diff --git a/.clang-format b/.clang-format
index d8f273702c8..2da3911dced 100644
--- a/.clang-format
+++ b/.clang-format
@@ -21,7 +21,6 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ExperimentalAutoDetectBinPacking: true
 UseTab: Never
 TabWidth: 4
-IndentWidth: 4
 Standard: Cpp11
 PointerAlignment: Middle
 MaxEmptyLinesToKeep: 2
diff --git a/.clang-tidy b/.clang-tidy
index 4dd8b9859c9..85989d311a2 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -23,9 +23,12 @@ Checks: '*,
     -bugprone-implicit-widening-of-multiplication-result,
     -bugprone-narrowing-conversions,
     -bugprone-not-null-terminated-result,
+    -bugprone-reserved-identifier, # useful but too slow, TODO retry when https://reviews.llvm.org/rG1c282052624f9d0bd273bde0b47b30c96699c6c7 is merged
     -bugprone-unchecked-optional-access,
 
     -cert-dcl16-c,
+    -cert-dcl37-c,
+    -cert-dcl51-cpp,
     -cert-err58-cpp,
     -cert-msc32-c,
     -cert-msc51-cpp,
@@ -38,6 +41,8 @@ Checks: '*,
     -clang-analyzer-security.insecureAPI.strcpy,
 
     -cppcoreguidelines-avoid-c-arrays,
+    -cppcoreguidelines-avoid-const-or-ref-data-members,
+    -cppcoreguidelines-avoid-do-while,
     -cppcoreguidelines-avoid-goto,
     -cppcoreguidelines-avoid-magic-numbers,
     -cppcoreguidelines-avoid-non-const-global-variables,
@@ -105,6 +110,8 @@ Checks: '*,
     -misc-const-correctness,
     -misc-no-recursion,
     -misc-non-private-member-variables-in-classes,
+    -misc-confusable-identifiers, # useful but slooow
+    -misc-use-anonymous-namespace,
 
     -modernize-avoid-c-arrays,
     -modernize-concat-nested-namespaces,
@@ -125,10 +132,12 @@ Checks: '*,
     -portability-simd-intrinsics,
 
     -readability-braces-around-statements,
+    -readability-convert-member-functions-to-static,
     -readability-else-after-return,
     -readability-function-cognitive-complexity,
     -readability-function-size,
     -readability-identifier-length,
+    -readability-identifier-naming, # useful but too slow
     -readability-implicit-bool-conversion,
     -readability-isolate-declaration,
     -readability-magic-numbers,
@@ -140,74 +149,32 @@ Checks: '*,
     -readability-uppercase-literal-suffix,
     -readability-use-anyofallof,
 
-    -zirkon-*,
-
-    -misc-*, # temporarily disabled due to being too slow
-    # also disable checks in other categories which are aliases of checks in misc-*:
-    # https://releases.llvm.org/15.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/list.html
-    -cert-dcl54-cpp,                                            # alias of misc-new-delete-overloads
-    -hicpp-new-delete-operators,                                # alias of misc-new-delete-overloads
-    -cert-fio38-c,                                              # alias of misc-non-copyable-objects
-    -cert-dcl03-c,                                              # alias of misc-static-assert
-    -hicpp-static-assert,                                       # alias of misc-static-assert
-    -cert-err09-cpp,                                            # alias of misc-throw-by-value-catch-by-reference
-    -cert-err61-cpp,                                            # alias of misc-throw-by-value-catch-by-reference
-    -cppcoreguidelines-c-copy-assignment-signature,             # alias of misc-unconventional-assign-operator
-    -cppcoreguidelines-non-private-member-variables-in-classes, # alias of misc-non-private-member-variables-in-classes
+    -zircon-*,
 '
 
 WarningsAsErrors: '*'
 
-# TODO: use dictionary syntax for CheckOptions when minimum clang-tidy level rose to 15
-#           some-check.SomeOption: 'some value'
-#       instead of
-#           - key:             some-check.SomeOption
-#             value:           'some value'
 CheckOptions:
-  - key: readability-identifier-naming.ClassCase
-    value: CamelCase
-  - key: readability-identifier-naming.EnumCase
-    value: CamelCase
-  - key: readability-identifier-naming.LocalVariableCase
-    value: lower_case
-  - key: readability-identifier-naming.StaticConstantCase
-    value: aNy_CasE
-  - key: readability-identifier-naming.MemberCase
-    value: lower_case
-  - key: readability-identifier-naming.PrivateMemberPrefix
-    value: ''
-  - key: readability-identifier-naming.ProtectedMemberPrefix
-    value: ''
-  - key: readability-identifier-naming.PublicMemberCase
-    value: lower_case
-  - key: readability-identifier-naming.MethodCase
-    value: camelBack
-  - key: readability-identifier-naming.PrivateMethodPrefix
-    value: ''
-  - key: readability-identifier-naming.ProtectedMethodPrefix
-    value: ''
-  - key: readability-identifier-naming.ParameterPackCase
-    value: lower_case
-  - key: readability-identifier-naming.StructCase
-    value: CamelCase
-  - key: readability-identifier-naming.TemplateTemplateParameterCase
-    value: CamelCase
-  - key: readability-identifier-naming.TemplateUsingCase
-    value: lower_case
-  - key: readability-identifier-naming.TypeTemplateParameterCase
-    value: CamelCase
-  - key: readability-identifier-naming.TypedefCase
-    value: CamelCase
-  - key: readability-identifier-naming.UnionCase
-    value: CamelCase
-  - key: readability-identifier-naming.UsingCase
-    value: CamelCase
-  - key: modernize-loop-convert.UseCxx20ReverseRanges
-    value: false
-  - key: performance-move-const-arg.CheckTriviallyCopyableMove
-    value: false
-    # Workaround clang-tidy bug: https://github.com/llvm/llvm-project/issues/46097
-  - key: readability-identifier-naming.TypeTemplateParameterIgnoredRegexp
-    value: expr-type
-  - key: cppcoreguidelines-avoid-do-while.IgnoreMacros
-    value: true
+  readability-identifier-naming.ClassCase: CamelCase
+  readability-identifier-naming.EnumCase: CamelCase
+  readability-identifier-naming.LocalVariableCase: lower_case
+  readability-identifier-naming.StaticConstantCase: aNy_CasE
+  readability-identifier-naming.MemberCase: lower_case
+  readability-identifier-naming.PrivateMemberPrefix: ''
+  readability-identifier-naming.ProtectedMemberPrefix: ''
+  readability-identifier-naming.PublicMemberCase: lower_case
+  readability-identifier-naming.MethodCase: camelBack
+  readability-identifier-naming.PrivateMethodPrefix: ''
+  readability-identifier-naming.ProtectedMethodPrefix: ''
+  readability-identifier-naming.ParameterPackCase: lower_case
+  readability-identifier-naming.StructCase: CamelCase
+  readability-identifier-naming.TemplateTemplateParameterCase: CamelCase
+  readability-identifier-naming.TemplateParameterCase: lower_case
+  readability-identifier-naming.TypeTemplateParameterCase: CamelCase
+  readability-identifier-naming.TypedefCase: CamelCase
+  readability-identifier-naming.UnionCase: CamelCase
+  modernize-loop-convert.UseCxx20ReverseRanges: false
+  performance-move-const-arg.CheckTriviallyCopyableMove: false
+  # Workaround clang-tidy bug: https://github.com/llvm/llvm-project/issues/46097
+  readability-identifier-naming.TypeTemplateParameterIgnoredRegexp: expr-type
+  cppcoreguidelines-avoid-do-while.IgnoreMacros: true
diff --git a/.clangd b/.clangd
new file mode 100644
index 00000000000..ad471db8d8b
--- /dev/null
+++ b/.clangd
@@ -0,0 +1,16 @@
+Diagnostics:
+    # clangd does parse .clang-tidy, but some checks are too slow to run in
+    # clang-tidy build, so let's enable them explicitly for clangd at least.
+    ClangTidy:
+        # The following checks had been disabled due to slowliness with C++23,
+        # for more details see [1].
+        #
+        #   [1]: https://github.com/llvm/llvm-project/issues/61418
+        #
+        # But the code base had been written in a style that had been checked
+        # by this check, so at least, let's enable it for clangd.
+        Add: [
+            # configured in .clang-tidy
+            readability-identifier-naming,
+            bugprone-reserved-identifier,
+        ]
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5d09d3a9ef3..db170c3e28f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,16 +2,16 @@
 A technical comment, you are free to remove or leave it as it is when PR is created
 The following categories are used in the next scripts, update them accordingly
 utils/changelog/changelog.py
-tests/ci/run_check.py
+tests/ci/cancel_and_rerun_workflow_lambda/app.py
 -->
 ### Changelog category (leave one):
 - New Feature
 - Improvement
-- Bug Fix (user-visible misbehavior in official stable or prestable release)
 - Performance Improvement
 - Backward Incompatible Change
 - Build/Testing/Packaging Improvement
 - Documentation (changelog entry is not required)
+- Bug Fix (user-visible misbehavior in an official stable release)
 - Not for changelog (changelog entry is not required)
 
 
diff --git a/.github/workflows/backport_branches.yml b/.github/workflows/backport_branches.yml
index 110c06631c7..d69168b01ee 100644
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@@ -9,8 +9,22 @@ on: # yamllint disable-line rule:truthy
     branches:
       - 'backport/**'
 jobs:
+  CheckLabels:
+    runs-on: [self-hosted, style-checker]
+    # Run the first check always, even if the CI is cancelled
+    if: ${{ always() }}
+    steps:
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Labels check
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 run_check.py
   PythonUnitTests:
     runs-on: [self-hosted, style-checker]
+    needs: CheckLabels
     steps:
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
@@ -22,6 +36,7 @@ jobs:
           python3 -m unittest discover -s . -p '*_test.py'
   DockerHubPushAarch64:
     runs-on: [self-hosted, style-checker-aarch64]
+    needs: CheckLabels
     steps:
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
@@ -38,6 +53,7 @@ jobs:
           path: ${{ runner.temp }}/docker_images_check/changed_images_aarch64.json
   DockerHubPushAmd64:
     runs-on: [self-hosted, style-checker]
+    needs: CheckLabels
     steps:
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
@@ -79,7 +95,7 @@ jobs:
         with:
           name: changed_images
           path: ${{ runner.temp }}/changed_images.json
-  CompatibilityCheck:
+  CompatibilityCheckX86:
     needs: [BuilderDebRelease]
     runs-on: [self-hosted, style-checker]
     steps:
@@ -98,12 +114,43 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           path: ${{ env.REPORTS_PATH }}
-      - name: CompatibilityCheck
+      - name: CompatibilityCheckX86
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py
+          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py --check-name "Compatibility check (amd64)" --check-glibc --check-distributions
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  CompatibilityCheckAarch64:
+    needs: [BuilderDebAarch64]
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/compatibility_check
+          REPO_COPY=${{runner.temp}}/compatibility_check/ClickHouse
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          EOF
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: CompatibilityCheckAarch64
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
       - name: Cleanup
         if: always()
         run: |
@@ -302,6 +349,13 @@ jobs:
         with:
           clear-repository: true
           submodules: true
+      - name: Apply sparse checkout for contrib # in order to check that it doesn't break build
+        run: |
+          rm -rf "$GITHUB_WORKSPACE/contrib" && echo 'removed'
+          git -C "$GITHUB_WORKSPACE" checkout .  && echo 'restored'
+          "$GITHUB_WORKSPACE/contrib/update-submodules.sh" && echo 'OK'
+          du -hs "$GITHUB_WORKSPACE/contrib" ||:
+          find "$GITHUB_WORKSPACE/contrib" -type f | wc -l ||:
       - name: Build
         run: |
           sudo rm -fr "$TEMP_PATH"
@@ -421,8 +475,9 @@ jobs:
       - name: Check docker clickhouse/clickhouse-server building
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 docker_server.py --release-type head --no-push
-          python3 docker_server.py --release-type head --no-push --no-ubuntu \
+          python3 docker_server.py --release-type head --no-push \
+            --image-repo clickhouse/clickhouse-server --image-path docker/server
+          python3 docker_server.py --release-type head --no-push \
             --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
       - name: Cleanup
         if: always()
@@ -741,7 +796,8 @@ jobs:
       - FunctionalStatefulTestDebug
       - StressTestTsan
       - IntegrationTestsRelease
-      - CompatibilityCheck
+      - CompatibilityCheckX86
+      - CompatibilityCheckAarch64
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Check out repository code
diff --git a/.github/workflows/cherry_pick.yml b/.github/workflows/cherry_pick.yml
index 065e584182b..8d1e2055978 100644
--- a/.github/workflows/cherry_pick.yml
+++ b/.github/workflows/cherry_pick.yml
@@ -35,7 +35,6 @@ jobs:
           fetch-depth: 0
       - name: Cherry pick
         run: |
-          sudo pip install GitPython
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 cherry_pick.py
       - name: Cleanup
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 7e045992dee..f0741b5465f 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -110,7 +110,7 @@ jobs:
           docker ps --quiet | xargs --no-run-if-empty docker kill ||:
           docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
           sudo rm -fr "$TEMP_PATH"
-  CompatibilityCheck:
+  CompatibilityCheckX86:
     needs: [BuilderDebRelease]
     runs-on: [self-hosted, style-checker]
     steps:
@@ -129,12 +129,43 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           path: ${{ env.REPORTS_PATH }}
-      - name: CompatibilityCheck
+      - name: CompatibilityCheckX86
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py
+          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py --check-name "Compatibility check (amd64)" --check-glibc --check-distributions
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  CompatibilityCheckAarch64:
+    needs: [BuilderDebAarch64]
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/compatibility_check
+          REPO_COPY=${{runner.temp}}/compatibility_check/ClickHouse
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          EOF
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: CompatibilityCheckAarch64
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
       - name: Cleanup
         if: always()
         run: |
@@ -456,6 +487,13 @@ jobs:
         with:
           clear-repository: true
           submodules: true
+      - name: Apply sparse checkout for contrib # in order to check that it doesn't break build
+        run: |
+          rm -rf "$GITHUB_WORKSPACE/contrib" && echo 'removed'
+          git -C "$GITHUB_WORKSPACE" checkout .  && echo 'restored'
+          "$GITHUB_WORKSPACE/contrib/update-submodules.sh" && echo 'OK'
+          du -hs "$GITHUB_WORKSPACE/contrib" ||:
+          find "$GITHUB_WORKSPACE/contrib" -type f | wc -l ||:
       - name: Build
         run: |
           sudo rm -fr "$TEMP_PATH"
@@ -829,8 +867,9 @@ jobs:
       - name: Check docker clickhouse/clickhouse-server building
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 docker_server.py --release-type head
-          python3 docker_server.py --release-type head --no-ubuntu \
+          python3 docker_server.py --release-type head \
+            --image-repo clickhouse/clickhouse-server --image-path docker/server
+          python3 docker_server.py --release-type head \
             --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
       - name: Cleanup
         if: always()
@@ -1099,7 +1138,7 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_database_replicated/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=0
-          RUN_BY_HASH_TOTAL=2
+          RUN_BY_HASH_TOTAL=4
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1135,6 +1174,114 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_database_replicated/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=1
+          RUN_BY_HASH_TOTAL=4
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestReleaseDatabaseReplicated2:
+    needs: [BuilderDebRelease]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_database_replicated
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (release, DatabaseReplicated)
+          REPO_COPY=${{runner.temp}}/stateless_database_replicated/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=2
+          RUN_BY_HASH_TOTAL=4
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestReleaseDatabaseReplicated3:
+    needs: [BuilderDebRelease]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_database_replicated
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (release, DatabaseReplicated)
+          REPO_COPY=${{runner.temp}}/stateless_database_replicated/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=3
+          RUN_BY_HASH_TOTAL=4
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestReleaseS3_0:
+    needs: [BuilderDebRelease]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_s3_storage
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (release, s3 storage)
+          REPO_COPY=${{runner.temp}}/stateless_s3_storage/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=0
           RUN_BY_HASH_TOTAL=2
           EOF
       - name: Download json reports
@@ -1158,7 +1305,7 @@ jobs:
           docker ps --quiet | xargs --no-run-if-empty docker kill ||:
           docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
           sudo rm -fr "$TEMP_PATH"
-  FunctionalStatelessTestReleaseS3:
+  FunctionalStatelessTestReleaseS3_1:
     needs: [BuilderDebRelease]
     runs-on: [self-hosted, func-tester]
     steps:
@@ -1170,6 +1317,42 @@ jobs:
           CHECK_NAME=Stateless tests (release, s3 storage)
           REPO_COPY=${{runner.temp}}/stateless_s3_storage/ClickHouse
           KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=1
+          RUN_BY_HASH_TOTAL=2
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestReleaseAnalyzer:
+    needs: [BuilderDebRelease]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_analyzer
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (release, analyzer)
+          REPO_COPY=${{runner.temp}}/stateless_analyzer/ClickHouse
+          KILL_TIMEOUT=10800
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1239,7 +1422,7 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_debug/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=0
-          RUN_BY_HASH_TOTAL=2
+          RUN_BY_HASH_TOTAL=4
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1275,7 +1458,79 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_debug/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=1
-          RUN_BY_HASH_TOTAL=2
+          RUN_BY_HASH_TOTAL=4
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestAsan2:
+    needs: [BuilderDebAsan]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_debug
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (asan)
+          REPO_COPY=${{runner.temp}}/stateless_debug/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=2
+          RUN_BY_HASH_TOTAL=4
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestAsan3:
+    needs: [BuilderDebAsan]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_debug
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (asan)
+          REPO_COPY=${{runner.temp}}/stateless_debug/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=3
+          RUN_BY_HASH_TOTAL=4
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1311,7 +1566,7 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_tsan/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=0
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=5
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1347,7 +1602,7 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_tsan/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=1
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=5
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1383,7 +1638,7 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_tsan/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=2
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=5
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1406,7 +1661,79 @@ jobs:
           docker ps --quiet | xargs --no-run-if-empty docker kill ||:
           docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
           sudo rm -fr "$TEMP_PATH"
-  FunctionalStatelessTestUBsan:
+  FunctionalStatelessTestTsan3:
+    needs: [BuilderDebTsan]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_tsan
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (tsan)
+          REPO_COPY=${{runner.temp}}/stateless_tsan/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=3
+          RUN_BY_HASH_TOTAL=5
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestTsan4:
+    needs: [BuilderDebTsan]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_tsan
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (tsan)
+          REPO_COPY=${{runner.temp}}/stateless_tsan/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=4
+          RUN_BY_HASH_TOTAL=5
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestUBsan0:
     needs: [BuilderDebUBsan]
     runs-on: [self-hosted, func-tester]
     steps:
@@ -1418,6 +1745,44 @@ jobs:
           CHECK_NAME=Stateless tests (ubsan)
           REPO_COPY=${{runner.temp}}/stateless_ubsan/ClickHouse
           KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=0
+          RUN_BY_HASH_TOTAL=2
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestUBsan1:
+    needs: [BuilderDebUBsan]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_ubsan
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (ubsan)
+          REPO_COPY=${{runner.temp}}/stateless_ubsan/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=1
+          RUN_BY_HASH_TOTAL=2
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1453,7 +1818,7 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_memory/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=0
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=6
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1489,7 +1854,7 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_memory/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=1
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=6
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1525,7 +1890,115 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_memory/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=2
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=6
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestMsan3:
+    needs: [BuilderDebMsan]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_memory
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (msan)
+          REPO_COPY=${{runner.temp}}/stateless_memory/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=3
+          RUN_BY_HASH_TOTAL=6
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestMsan4:
+    needs: [BuilderDebMsan]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_memory
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (msan)
+          REPO_COPY=${{runner.temp}}/stateless_memory/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=4
+          RUN_BY_HASH_TOTAL=6
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestMsan5:
+    needs: [BuilderDebMsan]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_memory
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (msan)
+          REPO_COPY=${{runner.temp}}/stateless_memory/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=5
+          RUN_BY_HASH_TOTAL=6
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1561,7 +2034,7 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_debug/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=0
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=5
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1597,7 +2070,7 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_debug/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=1
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=5
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -1633,7 +2106,79 @@ jobs:
           REPO_COPY=${{runner.temp}}/stateless_debug/ClickHouse
           KILL_TIMEOUT=10800
           RUN_BY_HASH_NUM=2
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=5
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestDebug3:
+    needs: [BuilderDebDebug]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_debug
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (debug)
+          REPO_COPY=${{runner.temp}}/stateless_debug/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=3
+          RUN_BY_HASH_TOTAL=5
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestDebug4:
+    needs: [BuilderDebDebug]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_debug
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (debug)
+          REPO_COPY=${{runner.temp}}/stateless_debug/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=4
+          RUN_BY_HASH_TOTAL=5
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -2084,7 +2629,7 @@ jobs:
           CHECK_NAME=Integration tests (asan)
           REPO_COPY=${{runner.temp}}/integration_tests_asan/ClickHouse
           RUN_BY_HASH_NUM=0
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=6
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -2119,7 +2664,7 @@ jobs:
           CHECK_NAME=Integration tests (asan)
           REPO_COPY=${{runner.temp}}/integration_tests_asan/ClickHouse
           RUN_BY_HASH_NUM=1
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=6
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -2154,7 +2699,112 @@ jobs:
           CHECK_NAME=Integration tests (asan)
           REPO_COPY=${{runner.temp}}/integration_tests_asan/ClickHouse
           RUN_BY_HASH_NUM=2
-          RUN_BY_HASH_TOTAL=3
+          RUN_BY_HASH_TOTAL=6
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Integration test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 integration_test_check.py "$CHECK_NAME"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  IntegrationTestsAsan3:
+    needs: [BuilderDebAsan]
+    runs-on: [self-hosted, stress-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/integration_tests_asan
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Integration tests (asan)
+          REPO_COPY=${{runner.temp}}/integration_tests_asan/ClickHouse
+          RUN_BY_HASH_NUM=3
+          RUN_BY_HASH_TOTAL=6
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Integration test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 integration_test_check.py "$CHECK_NAME"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  IntegrationTestsAsan4:
+    needs: [BuilderDebAsan]
+    runs-on: [self-hosted, stress-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/integration_tests_asan
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Integration tests (asan)
+          REPO_COPY=${{runner.temp}}/integration_tests_asan/ClickHouse
+          RUN_BY_HASH_NUM=4
+          RUN_BY_HASH_TOTAL=6
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Integration test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 integration_test_check.py "$CHECK_NAME"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  IntegrationTestsAsan5:
+    needs: [BuilderDebAsan]
+    runs-on: [self-hosted, stress-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/integration_tests_asan
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Integration tests (asan)
+          REPO_COPY=${{runner.temp}}/integration_tests_asan/ClickHouse
+          RUN_BY_HASH_NUM=5
+          RUN_BY_HASH_TOTAL=6
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -2189,7 +2839,7 @@ jobs:
           CHECK_NAME=Integration tests (tsan)
           REPO_COPY=${{runner.temp}}/integration_tests_tsan/ClickHouse
           RUN_BY_HASH_NUM=0
-          RUN_BY_HASH_TOTAL=4
+          RUN_BY_HASH_TOTAL=6
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -2224,7 +2874,7 @@ jobs:
           CHECK_NAME=Integration tests (tsan)
           REPO_COPY=${{runner.temp}}/integration_tests_tsan/ClickHouse
           RUN_BY_HASH_NUM=1
-          RUN_BY_HASH_TOTAL=4
+          RUN_BY_HASH_TOTAL=6
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -2259,7 +2909,7 @@ jobs:
           CHECK_NAME=Integration tests (tsan)
           REPO_COPY=${{runner.temp}}/integration_tests_tsan/ClickHouse
           RUN_BY_HASH_NUM=2
-          RUN_BY_HASH_TOTAL=4
+          RUN_BY_HASH_TOTAL=6
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -2294,7 +2944,77 @@ jobs:
           CHECK_NAME=Integration tests (tsan)
           REPO_COPY=${{runner.temp}}/integration_tests_tsan/ClickHouse
           RUN_BY_HASH_NUM=3
-          RUN_BY_HASH_TOTAL=4
+          RUN_BY_HASH_TOTAL=6
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Integration test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 integration_test_check.py "$CHECK_NAME"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  IntegrationTestsTsan4:
+    needs: [BuilderDebTsan]
+    runs-on: [self-hosted, stress-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/integration_tests_tsan
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Integration tests (tsan)
+          REPO_COPY=${{runner.temp}}/integration_tests_tsan/ClickHouse
+          RUN_BY_HASH_NUM=4
+          RUN_BY_HASH_TOTAL=6
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Integration test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 integration_test_check.py "$CHECK_NAME"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  IntegrationTestsTsan5:
+    needs: [BuilderDebTsan]
+    runs-on: [self-hosted, stress-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/integration_tests_tsan
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Integration tests (tsan)
+          REPO_COPY=${{runner.temp}}/integration_tests_tsan/ClickHouse
+          RUN_BY_HASH_NUM=5
+          RUN_BY_HASH_TOTAL=6
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -2329,7 +3049,7 @@ jobs:
           CHECK_NAME=Integration tests (release)
           REPO_COPY=${{runner.temp}}/integration_tests_release/ClickHouse
           RUN_BY_HASH_NUM=0
-          RUN_BY_HASH_TOTAL=2
+          RUN_BY_HASH_TOTAL=4
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -2364,7 +3084,77 @@ jobs:
           CHECK_NAME=Integration tests (release)
           REPO_COPY=${{runner.temp}}/integration_tests_release/ClickHouse
           RUN_BY_HASH_NUM=1
-          RUN_BY_HASH_TOTAL=2
+          RUN_BY_HASH_TOTAL=4
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Integration test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 integration_test_check.py "$CHECK_NAME"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  IntegrationTestsRelease2:
+    needs: [BuilderDebRelease]
+    runs-on: [self-hosted, stress-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/integration_tests_release
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Integration tests (release)
+          REPO_COPY=${{runner.temp}}/integration_tests_release/ClickHouse
+          RUN_BY_HASH_NUM=2
+          RUN_BY_HASH_TOTAL=4
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Integration test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 integration_test_check.py "$CHECK_NAME"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  IntegrationTestsRelease3:
+    needs: [BuilderDebRelease]
+    runs-on: [self-hosted, stress-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/integration_tests_release
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Integration tests (release)
+          REPO_COPY=${{runner.temp}}/integration_tests_release/ClickHouse
+          RUN_BY_HASH_NUM=3
+          RUN_BY_HASH_TOTAL=4
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v3
@@ -3084,23 +3874,36 @@ jobs:
       - FunctionalStatelessTestDebug0
       - FunctionalStatelessTestDebug1
       - FunctionalStatelessTestDebug2
+      - FunctionalStatelessTestDebug3
+      - FunctionalStatelessTestDebug4
       - FunctionalStatelessTestRelease
       - FunctionalStatelessTestReleaseDatabaseOrdinary
       - FunctionalStatelessTestReleaseDatabaseReplicated0
       - FunctionalStatelessTestReleaseDatabaseReplicated1
+      - FunctionalStatelessTestReleaseDatabaseReplicated2
+      - FunctionalStatelessTestReleaseDatabaseReplicated3
       - FunctionalStatelessTestAarch64
       - FunctionalStatelessTestAsan0
       - FunctionalStatelessTestAsan1
+      - FunctionalStatelessTestAsan2
+      - FunctionalStatelessTestAsan3
       - FunctionalStatelessTestTsan0
       - FunctionalStatelessTestTsan1
       - FunctionalStatelessTestTsan2
+      - FunctionalStatelessTestTsan3
+      - FunctionalStatelessTestTsan4
       - FunctionalStatelessTestMsan0
       - FunctionalStatelessTestMsan1
       - FunctionalStatelessTestMsan2
-      - FunctionalStatelessTestUBsan
+      - FunctionalStatelessTestMsan3
+      - FunctionalStatelessTestMsan4
+      - FunctionalStatelessTestMsan5
+      - FunctionalStatelessTestUBsan0
+      - FunctionalStatelessTestUBsan1
       - FunctionalStatefulTestDebug
       - FunctionalStatefulTestRelease
-      - FunctionalStatelessTestReleaseS3
+      - FunctionalStatelessTestReleaseS3_0
+      - FunctionalStatelessTestReleaseS3_1
       - FunctionalStatefulTestAarch64
       - FunctionalStatefulTestAsan
       - FunctionalStatefulTestTsan
@@ -3114,17 +3917,25 @@ jobs:
       - IntegrationTestsAsan0
       - IntegrationTestsAsan1
       - IntegrationTestsAsan2
+      - IntegrationTestsAsan3
+      - IntegrationTestsAsan4
+      - IntegrationTestsAsan5
       - IntegrationTestsRelease0
       - IntegrationTestsRelease1
+      - IntegrationTestsRelease2
+      - IntegrationTestsRelease3
       - IntegrationTestsTsan0
       - IntegrationTestsTsan1
       - IntegrationTestsTsan2
       - IntegrationTestsTsan3
+      - IntegrationTestsTsan4
+      - IntegrationTestsTsan5
       - PerformanceComparisonX86-0
       - PerformanceComparisonX86-1
       - PerformanceComparisonX86-2
       - PerformanceComparisonX86-3
-      - CompatibilityCheck
+      - CompatibilityCheckX86
+      - CompatibilityCheckAarch64
       - ASTFuzzerTestDebug
       - ASTFuzzerTestAsan
       - ASTFuzzerTestTsan
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index f6d6d192f48..acf6bbe8f6a 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -72,6 +72,9 @@ jobs:
         with:
           name: changed_images
           path: ${{ runner.temp }}/changed_images.json
+  Codebrowser:
+    needs: [DockerHubPush]
+    uses: ./.github/workflows/woboq.yml
   BuilderCoverity:
     needs: DockerHubPush
     runs-on: [self-hosted, builder]
@@ -118,13 +121,15 @@ jobs:
           docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   SonarCloud:
+    # TODO: Remove if: whenever SonarCloud supports c++23
+    if: ${{ false }}
     runs-on: [self-hosted, builder]
     env:
-      SONAR_SCANNER_VERSION: 4.7.0.2747
+      SONAR_SCANNER_VERSION: 4.8.0.2856
       SONAR_SERVER_URL: "https://sonarcloud.io"
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
-      CC: clang-15
-      CXX: clang++-15
+      CC: clang-16
+      CXX: clang++-16
     steps:
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
@@ -173,4 +178,4 @@ jobs:
             --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" \
             --define sonar.projectKey="ClickHouse_ClickHouse" \
             --define sonar.organization="clickhouse-java" \
-            --define sonar.exclusions="**/*.java,**/*.ts,**/*.js,**/*.css,**/*.sql"
+            --define sonar.exclusions="**/*.java,**/*.ts,**/*.js,**/*.css,**/*.sql" \
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 7d410f833c5..506ed451b6d 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -37,7 +37,6 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 run_check.py
   PythonUnitTests:
-    needs: CheckLabels
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Check out repository code
@@ -174,7 +173,7 @@ jobs:
           docker ps --quiet | xargs --no-run-if-empty docker kill ||:
           docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
-  CompatibilityCheck:
+  CompatibilityCheckX86:
     needs: [BuilderDebRelease]
     runs-on: [self-hosted, style-checker]
     steps:
@@ -193,12 +192,43 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           path: ${{ env.REPORTS_PATH }}
-      - name: CompatibilityCheck
+      - name: CompatibilityCheckX86
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py
+          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py --check-name "Compatibility check (amd64)" --check-glibc --check-distributions
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  CompatibilityCheckAarch64:
+    needs: [BuilderDebAarch64]
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/compatibility_check
+          REPO_COPY=${{runner.temp}}/compatibility_check/ClickHouse
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          EOF
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: CompatibilityCheckAarch64
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
       - name: Cleanup
         if: always()
         run: |
@@ -520,6 +550,13 @@ jobs:
         with:
           clear-repository: true
           submodules: true
+      - name: Apply sparse checkout for contrib # in order to check that it doesn't break build
+        run: |
+          rm -rf "$GITHUB_WORKSPACE/contrib" && echo 'removed'
+          git -C "$GITHUB_WORKSPACE" checkout .  && echo 'restored'
+          "$GITHUB_WORKSPACE/contrib/update-submodules.sh" && echo 'OK'
+          du -hs "$GITHUB_WORKSPACE/contrib" ||:
+          find "$GITHUB_WORKSPACE/contrib" -type f | wc -l ||:
       - name: Build
         run: |
           sudo rm -fr "$TEMP_PATH"
@@ -886,8 +923,9 @@ jobs:
       - name: Check docker clickhouse/clickhouse-server building
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 docker_server.py --release-type head --no-push
-          python3 docker_server.py --release-type head --no-push --no-ubuntu \
+          python3 docker_server.py --release-type head --no-push \
+            --image-repo clickhouse/clickhouse-server --image-path docker/server
+          python3 docker_server.py --release-type head --no-push \
             --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
       - name: Cleanup
         if: always()
@@ -1270,6 +1308,40 @@ jobs:
           docker ps --quiet | xargs --no-run-if-empty docker kill ||:
           docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
           sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestReleaseAnalyzer:
+    needs: [BuilderDebRelease]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_analyzer
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (release, analyzer)
+          REPO_COPY=${{runner.temp}}/stateless_analyzer/ClickHouse
+          KILL_TIMEOUT=10800
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestReleaseS3_0:
     needs: [BuilderDebRelease]
     runs-on: [self-hosted, func-tester]
@@ -4717,6 +4789,7 @@ jobs:
       - FunctionalStatelessTestReleaseDatabaseReplicated2
       - FunctionalStatelessTestReleaseDatabaseReplicated3
       - FunctionalStatelessTestReleaseWideParts
+      - FunctionalStatelessTestReleaseAnalyzer
       - FunctionalStatelessTestAarch64
       - FunctionalStatelessTestAsan0
       - FunctionalStatelessTestAsan1
@@ -4792,7 +4865,8 @@ jobs:
       - UnitTestsMsan
       - UnitTestsUBsan
       - UnitTestsReleaseClang
-      - CompatibilityCheck
+      - CompatibilityCheckX86
+      - CompatibilityCheckAarch64
       - IntegrationTestsFlakyCheck
       - SQLancerTestRelease
       - SQLancerTestDebug
@@ -4807,3 +4881,41 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 finish_check.py
           python3 merge_pr.py --check-approved
+##############################################################################################
+########################### SQLLOGIC TEST ###################################################
+##############################################################################################
+  SQLLogicTestRelease:
+    needs: [BuilderDebRelease]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/sqllogic_debug
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Sqllogic test (release)
+          REPO_COPY=${{runner.temp}}/sqllogic_debug/ClickHouse
+          KILL_TIMEOUT=10800
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v2
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Clear repository
+        run: |
+          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Sqllogic test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 sqllogic_test.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2ef05fe989b..0742ebfd449 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,15 +7,28 @@ on: # yamllint disable-line rule:truthy
   release:
     types:
     - published
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release tag'
+        required: true
+        type: string
 
 jobs:
   ReleasePublish:
     runs-on: [self-hosted, style-checker]
     steps:
+    - name: Set tag from input
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${{ github.event.inputs.tag }}" >> "$GITHUB_ENV"
+    - name: Set tag from REF
+      if: github.event_name == 'release'
+      run: |
+        echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
     - name: Deploy packages and assets
       run: |
-        GITHUB_TAG="${GITHUB_REF#refs/tags/}"
-        curl --silent --data '' \
+        curl --silent --data '' --no-buffer \
           '${{ secrets.PACKAGES_RELEASE_URL }}/release/'"${GITHUB_TAG}"'?binary=binary_darwin&binary=binary_darwin_aarch64&sync=true'
   ############################################################################################
   ##################################### Docker images  #######################################
@@ -23,16 +36,26 @@ jobs:
   DockerServerImages:
     runs-on: [self-hosted, style-checker]
     steps:
+    - name: Set tag from input
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${{ github.event.inputs.tag }}" >> "$GITHUB_ENV"
+    - name: Set tag from REF
+      if: github.event_name == 'release'
+      run: |
+        echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
     - name: Check out repository code
       uses: ClickHouse/checkout@v1
       with:
         clear-repository: true
         fetch-depth: 0  # otherwise we will have no version info
+        ref: ${{ env.GITHUB_TAG }}
     - name: Check docker clickhouse/clickhouse-server building
       run: |
         cd "$GITHUB_WORKSPACE/tests/ci"
-        python3 docker_server.py --release-type auto --version "${{ github.ref }}"
-        python3 docker_server.py --release-type auto --version "${{ github.ref }}" --no-ubuntu \
+        python3 docker_server.py --release-type auto --version "$GITHUB_TAG" \
+          --image-repo clickhouse/clickhouse-server --image-path docker/server
+        python3 docker_server.py --release-type auto --version "$GITHUB_TAG" \
           --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
     - name: Cleanup
       if: always()
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index 4d2a99c2106..21284815583 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -71,7 +71,7 @@ jobs:
         with:
           name: changed_images
           path: ${{ runner.temp }}/changed_images.json
-  CompatibilityCheck:
+  CompatibilityCheckX86:
     needs: [BuilderDebRelease]
     runs-on: [self-hosted, style-checker]
     steps:
@@ -90,12 +90,43 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           path: ${{ env.REPORTS_PATH }}
-      - name: CompatibilityCheck
+      - name: CompatibilityCheckX86
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py
+          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py --check-name "Compatibility check (amd64)" --check-glibc --check-distributions
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
+  CompatibilityCheckAarch64:
+    needs: [BuilderDebAarch64]
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/compatibility_check
+          REPO_COPY=${{runner.temp}}/compatibility_check/ClickHouse
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          EOF
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: CompatibilityCheckAarch64
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
       - name: Cleanup
         if: always()
         run: |
@@ -375,6 +406,13 @@ jobs:
         with:
           clear-repository: true
           submodules: true
+      - name: Apply sparse checkout for contrib # in order to check that it doesn't break build
+        run: |
+          rm -rf "$GITHUB_WORKSPACE/contrib" && echo 'removed'
+          git -C "$GITHUB_WORKSPACE" checkout .  && echo 'restored'
+          "$GITHUB_WORKSPACE/contrib/update-submodules.sh" && echo 'OK'
+          du -hs "$GITHUB_WORKSPACE/contrib" ||:
+          find "$GITHUB_WORKSPACE/contrib" -type f | wc -l ||:
       - name: Build
         run: |
           sudo rm -fr "$TEMP_PATH"
@@ -494,8 +532,9 @@ jobs:
       - name: Check docker clickhouse/clickhouse-server building
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 docker_server.py --release-type head --no-push
-          python3 docker_server.py --release-type head --no-push --no-ubuntu \
+          python3 docker_server.py --release-type head --no-push \
+            --image-repo clickhouse/clickhouse-server --image-path docker/server
+          python3 docker_server.py --release-type head --no-push \
             --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
       - name: Cleanup
         if: always()
@@ -1947,7 +1986,8 @@ jobs:
       - IntegrationTestsTsan1
       - IntegrationTestsTsan2
       - IntegrationTestsTsan3
-      - CompatibilityCheck
+      - CompatibilityCheckX86
+      - CompatibilityCheckAarch64
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Check out repository code
diff --git a/.github/workflows/woboq.yml b/.github/workflows/woboq.yml
index 363652c9f33..bdfbc8fef9c 100644
--- a/.github/workflows/woboq.yml
+++ b/.github/workflows/woboq.yml
@@ -6,9 +6,8 @@ env:
 concurrency:
   group: woboq
 on: # yamllint disable-line rule:truthy
-  schedule:
-    - cron: '0 */18 * * *'
   workflow_dispatch:
+  workflow_call:
 jobs:
   # don't use dockerhub push because this image updates so rarely
   WoboqCodebrowser:
@@ -26,6 +25,10 @@ jobs:
         with:
           clear-repository: true
           submodules: 'true'
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.IMAGES_PATH }}
       - name: Codebrowser
         run: |
           sudo rm -fr "$TEMP_PATH"
diff --git a/.gitignore b/.gitignore
index 14b860244c2..a04c60d5ca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,7 +129,6 @@ website/package-lock.json
 /.ccls-cache
 
 # clangd cache
-/.clangd
 /.cache
 
 /compile_commands.json
diff --git a/.gitmodules b/.gitmodules
index ca55281e643..f0984fec4db 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -267,7 +267,7 @@
 	url = https://github.com/ClickHouse/nats.c
 [submodule "contrib/vectorscan"]
 	path = contrib/vectorscan
-	url = https://github.com/VectorCamp/vectorscan
+	url = https://github.com/VectorCamp/vectorscan.git
 [submodule "contrib/c-ares"]
 	path = contrib/c-ares
 	url = https://github.com/ClickHouse/c-ares
@@ -296,6 +296,9 @@
 [submodule "contrib/libdivide"]
 	path = contrib/libdivide
 	url = https://github.com/ridiculousfish/libdivide
+[submodule "contrib/libbcrypt"]
+	path = contrib/libbcrypt
+	url = https://github.com/rg3/libbcrypt.git
 [submodule "contrib/ulid-c"]
 	path = contrib/ulid-c
 	url = https://github.com/ClickHouse/ulid-c.git
@@ -335,3 +338,9 @@
 [submodule "contrib/liburing"]
 	path = contrib/liburing
 	url = https://github.com/axboe/liburing
+[submodule "contrib/libfiu"]
+	path = contrib/libfiu
+	url = https://github.com/ClickHouse/libfiu.git
+[submodule "contrib/isa-l"]
+	path = contrib/isa-l
+	url = https://github.com/ClickHouse/isa-l.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e22377e2332..1ccd4f9846d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,343 @@
 ### Table of Contents
+**[ClickHouse release v23.4, 2023-04-26](#234)**<br/>
+**[ClickHouse release v23.3 LTS, 2023-03-30](#233)**<br/>
 **[ClickHouse release v23.2, 2023-02-23](#232)**<br/>
 **[ClickHouse release v23.1, 2023-01-25](#231)**<br/>
 **[Changelog for 2022](https://clickhouse.com/docs/en/whats-new/changelog/2022/)**<br/>
 
 # 2023 Changelog
 
+### <a id="234"></a> ClickHouse release 23.4, 2023-04-26
+
+#### Backward Incompatible Change
+* Formatter '%M' in function formatDateTime() now prints the month name instead of the minutes. This makes the behavior consistent with MySQL. The previous behavior can be restored using setting "formatdatetime_parsedatetime_m_is_month_name = 0". [#47246](https://github.com/ClickHouse/ClickHouse/pull/47246) ([Robert Schulze](https://github.com/rschu1ze)).
+* This change makes sense only if you are using the virtual filesystem cache. If `path` in the virtual filesystem cache configuration is not empty and is not an absolute path, then it will be put in `<clickhouse server data directory>/caches/<path_from_cache_config>`. [#48784](https://github.com/ClickHouse/ClickHouse/pull/48784) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Primary/secondary indices and sorting keys with identical expressions are now rejected. This behavior can be disabled using setting `allow_suspicious_indices`. [#48536](https://github.com/ClickHouse/ClickHouse/pull/48536) ([凌涛](https://github.com/lingtaolf)).
+
+#### New Feature
+* Support new aggregate function `quantileGK`/`quantilesGK`, like [approx_percentile](https://spark.apache.org/docs/latest/api/sql/index.html#approx_percentile) in spark. Greenwald-Khanna algorithm refer to http://infolab.stanford.edu/~datar/courses/cs361a/papers/quantiles.pdf. [#46428](https://github.com/ClickHouse/ClickHouse/pull/46428) ([李扬](https://github.com/taiyang-li)).
+* Add a statement `SHOW COLUMNS` which shows distilled information from system.columns. [#48017](https://github.com/ClickHouse/ClickHouse/pull/48017) ([Robert Schulze](https://github.com/rschu1ze)).
+* Added `LIGHTWEIGHT` and `PULL` modifiers for `SYSTEM SYNC REPLICA` query. `LIGHTWEIGHT` version waits for fetches and drop-ranges only (merges and mutations are ignored). `PULL` version pulls new entries from ZooKeeper and does not wait for them. Fixes [#47794](https://github.com/ClickHouse/ClickHouse/issues/47794). [#48085](https://github.com/ClickHouse/ClickHouse/pull/48085) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add `kafkaMurmurHash` function for compatibility with Kafka DefaultPartitioner. Closes [#47834](https://github.com/ClickHouse/ClickHouse/issues/47834). [#48185](https://github.com/ClickHouse/ClickHouse/pull/48185) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Allow to easily create a user with the same grants as the current user by using `GRANT CURRENT GRANTS`. [#48262](https://github.com/ClickHouse/ClickHouse/pull/48262) ([pufit](https://github.com/pufit)).
+* Add statistical aggregate function `kolmogorovSmirnovTest`. Close [#48228](https://github.com/ClickHouse/ClickHouse/issues/48228). [#48325](https://github.com/ClickHouse/ClickHouse/pull/48325) ([FFFFFFFHHHHHHH](https://github.com/FFFFFFFHHHHHHH)).
+* Added a `lost_part_count` column to the `system.replicas` table. The column value shows the total number of lost parts in the corresponding table. Value is stored in zookeeper and can be used instead of not persistent `ReplicatedDataLoss` profile event for monitoring. [#48526](https://github.com/ClickHouse/ClickHouse/pull/48526) ([Sergei Trifonov](https://github.com/serxa)).
+* Add `soundex` function for compatibility. Closes [#39880](https://github.com/ClickHouse/ClickHouse/issues/39880). [#48567](https://github.com/ClickHouse/ClickHouse/pull/48567) ([FriendLey](https://github.com/FriendLey)).
+* Support `Map` type for JSONExtract. [#48629](https://github.com/ClickHouse/ClickHouse/pull/48629) ([李扬](https://github.com/taiyang-li)).
+* Add `PrettyJSONEachRow` format to output pretty JSON with new line delimiters and 4 space indents. [#48898](https://github.com/ClickHouse/ClickHouse/pull/48898) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add `ParquetMetadata` input format to read Parquet file metadata. [#48911](https://github.com/ClickHouse/ClickHouse/pull/48911) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add `extractKeyValuePairs` function to extract key value pairs from strings. Input strings might contain noise (i.e. log files / do not need to be 100% formatted in key-value-pair format), the algorithm will look for key value pairs matching the arguments passed to the function. As of now, function accepts the following arguments: `data_column` (mandatory), `key_value_pair_delimiter` (defaults to `:`), `pair_delimiters` (defaults to `\space \, \;`) and `quoting_character` (defaults to double quotes). [#43606](https://github.com/ClickHouse/ClickHouse/pull/43606) ([Arthur Passos](https://github.com/arthurpassos)).
+* Functions replaceOne(), replaceAll(), replaceRegexpOne() and replaceRegexpAll() can now be called with non-const pattern and replacement arguments. [#46589](https://github.com/ClickHouse/ClickHouse/pull/46589) ([Robert Schulze](https://github.com/rschu1ze)).
+* Added functions to work with columns of type `Map`: `mapConcat`, `mapSort`, `mapExists`. [#48071](https://github.com/ClickHouse/ClickHouse/pull/48071) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Performance Improvement
+* Reading files in `Parquet` format is now much faster. IO and decoding are parallelized (controlled by `max_threads` setting), and only required data ranges are read. [#47964](https://github.com/ClickHouse/ClickHouse/pull/47964) ([Michael Kolupaev](https://github.com/al13n321)).
+* If we run a mutation with IN (subquery) like this: `ALTER TABLE t UPDATE col='new value' WHERE id IN (SELECT id FROM huge_table)` and the table `t` has multiple parts than for each part a set for subquery `SELECT id FROM huge_table` is built in memory. And if there are many parts then this might consume a lot of memory (and lead to an OOM) and CPU. The solution is to introduce a short-lived cache of sets that are currently being built by mutation tasks. If another task of the same mutation is executed concurrently it can look up the set in the cache, wait for it to be built and reuse it. [#46835](https://github.com/ClickHouse/ClickHouse/pull/46835) ([Alexander Gololobov](https://github.com/davenger)).
+* Only check dependencies if necessary when applying `ALTER TABLE` queries. [#48062](https://github.com/ClickHouse/ClickHouse/pull/48062) ([Raúl Marín](https://github.com/Algunenano)).
+* Optimize function `mapUpdate`. [#48118](https://github.com/ClickHouse/ClickHouse/pull/48118) ([Anton Popov](https://github.com/CurtizJ)).
+* Now an internal query to local replica is sent explicitly and data from it received through loopback interface. Setting `prefer_localhost_replica` is not respected for parallel replicas. This is needed for better scheduling and makes the code cleaner: the initiator is only responsible for coordinating of the reading process and merging results, continuously answering for requests while all the secondary queries read the data. Note: Using loopback interface is not so performant, otherwise some replicas could starve for tasks which could lead to even slower query execution and not utilizing all possible resources. The initialization of the coordinator is now even more lazy. All incoming requests contain the information about the reading algorithm we initialize the coordinator with it when first request comes. If any replica decides to read with a different algorithm–an exception will be thrown and a query will be aborted. [#48246](https://github.com/ClickHouse/ClickHouse/pull/48246) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Do not build set for the right side of `IN` clause with subquery when it is used only for analysis of skip indexes, and they are disabled by setting (`use_skip_indexes=0`). Previously it might affect the performance of queries. [#48299](https://github.com/ClickHouse/ClickHouse/pull/48299) ([Anton Popov](https://github.com/CurtizJ)).
+* Query processing is parallelized right after reading `FROM file(...)`. Related to [#38755](https://github.com/ClickHouse/ClickHouse/issues/38755). [#48525](https://github.com/ClickHouse/ClickHouse/pull/48525) ([Igor Nikonov](https://github.com/devcrafter)). Query processing is parallelized right after reading from any data source. Affected data sources are mostly simple or external storages like table functions `url`, `file`. [#48727](https://github.com/ClickHouse/ClickHouse/pull/48727) ([Igor Nikonov](https://github.com/devcrafter)). This is controlled by the setting `parallelize_output_from_storages` which is not enabled by default.
+* Lowered contention of ThreadPool mutex (may increase performance for a huge amount of small jobs). [#48750](https://github.com/ClickHouse/ClickHouse/pull/48750) ([Sergei Trifonov](https://github.com/serxa)).
+* Reduce memory usage for multiple `ALTER DELETE` mutations. [#48522](https://github.com/ClickHouse/ClickHouse/pull/48522) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Remove the excessive connection attempts if the `skip_unavailable_shards` setting is enabled. [#48771](https://github.com/ClickHouse/ClickHouse/pull/48771) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Experimental Feature
+* Entries in the query cache are now squashed to max_block_size and compressed. [#45912](https://github.com/ClickHouse/ClickHouse/pull/45912) ([Robert Schulze](https://github.com/rschu1ze)).
+* It is now possible to define per-user quotas in the query cache. [#48284](https://github.com/ClickHouse/ClickHouse/pull/48284) ([Robert Schulze](https://github.com/rschu1ze)).
+* Some fixes for parallel replicas [#48433](https://github.com/ClickHouse/ClickHouse/pull/48433) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Implement zero-copy-replication (an experimental feature) on encrypted disks. [#48741](https://github.com/ClickHouse/ClickHouse/pull/48741) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Improvement
+* Increase default value for `connect_timeout_with_failover_ms` to 1000 ms (because of adding async connections in https://github.com/ClickHouse/ClickHouse/pull/47229) . Closes [#5188](https://github.com/ClickHouse/ClickHouse/issues/5188). [#49009](https://github.com/ClickHouse/ClickHouse/pull/49009) ([Kruglov Pavel](https://github.com/Avogar)).
+* Several improvements around data lakes: - Make `Iceberg` work with non-partitioned data. - Support `Iceberg` format version v2 (previously only v1 was supported) - Support reading partitioned data for `DeltaLake`/`Hudi` - Faster reading of `DeltaLake` metadata by using Delta's checkpoint files - Fixed incorrect `Hudi` reads: previously it incorrectly chose which data to read and therefore was able to read correctly only small size tables - Made these engines to pickup updates of changed data (previously the state was set on table creation) - Make proper testing for `Iceberg`/`DeltaLake`/`Hudi` using spark. [#47307](https://github.com/ClickHouse/ClickHouse/pull/47307) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add async connection to socket and async writing to socket. Make creating connections and sending query/external tables async across shards. Refactor code with fibers. Closes [#46931](https://github.com/ClickHouse/ClickHouse/issues/46931). We will be able to increase `connect_timeout_with_failover_ms` by default after this PR (https://github.com/ClickHouse/ClickHouse/issues/5188). [#47229](https://github.com/ClickHouse/ClickHouse/pull/47229) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support config sections `keeper`/`keeper_server` as an alternative to `zookeeper`. Close [#34766](https://github.com/ClickHouse/ClickHouse/issues/34766) , [#34767](https://github.com/ClickHouse/ClickHouse/issues/34767). [#35113](https://github.com/ClickHouse/ClickHouse/pull/35113) ([李扬](https://github.com/taiyang-li)).
+* It is possible to set _secure_ flag in named_collections for a dictionary with a ClickHouse table source. Addresses [#38450](https://github.com/ClickHouse/ClickHouse/issues/38450) . [#46323](https://github.com/ClickHouse/ClickHouse/pull/46323) ([Ilya Golshtein](https://github.com/ilejn)).
+* `bitCount` function support `FixedString` and `String` data type. [#49044](https://github.com/ClickHouse/ClickHouse/pull/49044) ([flynn](https://github.com/ucasfl)).
+* Added configurable retries for all operations with [Zoo]Keeper for Backup queries. [#47224](https://github.com/ClickHouse/ClickHouse/pull/47224) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Enable `use_environment_credentials` for S3 by default, so the entire provider chain is constructed by default. [#47397](https://github.com/ClickHouse/ClickHouse/pull/47397) ([Antonio Andelic](https://github.com/antonio2368)).
+* Currently, the JSON_VALUE function is similar as spark's get_json_object function, which support to get value from JSON string by a path like '$.key'. But still has something different - 1. in spark's get_json_object will return null while the path is not exist, but in JSON_VALUE will return empty string; - 2. in spark's get_json_object will return a complex type value, such as a JSON object/array value, but in JSON_VALUE will return empty string. [#47494](https://github.com/ClickHouse/ClickHouse/pull/47494) ([KevinyhZou](https://github.com/KevinyhZou)).
+* For `use_structure_from_insertion_table_in_table_functions` more flexible insert table structure propagation to table function. Fixed an issue with name mapping and using virtual columns. No more need for 'auto' setting. [#47962](https://github.com/ClickHouse/ClickHouse/pull/47962) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Do not continue retrying to connect to Keeper if the query is killed or over limits. [#47985](https://github.com/ClickHouse/ClickHouse/pull/47985) ([Raúl Marín](https://github.com/Algunenano)).
+* Support Enum output/input in `BSONEachRow`, allow all map key types and avoid extra calculations on output. [#48122](https://github.com/ClickHouse/ClickHouse/pull/48122) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support more ClickHouse types in `ORC`/`Arrow`/`Parquet` formats: Enum(8|16), (U)Int(128|256), Decimal256 (for ORC), allow reading IPv4 from Int32 values (ORC outputs IPv4 as Int32, and we couldn't read it back), fix reading Nullable(IPv6) from binary data for `ORC`. [#48126](https://github.com/ClickHouse/ClickHouse/pull/48126) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add columns `perform_ttl_move_on_insert`, `load_balancing` for table `system.storage_policies`, modify column `volume_type` type to `Enum8`. [#48167](https://github.com/ClickHouse/ClickHouse/pull/48167) ([lizhuoyu5](https://github.com/lzydmxy)).
+* Added support for `BACKUP ALL` command which backups all tables and databases, including temporary and system ones. [#48189](https://github.com/ClickHouse/ClickHouse/pull/48189) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Function mapFromArrays supports `Map` type as an input. [#48207](https://github.com/ClickHouse/ClickHouse/pull/48207) ([李扬](https://github.com/taiyang-li)).
+* The output of some SHOW PROCESSLIST is now sorted. [#48241](https://github.com/ClickHouse/ClickHouse/pull/48241) ([Robert Schulze](https://github.com/rschu1ze)).
+* Per-query/per-server throttling for remote IO/local IO/BACKUPs (server settings: `max_remote_read_network_bandwidth_for_server`, `max_remote_write_network_bandwidth_for_server`, `max_local_read_bandwidth_for_server`, `max_local_write_bandwidth_for_server`, `max_backup_bandwidth_for_server`, settings: `max_remote_read_network_bandwidth`, `max_remote_write_network_bandwidth`, `max_local_read_bandwidth`, `max_local_write_bandwidth`, `max_backup_bandwidth`). [#48242](https://github.com/ClickHouse/ClickHouse/pull/48242) ([Azat Khuzhin](https://github.com/azat)).
+* Support more types in `CapnProto` format: Map, (U)Int(128|256), Decimal(128|256). Allow integer conversions during input/output. [#48257](https://github.com/ClickHouse/ClickHouse/pull/48257) ([Kruglov Pavel](https://github.com/Avogar)).
+* Don't throw CURRENT_WRITE_BUFFER_IS_EXHAUSTED for normal behaviour. [#48288](https://github.com/ClickHouse/ClickHouse/pull/48288) ([Raúl Marín](https://github.com/Algunenano)).
+* Add new setting `keeper_map_strict_mode` which enforces extra guarantees on operations made on top of `KeeperMap` tables. [#48293](https://github.com/ClickHouse/ClickHouse/pull/48293) ([Antonio Andelic](https://github.com/antonio2368)).
+* Check primary key type for simple dictionary is native unsigned integer type Add setting `check_dictionary_primary_key ` for compatibility(set `check_dictionary_primary_key =false` to disable checking). [#48335](https://github.com/ClickHouse/ClickHouse/pull/48335) ([lizhuoyu5](https://github.com/lzydmxy)).
+* Don't replicate mutations for `KeeperMap` because it's unnecessary. [#48354](https://github.com/ClickHouse/ClickHouse/pull/48354) ([Antonio Andelic](https://github.com/antonio2368)).
+* Allow to write/read unnamed tuple as nested Message in Protobuf format. Tuple elements and Message fields are matched by position. [#48390](https://github.com/ClickHouse/ClickHouse/pull/48390) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support `additional_table_filters` and `additional_result_filter` settings in the new planner. Also, add a documentation entry for `additional_result_filter`. [#48405](https://github.com/ClickHouse/ClickHouse/pull/48405) ([Dmitry Novik](https://github.com/novikd)).
+* `parseDateTime` now understands format string '%f' (fractional seconds). [#48420](https://github.com/ClickHouse/ClickHouse/pull/48420) ([Robert Schulze](https://github.com/rschu1ze)).
+* Format string "%f" in formatDateTime() now prints "000000" if the formatted value has no fractional seconds, the previous behavior (single zero) can be restored using setting "formatdatetime_f_prints_single_zero = 1". [#48422](https://github.com/ClickHouse/ClickHouse/pull/48422) ([Robert Schulze](https://github.com/rschu1ze)).
+* Don't replicate DELETE and TRUNCATE for KeeperMap. [#48434](https://github.com/ClickHouse/ClickHouse/pull/48434) ([Antonio Andelic](https://github.com/antonio2368)).
+* Generate valid Decimals and Bools in generateRandom function. [#48436](https://github.com/ClickHouse/ClickHouse/pull/48436) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow trailing commas in expression list of SELECT query, for example `SELECT a, b, c, FROM table`. Closes [#37802](https://github.com/ClickHouse/ClickHouse/issues/37802). [#48438](https://github.com/ClickHouse/ClickHouse/pull/48438) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Override `CLICKHOUSE_USER` and `CLICKHOUSE_PASSWORD` environment variables with `--user` and `--password` client parameters. Closes [#38909](https://github.com/ClickHouse/ClickHouse/issues/38909). [#48440](https://github.com/ClickHouse/ClickHouse/pull/48440) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Added retries to loading of data parts in `MergeTree` tables in case of retryable errors. [#48442](https://github.com/ClickHouse/ClickHouse/pull/48442) ([Anton Popov](https://github.com/CurtizJ)).
+* Add support for `Date`, `Date32`, `DateTime`, `DateTime64` data types to `arrayMin`, `arrayMax`, `arrayDifference` functions. Closes [#21645](https://github.com/ClickHouse/ClickHouse/issues/21645). [#48445](https://github.com/ClickHouse/ClickHouse/pull/48445) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Add support for `{server_uuid}` macro. It is useful for identifying replicas in autoscaled clusters when new replicas are constantly added and removed in runtime. This closes [#48554](https://github.com/ClickHouse/ClickHouse/issues/48554). [#48563](https://github.com/ClickHouse/ClickHouse/pull/48563) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The installation script will create a hard link instead of copying if it is possible. [#48578](https://github.com/ClickHouse/ClickHouse/pull/48578) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support `SHOW TABLE` syntax meaning the same as `SHOW CREATE TABLE`. Closes [#48580](https://github.com/ClickHouse/ClickHouse/issues/48580). [#48591](https://github.com/ClickHouse/ClickHouse/pull/48591) ([flynn](https://github.com/ucasfl)).
+* HTTP temporary buffers now support working by evicting data from the virtual filesystem cache. [#48664](https://github.com/ClickHouse/ClickHouse/pull/48664) ([Vladimir C](https://github.com/vdimir)).
+* Make Schema inference works for `CREATE AS SELECT`. Closes [#47599](https://github.com/ClickHouse/ClickHouse/issues/47599). [#48679](https://github.com/ClickHouse/ClickHouse/pull/48679) ([flynn](https://github.com/ucasfl)).
+* Added a `replicated_max_mutations_in_one_entry` setting for `ReplicatedMergeTree` that allows limiting the number of mutation commands per one `MUTATE_PART` entry (default is 10000). [#48731](https://github.com/ClickHouse/ClickHouse/pull/48731) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* In AggregateFunction types, don't count unused arena bytes as `read_bytes`. [#48745](https://github.com/ClickHouse/ClickHouse/pull/48745) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix some MySQL-related settings not being handled with the MySQL dictionary source + named collection. Closes [#48402](https://github.com/ClickHouse/ClickHouse/issues/48402). [#48759](https://github.com/ClickHouse/ClickHouse/pull/48759) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* If a user set `max_single_part_upload_size` to a very large value, it can lead to a crash due to a bug in the AWS S3 SDK. This fixes [#47679](https://github.com/ClickHouse/ClickHouse/issues/47679). [#48816](https://github.com/ClickHouse/ClickHouse/pull/48816) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix data race in `RabbitMQ` ([report](https://pastila.nl/?004f7100/de1505289ab5bb355e67ebe6c7cc8707)), refactor the code. [#48845](https://github.com/ClickHouse/ClickHouse/pull/48845) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add aliases `name` and `part_name` form `system.parts` and `system.part_log`. Closes [#48718](https://github.com/ClickHouse/ClickHouse/issues/48718). [#48850](https://github.com/ClickHouse/ClickHouse/pull/48850) ([sichenzhao](https://github.com/sichenzhao)).
+* Functions "arrayDifferenceSupport()", "arrayCumSum()" and "arrayCumSumNonNegative()" now support input arrays of wide integer types (U)Int128/256. [#48866](https://github.com/ClickHouse/ClickHouse/pull/48866) ([cluster](https://github.com/infdahai)).
+* Multi-line history in clickhouse-client is now no longer padded. This makes pasting more natural. [#48870](https://github.com/ClickHouse/ClickHouse/pull/48870) ([Joanna Hulboj](https://github.com/jh0x)).
+* Implement a slight improvement for the rare case when ClickHouse is run inside LXC and LXCFS is used. The LXCFS has an issue: sometimes it returns an error "Transport endpoint is not connected" on reading from the file inside `/proc`. This error was correctly logged into ClickHouse's server log. We have additionally workaround this issue by reopening a file. This is a minuscule change. [#48922](https://github.com/ClickHouse/ClickHouse/pull/48922) ([Real](https://github.com/RunningXie)).
+* Improve memory accounting for prefetches. Randomise prefetch settings In CI. [#48973](https://github.com/ClickHouse/ClickHouse/pull/48973) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Correctly set headers for native copy operations on GCS. [#48981](https://github.com/ClickHouse/ClickHouse/pull/48981) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add support for specifying setting names in the command line with dashes instead of underscores, for example, `--max-threads` instead of `--max_threads`. Additionally, support Unicode dash characters like `—` instead of `--` - this is useful when you communicate with a team in another company, and a manager from that team copy-pasted code from MS Word. [#48985](https://github.com/ClickHouse/ClickHouse/pull/48985) ([alekseygolub](https://github.com/alekseygolub)).
+* Add fallback to password authentication when authentication with SSL user certificate has failed. Closes [#48974](https://github.com/ClickHouse/ClickHouse/issues/48974). [#48989](https://github.com/ClickHouse/ClickHouse/pull/48989) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Improve the embedded dashboard. Close [#46671](https://github.com/ClickHouse/ClickHouse/issues/46671). [#49036](https://github.com/ClickHouse/ClickHouse/pull/49036) ([Kevin Zhang](https://github.com/Kinzeng)).
+* Add profile events for log messages, so you can easily see the count of log messages by severity. [#49042](https://github.com/ClickHouse/ClickHouse/pull/49042) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* In previous versions, the `LineAsString` format worked inconsistently when the parallel parsing was enabled or not, in presence of DOS or macOS Classic line breaks. This closes [#49039](https://github.com/ClickHouse/ClickHouse/issues/49039). [#49052](https://github.com/ClickHouse/ClickHouse/pull/49052) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The exception message about the unparsed query parameter will also tell about the name of the parameter. Reimplement [#48878](https://github.com/ClickHouse/ClickHouse/issues/48878). Close [#48772](https://github.com/ClickHouse/ClickHouse/issues/48772). [#49061](https://github.com/ClickHouse/ClickHouse/pull/49061) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### Build/Testing/Packaging Improvement
+* Update time zones. The following were updated: Africa/Cairo, Africa/Casablanca, Africa/El_Aaiun, America/Bogota, America/Cambridge_Bay, America/Ciudad_Juarez, America/Godthab, America/Inuvik, America/Iqaluit, America/Nuuk, America/Ojinaga, America/Pangnirtung, America/Rankin_Inlet, America/Resolute, America/Whitehorse, America/Yellowknife, Asia/Gaza, Asia/Hebron, Asia/Kuala_Lumpur, Asia/Singapore, Canada/Yukon, Egypt, Europe/Kirov, Europe/Volgograd, Singapore. [#48572](https://github.com/ClickHouse/ClickHouse/pull/48572) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Reduce the number of dependencies in the header files to speed up the build. [#47984](https://github.com/ClickHouse/ClickHouse/pull/47984) ([Dmitry Novik](https://github.com/novikd)).
+* Randomize compression of marks and indices in tests. [#48286](https://github.com/ClickHouse/ClickHouse/pull/48286) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Bump internal ZSTD from 1.5.4 to 1.5.5. [#46797](https://github.com/ClickHouse/ClickHouse/pull/46797) ([Robert Schulze](https://github.com/rschu1ze)).
+* Randomize vertical merges from compact to wide parts in tests. [#48287](https://github.com/ClickHouse/ClickHouse/pull/48287) ([Raúl Marín](https://github.com/Algunenano)).
+* Support for CRC32 checksum in HDFS. Fix performance issues. [#48614](https://github.com/ClickHouse/ClickHouse/pull/48614) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove remainders of GCC support. [#48671](https://github.com/ClickHouse/ClickHouse/pull/48671) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add CI run with new analyzer infrastructure enabled. [#48719](https://github.com/ClickHouse/ClickHouse/pull/48719) ([Dmitry Novik](https://github.com/novikd)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix system.query_views_log for MVs that are pushed from background threads [#46668](https://github.com/ClickHouse/ClickHouse/pull/46668) ([Azat Khuzhin](https://github.com/azat)).
+* Fix several `RENAME COLUMN` bugs [#46946](https://github.com/ClickHouse/ClickHouse/pull/46946) ([alesapin](https://github.com/alesapin)).
+* Fix minor hiliting issues in clickhouse-format [#47610](https://github.com/ClickHouse/ClickHouse/pull/47610) ([Natasha Murashkina](https://github.com/murfel)).
+* Fix a bug in LLVM's libc++ leading to a crash for uploading parts to S3 which size is greater than INT_MAX [#47693](https://github.com/ClickHouse/ClickHouse/pull/47693) ([Azat Khuzhin](https://github.com/azat)).
+* Fix overflow in the `sparkbar` function [#48121](https://github.com/ClickHouse/ClickHouse/pull/48121) ([Vladimir C](https://github.com/vdimir)).
+* Fix race in S3 [#48190](https://github.com/ClickHouse/ClickHouse/pull/48190) ([Anton Popov](https://github.com/CurtizJ)).
+* Disable JIT for aggregate functions due to inconsistent behavior [#48195](https://github.com/ClickHouse/ClickHouse/pull/48195) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix alter formatting (minor) [#48289](https://github.com/ClickHouse/ClickHouse/pull/48289) ([Natasha Murashkina](https://github.com/murfel)).
+* Fix CPU usage in RabbitMQ (was worsened in 23.2 after [#44404](https://github.com/ClickHouse/ClickHouse/issues/44404)) [#48311](https://github.com/ClickHouse/ClickHouse/pull/48311) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix crash in EXPLAIN PIPELINE for Merge over Distributed [#48320](https://github.com/ClickHouse/ClickHouse/pull/48320) ([Azat Khuzhin](https://github.com/azat)).
+* Fix serializing LowCardinality as Arrow dictionary [#48361](https://github.com/ClickHouse/ClickHouse/pull/48361) ([Kruglov Pavel](https://github.com/Avogar)).
+* Reset downloader for cache file segment in TemporaryFileStream [#48386](https://github.com/ClickHouse/ClickHouse/pull/48386) ([Vladimir C](https://github.com/vdimir)).
+* Fix possible SYSTEM SYNC REPLICA stuck in case of DROP/REPLACE PARTITION [#48391](https://github.com/ClickHouse/ClickHouse/pull/48391) ([Azat Khuzhin](https://github.com/azat)).
+* Fix a startup error when loading a distributed table that depends on a dictionary [#48419](https://github.com/ClickHouse/ClickHouse/pull/48419) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Don't check dependencies when renaming system tables automatically [#48431](https://github.com/ClickHouse/ClickHouse/pull/48431) ([Raúl Marín](https://github.com/Algunenano)).
+* Update only affected rows in KeeperMap storage [#48435](https://github.com/ClickHouse/ClickHouse/pull/48435) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix possible segfault in the VFS cache [#48469](https://github.com/ClickHouse/ClickHouse/pull/48469) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* `toTimeZone` function throws an error when no constant string is provided [#48471](https://github.com/ClickHouse/ClickHouse/pull/48471) ([Jordi Villar](https://github.com/jrdi)).
+* Fix logical error with IPv4 in Protobuf, add support for Date32 [#48486](https://github.com/ClickHouse/ClickHouse/pull/48486) ([Kruglov Pavel](https://github.com/Avogar)).
+* "changed" flag in system.settings was calculated incorrectly for settings with multiple values [#48516](https://github.com/ClickHouse/ClickHouse/pull/48516) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix storage `Memory` with enabled compression [#48517](https://github.com/ClickHouse/ClickHouse/pull/48517) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix bracketed-paste mode messing up password input in the event of client reconnection [#48528](https://github.com/ClickHouse/ClickHouse/pull/48528) ([Michael Kolupaev](https://github.com/al13n321)).
+* Fix nested map for keys of IP and UUID types [#48556](https://github.com/ClickHouse/ClickHouse/pull/48556) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix an uncaught exception in case of parallel loader for hashed dictionaries [#48571](https://github.com/ClickHouse/ClickHouse/pull/48571) ([Azat Khuzhin](https://github.com/azat)).
+* The `groupArray` aggregate function correctly works for empty result over nullable types [#48593](https://github.com/ClickHouse/ClickHouse/pull/48593) ([lgbo](https://github.com/lgbo-ustc)).
+* Fix bug in Keeper when a node is not created with scheme `auth` in ACL sometimes. [#48595](https://github.com/ClickHouse/ClickHouse/pull/48595) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Allow IPv4 comparison operators with UInt [#48611](https://github.com/ClickHouse/ClickHouse/pull/48611) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix possible error from cache [#48636](https://github.com/ClickHouse/ClickHouse/pull/48636) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Async inserts with empty data will no longer throw exception. [#48663](https://github.com/ClickHouse/ClickHouse/pull/48663) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix table dependencies in case of failed RENAME TABLE [#48683](https://github.com/ClickHouse/ClickHouse/pull/48683) ([Azat Khuzhin](https://github.com/azat)).
+* If the primary key has duplicate columns (which is only possible for projections), in previous versions it might lead to a bug [#48838](https://github.com/ClickHouse/ClickHouse/pull/48838) ([Amos Bird](https://github.com/amosbird)).
+* Fix for a race condition in ZooKeeper when joining send_thread/receive_thread [#48849](https://github.com/ClickHouse/ClickHouse/pull/48849) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix unexpected part name error when trying to drop a ignored detached part with zero copy replication [#48862](https://github.com/ClickHouse/ClickHouse/pull/48862) ([Michael Lex](https://github.com/mlex)).
+* Fix reading `Date32` Parquet/Arrow column into not a `Date32` column [#48864](https://github.com/ClickHouse/ClickHouse/pull/48864) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix `UNKNOWN_IDENTIFIER` error while selecting from table with row policy and column with dots [#48976](https://github.com/ClickHouse/ClickHouse/pull/48976) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix aggregation by empty nullable strings [#48999](https://github.com/ClickHouse/ClickHouse/pull/48999) ([LiuNeng](https://github.com/liuneng1994)).
+
+### <a id="233"></a> ClickHouse release 23.3 LTS, 2023-03-30
+
+#### Upgrade Notes
+* Lightweight DELETEs are production ready and enabled by default. The `DELETE` query for MergeTree tables is now available by default.
+* The behavior of `*domain*RFC` and `netloc` functions is slightly changed: relaxed the set of symbols that are allowed in the URL authority for better conformance. [#46841](https://github.com/ClickHouse/ClickHouse/pull/46841) ([Azat Khuzhin](https://github.com/azat)).
+* Prohibited creating tables based on KafkaEngine with DEFAULT/EPHEMERAL/ALIAS/MATERIALIZED statements for columns. [#47138](https://github.com/ClickHouse/ClickHouse/pull/47138) ([Aleksandr Musorin](https://github.com/AVMusorin)).
+* An "asynchronous connection drain" feature is removed. Related settings and metrics are removed as well. It was an internal feature, so the removal should not affect users who had never heard about that feature. [#47486](https://github.com/ClickHouse/ClickHouse/pull/47486) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Support 256-bit Decimal data type (more than 38 digits) in `arraySum`/`Min`/`Max`/`Avg`/`Product`, `arrayCumSum`/`CumSumNonNegative`, `arrayDifference`, array construction, IN operator, query parameters, `groupArrayMovingSum`, statistical functions, `min`/`max`/`any`/`argMin`/`argMax`, PostgreSQL wire protocol, MySQL table engine and function, `sumMap`, `mapAdd`, `mapSubtract`, `arrayIntersect`. Add support for big integers in `arrayIntersect`. Statistical aggregate functions involving moments (such as `corr` or various `TTest`s) will use `Float64` as their internal representation (they were using `Decimal128` before this change, but it was pointless), and these functions can return `nan` instead of `inf` in case of infinite variance. Some functions were allowed on `Decimal256` data types but returned `Decimal128` in previous versions - now it is fixed. This closes [#47569](https://github.com/ClickHouse/ClickHouse/issues/47569). This closes [#44864](https://github.com/ClickHouse/ClickHouse/issues/44864). This closes [#28335](https://github.com/ClickHouse/ClickHouse/issues/28335). [#47594](https://github.com/ClickHouse/ClickHouse/pull/47594) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Make backup_threads/restore_threads server settings (instead of user settings). [#47881](https://github.com/ClickHouse/ClickHouse/pull/47881) ([Azat Khuzhin](https://github.com/azat)).
+* Do not allow const and non-deterministic secondary indices [#46839](https://github.com/ClickHouse/ClickHouse/pull/46839) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### New Feature
+* Add a new mode for splitting the work on replicas using settings `parallel_replicas_custom_key` and `parallel_replicas_custom_key_filter_type`. If the cluster consists of a single shard with multiple replicas, up to `max_parallel_replicas` will be randomly picked and turned into shards. For each shard, a corresponding filter is added to the query on the initiator before being sent to the shard. If the cluster consists of multiple shards, it will behave the same as `sample_key` but with the possibility to define an arbitrary key. [#45108](https://github.com/ClickHouse/ClickHouse/pull/45108) ([Antonio Andelic](https://github.com/antonio2368)).
+* An option to display partial result on cancel: Added query setting `partial_result_on_first_cancel` allowing the canceled query (e.g. due to Ctrl-C) to return a partial result. [#45689](https://github.com/ClickHouse/ClickHouse/pull/45689) ([Alexey Perevyshin](https://github.com/alexX512)).
+* Added support of arbitrary tables engines for temporary tables (except for Replicated and KeeperMap engines). Close [#31497](https://github.com/ClickHouse/ClickHouse/issues/31497). [#46071](https://github.com/ClickHouse/ClickHouse/pull/46071) ([Roman Vasin](https://github.com/rvasin)).
+* Add support for replication of user-defined SQL functions using centralized storage in Keeper. [#46085](https://github.com/ClickHouse/ClickHouse/pull/46085) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Implement `system.server_settings` (similar to `system.settings`), which will contain server configurations. [#46550](https://github.com/ClickHouse/ClickHouse/pull/46550) ([pufit](https://github.com/pufit)).
+* Support for `UNDROP TABLE` query. Closes [#46811](https://github.com/ClickHouse/ClickHouse/issues/46811). [#47241](https://github.com/ClickHouse/ClickHouse/pull/47241) ([chen](https://github.com/xiedeyantu)).
+* Allow separate grants for named collections (e.g. to be able to give `SHOW/CREATE/ALTER/DROP named collection` access only to certain collections, instead of all at once). Closes [#40894](https://github.com/ClickHouse/ClickHouse/issues/40894). Add new access type `NAMED_COLLECTION_CONTROL` which is not given to user default unless explicitly added to the user config (is required to be able to do `GRANT ALL`), also `show_named_collections` is no longer obligatory to be manually specified for user default to be able to have full access rights as was in 23.2. [#46241](https://github.com/ClickHouse/ClickHouse/pull/46241) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Allow nested custom disks. Previously custom disks supported only flat disk structure. [#47106](https://github.com/ClickHouse/ClickHouse/pull/47106) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Introduce a function `widthBucket` (with a `WIDTH_BUCKET` alias for compatibility). [#42974](https://github.com/ClickHouse/ClickHouse/issues/42974). [#46790](https://github.com/ClickHouse/ClickHouse/pull/46790) ([avoiderboi](https://github.com/avoiderboi)).
+* Add new function `parseDateTime`/`parseDateTimeInJodaSyntax` according to the specified format string. parseDateTime parses String to DateTime in MySQL syntax, parseDateTimeInJodaSyntax parses in Joda syntax. [#46815](https://github.com/ClickHouse/ClickHouse/pull/46815) ([李扬](https://github.com/taiyang-li)).
+* Use `dummy UInt8` for the default structure of table function `null`. Closes [#46930](https://github.com/ClickHouse/ClickHouse/issues/46930). [#47006](https://github.com/ClickHouse/ClickHouse/pull/47006) ([flynn](https://github.com/ucasfl)).
+* Support for date format with a comma, like `Dec 15, 2021` in the `parseDateTimeBestEffort` function. Closes [#46816](https://github.com/ClickHouse/ClickHouse/issues/46816). [#47071](https://github.com/ClickHouse/ClickHouse/pull/47071) ([chen](https://github.com/xiedeyantu)).
+* Add settings `http_wait_end_of_query` and `http_response_buffer_size` that corresponds to URL params `wait_end_of_query` and `buffer_size` for the HTTP interface. This allows changing these settings in the profiles. [#47108](https://github.com/ClickHouse/ClickHouse/pull/47108) ([Vladimir C](https://github.com/vdimir)).
+* Add `system.dropped_tables` table that shows tables that were dropped from `Atomic` databases but were not completely removed yet. [#47364](https://github.com/ClickHouse/ClickHouse/pull/47364) ([chen](https://github.com/xiedeyantu)).
+* Add `INSTR` as alias of `positionCaseInsensitive` for MySQL compatibility. Closes [#47529](https://github.com/ClickHouse/ClickHouse/issues/47529). [#47535](https://github.com/ClickHouse/ClickHouse/pull/47535) ([flynn](https://github.com/ucasfl)).
+* Added `toDecimalString` function allowing to convert numbers to string with fixed precision. [#47838](https://github.com/ClickHouse/ClickHouse/pull/47838) ([Andrey Zvonov](https://github.com/zvonand)).
+* Add a merge tree setting `max_number_of_mutations_for_replica`. It limits the number of part mutations per replica to the specified amount. Zero means no limit on the number of mutations per replica (the execution can still be constrained by other settings). [#48047](https://github.com/ClickHouse/ClickHouse/pull/48047) ([Vladimir C](https://github.com/vdimir)).
+* Add the Map-related function `mapFromArrays`, which allows the creation of a map from a pair of arrays. [#31125](https://github.com/ClickHouse/ClickHouse/pull/31125) ([李扬](https://github.com/taiyang-li)).
+* Allow control of compression in Parquet/ORC/Arrow output formats, adds support for more compression input formats. This closes [#13541](https://github.com/ClickHouse/ClickHouse/issues/13541). [#47114](https://github.com/ClickHouse/ClickHouse/pull/47114) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add SSL User Certificate authentication to the native protocol. Closes [#47077](https://github.com/ClickHouse/ClickHouse/issues/47077). [#47596](https://github.com/ClickHouse/ClickHouse/pull/47596) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Add *OrNull() and *OrZero() variants for `parseDateTime`, add alias `str_to_date` for MySQL parity. [#48000](https://github.com/ClickHouse/ClickHouse/pull/48000) ([Robert Schulze](https://github.com/rschu1ze)).
+* Added operator `REGEXP` (similar to operators "LIKE", "IN", "MOD" etc.) for better compatibility with MySQL [#47869](https://github.com/ClickHouse/ClickHouse/pull/47869) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### Performance Improvement
+* Marks in memory are now compressed, using 3-6x less memory. [#47290](https://github.com/ClickHouse/ClickHouse/pull/47290) ([Michael Kolupaev](https://github.com/al13n321)).
+* Backups for large numbers of files were unbelievably slow in previous versions. Not anymore. Now they are unbelievably fast. [#47251](https://github.com/ClickHouse/ClickHouse/pull/47251) ([Alexey Milovidov](https://github.com/alexey-milovidov)). Introduced a separate thread pool for backup's IO operations. This will allow scaling it independently of other pools and increase performance. [#47174](https://github.com/ClickHouse/ClickHouse/pull/47174) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)). Use MultiRead request and retries for collecting metadata at the final stage of backup processing. [#47243](https://github.com/ClickHouse/ClickHouse/pull/47243) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)). If a backup and restoring data are both in S3 then server-side copy should be used from now on. [#47546](https://github.com/ClickHouse/ClickHouse/pull/47546) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed excessive reading in queries with `FINAL`. [#47801](https://github.com/ClickHouse/ClickHouse/pull/47801) ([Nikita Taranov](https://github.com/nickitat)).
+* Setting `max_final_threads` would be set to the number of cores at server startup (by the same algorithm as used for `max_threads`). This improves the concurrency of `final` execution on servers with high number of CPUs. [#47915](https://github.com/ClickHouse/ClickHouse/pull/47915) ([Nikita Taranov](https://github.com/nickitat)).
+* Allow executing reading pipeline for DIRECT dictionary with CLICKHOUSE source in multiple threads. To enable set `dictionary_use_async_executor=1` in `SETTINGS` section for source in `CREATE DICTIONARY` statement. [#47986](https://github.com/ClickHouse/ClickHouse/pull/47986) ([Vladimir C](https://github.com/vdimir)).
+* Optimize one nullable key aggregate performance. [#45772](https://github.com/ClickHouse/ClickHouse/pull/45772) ([LiuNeng](https://github.com/liuneng1994)).
+* Implemented lowercase `tokenbf_v1` index utilization for `hasTokenOrNull`, `hasTokenCaseInsensitive` and `hasTokenCaseInsensitiveOrNull`. [#46252](https://github.com/ClickHouse/ClickHouse/pull/46252) ([ltrk2](https://github.com/ltrk2)).
+* Optimize functions `position` and `LIKE` by searching the first two chars using SIMD. [#46289](https://github.com/ClickHouse/ClickHouse/pull/46289) ([Jiebin Sun](https://github.com/jiebinn)).
+* Optimize queries from the `system.detached_parts`, which could be significantly large. Added several sources with respect to the block size limitation; in each block, an IO thread pool is used to calculate the part size, i.e. to make syscalls in parallel. [#46624](https://github.com/ClickHouse/ClickHouse/pull/46624) ([Sema Checherinda](https://github.com/CheSema)).
+* Increase the default value of `max_replicated_merges_in_queue` for ReplicatedMergeTree tables from 16 to 1000. It allows faster background merge operation on clusters with a very large number of replicas, such as clusters with shared storage in ClickHouse Cloud. [#47050](https://github.com/ClickHouse/ClickHouse/pull/47050) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Updated `clickhouse-copier` to use `GROUP BY` instead of `DISTINCT` to get the list of partitions. For large tables, this reduced the select time from over 500s to under 1s. [#47386](https://github.com/ClickHouse/ClickHouse/pull/47386) ([Clayton McClure](https://github.com/cmcclure-twilio)).
+* Fix performance degradation in `ASOF JOIN`. [#47544](https://github.com/ClickHouse/ClickHouse/pull/47544) ([Ongkong](https://github.com/ongkong)).
+* Even more batching in Keeper. Improve performance by avoiding breaking batches on read requests. [#47978](https://github.com/ClickHouse/ClickHouse/pull/47978) ([Antonio Andelic](https://github.com/antonio2368)).
+* Allow PREWHERE for Merge with different DEFAULT expressions for columns. [#46831](https://github.com/ClickHouse/ClickHouse/pull/46831) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Experimental Feature
+* Parallel replicas: Improved the overall performance by better utilizing the local replica, and forbid the reading with parallel replicas from non-replicated MergeTree by default. [#47858](https://github.com/ClickHouse/ClickHouse/pull/47858) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Support filter push down to left table for JOIN with `Join`, `Dictionary` and `EmbeddedRocksDB` tables if the experimental Analyzer is enabled. [#47280](https://github.com/ClickHouse/ClickHouse/pull/47280) ([Maksim Kita](https://github.com/kitaisreal)).
+* Now ReplicatedMergeTree with zero copy replication has less load to Keeper. [#47676](https://github.com/ClickHouse/ClickHouse/pull/47676) ([alesapin](https://github.com/alesapin)).
+* Fix create materialized view with MaterializedPostgreSQL [#40807](https://github.com/ClickHouse/ClickHouse/pull/40807) ([Maksim Buren](https://github.com/maks-buren630501)).
+
+#### Improvement
+* Enable `input_format_json_ignore_unknown_keys_in_named_tuple` by default. [#46742](https://github.com/ClickHouse/ClickHouse/pull/46742) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow errors to be ignored while pushing to MATERIALIZED VIEW (add new setting `materialized_views_ignore_errors`, by default to `false`, but it is set to `true` for flushing logs to `system.*_log` tables unconditionally). [#46658](https://github.com/ClickHouse/ClickHouse/pull/46658) ([Azat Khuzhin](https://github.com/azat)).
+* Track the file queue of distributed sends in memory. [#45491](https://github.com/ClickHouse/ClickHouse/pull/45491) ([Azat Khuzhin](https://github.com/azat)).
+* Now `X-ClickHouse-Query-Id` and `X-ClickHouse-Timezone` headers are added to responses in all queries via HTTP protocol. Previously it was done only for `SELECT` queries. [#46364](https://github.com/ClickHouse/ClickHouse/pull/46364) ([Anton Popov](https://github.com/CurtizJ)).
+* External tables from `MongoDB`: support for connection to a replica set via a URI with a host:port enum and support for the readPreference option in MongoDB dictionaries. Example URI: mongodb://db0.example.com:27017,db1.example.com:27017,db2.example.com:27017/?replicaSet=myRepl&readPreference=primary. [#46524](https://github.com/ClickHouse/ClickHouse/pull/46524) ([artem-yadr](https://github.com/artem-yadr)).
+* This improvement should be invisible for users. Re-implement projection analysis on top of query plan. Added setting `query_plan_optimize_projection=1` to switch between old and new version. Fixes [#44963](https://github.com/ClickHouse/ClickHouse/issues/44963). [#46537](https://github.com/ClickHouse/ClickHouse/pull/46537) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Use Parquet format v2 instead of v1 in output format by default. Add setting `output_format_parquet_version` to control parquet version, possible values `1.0`, `2.4`, `2.6`, `2.latest` (default). [#46617](https://github.com/ClickHouse/ClickHouse/pull/46617) ([Kruglov Pavel](https://github.com/Avogar)).
+* It is now possible to use the new configuration syntax to configure Kafka topics with periods (`.`) in their name. [#46752](https://github.com/ClickHouse/ClickHouse/pull/46752) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix heuristics that check hyperscan patterns for problematic repeats. [#46819](https://github.com/ClickHouse/ClickHouse/pull/46819) ([Robert Schulze](https://github.com/rschu1ze)).
+* Don't report ZK node exists to system.errors when a block was created concurrently by a different replica. [#46820](https://github.com/ClickHouse/ClickHouse/pull/46820) ([Raúl Marín](https://github.com/Algunenano)).
+* Increase the limit for opened files in `clickhouse-local`. It will be able to read from `web` tables on servers with a huge number of CPU cores. Do not back off reading from the URL table engine in case of too many opened files. This closes [#46852](https://github.com/ClickHouse/ClickHouse/issues/46852). [#46853](https://github.com/ClickHouse/ClickHouse/pull/46853) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Exceptions thrown when numbers cannot be parsed now have an easier-to-read exception message. [#46917](https://github.com/ClickHouse/ClickHouse/pull/46917) ([Robert Schulze](https://github.com/rschu1ze)).
+* Added update `system.backups` after every processed task to track the progress of backups. [#46989](https://github.com/ClickHouse/ClickHouse/pull/46989) ([Aleksandr Musorin](https://github.com/AVMusorin)).
+* Allow types conversion in Native input format. Add settings `input_format_native_allow_types_conversion` that controls it (enabled by default). [#46990](https://github.com/ClickHouse/ClickHouse/pull/46990) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow IPv4 in the `range` function to generate IP ranges. [#46995](https://github.com/ClickHouse/ClickHouse/pull/46995) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Improve exception message when it's impossible to move a part from one volume/disk to another. [#47032](https://github.com/ClickHouse/ClickHouse/pull/47032) ([alesapin](https://github.com/alesapin)).
+* Support `Bool` type in `JSONType` function. Previously `Null` type was mistakenly returned for bool values. [#47046](https://github.com/ClickHouse/ClickHouse/pull/47046) ([Anton Popov](https://github.com/CurtizJ)).
+* Use `_request_body` parameter to configure predefined HTTP queries. [#47086](https://github.com/ClickHouse/ClickHouse/pull/47086) ([Constantine Peresypkin](https://github.com/pkit)).
+* Automatic indentation in the built-in UI SQL editor when Enter is pressed. [#47113](https://github.com/ClickHouse/ClickHouse/pull/47113) ([Alexey Korepanov](https://github.com/alexkorep)).
+* Self-extraction with 'sudo' will attempt to set uid and gid of extracted files to running user. [#47116](https://github.com/ClickHouse/ClickHouse/pull/47116) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Previously, the `repeat` function's second argument only accepted an unsigned integer type, which meant it could not accept values such as -1. This behavior differed from that of the Spark function. In this update, the repeat function has been modified to match the behavior of the Spark function. It now accepts the same types of inputs, including negative integers. Extensive testing has been performed to verify the correctness of the updated implementation. [#47134](https://github.com/ClickHouse/ClickHouse/pull/47134) ([KevinyhZou](https://github.com/KevinyhZou)). Note: the changelog entry was rewritten by ChatGPT.
+* Remove `::__1` part from stacktraces. Display `std::basic_string<char, ...` as `String` in stacktraces. [#47171](https://github.com/ClickHouse/ClickHouse/pull/47171) ([Mike Kot](https://github.com/myrrc)).
+* Reimplement interserver mode to avoid replay attacks (note, that change is backward compatible with older servers). [#47213](https://github.com/ClickHouse/ClickHouse/pull/47213) ([Azat Khuzhin](https://github.com/azat)).
+* Improve recognition of regular expression groups and refine the regexp_tree dictionary. [#47218](https://github.com/ClickHouse/ClickHouse/pull/47218) ([Han Fei](https://github.com/hanfei1991)).
+* Keeper improvement: Add new 4LW `clrs` to clean resources used by Keeper (e.g. release unused memory). [#47256](https://github.com/ClickHouse/ClickHouse/pull/47256) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add optional arguments to codecs `DoubleDelta(bytes_size)`, `Gorilla(bytes_size)`, `FPC(level, float_size)`, this allows using these codecs without column type in `clickhouse-compressor`. Fix possible aborts and arithmetic errors in `clickhouse-compressor` with these codecs. Fixes: https://github.com/ClickHouse/ClickHouse/discussions/47262. [#47271](https://github.com/ClickHouse/ClickHouse/pull/47271) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add support for big int types to the `runningDifference` function. Closes [#47194](https://github.com/ClickHouse/ClickHouse/issues/47194). [#47322](https://github.com/ClickHouse/ClickHouse/pull/47322) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Add an expiration window for S3 credentials that have an expiration time to avoid `ExpiredToken` errors in some edge cases. It can be controlled with `expiration_window_seconds` config, the default is 120 seconds. [#47423](https://github.com/ClickHouse/ClickHouse/pull/47423) ([Antonio Andelic](https://github.com/antonio2368)).
+* Support Decimals and Date32 in `Avro` format. [#47434](https://github.com/ClickHouse/ClickHouse/pull/47434) ([Kruglov Pavel](https://github.com/Avogar)).
+* Do not start the server if an interrupted conversion from `Ordinary` to `Atomic` was detected, print a better error message with troubleshooting instructions. [#47487](https://github.com/ClickHouse/ClickHouse/pull/47487) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add a new column `kind` to the `system.opentelemetry_span_log`. This column holds the value of [SpanKind](https://opentelemetry.io/docs/reference/specification/trace/api/#spankind) defined in OpenTelemtry. [#47499](https://github.com/ClickHouse/ClickHouse/pull/47499) ([Frank Chen](https://github.com/FrankChen021)).
+* Allow reading/writing nested arrays in `Protobuf` format with only the root field name as column name. Previously column name should've contained all nested field names (like `a.b.c Array(Array(Array(UInt32)))`, now you can use just `a Array(Array(Array(UInt32)))`. [#47650](https://github.com/ClickHouse/ClickHouse/pull/47650) ([Kruglov Pavel](https://github.com/Avogar)).
+* Added an optional `STRICT` modifier for `SYSTEM SYNC REPLICA` which makes the query wait for the replication queue to become empty (just like it worked before https://github.com/ClickHouse/ClickHouse/pull/45648). [#47659](https://github.com/ClickHouse/ClickHouse/pull/47659) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Improve the naming of some OpenTelemetry span logs. [#47667](https://github.com/ClickHouse/ClickHouse/pull/47667) ([Frank Chen](https://github.com/FrankChen021)).
+* Prevent using too long chains of aggregate function combinators (they can lead to slow queries in the analysis stage). This closes [#47715](https://github.com/ClickHouse/ClickHouse/issues/47715). [#47716](https://github.com/ClickHouse/ClickHouse/pull/47716) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support for subquery in parameterized views; resolves [#46741](https://github.com/ClickHouse/ClickHouse/issues/46741) [#47725](https://github.com/ClickHouse/ClickHouse/pull/47725) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Fix memory leak in MySQL integration (reproduces with `connection_auto_close=1`). [#47732](https://github.com/ClickHouse/ClickHouse/pull/47732) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Improved error handling in the code related to Decimal parameters, resulting in more informative error messages. Previously, when incorrect Decimal parameters were supplied, the error message generated was unclear or unhelpful. With this update, the error message printed has been fixed to provide more detailed and useful information, making it easier to identify and correct issues related to Decimal parameters. [#47812](https://github.com/ClickHouse/ClickHouse/pull/47812) ([Yu Feng](https://github.com/Vigor-jpg)). Note: this changelog entry is rewritten by ChatGPT.
+* The parameter `exact_rows_before_limit` is used to make `rows_before_limit_at_least` is designed to accurately reflect the number of rows returned before the limit is reached. This pull request addresses issues encountered when the query involves distributed processing across multiple shards or sorting operations. Prior to this update, these scenarios were not functioning as intended. [#47874](https://github.com/ClickHouse/ClickHouse/pull/47874) ([Amos Bird](https://github.com/amosbird)).
+* ThreadPools metrics introspection. [#47880](https://github.com/ClickHouse/ClickHouse/pull/47880) ([Azat Khuzhin](https://github.com/azat)).
+* Add `WriteBufferFromS3Microseconds` and `WriteBufferFromS3RequestsErrors` profile events. [#47885](https://github.com/ClickHouse/ClickHouse/pull/47885) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add `--link` and `--noninteractive` (`-y`) options to ClickHouse install. Closes [#47750](https://github.com/ClickHouse/ClickHouse/issues/47750). [#47887](https://github.com/ClickHouse/ClickHouse/pull/47887) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fixed `UNKNOWN_TABLE` exception when attaching to a materialized view that has dependent tables that are not available. This might be useful when trying to restore state from a backup. [#47975](https://github.com/ClickHouse/ClickHouse/pull/47975) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix case when the (optional) path is not added to an encrypted disk configuration. [#47981](https://github.com/ClickHouse/ClickHouse/pull/47981) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Support for CTE in parameterized views Implementation: Updated to allow query parameters while evaluating scalar subqueries. [#48065](https://github.com/ClickHouse/ClickHouse/pull/48065) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Support big integers `(U)Int128/(U)Int256`, `Map` with any key type and `DateTime64` with any precision (not only 3 and 6). [#48119](https://github.com/ClickHouse/ClickHouse/pull/48119) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow skipping errors related to unknown enum values in row input formats. [#48133](https://github.com/ClickHouse/ClickHouse/pull/48133) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### Build/Testing/Packaging Improvement
+* ClickHouse now builds with `C++23`. [#47424](https://github.com/ClickHouse/ClickHouse/pull/47424) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fuzz `EXPLAIN` queries in the AST Fuzzer. [#47803](https://github.com/ClickHouse/ClickHouse/pull/47803) [#47852](https://github.com/ClickHouse/ClickHouse/pull/47852) ([flynn](https://github.com/ucasfl)).
+* Split stress test and the automated backward compatibility check (now Upgrade check). [#44879](https://github.com/ClickHouse/ClickHouse/pull/44879) ([Kruglov Pavel](https://github.com/Avogar)).
+* Updated the Ubuntu Image for Docker to calm down some bogus security reports. [#46784](https://github.com/ClickHouse/ClickHouse/pull/46784) ([Julio Jimenez](https://github.com/juliojimenez)). Please note that ClickHouse has no dependencies and does not require Docker.
+* Adds a prompt to allow the removal of an existing `clickhouse` download when using "curl | sh" download of ClickHouse. Prompt is "ClickHouse binary clickhouse already exists. Overwrite? \[y/N\]". [#46859](https://github.com/ClickHouse/ClickHouse/pull/46859) ([Dan Roscigno](https://github.com/DanRoscigno)).
+* Fix error during server startup on old distros (e.g. Amazon Linux 2) and on ARM that glibc 2.28 symbols are not found. [#47008](https://github.com/ClickHouse/ClickHouse/pull/47008) ([Robert Schulze](https://github.com/rschu1ze)).
+* Prepare for clang 16. [#47027](https://github.com/ClickHouse/ClickHouse/pull/47027) ([Amos Bird](https://github.com/amosbird)).
+* Added a CI check which ensures ClickHouse can run with an old glibc on ARM. [#47063](https://github.com/ClickHouse/ClickHouse/pull/47063) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add a style check to prevent incorrect usage of the `NDEBUG` macro. [#47699](https://github.com/ClickHouse/ClickHouse/pull/47699) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Speed up the build a little. [#47714](https://github.com/ClickHouse/ClickHouse/pull/47714) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Bump `vectorscan` to 5.4.9. [#47955](https://github.com/ClickHouse/ClickHouse/pull/47955) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add a unit test to assert Apache Arrow's fatal logging does not abort. It covers the changes in [ClickHouse/arrow#16](https://github.com/ClickHouse/arrow/pull/16). [#47958](https://github.com/ClickHouse/ClickHouse/pull/47958) ([Arthur Passos](https://github.com/arthurpassos)).
+* Restore the ability of native macOS debug server build to start. [#48050](https://github.com/ClickHouse/ClickHouse/pull/48050) ([Robert Schulze](https://github.com/rschu1ze)). Note: this change is only relevant for development, as the ClickHouse official builds are done with cross-compilation.
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+* Fix formats parser resetting, test processing bad messages in `Kafka` [#45693](https://github.com/ClickHouse/ClickHouse/pull/45693) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix data size calculation in Keeper [#46086](https://github.com/ClickHouse/ClickHouse/pull/46086) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fixed a bug in automatic retries of `DROP TABLE` query with `ReplicatedMergeTree` tables and `Atomic` databases. In rare cases it could lead to `Can't get data for node /zk_path/log_pointer` and `The specified key does not exist` errors if the ZooKeeper session expired during DROP and a new replicated table with the same path in ZooKeeper was created in parallel. [#46384](https://github.com/ClickHouse/ClickHouse/pull/46384) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix incorrect alias recursion while normalizing queries that prevented some queries to run. [#46609](https://github.com/ClickHouse/ClickHouse/pull/46609) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix IPv4/IPv6 serialization/deserialization in binary formats [#46616](https://github.com/ClickHouse/ClickHouse/pull/46616) ([Kruglov Pavel](https://github.com/Avogar)).
+* ActionsDAG: do not change result of `and` during optimization [#46653](https://github.com/ClickHouse/ClickHouse/pull/46653) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
+* Improve query cancellation when a client dies [#46681](https://github.com/ClickHouse/ClickHouse/pull/46681) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix arithmetic operations in aggregate optimization [#46705](https://github.com/ClickHouse/ClickHouse/pull/46705) ([Duc Canh Le](https://github.com/canhld94)).
+* Fix possible `clickhouse-local`'s abort on JSONEachRow schema inference [#46731](https://github.com/ClickHouse/ClickHouse/pull/46731) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix changing an expired role [#46772](https://github.com/ClickHouse/ClickHouse/pull/46772) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix combined PREWHERE column accumulation from multiple steps [#46785](https://github.com/ClickHouse/ClickHouse/pull/46785) ([Alexander Gololobov](https://github.com/davenger)).
+* Use initial range for fetching file size in HTTP read buffer. Without this change, some remote files couldn't be processed. [#46824](https://github.com/ClickHouse/ClickHouse/pull/46824) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix the incorrect progress bar while using the URL tables [#46830](https://github.com/ClickHouse/ClickHouse/pull/46830) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix MSan report in `maxIntersections` function [#46847](https://github.com/ClickHouse/ClickHouse/pull/46847) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix a bug in `Map` data type [#46856](https://github.com/ClickHouse/ClickHouse/pull/46856) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong results of some LIKE searches when the LIKE pattern contains quoted non-quotable characters [#46875](https://github.com/ClickHouse/ClickHouse/pull/46875) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix - WITH FILL would produce abort when the Filling Transform processing an empty block [#46897](https://github.com/ClickHouse/ClickHouse/pull/46897) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix date and int inference from string in JSON [#46972](https://github.com/ClickHouse/ClickHouse/pull/46972) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix bug in zero-copy replication disk choice during fetch [#47010](https://github.com/ClickHouse/ClickHouse/pull/47010) ([alesapin](https://github.com/alesapin)).
+* Fix a typo in systemd service definition [#47051](https://github.com/ClickHouse/ClickHouse/pull/47051) ([Palash Goel](https://github.com/palash-goel)).
+* Fix the NOT_IMPLEMENTED error with CROSS JOIN and algorithm = auto [#47068](https://github.com/ClickHouse/ClickHouse/pull/47068) ([Vladimir C](https://github.com/vdimir)).
+* Fix the problem that the 'ReplicatedMergeTree' table failed to insert two similar data when the 'part_type' is configured as 'InMemory' mode (experimental feature). [#47121](https://github.com/ClickHouse/ClickHouse/pull/47121) ([liding1992](https://github.com/liding1992)).
+* External dictionaries / library-bridge: Fix error "unknown library method 'extDict_libClone'" [#47136](https://github.com/ClickHouse/ClickHouse/pull/47136) ([alex filatov](https://github.com/phil-88)).
+* Fix race condition in a grace hash join with limit [#47153](https://github.com/ClickHouse/ClickHouse/pull/47153) ([Vladimir C](https://github.com/vdimir)).
+* Fix concrete columns PREWHERE support [#47154](https://github.com/ClickHouse/ClickHouse/pull/47154) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible deadlock in Query Status [#47161](https://github.com/ClickHouse/ClickHouse/pull/47161) ([Kruglov Pavel](https://github.com/Avogar)).
+* Forbid insert select for the same `Join` table, as it leads to a deadlock [#47260](https://github.com/ClickHouse/ClickHouse/pull/47260) ([Vladimir C](https://github.com/vdimir)).
+* Skip merged partitions for `min_age_to_force_merge_seconds` merges [#47303](https://github.com/ClickHouse/ClickHouse/pull/47303) ([Antonio Andelic](https://github.com/antonio2368)).
+* Modify find_first_symbols, so it works as expected for find_first_not_symbols [#47304](https://github.com/ClickHouse/ClickHouse/pull/47304) ([Arthur Passos](https://github.com/arthurpassos)).
+* Fix big numbers inference in CSV [#47410](https://github.com/ClickHouse/ClickHouse/pull/47410) ([Kruglov Pavel](https://github.com/Avogar)).
+* Disable logical expression optimizer for expression with aliases. [#47451](https://github.com/ClickHouse/ClickHouse/pull/47451) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix error in `decodeURLComponent` [#47457](https://github.com/ClickHouse/ClickHouse/pull/47457) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix explain graph with projection [#47473](https://github.com/ClickHouse/ClickHouse/pull/47473) ([flynn](https://github.com/ucasfl)).
+* Fix query parameters [#47488](https://github.com/ClickHouse/ClickHouse/pull/47488) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Parameterized view: a bug fix. [#47495](https://github.com/ClickHouse/ClickHouse/pull/47495) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Fuzzer of data formats, and the corresponding fixes. [#47519](https://github.com/ClickHouse/ClickHouse/pull/47519) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix monotonicity check for `DateTime64` [#47526](https://github.com/ClickHouse/ClickHouse/pull/47526) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix "block structure mismatch" for a Nullable LowCardinality column [#47537](https://github.com/ClickHouse/ClickHouse/pull/47537) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Proper fix for a bug in Apache Parquet [#45878](https://github.com/ClickHouse/ClickHouse/issues/45878) [#47538](https://github.com/ClickHouse/ClickHouse/pull/47538) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix `BSONEachRow` parallel parsing when document size is invalid [#47540](https://github.com/ClickHouse/ClickHouse/pull/47540) ([Kruglov Pavel](https://github.com/Avogar)).
+* Preserve error in `system.distribution_queue` on `SYSTEM FLUSH DISTRIBUTED` [#47541](https://github.com/ClickHouse/ClickHouse/pull/47541) ([Azat Khuzhin](https://github.com/azat)).
+* Check for duplicate column in `BSONEachRow` format [#47609](https://github.com/ClickHouse/ClickHouse/pull/47609) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix wait for zero copy lock during move [#47631](https://github.com/ClickHouse/ClickHouse/pull/47631) ([alesapin](https://github.com/alesapin)).
+* Fix aggregation by partitions [#47634](https://github.com/ClickHouse/ClickHouse/pull/47634) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix bug in tuple as array serialization in `BSONEachRow` format [#47690](https://github.com/ClickHouse/ClickHouse/pull/47690) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix crash in `polygonsSymDifferenceCartesian` [#47702](https://github.com/ClickHouse/ClickHouse/pull/47702) ([pufit](https://github.com/pufit)).
+* Fix reading from storage `File` compressed files with `zlib` and `gzip` compression [#47796](https://github.com/ClickHouse/ClickHouse/pull/47796) ([Anton Popov](https://github.com/CurtizJ)).
+* Improve empty query detection for PostgreSQL (for pgx golang driver) [#47854](https://github.com/ClickHouse/ClickHouse/pull/47854) ([Azat Khuzhin](https://github.com/azat)).
+* Fix DateTime monotonicity check for LowCardinality types [#47860](https://github.com/ClickHouse/ClickHouse/pull/47860) ([Antonio Andelic](https://github.com/antonio2368)).
+* Use restore_threads (not backup_threads) for RESTORE ASYNC [#47861](https://github.com/ClickHouse/ClickHouse/pull/47861) ([Azat Khuzhin](https://github.com/azat)).
+* Fix DROP COLUMN with ReplicatedMergeTree containing projections [#47883](https://github.com/ClickHouse/ClickHouse/pull/47883) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix for Replicated database recovery [#47901](https://github.com/ClickHouse/ClickHouse/pull/47901) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Hotfix for too verbose warnings in HTTP [#47903](https://github.com/ClickHouse/ClickHouse/pull/47903) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix "Field value too long" in `catboostEvaluate` [#47970](https://github.com/ClickHouse/ClickHouse/pull/47970) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix [#36971](https://github.com/ClickHouse/ClickHouse/issues/36971): Watchdog: exit with non-zero code if child process exits [#47973](https://github.com/ClickHouse/ClickHouse/pull/47973) ([Коренберг Марк](https://github.com/socketpair)).
+* Fix for "index file `cidx` is unexpectedly long" [#48010](https://github.com/ClickHouse/ClickHouse/pull/48010) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Fix MaterializedPostgreSQL query to get attributes (replica-identity) [#48015](https://github.com/ClickHouse/ClickHouse/pull/48015) ([Solomatov Sergei](https://github.com/solomatovs)).
+* parseDateTime(): Fix UB (signed integer overflow) [#48019](https://github.com/ClickHouse/ClickHouse/pull/48019) ([Robert Schulze](https://github.com/rschu1ze)).
+* Use unique names for Records in Avro to avoid reusing its schema [#48057](https://github.com/ClickHouse/ClickHouse/pull/48057) ([Kruglov Pavel](https://github.com/Avogar)).
+* Correctly set TCP/HTTP socket timeouts in Keeper [#48108](https://github.com/ClickHouse/ClickHouse/pull/48108) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix possible member call on null pointer in `Avro` format [#48184](https://github.com/ClickHouse/ClickHouse/pull/48184) ([Kruglov Pavel](https://github.com/Avogar)).
+
 ### <a id="232"></a> ClickHouse release 23.2, 2023-02-23
 
 #### Backward Incompatible Change
@@ -140,7 +473,7 @@
 * Upgrade Intel QPL from v0.3.0 to v1.0.0 2. Build libaccel-config and link it statically to QPL library instead of dynamically. [#45809](https://github.com/ClickHouse/ClickHouse/pull/45809) ([jasperzhu](https://github.com/jinjunzh)).
 
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Flush data exactly by `rabbitmq_flush_interval_ms` or by `rabbitmq_max_block_size` in `StorageRabbitMQ`. Closes [#42389](https://github.com/ClickHouse/ClickHouse/issues/42389). Closes [#45160](https://github.com/ClickHouse/ClickHouse/issues/45160). [#44404](https://github.com/ClickHouse/ClickHouse/pull/44404) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Use PODArray to render in sparkBar function, so we can control the memory usage. Close [#44467](https://github.com/ClickHouse/ClickHouse/issues/44467). [#44489](https://github.com/ClickHouse/ClickHouse/pull/44489) ([Duc Canh Le](https://github.com/canhld94)).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbb666b81c3..5d6ed75bb29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,8 +57,8 @@ if (ENABLE_CHECK_HEAVY_BUILDS)
     # set CPU time limit to 1000 seconds
     set (RLIMIT_CPU 1000)
 
-    # gcc10/gcc10/clang -fsanitize=memory is too heavy
-    if (SANITIZE STREQUAL "memory" OR COMPILER_GCC)
+    # -fsanitize=memory is too heavy
+    if (SANITIZE STREQUAL "memory")
        set (RLIMIT_DATA 10000000000) # 10G
     endif()
 
@@ -102,6 +102,17 @@ if (ENABLE_FUZZING)
     set (ENABLE_PROTOBUF 1)
 endif()
 
+option (ENABLE_WOBOQ_CODEBROWSER "Build for woboq codebrowser" OFF)
+
+if (ENABLE_WOBOQ_CODEBROWSER)
+    set (ENABLE_EMBEDDED_COMPILER 0)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-poison-system-directories")
+    # woboq codebrowser uses clang tooling, and they could add default system
+    # clang includes, and later clang will warn for those added by itself
+    # includes.
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-poison-system-directories")
+endif()
+
 # Global libraries
 # See:
 # - default_libs.cmake
@@ -121,6 +132,7 @@ if (ENABLE_COLORED_BUILD AND CMAKE_GENERATOR STREQUAL "Ninja")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always")
     # ... such manually setting of flags can be removed once CMake supports a variable to
     # activate colors in *all* build systems: https://gitlab.kitware.com/cmake/cmake/-/issues/15502
+    # --> available since CMake 3.24: https://stackoverflow.com/a/73349744
 endif ()
 
 include (cmake/check_flags.cmake)
@@ -134,24 +146,15 @@ if (COMPILER_CLANG)
         set(COMPILER_FLAGS "${COMPILER_FLAGS} -gdwarf-aranges")
     endif ()
 
-    if (HAS_USE_CTOR_HOMING)
-        # For more info see https://blog.llvm.org/posts/2021-04-05-constructor-homing-for-debug-info/
-        if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO")
-            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fuse-ctor-homing")
-            set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")
-        endif()
+    # See https://blog.llvm.org/posts/2021-04-05-constructor-homing-for-debug-info/
+    if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO")
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fuse-ctor-homing")
+        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")
     endif()
 
     no_warning(enum-constexpr-conversion) # breaks Protobuf in clang-16
 endif ()
 
-# If compiler has support for -Wreserved-identifier. It is difficult to detect by clang version,
-# because there are two different branches of clang: clang and AppleClang.
-# (AppleClang is not supported by ClickHouse, but some developers have misfortune to use it).
-if (HAS_RESERVED_IDENTIFIER)
-    add_compile_definitions (HAS_RESERVED_IDENTIFIER)
-endif ()
-
 option(ENABLE_TESTS "Provide unit_test_dbms target with Google.Test unit tests" ON)
 option(ENABLE_EXAMPLES "Build all example programs in 'examples' subdirectories" OFF)
 option(ENABLE_BENCHMARKS "Build all benchmark programs in 'benchmarks' subdirectories" OFF)
@@ -178,32 +181,11 @@ else ()
     set(NO_WHOLE_ARCHIVE --no-whole-archive)
 endif ()
 
-option(ENABLE_CURL_BUILD "Enable curl, azure, sentry build on by default except MacOS." ON)
-if (OS_DARWIN)
-    # Disable the curl, azure, senry build on MacOS
-    set (ENABLE_CURL_BUILD OFF)
-endif ()
-
-# Ignored if `lld` is used
-option(ADD_GDB_INDEX_FOR_GOLD "Add .gdb-index to resulting binaries for gold linker.")
-
 if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
     # Can be lld or ld-lld or lld-13 or /path/to/lld.
-    if (LINKER_NAME MATCHES "lld" AND OS_LINUX)
+    if (LINKER_NAME MATCHES "lld")
         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
-        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gdb-index")
         message (STATUS "Adding .gdb-index via --gdb-index linker option.")
-    # we use another tool for gdb-index, because gold linker removes section .debug_aranges, which used inside clickhouse stacktraces
-    # http://sourceware-org.1504.n7.nabble.com/gold-No-debug-aranges-section-when-linking-with-gdb-index-td540965.html#a556932
-    elseif (LINKER_NAME MATCHES "gold$" AND ADD_GDB_INDEX_FOR_GOLD)
-        find_program (GDB_ADD_INDEX_EXE NAMES "gdb-add-index" DOC "Path to gdb-add-index executable")
-        if (NOT GDB_ADD_INDEX_EXE)
-            set (USE_GDB_ADD_INDEX 0)
-            message (WARNING "Cannot add gdb index to binaries, because gold linker is used, but gdb-add-index executable not found.")
-        else()
-            set (USE_GDB_ADD_INDEX 1)
-            message (STATUS "gdb-add-index found: ${GDB_ADD_INDEX_EXE}")
-        endif()
     endif ()
 endif()
 
@@ -235,7 +217,7 @@ endif ()
 
 # Create BuildID when using lld. For other linkers it is created by default.
 # (NOTE: LINKER_NAME can be either path or name, and in different variants)
-if (LINKER_NAME MATCHES "lld" AND OS_LINUX)
+if (LINKER_NAME MATCHES "lld")
     # SHA1 is not cryptographically secure but it is the best what lld is offering.
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1")
 endif ()
@@ -288,8 +270,8 @@ endif ()
 option (ENABLE_BUILD_PATH_MAPPING "Enable remapping of file source paths in debug info, predefined preprocessor macros, and __builtin_FILE(). It's used to generate reproducible builds. See https://reproducible-builds.org/docs/build-path" ${ENABLE_BUILD_PATH_MAPPING_DEFAULT})
 
 if (ENABLE_BUILD_PATH_MAPPING)
-    set (COMPILER_FLAGS "${COMPILER_FLAGS} -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
-    set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
+    set (COMPILER_FLAGS "${COMPILER_FLAGS} -ffile-prefix-map=${PROJECT_SOURCE_DIR}=.")
+    set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -ffile-prefix-map=${PROJECT_SOURCE_DIR}=.")
 endif ()
 
 option (ENABLE_BUILD_PROFILING "Enable profiling of build time" OFF)
@@ -301,59 +283,39 @@ if (ENABLE_BUILD_PROFILING)
      endif ()
 endif ()
 
-set (CMAKE_CXX_STANDARD 20)
-set (CMAKE_CXX_EXTENSIONS ON) # Same as gnu++2a (ON) vs c++2a (OFF): https://cmake.org/cmake/help/latest/prop_tgt/CXX_EXTENSIONS.html
+set (CMAKE_CXX_STANDARD 23)
+set (CMAKE_CXX_EXTENSIONS OFF)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set (CMAKE_C_STANDARD 11)
-set (CMAKE_C_EXTENSIONS ON)
+set (CMAKE_C_EXTENSIONS ON) # required by most contribs written in C
 set (CMAKE_C_STANDARD_REQUIRED ON)
 
-if (COMPILER_GCC OR COMPILER_CLANG)
-    # Enable C++14 sized global deallocation functions. It should be enabled by setting -std=c++14 but I'm not sure.
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsized-deallocation")
-endif ()
-
-# falign-functions=32 prevents from random performance regressions with the code change. Thus, providing more stable
-# benchmarks.
-if (COMPILER_GCC OR COMPILER_CLANG)
-    set(COMPILER_FLAGS "${COMPILER_FLAGS} -falign-functions=32")
-endif ()
-
-if (ARCH_AMD64)
-    # align branches within a 32-Byte boundary to avoid the potential performance loss when code layout change,
-    # which makes benchmark results more stable.
-    set(BRANCHES_WITHIN_32B_BOUNDARIES "-mbranches-within-32B-boundaries")
-    if (COMPILER_GCC)
-        # gcc is in assembler, need to add "-Wa," prefix
-        set(BRANCHES_WITHIN_32B_BOUNDARIES "-Wa,${BRANCHES_WITHIN_32B_BOUNDARIES}")
-    endif()
-
-    include(CheckCXXCompilerFlag)
-    check_cxx_compiler_flag("${BRANCHES_WITHIN_32B_BOUNDARIES}" HAS_BRANCHES_WITHIN_32B_BOUNDARIES)
-    if (HAS_BRANCHES_WITHIN_32B_BOUNDARIES)
-        set(COMPILER_FLAGS "${COMPILER_FLAGS} ${BRANCHES_WITHIN_32B_BOUNDARIES}")
-    endif()
-endif()
-
-if (COMPILER_GCC)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcoroutines")
-endif ()
-
-# Compiler-specific coverage flags e.g. -fcoverage-mapping for gcc
+# Compiler-specific coverage flags e.g. -fcoverage-mapping
 option(WITH_COVERAGE "Profile the resulting binary/binaries" OFF)
 
-if (WITH_COVERAGE AND COMPILER_CLANG)
-    set(COMPILER_FLAGS "${COMPILER_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
-    # If we want to disable coverage for specific translation units
-    set(WITHOUT_COVERAGE "-fno-profile-instr-generate -fno-coverage-mapping")
-endif()
+if (COMPILER_CLANG)
+    # Enable C++14 sized global deallocation functions. It should be enabled by setting -std=c++14 but I'm not sure.
+    # See https://reviews.llvm.org/D112921
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsized-deallocation")
 
-if (WITH_COVERAGE AND COMPILER_GCC)
-    set(COMPILER_FLAGS "${COMPILER_FLAGS} -fprofile-arcs -ftest-coverage")
-    set(COVERAGE_OPTION "-lgcov")
-    set(WITHOUT_COVERAGE "-fno-profile-arcs -fno-test-coverage")
-endif()
+    # falign-functions=32 prevents from random performance regressions with the code change. Thus, providing more stable
+    # benchmarks.
+    set(COMPILER_FLAGS "${COMPILER_FLAGS} -falign-functions=32")
+
+    if (ARCH_AMD64)
+        # align branches within a 32-Byte boundary to avoid the potential performance loss when code layout change,
+        # which makes benchmark results more stable.
+        set(BRANCHES_WITHIN_32B_BOUNDARIES "-mbranches-within-32B-boundaries")
+        set(COMPILER_FLAGS "${COMPILER_FLAGS} ${BRANCHES_WITHIN_32B_BOUNDARIES}")
+    endif()
+
+    if (WITH_COVERAGE)
+        set(COMPILER_FLAGS "${COMPILER_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
+        # If we want to disable coverage for specific translation units
+        set(WITHOUT_COVERAGE "-fno-profile-instr-generate -fno-coverage-mapping")
+    endif()
+endif ()
 
 set (COMPILER_FLAGS "${COMPILER_FLAGS}")
 
@@ -391,13 +353,6 @@ if (COMPILER_CLANG)
 
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-vtable-pointers")
 
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
-        # Set new experimental pass manager, it's a performance, build time and binary size win.
-        # Can be removed after https://reviews.llvm.org/D66490 merged and released to at least two versions of clang.
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-new-pass-manager")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexperimental-new-pass-manager")
-    endif ()
-
     # We cannot afford to use LTO when compiling unit tests, and it's not enough
     # to only supply -fno-lto at the final linking stage. So we disable it
     # completely.
@@ -436,15 +391,22 @@ else()
 endif ()
 
 option (ENABLE_GWP_ASAN "Enable Gwp-Asan" ON)
-if (NOT OS_LINUX AND NOT OS_ANDROID)
+# We use mmap for allocations more heavily in debug builds,
+# but GWP-ASan also wants to use mmap frequently,
+# and due to a large number of memory mappings,
+# it does not work together well.
+if ((NOT OS_LINUX AND NOT OS_ANDROID) OR (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG"))
     set(ENABLE_GWP_ASAN OFF)
 endif ()
 
+option (ENABLE_FIU "Enable Fiu" ON)
+
 option(WERROR "Enable -Werror compiler option" ON)
 
 if (WERROR)
     # Don't pollute CMAKE_CXX_FLAGS with -Werror as it will break some CMake checks.
     # Instead, adopt modern cmake usage requirement.
+    # TODO: Set CMAKE_COMPILE_WARNING_AS_ERROR (cmake 3.24)
     target_compile_options(global-group INTERFACE "-Werror")
 endif ()
 
@@ -459,8 +421,11 @@ endif ()
 
 set (CMAKE_POSTFIX_VARIABLE "CMAKE_${CMAKE_BUILD_TYPE_UC}_POSTFIX")
 
-set (CMAKE_POSITION_INDEPENDENT_CODE OFF)
-if (OS_LINUX AND NOT (ARCH_AARCH64 OR ARCH_S390X))
+if (NOT SANITIZE)
+    set (CMAKE_POSITION_INDEPENDENT_CODE OFF)
+endif()
+
+if (OS_LINUX AND NOT (ARCH_AARCH64 OR ARCH_S390X) AND NOT SANITIZE)
     # Slightly more efficient code can be generated
     # It's disabled for ARM because otherwise ClickHouse cannot run on Android.
     set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-pie")
@@ -563,6 +528,26 @@ include (cmake/print_flags.cmake)
 
 if (ENABLE_RUST)
     add_subdirectory (rust)
+
+    # With LTO Rust adds few symbols with global visiblity, the most common is
+    # rust_eh_personality. And this leads to linking errors because multiple
+    # Rust libraries contains the same symbol.
+    #
+    # If it was shared library, that we could use version script for linker to
+    # hide this symbols, but libraries are static.
+    #
+    # we could in theory compile everything to one library but this will be a
+    # mess
+    #
+    # But this should be OK since CI has lots of other builds that are done
+    # without LTO and it will find multiple definitions if there will be any.
+    #
+    # More information about this behaviour in Rust can be found here
+    # - https://github.com/rust-lang/rust/issues/44322
+    # - https://alanwu.space/post/symbol-hygiene/
+    if (ENABLE_THINLTO)
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-multiple-definition")
+    endif()
 endif()
 
 add_subdirectory (base)
@@ -583,7 +568,7 @@ if (NATIVE_BUILD_TARGETS
 )
     message (STATUS "Building native targets...")
 
-    set (NATIVE_BUILD_DIR "${CMAKE_BINARY_DIR}/native")
+    set (NATIVE_BUILD_DIR "${PROJECT_BINARY_DIR}/native")
 
     execute_process(
         COMMAND ${CMAKE_COMMAND} -E make_directory "${NATIVE_BUILD_DIR}"
@@ -593,11 +578,11 @@ if (NATIVE_BUILD_TARGETS
         COMMAND ${CMAKE_COMMAND}
             "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
             "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
-            "-DENABLE_CCACHE=${ENABLE_CCACHE}"
+            "-DCOMPILER_CACHE=${COMPILER_CACHE}"
             # Avoid overriding .cargo/config.toml with native toolchain.
             "-DENABLE_RUST=OFF"
             "-DENABLE_CLICKHOUSE_SELF_EXTRACTING=${ENABLE_CLICKHOUSE_SELF_EXTRACTING}"
-        ${CMAKE_SOURCE_DIR}
+        ${PROJECT_SOURCE_DIR}
         WORKING_DIRECTORY "${NATIVE_BUILD_DIR}"
         COMMAND_ECHO STDOUT)
 
diff --git a/PreLoad.cmake b/PreLoad.cmake
index 0e1ee70fc8f..b456c724cc6 100644
--- a/PreLoad.cmake
+++ b/PreLoad.cmake
@@ -19,8 +19,8 @@ endif()
 if (NOT "$ENV{CFLAGS}" STREQUAL ""
     OR NOT "$ENV{CXXFLAGS}" STREQUAL ""
     OR NOT "$ENV{LDFLAGS}" STREQUAL ""
-    OR CMAKE_C_FLAGS OR CMAKE_CXX_FLAGS OR CMAKE_EXE_LINKER_FLAGS OR CMAKE_SHARED_LINKER_FLAGS OR CMAKE_MODULE_LINKER_FLAGS
-    OR CMAKE_C_FLAGS_INIT OR CMAKE_CXX_FLAGS_INIT OR CMAKE_EXE_LINKER_FLAGS_INIT OR CMAKE_SHARED_LINKER_FLAGS_INIT OR CMAKE_MODULE_LINKER_FLAGS_INIT)
+    OR CMAKE_C_FLAGS OR CMAKE_CXX_FLAGS OR CMAKE_EXE_LINKER_FLAGS OR CMAKE_MODULE_LINKER_FLAGS
+    OR CMAKE_C_FLAGS_INIT OR CMAKE_CXX_FLAGS_INIT OR CMAKE_EXE_LINKER_FLAGS_INIT OR CMAKE_MODULE_LINKER_FLAGS_INIT)
 
     # if $ENV
     message("CFLAGS: $ENV{CFLAGS}")
@@ -36,7 +36,6 @@ if (NOT "$ENV{CFLAGS}" STREQUAL ""
     message("CMAKE_C_FLAGS_INIT: ${CMAKE_C_FLAGS_INIT}")
     message("CMAKE_CXX_FLAGS_INIT: ${CMAKE_CXX_FLAGS_INIT}")
     message("CMAKE_EXE_LINKER_FLAGS_INIT: ${CMAKE_EXE_LINKER_FLAGS_INIT}")
-    message("CMAKE_SHARED_LINKER_FLAGS_INIT: ${CMAKE_SHARED_LINKER_FLAGS_INIT}")
     message("CMAKE_MODULE_LINKER_FLAGS_INIT: ${CMAKE_MODULE_LINKER_FLAGS_INIT}")
 
     message(FATAL_ERROR "
diff --git a/README.md b/README.md
index fcbe65e8223..bbedea364fc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![ClickHouse — open source distributed column-oriented DBMS](https://github.com/ClickHouse/clickhouse-presentations/raw/master/images/logo-400x240.png)](https://clickhouse.com)
+[<img alt="ClickHouse — open source distributed column-oriented DBMS" width="400px" src="https://clickhouse.com/images/ch_gh_logo_rounded.png" />](https://clickhouse.com?utm_source=github)
 
 ClickHouse® is an open-source column-oriented database management system that allows generating analytical data reports in real-time.
 
@@ -14,18 +14,32 @@ curl https://clickhouse.com/ | sh
 * [Tutorial](https://clickhouse.com/docs/en/getting_started/tutorial/) shows how to set up and query a small ClickHouse cluster.
 * [Documentation](https://clickhouse.com/docs/en/) provides more in-depth information.
 * [YouTube channel](https://www.youtube.com/c/ClickHouseDB) has a lot of content about ClickHouse in video format.
-* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-1gh9ds7f4-PgDhJAaF8ad5RbWBAAjzFg) and [Telegram](https://telegram.me/clickhouse_en) allow chatting with ClickHouse users in real-time.
+* [Slack](https://clickhouse.com/slack) and [Telegram](https://telegram.me/clickhouse_en) allow chatting with ClickHouse users in real-time.
 * [Blog](https://clickhouse.com/blog/) contains various ClickHouse-related articles, as well as announcements and reports about events.
 * [Code Browser (Woboq)](https://clickhouse.com/codebrowser/ClickHouse/index.html) with syntax highlight and navigation.
 * [Code Browser (github.dev)](https://github.dev/ClickHouse/ClickHouse) with syntax highlight, powered by github.dev.
 * [Contacts](https://clickhouse.com/company/contact) can help to get your questions answered if there are any.
 
 ## Upcoming Events
-* [**v23.2 Release Webinar**](https://clickhouse.com/company/events/v23-2-release-webinar?utm_source=github&utm_medium=social&utm_campaign=release-webinar-2023-02) - Feb 23 - 23.2 is rapidly approaching. Original creator, co-founder, and CTO of ClickHouse Alexey Milovidov will walk us through the highlights of the release.
-* [**ClickHouse Meetup in Amsterdam**](https://www.meetup.com/clickhouse-netherlands-user-group/events/291485868/) - Mar 9 - The first ClickHouse Amsterdam Meetup of 2023 is here! 🎉 Join us for short lightning talks and long discussions. Food, drinks & good times on us.
-* [**ClickHouse Meetup in SF Bay Area**](https://www.meetup.com/clickhouse-silicon-valley-meetup-group/events/291490121/) - Mar 14 - A night to meet with ClickHouse team in the San Francisco area! Food and drink are a given...but networking is the primary focus.
-* [**ClickHouse Meetup in Austin**](https://www.meetup.com/clickhouse-austin-user-group/events/291486654/) - Mar 16 - The first ClickHouse Meetup in Austin is happening soon! Interested in speaking, let us know!
+
+* [**v23.5 Release Webinar**](https://clickhouse.com/company/events/v23-5-release-webinar?utm_source=github&utm_medium=social&utm_campaign=release-webinar-2023-05) - May 31 - 23.5 is rapidly approaching. Original creator, co-founder, and CTO of ClickHouse Alexey Milovidov will walk us through the highlights of the release.
+* [**ClickHouse Meetup in Barcelona**](https://www.meetup.com/clickhouse-barcelona-user-group/events/292892669) - May 25 
+* [**ClickHouse Meetup in London**](https://www.meetup.com/clickhouse-london-user-group/events/292892824) - May 25 
+* [**ClickHouse Meetup in San Francisco**](https://www.meetup.com/clickhouse-silicon-valley-meetup-group/events/293426725/) - Jun 7 
+* [**ClickHouse Meetup in Stockholm**](https://www.meetup.com/clickhouse-berlin-user-group/events/292892466) - Jun 13 
+
+Also, keep an eye out for upcoming meetups in Amsterdam, Boston, NYC, Beijing, and Toronto. Somewhere else you want us to be? Please feel free to reach out to tyler <at> clickhouse <dot> com.
 
 ## Recent Recordings
-* **FOSDEM 2023**: In the "Fast and Streaming Data" room Alexey gave a talk entitled "Building Analytical Apps With ClickHouse" that looks at the landscape of data tools, an interesting data set, and how you can interact with data quickly. Check out the recording on **[YouTube](https://www.youtube.com/watch?v=JlcI2Vfz_uk)**.
-* **Recording available**: [**v23.1 Release Webinar**](https://www.youtube.com/watch?v=zYSZXBnTMSE) 23.1 is the ClickHouse New Year release. Original creator, co-founder, and CTO of ClickHouse Alexey Milovidov will walk us through the highlights of the release. Inverted indices, query cache, and so -- very -- much more.
+* **Recent Meetup Videos**: [Meetup Playlist](https://www.youtube.com/playlist?list=PL0Z2YDlm0b3iNDUzpY1S3L_iV4nARda_U) Whenever possible recordings of the ClickHouse Community Meetups are edited and presented as individual talks. Current featuring "Modern SQL in 2023", "Fast, Concurrent, and Consistent Asynchronous INSERTS in ClickHouse", and "Full-Text Indices: Design and Experiments"
+* **Recording available**: [**v23.4 Release Webinar**](https://www.youtube.com/watch?v=4rrf6bk_mOg) Faster Parquet Reading, Asynchonous Connections to Reoplicas, Trailing Comma before FROM, extractKeyValuePairs, integrations updates, and so much more! Watch it now!
+* **All release webinar recordings**: [YouTube playlist](https://www.youtube.com/playlist?list=PL0Z2YDlm0b3jAlSy1JxyP8zluvXaN3nxU)
+
+  
+ ## Interested in joining ClickHouse and making it your full time job? 
+  
+We are a globally diverse and distributed team, united behind a common goal of creating industry-leading, real-time analytics. Here, you will have an opportunity to solve some of the most cutting edge technical challenges and have direct ownership of your work and vision. If you are a contributor by nature, a thinker as well as a doer - we’ll definitely click!
+  
+Check out our **current openings** here: https://clickhouse.com/company/careers 
+  
+Cant find what you are looking for, but want to let us know you are interested in joining ClickHouse? Email careers@clickhouse.com! 
diff --git a/SECURITY.md b/SECURITY.md
index 7c6648c70eb..75c1a9d7d6a 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -13,20 +13,16 @@ The following versions of ClickHouse server are currently being supported with s
 
 | Version | Supported |
 |:-|:-|
+| 23.4 | ✔️ |
+| 23.3 | ✔️ |
 | 23.2 | ✔️ |
-| 23.1 | ✔️ |
-| 22.12 | ✔️ |
+| 23.1 | ❌ |
+| 22.12 | ❌ |
 | 22.11 | ❌ |
 | 22.10 | ❌ |
 | 22.9 | ❌ |
 | 22.8 | ✔️ |
-| 22.7 | ❌ |
-| 22.6 | ❌ |
-| 22.5 | ❌ |
-| 22.4 | ❌ |
-| 22.3 | ✔️ |
-| 22.2 | ❌ |
-| 22.1 | ❌ |
+| 22.* | ❌ |
 | 21.* | ❌ |
 | 20.* | ❌ |
 | 19.* | ❌ |
diff --git a/base/base/CMakeLists.txt b/base/base/CMakeLists.txt
index 64785d575c5..8ab3c8a0711 100644
--- a/base/base/CMakeLists.txt
+++ b/base/base/CMakeLists.txt
@@ -2,6 +2,10 @@ if (USE_CLANG_TIDY)
     set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
 endif ()
 
+# TODO: Remove this. We like to compile with C++23 (set by top-level CMakeLists) but Clang crashes with our libcxx
+# when instantiated from JSON.cpp. Try again when libcxx(abi) and Clang are upgraded to 16.
+set (CMAKE_CXX_STANDARD 20)
+
 set (SRCS
     argsToConfig.cpp
     coverage.cpp
diff --git a/base/base/Decimal.h b/base/base/Decimal.h
index 22cb577b1b2..2405ba9ca0d 100644
--- a/base/base/Decimal.h
+++ b/base/base/Decimal.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <base/extended_types.h>
+#include <base/Decimal_fwd.h>
 
 #if !defined(NO_SANITIZE_UNDEFINED)
 #if defined(__clang__)
@@ -19,23 +20,6 @@ using Decimal64 = Decimal<Int64>;
 using Decimal128 = Decimal<Int128>;
 using Decimal256 = Decimal<Int256>;
 
-template <class T>
-concept is_decimal =
-    std::is_same_v<T, Decimal32>
-    || std::is_same_v<T, Decimal64>
-    || std::is_same_v<T, Decimal128>
-    || std::is_same_v<T, Decimal256>
-    || std::is_same_v<T, DateTime64>;
-
-template <class T>
-concept is_over_big_int =
-    std::is_same_v<T, Int128>
-    || std::is_same_v<T, UInt128>
-    || std::is_same_v<T, Int256>
-    || std::is_same_v<T, UInt256>
-    || std::is_same_v<T, Decimal128>
-    || std::is_same_v<T, Decimal256>;
-
 template <class T> struct NativeTypeT { using Type = T; };
 template <is_decimal T> struct NativeTypeT<T> { using Type = typename T::NativeType; };
 template <class T> using NativeType = typename NativeTypeT<T>::Type;
diff --git a/base/base/Decimal_fwd.h b/base/base/Decimal_fwd.h
new file mode 100644
index 00000000000..589d6224917
--- /dev/null
+++ b/base/base/Decimal_fwd.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <base/types.h>
+
+namespace wide
+{
+
+template <size_t Bits, typename Signed>
+class integer;
+
+}
+
+using Int128 = wide::integer<128, signed>;
+using UInt128 = wide::integer<128, unsigned>;
+using Int256 = wide::integer<256, signed>;
+using UInt256 = wide::integer<256, unsigned>;
+
+namespace DB
+{
+
+template <class> struct Decimal;
+
+using Decimal32 = Decimal<Int32>;
+using Decimal64 = Decimal<Int64>;
+using Decimal128 = Decimal<Int128>;
+using Decimal256 = Decimal<Int256>;
+
+class DateTime64;
+
+template <class T>
+concept is_decimal =
+    std::is_same_v<T, Decimal32>
+    || std::is_same_v<T, Decimal64>
+    || std::is_same_v<T, Decimal128>
+    || std::is_same_v<T, Decimal256>
+    || std::is_same_v<T, DateTime64>;
+
+template <class T>
+concept is_over_big_int =
+    std::is_same_v<T, Int128>
+    || std::is_same_v<T, UInt128>
+    || std::is_same_v<T, Int256>
+    || std::is_same_v<T, UInt256>
+    || std::is_same_v<T, Decimal128>
+    || std::is_same_v<T, Decimal256>;
+}
diff --git a/base/base/IPv4andIPv6.h b/base/base/IPv4andIPv6.h
index 0e97d83b07e..7b745ec7b84 100644
--- a/base/base/IPv4andIPv6.h
+++ b/base/base/IPv4andIPv6.h
@@ -51,3 +51,15 @@ namespace DB
     };
 
 }
+
+namespace std
+{
+    template <>
+    struct hash<DB::IPv6>
+    {
+        size_t operator()(const DB::IPv6 & x) const
+        {
+            return std::hash<DB::IPv6::UnderlyingType>()(x.toUnderType());
+        }
+    };
+}
diff --git a/base/base/JSON.cpp b/base/base/JSON.cpp
index 315bcce38da..4c6d97b4444 100644
--- a/base/base/JSON.cpp
+++ b/base/base/JSON.cpp
@@ -466,9 +466,8 @@ JSON::Pos JSON::searchField(const char * data, size_t size) const
     {
         if (!it->hasEscapes())
         {
-            if (static_cast<int>(size) + 2 > it->dataEnd() - it->data())
-                continue;
-            if (!strncmp(data, it->data() + 1, size))
+            const auto current_name = it->getRawName();
+            if (current_name.size() == size && 0 == memcmp(current_name.data(), data, size))
                 break;
         }
         else
diff --git a/base/base/StringRef.h b/base/base/StringRef.h
index a3e32ff5058..f428b7c747f 100644
--- a/base/base/StringRef.h
+++ b/base/base/StringRef.h
@@ -3,6 +3,7 @@
 #include <cassert>
 #include <stdexcept> // for std::logic_error
 #include <string>
+#include <type_traits>
 #include <vector>
 #include <functional>
 #include <iosfwd>
@@ -326,5 +327,16 @@ namespace ZeroTraits
     inline void set(StringRef & x) { x.size = 0; }
 }
 
+namespace PackedZeroTraits
+{
+    template <typename Second, template <typename, typename> class PackedPairNoInit>
+    inline bool check(const PackedPairNoInit<StringRef, Second> p)
+    { return 0 == p.key.size; }
+
+    template <typename Second, template <typename, typename> class PackedPairNoInit>
+    inline void set(PackedPairNoInit<StringRef, Second> & p)
+    { p.key.size = 0; }
+}
+
 
 std::ostream & operator<<(std::ostream & os, const StringRef & str);
diff --git a/base/base/TypeList.h b/base/base/TypeList.h
index 244403b1c6b..310f0c0c586 100644
--- a/base/base/TypeList.h
+++ b/base/base/TypeList.h
@@ -4,7 +4,6 @@
 #include <type_traits>
 #include <utility>
 #include "defines.h"
-#include "TypePair.h"
 
 /// General-purpose typelist. Easy on compilation times as it does not use recursion.
 template <typename ...Args>
@@ -28,7 +27,7 @@ namespace TypeListUtils /// In some contexts it's more handy to use functions in
     constexpr Root<Args...> changeRoot(TypeList<Args...>) { return {}; }
 
     template <typename F, typename ...Args>
-    constexpr void forEach(TypeList<Args...>, F && f) { (std::forward<F>(f)(Id<Args>{}), ...); }
+    constexpr void forEach(TypeList<Args...>, F && f) { (std::forward<F>(f)(TypeList<Args>{}), ...); }
 }
 
 template <typename TypeListLeft, typename TypeListRight>
diff --git a/base/base/TypePair.h b/base/base/TypePair.h
deleted file mode 100644
index 8c2f380618c..00000000000
--- a/base/base/TypePair.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-template <typename T, typename V> struct TypePair {};
-template <typename T> struct Id {};
diff --git a/base/base/argsToConfig.cpp b/base/base/argsToConfig.cpp
index d7983779d2d..faa1462218d 100644
--- a/base/base/argsToConfig.cpp
+++ b/base/base/argsToConfig.cpp
@@ -3,13 +3,29 @@
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Poco/Util/MapConfiguration.h>
 
-
-void argsToConfig(const Poco::Util::Application::ArgVec & argv, Poco::Util::LayeredConfiguration & config, int priority)
+void argsToConfig(const Poco::Util::Application::ArgVec & argv,
+                  Poco::Util::LayeredConfiguration & config,
+                  int priority,
+                  const std::unordered_set<std::string>* alias_names)
 {
     /// Parsing all args and converting to config layer
     /// Test: -- --1=1 --1=2 --3 5 7 8 -9 10 -11=12 14= 15== --16==17 --=18 --19= --20 21 22 --23 --24 25 --26 -27 28 ---29=30 -- ----31 32 --33 3-4
     Poco::AutoPtr<Poco::Util::MapConfiguration> map_config = new Poco::Util::MapConfiguration;
     std::string key;
+
+    auto add_arg = [&map_config, &alias_names](const std::string & k, const std::string & v)
+    {
+        map_config->setString(k, v);
+
+        if (alias_names && !alias_names->contains(k))
+        {
+            std::string alias_key = k;
+            std::replace(alias_key.begin(), alias_key.end(), '-', '_');
+            if (alias_names->contains(alias_key))
+                map_config->setString(alias_key, v);
+        }
+    };
+
     for (const auto & arg : argv)
     {
         auto key_start = arg.find_first_not_of('-');
@@ -19,7 +35,7 @@ void argsToConfig(const Poco::Util::Application::ArgVec & argv, Poco::Util::Laye
         // old saved '--key', will set to some true value "1"
         if (!key.empty() && pos_minus != std::string::npos && pos_minus < key_start)
         {
-            map_config->setString(key, "1");
+            add_arg(key, "1");
             key = "";
         }
 
@@ -29,7 +45,7 @@ void argsToConfig(const Poco::Util::Application::ArgVec & argv, Poco::Util::Laye
             {
                 if (pos_minus == std::string::npos || pos_minus > key_start)
                 {
-                    map_config->setString(key, arg);
+                    add_arg(key, arg);
                 }
                 key = "";
             }
@@ -55,7 +71,7 @@ void argsToConfig(const Poco::Util::Application::ArgVec & argv, Poco::Util::Laye
         if (arg.size() > pos_eq)
             value = arg.substr(pos_eq + 1);
 
-        map_config->setString(key, value);
+        add_arg(key, value);
         key = "";
     }
 
diff --git a/base/base/argsToConfig.h b/base/base/argsToConfig.h
index 9b7b44b7b7f..ef34a8a2145 100644
--- a/base/base/argsToConfig.h
+++ b/base/base/argsToConfig.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <Poco/Util/Application.h>
+#include <string>
+#include <unordered_set>
 
 namespace Poco::Util
 {
@@ -8,4 +10,7 @@ class LayeredConfiguration; // NOLINT(cppcoreguidelines-virtual-class-destructor
 }
 
 /// Import extra command line arguments to configuration. These are command line arguments after --.
-void argsToConfig(const Poco::Util::Application::ArgVec & argv, Poco::Util::LayeredConfiguration & config, int priority);
+void argsToConfig(const Poco::Util::Application::ArgVec & argv,
+                  Poco::Util::LayeredConfiguration & config,
+                  int priority,
+                  const std::unordered_set<std::string>* registered_alias_names = nullptr);
diff --git a/base/base/coverage.cpp b/base/base/coverage.cpp
index 043f97f9593..1027638be3d 100644
--- a/base/base/coverage.cpp
+++ b/base/base/coverage.cpp
@@ -2,6 +2,8 @@
 
 #if WITH_COVERAGE
 
+#pragma GCC diagnostic ignored "-Wreserved-identifier"
+
 #    include <mutex>
 #    include <unistd.h>
 
diff --git a/base/base/defines.h b/base/base/defines.h
index 91c35dc28b6..6abf8155b95 100644
--- a/base/base/defines.h
+++ b/base/base/defines.h
@@ -73,18 +73,6 @@
 #    endif
 #endif
 
-#if defined(ADDRESS_SANITIZER)
-#    define BOOST_USE_ASAN 1
-#    define BOOST_USE_UCONTEXT 1
-#endif
-
-#if defined(THREAD_SANITIZER)
-#    define BOOST_USE_TSAN 1
-#    define BOOST_USE_UCONTEXT 1
-#endif
-
-/// TODO: Strange enough, there is no way to detect UB sanitizer.
-
 /// Explicitly allow undefined behaviour for certain functions. Use it as a function attribute.
 /// It is useful in case when compiler cannot see (and exploit) it, but UBSan can.
 /// Example: multiplication of signed integers with possibility of overflow when both sides are from user input.
diff --git a/base/base/find_symbols.h b/base/base/find_symbols.h
index 83f53773ae7..a8747ecc9b7 100644
--- a/base/base/find_symbols.h
+++ b/base/base/find_symbols.h
@@ -34,9 +34,51 @@
   * If no such characters, returns nullptr.
   */
 
+struct SearchSymbols
+{
+    static constexpr auto BUFFER_SIZE = 16;
+
+    SearchSymbols() = default;
+
+    explicit SearchSymbols(std::string in)
+        : str(std::move(in))
+    {
+#if defined(__SSE4_2__)
+        if (str.size() > BUFFER_SIZE)
+        {
+            throw std::runtime_error("SearchSymbols can contain at most " + std::to_string(BUFFER_SIZE) + " symbols and " + std::to_string(str.size()) + " was provided\n");
+        }
+
+        char tmp_safety_buffer[BUFFER_SIZE] = {0};
+
+        memcpy(tmp_safety_buffer, str.data(), str.size());
+
+        simd_vector = _mm_loadu_si128(reinterpret_cast<const __m128i *>(tmp_safety_buffer));
+#endif
+    }
+
+#if defined(__SSE4_2__)
+    __m128i simd_vector;
+#endif
+    std::string str;
+};
+
 namespace detail
 {
-template <char ...chars> constexpr bool is_in(char x) { return ((x == chars) || ...); }
+template <char ...chars> constexpr bool is_in(char x) { return ((x == chars) || ...); } // NOLINT(misc-redundant-expression)
+
+static bool is_in(char c, const char * symbols, size_t num_chars)
+{
+    for (size_t i = 0u; i < num_chars; ++i)
+    {
+        if (c == symbols[i])
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
 
 #if defined(__SSE2__)
 template <char s0>
@@ -53,6 +95,43 @@ inline __m128i mm_is_in(__m128i bytes)
     __m128i eq = mm_is_in<s1, tail...>(bytes);
     return _mm_or_si128(eq0, eq);
 }
+
+inline __m128i mm_is_in(__m128i bytes, const char * symbols, size_t num_chars)
+{
+    __m128i accumulator = _mm_setzero_si128();
+    for (size_t i = 0; i < num_chars; ++i)
+    {
+        __m128i eq = _mm_cmpeq_epi8(bytes, _mm_set1_epi8(symbols[i]));
+        accumulator = _mm_or_si128(accumulator, eq);
+    }
+
+    return accumulator;
+}
+
+inline std::array<__m128i, 16u> mm_is_in_prepare(const char * symbols, size_t num_chars)
+{
+    std::array<__m128i, 16u> result {};
+
+    for (size_t i = 0; i < num_chars; ++i)
+    {
+        result[i] = _mm_set1_epi8(symbols[i]);
+    }
+
+    return result;
+}
+
+inline __m128i mm_is_in_execute(__m128i bytes, const std::array<__m128i, 16u> & needles)
+{
+    __m128i accumulator = _mm_setzero_si128();
+
+    for (const auto & needle : needles)
+    {
+        __m128i eq = _mm_cmpeq_epi8(bytes, needle);
+        accumulator = _mm_or_si128(accumulator, eq);
+    }
+
+    return accumulator;
+}
 #endif
 
 template <bool positive>
@@ -99,6 +178,32 @@ inline const char * find_first_symbols_sse2(const char * const begin, const char
     return return_mode == ReturnMode::End ? end : nullptr;
 }
 
+template <bool positive, ReturnMode return_mode>
+inline const char * find_first_symbols_sse2(const char * const begin, const char * const end, const char * symbols, size_t num_chars)
+{
+    const char * pos = begin;
+
+#if defined(__SSE2__)
+    const auto needles = mm_is_in_prepare(symbols, num_chars);
+    for (; pos + 15 < end; pos += 16)
+    {
+        __m128i bytes = _mm_loadu_si128(reinterpret_cast<const __m128i *>(pos));
+
+        __m128i eq = mm_is_in_execute(bytes, needles);
+
+        uint16_t bit_mask = maybe_negate<positive>(uint16_t(_mm_movemask_epi8(eq)));
+        if (bit_mask)
+            return pos + __builtin_ctz(bit_mask);
+    }
+#endif
+
+    for (; pos < end; ++pos)
+        if (maybe_negate<positive>(is_in(*pos, symbols, num_chars)))
+            return pos;
+
+    return return_mode == ReturnMode::End ? end : nullptr;
+}
+
 
 template <bool positive, ReturnMode return_mode, char... symbols>
 inline const char * find_last_symbols_sse2(const char * const begin, const char * const end)
@@ -159,26 +264,61 @@ inline const char * find_first_symbols_sse42(const char * const begin, const cha
 #endif
 
     for (; pos < end; ++pos)
-        if (   (num_chars >= 1 && maybe_negate<positive>(*pos == c01))
-            || (num_chars >= 2 && maybe_negate<positive>(*pos == c02))
-            || (num_chars >= 3 && maybe_negate<positive>(*pos == c03))
-            || (num_chars >= 4 && maybe_negate<positive>(*pos == c04))
-            || (num_chars >= 5 && maybe_negate<positive>(*pos == c05))
-            || (num_chars >= 6 && maybe_negate<positive>(*pos == c06))
-            || (num_chars >= 7 && maybe_negate<positive>(*pos == c07))
-            || (num_chars >= 8 && maybe_negate<positive>(*pos == c08))
-            || (num_chars >= 9 && maybe_negate<positive>(*pos == c09))
-            || (num_chars >= 10 && maybe_negate<positive>(*pos == c10))
-            || (num_chars >= 11 && maybe_negate<positive>(*pos == c11))
-            || (num_chars >= 12 && maybe_negate<positive>(*pos == c12))
-            || (num_chars >= 13 && maybe_negate<positive>(*pos == c13))
-            || (num_chars >= 14 && maybe_negate<positive>(*pos == c14))
-            || (num_chars >= 15 && maybe_negate<positive>(*pos == c15))
-            || (num_chars >= 16 && maybe_negate<positive>(*pos == c16)))
+        if (   (num_chars == 1 && maybe_negate<positive>(is_in<c01>(*pos)))
+            || (num_chars == 2 && maybe_negate<positive>(is_in<c01, c02>(*pos)))
+            || (num_chars == 3 && maybe_negate<positive>(is_in<c01, c02, c03>(*pos)))
+            || (num_chars == 4 && maybe_negate<positive>(is_in<c01, c02, c03, c04>(*pos)))
+            || (num_chars == 5 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05>(*pos)))
+            || (num_chars == 6 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06>(*pos)))
+            || (num_chars == 7 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06, c07>(*pos)))
+            || (num_chars == 8 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06, c07, c08>(*pos)))
+            || (num_chars == 9 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06, c07, c08, c09>(*pos)))
+            || (num_chars == 10 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06, c07, c08, c09, c10>(*pos)))
+            || (num_chars == 11 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11>(*pos)))
+            || (num_chars == 12 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12>(*pos)))
+            || (num_chars == 13 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12, c13>(*pos)))
+            || (num_chars == 14 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12, c13, c14>(*pos)))
+            || (num_chars == 15 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12, c13, c14, c15>(*pos)))
+            || (num_chars == 16 && maybe_negate<positive>(is_in<c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12, c13, c14, c15, c16>(*pos))))
             return pos;
     return return_mode == ReturnMode::End ? end : nullptr;
 }
 
+template <bool positive, ReturnMode return_mode>
+inline const char * find_first_symbols_sse42(const char * const begin, const char * const end, const SearchSymbols & symbols)
+{
+    const char * pos = begin;
+
+    const auto num_chars = symbols.str.size();
+
+#if defined(__SSE4_2__)
+    constexpr int mode = _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT;
+
+    const __m128i set = symbols.simd_vector;
+
+    for (; pos + 15 < end; pos += 16)
+    {
+        __m128i bytes = _mm_loadu_si128(reinterpret_cast<const __m128i *>(pos));
+
+        if constexpr (positive)
+        {
+            if (_mm_cmpestrc(set, num_chars, bytes, 16, mode))
+                return pos + _mm_cmpestri(set, num_chars, bytes, 16, mode);
+        }
+        else
+        {
+            if (_mm_cmpestrc(set, num_chars, bytes, 16, mode | _SIDD_NEGATIVE_POLARITY))
+                return pos + _mm_cmpestri(set, num_chars, bytes, 16, mode | _SIDD_NEGATIVE_POLARITY);
+        }
+    }
+#endif
+
+    for (; pos < end; ++pos)
+        if (maybe_negate<positive>(is_in(*pos, symbols.str.data(), num_chars)))
+            return pos;
+
+    return return_mode == ReturnMode::End ? end : nullptr;
+}
 
 /// NOTE No SSE 4.2 implementation for find_last_symbols_or_null. Not worth to do.
 
@@ -194,6 +334,17 @@ inline const char * find_first_symbols_dispatch(const char * begin, const char *
         return find_first_symbols_sse2<positive, return_mode, symbols...>(begin, end);
 }
 
+template <bool positive, ReturnMode return_mode>
+inline const char * find_first_symbols_dispatch(const std::string_view haystack, const SearchSymbols & symbols)
+{
+#if defined(__SSE4_2__)
+    if (symbols.str.size() >= 5)
+        return find_first_symbols_sse42<positive, return_mode>(haystack.begin(), haystack.end(), symbols);
+    else
+#endif
+        return find_first_symbols_sse2<positive, return_mode>(haystack.begin(), haystack.end(), symbols.str.data(), symbols.str.size());
+}
+
 }
 
 
@@ -211,6 +362,11 @@ inline char * find_first_symbols(char * begin, char * end)
     return const_cast<char *>(detail::find_first_symbols_dispatch<true, detail::ReturnMode::End, symbols...>(begin, end));
 }
 
+inline const char * find_first_symbols(std::string_view haystack, const SearchSymbols & symbols)
+{
+    return detail::find_first_symbols_dispatch<true, detail::ReturnMode::End>(haystack, symbols);
+}
+
 template <char... symbols>
 inline const char * find_first_not_symbols(const char * begin, const char * end)
 {
@@ -223,6 +379,11 @@ inline char * find_first_not_symbols(char * begin, char * end)
     return const_cast<char *>(detail::find_first_symbols_dispatch<false, detail::ReturnMode::End, symbols...>(begin, end));
 }
 
+inline const char * find_first_not_symbols(std::string_view haystack, const SearchSymbols & symbols)
+{
+    return detail::find_first_symbols_dispatch<false, detail::ReturnMode::End>(haystack, symbols);
+}
+
 template <char... symbols>
 inline const char * find_first_symbols_or_null(const char * begin, const char * end)
 {
@@ -235,6 +396,11 @@ inline char * find_first_symbols_or_null(char * begin, char * end)
     return const_cast<char *>(detail::find_first_symbols_dispatch<true, detail::ReturnMode::Nullptr, symbols...>(begin, end));
 }
 
+inline const char * find_first_symbols_or_null(std::string_view haystack, const SearchSymbols & symbols)
+{
+    return detail::find_first_symbols_dispatch<true, detail::ReturnMode::Nullptr>(haystack, symbols);
+}
+
 template <char... symbols>
 inline const char * find_first_not_symbols_or_null(const char * begin, const char * end)
 {
@@ -247,6 +413,10 @@ inline char * find_first_not_symbols_or_null(char * begin, char * end)
     return const_cast<char *>(detail::find_first_symbols_dispatch<false, detail::ReturnMode::Nullptr, symbols...>(begin, end));
 }
 
+inline const char * find_first_not_symbols_or_null(std::string_view haystack, const SearchSymbols & symbols)
+{
+    return detail::find_first_symbols_dispatch<false, detail::ReturnMode::Nullptr>(haystack, symbols);
+}
 
 template <char... symbols>
 inline const char * find_last_symbols_or_null(const char * begin, const char * end)
diff --git a/base/base/hex.h b/base/base/hex.h
new file mode 100644
index 00000000000..b8cf95db893
--- /dev/null
+++ b/base/base/hex.h
@@ -0,0 +1,215 @@
+#pragma once
+
+#include <bit>
+#include <cstring>
+#include "types.h"
+
+/// Maps 0..15 to 0..9A..F or 0..9a..f correspondingly.
+
+constexpr inline std::string_view hex_digit_to_char_uppercase_table = "0123456789ABCDEF";
+constexpr inline std::string_view hex_digit_to_char_lowercase_table = "0123456789abcdef";
+
+constexpr char hexDigitUppercase(unsigned char c)
+{
+    return hex_digit_to_char_uppercase_table[c];
+}
+constexpr char hexDigitLowercase(unsigned char c)
+{
+    return hex_digit_to_char_lowercase_table[c];
+}
+
+/// Maps 0..255 to 00..FF or 00..ff correspondingly
+
+constexpr inline std::string_view hex_byte_to_char_uppercase_table = //
+    "000102030405060708090A0B0C0D0E0F"
+    "101112131415161718191A1B1C1D1E1F"
+    "202122232425262728292A2B2C2D2E2F"
+    "303132333435363738393A3B3C3D3E3F"
+    "404142434445464748494A4B4C4D4E4F"
+    "505152535455565758595A5B5C5D5E5F"
+    "606162636465666768696A6B6C6D6E6F"
+    "707172737475767778797A7B7C7D7E7F"
+    "808182838485868788898A8B8C8D8E8F"
+    "909192939495969798999A9B9C9D9E9F"
+    "A0A1A2A3A4A5A6A7A8A9AAABACADAEAF"
+    "B0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF"
+    "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECF"
+    "D0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF"
+    "E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF"
+    "F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF";
+
+constexpr inline std::string_view hex_byte_to_char_lowercase_table = //
+    "000102030405060708090a0b0c0d0e0f"
+    "101112131415161718191a1b1c1d1e1f"
+    "202122232425262728292a2b2c2d2e2f"
+    "303132333435363738393a3b3c3d3e3f"
+    "404142434445464748494a4b4c4d4e4f"
+    "505152535455565758595a5b5c5d5e5f"
+    "606162636465666768696a6b6c6d6e6f"
+    "707172737475767778797a7b7c7d7e7f"
+    "808182838485868788898a8b8c8d8e8f"
+    "909192939495969798999a9b9c9d9e9f"
+    "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
+    "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
+    "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
+    "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
+    "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
+    "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff";
+
+inline void writeHexByteUppercase(UInt8 byte, void * out)
+{
+    memcpy(out, &hex_byte_to_char_uppercase_table[static_cast<size_t>(byte) * 2], 2);
+}
+
+inline void writeHexByteLowercase(UInt8 byte, void * out)
+{
+    memcpy(out, &hex_byte_to_char_lowercase_table[static_cast<size_t>(byte) * 2], 2);
+}
+
+constexpr inline std::string_view bin_byte_to_char_table = //
+    "0000000000000001000000100000001100000100000001010000011000000111"
+    "0000100000001001000010100000101100001100000011010000111000001111"
+    "0001000000010001000100100001001100010100000101010001011000010111"
+    "0001100000011001000110100001101100011100000111010001111000011111"
+    "0010000000100001001000100010001100100100001001010010011000100111"
+    "0010100000101001001010100010101100101100001011010010111000101111"
+    "0011000000110001001100100011001100110100001101010011011000110111"
+    "0011100000111001001110100011101100111100001111010011111000111111"
+    "0100000001000001010000100100001101000100010001010100011001000111"
+    "0100100001001001010010100100101101001100010011010100111001001111"
+    "0101000001010001010100100101001101010100010101010101011001010111"
+    "0101100001011001010110100101101101011100010111010101111001011111"
+    "0110000001100001011000100110001101100100011001010110011001100111"
+    "0110100001101001011010100110101101101100011011010110111001101111"
+    "0111000001110001011100100111001101110100011101010111011001110111"
+    "0111100001111001011110100111101101111100011111010111111001111111"
+    "1000000010000001100000101000001110000100100001011000011010000111"
+    "1000100010001001100010101000101110001100100011011000111010001111"
+    "1001000010010001100100101001001110010100100101011001011010010111"
+    "1001100010011001100110101001101110011100100111011001111010011111"
+    "1010000010100001101000101010001110100100101001011010011010100111"
+    "1010100010101001101010101010101110101100101011011010111010101111"
+    "1011000010110001101100101011001110110100101101011011011010110111"
+    "1011100010111001101110101011101110111100101111011011111010111111"
+    "1100000011000001110000101100001111000100110001011100011011000111"
+    "1100100011001001110010101100101111001100110011011100111011001111"
+    "1101000011010001110100101101001111010100110101011101011011010111"
+    "1101100011011001110110101101101111011100110111011101111011011111"
+    "1110000011100001111000101110001111100100111001011110011011100111"
+    "1110100011101001111010101110101111101100111011011110111011101111"
+    "1111000011110001111100101111001111110100111101011111011011110111"
+    "1111100011111001111110101111101111111100111111011111111011111111";
+
+inline void writeBinByte(UInt8 byte, void * out)
+{
+    memcpy(out, &bin_byte_to_char_table[static_cast<size_t>(byte) * 8], 8);
+}
+
+/// Produces hex representation of an unsigned int with leading zeros (for checksums)
+template <typename TUInt>
+inline void writeHexUIntImpl(TUInt uint_, char * out, std::string_view table)
+{
+    union
+    {
+        TUInt value;
+        UInt8 uint8[sizeof(TUInt)];
+    };
+
+    value = uint_;
+
+    for (size_t i = 0; i < sizeof(TUInt); ++i)
+    {
+        if constexpr (std::endian::native == std::endian::little)
+            memcpy(out + i * 2, &table[static_cast<size_t>(uint8[sizeof(TUInt) - 1 - i]) * 2], 2);
+        else
+            memcpy(out + i * 2, &table[static_cast<size_t>(uint8[i]) * 2], 2);
+    }
+}
+
+template <typename TUInt>
+inline void writeHexUIntUppercase(TUInt uint_, char * out)
+{
+    writeHexUIntImpl(uint_, out, hex_byte_to_char_uppercase_table);
+}
+
+template <typename TUInt>
+inline void writeHexUIntLowercase(TUInt uint_, char * out)
+{
+    writeHexUIntImpl(uint_, out, hex_byte_to_char_lowercase_table);
+}
+
+template <typename TUInt>
+std::string getHexUIntUppercase(TUInt uint_)
+{
+    std::string res(sizeof(TUInt) * 2, '\0');
+    writeHexUIntUppercase(uint_, res.data());
+    return res;
+}
+
+template <typename TUInt>
+std::string getHexUIntLowercase(TUInt uint_)
+{
+    std::string res(sizeof(TUInt) * 2, '\0');
+    writeHexUIntLowercase(uint_, res.data());
+    return res;
+}
+
+/// Maps 0..9, A..F, a..f to 0..15. Other chars are mapped to implementation specific value.
+
+constexpr inline std::string_view hex_char_to_digit_table
+    = {"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\xff\xff\xff\xff\xff\xff" //0-9
+       "\xff\x0a\x0b\x0c\x0d\x0e\x0f\xff\xff\xff\xff\xff\xff\xff\xff\xff" //A-Z
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\x0a\x0b\x0c\x0d\x0e\x0f\xff\xff\xff\xff\xff\xff\xff\xff\xff" //a-z
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+       "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
+       256};
+
+constexpr UInt8 unhex(char c)
+{
+    return hex_char_to_digit_table[static_cast<UInt8>(c)];
+}
+
+constexpr UInt8 unhex2(const char * data)
+{
+    return static_cast<UInt8>(unhex(data[0])) * 0x10 + static_cast<UInt8>(unhex(data[1]));
+}
+
+constexpr UInt16 unhex4(const char * data)
+{
+    return static_cast<UInt16>(unhex(data[0])) * 0x1000 + static_cast<UInt16>(unhex(data[1])) * 0x100
+        + static_cast<UInt16>(unhex(data[2])) * 0x10 + static_cast<UInt16>(unhex(data[3]));
+}
+
+template <typename TUInt>
+constexpr TUInt unhexUInt(const char * data)
+{
+    TUInt res = 0;
+    if constexpr ((sizeof(TUInt) <= 8) || ((sizeof(TUInt) % 8) != 0))
+    {
+        for (size_t i = 0; i < sizeof(TUInt) * 2; ++i, ++data)
+        {
+            res <<= 4;
+            res += unhex(*data);
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < sizeof(TUInt) / 8; ++i, data += 16)
+        {
+            res <<= 64;
+            res += unhexUInt<UInt64>(data);
+        }
+    }
+    return res;
+}
diff --git a/base/base/interpolate.h b/base/base/interpolate.h
new file mode 100644
index 00000000000..1d4fc0b6257
--- /dev/null
+++ b/base/base/interpolate.h
@@ -0,0 +1,13 @@
+#pragma once
+#include <cassert>
+#include <cmath>
+
+/** Linear interpolation in logarithmic coordinates.
+  * Exponential interpolation is related to linear interpolation
+  * exactly in same way as geometric mean is related to arithmetic mean.
+  */
+constexpr double interpolateExponential(double min, double max, double ratio)
+{
+    assert(min > 0 && ratio >= 0 && ratio <= 1);
+    return min * std::pow(max / min, ratio);
+}
diff --git a/base/base/phdr_cache.cpp b/base/base/phdr_cache.cpp
index c3d7fed2d3f..7d37f01b560 100644
--- a/base/base/phdr_cache.cpp
+++ b/base/base/phdr_cache.cpp
@@ -1,6 +1,4 @@
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 /// This code was based on the code by Fedor Korotkiy https://www.linkedin.com/in/fedor-korotkiy-659a1838/
 
diff --git a/base/base/strong_typedef.h b/base/base/strong_typedef.h
index 2ddea6412f5..b3b8bced688 100644
--- a/base/base/strong_typedef.h
+++ b/base/base/strong_typedef.h
@@ -35,7 +35,7 @@ public:
     Self & operator=(T && rhs) { t = std::move(rhs); return *this;}
 
     // NOLINTBEGIN(google-explicit-constructor)
-    operator const T & () const { return t; }
+    constexpr operator const T & () const { return t; }
     operator T & () { return t; }
     // NOLINTEND(google-explicit-constructor)
 
diff --git a/base/base/unaligned.h b/base/base/unaligned.h
index fcaaa38f2fe..3ab25c803bb 100644
--- a/base/base/unaligned.h
+++ b/base/base/unaligned.h
@@ -5,44 +5,6 @@
 #include <bit>
 
 
-inline void reverseMemcpy(void * dst, const void * src, size_t size)
-{
-    uint8_t * uint_dst = reinterpret_cast<uint8_t *>(dst);
-    const uint8_t * uint_src = reinterpret_cast<const uint8_t *>(src);
-
-    uint_dst += size;
-    while (size)
-    {
-        --uint_dst;
-        *uint_dst = *uint_src;
-        ++uint_src;
-        --size;
-    }
-}
-
-template <typename T>
-inline T unalignedLoadLE(const void * address)
-{
-    T res {};
-    if constexpr (std::endian::native == std::endian::little)
-        memcpy(&res, address, sizeof(res));
-    else
-        reverseMemcpy(&res, address, sizeof(res));
-    return res;
-}
-
-
-template <typename T>
-inline void unalignedStoreLE(void * address,
-                           const typename std::enable_if<true, T>::type & src)
-{
-    static_assert(std::is_trivially_copyable_v<T>);
-    if constexpr (std::endian::native == std::endian::little)
-        memcpy(address, &src, sizeof(src));
-    else
-        reverseMemcpy(address, &src, sizeof(src));
-}
-
 template <typename T>
 inline T unalignedLoad(const void * address)
 {
@@ -62,3 +24,70 @@ inline void unalignedStore(void * address,
     static_assert(std::is_trivially_copyable_v<T>);
     memcpy(address, &src, sizeof(src));
 }
+
+
+inline void reverseMemcpy(void * dst, const void * src, size_t size)
+{
+    uint8_t * uint_dst = reinterpret_cast<uint8_t *>(dst);
+    const uint8_t * uint_src = reinterpret_cast<const uint8_t *>(src);
+
+    uint_dst += size;
+    while (size)
+    {
+        --uint_dst;
+        *uint_dst = *uint_src;
+        ++uint_src;
+        --size;
+    }
+}
+
+template <std::endian endian, typename T>
+inline T unalignedLoadEndian(const void * address)
+{
+    T res {};
+    if constexpr (std::endian::native == endian)
+        memcpy(&res, address, sizeof(res));
+    else
+        reverseMemcpy(&res, address, sizeof(res));
+    return res;
+}
+
+
+template <std::endian endian, typename T>
+inline void unalignedStoreEndian(void * address, T & src)
+{
+    static_assert(std::is_trivially_copyable_v<T>);
+    if constexpr (std::endian::native == endian)
+        memcpy(address, &src, sizeof(src));
+    else
+        reverseMemcpy(address, &src, sizeof(src));
+}
+
+
+template <typename T>
+inline T unalignedLoadLittleEndian(const void * address)
+{
+    return unalignedLoadEndian<std::endian::little, T>(address);
+}
+
+
+template <typename T>
+inline void unalignedStoreLittleEndian(void * address,
+    const typename std::enable_if<true, T>::type & src)
+{
+    unalignedStoreEndian<std::endian::little>(address, src);
+}
+
+template <typename T>
+inline T unalignedLoadBigEndian(const void * address)
+{
+    return unalignedLoadEndian<std::endian::big, T>(address);
+}
+
+
+template <typename T>
+inline void unalignedStoreBigEndian(void * address,
+    const typename std::enable_if<true, T>::type & src)
+{
+    unalignedStoreEndian<std::endian::big>(address, src);
+}
diff --git a/base/base/unit.h b/base/base/unit.h
index 1fb530be1f0..0fc314af479 100644
--- a/base/base/unit.h
+++ b/base/base/unit.h
@@ -5,10 +5,8 @@ constexpr size_t KiB = 1024;
 constexpr size_t MiB = 1024 * KiB;
 constexpr size_t GiB = 1024 * MiB;
 
-#ifdef HAS_RESERVED_IDENTIFIER
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-identifier"
 
 // NOLINTBEGIN(google-runtime-int)
 constexpr size_t operator"" _KiB(unsigned long long val) { return val * KiB; }
@@ -16,6 +14,4 @@ constexpr size_t operator"" _MiB(unsigned long long val) { return val * MiB; }
 constexpr size_t operator"" _GiB(unsigned long long val) { return val * GiB; }
 // NOLINTEND(google-runtime-int)
 
-#ifdef HAS_RESERVED_IDENTIFIER
-#  pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
diff --git a/base/base/wide_integer_impl.h b/base/base/wide_integer_impl.h
index 4a54c0fb2a4..4a80c176829 100644
--- a/base/base/wide_integer_impl.h
+++ b/base/base/wide_integer_impl.h
@@ -155,13 +155,13 @@ struct common_type<wide::integer<Bits, Signed>, Arithmetic>
         std::is_floating_point_v<Arithmetic>,
         Arithmetic,
         std::conditional_t<
-            sizeof(Arithmetic) < Bits * sizeof(long),
+            sizeof(Arithmetic) * 8 < Bits,
             wide::integer<Bits, Signed>,
             std::conditional_t<
-                Bits * sizeof(long) < sizeof(Arithmetic),
+                Bits < sizeof(Arithmetic) * 8,
                 Arithmetic,
                 std::conditional_t<
-                    Bits * sizeof(long) == sizeof(Arithmetic) && (std::is_same_v<Signed, signed> || std::is_signed_v<Arithmetic>),
+                    Bits == sizeof(Arithmetic) * 8 && (std::is_same_v<Signed, signed> || std::is_signed_v<Arithmetic>),
                     Arithmetic,
                     wide::integer<Bits, Signed>>>>>;
 };
@@ -314,7 +314,14 @@ struct integer<Bits, Signed>::_impl
 
         const T alpha = t / static_cast<T>(max_int);
 
-        if (alpha <= static_cast<T>(max_int))
+        /** Here we have to use strict comparison.
+          * The max_int is 2^64 - 1.
+          * When casted to floating point type, it will be rounded to the closest representable number,
+          * which is 2^64.
+          * But 2^64 is not representable in uint64_t,
+          * so the maximum representable number will be strictly less.
+          */
+        if (alpha < static_cast<T>(max_int))
             self = static_cast<uint64_t>(alpha);
         else // max(double) / 2^64 will surely contain less than 52 precision bits, so speed up computations.
             set_multiplier<double>(self, static_cast<double>(alpha));
@@ -732,9 +739,10 @@ public:
             if (std::numeric_limits<T>::is_signed && (is_negative(lhs) != is_negative(rhs)))
                 return is_negative(rhs);
 
+            integer<Bits, Signed> t = rhs;
             for (unsigned i = 0; i < item_count; ++i)
             {
-                base_type rhs_item = get_item(rhs, big(i));
+                base_type rhs_item = get_item(t, big(i));
 
                 if (lhs.items[big(i)] != rhs_item)
                     return lhs.items[big(i)] > rhs_item;
@@ -757,9 +765,10 @@ public:
             if (std::numeric_limits<T>::is_signed && (is_negative(lhs) != is_negative(rhs)))
                 return is_negative(lhs);
 
+            integer<Bits, Signed> t = rhs;
             for (unsigned i = 0; i < item_count; ++i)
             {
-                base_type rhs_item = get_item(rhs, big(i));
+                base_type rhs_item = get_item(t, big(i));
 
                 if (lhs.items[big(i)] != rhs_item)
                     return lhs.items[big(i)] < rhs_item;
@@ -779,9 +788,10 @@ public:
     {
         if constexpr (should_keep_size<T>())
         {
+            integer<Bits, Signed> t = rhs;
             for (unsigned i = 0; i < item_count; ++i)
             {
-                base_type rhs_item = get_item(rhs, any(i));
+                base_type rhs_item = get_item(t, any(i));
 
                 if (lhs.items[any(i)] != rhs_item)
                     return false;
@@ -1239,7 +1249,7 @@ constexpr integer<Bits, Signed>::operator long double() const noexcept
     for (unsigned i = 0; i < _impl::item_count; ++i)
     {
         long double t = res;
-        res *= std::numeric_limits<base_type>::max();
+        res *= static_cast<long double>(std::numeric_limits<base_type>::max());
         res += t;
         res += tmp.items[_impl::big(i)];
     }
diff --git a/base/base/wide_integer_to_string.h b/base/base/wide_integer_to_string.h
index 160bf599516..c2cbe8d82e3 100644
--- a/base/base/wide_integer_to_string.h
+++ b/base/base/wide_integer_to_string.h
@@ -64,6 +64,6 @@ struct fmt::formatter<wide::integer<Bits, Signed>>
     template <typename FormatContext>
     auto format(const wide::integer<Bits, Signed> & value, FormatContext & ctx)
     {
-        return format_to(ctx.out(), "{}", to_string(value));
+        return fmt::format_to(ctx.out(), "{}", to_string(value));
     }
 };
diff --git a/base/glibc-compatibility/glibc-compatibility.c b/base/glibc-compatibility/glibc-compatibility.c
index 7e8ea5051d7..49bb81a58be 100644
--- a/base/glibc-compatibility/glibc-compatibility.c
+++ b/base/glibc-compatibility/glibc-compatibility.c
@@ -235,6 +235,17 @@ ssize_t getrandom(void *buf, size_t buflen, unsigned flags)
     return syscall(SYS_getrandom, buf, buflen, flags);
 }
 
+/* Structure for scatter/gather I/O.  */
+struct iovec
+{
+    void *iov_base;    /* Pointer to data.  */
+    size_t iov_len;    /* Length of data.  */
+};
+
+ssize_t preadv(int __fd, const struct iovec *__iovec, int __count, __off_t __offset)
+{
+    return syscall(SYS_preadv, __fd, __iovec, __count, (long)(__offset), (long)(__offset>>32));
+}
 
 #include <errno.h>
 #include <limits.h>
diff --git a/base/glibc-compatibility/musl/expf.c b/base/glibc-compatibility/musl/expf.c
new file mode 100644
index 00000000000..0a59236d1c0
--- /dev/null
+++ b/base/glibc-compatibility/musl/expf.c
@@ -0,0 +1,81 @@
+/* origin: FreeBSD /usr/src/lib/msun/src/e_expf.c */
+/*
+ * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
+ */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#include "libm.h"
+
+static const float
+    half[2] = {0.5,-0.5},
+    ln2hi   = 6.9314575195e-1f,  /* 0x3f317200 */
+    ln2lo   = 1.4286067653e-6f,  /* 0x35bfbe8e */
+    invln2  = 1.4426950216e+0f,  /* 0x3fb8aa3b */
+    /*
+ * Domain [-0.34568, 0.34568], range ~[-4.278e-9, 4.447e-9]:
+ * |x*(exp(x)+1)/(exp(x)-1) - p(x)| < 2**-27.74
+ */
+    P1 =  1.6666625440e-1f, /*  0xaaaa8f.0p-26 */
+    P2 = -2.7667332906e-3f; /* -0xb55215.0p-32 */
+
+float expf(float x)
+{
+    float_t hi, lo, c, xx, y;
+    int k, sign;
+    uint32_t hx;
+
+    GET_FLOAT_WORD(hx, x);
+    sign = hx >> 31;   /* sign bit of x */
+    hx &= 0x7fffffff;  /* high word of |x| */
+
+    /* special cases */
+    if (hx >= 0x42aeac50) {  /* if |x| >= -87.33655f or NaN */
+        if (hx >= 0x42b17218 && !sign) {  /* x >= 88.722839f */
+            /* overflow */
+            x *= 0x1p127f;
+            return x;
+        }
+        if (sign) {
+            /* underflow */
+            FORCE_EVAL(-0x1p-149f/x);
+            if (hx >= 0x42cff1b5)  /* x <= -103.972084f */
+                return 0;
+        }
+    }
+
+    /* argument reduction */
+    if (hx > 0x3eb17218) {  /* if |x| > 0.5 ln2 */
+        if (hx > 0x3f851592)  /* if |x| > 1.5 ln2 */
+            k = invln2*x + half[sign];
+        else
+            k = 1 - sign - sign;
+        hi = x - k*ln2hi;  /* k*ln2hi is exact here */
+        lo = k*ln2lo;
+        x = hi - lo;
+    } else if (hx > 0x39000000) {  /* |x| > 2**-14 */
+        k = 0;
+        hi = x;
+        lo = 0;
+    } else {
+        /* raise inexact */
+        FORCE_EVAL(0x1p127f + x);
+        return 1 + x;
+    }
+
+    /* x is now in primary range */
+    xx = x*x;
+    c = x - xx*(P1+xx*P2);
+    y = 1 + (x*c/(2-c) - lo + hi);
+    if (k == 0)
+        return y;
+    return scalbnf(y, k);
+}
\ No newline at end of file
diff --git a/base/glibc-compatibility/musl/logf.c b/base/glibc-compatibility/musl/logf.c
index 7ee5d7fe623..e4c2237caa2 100644
--- a/base/glibc-compatibility/musl/logf.c
+++ b/base/glibc-compatibility/musl/logf.c
@@ -53,7 +53,7 @@ float logf(float x)
 	tmp = ix - OFF;
 	i = (tmp >> (23 - LOGF_TABLE_BITS)) % N;
 	k = (int32_t)tmp >> 23; /* arithmetic shift */
-	iz = ix - (tmp & 0x1ff << 23);
+	iz = ix - (tmp & 0xff800000);
 	invc = T[i].invc;
 	logc = T[i].logc;
 	z = (double_t)asfloat(iz);
diff --git a/base/glibc-compatibility/musl/scalbnf.c b/base/glibc-compatibility/musl/scalbnf.c
new file mode 100644
index 00000000000..cf56cacfb5f
--- /dev/null
+++ b/base/glibc-compatibility/musl/scalbnf.c
@@ -0,0 +1,31 @@
+#include <math.h>
+#include <stdint.h>
+
+float scalbnf(float x, int n)
+{
+    union {float f; uint32_t i;} u;
+    float_t y = x;
+
+    if (n > 127) {
+        y *= 0x1p127f;
+        n -= 127;
+        if (n > 127) {
+            y *= 0x1p127f;
+            n -= 127;
+            if (n > 127)
+                n = 127;
+        }
+    } else if (n < -126) {
+        y *= 0x1p-126f;
+        n += 126;
+        if (n < -126) {
+            y *= 0x1p-126f;
+            n += 126;
+            if (n < -126)
+                n = -126;
+        }
+    }
+    u.i = (uint32_t)(0x7f+n)<<23;
+    x = y * u.f;
+    return x;
+}
diff --git a/base/harmful/harmful.c b/base/harmful/harmful.c
index 6112f9a339c..78796ca0c05 100644
--- a/base/harmful/harmful.c
+++ b/base/harmful/harmful.c
@@ -31,7 +31,8 @@ TRAP(argp_state_help)
 TRAP(argp_usage)
 TRAP(asctime)
 TRAP(clearenv)
-TRAP(crypt)
+// Redefined at contrib/libbcrypt/crypt_blowfish/wrapper.c:186
+// TRAP(crypt)
 TRAP(ctime)
 TRAP(cuserid)
 TRAP(drand48)
diff --git a/base/poco/Crypto/include/Poco/Crypto/ECKeyImpl.h b/base/poco/Crypto/include/Poco/Crypto/ECKeyImpl.h
index 2a72861a84e..d051ef1b768 100644
--- a/base/poco/Crypto/include/Poco/Crypto/ECKeyImpl.h
+++ b/base/poco/Crypto/include/Poco/Crypto/ECKeyImpl.h
@@ -90,20 +90,6 @@ namespace Crypto
         std::string groupName() const;
         /// Returns the EC key group name.
 
-        void save(const std::string & publicKeyFile, const std::string & privateKeyFile = "", const std::string & privateKeyPassphrase = "")
-            const;
-        /// Exports the public and private keys to the given files.
-        ///
-        /// If an empty filename is specified, the corresponding key
-        /// is not exported.
-
-        void
-        save(std::ostream * pPublicKeyStream, std::ostream * pPrivateKeyStream = 0, const std::string & privateKeyPassphrase = "") const;
-        /// Exports the public and private key to the given streams.
-        ///
-        /// If a null pointer is passed for a stream, the corresponding
-        /// key is not exported.
-
         static std::string getCurveName(int nid = -1);
         /// Returns elliptical curve name corresponding to
         /// the given nid; if nid is not found, returns
@@ -150,22 +136,6 @@ namespace Crypto
     {
         return OBJ_nid2sn(groupId());
     }
-
-
-    inline void
-    ECKeyImpl::save(const std::string & publicKeyFile, const std::string & privateKeyFile, const std::string & privateKeyPassphrase) const
-    {
-        EVPPKey(_pEC).save(publicKeyFile, privateKeyFile, privateKeyPassphrase);
-    }
-
-
-    inline void
-    ECKeyImpl::save(std::ostream * pPublicKeyStream, std::ostream * pPrivateKeyStream, const std::string & privateKeyPassphrase) const
-    {
-        EVPPKey(_pEC).save(pPublicKeyStream, pPrivateKeyStream, privateKeyPassphrase);
-    }
-
-
 }
 } // namespace Poco::Crypto
 
diff --git a/base/poco/Crypto/include/Poco/Crypto/KeyPair.h b/base/poco/Crypto/include/Poco/Crypto/KeyPair.h
index 36adbec6a4d..291a0f8b749 100644
--- a/base/poco/Crypto/include/Poco/Crypto/KeyPair.h
+++ b/base/poco/Crypto/include/Poco/Crypto/KeyPair.h
@@ -56,24 +56,6 @@ namespace Crypto
         virtual int size() const;
         /// Returns the RSA modulus size.
 
-        virtual void save(
-            const std::string & publicKeyPairFile,
-            const std::string & privateKeyPairFile = "",
-            const std::string & privateKeyPairPassphrase = "") const;
-        /// Exports the public and private keys to the given files.
-        ///
-        /// If an empty filename is specified, the corresponding key
-        /// is not exported.
-
-        virtual void save(
-            std::ostream * pPublicKeyPairStream,
-            std::ostream * pPrivateKeyPairStream = 0,
-            const std::string & privateKeyPairPassphrase = "") const;
-        /// Exports the public and private key to the given streams.
-        ///
-        /// If a null pointer is passed for a stream, the corresponding
-        /// key is not exported.
-
         KeyPairImpl::Ptr impl() const;
         /// Returns the impl object.
 
@@ -97,21 +79,6 @@ namespace Crypto
         return _pImpl->size();
     }
 
-
-    inline void
-    KeyPair::save(const std::string & publicKeyFile, const std::string & privateKeyFile, const std::string & privateKeyPassphrase) const
-    {
-        _pImpl->save(publicKeyFile, privateKeyFile, privateKeyPassphrase);
-    }
-
-
-    inline void
-    KeyPair::save(std::ostream * pPublicKeyStream, std::ostream * pPrivateKeyStream, const std::string & privateKeyPassphrase) const
-    {
-        _pImpl->save(pPublicKeyStream, pPrivateKeyStream, privateKeyPassphrase);
-    }
-
-
     inline const std::string & KeyPair::name() const
     {
         return _pImpl->name();
diff --git a/base/poco/Crypto/include/Poco/Crypto/KeyPairImpl.h b/base/poco/Crypto/include/Poco/Crypto/KeyPairImpl.h
index 155efd20b9c..ecafbef0241 100644
--- a/base/poco/Crypto/include/Poco/Crypto/KeyPairImpl.h
+++ b/base/poco/Crypto/include/Poco/Crypto/KeyPairImpl.h
@@ -55,22 +55,6 @@ namespace Crypto
         virtual int size() const = 0;
         /// Returns the key size.
 
-        virtual void save(
-            const std::string & publicKeyFile,
-            const std::string & privateKeyFile = "",
-            const std::string & privateKeyPassphrase = "") const = 0;
-        /// Exports the public and private keys to the given files.
-        ///
-        /// If an empty filename is specified, the corresponding key
-        /// is not exported.
-
-        virtual void save(
-            std::ostream * pPublicKeyStream, std::ostream * pPrivateKeyStream = 0, const std::string & privateKeyPassphrase = "") const = 0;
-        /// Exports the public and private key to the given streams.
-        ///
-        /// If a null pointer is passed for a stream, the corresponding
-        /// key is not exported.
-
         const std::string & name() const;
         /// Returns key pair name
 
diff --git a/base/poco/Crypto/include/Poco/Crypto/RSAKeyImpl.h b/base/poco/Crypto/include/Poco/Crypto/RSAKeyImpl.h
index 4ccbb324c06..010c68bacd7 100644
--- a/base/poco/Crypto/include/Poco/Crypto/RSAKeyImpl.h
+++ b/base/poco/Crypto/include/Poco/Crypto/RSAKeyImpl.h
@@ -96,20 +96,6 @@ namespace Crypto
         ByteVec decryptionExponent() const;
         /// Returns the RSA decryption exponent.
 
-        void save(const std::string & publicKeyFile, const std::string & privateKeyFile = "", const std::string & privateKeyPassphrase = "")
-            const;
-        /// Exports the public and private keys to the given files.
-        ///
-        /// If an empty filename is specified, the corresponding key
-        /// is not exported.
-
-        void
-        save(std::ostream * pPublicKeyStream, std::ostream * pPrivateKeyStream = 0, const std::string & privateKeyPassphrase = "") const;
-        /// Exports the public and private key to the given streams.
-        ///
-        /// If a null pointer is passed for a stream, the corresponding
-        /// key is not exported.
-
     private:
         RSAKeyImpl();
 
@@ -139,4 +125,4 @@ namespace Crypto
 } // namespace Poco::Crypto
 
 
-#endif // Crypto_RSAKeyImplImpl_INCLUDED
\ No newline at end of file
+#endif // Crypto_RSAKeyImplImpl_INCLUDED
diff --git a/base/poco/Crypto/src/RSAKeyImpl.cpp b/base/poco/Crypto/src/RSAKeyImpl.cpp
index eb6e758343a..229a3bce828 100644
--- a/base/poco/Crypto/src/RSAKeyImpl.cpp
+++ b/base/poco/Crypto/src/RSAKeyImpl.cpp
@@ -269,103 +269,6 @@ RSAKeyImpl::ByteVec RSAKeyImpl::decryptionExponent() const
 }
 
 
-void RSAKeyImpl::save(const std::string& publicKeyFile,
-	const std::string& privateKeyFile,
-	const std::string& privateKeyPassphrase) const
-{
-	if (!publicKeyFile.empty())
-	{
-		BIO* bio = BIO_new(BIO_s_file());
-		if (!bio) throw Poco::IOException("Cannot create BIO for writing public key file", publicKeyFile);
-		try
-		{
-			if (BIO_write_filename(bio, const_cast<char*>(publicKeyFile.c_str())))
-			{
-				if (!PEM_write_bio_RSAPublicKey(bio, _pRSA))
-					throw Poco::WriteFileException("Failed to write public key to file", publicKeyFile);
-			}
-			else throw Poco::CreateFileException("Cannot create public key file");
-		}
-		catch (...)
-		{
-			BIO_free(bio);
-			throw;
-		}
-		BIO_free(bio);
-	}
-	
-	if (!privateKeyFile.empty())
-	{
-		BIO* bio = BIO_new(BIO_s_file());
-		if (!bio) throw Poco::IOException("Cannot create BIO for writing private key file", privateKeyFile);
-		try
-		{
-			if (BIO_write_filename(bio, const_cast<char*>(privateKeyFile.c_str())))
-			{
-				int rc = 0;
-				if (privateKeyPassphrase.empty())
-					rc = PEM_write_bio_RSAPrivateKey(bio, _pRSA, 0, 0, 0, 0, 0);
-				else
-					rc = PEM_write_bio_RSAPrivateKey(bio, _pRSA, EVP_des_ede3_cbc(), 
-						reinterpret_cast<unsigned char*>(const_cast<char*>(privateKeyPassphrase.c_str())), 
-						static_cast<int>(privateKeyPassphrase.length()), 0, 0);
-				if (!rc) throw Poco::FileException("Failed to write private key to file", privateKeyFile);
-			}
-			else throw Poco::CreateFileException("Cannot create private key file", privateKeyFile);
-		}
-		catch (...)
-		{
-			BIO_free(bio);
-			throw;
-		}
-		BIO_free(bio);
-	}
-}
-
-
-void RSAKeyImpl::save(std::ostream* pPublicKeyStream,
-	std::ostream* pPrivateKeyStream,
-	const std::string& privateKeyPassphrase) const
-{
-	if (pPublicKeyStream)
-	{
-		BIO* bio = BIO_new(BIO_s_mem());
-		if (!bio) throw Poco::IOException("Cannot create BIO for writing public key");
-		if (!PEM_write_bio_RSAPublicKey(bio, _pRSA))
-		{
-			BIO_free(bio);
-			throw Poco::WriteFileException("Failed to write public key to stream");
-		}
-		char* pData;
-		long size = BIO_get_mem_data(bio, &pData);
-		pPublicKeyStream->write(pData, static_cast<std::streamsize>(size));
-		BIO_free(bio);
-	}
-
-	if (pPrivateKeyStream)
-	{
-		BIO* bio = BIO_new(BIO_s_mem());
-		if (!bio) throw Poco::IOException("Cannot create BIO for writing public key");
-		int rc = 0;
-		if (privateKeyPassphrase.empty())
-			rc = PEM_write_bio_RSAPrivateKey(bio, _pRSA, 0, 0, 0, 0, 0);
-		else
-			rc = PEM_write_bio_RSAPrivateKey(bio, _pRSA, EVP_des_ede3_cbc(), 
-				reinterpret_cast<unsigned char*>(const_cast<char*>(privateKeyPassphrase.c_str())), 
-				static_cast<int>(privateKeyPassphrase.length()), 0, 0);
-		if (!rc) 
-		{
-			BIO_free(bio);
-			throw Poco::FileException("Failed to write private key to stream");
-		}
-		char* pData;
-		long size = BIO_get_mem_data(bio, &pData);
-		pPrivateKeyStream->write(pData, static_cast<std::streamsize>(size));
-		BIO_free(bio);
-	}
-}
-
-
 RSAKeyImpl::ByteVec RSAKeyImpl::convertToByteVec(const BIGNUM* bn)
 {
 	int numBytes = BN_num_bytes(bn);
@@ -383,4 +286,4 @@ RSAKeyImpl::ByteVec RSAKeyImpl::convertToByteVec(const BIGNUM* bn)
 }
 
 
-} } // namespace Poco::Crypto
\ No newline at end of file
+} } // namespace Poco::Crypto
diff --git a/base/poco/Data/ODBC/include/Poco/Data/ODBC/Extractor.h b/base/poco/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
index 82e2f895638..3914f33df76 100644
--- a/base/poco/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
+++ b/base/poco/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
@@ -466,7 +466,7 @@ namespace Data
             bool extractManualImpl(std::size_t pos, T & val, SQLSMALLINT cType)
             {
                 SQLRETURN rc = 0;
-                T value = (T)0;
+                T value;
 
                 resizeLengths(pos);
 
diff --git a/base/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h b/base/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
deleted file mode 100644
index 06af853e443..00000000000
--- a/base/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Unicode.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Unicode
-//
-// Definition of Unicode_WIN32.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Unicode_WIN32_INCLUDED
-#define Data_ODBC_Unicode_WIN32_INCLUDED
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        inline void makeUTF16(SQLCHAR * pSQLChar, SQLINTEGER length, std::wstring & target)
-        /// Utility function for conversion from UTF-8 to UTF-16
-        {
-            int len = length;
-            if (SQL_NTS == len)
-                len = (int)std::strlen((const char *)pSQLChar);
-
-            UnicodeConverter::toUTF16((const char *)pSQLChar, len, target);
-        }
-
-
-        inline void makeUTF8(Poco::Buffer<wchar_t> & buffer, SQLINTEGER length, SQLPOINTER pTarget, SQLINTEGER targetLength)
-        /// Utility function for conversion from UTF-16 to UTF-8. Length is in bytes.
-        {
-            if (buffer.sizeBytes() < length)
-                throw InvalidArgumentException("Specified length exceeds available length.");
-            else if ((length % 2) != 0)
-                throw InvalidArgumentException("Length must be an even number.");
-
-            length /= sizeof(wchar_t);
-            std::string result;
-            UnicodeConverter::toUTF8(buffer.begin(), length, result);
-
-            std::memset(pTarget, 0, targetLength);
-            std::strncpy((char *)pTarget, result.c_str(), result.size() < targetLength ? result.size() : targetLength);
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif // Data_ODBC_Unicode_WIN32_INCLUDED
diff --git a/base/poco/Data/ODBC/src/Unicode_WIN32.cpp b/base/poco/Data/ODBC/src/Unicode_WIN32.cpp
deleted file mode 100644
index fe637e49b3d..00000000000
--- a/base/poco/Data/ODBC/src/Unicode_WIN32.cpp
+++ /dev/null
@@ -1,761 +0,0 @@
-//
-// Unicode.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Unicode
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Data/ODBC/Unicode_WIN32.h"
-#include "Poco/Buffer.h"
-#include "Poco/Exception.h"
-
-
-using Poco::Buffer;
-using Poco::InvalidArgumentException;
-using Poco::NotImplementedException;
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-SQLRETURN SQLColAttribute(SQLHSTMT hstmt,
-	SQLUSMALLINT   iCol,
-	SQLUSMALLINT   iField,
-	SQLPOINTER	   pCharAttr,
-	SQLSMALLINT	   cbCharAttrMax,
-	SQLSMALLINT*   pcbCharAttr,
-	NumAttrPtrType pNumAttr)
-{
-	if (isString(pCharAttr, cbCharAttrMax))
-	{
-		Buffer<wchar_t> buffer(stringLength(pCharAttr, cbCharAttrMax));
-
-		SQLRETURN rc = SQLColAttributeW(hstmt,
-			iCol,
-			iField,
-			buffer.begin(),
-			(SQLSMALLINT) buffer.sizeBytes(),
-			pcbCharAttr,
-			pNumAttr);
-
-		makeUTF8(buffer, *pcbCharAttr, pCharAttr, cbCharAttrMax);
-		return rc;
-	}
-
-	return SQLColAttributeW(hstmt,
-		iCol,
-		iField,
-		pCharAttr,
-		cbCharAttrMax,
-		pcbCharAttr,
-		pNumAttr);
-}
-
-
-SQLRETURN SQLColAttributes(SQLHSTMT hstmt,
-	SQLUSMALLINT icol,
-	SQLUSMALLINT fDescType,
-	SQLPOINTER   rgbDesc,
-	SQLSMALLINT  cbDescMax,
-	SQLSMALLINT* pcbDesc,
-	SQLLEN*      pfDesc)
-{
-	return SQLColAttribute(hstmt,
-		icol,
-		fDescType,
-		rgbDesc,
-		cbDescMax,
-		pcbDesc,
-		pfDesc);
-}
-
-
-SQLRETURN SQLConnect(SQLHDBC hdbc,
-	SQLCHAR*    szDSN,
-	SQLSMALLINT cbDSN,
-	SQLCHAR*    szUID,
-	SQLSMALLINT cbUID,
-	SQLCHAR*    szAuthStr,
-	SQLSMALLINT cbAuthStr)
-{
-	std::wstring sqlDSN;
-	makeUTF16(szDSN, cbDSN, sqlDSN);
-
-	std::wstring sqlUID;
-	makeUTF16(szUID, cbUID, sqlUID);
-
-	std::wstring sqlPWD;
-	makeUTF16(szAuthStr, cbAuthStr, sqlPWD);
-	
-	return SQLConnectW(hdbc,
-		(SQLWCHAR*) sqlDSN.c_str(),
-		(SQLSMALLINT) sqlDSN.size(),
-		(SQLWCHAR*) sqlUID.c_str(),
-		(SQLSMALLINT) sqlUID.size(),
-		(SQLWCHAR*) sqlPWD.c_str(),
-		(SQLSMALLINT) sqlPWD.size());
-}
-
-
-SQLRETURN SQLDescribeCol(SQLHSTMT hstmt,
-	SQLUSMALLINT icol,
-	SQLCHAR*     szColName,
-	SQLSMALLINT  cbColNameMax,
-	SQLSMALLINT* pcbColName,
-	SQLSMALLINT* pfSqlType,
-	SQLULEN*     pcbColDef,
-	SQLSMALLINT* pibScale,
-	SQLSMALLINT* pfNullable)
-{
-	Buffer<wchar_t> buffer(cbColNameMax);
-	SQLRETURN rc = SQLDescribeColW(hstmt,
-		icol,
-		(SQLWCHAR*) buffer.begin(),
-		(SQLSMALLINT) buffer.size(),
-		pcbColName,
-		pfSqlType,
-		pcbColDef,
-		pibScale,
-		pfNullable);
-
-	makeUTF8(buffer, *pcbColName * sizeof(wchar_t), szColName, cbColNameMax);
-	return rc;
-}
-
-
-SQLRETURN SQLError(SQLHENV henv,
-	SQLHDBC      hdbc,
-	SQLHSTMT     hstmt,
-	SQLCHAR*     szSqlState,
-	SQLINTEGER*  pfNativeError,
-	SQLCHAR*     szErrorMsg,
-	SQLSMALLINT  cbErrorMsgMax,
-	SQLSMALLINT* pcbErrorMsg)
-{
-	throw NotImplementedException("SQLError is obsolete. "
-		"Use SQLGetDiagRec instead.");
-}
-
-
-SQLRETURN SQLExecDirect(SQLHSTMT hstmt,
-	SQLCHAR*   szSqlStr,
-	SQLINTEGER cbSqlStr)
-{
-	std::wstring sqlStr;
-	makeUTF16(szSqlStr, cbSqlStr, sqlStr);
-
-	return SQLExecDirectW(hstmt, 
-		(SQLWCHAR*) sqlStr.c_str(), 
-		(SQLINTEGER) sqlStr.size());
-}
-
-
-SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc,
-	SQLINTEGER  fAttribute,
-	SQLPOINTER  rgbValue,
-	SQLINTEGER  cbValueMax,
-	SQLINTEGER* pcbValue)
-{
-	if (isString(rgbValue, cbValueMax))
-	{
-		Buffer<wchar_t> buffer(stringLength(rgbValue, cbValueMax));
-
-		SQLRETURN rc = SQLGetConnectAttrW(hdbc,
-				fAttribute,
-				buffer.begin(),
-				(SQLINTEGER) buffer.sizeBytes(),
-				pcbValue);
-
-		makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax);
-		return rc;
-	}
-	
-
-	return SQLGetConnectAttrW(hdbc,
-		fAttribute,
-		rgbValue,
-		cbValueMax,
-		pcbValue);
-}
-
-
-SQLRETURN SQLGetCursorName(SQLHSTMT hstmt,
-	SQLCHAR*     szCursor,
-	SQLSMALLINT  cbCursorMax,
-	SQLSMALLINT* pcbCursor)
-{
-	throw NotImplementedException("Not implemented");
-}
-
-
-SQLRETURN SQLSetDescField(SQLHDESC hdesc,
-	SQLSMALLINT iRecord, 
-	SQLSMALLINT iField,
-	SQLPOINTER  rgbValue, 
-	SQLINTEGER  cbValueMax)
-{
-	if (isString(rgbValue, cbValueMax))
-	{
-		std::wstring str;
-		makeUTF16((SQLCHAR*) rgbValue, cbValueMax, str);
-
-		SQLRETURN rc = SQLSetDescFieldW(hdesc,
-			iRecord, 
-			iField,
-			(SQLPOINTER) str.c_str(), 
-			(SQLINTEGER) str.size() * sizeof(std::wstring::value_type));
-
-		return rc;
-	}
-
-	return SQLSetDescFieldW(hdesc,
-		iRecord, 
-		iField,
-		rgbValue, 
-		cbValueMax);
-}
-
-
-SQLRETURN SQLGetDescField(SQLHDESC hdesc,
-	SQLSMALLINT iRecord,
-	SQLSMALLINT iField,
-	SQLPOINTER  rgbValue,
-	SQLINTEGER	cbValueMax,
-	SQLINTEGER* pcbValue)
-{
-	if (isString(rgbValue, cbValueMax))
-	{
-		Buffer<wchar_t> buffer(stringLength(rgbValue, cbValueMax));
-
-		SQLRETURN rc = SQLGetDescFieldW(hdesc,
-			iRecord,
-			iField,
-			buffer.begin(),
-			(SQLINTEGER) buffer.sizeBytes(),
-			pcbValue);
-
-		makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax);
-		return rc;
-	}
-
-	return SQLGetDescFieldW(hdesc,
-		iRecord,
-		iField,
-		rgbValue,
-		cbValueMax,
-		pcbValue);
-}
-
-
-SQLRETURN SQLGetDescRec(SQLHDESC hdesc,
-	SQLSMALLINT  iRecord,
-	SQLCHAR*     szName,
-	SQLSMALLINT  cbNameMax,
-	SQLSMALLINT* pcbName,
-	SQLSMALLINT* pfType,
-	SQLSMALLINT* pfSubType,
-	SQLLEN*      pLength,
-	SQLSMALLINT* pPrecision, 
-	SQLSMALLINT* pScale,
-	SQLSMALLINT* pNullable)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLGetDiagField(SQLSMALLINT fHandleType,
-	SQLHANDLE    handle,
-	SQLSMALLINT  iRecord,
-	SQLSMALLINT  fDiagField,
-	SQLPOINTER   rgbDiagInfo,
-	SQLSMALLINT  cbDiagInfoMax,
-	SQLSMALLINT* pcbDiagInfo)
-{
-	if (isString(rgbDiagInfo, cbDiagInfoMax))
-	{
-		Buffer<wchar_t> buffer(stringLength(rgbDiagInfo, cbDiagInfoMax));
-
-		SQLRETURN rc = SQLGetDiagFieldW(fHandleType,
-			handle,
-			iRecord,
-			fDiagField,
-			buffer.begin(),
-			(SQLSMALLINT) buffer.sizeBytes(),
-			pcbDiagInfo);
-
-		makeUTF8(buffer, *pcbDiagInfo, rgbDiagInfo, cbDiagInfoMax);
-		return rc;
-	}
-
-	return SQLGetDiagFieldW(fHandleType,
-		handle,
-		iRecord,
-		fDiagField,
-		rgbDiagInfo,
-		cbDiagInfoMax,
-		pcbDiagInfo);
-}
-
-
-SQLRETURN SQLGetDiagRec(SQLSMALLINT fHandleType,
-	SQLHANDLE    handle,
-	SQLSMALLINT  iRecord,
-	SQLCHAR*     szSqlState,
-	SQLINTEGER*  pfNativeError,
-	SQLCHAR*     szErrorMsg,
-	SQLSMALLINT  cbErrorMsgMax,
-	SQLSMALLINT* pcbErrorMsg)
-{
-	const SQLINTEGER stateLen = SQL_SQLSTATE_SIZE + 1;
-	Buffer<wchar_t> bufState(stateLen);
-	Buffer<wchar_t> bufErr(cbErrorMsgMax);
-
-	SQLRETURN rc = SQLGetDiagRecW(fHandleType,
-		handle,
-		iRecord,
-		bufState.begin(),
-		pfNativeError,
-		bufErr.begin(),
-		(SQLSMALLINT) bufErr.size(),
-		pcbErrorMsg);
-
-	makeUTF8(bufState, stateLen * sizeof(wchar_t), szSqlState, stateLen);
-	makeUTF8(bufErr, *pcbErrorMsg * sizeof(wchar_t), szErrorMsg, cbErrorMsgMax);
-
-	return rc;
-}
-
-
-SQLRETURN SQLPrepare(SQLHSTMT hstmt,
-	SQLCHAR*   szSqlStr,
-	SQLINTEGER cbSqlStr)
-{
-	std::wstring sqlStr;
-	makeUTF16(szSqlStr, cbSqlStr, sqlStr);
-
-	return SQLPrepareW(hstmt, 
-		(SQLWCHAR*) sqlStr.c_str(), 
-		(SQLINTEGER) sqlStr.size());
-}
-
-
-SQLRETURN SQLSetConnectAttr(SQLHDBC hdbc,
-	SQLINTEGER fAttribute,
-	SQLPOINTER rgbValue,
-	SQLINTEGER cbValue)
-{
-	if (isString(rgbValue, cbValue))
-	{
-		std::wstring str;
-		makeUTF16((SQLCHAR*) rgbValue, cbValue, str);
-
-		return SQLSetConnectAttrW(hdbc,
-			fAttribute,
-			(SQLWCHAR*) str.c_str(), 
-			(SQLINTEGER) str.size() * sizeof(std::wstring::value_type));
-	}
-
-	return SQLSetConnectAttrW(hdbc,
-		fAttribute,
-		rgbValue, 
-		cbValue);
-}
-
-
-SQLRETURN SQLSetCursorName(SQLHSTMT hstmt,
-	SQLCHAR*    szCursor,
-	SQLSMALLINT cbCursor)
-{
-	throw NotImplementedException("Not implemented");
-}
-
-
-SQLRETURN SQLSetStmtAttr(SQLHSTMT hstmt,
-	SQLINTEGER fAttribute,
-	SQLPOINTER rgbValue,
-	SQLINTEGER cbValueMax)
-{
-	if (isString(rgbValue, cbValueMax))
-	{
-		std::wstring str;
-		makeUTF16((SQLCHAR*) rgbValue, cbValueMax, str);
-
-		return SQLSetStmtAttrW(hstmt,
-			fAttribute,
-			(SQLPOINTER) str.c_str(),
-			(SQLINTEGER) str.size());
-	}
-
-	return SQLSetStmtAttrW(hstmt,
-		fAttribute,
-		rgbValue,
-		cbValueMax);
-}
-
-
-SQLRETURN SQLGetStmtAttr(SQLHSTMT hstmt,
-	SQLINTEGER  fAttribute,
-	SQLPOINTER  rgbValue,
-	SQLINTEGER  cbValueMax,
-	SQLINTEGER* pcbValue)
-{
-	if (isString(rgbValue, cbValueMax))
-	{
-		Buffer<wchar_t> buffer(stringLength(rgbValue, cbValueMax));
-
-		return SQLGetStmtAttrW(hstmt,
-			fAttribute,
-			(SQLPOINTER) buffer.begin(),
-			(SQLINTEGER) buffer.sizeBytes(),
-			pcbValue);
-	}
-
-	return SQLGetStmtAttrW(hstmt,
-			fAttribute,
-			rgbValue,
-			cbValueMax,
-			pcbValue);
-}
-
-
-SQLRETURN SQLColumns(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szTableName,
-	SQLSMALLINT cbTableName,
-	SQLCHAR*    szColumnName,
-	SQLSMALLINT cbColumnName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLGetConnectOption(SQLHDBC hdbc,
-	SQLUSMALLINT fOption,
-	SQLPOINTER   pvParam)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLGetInfo(SQLHDBC hdbc,
-	SQLUSMALLINT fInfoType,
-	SQLPOINTER   rgbInfoValue,
-	SQLSMALLINT  cbInfoValueMax,
-	SQLSMALLINT* pcbInfoValue)
-{
-	if (cbInfoValueMax)
-	{
-		Buffer<wchar_t> buffer(cbInfoValueMax);
-
-		SQLRETURN rc = SQLGetInfoW(hdbc,
-			fInfoType,
-			(SQLPOINTER) buffer.begin(),
-			(SQLSMALLINT) buffer.sizeBytes(),
-			pcbInfoValue);
-
-		makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax);
-
-		return rc;
-	}
-
-	return SQLGetInfoW(hdbc,
-		fInfoType,
-		rgbInfoValue,
-		cbInfoValueMax,
-		pcbInfoValue);
-}
-
-
-SQLRETURN SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
-{
-	return SQLGetTypeInfoW(StatementHandle, DataType);
-}
-
-
-SQLRETURN SQLSetConnectOption(SQLHDBC hdbc,
-	SQLUSMALLINT fOption,
-	SQLULEN      vParam)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLSpecialColumns(SQLHSTMT hstmt,
-	SQLUSMALLINT fColType,
-	SQLCHAR*     szCatalogName,
-	SQLSMALLINT  cbCatalogName,
-	SQLCHAR*     szSchemaName,
-	SQLSMALLINT  cbSchemaName,
-	SQLCHAR*     szTableName,
-	SQLSMALLINT  cbTableName,
-	SQLUSMALLINT fScope,
-	SQLUSMALLINT fNullable)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLStatistics(SQLHSTMT hstmt,
-	SQLCHAR*     szCatalogName,
-	SQLSMALLINT  cbCatalogName,
-	SQLCHAR*     szSchemaName,
-	SQLSMALLINT  cbSchemaName,
-	SQLCHAR*     szTableName,
-	SQLSMALLINT  cbTableName,
-	SQLUSMALLINT fUnique,
-	SQLUSMALLINT fAccuracy)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLTables(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szTableName,
-	SQLSMALLINT cbTableName,
-	SQLCHAR*    szTableType,
-	SQLSMALLINT cbTableType)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLDataSources(SQLHENV henv,
-	SQLUSMALLINT fDirection,
-	SQLCHAR*     szDSN,
-	SQLSMALLINT  cbDSNMax,
-	SQLSMALLINT* pcbDSN,
-	SQLCHAR*     szDesc,
-	SQLSMALLINT  cbDescMax,
-	SQLSMALLINT* pcbDesc)
-{
-	Buffer<wchar_t> bufDSN(cbDSNMax);
-	Buffer<wchar_t> bufDesc(cbDescMax);
-
-	SQLRETURN rc = SQLDataSourcesW(henv,
-		fDirection,
-		bufDSN.begin(),
-		(SQLSMALLINT) bufDSN.size(),
-		pcbDSN,
-		bufDesc.begin(),
-		(SQLSMALLINT) bufDesc.size(),
-		pcbDesc);
-
-	makeUTF8(bufDSN, *pcbDSN * sizeof(wchar_t), szDSN, cbDSNMax);
-	makeUTF8(bufDesc, *pcbDesc * sizeof(wchar_t), szDesc, cbDescMax);
-
-	return rc;
-}
-
-
-SQLRETURN SQLDriverConnect(SQLHDBC hdbc,
-	SQLHWND      hwnd,
-	SQLCHAR*     szConnStrIn,
-	SQLSMALLINT  cbConnStrIn,
-	SQLCHAR*     szConnStrOut,
-	SQLSMALLINT  cbConnStrOutMax,
-	SQLSMALLINT* pcbConnStrOut,
-	SQLUSMALLINT fDriverCompletion)
-{
-	std::wstring connStrIn;
-	int len = cbConnStrIn;
-	if (SQL_NTS == len) 
-		len = (int) std::strlen((const char*) szConnStrIn);
-
-	Poco::UnicodeConverter::toUTF16((const char *) szConnStrIn, len, connStrIn);
-
-	Buffer<wchar_t> bufOut(cbConnStrOutMax);
-	SQLRETURN rc = SQLDriverConnectW(hdbc,
-		hwnd,
-		(SQLWCHAR*) connStrIn.c_str(),
-		(SQLSMALLINT) connStrIn.size(),
-		bufOut.begin(),
-		(SQLSMALLINT) bufOut.size(),
-		pcbConnStrOut,
-		fDriverCompletion);
-
-	if (!Utility::isError(rc))
-		makeUTF8(bufOut, *pcbConnStrOut * sizeof(wchar_t), szConnStrOut, cbConnStrOutMax);
-
-	return rc;
-}
-
-
-SQLRETURN SQLBrowseConnect(SQLHDBC hdbc,
-	SQLCHAR*     szConnStrIn,
-	SQLSMALLINT  cbConnStrIn,
-	SQLCHAR*     szConnStrOut,
-	SQLSMALLINT  cbConnStrOutMax,
-	SQLSMALLINT* pcbConnStrOut)
-{
-	std::wstring str;
-	makeUTF16(szConnStrIn, cbConnStrIn, str);
-
-	Buffer<wchar_t> bufConnStrOut(cbConnStrOutMax);
-
-	SQLRETURN rc = SQLBrowseConnectW(hdbc,
-		(SQLWCHAR*) str.c_str(),
-		(SQLSMALLINT) str.size(),
-		bufConnStrOut.begin(),
-		(SQLSMALLINT) bufConnStrOut.size(),
-		pcbConnStrOut);
-
-	makeUTF8(bufConnStrOut, *pcbConnStrOut * sizeof(wchar_t), szConnStrOut, cbConnStrOutMax);
-
-	return rc;
-}
-
-
-SQLRETURN SQLColumnPrivileges(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szTableName,
-	SQLSMALLINT cbTableName,
-	SQLCHAR*    szColumnName,
-	SQLSMALLINT cbColumnName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLForeignKeys(SQLHSTMT hstmt,
-	SQLCHAR*    szPkCatalogName,
-	SQLSMALLINT cbPkCatalogName,
-	SQLCHAR*    szPkSchemaName,
-	SQLSMALLINT cbPkSchemaName,
-	SQLCHAR*    szPkTableName,
-	SQLSMALLINT cbPkTableName,
-	SQLCHAR*    szFkCatalogName,
-	SQLSMALLINT cbFkCatalogName,
-	SQLCHAR*    szFkSchemaName,
-	SQLSMALLINT cbFkSchemaName,
-	SQLCHAR*    szFkTableName,
-	SQLSMALLINT cbFkTableName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLNativeSql(SQLHDBC hdbc,
-	SQLCHAR*    szSqlStrIn,
-	SQLINTEGER  cbSqlStrIn,
-	SQLCHAR*    szSqlStr,
-	SQLINTEGER  cbSqlStrMax,
-	SQLINTEGER* pcbSqlStr)
-{
-	std::wstring str;
-	makeUTF16(szSqlStrIn, cbSqlStrIn, str);
-
-	Buffer<wchar_t> bufSQLOut(cbSqlStrMax);
-
-	SQLRETURN rc = SQLNativeSqlW(hdbc,
-		(SQLWCHAR*) str.c_str(),
-		(SQLINTEGER) str.size(),
-		bufSQLOut.begin(),
-		(SQLINTEGER) bufSQLOut.size(),
-		pcbSqlStr);
-
-	makeUTF8(bufSQLOut, *pcbSqlStr * sizeof(wchar_t), szSqlStr, cbSqlStrMax);
-
-	return rc;
-}
-
-
-SQLRETURN SQLPrimaryKeys(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szTableName,
-	SQLSMALLINT cbTableName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLProcedureColumns(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szProcName,
-	SQLSMALLINT cbProcName,
-	SQLCHAR*    szColumnName,
-	SQLSMALLINT cbColumnName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLProcedures(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szProcName,
-	SQLSMALLINT cbProcName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLTablePrivileges(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szTableName,
-	SQLSMALLINT cbTableName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLDrivers(SQLHENV henv,
-	SQLUSMALLINT fDirection,
-	SQLCHAR*     szDriverDesc,
-	SQLSMALLINT  cbDriverDescMax,
-	SQLSMALLINT* pcbDriverDesc,
-	SQLCHAR*     szDriverAttributes,
-	SQLSMALLINT  cbDrvrAttrMax,
-	SQLSMALLINT* pcbDrvrAttr)
-{
-	Buffer<wchar_t> bufDriverDesc(cbDriverDescMax);
-	Buffer<wchar_t> bufDriverAttr(cbDrvrAttrMax);
-
-	SQLRETURN rc = SQLDriversW(henv,
-		fDirection,
-		bufDriverDesc.begin(),
-		(SQLSMALLINT) bufDriverDesc.size(),
-		pcbDriverDesc,
-		bufDriverAttr.begin(),
-		(SQLSMALLINT) bufDriverAttr.size(),
-		pcbDrvrAttr);
-
-	makeUTF8(bufDriverDesc, *pcbDriverDesc * sizeof(wchar_t), szDriverDesc, cbDriverDescMax);
-	makeUTF8(bufDriverAttr, *pcbDrvrAttr * sizeof(wchar_t), szDriverAttributes, cbDrvrAttrMax);
-
-	return rc;
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/base/poco/Data/include/Poco/Data/AutoTransaction.h b/base/poco/Data/include/Poco/Data/AutoTransaction.h
deleted file mode 100644
index a222bd27afe..00000000000
--- a/base/poco/Data/include/Poco/Data/AutoTransaction.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// AutoTransaction.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  AutoTransaction
-//
-// Forward header for the Transaction class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_AutoTransaction_INCLUDED
-#define Data_AutoTransaction_INCLUDED
-
-
-#include "Poco/Data/Transaction.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    typedef Transaction AutoTransaction;
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_AutoTransaction_INCLUDED
diff --git a/base/poco/Data/include/Poco/Data/DynamicLOB.h b/base/poco/Data/include/Poco/Data/DynamicLOB.h
deleted file mode 100644
index 749b269ffac..00000000000
--- a/base/poco/Data/include/Poco/Data/DynamicLOB.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// DynamicLOB.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  DynamicLOB
-//
-// Definition of the Poco::Dynamic::Var LOB cast operators.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_DynamicLOB_INCLUDED
-#define Data_DynamicLOB_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/Dynamic/Var.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-    template <typename T>
-    class LOB;
-    typedef LOB<unsigned char> BLOB;
-    typedef LOB<char> CLOB;
-
-}
-} // namespace Poco::Data
-
-
-namespace Poco
-{
-namespace Dynamic
-{
-
-    template <>
-    Data_API Var::operator Poco::Data::CLOB() const;
-    template <>
-    Data_API Var::operator Poco::Data::BLOB() const;
-
-}
-} // namespace Poco::Dynamic
-
-
-#endif // Data_DynamicLOB_INCLUDED
diff --git a/base/poco/Data/include/Poco/Data/LOBStream.h b/base/poco/Data/include/Poco/Data/LOBStream.h
deleted file mode 100644
index 23346224c0f..00000000000
--- a/base/poco/Data/include/Poco/Data/LOBStream.h
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// LOBStream.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  LOBStream
-//
-// Definition of the LOBStream class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_LOBStream_INCLUDED
-#define Data_LOBStream_INCLUDED
-
-
-#include <istream>
-#include <ostream>
-#include "Poco/Data/LOB.h"
-#include "Poco/Foundation.h"
-#include "Poco/UnbufferedStreamBuf.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    template <typename T>
-    class LOBStreamBuf : public BasicUnbufferedStreamBuf<T, std::char_traits<T>>
-    /// This is the streambuf class used for reading from and writing to a LOB.
-    {
-    public:
-        LOBStreamBuf(LOB<T> & lob) : _lob(lob), _it(_lob.begin())
-        /// Creates LOBStreamBuf.
-        {
-        }
-
-
-        ~LOBStreamBuf()
-        /// Destroys LOBStreamBuf.
-        {
-        }
-
-    protected:
-        typedef std::char_traits<T> TraitsType;
-        typedef BasicUnbufferedStreamBuf<T, TraitsType> BaseType;
-
-        typename BaseType::int_type readFromDevice()
-        {
-            if (_it != _lob.end())
-                return BaseType::charToInt(*_it++);
-            else
-                return -1;
-        }
-
-        typename BaseType::int_type writeToDevice(T c)
-        {
-            _lob.appendRaw(&c, 1);
-            return 1;
-        }
-
-    private:
-        LOB<T> & _lob;
-        typename LOB<T>::Iterator _it;
-    };
-
-
-    template <typename T>
-    class LOBIOS : public virtual std::ios
-    /// The base class for LOBInputStream and
-    /// LOBOutputStream.
-    ///
-    /// This class is needed to ensure the correct initialization
-    /// order of the stream buffer and base classes.
-    {
-    public:
-        LOBIOS(LOB<T> & lob, openmode mode) : _buf(lob)
-        /// Creates the LOBIOS with the given LOB.
-        {
-            poco_ios_init(&_buf);
-        }
-
-        ~LOBIOS()
-        /// Destroys the LOBIOS.
-        {
-        }
-
-        LOBStreamBuf<T> * rdbuf()
-        /// Returns a pointer to the internal LOBStreamBuf.
-        {
-            return &_buf;
-        }
-
-    protected:
-        LOBStreamBuf<T> _buf;
-    };
-
-
-    template <typename T>
-    class LOBOutputStream : public LOBIOS<T>, public std::basic_ostream<T, std::char_traits<T>>
-    /// An output stream for writing to a LOB.
-    {
-    public:
-        LOBOutputStream(LOB<T> & lob) : LOBIOS<T>(lob, std::ios::out), std::ostream(LOBIOS<T>::rdbuf())
-        /// Creates the LOBOutputStream with the given LOB.
-        {
-        }
-
-        ~LOBOutputStream()
-        /// Destroys the LOBOutputStream.
-        {
-        }
-    };
-
-
-    template <typename T>
-    class LOBInputStream : public LOBIOS<T>, public std::basic_istream<T, std::char_traits<T>>
-    /// An input stream for reading from a LOB.
-    {
-    public:
-        LOBInputStream(LOB<T> & lob) : LOBIOS<T>(lob, std::ios::in), std::istream(LOBIOS<T>::rdbuf())
-        /// Creates the LOBInputStream with the given LOB.
-        {
-        }
-
-        ~LOBInputStream()
-        /// Destroys the LOBInputStream.
-        {
-        }
-    };
-
-
-    typedef LOBOutputStream<unsigned char> BLOBOutputStream;
-    typedef LOBOutputStream<char> CLOBOutputStream;
-
-    typedef LOBInputStream<unsigned char> BLOBInputStream;
-    typedef LOBInputStream<char> CLOBInputStream;
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_LOBStream_INCLUDED
diff --git a/base/poco/Data/src/DynamicLOB.cpp b/base/poco/Data/src/DynamicLOB.cpp
deleted file mode 100644
index 5dfe3df8574..00000000000
--- a/base/poco/Data/src/DynamicLOB.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// DynamicLOB.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  DynamicLOB
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifdef __GNUC__
-// TODO: determine g++ version able to do the right thing without these specializations
-
-#include "Poco/Data/DynamicLOB.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/Dynamic/Var.h"
-
-
-namespace Poco {
-namespace Dynamic {
-
-
-using Poco::Data::CLOB;
-using Poco::Data::BLOB;
-
-
-template <>
-Var::operator CLOB () const
-{
-	VarHolder* pHolder = content();
-
-	if (!pHolder)
-		throw InvalidAccessException("Can not convert empty value.");
-
-	if (typeid(CLOB) == pHolder->type())
-		return extract<CLOB>();
-	else
-	{
-		std::string result;
-		pHolder->convert(result);
-		return CLOB(result);
-	}
-}
-
-
-template <>
-Var::operator BLOB () const
-{
-	VarHolder* pHolder = content();
-
-	if (!pHolder)
-		throw InvalidAccessException("Can not convert empty value.");
-
-	if (typeid(BLOB) == pHolder->type())
-		return extract<BLOB>();
-	else
-	{
-		std::string result;
-		pHolder->convert(result);
-		return BLOB(reinterpret_cast<const unsigned char*>(result.data()),
-			result.size());
-	}
-}
-
-
-} } // namespace Poco::Data
-
-
-#endif // __GNUC__
-
diff --git a/base/poco/Foundation/CMakeLists.txt b/base/poco/Foundation/CMakeLists.txt
index dceb18e68cc..358f49ed055 100644
--- a/base/poco/Foundation/CMakeLists.txt
+++ b/base/poco/Foundation/CMakeLists.txt
@@ -31,8 +31,6 @@ set (SRCS
     src/ASCIIEncoding.cpp
     src/AsyncChannel.cpp
     src/AtomicCounter.cpp
-    src/Base32Decoder.cpp
-    src/Base32Encoder.cpp
     src/Base64Decoder.cpp
     src/Base64Encoder.cpp
     src/BinaryReader.cpp
@@ -81,9 +79,6 @@ set (SRCS
     src/HexBinaryEncoder.cpp
     src/InflatingStream.cpp
     src/JSONString.cpp
-    src/Latin1Encoding.cpp
-    src/Latin2Encoding.cpp
-    src/Latin9Encoding.cpp
     src/LineEndingConverter.cpp
     src/LocalDateTime.cpp
     src/LogFile.cpp
@@ -91,8 +86,6 @@ set (SRCS
     src/LoggingFactory.cpp
     src/LoggingRegistry.cpp
     src/LogStream.cpp
-    src/Manifest.cpp
-    src/MD4Engine.cpp
     src/MD5Engine.cpp
     src/MemoryPool.cpp
     src/MemoryStream.cpp
@@ -113,7 +106,6 @@ set (SRCS
     src/PatternFormatter.cpp
     src/Pipe.cpp
     src/PipeImpl.cpp
-    src/PipeStream.cpp
     src/PriorityNotificationQueue.cpp
     src/Process.cpp
     src/PurgeStrategy.cpp
@@ -136,10 +128,8 @@ set (SRCS
     src/StreamChannel.cpp
     src/StreamConverter.cpp
     src/StreamCopier.cpp
-    src/StreamTokenizer.cpp
     src/String.cpp
     src/StringTokenizer.cpp
-    src/SynchronizedObject.cpp
     src/SyslogChannel.cpp
     src/Task.cpp
     src/TaskManager.cpp
@@ -175,9 +165,6 @@ set (SRCS
     src/VarHolder.cpp
     src/VarIterator.cpp
     src/Void.cpp
-    src/Windows1250Encoding.cpp
-    src/Windows1251Encoding.cpp
-    src/Windows1252Encoding.cpp
 )
 
 add_library (_poco_foundation ${SRCS})
@@ -233,7 +220,8 @@ target_link_libraries (_poco_foundation
     PRIVATE
         Poco::Foundation::PCRE
         ch_contrib::zlib
-        ch_contrib::lz4)
+        ch_contrib::lz4
+        ch_contrib::double_conversion)
 
 if(OS_DARWIN AND ARCH_AARCH64)
     target_compile_definitions (_poco_foundation
diff --git a/base/poco/Foundation/include/Poco/Base32Decoder.h b/base/poco/Foundation/include/Poco/Base32Decoder.h
deleted file mode 100644
index 96b6f013db8..00000000000
--- a/base/poco/Foundation/include/Poco/Base32Decoder.h
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// Base32Decoder.h
-//
-// Library: Foundation
-// Package: Streams
-// Module:  Base32
-//
-// Definition of class Base32Decoder.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_Base32Decoder_INCLUDED
-#define Foundation_Base32Decoder_INCLUDED
-
-
-#include <istream>
-#include "Poco/Foundation.h"
-#include "Poco/UnbufferedStreamBuf.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API Base32DecoderBuf : public UnbufferedStreamBuf
-/// This streambuf base32-decodes all data read
-/// from the istream connected to it.
-///
-/// Note: For performance reasons, the characters
-/// are read directly from the given istream's
-/// underlying streambuf, so the state
-/// of the istream will not reflect that of
-/// its streambuf.
-{
-public:
-    Base32DecoderBuf(std::istream & istr);
-    ~Base32DecoderBuf();
-
-private:
-    int readFromDevice();
-    int readOne();
-
-    unsigned char _group[8];
-    int _groupLength;
-    int _groupIndex;
-    std::streambuf & _buf;
-
-    static unsigned char IN_ENCODING[256];
-    static bool IN_ENCODING_INIT;
-
-private:
-    Base32DecoderBuf(const Base32DecoderBuf &);
-    Base32DecoderBuf & operator=(const Base32DecoderBuf &);
-};
-
-
-class Foundation_API Base32DecoderIOS : public virtual std::ios
-/// The base class for Base32Decoder.
-///
-/// This class is needed to ensure the correct initialization
-/// order of the stream buffer and base classes.
-{
-public:
-    Base32DecoderIOS(std::istream & istr);
-    ~Base32DecoderIOS();
-    Base32DecoderBuf * rdbuf();
-
-protected:
-    Base32DecoderBuf _buf;
-
-private:
-    Base32DecoderIOS(const Base32DecoderIOS &);
-    Base32DecoderIOS & operator=(const Base32DecoderIOS &);
-};
-
-
-class Foundation_API Base32Decoder : public Base32DecoderIOS, public std::istream
-/// This istream base32-decodes all data
-/// read from the istream connected to it.
-///
-/// Note: For performance reasons, the characters
-/// are read directly from the given istream's
-/// underlying streambuf, so the state
-/// of the istream will not reflect that of
-/// its streambuf.
-{
-public:
-    Base32Decoder(std::istream & istr);
-    ~Base32Decoder();
-
-private:
-    Base32Decoder(const Base32Decoder &);
-    Base32Decoder & operator=(const Base32Decoder &);
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Base32Decoder_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/Base32Encoder.h b/base/poco/Foundation/include/Poco/Base32Encoder.h
deleted file mode 100644
index ced0dd6f3bb..00000000000
--- a/base/poco/Foundation/include/Poco/Base32Encoder.h
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Base32Encoder.h
-//
-// Library: Foundation
-// Package: Streams
-// Module:  Base32
-//
-// Definition of class Base32Encoder.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_Base32Encoder_INCLUDED
-#define Foundation_Base32Encoder_INCLUDED
-
-
-#include <ostream>
-#include "Poco/Foundation.h"
-#include "Poco/UnbufferedStreamBuf.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API Base32EncoderBuf : public UnbufferedStreamBuf
-/// This streambuf base32-encodes all data written
-/// to it and forwards it to a connected
-/// ostream.
-///
-/// Note: The characters are directly written
-/// to the ostream's streambuf, thus bypassing
-/// the ostream. The ostream's state is therefore
-/// not updated to match the buffer's state.
-{
-public:
-    Base32EncoderBuf(std::ostream & ostr, bool padding = true);
-    ~Base32EncoderBuf();
-
-    int close();
-    /// Closes the stream buffer.
-
-private:
-    int writeToDevice(char c);
-
-    unsigned char _group[5];
-    int _groupLength;
-    std::streambuf & _buf;
-    bool _doPadding;
-
-    static const unsigned char OUT_ENCODING[32];
-
-    friend class Base32DecoderBuf;
-
-    Base32EncoderBuf(const Base32EncoderBuf &);
-    Base32EncoderBuf & operator=(const Base32EncoderBuf &);
-};
-
-
-class Foundation_API Base32EncoderIOS : public virtual std::ios
-/// The base class for Base32Encoder.
-///
-/// This class is needed to ensure the correct initialization
-/// order of the stream buffer and base classes.
-{
-public:
-    Base32EncoderIOS(std::ostream & ostr, bool padding = true);
-    ~Base32EncoderIOS();
-    int close();
-    Base32EncoderBuf * rdbuf();
-
-protected:
-    Base32EncoderBuf _buf;
-
-private:
-    Base32EncoderIOS(const Base32EncoderIOS &);
-    Base32EncoderIOS & operator=(const Base32EncoderIOS &);
-};
-
-
-class Foundation_API Base32Encoder : public Base32EncoderIOS, public std::ostream
-/// This ostream base32-encodes all data
-/// written to it and forwards it to
-/// a connected ostream.
-/// Always call close() when done
-/// writing data, to ensure proper
-/// completion of the encoding operation.
-///
-/// Note: The characters are directly written
-/// to the ostream's streambuf, thus bypassing
-/// the ostream. The ostream's state is therefore
-/// not updated to match the buffer's state.
-{
-public:
-    Base32Encoder(std::ostream & ostr, bool padding = true);
-    ~Base32Encoder();
-
-private:
-    Base32Encoder(const Base32Encoder &);
-    Base32Encoder & operator=(const Base32Encoder &);
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Base32Encoder_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/ClassLibrary.h b/base/poco/Foundation/include/Poco/ClassLibrary.h
deleted file mode 100644
index deb43f26297..00000000000
--- a/base/poco/Foundation/include/Poco/ClassLibrary.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// ClassLibrary.h
-//
-// Library: Foundation
-// Package: SharedLibrary
-// Module:  ClassLoader
-//
-// Definitions for class libraries.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_ClassLibrary_INCLUDED
-#define Foundation_ClassLibrary_INCLUDED
-
-
-#include <typeinfo>
-#include "Poco/Foundation.h"
-#include "Poco/Manifest.h"
-
-
-#    define POCO_LIBRARY_API
-
-
-//
-// the entry points for every class library
-//
-extern "C" {
-bool POCO_LIBRARY_API pocoBuildManifest(Poco::ManifestBase * pManifest);
-void POCO_LIBRARY_API pocoInitializeLibrary();
-void POCO_LIBRARY_API pocoUninitializeLibrary();
-}
-
-
-//
-// additional support for named manifests
-//
-#define POCO_DECLARE_NAMED_MANIFEST(name) \
-    extern "C" { \
-    bool POCO_LIBRARY_API POCO_JOIN(pocoBuildManifest, name)(Poco::ManifestBase * pManifest); \
-    }
-
-
-//
-// Macros to automatically implement pocoBuildManifest
-//
-// usage:
-//
-// POCO_BEGIN_MANIFEST(MyBaseClass)
-//     POCO_EXPORT_CLASS(MyFirstClass)
-//     POCO_EXPORT_CLASS(MySecondClass)
-//     ...
-// POCO_END_MANIFEST
-//
-#define POCO_BEGIN_MANIFEST_IMPL(fnName, base) \
-    bool fnName(Poco::ManifestBase * pManifest_) \
-    { \
-        typedef base _Base; \
-        typedef Poco::Manifest<_Base> _Manifest; \
-        std::string requiredType(typeid(_Manifest).name()); \
-        std::string actualType(pManifest_->className()); \
-        if (requiredType == actualType) \
-        { \
-            Poco::Manifest<_Base> * pManifest = static_cast<_Manifest *>(pManifest_);
-
-
-#define POCO_BEGIN_MANIFEST(base) POCO_BEGIN_MANIFEST_IMPL(pocoBuildManifest, base)
-
-
-#define POCO_BEGIN_NAMED_MANIFEST(name, base) \
-    POCO_DECLARE_NAMED_MANIFEST(name) \
-    POCO_BEGIN_MANIFEST_IMPL(POCO_JOIN(pocoBuildManifest, name), base)
-
-
-#define POCO_END_MANIFEST \
-    return true; \
-    } \
-    else return false; \
-    }
-
-
-#define POCO_EXPORT_CLASS(cls) pManifest->insert(new Poco::MetaObject<cls, _Base>(#cls));
-
-
-#define POCO_EXPORT_SINGLETON(cls) pManifest->insert(new Poco::MetaSingleton<cls, _Base>(#cls));
-
-
-#endif // Foundation_ClassLibrary_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/ClassLoader.h b/base/poco/Foundation/include/Poco/ClassLoader.h
deleted file mode 100644
index 6752a6e7ecd..00000000000
--- a/base/poco/Foundation/include/Poco/ClassLoader.h
+++ /dev/null
@@ -1,355 +0,0 @@
-//
-// ClassLoader.h
-//
-// Library: Foundation
-// Package: SharedLibrary
-// Module:  ClassLoader
-//
-// Definition of the ClassLoader class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_ClassLoader_INCLUDED
-#define Foundation_ClassLoader_INCLUDED
-
-
-#include <map>
-#include "Poco/Exception.h"
-#include "Poco/Foundation.h"
-#include "Poco/Manifest.h"
-#include "Poco/MetaObject.h"
-#include "Poco/Mutex.h"
-#include "Poco/SharedLibrary.h"
-
-
-namespace Poco
-{
-
-
-template <class Base>
-class ClassLoader
-/// The ClassLoader loads C++ classes from shared libraries
-/// at runtime. It must be instantiated with a root class
-/// of the loadable classes.
-/// For a class to be loadable from a library, the library
-/// must provide a Manifest of all the classes it contains.
-/// The Manifest for a shared library can be easily built
-/// with the help of the macros in the header file
-/// "Foundation/ClassLibrary.h".
-///
-/// Starting with POCO release 1.3, a class library can
-/// export multiple manifests. In addition to the default
-/// (unnamed) manifest, multiple named manifests can
-/// be exported, each having a different base class.
-///
-/// There is one important restriction: one instance of
-/// ClassLoader can only load one manifest from a class
-/// library.
-{
-public:
-    typedef AbstractMetaObject<Base> Meta;
-    typedef Manifest<Base> Manif;
-    typedef void (*InitializeLibraryFunc)();
-    typedef void (*UninitializeLibraryFunc)();
-    typedef bool (*BuildManifestFunc)(ManifestBase *);
-
-    struct LibraryInfo
-    {
-        SharedLibrary * pLibrary;
-        const Manif * pManifest;
-        int refCount;
-    };
-    typedef std::map<std::string, LibraryInfo> LibraryMap;
-
-    class Iterator
-    /// The ClassLoader's very own iterator class.
-    {
-    public:
-        typedef std::pair<std::string, const Manif *> Pair;
-
-        Iterator(const typename LibraryMap::const_iterator & it) { _it = it; }
-        Iterator(const Iterator & it) { _it = it._it; }
-        ~Iterator() { }
-        Iterator & operator=(const Iterator & it)
-        {
-            _it = it._it;
-            return *this;
-        }
-        inline bool operator==(const Iterator & it) const { return _it == it._it; }
-        inline bool operator!=(const Iterator & it) const { return _it != it._it; }
-        Iterator & operator++() // prefix
-        {
-            ++_it;
-            return *this;
-        }
-        Iterator operator++(int) // postfix
-        {
-            Iterator result(_it);
-            ++_it;
-            return result;
-        }
-        inline const Pair * operator*() const
-        {
-            _pair.first = _it->first;
-            _pair.second = _it->second.pManifest;
-            return &_pair;
-        }
-        inline const Pair * operator->() const
-        {
-            _pair.first = _it->first;
-            _pair.second = _it->second.pManifest;
-            return &_pair;
-        }
-
-    private:
-        typename LibraryMap::const_iterator _it;
-        mutable Pair _pair;
-    };
-
-    ClassLoader()
-    /// Creates the ClassLoader.
-    {
-    }
-
-    virtual ~ClassLoader()
-    /// Destroys the ClassLoader.
-    {
-        for (typename LibraryMap::const_iterator it = _map.begin(); it != _map.end(); ++it)
-        {
-            delete it->second.pLibrary;
-            delete it->second.pManifest;
-        }
-    }
-
-    void loadLibrary(const std::string & path, const std::string & manifest)
-    /// Loads a library from the given path, using the given manifest.
-    /// Does nothing if the library is already loaded.
-    /// Throws a LibraryLoadException if the library
-    /// cannot be loaded or does not have a Manifest.
-    /// If the library exports a function named "pocoInitializeLibrary",
-    /// this function is executed.
-    /// If called multiple times for the same library,
-    /// the number of calls to unloadLibrary() must be the same
-    /// for the library to become unloaded.
-    {
-        FastMutex::ScopedLock lock(_mutex);
-
-        typename LibraryMap::iterator it = _map.find(path);
-        if (it == _map.end())
-        {
-            LibraryInfo li;
-            li.pLibrary = 0;
-            li.pManifest = 0;
-            li.refCount = 1;
-            try
-            {
-                li.pLibrary = new SharedLibrary(path);
-                li.pManifest = new Manif();
-                std::string pocoBuildManifestSymbol("pocoBuildManifest");
-                pocoBuildManifestSymbol.append(manifest);
-                if (li.pLibrary->hasSymbol("pocoInitializeLibrary"))
-                {
-                    InitializeLibraryFunc initializeLibrary = (InitializeLibraryFunc)li.pLibrary->getSymbol("pocoInitializeLibrary");
-                    initializeLibrary();
-                }
-                if (li.pLibrary->hasSymbol(pocoBuildManifestSymbol))
-                {
-                    BuildManifestFunc buildManifest = (BuildManifestFunc)li.pLibrary->getSymbol(pocoBuildManifestSymbol);
-                    if (buildManifest(const_cast<Manif *>(li.pManifest)))
-                        _map[path] = li;
-                    else
-                        throw LibraryLoadException(std::string("Manifest class mismatch in ") + path, manifest);
-                }
-                else
-                    throw LibraryLoadException(std::string("No manifest in ") + path, manifest);
-            }
-            catch (...)
-            {
-                delete li.pLibrary;
-                delete li.pManifest;
-                throw;
-            }
-        }
-        else
-        {
-            ++it->second.refCount;
-        }
-    }
-
-    void loadLibrary(const std::string & path)
-    /// Loads a library from the given path. Does nothing
-    /// if the library is already loaded.
-    /// Throws a LibraryLoadException if the library
-    /// cannot be loaded or does not have a Manifest.
-    /// If the library exports a function named "pocoInitializeLibrary",
-    /// this function is executed.
-    /// If called multiple times for the same library,
-    /// the number of calls to unloadLibrary() must be the same
-    /// for the library to become unloaded.
-    ///
-    /// Equivalent to loadLibrary(path, "").
-    {
-        loadLibrary(path, "");
-    }
-
-    void unloadLibrary(const std::string & path)
-    /// Unloads the given library.
-    /// Be extremely cautious when unloading shared libraries.
-    /// If objects from the library are still referenced somewhere,
-    /// a total crash is very likely.
-    /// If the library exports a function named "pocoUninitializeLibrary",
-    /// this function is executed before it is unloaded.
-    /// If loadLibrary() has been called multiple times for the same
-    /// library, the number of calls to unloadLibrary() must be the same
-    /// for the library to become unloaded.
-    {
-        FastMutex::ScopedLock lock(_mutex);
-
-        typename LibraryMap::iterator it = _map.find(path);
-        if (it != _map.end())
-        {
-            if (--it->second.refCount == 0)
-            {
-                if (it->second.pLibrary->hasSymbol("pocoUninitializeLibrary"))
-                {
-                    UninitializeLibraryFunc uninitializeLibrary
-                        = (UninitializeLibraryFunc)it->second.pLibrary->getSymbol("pocoUninitializeLibrary");
-                    uninitializeLibrary();
-                }
-                delete it->second.pManifest;
-                it->second.pLibrary->unload();
-                delete it->second.pLibrary;
-                _map.erase(it);
-            }
-        }
-        else
-            throw NotFoundException(path);
-    }
-
-    const Meta * findClass(const std::string & className) const
-    /// Returns a pointer to the MetaObject for the given
-    /// class, or a null pointer if the class is not known.
-    {
-        FastMutex::ScopedLock lock(_mutex);
-
-        for (typename LibraryMap::const_iterator it = _map.begin(); it != _map.end(); ++it)
-        {
-            const Manif * pManif = it->second.pManifest;
-            typename Manif::Iterator itm = pManif->find(className);
-            if (itm != pManif->end())
-                return *itm;
-        }
-        return 0;
-    }
-
-    const Meta & classFor(const std::string & className) const
-    /// Returns a reference to the MetaObject for the given
-    /// class. Throws a NotFoundException if the class
-    /// is not known.
-    {
-        const Meta * pMeta = findClass(className);
-        if (pMeta)
-            return *pMeta;
-        else
-            throw NotFoundException(className);
-    }
-
-    Base * create(const std::string & className) const
-    /// Creates an instance of the given class.
-    /// Throws a NotFoundException if the class
-    /// is not known.
-    {
-        return classFor(className).create();
-    }
-
-    Base & instance(const std::string & className) const
-    /// Returns a reference to the sole instance of
-    /// the given class. The class must be a singleton,
-    /// otherwise an InvalidAccessException will be thrown.
-    /// Throws a NotFoundException if the class
-    /// is not known.
-    {
-        return classFor(className).instance();
-    }
-
-    bool canCreate(const std::string & className) const
-    /// Returns true if create() can create new instances
-    /// of the class.
-    {
-        return classFor(className).canCreate();
-    }
-
-    void destroy(const std::string & className, Base * pObject) const
-    /// Destroys the object pObject points to.
-    /// Does nothing if object is not found.
-    {
-        classFor(className).destroy(pObject);
-    }
-
-    bool isAutoDelete(const std::string & className, Base * pObject) const
-    /// Returns true if the object is automatically
-    /// deleted by its meta object.
-    {
-        return classFor(className).isAutoDelete(pObject);
-    }
-
-    const Manif * findManifest(const std::string & path) const
-    /// Returns a pointer to the Manifest for the given
-    /// library, or a null pointer if the library has not been loaded.
-    {
-        FastMutex::ScopedLock lock(_mutex);
-
-        typename LibraryMap::const_iterator it = _map.find(path);
-        if (it != _map.end())
-            return it->second.pManifest;
-        else
-            return 0;
-    }
-
-    const Manif & manifestFor(const std::string & path) const
-    /// Returns a reference to the Manifest for the given library
-    /// Throws a NotFoundException if the library has not been loaded.
-    {
-        const Manif * pManif = findManifest(path);
-        if (pManif)
-            return *pManif;
-        else
-            throw NotFoundException(path);
-    }
-
-    bool isLibraryLoaded(const std::string & path) const
-    /// Returns true if the library with the given name
-    /// has already been loaded.
-    {
-        return findManifest(path) != 0;
-    }
-
-    Iterator begin() const
-    {
-        FastMutex::ScopedLock lock(_mutex);
-
-        return Iterator(_map.begin());
-    }
-
-    Iterator end() const
-    {
-        FastMutex::ScopedLock lock(_mutex);
-
-        return Iterator(_map.end());
-    }
-
-private:
-    LibraryMap _map;
-    mutable FastMutex _mutex;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_ClassLoader_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/Config.h b/base/poco/Foundation/include/Poco/Config.h
index e3fcb9d91cd..83d2c89553a 100644
--- a/base/poco/Foundation/include/Poco/Config.h
+++ b/base/poco/Foundation/include/Poco/Config.h
@@ -53,7 +53,7 @@
 
 
 // Define if no <locale> header is available (such as on WinCE)
-// #define POCO_NO_LOCALE
+#define POCO_NO_LOCALE
 
 
 // Define to desired default thread stack size
diff --git a/base/poco/Foundation/include/Poco/EventLogChannel.h b/base/poco/Foundation/include/Poco/EventLogChannel.h
deleted file mode 100644
index e6a79088204..00000000000
--- a/base/poco/Foundation/include/Poco/EventLogChannel.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// EventLogChannel.h
-//
-// Library: Foundation
-// Package: Logging
-// Module:  EventLogChannel
-//
-// Definition of the EventLogChannel class specific to WIN32.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_EventLogChannel_INCLUDED
-#define Foundation_EventLogChannel_INCLUDED
-
-
-#include "Poco/Channel.h"
-#include "Poco/Foundation.h"
-#include "Poco/UnWindows.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API EventLogChannel : public Channel
-/// This Windows-only channel works with the Windows NT Event Log
-/// service.
-///
-/// To work properly, the EventLogChannel class requires that either
-/// the PocoFoundation.dll or the PocoMsg.dll Dynamic Link Library
-/// containing the message definition resources can be found in $PATH.
-{
-public:
-    EventLogChannel();
-    /// Creates the EventLogChannel.
-    /// The name of the current application (or more correctly,
-    /// the name of its executable) is taken as event source name.
-
-    EventLogChannel(const std::string & name);
-    /// Creates the EventLogChannel with the given event source name.
-
-    EventLogChannel(const std::string & name, const std::string & host);
-    /// Creates an EventLogChannel with the given event source
-    /// name that routes messages to the given host.
-
-    void open();
-    /// Opens the EventLogChannel. If necessary, the
-    /// required registry entries to register a
-    /// message resource DLL are made.
-
-    void close();
-    /// Closes the EventLogChannel.
-
-    void log(const Message & msg);
-    /// Logs the given message to the Windows Event Log.
-    ///
-    /// The message type and priority are mapped to
-    /// appropriate values for Event Log type and category.
-
-    void setProperty(const std::string & name, const std::string & value);
-    /// Sets or changes a configuration property.
-    ///
-    /// The following properties are supported:
-    ///
-    ///   * name:    The name of the event source.
-    ///   * loghost: The name of the host where the Event Log service is running.
-    ///              The default is "localhost".
-    ///   * host:    same as host.
-    ///   * logfile: The name of the log file. The default is "Application".
-
-    std::string getProperty(const std::string & name) const;
-    /// Returns the value of the given property.
-
-    static const std::string PROP_NAME;
-    static const std::string PROP_HOST;
-    static const std::string PROP_LOGHOST;
-    static const std::string PROP_LOGFILE;
-
-protected:
-    ~EventLogChannel();
-    static int getType(const Message & msg);
-    static int getCategory(const Message & msg);
-    void setUpRegistry() const;
-    static std::string findLibrary(const char * name);
-
-private:
-    std::string _name;
-    std::string _host;
-    std::string _logFile;
-    HANDLE _h;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_EventLogChannel_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/FPEnvironment_DUMMY.h b/base/poco/Foundation/include/Poco/FPEnvironment_DUMMY.h
deleted file mode 100644
index 3d8f3612a7a..00000000000
--- a/base/poco/Foundation/include/Poco/FPEnvironment_DUMMY.h
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// FPEnvironment_DUMMY.h
-//
-// Library: Foundation
-// Package: Core
-// Module:  FPEnvironment
-//
-// Definition of class FPEnvironmentImpl for platforms that do not
-// support IEEE 754 extensions.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_FPEnvironment_DUMMY_INCLUDED
-#define Foundation_FPEnvironment_DUMMY_INCLUDED
-
-
-#include <cmath>
-#include "Poco/Foundation.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API FPEnvironmentImpl
-{
-protected:
-    enum RoundingModeImpl
-    {
-        FP_ROUND_DOWNWARD_IMPL,
-        FP_ROUND_UPWARD_IMPL,
-        FP_ROUND_TONEAREST_IMPL,
-        FP_ROUND_TOWARDZERO_IMPL
-    };
-    enum FlagImpl
-    {
-        FP_DIVIDE_BY_ZERO_IMPL,
-        FP_INEXACT_IMPL,
-        FP_OVERFLOW_IMPL,
-        FP_UNDERFLOW_IMPL,
-        FP_INVALID_IMPL
-    };
-    FPEnvironmentImpl();
-    FPEnvironmentImpl(const FPEnvironmentImpl & env);
-    ~FPEnvironmentImpl();
-    FPEnvironmentImpl & operator=(const FPEnvironmentImpl & env);
-    void keepCurrentImpl();
-    static void clearFlagsImpl();
-    static bool isFlagImpl(FlagImpl flag);
-    static void setRoundingModeImpl(RoundingModeImpl mode);
-    static RoundingModeImpl getRoundingModeImpl();
-    static bool isInfiniteImpl(float value);
-    static bool isInfiniteImpl(double value);
-    static bool isInfiniteImpl(long double value);
-    static bool isNaNImpl(float value);
-    static bool isNaNImpl(double value);
-    static bool isNaNImpl(long double value);
-    static float copySignImpl(float target, float source);
-    static double copySignImpl(double target, double source);
-    static long double copySignImpl(long double target, long double source);
-
-private:
-    static RoundingModeImpl _roundingMode;
-};
-
-
-//
-// inlines
-//
-inline bool FPEnvironmentImpl::isInfiniteImpl(float value)
-{
-    return std::isinf(value) != 0;
-}
-
-
-inline bool FPEnvironmentImpl::isInfiniteImpl(double value)
-{
-    return std::isinf(value) != 0;
-}
-
-
-inline bool FPEnvironmentImpl::isInfiniteImpl(long double value)
-{
-    return std::isinf((double)value) != 0;
-}
-
-
-inline bool FPEnvironmentImpl::isNaNImpl(float value)
-{
-    return std::isnan(value) != 0;
-}
-
-
-inline bool FPEnvironmentImpl::isNaNImpl(double value)
-{
-    return std::isnan(value) != 0;
-}
-
-
-inline bool FPEnvironmentImpl::isNaNImpl(long double value)
-{
-    return std::isnan((double)value) != 0;
-}
-
-
-inline float FPEnvironmentImpl::copySignImpl(float target, float source)
-{
-    return copysignf(target, source);
-}
-
-
-inline double FPEnvironmentImpl::copySignImpl(double target, double source)
-{
-    return copysign(target, source);
-}
-
-
-} // namespace Poco
-
-
-#endif // Foundation_FPEnvironment_DUMMY_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/FileStream_WIN32.h b/base/poco/Foundation/include/Poco/FileStream_WIN32.h
deleted file mode 100644
index 7d6670b9315..00000000000
--- a/base/poco/Foundation/include/Poco/FileStream_WIN32.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// FileStream_WIN32.h
-//
-// Library: Foundation
-// Package: Streams
-// Module:  FileStream
-//
-// Definition of the FileStreamBuf, FileInputStream and FileOutputStream classes.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_FileStream_WIN32_INCLUDED
-#define Foundation_FileStream_WIN32_INCLUDED
-
-
-#include "Poco/BufferedBidirectionalStreamBuf.h"
-#include "Poco/Foundation.h"
-#include "Poco/UnWindows.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API FileStreamBuf : public BufferedBidirectionalStreamBuf
-/// This stream buffer handles Fileio
-{
-public:
-    FileStreamBuf();
-    /// Creates a FileStreamBuf.
-
-    ~FileStreamBuf();
-    /// Destroys the FileStream.
-
-    void open(const std::string & path, std::ios::openmode mode);
-    /// Opens the given file in the given mode.
-
-    bool close();
-    /// Closes the File stream buffer. Returns true if successful,
-    /// false otherwise.
-
-    std::streampos seekoff(std::streamoff off, std::ios::seekdir dir, std::ios::openmode mode = std::ios::in | std::ios::out);
-    /// change position by offset, according to way and mode
-
-    std::streampos seekpos(std::streampos pos, std::ios::openmode mode = std::ios::in | std::ios::out);
-    /// change to specified position, according to mode
-
-protected:
-    enum
-    {
-        BUFFER_SIZE = 4096
-    };
-
-    int readFromDevice(char * buffer, std::streamsize length);
-    int writeToDevice(const char * buffer, std::streamsize length);
-
-private:
-    std::string _path;
-    HANDLE _handle;
-    UInt64 _pos;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_FileStream_WIN32_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/HashSet.h b/base/poco/Foundation/include/Poco/HashSet.h
deleted file mode 100644
index 8082b2813f4..00000000000
--- a/base/poco/Foundation/include/Poco/HashSet.h
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// HashSet.h
-//
-// Library: Foundation
-// Package: Hashing
-// Module:  HashSet
-//
-// Definition of the HashSet class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_HashSet_INCLUDED
-#define Foundation_HashSet_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/LinearHashTable.h"
-
-
-namespace Poco
-{
-
-
-template <class Value, class HashFunc = Hash<Value>>
-class HashSet
-/// This class implements a set using a LinearHashTable.
-///
-/// A HashSet can be used just like a std::set.
-{
-public:
-    typedef Value ValueType;
-    typedef Value & Reference;
-    typedef const Value & ConstReference;
-    typedef Value * Pointer;
-    typedef const Value * ConstPointer;
-    typedef HashFunc Hash;
-
-    typedef LinearHashTable<ValueType, Hash> HashTable;
-
-    typedef typename HashTable::Iterator Iterator;
-    typedef typename HashTable::ConstIterator ConstIterator;
-
-    HashSet()
-    /// Creates an empty HashSet.
-    {
-    }
-
-    HashSet(std::size_t initialReserve) : _table(initialReserve)
-    /// Creates the HashSet, using the given initialReserve.
-    {
-    }
-
-    HashSet(const HashSet & set) : _table(set._table)
-    /// Creates the HashSet by copying another one.
-    {
-    }
-
-    ~HashSet()
-    /// Destroys the HashSet.
-    {
-    }
-
-    HashSet & operator=(const HashSet & table)
-    /// Assigns another HashSet.
-    {
-        HashSet tmp(table);
-        swap(tmp);
-        return *this;
-    }
-
-    void swap(HashSet & set)
-    /// Swaps the HashSet with another one.
-    {
-        _table.swap(set._table);
-    }
-
-    ConstIterator begin() const
-    /// Returns an iterator pointing to the first entry, if one exists.
-    {
-        return _table.begin();
-    }
-
-    ConstIterator end() const
-    /// Returns an iterator pointing to the end of the table.
-    {
-        return _table.end();
-    }
-
-    Iterator begin()
-    /// Returns an iterator pointing to the first entry, if one exists.
-    {
-        return _table.begin();
-    }
-
-    Iterator end()
-    /// Returns an iterator pointing to the end of the table.
-    {
-        return _table.end();
-    }
-
-    ConstIterator find(const ValueType & value) const
-    /// Finds an entry in the table.
-    {
-        return _table.find(value);
-    }
-
-    Iterator find(const ValueType & value)
-    /// Finds an entry in the table.
-    {
-        return _table.find(value);
-    }
-
-    std::size_t count(const ValueType & value) const
-    /// Returns the number of elements with the given
-    /// value, with is either 1 or 0.
-    {
-        return _table.count(value);
-    }
-
-    std::pair<Iterator, bool> insert(const ValueType & value)
-    /// Inserts an element into the set.
-    ///
-    /// If the element already exists in the set,
-    /// a pair(iterator, false) with iterator pointing to the
-    /// existing element is returned.
-    /// Otherwise, the element is inserted an a
-    /// pair(iterator, true) with iterator
-    /// pointing to the new element is returned.
-    {
-        return _table.insert(value);
-    }
-
-    void erase(Iterator it)
-    /// Erases the element pointed to by it.
-    {
-        _table.erase(it);
-    }
-
-    void erase(const ValueType & value)
-    /// Erases the element with the given value, if it exists.
-    {
-        _table.erase(value);
-    }
-
-    void clear()
-    /// Erases all elements.
-    {
-        _table.clear();
-    }
-
-    std::size_t size() const
-    /// Returns the number of elements in the table.
-    {
-        return _table.size();
-    }
-
-    bool empty() const
-    /// Returns true iff the table is empty.
-    {
-        return _table.empty();
-    }
-
-private:
-    HashTable _table;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_HashSet_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/HashTable.h b/base/poco/Foundation/include/Poco/HashTable.h
deleted file mode 100644
index b160c9c2d6b..00000000000
--- a/base/poco/Foundation/include/Poco/HashTable.h
+++ /dev/null
@@ -1,352 +0,0 @@
-//
-// HashTable.h
-//
-// Library: Foundation
-// Package: Hashing
-// Module:  HashTable
-//
-// Definition of the HashTable class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_HashTable_INCLUDED
-#define Foundation_HashTable_INCLUDED
-
-
-#include <cstddef>
-#include <cstring>
-#include <map>
-#include <vector>
-#include "Poco/Exception.h"
-#include "Poco/Foundation.h"
-#include "Poco/HashFunction.h"
-#include "Poco/HashStatistic.h"
-
-
-namespace Poco
-{
-
-
-//@ deprecated
-template <class Key, class Value, class KeyHashFunction = HashFunction<Key>>
-class HashTable
-/// A HashTable stores a key value pair that can be looked up via a hashed key.
-///
-/// Collision handling is done via overflow maps(!). With small hash tables performance of this
-/// data struct will be closer to that a map than a hash table, i.e. slower. On the plus side,
-/// this class offers remove operations. Also HashTable full errors are not possible. If a fast
-/// HashTable implementation is needed and the remove operation is not required, use SimpleHashTable
-/// instead.
-///
-/// This class is NOT thread safe.
-{
-public:
-    typedef std::map<Key, Value> HashEntryMap;
-    typedef HashEntryMap ** HashTableVector;
-
-    typedef typename HashEntryMap::const_iterator ConstIterator;
-    typedef typename HashEntryMap::iterator Iterator;
-
-    HashTable(UInt32 initialSize = 251) : _entries(0), _size(0), _maxCapacity(initialSize)
-    /// Creates the HashTable.
-    {
-        _entries = new HashEntryMap *[initialSize];
-        memset(_entries, '\0', sizeof(HashEntryMap *) * initialSize);
-    }
-
-    HashTable(const HashTable & ht) : _entries(new HashEntryMap *[ht._maxCapacity]), _size(ht._size), _maxCapacity(ht._maxCapacity)
-    {
-        for (UInt32 i = 0; i < _maxCapacity; ++i)
-        {
-            if (ht._entries[i])
-                _entries[i] = new HashEntryMap(ht._entries[i]->begin(), ht._entries[i]->end());
-            else
-                _entries[i] = 0;
-        }
-    }
-
-    ~HashTable()
-    /// Destroys the HashTable.
-    {
-        clear();
-    }
-
-    HashTable & operator=(const HashTable & ht)
-    {
-        if (this != &ht)
-        {
-            clear();
-            _maxCapacity = ht._maxCapacity;
-            poco_assert_dbg(_entries == 0);
-            _entries = new HashEntryMap *[_maxCapacity];
-            _size = ht._size;
-
-            for (UInt32 i = 0; i < _maxCapacity; ++i)
-            {
-                if (ht._entries[i])
-                    _entries[i] = new HashEntryMap(ht._entries[i]->begin(), ht._entries[i]->end());
-                else
-                    _entries[i] = 0;
-            }
-        }
-        return *this;
-    }
-
-    void clear()
-    {
-        if (!_entries)
-            return;
-        for (UInt32 i = 0; i < _maxCapacity; ++i)
-        {
-            delete _entries[i];
-        }
-        delete[] _entries;
-        _entries = 0;
-        _size = 0;
-        _maxCapacity = 0;
-    }
-
-    UInt32 insert(const Key & key, const Value & value)
-    /// Returns the hash value of the inserted item.
-    /// Throws an exception if the entry was already inserted
-    {
-        UInt32 hsh = hash(key);
-        insertRaw(key, hsh, value);
-        return hsh;
-    }
-
-    Value & insertRaw(const Key & key, UInt32 hsh, const Value & value)
-    /// Returns the hash value of the inserted item.
-    /// Throws an exception if the entry was already inserted
-    {
-        if (!_entries[hsh])
-            _entries[hsh] = new HashEntryMap();
-        std::pair<typename HashEntryMap::iterator, bool> res(_entries[hsh]->insert(std::make_pair(key, value)));
-        if (!res.second)
-            throw InvalidArgumentException("HashTable::insert, key already exists.");
-        _size++;
-        return res.first->second;
-    }
-
-    UInt32 update(const Key & key, const Value & value)
-    /// Returns the hash value of the inserted item.
-    /// Replaces an existing entry if it finds one
-    {
-        UInt32 hsh = hash(key);
-        updateRaw(key, hsh, value);
-        return hsh;
-    }
-
-    void updateRaw(const Key & key, UInt32 hsh, const Value & value)
-    /// Returns the hash value of the inserted item.
-    /// Replaces an existing entry if it finds one
-    {
-        if (!_entries[hsh])
-            _entries[hsh] = new HashEntryMap();
-        std::pair<Iterator, bool> res = _entries[hsh]->insert(std::make_pair(key, value));
-        if (res.second == false)
-            res.first->second = value;
-        else
-            _size++;
-    }
-
-    void remove(const Key & key)
-    {
-        UInt32 hsh = hash(key);
-        removeRaw(key, hsh);
-    }
-
-    void removeRaw(const Key & key, UInt32 hsh)
-    /// Performance version, allows to specify the hash value
-    {
-        if (_entries[hsh])
-        {
-            _size -= _entries[hsh]->erase(key);
-        }
-    }
-
-    UInt32 hash(const Key & key) const { return _hash(key, _maxCapacity); }
-
-    const Value & get(const Key & key) const
-    /// Throws an exception if the value does not exist
-    {
-        UInt32 hsh = hash(key);
-        return getRaw(key, hsh);
-    }
-
-    const Value & getRaw(const Key & key, UInt32 hsh) const
-    /// Throws an exception if the value does not exist
-    {
-        if (!_entries[hsh])
-            throw InvalidArgumentException("key not found");
-
-        ConstIterator it = _entries[hsh]->find(key);
-        if (it == _entries[hsh]->end())
-            throw InvalidArgumentException("key not found");
-
-        return it->second;
-    }
-
-    Value & get(const Key & key)
-    /// Throws an exception if the value does not exist
-    {
-        UInt32 hsh = hash(key);
-        return const_cast<Value &>(getRaw(key, hsh));
-    }
-
-    const Value & operator[](const Key & key) const { return get(key); }
-
-    Value & operator[](const Key & key)
-    {
-        UInt32 hsh = hash(key);
-
-        if (!_entries[hsh])
-            return insertRaw(key, hsh, Value());
-
-        ConstIterator it = _entries[hsh]->find(key);
-        if (it == _entries[hsh]->end())
-            return insertRaw(key, hsh, Value());
-
-        return it->second;
-    }
-
-    const Key & getKeyRaw(const Key & key, UInt32 hsh)
-    /// Throws an exception if the key does not exist. returns a reference to the internally
-    /// stored key. Useful when someone does an insert and wants for performance reason only to store
-    /// a pointer to the key in another collection
-    {
-        if (!_entries[hsh])
-            throw InvalidArgumentException("key not found");
-        ConstIterator it = _entries[hsh]->find(key);
-        if (it == _entries[hsh]->end())
-            throw InvalidArgumentException("key not found");
-        return it->first;
-    }
-
-    bool get(const Key & key, Value & v) const
-    /// Sets v to the found value, returns false if no value was found
-    {
-        UInt32 hsh = hash(key);
-        return getRaw(key, hsh, v);
-    }
-
-    bool getRaw(const Key & key, UInt32 hsh, Value & v) const
-    /// Sets v to the found value, returns false if no value was found
-    {
-        if (!_entries[hsh])
-            return false;
-
-        ConstIterator it = _entries[hsh]->find(key);
-        if (it == _entries[hsh]->end())
-            return false;
-
-        v = it->second;
-        return true;
-    }
-
-    bool exists(const Key & key)
-    {
-        UInt32 hsh = hash(key);
-        return existsRaw(key, hsh);
-    }
-
-    bool existsRaw(const Key & key, UInt32 hsh) { return _entries[hsh] && (_entries[hsh]->end() != _entries[hsh]->find(key)); }
-
-    std::size_t size() const
-    /// Returns the number of elements already inserted into the HashTable
-    {
-        return _size;
-    }
-
-    UInt32 maxCapacity() const { return _maxCapacity; }
-
-    void resize(UInt32 newSize)
-    /// Resizes the hashtable, rehashes all existing entries. Expensive!
-    {
-        if (_maxCapacity != newSize)
-        {
-            HashTableVector cpy = _entries;
-            _entries = 0;
-            UInt32 oldSize = _maxCapacity;
-            _maxCapacity = newSize;
-            _entries = new HashEntryMap *[_maxCapacity];
-            memset(_entries, '\0', sizeof(HashEntryMap *) * _maxCapacity);
-
-            if (_size == 0)
-            {
-                // no data was yet inserted
-                delete[] cpy;
-                return;
-            }
-            _size = 0;
-            for (UInt32 i = 0; i < oldSize; ++i)
-            {
-                if (cpy[i])
-                {
-                    ConstIterator it = cpy[i]->begin();
-                    ConstIterator itEnd = cpy[i]->end();
-                    for (; it != itEnd; ++it)
-                    {
-                        insert(it->first, it->second);
-                    }
-                    delete cpy[i];
-                }
-            }
-            delete[] cpy;
-        }
-    }
-
-    HashStatistic currentState(bool details = false) const
-    /// Returns the current internal state
-    {
-        UInt32 numberOfEntries = (UInt32)_size;
-        UInt32 numZeroEntries = 0;
-        UInt32 maxEntriesPerHash = 0;
-        std::vector<UInt32> detailedEntriesPerHash;
-#ifdef _DEBUG
-        UInt32 totalSize = 0;
-#endif
-        for (UInt32 i = 0; i < _maxCapacity; ++i)
-        {
-            if (_entries[i])
-            {
-                UInt32 size = (UInt32)_entries[i]->size();
-                poco_assert_dbg(size != 0);
-                if (size > maxEntriesPerHash)
-                    maxEntriesPerHash = size;
-                if (details)
-                    detailedEntriesPerHash.push_back(size);
-#ifdef _DEBUG
-                totalSize += size;
-#endif
-            }
-            else
-            {
-                numZeroEntries++;
-                if (details)
-                    detailedEntriesPerHash.push_back(0);
-            }
-        }
-#ifdef _DEBUG
-        poco_assert_dbg(totalSize == numberOfEntries);
-#endif
-        return HashStatistic(_maxCapacity, numberOfEntries, numZeroEntries, maxEntriesPerHash, detailedEntriesPerHash);
-    }
-
-private:
-    HashTableVector _entries;
-    std::size_t _size;
-    UInt32 _maxCapacity;
-    KeyHashFunction _hash;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_HashTable_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/Latin1Encoding.h b/base/poco/Foundation/include/Poco/Latin1Encoding.h
deleted file mode 100644
index 279ecd477f4..00000000000
--- a/base/poco/Foundation/include/Poco/Latin1Encoding.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Latin1Encoding.h
-//
-// Library: Foundation
-// Package: Text
-// Module:  Latin1Encoding
-//
-// Definition of the Latin1Encoding class.
-//
-// Copyright (c) 2004-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_Latin1Encoding_INCLUDED
-#define Foundation_Latin1Encoding_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/TextEncoding.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API Latin1Encoding : public TextEncoding
-/// ISO Latin-1 (8859-1) text encoding.
-{
-public:
-    Latin1Encoding();
-    ~Latin1Encoding();
-    const char * canonicalName() const;
-    bool isA(const std::string & encodingName) const;
-    const CharacterMap & characterMap() const;
-    int convert(const unsigned char * bytes) const;
-    int convert(int ch, unsigned char * bytes, int length) const;
-    int queryConvert(const unsigned char * bytes, int length) const;
-    int sequenceLength(const unsigned char * bytes, int length) const;
-
-private:
-    static const char * _names[];
-    static const CharacterMap _charMap;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Latin1Encoding_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/Latin2Encoding.h b/base/poco/Foundation/include/Poco/Latin2Encoding.h
deleted file mode 100644
index b86c183de17..00000000000
--- a/base/poco/Foundation/include/Poco/Latin2Encoding.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Latin2Encoding.h
-//
-// Library: Foundation
-// Package: Text
-// Module:  Latin2Encoding
-//
-// Definition of the Latin2Encoding class.
-//
-// Copyright (c) 2004-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_Latin2Encoding_INCLUDED
-#define Foundation_Latin2Encoding_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/TextEncoding.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API Latin2Encoding : public TextEncoding
-/// ISO Latin-2 (8859-2) text encoding.
-///
-/// Latin-2 is basically Latin-1 with the EURO sign plus
-/// some other minor changes.
-{
-public:
-    Latin2Encoding();
-    virtual ~Latin2Encoding();
-    const char * canonicalName() const;
-    bool isA(const std::string & encodingName) const;
-    const CharacterMap & characterMap() const;
-    int convert(const unsigned char * bytes) const;
-    int convert(int ch, unsigned char * bytes, int length) const;
-    int queryConvert(const unsigned char * bytes, int length) const;
-    int sequenceLength(const unsigned char * bytes, int length) const;
-
-private:
-    static const char * _names[];
-    static const CharacterMap _charMap;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Latin2Encoding_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/Latin9Encoding.h b/base/poco/Foundation/include/Poco/Latin9Encoding.h
deleted file mode 100644
index db672e15bba..00000000000
--- a/base/poco/Foundation/include/Poco/Latin9Encoding.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Latin9Encoding.h
-//
-// Library: Foundation
-// Package: Text
-// Module:  Latin9Encoding
-//
-// Definition of the Latin9Encoding class.
-//
-// Copyright (c) 2004-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_Latin9Encoding_INCLUDED
-#define Foundation_Latin9Encoding_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/TextEncoding.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API Latin9Encoding : public TextEncoding
-/// ISO Latin-9 (8859-15) text encoding.
-///
-/// Latin-9 is basically Latin-1 with the EURO sign plus
-/// some other minor changes.
-{
-public:
-    Latin9Encoding();
-    ~Latin9Encoding();
-    const char * canonicalName() const;
-    bool isA(const std::string & encodingName) const;
-    const CharacterMap & characterMap() const;
-    int convert(const unsigned char * bytes) const;
-    int convert(int ch, unsigned char * bytes, int length) const;
-    int queryConvert(const unsigned char * bytes, int length) const;
-    int sequenceLength(const unsigned char * bytes, int length) const;
-
-private:
-    static const char * _names[];
-    static const CharacterMap _charMap;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Latin9Encoding_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/MD4Engine.h b/base/poco/Foundation/include/Poco/MD4Engine.h
deleted file mode 100644
index a772726955e..00000000000
--- a/base/poco/Foundation/include/Poco/MD4Engine.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// MD4Engine.h
-//
-// Library: Foundation
-// Package: Crypt
-// Module:  MD4Engine
-//
-// Definition of class MD4Engine.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-//
-// MD4 (RFC 1320) algorithm:
-// Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-// rights reserved.
-//
-// License to copy and use this software is granted provided that it
-// is identified as the "RSA Data Security, Inc. MD4 Message-Digest
-// Algorithm" in all material mentioning or referencing this software
-// or this function.
-//
-// License is also granted to make and use derivative works provided
-// that such works are identified as "derived from the RSA Data
-// Security, Inc. MD4 Message-Digest Algorithm" in all material
-// mentioning or referencing the derived work.
-//
-// RSA Data Security, Inc. makes no representations concerning either
-// the merchantability of this software or the suitability of this
-// software for any particular purpose. It is provided "as is"
-// without express or implied warranty of any kind.
-//
-// These notices must be retained in any copies of any part of this
-// documentation and/or software.
-//
-
-
-#ifndef Foundation_MD4Engine_INCLUDED
-#define Foundation_MD4Engine_INCLUDED
-
-
-#include "Poco/DigestEngine.h"
-#include "Poco/Foundation.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API MD4Engine : public DigestEngine
-/// This class implements the MD4 message digest algorithm,
-/// described in RFC 1320.
-{
-public:
-    enum
-    {
-        BLOCK_SIZE = 64,
-        DIGEST_SIZE = 16
-    };
-
-    MD4Engine();
-    ~MD4Engine();
-
-    std::size_t digestLength() const;
-    void reset();
-    const DigestEngine::Digest & digest();
-
-protected:
-    void updateImpl(const void * data, std::size_t length);
-
-private:
-    static void transform(UInt32 state[4], const unsigned char block[64]);
-    static void encode(unsigned char * output, const UInt32 * input, std::size_t len);
-    static void decode(UInt32 * output, const unsigned char * input, std::size_t len);
-
-    struct Context
-    {
-        UInt32 state[4]; // state (ABCD)
-        UInt32 count[2]; // number of bits, modulo 2^64 (lsb first)
-        unsigned char buffer[64]; // input buffer
-    };
-
-    Context _context;
-    DigestEngine::Digest _digest;
-
-    MD4Engine(const MD4Engine &);
-    MD4Engine & operator=(const MD4Engine &);
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_MD5Engine_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/Manifest.h b/base/poco/Foundation/include/Poco/Manifest.h
deleted file mode 100644
index 1835d6e64ce..00000000000
--- a/base/poco/Foundation/include/Poco/Manifest.h
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// Manifest.h
-//
-// Library: Foundation
-// Package: SharedLibrary
-// Module:  ClassLoader
-//
-// Definition of the Manifest class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_Manifest_INCLUDED
-#define Foundation_Manifest_INCLUDED
-
-
-#include <map>
-#include <typeinfo>
-#include "Poco/Foundation.h"
-#include "Poco/MetaObject.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API ManifestBase
-/// ManifestBase is a common base class for
-/// all instantiations of Manifest.
-{
-public:
-    ManifestBase();
-    virtual ~ManifestBase();
-
-    virtual const char * className() const = 0;
-    /// Returns the type name of the manifest's class.
-};
-
-
-template <class B>
-class Manifest : public ManifestBase
-/// A Manifest maintains a list of all classes
-/// contained in a dynamically loadable class
-/// library.
-/// Internally, the information is held
-/// in a map. An iterator is provided to
-/// iterate over all the classes in a Manifest.
-{
-public:
-    typedef AbstractMetaObject<B> Meta;
-    typedef std::map<std::string, const Meta *> MetaMap;
-
-    class Iterator
-    /// The Manifest's very own iterator class.
-    {
-    public:
-        Iterator(const typename MetaMap::const_iterator & it) { _it = it; }
-        Iterator(const Iterator & it) { _it = it._it; }
-        ~Iterator() { }
-        Iterator & operator=(const Iterator & it)
-        {
-            _it = it._it;
-            return *this;
-        }
-        inline bool operator==(const Iterator & it) const { return _it == it._it; }
-        inline bool operator!=(const Iterator & it) const { return _it != it._it; }
-        Iterator & operator++() // prefix
-        {
-            ++_it;
-            return *this;
-        }
-        Iterator operator++(int) // postfix
-        {
-            Iterator result(_it);
-            ++_it;
-            return result;
-        }
-        inline const Meta * operator*() const { return _it->second; }
-        inline const Meta * operator->() const { return _it->second; }
-
-    private:
-        typename MetaMap::const_iterator _it;
-    };
-
-    Manifest()
-    /// Creates an empty Manifest.
-    {
-    }
-
-    virtual ~Manifest()
-    /// Destroys the Manifest.
-    {
-        clear();
-    }
-
-    Iterator find(const std::string & className) const
-    /// Returns an iterator pointing to the MetaObject
-    /// for the given class. If the MetaObject cannot
-    /// be found, the iterator points to end().
-    {
-        return Iterator(_metaMap.find(className));
-    }
-
-    Iterator begin() const { return Iterator(_metaMap.begin()); }
-
-    Iterator end() const { return Iterator(_metaMap.end()); }
-
-    bool insert(const Meta * pMeta)
-    /// Inserts a MetaObject. Returns true if insertion
-    /// was successful, false if a class with the same
-    /// name already exists.
-    {
-        return _metaMap.insert(typename MetaMap::value_type(pMeta->name(), pMeta)).second;
-    }
-
-    void clear()
-    /// Removes all MetaObjects from the manifest.
-    {
-        for (typename MetaMap::iterator it = _metaMap.begin(); it != _metaMap.end(); ++it)
-        {
-            delete it->second;
-        }
-        _metaMap.clear();
-    }
-
-    int size() const
-    /// Returns the number of MetaObjects in the Manifest.
-    {
-        return int(_metaMap.size());
-    }
-
-    bool empty() const
-    /// Returns true iff the Manifest does not contain any MetaObjects.
-    {
-        return _metaMap.empty();
-    }
-
-    const char * className() const { return typeid(*this).name(); }
-
-private:
-    MetaMap _metaMap;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Manifest_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/Message.h b/base/poco/Foundation/include/Poco/Message.h
index f78b3ebb6a1..e8f04888ab4 100644
--- a/base/poco/Foundation/include/Poco/Message.h
+++ b/base/poco/Foundation/include/Poco/Message.h
@@ -105,6 +105,8 @@ public:
     const std::string & getText() const;
     /// Returns the text of the message.
 
+    void appendText(const std::string & text);
+
     void setPriority(Priority prio);
     /// Sets the priority of the message.
 
diff --git a/base/poco/Foundation/include/Poco/NumericString.h b/base/poco/Foundation/include/Poco/NumericString.h
index 7c9628c7f16..cc5c011e6ed 100644
--- a/base/poco/Foundation/include/Poco/NumericString.h
+++ b/base/poco/Foundation/include/Poco/NumericString.h
@@ -30,9 +30,6 @@
 #include <cctype>
 #include <cmath>
 #include <limits>
-#if !defined(POCO_NO_LOCALE)
-#    include <locale>
-#endif
 
 
 // binary numbers are supported, thus 64 (bits) + 1 (string terminating zero)
@@ -53,11 +50,7 @@ inline char decimalSeparator()
 /// Returns decimal separator from global locale or
 /// default '.' for platforms where locale is unavailable.
 {
-#if !defined(POCO_NO_LOCALE)
-    return std::use_facet<std::numpunct<char>>(std::locale()).decimal_point();
-#else
     return '.';
-#endif
 }
 
 
@@ -65,11 +58,7 @@ inline char thousandSeparator()
 /// Returns thousand separator from global locale or
 /// default ',' for platforms where locale is unavailable.
 {
-#if !defined(POCO_NO_LOCALE)
-    return std::use_facet<std::numpunct<char>>(std::locale()).thousands_sep();
-#else
     return ',';
-#endif
 }
 
 
diff --git a/base/poco/Foundation/include/Poco/PipeImpl_DUMMY.h b/base/poco/Foundation/include/Poco/PipeImpl_DUMMY.h
deleted file mode 100644
index c707e5f6f0f..00000000000
--- a/base/poco/Foundation/include/Poco/PipeImpl_DUMMY.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// PipeImpl_DUMMY.h
-//
-// Library: Foundation
-// Package: Processes
-// Module:  PipeImpl
-//
-// Definition of the PipeImpl_DUMMY class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_PipeImpl_DUMMY_INCLUDED
-#define Foundation_PipeImpl_DUMMY_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/RefCountedObject.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API PipeImpl : public RefCountedObject
-/// A dummy implementation of PipeImpl for platforms
-/// that do not support pipes.
-{
-public:
-    typedef int Handle;
-
-    PipeImpl();
-    ~PipeImpl();
-    int writeBytes(const void * buffer, int length);
-    int readBytes(void * buffer, int length);
-    Handle readHandle() const;
-    Handle writeHandle() const;
-    void closeRead();
-    void closeWrite();
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_PipeImpl_DUMMY_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/PipeStream.h b/base/poco/Foundation/include/Poco/PipeStream.h
deleted file mode 100644
index a797cade010..00000000000
--- a/base/poco/Foundation/include/Poco/PipeStream.h
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// PipeStream.h
-//
-// Library: Foundation
-// Package: Processes
-// Module:  PipeStream
-//
-// Definition of the PipeStream class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_PipeStream_INCLUDED
-#define Foundation_PipeStream_INCLUDED
-
-
-#include <istream>
-#include <ostream>
-#include "Poco/BufferedStreamBuf.h"
-#include "Poco/Foundation.h"
-#include "Poco/Pipe.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API PipeStreamBuf : public BufferedStreamBuf
-/// This is the streambuf class used for reading from and writing to a Pipe.
-{
-public:
-    typedef BufferedStreamBuf::openmode openmode;
-
-    PipeStreamBuf(const Pipe & pipe, openmode mode);
-    /// Creates a PipeStreamBuf with the given Pipe.
-
-    ~PipeStreamBuf();
-    /// Destroys the PipeStreamBuf.
-
-    void close();
-    /// Closes the pipe.
-
-protected:
-    int readFromDevice(char * buffer, std::streamsize length);
-    int writeToDevice(const char * buffer, std::streamsize length);
-
-private:
-    enum
-    {
-        STREAM_BUFFER_SIZE = 1024
-    };
-
-    Pipe _pipe;
-};
-
-
-class Foundation_API PipeIOS : public virtual std::ios
-/// The base class for PipeInputStream and
-/// PipeOutputStream.
-///
-/// This class is needed to ensure the correct initialization
-/// order of the stream buffer and base classes.
-{
-public:
-    PipeIOS(const Pipe & pipe, openmode mode);
-    /// Creates the PipeIOS with the given Pipe.
-
-    ~PipeIOS();
-    /// Destroys the PipeIOS.
-    ///
-    /// Flushes the buffer, but does not close the pipe.
-
-    PipeStreamBuf * rdbuf();
-    /// Returns a pointer to the internal PipeStreamBuf.
-
-    void close();
-    /// Flushes the stream and closes the pipe.
-
-protected:
-    PipeStreamBuf _buf;
-};
-
-
-class Foundation_API PipeOutputStream : public PipeIOS, public std::ostream
-/// An output stream for writing to a Pipe.
-{
-public:
-    PipeOutputStream(const Pipe & pipe);
-    /// Creates the PipeOutputStream with the given Pipe.
-
-    ~PipeOutputStream();
-    /// Destroys the PipeOutputStream.
-    ///
-    /// Flushes the buffer, but does not close the pipe.
-};
-
-
-class Foundation_API PipeInputStream : public PipeIOS, public std::istream
-/// An input stream for reading from a Pipe.
-///
-/// Using formatted input from a PipeInputStream
-/// is not recommended, due to the read-ahead behavior of
-/// istream with formatted reads.
-{
-public:
-    PipeInputStream(const Pipe & pipe);
-    /// Creates the PipeInputStream with the given Pipe.
-
-    ~PipeInputStream();
-    /// Destroys the PipeInputStream.
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_PipeStream_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/SharedMemory_DUMMY.h b/base/poco/Foundation/include/Poco/SharedMemory_DUMMY.h
deleted file mode 100644
index da5269dabad..00000000000
--- a/base/poco/Foundation/include/Poco/SharedMemory_DUMMY.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// SharedMemoryImpl.h
-//
-// Library: Foundation
-// Package: Processes
-// Module:  SharedMemoryImpl
-//
-// Definition of the SharedMemoryImpl class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_SharedMemoryImpl_INCLUDED
-#define Foundation_SharedMemoryImpl_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/RefCountedObject.h"
-#include "Poco/SharedMemory.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API SharedMemoryImpl : public RefCountedObject
-/// A dummy implementation of shared memory, for systems
-/// that do not have shared memory support.
-{
-public:
-    SharedMemoryImpl(const std::string & id, std::size_t size, SharedMemory::AccessMode mode, const void * addr, bool server);
-    /// Creates or connects to a shared memory object with the given name.
-    ///
-    /// For maximum portability, name should be a valid Unix filename and not
-    /// contain any slashes or backslashes.
-    ///
-    /// An address hint can be passed to the system, specifying the desired
-    /// start address of the shared memory area. Whether the hint
-    /// is actually honored is, however, up to the system. Windows platform
-    /// will generally ignore the hint.
-
-    SharedMemoryImpl(const Poco::File & aFile, SharedMemory::AccessMode mode, const void * addr);
-    /// Maps the entire contents of file into a shared memory segment.
-    ///
-    /// An address hint can be passed to the system, specifying the desired
-    /// start address of the shared memory area. Whether the hint
-    /// is actually honored is, however, up to the system. Windows platform
-    /// will generally ignore the hint.
-
-    char * begin() const;
-    /// Returns the start address of the shared memory segment.
-
-    char * end() const;
-    /// Returns the one-past-end end address of the shared memory segment.
-
-protected:
-    ~SharedMemoryImpl();
-    /// Destroys the SharedMemoryImpl.
-
-private:
-    SharedMemoryImpl();
-    SharedMemoryImpl(const SharedMemoryImpl &);
-    SharedMemoryImpl & operator=(const SharedMemoryImpl &);
-};
-
-
-//
-// inlines
-//
-inline char * SharedMemoryImpl::begin() const
-{
-    return 0;
-}
-
-
-inline char * SharedMemoryImpl::end() const
-{
-    return 0;
-}
-
-
-} // namespace Poco
-
-
-#endif // Foundation_SharedMemoryImpl_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/SimpleHashTable.h b/base/poco/Foundation/include/Poco/SimpleHashTable.h
deleted file mode 100644
index b0fcd99aafa..00000000000
--- a/base/poco/Foundation/include/Poco/SimpleHashTable.h
+++ /dev/null
@@ -1,387 +0,0 @@
-//
-// SimpleHashTable.h
-//
-// Library: Foundation
-// Package: Hashing
-// Module:  SimpleHashTable
-//
-// Definition of the SimpleHashTable class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_SimpleHashTable_INCLUDED
-#define Foundation_SimpleHashTable_INCLUDED
-
-
-#include <algorithm>
-#include <cstddef>
-#include <map>
-#include <vector>
-#include "Poco/Exception.h"
-#include "Poco/Foundation.h"
-#include "Poco/HashFunction.h"
-#include "Poco/HashStatistic.h"
-
-
-namespace Poco
-{
-
-
-//@ deprecated
-template <class Key, class Value, class KeyHashFunction = HashFunction<Key>>
-class SimpleHashTable
-/// A SimpleHashTable stores a key value pair that can be looked up via a hashed key.
-///
-/// In comparison to a HashTable, this class handles collisions by sequentially searching the next
-/// free location. This also means that the maximum size of this table is limited, i.e. if the hash table
-/// is full, it will throw an exception and that this class does not support remove operations.
-/// On the plus side it is faster than the HashTable.
-///
-/// This class is NOT thread safe.
-{
-public:
-    class HashEntry
-    {
-    public:
-        Key key;
-        Value value;
-        HashEntry(const Key k, const Value v) : key(k), value(v) { }
-    };
-
-    typedef std::vector<HashEntry *> HashTableVector;
-
-    SimpleHashTable(UInt32 capacity = 251) : _entries(capacity, 0), _size(0), _capacity(capacity)
-    /// Creates the SimpleHashTable.
-    {
-    }
-
-    SimpleHashTable(const SimpleHashTable & ht) : _size(ht._size), _capacity(ht._capacity)
-    {
-        _entries.reserve(ht._capacity);
-        for (typename HashTableVector::iterator it = ht._entries.begin(); it != ht._entries.end(); ++it)
-        {
-            if (*it)
-                _entries.push_back(new HashEntry(*it));
-            else
-                _entries.push_back(0);
-        }
-    }
-
-    ~SimpleHashTable()
-    /// Destroys the SimpleHashTable.
-    {
-        clear();
-    }
-
-    SimpleHashTable & operator=(const SimpleHashTable & ht)
-    {
-        if (this != &ht)
-        {
-            SimpleHashTable tmp(ht);
-            swap(tmp);
-        }
-        return *this;
-    }
-
-    void swap(SimpleHashTable & ht)
-    {
-        using std::swap;
-        swap(_entries, ht._entries);
-        swap(_size, ht._size);
-        swap(_capacity, ht._capacity);
-    }
-
-    void clear()
-    {
-        for (typename HashTableVector::iterator it = _entries.begin(); it != _entries.end(); ++it)
-        {
-            delete *it;
-            *it = 0;
-        }
-        _size = 0;
-    }
-
-    UInt32 insert(const Key & key, const Value & value)
-    /// Returns the hash value of the inserted item.
-    /// Throws an exception if the entry was already inserted
-    {
-        UInt32 hsh = hash(key);
-        insertRaw(key, hsh, value);
-        return hsh;
-    }
-
-    Value & insertRaw(const Key & key, UInt32 hsh, const Value & value)
-    /// Returns the hash value of the inserted item.
-    /// Throws an exception if the entry was already inserted
-    {
-        UInt32 pos = hsh;
-        if (!_entries[pos])
-            _entries[pos] = new HashEntry(key, value);
-        else
-        {
-            UInt32 origHash = hsh;
-            while (_entries[hsh % _capacity])
-            {
-                if (_entries[hsh % _capacity]->key == key)
-                    throw ExistsException();
-                if (hsh - origHash > _capacity)
-                    throw PoolOverflowException("SimpleHashTable full");
-                hsh++;
-            }
-            pos = hsh % _capacity;
-            _entries[pos] = new HashEntry(key, value);
-        }
-        _size++;
-        return _entries[pos]->value;
-    }
-
-    UInt32 update(const Key & key, const Value & value)
-    /// Returns the hash value of the inserted item.
-    /// Replaces an existing entry if it finds one
-    {
-        UInt32 hsh = hash(key);
-        updateRaw(key, hsh, value);
-        return hsh;
-    }
-
-    void updateRaw(const Key & key, UInt32 hsh, const Value & value)
-    /// Returns the hash value of the inserted item.
-    /// Replaces an existing entry if it finds one
-    {
-        if (!_entries[hsh])
-            _entries[hsh] = new HashEntry(key, value);
-        else
-        {
-            UInt32 origHash = hsh;
-            while (_entries[hsh % _capacity])
-            {
-                if (_entries[hsh % _capacity]->key == key)
-                {
-                    _entries[hsh % _capacity]->value = value;
-                    return;
-                }
-                if (hsh - origHash > _capacity)
-                    throw PoolOverflowException("SimpleHashTable full");
-                hsh++;
-            }
-            _entries[hsh % _capacity] = new HashEntry(key, value);
-        }
-        _size++;
-    }
-
-    UInt32 hash(const Key & key) const { return _hash(key, _capacity); }
-
-    const Value & get(const Key & key) const
-    /// Throws an exception if the value does not exist
-    {
-        UInt32 hsh = hash(key);
-        return getRaw(key, hsh);
-    }
-
-    const Value & getRaw(const Key & key, UInt32 hsh) const
-    /// Throws an exception if the value does not exist
-    {
-        UInt32 origHash = hsh;
-        while (true)
-        {
-            if (_entries[hsh % _capacity])
-            {
-                if (_entries[hsh % _capacity]->key == key)
-                {
-                    return _entries[hsh % _capacity]->value;
-                }
-            }
-            else
-                throw InvalidArgumentException("value not found");
-            if (hsh - origHash > _capacity)
-                throw InvalidArgumentException("value not found");
-            hsh++;
-        }
-    }
-
-    Value & get(const Key & key)
-    /// Throws an exception if the value does not exist
-    {
-        UInt32 hsh = hash(key);
-        return const_cast<Value &>(getRaw(key, hsh));
-    }
-
-    const Value & operator[](const Key & key) const { return get(key); }
-
-    Value & operator[](const Key & key)
-    {
-        UInt32 hsh = hash(key);
-        UInt32 origHash = hsh;
-        while (true)
-        {
-            if (_entries[hsh % _capacity])
-            {
-                if (_entries[hsh % _capacity]->key == key)
-                {
-                    return _entries[hsh % _capacity]->value;
-                }
-            }
-            else
-                return insertRaw(key, hsh, Value());
-            if (hsh - origHash > _capacity)
-                return insertRaw(key, hsh, Value());
-            hsh++;
-        }
-    }
-
-    const Key & getKeyRaw(const Key & key, UInt32 hsh)
-    /// Throws an exception if the key does not exist. returns a reference to the internally
-    /// stored key. Useful when someone does an insert and wants for performance reason only to store
-    /// a pointer to the key in another collection
-    {
-        UInt32 origHash = hsh;
-        while (true)
-        {
-            if (_entries[hsh % _capacity])
-            {
-                if (_entries[hsh % _capacity]->key == key)
-                {
-                    return _entries[hsh % _capacity]->key;
-                }
-            }
-            else
-                throw InvalidArgumentException("key not found");
-
-            if (hsh - origHash > _capacity)
-                throw InvalidArgumentException("key not found");
-            hsh++;
-        }
-    }
-
-    bool get(const Key & key, Value & v) const
-    /// Sets v to the found value, returns false if no value was found
-    {
-        UInt32 hsh = hash(key);
-        return getRaw(key, hsh, v);
-    }
-
-    bool getRaw(const Key & key, UInt32 hsh, Value & v) const
-    /// Sets v to the found value, returns false if no value was found
-    {
-        UInt32 origHash = hsh;
-        while (true)
-        {
-            if (_entries[hsh % _capacity])
-            {
-                if (_entries[hsh % _capacity]->key == key)
-                {
-                    v = _entries[hsh % _capacity]->value;
-                    return true;
-                }
-            }
-            else
-                return false;
-            if (hsh - origHash > _capacity)
-                return false;
-            hsh++;
-        }
-    }
-
-    bool exists(const Key & key) const
-    {
-        UInt32 hsh = hash(key);
-        return existsRaw(key, hsh);
-    }
-
-    bool existsRaw(const Key & key, UInt32 hsh) const
-    {
-        UInt32 origHash = hsh;
-        while (true)
-        {
-            if (_entries[hsh % _capacity])
-            {
-                if (_entries[hsh % _capacity]->key == key)
-                {
-                    return true;
-                }
-            }
-            else
-                return false;
-            if (hsh - origHash > _capacity)
-                return false;
-            hsh++;
-        }
-    }
-
-    std::size_t size() const
-    /// Returns the number of elements already inserted into the SimpleHashTable
-    {
-        return _size;
-    }
-
-    UInt32 capacity() const { return _capacity; }
-
-    void resize(UInt32 newSize)
-    /// Resizes the hashtable, rehashes all existing entries. Expensive!
-    {
-        if (_capacity != newSize)
-        {
-            SimpleHashTable tmp(newSize);
-            swap(tmp);
-            for (typename HashTableVector::const_iterator it = tmp._entries.begin(); it != tmp._entries.end(); ++it)
-            {
-                if (*it)
-                {
-                    insertRaw((*it)->key, hash((*it)->key), (*it)->value);
-                }
-            }
-        }
-    }
-
-    HashStatistic currentState(bool details = false) const
-    /// Returns the current internal state
-    {
-        UInt32 numberOfEntries = (UInt32)_size;
-        UInt32 numZeroEntries = 0;
-        UInt32 maxEntriesPerHash = 0;
-        std::vector<UInt32> detailedEntriesPerHash;
-#ifdef _DEBUG
-        UInt32 totalSize = 0;
-#endif
-        for (int i = 0; i < _capacity; ++i)
-        {
-            if (_entries[i])
-            {
-                maxEntriesPerHash = 1;
-                UInt32 size = 1;
-                if (details)
-                    detailedEntriesPerHash.push_back(size);
-#ifdef _DEBUG
-                totalSize += size;
-#endif
-            }
-            else
-            {
-                numZeroEntries++;
-                if (details)
-                    detailedEntriesPerHash.push_back(0);
-            }
-        }
-#ifdef _DEBUG
-        poco_assert_dbg(totalSize == numberOfEntries);
-#endif
-        return HashStatistic(_capacity, numberOfEntries, numZeroEntries, maxEntriesPerHash, detailedEntriesPerHash);
-    }
-
-private:
-    HashTableVector _entries;
-    std::size_t _size;
-    UInt32 _capacity;
-    KeyHashFunction _hash;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_HashTable_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/StreamTokenizer.h b/base/poco/Foundation/include/Poco/StreamTokenizer.h
deleted file mode 100644
index bb08e71f81a..00000000000
--- a/base/poco/Foundation/include/Poco/StreamTokenizer.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// StreamTokenizer.h
-//
-// Library: Foundation
-// Package: Streams
-// Module:  StreamTokenizer
-//
-// Definition of the StreamTokenizer class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_StreamTokenizer_INCLUDED
-#define Foundation_StreamTokenizer_INCLUDED
-
-
-#include <istream>
-#include <vector>
-#include "Poco/Foundation.h"
-#include "Poco/Token.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API StreamTokenizer
-/// A stream tokenizer splits an input stream
-/// into a sequence of tokens of different kinds.
-/// Various token kinds can be registered with
-/// the tokenizer.
-{
-public:
-    StreamTokenizer();
-    /// Creates a StreamTokenizer with no attached stream.
-
-    StreamTokenizer(std::istream & istr);
-    /// Creates a StreamTokenizer with no attached stream.
-
-    virtual ~StreamTokenizer();
-    /// Destroys the StreamTokenizer and deletes all
-    /// registered tokens.
-
-    void attachToStream(std::istream & istr);
-    /// Attaches the tokenizer to an input stream.
-
-    void addToken(Token * pToken);
-    /// Adds a token class to the tokenizer. The
-    /// tokenizer takes ownership of the token and
-    /// deletes it when no longer needed. Comment
-    /// and whitespace tokens will be marked as
-    /// ignorable, which means that next() will not
-    /// return them.
-
-    void addToken(Token * pToken, bool ignore);
-    /// Adds a token class to the tokenizer. The
-    /// tokenizer takes ownership of the token and
-    /// deletes it when no longer needed.
-    /// If ignore is true, the token will be marked
-    /// as ignorable, which means that next() will
-    /// not return it.
-
-    const Token * next();
-    /// Extracts the next token from the input stream.
-    /// Returns a pointer to an EOFToken if there are
-    /// no more characters to read.
-    /// Returns a pointer to an InvalidToken if an
-    /// invalid character is encountered.
-    /// If a token is marked as ignorable, it will not
-    /// be returned, and the next token will be
-    /// examined.
-    /// Never returns a NULL pointer.
-    /// You must not delete the token returned by next().
-
-private:
-    struct TokenInfo
-    {
-        Token * pToken;
-        bool ignore;
-    };
-
-    typedef std::vector<TokenInfo> TokenVec;
-
-    TokenVec _tokens;
-    std::istream * _pIstr;
-    InvalidToken _invalidToken;
-    EOFToken _eofToken;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_StreamTokenizer_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/SynchronizedObject.h b/base/poco/Foundation/include/Poco/SynchronizedObject.h
deleted file mode 100644
index f0d4311b107..00000000000
--- a/base/poco/Foundation/include/Poco/SynchronizedObject.h
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// SynchronizedObject.h
-//
-// Library: Foundation
-// Package: Threading
-// Module:  SynchronizedObject
-//
-// Definition of the SynchronizedObject class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_SynchronizedObject_INCLUDED
-#define Foundation_SynchronizedObject_INCLUDED
-
-
-#include "Poco/Event.h"
-#include "Poco/Foundation.h"
-#include "Poco/Mutex.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API SynchronizedObject
-/// This class aggregates a Mutex and an Event
-/// and can act as a base class for all objects
-/// requiring synchronization in a multithreaded
-/// scenario.
-{
-public:
-    typedef Poco::ScopedLock<SynchronizedObject> ScopedLock;
-
-    SynchronizedObject();
-    /// Creates the object.
-
-    virtual ~SynchronizedObject();
-    /// Destroys the object.
-
-    void lock() const;
-    /// Locks the object. Blocks if the object
-    /// is locked by another thread.
-
-    bool tryLock() const;
-    /// Tries to lock the object. Returns false immediately
-    /// if the object is already locked by another thread
-    /// Returns true if the object was successfully locked.
-
-    void unlock() const;
-    /// Unlocks the object so that it can be locked by
-    /// other threads.
-
-    void notify() const;
-    /// Signals the object.
-    /// Exactly only one thread waiting for the object
-    /// can resume execution.
-
-    void wait() const;
-    /// Waits for the object to become signalled.
-
-    void wait(long milliseconds) const;
-    /// Waits for the object to become signalled.
-    /// Throws a TimeoutException if the object
-    /// does not become signalled within the specified
-    /// time interval.
-
-    bool tryWait(long milliseconds) const;
-    /// Waits for the object to become signalled.
-    /// Returns true if the object
-    /// became signalled within the specified
-    /// time interval, false otherwise.
-
-private:
-    mutable Mutex _mutex;
-    mutable Event _event;
-};
-
-
-//
-// inlines
-//
-inline void SynchronizedObject::lock() const
-{
-    _mutex.lock();
-}
-
-
-inline bool SynchronizedObject::tryLock() const
-{
-    return _mutex.tryLock();
-}
-
-
-inline void SynchronizedObject::unlock() const
-{
-    _mutex.unlock();
-}
-
-
-inline void SynchronizedObject::notify() const
-{
-    _event.set();
-}
-
-
-inline void SynchronizedObject::wait() const
-{
-    _event.wait();
-}
-
-
-inline void SynchronizedObject::wait(long milliseconds) const
-{
-    _event.wait(milliseconds);
-}
-
-
-inline bool SynchronizedObject::tryWait(long milliseconds) const
-{
-    return _event.tryWait(milliseconds);
-}
-
-
-} // namespace Poco
-
-
-#endif // Foundation_SynchronizedObject_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/UnWindows.h b/base/poco/Foundation/include/Poco/UnWindows.h
deleted file mode 100644
index 1f3835b8af5..00000000000
--- a/base/poco/Foundation/include/Poco/UnWindows.h
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// UnWindows.h
-//
-// Library: Foundation
-// Package: Core
-// Module:  UnWindows
-//
-// A wrapper around the <windows.h> header file that #undef's some
-// of the macros for function names defined by <windows.h> that
-// are a frequent source of conflicts (e.g., GetUserName).
-//
-// Remember, that most of the WIN32 API functions come in two variants,
-// an Unicode variant (e.g., GetUserNameA) and an ASCII variant (GetUserNameW).
-// There is also a macro (GetUserName) that's either defined to be the Unicode
-// name or the ASCII name, depending on whether the UNICODE macro is #define'd
-// or not. POCO always calls the Unicode or ASCII functions directly (depending
-// on whether POCO_WIN32_UTF8 is #define'd or not), so the macros are not ignored.
-//
-// These macro definitions are a frequent case of problems and naming conflicts,
-// especially for C++ programmers. Say, you define a class with a member function named
-// GetUserName. Depending on whether "Poco/UnWindows.h" has been included by a particular
-// translation unit or not, this might be changed to GetUserNameA/GetUserNameW, or not.
-// While, due to naming conventions used, this is less of a problem in POCO, some
-// of the users of POCO might use a different naming convention where this can become
-// a problem.
-//
-// To disable the #undef's, compile POCO with the POCO_NO_UNWINDOWS macro #define'd.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_UnWindows_INCLUDED
-#define Foundation_UnWindows_INCLUDED
-
-
-// Reduce bloat
-
-
-// Microsoft Visual C++ includes copies of the Windows header files
-// that were current at the time Visual C++ was released.
-// The Windows header files use macros to indicate which versions
-// of Windows support many programming elements. Therefore, you must
-// define these macros to use new functionality introduced in each
-// major operating system release. (Individual header files may use
-// different macros; therefore, if compilation problems occur, check
-// the header file that contains the definition for conditional
-// definitions.) For more information, see SdkDdkVer.h.
-
-
-#    if defined(_WIN32_WINNT)
-#        if (_WIN32_WINNT < 0x0502)
-#            error Unsupported Windows version.
-#        endif
-#    elif defined(NTDDI_VERSION)
-#        if (NTDDI_VERSION < 0x05020000)
-#            error Unsupported Windows version.
-#        endif
-#    elif !defined(_WIN32_WINNT)
-// Define minimum supported version.
-// This can be changed, if needed.
-// If allowed (see POCO_MIN_WINDOWS_OS_SUPPORT
-// below), Platform_WIN32.h will do its
-// best to determine the appropriate values
-// and may redefine these. See Platform_WIN32.h
-// for details.
-#        define _WIN32_WINNT 0x0502
-#        define NTDDI_VERSION 0x05020000
-#    endif
-
-
-// To prevent Platform_WIN32.h to modify version defines,
-// uncomment this, otherwise versions will be automatically
-// discovered in Platform_WIN32.h.
-// #define POCO_FORCE_MIN_WINDOWS_OS_SUPPORT
-
-
-#include <windows.h>
-
-
-#if !defined(POCO_NO_UNWINDOWS)
-// A list of annoying macros to #undef.
-// Extend as required.
-#    undef GetBinaryType
-#    undef GetShortPathName
-#    undef GetLongPathName
-#    undef GetEnvironmentStrings
-#    undef SetEnvironmentStrings
-#    undef FreeEnvironmentStrings
-#    undef FormatMessage
-#    undef EncryptFile
-#    undef DecryptFile
-#    undef CreateMutex
-#    undef OpenMutex
-#    undef CreateEvent
-#    undef OpenEvent
-#    undef CreateSemaphore
-#    undef OpenSemaphore
-#    undef LoadLibrary
-#    undef GetModuleFileName
-#    undef CreateProcess
-#    undef GetCommandLine
-#    undef GetEnvironmentVariable
-#    undef SetEnvironmentVariable
-#    undef ExpandEnvironmentStrings
-#    undef OutputDebugString
-#    undef FindResource
-#    undef UpdateResource
-#    undef FindAtom
-#    undef AddAtom
-#    undef GetSystemDirectory
-#    undef GetTempPath
-#    undef GetTempFileName
-#    undef SetCurrentDirectory
-#    undef GetCurrentDirectory
-#    undef CreateDirectory
-#    undef RemoveDirectory
-#    undef CreateFile
-#    undef DeleteFile
-#    undef SearchPath
-#    undef CopyFile
-#    undef MoveFile
-#    undef ReplaceFile
-#    undef GetComputerName
-#    undef SetComputerName
-#    undef GetUserName
-#    undef LogonUser
-#    undef GetVersion
-#    undef GetObject
-#endif // POCO_NO_UNWINDOWS
-
-#endif // Foundation_UnWindows_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/Windows1250Encoding.h b/base/poco/Foundation/include/Poco/Windows1250Encoding.h
deleted file mode 100644
index 139c173949f..00000000000
--- a/base/poco/Foundation/include/Poco/Windows1250Encoding.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Windows1250Encoding.h
-//
-// Library: Foundation
-// Package: Text
-// Module:  Windows1250Encoding
-//
-// Definition of the Windows1250Encoding class.
-//
-// Copyright (c) 2005-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_Windows1250Encoding_INCLUDED
-#define Foundation_Windows1250Encoding_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/TextEncoding.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API Windows1250Encoding : public TextEncoding
-/// Windows Codepage 1250 text encoding.
-/// Based on: http://msdn.microsoft.com/en-us/goglobal/cc305143
-{
-public:
-    Windows1250Encoding();
-    ~Windows1250Encoding();
-    const char * canonicalName() const;
-    bool isA(const std::string & encodingName) const;
-    const CharacterMap & characterMap() const;
-    int convert(const unsigned char * bytes) const;
-    int convert(int ch, unsigned char * bytes, int length) const;
-    int queryConvert(const unsigned char * bytes, int length) const;
-    int sequenceLength(const unsigned char * bytes, int length) const;
-
-private:
-    static const char * _names[];
-    static const CharacterMap _charMap;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Windows1250Encoding_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/Windows1251Encoding.h b/base/poco/Foundation/include/Poco/Windows1251Encoding.h
deleted file mode 100644
index f2fe483a134..00000000000
--- a/base/poco/Foundation/include/Poco/Windows1251Encoding.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Windows1251Encoding.h
-//
-// Library: Foundation
-// Package: Text
-// Module:  Windows1251Encoding
-//
-// Definition of the Windows1251Encoding class.
-//
-// Copyright (c) 2005-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_Windows1251Encoding_INCLUDED
-#define Foundation_Windows1251Encoding_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/TextEncoding.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API Windows1251Encoding : public TextEncoding
-/// Windows Codepage 1251 text encoding.
-/// Based on: http://msdn.microsoft.com/en-us/goglobal/cc305144
-{
-public:
-    Windows1251Encoding();
-    ~Windows1251Encoding();
-    const char * canonicalName() const;
-    bool isA(const std::string & encodingName) const;
-    const CharacterMap & characterMap() const;
-    int convert(const unsigned char * bytes) const;
-    int convert(int ch, unsigned char * bytes, int length) const;
-    int queryConvert(const unsigned char * bytes, int length) const;
-    int sequenceLength(const unsigned char * bytes, int length) const;
-
-private:
-    static const char * _names[];
-    static const CharacterMap _charMap;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Windows1251Encoding_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/Windows1252Encoding.h b/base/poco/Foundation/include/Poco/Windows1252Encoding.h
deleted file mode 100644
index c1af357650b..00000000000
--- a/base/poco/Foundation/include/Poco/Windows1252Encoding.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Windows1252Encoding.h
-//
-// Library: Foundation
-// Package: Text
-// Module:  Windows1252Encoding
-//
-// Definition of the Windows1252Encoding class.
-//
-// Copyright (c) 2005-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_Windows1252Encoding_INCLUDED
-#define Foundation_Windows1252Encoding_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/TextEncoding.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API Windows1252Encoding : public TextEncoding
-/// Windows Codepage 1252 text encoding.
-{
-public:
-    Windows1252Encoding();
-    ~Windows1252Encoding();
-    const char * canonicalName() const;
-    bool isA(const std::string & encodingName) const;
-    const CharacterMap & characterMap() const;
-    int convert(const unsigned char * bytes) const;
-    int convert(int ch, unsigned char * bytes, int length) const;
-    int queryConvert(const unsigned char * bytes, int length) const;
-    int sequenceLength(const unsigned char * bytes, int length) const;
-
-private:
-    static const char * _names[];
-    static const CharacterMap _charMap;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Windows1252Encoding_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/WindowsConsoleChannel.h b/base/poco/Foundation/include/Poco/WindowsConsoleChannel.h
deleted file mode 100644
index 0473d030930..00000000000
--- a/base/poco/Foundation/include/Poco/WindowsConsoleChannel.h
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// WindowsConsoleChannel.h
-//
-// Library: Foundation
-// Package: Logging
-// Module:  WindowsConsoleChannel
-//
-// Definition of the WindowsConsoleChannel class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Foundation_WindowsConsoleChannel_INCLUDED
-#define Foundation_WindowsConsoleChannel_INCLUDED
-
-
-#include "Poco/Channel.h"
-#include "Poco/Foundation.h"
-#include "Poco/Mutex.h"
-#include "Poco/UnWindows.h"
-
-
-namespace Poco
-{
-
-
-class Foundation_API WindowsConsoleChannel : public Channel
-/// A channel that writes to the Windows console.
-///
-/// Only the message's text is written, followed
-/// by a newline.
-///
-/// If POCO has been compiled with POCO_WIN32_UTF8,
-/// log messages are assumed to be UTF-8 encoded, and
-/// are converted to UTF-16 prior to writing them to the
-/// console. This is the main difference to the ConsoleChannel
-/// class, which cannot handle UTF-8 encoded messages on Windows.
-///
-/// Chain this channel to a FormattingChannel with an
-/// appropriate Formatter to control what is contained
-/// in the text.
-///
-/// Only available on Windows platforms.
-{
-public:
-    WindowsConsoleChannel();
-    /// Creates the WindowsConsoleChannel.
-
-    void log(const Message & msg);
-    /// Logs the given message to the channel's stream.
-
-protected:
-    ~WindowsConsoleChannel();
-
-private:
-    HANDLE _hConsole;
-    bool _isFile;
-};
-
-
-class Foundation_API WindowsColorConsoleChannel : public Channel
-/// A channel that writes to the Windows console.
-///
-/// Only the message's text is written, followed
-/// by a newline.
-///
-/// If POCO has been compiled with POCO_WIN32_UTF8,
-/// log messages are assumed to be UTF-8 encoded, and
-/// are converted to UTF-16 prior to writing them to the
-/// console. This is the main difference to the ConsoleChannel
-/// class, which cannot handle UTF-8 encoded messages on Windows.
-///
-/// Messages can be colored depending on priority.
-///
-/// To enable message coloring, set the "enableColors"
-/// property to true (default). Furthermore, colors can be
-/// configured by setting the following properties
-/// (default values are given in parenthesis):
-///
-///   * traceColor (gray)
-///   * debugColor (gray)
-///   * informationColor (default)
-///   * noticeColor (default)
-///   * warningColor (yellow)
-///   * errorColor (lightRed)
-///   * criticalColor (lightRed)
-///   * fatalColor (lightRed)
-///
-/// The following color values are supported:
-///
-///   * default
-///   * black
-///   * red
-///   * green
-///   * brown
-///   * blue
-///   * magenta
-///   * cyan
-///   * gray
-///   * darkgray
-///   * lightRed
-///   * lightGreen
-///   * yellow
-///   * lightBlue
-///   * lightMagenta
-///   * lightCyan
-///   * white
-///
-/// Chain this channel to a FormattingChannel with an
-/// appropriate Formatter to control what is contained
-/// in the text.
-///
-/// Only available on Windows platforms.
-{
-public:
-    WindowsColorConsoleChannel();
-    /// Creates the WindowsConsoleChannel.
-
-    void log(const Message & msg);
-    /// Logs the given message to the channel's stream.
-
-    void setProperty(const std::string & name, const std::string & value);
-    /// Sets the property with the given name.
-    ///
-    /// The following properties are supported:
-    ///   * enableColors:      Enable or disable colors.
-    ///   * traceColor:        Specify color for trace messages.
-    ///   * debugColor:        Specify color for debug messages.
-    ///   * informationColor:  Specify color for information messages.
-    ///   * noticeColor:       Specify color for notice messages.
-    ///   * warningColor:      Specify color for warning messages.
-    ///   * errorColor:        Specify color for error messages.
-    ///   * criticalColor:     Specify color for critical messages.
-    ///   * fatalColor:        Specify color for fatal messages.
-    ///
-    /// See the class documentation for a list of supported color values.
-
-    std::string getProperty(const std::string & name) const;
-    /// Returns the value of the property with the given name.
-    /// See setProperty() for a description of the supported
-    /// properties.
-
-protected:
-    enum Color
-    {
-        CC_BLACK = 0x0000,
-        CC_RED = 0x0004,
-        CC_GREEN = 0x0002,
-        CC_BROWN = 0x0006,
-        CC_BLUE = 0x0001,
-        CC_MAGENTA = 0x0005,
-        CC_CYAN = 0x0003,
-        CC_GRAY = 0x0007,
-        CC_DARKGRAY = 0x0008,
-        CC_LIGHTRED = 0x000C,
-        CC_LIGHTGREEN = 0x000A,
-        CC_YELLOW = 0x000E,
-        CC_LIGHTBLUE = 0x0009,
-        CC_LIGHTMAGENTA = 0x000D,
-        CC_LIGHTCYAN = 0x000B,
-        CC_WHITE = 0x000F
-    };
-
-    ~WindowsColorConsoleChannel();
-    WORD parseColor(const std::string & color) const;
-    std::string formatColor(WORD color) const;
-    void initColors();
-
-private:
-    bool _enableColors;
-    HANDLE _hConsole;
-    bool _isFile;
-    WORD _colors[9];
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_WindowsConsoleChannel_INCLUDED
diff --git a/base/poco/Foundation/src/Base32Decoder.cpp b/base/poco/Foundation/src/Base32Decoder.cpp
deleted file mode 100644
index ba9f9db5958..00000000000
--- a/base/poco/Foundation/src/Base32Decoder.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-// Base32Decoder.cpp
-//
-// Library: Foundation
-// Package: Streams
-// Module:  Base32
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Base32Decoder.h"
-#include "Poco/Base32Encoder.h"
-#include "Poco/Exception.h"
-#include "Poco/Mutex.h"
-#include <cstring>
-
-
-namespace Poco {
-
-
-unsigned char Base32DecoderBuf::IN_ENCODING[256];
-bool Base32DecoderBuf::IN_ENCODING_INIT = false;
-
-
-namespace
-{
-	static FastMutex mutex;
-}
-
-
-Base32DecoderBuf::Base32DecoderBuf(std::istream& istr): 
-	_groupLength(0),
-	_groupIndex(0),
-	_buf(*istr.rdbuf())
-{
-	FastMutex::ScopedLock lock(mutex);
-	if (!IN_ENCODING_INIT)
-	{
-		for (unsigned i = 0; i < sizeof(IN_ENCODING); i++)
-		{
-			IN_ENCODING[i] = 0xFF;
-		}
-		for (unsigned i = 0; i < sizeof(Base32EncoderBuf::OUT_ENCODING); i++)
-		{
-			IN_ENCODING[Base32EncoderBuf::OUT_ENCODING[i]] = i;
-		}
-		IN_ENCODING[static_cast<unsigned char>('=')] = '\0';
-		IN_ENCODING_INIT = true;
-	}
-}
-
-
-Base32DecoderBuf::~Base32DecoderBuf()
-{
-}
-
-
-int Base32DecoderBuf::readFromDevice()
-{
-	if (_groupIndex < _groupLength) 
-	{
-		return _group[_groupIndex++];
-	}
-	else
-	{
-		unsigned char buffer[8];
-		std::memset(buffer, '=', sizeof(buffer));
-		int c;
-
-		// per RFC-4648, Section 6, permissible block lengths are:
-		// 2, 4, 5, 7, and 8 bytes. Any other length is malformed.
-		//
-		do {
-			if ((c = readOne()) == -1) return -1;
-			buffer[0] = (unsigned char) c;
-			if (IN_ENCODING[buffer[0]] == 0xFF) throw DataFormatException();
-			if ((c = readOne()) == -1) throw DataFormatException();
-			buffer[1] = (unsigned char) c;
-			if (IN_ENCODING[buffer[1]] == 0xFF) throw DataFormatException();
-			if ((c = readOne()) == -1) break;
-			buffer[2] = (unsigned char) c;
-			if (IN_ENCODING[buffer[2]] == 0xFF) throw DataFormatException();
-			if ((c = readOne()) == -1) throw DataFormatException();
-			buffer[3] = (unsigned char) c;
-			if (IN_ENCODING[buffer[3]] == 0xFF) throw DataFormatException();
-			if ((c = readOne()) == -1) break;
-			buffer[4] = (unsigned char) c;
-			if (IN_ENCODING[buffer[4]] == 0xFF) throw DataFormatException();
-			if ((c = readOne()) == -1) break;
-			buffer[5] = (unsigned char) c;
-			if (IN_ENCODING[buffer[5]] == 0xFF) throw DataFormatException();
-			if ((c = readOne()) == -1) throw DataFormatException();
-			buffer[6] = (unsigned char) c;
-			if (IN_ENCODING[buffer[6]] == 0xFF) throw DataFormatException();
-			if ((c = readOne()) == -1) break;
-			buffer[7] = (unsigned char) c;
-			if (IN_ENCODING[buffer[7]] == 0xFF) throw DataFormatException();
-		} while (false);
-
-		_group[0] = (IN_ENCODING[buffer[0]] << 3) | (IN_ENCODING[buffer[1]] >> 2);
-		_group[1] = ((IN_ENCODING[buffer[1]] & 0x03) << 6) | (IN_ENCODING[buffer[2]] << 1) | (IN_ENCODING[buffer[3]] >> 4);
-		_group[2] = ((IN_ENCODING[buffer[3]] & 0x0F) << 4) | (IN_ENCODING[buffer[4]] >> 1);
-		_group[3] = ((IN_ENCODING[buffer[4]] & 0x01) << 7) | (IN_ENCODING[buffer[5]] << 2) | (IN_ENCODING[buffer[6]] >> 3);
-		_group[4] = ((IN_ENCODING[buffer[6]] & 0x07) << 5) | IN_ENCODING[buffer[7]];
-
-		if (buffer[2] == '=')
-			_groupLength = 1;
-		else if (buffer[4] == '=') 
-			_groupLength = 2;
-		else if (buffer[5] == '=') 
-			_groupLength = 3;
-		else if (buffer[7] == '=') 
-			_groupLength = 4;
-		else
-			_groupLength = 5;
-		_groupIndex = 1;
-		return _group[0];
-	}
-}
-
-
-int Base32DecoderBuf::readOne()
-{
-	int ch = _buf.sbumpc();
-	return ch;
-}
-
-
-Base32DecoderIOS::Base32DecoderIOS(std::istream& istr): _buf(istr)
-{
-	poco_ios_init(&_buf);
-}
-
-
-Base32DecoderIOS::~Base32DecoderIOS()
-{
-}
-
-
-Base32DecoderBuf* Base32DecoderIOS::rdbuf()
-{
-	return &_buf;
-}
-
-
-Base32Decoder::Base32Decoder(std::istream& istr): Base32DecoderIOS(istr), std::istream(&_buf)
-{
-}
-
-
-Base32Decoder::~Base32Decoder()
-{
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/Base32Encoder.cpp b/base/poco/Foundation/src/Base32Encoder.cpp
deleted file mode 100644
index dbac2c977f8..00000000000
--- a/base/poco/Foundation/src/Base32Encoder.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-//
-// Base32Encoder.cpp
-//
-// Library: Foundation
-// Package: Streams
-// Module:  Base32
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Base32Encoder.h"
-
-
-namespace Poco {
-
-
-const unsigned char Base32EncoderBuf::OUT_ENCODING[32] =
-{
-	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-	'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-	'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-	'Y', 'Z', '2', '3', '4', '5', '6', '7',
-};
-
-
-Base32EncoderBuf::Base32EncoderBuf(std::ostream& ostr, bool padding): 
-	_groupLength(0),
-	_buf(*ostr.rdbuf()),
-	_doPadding(padding)
-{
-}
-
-
-Base32EncoderBuf::~Base32EncoderBuf()
-{
-	try
-	{
-		close();
-	}
-	catch (...)
-	{
-	}
-}
-
-
-
-int Base32EncoderBuf::writeToDevice(char c)
-{
-	static const int eof = std::char_traits<char>::eof();
-
-	_group[_groupLength++] = (unsigned char) c;
-	if (_groupLength == 5)
-	{
-		unsigned char idx;
-		idx = _group[0] >> 3;
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[0] & 0x07) << 2) | (_group[1] >> 6);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[1] & 0x3E) >> 1);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[1] & 0x01) << 4) | (_group[2] >> 4);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[2] & 0x0F) << 1) | (_group[3] >> 7);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[3] & 0x7C) >> 2);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[3] & 0x03) << 3) | (_group[4] >> 5);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = (_group[4] & 0x1F);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		_groupLength = 0;
-	}
-	return charToInt(c);
-}
-
-
-int Base32EncoderBuf::close()
-{
-	static const int eof = std::char_traits<char>::eof();
-
-	if (sync() == eof) return eof;
-	if (_groupLength == 1)
-	{
-		_group[1] = 0;
-		unsigned char idx;
-		idx = _group[0] >> 3;
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[0] & 0x07) << 2);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		if (_doPadding) {
-			if (_buf.sputc('=') == eof) return eof;
-			if (_buf.sputc('=') == eof) return eof;
-			if (_buf.sputc('=') == eof) return eof;
-			if (_buf.sputc('=') == eof) return eof;
-			if (_buf.sputc('=') == eof) return eof;
-			if (_buf.sputc('=') == eof) return eof;
-		}
-	}
-	else if (_groupLength == 2)
-	{
-		_group[2] = 0;
-		unsigned char idx;
-		idx = _group[0] >> 3;
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[0] & 0x07) << 2) | (_group[1] >> 6);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[1] & 0x3E) >> 1);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[1] & 0x01) << 4);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		if (_doPadding) {
-			if (_buf.sputc('=') == eof) return eof;
-			if (_buf.sputc('=') == eof) return eof;
-			if (_buf.sputc('=') == eof) return eof;
-			if (_buf.sputc('=') == eof) return eof;
-		}
-	}
-	else if (_groupLength == 3)
-	{
-		_group[3] = 0;
-		unsigned char idx;
-		idx = _group[0] >> 3;
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[0] & 0x07) << 2) | (_group[1] >> 6);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[1] & 0x3E) >> 1);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[1] & 0x01) << 4) | (_group[2] >> 4);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[2] & 0x0F) << 1);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		if (_doPadding) {
-			if (_buf.sputc('=') == eof) return eof;
-			if (_buf.sputc('=') == eof) return eof;
-			if (_buf.sputc('=') == eof) return eof;
-		}
-	}
-	else if (_groupLength == 4)
-	{
-		_group[4] = 0;
-		unsigned char idx;
-		idx = _group[0] >> 3;
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[0] & 0x07) << 2) | (_group[1] >> 6);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[1] & 0x3E) >> 1);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[1] & 0x01) << 4) | (_group[2] >> 4);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[2] & 0x0F) << 1) | (_group[3] >> 7);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[3] & 0x7C) >> 2);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		idx = ((_group[3] & 0x03) << 3);
-		if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof;
-		if (_doPadding && _buf.sputc('=') == eof) return eof;
-	}
-	_groupLength = 0;
-	return _buf.pubsync();
-}
-
-
-Base32EncoderIOS::Base32EncoderIOS(std::ostream& ostr, bool padding):
-	_buf(ostr, padding)
-{
-	poco_ios_init(&_buf);
-}
-
-
-Base32EncoderIOS::~Base32EncoderIOS()
-{
-}
-
-
-int Base32EncoderIOS::close()
-{
-	return _buf.close();
-}
-
-
-Base32EncoderBuf* Base32EncoderIOS::rdbuf()
-{
-	return &_buf;
-}
-
-
-Base32Encoder::Base32Encoder(std::ostream& ostr, bool padding):
-	Base32EncoderIOS(ostr, padding), std::ostream(&_buf)
-{
-}
-
-
-Base32Encoder::~Base32Encoder()
-{
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/EventLogChannel.cpp b/base/poco/Foundation/src/EventLogChannel.cpp
deleted file mode 100644
index ec35a9b5d28..00000000000
--- a/base/poco/Foundation/src/EventLogChannel.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-//
-// EventLogChannel.cpp
-//
-// Library: Foundation
-// Package: Logging
-// Module:  EventLogChannel
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/EventLogChannel.h"
-#include "Poco/Message.h"
-#include "Poco/String.h"
-#include "pocomsg.h"
-
-
-namespace Poco {
-
-
-const std::string EventLogChannel::PROP_NAME    = "name";
-const std::string EventLogChannel::PROP_HOST    = "host";
-const std::string EventLogChannel::PROP_LOGHOST = "loghost";
-const std::string EventLogChannel::PROP_LOGFILE = "logfile";
-
-
-EventLogChannel::EventLogChannel(): 
-	_logFile("Application"),
-	_h(0)
-{
-	const DWORD maxPathLen = MAX_PATH + 1;
-	char name[maxPathLen];
-	int n = GetModuleFileNameA(NULL, name, maxPathLen);
-	if (n > 0)
-	{
-		char* end = name + n - 1;
-		while (end > name && *end != '\\') --end;
-		if (*end == '\\') ++end;
-		_name = end;
-	}
-}
-
-
-EventLogChannel::EventLogChannel(const std::string& name): 
-	_name(name), 
-	_logFile("Application"),
-	_h(0)
-{
-}
-
-
-EventLogChannel::EventLogChannel(const std::string& name, const std::string& host): 
-	_name(name), 
-	_host(host),
-	_logFile("Application"),
-	_h(0)
-{
-}
-
-
-EventLogChannel::~EventLogChannel()
-{
-	try
-	{
-		close();
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-void EventLogChannel::open()
-{
-	setUpRegistry();
-	_h = RegisterEventSource(_host.empty() ? NULL : _host.c_str(), _name.c_str());
-	if (!_h) throw SystemException("cannot register event source");
-}
-
-
-void EventLogChannel::close()
-{
-	if (_h) DeregisterEventSource(_h);
-	_h = 0;
-}
-
-
-void EventLogChannel::log(const Message& msg)
-{
-	if (!_h) open();
-	const char* pMsg = msg.getText().c_str();
-	ReportEvent(_h, getType(msg), getCategory(msg), POCO_MSG_LOG, NULL, 1, 0, &pMsg, NULL); 
-}
-
-
-void EventLogChannel::setProperty(const std::string& name, const std::string& value)
-{
-	if (icompare(name, PROP_NAME) == 0)
-		_name = value;
-	else if (icompare(name, PROP_HOST) == 0)
-		_host = value;
-	else if (icompare(name, PROP_LOGHOST) == 0)
-		_host = value;
-	else if (icompare(name, PROP_LOGFILE) == 0)
-		_logFile = value;
-	else
-		Channel::setProperty(name, value);
-}
-
-
-std::string EventLogChannel::getProperty(const std::string& name) const
-{
-	if (icompare(name, PROP_NAME) == 0)
-		return _name;
-	else if (icompare(name, PROP_HOST) == 0)
-		return _host;
-	else if (icompare(name, PROP_LOGHOST) == 0)
-		return _host;
-	else if (icompare(name, PROP_LOGFILE) == 0)
-		return _logFile;
-	else
-		return Channel::getProperty(name);
-}
-
-
-int EventLogChannel::getType(const Message& msg)
-{
-	switch (msg.getPriority())
-	{
-	case Message::PRIO_TRACE:
-	case Message::PRIO_DEBUG:
-	case Message::PRIO_INFORMATION:
-		return EVENTLOG_INFORMATION_TYPE;
-	case Message::PRIO_NOTICE:
-	case Message::PRIO_WARNING:
-		return EVENTLOG_WARNING_TYPE;
-	default:
-		return EVENTLOG_ERROR_TYPE;
-	}
-}
-
-
-int EventLogChannel::getCategory(const Message& msg)
-{
-	switch (msg.getPriority())
-	{
-	case Message::PRIO_TRACE:
-		return POCO_CTG_TRACE;
-	case Message::PRIO_DEBUG:
-		return POCO_CTG_DEBUG;
-	case Message::PRIO_INFORMATION:
-		return POCO_CTG_INFORMATION;
-	case Message::PRIO_NOTICE:
-		return POCO_CTG_NOTICE;
-	case Message::PRIO_WARNING:
-		return POCO_CTG_WARNING;
-	case Message::PRIO_ERROR:
-		return POCO_CTG_ERROR;
-	case Message::PRIO_CRITICAL:
-		return POCO_CTG_CRITICAL;
-	case Message::PRIO_FATAL:
-		return POCO_CTG_FATAL;
-	default:
-		return 0;
-	}
-}
-
-
-void EventLogChannel::setUpRegistry() const
-{
-	std::string key = "SYSTEM\\CurrentControlSet\\Services\\EventLog\\";
-	key.append(_logFile);
-	key.append("\\");
-	key.append(_name);
-	HKEY hKey;
-	DWORD disp;
-	DWORD rc = RegCreateKeyEx(HKEY_LOCAL_MACHINE, key.c_str(), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &disp);
-	if (rc != ERROR_SUCCESS) return;
-	
-	if (disp == REG_CREATED_NEW_KEY)
-	{
-		std::string path;
-		
-		if (path.empty())
-			path = findLibrary("PocoMsg.dll");
-		
-		if (!path.empty())
-		{
-			DWORD count = 8;
-			DWORD types = 7;
-			RegSetValueEx(hKey, "CategoryMessageFile", 0, REG_SZ, (const BYTE*) path.c_str(), static_cast<DWORD>(path.size() + 1));
-			RegSetValueEx(hKey, "EventMessageFile", 0, REG_SZ, (const BYTE*) path.c_str(), static_cast<DWORD>(path.size() + 1));
-			RegSetValueEx(hKey, "CategoryCount", 0, REG_DWORD, (const BYTE*) &count, static_cast<DWORD>(sizeof(count)));
-			RegSetValueEx(hKey, "TypesSupported", 0, REG_DWORD, (const BYTE*) &types, static_cast<DWORD>(sizeof(types)));
-		}
-	}
-	RegCloseKey(hKey);
-}
-
-
-std::string EventLogChannel::findLibrary(const char* name)
-{
-	std::string path;
-	HMODULE dll = LoadLibraryA(name);
-	if (dll)
-	{
-		const DWORD maxPathLen = MAX_PATH + 1;
-		char name[maxPathLen];
-		int n = GetModuleFileNameA(dll, name, maxPathLen);
-		if (n > 0) path = name;
-		FreeLibrary(dll);
-	}
-	return path;
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/FPEnvironment_DEC.cpp b/base/poco/Foundation/src/FPEnvironment_DEC.cpp
deleted file mode 100644
index b5995f83bf5..00000000000
--- a/base/poco/Foundation/src/FPEnvironment_DEC.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// FPEnvironment_DEC.cpp
-//
-// Library: Foundation
-// Package: Core
-// Module:  FPEnvironment
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-//
-// _XOPEN_SOURCE disables the ieee fp functions
-// in <math.h>, therefore we undefine it for this file.
-//
-#undef _XOPEN_SOURCE
-
-
-#include <math.h>
-#include <fp.h>
-#include <fp_class.h>
-#include "Poco/FPEnvironment_DEC.h"
-
-
-namespace Poco {
-
-
-FPEnvironmentImpl::FPEnvironmentImpl()
-{
-	_env = ieee_get_fp_control();
-}
-
-
-FPEnvironmentImpl::FPEnvironmentImpl(const FPEnvironmentImpl& env)
-{
-	_env = env._env;
-}
-
-
-FPEnvironmentImpl::~FPEnvironmentImpl()
-{
-	ieee_set_fp_control(_env);
-}
-
-
-FPEnvironmentImpl& FPEnvironmentImpl::operator = (const FPEnvironmentImpl& env)
-{
-	_env = env._env;
-	return *this;
-}
-
-
-bool FPEnvironmentImpl::isInfiniteImpl(float value)
-{
-	int cls = fp_classf(value);
-	return cls == FP_POS_INF || cls == FP_NEG_INF;
-}
-
-
-bool FPEnvironmentImpl::isInfiniteImpl(double value)
-{
-	int cls = fp_class(value);
-	return cls == FP_POS_INF || cls == FP_NEG_INF;
-}
-
-
-bool FPEnvironmentImpl::isInfiniteImpl(long double value)
-{
-	int cls = fp_classl(value);
-	return cls == FP_POS_INF || cls == FP_NEG_INF;
-}
-
-
-bool FPEnvironmentImpl::isNaNImpl(float value)
-{
-	return isnanf(value) != 0;
-}
-
-
-bool FPEnvironmentImpl::isNaNImpl(double value)
-{
-	return isnan(value) != 0;
-}
-
-
-bool FPEnvironmentImpl::isNaNImpl(long double value)
-{
-	return isnanl(value) != 0;
-}
-
-
-float FPEnvironmentImpl::copySignImpl(float target, float source)
-{
-	return copysignf(target, source);
-}
-
-
-double FPEnvironmentImpl::copySignImpl(double target, double source)
-{
-	return copysign(target, source);
-}
-
-
-long double FPEnvironmentImpl::copySignImpl(long double target, long double source)
-{
-	return copysignl(target, source);
-}
-
-
-void FPEnvironmentImpl::keepCurrentImpl()
-{
-	ieee_set_fp_control(_env);
-}
-
-
-void FPEnvironmentImpl::clearFlagsImpl()
-{
-	ieee_set_fp_control(0);
-}
-
-
-bool FPEnvironmentImpl::isFlagImpl(FlagImpl flag)
-{
-	return (ieee_get_fp_control() & flag) != 0;
-}
-
-
-void FPEnvironmentImpl::setRoundingModeImpl(RoundingModeImpl mode)
-{
-	// not supported
-}
-
-
-FPEnvironmentImpl::RoundingModeImpl FPEnvironmentImpl::getRoundingModeImpl()
-{
-	// not supported
-	return FPEnvironmentImpl::RoundingModeImpl(0);
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/FPEnvironment_DUMMY.cpp b/base/poco/Foundation/src/FPEnvironment_DUMMY.cpp
deleted file mode 100644
index b473d0dfb93..00000000000
--- a/base/poco/Foundation/src/FPEnvironment_DUMMY.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// FPEnvironment_C99.cpp
-//
-// Library: Foundation
-// Package: Core
-// Module:  FPEnvironment
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/FPEnvironment_DUMMY.h"
-
-
-namespace Poco {
-
-
-FPEnvironmentImpl::RoundingModeImpl FPEnvironmentImpl::_roundingMode;
-
-
-FPEnvironmentImpl::FPEnvironmentImpl()
-{
-}
-
-
-FPEnvironmentImpl::FPEnvironmentImpl(const FPEnvironmentImpl& env)
-{
-}
-
-
-FPEnvironmentImpl::~FPEnvironmentImpl()
-{
-}
-
-
-FPEnvironmentImpl& FPEnvironmentImpl::operator = (const FPEnvironmentImpl& env)
-{
-	return *this;
-}
-
-
-void FPEnvironmentImpl::keepCurrentImpl()
-{
-}
-
-
-void FPEnvironmentImpl::clearFlagsImpl()
-{
-}
-
-
-bool FPEnvironmentImpl::isFlagImpl(FlagImpl flag)
-{
-	return false;
-}
-
-
-void FPEnvironmentImpl::setRoundingModeImpl(RoundingModeImpl mode)
-{
-	_roundingMode = mode;
-}
-
-
-FPEnvironmentImpl::RoundingModeImpl FPEnvironmentImpl::getRoundingModeImpl()
-{
-	return _roundingMode;
-}
-
-
-long double FPEnvironmentImpl::copySignImpl(long double target, long double source)
-{
-	return (source >= 0 && target >= 0) || (source < 0 && target < 0) ? target : -target;
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/FPEnvironment_QNX.cpp b/base/poco/Foundation/src/FPEnvironment_QNX.cpp
deleted file mode 100644
index 057eb8eb7bc..00000000000
--- a/base/poco/Foundation/src/FPEnvironment_QNX.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// FPEnvironment_QNX.cpp
-//
-// Library: Foundation
-// Package: Core
-// Module:  FPEnvironment
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/FPEnvironment_QNX.h"
-
-
-namespace Poco {
-
-
-FPEnvironmentImpl::FPEnvironmentImpl()
-{
-	fegetenv(&_env);
-}
-
-
-FPEnvironmentImpl::FPEnvironmentImpl(const FPEnvironmentImpl& env)
-{
-	_env = env._env;
-}
-
-
-FPEnvironmentImpl::~FPEnvironmentImpl()
-{
-	fesetenv(&_env);
-}
-
-
-FPEnvironmentImpl& FPEnvironmentImpl::operator = (const FPEnvironmentImpl& env)
-{
-	_env = env._env;
-	return *this;
-}
-
-
-void FPEnvironmentImpl::keepCurrentImpl()
-{
-	fegetenv(&_env);
-}
-
-
-void FPEnvironmentImpl::clearFlagsImpl()
-{
-	feclearexcept(FE_ALL_EXCEPT);
-}
-
-
-bool FPEnvironmentImpl::isFlagImpl(FlagImpl flag)
-{
-	return fetestexcept(flag) != 0;
-}
-
-
-void FPEnvironmentImpl::setRoundingModeImpl(RoundingModeImpl mode)
-{
-	fesetround(mode);
-}
-
-
-FPEnvironmentImpl::RoundingModeImpl FPEnvironmentImpl::getRoundingModeImpl()
-{
-	return (RoundingModeImpl) fegetround();
-}
-
-
-long double FPEnvironmentImpl::copySignImpl(long double target, long double source)
-{
-	return (source >= 0 && target >= 0) || (source < 0 && target < 0) ? target : -target;
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/Format.cpp b/base/poco/Foundation/src/Format.cpp
index ed5db5c21b2..9872ddff042 100644
--- a/base/poco/Foundation/src/Format.cpp
+++ b/base/poco/Foundation/src/Format.cpp
@@ -16,9 +16,6 @@
 #include "Poco/Exception.h"
 #include "Poco/Ascii.h"
 #include <sstream>
-#if !defined(POCO_NO_LOCALE)
-#include <locale>
-#endif
 #include <cstddef>
 
 
@@ -147,9 +144,6 @@ namespace
 	void formatOne(std::string& result, std::string::const_iterator& itFmt, const std::string::const_iterator& endFmt, std::vector<Any>::const_iterator& itVal)
 	{
 		std::ostringstream str;
-#if !defined(POCO_NO_LOCALE)
-		str.imbue(std::locale::classic());
-#endif
 		try
 		{
 			parseFlags(str, itFmt, endFmt);
diff --git a/base/poco/Foundation/src/Latin1Encoding.cpp b/base/poco/Foundation/src/Latin1Encoding.cpp
deleted file mode 100644
index c5aa00d745a..00000000000
--- a/base/poco/Foundation/src/Latin1Encoding.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Latin1Encoding.cpp
-//
-// Library: Foundation
-// Package: Text
-// Module:  Latin1Encoding
-//
-// Copyright (c) 2004-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Latin1Encoding.h"
-#include "Poco/String.h"
-
-
-namespace Poco {
-
-
-const char* Latin1Encoding::_names[] =
-{
-	"ISO-8859-1",
-	"Latin1",
-	"Latin-1",
-	NULL
-};
-
-
-const TextEncoding::CharacterMap Latin1Encoding::_charMap = 
-{
-	/*          00    01    02    03    04    05    06    07    08    09    0a    0b    0c    0d    0e    0f   */
-	/* 00 */	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 
-	/* 10 */	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 
-	/* 20 */	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 
-	/* 30 */	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 
-	/* 40 */	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 
-	/* 50 */	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
-	/* 60 */	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 
-	/* 70 */	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 
-	/* 80 */	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 
-	/* 90 */	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 
-	/* a0 */	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 
-	/* b0 */	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 
-	/* c0 */	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 
-	/* d0 */	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 
-	/* e0 */	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 
-	/* f0 */	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 
-};
-
-
-Latin1Encoding::Latin1Encoding()
-{
-}
-
-
-Latin1Encoding::~Latin1Encoding()
-{
-}
-
-
-const char* Latin1Encoding::canonicalName() const
-{
-	return _names[0];
-}
-
-
-bool Latin1Encoding::isA(const std::string& encodingName) const
-{
-	for (const char** name = _names; *name; ++name)
-	{
-		if (Poco::icompare(encodingName, *name) == 0)
-			return true;
-	}
-	return false;
-}
-
-
-const TextEncoding::CharacterMap& Latin1Encoding::characterMap() const
-{
-	return _charMap;
-}
-
-
-int Latin1Encoding::convert(const unsigned char* bytes) const
-{
-	return *bytes;
-}
-
-
-int Latin1Encoding::convert(int ch, unsigned char* bytes, int length) const
-{
-	if (ch >= 0 && ch <= 255)
-	{
-		if (bytes && length >= 1)
-			*bytes = (unsigned char) ch;
-		return 1;
-	}
-	else return 0;
-}
-
-
-int Latin1Encoding::queryConvert(const unsigned char* bytes, int length) const
-{
-	if (1 <= length)
-		return *bytes;
-	else
-		return -1;
-}
-
-
-int Latin1Encoding::sequenceLength(const unsigned char* bytes, int length) const
-{
-	return 1;
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/Latin2Encoding.cpp b/base/poco/Foundation/src/Latin2Encoding.cpp
deleted file mode 100644
index a0c77150099..00000000000
--- a/base/poco/Foundation/src/Latin2Encoding.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-// Latin2Encoding.cpp
-//
-// Library: Foundation
-// Package: Text
-// Module:  Latin2Encoding
-//
-// Copyright (c) 2004-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Latin2Encoding.h"
-#include "Poco/String.h"
-
-
-namespace Poco {
-
-
-const char* Latin2Encoding::_names[] =
-{
-	"ISO-8859-2",
-	"Latin2",
-	"Latin-2",
-	NULL
-};
-
-
-const TextEncoding::CharacterMap Latin2Encoding::_charMap = 
-{
-	/*          00      01      02      03      04      05      06      07      08      09      0a      0b      0c      0d      0e      0f   */
-	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
-	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
-	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
-	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
-	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
-	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
-	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
-	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
-	/* 80 */	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 
-	/* 90 */	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 
-	/* a0 */	0x00a0, 0x0104, 0x02d8, 0x0141, 0x00a4, 0x013d, 0x015a, 0x00a7, 0x00a8, 0x0160, 0x015e, 0x0164, 0x0179, 0x00ad, 0x017d, 0x017b,
-	/* b0 */	0x00b0, 0x0105, 0x02db, 0x0142, 0x00b4, 0x013e, 0x015b, 0x02c7, 0x00b8, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c,
-	/* c0 */	0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7, 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e,
-	/* d0 */	0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7, 0x0158, 0x016e, 0x00da, 0x0170, 0x00dc, 0x00dd, 0x0162, 0x00df,
-	/* e0 */	0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7, 0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f,
-	/* f0 */	0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7, 0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9,
-};
-
-
-Latin2Encoding::Latin2Encoding()
-{
-}
-
-
-Latin2Encoding::~Latin2Encoding()
-{
-}
-
-
-const char* Latin2Encoding::canonicalName() const
-{
-	return _names[0];
-}
-
-
-bool Latin2Encoding::isA(const std::string& encodingName) const
-{
-	for (const char** name = _names; *name; ++name)
-	{
-		if (Poco::icompare(encodingName, *name) == 0)
-			return true;
-	}
-	return false;
-}
-
-
-const TextEncoding::CharacterMap& Latin2Encoding::characterMap() const
-{
-	return _charMap;
-}
-
-
-int Latin2Encoding::convert(const unsigned char* bytes) const
-{
-	return _charMap[*bytes];
-}
-
-
-int Latin2Encoding::convert(int ch, unsigned char* bytes, int length) const
-{
-	if (ch >= 0 && ch <= 255 && _charMap[ch] == ch)
-	{
-		if (bytes && length >= 1)
-			*bytes = (unsigned char) ch;
-		return 1;
-	}
-	switch(ch)
-	{
-	case 0x0104: if (bytes && length >= 1) *bytes = 0xa1; return 1;
-	case 0x02d8: if (bytes && length >= 1) *bytes = 0xa2; return 1;
-	case 0x0141: if (bytes && length >= 1) *bytes = 0xa3; return 1;
-	case 0x013d: if (bytes && length >= 1) *bytes = 0xa5; return 1;
-	case 0x015a: if (bytes && length >= 1) *bytes = 0xa6; return 1;
-	case 0x0160: if (bytes && length >= 1) *bytes = 0xa9; return 1;
-	case 0x015e: if (bytes && length >= 1) *bytes = 0xaa; return 1;
-	case 0x0164: if (bytes && length >= 1) *bytes = 0xab; return 1;
-	case 0x0179: if (bytes && length >= 1) *bytes = 0xac; return 1;
-	case 0x017d: if (bytes && length >= 1) *bytes = 0xae; return 1;
-	case 0x017b: if (bytes && length >= 1) *bytes = 0xaf; return 1;
-	case 0x0105: if (bytes && length >= 1) *bytes = 0xb1; return 1;
-	case 0x02db: if (bytes && length >= 1) *bytes = 0xb2; return 1;
-	case 0x0142: if (bytes && length >= 1) *bytes = 0xb3; return 1;
-	case 0x013e: if (bytes && length >= 1) *bytes = 0xb5; return 1;
-	case 0x015b: if (bytes && length >= 1) *bytes = 0xb6; return 1;
-	case 0x02c7: if (bytes && length >= 1) *bytes = 0xb7; return 1;
-	case 0x0161: if (bytes && length >= 1) *bytes = 0xb9; return 1;
-	case 0x015f: if (bytes && length >= 1) *bytes = 0xba; return 1;
-	case 0x0165: if (bytes && length >= 1) *bytes = 0xbb; return 1;
-	case 0x017a: if (bytes && length >= 1) *bytes = 0xbc; return 1;
-	case 0x02dd: if (bytes && length >= 1) *bytes = 0xbd; return 1;
-	case 0x017e: if (bytes && length >= 1) *bytes = 0xbe; return 1;
-	case 0x017c: if (bytes && length >= 1) *bytes = 0xbf; return 1;
-	case 0x0154: if (bytes && length >= 1) *bytes = 0xc0; return 1;
-	case 0x0102: if (bytes && length >= 1) *bytes = 0xc3; return 1;
-	case 0x0139: if (bytes && length >= 1) *bytes = 0xc5; return 1;
-	case 0x0106: if (bytes && length >= 1) *bytes = 0xc6; return 1;
-	case 0x010c: if (bytes && length >= 1) *bytes = 0xc8; return 1;
-	case 0x0118: if (bytes && length >= 1) *bytes = 0xca; return 1;
-	case 0x011a: if (bytes && length >= 1) *bytes = 0xcc; return 1;
-	case 0x010e: if (bytes && length >= 1) *bytes = 0xcf; return 1;
-	case 0x0110: if (bytes && length >= 1) *bytes = 0xd0; return 1;
-	case 0x0143: if (bytes && length >= 1) *bytes = 0xd1; return 1;
-	case 0x0147: if (bytes && length >= 1) *bytes = 0xd2; return 1;
-	case 0x0150: if (bytes && length >= 1) *bytes = 0xd5; return 1;
-	case 0x0158: if (bytes && length >= 1) *bytes = 0xd8; return 1;
-	case 0x016e: if (bytes && length >= 1) *bytes = 0xd9; return 1;
-	case 0x0170: if (bytes && length >= 1) *bytes = 0xdb; return 1;
-	case 0x0162: if (bytes && length >= 1) *bytes = 0xde; return 1;
-	case 0x0155: if (bytes && length >= 1) *bytes = 0xe0; return 1;
-	case 0x0103: if (bytes && length >= 1) *bytes = 0xe3; return 1;
-	case 0x013a: if (bytes && length >= 1) *bytes = 0xe5; return 1;
-	case 0x0107: if (bytes && length >= 1) *bytes = 0xe6; return 1;
-	case 0x010d: if (bytes && length >= 1) *bytes = 0xe8; return 1;
-	case 0x0119: if (bytes && length >= 1) *bytes = 0xea; return 1;
-	case 0x011b: if (bytes && length >= 1) *bytes = 0xec; return 1;
-	case 0x010f: if (bytes && length >= 1) *bytes = 0xef; return 1;
-	case 0x0111: if (bytes && length >= 1) *bytes = 0xf0; return 1;
-	case 0x0144: if (bytes && length >= 1) *bytes = 0xf1; return 1;
-	case 0x0148: if (bytes && length >= 1) *bytes = 0xf2; return 1;
-	case 0x0151: if (bytes && length >= 1) *bytes = 0xf5; return 1;
-	case 0x0159: if (bytes && length >= 1) *bytes = 0xf8; return 1;
-	case 0x016f: if (bytes && length >= 1) *bytes = 0xf9; return 1;
-	case 0x0171: if (bytes && length >= 1) *bytes = 0xfb; return 1;
-	case 0x0163: if (bytes && length >= 1) *bytes = 0xfe; return 1;
-	case 0x02d9: if (bytes && length >= 1) *bytes = 0xff; return 1;
-	default: return 0;
-	}
-}
-
-
-int Latin2Encoding::queryConvert(const unsigned char* bytes, int length) const
-{
-	if (1 <= length)
-		return _charMap[*bytes];
-	else
-		return -1;
-}
-
-
-int Latin2Encoding::sequenceLength(const unsigned char* bytes, int length) const
-{
-	return 1;
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/Latin9Encoding.cpp b/base/poco/Foundation/src/Latin9Encoding.cpp
deleted file mode 100644
index eadc71f30e0..00000000000
--- a/base/poco/Foundation/src/Latin9Encoding.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Latin9Encoding.cpp
-//
-// Library: Foundation
-// Package: Text
-// Module:  Latin9Encoding
-//
-// Copyright (c) 2004-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Latin9Encoding.h"
-#include "Poco/String.h"
-
-
-namespace Poco {
-
-
-const char* Latin9Encoding::_names[] =
-{
-	"ISO-8859-15",
-	"Latin9",
-	"Latin-9",
-	NULL
-};
-
-
-const TextEncoding::CharacterMap Latin9Encoding::_charMap = 
-{
-	/*          00      01      02      03      04      05      06      07      08      09      0a      0b      0c      0d      0e      0f   */
-	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
-	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
-	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
-	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
-	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
-	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
-	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
-	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
-	/* 80 */	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 
-	/* 90 */	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 
-	/* a0 */	0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x20ac, 0x00a5, 0x0160, 0x00a7, 0x0161, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
-	/* b0 */	0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x017d, 0x00b5, 0x00b6, 0x00b7, 0x017e, 0x00b9, 0x00ba, 0x00bb, 0x0152, 0x0153, 0x0178, 0x00bf, 
-	/* c0 */	0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, 
-	/* d0 */	0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df, 
-	/* e0 */	0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 
-	/* f0 */	0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff, 
-};
-
-
-Latin9Encoding::Latin9Encoding()
-{
-}
-
-
-Latin9Encoding::~Latin9Encoding()
-{
-}
-
-
-const char* Latin9Encoding::canonicalName() const
-{
-	return _names[0];
-}
-
-
-bool Latin9Encoding::isA(const std::string& encodingName) const
-{
-	for (const char** name = _names; *name; ++name)
-	{
-		if (Poco::icompare(encodingName, *name) == 0)
-			return true;
-	}
-	return false;
-}
-
-
-const TextEncoding::CharacterMap& Latin9Encoding::characterMap() const
-{
-	return _charMap;
-}
-
-
-int Latin9Encoding::convert(const unsigned char* bytes) const
-{
-	return _charMap[*bytes];
-}
-
-
-int Latin9Encoding::convert(int ch, unsigned char* bytes, int length) const
-{
-	if (ch >= 0 && ch <= 255 && _charMap[ch] == ch)
-	{
-		if (bytes && length >= 1)
-			*bytes = ch;
-		return 1;
-	}
-	else switch (ch)
-	{
-	case 0x0152: if (bytes && length >= 1) *bytes = 0xbc; return 1;
-	case 0x0153: if (bytes && length >= 1) *bytes = 0xbd; return 1;
-	case 0x0160: if (bytes && length >= 1) *bytes = 0xa6; return 1;
-	case 0x0161: if (bytes && length >= 1) *bytes = 0xa8; return 1;
-	case 0x017d: if (bytes && length >= 1) *bytes = 0xb4; return 1;
-	case 0x017e: if (bytes && length >= 1) *bytes = 0xb8; return 1;
-	case 0x0178: if (bytes && length >= 1) *bytes = 0xbe; return 1;
-	case 0x20ac: if (bytes && length >= 1) *bytes = 0xa4; return 1;
-	default: return 0;
-	}
-}
-
-
-int Latin9Encoding::queryConvert(const unsigned char* bytes, int length) const
-{
-	if (1 <= length)
-		return _charMap[*bytes];
-	else
-		return -1;
-}
-
-
-int Latin9Encoding::sequenceLength(const unsigned char* bytes, int length) const
-{
-	return 1;
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/MD4Engine.cpp b/base/poco/Foundation/src/MD4Engine.cpp
deleted file mode 100644
index cab90623185..00000000000
--- a/base/poco/Foundation/src/MD4Engine.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-//
-// MD4Engine.cpp
-//
-// Library: Foundation
-// Package: Crypt
-// Module:  MD4Engine
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-//
-// MD4 (RFC 1320) algorithm:
-// Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-// rights reserved.
-//
-// License to copy and use this software is granted provided that it
-// is identified as the "RSA Data Security, Inc. MD4 Message-Digest
-// Algorithm" in all material mentioning or referencing this software
-// or this function.
-//
-// License is also granted to make and use derivative works provided
-// that such works are identified as "derived from the RSA Data
-// Security, Inc. MD4 Message-Digest Algorithm" in all material
-// mentioning or referencing the derived work.
-//
-// RSA Data Security, Inc. makes no representations concerning either
-// the merchantability of this software or the suitability of this
-// software for any particular purpose. It is provided "as is"
-// without express or implied warranty of any kind.
-//
-// These notices must be retained in any copies of any part of this
-// documentation and/or software.
-//
-
-
-#include "Poco/MD4Engine.h"
-#include <cstring>
-
-
-namespace Poco {
-
-
-MD4Engine::MD4Engine()
-{
-	_digest.reserve(16);
-	reset();
-}
-
-
-MD4Engine::~MD4Engine()
-{
-	reset();
-}
-
-	
-void MD4Engine::updateImpl(const void* input_, std::size_t inputLen)
-{
-	const unsigned char* input = (const unsigned char*) input_;
-	unsigned int i, index, partLen;
-
-	/* Compute number of bytes mod 64 */
-	index = (unsigned int)((_context.count[0] >> 3) & 0x3F);
-
-	/* Update number of bits */
-	if ((_context.count[0] += ((UInt32) inputLen << 3)) < ((UInt32) inputLen << 3))
-		_context.count[1]++;
-	_context.count[1] += ((UInt32) inputLen >> 29);
-
-	partLen = 64 - index;
-
-	/* Transform as many times as possible. */
-	if (inputLen >= partLen) 
-	{
-		std::memcpy(&_context.buffer[index], input, partLen);
-		transform(_context.state, _context.buffer);
-
-		for (i = partLen; i + 63 < inputLen; i += 64)
-			transform(_context.state, &input[i]);
-
-		index = 0;
-	}
-	else i = 0;
-
-	/* Buffer remaining input */
-	std::memcpy(&_context.buffer[index], &input[i], inputLen-i);
-}
-
-
-std::size_t MD4Engine::digestLength() const
-{
-	return DIGEST_SIZE;
-}
-
-
-void MD4Engine::reset()
-{
-	std::memset(&_context, 0, sizeof(_context));
-	_context.count[0] = _context.count[1] = 0;
-	_context.state[0] = 0x67452301;
-	_context.state[1] = 0xefcdab89;
-	_context.state[2] = 0x98badcfe;
-	_context.state[3] = 0x10325476;
-}
-
-
-const DigestEngine::Digest& MD4Engine::digest()
-{
-	static const unsigned char PADDING[64] = 
-	{
-		0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-	};
-	unsigned char bits[8];
-	unsigned int index, padLen;
-
-	/* Save number of bits */
-	encode(bits, _context.count, 8);
-
-	/* Pad out to 56 mod 64. */
-	index = (unsigned int)((_context.count[0] >> 3) & 0x3f);
-	padLen = (index < 56) ? (56 - index) : (120 - index);
-	update(PADDING, padLen);
-
-	/* Append length (before padding) */
-	update(bits, 8);
-
-	/* Store state in digest */
-	unsigned char digest[16];
-	encode(digest, _context.state, 16);
-	_digest.clear();
-	_digest.insert(_digest.begin(), digest, digest + sizeof(digest));
-
-	/* Zeroize sensitive information. */
-	std::memset(&_context, 0, sizeof (_context));
-	reset();
-	return _digest;
-}
-
-
-/* Constants for MD4Transform routine. */
-#define S11 3
-#define S12 7
-#define S13 11
-#define S14 19
-#define S21 3
-#define S22 5
-#define S23 9
-#define S24 13
-#define S31 3
-#define S32 9
-#define S33 11
-#define S34 15
-
-
-/* F, G and H are basic MD4 functions. */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-
-
-/* ROTATE_LEFT rotates x left n bits. */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-
-/* FF, GG and HH are transformations for rounds 1, 2 and 3 */
-/* Rotation is separate from addition to prevent recomputation */
-#define FF(a, b, c, d, x, s) { \
-    (a) += F ((b), (c), (d)) + (x); \
-    (a) = ROTATE_LEFT ((a), (s)); \
-  }
-#define GG(a, b, c, d, x, s) { \
-    (a) += G ((b), (c), (d)) + (x) + (UInt32)0x5a827999; \
-    (a) = ROTATE_LEFT ((a), (s)); \
-  }
-#define HH(a, b, c, d, x, s) { \
-    (a) += H ((b), (c), (d)) + (x) + (UInt32)0x6ed9eba1; \
-    (a) = ROTATE_LEFT ((a), (s)); \
-  }
-
-
-void MD4Engine::transform (UInt32 state[4], const unsigned char block[64])
-{
-	UInt32 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-
-	decode(x, block, 64);
-
-	/* Round 1 */
-	FF (a, b, c, d, x[ 0], S11); /* 1 */
-	FF (d, a, b, c, x[ 1], S12); /* 2 */
-	FF (c, d, a, b, x[ 2], S13); /* 3 */
-	FF (b, c, d, a, x[ 3], S14); /* 4 */
-	FF (a, b, c, d, x[ 4], S11); /* 5 */
-	FF (d, a, b, c, x[ 5], S12); /* 6 */
-	FF (c, d, a, b, x[ 6], S13); /* 7 */
-	FF (b, c, d, a, x[ 7], S14); /* 8 */
-	FF (a, b, c, d, x[ 8], S11); /* 9 */
-	FF (d, a, b, c, x[ 9], S12); /* 10 */
-	FF (c, d, a, b, x[10], S13); /* 11 */
-	FF (b, c, d, a, x[11], S14); /* 12 */
-	FF (a, b, c, d, x[12], S11); /* 13 */
-	FF (d, a, b, c, x[13], S12); /* 14 */
-	FF (c, d, a, b, x[14], S13); /* 15 */
-	FF (b, c, d, a, x[15], S14); /* 16 */
-
-	/* Round 2 */
-	GG (a, b, c, d, x[ 0], S21); /* 17 */
-	GG (d, a, b, c, x[ 4], S22); /* 18 */
-	GG (c, d, a, b, x[ 8], S23); /* 19 */
-	GG (b, c, d, a, x[12], S24); /* 20 */
-	GG (a, b, c, d, x[ 1], S21); /* 21 */
-	GG (d, a, b, c, x[ 5], S22); /* 22 */
-	GG (c, d, a, b, x[ 9], S23); /* 23 */
-	GG (b, c, d, a, x[13], S24); /* 24 */
-	GG (a, b, c, d, x[ 2], S21); /* 25 */
-	GG (d, a, b, c, x[ 6], S22); /* 26 */
-	GG (c, d, a, b, x[10], S23); /* 27 */
-	GG (b, c, d, a, x[14], S24); /* 28 */
-	GG (a, b, c, d, x[ 3], S21); /* 29 */
-	GG (d, a, b, c, x[ 7], S22); /* 30 */
-	GG (c, d, a, b, x[11], S23); /* 31 */
-	GG (b, c, d, a, x[15], S24); /* 32 */
-
-	/* Round 3 */
-	HH (a, b, c, d, x[ 0], S31); /* 33 */
-	HH (d, a, b, c, x[ 8], S32); /* 34 */
-	HH (c, d, a, b, x[ 4], S33); /* 35 */
-	HH (b, c, d, a, x[12], S34); /* 36 */
-	HH (a, b, c, d, x[ 2], S31); /* 37 */
-	HH (d, a, b, c, x[10], S32); /* 38 */
-	HH (c, d, a, b, x[ 6], S33); /* 39 */
-	HH (b, c, d, a, x[14], S34); /* 40 */
-	HH (a, b, c, d, x[ 1], S31); /* 41 */
-	HH (d, a, b, c, x[ 9], S32); /* 42 */
-	HH (c, d, a, b, x[ 5], S33); /* 43 */
-	HH (b, c, d, a, x[13], S34); /* 44 */
-	HH (a, b, c, d, x[ 3], S31); /* 45 */
-	HH (d, a, b, c, x[11], S32); /* 46 */
-	HH (c, d, a, b, x[ 7], S33); /* 47 */
-	HH (b, c, d, a, x[15], S34); /* 48 */
-
-	state[0] += a;
-	state[1] += b;
-	state[2] += c;
-	state[3] += d;
-
-	/* Zeroize sensitive information. */
-	std::memset(x, 0, sizeof(x));
-}
-
-
-void MD4Engine::encode(unsigned char* output, const UInt32* input, std::size_t len)
-{
-	unsigned int i, j;
-
-	for (i = 0, j = 0; j < len; i++, j += 4)
-	{
-		output[j]   = (unsigned char)(input[i] & 0xff);
-		output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
-		output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
-		output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
-	}
-}
-
-
-void MD4Engine::decode(UInt32* output, const unsigned char* input, std::size_t len)
-{
-	unsigned int i, j;
-
-	for (i = 0, j = 0; j < len; i++, j += 4)
-		output[i] = ((UInt32)input[j]) | (((UInt32)input[j+1]) << 8) |
-		            (((UInt32)input[j+2]) << 16) | (((UInt32)input[j+3]) << 24);
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/Manifest.cpp b/base/poco/Foundation/src/Manifest.cpp
deleted file mode 100644
index c4e828c5e97..00000000000
--- a/base/poco/Foundation/src/Manifest.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Manifest.cpp
-//
-// Library: Foundation
-// Package: SharedLibrary
-// Module:  ClassLoader
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Manifest.h"
-
-
-namespace Poco {
-
-
-ManifestBase::ManifestBase()
-{
-}
-
-
-ManifestBase::~ManifestBase()
-{
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/Message.cpp b/base/poco/Foundation/src/Message.cpp
index 0dfe4323134..663c96e47a2 100644
--- a/base/poco/Foundation/src/Message.cpp
+++ b/base/poco/Foundation/src/Message.cpp
@@ -27,8 +27,7 @@ Message::Message():
 	_tid(0), 
 	_file(0),
 	_line(0),
-	_pMap(0),
-    _fmt_str(0)
+	_pMap(0)
 {
 	init();
 }
@@ -157,6 +156,12 @@ void Message::setText(const std::string& text)
 }
 
 
+void Message::appendText(const std::string & text)
+{
+    _text.append(text);
+}
+
+
 void Message::setPriority(Priority prio)
 {
 	_prio = prio;
diff --git a/base/poco/Foundation/src/NumberFormatter.cpp b/base/poco/Foundation/src/NumberFormatter.cpp
index 0a9334059a9..328164911bf 100644
--- a/base/poco/Foundation/src/NumberFormatter.cpp
+++ b/base/poco/Foundation/src/NumberFormatter.cpp
@@ -15,9 +15,6 @@
 #include "Poco/NumberFormatter.h"
 #include "Poco/MemoryStream.h"
 #include <iomanip>
-#if !defined(POCO_NO_LOCALE)
-#include <locale>
-#endif
 #include <cstdio>
 
 
diff --git a/base/poco/Foundation/src/NumberParser.cpp b/base/poco/Foundation/src/NumberParser.cpp
index 8d32e1a722c..b4faa455922 100644
--- a/base/poco/Foundation/src/NumberParser.cpp
+++ b/base/poco/Foundation/src/NumberParser.cpp
@@ -19,9 +19,6 @@
 #include <cstdio>
 #include <cctype>
 #include <stdlib.h>
-#if !defined(POCO_NO_LOCALE)
-	#include <locale>
-#endif
 
 
 #if defined(POCO_LONG_IS_64_BIT)
diff --git a/base/poco/Foundation/src/NumericString.cpp b/base/poco/Foundation/src/NumericString.cpp
index 90b943015d6..7141d5d5d57 100644
--- a/base/poco/Foundation/src/NumericString.cpp
+++ b/base/poco/Foundation/src/NumericString.cpp
@@ -14,23 +14,9 @@
 
 #include "Poco/Bugcheck.h"
 
-
-// +++ double conversion +++
-#define double_conversion poco_double_conversion	// don't collide with standalone double_conversion library
-#define UNREACHABLE poco_bugcheck
-#define UNIMPLEMENTED poco_bugcheck
-#include "diy-fp.cc"
-#include "cached-powers.cc"
-#include "bignum-dtoa.cc"
-#include "bignum.cc"
-#include "fast-dtoa.cc"
-#include "fixed-dtoa.cc"
-#include "strtod.cc"
-#include "double-conversion.cc"
-// --- double conversion ---
+#include <double-conversion/double-conversion.h>
 
 #include "Poco/NumericString.h"
-poco_static_assert(POCO_MAX_FLT_STRING_LEN == double_conversion::kMaxSignificantDecimalDigits);
 #include "Poco/String.h"
 #include <memory>
 #include <cctype>
@@ -263,7 +249,7 @@ float strToFloat(const char* str)
 	int processed;
 	int flags = StringToDoubleConverter::ALLOW_LEADING_SPACES |
 		StringToDoubleConverter::ALLOW_TRAILING_SPACES;
-	StringToDoubleConverter converter(flags, 0.0, Single::NaN(), POCO_FLT_INF, POCO_FLT_NAN);
+	StringToDoubleConverter converter(flags, 0.0, std::numeric_limits<float>::quiet_NaN(), POCO_FLT_INF, POCO_FLT_NAN);
 	float result = converter.StringToFloat(str, static_cast<int>(strlen(str)), &processed);
 	return result;
 }
@@ -275,7 +261,7 @@ double strToDouble(const char* str)
 	int processed;
 	int flags = StringToDoubleConverter::ALLOW_LEADING_SPACES |
 		StringToDoubleConverter::ALLOW_TRAILING_SPACES;
-	StringToDoubleConverter converter(flags, 0.0, Double::NaN(), POCO_FLT_INF, POCO_FLT_NAN);
+	StringToDoubleConverter converter(flags, 0.0, std::numeric_limits<double>::quiet_NaN(), POCO_FLT_INF, POCO_FLT_NAN);
 	double result = converter.StringToDouble(str, static_cast<int>(strlen(str)), &processed);
 	return result;
 }
diff --git a/base/poco/Foundation/src/PipeImpl_DUMMY.cpp b/base/poco/Foundation/src/PipeImpl_DUMMY.cpp
deleted file mode 100644
index b0faf7b68ba..00000000000
--- a/base/poco/Foundation/src/PipeImpl_DUMMY.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// PipeImpl_DUMMY.cpp
-//
-// Library: Foundation
-// Package: Processes
-// Module:  PipeImpl
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/PipeImpl_DUMMY.h"
-
-
-namespace Poco {
-
-
-PipeImpl::PipeImpl()
-{
-}
-
-
-PipeImpl::~PipeImpl()
-{
-}
-
-
-int PipeImpl::writeBytes(const void* buffer, int length)
-{
-	return 0;
-}
-
-
-int PipeImpl::readBytes(void* buffer, int length)
-{
-	return 0;
-}
-
-
-PipeImpl::Handle PipeImpl::readHandle() const
-{
-	return 0;
-}
-
-
-PipeImpl::Handle PipeImpl::writeHandle() const
-{
-	return 0;
-}
-
-
-void PipeImpl::closeRead()
-{
-}
-
-
-void PipeImpl::closeWrite()
-{
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/PipeStream.cpp b/base/poco/Foundation/src/PipeStream.cpp
deleted file mode 100644
index 96fb323581d..00000000000
--- a/base/poco/Foundation/src/PipeStream.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// PipeStream.cpp
-//
-// Library: Foundation
-// Package: Processes
-// Module:  PipeStream
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/PipeStream.h"
-
-
-namespace Poco {
-
-
-//
-// PipeStreamBuf
-//
-
-
-PipeStreamBuf::PipeStreamBuf(const Pipe& pipe, openmode mode): 
-	BufferedStreamBuf(STREAM_BUFFER_SIZE, mode),
-	_pipe(pipe)
-{
-}
-
-
-PipeStreamBuf::~PipeStreamBuf()
-{
-}
-
-
-int PipeStreamBuf::readFromDevice(char* buffer, std::streamsize length)
-{
-	return _pipe.readBytes(buffer, (int) length);
-}
-
-
-int PipeStreamBuf::writeToDevice(const char* buffer, std::streamsize length)
-{
-	return _pipe.writeBytes(buffer, (int) length);
-}
-
-
-void PipeStreamBuf::close()
-{
-	_pipe.close(Pipe::CLOSE_BOTH);
-}
-
-
-//
-// PipeIOS
-//
-
-
-PipeIOS::PipeIOS(const Pipe& pipe, openmode mode):
-	_buf(pipe, mode)
-{
-	poco_ios_init(&_buf);
-}
-
-
-PipeIOS::~PipeIOS()
-{
-	try
-	{
-		_buf.sync();
-	}
-	catch (...)
-	{
-	}
-}
-
-
-PipeStreamBuf* PipeIOS::rdbuf()
-{
-	return &_buf;
-}
-
-
-void PipeIOS::close()
-{
-	_buf.sync();
-	_buf.close();
-}
-
-
-//
-// PipeOutputStream
-//
-
-
-PipeOutputStream::PipeOutputStream(const Pipe& pipe):
-	PipeIOS(pipe, std::ios::out),
-	std::ostream(&_buf)
-{
-}
-
-
-PipeOutputStream::~PipeOutputStream()
-{
-}
-
-
-//
-// PipeInputStream
-//
-
-
-PipeInputStream::PipeInputStream(const Pipe& pipe):
-	PipeIOS(pipe, std::ios::in),
-	std::istream(&_buf)
-{
-}
-
-
-PipeInputStream::~PipeInputStream()
-{
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/Semaphore_VX.cpp b/base/poco/Foundation/src/Semaphore_VX.cpp
deleted file mode 100644
index 5bc63b530c7..00000000000
--- a/base/poco/Foundation/src/Semaphore_VX.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Semaphore_VX.cpp
-//
-// Library: Foundation
-// Package: Threading
-// Module:  Semaphore
-//
-// Copyright (c) 2004-2011, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Semaphore_VX.h"
-#include <sysLib.h>
-
-
-namespace Poco {
-
-
-SemaphoreImpl::SemaphoreImpl(int n, int max)
-{
-	poco_assert (n >= 0 && max > 0 && n <= max);
-
-	_sem = semCCreate(SEM_Q_PRIORITY, n);
-	if (_sem == 0)
-		throw Poco::SystemException("cannot create semaphore");
-}
-
-
-SemaphoreImpl::~SemaphoreImpl()
-{
-	semDelete(_sem);
-}
-
-
-void SemaphoreImpl::waitImpl()
-{
-	if (semTake(_sem, WAIT_FOREVER) != OK)
-		throw SystemException("cannot wait for semaphore");
-}
-
-
-bool SemaphoreImpl::waitImpl(long milliseconds)
-{
-	int ticks = milliseconds*sysClkRateGet()/1000;
-	return semTake(_sem, ticks) == OK;
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/Semaphore_WIN32.cpp b/base/poco/Foundation/src/Semaphore_WIN32.cpp
deleted file mode 100644
index 2ec04a8c02d..00000000000
--- a/base/poco/Foundation/src/Semaphore_WIN32.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// Semaphore_WIN32.cpp
-//
-// Library: Foundation
-// Package: Threading
-// Module:  Semaphore
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Semaphore_WIN32.h"
-
-
-namespace Poco {
-
-
-SemaphoreImpl::SemaphoreImpl(int n, int max)
-{
-	poco_assert (n >= 0 && max > 0 && n <= max);
-
-	_sema = CreateSemaphoreW(NULL, n, max, NULL);
-	if (!_sema)
-	{
-		throw SystemException("cannot create semaphore");
-	}
-}
-
-
-SemaphoreImpl::~SemaphoreImpl()
-{
-	CloseHandle(_sema);
-}
-
-
-void SemaphoreImpl::waitImpl()
-{
-	switch (WaitForSingleObject(_sema, INFINITE))
-	{
-	case WAIT_OBJECT_0:
-		return;
-	default:
-		throw SystemException("wait for semaphore failed");
-	}
-}
-
-
-bool SemaphoreImpl::waitImpl(long milliseconds)
-{
-	switch (WaitForSingleObject(_sema, milliseconds + 1))
-	{
-	case WAIT_TIMEOUT:
-		return false;
-	case WAIT_OBJECT_0:
-		return true;
-	default:
-		throw SystemException("wait for semaphore failed");		
-	}
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/SharedMemory_DUMMY.cpp b/base/poco/Foundation/src/SharedMemory_DUMMY.cpp
deleted file mode 100644
index 38586323806..00000000000
--- a/base/poco/Foundation/src/SharedMemory_DUMMY.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// SharedMemoryImpl.cpp
-//
-// Library: Foundation
-// Package: Processes
-// Module:  SharedMemoryImpl
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SharedMemory_DUMMY.h"
-
-
-namespace Poco {
-
-
-SharedMemoryImpl::SharedMemoryImpl(const std::string&, std::size_t, SharedMemory::AccessMode, const void*, bool)
-{
-}
-
-
-SharedMemoryImpl::SharedMemoryImpl(const Poco::File&, SharedMemory::AccessMode, const void*)
-{
-}
-
-
-SharedMemoryImpl::~SharedMemoryImpl()
-{
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/StreamTokenizer.cpp b/base/poco/Foundation/src/StreamTokenizer.cpp
deleted file mode 100644
index 1b6e936274e..00000000000
--- a/base/poco/Foundation/src/StreamTokenizer.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// StreamTokenizer.cpp
-//
-// Library: Foundation
-// Package: Streams
-// Module:  StreamTokenizer
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/StreamTokenizer.h"
-
-
-namespace Poco {
-
-
-StreamTokenizer::StreamTokenizer():
-	_pIstr(0)
-{
-}
-
-
-StreamTokenizer::StreamTokenizer(std::istream& istr):
-	_pIstr(&istr)
-{
-}
-
-
-StreamTokenizer::~StreamTokenizer()
-{
-	for (TokenVec::iterator it = _tokens.begin(); it != _tokens.end(); ++it)
-	{
-		delete it->pToken;
-	}
-}
-
-
-void StreamTokenizer::attachToStream(std::istream& istr)
-{
-	_pIstr = &istr;
-}
-
-
-void StreamTokenizer::addToken(Token* pToken)
-{
-	poco_check_ptr (pToken);
-
-	TokenInfo ti;
-	ti.pToken = pToken;
-	ti.ignore = (pToken->tokenClass() == Token::COMMENT_TOKEN || pToken->tokenClass() == Token::WHITESPACE_TOKEN);
-	_tokens.push_back(ti);
-}
-
-
-void StreamTokenizer::addToken(Token* pToken, bool ignore)
-{
-	poco_check_ptr (pToken);
-
-	TokenInfo ti;
-	ti.pToken = pToken;
-	ti.ignore = ignore;
-	_tokens.push_back(ti);
-}
-
-	
-const Token* StreamTokenizer::next()
-{
-	poco_check_ptr (_pIstr);
-	
-	static const int eof = std::char_traits<char>::eof();
-
-	int first = _pIstr->get();
-	TokenVec::const_iterator it = _tokens.begin();
-	while (first != eof && it != _tokens.end())
-	{
-		const TokenInfo& ti = *it;
-		if (ti.pToken->start((char) first, *_pIstr))
-		{
-			ti.pToken->finish(*_pIstr);
-			if (ti.ignore) 
-			{
-				first = _pIstr->get();
-				it = _tokens.begin();
-			}
-			else return ti.pToken;
-		}
-		else ++it;
-	}
-	if (first == eof)
-	{
-		return &_eofToken;
-	}
-	else
-	{
-		_invalidToken.start((char) first, *_pIstr);
-		return &_invalidToken;
-	}
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/SynchronizedObject.cpp b/base/poco/Foundation/src/SynchronizedObject.cpp
deleted file mode 100644
index 6a42e6594dc..00000000000
--- a/base/poco/Foundation/src/SynchronizedObject.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// SynchronizedObject.cpp
-//
-// Library: Foundation
-// Package: Threading
-// Module:  SynchronizedObject
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SynchronizedObject.h"
-
-
-namespace Poco {
-
-
-SynchronizedObject::SynchronizedObject()
-{
-}
-
-	
-SynchronizedObject::~SynchronizedObject()
-{
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/TextEncoding.cpp b/base/poco/Foundation/src/TextEncoding.cpp
index cfd1c77ef95..f652d6f5d37 100644
--- a/base/poco/Foundation/src/TextEncoding.cpp
+++ b/base/poco/Foundation/src/TextEncoding.cpp
@@ -16,15 +16,9 @@
 #include "Poco/Exception.h"
 #include "Poco/String.h"
 #include "Poco/ASCIIEncoding.h"
-#include "Poco/Latin1Encoding.h"
-#include "Poco/Latin2Encoding.h"
-#include "Poco/Latin9Encoding.h"
 #include "Poco/UTF32Encoding.h"
 #include "Poco/UTF16Encoding.h"
 #include "Poco/UTF8Encoding.h"
-#include "Poco/Windows1250Encoding.h"
-#include "Poco/Windows1251Encoding.h"
-#include "Poco/Windows1252Encoding.h"
 #include "Poco/RWLock.h"
 #include "Poco/SingletonHolder.h"
 #include <map>
@@ -47,15 +41,9 @@ public:
 		add(pUtf8Encoding, TextEncoding::GLOBAL);
 
 		add(new ASCIIEncoding);
-		add(new Latin1Encoding);
-		add(new Latin2Encoding);
-		add(new Latin9Encoding);
 		add(pUtf8Encoding);
 		add(new UTF16Encoding);
 		add(new UTF32Encoding);
-		add(new Windows1250Encoding);
-		add(new Windows1251Encoding);
-		add(new Windows1252Encoding);
 	}
 
 	~TextEncodingManager()
diff --git a/base/poco/Foundation/src/Timezone_VX.cpp b/base/poco/Foundation/src/Timezone_VX.cpp
deleted file mode 100644
index 18339bffab4..00000000000
--- a/base/poco/Foundation/src/Timezone_VX.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Timezone_VXX.cpp
-//
-// Library: Foundation
-// Package: DateTime
-// Module:  Timezone
-//
-// Copyright (c) 2004-2011, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Timezone.h"
-#include "Poco/Exception.h"
-#include "Poco/Environment.h"
-#include <ctime>
-
-
-namespace Poco {
-
-
-int Timezone::utcOffset()
-{
-	std::time_t now = std::time(NULL);
-	struct std::tm t;
-	gmtime_r(&now, &t);
-	std::time_t utc = std::mktime(&t);
-	return now - utc;
-}
-
-	
-int Timezone::dst()
-{
-	std::time_t now = std::time(NULL);
-	struct std::tm t;
-	if (localtime_r(&now, &t) != OK)
-		throw Poco::SystemException("cannot get local time DST offset");
-	return t.tm_isdst == 1 ? 3600 : 0;
-}
-
-
-bool Timezone::isDst(const Timestamp& timestamp)
-{
-	std::time_t time = timestamp.epochTime();
-	struct std::tm* tms = std::localtime(&time);
-	if (!tms) throw Poco::SystemException("cannot get local time DST flag");
-	return tms->tm_isdst > 0;
-}
-
-	
-std::string Timezone::name()
-{
-	// format of TIMEZONE environment variable:
-	// name_of_zone:<(unused)>:time_in_minutes_from_UTC:daylight_start:daylight_end
-	std::string tz = Environment::get("TIMEZONE", "UTC");
-	std::string::size_type pos = tz.find(':');
-	if (pos != std::string::npos)
-		return tz.substr(0, pos);
-	else
-		return tz;
-}
-
-	
-std::string Timezone::standardName()
-{
-	return name();
-}
-
-	
-std::string Timezone::dstName()
-{
-	return name();
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/Windows1251Encoding.cpp b/base/poco/Foundation/src/Windows1251Encoding.cpp
deleted file mode 100644
index 91f1d23a859..00000000000
--- a/base/poco/Foundation/src/Windows1251Encoding.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-//
-// Windows1251Encoding.cpp
-//
-// Library: Foundation
-// Package: Text
-// Module:  Windows1251Encoding
-//
-// Copyright (c) 2005-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Windows1251Encoding.h"
-#include "Poco/String.h"
-
-
-namespace Poco {
-
-
-const char* Windows1251Encoding::_names[] =
-{
-	"windows-1251",
-	"Windows-1251",
-	"cp1251",
-	"CP1251",
-	NULL
-};
-
-
-const TextEncoding::CharacterMap Windows1251Encoding::_charMap =
-{
-	/*          00      01      02      03      04      05      06      07      08      09      0a      0b      0c      0d      0e      0f   */
-	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
-	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
-	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
-	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
-	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
-	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
-	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
-	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
-	/* 80 */	0x0402, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021, 0x20ac, 0x2030, 0x0409, 0x2039, 0x040a, 0x040c, 0x040b, 0x040f,
-	/* 90 */	0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0xfffe, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f,
-	/* a0 */	0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7, 0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407,
-	/* b0 */	0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7, 0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x0457,
-	/* c0 */	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f,
-	/* d0 */	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f,
-	/* e0 */	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f,
-	/* f0 */	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f,
-};
-
-
-Windows1251Encoding::Windows1251Encoding()
-{
-}
-
-
-Windows1251Encoding::~Windows1251Encoding()
-{
-}
-
-
-const char* Windows1251Encoding::canonicalName() const
-{
-	return _names[0];
-}
-
-
-bool Windows1251Encoding::isA(const std::string& encodingName) const
-{
-	for (const char** name = _names; *name; ++name)
-	{
-		if (Poco::icompare(encodingName, *name) == 0)
-			return true;
-	}
-	return false;
-}
-
-
-const TextEncoding::CharacterMap& Windows1251Encoding::characterMap() const
-{
-	return _charMap;
-}
-
-
-int Windows1251Encoding::convert(const unsigned char* bytes) const
-{
-	return _charMap[*bytes];
-}
-
-
-int Windows1251Encoding::convert(int ch, unsigned char* bytes, int length) const
-{
-	if (ch >= 0 && ch <= 255 && _charMap[ch] == ch)
-	{
-		if (bytes && length >= 1)
-			*bytes = (unsigned char) ch;
-		return 1;
-	}
-	else switch(ch)
-	{
-	case 0x0402: if (bytes && length >= 1) *bytes = 0x80; return 1;
-	case 0x0403: if (bytes && length >= 1) *bytes = 0x81; return 1;
-	case 0x201a: if (bytes && length >= 1) *bytes = 0x82; return 1;
-	case 0x0453: if (bytes && length >= 1) *bytes = 0x83; return 1;
-	case 0x201e: if (bytes && length >= 1) *bytes = 0x84; return 1;
-	case 0x2026: if (bytes && length >= 1) *bytes = 0x85; return 1;
-	case 0x2020: if (bytes && length >= 1) *bytes = 0x86; return 1;
-	case 0x2021: if (bytes && length >= 1) *bytes = 0x87; return 1;
-	case 0x20ac: if (bytes && length >= 1) *bytes = 0x88; return 1;
-	case 0x2030: if (bytes && length >= 1) *bytes = 0x89; return 1;
-	case 0x0409: if (bytes && length >= 1) *bytes = 0x8a; return 1;
-	case 0x2039: if (bytes && length >= 1) *bytes = 0x8b; return 1;
-	case 0x040a: if (bytes && length >= 1) *bytes = 0x8c; return 1;
-	case 0x040c: if (bytes && length >= 1) *bytes = 0x8d; return 1;
-	case 0x040b: if (bytes && length >= 1) *bytes = 0x8e; return 1;
-	case 0x040f: if (bytes && length >= 1) *bytes = 0x8f; return 1;
-	case 0x0452: if (bytes && length >= 1) *bytes = 0x90; return 1;
-	case 0x2018: if (bytes && length >= 1) *bytes = 0x91; return 1;
-	case 0x2019: if (bytes && length >= 1) *bytes = 0x92; return 1;
-	case 0x201c: if (bytes && length >= 1) *bytes = 0x93; return 1;
-	case 0x201d: if (bytes && length >= 1) *bytes = 0x94; return 1;
-	case 0x2022: if (bytes && length >= 1) *bytes = 0x95; return 1;
-	case 0x2013: if (bytes && length >= 1) *bytes = 0x96; return 1;
-	case 0x2014: if (bytes && length >= 1) *bytes = 0x97; return 1;
-	case 0xfffe: if (bytes && length >= 1) *bytes = 0x98; return 1;
-	case 0x2122: if (bytes && length >= 1) *bytes = 0x99; return 1;
-	case 0x0459: if (bytes && length >= 1) *bytes = 0x9a; return 1;
-	case 0x203a: if (bytes && length >= 1) *bytes = 0x9b; return 1;
-	case 0x045a: if (bytes && length >= 1) *bytes = 0x9c; return 1;
-	case 0x045c: if (bytes && length >= 1) *bytes = 0x9d; return 1;
-	case 0x045b: if (bytes && length >= 1) *bytes = 0x9e; return 1;
-	case 0x045f: if (bytes && length >= 1) *bytes = 0x9f; return 1;
-	case 0x040e: if (bytes && length >= 1) *bytes = 0xa1; return 1;
-	case 0x045e: if (bytes && length >= 1) *bytes = 0xa2; return 1;
-	case 0x0408: if (bytes && length >= 1) *bytes = 0xa3; return 1;
-	case 0x0490: if (bytes && length >= 1) *bytes = 0xa5; return 1;
-	case 0x0401: if (bytes && length >= 1) *bytes = 0xa8; return 1;
-	case 0x0404: if (bytes && length >= 1) *bytes = 0xaa; return 1;
-	case 0x0407: if (bytes && length >= 1) *bytes = 0xaf; return 1;
-	case 0x0406: if (bytes && length >= 1) *bytes = 0xb2; return 1;
-	case 0x0456: if (bytes && length >= 1) *bytes = 0xb3; return 1;
-	case 0x0491: if (bytes && length >= 1) *bytes = 0xb4; return 1;
-	case 0x0451: if (bytes && length >= 1) *bytes = 0xb8; return 1;
-	case 0x2116: if (bytes && length >= 1) *bytes = 0xb9; return 1;
-	case 0x0454: if (bytes && length >= 1) *bytes = 0xba; return 1;
-	case 0x0458: if (bytes && length >= 1) *bytes = 0xbc; return 1;
-	case 0x0405: if (bytes && length >= 1) *bytes = 0xbd; return 1;
-	case 0x0455: if (bytes && length >= 1) *bytes = 0xbe; return 1;
-	case 0x0457: if (bytes && length >= 1) *bytes = 0xbf; return 1;
-	case 0x0410: if (bytes && length >= 1) *bytes = 0xc0; return 1;
-	case 0x0411: if (bytes && length >= 1) *bytes = 0xc1; return 1;
-	case 0x0412: if (bytes && length >= 1) *bytes = 0xc2; return 1;
-	case 0x0413: if (bytes && length >= 1) *bytes = 0xc3; return 1;
-	case 0x0414: if (bytes && length >= 1) *bytes = 0xc4; return 1;
-	case 0x0415: if (bytes && length >= 1) *bytes = 0xc5; return 1;
-	case 0x0416: if (bytes && length >= 1) *bytes = 0xc6; return 1;
-	case 0x0417: if (bytes && length >= 1) *bytes = 0xc7; return 1;
-	case 0x0418: if (bytes && length >= 1) *bytes = 0xc8; return 1;
-	case 0x0419: if (bytes && length >= 1) *bytes = 0xc9; return 1;
-	case 0x041a: if (bytes && length >= 1) *bytes = 0xca; return 1;
-	case 0x041b: if (bytes && length >= 1) *bytes = 0xcb; return 1;
-	case 0x041c: if (bytes && length >= 1) *bytes = 0xcc; return 1;
-	case 0x041d: if (bytes && length >= 1) *bytes = 0xcd; return 1;
-	case 0x041e: if (bytes && length >= 1) *bytes = 0xce; return 1;
-	case 0x041f: if (bytes && length >= 1) *bytes = 0xcf; return 1;
-	case 0x0420: if (bytes && length >= 1) *bytes = 0xd0; return 1;
-	case 0x0421: if (bytes && length >= 1) *bytes = 0xd1; return 1;
-	case 0x0422: if (bytes && length >= 1) *bytes = 0xd2; return 1;
-	case 0x0423: if (bytes && length >= 1) *bytes = 0xd3; return 1;
-	case 0x0424: if (bytes && length >= 1) *bytes = 0xd4; return 1;
-	case 0x0425: if (bytes && length >= 1) *bytes = 0xd5; return 1;
-	case 0x0426: if (bytes && length >= 1) *bytes = 0xd6; return 1;
-	case 0x0427: if (bytes && length >= 1) *bytes = 0xd7; return 1;
-	case 0x0428: if (bytes && length >= 1) *bytes = 0xd8; return 1;
-	case 0x0429: if (bytes && length >= 1) *bytes = 0xd9; return 1;
-	case 0x042a: if (bytes && length >= 1) *bytes = 0xda; return 1;
-	case 0x042b: if (bytes && length >= 1) *bytes = 0xdb; return 1;
-	case 0x042c: if (bytes && length >= 1) *bytes = 0xdc; return 1;
-	case 0x042d: if (bytes && length >= 1) *bytes = 0xdd; return 1;
-	case 0x042e: if (bytes && length >= 1) *bytes = 0xde; return 1;
-	case 0x042f: if (bytes && length >= 1) *bytes = 0xdf; return 1;
-	case 0x0430: if (bytes && length >= 1) *bytes = 0xe0; return 1;
-	case 0x0431: if (bytes && length >= 1) *bytes = 0xe1; return 1;
-	case 0x0432: if (bytes && length >= 1) *bytes = 0xe2; return 1;
-	case 0x0433: if (bytes && length >= 1) *bytes = 0xe3; return 1;
-	case 0x0434: if (bytes && length >= 1) *bytes = 0xe4; return 1;
-	case 0x0435: if (bytes && length >= 1) *bytes = 0xe5; return 1;
-	case 0x0436: if (bytes && length >= 1) *bytes = 0xe6; return 1;
-	case 0x0437: if (bytes && length >= 1) *bytes = 0xe7; return 1;
-	case 0x0438: if (bytes && length >= 1) *bytes = 0xe8; return 1;
-	case 0x0439: if (bytes && length >= 1) *bytes = 0xe9; return 1;
-	case 0x043a: if (bytes && length >= 1) *bytes = 0xea; return 1;
-	case 0x043b: if (bytes && length >= 1) *bytes = 0xeb; return 1;
-	case 0x043c: if (bytes && length >= 1) *bytes = 0xec; return 1;
-	case 0x043d: if (bytes && length >= 1) *bytes = 0xed; return 1;
-	case 0x043e: if (bytes && length >= 1) *bytes = 0xee; return 1;
-	case 0x043f: if (bytes && length >= 1) *bytes = 0xef; return 1;
-	case 0x0440: if (bytes && length >= 1) *bytes = 0xf0; return 1;
-	case 0x0441: if (bytes && length >= 1) *bytes = 0xf1; return 1;
-	case 0x0442: if (bytes && length >= 1) *bytes = 0xf2; return 1;
-	case 0x0443: if (bytes && length >= 1) *bytes = 0xf3; return 1;
-	case 0x0444: if (bytes && length >= 1) *bytes = 0xf4; return 1;
-	case 0x0445: if (bytes && length >= 1) *bytes = 0xf5; return 1;
-	case 0x0446: if (bytes && length >= 1) *bytes = 0xf6; return 1;
-	case 0x0447: if (bytes && length >= 1) *bytes = 0xf7; return 1;
-	case 0x0448: if (bytes && length >= 1) *bytes = 0xf8; return 1;
-	case 0x0449: if (bytes && length >= 1) *bytes = 0xf9; return 1;
-	case 0x044a: if (bytes && length >= 1) *bytes = 0xfa; return 1;
-	case 0x044b: if (bytes && length >= 1) *bytes = 0xfb; return 1;
-	case 0x044c: if (bytes && length >= 1) *bytes = 0xfc; return 1;
-	case 0x044d: if (bytes && length >= 1) *bytes = 0xfd; return 1;
-	case 0x044e: if (bytes && length >= 1) *bytes = 0xfe; return 1;
-	case 0x044f: if (bytes && length >= 1) *bytes = 0xff; return 1;
-	default: return 0;
-	}
-}
-
-
-int Windows1251Encoding::queryConvert(const unsigned char* bytes, int length) const
-{
-	if (1 <= length)
-		return _charMap[*bytes];
-	else
-		return -1;
-}
-
-
-int Windows1251Encoding::sequenceLength(const unsigned char* bytes, int length) const
-{
-	return 1;
-}
-
-
-} // namespace Poco
-
diff --git a/base/poco/Foundation/src/Windows1252Encoding.cpp b/base/poco/Foundation/src/Windows1252Encoding.cpp
deleted file mode 100644
index b73a19dd90d..00000000000
--- a/base/poco/Foundation/src/Windows1252Encoding.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-// Windows1252Encoding.cpp
-//
-// Library: Foundation
-// Package: Text
-// Module:  Windows1252Encoding
-//
-// Copyright (c) 2005-2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Windows1252Encoding.h"
-#include "Poco/String.h"
-#include <map>
-
-
-namespace Poco {
-
-
-const char* Windows1252Encoding::_names[] =
-{
-	"windows-1252",
-	"Windows-1252",
-	"cp1252",
-	"CP1252",
-	NULL
-};
-
-
-const TextEncoding::CharacterMap Windows1252Encoding::_charMap = 
-{
-	/*          00      01      02      03      04      05      06      07      08      09      0a      0b      0c      0d      0e      0f   */
-	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
-	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
-	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
-	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
-	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
-	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
-	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
-	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
-	/* 80 */	0x20ac, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f, 
-	/* 90 */	0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x017e, 0x0178, 
-	/* a0 */	0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
-	/* b0 */	0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 
-	/* c0 */	0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, 
-	/* d0 */	0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df, 
-	/* e0 */	0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 
-	/* f0 */	0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff, 
-};
-
-
-Windows1252Encoding::Windows1252Encoding()
-{
-}
-
-
-Windows1252Encoding::~Windows1252Encoding()
-{
-}
-
-
-const char* Windows1252Encoding::canonicalName() const
-{
-	return _names[0];
-}
-
-
-bool Windows1252Encoding::isA(const std::string& encodingName) const
-{
-	for (const char** name = _names; *name; ++name)
-	{
-		if (Poco::icompare(encodingName, *name) == 0)
-			return true;
-	}
-	return false;
-}
-
-
-const TextEncoding::CharacterMap& Windows1252Encoding::characterMap() const
-{
-	return _charMap;
-}
-
-
-int Windows1252Encoding::convert(const unsigned char* bytes) const
-{
-	return _charMap[*bytes];
-}
-
-
-int Windows1252Encoding::convert(int ch, unsigned char* bytes, int length) const
-{
-	if (ch >= 0 && ch <= 255 && _charMap[ch] == ch)
-	{
-		if (bytes && length >= 1)
-			*bytes = ch;
-		return 1;
-	}
-	else switch (ch)
-	{
-	case 0x20ac: if (bytes && length >= 1) *bytes = 0x80; return 1;
-	case 0x201a: if (bytes && length >= 1) *bytes = 0x82; return 1;
-	case 0x0192: if (bytes && length >= 1) *bytes = 0x83; return 1;
-	case 0x201e: if (bytes && length >= 1) *bytes = 0x84; return 1;
-	case 0x2026: if (bytes && length >= 1) *bytes = 0x85; return 1;
-	case 0x2020: if (bytes && length >= 1) *bytes = 0x86; return 1;
-	case 0x2021: if (bytes && length >= 1) *bytes = 0x87; return 1;
-	case 0x02c6: if (bytes && length >= 1) *bytes = 0x88; return 1;
-	case 0x2030: if (bytes && length >= 1) *bytes = 0x89; return 1;
-	case 0x0160: if (bytes && length >= 1) *bytes = 0x8a; return 1;
-	case 0x2039: if (bytes && length >= 1) *bytes = 0x8b; return 1;
-	case 0x0152: if (bytes && length >= 1) *bytes = 0x8c; return 1;
-	case 0x017d: if (bytes && length >= 1) *bytes = 0x8e; return 1;
-	case 0x2018: if (bytes && length >= 1) *bytes = 0x91; return 1;
-	case 0x2019: if (bytes && length >= 1) *bytes = 0x92; return 1;
-	case 0x201c: if (bytes && length >= 1) *bytes = 0x93; return 1;
-	case 0x201d: if (bytes && length >= 1) *bytes = 0x94; return 1;
-	case 0x2022: if (bytes && length >= 1) *bytes = 0x95; return 1;
-	case 0x2013: if (bytes && length >= 1) *bytes = 0x96; return 1;
-	case 0x2014: if (bytes && length >= 1) *bytes = 0x97; return 1;
-	case 0x02dc: if (bytes && length >= 1) *bytes = 0x98; return 1;
-	case 0x2122: if (bytes && length >= 1) *bytes = 0x99; return 1;
-	case 0x0161: if (bytes && length >= 1) *bytes = 0x9a; return 1;
-	case 0x203a: if (bytes && length >= 1) *bytes = 0x9b; return 1;
-	case 0x0153: if (bytes && length >= 1) *bytes = 0x9c; return 1;
-	case 0x017e: if (bytes && length >= 1) *bytes = 0x9e; return 1;
-	case 0x0178: if (bytes && length >= 1) *bytes = 0x9f; return 1;
-	default: return 0;
-	}
-}
-
-
-int Windows1252Encoding::queryConvert(const unsigned char* bytes, int length) const
-{
-	if (1 <= length)
-		return _charMap[*bytes];
-	else
-		return -1;
-}
-
-
-int Windows1252Encoding::sequenceLength(const unsigned char* bytes, int length) const
-{
-	return 1;
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/WindowsConsoleChannel.cpp b/base/poco/Foundation/src/WindowsConsoleChannel.cpp
deleted file mode 100644
index 48665bb178a..00000000000
--- a/base/poco/Foundation/src/WindowsConsoleChannel.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-//
-// WindowsConsoleChannel.cpp
-//
-// Library: Foundation
-// Package: Logging
-// Module:  WindowsConsoleChannel
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/WindowsConsoleChannel.h"
-#include "Poco/Message.h"
-#include "Poco/String.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco {
-
-
-WindowsConsoleChannel::WindowsConsoleChannel():
-	_isFile(false),
-	_hConsole(INVALID_HANDLE_VALUE)
-{
-	_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-	// check whether the console has been redirected
-	DWORD mode;	
-	_isFile = (GetConsoleMode(_hConsole, &mode) == 0);
-}
-
-
-WindowsConsoleChannel::~WindowsConsoleChannel()
-{
-}
-
-
-void WindowsConsoleChannel::log(const Message& msg)
-{
-	std::string text = msg.getText();
-	text += "\r\n";
-	
-	DWORD written;
-	WriteFile(_hConsole, text.data(), text.size(), &written, NULL);	
-}
-
-
-WindowsColorConsoleChannel::WindowsColorConsoleChannel():
-	_enableColors(true),
-	_isFile(false),
-	_hConsole(INVALID_HANDLE_VALUE)
-{
-	_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-	// check whether the console has been redirected
-	DWORD mode;	
-	_isFile = (GetConsoleMode(_hConsole, &mode) == 0);
-	initColors();
-}
-
-
-WindowsColorConsoleChannel::~WindowsColorConsoleChannel()
-{
-}
-
-
-void WindowsColorConsoleChannel::log(const Message& msg)
-{
-	std::string text = msg.getText();
-	text += "\r\n";
-
-	if (_enableColors && !_isFile)
-	{
-		WORD attr = _colors[0];
-		attr &= 0xFFF0;
-		attr |= _colors[msg.getPriority()];
-		SetConsoleTextAttribute(_hConsole, attr);
-	}
-
-	DWORD written;
-	WriteFile(_hConsole, text.data(), text.size(), &written, NULL);	
-
-	if (_enableColors && !_isFile)
-	{
-		SetConsoleTextAttribute(_hConsole, _colors[0]);
-	}
-}
-
-
-void WindowsColorConsoleChannel::setProperty(const std::string& name, const std::string& value)
-{
-	if (name == "enableColors")
-	{
-		_enableColors = icompare(value, "true") == 0;
-	}
-	else if (name == "traceColor")
-	{
-		_colors[Message::PRIO_TRACE] = parseColor(value);
-	}
-	else if (name == "debugColor")
-	{
-		_colors[Message::PRIO_DEBUG] = parseColor(value);
-	}
-	else if (name == "informationColor")
-	{
-		_colors[Message::PRIO_INFORMATION] = parseColor(value);
-	}
-	else if (name == "noticeColor")
-	{
-		_colors[Message::PRIO_NOTICE] = parseColor(value);
-	}
-	else if (name == "warningColor")
-	{
-		_colors[Message::PRIO_WARNING] = parseColor(value);
-	}
-	else if (name == "errorColor")
-	{
-		_colors[Message::PRIO_ERROR] = parseColor(value);
-	}
-	else if (name == "criticalColor")
-	{
-		_colors[Message::PRIO_CRITICAL] = parseColor(value);
-	}
-	else if (name == "fatalColor")
-	{
-		_colors[Message::PRIO_FATAL] = parseColor(value);
-	}
-	else
-	{
-		Channel::setProperty(name, value);
-	}
-}
-
-
-std::string WindowsColorConsoleChannel::getProperty(const std::string& name) const
-{
-	if (name == "enableColors")
-	{
-		return _enableColors ? "true" : "false";
-	}
-	else if (name == "traceColor")
-	{
-		return formatColor(_colors[Message::PRIO_TRACE]);
-	}
-	else if (name == "debugColor")
-	{
-		return formatColor(_colors[Message::PRIO_DEBUG]);
-	}
-	else if (name == "informationColor")
-	{
-		return formatColor(_colors[Message::PRIO_INFORMATION]);
-	}
-	else if (name == "noticeColor")
-	{
-		return formatColor(_colors[Message::PRIO_NOTICE]);
-	}
-	else if (name == "warningColor")
-	{
-		return formatColor(_colors[Message::PRIO_WARNING]);
-	}
-	else if (name == "errorColor")
-	{
-		return formatColor(_colors[Message::PRIO_ERROR]);
-	}
-	else if (name == "criticalColor")
-	{
-		return formatColor(_colors[Message::PRIO_CRITICAL]);
-	}
-	else if (name == "fatalColor")
-	{
-		return formatColor(_colors[Message::PRIO_FATAL]);
-	}
-	else
-	{
-		return Channel::getProperty(name);
-	}
-}
-
-
-WORD WindowsColorConsoleChannel::parseColor(const std::string& color) const
-{
-	if (icompare(color, "default") == 0)
-		return _colors[0];
-	else if (icompare(color, "black") == 0)
-		return CC_BLACK;
-	else if (icompare(color, "red") == 0)
-		return CC_RED;
-	else if (icompare(color, "green") == 0)
-		return CC_GREEN;
-	else if (icompare(color, "brown") == 0)
-		return CC_BROWN;
-	else if (icompare(color, "blue") == 0)
-		return CC_BLUE;
-	else if (icompare(color, "magenta") == 0)
-		return CC_MAGENTA;
-	else if (icompare(color, "cyan") == 0)
-		return CC_CYAN;
-	else if (icompare(color, "gray") == 0)
-		return CC_GRAY;
-	else if (icompare(color, "darkGray") == 0)
-		return CC_DARKGRAY;
-	else if (icompare(color, "lightRed") == 0)
-		return CC_LIGHTRED;
-	else if (icompare(color, "lightGreen") == 0)
-		return CC_LIGHTGREEN;
-	else if (icompare(color, "yellow") == 0)
-		return CC_YELLOW;
-	else if (icompare(color, "lightBlue") == 0)
-		return CC_LIGHTBLUE;
-	else if (icompare(color, "lightMagenta") == 0)
-		return CC_LIGHTMAGENTA;
-	else if (icompare(color, "lightCyan") == 0)
-		return CC_LIGHTCYAN;
-	else if (icompare(color, "white") == 0)
-		return CC_WHITE;
-	else throw InvalidArgumentException("Invalid color value", color);
-}
-
-
-std::string WindowsColorConsoleChannel::formatColor(WORD color) const
-{
-	switch (color)
-	{
-	case CC_BLACK:        return "black";
-	case CC_RED:          return "red";
-	case CC_GREEN:        return "green";
-	case CC_BROWN:        return "brown";
-	case CC_BLUE:         return "blue";
-	case CC_MAGENTA:      return "magenta";
-	case CC_CYAN:         return "cyan";
-	case CC_GRAY:         return "gray";
-	case CC_DARKGRAY:     return "darkGray";
-	case CC_LIGHTRED:     return "lightRed";
-	case CC_LIGHTGREEN:   return "lightGreen";
-	case CC_YELLOW:       return "yellow";
-	case CC_LIGHTBLUE:    return "lightBlue";
-	case CC_LIGHTMAGENTA: return "lightMagenta";
-	case CC_LIGHTCYAN:    return "lightCyan";
-	case CC_WHITE:        return "white";
-	default:              return "invalid";
-	}
-}
-
-
-void WindowsColorConsoleChannel::initColors()
-{
-	if (!_isFile)
-	{
-		CONSOLE_SCREEN_BUFFER_INFO csbi;
-		GetConsoleScreenBufferInfo(_hConsole, &csbi);
-		_colors[0] = csbi.wAttributes;
-	}
-	else
-	{
-		_colors[0] = CC_WHITE;
-	}
-	_colors[Message::PRIO_FATAL]       = CC_LIGHTRED;
-	_colors[Message::PRIO_CRITICAL]    = CC_LIGHTRED;
-	_colors[Message::PRIO_ERROR]       = CC_LIGHTRED;
-	_colors[Message::PRIO_WARNING]     = CC_YELLOW;
-	_colors[Message::PRIO_NOTICE]      = _colors[0];
-	_colors[Message::PRIO_INFORMATION] = _colors[0];
-	_colors[Message::PRIO_DEBUG]       = CC_GRAY;
-	_colors[Message::PRIO_TRACE]       = CC_GRAY;
-}
-
-
-} // namespace Poco
diff --git a/base/poco/Foundation/src/adler32.c b/base/poco/Foundation/src/adler32.c
deleted file mode 100644
index 8fa49192ada..00000000000
--- a/base/poco/Foundation/src/adler32.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-
-#define local static
-
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-
-#define BASE 65521U     /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* use NO_DIVIDE if your processor does not do division in hardware --
-   try it both ways to see which is faster */
-#ifdef NO_DIVIDE
-/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
-   (thank you to John Reiser for pointing this out) */
-#  define CHOP(a) \
-    do { \
-        unsigned long tmp = a >> 16; \
-        a &= 0xffffUL; \
-        a += (tmp << 4) - tmp; \
-    } while (0)
-#  define MOD28(a) \
-    do { \
-        CHOP(a); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#  define MOD(a) \
-    do { \
-        CHOP(a); \
-        MOD28(a); \
-    } while (0)
-#  define MOD63(a) \
-    do { /* this assumes a is not negative */ \
-        z_off64_t tmp = a >> 32; \
-        a &= 0xffffffffL; \
-        a += (tmp << 8) - (tmp << 5) + tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#else
-#  define MOD(a) a %= BASE
-#  define MOD28(a) a %= BASE
-#  define MOD63(a) a %= BASE
-#endif
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_z(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    z_size_t len;
-{
-    unsigned long sum2;
-    unsigned n;
-
-    /* split Adler-32 into component sums */
-    sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1) {
-        adler += buf[0];
-        if (adler >= BASE)
-            adler -= BASE;
-        sum2 += adler;
-        if (sum2 >= BASE)
-            sum2 -= BASE;
-        return adler | (sum2 << 16);
-    }
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == Z_NULL)
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16) {
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        if (adler >= BASE)
-            adler -= BASE;
-        MOD28(sum2);            /* only added so many BASE's */
-        return adler | (sum2 << 16);
-    }
-
-    /* do length NMAX blocks -- requires just one modulo operation */
-    while (len >= NMAX) {
-        len -= NMAX;
-        n = NMAX / 16;          /* NMAX is divisible by 16 */
-        do {
-            DO16(buf);          /* 16 sums unrolled */
-            buf += 16;
-        } while (--n);
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* do remaining bytes (less than NMAX, still just one modulo) */
-    if (len) {                  /* avoid modulos if none remaining */
-        while (len >= 16) {
-            len -= 16;
-            DO16(buf);
-            buf += 16;
-        }
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* return recombined sums */
-    return adler | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
-    return adler32_z(adler, buf, len);
-}
-
-/* ========================================================================= */
-local uLong adler32_combine_(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
-    unsigned long sum1;
-    unsigned long sum2;
-    unsigned rem;
-
-    /* for negative len, return invalid adler32 as a clue for debugging */
-    if (len2 < 0)
-        return 0xffffffffUL;
-
-    /* the derivation of this formula is left as an exercise for the reader */
-    MOD63(len2);                /* assumes len2 >= 0 */
-    rem = (unsigned)len2;
-    sum1 = adler1 & 0xffff;
-    sum2 = rem * sum1;
-    MOD(sum2);
-    sum1 += (adler2 & 0xffff) + BASE - 1;
-    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
-    if (sum2 >= BASE) sum2 -= BASE;
-    return sum1 | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
-    return adler32_combine_(adler1, adler2, len2);
-}
-
-uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
-    return adler32_combine_(adler1, adler2, len2);
-}
diff --git a/base/poco/Foundation/src/bignum-dtoa.cc b/base/poco/Foundation/src/bignum-dtoa.cc
deleted file mode 100644
index 5a44adfccf3..00000000000
--- a/base/poco/Foundation/src/bignum-dtoa.cc
+++ /dev/null
@@ -1,641 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <math.h>
-
-#include "bignum-dtoa.h"
-
-#include "bignum.h"
-#include "ieee.h"
-
-namespace double_conversion {
-
-static int NormalizedExponent(uint64_t significand, int exponent) {
-  ASSERT(significand != 0);
-  while ((significand & Double::kHiddenBit) == 0) {
-    significand = significand << 1;
-    exponent = exponent - 1;
-  }
-  return exponent;
-}
-
-
-// Forward declarations:
-// Returns an estimation of k such that 10^(k-1) <= v < 10^k.
-static int EstimatePower(int exponent);
-// Computes v / 10^estimated_power exactly, as a ratio of two bignums, numerator
-// and denominator.
-static void InitialScaledStartValues(uint64_t significand,
-                                     int exponent,
-                                     bool lower_boundary_is_closer,
-                                     int estimated_power,
-                                     bool need_boundary_deltas,
-                                     Bignum* numerator,
-                                     Bignum* denominator,
-                                     Bignum* delta_minus,
-                                     Bignum* delta_plus);
-// Multiplies numerator/denominator so that its values lies in the range 1-10.
-// Returns decimal_point s.t.
-//  v = numerator'/denominator' * 10^(decimal_point-1)
-//     where numerator' and denominator' are the values of numerator and
-//     denominator after the call to this function.
-static void FixupMultiply10(int estimated_power, bool is_even,
-                            int* decimal_point,
-                            Bignum* numerator, Bignum* denominator,
-                            Bignum* delta_minus, Bignum* delta_plus);
-// Generates digits from the left to the right and stops when the generated
-// digits yield the shortest decimal representation of v.
-static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator,
-                                   Bignum* delta_minus, Bignum* delta_plus,
-                                   bool is_even,
-                                   Vector<char> buffer, int* length);
-// Generates 'requested_digits' after the decimal point.
-static void BignumToFixed(int requested_digits, int* decimal_point,
-                          Bignum* numerator, Bignum* denominator,
-                          Vector<char>(buffer), int* length);
-// Generates 'count' digits of numerator/denominator.
-// Once 'count' digits have been produced rounds the result depending on the
-// remainder (remainders of exactly .5 round upwards). Might update the
-// decimal_point when rounding up (for example for 0.9999).
-static void GenerateCountedDigits(int count, int* decimal_point,
-                                  Bignum* numerator, Bignum* denominator,
-                                  Vector<char>(buffer), int* length);
-
-
-void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits,
-                Vector<char> buffer, int* length, int* decimal_point) {
-  ASSERT(v > 0);
-  ASSERT(!Double(v).IsSpecial());
-  uint64_t significand;
-  int exponent;
-  bool lower_boundary_is_closer;
-  if (mode == BIGNUM_DTOA_SHORTEST_SINGLE) {
-    float f = static_cast<float>(v);
-    ASSERT(f == v);
-    significand = Single(f).Significand();
-    exponent = Single(f).Exponent();
-    lower_boundary_is_closer = Single(f).LowerBoundaryIsCloser();
-  } else {
-    significand = Double(v).Significand();
-    exponent = Double(v).Exponent();
-    lower_boundary_is_closer = Double(v).LowerBoundaryIsCloser();
-  }
-  bool need_boundary_deltas =
-      (mode == BIGNUM_DTOA_SHORTEST || mode == BIGNUM_DTOA_SHORTEST_SINGLE);
-
-  bool is_even = (significand & 1) == 0;
-  int normalized_exponent = NormalizedExponent(significand, exponent);
-  // estimated_power might be too low by 1.
-  int estimated_power = EstimatePower(normalized_exponent);
-
-  // Shortcut for Fixed.
-  // The requested digits correspond to the digits after the point. If the
-  // number is much too small, then there is no need in trying to get any
-  // digits.
-  if (mode == BIGNUM_DTOA_FIXED && -estimated_power - 1 > requested_digits) {
-    buffer[0] = '\0';
-    *length = 0;
-    // Set decimal-point to -requested_digits. This is what Gay does.
-    // Note that it should not have any effect anyways since the string is
-    // empty.
-    *decimal_point = -requested_digits;
-    return;
-  }
-
-  Bignum numerator;
-  Bignum denominator;
-  Bignum delta_minus;
-  Bignum delta_plus;
-  // Make sure the bignum can grow large enough. The smallest double equals
-  // 4e-324. In this case the denominator needs fewer than 324*4 binary digits.
-  // The maximum double is 1.7976931348623157e308 which needs fewer than
-  // 308*4 binary digits.
-  ASSERT(Bignum::kMaxSignificantBits >= 324*4);
-  InitialScaledStartValues(significand, exponent, lower_boundary_is_closer,
-                           estimated_power, need_boundary_deltas,
-                           &numerator, &denominator,
-                           &delta_minus, &delta_plus);
-  // We now have v = (numerator / denominator) * 10^estimated_power.
-  FixupMultiply10(estimated_power, is_even, decimal_point,
-                  &numerator, &denominator,
-                  &delta_minus, &delta_plus);
-  // We now have v = (numerator / denominator) * 10^(decimal_point-1), and
-  //  1 <= (numerator + delta_plus) / denominator < 10
-  switch (mode) {
-    case BIGNUM_DTOA_SHORTEST:
-    case BIGNUM_DTOA_SHORTEST_SINGLE:
-      GenerateShortestDigits(&numerator, &denominator,
-                             &delta_minus, &delta_plus,
-                             is_even, buffer, length);
-      break;
-    case BIGNUM_DTOA_FIXED:
-      BignumToFixed(requested_digits, decimal_point,
-                    &numerator, &denominator,
-                    buffer, length);
-      break;
-    case BIGNUM_DTOA_PRECISION:
-      GenerateCountedDigits(requested_digits, decimal_point,
-                            &numerator, &denominator,
-                            buffer, length);
-      break;
-    default:
-      UNREACHABLE();
-  }
-  buffer[*length] = '\0';
-}
-
-
-// The procedure starts generating digits from the left to the right and stops
-// when the generated digits yield the shortest decimal representation of v. A
-// decimal representation of v is a number lying closer to v than to any other
-// double, so it converts to v when read.
-//
-// This is true if d, the decimal representation, is between m- and m+, the
-// upper and lower boundaries. d must be strictly between them if !is_even.
-//           m- := (numerator - delta_minus) / denominator
-//           m+ := (numerator + delta_plus) / denominator
-//
-// Precondition: 0 <= (numerator+delta_plus) / denominator < 10.
-//   If 1 <= (numerator+delta_plus) / denominator < 10 then no leading 0 digit
-//   will be produced. This should be the standard precondition.
-static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator,
-                                   Bignum* delta_minus, Bignum* delta_plus,
-                                   bool is_even,
-                                   Vector<char> buffer, int* length) {
-  // Small optimization: if delta_minus and delta_plus are the same just reuse
-  // one of the two bignums.
-  if (Bignum::Equal(*delta_minus, *delta_plus)) {
-    delta_plus = delta_minus;
-  }
-  *length = 0;
-  for (;;) {
-    uint16_t digit;
-    digit = numerator->DivideModuloIntBignum(*denominator);
-    ASSERT(digit <= 9);  // digit is a uint16_t and therefore always positive.
-    // digit = numerator / denominator (integer division).
-    // numerator = numerator % denominator.
-    buffer[(*length)++] = static_cast<char>(digit + '0');
-
-    // Can we stop already?
-    // If the remainder of the division is less than the distance to the lower
-    // boundary we can stop. In this case we simply round down (discarding the
-    // remainder).
-    // Similarly we test if we can round up (using the upper boundary).
-    bool in_delta_room_minus;
-    bool in_delta_room_plus;
-    if (is_even) {
-      in_delta_room_minus = Bignum::LessEqual(*numerator, *delta_minus);
-    } else {
-      in_delta_room_minus = Bignum::Less(*numerator, *delta_minus);
-    }
-    if (is_even) {
-      in_delta_room_plus =
-          Bignum::PlusCompare(*numerator, *delta_plus, *denominator) >= 0;
-    } else {
-      in_delta_room_plus =
-          Bignum::PlusCompare(*numerator, *delta_plus, *denominator) > 0;
-    }
-    if (!in_delta_room_minus && !in_delta_room_plus) {
-      // Prepare for next iteration.
-      numerator->Times10();
-      delta_minus->Times10();
-      // We optimized delta_plus to be equal to delta_minus (if they share the
-      // same value). So don't multiply delta_plus if they point to the same
-      // object.
-      if (delta_minus != delta_plus) {
-        delta_plus->Times10();
-      }
-    } else if (in_delta_room_minus && in_delta_room_plus) {
-      // Let's see if 2*numerator < denominator.
-      // If yes, then the next digit would be < 5 and we can round down.
-      int compare = Bignum::PlusCompare(*numerator, *numerator, *denominator);
-      if (compare < 0) {
-        // Remaining digits are less than .5. -> Round down (== do nothing).
-      } else if (compare > 0) {
-        // Remaining digits are more than .5 of denominator. -> Round up.
-        // Note that the last digit could not be a '9' as otherwise the whole
-        // loop would have stopped earlier.
-        // We still have an assert here in case the preconditions were not
-        // satisfied.
-        ASSERT(buffer[(*length) - 1] != '9');
-        buffer[(*length) - 1]++;
-      } else {
-        // Halfway case.
-        // TODO(floitsch): need a way to solve half-way cases.
-        //   For now let's round towards even (since this is what Gay seems to
-        //   do).
-
-        if ((buffer[(*length) - 1] - '0') % 2 == 0) {
-          // Round down => Do nothing.
-        } else {
-          ASSERT(buffer[(*length) - 1] != '9');
-          buffer[(*length) - 1]++;
-        }
-      }
-      return;
-    } else if (in_delta_room_minus) {
-      // Round down (== do nothing).
-      return;
-    } else {  // in_delta_room_plus
-      // Round up.
-      // Note again that the last digit could not be '9' since this would have
-      // stopped the loop earlier.
-      // We still have an ASSERT here, in case the preconditions were not
-      // satisfied.
-      ASSERT(buffer[(*length) -1] != '9');
-      buffer[(*length) - 1]++;
-      return;
-    }
-  }
-}
-
-
-// Let v = numerator / denominator < 10.
-// Then we generate 'count' digits of d = x.xxxxx... (without the decimal point)
-// from left to right. Once 'count' digits have been produced we decide whether
-// to round up or down. Remainders of exactly .5 round upwards. Numbers such
-// as 9.999999 propagate a carry all the way, and change the
-// exponent (decimal_point), when rounding upwards.
-static void GenerateCountedDigits(int count, int* decimal_point,
-                                  Bignum* numerator, Bignum* denominator,
-                                  Vector<char> buffer, int* length) {
-  ASSERT(count >= 0);
-  for (int i = 0; i < count - 1; ++i) {
-    uint16_t digit;
-    digit = numerator->DivideModuloIntBignum(*denominator);
-    ASSERT(digit <= 9);  // digit is a uint16_t and therefore always positive.
-    // digit = numerator / denominator (integer division).
-    // numerator = numerator % denominator.
-    buffer[i] = static_cast<char>(digit + '0');
-    // Prepare for next iteration.
-    numerator->Times10();
-  }
-  // Generate the last digit.
-  uint16_t digit;
-  digit = numerator->DivideModuloIntBignum(*denominator);
-  if (Bignum::PlusCompare(*numerator, *numerator, *denominator) >= 0) {
-    digit++;
-  }
-  ASSERT(digit <= 10);
-  buffer[count - 1] = static_cast<char>(digit + '0');
-  // Correct bad digits (in case we had a sequence of '9's). Propagate the
-  // carry until we hat a non-'9' or til we reach the first digit.
-  for (int i = count - 1; i > 0; --i) {
-    if (buffer[i] != '0' + 10) break;
-    buffer[i] = '0';
-    buffer[i - 1]++;
-  }
-  if (buffer[0] == '0' + 10) {
-    // Propagate a carry past the top place.
-    buffer[0] = '1';
-    (*decimal_point)++;
-  }
-  *length = count;
-}
-
-
-// Generates 'requested_digits' after the decimal point. It might omit
-// trailing '0's. If the input number is too small then no digits at all are
-// generated (ex.: 2 fixed digits for 0.00001).
-//
-// Input verifies:  1 <= (numerator + delta) / denominator < 10.
-static void BignumToFixed(int requested_digits, int* decimal_point,
-                          Bignum* numerator, Bignum* denominator,
-                          Vector<char>(buffer), int* length) {
-  // Note that we have to look at more than just the requested_digits, since
-  // a number could be rounded up. Example: v=0.5 with requested_digits=0.
-  // Even though the power of v equals 0 we can't just stop here.
-  if (-(*decimal_point) > requested_digits) {
-    // The number is definitively too small.
-    // Ex: 0.001 with requested_digits == 1.
-    // Set decimal-point to -requested_digits. This is what Gay does.
-    // Note that it should not have any effect anyways since the string is
-    // empty.
-    *decimal_point = -requested_digits;
-    *length = 0;
-    return;
-  } else if (-(*decimal_point) == requested_digits) {
-    // We only need to verify if the number rounds down or up.
-    // Ex: 0.04 and 0.06 with requested_digits == 1.
-    ASSERT(*decimal_point == -requested_digits);
-    // Initially the fraction lies in range (1, 10]. Multiply the denominator
-    // by 10 so that we can compare more easily.
-    denominator->Times10();
-    if (Bignum::PlusCompare(*numerator, *numerator, *denominator) >= 0) {
-      // If the fraction is >= 0.5 then we have to include the rounded
-      // digit.
-      buffer[0] = '1';
-      *length = 1;
-      (*decimal_point)++;
-    } else {
-      // Note that we caught most of similar cases earlier.
-      *length = 0;
-    }
-    return;
-  } else {
-    // The requested digits correspond to the digits after the point.
-    // The variable 'needed_digits' includes the digits before the point.
-    int needed_digits = (*decimal_point) + requested_digits;
-    GenerateCountedDigits(needed_digits, decimal_point,
-                          numerator, denominator,
-                          buffer, length);
-  }
-}
-
-
-// Returns an estimation of k such that 10^(k-1) <= v < 10^k where
-// v = f * 2^exponent and 2^52 <= f < 2^53.
-// v is hence a normalized double with the given exponent. The output is an
-// approximation for the exponent of the decimal approimation .digits * 10^k.
-//
-// The result might undershoot by 1 in which case 10^k <= v < 10^k+1.
-// Note: this property holds for v's upper boundary m+ too.
-//    10^k <= m+ < 10^k+1.
-//   (see explanation below).
-//
-// Examples:
-//  EstimatePower(0)   => 16
-//  EstimatePower(-52) => 0
-//
-// Note: e >= 0 => EstimatedPower(e) > 0. No similar claim can be made for e<0.
-static int EstimatePower(int exponent) {
-  // This function estimates log10 of v where v = f*2^e (with e == exponent).
-  // Note that 10^floor(log10(v)) <= v, but v <= 10^ceil(log10(v)).
-  // Note that f is bounded by its container size. Let p = 53 (the double's
-  // significand size). Then 2^(p-1) <= f < 2^p.
-  //
-  // Given that log10(v) == log2(v)/log2(10) and e+(len(f)-1) is quite close
-  // to log2(v) the function is simplified to (e+(len(f)-1)/log2(10)).
-  // The computed number undershoots by less than 0.631 (when we compute log3
-  // and not log10).
-  //
-  // Optimization: since we only need an approximated result this computation
-  // can be performed on 64 bit integers. On x86/x64 architecture the speedup is
-  // not really measurable, though.
-  //
-  // Since we want to avoid overshooting we decrement by 1e10 so that
-  // floating-point imprecisions don't affect us.
-  //
-  // Explanation for v's boundary m+: the computation takes advantage of
-  // the fact that 2^(p-1) <= f < 2^p. Boundaries still satisfy this requirement
-  // (even for denormals where the delta can be much more important).
-
-  const double k1Log10 = 0.30102999566398114;  // 1/lg(10)
-
-  // For doubles len(f) == 53 (don't forget the hidden bit).
-  const int kSignificandSize = Double::kSignificandSize;
-  double estimate = ceil((exponent + kSignificandSize - 1) * k1Log10 - 1e-10);
-  return static_cast<int>(estimate);
-}
-
-
-// See comments for InitialScaledStartValues.
-static void InitialScaledStartValuesPositiveExponent(
-    uint64_t significand, int exponent,
-    int estimated_power, bool need_boundary_deltas,
-    Bignum* numerator, Bignum* denominator,
-    Bignum* delta_minus, Bignum* delta_plus) {
-  // A positive exponent implies a positive power.
-  ASSERT(estimated_power >= 0);
-  // Since the estimated_power is positive we simply multiply the denominator
-  // by 10^estimated_power.
-
-  // numerator = v.
-  numerator->AssignUInt64(significand);
-  numerator->ShiftLeft(exponent);
-  // denominator = 10^estimated_power.
-  denominator->AssignPowerUInt16(10, estimated_power);
-
-  if (need_boundary_deltas) {
-    // Introduce a common denominator so that the deltas to the boundaries are
-    // integers.
-    denominator->ShiftLeft(1);
-    numerator->ShiftLeft(1);
-    // Let v = f * 2^e, then m+ - v = 1/2 * 2^e; With the common
-    // denominator (of 2) delta_plus equals 2^e.
-    delta_plus->AssignUInt16(1);
-    delta_plus->ShiftLeft(exponent);
-    // Same for delta_minus. The adjustments if f == 2^p-1 are done later.
-    delta_minus->AssignUInt16(1);
-    delta_minus->ShiftLeft(exponent);
-  }
-}
-
-
-// See comments for InitialScaledStartValues
-static void InitialScaledStartValuesNegativeExponentPositivePower(
-    uint64_t significand, int exponent,
-    int estimated_power, bool need_boundary_deltas,
-    Bignum* numerator, Bignum* denominator,
-    Bignum* delta_minus, Bignum* delta_plus) {
-  // v = f * 2^e with e < 0, and with estimated_power >= 0.
-  // This means that e is close to 0 (have a look at how estimated_power is
-  // computed).
-
-  // numerator = significand
-  //  since v = significand * 2^exponent this is equivalent to
-  //  numerator = v * / 2^-exponent
-  numerator->AssignUInt64(significand);
-  // denominator = 10^estimated_power * 2^-exponent (with exponent < 0)
-  denominator->AssignPowerUInt16(10, estimated_power);
-  denominator->ShiftLeft(-exponent);
-
-  if (need_boundary_deltas) {
-    // Introduce a common denominator so that the deltas to the boundaries are
-    // integers.
-    denominator->ShiftLeft(1);
-    numerator->ShiftLeft(1);
-    // Let v = f * 2^e, then m+ - v = 1/2 * 2^e; With the common
-    // denominator (of 2) delta_plus equals 2^e.
-    // Given that the denominator already includes v's exponent the distance
-    // to the boundaries is simply 1.
-    delta_plus->AssignUInt16(1);
-    // Same for delta_minus. The adjustments if f == 2^p-1 are done later.
-    delta_minus->AssignUInt16(1);
-  }
-}
-
-
-// See comments for InitialScaledStartValues
-static void InitialScaledStartValuesNegativeExponentNegativePower(
-    uint64_t significand, int exponent,
-    int estimated_power, bool need_boundary_deltas,
-    Bignum* numerator, Bignum* denominator,
-    Bignum* delta_minus, Bignum* delta_plus) {
-  // Instead of multiplying the denominator with 10^estimated_power we
-  // multiply all values (numerator and deltas) by 10^-estimated_power.
-
-  // Use numerator as temporary container for power_ten.
-  Bignum* power_ten = numerator;
-  power_ten->AssignPowerUInt16(10, -estimated_power);
-
-  if (need_boundary_deltas) {
-    // Since power_ten == numerator we must make a copy of 10^estimated_power
-    // before we complete the computation of the numerator.
-    // delta_plus = delta_minus = 10^estimated_power
-    delta_plus->AssignBignum(*power_ten);
-    delta_minus->AssignBignum(*power_ten);
-  }
-
-  // numerator = significand * 2 * 10^-estimated_power
-  //  since v = significand * 2^exponent this is equivalent to
-  // numerator = v * 10^-estimated_power * 2 * 2^-exponent.
-  // Remember: numerator has been abused as power_ten. So no need to assign it
-  //  to itself.
-  ASSERT(numerator == power_ten);
-  numerator->MultiplyByUInt64(significand);
-
-  // denominator = 2 * 2^-exponent with exponent < 0.
-  denominator->AssignUInt16(1);
-  denominator->ShiftLeft(-exponent);
-
-  if (need_boundary_deltas) {
-    // Introduce a common denominator so that the deltas to the boundaries are
-    // integers.
-    numerator->ShiftLeft(1);
-    denominator->ShiftLeft(1);
-    // With this shift the boundaries have their correct value, since
-    // delta_plus = 10^-estimated_power, and
-    // delta_minus = 10^-estimated_power.
-    // These assignments have been done earlier.
-    // The adjustments if f == 2^p-1 (lower boundary is closer) are done later.
-  }
-}
-
-
-// Let v = significand * 2^exponent.
-// Computes v / 10^estimated_power exactly, as a ratio of two bignums, numerator
-// and denominator. The functions GenerateShortestDigits and
-// GenerateCountedDigits will then convert this ratio to its decimal
-// representation d, with the required accuracy.
-// Then d * 10^estimated_power is the representation of v.
-// (Note: the fraction and the estimated_power might get adjusted before
-// generating the decimal representation.)
-//
-// The initial start values consist of:
-//  - a scaled numerator: s.t. numerator/denominator == v / 10^estimated_power.
-//  - a scaled (common) denominator.
-//  optionally (used by GenerateShortestDigits to decide if it has the shortest
-//  decimal converting back to v):
-//  - v - m-: the distance to the lower boundary.
-//  - m+ - v: the distance to the upper boundary.
-//
-// v, m+, m-, and therefore v - m- and m+ - v all share the same denominator.
-//
-// Let ep == estimated_power, then the returned values will satisfy:
-//  v / 10^ep = numerator / denominator.
-//  v's boundaries m- and m+:
-//    m- / 10^ep == v / 10^ep - delta_minus / denominator
-//    m+ / 10^ep == v / 10^ep + delta_plus / denominator
-//  Or in other words:
-//    m- == v - delta_minus * 10^ep / denominator;
-//    m+ == v + delta_plus * 10^ep / denominator;
-//
-// Since 10^(k-1) <= v < 10^k    (with k == estimated_power)
-//  or       10^k <= v < 10^(k+1)
-//  we then have 0.1 <= numerator/denominator < 1
-//           or    1 <= numerator/denominator < 10
-//
-// It is then easy to kickstart the digit-generation routine.
-//
-// The boundary-deltas are only filled if the mode equals BIGNUM_DTOA_SHORTEST
-// or BIGNUM_DTOA_SHORTEST_SINGLE.
-
-static void InitialScaledStartValues(uint64_t significand,
-                                     int exponent,
-                                     bool lower_boundary_is_closer,
-                                     int estimated_power,
-                                     bool need_boundary_deltas,
-                                     Bignum* numerator,
-                                     Bignum* denominator,
-                                     Bignum* delta_minus,
-                                     Bignum* delta_plus) {
-  if (exponent >= 0) {
-    InitialScaledStartValuesPositiveExponent(
-        significand, exponent, estimated_power, need_boundary_deltas,
-        numerator, denominator, delta_minus, delta_plus);
-  } else if (estimated_power >= 0) {
-    InitialScaledStartValuesNegativeExponentPositivePower(
-        significand, exponent, estimated_power, need_boundary_deltas,
-        numerator, denominator, delta_minus, delta_plus);
-  } else {
-    InitialScaledStartValuesNegativeExponentNegativePower(
-        significand, exponent, estimated_power, need_boundary_deltas,
-        numerator, denominator, delta_minus, delta_plus);
-  }
-
-  if (need_boundary_deltas && lower_boundary_is_closer) {
-    // The lower boundary is closer at half the distance of "normal" numbers.
-    // Increase the common denominator and adapt all but the delta_minus.
-    denominator->ShiftLeft(1);  // *2
-    numerator->ShiftLeft(1);    // *2
-    delta_plus->ShiftLeft(1);   // *2
-  }
-}
-
-
-// This routine multiplies numerator/denominator so that its values lies in the
-// range 1-10. That is after a call to this function we have:
-//    1 <= (numerator + delta_plus) /denominator < 10.
-// Let numerator the input before modification and numerator' the argument
-// after modification, then the output-parameter decimal_point is such that
-//  numerator / denominator * 10^estimated_power ==
-//    numerator' / denominator' * 10^(decimal_point - 1)
-// In some cases estimated_power was too low, and this is already the case. We
-// then simply adjust the power so that 10^(k-1) <= v < 10^k (with k ==
-// estimated_power) but do not touch the numerator or denominator.
-// Otherwise the routine multiplies the numerator and the deltas by 10.
-static void FixupMultiply10(int estimated_power, bool is_even,
-                            int* decimal_point,
-                            Bignum* numerator, Bignum* denominator,
-                            Bignum* delta_minus, Bignum* delta_plus) {
-  bool in_range;
-  if (is_even) {
-    // For IEEE doubles half-way cases (in decimal system numbers ending with 5)
-    // are rounded to the closest floating-point number with even significand.
-    in_range = Bignum::PlusCompare(*numerator, *delta_plus, *denominator) >= 0;
-  } else {
-    in_range = Bignum::PlusCompare(*numerator, *delta_plus, *denominator) > 0;
-  }
-  if (in_range) {
-    // Since numerator + delta_plus >= denominator we already have
-    // 1 <= numerator/denominator < 10. Simply update the estimated_power.
-    *decimal_point = estimated_power + 1;
-  } else {
-    *decimal_point = estimated_power;
-    numerator->Times10();
-    if (Bignum::Equal(*delta_minus, *delta_plus)) {
-      delta_minus->Times10();
-      delta_plus->AssignBignum(*delta_minus);
-    } else {
-      delta_minus->Times10();
-      delta_plus->Times10();
-    }
-  }
-}
-
-}  // namespace double_conversion
diff --git a/base/poco/Foundation/src/bignum-dtoa.h b/base/poco/Foundation/src/bignum-dtoa.h
deleted file mode 100644
index 6ee62aa23df..00000000000
--- a/base/poco/Foundation/src/bignum-dtoa.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef DOUBLE_CONVERSION_BIGNUM_DTOA_H_
-#define DOUBLE_CONVERSION_BIGNUM_DTOA_H_
-
-#include "utils.h"
-
-namespace double_conversion
-{
-
-enum BignumDtoaMode
-{
-    // Return the shortest correct representation.
-    // For example the output of 0.299999999999999988897 is (the less accurate but
-    // correct) 0.3.
-    BIGNUM_DTOA_SHORTEST,
-    // Same as BIGNUM_DTOA_SHORTEST but for single-precision floats.
-    BIGNUM_DTOA_SHORTEST_SINGLE,
-    // Return a fixed number of digits after the decimal point.
-    // For instance fixed(0.1, 4) becomes 0.1000
-    // If the input number is big, the output will be big.
-    BIGNUM_DTOA_FIXED,
-    // Return a fixed number of digits, no matter what the exponent is.
-    BIGNUM_DTOA_PRECISION
-};
-
-// Converts the given double 'v' to ascii.
-// The result should be interpreted as buffer * 10^(point-length).
-// The buffer will be null-terminated.
-//
-// The input v must be > 0 and different from NaN, and Infinity.
-//
-// The output depends on the given mode:
-//  - SHORTEST: produce the least amount of digits for which the internal
-//   identity requirement is still satisfied. If the digits are printed
-//   (together with the correct exponent) then reading this number will give
-//   'v' again. The buffer will choose the representation that is closest to
-//   'v'. If there are two at the same distance, than the number is round up.
-//   In this mode the 'requested_digits' parameter is ignored.
-//  - FIXED: produces digits necessary to print a given number with
-//   'requested_digits' digits after the decimal point. The produced digits
-//   might be too short in which case the caller has to fill the gaps with '0's.
-//   Example: toFixed(0.001, 5) is allowed to return buffer="1", point=-2.
-//   Halfway cases are rounded up. The call toFixed(0.15, 2) thus returns
-//     buffer="2", point=0.
-//   Note: the length of the returned buffer has no meaning wrt the significance
-//   of its digits. That is, just because it contains '0's does not mean that
-//   any other digit would not satisfy the internal identity requirement.
-//  - PRECISION: produces 'requested_digits' where the first digit is not '0'.
-//   Even though the length of produced digits usually equals
-//   'requested_digits', the function is allowed to return fewer digits, in
-//   which case the caller has to fill the missing digits with '0's.
-//   Halfway cases are again rounded up.
-// 'BignumDtoa' expects the given buffer to be big enough to hold all digits
-// and a terminating null-character.
-void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits, Vector<char> buffer, int * length, int * point);
-
-} // namespace double_conversion
-
-#endif // DOUBLE_CONVERSION_BIGNUM_DTOA_H_
diff --git a/base/poco/Foundation/src/bignum.cc b/base/poco/Foundation/src/bignum.cc
deleted file mode 100644
index 2743d67e8d9..00000000000
--- a/base/poco/Foundation/src/bignum.cc
+++ /dev/null
@@ -1,766 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "bignum.h"
-#include "utils.h"
-
-namespace double_conversion {
-
-Bignum::Bignum()
-    : bigits_(bigits_buffer_, kBigitCapacity), used_digits_(0), exponent_(0) {
-  for (int i = 0; i < kBigitCapacity; ++i) {
-    bigits_[i] = 0;
-  }
-}
-
-
-template<typename S>
-static int BitSize(S value) {
-  (void) value;  // Mark variable as used.
-  return 8 * sizeof(value);
-}
-
-// Guaranteed to lie in one Bigit.
-void Bignum::AssignUInt16(uint16_t value) {
-  ASSERT(kBigitSize >= BitSize(value));
-  Zero();
-  if (value == 0) return;
-
-  EnsureCapacity(1);
-  bigits_[0] = value;
-  used_digits_ = 1;
-}
-
-
-void Bignum::AssignUInt64(uint64_t value) {
-  const int kUInt64Size = 64;
-
-  Zero();
-  if (value == 0) return;
-
-  int needed_bigits = kUInt64Size / kBigitSize + 1;
-  EnsureCapacity(needed_bigits);
-  for (int i = 0; i < needed_bigits; ++i) {
-    bigits_[i] = value & kBigitMask;
-    value = value >> kBigitSize;
-  }
-  used_digits_ = needed_bigits;
-  Clamp();
-}
-
-
-void Bignum::AssignBignum(const Bignum& other) {
-  exponent_ = other.exponent_;
-  for (int i = 0; i < other.used_digits_; ++i) {
-    bigits_[i] = other.bigits_[i];
-  }
-  // Clear the excess digits (if there were any).
-  for (int i = other.used_digits_; i < used_digits_; ++i) {
-    bigits_[i] = 0;
-  }
-  used_digits_ = other.used_digits_;
-}
-
-
-static uint64_t ReadUInt64(Vector<const char> buffer,
-                           int from,
-                           int digits_to_read) {
-  uint64_t result = 0;
-  for (int i = from; i < from + digits_to_read; ++i) {
-    int digit = buffer[i] - '0';
-    ASSERT(0 <= digit && digit <= 9);
-    result = result * 10 + digit;
-  }
-  return result;
-}
-
-
-void Bignum::AssignDecimalString(Vector<const char> value) {
-  // 2^64 = 18446744073709551616 > 10^19
-  const int kMaxUint64DecimalDigits = 19;
-  Zero();
-  int length = value.length();
-  int pos = 0;
-  // Let's just say that each digit needs 4 bits.
-  while (length >= kMaxUint64DecimalDigits) {
-    uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits);
-    pos += kMaxUint64DecimalDigits;
-    length -= kMaxUint64DecimalDigits;
-    MultiplyByPowerOfTen(kMaxUint64DecimalDigits);
-    AddUInt64(digits);
-  }
-  uint64_t digits = ReadUInt64(value, pos, length);
-  MultiplyByPowerOfTen(length);
-  AddUInt64(digits);
-  Clamp();
-}
-
-
-static int HexCharValue(char c) {
-  if ('0' <= c && c <= '9') return c - '0';
-  if ('a' <= c && c <= 'f') return 10 + c - 'a';
-  ASSERT('A' <= c && c <= 'F');
-  return 10 + c - 'A';
-}
-
-
-void Bignum::AssignHexString(Vector<const char> value) {
-  Zero();
-  int length = value.length();
-
-  int needed_bigits = length * 4 / kBigitSize + 1;
-  EnsureCapacity(needed_bigits);
-  int string_index = length - 1;
-  for (int i = 0; i < needed_bigits - 1; ++i) {
-    // These bigits are guaranteed to be "full".
-    Chunk current_bigit = 0;
-    for (int j = 0; j < kBigitSize / 4; j++) {
-      current_bigit += HexCharValue(value[string_index--]) << (j * 4);
-    }
-    bigits_[i] = current_bigit;
-  }
-  used_digits_ = needed_bigits - 1;
-
-  Chunk most_significant_bigit = 0;  // Could be = 0;
-  for (int j = 0; j <= string_index; ++j) {
-    most_significant_bigit <<= 4;
-    most_significant_bigit += HexCharValue(value[j]);
-  }
-  if (most_significant_bigit != 0) {
-    bigits_[used_digits_] = most_significant_bigit;
-    used_digits_++;
-  }
-  Clamp();
-}
-
-
-void Bignum::AddUInt64(uint64_t operand) {
-  if (operand == 0) return;
-  Bignum other;
-  other.AssignUInt64(operand);
-  AddBignum(other);
-}
-
-
-void Bignum::AddBignum(const Bignum& other) {
-  ASSERT(IsClamped());
-  ASSERT(other.IsClamped());
-
-  // If this has a greater exponent than other append zero-bigits to this.
-  // After this call exponent_ <= other.exponent_.
-  Align(other);
-
-  // There are two possibilities:
-  //   aaaaaaaaaaa 0000  (where the 0s represent a's exponent)
-  //     bbbbb 00000000
-  //   ----------------
-  //   ccccccccccc 0000
-  // or
-  //    aaaaaaaaaa 0000
-  //  bbbbbbbbb 0000000
-  //  -----------------
-  //  cccccccccccc 0000
-  // In both cases we might need a carry bigit.
-
-  EnsureCapacity(1 + Max(BigitLength(), other.BigitLength()) - exponent_);
-  Chunk carry = 0;
-  int bigit_pos = other.exponent_ - exponent_;
-  ASSERT(bigit_pos >= 0);
-  for (int i = 0; i < other.used_digits_; ++i) {
-    Chunk sum = bigits_[bigit_pos] + other.bigits_[i] + carry;
-    bigits_[bigit_pos] = sum & kBigitMask;
-    carry = sum >> kBigitSize;
-    bigit_pos++;
-  }
-
-  while (carry != 0) {
-    Chunk sum = bigits_[bigit_pos] + carry;
-    bigits_[bigit_pos] = sum & kBigitMask;
-    carry = sum >> kBigitSize;
-    bigit_pos++;
-  }
-  used_digits_ = Max(bigit_pos, used_digits_);
-  ASSERT(IsClamped());
-}
-
-
-void Bignum::SubtractBignum(const Bignum& other) {
-  ASSERT(IsClamped());
-  ASSERT(other.IsClamped());
-  // We require this to be bigger than other.
-  ASSERT(LessEqual(other, *this));
-
-  Align(other);
-
-  int offset = other.exponent_ - exponent_;
-  Chunk borrow = 0;
-  int i;
-  for (i = 0; i < other.used_digits_; ++i) {
-    ASSERT((borrow == 0) || (borrow == 1));
-    Chunk difference = bigits_[i + offset] - other.bigits_[i] - borrow;
-    bigits_[i + offset] = difference & kBigitMask;
-    borrow = difference >> (kChunkSize - 1);
-  }
-  while (borrow != 0) {
-    Chunk difference = bigits_[i + offset] - borrow;
-    bigits_[i + offset] = difference & kBigitMask;
-    borrow = difference >> (kChunkSize - 1);
-    ++i;
-  }
-  Clamp();
-}
-
-
-void Bignum::ShiftLeft(int shift_amount) {
-  if (used_digits_ == 0) return;
-  exponent_ += shift_amount / kBigitSize;
-  int local_shift = shift_amount % kBigitSize;
-  EnsureCapacity(used_digits_ + 1);
-  BigitsShiftLeft(local_shift);
-}
-
-
-void Bignum::MultiplyByUInt32(uint32_t factor) {
-  if (factor == 1) return;
-  if (factor == 0) {
-    Zero();
-    return;
-  }
-  if (used_digits_ == 0) return;
-
-  // The product of a bigit with the factor is of size kBigitSize + 32.
-  // Assert that this number + 1 (for the carry) fits into double chunk.
-  ASSERT(kDoubleChunkSize >= kBigitSize + 32 + 1);
-  DoubleChunk carry = 0;
-  for (int i = 0; i < used_digits_; ++i) {
-    DoubleChunk product = static_cast<DoubleChunk>(factor) * bigits_[i] + carry;
-    bigits_[i] = static_cast<Chunk>(product & kBigitMask);
-    carry = (product >> kBigitSize);
-  }
-  while (carry != 0) {
-    EnsureCapacity(used_digits_ + 1);
-    bigits_[used_digits_] = carry & kBigitMask;
-    used_digits_++;
-    carry >>= kBigitSize;
-  }
-}
-
-
-void Bignum::MultiplyByUInt64(uint64_t factor) {
-  if (factor == 1) return;
-  if (factor == 0) {
-    Zero();
-    return;
-  }
-  ASSERT(kBigitSize < 32);
-  uint64_t carry = 0;
-  uint64_t low = factor & 0xFFFFFFFF;
-  uint64_t high = factor >> 32;
-  for (int i = 0; i < used_digits_; ++i) {
-    uint64_t product_low = low * bigits_[i];
-    uint64_t product_high = high * bigits_[i];
-    uint64_t tmp = (carry & kBigitMask) + product_low;
-    bigits_[i] = tmp & kBigitMask;
-    carry = (carry >> kBigitSize) + (tmp >> kBigitSize) +
-        (product_high << (32 - kBigitSize));
-  }
-  while (carry != 0) {
-    EnsureCapacity(used_digits_ + 1);
-    bigits_[used_digits_] = carry & kBigitMask;
-    used_digits_++;
-    carry >>= kBigitSize;
-  }
-}
-
-
-void Bignum::MultiplyByPowerOfTen(int exponent) {
-  const uint64_t kFive27 = UINT64_2PART_C(0x6765c793, fa10079d);
-  const uint16_t kFive1 = 5;
-  const uint16_t kFive2 = kFive1 * 5;
-  const uint16_t kFive3 = kFive2 * 5;
-  const uint16_t kFive4 = kFive3 * 5;
-  const uint16_t kFive5 = kFive4 * 5;
-  const uint16_t kFive6 = kFive5 * 5;
-  const uint32_t kFive7 = kFive6 * 5;
-  const uint32_t kFive8 = kFive7 * 5;
-  const uint32_t kFive9 = kFive8 * 5;
-  const uint32_t kFive10 = kFive9 * 5;
-  const uint32_t kFive11 = kFive10 * 5;
-  const uint32_t kFive12 = kFive11 * 5;
-  const uint32_t kFive13 = kFive12 * 5;
-  const uint32_t kFive1_to_12[] =
-      { kFive1, kFive2, kFive3, kFive4, kFive5, kFive6,
-        kFive7, kFive8, kFive9, kFive10, kFive11, kFive12 };
-
-  ASSERT(exponent >= 0);
-  if (exponent == 0) return;
-  if (used_digits_ == 0) return;
-
-  // We shift by exponent at the end just before returning.
-  int remaining_exponent = exponent;
-  while (remaining_exponent >= 27) {
-    MultiplyByUInt64(kFive27);
-    remaining_exponent -= 27;
-  }
-  while (remaining_exponent >= 13) {
-    MultiplyByUInt32(kFive13);
-    remaining_exponent -= 13;
-  }
-  if (remaining_exponent > 0) {
-    MultiplyByUInt32(kFive1_to_12[remaining_exponent - 1]);
-  }
-  ShiftLeft(exponent);
-}
-
-
-void Bignum::Square() {
-  ASSERT(IsClamped());
-  int product_length = 2 * used_digits_;
-  EnsureCapacity(product_length);
-
-  // Comba multiplication: compute each column separately.
-  // Example: r = a2a1a0 * b2b1b0.
-  //    r =  1    * a0b0 +
-  //        10    * (a1b0 + a0b1) +
-  //        100   * (a2b0 + a1b1 + a0b2) +
-  //        1000  * (a2b1 + a1b2) +
-  //        10000 * a2b2
-  //
-  // In the worst case we have to accumulate nb-digits products of digit*digit.
-  //
-  // Assert that the additional number of bits in a DoubleChunk are enough to
-  // sum up used_digits of Bigit*Bigit.
-  if ((1 << (2 * (kChunkSize - kBigitSize))) <= used_digits_) {
-    UNIMPLEMENTED();
-  }
-  DoubleChunk accumulator = 0;
-  // First shift the digits so we don't overwrite them.
-  int copy_offset = used_digits_;
-  for (int i = 0; i < used_digits_; ++i) {
-    bigits_[copy_offset + i] = bigits_[i];
-  }
-  // We have two loops to avoid some 'if's in the loop.
-  for (int i = 0; i < used_digits_; ++i) {
-    // Process temporary digit i with power i.
-    // The sum of the two indices must be equal to i.
-    int bigit_index1 = i;
-    int bigit_index2 = 0;
-    // Sum all of the sub-products.
-    while (bigit_index1 >= 0) {
-      Chunk chunk1 = bigits_[copy_offset + bigit_index1];
-      Chunk chunk2 = bigits_[copy_offset + bigit_index2];
-      accumulator += static_cast<DoubleChunk>(chunk1) * chunk2;
-      bigit_index1--;
-      bigit_index2++;
-    }
-    bigits_[i] = static_cast<Chunk>(accumulator) & kBigitMask;
-    accumulator >>= kBigitSize;
-  }
-  for (int i = used_digits_; i < product_length; ++i) {
-    int bigit_index1 = used_digits_ - 1;
-    int bigit_index2 = i - bigit_index1;
-    // Invariant: sum of both indices is again equal to i.
-    // Inner loop runs 0 times on last iteration, emptying accumulator.
-    while (bigit_index2 < used_digits_) {
-      Chunk chunk1 = bigits_[copy_offset + bigit_index1];
-      Chunk chunk2 = bigits_[copy_offset + bigit_index2];
-      accumulator += static_cast<DoubleChunk>(chunk1) * chunk2;
-      bigit_index1--;
-      bigit_index2++;
-    }
-    // The overwritten bigits_[i] will never be read in further loop iterations,
-    // because bigit_index1 and bigit_index2 are always greater
-    // than i - used_digits_.
-    bigits_[i] = static_cast<Chunk>(accumulator) & kBigitMask;
-    accumulator >>= kBigitSize;
-  }
-  // Since the result was guaranteed to lie inside the number the
-  // accumulator must be 0 now.
-  ASSERT(accumulator == 0);
-
-  // Don't forget to update the used_digits and the exponent.
-  used_digits_ = product_length;
-  exponent_ *= 2;
-  Clamp();
-}
-
-
-void Bignum::AssignPowerUInt16(uint16_t base, int power_exponent) {
-  ASSERT(base != 0);
-  ASSERT(power_exponent >= 0);
-  if (power_exponent == 0) {
-    AssignUInt16(1);
-    return;
-  }
-  Zero();
-  int shifts = 0;
-  // We expect base to be in range 2-32, and most often to be 10.
-  // It does not make much sense to implement different algorithms for counting
-  // the bits.
-  while ((base & 1) == 0) {
-    base >>= 1;
-    shifts++;
-  }
-  int bit_size = 0;
-  int tmp_base = base;
-  while (tmp_base != 0) {
-    tmp_base >>= 1;
-    bit_size++;
-  }
-  int final_size = bit_size * power_exponent;
-  // 1 extra bigit for the shifting, and one for rounded final_size.
-  EnsureCapacity(final_size / kBigitSize + 2);
-
-  // Left to Right exponentiation.
-  int mask = 1;
-  while (power_exponent >= mask) mask <<= 1;
-
-  // The mask is now pointing to the bit above the most significant 1-bit of
-  // power_exponent.
-  // Get rid of first 1-bit;
-  mask >>= 2;
-  uint64_t this_value = base;
-
-  bool delayed_multipliciation = false;
-  const uint64_t max_32bits = 0xFFFFFFFF;
-  while (mask != 0 && this_value <= max_32bits) {
-    this_value = this_value * this_value;
-    // Verify that there is enough space in this_value to perform the
-    // multiplication.  The first bit_size bits must be 0.
-    if ((power_exponent & mask) != 0) {
-      uint64_t base_bits_mask =
-          ~((static_cast<uint64_t>(1) << (64 - bit_size)) - 1);
-      bool high_bits_zero = (this_value & base_bits_mask) == 0;
-      if (high_bits_zero) {
-        this_value *= base;
-      } else {
-        delayed_multipliciation = true;
-      }
-    }
-    mask >>= 1;
-  }
-  AssignUInt64(this_value);
-  if (delayed_multipliciation) {
-    MultiplyByUInt32(base);
-  }
-
-  // Now do the same thing as a bignum.
-  while (mask != 0) {
-    Square();
-    if ((power_exponent & mask) != 0) {
-      MultiplyByUInt32(base);
-    }
-    mask >>= 1;
-  }
-
-  // And finally add the saved shifts.
-  ShiftLeft(shifts * power_exponent);
-}
-
-
-// Precondition: this/other < 16bit.
-uint16_t Bignum::DivideModuloIntBignum(const Bignum& other) {
-  ASSERT(IsClamped());
-  ASSERT(other.IsClamped());
-  ASSERT(other.used_digits_ > 0);
-
-  // Easy case: if we have less digits than the divisor than the result is 0.
-  // Note: this handles the case where this == 0, too.
-  if (BigitLength() < other.BigitLength()) {
-    return 0;
-  }
-
-  Align(other);
-
-  uint16_t result = 0;
-
-  // Start by removing multiples of 'other' until both numbers have the same
-  // number of digits.
-  while (BigitLength() > other.BigitLength()) {
-    // This naive approach is extremely inefficient if `this` divided by other
-    // is big. This function is implemented for doubleToString where
-    // the result should be small (less than 10).
-    ASSERT(other.bigits_[other.used_digits_ - 1] >= ((1 << kBigitSize) / 16));
-    ASSERT(bigits_[used_digits_ - 1] < 0x10000);
-    // Remove the multiples of the first digit.
-    // Example this = 23 and other equals 9. -> Remove 2 multiples.
-    result += static_cast<uint16_t>(bigits_[used_digits_ - 1]);
-    SubtractTimes(other, bigits_[used_digits_ - 1]);
-  }
-
-  ASSERT(BigitLength() == other.BigitLength());
-
-  // Both bignums are at the same length now.
-  // Since other has more than 0 digits we know that the access to
-  // bigits_[used_digits_ - 1] is safe.
-  Chunk this_bigit = bigits_[used_digits_ - 1];
-  Chunk other_bigit = other.bigits_[other.used_digits_ - 1];
-
-  if (other.used_digits_ == 1) {
-    // Shortcut for easy (and common) case.
-    int quotient = this_bigit / other_bigit;
-    bigits_[used_digits_ - 1] = this_bigit - other_bigit * quotient;
-    ASSERT(quotient < 0x10000);
-    result += static_cast<uint16_t>(quotient);
-    Clamp();
-    return result;
-  }
-
-  int division_estimate = this_bigit / (other_bigit + 1);
-  ASSERT(division_estimate < 0x10000);
-  result += static_cast<uint16_t>(division_estimate);
-  SubtractTimes(other, division_estimate);
-
-  if (other_bigit * (division_estimate + 1) > this_bigit) {
-    // No need to even try to subtract. Even if other's remaining digits were 0
-    // another subtraction would be too much.
-    return result;
-  }
-
-  while (LessEqual(other, *this)) {
-    SubtractBignum(other);
-    result++;
-  }
-  return result;
-}
-
-
-template<typename S>
-static int SizeInHexChars(S number) {
-  ASSERT(number > 0);
-  int result = 0;
-  while (number != 0) {
-    number >>= 4;
-    result++;
-  }
-  return result;
-}
-
-
-static char HexCharOfValue(int value) {
-  ASSERT(0 <= value && value <= 16);
-  if (value < 10) return static_cast<char>(value + '0');
-  return static_cast<char>(value - 10 + 'A');
-}
-
-
-bool Bignum::ToHexString(char* buffer, int buffer_size) const {
-  ASSERT(IsClamped());
-  // Each bigit must be printable as separate hex-character.
-  ASSERT(kBigitSize % 4 == 0);
-  const int kHexCharsPerBigit = kBigitSize / 4;
-
-  if (used_digits_ == 0) {
-    if (buffer_size < 2) return false;
-    buffer[0] = '0';
-    buffer[1] = '\0';
-    return true;
-  }
-  // We add 1 for the terminating '\0' character.
-  int needed_chars = (BigitLength() - 1) * kHexCharsPerBigit +
-      SizeInHexChars(bigits_[used_digits_ - 1]) + 1;
-  if (needed_chars > buffer_size) return false;
-  int string_index = needed_chars - 1;
-  buffer[string_index--] = '\0';
-  for (int i = 0; i < exponent_; ++i) {
-    for (int j = 0; j < kHexCharsPerBigit; ++j) {
-      buffer[string_index--] = '0';
-    }
-  }
-  for (int i = 0; i < used_digits_ - 1; ++i) {
-    Chunk current_bigit = bigits_[i];
-    for (int j = 0; j < kHexCharsPerBigit; ++j) {
-      buffer[string_index--] = HexCharOfValue(current_bigit & 0xF);
-      current_bigit >>= 4;
-    }
-  }
-  // And finally the last bigit.
-  Chunk most_significant_bigit = bigits_[used_digits_ - 1];
-  while (most_significant_bigit != 0) {
-    buffer[string_index--] = HexCharOfValue(most_significant_bigit & 0xF);
-    most_significant_bigit >>= 4;
-  }
-  return true;
-}
-
-
-Bignum::Chunk Bignum::BigitAt(int index) const {
-  if (index >= BigitLength()) return 0;
-  if (index < exponent_) return 0;
-  return bigits_[index - exponent_];
-}
-
-
-int Bignum::Compare(const Bignum& a, const Bignum& b) {
-  ASSERT(a.IsClamped());
-  ASSERT(b.IsClamped());
-  int bigit_length_a = a.BigitLength();
-  int bigit_length_b = b.BigitLength();
-  if (bigit_length_a < bigit_length_b) return -1;
-  if (bigit_length_a > bigit_length_b) return +1;
-  for (int i = bigit_length_a - 1; i >= Min(a.exponent_, b.exponent_); --i) {
-    Chunk bigit_a = a.BigitAt(i);
-    Chunk bigit_b = b.BigitAt(i);
-    if (bigit_a < bigit_b) return -1;
-    if (bigit_a > bigit_b) return +1;
-    // Otherwise they are equal up to this digit. Try the next digit.
-  }
-  return 0;
-}
-
-
-int Bignum::PlusCompare(const Bignum& a, const Bignum& b, const Bignum& c) {
-  ASSERT(a.IsClamped());
-  ASSERT(b.IsClamped());
-  ASSERT(c.IsClamped());
-  if (a.BigitLength() < b.BigitLength()) {
-    return PlusCompare(b, a, c);
-  }
-  if (a.BigitLength() + 1 < c.BigitLength()) return -1;
-  if (a.BigitLength() > c.BigitLength()) return +1;
-  // The exponent encodes 0-bigits. So if there are more 0-digits in 'a' than
-  // 'b' has digits, then the bigit-length of 'a'+'b' must be equal to the one
-  // of 'a'.
-  if (a.exponent_ >= b.BigitLength() && a.BigitLength() < c.BigitLength()) {
-    return -1;
-  }
-
-  Chunk borrow = 0;
-  // Starting at min_exponent all digits are == 0. So no need to compare them.
-  int min_exponent = Min(Min(a.exponent_, b.exponent_), c.exponent_);
-  for (int i = c.BigitLength() - 1; i >= min_exponent; --i) {
-    Chunk chunk_a = a.BigitAt(i);
-    Chunk chunk_b = b.BigitAt(i);
-    Chunk chunk_c = c.BigitAt(i);
-    Chunk sum = chunk_a + chunk_b;
-    if (sum > chunk_c + borrow) {
-      return +1;
-    } else {
-      borrow = chunk_c + borrow - sum;
-      if (borrow > 1) return -1;
-      borrow <<= kBigitSize;
-    }
-  }
-  if (borrow == 0) return 0;
-  return -1;
-}
-
-
-void Bignum::Clamp() {
-  while (used_digits_ > 0 && bigits_[used_digits_ - 1] == 0) {
-    used_digits_--;
-  }
-  if (used_digits_ == 0) {
-    // Zero.
-    exponent_ = 0;
-  }
-}
-
-
-bool Bignum::IsClamped() const {
-  return used_digits_ == 0 || bigits_[used_digits_ - 1] != 0;
-}
-
-
-void Bignum::Zero() {
-  for (int i = 0; i < used_digits_; ++i) {
-    bigits_[i] = 0;
-  }
-  used_digits_ = 0;
-  exponent_ = 0;
-}
-
-
-void Bignum::Align(const Bignum& other) {
-  if (exponent_ > other.exponent_) {
-    // If "X" represents a "hidden" digit (by the exponent) then we are in the
-    // following case (a == this, b == other):
-    // a:  aaaaaaXXXX   or a:   aaaaaXXX
-    // b:     bbbbbbX      b: bbbbbbbbXX
-    // We replace some of the hidden digits (X) of a with 0 digits.
-    // a:  aaaaaa000X   or a:   aaaaa0XX
-    int zero_digits = exponent_ - other.exponent_;
-    EnsureCapacity(used_digits_ + zero_digits);
-    for (int i = used_digits_ - 1; i >= 0; --i) {
-      bigits_[i + zero_digits] = bigits_[i];
-    }
-    for (int i = 0; i < zero_digits; ++i) {
-      bigits_[i] = 0;
-    }
-    used_digits_ += zero_digits;
-    exponent_ -= zero_digits;
-    ASSERT(used_digits_ >= 0);
-    ASSERT(exponent_ >= 0);
-  }
-}
-
-
-void Bignum::BigitsShiftLeft(int shift_amount) {
-  ASSERT(shift_amount < kBigitSize);
-  ASSERT(shift_amount >= 0);
-  Chunk carry = 0;
-  for (int i = 0; i < used_digits_; ++i) {
-    Chunk new_carry = bigits_[i] >> (kBigitSize - shift_amount);
-    bigits_[i] = ((bigits_[i] << shift_amount) + carry) & kBigitMask;
-    carry = new_carry;
-  }
-  if (carry != 0) {
-    bigits_[used_digits_] = carry;
-    used_digits_++;
-  }
-}
-
-
-void Bignum::SubtractTimes(const Bignum& other, int factor) {
-  ASSERT(exponent_ <= other.exponent_);
-  if (factor < 3) {
-    for (int i = 0; i < factor; ++i) {
-      SubtractBignum(other);
-    }
-    return;
-  }
-  Chunk borrow = 0;
-  int exponent_diff = other.exponent_ - exponent_;
-  for (int i = 0; i < other.used_digits_; ++i) {
-    DoubleChunk product = static_cast<DoubleChunk>(factor) * other.bigits_[i];
-    DoubleChunk remove = borrow + product;
-    Chunk difference = bigits_[i + exponent_diff] - (remove & kBigitMask);
-    bigits_[i + exponent_diff] = difference & kBigitMask;
-    borrow = static_cast<Chunk>((difference >> (kChunkSize - 1)) +
-                                (remove >> kBigitSize));
-  }
-  for (int i = other.used_digits_ + exponent_diff; i < used_digits_; ++i) {
-    if (borrow == 0) return;
-    Chunk difference = bigits_[i] - borrow;
-    bigits_[i] = difference & kBigitMask;
-    borrow = difference >> (kChunkSize - 1);
-  }
-  Clamp();
-}
-
-
-}  // namespace double_conversion
diff --git a/base/poco/Foundation/src/bignum.h b/base/poco/Foundation/src/bignum.h
deleted file mode 100644
index ec56adac23f..00000000000
--- a/base/poco/Foundation/src/bignum.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef DOUBLE_CONVERSION_BIGNUM_H_
-#define DOUBLE_CONVERSION_BIGNUM_H_
-
-#include "utils.h"
-
-namespace double_conversion
-{
-
-class Bignum
-{
-public:
-    // 3584 = 128 * 28. We can represent 2^3584 > 10^1000 accurately.
-    // This bignum can encode much bigger numbers, since it contains an
-    // exponent.
-    static const int kMaxSignificantBits = 3584;
-
-    Bignum();
-    void AssignUInt16(uint16_t value);
-    void AssignUInt64(uint64_t value);
-    void AssignBignum(const Bignum & other);
-
-    void AssignDecimalString(Vector<const char> value);
-    void AssignHexString(Vector<const char> value);
-
-    void AssignPowerUInt16(uint16_t base, int exponent);
-
-    void AddUInt16(uint16_t operand);
-    void AddUInt64(uint64_t operand);
-    void AddBignum(const Bignum & other);
-    // Precondition: this >= other.
-    void SubtractBignum(const Bignum & other);
-
-    void Square();
-    void ShiftLeft(int shift_amount);
-    void MultiplyByUInt32(uint32_t factor);
-    void MultiplyByUInt64(uint64_t factor);
-    void MultiplyByPowerOfTen(int exponent);
-    void Times10() { return MultiplyByUInt32(10); }
-    // Pseudocode:
-    //  int result = this / other;
-    //  this = this % other;
-    // In the worst case this function is in O(this/other).
-    uint16_t DivideModuloIntBignum(const Bignum & other);
-
-    bool ToHexString(char * buffer, int buffer_size) const;
-
-    // Returns
-    //  -1 if a < b,
-    //   0 if a == b, and
-    //  +1 if a > b.
-    static int Compare(const Bignum & a, const Bignum & b);
-    static bool Equal(const Bignum & a, const Bignum & b) { return Compare(a, b) == 0; }
-    static bool LessEqual(const Bignum & a, const Bignum & b) { return Compare(a, b) <= 0; }
-    static bool Less(const Bignum & a, const Bignum & b) { return Compare(a, b) < 0; }
-    // Returns Compare(a + b, c);
-    static int PlusCompare(const Bignum & a, const Bignum & b, const Bignum & c);
-    // Returns a + b == c
-    static bool PlusEqual(const Bignum & a, const Bignum & b, const Bignum & c) { return PlusCompare(a, b, c) == 0; }
-    // Returns a + b <= c
-    static bool PlusLessEqual(const Bignum & a, const Bignum & b, const Bignum & c) { return PlusCompare(a, b, c) <= 0; }
-    // Returns a + b < c
-    static bool PlusLess(const Bignum & a, const Bignum & b, const Bignum & c) { return PlusCompare(a, b, c) < 0; }
-
-private:
-    typedef uint32_t Chunk;
-    typedef uint64_t DoubleChunk;
-
-    static const int kChunkSize = sizeof(Chunk) * 8;
-    static const int kDoubleChunkSize = sizeof(DoubleChunk) * 8;
-    // With bigit size of 28 we loose some bits, but a double still fits easily
-    // into two chunks, and more importantly we can use the Comba multiplication.
-    static const int kBigitSize = 28;
-    static const Chunk kBigitMask = (1 << kBigitSize) - 1;
-    // Every instance allocates kBigitLength chunks on the stack. Bignums cannot
-    // grow. There are no checks if the stack-allocated space is sufficient.
-    static const int kBigitCapacity = kMaxSignificantBits / kBigitSize;
-
-    void EnsureCapacity(int size)
-    {
-        if (size > kBigitCapacity)
-        {
-            UNREACHABLE();
-        }
-    }
-    void Align(const Bignum & other);
-    void Clamp();
-    bool IsClamped() const;
-    void Zero();
-    // Requires this to have enough capacity (no tests done).
-    // Updates used_digits_ if necessary.
-    // shift_amount must be < kBigitSize.
-    void BigitsShiftLeft(int shift_amount);
-    // BigitLength includes the "hidden" digits encoded in the exponent.
-    int BigitLength() const { return used_digits_ + exponent_; }
-    Chunk BigitAt(int index) const;
-    void SubtractTimes(const Bignum & other, int factor);
-
-    Chunk bigits_buffer_[kBigitCapacity];
-    // A vector backed by bigits_buffer_. This way accesses to the array are
-    // checked for out-of-bounds errors.
-    Vector<Chunk> bigits_;
-    int used_digits_;
-    // The Bignum's value equals value(bigits_) * 2^(exponent_ * kBigitSize).
-    int exponent_;
-
-    DISALLOW_COPY_AND_ASSIGN(Bignum);
-};
-
-} // namespace double_conversion
-
-#endif // DOUBLE_CONVERSION_BIGNUM_H_
diff --git a/base/poco/Foundation/src/cached-powers.cc b/base/poco/Foundation/src/cached-powers.cc
deleted file mode 100644
index d1359ffe43e..00000000000
--- a/base/poco/Foundation/src/cached-powers.cc
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2006-2008 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <stdarg.h>
-#include <limits.h>
-#include <math.h>
-
-#include "utils.h"
-
-#include "cached-powers.h"
-
-namespace double_conversion {
-
-struct CachedPower {
-  uint64_t significand;
-  int16_t binary_exponent;
-  int16_t decimal_exponent;
-};
-
-static const CachedPower kCachedPowers[] = {
-  {UINT64_2PART_C(0xfa8fd5a0, 081c0288), -1220, -348},
-  {UINT64_2PART_C(0xbaaee17f, a23ebf76), -1193, -340},
-  {UINT64_2PART_C(0x8b16fb20, 3055ac76), -1166, -332},
-  {UINT64_2PART_C(0xcf42894a, 5dce35ea), -1140, -324},
-  {UINT64_2PART_C(0x9a6bb0aa, 55653b2d), -1113, -316},
-  {UINT64_2PART_C(0xe61acf03, 3d1a45df), -1087, -308},
-  {UINT64_2PART_C(0xab70fe17, c79ac6ca), -1060, -300},
-  {UINT64_2PART_C(0xff77b1fc, bebcdc4f), -1034, -292},
-  {UINT64_2PART_C(0xbe5691ef, 416bd60c), -1007, -284},
-  {UINT64_2PART_C(0x8dd01fad, 907ffc3c), -980, -276},
-  {UINT64_2PART_C(0xd3515c28, 31559a83), -954, -268},
-  {UINT64_2PART_C(0x9d71ac8f, ada6c9b5), -927, -260},
-  {UINT64_2PART_C(0xea9c2277, 23ee8bcb), -901, -252},
-  {UINT64_2PART_C(0xaecc4991, 4078536d), -874, -244},
-  {UINT64_2PART_C(0x823c1279, 5db6ce57), -847, -236},
-  {UINT64_2PART_C(0xc2109436, 4dfb5637), -821, -228},
-  {UINT64_2PART_C(0x9096ea6f, 3848984f), -794, -220},
-  {UINT64_2PART_C(0xd77485cb, 25823ac7), -768, -212},
-  {UINT64_2PART_C(0xa086cfcd, 97bf97f4), -741, -204},
-  {UINT64_2PART_C(0xef340a98, 172aace5), -715, -196},
-  {UINT64_2PART_C(0xb23867fb, 2a35b28e), -688, -188},
-  {UINT64_2PART_C(0x84c8d4df, d2c63f3b), -661, -180},
-  {UINT64_2PART_C(0xc5dd4427, 1ad3cdba), -635, -172},
-  {UINT64_2PART_C(0x936b9fce, bb25c996), -608, -164},
-  {UINT64_2PART_C(0xdbac6c24, 7d62a584), -582, -156},
-  {UINT64_2PART_C(0xa3ab6658, 0d5fdaf6), -555, -148},
-  {UINT64_2PART_C(0xf3e2f893, dec3f126), -529, -140},
-  {UINT64_2PART_C(0xb5b5ada8, aaff80b8), -502, -132},
-  {UINT64_2PART_C(0x87625f05, 6c7c4a8b), -475, -124},
-  {UINT64_2PART_C(0xc9bcff60, 34c13053), -449, -116},
-  {UINT64_2PART_C(0x964e858c, 91ba2655), -422, -108},
-  {UINT64_2PART_C(0xdff97724, 70297ebd), -396, -100},
-  {UINT64_2PART_C(0xa6dfbd9f, b8e5b88f), -369, -92},
-  {UINT64_2PART_C(0xf8a95fcf, 88747d94), -343, -84},
-  {UINT64_2PART_C(0xb9447093, 8fa89bcf), -316, -76},
-  {UINT64_2PART_C(0x8a08f0f8, bf0f156b), -289, -68},
-  {UINT64_2PART_C(0xcdb02555, 653131b6), -263, -60},
-  {UINT64_2PART_C(0x993fe2c6, d07b7fac), -236, -52},
-  {UINT64_2PART_C(0xe45c10c4, 2a2b3b06), -210, -44},
-  {UINT64_2PART_C(0xaa242499, 697392d3), -183, -36},
-  {UINT64_2PART_C(0xfd87b5f2, 8300ca0e), -157, -28},
-  {UINT64_2PART_C(0xbce50864, 92111aeb), -130, -20},
-  {UINT64_2PART_C(0x8cbccc09, 6f5088cc), -103, -12},
-  {UINT64_2PART_C(0xd1b71758, e219652c), -77, -4},
-  {UINT64_2PART_C(0x9c400000, 00000000), -50, 4},
-  {UINT64_2PART_C(0xe8d4a510, 00000000), -24, 12},
-  {UINT64_2PART_C(0xad78ebc5, ac620000), 3, 20},
-  {UINT64_2PART_C(0x813f3978, f8940984), 30, 28},
-  {UINT64_2PART_C(0xc097ce7b, c90715b3), 56, 36},
-  {UINT64_2PART_C(0x8f7e32ce, 7bea5c70), 83, 44},
-  {UINT64_2PART_C(0xd5d238a4, abe98068), 109, 52},
-  {UINT64_2PART_C(0x9f4f2726, 179a2245), 136, 60},
-  {UINT64_2PART_C(0xed63a231, d4c4fb27), 162, 68},
-  {UINT64_2PART_C(0xb0de6538, 8cc8ada8), 189, 76},
-  {UINT64_2PART_C(0x83c7088e, 1aab65db), 216, 84},
-  {UINT64_2PART_C(0xc45d1df9, 42711d9a), 242, 92},
-  {UINT64_2PART_C(0x924d692c, a61be758), 269, 100},
-  {UINT64_2PART_C(0xda01ee64, 1a708dea), 295, 108},
-  {UINT64_2PART_C(0xa26da399, 9aef774a), 322, 116},
-  {UINT64_2PART_C(0xf209787b, b47d6b85), 348, 124},
-  {UINT64_2PART_C(0xb454e4a1, 79dd1877), 375, 132},
-  {UINT64_2PART_C(0x865b8692, 5b9bc5c2), 402, 140},
-  {UINT64_2PART_C(0xc83553c5, c8965d3d), 428, 148},
-  {UINT64_2PART_C(0x952ab45c, fa97a0b3), 455, 156},
-  {UINT64_2PART_C(0xde469fbd, 99a05fe3), 481, 164},
-  {UINT64_2PART_C(0xa59bc234, db398c25), 508, 172},
-  {UINT64_2PART_C(0xf6c69a72, a3989f5c), 534, 180},
-  {UINT64_2PART_C(0xb7dcbf53, 54e9bece), 561, 188},
-  {UINT64_2PART_C(0x88fcf317, f22241e2), 588, 196},
-  {UINT64_2PART_C(0xcc20ce9b, d35c78a5), 614, 204},
-  {UINT64_2PART_C(0x98165af3, 7b2153df), 641, 212},
-  {UINT64_2PART_C(0xe2a0b5dc, 971f303a), 667, 220},
-  {UINT64_2PART_C(0xa8d9d153, 5ce3b396), 694, 228},
-  {UINT64_2PART_C(0xfb9b7cd9, a4a7443c), 720, 236},
-  {UINT64_2PART_C(0xbb764c4c, a7a44410), 747, 244},
-  {UINT64_2PART_C(0x8bab8eef, b6409c1a), 774, 252},
-  {UINT64_2PART_C(0xd01fef10, a657842c), 800, 260},
-  {UINT64_2PART_C(0x9b10a4e5, e9913129), 827, 268},
-  {UINT64_2PART_C(0xe7109bfb, a19c0c9d), 853, 276},
-  {UINT64_2PART_C(0xac2820d9, 623bf429), 880, 284},
-  {UINT64_2PART_C(0x80444b5e, 7aa7cf85), 907, 292},
-  {UINT64_2PART_C(0xbf21e440, 03acdd2d), 933, 300},
-  {UINT64_2PART_C(0x8e679c2f, 5e44ff8f), 960, 308},
-  {UINT64_2PART_C(0xd433179d, 9c8cb841), 986, 316},
-  {UINT64_2PART_C(0x9e19db92, b4e31ba9), 1013, 324},
-  {UINT64_2PART_C(0xeb96bf6e, badf77d9), 1039, 332},
-  {UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340},
-};
-
-static const int kCachedPowersLength = ARRAY_SIZE(kCachedPowers);
-static const int kCachedPowersOffset = 348;  // -1 * the first decimal_exponent.
-static const double kD_1_LOG2_10 = 0.30102999566398114;  //  1 / lg(10)
-// Difference between the decimal exponents in the table above.
-const int PowersOfTenCache::kDecimalExponentDistance = 8;
-const int PowersOfTenCache::kMinDecimalExponent = -348;
-const int PowersOfTenCache::kMaxDecimalExponent = 340;
-
-void PowersOfTenCache::GetCachedPowerForBinaryExponentRange(
-    int min_exponent,
-    int max_exponent,
-    DiyFp* power,
-    int* decimal_exponent) {
-  int kQ = DiyFp::kSignificandSize;
-  double k = ceil((min_exponent + kQ - 1) * kD_1_LOG2_10);
-  int foo = kCachedPowersOffset;
-  int index =
-      (foo + static_cast<int>(k) - 1) / kDecimalExponentDistance + 1;
-  ASSERT(0 <= index && index < kCachedPowersLength);
-  CachedPower cached_power = kCachedPowers[index];
-  ASSERT(min_exponent <= cached_power.binary_exponent);
-  (void) max_exponent;  // Mark variable as used.
-  ASSERT(cached_power.binary_exponent <= max_exponent);
-  *decimal_exponent = cached_power.decimal_exponent;
-  *power = DiyFp(cached_power.significand, cached_power.binary_exponent);
-}
-
-
-void PowersOfTenCache::GetCachedPowerForDecimalExponent(int requested_exponent,
-                                                        DiyFp* power,
-                                                        int* found_exponent) {
-  ASSERT(kMinDecimalExponent <= requested_exponent);
-  ASSERT(requested_exponent < kMaxDecimalExponent + kDecimalExponentDistance);
-  int index =
-      (requested_exponent + kCachedPowersOffset) / kDecimalExponentDistance;
-  CachedPower cached_power = kCachedPowers[index];
-  *power = DiyFp(cached_power.significand, cached_power.binary_exponent);
-  *found_exponent = cached_power.decimal_exponent;
-  ASSERT(*found_exponent <= requested_exponent);
-  ASSERT(requested_exponent < *found_exponent + kDecimalExponentDistance);
-}
-
-}  // namespace double_conversion
diff --git a/base/poco/Foundation/src/cached-powers.h b/base/poco/Foundation/src/cached-powers.h
deleted file mode 100644
index a65092d6cad..00000000000
--- a/base/poco/Foundation/src/cached-powers.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef DOUBLE_CONVERSION_CACHED_POWERS_H_
-#define DOUBLE_CONVERSION_CACHED_POWERS_H_
-
-#include "diy-fp.h"
-
-namespace double_conversion
-{
-
-class PowersOfTenCache
-{
-public:
-    // Not all powers of ten are cached. The decimal exponent of two neighboring
-    // cached numbers will differ by kDecimalExponentDistance.
-    static const int kDecimalExponentDistance;
-
-    static const int kMinDecimalExponent;
-    static const int kMaxDecimalExponent;
-
-    // Returns a cached power-of-ten with a binary exponent in the range
-    // [min_exponent; max_exponent] (boundaries included).
-    static void GetCachedPowerForBinaryExponentRange(int min_exponent, int max_exponent, DiyFp * power, int * decimal_exponent);
-
-    // Returns a cached power of ten x ~= 10^k such that
-    //   k <= decimal_exponent < k + kCachedPowersDecimalDistance.
-    // The given decimal_exponent must satisfy
-    //   kMinDecimalExponent <= requested_exponent, and
-    //   requested_exponent < kMaxDecimalExponent + kDecimalExponentDistance.
-    static void GetCachedPowerForDecimalExponent(int requested_exponent, DiyFp * power, int * found_exponent);
-};
-
-} // namespace double_conversion
-
-#endif // DOUBLE_CONVERSION_CACHED_POWERS_H_
diff --git a/base/poco/Foundation/src/compress.c b/base/poco/Foundation/src/compress.c
deleted file mode 100644
index e2db404abf8..00000000000
--- a/base/poco/Foundation/src/compress.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-    int level;
-{
-    z_stream stream;
-    int err;
-    const uInt max = (uInt)-1;
-    uLong left;
-
-    left = *destLen;
-    *destLen = 0;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = deflateInit(&stream, level);
-    if (err != Z_OK) return err;
-
-    stream.next_out = dest;
-    stream.avail_out = 0;
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = 0;
-
-    do {
-        if (stream.avail_out == 0) {
-            stream.avail_out = left > (uLong)max ? max : (uInt)left;
-            left -= stream.avail_out;
-        }
-        if (stream.avail_in == 0) {
-            stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
-            sourceLen -= stream.avail_in;
-        }
-        err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
-    } while (err == Z_OK);
-
-    *destLen = stream.total_out;
-    deflateEnd(&stream);
-    return err == Z_STREAM_END ? Z_OK : err;
-}
-
-/* ===========================================================================
- */
-int ZEXPORT compress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
-}
-
-/* ===========================================================================
-     If the default memLevel or windowBits for deflateInit() is changed, then
-   this function needs to be updated.
- */
-uLong ZEXPORT compressBound (sourceLen)
-    uLong sourceLen;
-{
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13;
-}
diff --git a/base/poco/Foundation/src/crc32.c b/base/poco/Foundation/src/crc32.c
deleted file mode 100644
index a0fe210ab1b..00000000000
--- a/base/poco/Foundation/src/crc32.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors.  This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
- */
-
-/* @(#) $Id$ */
-
-/*
-  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
-  protection on the static variables used to control the first-use generation
-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
-  first call get_crc_table() to initialize the tables before allowing more than
-  one thread to use crc32().
-
-  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
- */
-
-#ifdef MAKECRCH
-#  include <stdio.h>
-#  ifndef DYNAMIC_CRC_TABLE
-#    define DYNAMIC_CRC_TABLE
-#  endif /* !DYNAMIC_CRC_TABLE */
-#endif /* MAKECRCH */
-
-#include "zutil.h"      /* for STDC and FAR definitions */
-
-#define local static
-
-/* Definitions for doing the crc four data bytes at a time. */
-#if !defined(NOBYFOUR) && defined(Z_U4)
-#  define BYFOUR
-#endif
-#ifdef BYFOUR
-   local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, z_size_t));
-   local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, z_size_t));
-#  define TBLS 8
-#else
-#  define TBLS 1
-#endif /* BYFOUR */
-
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
-                                         unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
-
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local volatile int crc_table_empty = 1;
-local z_crc_t FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
-#ifdef MAKECRCH
-   local void write_table OF((FILE *, const z_crc_t FAR *));
-#endif /* MAKECRCH */
-/*
-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The first table is simply the CRC of all possible eight bit values.  This is
-  all the information needed to generate CRCs on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.  The remaining tables
-  allow for word-at-a-time CRC calculation for both big-endian and little-
-  endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
-    z_crc_t c;
-    int n, k;
-    z_crc_t poly;                       /* polynomial exclusive-or pattern */
-    /* terms of polynomial defining this crc (except x^32): */
-    static volatile int first = 1;      /* flag to limit concurrent making */
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-    /* See if another task is already doing this (not thread-safe, but better
-       than nothing -- significantly reduces duration of vulnerability in
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first) {
-        first = 0;
-
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0;
-        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
-            poly |= (z_crc_t)1 << (31 - p[n]);
-
-        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++) {
-            c = (z_crc_t)n;
-            for (k = 0; k < 8; k++)
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-            crc_table[0][n] = c;
-        }
-
-#ifdef BYFOUR
-        /* generate crc for each value followed by one, two, and three zeros,
-           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++) {
-            c = crc_table[0][n];
-            crc_table[4][n] = ZSWAP32(c);
-            for (k = 1; k < 4; k++) {
-                c = crc_table[0][c & 0xff] ^ (c >> 8);
-                crc_table[k][n] = c;
-                crc_table[k + 4][n] = ZSWAP32(c);
-            }
-        }
-#endif /* BYFOUR */
-
-        crc_table_empty = 0;
-    }
-    else {      /* not first */
-        /* wait for the other guy to finish (not efficient, but rare) */
-        while (crc_table_empty)
-            ;
-    }
-
-#ifdef MAKECRCH
-    /* write out CRC tables to crc32.h */
-    {
-        FILE *out;
-
-        out = fopen("crc32.h", "w");
-        if (out == NULL) return;
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const z_crc_t FAR ");
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
-        write_table(out, crc_table[0]);
-#  ifdef BYFOUR
-        fprintf(out, "#ifdef BYFOUR\n");
-        for (k = 1; k < 8; k++) {
-            fprintf(out, "  },\n  {\n");
-            write_table(out, crc_table[k]);
-        }
-        fprintf(out, "#endif\n");
-#  endif /* BYFOUR */
-        fprintf(out, "  }\n};\n");
-        fclose(out);
-    }
-#endif /* MAKECRCH */
-}
-
-#ifdef MAKECRCH
-local void write_table(out, table)
-    FILE *out;
-    const z_crc_t FAR *table;
-{
-    int n;
-
-    for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
-                (unsigned long)(table[n]),
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
-}
-#endif /* MAKECRCH */
-
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
- */
-#include "crc32.h"
-#endif /* DYNAMIC_CRC_TABLE */
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const z_crc_t FAR * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-    return (const z_crc_t FAR *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32_z(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    if (buf == Z_NULL) return 0UL;
-
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-
-#ifdef BYFOUR
-    if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        z_crc_t endian;
-
-        endian = 1;
-        if (*((unsigned char *)(&endian)))
-            return crc32_little(crc, buf, len);
-        else
-            return crc32_big(crc, buf, len);
-    }
-#endif /* BYFOUR */
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8) {
-        DO8;
-        len -= 8;
-    }
-    if (len) do {
-        DO1;
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    uInt len;
-{
-    return crc32_z(crc, buf, len);
-}
-
-#ifdef BYFOUR
-
-/*
-   This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
-   integer pointer type. This violates the strict aliasing rule, where a
-   compiler can assume, for optimization purposes, that two pointers to
-   fundamentally different types won't ever point to the same memory. This can
-   manifest as a problem only if one of the pointers is written to. This code
-   only reads from those pointers. So long as this code remains isolated in
-   this compilation unit, there won't be a problem. For this reason, this code
-   should not be copied and pasted into a compilation unit in which other code
-   writes to the buffer that is passed to these routines.
- */
-
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
-
-/* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
-
-    c = (z_crc_t)crc;
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-        len--;
-    }
-
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOLIT32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOLIT4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)c;
-}
-
-/* ========================================================================= */
-#define DOBIG4 c ^= *buf4++; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
-
-    c = ZSWAP32((z_crc_t)crc);
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        len--;
-    }
-
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOBIG32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOBIG4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)(ZSWAP32(c));
-}
-
-#endif /* BYFOUR */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
-
-/* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
-    unsigned long *mat;
-    unsigned long vec;
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
-    }
-    return sum;
-}
-
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
-    unsigned long *square;
-    unsigned long *mat;
-{
-    int n;
-
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
-}
-
-/* ========================================================================= */
-local uLong crc32_combine_(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case (also disallow negative lengths) */
-    if (len2 <= 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
-
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
-}
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
-}
-
-uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
-}
diff --git a/base/poco/Foundation/src/crc32.h b/base/poco/Foundation/src/crc32.h
deleted file mode 100644
index 3e00b277e77..00000000000
--- a/base/poco/Foundation/src/crc32.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/* crc32.h -- tables for rapid CRC calculation
- * Generated automatically by crc32.c
- */
-
-local const z_crc_t FAR crc_table[TBLS][256]
-    = {{0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL,
-        0x79dcb8a4UL, 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL,
-        0xf3b97148UL, 0x84be41deUL, 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, 0x646ba8c0UL, 0xfd62f97aUL,
-        0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, 0xa2677172UL,
-        0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-        0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL,
-        0xcfba9599UL, 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL,
-        0xb6662d3dUL, 0x76dc4190UL, 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, 0x9fbfe4a5UL, 0xe8b8d433UL,
-        0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, 0x6b6b51f4UL,
-        0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-        0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL,
-        0xd4bb30e2UL, 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL,
-        0x44042d73UL, 0x33031de5UL, 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, 0xc90c2086UL, 0x5768b525UL,
-        0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, 0x2eb40d81UL,
-        0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-        0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL,
-        0xf00f9344UL, 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL,
-        0x89d32be0UL, 0x10da7a5aUL, 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, 0xd6d6a3e8UL, 0xa1d1937eUL,
-        0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, 0x36034af6UL,
-        0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-        0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL,
-        0xb5d0cf31UL, 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL,
-        0x72076785UL, 0x05005713UL, 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, 0xe5d5be0dUL, 0x7cdcefb7UL,
-        0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, 0x18b74777UL,
-        0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-        0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL,
-        0x40df0b66UL, 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL,
-        0x24b4a3a6UL, 0xbad03605UL, 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 0x5d681b02UL, 0x2a6f2b94UL,
-        0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 0x2d02ef8dUL
-#ifdef BYFOUR
-       },
-       {0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL, 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL,
-        0xd1c2bb49UL, 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL, 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL,
-        0x78f470d3UL, 0x61ef4192UL, 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL, 0x9b00a918UL, 0xb02dfadbUL,
-        0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL, 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL, 0xbea97761UL,
-        0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL, 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-        0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL, 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL,
-        0x891c9175UL, 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL, 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL,
-        0x58de2a3cUL, 0xf0794f05UL, 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL, 0xa623e883UL, 0xbf38d9c2UL,
-        0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL, 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL, 0xbabb5d54UL,
-        0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL, 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-        0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL, 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL,
-        0x4ed03864UL, 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL, 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL,
-        0xc94824abUL, 0xd05315eaUL, 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL, 0x04122a35UL, 0x4b53bcf2UL,
-        0x52488db3UL, 0x7965de70UL, 0x607eef31UL, 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL, 0x9a9107bbUL,
-        0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL, 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-        0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL, 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL,
-        0x71418a1aUL, 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL, 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL,
-        0xa0833153UL, 0x8bae6290UL, 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL, 0xae07bce9UL, 0xb71c8da8UL,
-        0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL, 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL, 0x54e85463UL,
-        0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL, 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-        0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL, 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL,
-        0x516bd0f5UL, 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL, 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL,
-        0x9da070c8UL, 0x84bb4189UL, 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL, 0x7e54a903UL, 0x5579fac0UL,
-        0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL, 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL, 0xce7953d8UL,
-        0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL, 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-        0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL, 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL,
-        0xa4911b66UL, 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL, 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL,
-        0x3f91b27eUL, 0x70d024b9UL, 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL, 0xee530937UL, 0xf7483876UL,
-        0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL, 0x9324fd72UL},
-       {0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL, 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL,
-        0x0fd13b8fUL, 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL, 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL,
-        0x1fa2771eUL, 0x1e601d29UL, 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL, 0x13f798ffUL, 0x11b126a6UL,
-        0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL, 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL, 0x3a0bf8b9UL,
-        0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL, 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-        0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL, 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL,
-        0x20e69922UL, 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL, 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL,
-        0x2f37a2adUL, 0x709a8dc0UL, 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL, 0x7417f172UL, 0x75d59b45UL,
-        0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL, 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL, 0x6cbc2eb0UL,
-        0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL, 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-        0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL, 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL,
-        0x4a917579UL, 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL, 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL,
-        0x41cd3244UL, 0x400f5873UL, 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL, 0x56b7d609UL, 0x53f8c08cUL,
-        0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL, 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL, 0x5c29fb03UL,
-        0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL, 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-        0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL, 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL,
-        0xfd13b8f0UL, 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL, 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL,
-        0xf2c2837fUL, 0xf0843d26UL, 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL, 0xd9785d60UL, 0xd8ba3757UL,
-        0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL, 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL, 0xd4efd8b6UL,
-        0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL, 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-        0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL, 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL,
-        0xcd866d43UL, 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL, 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL,
-        0x9522eaf2UL, 0x94e080c5UL, 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL, 0x99770513UL, 0x9b31bb4aUL,
-        0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL, 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL, 0x88c623b5UL,
-        0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL, 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-        0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL, 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL,
-        0xa4755576UL, 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL, 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL,
-        0xb782cd89UL, 0xb2cddb0cUL, 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL, 0xb853f606UL, 0xb9919c31UL,
-        0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL, 0xbe9834edUL},
-       {0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL, 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL,
-        0x7d084f8aUL, 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL, 0x58631056UL, 0x5019579fUL, 0xe8a530faUL,
-        0xfa109f14UL, 0x42acf871UL, 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL, 0x2d111815UL, 0x3fa4b7fbUL,
-        0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL, 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL, 0xb28700d0UL,
-        0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL, 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-        0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL, 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL,
-        0xd540a77dUL, 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL, 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL,
-        0xa848e8f7UL, 0x9b14583dUL, 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL, 0xbe7f07e1UL, 0x06c36084UL,
-        0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL, 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL, 0xcb0d0fa2UL,
-        0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL, 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-        0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL, 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL,
-        0x299358edUL, 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL, 0x462eb889UL, 0x549b1767UL, 0xec277002UL,
-        0x71f048bbUL, 0xc94c2fdeUL, 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL, 0x798a0f72UL, 0xe45d37cbUL,
-        0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL, 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL, 0x99557841UL,
-        0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL, 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-        0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL, 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL,
-        0xbd40e1a4UL, 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL, 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL,
-        0xc048ae2eUL, 0xd2fd01c0UL, 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL, 0x4d6b1905UL, 0xf5d77e60UL,
-        0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL, 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL, 0x22d6f961UL,
-        0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL, 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-        0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL, 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL,
-        0xef189647UL, 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL, 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL,
-        0x5326b1daUL, 0xeb9ad6bfUL, 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL, 0x842736dbUL, 0x96929935UL,
-        0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL, 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL, 0xbb838120UL,
-        0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL, 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-        0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL, 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL,
-        0xb9c2a15cUL, 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL, 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL,
-        0x94d3b949UL, 0x090481f0UL, 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL, 0xe9dbf6c3UL, 0x516791a6UL,
-        0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL, 0xde0506f1UL},
-       {0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL, 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL,
-        0xa4b8dc79UL, 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL, 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL,
-        0x4871b9f3UL, 0xde41be84UL, 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL, 0xc0a86b64UL, 0x7af962fdUL,
-        0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL, 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL, 0x727167a2UL,
-        0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL, 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-        0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL, 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL,
-        0x9995bacfUL, 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL, 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL,
-        0x3d2d66b6UL, 0x9041dc76UL, 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL, 0xa5e4bf9fUL, 0x33d4b8e8UL,
-        0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL, 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL, 0xf4516b6bUL,
-        0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL, 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-        0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL, 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL,
-        0xe230bbd4UL, 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL, 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL,
-        0x732d0444UL, 0xe51d0333UL, 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL, 0x86200cc9UL, 0x25b56857UL,
-        0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL, 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL, 0x810db42eUL,
-        0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL, 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-        0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL, 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL,
-        0x44930ff0UL, 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL, 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL,
-        0xe02bd389UL, 0x5a7ada10UL, 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL, 0xe8a3d6d6UL, 0x7e93d1a1UL,
-        0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL, 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL, 0xf64a0336UL,
-        0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL, 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-        0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL, 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL,
-        0x31cfd0b5UL, 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL, 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL,
-        0x85670772UL, 0x13570005UL, 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL, 0x0dbed5e5UL, 0xb7efdc7cUL,
-        0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL, 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL, 0x7747b718UL,
-        0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL, 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-        0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL, 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL,
-        0x660bdf40UL, 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL, 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL,
-        0xa6a3b424UL, 0x0536d0baUL, 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL, 0x021b685dUL, 0x942b6f2aUL,
-        0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL, 0x8def022dUL},
-       {0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL, 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL,
-        0x49bbc2d1UL, 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL, 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL,
-        0xd370f478UL, 0x9241ef61UL, 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL, 0x18a9009bUL, 0xdbfa2db0UL,
-        0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL, 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL, 0x6177a9beUL,
-        0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL, 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-        0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL, 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL,
-        0x75911c89UL, 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL, 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL,
-        0x3c2ade58UL, 0x054f79f0UL, 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL, 0x83e823a6UL, 0xc2d938bfUL,
-        0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL, 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL, 0x545dbbbaUL,
-        0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL, 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-        0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL, 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL,
-        0x6438d04eUL, 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL, 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL,
-        0xab2448c9UL, 0xea1553d0UL, 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL, 0x352a1204UL, 0xf2bc534bUL,
-        0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL, 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL, 0xbb07919aUL,
-        0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL, 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-        0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL, 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL,
-        0x1a8a4171UL, 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL, 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL,
-        0x533183a0UL, 0x9062ae8bUL, 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL, 0xe9bc07aeUL, 0xa88d1cb7UL,
-        0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL, 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL, 0x6354e854UL,
-        0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL, 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-        0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL, 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL,
-        0xf5d06b51UL, 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL, 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL,
-        0xc870a09dUL, 0x8941bb84UL, 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL, 0x03a9547eUL, 0xc0fa7955UL,
-        0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL, 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL, 0xd85379ceUL,
-        0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL, 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-        0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL, 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL,
-        0x661b91a4UL, 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL, 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL,
-        0x7eb2913fUL, 0xb924d070UL, 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL, 0x370953eeUL, 0x763848f7UL,
-        0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL, 0x72fd2493UL},
-       {0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL, 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL,
-        0x8f3bd10fUL, 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL, 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL,
-        0x1e77a21fUL, 0x291d601eUL, 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL, 0xff98f713UL, 0xa626b111UL,
-        0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL, 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL, 0xb9f80b3aUL,
-        0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL, 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-        0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL, 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL,
-        0x2299e620UL, 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL, 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL,
-        0xada2372fUL, 0xc08d9a70UL, 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL, 0x72f11774UL, 0x459bd575UL,
-        0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL, 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL, 0xb02ebc6cUL,
-        0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL, 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-        0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL, 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL,
-        0x7975914aUL, 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL, 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL,
-        0x4432cd41UL, 0x73580f40UL, 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL, 0x09d6b756UL, 0x8cc0f853UL,
-        0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL, 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL, 0x03fb295cUL,
-        0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL, 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-        0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL, 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL,
-        0xf0b813fdUL, 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL, 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL,
-        0x7f83c2f2UL, 0x263d84f0UL, 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL, 0x605d78d9UL, 0x5737bad8UL,
-        0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL, 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL, 0xb6d8efd4UL,
-        0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL, 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-        0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL, 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL,
-        0x436d86cdUL, 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL, 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL,
-        0xf2ea2295UL, 0xc580e094UL, 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL, 0x13057799UL, 0x4abb319bUL,
-        0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL, 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL, 0xb523c688UL,
-        0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL, 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-        0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL, 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL,
-        0x765575a4UL, 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL, 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL,
-        0x89cd82b7UL, 0x0cdbcdb2UL, 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL, 0x06f653b8UL, 0x319c91b9UL,
-        0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL, 0xed3498beUL},
-       {0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL, 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL,
-        0x8a4f087dUL, 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL, 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL,
-        0x149f10faUL, 0x71f8ac42UL, 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL, 0x1518112dUL, 0xfbb7a43fUL,
-        0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL, 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL, 0xd00087b2UL,
-        0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL, 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-        0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL, 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL,
-        0x7da740d5UL, 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL, 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL,
-        0xf7e848a8UL, 0x3d58149bUL, 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL, 0xe1077fbeUL, 0x8460c306UL,
-        0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL, 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL, 0xa20f0dcbUL,
-        0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL, 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-        0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL, 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL,
-        0xed589329UL, 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL, 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL,
-        0xbb48f071UL, 0xde2f4cc9UL, 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL, 0x720f8a79UL, 0xcb375de4UL,
-        0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL, 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL, 0x41785599UL,
-        0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL, 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-        0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL, 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL,
-        0xa4e140bdUL, 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL, 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL,
-        0x2eae48c0UL, 0xc001fdd2UL, 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL, 0x05196b4dUL, 0x607ed7f5UL,
-        0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL, 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL, 0x61f9d622UL,
-        0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL, 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-        0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL, 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL,
-        0x479618efUL, 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL, 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL,
-        0xdab12653UL, 0xbfd69aebUL, 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL, 0xdb362784UL, 0x35999296UL,
-        0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL, 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL, 0x208183bbUL,
-        0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL, 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-        0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL, 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL,
-        0x5ca1c2b9UL, 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL, 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL,
-        0x49b9d394UL, 0xf0810409UL, 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL, 0xc3f6dbe9UL, 0xa6916751UL,
-        0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL, 0xf10605deUL
-#endif
-       }};
diff --git a/base/poco/Foundation/src/deflate.c b/base/poco/Foundation/src/deflate.c
deleted file mode 100644
index 0a80edd92d8..00000000000
--- a/base/poco/Foundation/src/deflate.c
+++ /dev/null
@@ -1,2163 +0,0 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process depends on being able to identify portions
- *      of the input text which are identical to earlier input (within a
- *      sliding window trailing behind the input currently being processed).
- *
- *      The most straightforward technique turns out to be the fastest for
- *      most input files: try all possible matches and select the longest.
- *      The key feature of this algorithm is that insertions into the string
- *      dictionary are very simple and thus fast, and deletions are avoided
- *      completely. Insertions are performed at each input character, whereas
- *      string matches are performed only when the previous match ends. So it
- *      is preferable to spend more time in matches to allow very fast string
- *      insertions and avoid deletions. The matching algorithm for small
- *      strings is inspired from that of Rabin & Karp. A brute force approach
- *      is used to find longer strings when a small match has been found.
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- *      (by Leonid Broukhis).
- *         A previous version of this file used a more sophisticated algorithm
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized
- *      time, but has a larger average cost, uses more memory and is patented.
- *      However the F&G algorithm may be faster for some highly redundant
- *      files if the parameter max_chain_length (described below) is too large.
- *
- *  ACKNOWLEDGEMENTS
- *
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- *      I found it in 'freeze' written by Leonid Broukhis.
- *      Thanks to many people for bug reports and testing.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://tools.ietf.org/html/rfc1951
- *
- *      A description of the Rabin and Karp algorithm is given in the book
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- *      Fiala,E.R., and Greene,D.H.
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-/* @(#) $Id$ */
-
-#include "deflate.h"
-
-const char deflate_copyright[] =
-   " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- *  Function prototypes.
- */
-typedef enum {
-    need_more,      /* block not completed, need more input or more output */
-    block_done,     /* block flush performed */
-    finish_started, /* finish started, need only more output at next deflate */
-    finish_done     /* finish done, accept no more input or output */
-} block_state;
-
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-/* Compression function. Returns the block state after the call. */
-
-local int deflateStateCheck      OF((z_streamp strm));
-local void slide_hash     OF((deflate_state *s));
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
-#ifndef FASTEST
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-#endif
-local block_state deflate_rle    OF((deflate_state *s, int flush));
-local block_state deflate_huff   OF((deflate_state *s, int flush));
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-#  pragma message("Assembler code may have bugs -- use at your own risk")
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef ZLIB_DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
-#endif
-
-/* ===========================================================================
- * Local data
- */
-
-#define NIL 0
-/* Tail of hash chains */
-
-#ifndef TOO_FAR
-#  define TOO_FAR 4096
-#endif
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
-   ush good_length; /* reduce lazy search above this match length */
-   ush max_lazy;    /* do not perform lazy search above this match length */
-   ush nice_length; /* quit search above this match length */
-   ush max_chain;
-   compress_func func;
-} config;
-
-#ifdef FASTEST
-local const config configuration_table[2] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
-#else
-local const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-/* 3 */ {4,    6, 32,   32, deflate_fast},
-
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-/* 7 */ {8,   32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
-#endif
-
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
- *    characters, so that a running hash key can be computed from the previous
- *    key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to INSERT_STRING are made with consecutive input
- *    characters and the first MIN_MATCH bytes of str are valid (except for
- *    the last MIN_MATCH-1 bytes of the input file).
- */
-#ifdef FASTEST
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#else
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#endif
-
-/* ===========================================================================
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
- * prev[] will be initialized on the fly.
- */
-#define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ===========================================================================
- * Slide the hash table when sliding the window down (could be avoided with 32
- * bit values at the expense of memory usage). We slide even when level == 0 to
- * keep the hash table consistent if we switch back to level > 0 later.
- */
-local void slide_hash(s)
-    deflate_state *s;
-{
-    unsigned n, m;
-    Posf *p;
-    uInt wsize = s->w_size;
-
-    n = s->hash_size;
-    p = &s->head[n];
-    do {
-        m = *--p;
-        *p = (Pos)(m >= wsize ? m - wsize : NIL);
-    } while (--n);
-    n = wsize;
-#ifndef FASTEST
-    p = &s->prev[n];
-    do {
-        m = *--p;
-        *p = (Pos)(m >= wsize ? m - wsize : NIL);
-        /* If n is not on any hash chain, prev[n] is garbage but
-         * its value will never be used.
-         */
-    } while (--n);
-#endif
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
-{
-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-                         Z_DEFAULT_STRATEGY, version, stream_size);
-    /* To do: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
-{
-    deflate_state *s;
-    int wrap = 1;
-    static const char my_version[] = ZLIB_VERSION;
-
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    if (version == Z_NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
-        return Z_VERSION_ERROR;
-    }
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->msg = Z_NULL;
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zfree = zcfree;
-#endif
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-
-    if (windowBits < 0) { /* suppress zlib wrapper */
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-#ifdef GZIP
-    else if (windowBits > 15) {
-        wrap = 2;       /* write gzip wrapper instead */
-        windowBits -= 16;
-    }
-#endif
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-        strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {
-        return Z_STREAM_ERROR;
-    }
-    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-    if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state FAR *)s;
-    s->strm = strm;
-    s->status = INIT_STATE;     /* to pass state test in deflateReset() */
-
-    s->wrap = wrap;
-    s->gzhead = Z_NULL;
-    s->w_bits = (uInt)windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-    s->hash_bits = (uInt)memLevel + 7;
-    s->hash_size = 1 << s->hash_bits;
-    s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
-
-    s->high_water = 0;      /* nothing written to s->window yet */
-
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-        s->pending_buf == Z_NULL) {
-        s->status = FINISH_STATE;
-        strm->msg = ERR_MSG(Z_MEM_ERROR);
-        deflateEnd (strm);
-        return Z_MEM_ERROR;
-    }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
-    s->level = level;
-    s->strategy = strategy;
-    s->method = (Byte)method;
-
-    return deflateReset(strm);
-}
-
-/* =========================================================================
- * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
- */
-local int deflateStateCheck (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-    if (strm == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
-        return 1;
-    s = strm->state;
-    if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE &&
-#ifdef GZIP
-                                           s->status != GZIP_STATE &&
-#endif
-                                           s->status != EXTRA_STATE &&
-                                           s->status != NAME_STATE &&
-                                           s->status != COMMENT_STATE &&
-                                           s->status != HCRC_STATE &&
-                                           s->status != BUSY_STATE &&
-                                           s->status != FINISH_STATE))
-        return 1;
-    return 0;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
-{
-    deflate_state *s;
-    uInt str, n;
-    int wrap;
-    unsigned avail;
-    z_const unsigned char *next;
-
-    if (deflateStateCheck(strm) || dictionary == Z_NULL)
-        return Z_STREAM_ERROR;
-    s = strm->state;
-    wrap = s->wrap;
-    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
-        return Z_STREAM_ERROR;
-
-    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
-    if (wrap == 1)
-        strm->adler = adler32(strm->adler, dictionary, dictLength);
-    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
-
-    /* if dictionary would fill window, just replace the history */
-    if (dictLength >= s->w_size) {
-        if (wrap == 0) {            /* already empty otherwise */
-            CLEAR_HASH(s);
-            s->strstart = 0;
-            s->block_start = 0L;
-            s->insert = 0;
-        }
-        dictionary += dictLength - s->w_size;  /* use the tail */
-        dictLength = s->w_size;
-    }
-
-    /* insert dictionary into window and hash */
-    avail = strm->avail_in;
-    next = strm->next_in;
-    strm->avail_in = dictLength;
-    strm->next_in = (z_const Bytef *)dictionary;
-    fill_window(s);
-    while (s->lookahead >= MIN_MATCH) {
-        str = s->strstart;
-        n = s->lookahead - (MIN_MATCH-1);
-        do {
-            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-            s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-            s->head[s->ins_h] = (Pos)str;
-            str++;
-        } while (--n);
-        s->strstart = str;
-        s->lookahead = MIN_MATCH-1;
-        fill_window(s);
-    }
-    s->strstart += s->lookahead;
-    s->block_start = (long)s->strstart;
-    s->insert = s->lookahead;
-    s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    strm->next_in = next;
-    strm->avail_in = avail;
-    s->wrap = wrap;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    Bytef *dictionary;
-    uInt  *dictLength;
-{
-    deflate_state *s;
-    uInt len;
-
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    s = strm->state;
-    len = s->strstart + s->lookahead;
-    if (len > s->w_size)
-        len = s->w_size;
-    if (dictionary != Z_NULL && len)
-        zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len);
-    if (dictLength != Z_NULL)
-        *dictLength = len;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-
-    if (deflateStateCheck(strm)) {
-        return Z_STREAM_ERROR;
-    }
-
-    strm->total_in = strm->total_out = 0;
-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-    strm->data_type = Z_UNKNOWN;
-
-    s = (deflate_state *)strm->state;
-    s->pending = 0;
-    s->pending_out = s->pending_buf;
-
-    if (s->wrap < 0) {
-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
-    }
-    s->status =
-#ifdef GZIP
-        s->wrap == 2 ? GZIP_STATE :
-#endif
-        s->wrap ? INIT_STATE : BUSY_STATE;
-    strm->adler =
-#ifdef GZIP
-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
-#endif
-        adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
-
-    _tr_init(s);
-
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
-{
-    int ret;
-
-    ret = deflateResetKeep(strm);
-    if (ret == Z_OK)
-        lm_init(strm->state);
-    return ret;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
-    z_streamp strm;
-    gz_headerp head;
-{
-    if (deflateStateCheck(strm) || strm->state->wrap != 2)
-        return Z_STREAM_ERROR;
-    strm->state->gzhead = head;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePending (strm, pending, bits)
-    unsigned *pending;
-    int *bits;
-    z_streamp strm;
-{
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    if (pending != Z_NULL)
-        *pending = strm->state->pending;
-    if (bits != Z_NULL)
-        *bits = strm->state->bi_valid;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
-    z_streamp strm;
-    int bits;
-    int value;
-{
-    deflate_state *s;
-    int put;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state;
-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
-        return Z_BUF_ERROR;
-    do {
-        put = Buf_size - s->bi_valid;
-        if (put > bits)
-            put = bits;
-        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
-        s->bi_valid += put;
-        _tr_flush_bits(s);
-        value >>= put;
-        bits -= put;
-    } while (bits);
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
-{
-    deflate_state *s;
-    compress_func func;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state;
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    func = configuration_table[s->level].func;
-
-    if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        s->high_water) {
-        /* Flush the last buffer: */
-        int err = deflate(strm, Z_BLOCK);
-        if (err == Z_STREAM_ERROR)
-            return err;
-        if (strm->avail_out == 0)
-            return Z_BUF_ERROR;
-    }
-    if (s->level != level) {
-        if (s->level == 0 && s->matches != 0) {
-            if (s->matches == 1)
-                slide_hash(s);
-            else
-                CLEAR_HASH(s);
-            s->matches = 0;
-        }
-        s->level = level;
-        s->max_lazy_match   = configuration_table[level].max_lazy;
-        s->good_match       = configuration_table[level].good_length;
-        s->nice_match       = configuration_table[level].nice_length;
-        s->max_chain_length = configuration_table[level].max_chain;
-    }
-    s->strategy = strategy;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-    z_streamp strm;
-    int good_length;
-    int max_lazy;
-    int nice_length;
-    int max_chain;
-{
-    deflate_state *s;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state;
-    s->good_match = (uInt)good_length;
-    s->max_lazy_match = (uInt)max_lazy;
-    s->nice_match = nice_length;
-    s->max_chain_length = (uInt)max_chain;
-    return Z_OK;
-}
-
-/* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
- *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
- *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
- */
-uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
-{
-    deflate_state *s;
-    uLong complen, wraplen;
-
-    /* conservative upper bound for compressed data */
-    complen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
-
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
-    if (deflateStateCheck(strm))
-        return complen + 6;
-
-    /* compute wrapper length */
-    s = strm->state;
-    switch (s->wrap) {
-    case 0:                                 /* raw deflate */
-        wraplen = 0;
-        break;
-    case 1:                                 /* zlib wrapper */
-        wraplen = 6 + (s->strstart ? 4 : 0);
-        break;
-#ifdef GZIP
-    case 2:                                 /* gzip wrapper */
-        wraplen = 18;
-        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
-            Bytef *str;
-            if (s->gzhead->extra != Z_NULL)
-                wraplen += 2 + s->gzhead->extra_len;
-            str = s->gzhead->name;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            str = s->gzhead->comment;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            if (s->gzhead->hcrc)
-                wraplen += 2;
-        }
-        break;
-#endif
-    default:                                /* for compiler happiness */
-        wraplen = 6;
-    }
-
-    /* if not default parameters, return conservative bound */
-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return complen + wraplen;
-
-    /* default settings: return tight bound for that case */
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13 - 6 + wraplen;
-}
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
-{
-    put_byte(s, (Byte)(b >> 8));
-    put_byte(s, (Byte)(b & 0xff));
-}
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output, except for
- * some deflate_stored() output, goes through this function so some
- * applications may wish to modify it to avoid allocating a large
- * strm->next_out buffer and copying into it. (See also read_buf()).
- */
-local void flush_pending(strm)
-    z_streamp strm;
-{
-    unsigned len;
-    deflate_state *s = strm->state;
-
-    _tr_flush_bits(s);
-    len = s->pending;
-    if (len > strm->avail_out) len = strm->avail_out;
-    if (len == 0) return;
-
-    zmemcpy(strm->next_out, s->pending_out, len);
-    strm->next_out  += len;
-    s->pending_out  += len;
-    strm->total_out += len;
-    strm->avail_out -= len;
-    s->pending      -= len;
-    if (s->pending == 0) {
-        s->pending_out = s->pending_buf;
-    }
-}
-
-/* ===========================================================================
- * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
- */
-#define HCRC_UPDATE(beg) \
-    do { \
-        if (s->gzhead->hcrc && s->pending > (beg)) \
-            strm->adler = crc32(strm->adler, s->pending_buf + (beg), \
-                                s->pending - (beg)); \
-    } while (0)
-
-/* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
-{
-    int old_flush; /* value of flush param for previous deflate call */
-    deflate_state *s;
-
-    if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {
-        return Z_STREAM_ERROR;
-    }
-    s = strm->state;
-
-    if (strm->next_out == Z_NULL ||
-        (strm->avail_in != 0 && strm->next_in == Z_NULL) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
-        flush_pending(strm);
-        if (strm->avail_out == 0) {
-            /* Since avail_out is 0, deflate will be called again with
-             * more output space, but possibly with both pending and
-             * avail_in equal to zero. There won't be anything to do,
-             * but this is not an error situation so make sure we
-             * return OK instead of BUF_ERROR at next call of deflate:
-             */
-            s->last_flush = -1;
-            return Z_OK;
-        }
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
-    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
-               flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* Write the header */
-    if (s->status == INIT_STATE) {
-        /* zlib header */
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-        uInt level_flags;
-
-        if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-            level_flags = 0;
-        else if (s->level < 6)
-            level_flags = 1;
-        else if (s->level == 6)
-            level_flags = 2;
-        else
-            level_flags = 3;
-        header |= (level_flags << 6);
-        if (s->strstart != 0) header |= PRESET_DICT;
-        header += 31 - (header % 31);
-
-        putShortMSB(s, header);
-
-        /* Save the adler32 of the preset dictionary: */
-        if (s->strstart != 0) {
-            putShortMSB(s, (uInt)(strm->adler >> 16));
-            putShortMSB(s, (uInt)(strm->adler & 0xffff));
-        }
-        strm->adler = adler32(0L, Z_NULL, 0);
-        s->status = BUSY_STATE;
-
-        /* Compression must start with an empty pending buffer */
-        flush_pending(strm);
-        if (s->pending != 0) {
-            s->last_flush = -1;
-            return Z_OK;
-        }
-    }
-#ifdef GZIP
-    if (s->status == GZIP_STATE) {
-        /* gzip header */
-        strm->adler = crc32(0L, Z_NULL, 0);
-        put_byte(s, 31);
-        put_byte(s, 139);
-        put_byte(s, 8);
-        if (s->gzhead == Z_NULL) {
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, s->level == 9 ? 2 :
-                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                      4 : 0));
-            put_byte(s, OS_CODE);
-            s->status = BUSY_STATE;
-
-            /* Compression must start with an empty pending buffer */
-            flush_pending(strm);
-            if (s->pending != 0) {
-                s->last_flush = -1;
-                return Z_OK;
-            }
-        }
-        else {
-            put_byte(s, (s->gzhead->text ? 1 : 0) +
-                     (s->gzhead->hcrc ? 2 : 0) +
-                     (s->gzhead->extra == Z_NULL ? 0 : 4) +
-                     (s->gzhead->name == Z_NULL ? 0 : 8) +
-                     (s->gzhead->comment == Z_NULL ? 0 : 16)
-                     );
-            put_byte(s, (Byte)(s->gzhead->time & 0xff));
-            put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
-            put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
-            put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
-            put_byte(s, s->level == 9 ? 2 :
-                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                      4 : 0));
-            put_byte(s, s->gzhead->os & 0xff);
-            if (s->gzhead->extra != Z_NULL) {
-                put_byte(s, s->gzhead->extra_len & 0xff);
-                put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
-            }
-            if (s->gzhead->hcrc)
-                strm->adler = crc32(strm->adler, s->pending_buf,
-                                    s->pending);
-            s->gzindex = 0;
-            s->status = EXTRA_STATE;
-        }
-    }
-    if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */
-            uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
-            while (s->pending + left > s->pending_buf_size) {
-                uInt copy = s->pending_buf_size - s->pending;
-                zmemcpy(s->pending_buf + s->pending,
-                        s->gzhead->extra + s->gzindex, copy);
-                s->pending = s->pending_buf_size;
-                HCRC_UPDATE(beg);
-                s->gzindex += copy;
-                flush_pending(strm);
-                if (s->pending != 0) {
-                    s->last_flush = -1;
-                    return Z_OK;
-                }
-                beg = 0;
-                left -= copy;
-            }
-            zmemcpy(s->pending_buf + s->pending,
-                    s->gzhead->extra + s->gzindex, left);
-            s->pending += left;
-            HCRC_UPDATE(beg);
-            s->gzindex = 0;
-        }
-        s->status = NAME_STATE;
-    }
-    if (s->status == NAME_STATE) {
-        if (s->gzhead->name != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */
-            int val;
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    HCRC_UPDATE(beg);
-                    flush_pending(strm);
-                    if (s->pending != 0) {
-                        s->last_flush = -1;
-                        return Z_OK;
-                    }
-                    beg = 0;
-                }
-                val = s->gzhead->name[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            HCRC_UPDATE(beg);
-            s->gzindex = 0;
-        }
-        s->status = COMMENT_STATE;
-    }
-    if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */
-            int val;
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    HCRC_UPDATE(beg);
-                    flush_pending(strm);
-                    if (s->pending != 0) {
-                        s->last_flush = -1;
-                        return Z_OK;
-                    }
-                    beg = 0;
-                }
-                val = s->gzhead->comment[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            HCRC_UPDATE(beg);
-        }
-        s->status = HCRC_STATE;
-    }
-    if (s->status == HCRC_STATE) {
-        if (s->gzhead->hcrc) {
-            if (s->pending + 2 > s->pending_buf_size) {
-                flush_pending(strm);
-                if (s->pending != 0) {
-                    s->last_flush = -1;
-                    return Z_OK;
-                }
-            }
-            put_byte(s, (Byte)(strm->adler & 0xff));
-            put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-            strm->adler = crc32(0L, Z_NULL, 0);
-        }
-        s->status = BUSY_STATE;
-
-        /* Compression must start with an empty pending buffer */
-        flush_pending(strm);
-        if (s->pending != 0) {
-            s->last_flush = -1;
-            return Z_OK;
-        }
-    }
-#endif
-
-    /* Start a new block or continue the current one.
-     */
-    if (strm->avail_in != 0 || s->lookahead != 0 ||
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        block_state bstate;
-
-        bstate = s->level == 0 ? deflate_stored(s, flush) :
-                 s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
-                 s->strategy == Z_RLE ? deflate_rle(s, flush) :
-                 (*(configuration_table[s->level].func))(s, flush);
-
-        if (bstate == finish_started || bstate == finish_done) {
-            s->status = FINISH_STATE;
-        }
-        if (bstate == need_more || bstate == finish_started) {
-            if (strm->avail_out == 0) {
-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-            }
-            return Z_OK;
-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-             * of deflate should use the same flush parameter to make sure
-             * that the flush is complete. So we don't have to output an
-             * empty block here, this will be done at next call. This also
-             * ensures that for a very small output buffer, we emit at most
-             * one empty block.
-             */
-        }
-        if (bstate == block_done) {
-            if (flush == Z_PARTIAL_FLUSH) {
-                _tr_align(s);
-            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
-                /* For a full flush, this empty block will be recognized
-                 * as a special marker by inflate_sync().
-                 */
-                if (flush == Z_FULL_FLUSH) {
-                    CLEAR_HASH(s);             /* forget history */
-                    if (s->lookahead == 0) {
-                        s->strstart = 0;
-                        s->block_start = 0L;
-                        s->insert = 0;
-                    }
-                }
-            }
-            flush_pending(strm);
-            if (strm->avail_out == 0) {
-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-              return Z_OK;
-            }
-        }
-    }
-
-    if (flush != Z_FINISH) return Z_OK;
-    if (s->wrap <= 0) return Z_STREAM_END;
-
-    /* Write the trailer */
-#ifdef GZIP
-    if (s->wrap == 2) {
-        put_byte(s, (Byte)(strm->adler & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
-        put_byte(s, (Byte)(strm->total_in & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
-    }
-    else
-#endif
-    {
-        putShortMSB(s, (uInt)(strm->adler >> 16));
-        putShortMSB(s, (uInt)(strm->adler & 0xffff));
-    }
-    flush_pending(strm);
-    /* If avail_out is zero, the application will call deflate again
-     * to flush the rest.
-     */
-    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
-    return s->pending != 0 ? Z_OK : Z_STREAM_END;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
-{
-    int status;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-
-    /* Deallocate in reverse order of allocations: */
-    TRY_FREE(strm, strm->state->pending_buf);
-    TRY_FREE(strm, strm->state->head);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE(strm, strm->state->window);
-
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- * To simplify the source, this is not supported for 16-bit MS-DOS (which
- * doesn't have enough memory anyway to duplicate compression states).
- */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
-{
-#ifdef MAXSEG_64K
-    return Z_STREAM_ERROR;
-#else
-    deflate_state *ds;
-    deflate_state *ss;
-    ushf *overlay;
-
-
-    if (deflateStateCheck(source) || dest == Z_NULL) {
-        return Z_STREAM_ERROR;
-    }
-
-    ss = source->state;
-
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-
-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-    if (ds == Z_NULL) return Z_MEM_ERROR;
-    dest->state = (struct internal_state FAR *) ds;
-    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
-    ds->strm = dest;
-
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
-
-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-        ds->pending_buf == Z_NULL) {
-        deflateEnd (dest);
-        return Z_MEM_ERROR;
-    }
-    /* following zmemcpy do not work for 16-bit MS-DOS */
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-
-    ds->l_desc.dyn_tree = ds->dyn_ltree;
-    ds->d_desc.dyn_tree = ds->dyn_dtree;
-    ds->bl_desc.dyn_tree = ds->bl_tree;
-
-    return Z_OK;
-#endif /* MAXSEG_64K */
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local unsigned read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-    zmemcpy(buf, strm->next_in, len);
-    if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, buf, len);
-    }
-#ifdef GZIP
-    else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, buf, len);
-    }
-#endif
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
-    deflate_state *s;
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->insert = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                      /* matched string */
-    register int len;                           /* length of current match */
-    int best_len = (int)s->prev_length;         /* best match length so far */
-    int nice_match = s->nice_match;             /* stop if match long enough */
-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-        s->strstart - (IPos)MAX_DIST(s) : NIL;
-    /* Stop when cur_match becomes <= limit. To simplify the code,
-     * we prevent matches with the string of window index 0.
-     */
-    Posf *prev = s->prev;
-    uInt wmask = s->w_mask;
-
-#ifdef UNALIGNED_OK
-    /* Compare two bytes at a time. Note: this is not always beneficial.
-     * Try with and without -DUNALIGNED_OK to check.
-     */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
-#else
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
-    register Byte scan_end   = scan[best_len];
-#endif
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    /* Do not waste too much time if we already have a good match: */
-    if (s->prev_length >= s->good_match) {
-        chain_length >>= 2;
-    }
-    /* Do not look for matches beyond the end of the input. This is necessary
-     * to make deflate deterministic.
-     */
-    if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    do {
-        Assert(cur_match < s->strstart, "no future");
-        match = s->window + cur_match;
-
-        /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2.  Note that the checks below
-         * for insufficient lookahead only occur occasionally for performance
-         * reasons.  Therefore uninitialized memory will be accessed, and
-         * conditional jumps will be made that depend on those values.
-         * However the length of the match is limited to the lookahead, so
-         * the output of deflate is not affected by the uninitialized values.
-         */
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-        /* This code assumes sizeof(unsigned short) == 2. Do not use
-         * UNALIGNED_OK if your compiler uses a different size.
-         */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ushf*)match != scan_start) continue;
-
-        /* It is not necessary to compare scan[2] and match[2] since they are
-         * always equal when the other bytes match, given that the hash keys
-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
-         * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-         * necessary to put more guard bytes at the end of the window, or
-         * to check more often for insufficient lookahead.
-         */
-        Assert(scan[2] == match[2], "scan[2]?");
-        scan++, match++;
-        do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 scan < strend);
-        /* The funny "do {}" generates better code on most compilers */
-
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-        if (*scan == *match) scan++;
-
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
-        scan = strend - (MAX_MATCH-1);
-
-#else /* UNALIGNED_OK */
-
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
-
-        /* The check at best_len-1 can be removed because it will be made
-         * again later. (This heuristic is not always a win.)
-         * It is not necessary to compare scan[2] and match[2] since they
-         * are always equal when the other bytes match, given that
-         * the hash keys are equal and that HASH_BITS >= 8.
-         */
-        scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
-
-        /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
-         */
-        do {
-        } while (*++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 scan < strend);
-
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-        len = MAX_MATCH - (int)(strend - scan);
-        scan = strend - MAX_MATCH;
-
-#endif /* UNALIGNED_OK */
-
-        if (len > best_len) {
-            s->match_start = cur_match;
-            best_len = len;
-            if (len >= nice_match) break;
-#ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
-#else
-            scan_end1  = scan[best_len-1];
-            scan_end   = scan[best_len];
-#endif
-        }
-    } while ((cur_match = prev[cur_match & wmask]) > limit
-             && --chain_length != 0);
-
-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-    return s->lookahead;
-}
-#endif /* ASMV */
-
-#else /* FASTEST */
-
-/* ---------------------------------------------------------------------------
- * Optimized version for FASTEST only
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    Assert(cur_match < s->strstart, "no future");
-
-    match = s->window + cur_match;
-
-    /* Return failure if the match length is less than 2:
-     */
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2, match += 2;
-    Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-    } while (*++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             scan < strend);
-
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (int)(strend - scan);
-
-    if (len < MIN_MATCH) return MIN_MATCH - 1;
-
-    s->match_start = cur_match;
-    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
-}
-
-#endif /* FASTEST */
-
-#ifdef ZLIB_DEBUG
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
-    /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-                start, match, length);
-        do {
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-        } while (--length != 0);
-        z_error("invalid match");
-    }
-    if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(s->window[start++], stderr); } while (--length != 0);
-    }
-}
-#else
-#  define check_match(s, start, match, length)
-#endif /* ZLIB_DEBUG */
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window(s)
-    deflate_state *s;
-{
-    unsigned n;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-            slide_hash(s);
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) break;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead + s->insert >= MIN_MATCH) {
-            uInt str = s->strstart - s->insert;
-            s->ins_h = s->window[str];
-            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-            while (s->insert) {
-                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-                s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-                s->head[s->ins_h] = (Pos)str;
-                str++;
-                s->insert--;
-                if (s->lookahead + s->insert < MIN_MATCH)
-                    break;
-            }
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        ulg curr = s->strstart + (ulg)(s->lookahead);
-        ulg init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            zmemzero(s->window + curr, (unsigned)init);
-            s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = (ulg)curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            zmemzero(s->window + s->high_water, (unsigned)init);
-            s->high_water += init;
-        }
-    }
-
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, last) { \
-   _tr_flush_block(s, (s->block_start >= 0L ? \
-                   (charf *)&s->window[(unsigned)s->block_start] : \
-                   (charf *)Z_NULL), \
-                (ulg)((long)s->strstart - s->block_start), \
-                (last)); \
-   s->block_start = s->strstart; \
-   flush_pending(s->strm); \
-   Tracev((stderr,"[FLUSH]")); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, last) { \
-   FLUSH_BLOCK_ONLY(s, last); \
-   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
-}
-
-/* Maximum stored block length in deflate format (not including header). */
-#define MAX_STORED 65535
-
-/* Minimum of a and b. */
-#define MIN(a, b) ((a) > (b) ? (b) : (a))
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- *
- * In case deflateParams() is used to later switch to a non-zero compression
- * level, s->matches (otherwise unused when storing) keeps track of the number
- * of hash table slides to perform. If s->matches is 1, then one hash table
- * slide will be done when switching. If s->matches is 2, the maximum value
- * allowed here, then the hash table will be cleared, since two or more slides
- * is the same as a clear.
- *
- * deflate_stored() is written to minimize the number of times an input byte is
- * copied. It is most efficient with large input and output buffers, which
- * maximizes the opportunites to have a single copy from next_in to next_out.
- */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    /* Smallest worthy block size when not flushing or finishing. By default
-     * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
-     * large input and output buffers, the stored block size will be larger.
-     */
-    unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
-
-    /* Copy as many min_block or larger stored blocks directly to next_out as
-     * possible. If flushing, copy the remaining available input to next_out as
-     * stored blocks, if there is enough space.
-     */
-    unsigned len, left, have, last = 0;
-    unsigned used = s->strm->avail_in;
-    do {
-        /* Set len to the maximum size block that we can copy directly with the
-         * available input data and output space. Set left to how much of that
-         * would be copied from what's left in the window.
-         */
-        len = MAX_STORED;       /* maximum deflate stored block length */
-        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
-        if (s->strm->avail_out < have)          /* need room for header */
-            break;
-            /* maximum stored block length that will fit in avail_out: */
-        have = s->strm->avail_out - have;
-        left = s->strstart - s->block_start;    /* bytes left in window */
-        if (len > (ulg)left + s->strm->avail_in)
-            len = left + s->strm->avail_in;     /* limit len to the input */
-        if (len > have)
-            len = have;                         /* limit len to the output */
-
-        /* If the stored block would be less than min_block in length, or if
-         * unable to copy all of the available input when flushing, then try
-         * copying to the window and the pending buffer instead. Also don't
-         * write an empty block when flushing -- deflate() does that.
-         */
-        if (len < min_block && ((len == 0 && flush != Z_FINISH) ||
-                                flush == Z_NO_FLUSH ||
-                                len != left + s->strm->avail_in))
-            break;
-
-        /* Make a dummy stored block in pending to get the header bytes,
-         * including any pending bits. This also updates the debugging counts.
-         */
-        last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
-        _tr_stored_block(s, (char *)0, 0L, last);
-
-        /* Replace the lengths in the dummy stored block with len. */
-        s->pending_buf[s->pending - 4] = len;
-        s->pending_buf[s->pending - 3] = len >> 8;
-        s->pending_buf[s->pending - 2] = ~len;
-        s->pending_buf[s->pending - 1] = ~len >> 8;
-
-        /* Write the stored block header bytes. */
-        flush_pending(s->strm);
-
-#ifdef ZLIB_DEBUG
-        /* Update debugging counts for the data about to be copied. */
-        s->compressed_len += len << 3;
-        s->bits_sent += len << 3;
-#endif
-
-        /* Copy uncompressed bytes from the window to next_out. */
-        if (left) {
-            if (left > len)
-                left = len;
-            zmemcpy(s->strm->next_out, s->window + s->block_start, left);
-            s->strm->next_out += left;
-            s->strm->avail_out -= left;
-            s->strm->total_out += left;
-            s->block_start += left;
-            len -= left;
-        }
-
-        /* Copy uncompressed bytes directly from next_in to next_out, updating
-         * the check value.
-         */
-        if (len) {
-            read_buf(s->strm, s->strm->next_out, len);
-            s->strm->next_out += len;
-            s->strm->avail_out -= len;
-            s->strm->total_out += len;
-        }
-    } while (last == 0);
-
-    /* Update the sliding window with the last s->w_size bytes of the copied
-     * data, or append all of the copied data to the existing window if less
-     * than s->w_size bytes were copied. Also update the number of bytes to
-     * insert in the hash tables, in the event that deflateParams() switches to
-     * a non-zero compression level.
-     */
-    used -= s->strm->avail_in;      /* number of input bytes directly copied */
-    if (used) {
-        /* If any input was used, then no unused input remains in the window,
-         * therefore s->block_start == s->strstart.
-         */
-        if (used >= s->w_size) {    /* supplant the previous history */
-            s->matches = 2;         /* clear hash */
-            zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
-            s->strstart = s->w_size;
-        }
-        else {
-            if (s->window_size - s->strstart <= used) {
-                /* Slide the window down. */
-                s->strstart -= s->w_size;
-                zmemcpy(s->window, s->window + s->w_size, s->strstart);
-                if (s->matches < 2)
-                    s->matches++;   /* add a pending slide_hash() */
-            }
-            zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);
-            s->strstart += used;
-        }
-        s->block_start = s->strstart;
-        s->insert += MIN(used, s->w_size - s->insert);
-    }
-    if (s->high_water < s->strstart)
-        s->high_water = s->strstart;
-
-    /* If the last block was written to next_out, then done. */
-    if (last)
-        return finish_done;
-
-    /* If flushing and all input has been consumed, then done. */
-    if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
-        s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
-        return block_done;
-
-    /* Fill the window with any remaining input. */
-    have = s->window_size - s->strstart - 1;
-    if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
-        /* Slide the window down. */
-        s->block_start -= s->w_size;
-        s->strstart -= s->w_size;
-        zmemcpy(s->window, s->window + s->w_size, s->strstart);
-        if (s->matches < 2)
-            s->matches++;           /* add a pending slide_hash() */
-        have += s->w_size;          /* more space now */
-    }
-    if (have > s->strm->avail_in)
-        have = s->strm->avail_in;
-    if (have) {
-        read_buf(s->strm, s->window + s->strstart, have);
-        s->strstart += have;
-    }
-    if (s->high_water < s->strstart)
-        s->high_water = s->strstart;
-
-    /* There was not enough avail_out to write a complete worthy or flushed
-     * stored block to next_out. Write a stored block to pending instead, if we
-     * have enough input for a worthy block, or if flushing and there is enough
-     * room for the remaining input as a stored block in the pending buffer.
-     */
-    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
-        /* maximum stored block length that will fit in pending: */
-    have = MIN(s->pending_buf_size - have, MAX_STORED);
-    min_block = MIN(have, s->w_size);
-    left = s->strstart - s->block_start;
-    if (left >= min_block ||
-        ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
-         s->strm->avail_in == 0 && left <= have)) {
-        len = MIN(left, have);
-        last = flush == Z_FINISH && s->strm->avail_in == 0 &&
-               len == left ? 1 : 0;
-        _tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
-        s->block_start += len;
-        flush_pending(s->strm);
-    }
-
-    /* We've done all we can with the available input and output. */
-    return last ? finish_started : need_more;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head;       /* head of the hash chain */
-    int bflush;           /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        hash_head = NIL;
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            s->match_length = longest_match (s, hash_head);
-            /* longest_match() sets match_start */
-        }
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, s->match_length);
-
-            _tr_tally_dist(s, s->strstart - s->match_start,
-                           s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-#ifndef FASTEST
-            if (s->match_length <= s->max_insert_length &&
-                s->lookahead >= MIN_MATCH) {
-                s->match_length--; /* string at strstart already in table */
-                do {
-                    s->strstart++;
-                    INSERT_STRING(s, s->strstart, hash_head);
-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead.
-                     */
-                } while (--s->match_length != 0);
-                s->strstart++;
-            } else
-#endif
-            {
-                s->strstart += s->match_length;
-                s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
-            }
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head;          /* head of hash chain */
-    int bflush;              /* set if current block must be flushed */
-
-    /* Process the input block. */
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        hash_head = NIL;
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        s->prev_length = s->match_length, s->prev_match = s->match_start;
-        s->match_length = MIN_MATCH-1;
-
-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-            s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            s->match_length = longest_match (s, hash_head);
-            /* longest_match() sets match_start */
-
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
-#if TOO_FAR <= 32767
-                || (s->match_length == MIN_MATCH &&
-                    s->strstart - s->match_start > TOO_FAR)
-#endif
-                )) {
-
-                /* If prev_match is also MIN_MATCH, match_start is garbage
-                 * but we will ignore the current match anyway.
-                 */
-                s->match_length = MIN_MATCH-1;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-            /* Do not insert strings in hash table beyond this. */
-
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-                           s->prev_length - MIN_MATCH, bflush);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
-             * enough lookahead, the last two strings are not inserted in
-             * the hash table.
-             */
-            s->lookahead -= s->prev_length-1;
-            s->prev_length -= 2;
-            do {
-                if (++s->strstart <= max_insert) {
-                    INSERT_STRING(s, s->strstart, hash_head);
-                }
-            } while (--s->prev_length != 0);
-            s->match_available = 0;
-            s->match_length = MIN_MATCH-1;
-            s->strstart++;
-
-            if (bflush) FLUSH_BLOCK(s, 0);
-
-        } else if (s->match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-            if (bflush) {
-                FLUSH_BLOCK_ONLY(s, 0);
-            }
-            s->strstart++;
-            s->lookahead--;
-            if (s->strm->avail_out == 0) return need_more;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            s->match_available = 1;
-            s->strstart++;
-            s->lookahead--;
-        }
-    }
-    Assert (flush != Z_NO_FLUSH, "no flush?");
-    if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-        s->match_available = 0;
-    }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-#endif /* FASTEST */
-
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-local block_state deflate_rle(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;             /* set if current block must be flushed */
-    uInt prev;              /* byte at distance one to match */
-    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest run, plus one for the unrolled loop.
-         */
-        if (s->lookahead <= MAX_MATCH) {
-            fill_window(s);
-            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* See how many times the previous byte repeats */
-        s->match_length = 0;
-        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
-            scan = s->window + s->strstart - 1;
-            prev = *scan;
-            if (prev == *++scan && prev == *++scan && prev == *++scan) {
-                strend = s->window + s->strstart + MAX_MATCH;
-                do {
-                } while (prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         scan < strend);
-                s->match_length = MAX_MATCH - (uInt)(strend - scan);
-                if (s->match_length > s->lookahead)
-                    s->match_length = s->lookahead;
-            }
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
-        }
-
-        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, s->match_length);
-
-            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-            s->strstart += s->match_length;
-            s->match_length = 0;
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-
-/* ===========================================================================
- * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
- * (It will be regenerated if this run of deflate switches away from Huffman.)
- */
-local block_state deflate_huff(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;             /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we have a literal to write. */
-        if (s->lookahead == 0) {
-            fill_window(s);
-            if (s->lookahead == 0) {
-                if (flush == Z_NO_FLUSH)
-                    return need_more;
-                break;      /* flush the current block */
-            }
-        }
-
-        /* Output a literal byte */
-        s->match_length = 0;
-        Tracevv((stderr,"%c", s->window[s->strstart]));
-        _tr_tally_lit (s, s->window[s->strstart], bflush);
-        s->lookahead--;
-        s->strstart++;
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
diff --git a/base/poco/Foundation/src/deflate.h b/base/poco/Foundation/src/deflate.h
deleted file mode 100644
index 5dd6e41bb29..00000000000
--- a/base/poco/Foundation/src/deflate.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/* deflate.h -- internal compression state
- * Copyright (C) 1995-2016 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef DEFLATE_H
-#define DEFLATE_H
-
-#include "zutil.h"
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip encoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#    define GZIP
-#endif
-
-/* ===========================================================================
- * Internal compression state.
- */
-
-#define LENGTH_CODES 29
-/* number of length codes, not counting the special END_BLOCK code */
-
-#define LITERALS 256
-/* number of literal bytes 0..255 */
-
-#define L_CODES (LITERALS + 1 + LENGTH_CODES)
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-#define D_CODES 30
-/* number of distance codes */
-
-#define BL_CODES 19
-/* number of codes used to transfer the bit lengths */
-
-#define HEAP_SIZE (2 * L_CODES + 1)
-/* maximum heap size */
-
-#define MAX_BITS 15
-/* All codes must not exceed MAX_BITS bits */
-
-#define Buf_size 16
-/* size of bit buffer in bi_buf */
-
-#define INIT_STATE 42 /* zlib header -> BUSY_STATE */
-#ifdef GZIP
-#    define GZIP_STATE 57 /* gzip header -> BUSY_STATE | EXTRA_STATE */
-#endif
-#define EXTRA_STATE 69 /* gzip extra block -> NAME_STATE */
-#define NAME_STATE 73 /* gzip file name -> COMMENT_STATE */
-#define COMMENT_STATE 91 /* gzip comment -> HCRC_STATE */
-#define HCRC_STATE 103 /* gzip header CRC -> BUSY_STATE */
-#define BUSY_STATE 113 /* deflate -> FINISH_STATE */
-#define FINISH_STATE 666 /* stream complete */
-/* Stream status */
-
-
-/* Data structure describing a single value and its code string. */
-typedef struct ct_data_s
-{
-    union
-    {
-        ush freq; /* frequency count */
-        ush code; /* bit string */
-    } fc;
-    union
-    {
-        ush dad; /* father node in Huffman tree */
-        ush len; /* length of bit string */
-    } dl;
-} FAR ct_data;
-
-#define Freq fc.freq
-#define Code fc.code
-#define Dad dl.dad
-#define Len dl.len
-
-typedef struct static_tree_desc_s static_tree_desc;
-
-typedef struct tree_desc_s
-{
-    ct_data * dyn_tree; /* the dynamic tree */
-    int max_code; /* largest code with non zero frequency */
-    const static_tree_desc * stat_desc; /* the corresponding static tree */
-} FAR tree_desc;
-
-typedef ush Pos;
-typedef Pos FAR Posf;
-typedef unsigned IPos;
-
-/* A Pos is an index in the character window. We use short instead of int to
- * save space in the various tables. IPos is used only for parameter passing.
- */
-
-typedef struct internal_state
-{
-    z_streamp strm; /* pointer back to this zlib stream */
-    int status; /* as the name implies */
-    Bytef * pending_buf; /* output still pending */
-    ulg pending_buf_size; /* size of pending_buf */
-    Bytef * pending_out; /* next pending byte to output to the stream */
-    ulg pending; /* nb of bytes in the pending buffer */
-    int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
-    gz_headerp gzhead; /* gzip header information to write */
-    ulg gzindex; /* where in extra, name, or comment */
-    Byte method; /* can only be DEFLATED */
-    int last_flush; /* value of flush param for previous deflate call */
-
-    /* used by deflate.c: */
-
-    uInt w_size; /* LZ77 window size (32K by default) */
-    uInt w_bits; /* log2(w_size)  (8..16) */
-    uInt w_mask; /* w_size - 1 */
-
-    Bytef * window;
-    /* Sliding window. Input bytes are read into the second half of the window,
-     * and move to the first half later to keep a dictionary of at least wSize
-     * bytes. With this organization, matches are limited to a distance of
-     * wSize-MAX_MATCH bytes, but this ensures that IO is always
-     * performed with a length multiple of the block size. Also, it limits
-     * the window size to 64K, which is quite useful on MS-DOS.
-     * To do: use the user input buffer as sliding window.
-     */
-
-    ulg window_size;
-    /* Actual size of window: 2*wSize, except when the user input buffer
-     * is directly used as sliding window.
-     */
-
-    Posf * prev;
-    /* Link to older string with same hash index. To limit the size of this
-     * array to 64K, this link is maintained only for the last 32K strings.
-     * An index in this array is thus a window index modulo 32K.
-     */
-
-    Posf * head; /* Heads of the hash chains or NIL. */
-
-    uInt ins_h; /* hash index of string to be inserted */
-    uInt hash_size; /* number of elements in hash table */
-    uInt hash_bits; /* log2(hash_size) */
-    uInt hash_mask; /* hash_size-1 */
-
-    uInt hash_shift;
-    /* Number of bits by which ins_h must be shifted at each input
-     * step. It must be such that after MIN_MATCH steps, the oldest
-     * byte no longer takes part in the hash key, that is:
-     *   hash_shift * MIN_MATCH >= hash_bits
-     */
-
-    long block_start;
-    /* Window position at the beginning of the current output block. Gets
-     * negative when the window is moved backwards.
-     */
-
-    uInt match_length; /* length of best match */
-    IPos prev_match; /* previous match */
-    int match_available; /* set if previous match exists */
-    uInt strstart; /* start of string to insert */
-    uInt match_start; /* start of matching string */
-    uInt lookahead; /* number of valid bytes ahead in window */
-
-    uInt prev_length;
-    /* Length of the best match at previous step. Matches not greater than this
-     * are discarded. This is used in the lazy match evaluation.
-     */
-
-    uInt max_chain_length;
-    /* To speed up deflation, hash chains are never searched beyond this
-     * length.  A higher limit improves compression ratio but degrades the
-     * speed.
-     */
-
-    uInt max_lazy_match;
-    /* Attempt to find a better match only when the current match is strictly
-     * smaller than this value. This mechanism is used only for compression
-     * levels >= 4.
-     */
-#define max_insert_length max_lazy_match
-    /* Insert new strings in the hash table only if the match length is not
-     * greater than this length. This saves time but degrades compression.
-     * max_insert_length is used only for compression levels <= 3.
-     */
-
-    int level; /* compression level (1..9) */
-    int strategy; /* favor or force Huffman coding*/
-
-    uInt good_match;
-    /* Use a faster search when the previous match is longer than this */
-
-    int nice_match; /* Stop searching when current match exceeds this */
-
-    /* used by trees.c: */
-    /* Didn't use ct_data typedef below to suppress compiler warning */
-    struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
-    struct ct_data_s dyn_dtree[2 * D_CODES + 1]; /* distance tree */
-    struct ct_data_s bl_tree[2 * BL_CODES + 1]; /* Huffman tree for bit lengths */
-
-    struct tree_desc_s l_desc; /* desc. for literal tree */
-    struct tree_desc_s d_desc; /* desc. for distance tree */
-    struct tree_desc_s bl_desc; /* desc. for bit length tree */
-
-    ush bl_count[MAX_BITS + 1];
-    /* number of codes at each bit length for an optimal tree */
-
-    int heap[2 * L_CODES + 1]; /* heap used to build the Huffman trees */
-    int heap_len; /* number of elements in the heap */
-    int heap_max; /* element of largest frequency */
-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-     * The same heap array is used to build all trees.
-     */
-
-    uch depth[2 * L_CODES + 1];
-    /* Depth of each subtree used as tie breaker for trees of equal frequency
-     */
-
-    uchf * l_buf; /* buffer for literals or lengths */
-
-    uInt lit_bufsize;
-    /* Size of match buffer for literals/lengths.  There are 4 reasons for
-     * limiting lit_bufsize to 64K:
-     *   - frequencies can be kept in 16 bit counters
-     *   - if compression is not successful for the first block, all input
-     *     data is still in the window so we can still emit a stored block even
-     *     when input comes from standard input.  (This can also be done for
-     *     all blocks if lit_bufsize is not greater than 32K.)
-     *   - if compression is not successful for a file smaller than 64K, we can
-     *     even emit a stored file instead of a stored block (saving 5 bytes).
-     *     This is applicable only for zip (not gzip or zlib).
-     *   - creating new Huffman trees less frequently may not provide fast
-     *     adaptation to changes in the input data statistics. (Take for
-     *     example a binary file with poorly compressible code followed by
-     *     a highly compressible string table.) Smaller buffer sizes give
-     *     fast adaptation but have of course the overhead of transmitting
-     *     trees more frequently.
-     *   - I can't count above 4
-     */
-
-    uInt last_lit; /* running index in l_buf */
-
-    ushf * d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
-
-    ulg opt_len; /* bit length of current block with optimal trees */
-    ulg static_len; /* bit length of current block with static trees */
-    uInt matches; /* number of string matches in current block */
-    uInt insert; /* bytes at end of window left to insert */
-
-#ifdef ZLIB_DEBUG
-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
-    ulg bits_sent; /* bit length of compressed data sent mod 2^32 */
-#endif
-
-    ush bi_buf;
-    /* Output buffer. bits are inserted starting at the bottom (least
-     * significant bits).
-     */
-    int bi_valid;
-    /* Number of valid bits in bi_buf.  All bits above the last valid bit
-     * are always zero.
-     */
-
-    ulg high_water;
-    /* High water mark offset in window for initialized bytes -- bytes above
-     * this are set to zero in order to avoid memory check warnings when
-     * longest match routines access bytes past the input.  This is then
-     * updated to the new high water mark.
-     */
-
-} FAR deflate_state;
-
-/* Output a byte on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-#define put_byte(s, c) \
-    { \
-        s->pending_buf[s->pending++] = (Bytef)(c); \
-    }
-
-
-#define MIN_LOOKAHEAD (MAX_MATCH + MIN_MATCH + 1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-#define MAX_DIST(s) ((s)->w_size - MIN_LOOKAHEAD)
-/* In order to simplify the code, particularly on 16 bit machines, match
- * distances are limited to MAX_DIST instead of WSIZE.
- */
-
-#define WIN_INIT MAX_MATCH
-/* Number of bytes after end of data in window to initialize in order to avoid
-   memory checker errors from longest match routines */
-
-/* in trees.c */
-void ZLIB_INTERNAL _tr_init OF((deflate_state * s));
-int ZLIB_INTERNAL _tr_tally OF((deflate_state * s, unsigned dist, unsigned lc));
-void ZLIB_INTERNAL _tr_flush_block OF((deflate_state * s, charf * buf, ulg stored_len, int last));
-void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state * s));
-void ZLIB_INTERNAL _tr_align OF((deflate_state * s));
-void ZLIB_INTERNAL _tr_stored_block OF((deflate_state * s, charf * buf, ulg stored_len, int last));
-
-#define d_code(dist) ((dist) < 256 ? _dist_code[dist] : _dist_code[256 + ((dist) >> 7)])
-/* Mapping from a distance to a distance code. dist is the distance - 1 and
- * must not have side effects. _dist_code[256] and _dist_code[257] are never
- * used.
- */
-
-#ifndef ZLIB_DEBUG
-/* Inline versions of _tr_tally for speed: */
-
-#    if defined(GEN_TREES_H) || !defined(STDC)
-extern uch ZLIB_INTERNAL _length_code[];
-extern uch ZLIB_INTERNAL _dist_code[];
-#    else
-extern const uch ZLIB_INTERNAL _length_code[];
-extern const uch ZLIB_INTERNAL _dist_code[];
-#    endif
-
-#    define _tr_tally_lit(s, c, flush) \
-        { \
-            uch cc = (c); \
-            s->d_buf[s->last_lit] = 0; \
-            s->l_buf[s->last_lit++] = cc; \
-            s->dyn_ltree[cc].Freq++; \
-            flush = (s->last_lit == s->lit_bufsize - 1); \
-        }
-#    define _tr_tally_dist(s, distance, length, flush) \
-        { \
-            uch len = (uch)(length); \
-            ush dist = (ush)(distance); \
-            s->d_buf[s->last_lit] = dist; \
-            s->l_buf[s->last_lit++] = len; \
-            dist--; \
-            s->dyn_ltree[_length_code[len] + LITERALS + 1].Freq++; \
-            s->dyn_dtree[d_code(dist)].Freq++; \
-            flush = (s->last_lit == s->lit_bufsize - 1); \
-        }
-#else
-#    define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-#    define _tr_tally_dist(s, distance, length, flush) flush = _tr_tally(s, distance, length)
-#endif
-
-#endif /* DEFLATE_H */
diff --git a/base/poco/Foundation/src/diy-fp.cc b/base/poco/Foundation/src/diy-fp.cc
deleted file mode 100644
index ddd1891b168..00000000000
--- a/base/poco/Foundation/src/diy-fp.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include "diy-fp.h"
-#include "utils.h"
-
-namespace double_conversion {
-
-void DiyFp::Multiply(const DiyFp& other) {
-  // Simply "emulates" a 128 bit multiplication.
-  // However: the resulting number only contains 64 bits. The least
-  // significant 64 bits are only used for rounding the most significant 64
-  // bits.
-  const uint64_t kM32 = 0xFFFFFFFFU;
-  uint64_t a = f_ >> 32;
-  uint64_t b = f_ & kM32;
-  uint64_t c = other.f_ >> 32;
-  uint64_t d = other.f_ & kM32;
-  uint64_t ac = a * c;
-  uint64_t bc = b * c;
-  uint64_t ad = a * d;
-  uint64_t bd = b * d;
-  uint64_t tmp = (bd >> 32) + (ad & kM32) + (bc & kM32);
-  // By adding 1U << 31 to tmp we round the final result.
-  // Halfway cases will be round up.
-  tmp += 1U << 31;
-  uint64_t result_f = ac + (ad >> 32) + (bc >> 32) + (tmp >> 32);
-  e_ += other.e_ + 64;
-  f_ = result_f;
-}
-
-}  // namespace double_conversion
diff --git a/base/poco/Foundation/src/diy-fp.h b/base/poco/Foundation/src/diy-fp.h
deleted file mode 100644
index 03581bc16ae..00000000000
--- a/base/poco/Foundation/src/diy-fp.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef DOUBLE_CONVERSION_DIY_FP_H_
-#define DOUBLE_CONVERSION_DIY_FP_H_
-
-#include "utils.h"
-
-namespace double_conversion
-{
-
-// This "Do It Yourself Floating Point" class implements a floating-point number
-// with a uint64 significand and an int exponent. Normalized DiyFp numbers will
-// have the most significant bit of the significand set.
-// Multiplication and Subtraction do not normalize their results.
-// DiyFp are not designed to contain special doubles (NaN and Infinity).
-class DiyFp
-{
-public:
-    static const int kSignificandSize = 64;
-
-    DiyFp() : f_(0), e_(0) { }
-    DiyFp(uint64_t f, int e) : f_(f), e_(e) { }
-
-    // this = this - other.
-    // The exponents of both numbers must be the same and the significand of this
-    // must be bigger than the significand of other.
-    // The result will not be normalized.
-    void Subtract(const DiyFp & other)
-    {
-        ASSERT(e_ == other.e_);
-        ASSERT(f_ >= other.f_);
-        f_ -= other.f_;
-    }
-
-    // Returns a - b.
-    // The exponents of both numbers must be the same and this must be bigger
-    // than other. The result will not be normalized.
-    static DiyFp Minus(const DiyFp & a, const DiyFp & b)
-    {
-        DiyFp result = a;
-        result.Subtract(b);
-        return result;
-    }
-
-
-    // this = this * other.
-    void Multiply(const DiyFp & other);
-
-    // returns a * b;
-    static DiyFp Times(const DiyFp & a, const DiyFp & b)
-    {
-        DiyFp result = a;
-        result.Multiply(b);
-        return result;
-    }
-
-    void Normalize()
-    {
-        ASSERT(f_ != 0);
-        uint64_t f = f_;
-        int e = e_;
-
-        // This method is mainly called for normalizing boundaries. In general
-        // boundaries need to be shifted by 10 bits. We thus optimize for this case.
-        const uint64_t k10MSBits = UINT64_2PART_C(0xFFC00000, 00000000);
-        while ((f & k10MSBits) == 0)
-        {
-            f <<= 10;
-            e -= 10;
-        }
-        while ((f & kUint64MSB) == 0)
-        {
-            f <<= 1;
-            e--;
-        }
-        f_ = f;
-        e_ = e;
-    }
-
-    static DiyFp Normalize(const DiyFp & a)
-    {
-        DiyFp result = a;
-        result.Normalize();
-        return result;
-    }
-
-    uint64_t f() const { return f_; }
-    int e() const { return e_; }
-
-    void set_f(uint64_t new_value) { f_ = new_value; }
-    void set_e(int new_value) { e_ = new_value; }
-
-private:
-    static const uint64_t kUint64MSB = UINT64_2PART_C(0x80000000, 00000000);
-
-    uint64_t f_;
-    int e_;
-};
-
-} // namespace double_conversion
-
-#endif // DOUBLE_CONVERSION_DIY_FP_H_
diff --git a/base/poco/Foundation/src/double-conversion.cc b/base/poco/Foundation/src/double-conversion.cc
deleted file mode 100644
index 39ad2461e9b..00000000000
--- a/base/poco/Foundation/src/double-conversion.cc
+++ /dev/null
@@ -1,911 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <limits.h>
-#include <math.h>
-
-#include "double-conversion.h"
-
-#include "bignum-dtoa.h"
-#include "fast-dtoa.h"
-#include "fixed-dtoa.h"
-#include "ieee.h"
-#include "strtod.h"
-#include "utils.h"
-
-namespace double_conversion {
-
-const DoubleToStringConverter& DoubleToStringConverter::EcmaScriptConverter() {
-  int flags = UNIQUE_ZERO | EMIT_POSITIVE_EXPONENT_SIGN;
-  static DoubleToStringConverter converter(flags,
-                                           "Infinity",
-                                           "NaN",
-                                           'e',
-                                           -6, 21,
-                                           6, 0);
-  return converter;
-}
-
-
-bool DoubleToStringConverter::HandleSpecialValues(
-    double value,
-    StringBuilder* result_builder) const {
-  Double double_inspect(value);
-  if (double_inspect.IsInfinite()) {
-    if (infinity_symbol_ == NULL) return false;
-    if (value < 0) {
-      result_builder->AddCharacter('-');
-    }
-    result_builder->AddString(infinity_symbol_);
-    return true;
-  }
-  if (double_inspect.IsNan()) {
-    if (nan_symbol_ == NULL) return false;
-    result_builder->AddString(nan_symbol_);
-    return true;
-  }
-  return false;
-}
-
-
-void DoubleToStringConverter::CreateExponentialRepresentation(
-    const char* decimal_digits,
-    int length,
-    int exponent,
-    StringBuilder* result_builder) const {
-  ASSERT(length != 0);
-  result_builder->AddCharacter(decimal_digits[0]);
-  if (length != 1) {
-    result_builder->AddCharacter('.');
-    result_builder->AddSubstring(&decimal_digits[1], length-1);
-  }
-  result_builder->AddCharacter(exponent_character_);
-  if (exponent < 0) {
-    result_builder->AddCharacter('-');
-    exponent = -exponent;
-  } else {
-    if ((flags_ & EMIT_POSITIVE_EXPONENT_SIGN) != 0) {
-      result_builder->AddCharacter('+');
-    }
-  }
-  if (exponent == 0) {
-    result_builder->AddCharacter('0');
-    return;
-  }
-  ASSERT(exponent < 1e4);
-  const int kMaxExponentLength = 5;
-  char buffer[kMaxExponentLength + 1];
-  buffer[kMaxExponentLength] = '\0';
-  int first_char_pos = kMaxExponentLength;
-  while (exponent > 0) {
-    buffer[--first_char_pos] = '0' + (exponent % 10);
-    exponent /= 10;
-  }
-  result_builder->AddSubstring(&buffer[first_char_pos],
-                               kMaxExponentLength - first_char_pos);
-}
-
-
-void DoubleToStringConverter::CreateDecimalRepresentation(
-    const char* decimal_digits,
-    int length,
-    int decimal_point,
-    int digits_after_point,
-    StringBuilder* result_builder) const {
-  // Create a representation that is padded with zeros if needed.
-  if (decimal_point <= 0) {
-      // "0.00000decimal_rep".
-    result_builder->AddCharacter('0');
-    if (digits_after_point > 0) {
-      result_builder->AddCharacter('.');
-      result_builder->AddPadding('0', -decimal_point);
-      ASSERT(length <= digits_after_point - (-decimal_point));
-      result_builder->AddSubstring(decimal_digits, length);
-      int remaining_digits = digits_after_point - (-decimal_point) - length;
-      result_builder->AddPadding('0', remaining_digits);
-    }
-  } else if (decimal_point >= length) {
-    // "decimal_rep0000.00000" or "decimal_rep.0000"
-    result_builder->AddSubstring(decimal_digits, length);
-    result_builder->AddPadding('0', decimal_point - length);
-    if (digits_after_point > 0) {
-      result_builder->AddCharacter('.');
-      result_builder->AddPadding('0', digits_after_point);
-    }
-  } else {
-    // "decima.l_rep000"
-    ASSERT(digits_after_point > 0);
-    result_builder->AddSubstring(decimal_digits, decimal_point);
-    result_builder->AddCharacter('.');
-    ASSERT(length - decimal_point <= digits_after_point);
-    result_builder->AddSubstring(&decimal_digits[decimal_point],
-                                 length - decimal_point);
-    int remaining_digits = digits_after_point - (length - decimal_point);
-    result_builder->AddPadding('0', remaining_digits);
-  }
-  if (digits_after_point == 0) {
-    if ((flags_ & EMIT_TRAILING_DECIMAL_POINT) != 0) {
-      result_builder->AddCharacter('.');
-    }
-    if ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) {
-      result_builder->AddCharacter('0');
-    }
-  }
-}
-
-
-bool DoubleToStringConverter::ToShortestIeeeNumber(
-    double value,
-    StringBuilder* result_builder,
-    DoubleToStringConverter::DtoaMode mode) const {
-  ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE);
-  if (Double(value).IsSpecial()) {
-    return HandleSpecialValues(value, result_builder);
-  }
-
-  int decimal_point;
-  bool sign;
-  const int kDecimalRepCapacity = kBase10MaximalLength + 1;
-  char decimal_rep[kDecimalRepCapacity];
-  int decimal_rep_length;
-
-  DoubleToAscii(value, mode, 0, decimal_rep, kDecimalRepCapacity,
-                &sign, &decimal_rep_length, &decimal_point);
-
-  bool unique_zero = (flags_ & UNIQUE_ZERO) != 0;
-  if (sign && (value != 0.0 || !unique_zero)) {
-    result_builder->AddCharacter('-');
-  }
-
-  int exponent = decimal_point - 1;
-  if ((decimal_in_shortest_low_ <= exponent) &&
-      (exponent < decimal_in_shortest_high_)) {
-    CreateDecimalRepresentation(decimal_rep, decimal_rep_length,
-                                decimal_point,
-                                Max(0, decimal_rep_length - decimal_point),
-                                result_builder);
-  } else {
-    CreateExponentialRepresentation(decimal_rep, decimal_rep_length, exponent,
-                                    result_builder);
-  }
-  return true;
-}
-
-
-bool DoubleToStringConverter::ToFixed(double value,
-                                      int requested_digits,
-                                      StringBuilder* result_builder) const {
-  ASSERT(kMaxFixedDigitsBeforePoint == 60);
-  const double kFirstNonFixed = 1e60;
-
-  if (Double(value).IsSpecial()) {
-    return HandleSpecialValues(value, result_builder);
-  }
-
-  if (requested_digits > kMaxFixedDigitsAfterPoint) return false;
-  if (value >= kFirstNonFixed || value <= -kFirstNonFixed) return false;
-
-  // Find a sufficiently precise decimal representation of n.
-  int decimal_point;
-  bool sign;
-  // Add space for the '\0' byte.
-  const int kDecimalRepCapacity =
-      kMaxFixedDigitsBeforePoint + kMaxFixedDigitsAfterPoint + 1;
-  char decimal_rep[kDecimalRepCapacity];
-  int decimal_rep_length;
-  DoubleToAscii(value, FIXED, requested_digits,
-                decimal_rep, kDecimalRepCapacity,
-                &sign, &decimal_rep_length, &decimal_point);
-
-  bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0);
-  if (sign && (value != 0.0 || !unique_zero)) {
-    result_builder->AddCharacter('-');
-  }
-
-  CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point,
-                              requested_digits, result_builder);
-  return true;
-}
-
-
-bool DoubleToStringConverter::ToExponential(
-    double value,
-    int requested_digits,
-    StringBuilder* result_builder) const {
-  if (Double(value).IsSpecial()) {
-    return HandleSpecialValues(value, result_builder);
-  }
-
-  if (requested_digits < -1) return false;
-  if (requested_digits > kMaxExponentialDigits) return false;
-
-  int decimal_point;
-  bool sign;
-  // Add space for digit before the decimal point and the '\0' character.
-  const int kDecimalRepCapacity = kMaxExponentialDigits + 2;
-  ASSERT(kDecimalRepCapacity > kBase10MaximalLength);
-  char decimal_rep[kDecimalRepCapacity];
-  int decimal_rep_length;
-
-  if (requested_digits == -1) {
-    DoubleToAscii(value, SHORTEST, 0,
-                  decimal_rep, kDecimalRepCapacity,
-                  &sign, &decimal_rep_length, &decimal_point);
-  } else {
-    DoubleToAscii(value, PRECISION, requested_digits + 1,
-                  decimal_rep, kDecimalRepCapacity,
-                  &sign, &decimal_rep_length, &decimal_point);
-    ASSERT(decimal_rep_length <= requested_digits + 1);
-
-    for (int i = decimal_rep_length; i < requested_digits + 1; ++i) {
-      decimal_rep[i] = '0';
-    }
-    decimal_rep_length = requested_digits + 1;
-  }
-
-  bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0);
-  if (sign && (value != 0.0 || !unique_zero)) {
-    result_builder->AddCharacter('-');
-  }
-
-  int exponent = decimal_point - 1;
-  CreateExponentialRepresentation(decimal_rep,
-                                  decimal_rep_length,
-                                  exponent,
-                                  result_builder);
-  return true;
-}
-
-
-bool DoubleToStringConverter::ToPrecision(double value,
-                                          int precision,
-                                          StringBuilder* result_builder) const {
-  if (Double(value).IsSpecial()) {
-    return HandleSpecialValues(value, result_builder);
-  }
-
-  if (precision < kMinPrecisionDigits || precision > kMaxPrecisionDigits) {
-    return false;
-  }
-
-  // Find a sufficiently precise decimal representation of n.
-  int decimal_point;
-  bool sign;
-  // Add one for the terminating null character.
-  const int kDecimalRepCapacity = kMaxPrecisionDigits + 1;
-  char decimal_rep[kDecimalRepCapacity];
-  int decimal_rep_length;
-
-  DoubleToAscii(value, PRECISION, precision,
-                decimal_rep, kDecimalRepCapacity,
-                &sign, &decimal_rep_length, &decimal_point);
-  ASSERT(decimal_rep_length <= precision);
-
-  bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0);
-  if (sign && (value != 0.0 || !unique_zero)) {
-    result_builder->AddCharacter('-');
-  }
-
-  // The exponent if we print the number as x.xxeyyy. That is with the
-  // decimal point after the first digit.
-  int exponent = decimal_point - 1;
-
-  int extra_zero = ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) ? 1 : 0;
-  if ((-decimal_point + 1 > max_leading_padding_zeroes_in_precision_mode_) ||
-      (decimal_point - precision + extra_zero >
-       max_trailing_padding_zeroes_in_precision_mode_)) {
-    // Fill buffer to contain 'precision' digits.
-    // Usually the buffer is already at the correct length, but 'DoubleToAscii'
-    // is allowed to return less characters.
-    for (int i = decimal_rep_length; i < precision; ++i) {
-      decimal_rep[i] = '0';
-    }
-
-    CreateExponentialRepresentation(decimal_rep,
-                                    precision,
-                                    exponent,
-                                    result_builder);
-  } else {
-    CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point,
-                                Max(0, precision - decimal_point),
-                                result_builder);
-  }
-  return true;
-}
-
-
-static BignumDtoaMode DtoaToBignumDtoaMode(
-    DoubleToStringConverter::DtoaMode dtoa_mode) {
-  switch (dtoa_mode) {
-    case DoubleToStringConverter::SHORTEST:  return BIGNUM_DTOA_SHORTEST;
-    case DoubleToStringConverter::SHORTEST_SINGLE:
-        return BIGNUM_DTOA_SHORTEST_SINGLE;
-    case DoubleToStringConverter::FIXED:     return BIGNUM_DTOA_FIXED;
-    case DoubleToStringConverter::PRECISION: return BIGNUM_DTOA_PRECISION;
-    default:
-      UNREACHABLE();
-	  return BIGNUM_DTOA_SHORTEST;
-  }
-}
-
-
-void DoubleToStringConverter::DoubleToAscii(double v,
-                                            DtoaMode mode,
-                                            int requested_digits,
-                                            char* buffer,
-                                            int buffer_length,
-                                            bool* sign,
-                                            int* length,
-                                            int* point) {
-  Vector<char> vector(buffer, buffer_length);
-  ASSERT(!Double(v).IsSpecial());
-  ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE || requested_digits >= 0);
-
-  if (Double(v).Sign() < 0) {
-    *sign = true;
-    v = -v;
-  } else {
-    *sign = false;
-  }
-
-  if (mode == PRECISION && requested_digits == 0) {
-    vector[0] = '\0';
-    *length = 0;
-    return;
-  }
-
-  if (v == 0) {
-    vector[0] = '0';
-    vector[1] = '\0';
-    *length = 1;
-    *point = 1;
-    return;
-  }
-
-  bool fast_worked;
-  switch (mode) {
-    case SHORTEST:
-      fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST, 0, vector, length, point);
-      break;
-    case SHORTEST_SINGLE:
-      fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST_SINGLE, 0,
-                             vector, length, point);
-      break;
-    case FIXED:
-      fast_worked = FastFixedDtoa(v, requested_digits, vector, length, point);
-      break;
-    case PRECISION:
-      fast_worked = FastDtoa(v, FAST_DTOA_PRECISION, requested_digits,
-                             vector, length, point);
-      break;
-    default:
-      fast_worked = false;
-      UNREACHABLE();
-  }
-  if (fast_worked) return;
-
-  // If the fast dtoa didn't succeed use the slower bignum version.
-  BignumDtoaMode bignum_mode = DtoaToBignumDtoaMode(mode);
-  BignumDtoa(v, bignum_mode, requested_digits, vector, length, point);
-  vector[*length] = '\0';
-}
-
-
-// Consumes the given substring from the iterator.
-// Returns false, if the substring does not match.
-static bool ConsumeSubString(const char** current,
-                             const char* end,
-                             const char* substring) {
-  ASSERT(**current == *substring);
-  for (substring++; *substring != '\0'; substring++) {
-    ++*current;
-    if (*current == end || **current != *substring) return false;
-  }
-  ++*current;
-  return true;
-}
-
-
-// Maximum number of significant digits in decimal representation.
-// The longest possible double in decimal representation is
-// (2^53 - 1) * 2 ^ -1074 that is (2 ^ 53 - 1) * 5 ^ 1074 / 10 ^ 1074
-// (768 digits). If we parse a number whose first digits are equal to a
-// mean of 2 adjacent doubles (that could have up to 769 digits) the result
-// must be rounded to the bigger one unless the tail consists of zeros, so
-// we don't need to preserve all the digits.
-const int kMaxSignificantDigits = 772;
-
-
-// Returns true if a nonspace found and false if the end has reached.
-static inline bool AdvanceToNonspace(const char** current, const char* end) {
-  while (*current != end) {
-    if (**current != ' ') return true;
-    ++*current;
-  }
-  return false;
-}
-
-
-static bool isDigit(int x, int radix) {
-  return (x >= '0' && x <= '9' && x < '0' + radix)
-      || (radix > 10 && x >= 'a' && x < 'a' + radix - 10)
-      || (radix > 10 && x >= 'A' && x < 'A' + radix - 10);
-}
-
-
-static double SignedZero(bool sign) {
-  return sign ? -0.0 : 0.0;
-}
-
-
-// Returns true if 'c' is a decimal digit that is valid for the given radix.
-//
-// The function is small and could be inlined, but VS2012 emitted a warning
-// because it constant-propagated the radix and concluded that the last
-// condition was always true. By moving it into a separate function the
-// compiler wouldn't warn anymore.
-static bool IsDecimalDigitForRadix(int c, int radix) {
-  return '0' <= c && c <= '9' && (c - '0') < radix;
-}
-
-// Returns true if 'c' is a character digit that is valid for the given radix.
-// The 'a_character' should be 'a' or 'A'.
-//
-// The function is small and could be inlined, but VS2012 emitted a warning
-// because it constant-propagated the radix and concluded that the first
-// condition was always false. By moving it into a separate function the
-// compiler wouldn't warn anymore.
-static bool IsCharacterDigitForRadix(int c, int radix, char a_character) {
-  return radix > 10 && c >= a_character && c < a_character + radix - 10;
-}
-
-
-// Parsing integers with radix 2, 4, 8, 16, 32. Assumes current != end.
-template <int radix_log_2>
-static double RadixStringToIeee(const char* current,
-                                const char* end,
-                                bool sign,
-                                bool allow_trailing_junk,
-                                double junk_string_value,
-                                bool read_as_double,
-                                const char** trailing_pointer) {
-  ASSERT(current != end);
-
-  const int kDoubleSize = Double::kSignificandSize;
-  const int kSingleSize = Single::kSignificandSize;
-  const int kSignificandSize = read_as_double? kDoubleSize: kSingleSize;
-
-  // Skip leading 0s.
-  while (*current == '0') {
-    ++current;
-    if (current == end) {
-      *trailing_pointer = end;
-      return SignedZero(sign);
-    }
-  }
-
-  int64_t number = 0;
-  int exponent = 0;
-  const int radix = (1 << radix_log_2);
-
-  do {
-    int digit;
-    if (IsDecimalDigitForRadix(*current, radix)) {
-      digit = static_cast<char>(*current) - '0';
-    } else if (IsCharacterDigitForRadix(*current, radix, 'a')) {
-      digit = static_cast<char>(*current) - 'a' + 10;
-    } else if (IsCharacterDigitForRadix(*current, radix, 'A')) {
-      digit = static_cast<char>(*current) - 'A' + 10;
-    } else {
-      if (allow_trailing_junk || !AdvanceToNonspace(&current, end)) {
-        break;
-      } else {
-        return junk_string_value;
-      }
-    }
-
-    number = number * radix + digit;
-    int overflow = static_cast<int>(number >> kSignificandSize);
-    if (overflow != 0) {
-      // Overflow occurred. Need to determine which direction to round the
-      // result.
-      int overflow_bits_count = 1;
-      while (overflow > 1) {
-        overflow_bits_count++;
-        overflow >>= 1;
-      }
-
-      int dropped_bits_mask = ((1 << overflow_bits_count) - 1);
-      int dropped_bits = static_cast<int>(number) & dropped_bits_mask;
-      number >>= overflow_bits_count;
-      exponent = overflow_bits_count;
-
-      bool zero_tail = true;
-      for (;;) {
-        ++current;
-        if (current == end || !isDigit(*current, radix)) break;
-        zero_tail = zero_tail && *current == '0';
-        exponent += radix_log_2;
-      }
-
-      if (!allow_trailing_junk && AdvanceToNonspace(&current, end)) {
-        return junk_string_value;
-      }
-
-      int middle_value = (1 << (overflow_bits_count - 1));
-      if (dropped_bits > middle_value) {
-        number++;  // Rounding up.
-      } else if (dropped_bits == middle_value) {
-        // Rounding to even to consistency with decimals: half-way case rounds
-        // up if significant part is odd and down otherwise.
-        if ((number & 1) != 0 || !zero_tail) {
-          number++;  // Rounding up.
-        }
-      }
-
-      // Rounding up may cause overflow.
-      if ((number & ((int64_t)1 << kSignificandSize)) != 0) {
-        exponent++;
-        number >>= 1;
-      }
-      break;
-    }
-    ++current;
-  } while (current != end);
-
-  ASSERT(number < ((int64_t)1 << kSignificandSize));
-  ASSERT(static_cast<int64_t>(static_cast<double>(number)) == number);
-
-  *trailing_pointer = current;
-
-  if (exponent == 0) {
-    if (sign) {
-      if (number == 0) return -0.0;
-      number = -number;
-    }
-    return static_cast<double>(number);
-  }
-
-  ASSERT(number != 0);
-  return Double(DiyFp(number, exponent)).value();
-}
-
-
-double StringToDoubleConverter::StringToIeee(
-    const char* input,
-    int length,
-    int* processed_characters_count,
-    bool read_as_double) const {
-  const char* current = input;
-  const char* end = input + length;
-
-  *processed_characters_count = 0;
-
-  const bool allow_trailing_junk = (flags_ & ALLOW_TRAILING_JUNK) != 0;
-  const bool allow_leading_spaces = (flags_ & ALLOW_LEADING_SPACES) != 0;
-  const bool allow_trailing_spaces = (flags_ & ALLOW_TRAILING_SPACES) != 0;
-  const bool allow_spaces_after_sign = (flags_ & ALLOW_SPACES_AFTER_SIGN) != 0;
-
-  // To make sure that iterator dereferencing is valid the following
-  // convention is used:
-  // 1. Each '++current' statement is followed by check for equality to 'end'.
-  // 2. If AdvanceToNonspace returned false then current == end.
-  // 3. If 'current' becomes equal to 'end' the function returns or goes to
-  // 'parsing_done'.
-  // 4. 'current' is not dereferenced after the 'parsing_done' label.
-  // 5. Code before 'parsing_done' may rely on 'current != end'.
-  if (current == end) return empty_string_value_;
-
-  if (allow_leading_spaces || allow_trailing_spaces) {
-    if (!AdvanceToNonspace(&current, end)) {
-      *processed_characters_count = static_cast<int>(current - input);
-      return empty_string_value_;
-    }
-    if (!allow_leading_spaces && (input != current)) {
-      // No leading spaces allowed, but AdvanceToNonspace moved forward.
-      return junk_string_value_;
-    }
-  }
-
-  // The longest form of simplified number is: "-<significant digits>.1eXXX\0".
-  const int kBufferSize = kMaxSignificantDigits + 10;
-  char buffer[kBufferSize];  // NOLINT: size is known at compile time.
-  int buffer_pos = 0;
-
-  // Exponent will be adjusted if insignificant digits of the integer part
-  // or insignificant leading zeros of the fractional part are dropped.
-  int exponent = 0;
-  int significant_digits = 0;
-  int insignificant_digits = 0;
-  bool nonzero_digit_dropped = false;
-
-  bool sign = false;
-
-  if (*current == '+' || *current == '-') {
-    sign = (*current == '-');
-    ++current;
-    const char* next_non_space = current;
-    // Skip following spaces (if allowed).
-    if (!AdvanceToNonspace(&next_non_space, end)) return junk_string_value_;
-    if (!allow_spaces_after_sign && (current != next_non_space)) {
-      return junk_string_value_;
-    }
-    current = next_non_space;
-  }
-
-  if (infinity_symbol_ != NULL) {
-    if (*current == infinity_symbol_[0]) {
-      if (!ConsumeSubString(&current, end, infinity_symbol_)) {
-        return junk_string_value_;
-      }
-
-      if (!(allow_trailing_spaces || allow_trailing_junk) && (current != end)) {
-        return junk_string_value_;
-      }
-      if (!allow_trailing_junk && AdvanceToNonspace(&current, end)) {
-        return junk_string_value_;
-      }
-
-      ASSERT(buffer_pos == 0);
-      *processed_characters_count = static_cast<int>(current - input);
-      return sign ? -Double::Infinity() : Double::Infinity();
-    }
-  }
-
-  if (nan_symbol_ != NULL) {
-    if (*current == nan_symbol_[0]) {
-      if (!ConsumeSubString(&current, end, nan_symbol_)) {
-        return junk_string_value_;
-      }
-
-      if (!(allow_trailing_spaces || allow_trailing_junk) && (current != end)) {
-        return junk_string_value_;
-      }
-      if (!allow_trailing_junk && AdvanceToNonspace(&current, end)) {
-        return junk_string_value_;
-      }
-
-      ASSERT(buffer_pos == 0);
-      *processed_characters_count = static_cast<int>(current - input);
-      return sign ? -Double::NaN() : Double::NaN();
-    }
-  }
-
-  bool leading_zero = false;
-  if (*current == '0') {
-    ++current;
-    if (current == end) {
-      *processed_characters_count = static_cast<int>(current - input);
-      return SignedZero(sign);
-    }
-
-    leading_zero = true;
-
-    // It could be hexadecimal value.
-    if ((flags_ & ALLOW_HEX) && (*current == 'x' || *current == 'X')) {
-      ++current;
-      if (current == end || !isDigit(*current, 16)) {
-        return junk_string_value_;  // "0x".
-      }
-
-      const char* tail_pointer = NULL;
-      double result = RadixStringToIeee<4>(current,
-                                           end,
-                                           sign,
-                                           allow_trailing_junk,
-                                           junk_string_value_,
-                                           read_as_double,
-                                           &tail_pointer);
-      if (tail_pointer != NULL) {
-        if (allow_trailing_spaces) AdvanceToNonspace(&tail_pointer, end);
-        *processed_characters_count = static_cast<int>(tail_pointer - input);
-      }
-      return result;
-    }
-
-    // Ignore leading zeros in the integer part.
-    while (*current == '0') {
-      ++current;
-      if (current == end) {
-        *processed_characters_count = static_cast<int>(current - input);
-        return SignedZero(sign);
-      }
-    }
-  }
-
-  bool octal = leading_zero && (flags_ & ALLOW_OCTALS) != 0;
-
-  // Copy significant digits of the integer part (if any) to the buffer.
-  while (*current >= '0' && *current <= '9') {
-    if (significant_digits < kMaxSignificantDigits) {
-      ASSERT(buffer_pos < kBufferSize);
-      buffer[buffer_pos++] = static_cast<char>(*current);
-      significant_digits++;
-      // Will later check if it's an octal in the buffer.
-    } else {
-      insignificant_digits++;  // Move the digit into the exponential part.
-      nonzero_digit_dropped = nonzero_digit_dropped || *current != '0';
-    }
-    octal = octal && *current < '8';
-    ++current;
-    if (current == end) goto parsing_done;
-  }
-
-  if (significant_digits == 0) {
-    octal = false;
-  }
-
-  if (*current == '.') {
-    if (octal && !allow_trailing_junk) return junk_string_value_;
-    if (octal) goto parsing_done;
-
-    ++current;
-    if (current == end) {
-      if (significant_digits == 0 && !leading_zero) {
-        return junk_string_value_;
-      } else {
-        goto parsing_done;
-      }
-    }
-
-    if (significant_digits == 0) {
-      // octal = false;
-      // Integer part consists of 0 or is absent. Significant digits start after
-      // leading zeros (if any).
-      while (*current == '0') {
-        ++current;
-        if (current == end) {
-          *processed_characters_count = static_cast<int>(current - input);
-          return SignedZero(sign);
-        }
-        exponent--;  // Move this 0 into the exponent.
-      }
-    }
-
-    // There is a fractional part.
-    // We don't emit a '.', but adjust the exponent instead.
-    while (*current >= '0' && *current <= '9') {
-      if (significant_digits < kMaxSignificantDigits) {
-        ASSERT(buffer_pos < kBufferSize);
-        buffer[buffer_pos++] = static_cast<char>(*current);
-        significant_digits++;
-        exponent--;
-      } else {
-        // Ignore insignificant digits in the fractional part.
-        nonzero_digit_dropped = nonzero_digit_dropped || *current != '0';
-      }
-      ++current;
-      if (current == end) goto parsing_done;
-    }
-  }
-
-  if (!leading_zero && exponent == 0 && significant_digits == 0) {
-    // If leading_zeros is true then the string contains zeros.
-    // If exponent < 0 then string was [+-]\.0*...
-    // If significant_digits != 0 the string is not equal to 0.
-    // Otherwise there are no digits in the string.
-    return junk_string_value_;
-  }
-
-  // Parse exponential part.
-  if (*current == 'e' || *current == 'E') {
-    if (octal && !allow_trailing_junk) return junk_string_value_;
-    if (octal) goto parsing_done;
-    ++current;
-    if (current == end) {
-      if (allow_trailing_junk) {
-        goto parsing_done;
-      } else {
-        return junk_string_value_;
-      }
-    }
-    char sign = '+';
-    if (*current == '+' || *current == '-') {
-      sign = static_cast<char>(*current);
-      ++current;
-      if (current == end) {
-        if (allow_trailing_junk) {
-          goto parsing_done;
-        } else {
-          return junk_string_value_;
-        }
-      }
-    }
-
-    if (current == end || *current < '0' || *current > '9') {
-      if (allow_trailing_junk) {
-        goto parsing_done;
-      } else {
-        return junk_string_value_;
-      }
-    }
-
-    const int max_exponent = INT_MAX / 2;
-    ASSERT(-max_exponent / 2 <= exponent && exponent <= max_exponent / 2);
-    int num = 0;
-    do {
-      // Check overflow.
-      int digit = *current - '0';
-      if (num >= max_exponent / 10
-          && !(num == max_exponent / 10 && digit <= max_exponent % 10)) {
-        num = max_exponent;
-      } else {
-        num = num * 10 + digit;
-      }
-      ++current;
-    } while (current != end && *current >= '0' && *current <= '9');
-
-    exponent += (sign == '-' ? -num : num);
-  }
-
-  if (!(allow_trailing_spaces || allow_trailing_junk) && (current != end)) {
-    return junk_string_value_;
-  }
-  if (!allow_trailing_junk && AdvanceToNonspace(&current, end)) {
-    return junk_string_value_;
-  }
-  if (allow_trailing_spaces) {
-    AdvanceToNonspace(&current, end);
-  }
-
-  parsing_done:
-  exponent += insignificant_digits;
-
-  if (octal) {
-    double result;
-    const char* tail_pointer = NULL;
-    result = RadixStringToIeee<3>(buffer,
-                                  buffer + buffer_pos,
-                                  sign,
-                                  allow_trailing_junk,
-                                  junk_string_value_,
-                                  read_as_double,
-                                  &tail_pointer);
-    ASSERT(tail_pointer != NULL);
-    *processed_characters_count = static_cast<int>(current - input);
-    return result;
-  }
-
-  if (nonzero_digit_dropped) {
-    buffer[buffer_pos++] = '1';
-    exponent--;
-  }
-
-  ASSERT(buffer_pos < kBufferSize);
-  buffer[buffer_pos] = '\0';
-
-  double converted;
-  if (read_as_double) {
-    converted = Strtod(Vector<const char>(buffer, buffer_pos), exponent);
-  } else {
-    converted = Strtof(Vector<const char>(buffer, buffer_pos), exponent);
-  }
-  *processed_characters_count = static_cast<int>(current - input);
-  return sign? -converted: converted;
-}
-
-}  // namespace double_conversion
diff --git a/base/poco/Foundation/src/double-conversion.h b/base/poco/Foundation/src/double-conversion.h
deleted file mode 100644
index 851049bf7f0..00000000000
--- a/base/poco/Foundation/src/double-conversion.h
+++ /dev/null
@@ -1,512 +0,0 @@
-// Copyright 2012 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_
-#define DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_
-
-#include "utils.h"
-
-namespace double_conversion
-{
-
-class DoubleToStringConverter
-{
-public:
-    // When calling ToFixed with a double > 10^kMaxFixedDigitsBeforePoint
-    // or a requested_digits parameter > kMaxFixedDigitsAfterPoint then the
-    // function returns false.
-    static const int kMaxFixedDigitsBeforePoint = 60;
-    static const int kMaxFixedDigitsAfterPoint = 60;
-
-    // When calling ToExponential with a requested_digits
-    // parameter > kMaxExponentialDigits then the function returns false.
-    static const int kMaxExponentialDigits = 120;
-
-    // When calling ToPrecision with a requested_digits
-    // parameter < kMinPrecisionDigits or requested_digits > kMaxPrecisionDigits
-    // then the function returns false.
-    static const int kMinPrecisionDigits = 1;
-    static const int kMaxPrecisionDigits = 120;
-
-    enum Flags
-    {
-        NO_FLAGS = 0,
-        EMIT_POSITIVE_EXPONENT_SIGN = 1,
-        EMIT_TRAILING_DECIMAL_POINT = 2,
-        EMIT_TRAILING_ZERO_AFTER_POINT = 4,
-        UNIQUE_ZERO = 8
-    };
-
-    // Flags should be a bit-or combination of the possible Flags-enum.
-    //  - NO_FLAGS: no special flags.
-    //  - EMIT_POSITIVE_EXPONENT_SIGN: when the number is converted into exponent
-    //    form, emits a '+' for positive exponents. Example: 1.2e+2.
-    //  - EMIT_TRAILING_DECIMAL_POINT: when the input number is an integer and is
-    //    converted into decimal format then a trailing decimal point is appended.
-    //    Example: 2345.0 is converted to "2345.".
-    //  - EMIT_TRAILING_ZERO_AFTER_POINT: in addition to a trailing decimal point
-    //    emits a trailing '0'-character. This flag requires the
-    //    EXMIT_TRAILING_DECIMAL_POINT flag.
-    //    Example: 2345.0 is converted to "2345.0".
-    //  - UNIQUE_ZERO: "-0.0" is converted to "0.0".
-    //
-    // Infinity symbol and nan_symbol provide the string representation for these
-    // special values. If the string is NULL and the special value is encountered
-    // then the conversion functions return false.
-    //
-    // The exponent_character is used in exponential representations. It is
-    // usually 'e' or 'E'.
-    //
-    // When converting to the shortest representation the converter will
-    // represent input numbers in decimal format if they are in the interval
-    // [10^decimal_in_shortest_low; 10^decimal_in_shortest_high[
-    //    (lower boundary included, greater boundary excluded).
-    // Example: with decimal_in_shortest_low = -6 and
-    //               decimal_in_shortest_high = 21:
-    //   ToShortest(0.000001)  -> "0.000001"
-    //   ToShortest(0.0000001) -> "1e-7"
-    //   ToShortest(111111111111111111111.0)  -> "111111111111111110000"
-    //   ToShortest(100000000000000000000.0)  -> "100000000000000000000"
-    //   ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21"
-    //
-    // When converting to precision mode the converter may add
-    // max_leading_padding_zeroes before returning the number in exponential
-    // format.
-    // Example with max_leading_padding_zeroes_in_precision_mode = 6.
-    //   ToPrecision(0.0000012345, 2) -> "0.0000012"
-    //   ToPrecision(0.00000012345, 2) -> "1.2e-7"
-    // Similarly the converter may add up to
-    // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid
-    // returning an exponential representation. A zero added by the
-    // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit.
-    // Examples for max_trailing_padding_zeroes_in_precision_mode = 1:
-    //   ToPrecision(230.0, 2) -> "230"
-    //   ToPrecision(230.0, 2) -> "230."  with EMIT_TRAILING_DECIMAL_POINT.
-    //   ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT.
-    DoubleToStringConverter(
-        int flags,
-        const char * infinity_symbol,
-        const char * nan_symbol,
-        char exponent_character,
-        int decimal_in_shortest_low,
-        int decimal_in_shortest_high,
-        int max_leading_padding_zeroes_in_precision_mode,
-        int max_trailing_padding_zeroes_in_precision_mode)
-        : flags_(flags)
-        , infinity_symbol_(infinity_symbol)
-        , nan_symbol_(nan_symbol)
-        , exponent_character_(exponent_character)
-        , decimal_in_shortest_low_(decimal_in_shortest_low)
-        , decimal_in_shortest_high_(decimal_in_shortest_high)
-        , max_leading_padding_zeroes_in_precision_mode_(max_leading_padding_zeroes_in_precision_mode)
-        , max_trailing_padding_zeroes_in_precision_mode_(max_trailing_padding_zeroes_in_precision_mode)
-    {
-        // When 'trailing zero after the point' is set, then 'trailing point'
-        // must be set too.
-        ASSERT(((flags & EMIT_TRAILING_DECIMAL_POINT) != 0) || !((flags & EMIT_TRAILING_ZERO_AFTER_POINT) != 0));
-    }
-
-    // Returns a converter following the EcmaScript specification.
-    static const DoubleToStringConverter & EcmaScriptConverter();
-
-    // Computes the shortest string of digits that correctly represent the input
-    // number. Depending on decimal_in_shortest_low and decimal_in_shortest_high
-    // (see constructor) it then either returns a decimal representation, or an
-    // exponential representation.
-    // Example with decimal_in_shortest_low = -6,
-    //              decimal_in_shortest_high = 21,
-    //              EMIT_POSITIVE_EXPONENT_SIGN activated, and
-    //              EMIT_TRAILING_DECIMAL_POINT deactivated:
-    //   ToShortest(0.000001)  -> "0.000001"
-    //   ToShortest(0.0000001) -> "1e-7"
-    //   ToShortest(111111111111111111111.0)  -> "111111111111111110000"
-    //   ToShortest(100000000000000000000.0)  -> "100000000000000000000"
-    //   ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21"
-    //
-    // Note: the conversion may round the output if the returned string
-    // is accurate enough to uniquely identify the input-number.
-    // For example the most precise representation of the double 9e59 equals
-    // "899999999999999918767229449717619953810131273674690656206848", but
-    // the converter will return the shorter (but still correct) "9e59".
-    //
-    // Returns true if the conversion succeeds. The conversion always succeeds
-    // except when the input value is special and no infinity_symbol or
-    // nan_symbol has been given to the constructor.
-    bool ToShortest(double value, StringBuilder * result_builder) const { return ToShortestIeeeNumber(value, result_builder, SHORTEST); }
-
-    // Same as ToShortest, but for single-precision floats.
-    bool ToShortestSingle(float value, StringBuilder * result_builder) const
-    {
-        return ToShortestIeeeNumber(value, result_builder, SHORTEST_SINGLE);
-    }
-
-
-    // Computes a decimal representation with a fixed number of digits after the
-    // decimal point. The last emitted digit is rounded.
-    //
-    // Examples:
-    //   ToFixed(3.12, 1) -> "3.1"
-    //   ToFixed(3.1415, 3) -> "3.142"
-    //   ToFixed(1234.56789, 4) -> "1234.5679"
-    //   ToFixed(1.23, 5) -> "1.23000"
-    //   ToFixed(0.1, 4) -> "0.1000"
-    //   ToFixed(1e30, 2) -> "1000000000000000019884624838656.00"
-    //   ToFixed(0.1, 30) -> "0.100000000000000005551115123126"
-    //   ToFixed(0.1, 17) -> "0.10000000000000001"
-    //
-    // If requested_digits equals 0, then the tail of the result depends on
-    // the EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT.
-    // Examples, for requested_digits == 0,
-    //   let EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT be
-    //    - false and false: then 123.45 -> 123
-    //                             0.678 -> 1
-    //    - true and false: then 123.45 -> 123.
-    //                            0.678 -> 1.
-    //    - true and true: then 123.45 -> 123.0
-    //                           0.678 -> 1.0
-    //
-    // Returns true if the conversion succeeds. The conversion always succeeds
-    // except for the following cases:
-    //   - the input value is special and no infinity_symbol or nan_symbol has
-    //     been provided to the constructor,
-    //   - 'value' > 10^kMaxFixedDigitsBeforePoint, or
-    //   - 'requested_digits' > kMaxFixedDigitsAfterPoint.
-    // The last two conditions imply that the result will never contain more than
-    // 1 + kMaxFixedDigitsBeforePoint + 1 + kMaxFixedDigitsAfterPoint characters
-    // (one additional character for the sign, and one for the decimal point).
-    bool ToFixed(double value, int requested_digits, StringBuilder * result_builder) const;
-
-    // Computes a representation in exponential format with requested_digits
-    // after the decimal point. The last emitted digit is rounded.
-    // If requested_digits equals -1, then the shortest exponential representation
-    // is computed.
-    //
-    // Examples with EMIT_POSITIVE_EXPONENT_SIGN deactivated, and
-    //               exponent_character set to 'e'.
-    //   ToExponential(3.12, 1) -> "3.1e0"
-    //   ToExponential(5.0, 3) -> "5.000e0"
-    //   ToExponential(0.001, 2) -> "1.00e-3"
-    //   ToExponential(3.1415, -1) -> "3.1415e0"
-    //   ToExponential(3.1415, 4) -> "3.1415e0"
-    //   ToExponential(3.1415, 3) -> "3.142e0"
-    //   ToExponential(123456789000000, 3) -> "1.235e14"
-    //   ToExponential(1000000000000000019884624838656.0, -1) -> "1e30"
-    //   ToExponential(1000000000000000019884624838656.0, 32) ->
-    //                     "1.00000000000000001988462483865600e30"
-    //   ToExponential(1234, 0) -> "1e3"
-    //
-    // Returns true if the conversion succeeds. The conversion always succeeds
-    // except for the following cases:
-    //   - the input value is special and no infinity_symbol or nan_symbol has
-    //     been provided to the constructor,
-    //   - 'requested_digits' > kMaxExponentialDigits.
-    // The last condition implies that the result will never contain more than
-    // kMaxExponentialDigits + 8 characters (the sign, the digit before the
-    // decimal point, the decimal point, the exponent character, the
-    // exponent's sign, and at most 3 exponent digits).
-    bool ToExponential(double value, int requested_digits, StringBuilder * result_builder) const;
-
-    // Computes 'precision' leading digits of the given 'value' and returns them
-    // either in exponential or decimal format, depending on
-    // max_{leading|trailing}_padding_zeroes_in_precision_mode (given to the
-    // constructor).
-    // The last computed digit is rounded.
-    //
-    // Example with max_leading_padding_zeroes_in_precision_mode = 6.
-    //   ToPrecision(0.0000012345, 2) -> "0.0000012"
-    //   ToPrecision(0.00000012345, 2) -> "1.2e-7"
-    // Similarly the converter may add up to
-    // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid
-    // returning an exponential representation. A zero added by the
-    // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit.
-    // Examples for max_trailing_padding_zeroes_in_precision_mode = 1:
-    //   ToPrecision(230.0, 2) -> "230"
-    //   ToPrecision(230.0, 2) -> "230."  with EMIT_TRAILING_DECIMAL_POINT.
-    //   ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT.
-    // Examples for max_trailing_padding_zeroes_in_precision_mode = 3, and no
-    //    EMIT_TRAILING_ZERO_AFTER_POINT:
-    //   ToPrecision(123450.0, 6) -> "123450"
-    //   ToPrecision(123450.0, 5) -> "123450"
-    //   ToPrecision(123450.0, 4) -> "123500"
-    //   ToPrecision(123450.0, 3) -> "123000"
-    //   ToPrecision(123450.0, 2) -> "1.2e5"
-    //
-    // Returns true if the conversion succeeds. The conversion always succeeds
-    // except for the following cases:
-    //   - the input value is special and no infinity_symbol or nan_symbol has
-    //     been provided to the constructor,
-    //   - precision < kMinPericisionDigits
-    //   - precision > kMaxPrecisionDigits
-    // The last condition implies that the result will never contain more than
-    // kMaxPrecisionDigits + 7 characters (the sign, the decimal point, the
-    // exponent character, the exponent's sign, and at most 3 exponent digits).
-    bool ToPrecision(double value, int precision, StringBuilder * result_builder) const;
-
-    enum DtoaMode
-    {
-        // Produce the shortest correct representation.
-        // For example the output of 0.299999999999999988897 is (the less accurate
-        // but correct) 0.3.
-        SHORTEST,
-        // Same as SHORTEST, but for single-precision floats.
-        SHORTEST_SINGLE,
-        // Produce a fixed number of digits after the decimal point.
-        // For instance fixed(0.1, 4) becomes 0.1000
-        // If the input number is big, the output will be big.
-        FIXED,
-        // Fixed number of digits (independent of the decimal point).
-        PRECISION
-    };
-
-    // The maximal number of digits that are needed to emit a double in base 10.
-    // A higher precision can be achieved by using more digits, but the shortest
-    // accurate representation of any double will never use more digits than
-    // kBase10MaximalLength.
-    // Note that DoubleToAscii null-terminates its input. So the given buffer
-    // should be at least kBase10MaximalLength + 1 characters long.
-    static const int kBase10MaximalLength = 17;
-
-    // Converts the given double 'v' to ascii. 'v' must not be NaN, +Infinity, or
-    // -Infinity. In SHORTEST_SINGLE-mode this restriction also applies to 'v'
-    // after it has been casted to a single-precision float. That is, in this
-    // mode static_cast<float>(v) must not be NaN, +Infinity or -Infinity.
-    //
-    // The result should be interpreted as buffer * 10^(point-length).
-    //
-    // The output depends on the given mode:
-    //  - SHORTEST: produce the least amount of digits for which the internal
-    //   identity requirement is still satisfied. If the digits are printed
-    //   (together with the correct exponent) then reading this number will give
-    //   'v' again. The buffer will choose the representation that is closest to
-    //   'v'. If there are two at the same distance, than the one farther away
-    //   from 0 is chosen (halfway cases - ending with 5 - are rounded up).
-    //   In this mode the 'requested_digits' parameter is ignored.
-    //  - SHORTEST_SINGLE: same as SHORTEST but with single-precision.
-    //  - FIXED: produces digits necessary to print a given number with
-    //   'requested_digits' digits after the decimal point. The produced digits
-    //   might be too short in which case the caller has to fill the remainder
-    //   with '0's.
-    //   Example: toFixed(0.001, 5) is allowed to return buffer="1", point=-2.
-    //   Halfway cases are rounded towards +/-Infinity (away from 0). The call
-    //   toFixed(0.15, 2) thus returns buffer="2", point=0.
-    //   The returned buffer may contain digits that would be truncated from the
-    //   shortest representation of the input.
-    //  - PRECISION: produces 'requested_digits' where the first digit is not '0'.
-    //   Even though the length of produced digits usually equals
-    //   'requested_digits', the function is allowed to return fewer digits, in
-    //   which case the caller has to fill the missing digits with '0's.
-    //   Halfway cases are again rounded away from 0.
-    // DoubleToAscii expects the given buffer to be big enough to hold all
-    // digits and a terminating null-character. In SHORTEST-mode it expects a
-    // buffer of at least kBase10MaximalLength + 1. In all other modes the
-    // requested_digits parameter and the padding-zeroes limit the size of the
-    // output. Don't forget the decimal point, the exponent character and the
-    // terminating null-character when computing the maximal output size.
-    // The given length is only used in debug mode to ensure the buffer is big
-    // enough.
-    static void
-    DoubleToAscii(double v, DtoaMode mode, int requested_digits, char * buffer, int buffer_length, bool * sign, int * length, int * point);
-
-private:
-    // Implementation for ToShortest and ToShortestSingle.
-    bool ToShortestIeeeNumber(double value, StringBuilder * result_builder, DtoaMode mode) const;
-
-    // If the value is a special value (NaN or Infinity) constructs the
-    // corresponding string using the configured infinity/nan-symbol.
-    // If either of them is NULL or the value is not special then the
-    // function returns false.
-    bool HandleSpecialValues(double value, StringBuilder * result_builder) const;
-    // Constructs an exponential representation (i.e. 1.234e56).
-    // The given exponent assumes a decimal point after the first decimal digit.
-    void CreateExponentialRepresentation(const char * decimal_digits, int length, int exponent, StringBuilder * result_builder) const;
-    // Creates a decimal representation (i.e 1234.5678).
-    void CreateDecimalRepresentation(
-        const char * decimal_digits, int length, int decimal_point, int digits_after_point, StringBuilder * result_builder) const;
-
-    const int flags_;
-    const char * const infinity_symbol_;
-    const char * const nan_symbol_;
-    const char exponent_character_;
-    const int decimal_in_shortest_low_;
-    const int decimal_in_shortest_high_;
-    const int max_leading_padding_zeroes_in_precision_mode_;
-    const int max_trailing_padding_zeroes_in_precision_mode_;
-
-    DISALLOW_IMPLICIT_CONSTRUCTORS(DoubleToStringConverter);
-};
-
-
-class StringToDoubleConverter
-{
-public:
-    // Enumeration for allowing octals and ignoring junk when converting
-    // strings to numbers.
-    enum Flags
-    {
-        NO_FLAGS = 0,
-        ALLOW_HEX = 1,
-        ALLOW_OCTALS = 2,
-        ALLOW_TRAILING_JUNK = 4,
-        ALLOW_LEADING_SPACES = 8,
-        ALLOW_TRAILING_SPACES = 16,
-        ALLOW_SPACES_AFTER_SIGN = 32
-    };
-
-    // Flags should be a bit-or combination of the possible Flags-enum.
-    //  - NO_FLAGS: no special flags.
-    //  - ALLOW_HEX: recognizes the prefix "0x". Hex numbers may only be integers.
-    //      Ex: StringToDouble("0x1234") -> 4660.0
-    //          In StringToDouble("0x1234.56") the characters ".56" are trailing
-    //          junk. The result of the call is hence dependent on
-    //          the ALLOW_TRAILING_JUNK flag and/or the junk value.
-    //      With this flag "0x" is a junk-string. Even with ALLOW_TRAILING_JUNK,
-    //      the string will not be parsed as "0" followed by junk.
-    //
-    //  - ALLOW_OCTALS: recognizes the prefix "0" for octals:
-    //      If a sequence of octal digits starts with '0', then the number is
-    //      read as octal integer. Octal numbers may only be integers.
-    //      Ex: StringToDouble("01234") -> 668.0
-    //          StringToDouble("012349") -> 12349.0  // Not a sequence of octal
-    //                                               // digits.
-    //          In StringToDouble("01234.56") the characters ".56" are trailing
-    //          junk. The result of the call is hence dependent on
-    //          the ALLOW_TRAILING_JUNK flag and/or the junk value.
-    //          In StringToDouble("01234e56") the characters "e56" are trailing
-    //          junk, too.
-    //  - ALLOW_TRAILING_JUNK: ignore trailing characters that are not part of
-    //      a double literal.
-    //  - ALLOW_LEADING_SPACES: skip over leading spaces.
-    //  - ALLOW_TRAILING_SPACES: ignore trailing spaces.
-    //  - ALLOW_SPACES_AFTER_SIGN: ignore spaces after the sign.
-    //       Ex: StringToDouble("-   123.2") -> -123.2.
-    //           StringToDouble("+   123.2") -> 123.2
-    //
-    // empty_string_value is returned when an empty string is given as input.
-    // If ALLOW_LEADING_SPACES or ALLOW_TRAILING_SPACES are set, then a string
-    // containing only spaces is converted to the 'empty_string_value', too.
-    //
-    // junk_string_value is returned when
-    //  a) ALLOW_TRAILING_JUNK is not set, and a junk character (a character not
-    //     part of a double-literal) is found.
-    //  b) ALLOW_TRAILING_JUNK is set, but the string does not start with a
-    //     double literal.
-    //
-    // infinity_symbol and nan_symbol are strings that are used to detect
-    // inputs that represent infinity and NaN. They can be null, in which case
-    // they are ignored.
-    // The conversion routine first reads any possible signs. Then it compares the
-    // following character of the input-string with the first character of
-    // the infinity, and nan-symbol. If either matches, the function assumes, that
-    // a match has been found, and expects the following input characters to match
-    // the remaining characters of the special-value symbol.
-    // This means that the following restrictions apply to special-value symbols:
-    //  - they must not start with signs ('+', or '-'),
-    //  - they must not have the same first character.
-    //  - they must not start with digits.
-    //
-    // Examples:
-    //  flags = ALLOW_HEX | ALLOW_TRAILING_JUNK,
-    //  empty_string_value = 0.0,
-    //  junk_string_value = NaN,
-    //  infinity_symbol = "infinity",
-    //  nan_symbol = "nan":
-    //    StringToDouble("0x1234") -> 4660.0.
-    //    StringToDouble("0x1234K") -> 4660.0.
-    //    StringToDouble("") -> 0.0  // empty_string_value.
-    //    StringToDouble(" ") -> NaN  // junk_string_value.
-    //    StringToDouble(" 1") -> NaN  // junk_string_value.
-    //    StringToDouble("0x") -> NaN  // junk_string_value.
-    //    StringToDouble("-123.45") -> -123.45.
-    //    StringToDouble("--123.45") -> NaN  // junk_string_value.
-    //    StringToDouble("123e45") -> 123e45.
-    //    StringToDouble("123E45") -> 123e45.
-    //    StringToDouble("123e+45") -> 123e45.
-    //    StringToDouble("123E-45") -> 123e-45.
-    //    StringToDouble("123e") -> 123.0  // trailing junk ignored.
-    //    StringToDouble("123e-") -> 123.0  // trailing junk ignored.
-    //    StringToDouble("+NaN") -> NaN  // NaN string literal.
-    //    StringToDouble("-infinity") -> -inf.  // infinity literal.
-    //    StringToDouble("Infinity") -> NaN  // junk_string_value.
-    //
-    //  flags = ALLOW_OCTAL | ALLOW_LEADING_SPACES,
-    //  empty_string_value = 0.0,
-    //  junk_string_value = NaN,
-    //  infinity_symbol = NULL,
-    //  nan_symbol = NULL:
-    //    StringToDouble("0x1234") -> NaN  // junk_string_value.
-    //    StringToDouble("01234") -> 668.0.
-    //    StringToDouble("") -> 0.0  // empty_string_value.
-    //    StringToDouble(" ") -> 0.0  // empty_string_value.
-    //    StringToDouble(" 1") -> 1.0
-    //    StringToDouble("0x") -> NaN  // junk_string_value.
-    //    StringToDouble("0123e45") -> NaN  // junk_string_value.
-    //    StringToDouble("01239E45") -> 1239e45.
-    //    StringToDouble("-infinity") -> NaN  // junk_string_value.
-    //    StringToDouble("NaN") -> NaN  // junk_string_value.
-    StringToDoubleConverter(
-        int flags, double empty_string_value, double junk_string_value, const char * infinity_symbol, const char * nan_symbol)
-        : flags_(flags)
-        , empty_string_value_(empty_string_value)
-        , junk_string_value_(junk_string_value)
-        , infinity_symbol_(infinity_symbol)
-        , nan_symbol_(nan_symbol)
-    {
-    }
-
-    // Performs the conversion.
-    // The output parameter 'processed_characters_count' is set to the number
-    // of characters that have been processed to read the number.
-    // Spaces than are processed with ALLOW_{LEADING|TRAILING}_SPACES are included
-    // in the 'processed_characters_count'. Trailing junk is never included.
-    double StringToDouble(const char * buffer, int length, int * processed_characters_count) const
-    {
-        return StringToIeee(buffer, length, processed_characters_count, true);
-    }
-
-    // Same as StringToDouble but reads a float.
-    // Note that this is not equivalent to static_cast<float>(StringToDouble(...))
-    // due to potential double-rounding.
-    float StringToFloat(const char * buffer, int length, int * processed_characters_count) const
-    {
-        return static_cast<float>(StringToIeee(buffer, length, processed_characters_count, false));
-    }
-
-private:
-    const int flags_;
-    const double empty_string_value_;
-    const double junk_string_value_;
-    const char * const infinity_symbol_;
-    const char * const nan_symbol_;
-
-    double StringToIeee(const char * buffer, int length, int * processed_characters_count, bool read_as_double) const;
-
-    DISALLOW_IMPLICIT_CONSTRUCTORS(StringToDoubleConverter);
-};
-
-} // namespace double_conversion
-
-#endif // DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_
diff --git a/base/poco/Foundation/src/fast-dtoa.cc b/base/poco/Foundation/src/fast-dtoa.cc
deleted file mode 100644
index a58f4d4487a..00000000000
--- a/base/poco/Foundation/src/fast-dtoa.cc
+++ /dev/null
@@ -1,665 +0,0 @@
-// Copyright 2012 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "fast-dtoa.h"
-
-#include "cached-powers.h"
-#include "diy-fp.h"
-#include "ieee.h"
-
-namespace double_conversion {
-
-// The minimal and maximal target exponent define the range of w's binary
-// exponent, where 'w' is the result of multiplying the input by a cached power
-// of ten.
-//
-// A different range might be chosen on a different platform, to optimize digit
-// generation, but a smaller range requires more powers of ten to be cached.
-static const int kMinimalTargetExponent = -60;
-static const int kMaximalTargetExponent = -32;
-
-
-// Adjusts the last digit of the generated number, and screens out generated
-// solutions that may be inaccurate. A solution may be inaccurate if it is
-// outside the safe interval, or if we cannot prove that it is closer to the
-// input than a neighboring representation of the same length.
-//
-// Input: * buffer containing the digits of too_high / 10^kappa
-//        * the buffer's length
-//        * distance_too_high_w == (too_high - w).f() * unit
-//        * unsafe_interval == (too_high - too_low).f() * unit
-//        * rest = (too_high - buffer * 10^kappa).f() * unit
-//        * ten_kappa = 10^kappa * unit
-//        * unit = the common multiplier
-// Output: returns true if the buffer is guaranteed to contain the closest
-//    representable number to the input.
-//  Modifies the generated digits in the buffer to approach (round towards) w.
-static bool RoundWeed(Vector<char> buffer,
-                      int length,
-                      uint64_t distance_too_high_w,
-                      uint64_t unsafe_interval,
-                      uint64_t rest,
-                      uint64_t ten_kappa,
-                      uint64_t unit) {
-  uint64_t small_distance = distance_too_high_w - unit;
-  uint64_t big_distance = distance_too_high_w + unit;
-  // Let w_low  = too_high - big_distance, and
-  //     w_high = too_high - small_distance.
-  // Note: w_low < w < w_high
-  //
-  // The real w (* unit) must lie somewhere inside the interval
-  // ]w_low; w_high[ (often written as "(w_low; w_high)")
-
-  // Basically the buffer currently contains a number in the unsafe interval
-  // ]too_low; too_high[ with too_low < w < too_high
-  //
-  //  too_high - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  //                     ^v 1 unit            ^      ^                 ^      ^
-  //  boundary_high ---------------------     .      .                 .      .
-  //                     ^v 1 unit            .      .                 .      .
-  //   - - - - - - - - - - - - - - - - - - -  +  - - + - - - - - -     .      .
-  //                                          .      .         ^       .      .
-  //                                          .  big_distance  .       .      .
-  //                                          .      .         .       .    rest
-  //                              small_distance     .         .       .      .
-  //                                          v      .         .       .      .
-  //  w_high - - - - - - - - - - - - - - - - - -     .         .       .      .
-  //                     ^v 1 unit                   .         .       .      .
-  //  w ----------------------------------------     .         .       .      .
-  //                     ^v 1 unit                   v         .       .      .
-  //  w_low  - - - - - - - - - - - - - - - - - - - - -         .       .      .
-  //                                                           .       .      v
-  //  buffer --------------------------------------------------+-------+--------
-  //                                                           .       .
-  //                                                  safe_interval    .
-  //                                                           v       .
-  //   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -     .
-  //                     ^v 1 unit                                     .
-  //  boundary_low -------------------------                     unsafe_interval
-  //                     ^v 1 unit                                     v
-  //  too_low  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  //
-  //
-  // Note that the value of buffer could lie anywhere inside the range too_low
-  // to too_high.
-  //
-  // boundary_low, boundary_high and w are approximations of the real boundaries
-  // and v (the input number). They are guaranteed to be precise up to one unit.
-  // In fact the error is guaranteed to be strictly less than one unit.
-  //
-  // Anything that lies outside the unsafe interval is guaranteed not to round
-  // to v when read again.
-  // Anything that lies inside the safe interval is guaranteed to round to v
-  // when read again.
-  // If the number inside the buffer lies inside the unsafe interval but not
-  // inside the safe interval then we simply do not know and bail out (returning
-  // false).
-  //
-  // Similarly we have to take into account the imprecision of 'w' when finding
-  // the closest representation of 'w'. If we have two potential
-  // representations, and one is closer to both w_low and w_high, then we know
-  // it is closer to the actual value v.
-  //
-  // By generating the digits of too_high we got the largest (closest to
-  // too_high) buffer that is still in the unsafe interval. In the case where
-  // w_high < buffer < too_high we try to decrement the buffer.
-  // This way the buffer approaches (rounds towards) w.
-  // There are 3 conditions that stop the decrementation process:
-  //   1) the buffer is already below w_high
-  //   2) decrementing the buffer would make it leave the unsafe interval
-  //   3) decrementing the buffer would yield a number below w_high and farther
-  //      away than the current number. In other words:
-  //              (buffer{-1} < w_high) && w_high - buffer{-1} > buffer - w_high
-  // Instead of using the buffer directly we use its distance to too_high.
-  // Conceptually rest ~= too_high - buffer
-  // We need to do the following tests in this order to avoid over- and
-  // underflows.
-  ASSERT(rest <= unsafe_interval);
-  while (rest < small_distance &&  // Negated condition 1
-         unsafe_interval - rest >= ten_kappa &&  // Negated condition 2
-         (rest + ten_kappa < small_distance ||  // buffer{-1} > w_high
-          small_distance - rest >= rest + ten_kappa - small_distance)) {
-    buffer[length - 1]--;
-    rest += ten_kappa;
-  }
-
-  // We have approached w+ as much as possible. We now test if approaching w-
-  // would require changing the buffer. If yes, then we have two possible
-  // representations close to w, but we cannot decide which one is closer.
-  if (rest < big_distance &&
-      unsafe_interval - rest >= ten_kappa &&
-      (rest + ten_kappa < big_distance ||
-       big_distance - rest > rest + ten_kappa - big_distance)) {
-    return false;
-  }
-
-  // Weeding test.
-  //   The safe interval is [too_low + 2 ulp; too_high - 2 ulp]
-  //   Since too_low = too_high - unsafe_interval this is equivalent to
-  //      [too_high - unsafe_interval + 4 ulp; too_high - 2 ulp]
-  //   Conceptually we have: rest ~= too_high - buffer
-  return (2 * unit <= rest) && (rest <= unsafe_interval - 4 * unit);
-}
-
-
-// Rounds the buffer upwards if the result is closer to v by possibly adding
-// 1 to the buffer. If the precision of the calculation is not sufficient to
-// round correctly, return false.
-// The rounding might shift the whole buffer in which case the kappa is
-// adjusted. For example "99", kappa = 3 might become "10", kappa = 4.
-//
-// If 2*rest > ten_kappa then the buffer needs to be round up.
-// rest can have an error of +/- 1 unit. This function accounts for the
-// imprecision and returns false, if the rounding direction cannot be
-// unambiguously determined.
-//
-// Precondition: rest < ten_kappa.
-static bool RoundWeedCounted(Vector<char> buffer,
-                             int length,
-                             uint64_t rest,
-                             uint64_t ten_kappa,
-                             uint64_t unit,
-                             int* kappa) {
-  ASSERT(rest < ten_kappa);
-  // The following tests are done in a specific order to avoid overflows. They
-  // will work correctly with any uint64 values of rest < ten_kappa and unit.
-  //
-  // If the unit is too big, then we don't know which way to round. For example
-  // a unit of 50 means that the real number lies within rest +/- 50. If
-  // 10^kappa == 40 then there is no way to tell which way to round.
-  if (unit >= ten_kappa) return false;
-  // Even if unit is just half the size of 10^kappa we are already completely
-  // lost. (And after the previous test we know that the expression will not
-  // over/underflow.)
-  if (ten_kappa - unit <= unit) return false;
-  // If 2 * (rest + unit) <= 10^kappa we can safely round down.
-  if ((ten_kappa - rest > rest) && (ten_kappa - 2 * rest >= 2 * unit)) {
-    return true;
-  }
-  // If 2 * (rest - unit) >= 10^kappa, then we can safely round up.
-  if ((rest > unit) && (ten_kappa - (rest - unit) <= (rest - unit))) {
-    // Increment the last digit recursively until we find a non '9' digit.
-    buffer[length - 1]++;
-    for (int i = length - 1; i > 0; --i) {
-      if (buffer[i] != '0' + 10) break;
-      buffer[i] = '0';
-      buffer[i - 1]++;
-    }
-    // If the first digit is now '0'+ 10 we had a buffer with all '9's. With the
-    // exception of the first digit all digits are now '0'. Simply switch the
-    // first digit to '1' and adjust the kappa. Example: "99" becomes "10" and
-    // the power (the kappa) is increased.
-    if (buffer[0] == '0' + 10) {
-      buffer[0] = '1';
-      (*kappa) += 1;
-    }
-    return true;
-  }
-  return false;
-}
-
-// Returns the biggest power of ten that is less than or equal to the given
-// number. We furthermore receive the maximum number of bits 'number' has.
-//
-// Returns power == 10^(exponent_plus_one-1) such that
-//    power <= number < power * 10.
-// If number_bits == 0 then 0^(0-1) is returned.
-// The number of bits must be <= 32.
-// Precondition: number < (1 << (number_bits + 1)).
-
-// Inspired by the method for finding an integer log base 10 from here:
-// http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog10
-static unsigned int const kSmallPowersOfTen[] =
-    {0, 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000,
-     1000000000};
-
-static void BiggestPowerTen(uint32_t number,
-                            int number_bits,
-                            uint32_t* power,
-                            int* exponent_plus_one) {
-  ASSERT(number < (1u << (number_bits + 1)));
-  // 1233/4096 is approximately 1/lg(10).
-  int exponent_plus_one_guess = ((number_bits + 1) * 1233 >> 12);
-  // We increment to skip over the first entry in the kPowersOf10 table.
-  // Note: kPowersOf10[i] == 10^(i-1).
-  exponent_plus_one_guess++;
-  // We don't have any guarantees that 2^number_bits <= number.
-  if (number < kSmallPowersOfTen[exponent_plus_one_guess] && exponent_plus_one_guess > 0) {
-    exponent_plus_one_guess--;
-  }
-  *power = kSmallPowersOfTen[exponent_plus_one_guess];
-  *exponent_plus_one = exponent_plus_one_guess;
-}
-
-// Generates the digits of input number w.
-// w is a floating-point number (DiyFp), consisting of a significand and an
-// exponent. Its exponent is bounded by kMinimalTargetExponent and
-// kMaximalTargetExponent.
-//       Hence -60 <= w.e() <= -32.
-//
-// Returns false if it fails, in which case the generated digits in the buffer
-// should not be used.
-// Preconditions:
-//  * low, w and high are correct up to 1 ulp (unit in the last place). That
-//    is, their error must be less than a unit of their last digits.
-//  * low.e() == w.e() == high.e()
-//  * low < w < high, and taking into account their error: low~ <= high~
-//  * kMinimalTargetExponent <= w.e() <= kMaximalTargetExponent
-// Postconditions: returns false if procedure fails.
-//   otherwise:
-//     * buffer is not null-terminated, but len contains the number of digits.
-//     * buffer contains the shortest possible decimal digit-sequence
-//       such that LOW < buffer * 10^kappa < HIGH, where LOW and HIGH are the
-//       correct values of low and high (without their error).
-//     * if more than one decimal representation gives the minimal number of
-//       decimal digits then the one closest to W (where W is the correct value
-//       of w) is chosen.
-// Remark: this procedure takes into account the imprecision of its input
-//   numbers. If the precision is not enough to guarantee all the postconditions
-//   then false is returned. This usually happens rarely (~0.5%).
-//
-// Say, for the sake of example, that
-//   w.e() == -48, and w.f() == 0x1234567890abcdef
-// w's value can be computed by w.f() * 2^w.e()
-// We can obtain w's integral digits by simply shifting w.f() by -w.e().
-//  -> w's integral part is 0x1234
-//  w's fractional part is therefore 0x567890abcdef.
-// Printing w's integral part is easy (simply print 0x1234 in decimal).
-// In order to print its fraction we repeatedly multiply the fraction by 10 and
-// get each digit. Example the first digit after the point would be computed by
-//   (0x567890abcdef * 10) >> 48. -> 3
-// The whole thing becomes slightly more complicated because we want to stop
-// once we have enough digits. That is, once the digits inside the buffer
-// represent 'w' we can stop. Everything inside the interval low - high
-// represents w. However we have to pay attention to low, high and w's
-// imprecision.
-static bool DigitGen(DiyFp low,
-                     DiyFp w,
-                     DiyFp high,
-                     Vector<char> buffer,
-                     int* length,
-                     int* kappa) {
-  ASSERT(low.e() == w.e() && w.e() == high.e());
-  ASSERT(low.f() + 1 <= high.f() - 1);
-  ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent);
-  // low, w and high are imprecise, but by less than one ulp (unit in the last
-  // place).
-  // If we remove (resp. add) 1 ulp from low (resp. high) we are certain that
-  // the new numbers are outside of the interval we want the final
-  // representation to lie in.
-  // Inversely adding (resp. removing) 1 ulp from low (resp. high) would yield
-  // numbers that are certain to lie in the interval. We will use this fact
-  // later on.
-  // We will now start by generating the digits within the uncertain
-  // interval. Later we will weed out representations that lie outside the safe
-  // interval and thus _might_ lie outside the correct interval.
-  uint64_t unit = 1;
-  DiyFp too_low = DiyFp(low.f() - unit, low.e());
-  DiyFp too_high = DiyFp(high.f() + unit, high.e());
-  // too_low and too_high are guaranteed to lie outside the interval we want the
-  // generated number in.
-  DiyFp unsafe_interval = DiyFp::Minus(too_high, too_low);
-  // We now cut the input number into two parts: the integral digits and the
-  // fractionals. We will not write any decimal separator though, but adapt
-  // kappa instead.
-  // Reminder: we are currently computing the digits (stored inside the buffer)
-  // such that:   too_low < buffer * 10^kappa < too_high
-  // We use too_high for the digit_generation and stop as soon as possible.
-  // If we stop early we effectively round down.
-  DiyFp one = DiyFp(static_cast<uint64_t>(1) << -w.e(), w.e());
-  // Division by one is a shift.
-  uint32_t integrals = static_cast<uint32_t>(too_high.f() >> -one.e());
-  // Modulo by one is an and.
-  uint64_t fractionals = too_high.f() & (one.f() - 1);
-  uint32_t divisor;
-  int divisor_exponent_plus_one;
-  BiggestPowerTen(integrals, DiyFp::kSignificandSize - (-one.e()),
-                  &divisor, &divisor_exponent_plus_one);
-  *kappa = divisor_exponent_plus_one;
-  *length = 0;
-  // Loop invariant: buffer = too_high / 10^kappa  (integer division)
-  // The invariant holds for the first iteration: kappa has been initialized
-  // with the divisor exponent + 1. And the divisor is the biggest power of ten
-  // that is smaller than integrals.
-  while (*kappa > 0) {
-    int digit = integrals / divisor;
-    ASSERT(digit <= 9);
-    buffer[*length] = static_cast<char>('0' + digit);
-    (*length)++;
-    integrals %= divisor;
-    (*kappa)--;
-    // Note that kappa now equals the exponent of the divisor and that the
-    // invariant thus holds again.
-    uint64_t rest =
-        (static_cast<uint64_t>(integrals) << -one.e()) + fractionals;
-    // Invariant: too_high = buffer * 10^kappa + DiyFp(rest, one.e())
-    // Reminder: unsafe_interval.e() == one.e()
-    if (rest < unsafe_interval.f()) {
-      // Rounding down (by not emitting the remaining digits) yields a number
-      // that lies within the unsafe interval.
-      return RoundWeed(buffer, *length, DiyFp::Minus(too_high, w).f(),
-                       unsafe_interval.f(), rest,
-                       static_cast<uint64_t>(divisor) << -one.e(), unit);
-    }
-    divisor /= 10;
-  }
-
-  // The integrals have been generated. We are at the point of the decimal
-  // separator. In the following loop we simply multiply the remaining digits by
-  // 10 and divide by one. We just need to pay attention to multiply associated
-  // data (like the interval or 'unit'), too.
-  // Note that the multiplication by 10 does not overflow, because w.e >= -60
-  // and thus one.e >= -60.
-  ASSERT(one.e() >= -60);
-  ASSERT(fractionals < one.f());
-  ASSERT(UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f());
-  for (;;) {
-    fractionals *= 10;
-    unit *= 10;
-    unsafe_interval.set_f(unsafe_interval.f() * 10);
-    // Integer division by one.
-    int digit = static_cast<int>(fractionals >> -one.e());
-    ASSERT(digit <= 9);
-    buffer[*length] = static_cast<char>('0' + digit);
-    (*length)++;
-    fractionals &= one.f() - 1;  // Modulo by one.
-    (*kappa)--;
-    if (fractionals < unsafe_interval.f()) {
-      return RoundWeed(buffer, *length, DiyFp::Minus(too_high, w).f() * unit,
-                       unsafe_interval.f(), fractionals, one.f(), unit);
-    }
-  }
-}
-
-
-
-// Generates (at most) requested_digits digits of input number w.
-// w is a floating-point number (DiyFp), consisting of a significand and an
-// exponent. Its exponent is bounded by kMinimalTargetExponent and
-// kMaximalTargetExponent.
-//       Hence -60 <= w.e() <= -32.
-//
-// Returns false if it fails, in which case the generated digits in the buffer
-// should not be used.
-// Preconditions:
-//  * w is correct up to 1 ulp (unit in the last place). That
-//    is, its error must be strictly less than a unit of its last digit.
-//  * kMinimalTargetExponent <= w.e() <= kMaximalTargetExponent
-//
-// Postconditions: returns false if procedure fails.
-//   otherwise:
-//     * buffer is not null-terminated, but length contains the number of
-//       digits.
-//     * the representation in buffer is the most precise representation of
-//       requested_digits digits.
-//     * buffer contains at most requested_digits digits of w. If there are less
-//       than requested_digits digits then some trailing '0's have been removed.
-//     * kappa is such that
-//            w = buffer * 10^kappa + eps with |eps| < 10^kappa / 2.
-//
-// Remark: This procedure takes into account the imprecision of its input
-//   numbers. If the precision is not enough to guarantee all the postconditions
-//   then false is returned. This usually happens rarely, but the failure-rate
-//   increases with higher requested_digits.
-static bool DigitGenCounted(DiyFp w,
-                            int requested_digits,
-                            Vector<char> buffer,
-                            int* length,
-                            int* kappa) {
-  ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent);
-  ASSERT(kMinimalTargetExponent >= -60);
-  ASSERT(kMaximalTargetExponent <= -32);
-  // w is assumed to have an error less than 1 unit. Whenever w is scaled we
-  // also scale its error.
-  uint64_t w_error = 1;
-  // We cut the input number into two parts: the integral digits and the
-  // fractional digits. We don't emit any decimal separator, but adapt kappa
-  // instead. Example: instead of writing "1.2" we put "12" into the buffer and
-  // increase kappa by 1.
-  DiyFp one = DiyFp(static_cast<uint64_t>(1) << -w.e(), w.e());
-  // Division by one is a shift.
-  uint32_t integrals = static_cast<uint32_t>(w.f() >> -one.e());
-  // Modulo by one is an and.
-  uint64_t fractionals = w.f() & (one.f() - 1);
-  uint32_t divisor;
-  int divisor_exponent_plus_one;
-  BiggestPowerTen(integrals, DiyFp::kSignificandSize - (-one.e()),
-                  &divisor, &divisor_exponent_plus_one);
-  *kappa = divisor_exponent_plus_one;
-  *length = 0;
-
-  // Loop invariant: buffer = w / 10^kappa  (integer division)
-  // The invariant holds for the first iteration: kappa has been initialized
-  // with the divisor exponent + 1. And the divisor is the biggest power of ten
-  // that is smaller than 'integrals'.
-  while (*kappa > 0) {
-    int digit = integrals / divisor;
-    ASSERT(digit <= 9);
-    buffer[*length] = static_cast<char>('0' + digit);
-    (*length)++;
-    requested_digits--;
-    integrals %= divisor;
-    (*kappa)--;
-    // Note that kappa now equals the exponent of the divisor and that the
-    // invariant thus holds again.
-    if (requested_digits == 0) break;
-    divisor /= 10;
-  }
-
-  if (requested_digits == 0) {
-    uint64_t rest =
-        (static_cast<uint64_t>(integrals) << -one.e()) + fractionals;
-    return RoundWeedCounted(buffer, *length, rest,
-                            static_cast<uint64_t>(divisor) << -one.e(), w_error,
-                            kappa);
-  }
-
-  // The integrals have been generated. We are at the point of the decimal
-  // separator. In the following loop we simply multiply the remaining digits by
-  // 10 and divide by one. We just need to pay attention to multiply associated
-  // data (the 'unit'), too.
-  // Note that the multiplication by 10 does not overflow, because w.e >= -60
-  // and thus one.e >= -60.
-  ASSERT(one.e() >= -60);
-  ASSERT(fractionals < one.f());
-  ASSERT(UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f());
-  while (requested_digits > 0 && fractionals > w_error) {
-    fractionals *= 10;
-    w_error *= 10;
-    // Integer division by one.
-    int digit = static_cast<int>(fractionals >> -one.e());
-    ASSERT(digit <= 9);
-    buffer[*length] = static_cast<char>('0' + digit);
-    (*length)++;
-    requested_digits--;
-    fractionals &= one.f() - 1;  // Modulo by one.
-    (*kappa)--;
-  }
-  if (requested_digits != 0) return false;
-  return RoundWeedCounted(buffer, *length, fractionals, one.f(), w_error,
-                          kappa);
-}
-
-
-// Provides a decimal representation of v.
-// Returns true if it succeeds, otherwise the result cannot be trusted.
-// There will be *length digits inside the buffer (not null-terminated).
-// If the function returns true then
-//        v == (double) (buffer * 10^decimal_exponent).
-// The digits in the buffer are the shortest representation possible: no
-// 0.09999999999999999 instead of 0.1. The shorter representation will even be
-// chosen even if the longer one would be closer to v.
-// The last digit will be closest to the actual v. That is, even if several
-// digits might correctly yield 'v' when read again, the closest will be
-// computed.
-static bool Grisu3(double v,
-                   FastDtoaMode mode,
-                   Vector<char> buffer,
-                   int* length,
-                   int* decimal_exponent) {
-  DiyFp w = Double(v).AsNormalizedDiyFp();
-  // boundary_minus and boundary_plus are the boundaries between v and its
-  // closest floating-point neighbors. Any number strictly between
-  // boundary_minus and boundary_plus will round to v when convert to a double.
-  // Grisu3 will never output representations that lie exactly on a boundary.
-  DiyFp boundary_minus, boundary_plus;
-  if (mode == FAST_DTOA_SHORTEST) {
-    Double(v).NormalizedBoundaries(&boundary_minus, &boundary_plus);
-  } else {
-    ASSERT(mode == FAST_DTOA_SHORTEST_SINGLE);
-    float single_v = static_cast<float>(v);
-    Single(single_v).NormalizedBoundaries(&boundary_minus, &boundary_plus);
-  }
-  ASSERT(boundary_plus.e() == w.e());
-  DiyFp ten_mk;  // Cached power of ten: 10^-k
-  int mk;        // -k
-  int ten_mk_minimal_binary_exponent =
-     kMinimalTargetExponent - (w.e() + DiyFp::kSignificandSize);
-  int ten_mk_maximal_binary_exponent =
-     kMaximalTargetExponent - (w.e() + DiyFp::kSignificandSize);
-  PowersOfTenCache::GetCachedPowerForBinaryExponentRange(
-      ten_mk_minimal_binary_exponent,
-      ten_mk_maximal_binary_exponent,
-      &ten_mk, &mk);
-  ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() +
-          DiyFp::kSignificandSize) &&
-         (kMaximalTargetExponent >= w.e() + ten_mk.e() +
-          DiyFp::kSignificandSize));
-  // Note that ten_mk is only an approximation of 10^-k. A DiyFp only contains a
-  // 64 bit significand and ten_mk is thus only precise up to 64 bits.
-
-  // The DiyFp::Times procedure rounds its result, and ten_mk is approximated
-  // too. The variable scaled_w (as well as scaled_boundary_minus/plus) are now
-  // off by a small amount.
-  // In fact: scaled_w - w*10^k < 1ulp (unit in the last place) of scaled_w.
-  // In other words: let f = scaled_w.f() and e = scaled_w.e(), then
-  //           (f-1) * 2^e < w*10^k < (f+1) * 2^e
-  DiyFp scaled_w = DiyFp::Times(w, ten_mk);
-  ASSERT(scaled_w.e() ==
-         boundary_plus.e() + ten_mk.e() + DiyFp::kSignificandSize);
-  // In theory it would be possible to avoid some recomputations by computing
-  // the difference between w and boundary_minus/plus (a power of 2) and to
-  // compute scaled_boundary_minus/plus by subtracting/adding from
-  // scaled_w. However the code becomes much less readable and the speed
-  // enhancements are not terrific.
-  DiyFp scaled_boundary_minus = DiyFp::Times(boundary_minus, ten_mk);
-  DiyFp scaled_boundary_plus  = DiyFp::Times(boundary_plus,  ten_mk);
-
-  // DigitGen will generate the digits of scaled_w. Therefore we have
-  // v == (double) (scaled_w * 10^-mk).
-  // Set decimal_exponent == -mk and pass it to DigitGen. If scaled_w is not an
-  // integer than it will be updated. For instance if scaled_w == 1.23 then
-  // the buffer will be filled with "123" und the decimal_exponent will be
-  // decreased by 2.
-  int kappa;
-  bool result = DigitGen(scaled_boundary_minus, scaled_w, scaled_boundary_plus,
-                         buffer, length, &kappa);
-  *decimal_exponent = -mk + kappa;
-  return result;
-}
-
-
-// The "counted" version of grisu3 (see above) only generates requested_digits
-// number of digits. This version does not generate the shortest representation,
-// and with enough requested digits 0.1 will at some point print as 0.9999999...
-// Grisu3 is too imprecise for real halfway cases (1.5 will not work) and
-// therefore the rounding strategy for halfway cases is irrelevant.
-static bool Grisu3Counted(double v,
-                          int requested_digits,
-                          Vector<char> buffer,
-                          int* length,
-                          int* decimal_exponent) {
-  DiyFp w = Double(v).AsNormalizedDiyFp();
-  DiyFp ten_mk;  // Cached power of ten: 10^-k
-  int mk;        // -k
-  int ten_mk_minimal_binary_exponent =
-     kMinimalTargetExponent - (w.e() + DiyFp::kSignificandSize);
-  int ten_mk_maximal_binary_exponent =
-     kMaximalTargetExponent - (w.e() + DiyFp::kSignificandSize);
-  PowersOfTenCache::GetCachedPowerForBinaryExponentRange(
-      ten_mk_minimal_binary_exponent,
-      ten_mk_maximal_binary_exponent,
-      &ten_mk, &mk);
-  ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() +
-          DiyFp::kSignificandSize) &&
-         (kMaximalTargetExponent >= w.e() + ten_mk.e() +
-          DiyFp::kSignificandSize));
-  // Note that ten_mk is only an approximation of 10^-k. A DiyFp only contains a
-  // 64 bit significand and ten_mk is thus only precise up to 64 bits.
-
-  // The DiyFp::Times procedure rounds its result, and ten_mk is approximated
-  // too. The variable scaled_w (as well as scaled_boundary_minus/plus) are now
-  // off by a small amount.
-  // In fact: scaled_w - w*10^k < 1ulp (unit in the last place) of scaled_w.
-  // In other words: let f = scaled_w.f() and e = scaled_w.e(), then
-  //           (f-1) * 2^e < w*10^k < (f+1) * 2^e
-  DiyFp scaled_w = DiyFp::Times(w, ten_mk);
-
-  // We now have (double) (scaled_w * 10^-mk).
-  // DigitGen will generate the first requested_digits digits of scaled_w and
-  // return together with a kappa such that scaled_w ~= buffer * 10^kappa. (It
-  // will not always be exactly the same since DigitGenCounted only produces a
-  // limited number of digits.)
-  int kappa;
-  bool result = DigitGenCounted(scaled_w, requested_digits,
-                                buffer, length, &kappa);
-  *decimal_exponent = -mk + kappa;
-  return result;
-}
-
-
-bool FastDtoa(double v,
-              FastDtoaMode mode,
-              int requested_digits,
-              Vector<char> buffer,
-              int* length,
-              int* decimal_point) {
-  ASSERT(v > 0);
-  ASSERT(!Double(v).IsSpecial());
-
-  bool result = false;
-  int decimal_exponent = 0;
-  switch (mode) {
-    case FAST_DTOA_SHORTEST:
-    case FAST_DTOA_SHORTEST_SINGLE:
-      result = Grisu3(v, mode, buffer, length, &decimal_exponent);
-      break;
-    case FAST_DTOA_PRECISION:
-      result = Grisu3Counted(v, requested_digits,
-                             buffer, length, &decimal_exponent);
-      break;
-    default:
-      UNREACHABLE();
-  }
-  if (result) {
-    *decimal_point = *length + decimal_exponent;
-    buffer[*length] = '\0';
-  }
-  return result;
-}
-
-}  // namespace double_conversion
diff --git a/base/poco/Foundation/src/fast-dtoa.h b/base/poco/Foundation/src/fast-dtoa.h
deleted file mode 100644
index dc3be8b71b0..00000000000
--- a/base/poco/Foundation/src/fast-dtoa.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef DOUBLE_CONVERSION_FAST_DTOA_H_
-#define DOUBLE_CONVERSION_FAST_DTOA_H_
-
-#include "utils.h"
-
-namespace double_conversion
-{
-
-enum FastDtoaMode
-{
-    // Computes the shortest representation of the given input. The returned
-    // result will be the most accurate number of this length. Longer
-    // representations might be more accurate.
-    FAST_DTOA_SHORTEST,
-    // Same as FAST_DTOA_SHORTEST but for single-precision floats.
-    FAST_DTOA_SHORTEST_SINGLE,
-    // Computes a representation where the precision (number of digits) is
-    // given as input. The precision is independent of the decimal point.
-    FAST_DTOA_PRECISION
-};
-
-// FastDtoa will produce at most kFastDtoaMaximalLength digits. This does not
-// include the terminating '\0' character.
-static const int kFastDtoaMaximalLength = 17;
-// Same for single-precision numbers.
-static const int kFastDtoaMaximalSingleLength = 9;
-
-// Provides a decimal representation of v.
-// The result should be interpreted as buffer * 10^(point - length).
-//
-// Precondition:
-//   * v must be a strictly positive finite double.
-//
-// Returns true if it succeeds, otherwise the result can not be trusted.
-// There will be *length digits inside the buffer followed by a null terminator.
-// If the function returns true and mode equals
-//   - FAST_DTOA_SHORTEST, then
-//     the parameter requested_digits is ignored.
-//     The result satisfies
-//         v == (double) (buffer * 10^(point - length)).
-//     The digits in the buffer are the shortest representation possible. E.g.
-//     if 0.099999999999 and 0.1 represent the same double then "1" is returned
-//     with point = 0.
-//     The last digit will be closest to the actual v. That is, even if several
-//     digits might correctly yield 'v' when read again, the buffer will contain
-//     the one closest to v.
-//   - FAST_DTOA_PRECISION, then
-//     the buffer contains requested_digits digits.
-//     the difference v - (buffer * 10^(point-length)) is closest to zero for
-//     all possible representations of requested_digits digits.
-//     If there are two values that are equally close, then FastDtoa returns
-//     false.
-// For both modes the buffer must be large enough to hold the result.
-bool FastDtoa(double d, FastDtoaMode mode, int requested_digits, Vector<char> buffer, int * length, int * decimal_point);
-
-} // namespace double_conversion
-
-#endif // DOUBLE_CONVERSION_FAST_DTOA_H_
diff --git a/base/poco/Foundation/src/fixed-dtoa.cc b/base/poco/Foundation/src/fixed-dtoa.cc
deleted file mode 100644
index 390e823d95e..00000000000
--- a/base/poco/Foundation/src/fixed-dtoa.cc
+++ /dev/null
@@ -1,404 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <math.h>
-
-#include "fixed-dtoa.h"
-#include "ieee.h"
-
-namespace double_conversion {
-
-// Represents a 128bit type. This class should be replaced by a native type on
-// platforms that support 128bit integers.
-class UInt128 {
- public:
-  UInt128() : high_bits_(0), low_bits_(0) { }
-  UInt128(uint64_t high, uint64_t low) : high_bits_(high), low_bits_(low) { }
-
-  void Multiply(uint32_t multiplicand) {
-    uint64_t accumulator;
-
-    accumulator = (low_bits_ & kMask32) * multiplicand;
-    uint32_t part = static_cast<uint32_t>(accumulator & kMask32);
-    accumulator >>= 32;
-    accumulator = accumulator + (low_bits_ >> 32) * multiplicand;
-    low_bits_ = (accumulator << 32) + part;
-    accumulator >>= 32;
-    accumulator = accumulator + (high_bits_ & kMask32) * multiplicand;
-    part = static_cast<uint32_t>(accumulator & kMask32);
-    accumulator >>= 32;
-    accumulator = accumulator + (high_bits_ >> 32) * multiplicand;
-    high_bits_ = (accumulator << 32) + part;
-    ASSERT((accumulator >> 32) == 0);
-  }
-
-  void Shift(int shift_amount) {
-    ASSERT(-64 <= shift_amount && shift_amount <= 64);
-    if (shift_amount == 0) {
-      return;
-    } else if (shift_amount == -64) {
-      high_bits_ = low_bits_;
-      low_bits_ = 0;
-    } else if (shift_amount == 64) {
-      low_bits_ = high_bits_;
-      high_bits_ = 0;
-    } else if (shift_amount <= 0) {
-      high_bits_ <<= -shift_amount;
-      high_bits_ += low_bits_ >> (64 + shift_amount);
-      low_bits_ <<= -shift_amount;
-    } else {
-      low_bits_ >>= shift_amount;
-      low_bits_ += high_bits_ << (64 - shift_amount);
-      high_bits_ >>= shift_amount;
-    }
-  }
-
-  // Modifies *this to *this MOD (2^power).
-  // Returns *this DIV (2^power).
-  int DivModPowerOf2(int power) {
-    if (power >= 64) {
-      int result = static_cast<int>(high_bits_ >> (power - 64));
-      high_bits_ -= static_cast<uint64_t>(result) << (power - 64);
-      return result;
-    } else {
-      uint64_t part_low = low_bits_ >> power;
-      uint64_t part_high = high_bits_ << (64 - power);
-      int result = static_cast<int>(part_low + part_high);
-      high_bits_ = 0;
-      low_bits_ -= part_low << power;
-      return result;
-    }
-  }
-
-  bool IsZero() const {
-    return high_bits_ == 0 && low_bits_ == 0;
-  }
-
-  int BitAt(int position) {
-    if (position >= 64) {
-      return static_cast<int>(high_bits_ >> (position - 64)) & 1;
-    } else {
-      return static_cast<int>(low_bits_ >> position) & 1;
-    }
-  }
-
- private:
-  static const uint64_t kMask32 = 0xFFFFFFFF;
-  // Value == (high_bits_ << 64) + low_bits_
-  uint64_t high_bits_;
-  uint64_t low_bits_;
-};
-
-
-static const int kDoubleSignificandSize = 53;  // Includes the hidden bit.
-
-
-static void FillDigits32FixedLength(uint32_t number, int requested_length,
-                                    Vector<char> buffer, int* length) {
-  for (int i = requested_length - 1; i >= 0; --i) {
-    buffer[(*length) + i] = '0' + number % 10;
-    number /= 10;
-  }
-  *length += requested_length;
-}
-
-
-static void FillDigits32(uint32_t number, Vector<char> buffer, int* length) {
-  int number_length = 0;
-  // We fill the digits in reverse order and exchange them afterwards.
-  while (number != 0) {
-    int digit = number % 10;
-    number /= 10;
-    buffer[(*length) + number_length] = static_cast<char>('0' + digit);
-    number_length++;
-  }
-  // Exchange the digits.
-  int i = *length;
-  int j = *length + number_length - 1;
-  while (i < j) {
-    char tmp = buffer[i];
-    buffer[i] = buffer[j];
-    buffer[j] = tmp;
-    i++;
-    j--;
-  }
-  *length += number_length;
-}
-
-
-static void FillDigits64FixedLength(uint64_t number,
-                                    Vector<char> buffer, int* length) {
-  const uint32_t kTen7 = 10000000;
-  // For efficiency cut the number into 3 uint32_t parts, and print those.
-  uint32_t part2 = static_cast<uint32_t>(number % kTen7);
-  number /= kTen7;
-  uint32_t part1 = static_cast<uint32_t>(number % kTen7);
-  uint32_t part0 = static_cast<uint32_t>(number / kTen7);
-
-  FillDigits32FixedLength(part0, 3, buffer, length);
-  FillDigits32FixedLength(part1, 7, buffer, length);
-  FillDigits32FixedLength(part2, 7, buffer, length);
-}
-
-
-static void FillDigits64(uint64_t number, Vector<char> buffer, int* length) {
-  const uint32_t kTen7 = 10000000;
-  // For efficiency cut the number into 3 uint32_t parts, and print those.
-  uint32_t part2 = static_cast<uint32_t>(number % kTen7);
-  number /= kTen7;
-  uint32_t part1 = static_cast<uint32_t>(number % kTen7);
-  uint32_t part0 = static_cast<uint32_t>(number / kTen7);
-
-  if (part0 != 0) {
-    FillDigits32(part0, buffer, length);
-    FillDigits32FixedLength(part1, 7, buffer, length);
-    FillDigits32FixedLength(part2, 7, buffer, length);
-  } else if (part1 != 0) {
-    FillDigits32(part1, buffer, length);
-    FillDigits32FixedLength(part2, 7, buffer, length);
-  } else {
-    FillDigits32(part2, buffer, length);
-  }
-}
-
-
-static void RoundUp(Vector<char> buffer, int* length, int* decimal_point) {
-  // An empty buffer represents 0.
-  if (*length == 0) {
-    buffer[0] = '1';
-    *decimal_point = 1;
-    *length = 1;
-    return;
-  }
-  // Round the last digit until we either have a digit that was not '9' or until
-  // we reached the first digit.
-  buffer[(*length) - 1]++;
-  for (int i = (*length) - 1; i > 0; --i) {
-    if (buffer[i] != '0' + 10) {
-      return;
-    }
-    buffer[i] = '0';
-    buffer[i - 1]++;
-  }
-  // If the first digit is now '0' + 10, we would need to set it to '0' and add
-  // a '1' in front. However we reach the first digit only if all following
-  // digits had been '9' before rounding up. Now all trailing digits are '0' and
-  // we simply switch the first digit to '1' and update the decimal-point
-  // (indicating that the point is now one digit to the right).
-  if (buffer[0] == '0' + 10) {
-    buffer[0] = '1';
-    (*decimal_point)++;
-  }
-}
-
-
-// The given fractionals number represents a fixed-point number with binary
-// point at bit (-exponent).
-// Preconditions:
-//   -128 <= exponent <= 0.
-//   0 <= fractionals * 2^exponent < 1
-//   The buffer holds the result.
-// The function will round its result. During the rounding-process digits not
-// generated by this function might be updated, and the decimal-point variable
-// might be updated. If this function generates the digits 99 and the buffer
-// already contained "199" (thus yielding a buffer of "19999") then a
-// rounding-up will change the contents of the buffer to "20000".
-static void FillFractionals(uint64_t fractionals, int exponent,
-                            int fractional_count, Vector<char> buffer,
-                            int* length, int* decimal_point) {
-  ASSERT(-128 <= exponent && exponent <= 0);
-  // 'fractionals' is a fixed-point number, with binary point at bit
-  // (-exponent). Inside the function the non-converted remainder of fractionals
-  // is a fixed-point number, with binary point at bit 'point'.
-  if (-exponent <= 64) {
-    // One 64 bit number is sufficient.
-    ASSERT(fractionals >> 56 == 0);
-    int point = -exponent;
-    for (int i = 0; i < fractional_count; ++i) {
-      if (fractionals == 0) break;
-      // Instead of multiplying by 10 we multiply by 5 and adjust the point
-      // location. This way the fractionals variable will not overflow.
-      // Invariant at the beginning of the loop: fractionals < 2^point.
-      // Initially we have: point <= 64 and fractionals < 2^56
-      // After each iteration the point is decremented by one.
-      // Note that 5^3 = 125 < 128 = 2^7.
-      // Therefore three iterations of this loop will not overflow fractionals
-      // (even without the subtraction at the end of the loop body). At this
-      // time point will satisfy point <= 61 and therefore fractionals < 2^point
-      // and any further multiplication of fractionals by 5 will not overflow.
-      fractionals *= 5;
-      point--;
-      int digit = static_cast<int>(fractionals >> point);
-      ASSERT(digit <= 9);
-      buffer[*length] = static_cast<char>('0' + digit);
-      (*length)++;
-      fractionals -= static_cast<uint64_t>(digit) << point;
-    }
-    // If the first bit after the point is set we have to round up.
-    if (((fractionals >> (point - 1)) & 1) == 1) {
-      RoundUp(buffer, length, decimal_point);
-    }
-  } else {  // We need 128 bits.
-    ASSERT(64 < -exponent && -exponent <= 128);
-    UInt128 fractionals128 = UInt128(fractionals, 0);
-    fractionals128.Shift(-exponent - 64);
-    int point = 128;
-    for (int i = 0; i < fractional_count; ++i) {
-      if (fractionals128.IsZero()) break;
-      // As before: instead of multiplying by 10 we multiply by 5 and adjust the
-      // point location.
-      // This multiplication will not overflow for the same reasons as before.
-      fractionals128.Multiply(5);
-      point--;
-      int digit = fractionals128.DivModPowerOf2(point);
-      ASSERT(digit <= 9);
-      buffer[*length] = static_cast<char>('0' + digit);
-      (*length)++;
-    }
-    if (fractionals128.BitAt(point - 1) == 1) {
-      RoundUp(buffer, length, decimal_point);
-    }
-  }
-}
-
-
-// Removes leading and trailing zeros.
-// If leading zeros are removed then the decimal point position is adjusted.
-static void TrimZeros(Vector<char> buffer, int* length, int* decimal_point) {
-  while (*length > 0 && buffer[(*length) - 1] == '0') {
-    (*length)--;
-  }
-  int first_non_zero = 0;
-  while (first_non_zero < *length && buffer[first_non_zero] == '0') {
-    first_non_zero++;
-  }
-  if (first_non_zero != 0) {
-    for (int i = first_non_zero; i < *length; ++i) {
-      buffer[i - first_non_zero] = buffer[i];
-    }
-    *length -= first_non_zero;
-    *decimal_point -= first_non_zero;
-  }
-}
-
-
-bool FastFixedDtoa(double v,
-                   int fractional_count,
-                   Vector<char> buffer,
-                   int* length,
-                   int* decimal_point) {
-  const uint32_t kMaxUInt32 = 0xFFFFFFFF;
-  uint64_t significand = Double(v).Significand();
-  int exponent = Double(v).Exponent();
-  // v = significand * 2^exponent (with significand a 53bit integer).
-  // If the exponent is larger than 20 (i.e. we may have a 73bit number) then we
-  // don't know how to compute the representation. 2^73 ~= 9.5*10^21.
-  // If necessary this limit could probably be increased, but we don't need
-  // more.
-  if (exponent > 20) return false;
-  if (fractional_count > 20) return false;
-  *length = 0;
-  // At most kDoubleSignificandSize bits of the significand are non-zero.
-  // Given a 64 bit integer we have 11 0s followed by 53 potentially non-zero
-  // bits:  0..11*..0xxx..53*..xx
-  if (exponent + kDoubleSignificandSize > 64) {
-    // The exponent must be > 11.
-    //
-    // We know that v = significand * 2^exponent.
-    // And the exponent > 11.
-    // We simplify the task by dividing v by 10^17.
-    // The quotient delivers the first digits, and the remainder fits into a 64
-    // bit number.
-    // Dividing by 10^17 is equivalent to dividing by 5^17*2^17.
-    const uint64_t kFive17 = UINT64_2PART_C(0xB1, A2BC2EC5);  // 5^17
-    uint64_t divisor = kFive17;
-    int divisor_power = 17;
-    uint64_t dividend = significand;
-    uint32_t quotient;
-    uint64_t remainder;
-    // Let v = f * 2^e with f == significand and e == exponent.
-    // Then need q (quotient) and r (remainder) as follows:
-    //   v            = q * 10^17       + r
-    //   f * 2^e      = q * 10^17       + r
-    //   f * 2^e      = q * 5^17 * 2^17 + r
-    // If e > 17 then
-    //   f * 2^(e-17) = q * 5^17        + r/2^17
-    // else
-    //   f  = q * 5^17 * 2^(17-e) + r/2^e
-    if (exponent > divisor_power) {
-      // We only allow exponents of up to 20 and therefore (17 - e) <= 3
-      dividend <<= exponent - divisor_power;
-      quotient = static_cast<uint32_t>(dividend / divisor);
-      remainder = (dividend % divisor) << divisor_power;
-    } else {
-      divisor <<= divisor_power - exponent;
-      quotient = static_cast<uint32_t>(dividend / divisor);
-      remainder = (dividend % divisor) << exponent;
-    }
-    FillDigits32(quotient, buffer, length);
-    FillDigits64FixedLength(remainder, buffer, length);
-    *decimal_point = *length;
-  } else if (exponent >= 0) {
-    // 0 <= exponent <= 11
-    significand <<= exponent;
-    FillDigits64(significand, buffer, length);
-    *decimal_point = *length;
-  } else if (exponent > -kDoubleSignificandSize) {
-    // We have to cut the number.
-    uint64_t integrals = significand >> -exponent;
-    uint64_t fractionals = significand - (integrals << -exponent);
-    if (integrals > kMaxUInt32) {
-      FillDigits64(integrals, buffer, length);
-    } else {
-      FillDigits32(static_cast<uint32_t>(integrals), buffer, length);
-    }
-    *decimal_point = *length;
-    FillFractionals(fractionals, exponent, fractional_count,
-                    buffer, length, decimal_point);
-  } else if (exponent < -128) {
-    // This configuration (with at most 20 digits) means that all digits must be
-    // 0.
-    ASSERT(fractional_count <= 20);
-    buffer[0] = '\0';
-    *length = 0;
-    *decimal_point = -fractional_count;
-  } else {
-    *decimal_point = 0;
-    FillFractionals(significand, exponent, fractional_count,
-                    buffer, length, decimal_point);
-  }
-  TrimZeros(buffer, length, decimal_point);
-  buffer[*length] = '\0';
-  if ((*length) == 0) {
-    // The string is empty and the decimal_point thus has no importance. Mimic
-    // Gay's dtoa and and set it to -fractional_count.
-    *decimal_point = -fractional_count;
-  }
-  return true;
-}
-
-}  // namespace double_conversion
diff --git a/base/poco/Foundation/src/fixed-dtoa.h b/base/poco/Foundation/src/fixed-dtoa.h
deleted file mode 100644
index c39eecce51f..00000000000
--- a/base/poco/Foundation/src/fixed-dtoa.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef DOUBLE_CONVERSION_FIXED_DTOA_H_
-#define DOUBLE_CONVERSION_FIXED_DTOA_H_
-
-#include "utils.h"
-
-namespace double_conversion
-{
-
-// Produces digits necessary to print a given number with
-// 'fractional_count' digits after the decimal point.
-// The buffer must be big enough to hold the result plus one terminating null
-// character.
-//
-// The produced digits might be too short in which case the caller has to fill
-// the gaps with '0's.
-// Example: FastFixedDtoa(0.001, 5, ...) is allowed to return buffer = "1", and
-// decimal_point = -2.
-// Halfway cases are rounded towards +/-Infinity (away from 0). The call
-// FastFixedDtoa(0.15, 2, ...) thus returns buffer = "2", decimal_point = 0.
-// The returned buffer may contain digits that would be truncated from the
-// shortest representation of the input.
-//
-// This method only works for some parameters. If it can't handle the input it
-// returns false. The output is null-terminated when the function succeeds.
-bool FastFixedDtoa(double v, int fractional_count, Vector<char> buffer, int * length, int * decimal_point);
-
-} // namespace double_conversion
-
-#endif // DOUBLE_CONVERSION_FIXED_DTOA_H_
diff --git a/base/poco/Foundation/src/gzguts.h b/base/poco/Foundation/src/gzguts.h
deleted file mode 100644
index 1b964756065..00000000000
--- a/base/poco/Foundation/src/gzguts.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef _LARGEFILE64_SOURCE
-#    ifndef _LARGEFILE_SOURCE
-#        define _LARGEFILE_SOURCE 1
-#    endif
-#    ifdef _FILE_OFFSET_BITS
-#        undef _FILE_OFFSET_BITS
-#    endif
-#endif
-
-#ifdef HAVE_HIDDEN
-#    define ZLIB_INTERNAL __attribute__((visibility("hidden")))
-#else
-#    define ZLIB_INTERNAL
-#endif
-
-#include <stdio.h>
-#include "zlib.h"
-#ifdef STDC
-#    include <limits.h>
-#    include <stdlib.h>
-#    include <string.h>
-#endif
-
-#ifndef _POSIX_SOURCE
-#    define _POSIX_SOURCE
-#endif
-#include <fcntl.h>
-
-
-#    if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
-#        include <io.h>
-#    endif
-#if defined(_WIN32) || defined(__CYGWIN__)
-#    define WIDECHAR
-#endif
-
-#ifdef WINAPI_FAMILY
-#    define open _open
-#    define read _read
-#    define write _write
-#    define close _close
-#endif
-
-#ifdef NO_DEFLATE /* for compatibility with old definition */
-#    define NO_GZCOMPRESS
-#endif
-
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-#    ifndef HAVE_VSNPRINTF
-#        define HAVE_VSNPRINTF
-#    endif
-#endif
-
-
-#ifndef HAVE_VSNPRINTF
-#    ifdef __TURBOC__
-#        define NO_vsnprintf
-#    endif
-#    ifdef WIN32
-/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#        if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#                define vsnprintf _vsnprintf
-#        endif
-#    endif
-#    ifdef __SASC
-#        define NO_vsnprintf
-#    endif
-#    ifdef VMS
-#        define NO_vsnprintf
-#    endif
-#    ifdef __OS400__
-#        define NO_vsnprintf
-#    endif
-#    ifdef __MVS__
-#        define NO_vsnprintf
-#    endif
-#endif
-
-/* unlike snprintf (which is required in C99), _snprintf does not guarantee
-   null termination of the result -- however this is only used in gzlib.c where
-   the result is assured to fit in the space provided */
-
-#ifndef local
-#    define local static
-#endif
-/* since "static" is used to mean two completely different things in C, we
-   define "local" for the non-static meaning of "static", for readability
-   (compile with -Dlocal if your debugger can't find static symbols) */
-
-/* gz* functions always use library allocation functions */
-#ifndef STDC
-extern voidp malloc OF((uInt size));
-extern void free OF((voidpf ptr));
-#endif
-
-/* get errno and strerror definition */
-#if defined UNDER_CE
-#    include <windows.h>
-#    define zstrerror() gz_strwinerror((DWORD)GetLastError())
-#else
-#    ifndef NO_STRERROR
-#        include <errno.h>
-#        define zstrerror() strerror(errno)
-#    else
-#        define zstrerror() "stdio error (consult errno)"
-#    endif
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE - 0 == 0
-ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-#endif
-
-/* default memLevel */
-#if MAX_MEM_LEVEL >= 8
-#    define DEF_MEM_LEVEL 8
-#else
-#    define DEF_MEM_LEVEL MAX_MEM_LEVEL
-#endif
-
-/* default i/o buffer size -- double this for output when reading (this and
-   twice this must be able to fit in an unsigned type) */
-#define GZBUFSIZE 8192
-
-/* gzip modes, also provide a little integrity check on the passed structure */
-#define GZ_NONE 0
-#define GZ_READ 7247
-#define GZ_WRITE 31153
-#define GZ_APPEND 1 /* mode set to GZ_WRITE after the file is opened */
-
-/* values for gz_state how */
-#define LOOK 0 /* look for a gzip header */
-#define COPY 1 /* copy input directly */
-#define GZIP 2 /* decompress a gzip stream */
-
-/* internal gzip file state data structure */
-typedef struct
-{
-    /* exposed contents for gzgetc() macro */
-    struct gzFile_s x; /* "x" for exposed */
-    /* x.have: number of bytes available at x.next */
-    /* x.next: next output data to deliver or write */
-    /* x.pos: current position in uncompressed data */
-    /* used for both reading and writing */
-    int mode; /* see gzip modes above */
-    int fd; /* file descriptor */
-    char * path; /* path or fd for error messages */
-    unsigned size; /* buffer size, zero if not allocated yet */
-    unsigned want; /* requested buffer size, default is GZBUFSIZE */
-    unsigned char * in; /* input buffer (double-sized when writing) */
-    unsigned char * out; /* output buffer (double-sized when reading) */
-    int direct; /* 0 if processing gzip, 1 if transparent */
-    /* just for reading */
-    int how; /* 0: get header, 1: copy, 2: decompress */
-    z_off64_t start; /* where the gzip data started, for rewinding */
-    int eof; /* true if end of input file reached */
-    int past; /* true if read requested past end */
-    /* just for writing */
-    int level; /* compression level */
-    int strategy; /* compression strategy */
-    /* seek request */
-    z_off64_t skip; /* amount to skip (already rewound if backwards) */
-    int seek; /* true if seek request pending */
-    /* error information */
-    int err; /* error code */
-    char * msg; /* error message */
-    /* zlib inflate or deflate stream */
-    z_stream strm; /* stream structure in-place (not a pointer) */
-} gz_state;
-typedef gz_state FAR * gz_statep;
-
-/* shared functions */
-void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
-#if defined UNDER_CE
-char ZLIB_INTERNAL * gz_strwinerror OF((DWORD error));
-#endif
-
-/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
-   value -- needed when comparing unsigned to z_off64_t, which is signed
-   (possible z_off64_t types off_t, off64_t, and long are all signed) */
-#ifdef INT_MAX
-#    define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
-#else
-unsigned ZLIB_INTERNAL gz_intmax OF((void));
-#    define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
-#endif
diff --git a/base/poco/Foundation/src/ieee.h b/base/poco/Foundation/src/ieee.h
deleted file mode 100644
index 2cfd39bab66..00000000000
--- a/base/poco/Foundation/src/ieee.h
+++ /dev/null
@@ -1,458 +0,0 @@
-// Copyright 2012 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef DOUBLE_CONVERSION_DOUBLE_H_
-#define DOUBLE_CONVERSION_DOUBLE_H_
-
-#include "diy-fp.h"
-
-namespace double_conversion
-{
-
-// We assume that doubles and uint64_t have the same endianness.
-static uint64_t double_to_uint64(double d)
-{
-    return BitCast<uint64_t>(d);
-}
-static double uint64_to_double(uint64_t d64)
-{
-    return BitCast<double>(d64);
-}
-static uint32_t float_to_uint32(float f)
-{
-    return BitCast<uint32_t>(f);
-}
-static float uint32_to_float(uint32_t d32)
-{
-    return BitCast<float>(d32);
-}
-
-// Helper functions for doubles.
-class Double
-{
-public:
-    static const uint64_t kSignMask = UINT64_2PART_C(0x80000000, 00000000);
-    static const uint64_t kExponentMask = UINT64_2PART_C(0x7FF00000, 00000000);
-    static const uint64_t kSignificandMask = UINT64_2PART_C(0x000FFFFF, FFFFFFFF);
-    static const uint64_t kHiddenBit = UINT64_2PART_C(0x00100000, 00000000);
-    static const int kPhysicalSignificandSize = 52; // Excludes the hidden bit.
-    static const int kSignificandSize = 53;
-
-    Double() : d64_(0) { }
-    explicit Double(double d) : d64_(double_to_uint64(d)) { }
-    explicit Double(uint64_t d64) : d64_(d64) { }
-    explicit Double(DiyFp diy_fp) : d64_(DiyFpToUint64(diy_fp)) { }
-
-    // The value encoded by this Double must be greater or equal to +0.0.
-    // It must not be special (infinity, or NaN).
-    DiyFp AsDiyFp() const
-    {
-        ASSERT(Sign() > 0);
-        ASSERT(!IsSpecial());
-        return DiyFp(Significand(), Exponent());
-    }
-
-    // The value encoded by this Double must be strictly greater than 0.
-    DiyFp AsNormalizedDiyFp() const
-    {
-        ASSERT(value() > 0.0);
-        uint64_t f = Significand();
-        int e = Exponent();
-
-        // The current double could be a denormal.
-        while ((f & kHiddenBit) == 0)
-        {
-            f <<= 1;
-            e--;
-        }
-        // Do the final shifts in one go.
-        f <<= DiyFp::kSignificandSize - kSignificandSize;
-        e -= DiyFp::kSignificandSize - kSignificandSize;
-        return DiyFp(f, e);
-    }
-
-    // Returns the double's bit as uint64.
-    uint64_t AsUint64() const { return d64_; }
-
-    // Returns the next greater double. Returns +infinity on input +infinity.
-    double NextDouble() const
-    {
-        if (d64_ == kInfinity)
-            return Double(kInfinity).value();
-        if (Sign() < 0 && Significand() == 0)
-        {
-            // -0.0
-            return 0.0;
-        }
-        if (Sign() < 0)
-        {
-            return Double(d64_ - 1).value();
-        }
-        else
-        {
-            return Double(d64_ + 1).value();
-        }
-    }
-
-    double PreviousDouble() const
-    {
-        if (d64_ == (kInfinity | kSignMask))
-            return -Double::Infinity();
-        if (Sign() < 0)
-        {
-            return Double(d64_ + 1).value();
-        }
-        else
-        {
-            if (Significand() == 0)
-                return -0.0;
-            return Double(d64_ - 1).value();
-        }
-    }
-
-    int Exponent() const
-    {
-        if (IsDenormal())
-            return kDenormalExponent;
-
-        uint64_t d64 = AsUint64();
-        int biased_e = static_cast<int>((d64 & kExponentMask) >> kPhysicalSignificandSize);
-        return biased_e - kExponentBias;
-    }
-
-    uint64_t Significand() const
-    {
-        uint64_t d64 = AsUint64();
-        uint64_t significand = d64 & kSignificandMask;
-        if (!IsDenormal())
-        {
-            return significand + kHiddenBit;
-        }
-        else
-        {
-            return significand;
-        }
-    }
-
-    // Returns true if the double is a denormal.
-    bool IsDenormal() const
-    {
-        uint64_t d64 = AsUint64();
-        return (d64 & kExponentMask) == 0;
-    }
-
-    // We consider denormals not to be special.
-    // Hence only Infinity and NaN are special.
-    bool IsSpecial() const
-    {
-        uint64_t d64 = AsUint64();
-        return (d64 & kExponentMask) == kExponentMask;
-    }
-
-    bool IsNan() const
-    {
-        uint64_t d64 = AsUint64();
-        return ((d64 & kExponentMask) == kExponentMask) && ((d64 & kSignificandMask) != 0);
-    }
-
-    bool IsInfinite() const
-    {
-        uint64_t d64 = AsUint64();
-        return ((d64 & kExponentMask) == kExponentMask) && ((d64 & kSignificandMask) == 0);
-    }
-
-    int Sign() const
-    {
-        uint64_t d64 = AsUint64();
-        return (d64 & kSignMask) == 0 ? 1 : -1;
-    }
-
-    // Precondition: the value encoded by this Double must be greater or equal
-    // than +0.0.
-    DiyFp UpperBoundary() const
-    {
-        ASSERT(Sign() > 0);
-        return DiyFp(Significand() * 2 + 1, Exponent() - 1);
-    }
-
-    // Computes the two boundaries of this.
-    // The bigger boundary (m_plus) is normalized. The lower boundary has the same
-    // exponent as m_plus.
-    // Precondition: the value encoded by this Double must be greater than 0.
-    void NormalizedBoundaries(DiyFp * out_m_minus, DiyFp * out_m_plus) const
-    {
-        ASSERT(value() > 0.0);
-        DiyFp v = this->AsDiyFp();
-        DiyFp m_plus = DiyFp::Normalize(DiyFp((v.f() << 1) + 1, v.e() - 1));
-        DiyFp m_minus;
-        if (LowerBoundaryIsCloser())
-        {
-            m_minus = DiyFp((v.f() << 2) - 1, v.e() - 2);
-        }
-        else
-        {
-            m_minus = DiyFp((v.f() << 1) - 1, v.e() - 1);
-        }
-        m_minus.set_f(m_minus.f() << (m_minus.e() - m_plus.e()));
-        m_minus.set_e(m_plus.e());
-        *out_m_plus = m_plus;
-        *out_m_minus = m_minus;
-    }
-
-    bool LowerBoundaryIsCloser() const
-    {
-        // The boundary is closer if the significand is of the form f == 2^p-1 then
-        // the lower boundary is closer.
-        // Think of v = 1000e10 and v- = 9999e9.
-        // Then the boundary (== (v - v-)/2) is not just at a distance of 1e9 but
-        // at a distance of 1e8.
-        // The only exception is for the smallest normal: the largest denormal is
-        // at the same distance as its successor.
-        // Note: denormals have the same exponent as the smallest normals.
-        bool physical_significand_is_zero = ((AsUint64() & kSignificandMask) == 0);
-        return physical_significand_is_zero && (Exponent() != kDenormalExponent);
-    }
-
-    double value() const { return uint64_to_double(d64_); }
-
-    // Returns the significand size for a given order of magnitude.
-    // If v = f*2^e with 2^p-1 <= f <= 2^p then p+e is v's order of magnitude.
-    // This function returns the number of significant binary digits v will have
-    // once it's encoded into a double. In almost all cases this is equal to
-    // kSignificandSize. The only exceptions are denormals. They start with
-    // leading zeroes and their effective significand-size is hence smaller.
-    static int SignificandSizeForOrderOfMagnitude(int order)
-    {
-        if (order >= (kDenormalExponent + kSignificandSize))
-        {
-            return kSignificandSize;
-        }
-        if (order <= kDenormalExponent)
-            return 0;
-        return order - kDenormalExponent;
-    }
-
-    static double Infinity() { return Double(kInfinity).value(); }
-
-    static double NaN() { return Double(kNaN).value(); }
-
-private:
-    static const int kExponentBias = 0x3FF + kPhysicalSignificandSize;
-    static const int kDenormalExponent = -kExponentBias + 1;
-    static const int kMaxExponent = 0x7FF - kExponentBias;
-    static const uint64_t kInfinity = UINT64_2PART_C(0x7FF00000, 00000000);
-    static const uint64_t kNaN = UINT64_2PART_C(0x7FF80000, 00000000);
-
-    const uint64_t d64_;
-
-    static uint64_t DiyFpToUint64(DiyFp diy_fp)
-    {
-        uint64_t significand = diy_fp.f();
-        int exponent = diy_fp.e();
-        while (significand > kHiddenBit + kSignificandMask)
-        {
-            significand >>= 1;
-            exponent++;
-        }
-        if (exponent >= kMaxExponent)
-        {
-            return kInfinity;
-        }
-        if (exponent < kDenormalExponent)
-        {
-            return 0;
-        }
-        while (exponent > kDenormalExponent && (significand & kHiddenBit) == 0)
-        {
-            significand <<= 1;
-            exponent--;
-        }
-        uint64_t biased_exponent;
-        if (exponent == kDenormalExponent && (significand & kHiddenBit) == 0)
-        {
-            biased_exponent = 0;
-        }
-        else
-        {
-            biased_exponent = static_cast<uint64_t>(exponent + kExponentBias);
-        }
-        return (significand & kSignificandMask) | (biased_exponent << kPhysicalSignificandSize);
-    }
-
-    DISALLOW_COPY_AND_ASSIGN(Double);
-};
-
-class Single
-{
-public:
-    static const uint32_t kSignMask = 0x80000000;
-    static const uint32_t kExponentMask = 0x7F800000;
-    static const uint32_t kSignificandMask = 0x007FFFFF;
-    static const uint32_t kHiddenBit = 0x00800000;
-    static const int kPhysicalSignificandSize = 23; // Excludes the hidden bit.
-    static const int kSignificandSize = 24;
-
-    Single() : d32_(0) { }
-    explicit Single(float f) : d32_(float_to_uint32(f)) { }
-    explicit Single(uint32_t d32) : d32_(d32) { }
-
-    // The value encoded by this Single must be greater or equal to +0.0.
-    // It must not be special (infinity, or NaN).
-    DiyFp AsDiyFp() const
-    {
-        ASSERT(Sign() > 0);
-        ASSERT(!IsSpecial());
-        return DiyFp(Significand(), Exponent());
-    }
-
-    // Returns the single's bit as uint64.
-    uint32_t AsUint32() const { return d32_; }
-
-    int Exponent() const
-    {
-        if (IsDenormal())
-            return kDenormalExponent;
-
-        uint32_t d32 = AsUint32();
-        int biased_e = static_cast<int>((d32 & kExponentMask) >> kPhysicalSignificandSize);
-        return biased_e - kExponentBias;
-    }
-
-    uint32_t Significand() const
-    {
-        uint32_t d32 = AsUint32();
-        uint32_t significand = d32 & kSignificandMask;
-        if (!IsDenormal())
-        {
-            return significand + kHiddenBit;
-        }
-        else
-        {
-            return significand;
-        }
-    }
-
-    // Returns true if the single is a denormal.
-    bool IsDenormal() const
-    {
-        uint32_t d32 = AsUint32();
-        return (d32 & kExponentMask) == 0;
-    }
-
-    // We consider denormals not to be special.
-    // Hence only Infinity and NaN are special.
-    bool IsSpecial() const
-    {
-        uint32_t d32 = AsUint32();
-        return (d32 & kExponentMask) == kExponentMask;
-    }
-
-    bool IsNan() const
-    {
-        uint32_t d32 = AsUint32();
-        return ((d32 & kExponentMask) == kExponentMask) && ((d32 & kSignificandMask) != 0);
-    }
-
-    bool IsInfinite() const
-    {
-        uint32_t d32 = AsUint32();
-        return ((d32 & kExponentMask) == kExponentMask) && ((d32 & kSignificandMask) == 0);
-    }
-
-    int Sign() const
-    {
-        uint32_t d32 = AsUint32();
-        return (d32 & kSignMask) == 0 ? 1 : -1;
-    }
-
-    // Computes the two boundaries of this.
-    // The bigger boundary (m_plus) is normalized. The lower boundary has the same
-    // exponent as m_plus.
-    // Precondition: the value encoded by this Single must be greater than 0.
-    void NormalizedBoundaries(DiyFp * out_m_minus, DiyFp * out_m_plus) const
-    {
-        ASSERT(value() > 0.0);
-        DiyFp v = this->AsDiyFp();
-        DiyFp m_plus = DiyFp::Normalize(DiyFp((v.f() << 1) + 1, v.e() - 1));
-        DiyFp m_minus;
-        if (LowerBoundaryIsCloser())
-        {
-            m_minus = DiyFp((v.f() << 2) - 1, v.e() - 2);
-        }
-        else
-        {
-            m_minus = DiyFp((v.f() << 1) - 1, v.e() - 1);
-        }
-        m_minus.set_f(m_minus.f() << (m_minus.e() - m_plus.e()));
-        m_minus.set_e(m_plus.e());
-        *out_m_plus = m_plus;
-        *out_m_minus = m_minus;
-    }
-
-    // Precondition: the value encoded by this Single must be greater or equal
-    // than +0.0.
-    DiyFp UpperBoundary() const
-    {
-        ASSERT(Sign() > 0);
-        return DiyFp(Significand() * 2 + 1, Exponent() - 1);
-    }
-
-    bool LowerBoundaryIsCloser() const
-    {
-        // The boundary is closer if the significand is of the form f == 2^p-1 then
-        // the lower boundary is closer.
-        // Think of v = 1000e10 and v- = 9999e9.
-        // Then the boundary (== (v - v-)/2) is not just at a distance of 1e9 but
-        // at a distance of 1e8.
-        // The only exception is for the smallest normal: the largest denormal is
-        // at the same distance as its successor.
-        // Note: denormals have the same exponent as the smallest normals.
-        bool physical_significand_is_zero = ((AsUint32() & kSignificandMask) == 0);
-        return physical_significand_is_zero && (Exponent() != kDenormalExponent);
-    }
-
-    float value() const { return uint32_to_float(d32_); }
-
-    static float Infinity() { return Single(kInfinity).value(); }
-
-    static float NaN() { return Single(kNaN).value(); }
-
-private:
-    static const int kExponentBias = 0x7F + kPhysicalSignificandSize;
-    static const int kDenormalExponent = -kExponentBias + 1;
-    static const int kMaxExponent = 0xFF - kExponentBias;
-    static const uint32_t kInfinity = 0x7F800000;
-    static const uint32_t kNaN = 0x7FC00000;
-
-    const uint32_t d32_;
-
-    DISALLOW_COPY_AND_ASSIGN(Single);
-};
-
-} // namespace double_conversion
-
-#endif // DOUBLE_CONVERSION_DOUBLE_H_
diff --git a/base/poco/Foundation/src/infback.c b/base/poco/Foundation/src/infback.c
deleted file mode 100644
index 59679ecbfc5..00000000000
--- a/base/poco/Foundation/src/infback.c
+++ /dev/null
@@ -1,640 +0,0 @@
-/* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
-   This code is largely copied from inflate.c.  Normally either infback.o or
-   inflate.o would be linked into an application--not both.  The interface
-   with inffast.c is retained so that optimized assembler-coded versions of
-   inflate_fast() can be used with either inflate.c or infback.c.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-
-/*
-   strm provides memory allocation functions in zalloc and zfree, or
-   Z_NULL to use the library memory allocation functions.
-
-   windowBits is in the range 8..15, and window is a user-supplied
-   window and output buffer that is 2**windowBits bytes.
- */
-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
-z_streamp strm;
-int windowBits;
-unsigned char FAR *window;
-const char *version;
-int stream_size;
-{
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL || window == Z_NULL ||
-        windowBits < 8 || windowBits > 15)
-        return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-    strm->zfree = zcfree;
-#endif
-    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
-                                               sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    state->dmax = 32768U;
-    state->wbits = (uInt)windowBits;
-    state->wsize = 1U << windowBits;
-    state->window = window;
-    state->wnext = 0;
-    state->whave = 0;
-    return Z_OK;
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-/* Macros for inflateBack(): */
-
-/* Load returned state from inflate_fast() */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Set state from registers for inflate_fast() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Assure that some input is available.  If input is requested, but denied,
-   then return a Z_BUF_ERROR from inflateBack(). */
-#define PULL() \
-    do { \
-        if (have == 0) { \
-            have = in(in_desc, &next); \
-            if (have == 0) { \
-                next = Z_NULL; \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflateBack()
-   with an error if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        PULL(); \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflateBack() with
-   an error. */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/* Assure that some output space is available, by writing out the window
-   if it's full.  If the write fails, return from inflateBack() with a
-   Z_BUF_ERROR. */
-#define ROOM() \
-    do { \
-        if (left == 0) { \
-            put = state->window; \
-            left = state->wsize; \
-            state->whave = left; \
-            if (out(out_desc, put, left)) { \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/*
-   strm provides the memory allocation functions and window buffer on input,
-   and provides information on the unused input on return.  For Z_DATA_ERROR
-   returns, strm will also provide an error message.
-
-   in() and out() are the call-back input and output functions.  When
-   inflateBack() needs more input, it calls in().  When inflateBack() has
-   filled the window with output, or when it completes with data in the
-   window, it calls out() to write out the data.  The application must not
-   change the provided input until in() is called again or inflateBack()
-   returns.  The application must not change the window/output buffer until
-   inflateBack() returns.
-
-   in() and out() are called with a descriptor parameter provided in the
-   inflateBack() call.  This parameter can be a structure that provides the
-   information required to do the read or write, as well as accumulated
-   information on the input and output such as totals and check values.
-
-   in() should return zero on failure.  out() should return non-zero on
-   failure.  If either in() or out() fails, than inflateBack() returns a
-   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
-   was in() or out() that caused in the error.  Otherwise,  inflateBack()
-   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
-   error, or Z_MEM_ERROR if it could not allocate memory for the state.
-   inflateBack() can also return Z_STREAM_ERROR if the input parameters
-   are not correct, i.e. strm is Z_NULL or the state was not initialized.
- */
-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
-z_streamp strm;
-in_func in;
-void FAR *in_desc;
-out_func out;
-void FAR *out_desc;
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    /* Check that the strm exists and that the state was initialized */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* Reset the state */
-    strm->msg = Z_NULL;
-    state->mode = TYPE;
-    state->last = 0;
-    state->whave = 0;
-    next = strm->next_in;
-    have = next != Z_NULL ? strm->avail_in : 0;
-    hold = 0;
-    bits = 0;
-    put = state->window;
-    left = state->wsize;
-
-    /* Inflate until end of block marked as last */
-    for (;;)
-        switch (state->mode) {
-        case TYPE:
-            /* determine and dispatch block type */
-            if (state->last) {
-                BYTEBITS();
-                state->mode = DONE;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN;              /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-
-        case STORED:
-            /* get and verify stored block length */
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-
-            /* copy stored block from input to output */
-            while (state->length != 0) {
-                copy = state->length;
-                PULL();
-                ROOM();
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-
-        case TABLE:
-            /* get dynamic table entries descriptor */
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-
-            /* get code length code lengths (not a typo) */
-            state->have = 0;
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-
-            /* get length and distance code code lengths */
-            state->have = 0;
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = (unsigned)(state->lens[state->have - 1]);
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                state->mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (code const FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN;
-
-        case LEN:
-            /* use inflate_fast() if we have enough input and output */
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                if (state->whave < state->wsize)
-                    state->whave = state->wsize - left;
-                inflate_fast(strm, state->wsize);
-                LOAD();
-                break;
-            }
-
-            /* get a literal, length, or end-of-block code */
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            state->length = (unsigned)here.val;
-
-            /* process literal */
-            if (here.op == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                ROOM();
-                *put++ = (unsigned char)(state->length);
-                left--;
-                state->mode = LEN;
-                break;
-            }
-
-            /* process end of block */
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->mode = TYPE;
-                break;
-            }
-
-            /* invalid code */
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-
-            /* length code -- get extra bits, if any */
-            state->extra = (unsigned)(here.op) & 15;
-            if (state->extra != 0) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-
-            /* get distance code */
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)here.val;
-
-            /* get distance extra bits, if any */
-            state->extra = (unsigned)(here.op) & 15;
-            if (state->extra != 0) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            if (state->offset > state->wsize - (state->whave < state->wsize ?
-                                                left : 0)) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-
-            /* copy match from window to output */
-            do {
-                ROOM();
-                copy = state->wsize - state->offset;
-                if (copy < left) {
-                    from = put + copy;
-                    copy = left - copy;
-                }
-                else {
-                    from = put - state->offset;
-                    copy = left;
-                }
-                if (copy > state->length) copy = state->length;
-                state->length -= copy;
-                left -= copy;
-                do {
-                    *put++ = *from++;
-                } while (--copy);
-            } while (state->length != 0);
-            break;
-
-        case DONE:
-            /* inflate stream terminated properly -- write leftover output */
-            ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
-            goto inf_leave;
-
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-
-        default:                /* can't happen, but makes compilers happy */
-            ret = Z_STREAM_ERROR;
-            goto inf_leave;
-        }
-
-    /* Return unused input */
-  inf_leave:
-    strm->next_in = next;
-    strm->avail_in = have;
-    return ret;
-}
-
-int ZEXPORT inflateBackEnd(strm)
-z_streamp strm;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
diff --git a/base/poco/Foundation/src/inffast.c b/base/poco/Foundation/src/inffast.c
deleted file mode 100644
index 0dbd1dbc09f..00000000000
--- a/base/poco/Foundation/src/inffast.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/* inffast.c -- fast decoding
- * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef ASMINF
-#  pragma message("Assembler code may have bugs -- use at your own risk")
-#else
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-void ZLIB_INTERNAL inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *in;      /* local strm->next_in */
-    z_const unsigned char FAR *last;    /* have enough input while in < last */
-    unsigned char FAR *out;     /* local strm->next_out */
-    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
-    unsigned char FAR *end;     /* while out < end, enough space available */
-#ifdef INFLATE_STRICT
-    unsigned dmax;              /* maximum distance from zlib header */
-#endif
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned wnext;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
-    unsigned long hold;         /* local strm->hold */
-    unsigned bits;              /* local strm->bits */
-    code const FAR *lcode;      /* local strm->lencode */
-    code const FAR *dcode;      /* local strm->distcode */
-    unsigned lmask;             /* mask for first level of length codes */
-    unsigned dmask;             /* mask for first level of distance codes */
-    code here;                  /* retrieved table entry */
-    unsigned op;                /* code bits, operation, extra bits, or */
-                                /*  window position, window bytes to copy */
-    unsigned len;               /* match length, unused bytes */
-    unsigned dist;              /* match distance */
-    unsigned char FAR *from;    /* where to copy match from */
-
-    /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
-    in = strm->next_in;
-    last = in + (strm->avail_in - 5);
-    out = strm->next_out;
-    beg = out - (start - strm->avail_out);
-    end = out + (strm->avail_out - 257);
-#ifdef INFLATE_STRICT
-    dmax = state->dmax;
-#endif
-    wsize = state->wsize;
-    whave = state->whave;
-    wnext = state->wnext;
-    window = state->window;
-    hold = state->hold;
-    bits = state->bits;
-    lcode = state->lencode;
-    dcode = state->distcode;
-    lmask = (1U << state->lenbits) - 1;
-    dmask = (1U << state->distbits) - 1;
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-    do {
-        if (bits < 15) {
-            hold += (unsigned long)(*in++) << bits;
-            bits += 8;
-            hold += (unsigned long)(*in++) << bits;
-            bits += 8;
-        }
-        here = lcode[hold & lmask];
-      dolen:
-        op = (unsigned)(here.bits);
-        hold >>= op;
-        bits -= op;
-        op = (unsigned)(here.op);
-        if (op == 0) {                          /* literal */
-            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                    "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", here.val));
-            *out++ = (unsigned char)(here.val);
-        }
-        else if (op & 16) {                     /* length base */
-            len = (unsigned)(here.val);
-            op &= 15;                           /* number of extra bits */
-            if (op) {
-                if (bits < op) {
-                    hold += (unsigned long)(*in++) << bits;
-                    bits += 8;
-                }
-                len += (unsigned)hold & ((1U << op) - 1);
-                hold >>= op;
-                bits -= op;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", len));
-            if (bits < 15) {
-                hold += (unsigned long)(*in++) << bits;
-                bits += 8;
-                hold += (unsigned long)(*in++) << bits;
-                bits += 8;
-            }
-            here = dcode[hold & dmask];
-          dodist:
-            op = (unsigned)(here.bits);
-            hold >>= op;
-            bits -= op;
-            op = (unsigned)(here.op);
-            if (op & 16) {                      /* distance base */
-                dist = (unsigned)(here.val);
-                op &= 15;                       /* number of extra bits */
-                if (bits < op) {
-                    hold += (unsigned long)(*in++) << bits;
-                    bits += 8;
-                    if (bits < op) {
-                        hold += (unsigned long)(*in++) << bits;
-                        bits += 8;
-                    }
-                }
-                dist += (unsigned)hold & ((1U << op) - 1);
-#ifdef INFLATE_STRICT
-                if (dist > dmax) {
-                    strm->msg = (char *)"invalid distance too far back";
-                    state->mode = BAD;
-                    break;
-                }
-#endif
-                hold >>= op;
-                bits -= op;
-                Tracevv((stderr, "inflate:         distance %u\n", dist));
-                op = (unsigned)(out - beg);     /* max distance in output */
-                if (dist > op) {                /* see if copy from window */
-                    op = dist - op;             /* distance back in window */
-                    if (op > whave) {
-                        if (state->sane) {
-                            strm->msg =
-                                (char *)"invalid distance too far back";
-                            state->mode = BAD;
-                            break;
-                        }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                        if (len <= op - whave) {
-                            do {
-                                *out++ = 0;
-                            } while (--len);
-                            continue;
-                        }
-                        len -= op - whave;
-                        do {
-                            *out++ = 0;
-                        } while (--op > whave);
-                        if (op == 0) {
-                            from = out - dist;
-                            do {
-                                *out++ = *from++;
-                            } while (--len);
-                            continue;
-                        }
-#endif
-                    }
-                    from = window;
-                    if (wnext == 0) {           /* very common case */
-                        from += wsize - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                *out++ = *from++;
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    else if (wnext < op) {      /* wrap around window */
-                        from += wsize + wnext - op;
-                        op -= wnext;
-                        if (op < len) {         /* some from end of window */
-                            len -= op;
-                            do {
-                                *out++ = *from++;
-                            } while (--op);
-                            from = window;
-                            if (wnext < len) {  /* some from start of window */
-                                op = wnext;
-                                len -= op;
-                                do {
-                                    *out++ = *from++;
-                                } while (--op);
-                                from = out - dist;      /* rest from output */
-                            }
-                        }
-                    }
-                    else {                      /* contiguous in window */
-                        from += wnext - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                *out++ = *from++;
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    while (len > 2) {
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        len -= 3;
-                    }
-                    if (len) {
-                        *out++ = *from++;
-                        if (len > 1)
-                            *out++ = *from++;
-                    }
-                }
-                else {
-                    from = out - dist;          /* copy direct from output */
-                    do {                        /* minimum length is three */
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        len -= 3;
-                    } while (len > 2);
-                    if (len) {
-                        *out++ = *from++;
-                        if (len > 1)
-                            *out++ = *from++;
-                    }
-                }
-            }
-            else if ((op & 64) == 0) {          /* 2nd level distance code */
-                here = dcode[here.val + (hold & ((1U << op) - 1))];
-                goto dodist;
-            }
-            else {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-        }
-        else if ((op & 64) == 0) {              /* 2nd level length code */
-            here = lcode[here.val + (hold & ((1U << op) - 1))];
-            goto dolen;
-        }
-        else if (op & 32) {                     /* end-of-block */
-            Tracevv((stderr, "inflate:         end of block\n"));
-            state->mode = TYPE;
-            break;
-        }
-        else {
-            strm->msg = (char *)"invalid literal/length code";
-            state->mode = BAD;
-            break;
-        }
-    } while (in < last && out < end);
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    len = bits >> 3;
-    in -= len;
-    bits -= len << 3;
-    hold &= (1U << bits) - 1;
-
-    /* update state and return */
-    strm->next_in = in;
-    strm->next_out = out;
-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
-    strm->avail_out = (unsigned)(out < end ?
-                                 257 + (end - out) : 257 - (out - end));
-    state->hold = hold;
-    state->bits = bits;
-    return;
-}
-
-/*
-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
-   - Using bit fields for code structure
-   - Different op definition to avoid & for extra bits (do & for table bits)
-   - Three separate decoding do-loops for direct, window, and wnext == 0
-   - Special case for distance > 1 copies to do overlapped load and store copy
-   - Explicit branch predictions (based on measured branch probabilities)
-   - Deferring match copy and interspersed it with decoding subsequent codes
-   - Swapping literal/length else
-   - Swapping window/direct else
-   - Larger unrolled copy loops (three is about right)
-   - Moving len -= 3 statement into middle of loop
- */
-
-#endif /* !ASMINF */
diff --git a/base/poco/Foundation/src/inffast.h b/base/poco/Foundation/src/inffast.h
deleted file mode 100644
index e5c1aa4ca8c..00000000000
--- a/base/poco/Foundation/src/inffast.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/base/poco/Foundation/src/inffixed.h b/base/poco/Foundation/src/inffixed.h
deleted file mode 100644
index 4a39de52ca2..00000000000
--- a/base/poco/Foundation/src/inffixed.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* inffixed.h -- table for decoding fixed codes
-     * Generated automatically by makefixed().
-     */
-
-/* WARNING: this file should *not* be used by applications.
-       It is part of the implementation of this library and is
-       subject to change. Applications should only use zlib.h.
-     */
-
-static const code lenfix[512] = {
-    {96, 7, 0},  {0, 8, 80},   {0, 8, 16},  {20, 8, 115}, {18, 7, 31}, {0, 8, 112},  {0, 8, 48},  {0, 9, 192},  {16, 7, 10}, {0, 8, 96},
-    {0, 8, 32},  {0, 9, 160},  {0, 8, 0},   {0, 8, 128},  {0, 8, 64},  {0, 9, 224},  {16, 7, 6},  {0, 8, 88},   {0, 8, 24},  {0, 9, 144},
-    {19, 7, 59}, {0, 8, 120},  {0, 8, 56},  {0, 9, 208},  {17, 7, 17}, {0, 8, 104},  {0, 8, 40},  {0, 9, 176},  {0, 8, 8},   {0, 8, 136},
-    {0, 8, 72},  {0, 9, 240},  {16, 7, 4},  {0, 8, 84},   {0, 8, 20},  {21, 8, 227}, {19, 7, 43}, {0, 8, 116},  {0, 8, 52},  {0, 9, 200},
-    {17, 7, 13}, {0, 8, 100},  {0, 8, 36},  {0, 9, 168},  {0, 8, 4},   {0, 8, 132},  {0, 8, 68},  {0, 9, 232},  {16, 7, 8},  {0, 8, 92},
-    {0, 8, 28},  {0, 9, 152},  {20, 7, 83}, {0, 8, 124},  {0, 8, 60},  {0, 9, 216},  {18, 7, 23}, {0, 8, 108},  {0, 8, 44},  {0, 9, 184},
-    {0, 8, 12},  {0, 8, 140},  {0, 8, 76},  {0, 9, 248},  {16, 7, 3},  {0, 8, 82},   {0, 8, 18},  {21, 8, 163}, {19, 7, 35}, {0, 8, 114},
-    {0, 8, 50},  {0, 9, 196},  {17, 7, 11}, {0, 8, 98},   {0, 8, 34},  {0, 9, 164},  {0, 8, 2},   {0, 8, 130},  {0, 8, 66},  {0, 9, 228},
-    {16, 7, 7},  {0, 8, 90},   {0, 8, 26},  {0, 9, 148},  {20, 7, 67}, {0, 8, 122},  {0, 8, 58},  {0, 9, 212},  {18, 7, 19}, {0, 8, 106},
-    {0, 8, 42},  {0, 9, 180},  {0, 8, 10},  {0, 8, 138},  {0, 8, 74},  {0, 9, 244},  {16, 7, 5},  {0, 8, 86},   {0, 8, 22},  {64, 8, 0},
-    {19, 7, 51}, {0, 8, 118},  {0, 8, 54},  {0, 9, 204},  {17, 7, 15}, {0, 8, 102},  {0, 8, 38},  {0, 9, 172},  {0, 8, 6},   {0, 8, 134},
-    {0, 8, 70},  {0, 9, 236},  {16, 7, 9},  {0, 8, 94},   {0, 8, 30},  {0, 9, 156},  {20, 7, 99}, {0, 8, 126},  {0, 8, 62},  {0, 9, 220},
-    {18, 7, 27}, {0, 8, 110},  {0, 8, 46},  {0, 9, 188},  {0, 8, 14},  {0, 8, 142},  {0, 8, 78},  {0, 9, 252},  {96, 7, 0},  {0, 8, 81},
-    {0, 8, 17},  {21, 8, 131}, {18, 7, 31}, {0, 8, 113},  {0, 8, 49},  {0, 9, 194},  {16, 7, 10}, {0, 8, 97},   {0, 8, 33},  {0, 9, 162},
-    {0, 8, 1},   {0, 8, 129},  {0, 8, 65},  {0, 9, 226},  {16, 7, 6},  {0, 8, 89},   {0, 8, 25},  {0, 9, 146},  {19, 7, 59}, {0, 8, 121},
-    {0, 8, 57},  {0, 9, 210},  {17, 7, 17}, {0, 8, 105},  {0, 8, 41},  {0, 9, 178},  {0, 8, 9},   {0, 8, 137},  {0, 8, 73},  {0, 9, 242},
-    {16, 7, 4},  {0, 8, 85},   {0, 8, 21},  {16, 8, 258}, {19, 7, 43}, {0, 8, 117},  {0, 8, 53},  {0, 9, 202},  {17, 7, 13}, {0, 8, 101},
-    {0, 8, 37},  {0, 9, 170},  {0, 8, 5},   {0, 8, 133},  {0, 8, 69},  {0, 9, 234},  {16, 7, 8},  {0, 8, 93},   {0, 8, 29},  {0, 9, 154},
-    {20, 7, 83}, {0, 8, 125},  {0, 8, 61},  {0, 9, 218},  {18, 7, 23}, {0, 8, 109},  {0, 8, 45},  {0, 9, 186},  {0, 8, 13},  {0, 8, 141},
-    {0, 8, 77},  {0, 9, 250},  {16, 7, 3},  {0, 8, 83},   {0, 8, 19},  {21, 8, 195}, {19, 7, 35}, {0, 8, 115},  {0, 8, 51},  {0, 9, 198},
-    {17, 7, 11}, {0, 8, 99},   {0, 8, 35},  {0, 9, 166},  {0, 8, 3},   {0, 8, 131},  {0, 8, 67},  {0, 9, 230},  {16, 7, 7},  {0, 8, 91},
-    {0, 8, 27},  {0, 9, 150},  {20, 7, 67}, {0, 8, 123},  {0, 8, 59},  {0, 9, 214},  {18, 7, 19}, {0, 8, 107},  {0, 8, 43},  {0, 9, 182},
-    {0, 8, 11},  {0, 8, 139},  {0, 8, 75},  {0, 9, 246},  {16, 7, 5},  {0, 8, 87},   {0, 8, 23},  {64, 8, 0},   {19, 7, 51}, {0, 8, 119},
-    {0, 8, 55},  {0, 9, 206},  {17, 7, 15}, {0, 8, 103},  {0, 8, 39},  {0, 9, 174},  {0, 8, 7},   {0, 8, 135},  {0, 8, 71},  {0, 9, 238},
-    {16, 7, 9},  {0, 8, 95},   {0, 8, 31},  {0, 9, 158},  {20, 7, 99}, {0, 8, 127},  {0, 8, 63},  {0, 9, 222},  {18, 7, 27}, {0, 8, 111},
-    {0, 8, 47},  {0, 9, 190},  {0, 8, 15},  {0, 8, 143},  {0, 8, 79},  {0, 9, 254},  {96, 7, 0},  {0, 8, 80},   {0, 8, 16},  {20, 8, 115},
-    {18, 7, 31}, {0, 8, 112},  {0, 8, 48},  {0, 9, 193},  {16, 7, 10}, {0, 8, 96},   {0, 8, 32},  {0, 9, 161},  {0, 8, 0},   {0, 8, 128},
-    {0, 8, 64},  {0, 9, 225},  {16, 7, 6},  {0, 8, 88},   {0, 8, 24},  {0, 9, 145},  {19, 7, 59}, {0, 8, 120},  {0, 8, 56},  {0, 9, 209},
-    {17, 7, 17}, {0, 8, 104},  {0, 8, 40},  {0, 9, 177},  {0, 8, 8},   {0, 8, 136},  {0, 8, 72},  {0, 9, 241},  {16, 7, 4},  {0, 8, 84},
-    {0, 8, 20},  {21, 8, 227}, {19, 7, 43}, {0, 8, 116},  {0, 8, 52},  {0, 9, 201},  {17, 7, 13}, {0, 8, 100},  {0, 8, 36},  {0, 9, 169},
-    {0, 8, 4},   {0, 8, 132},  {0, 8, 68},  {0, 9, 233},  {16, 7, 8},  {0, 8, 92},   {0, 8, 28},  {0, 9, 153},  {20, 7, 83}, {0, 8, 124},
-    {0, 8, 60},  {0, 9, 217},  {18, 7, 23}, {0, 8, 108},  {0, 8, 44},  {0, 9, 185},  {0, 8, 12},  {0, 8, 140},  {0, 8, 76},  {0, 9, 249},
-    {16, 7, 3},  {0, 8, 82},   {0, 8, 18},  {21, 8, 163}, {19, 7, 35}, {0, 8, 114},  {0, 8, 50},  {0, 9, 197},  {17, 7, 11}, {0, 8, 98},
-    {0, 8, 34},  {0, 9, 165},  {0, 8, 2},   {0, 8, 130},  {0, 8, 66},  {0, 9, 229},  {16, 7, 7},  {0, 8, 90},   {0, 8, 26},  {0, 9, 149},
-    {20, 7, 67}, {0, 8, 122},  {0, 8, 58},  {0, 9, 213},  {18, 7, 19}, {0, 8, 106},  {0, 8, 42},  {0, 9, 181},  {0, 8, 10},  {0, 8, 138},
-    {0, 8, 74},  {0, 9, 245},  {16, 7, 5},  {0, 8, 86},   {0, 8, 22},  {64, 8, 0},   {19, 7, 51}, {0, 8, 118},  {0, 8, 54},  {0, 9, 205},
-    {17, 7, 15}, {0, 8, 102},  {0, 8, 38},  {0, 9, 173},  {0, 8, 6},   {0, 8, 134},  {0, 8, 70},  {0, 9, 237},  {16, 7, 9},  {0, 8, 94},
-    {0, 8, 30},  {0, 9, 157},  {20, 7, 99}, {0, 8, 126},  {0, 8, 62},  {0, 9, 221},  {18, 7, 27}, {0, 8, 110},  {0, 8, 46},  {0, 9, 189},
-    {0, 8, 14},  {0, 8, 142},  {0, 8, 78},  {0, 9, 253},  {96, 7, 0},  {0, 8, 81},   {0, 8, 17},  {21, 8, 131}, {18, 7, 31}, {0, 8, 113},
-    {0, 8, 49},  {0, 9, 195},  {16, 7, 10}, {0, 8, 97},   {0, 8, 33},  {0, 9, 163},  {0, 8, 1},   {0, 8, 129},  {0, 8, 65},  {0, 9, 227},
-    {16, 7, 6},  {0, 8, 89},   {0, 8, 25},  {0, 9, 147},  {19, 7, 59}, {0, 8, 121},  {0, 8, 57},  {0, 9, 211},  {17, 7, 17}, {0, 8, 105},
-    {0, 8, 41},  {0, 9, 179},  {0, 8, 9},   {0, 8, 137},  {0, 8, 73},  {0, 9, 243},  {16, 7, 4},  {0, 8, 85},   {0, 8, 21},  {16, 8, 258},
-    {19, 7, 43}, {0, 8, 117},  {0, 8, 53},  {0, 9, 203},  {17, 7, 13}, {0, 8, 101},  {0, 8, 37},  {0, 9, 171},  {0, 8, 5},   {0, 8, 133},
-    {0, 8, 69},  {0, 9, 235},  {16, 7, 8},  {0, 8, 93},   {0, 8, 29},  {0, 9, 155},  {20, 7, 83}, {0, 8, 125},  {0, 8, 61},  {0, 9, 219},
-    {18, 7, 23}, {0, 8, 109},  {0, 8, 45},  {0, 9, 187},  {0, 8, 13},  {0, 8, 141},  {0, 8, 77},  {0, 9, 251},  {16, 7, 3},  {0, 8, 83},
-    {0, 8, 19},  {21, 8, 195}, {19, 7, 35}, {0, 8, 115},  {0, 8, 51},  {0, 9, 199},  {17, 7, 11}, {0, 8, 99},   {0, 8, 35},  {0, 9, 167},
-    {0, 8, 3},   {0, 8, 131},  {0, 8, 67},  {0, 9, 231},  {16, 7, 7},  {0, 8, 91},   {0, 8, 27},  {0, 9, 151},  {20, 7, 67}, {0, 8, 123},
-    {0, 8, 59},  {0, 9, 215},  {18, 7, 19}, {0, 8, 107},  {0, 8, 43},  {0, 9, 183},  {0, 8, 11},  {0, 8, 139},  {0, 8, 75},  {0, 9, 247},
-    {16, 7, 5},  {0, 8, 87},   {0, 8, 23},  {64, 8, 0},   {19, 7, 51}, {0, 8, 119},  {0, 8, 55},  {0, 9, 207},  {17, 7, 15}, {0, 8, 103},
-    {0, 8, 39},  {0, 9, 175},  {0, 8, 7},   {0, 8, 135},  {0, 8, 71},  {0, 9, 239},  {16, 7, 9},  {0, 8, 95},   {0, 8, 31},  {0, 9, 159},
-    {20, 7, 99}, {0, 8, 127},  {0, 8, 63},  {0, 9, 223},  {18, 7, 27}, {0, 8, 111},  {0, 8, 47},  {0, 9, 191},  {0, 8, 15},  {0, 8, 143},
-    {0, 8, 79},  {0, 9, 255}};
-
-static const code distfix[32]
-    = {{16, 5, 1}, {23, 5, 257}, {19, 5, 17}, {27, 5, 4097},  {17, 5, 5},  {25, 5, 1025}, {21, 5, 65},  {29, 5, 16385},
-       {16, 5, 3}, {24, 5, 513}, {20, 5, 33}, {28, 5, 8193},  {18, 5, 9},  {26, 5, 2049}, {22, 5, 129}, {64, 5, 0},
-       {16, 5, 2}, {23, 5, 385}, {19, 5, 25}, {27, 5, 6145},  {17, 5, 7},  {25, 5, 1537}, {21, 5, 97},  {29, 5, 24577},
-       {16, 5, 4}, {24, 5, 769}, {20, 5, 49}, {28, 5, 12289}, {18, 5, 13}, {26, 5, 3073}, {22, 5, 193}, {64, 5, 0}};
diff --git a/base/poco/Foundation/src/inflate.c b/base/poco/Foundation/src/inflate.c
deleted file mode 100644
index ac333e8c2ed..00000000000
--- a/base/poco/Foundation/src/inflate.c
+++ /dev/null
@@ -1,1561 +0,0 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * Change history:
- *
- * 1.2.beta0    24 Nov 2002
- * - First version -- complete rewrite of inflate to simplify code, avoid
- *   creation of window when not needed, minimize use of window when it is
- *   needed, make inffast.c even faster, implement gzip decoding, and to
- *   improve code readability and style over the previous zlib inflate code
- *
- * 1.2.beta1    25 Nov 2002
- * - Use pointers for available input and output checking in inffast.c
- * - Remove input and output counters in inffast.c
- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
- * - Remove unnecessary second byte pull from length extra in inffast.c
- * - Unroll direct copy to three copies per loop in inffast.c
- *
- * 1.2.beta2    4 Dec 2002
- * - Change external routine names to reduce potential conflicts
- * - Correct filename to inffixed.h for fixed tables in inflate.c
- * - Make hbuf[] unsigned char to match parameter type in inflate.c
- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
- *   to avoid negation problem on Alphas (64 bit) in inflate.c
- *
- * 1.2.beta3    22 Dec 2002
- * - Add comments on state->bits assertion in inffast.c
- * - Add comments on op field in inftrees.h
- * - Fix bug in reuse of allocated window after inflateReset()
- * - Remove bit fields--back to byte structure for speed
- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
- * - Use local copies of stream next and avail values, as well as local bit
- *   buffer and bit count in inflate()--for speed when inflate_fast() not used
- *
- * 1.2.beta4    1 Jan 2003
- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
- * - Move a comment on output buffer sizes from inffast.c to inflate.c
- * - Add comments in inffast.c to introduce the inflate_fast() routine
- * - Rearrange window copies in inflate_fast() for speed and simplification
- * - Unroll last copy for window match in inflate_fast()
- * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common wnext == 0 case for speed in inflate_fast()
- * - Make op and len in inflate_fast() unsigned for consistency
- * - Add FAR to lcode and dcode declarations in inflate_fast()
- * - Simplified bad distance check in inflate_fast()
- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
- *   source file infback.c to provide a call-back interface to inflate for
- *   programs like gzip and unzip -- uses window as output buffer to avoid
- *   window copying
- *
- * 1.2.beta5    1 Jan 2003
- * - Improved inflateBack() interface to allow the caller to provide initial
- *   input in strm.
- * - Fixed stored blocks bug in inflateBack()
- *
- * 1.2.beta6    4 Jan 2003
- * - Added comments in inffast.c on effectiveness of POSTINC
- * - Typecasting all around to reduce compiler warnings
- * - Changed loops from while (1) or do {} while (1) to for (;;), again to
- *   make compilers happy
- * - Changed type of window in inflateBackInit() to unsigned char *
- *
- * 1.2.beta7    27 Jan 2003
- * - Changed many types to unsigned or unsigned short to avoid warnings
- * - Added inflateCopy() function
- *
- * 1.2.0        9 Mar 2003
- * - Changed inflateBack() interface to provide separate opaque descriptors
- *   for the in() and out() functions
- * - Changed inflateBack() argument and in_func typedef to swap the length
- *   and buffer address return values for the input function
- * - Check next_in and next_out for Z_NULL on entry to inflate()
- *
- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef MAKEFIXED
-#  ifndef BUILDFIXED
-#    define BUILDFIXED
-#  endif
-#endif
-
-/* function prototypes */
-local int inflateStateCheck OF((z_streamp strm));
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
-                           unsigned copy));
-#ifdef BUILDFIXED
-   void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
-                              unsigned len));
-
-local int inflateStateCheck(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (strm == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
-        return 1;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state == Z_NULL || state->strm != strm ||
-        state->mode < HEAD || state->mode > SYNC)
-        return 1;
-    return 0;
-}
-
-int ZEXPORT inflateResetKeep(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    strm->total_in = strm->total_out = state->total = 0;
-    strm->msg = Z_NULL;
-    if (state->wrap)        /* to support ill-conceived Java test suite */
-        strm->adler = state->wrap & 1;
-    state->mode = HEAD;
-    state->last = 0;
-    state->havedict = 0;
-    state->dmax = 32768U;
-    state->head = Z_NULL;
-    state->hold = 0;
-    state->bits = 0;
-    state->lencode = state->distcode = state->next = state->codes;
-    state->sane = 1;
-    state->back = -1;
-    Tracev((stderr, "inflate: reset\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    state->wsize = 0;
-    state->whave = 0;
-    state->wnext = 0;
-    return inflateResetKeep(strm);
-}
-
-int ZEXPORT inflateReset2(strm, windowBits)
-z_streamp strm;
-int windowBits;
-{
-    int wrap;
-    struct inflate_state FAR *state;
-
-    /* get the state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* extract wrap request from windowBits parameter */
-    if (windowBits < 0) {
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-    else {
-        wrap = (windowBits >> 4) + 5;
-#ifdef GUNZIP
-        if (windowBits < 48)
-            windowBits &= 15;
-#endif
-    }
-
-    /* set number of window bits, free window if different */
-    if (windowBits && (windowBits < 8 || windowBits > 15))
-        return Z_STREAM_ERROR;
-    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
-        ZFREE(strm, state->window);
-        state->window = Z_NULL;
-    }
-
-    /* update state and reset the rest of it */
-    state->wrap = wrap;
-    state->wbits = (unsigned)windowBits;
-    return inflateReset(strm);
-}
-
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
-    int ret;
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zfree = zcfree;
-#endif
-    state = (struct inflate_state FAR *)
-            ZALLOC(strm, 1, sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    state->strm = strm;
-    state->window = Z_NULL;
-    state->mode = HEAD;     /* to pass state test in inflateReset2() */
-    ret = inflateReset2(strm, windowBits);
-    if (ret != Z_OK) {
-        ZFREE(strm, state);
-        strm->state = Z_NULL;
-    }
-    return ret;
-}
-
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
-    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
-}
-
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (bits < 0) {
-        state->hold = 0;
-        state->bits = 0;
-        return Z_OK;
-    }
-    if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += (unsigned)value << state->bits;
-    state->bits += (uInt)bits;
-    return Z_OK;
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-/*
-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
-   those tables to stdout, which would be piped to inffixed.h.  A small program
-   can simply call makefixed to do this:
-
-    void makefixed(void);
-
-    int main(void)
-    {
-        makefixed();
-        return 0;
-    }
-
-   Then that can be linked with zlib built with MAKEFIXED defined and run:
-
-    a.out > inffixed.h
- */
-void makefixed()
-{
-    unsigned low, size;
-    struct inflate_state state;
-
-    fixedtables(&state);
-    puts("    /* inffixed.h -- table for decoding fixed codes");
-    puts("     * Generated automatically by makefixed().");
-    puts("     */");
-    puts("");
-    puts("    /* WARNING: this file should *not* be used by applications.");
-    puts("       It is part of the implementation of this library and is");
-    puts("       subject to change. Applications should only use zlib.h.");
-    puts("     */");
-    puts("");
-    size = 1U << 9;
-    printf("    static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
-               state.lencode[low].bits, state.lencode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-    size = 1U << 5;
-    printf("\n    static const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
-               state.distcode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-}
-#endif /* MAKEFIXED */
-
-/*
-   Update the window with the last wsize (normally 32K) bytes written before
-   returning.  If window does not exist yet, create it.  This is only called
-   when a window is already in use, or when output has been written during this
-   inflate call, but the end of the deflate stream has not been reached yet.
-   It is also called to create a window for dictionary data when a dictionary
-   is loaded.
-
-   Providing output buffers larger than 32K to inflate() should provide a speed
-   advantage, since only the last 32K of output is copied to the sliding window
-   upon return from inflate(), and since all distances after the first 32K of
-   output will fall in the output data, making match copies simpler and faster.
-   The advantage may be dependent on the size of the processor's data caches.
- */
-local int updatewindow(strm, end, copy)
-z_streamp strm;
-const Bytef *end;
-unsigned copy;
-{
-    struct inflate_state FAR *state;
-    unsigned dist;
-
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* if it hasn't been done already, allocate space for the window */
-    if (state->window == Z_NULL) {
-        state->window = (unsigned char FAR *)
-                        ZALLOC(strm, 1U << state->wbits,
-                               sizeof(unsigned char));
-        if (state->window == Z_NULL) return 1;
-    }
-
-    /* if window not in use yet, initialize */
-    if (state->wsize == 0) {
-        state->wsize = 1U << state->wbits;
-        state->wnext = 0;
-        state->whave = 0;
-    }
-
-    /* copy state->wsize or less output bytes into the circular window */
-    if (copy >= state->wsize) {
-        zmemcpy(state->window, end - state->wsize, state->wsize);
-        state->wnext = 0;
-        state->whave = state->wsize;
-    }
-    else {
-        dist = state->wsize - state->wnext;
-        if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->wnext, end - copy, dist);
-        copy -= dist;
-        if (copy) {
-            zmemcpy(state->window, end - copy, copy);
-            state->wnext = copy;
-            state->whave = state->wsize;
-        }
-        else {
-            state->wnext += dist;
-            if (state->wnext == state->wsize) state->wnext = 0;
-            if (state->whave < state->wsize) state->whave += dist;
-        }
-    }
-    return 0;
-}
-
-/* Macros for inflate(): */
-
-/* check function to use adler32() for zlib or crc32() for gzip */
-#ifdef GUNZIP
-#  define UPDATE(check, buf, len) \
-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
-#else
-#  define UPDATE(check, buf, len) adler32(check, buf, len)
-#endif
-
-/* check macros for header crc */
-#ifdef GUNZIP
-#  define CRC2(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        check = crc32(check, hbuf, 2); \
-    } while (0)
-
-#  define CRC4(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        hbuf[2] = (unsigned char)((word) >> 16); \
-        hbuf[3] = (unsigned char)((word) >> 24); \
-        check = crc32(check, hbuf, 4); \
-    } while (0)
-#endif
-
-/* Load registers with state in inflate() for speed */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Restore state from registers in inflate() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflate()
-   if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        if (have == 0) goto inf_leave; \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflate(). */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/*
-   inflate() uses a state machine to process as much input data and generate as
-   much output data as possible before returning.  The state machine is
-   structured roughly as follows:
-
-    for (;;) switch (state) {
-    ...
-    case STATEn:
-        if (not enough input data or output space to make progress)
-            return;
-        ... make progress ...
-        state = STATEm;
-        break;
-    ...
-    }
-
-   so when inflate() is called again, the same case is attempted again, and
-   if the appropriate resources are provided, the machine proceeds to the
-   next state.  The NEEDBITS() macro is usually the way the state evaluates
-   whether it can proceed or should return.  NEEDBITS() does the return if
-   the requested bits are not available.  The typical use of the BITS macros
-   is:
-
-        NEEDBITS(n);
-        ... do something with BITS(n) ...
-        DROPBITS(n);
-
-   where NEEDBITS(n) either returns from inflate() if there isn't enough
-   input left to load n bits into the accumulator, or it continues.  BITS(n)
-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
-   the low n bits off the accumulator.  INITBITS() clears the accumulator
-   and sets the number of available bits to zero.  BYTEBITS() discards just
-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-
-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
-   if there is no input available.  The decoding of variable length codes uses
-   PULLBYTE() directly in order to pull just enough bytes to decode the next
-   code, and no more.
-
-   Some states loop until they get enough input, making sure that enough
-   state information is maintained to continue the loop where it left off
-   if NEEDBITS() returns in the loop.  For example, want, need, and keep
-   would all have to actually be part of the saved state in case NEEDBITS()
-   returns:
-
-    case STATEw:
-        while (want < need) {
-            NEEDBITS(n);
-            keep[want++] = BITS(n);
-            DROPBITS(n);
-        }
-        state = STATEx;
-    case STATEx:
-
-   As shown above, if the next state is also the next case, then the break
-   is omitted.
-
-   A state may also return if there is not enough output space available to
-   complete that state.  Those states are copying stored data, writing a
-   literal byte, and copying a matching string.
-
-   When returning, a "goto inf_leave" is used to update the total counters,
-   update the check value, and determine whether any progress has been made
-   during that inflate() call in order to return the proper return code.
-   Progress is defined as a change in either strm->avail_in or strm->avail_out.
-   When there is a window, goto inf_leave will update the window with the last
-   output written.  If a goto inf_leave occurs in the middle of decompression
-   and there is no window currently, goto inf_leave will create one and copy
-   output to the window for the next call of inflate().
-
-   In this implementation, the flush parameter of inflate() only affects the
-   return code (per zlib.h).  inflate() always writes as much as possible to
-   strm->next_out, given the space available and the provided input--the effect
-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
-   the allocation of and copying into a sliding window until necessary, which
-   provides the effect documented in zlib.h for Z_FINISH when the entire input
-   stream available.  So the only thing the flush parameter actually does is:
-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
-   will return Z_BUF_ERROR if it has not reached the end of the stream.
- */
-
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned in, out;           /* save starting available input and output */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-#ifdef GUNZIP
-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
-#endif
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0))
-        return Z_STREAM_ERROR;
-
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
-    LOAD();
-    in = have;
-    out = left;
-    ret = Z_OK;
-    for (;;)
-        switch (state->mode) {
-        case HEAD:
-            if (state->wrap == 0) {
-                state->mode = TYPEDO;
-                break;
-            }
-            NEEDBITS(16);
-#ifdef GUNZIP
-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
-                if (state->wbits == 0)
-                    state->wbits = 15;
-                state->check = crc32(0L, Z_NULL, 0);
-                CRC2(state->check, hold);
-                INITBITS();
-                state->mode = FLAGS;
-                break;
-            }
-            state->flags = 0;           /* expect zlib header */
-            if (state->head != Z_NULL)
-                state->head->done = -1;
-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
-#else
-            if (
-#endif
-                ((BITS(8) << 8) + (hold >> 8)) % 31) {
-                strm->msg = (char *)"incorrect header check";
-                state->mode = BAD;
-                break;
-            }
-            if (BITS(4) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            DROPBITS(4);
-            len = BITS(4) + 8;
-            if (state->wbits == 0)
-                state->wbits = len;
-            if (len > 15 || len > state->wbits) {
-                strm->msg = (char *)"invalid window size";
-                state->mode = BAD;
-                break;
-            }
-            state->dmax = 1U << len;
-            Tracev((stderr, "inflate:   zlib header ok\n"));
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = hold & 0x200 ? DICTID : TYPE;
-            INITBITS();
-            break;
-#ifdef GUNZIP
-        case FLAGS:
-            NEEDBITS(16);
-            state->flags = (int)(hold);
-            if ((state->flags & 0xff) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            if (state->flags & 0xe000) {
-                strm->msg = (char *)"unknown header flags set";
-                state->mode = BAD;
-                break;
-            }
-            if (state->head != Z_NULL)
-                state->head->text = (int)((hold >> 8) & 1);
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC2(state->check, hold);
-            INITBITS();
-            state->mode = TIME;
-        case TIME:
-            NEEDBITS(32);
-            if (state->head != Z_NULL)
-                state->head->time = hold;
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC4(state->check, hold);
-            INITBITS();
-            state->mode = OS;
-        case OS:
-            NEEDBITS(16);
-            if (state->head != Z_NULL) {
-                state->head->xflags = (int)(hold & 0xff);
-                state->head->os = (int)(hold >> 8);
-            }
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC2(state->check, hold);
-            INITBITS();
-            state->mode = EXLEN;
-        case EXLEN:
-            if (state->flags & 0x0400) {
-                NEEDBITS(16);
-                state->length = (unsigned)(hold);
-                if (state->head != Z_NULL)
-                    state->head->extra_len = (unsigned)hold;
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    CRC2(state->check, hold);
-                INITBITS();
-            }
-            else if (state->head != Z_NULL)
-                state->head->extra = Z_NULL;
-            state->mode = EXTRA;
-        case EXTRA:
-            if (state->flags & 0x0400) {
-                copy = state->length;
-                if (copy > have) copy = have;
-                if (copy) {
-                    if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
-                        zmemcpy(state->head->extra + len, next,
-                                len + copy > state->head->extra_max ?
-                                state->head->extra_max - len : copy);
-                    }
-                    if ((state->flags & 0x0200) && (state->wrap & 4))
-                        state->check = crc32(state->check, next, copy);
-                    have -= copy;
-                    next += copy;
-                    state->length -= copy;
-                }
-                if (state->length) goto inf_leave;
-            }
-            state->length = 0;
-            state->mode = NAME;
-        case NAME:
-            if (state->flags & 0x0800) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->name != Z_NULL &&
-                            state->length < state->head->name_max)
-                        state->head->name[state->length++] = (Bytef)len;
-                } while (len && copy < have);
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->name = Z_NULL;
-            state->length = 0;
-            state->mode = COMMENT;
-        case COMMENT:
-            if (state->flags & 0x1000) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->comment != Z_NULL &&
-                            state->length < state->head->comm_max)
-                        state->head->comment[state->length++] = (Bytef)len;
-                } while (len && copy < have);
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->comment = Z_NULL;
-            state->mode = HCRC;
-        case HCRC:
-            if (state->flags & 0x0200) {
-                NEEDBITS(16);
-                if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
-                    strm->msg = (char *)"header crc mismatch";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-            }
-            if (state->head != Z_NULL) {
-                state->head->hcrc = (int)((state->flags >> 9) & 1);
-                state->head->done = 1;
-            }
-            strm->adler = state->check = crc32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-            break;
-#endif
-        case DICTID:
-            NEEDBITS(32);
-            strm->adler = state->check = ZSWAP32(hold);
-            INITBITS();
-            state->mode = DICT;
-        case DICT:
-            if (state->havedict == 0) {
-                RESTORE();
-                return Z_NEED_DICT;
-            }
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-        case TYPE:
-            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
-        case TYPEDO:
-            if (state->last) {
-                BYTEBITS();
-                state->mode = CHECK;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN_;             /* decode codes */
-                if (flush == Z_TREES) {
-                    DROPBITS(2);
-                    goto inf_leave;
-                }
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-        case STORED:
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-            state->mode = COPY_;
-            if (flush == Z_TREES) goto inf_leave;
-        case COPY_:
-            state->mode = COPY;
-        case COPY:
-            copy = state->length;
-            if (copy) {
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                if (copy == 0) goto inf_leave;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-                break;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-        case TABLE:
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-            state->have = 0;
-            state->mode = LENLENS;
-        case LENLENS:
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-            state->have = 0;
-            state->mode = CODELENS;
-        case CODELENS:
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = state->lens[state->have - 1];
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                state->mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (const code FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN_;
-            if (flush == Z_TREES) goto inf_leave;
-        case LEN_:
-            state->mode = LEN;
-        case LEN:
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                inflate_fast(strm, out);
-                LOAD();
-                if (state->mode == TYPE)
-                    state->back = -1;
-                break;
-            }
-            state->back = 0;
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            state->length = (unsigned)here.val;
-            if ((int)(here.op) == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                state->mode = LIT;
-                break;
-            }
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->back = -1;
-                state->mode = TYPE;
-                break;
-            }
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-            state->extra = (unsigned)(here.op) & 15;
-            state->mode = LENEXT;
-        case LENEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-            state->was = state->length;
-            state->mode = DIST;
-        case DIST:
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)here.val;
-            state->extra = (unsigned)(here.op) & 15;
-            state->mode = DISTEXT;
-        case DISTEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-#ifdef INFLATE_STRICT
-            if (state->offset > state->dmax) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-            state->mode = MATCH;
-        case MATCH:
-            if (left == 0) goto inf_leave;
-            copy = out - left;
-            if (state->offset > copy) {         /* copy from window */
-                copy = state->offset - copy;
-                if (copy > state->whave) {
-                    if (state->sane) {
-                        strm->msg = (char *)"invalid distance too far back";
-                        state->mode = BAD;
-                        break;
-                    }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                    Trace((stderr, "inflate.c too far\n"));
-                    copy -= state->whave;
-                    if (copy > state->length) copy = state->length;
-                    if (copy > left) copy = left;
-                    left -= copy;
-                    state->length -= copy;
-                    do {
-                        *put++ = 0;
-                    } while (--copy);
-                    if (state->length == 0) state->mode = LEN;
-                    break;
-#endif
-                }
-                if (copy > state->wnext) {
-                    copy -= state->wnext;
-                    from = state->window + (state->wsize - copy);
-                }
-                else
-                    from = state->window + (state->wnext - copy);
-                if (copy > state->length) copy = state->length;
-            }
-            else {                              /* copy from output */
-                from = put - state->offset;
-                copy = state->length;
-            }
-            if (copy > left) copy = left;
-            left -= copy;
-            state->length -= copy;
-            do {
-                *put++ = *from++;
-            } while (--copy);
-            if (state->length == 0) state->mode = LEN;
-            break;
-        case LIT:
-            if (left == 0) goto inf_leave;
-            *put++ = (unsigned char)(state->length);
-            left--;
-            state->mode = LEN;
-            break;
-        case CHECK:
-            if (state->wrap) {
-                NEEDBITS(32);
-                out -= left;
-                strm->total_out += out;
-                state->total += out;
-                if ((state->wrap & 4) && out)
-                    strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
-                out = left;
-                if ((state->wrap & 4) && (
-#ifdef GUNZIP
-                     state->flags ? hold :
-#endif
-                     ZSWAP32(hold)) != state->check) {
-                    strm->msg = (char *)"incorrect data check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   check matches trailer\n"));
-            }
-#ifdef GUNZIP
-            state->mode = LENGTH;
-        case LENGTH:
-            if (state->wrap && state->flags) {
-                NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
-                    strm->msg = (char *)"incorrect length check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   length matches trailer\n"));
-            }
-#endif
-            state->mode = DONE;
-        case DONE:
-            ret = Z_STREAM_END;
-            goto inf_leave;
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-        case MEM:
-            return Z_MEM_ERROR;
-        case SYNC:
-        default:
-            return Z_STREAM_ERROR;
-        }
-
-    /*
-       Return from inflate(), updating the total counts and the check value.
-       If there was no progress during the inflate() call, return a buffer
-       error.  Call updatewindow() to create and/or update the window state.
-       Note: a memory error from inflate() is non-recoverable.
-     */
-  inf_leave:
-    RESTORE();
-    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
-            (state->mode < CHECK || flush != Z_FINISH)))
-        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
-            state->mode = MEM;
-            return Z_MEM_ERROR;
-        }
-    in -= strm->avail_in;
-    out -= strm->avail_out;
-    strm->total_in += in;
-    strm->total_out += out;
-    state->total += out;
-    if ((state->wrap & 4) && out)
-        strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
-    strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0) +
-                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
-        ret = Z_BUF_ERROR;
-    return ret;
-}
-
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->window != Z_NULL) ZFREE(strm, state->window);
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-Bytef *dictionary;
-uInt *dictLength;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* copy dictionary */
-    if (state->whave && dictionary != Z_NULL) {
-        zmemcpy(dictionary, state->window + state->wnext,
-                state->whave - state->wnext);
-        zmemcpy(dictionary + state->whave - state->wnext,
-                state->window, state->wnext);
-    }
-    if (dictLength != Z_NULL)
-        *dictLength = state->whave;
-    return Z_OK;
-}
-
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
-    struct inflate_state FAR *state;
-    unsigned long dictid;
-    int ret;
-
-    /* check state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->wrap != 0 && state->mode != DICT)
-        return Z_STREAM_ERROR;
-
-    /* check for correct dictionary identifier */
-    if (state->mode == DICT) {
-        dictid = adler32(0L, Z_NULL, 0);
-        dictid = adler32(dictid, dictionary, dictLength);
-        if (dictid != state->check)
-            return Z_DATA_ERROR;
-    }
-
-    /* copy dictionary to window using updatewindow(), which will amend the
-       existing dictionary if appropriate */
-    ret = updatewindow(strm, dictionary + dictLength, dictLength);
-    if (ret) {
-        state->mode = MEM;
-        return Z_MEM_ERROR;
-    }
-    state->havedict = 1;
-    Tracev((stderr, "inflate:   dictionary set\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
-
-    /* save header structure */
-    state->head = head;
-    head->done = 0;
-    return Z_OK;
-}
-
-/*
-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
-   or when out of input.  When called, *have is the number of pattern bytes
-   found in order so far, in 0..3.  On return *have is updated to the new
-   state.  If on return *have equals four, then the pattern was found and the
-   return value is how many bytes were read including the last byte of the
-   pattern.  If *have is less than four, then the pattern has not been found
-   yet and the return value is len.  In the latter case, syncsearch() can be
-   called again with more data and the *have state.  *have is initialized to
-   zero for the first call.
- */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-const unsigned char FAR *buf;
-unsigned len;
-{
-    unsigned got;
-    unsigned next;
-
-    got = *have;
-    next = 0;
-    while (next < len && got < 4) {
-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
-            got++;
-        else if (buf[next])
-            got = 0;
-        else
-            got = 4 - got;
-        next++;
-    }
-    *have = got;
-    return next;
-}
-
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
-    unsigned len;               /* number of bytes to look at or looked at */
-    unsigned long in, out;      /* temporary to save total_in and total_out */
-    unsigned char buf[4];       /* to restore bit buffer to byte string */
-    struct inflate_state FAR *state;
-
-    /* check parameters */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
-
-    /* if first time, start search in bit buffer */
-    if (state->mode != SYNC) {
-        state->mode = SYNC;
-        state->hold <<= state->bits & 7;
-        state->bits -= state->bits & 7;
-        len = 0;
-        while (state->bits >= 8) {
-            buf[len++] = (unsigned char)(state->hold);
-            state->hold >>= 8;
-            state->bits -= 8;
-        }
-        state->have = 0;
-        syncsearch(&(state->have), buf, len);
-    }
-
-    /* search available input */
-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
-    strm->avail_in -= len;
-    strm->next_in += len;
-    strm->total_in += len;
-
-    /* return no joy or set up to restart inflate() on a new block */
-    if (state->have != 4) return Z_DATA_ERROR;
-    in = strm->total_in;  out = strm->total_out;
-    inflateReset(strm);
-    strm->total_in = in;  strm->total_out = out;
-    state->mode = TYPE;
-    return Z_OK;
-}
-
-/*
-   Returns true if inflate is currently at the end of a block generated by
-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-   implementation to provide an additional safety check. PPP uses
-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
-   block. When decompressing, PPP checks that at the end of input packet,
-   inflate is waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    return state->mode == STORED && state->bits == 0;
-}
-
-int ZEXPORT inflateCopy(dest, source)
-z_streamp dest;
-z_streamp source;
-{
-    struct inflate_state FAR *state;
-    struct inflate_state FAR *copy;
-    unsigned char FAR *window;
-    unsigned wsize;
-
-    /* check input */
-    if (inflateStateCheck(source) || dest == Z_NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)source->state;
-
-    /* allocate space */
-    copy = (struct inflate_state FAR *)
-           ZALLOC(source, 1, sizeof(struct inflate_state));
-    if (copy == Z_NULL) return Z_MEM_ERROR;
-    window = Z_NULL;
-    if (state->window != Z_NULL) {
-        window = (unsigned char FAR *)
-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
-        if (window == Z_NULL) {
-            ZFREE(source, copy);
-            return Z_MEM_ERROR;
-        }
-    }
-
-    /* copy state */
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
-    copy->strm = dest;
-    if (state->lencode >= state->codes &&
-        state->lencode <= state->codes + ENOUGH - 1) {
-        copy->lencode = copy->codes + (state->lencode - state->codes);
-        copy->distcode = copy->codes + (state->distcode - state->codes);
-    }
-    copy->next = copy->codes + (state->next - state->codes);
-    if (window != Z_NULL) {
-        wsize = 1U << state->wbits;
-        zmemcpy(window, state->window, wsize);
-    }
-    copy->window = window;
-    dest->state = (struct internal_state FAR *)copy;
-    return Z_OK;
-}
-
-int ZEXPORT inflateUndermine(strm, subvert)
-z_streamp strm;
-int subvert;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-    state->sane = !subvert;
-    return Z_OK;
-#else
-    (void)subvert;
-    state->sane = 1;
-    return Z_DATA_ERROR;
-#endif
-}
-
-int ZEXPORT inflateValidate(strm, check)
-z_streamp strm;
-int check;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (check)
-        state->wrap |= 4;
-    else
-        state->wrap &= ~4;
-    return Z_OK;
-}
-
-long ZEXPORT inflateMark(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm))
-        return -(1L << 16);
-    state = (struct inflate_state FAR *)strm->state;
-    return (long)(((unsigned long)((long)state->back)) << 16) +
-        (state->mode == COPY ? state->length :
-            (state->mode == MATCH ? state->was - state->length : 0));
-}
-
-unsigned long ZEXPORT inflateCodesUsed(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (inflateStateCheck(strm)) return (unsigned long)-1;
-    state = (struct inflate_state FAR *)strm->state;
-    return (unsigned long)(state->next - state->codes);
-}
diff --git a/base/poco/Foundation/src/inflate.h b/base/poco/Foundation/src/inflate.h
deleted file mode 100644
index 6096e40fb35..00000000000
--- a/base/poco/Foundation/src/inflate.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip decoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#    define GUNZIP
-#endif
-
-/* Possible inflate modes between inflate() calls */
-typedef enum
-{
-    HEAD = 16180, /* i: waiting for magic header */
-    FLAGS, /* i: waiting for method and flags (gzip) */
-    TIME, /* i: waiting for modification time (gzip) */
-    OS, /* i: waiting for extra flags and operating system (gzip) */
-    EXLEN, /* i: waiting for extra length (gzip) */
-    EXTRA, /* i: waiting for extra bytes (gzip) */
-    NAME, /* i: waiting for end of file name (gzip) */
-    COMMENT, /* i: waiting for end of comment (gzip) */
-    HCRC, /* i: waiting for header crc (gzip) */
-    DICTID, /* i: waiting for dictionary check value */
-    DICT, /* waiting for inflateSetDictionary() call */
-    TYPE, /* i: waiting for type bits, including last-flag bit */
-    TYPEDO, /* i: same, but skip check to exit inflate on new block */
-    STORED, /* i: waiting for stored size (length and complement) */
-    COPY_, /* i/o: same as COPY below, but only first time in */
-    COPY, /* i/o: waiting for input or output to copy stored block */
-    TABLE, /* i: waiting for dynamic block table lengths */
-    LENLENS, /* i: waiting for code length code lengths */
-    CODELENS, /* i: waiting for length/lit and distance code lengths */
-    LEN_, /* i: same as LEN below, but only first time in */
-    LEN, /* i: waiting for length/lit/eob code */
-    LENEXT, /* i: waiting for length extra bits */
-    DIST, /* i: waiting for distance code */
-    DISTEXT, /* i: waiting for distance extra bits */
-    MATCH, /* o: waiting for output space to copy string */
-    LIT, /* o: waiting for output space to write literal */
-    CHECK, /* i: waiting for 32-bit check value */
-    LENGTH, /* i: waiting for 32-bit length (gzip) */
-    DONE, /* finished check, done -- remain here until reset */
-    BAD, /* got a data error -- remain here until reset */
-    MEM, /* got an inflate() memory error -- remain here until reset */
-    SYNC /* looking for synchronization bytes to restart inflate() */
-} inflate_mode;
-
-/*
-    State transitions between above modes -
-
-    (most modes can go to BAD or MEM on error -- not shown for clarity)
-
-    Process header:
-        HEAD -> (gzip) or (zlib) or (raw)
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
-                  HCRC -> TYPE
-        (zlib) -> DICTID or TYPE
-        DICTID -> DICT -> TYPE
-        (raw) -> TYPEDO
-    Read deflate blocks:
-            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
-            STORED -> COPY_ -> COPY -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN_
-            LEN_ -> LEN
-    Read deflate codes in fixed or dynamic block:
-                LEN -> LENEXT or LIT or TYPE
-                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
-                LIT -> LEN
-    Process trailer:
-        CHECK -> LENGTH -> DONE
- */
-
-/* State maintained between inflate() calls -- approximately 7K bytes, not
-   including the allocated sliding window, which is up to 32K bytes. */
-struct inflate_state
-{
-    z_streamp strm; /* pointer back to this zlib stream */
-    inflate_mode mode; /* current inflate mode */
-    int last; /* true if processing last block */
-    int wrap; /* bit 0 true for zlib, bit 1 true for gzip,
-                                   bit 2 true to validate check value */
-    int havedict; /* true if dictionary provided */
-    int flags; /* gzip header method and flags (0 if zlib) */
-    unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */
-    unsigned long check; /* protected copy of check value */
-    unsigned long total; /* protected copy of output count */
-    gz_headerp head; /* where to save gzip header information */
-    /* sliding window */
-    unsigned wbits; /* log base 2 of requested window size */
-    unsigned wsize; /* window size or zero if not using window */
-    unsigned whave; /* valid bytes in the window */
-    unsigned wnext; /* window write index */
-    unsigned char FAR * window; /* allocated sliding window, if needed */
-    /* bit accumulator */
-    unsigned long hold; /* input bit accumulator */
-    unsigned bits; /* number of bits in "in" */
-    /* for string and stored block copying */
-    unsigned length; /* literal or length of data to copy */
-    unsigned offset; /* distance back to copy string from */
-    /* for table and code decoding */
-    unsigned extra; /* extra bits needed */
-    /* fixed and dynamic code tables */
-    code const FAR * lencode; /* starting table for length/literal codes */
-    code const FAR * distcode; /* starting table for distance codes */
-    unsigned lenbits; /* index bits for lencode */
-    unsigned distbits; /* index bits for distcode */
-    /* dynamic table building */
-    unsigned ncode; /* number of code length code lengths */
-    unsigned nlen; /* number of length code lengths */
-    unsigned ndist; /* number of distance code lengths */
-    unsigned have; /* number of code lengths in lens[] */
-    code FAR * next; /* next available space in codes[] */
-    unsigned short lens[320]; /* temporary storage for code lengths */
-    unsigned short work[288]; /* work area for code table building */
-    code codes[ENOUGH]; /* space for code tables */
-    int sane; /* if false, allow invalid distance too far */
-    int back; /* bits back of last unprocessed length/lit */
-    unsigned was; /* initial length of match */
-};
diff --git a/base/poco/Foundation/src/inftrees.c b/base/poco/Foundation/src/inftrees.c
deleted file mode 100644
index 2ea08fc13ea..00000000000
--- a/base/poco/Foundation/src/inftrees.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#define MAXBITS 15
-
-const char inflate_copyright[] =
-   " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/*
-   Build a set of tables to decode the provided canonical Huffman code.
-   The code lengths are lens[0..codes-1].  The result starts at *table,
-   whose indices are 0..2^bits-1.  work is a writable array of at least
-   lens shorts, which is used as a work area.  type is the type of code
-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
-   on return points to the next available entry's address.  bits is the
-   requested root table index bits, and on return it is the actual root
-   table index bits.  It will differ if the request is greater than the
-   longest code or if it is less than the shortest code.
- */
-int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
-    unsigned len;               /* a code's length in bits */
-    unsigned sym;               /* index of code symbols */
-    unsigned min, max;          /* minimum and maximum code lengths */
-    unsigned root;              /* number of index bits for root table */
-    unsigned curr;              /* number of index bits for current table */
-    unsigned drop;              /* code bits to drop for sub-table */
-    int left;                   /* number of prefix codes available */
-    unsigned used;              /* code entries in table used */
-    unsigned huff;              /* Huffman code */
-    unsigned incr;              /* for incrementing code, index */
-    unsigned fill;              /* index for replicating entries */
-    unsigned low;               /* low bits for current root entry */
-    unsigned mask;              /* mask for low root bits */
-    code here;                  /* table entry for duplication */
-    code FAR *next;             /* next available space in table */
-    const unsigned short FAR *base;     /* base value table to use */
-    const unsigned short FAR *extra;    /* extra bits table to use */
-    unsigned match;             /* use base and extra for symbol >= match */
-    unsigned short count[MAXBITS+1];    /* number of codes of each length */
-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
-        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
-    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577, 0, 0};
-    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
-        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-        28, 28, 29, 29, 64, 64};
-
-    /*
-       Process a set of code lengths to create a canonical Huffman code.  The
-       code lengths are lens[0..codes-1].  Each length corresponds to the
-       symbols 0..codes-1.  The Huffman code is generated by first sorting the
-       symbols by length from short to long, and retaining the symbol order
-       for codes with equal lengths.  Then the code starts with all zero bits
-       for the first code of the shortest length, and the codes are integer
-       increments for the same length, and zeros are appended as the length
-       increases.  For the deflate format, these bits are stored backwards
-       from their more natural integer increment ordering, and so when the
-       decoding tables are built in the large loop below, the integer codes
-       are incremented backwards.
-
-       This routine assumes, but does not check, that all of the entries in
-       lens[] are in the range 0..MAXBITS.  The caller must assure this.
-       1..MAXBITS is interpreted as that code length.  zero means that that
-       symbol does not occur in this code.
-
-       The codes are sorted by computing a count of codes for each length,
-       creating from that a table of starting indices for each length in the
-       sorted table, and then entering the symbols in order in the sorted
-       table.  The sorted table is work[], with that space being provided by
-       the caller.
-
-       The length counts are used for other purposes as well, i.e. finding
-       the minimum and maximum length codes, determining if there are any
-       codes at all, checking for a valid set of lengths, and looking ahead
-       at length counts to determine sub-table sizes when building the
-       decoding tables.
-     */
-
-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-    for (len = 0; len <= MAXBITS; len++)
-        count[len] = 0;
-    for (sym = 0; sym < codes; sym++)
-        count[lens[sym]]++;
-
-    /* bound code lengths, force root to be within code lengths */
-    root = *bits;
-    for (max = MAXBITS; max >= 1; max--)
-        if (count[max] != 0) break;
-    if (root > max) root = max;
-    if (max == 0) {                     /* no symbols to code at all */
-        here.op = (unsigned char)64;    /* invalid code marker */
-        here.bits = (unsigned char)1;
-        here.val = (unsigned short)0;
-        *(*table)++ = here;             /* make a table to force an error */
-        *(*table)++ = here;
-        *bits = 1;
-        return 0;     /* no symbols, but wait for decoding to report error */
-    }
-    for (min = 1; min < max; min++)
-        if (count[min] != 0) break;
-    if (root < min) root = min;
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;
-        left -= count[len];
-        if (left < 0) return -1;        /* over-subscribed */
-    }
-    if (left > 0 && (type == CODES || max != 1))
-        return -1;                      /* incomplete set */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + count[len];
-
-    /* sort symbols by length, by symbol order within each length */
-    for (sym = 0; sym < codes; sym++)
-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
-
-    /*
-       Create and fill in decoding tables.  In this loop, the table being
-       filled is at next and has curr index bits.  The code being used is huff
-       with length len.  That code is converted to an index by dropping drop
-       bits off of the bottom.  For codes where len is less than drop + curr,
-       those top drop + curr - len bits are incremented through all values to
-       fill the table with replicated entries.
-
-       root is the number of index bits for the root table.  When len exceeds
-       root, sub-tables are created pointed to by the root entry with an index
-       of the low root bits of huff.  This is saved in low to check for when a
-       new sub-table should be started.  drop is zero when the root table is
-       being filled, and drop is root when sub-tables are being filled.
-
-       When a new sub-table is needed, it is necessary to look ahead in the
-       code lengths to determine what size sub-table is needed.  The length
-       counts are used for this, and so count[] is decremented as codes are
-       entered in the tables.
-
-       used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked for LENS and DIST tables against
-       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-       the initial root table size constants.  See the comments in inftrees.h
-       for more information.
-
-       sym increments through all symbols, and the loop terminates when
-       all codes of length max, i.e. all codes, have been processed.  This
-       routine permits incomplete codes, so another loop after this one fills
-       in the rest of the decoding tables with invalid code markers.
-     */
-
-    /* set up for code type */
-    switch (type) {
-    case CODES:
-        base = extra = work;    /* dummy value--not used */
-        match = 20;
-        break;
-    case LENS:
-        base = lbase;
-        extra = lext;
-        match = 257;
-        break;
-    default:    /* DISTS */
-        base = dbase;
-        extra = dext;
-        match = 0;
-    }
-
-    /* initialize state for loop */
-    huff = 0;                   /* starting code */
-    sym = 0;                    /* starting code symbol */
-    len = min;                  /* starting code length */
-    next = *table;              /* current table to fill in */
-    curr = root;                /* current table index bits */
-    drop = 0;                   /* current bits to drop from code for index */
-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
-    used = 1U << root;          /* use root table entries */
-    mask = used - 1;            /* mask for comparing low */
-
-    /* check available table space */
-    if ((type == LENS && used > ENOUGH_LENS) ||
-        (type == DISTS && used > ENOUGH_DISTS))
-        return 1;
-
-    /* process all codes and make table entries */
-    for (;;) {
-        /* create table entry */
-        here.bits = (unsigned char)(len - drop);
-        if (work[sym] + 1U < match) {
-            here.op = (unsigned char)0;
-            here.val = work[sym];
-        }
-        else if (work[sym] >= match) {
-            here.op = (unsigned char)(extra[work[sym] - match]);
-            here.val = base[work[sym] - match];
-        }
-        else {
-            here.op = (unsigned char)(32 + 64);         /* end of block */
-            here.val = 0;
-        }
-
-        /* replicate for those indices with low len bits equal to huff */
-        incr = 1U << (len - drop);
-        fill = 1U << curr;
-        min = fill;                 /* save offset to next table */
-        do {
-            fill -= incr;
-            next[(huff >> drop) + fill] = here;
-        } while (fill != 0);
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-
-        /* go to next symbol, update count, len */
-        sym++;
-        if (--(count[len]) == 0) {
-            if (len == max) break;
-            len = lens[work[sym]];
-        }
-
-        /* create new sub-table if needed */
-        if (len > root && (huff & mask) != low) {
-            /* if first time, transition to sub-tables */
-            if (drop == 0)
-                drop = root;
-
-            /* increment past last table */
-            next += min;            /* here min is 1 << curr */
-
-            /* determine length of next table */
-            curr = len - drop;
-            left = (int)(1 << curr);
-            while (curr + drop < max) {
-                left -= count[curr + drop];
-                if (left <= 0) break;
-                curr++;
-                left <<= 1;
-            }
-
-            /* check for enough space */
-            used += 1U << curr;
-            if ((type == LENS && used > ENOUGH_LENS) ||
-                (type == DISTS && used > ENOUGH_DISTS))
-                return 1;
-
-            /* point entry in root table to sub-table */
-            low = huff & mask;
-            (*table)[low].op = (unsigned char)curr;
-            (*table)[low].bits = (unsigned char)root;
-            (*table)[low].val = (unsigned short)(next - *table);
-        }
-    }
-
-    /* fill in remaining table entry if code is incomplete (guaranteed to have
-       at most one remaining entry, since if the code is incomplete, the
-       maximum code length that was allowed to get this far is one bit) */
-    if (huff != 0) {
-        here.op = (unsigned char)64;            /* invalid code marker */
-        here.bits = (unsigned char)(len - drop);
-        here.val = (unsigned short)0;
-        next[huff] = here;
-    }
-
-    /* set return parameters */
-    *table += used;
-    *bits = root;
-    return 0;
-}
diff --git a/base/poco/Foundation/src/inftrees.h b/base/poco/Foundation/src/inftrees.h
deleted file mode 100644
index 55407138bd6..00000000000
--- a/base/poco/Foundation/src/inftrees.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables.  Each entry provides either the
-   information needed to do the operation requested by the code that
-   indexed that table entry, or it provides a pointer to another
-   table that indexes more bits of the code.  op indicates whether
-   the entry is a pointer to another table, a literal, a length or
-   distance, an end-of-block, or an invalid code.  For a table
-   pointer, the low four bits of op is the number of index bits of
-   that table.  For a length or distance, the low four bits of op
-   is the number of extra bits to get after the code.  bits is
-   the number of bits in this code or part of the code to drop off
-   of the bit buffer.  val is the actual byte to output in the case
-   of a literal, the base length or distance, or the offset from
-   the current table to the next table.  Each entry is four bytes. */
-typedef struct
-{
-    unsigned char op; /* operation, extra bits, table bits */
-    unsigned char bits; /* bits in this part of the code */
-    unsigned short val; /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
-    00000000 - literal
-    0000tttt - table link, tttt != 0 is the number of table index bits
-    0001eeee - length or distance, eeee is the number of extra bits
-    01100000 - end of block
-    01000000 - invalid code
- */
-
-/* Maximum size of the dynamic table.  The maximum number of code structures is
-   1444, which is the sum of 852 for literal/length codes and 592 for distance
-   codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribution.  The arguments to that
-   program are the number of symbols, the initial root table size, and the
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-   The initial root table size (9 or 6) is found in the fifth argument of the
-   inflate_table() calls in inflate.c and infback.c.  If the root table size is
-   changed, then these maximum sizes would be need to be recalculated and
-   updated. */
-#define ENOUGH_LENS 852
-#define ENOUGH_DISTS 592
-#define ENOUGH (ENOUGH_LENS + ENOUGH_DISTS)
-
-/* Type of code to build for inflate_table() */
-typedef enum
-{
-    CODES,
-    LENS,
-    DISTS
-} codetype;
-
-int ZLIB_INTERNAL inflate_table
-    OF((codetype type, unsigned short FAR * lens, unsigned codes, code FAR * FAR * table, unsigned FAR * bits, unsigned short FAR * work));
diff --git a/base/poco/Foundation/src/pocomsg.mc b/base/poco/Foundation/src/pocomsg.mc
deleted file mode 100644
index d1f6d6e7a8e..00000000000
--- a/base/poco/Foundation/src/pocomsg.mc
+++ /dev/null
@@ -1,87 +0,0 @@
-;//
-;// pocomsg.mc[.h]
-;//
-;// The Poco message source/header file.
-;//
-;// NOTE: pocomsg.h is automatically generated from pocomsg.mc.
-;//       Never edit pocomsg.h directly!
-;//
-;// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-;// and Contributors.
-;//
-;// Permission is hereby granted, free of charge, to any person or organization
-;// obtaining a copy of the software and accompanying documentation covered by
-;// this license (the "Software") to use, reproduce, display, distribute,
-;// execute, and transmit the Software, and to prepare derivative works of the
-;// Software, and to permit third-parties to whom the Software is furnished to
-;// do so, all subject to the following:
-;//
-;// The copyright notices in the Software and this entire statement, including
-;// the above license grant, this restriction and the following disclaimer,
-;// must be included in all copies of the Software, in whole or in part, and
-;// all derivative works of the Software, unless such copies or derivative
-;// works are solely in the form of machine-executable object code generated by
-;// a source language processor.
-;//
-;// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-;// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-;// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-;// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-;// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-;// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-;// DEALINGS IN THE SOFTWARE.
-;//
-
-
-;//
-;// Categories
-;//
-MessageId=0x1
-SymbolicName=POCO_CTG_FATAL
-Language=English
-Fatal
-.
-MessageId=0x2
-SymbolicName=POCO_CTG_CRITICAL
-Language=English
-Critical
-.
-MessageId=0x3
-SymbolicName=POCO_CTG_ERROR
-Language=English
-Error
-.
-MessageId=0x4
-SymbolicName=POCO_CTG_WARNING
-Language=English
-Warning
-.
-MessageId=0x5
-SymbolicName=POCO_CTG_NOTICE
-Language=English
-Notice
-.
-MessageId=0x6
-SymbolicName=POCO_CTG_INFORMATION
-Language=English
-Information
-.
-MessageId=0x7
-SymbolicName=POCO_CTG_DEBUG
-Language=English
-Debug
-.
-MessageId=0x8
-SymbolicName=POCO_CTG_TRACE
-Language=English
-Trace
-.
-
-;//
-;// Event Identifiers
-;//
-MessageId=0x1000
-SymbolicName=POCO_MSG_LOG
-Language=English
-%1
-.
diff --git a/base/poco/Foundation/src/strtod.cc b/base/poco/Foundation/src/strtod.cc
deleted file mode 100644
index 7c776943be5..00000000000
--- a/base/poco/Foundation/src/strtod.cc
+++ /dev/null
@@ -1,556 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <stdarg.h>
-#include <limits.h>
-
-#include "strtod.h"
-#include "bignum.h"
-#include "cached-powers.h"
-#include "ieee.h"
-
-namespace double_conversion {
-
-// 2^53 = 9007199254740992.
-// Any integer with at most 15 decimal digits will hence fit into a double
-// (which has a 53bit significand) without loss of precision.
-static const int kMaxExactDoubleIntegerDecimalDigits = 15;
-// 2^64 = 18446744073709551616 > 10^19
-static const int kMaxUint64DecimalDigits = 19;
-
-// Max double: 1.7976931348623157 x 10^308
-// Min non-zero double: 4.9406564584124654 x 10^-324
-// Any x >= 10^309 is interpreted as +infinity.
-// Any x <= 10^-324 is interpreted as 0.
-// Note that 2.5e-324 (despite being smaller than the min double) will be read
-// as non-zero (equal to the min non-zero double).
-static const int kMaxDecimalPower = 309;
-static const int kMinDecimalPower = -324;
-
-// 2^64 = 18446744073709551616
-static const uint64_t kMaxUint64 = UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF);
-
-
-static const double exact_powers_of_ten[] = {
-  1.0,  // 10^0
-  10.0,
-  100.0,
-  1000.0,
-  10000.0,
-  100000.0,
-  1000000.0,
-  10000000.0,
-  100000000.0,
-  1000000000.0,
-  10000000000.0,  // 10^10
-  100000000000.0,
-  1000000000000.0,
-  10000000000000.0,
-  100000000000000.0,
-  1000000000000000.0,
-  10000000000000000.0,
-  100000000000000000.0,
-  1000000000000000000.0,
-  10000000000000000000.0,
-  100000000000000000000.0,  // 10^20
-  1000000000000000000000.0,
-  // 10^22 = 0x21e19e0c9bab2400000 = 0x878678326eac9 * 2^22
-  10000000000000000000000.0
-};
-static const int kExactPowersOfTenSize = ARRAY_SIZE(exact_powers_of_ten);
-
-// Maximum number of significant digits in the decimal representation.
-// In fact the value is 772 (see conversions.cc), but to give us some margin
-// we round up to 780.
-static const int kMaxSignificantDecimalDigits = 780;
-
-static Vector<const char> TrimLeadingZeros(Vector<const char> buffer) {
-  for (int i = 0; i < buffer.length(); i++) {
-    if (buffer[i] != '0') {
-      return buffer.SubVector(i, buffer.length());
-    }
-  }
-  return Vector<const char>(buffer.start(), 0);
-}
-
-
-static Vector<const char> TrimTrailingZeros(Vector<const char> buffer) {
-  for (int i = buffer.length() - 1; i >= 0; --i) {
-    if (buffer[i] != '0') {
-      return buffer.SubVector(0, i + 1);
-    }
-  }
-  return Vector<const char>(buffer.start(), 0);
-}
-
-
-static void CutToMaxSignificantDigits(Vector<const char> buffer,
-                                       int exponent,
-                                       char* significant_buffer,
-                                       int* significant_exponent) {
-  for (int i = 0; i < kMaxSignificantDecimalDigits - 1; ++i) {
-    significant_buffer[i] = buffer[i];
-  }
-  // The input buffer has been trimmed. Therefore the last digit must be
-  // different from '0'.
-  ASSERT(buffer[buffer.length() - 1] != '0');
-  // Set the last digit to be non-zero. This is sufficient to guarantee
-  // correct rounding.
-  significant_buffer[kMaxSignificantDecimalDigits - 1] = '1';
-  *significant_exponent =
-      exponent + (buffer.length() - kMaxSignificantDecimalDigits);
-}
-
-
-// Trims the buffer and cuts it to at most kMaxSignificantDecimalDigits.
-// If possible the input-buffer is reused, but if the buffer needs to be
-// modified (due to cutting), then the input needs to be copied into the
-// buffer_copy_space.
-static void TrimAndCut(Vector<const char> buffer, int exponent,
-                       char* buffer_copy_space, int space_size,
-                       Vector<const char>* trimmed, int* updated_exponent) {
-  Vector<const char> left_trimmed = TrimLeadingZeros(buffer);
-  Vector<const char> right_trimmed = TrimTrailingZeros(left_trimmed);
-  exponent += left_trimmed.length() - right_trimmed.length();
-  if (right_trimmed.length() > kMaxSignificantDecimalDigits) {
-    (void) space_size;  // Mark variable as used.
-    ASSERT(space_size >= kMaxSignificantDecimalDigits);
-    CutToMaxSignificantDigits(right_trimmed, exponent,
-                              buffer_copy_space, updated_exponent);
-    *trimmed = Vector<const char>(buffer_copy_space,
-                                 kMaxSignificantDecimalDigits);
-  } else {
-    *trimmed = right_trimmed;
-    *updated_exponent = exponent;
-  }
-}
-
-
-// Reads digits from the buffer and converts them to a uint64.
-// Reads in as many digits as fit into a uint64.
-// When the string starts with "1844674407370955161" no further digit is read.
-// Since 2^64 = 18446744073709551616 it would still be possible read another
-// digit if it was less or equal than 6, but this would complicate the code.
-static uint64_t ReadUint64(Vector<const char> buffer,
-                           int* number_of_read_digits) {
-  uint64_t result = 0;
-  int i = 0;
-  while (i < buffer.length() && result <= (kMaxUint64 / 10 - 1)) {
-    int digit = buffer[i++] - '0';
-    ASSERT(0 <= digit && digit <= 9);
-    result = 10 * result + digit;
-  }
-  *number_of_read_digits = i;
-  return result;
-}
-
-
-// Reads a DiyFp from the buffer.
-// The returned DiyFp is not necessarily normalized.
-// If remaining_decimals is zero then the returned DiyFp is accurate.
-// Otherwise it has been rounded and has error of at most 1/2 ulp.
-static void ReadDiyFp(Vector<const char> buffer,
-                      DiyFp* result,
-                      int* remaining_decimals) {
-  int read_digits;
-  uint64_t significand = ReadUint64(buffer, &read_digits);
-  if (buffer.length() == read_digits) {
-    *result = DiyFp(significand, 0);
-    *remaining_decimals = 0;
-  } else {
-    // Round the significand.
-    if (buffer[read_digits] >= '5') {
-      significand++;
-    }
-    // Compute the binary exponent.
-    int exponent = 0;
-    *result = DiyFp(significand, exponent);
-    *remaining_decimals = buffer.length() - read_digits;
-  }
-}
-
-
-static bool DoubleStrtod(Vector<const char> trimmed,
-                         int exponent,
-                         double* result) {
-#if !defined(DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS)
-  // On x86 the floating-point stack can be 64 or 80 bits wide. If it is
-  // 80 bits wide (as is the case on Linux) then double-rounding occurs and the
-  // result is not accurate.
-  // We know that Windows32 uses 64 bits and is therefore accurate.
-  // Note that the ARM simulator is compiled for 32bits. It therefore exhibits
-  // the same problem.
-  return false;
-#endif
-  if (trimmed.length() <= kMaxExactDoubleIntegerDecimalDigits) {
-    int read_digits;
-    // The trimmed input fits into a double.
-    // If the 10^exponent (resp. 10^-exponent) fits into a double too then we
-    // can compute the result-double simply by multiplying (resp. dividing) the
-    // two numbers.
-    // This is possible because IEEE guarantees that floating-point operations
-    // return the best possible approximation.
-    if (exponent < 0 && -exponent < kExactPowersOfTenSize) {
-      // 10^-exponent fits into a double.
-      *result = static_cast<double>(ReadUint64(trimmed, &read_digits));
-      ASSERT(read_digits == trimmed.length());
-      *result /= exact_powers_of_ten[-exponent];
-      return true;
-    }
-    if (0 <= exponent && exponent < kExactPowersOfTenSize) {
-      // 10^exponent fits into a double.
-      *result = static_cast<double>(ReadUint64(trimmed, &read_digits));
-      ASSERT(read_digits == trimmed.length());
-      *result *= exact_powers_of_ten[exponent];
-      return true;
-    }
-    int remaining_digits =
-        kMaxExactDoubleIntegerDecimalDigits - trimmed.length();
-    if ((0 <= exponent) &&
-        (exponent - remaining_digits < kExactPowersOfTenSize)) {
-      // The trimmed string was short and we can multiply it with
-      // 10^remaining_digits. As a result the remaining exponent now fits
-      // into a double too.
-      *result = static_cast<double>(ReadUint64(trimmed, &read_digits));
-      ASSERT(read_digits == trimmed.length());
-      *result *= exact_powers_of_ten[remaining_digits];
-      *result *= exact_powers_of_ten[exponent - remaining_digits];
-      return true;
-    }
-  }
-  return false;
-}
-
-
-// Returns 10^exponent as an exact DiyFp.
-// The given exponent must be in the range [1; kDecimalExponentDistance[.
-static DiyFp AdjustmentPowerOfTen(int exponent) {
-  ASSERT(0 < exponent);
-  ASSERT(exponent < PowersOfTenCache::kDecimalExponentDistance);
-  // Simply hardcode the remaining powers for the given decimal exponent
-  // distance.
-  ASSERT(PowersOfTenCache::kDecimalExponentDistance == 8);
-  switch (exponent) {
-    case 1: return DiyFp(UINT64_2PART_C(0xa0000000, 00000000), -60);
-    case 2: return DiyFp(UINT64_2PART_C(0xc8000000, 00000000), -57);
-    case 3: return DiyFp(UINT64_2PART_C(0xfa000000, 00000000), -54);
-    case 4: return DiyFp(UINT64_2PART_C(0x9c400000, 00000000), -50);
-    case 5: return DiyFp(UINT64_2PART_C(0xc3500000, 00000000), -47);
-    case 6: return DiyFp(UINT64_2PART_C(0xf4240000, 00000000), -44);
-    case 7: return DiyFp(UINT64_2PART_C(0x98968000, 00000000), -40);
-    default:
-      UNREACHABLE();
-      return DiyFp(0, 0);
-  }
-}
-
-
-// If the function returns true then the result is the correct double.
-// Otherwise it is either the correct double or the double that is just below
-// the correct double.
-static bool DiyFpStrtod(Vector<const char> buffer,
-                        int exponent,
-                        double* result) {
-  DiyFp input;
-  int remaining_decimals;
-  ReadDiyFp(buffer, &input, &remaining_decimals);
-  // Since we may have dropped some digits the input is not accurate.
-  // If remaining_decimals is different than 0 than the error is at most
-  // .5 ulp (unit in the last place).
-  // We don't want to deal with fractions and therefore keep a common
-  // denominator.
-  const int kDenominatorLog = 3;
-  const int kDenominator = 1 << kDenominatorLog;
-  // Move the remaining decimals into the exponent.
-  exponent += remaining_decimals;
-  int error = (remaining_decimals == 0 ? 0 : kDenominator / 2);
-
-  int old_e = input.e();
-  input.Normalize();
-  error <<= old_e - input.e();
-
-  ASSERT(exponent <= PowersOfTenCache::kMaxDecimalExponent);
-  if (exponent < PowersOfTenCache::kMinDecimalExponent) {
-    *result = 0.0;
-    return true;
-  }
-  DiyFp cached_power;
-  int cached_decimal_exponent;
-  PowersOfTenCache::GetCachedPowerForDecimalExponent(exponent,
-                                                     &cached_power,
-                                                     &cached_decimal_exponent);
-
-  if (cached_decimal_exponent != exponent) {
-    int adjustment_exponent = exponent - cached_decimal_exponent;
-    DiyFp adjustment_power = AdjustmentPowerOfTen(adjustment_exponent);
-    input.Multiply(adjustment_power);
-    if (kMaxUint64DecimalDigits - buffer.length() >= adjustment_exponent) {
-      // The product of input with the adjustment power fits into a 64 bit
-      // integer.
-      ASSERT(DiyFp::kSignificandSize == 64);
-    } else {
-      // The adjustment power is exact. There is hence only an error of 0.5.
-      error += kDenominator / 2;
-    }
-  }
-
-  input.Multiply(cached_power);
-  // The error introduced by a multiplication of a*b equals
-  //   error_a + error_b + error_a*error_b/2^64 + 0.5
-  // Substituting a with 'input' and b with 'cached_power' we have
-  //   error_b = 0.5  (all cached powers have an error of less than 0.5 ulp),
-  //   error_ab = 0 or 1 / kDenominator > error_a*error_b/ 2^64
-  int error_b = kDenominator / 2;
-  int error_ab = (error == 0 ? 0 : 1);  // We round up to 1.
-  int fixed_error = kDenominator / 2;
-  error += error_b + error_ab + fixed_error;
-
-  old_e = input.e();
-  input.Normalize();
-  error <<= old_e - input.e();
-
-  // See if the double's significand changes if we add/subtract the error.
-  int order_of_magnitude = DiyFp::kSignificandSize + input.e();
-  int effective_significand_size =
-      Double::SignificandSizeForOrderOfMagnitude(order_of_magnitude);
-  int precision_digits_count =
-      DiyFp::kSignificandSize - effective_significand_size;
-  if (precision_digits_count + kDenominatorLog >= DiyFp::kSignificandSize) {
-    // This can only happen for very small denormals. In this case the
-    // half-way multiplied by the denominator exceeds the range of an uint64.
-    // Simply shift everything to the right.
-    int shift_amount = (precision_digits_count + kDenominatorLog) -
-        DiyFp::kSignificandSize + 1;
-    input.set_f(input.f() >> shift_amount);
-    input.set_e(input.e() + shift_amount);
-    // We add 1 for the lost precision of error, and kDenominator for
-    // the lost precision of input.f().
-    error = (error >> shift_amount) + 1 + kDenominator;
-    precision_digits_count -= shift_amount;
-  }
-  // We use uint64_ts now. This only works if the DiyFp uses uint64_ts too.
-  ASSERT(DiyFp::kSignificandSize == 64);
-  ASSERT(precision_digits_count < 64);
-  uint64_t one64 = 1;
-  uint64_t precision_bits_mask = (one64 << precision_digits_count) - 1;
-  uint64_t precision_bits = input.f() & precision_bits_mask;
-  uint64_t half_way = one64 << (precision_digits_count - 1);
-  precision_bits *= kDenominator;
-  half_way *= kDenominator;
-  DiyFp rounded_input(input.f() >> precision_digits_count,
-                      input.e() + precision_digits_count);
-  if (precision_bits >= half_way + error) {
-    rounded_input.set_f(rounded_input.f() + 1);
-  }
-  // If the last_bits are too close to the half-way case than we are too
-  // inaccurate and round down. In this case we return false so that we can
-  // fall back to a more precise algorithm.
-
-  *result = Double(rounded_input).value();
-  if (half_way - error < precision_bits && precision_bits < half_way + error) {
-    // Too imprecise. The caller will have to fall back to a slower version.
-    // However the returned number is guaranteed to be either the correct
-    // double, or the next-lower double.
-    return false;
-  } else {
-    return true;
-  }
-}
-
-
-// Returns
-//   - -1 if buffer*10^exponent < diy_fp.
-//   -  0 if buffer*10^exponent == diy_fp.
-//   - +1 if buffer*10^exponent > diy_fp.
-// Preconditions:
-//   buffer.length() + exponent <= kMaxDecimalPower + 1
-//   buffer.length() + exponent > kMinDecimalPower
-//   buffer.length() <= kMaxDecimalSignificantDigits
-static int CompareBufferWithDiyFp(Vector<const char> buffer,
-                                  int exponent,
-                                  DiyFp diy_fp) {
-  ASSERT(buffer.length() + exponent <= kMaxDecimalPower + 1);
-  ASSERT(buffer.length() + exponent > kMinDecimalPower);
-  ASSERT(buffer.length() <= kMaxSignificantDecimalDigits);
-  // Make sure that the Bignum will be able to hold all our numbers.
-  // Our Bignum implementation has a separate field for exponents. Shifts will
-  // consume at most one bigit (< 64 bits).
-  // ln(10) == 3.3219...
-  ASSERT(((kMaxDecimalPower + 1) * 333 / 100) < Bignum::kMaxSignificantBits);
-  Bignum buffer_bignum;
-  Bignum diy_fp_bignum;
-  buffer_bignum.AssignDecimalString(buffer);
-  diy_fp_bignum.AssignUInt64(diy_fp.f());
-  if (exponent >= 0) {
-    buffer_bignum.MultiplyByPowerOfTen(exponent);
-  } else {
-    diy_fp_bignum.MultiplyByPowerOfTen(-exponent);
-  }
-  if (diy_fp.e() > 0) {
-    diy_fp_bignum.ShiftLeft(diy_fp.e());
-  } else {
-    buffer_bignum.ShiftLeft(-diy_fp.e());
-  }
-  return Bignum::Compare(buffer_bignum, diy_fp_bignum);
-}
-
-
-// Returns true if the guess is the correct double.
-// Returns false, when guess is either correct or the next-lower double.
-static bool ComputeGuess(Vector<const char> trimmed, int exponent,
-                         double* guess) {
-  if (trimmed.length() == 0) {
-    *guess = 0.0;
-    return true;
-  }
-  if (exponent + trimmed.length() - 1 >= kMaxDecimalPower) {
-    *guess = Double::Infinity();
-    return true;
-  }
-  if (exponent + trimmed.length() <= kMinDecimalPower) {
-    *guess = 0.0;
-    return true;
-  }
-
-  if (DoubleStrtod(trimmed, exponent, guess) ||
-      DiyFpStrtod(trimmed, exponent, guess)) {
-    return true;
-  }
-  if (*guess == Double::Infinity()) {
-    return true;
-  }
-  return false;
-}
-
-double Strtod(Vector<const char> buffer, int exponent) {
-  char copy_buffer[kMaxSignificantDecimalDigits];
-  Vector<const char> trimmed;
-  int updated_exponent;
-  TrimAndCut(buffer, exponent, copy_buffer, kMaxSignificantDecimalDigits,
-             &trimmed, &updated_exponent);
-  exponent = updated_exponent;
-
-  double guess;
-  bool is_correct = ComputeGuess(trimmed, exponent, &guess);
-  if (is_correct) return guess;
-
-  DiyFp upper_boundary = Double(guess).UpperBoundary();
-  int comparison = CompareBufferWithDiyFp(trimmed, exponent, upper_boundary);
-  if (comparison < 0) {
-    return guess;
-  } else if (comparison > 0) {
-    return Double(guess).NextDouble();
-  } else if ((Double(guess).Significand() & 1) == 0) {
-    // Round towards even.
-    return guess;
-  } else {
-    return Double(guess).NextDouble();
-  }
-}
-
-float Strtof(Vector<const char> buffer, int exponent) {
-  char copy_buffer[kMaxSignificantDecimalDigits];
-  Vector<const char> trimmed;
-  int updated_exponent;
-  TrimAndCut(buffer, exponent, copy_buffer, kMaxSignificantDecimalDigits,
-             &trimmed, &updated_exponent);
-  exponent = updated_exponent;
-
-  double double_guess;
-  bool is_correct = ComputeGuess(trimmed, exponent, &double_guess);
-
-  float float_guess = static_cast<float>(double_guess);
-  if (float_guess == double_guess) {
-    // This shortcut triggers for integer values.
-    return float_guess;
-  }
-
-  // We must catch double-rounding. Say the double has been rounded up, and is
-  // now a boundary of a float, and rounds up again. This is why we have to
-  // look at previous too.
-  // Example (in decimal numbers):
-  //    input: 12349
-  //    high-precision (4 digits): 1235
-  //    low-precision (3 digits):
-  //       when read from input: 123
-  //       when rounded from high precision: 124.
-  // To do this we simply look at the neighbors of the correct result and see
-  // if they would round to the same float. If the guess is not correct we have
-  // to look at four values (since two different doubles could be the correct
-  // double).
-
-  double double_next = Double(double_guess).NextDouble();
-  double double_previous = Double(double_guess).PreviousDouble();
-
-  float f1 = static_cast<float>(double_previous);
-  float f2 = float_guess;
-  float f3 = static_cast<float>(double_next);
-  float f4;
-  if (is_correct) {
-    f4 = f3;
-  } else {
-    double double_next2 = Double(double_next).NextDouble();
-    f4 = static_cast<float>(double_next2);
-  }
-  (void) f2;  // Mark variable as used.
-  ASSERT(f1 <= f2 && f2 <= f3 && f3 <= f4);
-
-  // If the guess doesn't lie near a single-precision boundary we can simply
-  // return its float-value.
-  if (f1 == f4) {
-    return float_guess;
-  }
-
-  ASSERT((f1 != f2 && f2 == f3 && f3 == f4) ||
-         (f1 == f2 && f2 != f3 && f3 == f4) ||
-         (f1 == f2 && f2 == f3 && f3 != f4));
-
-  // guess and next are the two possible candidates (in the same way that
-  // double_guess was the lower candidate for a double-precision guess).
-  float guess = f1;
-  float next = f4;
-  DiyFp upper_boundary;
-  if (guess == 0.0f) {
-    float min_float = 1e-45f;
-    upper_boundary = Double(static_cast<double>(min_float) / 2).AsDiyFp();
-  } else {
-    upper_boundary = Single(guess).UpperBoundary();
-  }
-  int comparison = CompareBufferWithDiyFp(trimmed, exponent, upper_boundary);
-  if (comparison < 0) {
-    return guess;
-  } else if (comparison > 0) {
-    return next;
-  } else if ((Single(guess).Significand() & 1) == 0) {
-    // Round towards even.
-    return guess;
-  } else {
-    return next;
-  }
-}
-
-}  // namespace double_conversion
diff --git a/base/poco/Foundation/src/strtod.h b/base/poco/Foundation/src/strtod.h
deleted file mode 100644
index 66f90253e32..00000000000
--- a/base/poco/Foundation/src/strtod.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef DOUBLE_CONVERSION_STRTOD_H_
-#define DOUBLE_CONVERSION_STRTOD_H_
-
-#include "utils.h"
-
-namespace double_conversion
-{
-
-// The buffer must only contain digits in the range [0-9]. It must not
-// contain a dot or a sign. It must not start with '0', and must not be empty.
-double Strtod(Vector<const char> buffer, int exponent);
-
-// The buffer must only contain digits in the range [0-9]. It must not
-// contain a dot or a sign. It must not start with '0', and must not be empty.
-float Strtof(Vector<const char> buffer, int exponent);
-
-} // namespace double_conversion
-
-#endif // DOUBLE_CONVERSION_STRTOD_H_
diff --git a/base/poco/Foundation/src/trees.c b/base/poco/Foundation/src/trees.c
deleted file mode 100644
index b9d998f1b32..00000000000
--- a/base/poco/Foundation/src/trees.c
+++ /dev/null
@@ -1,1203 +0,0 @@
-/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2017 Jean-loup Gailly
- * detect_data_type() function provided freely by Cosmin Truta, 2006
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process uses several Huffman trees. The more
- *      common source values are represented by shorter bit sequences.
- *
- *      Each code tree is stored in a compressed form which is itself
- * a Huffman encoding of the lengths of all the code strings (in
- * ascending order by source values).  The actual code strings are
- * reconstructed from the lengths in the inflate process, as described
- * in the deflate specification.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
- *
- *      Storer, James A.
- *          Data Compression:  Methods and Theory, pp. 49-50.
- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
- *
- *      Sedgewick, R.
- *          Algorithms, p290.
- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
- */
-
-/* @(#) $Id$ */
-
-/* #define GEN_TREES_H */
-
-#include "deflate.h"
-
-#ifdef ZLIB_DEBUG
-#  include <ctype.h>
-#endif
-
-/* ===========================================================================
- * Constants
- */
-
-#define MAX_BL_BITS 7
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-#define END_BLOCK 256
-/* end of block literal code */
-
-#define REP_3_6      16
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-#define REPZ_3_10    17
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-#define REPZ_11_138  18
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-
-local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-
-local const uch bl_order[BL_CODES]
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-/* non ANSI compilers may not accept trees.h */
-
-local ct_data static_ltree[L_CODES+2];
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-local ct_data static_dtree[D_CODES];
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-uch _dist_code[DIST_CODE_LEN];
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-uch _length_code[MAX_MATCH-MIN_MATCH+1];
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-local int base_length[LENGTH_CODES];
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-local int base_dist[D_CODES];
-/* First normalized distance for each code (0 = distance of 1) */
-
-#else
-#  include "trees.h"
-#endif /* GEN_TREES_H */
-
-struct static_tree_desc_s {
-    const ct_data *static_tree;  /* static tree or NULL */
-    const intf *extra_bits;      /* extra bits for each code or NULL */
-    int     extra_base;          /* base index for extra_bits */
-    int     elems;               /* max number of elements in the tree */
-    int     max_length;          /* max bit length for the codes */
-};
-
-local const static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-
-local const static_tree_desc  static_d_desc =
-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
-
-local const static_tree_desc  static_bl_desc =
-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
-
-/* ===========================================================================
- * Local (static) routines in this file.
- */
-
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, const ct_data *ltree,
-                              const ct_data *dtree));
-local int  detect_data_type OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
-
-#ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
-#endif
-
-#ifndef ZLIB_DEBUG
-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-   /* Send a code of the given tree. c and tree must not have side effects */
-
-#else /* !ZLIB_DEBUG */
-#  define send_code(s, c, tree) \
-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-       send_bits(s, tree[c].Code, tree[c].Len); }
-#endif
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-#ifdef ZLIB_DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
-    Tracevv((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (ulg)length;
-
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (ush)value << s->bi_valid;
-        put_short(s, s->bi_buf);
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= (ush)value << s->bi_valid;
-        s->bi_valid += length;
-    }
-}
-#else /* !ZLIB_DEBUG */
-
-#define send_bits(s, value, length) \
-{ int len = length;\
-  if (s->bi_valid > (int)Buf_size - len) {\
-    int val = (int)value;\
-    s->bi_buf |= (ush)val << s->bi_valid;\
-    put_short(s, s->bi_buf);\
-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-    s->bi_valid += len - Buf_size;\
-  } else {\
-    s->bi_buf |= (ush)(value) << s->bi_valid;\
-    s->bi_valid += len;\
-  }\
-}
-#endif /* ZLIB_DEBUG */
-
-
-/* the arguments must not have side effects */
-
-/* ===========================================================================
- * Initialize the various 'constant' tables.
- */
-local void tr_static_init()
-{
-#if defined(GEN_TREES_H) || !defined(STDC)
-    static int static_init_done = 0;
-    int n;        /* iterates over tree elements */
-    int bits;     /* bit counter */
-    int length;   /* length value */
-    int code;     /* code value */
-    int dist;     /* distance index */
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    if (static_init_done) return;
-
-    /* For some embedded targets, global variables are not initialized: */
-#ifdef NO_INIT_GLOBAL_POINTERS
-    static_l_desc.static_tree = static_ltree;
-    static_l_desc.extra_bits = extra_lbits;
-    static_d_desc.static_tree = static_dtree;
-    static_d_desc.extra_bits = extra_dbits;
-    static_bl_desc.extra_bits = extra_blbits;
-#endif
-
-    /* Initialize the mapping length (0..255) -> length code (0..28) */
-    length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
-        base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
-            _length_code[length++] = (uch)code;
-        }
-    }
-    Assert (length == 256, "tr_static_init: length != 256");
-    /* Note that the length 255 (match length 258) can be represented
-     * in two different ways: code 284 + 5 bits or code 285, so we
-     * overwrite length_code[255] to use the best encoding:
-     */
-    _length_code[length-1] = (uch)code;
-
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-    dist = 0;
-    for (code = 0 ; code < 16; code++) {
-        base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
-            _dist_code[dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: dist != 256");
-    dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
-        base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-            _dist_code[256 + dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
-    /* Construct the codes of the static literal tree */
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-    n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-    /* Codes 286 and 287 do not exist, but we must include them in the
-     * tree construction to get a canonical Huffman tree (longest code
-     * all ones)
-     */
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
-
-    /* The static distance tree is trivial: */
-    for (n = 0; n < D_CODES; n++) {
-        static_dtree[n].Len = 5;
-        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
-    }
-    static_init_done = 1;
-
-#  ifdef GEN_TREES_H
-    gen_trees_header();
-#  endif
-#endif /* defined(GEN_TREES_H) || !defined(STDC) */
-}
-
-/* ===========================================================================
- * Generate the file trees.h describing the static trees.
- */
-#ifdef GEN_TREES_H
-#  ifndef ZLIB_DEBUG
-#    include <stdio.h>
-#  endif
-
-#  define SEPARATOR(i, last, width) \
-      ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
-
-void gen_trees_header()
-{
-    FILE *header = fopen("trees.h", "w");
-    int i;
-
-    Assert (header != NULL, "Can't open trees.h");
-    fprintf(header,
-            "/* header created automatically with -DGEN_TREES_H */\n\n");
-
-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-    for (i = 0; i < L_CODES+2; i++) {
-        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-    }
-
-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-    }
-
-    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
-    for (i = 0; i < DIST_CODE_LEN; i++) {
-        fprintf(header, "%2u%s", _dist_code[i],
-                SEPARATOR(i, DIST_CODE_LEN-1, 20));
-    }
-
-    fprintf(header,
-        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
-        fprintf(header, "%2u%s", _length_code[i],
-                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
-    }
-
-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
-    for (i = 0; i < LENGTH_CODES; i++) {
-        fprintf(header, "%1u%s", base_length[i],
-                SEPARATOR(i, LENGTH_CODES-1, 20));
-    }
-
-    fprintf(header, "local const int base_dist[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "%5u%s", base_dist[i],
-                SEPARATOR(i, D_CODES-1, 10));
-    }
-
-    fclose(header);
-}
-#endif /* GEN_TREES_H */
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-void ZLIB_INTERNAL _tr_init(s)
-    deflate_state *s;
-{
-    tr_static_init();
-
-    s->l_desc.dyn_tree = s->dyn_ltree;
-    s->l_desc.stat_desc = &static_l_desc;
-
-    s->d_desc.dyn_tree = s->dyn_dtree;
-    s->d_desc.stat_desc = &static_d_desc;
-
-    s->bl_desc.dyn_tree = s->bl_tree;
-    s->bl_desc.stat_desc = &static_bl_desc;
-
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef ZLIB_DEBUG
-    s->compressed_len = 0L;
-    s->bits_sent = 0L;
-#endif
-
-    /* Initialize the first block of the first file: */
-    init_block(s);
-}
-
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(s)
-    deflate_state *s;
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
-}
-
-#define SMALLEST 1
-/* Index within the heap array of least frequent node in the Huffman tree */
-
-
-/* ===========================================================================
- * Remove the smallest element from the heap and recreate the heap with
- * one less element. Updates heap and heap_len.
- */
-#define pqremove(s, tree, top) \
-{\
-    top = s->heap[SMALLEST]; \
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-    pqdownheap(s, tree, SMALLEST); \
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-#define smaller(tree, n, m, depth) \
-   (tree[n].Freq < tree[m].Freq || \
-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-local void pqdownheap(s, tree, k)
-    deflate_state *s;
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
-{
-    int v = s->heap[k];
-    int j = k << 1;  /* left son of k */
-    while (j <= s->heap_len) {
-        /* Set j to the smallest of the two sons: */
-        if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-            j++;
-        }
-        /* Exit if v is smaller than both sons */
-        if (smaller(tree, v, s->heap[j], s->depth)) break;
-
-        /* Exchange v with the smallest son */
-        s->heap[k] = s->heap[j];  k = j;
-
-        /* And continue down the tree, setting j to the left son of k */
-        j <<= 1;
-    }
-    s->heap[k] = v;
-}
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-local void gen_bitlen(s, desc)
-    deflate_state *s;
-    tree_desc *desc;    /* the tree descriptor */
-{
-    ct_data *tree        = desc->dyn_tree;
-    int max_code         = desc->max_code;
-    const ct_data *stree = desc->stat_desc->static_tree;
-    const intf *extra    = desc->stat_desc->extra_bits;
-    int base             = desc->stat_desc->extra_base;
-    int max_length       = desc->stat_desc->max_length;
-    int h;              /* heap index */
-    int n, m;           /* iterate over the tree elements */
-    int bits;           /* bit length */
-    int xbits;          /* extra bits */
-    ush f;              /* frequency */
-    int overflow = 0;   /* number of elements with bit length too large */
-
-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
-
-    /* In a first pass, compute the optimal bit lengths (which may
-     * overflow in the case of the bit length tree).
-     */
-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
-
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
-        n = s->heap[h];
-        bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) bits = max_length, overflow++;
-        tree[n].Len = (ush)bits;
-        /* We overwrite tree[n].Dad which is no longer needed */
-
-        if (n > max_code) continue; /* not a leaf node */
-
-        s->bl_count[bits]++;
-        xbits = 0;
-        if (n >= base) xbits = extra[n-base];
-        f = tree[n].Freq;
-        s->opt_len += (ulg)f * (unsigned)(bits + xbits);
-        if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
-    }
-    if (overflow == 0) return;
-
-    Tracev((stderr,"\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */
-
-    /* Find the first bit length which could increase: */
-    do {
-        bits = max_length-1;
-        while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
-        s->bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-        overflow -= 2;
-    } while (overflow > 0);
-
-    /* Now recompute all bit lengths, scanning in increasing frequency.
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-     * lengths instead of fixing only the wrong ones. This idea is taken
-     * from 'ar' written by Haruhiko Okumura.)
-     */
-    for (bits = max_length; bits != 0; bits--) {
-        n = s->bl_count[bits];
-        while (n != 0) {
-            m = s->heap[--h];
-            if (m > max_code) continue;
-            if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Tracev((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq;
-                tree[m].Len = (ush)bits;
-            }
-            n--;
-        }
-    }
-}
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (tree, max_code, bl_count)
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    unsigned code = 0;         /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        code = (code + bl_count[bits-1]) << 1;
-        next_code[bits] = (ush)code;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-local void build_tree(s, desc)
-    deflate_state *s;
-    tree_desc *desc; /* the tree descriptor */
-{
-    ct_data *tree         = desc->dyn_tree;
-    const ct_data *stree  = desc->stat_desc->static_tree;
-    int elems             = desc->stat_desc->elems;
-    int n, m;          /* iterate over heap elements */
-    int max_code = -1; /* largest code with non zero frequency */
-    int node;          /* new node being created */
-
-    /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-     * heap[0] is not used.
-     */
-    s->heap_len = 0, s->heap_max = HEAP_SIZE;
-
-    for (n = 0; n < elems; n++) {
-        if (tree[n].Freq != 0) {
-            s->heap[++(s->heap_len)] = max_code = n;
-            s->depth[n] = 0;
-        } else {
-            tree[n].Len = 0;
-        }
-    }
-
-    /* The pkzip format requires that at least one distance code exists,
-     * and that at least one bit should be sent even if there is only one
-     * possible code. So to avoid special checks later on we force at least
-     * two codes of non zero frequency.
-     */
-    while (s->heap_len < 2) {
-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[node].Freq = 1;
-        s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-        /* node is 0 or 1 so it does not have extra bits */
-    }
-    desc->max_code = max_code;
-
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-     * establish sub-heaps of increasing lengths:
-     */
-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
-
-    /* Construct the Huffman tree by repeatedly combining the least two
-     * frequent nodes.
-     */
-    node = elems;              /* next internal node of the tree */
-    do {
-        pqremove(s, tree, n);  /* n = node of least frequency */
-        m = s->heap[SMALLEST]; /* m = node of next least frequency */
-
-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-        s->heap[--(s->heap_max)] = m;
-
-        /* Create a new node father of n and m */
-        tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
-                                s->depth[n] : s->depth[m]) + 1);
-        tree[n].Dad = tree[m].Dad = (ush)node;
-#ifdef DUMP_BL_TREE
-        if (tree == s->bl_tree) {
-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-        }
-#endif
-        /* and insert the new node in the heap */
-        s->heap[SMALLEST] = node++;
-        pqdownheap(s, tree, SMALLEST);
-
-    } while (s->heap_len >= 2);
-
-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
-
-    /* At this point, the fields freq and dad are set. We can now
-     * generate the bit lengths.
-     */
-    gen_bitlen(s, (tree_desc *)desc);
-
-    /* The field len is now set, we can generate the bit codes */
-    gen_codes ((ct_data *)tree, max_code, s->bl_count);
-}
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-local void scan_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            s->bl_tree[curlen].Freq += count;
-        } else if (curlen != 0) {
-            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
-            s->bl_tree[REP_3_6].Freq++;
-        } else if (count <= 10) {
-            s->bl_tree[REPZ_3_10].Freq++;
-        } else {
-            s->bl_tree[REPZ_11_138].Freq++;
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-local void send_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0) max_count = 138, min_count = 3;
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
-
-        } else if (curlen != 0) {
-            if (curlen != prevlen) {
-                send_code(s, curlen, s->bl_tree); count--;
-            }
-            Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
-
-        } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
-
-        } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-local int build_bl_tree(s)
-    deflate_state *s;
-{
-    int max_blindex;  /* index of last bit length code of non zero freq */
-
-    /* Determine the bit length frequencies for literal and distance trees */
-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
-
-    /* Build the bit length tree: */
-    build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-     */
-
-    /* Determine the number of bit length codes to send. The pkzip format
-     * requires that at least 4 bit length codes be sent. (appnote.txt says
-     * 3 but the actual value used is 4.)
-     */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
-    }
-    /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-            s->opt_len, s->static_len));
-
-    return max_blindex;
-}
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-local void send_all_trees(s, lcodes, dcodes, blcodes)
-    deflate_state *s;
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
-    int rank;                    /* index in bl_order */
-
-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-            "too many codes");
-    Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
-    for (rank = 0; rank < blcodes; rank++) {
-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
-    }
-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-/* ===========================================================================
- * Send a stored block
- */
-void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
-    bi_windup(s);        /* align on byte boundary */
-    put_short(s, (ush)stored_len);
-    put_short(s, (ush)~stored_len);
-    zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
-    s->pending += stored_len;
-#ifdef ZLIB_DEBUG
-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
-    s->compressed_len += (stored_len + 4) << 3;
-    s->bits_sent += 2*16;
-    s->bits_sent += stored_len<<3;
-#endif
-}
-
-/* ===========================================================================
- * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
- */
-void ZLIB_INTERNAL _tr_flush_bits(s)
-    deflate_state *s;
-{
-    bi_flush(s);
-}
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- */
-void ZLIB_INTERNAL _tr_align(s)
-    deflate_state *s;
-{
-    send_bits(s, STATIC_TREES<<1, 3);
-    send_code(s, END_BLOCK, static_ltree);
-#ifdef ZLIB_DEBUG
-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
-#endif
-    bi_flush(s);
-}
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and write out the encoded block.
- */
-void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex = 0;  /* index of last bit length code of non zero freq */
-
-    /* Build the Huffman trees unless a stored block is forced */
-    if (s->level > 0) {
-
-        /* Check if the file is binary or text */
-        if (s->strm->data_type == Z_UNKNOWN)
-            s->strm->data_type = detect_data_type(s);
-
-        /* Construct the literal and distance trees */
-        build_tree(s, (tree_desc *)(&(s->l_desc)));
-        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-
-        build_tree(s, (tree_desc *)(&(s->d_desc)));
-        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-        /* At this point, opt_len and static_len are the total bit lengths of
-         * the compressed block data, excluding the tree representations.
-         */
-
-        /* Build the bit length tree for the above two trees, and get the index
-         * in bl_order of the last bit length code to send.
-         */
-        max_blindex = build_bl_tree(s);
-
-        /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
-
-        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-                s->last_lit));
-
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
-
-    } else {
-        Assert(buf != (char*)0, "lost buf");
-        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-    }
-
-#ifdef FORCE_STORED
-    if (buf != (char*)0) { /* force stored block */
-#else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-                       /* 4: two words for the lengths */
-#endif
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-        _tr_stored_block(s, buf, stored_len, last);
-
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
-        compress_block(s, (const ct_data *)static_ltree,
-                       (const ct_data *)static_dtree);
-#ifdef ZLIB_DEBUG
-        s->compressed_len += 3 + s->static_len;
-#endif
-    } else {
-        send_bits(s, (DYN_TREES<<1)+last, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
-        compress_block(s, (const ct_data *)s->dyn_ltree,
-                       (const ct_data *)s->dyn_dtree);
-#ifdef ZLIB_DEBUG
-        s->compressed_len += 3 + s->opt_len;
-#endif
-    }
-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-    /* The above check is made mod 2^32, for files larger than 512 MB
-     * and uLong implemented on 32 bits.
-     */
-    init_block(s);
-
-    if (last) {
-        bi_windup(s);
-#ifdef ZLIB_DEBUG
-        s->compressed_len += 7;  /* align on byte boundary */
-#endif
-    }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*last));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-    deflate_state *s;
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
-    if (dist == 0) {
-        /* lc is the unmatched char */
-        s->dyn_ltree[lc].Freq++;
-    } else {
-        s->matches++;
-        /* Here, lc is the match length - MIN_MATCH */
-        dist--;             /* dist = match distance - 1 */
-        Assert((ush)dist < (ush)MAX_DIST(s) &&
-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-        s->dyn_dtree[d_code(dist)].Freq++;
-    }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(s, ltree, dtree)
-    deflate_state *s;
-    const ct_data *ltree; /* literal tree */
-    const ct_data *dtree; /* distance tree */
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= (unsigned)base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    send_code(s, END_BLOCK, ltree);
-}
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-local int detect_data_type(s)
-    deflate_state *s;
-{
-    /* black_mask is the bit mask of black-listed bytes
-     * set bits 0..6, 14..25, and 28..31
-     * 0xf3ffc07f = binary 11110011111111111100000001111111
-     */
-    unsigned long black_mask = 0xf3ffc07fUL;
-    int n;
-
-    /* Check for non-textual ("black-listed") bytes. */
-    for (n = 0; n <= 31; n++, black_mask >>= 1)
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-            return Z_BINARY;
-
-    /* Check for textual ("white-listed") bytes. */
-    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-            || s->dyn_ltree[13].Freq != 0)
-        return Z_TEXT;
-    for (n = 32; n < LITERALS; n++)
-        if (s->dyn_ltree[n].Freq != 0)
-            return Z_TEXT;
-
-    /* There are no "black-listed" or "white-listed" bytes:
-     * this stream either is empty or has tolerated ("gray-listed") bytes only.
-     */
-    return Z_BINARY;
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(s)
-    deflate_state *s;
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(s)
-    deflate_state *s;
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef ZLIB_DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
-}
diff --git a/base/poco/Foundation/src/trees.h b/base/poco/Foundation/src/trees.h
deleted file mode 100644
index 40ea61f35a6..00000000000
--- a/base/poco/Foundation/src/trees.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* header created automatically with -DGEN_TREES_H */
-
-local const ct_data static_ltree[L_CODES + 2]
-    = {{{12}, {8}},  {{140}, {8}}, {{76}, {8}},  {{204}, {8}}, {{44}, {8}},  {{172}, {8}}, {{108}, {8}}, {{236}, {8}}, {{28}, {8}},
-       {{156}, {8}}, {{92}, {8}},  {{220}, {8}}, {{60}, {8}},  {{188}, {8}}, {{124}, {8}}, {{252}, {8}}, {{2}, {8}},   {{130}, {8}},
-       {{66}, {8}},  {{194}, {8}}, {{34}, {8}},  {{162}, {8}}, {{98}, {8}},  {{226}, {8}}, {{18}, {8}},  {{146}, {8}}, {{82}, {8}},
-       {{210}, {8}}, {{50}, {8}},  {{178}, {8}}, {{114}, {8}}, {{242}, {8}}, {{10}, {8}},  {{138}, {8}}, {{74}, {8}},  {{202}, {8}},
-       {{42}, {8}},  {{170}, {8}}, {{106}, {8}}, {{234}, {8}}, {{26}, {8}},  {{154}, {8}}, {{90}, {8}},  {{218}, {8}}, {{58}, {8}},
-       {{186}, {8}}, {{122}, {8}}, {{250}, {8}}, {{6}, {8}},   {{134}, {8}}, {{70}, {8}},  {{198}, {8}}, {{38}, {8}},  {{166}, {8}},
-       {{102}, {8}}, {{230}, {8}}, {{22}, {8}},  {{150}, {8}}, {{86}, {8}},  {{214}, {8}}, {{54}, {8}},  {{182}, {8}}, {{118}, {8}},
-       {{246}, {8}}, {{14}, {8}},  {{142}, {8}}, {{78}, {8}},  {{206}, {8}}, {{46}, {8}},  {{174}, {8}}, {{110}, {8}}, {{238}, {8}},
-       {{30}, {8}},  {{158}, {8}}, {{94}, {8}},  {{222}, {8}}, {{62}, {8}},  {{190}, {8}}, {{126}, {8}}, {{254}, {8}}, {{1}, {8}},
-       {{129}, {8}}, {{65}, {8}},  {{193}, {8}}, {{33}, {8}},  {{161}, {8}}, {{97}, {8}},  {{225}, {8}}, {{17}, {8}},  {{145}, {8}},
-       {{81}, {8}},  {{209}, {8}}, {{49}, {8}},  {{177}, {8}}, {{113}, {8}}, {{241}, {8}}, {{9}, {8}},   {{137}, {8}}, {{73}, {8}},
-       {{201}, {8}}, {{41}, {8}},  {{169}, {8}}, {{105}, {8}}, {{233}, {8}}, {{25}, {8}},  {{153}, {8}}, {{89}, {8}},  {{217}, {8}},
-       {{57}, {8}},  {{185}, {8}}, {{121}, {8}}, {{249}, {8}}, {{5}, {8}},   {{133}, {8}}, {{69}, {8}},  {{197}, {8}}, {{37}, {8}},
-       {{165}, {8}}, {{101}, {8}}, {{229}, {8}}, {{21}, {8}},  {{149}, {8}}, {{85}, {8}},  {{213}, {8}}, {{53}, {8}},  {{181}, {8}},
-       {{117}, {8}}, {{245}, {8}}, {{13}, {8}},  {{141}, {8}}, {{77}, {8}},  {{205}, {8}}, {{45}, {8}},  {{173}, {8}}, {{109}, {8}},
-       {{237}, {8}}, {{29}, {8}},  {{157}, {8}}, {{93}, {8}},  {{221}, {8}}, {{61}, {8}},  {{189}, {8}}, {{125}, {8}}, {{253}, {8}},
-       {{19}, {9}},  {{275}, {9}}, {{147}, {9}}, {{403}, {9}}, {{83}, {9}},  {{339}, {9}}, {{211}, {9}}, {{467}, {9}}, {{51}, {9}},
-       {{307}, {9}}, {{179}, {9}}, {{435}, {9}}, {{115}, {9}}, {{371}, {9}}, {{243}, {9}}, {{499}, {9}}, {{11}, {9}},  {{267}, {9}},
-       {{139}, {9}}, {{395}, {9}}, {{75}, {9}},  {{331}, {9}}, {{203}, {9}}, {{459}, {9}}, {{43}, {9}},  {{299}, {9}}, {{171}, {9}},
-       {{427}, {9}}, {{107}, {9}}, {{363}, {9}}, {{235}, {9}}, {{491}, {9}}, {{27}, {9}},  {{283}, {9}}, {{155}, {9}}, {{411}, {9}},
-       {{91}, {9}},  {{347}, {9}}, {{219}, {9}}, {{475}, {9}}, {{59}, {9}},  {{315}, {9}}, {{187}, {9}}, {{443}, {9}}, {{123}, {9}},
-       {{379}, {9}}, {{251}, {9}}, {{507}, {9}}, {{7}, {9}},   {{263}, {9}}, {{135}, {9}}, {{391}, {9}}, {{71}, {9}},  {{327}, {9}},
-       {{199}, {9}}, {{455}, {9}}, {{39}, {9}},  {{295}, {9}}, {{167}, {9}}, {{423}, {9}}, {{103}, {9}}, {{359}, {9}}, {{231}, {9}},
-       {{487}, {9}}, {{23}, {9}},  {{279}, {9}}, {{151}, {9}}, {{407}, {9}}, {{87}, {9}},  {{343}, {9}}, {{215}, {9}}, {{471}, {9}},
-       {{55}, {9}},  {{311}, {9}}, {{183}, {9}}, {{439}, {9}}, {{119}, {9}}, {{375}, {9}}, {{247}, {9}}, {{503}, {9}}, {{15}, {9}},
-       {{271}, {9}}, {{143}, {9}}, {{399}, {9}}, {{79}, {9}},  {{335}, {9}}, {{207}, {9}}, {{463}, {9}}, {{47}, {9}},  {{303}, {9}},
-       {{175}, {9}}, {{431}, {9}}, {{111}, {9}}, {{367}, {9}}, {{239}, {9}}, {{495}, {9}}, {{31}, {9}},  {{287}, {9}}, {{159}, {9}},
-       {{415}, {9}}, {{95}, {9}},  {{351}, {9}}, {{223}, {9}}, {{479}, {9}}, {{63}, {9}},  {{319}, {9}}, {{191}, {9}}, {{447}, {9}},
-       {{127}, {9}}, {{383}, {9}}, {{255}, {9}}, {{511}, {9}}, {{0}, {7}},   {{64}, {7}},  {{32}, {7}},  {{96}, {7}},  {{16}, {7}},
-       {{80}, {7}},  {{48}, {7}},  {{112}, {7}}, {{8}, {7}},   {{72}, {7}},  {{40}, {7}},  {{104}, {7}}, {{24}, {7}},  {{88}, {7}},
-       {{56}, {7}},  {{120}, {7}}, {{4}, {7}},   {{68}, {7}},  {{36}, {7}},  {{100}, {7}}, {{20}, {7}},  {{84}, {7}},  {{52}, {7}},
-       {{116}, {7}}, {{3}, {8}},   {{131}, {8}}, {{67}, {8}},  {{195}, {8}}, {{35}, {8}},  {{163}, {8}}, {{99}, {8}},  {{227}, {8}}};
-
-local const ct_data static_dtree[D_CODES]
-    = {{{0}, {5}},  {{16}, {5}}, {{8}, {5}},  {{24}, {5}}, {{4}, {5}},  {{20}, {5}}, {{12}, {5}}, {{28}, {5}}, {{2}, {5}}, {{18}, {5}},
-       {{10}, {5}}, {{26}, {5}}, {{6}, {5}},  {{22}, {5}}, {{14}, {5}}, {{30}, {5}}, {{1}, {5}},  {{17}, {5}}, {{9}, {5}}, {{25}, {5}},
-       {{5}, {5}},  {{21}, {5}}, {{13}, {5}}, {{29}, {5}}, {{3}, {5}},  {{19}, {5}}, {{11}, {5}}, {{27}, {5}}, {{7}, {5}}, {{23}, {5}}};
-
-const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN]
-    = {0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9,
-       10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-       12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-       13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-       14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-       14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-       15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-       15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-       0,  0,  16, 17, 18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-       24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-       26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-       27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-       28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-       28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-       29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-       29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29};
-
-const uch ZLIB_INTERNAL _length_code[MAX_MATCH - MIN_MATCH + 1]
-    = {0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9,  10, 10, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15,
-       16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19,
-       20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-       22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-       24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-       25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-       26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-       27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28};
-
-local const int base_length[LENGTH_CODES]
-    = {0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 0};
-
-local const int base_dist[D_CODES] = {0,   1,   2,   3,   4,   6,    8,    12,   16,   24,   32,   48,   64,    96,    128,
-                                      192, 256, 384, 512, 768, 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576};
diff --git a/base/poco/Foundation/src/utils.h b/base/poco/Foundation/src/utils.h
deleted file mode 100644
index bdfdaed9833..00000000000
--- a/base/poco/Foundation/src/utils.h
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef DOUBLE_CONVERSION_UTILS_H_
-#define DOUBLE_CONVERSION_UTILS_H_
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <assert.h>
-#ifndef ASSERT
-#    define ASSERT(condition) assert(condition);
-#endif
-#ifndef UNIMPLEMENTED
-#    define UNIMPLEMENTED() (abort())
-#endif
-#ifndef UNREACHABLE
-#    define UNREACHABLE() (abort())
-#endif
-
-// Double operations detection based on target architecture.
-// Linux uses a 80bit wide floating point stack on x86. This induces double
-// rounding, which in turn leads to wrong results.
-// An easy way to test if the floating-point operations are correct is to
-// evaluate: 89255.0/1e22. If the floating-point stack is 64 bits wide then
-// the result is equal to 89255e-22.
-// The best way to test this, is to create a division-function and to compare
-// the output of the division with the expected result. (Inlining must be
-// disabled.)
-// On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
-#if defined(_M_X64) || defined(__x86_64__) || defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) \
-    || defined(__avr32__) || defined(__hppa__) || defined(__ia64__) || defined(__mips__) || defined(__powerpc__) || defined(__ppc__) \
-    || defined(__ppc64__) || defined(__sparc__) || defined(__sparc) || defined(__s390__) || defined(__SH4__) || defined(__alpha__) \
-    || defined(_MIPS_ARCH_MIPS32R2) || defined(__riscv) || defined(__AARCH64EL__) || defined(nios2) || defined(__nios2) \
-    || defined(__nios2__)
-#    define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-#elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
-#        undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
-#else
-#    error Target architecture was not detected as supported by Double-Conversion.
-#endif
-
-#if defined(__GNUC__)
-#    define DOUBLE_CONVERSION_UNUSED __attribute__((unused))
-#else
-#    define DOUBLE_CONVERSION_UNUSED
-#endif
-
-
-#    include <stdint.h>
-
-
-// The following macro works on both 32 and 64-bit platforms.
-// Usage: instead of writing 0x1234567890123456
-//      write UINT64_2PART_C(0x12345678,90123456);
-#define UINT64_2PART_C(a, b) (((static_cast<uint64_t>(a) << 32) + 0x##b##u))
-
-
-// The expression ARRAY_SIZE(a) is a compile-time constant of type
-// size_t which represents the number of elements of the given
-// array. You should only use ARRAY_SIZE on statically allocated
-// arrays.
-#ifndef ARRAY_SIZE
-#    define ARRAY_SIZE(a) ((sizeof(a) / sizeof(*(a))) / static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
-#endif
-
-// A macro to disallow the evil copy constructor and operator= functions
-// This should be used in the private: declarations for a class
-#ifndef DISALLOW_COPY_AND_ASSIGN
-#    define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-        TypeName(const TypeName &); \
-        void operator=(const TypeName &)
-#endif
-
-// A macro to disallow all the implicit constructors, namely the
-// default constructor, copy constructor and operator= functions.
-//
-// This should be used in the private: declarations for a class
-// that wants to prevent anyone from instantiating it. This is
-// especially useful for classes containing only static methods.
-#ifndef DISALLOW_IMPLICIT_CONSTRUCTORS
-#    define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-        TypeName(); \
-        DISALLOW_COPY_AND_ASSIGN(TypeName)
-#endif
-
-namespace double_conversion
-{
-
-static const int kCharSize = sizeof(char);
-
-// Returns the maximum of the two parameters.
-template <typename T>
-static T Max(T a, T b)
-{
-    return a < b ? b : a;
-}
-
-
-// Returns the minimum of the two parameters.
-template <typename T>
-static T Min(T a, T b)
-{
-    return a < b ? a : b;
-}
-
-
-inline int StrLength(const char * string)
-{
-    size_t length = strlen(string);
-    ASSERT(length == static_cast<size_t>(static_cast<int>(length)));
-    return static_cast<int>(length);
-}
-
-// This is a simplified version of V8's Vector class.
-template <typename T>
-class Vector
-{
-public:
-    Vector() : start_(NULL), length_(0) { }
-    Vector(T * data, int length) : start_(data), length_(length) { ASSERT(length == 0 || (length > 0 && data != NULL)); }
-
-    // Returns a vector using the same backing storage as this one,
-    // spanning from and including 'from', to but not including 'to'.
-    Vector<T> SubVector(int from, int to)
-    {
-        ASSERT(to <= length_);
-        ASSERT(from < to);
-        ASSERT(0 <= from);
-        return Vector<T>(start() + from, to - from);
-    }
-
-    // Returns the length of the vector.
-    int length() const { return length_; }
-
-    // Returns whether or not the vector is empty.
-    bool is_empty() const { return length_ == 0; }
-
-    // Returns the pointer to the start of the data in the vector.
-    T * start() const { return start_; }
-
-    // Access individual vector elements - checks bounds in debug mode.
-    T & operator[](int index) const
-    {
-        ASSERT(0 <= index && index < length_);
-        return start_[index];
-    }
-
-    T & first() { return start_[0]; }
-
-    T & last() { return start_[length_ - 1]; }
-
-private:
-    T * start_;
-    int length_;
-};
-
-
-// Helper class for building result strings in a character buffer. The
-// purpose of the class is to use safe operations that checks the
-// buffer bounds on all operations in debug mode.
-class StringBuilder
-{
-public:
-    StringBuilder(char * buffer, int size) : buffer_(buffer, size), position_(0) { }
-
-    ~StringBuilder()
-    {
-        if (!is_finalized())
-            Finalize();
-    }
-
-    int size() const { return buffer_.length(); }
-
-    // Get the current position in the builder.
-    int position() const
-    {
-        ASSERT(!is_finalized());
-        return position_;
-    }
-
-    // Reset the position.
-    void Reset() { position_ = 0; }
-
-    // Add a single character to the builder. It is not allowed to add
-    // 0-characters; use the Finalize() method to terminate the string
-    // instead.
-    void AddCharacter(char c)
-    {
-        ASSERT(c != '\0');
-        ASSERT(!is_finalized() && position_ < buffer_.length());
-        buffer_[position_++] = c;
-    }
-
-    // Add an entire string to the builder. Uses strlen() internally to
-    // compute the length of the input string.
-    void AddString(const char * s) { AddSubstring(s, StrLength(s)); }
-
-    // Add the first 'n' characters of the given string 's' to the
-    // builder. The input string must have enough characters.
-    void AddSubstring(const char * s, int n)
-    {
-        ASSERT(!is_finalized() && position_ + n < buffer_.length());
-        ASSERT(static_cast<size_t>(n) <= strlen(s));
-        memmove(&buffer_[position_], s, n * kCharSize);
-        position_ += n;
-    }
-
-
-    // Add character padding to the builder. If count is non-positive,
-    // nothing is added to the builder.
-    void AddPadding(char c, int count)
-    {
-        for (int i = 0; i < count; i++)
-        {
-            AddCharacter(c);
-        }
-    }
-
-    // Finalize the string by 0-terminating it and returning the buffer.
-    char * Finalize()
-    {
-        ASSERT(!is_finalized() && position_ < buffer_.length());
-        buffer_[position_] = '\0';
-        // Make sure nobody managed to add a 0-character to the
-        // buffer while building the string.
-        ASSERT(strlen(buffer_.start()) == static_cast<size_t>(position_));
-        position_ = -1;
-        ASSERT(is_finalized());
-        return buffer_.start();
-    }
-
-private:
-    Vector<char> buffer_;
-    int position_;
-
-    bool is_finalized() const { return position_ < 0; }
-
-    DISALLOW_IMPLICIT_CONSTRUCTORS(StringBuilder);
-};
-
-// The type-based aliasing rule allows the compiler to assume that pointers of
-// different types (for some definition of different) never alias each other.
-// Thus the following code does not work:
-//
-// float f = foo();
-// int fbits = *(int*)(&f);
-//
-// The compiler 'knows' that the int pointer can't refer to f since the types
-// don't match, so the compiler may cache f in a register, leaving random data
-// in fbits.  Using C++ style casts makes no difference, however a pointer to
-// char data is assumed to alias any other pointer.  This is the 'memcpy
-// exception'.
-//
-// Bit_cast uses the memcpy exception to move the bits from a variable of one
-// type of a variable of another type.  Of course the end result is likely to
-// be implementation dependent.  Most compilers (gcc-4.2 and MSVC 2005)
-// will completely optimize BitCast away.
-//
-// There is an additional use for BitCast.
-// Recent gccs will warn when they see casts that may result in breakage due to
-// the type-based aliasing rule.  If you have checked that there is no breakage
-// you can use BitCast to cast one pointer type to another.  This confuses gcc
-// enough that it can no longer see that you have cast one pointer type to
-// another thus avoiding the warning.
-template <class Dest, class Source>
-inline Dest BitCast(const Source & source)
-{
-    // Compile time assertion: sizeof(Dest) == sizeof(Source)
-    // A compile error here means your Dest and Source have different sizes.
-    DOUBLE_CONVERSION_UNUSED
-    typedef char VerifySizesAreEqual[sizeof(Dest) == sizeof(Source) ? 1 : -1];
-
-    Dest dest;
-    memmove(&dest, &source, sizeof(dest));
-    return dest;
-}
-
-template <class Dest, class Source>
-inline Dest BitCast(Source * source)
-{
-    return BitCast<Dest>(reinterpret_cast<uintptr_t>(source));
-}
-
-} // namespace double_conversion
-
-#endif // DOUBLE_CONVERSION_UTILS_H_
diff --git a/base/poco/Foundation/src/zutil.c b/base/poco/Foundation/src/zutil.c
deleted file mode 100644
index 14a7bebb1b3..00000000000
--- a/base/poco/Foundation/src/zutil.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id: //poco/1.4/Foundation/src/zutil.c#3 $ */
-
-#include "zutil.h"
-#ifndef Z_SOLO
-#  include "gzguts.h"
-#endif
-
-#ifndef NO_DUMMY_DECL
-struct internal_state      {int dummy;}; /* for buggy compilers */
-#endif
-
-z_const char * const z_errmsg[10] = {
-"need dictionary",     /* Z_NEED_DICT       2  */
-"stream end",          /* Z_STREAM_END      1  */
-"",                    /* Z_OK              0  */
-"file error",          /* Z_ERRNO         (-1) */
-"stream error",        /* Z_STREAM_ERROR  (-2) */
-"data error",          /* Z_DATA_ERROR    (-3) */
-"insufficient memory", /* Z_MEM_ERROR     (-4) */
-"buffer error",        /* Z_BUF_ERROR     (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
-
-
-const char * ZEXPORT zlibVersion()
-{
-    return ZLIB_VERSION;
-}
-
-uLong ZEXPORT zlibCompileFlags()
-{
-    uLong flags;
-
-    flags = 0;
-    switch ((int)(sizeof(uInt))) {
-    case 2:     break;
-    case 4:     flags += 1;     break;
-    case 8:     flags += 2;     break;
-    default:    flags += 3;
-    }
-    switch ((int)(sizeof(uLong))) {
-    case 2:     break;
-    case 4:     flags += 1 << 2;        break;
-    case 8:     flags += 2 << 2;        break;
-    default:    flags += 3 << 2;
-    }
-    switch ((int)(sizeof(voidpf))) {
-    case 2:     break;
-    case 4:     flags += 1 << 4;        break;
-    case 8:     flags += 2 << 4;        break;
-    default:    flags += 3 << 4;
-    }
-    switch ((int)(sizeof(z_off_t))) {
-    case 2:     break;
-    case 4:     flags += 1 << 6;        break;
-    case 8:     flags += 2 << 6;        break;
-    default:    flags += 3 << 6;
-    }
-#ifdef ZLIB_DEBUG
-    flags += 1 << 8;
-#endif
-#if defined(ASMV) || defined(ASMINF)
-    flags += 1 << 9;
-#endif
-#ifdef ZLIB_WINAPI
-    flags += 1 << 10;
-#endif
-#ifdef BUILDFIXED
-    flags += 1 << 12;
-#endif
-#ifdef DYNAMIC_CRC_TABLE
-    flags += 1 << 13;
-#endif
-#ifdef NO_GZCOMPRESS
-    flags += 1L << 16;
-#endif
-#ifdef NO_GZIP
-    flags += 1L << 17;
-#endif
-#ifdef PKZIP_BUG_WORKAROUND
-    flags += 1L << 20;
-#endif
-#ifdef FASTEST
-    flags += 1L << 21;
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifdef NO_vsnprintf
-    flags += 1L << 25;
-#    ifdef HAS_vsprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_vsnprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
-#else
-    flags += 1L << 24;
-#  ifdef NO_snprintf
-    flags += 1L << 25;
-#    ifdef HAS_sprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_snprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
-#endif
-    return flags;
-}
-
-#ifdef ZLIB_DEBUG
-
-#  ifndef verbose
-#    define verbose 0
-#  endif
-int ZLIB_INTERNAL z_verbose = verbose;
-
-void ZLIB_INTERNAL z_error (m)
-    char *m;
-{
-    fprintf(stderr, "%s\n", m);
-    exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * ZEXPORT zError(err)
-    int err;
-{
-    return ERR_MSG(err);
-}
-
-#if defined(_WIN32_WCE) && _WIN32_WCE < 0x800
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
-     * errno.  We define it as a global variable to simplify porting.
-     * Its value is always 0 and should not be used.
-     */
-    int errno = 0;
-#endif
-
-#ifndef HAVE_MEMCPY
-
-void ZLIB_INTERNAL zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = *source++; /* ??? to be unrolled */
-    } while (--len != 0);
-}
-
-int ZLIB_INTERNAL zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
-{
-    uInt j;
-
-    for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-    }
-    return 0;
-}
-
-void ZLIB_INTERNAL zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = 0;  /* ??? to be unrolled */
-    } while (--len != 0);
-}
-#endif
-
-#ifndef Z_SOLO
-
-#ifdef SYS16BIT
-
-#ifdef __TURBOC__
-/* Turbo C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
-} ptr_table;
-
-local ptr_table table[MAX_PTR];
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MS-DOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf = opaque; /* just to make some compilers happy */
-    ulg bsize = (ulg)items*size;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
-}
-
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
-    int n;
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        farfree(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        farfree(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    ptr = opaque; /* just to make some compilers happy */
-    Assert(0, "zcfree: ptr not found");
-}
-
-#endif /* __TURBOC__ */
-
-
-#ifdef M_I86
-/* Microsoft C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-#  define _halloc  halloc
-#  define _hfree   hfree
-#endif
-
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    return _halloc((long)items, size);
-}
-
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    _hfree(ptr);
-}
-
-#endif /* M_I86 */
-
-#endif /* SYS16BIT */
-
-
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-
-#ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
-    if (opaque) items += size - size; /* make compiler happy */
-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-                              (voidpf)calloc(items, size);
-}
-
-void ZLIB_INTERNAL zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
-{
-    free(ptr);
-    if (opaque) return; /* make compiler happy */
-}
-
-#endif /* MY_ZCALLOC */
-
-#endif /* !Z_SOLO */
diff --git a/base/poco/Foundation/src/zutil.h b/base/poco/Foundation/src/zutil.h
deleted file mode 100644
index 4deb4ec0db1..00000000000
--- a/base/poco/Foundation/src/zutil.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id: //poco/1.4/Foundation/src/zutil.h#3 $ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#ifdef HAVE_HIDDEN
-#    define ZLIB_INTERNAL __attribute__((visibility("hidden")))
-#else
-#    define ZLIB_INTERNAL
-#endif
-
-#include "zlib.h"
-
-#if defined(STDC) && !defined(Z_SOLO)
-#        include <stddef.h>
-#    include <stdlib.h>
-#    include <string.h>
-#endif
-
-#ifdef Z_SOLO
-typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
-#endif
-
-#ifndef local
-#    define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long ulg;
-
-extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT - (err)]
-
-#define ERR_RETURN(strm, err) return (strm->msg = ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-/* common constants */
-
-#ifndef DEF_WBITS
-#    define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#    define DEF_MEM_LEVEL 8
-#else
-#    define DEF_MEM_LEVEL MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES 2
-/* The three kinds of block type */
-
-#define MIN_MATCH 3
-#define MAX_MATCH 258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-/* target dependencies */
-
-#ifdef AMIGA
-#    define OS_CODE 0x01
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#    define OS_CODE 0x02
-#    define F_OPEN(name, mode) fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#    define OS_CODE 0x05
-#endif
-
-#ifdef OS2
-#    define OS_CODE 0x06
-#    if defined(M_I86) && !defined(Z_SOLO)
-#        include <malloc.h>
-#    endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#    define OS_CODE 0x07
-#    ifndef Z_SOLO
-#        if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#            include <unix.h> /* for fdopen */
-#        else
-#            ifndef fdopen
-#                define fdopen(fd, mode) NULL /* No fdopen() */
-#            endif
-#        endif
-#    endif
-#endif
-
-#ifdef TOPS20
-#    define OS_CODE 0x0a
-#endif
-
-#ifdef WIN32
-#        define OS_CODE 0x0b
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-#    define OS_CODE 0x0f
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#    define fdopen(fd, mode) NULL /* No fdopen() */
-#endif
-
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE - 0 == 0)
-ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#endif
-
-/* common defaults */
-
-#ifndef OS_CODE
-#    define OS_CODE 0x03 /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#    define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-/* functions */
-
-#if defined(pyr) || defined(Z_SOLO)
-#    define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
-/* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
-#    define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-#    define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-#    ifdef SMALL_MEDIUM /* MS-DOS small or medium model */
-#        define zmemcpy _fmemcpy
-#        define zmemcmp _fmemcmp
-#        define zmemzero(dest, len) _fmemset(dest, 0, len)
-#    else
-#        define zmemcpy memcpy
-#        define zmemcmp memcmp
-#        define zmemzero(dest, len) memset(dest, 0, len)
-#    endif
-#else
-void ZLIB_INTERNAL zmemcpy OF((Bytef * dest, const Bytef * source, uInt len));
-int ZLIB_INTERNAL zmemcmp OF((const Bytef * s1, const Bytef * s2, uInt len));
-void ZLIB_INTERNAL zmemzero OF((Bytef * dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef ZLIB_DEBUG
-#    include <stdio.h>
-extern int ZLIB_INTERNAL z_verbose;
-extern void ZLIB_INTERNAL z_error OF((char * m));
-#    define Assert(cond, msg) \
-        { \
-            if (!(cond)) \
-                z_error(msg); \
-        }
-#    define Trace(x) \
-        { \
-            if (z_verbose >= 0) \
-                fprintf x; \
-        }
-#    define Tracev(x) \
-        { \
-            if (z_verbose > 0) \
-                fprintf x; \
-        }
-#    define Tracevv(x) \
-        { \
-            if (z_verbose > 1) \
-                fprintf x; \
-        }
-#    define Tracec(c, x) \
-        { \
-            if (z_verbose > 0 && (c)) \
-                fprintf x; \
-        }
-#    define Tracecv(c, x) \
-        { \
-            if (z_verbose > 1 && (c)) \
-                fprintf x; \
-        }
-#else
-#    define Assert(cond, msg)
-#    define Trace(x)
-#    define Tracev(x)
-#    define Tracevv(x)
-#    define Tracec(c, x)
-#    define Tracecv(c, x)
-#endif
-
-#ifndef Z_SOLO
-voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr));
-#endif
-
-#define ZALLOC(strm, items, size) (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) \
-    { \
-        if (p) \
-            ZFREE(s, p); \
-    }
-
-/* Reverse the bytes in a 32-bit value */
-#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + (((q)&0xff00) << 8) + (((q)&0xff) << 24))
-
-#endif /* ZUTIL_H */
diff --git a/base/poco/MongoDB/include/Poco/MongoDB/Connection.h b/base/poco/MongoDB/include/Poco/MongoDB/Connection.h
index de669aa90dd..dcb813b75bc 100644
--- a/base/poco/MongoDB/include/Poco/MongoDB/Connection.h
+++ b/base/poco/MongoDB/include/Poco/MongoDB/Connection.h
@@ -90,6 +90,9 @@ namespace MongoDB
 
         Poco::Net::SocketAddress address() const;
         /// Returns the address of the MongoDB server.
+        
+        const std::string & uri() const;
+        /// Returns the uri on which the connection was made.
 
         void connect(const std::string & hostAndPort);
         /// Connects to the given MongoDB server.
@@ -148,6 +151,7 @@ namespace MongoDB
     private:
         Poco::Net::SocketAddress _address;
         Poco::Net::StreamSocket _socket;
+        std::string _uri;
     };
 
 
@@ -158,6 +162,10 @@ namespace MongoDB
     {
         return _address;
     }
+    inline const std::string & Connection::uri() const
+    {
+    	return _uri;
+    }
 
 
 }
diff --git a/base/poco/MongoDB/src/Connection.cpp b/base/poco/MongoDB/src/Connection.cpp
index 56bb192cec2..38c31d2250a 100644
--- a/base/poco/MongoDB/src/Connection.cpp
+++ b/base/poco/MongoDB/src/Connection.cpp
@@ -145,68 +145,155 @@ void Connection::connect(const Poco::Net::StreamSocket& socket)
 
 void Connection::connect(const std::string& uri, SocketFactory& socketFactory)
 {
-	Poco::URI theURI(uri);
-	if (theURI.getScheme() != "mongodb") throw Poco::UnknownURISchemeException(uri);
+    std::vector<std::string> strAddresses;
+    std::string newURI;
 
-	std::string userInfo = theURI.getUserInfo();
-	std::string host = theURI.getHost();
-	Poco::UInt16 port = theURI.getPort();
-	if (port == 0) port = 27017;
+    if (uri.find(',') != std::string::npos)
+    {
+        size_t pos;
+        size_t head = 0;
+        if ((pos = uri.find("@")) != std::string::npos)
+        {
+            head = pos + 1;
+        }
+        else if ((pos = uri.find("://")) != std::string::npos)
+        {
+            head = pos + 3;
+        }
 
-	std::string databaseName = theURI.getPath();
-	if (!databaseName.empty() && databaseName[0] == '/') databaseName.erase(0, 1);
-	if (databaseName.empty()) databaseName = "admin";
+        std::string tempstr;
+        std::string::const_iterator it = uri.begin();
+        it += head;
+        size_t tail = head;
+        for (;it != uri.end() && *it != '?' && *it != '/'; ++it)
+        {
+            tempstr += *it;
+            tail++;
+        }
 
-	bool ssl = false;
-	Poco::Timespan connectTimeout;
-	Poco::Timespan socketTimeout;
-	std::string authMechanism = Database::AUTH_SCRAM_SHA1;
+        it = tempstr.begin();
+        std::string token;
+        for (;it != tempstr.end(); ++it)
+        {
+            if (*it == ',')
+            {
+                newURI = uri.substr(0, head) + token + uri.substr(tail, uri.length());
+                strAddresses.push_back(newURI);
+                token = "";
+            }
+            else
+            {
+                token += *it;
+            }
+        }
+        newURI = uri.substr(0, head) + token + uri.substr(tail, uri.length());
+        strAddresses.push_back(newURI);
+    }
+    else
+    {
+        strAddresses.push_back(uri);
+    }
 
-	Poco::URI::QueryParameters params = theURI.getQueryParameters();
-	for (Poco::URI::QueryParameters::const_iterator it = params.begin(); it != params.end(); ++it)
-	{
-		if (it->first == "ssl")
-		{
-			ssl = (it->second == "true");
-		}
-		else if (it->first == "connectTimeoutMS")
-		{
-			connectTimeout = static_cast<Poco::Timespan::TimeDiff>(1000)*Poco::NumberParser::parse(it->second);
-		}
-		else if (it->first == "socketTimeoutMS")
-		{
-			socketTimeout = static_cast<Poco::Timespan::TimeDiff>(1000)*Poco::NumberParser::parse(it->second);
-		}
-		else if (it->first == "authMechanism")
-		{
-			authMechanism = it->second;
-		}
-	}
+    newURI = strAddresses.front();
+    Poco::URI theURI(newURI);
+    if (theURI.getScheme() != "mongodb") throw Poco::UnknownURISchemeException(uri);
 
-	connect(socketFactory.createSocket(host, port, connectTimeout, ssl));
+    std::string userInfo = theURI.getUserInfo();
+    std::string databaseName = theURI.getPath();
+    if (!databaseName.empty() && databaseName[0] == '/') databaseName.erase(0, 1);
+    if (databaseName.empty()) databaseName = "admin";
 
-	if (socketTimeout > 0)
-	{
-		_socket.setSendTimeout(socketTimeout);
-		_socket.setReceiveTimeout(socketTimeout);
-	}
+    bool ssl = false;
+    Poco::Timespan connectTimeout;
+    Poco::Timespan socketTimeout;
+    std::string authMechanism = Database::AUTH_SCRAM_SHA1;
+    std::string readPreference="primary";
 
-	if (!userInfo.empty())
-	{
-		std::string username;
-		std::string password;
-		std::string::size_type pos = userInfo.find(':');
-		if (pos != std::string::npos)
-		{
-			username.assign(userInfo, 0, pos++);
-			password.assign(userInfo, pos, userInfo.size() - pos);
-		}
-		else username = userInfo;
+    Poco::URI::QueryParameters params = theURI.getQueryParameters();
+    for (Poco::URI::QueryParameters::const_iterator it = params.begin(); it != params.end(); ++it)
+    {
+        if (it->first == "ssl")
+        {
+            ssl = (it->second == "true");
+        }
+        else if (it->first == "connectTimeoutMS")
+        {
+            connectTimeout = static_cast<Poco::Timespan::TimeDiff>(1000)*Poco::NumberParser::parse(it->second);
+        }
+        else if (it->first == "socketTimeoutMS")
+        {
+            socketTimeout = static_cast<Poco::Timespan::TimeDiff>(1000)*Poco::NumberParser::parse(it->second);
+        }
+        else if (it->first == "authMechanism")
+        {
+            authMechanism = it->second;
+        }
+        else if (it->first == "readPreference")
+        {
+            readPreference= it->second;
+        }
+    }
 
-		Database database(databaseName);
-		if (!database.authenticate(*this, username, password, authMechanism))
-			throw Poco::NoPermissionException(Poco::format("Access to MongoDB database %s denied for user %s", databaseName, username));
-	}
+    for (std::vector<std::string>::const_iterator it = strAddresses.cbegin();it != strAddresses.cend(); ++it)
+    {
+        newURI = *it;
+        theURI = Poco::URI(newURI);
+
+        std::string host = theURI.getHost();
+        Poco::UInt16 port = theURI.getPort();
+        if (port == 0) port = 27017;
+
+        connect(socketFactory.createSocket(host, port, connectTimeout, ssl));
+        _uri = newURI;
+        if (socketTimeout > 0)
+        {
+            _socket.setSendTimeout(socketTimeout);
+            _socket.setReceiveTimeout(socketTimeout);
+        }
+        if (strAddresses.size() > 1)
+        {
+            Poco::MongoDB::QueryRequest request("admin.$cmd");
+            request.setNumberToReturn(1);
+            request.selector().add("isMaster", 1);
+            Poco::MongoDB::ResponseMessage response;
+
+            sendRequest(request, response);
+            _uri = newURI;
+            if (!response.documents().empty())
+            {
+                Poco::MongoDB::Document::Ptr doc = response.documents()[0];
+                if (doc->get<bool>("ismaster") && readPreference == "primary")
+                {
+                    break;
+                }
+                else if (!doc->get<bool>("ismaster") && readPreference == "secondary")
+                {
+                    break;
+                }
+                else if (it + 1 == strAddresses.cend())
+                {
+                    throw Poco::URISyntaxException(uri);
+                }
+            }
+        }
+    }
+    if (!userInfo.empty())
+    {
+        std::string username;
+        std::string password;
+        std::string::size_type pos = userInfo.find(':');
+        if (pos != std::string::npos)
+        {
+            username.assign(userInfo, 0, pos++);
+            password.assign(userInfo, pos, userInfo.size() - pos);
+        }
+        else username = userInfo;
+
+        Database database(databaseName);
+
+        if (!database.authenticate(*this, username, password, authMechanism))
+            throw Poco::NoPermissionException(Poco::format("Access to MongoDB database %s denied for user %s", databaseName, username));
+    }
 }
 
 
diff --git a/base/poco/Net/include/Poco/Net/SMTPChannel.h b/base/poco/Net/include/Poco/Net/SMTPChannel.h
deleted file mode 100644
index d913ccbc808..00000000000
--- a/base/poco/Net/include/Poco/Net/SMTPChannel.h
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// SMTPChannel.h
-//
-// Library: Net
-// Package: Logging
-// Module:  SMTPChannel
-//
-// Definition of the SMTPChannel class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Net_SMTPChannel_INCLUDED
-#define Net_SMTPChannel_INCLUDED
-
-
-#include "Poco/Channel.h"
-#include "Poco/Net/Net.h"
-#include "Poco/String.h"
-
-
-namespace Poco
-{
-namespace Net
-{
-
-
-    class Net_API SMTPChannel : public Poco::Channel
-    /// This Channel implements SMTP (email) logging.
-    {
-    public:
-        SMTPChannel();
-        /// Creates a SMTPChannel.
-
-        SMTPChannel(const std::string & mailhost, const std::string & sender, const std::string & recipient);
-        /// Creates a SMTPChannel with the given target mailhost, sender, and recipient.
-
-        void open();
-        /// Opens the SMTPChannel.
-
-        void close();
-        /// Closes the SMTPChannel.
-
-        void log(const Message & msg);
-        /// Sends the message's text to the recipient.
-
-        void setProperty(const std::string & name, const std::string & value);
-        /// Sets the property with the given value.
-        ///
-        /// The following properties are supported:
-        ///     * mailhost:   The SMTP server. Default is "localhost".
-        ///     * sender:     The sender address.
-        ///     * recipient:  The recipient address.
-        ///     * local:      If true, local time is used. Default is true.
-        ///     * attachment: Filename of the file to attach.
-        ///     * type:       Content type of the file to attach.
-        ///     * delete:     Boolean value indicating whether to delete
-        ///                   the attachment file after sending.
-        ///     * throw:      Boolean value indicating whether to throw
-        ///                   exception upon failure.
-
-        std::string getProperty(const std::string & name) const;
-        /// Returns the value of the property with the given name.
-
-        static void registerChannel();
-        /// Registers the channel with the global LoggingFactory.
-
-        static const std::string PROP_MAILHOST;
-        static const std::string PROP_SENDER;
-        static const std::string PROP_RECIPIENT;
-        static const std::string PROP_LOCAL;
-        static const std::string PROP_ATTACHMENT;
-        static const std::string PROP_TYPE;
-        static const std::string PROP_DELETE;
-        static const std::string PROP_THROW;
-
-    protected:
-        ~SMTPChannel();
-
-    private:
-        bool isTrue(const std::string & value) const;
-
-        std::string _mailHost;
-        std::string _sender;
-        std::string _recipient;
-        bool _local;
-        std::string _attachment;
-        std::string _type;
-        bool _delete;
-        bool _throw;
-    };
-
-
-    inline bool SMTPChannel::isTrue(const std::string & value) const
-    {
-        return (
-            (0 == icompare(value, "true")) || (0 == icompare(value, "t")) || (0 == icompare(value, "yes")) || (0 == icompare(value, "y")));
-    }
-
-
-}
-} // namespace Poco::Net
-
-
-#endif // Net_SMTPChannel_INCLUDED
diff --git a/base/poco/Net/include/Poco/Net/SocketImpl.h b/base/poco/Net/include/Poco/Net/SocketImpl.h
index e08d49be7a2..082f258fa98 100644
--- a/base/poco/Net/include/Poco/Net/SocketImpl.h
+++ b/base/poco/Net/include/Poco/Net/SocketImpl.h
@@ -399,9 +399,12 @@ namespace Net
         bool initialized() const;
         /// Returns true iff the underlying socket is initialized.
 
+        static void error(int code);
+        /// Throws an appropriate exception for the given error code.
+    
     protected:
-        SocketImpl();
-        /// Creates a SocketImpl.
+	    SocketImpl();
+		/// Creates a SocketImpl.
 
         SocketImpl(poco_socket_t sockfd);
         /// Creates a SocketImpl using the given native socket.
@@ -446,9 +449,6 @@ namespace Net
         static void error(const std::string & arg);
         /// Throws an appropriate exception for the last error.
 
-        static void error(int code);
-        /// Throws an appropriate exception for the given error code.
-
         static void error(int code, const std::string & arg);
         /// Throws an appropriate exception for the given error code.
 
diff --git a/base/poco/Net/src/SMTPChannel.cpp b/base/poco/Net/src/SMTPChannel.cpp
deleted file mode 100644
index a498179a44e..00000000000
--- a/base/poco/Net/src/SMTPChannel.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// SMTPChannel.cpp
-//
-// Library: Net
-// Package: Logging
-// Module:  SMTPChannel
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Net/SMTPChannel.h"
-#include "Poco/Net/MailMessage.h"
-#include "Poco/Net/MailRecipient.h"
-#include "Poco/Net/SMTPClientSession.h"
-#include "Poco/Net/StringPartSource.h"
-#include "Poco/Message.h"
-#include "Poco/DateTimeFormatter.h"
-#include "Poco/DateTimeFormat.h"
-#include "Poco/LocalDateTime.h"
-#include "Poco/LoggingFactory.h"
-#include "Poco/Instantiator.h"
-#include "Poco/NumberFormatter.h"
-#include "Poco/FileStream.h"
-#include "Poco/File.h"
-#include "Poco/Environment.h"
-
-
-namespace Poco {
-namespace Net {
-
-
-const std::string SMTPChannel::PROP_MAILHOST("mailhost");
-const std::string SMTPChannel::PROP_SENDER("sender");
-const std::string SMTPChannel::PROP_RECIPIENT("recipient");
-const std::string SMTPChannel::PROP_LOCAL("local");
-const std::string SMTPChannel::PROP_ATTACHMENT("attachment");
-const std::string SMTPChannel::PROP_TYPE("type");
-const std::string SMTPChannel::PROP_DELETE("delete");
-const std::string SMTPChannel::PROP_THROW("throw");
-
-
-SMTPChannel::SMTPChannel():
-	_mailHost("localhost"),
-	_local(true),
-	_type("text/plain"),
-	_delete(false),
-	_throw(false)
-{
-}
-
-		
-SMTPChannel::SMTPChannel(const std::string& mailhost, const std::string& sender, const std::string& recipient):
-	_mailHost(mailhost),
-	_sender(sender),
-	_recipient(recipient),
-	_local(true),
-	_type("text/plain"),
-	_delete(false),
-	_throw(false)
-{
-}
-
-
-SMTPChannel::~SMTPChannel()
-{
-	try
-	{
-		close();
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-void SMTPChannel::open()
-{
-}
-
-	
-void SMTPChannel::close()
-{
-}
-
-	
-void SMTPChannel::log(const Message& msg)
-{
-	try
-	{
-		MailMessage message;
-		message.setSender(_sender);
-		message.addRecipient(MailRecipient(MailRecipient::PRIMARY_RECIPIENT, _recipient));
-		message.setSubject("Log Message from " + _sender);
-		std::stringstream content;
-		content << "Log Message\r\n"
-			<< "===========\r\n\r\n"
-			<< "Host: " << Environment::nodeName() << "\r\n"
-			<< "Logger: " << msg.getSource() << "\r\n";
-
-		if (_local)
-		{
-			DateTime dt(msg.getTime());
-			content	<< "Timestamp: " << DateTimeFormatter::format(LocalDateTime(dt), DateTimeFormat::RFC822_FORMAT) << "\r\n";
-		}
-		else
-			content	<< "Timestamp: " << DateTimeFormatter::format(msg.getTime(), DateTimeFormat::RFC822_FORMAT) << "\r\n";
-
-		content	<< "Priority: " << NumberFormatter::format(msg.getPriority()) << "\r\n"
-			<< "Process ID: " << NumberFormatter::format(msg.getPid()) << "\r\n"
-			<< "Thread: " << msg.getThread() << " (ID: " << msg.getTid() << ")\r\n"
-			<< "Message text: " << msg.getText() << "\r\n\r\n";
-
-		message.addContent(new StringPartSource(content.str()));
-	
-		if (!_attachment.empty())
-		{
-			{
-				Poco::FileInputStream fis(_attachment, std::ios::in | std::ios::binary | std::ios::ate);
-				if (fis.good())
-				{
-					typedef std::allocator<std::string::value_type>::size_type SST;
-
-					std::streamoff size = fis.tellg();
-					poco_assert (std::numeric_limits<unsigned int>::max() >= size);
-					poco_assert (std::numeric_limits<SST>::max() >= size);
-					char* pMem = new char [static_cast<unsigned int>(size)];
-					fis.seekg(std::ios::beg);
-					fis.read(pMem, size);
-					message.addAttachment(_attachment,
-						new StringPartSource(std::string(pMem, static_cast<SST>(size)), 
-							_type,
-							_attachment));
-
-					delete [] pMem;
-				}
-			}
-			if (_delete) File(_attachment).remove();
-		}
-
-		SMTPClientSession session(_mailHost);
-		session.login();
-		session.sendMessage(message);
-		session.close();
-	} 
-	catch (Exception&) 
-	{ 
-		if (_throw) throw; 
-	}
-}
-
-	
-void SMTPChannel::setProperty(const std::string& name, const std::string& value)
-{
-	if (name == PROP_MAILHOST) 
-		_mailHost = value;
-	else if (name == PROP_SENDER) 
-		_sender = value;
-	else if (name == PROP_RECIPIENT) 
-		_recipient = value;
-	else if (name == PROP_LOCAL) 
-		_local = isTrue(value);
-	else if (name == PROP_ATTACHMENT) 
-		_attachment = value;
-	else if (name == PROP_TYPE) 
-		_type = value;
-	else if (name == PROP_DELETE) 
-		_delete = isTrue(value);
-	else if (name == PROP_THROW) 
-		_throw = isTrue(value);
-	else 
-		Channel::setProperty(name, value);
-}
-
-	
-std::string SMTPChannel::getProperty(const std::string& name) const
-{
-	if (name == PROP_MAILHOST) 
-		return _mailHost;
-	else if (name == PROP_SENDER) 
-		return _sender;
-	else if (name == PROP_RECIPIENT) 
-		return _recipient;
-	else if (name == PROP_LOCAL) 
-		return _local ? "true" : "false";
-	else if (name == PROP_ATTACHMENT) 
-		return _attachment;
-	else if (name == PROP_TYPE) 
-		return _type;
-	else if (name == PROP_DELETE) 
-		return _delete ? "true" : "false";
-	else if (name == PROP_THROW) 
-		return _throw ? "true" : "false";
-	else
-		return Channel::getProperty(name);
-}
-
-
-void SMTPChannel::registerChannel()
-{
-	Poco::LoggingFactory::defaultFactory().registerChannelClass("SMTPChannel", 
-		new Poco::Instantiator<SMTPChannel, Poco::Channel>);
-}
-
-
-} } // namespace Poco::Net
diff --git a/base/poco/Util/include/Poco/Util/ConfigurationMapper.h b/base/poco/Util/include/Poco/Util/ConfigurationMapper.h
deleted file mode 100644
index dc1dd1fe86c..00000000000
--- a/base/poco/Util/include/Poco/Util/ConfigurationMapper.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// ConfigurationMapper.h
-//
-// Library: Util
-// Package: Configuration
-// Module:  ConfigurationMapper
-//
-// Definition of the ConfigurationMapper class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Util_ConfigurationMapper_INCLUDED
-#define Util_ConfigurationMapper_INCLUDED
-
-
-#include "Poco/Util/AbstractConfiguration.h"
-#include "Poco/Util/Util.h"
-
-
-namespace Poco
-{
-namespace Util
-{
-
-
-    class Util_API ConfigurationMapper : public AbstractConfiguration
-    /// This configuration maps a property hierarchy into another
-    /// hierarchy.
-    ///
-    /// For example, given a configuration with the following properties:
-    ///     config.value1
-    ///     config.value2
-    ///     config.sub.value1
-    ///     config.sub.value2
-    /// and a ConfigurationView with fromPrefix == "config" and toPrefix == "root.conf", then
-    /// the above properties will be available via the mapper as
-    ///     root.conf.value1
-    ///     root.conf.value2
-    ///     root.conf.sub.value1
-    ///     root.conf.sub.value2
-    ///
-    /// FromPrefix can be empty, in which case, and given toPrefix == "root",
-    /// the properties will be available as
-    ///     root.config.value1
-    ///     root.config.value2
-    ///     root.config.sub.value1
-    ///     root.config.sub.value2
-    ///
-    /// This is equivalent to the functionality of the ConfigurationView class.
-    ///
-    /// Similarly, toPrefix can also be empty. Given fromPrefix == "config" and
-    /// toPrefix == "", the properties will be available as
-    ///     value1
-    ///     value2
-    ///     sub.value1
-    ///     sub.value2
-    ///
-    /// If both fromPrefix and toPrefix are empty, no mapping is performed.
-    ///
-    /// A ConfigurationMapper is most useful in combination with a
-    /// LayeredConfiguration.
-    {
-    public:
-        ConfigurationMapper(const std::string & fromPrefix, const std::string & toPrefix, AbstractConfiguration * pConfig);
-        /// Creates the ConfigurationMapper. The ConfigurationMapper does not take
-        /// ownership of the passed configuration.
-
-    protected:
-        bool getRaw(const std::string & key, std::string & value) const;
-        void setRaw(const std::string & key, const std::string & value);
-        void enumerate(const std::string & key, Keys & range) const;
-        void removeRaw(const std::string & key);
-
-        std::string translateKey(const std::string & key) const;
-
-        ~ConfigurationMapper();
-
-    private:
-        ConfigurationMapper(const ConfigurationMapper &);
-        ConfigurationMapper & operator=(const ConfigurationMapper &);
-
-        std::string _fromPrefix;
-        std::string _toPrefix;
-        AbstractConfiguration * _pConfig;
-    };
-
-
-}
-} // namespace Poco::Util
-
-
-#endif // Util_ConfigurationMapper_INCLUDED
diff --git a/base/poco/Util/include/Poco/Util/WinRegistryConfiguration.h b/base/poco/Util/include/Poco/Util/WinRegistryConfiguration.h
deleted file mode 100644
index 43dc34f630b..00000000000
--- a/base/poco/Util/include/Poco/Util/WinRegistryConfiguration.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// WinRegistryConfiguration.h
-//
-// Library: Util
-// Package: Windows
-// Module:  WinRegistryConfiguration
-//
-// Definition of the WinRegistryConfiguration class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Util_WinRegistryConfiguration_INCLUDED
-#define Util_WinRegistryConfiguration_INCLUDED
-
-
-#include "Poco/String.h"
-#include "Poco/Util/AbstractConfiguration.h"
-#include "Poco/Util/Util.h"
-
-
-namespace Poco
-{
-namespace Util
-{
-
-
-    class Util_API WinRegistryConfiguration : public AbstractConfiguration
-    /// An implementation of AbstractConfiguration that stores configuration data
-    /// in the Windows registry.
-    ///
-    /// Removing key is not supported. An attempt to remove a key results
-    /// in a NotImplementedException being thrown.
-    {
-    public:
-        WinRegistryConfiguration(const std::string & rootPath, REGSAM extraSam = 0);
-        /// Creates the WinRegistryConfiguration.
-        /// The rootPath must start with one of the root key names
-        /// like HKEY_CLASSES_ROOT, e.g. HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services.
-        /// All further keys are relative to the root path and can be
-        /// dot separated, e.g. the path MyService.ServiceName will be converted to
-        /// HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\MyService\ServiceName.
-        /// The extraSam parameter will be passed along to WinRegistryKey, to control
-        /// registry virtualization for example.
-
-    protected:
-        ~WinRegistryConfiguration();
-        /// Destroys the WinRegistryConfiguration.
-
-        bool getRaw(const std::string & key, std::string & value) const;
-        void setRaw(const std::string & key, const std::string & value);
-        void enumerate(const std::string & key, Keys & range) const;
-        void removeRaw(const std::string & key);
-
-        std::string convertToRegFormat(const std::string & key, std::string & keyName) const;
-        /// Takes a key in the format of A.B.C and converts it to
-        /// registry format A\B\C, the last entry is the keyName, the rest is returned as path
-
-        friend class WinConfigurationTest;
-
-    private:
-        std::string _rootPath;
-        REGSAM _extraSam;
-    };
-
-
-}
-} // namespace Poco::Util
-
-
-#endif // Util_WinRegistryConfiguration_INCLUDED
diff --git a/base/poco/Util/include/Poco/Util/WinRegistryKey.h b/base/poco/Util/include/Poco/Util/WinRegistryKey.h
deleted file mode 100644
index 9aa5e35ed8a..00000000000
--- a/base/poco/Util/include/Poco/Util/WinRegistryKey.h
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// WinRegistryKey.h
-//
-// Library: Util
-// Package: Windows
-// Module:  WinRegistryKey
-//
-// Definition of the WinRegistryKey class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Util_WinRegistryKey_INCLUDED
-#define Util_WinRegistryKey_INCLUDED
-
-
-#include <vector>
-#include "Poco/UnWindows.h"
-#include "Poco/Util/Util.h"
-
-
-namespace Poco
-{
-namespace Util
-{
-
-
-    class Util_API WinRegistryKey
-    /// This class implements a convenient interface to the
-    /// Windows Registry.
-    ///
-    /// This class is only available on Windows platforms.
-    {
-    public:
-        typedef std::vector<std::string> Keys;
-        typedef std::vector<std::string> Values;
-
-        enum Type
-        {
-            REGT_NONE = 0,
-            REGT_STRING = 1,
-            REGT_STRING_EXPAND = 2,
-            REGT_BINARY = 3,
-            REGT_DWORD = 4,
-            REGT_DWORD_BIG_ENDIAN = 5,
-            REGT_LINK = 6,
-            REGT_MULTI_STRING = 7,
-            REGT_RESOURCE_LIST = 8,
-            REGT_FULL_RESOURCE_DESCRIPTOR = 9,
-            REGT_RESOURCE_REQUIREMENTS_LIST = 10,
-            REGT_QWORD = 11
-        };
-
-        WinRegistryKey(const std::string & key, bool readOnly = false, REGSAM extraSam = 0);
-        /// Creates the WinRegistryKey.
-        ///
-        /// The key must start with one of the root key names
-        /// like HKEY_CLASSES_ROOT, e.g. HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services.
-        ///
-        /// If readOnly is true, then only read access to the registry
-        /// is available and any attempt to write to the registry will
-        /// result in an exception.
-        ///
-        /// extraSam is used to pass extra flags (in addition to KEY_READ and KEY_WRITE)
-        /// to the samDesired argument of RegOpenKeyEx() or RegCreateKeyEx().
-
-        WinRegistryKey(HKEY hRootKey, const std::string & subKey, bool readOnly = false, REGSAM extraSam = 0);
-        /// Creates the WinRegistryKey.
-        ///
-        /// If readOnly is true, then only read access to the registry
-        /// is available and any attempt to write to the registry will
-        /// result in an exception.
-        ///
-        /// extraSam is used to pass extra flags (in addition to KEY_READ and KEY_WRITE)
-        /// to the samDesired argument of RegOpenKeyEx() or RegCreateKeyEx().
-
-        ~WinRegistryKey();
-        /// Destroys the WinRegistryKey.
-
-        void setString(const std::string & name, const std::string & value);
-        /// Sets the string value (REG_SZ) with the given name.
-        /// An empty name denotes the default value.
-
-        std::string getString(const std::string & name);
-        /// Returns the string value (REG_SZ) with the given name.
-        /// An empty name denotes the default value.
-        ///
-        /// Throws a NotFoundException if the value does not exist.
-
-        void setStringExpand(const std::string & name, const std::string & value);
-        /// Sets the expandable string value (REG_EXPAND_SZ) with the given name.
-        /// An empty name denotes the default value.
-
-        std::string getStringExpand(const std::string & name);
-        /// Returns the string value (REG_EXPAND_SZ) with the given name.
-        /// An empty name denotes the default value.
-        /// All references to environment variables (%VAR%) in the string
-        /// are expanded.
-        ///
-        /// Throws a NotFoundException if the value does not exist.
-
-        void setBinary(const std::string & name, const std::vector<char> & value);
-        /// Sets the string value (REG_BINARY) with the given name.
-        /// An empty name denotes the default value.
-
-        std::vector<char> getBinary(const std::string & name);
-        /// Returns the string value (REG_BINARY) with the given name.
-        /// An empty name denotes the default value.
-        ///
-        /// Throws a NotFoundException if the value does not exist.
-
-        void setInt(const std::string & name, int value);
-        /// Sets the numeric (REG_DWORD) value with the given name.
-        /// An empty name denotes the default value.
-
-        int getInt(const std::string & name);
-        /// Returns the numeric value (REG_DWORD) with the given name.
-        /// An empty name denotes the default value.
-        ///
-        /// Throws a NotFoundException if the value does not exist.
-
-
-        void setInt64(const std::string & name, Poco::Int64 value);
-        /// Sets the numeric (REG_QWORD) value with the given name.
-        /// An empty name denotes the default value.
-
-        Poco::Int64 getInt64(const std::string & name);
-        /// Returns the numeric value (REG_QWORD) with the given name.
-        /// An empty name denotes the default value.
-        ///
-        /// Throws a NotFoundException if the value does not exist.
-
-
-        void deleteValue(const std::string & name);
-        /// Deletes the value with the given name.
-        ///
-        /// Throws a NotFoundException if the value does not exist.
-
-        void deleteKey();
-        /// Recursively deletes the key and all subkeys.
-
-        bool exists();
-        /// Returns true iff the key exists.
-
-        Type type(const std::string & name);
-        /// Returns the type of the key value.
-
-        bool exists(const std::string & name);
-        /// Returns true iff the given value exists under that key.
-
-        void subKeys(Keys & keys);
-        /// Appends all subKey names to keys.
-
-        void values(Values & vals);
-        /// Appends all value names to vals;
-
-        bool isReadOnly() const;
-        /// Returns true iff the key has been opened for read-only access only.
-
-    protected:
-        void open();
-        void close();
-        std::string key() const;
-        std::string key(const std::string & valueName) const;
-        HKEY handle();
-        void handleSetError(const std::string & name);
-        static HKEY handleFor(const std::string & rootKey);
-
-    private:
-        WinRegistryKey();
-        WinRegistryKey(const WinRegistryKey &);
-        WinRegistryKey & operator=(const WinRegistryKey &);
-
-        HKEY _hRootKey;
-        std::string _subKey;
-        HKEY _hKey;
-        bool _readOnly;
-        REGSAM _extraSam;
-    };
-
-
-    //
-    // inlines
-    //
-    inline bool WinRegistryKey::isReadOnly() const
-    {
-        return _readOnly;
-    }
-
-
-}
-} // namespace Poco::Util
-
-
-#endif // Util_WinRegistryKey_INCLUDED
diff --git a/base/poco/Util/include/Poco/Util/WinService.h b/base/poco/Util/include/Poco/Util/WinService.h
deleted file mode 100644
index 52377dfb67b..00000000000
--- a/base/poco/Util/include/Poco/Util/WinService.h
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// WinService.h
-//
-// Library: Util
-// Package: Windows
-// Module:  WinService
-//
-// Definition of the WinService class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Util_WinService_INCLUDED
-#define Util_WinService_INCLUDED
-
-
-#include "Poco/UnWindows.h"
-#include "Poco/Util/Util.h"
-
-
-#    define POCO_LPQUERY_SERVICE_CONFIG LPQUERY_SERVICE_CONFIGA
-
-
-namespace Poco
-{
-namespace Util
-{
-
-
-    class Util_API WinService
-    /// This class provides an object-oriented interface to
-    /// the Windows Service Control Manager for registering,
-    /// unregistering, configuring, starting and stopping
-    /// services.
-    ///
-    /// This class is only available on Windows platforms.
-    {
-    public:
-        enum Startup
-        {
-            SVC_AUTO_START,
-            SVC_MANUAL_START,
-            SVC_DISABLED
-        };
-
-        WinService(const std::string & name);
-        /// Creates the WinService, using the given service name.
-
-        ~WinService();
-        /// Destroys the WinService.
-
-        const std::string & name() const;
-        /// Returns the service name.
-
-        std::string displayName() const;
-        /// Returns the service's display name.
-
-        std::string path() const;
-        /// Returns the path to the service executable.
-        ///
-        /// Throws a NotFoundException if the service has not been registered.
-
-        void registerService(const std::string & path, const std::string & displayName);
-        /// Creates a Windows service with the executable specified by path
-        /// and the given displayName.
-        ///
-        /// Throws a ExistsException if the service has already been registered.
-
-        void registerService(const std::string & path);
-        /// Creates a Windows service with the executable specified by path
-        /// and the given displayName. The service name is used as display name.
-        ///
-        /// Throws a ExistsException if the service has already been registered.
-
-        void unregisterService();
-        /// Deletes the Windows service.
-        ///
-        /// Throws a NotFoundException if the service has not been registered.
-
-        bool isRegistered() const;
-        /// Returns true if the service has been registered with the Service Control Manager.
-
-        bool isRunning() const;
-        /// Returns true if the service is currently running.
-
-        void start();
-        /// Starts the service.
-        /// Does nothing if the service is already running.
-        ///
-        /// Throws a NotFoundException if the service has not been registered.
-
-        void stop();
-        /// Stops the service.
-        /// Does nothing if the service is not running.
-        ///
-        /// Throws a NotFoundException if the service has not been registered.
-
-        void setStartup(Startup startup);
-        /// Sets the startup mode for the service.
-
-        Startup getStartup() const;
-        /// Returns the startup mode for the service.
-
-        void setDescription(const std::string & description);
-        /// Sets the service description in the registry.
-
-        std::string getDescription() const;
-        /// Returns the service description from the registry.
-
-        static const int STARTUP_TIMEOUT;
-
-    protected:
-        static const std::string REGISTRY_KEY;
-        static const std::string REGISTRY_DESCRIPTION;
-
-    private:
-        void open() const;
-        bool tryOpen() const;
-        void close() const;
-        POCO_LPQUERY_SERVICE_CONFIG config() const;
-
-        WinService();
-        WinService(const WinService &);
-        WinService & operator=(const WinService &);
-
-        std::string _name;
-        SC_HANDLE _scmHandle;
-        mutable SC_HANDLE _svcHandle;
-    };
-
-
-}
-} // namespace Poco::Util
-
-
-#endif // Util_WinService_INCLUDED
diff --git a/base/poco/Util/src/ConfigurationMapper.cpp b/base/poco/Util/src/ConfigurationMapper.cpp
deleted file mode 100644
index d76f9c0b6da..00000000000
--- a/base/poco/Util/src/ConfigurationMapper.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// ConfigurationMapper.cpp
-//
-// Library: Util
-// Package: Configuration
-// Module:  ConfigurationMapper
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Util/ConfigurationMapper.h"
-
-
-namespace Poco {
-namespace Util {
-
-
-ConfigurationMapper::ConfigurationMapper(const std::string& fromPrefix, const std::string& toPrefix, AbstractConfiguration* pConfig):
-	_fromPrefix(fromPrefix),
-	_toPrefix(toPrefix),
-	_pConfig(pConfig)
-{
-	poco_check_ptr (pConfig);
-
-	if (!_fromPrefix.empty()) _fromPrefix += '.';
-	if (!_toPrefix.empty()) _toPrefix += '.';
-
-	_pConfig->duplicate();
-}
-
-
-ConfigurationMapper::~ConfigurationMapper()
-{
-	_pConfig->release();
-}
-
-
-bool ConfigurationMapper::getRaw(const std::string& key, std::string& value) const
-{
-	std::string translatedKey = translateKey(key);
-	return _pConfig->getRaw(translatedKey, value);
-}
-
-
-void ConfigurationMapper::setRaw(const std::string& key, const std::string& value)
-{
-	std::string translatedKey = translateKey(key);
-	_pConfig->setRaw(translatedKey, value); 
-}
-
-
-void ConfigurationMapper::enumerate(const std::string& key, Keys& range) const
-{
-	std::string cKey(key);
-	if (!cKey.empty()) cKey += '.';
-	std::string::size_type keyLen = cKey.length();
-	if (keyLen < _toPrefix.length())
-	{
-		if (_toPrefix.compare(0, keyLen, cKey) == 0)
-		{
-			std::string::size_type pos = _toPrefix.find_first_of('.', keyLen);
-			poco_assert_dbg(pos != std::string::npos);
-			range.push_back(_toPrefix.substr(keyLen, pos - keyLen));
-		}
-	}
-	else
-	{
-		std::string translatedKey;
-		if (cKey == _toPrefix)
-		{
-			translatedKey = _fromPrefix;
-			if (!translatedKey.empty())
-				translatedKey.resize(translatedKey.length() - 1);
-		}
-		else translatedKey = translateKey(key);
-		_pConfig->enumerate(translatedKey, range);
-	}
-}
-
-
-void ConfigurationMapper::removeRaw(const std::string& key)
-{
-	std::string translatedKey = translateKey(key);
-	_pConfig->remove(translatedKey);
-}
-
-
-std::string ConfigurationMapper::translateKey(const std::string& key) const
-{
-	std::string result(key);
-	if (result.compare(0, _toPrefix.size(), _toPrefix) == 0)
-		result.replace(0, _toPrefix.size(), _fromPrefix);
-	return result;
-}
-
-
-} } // namespace Poco::Util
diff --git a/base/poco/Util/src/XMLConfiguration.cpp b/base/poco/Util/src/XMLConfiguration.cpp
index 974361044d7..e0d363cc870 100644
--- a/base/poco/Util/src/XMLConfiguration.cpp
+++ b/base/poco/Util/src/XMLConfiguration.cpp
@@ -27,7 +27,7 @@
 #include "Poco/Exception.h"
 #include "Poco/NumberParser.h"
 #include "Poco/NumberFormatter.h"
-#include <set>
+#include <unordered_map>
 
 
 namespace Poco {
diff --git a/base/readpassphrase/readpassphrase.c b/base/readpassphrase/readpassphrase.c
index a84ec43767c..fbd582ffe79 100644
--- a/base/readpassphrase/readpassphrase.c
+++ b/base/readpassphrase/readpassphrase.c
@@ -27,9 +27,7 @@
 #define _PATH_TTY "/dev/tty"
 #endif
 
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 #include <termios.h>
 #include <signal.h>
diff --git a/cmake/add_check.cmake b/cmake/add_check.cmake
index c6abbcdb321..ba30ee8676f 100644
--- a/cmake/add_check.cmake
+++ b/cmake/add_check.cmake
@@ -5,11 +5,11 @@ if (NOT TARGET check)
     if (CMAKE_CONFIGURATION_TYPES)
         add_custom_target (check COMMAND ${CMAKE_CTEST_COMMAND}
             --force-new-ctest-process --output-on-failure --build-config "$<CONFIGURATION>"
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+            WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
     else ()
         add_custom_target (check COMMAND ${CMAKE_CTEST_COMMAND}
             --force-new-ctest-process --output-on-failure
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+            WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
     endif ()
 endif ()
 
diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index b52b2eda992..462529fbc13 100644
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@@ -2,11 +2,11 @@
 
 # NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54472)
+SET(VERSION_REVISION 54474)
 SET(VERSION_MAJOR 23)
-SET(VERSION_MINOR 3)
+SET(VERSION_MINOR 5)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH 52bf836e03a6ba7cf2d654eaaf73231701abc3a2)
-SET(VERSION_DESCRIBE v23.3.1.2537-testing)
-SET(VERSION_STRING 23.3.1.2537)
+SET(VERSION_GITHASH 3920eb987f7ed837ada5de8907284adf123f0583)
+SET(VERSION_DESCRIBE v23.5.1.1-testing)
+SET(VERSION_STRING 23.5.1.1)
 # end of autochange
diff --git a/cmake/ccache.cmake b/cmake/ccache.cmake
index f0769f337d0..9a70e4aee32 100644
--- a/cmake/ccache.cmake
+++ b/cmake/ccache.cmake
@@ -1,5 +1,6 @@
 # Setup integration with ccache to speed up builds, see https://ccache.dev/
 
+# Matches both ccache and sccache
 if (CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache" OR CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache")
     # custom compiler launcher already defined, most likely because cmake was invoked with like "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" or
     # via environment variable --> respect setting and trust that the launcher was specified correctly
@@ -8,45 +9,57 @@ if (CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache" OR CMAKE_C_COMPILER_LAUNCHER MA
     return()
 endif()
 
-option(ENABLE_CCACHE "Speedup re-compilations using ccache (external tool)" ON)
+set(COMPILER_CACHE "auto" CACHE STRING "Speedup re-compilations using the caching tools; valid options are 'auto' (ccache, then sccache), 'ccache', 'sccache', or 'disabled'")
 
-if (NOT ENABLE_CCACHE)
-    message(STATUS "Using ccache: no (disabled via configuration)")
+if(COMPILER_CACHE STREQUAL "auto")
+    find_program (CCACHE_EXECUTABLE ccache sccache)
+elseif (COMPILER_CACHE STREQUAL "ccache")
+    find_program (CCACHE_EXECUTABLE ccache)
+elseif(COMPILER_CACHE STREQUAL "sccache")
+    find_program (CCACHE_EXECUTABLE sccache)
+elseif(COMPILER_CACHE STREQUAL "disabled")
+    message(STATUS "Using *ccache: no (disabled via configuration)")
     return()
+else()
+    message(${RECONFIGURE_MESSAGE_LEVEL} "The COMPILER_CACHE must be one of (auto|ccache|sccache|disabled), value: '${COMPILER_CACHE}'")
 endif()
 
-find_program (CCACHE_EXECUTABLE ccache)
 
 if (NOT CCACHE_EXECUTABLE)
-    message(${RECONFIGURE_MESSAGE_LEVEL} "Using ccache: no (Could not find find ccache. To significantly reduce compile times for the 2nd, 3rd, etc. build, it is highly recommended to install ccache. To suppress this message, run cmake with -DENABLE_CCACHE=0)")
+    message(${RECONFIGURE_MESSAGE_LEVEL} "Using *ccache: no (Could not find find ccache or sccache. To significantly reduce compile times for the 2nd, 3rd, etc. build, it is highly recommended to install one of them. To suppress this message, run cmake with -DCOMPILER_CACHE=disabled)")
     return()
 endif()
 
-execute_process(COMMAND ${CCACHE_EXECUTABLE} "-V" OUTPUT_VARIABLE CCACHE_VERSION)
-string(REGEX REPLACE "ccache version ([0-9\\.]+).*" "\\1" CCACHE_VERSION ${CCACHE_VERSION})
+if (CCACHE_EXECUTABLE MATCHES "/ccache$")
+    execute_process(COMMAND ${CCACHE_EXECUTABLE} "-V" OUTPUT_VARIABLE CCACHE_VERSION)
+    string(REGEX REPLACE "ccache version ([0-9\\.]+).*" "\\1" CCACHE_VERSION ${CCACHE_VERSION})
 
-set (CCACHE_MINIMUM_VERSION 3.3)
+    set (CCACHE_MINIMUM_VERSION 3.3)
 
-if (CCACHE_VERSION VERSION_LESS_EQUAL ${CCACHE_MINIMUM_VERSION})
-    message(${RECONFIGURE_MESSAGE_LEVEL} "Using ccache: no (found ${CCACHE_EXECUTABLE} (version ${CCACHE_VERSION}), the minimum required version is ${CCACHE_MINIMUM_VERSION}")
-    return()
-endif()
+    if (CCACHE_VERSION VERSION_LESS_EQUAL ${CCACHE_MINIMUM_VERSION})
+        message(${RECONFIGURE_MESSAGE_LEVEL} "Using ccache: no (found ${CCACHE_EXECUTABLE} (version ${CCACHE_VERSION}), the minimum required version is ${CCACHE_MINIMUM_VERSION}")
+        return()
+    endif()
 
-message(STATUS "Using ccache: ${CCACHE_EXECUTABLE} (version ${CCACHE_VERSION})")
-set(LAUNCHER ${CCACHE_EXECUTABLE})
+    message(STATUS "Using ccache: ${CCACHE_EXECUTABLE} (version ${CCACHE_VERSION})")
+    set(LAUNCHER ${CCACHE_EXECUTABLE})
 
-# Work around a well-intended but unfortunate behavior of ccache 4.0 & 4.1 with
-# environment variable SOURCE_DATE_EPOCH. This variable provides an alternative
-# to source-code embedded timestamps (__DATE__/__TIME__) and therefore helps with
-# reproducible builds (*). SOURCE_DATE_EPOCH is set automatically by the
-# distribution, e.g. Debian. Ccache 4.0 & 4.1 incorporate SOURCE_DATE_EPOCH into
-# the hash calculation regardless they contain timestamps or not. This invalidates
-# the cache whenever SOURCE_DATE_EPOCH changes. As a fix, ignore SOURCE_DATE_EPOCH.
-#
-# (*) https://reproducible-builds.org/specs/source-date-epoch/
-if (CCACHE_VERSION VERSION_GREATER_EQUAL "4.0" AND CCACHE_VERSION VERSION_LESS "4.2")
-    message(STATUS "Ignore SOURCE_DATE_EPOCH for ccache 4.0 / 4.1")
-    set(LAUNCHER env -u SOURCE_DATE_EPOCH ${CCACHE_EXECUTABLE})
+    # Work around a well-intended but unfortunate behavior of ccache 4.0 & 4.1 with
+    # environment variable SOURCE_DATE_EPOCH. This variable provides an alternative
+    # to source-code embedded timestamps (__DATE__/__TIME__) and therefore helps with
+    # reproducible builds (*). SOURCE_DATE_EPOCH is set automatically by the
+    # distribution, e.g. Debian. Ccache 4.0 & 4.1 incorporate SOURCE_DATE_EPOCH into
+    # the hash calculation regardless they contain timestamps or not. This invalidates
+    # the cache whenever SOURCE_DATE_EPOCH changes. As a fix, ignore SOURCE_DATE_EPOCH.
+    #
+    # (*) https://reproducible-builds.org/specs/source-date-epoch/
+    if (CCACHE_VERSION VERSION_GREATER_EQUAL "4.0" AND CCACHE_VERSION VERSION_LESS "4.2")
+        message(STATUS "Ignore SOURCE_DATE_EPOCH for ccache 4.0 / 4.1")
+        set(LAUNCHER env -u SOURCE_DATE_EPOCH ${CCACHE_EXECUTABLE})
+    endif()
+elseif(CCACHE_EXECUTABLE MATCHES "/sccache$")
+    message(STATUS "Using sccache: ${CCACHE_EXECUTABLE}")
+    set(LAUNCHER ${CCACHE_EXECUTABLE})
 endif()
 
 set (CMAKE_CXX_COMPILER_LAUNCHER ${LAUNCHER} ${CMAKE_CXX_COMPILER_LAUNCHER})
diff --git a/cmake/check_flags.cmake b/cmake/check_flags.cmake
index 518f9ecf8de..294f135e8ee 100644
--- a/cmake/check_flags.cmake
+++ b/cmake/check_flags.cmake
@@ -1,7 +1,5 @@
 include (CheckCXXCompilerFlag)
 include (CheckCCompilerFlag)
 
-check_cxx_compiler_flag("-Wreserved-identifier" HAS_RESERVED_IDENTIFIER)
-check_cxx_compiler_flag("-Wsuggest-destructor-override" HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
-check_cxx_compiler_flag("-Wsuggest-override" HAS_SUGGEST_OVERRIDE)
-check_cxx_compiler_flag("-Xclang -fuse-ctor-homing" HAS_USE_CTOR_HOMING)
+# Set/unset variable based on existence of compiler flags. Example:
+# check_cxx_compiler_flag("-Wreserved-identifier" HAS_RESERVED_IDENTIFIER)
diff --git a/cmake/clang_tidy.cmake b/cmake/clang_tidy.cmake
index ceaafdaa9aa..96c295b6bb9 100644
--- a/cmake/clang_tidy.cmake
+++ b/cmake/clang_tidy.cmake
@@ -5,14 +5,14 @@ if (ENABLE_CLANG_TIDY)
 
     find_program (CLANG_TIDY_CACHE_PATH NAMES "clang-tidy-cache")
     if (CLANG_TIDY_CACHE_PATH)
-        find_program (_CLANG_TIDY_PATH NAMES "clang-tidy-15" "clang-tidy-14" "clang-tidy-13" "clang-tidy-12" "clang-tidy")
+        find_program (_CLANG_TIDY_PATH NAMES "clang-tidy-16" "clang-tidy-15" "clang-tidy-14" "clang-tidy")
 
         # Why do we use ';' here?
         # It's a cmake black magic: https://cmake.org/cmake/help/latest/prop_tgt/LANG_CLANG_TIDY.html#prop_tgt:%3CLANG%3E_CLANG_TIDY
         # The CLANG_TIDY_PATH is passed to CMAKE_CXX_CLANG_TIDY, which follows CXX_CLANG_TIDY syntax.
         set (CLANG_TIDY_PATH "${CLANG_TIDY_CACHE_PATH};${_CLANG_TIDY_PATH}" CACHE STRING "A combined command to run clang-tidy with caching wrapper")
     else ()
-        find_program (CLANG_TIDY_PATH NAMES "clang-tidy-15" "clang-tidy-14" "clang-tidy-13" "clang-tidy-12" "clang-tidy")
+        find_program (CLANG_TIDY_PATH NAMES "clang-tidy-16" "clang-tidy-15" "clang-tidy-14" "clang-tidy")
     endif ()
 
     if (CLANG_TIDY_PATH)
diff --git a/cmake/darwin/default_libs.cmake b/cmake/darwin/default_libs.cmake
index 3e6e4907a71..812847e6201 100644
--- a/cmake/darwin/default_libs.cmake
+++ b/cmake/darwin/default_libs.cmake
@@ -2,13 +2,6 @@ set (DEFAULT_LIBS "-nodefaultlibs")
 
 set (DEFAULT_LIBS "${DEFAULT_LIBS} ${COVERAGE_OPTION} -lc -lm -lpthread -ldl")
 
-if (COMPILER_GCC)
-    set (DEFAULT_LIBS "${DEFAULT_LIBS} -lgcc_eh")
-    if (ARCH_AARCH64)
-        set (DEFAULT_LIBS "${DEFAULT_LIBS} -lgcc")
-    endif ()
-endif ()
-
 message(STATUS "Default libraries: ${DEFAULT_LIBS}")
 
 set(CMAKE_CXX_STANDARD_LIBRARIES ${DEFAULT_LIBS})
diff --git a/cmake/freebsd/default_libs.cmake b/cmake/freebsd/default_libs.cmake
index 3e1f22ef2e4..65bf296ee09 100644
--- a/cmake/freebsd/default_libs.cmake
+++ b/cmake/freebsd/default_libs.cmake
@@ -1,9 +1,5 @@
 set (DEFAULT_LIBS "-nodefaultlibs")
 
-if (NOT COMPILER_CLANG)
-    message (FATAL_ERROR "FreeBSD build is supported only for Clang")
-endif ()
-
 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64")
     execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libclang_rt.builtins-x86_64.a OUTPUT_VARIABLE BUILTINS_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE)
 else ()
diff --git a/cmake/fuzzer.cmake b/cmake/fuzzer.cmake
index 578a9757270..52f301ab8ad 100644
--- a/cmake/fuzzer.cmake
+++ b/cmake/fuzzer.cmake
@@ -7,10 +7,6 @@ if (FUZZER)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} -fsanitize=fuzzer-no-link")
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} -fsanitize=fuzzer-no-link")
 
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=fuzzer-no-link")
-        endif()
-
         # NOTE: oss-fuzz can change LIB_FUZZING_ENGINE variable
         if (NOT LIB_FUZZING_ENGINE)
             set (LIB_FUZZING_ENGINE "-fsanitize=fuzzer")
diff --git a/cmake/git.cmake b/cmake/git.cmake
index 397ec3cd081..a4b3bd4bdab 100644
--- a/cmake/git.cmake
+++ b/cmake/git.cmake
@@ -5,14 +5,14 @@ if (Git_FOUND)
   # Commit hash + whether the building workspace was dirty or not
   execute_process(COMMAND
     "${GIT_EXECUTABLE}" rev-parse HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_HASH
     ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   # Branch name
   execute_process(COMMAND
     "${GIT_EXECUTABLE}" rev-parse --abbrev-ref HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_BRANCH
     ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 
@@ -20,14 +20,14 @@ if (Git_FOUND)
   SET(ENV{TZ} "UTC")
   execute_process(COMMAND
     "${GIT_EXECUTABLE}" log -1 --format=%ad --date=iso-local
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_DATE
     ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   # Subject of the commit
   execute_process(COMMAND
     "${GIT_EXECUTABLE}" log -1 --format=%s
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_COMMIT_SUBJECT
     ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 
@@ -35,7 +35,7 @@ if (Git_FOUND)
 
   execute_process(
     COMMAND ${GIT_EXECUTABLE} status
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE)
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE)
 else()
   message(STATUS "Git could not be found.")
 endif()
diff --git a/cmake/linux/default_libs.cmake b/cmake/linux/default_libs.cmake
index 23c5fc3e14f..d42d587303a 100644
--- a/cmake/linux/default_libs.cmake
+++ b/cmake/linux/default_libs.cmake
@@ -11,8 +11,6 @@ if (COMPILER_CLANG)
     if (NOT EXISTS "${BUILTINS_LIBRARY}")
         set (BUILTINS_LIBRARY "-lgcc")
     endif ()
-else ()
-    set (BUILTINS_LIBRARY "-lgcc")
 endif ()
 
 if (OS_ANDROID)
diff --git a/cmake/linux/toolchain-riscv64.cmake b/cmake/linux/toolchain-riscv64.cmake
index 49a036c2972..7f876f88d72 100644
--- a/cmake/linux/toolchain-riscv64.cmake
+++ b/cmake/linux/toolchain-riscv64.cmake
@@ -21,8 +21,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 
-set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=bfd")
-set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=bfd")
+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd")
 
 # Currently, lld does not work with the error:
 # ld.lld: error: section size decrease is too large
diff --git a/cmake/linux/toolchain-x86_64.cmake b/cmake/linux/toolchain-x86_64.cmake
index e73d779284a..55b9df79f70 100644
--- a/cmake/linux/toolchain-x86_64.cmake
+++ b/cmake/linux/toolchain-x86_64.cmake
@@ -30,7 +30,6 @@ set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/x86_64-linux-gnu/libc")
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
-set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 
diff --git a/cmake/print_flags.cmake b/cmake/print_flags.cmake
index 66f2a8bfbc7..869764602d4 100644
--- a/cmake/print_flags.cmake
+++ b/cmake/print_flags.cmake
@@ -7,6 +7,6 @@ message (STATUS "compiler CXX = ${CMAKE_CXX_COMPILER} ${FULL_CXX_FLAGS}")
 message (STATUS "LINKER_FLAGS = ${FULL_EXE_LINKER_FLAGS}")
 
 # Reproducible builds
-string (REPLACE "${CMAKE_SOURCE_DIR}" "." FULL_C_FLAGS_NORMALIZED "${FULL_C_FLAGS}")
-string (REPLACE "${CMAKE_SOURCE_DIR}" "." FULL_CXX_FLAGS_NORMALIZED "${FULL_CXX_FLAGS}")
-string (REPLACE "${CMAKE_SOURCE_DIR}" "." FULL_EXE_LINKER_FLAGS_NORMALIZED "${FULL_EXE_LINKER_FLAGS}")
+string (REPLACE "${PROJECT_SOURCE_DIR}" "." FULL_C_FLAGS_NORMALIZED "${FULL_C_FLAGS}")
+string (REPLACE "${PROJECT_SOURCE_DIR}" "." FULL_CXX_FLAGS_NORMALIZED "${FULL_CXX_FLAGS}")
+string (REPLACE "${PROJECT_SOURCE_DIR}" "." FULL_EXE_LINKER_FLAGS_NORMALIZED "${FULL_EXE_LINKER_FLAGS}")
diff --git a/cmake/sanitize.cmake b/cmake/sanitize.cmake
index cf7f7606618..6ac46bb42fa 100644
--- a/cmake/sanitize.cmake
+++ b/cmake/sanitize.cmake
@@ -8,75 +8,42 @@ option (SANITIZE "Enable one of the code sanitizers" "")
 
 set (SAN_FLAGS "${SAN_FLAGS} -g -fno-omit-frame-pointer -DSANITIZER")
 
-# gcc with -nodefaultlibs does not add sanitizer libraries
-# with -static-libasan and similar
-macro(add_explicit_sanitizer_library lib)
-    target_link_libraries(global-libs INTERFACE "-Wl,-static -l${lib} -Wl,-Bdynamic")
-endmacro()
+# It's possible to pass an ignore list to sanitizers (-fsanitize-ignorelist). Intentionally not doing this because
+# 1. out-of-source suppressions are awkward 2. it seems ignore lists don't work after the Clang v16 upgrade (#49829)
 
 if (SANITIZE)
     if (SANITIZE STREQUAL "address")
-        # LLVM-15 has a bug in Address Sanitizer, preventing the usage of 'sanitize-address-use-after-scope',
-        # see https://github.com/llvm/llvm-project/issues/58633
-        set (ASAN_FLAGS "-fsanitize=address -fno-sanitize-address-use-after-scope")
+        set (ASAN_FLAGS "-fsanitize=address -fsanitize-address-use-after-scope")
+        if (COMPILER_CLANG)
+            if (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL 15 AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 16)
+                # LLVM-15 has a bug in Address Sanitizer, preventing the usage
+                # of 'sanitize-address-use-after-scope', see [1].
+                #
+                #   [1]: https://github.com/llvm/llvm-project/issues/58633
+                set (ASAN_FLAGS "${ASAN_FLAGS} -fno-sanitize-address-use-after-scope")
+            endif()
+        endif()
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${ASAN_FLAGS}")
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} ${ASAN_FLAGS}")
 
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ASAN_FLAGS}")
-        endif()
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libasan")
-        endif ()
-        if (COMPILER_GCC)
-            add_explicit_sanitizer_library(asan)
-        endif()
-
     elseif (SANITIZE STREQUAL "memory")
         # MemorySanitizer flags are set according to the official documentation:
         # https://clang.llvm.org/docs/MemorySanitizer.html#usage
-        #
-        # For now, it compiles with `cmake -DSANITIZE=memory -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_FLAGS_ADD="-O1" -DCMAKE_C_FLAGS_ADD="-O1"`
-        # Compiling with -DCMAKE_BUILD_TYPE=Debug leads to ld.lld failures because
-        # of large files (was not tested with ld.gold). This is why we compile with
-        # RelWithDebInfo, and downgrade optimizations to -O1 but not to -Og, to
-        # keep the binary size down.
-        # TODO: try compiling with -Og and with ld.gold.
-        set (MSAN_FLAGS "-fsanitize=memory -fsanitize-memory-use-after-dtor -fsanitize-memory-track-origins -fno-optimize-sibling-calls -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/msan_suppressions.txt")
 
+        # Linking can fail due to relocation overflows (see #49145), caused by too big object files / libraries.
+        # Work around this with position-independent builds (-fPIC and -fpie), this is slightly slower than non-PIC/PIE but that's okay.
+        set (MSAN_FLAGS "-fsanitize=memory -fsanitize-memory-use-after-dtor -fsanitize-memory-track-origins -fno-optimize-sibling-calls -fPIC -fpie")
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${MSAN_FLAGS}")
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} ${MSAN_FLAGS}")
 
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=memory")
-        endif()
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libmsan")
-        endif ()
-
     elseif (SANITIZE STREQUAL "thread")
         set (TSAN_FLAGS "-fsanitize=thread")
         if (COMPILER_CLANG)
-            set (TSAN_FLAGS "${TSAN_FLAGS} -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/tsan_suppressions.txt")
-        else()
-            set (MESSAGE "TSAN suppressions was not passed to the compiler (since the compiler is not clang)\n")
-            set (MESSAGE "${MESSAGE}Use the following command to pass them manually:\n")
-            set (MESSAGE "${MESSAGE}    export TSAN_OPTIONS=\"$TSAN_OPTIONS suppressions=${CMAKE_SOURCE_DIR}/tests/tsan_suppressions.txt\"")
-            message (WARNING "${MESSAGE}")
+            set (TSAN_FLAGS "${TSAN_FLAGS} -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tests/tsan_suppressions.txt")
         endif()
 
-
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${TSAN_FLAGS}")
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} ${TSAN_FLAGS}")
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
-        endif()
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libtsan")
-        endif ()
-        if (COMPILER_GCC)
-            add_explicit_sanitizer_library(tsan)
-        endif()
 
     elseif (SANITIZE STREQUAL "undefined")
         set (UBSAN_FLAGS "-fsanitize=undefined -fno-sanitize-recover=all -fno-sanitize=float-divide-by-zero")
@@ -90,25 +57,11 @@ if (SANITIZE)
             set(UBSAN_FLAGS "${UBSAN_FLAGS} -fno-sanitize=unsigned-integer-overflow")
         endif()
         if (COMPILER_CLANG)
-            set (UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/ubsan_suppressions.txt")
-        else()
-            set (MESSAGE "UBSAN suppressions was not passed to the compiler (since the compiler is not clang)\n")
-            set (MESSAGE "${MESSAGE}Use the following command to pass them manually:\n")
-            set (MESSAGE "${MESSAGE}        export UBSAN_OPTIONS=\"$UBSAN_OPTIONS suppressions=${CMAKE_SOURCE_DIR}/tests/ubsan_suppressions.txt\"")
-            message (WARNING "${MESSAGE}")
+            set (UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tests/ubsan_suppressions.txt")
         endif()
 
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${UBSAN_FLAGS}")
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} ${UBSAN_FLAGS}")
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
-        endif()
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libubsan")
-        endif ()
-        if (COMPILER_GCC)
-            add_explicit_sanitizer_library(ubsan)
-        endif()
 
         # llvm-tblgen, that is used during LLVM build, doesn't work with UBSan.
         set (ENABLE_EMBEDDED_COMPILER 0 CACHE BOOL "")
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 4d4d741cc3a..802907c9dda 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -1,8 +1,6 @@
 # Compiler
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set (COMPILER_GCC 1)
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
+if (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
     set (COMPILER_CLANG 1) # Safe to treat AppleClang as a regular Clang, in general.
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set (COMPILER_CLANG 1)
@@ -18,16 +16,8 @@ message (STATUS "Using compiler:\n${COMPILER_SELF_IDENTIFICATION}")
 set (CLANG_MINIMUM_VERSION 15)
 set (XCODE_MINIMUM_VERSION 12.0)
 set (APPLE_CLANG_MINIMUM_VERSION 12.0.0)
-set (GCC_MINIMUM_VERSION 11)
 
-if (COMPILER_GCC)
-    message (FATAL_ERROR "Compilation with GCC is unsupported. Please use Clang instead.")
-
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${GCC_MINIMUM_VERSION})
-        message (FATAL_ERROR "Compilation with GCC version ${CMAKE_CXX_COMPILER_VERSION} is unsupported, the minimum required version is ${GCC_MINIMUM_VERSION}.")
-    endif ()
-
-elseif (COMPILER_CLANG)
+if (COMPILER_CLANG)
     if (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
         # (Experimental!) Specify "-DALLOW_APPLECLANG=ON" when running CMake configuration step, if you want to experiment with using it.
         if (NOT ALLOW_APPLECLANG AND NOT DEFINED ENV{ALLOW_APPLECLANG})
@@ -50,70 +40,45 @@ endif ()
 string (REGEX MATCHALL "[0-9]+" COMPILER_VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION})
 list (GET COMPILER_VERSION_LIST 0 COMPILER_VERSION_MAJOR)
 
-# Example values: `lld-10`, `gold`.
+# Example values: `lld-10`
 option (LINKER_NAME "Linker name or full path")
 
-# s390x doesnt support lld
-if (NOT ARCH_S390X)
-    if (NOT LINKER_NAME)
-        if (COMPILER_GCC)
-            find_program (LLD_PATH NAMES "ld.lld")
-            find_program (GOLD_PATH NAMES "ld.gold")
-        elseif (COMPILER_CLANG)
-            # llvm lld is a generic driver.
-            # Invoke ld.lld (Unix), ld64.lld (macOS), lld-link (Windows), wasm-ld (WebAssembly) instead
-            if (OS_LINUX)
+if (LINKER_NAME MATCHES "gold")
+    message (FATAL_ERROR "Linking with gold is unsupported. Please use lld.")
+endif ()
+
+if (NOT LINKER_NAME)
+    if (COMPILER_CLANG)
+        if (OS_LINUX)
+            if (NOT ARCH_S390X) # s390x doesnt support lld
                 find_program (LLD_PATH NAMES "ld.lld-${COMPILER_VERSION_MAJOR}" "ld.lld")
-            elseif (OS_DARWIN)
-                find_program (LLD_PATH NAMES "ld64.lld-${COMPILER_VERSION_MAJOR}" "ld64.lld")
             endif ()
-            find_program (GOLD_PATH NAMES "ld.gold" "gold")
+        endif ()
+    endif ()
+    if (OS_LINUX)
+        if (LLD_PATH)
+            if (COMPILER_CLANG)
+                # Clang driver simply allows full linker path.
+                set (LINKER_NAME ${LLD_PATH})
+            endif ()
         endif ()
     endif()
 endif()
 
-if ((OS_LINUX OR OS_DARWIN) AND NOT LINKER_NAME)
-    # prefer lld linker over gold or ld on linux and macos
-    if (LLD_PATH)
-        if (COMPILER_GCC)
-            # GCC driver requires one of supported linker names like "lld".
-            set (LINKER_NAME "lld")
-        else ()
-            # Clang driver simply allows full linker path.
-            set (LINKER_NAME ${LLD_PATH})
-        endif ()
-    endif ()
-
-    if (NOT LINKER_NAME)
-        if (GOLD_PATH)
-            message (FATAL_ERROR "Linking with gold is unsupported. Please use lld.")
-            if (COMPILER_GCC)
-                set (LINKER_NAME "gold")
-            else ()
-                set (LINKER_NAME ${GOLD_PATH})
-            endif ()
-        endif ()
-    endif ()
-endif ()
-# TODO: allow different linker on != OS_LINUX
-
 if (LINKER_NAME)
-    if (COMPILER_CLANG)
-        find_program (LLD_PATH NAMES ${LINKER_NAME})
-        if (NOT LLD_PATH)
-            message (FATAL_ERROR "Using linker ${LINKER_NAME} but can't find its path.")
-        endif ()
-
-        # This a temporary quirk to emit .debug_aranges with ThinLTO
+    find_program (LLD_PATH NAMES ${LINKER_NAME})
+    if (NOT LLD_PATH)
+        message (FATAL_ERROR "Using linker ${LINKER_NAME} but can't find its path.")
+    endif ()
+    # This a temporary quirk to emit .debug_aranges with ThinLTO, it is only the case clang/llvm <16
+    if (COMPILER_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
         set (LLD_WRAPPER "${CMAKE_CURRENT_BINARY_DIR}/ld.lld")
         configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/cmake/ld.lld.in" "${LLD_WRAPPER}" @ONLY)
 
         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --ld-path=${LLD_WRAPPER}")
-        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --ld-path=${LLD_WRAPPER}")
     else ()
-        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
-        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
-    endif ()
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --ld-path=${LLD_PATH}")
+    endif()
 
 endif ()
 
@@ -125,9 +90,7 @@ endif()
 
 # Archiver
 
-if (COMPILER_GCC)
-    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-15" "llvm-ar-14" "llvm-ar-13" "llvm-ar-12")
-else ()
+if (COMPILER_CLANG)
     find_program (LLVM_AR_PATH NAMES "llvm-ar-${COMPILER_VERSION_MAJOR}" "llvm-ar")
 endif ()
 
@@ -139,9 +102,7 @@ message(STATUS "Using archiver: ${CMAKE_AR}")
 
 # Ranlib
 
-if (COMPILER_GCC)
-    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-15" "llvm-ranlib-14" "llvm-ranlib-13" "llvm-ranlib-12")
-else ()
+if (COMPILER_CLANG)
     find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib-${COMPILER_VERSION_MAJOR}" "llvm-ranlib")
 endif ()
 
@@ -153,9 +114,7 @@ message(STATUS "Using ranlib: ${CMAKE_RANLIB}")
 
 # Install Name Tool
 
-if (COMPILER_GCC)
-    find_program (LLVM_INSTALL_NAME_TOOL_PATH NAMES "llvm-install-name-tool" "llvm-install-name-tool-15" "llvm-install-name-tool-14" "llvm-install-name-tool-13" "llvm-install-name-tool-12")
-else ()
+if (COMPILER_CLANG)
     find_program (LLVM_INSTALL_NAME_TOOL_PATH NAMES "llvm-install-name-tool-${COMPILER_VERSION_MAJOR}" "llvm-install-name-tool")
 endif ()
 
@@ -167,9 +126,7 @@ message(STATUS "Using install-name-tool: ${CMAKE_INSTALL_NAME_TOOL}")
 
 # Objcopy
 
-if (COMPILER_GCC)
-    find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-15" "llvm-objcopy-14" "llvm-objcopy-13" "llvm-objcopy-12" "objcopy")
-else ()
+if (COMPILER_CLANG)
     find_program (OBJCOPY_PATH NAMES "llvm-objcopy-${COMPILER_VERSION_MAJOR}" "llvm-objcopy" "objcopy")
 endif ()
 
@@ -181,9 +138,7 @@ endif ()
 
 # Strip
 
-if (COMPILER_GCC)
-    find_program (STRIP_PATH NAMES "llvm-strip" "llvm-strip-15" "llvm-strip-14" "llvm-strip-13" "llvm-strip-12" "strip")
-else ()
+if (COMPILER_CLANG)
     find_program (STRIP_PATH NAMES "llvm-strip-${COMPILER_VERSION_MAJOR}" "llvm-strip" "strip")
 endif ()
 
diff --git a/cmake/version.cmake b/cmake/version.cmake
index acaa772ff2f..9ca21556f4d 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -1,4 +1,4 @@
-include(${CMAKE_SOURCE_DIR}/cmake/autogenerated_versions.txt)
+include(${PROJECT_SOURCE_DIR}/cmake/autogenerated_versions.txt)
 
 set(VERSION_EXTRA "" CACHE STRING "")
 set(VERSION_TWEAK "" CACHE STRING "")
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index 5d116b199cf..00fa32a6b7f 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -47,115 +47,4 @@ if (COMPILER_CLANG)
     no_warning(enum-constexpr-conversion) # breaks magic-enum library in clang-16
     no_warning(unsafe-buffer-usage) # too aggressive
     # TODO Enable conversion, sign-conversion, double-promotion warnings.
-elseif (COMPILER_GCC)
-    # Add compiler options only to c++ compiler
-    function(add_cxx_compile_options option)
-        add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:${option}>")
-    endfunction()
-    # Warn about boolean expression compared with an integer value different from true/false
-    add_cxx_compile_options(-Wbool-compare)
-    # Warn whenever a pointer is cast such that the required alignment of the target is increased.
-    add_cxx_compile_options(-Wcast-align)
-    # Warn whenever a pointer is cast so as to remove a type qualifier from the target type.
-    add_cxx_compile_options(-Wcast-qual)
-    # Warn when deleting a pointer to incomplete type, which may cause undefined behavior at runtime
-    add_cxx_compile_options(-Wdelete-incomplete)
-    # Warn if a requested optimization pass is disabled. Code is too big or too complex
-    add_cxx_compile_options(-Wdisabled-optimization)
-    # Warn about duplicated conditions in an if-else-if chain
-    add_cxx_compile_options(-Wduplicated-cond)
-    # Warn about a comparison between values of different enumerated types
-    add_cxx_compile_options(-Wenum-compare)
-    # Warn about uninitialized variables that are initialized with themselves
-    add_cxx_compile_options(-Winit-self)
-    # Warn about logical not used on the left hand side operand of a comparison
-    add_cxx_compile_options(-Wlogical-not-parentheses)
-    # Warn about suspicious uses of logical operators in expressions
-    add_cxx_compile_options(-Wlogical-op)
-    # Warn if there exists a path from the function entry to a use of the variable that is uninitialized.
-    add_cxx_compile_options(-Wmaybe-uninitialized)
-    # Warn when the indentation of the code does not reflect the block structure
-    add_cxx_compile_options(-Wmisleading-indentation)
-    # Warn if a global function is defined without a previous declaration - disabled because of build times
-    # add_cxx_compile_options(-Wmissing-declarations)
-    # Warn if a user-supplied include directory does not exist
-    add_cxx_compile_options(-Wmissing-include-dirs)
-    # Obvious
-    add_cxx_compile_options(-Wnon-virtual-dtor)
-    # Obvious
-    add_cxx_compile_options(-Wno-return-local-addr)
-    # This warning is disabled due to false positives if compiled with libc++: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90037
-    #add_cxx_compile_options(-Wnull-dereference)
-    # Obvious
-    add_cxx_compile_options(-Wodr)
-    # Obvious
-    add_cxx_compile_options(-Wold-style-cast)
-    # Warn when a function declaration hides virtual functions from a base class
-    # add_cxx_compile_options(-Woverloaded-virtual)
-    # Warn about placement new expressions with undefined behavior
-    add_cxx_compile_options(-Wplacement-new=2)
-    # Warn about anything that depends on the “size of” a function type or of void
-    add_cxx_compile_options(-Wpointer-arith)
-    # Warn if anything is declared more than once in the same scope
-    add_cxx_compile_options(-Wredundant-decls)
-    # Member initialization reordering
-    add_cxx_compile_options(-Wreorder)
-    # Obvious
-    add_cxx_compile_options(-Wshadow)
-    # Warn if left shifting a negative value
-    add_cxx_compile_options(-Wshift-negative-value)
-    # Warn about a definition of an unsized deallocation function
-    add_cxx_compile_options(-Wsized-deallocation)
-    # Warn when the sizeof operator is applied to a parameter that is declared as an array in a function definition
-    add_cxx_compile_options(-Wsizeof-array-argument)
-    # Warn for suspicious length parameters to certain string and memory built-in functions if the argument uses sizeof
-    add_cxx_compile_options(-Wsizeof-pointer-memaccess)
-    # Warn about overriding virtual functions that are not marked with the override keyword
-    add_cxx_compile_options(-Wsuggest-override)
-    # Warn whenever a switch statement has an index of boolean type and the case values are outside the range of a boolean type
-    add_cxx_compile_options(-Wswitch-bool)
-    # Warn if a self-comparison always evaluates to true or false
-    add_cxx_compile_options(-Wtautological-compare)
-    # Warn about trampolines generated for pointers to nested functions
-    add_cxx_compile_options(-Wtrampolines)
-    # Obvious
-    add_cxx_compile_options(-Wunused)
-    add_cxx_compile_options(-Wundef)
-    # Warn if vector operation is not implemented via SIMD capabilities of the architecture
-    add_cxx_compile_options(-Wvector-operation-performance)
-    # Warn when a literal 0 is used as null pointer constant.
-    add_cxx_compile_options(-Wzero-as-null-pointer-constant)
-
-    # The following warnings are generally useful but had to be disabled because of compiler bugs with older GCCs.
-    # XXX: We should try again on more recent GCCs (--> see CMake variable GCC_MINIMUM_VERSION).
-
-    # gcc10 stuck with this option while compiling GatherUtils code, anyway there are builds with clang that will warn
-    add_cxx_compile_options(-Wno-sequence-point)
-    # gcc10 false positive with this warning in MergeTreePartition.cpp
-    #     inlined from 'void writeHexByteLowercase(UInt8, void*)' at ../src/Common/hex.h:39:11,
-    #     inlined from 'DB::String DB::MergeTreePartition::getID(const DB::Block&) const' at ../src/Storages/MergeTree/MergeTreePartition.cpp:85:30:
-    #     ../contrib/libc-headers/x86_64-linux-gnu/bits/string_fortified.h:34:33: error: writing 2 bytes into a region of size 0 [-Werror=stringop-overflow=]
-    #     34 |   return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
-    # For some reason (bug in gcc?) macro 'GCC diagnostic ignored "-Wstringop-overflow"' doesn't help.
-    add_cxx_compile_options(-Wno-stringop-overflow)
-    # reinterpretAs.cpp:182:31: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of non-trivial type
-    # ‘using ToFieldType = using FieldType = using UUID = struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’
-    # {aka ‘struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’} from an array of ‘const char8_t’
-    add_cxx_compile_options(-Wno-error=class-memaccess)
-    # Maybe false positive...
-    # In file included from /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:673,
-    # In function ‘void std::__1::__libcpp_operator_delete(_Args ...) [with _Args = {void*, long unsigned int}]’,
-    # inlined from ‘void std::__1::__do_deallocate_handle_size(void*, size_t, _Args ...) [with _Args = {}]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:271:34,
-    # inlined from ‘void std::__1::__libcpp_deallocate(void*, size_t, size_t)’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:285:41,
-    # inlined from ‘constexpr void std::__1::allocator<_Tp>::deallocate(_Tp*, size_t) [with _Tp = char]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:849:39,
-    # inlined from ‘static constexpr void std::__1::allocator_traits<_Alloc>::deallocate(std::__1::allocator_traits<_Alloc>::allocator_type&, std::__1::allocator_traits<_Alloc>::pointer, std::__1::allocator_traits<_Alloc>::size_type) [with _Alloc = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/__memory/allocator_traits.h:476:24,
-    # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2219:35,
-    # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2213:1,
-    # inlined from ‘DB::JSONBuilder::JSONMap::Pair::~Pair()’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:90:12,
-    # inlined from ‘void DB::JSONBuilder::JSONMap::add(std::__1::string, DB::JSONBuilder::ItemPtr)’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:97:68,
-    # inlined from ‘virtual void DB::ExpressionStep::describeActions(DB::JSONBuilder::JSONMap&) const’ at /home/jakalletti/ClickHouse/ClickHouse/src/Processors/QueryPlan/ExpressionStep.cpp:102:12:
-    # /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:247:20: error: ‘void operator delete(void*, size_t)’ called on a pointer to an unallocated object ‘7598543875853023301’ [-Werror=free-nonheap-object]
-    add_cxx_compile_options(-Wno-error=free-nonheap-object)
-    # AggregateFunctionAvg.h:203:100: error: ‘this’ pointer is null [-Werror=nonnull]
-    add_cxx_compile_options(-Wno-error=nonnull)
 endif ()
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 695d7ec3f92..020fe1e1c5a 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -9,8 +9,6 @@ if (WITH_COVERAGE)
   # disable coverage for contib files and build with optimisations
   if (COMPILER_CLANG)
       add_compile_options(-O3 -DNDEBUG -finline-functions -finline-hint-functions ${WITHOUT_COVERAGE_LIST})
-  else()
-      add_compile_options(-O3 -DNDEBUG -finline-functions ${WITHOUT_COVERAGE_LIST})
   endif()
 endif()
 
@@ -107,6 +105,7 @@ add_contrib (libfarmhash)
 add_contrib (icu-cmake icu)
 add_contrib (h3-cmake h3)
 add_contrib (mariadb-connector-c-cmake mariadb-connector-c)
+add_contrib (libfiu-cmake libfiu)
 
 if (ENABLE_TESTS)
     add_contrib (googletest-cmake googletest)
@@ -136,27 +135,28 @@ add_contrib (aws-cmake
 )
 
 add_contrib (base64-cmake base64)
+if (NOT ARCH_S390X)
 add_contrib (simdjson-cmake simdjson)
+endif()
 add_contrib (rapidjson-cmake rapidjson)
 add_contrib (fastops-cmake fastops)
 add_contrib (libuv-cmake libuv)
 add_contrib (liburing-cmake liburing)
 add_contrib (amqpcpp-cmake AMQP-CPP) # requires: libuv
 add_contrib (cassandra-cmake cassandra) # requires: libuv
-
-if (ENABLE_CURL_BUILD)
+if (NOT OS_DARWIN)
     add_contrib (curl-cmake curl)
     add_contrib (azure-cmake azure)
     add_contrib (sentry-native-cmake sentry-native) # requires: curl
 endif()
-
 add_contrib (fmtlib-cmake fmtlib)
 add_contrib (krb5-cmake krb5)
 add_contrib (cyrus-sasl-cmake cyrus-sasl) # for krb5
 add_contrib (libgsasl-cmake libgsasl) # requires krb5
 add_contrib (librdkafka-cmake librdkafka) # requires: libgsasl
 add_contrib (nats-io-cmake nats-io)
-add_contrib (libhdfs3-cmake libhdfs3) # requires: protobuf, krb5
+add_contrib (isa-l-cmake isa-l)
+add_contrib (libhdfs3-cmake libhdfs3) # requires: protobuf, krb5, isa-l
 add_contrib (hive-metastore-cmake hive-metastore) # requires: thrift/avro/arrow/libhdfs3
 add_contrib (cppkafka-cmake cppkafka)
 add_contrib (libpqxx-cmake libpqxx)
@@ -178,19 +178,29 @@ endif()
 add_contrib (sqlite-cmake sqlite-amalgamation)
 add_contrib (s2geometry-cmake s2geometry)
 add_contrib (c-ares-cmake c-ares)
-add_contrib (qpl-cmake qpl)
-add_contrib (morton-nd-cmake morton-nd)
 
+if (OS_LINUX AND ARCH_AMD64 AND ENABLE_SSE42)
+    option (ENABLE_QPL "Enable Intel® Query Processing Library" ${ENABLE_LIBRARIES})
+elseif(ENABLE_QPL)
+    message (${RECONFIGURE_MESSAGE_LEVEL} "QPL library is only supported on x86_64 arch with SSE 4.2 or higher")
+endif()
+if (ENABLE_QPL)
+    add_contrib (idxd-config-cmake idxd-config)
+    add_contrib (qpl-cmake qpl) # requires: idxd-config
+else()
+    message(STATUS "Not using QPL")
+endif ()
+
+add_contrib (morton-nd-cmake morton-nd)
 if (ARCH_S390X)
     add_contrib(crc32-s390x-cmake crc32-s390x)
 endif()
-
 add_contrib (annoy-cmake annoy)
-
 add_contrib (xxHash-cmake xxHash)
 
-add_contrib (google-benchmark-cmake google-benchmark)
+add_contrib (libbcrypt-cmake libbcrypt)
 
+add_contrib (google-benchmark-cmake google-benchmark)
 add_contrib (ulid-c-cmake ulid-c)
 
 # Put all targets defined here and in subdirectories under "contrib/<immediate-subdir>" folders in GUI-based IDEs.
diff --git a/contrib/arrow b/contrib/arrow
index d03245f801f..1f1b3d35fb6 160000
--- a/contrib/arrow
+++ b/contrib/arrow
@@ -1 +1 @@
-Subproject commit d03245f801f798c63ee9a7d2b8914a9e5c5cd666
+Subproject commit 1f1b3d35fb6eb73e6492d3afd8a85cde848d174f
diff --git a/contrib/arrow-cmake/CMakeLists.txt b/contrib/arrow-cmake/CMakeLists.txt
index ae6f270a768..16198887075 100644
--- a/contrib/arrow-cmake/CMakeLists.txt
+++ b/contrib/arrow-cmake/CMakeLists.txt
@@ -115,6 +115,13 @@ configure_file("${ORC_SOURCE_SRC_DIR}/Adaptor.hh.in" "${ORC_BUILD_INCLUDE_DIR}/A
 
 # ARROW_ORC + adapters/orc/CMakefiles
 set(ORC_SRCS
+        "${CMAKE_CURRENT_BINARY_DIR}/orc_proto.pb.h"
+        "${ORC_SOURCE_SRC_DIR}/sargs/ExpressionTree.cc"
+        "${ORC_SOURCE_SRC_DIR}/sargs/Literal.cc"
+        "${ORC_SOURCE_SRC_DIR}/sargs/PredicateLeaf.cc"
+        "${ORC_SOURCE_SRC_DIR}/sargs/SargsApplier.cc"
+        "${ORC_SOURCE_SRC_DIR}/sargs/SearchArgument.cc"
+        "${ORC_SOURCE_SRC_DIR}/sargs/TruthValue.cc"
         "${ORC_SOURCE_SRC_DIR}/Exceptions.cc"
         "${ORC_SOURCE_SRC_DIR}/OrcFile.cc"
         "${ORC_SOURCE_SRC_DIR}/Reader.cc"
@@ -129,13 +136,20 @@ set(ORC_SRCS
         "${ORC_SOURCE_SRC_DIR}/MemoryPool.cc"
         "${ORC_SOURCE_SRC_DIR}/RLE.cc"
         "${ORC_SOURCE_SRC_DIR}/RLEv1.cc"
-        "${ORC_SOURCE_SRC_DIR}/RLEv2.cc"
+        "${ORC_SOURCE_SRC_DIR}/RleDecoderV2.cc"
+        "${ORC_SOURCE_SRC_DIR}/RleEncoderV2.cc"
+        "${ORC_SOURCE_SRC_DIR}/RLEV2Util.cc"
         "${ORC_SOURCE_SRC_DIR}/Statistics.cc"
         "${ORC_SOURCE_SRC_DIR}/StripeStream.cc"
         "${ORC_SOURCE_SRC_DIR}/Timezone.cc"
         "${ORC_SOURCE_SRC_DIR}/TypeImpl.cc"
         "${ORC_SOURCE_SRC_DIR}/Vector.cc"
         "${ORC_SOURCE_SRC_DIR}/Writer.cc"
+        "${ORC_SOURCE_SRC_DIR}/Adaptor.cc"
+        "${ORC_SOURCE_SRC_DIR}/BloomFilter.cc"
+        "${ORC_SOURCE_SRC_DIR}/Murmur3.cc"
+        "${ORC_SOURCE_SRC_DIR}/BlockBuffer.cc"
+        "${ORC_SOURCE_SRC_DIR}/wrap/orc-proto-wrapper.cc"
         "${ORC_SOURCE_SRC_DIR}/io/InputStream.cc"
         "${ORC_SOURCE_SRC_DIR}/io/OutputStream.cc"
         "${ORC_ADDITION_SOURCE_DIR}/orc_proto.pb.cc"
@@ -188,6 +202,7 @@ set(ARROW_SRCS
         "${LIBRARY_DIR}/builder.cc"
         "${LIBRARY_DIR}/buffer.cc"
         "${LIBRARY_DIR}/chunked_array.cc"
+        "${LIBRARY_DIR}/chunk_resolver.cc"
         "${LIBRARY_DIR}/compare.cc"
         "${LIBRARY_DIR}/config.cc"
         "${LIBRARY_DIR}/datum.cc"
@@ -254,6 +269,10 @@ set(ARROW_SRCS
         "${LIBRARY_DIR}/util/uri.cc"
         "${LIBRARY_DIR}/util/utf8.cc"
         "${LIBRARY_DIR}/util/value_parsing.cc"
+        "${LIBRARY_DIR}/util/byte_size.cc"
+        "${LIBRARY_DIR}/util/debug.cc"
+        "${LIBRARY_DIR}/util/tracing.cc"
+        "${LIBRARY_DIR}/util/atfork_internal.cc"
         "${LIBRARY_DIR}/vendored/base64.cpp"
         "${LIBRARY_DIR}/vendored/datetime/tz.cpp"
 
@@ -287,9 +306,11 @@ set(ARROW_SRCS
         "${LIBRARY_DIR}/compute/exec/source_node.cc"
         "${LIBRARY_DIR}/compute/exec/sink_node.cc"
         "${LIBRARY_DIR}/compute/exec/order_by_impl.cc"
+        "${LIBRARY_DIR}/compute/exec/partition_util.cc"
         "${LIBRARY_DIR}/compute/function.cc"
         "${LIBRARY_DIR}/compute/function_internal.cc"
         "${LIBRARY_DIR}/compute/kernel.cc"
+        "${LIBRARY_DIR}/compute/light_array.cc"
         "${LIBRARY_DIR}/compute/registry.cc"
         "${LIBRARY_DIR}/compute/kernels/aggregate_basic.cc"
         "${LIBRARY_DIR}/compute/kernels/aggregate_mode.cc"
@@ -303,21 +324,28 @@ set(ARROW_SRCS
         "${LIBRARY_DIR}/compute/kernels/scalar_cast_boolean.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_cast_dictionary.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_cast_internal.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_extension.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_cast_nested.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_cast_numeric.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_cast_string.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_cast_temporal.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_compare.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_nested.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_random.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_round.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_set_lookup.cc"
-        "${LIBRARY_DIR}/compute/kernels/scalar_string.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_temporal_binary.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_temporal_unary.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_validity.cc"
         "${LIBRARY_DIR}/compute/kernels/scalar_if_else.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_string_ascii.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_string_utf8.cc"
         "${LIBRARY_DIR}/compute/kernels/util_internal.cc"
         "${LIBRARY_DIR}/compute/kernels/vector_array_sort.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_cumulative_ops.cc"
         "${LIBRARY_DIR}/compute/kernels/vector_hash.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_rank.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_select_k.cc"
         "${LIBRARY_DIR}/compute/kernels/vector_nested.cc"
         "${LIBRARY_DIR}/compute/kernels/vector_replace.cc"
         "${LIBRARY_DIR}/compute/kernels/vector_selection.cc"
@@ -326,13 +354,15 @@ set(ARROW_SRCS
         "${LIBRARY_DIR}/compute/exec/union_node.cc"
         "${LIBRARY_DIR}/compute/exec/key_hash.cc"
         "${LIBRARY_DIR}/compute/exec/key_map.cc"
-        "${LIBRARY_DIR}/compute/exec/key_compare.cc"
-        "${LIBRARY_DIR}/compute/exec/key_encode.cc"
         "${LIBRARY_DIR}/compute/exec/util.cc"
         "${LIBRARY_DIR}/compute/exec/hash_join_dict.cc"
         "${LIBRARY_DIR}/compute/exec/hash_join.cc"
         "${LIBRARY_DIR}/compute/exec/hash_join_node.cc"
         "${LIBRARY_DIR}/compute/exec/task_util.cc"
+        "${LIBRARY_DIR}/compute/row/encode_internal.cc"
+        "${LIBRARY_DIR}/compute/row/grouper.cc"
+        "${LIBRARY_DIR}/compute/row/compare_internal.cc"
+        "${LIBRARY_DIR}/compute/row/row_internal.cc"
 
         "${LIBRARY_DIR}/ipc/dictionary.cc"
         "${LIBRARY_DIR}/ipc/feather.cc"
@@ -343,7 +373,8 @@ set(ARROW_SRCS
         "${LIBRARY_DIR}/ipc/writer.cc"
 
         "${ARROW_SRC_DIR}/arrow/adapters/orc/adapter.cc"
-        "${ARROW_SRC_DIR}/arrow/adapters/orc/adapter_util.cc"
+        "${ARROW_SRC_DIR}/arrow/adapters/orc/util.cc"
+        "${ARROW_SRC_DIR}/arrow/adapters/orc/options.cc"
         )
 
 add_definitions(-DARROW_WITH_LZ4)
@@ -358,6 +389,9 @@ SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zlib.cc" ${ARROW_SRCS})
 add_definitions(-DARROW_WITH_ZSTD)
 SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zstd.cc" ${ARROW_SRCS})
 
+add_definitions(-DARROW_WITH_BROTLI)
+SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_brotli.cc" ${ARROW_SRCS})
+
 
 add_library(_arrow ${ARROW_SRCS})
 
@@ -372,6 +406,7 @@ target_link_libraries(_arrow PRIVATE
     ch_contrib::snappy
     ch_contrib::zlib
     ch_contrib::zstd
+    ch_contrib::brotli
 )
 target_link_libraries(_arrow PUBLIC _orc)
 
diff --git a/contrib/avro-cmake/CMakeLists.txt b/contrib/avro-cmake/CMakeLists.txt
index 25474650d0e..63b3854eef9 100644
--- a/contrib/avro-cmake/CMakeLists.txt
+++ b/contrib/avro-cmake/CMakeLists.txt
@@ -6,7 +6,7 @@ if (NOT ENABLE_AVRO)
     return()
 endif()
 
-set(AVROCPP_ROOT_DIR "${CMAKE_SOURCE_DIR}/contrib/avro/lang/c++")
+set(AVROCPP_ROOT_DIR "${PROJECT_SOURCE_DIR}/contrib/avro/lang/c++")
 set(AVROCPP_INCLUDE_DIR "${AVROCPP_ROOT_DIR}/api")
 set(AVROCPP_SOURCE_DIR "${AVROCPP_ROOT_DIR}/impl")
 
diff --git a/contrib/aws b/contrib/aws
index ecccfc026a4..ca02358dcc7 160000
--- a/contrib/aws
+++ b/contrib/aws
@@ -1 +1 @@
-Subproject commit ecccfc026a42b30023289410a67024d561f4bf3e
+Subproject commit ca02358dcc7ce3ab733dd4cbcc32734eecfa4ee3
diff --git a/contrib/aws-c-auth b/contrib/aws-c-auth
index 30df6c407e2..97133a2b5db 160000
--- a/contrib/aws-c-auth
+++ b/contrib/aws-c-auth
@@ -1 +1 @@
-Subproject commit 30df6c407e2df43bd244e2c34c9b4a4b87372bfb
+Subproject commit 97133a2b5dbca1ccdf88cd6f44f39d0531d27d12
diff --git a/contrib/aws-c-common b/contrib/aws-c-common
index 324fd1d973c..45dcb2849c8 160000
--- a/contrib/aws-c-common
+++ b/contrib/aws-c-common
@@ -1 +1 @@
-Subproject commit 324fd1d973ccb25c813aa747bf1759cfde5121c5
+Subproject commit 45dcb2849c891dba2100b270b4676765c92949ff
diff --git a/contrib/aws-c-event-stream b/contrib/aws-c-event-stream
index 39bfa94a14b..2f9b60c42f9 160000
--- a/contrib/aws-c-event-stream
+++ b/contrib/aws-c-event-stream
@@ -1 +1 @@
-Subproject commit 39bfa94a14b7126bf0c1330286ef8db452d87e66
+Subproject commit 2f9b60c42f90840ec11822acda3d8cdfa97a773d
diff --git a/contrib/aws-c-http b/contrib/aws-c-http
index 2c5a2a7d555..dd344619879 160000
--- a/contrib/aws-c-http
+++ b/contrib/aws-c-http
@@ -1 +1 @@
-Subproject commit 2c5a2a7d5556600b9782ffa6c9d7e09964df1abc
+Subproject commit dd34461987947672444d0bc872c5a733dfdb9711
diff --git a/contrib/aws-c-io b/contrib/aws-c-io
index 5d32c453560..d58ed4f272b 160000
--- a/contrib/aws-c-io
+++ b/contrib/aws-c-io
@@ -1 +1 @@
-Subproject commit 5d32c453560d0823df521a686bf7fbacde7f9be3
+Subproject commit d58ed4f272b1cb4f89ac9196526ceebe5f2b0d89
diff --git a/contrib/aws-c-mqtt b/contrib/aws-c-mqtt
index 882c689561a..33c3455cec8 160000
--- a/contrib/aws-c-mqtt
+++ b/contrib/aws-c-mqtt
@@ -1 +1 @@
-Subproject commit 882c689561a3db1466330ccfe3b63637e0a575d3
+Subproject commit 33c3455cec82b16feb940e12006cefd7b3ef4194
diff --git a/contrib/aws-c-s3 b/contrib/aws-c-s3
index a41255ece72..d7bfe602d69 160000
--- a/contrib/aws-c-s3
+++ b/contrib/aws-c-s3
@@ -1 +1 @@
-Subproject commit a41255ece72a7c887bba7f9d998ca3e14f4c8a1b
+Subproject commit d7bfe602d6925948f1fff95784e3613cca6a3900
diff --git a/contrib/aws-c-sdkutils b/contrib/aws-c-sdkutils
index 25bf5cf225f..208a701fa01 160000
--- a/contrib/aws-c-sdkutils
+++ b/contrib/aws-c-sdkutils
@@ -1 +1 @@
-Subproject commit 25bf5cf225f977c3accc6a05a0a7a181ef2a4a30
+Subproject commit 208a701fa01e99c7c8cc3dcebc8317da71362972
diff --git a/contrib/aws-checksums b/contrib/aws-checksums
index 48e7c0e0147..ad53be196a2 160000
--- a/contrib/aws-checksums
+++ b/contrib/aws-checksums
@@ -1 +1 @@
-Subproject commit 48e7c0e01479232f225c8044d76c84e74192889d
+Subproject commit ad53be196a25bbefa3700a01187fdce573a7d2d0
diff --git a/contrib/aws-cmake/CMakeLists.txt b/contrib/aws-cmake/CMakeLists.txt
index 52533cd6483..950a0e06cd0 100644
--- a/contrib/aws-cmake/CMakeLists.txt
+++ b/contrib/aws-cmake/CMakeLists.txt
@@ -52,8 +52,8 @@ endif()
 
 # Directories.
 SET(AWS_SDK_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws")
-SET(AWS_SDK_CORE_DIR "${AWS_SDK_DIR}/aws-cpp-sdk-core")
-SET(AWS_SDK_S3_DIR "${AWS_SDK_DIR}/aws-cpp-sdk-s3")
+SET(AWS_SDK_CORE_DIR "${AWS_SDK_DIR}/src/aws-cpp-sdk-core")
+SET(AWS_SDK_S3_DIR "${AWS_SDK_DIR}/generated/src/aws-cpp-sdk-s3")
 
 SET(AWS_AUTH_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-auth")
 SET(AWS_CAL_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-cal")
@@ -118,7 +118,7 @@ configure_file("${AWS_SDK_CORE_DIR}/include/aws/core/SDKConfig.h.in"
 list(APPEND AWS_PUBLIC_COMPILE_DEFS "-DAWS_SDK_VERSION_MAJOR=1")
 list(APPEND AWS_PUBLIC_COMPILE_DEFS "-DAWS_SDK_VERSION_MINOR=10")
 list(APPEND AWS_PUBLIC_COMPILE_DEFS "-DAWS_SDK_VERSION_PATCH=36")
-    
+
 list(APPEND AWS_SOURCES ${AWS_SDK_CORE_SRC} ${AWS_SDK_CORE_NET_SRC} ${AWS_SDK_CORE_PLATFORM_SRC})
 
 list(APPEND AWS_PUBLIC_INCLUDES
diff --git a/contrib/aws-crt-cpp b/contrib/aws-crt-cpp
index ec0bea288f4..8a301b7e842 160000
--- a/contrib/aws-crt-cpp
+++ b/contrib/aws-crt-cpp
@@ -1 +1 @@
-Subproject commit ec0bea288f451d884c0d80d534bc5c66241c39a4
+Subproject commit 8a301b7e842f1daed478090c869207300972379f
diff --git a/contrib/aws-s2n-tls b/contrib/aws-s2n-tls
index 0f1ba9e5c4a..71f4794b758 160000
--- a/contrib/aws-s2n-tls
+++ b/contrib/aws-s2n-tls
@@ -1 +1 @@
-Subproject commit 0f1ba9e5c4a67cb3898de0c0b4f911d4194dc8de
+Subproject commit 71f4794b7580cf780eb4aca77d69eded5d3c7bb4
diff --git a/contrib/boost b/contrib/boost
index 03d9ec9cd15..aec12eea7fc 160000
--- a/contrib/boost
+++ b/contrib/boost
@@ -1 +1 @@
-Subproject commit 03d9ec9cd159d14bd0b17c05138098451a1ea606
+Subproject commit aec12eea7fc762721ae16943d1361340c66c9c17
diff --git a/contrib/boost-cmake/CMakeLists.txt b/contrib/boost-cmake/CMakeLists.txt
index 2a70c25ffe1..6f9dce0b042 100644
--- a/contrib/boost-cmake/CMakeLists.txt
+++ b/contrib/boost-cmake/CMakeLists.txt
@@ -92,6 +92,8 @@ add_library (boost::system ALIAS _boost_system)
 target_include_directories (_boost_system PRIVATE ${LIBRARY_DIR})
 
 # context
+option (BOOST_USE_UCONTEXT "Use ucontext_t for context switching of boost::fiber within boost::context" OFF)
+
 enable_language(ASM)
 SET(ASM_OPTIONS "-x assembler-with-cpp")
 
@@ -100,26 +102,20 @@ set (SRCS_CONTEXT
     "${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp"
 )
 
-if (SANITIZE AND (SANITIZE STREQUAL "address" OR SANITIZE STREQUAL "thread"))
-    add_compile_definitions(BOOST_USE_UCONTEXT)
-
-    if (SANITIZE STREQUAL "address")
-        add_compile_definitions(BOOST_USE_ASAN)
-    elseif (SANITIZE STREQUAL "thread")
-        add_compile_definitions(BOOST_USE_TSAN)
-    endif()
-
-    set (SRCS_CONTEXT ${SRCS_CONTEXT}
-            "${LIBRARY_DIR}/libs/context/src/fiber.cpp"
-            "${LIBRARY_DIR}/libs/context/src/continuation.cpp"
-    )
-endif()
 if (ARCH_AARCH64)
-    set (SRCS_CONTEXT ${SRCS_CONTEXT}
-        "${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S"
-        "${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S"
-        "${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S"
-    )
+    if (OS_DARWIN)
+        set (SRCS_CONTEXT ${SRCS_CONTEXT}
+            "${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_macho_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_macho_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_macho_gas.S"
+        )
+    else()
+        set (SRCS_CONTEXT ${SRCS_CONTEXT}
+            "${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S"
+        )
+    endif()
 elseif (ARCH_PPC64LE)
     set (SRCS_CONTEXT ${SRCS_CONTEXT}
         "${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S"
@@ -152,10 +148,27 @@ else()
     )
 endif()
 
+if (SANITIZE OR BOOST_USE_UCONTEXT)
+    list (APPEND SRCS_CONTEXT
+        "${LIBRARY_DIR}/libs/context/src/fiber.cpp"
+        "${LIBRARY_DIR}/libs/context/src/continuation.cpp"
+    )
+endif()
+
 add_library (_boost_context ${SRCS_CONTEXT})
 add_library (boost::context ALIAS _boost_context)
 target_include_directories (_boost_context PRIVATE ${LIBRARY_DIR})
 
+if (SANITIZE OR BOOST_USE_UCONTEXT)
+    target_compile_definitions(_boost_context PUBLIC BOOST_USE_UCONTEXT)
+endif()
+
+if (SANITIZE STREQUAL "address")
+    target_compile_definitions(_boost_context PUBLIC BOOST_USE_ASAN)
+elseif (SANITIZE STREQUAL "thread")
+    target_compile_definitions(_boost_context PUBLIC BOOST_USE_TSAN)
+endif()
+
 # coroutine
 
 set (SRCS_COROUTINE
diff --git a/contrib/boringssl-cmake/CMakeLists.txt b/contrib/boringssl-cmake/CMakeLists.txt
index 828919476a7..51137f6d04e 100644
--- a/contrib/boringssl-cmake/CMakeLists.txt
+++ b/contrib/boringssl-cmake/CMakeLists.txt
@@ -111,6 +111,8 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips")
   set(ARCH "generic")
 elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le")
   set(ARCH "ppc64le")
+elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "riscv64")
+  set(ARCH "riscv64")
 else()
   message(FATAL_ERROR "Unknown processor:" ${CMAKE_SYSTEM_PROCESSOR})
 endif()
diff --git a/contrib/cassandra-cmake/CMakeLists.txt b/contrib/cassandra-cmake/CMakeLists.txt
index 59ff908b63a..32611e0e151 100644
--- a/contrib/cassandra-cmake/CMakeLists.txt
+++ b/contrib/cassandra-cmake/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 # Need to use C++17 since the compilation is not possible with C++20 currently.
 set (CMAKE_CXX_STANDARD 17)
 
-set(CASS_ROOT_DIR ${CMAKE_SOURCE_DIR}/contrib/cassandra)
+set(CASS_ROOT_DIR ${PROJECT_SOURCE_DIR}/contrib/cassandra)
 set(CASS_SRC_DIR "${CASS_ROOT_DIR}/src")
 set(CASS_INCLUDE_DIR "${CASS_ROOT_DIR}/include")
 
diff --git a/contrib/cctz b/contrib/cctz
index 7c78edd52b4..5e05432420f 160000
--- a/contrib/cctz
+++ b/contrib/cctz
@@ -1 +1 @@
-Subproject commit 7c78edd52b4d65acc103c2f195818ffcabe6fe0d
+Subproject commit 5e05432420f9692418e2e12aff09859e420b14a2
diff --git a/contrib/cctz-cmake/CMakeLists.txt b/contrib/cctz-cmake/CMakeLists.txt
index f1ef9b53f7d..10070fbd949 100644
--- a/contrib/cctz-cmake/CMakeLists.txt
+++ b/contrib/cctz-cmake/CMakeLists.txt
@@ -26,7 +26,7 @@ endif ()
 # StorageSystemTimeZones.generated.cpp is autogenerated each time during a build
 # data in this file will be used to populate the system.time_zones table, this is specific to OS_LINUX
 # as the library that's built using embedded tzdata is also specific to OS_LINUX
-set(SYSTEM_STORAGE_TZ_FILE "${CMAKE_BINARY_DIR}/src/Storages/System/StorageSystemTimeZones.generated.cpp")
+set(SYSTEM_STORAGE_TZ_FILE "${PROJECT_BINARY_DIR}/src/Storages/System/StorageSystemTimeZones.generated.cpp")
 # remove existing copies so that its generated fresh on each build.
 file(REMOVE ${SYSTEM_STORAGE_TZ_FILE})
 
diff --git a/contrib/consistent-hashing/consistent_hashing.cpp b/contrib/consistent-hashing/consistent_hashing.cpp
index 347456eede3..c21e57bdaef 100644
--- a/contrib/consistent-hashing/consistent_hashing.cpp
+++ b/contrib/consistent-hashing/consistent_hashing.cpp
@@ -8,7 +8,7 @@
 
 /*
  * (all numbers are written in big-endian manner: the least significant digit on the right)
- * (only bit representations are used - no hex or octal, leading zeroes are ommited)
+ * (only bit representations are used - no hex or octal, leading zeroes are omitted)
  *
  * Consistent hashing scheme:
  *
diff --git a/contrib/croaring b/contrib/croaring
index 2c867e9f9c9..f40ed52bcdd 160000
--- a/contrib/croaring
+++ b/contrib/croaring
@@ -1 +1 @@
-Subproject commit 2c867e9f9c9e2a3a7032791f94c4c7ae3013f6e0
+Subproject commit f40ed52bcdd635840a79877cef4857315dba817c
diff --git a/contrib/croaring-cmake/CMakeLists.txt b/contrib/croaring-cmake/CMakeLists.txt
index 0bb7d0bd221..794c0426b96 100644
--- a/contrib/croaring-cmake/CMakeLists.txt
+++ b/contrib/croaring-cmake/CMakeLists.txt
@@ -17,7 +17,8 @@ set(SRCS
     "${LIBRARY_DIR}/src/containers/run.c"
     "${LIBRARY_DIR}/src/roaring.c"
     "${LIBRARY_DIR}/src/roaring_priority_queue.c"
-    "${LIBRARY_DIR}/src/roaring_array.c")
+    "${LIBRARY_DIR}/src/roaring_array.c"
+    "${LIBRARY_DIR}/src/memory.c")
 
 add_library(_roaring ${SRCS})
 
diff --git a/contrib/curl b/contrib/curl
index c12fb3ddaf4..b0edf0b7dae 160000
--- a/contrib/curl
+++ b/contrib/curl
@@ -1 +1 @@
-Subproject commit c12fb3ddaf48e709a7a4deaa55ec485e4df163ee
+Subproject commit b0edf0b7dae44d9e66f270a257cf654b35d5263d
diff --git a/contrib/curl-cmake/CMakeLists.txt b/contrib/curl-cmake/CMakeLists.txt
index 8a570bd267c..70d9c2816dc 100644
--- a/contrib/curl-cmake/CMakeLists.txt
+++ b/contrib/curl-cmake/CMakeLists.txt
@@ -12,6 +12,9 @@ set (SRCS
     "${LIBRARY_DIR}/lib/noproxy.c"
     "${LIBRARY_DIR}/lib/idn.c"
     "${LIBRARY_DIR}/lib/cfilters.c"
+    "${LIBRARY_DIR}/lib/cf-socket.c"
+    "${LIBRARY_DIR}/lib/cf-haproxy.c"
+    "${LIBRARY_DIR}/lib/cf-https-connect.c"
     "${LIBRARY_DIR}/lib/file.c"
     "${LIBRARY_DIR}/lib/timeval.c"
     "${LIBRARY_DIR}/lib/base64.c"
@@ -37,8 +40,8 @@ set (SRCS
     "${LIBRARY_DIR}/lib/strcase.c"
     "${LIBRARY_DIR}/lib/easy.c"
     "${LIBRARY_DIR}/lib/curl_fnmatch.c"
+    "${LIBRARY_DIR}/lib/curl_log.c"
     "${LIBRARY_DIR}/lib/fileinfo.c"
-    "${LIBRARY_DIR}/lib/wildcard.c"
     "${LIBRARY_DIR}/lib/krb5.c"
     "${LIBRARY_DIR}/lib/memdebug.c"
     "${LIBRARY_DIR}/lib/http_chunks.c"
@@ -96,6 +99,7 @@ set (SRCS
     "${LIBRARY_DIR}/lib/rand.c"
     "${LIBRARY_DIR}/lib/curl_multibyte.c"
     "${LIBRARY_DIR}/lib/conncache.c"
+    "${LIBRARY_DIR}/lib/cf-h1-proxy.c"
     "${LIBRARY_DIR}/lib/http2.c"
     "${LIBRARY_DIR}/lib/smb.c"
     "${LIBRARY_DIR}/lib/curl_endian.c"
@@ -113,12 +117,13 @@ set (SRCS
     "${LIBRARY_DIR}/lib/altsvc.c"
     "${LIBRARY_DIR}/lib/socketpair.c"
     "${LIBRARY_DIR}/lib/bufref.c"
+    "${LIBRARY_DIR}/lib/bufq.c"
     "${LIBRARY_DIR}/lib/dynbuf.c"
+    "${LIBRARY_DIR}/lib/dynhds.c"
     "${LIBRARY_DIR}/lib/hsts.c"
     "${LIBRARY_DIR}/lib/http_aws_sigv4.c"
     "${LIBRARY_DIR}/lib/mqtt.c"
     "${LIBRARY_DIR}/lib/rename.c"
-    "${LIBRARY_DIR}/lib/h2h3.c"
     "${LIBRARY_DIR}/lib/headers.c"
     "${LIBRARY_DIR}/lib/timediff.c"
     "${LIBRARY_DIR}/lib/vauth/vauth.c"
@@ -133,6 +138,7 @@ set (SRCS
     "${LIBRARY_DIR}/lib/vauth/oauth2.c"
     "${LIBRARY_DIR}/lib/vauth/spnego_gssapi.c"
     "${LIBRARY_DIR}/lib/vauth/spnego_sspi.c"
+    "${LIBRARY_DIR}/lib/vquic/vquic.c"
     "${LIBRARY_DIR}/lib/vtls/openssl.c"
     "${LIBRARY_DIR}/lib/vtls/gtls.c"
     "${LIBRARY_DIR}/lib/vtls/vtls.c"
@@ -147,9 +153,6 @@ set (SRCS
     "${LIBRARY_DIR}/lib/vtls/keylog.c"
     "${LIBRARY_DIR}/lib/vtls/x509asn1.c"
     "${LIBRARY_DIR}/lib/vtls/hostcheck.c"
-    "${LIBRARY_DIR}/lib/vquic/ngtcp2.c"
-    "${LIBRARY_DIR}/lib/vquic/quiche.c"
-    "${LIBRARY_DIR}/lib/vquic/msh3.c"
     "${LIBRARY_DIR}/lib/vssh/libssh2.c"
     "${LIBRARY_DIR}/lib/vssh/libssh.c"
 )
diff --git a/contrib/googletest-cmake/CMakeLists.txt b/contrib/googletest-cmake/CMakeLists.txt
index 90fdde0c185..3905df03155 100644
--- a/contrib/googletest-cmake/CMakeLists.txt
+++ b/contrib/googletest-cmake/CMakeLists.txt
@@ -1,15 +1,30 @@
-set (SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/googletest/googletest")
+set (SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/googletest")
 
-add_library(_gtest "${SRC_DIR}/src/gtest-all.cc")
+add_library(_gtest "${SRC_DIR}/googletest/src/gtest-all.cc")
 set_target_properties(_gtest PROPERTIES VERSION "1.0.0")
 target_compile_definitions (_gtest PUBLIC GTEST_HAS_POSIX_RE=0)
-target_include_directories(_gtest SYSTEM PUBLIC "${SRC_DIR}/include")
-target_include_directories(_gtest PRIVATE "${SRC_DIR}")
+target_include_directories(_gtest SYSTEM PUBLIC "${SRC_DIR}/googletest/include")
+target_include_directories(_gtest PRIVATE "${SRC_DIR}/googletest")
 
-add_library(_gtest_main "${SRC_DIR}/src/gtest_main.cc")
+add_library(_gtest_main "${SRC_DIR}/googletest/src/gtest_main.cc")
 set_target_properties(_gtest_main PROPERTIES VERSION "1.0.0")
 target_link_libraries(_gtest_main PUBLIC _gtest)
 
 add_library(_gtest_all INTERFACE)
 target_link_libraries(_gtest_all INTERFACE _gtest _gtest_main)
 add_library(ch_contrib::gtest_all ALIAS _gtest_all)
+
+
+add_library(_gmock "${SRC_DIR}/googlemock/src/gmock-all.cc")
+set_target_properties(_gmock PROPERTIES VERSION "1.0.0")
+target_compile_definitions (_gmock PUBLIC GTEST_HAS_POSIX_RE=0)
+target_include_directories(_gmock SYSTEM PUBLIC "${SRC_DIR}/googlemock/include" "${SRC_DIR}/googletest/include")
+target_include_directories(_gmock PRIVATE "${SRC_DIR}/googlemock")
+
+add_library(_gmock_main "${SRC_DIR}/googlemock/src/gmock_main.cc")
+set_target_properties(_gmock_main PROPERTIES VERSION "1.0.0")
+target_link_libraries(_gmock_main PUBLIC _gmock)
+
+add_library(_gmock_all INTERFACE)
+target_link_libraries(_gmock_all INTERFACE _gmock _gmock_main)
+add_library(ch_contrib::gmock_all ALIAS _gmock_all)
diff --git a/contrib/grpc-cmake/CMakeLists.txt b/contrib/grpc-cmake/CMakeLists.txt
index b1ed7e464b6..09ed2fe3f80 100644
--- a/contrib/grpc-cmake/CMakeLists.txt
+++ b/contrib/grpc-cmake/CMakeLists.txt
@@ -1,9 +1,4 @@
-# disable grpc due to conflicts of abseil (required by grpc) dynamic annotations with libtsan.a
-if (SANITIZE STREQUAL "thread" AND COMPILER_GCC)
-  set(ENABLE_GRPC_DEFAULT OFF)
-else()
-  set(ENABLE_GRPC_DEFAULT ${ENABLE_LIBRARIES})
-endif()
+set(ENABLE_GRPC_DEFAULT ${ENABLE_LIBRARIES})
 option(ENABLE_GRPC "Use gRPC" ${ENABLE_GRPC_DEFAULT})
 
 if(NOT ENABLE_GRPC)
@@ -48,6 +43,9 @@ set(gRPC_ABSL_PROVIDER "clickhouse" CACHE STRING "" FORCE)
 # We don't want to build C# extensions.
 set(gRPC_BUILD_CSHARP_EXT OFF)
 
+# TODO: Remove this. We generally like to compile with C++23 but grpc isn't ready yet.
+set (CMAKE_CXX_STANDARD 20)
+
 set(_gRPC_CARES_LIBRARIES ch_contrib::c-ares)
 set(gRPC_CARES_PROVIDER "clickhouse" CACHE STRING "" FORCE)
 add_subdirectory("${_gRPC_SOURCE_DIR}" "${_gRPC_BINARY_DIR}")
diff --git a/contrib/idxd-config-cmake/CMakeLists.txt b/contrib/idxd-config-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..030252ec8e6
--- /dev/null
+++ b/contrib/idxd-config-cmake/CMakeLists.txt
@@ -0,0 +1,23 @@
+## accel_config is the utility library required by QPL-Deflate codec for controlling and configuring Intel® In-Memory Analytics Accelerator (Intel® IAA).
+set (LIBACCEL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/idxd-config")
+set (UUID_DIR "${ClickHouse_SOURCE_DIR}/contrib/qpl-cmake")
+set (LIBACCEL_HEADER_DIR "${ClickHouse_SOURCE_DIR}/contrib/idxd-config-cmake/include")
+set (SRCS
+    "${LIBACCEL_SOURCE_DIR}/accfg/lib/libaccfg.c"
+    "${LIBACCEL_SOURCE_DIR}/util/log.c"
+    "${LIBACCEL_SOURCE_DIR}/util/sysfs.c"
+)
+
+add_library(_accel-config ${SRCS})
+
+target_compile_options(_accel-config PRIVATE "-D_GNU_SOURCE")
+
+target_include_directories(_accel-config BEFORE
+    PRIVATE ${UUID_DIR}
+    PRIVATE ${LIBACCEL_HEADER_DIR}
+    PRIVATE ${LIBACCEL_SOURCE_DIR})
+
+target_include_directories(_accel-config SYSTEM BEFORE
+    PUBLIC ${LIBACCEL_SOURCE_DIR}/accfg)
+
+add_library(ch_contrib::accel-config ALIAS _accel-config)
diff --git a/contrib/qpl-cmake/idxd-header/config.h b/contrib/idxd-config-cmake/include/config.h
similarity index 100%
rename from contrib/qpl-cmake/idxd-header/config.h
rename to contrib/idxd-config-cmake/include/config.h
diff --git a/contrib/isa-l b/contrib/isa-l
new file mode 160000
index 00000000000..9f2b68f0575
--- /dev/null
+++ b/contrib/isa-l
@@ -0,0 +1 @@
+Subproject commit 9f2b68f05752097f0f16632fc4a9a86950831efd
diff --git a/contrib/isa-l-cmake/CMakeLists.txt b/contrib/isa-l-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..d4d6d648268
--- /dev/null
+++ b/contrib/isa-l-cmake/CMakeLists.txt
@@ -0,0 +1,203 @@
+option(ENABLE_ISAL_LIBRARY "Enable ISA-L library" ${ENABLE_LIBRARIES})
+if (ARCH_AARCH64)
+    # Disable ISA-L libray on aarch64.
+    set (ENABLE_ISAL_LIBRARY OFF)
+endif ()
+
+if (NOT ENABLE_ISAL_LIBRARY)
+    message(STATUS "Not using isa-l")
+    return()
+endif()
+
+set(ISAL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/isa-l")
+
+# The YASM and NASM assembers are somewhat mutually compatible. ISAL specifically needs NASM. If only YASM is installed, then check_language(ASM_NASM)
+# below happily finds YASM, leading to weird errors at build time. Therefore, do an explicit check for NASM here.
+find_program(NASM_PATH NAMES nasm)
+if (NOT NASM_PATH)
+    message(FATAL_ERROR "Please install NASM from 'https://www.nasm.us/' because NASM compiler can not be found!")
+endif ()
+
+include(CheckLanguage)
+check_language(ASM_NASM)
+if(NOT CMAKE_ASM_NASM_COMPILER)
+    message(FATAL_ERROR "Please install NASM from 'https://www.nasm.us/' because NASM compiler can not be found!")
+endif()
+
+enable_language(ASM_NASM)
+
+set(ISAL_C_SRC
+        ${ISAL_SOURCE_DIR}/crc/crc_base_aliases.c
+        ${ISAL_SOURCE_DIR}/crc/crc_base.c
+        ${ISAL_SOURCE_DIR}/crc/crc64_base.c
+        ${ISAL_SOURCE_DIR}/erasure_code/ec_base.c
+        ${ISAL_SOURCE_DIR}/erasure_code/ec_base_aliases.c
+        ${ISAL_SOURCE_DIR}/erasure_code/ec_highlevel_func.c
+        ${ISAL_SOURCE_DIR}/erasure_code/gen_rs_matrix_limits.c
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_dot_prod_1tbl.c
+        ${ISAL_SOURCE_DIR}/igzip/adler32_base.c
+        ${ISAL_SOURCE_DIR}/igzip/encode_df.c
+        ${ISAL_SOURCE_DIR}/igzip/flatten_ll.c
+        ${ISAL_SOURCE_DIR}/igzip/generate_custom_hufftables.c
+        ${ISAL_SOURCE_DIR}/igzip/generate_static_inflate.c
+        ${ISAL_SOURCE_DIR}/igzip/huff_codes.c
+        ${ISAL_SOURCE_DIR}/igzip/hufftables_c.c
+        ${ISAL_SOURCE_DIR}/igzip/igzip_base_aliases.c
+        ${ISAL_SOURCE_DIR}/igzip/igzip_base.c
+        ${ISAL_SOURCE_DIR}/igzip/igzip_icf_base.c
+        ${ISAL_SOURCE_DIR}/igzip/igzip_icf_body.c
+        ${ISAL_SOURCE_DIR}/igzip/igzip_inflate.c
+        ${ISAL_SOURCE_DIR}/igzip/igzip.c
+        ${ISAL_SOURCE_DIR}/mem/mem_zero_detect_base_aliases.c
+        ${ISAL_SOURCE_DIR}/mem/mem_zero_detect_base.c
+        ${ISAL_SOURCE_DIR}/programs/igzip_cli.c
+        ${ISAL_SOURCE_DIR}/raid/raid_base_aliases.c
+        ${ISAL_SOURCE_DIR}/raid/raid_base.c
+)
+
+set(ISAL_ASM_SRC
+        ${ISAL_SOURCE_DIR}/crc/crc_multibinary.asm
+        ${ISAL_SOURCE_DIR}/crc/crc16_t10dif_01.asm
+        ${ISAL_SOURCE_DIR}/crc/crc16_t10dif_02.asm
+        ${ISAL_SOURCE_DIR}/crc/crc16_t10dif_by4.asm
+        ${ISAL_SOURCE_DIR}/crc/crc16_t10dif_by16_10.asm
+        ${ISAL_SOURCE_DIR}/crc/crc16_t10dif_copy_by4_02.asm
+        ${ISAL_SOURCE_DIR}/crc/crc16_t10dif_copy_by4.asm
+        ${ISAL_SOURCE_DIR}/crc/crc32_gzip_refl_by8_02.asm
+        ${ISAL_SOURCE_DIR}/crc/crc32_gzip_refl_by8.asm
+        ${ISAL_SOURCE_DIR}/crc/crc32_gzip_refl_by16_10.asm
+        ${ISAL_SOURCE_DIR}/crc/crc32_ieee_01.asm
+        ${ISAL_SOURCE_DIR}/crc/crc32_ieee_02.asm
+        ${ISAL_SOURCE_DIR}/crc/crc32_ieee_by4.asm
+        ${ISAL_SOURCE_DIR}/crc/crc32_ieee_by16_10.asm
+        ${ISAL_SOURCE_DIR}/crc/crc32_iscsi_00.asm
+        ${ISAL_SOURCE_DIR}/crc/crc32_iscsi_01.asm
+        ${ISAL_SOURCE_DIR}/crc/crc32_iscsi_by16_10.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_ecma_norm_by8.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_ecma_norm_by16_10.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_ecma_refl_by8.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_ecma_refl_by16_10.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_iso_norm_by8.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_iso_norm_by16_10.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_iso_refl_by8.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_iso_refl_by16_10.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_jones_norm_by8.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_jones_norm_by16_10.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_jones_refl_by8.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_jones_refl_by16_10.asm
+        ${ISAL_SOURCE_DIR}/crc/crc64_multibinary.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_2vect_dot_prod_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_2vect_dot_prod_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_2vect_dot_prod_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_2vect_dot_prod_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/ec_multibinary.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_2vect_mad_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_2vect_mad_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_2vect_mad_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_2vect_mad_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_3vect_dot_prod_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_3vect_dot_prod_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_3vect_dot_prod_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_3vect_dot_prod_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_3vect_mad_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_3vect_mad_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_3vect_mad_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_3vect_mad_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_4vect_dot_prod_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_4vect_dot_prod_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_4vect_dot_prod_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_4vect_dot_prod_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_4vect_mad_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_4vect_mad_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_4vect_mad_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_4vect_mad_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_5vect_dot_prod_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_5vect_dot_prod_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_5vect_dot_prod_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_5vect_dot_prod_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_5vect_mad_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_5vect_mad_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_5vect_mad_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_5vect_mad_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_6vect_dot_prod_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_6vect_dot_prod_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_6vect_dot_prod_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_6vect_dot_prod_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_6vect_mad_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_6vect_mad_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_6vect_mad_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_6vect_mad_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_dot_prod_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_dot_prod_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_dot_prod_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_dot_prod_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_mad_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_mad_avx2.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_mad_avx512.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_mad_sse.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_mul_avx.asm
+        ${ISAL_SOURCE_DIR}/erasure_code/gf_vect_mul_sse.asm
+        ${ISAL_SOURCE_DIR}/igzip/adler32_avx2_4.asm
+        ${ISAL_SOURCE_DIR}/igzip/adler32_sse.asm
+        ${ISAL_SOURCE_DIR}/igzip/bitbuf2.asm
+        ${ISAL_SOURCE_DIR}/igzip/encode_df_04.asm
+        ${ISAL_SOURCE_DIR}/igzip/encode_df_06.asm
+        ${ISAL_SOURCE_DIR}/igzip/heap_macros.asm
+        ${ISAL_SOURCE_DIR}/igzip/huffman.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_body.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_compare_types.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_decode_block_stateless_01.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_decode_block_stateless_04.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_deflate_hash.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_finish.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_gen_icf_map_lh1_04.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_gen_icf_map_lh1_06.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_icf_body_h1_gr_bt.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_icf_finish.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_inflate_multibinary.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_multibinary.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_set_long_icf_fg_04.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_set_long_icf_fg_06.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_update_histogram_01.asm
+        ${ISAL_SOURCE_DIR}/igzip/igzip_update_histogram_04.asm
+        ${ISAL_SOURCE_DIR}/igzip/lz0a_const.asm
+        ${ISAL_SOURCE_DIR}/igzip/options.asm
+        ${ISAL_SOURCE_DIR}/igzip/proc_heap.asm
+        ${ISAL_SOURCE_DIR}/igzip/rfc1951_lookup.asm
+        ${ISAL_SOURCE_DIR}/igzip/stdmac.asm
+        ${ISAL_SOURCE_DIR}/mem/mem_multibinary.asm
+        ${ISAL_SOURCE_DIR}/mem/mem_zero_detect_avx.asm
+        ${ISAL_SOURCE_DIR}/mem/mem_zero_detect_avx2.asm
+        ${ISAL_SOURCE_DIR}/mem/mem_zero_detect_avx512.asm
+        ${ISAL_SOURCE_DIR}/mem/mem_zero_detect_sse.asm
+        ${ISAL_SOURCE_DIR}/raid/pq_check_sse.asm
+        ${ISAL_SOURCE_DIR}/raid/pq_gen_avx.asm
+        ${ISAL_SOURCE_DIR}/raid/pq_gen_avx2.asm
+        ${ISAL_SOURCE_DIR}/raid/pq_gen_avx512.asm
+        ${ISAL_SOURCE_DIR}/raid/pq_gen_sse.asm
+        ${ISAL_SOURCE_DIR}/raid/raid_multibinary.asm
+        ${ISAL_SOURCE_DIR}/raid/xor_check_sse.asm
+        ${ISAL_SOURCE_DIR}/raid/xor_gen_avx.asm
+        ${ISAL_SOURCE_DIR}/raid/xor_gen_avx512.asm
+        ${ISAL_SOURCE_DIR}/raid/xor_gen_sse.asm
+)
+
+# Adding ISA-L library target
+add_library(_isal ${ISAL_C_SRC} ${ISAL_ASM_SRC})
+
+# Setting external and internal interfaces for ISA-L library
+target_include_directories(_isal
+        PUBLIC ${ISAL_SOURCE_DIR}/include
+        PUBLIC ${ISAL_SOURCE_DIR}/igzip
+        PUBLIC ${ISAL_SOURCE_DIR}/crc
+        PUBLIC ${ISAL_SOURCE_DIR}/erasure_code)
+
+# Here must remove "-fno-sanitize=undefined" from COMPILE_OPTIONS.
+# Otherwise nasm compiler would fail to proceed due to unrecognition of "-fno-sanitize=undefined"
+if (SANITIZE STREQUAL "undefined")
+    get_target_property(target_options _isal COMPILE_OPTIONS)
+    list(REMOVE_ITEM target_options "-fno-sanitize=undefined")
+    set_property(TARGET _isal PROPERTY COMPILE_OPTIONS ${target_options})
+endif()
+
+add_library(ch_contrib::isal ALIAS _isal)
diff --git a/contrib/krb5 b/contrib/krb5
index f8262a1b548..b56ce6ba690 160000
--- a/contrib/krb5
+++ b/contrib/krb5
@@ -1 +1 @@
-Subproject commit f8262a1b548eb29d97e059260042036255d07f8d
+Subproject commit b56ce6ba690e1f320df1a64afa34980c3e462617
diff --git a/contrib/krb5-cmake/CMakeLists.txt b/contrib/krb5-cmake/CMakeLists.txt
index ceaa270ad85..44058456ed4 100644
--- a/contrib/krb5-cmake/CMakeLists.txt
+++ b/contrib/krb5-cmake/CMakeLists.txt
@@ -15,10 +15,6 @@ if(NOT AWK_PROGRAM)
     message(FATAL_ERROR "You need the awk program to build ClickHouse with krb5 enabled.")
 endif()
 
-if (NOT (ENABLE_OPENSSL OR ENABLE_OPENSSL_DYNAMIC))
-    add_compile_definitions(USE_BORINGSSL=1)
-endif ()
-
 set(KRB5_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/krb5/src")
 set(KRB5_ET_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}/include_private")
 
@@ -160,6 +156,13 @@ set(ALL_SRCS
 
     # "${KRB5_SOURCE_DIR}/lib/gssapi/spnego/negoex_trace.c"
 
+    "${KRB5_SOURCE_DIR}/lib/crypto/builtin/kdf.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/builtin/cmac.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/builtin/des/des_keys.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/builtin/des/f_parity.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/builtin/enc_provider/rc4.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/builtin/hash_provider/hash_md4.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/builtin/md4/md4.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/prng.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_dk_cmac.c"
     # "${KRB5_SOURCE_DIR}/lib/crypto/krb/crc32.c"
@@ -183,7 +186,6 @@ set(ALL_SRCS
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/block_size.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/string_to_key.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/verify_checksum.c"
-    "${KRB5_SOURCE_DIR}/lib/crypto/krb/crypto_libinit.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/derive.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/random_to_key.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/verify_checksum_iov.c"
@@ -217,9 +219,7 @@ set(ALL_SRCS
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_rc4.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/valid_cksumtype.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/nfold.c"
-    "${KRB5_SOURCE_DIR}/lib/crypto/krb/prng_fortuna.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/encrypt_length.c"
-    "${KRB5_SOURCE_DIR}/lib/crypto/krb/cmac.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/keyblocks.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_rc4.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_pbkdf2.c"
@@ -227,12 +227,11 @@ set(ALL_SRCS
     # "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/rc4.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des3.c"
-    #"${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/camellia.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/cmac.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/openssl/sha256.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/openssl/hmac.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/kdf.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/openssl/pbkdf2.c"
-    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/init.c"
-    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/stubs.c"
     # "${KRB5_SOURCE_DIR}/lib/crypto/openssl/hash_provider/hash_crc32.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/openssl/hash_provider/hash_evp.c"
     "${KRB5_SOURCE_DIR}/lib/crypto/openssl/des/des_keys.c"
@@ -312,7 +311,6 @@ set(ALL_SRCS
     "${KRB5_SOURCE_DIR}/lib/krb5/krb/allow_weak.c"
     "${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_rep.c"
     "${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_priv.c"
-    "${KRB5_SOURCE_DIR}/lib/krb5/krb/s4u_authdata.c"
     "${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_otp.c"
     "${KRB5_SOURCE_DIR}/lib/krb5/krb/init_keyblock.c"
     "${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_addr.c"
@@ -476,6 +474,14 @@ set(ALL_SRCS
     "${KRB5_SOURCE_DIR}/lib/krb5/krb5_libinit.c"
 )
 
+if (NOT (ENABLE_OPENSSL OR ENABLE_OPENSSL_DYNAMIC))
+    add_compile_definitions(USE_BORINGSSL=1)
+else()
+    set(ALL_SRCS ${ALL_SRCS}
+        "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/camellia.c"
+    )
+endif()
+
 add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/compile_et"
     COMMAND /bin/sh
@@ -675,6 +681,7 @@ target_include_directories(_krb5 PRIVATE
     "${KRB5_SOURCE_DIR}/lib/gssapi/krb5"
     "${KRB5_SOURCE_DIR}/lib/gssapi/spnego"
     "${KRB5_SOURCE_DIR}/util/et"
+    "${KRB5_SOURCE_DIR}/lib/crypto/builtin/md4"
     "${KRB5_SOURCE_DIR}/lib/crypto/openssl"
     "${KRB5_SOURCE_DIR}/lib/crypto/krb"
     "${KRB5_SOURCE_DIR}/util/profile"
@@ -688,6 +695,7 @@ target_include_directories(_krb5 PRIVATE
 
 target_compile_definitions(_krb5 PRIVATE
     KRB5_PRIVATE
+    CRYPTO_OPENSSL
     _GSS_STATIC_LINK=1
     KRB5_DEPRECATED=1
     LOCALEDIR="/usr/local/share/locale"
diff --git a/contrib/libbcrypt b/contrib/libbcrypt
new file mode 160000
index 00000000000..8aa32ad94eb
--- /dev/null
+++ b/contrib/libbcrypt
@@ -0,0 +1 @@
+Subproject commit 8aa32ad94ebe06b76853b0767c910c9fbf7ccef4
diff --git a/contrib/libbcrypt-cmake/CMakeLists.txt b/contrib/libbcrypt-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..d40d7f9195e
--- /dev/null
+++ b/contrib/libbcrypt-cmake/CMakeLists.txt
@@ -0,0 +1,19 @@
+option(ENABLE_BCRYPT "Enable bcrypt" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_BCRYPT)
+    message(STATUS "Not using bcrypt")
+    return()
+endif()
+
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libbcrypt")
+
+set(SRCS 
+    "${LIBRARY_DIR}/bcrypt.c"
+    "${LIBRARY_DIR}/crypt_blowfish/crypt_blowfish.c"
+    "${LIBRARY_DIR}/crypt_blowfish/crypt_gensalt.c"
+    "${LIBRARY_DIR}/crypt_blowfish/wrapper.c"
+)
+
+add_library(_bcrypt ${SRCS})
+target_include_directories(_bcrypt SYSTEM PUBLIC "${LIBRARY_DIR}")
+add_library(ch_contrib::bcrypt ALIAS _bcrypt)
diff --git a/contrib/libcxx-cmake/CMakeLists.txt b/contrib/libcxx-cmake/CMakeLists.txt
index 21ed76f8b6f..a13e4f0f60a 100644
--- a/contrib/libcxx-cmake/CMakeLists.txt
+++ b/contrib/libcxx-cmake/CMakeLists.txt
@@ -69,11 +69,6 @@ if (USE_MUSL)
     target_compile_definitions(cxx PUBLIC -D_LIBCPP_HAS_MUSL_LIBC=1)
 endif ()
 
-# Override the deduced attribute support that causes error.
-if (OS_DARWIN AND COMPILER_GCC)
-    add_compile_definitions(_LIBCPP_INIT_PRIORITY_MAX)
-endif ()
-
 target_compile_options(cxx PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-nostdinc++>)
 
 # Third party library may have substandard code.
@@ -84,11 +79,6 @@ target_compile_definitions(cxx PUBLIC -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS
 
 target_link_libraries(cxx PUBLIC cxxabi)
 
-# For __udivmodti4, __divmodti4.
-if (OS_DARWIN AND COMPILER_GCC)
-    target_link_libraries(cxx PRIVATE gcc)
-endif ()
-
 install(
     TARGETS cxx
     EXPORT global
diff --git a/contrib/libfarmhash/CMakeLists.txt b/contrib/libfarmhash/CMakeLists.txt
index a0533a93f17..436bc3d0108 100644
--- a/contrib/libfarmhash/CMakeLists.txt
+++ b/contrib/libfarmhash/CMakeLists.txt
@@ -6,6 +6,10 @@ if (MSVC)
     target_compile_definitions (_farmhash PRIVATE FARMHASH_NO_BUILTIN_EXPECT=1)
 endif ()
 
+if (ARCH_S390X)
+    add_compile_definitions(WORDS_BIGENDIAN)
+endif ()
+
 target_include_directories (_farmhash BEFORE PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_library(ch_contrib::farmhash ALIAS _farmhash)
diff --git a/contrib/libfiu b/contrib/libfiu
new file mode 160000
index 00000000000..b85edbde4cf
--- /dev/null
+++ b/contrib/libfiu
@@ -0,0 +1 @@
+Subproject commit b85edbde4cf974b1b40d27828a56f0505f4e2ee5
diff --git a/contrib/libfiu-cmake/CMakeLists.txt b/contrib/libfiu-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..e805491edbb
--- /dev/null
+++ b/contrib/libfiu-cmake/CMakeLists.txt
@@ -0,0 +1,20 @@
+if (NOT ENABLE_FIU)
+  message (STATUS "Not using fiu")
+  return ()
+endif ()
+
+set(FIU_DIR "${ClickHouse_SOURCE_DIR}/contrib/libfiu/")
+
+set(FIU_SOURCES
+  ${FIU_DIR}/libfiu/fiu.c
+  ${FIU_DIR}/libfiu/fiu-rc.c
+  ${FIU_DIR}/libfiu/backtrace.c
+  ${FIU_DIR}/libfiu/wtable.c
+)
+
+set(FIU_HEADERS "${FIU_DIR}/libfiu")
+
+add_library(_fiu ${FIU_SOURCES})
+target_compile_definitions(_fiu PUBLIC DUMMY_BACKTRACE)
+target_include_directories(_fiu PUBLIC ${FIU_HEADERS})
+add_library(ch_contrib::fiu ALIAS _fiu)
diff --git a/contrib/libhdfs3 b/contrib/libhdfs3
index 9ee3ce77215..164b89253fa 160000
--- a/contrib/libhdfs3
+++ b/contrib/libhdfs3
@@ -1 +1 @@
-Subproject commit 9ee3ce77215fca83b7fdfcfe2186a3db0d0bdb74
+Subproject commit 164b89253fad7991bce77882f01b51ab81d19f3d
diff --git a/contrib/libhdfs3-cmake/CMake/CMakeTestCompileStrerror.c b/contrib/libhdfs3-cmake/CMake/CMakeTestCompileStrerror.c
deleted file mode 100644
index 0ef4eda583e..00000000000
--- a/contrib/libhdfs3-cmake/CMake/CMakeTestCompileStrerror.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <string.h>
-
-int main()
-{
-    // We can't test "char *p = strerror_r()" because that only causes a
-    // compiler warning when strerror_r returns an integer.
-    char *buf = 0;
-    int i = strerror_r(0, buf, 100);
-    return i;
-}
diff --git a/contrib/libhdfs3-cmake/CMake/Functions.cmake b/contrib/libhdfs3-cmake/CMake/Functions.cmake
deleted file mode 100644
index a771b6043fb..00000000000
--- a/contrib/libhdfs3-cmake/CMake/Functions.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-FUNCTION(AUTO_SOURCES RETURN_VALUE PATTERN SOURCE_SUBDIRS)
-
-	IF ("${SOURCE_SUBDIRS}" STREQUAL "RECURSE")
-		SET(PATH ".")
-		IF (${ARGC} EQUAL 4)
-			LIST(GET ARGV 3 PATH)
-		ENDIF ()
-	ENDIF()
-
-	IF ("${SOURCE_SUBDIRS}" STREQUAL "RECURSE")
-		UNSET(${RETURN_VALUE})
-		FILE(GLOB SUBDIR_FILES "${PATH}/${PATTERN}")
-		LIST(APPEND ${RETURN_VALUE} ${SUBDIR_FILES})
-
-		FILE(GLOB SUBDIRS RELATIVE ${PATH} ${PATH}/*)
-
-		FOREACH(DIR ${SUBDIRS})
-			IF (IS_DIRECTORY ${PATH}/${DIR})
-				IF (NOT "${DIR}" STREQUAL "CMAKEFILES")
-					FILE(GLOB_RECURSE SUBDIR_FILES "${PATH}/${DIR}/${PATTERN}")
-					LIST(APPEND ${RETURN_VALUE} ${SUBDIR_FILES})
-				ENDIF()
-			ENDIF()
-		ENDFOREACH()
-	ELSE ()
-		FILE(GLOB ${RETURN_VALUE} "${PATTERN}")
-
-		FOREACH (PATH ${SOURCE_SUBDIRS})
-			FILE(GLOB SUBDIR_FILES "${PATH}/${PATTERN}")
-			LIST(APPEND ${RETURN_VALUE} ${SUBDIR_FILES})
-		ENDFOREACH(PATH ${SOURCE_SUBDIRS})
-	ENDIF ()
-
-	IF (${FILTER_OUT})
-		LIST(REMOVE_ITEM ${RETURN_VALUE} ${FILTER_OUT})
-	ENDIF()
-
-	SET(${RETURN_VALUE} ${${RETURN_VALUE}} PARENT_SCOPE)
-ENDFUNCTION(AUTO_SOURCES)
-
-FUNCTION(CONTAINS_STRING FILE SEARCH RETURN_VALUE)
-	FILE(STRINGS ${FILE} FILE_CONTENTS REGEX ".*${SEARCH}.*")
-	IF (FILE_CONTENTS)
-		SET(${RETURN_VALUE} TRUE PARENT_SCOPE)
-	ENDIF()
-ENDFUNCTION(CONTAINS_STRING)
diff --git a/contrib/libhdfs3-cmake/CMake/Options.cmake b/contrib/libhdfs3-cmake/CMake/Options.cmake
deleted file mode 100644
index 933b24fb9b5..00000000000
--- a/contrib/libhdfs3-cmake/CMake/Options.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-OPTION(ENABLE_SSE "enable SSE4.2 builtin function" ON)
-
-INCLUDE (CheckFunctionExists)
-CHECK_FUNCTION_EXISTS(dladdr HAVE_DLADDR)
-CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP)
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing")
-
-IF(ENABLE_SSE STREQUAL ON AND ARCH_AMD64)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
-ENDIF()
-
-IF(NOT TEST_HDFS_PREFIX)
-SET(TEST_HDFS_PREFIX "./" CACHE STRING "default directory prefix used for test." FORCE)
-ENDIF(NOT TEST_HDFS_PREFIX)
-
-ADD_DEFINITIONS(-DTEST_HDFS_PREFIX="${TEST_HDFS_PREFIX}")
-ADD_DEFINITIONS(-D__STDC_FORMAT_MACROS)
-ADD_DEFINITIONS(-D_GNU_SOURCE)
-ADD_DEFINITIONS(-D_GLIBCXX_USE_NANOSLEEP)
-
-TRY_COMPILE(STRERROR_R_RETURN_INT
-    ${CMAKE_CURRENT_BINARY_DIR}
-    "${CMAKE_CURRENT_SOURCE_DIR}/CMake/CMakeTestCompileStrerror.c"
-    CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'"
-    OUTPUT_VARIABLE OUTPUT)
-
-MESSAGE(STATUS "Checking whether strerror_r returns an int")
-
-IF(STRERROR_R_RETURN_INT)
-    MESSAGE(STATUS "Checking whether strerror_r returns an int -- yes")
-ELSE(STRERROR_R_RETURN_INT)
-    MESSAGE(STATUS "Checking whether strerror_r returns an int -- no")
-ENDIF(STRERROR_R_RETURN_INT)
-
-set(HAVE_STEADY_CLOCK 1)
-set(HAVE_NESTED_EXCEPTION 1)
-
-SET(HAVE_BOOST_CHRONO 0)
-SET(HAVE_BOOST_ATOMIC 0)
-
-SET(HAVE_STD_CHRONO 1)
-SET(HAVE_STD_ATOMIC 1)
diff --git a/contrib/libhdfs3-cmake/CMake/Platform.cmake b/contrib/libhdfs3-cmake/CMake/Platform.cmake
deleted file mode 100644
index fec1d974519..00000000000
--- a/contrib/libhdfs3-cmake/CMake/Platform.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    SET(OS_LINUX true CACHE INTERNAL "Linux operating system")
-ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    SET(OS_MACOSX true CACHE INTERNAL "Mac Darwin operating system")
-ELSE(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    MESSAGE(FATAL_ERROR "Unsupported OS: \"${CMAKE_SYSTEM_NAME}\"")
-ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-    EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpfullversion OUTPUT_VARIABLE GCC_COMPILER_VERSION)
-    
-    IF (NOT GCC_COMPILER_VERSION)
-        EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_COMPILER_VERSION)
-
-        IF (NOT GCC_COMPILER_VERSION)
-            MESSAGE(FATAL_ERROR "Cannot get gcc version")
-        ENDIF (NOT GCC_COMPILER_VERSION)
-    ENDIF (NOT GCC_COMPILER_VERSION)
-    
-    STRING(REGEX MATCHALL "[0-9]+" GCC_COMPILER_VERSION ${GCC_COMPILER_VERSION})
-    
-    LIST(LENGTH GCC_COMPILER_VERSION GCC_COMPILER_VERSION_LENGTH)
-    LIST(GET GCC_COMPILER_VERSION 0 GCC_COMPILER_VERSION_MAJOR)
-    if (GCC_COMPILER_VERSION_LENGTH GREATER 1)
-        LIST(GET GCC_COMPILER_VERSION 1 GCC_COMPILER_VERSION_MINOR)
-    else ()
-        set (GCC_COMPILER_VERSION_MINOR 0)
-    endif ()
-
-    SET(GCC_COMPILER_VERSION_MAJOR ${GCC_COMPILER_VERSION_MAJOR} CACHE INTERNAL "gcc major version")
-    SET(GCC_COMPILER_VERSION_MINOR ${GCC_COMPILER_VERSION_MINOR} CACHE INTERNAL "gcc minor version")
-    
-    MESSAGE(STATUS "checking compiler: GCC (${GCC_COMPILER_VERSION_MAJOR}.${GCC_COMPILER_VERSION_MINOR}.${GCC_COMPILER_VERSION_PATCH})")
-ELSE(CMAKE_COMPILER_IS_GNUCXX)
-    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} --version  OUTPUT_VARIABLE COMPILER_OUTPUT)
-    IF(COMPILER_OUTPUT MATCHES "clang")
-        SET(CMAKE_COMPILER_IS_CLANG true CACHE INTERNAL "using clang as compiler")
-        MESSAGE(STATUS "checking compiler: CLANG")
-    ELSE(COMPILER_OUTPUT MATCHES "clang")
-        MESSAGE(FATAL_ERROR "Unsupported compiler: \"${CMAKE_CXX_COMPILER}\"")
-    ENDIF(COMPILER_OUTPUT MATCHES "clang")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/contrib/libhdfs3-cmake/CMakeLists.txt b/contrib/libhdfs3-cmake/CMakeLists.txt
index c22cac731fe..e2f122e282a 100644
--- a/contrib/libhdfs3-cmake/CMakeLists.txt
+++ b/contrib/libhdfs3-cmake/CMakeLists.txt
@@ -21,10 +21,17 @@ set(HDFS3_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3")
 set(HDFS3_SOURCE_DIR "${HDFS3_ROOT_DIR}/src")
 set(HDFS3_COMMON_DIR "${HDFS3_SOURCE_DIR}/common")
 
-# module
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
-include(Platform)
-include(Options)
+ADD_DEFINITIONS(-DTEST_HDFS_PREFIX="${TEST_HDFS_PREFIX}")
+ADD_DEFINITIONS(-D__STDC_FORMAT_MACROS)
+ADD_DEFINITIONS(-D_GNU_SOURCE)
+ADD_DEFINITIONS(-D_GLIBCXX_USE_NANOSLEEP)
+ADD_DEFINITIONS(-DHAVE_NANOSLEEP)
+set(HAVE_STEADY_CLOCK 1)
+set(HAVE_NESTED_EXCEPTION 1)
+SET(HAVE_BOOST_CHRONO 0)
+SET(HAVE_BOOST_ATOMIC 0)
+SET(HAVE_STD_CHRONO 1)
+SET(HAVE_STD_ATOMIC 1)
 
 # source
 set(PROTO_FILES
@@ -70,6 +77,30 @@ set(SRCS
     "${HDFS3_SOURCE_DIR}/client/Token.cpp"
     "${HDFS3_SOURCE_DIR}/client/PacketPool.cpp"
     "${HDFS3_SOURCE_DIR}/client/OutputStream.cpp"
+    "${HDFS3_SOURCE_DIR}/client/AbstractNativeRawDecoder.cpp"
+    "${HDFS3_SOURCE_DIR}/client/AbstractNativeRawEncoder.cpp"
+    "${HDFS3_SOURCE_DIR}/client/ByteBufferDecodingState.cpp"
+    "${HDFS3_SOURCE_DIR}/client/ByteBufferEncodingState.cpp"
+    "${HDFS3_SOURCE_DIR}/client/CoderUtil.cpp"
+    "${HDFS3_SOURCE_DIR}/client/ECChunk.cpp"
+    "${HDFS3_SOURCE_DIR}/client/ErasureCoderOptions.cpp"
+    "${HDFS3_SOURCE_DIR}/client/GF256.cpp"
+    "${HDFS3_SOURCE_DIR}/client/GaloisField.cpp"
+    "${HDFS3_SOURCE_DIR}/client/NativeRSRawDecoder.cpp"
+    "${HDFS3_SOURCE_DIR}/client/NativeRSRawEncoder.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Preconditions.cpp"
+    "${HDFS3_SOURCE_DIR}/client/RSUtil.cpp"
+    "${HDFS3_SOURCE_DIR}/client/RawErasureCoderFactory.cpp"
+    "${HDFS3_SOURCE_DIR}/client/RawErasureDecoder.cpp"
+    "${HDFS3_SOURCE_DIR}/client/RawErasureEncoder.cpp"
+    "${HDFS3_SOURCE_DIR}/client/StatefulStripeReader.cpp"
+    "${HDFS3_SOURCE_DIR}/client/StripeReader.cpp"
+    "${HDFS3_SOURCE_DIR}/client/StripedBlockUtil.cpp"
+    "${HDFS3_SOURCE_DIR}/client/StripedInputStreamImpl.cpp"
+    "${HDFS3_SOURCE_DIR}/client/StripedOutputStreamImpl.cpp"
+    "${HDFS3_SOURCE_DIR}/client/SystemECPolicies.cpp"
+    "${HDFS3_SOURCE_DIR}/client/dump.cpp"
+    "${HDFS3_SOURCE_DIR}/client/erasure_coder.cpp"
     "${HDFS3_SOURCE_DIR}/rpc/RpcChannelKey.cpp"
     "${HDFS3_SOURCE_DIR}/rpc/RpcProtocolInfo.cpp"
     "${HDFS3_SOURCE_DIR}/rpc/RpcClient.cpp"
@@ -148,6 +179,11 @@ if (TARGET OpenSSL::SSL)
     target_link_libraries(_hdfs3 PRIVATE OpenSSL::Crypto OpenSSL::SSL)
 endif()
 
+if (TARGET ch_contrib::isal)
+    target_link_libraries(_hdfs3 PRIVATE ch_contrib::isal)
+    add_definitions(-DHADOOP_ISAL_LIBRARY)
+endif()
+
 add_library(ch_contrib::hdfs ALIAS _hdfs3)
 
 if (ENABLE_CLICKHOUSE_BENCHMARK)
diff --git a/contrib/libpqxx b/contrib/libpqxx
index a4e83483927..bdd6540fb95 160000
--- a/contrib/libpqxx
+++ b/contrib/libpqxx
@@ -1 +1 @@
-Subproject commit a4e834839270a8c1f7ff1db351ba85afced3f0e2
+Subproject commit bdd6540fb95ff56c813691ceb5da5a3266cf235d
diff --git a/contrib/libuv-cmake/CMakeLists.txt b/contrib/libuv-cmake/CMakeLists.txt
index 7ca2cef2251..928fdcdd7e6 100644
--- a/contrib/libuv-cmake/CMakeLists.txt
+++ b/contrib/libuv-cmake/CMakeLists.txt
@@ -1,13 +1,7 @@
-# once fixed, please remove similar places in CMakeLists of libuv users (search "ch_contrib::uv")
-if (OS_DARWIN AND COMPILER_GCC)
-    message (WARNING "libuv cannot be built with GCC in macOS due to a bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082")
-    return()
-endif()
-
 # This file is a modified version of contrib/libuv/CMakeLists.txt
 
-set (SOURCE_DIR "${CMAKE_SOURCE_DIR}/contrib/libuv")
-set (BINARY_DIR "${CMAKE_BINARY_DIR}/contrib/libuv")
+set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/contrib/libuv")
+set (BINARY_DIR "${PROJECT_BINARY_DIR}/contrib/libuv")
 
 set(uv_sources
     src/fs-poll.c
diff --git a/contrib/llvm-project b/contrib/llvm-project
index a8bf69e9cd3..d857c707fcc 160000
--- a/contrib/llvm-project
+++ b/contrib/llvm-project
@@ -1 +1 @@
-Subproject commit a8bf69e9cd39a23140a2b633c172d201484172da
+Subproject commit d857c707fccd50423bea1c4710dc469cf89607a9
diff --git a/contrib/mariadb-connector-c-cmake/CMakeLists.txt b/contrib/mariadb-connector-c-cmake/CMakeLists.txt
index 50287c54ac1..18d1510a57b 100644
--- a/contrib/mariadb-connector-c-cmake/CMakeLists.txt
+++ b/contrib/mariadb-connector-c-cmake/CMakeLists.txt
@@ -15,7 +15,7 @@ endif()
 
 # This is the LGPL libmariadb project.
 
-set(CC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/contrib/mariadb-connector-c)
+set(CC_SOURCE_DIR ${PROJECT_SOURCE_DIR}/contrib/mariadb-connector-c)
 set(CC_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 set(WITH_SSL ON)
diff --git a/contrib/murmurhash/src/MurmurHash2.cpp b/contrib/murmurhash/src/MurmurHash2.cpp
index 1c4469b0a02..0bd0a352dc4 100644
--- a/contrib/murmurhash/src/MurmurHash2.cpp
+++ b/contrib/murmurhash/src/MurmurHash2.cpp
@@ -31,6 +31,40 @@
 #define BIG_CONSTANT(x) (x##LLU)
 
 #endif // !defined(_MSC_VER)
+//
+//-----------------------------------------------------------------------------
+// Block read - on little-endian machines this is a single load,
+// while on big-endian or unknown machines the byte accesses should
+// still get optimized into the most efficient instruction.
+static inline uint32_t getblock ( const uint32_t * p )
+{
+#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+  return *p;
+#else
+  const uint8_t *c = (const uint8_t *)p;
+  return (uint32_t)c[0] |
+	 (uint32_t)c[1] <<  8 |
+	 (uint32_t)c[2] << 16 |
+	 (uint32_t)c[3] << 24;
+#endif
+}
+
+static inline uint64_t getblock ( const uint64_t * p )
+{
+#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+  return *p;
+#else
+  const uint8_t *c = (const uint8_t *)p;
+  return (uint64_t)c[0] |
+	 (uint64_t)c[1] <<  8 |
+	 (uint64_t)c[2] << 16 |
+	 (uint64_t)c[3] << 24 |
+	 (uint64_t)c[4] << 32 |
+	 (uint64_t)c[5] << 40 |
+	 (uint64_t)c[6] << 48 |
+	 (uint64_t)c[7] << 56;
+#endif
+}
 
 //-----------------------------------------------------------------------------
 
@@ -52,7 +86,7 @@ uint32_t MurmurHash2 ( const void * key, size_t len, uint32_t seed )
 
   while(len >= 4)
   {
-    uint32_t k = *(uint32_t*)data;
+    uint32_t k = getblock((const uint32_t *)data);
 
     k *= m;
     k ^= k >> r;
@@ -105,7 +139,7 @@ uint64_t MurmurHash64A ( const void * key, size_t len, uint64_t seed )
 
   while(data != end)
   {
-    uint64_t k = *data++;
+    uint64_t k = getblock(data++);
 
     k *= m; 
     k ^= k >> r; 
@@ -151,12 +185,12 @@ uint64_t MurmurHash64B ( const void * key, size_t len, uint64_t seed )
 
   while(len >= 8)
   {
-    uint32_t k1 = *data++;
+    uint32_t k1 = getblock(data++);
     k1 *= m; k1 ^= k1 >> r; k1 *= m;
     h1 *= m; h1 ^= k1;
     len -= 4;
 
-    uint32_t k2 = *data++;
+    uint32_t k2 = getblock(data++);
     k2 *= m; k2 ^= k2 >> r; k2 *= m;
     h2 *= m; h2 ^= k2;
     len -= 4;
@@ -164,7 +198,7 @@ uint64_t MurmurHash64B ( const void * key, size_t len, uint64_t seed )
 
   if(len >= 4)
   {
-    uint32_t k1 = *data++;
+    uint32_t k1 = getblock(data++);
     k1 *= m; k1 ^= k1 >> r; k1 *= m;
     h1 *= m; h1 ^= k1;
     len -= 4;
@@ -215,7 +249,7 @@ uint32_t MurmurHash2A ( const void * key, size_t len, uint32_t seed )
 
   while(len >= 4)
   {
-    uint32_t k = *(uint32_t*)data;
+    uint32_t k = getblock((const uint32_t *)data);
 
     mmix(h,k);
 
@@ -278,7 +312,7 @@ public:
 
     while(len >= 4)
     {
-      uint32_t k = *(uint32_t*)data;
+      uint32_t k = getblock((const uint32_t *)data);
 
       mmix(m_hash,k);
 
@@ -427,7 +461,7 @@ uint32_t MurmurHashAligned2 ( const void * key, size_t len, uint32_t seed )
 
     while(len >= 4)
     {
-      d = *(uint32_t *)data;
+      d = getblock((const uint32_t *)data);
       t = (t >> sr) | (d << sl);
 
       uint32_t k = t;
@@ -492,7 +526,7 @@ uint32_t MurmurHashAligned2 ( const void * key, size_t len, uint32_t seed )
   {
     while(len >= 4)
     {
-      uint32_t k = *(uint32_t *)data;
+      uint32_t k = getblock((const uint32_t *)data);
 
       MIX(h,k,m);
 
diff --git a/contrib/murmurhash/src/MurmurHash3.cpp b/contrib/murmurhash/src/MurmurHash3.cpp
index cf5158e97ad..6573c470be3 100644
--- a/contrib/murmurhash/src/MurmurHash3.cpp
+++ b/contrib/murmurhash/src/MurmurHash3.cpp
@@ -55,14 +55,32 @@ inline uint64_t rotl64 ( uint64_t x, int8_t r )
 
 FORCE_INLINE uint32_t getblock32 ( const uint32_t * p, int i )
 {
-  uint32_t res;
-  memcpy(&res, p + i, sizeof(res));
-  return res;
+#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+  return p[i];
+#else
+  const uint8_t *c = (const uint8_t *)&p[i];
+  return (uint32_t)c[0] |
+	 (uint32_t)c[1] <<  8 |
+	 (uint32_t)c[2] << 16 |
+	 (uint32_t)c[3] << 24;
+#endif
 }
 
 FORCE_INLINE uint64_t getblock64 ( const uint64_t * p, int i )
 {
+#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
   return p[i];
+#else
+  const uint8_t *c = (const uint8_t *)&p[i];
+  return (uint64_t)c[0] |
+	 (uint64_t)c[1] <<  8 |
+	 (uint64_t)c[2] << 16 |
+	 (uint64_t)c[3] << 24 |
+	 (uint64_t)c[4] << 32 |
+	 (uint64_t)c[5] << 40 |
+	 (uint64_t)c[6] << 48 |
+	 (uint64_t)c[7] << 56;
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -329,9 +347,13 @@ void MurmurHash3_x64_128 ( const void * key, const size_t len,
 
   h1 += h2;
   h2 += h1;
-
+#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
   ((uint64_t*)out)[0] = h1;
   ((uint64_t*)out)[1] = h2;
+#else
+  ((uint64_t*)out)[0] = h2;
+  ((uint64_t*)out)[1] = h1;
+#endif
 }
 
 //-----------------------------------------------------------------------------
diff --git a/contrib/orc b/contrib/orc
index f9a393ed243..c5d7755ba0b 160000
--- a/contrib/orc
+++ b/contrib/orc
@@ -1 +1 @@
-Subproject commit f9a393ed2433a60034795284f82d093b348f2102
+Subproject commit c5d7755ba0b9a95631c8daea4d094101f26ec761
diff --git a/contrib/qpl b/contrib/qpl
index d75a29d95d8..3f8f5cea277 160000
--- a/contrib/qpl
+++ b/contrib/qpl
@@ -1 +1 @@
-Subproject commit d75a29d95d8a548297fce3549d21020005364dc8
+Subproject commit 3f8f5cea27739f5261e8fd577dc233ffe88bf679
diff --git a/contrib/qpl-cmake/CMakeLists.txt b/contrib/qpl-cmake/CMakeLists.txt
index fc5548b0652..4e6c66fe731 100644
--- a/contrib/qpl-cmake/CMakeLists.txt
+++ b/contrib/qpl-cmake/CMakeLists.txt
@@ -1,36 +1,5 @@
 ## The Intel® QPL provides high performance implementations of data processing functions for existing hardware accelerator, and/or software path in case if hardware accelerator is not available.
-if (OS_LINUX AND ARCH_AMD64 AND (ENABLE_AVX2 OR ENABLE_AVX512))
-    option (ENABLE_QPL "Enable Intel® Query Processing Library" ${ENABLE_LIBRARIES})
-elseif(ENABLE_QPL)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "QPL library is only supported on x86_64 arch with avx2/avx512 support")
-endif()
-
-if (NOT ENABLE_QPL)
-    message(STATUS "Not using QPL")
-    return()
-endif()
-
-## QPL has build dependency on libaccel-config. Here is to build libaccel-config which is required by QPL.
-## libaccel-config is the utility library for controlling and configuring Intel® In-Memory Analytics Accelerator (Intel® IAA).
-set (LIBACCEL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/idxd-config")
 set (UUID_DIR "${ClickHouse_SOURCE_DIR}/contrib/qpl-cmake")
-set (LIBACCEL_HEADER_DIR "${ClickHouse_SOURCE_DIR}/contrib/qpl-cmake/idxd-header")
-set (SRCS
-    "${LIBACCEL_SOURCE_DIR}/accfg/lib/libaccfg.c"
-    "${LIBACCEL_SOURCE_DIR}/util/log.c"
-    "${LIBACCEL_SOURCE_DIR}/util/sysfs.c"
-)
-
-add_library(accel-config ${SRCS})
-
-target_compile_options(accel-config PRIVATE "-D_GNU_SOURCE")
-
-target_include_directories(accel-config BEFORE
-    PRIVATE ${UUID_DIR}
-    PRIVATE ${LIBACCEL_HEADER_DIR}
-    PRIVATE ${LIBACCEL_SOURCE_DIR})
-
-## QPL build start here.
 set (QPL_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/qpl")
 set (QPL_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/qpl/sources")
 set (QPL_BINARY_DIR "${ClickHouse_BINARY_DIR}/build/contrib/qpl")
@@ -40,9 +9,10 @@ set (LOG_HW_INIT OFF)
 set (SANITIZE_MEMORY OFF)
 set (SANITIZE_THREADS OFF)
 set (LIB_FUZZING_ENGINE OFF)
+set (DYNAMIC_LOADING_LIBACCEL_CONFIG OFF)
 
 function(GetLibraryVersion _content _outputVar)
-    string(REGEX MATCHALL "Qpl VERSION (.+) LANGUAGES" VERSION_REGEX "${_content}")
+    string(REGEX MATCHALL "QPL VERSION (.+) LANGUAGES" VERSION_REGEX "${_content}")
     SET(${_outputVar} ${CMAKE_MATCH_1} PARENT_SCOPE)
 endfunction()
 
@@ -52,8 +22,11 @@ GetLibraryVersion("${HEADER_CONTENT}" QPL_VERSION)
 message(STATUS "Intel QPL version: ${QPL_VERSION}")
 
 # There are 5 source subdirectories under $QPL_SRC_DIR: isal, c_api, core-sw, middle-layer, c_api.
-# Generate 7 library targets: middle_layer_lib, isal, isal_asm, qplcore_px, qplcore_avx512, core_iaa, middle_layer_lib.
-# Output ch_contrib::qpl by linking with 7 library targets.
+# Generate 8 library targets: middle_layer_lib, isal, isal_asm, qplcore_px, qplcore_avx512, qplcore_sw_dispatcher, core_iaa, middle_layer_lib.
+# Output ch_contrib::qpl by linking with 8 library targets.
+
+# The qpl submodule comes with its own version of isal. It contains code which does not exist in upstream isal. It would be nice to link
+# only upstream isal (ch_contrib::isal) but at this point we can't.
 
 include("${QPL_PROJECT_DIR}/cmake/CompileOptions.cmake")
 
@@ -118,31 +91,36 @@ set(ISAL_ASM_SRC ${QPL_SRC_DIR}/isal/igzip/igzip_body.asm
 add_library(isal OBJECT ${ISAL_C_SRC})
 add_library(isal_asm OBJECT ${ISAL_ASM_SRC})
 
+set_property(GLOBAL APPEND PROPERTY QPL_LIB_DEPS
+             $<TARGET_OBJECTS:isal>)
+
+set_property(GLOBAL APPEND PROPERTY QPL_LIB_DEPS
+             $<TARGET_OBJECTS:isal_asm>)
+
 # Setting external and internal interfaces for ISA-L library
 target_include_directories(isal
-                           PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/isal/include>
-                           PRIVATE ${QPL_SRC_DIR}/isal/include
-                           PUBLIC ${QPL_SRC_DIR}/isal/igzip)
+                        PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/isal/include>
+                        PRIVATE ${QPL_SRC_DIR}/isal/include
+                        PUBLIC ${QPL_SRC_DIR}/isal/igzip)
+
+set_target_properties(isal PROPERTIES
+                        CXX_STANDARD 11
+                        C_STANDARD 99)
 
 target_compile_options(isal PRIVATE
                        "$<$<C_COMPILER_ID:GNU>:${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS}>"
                        "$<$<CONFIG:Debug>:>"
                        "$<$<CONFIG:Release>:>")
 
+# AS_FEATURE_LEVEL=10 means "Check SIMD capabilities of the target system at runtime and use up to AVX512 if available".
+# HAVE_KNOWS_AVX512 means rely on AVX512 being available on the target system.
 target_compile_options(isal_asm PRIVATE "-I${QPL_SRC_DIR}/isal/include/"
                        PRIVATE "-I${QPL_SRC_DIR}/isal/igzip/"
                        PRIVATE "-I${QPL_SRC_DIR}/isal/crc/"
+                       PRIVATE "-DHAVE_AS_KNOWS_AVX512"
+                       PRIVATE "-DAS_FEATURE_LEVEL=10"
                        PRIVATE "-DQPL_LIB")
 
-# AS_FEATURE_LEVEL=10 means "Check SIMD capabilities of the target system at runtime and use up to AVX512 if available".
-# AS_FEATURE_LEVEL=5 means "Check SIMD capabilities of the target system at runtime and use up to AVX2 if available".
-# HAVE_KNOWS_AVX512 means rely on AVX512 being available on the target system.
-if (ENABLE_AVX512)
-    target_compile_options(isal_asm PRIVATE "-DHAVE_AS_KNOWS_AVX512" "-DAS_FEATURE_LEVEL=10")
-else()
-    target_compile_options(isal_asm PRIVATE "-DAS_FEATURE_LEVEL=5")
-endif()
-
 # Here must remove "-fno-sanitize=undefined" from COMPILE_OPTIONS.
 # Otherwise nasm compiler would fail to proceed due to unrecognition of "-fno-sanitize=undefined"
 if (SANITIZE STREQUAL "undefined")
@@ -156,74 +134,97 @@ target_compile_definitions(isal PUBLIC
                            NDEBUG)
 
 # [SUBDIR]core-sw
-# Two libraries:qplcore_avx512/qplcore_px for SW fallback will be created which are implemented by AVX512 and non-AVX512 instructions respectively.
+# Create set of libraries corresponding to supported platforms for SW fallback which are implemented by AVX512 and non-AVX512 instructions respectively.
 # The upper level QPL API will check SIMD capabilities of the target system at runtime and decide to call AVX512 function or non-AVX512 function.
-# Hence, here we don't need put qplcore_avx512 under an ENABLE_AVX512 CMake switch. 
-# Actually, if we do that, some undefined symbols errors would happen because both of AVX512 function and non-AVX512 function are referenced by QPL API.
-# PLATFORM=2 means AVX512 implementation; PLATFORM=0 means non-AVX512 implementation.
+# Hence, here we don't need put ENABLE_AVX512 CMake switch.
 
-# Find Core Sources
-file(GLOB SOURCES
-     ${QPL_SRC_DIR}/core-sw/src/checksums/*.c
-     ${QPL_SRC_DIR}/core-sw/src/filtering/*.c
-     ${QPL_SRC_DIR}/core-sw/src/other/*.c
-     ${QPL_SRC_DIR}/core-sw/src/compression/*.c)
+get_list_of_supported_optimizations(PLATFORMS_LIST)
 
-file(GLOB DATA_SOURCES
-     ${QPL_SRC_DIR}/core-sw/src/data/*.c)
+foreach(PLATFORM_ID IN LISTS PLATFORMS_LIST)
+    # Find Core Sources
+    file(GLOB SOURCES
+        ${QPL_SRC_DIR}/core-sw/src/checksums/*.c
+        ${QPL_SRC_DIR}/core-sw/src/filtering/*.c
+        ${QPL_SRC_DIR}/core-sw/src/other/*.c
+        ${QPL_SRC_DIR}/core-sw/src/compression/*.c)
 
-# Create avx512 library
-add_library(qplcore_avx512 OBJECT ${SOURCES})
+    file(GLOB DATA_SOURCES
+        ${QPL_SRC_DIR}/core-sw/src/data/*.c)
 
-target_compile_definitions(qplcore_avx512 PRIVATE PLATFORM=2)
+    # Create library
+    add_library(qplcore_${PLATFORM_ID} OBJECT ${SOURCES})
 
-target_include_directories(qplcore_avx512
-                           PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/include>
-                           PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/src/include>
-                           PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/src/compression/include>
-                           PRIVATE $<TARGET_PROPERTY:isal,INTERFACE_INCLUDE_DIRECTORIES>)
+    set_property(GLOBAL APPEND PROPERTY QPL_LIB_DEPS
+                $<TARGET_OBJECTS:qplcore_${PLATFORM_ID}>)
 
-set_target_properties(qplcore_avx512 PROPERTIES
-        $<$<C_COMPILER_ID:GNU>:C_STANDARD 17>)
+    target_include_directories(qplcore_${PLATFORM_ID}
+                                PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw>
+                                PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/include>
+                                PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/src/include>
+                                PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/src/compression/include>
+                                PRIVATE $<TARGET_PROPERTY:isal,INTERFACE_INCLUDE_DIRECTORIES>)
 
-target_link_libraries(qplcore_avx512 ${CMAKE_DL_LIBS} isal)
+    set_target_properties(qplcore_${PLATFORM_ID} PROPERTIES
+                                $<$<C_COMPILER_ID:GNU>:C_STANDARD 17>)
 
-target_compile_options(qplcore_avx512
-                        PRIVATE ${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS}
-                        PRIVATE -march=skylake-avx512
-                        PRIVATE "$<$<CONFIG:Debug>:>"
-                        PRIVATE "$<$<CONFIG:Release>:-O3;-D_FORTIFY_SOURCE=2>")
+    target_compile_options(qplcore_${PLATFORM_ID}
+                            PRIVATE ${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS}
+                            PRIVATE "$<$<CONFIG:Debug>:>"
+                            PRIVATE "$<$<CONFIG:Release>:-O3;-D_FORTIFY_SOURCE=2>")
 
+    # Set specific compiler options and/or definitions based on a platform
+    if (${PLATFORM_ID} MATCHES "avx512")
+        target_compile_definitions(qplcore_${PLATFORM_ID} PRIVATE PLATFORM=2)
+        target_compile_options(qplcore_${PLATFORM_ID} PRIVATE -march=skylake-avx512)
+    else() # Create default px library
+        target_compile_definitions(qplcore_${PLATFORM_ID} PRIVATE PLATFORM=0)
+    endif()
 
-target_compile_definitions(qplcore_avx512 PUBLIC QPL_BADARG_CHECK)
+    target_link_libraries(qplcore_${PLATFORM_ID} isal)
+endforeach()
 
 #
-# Create px library
+# Create dispatcher between platforms and auto-generated wrappers
 #
-#set(CMAKE_INCLUDE_CURRENT_DIR ON)
+file(GLOB SW_DISPATCHER_SOURCES ${QPL_SRC_DIR}/core-sw/dispatcher/*.cpp)
 
-# Create library
-add_library(qplcore_px OBJECT ${SOURCES} ${DATA_SOURCES})
+add_library(qplcore_sw_dispatcher OBJECT ${SW_DISPATCHER_SOURCES})
 
-target_compile_definitions(qplcore_px PRIVATE PLATFORM=0)
+set_property(GLOBAL APPEND PROPERTY QPL_LIB_DEPS
+             $<TARGET_OBJECTS:qplcore_sw_dispatcher>)
 
-target_include_directories(qplcore_px
-                           PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/include>
-                           PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/src/include>
-                           PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/src/compression/include>
-                           PRIVATE $<TARGET_PROPERTY:isal,INTERFACE_INCLUDE_DIRECTORIES>)
+target_include_directories(qplcore_sw_dispatcher
+                          PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/dispatcher>)
 
-set_target_properties(qplcore_px PROPERTIES
-        $<$<C_COMPILER_ID:GNU>:C_STANDARD 17>)
+# Generate kernel wrappers
+generate_unpack_kernel_arrays(${QPL_BINARY_DIR} "${PLATFORMS_LIST}")
 
-target_link_libraries(qplcore_px isal ${CMAKE_DL_LIBS})
+foreach(PLATFORM_ID IN LISTS PLATFORMS_LIST)
+    file(GLOB GENERATED_${PLATFORM_ID}_TABLES_SRC ${QPL_BINARY_DIR}/generated/${PLATFORM_ID}_*.cpp)
 
-target_compile_options(qplcore_px
-                        PRIVATE ${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS}
-                        PRIVATE "$<$<CONFIG:Debug>:>"
-                        PRIVATE "$<$<CONFIG:Release>:-O3;-D_FORTIFY_SOURCE=2>")
+    target_sources(qplcore_sw_dispatcher PRIVATE ${GENERATED_${PLATFORM_ID}_TABLES_SRC})
 
-target_compile_definitions(qplcore_px PUBLIC QPL_BADARG_CHECK)
+    # Set specific compiler options and/or definitions based on a platform
+    if (${PLATFORM_ID} MATCHES "avx512")
+        set_source_files_properties(${GENERATED_${PLATFORM_ID}_TABLES_SRC} PROPERTIES COMPILE_DEFINITIONS PLATFORM=2)
+    else()
+        set_source_files_properties(${GENERATED_${PLATFORM_ID}_TABLES_SRC} PROPERTIES COMPILE_DEFINITIONS PLATFORM=0)
+    endif()
+
+    target_include_directories(qplcore_sw_dispatcher
+                                PUBLIC $<TARGET_PROPERTY:qplcore_${PLATFORM_ID},INTERFACE_INCLUDE_DIRECTORIES>)
+endforeach()
+
+set_target_properties(qplcore_sw_dispatcher PROPERTIES CXX_STANDARD 17)
+
+# w/a for build compatibility with ISAL codebase
+target_compile_definitions(qplcore_sw_dispatcher PUBLIC -DQPL_LIB)
+
+target_compile_options(qplcore_sw_dispatcher
+        PRIVATE $<$<C_COMPILER_ID:GNU>:${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS};
+                                       ${QPL_LINUX_TOOLCHAIN_DYNAMIC_LIBRARY_FLAGS};
+                                       $<$<CONFIG:Release>:-O3;-D_FORTIFY_SOURCE=2>>
+        PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU>:${QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS}>)
 
 # [SUBDIR]core-iaa
 file(GLOB HW_PATH_SRC ${QPL_SRC_DIR}/core-iaa/sources/aecs/*.c
@@ -237,11 +238,20 @@ file(GLOB HW_PATH_SRC ${QPL_SRC_DIR}/core-iaa/sources/aecs/*.c
 # Create library
 add_library(core_iaa OBJECT ${HW_PATH_SRC})
 
+set_property(GLOBAL APPEND PROPERTY QPL_LIB_DEPS
+             $<TARGET_OBJECTS:core_iaa>)
+
 target_include_directories(core_iaa
         PRIVATE ${UUID_DIR}
         PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-iaa/include>
-        PRIVATE $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-iaa/sources/include>
-        PRIVATE $<TARGET_PROPERTY:qplcore_avx512,INTERFACE_INCLUDE_DIRECTORIES>)
+        PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-iaa/sources/include>
+        PRIVATE $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/include>  # status.h in own_checkers.h
+        PRIVATE $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/sources/c_api> # own_checkers.h
+        PRIVATE $<TARGET_PROPERTY:qplcore_sw_dispatcher,INTERFACE_INCLUDE_DIRECTORIES>)
+
+set_target_properties(core_iaa PROPERTIES
+        $<$<C_COMPILER_ID:GNU>:C_STANDARD 17>
+        CXX_STANDARD 17)
 
 target_compile_options(core_iaa
         PRIVATE $<$<C_COMPILER_ID:GNU>:${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS};
@@ -251,11 +261,10 @@ target_compile_features(core_iaa PRIVATE c_std_11)
 
 target_compile_definitions(core_iaa PRIVATE QPL_BADARG_CHECK
         PRIVATE $<$<BOOL:${BLOCK_ON_FAULT}>: BLOCK_ON_FAULT_ENABLED>
-        PRIVATE $<$<BOOL:${LOG_HW_INIT}>:LOG_HW_INIT>)
+        PRIVATE $<$<BOOL:${LOG_HW_INIT}>:LOG_HW_INIT>
+        PRIVATE $<$<BOOL:${DYNAMIC_LOADING_LIBACCEL_CONFIG}>:DYNAMIC_LOADING_LIBACCEL_CONFIG>)
 
 # [SUBDIR]middle-layer
-generate_unpack_kernel_arrays(${QPL_BINARY_DIR})
-
 file(GLOB MIDDLE_LAYER_SRC
         ${QPL_SRC_DIR}/middle-layer/analytics/*.cpp
         ${QPL_SRC_DIR}/middle-layer/c_wrapper/*.cpp
@@ -270,14 +279,12 @@ file(GLOB MIDDLE_LAYER_SRC
         ${QPL_SRC_DIR}/middle-layer/inflate/*.cpp
         ${QPL_SRC_DIR}/core-iaa/sources/accelerator/*.cpp) # todo
 
-file(GLOB GENERATED_PX_TABLES_SRC ${QPL_BINARY_DIR}/generated/px_*.cpp)
-file(GLOB GENERATED_AVX512_TABLES_SRC ${QPL_BINARY_DIR}/generated/avx512_*.cpp)
-
 add_library(middle_layer_lib OBJECT
-        ${GENERATED_PX_TABLES_SRC}
-        ${GENERATED_AVX512_TABLES_SRC}
         ${MIDDLE_LAYER_SRC})
 
+set_property(GLOBAL APPEND PROPERTY QPL_LIB_DEPS
+        $<TARGET_OBJECTS:middle_layer_lib>)
+
 target_compile_options(middle_layer_lib
         PRIVATE $<$<C_COMPILER_ID:GNU>:${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS};
                                        ${QPL_LINUX_TOOLCHAIN_DYNAMIC_LIBRARY_FLAGS};
@@ -288,41 +295,39 @@ target_compile_definitions(middle_layer_lib
         PUBLIC QPL_VERSION="${QPL_VERSION}"
         PUBLIC $<$<BOOL:${LOG_HW_INIT}>:LOG_HW_INIT>
         PUBLIC $<$<BOOL:${EFFICIENT_WAIT}>:QPL_EFFICIENT_WAIT>
-        PUBLIC QPL_BADARG_CHECK)
+        PUBLIC QPL_BADARG_CHECK
+        PUBLIC $<$<BOOL:${DYNAMIC_LOADING_LIBACCEL_CONFIG}>:DYNAMIC_LOADING_LIBACCEL_CONFIG>)
 
-set_source_files_properties(${GENERATED_PX_TABLES_SRC} PROPERTIES COMPILE_DEFINITIONS PLATFORM=0)
-set_source_files_properties(${GENERATED_AVX512_TABLES_SRC} PROPERTIES COMPILE_DEFINITIONS PLATFORM=2)
+set_target_properties(middle_layer_lib PROPERTIES CXX_STANDARD 17)
 
 target_include_directories(middle_layer_lib
         PRIVATE ${UUID_DIR}
         PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/middle-layer>
         PUBLIC $<TARGET_PROPERTY:_qpl,INTERFACE_INCLUDE_DIRECTORIES>
-        PUBLIC $<TARGET_PROPERTY:qplcore_px,INTERFACE_INCLUDE_DIRECTORIES>
-        PUBLIC $<TARGET_PROPERTY:qplcore_avx512,INTERFACE_INCLUDE_DIRECTORIES>
+        PUBLIC $<TARGET_PROPERTY:qplcore_sw_dispatcher,INTERFACE_INCLUDE_DIRECTORIES>
         PUBLIC $<TARGET_PROPERTY:isal,INTERFACE_INCLUDE_DIRECTORIES>
         PUBLIC $<TARGET_PROPERTY:core_iaa,INTERFACE_INCLUDE_DIRECTORIES>)
 
 target_compile_definitions(middle_layer_lib PUBLIC -DQPL_LIB)
 
 # [SUBDIR]c_api
-file(GLOB_RECURSE QPL_C_API_SRC 
+file(GLOB_RECURSE QPL_C_API_SRC
         ${QPL_SRC_DIR}/c_api/*.c
         ${QPL_SRC_DIR}/c_api/*.cpp)
 
-add_library(_qpl STATIC ${QPL_C_API_SRC}
-         $<TARGET_OBJECTS:middle_layer_lib>
-        $<TARGET_OBJECTS:isal>
-        $<TARGET_OBJECTS:isal_asm>
-        $<TARGET_OBJECTS:qplcore_px>
-        $<TARGET_OBJECTS:qplcore_avx512>
-        $<TARGET_OBJECTS:core_iaa>
-        $<TARGET_OBJECTS:middle_layer_lib>)
+get_property(LIB_DEPS GLOBAL PROPERTY QPL_LIB_DEPS)
+
+add_library(_qpl STATIC ${QPL_C_API_SRC} ${LIB_DEPS})
 
 target_include_directories(_qpl
-        PUBLIC $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/include/>
+        PUBLIC $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/include/> $<INSTALL_INTERFACE:include>
         PRIVATE $<TARGET_PROPERTY:middle_layer_lib,INTERFACE_INCLUDE_DIRECTORIES>
         PRIVATE $<BUILD_INTERFACE:${QPL_SRC_DIR}/c_api>)
 
+set_target_properties(_qpl PROPERTIES
+        $<$<C_COMPILER_ID:GNU>:C_STANDARD 17>
+        CXX_STANDARD 17)
+
 target_compile_options(_qpl
         PRIVATE $<$<C_COMPILER_ID:GNU>:${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS};
                                        ${QPL_LINUX_TOOLCHAIN_DYNAMIC_LIBRARY_FLAGS};
@@ -332,11 +337,15 @@ target_compile_options(_qpl
 target_compile_definitions(_qpl
         PRIVATE -DQPL_LIB
         PRIVATE -DQPL_BADARG_CHECK
+        PRIVATE $<$<BOOL:${DYNAMIC_LOADING_LIBACCEL_CONFIG}>:DYNAMIC_LOADING_LIBACCEL_CONFIG>
         PUBLIC -DENABLE_QPL_COMPRESSION)
 
 target_link_libraries(_qpl
-        PRIVATE accel-config
-        PRIVATE ${CMAKE_DL_LIBS})
+        PRIVATE ch_contrib::accel-config
+        PRIVATE ch_contrib::isal)
+
+target_include_directories(_qpl SYSTEM BEFORE
+        PUBLIC "${QPL_PROJECT_DIR}/include"
+        PUBLIC ${UUID_DIR})
 
 add_library (ch_contrib::qpl ALIAS _qpl)
-target_include_directories(_qpl SYSTEM BEFORE PUBLIC "${QPL_PROJECT_DIR}/include")
diff --git a/contrib/qpl-cmake/benchmark_sample/client_scripts/allin1_ssb.sh b/contrib/qpl-cmake/benchmark_sample/client_scripts/allin1_ssb.sh
new file mode 100644
index 00000000000..31017b565b6
--- /dev/null
+++ b/contrib/qpl-cmake/benchmark_sample/client_scripts/allin1_ssb.sh
@@ -0,0 +1,530 @@
+#!/bin/bash
+ckhost="localhost"
+ckport=("9000" "9001" "9002" "9003")
+WORKING_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
+OUTPUT_DIR="${WORKING_DIR}/output"
+LOG_DIR="${OUTPUT_DIR}/log"
+RAWDATA_DIR="${WORKING_DIR}/rawdata_dir"
+database_dir="${WORKING_DIR}/database_dir"
+CLIENT_SCRIPTS_DIR="${WORKING_DIR}/client_scripts"
+LOG_PACK_FILE="$(date +%Y-%m-%d-%H-%M-%S)"
+QUERY_FILE="queries_ssb.sql"
+SERVER_BIND_CMD[0]="numactl -m 0 -N 0"
+SERVER_BIND_CMD[1]="numactl -m 0 -N 0"
+SERVER_BIND_CMD[2]="numactl -m 1 -N 1"
+SERVER_BIND_CMD[3]="numactl -m 1 -N 1"
+CLIENT_BIND_CMD=""
+SSB_GEN_FACTOR=20
+TABLE_NAME="lineorder_flat"
+TALBE_ROWS="119994608"
+CODEC_CONFIG="lz4 deflate zstd"
+
+# define instance number
+inst_num=$1
+if [ ! -n "$1" ]; then
+        echo "Please clarify instance number from 1,2,3 or 4"
+        exit 1
+else
+        echo "Benchmarking with instance number:$1"
+fi
+
+if [ ! -d "$OUTPUT_DIR" ]; then
+mkdir $OUTPUT_DIR
+fi
+if [ ! -d "$LOG_DIR" ]; then
+mkdir $LOG_DIR
+fi
+if [ ! -d "$RAWDATA_DIR" ]; then
+mkdir $RAWDATA_DIR
+fi
+
+# define different directories
+dir_server=("" "_s2" "_s3" "_s4")
+ckreadSql="
+    CREATE TABLE customer
+    (
+            C_CUSTKEY       UInt32,
+            C_NAME          String,
+            C_ADDRESS       String,
+            C_CITY          LowCardinality(String),
+            C_NATION        LowCardinality(String),
+            C_REGION        LowCardinality(String),
+            C_PHONE         String,
+            C_MKTSEGMENT    LowCardinality(String)
+    )
+    ENGINE = MergeTree ORDER BY (C_CUSTKEY);
+
+    CREATE TABLE lineorder
+    (
+        LO_ORDERKEY             UInt32,
+        LO_LINENUMBER           UInt8,
+        LO_CUSTKEY              UInt32,
+        LO_PARTKEY              UInt32,
+        LO_SUPPKEY              UInt32,
+        LO_ORDERDATE            Date,
+        LO_ORDERPRIORITY        LowCardinality(String),
+        LO_SHIPPRIORITY         UInt8,
+        LO_QUANTITY             UInt8,
+        LO_EXTENDEDPRICE        UInt32,
+        LO_ORDTOTALPRICE        UInt32,
+        LO_DISCOUNT             UInt8,
+        LO_REVENUE              UInt32,
+        LO_SUPPLYCOST           UInt32,
+        LO_TAX                  UInt8,
+        LO_COMMITDATE           Date,
+        LO_SHIPMODE             LowCardinality(String)
+    )
+    ENGINE = MergeTree PARTITION BY toYear(LO_ORDERDATE) ORDER BY (LO_ORDERDATE, LO_ORDERKEY);
+
+    CREATE TABLE part
+    (
+            P_PARTKEY       UInt32,
+            P_NAME          String,
+            P_MFGR          LowCardinality(String),
+            P_CATEGORY      LowCardinality(String),
+            P_BRAND         LowCardinality(String),
+            P_COLOR         LowCardinality(String),
+            P_TYPE          LowCardinality(String),
+            P_SIZE          UInt8,
+            P_CONTAINER     LowCardinality(String)
+    )
+    ENGINE = MergeTree ORDER BY P_PARTKEY;
+
+    CREATE TABLE supplier
+    (
+            S_SUPPKEY       UInt32,
+            S_NAME          String,
+            S_ADDRESS       String,
+            S_CITY          LowCardinality(String),
+            S_NATION        LowCardinality(String),
+            S_REGION        LowCardinality(String),
+            S_PHONE         String
+    )
+    ENGINE = MergeTree ORDER BY S_SUPPKEY;
+"
+supplier_table="
+   CREATE TABLE supplier
+    (
+            S_SUPPKEY       UInt32,
+            S_NAME          String,
+            S_ADDRESS       String,
+            S_CITY          LowCardinality(String),
+            S_NATION        LowCardinality(String),
+            S_REGION        LowCardinality(String),
+            S_PHONE         String
+    )
+    ENGINE = MergeTree ORDER BY S_SUPPKEY;
+"
+part_table="
+    CREATE TABLE part
+    (
+            P_PARTKEY       UInt32,
+            P_NAME          String,
+            P_MFGR          LowCardinality(String),
+            P_CATEGORY      LowCardinality(String),
+            P_BRAND         LowCardinality(String),
+            P_COLOR         LowCardinality(String),
+            P_TYPE          LowCardinality(String),
+            P_SIZE          UInt8,
+            P_CONTAINER     LowCardinality(String)
+    )
+    ENGINE = MergeTree ORDER BY P_PARTKEY;
+"
+lineorder_table="
+    CREATE TABLE lineorder
+    (
+        LO_ORDERKEY             UInt32,
+        LO_LINENUMBER           UInt8,
+        LO_CUSTKEY              UInt32,
+        LO_PARTKEY              UInt32,
+        LO_SUPPKEY              UInt32,
+        LO_ORDERDATE            Date,
+        LO_ORDERPRIORITY        LowCardinality(String),
+        LO_SHIPPRIORITY         UInt8,
+        LO_QUANTITY             UInt8,
+        LO_EXTENDEDPRICE        UInt32,
+        LO_ORDTOTALPRICE        UInt32,
+        LO_DISCOUNT             UInt8,
+        LO_REVENUE              UInt32,
+        LO_SUPPLYCOST           UInt32,
+        LO_TAX                  UInt8,
+        LO_COMMITDATE           Date,
+        LO_SHIPMODE             LowCardinality(String)
+    )
+    ENGINE = MergeTree PARTITION BY toYear(LO_ORDERDATE) ORDER BY (LO_ORDERDATE, LO_ORDERKEY);
+"
+customer_table="
+    CREATE TABLE customer
+    (
+            C_CUSTKEY       UInt32,
+            C_NAME          String,
+            C_ADDRESS       String,
+            C_CITY          LowCardinality(String),
+            C_NATION        LowCardinality(String),
+            C_REGION        LowCardinality(String),
+            C_PHONE         String,
+            C_MKTSEGMENT    LowCardinality(String)
+    )
+    ENGINE = MergeTree ORDER BY (C_CUSTKEY);
+"
+
+lineorder_flat_table="
+    SET max_memory_usage = 20000000000;
+    CREATE TABLE lineorder_flat
+    ENGINE = MergeTree
+    PARTITION BY toYear(LO_ORDERDATE)
+    ORDER BY (LO_ORDERDATE, LO_ORDERKEY) AS
+    SELECT
+        l.LO_ORDERKEY AS LO_ORDERKEY,
+        l.LO_LINENUMBER AS LO_LINENUMBER,
+        l.LO_CUSTKEY AS LO_CUSTKEY,
+        l.LO_PARTKEY AS LO_PARTKEY,
+        l.LO_SUPPKEY AS LO_SUPPKEY,
+        l.LO_ORDERDATE AS LO_ORDERDATE,
+        l.LO_ORDERPRIORITY AS LO_ORDERPRIORITY,
+        l.LO_SHIPPRIORITY AS LO_SHIPPRIORITY,
+        l.LO_QUANTITY AS LO_QUANTITY,
+        l.LO_EXTENDEDPRICE AS LO_EXTENDEDPRICE,
+        l.LO_ORDTOTALPRICE AS LO_ORDTOTALPRICE,
+        l.LO_DISCOUNT AS LO_DISCOUNT,
+        l.LO_REVENUE AS LO_REVENUE,
+        l.LO_SUPPLYCOST AS LO_SUPPLYCOST,
+        l.LO_TAX AS LO_TAX,
+        l.LO_COMMITDATE AS LO_COMMITDATE,
+        l.LO_SHIPMODE AS LO_SHIPMODE,
+        c.C_NAME AS C_NAME,
+        c.C_ADDRESS AS C_ADDRESS,
+        c.C_CITY AS C_CITY,
+        c.C_NATION AS C_NATION,
+        c.C_REGION AS C_REGION,
+        c.C_PHONE AS C_PHONE,
+        c.C_MKTSEGMENT AS C_MKTSEGMENT,
+        s.S_NAME AS S_NAME,
+        s.S_ADDRESS AS S_ADDRESS,
+        s.S_CITY AS S_CITY,
+        s.S_NATION AS S_NATION,
+        s.S_REGION AS S_REGION,
+        s.S_PHONE AS S_PHONE,
+        p.P_NAME AS P_NAME,
+        p.P_MFGR AS P_MFGR,
+        p.P_CATEGORY AS P_CATEGORY,
+        p.P_BRAND AS P_BRAND,
+        p.P_COLOR AS P_COLOR,
+        p.P_TYPE AS P_TYPE,
+        p.P_SIZE AS P_SIZE,
+        p.P_CONTAINER AS P_CONTAINER
+    FROM lineorder AS l
+    INNER JOIN customer AS c ON c.C_CUSTKEY = l.LO_CUSTKEY
+    INNER JOIN supplier AS s ON s.S_SUPPKEY = l.LO_SUPPKEY
+    INNER JOIN part AS p ON p.P_PARTKEY = l.LO_PARTKEY;
+    show settings ilike 'max_memory_usage';
+"
+ 
+function insert_data(){
+        echo "insert_data:$1"
+        create_table_prefix="clickhouse client --host ${ckhost} --port $2 --multiquery -q"
+        insert_data_prefix="clickhouse client --query "
+        case $1 in
+          all)
+                clickhouse client --host ${ckhost} --port $2 --multiquery -q"$ckreadSql" && {
+                ${insert_data_prefix} "INSERT INTO customer FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/customer.tbl --port=$2
+                ${insert_data_prefix} "INSERT INTO part FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/part.tbl --port=$2
+                ${insert_data_prefix} "INSERT INTO supplier FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/supplier.tbl --port=$2
+                ${insert_data_prefix} "INSERT INTO lineorder FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/lineorder.tbl --port=$2
+                }
+                ${create_table_prefix}"${lineorder_flat_table}" 
+          ;;
+          customer)
+                echo ${create_table_prefix}\"${customer_table}\"
+                ${create_table_prefix}"${customer_table}" && {
+                echo "${insert_data_prefix} \"INSERT INTO $1 FORMAT CSV\" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2"
+                ${insert_data_prefix} "INSERT INTO $1 FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2
+                }
+          ;;
+          part)
+                echo ${create_table_prefix}\"${part_table}\"
+                ${create_table_prefix}"${part_table}" && {
+                echo "${insert_data_prefix} \"INSERT INTO $1 FORMAT CSV\" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2"
+                ${insert_data_prefix} "INSERT INTO $1 FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2
+                }
+          ;;
+          supplier)
+                echo ${create_table_prefix}"${supplier_table}"
+                ${create_table_prefix}"${supplier_table}" && {
+                echo "${insert_data_prefix} \"INSERT INTO $1 FORMAT CSV\" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2"
+                ${insert_data_prefix} "INSERT INTO $1 FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2
+                }
+          ;;
+          lineorder)
+                echo ${create_table_prefix}"${lineorder_table}"
+                ${create_table_prefix}"${lineorder_table}" && {
+                echo "${insert_data_prefix} \"INSERT INTO $1 FORMAT CSV\" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2"
+                ${insert_data_prefix} "INSERT INTO $1 FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2
+                }
+          ;;
+          lineorder_flat)
+                echo ${create_table_prefix}"${lineorder_flat_table}"
+                ${create_table_prefix}"${lineorder_flat_table}" 
+                return 0
+          ;;
+          *)
+                exit 0
+                ;;
+
+        esac
+}
+
+function check_sql(){
+        select_sql="select * from "$1" limit 1"
+        clickhouse client --host ${ckhost} --port $2 --multiquery -q"${select_sql}"
+}
+
+function check_table(){
+        checknum=0
+        source_tables="customer part supplier lineorder lineorder_flat"
+        test_tables=${1:-${source_tables}}
+        echo "Checking table data required in server..."
+        for i in $(seq 0 $[inst_num-1])
+        do
+                for j in `echo ${test_tables}`
+                do
+                        check_sql $j ${ckport[i]} &> /dev/null || {
+                                let checknum+=1 && insert_data "$j" ${ckport[i]}
+                        }
+                done
+        done
+
+        for i in $(seq 0 $[inst_num-1])
+        do
+                echo "clickhouse client --host ${ckhost} --port ${ckport[i]} -m -q\"select count() from ${TABLE_NAME};\""
+                var=$(clickhouse client --host ${ckhost} --port ${ckport[i]} -m -q"select count() from ${TABLE_NAME};")
+                if [ $var -eq $TALBE_ROWS ];then
+                        echo "Instance_${i} Table data integrity check OK -> Rows:$var"
+                else
+                        echo  "Instance_${i} Table data integrity check Failed -> Rows:$var"
+                        exit 1
+                fi
+        done
+        if [ $checknum -gt 0 ];then
+                echo "Need sleep 10s after first table data insertion...$checknum"
+                sleep 10
+        fi
+}
+
+function check_instance(){
+instance_alive=0
+for i in {1..10}
+do
+        sleep 1
+        netstat -nltp | grep ${1} > /dev/null
+        if [ $? -ne 1 ];then
+                instance_alive=1
+                break
+        fi
+        
+done
+
+if [ $instance_alive -eq 0 ];then
+        echo "check_instance -> clickhouse server instance faild to launch due to 10s timeout!"
+        exit 1
+else
+        echo "check_instance -> clickhouse server instance launch successfully!"
+fi
+}
+
+function start_clickhouse_for_insertion(){
+        echo "start_clickhouse_for_insertion"
+        for i in $(seq 0 $[inst_num-1])
+	do                
+                echo "cd ${database_dir}/$1${dir_server[i]}"
+                echo "${SERVER_BIND_CMD[i]} clickhouse server -C config_${1}${dir_server[i]}.xml >&${LOG_DIR}/${1}_${i}_server_log& > /dev/null"
+                
+	        cd ${database_dir}/$1${dir_server[i]}
+	        ${SERVER_BIND_CMD[i]} clickhouse server -C config_${1}${dir_server[i]}.xml >&${LOG_DIR}/${1}_${i}_server_log& > /dev/null
+                check_instance ${ckport[i]}
+        done
+}
+
+function start_clickhouse_for_stressing(){
+        echo "start_clickhouse_for_stressing"
+        for i in $(seq 0 $[inst_num-1])
+	do
+                echo "cd ${database_dir}/$1${dir_server[i]}"
+                echo "${SERVER_BIND_CMD[i]} clickhouse server -C config_${1}${dir_server[i]}.xml >&/dev/null&"
+                
+	        cd ${database_dir}/$1${dir_server[i]}
+	        ${SERVER_BIND_CMD[i]} clickhouse server -C config_${1}${dir_server[i]}.xml >&/dev/null&
+                check_instance ${ckport[i]}
+        done
+}
+yum -y install git make gcc sudo net-tools &> /dev/null
+pip3 install clickhouse_driver numpy &> /dev/null
+test -d ${RAWDATA_DIR}/ssb-dbgen || git clone https://github.com/vadimtk/ssb-dbgen.git ${RAWDATA_DIR}/ssb-dbgen && cd ${RAWDATA_DIR}/ssb-dbgen
+
+if [ ! -f ${RAWDATA_DIR}/ssb-dbgen/dbgen ];then
+        make && {
+        test -f ${RAWDATA_DIR}/ssb-dbgen/customer.tbl || echo y |./dbgen -s ${SSB_GEN_FACTOR} -T c
+        test -f ${RAWDATA_DIR}/ssb-dbgen/part.tbl  || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T p
+        test -f ${RAWDATA_DIR}/ssb-dbgen/supplier.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T s
+        test -f ${RAWDATA_DIR}/ssb-dbgen/date.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T d
+        test -f ${RAWDATA_DIR}/ssb-dbgen/lineorder.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T l
+        }
+else
+        test -f ${RAWDATA_DIR}/ssb-dbgen/customer.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T c
+        test -f ${RAWDATA_DIR}/ssb-dbgen/part.tbl  || echo y |  ./dbgen -s ${SSB_GEN_FACTOR} -T p
+        test -f ${RAWDATA_DIR}/ssb-dbgen/supplier.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T s
+        test -f ${RAWDATA_DIR}/ssb-dbgen/date.tbl || echo y |  ./dbgen -s ${SSB_GEN_FACTOR} -T d
+        test -f ${RAWDATA_DIR}/ssb-dbgen/lineorder.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T l
+
+fi
+
+filenum=`find ${RAWDATA_DIR}/ssb-dbgen/ -name "*.tbl" | wc -l`
+
+if [ $filenum -ne 5 ];then
+        echo "generate ssb data file *.tbl faild"
+        exit 1
+fi
+
+function kill_instance(){
+instance_alive=1  
+for i in {1..2}
+do
+	pkill clickhouse && sleep 5
+        instance_alive=0        
+        for i in $(seq 0 $[inst_num-1])
+        do
+                netstat -nltp | grep ${ckport[i]} > /dev/null
+                if [ $? -ne 1 ];then
+                        instance_alive=1
+                        break;
+                fi
+        done
+        if [ $instance_alive -eq 0 ];then
+                break;
+        fi        
+done
+if [ $instance_alive -eq 0 ];then
+        echo "kill_instance OK!"
+else
+        echo "kill_instance Failed -> clickhouse server instance still alive due to 10s timeout"
+        exit 1        
+fi
+}
+
+function run_test(){
+is_xml=0
+for i in $(seq 0 $[inst_num-1])
+do
+        if [ -f ${database_dir}/${1}${dir_server[i]}/config_${1}${dir_server[i]}.xml ]; then
+                is_xml=$[is_xml+1]
+        fi
+done
+if [ $is_xml -eq $inst_num ];then
+        echo "Benchmark with $inst_num instance"
+        start_clickhouse_for_insertion ${1}
+
+        for i in $(seq 0 $[inst_num-1])
+        do
+                clickhouse client --host ${ckhost} --port ${ckport[i]} -m -q"show databases;" >/dev/null
+        done
+
+        if [ $? -eq 0 ];then
+                check_table
+        fi
+        kill_instance
+
+        if [ $1 == "deflate" ];then
+	        test -f ${LOG_DIR}/${1}_server_log && deflatemsg=`cat ${LOG_DIR}/${1}_server_log | grep DeflateJobHWPool`
+	        if [ -n "$deflatemsg" ];then
+	                echo ------------------------------------------------------
+	                echo $deflatemsg
+	                echo ------------------------------------------------------
+	        fi
+	fi
+        echo "Check table data required in server_${1} -> Done! "
+        
+        start_clickhouse_for_stressing ${1}
+        for i in $(seq 0 $[inst_num-1])
+        do
+                clickhouse client --host ${ckhost} --port ${ckport[i]} -m -q"show databases;" >/dev/null
+        done
+        if [ $? -eq 0 ];then
+                test -d ${CLIENT_SCRIPTS_DIR}  && cd ${CLIENT_SCRIPTS_DIR}
+                echo "Client stressing... "
+                echo "${CLIENT_BIND_CMD} python3 client_stressing_test.py ${QUERY_FILE} $inst_num &> ${LOG_DIR}/${1}.log"
+                ${CLIENT_BIND_CMD} python3 client_stressing_test.py ${QUERY_FILE} $inst_num &> ${LOG_DIR}/${1}.log
+                echo "Completed client stressing, checking log... "
+                finish_log=`grep "Finished" ${LOG_DIR}/${1}.log | wc -l`
+	        if [ $finish_log -eq 1 ] ;then
+                        kill_instance
+	                test -f ${LOG_DIR}/${1}.log && echo  "${1}.log ===> ${LOG_DIR}/${1}.log"
+	        else
+	                kill_instance
+	                echo "No find 'Finished' in client log -> Performance test may fail"
+	                exit 1
+
+	        fi
+
+	    else
+                echo "${1} clickhouse server start fail"
+                exit 1
+        fi
+else
+        echo "clickhouse server start fail -> Please check xml files required in ${database_dir} for each instance"
+        exit 1
+
+fi
+}
+function clear_log(){
+        if [ -d "$LOG_DIR" ]; then
+                cd ${LOG_DIR} && rm -rf *
+        fi     
+}
+
+function gather_log_for_codec(){
+        cd ${OUTPUT_DIR} && mkdir -p ${LOG_PACK_FILE}/${1}
+        cp -rf ${LOG_DIR} ${OUTPUT_DIR}/${LOG_PACK_FILE}/${1}
+}
+
+function pack_log(){
+        if [ -e "${OUTPUT_DIR}/run.log" ]; then
+                cp ${OUTPUT_DIR}/run.log ${OUTPUT_DIR}/${LOG_PACK_FILE}/
+        fi
+        echo "Please check all log information in ${OUTPUT_DIR}/${LOG_PACK_FILE}"
+}
+
+function setup_check(){
+
+        iax_dev_num=`accel-config list | grep iax | wc -l`
+	if [ $iax_dev_num -eq 0 ] ;then
+                iax_dev_num=`accel-config list | grep iax | wc -l`
+                if [ $iax_dev_num -eq 0 ] ;then
+                        echo "No IAA devices available -> Please check IAA hardware setup manually!"
+                        exit 1
+                else
+	                echo "IAA enabled devices number:$iax_dev_num"
+                fi
+	else
+	        echo "IAA enabled devices number:$iax_dev_num"
+	fi        
+        libaccel_version=`accel-config -v`
+        clickhouser_version=`clickhouse server --version`
+        kernel_dxd_log=`dmesg | grep dxd`
+        echo "libaccel_version:$libaccel_version"
+        echo "clickhouser_version:$clickhouser_version"
+        echo -e "idxd section in kernel log:\n$kernel_dxd_log"
+}
+
+setup_check
+export CLICKHOUSE_WATCHDOG_ENABLE=0
+for i in  ${CODEC_CONFIG[@]}
+do
+        clear_log
+        codec=${i}
+        echo "run test------------$codec"
+        run_test $codec
+        gather_log_for_codec $codec
+done
+
+pack_log
+echo "Done."
\ No newline at end of file
diff --git a/contrib/qpl-cmake/benchmark_sample/client_scripts/client_stressing_test.py b/contrib/qpl-cmake/benchmark_sample/client_scripts/client_stressing_test.py
new file mode 100644
index 00000000000..f12381a198c
--- /dev/null
+++ b/contrib/qpl-cmake/benchmark_sample/client_scripts/client_stressing_test.py
@@ -0,0 +1,278 @@
+from operator import eq
+import os
+import random
+import time
+import sys
+from clickhouse_driver import Client
+import numpy as np
+import subprocess
+import multiprocessing
+from multiprocessing import Manager
+
+warmup_runs = 10
+calculated_runs = 10
+seconds = 30
+max_instances_number = 8
+retest_number = 3
+retest_tolerance = 10
+
+
+def checkInt(str):
+    try:
+        int(str)
+        return True
+    except ValueError:
+        return False
+
+
+def setup_client(index):
+    if index < 4:
+        port_idx = index
+    else:
+        port_idx = index + 4
+    client = Client(
+        host="localhost",
+        database="default",
+        user="default",
+        password="",
+        port="900%d" % port_idx,
+    )
+    union_mode_query = "SET union_default_mode='DISTINCT'"
+    client.execute(union_mode_query)
+    return client
+
+
+def warm_client(clientN, clientL, query, loop):
+    for c_idx in range(clientN):
+        for _ in range(loop):
+            clientL[c_idx].execute(query)
+
+
+def read_queries(queries_list):
+    queries = list()
+    queries_id = list()
+    with open(queries_list, "r") as f:
+        for line in f:
+            line = line.rstrip()
+            line = line.split("$")
+            queries_id.append(line[0])
+            queries.append(line[1])
+    return queries_id, queries
+
+
+def run_task(client, cname, query, loop, query_latency):
+    start_time = time.time()
+    for i in range(loop):
+        client.execute(query)
+        query_latency.append(client.last_query.elapsed)
+
+    end_time = time.time()
+    p95 = np.percentile(query_latency, 95)
+    print(
+        "CLIENT: {0} end. -> P95: %f, qps: %f".format(cname)
+        % (p95, loop / (end_time - start_time))
+    )
+
+
+def run_multi_clients(clientN, clientList, query, loop):
+    client_pids = {}
+    start_time = time.time()
+    manager = multiprocessing.Manager()
+    query_latency_list0 = manager.list()
+    query_latency_list1 = manager.list()
+    query_latency_list2 = manager.list()
+    query_latency_list3 = manager.list()
+    query_latency_list4 = manager.list()
+    query_latency_list5 = manager.list()
+    query_latency_list6 = manager.list()
+    query_latency_list7 = manager.list()
+
+    for c_idx in range(clientN):
+        client_name = "Role_%d" % c_idx
+        if c_idx == 0:
+            client_pids[c_idx] = multiprocessing.Process(
+                target=run_task,
+                args=(clientList[c_idx], client_name, query, loop, query_latency_list0),
+            )
+        elif c_idx == 1:
+            client_pids[c_idx] = multiprocessing.Process(
+                target=run_task,
+                args=(clientList[c_idx], client_name, query, loop, query_latency_list1),
+            )
+        elif c_idx == 2:
+            client_pids[c_idx] = multiprocessing.Process(
+                target=run_task,
+                args=(clientList[c_idx], client_name, query, loop, query_latency_list2),
+            )
+        elif c_idx == 3:
+            client_pids[c_idx] = multiprocessing.Process(
+                target=run_task,
+                args=(clientList[c_idx], client_name, query, loop, query_latency_list3),
+            )
+        elif c_idx == 4:
+            client_pids[c_idx] = multiprocessing.Process(
+                target=run_task,
+                args=(clientList[c_idx], client_name, query, loop, query_latency_list4),
+            )
+        elif c_idx == 5:
+            client_pids[c_idx] = multiprocessing.Process(
+                target=run_task,
+                args=(clientList[c_idx], client_name, query, loop, query_latency_list5),
+            )
+        elif c_idx == 6:
+            client_pids[c_idx] = multiprocessing.Process(
+                target=run_task,
+                args=(clientList[c_idx], client_name, query, loop, query_latency_list6),
+            )
+        elif c_idx == 7:
+            client_pids[c_idx] = multiprocessing.Process(
+                target=run_task,
+                args=(clientList[c_idx], client_name, query, loop, query_latency_list7),
+            )
+        else:
+            print("ERROR: CLIENT number dismatch!!")
+            exit()
+        print("CLIENT: %s start" % client_name)
+        client_pids[c_idx].start()
+
+    for c_idx in range(clientN):
+        client_pids[c_idx].join()
+    end_time = time.time()
+    totalT = end_time - start_time
+
+    query_latencyTotal = list()
+    for item in query_latency_list0:
+        query_latencyTotal.append(item)
+    for item in query_latency_list1:
+        query_latencyTotal.append(item)
+    for item in query_latency_list2:
+        query_latencyTotal.append(item)
+    for item in query_latency_list3:
+        query_latencyTotal.append(item)
+    for item in query_latency_list4:
+        query_latencyTotal.append(item)
+    for item in query_latency_list5:
+        query_latencyTotal.append(item)
+    for item in query_latency_list6:
+        query_latencyTotal.append(item)
+    for item in query_latency_list7:
+        query_latencyTotal.append(item)
+
+    totalP95 = np.percentile(query_latencyTotal, 95) * 1000
+    return totalT, totalP95
+
+
+def run_task_caculated(client, cname, query, loop):
+    query_latency = list()
+    start_time = time.time()
+    for i in range(loop):
+        client.execute(query)
+        query_latency.append(client.last_query.elapsed)
+    end_time = time.time()
+    p95 = np.percentile(query_latency, 95)
+
+
+def run_multi_clients_caculated(clientN, clientList, query, loop):
+    client_pids = {}
+    start_time = time.time()
+    for c_idx in range(clientN):
+        client_name = "Role_%d" % c_idx
+        client_pids[c_idx] = multiprocessing.Process(
+            target=run_task_caculated,
+            args=(clientList[c_idx], client_name, query, loop),
+        )
+        client_pids[c_idx].start()
+    for c_idx in range(clientN):
+        client_pids[c_idx].join()
+    end_time = time.time()
+    totalT = end_time - start_time
+    return totalT
+
+
+if __name__ == "__main__":
+    client_number = 1
+    queries = list()
+    queries_id = list()
+
+    if len(sys.argv) != 3:
+        print(
+            "usage: python3 client_stressing_test.py [queries_file_path] [client_number]"
+        )
+        sys.exit()
+    else:
+        queries_list = sys.argv[1]
+        client_number = int(sys.argv[2])
+        print(
+            "queries_file_path: %s, client_number: %d" % (queries_list, client_number)
+        )
+        if not os.path.isfile(queries_list) or not os.access(queries_list, os.R_OK):
+            print("please check the right path for queries file")
+            sys.exit()
+        if (
+            not checkInt(sys.argv[2])
+            or int(sys.argv[2]) > max_instances_number
+            or int(sys.argv[2]) < 1
+        ):
+            print("client_number should be in [1~%d]" % max_instances_number)
+            sys.exit()
+
+    client_list = {}
+    queries_id, queries = read_queries(queries_list)
+
+    for c_idx in range(client_number):
+        client_list[c_idx] = setup_client(c_idx)
+    # clear cache
+    os.system("sync; echo 3 > /proc/sys/vm/drop_caches")
+
+    print("###Polit Run Begin")
+    for i in queries:
+        warm_client(client_number, client_list, i, 1)
+    print("###Polit Run End -> Start stressing....")
+
+    query_index = 0
+    for q in queries:
+        print(
+            "\n###START -> Index: %d, ID: %s, Query: %s"
+            % (query_index, queries_id[query_index], q)
+        )
+        warm_client(client_number, client_list, q, warmup_runs)
+        print("###Warm Done!")
+        for j in range(0, retest_number):
+            totalT = run_multi_clients_caculated(
+                client_number, client_list, q, calculated_runs
+            )
+            curr_loop = int(seconds * calculated_runs / totalT) + 1
+            print(
+                "###Calculation Done! -> loopN: %d, expected seconds:%d"
+                % (curr_loop, seconds)
+            )
+
+            print("###Stress Running! -> %d iterations......" % curr_loop)
+
+            totalT, totalP95 = run_multi_clients(
+                client_number, client_list, q, curr_loop
+            )
+
+            if totalT > (seconds - retest_tolerance) and totalT < (
+                seconds + retest_tolerance
+            ):
+                break
+            else:
+                print(
+                    "###totalT:%d is far way from expected seconds:%d. Run again ->j:%d!"
+                    % (totalT, seconds, j)
+                )
+
+        print(
+            "###Completed! -> ID: %s, clientN: %d, totalT: %.2f s, latencyAVG: %.2f ms, P95: %.2f ms, QPS_Final: %.2f"
+            % (
+                queries_id[query_index],
+                client_number,
+                totalT,
+                totalT * 1000 / (curr_loop * client_number),
+                totalP95,
+                ((curr_loop * client_number) / totalT),
+            )
+        )
+        query_index += 1
+    print("###Finished!")
diff --git a/contrib/qpl-cmake/benchmark_sample/client_scripts/queries_ssb.sql b/contrib/qpl-cmake/benchmark_sample/client_scripts/queries_ssb.sql
new file mode 100644
index 00000000000..abf2df6503a
--- /dev/null
+++ b/contrib/qpl-cmake/benchmark_sample/client_scripts/queries_ssb.sql
@@ -0,0 +1,10 @@
+Q1.1$SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE toYear(LO_ORDERDATE) = 1993 AND LO_DISCOUNT BETWEEN 1 AND 3 AND LO_QUANTITY < 25;
+Q2.1$SELECT sum(LO_REVENUE),toYear(LO_ORDERDATE) AS year,P_BRAND FROM lineorder_flat WHERE P_CATEGORY = 'MFGR#12' AND S_REGION = 'AMERICA' GROUP BY year,P_BRAND ORDER BY year,P_BRAND;
+Q2.2$SELECT sum(LO_REVENUE),toYear(LO_ORDERDATE) AS year,P_BRAND FROM lineorder_flat WHERE P_BRAND >= 'MFGR#2221' AND P_BRAND <= 'MFGR#2228' AND S_REGION = 'ASIA' GROUP BY year,P_BRAND ORDER BY year,P_BRAND;
+Q2.3$SELECT sum(LO_REVENUE),toYear(LO_ORDERDATE) AS year,P_BRAND FROM lineorder_flat WHERE P_BRAND = 'MFGR#2239' AND S_REGION = 'EUROPE' GROUP BY year,P_BRAND ORDER BY year,P_BRAND;
+Q3.1$SELECT C_NATION,S_NATION,toYear(LO_ORDERDATE) AS year,sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE C_REGION = 'ASIA' AND S_REGION = 'ASIA' AND year >= 1992 AND year <= 1997 GROUP BY C_NATION,S_NATION,year ORDER BY year ASC,revenue DESC;
+Q3.2$SELECT C_CITY,S_CITY,toYear(LO_ORDERDATE) AS year,sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE C_NATION = 'UNITED STATES' AND S_NATION = 'UNITED STATES' AND year >= 1992 AND year <= 1997 GROUP BY C_CITY,S_CITY,year ORDER BY year ASC,revenue DESC;
+Q3.3$SELECT C_CITY,S_CITY,toYear(LO_ORDERDATE) AS year,sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND year >= 1992 AND year <= 1997 GROUP BY C_CITY,S_CITY,year ORDER BY year ASC,revenue DESC;
+Q4.1$SELECT toYear(LO_ORDERDATE) AS year,C_NATION,sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2') GROUP BY year,C_NATION ORDER BY year ASC,C_NATION ASC;
+Q4.2$SELECT toYear(LO_ORDERDATE) AS year,S_NATION,P_CATEGORY,sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (year = 1997 OR year = 1998) AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2') GROUP BY year,S_NATION,P_CATEGORY ORDER BY year ASC,S_NATION ASC,P_CATEGORY ASC;
+Q4.3$SELECT toYear(LO_ORDERDATE) AS year,S_CITY,P_BRAND,sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE S_NATION = 'UNITED STATES' AND (year = 1997 OR year = 1998) AND P_CATEGORY = 'MFGR#14' GROUP BY year,S_CITY,P_BRAND ORDER BY year ASC,S_CITY ASC,P_BRAND ASC;
diff --git a/contrib/qpl-cmake/benchmark_sample/client_scripts/run_ssb.sh b/contrib/qpl-cmake/benchmark_sample/client_scripts/run_ssb.sh
new file mode 100644
index 00000000000..6067b1058f2
--- /dev/null
+++ b/contrib/qpl-cmake/benchmark_sample/client_scripts/run_ssb.sh
@@ -0,0 +1,6 @@
+WORKING_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
+if [ ! -d "${WORKING_DIR}/output" ]; then
+mkdir ${WORKING_DIR}/output
+fi
+bash allin1_ssb.sh 2 > ${WORKING_DIR}/output/run.log
+echo "Please check log in: ${WORKING_DIR}/output/run.log"
\ No newline at end of file
diff --git a/contrib/qpl-cmake/benchmark_sample/database_dir/deflate/config_deflate.xml b/contrib/qpl-cmake/benchmark_sample/database_dir/deflate/config_deflate.xml
new file mode 100644
index 00000000000..ab77a9cdcbe
--- /dev/null
+++ b/contrib/qpl-cmake/benchmark_sample/database_dir/deflate/config_deflate.xml
@@ -0,0 +1,49 @@
+<!-- This file was generated automatically.
+     Do not edit it: it is likely to be discarded and generated again before it's read next time.
+     Files used to generate this file:
+       config.xml      -->
+
+<!-- Config that is used when server is run without config file. --><clickhouse>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <compression>
+        <case>
+            <method>deflate_qpl</method>
+        </case>
+    </compression>
+
+    <users>
+        <default>
+            <password/>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default/>
+    </quotas>
+</clickhouse>
diff --git a/contrib/qpl-cmake/benchmark_sample/database_dir/deflate_s2/config_deflate_s2.xml b/contrib/qpl-cmake/benchmark_sample/database_dir/deflate_s2/config_deflate_s2.xml
new file mode 100644
index 00000000000..b71456486f5
--- /dev/null
+++ b/contrib/qpl-cmake/benchmark_sample/database_dir/deflate_s2/config_deflate_s2.xml
@@ -0,0 +1,49 @@
+<!-- This file was generated automatically.
+     Do not edit it: it is likely to be discarded and generated again before it's read next time.
+     Files used to generate this file:
+       config.xml      -->
+
+<!-- Config that is used when server is run without config file. --><clickhouse>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8124</http_port>
+    <tcp_port>9001</tcp_port>
+    <mysql_port>9005</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <compression>
+        <case>
+            <method>deflate_qpl</method>
+        </case>
+    </compression>
+
+    <users>
+        <default>
+            <password/>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default/>
+    </quotas>
+</clickhouse>
diff --git a/contrib/qpl-cmake/benchmark_sample/database_dir/lz4/config_lz4.xml b/contrib/qpl-cmake/benchmark_sample/database_dir/lz4/config_lz4.xml
new file mode 100644
index 00000000000..f4dc59b60aa
--- /dev/null
+++ b/contrib/qpl-cmake/benchmark_sample/database_dir/lz4/config_lz4.xml
@@ -0,0 +1,49 @@
+<!-- This file was generated automatically.
+     Do not edit it: it is likely to be discarded and generated again before it's read next time.
+     Files used to generate this file:
+       config.xml      -->
+
+<!-- Config that is used when server is run without config file. --><clickhouse>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <compression>
+        <case>
+            <method>lz4</method>
+        </case>
+    </compression>
+
+    <users>
+        <default>
+            <password/>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default/>
+    </quotas>
+</clickhouse>
diff --git a/contrib/qpl-cmake/benchmark_sample/database_dir/lz4_s2/config_lz4_s2.xml b/contrib/qpl-cmake/benchmark_sample/database_dir/lz4_s2/config_lz4_s2.xml
new file mode 100644
index 00000000000..357db8942d7
--- /dev/null
+++ b/contrib/qpl-cmake/benchmark_sample/database_dir/lz4_s2/config_lz4_s2.xml
@@ -0,0 +1,49 @@
+<!-- This file was generated automatically.
+     Do not edit it: it is likely to be discarded and generated again before it's read next time.
+     Files used to generate this file:
+       config.xml      -->
+
+<!-- Config that is used when server is run without config file. --><clickhouse>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8124</http_port>
+    <tcp_port>9001</tcp_port>
+    <mysql_port>9005</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <compression>
+        <case>
+            <method>lz4</method>
+        </case>
+    </compression>
+
+    <users>
+        <default>
+            <password/>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default/>
+    </quotas>
+</clickhouse>
diff --git a/contrib/qpl-cmake/benchmark_sample/database_dir/zstd/config_zstd.xml b/contrib/qpl-cmake/benchmark_sample/database_dir/zstd/config_zstd.xml
new file mode 100644
index 00000000000..1c4c738edaf
--- /dev/null
+++ b/contrib/qpl-cmake/benchmark_sample/database_dir/zstd/config_zstd.xml
@@ -0,0 +1,49 @@
+<!-- This file was generated automatically.
+     Do not edit it: it is likely to be discarded and generated again before it's read next time.
+     Files used to generate this file:
+       config.xml      -->
+
+<!-- Config that is used when server is run without config file. --><clickhouse>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <compression>
+        <case>
+            <method>zstd</method>
+        </case>
+    </compression>
+
+    <users>
+        <default>
+            <password/>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default/>
+    </quotas>
+</clickhouse>
diff --git a/contrib/qpl-cmake/benchmark_sample/database_dir/zstd_s2/config_zstd_s2.xml b/contrib/qpl-cmake/benchmark_sample/database_dir/zstd_s2/config_zstd_s2.xml
new file mode 100644
index 00000000000..f3db01b7739
--- /dev/null
+++ b/contrib/qpl-cmake/benchmark_sample/database_dir/zstd_s2/config_zstd_s2.xml
@@ -0,0 +1,49 @@
+<!-- This file was generated automatically.
+     Do not edit it: it is likely to be discarded and generated again before it's read next time.
+     Files used to generate this file:
+       config.xml      -->
+
+<!-- Config that is used when server is run without config file. --><clickhouse>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8124</http_port>
+    <tcp_port>9001</tcp_port>
+    <mysql_port>9005</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <compression>
+        <case>
+            <method>zstd</method>
+        </case>
+    </compression>
+
+    <users>
+        <default>
+            <password/>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default/>
+    </quotas>
+</clickhouse>
diff --git a/contrib/snappy-cmake/CMakeLists.txt b/contrib/snappy-cmake/CMakeLists.txt
index 50cdc8732a1..f406de0e343 100644
--- a/contrib/snappy-cmake/CMakeLists.txt
+++ b/contrib/snappy-cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-set (SOURCE_DIR "${CMAKE_SOURCE_DIR}/contrib/snappy")
+set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/contrib/snappy")
 
 if (ARCH_S390X)
     set (SNAPPY_IS_BIG_ENDIAN 1)
diff --git a/contrib/sparse-checkout/setup-sparse-checkout.sh b/contrib/sparse-checkout/setup-sparse-checkout.sh
new file mode 100755
index 00000000000..3feba6c5adf
--- /dev/null
+++ b/contrib/sparse-checkout/setup-sparse-checkout.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+git config submodule."contrib/llvm-project".update '!../sparse-checkout/update-llvm-project.sh'
+git config submodule."contrib/croaring".update '!../sparse-checkout/update-croaring.sh'
+git config submodule."contrib/aws".update '!../sparse-checkout/update-aws.sh'
+git config submodule."contrib/openssl".update '!../sparse-checkout/update-openssl.sh'
+git config submodule."contrib/boringssl".update '!../sparse-checkout/update-boringssl.sh'
+git config submodule."contrib/arrow".update '!../sparse-checkout/update-arrow.sh'
+git config submodule."contrib/grpc".update '!../sparse-checkout/update-grpc.sh'
+git config submodule."contrib/orc".update '!../sparse-checkout/update-orc.sh'
+git config submodule."contrib/h3".update '!../sparse-checkout/update-h3.sh'
+git config submodule."contrib/icu".update '!../sparse-checkout/update-icu.sh'
+git config submodule."contrib/boost".update '!../sparse-checkout/update-boost.sh'
+git config submodule."contrib/aws-s2n-tls".update '!../sparse-checkout/update-aws-s2n-tls.sh'
+git config submodule."contrib/protobuf".update '!../sparse-checkout/update-protobuf.sh'
+git config submodule."contrib/libxml2".update '!../sparse-checkout/update-libxml2.sh'
+git config submodule."contrib/brotli".update '!../sparse-checkout/update-brotli.sh'
diff --git a/contrib/sparse-checkout/update-arrow.sh b/contrib/sparse-checkout/update-arrow.sh
new file mode 100755
index 00000000000..e004b60da02
--- /dev/null
+++ b/contrib/sparse-checkout/update-arrow.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+echo "Using sparse checkout for arrow"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/*/*' >> $FILES_TO_CHECKOUT
+echo '/cpp/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-aws-s2n-tls.sh b/contrib/sparse-checkout/update-aws-s2n-tls.sh
new file mode 100755
index 00000000000..4d65dc4b81d
--- /dev/null
+++ b/contrib/sparse-checkout/update-aws-s2n-tls.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+echo "Using sparse checkout for aws-s2n-tls"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/test/*' >> $FILES_TO_CHECKOUT
+echo '!/docs/*' >> $FILES_TO_CHECKOUT
+echo '!/compliance/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-aws.sh b/contrib/sparse-checkout/update-aws.sh
new file mode 100755
index 00000000000..f86acb54d95
--- /dev/null
+++ b/contrib/sparse-checkout/update-aws.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+echo "Using sparse checkout for aws"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/*/*' >> $FILES_TO_CHECKOUT
+echo '/src/aws-cpp-sdk-core/*' >> $FILES_TO_CHECKOUT
+echo '/generated/src/aws-cpp-sdk-s3/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-boost.sh b/contrib/sparse-checkout/update-boost.sh
new file mode 100755
index 00000000000..9bd1f6c1796
--- /dev/null
+++ b/contrib/sparse-checkout/update-boost.sh
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+echo "Using sparse checkout for boost"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/*/*' >> $FILES_TO_CHECKOUT
+echo '/boost/*' > $FILES_TO_CHECKOUT
+echo '!/boost/*/*' >> $FILES_TO_CHECKOUT
+echo '/boost/algorithm/*' >> $FILES_TO_CHECKOUT
+echo '/boost/any/*' >> $FILES_TO_CHECKOUT
+echo '/boost/atomic/*' >> $FILES_TO_CHECKOUT
+echo '/boost/assert/*' >> $FILES_TO_CHECKOUT
+echo '/boost/bind/*' >> $FILES_TO_CHECKOUT
+echo '/boost/concept/*' >> $FILES_TO_CHECKOUT
+echo '/boost/config/*' >> $FILES_TO_CHECKOUT
+echo '/boost/container/*' >> $FILES_TO_CHECKOUT
+echo '/boost/container_hash/*' >> $FILES_TO_CHECKOUT
+echo '/boost/context/*' >> $FILES_TO_CHECKOUT
+echo '/boost/convert/*' >> $FILES_TO_CHECKOUT
+echo '/boost/coroutine/*' >> $FILES_TO_CHECKOUT
+echo '/boost/core/*' >> $FILES_TO_CHECKOUT
+echo '/boost/detail/*' >> $FILES_TO_CHECKOUT
+echo '/boost/dynamic_bitset/*' >> $FILES_TO_CHECKOUT
+echo '/boost/exception/*' >> $FILES_TO_CHECKOUT
+echo '/boost/filesystem/*' >> $FILES_TO_CHECKOUT
+echo '/boost/functional/*' >> $FILES_TO_CHECKOUT
+echo '/boost/function/*' >> $FILES_TO_CHECKOUT
+echo '/boost/geometry/*' >> $FILES_TO_CHECKOUT
+echo '/boost/graph/*' >> $FILES_TO_CHECKOUT
+echo '/boost/heap/*' >> $FILES_TO_CHECKOUT
+echo '/boost/integer/*' >> $FILES_TO_CHECKOUT
+echo '/boost/intrusive/*' >> $FILES_TO_CHECKOUT
+echo '/boost/iostreams/*' >> $FILES_TO_CHECKOUT
+echo '/boost/io/*' >> $FILES_TO_CHECKOUT
+echo '/boost/iterator/*' >> $FILES_TO_CHECKOUT
+echo '/boost/math/*' >> $FILES_TO_CHECKOUT
+echo '/boost/move/*' >> $FILES_TO_CHECKOUT
+echo '/boost/mpl/*' >> $FILES_TO_CHECKOUT
+echo '/boost/multi_index/*' >> $FILES_TO_CHECKOUT
+echo '/boost/multiprecision/*' >> $FILES_TO_CHECKOUT
+echo '/boost/numeric/*' >> $FILES_TO_CHECKOUT
+echo '/boost/predef/*' >> $FILES_TO_CHECKOUT
+echo '/boost/preprocessor/*' >> $FILES_TO_CHECKOUT
+echo '/boost/program_options/*' >> $FILES_TO_CHECKOUT
+echo '/boost/range/*' >> $FILES_TO_CHECKOUT
+echo '/boost/regex/*' >> $FILES_TO_CHECKOUT
+echo '/boost/smart_ptr/*' >> $FILES_TO_CHECKOUT
+echo '/boost/type_index/*' >> $FILES_TO_CHECKOUT
+echo '/boost/type_traits/*' >> $FILES_TO_CHECKOUT
+echo '/boost/system/*' >> $FILES_TO_CHECKOUT
+echo '/boost/tti/*' >> $FILES_TO_CHECKOUT
+echo '/boost/utility/*' >> $FILES_TO_CHECKOUT
+echo '/boost/lexical_cast/*' >> $FILES_TO_CHECKOUT
+echo '/boost/optional/*' >> $FILES_TO_CHECKOUT
+echo '/boost/property_map/*' >> $FILES_TO_CHECKOUT
+echo '/boost/pending/*' >> $FILES_TO_CHECKOUT
+echo '/boost/multi_array/*' >> $FILES_TO_CHECKOUT
+echo '/boost/tuple/*' >> $FILES_TO_CHECKOUT
+echo '/boost/icl/*' >> $FILES_TO_CHECKOUT
+echo '/boost/unordered/*' >> $FILES_TO_CHECKOUT
+echo '/boost/typeof/*' >> $FILES_TO_CHECKOUT
+echo '/boost/parameter/*' >> $FILES_TO_CHECKOUT
+echo '/boost/mp11/*' >> $FILES_TO_CHECKOUT
+echo '/boost/archive/*' >> $FILES_TO_CHECKOUT
+echo '/boost/function_types/*' >> $FILES_TO_CHECKOUT
+echo '/boost/serialization/*' >> $FILES_TO_CHECKOUT
+echo '/boost/fusion/*' >> $FILES_TO_CHECKOUT
+echo '/boost/variant/*' >> $FILES_TO_CHECKOUT
+echo '/boost/format/*' >> $FILES_TO_CHECKOUT
+echo '/boost/locale/*' >> $FILES_TO_CHECKOUT
+echo '/boost/random/*' >> $FILES_TO_CHECKOUT
+echo '/boost/spirit/*' >> $FILES_TO_CHECKOUT
+echo '/boost/uuid/*' >> $FILES_TO_CHECKOUT
+echo '/boost/xpressive/*' >> $FILES_TO_CHECKOUT
+echo '/boost/asio/*' >> $FILES_TO_CHECKOUT
+echo '/boost/circular_buffer/*' >> $FILES_TO_CHECKOUT
+echo '/boost/proto/*' >> $FILES_TO_CHECKOUT
+echo '/boost/qvm/*' >> $FILES_TO_CHECKOUT
+echo '/boost/property_tree/*' >> $FILES_TO_CHECKOUT
+echo '/libs/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
\ No newline at end of file
diff --git a/contrib/sparse-checkout/update-boringssl.sh b/contrib/sparse-checkout/update-boringssl.sh
new file mode 100755
index 00000000000..f877a78afed
--- /dev/null
+++ b/contrib/sparse-checkout/update-boringssl.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+echo "Using sparse checkout for boringsll"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/fuzz/*' >> $FILES_TO_CHECKOUT
+echo '!/crypto/cipher_extra/test/*' >> $FILES_TO_CHECKOUT
+echo '!/third_party/wycheproof_testvectors/*' >> $FILES_TO_CHECKOUT
+echo '!/third_party/googletest/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-brotli.sh b/contrib/sparse-checkout/update-brotli.sh
new file mode 100755
index 00000000000..8784f5e4125
--- /dev/null
+++ b/contrib/sparse-checkout/update-brotli.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+echo "Using sparse checkout for brotli"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/*/*' >> $FILES_TO_CHECKOUT
+echo '/c/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-croaring.sh b/contrib/sparse-checkout/update-croaring.sh
new file mode 100755
index 00000000000..9b7bba19df4
--- /dev/null
+++ b/contrib/sparse-checkout/update-croaring.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+echo "Using sparse checkout for croaring"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/benchmarks/*' >> $FILES_TO_CHECKOUT
+echo '!/tests/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-grpc.sh b/contrib/sparse-checkout/update-grpc.sh
new file mode 100755
index 00000000000..38934fdbc1b
--- /dev/null
+++ b/contrib/sparse-checkout/update-grpc.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+echo "Using sparse checkout for grpc"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/test/*' >> $FILES_TO_CHECKOUT
+echo '/test/build/*' >> $FILES_TO_CHECKOUT
+echo '!/tools/*' >> $FILES_TO_CHECKOUT
+echo '/tools/codegen/*' >> $FILES_TO_CHECKOUT
+echo '!/examples/*' >> $FILES_TO_CHECKOUT
+echo '!/doc/*' >> $FILES_TO_CHECKOUT
+# FIXME why do we need csharp?
+#echo '!/src/csharp/*' >> $FILES_TO_CHECKOUT
+echo '!/src/python/*' >> $FILES_TO_CHECKOUT
+echo '!/src/objective-c/*' >> $FILES_TO_CHECKOUT
+echo '!/src/php/*' >> $FILES_TO_CHECKOUT
+echo '!/src/ruby/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-h3.sh b/contrib/sparse-checkout/update-h3.sh
new file mode 100755
index 00000000000..127885f89cc
--- /dev/null
+++ b/contrib/sparse-checkout/update-h3.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+echo "Using sparse checkout for h3"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/tests/*' >> $FILES_TO_CHECKOUT
+echo '!/website/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-icu.sh b/contrib/sparse-checkout/update-icu.sh
new file mode 100755
index 00000000000..76af39f07a4
--- /dev/null
+++ b/contrib/sparse-checkout/update-icu.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+echo "Using sparse checkout for icu"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/*/*' >> $FILES_TO_CHECKOUT
+echo '/icu4c/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
\ No newline at end of file
diff --git a/contrib/sparse-checkout/update-libxml2.sh b/contrib/sparse-checkout/update-libxml2.sh
new file mode 100755
index 00000000000..24faf11eec9
--- /dev/null
+++ b/contrib/sparse-checkout/update-libxml2.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo "Using sparse checkout for libxml2"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/result/*' >> $FILES_TO_CHECKOUT
+echo '!/test/*' >> $FILES_TO_CHECKOUT
+echo '!/doc/*' >> $FILES_TO_CHECKOUT
+echo '!/os400/*' >> $FILES_TO_CHECKOUT
+echo '!/fuzz/*' >> $FILES_TO_CHECKOUT
+echo '!/python/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-llvm-project.sh b/contrib/sparse-checkout/update-llvm-project.sh
new file mode 100755
index 00000000000..53c3b691d3a
--- /dev/null
+++ b/contrib/sparse-checkout/update-llvm-project.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+echo "Using sparse checkout for llvm-project"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/*/*' >> $FILES_TO_CHECKOUT
+echo '/llvm/*' >> $FILES_TO_CHECKOUT
+echo '!/llvm/*/*' >> $FILES_TO_CHECKOUT
+echo '/llvm/cmake/*' >> $FILES_TO_CHECKOUT
+echo '/llvm/projects/*' >> $FILES_TO_CHECKOUT
+echo '/llvm/include/*' >> $FILES_TO_CHECKOUT
+echo '/llvm/lib/*' >> $FILES_TO_CHECKOUT
+echo '/llvm/utils/TableGen/*' >> $FILES_TO_CHECKOUT
+echo '/libcxxabi/*' >> $FILES_TO_CHECKOUT
+echo '!/libcxxabi/test/*' >> $FILES_TO_CHECKOUT
+echo '/libcxx/*' >> $FILES_TO_CHECKOUT
+echo '!/libcxx/test/*' >> $FILES_TO_CHECKOUT
+echo '/libunwind/*' >> $FILES_TO_CHECKOUT
+echo '!/libunwind/test/*' >> $FILES_TO_CHECKOUT
+echo '/compiler-rt/*' >> $FILES_TO_CHECKOUT
+echo '!/compiler-rt/test/*' >> $FILES_TO_CHECKOUT
+echo '/cmake/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-openssl.sh b/contrib/sparse-checkout/update-openssl.sh
new file mode 100755
index 00000000000..33e19f43cb7
--- /dev/null
+++ b/contrib/sparse-checkout/update-openssl.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+echo "Using sparse checkout for openssl"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/fuzz/*' >> $FILES_TO_CHECKOUT
+echo '!/test/*' >> $FILES_TO_CHECKOUT
+echo '!/doc/*' >> $FILES_TO_CHECKOUT
+echo '!/providers/*' >> $FILES_TO_CHECKOUT
+echo '!/apps/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-orc.sh b/contrib/sparse-checkout/update-orc.sh
new file mode 100755
index 00000000000..57ab57a8d52
--- /dev/null
+++ b/contrib/sparse-checkout/update-orc.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+echo "Using sparse checkout for orc"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '/*' > $FILES_TO_CHECKOUT
+echo '!/*/*' >> $FILES_TO_CHECKOUT
+echo '/c++/*' >> $FILES_TO_CHECKOUT
+echo '/proto/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sparse-checkout/update-protobuf.sh b/contrib/sparse-checkout/update-protobuf.sh
new file mode 100755
index 00000000000..31c037c2cf5
--- /dev/null
+++ b/contrib/sparse-checkout/update-protobuf.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+echo "Using sparse checkout for protobuf"
+
+FILES_TO_CHECKOUT=$(git rev-parse --git-dir)/info/sparse-checkout
+echo '!/*' > $FILES_TO_CHECKOUT
+echo '/*/*' >> $FILES_TO_CHECKOUT
+echo '/src/*' >> $FILES_TO_CHECKOUT
+echo '/cmake/*' >> $FILES_TO_CHECKOUT
+
+git config core.sparsecheckout true
+git checkout $1
+git read-tree -mu HEAD
diff --git a/contrib/sqlite-amalgamation b/contrib/sqlite-amalgamation
index 400ad7152a0..20598079891 160000
--- a/contrib/sqlite-amalgamation
+++ b/contrib/sqlite-amalgamation
@@ -1 +1 @@
-Subproject commit 400ad7152a0c7ee07756d96ab4f6a8f6d1080916
+Subproject commit 20598079891d27ef1a3ad3f66bbfa3f983c25268
diff --git a/contrib/sysroot b/contrib/sysroot
index f0081b2649b..e0d1b64da66 160000
--- a/contrib/sysroot
+++ b/contrib/sysroot
@@ -1 +1 @@
-Subproject commit f0081b2649b94837855f3bc7d05ef326b100bad8
+Subproject commit e0d1b64da666afbfaa6f1ee0487c33f3fd2cd5cb
diff --git a/contrib/update-submodules.sh b/contrib/update-submodules.sh
new file mode 100755
index 00000000000..c94681e6240
--- /dev/null
+++ b/contrib/update-submodules.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+WORKDIR=$(dirname "$0")
+WORKDIR=$(readlink -f "${WORKDIR}")
+
+"$WORKDIR/sparse-checkout/setup-sparse-checkout.sh"
+git submodule init
+git submodule sync
+git submodule update --depth=1
diff --git a/contrib/vectorscan b/contrib/vectorscan
index f6250ae3e5a..38431d11178 160000
--- a/contrib/vectorscan
+++ b/contrib/vectorscan
@@ -1 +1 @@
-Subproject commit f6250ae3e5a3085000239313ad0689cc1e00cdc2
+Subproject commit 38431d111781843741a781a57a6381a527d900a4
diff --git a/contrib/zlib-ng-cmake/CMakeLists.txt b/contrib/zlib-ng-cmake/CMakeLists.txt
index aa067ba37e0..79f343bfc75 100644
--- a/contrib/zlib-ng-cmake/CMakeLists.txt
+++ b/contrib/zlib-ng-cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-set (SOURCE_DIR ${CMAKE_SOURCE_DIR}/contrib/zlib-ng)
+set (SOURCE_DIR ${PROJECT_SOURCE_DIR}/contrib/zlib-ng)
 
 add_definitions(-DZLIB_COMPAT)
 add_definitions(-DWITH_GZFILEOP)
diff --git a/contrib/zstd b/contrib/zstd
index 945f27758c0..63779c79823 160000
--- a/contrib/zstd
+++ b/contrib/zstd
@@ -1 +1 @@
-Subproject commit 945f27758c0fd67b636103a38dbf050266c6b90a
+Subproject commit 63779c798237346c2b245c546c40b72a5a5913fe
diff --git a/docker/bare/README.md b/docker/bare/README.md
index 0a610b1de90..4baf308f1e1 100644
--- a/docker/bare/README.md
+++ b/docker/bare/README.md
@@ -1,6 +1,6 @@
 ## The bare minimum ClickHouse Docker image.
 
-It is intented as a showcase to check the amount of implicit dependencies of ClickHouse from the OS in addition to the OS kernel.
+It is intended as a showcase to check the amount of implicit dependencies of ClickHouse from the OS in addition to the OS kernel.
 
 Example usage:
 
diff --git a/docker/docs/builder/Dockerfile b/docker/docs/builder/Dockerfile
index 5946687dbef..3ca2bdafcb3 100644
--- a/docker/docs/builder/Dockerfile
+++ b/docker/docs/builder/Dockerfile
@@ -1,4 +1,3 @@
-# rebuild in #36968
 # docker build -t clickhouse/docs-builder .
 # nodejs 17 prefers ipv6 and is broken in our environment
 FROM node:16-alpine
diff --git a/docker/images.json b/docker/images.json
index 508138d79af..b4f3e755bd1 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -123,7 +123,8 @@
             "docker/test/stateless",
             "docker/test/integration/base",
             "docker/test/fuzzer",
-            "docker/test/keeper-jepsen"
+            "docker/test/keeper-jepsen",
+            "docker/test/server-jepsen"
          ]
     },
     "docker/test/integration/kerberized_hadoop": {
@@ -139,6 +140,10 @@
         "name": "clickhouse/keeper-jepsen-test",
         "dependent": []
     },
+    "docker/test/server-jepsen": {
+        "name": "clickhouse/server-jepsen-test",
+        "dependent": []
+    },
     "docker/test/install/deb": {
         "name": "clickhouse/install-deb-test",
         "dependent": []
@@ -151,5 +156,9 @@
         "name": "clickhouse/docs-builder",
         "dependent": [
         ]
+    },
+    "docker/test/sqllogic": {
+        "name": "clickhouse/sqllogic-test",
+        "dependent": []
     }
 }
diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile
index 09395befdad..73da4515ff4 100644
--- a/docker/keeper/Dockerfile
+++ b/docker/keeper/Dockerfile
@@ -1,3 +1,6 @@
+# The Dockerfile.ubuntu exists for the tests/ci/docker_server.py script
+# If the image is built from Dockerfile.alpine, then the `-alpine` suffix is added automatically,
+# so the only purpose of Dockerfile.ubuntu is to push `latest`, `head` and so on w/o suffixes
 FROM ubuntu:20.04 AS glibc-donor
 
 ARG TARGETARCH
@@ -29,7 +32,7 @@ RUN arch=${TARGETARCH:-amd64} \
     esac
 
 ARG REPOSITORY="https://s3.amazonaws.com/clickhouse-builds/22.4/31c367d3cd3aefd316778601ff6565119fe36682/package_release"
-ARG VERSION="23.2.1.2537"
+ARG VERSION="23.4.2.11"
 ARG PACKAGES="clickhouse-keeper"
 
 # user/group precreated explicitly with fixed uid/gid on purpose.
diff --git a/docker/keeper/Dockerfile.ubuntu b/docker/keeper/Dockerfile.ubuntu
new file mode 120000
index 00000000000..1d1fe94df49
--- /dev/null
+++ b/docker/keeper/Dockerfile.ubuntu
@@ -0,0 +1 @@
+Dockerfile
\ No newline at end of file
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 62e6d47c183..fa860b2207f 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -69,13 +69,14 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
         libc6 \
         libc6-dev \
         libc6-dev-arm64-cross \
+        python3-boto3 \
         yasm \
         zstd \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists
 
 # Download toolchain and SDK for Darwin
-RUN wget -nv https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.0.sdk.tar.xz
+RUN curl -sL -O https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.0.sdk.tar.xz
 
 # Architecture of the image when BuildKit/buildx is used
 ARG TARGETARCH
@@ -97,7 +98,7 @@ ENV PATH="$PATH:/usr/local/go/bin"
 ENV GOPATH=/workdir/go
 ENV GOCACHE=/workdir/
 
-ARG CLANG_TIDY_SHA1=03644275e794b0587849bfc2ec6123d5ae0bdb1c
+ARG CLANG_TIDY_SHA1=c191254ea00d47ade11d7170ef82fe038c213774
 RUN curl -Lo /usr/bin/clang-tidy-cache \
         "https://raw.githubusercontent.com/matus-chochlik/ctcache/$CLANG_TIDY_SHA1/clang-tidy-cache" \
     && chmod +x /usr/bin/clang-tidy-cache
diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index 24dca72e946..2cd0a011013 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -6,6 +6,7 @@ exec &> >(ts)
 ccache_status () {
     ccache --show-config ||:
     ccache --show-stats ||:
+    SCCACHE_NO_DAEMON=1 sccache --show-stats ||:
 }
 
 [ -O /build ] || git config --global --add safe.directory /build
diff --git a/docker/packager/packager b/docker/packager/packager
index 58dd299fd6d..a894fe2d8e9 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -5,13 +5,19 @@ import os
 import argparse
 import logging
 import sys
-from typing import List
+from pathlib import Path
+from typing import List, Optional
 
-SCRIPT_PATH = os.path.realpath(__file__)
+SCRIPT_PATH = Path(__file__).absolute()
 IMAGE_TYPE = "binary"
+IMAGE_NAME = f"clickhouse/{IMAGE_TYPE}-builder"
 
 
-def check_image_exists_locally(image_name):
+class BuildException(Exception):
+    pass
+
+
+def check_image_exists_locally(image_name: str) -> bool:
     try:
         output = subprocess.check_output(
             f"docker images -q {image_name} 2> /dev/null", shell=True
@@ -21,17 +27,17 @@ def check_image_exists_locally(image_name):
         return False
 
 
-def pull_image(image_name):
+def pull_image(image_name: str) -> bool:
     try:
         subprocess.check_call(f"docker pull {image_name}", shell=True)
         return True
     except subprocess.CalledProcessError:
-        logging.info(f"Cannot pull image {image_name}".format())
+        logging.info("Cannot pull image %s", image_name)
         return False
 
 
-def build_image(image_name, filepath):
-    context = os.path.dirname(filepath)
+def build_image(image_name: str, filepath: Path) -> None:
+    context = filepath.parent
     build_cmd = f"docker build --network=host -t {image_name} -f {filepath} {context}"
     logging.info("Will build image with cmd: '%s'", build_cmd)
     subprocess.check_call(
@@ -40,7 +46,7 @@ def build_image(image_name, filepath):
     )
 
 
-def pre_build(repo_path: str, env_variables: List[str]):
+def pre_build(repo_path: Path, env_variables: List[str]):
     if "WITH_PERFORMANCE=1" in env_variables:
         current_branch = subprocess.check_output(
             "git branch --show-current", shell=True, encoding="utf-8"
@@ -56,7 +62,9 @@ def pre_build(repo_path: str, env_variables: List[str]):
             # conclusion is: in the current state the easiest way to go is to force
             # unshallow repository for performance artifacts.
             # To change it we need to rework our performance tests docker image
-            raise Exception("shallow repository is not suitable for performance builds")
+            raise BuildException(
+                "shallow repository is not suitable for performance builds"
+            )
         if current_branch != "master":
             cmd = (
                 f"git -C {repo_path} fetch --no-recurse-submodules "
@@ -67,14 +75,14 @@ def pre_build(repo_path: str, env_variables: List[str]):
 
 
 def run_docker_image_with_env(
-    image_name,
-    as_root,
-    output,
-    env_variables,
-    ch_root,
-    ccache_dir,
-    docker_image_version,
+    image_name: str,
+    as_root: bool,
+    output_dir: Path,
+    env_variables: List[str],
+    ch_root: Path,
+    ccache_dir: Optional[Path],
 ):
+    output_dir.mkdir(parents=True, exist_ok=True)
     env_part = " -e ".join(env_variables)
     if env_part:
         env_part = " -e " + env_part
@@ -89,10 +97,14 @@ def run_docker_image_with_env(
     else:
         user = f"{os.geteuid()}:{os.getegid()}"
 
+    ccache_mount = f"--volume={ccache_dir}:/ccache"
+    if ccache_dir is None:
+        ccache_mount = ""
+
     cmd = (
-        f"docker run --network=host --user={user} --rm --volume={output}:/output "
-        f"--volume={ch_root}:/build --volume={ccache_dir}:/ccache {env_part} "
-        f"{interactive} {image_name}:{docker_image_version}"
+        f"docker run --network=host --user={user} --rm {ccache_mount}"
+        f"--volume={output_dir}:/output --volume={ch_root}:/build {env_part} "
+        f"{interactive} {image_name}"
     )
 
     logging.info("Will build ClickHouse pkg with cmd: '%s'", cmd)
@@ -100,24 +112,25 @@ def run_docker_image_with_env(
     subprocess.check_call(cmd, shell=True)
 
 
-def is_release_build(build_type, package_type, sanitizer):
+def is_release_build(build_type: str, package_type: str, sanitizer: str) -> bool:
     return build_type == "" and package_type == "deb" and sanitizer == ""
 
 
 def parse_env_variables(
-    build_type,
-    compiler,
-    sanitizer,
-    package_type,
-    cache,
-    distcc_hosts,
-    clang_tidy,
-    version,
-    author,
-    official,
-    additional_pkgs,
-    with_coverage,
-    with_binaries,
+    build_type: str,
+    compiler: str,
+    sanitizer: str,
+    package_type: str,
+    cache: str,
+    s3_bucket: str,
+    s3_directory: str,
+    s3_rw_access: bool,
+    clang_tidy: bool,
+    version: str,
+    official: bool,
+    additional_pkgs: bool,
+    with_coverage: bool,
+    with_binaries: str,
 ):
     DARWIN_SUFFIX = "-darwin"
     DARWIN_ARM_SUFFIX = "-darwin-aarch64"
@@ -243,32 +256,43 @@ def parse_env_variables(
     else:
         result.append("BUILD_TYPE=None")
 
-    if cache == "distcc":
-        result.append(f"CCACHE_PREFIX={cache}")
+    if not cache:
+        cmake_flags.append("-DCOMPILER_CACHE=disabled")
 
-    if cache:
+    if cache == "ccache":
+        cmake_flags.append("-DCOMPILER_CACHE=ccache")
         result.append("CCACHE_DIR=/ccache")
         result.append("CCACHE_COMPRESSLEVEL=5")
         result.append("CCACHE_BASEDIR=/build")
         result.append("CCACHE_NOHASHDIR=true")
         result.append("CCACHE_COMPILERCHECK=content")
-        cache_maxsize = "15G"
-        if clang_tidy:
-            # 15G is not enough for tidy build
-            cache_maxsize = "25G"
+        result.append("CCACHE_MAXSIZE=15G")
 
-            # `CTCACHE_DIR` has the same purpose as the `CCACHE_DIR` above.
-            # It's there to have the clang-tidy cache embedded into our standard `CCACHE_DIR`
+    if cache == "sccache":
+        cmake_flags.append("-DCOMPILER_CACHE=sccache")
+        # see https://github.com/mozilla/sccache/blob/main/docs/S3.md
+        result.append(f"SCCACHE_BUCKET={s3_bucket}")
+        sccache_dir = "sccache"
+        if s3_directory:
+            sccache_dir = f"{s3_directory}/{sccache_dir}"
+        result.append(f"SCCACHE_S3_KEY_PREFIX={sccache_dir}")
+        if not s3_rw_access:
+            result.append("SCCACHE_S3_NO_CREDENTIALS=true")
+
+    if clang_tidy:
+        # `CTCACHE_DIR` has the same purpose as the `CCACHE_DIR` above.
+        # It's there to have the clang-tidy cache embedded into our standard `CCACHE_DIR`
+        if cache == "ccache":
             result.append("CTCACHE_DIR=/ccache/clang-tidy-cache")
-        result.append(f"CCACHE_MAXSIZE={cache_maxsize}")
-
-    if distcc_hosts:
-        hosts_with_params = [f"{host}/24,lzo" for host in distcc_hosts] + [
-            "localhost/`nproc`"
-        ]
-        result.append('DISTCC_HOSTS="' + " ".join(hosts_with_params) + '"')
-    elif cache == "distcc":
-        result.append('DISTCC_HOSTS="localhost/`nproc`"')
+        if s3_bucket:
+            # see https://github.com/matus-chochlik/ctcache#environment-variables
+            ctcache_dir = "clang-tidy-cache"
+            if s3_directory:
+                ctcache_dir = f"{s3_directory}/{ctcache_dir}"
+            result.append(f"CTCACHE_S3_BUCKET={s3_bucket}")
+            result.append(f"CTCACHE_S3_FOLDER={ctcache_dir}")
+            if not s3_rw_access:
+                result.append("CTCACHE_S3_NO_CREDENTIALS=true")
 
     if additional_pkgs:
         # NOTE: This are the env for packages/build script
@@ -300,9 +324,6 @@ def parse_env_variables(
     if version:
         result.append(f"VERSION_STRING='{version}'")
 
-    if author:
-        result.append(f"AUTHOR='{author}'")
-
     if official:
         cmake_flags.append("-DCLICKHOUSE_OFFICIAL_BUILD=1")
 
@@ -312,14 +333,14 @@ def parse_env_variables(
     return result
 
 
-def dir_name(name: str) -> str:
-    if not os.path.isabs(name):
-        name = os.path.abspath(os.path.join(os.getcwd(), name))
-    return name
+def dir_name(name: str) -> Path:
+    path = Path(name)
+    if not path.is_absolute():
+        path = Path.cwd() / name
+    return path
 
 
-if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO, format="%(asctime)s %(message)s")
+def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
         description="ClickHouse building script using prebuilt Docker image",
@@ -331,7 +352,7 @@ if __name__ == "__main__":
     )
     parser.add_argument(
         "--clickhouse-repo-path",
-        default=os.path.join(os.path.dirname(SCRIPT_PATH), os.pardir, os.pardir),
+        default=SCRIPT_PATH.parents[2],
         type=dir_name,
         help="ClickHouse git repository",
     )
@@ -341,17 +362,16 @@ if __name__ == "__main__":
     parser.add_argument(
         "--compiler",
         choices=(
-            "clang-15",
-            "clang-15-darwin",
-            "clang-15-darwin-aarch64",
-            "clang-15-aarch64",
-            "clang-15-aarch64-v80compat",
-            "clang-15-ppc64le",
-            "clang-15-amd64-compat",
-            "clang-15-freebsd",
-            "gcc-11",
+            "clang-16",
+            "clang-16-darwin",
+            "clang-16-darwin-aarch64",
+            "clang-16-aarch64",
+            "clang-16-aarch64-v80compat",
+            "clang-16-ppc64le",
+            "clang-16-amd64-compat",
+            "clang-16-freebsd",
         ),
-        default="clang-15",
+        default="clang-16",
         help="a compiler to use",
     )
     parser.add_argument(
@@ -361,17 +381,34 @@ if __name__ == "__main__":
     )
 
     parser.add_argument("--clang-tidy", action="store_true")
-    parser.add_argument("--cache", choices=("ccache", "distcc", ""), default="")
     parser.add_argument(
-        "--ccache_dir",
-        default=os.getenv("HOME", "") + "/.ccache",
+        "--cache",
+        choices=("ccache", "sccache", ""),
+        default="",
+        help="ccache or sccache for objects caching; sccache uses only S3 buckets",
+    )
+    parser.add_argument(
+        "--ccache-dir",
+        default=Path.home() / ".ccache",
         type=dir_name,
         help="a directory with ccache",
     )
-    parser.add_argument("--distcc-hosts", nargs="+")
+    parser.add_argument(
+        "--s3-bucket",
+        help="an S3 bucket used for sscache and clang-tidy-cache",
+    )
+    parser.add_argument(
+        "--s3-directory",
+        default="ccache",
+        help="an S3 directory prefix used for sscache and clang-tidy-cache",
+    )
+    parser.add_argument(
+        "--s3-rw-access",
+        action="store_true",
+        help="if set, the build fails on errors writing cache to S3",
+    )
     parser.add_argument("--force-build-image", action="store_true")
     parser.add_argument("--version")
-    parser.add_argument("--author", default="clickhouse", help="a package author")
     parser.add_argument("--official", action="store_true")
     parser.add_argument("--additional-pkgs", action="store_true")
     parser.add_argument("--with-coverage", action="store_true")
@@ -387,34 +424,54 @@ if __name__ == "__main__":
 
     args = parser.parse_args()
 
-    image_name = f"clickhouse/{IMAGE_TYPE}-builder"
+    if args.additional_pkgs and args.package_type != "deb":
+        raise argparse.ArgumentTypeError(
+            "Can build additional packages only in deb build"
+        )
+
+    if args.cache != "ccache":
+        args.ccache_dir = None
+
+    if args.with_binaries != "":
+        if args.package_type != "deb":
+            raise argparse.ArgumentTypeError(
+                "Can add additional binaries only in deb build"
+            )
+        logging.info("Should place %s to output", args.with_binaries)
+
+    if args.cache == "sccache":
+        if not args.s3_bucket:
+            raise argparse.ArgumentTypeError("sccache must have --s3-bucket set")
+
+    return args
+
+
+def main():
+    logging.basicConfig(level=logging.INFO, format="%(asctime)s %(message)s")
+    args = parse_args()
 
     ch_root = args.clickhouse_repo_path
 
-    if args.additional_pkgs and args.package_type != "deb":
-        raise Exception("Can build additional packages only in deb build")
+    dockerfile = ch_root / "docker/packager" / IMAGE_TYPE / "Dockerfile"
+    image_with_version = IMAGE_NAME + ":" + args.docker_image_version
+    if args.force_build_image:
+        build_image(image_with_version, dockerfile)
+    elif not (
+        check_image_exists_locally(image_with_version) or pull_image(image_with_version)
+    ):
+        build_image(image_with_version, dockerfile)
 
-    if args.with_binaries != "" and args.package_type != "deb":
-        raise Exception("Can add additional binaries only in deb build")
-
-    if args.with_binaries != "" and args.package_type == "deb":
-        logging.info("Should place %s to output", args.with_binaries)
-
-    dockerfile = os.path.join(ch_root, "docker/packager", IMAGE_TYPE, "Dockerfile")
-    image_with_version = image_name + ":" + args.docker_image_version
-    if not check_image_exists_locally(image_name) or args.force_build_image:
-        if not pull_image(image_with_version) or args.force_build_image:
-            build_image(image_with_version, dockerfile)
     env_prepared = parse_env_variables(
         args.build_type,
         args.compiler,
         args.sanitizer,
         args.package_type,
         args.cache,
-        args.distcc_hosts,
+        args.s3_bucket,
+        args.s3_directory,
+        args.s3_rw_access,
         args.clang_tidy,
         args.version,
-        args.author,
         args.official,
         args.additional_pkgs,
         args.with_coverage,
@@ -423,12 +480,15 @@ if __name__ == "__main__":
 
     pre_build(args.clickhouse_repo_path, env_prepared)
     run_docker_image_with_env(
-        image_name,
+        image_with_version,
         args.as_root,
         args.output_dir,
         env_prepared,
         ch_root,
         args.ccache_dir,
-        args.docker_image_version,
     )
     logging.info("Output placed into %s", args.output_dir)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine
index 472f25eed2d..1a5d2071f6b 100644
--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@@ -33,7 +33,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # lts / testing / prestable / etc
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="23.2.1.2537"
+ARG VERSION="23.4.2.11"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 # user/group precreated explicitly with fixed uid/gid on purpose.
diff --git a/docker/server/Dockerfile.ubuntu b/docker/server/Dockerfile.ubuntu
index 5dbb244c298..8792d419a16 100644
--- a/docker/server/Dockerfile.ubuntu
+++ b/docker/server/Dockerfile.ubuntu
@@ -22,7 +22,7 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
 
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="deb https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
-ARG VERSION="23.2.1.2537"
+ARG VERSION="23.4.2.11"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 # set non-empty deb_location_url url to create a docker image
diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile
index c6c9fbca421..f6836804454 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -18,13 +18,13 @@ RUN apt-get update \
 # and MEMORY_LIMIT_EXCEEDED exceptions in Functional tests (total memory limit in Functional tests is ~55.24 GiB).
 # TSAN will flush shadow memory when reaching this limit.
 # It may cause false-negatives, but it's better than OOM.
-RUN echo "TSAN_OPTIONS='verbosity=1000 halt_on_error=1 history_size=7 memory_limit_mb=46080'" >> /etc/environment
+RUN echo "TSAN_OPTIONS='verbosity=1000 halt_on_error=1 history_size=7 memory_limit_mb=46080 second_deadlock_stack=1'" >> /etc/environment
 RUN echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment
 RUN echo "MSAN_OPTIONS='abort_on_error=1 poison_in_dtor=1'" >> /etc/environment
 RUN echo "LSAN_OPTIONS='suppressions=/usr/share/clickhouse-test/config/lsan_suppressions.txt'" >> /etc/environment
 # Sanitizer options for current shell (not current, but the one that will be spawned on "docker run")
 # (but w/o verbosity for TSAN, otherwise test.reference will not match)
-ENV TSAN_OPTIONS='halt_on_error=1 history_size=7 memory_limit_mb=46080'
+ENV TSAN_OPTIONS='halt_on_error=1 history_size=7 memory_limit_mb=46080 second_deadlock_stack=1'
 ENV UBSAN_OPTIONS='print_stacktrace=1'
 ENV MSAN_OPTIONS='abort_on_error=1 poison_in_dtor=1'
 
diff --git a/docker/test/codebrowser/Dockerfile b/docker/test/codebrowser/Dockerfile
index b76b8234c81..8136fd1fbbc 100644
--- a/docker/test/codebrowser/Dockerfile
+++ b/docker/test/codebrowser/Dockerfile
@@ -10,53 +10,21 @@ RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 RUN apt-get update && apt-get --yes --allow-unauthenticated install libclang-${LLVM_VERSION}-dev libmlir-${LLVM_VERSION}-dev
 
-# libclang-15-dev does not contain proper symlink:
-#
-# This is what cmake will search for:
-#
-#     # readlink -f /usr/lib/llvm-15/lib/libclang-15.so.1
-#     /usr/lib/x86_64-linux-gnu/libclang-15.so.1
-#
-# This is what exists:
-#
-#     # ls -l /usr/lib/x86_64-linux-gnu/libclang-15*
-#     lrwxrwxrwx 1 root root       16 Sep  5 13:31 /usr/lib/x86_64-linux-gnu/libclang-15.so -> libclang-15.so.1
-#     lrwxrwxrwx 1 root root       21 Sep  5 13:31 /usr/lib/x86_64-linux-gnu/libclang-15.so.15 -> libclang-15.so.15.0.0
-#     -rw-r--r-- 1 root root 31835760 Sep  5 13:31 /usr/lib/x86_64-linux-gnu/libclang-15.so.15.0.0
-#
 ARG TARGETARCH
 RUN arch=${TARGETARCH:-amd64} \
     && case $arch in \
         amd64) rarch=x86_64 ;; \
         arm64) rarch=aarch64 ;; \
         *) exit 1 ;; \
-    esac \
-    && ln -rsf /usr/lib/$rarch-linux-gnu/libclang-15.so.15 /usr/lib/$rarch-linux-gnu/libclang-15.so.1
+    esac
 
 # repo versions doesn't work correctly with C++17
 # also we push reports to s3, so we add index.html to subfolder urls
-# https://github.com/ClickHouse-Extras/woboq_codebrowser/commit/37e15eaf377b920acb0b48dbe82471be9203f76b
-RUN git clone https://github.com/ClickHouse/woboq_codebrowser \
-  && cd woboq_codebrowser \
-  && cmake . -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-${LLVM_VERSION} -DCMAKE_C_COMPILER=clang-${LLVM_VERSION} \
-  && ninja \
-  && cd .. \
-  && rm -rf woboq_codebrowser
+# https://github.com/ClickHouse/woboq_codebrowser/commit/37e15eaf377b920acb0b48dbe82471be9203f76b
+RUN git clone --branch=master --depth=1 https://github.com/ClickHouse/woboq_codebrowser /woboq_codebrowser \
+  && cd /woboq_codebrowser \
+  && cmake . -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-${LLVM_VERSION} -DCMAKE_C_COMPILER=clang-${LLVM_VERSION} -DCLANG_BUILTIN_HEADERS_DIR=/usr/lib/llvm-${LLVM_VERSION}/lib/clang/${LLVM_VERSION}/include \
+  && ninja
 
-ENV CODEGEN=/woboq_codebrowser/generator/codebrowser_generator
-ENV CODEINDEX=/woboq_codebrowser/indexgenerator/codebrowser_indexgenerator
-ENV STATIC_DATA=/woboq_codebrowser/data
-
-ENV SOURCE_DIRECTORY=/repo_folder
-ENV BUILD_DIRECTORY=/build
-ENV HTML_RESULT_DIRECTORY=$BUILD_DIRECTORY/html_report
-ENV SHA=nosha
-ENV DATA="https://s3.amazonaws.com/clickhouse-test-reports/codebrowser/data"
-
-CMD mkdir -p $BUILD_DIRECTORY && cd $BUILD_DIRECTORY && \
-    cmake $SOURCE_DIRECTORY -DCMAKE_CXX_COMPILER=/usr/bin/clang\+\+-${LLVM_VERSION} -DCMAKE_C_COMPILER=/usr/bin/clang-${LLVM_VERSION} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_S3=0 && \
-    mkdir -p $HTML_RESULT_DIRECTORY && \
-    $CODEGEN -b $BUILD_DIRECTORY -a -o $HTML_RESULT_DIRECTORY -p ClickHouse:$SOURCE_DIRECTORY:$SHA -d $DATA | ts '%Y-%m-%d %H:%M:%S' && \
-    cp -r $STATIC_DATA $HTML_RESULT_DIRECTORY/ &&\
-    $CODEINDEX $HTML_RESULT_DIRECTORY -d "$DATA" | ts '%Y-%m-%d %H:%M:%S' && \
-    mv $HTML_RESULT_DIRECTORY /test_output
+COPY build.sh /
+CMD ["bash", "-c", "/build.sh 2>&1"]
diff --git a/docker/test/codebrowser/build.sh b/docker/test/codebrowser/build.sh
new file mode 100755
index 00000000000..d76d0c3a039
--- /dev/null
+++ b/docker/test/codebrowser/build.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -x -e
+
+
+STATIC_DATA=${STATIC_DATA:-/woboq_codebrowser/data}
+SOURCE_DIRECTORY=${SOURCE_DIRECTORY:-/build}
+BUILD_DIRECTORY=${BUILD_DIRECTORY:-/workdir/build}
+OUTPUT_DIRECTORY=${OUTPUT_DIRECTORY:-/workdir/output}
+HTML_RESULT_DIRECTORY=${HTML_RESULT_DIRECTORY:-$OUTPUT_DIRECTORY/html_report}
+SHA=${SHA:-nosha}
+DATA=${DATA:-https://s3.amazonaws.com/clickhouse-test-reports/codebrowser/data}
+nproc=$(($(nproc) + 2)) # increase parallelism
+
+read -ra CMAKE_FLAGS <<< "${CMAKE_FLAGS:-}"
+
+mkdir -p "$BUILD_DIRECTORY" && cd "$BUILD_DIRECTORY"
+cmake "$SOURCE_DIRECTORY" -DCMAKE_CXX_COMPILER="/usr/bin/clang++-${LLVM_VERSION}" -DCMAKE_C_COMPILER="/usr/bin/clang-${LLVM_VERSION}" -DENABLE_WOBOQ_CODEBROWSER=ON "${CMAKE_FLAGS[@]}"
+mkdir -p "$HTML_RESULT_DIRECTORY"
+echo 'Filter out too noisy "Error: filename" lines and keep them in full codebrowser_generator.log'
+/woboq_codebrowser/generator/codebrowser_generator -b "$BUILD_DIRECTORY" -a \
+  -o "$HTML_RESULT_DIRECTORY" --execute-concurrency="$nproc" -p "ClickHouse:$SOURCE_DIRECTORY:$SHA" \
+  -d "$DATA" \
+    |& ts '%Y-%m-%d %H:%M:%S' \
+    | tee "$OUTPUT_DIRECTORY/codebrowser_generator.log" \
+    | grep --line-buffered -v ':[0-9]* Error: '
+cp -r "$STATIC_DATA" "$HTML_RESULT_DIRECTORY/"
+/woboq_codebrowser/indexgenerator/codebrowser_indexgenerator "$HTML_RESULT_DIRECTORY" \
+  -d "$DATA" |& ts '%Y-%m-%d %H:%M:%S'
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index 32546b71eb8..ffb13fc774d 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -20,12 +20,6 @@ RUN apt-get update \
         zstd \
     --yes --no-install-recommends
 
-# Install CMake 3.20+ for Rust compilation
-RUN apt purge cmake --yes
-RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
-RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main'
-RUN apt update && apt install cmake --yes
-
 RUN pip3 install numpy scipy pandas Jinja2
 
 ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index 086276bed55..dab873377ce 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -9,14 +9,15 @@ trap 'kill $(jobs -pr) ||:' EXIT
 stage=${stage:-}
 
 # Compiler version, normally set by Dockerfile
-export LLVM_VERSION=${LLVM_VERSION:-13}
+export LLVM_VERSION=${LLVM_VERSION:-16}
 
 # A variable to pass additional flags to CMake.
 # Here we explicitly default it to nothing so that bash doesn't complain about
 # it being undefined. Also read it as array so that we can pass an empty list
 # of additional variable to cmake properly, and it doesn't generate an extra
 # empty parameter.
-read -ra FASTTEST_CMAKE_FLAGS <<< "${FASTTEST_CMAKE_FLAGS:-}"
+# Read it as CMAKE_FLAGS to not lose exported FASTTEST_CMAKE_FLAGS on subsequential launch
+read -ra CMAKE_FLAGS <<< "${FASTTEST_CMAKE_FLAGS:-}"
 
 # Run only matching tests.
 FASTTEST_FOCUS=${FASTTEST_FOCUS:-""}
@@ -37,6 +38,13 @@ export FASTTEST_DATA
 export FASTTEST_OUT
 export PATH
 
+function ccache_status
+{
+    ccache --show-config ||:
+    ccache --show-stats ||:
+    SCCACHE_NO_DAEMON=1 sccache --show-stats ||:
+}
+
 function start_server
 {
     set -m # Spawn server in its own process groups
@@ -139,6 +147,7 @@ function clone_submodules
             contrib/xxHash
             contrib/simdjson
             contrib/liburing
+            contrib/libfiu
         )
 
         git submodule sync
@@ -171,14 +180,14 @@ function run_cmake
     export CCACHE_COMPILERCHECK=content
     export CCACHE_MAXSIZE=15G
 
-    ccache --show-stats ||:
+    ccache_status
     ccache --zero-stats ||:
 
     mkdir "$FASTTEST_BUILD" ||:
 
     (
         cd "$FASTTEST_BUILD"
-        cmake "$FASTTEST_SOURCE" -DCMAKE_CXX_COMPILER="clang++-${LLVM_VERSION}" -DCMAKE_C_COMPILER="clang-${LLVM_VERSION}" "${CMAKE_LIBS_CONFIG[@]}" "${FASTTEST_CMAKE_FLAGS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/cmake_log.txt"
+        cmake "$FASTTEST_SOURCE" -DCMAKE_CXX_COMPILER="clang++-${LLVM_VERSION}" -DCMAKE_C_COMPILER="clang-${LLVM_VERSION}" "${CMAKE_LIBS_CONFIG[@]}" "${CMAKE_FLAGS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/cmake_log.txt"
     )
 }
 
@@ -186,14 +195,19 @@ function build
 {
     (
         cd "$FASTTEST_BUILD"
-        time ninja clickhouse-bundle 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/build_log.txt"
+        TIMEFORMAT=$'\nreal\t%3R\nuser\t%3U\nsys\t%3S'
+        ( time ninja clickhouse-bundle) |& ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/build_log.txt"
+        BUILD_SECONDS_ELAPSED=$(awk '/^....-..-.. ..:..:.. real\t[0-9]/ {print $4}' < "$FASTTEST_OUTPUT/build_log.txt")
+        echo "build_clickhouse_fasttest_binary: [ OK ] $BUILD_SECONDS_ELAPSED sec." \
+          | ts '%Y-%m-%d %H:%M:%S' \
+          | tee "$FASTTEST_OUTPUT/test_result.txt"
         if [ "$COPY_CLICKHOUSE_BINARY_TO_OUTPUT" -eq "1" ]; then
             cp programs/clickhouse "$FASTTEST_OUTPUT/clickhouse"
 
             strip programs/clickhouse -o "$FASTTEST_OUTPUT/clickhouse-stripped"
             zstd --threads=0 "$FASTTEST_OUTPUT/clickhouse-stripped"
         fi
-        ccache --show-stats ||:
+        ccache_status
         ccache --evict-older-than 1d ||:
     )
 }
@@ -243,7 +257,7 @@ function run_tests
     )
     time clickhouse-test "${test_opts[@]}" -- "$FASTTEST_FOCUS" 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S' \
-        | tee "$FASTTEST_OUTPUT/test_result.txt"
+        | tee -a "$FASTTEST_OUTPUT/test_result.txt"
     set -e
 
     clickhouse stop --pid-path "$FASTTEST_DATA"
diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 75f2a0af358..d2c8de7a211 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -15,7 +15,7 @@ stage=${stage:-}
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 echo "$script_dir"
 repo_dir=ch
-BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-15_debug_none_unsplitted_disable_False_binary"}
+BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-16_debug_none_unsplitted_disable_False_binary"}
 BINARY_URL_TO_DOWNLOAD=${BINARY_URL_TO_DOWNLOAD:="https://clickhouse-builds.s3.amazonaws.com/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/$BINARY_TO_DOWNLOAD/clickhouse"}
 
 function git_clone_with_retry
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index ce5bae2a031..14c97e479f6 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -32,6 +32,7 @@ RUN apt-get update \
     libssl-dev \
     libcurl4-openssl-dev \
     gdb \
+    default-jdk \
     software-properties-common \
     libkrb5-dev \
     krb5-user \
@@ -46,10 +47,9 @@ ENV TZ=Etc/UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ENV DOCKER_CHANNEL stable
-RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-RUN add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -c -s) ${DOCKER_CHANNEL}"
-
-RUN apt-get update \
+RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
+    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -c -s) ${DOCKER_CHANNEL}" \
+    && apt-get update \
     && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         docker-ce \
     && rm -rf \
@@ -60,7 +60,7 @@ RUN apt-get update \
 
 RUN dockerd --version; docker --version
 
-RUN python3 -m pip install \
+RUN python3 -m pip install --no-cache-dir \
     PyMySQL \
     aerospike==4.0.0 \
     avro==1.10.2 \
@@ -92,15 +92,25 @@ RUN python3 -m pip install \
     tzlocal==2.1 \
     urllib3 \
     requests-kerberos \
+    pyspark==3.3.2 \
+    delta-spark==2.2.0 \
     pyhdfs \
     azure-storage-blob \
-    meilisearch==0.18.3 
+    meilisearch==0.18.3
 
 COPY modprobe.sh /usr/local/bin/modprobe
 COPY dockerd-entrypoint.sh /usr/local/bin/
 COPY compose/ /compose/
 COPY misc/ /misc/
 
+RUN curl -fsSL -O https://dlcdn.apache.org/spark/spark-3.3.2/spark-3.3.2-bin-hadoop3.tgz \
+    && tar xzvf spark-3.3.2-bin-hadoop3.tgz -C / \
+    && rm spark-3.3.2-bin-hadoop3.tgz
+
+# download spark and packages
+# if you change packages, don't forget to update them in tests/integration/helpers/cluster.py
+RUN echo ":quit" | /spark-3.3.2-bin-hadoop3/bin/spark-shell --packages "org.apache.hudi:hudi-spark3.3-bundle_2.12:0.13.0,io.delta:delta-core_2.12:2.2.0,org.apache.iceberg:iceberg-spark-runtime-3.3_2.12:1.1.0" > /dev/null
+
 RUN set -x \
   && addgroup --system dockremap \
     && adduser --system dockremap \
@@ -108,6 +118,12 @@ RUN set -x \
   && echo 'dockremap:165536:65536' >> /etc/subuid \
     && echo 'dockremap:165536:65536' >> /etc/subgid
 
+# Same options as in test/base/Dockerfile
+# (in case you need to override them in tests)
+ENV TSAN_OPTIONS='halt_on_error=1 history_size=7 memory_limit_mb=46080 second_deadlock_stack=1'
+ENV UBSAN_OPTIONS='print_stacktrace=1'
+ENV MSAN_OPTIONS='abort_on_error=1 poison_in_dtor=1'
+
 EXPOSE 2375
 ENTRYPOINT ["dockerd-entrypoint.sh"]
 CMD ["sh", "-c", "pytest $PYTEST_OPTS"]
diff --git a/docker/test/integration/runner/dockerd-entrypoint.sh b/docker/test/integration/runner/dockerd-entrypoint.sh
index c16b2bf1087..fe47fc90951 100755
--- a/docker/test/integration/runner/dockerd-entrypoint.sh
+++ b/docker/test/integration/runner/dockerd-entrypoint.sh
@@ -16,7 +16,9 @@ echo '{
 # and on hung you can simply press Ctrl-C and it will spawn a python pdb,
 # but on SIGINT dockerd will exit, so ignore it to preserve the daemon.
 trap '' INT
-dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --default-address-pool base=172.17.0.0/12,size=24 &>/ClickHouse/tests/integration/dockerd.log &
+# Binding to an IP address without --tlsverify is deprecated. Startup is intentionally being slowed
+# unless --tls=false or --tlsverify=false is set
+dockerd --host=unix:///var/run/docker.sock --tls=false --host=tcp://0.0.0.0:2375 --default-address-pool base=172.17.0.0/12,size=24 &>/ClickHouse/tests/integration/dockerd.log &
 
 set +e
 reties=0
@@ -37,6 +39,12 @@ set -e
     docker ps --all --quiet | xargs --no-run-if-empty docker rm || true
 }
 
+java_path="$(update-alternatives --config java | sed -n 's/.*(providing \/usr\/bin\/java): //p')"
+export JAVA_PATH=$java_path
+export SPARK_HOME="/spark-3.3.2-bin-hadoop3"
+export PATH=$SPARK_HOME/bin:$PATH
+export JAVA_TOOL_OPTIONS="-Djdk.attach.allowAttachSelf=true"
+
 echo "Start tests"
 export CLICKHOUSE_TESTS_SERVER_BIN_PATH=/clickhouse
 export CLICKHOUSE_TESTS_CLIENT_BIN_PATH=/clickhouse
diff --git a/docker/test/keeper-jepsen/run.sh b/docker/test/keeper-jepsen/run.sh
index 5e321b7c347..694d7fcd916 100644
--- a/docker/test/keeper-jepsen/run.sh
+++ b/docker/test/keeper-jepsen/run.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 
-CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.amazonaws.com/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-15_relwithdebuginfo_none_unsplitted_disable_False_binary/clickhouse"}
+CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.amazonaws.com/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-16_relwithdebuginfo_none_unsplitted_disable_False_binary/clickhouse"}
 CLICKHOUSE_REPO_PATH=${CLICKHOUSE_REPO_PATH:=""}
 
 
diff --git a/docker/test/performance-comparison/download.sh b/docker/test/performance-comparison/download.sh
index e3df98c7da1..aee11030068 100755
--- a/docker/test/performance-comparison/download.sh
+++ b/docker/test/performance-comparison/download.sh
@@ -3,7 +3,9 @@ set -ex
 set -o pipefail
 trap "exit" INT TERM
 trap 'kill $(jobs -pr) ||:' EXIT
+S3_URL=${S3_URL:="https://clickhouse-builds.s3.amazonaws.com"}
 BUILD_NAME=${BUILD_NAME:-package_release}
+export S3_URL BUILD_NAME
 
 mkdir db0 ||:
 mkdir left ||:
@@ -28,8 +30,9 @@ function download
     # Historically there were various paths for the performance test package.
     # Test all of them.
     declare -a urls_to_try=(
-        "https://s3.amazonaws.com/clickhouse-builds/$left_pr/$left_sha/$BUILD_NAME/performance.tar.zst"
-        "https://s3.amazonaws.com/clickhouse-builds/$left_pr/$left_sha/$BUILD_NAME/performance.tgz"
+        "$S3_URL/PRs/$left_pr/$left_sha/$BUILD_NAME/performance.tar.zst"
+        "$S3_URL/$left_pr/$left_sha/$BUILD_NAME/performance.tar.zst"
+        "$S3_URL/$left_pr/$left_sha/$BUILD_NAME/performance.tgz"
     )
 
     for path in "${urls_to_try[@]}"
diff --git a/docker/test/performance-comparison/entrypoint.sh b/docker/test/performance-comparison/entrypoint.sh
index 75b25412ac4..74571777be0 100755
--- a/docker/test/performance-comparison/entrypoint.sh
+++ b/docker/test/performance-comparison/entrypoint.sh
@@ -6,11 +6,7 @@ export CHPC_CHECK_START_TIMESTAMP
 
 S3_URL=${S3_URL:="https://clickhouse-builds.s3.amazonaws.com"}
 BUILD_NAME=${BUILD_NAME:-package_release}
-
-COMMON_BUILD_PREFIX="/clickhouse_build_check"
-if [[ $S3_URL == *"s3.amazonaws.com"* ]]; then
-    COMMON_BUILD_PREFIX=""
-fi
+export S3_URL BUILD_NAME
 
 # Sometimes AWS responde with DNS error and it's impossible to retry it with
 # current curl version options.
@@ -66,8 +62,9 @@ function find_reference_sha
         # test all of them.
         unset found
         declare -a urls_to_try=(
-            "https://s3.amazonaws.com/clickhouse-builds/0/$REF_SHA/$BUILD_NAME/performance.tar.zst"
-            "https://s3.amazonaws.com/clickhouse-builds/0/$REF_SHA/$BUILD_NAME/performance.tgz"
+            "$S3_URL/PRs/0/$REF_SHA/$BUILD_NAME/performance.tar.zst"
+            "$S3_URL/0/$REF_SHA/$BUILD_NAME/performance.tar.zst"
+            "$S3_URL/0/$REF_SHA/$BUILD_NAME/performance.tgz"
         )
         for path in "${urls_to_try[@]}"
         do
@@ -92,10 +89,15 @@ chmod 777 workspace output
 cd workspace
 
 # Download the package for the version we are going to test.
-if curl_with_retry "$S3_URL/$PR_TO_TEST/$SHA_TO_TEST$COMMON_BUILD_PREFIX/$BUILD_NAME/performance.tar.zst"
-then
-    right_path="$S3_URL/$PR_TO_TEST/$SHA_TO_TEST$COMMON_BUILD_PREFIX/$BUILD_NAME/performance.tar.zst"
-fi
+# A temporary solution for migrating into PRs directory
+for prefix in "$S3_URL/PRs" "$S3_URL";
+do
+    if curl_with_retry "$prefix/$PR_TO_TEST/$SHA_TO_TEST/$BUILD_NAME/performance.tar.zst"
+    then
+        right_path="$prefix/$PR_TO_TEST/$SHA_TO_TEST/$BUILD_NAME/performance.tar.zst"
+        break
+    fi
+done
 
 mkdir right
 wget -nv -nd -c "$right_path" -O- | tar -C right --no-same-owner --strip-components=1 --zstd --extract --verbose
diff --git a/docker/test/performance-comparison/perf.py b/docker/test/performance-comparison/perf.py
index 65bf49c2914..7a4e6386d0d 100755
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@@ -26,6 +26,7 @@ logging.basicConfig(
 total_start_seconds = time.perf_counter()
 stage_start_seconds = total_start_seconds
 
+
 # Thread executor that does not hides exception that happens during function
 # execution, and rethrows it after join()
 class SafeThread(Thread):
@@ -158,6 +159,7 @@ for e in subst_elems:
 
     available_parameters[name] = values
 
+
 # Takes parallel lists of templates, substitutes them with all combos of
 # parameters. The set of parameters is determined based on the first list.
 # Note: keep the order of queries -- sometimes we have DROP IF EXISTS
diff --git a/docker/test/performance-comparison/report.py b/docker/test/performance-comparison/report.py
index 782cf29863c..214f2d550b4 100755
--- a/docker/test/performance-comparison/report.py
+++ b/docker/test/performance-comparison/report.py
@@ -670,7 +670,6 @@ if args.report == "main":
     )
 
 elif args.report == "all-queries":
-
     print((header_template.format()))
 
     add_tested_commits()
diff --git a/docker/test/server-jepsen/Dockerfile b/docker/test/server-jepsen/Dockerfile
index 958dbfa066a..a212427b2a1 100644
--- a/docker/test/server-jepsen/Dockerfile
+++ b/docker/test/server-jepsen/Dockerfile
@@ -16,6 +16,11 @@ ENV TESTS_TO_RUN="8"
 ENV TIME_LIMIT="30"
 
 ENV KEEPER_NODE=""
+ENV NEMESIS=""
+ENV WORKLOAD=""
+ENV WITH_LOCAL_BINARY=""
+ENV RATE=""
+ENV CONCURRENCY=""
 
 
 # volumes
diff --git a/docker/test/server-jepsen/run.sh b/docker/test/server-jepsen/run.sh
index 4a966d50f74..0c3768df813 100644
--- a/docker/test/server-jepsen/run.sh
+++ b/docker/test/server-jepsen/run.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 
-CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.amazonaws.com/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-15_relwithdebuginfo_none_unsplitted_disable_False_binary/clickhouse"}
+CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.amazonaws.com/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-16_relwithdebuginfo_none_unsplitted_disable_False_binary/clickhouse"}
 CLICKHOUSE_REPO_PATH=${CLICKHOUSE_REPO_PATH:=""}
 
 
@@ -15,8 +15,38 @@ if [ -z "$CLICKHOUSE_REPO_PATH" ]; then
     ls -lath ||:
 fi
 
+clickhouse_source="--clickhouse-source $CLICKHOUSE_PACKAGE"
+if [ -n "$WITH_LOCAL_BINARY" ]; then
+    clickhouse_source="--clickhouse-source /clickhouse"
+fi
+
+tests_count="--test-count $TESTS_TO_RUN"
+tests_to_run="test-all"
+workload=""
+if [ -n "$WORKLOAD" ]; then
+    tests_to_run="test"
+    workload="--workload $WORKLOAD"
+    tests_count=""
+fi
+
+nemesis=""
+if [ -n "$NEMESIS" ]; then
+    nemesis="--nemesis $NEMESIS"
+fi
+
+rate=""
+if [ -n "$RATE" ]; then
+    rate="--rate $RATE"
+fi
+
+concurrency=""
+if [ -n "$CONCURRENCY" ]; then
+    concurrency="--concurrency $CONCURRENCY"
+fi
+
+
 cd "$CLICKHOUSE_REPO_PATH/tests/jepsen.clickhouse"
 
-(lein run server test-all --keeper "$KEEPER_NODE" --nodes-file "$NODES_FILE_PATH" --username "$NODES_USERNAME" --logging-json --password "$NODES_PASSWORD" --time-limit "$TIME_LIMIT" --concurrency 50 -r 50 --clickhouse-source "$CLICKHOUSE_PACKAGE" --test-count "$TESTS_TO_RUN" || true) | tee "$TEST_OUTPUT/jepsen_run_all_tests.log"
+(lein run server $tests_to_run $workload --keeper "$KEEPER_NODE" $concurrency $nemesis $rate --nodes-file "$NODES_FILE_PATH" --username "$NODES_USERNAME" --logging-json --password "$NODES_PASSWORD" --time-limit "$TIME_LIMIT" --concurrency 50 $clickhouse_source $tests_count --reuse-binary || true) | tee "$TEST_OUTPUT/jepsen_run_all_tests.log"
 
 mv store "$TEST_OUTPUT/"
diff --git a/docker/test/sqllogic/Dockerfile b/docker/test/sqllogic/Dockerfile
new file mode 100644
index 00000000000..83dcf7e1f56
--- /dev/null
+++ b/docker/test/sqllogic/Dockerfile
@@ -0,0 +1,45 @@
+# docker build -t clickhouse/sqllogic-test .
+ARG FROM_TAG=latest
+FROM clickhouse/test-base:$FROM_TAG
+
+RUN apt-get update --yes \
+    && env DEBIAN_FRONTEND=noninteractive \
+        apt-get install --yes --no-install-recommends \
+            wget \
+            git \
+            python3 \
+            python3-dev \
+            python3-pip \
+            sqlite3 \
+            unixodbc \
+            unixodbc-dev \
+            sudo \
+    && apt-get clean
+
+RUN pip3 install \
+    numpy \
+    pyodbc \
+    deepdiff
+
+ARG odbc_repo="https://github.com/ClickHouse/clickhouse-odbc.git"
+
+RUN git clone --recursive ${odbc_repo} \
+    && mkdir -p /clickhouse-odbc/build \
+    && cmake -S /clickhouse-odbc -B /clickhouse-odbc/build \
+    && ls /clickhouse-odbc/build/driver \
+    && make -j 10 -C /clickhouse-odbc/build \
+    && ls /clickhouse-odbc/build/driver \
+    && mkdir -p /usr/local/lib64/ && cp /clickhouse-odbc/build/driver/lib*.so /usr/local/lib64/ \
+    && odbcinst -i -d -f /clickhouse-odbc/packaging/odbcinst.ini.sample \
+    && odbcinst -i -s -l -f /clickhouse-odbc/packaging/odbc.ini.sample
+
+ENV TZ=Europe/Amsterdam
+ENV MAX_RUN_TIME=900
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+ARG sqllogic_test_repo="https://github.com/gregrahn/sqllogictest.git"
+
+RUN git clone --recursive ${sqllogic_test_repo}
+
+COPY run.sh /
+CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/sqllogic/run.sh b/docker/test/sqllogic/run.sh
new file mode 100755
index 00000000000..8d0252e3c98
--- /dev/null
+++ b/docker/test/sqllogic/run.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+set -exu
+trap "exit" INT TERM
+
+echo "ENV"
+env
+
+# fail on errors, verbose and export all env variables
+set -e -x -a
+
+echo "Current directory"
+pwd
+echo "Files in current directory"
+ls -la ./
+echo "Files in root directory"
+ls -la /
+echo "Files in /clickhouse-tests directory"
+ls -la /clickhouse-tests
+echo "Files in /clickhouse-tests/sqllogic directory"
+ls -la /clickhouse-tests/sqllogic
+echo "Files in /package_folder directory"
+ls -la /package_folder
+echo "Files in /test_output"
+ls -la /test_output
+echo "File in /sqllogictest"
+ls -la /sqllogictest
+
+dpkg -i package_folder/clickhouse-common-static_*.deb
+dpkg -i package_folder/clickhouse-common-static-dbg_*.deb
+dpkg -i package_folder/clickhouse-server_*.deb
+dpkg -i package_folder/clickhouse-client_*.deb
+
+# install test configs
+# /clickhouse-tests/config/install.sh
+
+sudo clickhouse start
+
+sleep 5
+for _ in $(seq 1 60); do if [[ $(wget --timeout=1 -q 'localhost:8123' -O-) == 'Ok.' ]]; then break ; else sleep 1; fi ; done
+
+function run_tests()
+{
+    set -x
+
+    cd /test_output
+
+    /clickhouse-tests/sqllogic/runner.py --help 2>&1 \
+        | ts '%Y-%m-%d %H:%M:%S'
+
+    mkdir -p /test_output/self-test
+    /clickhouse-tests/sqllogic/runner.py --log-file /test_output/runner-self-test.log \
+        self-test \
+        --self-test-dir /clickhouse-tests/sqllogic/self-test \
+        --out-dir /test_output/self-test \
+        2>&1 \
+        | ts '%Y-%m-%d %H:%M:%S'
+
+    cat /test_output/self-test/check_status.tsv >> /test_output/check_status.tsv
+    cat /test_output/self-test/test_results.tsv >> /test_output/test_results.tsv ||:
+    tar -zcvf self-test.tar.gz self-test 1>/dev/null
+
+    if [ -d /sqllogictest ]
+    then
+        mkdir -p /test_output/statements-test
+        /clickhouse-tests/sqllogic/runner.py \
+        --log-file /test_output/runner-statements-test.log \
+        --log-level info \
+            statements-test \
+            --input-dir /sqllogictest \
+            --out-dir /test_output/statements-test \
+            2>&1 \
+            | ts '%Y-%m-%d %H:%M:%S'
+
+        cat /test_output/statements-test/check_status.tsv >> /test_output/check_status.tsv
+        cat /test_output/statements-test/test_results.tsv >> /test_output/test_results.tsv
+        tar -zcvf statements-check.tar.gz statements-test 1>/dev/null
+    fi
+}
+
+export -f run_tests
+
+timeout "${MAX_RUN_TIME:-9000}" bash -c run_tests || echo "timeout reached" >&2
+
+#/process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
+
+clickhouse-client -q "system flush logs" ||:
+
+# Stop server so we can safely read data with clickhouse-local.
+# Why do we read data with clickhouse-local?
+# Because it's the simplest way to read it when server has crashed.
+sudo clickhouse stop ||:
+
+for _ in $(seq 1 60); do if [[ $(wget --timeout=1 -q 'localhost:8123' -O-) == 'Ok.' ]]; then sleep 1 ; else break; fi ; done
+
+grep -Fa "Fatal" /var/log/clickhouse-server/clickhouse-server.log ||:
+pigz < /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log.gz &
+
+# Compressed (FIXME: remove once only github actions will be left)
+rm /var/log/clickhouse-server/clickhouse-server.log
+mv /var/log/clickhouse-server/stderr.log /test_output/ ||:
diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index e7a400b8216..c973b6c6ec6 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -128,7 +128,7 @@ function run_tests()
     set +e
 
     if [[ -n "$USE_PARALLEL_REPLICAS" ]] && [[ "$USE_PARALLEL_REPLICAS" -eq 1 ]]; then
-        clickhouse-test --client="clickhouse-client --use_hedged_requests=0  --allow_experimental_parallel_reading_from_replicas=1 \
+        clickhouse-test --client="clickhouse-client --use_hedged_requests=0  --allow_experimental_parallel_reading_from_replicas=1 --parallel_replicas_for_non_replicated_merge_tree=1 \
             --max_parallel_replicas=100 --cluster_for_parallel_replicas='parallel_replicas'" \
             -j 2 --testname --shard --zookeeper --check-zookeeper-session --no-stateless --no-parallel-replicas --hung-check --print-time "${ADDITIONAL_OPTIONS[@]}" \
         "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
diff --git a/docker/test/stateful/s3downloader b/docker/test/stateful/s3downloader
index b1302877d6a..96f2aa96dd5 100755
--- a/docker/test/stateful/s3downloader
+++ b/docker/test/stateful/s3downloader
@@ -10,31 +10,38 @@ import requests
 import tempfile
 
 
-DEFAULT_URL = 'https://clickhouse-datasets.s3.amazonaws.com'
+DEFAULT_URL = "https://clickhouse-datasets.s3.amazonaws.com"
 
 AVAILABLE_DATASETS = {
-    'hits': 'hits_v1.tar',
-    'visits': 'visits_v1.tar',
+    "hits": "hits_v1.tar",
+    "visits": "visits_v1.tar",
 }
 
 RETRIES_COUNT = 5
 
+
 def _get_temp_file_name():
-    return os.path.join(tempfile._get_default_tempdir(), next(tempfile._get_candidate_names()))
+    return os.path.join(
+        tempfile._get_default_tempdir(), next(tempfile._get_candidate_names())
+    )
+
 
 def build_url(base_url, dataset):
-    return os.path.join(base_url, dataset, 'partitions', AVAILABLE_DATASETS[dataset])
+    return os.path.join(base_url, dataset, "partitions", AVAILABLE_DATASETS[dataset])
+
 
 def dowload_with_progress(url, path):
     logging.info("Downloading from %s to temp path %s", url, path)
     for i in range(RETRIES_COUNT):
         try:
-            with open(path, 'wb') as f:
+            with open(path, "wb") as f:
                 response = requests.get(url, stream=True)
                 response.raise_for_status()
-                total_length = response.headers.get('content-length')
+                total_length = response.headers.get("content-length")
                 if total_length is None or int(total_length) == 0:
-                    logging.info("No content-length, will download file without progress")
+                    logging.info(
+                        "No content-length, will download file without progress"
+                    )
                     f.write(response.content)
                 else:
                     dl = 0
@@ -46,7 +53,11 @@ def dowload_with_progress(url, path):
                         if sys.stdout.isatty():
                             done = int(50 * dl / total_length)
                             percent = int(100 * float(dl) / total_length)
-                            sys.stdout.write("\r[{}{}] {}%".format('=' * done, ' ' * (50-done), percent))
+                            sys.stdout.write(
+                                "\r[{}{}] {}%".format(
+                                    "=" * done, " " * (50 - done), percent
+                                )
+                            )
                             sys.stdout.flush()
             break
         except Exception as ex:
@@ -56,14 +67,21 @@ def dowload_with_progress(url, path):
             if os.path.exists(path):
                 os.remove(path)
     else:
-        raise Exception("Cannot download dataset from {}, all retries exceeded".format(url))
+        raise Exception(
+            "Cannot download dataset from {}, all retries exceeded".format(url)
+        )
 
     sys.stdout.write("\n")
     logging.info("Downloading finished")
 
+
 def unpack_to_clickhouse_directory(tar_path, clickhouse_path):
-    logging.info("Will unpack data from temp path %s to clickhouse db %s", tar_path, clickhouse_path)
-    with tarfile.open(tar_path, 'r') as comp_file:
+    logging.info(
+        "Will unpack data from temp path %s to clickhouse db %s",
+        tar_path,
+        clickhouse_path,
+    )
+    with tarfile.open(tar_path, "r") as comp_file:
         comp_file.extractall(path=clickhouse_path)
     logging.info("Unpack finished")
 
@@ -72,15 +90,21 @@ if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
 
     parser = argparse.ArgumentParser(
-        description="Simple tool for dowloading datasets for clickhouse from S3")
+        description="Simple tool for dowloading datasets for clickhouse from S3"
+    )
 
-    parser.add_argument('--dataset-names', required=True, nargs='+', choices=list(AVAILABLE_DATASETS.keys()))
-    parser.add_argument('--url-prefix', default=DEFAULT_URL)
-    parser.add_argument('--clickhouse-data-path', default='/var/lib/clickhouse/')
+    parser.add_argument(
+        "--dataset-names",
+        required=True,
+        nargs="+",
+        choices=list(AVAILABLE_DATASETS.keys()),
+    )
+    parser.add_argument("--url-prefix", default=DEFAULT_URL)
+    parser.add_argument("--clickhouse-data-path", default="/var/lib/clickhouse/")
 
     args = parser.parse_args()
     datasets = args.dataset_names
-    logging.info("Will fetch following datasets: %s", ', '.join(datasets))
+    logging.info("Will fetch following datasets: %s", ", ".join(datasets))
     for dataset in datasets:
         logging.info("Processing %s", dataset)
         temp_archive_path = _get_temp_file_name()
@@ -92,10 +116,11 @@ if __name__ == "__main__":
             logging.info("Some exception occured %s", str(ex))
             raise
         finally:
-            logging.info("Will remove downloaded file %s from filesystem if it exists", temp_archive_path)
+            logging.info(
+                "Will remove downloaded file %s from filesystem if it exists",
+                temp_archive_path,
+            )
             if os.path.exists(temp_archive_path):
                 os.remove(temp_archive_path)
         logging.info("Processing of %s finished", dataset)
     logging.info("Fetch finished, enjoy your tables!")
-
-
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index ade59224035..5d0a7b50741 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -132,6 +132,9 @@ function run_tests()
 
     ADDITIONAL_OPTIONS+=('--report-logs-stats')
 
+    clickhouse-test "00001_select_1" > /dev/null ||:
+    clickhouse-client -q "insert into system.zookeeper (name, path, value) values ('auxiliary_zookeeper2', '/test/chroot/', '')" ||:
+
     set +e
     clickhouse-test --testname --shard --zookeeper --check-zookeeper-session --hung-check --print-time \
         --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
@@ -170,6 +173,7 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
 fi
 
 rg -Fa "<Fatal>" /var/log/clickhouse-server/clickhouse-server.log ||:
+rg -A50 -Fa "============" /var/log/clickhouse-server/stderr.log ||:
 zstd --threads=0 < /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log.zst &
 
 # Compress tables.
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index 15f58d6c3a3..4926967d2d2 100644
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -20,30 +20,31 @@ install_packages package_folder
 
 # Thread Fuzzer allows to check more permutations of possible thread scheduling
 # and find more potential issues.
-# Temporarily disable ThreadFuzzer with tsan because of https://github.com/google/sanitizers/issues/1540
-is_tsan_build=$(clickhouse local -q "select value like '% -fsanitize=thread %' from system.build_options where name='CXX_FLAGS'")
-if [ "$is_tsan_build" -eq "0" ]; then
-    export THREAD_FUZZER_CPU_TIME_PERIOD_US=1000
-    export THREAD_FUZZER_SLEEP_PROBABILITY=0.1
-    export THREAD_FUZZER_SLEEP_TIME_US=100000
+export THREAD_FUZZER_CPU_TIME_PERIOD_US=1000
+export THREAD_FUZZER_SLEEP_PROBABILITY=0.1
+export THREAD_FUZZER_SLEEP_TIME_US=100000
 
-    export THREAD_FUZZER_pthread_mutex_lock_BEFORE_MIGRATE_PROBABILITY=1
-    export THREAD_FUZZER_pthread_mutex_lock_AFTER_MIGRATE_PROBABILITY=1
-    export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_MIGRATE_PROBABILITY=1
-    export THREAD_FUZZER_pthread_mutex_unlock_AFTER_MIGRATE_PROBABILITY=1
+export THREAD_FUZZER_pthread_mutex_lock_BEFORE_MIGRATE_PROBABILITY=1
+export THREAD_FUZZER_pthread_mutex_lock_AFTER_MIGRATE_PROBABILITY=1
+export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_MIGRATE_PROBABILITY=1
+export THREAD_FUZZER_pthread_mutex_unlock_AFTER_MIGRATE_PROBABILITY=1
 
-    export THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_PROBABILITY=0.001
-    export THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_PROBABILITY=0.001
-    export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_PROBABILITY=0.001
-    export THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_PROBABILITY=0.001
-    export THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_TIME_US=10000
+export THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_PROBABILITY=0.001
+export THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_PROBABILITY=0.001
+export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_PROBABILITY=0.001
+export THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_PROBABILITY=0.001
+export THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_TIME_US=10000
 
-    export THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_TIME_US=10000
-    export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_TIME_US=10000
-    export THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_TIME_US=10000
-fi
+export THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_TIME_US=10000
+export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_TIME_US=10000
+export THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_TIME_US=10000
+
+export THREAD_FUZZER_EXPLICIT_SLEEP_PROBABILITY=0.01
+export THREAD_FUZZER_EXPLICIT_MEMORY_EXCEPTION_PROBABILITY=0.01
 
 export ZOOKEEPER_FAULT_INJECTION=1
+# Initial run without S3 to create system.*_log on local file system to make it
+# available for dump via clickhouse-local
 configure
 
 azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
diff --git a/docker/test/style/Dockerfile b/docker/test/style/Dockerfile
index e8c5e17024c..746cc7bb2d5 100644
--- a/docker/test/style/Dockerfile
+++ b/docker/test/style/Dockerfile
@@ -11,13 +11,14 @@ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
     aspell \
     curl \
     git \
+    file \
     libxml2-utils \
     moreutils \
     python3-fuzzywuzzy \
     python3-pip \
     shellcheck \
     yamllint \
-    && pip3 install black==22.8.0 boto3 codespell==2.2.1 dohq-artifactory mypy PyGithub unidiff pylint==2.6.2 \
+    && pip3 install black==23.1.0 boto3 codespell==2.2.1 dohq-artifactory mypy PyGithub unidiff pylint==2.6.2 \
     && apt-get clean \
     && rm -rf /root/.cache/pip
 
diff --git a/docker/test/upgrade/run.sh b/docker/test/upgrade/run.sh
index df32e2833e7..bd0c59a12cd 100644
--- a/docker/test/upgrade/run.sh
+++ b/docker/test/upgrade/run.sh
@@ -49,12 +49,42 @@ echo -e "Successfully cloned previous release tests$OK" >> /test_output/test_res
 echo -e "Successfully downloaded previous release packages$OK" >> /test_output/test_results.tsv
 
 # Make upgrade check more funny by forcing Ordinary engine for system database
-mkdir /var/lib/clickhouse/metadata
+mkdir -p /var/lib/clickhouse/metadata
 echo "ATTACH DATABASE system ENGINE=Ordinary" > /var/lib/clickhouse/metadata/system.sql
 
 # Install previous release packages
 install_packages previous_release_package_folder
 
+# Initial run without S3 to create system.*_log on local file system to make it
+# available for dump via clickhouse-local
+configure
+
+# local_blob_storage disk type does not exist in older versions
+sudo cat /etc/clickhouse-server/config.d/storage_conf.xml \
+  | sed "s|<type>local_blob_storage</type>|<type>local</type>|" \
+  > /etc/clickhouse-server/config.d/storage_conf.xml.tmp
+sudo mv /etc/clickhouse-server/config.d/storage_conf.xml.tmp /etc/clickhouse-server/config.d/storage_conf.xml
+
+# it contains some new settings, but we can safely remove it
+rm /etc/clickhouse-server/config.d/merge_tree.xml
+
+start
+stop
+mv /var/log/clickhouse-server/clickhouse-server.log /var/log/clickhouse-server/clickhouse-server.initial.log
+
+# force_sync=false doesn't work correctly on some older versions
+sudo cat /etc/clickhouse-server/config.d/keeper_port.xml \
+  | sed "s|<force_sync>false</force_sync>|<force_sync>true</force_sync>|" \
+  > /etc/clickhouse-server/config.d/keeper_port.xml.tmp
+sudo mv /etc/clickhouse-server/config.d/keeper_port.xml.tmp /etc/clickhouse-server/config.d/keeper_port.xml
+
+# But we still need default disk because some tables loaded only into it
+sudo cat /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml \
+  | sed "s|<main><disk>s3</disk></main>|<main><disk>s3</disk></main><default><disk>default</disk></default>|" \
+  > /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml.tmp    mv /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml.tmp /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml
+sudo chown clickhouse /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml
+sudo chgrp clickhouse /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml
+
 # Start server from previous release
 # Let's enable S3 storage by default
 export USE_S3_STORAGE_FOR_MERGE_TREE=1
@@ -62,12 +92,13 @@ export USE_S3_STORAGE_FOR_MERGE_TREE=1
 export ZOOKEEPER_FAULT_INJECTION=0
 configure
 
-# But we still need default disk because some tables loaded only into it
-sudo cat /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml \
-  | sed "s|<main><disk>s3</disk></main>|<main><disk>s3</disk></main><default><disk>default</disk></default>|" \
-  > /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml.tmp    mv /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml.tmp /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml
-sudo chown clickhouse /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml
-sudo chgrp clickhouse /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml
+sudo cat /etc/clickhouse-server/config.d/storage_conf.xml \
+  | sed "s|<type>local_blob_storage</type>|<type>local</type>|" \
+  > /etc/clickhouse-server/config.d/storage_conf.xml.tmp
+sudo mv /etc/clickhouse-server/config.d/storage_conf.xml.tmp /etc/clickhouse-server/config.d/storage_conf.xml
+
+# it contains some new settings, but we can safely remove it
+rm /etc/clickhouse-server/config.d/merge_tree.xml
 
 start
 
@@ -95,8 +126,7 @@ mv /var/log/clickhouse-server/clickhouse-server.log /var/log/clickhouse-server/c
 
 # Install and start new server
 install_packages package_folder
-# Disable fault injections on start (we don't test them here, and it can lead to tons of requests in case of huge number of tables).
-export ZOOKEEPER_FAULT_INJECTION=0
+export ZOOKEEPER_FAULT_INJECTION=1
 configure
 start 500
 clickhouse-client --query "SELECT 'Server successfully started', 'OK', NULL, ''" >> /test_output/test_results.tsv \
@@ -161,8 +191,10 @@ rg -Fav -e "Code: 236. DB::Exception: Cancelled merging parts" \
            -e "Authentication failed" \
            -e "Cannot flush" \
            -e "Container already exists" \
-    /var/log/clickhouse-server/clickhouse-server.upgrade.log | zgrep -Fa "<Error>" > /test_output/upgrade_error_messages.txt \
-    && echo -e "Error message in clickhouse-server.log (see upgrade_error_messages.txt)$FAIL$(head_escaped /test_output/bc_check_error_messages.txt)" \
+    clickhouse-server.upgrade.log \
+    | grep -av -e "_repl_01111_.*Mapping for table with UUID" \
+    | zgrep -Fa "<Error>" > /test_output/upgrade_error_messages.txt \
+    && echo -e "Error message in clickhouse-server.log (see upgrade_error_messages.txt)$FAIL$(head_escaped /test_output/upgrade_error_messages.txt)" \
         >> /test_output/test_results.tsv \
     || echo -e "No Error messages after server upgrade$OK" >> /test_output/test_results.tsv
 
@@ -176,8 +208,6 @@ tar -chf /test_output/coordination.tar /var/lib/clickhouse/coordination ||:
 
 collect_query_and_trace_logs
 
-check_oom_in_dmesg
-
 mv /var/log/clickhouse-server/stderr.log /test_output/
 
 # Write check result into check_status.tsv
diff --git a/docker/test/util/Dockerfile b/docker/test/util/Dockerfile
index 0ee426f4e4d..a49278e960b 100644
--- a/docker/test/util/Dockerfile
+++ b/docker/test/util/Dockerfile
@@ -6,7 +6,7 @@ ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 # 15.0.2
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=15
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=16
 
 RUN apt-get update \
     && apt-get install \
@@ -52,6 +52,7 @@ RUN apt-get update \
         lld-${LLVM_VERSION} \
         llvm-${LLVM_VERSION} \
         llvm-${LLVM_VERSION}-dev \
+        libclang-${LLVM_VERSION}-dev \
         moreutils \
         nasm \
         ninja-build \
@@ -92,4 +93,17 @@ RUN mkdir /tmp/ccache \
     && cd / \
     && rm -rf /tmp/ccache
 
+ARG TARGETARCH
+ARG SCCACHE_VERSION=v0.4.1
+RUN arch=${TARGETARCH:-amd64} \
+  && case $arch in \
+    amd64) rarch=x86_64 ;; \
+    arm64) rarch=aarch64 ;; \
+  esac \
+  && curl -Ls "https://github.com/mozilla/sccache/releases/download/$SCCACHE_VERSION/sccache-$SCCACHE_VERSION-$rarch-unknown-linux-musl.tar.gz" | \
+    tar xz -C /tmp \
+  && mv "/tmp/sccache-$SCCACHE_VERSION-$rarch-unknown-linux-musl/sccache" /usr/bin \
+  && rm "/tmp/sccache-$SCCACHE_VERSION-$rarch-unknown-linux-musl" -r
+
+
 COPY process_functional_tests_result.py /
diff --git a/docker/test/util/process_functional_tests_result.py b/docker/test/util/process_functional_tests_result.py
index da58db8e45d..c75a3500831 100755
--- a/docker/test/util/process_functional_tests_result.py
+++ b/docker/test/util/process_functional_tests_result.py
@@ -18,7 +18,7 @@ SUCCESS_FINISH_SIGNS = ["All tests have finished", "No tests were run"]
 RETRIES_SIGN = "Some tests were restarted"
 
 
-def process_test_log(log_path):
+def process_test_log(log_path, broken_tests):
     total = 0
     skipped = 0
     unknown = 0
@@ -59,11 +59,19 @@ def process_test_log(log_path):
 
                 total += 1
                 if TIMEOUT_SIGN in line:
-                    failed += 1
-                    test_results.append((test_name, "Timeout", test_time, []))
+                    if test_name in broken_tests:
+                        success += 1
+                        test_results.append((test_name, "BROKEN", test_time, []))
+                    else:
+                        failed += 1
+                        test_results.append((test_name, "Timeout", test_time, []))
                 elif FAIL_SIGN in line:
-                    failed += 1
-                    test_results.append((test_name, "FAIL", test_time, []))
+                    if test_name in broken_tests:
+                        success += 1
+                        test_results.append((test_name, "BROKEN", test_time, []))
+                    else:
+                        failed += 1
+                        test_results.append((test_name, "FAIL", test_time, []))
                 elif UNKNOWN_SIGN in line:
                     unknown += 1
                     test_results.append((test_name, "FAIL", test_time, []))
@@ -71,8 +79,19 @@ def process_test_log(log_path):
                     skipped += 1
                     test_results.append((test_name, "SKIPPED", test_time, []))
                 else:
-                    success += int(OK_SIGN in line)
-                    test_results.append((test_name, "OK", test_time, []))
+                    if OK_SIGN in line and test_name in broken_tests:
+                        skipped += 1
+                        test_results.append(
+                            (
+                                test_name,
+                                "NOT_FAILED",
+                                test_time,
+                                ["This test passed. Update broken_tests.txt.\n"],
+                            )
+                        )
+                    else:
+                        success += int(OK_SIGN in line)
+                        test_results.append((test_name, "OK", test_time, []))
                 test_end = False
             elif (
                 len(test_results) > 0 and test_results[-1][1] == "FAIL" and not test_end
@@ -110,7 +129,7 @@ def process_test_log(log_path):
     )
 
 
-def process_result(result_path):
+def process_result(result_path, broken_tests):
     test_results = []
     state = "success"
     description = ""
@@ -134,7 +153,7 @@ def process_result(result_path):
             success_finish,
             retries,
             test_results,
-        ) = process_test_log(result_path)
+        ) = process_test_log(result_path, broken_tests)
         is_flacky_check = 1 < int(os.environ.get("NUM_TRIES", 1))
         logging.info("Is flaky check: %s", is_flacky_check)
         # If no tests were run (success == 0) it indicates an error (e.g. server did not start or crashed immediately)
@@ -186,9 +205,17 @@ if __name__ == "__main__":
     parser.add_argument("--in-results-dir", default="/test_output/")
     parser.add_argument("--out-results-file", default="/test_output/test_results.tsv")
     parser.add_argument("--out-status-file", default="/test_output/check_status.tsv")
+    parser.add_argument("--broken-tests", default="/broken_tests.txt")
     args = parser.parse_args()
 
-    state, description, test_results = process_result(args.in_results_dir)
+    broken_tests = list()
+    if os.path.exists(args.broken_tests):
+        logging.info(f"File {args.broken_tests} with broken tests found")
+        with open(args.broken_tests) as f:
+            broken_tests = f.read().splitlines()
+        logging.info(f"Broken tests in the list: {len(broken_tests)}")
+
+    state, description, test_results = process_result(args.in_results_dir, broken_tests)
     logging.info("Result parsed")
     status = (state, description)
     write_results(args.out_results_file, args.out_status_file, test_results, status)
diff --git a/docs/.gitignore b/docs/.gitignore
index 378eac25d31..509538d9051 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1 +1,2 @@
 build
+clickhouse-docs
diff --git a/docs/README.md b/docs/README.md
index 9bfd3d2b897..0cd35a4e3ec 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -40,6 +40,8 @@ The documentation contains information about all the aspects of the ClickHouse l
 
 At the moment, [documentation](https://clickhouse.com/docs) exists in English, Russian, and Chinese. We store the reference documentation besides the ClickHouse source code in the [GitHub repository](https://github.com/ClickHouse/ClickHouse/tree/master/docs), and user guides in a separate repo [Clickhouse/clickhouse-docs](https://github.com/ClickHouse/clickhouse-docs).
 
+To get the latter launch the `get-clickhouse-docs.sh` script.
+
 Each language lies in the corresponding folder. Files that are not translated from English are symbolic links to the English ones.
 
 <a name="how-to-contribute"/>
diff --git a/docs/_includes/install/universal.sh b/docs/_includes/install/universal.sh
index 403aab6f4e6..1699be138c8 100755
--- a/docs/_includes/install/universal.sh
+++ b/docs/_includes/install/universal.sh
@@ -85,9 +85,9 @@ echo
 echo "Successfully downloaded the ClickHouse binary, you can run it as:
     ./${clickhouse}"
 
-#if [ "${OS}" = "Linux" ]
-#then
-    #echo
-    #echo "You can also install it:
-    #sudo ./${clickhouse} install"
-#fi
+if [ "${OS}" = "Linux" ]
+then
+    echo
+    echo "You can also install it:
+    sudo ./${clickhouse} install"
+fi
diff --git a/docs/changelogs/v21.10.1.8013-prestable.md b/docs/changelogs/v21.10.1.8013-prestable.md
index 02ea593e02a..1c40aa67711 100644
--- a/docs/changelogs/v21.10.1.8013-prestable.md
+++ b/docs/changelogs/v21.10.1.8013-prestable.md
@@ -108,7 +108,7 @@ sidebar_label: 2022
 * Print out git status information at CMake configure stage. [#28047](https://github.com/ClickHouse/ClickHouse/pull/28047) ([Braulio Valdivielso Martínez](https://github.com/BraulioVM)).
 * Add new log level `<test>` for testing environments. [#28559](https://github.com/ClickHouse/ClickHouse/pull/28559) ([alesapin](https://github.com/alesapin)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Fix handling null value with type of Nullable(String) in function JSONExtract. This fixes [#27929](https://github.com/ClickHouse/ClickHouse/issues/27929) and [#27930](https://github.com/ClickHouse/ClickHouse/issues/27930) . This was introduced in https://github.com/ClickHouse/ClickHouse/pull/25452 . [#27939](https://github.com/ClickHouse/ClickHouse/pull/27939) ([Amos Bird](https://github.com/amosbird)).
 * Fix extremely rare segfaults on shutdown due to incorrect order of context/config reloader shutdown. [#28088](https://github.com/ClickHouse/ClickHouse/pull/28088) ([nvartolomei](https://github.com/nvartolomei)).
diff --git a/docs/changelogs/v21.10.2.15-stable.md b/docs/changelogs/v21.10.2.15-stable.md
index 4ae5c8f5072..42402808260 100644
--- a/docs/changelogs/v21.10.2.15-stable.md
+++ b/docs/changelogs/v21.10.2.15-stable.md
@@ -17,7 +17,7 @@ sidebar_label: 2022
 * Backported in [#29970](https://github.com/ClickHouse/ClickHouse/issues/29970): Fix shutdown of `AccessControlManager`. Now there can't be reloading of the configuration after AccessControlManager has been destroyed. This PR fixes the flaky test [test_user_directories/test.py::test_relative_path](https://clickhouse-test-reports.s3.yandex.net/0/f0e3122507ed8bea3f177495531c7d56bcb32466/integration_tests_(thread).html). [#29951](https://github.com/ClickHouse/ClickHouse/pull/29951) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Backported in [#30051](https://github.com/ClickHouse/ClickHouse/issues/30051): Fix releasing query ID and session ID at the end of query processing while handing gRPC call. This PR fixes flaky test [test_grpc_protocol/test.py::test_session](https://clickhouse-test-reports.s3.yandex.net/0/1ac03811a2df9717fa7c633d1af03def821d24b6/integration_tests_(memory).html). [#29954](https://github.com/ClickHouse/ClickHouse/pull/29954) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#29054](https://github.com/ClickHouse/ClickHouse/issues/29054): Fix invalid constant type conversion when nullable or lowcardinality primary key is used. [#28636](https://github.com/ClickHouse/ClickHouse/pull/28636) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#28795](https://github.com/ClickHouse/ClickHouse/issues/28795): - Fix the number of arguments required by s2RectAdd and s2RectContains functions. [#28663](https://github.com/ClickHouse/ClickHouse/pull/28663) ([Bharat Nallan](https://github.com/bharatnc)).
diff --git a/docs/changelogs/v21.10.3.9-stable.md b/docs/changelogs/v21.10.3.9-stable.md
index d0384d58e23..327e34ca64c 100644
--- a/docs/changelogs/v21.10.3.9-stable.md
+++ b/docs/changelogs/v21.10.3.9-stable.md
@@ -18,11 +18,11 @@ sidebar_label: 2022
 * Backported in [#30620](https://github.com/ClickHouse/ClickHouse/issues/30620): Fix reading from empty file on encrypted disk. [#30494](https://github.com/ClickHouse/ClickHouse/pull/30494) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Backported in [#31369](https://github.com/ClickHouse/ClickHouse/issues/31369): Fix SHOW GRANTS when partial revokes are used. This PR fixes [#31138](https://github.com/ClickHouse/ClickHouse/issues/31138). [#31249](https://github.com/ClickHouse/ClickHouse/pull/31249) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release
+#### Bug Fix (user-visible misbehaviour in official stable release
 
 * Backported in [#30915](https://github.com/ClickHouse/ClickHouse/issues/30915): Fix `ORDER BY ... WITH FILL` with set `TO` and `FROM` and no rows in result set. [#30888](https://github.com/ClickHouse/ClickHouse/pull/30888) ([Anton Popov](https://github.com/CurtizJ)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#30824](https://github.com/ClickHouse/ClickHouse/issues/30824): Fix "Column is not under aggregate function and not in GROUP BY" with PREWHERE (Fixes: [#28461](https://github.com/ClickHouse/ClickHouse/issues/28461)). [#28502](https://github.com/ClickHouse/ClickHouse/pull/28502) ([Azat Khuzhin](https://github.com/azat)).
 * Backported in [#30766](https://github.com/ClickHouse/ClickHouse/issues/30766): Fix hanging DDL queries on Replicated database while adding a new replica. [#29328](https://github.com/ClickHouse/ClickHouse/pull/29328) ([Kevin Michel](https://github.com/kmichel-aiven)).
diff --git a/docs/changelogs/v21.10.4.26-stable.md b/docs/changelogs/v21.10.4.26-stable.md
index 7d1cc93bb98..267f2109f6f 100644
--- a/docs/changelogs/v21.10.4.26-stable.md
+++ b/docs/changelogs/v21.10.4.26-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#31573](https://github.com/ClickHouse/ClickHouse/issues/31573): Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31337](https://github.com/ClickHouse/ClickHouse/pull/31337) ([sunny](https://github.com/sunny19930321)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#31518](https://github.com/ClickHouse/ClickHouse/issues/31518): Remove not like function into RPNElement. [#31169](https://github.com/ClickHouse/ClickHouse/pull/31169) ([sundyli](https://github.com/sundy-li)).
 * Backported in [#31554](https://github.com/ClickHouse/ClickHouse/issues/31554): Resolve `nullptr` in STS credentials provider for S3. [#31409](https://github.com/ClickHouse/ClickHouse/pull/31409) ([Vladimir Chebotarev](https://github.com/excitoon)).
diff --git a/docs/changelogs/v21.10.5.3-stable.md b/docs/changelogs/v21.10.5.3-stable.md
index 88d3d70028e..7c717dfe838 100644
--- a/docs/changelogs/v21.10.5.3-stable.md
+++ b/docs/changelogs/v21.10.5.3-stable.md
@@ -11,7 +11,7 @@ sidebar_label: 2022
 * Backported in [#32252](https://github.com/ClickHouse/ClickHouse/issues/32252): Fix skipping columns while writing protobuf. This PR fixes [#31160](https://github.com/ClickHouse/ClickHouse/issues/31160), see the comment [#31160](https://github.com/ClickHouse/ClickHouse/issues/31160)#issuecomment-980595318. [#31988](https://github.com/ClickHouse/ClickHouse/pull/31988) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Backported in [#32346](https://github.com/ClickHouse/ClickHouse/issues/32346): Fix bug when remove unneeded columns in subquery. If there is an aggregation function in query without group by, do not remove if it is unneeded. [#32289](https://github.com/ClickHouse/ClickHouse/pull/32289) ([dongyifeng](https://github.com/dyf6372)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#32151](https://github.com/ClickHouse/ClickHouse/issues/32151): Fix crash when function `dictGet` with type is used for dictionary attribute when type is `Nullable`. Fixes [#30980](https://github.com/ClickHouse/ClickHouse/issues/30980). [#31800](https://github.com/ClickHouse/ClickHouse/pull/31800) ([Maksim Kita](https://github.com/kitaisreal)).
 * Backported in [#32093](https://github.com/ClickHouse/ClickHouse/issues/32093): Some `GET_PART` entry might hang in replication queue if part is lost on all replicas and there are no other parts in the same partition. It's fixed in cases when partition key contains only columns of integer types or `Date[Time]`. Fixes [#31485](https://github.com/ClickHouse/ClickHouse/issues/31485). [#31887](https://github.com/ClickHouse/ClickHouse/pull/31887) ([Alexander Tokmakov](https://github.com/tavplubix)).
diff --git a/docs/changelogs/v21.10.6.2-stable.md b/docs/changelogs/v21.10.6.2-stable.md
index 74f037b2f8f..0e8e934e2fa 100644
--- a/docs/changelogs/v21.10.6.2-stable.md
+++ b/docs/changelogs/v21.10.6.2-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#32692](https://github.com/ClickHouse/ClickHouse/issues/32692): Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31656](https://github.com/ClickHouse/ClickHouse/pull/31656) ([sunny](https://github.com/sunny19930321)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#32680](https://github.com/ClickHouse/ClickHouse/issues/32680): Fix unexpected projection removal when detaching parts. [#32067](https://github.com/ClickHouse/ClickHouse/pull/32067) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#32285](https://github.com/ClickHouse/ClickHouse/issues/32285): Dictionaries fix cases when `{condition}` does not work for custom database queries. [#32117](https://github.com/ClickHouse/ClickHouse/pull/32117) ([Maksim Kita](https://github.com/kitaisreal)).
@@ -23,7 +23,7 @@ sidebar_label: 2022
 * Backported in [#33182](https://github.com/ClickHouse/ClickHouse/issues/33182): Server might fail to start if database with `MySQL` engine cannot connect to MySQL server, it's fixed. Fixes [#14441](https://github.com/ClickHouse/ClickHouse/issues/14441). [#32802](https://github.com/ClickHouse/ClickHouse/pull/32802) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Backported in [#33655](https://github.com/ClickHouse/ClickHouse/issues/33655): Fix hdfs url check that didn't allow using HA namenode address. Bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/31042. [#32976](https://github.com/ClickHouse/ClickHouse/pull/32976) ([Kruglov Pavel](https://github.com/Avogar)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release):
+#### Bug Fix (user-visible misbehaviour in official stable release):
 
 * Backported in [#32657](https://github.com/ClickHouse/ClickHouse/issues/32657): Fix possible crash (or incorrect result) in case of `LowCardinality` arguments of window function. Fixes [#31114](https://github.com/ClickHouse/ClickHouse/issues/31114). [#31888](https://github.com/ClickHouse/ClickHouse/pull/31888) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
diff --git a/docs/changelogs/v21.11.1.8636-prestable.md b/docs/changelogs/v21.11.1.8636-prestable.md
index 407a5196c1d..d6a435dd3ce 100644
--- a/docs/changelogs/v21.11.1.8636-prestable.md
+++ b/docs/changelogs/v21.11.1.8636-prestable.md
@@ -124,11 +124,11 @@ sidebar_label: 2022
 * Recursive submodules are no longer needed for ClickHouse. [#30315](https://github.com/ClickHouse/ClickHouse/pull/30315) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Added docker image to build docs. [#30499](https://github.com/ClickHouse/ClickHouse/pull/30499) ([Ilya Yatsishin](https://github.com/qoega)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release
+#### Bug Fix (user-visible misbehaviour in official stable release
 
 * Fix `ORDER BY ... WITH FILL` with set `TO` and `FROM` and no rows in result set. [#30888](https://github.com/ClickHouse/ClickHouse/pull/30888) ([Anton Popov](https://github.com/CurtizJ)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Fix hanging DDL queries on Replicated database while adding a new replica. [#29328](https://github.com/ClickHouse/ClickHouse/pull/29328) ([Kevin Michel](https://github.com/kmichel-aiven)).
 * Fix vertical merges of projection parts. This fixes [#29253](https://github.com/ClickHouse/ClickHouse/issues/29253) . This PR also fixes several projection merge/mutation issues introduced in https://github.com/ClickHouse/ClickHouse/pull/25165. [#29337](https://github.com/ClickHouse/ClickHouse/pull/29337) ([Amos Bird](https://github.com/amosbird)).
diff --git a/docs/changelogs/v21.11.11.1-stable.md b/docs/changelogs/v21.11.11.1-stable.md
index 85a8975c6e7..76cd5239cba 100644
--- a/docs/changelogs/v21.11.11.1-stable.md
+++ b/docs/changelogs/v21.11.11.1-stable.md
@@ -7,6 +7,6 @@ sidebar_label: 2022
 
 ### ClickHouse release v21.11.11.1-stable FIXME as compared to v21.11.10.1-stable
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#33656](https://github.com/ClickHouse/ClickHouse/issues/33656): Fix hdfs url check that didn't allow using HA namenode address. Bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/31042. [#32976](https://github.com/ClickHouse/ClickHouse/pull/32976) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v21.11.2.2-stable.md b/docs/changelogs/v21.11.2.2-stable.md
index bf02de235e4..44938addad5 100644
--- a/docs/changelogs/v21.11.2.2-stable.md
+++ b/docs/changelogs/v21.11.2.2-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v21.11.2.2-stable FIXME as compared to v21.11.1.8636-prestable
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#31154](https://github.com/ClickHouse/ClickHouse/issues/31154): Skip max_partition_size_to_drop check in case of ATTACH PARTITION ... FROM and MOVE PARTITION ... [#30995](https://github.com/ClickHouse/ClickHouse/pull/30995) ([Amr Alaa](https://github.com/amralaa-MSFT)).
 * Backported in [#31027](https://github.com/ClickHouse/ClickHouse/issues/31027): Using `formatRow` function with not row formats led to segfault. Don't allow to use this function with such formats (because it doesn't make sense). [#31001](https://github.com/ClickHouse/ClickHouse/pull/31001) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v21.11.3.6-stable.md b/docs/changelogs/v21.11.3.6-stable.md
index e3886c4efac..f9cc64e2c2b 100644
--- a/docs/changelogs/v21.11.3.6-stable.md
+++ b/docs/changelogs/v21.11.3.6-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#31246](https://github.com/ClickHouse/ClickHouse/issues/31246): Memory amount was incorrectly estimated when ClickHouse is run in containers with cgroup limits. [#31157](https://github.com/ClickHouse/ClickHouse/pull/31157) ([Pavel Medvedev](https://github.com/pmed)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#31206](https://github.com/ClickHouse/ClickHouse/issues/31206): Fix possible assert in `hdfs` table function/engine, add test. [#31036](https://github.com/ClickHouse/ClickHouse/pull/31036) ([Kruglov Pavel](https://github.com/Avogar)).
 * Backported in [#31202](https://github.com/ClickHouse/ClickHouse/issues/31202): Fix abort in debug server and `DB::Exception: std::out_of_range: basic_string` error in release server in case of bad hdfs url by adding additional check of hdfs url structure. [#31042](https://github.com/ClickHouse/ClickHouse/pull/31042) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v21.11.4.14-stable.md b/docs/changelogs/v21.11.4.14-stable.md
index f05f43d9de1..8882832d1fe 100644
--- a/docs/changelogs/v21.11.4.14-stable.md
+++ b/docs/changelogs/v21.11.4.14-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#31370](https://github.com/ClickHouse/ClickHouse/issues/31370): Fix SHOW GRANTS when partial revokes are used. This PR fixes [#31138](https://github.com/ClickHouse/ClickHouse/issues/31138). [#31249](https://github.com/ClickHouse/ClickHouse/pull/31249) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#31282](https://github.com/ClickHouse/ClickHouse/issues/31282): Fix some corner cases with intersect/except. Closes [#30803](https://github.com/ClickHouse/ClickHouse/issues/30803). [#30965](https://github.com/ClickHouse/ClickHouse/pull/30965) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Backported in [#31237](https://github.com/ClickHouse/ClickHouse/issues/31237): Fix bug which broke select queries if they happened after dropping materialized view. Found in [#30691](https://github.com/ClickHouse/ClickHouse/issues/30691). [#30997](https://github.com/ClickHouse/ClickHouse/pull/30997) ([Kseniia Sumarokova](https://github.com/kssenii)).
diff --git a/docs/changelogs/v21.11.5.33-stable.md b/docs/changelogs/v21.11.5.33-stable.md
index 3780d5a2530..11e7f24dbb1 100644
--- a/docs/changelogs/v21.11.5.33-stable.md
+++ b/docs/changelogs/v21.11.5.33-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#31572](https://github.com/ClickHouse/ClickHouse/issues/31572): Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31337](https://github.com/ClickHouse/ClickHouse/pull/31337) ([sunny](https://github.com/sunny19930321)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#31517](https://github.com/ClickHouse/ClickHouse/issues/31517): Remove not like function into RPNElement. [#31169](https://github.com/ClickHouse/ClickHouse/pull/31169) ([sundyli](https://github.com/sundy-li)).
 * Backported in [#31551](https://github.com/ClickHouse/ClickHouse/issues/31551): Resolve `nullptr` in STS credentials provider for S3. [#31409](https://github.com/ClickHouse/ClickHouse/pull/31409) ([Vladimir Chebotarev](https://github.com/excitoon)).
diff --git a/docs/changelogs/v21.11.6.7-stable.md b/docs/changelogs/v21.11.6.7-stable.md
index 1f1935d1865..cddd472076a 100644
--- a/docs/changelogs/v21.11.6.7-stable.md
+++ b/docs/changelogs/v21.11.6.7-stable.md
@@ -11,7 +11,7 @@ sidebar_label: 2022
 * Backported in [#32254](https://github.com/ClickHouse/ClickHouse/issues/32254): Fix skipping columns while writing protobuf. This PR fixes [#31160](https://github.com/ClickHouse/ClickHouse/issues/31160), see the comment [#31160](https://github.com/ClickHouse/ClickHouse/issues/31160)#issuecomment-980595318. [#31988](https://github.com/ClickHouse/ClickHouse/pull/31988) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Backported in [#32345](https://github.com/ClickHouse/ClickHouse/issues/32345): Fix bug when remove unneeded columns in subquery. If there is an aggregation function in query without group by, do not remove if it is unneeded. [#32289](https://github.com/ClickHouse/ClickHouse/pull/32289) ([dongyifeng](https://github.com/dyf6372)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#32152](https://github.com/ClickHouse/ClickHouse/issues/32152): Fix crash when function `dictGet` with type is used for dictionary attribute when type is `Nullable`. Fixes [#30980](https://github.com/ClickHouse/ClickHouse/issues/30980). [#31800](https://github.com/ClickHouse/ClickHouse/pull/31800) ([Maksim Kita](https://github.com/kitaisreal)).
 * Backported in [#32298](https://github.com/ClickHouse/ClickHouse/issues/32298): Fix recursive user defined functions crash. Closes [#30856](https://github.com/ClickHouse/ClickHouse/issues/30856). [#31820](https://github.com/ClickHouse/ClickHouse/pull/31820) ([Maksim Kita](https://github.com/kitaisreal)).
diff --git a/docs/changelogs/v21.11.7.9-stable.md b/docs/changelogs/v21.11.7.9-stable.md
index baa6b0290a5..596d16a28ef 100644
--- a/docs/changelogs/v21.11.7.9-stable.md
+++ b/docs/changelogs/v21.11.7.9-stable.md
@@ -10,13 +10,13 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#32691](https://github.com/ClickHouse/ClickHouse/issues/32691): Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31656](https://github.com/ClickHouse/ClickHouse/pull/31656) ([sunny](https://github.com/sunny19930321)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#32711](https://github.com/ClickHouse/ClickHouse/issues/32711): Fix failures in queries that are trying to use skipping indices, which are not materialized yet. Fixes [#32292](https://github.com/ClickHouse/ClickHouse/issues/32292) and [#30343](https://github.com/ClickHouse/ClickHouse/issues/30343). [#32359](https://github.com/ClickHouse/ClickHouse/pull/32359) ([Anton Popov](https://github.com/CurtizJ)).
 * Backported in [#32568](https://github.com/ClickHouse/ClickHouse/issues/32568): Fix crash in `JoinCommon::removeColumnNullability`, close [#32458](https://github.com/ClickHouse/ClickHouse/issues/32458). [#32508](https://github.com/ClickHouse/ClickHouse/pull/32508) ([Vladimir C](https://github.com/vdimir)).
 * Backported in [#32732](https://github.com/ClickHouse/ClickHouse/issues/32732): Fix surprisingly bad code in function `file`. [#32640](https://github.com/ClickHouse/ClickHouse/pull/32640) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release):
+#### Bug Fix (user-visible misbehaviour in official stable release):
 
 * Backported in [#32617](https://github.com/ClickHouse/ClickHouse/issues/32617): Fix possible crash (or incorrect result) in case of `LowCardinality` arguments of window function. Fixes [#31114](https://github.com/ClickHouse/ClickHouse/issues/31114). [#31888](https://github.com/ClickHouse/ClickHouse/pull/31888) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
diff --git a/docs/changelogs/v21.11.8.4-stable.md b/docs/changelogs/v21.11.8.4-stable.md
index bd71374e870..28d413dd2c5 100644
--- a/docs/changelogs/v21.11.8.4-stable.md
+++ b/docs/changelogs/v21.11.8.4-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v21.11.8.4-stable FIXME as compared to v21.11.7.9-stable
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#32679](https://github.com/ClickHouse/ClickHouse/issues/32679): Fix unexpected projection removal when detaching parts. [#32067](https://github.com/ClickHouse/ClickHouse/pull/32067) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#32543](https://github.com/ClickHouse/ClickHouse/issues/32543): Some replication queue entries might hang for `temporary_directories_lifetime` (1 day by default) with `Directory tmp_merge_<part_name>` or `Part ... (state Deleting) already exists, but it will be deleted soon` or similar error. It's fixed. Fixes [#29616](https://github.com/ClickHouse/ClickHouse/issues/29616). [#32201](https://github.com/ClickHouse/ClickHouse/pull/32201) ([Alexander Tokmakov](https://github.com/tavplubix)).
diff --git a/docs/changelogs/v21.11.9.1-stable.md b/docs/changelogs/v21.11.9.1-stable.md
index 1473a4a152c..ea36479c943 100644
--- a/docs/changelogs/v21.11.9.1-stable.md
+++ b/docs/changelogs/v21.11.9.1-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v21.11.9.1-stable FIXME as compared to v21.11.8.4-stable
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#33181](https://github.com/ClickHouse/ClickHouse/issues/33181): Server might fail to start if database with `MySQL` engine cannot connect to MySQL server, it's fixed. Fixes [#14441](https://github.com/ClickHouse/ClickHouse/issues/14441). [#32802](https://github.com/ClickHouse/ClickHouse/pull/32802) ([Alexander Tokmakov](https://github.com/tavplubix)).
 
diff --git a/docs/changelogs/v21.12.1.9017-prestable.md b/docs/changelogs/v21.12.1.9017-prestable.md
index e8f2ca283a4..88b8260e312 100644
--- a/docs/changelogs/v21.12.1.9017-prestable.md
+++ b/docs/changelogs/v21.12.1.9017-prestable.md
@@ -132,7 +132,7 @@ sidebar_label: 2022
 * Build rpm and tgz packages in master and release branches workfolw. [#32048](https://github.com/ClickHouse/ClickHouse/pull/32048) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Fix broken symlink for sysroot/linux-riscv64/usr/lib. [#32071](https://github.com/ClickHouse/ClickHouse/pull/32071) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Fix some corner cases with intersect/except. Closes [#30803](https://github.com/ClickHouse/ClickHouse/issues/30803). [#30965](https://github.com/ClickHouse/ClickHouse/pull/30965) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Skip max_partition_size_to_drop check in case of ATTACH PARTITION ... FROM and MOVE PARTITION ... [#30995](https://github.com/ClickHouse/ClickHouse/pull/30995) ([Amr Alaa](https://github.com/amralaa-MSFT)).
diff --git a/docs/changelogs/v21.12.2.17-stable.md b/docs/changelogs/v21.12.2.17-stable.md
index 94cfc1b88a8..67761ce0e08 100644
--- a/docs/changelogs/v21.12.2.17-stable.md
+++ b/docs/changelogs/v21.12.2.17-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#32693](https://github.com/ClickHouse/ClickHouse/issues/32693): Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31656](https://github.com/ClickHouse/ClickHouse/pull/31656) ([sunny](https://github.com/sunny19930321)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#32681](https://github.com/ClickHouse/ClickHouse/issues/32681): Fix unexpected projection removal when detaching parts. [#32067](https://github.com/ClickHouse/ClickHouse/pull/32067) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#32483](https://github.com/ClickHouse/ClickHouse/issues/32483): Fix 'APPLY lambda' parsing which could lead to client/server crash. [#32138](https://github.com/ClickHouse/ClickHouse/pull/32138) ([Kruglov Pavel](https://github.com/Avogar)).
@@ -23,7 +23,7 @@ sidebar_label: 2022
 * Backported in [#32733](https://github.com/ClickHouse/ClickHouse/issues/32733): Fix surprisingly bad code in function `file`. [#32640](https://github.com/ClickHouse/ClickHouse/pull/32640) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Backported in [#32793](https://github.com/ClickHouse/ClickHouse/issues/32793): fix crash when used fuzzBits with multiply same FixedString, Close [#32737](https://github.com/ClickHouse/ClickHouse/issues/32737). [#32755](https://github.com/ClickHouse/ClickHouse/pull/32755) ([SuperDJY](https://github.com/cmsxbc)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release):
+#### Bug Fix (user-visible misbehaviour in official stable release):
 
 * Backported in [#32616](https://github.com/ClickHouse/ClickHouse/issues/32616): Fix possible crash (or incorrect result) in case of `LowCardinality` arguments of window function. Fixes [#31114](https://github.com/ClickHouse/ClickHouse/issues/31114). [#31888](https://github.com/ClickHouse/ClickHouse/pull/31888) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
diff --git a/docs/changelogs/v21.12.3.32-stable.md b/docs/changelogs/v21.12.3.32-stable.md
index ea11efa46c5..c8c423a77b9 100644
--- a/docs/changelogs/v21.12.3.32-stable.md
+++ b/docs/changelogs/v21.12.3.32-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#33018](https://github.com/ClickHouse/ClickHouse/issues/33018): - ClickHouse Keeper handler should remove operation when response sent. [#32988](https://github.com/ClickHouse/ClickHouse/pull/32988) ([JackyWoo](https://github.com/JackyWoo)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#32890](https://github.com/ClickHouse/ClickHouse/issues/32890): Fix LOGICAL_ERROR when the target of a materialized view is a JOIN or a SET table. [#32669](https://github.com/ClickHouse/ClickHouse/pull/32669) ([Raúl Marín](https://github.com/Algunenano)).
 * Backported in [#33183](https://github.com/ClickHouse/ClickHouse/issues/33183): Server might fail to start if database with `MySQL` engine cannot connect to MySQL server, it's fixed. Fixes [#14441](https://github.com/ClickHouse/ClickHouse/issues/14441). [#32802](https://github.com/ClickHouse/ClickHouse/pull/32802) ([Alexander Tokmakov](https://github.com/tavplubix)).
diff --git a/docs/changelogs/v21.12.4.1-stable.md b/docs/changelogs/v21.12.4.1-stable.md
index bd38dbd0c59..3345f76b317 100644
--- a/docs/changelogs/v21.12.4.1-stable.md
+++ b/docs/changelogs/v21.12.4.1-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#33551](https://github.com/ClickHouse/ClickHouse/issues/33551): Fix null pointer dereference in low cardinality data when deserializing LowCardinality data in the Native format. [#33021](https://github.com/ClickHouse/ClickHouse/pull/33021) ([Harry Lee](https://github.com/HarryLeeIBM)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#33537](https://github.com/ClickHouse/ClickHouse/issues/33537): Fix ORC stripe reading. [#32929](https://github.com/ClickHouse/ClickHouse/pull/32929) ([Ernest Zaslavsky](https://github.com/kreuzerkrieg)).
 * Backported in [#33654](https://github.com/ClickHouse/ClickHouse/issues/33654): Fix segfault in Avro that appears after the second insert into file. [#33566](https://github.com/ClickHouse/ClickHouse/pull/33566) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v21.3.16.5-lts.md b/docs/changelogs/v21.3.16.5-lts.md
index 123b27097d4..6aedeff5acb 100644
--- a/docs/changelogs/v21.3.16.5-lts.md
+++ b/docs/changelogs/v21.3.16.5-lts.md
@@ -25,7 +25,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#28075](https://github.com/ClickHouse/ClickHouse/issues/28075): Temporarily switched ubuntu apt repository to mirror ru.archive.ubuntu.com as default one(archive.ubuntu.com) is not responding from our CI. [#28016](https://github.com/ClickHouse/ClickHouse/pull/28016) ([Ilya Yatsishin](https://github.com/qoega)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#28181](https://github.com/ClickHouse/ClickHouse/issues/28181): Fixed possible excessive number of conditions moved from `WHERE` to `PREWHERE` (optimization controlled by settings `optimize_move_to_prewhere`). [#28139](https://github.com/ClickHouse/ClickHouse/pull/28139) ([lthaooo](https://github.com/lthaooo)).
 * Backported in [#28293](https://github.com/ClickHouse/ClickHouse/issues/28293): Fix inconsistent result in queries with `ORDER BY` and `Merge` tables with enabled setting `optimize_read_in_order`. [#28266](https://github.com/ClickHouse/ClickHouse/pull/28266) ([Anton Popov](https://github.com/CurtizJ)).
diff --git a/docs/changelogs/v21.3.17.2-lts.md b/docs/changelogs/v21.3.17.2-lts.md
index 6c288b5a0d8..9104ae7aa0a 100644
--- a/docs/changelogs/v21.3.17.2-lts.md
+++ b/docs/changelogs/v21.3.17.2-lts.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#28647](https://github.com/ClickHouse/ClickHouse/issues/28647): Fix a rare bug in `DROP PART` which can lead to the error `Unexpected merged part intersects drop range`. [#27807](https://github.com/ClickHouse/ClickHouse/pull/27807) ([alesapin](https://github.com/alesapin)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#28569](https://github.com/ClickHouse/ClickHouse/issues/28569): Fix bug which can lead to error `Existing table metadata in ZooKeeper differs in sorting key expression.` after alter of `ReplicatedVersionedCollapsingMergeTree`. Fixes [#28515](https://github.com/ClickHouse/ClickHouse/issues/28515). [#28528](https://github.com/ClickHouse/ClickHouse/pull/28528) ([alesapin](https://github.com/alesapin)).
 * Backported in [#28857](https://github.com/ClickHouse/ClickHouse/issues/28857): Fix benign race condition in ReplicatedMergeTreeQueue. Shouldn't be visible for user, but can lead to subtle bugs. [#28734](https://github.com/ClickHouse/ClickHouse/pull/28734) ([alesapin](https://github.com/alesapin)).
diff --git a/docs/changelogs/v21.3.18.4-lts.md b/docs/changelogs/v21.3.18.4-lts.md
index d14dddfb1a5..33f4b86d81c 100644
--- a/docs/changelogs/v21.3.18.4-lts.md
+++ b/docs/changelogs/v21.3.18.4-lts.md
@@ -14,7 +14,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#30041](https://github.com/ClickHouse/ClickHouse/issues/30041): Fix shutdown of `AccessControlManager`. Now there can't be reloading of the configuration after AccessControlManager has been destroyed. This PR fixes the flaky test [test_user_directories/test.py::test_relative_path](https://clickhouse-test-reports.s3.yandex.net/0/f0e3122507ed8bea3f177495531c7d56bcb32466/integration_tests_(thread).html). [#29951](https://github.com/ClickHouse/ClickHouse/pull/29951) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#29260](https://github.com/ClickHouse/ClickHouse/issues/29260): Fix invalid constant type conversion when nullable or lowcardinality primary key is used. [#28636](https://github.com/ClickHouse/ClickHouse/pull/28636) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#29026](https://github.com/ClickHouse/ClickHouse/issues/29026): Fix the number of threads used in `GLOBAL IN` subquery (it was executed in single threads since [#19414](https://github.com/ClickHouse/ClickHouse/issues/19414) bugfix). [#28997](https://github.com/ClickHouse/ClickHouse/pull/28997) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
diff --git a/docs/changelogs/v21.3.19.1-lts.md b/docs/changelogs/v21.3.19.1-lts.md
index 4d4404077a5..26c36725610 100644
--- a/docs/changelogs/v21.3.19.1-lts.md
+++ b/docs/changelogs/v21.3.19.1-lts.md
@@ -14,11 +14,11 @@ sidebar_label: 2022
 * Backported in [#31577](https://github.com/ClickHouse/ClickHouse/issues/31577): Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31337](https://github.com/ClickHouse/ClickHouse/pull/31337) ([sunny](https://github.com/sunny19930321)).
 * Backported in [#32347](https://github.com/ClickHouse/ClickHouse/issues/32347): Fix bug when remove unneeded columns in subquery. If there is an aggregation function in query without group by, do not remove if it is unneeded. [#32289](https://github.com/ClickHouse/ClickHouse/pull/32289) ([dongyifeng](https://github.com/dyf6372)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release
+#### Bug Fix (user-visible misbehaviour in official stable release
 
 * Backported in [#30913](https://github.com/ClickHouse/ClickHouse/issues/30913): Fix `ORDER BY ... WITH FILL` with set `TO` and `FROM` and no rows in result set. [#30888](https://github.com/ClickHouse/ClickHouse/pull/30888) ([Anton Popov](https://github.com/CurtizJ)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#30750](https://github.com/ClickHouse/ClickHouse/issues/30750): Functions for case-insensitive search in UTF8 strings like `positionCaseInsensitiveUTF8` and `countSubstringsCaseInsensitiveUTF8` might find substrings that actually does not match, it's fixed. [#30663](https://github.com/ClickHouse/ClickHouse/pull/30663) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Backported in [#31038](https://github.com/ClickHouse/ClickHouse/issues/31038): Using `formatRow` function with not row formats led to segfault. Don't allow to use this function with such formats (because it doesn't make sense). [#31001](https://github.com/ClickHouse/ClickHouse/pull/31001) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v21.3.20.1-lts.md b/docs/changelogs/v21.3.20.1-lts.md
index f9ce3cba78b..1b235556faf 100644
--- a/docs/changelogs/v21.3.20.1-lts.md
+++ b/docs/changelogs/v21.3.20.1-lts.md
@@ -11,7 +11,7 @@ sidebar_label: 2022
 * Backported in [#32690](https://github.com/ClickHouse/ClickHouse/issues/32690): Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31656](https://github.com/ClickHouse/ClickHouse/pull/31656) ([sunny](https://github.com/sunny19930321)).
 * Backported in [#33727](https://github.com/ClickHouse/ClickHouse/issues/33727): Fix null pointer dereference in low cardinality data when deserializing LowCardinality data in the Native format. [#33021](https://github.com/ClickHouse/ClickHouse/pull/33021) ([Harry Lee](https://github.com/HarryLeeIBM)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#32791](https://github.com/ClickHouse/ClickHouse/issues/32791): fix crash when used fuzzBits with multiply same FixedString, Close [#32737](https://github.com/ClickHouse/ClickHouse/issues/32737). [#32755](https://github.com/ClickHouse/ClickHouse/pull/32755) ([SuperDJY](https://github.com/cmsxbc)).
 
diff --git a/docs/changelogs/v21.6.9.7-stable.md b/docs/changelogs/v21.6.9.7-stable.md
index ca1edeb1722..0a989e4d6b7 100644
--- a/docs/changelogs/v21.6.9.7-stable.md
+++ b/docs/changelogs/v21.6.9.7-stable.md
@@ -40,7 +40,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#28030](https://github.com/ClickHouse/ClickHouse/issues/28030): Temporarily switched ubuntu apt repository to mirror ru.archive.ubuntu.com as default one(archive.ubuntu.com) is not responding from our CI. [#28016](https://github.com/ClickHouse/ClickHouse/pull/28016) ([Ilya Yatsishin](https://github.com/qoega)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#28119](https://github.com/ClickHouse/ClickHouse/issues/28119): Fix extremely rare segfaults on shutdown due to incorrect order of context/config reloader shutdown. [#28088](https://github.com/ClickHouse/ClickHouse/pull/28088) ([nvartolomei](https://github.com/nvartolomei)).
 * Backported in [#28179](https://github.com/ClickHouse/ClickHouse/issues/28179): Fixed possible excessive number of conditions moved from `WHERE` to `PREWHERE` (optimization controlled by settings `optimize_move_to_prewhere`). [#28139](https://github.com/ClickHouse/ClickHouse/pull/28139) ([lthaooo](https://github.com/lthaooo)).
diff --git a/docs/changelogs/v21.7.10.4-stable.md b/docs/changelogs/v21.7.10.4-stable.md
index daa063ebf5a..238dfd651eb 100644
--- a/docs/changelogs/v21.7.10.4-stable.md
+++ b/docs/changelogs/v21.7.10.4-stable.md
@@ -14,7 +14,7 @@ sidebar_label: 2022
 * Backported in [#27925](https://github.com/ClickHouse/ClickHouse/issues/27925): Fix PostgreSQL-style cast (`::` operator) with negative numbers. [#27876](https://github.com/ClickHouse/ClickHouse/pull/27876) ([Anton Popov](https://github.com/CurtizJ)).
 * Backported in [#28752](https://github.com/ClickHouse/ClickHouse/issues/28752): Fix transformation of disjunctions chain to `IN` (controlled by settings `optimize_min_equality_disjunction_chain_length`) in distributed queries with settings `legacy_column_name_of_tuple_literal = 0`. [#28658](https://github.com/ClickHouse/ClickHouse/pull/28658) ([Anton Popov](https://github.com/CurtizJ)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#28509](https://github.com/ClickHouse/ClickHouse/issues/28509): Fixed possible ZooKeeper watches leak on background processing of distributed DDL queue. Closes [#26036](https://github.com/ClickHouse/ClickHouse/issues/26036). [#28446](https://github.com/ClickHouse/ClickHouse/pull/28446) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Backported in [#28570](https://github.com/ClickHouse/ClickHouse/issues/28570): Fix bug which can lead to error `Existing table metadata in ZooKeeper differs in sorting key expression.` after alter of `ReplicatedVersionedCollapsingMergeTree`. Fixes [#28515](https://github.com/ClickHouse/ClickHouse/issues/28515). [#28528](https://github.com/ClickHouse/ClickHouse/pull/28528) ([alesapin](https://github.com/alesapin)).
diff --git a/docs/changelogs/v21.7.11.3-stable.md b/docs/changelogs/v21.7.11.3-stable.md
index b3d1c9a44fd..8ccc31657de 100644
--- a/docs/changelogs/v21.7.11.3-stable.md
+++ b/docs/changelogs/v21.7.11.3-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v21.7.11.3-stable FIXME as compared to v21.7.10.4-stable
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#29024](https://github.com/ClickHouse/ClickHouse/issues/29024): Fix the number of threads used in `GLOBAL IN` subquery (it was executed in single threads since [#19414](https://github.com/ClickHouse/ClickHouse/issues/19414) bugfix). [#28997](https://github.com/ClickHouse/ClickHouse/pull/28997) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Backported in [#29195](https://github.com/ClickHouse/ClickHouse/issues/29195): Fix segfault while inserting into column with type LowCardinality(Nullable) in Avro input format. [#29132](https://github.com/ClickHouse/ClickHouse/pull/29132) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v21.7.9.7-stable.md b/docs/changelogs/v21.7.9.7-stable.md
index ac985f7af37..7aaab54af6b 100644
--- a/docs/changelogs/v21.7.9.7-stable.md
+++ b/docs/changelogs/v21.7.9.7-stable.md
@@ -23,7 +23,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#28032](https://github.com/ClickHouse/ClickHouse/issues/28032): Temporarily switched ubuntu apt repository to mirror ru.archive.ubuntu.com as default one(archive.ubuntu.com) is not responding from our CI. [#28016](https://github.com/ClickHouse/ClickHouse/pull/28016) ([Ilya Yatsishin](https://github.com/qoega)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#28116](https://github.com/ClickHouse/ClickHouse/issues/28116): Fix extremely rare segfaults on shutdown due to incorrect order of context/config reloader shutdown. [#28088](https://github.com/ClickHouse/ClickHouse/pull/28088) ([nvartolomei](https://github.com/nvartolomei)).
 * Backported in [#28183](https://github.com/ClickHouse/ClickHouse/issues/28183): Fixed possible excessive number of conditions moved from `WHERE` to `PREWHERE` (optimization controlled by settings `optimize_move_to_prewhere`). [#28139](https://github.com/ClickHouse/ClickHouse/pull/28139) ([lthaooo](https://github.com/lthaooo)).
diff --git a/docs/changelogs/v21.8.10.19-lts.md b/docs/changelogs/v21.8.10.19-lts.md
index 56c682ddbd2..5873f2b2ff9 100644
--- a/docs/changelogs/v21.8.10.19-lts.md
+++ b/docs/changelogs/v21.8.10.19-lts.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Improvement
 * Backported in [#30452](https://github.com/ClickHouse/ClickHouse/issues/30452): Allow symlinks to files in user_files directory for file table function. [#30309](https://github.com/ClickHouse/ClickHouse/pull/30309) ([Kseniia Sumarokova](https://github.com/kssenii)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#29724](https://github.com/ClickHouse/ClickHouse/issues/29724): Fix null deference for `GROUP BY WITH TOTALS HAVING` (when the column from `HAVING` wasn't selected). [#29553](https://github.com/ClickHouse/ClickHouse/pull/29553) ([Azat Khuzhin](https://github.com/azat)).
 * Backported in [#30233](https://github.com/ClickHouse/ClickHouse/issues/30233): Fix INSERT SELECT incorrectly fills MATERIALIZED column based of Nullable column. [#30189](https://github.com/ClickHouse/ClickHouse/pull/30189) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v21.8.11.4-lts.md b/docs/changelogs/v21.8.11.4-lts.md
index d88d191bae2..81bbea4ee21 100644
--- a/docs/changelogs/v21.8.11.4-lts.md
+++ b/docs/changelogs/v21.8.11.4-lts.md
@@ -16,11 +16,11 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#31368](https://github.com/ClickHouse/ClickHouse/issues/31368): Fix SHOW GRANTS when partial revokes are used. This PR fixes [#31138](https://github.com/ClickHouse/ClickHouse/issues/31138). [#31249](https://github.com/ClickHouse/ClickHouse/pull/31249) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release
+#### Bug Fix (user-visible misbehaviour in official stable release
 
 * Backported in [#30914](https://github.com/ClickHouse/ClickHouse/issues/30914): Fix `ORDER BY ... WITH FILL` with set `TO` and `FROM` and no rows in result set. [#30888](https://github.com/ClickHouse/ClickHouse/pull/30888) ([Anton Popov](https://github.com/CurtizJ)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#28756](https://github.com/ClickHouse/ClickHouse/issues/28756): Fix NOT-IN index optimization when not all key columns are used. This fixes [#28120](https://github.com/ClickHouse/ClickHouse/issues/28120). [#28315](https://github.com/ClickHouse/ClickHouse/pull/28315) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#30825](https://github.com/ClickHouse/ClickHouse/issues/30825): Fix "Column is not under aggregate function and not in GROUP BY" with PREWHERE (Fixes: [#28461](https://github.com/ClickHouse/ClickHouse/issues/28461)). [#28502](https://github.com/ClickHouse/ClickHouse/pull/28502) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v21.8.12.29-lts.md b/docs/changelogs/v21.8.12.29-lts.md
index bd1f0c7fe60..8b68a6a3af8 100644
--- a/docs/changelogs/v21.8.12.29-lts.md
+++ b/docs/changelogs/v21.8.12.29-lts.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#31575](https://github.com/ClickHouse/ClickHouse/issues/31575): Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31337](https://github.com/ClickHouse/ClickHouse/pull/31337) ([sunny](https://github.com/sunny19930321)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#31204](https://github.com/ClickHouse/ClickHouse/issues/31204): Fix abort in debug server and `DB::Exception: std::out_of_range: basic_string` error in release server in case of bad hdfs url by adding additional check of hdfs url structure. [#31042](https://github.com/ClickHouse/ClickHouse/pull/31042) ([Kruglov Pavel](https://github.com/Avogar)).
 * Backported in [#31253](https://github.com/ClickHouse/ClickHouse/issues/31253): Fix bug in Keeper which can lead to inability to start when some coordination logs was lost and we have more fresh snapshot than our latest log. [#31150](https://github.com/ClickHouse/ClickHouse/pull/31150) ([alesapin](https://github.com/alesapin)).
diff --git a/docs/changelogs/v21.8.13.6-lts.md b/docs/changelogs/v21.8.13.6-lts.md
index 63ac956c3d5..205628c6330 100644
--- a/docs/changelogs/v21.8.13.6-lts.md
+++ b/docs/changelogs/v21.8.13.6-lts.md
@@ -11,7 +11,7 @@ sidebar_label: 2022
 * Backported in [#32688](https://github.com/ClickHouse/ClickHouse/issues/32688): Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31656](https://github.com/ClickHouse/ClickHouse/pull/31656) ([sunny](https://github.com/sunny19930321)).
 * Backported in [#32343](https://github.com/ClickHouse/ClickHouse/issues/32343): Fix bug when remove unneeded columns in subquery. If there is an aggregation function in query without group by, do not remove if it is unneeded. [#32289](https://github.com/ClickHouse/ClickHouse/pull/32289) ([dongyifeng](https://github.com/dyf6372)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#32108](https://github.com/ClickHouse/ClickHouse/issues/32108): Fix crash with empty result on odbc query. Closes [#31465](https://github.com/ClickHouse/ClickHouse/issues/31465). [#31766](https://github.com/ClickHouse/ClickHouse/pull/31766) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Backported in [#32150](https://github.com/ClickHouse/ClickHouse/issues/32150): Fix crash when function `dictGet` with type is used for dictionary attribute when type is `Nullable`. Fixes [#30980](https://github.com/ClickHouse/ClickHouse/issues/30980). [#31800](https://github.com/ClickHouse/ClickHouse/pull/31800) ([Maksim Kita](https://github.com/kitaisreal)).
@@ -26,7 +26,7 @@ sidebar_label: 2022
 * Backported in [#33048](https://github.com/ClickHouse/ClickHouse/issues/33048): Fix possible exception at RabbitMQ storage startup by delaying channel creation. [#32584](https://github.com/ClickHouse/ClickHouse/pull/32584) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Backported in [#32795](https://github.com/ClickHouse/ClickHouse/issues/32795): fix crash when used fuzzBits with multiply same FixedString, Close [#32737](https://github.com/ClickHouse/ClickHouse/issues/32737). [#32755](https://github.com/ClickHouse/ClickHouse/pull/32755) ([SuperDJY](https://github.com/cmsxbc)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release):
+#### Bug Fix (user-visible misbehaviour in official stable release):
 
 * Backported in [#32659](https://github.com/ClickHouse/ClickHouse/issues/32659): Fix possible crash (or incorrect result) in case of `LowCardinality` arguments of window function. Fixes [#31114](https://github.com/ClickHouse/ClickHouse/issues/31114). [#31888](https://github.com/ClickHouse/ClickHouse/pull/31888) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
diff --git a/docs/changelogs/v21.8.14.5-lts.md b/docs/changelogs/v21.8.14.5-lts.md
index 1012d9c5784..75d966ec9e7 100644
--- a/docs/changelogs/v21.8.14.5-lts.md
+++ b/docs/changelogs/v21.8.14.5-lts.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v21.8.14.5-lts FIXME as compared to v21.8.13.6-lts
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#33184](https://github.com/ClickHouse/ClickHouse/issues/33184): Server might fail to start if database with `MySQL` engine cannot connect to MySQL server, it's fixed. Fixes [#14441](https://github.com/ClickHouse/ClickHouse/issues/14441). [#32802](https://github.com/ClickHouse/ClickHouse/pull/32802) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Backported in [#33659](https://github.com/ClickHouse/ClickHouse/issues/33659): Fix hdfs url check that didn't allow using HA namenode address. Bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/31042. [#32976](https://github.com/ClickHouse/ClickHouse/pull/32976) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v21.8.15.7-lts.md b/docs/changelogs/v21.8.15.7-lts.md
index eb6bf39d7be..1522c28016a 100644
--- a/docs/changelogs/v21.8.15.7-lts.md
+++ b/docs/changelogs/v21.8.15.7-lts.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v21.8.15.7-lts FIXME as compared to v21.8.14.5-lts
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#34121](https://github.com/ClickHouse/ClickHouse/issues/34121): Fix usage of functions `array` and `tuple` with literal arguments in distributed queries. Previously it could lead to `Not found columns` exception. [#33938](https://github.com/ClickHouse/ClickHouse/pull/33938) ([Anton Popov](https://github.com/CurtizJ)).
 * Backported in [#34097](https://github.com/ClickHouse/ClickHouse/issues/34097): Fix segfault while parsing ORC file with corrupted footer. Closes [#33797](https://github.com/ClickHouse/ClickHouse/issues/33797). [#33984](https://github.com/ClickHouse/ClickHouse/pull/33984) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v21.8.5.7-lts.md b/docs/changelogs/v21.8.5.7-lts.md
index 00c6c6e46a7..fa459e093f7 100644
--- a/docs/changelogs/v21.8.5.7-lts.md
+++ b/docs/changelogs/v21.8.5.7-lts.md
@@ -25,7 +25,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#28031](https://github.com/ClickHouse/ClickHouse/issues/28031): Temporarily switched ubuntu apt repository to mirror ru.archive.ubuntu.com as default one(archive.ubuntu.com) is not responding from our CI. [#28016](https://github.com/ClickHouse/ClickHouse/pull/28016) ([Ilya Yatsishin](https://github.com/qoega)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#27974](https://github.com/ClickHouse/ClickHouse/issues/27974): Fix handling null value with type of Nullable(String) in function JSONExtract. This fixes [#27929](https://github.com/ClickHouse/ClickHouse/issues/27929) and [#27930](https://github.com/ClickHouse/ClickHouse/issues/27930) . This was introduced in https://github.com/ClickHouse/ClickHouse/pull/25452 . [#27939](https://github.com/ClickHouse/ClickHouse/pull/27939) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#28117](https://github.com/ClickHouse/ClickHouse/issues/28117): Fix extremely rare segfaults on shutdown due to incorrect order of context/config reloader shutdown. [#28088](https://github.com/ClickHouse/ClickHouse/pull/28088) ([nvartolomei](https://github.com/nvartolomei)).
diff --git a/docs/changelogs/v21.8.6.15-lts.md b/docs/changelogs/v21.8.6.15-lts.md
index dc8ae4ec9b5..aa51dc1ac1e 100644
--- a/docs/changelogs/v21.8.6.15-lts.md
+++ b/docs/changelogs/v21.8.6.15-lts.md
@@ -16,7 +16,7 @@ sidebar_label: 2022
 * Backported in [#27923](https://github.com/ClickHouse/ClickHouse/issues/27923): Fix PostgreSQL-style cast (`::` operator) with negative numbers. [#27876](https://github.com/ClickHouse/ClickHouse/pull/27876) ([Anton Popov](https://github.com/CurtizJ)).
 * Backported in [#28753](https://github.com/ClickHouse/ClickHouse/issues/28753): Fix transformation of disjunctions chain to `IN` (controlled by settings `optimize_min_equality_disjunction_chain_length`) in distributed queries with settings `legacy_column_name_of_tuple_literal = 0`. [#28658](https://github.com/ClickHouse/ClickHouse/pull/28658) ([Anton Popov](https://github.com/CurtizJ)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#28644](https://github.com/ClickHouse/ClickHouse/issues/28644): Fix rare case when changes of `clickhouse-keeper` settings may lead to lost logs and server hung. [#28360](https://github.com/ClickHouse/ClickHouse/pull/28360) ([alesapin](https://github.com/alesapin)).
 * Backported in [#28508](https://github.com/ClickHouse/ClickHouse/issues/28508): Fix lack of quotes for table names in MaterializedPostgreSQL engine. Closes [#28316](https://github.com/ClickHouse/ClickHouse/issues/28316). [#28433](https://github.com/ClickHouse/ClickHouse/pull/28433) ([Kseniia Sumarokova](https://github.com/kssenii)).
diff --git a/docs/changelogs/v21.8.7.22-lts.md b/docs/changelogs/v21.8.7.22-lts.md
index b6c5b70e096..7a751be4132 100644
--- a/docs/changelogs/v21.8.7.22-lts.md
+++ b/docs/changelogs/v21.8.7.22-lts.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v21.8.7.22-lts FIXME as compared to v21.8.6.15-lts
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#29121](https://github.com/ClickHouse/ClickHouse/issues/29121): Better check for connection usability and also catch any exception in RabbitMQ shutdown just in case. [#28797](https://github.com/ClickHouse/ClickHouse/pull/28797) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Backported in [#29027](https://github.com/ClickHouse/ClickHouse/issues/29027): Fix the number of threads used in `GLOBAL IN` subquery (it was executed in single threads since [#19414](https://github.com/ClickHouse/ClickHouse/issues/19414) bugfix). [#28997](https://github.com/ClickHouse/ClickHouse/pull/28997) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
diff --git a/docs/changelogs/v21.8.8.29-lts.md b/docs/changelogs/v21.8.8.29-lts.md
index 160d30a6aa9..e988c3c6801 100644
--- a/docs/changelogs/v21.8.8.29-lts.md
+++ b/docs/changelogs/v21.8.8.29-lts.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#29128](https://github.com/ClickHouse/ClickHouse/issues/29128): Fix bug in `clickhouse-keeper-converter` which can lead to incorrect ZooKeeper log deserialization. [#29071](https://github.com/ClickHouse/ClickHouse/pull/29071) ([小路](https://github.com/nicelulu)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#29262](https://github.com/ClickHouse/ClickHouse/issues/29262): Fix invalid constant type conversion when nullable or lowcardinality primary key is used. [#28636](https://github.com/ClickHouse/ClickHouse/pull/28636) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#29106](https://github.com/ClickHouse/ClickHouse/issues/29106): Fix waiting for mutation with `mutations_sync=2`. [#28889](https://github.com/ClickHouse/ClickHouse/pull/28889) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v21.8.9.13-lts.md b/docs/changelogs/v21.8.9.13-lts.md
index a48ca30080e..71919c48c47 100644
--- a/docs/changelogs/v21.8.9.13-lts.md
+++ b/docs/changelogs/v21.8.9.13-lts.md
@@ -14,7 +14,7 @@ sidebar_label: 2022
 * Backported in [#29817](https://github.com/ClickHouse/ClickHouse/issues/29817): Allow using a materialized column as the sharding key in a distributed table even if `insert_allow_materialized_columns=0`:. [#28637](https://github.com/ClickHouse/ClickHouse/pull/28637) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Backported in [#29973](https://github.com/ClickHouse/ClickHouse/issues/29973): Fix shutdown of `AccessControlManager`. Now there can't be reloading of the configuration after AccessControlManager has been destroyed. This PR fixes the flaky test [test_user_directories/test.py::test_relative_path](https://clickhouse-test-reports.s3.yandex.net/0/f0e3122507ed8bea3f177495531c7d56bcb32466/integration_tests_(thread).html). [#29951](https://github.com/ClickHouse/ClickHouse/pull/29951) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#29676](https://github.com/ClickHouse/ClickHouse/issues/29676): Fix vertical merges of projection parts. This fixes [#29253](https://github.com/ClickHouse/ClickHouse/issues/29253) . This PR also fixes several projection merge/mutation issues introduced in https://github.com/ClickHouse/ClickHouse/pull/25165. [#29337](https://github.com/ClickHouse/ClickHouse/pull/29337) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#29538](https://github.com/ClickHouse/ClickHouse/issues/29538): Fix possible `Block structure mismatch` for subqueries with pushed-down `HAVING` predicate. Fixes [#29010](https://github.com/ClickHouse/ClickHouse/issues/29010). [#29475](https://github.com/ClickHouse/ClickHouse/pull/29475) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
diff --git a/docs/changelogs/v21.9.2.17-stable.md b/docs/changelogs/v21.9.2.17-stable.md
index 39e3f627f4a..08d208ec97b 100644
--- a/docs/changelogs/v21.9.2.17-stable.md
+++ b/docs/changelogs/v21.9.2.17-stable.md
@@ -25,7 +25,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#28029](https://github.com/ClickHouse/ClickHouse/issues/28029): Temporarily switched ubuntu apt repository to mirror ru.archive.ubuntu.com as default one(archive.ubuntu.com) is not responding from our CI. [#28016](https://github.com/ClickHouse/ClickHouse/pull/28016) ([Ilya Yatsishin](https://github.com/qoega)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#27973](https://github.com/ClickHouse/ClickHouse/issues/27973): Fix handling null value with type of Nullable(String) in function JSONExtract. This fixes [#27929](https://github.com/ClickHouse/ClickHouse/issues/27929) and [#27930](https://github.com/ClickHouse/ClickHouse/issues/27930) . This was introduced in https://github.com/ClickHouse/ClickHouse/pull/25452 . [#27939](https://github.com/ClickHouse/ClickHouse/pull/27939) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#28118](https://github.com/ClickHouse/ClickHouse/issues/28118): Fix extremely rare segfaults on shutdown due to incorrect order of context/config reloader shutdown. [#28088](https://github.com/ClickHouse/ClickHouse/pull/28088) ([nvartolomei](https://github.com/nvartolomei)).
diff --git a/docs/changelogs/v21.9.3.30-stable.md b/docs/changelogs/v21.9.3.30-stable.md
index ee2dd24277d..28375c5588e 100644
--- a/docs/changelogs/v21.9.3.30-stable.md
+++ b/docs/changelogs/v21.9.3.30-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Improvement
 * Backported in [#28897](https://github.com/ClickHouse/ClickHouse/issues/28897): Use real tmp file instead of predefined "rows_sources" for vertical merges. This avoids generating garbage directories in tmp disks. [#28299](https://github.com/ClickHouse/ClickHouse/pull/28299) ([Amos Bird](https://github.com/amosbird)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#28815](https://github.com/ClickHouse/ClickHouse/issues/28815): Fix possible crash for `SELECT` with partially created aggregate projection in case of exception. [#28700](https://github.com/ClickHouse/ClickHouse/pull/28700) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#28789](https://github.com/ClickHouse/ClickHouse/issues/28789): Fix benign race condition in ReplicatedMergeTreeQueue. Shouldn't be visible for user, but can lead to subtle bugs. [#28734](https://github.com/ClickHouse/ClickHouse/pull/28734) ([alesapin](https://github.com/alesapin)).
diff --git a/docs/changelogs/v21.9.4.35-stable.md b/docs/changelogs/v21.9.4.35-stable.md
index 5a556df1b3a..0b300574559 100644
--- a/docs/changelogs/v21.9.4.35-stable.md
+++ b/docs/changelogs/v21.9.4.35-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v21.9.4.35-stable FIXME as compared to v21.9.3.30-stable
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#29191](https://github.com/ClickHouse/ClickHouse/issues/29191): Fix segfault while inserting into column with type LowCardinality(Nullable) in Avro input format. [#29132](https://github.com/ClickHouse/ClickHouse/pull/29132) ([Kruglov Pavel](https://github.com/Avogar)).
 
diff --git a/docs/changelogs/v21.9.5.16-stable.md b/docs/changelogs/v21.9.5.16-stable.md
index e681322eb45..895e882d257 100644
--- a/docs/changelogs/v21.9.5.16-stable.md
+++ b/docs/changelogs/v21.9.5.16-stable.md
@@ -17,7 +17,7 @@ sidebar_label: 2022
 * Backported in [#29972](https://github.com/ClickHouse/ClickHouse/issues/29972): Fix shutdown of `AccessControlManager`. Now there can't be reloading of the configuration after AccessControlManager has been destroyed. This PR fixes the flaky test [test_user_directories/test.py::test_relative_path](https://clickhouse-test-reports.s3.yandex.net/0/f0e3122507ed8bea3f177495531c7d56bcb32466/integration_tests_(thread).html). [#29951](https://github.com/ClickHouse/ClickHouse/pull/29951) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Backported in [#30052](https://github.com/ClickHouse/ClickHouse/issues/30052): Fix releasing query ID and session ID at the end of query processing while handing gRPC call. This PR fixes flaky test [test_grpc_protocol/test.py::test_session](https://clickhouse-test-reports.s3.yandex.net/0/1ac03811a2df9717fa7c633d1af03def821d24b6/integration_tests_(memory).html). [#29954](https://github.com/ClickHouse/ClickHouse/pull/29954) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#29055](https://github.com/ClickHouse/ClickHouse/issues/29055): Fix invalid constant type conversion when nullable or lowcardinality primary key is used. [#28636](https://github.com/ClickHouse/ClickHouse/pull/28636) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#29107](https://github.com/ClickHouse/ClickHouse/issues/29107): Fix waiting for mutation with `mutations_sync=2`. [#28889](https://github.com/ClickHouse/ClickHouse/pull/28889) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v21.9.6.24-stable.md b/docs/changelogs/v21.9.6.24-stable.md
index 2407c031873..890dc8d5d02 100644
--- a/docs/changelogs/v21.9.6.24-stable.md
+++ b/docs/changelogs/v21.9.6.24-stable.md
@@ -21,11 +21,11 @@ sidebar_label: 2022
 * Backported in [#31371](https://github.com/ClickHouse/ClickHouse/issues/31371): Fix SHOW GRANTS when partial revokes are used. This PR fixes [#31138](https://github.com/ClickHouse/ClickHouse/issues/31138). [#31249](https://github.com/ClickHouse/ClickHouse/pull/31249) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Backported in [#31576](https://github.com/ClickHouse/ClickHouse/issues/31576): Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31337](https://github.com/ClickHouse/ClickHouse/pull/31337) ([sunny](https://github.com/sunny19930321)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release
+#### Bug Fix (user-visible misbehaviour in official stable release
 
 * Backported in [#30916](https://github.com/ClickHouse/ClickHouse/issues/30916): Fix `ORDER BY ... WITH FILL` with set `TO` and `FROM` and no rows in result set. [#30888](https://github.com/ClickHouse/ClickHouse/pull/30888) ([Anton Popov](https://github.com/CurtizJ)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#30823](https://github.com/ClickHouse/ClickHouse/issues/30823): Fix "Column is not under aggregate function and not in GROUP BY" with PREWHERE (Fixes: [#28461](https://github.com/ClickHouse/ClickHouse/issues/28461)). [#28502](https://github.com/ClickHouse/ClickHouse/pull/28502) ([Azat Khuzhin](https://github.com/azat)).
 * Backported in [#30609](https://github.com/ClickHouse/ClickHouse/issues/30609): Fix bad optimizations of ORDER BY if it contains WITH FILL. This closes [#28908](https://github.com/ClickHouse/ClickHouse/issues/28908). This closes [#26049](https://github.com/ClickHouse/ClickHouse/issues/26049). [#28910](https://github.com/ClickHouse/ClickHouse/pull/28910) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
diff --git a/docs/changelogs/v22.1.1.2542-prestable.md b/docs/changelogs/v22.1.1.2542-prestable.md
index 8d7bb015db6..cacd13c1e12 100644
--- a/docs/changelogs/v22.1.1.2542-prestable.md
+++ b/docs/changelogs/v22.1.1.2542-prestable.md
@@ -118,7 +118,7 @@ sidebar_label: 2022
 * Remove editing /etc/hosts from Dockerfile. [#33635](https://github.com/ClickHouse/ClickHouse/pull/33635) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Properly separate thrift-cmake from arrow-cmake after https://github.com/ClickHouse/ClickHouse/pull/31104 . cc @taiyang-li. [#33661](https://github.com/ClickHouse/ClickHouse/pull/33661) ([Amos Bird](https://github.com/amosbird)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Fixed CAST from String to IPv4 or IPv6 and back. Fixed error message in case of failed conversion. [#29224](https://github.com/ClickHouse/ClickHouse/pull/29224) ([Dmitry Novik](https://github.com/novikd)).
 * Fix base64Encode adding trailing bytes on small strings. [#31797](https://github.com/ClickHouse/ClickHouse/pull/31797) ([Kevin Michel](https://github.com/kmichel-aiven)).
@@ -185,7 +185,7 @@ sidebar_label: 2022
 * Fix segfault in Avro that appears after the second insert into file. [#33566](https://github.com/ClickHouse/ClickHouse/pull/33566) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fix wrong database for JOIN w/o explicit database in distributed queries (Fixes: [#10471](https://github.com/ClickHouse/ClickHouse/issues/10471)). [#33611](https://github.com/ClickHouse/ClickHouse/pull/33611) ([Azat Khuzhin](https://github.com/azat)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release):
+#### Bug Fix (user-visible misbehaviour in official stable release):
 
 * Fix possible crash (or incorrect result) in case of `LowCardinality` arguments of window function. Fixes [#31114](https://github.com/ClickHouse/ClickHouse/issues/31114). [#31888](https://github.com/ClickHouse/ClickHouse/pull/31888) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
diff --git a/docs/changelogs/v22.1.3.7-stable.md b/docs/changelogs/v22.1.3.7-stable.md
index a92a82be290..fd8787f0e75 100644
--- a/docs/changelogs/v22.1.3.7-stable.md
+++ b/docs/changelogs/v22.1.3.7-stable.md
@@ -10,6 +10,6 @@ sidebar_label: 2022
 #### Improvement
 * Backported in [#33793](https://github.com/ClickHouse/ClickHouse/issues/33793): Create parent directories in DiskS3::restoreFileOperations method. [#33730](https://github.com/ClickHouse/ClickHouse/pull/33730) ([ianton-ru](https://github.com/ianton-ru)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#33898](https://github.com/ClickHouse/ClickHouse/issues/33898): Fix usage of sparse columns (which can be enabled by experimental setting `ratio_of_defaults_for_sparse_serialization`). [#33849](https://github.com/ClickHouse/ClickHouse/pull/33849) ([Anton Popov](https://github.com/CurtizJ)).
diff --git a/docs/changelogs/v22.1.4.30-stable.md b/docs/changelogs/v22.1.4.30-stable.md
index c4286d7b64d..b0437382a46 100644
--- a/docs/changelogs/v22.1.4.30-stable.md
+++ b/docs/changelogs/v22.1.4.30-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backport CI checks to 22.1 release branch. [#34897](https://github.com/ClickHouse/ClickHouse/pull/34897) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#34119](https://github.com/ClickHouse/ClickHouse/issues/34119): Fix usage of functions `array` and `tuple` with literal arguments in distributed queries. Previously it could lead to `Not found columns` exception. [#33938](https://github.com/ClickHouse/ClickHouse/pull/33938) ([Anton Popov](https://github.com/CurtizJ)).
 * Backported in [#34124](https://github.com/ClickHouse/ClickHouse/issues/34124): Fix crash while reading of nested tuples. Fixes [#33838](https://github.com/ClickHouse/ClickHouse/issues/33838). [#33956](https://github.com/ClickHouse/ClickHouse/pull/33956) ([Anton Popov](https://github.com/CurtizJ)).
diff --git a/docs/changelogs/v22.10.1.1877-stable.md b/docs/changelogs/v22.10.1.1877-stable.md
index 5b573a3faa4..23c58447c99 100644
--- a/docs/changelogs/v22.10.1.1877-stable.md
+++ b/docs/changelogs/v22.10.1.1877-stable.md
@@ -105,7 +105,7 @@ sidebar_label: 2022
 * Update tzdata to 2022e to support the new timezone changes. Palestine transitions are now Saturdays at 02:00. Simplify three Ukraine zones into one. Jordan and Syria switch from +02/+03 with DST to year-round +03. (https://data.iana.org/time-zones/tzdb/NEWS). This closes [#42252](https://github.com/ClickHouse/ClickHouse/issues/42252). [#42327](https://github.com/ClickHouse/ClickHouse/pull/42327) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Fix power8 support. [#42462](https://github.com/ClickHouse/ClickHouse/pull/42462) ([Boris Kuschel](https://github.com/bkuschel)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Several fixes for DiskWeb. [#41652](https://github.com/ClickHouse/ClickHouse/pull/41652) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fixes issue when docker run will fail if "https_port" is not present in config. [#41693](https://github.com/ClickHouse/ClickHouse/pull/41693) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
@@ -147,7 +147,7 @@ sidebar_label: 2022
 * This closes [#42453](https://github.com/ClickHouse/ClickHouse/issues/42453). [#42573](https://github.com/ClickHouse/ClickHouse/pull/42573) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Fix function `arrayElement` with type `Map` with `Nullable` values and `Nullable` index. [#42623](https://github.com/ClickHouse/ClickHouse/pull/42623) ([Anton Popov](https://github.com/CurtizJ)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Fix unexpected table loading error when partition key contains alias function names during server upgrade. [#36379](https://github.com/ClickHouse/ClickHouse/pull/36379) ([Amos Bird](https://github.com/amosbird)).
 
diff --git a/docs/changelogs/v22.10.2.11-stable.md b/docs/changelogs/v22.10.2.11-stable.md
index 4e3c382f5a7..196d3fbde80 100644
--- a/docs/changelogs/v22.10.2.11-stable.md
+++ b/docs/changelogs/v22.10.2.11-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.10.2.11-stable (d2bfcaba002) FIXME as compared to v22.10.1.1877-stable (98ab5a3c189)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#42750](https://github.com/ClickHouse/ClickHouse/issues/42750): A segmentation fault related to DNS & c-ares has been reported. The below error ocurred in multiple threads: ``` 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008088 [ 356 ] {} <Fatal> BaseDaemon: ######################################## 2022-09-28 15:41:19.008,"2022.09.28 15:41:19.008147 [ 356 ] {} <Fatal> BaseDaemon: (version 22.8.5.29 (official build), build id: 92504ACA0B8E2267) (from thread 353) (no query) Received signal Segmentation fault (11)" 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008196 [ 356 ] {} <Fatal> BaseDaemon: Address: 0xf Access: write. Address not mapped to object. 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008216 [ 356 ] {} <Fatal> BaseDaemon: Stack trace: 0x188f8212 0x1626851b 0x1626a69e 0x16269b3f 0x16267eab 0x13cf8284 0x13d24afc 0x13c5217e 0x14ec2495 0x15ba440f 0x15b9d13b 0x15bb2699 0x1891ccb3 0x1891e00d 0x18ae0769 0x18ade022 0x7f76aa985609 0x7f76aa8aa133 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008274 [ 356 ] {} <Fatal> BaseDaemon: 2. Poco::Net::IPAddress::family() const @ 0x188f8212 in /usr/bin/clickhouse 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008297 [ 356 ] {} <Fatal> BaseDaemon: 3. ? @ 0x1626851b in /usr/bin/clickhouse 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008309 [ 356 ] {} <Fatal> BaseDaemon: 4. ? @ 0x1626a69e in /usr/bin/clickhouse ```. [#42234](https://github.com/ClickHouse/ClickHouse/pull/42234) ([Arthur Passos](https://github.com/arthurpassos)).
 * Backported in [#42793](https://github.com/ClickHouse/ClickHouse/issues/42793): Fix a bug in ParserFunction that could have led to a segmentation fault. [#42724](https://github.com/ClickHouse/ClickHouse/pull/42724) ([Nikolay Degterinsky](https://github.com/evillique)).
diff --git a/docs/changelogs/v22.10.3.27-stable.md b/docs/changelogs/v22.10.3.27-stable.md
index 6dc9fd7f3b9..6e0188ad619 100644
--- a/docs/changelogs/v22.10.3.27-stable.md
+++ b/docs/changelogs/v22.10.3.27-stable.md
@@ -14,7 +14,7 @@ sidebar_label: 2022
 * Backported in [#42959](https://github.com/ClickHouse/ClickHouse/issues/42959): Before the fix, the user-defined config was preserved by RPM in `$file.rpmsave`. The PR fixes it and won't replace the user's files from packages. [#42936](https://github.com/ClickHouse/ClickHouse/pull/42936) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#43042](https://github.com/ClickHouse/ClickHouse/issues/43042): Add a CI step to mark commits as ready for release; soft-forbid launching a release script from branches but master. [#43017](https://github.com/ClickHouse/ClickHouse/pull/43017) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#42864](https://github.com/ClickHouse/ClickHouse/issues/42864): Fix lowerUTF8()/upperUTF8() in case of symbol was in between 16-byte boundary (very frequent case of you have strings > 16 bytes long). [#42812](https://github.com/ClickHouse/ClickHouse/pull/42812) ([Azat Khuzhin](https://github.com/azat)).
 * Backported in [#43173](https://github.com/ClickHouse/ClickHouse/issues/43173): Fix rare possible hung on query cancellation. [#42874](https://github.com/ClickHouse/ClickHouse/pull/42874) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v22.10.4.23-stable.md b/docs/changelogs/v22.10.4.23-stable.md
index 04eb8be982f..4438a3470fc 100644
--- a/docs/changelogs/v22.10.4.23-stable.md
+++ b/docs/changelogs/v22.10.4.23-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#43053](https://github.com/ClickHouse/ClickHouse/issues/43053): Wait for all files are in sync before archiving them in integration tests. [#42891](https://github.com/ClickHouse/ClickHouse/pull/42891) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#43715](https://github.com/ClickHouse/ClickHouse/issues/43715): An issue with the following exception has been reported while trying to read a Parquet file from S3 into ClickHouse:. [#43297](https://github.com/ClickHouse/ClickHouse/pull/43297) ([Arthur Passos](https://github.com/arthurpassos)).
 * Backported in [#43576](https://github.com/ClickHouse/ClickHouse/issues/43576): Fix possible `Cannot create non-empty column with type Nothing` in functions if/multiIf. Closes [#43356](https://github.com/ClickHouse/ClickHouse/issues/43356). [#43368](https://github.com/ClickHouse/ClickHouse/pull/43368) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v22.10.5.54-stable.md b/docs/changelogs/v22.10.5.54-stable.md
index e372fb30618..73c15cf985d 100644
--- a/docs/changelogs/v22.10.5.54-stable.md
+++ b/docs/changelogs/v22.10.5.54-stable.md
@@ -17,7 +17,7 @@ sidebar_label: 2023
 * Backported in [#44379](https://github.com/ClickHouse/ClickHouse/issues/44379): In rare cases, we don't rebuild binaries, because another task with a similar prefix succeeded. E.g. `binary_darwin` didn't restart because `binary_darwin_aarch64`. [#44311](https://github.com/ClickHouse/ClickHouse/pull/44311) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#44559](https://github.com/ClickHouse/ClickHouse/issues/44559): Retry the integration tests on compressing errors. [#44529](https://github.com/ClickHouse/ClickHouse/pull/44529) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#44754](https://github.com/ClickHouse/ClickHouse/issues/44754): [#40651](https://github.com/ClickHouse/ClickHouse/issues/40651) [#41404](https://github.com/ClickHouse/ClickHouse/issues/41404). [#42126](https://github.com/ClickHouse/ClickHouse/pull/42126) ([Alexander Gololobov](https://github.com/davenger)).
 * Backported in [#43527](https://github.com/ClickHouse/ClickHouse/issues/43527): Fix incorrect UserTimeMicroseconds/SystemTimeMicroseconds accounting. [#42791](https://github.com/ClickHouse/ClickHouse/pull/42791) ([Azat Khuzhin](https://github.com/azat)).
@@ -41,4 +41,3 @@ sidebar_label: 2023
 * Implement a custom central checkout action [#44399](https://github.com/ClickHouse/ClickHouse/pull/44399) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Fix crash on delete from materialized view [#44705](https://github.com/ClickHouse/ClickHouse/pull/44705) ([Alexander Gololobov](https://github.com/davenger)).
 * Do not check read result consistency when unwinding [#44956](https://github.com/ClickHouse/ClickHouse/pull/44956) ([Alexander Gololobov](https://github.com/davenger)).
-
diff --git a/docs/changelogs/v22.10.6.3-stable.md b/docs/changelogs/v22.10.6.3-stable.md
index b0e88c92cb0..c09e9a8670b 100644
--- a/docs/changelogs/v22.10.6.3-stable.md
+++ b/docs/changelogs/v22.10.6.3-stable.md
@@ -7,7 +7,6 @@ sidebar_label: 2023
 
 ### ClickHouse release v22.10.6.3-stable (645a66d221f) FIXME as compared to v22.10.5.54-stable (dbc7984dc3b)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#45084](https://github.com/ClickHouse/ClickHouse/issues/45084): fix alter table ttl error when wide part has light weight delete mask. [#44959](https://github.com/ClickHouse/ClickHouse/pull/44959) ([Mingliang Pan](https://github.com/liangliangpan)).
-
diff --git a/docs/changelogs/v22.10.7.13-stable.md b/docs/changelogs/v22.10.7.13-stable.md
index c906e00e524..987bf6cf1e1 100644
--- a/docs/changelogs/v22.10.7.13-stable.md
+++ b/docs/changelogs/v22.10.7.13-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2023
 
 ### ClickHouse release v22.10.7.13-stable (d261d9036cc) FIXME as compared to v22.10.6.3-stable (645a66d221f)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#44998](https://github.com/ClickHouse/ClickHouse/issues/44998): Another fix for `Cannot read all data` error which could happen while reading `LowCardinality` dictionary from remote fs. Fixes [#44709](https://github.com/ClickHouse/ClickHouse/issues/44709). [#44875](https://github.com/ClickHouse/ClickHouse/pull/44875) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Backported in [#45551](https://github.com/ClickHouse/ClickHouse/issues/45551): Fix `SELECT ... FROM system.dictionaries` exception when there is a dictionary with a bad structure (e.g. incorrect type in xml config). [#45399](https://github.com/ClickHouse/ClickHouse/pull/45399) ([Aleksei Filatov](https://github.com/aalexfvk)).
@@ -18,4 +18,3 @@ sidebar_label: 2023
 * Improve release scripts [#45074](https://github.com/ClickHouse/ClickHouse/pull/45074) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Fix wrong approved_at, simplify conditions [#45302](https://github.com/ClickHouse/ClickHouse/pull/45302) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Get rid of artifactory in favor of r2 + ch-repos-manager [#45421](https://github.com/ClickHouse/ClickHouse/pull/45421) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-
diff --git a/docs/changelogs/v22.11.1.1360-stable.md b/docs/changelogs/v22.11.1.1360-stable.md
index 1da53be02b7..4aa110484f8 100644
--- a/docs/changelogs/v22.11.1.1360-stable.md
+++ b/docs/changelogs/v22.11.1.1360-stable.md
@@ -81,7 +81,7 @@ sidebar_label: 2022
 * Before the fix, the user-defined config was preserved by RPM in `$file.rpmsave`. The PR fixes it and won't replace the user's files from packages. [#42936](https://github.com/ClickHouse/ClickHouse/pull/42936) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Add a CI step to mark commits as ready for release; soft-forbid launching a release script from branches but master. [#43017](https://github.com/ClickHouse/ClickHouse/pull/43017) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Fix schema inference in s3Cluster and improve in hdfsCluster. [#41979](https://github.com/ClickHouse/ClickHouse/pull/41979) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fix retries while reading from http table engines / table function. (retrtiable errors could be retries more times than needed, non-retrialble errors resulted in failed assertion in code). [#42224](https://github.com/ClickHouse/ClickHouse/pull/42224) ([Kseniia Sumarokova](https://github.com/kssenii)).
diff --git a/docs/changelogs/v22.11.2.30-stable.md b/docs/changelogs/v22.11.2.30-stable.md
index 7b2febe072a..4759aa4a503 100644
--- a/docs/changelogs/v22.11.2.30-stable.md
+++ b/docs/changelogs/v22.11.2.30-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Improvement
 * Backported in [#43511](https://github.com/ClickHouse/ClickHouse/issues/43511): Restrict default access to named collections for user defined in config. It must have explicit `show_named_collections=1` to be able to see them. [#43325](https://github.com/ClickHouse/ClickHouse/pull/43325) ([Kseniia Sumarokova](https://github.com/kssenii)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#43716](https://github.com/ClickHouse/ClickHouse/issues/43716): An issue with the following exception has been reported while trying to read a Parquet file from S3 into ClickHouse:. [#43297](https://github.com/ClickHouse/ClickHouse/pull/43297) ([Arthur Passos](https://github.com/arthurpassos)).
 * Backported in [#43431](https://github.com/ClickHouse/ClickHouse/issues/43431): Fixed queries with `SAMPLE BY` with prewhere optimization on tables using `Merge` engine. [#43315](https://github.com/ClickHouse/ClickHouse/pull/43315) ([Antonio Andelic](https://github.com/antonio2368)).
diff --git a/docs/changelogs/v22.11.3.47-stable.md b/docs/changelogs/v22.11.3.47-stable.md
index d6451b853f7..a993ff8516f 100644
--- a/docs/changelogs/v22.11.3.47-stable.md
+++ b/docs/changelogs/v22.11.3.47-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2023
 * Backported in [#44380](https://github.com/ClickHouse/ClickHouse/issues/44380): In rare cases, we don't rebuild binaries, because another task with a similar prefix succeeded. E.g. `binary_darwin` didn't restart because `binary_darwin_aarch64`. [#44311](https://github.com/ClickHouse/ClickHouse/pull/44311) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#44560](https://github.com/ClickHouse/ClickHouse/issues/44560): Retry the integration tests on compressing errors. [#44529](https://github.com/ClickHouse/ClickHouse/pull/44529) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#44756](https://github.com/ClickHouse/ClickHouse/issues/44756): [#40651](https://github.com/ClickHouse/ClickHouse/issues/40651) [#41404](https://github.com/ClickHouse/ClickHouse/issues/41404). [#42126](https://github.com/ClickHouse/ClickHouse/pull/42126) ([Alexander Gololobov](https://github.com/davenger)).
 * Backported in [#43528](https://github.com/ClickHouse/ClickHouse/issues/43528): Fix incorrect UserTimeMicroseconds/SystemTimeMicroseconds accounting. [#42791](https://github.com/ClickHouse/ClickHouse/pull/42791) ([Azat Khuzhin](https://github.com/azat)).
@@ -37,4 +37,3 @@ sidebar_label: 2023
 * Implement a custom central checkout action [#44399](https://github.com/ClickHouse/ClickHouse/pull/44399) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Fix crash on delete from materialized view [#44705](https://github.com/ClickHouse/ClickHouse/pull/44705) ([Alexander Gololobov](https://github.com/davenger)).
 * Do not check read result consistency when unwinding [#44956](https://github.com/ClickHouse/ClickHouse/pull/44956) ([Alexander Gololobov](https://github.com/davenger)).
-
diff --git a/docs/changelogs/v22.11.4.3-stable.md b/docs/changelogs/v22.11.4.3-stable.md
index 33780e848ef..b0e7586277a 100644
--- a/docs/changelogs/v22.11.4.3-stable.md
+++ b/docs/changelogs/v22.11.4.3-stable.md
@@ -7,7 +7,6 @@ sidebar_label: 2023
 
 ### ClickHouse release v22.11.4.3-stable (7f4cf554f69) FIXME as compared to v22.11.3.47-stable (1c49d124a37)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#45085](https://github.com/ClickHouse/ClickHouse/issues/45085): fix alter table ttl error when wide part has light weight delete mask. [#44959](https://github.com/ClickHouse/ClickHouse/pull/44959) ([Mingliang Pan](https://github.com/liangliangpan)).
-
diff --git a/docs/changelogs/v22.11.5.15-stable.md b/docs/changelogs/v22.11.5.15-stable.md
index 742a8740514..f11a01c4b1c 100644
--- a/docs/changelogs/v22.11.5.15-stable.md
+++ b/docs/changelogs/v22.11.5.15-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2023
 
 ### ClickHouse release v22.11.5.15-stable (d763e5a9239) FIXME as compared to v22.11.4.3-stable (7f4cf554f69)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#44999](https://github.com/ClickHouse/ClickHouse/issues/44999): Another fix for `Cannot read all data` error which could happen while reading `LowCardinality` dictionary from remote fs. Fixes [#44709](https://github.com/ClickHouse/ClickHouse/issues/44709). [#44875](https://github.com/ClickHouse/ClickHouse/pull/44875) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Backported in [#45552](https://github.com/ClickHouse/ClickHouse/issues/45552): Fix `SELECT ... FROM system.dictionaries` exception when there is a dictionary with a bad structure (e.g. incorrect type in xml config). [#45399](https://github.com/ClickHouse/ClickHouse/pull/45399) ([Aleksei Filatov](https://github.com/aalexfvk)).
@@ -19,4 +19,3 @@ sidebar_label: 2023
 * Fix wrong approved_at, simplify conditions [#45302](https://github.com/ClickHouse/ClickHouse/pull/45302) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Get rid of artifactory in favor of r2 + ch-repos-manager [#45421](https://github.com/ClickHouse/ClickHouse/pull/45421) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Trim refs/tags/ from GITHUB_TAG in release workflow [#45636](https://github.com/ClickHouse/ClickHouse/pull/45636) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-
diff --git a/docs/changelogs/v22.11.6.44-stable.md b/docs/changelogs/v22.11.6.44-stable.md
index 6e628b85150..db19e73c666 100644
--- a/docs/changelogs/v22.11.6.44-stable.md
+++ b/docs/changelogs/v22.11.6.44-stable.md
@@ -17,7 +17,7 @@ sidebar_label: 2023
 * Backported in [#46483](https://github.com/ClickHouse/ClickHouse/issues/46483): Get rid of unnecessary build for standalone clickhouse-keeper. [#46367](https://github.com/ClickHouse/ClickHouse/pull/46367) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#46507](https://github.com/ClickHouse/ClickHouse/issues/46507): Some time ago the ccache compression was changed to `zst`, but `gz` archives are downloaded by default. It fixes it by prioritizing zst archive. [#46490](https://github.com/ClickHouse/ClickHouse/pull/46490) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#45903](https://github.com/ClickHouse/ClickHouse/issues/45903): Fixed bug with non-parsable default value for EPHEMERAL column in table metadata. [#44026](https://github.com/ClickHouse/ClickHouse/pull/44026) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Backported in [#46239](https://github.com/ClickHouse/ClickHouse/issues/46239): A couple of seg faults have been reported around `c-ares`. All of the recent stack traces observed fail on inserting into `std::unodered_set<>`. I believe I have found the root cause of this, it seems to be unprocessed queries. Prior to this PR, CH calls `poll` to wait on the file descriptors in the `c-ares` channel. According to the [poll docs](https://man7.org/linux/man-pages/man2/poll.2.html), a negative return value means an error has ocurred. Because of this, we would abort the execution and return failure. The problem is that `poll` will also return a negative value if a system interrupt occurs. A system interrupt does not mean the processing has failed or ended, but we would abort it anyways because we were checking for negative values. Once the execution is aborted, the whole stack is destroyed, which includes the `std::unordered_set<std::string>` passed to the `void *` parameter of the c-ares callback. Once c-ares completed the request, the callback would be invoked and would access an invalid memory address causing a segfault. [#45629](https://github.com/ClickHouse/ClickHouse/pull/45629) ([Arthur Passos](https://github.com/arthurpassos)).
@@ -34,4 +34,3 @@ sidebar_label: 2023
 * Add helping logging to auto-merge script [#46080](https://github.com/ClickHouse/ClickHouse/pull/46080) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Fix write buffer destruction order for vertical merge. [#46205](https://github.com/ClickHouse/ClickHouse/pull/46205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Get rid of legacy DocsReleaseChecks [#46665](https://github.com/ClickHouse/ClickHouse/pull/46665) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-
diff --git a/docs/changelogs/v22.12.1.1752-stable.md b/docs/changelogs/v22.12.1.1752-stable.md
index 4f4c4b11150..1549af037f2 100644
--- a/docs/changelogs/v22.12.1.1752-stable.md
+++ b/docs/changelogs/v22.12.1.1752-stable.md
@@ -91,7 +91,7 @@ sidebar_label: 2022
 * Bring sha512 sums back to the building step. [#44017](https://github.com/ClickHouse/ClickHouse/pull/44017) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Kill stress tests after 2.5h in case of hanging process. [#44214](https://github.com/ClickHouse/ClickHouse/pull/44214) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Fixed unable to log in (because of failure to create session_log entry) in rare case of messed up setting profiles. ... [#42641](https://github.com/ClickHouse/ClickHouse/pull/42641) ([Vasily Nemkov](https://github.com/Enmk)).
 * Fix incorrect UserTimeMicroseconds/SystemTimeMicroseconds accounting. [#42791](https://github.com/ClickHouse/ClickHouse/pull/42791) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v22.12.2.25-stable.md b/docs/changelogs/v22.12.2.25-stable.md
index 194d0fe3cbc..968854d0428 100644
--- a/docs/changelogs/v22.12.2.25-stable.md
+++ b/docs/changelogs/v22.12.2.25-stable.md
@@ -11,7 +11,7 @@ sidebar_label: 2023
 * Backported in [#44381](https://github.com/ClickHouse/ClickHouse/issues/44381): In rare cases, we don't rebuild binaries, because another task with a similar prefix succeeded. E.g. `binary_darwin` didn't restart because `binary_darwin_aarch64`. [#44311](https://github.com/ClickHouse/ClickHouse/pull/44311) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#44561](https://github.com/ClickHouse/ClickHouse/issues/44561): Retry the integration tests on compressing errors. [#44529](https://github.com/ClickHouse/ClickHouse/pull/44529) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#44739](https://github.com/ClickHouse/ClickHouse/issues/44739): [#40651](https://github.com/ClickHouse/ClickHouse/issues/40651) [#41404](https://github.com/ClickHouse/ClickHouse/issues/41404). [#42126](https://github.com/ClickHouse/ClickHouse/pull/42126) ([Alexander Gololobov](https://github.com/davenger)).
 * Backported in [#44764](https://github.com/ClickHouse/ClickHouse/issues/44764): Fix parsing of bad version from compatibility setting. [#44224](https://github.com/ClickHouse/ClickHouse/pull/44224) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v22.12.3.5-stable.md b/docs/changelogs/v22.12.3.5-stable.md
index 8cbcbc6a590..5f0cc9cebf3 100644
--- a/docs/changelogs/v22.12.3.5-stable.md
+++ b/docs/changelogs/v22.12.3.5-stable.md
@@ -7,11 +7,10 @@ sidebar_label: 2023
 
 ### ClickHouse release v22.12.3.5-stable (893de538f02) FIXME as compared to v22.12.2.25-stable (c790cfd4465)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#45086](https://github.com/ClickHouse/ClickHouse/issues/45086): fix alter table ttl error when wide part has light weight delete mask. [#44959](https://github.com/ClickHouse/ClickHouse/pull/44959) ([Mingliang Pan](https://github.com/liangliangpan)).
 
 #### NOT FOR CHANGELOG / INSIGNIFICANT
 
 * Do not check read result consistency when unwinding [#44956](https://github.com/ClickHouse/ClickHouse/pull/44956) ([Alexander Gololobov](https://github.com/davenger)).
-
diff --git a/docs/changelogs/v22.12.4.76-stable.md b/docs/changelogs/v22.12.4.76-stable.md
new file mode 100644
index 00000000000..cdadaae7f7b
--- /dev/null
+++ b/docs/changelogs/v22.12.4.76-stable.md
@@ -0,0 +1,54 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v22.12.4.76-stable (cb5772db805) FIXME as compared to v22.12.3.5-stable (893de538f02)
+
+#### Performance Improvement
+* Backported in [#45704](https://github.com/ClickHouse/ClickHouse/issues/45704): Fixed performance of short `SELECT` queries that read from tables with large number of`Array`/`Map`/`Nested` columns. [#45630](https://github.com/ClickHouse/ClickHouse/pull/45630) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#46378](https://github.com/ClickHouse/ClickHouse/issues/46378): Fix too big memory usage for vertical merges on non-remote disk. Respect `max_insert_delayed_streams_for_parallel_write` for the remote disk. [#46275](https://github.com/ClickHouse/ClickHouse/pull/46275) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+
+#### Bug Fix
+* Backported in [#45672](https://github.com/ClickHouse/ClickHouse/issues/45672): Fix wiping sensitive info in logs. [#45603](https://github.com/ClickHouse/ClickHouse/pull/45603) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#45200](https://github.com/ClickHouse/ClickHouse/issues/45200): Fix zookeeper downloading, update the version, and optimize the image size. [#44853](https://github.com/ClickHouse/ClickHouse/pull/44853) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#46116](https://github.com/ClickHouse/ClickHouse/issues/46116): Remove the dependency on the `adduser` tool from the packages, because we don't use it. This fixes [#44934](https://github.com/ClickHouse/ClickHouse/issues/44934). [#45011](https://github.com/ClickHouse/ClickHouse/pull/45011) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#46035](https://github.com/ClickHouse/ClickHouse/issues/46035): Add systemd.service file for clickhouse-keeper. Fixes [#44293](https://github.com/ClickHouse/ClickHouse/issues/44293). [#45568](https://github.com/ClickHouse/ClickHouse/pull/45568) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#46484](https://github.com/ClickHouse/ClickHouse/issues/46484): Get rid of unnecessary build for standalone clickhouse-keeper. [#46367](https://github.com/ClickHouse/ClickHouse/pull/46367) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#46509](https://github.com/ClickHouse/ClickHouse/issues/46509): Some time ago the ccache compression was changed to `zst`, but `gz` archives are downloaded by default. It fixes it by prioritizing zst archive. [#46490](https://github.com/ClickHouse/ClickHouse/pull/46490) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#47058](https://github.com/ClickHouse/ClickHouse/issues/47058): Fix error during server startup on old distros (e.g. Amazon Linux 2) and on ARM that glibc 2.28 symbols are not found. [#47008](https://github.com/ClickHouse/ClickHouse/pull/47008) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### Bug Fix (user-visible misbehavior in official stable release)
+
+* Backported in [#45904](https://github.com/ClickHouse/ClickHouse/issues/45904): Fixed bug with non-parsable default value for EPHEMERAL column in table metadata. [#44026](https://github.com/ClickHouse/ClickHouse/pull/44026) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backported in [#45321](https://github.com/ClickHouse/ClickHouse/issues/45321): Fixed a bug in normalization of a `DEFAULT` expression in `CREATE TABLE` statement. The second argument of function `in` (or the right argument of operator `IN`) might be replaced with the result of its evaluation during CREATE query execution. Fixes [#44496](https://github.com/ClickHouse/ClickHouse/issues/44496). [#44547](https://github.com/ClickHouse/ClickHouse/pull/44547) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#45000](https://github.com/ClickHouse/ClickHouse/issues/45000): Another fix for `Cannot read all data` error which could happen while reading `LowCardinality` dictionary from remote fs. Fixes [#44709](https://github.com/ClickHouse/ClickHouse/issues/44709). [#44875](https://github.com/ClickHouse/ClickHouse/pull/44875) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#45553](https://github.com/ClickHouse/ClickHouse/issues/45553): Fix `SELECT ... FROM system.dictionaries` exception when there is a dictionary with a bad structure (e.g. incorrect type in xml config). [#45399](https://github.com/ClickHouse/ClickHouse/pull/45399) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Backported in [#46226](https://github.com/ClickHouse/ClickHouse/issues/46226): A couple of seg faults have been reported around `c-ares`. All of the recent stack traces observed fail on inserting into `std::unodered_set<>`. I believe I have found the root cause of this, it seems to be unprocessed queries. Prior to this PR, CH calls `poll` to wait on the file descriptors in the `c-ares` channel. According to the [poll docs](https://man7.org/linux/man-pages/man2/poll.2.html), a negative return value means an error has ocurred. Because of this, we would abort the execution and return failure. The problem is that `poll` will also return a negative value if a system interrupt occurs. A system interrupt does not mean the processing has failed or ended, but we would abort it anyways because we were checking for negative values. Once the execution is aborted, the whole stack is destroyed, which includes the `std::unordered_set<std::string>` passed to the `void *` parameter of the c-ares callback. Once c-ares completed the request, the callback would be invoked and would access an invalid memory address causing a segfault. [#45629](https://github.com/ClickHouse/ClickHouse/pull/45629) ([Arthur Passos](https://github.com/arthurpassos)).
+* Backported in [#46218](https://github.com/ClickHouse/ClickHouse/issues/46218): Fix reading of non existing nested columns with multiple level in compact parts. [#46045](https://github.com/ClickHouse/ClickHouse/pull/46045) ([Azat Khuzhin](https://github.com/azat)).
+* Backported in [#46446](https://github.com/ClickHouse/ClickHouse/issues/46446): Fix possible `LOGICAL_ERROR` in asynchronous inserts with invalid data sent in format `VALUES`. [#46350](https://github.com/ClickHouse/ClickHouse/pull/46350) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#46678](https://github.com/ClickHouse/ClickHouse/issues/46678): Fix an invalid processing of constant `LowCardinality` argument in function `arrayMap`. This bug could lead to a segfault in release, and logical error `Bad cast` in debug build. [#46569](https://github.com/ClickHouse/ClickHouse/pull/46569) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#46872](https://github.com/ClickHouse/ClickHouse/issues/46872): Fix a bug in the `Map` data type. This closes [#46855](https://github.com/ClickHouse/ClickHouse/issues/46855). [#46856](https://github.com/ClickHouse/ClickHouse/pull/46856) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#46954](https://github.com/ClickHouse/ClickHouse/issues/46954): Fix result of LIKE predicates which translate to substring searches and contain quoted non-LIKE metacharacters. [#46875](https://github.com/ClickHouse/ClickHouse/pull/46875) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Automatically merge green backport PRs and green approved PRs [#41110](https://github.com/ClickHouse/ClickHouse/pull/41110) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Improve release scripts [#45074](https://github.com/ClickHouse/ClickHouse/pull/45074) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix wrong approved_at, simplify conditions [#45302](https://github.com/ClickHouse/ClickHouse/pull/45302) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Get rid of artifactory in favor of r2 + ch-repos-manager [#45421](https://github.com/ClickHouse/ClickHouse/pull/45421) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Another attempt to fix automerge, or at least to have debug footprint [#45476](https://github.com/ClickHouse/ClickHouse/pull/45476) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Trim refs/tags/ from GITHUB_TAG in release workflow [#45636](https://github.com/ClickHouse/ClickHouse/pull/45636) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add check for running workflows to merge_pr.py [#45803](https://github.com/ClickHouse/ClickHouse/pull/45803) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Get rid of progress timestamps in release publishing [#45818](https://github.com/ClickHouse/ClickHouse/pull/45818) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add necessary dependency for sanitizers [#45959](https://github.com/ClickHouse/ClickHouse/pull/45959) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add helping logging to auto-merge script [#46080](https://github.com/ClickHouse/ClickHouse/pull/46080) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix write buffer destruction order for vertical merge. [#46205](https://github.com/ClickHouse/ClickHouse/pull/46205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Improve install_check.py [#46458](https://github.com/ClickHouse/ClickHouse/pull/46458) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix dependencies for InstallPackagesTestAarch64 [#46597](https://github.com/ClickHouse/ClickHouse/pull/46597) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Get rid of legacy DocsReleaseChecks [#46665](https://github.com/ClickHouse/ClickHouse/pull/46665) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Reduce updates of Mergeable Check [#46781](https://github.com/ClickHouse/ClickHouse/pull/46781) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v22.12.5.34-stable.md b/docs/changelogs/v22.12.5.34-stable.md
new file mode 100644
index 00000000000..61f099462a0
--- /dev/null
+++ b/docs/changelogs/v22.12.5.34-stable.md
@@ -0,0 +1,28 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v22.12.5.34-stable (b82d6401ca1) FIXME as compared to v22.12.4.76-stable (cb5772db805)
+
+#### Improvement
+* Backported in [#46983](https://github.com/ClickHouse/ClickHouse/issues/46983): - Apply `ALTER TABLE table_name ON CLUSTER cluster MOVE PARTITION|PART partition_expr TO DISK|VOLUME 'disk_name'` to all replicas. Because `ALTER TABLE t MOVE` is not replicated. [#46402](https://github.com/ClickHouse/ClickHouse/pull/46402) ([lizhuoyu5](https://github.com/lzydmxy)).
+
+#### Bug Fix (user-visible misbehavior in official stable release)
+
+* Backported in [#45729](https://github.com/ClickHouse/ClickHouse/issues/45729): Fix key description when encountering duplicate primary keys. This can happen in projections. See [#45590](https://github.com/ClickHouse/ClickHouse/issues/45590) for details. [#45686](https://github.com/ClickHouse/ClickHouse/pull/45686) ([Amos Bird](https://github.com/amosbird)).
+* Backported in [#46398](https://github.com/ClickHouse/ClickHouse/issues/46398): Fix `SYSTEM UNFREEZE` queries failing with the exception `CANNOT_PARSE_INPUT_ASSERTION_FAILED`. [#46325](https://github.com/ClickHouse/ClickHouse/pull/46325) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Backported in [#46903](https://github.com/ClickHouse/ClickHouse/issues/46903): - Fix incorrect alias recursion in QueryNormalizer. [#46609](https://github.com/ClickHouse/ClickHouse/pull/46609) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#47210](https://github.com/ClickHouse/ClickHouse/issues/47210): `INSERT` queries through native TCP protocol and HTTP protocol were not canceled correctly in some cases. It could lead to a partially applied query if a client canceled the query, or if a client died or, in rare cases, on network errors. As a result, it could lead to not working deduplication. Fixes [#27667](https://github.com/ClickHouse/ClickHouse/issues/27667) and [#45377](https://github.com/ClickHouse/ClickHouse/issues/45377). [#46681](https://github.com/ClickHouse/ClickHouse/pull/46681) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#47157](https://github.com/ClickHouse/ClickHouse/issues/47157): - Fix arithmetic operations in aggregate optimization with `min` and `max`. [#46705](https://github.com/ClickHouse/ClickHouse/pull/46705) ([Duc Canh Le](https://github.com/canhld94)).
+* Backported in [#46881](https://github.com/ClickHouse/ClickHouse/issues/46881): Fix MSan report in the `maxIntersections` function. This closes [#43126](https://github.com/ClickHouse/ClickHouse/issues/43126). [#46847](https://github.com/ClickHouse/ClickHouse/pull/46847) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#47359](https://github.com/ClickHouse/ClickHouse/issues/47359): Fix possible deadlock on distributed query cancellation. [#47161](https://github.com/ClickHouse/ClickHouse/pull/47161) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Use /etc/default/clickhouse in systemd too [#47003](https://github.com/ClickHouse/ClickHouse/pull/47003) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update typing for a new PyGithub version [#47123](https://github.com/ClickHouse/ClickHouse/pull/47123) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Follow-up to [#46681](https://github.com/ClickHouse/ClickHouse/issues/46681) [#47284](https://github.com/ClickHouse/ClickHouse/pull/47284) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add a manual trigger for release workflow [#47302](https://github.com/ClickHouse/ClickHouse/pull/47302) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v22.12.6.22-stable.md b/docs/changelogs/v22.12.6.22-stable.md
new file mode 100644
index 00000000000..f0bf7c92340
--- /dev/null
+++ b/docs/changelogs/v22.12.6.22-stable.md
@@ -0,0 +1,26 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v22.12.6.22-stable (10d87f90261) FIXME as compared to v22.12.5.34-stable (b82d6401ca1)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix changing an expired role [#46772](https://github.com/ClickHouse/ClickHouse/pull/46772) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix bug in zero-copy replication disk choice during fetch [#47010](https://github.com/ClickHouse/ClickHouse/pull/47010) ([alesapin](https://github.com/alesapin)).
+* Fix NOT_IMPLEMENTED error with CROSS JOIN and algorithm = auto [#47068](https://github.com/ClickHouse/ClickHouse/pull/47068) ([Vladimir C](https://github.com/vdimir)).
+* Fix query parameters [#47488](https://github.com/ClickHouse/ClickHouse/pull/47488) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Hotfix for too verbose warnings in HTTP [#47903](https://github.com/ClickHouse/ClickHouse/pull/47903) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Better error messages in ReplicatedMergeTreeAttachThread [#47454](https://github.com/ClickHouse/ClickHouse/pull/47454) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add a fuse for backport branches w/o a created PR [#47760](https://github.com/ClickHouse/ClickHouse/pull/47760) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Only valid Reviews.STATES overwrite existing reviews [#47789](https://github.com/ClickHouse/ClickHouse/pull/47789) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Place short return before big block, improve logging [#47822](https://github.com/ClickHouse/ClickHouse/pull/47822) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Artifacts s3 prefix [#47945](https://github.com/ClickHouse/ClickHouse/pull/47945) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix tsan error lock-order-inversion [#47953](https://github.com/ClickHouse/ClickHouse/pull/47953) ([Kruglov Pavel](https://github.com/Avogar)).
+
diff --git a/docs/changelogs/v22.2.1.2139-prestable.md b/docs/changelogs/v22.2.1.2139-prestable.md
index 67db2d9a18d..ca3a84ceaa2 100644
--- a/docs/changelogs/v22.2.1.2139-prestable.md
+++ b/docs/changelogs/v22.2.1.2139-prestable.md
@@ -141,7 +141,7 @@ sidebar_label: 2022
 * - Rework version_helper, make it executable - Reimplement StorageSystemContributors.sh in version_helper - Create a release script. [#34641](https://github.com/ClickHouse/ClickHouse/pull/34641) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * - Fix path in workflows/release.yml - To be backported to branch 22.1. [#34646](https://github.com/ClickHouse/ClickHouse/pull/34646) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Fix lz4 compression for output. Closes [#31421](https://github.com/ClickHouse/ClickHouse/issues/31421). [#31862](https://github.com/ClickHouse/ClickHouse/pull/31862) ([Kruglov Pavel](https://github.com/Avogar)).
 * Create a function escapeForLDAPFilter and use it to escape characters '(' and ')' in a final_user_dn variable. [#33401](https://github.com/ClickHouse/ClickHouse/pull/33401) ([IlyaTsoi](https://github.com/IlyaTsoi)).
diff --git a/docs/changelogs/v22.2.3.5-stable.md b/docs/changelogs/v22.2.3.5-stable.md
index c433669049d..a4368e465aa 100644
--- a/docs/changelogs/v22.2.3.5-stable.md
+++ b/docs/changelogs/v22.2.3.5-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.2.3.5-stable FIXME as compared to v22.2.2.1-stable
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#34848](https://github.com/ClickHouse/ClickHouse/issues/34848): Fix possible failures in S2 functions when queries contain const columns. [#34745](https://github.com/ClickHouse/ClickHouse/pull/34745) ([Bharat Nallan](https://github.com/bharatnc)).
 
diff --git a/docs/changelogs/v22.3.1.1262-prestable.md b/docs/changelogs/v22.3.1.1262-prestable.md
index e6203ff18d1..385393cef17 100644
--- a/docs/changelogs/v22.3.1.1262-prestable.md
+++ b/docs/changelogs/v22.3.1.1262-prestable.md
@@ -95,7 +95,7 @@ sidebar_label: 2022
 * Clion has the following problems "The breakpoint will not currently be hit. No executable code is associated with this line". [#35179](https://github.com/ClickHouse/ClickHouse/pull/35179) ([小路](https://github.com/nicelulu)).
 * Add an ability to build stripped binaries with cmake. [#35196](https://github.com/ClickHouse/ClickHouse/pull/35196) ([alesapin](https://github.com/alesapin)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Fix distributed subquery max_query_size limitation inconsistency. [#34078](https://github.com/ClickHouse/ClickHouse/pull/34078) ([Chao Ma](https://github.com/godliness)).
 * Fix incorrect trivial count result when part movement feature is used [#34089](https://github.com/ClickHouse/ClickHouse/issues/34089). [#34385](https://github.com/ClickHouse/ClickHouse/pull/34385) ([nvartolomei](https://github.com/nvartolomei)).
diff --git a/docs/changelogs/v22.3.10.22-lts.md b/docs/changelogs/v22.3.10.22-lts.md
index a43b8301aad..cc033eb707d 100644
--- a/docs/changelogs/v22.3.10.22-lts.md
+++ b/docs/changelogs/v22.3.10.22-lts.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#39761](https://github.com/ClickHouse/ClickHouse/issues/39761): Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#39206](https://github.com/ClickHouse/ClickHouse/issues/39206): Fix reading of sparse columns from `MergeTree` tables that store their data in S3. [#37978](https://github.com/ClickHouse/ClickHouse/pull/37978) ([Anton Popov](https://github.com/CurtizJ)).
 * Backported in [#39381](https://github.com/ClickHouse/ClickHouse/issues/39381): Fixed error `Not found column Type in block` in selects with `PREWHERE` and read-in-order optimizations. [#39157](https://github.com/ClickHouse/ClickHouse/pull/39157) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
@@ -18,7 +18,7 @@ sidebar_label: 2022
 * Backported in [#39610](https://github.com/ClickHouse/ClickHouse/issues/39610): Fix bug with maxsplit argument for splitByChar, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
 * Backported in [#39834](https://github.com/ClickHouse/ClickHouse/issues/39834): Fix `CANNOT_READ_ALL_DATA` exception with `local_filesystem_read_method=pread_threadpool`. This bug affected only Linux kernel version 5.9 and 5.10 according to [man](https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS). [#39800](https://github.com/ClickHouse/ClickHouse/pull/39800) ([Anton Popov](https://github.com/CurtizJ)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#39238](https://github.com/ClickHouse/ClickHouse/issues/39238): Fix performance regression of scalar query optimization. [#35986](https://github.com/ClickHouse/ClickHouse/pull/35986) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#39531](https://github.com/ClickHouse/ClickHouse/issues/39531): Fix some issues with async reads from remote filesystem which happened when reading low cardinality. [#36763](https://github.com/ClickHouse/ClickHouse/pull/36763) ([Kseniia Sumarokova](https://github.com/kssenii)).
diff --git a/docs/changelogs/v22.3.11.12-lts.md b/docs/changelogs/v22.3.11.12-lts.md
index e718493d9a0..58df0c0cadb 100644
--- a/docs/changelogs/v22.3.11.12-lts.md
+++ b/docs/changelogs/v22.3.11.12-lts.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#39881](https://github.com/ClickHouse/ClickHouse/issues/39881): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#39336](https://github.com/ClickHouse/ClickHouse/issues/39336): Fix `parallel_view_processing=1` with `optimize_trivial_insert_select=1`. Fix `max_insert_threads` while pushing to views. [#38731](https://github.com/ClickHouse/ClickHouse/pull/38731) ([Azat Khuzhin](https://github.com/azat)).
 
diff --git a/docs/changelogs/v22.3.12.19-lts.md b/docs/changelogs/v22.3.12.19-lts.md
index 4f6342419f7..6ae342583a9 100644
--- a/docs/changelogs/v22.3.12.19-lts.md
+++ b/docs/changelogs/v22.3.12.19-lts.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#40695](https://github.com/ClickHouse/ClickHouse/issues/40695): Fix TGZ packages. [#40681](https://github.com/ClickHouse/ClickHouse/pull/40681) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#40160](https://github.com/ClickHouse/ClickHouse/issues/40160): fix HashMethodOneNumber get wrong key value when column is const. [#40020](https://github.com/ClickHouse/ClickHouse/pull/40020) ([Duc Canh Le](https://github.com/canhld94)).
 * Backported in [#40122](https://github.com/ClickHouse/ClickHouse/issues/40122): Fix bug in collectFilesToSkip() by adding correct file extension(.idx or idx2) for indexes to be recalculated, avoid wrong hard links. Fixed [#39896](https://github.com/ClickHouse/ClickHouse/issues/39896). [#40095](https://github.com/ClickHouse/ClickHouse/pull/40095) ([Jianmei Zhang](https://github.com/zhangjmruc)).
diff --git a/docs/changelogs/v22.3.13.80-lts.md b/docs/changelogs/v22.3.13.80-lts.md
index bb84da9a96a..3d0a6a77276 100644
--- a/docs/changelogs/v22.3.13.80-lts.md
+++ b/docs/changelogs/v22.3.13.80-lts.md
@@ -17,7 +17,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#41557](https://github.com/ClickHouse/ClickHouse/issues/41557): Add `source` field to deb packages, update `nfpm`. [#41531](https://github.com/ClickHouse/ClickHouse/pull/41531) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#40745](https://github.com/ClickHouse/ClickHouse/issues/40745): * Fix cast lowcard of nullable in JoinSwitcher, close [#37385](https://github.com/ClickHouse/ClickHouse/issues/37385). [#37453](https://github.com/ClickHouse/ClickHouse/pull/37453) ([Vladimir C](https://github.com/vdimir)).
 * Backported in [#41812](https://github.com/ClickHouse/ClickHouse/issues/41812): Update `simdjson`. This fixes [#38621](https://github.com/ClickHouse/ClickHouse/issues/38621). [#38838](https://github.com/ClickHouse/ClickHouse/pull/38838) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -36,7 +36,7 @@ sidebar_label: 2022
 * Backported in [#41639](https://github.com/ClickHouse/ClickHouse/issues/41639): Fix possible `pipeline stuck` exception for queries with `OFFSET`. The error was found with `enable_optimize_predicate_expression = 0` and always false condition in `WHERE`. Fixes [#41383](https://github.com/ClickHouse/ClickHouse/issues/41383). [#41588](https://github.com/ClickHouse/ClickHouse/pull/41588) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Backported in [#41899](https://github.com/ClickHouse/ClickHouse/issues/41899): Fix possible crash in `SELECT` from `Merge` table with enabled `optimize_monotonous_functions_in_order_by` setting. Fixes [#41269](https://github.com/ClickHouse/ClickHouse/issues/41269). [#41740](https://github.com/ClickHouse/ClickHouse/pull/41740) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#41321](https://github.com/ClickHouse/ClickHouse/issues/41321): Fix bug in function `if` when resulting column type differs with resulting data type that led to logical errors like `Logical error: 'Bad cast from type DB::ColumnVector<int> to DB::ColumnVector<long>'.`. Closes [#35367](https://github.com/ClickHouse/ClickHouse/issues/35367). [#35476](https://github.com/ClickHouse/ClickHouse/pull/35476) ([Kruglov Pavel](https://github.com/Avogar)).
 
diff --git a/docs/changelogs/v22.3.14.18-lts.md b/docs/changelogs/v22.3.14.18-lts.md
index 88801b268ce..235525bbe81 100644
--- a/docs/changelogs/v22.3.14.18-lts.md
+++ b/docs/changelogs/v22.3.14.18-lts.md
@@ -14,7 +14,7 @@ sidebar_label: 2022
 * Backported in [#42328](https://github.com/ClickHouse/ClickHouse/issues/42328): Update cctz to the latest master, update tzdb to 2020e. [#42273](https://github.com/ClickHouse/ClickHouse/pull/42273) ([Dom Del Nano](https://github.com/ddelnano)).
 * Backported in [#42358](https://github.com/ClickHouse/ClickHouse/issues/42358): Update tzdata to 2022e to support the new timezone changes. Palestine transitions are now Saturdays at 02:00. Simplify three Ukraine zones into one. Jordan and Syria switch from +02/+03 with DST to year-round +03. (https://data.iana.org/time-zones/tzdb/NEWS). This closes [#42252](https://github.com/ClickHouse/ClickHouse/issues/42252). [#42327](https://github.com/ClickHouse/ClickHouse/pull/42327) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#42298](https://github.com/ClickHouse/ClickHouse/issues/42298): Fix a bug with projections and the `aggregate_functions_null_for_empty` setting. This bug is very rare and appears only if you enable the `aggregate_functions_null_for_empty` setting in the server's config. This closes [#41647](https://github.com/ClickHouse/ClickHouse/issues/41647). [#42198](https://github.com/ClickHouse/ClickHouse/pull/42198) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Backported in [#42592](https://github.com/ClickHouse/ClickHouse/issues/42592): This closes [#42453](https://github.com/ClickHouse/ClickHouse/issues/42453). [#42573](https://github.com/ClickHouse/ClickHouse/pull/42573) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
diff --git a/docs/changelogs/v22.3.14.23-lts.md b/docs/changelogs/v22.3.14.23-lts.md
index 0a8c645702e..e086e223fb1 100644
--- a/docs/changelogs/v22.3.14.23-lts.md
+++ b/docs/changelogs/v22.3.14.23-lts.md
@@ -17,7 +17,7 @@ sidebar_label: 2022
 * Backported in [#42328](https://github.com/ClickHouse/ClickHouse/issues/42328): Update cctz to the latest master, update tzdb to 2020e. [#42273](https://github.com/ClickHouse/ClickHouse/pull/42273) ([Dom Del Nano](https://github.com/ddelnano)).
 * Backported in [#42358](https://github.com/ClickHouse/ClickHouse/issues/42358): Update tzdata to 2022e to support the new timezone changes. Palestine transitions are now Saturdays at 02:00. Simplify three Ukraine zones into one. Jordan and Syria switch from +02/+03 with DST to year-round +03. (https://data.iana.org/time-zones/tzdb/NEWS). This closes [#42252](https://github.com/ClickHouse/ClickHouse/issues/42252). [#42327](https://github.com/ClickHouse/ClickHouse/pull/42327) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#42298](https://github.com/ClickHouse/ClickHouse/issues/42298): Fix a bug with projections and the `aggregate_functions_null_for_empty` setting. This bug is very rare and appears only if you enable the `aggregate_functions_null_for_empty` setting in the server's config. This closes [#41647](https://github.com/ClickHouse/ClickHouse/issues/41647). [#42198](https://github.com/ClickHouse/ClickHouse/pull/42198) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Backported in [#42592](https://github.com/ClickHouse/ClickHouse/issues/42592): This closes [#42453](https://github.com/ClickHouse/ClickHouse/issues/42453). [#42573](https://github.com/ClickHouse/ClickHouse/pull/42573) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
diff --git a/docs/changelogs/v22.3.15.33-lts.md b/docs/changelogs/v22.3.15.33-lts.md
index e59bf8bd1cd..3f675bfba1e 100644
--- a/docs/changelogs/v22.3.15.33-lts.md
+++ b/docs/changelogs/v22.3.15.33-lts.md
@@ -18,7 +18,7 @@ sidebar_label: 2022
 * Backported in [#42963](https://github.com/ClickHouse/ClickHouse/issues/42963): Before the fix, the user-defined config was preserved by RPM in `$file.rpmsave`. The PR fixes it and won't replace the user's files from packages. [#42936](https://github.com/ClickHouse/ClickHouse/pull/42936) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#43039](https://github.com/ClickHouse/ClickHouse/issues/43039): Add a CI step to mark commits as ready for release; soft-forbid launching a release script from branches but master. [#43017](https://github.com/ClickHouse/ClickHouse/pull/43017) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#43427](https://github.com/ClickHouse/ClickHouse/issues/43427): Fixed queries with `SAMPLE BY` with prewhere optimization on tables using `Merge` engine. [#43315](https://github.com/ClickHouse/ClickHouse/pull/43315) ([Antonio Andelic](https://github.com/antonio2368)).
 * Backported in [#43720](https://github.com/ClickHouse/ClickHouse/issues/43720): Fixed primary key analysis with conditions involving `toString(enum)`. [#43596](https://github.com/ClickHouse/ClickHouse/pull/43596) ([Nikita Taranov](https://github.com/nickitat)).
diff --git a/docs/changelogs/v22.3.16.1190-lts.md b/docs/changelogs/v22.3.16.1190-lts.md
index a43d34551ca..b65a6484109 100644
--- a/docs/changelogs/v22.3.16.1190-lts.md
+++ b/docs/changelogs/v22.3.16.1190-lts.md
@@ -18,7 +18,7 @@ sidebar_label: 2023
 * Backported in [#44431](https://github.com/ClickHouse/ClickHouse/issues/44431): Kill stress tests after 2.5h in case of hanging process. [#44214](https://github.com/ClickHouse/ClickHouse/pull/44214) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#44557](https://github.com/ClickHouse/ClickHouse/issues/44557): Retry the integration tests on compressing errors. [#44529](https://github.com/ClickHouse/ClickHouse/pull/44529) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#43512](https://github.com/ClickHouse/ClickHouse/issues/43512): - Fix several buffer over-reads. [#43159](https://github.com/ClickHouse/ClickHouse/pull/43159) ([Raúl Marín](https://github.com/Algunenano)).
 * Backported in [#43750](https://github.com/ClickHouse/ClickHouse/issues/43750): An issue with the following exception has been reported while trying to read a Parquet file from S3 into ClickHouse:. [#43297](https://github.com/ClickHouse/ClickHouse/pull/43297) ([Arthur Passos](https://github.com/arthurpassos)).
@@ -30,4 +30,3 @@ sidebar_label: 2023
 #### NO CL ENTRY
 
 * NO CL ENTRY:  'Fix multipart upload for large S3 object, backport to 22.3'. [#44217](https://github.com/ClickHouse/ClickHouse/pull/44217) ([ianton-ru](https://github.com/ianton-ru)).
-
diff --git a/docs/changelogs/v22.3.18.37-lts.md b/docs/changelogs/v22.3.18.37-lts.md
index ff6378f09ad..5a9004e7f98 100644
--- a/docs/changelogs/v22.3.18.37-lts.md
+++ b/docs/changelogs/v22.3.18.37-lts.md
@@ -14,7 +14,7 @@ sidebar_label: 2023
 #### Build/Testing/Packaging Improvement
 * Backported in [#45856](https://github.com/ClickHouse/ClickHouse/issues/45856): Fix zookeeper downloading, update the version, and optimize the image size. [#44853](https://github.com/ClickHouse/ClickHouse/pull/44853) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#45620](https://github.com/ClickHouse/ClickHouse/issues/45620): Another fix for `Cannot read all data` error which could happen while reading `LowCardinality` dictionary from remote fs. Fixes [#44709](https://github.com/ClickHouse/ClickHouse/issues/44709). [#44875](https://github.com/ClickHouse/ClickHouse/pull/44875) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Backported in [#45549](https://github.com/ClickHouse/ClickHouse/issues/45549): Fix `SELECT ... FROM system.dictionaries` exception when there is a dictionary with a bad structure (e.g. incorrect type in xml config). [#45399](https://github.com/ClickHouse/ClickHouse/pull/45399) ([Aleksei Filatov](https://github.com/aalexfvk)).
@@ -30,4 +30,3 @@ sidebar_label: 2023
 * Get rid of progress timestamps in release publishing [#45818](https://github.com/ClickHouse/ClickHouse/pull/45818) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Add helping logging to auto-merge script [#46080](https://github.com/ClickHouse/ClickHouse/pull/46080) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Fix write buffer destruction order for vertical merge. [#46205](https://github.com/ClickHouse/ClickHouse/pull/46205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-
diff --git a/docs/changelogs/v22.3.19.6-lts.md b/docs/changelogs/v22.3.19.6-lts.md
index d5b45f4ce66..dc34ece918d 100644
--- a/docs/changelogs/v22.3.19.6-lts.md
+++ b/docs/changelogs/v22.3.19.6-lts.md
@@ -7,11 +7,10 @@ sidebar_label: 2023
 
 ### ClickHouse release v22.3.19.6-lts (467e0a7bd77) FIXME as compared to v22.3.18.37-lts (fe512717551)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#46440](https://github.com/ClickHouse/ClickHouse/issues/46440): Fix possible `LOGICAL_ERROR` in asynchronous inserts with invalid data sent in format `VALUES`. [#46350](https://github.com/ClickHouse/ClickHouse/pull/46350) ([Anton Popov](https://github.com/CurtizJ)).
 
 #### NOT FOR CHANGELOG / INSIGNIFICANT
 
 * Get rid of legacy DocsReleaseChecks [#46665](https://github.com/ClickHouse/ClickHouse/pull/46665) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-
diff --git a/docs/changelogs/v22.3.20.29-lts.md b/docs/changelogs/v22.3.20.29-lts.md
new file mode 100644
index 00000000000..a54a320c4c1
--- /dev/null
+++ b/docs/changelogs/v22.3.20.29-lts.md
@@ -0,0 +1,29 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v22.3.20.29-lts (297b4dd5e55) FIXME as compared to v22.3.19.6-lts (467e0a7bd77)
+
+#### Improvement
+* Backported in [#46979](https://github.com/ClickHouse/ClickHouse/issues/46979): Apply `ALTER TABLE table_name ON CLUSTER cluster MOVE PARTITION|PART partition_expr TO DISK|VOLUME 'disk_name'` to all replicas. Because `ALTER TABLE t MOVE` is not replicated. [#46402](https://github.com/ClickHouse/ClickHouse/pull/46402) ([lizhuoyu5](https://github.com/lzydmxy)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix incorrect alias recursion in QueryNormalizer [#46609](https://github.com/ClickHouse/ClickHouse/pull/46609) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix arithmetic operations in aggregate optimization [#46705](https://github.com/ClickHouse/ClickHouse/pull/46705) ([Duc Canh Le](https://github.com/canhld94)).
+* Fix MSan report in `maxIntersections` function [#46847](https://github.com/ClickHouse/ClickHouse/pull/46847) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong results of some LIKE searches when the LIKE pattern contains quoted non-quotable characters [#46875](https://github.com/ClickHouse/ClickHouse/pull/46875) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix possible deadlock in QueryStatus [#47161](https://github.com/ClickHouse/ClickHouse/pull/47161) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Update typing for a new PyGithub version [#47123](https://github.com/ClickHouse/ClickHouse/pull/47123) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add a manual trigger for release workflow [#47302](https://github.com/ClickHouse/ClickHouse/pull/47302) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add a fuse for backport branches w/o a created PR [#47760](https://github.com/ClickHouse/ClickHouse/pull/47760) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Only valid Reviews.STATES overwrite existing reviews [#47789](https://github.com/ClickHouse/ClickHouse/pull/47789) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Place short return before big block, improve logging [#47822](https://github.com/ClickHouse/ClickHouse/pull/47822) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix tsan error lock-order-inversion [#47953](https://github.com/ClickHouse/ClickHouse/pull/47953) ([Kruglov Pavel](https://github.com/Avogar)).
+
diff --git a/docs/changelogs/v22.3.3.44-lts.md b/docs/changelogs/v22.3.3.44-lts.md
index 3d113d45e68..bf491e46915 100644
--- a/docs/changelogs/v22.3.3.44-lts.md
+++ b/docs/changelogs/v22.3.3.44-lts.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#35928](https://github.com/ClickHouse/ClickHouse/issues/35928): Added settings `input_format_ipv4_default_on_conversion_error`, `input_format_ipv6_default_on_conversion_error` to allow insert of invalid ip address values as default into tables. Closes [#35726](https://github.com/ClickHouse/ClickHouse/issues/35726). [#35733](https://github.com/ClickHouse/ClickHouse/pull/35733) ([Maksim Kita](https://github.com/kitaisreal)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#35415](https://github.com/ClickHouse/ClickHouse/issues/35415): Fix possible deadlock in cache. [#35378](https://github.com/ClickHouse/ClickHouse/pull/35378) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Backported in [#35563](https://github.com/ClickHouse/ClickHouse/issues/35563): Fix cast into IPv4, IPv6 address in IN section. Fixes [#35528](https://github.com/ClickHouse/ClickHouse/issues/35528). [#35534](https://github.com/ClickHouse/ClickHouse/pull/35534) ([Maksim Kita](https://github.com/kitaisreal)).
diff --git a/docs/changelogs/v22.3.4.20-lts.md b/docs/changelogs/v22.3.4.20-lts.md
index 72d7b90c743..070ad961beb 100644
--- a/docs/changelogs/v22.3.4.20-lts.md
+++ b/docs/changelogs/v22.3.4.20-lts.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * - Add `_le_` method for ClickHouseVersion - Fix auto_version for existing tag - docker_server now support getting version from tags - Add python unit tests to backport workflow. [#36028](https://github.com/ClickHouse/ClickHouse/pull/36028) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#36244](https://github.com/ClickHouse/ClickHouse/issues/36244): Fix usage of quota with asynchronous inserts. [#35645](https://github.com/ClickHouse/ClickHouse/pull/35645) ([Anton Popov](https://github.com/CurtizJ)).
 * Backported in [#36240](https://github.com/ClickHouse/ClickHouse/issues/36240): Fix possible loss of subcolumns in type `Object`. [#35682](https://github.com/ClickHouse/ClickHouse/pull/35682) ([Anton Popov](https://github.com/CurtizJ)).
diff --git a/docs/changelogs/v22.3.5.5-lts.md b/docs/changelogs/v22.3.5.5-lts.md
index b4205d5e1a9..4a5dc318b9f 100644
--- a/docs/changelogs/v22.3.5.5-lts.md
+++ b/docs/changelogs/v22.3.5.5-lts.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.3.5.5-lts (438b4a81f77) FIXME as compared to v22.3.4.20-lts (ecbaf001f49)
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#36525](https://github.com/ClickHouse/ClickHouse/issues/36525): Queries with aliases inside special operators returned parsing error (was broken in 22.1). Example: `SELECT substring('test' AS t, 1, 1)`. [#36167](https://github.com/ClickHouse/ClickHouse/pull/36167) ([Maksim Kita](https://github.com/kitaisreal)).
 * Backported in [#36674](https://github.com/ClickHouse/ClickHouse/issues/36674): Fix merges of wide parts with type `Object`. [#36637](https://github.com/ClickHouse/ClickHouse/pull/36637) ([Anton Popov](https://github.com/CurtizJ)).
diff --git a/docs/changelogs/v22.3.6.5-lts.md b/docs/changelogs/v22.3.6.5-lts.md
index 4183332efb0..90e65c7445f 100644
--- a/docs/changelogs/v22.3.6.5-lts.md
+++ b/docs/changelogs/v22.3.6.5-lts.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.3.6.5-lts (3e44e824cff) FIXME as compared to v22.3.5.5-lts (438b4a81f77)
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#36795](https://github.com/ClickHouse/ClickHouse/issues/36795): Fix vertical merges in wide parts. Previously an exception `There is no column` can be thrown during merge. [#36707](https://github.com/ClickHouse/ClickHouse/pull/36707) ([Anton Popov](https://github.com/CurtizJ)).
 
diff --git a/docs/changelogs/v22.3.7.28-lts.md b/docs/changelogs/v22.3.7.28-lts.md
index 7347e8e0705..a6a7885abc3 100644
--- a/docs/changelogs/v22.3.7.28-lts.md
+++ b/docs/changelogs/v22.3.7.28-lts.md
@@ -7,14 +7,14 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.3.7.28-lts (420bdfa2751) FIXME as compared to v22.3.6.5-lts (3e44e824cff)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#37715](https://github.com/ClickHouse/ClickHouse/issues/37715): Fix unexpected errors with a clash of constant strings in aggregate function, prewhere and join. Close [#36891](https://github.com/ClickHouse/ClickHouse/issues/36891). [#37336](https://github.com/ClickHouse/ClickHouse/pull/37336) ([Vladimir C](https://github.com/vdimir)).
 * Backported in [#37511](https://github.com/ClickHouse/ClickHouse/issues/37511): Fix logical error in normalizeUTF8 functions. Closes [#37298](https://github.com/ClickHouse/ClickHouse/issues/37298). [#37443](https://github.com/ClickHouse/ClickHouse/pull/37443) ([Maksim Kita](https://github.com/kitaisreal)).
 * Backported in [#37843](https://github.com/ClickHouse/ClickHouse/issues/37843): Fix segmentation fault in `show create table` from mysql database when it is configured with named collections. Closes [#37683](https://github.com/ClickHouse/ClickHouse/issues/37683). [#37690](https://github.com/ClickHouse/ClickHouse/pull/37690) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Backported in [#37940](https://github.com/ClickHouse/ClickHouse/issues/37940): Fix setting cast_ipv4_ipv6_default_on_conversion_error for internal cast function. Closes [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#37761](https://github.com/ClickHouse/ClickHouse/pull/37761) ([Maksim Kita](https://github.com/kitaisreal)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#37926](https://github.com/ClickHouse/ClickHouse/issues/37926): Fix check asof join key nullability, close [#35565](https://github.com/ClickHouse/ClickHouse/issues/35565). [#35674](https://github.com/ClickHouse/ClickHouse/pull/35674) ([Vladimir C](https://github.com/vdimir)).
 * Backported in [#37172](https://github.com/ClickHouse/ClickHouse/issues/37172): Fix bug in indexes of not presented columns in -WithNames formats that led to error `INCORRECT_NUMBER_OF_COLUMNS ` when the number of columns is more than 256. Closes [#35793](https://github.com/ClickHouse/ClickHouse/issues/35793). [#35803](https://github.com/ClickHouse/ClickHouse/pull/35803) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v22.3.8.39-lts.md b/docs/changelogs/v22.3.8.39-lts.md
index 8fff7f00a01..7f9363207d3 100644
--- a/docs/changelogs/v22.3.8.39-lts.md
+++ b/docs/changelogs/v22.3.8.39-lts.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#38826](https://github.com/ClickHouse/ClickHouse/issues/38826): - Change `all|noarch` packages to architecture-dependent - Fix some documentation for it - Push aarch64|arm64 packages to artifactory and release assets - Fixes [#36443](https://github.com/ClickHouse/ClickHouse/issues/36443). [#38580](https://github.com/ClickHouse/ClickHouse/pull/38580) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#38453](https://github.com/ClickHouse/ClickHouse/issues/38453): Fix bug with nested short-circuit functions that led to execution of arguments even if condition is false. Closes [#38040](https://github.com/ClickHouse/ClickHouse/issues/38040). [#38173](https://github.com/ClickHouse/ClickHouse/pull/38173) ([Kruglov Pavel](https://github.com/Avogar)).
 * Backported in [#38710](https://github.com/ClickHouse/ClickHouse/issues/38710): Fix incorrect result of distributed queries with `DISTINCT` and `LIMIT`. Fixes [#38282](https://github.com/ClickHouse/ClickHouse/issues/38282). [#38371](https://github.com/ClickHouse/ClickHouse/pull/38371) ([Anton Popov](https://github.com/CurtizJ)).
@@ -18,7 +18,7 @@ sidebar_label: 2022
 * Backported in [#38776](https://github.com/ClickHouse/ClickHouse/issues/38776): `rankCorr` function will work correctly if some arguments are NaNs. This closes [#38396](https://github.com/ClickHouse/ClickHouse/issues/38396). [#38722](https://github.com/ClickHouse/ClickHouse/pull/38722) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Backported in [#38780](https://github.com/ClickHouse/ClickHouse/issues/38780): Fix use-after-free for Map combinator that leads to incorrect result. [#38748](https://github.com/ClickHouse/ClickHouse/pull/38748) ([Azat Khuzhin](https://github.com/azat)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#36818](https://github.com/ClickHouse/ClickHouse/issues/36818): Fix projection analysis which might lead to wrong query result when IN subquery is used. This fixes [#35336](https://github.com/ClickHouse/ClickHouse/issues/35336). [#35631](https://github.com/ClickHouse/ClickHouse/pull/35631) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#38467](https://github.com/ClickHouse/ClickHouse/issues/38467): - Fix potential error with literals in `WHERE` for join queries. Close [#36279](https://github.com/ClickHouse/ClickHouse/issues/36279). [#36542](https://github.com/ClickHouse/ClickHouse/pull/36542) ([Vladimir C](https://github.com/vdimir)).
diff --git a/docs/changelogs/v22.3.9.19-lts.md b/docs/changelogs/v22.3.9.19-lts.md
index 084793f11cc..e0ebcd9b7b8 100644
--- a/docs/changelogs/v22.3.9.19-lts.md
+++ b/docs/changelogs/v22.3.9.19-lts.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.3.9.19-lts (7976930b82e) FIXME as compared to v22.3.8.39-lts (6bcf982f58b)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#39097](https://github.com/ClickHouse/ClickHouse/issues/39097): Any allocations inside OvercommitTracker may lead to deadlock. Logging was not very informative so it's easier just to remove logging. Fixes [#37794](https://github.com/ClickHouse/ClickHouse/issues/37794). [#39030](https://github.com/ClickHouse/ClickHouse/pull/39030) ([Dmitry Novik](https://github.com/novikd)).
 * Backported in [#39080](https://github.com/ClickHouse/ClickHouse/issues/39080): Fix bug in filesystem cache that could happen in some corner case which coincided with cache capacity hitting the limit. Closes [#39066](https://github.com/ClickHouse/ClickHouse/issues/39066). [#39070](https://github.com/ClickHouse/ClickHouse/pull/39070) ([Kseniia Sumarokova](https://github.com/kssenii)).
diff --git a/docs/changelogs/v22.4.1.2305-prestable.md b/docs/changelogs/v22.4.1.2305-prestable.md
index 04ad0bf8955..b277137ca7e 100644
--- a/docs/changelogs/v22.4.1.2305-prestable.md
+++ b/docs/changelogs/v22.4.1.2305-prestable.md
@@ -9,7 +9,7 @@ sidebar_label: 2022
 
 #### Backward Incompatible Change
 * Function `yandexConsistentHash` (consistent hashing algorithm by Konstantin "kostik" Oblakov) is renamed to `kostikConsistentHash`. The old name is left as an alias for compatibility. Although this change is backward compatible, we may remove the alias in subsequent releases, that's why it's recommended to update the usages of this function in your apps. [#35553](https://github.com/ClickHouse/ClickHouse/pull/35553) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Do not allow SETTINGS after FORMAT for INSERT queries (there is compatibility setting `parser_settings_after_format_compact` to accept such queries, but it is turned OFF by default). [#35883](https://github.com/ClickHouse/ClickHouse/pull/35883) ([Azat Khuzhin](https://github.com/azat)).
+* Do not allow SETTINGS after FORMAT for INSERT queries (there is compatibility setting `allow_settings_after_format_in_insert` to accept such queries, but it is turned OFF by default). [#35883](https://github.com/ClickHouse/ClickHouse/pull/35883) ([Azat Khuzhin](https://github.com/azat)).
 * Changed hashed path for cache files. [#36079](https://github.com/ClickHouse/ClickHouse/pull/36079) ([Kseniia Sumarokova](https://github.com/kssenii)).
 
 #### New Feature
@@ -161,7 +161,7 @@ sidebar_label: 2022
 
 * call RemoteQueryExecutor with original_query instead of an rewritten query, elimate the AMBIGUOUS_COLUMN_NAME exception. [#35748](https://github.com/ClickHouse/ClickHouse/pull/35748) ([lgbo](https://github.com/lgbo-ustc)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Disallow ALTER TTL for engines that does not support it, to avoid breaking ATTACH TABLE (closes [#33344](https://github.com/ClickHouse/ClickHouse/issues/33344)). [#33391](https://github.com/ClickHouse/ClickHouse/pull/33391) ([zhongyuankai](https://github.com/zhongyuankai)).
 * Do not delay final part writing by default (fixes possible `Memory limit exceeded` during `INSERT` by adding `max_insert_delayed_streams_for_parallel_write` with default to 1000 for writes to s3 and disabled as before otherwise). [#34780](https://github.com/ClickHouse/ClickHouse/pull/34780) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v22.4.3.3-stable.md b/docs/changelogs/v22.4.3.3-stable.md
index 69f95d8cd27..58d0f7b69a1 100644
--- a/docs/changelogs/v22.4.3.3-stable.md
+++ b/docs/changelogs/v22.4.3.3-stable.md
@@ -7,6 +7,6 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.4.3.3-stable (def956d6299) FIXME as compared to v22.4.2.1-stable (b34ebdc36ae)
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#36582](https://github.com/ClickHouse/ClickHouse/issues/36582): Fix nullptr dereference in JOIN and COLUMNS matcher. This fixes [#36416](https://github.com/ClickHouse/ClickHouse/issues/36416) . This is for https://github.com/ClickHouse/ClickHouse/pull/36417. [#36430](https://github.com/ClickHouse/ClickHouse/pull/36430) ([Amos Bird](https://github.com/amosbird)).
diff --git a/docs/changelogs/v22.4.4.7-stable.md b/docs/changelogs/v22.4.4.7-stable.md
index 1dce0c50e0a..af94ecafcf6 100644
--- a/docs/changelogs/v22.4.4.7-stable.md
+++ b/docs/changelogs/v22.4.4.7-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.4.4.7-stable (ba44414f9b3) FIXME as compared to v22.4.3.3-stable (def956d6299)
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#36524](https://github.com/ClickHouse/ClickHouse/issues/36524): Queries with aliases inside special operators returned parsing error (was broken in 22.1). Example: `SELECT substring('test' AS t, 1, 1)`. [#36167](https://github.com/ClickHouse/ClickHouse/pull/36167) ([Maksim Kita](https://github.com/kitaisreal)).
 * Backported in [#36673](https://github.com/ClickHouse/ClickHouse/issues/36673): Fix merges of wide parts with type `Object`. [#36637](https://github.com/ClickHouse/ClickHouse/pull/36637) ([Anton Popov](https://github.com/CurtizJ)).
diff --git a/docs/changelogs/v22.4.5.9-stable.md b/docs/changelogs/v22.4.5.9-stable.md
index 50cec91b12c..524b309f8ec 100644
--- a/docs/changelogs/v22.4.5.9-stable.md
+++ b/docs/changelogs/v22.4.5.9-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.4.5.9-stable (059ef6cadcd) FIXME as compared to v22.4.4.7-stable (ba44414f9b3)
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#36635](https://github.com/ClickHouse/ClickHouse/issues/36635): Fix `Missing column` exception which could happen while using `INTERPOLATE` with `ENGINE = MergeTree` table. [#36549](https://github.com/ClickHouse/ClickHouse/pull/36549) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Backported in [#36794](https://github.com/ClickHouse/ClickHouse/issues/36794): Fix vertical merges in wide parts. Previously an exception `There is no column` can be thrown during merge. [#36707](https://github.com/ClickHouse/ClickHouse/pull/36707) ([Anton Popov](https://github.com/CurtizJ)).
diff --git a/docs/changelogs/v22.4.6.53-stable.md b/docs/changelogs/v22.4.6.53-stable.md
index 5dc25697c20..b6380d9c7ba 100644
--- a/docs/changelogs/v22.4.6.53-stable.md
+++ b/docs/changelogs/v22.4.6.53-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#38828](https://github.com/ClickHouse/ClickHouse/issues/38828): - Change `all|noarch` packages to architecture-dependent - Fix some documentation for it - Push aarch64|arm64 packages to artifactory and release assets - Fixes [#36443](https://github.com/ClickHouse/ClickHouse/issues/36443). [#38580](https://github.com/ClickHouse/ClickHouse/pull/38580) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#37717](https://github.com/ClickHouse/ClickHouse/issues/37717): Fix unexpected errors with a clash of constant strings in aggregate function, prewhere and join. Close [#36891](https://github.com/ClickHouse/ClickHouse/issues/36891). [#37336](https://github.com/ClickHouse/ClickHouse/pull/37336) ([Vladimir C](https://github.com/vdimir)).
 * Backported in [#37512](https://github.com/ClickHouse/ClickHouse/issues/37512): Fix logical error in normalizeUTF8 functions. Closes [#37298](https://github.com/ClickHouse/ClickHouse/issues/37298). [#37443](https://github.com/ClickHouse/ClickHouse/pull/37443) ([Maksim Kita](https://github.com/kitaisreal)).
@@ -27,7 +27,7 @@ sidebar_label: 2022
 * Backported in [#38777](https://github.com/ClickHouse/ClickHouse/issues/38777): `rankCorr` function will work correctly if some arguments are NaNs. This closes [#38396](https://github.com/ClickHouse/ClickHouse/issues/38396). [#38722](https://github.com/ClickHouse/ClickHouse/pull/38722) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Backported in [#38781](https://github.com/ClickHouse/ClickHouse/issues/38781): Fix use-after-free for Map combinator that leads to incorrect result. [#38748](https://github.com/ClickHouse/ClickHouse/pull/38748) ([Azat Khuzhin](https://github.com/azat)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Backported in [#37456](https://github.com/ClickHouse/ClickHouse/issues/37456): Server might fail to start if it cannot resolve hostname of external ClickHouse dictionary. It's fixed. Fixes [#36451](https://github.com/ClickHouse/ClickHouse/issues/36451). [#36463](https://github.com/ClickHouse/ClickHouse/pull/36463) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Backported in [#38468](https://github.com/ClickHouse/ClickHouse/issues/38468): - Fix potential error with literals in `WHERE` for join queries. Close [#36279](https://github.com/ClickHouse/ClickHouse/issues/36279). [#36542](https://github.com/ClickHouse/ClickHouse/pull/36542) ([Vladimir C](https://github.com/vdimir)).
diff --git a/docs/changelogs/v22.5.1.2079-stable.md b/docs/changelogs/v22.5.1.2079-stable.md
index fdd6325fd1f..28dfa0825cf 100644
--- a/docs/changelogs/v22.5.1.2079-stable.md
+++ b/docs/changelogs/v22.5.1.2079-stable.md
@@ -104,7 +104,7 @@ sidebar_label: 2022
 * ClickHouse builds for `PowerPC64LE` architecture are now available in universal installation script `curl https://clickhouse.com/ | sh` and by direct link `https://builds.clickhouse.com/master/powerpc64le/clickhouse`. [#37095](https://github.com/ClickHouse/ClickHouse/pull/37095) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * - Make cmake build scripts a bit more robust. [#37169](https://github.com/ClickHouse/ClickHouse/pull/37169) ([Robert Schulze](https://github.com/rschu1ze)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * The ilike() function on FixedString columns could have returned wrong results (i.e. match less than it should). [#37117](https://github.com/ClickHouse/ClickHouse/pull/37117) ([Robert Schulze](https://github.com/rschu1ze)).
 * Fix implicit cast for optimize_skip_unused_shards_rewrite_in. [#37153](https://github.com/ClickHouse/ClickHouse/pull/37153) ([Azat Khuzhin](https://github.com/azat)).
@@ -120,7 +120,7 @@ sidebar_label: 2022
 * Fix system.opentelemetry_span_log attribute.values alias to values instead of keys. [#37275](https://github.com/ClickHouse/ClickHouse/pull/37275) ([Aleksandr Razumov](https://github.com/ernado)).
 * Fix possible deadlock in OvercommitTracker during logging. cc @alesapin @tavplubix Fixes [#37272](https://github.com/ClickHouse/ClickHouse/issues/37272). [#37299](https://github.com/ClickHouse/ClickHouse/pull/37299) ([Dmitry Novik](https://github.com/novikd)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * - fix substring function range error length when `offset` and `length` is negative constant and `s` is not constant. [#33861](https://github.com/ClickHouse/ClickHouse/pull/33861) ([RogerYK](https://github.com/RogerYK)).
 * Accidentally ZSTD support for Arrow was not being built. This fixes [#35283](https://github.com/ClickHouse/ClickHouse/issues/35283). [#35486](https://github.com/ClickHouse/ClickHouse/pull/35486) ([Sean Lafferty](https://github.com/seanlaff)).
diff --git a/docs/changelogs/v22.5.2.53-stable.md b/docs/changelogs/v22.5.2.53-stable.md
index f2fb50b3e14..8af0c7dac45 100644
--- a/docs/changelogs/v22.5.2.53-stable.md
+++ b/docs/changelogs/v22.5.2.53-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#38827](https://github.com/ClickHouse/ClickHouse/issues/38827): - Change `all|noarch` packages to architecture-dependent - Fix some documentation for it - Push aarch64|arm64 packages to artifactory and release assets - Fixes [#36443](https://github.com/ClickHouse/ClickHouse/issues/36443). [#38580](https://github.com/ClickHouse/ClickHouse/pull/38580) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#37716](https://github.com/ClickHouse/ClickHouse/issues/37716): Fix unexpected errors with a clash of constant strings in aggregate function, prewhere and join. Close [#36891](https://github.com/ClickHouse/ClickHouse/issues/36891). [#37336](https://github.com/ClickHouse/ClickHouse/pull/37336) ([Vladimir C](https://github.com/vdimir)).
 * Backported in [#37408](https://github.com/ClickHouse/ClickHouse/issues/37408): Throw an exception when GROUPING SETS used with ROLLUP or CUBE. [#37367](https://github.com/ClickHouse/ClickHouse/pull/37367) ([Dmitry Novik](https://github.com/novikd)).
diff --git a/docs/changelogs/v22.5.3.21-stable.md b/docs/changelogs/v22.5.3.21-stable.md
index 994bf79f7a8..4915a41a10c 100644
--- a/docs/changelogs/v22.5.3.21-stable.md
+++ b/docs/changelogs/v22.5.3.21-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.5.3.21-stable (e03724efec5) FIXME as compared to v22.5.2.53-stable (5fd600fda9e)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#38241](https://github.com/ClickHouse/ClickHouse/issues/38241): Fix possible crash in `Distributed` async insert in case of removing a replica from config. [#38029](https://github.com/ClickHouse/ClickHouse/pull/38029) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Backported in [#39098](https://github.com/ClickHouse/ClickHouse/issues/39098): Any allocations inside OvercommitTracker may lead to deadlock. Logging was not very informative so it's easier just to remove logging. Fixes [#37794](https://github.com/ClickHouse/ClickHouse/issues/37794). [#39030](https://github.com/ClickHouse/ClickHouse/pull/39030) ([Dmitry Novik](https://github.com/novikd)).
diff --git a/docs/changelogs/v22.5.4.19-stable.md b/docs/changelogs/v22.5.4.19-stable.md
index 24903260904..c90f45c770e 100644
--- a/docs/changelogs/v22.5.4.19-stable.md
+++ b/docs/changelogs/v22.5.4.19-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#39882](https://github.com/ClickHouse/ClickHouse/issues/39882): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#39209](https://github.com/ClickHouse/ClickHouse/issues/39209): Fix reading of sparse columns from `MergeTree` tables that store their data in S3. [#37978](https://github.com/ClickHouse/ClickHouse/pull/37978) ([Anton Popov](https://github.com/CurtizJ)).
 * Backported in [#39589](https://github.com/ClickHouse/ClickHouse/issues/39589): Fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
diff --git a/docs/changelogs/v22.6.1.1985-stable.md b/docs/changelogs/v22.6.1.1985-stable.md
index 0437f682789..c915d24fe00 100644
--- a/docs/changelogs/v22.6.1.1985-stable.md
+++ b/docs/changelogs/v22.6.1.1985-stable.md
@@ -119,7 +119,7 @@ sidebar_label: 2022
 * Fix overly aggressive stripping which removed the embedded hash required for checking the consistency of the executable. [#37993](https://github.com/ClickHouse/ClickHouse/pull/37993) ([Robert Schulze](https://github.com/rschu1ze)).
 * fix MacOS build compressor faild. [#38007](https://github.com/ClickHouse/ClickHouse/pull/38007) ([chen](https://github.com/xiedeyantu)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Fix `GROUP BY` `AggregateFunction` (i.e. you `GROUP BY` by the column that has `AggregateFunction` type). [#37093](https://github.com/ClickHouse/ClickHouse/pull/37093) ([Azat Khuzhin](https://github.com/azat)).
 * Fix possible heap-use-after-free error when reading system.projection_parts and system.projection_parts_columns . This fixes [#37184](https://github.com/ClickHouse/ClickHouse/issues/37184). [#37185](https://github.com/ClickHouse/ClickHouse/pull/37185) ([Amos Bird](https://github.com/amosbird)).
@@ -169,7 +169,7 @@ sidebar_label: 2022
 * when open enable_filesystem_query_cache_limit, throw Reserved cache size exceeds the remaining cache size. [#38004](https://github.com/ClickHouse/ClickHouse/pull/38004) ([chen](https://github.com/xiedeyantu)).
 * Query, containing ORDER BY ... WITH FILL, can generate extra rows when multiple WITH FILL columns are present. [#38074](https://github.com/ClickHouse/ClickHouse/pull/38074) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Fix converting types for UNION queries (may produce LOGICAL_ERROR). [#34775](https://github.com/ClickHouse/ClickHouse/pull/34775) ([Azat Khuzhin](https://github.com/azat)).
 * TTL merge may not be scheduled again if BackgroundExecutor is busy. --merges_with_ttl_counter is increased in selectPartsToMerge() --merge task will be ignored if BackgroundExecutor is busy --merges_with_ttl_counter will not be decrease. [#36387](https://github.com/ClickHouse/ClickHouse/pull/36387) ([lthaooo](https://github.com/lthaooo)).
diff --git a/docs/changelogs/v22.6.2.12-stable.md b/docs/changelogs/v22.6.2.12-stable.md
index d8c1cd31936..3c0f2116f1d 100644
--- a/docs/changelogs/v22.6.2.12-stable.md
+++ b/docs/changelogs/v22.6.2.12-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Improvement
 * Backported in [#38484](https://github.com/ClickHouse/ClickHouse/issues/38484): Improve the stability for hive storage integration test. Move the data prepare step into test.py. [#38260](https://github.com/ClickHouse/ClickHouse/pull/38260) ([lgbo](https://github.com/lgbo-ustc)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#38404](https://github.com/ClickHouse/ClickHouse/issues/38404): Fix bug with nested short-circuit functions that led to execution of arguments even if condition is false. Closes [#38040](https://github.com/ClickHouse/ClickHouse/issues/38040). [#38173](https://github.com/ClickHouse/ClickHouse/pull/38173) ([Kruglov Pavel](https://github.com/Avogar)).
 
diff --git a/docs/changelogs/v22.6.3.35-stable.md b/docs/changelogs/v22.6.3.35-stable.md
index 0a86c136d35..86b8282e075 100644
--- a/docs/changelogs/v22.6.3.35-stable.md
+++ b/docs/changelogs/v22.6.3.35-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#38883](https://github.com/ClickHouse/ClickHouse/issues/38883): Add `clickhouse-diagnostics` binary to the packages. [#38647](https://github.com/ClickHouse/ClickHouse/pull/38647) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#38690](https://github.com/ClickHouse/ClickHouse/issues/38690): Fix incorrect columns order in subqueries of UNION (in case of duplicated columns in subselects may produce incorrect result). [#37887](https://github.com/ClickHouse/ClickHouse/pull/37887) ([Azat Khuzhin](https://github.com/azat)).
 * Backported in [#38500](https://github.com/ClickHouse/ClickHouse/issues/38500): Do not allow recursive usage of OvercommitTracker during logging. Fixes [#37794](https://github.com/ClickHouse/ClickHouse/issues/37794) cc @tavplubix @davenger. [#38246](https://github.com/ClickHouse/ClickHouse/pull/38246) ([Dmitry Novik](https://github.com/novikd)).
diff --git a/docs/changelogs/v22.6.4.35-stable.md b/docs/changelogs/v22.6.4.35-stable.md
index 5c4644f735a..2b5537b5bf9 100644
--- a/docs/changelogs/v22.6.4.35-stable.md
+++ b/docs/changelogs/v22.6.4.35-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#38822](https://github.com/ClickHouse/ClickHouse/issues/38822): - Change `all|noarch` packages to architecture-dependent - Fix some documentation for it - Push aarch64|arm64 packages to artifactory and release assets - Fixes [#36443](https://github.com/ClickHouse/ClickHouse/issues/36443). [#38580](https://github.com/ClickHouse/ClickHouse/pull/38580) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#38242](https://github.com/ClickHouse/ClickHouse/issues/38242): Fix possible crash in `Distributed` async insert in case of removing a replica from config. [#38029](https://github.com/ClickHouse/ClickHouse/pull/38029) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Backported in [#38865](https://github.com/ClickHouse/ClickHouse/issues/38865): Fix s3 seekable reads with parallel read buffer. (Affected memory usage during query). Closes [#38258](https://github.com/ClickHouse/ClickHouse/issues/38258). [#38802](https://github.com/ClickHouse/ClickHouse/pull/38802) ([Kseniia Sumarokova](https://github.com/kssenii)).
diff --git a/docs/changelogs/v22.6.5.22-stable.md b/docs/changelogs/v22.6.5.22-stable.md
index 5965f63df14..edb6bdf7c2d 100644
--- a/docs/changelogs/v22.6.5.22-stable.md
+++ b/docs/changelogs/v22.6.5.22-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#39883](https://github.com/ClickHouse/ClickHouse/issues/39883): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#39207](https://github.com/ClickHouse/ClickHouse/issues/39207): Fix reading of sparse columns from `MergeTree` tables that store their data in S3. [#37978](https://github.com/ClickHouse/ClickHouse/pull/37978) ([Anton Popov](https://github.com/CurtizJ)).
 * Backported in [#38932](https://github.com/ClickHouse/ClickHouse/issues/38932): Fix `parallel_view_processing=1` with `optimize_trivial_insert_select=1`. Fix `max_insert_threads` while pushing to views. [#38731](https://github.com/ClickHouse/ClickHouse/pull/38731) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v22.6.6.16-stable.md b/docs/changelogs/v22.6.6.16-stable.md
index 4d44621454b..d4d25771326 100644
--- a/docs/changelogs/v22.6.6.16-stable.md
+++ b/docs/changelogs/v22.6.6.16-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.6.6.16-stable (d2a33ebc822) FIXME as compared to v22.6.5.22-stable (47ca5f14a34)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#40162](https://github.com/ClickHouse/ClickHouse/issues/40162): fix HashMethodOneNumber get wrong key value when column is const. [#40020](https://github.com/ClickHouse/ClickHouse/pull/40020) ([Duc Canh Le](https://github.com/canhld94)).
 * Backported in [#40124](https://github.com/ClickHouse/ClickHouse/issues/40124): Fix bug in collectFilesToSkip() by adding correct file extension(.idx or idx2) for indexes to be recalculated, avoid wrong hard links. Fixed [#39896](https://github.com/ClickHouse/ClickHouse/issues/39896). [#40095](https://github.com/ClickHouse/ClickHouse/pull/40095) ([Jianmei Zhang](https://github.com/zhangjmruc)).
diff --git a/docs/changelogs/v22.6.7.7-stable.md b/docs/changelogs/v22.6.7.7-stable.md
index f5351cc03ed..0b4cc6836f7 100644
--- a/docs/changelogs/v22.6.7.7-stable.md
+++ b/docs/changelogs/v22.6.7.7-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#40692](https://github.com/ClickHouse/ClickHouse/issues/40692): Fix TGZ packages. [#40681](https://github.com/ClickHouse/ClickHouse/pull/40681) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#40531](https://github.com/ClickHouse/ClickHouse/issues/40531): Proxy resolver stop on first successful request to endpoint. [#40353](https://github.com/ClickHouse/ClickHouse/pull/40353) ([Maksim Kita](https://github.com/kitaisreal)).
 * Backported in [#40623](https://github.com/ClickHouse/ClickHouse/issues/40623): Fix potential dataloss due to a bug in AWS SDK (https://github.com/aws/aws-sdk-cpp/issues/658). Bug can be triggered only when clickhouse is used over S3. [#40506](https://github.com/ClickHouse/ClickHouse/pull/40506) ([alesapin](https://github.com/alesapin)).
diff --git a/docs/changelogs/v22.6.8.35-stable.md b/docs/changelogs/v22.6.8.35-stable.md
index e68384d3d9c..b69cabffd4d 100644
--- a/docs/changelogs/v22.6.8.35-stable.md
+++ b/docs/changelogs/v22.6.8.35-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#41274](https://github.com/ClickHouse/ClickHouse/issues/41274): Fix memory safety issues with functions `encrypt` and `contingency` if Array of Nullable is used as an argument. This fixes [#41004](https://github.com/ClickHouse/ClickHouse/issues/41004). [#40195](https://github.com/ClickHouse/ClickHouse/pull/40195) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#41282](https://github.com/ClickHouse/ClickHouse/issues/41282): Fix unused unknown columns introduced by WITH statement. This fixes [#37812](https://github.com/ClickHouse/ClickHouse/issues/37812) . [#39131](https://github.com/ClickHouse/ClickHouse/pull/39131) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#40905](https://github.com/ClickHouse/ClickHouse/issues/40905): Fix potential deadlock in WriteBufferFromS3 during task scheduling failure. [#40070](https://github.com/ClickHouse/ClickHouse/pull/40070) ([Maksim Kita](https://github.com/kitaisreal)).
diff --git a/docs/changelogs/v22.6.9.11-stable.md b/docs/changelogs/v22.6.9.11-stable.md
index 5beb9171d9e..42cf0948ecc 100644
--- a/docs/changelogs/v22.6.9.11-stable.md
+++ b/docs/changelogs/v22.6.9.11-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#41558](https://github.com/ClickHouse/ClickHouse/issues/41558): Add `source` field to deb packages, update `nfpm`. [#41531](https://github.com/ClickHouse/ClickHouse/pull/41531) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#41504](https://github.com/ClickHouse/ClickHouse/issues/41504): Writing data in Apache `ORC` format might lead to a buffer overrun. [#41458](https://github.com/ClickHouse/ClickHouse/pull/41458) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
diff --git a/docs/changelogs/v22.7.1.2484-stable.md b/docs/changelogs/v22.7.1.2484-stable.md
index 3f90b3691ea..7464b0449ee 100644
--- a/docs/changelogs/v22.7.1.2484-stable.md
+++ b/docs/changelogs/v22.7.1.2484-stable.md
@@ -128,7 +128,7 @@ sidebar_label: 2022
 * Fix LSan by fixing getauxval(). [#39299](https://github.com/ClickHouse/ClickHouse/pull/39299) ([Azat Khuzhin](https://github.com/azat)).
 * Adapt universal installation script for FreeBSD. [#39302](https://github.com/ClickHouse/ClickHouse/pull/39302) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Fix projection exception when aggregation keys are wrapped inside other functions. This fixes [#37151](https://github.com/ClickHouse/ClickHouse/issues/37151). [#37155](https://github.com/ClickHouse/ClickHouse/pull/37155) ([Amos Bird](https://github.com/amosbird)).
 * Fix possible logical error `... with argument with type Nothing and default implementation for Nothing is expected to return result with type Nothing, got ...` in some functions. Closes: [#37610](https://github.com/ClickHouse/ClickHouse/issues/37610) Closes: [#37741](https://github.com/ClickHouse/ClickHouse/issues/37741). [#37759](https://github.com/ClickHouse/ClickHouse/pull/37759) ([Kruglov Pavel](https://github.com/Avogar)).
@@ -198,7 +198,7 @@ sidebar_label: 2022
 * Fix UB (stack-use-after-scope) in extactAll(). [#39397](https://github.com/ClickHouse/ClickHouse/pull/39397) ([Azat Khuzhin](https://github.com/azat)).
 * Fix incorrect query result when trivial count optimization is in effect with array join. This fixes [#39431](https://github.com/ClickHouse/ClickHouse/issues/39431). [#39444](https://github.com/ClickHouse/ClickHouse/pull/39444) ([Amos Bird](https://github.com/amosbird)).
 
-#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+#### Bug Fix (user-visible misbehaviour in official stable release)
 
 * Disable send_logs_level for INSERT into Distributed to avoid possible hung. [#35075](https://github.com/ClickHouse/ClickHouse/pull/35075) ([Azat Khuzhin](https://github.com/azat)).
 
diff --git a/docs/changelogs/v22.7.2.15-stable.md b/docs/changelogs/v22.7.2.15-stable.md
index a9db8bcf10d..0a3748f90f7 100644
--- a/docs/changelogs/v22.7.2.15-stable.md
+++ b/docs/changelogs/v22.7.2.15-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#39750](https://github.com/ClickHouse/ClickHouse/issues/39750): Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#39591](https://github.com/ClickHouse/ClickHouse/issues/39591): Fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
 * Backported in [#39613](https://github.com/ClickHouse/ClickHouse/issues/39613): Fix bug with maxsplit argument for splitByChar, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
diff --git a/docs/changelogs/v22.7.3.5-stable.md b/docs/changelogs/v22.7.3.5-stable.md
index 62a5dfee611..b55b16509d4 100644
--- a/docs/changelogs/v22.7.3.5-stable.md
+++ b/docs/changelogs/v22.7.3.5-stable.md
@@ -11,7 +11,7 @@ sidebar_label: 2022
 * Backported in [#39884](https://github.com/ClickHouse/ClickHouse/issues/39884): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#39884](https://github.com/ClickHouse/ClickHouse/issues/39884): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#40045](https://github.com/ClickHouse/ClickHouse/issues/40045): Fix big memory usage during fetches. Fixes [#39915](https://github.com/ClickHouse/ClickHouse/issues/39915). [#39990](https://github.com/ClickHouse/ClickHouse/pull/39990) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Backported in [#40045](https://github.com/ClickHouse/ClickHouse/issues/40045): Fix big memory usage during fetches. Fixes [#39915](https://github.com/ClickHouse/ClickHouse/issues/39915). [#39990](https://github.com/ClickHouse/ClickHouse/pull/39990) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
diff --git a/docs/changelogs/v22.7.4.16-stable.md b/docs/changelogs/v22.7.4.16-stable.md
index 52d68283a2f..4847ef8cf64 100644
--- a/docs/changelogs/v22.7.4.16-stable.md
+++ b/docs/changelogs/v22.7.4.16-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.7.4.16-stable (0b9272f8fdc) FIXME as compared to v22.7.3.5-stable (e140b8b5f3a)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#40163](https://github.com/ClickHouse/ClickHouse/issues/40163): fix HashMethodOneNumber get wrong key value when column is const. [#40020](https://github.com/ClickHouse/ClickHouse/pull/40020) ([Duc Canh Le](https://github.com/canhld94)).
 * Backported in [#40125](https://github.com/ClickHouse/ClickHouse/issues/40125): Fix bug in collectFilesToSkip() by adding correct file extension(.idx or idx2) for indexes to be recalculated, avoid wrong hard links. Fixed [#39896](https://github.com/ClickHouse/ClickHouse/issues/39896). [#40095](https://github.com/ClickHouse/ClickHouse/pull/40095) ([Jianmei Zhang](https://github.com/zhangjmruc)).
diff --git a/docs/changelogs/v22.7.5.13-stable.md b/docs/changelogs/v22.7.5.13-stable.md
index 0de9e9a26aa..24dbc5c9e7f 100644
--- a/docs/changelogs/v22.7.5.13-stable.md
+++ b/docs/changelogs/v22.7.5.13-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#40693](https://github.com/ClickHouse/ClickHouse/issues/40693): Fix TGZ packages. [#40681](https://github.com/ClickHouse/ClickHouse/pull/40681) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#40542](https://github.com/ClickHouse/ClickHouse/issues/40542): Fix potential deadlock in WriteBufferFromS3 during task scheduling failure. [#40070](https://github.com/ClickHouse/ClickHouse/pull/40070) ([Maksim Kita](https://github.com/kitaisreal)).
 * Backported in [#40450](https://github.com/ClickHouse/ClickHouse/issues/40450): Fix rare bug with column TTL for MergeTree engines family: In case of repeated vertical merge the error `Cannot unlink file ColumnName.bin ... No such file or directory.` could happen. [#40346](https://github.com/ClickHouse/ClickHouse/pull/40346) ([alesapin](https://github.com/alesapin)).
diff --git a/docs/changelogs/v22.7.6.74-stable.md b/docs/changelogs/v22.7.6.74-stable.md
index 9060375ce8e..3cf2edfccd1 100644
--- a/docs/changelogs/v22.7.6.74-stable.md
+++ b/docs/changelogs/v22.7.6.74-stable.md
@@ -16,7 +16,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#41559](https://github.com/ClickHouse/ClickHouse/issues/41559): Add `source` field to deb packages, update `nfpm`. [#41531](https://github.com/ClickHouse/ClickHouse/pull/41531) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#41283](https://github.com/ClickHouse/ClickHouse/issues/41283): Fix unused unknown columns introduced by WITH statement. This fixes [#37812](https://github.com/ClickHouse/ClickHouse/issues/37812) . [#39131](https://github.com/ClickHouse/ClickHouse/pull/39131) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#40865](https://github.com/ClickHouse/ClickHouse/issues/40865): - Fix crash while parsing values of type `Object` that contains arrays of variadic dimension. [#40483](https://github.com/ClickHouse/ClickHouse/pull/40483) ([Duc Canh Le](https://github.com/canhld94)).
diff --git a/docs/changelogs/v22.7.7.24-stable.md b/docs/changelogs/v22.7.7.24-stable.md
index cc3a83c5d4c..16e56156ff6 100644
--- a/docs/changelogs/v22.7.7.24-stable.md
+++ b/docs/changelogs/v22.7.7.24-stable.md
@@ -14,7 +14,7 @@ sidebar_label: 2022
 * Backported in [#42329](https://github.com/ClickHouse/ClickHouse/issues/42329): Update cctz to the latest master, update tzdb to 2020e. [#42273](https://github.com/ClickHouse/ClickHouse/pull/42273) ([Dom Del Nano](https://github.com/ddelnano)).
 * Backported in [#42359](https://github.com/ClickHouse/ClickHouse/issues/42359): Update tzdata to 2022e to support the new timezone changes. Palestine transitions are now Saturdays at 02:00. Simplify three Ukraine zones into one. Jordan and Syria switch from +02/+03 with DST to year-round +03. (https://data.iana.org/time-zones/tzdb/NEWS). This closes [#42252](https://github.com/ClickHouse/ClickHouse/issues/42252). [#42327](https://github.com/ClickHouse/ClickHouse/pull/42327) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#42268](https://github.com/ClickHouse/ClickHouse/issues/42268): Fix reusing of files > 4GB from base backup. [#42146](https://github.com/ClickHouse/ClickHouse/pull/42146) ([Azat Khuzhin](https://github.com/azat)).
 * Backported in [#42299](https://github.com/ClickHouse/ClickHouse/issues/42299): Fix a bug with projections and the `aggregate_functions_null_for_empty` setting. This bug is very rare and appears only if you enable the `aggregate_functions_null_for_empty` setting in the server's config. This closes [#41647](https://github.com/ClickHouse/ClickHouse/issues/41647). [#42198](https://github.com/ClickHouse/ClickHouse/pull/42198) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
diff --git a/docs/changelogs/v22.8.1.2097-lts.md b/docs/changelogs/v22.8.1.2097-lts.md
index ef454a7e283..b6b634f4826 100644
--- a/docs/changelogs/v22.8.1.2097-lts.md
+++ b/docs/changelogs/v22.8.1.2097-lts.md
@@ -106,7 +106,7 @@ sidebar_label: 2022
 * Support build with `clang-16` (trunk). This closes [#39949](https://github.com/ClickHouse/ClickHouse/issues/39949). [#40181](https://github.com/ClickHouse/ClickHouse/pull/40181) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Prepare RISC-V 64 build to run in CI. This is for [#40141](https://github.com/ClickHouse/ClickHouse/issues/40141). [#40197](https://github.com/ClickHouse/ClickHouse/pull/40197) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Fixed query hanging for SELECT with ORDER BY WITH FILL with different date/time types. [#37849](https://github.com/ClickHouse/ClickHouse/pull/37849) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Fix ORDER BY that matches projections ORDER BY (before it simply returns unsorted result). [#38725](https://github.com/ClickHouse/ClickHouse/pull/38725) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v22.8.10.29-lts.md b/docs/changelogs/v22.8.10.29-lts.md
index ac41d71650c..33ae27b6da8 100644
--- a/docs/changelogs/v22.8.10.29-lts.md
+++ b/docs/changelogs/v22.8.10.29-lts.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#43051](https://github.com/ClickHouse/ClickHouse/issues/43051): Wait for all files are in sync before archiving them in integration tests. [#42891](https://github.com/ClickHouse/ClickHouse/pull/42891) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#43513](https://github.com/ClickHouse/ClickHouse/issues/43513): - Fix several buffer over-reads. [#43159](https://github.com/ClickHouse/ClickHouse/pull/43159) ([Raúl Marín](https://github.com/Algunenano)).
 * Backported in [#43428](https://github.com/ClickHouse/ClickHouse/issues/43428): Fixed queries with `SAMPLE BY` with prewhere optimization on tables using `Merge` engine. [#43315](https://github.com/ClickHouse/ClickHouse/pull/43315) ([Antonio Andelic](https://github.com/antonio2368)).
diff --git a/docs/changelogs/v22.8.11.15-lts.md b/docs/changelogs/v22.8.11.15-lts.md
index 337eeba9187..dbe765ca4a2 100644
--- a/docs/changelogs/v22.8.11.15-lts.md
+++ b/docs/changelogs/v22.8.11.15-lts.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Bug Fix
 * Backported in [#43098](https://github.com/ClickHouse/ClickHouse/issues/43098): Updated normaliser to clone the alias ast. resolves [#42452](https://github.com/ClickHouse/ClickHouse/issues/42452) Implementation: * Updated QueryNormalizer to clone alias ast, when its replaced. Previously just assigning the same leads to exception in LogicalExpressinsOptimizer as it would be the same parent being inserted again. * This bug is not seen with new analyser (allow_experimental_analyzer), so no changes for it. I added a test for the same. [#42827](https://github.com/ClickHouse/ClickHouse/pull/42827) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#43751](https://github.com/ClickHouse/ClickHouse/issues/43751): An issue with the following exception has been reported while trying to read a Parquet file from S3 into ClickHouse:. [#43297](https://github.com/ClickHouse/ClickHouse/pull/43297) ([Arthur Passos](https://github.com/arthurpassos)).
 * Backported in [#43617](https://github.com/ClickHouse/ClickHouse/issues/43617): Fix sumMap() for Nullable(Decimal()). [#43414](https://github.com/ClickHouse/ClickHouse/pull/43414) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v22.8.12.45-lts.md b/docs/changelogs/v22.8.12.45-lts.md
index 7412784419c..9fab9daeb95 100644
--- a/docs/changelogs/v22.8.12.45-lts.md
+++ b/docs/changelogs/v22.8.12.45-lts.md
@@ -16,7 +16,7 @@ sidebar_label: 2023
 * Backported in [#44378](https://github.com/ClickHouse/ClickHouse/issues/44378): In rare cases, we don't rebuild binaries, because another task with a similar prefix succeeded. E.g. `binary_darwin` didn't restart because `binary_darwin_aarch64`. [#44311](https://github.com/ClickHouse/ClickHouse/pull/44311) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#44558](https://github.com/ClickHouse/ClickHouse/issues/44558): Retry the integration tests on compressing errors. [#44529](https://github.com/ClickHouse/ClickHouse/pull/44529) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#44751](https://github.com/ClickHouse/ClickHouse/issues/44751): [#40651](https://github.com/ClickHouse/ClickHouse/issues/40651) [#41404](https://github.com/ClickHouse/ClickHouse/issues/41404). [#42126](https://github.com/ClickHouse/ClickHouse/pull/42126) ([Alexander Gololobov](https://github.com/davenger)).
 * Backported in [#43525](https://github.com/ClickHouse/ClickHouse/issues/43525): Fix incorrect UserTimeMicroseconds/SystemTimeMicroseconds accounting. [#42791](https://github.com/ClickHouse/ClickHouse/pull/42791) ([Azat Khuzhin](https://github.com/azat)).
@@ -39,4 +39,3 @@ sidebar_label: 2023
 * Add check for submodules sanity [#44386](https://github.com/ClickHouse/ClickHouse/pull/44386) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Implement a custom central checkout action [#44399](https://github.com/ClickHouse/ClickHouse/pull/44399) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Do not check read result consistency when unwinding [#44956](https://github.com/ClickHouse/ClickHouse/pull/44956) ([Alexander Gololobov](https://github.com/davenger)).
-
diff --git a/docs/changelogs/v22.8.13.20-lts.md b/docs/changelogs/v22.8.13.20-lts.md
index d8dd1bd2b1c..0734f40bf3e 100644
--- a/docs/changelogs/v22.8.13.20-lts.md
+++ b/docs/changelogs/v22.8.13.20-lts.md
@@ -7,7 +7,7 @@ sidebar_label: 2023
 
 ### ClickHouse release v22.8.13.20-lts (e4817946d18) FIXME as compared to v22.8.12.45-lts (86b0ecd5d51)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#45565](https://github.com/ClickHouse/ClickHouse/issues/45565): Fix positional arguments exception Positional argument out of bounds. Closes [#40634](https://github.com/ClickHouse/ClickHouse/issues/40634). [#41189](https://github.com/ClickHouse/ClickHouse/pull/41189) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Backported in [#44997](https://github.com/ClickHouse/ClickHouse/issues/44997): Another fix for `Cannot read all data` error which could happen while reading `LowCardinality` dictionary from remote fs. Fixes [#44709](https://github.com/ClickHouse/ClickHouse/issues/44709). [#44875](https://github.com/ClickHouse/ClickHouse/pull/44875) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
@@ -21,4 +21,3 @@ sidebar_label: 2023
 * Get rid of artifactory in favor of r2 + ch-repos-manager [#45421](https://github.com/ClickHouse/ClickHouse/pull/45421) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Trim refs/tags/ from GITHUB_TAG in release workflow [#45636](https://github.com/ClickHouse/ClickHouse/pull/45636) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Merge pull request [#38262](https://github.com/ClickHouse/ClickHouse/issues/38262) from PolyProgrammist/fix-ordinary-system-un… [#45650](https://github.com/ClickHouse/ClickHouse/pull/45650) ([alesapin](https://github.com/alesapin)).
-
diff --git a/docs/changelogs/v22.8.14.53-lts.md b/docs/changelogs/v22.8.14.53-lts.md
new file mode 100644
index 00000000000..3cceb3475b6
--- /dev/null
+++ b/docs/changelogs/v22.8.14.53-lts.md
@@ -0,0 +1,39 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v22.8.14.53-lts (4ea67c40077) FIXME as compared to v22.8.13.20-lts (e4817946d18)
+
+#### Performance Improvement
+* Backported in [#45845](https://github.com/ClickHouse/ClickHouse/issues/45845): Fixed performance of short `SELECT` queries that read from tables with large number of`Array`/`Map`/`Nested` columns. [#45630](https://github.com/ClickHouse/ClickHouse/pull/45630) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#46374](https://github.com/ClickHouse/ClickHouse/issues/46374): Fix too big memory usage for vertical merges on non-remote disk. Respect `max_insert_delayed_streams_for_parallel_write` for the remote disk. [#46275](https://github.com/ClickHouse/ClickHouse/pull/46275) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#46358](https://github.com/ClickHouse/ClickHouse/issues/46358): Allow using Vertical merge algorithm with parts in Compact format. This will allow ClickHouse server to use much less memory for background operations. This closes [#46084](https://github.com/ClickHouse/ClickHouse/issues/46084). [#46282](https://github.com/ClickHouse/ClickHouse/pull/46282) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#46112](https://github.com/ClickHouse/ClickHouse/issues/46112): Remove the dependency on the `adduser` tool from the packages, because we don't use it. This fixes [#44934](https://github.com/ClickHouse/ClickHouse/issues/44934). [#45011](https://github.com/ClickHouse/ClickHouse/pull/45011) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#46482](https://github.com/ClickHouse/ClickHouse/issues/46482): Get rid of unnecessary build for standalone clickhouse-keeper. [#46367](https://github.com/ClickHouse/ClickHouse/pull/46367) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#46505](https://github.com/ClickHouse/ClickHouse/issues/46505): Some time ago the ccache compression was changed to `zst`, but `gz` archives are downloaded by default. It fixes it by prioritizing zst archive. [#46490](https://github.com/ClickHouse/ClickHouse/pull/46490) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable release)
+
+* Backported in [#45908](https://github.com/ClickHouse/ClickHouse/issues/45908): Fixed bug with non-parsable default value for EPHEMERAL column in table metadata. [#44026](https://github.com/ClickHouse/ClickHouse/pull/44026) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backported in [#46238](https://github.com/ClickHouse/ClickHouse/issues/46238): A couple of seg faults have been reported around `c-ares`. All of the recent stack traces observed fail on inserting into `std::unodered_set<>`. I believe I have found the root cause of this, it seems to be unprocessed queries. Prior to this PR, CH calls `poll` to wait on the file descriptors in the `c-ares` channel. According to the [poll docs](https://man7.org/linux/man-pages/man2/poll.2.html), a negative return value means an error has ocurred. Because of this, we would abort the execution and return failure. The problem is that `poll` will also return a negative value if a system interrupt occurs. A system interrupt does not mean the processing has failed or ended, but we would abort it anyways because we were checking for negative values. Once the execution is aborted, the whole stack is destroyed, which includes the `std::unordered_set<std::string>` passed to the `void *` parameter of the c-ares callback. Once c-ares completed the request, the callback would be invoked and would access an invalid memory address causing a segfault. [#45629](https://github.com/ClickHouse/ClickHouse/pull/45629) ([Arthur Passos](https://github.com/arthurpassos)).
+* Backported in [#45727](https://github.com/ClickHouse/ClickHouse/issues/45727): Fix key description when encountering duplicate primary keys. This can happen in projections. See [#45590](https://github.com/ClickHouse/ClickHouse/issues/45590) for details. [#45686](https://github.com/ClickHouse/ClickHouse/pull/45686) ([Amos Bird](https://github.com/amosbird)).
+* Backported in [#46394](https://github.com/ClickHouse/ClickHouse/issues/46394): Fix `SYSTEM UNFREEZE` queries failing with the exception `CANNOT_PARSE_INPUT_ASSERTION_FAILED`. [#46325](https://github.com/ClickHouse/ClickHouse/pull/46325) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Backported in [#46442](https://github.com/ClickHouse/ClickHouse/issues/46442): Fix possible `LOGICAL_ERROR` in asynchronous inserts with invalid data sent in format `VALUES`. [#46350](https://github.com/ClickHouse/ClickHouse/pull/46350) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#46674](https://github.com/ClickHouse/ClickHouse/issues/46674): Fix an invalid processing of constant `LowCardinality` argument in function `arrayMap`. This bug could lead to a segfault in release, and logical error `Bad cast` in debug build. [#46569](https://github.com/ClickHouse/ClickHouse/pull/46569) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#46879](https://github.com/ClickHouse/ClickHouse/issues/46879): Fix MSan report in the `maxIntersections` function. This closes [#43126](https://github.com/ClickHouse/ClickHouse/issues/43126). [#46847](https://github.com/ClickHouse/ClickHouse/pull/46847) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#46871](https://github.com/ClickHouse/ClickHouse/issues/46871): Fix a bug in the `Map` data type. This closes [#46855](https://github.com/ClickHouse/ClickHouse/issues/46855). [#46856](https://github.com/ClickHouse/ClickHouse/pull/46856) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Another attempt to fix automerge, or at least to have debug footprint [#45476](https://github.com/ClickHouse/ClickHouse/pull/45476) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add check for running workflows to merge_pr.py [#45803](https://github.com/ClickHouse/ClickHouse/pull/45803) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Get rid of progress timestamps in release publishing [#45818](https://github.com/ClickHouse/ClickHouse/pull/45818) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add necessary dependency for sanitizers [#45959](https://github.com/ClickHouse/ClickHouse/pull/45959) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add helping logging to auto-merge script [#46080](https://github.com/ClickHouse/ClickHouse/pull/46080) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix write buffer destruction order for vertical merge. [#46205](https://github.com/ClickHouse/ClickHouse/pull/46205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Get rid of legacy DocsReleaseChecks [#46665](https://github.com/ClickHouse/ClickHouse/pull/46665) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v22.8.15.23-lts.md b/docs/changelogs/v22.8.15.23-lts.md
new file mode 100644
index 00000000000..5f49dfb1757
--- /dev/null
+++ b/docs/changelogs/v22.8.15.23-lts.md
@@ -0,0 +1,27 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v22.8.15.23-lts (d36fa168bbf) FIXME as compared to v22.8.14.53-lts (4ea67c40077)
+
+#### Improvement
+* Backported in [#46981](https://github.com/ClickHouse/ClickHouse/issues/46981): - Apply `ALTER TABLE table_name ON CLUSTER cluster MOVE PARTITION|PART partition_expr TO DISK|VOLUME 'disk_name'` to all replicas. Because `ALTER TABLE t MOVE` is not replicated. [#46402](https://github.com/ClickHouse/ClickHouse/pull/46402) ([lizhuoyu5](https://github.com/lzydmxy)).
+
+#### Bug Fix
+* Backported in [#47336](https://github.com/ClickHouse/ClickHouse/issues/47336): Sometimes after changing a role that could be not reflected on the access rights of a user who uses that role. This PR fixes that. [#46772](https://github.com/ClickHouse/ClickHouse/pull/46772) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Bug Fix (user-visible misbehavior in official stable release)
+
+* Backported in [#46901](https://github.com/ClickHouse/ClickHouse/issues/46901): - Fix incorrect alias recursion in QueryNormalizer. [#46609](https://github.com/ClickHouse/ClickHouse/pull/46609) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#47156](https://github.com/ClickHouse/ClickHouse/issues/47156): - Fix arithmetic operations in aggregate optimization with `min` and `max`. [#46705](https://github.com/ClickHouse/ClickHouse/pull/46705) ([Duc Canh Le](https://github.com/canhld94)).
+* Backported in [#46987](https://github.com/ClickHouse/ClickHouse/issues/46987): Fix result of LIKE predicates which translate to substring searches and contain quoted non-LIKE metacharacters. [#46875](https://github.com/ClickHouse/ClickHouse/pull/46875) ([Robert Schulze](https://github.com/rschu1ze)).
+* Backported in [#47357](https://github.com/ClickHouse/ClickHouse/issues/47357): Fix possible deadlock on distributed query cancellation. [#47161](https://github.com/ClickHouse/ClickHouse/pull/47161) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Reduce updates of Mergeable Check [#46781](https://github.com/ClickHouse/ClickHouse/pull/46781) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update typing for a new PyGithub version [#47123](https://github.com/ClickHouse/ClickHouse/pull/47123) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add a manual trigger for release workflow [#47302](https://github.com/ClickHouse/ClickHouse/pull/47302) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v22.8.16.32-lts.md b/docs/changelogs/v22.8.16.32-lts.md
new file mode 100644
index 00000000000..27ec1f1f145
--- /dev/null
+++ b/docs/changelogs/v22.8.16.32-lts.md
@@ -0,0 +1,29 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v22.8.16.32-lts (7c4be737bd0) FIXME as compared to v22.8.15.23-lts (d36fa168bbf)
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#48344](https://github.com/ClickHouse/ClickHouse/issues/48344): Use sccache as a replacement for ccache and using S3 as cache backend. [#46240](https://github.com/ClickHouse/ClickHouse/pull/46240) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#48250](https://github.com/ClickHouse/ClickHouse/issues/48250): The `clickhouse/clickhouse-keeper` image used to be pushed only with tags `-alpine`, e.g. `latest-alpine`. As it was suggested in https://github.com/ClickHouse/examples/pull/2, now it will be pushed as suffixless too. [#48236](https://github.com/ClickHouse/ClickHouse/pull/48236) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix bug in zero-copy replication disk choice during fetch [#47010](https://github.com/ClickHouse/ClickHouse/pull/47010) ([alesapin](https://github.com/alesapin)).
+* Fix query parameters [#47488](https://github.com/ClickHouse/ClickHouse/pull/47488) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix wait for zero copy lock during move [#47631](https://github.com/ClickHouse/ClickHouse/pull/47631) ([alesapin](https://github.com/alesapin)).
+* Fix crash in polygonsSymDifferenceCartesian [#47702](https://github.com/ClickHouse/ClickHouse/pull/47702) ([pufit](https://github.com/pufit)).
+* Backport to 22.8: Fix moving broken parts to the detached for the object storage disk on startup [#48273](https://github.com/ClickHouse/ClickHouse/pull/48273) ([Aleksei Filatov](https://github.com/aalexfvk)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Add a fuse for backport branches w/o a created PR [#47760](https://github.com/ClickHouse/ClickHouse/pull/47760) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Only valid Reviews.STATES overwrite existing reviews [#47789](https://github.com/ClickHouse/ClickHouse/pull/47789) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Place short return before big block, improve logging [#47822](https://github.com/ClickHouse/ClickHouse/pull/47822) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Artifacts s3 prefix [#47945](https://github.com/ClickHouse/ClickHouse/pull/47945) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix tsan error lock-order-inversion [#47953](https://github.com/ClickHouse/ClickHouse/pull/47953) ([Kruglov Pavel](https://github.com/Avogar)).
+
diff --git a/docs/changelogs/v22.8.17.17-lts.md b/docs/changelogs/v22.8.17.17-lts.md
new file mode 100644
index 00000000000..9c8c3e1839b
--- /dev/null
+++ b/docs/changelogs/v22.8.17.17-lts.md
@@ -0,0 +1,22 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v22.8.17.17-lts (df7f2ef0b41) FIXME as compared to v22.8.16.32-lts (7c4be737bd0)
+
+#### Improvement
+* Backported in [#48157](https://github.com/ClickHouse/ClickHouse/issues/48157): Fixed `UNKNOWN_TABLE` exception when attaching to a materialized view that has dependent tables that are not available. This might be useful when trying to restore state from a backup. [#47975](https://github.com/ClickHouse/ClickHouse/pull/47975) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#48957](https://github.com/ClickHouse/ClickHouse/issues/48957): After the recent update, the `dockerd` requires `--tlsverify=false` together with the http port explicitly. [#48924](https://github.com/ClickHouse/ClickHouse/pull/48924) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix explain graph with projection [#47473](https://github.com/ClickHouse/ClickHouse/pull/47473) ([flynn](https://github.com/ucasfl)).
+* Remove a feature [#48195](https://github.com/ClickHouse/ClickHouse/pull/48195) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix possible segfault in cache [#48469](https://github.com/ClickHouse/ClickHouse/pull/48469) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix bug in Keeper when a node is not created with scheme `auth` in ACL sometimes. [#48595](https://github.com/ClickHouse/ClickHouse/pull/48595) ([Aleksei Filatov](https://github.com/aalexfvk)).
+
diff --git a/docs/changelogs/v22.8.3.13-lts.md b/docs/changelogs/v22.8.3.13-lts.md
index 903f5b7a600..5f08bc9ee67 100644
--- a/docs/changelogs/v22.8.3.13-lts.md
+++ b/docs/changelogs/v22.8.3.13-lts.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#40694](https://github.com/ClickHouse/ClickHouse/issues/40694): Fix TGZ packages. [#40681](https://github.com/ClickHouse/ClickHouse/pull/40681) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#40451](https://github.com/ClickHouse/ClickHouse/issues/40451): Fix rare bug with column TTL for MergeTree engines family: In case of repeated vertical merge the error `Cannot unlink file ColumnName.bin ... No such file or directory.` could happen. [#40346](https://github.com/ClickHouse/ClickHouse/pull/40346) ([alesapin](https://github.com/alesapin)).
 * Backported in [#40533](https://github.com/ClickHouse/ClickHouse/issues/40533): Proxy resolver stop on first successful request to endpoint. [#40353](https://github.com/ClickHouse/ClickHouse/pull/40353) ([Maksim Kita](https://github.com/kitaisreal)).
diff --git a/docs/changelogs/v22.8.4.7-lts.md b/docs/changelogs/v22.8.4.7-lts.md
index 93d9aa2bf1a..a852120ab8a 100644
--- a/docs/changelogs/v22.8.4.7-lts.md
+++ b/docs/changelogs/v22.8.4.7-lts.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.8.4.7-lts (baad27bcd2f) FIXME as compared to v22.8.3.13-lts (6a15b73faea)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#40760](https://github.com/ClickHouse/ClickHouse/issues/40760): Fix possible error 'Decimal math overflow' while parsing DateTime64. [#40546](https://github.com/ClickHouse/ClickHouse/pull/40546) ([Kruglov Pavel](https://github.com/Avogar)).
 * Backported in [#40811](https://github.com/ClickHouse/ClickHouse/issues/40811): In [#40595](https://github.com/ClickHouse/ClickHouse/issues/40595) it was reported that the `host_regexp` functionality was not working properly with a name to address resolution in `/etc/hosts`. It's fixed. [#40769](https://github.com/ClickHouse/ClickHouse/pull/40769) ([Arthur Passos](https://github.com/arthurpassos)).
diff --git a/docs/changelogs/v22.8.5.29-lts.md b/docs/changelogs/v22.8.5.29-lts.md
index b7ad3c11a46..1b59501cc28 100644
--- a/docs/changelogs/v22.8.5.29-lts.md
+++ b/docs/changelogs/v22.8.5.29-lts.md
@@ -17,7 +17,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#41157](https://github.com/ClickHouse/ClickHouse/issues/41157): Add macOS binaries to GH release assets, it fixes [#37718](https://github.com/ClickHouse/ClickHouse/issues/37718). [#41088](https://github.com/ClickHouse/ClickHouse/pull/41088) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#40866](https://github.com/ClickHouse/ClickHouse/issues/40866): - Fix crash while parsing values of type `Object` that contains arrays of variadic dimension. [#40483](https://github.com/ClickHouse/ClickHouse/pull/40483) ([Duc Canh Le](https://github.com/canhld94)).
 * Backported in [#40805](https://github.com/ClickHouse/ClickHouse/issues/40805): During insertion of a new query to the `ProcessList` allocations happen. If we reach the memory limit during these allocations we can not use `OvercommitTracker`, because `ProcessList::mutex` is already acquired. Fixes [#40611](https://github.com/ClickHouse/ClickHouse/issues/40611). [#40677](https://github.com/ClickHouse/ClickHouse/pull/40677) ([Dmitry Novik](https://github.com/novikd)).
diff --git a/docs/changelogs/v22.8.6.71-lts.md b/docs/changelogs/v22.8.6.71-lts.md
index 0337c5ba2e2..2ac6ef05bc4 100644
--- a/docs/changelogs/v22.8.6.71-lts.md
+++ b/docs/changelogs/v22.8.6.71-lts.md
@@ -16,7 +16,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#41560](https://github.com/ClickHouse/ClickHouse/issues/41560): Add `source` field to deb packages, update `nfpm`. [#41531](https://github.com/ClickHouse/ClickHouse/pull/41531) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#41284](https://github.com/ClickHouse/ClickHouse/issues/41284): Fix unused unknown columns introduced by WITH statement. This fixes [#37812](https://github.com/ClickHouse/ClickHouse/issues/37812) . [#39131](https://github.com/ClickHouse/ClickHouse/pull/39131) ([Amos Bird](https://github.com/amosbird)).
 * Backported in [#41837](https://github.com/ClickHouse/ClickHouse/issues/41837): Fix vertical merge of parts with lightweight deleted rows. [#40559](https://github.com/ClickHouse/ClickHouse/pull/40559) ([Alexander Gololobov](https://github.com/davenger)).
diff --git a/docs/changelogs/v22.8.7.34-lts.md b/docs/changelogs/v22.8.7.34-lts.md
index ee55f5d9f1f..56f03ecdf3b 100644
--- a/docs/changelogs/v22.8.7.34-lts.md
+++ b/docs/changelogs/v22.8.7.34-lts.md
@@ -17,7 +17,7 @@ sidebar_label: 2022
 * Backported in [#42296](https://github.com/ClickHouse/ClickHouse/issues/42296): Update cctz to the latest master, update tzdb to 2020e. [#42273](https://github.com/ClickHouse/ClickHouse/pull/42273) ([Dom Del Nano](https://github.com/ddelnano)).
 * Backported in [#42360](https://github.com/ClickHouse/ClickHouse/issues/42360): Update tzdata to 2022e to support the new timezone changes. Palestine transitions are now Saturdays at 02:00. Simplify three Ukraine zones into one. Jordan and Syria switch from +02/+03 with DST to year-round +03. (https://data.iana.org/time-zones/tzdb/NEWS). This closes [#42252](https://github.com/ClickHouse/ClickHouse/issues/42252). [#42327](https://github.com/ClickHouse/ClickHouse/pull/42327) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#42489](https://github.com/ClickHouse/ClickHouse/issues/42489): Removed skipping of mutations in unaffected partitions of `MergeTree` tables, because this feature never worked correctly and might cause resurrection of finished mutations. [#40589](https://github.com/ClickHouse/ClickHouse/pull/40589) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Backported in [#42121](https://github.com/ClickHouse/ClickHouse/issues/42121): Fixed "Part ... intersects part ..." error that might happen in extremely rare cases if replica was restarted just after detaching some part as broken. [#41741](https://github.com/ClickHouse/ClickHouse/pull/41741) ([Alexander Tokmakov](https://github.com/tavplubix)).
diff --git a/docs/changelogs/v22.8.8.3-lts.md b/docs/changelogs/v22.8.8.3-lts.md
index b4673eb955a..d42f333ce3f 100644
--- a/docs/changelogs/v22.8.8.3-lts.md
+++ b/docs/changelogs/v22.8.8.3-lts.md
@@ -7,6 +7,6 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.8.8.3-lts (ac5a6cababc) FIXME as compared to v22.8.7.34-lts (3c38e5e8ab9)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#42677](https://github.com/ClickHouse/ClickHouse/issues/42677): keeper-fix: fix race in accessing logs while snapshot is being installed. [#40627](https://github.com/ClickHouse/ClickHouse/pull/40627) ([Antonio Andelic](https://github.com/antonio2368)).
diff --git a/docs/changelogs/v22.8.9.24-lts.md b/docs/changelogs/v22.8.9.24-lts.md
index 585327b83a1..15935c4cf4e 100644
--- a/docs/changelogs/v22.8.9.24-lts.md
+++ b/docs/changelogs/v22.8.9.24-lts.md
@@ -17,7 +17,7 @@ sidebar_label: 2022
 * Backported in [#42964](https://github.com/ClickHouse/ClickHouse/issues/42964): Before the fix, the user-defined config was preserved by RPM in `$file.rpmsave`. The PR fixes it and won't replace the user's files from packages. [#42936](https://github.com/ClickHouse/ClickHouse/pull/42936) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#43040](https://github.com/ClickHouse/ClickHouse/issues/43040): Add a CI step to mark commits as ready for release; soft-forbid launching a release script from branches but master. [#43017](https://github.com/ClickHouse/ClickHouse/pull/43017) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#42720](https://github.com/ClickHouse/ClickHouse/issues/42720): Fixed `Unknown identifier (aggregate-function)` exception which appears when a user tries to calculate WINDOW ORDER BY/PARTITION BY expressions over aggregate functions: ``` CREATE TABLE default.tenk1 ( `unique1` Int32, `unique2` Int32, `ten` Int32 ) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192; SELECT ten, sum(unique1) + sum(unique2) AS res, rank() OVER (ORDER BY sum(unique1) + sum(unique2) ASC) AS rank FROM _complex GROUP BY ten ORDER BY ten ASC; ``` which gives: ``` Code: 47. DB::Exception: Received from localhost:9000. DB::Exception: Unknown identifier: sum(unique1); there are columns: unique1, unique2, ten: While processing sum(unique1) + sum(unique2) ASC. (UNKNOWN_IDENTIFIER) ```. [#39762](https://github.com/ClickHouse/ClickHouse/pull/39762) ([Vladimir Chebotaryov](https://github.com/quickhouse)).
 * Backported in [#42748](https://github.com/ClickHouse/ClickHouse/issues/42748): A segmentation fault related to DNS & c-ares has been reported. The below error ocurred in multiple threads: ``` 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008088 [ 356 ] {} <Fatal> BaseDaemon: ######################################## 2022-09-28 15:41:19.008,"2022.09.28 15:41:19.008147 [ 356 ] {} <Fatal> BaseDaemon: (version 22.8.5.29 (official build), build id: 92504ACA0B8E2267) (from thread 353) (no query) Received signal Segmentation fault (11)" 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008196 [ 356 ] {} <Fatal> BaseDaemon: Address: 0xf Access: write. Address not mapped to object. 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008216 [ 356 ] {} <Fatal> BaseDaemon: Stack trace: 0x188f8212 0x1626851b 0x1626a69e 0x16269b3f 0x16267eab 0x13cf8284 0x13d24afc 0x13c5217e 0x14ec2495 0x15ba440f 0x15b9d13b 0x15bb2699 0x1891ccb3 0x1891e00d 0x18ae0769 0x18ade022 0x7f76aa985609 0x7f76aa8aa133 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008274 [ 356 ] {} <Fatal> BaseDaemon: 2. Poco::Net::IPAddress::family() const @ 0x188f8212 in /usr/bin/clickhouse 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008297 [ 356 ] {} <Fatal> BaseDaemon: 3. ? @ 0x1626851b in /usr/bin/clickhouse 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008309 [ 356 ] {} <Fatal> BaseDaemon: 4. ? @ 0x1626a69e in /usr/bin/clickhouse ```. [#42234](https://github.com/ClickHouse/ClickHouse/pull/42234) ([Arthur Passos](https://github.com/arthurpassos)).
diff --git a/docs/changelogs/v22.9.2.7-stable.md b/docs/changelogs/v22.9.2.7-stable.md
index 5c4db4bfa96..bbd0a6cce32 100644
--- a/docs/changelogs/v22.9.2.7-stable.md
+++ b/docs/changelogs/v22.9.2.7-stable.md
@@ -10,7 +10,7 @@ sidebar_label: 2022
 #### Improvement
 * Backported in [#41709](https://github.com/ClickHouse/ClickHouse/issues/41709): Check file path for path traversal attacks in errors logger for input formats. [#41694](https://github.com/ClickHouse/ClickHouse/pull/41694) ([Kruglov Pavel](https://github.com/Avogar)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#41696](https://github.com/ClickHouse/ClickHouse/issues/41696): Fixes issue when docker run will fail if "https_port" is not present in config. [#41693](https://github.com/ClickHouse/ClickHouse/pull/41693) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 
diff --git a/docs/changelogs/v22.9.3.18-stable.md b/docs/changelogs/v22.9.3.18-stable.md
index 656cb1dfc22..a46dba6718c 100644
--- a/docs/changelogs/v22.9.3.18-stable.md
+++ b/docs/changelogs/v22.9.3.18-stable.md
@@ -7,7 +7,7 @@ sidebar_label: 2022
 
 ### ClickHouse release v22.9.3.18-stable (0cb4b15d2fa) FIXME as compared to v22.9.2.7-stable (362e2cefcef)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#41902](https://github.com/ClickHouse/ClickHouse/issues/41902): Fix possible crash in `SELECT` from `Merge` table with enabled `optimize_monotonous_functions_in_order_by` setting. Fixes [#41269](https://github.com/ClickHouse/ClickHouse/issues/41269). [#41740](https://github.com/ClickHouse/ClickHouse/pull/41740) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Backported in [#41863](https://github.com/ClickHouse/ClickHouse/issues/41863): 22.9 might fail to startup `ReplicatedMergeTree` table if that table was created by 20.3 or older version and was never altered, it's fixed. Fixes [#41742](https://github.com/ClickHouse/ClickHouse/issues/41742). [#41796](https://github.com/ClickHouse/ClickHouse/pull/41796) ([Alexander Tokmakov](https://github.com/tavplubix)).
diff --git a/docs/changelogs/v22.9.4.32-stable.md b/docs/changelogs/v22.9.4.32-stable.md
index 658d39af079..92bcc01e408 100644
--- a/docs/changelogs/v22.9.4.32-stable.md
+++ b/docs/changelogs/v22.9.4.32-stable.md
@@ -14,7 +14,7 @@ sidebar_label: 2022
 * Backported in [#42297](https://github.com/ClickHouse/ClickHouse/issues/42297): Update cctz to the latest master, update tzdb to 2020e. [#42273](https://github.com/ClickHouse/ClickHouse/pull/42273) ([Dom Del Nano](https://github.com/ddelnano)).
 * Backported in [#42361](https://github.com/ClickHouse/ClickHouse/issues/42361): Update tzdata to 2022e to support the new timezone changes. Palestine transitions are now Saturdays at 02:00. Simplify three Ukraine zones into one. Jordan and Syria switch from +02/+03 with DST to year-round +03. (https://data.iana.org/time-zones/tzdb/NEWS). This closes [#42252](https://github.com/ClickHouse/ClickHouse/issues/42252). [#42327](https://github.com/ClickHouse/ClickHouse/pull/42327) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#42122](https://github.com/ClickHouse/ClickHouse/issues/42122): Fixed "Part ... intersects part ..." error that might happen in extremely rare cases if replica was restarted just after detaching some part as broken. [#41741](https://github.com/ClickHouse/ClickHouse/pull/41741) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Backported in [#41938](https://github.com/ClickHouse/ClickHouse/issues/41938): Don't allow to create or alter merge tree tables with virtual column name _row_exists, which is reserved for lightweight delete. Fixed [#41716](https://github.com/ClickHouse/ClickHouse/issues/41716). [#41763](https://github.com/ClickHouse/ClickHouse/pull/41763) ([Jianmei Zhang](https://github.com/zhangjmruc)).
diff --git a/docs/changelogs/v22.9.5.25-stable.md b/docs/changelogs/v22.9.5.25-stable.md
index eb46fb893e7..90150726ace 100644
--- a/docs/changelogs/v22.9.5.25-stable.md
+++ b/docs/changelogs/v22.9.5.25-stable.md
@@ -14,7 +14,7 @@ sidebar_label: 2022
 * Backported in [#42965](https://github.com/ClickHouse/ClickHouse/issues/42965): Before the fix, the user-defined config was preserved by RPM in `$file.rpmsave`. The PR fixes it and won't replace the user's files from packages. [#42936](https://github.com/ClickHouse/ClickHouse/pull/42936) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Backported in [#43041](https://github.com/ClickHouse/ClickHouse/issues/43041): Add a CI step to mark commits as ready for release; soft-forbid launching a release script from branches but master. [#43017](https://github.com/ClickHouse/ClickHouse/pull/43017) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#42749](https://github.com/ClickHouse/ClickHouse/issues/42749): A segmentation fault related to DNS & c-ares has been reported. The below error ocurred in multiple threads: ``` 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008088 [ 356 ] {} <Fatal> BaseDaemon: ######################################## 2022-09-28 15:41:19.008,"2022.09.28 15:41:19.008147 [ 356 ] {} <Fatal> BaseDaemon: (version 22.8.5.29 (official build), build id: 92504ACA0B8E2267) (from thread 353) (no query) Received signal Segmentation fault (11)" 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008196 [ 356 ] {} <Fatal> BaseDaemon: Address: 0xf Access: write. Address not mapped to object. 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008216 [ 356 ] {} <Fatal> BaseDaemon: Stack trace: 0x188f8212 0x1626851b 0x1626a69e 0x16269b3f 0x16267eab 0x13cf8284 0x13d24afc 0x13c5217e 0x14ec2495 0x15ba440f 0x15b9d13b 0x15bb2699 0x1891ccb3 0x1891e00d 0x18ae0769 0x18ade022 0x7f76aa985609 0x7f76aa8aa133 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008274 [ 356 ] {} <Fatal> BaseDaemon: 2. Poco::Net::IPAddress::family() const @ 0x188f8212 in /usr/bin/clickhouse 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008297 [ 356 ] {} <Fatal> BaseDaemon: 3. ? @ 0x1626851b in /usr/bin/clickhouse 2022-09-28 15:41:19.008,2022.09.28 15:41:19.008309 [ 356 ] {} <Fatal> BaseDaemon: 4. ? @ 0x1626a69e in /usr/bin/clickhouse ```. [#42234](https://github.com/ClickHouse/ClickHouse/pull/42234) ([Arthur Passos](https://github.com/arthurpassos)).
 * Backported in [#42863](https://github.com/ClickHouse/ClickHouse/issues/42863): Fix lowerUTF8()/upperUTF8() in case of symbol was in between 16-byte boundary (very frequent case of you have strings > 16 bytes long). [#42812](https://github.com/ClickHouse/ClickHouse/pull/42812) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v22.9.6.20-stable.md b/docs/changelogs/v22.9.6.20-stable.md
index d450f285848..7abc4adc32e 100644
--- a/docs/changelogs/v22.9.6.20-stable.md
+++ b/docs/changelogs/v22.9.6.20-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#43052](https://github.com/ClickHouse/ClickHouse/issues/43052): Wait for all files are in sync before archiving them in integration tests. [#42891](https://github.com/ClickHouse/ClickHouse/pull/42891) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#43505](https://github.com/ClickHouse/ClickHouse/issues/43505): Fix a bug when row level filter uses default value of column. [#43387](https://github.com/ClickHouse/ClickHouse/pull/43387) ([Alexander Gololobov](https://github.com/davenger)).
 * Backported in [#43722](https://github.com/ClickHouse/ClickHouse/issues/43722): Fixed primary key analysis with conditions involving `toString(enum)`. [#43596](https://github.com/ClickHouse/ClickHouse/pull/43596) ([Nikita Taranov](https://github.com/nickitat)).
diff --git a/docs/changelogs/v22.9.7.34-stable.md b/docs/changelogs/v22.9.7.34-stable.md
index 83be449f70d..ed8173eaf50 100644
--- a/docs/changelogs/v22.9.7.34-stable.md
+++ b/docs/changelogs/v22.9.7.34-stable.md
@@ -13,7 +13,7 @@ sidebar_label: 2022
 #### Build/Testing/Packaging Improvement
 * Backported in [#44111](https://github.com/ClickHouse/ClickHouse/issues/44111): Bring sha512 sums back to the building step. [#44017](https://github.com/ClickHouse/ClickHouse/pull/44017) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#43612](https://github.com/ClickHouse/ClickHouse/issues/43612): Fix bad inefficiency of `remote_filesystem_read_method=read` with filesystem cache. Closes [#42125](https://github.com/ClickHouse/ClickHouse/issues/42125). [#42129](https://github.com/ClickHouse/ClickHouse/pull/42129) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Backported in [#43526](https://github.com/ClickHouse/ClickHouse/issues/43526): Fix incorrect UserTimeMicroseconds/SystemTimeMicroseconds accounting. [#42791](https://github.com/ClickHouse/ClickHouse/pull/42791) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v23.1.1.3077-stable.md b/docs/changelogs/v23.1.1.3077-stable.md
index e218be62f09..53ca9e1831c 100644
--- a/docs/changelogs/v23.1.1.3077-stable.md
+++ b/docs/changelogs/v23.1.1.3077-stable.md
@@ -125,7 +125,7 @@ sidebar_label: 2023
 * SQLite library is updated to the latest. It is used for the SQLite database and table integration engines. Also, fixed a false-positive TSan report. This closes [#45027](https://github.com/ClickHouse/ClickHouse/issues/45027). [#45031](https://github.com/ClickHouse/ClickHouse/pull/45031) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Fix report sending in the case when FastTest failed. [#45588](https://github.com/ClickHouse/ClickHouse/pull/45588) ([Dmitry Novik](https://github.com/novikd)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * #40651 [#41404](https://github.com/ClickHouse/ClickHouse/issues/41404). [#42126](https://github.com/ClickHouse/ClickHouse/pull/42126) ([Alexander Gololobov](https://github.com/davenger)).
 * Fix possible use-of-unitialized value after executing expressions after sorting. Closes [#43386](https://github.com/ClickHouse/ClickHouse/issues/43386) CC: @nickitat. [#43635](https://github.com/ClickHouse/ClickHouse/pull/43635) ([Kruglov Pavel](https://github.com/Avogar)).
@@ -589,4 +589,3 @@ sidebar_label: 2023
 * Resubmit "Fix possible in-use table after DETACH" [#45566](https://github.com/ClickHouse/ClickHouse/pull/45566) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Typo: "Granulesis" --> "Granules" [#45598](https://github.com/ClickHouse/ClickHouse/pull/45598) ([Robert Schulze](https://github.com/rschu1ze)).
 * Fix version in autogenerated_versions.txt [#45624](https://github.com/ClickHouse/ClickHouse/pull/45624) ([Dmitry Novik](https://github.com/novikd)).
-
diff --git a/docs/changelogs/v23.1.2.9-stable.md b/docs/changelogs/v23.1.2.9-stable.md
index 272a2b95a86..7d34a6b9ec2 100644
--- a/docs/changelogs/v23.1.2.9-stable.md
+++ b/docs/changelogs/v23.1.2.9-stable.md
@@ -13,11 +13,10 @@ sidebar_label: 2023
 #### Bug Fix
 * Backported in [#45673](https://github.com/ClickHouse/ClickHouse/issues/45673): Fix wiping sensitive info in logs. [#45603](https://github.com/ClickHouse/ClickHouse/pull/45603) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#45730](https://github.com/ClickHouse/ClickHouse/issues/45730): Fix key description when encountering duplicate primary keys. This can happen in projections. See [#45590](https://github.com/ClickHouse/ClickHouse/issues/45590) for details. [#45686](https://github.com/ClickHouse/ClickHouse/pull/45686) ([Amos Bird](https://github.com/amosbird)).
 
 #### NOT FOR CHANGELOG / INSIGNIFICANT
 
 * Trim refs/tags/ from GITHUB_TAG in release workflow [#45636](https://github.com/ClickHouse/ClickHouse/pull/45636) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-
diff --git a/docs/changelogs/v23.1.3.5-stable.md b/docs/changelogs/v23.1.3.5-stable.md
index d4f39894bec..9f8ef928138 100644
--- a/docs/changelogs/v23.1.3.5-stable.md
+++ b/docs/changelogs/v23.1.3.5-stable.md
@@ -7,11 +7,10 @@ sidebar_label: 2023
 
 ### ClickHouse release v23.1.3.5-stable (548b494bcce) FIXME as compared to v23.1.2.9-stable (8dfb1700858)
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Backported in [#45896](https://github.com/ClickHouse/ClickHouse/issues/45896): Bugfix IPv6 parser for mixed ip4 address with missed first octet (like `::.1.2.3`). [#45871](https://github.com/ClickHouse/ClickHouse/pull/45871) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 
 #### NOT FOR CHANGELOG / INSIGNIFICANT
 
 * Get rid of progress timestamps in release publishing [#45818](https://github.com/ClickHouse/ClickHouse/pull/45818) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-
diff --git a/docs/changelogs/v23.1.4.58-stable.md b/docs/changelogs/v23.1.4.58-stable.md
new file mode 100644
index 00000000000..9081d700308
--- /dev/null
+++ b/docs/changelogs/v23.1.4.58-stable.md
@@ -0,0 +1,46 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.1.4.58-stable (9ed562163a5) FIXME as compared to v23.1.3.5-stable (548b494bcce)
+
+#### Performance Improvement
+* Backported in [#46380](https://github.com/ClickHouse/ClickHouse/issues/46380): Fix too big memory usage for vertical merges on non-remote disk. Respect `max_insert_delayed_streams_for_parallel_write` for the remote disk. [#46275](https://github.com/ClickHouse/ClickHouse/pull/46275) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+
+#### Improvement
+* Backported in [#46985](https://github.com/ClickHouse/ClickHouse/issues/46985): - Apply `ALTER TABLE table_name ON CLUSTER cluster MOVE PARTITION|PART partition_expr TO DISK|VOLUME 'disk_name'` to all replicas. Because `ALTER TABLE t MOVE` is not replicated. [#46402](https://github.com/ClickHouse/ClickHouse/pull/46402) ([lizhuoyu5](https://github.com/lzydmxy)).
+* Backported in [#46778](https://github.com/ClickHouse/ClickHouse/issues/46778): Backward compatibility for T64 codec support for IPv4. [#46747](https://github.com/ClickHouse/ClickHouse/pull/46747) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backported in [#47020](https://github.com/ClickHouse/ClickHouse/issues/47020): Allow IPv4 in range(). [#46995](https://github.com/ClickHouse/ClickHouse/pull/46995) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#46031](https://github.com/ClickHouse/ClickHouse/issues/46031): Add systemd.service file for clickhouse-keeper. Fixes [#44293](https://github.com/ClickHouse/ClickHouse/issues/44293). [#45568](https://github.com/ClickHouse/ClickHouse/pull/45568) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#46477](https://github.com/ClickHouse/ClickHouse/issues/46477): Get rid of unnecessary build for standalone clickhouse-keeper. [#46367](https://github.com/ClickHouse/ClickHouse/pull/46367) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#46511](https://github.com/ClickHouse/ClickHouse/issues/46511): Some time ago the ccache compression was changed to `zst`, but `gz` archives are downloaded by default. It fixes it by prioritizing zst archive. [#46490](https://github.com/ClickHouse/ClickHouse/pull/46490) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable release)
+
+* Backported in [#46228](https://github.com/ClickHouse/ClickHouse/issues/46228): A couple of seg faults have been reported around `c-ares`. All of the recent stack traces observed fail on inserting into `std::unodered_set<>`. I believe I have found the root cause of this, it seems to be unprocessed queries. Prior to this PR, CH calls `poll` to wait on the file descriptors in the `c-ares` channel. According to the [poll docs](https://man7.org/linux/man-pages/man2/poll.2.html), a negative return value means an error has ocurred. Because of this, we would abort the execution and return failure. The problem is that `poll` will also return a negative value if a system interrupt occurs. A system interrupt does not mean the processing has failed or ended, but we would abort it anyways because we were checking for negative values. Once the execution is aborted, the whole stack is destroyed, which includes the `std::unordered_set<std::string>` passed to the `void *` parameter of the c-ares callback. Once c-ares completed the request, the callback would be invoked and would access an invalid memory address causing a segfault. [#45629](https://github.com/ClickHouse/ClickHouse/pull/45629) ([Arthur Passos](https://github.com/arthurpassos)).
+* Backported in [#46967](https://github.com/ClickHouse/ClickHouse/issues/46967): Backward compatibility - allow implicit narrowing conversion from UInt64 to IPv4 - required for "INSERT ... VALUES ..." expression. [#45865](https://github.com/ClickHouse/ClickHouse/pull/45865) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backported in [#46220](https://github.com/ClickHouse/ClickHouse/issues/46220): Fix reading of non existing nested columns with multiple level in compact parts. [#46045](https://github.com/ClickHouse/ClickHouse/pull/46045) ([Azat Khuzhin](https://github.com/azat)).
+* Backported in [#46751](https://github.com/ClickHouse/ClickHouse/issues/46751): Follow-up fix for Replace domain IP types (IPv4, IPv6) with native https://github.com/ClickHouse/ClickHouse/pull/43221. [#46087](https://github.com/ClickHouse/ClickHouse/pull/46087) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backported in [#46448](https://github.com/ClickHouse/ClickHouse/issues/46448): Fix possible `LOGICAL_ERROR` in asynchronous inserts with invalid data sent in format `VALUES`. [#46350](https://github.com/ClickHouse/ClickHouse/pull/46350) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#46680](https://github.com/ClickHouse/ClickHouse/issues/46680): Fix an invalid processing of constant `LowCardinality` argument in function `arrayMap`. This bug could lead to a segfault in release, and logical error `Bad cast` in debug build. [#46569](https://github.com/ClickHouse/ClickHouse/pull/46569) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#46873](https://github.com/ClickHouse/ClickHouse/issues/46873): Fix a bug in the `Map` data type. This closes [#46855](https://github.com/ClickHouse/ClickHouse/issues/46855). [#46856](https://github.com/ClickHouse/ClickHouse/pull/46856) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#46956](https://github.com/ClickHouse/ClickHouse/issues/46956): Fix result of LIKE predicates which translate to substring searches and contain quoted non-LIKE metacharacters. [#46875](https://github.com/ClickHouse/ClickHouse/pull/46875) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Another attempt to fix automerge, or at least to have debug footprint [#45476](https://github.com/ClickHouse/ClickHouse/pull/45476) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Support DELETE ON CLUSTER [#45786](https://github.com/ClickHouse/ClickHouse/pull/45786) ([Alexander Gololobov](https://github.com/davenger)).
+* Add check for running workflows to merge_pr.py [#45803](https://github.com/ClickHouse/ClickHouse/pull/45803) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add necessary dependency for sanitizers [#45959](https://github.com/ClickHouse/ClickHouse/pull/45959) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add helping logging to auto-merge script [#46080](https://github.com/ClickHouse/ClickHouse/pull/46080) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix write buffer destruction order for vertical merge. [#46205](https://github.com/ClickHouse/ClickHouse/pull/46205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Wait for background tasks in ~UploadHelper [#46334](https://github.com/ClickHouse/ClickHouse/pull/46334) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Improve install_check.py [#46458](https://github.com/ClickHouse/ClickHouse/pull/46458) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix dependencies for InstallPackagesTestAarch64 [#46597](https://github.com/ClickHouse/ClickHouse/pull/46597) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Get rid of legacy DocsReleaseChecks [#46665](https://github.com/ClickHouse/ClickHouse/pull/46665) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Reduce updates of Mergeable Check [#46781](https://github.com/ClickHouse/ClickHouse/pull/46781) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v23.1.5.24-stable.md b/docs/changelogs/v23.1.5.24-stable.md
new file mode 100644
index 00000000000..934e97312c0
--- /dev/null
+++ b/docs/changelogs/v23.1.5.24-stable.md
@@ -0,0 +1,27 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.1.5.24-stable (0e51b53ba99) FIXME as compared to v23.1.4.58-stable (9ed562163a5)
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#47060](https://github.com/ClickHouse/ClickHouse/issues/47060): Fix error during server startup on old distros (e.g. Amazon Linux 2) and on ARM that glibc 2.28 symbols are not found. [#47008](https://github.com/ClickHouse/ClickHouse/pull/47008) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### Bug Fix (user-visible misbehavior in official stable release)
+
+* Backported in [#46401](https://github.com/ClickHouse/ClickHouse/issues/46401): Fix `SYSTEM UNFREEZE` queries failing with the exception `CANNOT_PARSE_INPUT_ASSERTION_FAILED`. [#46325](https://github.com/ClickHouse/ClickHouse/pull/46325) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Backported in [#46905](https://github.com/ClickHouse/ClickHouse/issues/46905): - Fix incorrect alias recursion in QueryNormalizer. [#46609](https://github.com/ClickHouse/ClickHouse/pull/46609) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#47211](https://github.com/ClickHouse/ClickHouse/issues/47211): `INSERT` queries through native TCP protocol and HTTP protocol were not canceled correctly in some cases. It could lead to a partially applied query if a client canceled the query, or if a client died or, in rare cases, on network errors. As a result, it could lead to not working deduplication. Fixes [#27667](https://github.com/ClickHouse/ClickHouse/issues/27667) and [#45377](https://github.com/ClickHouse/ClickHouse/issues/45377). [#46681](https://github.com/ClickHouse/ClickHouse/pull/46681) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#47118](https://github.com/ClickHouse/ClickHouse/issues/47118): - Fix arithmetic operations in aggregate optimization with `min` and `max`. [#46705](https://github.com/ClickHouse/ClickHouse/pull/46705) ([Duc Canh Le](https://github.com/canhld94)).
+* Backported in [#46883](https://github.com/ClickHouse/ClickHouse/issues/46883): Fix MSan report in the `maxIntersections` function. This closes [#43126](https://github.com/ClickHouse/ClickHouse/issues/43126). [#46847](https://github.com/ClickHouse/ClickHouse/pull/46847) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#47361](https://github.com/ClickHouse/ClickHouse/issues/47361): Fix possible deadlock on distributed query cancellation. [#47161](https://github.com/ClickHouse/ClickHouse/pull/47161) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Use /etc/default/clickhouse in systemd too [#47003](https://github.com/ClickHouse/ClickHouse/pull/47003) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update typing for a new PyGithub version [#47123](https://github.com/ClickHouse/ClickHouse/pull/47123) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Follow-up to [#46681](https://github.com/ClickHouse/ClickHouse/issues/46681) [#47284](https://github.com/ClickHouse/ClickHouse/pull/47284) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add a manual trigger for release workflow [#47302](https://github.com/ClickHouse/ClickHouse/pull/47302) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v23.1.6.42-stable.md b/docs/changelogs/v23.1.6.42-stable.md
new file mode 100644
index 00000000000..21fb9220443
--- /dev/null
+++ b/docs/changelogs/v23.1.6.42-stable.md
@@ -0,0 +1,34 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.1.6.42-stable (783ddf67991) FIXME as compared to v23.1.5.24-stable (0e51b53ba99)
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#48215](https://github.com/ClickHouse/ClickHouse/issues/48215): Use sccache as a replacement for ccache and using S3 as cache backend. [#46240](https://github.com/ClickHouse/ClickHouse/pull/46240) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#48254](https://github.com/ClickHouse/ClickHouse/issues/48254): The `clickhouse/clickhouse-keeper` image used to be pushed only with tags `-alpine`, e.g. `latest-alpine`. As it was suggested in https://github.com/ClickHouse/examples/pull/2, now it will be pushed as suffixless too. [#48236](https://github.com/ClickHouse/ClickHouse/pull/48236) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix changing an expired role [#46772](https://github.com/ClickHouse/ClickHouse/pull/46772) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix bug in zero-copy replication disk choice during fetch [#47010](https://github.com/ClickHouse/ClickHouse/pull/47010) ([alesapin](https://github.com/alesapin)).
+* Fix NOT_IMPLEMENTED error with CROSS JOIN and algorithm = auto [#47068](https://github.com/ClickHouse/ClickHouse/pull/47068) ([Vladimir C](https://github.com/vdimir)).
+* Disable logical expression optimizer for expression with aliases. [#47451](https://github.com/ClickHouse/ClickHouse/pull/47451) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix query parameters [#47488](https://github.com/ClickHouse/ClickHouse/pull/47488) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Parameterized view bug fix 47287 47247 [#47495](https://github.com/ClickHouse/ClickHouse/pull/47495) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Fix wait for zero copy lock during move [#47631](https://github.com/ClickHouse/ClickHouse/pull/47631) ([alesapin](https://github.com/alesapin)).
+* Hotfix for too verbose warnings in HTTP [#47903](https://github.com/ClickHouse/ClickHouse/pull/47903) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Better error messages in ReplicatedMergeTreeAttachThread [#47454](https://github.com/ClickHouse/ClickHouse/pull/47454) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix `00933_test_fix_extra_seek_on_compressed_cache` in releases. [#47490](https://github.com/ClickHouse/ClickHouse/pull/47490) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a fuse for backport branches w/o a created PR [#47760](https://github.com/ClickHouse/ClickHouse/pull/47760) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Only valid Reviews.STATES overwrite existing reviews [#47789](https://github.com/ClickHouse/ClickHouse/pull/47789) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Place short return before big block, improve logging [#47822](https://github.com/ClickHouse/ClickHouse/pull/47822) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Artifacts s3 prefix [#47945](https://github.com/ClickHouse/ClickHouse/pull/47945) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix tsan error lock-order-inversion [#47953](https://github.com/ClickHouse/ClickHouse/pull/47953) ([Kruglov Pavel](https://github.com/Avogar)).
+
diff --git a/docs/changelogs/v23.1.7.30-stable.md b/docs/changelogs/v23.1.7.30-stable.md
new file mode 100644
index 00000000000..80f683f6ac8
--- /dev/null
+++ b/docs/changelogs/v23.1.7.30-stable.md
@@ -0,0 +1,28 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.1.7.30-stable (c94dba6e023) FIXME as compared to v23.1.6.42-stable (783ddf67991)
+
+#### Improvement
+* Backported in [#48161](https://github.com/ClickHouse/ClickHouse/issues/48161): Fixed `UNKNOWN_TABLE` exception when attaching to a materialized view that has dependent tables that are not available. This might be useful when trying to restore state from a backup. [#47975](https://github.com/ClickHouse/ClickHouse/pull/47975) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#48585](https://github.com/ClickHouse/ClickHouse/issues/48585): Update time zones. The following were updated: Africa/Cairo, Africa/Casablanca, Africa/El_Aaiun, America/Bogota, America/Cambridge_Bay, America/Ciudad_Juarez, America/Godthab, America/Inuvik, America/Iqaluit, America/Nuuk, America/Ojinaga, America/Pangnirtung, America/Rankin_Inlet, America/Resolute, America/Whitehorse, America/Yellowknife, Asia/Gaza, Asia/Hebron, Asia/Kuala_Lumpur, Asia/Singapore, Canada/Yukon, Egypt, Europe/Kirov, Europe/Volgograd, Singapore. [#48572](https://github.com/ClickHouse/ClickHouse/pull/48572) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#48958](https://github.com/ClickHouse/ClickHouse/issues/48958): After the recent update, the `dockerd` requires `--tlsverify=false` together with the http port explicitly. [#48924](https://github.com/ClickHouse/ClickHouse/pull/48924) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix race in grace hash join with limit [#47153](https://github.com/ClickHouse/ClickHouse/pull/47153) ([Vladimir C](https://github.com/vdimir)).
+* Fix explain graph with projection [#47473](https://github.com/ClickHouse/ClickHouse/pull/47473) ([flynn](https://github.com/ucasfl)).
+* Fix crash in polygonsSymDifferenceCartesian [#47702](https://github.com/ClickHouse/ClickHouse/pull/47702) ([pufit](https://github.com/pufit)).
+* Remove a feature [#48195](https://github.com/ClickHouse/ClickHouse/pull/48195) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* ClickHouse startup error when loading a distributed table that depends on a dictionary [#48419](https://github.com/ClickHouse/ClickHouse/pull/48419) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix possible segfault in cache [#48469](https://github.com/ClickHouse/ClickHouse/pull/48469) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix nested map for keys of IP and UUID types [#48556](https://github.com/ClickHouse/ClickHouse/pull/48556) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix bug in Keeper when a node is not created with scheme `auth` in ACL sometimes. [#48595](https://github.com/ClickHouse/ClickHouse/pull/48595) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Fix IPv4 comparable with UInt [#48611](https://github.com/ClickHouse/ClickHouse/pull/48611) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
diff --git a/docs/changelogs/v23.2.1.2537-stable.md b/docs/changelogs/v23.2.1.2537-stable.md
index 3fdcf6d6571..9da81c039ea 100644
--- a/docs/changelogs/v23.2.1.2537-stable.md
+++ b/docs/changelogs/v23.2.1.2537-stable.md
@@ -161,7 +161,7 @@ sidebar_label: 2023
 * Some time ago the ccache compression was changed to `zst`, but `gz` archives are downloaded by default. It fixes it by prioritizing zst archive. [#46490](https://github.com/ClickHouse/ClickHouse/pull/46490) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Raised the minimum Clang version needed to build ClickHouse from 12 to 15. [#46710](https://github.com/ClickHouse/ClickHouse/pull/46710) ([Robert Schulze](https://github.com/rschu1ze)).
 
-#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+#### Bug Fix (user-visible misbehavior in official stable release)
 
 * Flush data exactly by `rabbitmq_flush_interval_ms` or by `rabbitmq_max_block_size` in `StorageRabbitMQ`. Closes [#42389](https://github.com/ClickHouse/ClickHouse/issues/42389). Closes [#45160](https://github.com/ClickHouse/ClickHouse/issues/45160). [#44404](https://github.com/ClickHouse/ClickHouse/pull/44404) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * - Use PODArray to render in sparkBar function, so we can control the memory usage. Close [#44467](https://github.com/ClickHouse/ClickHouse/issues/44467). [#44489](https://github.com/ClickHouse/ClickHouse/pull/44489) ([Duc Canh Le](https://github.com/canhld94)).
@@ -470,4 +470,3 @@ sidebar_label: 2023
 #### Testing Improvement
 
 * Fixed functional test 00304_http_external_data for s390x. [#45807](https://github.com/ClickHouse/ClickHouse/pull/45807) ([Harry Lee](https://github.com/HarryLeeIBM)).
-
diff --git a/docs/changelogs/v23.2.2.20-stable.md b/docs/changelogs/v23.2.2.20-stable.md
new file mode 100644
index 00000000000..b92fbdebe33
--- /dev/null
+++ b/docs/changelogs/v23.2.2.20-stable.md
@@ -0,0 +1,29 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.2.2.20-stable (f6c269c8df2) FIXME as compared to v23.2.1.2537-stable (52bf836e03a)
+
+#### Improvement
+* Backported in [#46914](https://github.com/ClickHouse/ClickHouse/issues/46914): Allow PREWHERE for Merge with different DEFAULT expression for column. [#46831](https://github.com/ClickHouse/ClickHouse/pull/46831) ([Azat Khuzhin](https://github.com/azat)).
+* Backported in [#47022](https://github.com/ClickHouse/ClickHouse/issues/47022): Allow IPv4 in range(). [#46995](https://github.com/ClickHouse/ClickHouse/pull/46995) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
+#### Bug Fix
+* Backported in [#46828](https://github.com/ClickHouse/ClickHouse/issues/46828): Combined PREWHERE column accumulated from multiple PREWHERE in some cases didn't contain 0's from previous steps. The fix is to apply final filter if we know that it wasn't applied from more than 1 last step. [#46785](https://github.com/ClickHouse/ClickHouse/pull/46785) ([Alexander Gololobov](https://github.com/davenger)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#47062](https://github.com/ClickHouse/ClickHouse/issues/47062): Fix error during server startup on old distros (e.g. Amazon Linux 2) and on ARM that glibc 2.28 symbols are not found. [#47008](https://github.com/ClickHouse/ClickHouse/pull/47008) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### Bug Fix (user-visible misbehavior in official stable release)
+
+* Backported in [#46895](https://github.com/ClickHouse/ClickHouse/issues/46895): Fixed a bug in automatic retries of `DROP TABLE` query with `ReplicatedMergeTree` tables and `Atomic` databases. In rare cases it could lead to `Can't get data for node /zk_path/log_pointer` and `The specified key does not exist` errors if ZooKeeper session expired during DROP and a new replicated table with the same path in ZooKeeper was created in parallel. [#46384](https://github.com/ClickHouse/ClickHouse/pull/46384) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#46865](https://github.com/ClickHouse/ClickHouse/issues/46865): Fix a bug in the `Map` data type. This closes [#46855](https://github.com/ClickHouse/ClickHouse/issues/46855). [#46856](https://github.com/ClickHouse/ClickHouse/pull/46856) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#46958](https://github.com/ClickHouse/ClickHouse/issues/46958): Fix result of LIKE predicates which translate to substring searches and contain quoted non-LIKE metacharacters. [#46875](https://github.com/ClickHouse/ClickHouse/pull/46875) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* More concise logging at trace level for PREWHERE steps [#46771](https://github.com/ClickHouse/ClickHouse/pull/46771) ([Alexander Gololobov](https://github.com/davenger)).
+* Reduce updates of Mergeable Check [#46781](https://github.com/ClickHouse/ClickHouse/pull/46781) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v23.2.3.17-stable.md b/docs/changelogs/v23.2.3.17-stable.md
new file mode 100644
index 00000000000..75b7f8b2b20
--- /dev/null
+++ b/docs/changelogs/v23.2.3.17-stable.md
@@ -0,0 +1,22 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.2.3.17-stable (dec18bf7281) FIXME as compared to v23.2.2.20-stable (f6c269c8df2)
+
+#### Bug Fix (user-visible misbehavior in official stable release)
+
+* Backported in [#46907](https://github.com/ClickHouse/ClickHouse/issues/46907): - Fix incorrect alias recursion in QueryNormalizer. [#46609](https://github.com/ClickHouse/ClickHouse/pull/46609) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#47091](https://github.com/ClickHouse/ClickHouse/issues/47091): - Fix arithmetic operations in aggregate optimization with `min` and `max`. [#46705](https://github.com/ClickHouse/ClickHouse/pull/46705) ([Duc Canh Le](https://github.com/canhld94)).
+* Backported in [#46885](https://github.com/ClickHouse/ClickHouse/issues/46885): Fix MSan report in the `maxIntersections` function. This closes [#43126](https://github.com/ClickHouse/ClickHouse/issues/43126). [#46847](https://github.com/ClickHouse/ClickHouse/pull/46847) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#47067](https://github.com/ClickHouse/ClickHouse/issues/47067): Fix typo in systemd service, which causes the systemd service start to fail. [#47051](https://github.com/ClickHouse/ClickHouse/pull/47051) ([Palash Goel](https://github.com/palash-goel)).
+* Backported in [#47259](https://github.com/ClickHouse/ClickHouse/issues/47259): Fix concrete columns PREWHERE support. [#47154](https://github.com/ClickHouse/ClickHouse/pull/47154) ([Azat Khuzhin](https://github.com/azat)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Use /etc/default/clickhouse in systemd too [#47003](https://github.com/ClickHouse/ClickHouse/pull/47003) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* do flushUntrackedMemory when context switches [#47102](https://github.com/ClickHouse/ClickHouse/pull/47102) ([Sema Checherinda](https://github.com/CheSema)).
+* Update typing for a new PyGithub version [#47123](https://github.com/ClickHouse/ClickHouse/pull/47123) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v23.2.4.12-stable.md b/docs/changelogs/v23.2.4.12-stable.md
new file mode 100644
index 00000000000..1542e3257ce
--- /dev/null
+++ b/docs/changelogs/v23.2.4.12-stable.md
@@ -0,0 +1,19 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.2.4.12-stable (8fe866cb035) FIXME as compared to v23.2.3.17-stable (dec18bf7281)
+
+#### Bug Fix (user-visible misbehavior in official stable release)
+
+* Backported in [#47277](https://github.com/ClickHouse/ClickHouse/issues/47277): Fix IPv4/IPv6 serialization/deserialization in binary formats that was broken in https://github.com/ClickHouse/ClickHouse/pull/43221. Closes [#46522](https://github.com/ClickHouse/ClickHouse/issues/46522). [#46616](https://github.com/ClickHouse/ClickHouse/pull/46616) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#47212](https://github.com/ClickHouse/ClickHouse/issues/47212): `INSERT` queries through native TCP protocol and HTTP protocol were not canceled correctly in some cases. It could lead to a partially applied query if a client canceled the query, or if a client died or, in rare cases, on network errors. As a result, it could lead to not working deduplication. Fixes [#27667](https://github.com/ClickHouse/ClickHouse/issues/27667) and [#45377](https://github.com/ClickHouse/ClickHouse/issues/45377). [#46681](https://github.com/ClickHouse/ClickHouse/pull/46681) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#47363](https://github.com/ClickHouse/ClickHouse/issues/47363): Fix possible deadlock on distributed query cancellation. [#47161](https://github.com/ClickHouse/ClickHouse/pull/47161) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Follow-up to [#46681](https://github.com/ClickHouse/ClickHouse/issues/46681) [#47284](https://github.com/ClickHouse/ClickHouse/pull/47284) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add a manual trigger for release workflow [#47302](https://github.com/ClickHouse/ClickHouse/pull/47302) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v23.2.5.46-stable.md b/docs/changelogs/v23.2.5.46-stable.md
new file mode 100644
index 00000000000..b3ce585848b
--- /dev/null
+++ b/docs/changelogs/v23.2.5.46-stable.md
@@ -0,0 +1,40 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.2.5.46-stable (b50faecbb12) FIXME as compared to v23.2.4.12-stable (8fe866cb035)
+
+#### Improvement
+* Backported in [#48164](https://github.com/ClickHouse/ClickHouse/issues/48164): Fixed `UNKNOWN_TABLE` exception when attaching to a materialized view that has dependent tables that are not available. This might be useful when trying to restore state from a backup. [#47975](https://github.com/ClickHouse/ClickHouse/pull/47975) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#48216](https://github.com/ClickHouse/ClickHouse/issues/48216): Use sccache as a replacement for ccache and using S3 as cache backend. [#46240](https://github.com/ClickHouse/ClickHouse/pull/46240) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#48256](https://github.com/ClickHouse/ClickHouse/issues/48256): The `clickhouse/clickhouse-keeper` image used to be pushed only with tags `-alpine`, e.g. `latest-alpine`. As it was suggested in https://github.com/ClickHouse/examples/pull/2, now it will be pushed as suffixless too. [#48236](https://github.com/ClickHouse/ClickHouse/pull/48236) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix changing an expired role [#46772](https://github.com/ClickHouse/ClickHouse/pull/46772) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix bug in zero-copy replication disk choice during fetch [#47010](https://github.com/ClickHouse/ClickHouse/pull/47010) ([alesapin](https://github.com/alesapin)).
+* Fix NOT_IMPLEMENTED error with CROSS JOIN and algorithm = auto [#47068](https://github.com/ClickHouse/ClickHouse/pull/47068) ([Vladimir C](https://github.com/vdimir)).
+* Disable logical expression optimizer for expression with aliases. [#47451](https://github.com/ClickHouse/ClickHouse/pull/47451) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix query parameters [#47488](https://github.com/ClickHouse/ClickHouse/pull/47488) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Parameterized view bug fix 47287 47247 [#47495](https://github.com/ClickHouse/ClickHouse/pull/47495) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Proper fix for bug in parquet, revert reverted [#45878](https://github.com/ClickHouse/ClickHouse/issues/45878) [#47538](https://github.com/ClickHouse/ClickHouse/pull/47538) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix wait for zero copy lock during move [#47631](https://github.com/ClickHouse/ClickHouse/pull/47631) ([alesapin](https://github.com/alesapin)).
+* Hotfix for too verbose warnings in HTTP [#47903](https://github.com/ClickHouse/ClickHouse/pull/47903) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* fix: keeper systemd service file include invalid inline comment [#47105](https://github.com/ClickHouse/ClickHouse/pull/47105) ([SuperDJY](https://github.com/cmsxbc)).
+* Better error messages in ReplicatedMergeTreeAttachThread [#47454](https://github.com/ClickHouse/ClickHouse/pull/47454) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix `00933_test_fix_extra_seek_on_compressed_cache` in releases. [#47490](https://github.com/ClickHouse/ClickHouse/pull/47490) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix startup on older systemd versions [#47689](https://github.com/ClickHouse/ClickHouse/pull/47689) ([Thomas Casteleyn](https://github.com/Hipska)).
+* Add a fuse for backport branches w/o a created PR [#47760](https://github.com/ClickHouse/ClickHouse/pull/47760) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Only valid Reviews.STATES overwrite existing reviews [#47789](https://github.com/ClickHouse/ClickHouse/pull/47789) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Place short return before big block, improve logging [#47822](https://github.com/ClickHouse/ClickHouse/pull/47822) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Artifacts s3 prefix [#47945](https://github.com/ClickHouse/ClickHouse/pull/47945) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix tsan error lock-order-inversion [#47953](https://github.com/ClickHouse/ClickHouse/pull/47953) ([Kruglov Pavel](https://github.com/Avogar)).
+
diff --git a/docs/changelogs/v23.2.6.34-stable.md b/docs/changelogs/v23.2.6.34-stable.md
new file mode 100644
index 00000000000..c6f73da843d
--- /dev/null
+++ b/docs/changelogs/v23.2.6.34-stable.md
@@ -0,0 +1,29 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.2.6.34-stable (570190045b0) FIXME as compared to v23.2.5.46-stable (b50faecbb12)
+
+#### Improvement
+* Backported in [#48709](https://github.com/ClickHouse/ClickHouse/issues/48709): Formatter '%M' in function formatDateTime() now prints the month name instead of the minutes. This makes the behavior consistent with MySQL. The previous behavior can be restored using setting "formatdatetime_parsedatetime_m_is_month_name = 0". [#47246](https://github.com/ClickHouse/ClickHouse/pull/47246) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#48587](https://github.com/ClickHouse/ClickHouse/issues/48587): Update time zones. The following were updated: Africa/Cairo, Africa/Casablanca, Africa/El_Aaiun, America/Bogota, America/Cambridge_Bay, America/Ciudad_Juarez, America/Godthab, America/Inuvik, America/Iqaluit, America/Nuuk, America/Ojinaga, America/Pangnirtung, America/Rankin_Inlet, America/Resolute, America/Whitehorse, America/Yellowknife, Asia/Gaza, Asia/Hebron, Asia/Kuala_Lumpur, Asia/Singapore, Canada/Yukon, Egypt, Europe/Kirov, Europe/Volgograd, Singapore. [#48572](https://github.com/ClickHouse/ClickHouse/pull/48572) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#48959](https://github.com/ClickHouse/ClickHouse/issues/48959): After the recent update, the `dockerd` requires `--tlsverify=false` together with the http port explicitly. [#48924](https://github.com/ClickHouse/ClickHouse/pull/48924) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix race in grace hash join with limit [#47153](https://github.com/ClickHouse/ClickHouse/pull/47153) ([Vladimir C](https://github.com/vdimir)).
+* Fix explain graph with projection [#47473](https://github.com/ClickHouse/ClickHouse/pull/47473) ([flynn](https://github.com/ucasfl)).
+* Fix crash in polygonsSymDifferenceCartesian [#47702](https://github.com/ClickHouse/ClickHouse/pull/47702) ([pufit](https://github.com/pufit)).
+* Remove a feature [#48195](https://github.com/ClickHouse/ClickHouse/pull/48195) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix cpu usage in rabbitmq (was worsened in 23.2 after [#44404](https://github.com/ClickHouse/ClickHouse/issues/44404)) [#48311](https://github.com/ClickHouse/ClickHouse/pull/48311) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* ClickHouse startup error when loading a distributed table that depends on a dictionary [#48419](https://github.com/ClickHouse/ClickHouse/pull/48419) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix possible segfault in cache [#48469](https://github.com/ClickHouse/ClickHouse/pull/48469) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix nested map for keys of IP and UUID types [#48556](https://github.com/ClickHouse/ClickHouse/pull/48556) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix bug in Keeper when a node is not created with scheme `auth` in ACL sometimes. [#48595](https://github.com/ClickHouse/ClickHouse/pull/48595) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Fix IPv4 comparable with UInt [#48611](https://github.com/ClickHouse/ClickHouse/pull/48611) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
diff --git a/docs/changelogs/v23.3.1.2823-lts.md b/docs/changelogs/v23.3.1.2823-lts.md
new file mode 100644
index 00000000000..0c9be3601da
--- /dev/null
+++ b/docs/changelogs/v23.3.1.2823-lts.md
@@ -0,0 +1,545 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.3.1.2823-lts (46e85357ce2) FIXME as compared to v23.2.1.2537-stable (52bf836e03a)
+
+#### Backward Incompatible Change
+* Relax symbols that are allowed in URL authority in *domain*RFC()/netloc(). [#46841](https://github.com/ClickHouse/ClickHouse/pull/46841) ([Azat Khuzhin](https://github.com/azat)).
+* Prohibit create tables based on KafkaEngine with DEFAULT/EPHEMERAL/ALIAS/MATERIALIZED statements for columns. [#47138](https://github.com/ClickHouse/ClickHouse/pull/47138) ([Aleksandr Musorin](https://github.com/AVMusorin)).
+* An "asynchronous connection drain" feature is removed. Related settings and metrics are removed as well. It was an internal feature, so the removal should not affect users who had never heard about that feature. [#47486](https://github.com/ClickHouse/ClickHouse/pull/47486) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Support 256-bit Decimal data type (more than 38 digits) in `arraySum`/`Min`/`Max`/`Avg`/`Product`, `arrayCumSum`/`CumSumNonNegative`, `arrayDifference`, array construction, IN operator, query parameters, `groupArrayMovingSum`, statistical functions, `min`/`max`/`any`/`argMin`/`argMax`, PostgreSQL wire protocol, MySQL table engine and function, `sumMap`, `mapAdd`, `mapSubtract`, `arrayIntersect`. Add support for big integers in `arrayIntersect`. Statistical aggregate functions involving moments (such as `corr` or various `TTest`s) will use `Float64` as their internal representation (they were using `Decimal128` before this change, but it was pointless), and these functions can return `nan` instead of `inf` in case of infinite variance. Some functions were allowed on `Decimal256` data types but returned `Decimal128` in previous versions - now it is fixed. This closes [#47569](https://github.com/ClickHouse/ClickHouse/issues/47569). This closes [#44864](https://github.com/ClickHouse/ClickHouse/issues/44864). This closes [#28335](https://github.com/ClickHouse/ClickHouse/issues/28335). [#47594](https://github.com/ClickHouse/ClickHouse/pull/47594) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Make backup_threads/restore_threads server settings. [#47881](https://github.com/ClickHouse/ClickHouse/pull/47881) ([Azat Khuzhin](https://github.com/azat)).
+* Fix the isIPv6String function which could have outputted a false positive result in the case of an incorrect IPv6 address. For example `1234::1234:` was considered a valid IPv6 address. [#47895](https://github.com/ClickHouse/ClickHouse/pull/47895) ([Nikolay Degterinsky](https://github.com/evillique)).
+
+#### New Feature
+* Add new mode for splitting the work on replicas using settings `parallel_replicas_custom_key` and `parallel_replicas_custom_key_filter_type`. If the cluster consists of a single shard with multiple replicas, up to `max_parallel_replicas` will be randomly picked and turned into shards. For each shard, a corresponding filter is added to the query on the initiator before being sent to the shard. If the cluster consists of multiple shards, it will behave the same as `sample_key` but with the possibility to define an arbitrary key. [#45108](https://github.com/ClickHouse/ClickHouse/pull/45108) ([Antonio Andelic](https://github.com/antonio2368)).
+* Added query setting `partial_result_on_first_cancel` allowing the canceled query (e.g. due to Ctrl-C) to return a partial result. [#45689](https://github.com/ClickHouse/ClickHouse/pull/45689) ([Alexey Perevyshin](https://github.com/alexX512)).
+* Added support of arbitrary tables engines for temporary tables except for Replicated and KeeperMap engines. Partially close [#31497](https://github.com/ClickHouse/ClickHouse/issues/31497). [#46071](https://github.com/ClickHouse/ClickHouse/pull/46071) ([Roman Vasin](https://github.com/rvasin)).
+* Add replication of user-defined SQL functions using ZooKeeper. [#46085](https://github.com/ClickHouse/ClickHouse/pull/46085) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Implement `system.server_settings` (similar to `system.settings`), which will contain server configurations. [#46550](https://github.com/ClickHouse/ClickHouse/pull/46550) ([pufit](https://github.com/pufit)).
+* Intruduce a function `WIDTH_BUCKET`. [#42974](https://github.com/ClickHouse/ClickHouse/issues/42974). [#46790](https://github.com/ClickHouse/ClickHouse/pull/46790) ([avoiderboi](https://github.com/avoiderboi)).
+* Add new function parseDateTime/parseDateTimeInJodaSyntax according to specified format string. parseDateTime parses string to datetime in MySQL syntax, parseDateTimeInJodaSyntax parses in Joda syntax. [#46815](https://github.com/ClickHouse/ClickHouse/pull/46815) ([李扬](https://github.com/taiyang-li)).
+* Use `dummy UInt8` for default structure of table function `null`. Closes [#46930](https://github.com/ClickHouse/ClickHouse/issues/46930). [#47006](https://github.com/ClickHouse/ClickHouse/pull/47006) ([flynn](https://github.com/ucasfl)).
+* Dec 15, 2021 support for parseDateTimeBestEffort function. closes [#46816](https://github.com/ClickHouse/ClickHouse/issues/46816). [#47071](https://github.com/ClickHouse/ClickHouse/pull/47071) ([chen](https://github.com/xiedeyantu)).
+* Add function ULIDStringToDateTime(). Closes [#46945](https://github.com/ClickHouse/ClickHouse/issues/46945). [#47087](https://github.com/ClickHouse/ClickHouse/pull/47087) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Add settings `http_wait_end_of_query` and `http_response_buffer_size` that corresponds to URL params `wait_end_of_query` and `buffer_size` for HTTP interface. [#47108](https://github.com/ClickHouse/ClickHouse/pull/47108) ([Vladimir C](https://github.com/vdimir)).
+* Support for `UNDROP TABLE` query. Closes [#46811](https://github.com/ClickHouse/ClickHouse/issues/46811). [#47241](https://github.com/ClickHouse/ClickHouse/pull/47241) ([chen](https://github.com/xiedeyantu)).
+* Add `system.marked_dropped_tables` table that shows tables that were dropped from `Atomic` databases but were not completely removed yet. [#47364](https://github.com/ClickHouse/ClickHouse/pull/47364) ([chen](https://github.com/xiedeyantu)).
+* Add `INSTR` as alias of `positionCaseInsensitive` for MySQL compatibility. Closes [#47529](https://github.com/ClickHouse/ClickHouse/issues/47529). [#47535](https://github.com/ClickHouse/ClickHouse/pull/47535) ([flynn](https://github.com/ucasfl)).
+* Added `toDecimalString` function allowing to convert numbers to string with fixed precision. [#47838](https://github.com/ClickHouse/ClickHouse/pull/47838) ([Andrey Zvonov](https://github.com/zvonand)).
+* Added operator "REGEXP" (similar to operators "LIKE", "IN", "MOD" etc.) for better compatibility with MySQL. [#47869](https://github.com/ClickHouse/ClickHouse/pull/47869) ([Robert Schulze](https://github.com/rschu1ze)).
+* Allow executing reading pipeline for DIRECT dictionary with CLICKHOUSE source in multiple threads. To enable set `dictionary_use_async_executor=1` in `SETTINGS` section for source in `CREATE DICTIONARY` statement. [#47986](https://github.com/ClickHouse/ClickHouse/pull/47986) ([Vladimir C](https://github.com/vdimir)).
+* Add merge tree setting `max_number_of_mutatuins_for_replica`. It limit the number of part mutations per replica to the specified amount. Zero means no limit on the number of mutations per replica (the execution can still be constrained by other settings). [#48047](https://github.com/ClickHouse/ClickHouse/pull/48047) ([Vladimir C](https://github.com/vdimir)).
+
+#### Performance Improvement
+* Optimize one nullable key aggregate performance. [#45772](https://github.com/ClickHouse/ClickHouse/pull/45772) ([LiuNeng](https://github.com/liuneng1994)).
+* Implemented lowercase tokenbf_v1 index utilization for hasTokenOrNull, hasTokenCaseInsensitive and hasTokenCaseInsensitiveOrNull. [#46252](https://github.com/ClickHouse/ClickHouse/pull/46252) ([ltrk2](https://github.com/ltrk2)).
+* Optimize the generic SIMD StringSearcher by searching first two chars. [#46289](https://github.com/ClickHouse/ClickHouse/pull/46289) ([Jiebin Sun](https://github.com/jiebinn)).
+* System.detached_parts could be significant large. - added several sources with respects block size limitation - in each block iothread pool is used to calculate part size, ie to make syscalls in parallel. [#46624](https://github.com/ClickHouse/ClickHouse/pull/46624) ([Sema Checherinda](https://github.com/CheSema)).
+* Increase the default value of `max_replicated_merges_in_queue` for ReplicatedMergeTree tables from 16 to 1000. It allows faster background merge operation on clusters with a very large number of replicas, such as clusters with shared storage in ClickHouse Cloud. [#47050](https://github.com/ClickHouse/ClickHouse/pull/47050) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backups for large numbers of files were unbelievably slow in previous versions. [#47251](https://github.com/ClickHouse/ClickHouse/pull/47251) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support filter push down to left table for JOIN with StorageJoin, StorageDictionary, StorageEmbeddedRocksDB. [#47280](https://github.com/ClickHouse/ClickHouse/pull/47280) ([Maksim Kita](https://github.com/kitaisreal)).
+* Marks in memory are now compressed, using 3-6x less memory. [#47290](https://github.com/ClickHouse/ClickHouse/pull/47290) ([Michael Kolupaev](https://github.com/al13n321)).
+* Updated copier to use group by instead of distinct to get list of partitions. For large tables this reduced the select time from over 500s to under 1s. [#47386](https://github.com/ClickHouse/ClickHouse/pull/47386) ([Clayton McClure](https://github.com/cmcclure-twilio)).
+* Address https://github.com/clickhouse/clickhouse/issues/46453. bisect marked https://github.com/clickhouse/clickhouse/pull/35525 as the bad changed. this pr looks to reverse the changes in that pr. [#47544](https://github.com/ClickHouse/ClickHouse/pull/47544) ([Ongkong](https://github.com/ongkong)).
+* Fixed excessive reading in queries with `FINAL`. [#47801](https://github.com/ClickHouse/ClickHouse/pull/47801) ([Nikita Taranov](https://github.com/nickitat)).
+* Setting `max_final_threads` would be set to number of cores at server startup (by the same algorithm as we use for `max_threads`). This improves concurrency of `final` execution on servers with high number of CPUs. [#47915](https://github.com/ClickHouse/ClickHouse/pull/47915) ([Nikita Taranov](https://github.com/nickitat)).
+* Avoid breaking batches on read requests to improve performance. [#47978](https://github.com/ClickHouse/ClickHouse/pull/47978) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### Improvement
+* Add map related functions: mapFromArrays, which allows us to create map from a pair of arrays. [#31125](https://github.com/ClickHouse/ClickHouse/pull/31125) ([李扬](https://github.com/taiyang-li)).
+* Rewrite distributed sends to avoid using filesystem as a queue, use in-memory queue instead. [#45491](https://github.com/ClickHouse/ClickHouse/pull/45491) ([Azat Khuzhin](https://github.com/azat)).
+* Allow separate grants for named collections (e.g. to be able to give `SHOW/CREATE/ALTER/DROP named collection` access only to certain collections, instead of all at once). Closes [#40894](https://github.com/ClickHouse/ClickHouse/issues/40894). Add new access type `NAMED_COLLECTION_CONTROL` which is not given to default user unless explicitly added to user config (is required to be able to do `GRANT ALL`), also `show_named_collections` is no longer obligatory to be manually specified for default user to be able to have full access rights as was in 23.2. [#46241](https://github.com/ClickHouse/ClickHouse/pull/46241) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Now `X-ClickHouse-Query-Id` and `X-ClickHouse-Timezone` headers are added to response in all queries via http protocol. Previously it was done only for `SELECT` queries. [#46364](https://github.com/ClickHouse/ClickHouse/pull/46364) ([Anton Popov](https://github.com/CurtizJ)).
+* Support for connection to a replica set via a URI with a host:port enum and support for the readPreference option in MongoDB dictionaries. Example URI: mongodb://db0.example.com:27017,db1.example.com:27017,db2.example.com:27017/?replicaSet=myRepl&readPreference=primary. [#46524](https://github.com/ClickHouse/ClickHouse/pull/46524) ([artem-yadr](https://github.com/artem-yadr)).
+* Re-implement projection analysis on top of query plan. Added setting `query_plan_optimize_projection=1` to switch between old and new version. Fixes [#44963](https://github.com/ClickHouse/ClickHouse/issues/44963). [#46537](https://github.com/ClickHouse/ClickHouse/pull/46537) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Use parquet format v2 instead of v1 in output format by default. Add setting `output_format_parquet_version` to control parquet version, possible values `v1_0`, `v2_4`, `v2_6`, `v2_latest` (default). [#46617](https://github.com/ClickHouse/ClickHouse/pull/46617) ([Kruglov Pavel](https://github.com/Avogar)).
+* Not for changelog - part of [#42648](https://github.com/ClickHouse/ClickHouse/issues/42648). [#46632](https://github.com/ClickHouse/ClickHouse/pull/46632) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Allow to ignore errors while pushing to MATERILIZED VIEW (add new setting `materialized_views_ignore_errors`, by default to `false`, but it is set to `true` for flushing logs to `system.*_log` tables unconditionally). [#46658](https://github.com/ClickHouse/ClickHouse/pull/46658) ([Azat Khuzhin](https://github.com/azat)).
+* Enable input_format_json_ignore_unknown_keys_in_named_tuple by default. [#46742](https://github.com/ClickHouse/ClickHouse/pull/46742) ([Kruglov Pavel](https://github.com/Avogar)).
+* It is now possible using new configuration syntax to configure Kafka topics with periods in their name. [#46752](https://github.com/ClickHouse/ClickHouse/pull/46752) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix heuristics that check hyperscan patterns for problematic repeats. [#46819](https://github.com/ClickHouse/ClickHouse/pull/46819) ([Robert Schulze](https://github.com/rschu1ze)).
+* Don't report ZK node exists to system.errors when a block was created concurrently by a different replica. [#46820](https://github.com/ClickHouse/ClickHouse/pull/46820) ([Raúl Marín](https://github.com/Algunenano)).
+* Allow PREWHERE for Merge with different DEFAULT expression for column. [#46831](https://github.com/ClickHouse/ClickHouse/pull/46831) ([Azat Khuzhin](https://github.com/azat)).
+* Increase the limit for opened files in `clickhouse-local`. It will be able to read from `web` tables on servers with a huge number of CPU cores. Do not back off reading from the URL table engine in case of too many opened files. This closes [#46852](https://github.com/ClickHouse/ClickHouse/issues/46852). [#46853](https://github.com/ClickHouse/ClickHouse/pull/46853) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Exceptions thrown when numbers cannot be parsed now have an easier-to-read exception message. [#46917](https://github.com/ClickHouse/ClickHouse/pull/46917) ([Robert Schulze](https://github.com/rschu1ze)).
+* Added update `system.backups` after every processed task. [#46989](https://github.com/ClickHouse/ClickHouse/pull/46989) ([Aleksandr Musorin](https://github.com/AVMusorin)).
+* Allow types conversion in Native input format. Add settings `input_format_native_allow_types_conversion` that controls it (enabled by default). [#46990](https://github.com/ClickHouse/ClickHouse/pull/46990) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow IPv4 in the `range` function to generate IP ranges. [#46995](https://github.com/ClickHouse/ClickHouse/pull/46995) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Role change was not promoted sometimes before https://github.com/ClickHouse/ClickHouse/pull/46772 This PR just adds tests. [#47002](https://github.com/ClickHouse/ClickHouse/pull/47002) ([Ilya Golshtein](https://github.com/ilejn)).
+* Improve exception message when it's impossible to make part move from one volume/disk to another. [#47032](https://github.com/ClickHouse/ClickHouse/pull/47032) ([alesapin](https://github.com/alesapin)).
+* Support `Bool` type in `JSONType` function. Previously `Null` type was mistakenly returned for bool values. [#47046](https://github.com/ClickHouse/ClickHouse/pull/47046) ([Anton Popov](https://github.com/CurtizJ)).
+* Use _request_body parameter to configure predefined http queries. [#47086](https://github.com/ClickHouse/ClickHouse/pull/47086) ([Constantine Peresypkin](https://github.com/pkit)).
+* Removing logging of custom disk structure. [#47103](https://github.com/ClickHouse/ClickHouse/pull/47103) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Allow nested custom disks. Previously custom disks supported only flat disk structure. [#47106](https://github.com/ClickHouse/ClickHouse/pull/47106) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Automatic indentation in the built-in UI SQL editor when Enter is pressed. [#47113](https://github.com/ClickHouse/ClickHouse/pull/47113) ([Alexey Korepanov](https://github.com/alexkorep)).
+* Allow control compression in Parquet/ORC/Arrow output formats, support more compression for input formats. This closes [#13541](https://github.com/ClickHouse/ClickHouse/issues/13541). [#47114](https://github.com/ClickHouse/ClickHouse/pull/47114) ([Kruglov Pavel](https://github.com/Avogar)).
+* Self-extraction with 'sudo' will attempt to set uid and gid of extracted files to running user. [#47116](https://github.com/ClickHouse/ClickHouse/pull/47116) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Currently the funtion repeat's second argument must be unsigned integer type, which can not accept a integer value like -1. And this is different from the spark function, so I fix this here to make it same as spark. And it tested as below. [#47134](https://github.com/ClickHouse/ClickHouse/pull/47134) ([KevinyhZou](https://github.com/KevinyhZou)).
+* Remove `::__1` part from stacktraces. Display `std::basic_string<char, ...` as `String` in stacktraces. [#47171](https://github.com/ClickHouse/ClickHouse/pull/47171) ([Mike Kot](https://github.com/myrrc)).
+* Introduced a separate thread pool for backup IO operations. This will allow to scale it independently from other pool and increase performance. [#47174](https://github.com/ClickHouse/ClickHouse/pull/47174) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Reimplement interserver mode to avoid replay attacks (note, that change is backward compatible with older servers). [#47213](https://github.com/ClickHouse/ClickHouse/pull/47213) ([Azat Khuzhin](https://github.com/azat)).
+* Make function `optimizeregularexpression` recognize re groups and refine regexp tree dictionary. [#47218](https://github.com/ClickHouse/ClickHouse/pull/47218) ([Han Fei](https://github.com/hanfei1991)).
+* Use MultiRead request and retries for collecting metadata at final stage of backup processing. [#47243](https://github.com/ClickHouse/ClickHouse/pull/47243) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Keeper improvement: Add new 4LW `clrs` to clean resources used by Keeper (e.g. release unused memory). [#47256](https://github.com/ClickHouse/ClickHouse/pull/47256) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add optional arguments to codecs `DoubleDelta(bytes_size)`, `Gorilla(bytes_size)`, `FPC(level, float_size)`, it will allow using this codecs without column type in `clickhouse-compressor`. Fix possible abrots and arithmetic errors in `clickhouse-compressor` with these codecs. Fixes: https://github.com/ClickHouse/ClickHouse/discussions/47262. [#47271](https://github.com/ClickHouse/ClickHouse/pull/47271) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add support for big int types to runningDifference() function. Closes [#47194](https://github.com/ClickHouse/ClickHouse/issues/47194). [#47322](https://github.com/ClickHouse/ClickHouse/pull/47322) ([Nikolay Degterinsky](https://github.com/evillique)).
+* PostgreSQL replication has been adjusted to use "FROM ONLY" clause while performing initial synchronization. This prevents double-fetching the same data in case the target PostgreSQL database uses table inheritance. [#47387](https://github.com/ClickHouse/ClickHouse/pull/47387) ([Maksym Sobolyev](https://github.com/sobomax)).
+* Add an expiration window for S3 credentials that have an expiration time to avoid `ExpiredToken` errors in some edge cases. It can be controlled with `expiration_window_seconds` config, the default is 120 seconds. [#47423](https://github.com/ClickHouse/ClickHouse/pull/47423) ([Antonio Andelic](https://github.com/antonio2368)).
+* Support Decimals and Date32 in Avro format. [#47434](https://github.com/ClickHouse/ClickHouse/pull/47434) ([Kruglov Pavel](https://github.com/Avogar)).
+* Do not start the server if an interrupted conversion from `Ordinary` to `Atomic` was detected, print a better error message with troubleshooting instructions. [#47487](https://github.com/ClickHouse/ClickHouse/pull/47487) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add a new column `kind` to system.opentelemetry_span_log. This column holds the value of [SpanKind](https://opentelemetry.io/docs/reference/specification/trace/api/#spankind) defined in OpenTelemtry. [#47499](https://github.com/ClickHouse/ClickHouse/pull/47499) ([Frank Chen](https://github.com/FrankChen021)).
+* If a backup and restoring data are both in S3 then server-side copy should be used from now on. [#47546](https://github.com/ClickHouse/ClickHouse/pull/47546) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Add SSL User Certificate authentication to the native protocol. Closes [#47077](https://github.com/ClickHouse/ClickHouse/issues/47077). [#47596](https://github.com/ClickHouse/ClickHouse/pull/47596) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Allow reading/writing nested arrays in Protobuf with only root field name as column name. Previously column name should've contain all nested field names (like `a.b.c Array(Array(Array(UInt32)))`, now you can use just `a Array(Array(Array(UInt32)))`. [#47650](https://github.com/ClickHouse/ClickHouse/pull/47650) ([Kruglov Pavel](https://github.com/Avogar)).
+* Added an optional `STRICT` modifier for `SYSTEM SYNC REPLICA` which makes the query wait for replication queue to become empty (just like it worked before https://github.com/ClickHouse/ClickHouse/pull/45648). [#47659](https://github.com/ClickHouse/ClickHouse/pull/47659) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Improvement name of some span logs. [#47667](https://github.com/ClickHouse/ClickHouse/pull/47667) ([Frank Chen](https://github.com/FrankChen021)).
+* Now ReplicatedMergeTree with zero copy replication has less load to ZooKeeper. [#47676](https://github.com/ClickHouse/ClickHouse/pull/47676) ([alesapin](https://github.com/alesapin)).
+* Prevent using too long chains of aggregate function combinators (they can lead to slow queries in the analysis stage). This closes [#47715](https://github.com/ClickHouse/ClickHouse/issues/47715). [#47716](https://github.com/ClickHouse/ClickHouse/pull/47716) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support for subquery in parameterized views resolves [#46741](https://github.com/ClickHouse/ClickHouse/issues/46741) Implementation: * Updated to pass the parameter is_create_parameterized_view to subquery processing. Testing: * Added test case with subquery for parameterized view. [#47725](https://github.com/ClickHouse/ClickHouse/pull/47725) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Fix memory leak in MySQL integration (reproduces with `connection_auto_close=1`). [#47732](https://github.com/ClickHouse/ClickHouse/pull/47732) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* AST Fuzzer support fuzz `EXPLAIN` query. [#47803](https://github.com/ClickHouse/ClickHouse/pull/47803) ([flynn](https://github.com/ucasfl)).
+* Fixed error print message while Decimal parameters is incorrect. [#47812](https://github.com/ClickHouse/ClickHouse/pull/47812) ([Yu Feng](https://github.com/Vigor-jpg)).
+* Add `X-ClickHouse-Query-Id` to HTTP response when queries fails to execute. [#47813](https://github.com/ClickHouse/ClickHouse/pull/47813) ([Frank Chen](https://github.com/FrankChen021)).
+* AST fuzzer support fuzzing `SELECT` query to `EXPLAIN` query randomly. [#47852](https://github.com/ClickHouse/ClickHouse/pull/47852) ([flynn](https://github.com/ucasfl)).
+* Improved the overall performance by better utilizing local replica. And forbid reading with parallel replicas from non-replicated MergeTree by default. [#47858](https://github.com/ClickHouse/ClickHouse/pull/47858) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* More accurate CPU usage indication for client: account for usage in some long-living server threads (Segmentator) and do regular CPU accounting for every thread. [#47870](https://github.com/ClickHouse/ClickHouse/pull/47870) ([Sergei Trifonov](https://github.com/serxa)).
+* The parameter `exact_rows_before_limit` is used to make `rows_before_limit_at_least` is designed to accurately reflect the number of rows returned before the limit is reached. This pull request addresses issues encountered when the query involves distributed processing across multiple shards or sorting operations. Prior to this update, these scenarios were not functioning as intended. [#47874](https://github.com/ClickHouse/ClickHouse/pull/47874) ([Amos Bird](https://github.com/amosbird)).
+* ThreadPool metrics introspection. [#47880](https://github.com/ClickHouse/ClickHouse/pull/47880) ([Azat Khuzhin](https://github.com/azat)).
+* Add `WriteBufferFromS3Microseconds` and `WriteBufferFromS3RequestsErrors` profile events. [#47885](https://github.com/ClickHouse/ClickHouse/pull/47885) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add `--link` and `--noninteractive` (`-y`) options to clickhouse install. Closes [#47750](https://github.com/ClickHouse/ClickHouse/issues/47750). [#47887](https://github.com/ClickHouse/ClickHouse/pull/47887) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix decimal-256 text output issue on s390x. [#47932](https://github.com/ClickHouse/ClickHouse/pull/47932) ([MeenaRenganathan22](https://github.com/MeenaRenganathan22)).
+* Fixed `UNKNOWN_TABLE` exception when attaching to a materialized view that has dependent tables that are not available. This might be useful when trying to restore state from a backup. [#47975](https://github.com/ClickHouse/ClickHouse/pull/47975) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix case when (optional) path is not added to encrypted disk configuration. [#47981](https://github.com/ClickHouse/ClickHouse/pull/47981) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add *OrNull() and *OrZero() variants for parseDateTime(), add alias "str_to_date" for MySQL parity. [#48000](https://github.com/ClickHouse/ClickHouse/pull/48000) ([Robert Schulze](https://github.com/rschu1ze)).
+* Improve the code around `background_..._pool_size` settings reading. It should be configured via the main server configuration file. [#48055](https://github.com/ClickHouse/ClickHouse/pull/48055) ([filimonov](https://github.com/filimonov)).
+* Support for cte in parameterized views Implementation: * Updated to allow query parameters while evaluating scalar subqueries. Testing: * Added test case with cte for parameterized view. [#48065](https://github.com/ClickHouse/ClickHouse/pull/48065) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Add `NOSIGN` keyword for S3 table function and storage engine to avoid signing requests with provided credentials. Add `no_sign_request` config for all functionalities using S3. [#48092](https://github.com/ClickHouse/ClickHouse/pull/48092) ([Antonio Andelic](https://github.com/antonio2368)).
+* Support bin integers `(U)Int128/(U)Int256`, `Map` with any key type and `DateTime64` with any precision (not only 3 and 6). [#48119](https://github.com/ClickHouse/ClickHouse/pull/48119) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support more ClickHouse types in MsgPack format: (U)Int128/(U)Int256, Enum8(16), Date32, Decimal(32|64|128|256), Tuples. [#48124](https://github.com/ClickHouse/ClickHouse/pull/48124) ([Kruglov Pavel](https://github.com/Avogar)).
+* The output of some SHOW ... statements is now sorted. [#48127](https://github.com/ClickHouse/ClickHouse/pull/48127) ([Robert Schulze](https://github.com/rschu1ze)).
+* Allow skipping errors related to unknown enum values in row input formats. [#48133](https://github.com/ClickHouse/ClickHouse/pull/48133) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add `allow_distributed_ddl_queries` option to disallow distributed DDL queries for the cluster in the config. [#48171](https://github.com/ClickHouse/ClickHouse/pull/48171) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Determine the hosts' order in `SHOW CLUSTER` query, a followup for [#48127](https://github.com/ClickHouse/ClickHouse/issues/48127) and [#46240](https://github.com/ClickHouse/ClickHouse/issues/46240). [#48235](https://github.com/ClickHouse/ClickHouse/pull/48235) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Build/Testing/Packaging Improvement
+* Split stress test and backward compatibility check (now Upgrade check). [#44879](https://github.com/ClickHouse/ClickHouse/pull/44879) ([Kruglov Pavel](https://github.com/Avogar)).
+* Use sccache as a replacement for ccache and using S3 as cache backend. [#46240](https://github.com/ClickHouse/ClickHouse/pull/46240) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Updated Ubuntu Image. [#46784](https://github.com/ClickHouse/ClickHouse/pull/46784) ([Julio Jimenez](https://github.com/juliojimenez)).
+* Adds a prompt to allow the removal of an existing `cickhouse` download when using "curl | sh" download of ClickHouse. Prompt is "ClickHouse binary clickhouse already exists. Overwrite? [y/N] ". [#46859](https://github.com/ClickHouse/ClickHouse/pull/46859) ([Dan Roscigno](https://github.com/DanRoscigno)).
+* Fix error during server startup on old distros (e.g. Amazon Linux 2) and on ARM that glibc 2.28 symbols are not found. [#47008](https://github.com/ClickHouse/ClickHouse/pull/47008) ([Robert Schulze](https://github.com/rschu1ze)).
+* Clang 16 is set to release in the next few days, making it an opportune time to update. [#47027](https://github.com/ClickHouse/ClickHouse/pull/47027) ([Amos Bird](https://github.com/amosbird)).
+* Added a CI check which ensures ClickHouse can run with an old glibc on ARM. [#47063](https://github.com/ClickHouse/ClickHouse/pull/47063) ([Robert Schulze](https://github.com/rschu1ze)).
+* ClickHouse now builds with C++23. [#47424](https://github.com/ClickHouse/ClickHouse/pull/47424) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fixed issue with starting `clickhouse-test` against custom clickhouse binary with `-b`. ... [#47578](https://github.com/ClickHouse/ClickHouse/pull/47578) ([Vasily Nemkov](https://github.com/Enmk)).
+* Add a style check to prevent incorrect usage of the `NDEBUG` macro. [#47699](https://github.com/ClickHouse/ClickHouse/pull/47699) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Speed up the build a little. [#47714](https://github.com/ClickHouse/ClickHouse/pull/47714) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Bump vectorscan to 5.4.9. [#47955](https://github.com/ClickHouse/ClickHouse/pull/47955) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add a unit test to assert arrow fatal logging does not abort. It covers the changes in https://github.com/ClickHouse/arrow/pull/16. [#47958](https://github.com/ClickHouse/ClickHouse/pull/47958) ([Arthur Passos](https://github.com/arthurpassos)).
+* Restore ability of native macos debug server build to start (this time for real). [#48050](https://github.com/ClickHouse/ClickHouse/pull/48050) ([Robert Schulze](https://github.com/rschu1ze)).
+* Functional tests will trigger JIT compilation more frequently, in a randomized fashion. See [#48120](https://github.com/ClickHouse/ClickHouse/issues/48120). [#48196](https://github.com/ClickHouse/ClickHouse/pull/48196) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The `clickhouse/clickhouse-keeper` image used to be pushed only with tags `-alpine`, e.g. `latest-alpine`. As it was suggested in https://github.com/ClickHouse/examples/pull/2, now it will be pushed as suffixless too. [#48236](https://github.com/ClickHouse/ClickHouse/pull/48236) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix create materialized view with MaterializedPostgreSQL [#40807](https://github.com/ClickHouse/ClickHouse/pull/40807) ([Maksim Buren](https://github.com/maks-buren630501)).
+* Fix formats parser resetting, test processing bad messages in kafka [#45693](https://github.com/ClickHouse/ClickHouse/pull/45693) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix several `RENAME COLUMN` bugs. [#45911](https://github.com/ClickHouse/ClickHouse/pull/45911) ([alesapin](https://github.com/alesapin)).
+* Fix data size calculation in Keeper [#46086](https://github.com/ClickHouse/ClickHouse/pull/46086) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fixes for 993 [#46384](https://github.com/ClickHouse/ClickHouse/pull/46384) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix incorrect alias recursion in QueryNormalizer [#46609](https://github.com/ClickHouse/ClickHouse/pull/46609) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix IPv4/IPv6 serialization/deserialization in binary formats [#46616](https://github.com/ClickHouse/ClickHouse/pull/46616) ([Kruglov Pavel](https://github.com/Avogar)).
+* ActionsDAG: do not change result of and() during optimization [#46653](https://github.com/ClickHouse/ClickHouse/pull/46653) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
+* Fix queries cancellation when a client dies [#46681](https://github.com/ClickHouse/ClickHouse/pull/46681) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix arithmetic operations in aggregate optimization [#46705](https://github.com/ClickHouse/ClickHouse/pull/46705) ([Duc Canh Le](https://github.com/canhld94)).
+* Fix possible clickhouse-local abort on JSONEachRow schema inference [#46731](https://github.com/ClickHouse/ClickHouse/pull/46731) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix changing an expired role [#46772](https://github.com/ClickHouse/ClickHouse/pull/46772) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix combined PREWHERE column accumulated from multiple steps [#46785](https://github.com/ClickHouse/ClickHouse/pull/46785) ([Alexander Gololobov](https://github.com/davenger)).
+* Use initial range for fetching file size in HTTP read buffer [#46824](https://github.com/ClickHouse/ClickHouse/pull/46824) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix progress bar with URL [#46830](https://github.com/ClickHouse/ClickHouse/pull/46830) ([Antonio Andelic](https://github.com/antonio2368)).
+* Do not allow const and non-deterministic secondary indexes [#46839](https://github.com/ClickHouse/ClickHouse/pull/46839) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix MSan report in `maxIntersections` function [#46847](https://github.com/ClickHouse/ClickHouse/pull/46847) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix a bug in `Map` data type [#46856](https://github.com/ClickHouse/ClickHouse/pull/46856) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong results of some LIKE searches when the LIKE pattern contains quoted non-quotable characters [#46875](https://github.com/ClickHouse/ClickHouse/pull/46875) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix - WITH FILL would produce abort when FillingTransform processing empty block [#46897](https://github.com/ClickHouse/ClickHouse/pull/46897) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix date and int inference from string in JSON [#46972](https://github.com/ClickHouse/ClickHouse/pull/46972) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix bug in zero-copy replication disk choice during fetch [#47010](https://github.com/ClickHouse/ClickHouse/pull/47010) ([alesapin](https://github.com/alesapin)).
+* Fix typo in systemd service definition [#47051](https://github.com/ClickHouse/ClickHouse/pull/47051) ([Palash Goel](https://github.com/palash-goel)).
+* Fix NOT_IMPLEMENTED error with CROSS JOIN and algorithm = auto [#47068](https://github.com/ClickHouse/ClickHouse/pull/47068) ([Vladimir C](https://github.com/vdimir)).
+* Fix the problem that the 'ReplicatedMergeTree' table failed to insert two similar data when the 'part_type' is configured as 'InMemory' mode. [#47121](https://github.com/ClickHouse/ClickHouse/pull/47121) ([liding1992](https://github.com/liding1992)).
+* External dictionaries / library-bridge: Fix error "unknown library method 'extDict_libClone'" [#47136](https://github.com/ClickHouse/ClickHouse/pull/47136) ([alex filatov](https://github.com/phil-88)).
+* Fix race in grace hash join with limit [#47153](https://github.com/ClickHouse/ClickHouse/pull/47153) ([Vladimir C](https://github.com/vdimir)).
+* Fix concrete columns PREWHERE support [#47154](https://github.com/ClickHouse/ClickHouse/pull/47154) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible deadlock in QueryStatus [#47161](https://github.com/ClickHouse/ClickHouse/pull/47161) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backup_Restore_concurrency_check_node [#47216](https://github.com/ClickHouse/ClickHouse/pull/47216) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Forbid insert select for the same StorageJoin [#47260](https://github.com/ClickHouse/ClickHouse/pull/47260) ([Vladimir C](https://github.com/vdimir)).
+* Skip merged partitions for `min_age_to_force_merge_seconds` merges [#47303](https://github.com/ClickHouse/ClickHouse/pull/47303) ([Antonio Andelic](https://github.com/antonio2368)).
+* Modify find_first_symbols so it works as expected for find_first_not_symbols [#47304](https://github.com/ClickHouse/ClickHouse/pull/47304) ([Arthur Passos](https://github.com/arthurpassos)).
+* Fix big numbers inference in CSV [#47410](https://github.com/ClickHouse/ClickHouse/pull/47410) ([Kruglov Pavel](https://github.com/Avogar)).
+* Disable logical expression optimizer for expression with aliases. [#47451](https://github.com/ClickHouse/ClickHouse/pull/47451) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Remove a feature [#47456](https://github.com/ClickHouse/ClickHouse/pull/47456) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix error in `decodeURLComponent` [#47457](https://github.com/ClickHouse/ClickHouse/pull/47457) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix explain graph with projection [#47473](https://github.com/ClickHouse/ClickHouse/pull/47473) ([flynn](https://github.com/ucasfl)).
+* Fix query parameters [#47488](https://github.com/ClickHouse/ClickHouse/pull/47488) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Parameterized view bug fix 47287 47247 [#47495](https://github.com/ClickHouse/ClickHouse/pull/47495) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Fuzzer of data formats [#47519](https://github.com/ClickHouse/ClickHouse/pull/47519) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix monotonicity check for DateTime64 [#47526](https://github.com/ClickHouse/ClickHouse/pull/47526) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix block structure mismatch for nullable LowCardinality column  [#47537](https://github.com/ClickHouse/ClickHouse/pull/47537) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Proper fix for bug in parquet, revert reverted [#45878](https://github.com/ClickHouse/ClickHouse/issues/45878) [#47538](https://github.com/ClickHouse/ClickHouse/pull/47538) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix BSONEachRow parallel parsing when document size is invalid [#47540](https://github.com/ClickHouse/ClickHouse/pull/47540) ([Kruglov Pavel](https://github.com/Avogar)).
+* Preserve error in system.distribution_queue on SYSTEM FLUSH DISTRIBUTED [#47541](https://github.com/ClickHouse/ClickHouse/pull/47541) ([Azat Khuzhin](https://github.com/azat)).
+* Revert "Revert "Backup_Restore_concurrency_check_node"" [#47586](https://github.com/ClickHouse/ClickHouse/pull/47586) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Check for duplicate column in BSONEachRow format [#47609](https://github.com/ClickHouse/ClickHouse/pull/47609) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix wait for zero copy lock during move [#47631](https://github.com/ClickHouse/ClickHouse/pull/47631) ([alesapin](https://github.com/alesapin)).
+* Fix aggregation by partitions [#47634](https://github.com/ClickHouse/ClickHouse/pull/47634) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix bug in tuple as array serialization in BSONEachRow format [#47690](https://github.com/ClickHouse/ClickHouse/pull/47690) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix crash in polygonsSymDifferenceCartesian [#47702](https://github.com/ClickHouse/ClickHouse/pull/47702) ([pufit](https://github.com/pufit)).
+* Fix reading from storage `File` compressed files with `zlib` and `gzip` compression [#47796](https://github.com/ClickHouse/ClickHouse/pull/47796) ([Anton Popov](https://github.com/CurtizJ)).
+* Improve empty query detection for PostgreSQL (for pgx golang driver) [#47854](https://github.com/ClickHouse/ClickHouse/pull/47854) ([Azat Khuzhin](https://github.com/azat)).
+* Fix DateTime monotonicity check for LowCardinality [#47860](https://github.com/ClickHouse/ClickHouse/pull/47860) ([Antonio Andelic](https://github.com/antonio2368)).
+* Use restore_threads (not backup_threads) for RESTORE ASYNC [#47861](https://github.com/ClickHouse/ClickHouse/pull/47861) ([Azat Khuzhin](https://github.com/azat)).
+* Fix DROP COLUMN with ReplicatedMergeTree containing projections [#47883](https://github.com/ClickHouse/ClickHouse/pull/47883) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix for Replicated database recovery [#47901](https://github.com/ClickHouse/ClickHouse/pull/47901) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Hotfix for too verbose warnings in HTTP [#47903](https://github.com/ClickHouse/ClickHouse/pull/47903) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix "Field value too long" in catboostEvaluate() [#47970](https://github.com/ClickHouse/ClickHouse/pull/47970) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix [#36971](https://github.com/ClickHouse/ClickHouse/issues/36971): Watchdog: exit with non-zero code if child process exits [#47973](https://github.com/ClickHouse/ClickHouse/pull/47973) ([Коренберг Марк](https://github.com/socketpair)).
+* Fix for index file cidx is unexpectedly long [#48010](https://github.com/ClickHouse/ClickHouse/pull/48010) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* fix MaterializedPostgreSQL query to get attributes (replica-identity) [#48015](https://github.com/ClickHouse/ClickHouse/pull/48015) ([Solomatov Sergei](https://github.com/solomatovs)).
+* parseDateTime(): Fix UB (signed integer overflow) [#48019](https://github.com/ClickHouse/ClickHouse/pull/48019) ([Robert Schulze](https://github.com/rschu1ze)).
+* Use uniq names for Records in Avro to avoid reusing its schema [#48057](https://github.com/ClickHouse/ClickHouse/pull/48057) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix crash in explain graph with StorageMerge [#48102](https://github.com/ClickHouse/ClickHouse/pull/48102) ([Vladimir C](https://github.com/vdimir)).
+* Correctly set TCP/HTTP socket timeouts in Keeper [#48108](https://github.com/ClickHouse/ClickHouse/pull/48108) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix possible member call on null pointer in Avro format [#48184](https://github.com/ClickHouse/ClickHouse/pull/48184) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### Build Improvement
+
+* Update krb5 to 1.20.1-final to mitigate CVE-2022-42898. [#46485](https://github.com/ClickHouse/ClickHouse/pull/46485) ([MeenaRenganathan22](https://github.com/MeenaRenganathan22)).
+* Fixed random crash issues caused by bad pointers in libunwind for s390x. [#46755](https://github.com/ClickHouse/ClickHouse/pull/46755) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fixed http xz compression issue for s390x. [#46832](https://github.com/ClickHouse/ClickHouse/pull/46832) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fixed murmurhash function for s390x. [#47036](https://github.com/ClickHouse/ClickHouse/pull/47036) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fixed halfMD5 and broken cityHash function for s390x. [#47115](https://github.com/ClickHouse/ClickHouse/pull/47115) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fixed farmhash functions for s390x. [#47223](https://github.com/ClickHouse/ClickHouse/pull/47223) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fixed endian issue in hashing tuples for s390x. [#47371](https://github.com/ClickHouse/ClickHouse/pull/47371) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fixed SipHash integer hashing issue and byte order issue in random integer data from GenerateRandom storage engine for s390x. [#47576](https://github.com/ClickHouse/ClickHouse/pull/47576) ([Harry Lee](https://github.com/HarryLeeIBM)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Fix several `RENAME COLUMN` bugs."'. [#46909](https://github.com/ClickHouse/ClickHouse/pull/46909) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Add join_algorithm='grace_hash' to stress tests"'. [#46988](https://github.com/ClickHouse/ClickHouse/pull/46988) ([Pradeep Chhetri](https://github.com/chhetripradeep)).
+* NO CL ENTRY:  'Revert "Give users option of overwriting"'. [#47169](https://github.com/ClickHouse/ClickHouse/pull/47169) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "standardize admonitions"'. [#47413](https://github.com/ClickHouse/ClickHouse/pull/47413) ([Rich Raposa](https://github.com/rfraposa)).
+* NO CL ENTRY:  'Revert "Backup_Restore_concurrency_check_node"'. [#47581](https://github.com/ClickHouse/ClickHouse/pull/47581) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Update storing-data.md'. [#47598](https://github.com/ClickHouse/ClickHouse/pull/47598) ([San](https://github.com/santrancisco)).
+* NO CL ENTRY:  'Revert "Fix BSONEachRow parallel parsing when document size is invalid"'. [#47672](https://github.com/ClickHouse/ClickHouse/pull/47672) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "New navigation"'. [#47694](https://github.com/ClickHouse/ClickHouse/pull/47694) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Analyzer planner fixes before enable by default"'. [#47721](https://github.com/ClickHouse/ClickHouse/pull/47721) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Revert "Analyzer planner fixes before enable by default""'. [#47748](https://github.com/ClickHouse/ClickHouse/pull/47748) ([Maksim Kita](https://github.com/kitaisreal)).
+* NO CL ENTRY:  'Revert "Add sanity checks for writing number in variable length format"'. [#47850](https://github.com/ClickHouse/ClickHouse/pull/47850) ([Robert Schulze](https://github.com/rschu1ze)).
+* NO CL ENTRY:  'Revert "Revert "Revert "Backup_Restore_concurrency_check_node"""'. [#47963](https://github.com/ClickHouse/ClickHouse/pull/47963) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Test differences between using materialize_ttl_recalculate_only=1/0 [#45304](https://github.com/ClickHouse/ClickHouse/pull/45304) ([Jordi Villar](https://github.com/jrdi)).
+* Fix query in stress script [#45480](https://github.com/ClickHouse/ClickHouse/pull/45480) ([Pradeep Chhetri](https://github.com/chhetripradeep)).
+* Add join_algorithm='grace_hash' to stress tests [#45607](https://github.com/ClickHouse/ClickHouse/pull/45607) ([Pradeep Chhetri](https://github.com/chhetripradeep)).
+* Support `group_by_use_nulls` setting in new analyzer [#45910](https://github.com/ClickHouse/ClickHouse/pull/45910) ([Dmitry Novik](https://github.com/novikd)).
+* Randomize setting `ratio_of_defaults_for_sparse_serialization` [#46118](https://github.com/ClickHouse/ClickHouse/pull/46118) ([Anton Popov](https://github.com/CurtizJ)).
+* Add CrossToInnerJoinPass [#46408](https://github.com/ClickHouse/ClickHouse/pull/46408) ([Vladimir C](https://github.com/vdimir)).
+* Fix flakiness of test_backup_restore_on_cluster/test_disallow_concurrency [#46517](https://github.com/ClickHouse/ClickHouse/pull/46517) ([Azat Khuzhin](https://github.com/azat)).
+* Map field to string fix [#46618](https://github.com/ClickHouse/ClickHouse/pull/46618) ([Maksim Kita](https://github.com/kitaisreal)).
+* Enable perf tests added in [#45364](https://github.com/ClickHouse/ClickHouse/issues/45364) [#46623](https://github.com/ClickHouse/ClickHouse/pull/46623) ([Nikita Taranov](https://github.com/nickitat)).
+* Logical expression optimizer in new analyzer [#46644](https://github.com/ClickHouse/ClickHouse/pull/46644) ([Antonio Andelic](https://github.com/antonio2368)).
+* Named collections: finish replacing old code for storages [#46647](https://github.com/ClickHouse/ClickHouse/pull/46647) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Make tiny improvements [#46659](https://github.com/ClickHouse/ClickHouse/pull/46659) ([ltrk2](https://github.com/ltrk2)).
+* Fix openssl/s390x build (setenv + link order) [#46684](https://github.com/ClickHouse/ClickHouse/pull/46684) ([Boris Kuschel](https://github.com/bkuschel)).
+* Analyzer AutoFinalOnQueryPass fix [#46729](https://github.com/ClickHouse/ClickHouse/pull/46729) ([Maksim Kita](https://github.com/kitaisreal)).
+* Mark failed build reports as pending on reruns [#46736](https://github.com/ClickHouse/ClickHouse/pull/46736) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Do not reanalyze expressions from aggregation in projection [#46738](https://github.com/ClickHouse/ClickHouse/pull/46738) ([Vladimir C](https://github.com/vdimir)).
+* Update CHANGELOG.md [#46766](https://github.com/ClickHouse/ClickHouse/pull/46766) ([Ilya Yatsishin](https://github.com/qoega)).
+* Poco: Remove some dead code [#46768](https://github.com/ClickHouse/ClickHouse/pull/46768) ([Robert Schulze](https://github.com/rschu1ze)).
+* More concise logging at trace level for PREWHERE steps [#46771](https://github.com/ClickHouse/ClickHouse/pull/46771) ([Alexander Gololobov](https://github.com/davenger)).
+* Follow-up to [#41534](https://github.com/ClickHouse/ClickHouse/issues/41534) [#46775](https://github.com/ClickHouse/ClickHouse/pull/46775) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix timeout for all expect tests (wrong usage of expect_after timeout) [#46779](https://github.com/ClickHouse/ClickHouse/pull/46779) ([Azat Khuzhin](https://github.com/azat)).
+* Reduce updates of Mergeable Check [#46781](https://github.com/ClickHouse/ClickHouse/pull/46781) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Updated Slack invite link [#46783](https://github.com/ClickHouse/ClickHouse/pull/46783) ([clickhouse-adrianfraguela](https://github.com/clickhouse-adrianfraguela)).
+* Print all stacktraces in hung check [#46787](https://github.com/ClickHouse/ClickHouse/pull/46787) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Quick temporary fix for stress tests [#46789](https://github.com/ClickHouse/ClickHouse/pull/46789) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Update version after release [#46792](https://github.com/ClickHouse/ClickHouse/pull/46792) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update version_date.tsv and changelogs after v23.2.1.2537-stable [#46794](https://github.com/ClickHouse/ClickHouse/pull/46794) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Remove ZSTD version from CMake output [#46796](https://github.com/ClickHouse/ClickHouse/pull/46796) ([Robert Schulze](https://github.com/rschu1ze)).
+* Update version_date.tsv and changelogs after v22.11.6.44-stable [#46801](https://github.com/ClickHouse/ClickHouse/pull/46801) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* CMake: Add best effort checks that the build machine isn't too old [#46803](https://github.com/ClickHouse/ClickHouse/pull/46803) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix async reading pipeline when small limit is present [#46804](https://github.com/ClickHouse/ClickHouse/pull/46804) ([Nikita Taranov](https://github.com/nickitat)).
+* Cleanup string search code [#46814](https://github.com/ClickHouse/ClickHouse/pull/46814) ([Robert Schulze](https://github.com/rschu1ze)).
+* Stateless cmake version [#46821](https://github.com/ClickHouse/ClickHouse/pull/46821) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* refine regexp tree dictionary [#46822](https://github.com/ClickHouse/ClickHouse/pull/46822) ([Han Fei](https://github.com/hanfei1991)).
+* Non-significant change [#46844](https://github.com/ClickHouse/ClickHouse/pull/46844) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a trap [#46845](https://github.com/ClickHouse/ClickHouse/pull/46845) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Better handling of fatal errors [#46846](https://github.com/ClickHouse/ClickHouse/pull/46846) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a test for [#43184](https://github.com/ClickHouse/ClickHouse/issues/43184) [#46848](https://github.com/ClickHouse/ClickHouse/pull/46848) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong function name [#46849](https://github.com/ClickHouse/ClickHouse/pull/46849) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a test for [#45214](https://github.com/ClickHouse/ClickHouse/issues/45214) [#46850](https://github.com/ClickHouse/ClickHouse/pull/46850) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Final fixes for expect tests [#46857](https://github.com/ClickHouse/ClickHouse/pull/46857) ([Azat Khuzhin](https://github.com/azat)).
+* Small optimization of LIKE patterns with > 1 trailing % [#46869](https://github.com/ClickHouse/ClickHouse/pull/46869) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add new metrics to system.asynchronous_metrics [#46886](https://github.com/ClickHouse/ClickHouse/pull/46886) ([Azat Khuzhin](https://github.com/azat)).
+* Fix flaky `test_concurrent_queries_restriction_by_query_kind` [#46887](https://github.com/ClickHouse/ClickHouse/pull/46887) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix test test_async_backups_to_same_destination. [#46888](https://github.com/ClickHouse/ClickHouse/pull/46888) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Make ASTSelectQuery::formatImpl() more robust [#46889](https://github.com/ClickHouse/ClickHouse/pull/46889) ([Robert Schulze](https://github.com/rschu1ze)).
+* tests: fix 02116_interactive_hello for "official build" [#46911](https://github.com/ClickHouse/ClickHouse/pull/46911) ([Azat Khuzhin](https://github.com/azat)).
+* Fix some expect tests leftovers and enable them in fasttest [#46915](https://github.com/ClickHouse/ClickHouse/pull/46915) ([Azat Khuzhin](https://github.com/azat)).
+* Increase ddl timeout for DROP statement in backup restore tests [#46920](https://github.com/ClickHouse/ClickHouse/pull/46920) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* A better alternative to [#46344](https://github.com/ClickHouse/ClickHouse/issues/46344) [#46921](https://github.com/ClickHouse/ClickHouse/pull/46921) ([Robert Schulze](https://github.com/rschu1ze)).
+* Code review from @tavplubix [#46922](https://github.com/ClickHouse/ClickHouse/pull/46922) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Planner: trivial count optimization [#46923](https://github.com/ClickHouse/ClickHouse/pull/46923) ([Igor Nikonov](https://github.com/devcrafter)).
+* Typo: SIZES_OF_ARRAYS_DOESNT_MATCH --> SIZES_OF_ARRAYS_DONT_MATCH [#46940](https://github.com/ClickHouse/ClickHouse/pull/46940) ([Robert Schulze](https://github.com/rschu1ze)).
+* Another fix for clone() for ASTColumnMatchers [#46947](https://github.com/ClickHouse/ClickHouse/pull/46947) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Un-inline likePatternToRegexp() [#46950](https://github.com/ClickHouse/ClickHouse/pull/46950) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix missing format_description [#46959](https://github.com/ClickHouse/ClickHouse/pull/46959) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* ARM: Activate LDAPR with -march flag instead via -XClang [#46960](https://github.com/ClickHouse/ClickHouse/pull/46960) ([Robert Schulze](https://github.com/rschu1ze)).
+* Preset description on the tweak reset [#46963](https://github.com/ClickHouse/ClickHouse/pull/46963) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update version_date.tsv and changelogs after v22.3.19.6-lts [#46964](https://github.com/ClickHouse/ClickHouse/pull/46964) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v22.8.14.53-lts [#46969](https://github.com/ClickHouse/ClickHouse/pull/46969) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Better exception messages when schema_inference_hints is ill-formatted [#46971](https://github.com/ClickHouse/ClickHouse/pull/46971) ([Kruglov Pavel](https://github.com/Avogar)).
+* Decrease log level in "disks" [#46976](https://github.com/ClickHouse/ClickHouse/pull/46976) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Change the cherry-pick PR body [#46977](https://github.com/ClickHouse/ClickHouse/pull/46977) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Rename recent stateless tests to fix order [#46991](https://github.com/ClickHouse/ClickHouse/pull/46991) ([Kruglov Pavel](https://github.com/Avogar)).
+* Pass headers from StorageURL to WriteBufferFromHTTP [#46996](https://github.com/ClickHouse/ClickHouse/pull/46996) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Change level log in executeQuery [#46997](https://github.com/ClickHouse/ClickHouse/pull/46997) ([Andrey Bystrov](https://github.com/AndyBys)).
+* Add thevar1able to trusted contributors [#46998](https://github.com/ClickHouse/ClickHouse/pull/46998) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Use /etc/default/clickhouse in systemd too [#47003](https://github.com/ClickHouse/ClickHouse/pull/47003) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix tmp_path_template in HTTPHandler::processQuery [#47007](https://github.com/ClickHouse/ClickHouse/pull/47007) ([Vladimir C](https://github.com/vdimir)).
+* Fix flaky azure test [#47011](https://github.com/ClickHouse/ClickHouse/pull/47011) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Temporary enable force_sync for keeper in CI [#47024](https://github.com/ClickHouse/ClickHouse/pull/47024) ([alesapin](https://github.com/alesapin)).
+* ActionsDAG: do not change result of and() during optimization - part 2 [#47028](https://github.com/ClickHouse/ClickHouse/pull/47028) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
+* Add upgrade check to stateful dependent field [#47031](https://github.com/ClickHouse/ClickHouse/pull/47031) ([Kruglov Pavel](https://github.com/Avogar)).
+* Disable path check in SQLite storage for clickhouse-local [#47052](https://github.com/ClickHouse/ClickHouse/pull/47052) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Terminate long-running offline non-busy runners in EC2 [#47064](https://github.com/ClickHouse/ClickHouse/pull/47064) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix Keeper with `force_sync = false` [#47065](https://github.com/ClickHouse/ClickHouse/pull/47065) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update version_date.tsv and changelogs after v23.2.2.20-stable [#47069](https://github.com/ClickHouse/ClickHouse/pull/47069) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.1.4.58-stable [#47070](https://github.com/ClickHouse/ClickHouse/pull/47070) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v22.12.4.76-stable [#47074](https://github.com/ClickHouse/ClickHouse/pull/47074) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Fix empty result when selection from only one side of join in analyzer [#47093](https://github.com/ClickHouse/ClickHouse/pull/47093) ([Vladimir C](https://github.com/vdimir)).
+* Suppress "Cannot flush" for Distributed tables in upgrade check [#47095](https://github.com/ClickHouse/ClickHouse/pull/47095) ([Azat Khuzhin](https://github.com/azat)).
+* Make stacktraces in hung check more readable [#47096](https://github.com/ClickHouse/ClickHouse/pull/47096) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* release lambda resources before detaching thread group [#47098](https://github.com/ClickHouse/ClickHouse/pull/47098) ([Sema Checherinda](https://github.com/CheSema)).
+* Analyzer Planner fixes before enable by default [#47101](https://github.com/ClickHouse/ClickHouse/pull/47101) ([Maksim Kita](https://github.com/kitaisreal)).
+* do flushUntrackedMemory when context switches [#47102](https://github.com/ClickHouse/ClickHouse/pull/47102) ([Sema Checherinda](https://github.com/CheSema)).
+* fix: keeper systemd service file include invalid inline comment [#47105](https://github.com/ClickHouse/ClickHouse/pull/47105) ([SuperDJY](https://github.com/cmsxbc)).
+* Add code for autoscaling lambda [#47107](https://github.com/ClickHouse/ClickHouse/pull/47107) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Enable lightweight delete support by default [#47109](https://github.com/ClickHouse/ClickHouse/pull/47109) ([Alexander Gololobov](https://github.com/davenger)).
+* Update typing for a new PyGithub version [#47123](https://github.com/ClickHouse/ClickHouse/pull/47123) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Shorten some code with CTAD [#47139](https://github.com/ClickHouse/ClickHouse/pull/47139) ([Robert Schulze](https://github.com/rschu1ze)).
+* Make 01710_projections more stable. [#47145](https://github.com/ClickHouse/ClickHouse/pull/47145) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* fix_JSON_searchField [#47147](https://github.com/ClickHouse/ClickHouse/pull/47147) ([Aleksei Tikhomirov](https://github.com/aletik256)).
+* Mark 01771_bloom_filter_not_has as no-parallel and long [#47148](https://github.com/ClickHouse/ClickHouse/pull/47148) ([Azat Khuzhin](https://github.com/azat)).
+* Use unique names and paths in `test_replicated_database` [#47152](https://github.com/ClickHouse/ClickHouse/pull/47152) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add stupid retries in clickhouse-test health check. [#47158](https://github.com/ClickHouse/ClickHouse/pull/47158) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* 02346_full_text_search.sql: Add result separators to simplify analysis [#47166](https://github.com/ClickHouse/ClickHouse/pull/47166) ([Robert Schulze](https://github.com/rschu1ze)).
+* More correct handling of fatal errors [#47175](https://github.com/ClickHouse/ClickHouse/pull/47175) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update read in StorageMemory [#47180](https://github.com/ClickHouse/ClickHouse/pull/47180) ([Konstantin Morozov](https://github.com/k-morozov)).
+* Doc update for mapFromArrays() [#47183](https://github.com/ClickHouse/ClickHouse/pull/47183) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix failure context for Upgrade check [#47191](https://github.com/ClickHouse/ClickHouse/pull/47191) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add support for different expected errors [#47196](https://github.com/ClickHouse/ClickHouse/pull/47196) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix ip coding on s390x [#47208](https://github.com/ClickHouse/ClickHouse/pull/47208) ([Suzy Wang](https://github.com/SuzyWangIBMer)).
+* Add real client (initiator server) address into the logs for interserver mode [#47214](https://github.com/ClickHouse/ClickHouse/pull/47214) ([Azat Khuzhin](https://github.com/azat)).
+* Fix 01019_alter_materialized_view_consistent [#47215](https://github.com/ClickHouse/ClickHouse/pull/47215) ([Vladimir C](https://github.com/vdimir)).
+* Fix RewriteArrayExistsToHasPass [#47225](https://github.com/ClickHouse/ClickHouse/pull/47225) ([Maksim Kita](https://github.com/kitaisreal)).
+* Release shared ptrs after finishing a transaction [#47245](https://github.com/ClickHouse/ClickHouse/pull/47245) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add default constructor for `MultiReadResponse` [#47254](https://github.com/ClickHouse/ClickHouse/pull/47254) ([Antonio Andelic](https://github.com/antonio2368)).
+* Join threads if exception happened in `ZooKeeperImpl` constructor [#47261](https://github.com/ClickHouse/ClickHouse/pull/47261) ([Antonio Andelic](https://github.com/antonio2368)).
+* use std::lerp, constexpr hex.h [#47268](https://github.com/ClickHouse/ClickHouse/pull/47268) ([Mike Kot](https://github.com/myrrc)).
+* Update version_date.tsv and changelogs after v23.2.3.17-stable [#47269](https://github.com/ClickHouse/ClickHouse/pull/47269) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Fix bug in zero copy replica which can lead to dataloss [#47274](https://github.com/ClickHouse/ClickHouse/pull/47274) ([alesapin](https://github.com/alesapin)).
+* Fix typo [#47282](https://github.com/ClickHouse/ClickHouse/pull/47282) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Follow-up to [#46681](https://github.com/ClickHouse/ClickHouse/issues/46681) [#47284](https://github.com/ClickHouse/ClickHouse/pull/47284) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix test 02566_ipv4_ipv6_binary_formats [#47295](https://github.com/ClickHouse/ClickHouse/pull/47295) ([Kruglov Pavel](https://github.com/Avogar)).
+* Set fixed index_granularity for test 00636 [#47298](https://github.com/ClickHouse/ClickHouse/pull/47298) ([Sema Checherinda](https://github.com/CheSema)).
+* Add a manual trigger for release workflow [#47302](https://github.com/ClickHouse/ClickHouse/pull/47302) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix 02570_fallback_from_async_insert [#47308](https://github.com/ClickHouse/ClickHouse/pull/47308) ([Vladimir C](https://github.com/vdimir)).
+* Catch exceptions in LiveViewPeriodicRefreshTask [#47309](https://github.com/ClickHouse/ClickHouse/pull/47309) ([Vladimir C](https://github.com/vdimir)).
+* Fix MergeTreeTransaction::isReadOnly [#47310](https://github.com/ClickHouse/ClickHouse/pull/47310) ([Vladimir C](https://github.com/vdimir)).
+* Fix an assertion with implicit transactions in interserver mode [#47312](https://github.com/ClickHouse/ClickHouse/pull/47312) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix `File exists` error in Upgrade check [#47314](https://github.com/ClickHouse/ClickHouse/pull/47314) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Support transformQueryForExternalDatabase for analyzer [#47316](https://github.com/ClickHouse/ClickHouse/pull/47316) ([Vladimir C](https://github.com/vdimir)).
+* Disable parallel format in health check [#47318](https://github.com/ClickHouse/ClickHouse/pull/47318) ([Ilya Yatsishin](https://github.com/qoega)).
+* Analyzer - fix combine logic for limit expression and limit setting [#47324](https://github.com/ClickHouse/ClickHouse/pull/47324) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Suppress expected errors from test 01111 in Upgrade check [#47365](https://github.com/ClickHouse/ClickHouse/pull/47365) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix GROUPING function initialization for grouping sets [#47370](https://github.com/ClickHouse/ClickHouse/pull/47370) ([Dmitry Novik](https://github.com/novikd)).
+* Add join_algorithm='grace_hash' to stress tests [#47372](https://github.com/ClickHouse/ClickHouse/pull/47372) ([Pradeep Chhetri](https://github.com/chhetripradeep)).
+* Fix 02343_group_by_use_nulls test in new analyzer [#47373](https://github.com/ClickHouse/ClickHouse/pull/47373) ([Dmitry Novik](https://github.com/novikd)).
+* Disable 02368_cancel_write_into_hdfs in stress tests [#47382](https://github.com/ClickHouse/ClickHouse/pull/47382) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Analyzer planner fixes before enable by default [#47383](https://github.com/ClickHouse/ClickHouse/pull/47383) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix `ALTER CLEAR COLUMN` with sparse columns [#47384](https://github.com/ClickHouse/ClickHouse/pull/47384) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix: apply reading in order for distinct [#47385](https://github.com/ClickHouse/ClickHouse/pull/47385) ([Igor Nikonov](https://github.com/devcrafter)).
+* add checks for ptr [#47398](https://github.com/ClickHouse/ClickHouse/pull/47398) ([Sema Checherinda](https://github.com/CheSema)).
+* Remove distinct on top of MergingAggregatedStep [#47399](https://github.com/ClickHouse/ClickHouse/pull/47399) ([Igor Nikonov](https://github.com/devcrafter)).
+* Update LRUFileCachePriority.cpp [#47411](https://github.com/ClickHouse/ClickHouse/pull/47411) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Make test 02473_optimize_old_parts less flaky [#47416](https://github.com/ClickHouse/ClickHouse/pull/47416) ([Michael Kolupaev](https://github.com/al13n321)).
+* Add test to prevent regressions when using bitmapHasAny [#47419](https://github.com/ClickHouse/ClickHouse/pull/47419) ([Jordi Villar](https://github.com/jrdi)).
+* Update README.md [#47421](https://github.com/ClickHouse/ClickHouse/pull/47421) ([Tyler Hannan](https://github.com/tylerhannan)).
+* Refactor query cache (make use of CacheBase) [#47428](https://github.com/ClickHouse/ClickHouse/pull/47428) ([Robert Schulze](https://github.com/rschu1ze)).
+* Suppress Hung Check with UBsan [#47429](https://github.com/ClickHouse/ClickHouse/pull/47429) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* [docs] Document add async_insert_max_query_number [#47431](https://github.com/ClickHouse/ClickHouse/pull/47431) ([Antonio Bonuccelli](https://github.com/nellicus)).
+* Apply settings for EXPLAIN earlier (in the same way we do for SELECT). [#47433](https://github.com/ClickHouse/ClickHouse/pull/47433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Update version_date.tsv and changelogs after v23.2.4.12-stable [#47448](https://github.com/ClickHouse/ClickHouse/pull/47448) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Fix aggregation-in-order with aliases. [#47449](https://github.com/ClickHouse/ClickHouse/pull/47449) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix 01429_join_on_error_messages [#47450](https://github.com/ClickHouse/ClickHouse/pull/47450) ([Vladimir C](https://github.com/vdimir)).
+* Update version_date.tsv and changelogs after v23.1.5.24-stable [#47452](https://github.com/ClickHouse/ClickHouse/pull/47452) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v22.12.5.34-stable [#47453](https://github.com/ClickHouse/ClickHouse/pull/47453) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Better error messages in ReplicatedMergeTreeAttachThread [#47454](https://github.com/ClickHouse/ClickHouse/pull/47454) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update version_date.tsv and changelogs after v22.8.15.23-lts [#47455](https://github.com/ClickHouse/ClickHouse/pull/47455) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Disable grace hash join in upgrade check [#47474](https://github.com/ClickHouse/ClickHouse/pull/47474) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Revert [#46622](https://github.com/ClickHouse/ClickHouse/issues/46622) (test_async_insert_memory) [#47476](https://github.com/ClickHouse/ClickHouse/pull/47476) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix `00933_test_fix_extra_seek_on_compressed_cache` in releases. [#47490](https://github.com/ClickHouse/ClickHouse/pull/47490) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix long test `02371_select_projection_normal_agg.sql` [#47491](https://github.com/ClickHouse/ClickHouse/pull/47491) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Revert [#45878](https://github.com/ClickHouse/ClickHouse/issues/45878) and add a test [#47492](https://github.com/ClickHouse/ClickHouse/pull/47492) ([Kruglov Pavel](https://github.com/Avogar)).
+* Planner JOIN TREE build fix [#47498](https://github.com/ClickHouse/ClickHouse/pull/47498) ([Maksim Kita](https://github.com/kitaisreal)).
+* Better support of identifiers from compound expressions in analyzer [#47506](https://github.com/ClickHouse/ClickHouse/pull/47506) ([Anton Popov](https://github.com/CurtizJ)).
+* Adapt some tests to pass with and without the analyzer [#47525](https://github.com/ClickHouse/ClickHouse/pull/47525) ([Raúl Marín](https://github.com/Algunenano)).
+* Small enhancements [#47534](https://github.com/ClickHouse/ClickHouse/pull/47534) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Support constants in INTERPOLATE clause (new analyzer) [#47539](https://github.com/ClickHouse/ClickHouse/pull/47539) ([Dmitry Novik](https://github.com/novikd)).
+* Remove TOTALS handling in FillingTransform [#47542](https://github.com/ClickHouse/ClickHouse/pull/47542) ([Igor Nikonov](https://github.com/devcrafter)).
+* Hide too noisy log messages, fix some tests [#47547](https://github.com/ClickHouse/ClickHouse/pull/47547) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix some flaky tests [#47553](https://github.com/ClickHouse/ClickHouse/pull/47553) ([Azat Khuzhin](https://github.com/azat)).
+* remove counters for threads, fix negative counters [#47564](https://github.com/ClickHouse/ClickHouse/pull/47564) ([Sema Checherinda](https://github.com/CheSema)).
+* Fix typo [#47565](https://github.com/ClickHouse/ClickHouse/pull/47565) ([hq1](https://github.com/aerosol)).
+* Fixes for upgrade check [#47570](https://github.com/ClickHouse/ClickHouse/pull/47570) ([Azat Khuzhin](https://github.com/azat)).
+* Change error code in case of columns definitions was empty in ODBC [#47573](https://github.com/ClickHouse/ClickHouse/pull/47573) ([Azat Khuzhin](https://github.com/azat)).
+* Add missing SYSTEM FLUSH LOGS for log messages statistics [#47575](https://github.com/ClickHouse/ClickHouse/pull/47575) ([Azat Khuzhin](https://github.com/azat)).
+* Fix performance regression in aggregation [#47582](https://github.com/ClickHouse/ClickHouse/pull/47582) ([Anton Popov](https://github.com/CurtizJ)).
+* ReadFromMergeTree explain prewhere and row policy actions [#47583](https://github.com/ClickHouse/ClickHouse/pull/47583) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix possible failures of 01300_client_save_history_when_terminated_long [#47606](https://github.com/ClickHouse/ClickHouse/pull/47606) ([Azat Khuzhin](https://github.com/azat)).
+* checksum: do not check inverted index files [#47607](https://github.com/ClickHouse/ClickHouse/pull/47607) ([save-my-heart](https://github.com/save-my-heart)).
+* Add sanity checks for writing number in variable length format [#47608](https://github.com/ClickHouse/ClickHouse/pull/47608) ([Azat Khuzhin](https://github.com/azat)).
+* Analyzer planner fixes before enable by default [#47622](https://github.com/ClickHouse/ClickHouse/pull/47622) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix exception message in clickhouse-test [#47625](https://github.com/ClickHouse/ClickHouse/pull/47625) ([Nikolay Degterinsky](https://github.com/evillique)).
+* FillingTransform: remove unnecessary indirection when accessing columns [#47632](https://github.com/ClickHouse/ClickHouse/pull/47632) ([Igor Nikonov](https://github.com/devcrafter)).
+* fix typo in HashJoin insertion that enables debug code in release build [#46726](https://github.com/ClickHouse/ClickHouse/issues/46726) [#47647](https://github.com/ClickHouse/ClickHouse/pull/47647) ([jorisgio](https://github.com/jorisgio)).
+* clang-tidy >= 15: write CheckOptions in dictionary format [#47648](https://github.com/ClickHouse/ClickHouse/pull/47648) ([Robert Schulze](https://github.com/rschu1ze)).
+* CMake: Build ClickHouse w/o GNU extensions [#47651](https://github.com/ClickHouse/ClickHouse/pull/47651) ([Robert Schulze](https://github.com/rschu1ze)).
+* Faster fasttest [#47654](https://github.com/ClickHouse/ClickHouse/pull/47654) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add background pools size metrics [#47656](https://github.com/ClickHouse/ClickHouse/pull/47656) ([Sergei Trifonov](https://github.com/serxa)).
+* Improve ThreadPool [#47657](https://github.com/ClickHouse/ClickHouse/pull/47657) ([Vitaly Baranov](https://github.com/vitlibar)).
+* cmake: remove support for gold linker [#47660](https://github.com/ClickHouse/ClickHouse/pull/47660) ([Robert Schulze](https://github.com/rschu1ze)).
+* Updated events and recordings [#47668](https://github.com/ClickHouse/ClickHouse/pull/47668) ([clickhouse-adrianfraguela](https://github.com/clickhouse-adrianfraguela)).
+* Follow-up to [#47660](https://github.com/ClickHouse/ClickHouse/issues/47660): Further removal of gold linker support [#47669](https://github.com/ClickHouse/ClickHouse/pull/47669) ([Robert Schulze](https://github.com/rschu1ze)).
+* Enable parallel execution for two tests [#47670](https://github.com/ClickHouse/ClickHouse/pull/47670) ([Robert Schulze](https://github.com/rschu1ze)).
+* Restore native macos build [#47673](https://github.com/ClickHouse/ClickHouse/pull/47673) ([Robert Schulze](https://github.com/rschu1ze)).
+* CMake: Remove further cruft from build [#47680](https://github.com/ClickHouse/ClickHouse/pull/47680) ([Robert Schulze](https://github.com/rschu1ze)).
+* fix test / remove hardcoded database [#47682](https://github.com/ClickHouse/ClickHouse/pull/47682) ([Denny Crane](https://github.com/den-crane)).
+* Apply log_queries_cut_to_length in MergeTreeWhereOptimizer [#47684](https://github.com/ClickHouse/ClickHouse/pull/47684) ([Vladimir C](https://github.com/vdimir)).
+* Fix logical error in evaluate constant expression [#47685](https://github.com/ClickHouse/ClickHouse/pull/47685) ([Vladimir C](https://github.com/vdimir)).
+* Try making `test_keeper_mntr_data_size` less flaky [#47687](https://github.com/ClickHouse/ClickHouse/pull/47687) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix limit offset [#47688](https://github.com/ClickHouse/ClickHouse/pull/47688) ([flynn](https://github.com/ucasfl)).
+* Fix startup on older systemd versions [#47689](https://github.com/ClickHouse/ClickHouse/pull/47689) ([Thomas Casteleyn](https://github.com/Hipska)).
+* More random query id in tests [#47700](https://github.com/ClickHouse/ClickHouse/pull/47700) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add a style check for unsafe code [#47703](https://github.com/ClickHouse/ClickHouse/pull/47703) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Make the code in Join less disgusting [#47712](https://github.com/ClickHouse/ClickHouse/pull/47712) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fixup git reference to LLVM [#47719](https://github.com/ClickHouse/ClickHouse/pull/47719) ([Robert Schulze](https://github.com/rschu1ze)).
+* Preparation for libcxx(abi), llvm, clang-tidy 16 [#47722](https://github.com/ClickHouse/ClickHouse/pull/47722) ([Robert Schulze](https://github.com/rschu1ze)).
+* Rename cfg parameter query_cache.size to query_cache.max_size [#47724](https://github.com/ClickHouse/ClickHouse/pull/47724) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add optimization for MemoryStorageStep [#47726](https://github.com/ClickHouse/ClickHouse/pull/47726) ([Konstantin Morozov](https://github.com/k-morozov)).
+* Fix aggregation with constant key in planner [#47727](https://github.com/ClickHouse/ClickHouse/pull/47727) ([Dmitry Novik](https://github.com/novikd)).
+* Disable setting in 02343_group_by_use_nulls_distributed (for new analyzer) [#47728](https://github.com/ClickHouse/ClickHouse/pull/47728) ([Dmitry Novik](https://github.com/novikd)).
+* Add a test for [#21469](https://github.com/ClickHouse/ClickHouse/issues/21469) [#47736](https://github.com/ClickHouse/ClickHouse/pull/47736) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a test for [#23804](https://github.com/ClickHouse/ClickHouse/issues/23804) [#47737](https://github.com/ClickHouse/ClickHouse/pull/47737) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a test for [#18937](https://github.com/ClickHouse/ClickHouse/issues/18937) [#47738](https://github.com/ClickHouse/ClickHouse/pull/47738) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a test for [#17756](https://github.com/ClickHouse/ClickHouse/issues/17756) [#47739](https://github.com/ClickHouse/ClickHouse/pull/47739) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a test for [#23162](https://github.com/ClickHouse/ClickHouse/issues/23162) [#47740](https://github.com/ClickHouse/ClickHouse/pull/47740) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* remove unused code [#47743](https://github.com/ClickHouse/ClickHouse/pull/47743) ([flynn](https://github.com/ucasfl)).
+* Fix broken cross-compiled macos builds [#47744](https://github.com/ClickHouse/ClickHouse/pull/47744) ([Robert Schulze](https://github.com/rschu1ze)).
+* Randomize query cache settings [#47749](https://github.com/ClickHouse/ClickHouse/pull/47749) ([Robert Schulze](https://github.com/rschu1ze)).
+* Clarify steps for reopened cherry-pick PRs [#47755](https://github.com/ClickHouse/ClickHouse/pull/47755) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix ZK exception error message [#47757](https://github.com/ClickHouse/ClickHouse/pull/47757) ([Raúl Marín](https://github.com/Algunenano)).
+* Add ComparisonTupleEliminationVisitor [#47758](https://github.com/ClickHouse/ClickHouse/pull/47758) ([Vladimir C](https://github.com/vdimir)).
+* Add a fuse for backport branches w/o a created PR [#47760](https://github.com/ClickHouse/ClickHouse/pull/47760) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix partition ID byte order for s390x [#47769](https://github.com/ClickHouse/ClickHouse/pull/47769) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Stop `wait for quorum` retries on shutdown [#47770](https://github.com/ClickHouse/ClickHouse/pull/47770) ([Igor Nikonov](https://github.com/devcrafter)).
+* More preparation for upgrade to libcxx(abi), llvm, clang-tidy 16 [#47771](https://github.com/ClickHouse/ClickHouse/pull/47771) ([Robert Schulze](https://github.com/rschu1ze)).
+* Only valid Reviews.STATES overwrite existing reviews [#47789](https://github.com/ClickHouse/ClickHouse/pull/47789) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Apply black formatter to all python scripts [#47790](https://github.com/ClickHouse/ClickHouse/pull/47790) ([Anton Popov](https://github.com/CurtizJ)).
+* Try fix window view test [#47791](https://github.com/ClickHouse/ClickHouse/pull/47791) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Update test for nested lambdas [#47795](https://github.com/ClickHouse/ClickHouse/pull/47795) ([Dmitry Novik](https://github.com/novikd)).
+* Decrease scale_down ratio for faster deflation [#47798](https://github.com/ClickHouse/ClickHouse/pull/47798) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix 993 and two other tests [#47802](https://github.com/ClickHouse/ClickHouse/pull/47802) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix flaky test 02417_opentelemetry_insert_on_distributed_table [#47811](https://github.com/ClickHouse/ClickHouse/pull/47811) ([Azat Khuzhin](https://github.com/azat)).
+* Make 01086_odbc_roundtrip less flaky [#47820](https://github.com/ClickHouse/ClickHouse/pull/47820) ([Antonio Andelic](https://github.com/antonio2368)).
+* Place short return before big block, improve logging [#47822](https://github.com/ClickHouse/ClickHouse/pull/47822) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* [FixTests] Remove wrong chassert() in UserDefinedSQLObjectsLoaderFromZooKeeper.cpp [#47839](https://github.com/ClickHouse/ClickHouse/pull/47839) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix test test_replicated_merge_tree_encryption_codec [#47851](https://github.com/ClickHouse/ClickHouse/pull/47851) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Allow injecting timeout errors on Keeper [#47856](https://github.com/ClickHouse/ClickHouse/pull/47856) ([Raúl Marín](https://github.com/Algunenano)).
+* Comment stale cherry-pick PRs once a day to remind for resolving conflicts [#47857](https://github.com/ClickHouse/ClickHouse/pull/47857) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Followup to [#47802](https://github.com/ClickHouse/ClickHouse/issues/47802) [#47864](https://github.com/ClickHouse/ClickHouse/pull/47864) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Slightly better error message [#47868](https://github.com/ClickHouse/ClickHouse/pull/47868) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Make test_server_reload non-parallel [#47871](https://github.com/ClickHouse/ClickHouse/pull/47871) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* aspell-dict.txt: keep sorted things sorted [#47878](https://github.com/ClickHouse/ClickHouse/pull/47878) ([Robert Schulze](https://github.com/rschu1ze)).
+* throw exception when all retries exhausted [#47902](https://github.com/ClickHouse/ClickHouse/pull/47902) ([Sema Checherinda](https://github.com/CheSema)).
+* Fix GRANT query formatting [#47908](https://github.com/ClickHouse/ClickHouse/pull/47908) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix exception type in arrayElement function [#47909](https://github.com/ClickHouse/ClickHouse/pull/47909) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix logical error in DistributedSink [#47916](https://github.com/ClickHouse/ClickHouse/pull/47916) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix terminate in parts check thread [#47917](https://github.com/ClickHouse/ClickHouse/pull/47917) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Limit keeper request batching by size in bytes [#47918](https://github.com/ClickHouse/ClickHouse/pull/47918) ([Alexander Gololobov](https://github.com/davenger)).
+* Improve replicated user defined functions [#47919](https://github.com/ClickHouse/ClickHouse/pull/47919) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Update 01072_window_view_multiple_columns_groupby.sh [#47928](https://github.com/ClickHouse/ClickHouse/pull/47928) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Added test. Closes [#12264](https://github.com/ClickHouse/ClickHouse/issues/12264) [#47931](https://github.com/ClickHouse/ClickHouse/pull/47931) ([Ilya Yatsishin](https://github.com/qoega)).
+* Disallow concurrent backup restore test - removed SYSTEM SYNC [#47944](https://github.com/ClickHouse/ClickHouse/pull/47944) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Artifacts s3 prefix [#47945](https://github.com/ClickHouse/ClickHouse/pull/47945) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Set content-length for empty POST requests [#47950](https://github.com/ClickHouse/ClickHouse/pull/47950) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix test `02050_client_profile_events` [#47951](https://github.com/ClickHouse/ClickHouse/pull/47951) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix tsan error lock-order-inversion [#47953](https://github.com/ClickHouse/ClickHouse/pull/47953) ([Kruglov Pavel](https://github.com/Avogar)).
+* Update docs for parseDateTime() (follow-up to [#46815](https://github.com/ClickHouse/ClickHouse/issues/46815)) [#47959](https://github.com/ClickHouse/ClickHouse/pull/47959) ([Robert Schulze](https://github.com/rschu1ze)).
+* Docs: Update secondary index example [#47961](https://github.com/ClickHouse/ClickHouse/pull/47961) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix compilation on MacOS [#47967](https://github.com/ClickHouse/ClickHouse/pull/47967) ([Jordi Villar](https://github.com/jrdi)).
+* [Refactoring] Move information about current hosts and list of all hosts to BackupCoordination [#47971](https://github.com/ClickHouse/ClickHouse/pull/47971) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Stabilize tests for new function parseDateTimeInJodaSyntax [#47974](https://github.com/ClickHouse/ClickHouse/pull/47974) ([Robert Schulze](https://github.com/rschu1ze)).
+* Docs: Fix links [#47976](https://github.com/ClickHouse/ClickHouse/pull/47976) ([Robert Schulze](https://github.com/rschu1ze)).
+* Try fix rabbitmq test [#47987](https://github.com/ClickHouse/ClickHouse/pull/47987) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Better type check in arrayElement function [#47989](https://github.com/ClickHouse/ClickHouse/pull/47989) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix incorrect code indentation [#48011](https://github.com/ClickHouse/ClickHouse/pull/48011) ([exmy](https://github.com/exmy)).
+* CMake: Remove configuration of CMAKE_SHARED_LINKER_FLAGS [#48018](https://github.com/ClickHouse/ClickHouse/pull/48018) ([Robert Schulze](https://github.com/rschu1ze)).
+* Remove the old changelog script [#48042](https://github.com/ClickHouse/ClickHouse/pull/48042) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix automatic indentation in the built-in UI SQL editor [#48045](https://github.com/ClickHouse/ClickHouse/pull/48045) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Rename `system.marked_dropped_tables` to `dropped_tables` [#48048](https://github.com/ClickHouse/ClickHouse/pull/48048) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Automatically correct some mistakes in the changelog [#48052](https://github.com/ClickHouse/ClickHouse/pull/48052) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Docs: Document [FULL] keyword in SHOW TABLES [#48061](https://github.com/ClickHouse/ClickHouse/pull/48061) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix stateless tests numbers [#48063](https://github.com/ClickHouse/ClickHouse/pull/48063) ([Raúl Marín](https://github.com/Algunenano)).
+* Docs: Update syntax of some SHOW queries [#48064](https://github.com/ClickHouse/ClickHouse/pull/48064) ([Robert Schulze](https://github.com/rschu1ze)).
+* Simplify backup coordination for file infos [#48095](https://github.com/ClickHouse/ClickHouse/pull/48095) ([Vitaly Baranov](https://github.com/vitlibar)).
+* materialized pg small fix [#48098](https://github.com/ClickHouse/ClickHouse/pull/48098) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Update SQLite to 3.41.2 [#48101](https://github.com/ClickHouse/ClickHouse/pull/48101) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix test numbers again and enforce it with style [#48106](https://github.com/ClickHouse/ClickHouse/pull/48106) ([Raúl Marín](https://github.com/Algunenano)).
+* s390x reinterpret as float64 [#48112](https://github.com/ClickHouse/ClickHouse/pull/48112) ([Suzy Wang](https://github.com/SuzyWangIBMer)).
+* Remove slow outdated test [#48114](https://github.com/ClickHouse/ClickHouse/pull/48114) ([alesapin](https://github.com/alesapin)).
+* Cosmetic follow-up to [#46252](https://github.com/ClickHouse/ClickHouse/issues/46252) [#48128](https://github.com/ClickHouse/ClickHouse/pull/48128) ([Robert Schulze](https://github.com/rschu1ze)).
+* Merging "Support undrop table" [#48130](https://github.com/ClickHouse/ClickHouse/pull/48130) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix double whitespace in exception message [#48132](https://github.com/ClickHouse/ClickHouse/pull/48132) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve script for updating clickhouse-docs [#48135](https://github.com/ClickHouse/ClickHouse/pull/48135) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix stdlib compatibility issues [#48150](https://github.com/ClickHouse/ClickHouse/pull/48150) ([DimasKovas](https://github.com/DimasKovas)).
+* Make test test_disallow_concurrency less flaky [#48152](https://github.com/ClickHouse/ClickHouse/pull/48152) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Remove unused mockSystemDatabase from gtest_transform_query_for_exter… [#48162](https://github.com/ClickHouse/ClickHouse/pull/48162) ([Vladimir C](https://github.com/vdimir)).
+* Update environmental-sensors.md [#48166](https://github.com/ClickHouse/ClickHouse/pull/48166) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Correctly handle NULL constants in logical optimizer for new analyzer [#48168](https://github.com/ClickHouse/ClickHouse/pull/48168) ([Antonio Andelic](https://github.com/antonio2368)).
+* Try making KeeperMap test more stable [#48170](https://github.com/ClickHouse/ClickHouse/pull/48170) ([Antonio Andelic](https://github.com/antonio2368)).
+* Deprecate EXPLAIN QUERY TREE with disabled analyzer. [#48177](https://github.com/ClickHouse/ClickHouse/pull/48177) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Use uniq file names in 02149_* tests to avoid SIGBUS in stress tests [#48187](https://github.com/ClickHouse/ClickHouse/pull/48187) ([Kruglov Pavel](https://github.com/Avogar)).
+* Update style in ParserKQLSort.cpp [#48199](https://github.com/ClickHouse/ClickHouse/pull/48199) ([Ilya Yatsishin](https://github.com/qoega)).
+* Remove support for std::unary/binary_function (removed in C++17) [#48204](https://github.com/ClickHouse/ClickHouse/pull/48204) ([Robert Schulze](https://github.com/rschu1ze)).
+* Remove unused setting [#48208](https://github.com/ClickHouse/ClickHouse/pull/48208) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove wrong assert from LogicalExpressionOptimizerPass [#48214](https://github.com/ClickHouse/ClickHouse/pull/48214) ([Antonio Andelic](https://github.com/antonio2368)).
+* MySQL compatibility: Make str_to_date alias case-insensitive [#48220](https://github.com/ClickHouse/ClickHouse/pull/48220) ([Robert Schulze](https://github.com/rschu1ze)).
+* Disable AST optimizations for projection analysis. [#48221](https://github.com/ClickHouse/ClickHouse/pull/48221) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix Too big of a difference between test numbers [#48224](https://github.com/ClickHouse/ClickHouse/pull/48224) ([Vladimir C](https://github.com/vdimir)).
+* Stabilize 02477_age [#48225](https://github.com/ClickHouse/ClickHouse/pull/48225) ([Robert Schulze](https://github.com/rschu1ze)).
+* Rename setting stop_reading_on_first_cancel [#48226](https://github.com/ClickHouse/ClickHouse/pull/48226) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Address flaky 02346_full_text_search [#48227](https://github.com/ClickHouse/ClickHouse/pull/48227) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix incorrect ThreadPool usage after ThreadPool introspection [#48244](https://github.com/ClickHouse/ClickHouse/pull/48244) ([Azat Khuzhin](https://github.com/azat)).
+* fix test numbers again [#48264](https://github.com/ClickHouse/ClickHouse/pull/48264) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
+#### Testing Improvement
+
+* Fixed functional test 02534_keyed_siphash and 02552_siphash128_reference for s390x. [#47615](https://github.com/ClickHouse/ClickHouse/pull/47615) ([Harry Lee](https://github.com/HarryLeeIBM)).
+
diff --git a/docs/changelogs/v23.3.2.37-lts.md b/docs/changelogs/v23.3.2.37-lts.md
new file mode 100644
index 00000000000..69602b573c5
--- /dev/null
+++ b/docs/changelogs/v23.3.2.37-lts.md
@@ -0,0 +1,35 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.3.2.37-lts (1b144bcd101) FIXME as compared to v23.3.1.2823-lts (46e85357ce2)
+
+#### Improvement
+* Backported in [#48459](https://github.com/ClickHouse/ClickHouse/issues/48459): Formatter '%M' in function formatDateTime() now prints the month name instead of the minutes. This makes the behavior consistent with MySQL. The previous behavior can be restored using setting "formatdatetime_parsedatetime_m_is_month_name = 0". [#47246](https://github.com/ClickHouse/ClickHouse/pull/47246) ([Robert Schulze](https://github.com/rschu1ze)).
+* Backported in [#48842](https://github.com/ClickHouse/ClickHouse/issues/48842): Fix some mysql related settings not being handled with mysql dictionary source + named collection. Closes [#48402](https://github.com/ClickHouse/ClickHouse/issues/48402). [#48759](https://github.com/ClickHouse/ClickHouse/pull/48759) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Backported in [#49035](https://github.com/ClickHouse/ClickHouse/issues/49035): Add fallback to password authentication when authentication with SSL user certificate has failed. Closes [#48974](https://github.com/ClickHouse/ClickHouse/issues/48974). [#48989](https://github.com/ClickHouse/ClickHouse/pull/48989) ([Nikolay Degterinsky](https://github.com/evillique)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#48589](https://github.com/ClickHouse/ClickHouse/issues/48589): Update time zones. The following were updated: Africa/Cairo, Africa/Casablanca, Africa/El_Aaiun, America/Bogota, America/Cambridge_Bay, America/Ciudad_Juarez, America/Godthab, America/Inuvik, America/Iqaluit, America/Nuuk, America/Ojinaga, America/Pangnirtung, America/Rankin_Inlet, America/Resolute, America/Whitehorse, America/Yellowknife, Asia/Gaza, Asia/Hebron, Asia/Kuala_Lumpur, Asia/Singapore, Canada/Yukon, Egypt, Europe/Kirov, Europe/Volgograd, Singapore. [#48572](https://github.com/ClickHouse/ClickHouse/pull/48572) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#48960](https://github.com/ClickHouse/ClickHouse/issues/48960): After the recent update, the `dockerd` requires `--tlsverify=false` together with the http port explicitly. [#48924](https://github.com/ClickHouse/ClickHouse/pull/48924) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Remove a feature [#48195](https://github.com/ClickHouse/ClickHouse/pull/48195) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix cpu usage in rabbitmq (was worsened in 23.2 after [#44404](https://github.com/ClickHouse/ClickHouse/issues/44404)) [#48311](https://github.com/ClickHouse/ClickHouse/pull/48311) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix ThreadPool for DistributedSink and use StrongTypedef for CurrentMetrics/ProfileEvents/StatusInfo to avoid further errors [#48314](https://github.com/ClickHouse/ClickHouse/pull/48314) ([Azat Khuzhin](https://github.com/azat)).
+* Reset downloader for cache file segment in TemporaryFileStream [#48386](https://github.com/ClickHouse/ClickHouse/pull/48386) ([Vladimir C](https://github.com/vdimir)).
+* ClickHouse startup error when loading a distributed table that depends on a dictionary [#48419](https://github.com/ClickHouse/ClickHouse/pull/48419) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix possible segfault in cache [#48469](https://github.com/ClickHouse/ClickHouse/pull/48469) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix nested map for keys of IP and UUID types [#48556](https://github.com/ClickHouse/ClickHouse/pull/48556) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix bug in Keeper when a node is not created with scheme `auth` in ACL sometimes. [#48595](https://github.com/ClickHouse/ClickHouse/pull/48595) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Fix IPv4 comparable with UInt [#48611](https://github.com/ClickHouse/ClickHouse/pull/48611) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Batch fix for projections analysis with analyzer. [#48357](https://github.com/ClickHouse/ClickHouse/pull/48357) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix a confusing warning about interserver mode [#48793](https://github.com/ClickHouse/ClickHouse/pull/48793) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
diff --git a/docs/changelogs/v23.4.1.1943-stable.md b/docs/changelogs/v23.4.1.1943-stable.md
new file mode 100644
index 00000000000..ea16f5856be
--- /dev/null
+++ b/docs/changelogs/v23.4.1.1943-stable.md
@@ -0,0 +1,375 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.4.1.1943-stable (3920eb987f7) FIXME as compared to v23.3.1.2823-lts (46e85357ce2)
+
+#### Backward Incompatible Change
+* If `path` in cache configuration is not empty and is not absolute path, then it will be put in `<clickhouse server data directory>/caches/<path_from_cache_config>`. [#48784](https://github.com/ClickHouse/ClickHouse/pull/48784) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Compatibility setting `parallelize_output_from_storages` to enable behavior before [#48727](https://github.com/ClickHouse/ClickHouse/issues/48727). [#49101](https://github.com/ClickHouse/ClickHouse/pull/49101) ([Igor Nikonov](https://github.com/devcrafter)).
+
+#### New Feature
+* Add `extractKeyValuePairs` function to extract key value pairs from strings. Input strings might contain noise (i.e log files / do not need to be 100% formatted in key-value-pair format), the algorithm will look for key value pairs matching the arguments passed to the function. As of now, function accepts the following arguments: `data_column` (mandatory), `key_value_pair_delimiter` (defaults to `:`), `pair_delimiters` (defaults to `\space \, \;`) and `quoting_character` (defaults to double quotes). [#43606](https://github.com/ClickHouse/ClickHouse/pull/43606) ([Arthur Passos](https://github.com/arthurpassos)).
+* Add MemoryTracker for the background tasks (merges and mutation). Introduces `merges_mutations_memory_usage_soft_limit` and `merges_mutations_memory_usage_to_ram_ratio` settings that represent the soft memory limit for merges and mutations. If this limit is reached ClickHouse won't schedule new merge or mutation tasks. Also `MergesMutationsMemoryTracking` metric is introduced to allow observing current memory usage of background tasks. Closes [#45710](https://github.com/ClickHouse/ClickHouse/issues/45710). [#46089](https://github.com/ClickHouse/ClickHouse/pull/46089) ([Dmitry Novik](https://github.com/novikd)).
+* Support new aggregate function quantileGK/quantilesGK, like [approx_percentile](https://spark.apache.org/docs/latest/api/sql/index.html#approx_percentile) in spark. Greenwald-Khanna algorithm refer to http://infolab.stanford.edu/~datar/courses/cs361a/papers/quantiles.pdf. [#46428](https://github.com/ClickHouse/ClickHouse/pull/46428) ([李扬](https://github.com/taiyang-li)).
+* Add statement `SHOW COLUMNS` which shows distilled information from system.columns. [#48017](https://github.com/ClickHouse/ClickHouse/pull/48017) ([Robert Schulze](https://github.com/rschu1ze)).
+* Added `LIGHTWEIGHT` and `PULL` modifiers for `SYSTEM SYNC REPLICA` query. `LIGHTWEIGHT` version waits for fetches and drop-ranges only (merges and mutations are ignored). `PULL` version pulls new entries from ZooKeeper and does not wait for them. Fixes [#47794](https://github.com/ClickHouse/ClickHouse/issues/47794). [#48085](https://github.com/ClickHouse/ClickHouse/pull/48085) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add kafkaMurmurHash function for compatibility with Kafka DefaultPartitioner. Closes [#47834](https://github.com/ClickHouse/ClickHouse/issues/47834). [#48185](https://github.com/ClickHouse/ClickHouse/pull/48185) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Allow to easily create a user with the same grants as the current user by using `GRANT CURRENT GRANTS`. [#48262](https://github.com/ClickHouse/ClickHouse/pull/48262) ([pufit](https://github.com/pufit)).
+* Add statistical aggregate function `kolmogorovSmirnovTest`. close [#48228](https://github.com/ClickHouse/ClickHouse/issues/48228). [#48325](https://github.com/ClickHouse/ClickHouse/pull/48325) ([FFFFFFFHHHHHHH](https://github.com/FFFFFFFHHHHHHH)).
+* Added a `lost_part_count` column to the `system.replicas` table. The column value shows the total number of lost parts in the corresponding table. Value is stored in zookeeper and can be used instead of not persistent `ReplicatedDataLoss` profile event for monitoring. [#48526](https://github.com/ClickHouse/ClickHouse/pull/48526) ([Sergei Trifonov](https://github.com/serxa)).
+* Add soundex function. Closes [#39880](https://github.com/ClickHouse/ClickHouse/issues/39880). [#48567](https://github.com/ClickHouse/ClickHouse/pull/48567) ([FriendLey](https://github.com/FriendLey)).
+* Support map type for JSONExtract. [#48629](https://github.com/ClickHouse/ClickHouse/pull/48629) ([李扬](https://github.com/taiyang-li)).
+* Add PrettyJSONEachRow format to output pretty JSON with new line delimieters and 4 space indents. [#48898](https://github.com/ClickHouse/ClickHouse/pull/48898) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add ParquetMetadata input format to read Parquet file metadata. [#48911](https://github.com/ClickHouse/ClickHouse/pull/48911) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### Performance Improvement
+* Reading files in Parquet format is now much faster. IO and decoding are parallelized (controlled by `max_threads` setting), and only required data ranges are read. [#47964](https://github.com/ClickHouse/ClickHouse/pull/47964) ([Michael Kolupaev](https://github.com/al13n321)).
+* Only check dependencies if necessary when applying `ALTER TABLE` queries. [#48062](https://github.com/ClickHouse/ClickHouse/pull/48062) ([Raúl Marín](https://github.com/Algunenano)).
+* Optimize function `mapUpdate`. [#48118](https://github.com/ClickHouse/ClickHouse/pull/48118) ([Anton Popov](https://github.com/CurtizJ)).
+* Now an internal query to local replica is sent explicitly and data from it received through loopback interface. Setting `prefer_localhost_replica` is not respected for parallel replicas. This is needed for better scheduling and makes the code cleaner: the initiator is only responsible for coordinating of the reading process and merging results, continiously answering for requests while all the secondary queries read the data. Note: Using loopback interface is not so performant, otherwise some replicas could starve for tasks which could lead to even slower query execution and not utilizing all possible resources. The initialization of the coordinator is now even more lazy. All incoming requests contain the information about the reading algorithm we initialize the coordinator with it when first request comes. If any replica will decide to read with different algorithm - an exception will be thrown and a query will be aborted. [#48246](https://github.com/ClickHouse/ClickHouse/pull/48246) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Do not build set for the right side of `IN` clause with subquery when it is used only for analysis of skip indexes and they are disabled by setting (`use_skip_indexes=0`). Previously it might affect the performance of queries. [#48299](https://github.com/ClickHouse/ClickHouse/pull/48299) ([Anton Popov](https://github.com/CurtizJ)).
+* Query processing is parallelized right after reading `FROM file(...)`. Related to [#38755](https://github.com/ClickHouse/ClickHouse/issues/38755). [#48525](https://github.com/ClickHouse/ClickHouse/pull/48525) ([Igor Nikonov](https://github.com/devcrafter)).
+* Query processing is parallelized right after reading from a data source. Affected data sources are mostly simple or external storages like table functions `url`, `file`. [#48727](https://github.com/ClickHouse/ClickHouse/pull/48727) ([Igor Nikonov](https://github.com/devcrafter)).
+* Using correct memory order for counter in `numebers_mt()`. [#48729](https://github.com/ClickHouse/ClickHouse/pull/48729) ([Igor Nikonov](https://github.com/devcrafter)).
+* Lowered contention of ThreadPool mutex (may increase performance for a huge amount of small jobs). [#48750](https://github.com/ClickHouse/ClickHouse/pull/48750) ([Sergei Trifonov](https://github.com/serxa)).
+* Simplify accounting of approximate size of granule in prefetched read pool. [#49051](https://github.com/ClickHouse/ClickHouse/pull/49051) ([Nikita Taranov](https://github.com/nickitat)).
+
+#### Improvement
+* Support config sections `keeper`/`keeper_server` as an alternative to `zookeeper`. Close [#34766](https://github.com/ClickHouse/ClickHouse/issues/34766) , [#34767](https://github.com/ClickHouse/ClickHouse/issues/34767). [#35113](https://github.com/ClickHouse/ClickHouse/pull/35113) ([李扬](https://github.com/taiyang-li)).
+* Many issues in ClickHouse applications's help were fixed. Help is now written to stdout from all tools. Status code for `clickhouse help` invocation is now 0. Updated help for `clickhouse-local`, `clickhouse-benchmark`, `clickhouse-client`, `clickhouse hash`, `clickhouse su`, `clickhouse-install`. [#45819](https://github.com/ClickHouse/ClickHouse/pull/45819) ([Ilya Yatsishin](https://github.com/qoega)).
+* Entries in the query cache are now squashed to max_block_size and compressed. [#45912](https://github.com/ClickHouse/ClickHouse/pull/45912) ([Robert Schulze](https://github.com/rschu1ze)).
+* It is possible to set _secure_ flag in named_collections for a dictionary with a ClickHouse table source. Addresses [#38450](https://github.com/ClickHouse/ClickHouse/issues/38450) . [#46323](https://github.com/ClickHouse/ClickHouse/pull/46323) ([Ilya Golshtein](https://github.com/ilejn)).
+* Functions replaceOne(), replaceAll(), replaceRegexpOne() and replaceRegexpAll() can now be called with non-const pattern and replacement arguments. [#46589](https://github.com/ClickHouse/ClickHouse/pull/46589) ([Robert Schulze](https://github.com/rschu1ze)).
+* Bump internal ZSTD from 1.5.4 to 1.5.5. [#46797](https://github.com/ClickHouse/ClickHouse/pull/46797) ([Robert Schulze](https://github.com/rschu1ze)).
+* If we run a mutation with IN (subquery) like this: `ALTER TABLE t UPDATE col='new value' WHERE id IN (SELECT id FROM huge_table)` and the table `t` has multiple parts than for each part a set for subquery `SELECT id FROM huge_table` is built in memory. And if there are many parts then this might consume a lot of memory (and lead to an OOM) and CPU. The solution is to introduce a short-lived cache of sets that are currently being built by mutation tasks. If another task of the same mutation is executed concurrently it can lookup the set in the cache, wait for it be be built and reuse it. [#46835](https://github.com/ClickHouse/ClickHouse/pull/46835) ([Alexander Gololobov](https://github.com/davenger)).
+* Added configurable retries for all operations with [Zoo]Keeper for Backup queries. [#47224](https://github.com/ClickHouse/ClickHouse/pull/47224) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add async connection to socket and async writing to socket. Make creating connections and sending query/external tables async across shards. Refactor code with fibers. Closes [#46931](https://github.com/ClickHouse/ClickHouse/issues/46931). We will be able to increase `connect_timeout_with_failover_ms` by default after this PR (https://github.com/ClickHouse/ClickHouse/issues/5188). [#47229](https://github.com/ClickHouse/ClickHouse/pull/47229) ([Kruglov Pavel](https://github.com/Avogar)).
+* Formatter '%M' in function formatDateTime() now prints the month name instead of the minutes. This makes the behavior consistent with MySQL. The previous behavior can be restored using setting "formatdatetime_parsedatetime_m_is_month_name = 0". [#47246](https://github.com/ClickHouse/ClickHouse/pull/47246) ([Robert Schulze](https://github.com/rschu1ze)).
+* Several improvements around data lakes: - Make StorageIceberg work with non-partitioned data. - Support Iceberg format version V2 (previously only V1 was supported) - Support reading partitioned data for DeltaLake/Hudi - Faster reading of DeltaLake metadata by using Delta's checkpoint files - Fixed incorrect Hudi reads: previously it incorrectly chose which data to read and therefore was able to read correctly only small size tables - Made these engines to pickup updates of changed data (previously the state was set on table creation) - Make proper testing for Iceberg/DeltaLake/Hudi using spark. [#47307](https://github.com/ClickHouse/ClickHouse/pull/47307) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Enable `use_environment_credentials` for S3 by default, so the entire provider chain is constructed by default. [#47397](https://github.com/ClickHouse/ClickHouse/pull/47397) ([Antonio Andelic](https://github.com/antonio2368)).
+* Currently, the JSON_VALUE function is similar as spark's get_json_object function, which support to get value from json string by a path like '$.key'. But still has something different - 1. in spark's get_json_object will return null while the path is not exist, but in JSON_VALUE will return empty string; - 2. in spark's get_json_object will return a complext type value, such as a json object/array value, but in JSON_VALUE will return empty string. [#47494](https://github.com/ClickHouse/ClickHouse/pull/47494) ([KevinyhZou](https://github.com/KevinyhZou)).
+* Add CNF/constraint optimizer in new analyzer. [#47617](https://github.com/ClickHouse/ClickHouse/pull/47617) ([Antonio Andelic](https://github.com/antonio2368)).
+* For use_structure_from_insertion_table_in_table_functions more flexible insert table structure propagation to table function. Fixed bug with name mapping and using virtual columns. No more need for 'auto' setting. [#47962](https://github.com/ClickHouse/ClickHouse/pull/47962) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Do not continue retrying to connect to ZK if the query is killed or over limits. [#47985](https://github.com/ClickHouse/ClickHouse/pull/47985) ([Raúl Marín](https://github.com/Algunenano)).
+* Added functions to work with columns of type `Map`: `mapConcat`, `mapSort`, `mapExists`. [#48071](https://github.com/ClickHouse/ClickHouse/pull/48071) ([Anton Popov](https://github.com/CurtizJ)).
+* Support Enum output/input in BSONEachRow, allow all map key types and avoid extra calculations on output. [#48122](https://github.com/ClickHouse/ClickHouse/pull/48122) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support more ClickHouse types in ORC/Arrow/Parquet formats: Enum(8|16), (U)Int(128|256), Decimal256 (for ORC), allow reading IPv4 from Int32 values (ORC outputs IPv4 as Int32 and we couldn't read it back), fix reading Nullable(IPv6) from binary data for ORC. [#48126](https://github.com/ClickHouse/ClickHouse/pull/48126) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add columns `perform_ttl_move_on_insert`, `load_balancing` for table `system.storage_policies`, modify column `volume_type` type to `enum8`. [#48167](https://github.com/ClickHouse/ClickHouse/pull/48167) ([lizhuoyu5](https://github.com/lzydmxy)).
+* Added support for `BACKUP ALL` command which backups all tables and databases, including temporary and system ones. [#48189](https://github.com/ClickHouse/ClickHouse/pull/48189) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Function mapFromArrays support map type as input. [#48207](https://github.com/ClickHouse/ClickHouse/pull/48207) ([李扬](https://github.com/taiyang-li)).
+* The output of some SHOW PROCESSLIST is now sorted. [#48241](https://github.com/ClickHouse/ClickHouse/pull/48241) ([Robert Schulze](https://github.com/rschu1ze)).
+* Per-query/per-server throttling for remote IO/local IO/BACKUPs (server settings: `max_remote_read_network_bandwidth_for_server`, `max_remote_write_network_bandwidth_for_server`, `max_local_read_bandwidth_for_server`, `max_local_write_bandwidth_for_server`, `max_backup_bandwidth_for_server`, settings: `max_remote_read_network_bandwidth`, `max_remote_write_network_bandwidth`, `max_local_read_bandwidth`, `max_local_write_bandwidth`, `max_backup_bandwidth`). [#48242](https://github.com/ClickHouse/ClickHouse/pull/48242) ([Azat Khuzhin](https://github.com/azat)).
+* Support more types in CapnProto format: Map, (U)Int(128|256), Decimal(128|256). Allow integer conversions during input/output. [#48257](https://github.com/ClickHouse/ClickHouse/pull/48257) ([Kruglov Pavel](https://github.com/Avogar)).
+* It is now possible to define per-user quotas in the query cache. [#48284](https://github.com/ClickHouse/ClickHouse/pull/48284) ([Robert Schulze](https://github.com/rschu1ze)).
+* Don't throw CURRENT_WRITE_BUFFER_IS_EXHAUSTED for normal behaviour. [#48288](https://github.com/ClickHouse/ClickHouse/pull/48288) ([Raúl Marín](https://github.com/Algunenano)).
+* Add new setting `keeper_map_strict_mode` which enforces extra guarantees on operations made on top of `KeeperMap` tables. [#48293](https://github.com/ClickHouse/ClickHouse/pull/48293) ([Antonio Andelic](https://github.com/antonio2368)).
+* Check primary key type for simple dictionary is native unsigned integer type Add setting `check_dictionary_primary_key ` for compatibility(set `check_dictionary_primary_key =false` to disable checking). [#48335](https://github.com/ClickHouse/ClickHouse/pull/48335) ([lizhuoyu5](https://github.com/lzydmxy)).
+* Don't replicate mutations for `KeeperMap` because it's unnecessary. [#48354](https://github.com/ClickHouse/ClickHouse/pull/48354) ([Antonio Andelic](https://github.com/antonio2368)).
+* Allow write/read unnamed tuple as nested Message in Protobuf format. Tuple elements and Message fields are mathced by position. [#48390](https://github.com/ClickHouse/ClickHouse/pull/48390) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support `additional_table_filters` and `additional_result_filter` settings in the new planner. Also, add a documentation entry for `additional_result_filter`. [#48405](https://github.com/ClickHouse/ClickHouse/pull/48405) ([Dmitry Novik](https://github.com/novikd)).
+* Parsedatetime now understands format string '%f' (fractional seconds). [#48420](https://github.com/ClickHouse/ClickHouse/pull/48420) ([Robert Schulze](https://github.com/rschu1ze)).
+* Format string "%f" in formatDateTime() now prints "000000" if the formatted value has no fractional seconds, the previous behavior (single zero) can be restored using setting "formatdatetime_f_prints_single_zero = 1". [#48422](https://github.com/ClickHouse/ClickHouse/pull/48422) ([Robert Schulze](https://github.com/rschu1ze)).
+* Don't replicate DELETE and TRUNCATE for KeeperMap. [#48434](https://github.com/ClickHouse/ClickHouse/pull/48434) ([Antonio Andelic](https://github.com/antonio2368)).
+* Generate valid Decimals and Bools in generateRandom function. [#48436](https://github.com/ClickHouse/ClickHouse/pull/48436) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow trailing commas in expression list of SELECT query, for example `SELECT a, b, c, FROM table`. Closes [#37802](https://github.com/ClickHouse/ClickHouse/issues/37802). [#48438](https://github.com/ClickHouse/ClickHouse/pull/48438) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Override `CLICKHOUSE_USER` and `CLICKHOUSE_PASSWORD` environment variables with `--user` and `--password` client parameters. Closes [#38909](https://github.com/ClickHouse/ClickHouse/issues/38909). [#48440](https://github.com/ClickHouse/ClickHouse/pull/48440) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Added retries to loading of data parts in `MergeTree` tables in case of retryable errors. [#48442](https://github.com/ClickHouse/ClickHouse/pull/48442) ([Anton Popov](https://github.com/CurtizJ)).
+* Add support for `Date`, `Date32`, `DateTime`, `DateTime64` data types to `arrayMin`, `arrayMax`, `arrayDifference` functions. Closes [#21645](https://github.com/ClickHouse/ClickHouse/issues/21645). [#48445](https://github.com/ClickHouse/ClickHouse/pull/48445) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Reduce memory usage for multiple `ALTER DELETE` mutations. [#48522](https://github.com/ClickHouse/ClickHouse/pull/48522) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Primary/secondary indices and sorting keys with identical expressions are now rejected. This behavior can be disabled using setting `allow_suspicious_indices`. [#48536](https://github.com/ClickHouse/ClickHouse/pull/48536) ([凌涛](https://github.com/lingtaolf)).
+* Just fix small typo in comment around `lockForAlter` method in `IStorage.h`. [#48559](https://github.com/ClickHouse/ClickHouse/pull/48559) ([artem-pershin](https://github.com/artem-pershin)).
+* Add support for `{server_uuid}` macro. It is useful for identifying replicas in autoscaled clusters when new replicas are constantly added and removed in runtime. This closes [#48554](https://github.com/ClickHouse/ClickHouse/issues/48554). [#48563](https://github.com/ClickHouse/ClickHouse/pull/48563) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The installation script will create a hard link instead of copying if it is possible. [#48578](https://github.com/ClickHouse/ClickHouse/pull/48578) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support `SHOW TABLE` syntax meaning the same as `SHOW CREATE TABLE`. Closes [#48580](https://github.com/ClickHouse/ClickHouse/issues/48580). [#48591](https://github.com/ClickHouse/ClickHouse/pull/48591) ([flynn](https://github.com/ucasfl)).
+* HTTP temporary buffer support working with fs cache. [#48664](https://github.com/ClickHouse/ClickHouse/pull/48664) ([Vladimir C](https://github.com/vdimir)).
+* Make Schema inference works for `CREATE AS SELECT`. Closes [#47599](https://github.com/ClickHouse/ClickHouse/issues/47599). [#48679](https://github.com/ClickHouse/ClickHouse/pull/48679) ([flynn](https://github.com/ucasfl)).
+* Added a `replicated_max_mutations_in_one_entry` setting for `ReplicatedMergeTree` that allows limiting the number of mutation commands per one `MUTATE_PART` entry (default is 10000). [#48731](https://github.com/ClickHouse/ClickHouse/pull/48731) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* In AggregateFunction types, don't count unused arena bytes as `read_bytes`. [#48745](https://github.com/ClickHouse/ClickHouse/pull/48745) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix some mysql related settings not being handled with mysql dictionary source + named collection. Closes [#48402](https://github.com/ClickHouse/ClickHouse/issues/48402). [#48759](https://github.com/ClickHouse/ClickHouse/pull/48759) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix squashing in query cache. [#48763](https://github.com/ClickHouse/ClickHouse/pull/48763) ([Robert Schulze](https://github.com/rschu1ze)).
+* Support following new jsonpath format - '$.1key', path element begins with number - '$[key]', '$[“key”]', '$[\\\'key\\\']', '$["key 123"]', path element embraced in []. [#48768](https://github.com/ClickHouse/ClickHouse/pull/48768) ([lgbo](https://github.com/lgbo-ustc)).
+* If a user set `max_single_part_upload_size` to a very large value, it can lead to a crash due to a bug in the AWS S3 SDK. This fixes [#47679](https://github.com/ClickHouse/ClickHouse/issues/47679). [#48816](https://github.com/ClickHouse/ClickHouse/pull/48816) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Not for changelog. [#48824](https://github.com/ClickHouse/ClickHouse/pull/48824) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix data race in `StorageRabbitMQ` ([report](https://pastila.nl/?004f7100/de1505289ab5bb355e67ebe6c7cc8707)), refactor the code. [#48845](https://github.com/ClickHouse/ClickHouse/pull/48845) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add aliases `name` and `part_name` form `system.parts` and `system.part_log`. Closes [#48718](https://github.com/ClickHouse/ClickHouse/issues/48718). [#48850](https://github.com/ClickHouse/ClickHouse/pull/48850) ([sichenzhao](https://github.com/sichenzhao)).
+* Functions "arrayDifferenceSupport()", "arrayCumSum()" and "arrayCumSumNonNegative()" now support input arrays of wide integer types (U)Int128/256. [#48866](https://github.com/ClickHouse/ClickHouse/pull/48866) ([cluster](https://github.com/infdahai)).
+* Multi-line history in clickhouse-client is now no longer padded. This makes pasting more natural. [#48870](https://github.com/ClickHouse/ClickHouse/pull/48870) ([Joanna Hulboj](https://github.com/jh0x)).
+* Not for changelog. [#48873](https://github.com/ClickHouse/ClickHouse/pull/48873) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Implement a slight improvement for the rare case when ClickHouse is run inside LXC and LXCFS is used. The LXCFS has an issue: sometimes it returns an error "Transport endpoint is not connected" on reading from the file inside `/proc`. This error was correctly logged into ClickHouse's server log. We have additionally workaround this issue by reopening a file. This is a minuscule change. [#48922](https://github.com/ClickHouse/ClickHouse/pull/48922) ([Real](https://github.com/RunningXie)).
+* Improve memory accounting for prefetches. Randomise prefetch settings In CI. [#48973](https://github.com/ClickHouse/ClickHouse/pull/48973) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Correctly set headers for native copy operations on GCS. [#48981](https://github.com/ClickHouse/ClickHouse/pull/48981) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add support for specifying setting names in the command line with dashes instead of underscores, for example, `--max-threads` instead of `--max_threads`. Additionally, support Unicode dash characters like `—` instead of `--` - this is useful when you communicate with a team in another company, and a manager from that team copy-pasted code from MS Word. [#48985](https://github.com/ClickHouse/ClickHouse/pull/48985) ([alekseygolub](https://github.com/alekseygolub)).
+* Add fallback to password authentication when authentication with SSL user certificate has failed. Closes [#48974](https://github.com/ClickHouse/ClickHouse/issues/48974). [#48989](https://github.com/ClickHouse/ClickHouse/pull/48989) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Increase default value for `connect_timeout_with_failover_ms` to 1000 ms (because of adding async connections in https://github.com/ClickHouse/ClickHouse/pull/47229) . Closes [#5188](https://github.com/ClickHouse/ClickHouse/issues/5188). [#49009](https://github.com/ClickHouse/ClickHouse/pull/49009) ([Kruglov Pavel](https://github.com/Avogar)).
+* Improve the embedded dashboard. Close [#46671](https://github.com/ClickHouse/ClickHouse/issues/46671). [#49036](https://github.com/ClickHouse/ClickHouse/pull/49036) ([Kevin Zhang](https://github.com/Kinzeng)).
+* Add profile events for log messages, so you can easily see the count of log messages by severity. [#49042](https://github.com/ClickHouse/ClickHouse/pull/49042) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* `bitCount` function support `FixedString` and `String` data type. [#49044](https://github.com/ClickHouse/ClickHouse/pull/49044) ([flynn](https://github.com/ucasfl)).
+* In previous versions, the `LineAsString` format worked inconsistently when the parallel parsing was enabled or not, in presence of DOS or MacOS Classic line breaks. This closes [#49039](https://github.com/ClickHouse/ClickHouse/issues/49039). [#49052](https://github.com/ClickHouse/ClickHouse/pull/49052) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The exception message about the unparsed query parameter will also tell about the name of the parameter. Reimplement [#48878](https://github.com/ClickHouse/ClickHouse/issues/48878). Close [#48772](https://github.com/ClickHouse/ClickHouse/issues/48772). [#49061](https://github.com/ClickHouse/ClickHouse/pull/49061) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Added field `rows` with number of rows parsed from asynchronous insert to `system.asynchronous_insert_log`. [#49120](https://github.com/ClickHouse/ClickHouse/pull/49120) ([Anton Popov](https://github.com/CurtizJ)).
+* 1. Bump Intel QPL from v1.0.0 to v1.1.0 (fixes build issue [#47877](https://github.com/ClickHouse/ClickHouse/issues/47877)) 2. the DEFLATE_QPL codec now respects the maximum hardware jobs returned by libaccel_config. [#49126](https://github.com/ClickHouse/ClickHouse/pull/49126) ([jasperzhu](https://github.com/jinjunzh)).
+
+#### Build/Testing/Packaging Improvement
+* Reduce the number of dependencies in the header files to speed up the build. [#47984](https://github.com/ClickHouse/ClickHouse/pull/47984) ([Dmitry Novik](https://github.com/novikd)).
+* Randomize compression of marks and indices in tests. [#48286](https://github.com/ClickHouse/ClickHouse/pull/48286) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Randomize vertical merges from compact to wide parts in tests. [#48287](https://github.com/ClickHouse/ClickHouse/pull/48287) ([Raúl Marín](https://github.com/Algunenano)).
+* With the current approach, all ports are calculated at the beginning and could overlap or even be highjacked, see [the report](https://s3.amazonaws.com/clickhouse-test-reports/46793/02928ae50c52f31ce8e5bfa99eb1b5db046f4a4f/integration_tests__release__[1/2]/integration_run_parallel8_0.log) for `port is already allocated`. It's possibly the reason for [#45368](https://github.com/ClickHouse/ClickHouse/issues/45368). [#48393](https://github.com/ClickHouse/ClickHouse/pull/48393) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update time zones. The following were updated: Africa/Cairo, Africa/Casablanca, Africa/El_Aaiun, America/Bogota, America/Cambridge_Bay, America/Ciudad_Juarez, America/Godthab, America/Inuvik, America/Iqaluit, America/Nuuk, America/Ojinaga, America/Pangnirtung, America/Rankin_Inlet, America/Resolute, America/Whitehorse, America/Yellowknife, Asia/Gaza, Asia/Hebron, Asia/Kuala_Lumpur, Asia/Singapore, Canada/Yukon, Egypt, Europe/Kirov, Europe/Volgograd, Singapore. [#48572](https://github.com/ClickHouse/ClickHouse/pull/48572) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support for CRC32 checksum in HDFS. Fix performance issues. [#48614](https://github.com/ClickHouse/ClickHouse/pull/48614) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove remainders of GCC support. [#48671](https://github.com/ClickHouse/ClickHouse/pull/48671) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add CI run with new analyzer infrastructure enabled. [#48719](https://github.com/ClickHouse/ClickHouse/pull/48719) ([Dmitry Novik](https://github.com/novikd)).
+* Not for changelog. [#48879](https://github.com/ClickHouse/ClickHouse/pull/48879) ([larryluogit](https://github.com/larryluogit)).
+* After the recent update, the `dockerd` requires `--tlsverify=false` together with the http port explicitly. [#48924](https://github.com/ClickHouse/ClickHouse/pull/48924) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Run more functional tests concurrently. [#48970](https://github.com/ClickHouse/ClickHouse/pull/48970) ([alesapin](https://github.com/alesapin)).
+* Fix glibc compatibility check: replace `preadv` from musl. [#49144](https://github.com/ClickHouse/ClickHouse/pull/49144) ([alesapin](https://github.com/alesapin)).
+* Use position independent encoding/code for sanitizers (at least msan :D) build to avoid issues with maximum relocation size. [#49145](https://github.com/ClickHouse/ClickHouse/pull/49145) ([alesapin](https://github.com/alesapin)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix system.query_views_log for MVs that are pushed from background threads [#46668](https://github.com/ClickHouse/ClickHouse/pull/46668) ([Azat Khuzhin](https://github.com/azat)).
+* Fix several `RENAME COLUMN` bugs [#46946](https://github.com/ClickHouse/ClickHouse/pull/46946) ([alesapin](https://github.com/alesapin)).
+* Fix minor hiliting issues in clickhouse-format [#47610](https://github.com/ClickHouse/ClickHouse/pull/47610) ([Natasha Murashkina](https://github.com/murfel)).
+* Fix crash for uploading parts which size is greater then INT_MAX to S3 [#47693](https://github.com/ClickHouse/ClickHouse/pull/47693) ([Azat Khuzhin](https://github.com/azat)).
+* Fix overflow in sparkbar function [#48121](https://github.com/ClickHouse/ClickHouse/pull/48121) ([Vladimir C](https://github.com/vdimir)).
+* Fix race in StorageS3 [#48190](https://github.com/ClickHouse/ClickHouse/pull/48190) ([Anton Popov](https://github.com/CurtizJ)).
+* Remove a feature [#48195](https://github.com/ClickHouse/ClickHouse/pull/48195) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix alter formatting (minor) [#48289](https://github.com/ClickHouse/ClickHouse/pull/48289) ([Natasha Murashkina](https://github.com/murfel)).
+* Fix cpu usage in rabbitmq (was worsened in 23.2 after [#44404](https://github.com/ClickHouse/ClickHouse/issues/44404)) [#48311](https://github.com/ClickHouse/ClickHouse/pull/48311) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix ThreadPool for DistributedSink and use StrongTypedef for CurrentMetrics/ProfileEvents/StatusInfo to avoid further errors [#48314](https://github.com/ClickHouse/ClickHouse/pull/48314) ([Azat Khuzhin](https://github.com/azat)).
+* Fix crash in EXPLAIN PIPELINE for Merge over Distributed [#48320](https://github.com/ClickHouse/ClickHouse/pull/48320) ([Azat Khuzhin](https://github.com/azat)).
+* Check node for Backup Restore concurrency [#48342](https://github.com/ClickHouse/ClickHouse/pull/48342) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* close client [#48347](https://github.com/ClickHouse/ClickHouse/pull/48347) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix serializing LowCardinality as Arrow dictionary [#48361](https://github.com/ClickHouse/ClickHouse/pull/48361) ([Kruglov Pavel](https://github.com/Avogar)).
+* Reset downloader for cache file segment in TemporaryFileStream [#48386](https://github.com/ClickHouse/ClickHouse/pull/48386) ([Vladimir C](https://github.com/vdimir)).
+* Fix possible SYSTEM SYNC REPLICA stuck in case of DROP/REPLACE PARTITION [#48391](https://github.com/ClickHouse/ClickHouse/pull/48391) ([Azat Khuzhin](https://github.com/azat)).
+* ClickHouse startup error when loading a distributed table that depends on a dictionary [#48419](https://github.com/ClickHouse/ClickHouse/pull/48419) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Don't check dependencies when renaming system tables automatically [#48431](https://github.com/ClickHouse/ClickHouse/pull/48431) ([Raúl Marín](https://github.com/Algunenano)).
+* Some fixes for parallel replicas [#48433](https://github.com/ClickHouse/ClickHouse/pull/48433) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Update only affected rows in KV storage [#48435](https://github.com/ClickHouse/ClickHouse/pull/48435) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix possible segfault in cache [#48469](https://github.com/ClickHouse/ClickHouse/pull/48469) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* toTimeZone function throw an error when no constant string is provided [#48471](https://github.com/ClickHouse/ClickHouse/pull/48471) ([Jordi Villar](https://github.com/jrdi)).
+* Fix logical error with IPv4 in Protobuf, add support for Date32 [#48486](https://github.com/ClickHouse/ClickHouse/pull/48486) ([Kruglov Pavel](https://github.com/Avogar)).
+* "changed" flag in system.settings is calculated incorrectly for settings with multiple values [#48516](https://github.com/ClickHouse/ClickHouse/pull/48516) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix storage `Memory` with enabled compression [#48517](https://github.com/ClickHouse/ClickHouse/pull/48517) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix bracketed-paste mode messing up password input in client reconnect [#48528](https://github.com/ClickHouse/ClickHouse/pull/48528) ([Michael Kolupaev](https://github.com/al13n321)).
+* Avoid sending `nullptr` to `memcpy` in `copyStringInArena` [#48532](https://github.com/ClickHouse/ClickHouse/pull/48532) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix nested map for keys of IP and UUID types [#48556](https://github.com/ClickHouse/ClickHouse/pull/48556) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix uncaught exception in case of parallel loader for hashed dictionaries [#48571](https://github.com/ClickHouse/ClickHouse/pull/48571) ([Azat Khuzhin](https://github.com/azat)).
+* `groupArray` returns cannot be nullable [#48593](https://github.com/ClickHouse/ClickHouse/pull/48593) ([lgbo](https://github.com/lgbo-ustc)).
+* Fix bug in Keeper when a node is not created with scheme `auth` in ACL sometimes. [#48595](https://github.com/ClickHouse/ClickHouse/pull/48595) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Fix IPv4 comparable with UInt [#48611](https://github.com/ClickHouse/ClickHouse/pull/48611) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix possible error from cache [#48636](https://github.com/ClickHouse/ClickHouse/pull/48636) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix async inserts with empty data [#48663](https://github.com/ClickHouse/ClickHouse/pull/48663) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix table dependencies in case of failed RENAME TABLE [#48683](https://github.com/ClickHouse/ClickHouse/pull/48683) ([Azat Khuzhin](https://github.com/azat)).
+* Fix zero-copy-replication on encrypted disks. [#48741](https://github.com/ClickHouse/ClickHouse/pull/48741) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix skip_unavailable_shards in case of unavailable hosts [#48771](https://github.com/ClickHouse/ClickHouse/pull/48771) ([Azat Khuzhin](https://github.com/azat)).
+* Fix key condition on duplicate primary keys [#48838](https://github.com/ClickHouse/ClickHouse/pull/48838) ([Amos Bird](https://github.com/amosbird)).
+* Fix for race in ZooKeeper when joining send_thread/receive_thread [#48849](https://github.com/ClickHouse/ClickHouse/pull/48849) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix unexpected part name error when trying to drop a ignored detached part with zero copy replication [#48862](https://github.com/ClickHouse/ClickHouse/pull/48862) ([Michael Lex](https://github.com/mlex)).
+* Fix reading Date32 Parquet/Arrow column into not Date32 column [#48864](https://github.com/ClickHouse/ClickHouse/pull/48864) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix UNKNOWN_IDENTIFIER error while select from table with row policy and column with dots [#48976](https://github.com/ClickHouse/ClickHouse/pull/48976) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix aggregate empty string error [#48999](https://github.com/ClickHouse/ClickHouse/pull/48999) ([LiuNeng](https://github.com/liuneng1994)).
+* Fix postgres database setting [#49100](https://github.com/ClickHouse/ClickHouse/pull/49100) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky test_cache_with_full_disk_space [#49110](https://github.com/ClickHouse/ClickHouse/pull/49110) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix "prepared statement insert already exists" [#49154](https://github.com/ClickHouse/ClickHouse/pull/49154) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix replace[Regexp]{One,All}() with const haystacks [#49220](https://github.com/ClickHouse/ClickHouse/pull/49220) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### Build Improvement
+
+* Fixed hashing issue in creating partition IDs for s390x. [#48134](https://github.com/ClickHouse/ClickHouse/pull/48134) ([Harry Lee](https://github.com/HarryLeeIBM)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Randomize JIT settings in tests"'. [#48277](https://github.com/ClickHouse/ClickHouse/pull/48277) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Fix test "02494_query_cache_drop.sql"'. [#48358](https://github.com/ClickHouse/ClickHouse/pull/48358) ([Anton Popov](https://github.com/CurtizJ)).
+* NO CL ENTRY:  'Revert "Check simple dictionary key is native unsigned integer"'. [#48732](https://github.com/ClickHouse/ClickHouse/pull/48732) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Make Schema inference works for CREATE AS SELECT"'. [#48758](https://github.com/ClickHouse/ClickHouse/pull/48758) ([pufit](https://github.com/pufit)).
+* NO CL ENTRY:  'Revert "Add MemoryTracker for the background tasks"'. [#48760](https://github.com/ClickHouse/ClickHouse/pull/48760) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Added tests for ClickHouse apps help and fixed help issues"'. [#48991](https://github.com/ClickHouse/ClickHouse/pull/48991) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Adapt marks count for prefetch read pool"'. [#49068](https://github.com/ClickHouse/ClickHouse/pull/49068) ([Nikita Taranov](https://github.com/nickitat)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* merge and mutation make thread group for setting memory trackers right [#47104](https://github.com/ClickHouse/ClickHouse/pull/47104) ([Sema Checherinda](https://github.com/CheSema)).
+* Query plan: update sort description [#47319](https://github.com/ClickHouse/ClickHouse/pull/47319) ([Igor Nikonov](https://github.com/devcrafter)).
+* Sqllogic [#47784](https://github.com/ClickHouse/ClickHouse/pull/47784) ([Sema Checherinda](https://github.com/CheSema)).
+* Fix race between DROP MatView and RESTART REPLICAS [#47863](https://github.com/ClickHouse/ClickHouse/pull/47863) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Merge [#35113](https://github.com/ClickHouse/ClickHouse/issues/35113) [#47934](https://github.com/ClickHouse/ClickHouse/pull/47934) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add a test for ClientInfo initial_query_start_time in inter-server mode [#48036](https://github.com/ClickHouse/ClickHouse/pull/48036) ([Azat Khuzhin](https://github.com/azat)).
+* Make custom key for parallel replicas work in new analyzer [#48054](https://github.com/ClickHouse/ClickHouse/pull/48054) ([Antonio Andelic](https://github.com/antonio2368)).
+* throw exception while non-parametric functions having parameters [#48115](https://github.com/ClickHouse/ClickHouse/pull/48115) ([save-my-heart](https://github.com/save-my-heart)).
+* Move FunctionsJSON implementation to header file [#48142](https://github.com/ClickHouse/ClickHouse/pull/48142) ([DimasKovas](https://github.com/DimasKovas)).
+* Use ThreadPool in PipelineExecutor [#48146](https://github.com/ClickHouse/ClickHouse/pull/48146) ([Azat Khuzhin](https://github.com/azat)).
+* Add sanity checks for writing number in variable length format (resubmit) [#48154](https://github.com/ClickHouse/ClickHouse/pull/48154) ([Azat Khuzhin](https://github.com/azat)).
+* Try fix 02151_hash_table_sizes_stats.sh test [#48178](https://github.com/ClickHouse/ClickHouse/pull/48178) ([Nikita Taranov](https://github.com/nickitat)).
+* Add scripts for sparse checkout of some contribs [#48183](https://github.com/ClickHouse/ClickHouse/pull/48183) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Do not take lock for shared context in setTempDataOnDisk [#48219](https://github.com/ClickHouse/ClickHouse/pull/48219) ([Vladimir C](https://github.com/vdimir)).
+* parseDateTime[InJodaSyntax](): Require format argument [#48222](https://github.com/ClickHouse/ClickHouse/pull/48222) ([Robert Schulze](https://github.com/rschu1ze)).
+* Do not  partially cancel processors added from expand pipeline. [#48231](https://github.com/ClickHouse/ClickHouse/pull/48231) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix some tests [#48267](https://github.com/ClickHouse/ClickHouse/pull/48267) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix compiling examples without Hive [#48269](https://github.com/ClickHouse/ClickHouse/pull/48269) ([Azat Khuzhin](https://github.com/azat)).
+* In messages, put values into quotes [#48271](https://github.com/ClickHouse/ClickHouse/pull/48271) ([Vadim Chekan](https://github.com/vchekan)).
+* Fix 01710_projection_optimize_materialize flakiness [#48276](https://github.com/ClickHouse/ClickHouse/pull/48276) ([Azat Khuzhin](https://github.com/azat)).
+* Fix UB (signed integer overflow) in StorageMergeTree::backupData() [#48278](https://github.com/ClickHouse/ClickHouse/pull/48278) ([Azat Khuzhin](https://github.com/azat)).
+* Update version after release [#48279](https://github.com/ClickHouse/ClickHouse/pull/48279) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update version_date.tsv and changelogs after v23.3.1.2823-lts [#48281](https://github.com/ClickHouse/ClickHouse/pull/48281) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Small follow-up to [#48017](https://github.com/ClickHouse/ClickHouse/issues/48017) [#48292](https://github.com/ClickHouse/ClickHouse/pull/48292) ([Robert Schulze](https://github.com/rschu1ze)).
+* Try to update arrow library to release 11.0.0 [#48294](https://github.com/ClickHouse/ClickHouse/pull/48294) ([Kruglov Pavel](https://github.com/Avogar)).
+* fix test numbers again 2 [#48295](https://github.com/ClickHouse/ClickHouse/pull/48295) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix: copy forgotten show_secrets in FormatSettings semi-copy-ctor [#48297](https://github.com/ClickHouse/ClickHouse/pull/48297) ([Natasha Murashkina](https://github.com/murfel)).
+* Do not remove inputs from maybe compiled DAG. [#48303](https://github.com/ClickHouse/ClickHouse/pull/48303) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Update version_date.tsv and changelogs after v22.3.20.29-lts [#48304](https://github.com/ClickHouse/ClickHouse/pull/48304) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v22.12.6.22-stable, v22.3.20.29-lts [#48305](https://github.com/ClickHouse/ClickHouse/pull/48305) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Merging [#46323](https://github.com/ClickHouse/ClickHouse/issues/46323) [#48312](https://github.com/ClickHouse/ClickHouse/pull/48312) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Follow-up to [#47863](https://github.com/ClickHouse/ClickHouse/issues/47863) [#48315](https://github.com/ClickHouse/ClickHouse/pull/48315) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* test / some complex query (it fails with analyzer enabled) [#48324](https://github.com/ClickHouse/ClickHouse/pull/48324) ([Denny Crane](https://github.com/den-crane)).
+* Fix constraints after merge [#48328](https://github.com/ClickHouse/ClickHouse/pull/48328) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add logging for concurrency checks for backups [#48337](https://github.com/ClickHouse/ClickHouse/pull/48337) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Update version_date.tsv and changelogs after v23.1.6.42-stable [#48345](https://github.com/ClickHouse/ClickHouse/pull/48345) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.2.5.46-stable [#48346](https://github.com/ClickHouse/ClickHouse/pull/48346) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Fix lambda type resolution [#48355](https://github.com/ClickHouse/ClickHouse/pull/48355) ([Dmitry Novik](https://github.com/novikd)).
+* Avoid abort in protobuf library in debug build [#48356](https://github.com/ClickHouse/ClickHouse/pull/48356) ([Kruglov Pavel](https://github.com/Avogar)).
+* Batch fix for projections analysis with analyzer. [#48357](https://github.com/ClickHouse/ClickHouse/pull/48357) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix tests with explain and analyzer where names changed. [#48360](https://github.com/ClickHouse/ClickHouse/pull/48360) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Small follow-up to [#45912](https://github.com/ClickHouse/ClickHouse/issues/45912) [#48373](https://github.com/ClickHouse/ClickHouse/pull/48373) ([Robert Schulze](https://github.com/rschu1ze)).
+* Update version_date.tsv and changelogs after v22.8.16.32-lts [#48376](https://github.com/ClickHouse/ClickHouse/pull/48376) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Add script for a slack bot that reports broken tests [#48382](https://github.com/ClickHouse/ClickHouse/pull/48382) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix flaky `test_keeper_mntr_data_size` [#48384](https://github.com/ClickHouse/ClickHouse/pull/48384) ([Antonio Andelic](https://github.com/antonio2368)).
+* WITH FILL clarification and cleanup [#48395](https://github.com/ClickHouse/ClickHouse/pull/48395) ([Igor Nikonov](https://github.com/devcrafter)).
+* Cleanup mess in .clang-tidy [#48396](https://github.com/ClickHouse/ClickHouse/pull/48396) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix test_backup_all [#48400](https://github.com/ClickHouse/ClickHouse/pull/48400) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Find big allocations without memory limits checks  [#48401](https://github.com/ClickHouse/ClickHouse/pull/48401) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix issue with krb5 and building w/ OpenSSL [#48407](https://github.com/ClickHouse/ClickHouse/pull/48407) ([Boris Kuschel](https://github.com/bkuschel)).
+* Make CI slack bot less noisy [#48409](https://github.com/ClickHouse/ClickHouse/pull/48409) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* AST fuzzer: Fix assertion in TopK serialization [#48412](https://github.com/ClickHouse/ClickHouse/pull/48412) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix possible flakiness of lightweight delete tests (due to index granularity randomization) [#48413](https://github.com/ClickHouse/ClickHouse/pull/48413) ([Azat Khuzhin](https://github.com/azat)).
+* Fix flaky `test_keeper_snapshots` [#48417](https://github.com/ClickHouse/ClickHouse/pull/48417) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update sort desc: more efficient original node search in ActionsDAG [#48427](https://github.com/ClickHouse/ClickHouse/pull/48427) ([Igor Nikonov](https://github.com/devcrafter)).
+* test for [#16399](https://github.com/ClickHouse/ClickHouse/issues/16399) [#48439](https://github.com/ClickHouse/ClickHouse/pull/48439) ([Denny Crane](https://github.com/den-crane)).
+* Better exception messages from Keeper client [#48444](https://github.com/ClickHouse/ClickHouse/pull/48444) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Small documentation follow-up to [#47246](https://github.com/ClickHouse/ClickHouse/issues/47246) [#48463](https://github.com/ClickHouse/ClickHouse/pull/48463) ([Robert Schulze](https://github.com/rschu1ze)).
+* Update 00002_log_and_exception_messages_formatting.sql [#48467](https://github.com/ClickHouse/ClickHouse/pull/48467) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Avoid operation on uninitialised data in readDateTimeTextImpl [#48472](https://github.com/ClickHouse/ClickHouse/pull/48472) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add reading step for system zookeeper. Analyze path from filter DAG. [#48485](https://github.com/ClickHouse/ClickHouse/pull/48485) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix deadlock due to debug tracking of memory allocations [#48487](https://github.com/ClickHouse/ClickHouse/pull/48487) ([Azat Khuzhin](https://github.com/azat)).
+* Register datediff and trim aliases in system.functions [#48489](https://github.com/ClickHouse/ClickHouse/pull/48489) ([Robert Schulze](https://github.com/rschu1ze)).
+* Change error code [#48490](https://github.com/ClickHouse/ClickHouse/pull/48490) ([Anton Popov](https://github.com/CurtizJ)).
+* Update 00002_log_and_exception_messages_formatting.sql [#48499](https://github.com/ClickHouse/ClickHouse/pull/48499) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix query cache with sparse columns [#48500](https://github.com/ClickHouse/ClickHouse/pull/48500) ([Anton Popov](https://github.com/CurtizJ)).
+* Use std::string_view to get rid of strlen [#48509](https://github.com/ClickHouse/ClickHouse/pull/48509) ([ltrk2](https://github.com/ltrk2)).
+* Fix bytesSize() of zk SetRequest [#48512](https://github.com/ClickHouse/ClickHouse/pull/48512) ([Sergei Trifonov](https://github.com/serxa)).
+* Remove dead code and unused dependencies [#48518](https://github.com/ClickHouse/ClickHouse/pull/48518) ([ltrk2](https://github.com/ltrk2)).
+* Use forward declaration of ThreadPool [#48519](https://github.com/ClickHouse/ClickHouse/pull/48519) ([Azat Khuzhin](https://github.com/azat)).
+* Use std::string_view instead of strlen [#48520](https://github.com/ClickHouse/ClickHouse/pull/48520) ([ltrk2](https://github.com/ltrk2)).
+* Use std::string::starts_with instead of a roll your own variant [#48521](https://github.com/ClickHouse/ClickHouse/pull/48521) ([ltrk2](https://github.com/ltrk2)).
+* Fix flaky `test_alternative_keeper_config` [#48533](https://github.com/ClickHouse/ClickHouse/pull/48533) ([Antonio Andelic](https://github.com/antonio2368)).
+* Use one ThreadGroup while pushing to materialized views (and some refactoring for ThreadGroup) [#48543](https://github.com/ClickHouse/ClickHouse/pull/48543) ([Azat Khuzhin](https://github.com/azat)).
+* Fix some tests [#48550](https://github.com/ClickHouse/ClickHouse/pull/48550) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix 02477_projection_materialize_and_zero_copy flakiness (due to index granularity randomization) [#48551](https://github.com/ClickHouse/ClickHouse/pull/48551) ([Azat Khuzhin](https://github.com/azat)).
+* Better exception message for ZSTD [#48552](https://github.com/ClickHouse/ClickHouse/pull/48552) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove misleading comment and block [#48562](https://github.com/ClickHouse/ClickHouse/pull/48562) ([Sergei Trifonov](https://github.com/serxa)).
+* Update 02207_allow_plaintext_and_no_password.sh [#48566](https://github.com/ClickHouse/ClickHouse/pull/48566) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* bugfix: compare Bits and sizeof(Arithmetic) * 8 [#48569](https://github.com/ClickHouse/ClickHouse/pull/48569) ([caipengxiang](https://github.com/awfeequdng)).
+* Remove superfluous includes of logger_userful.h from headers [#48570](https://github.com/ClickHouse/ClickHouse/pull/48570) ([Azat Khuzhin](https://github.com/azat)).
+* Remove slow test from debug builds [#48574](https://github.com/ClickHouse/ClickHouse/pull/48574) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Don't use type conversion with String query parameters [#48577](https://github.com/ClickHouse/ClickHouse/pull/48577) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix TSan report in Kerberos [#48579](https://github.com/ClickHouse/ClickHouse/pull/48579) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add second_deadlock_stack=1 for TSan on CI and fix some lock-order-inversion problems [#48596](https://github.com/ClickHouse/ClickHouse/pull/48596) ([Azat Khuzhin](https://github.com/azat)).
+* Fix LOGICAL_ERROR in executable table function [#48605](https://github.com/ClickHouse/ClickHouse/pull/48605) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix flakiness of test_store_cleanup in case of image rebuild [#48610](https://github.com/ClickHouse/ClickHouse/pull/48610) ([Azat Khuzhin](https://github.com/azat)).
+* Remove strange code [#48612](https://github.com/ClickHouse/ClickHouse/pull/48612) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Minor refactoring of formatDateTime() [#48627](https://github.com/ClickHouse/ClickHouse/pull/48627) ([Robert Schulze](https://github.com/rschu1ze)).
+* Better handling of values too large for VarInt encoding [#48628](https://github.com/ClickHouse/ClickHouse/pull/48628) ([Robert Schulze](https://github.com/rschu1ze)).
+* refine some messages of exception in regexp tree [#48632](https://github.com/ClickHouse/ClickHouse/pull/48632) ([Han Fei](https://github.com/hanfei1991)).
+* Partially revert e0252db8d and fix pr-bugfix labeling [#48637](https://github.com/ClickHouse/ClickHouse/pull/48637) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix build src/Interpreters/InterpreterInsertQuery.h [#48638](https://github.com/ClickHouse/ClickHouse/pull/48638) ([Vladimir C](https://github.com/vdimir)).
+* Fix build ThreadGroupPtr [#48641](https://github.com/ClickHouse/ClickHouse/pull/48641) ([Vladimir C](https://github.com/vdimir)).
+* Fix flaky test test_drop_replica_and_achieve_quorum [#48642](https://github.com/ClickHouse/ClickHouse/pull/48642) ([Kruglov Pavel](https://github.com/Avogar)).
+* fix 02504_regexp_dictionary_table_source [#48662](https://github.com/ClickHouse/ClickHouse/pull/48662) ([Han Fei](https://github.com/hanfei1991)).
+* Remove strange code from MutateTask [#48666](https://github.com/ClickHouse/ClickHouse/pull/48666) ([alesapin](https://github.com/alesapin)).
+* SonarCloud: C++ Reporting Standards [#48668](https://github.com/ClickHouse/ClickHouse/pull/48668) ([Julio Jimenez](https://github.com/juliojimenez)).
+* Remove lock for duplicated parts UUIDs (allow_experimental_query_deduplication=1) [#48670](https://github.com/ClickHouse/ClickHouse/pull/48670) ([Azat Khuzhin](https://github.com/azat)).
+* show result of minio listings for test test_attach_detach_partition [#48674](https://github.com/ClickHouse/ClickHouse/pull/48674) ([Sema Checherinda](https://github.com/CheSema)).
+* Fix tests for analyzer [#48675](https://github.com/ClickHouse/ClickHouse/pull/48675) ([Igor Nikonov](https://github.com/devcrafter)).
+* Call IProcessor::onCancel() once [#48687](https://github.com/ClickHouse/ClickHouse/pull/48687) ([Igor Nikonov](https://github.com/devcrafter)).
+* Update MergeTree syntax for optional index granularity argument [#48692](https://github.com/ClickHouse/ClickHouse/pull/48692) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add test for old bug [#7826](https://github.com/ClickHouse/ClickHouse/issues/7826) [#48697](https://github.com/ClickHouse/ClickHouse/pull/48697) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix flaky `test_keeper_session` [#48699](https://github.com/ClickHouse/ClickHouse/pull/48699) ([Antonio Andelic](https://github.com/antonio2368)).
+* Better messages formatting in the CI Slack bot [#48712](https://github.com/ClickHouse/ClickHouse/pull/48712) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add trusted contributors [#48715](https://github.com/ClickHouse/ClickHouse/pull/48715) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Do not remove broken detached parts on startup [#48730](https://github.com/ClickHouse/ClickHouse/pull/48730) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Remove `-Wshadow` suppression which leaked into global namespace [#48737](https://github.com/ClickHouse/ClickHouse/pull/48737) ([Robert Schulze](https://github.com/rschu1ze)).
+* VarInt coding: Always perform sanity check [#48740](https://github.com/ClickHouse/ClickHouse/pull/48740) ([Robert Schulze](https://github.com/rschu1ze)).
+* Try to fix flaky 02455_one_row_from_csv_memory_usage [#48756](https://github.com/ClickHouse/ClickHouse/pull/48756) ([Dmitry Novik](https://github.com/novikd)).
+* insert UInt32 Hashvalue in reverse order on big endian machine [#48764](https://github.com/ClickHouse/ClickHouse/pull/48764) ([Suzy Wang](https://github.com/SuzyWangIBMer)).
+* Limit size of messages from the CI slack bot [#48766](https://github.com/ClickHouse/ClickHouse/pull/48766) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update README.md [#48776](https://github.com/ClickHouse/ClickHouse/pull/48776) ([Tyler Hannan](https://github.com/tylerhannan)).
+* Remove duplicate definition of SingleEndpointHTTPSessionPool [#48779](https://github.com/ClickHouse/ClickHouse/pull/48779) ([JaySon](https://github.com/JaySon-Huang)).
+* Fix flaky test_version_update_after_mutation/test.py::test_upgrade_while_mutation [#48783](https://github.com/ClickHouse/ClickHouse/pull/48783) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky test test_backup_all [#48789](https://github.com/ClickHouse/ClickHouse/pull/48789) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix a confusing warning about interserver mode [#48793](https://github.com/ClickHouse/ClickHouse/pull/48793) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Store clusters from ClusterDiscovery in separate map [#48795](https://github.com/ClickHouse/ClickHouse/pull/48795) ([Vladimir C](https://github.com/vdimir)).
+* Reimplement [#48790](https://github.com/ClickHouse/ClickHouse/issues/48790) [#48797](https://github.com/ClickHouse/ClickHouse/pull/48797) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Allow running integration tests without spark [#48803](https://github.com/ClickHouse/ClickHouse/pull/48803) ([Vitaly Baranov](https://github.com/vitlibar)).
+* forbid gwpsan in debug mode to rescue stress tests [#48804](https://github.com/ClickHouse/ClickHouse/pull/48804) ([Han Fei](https://github.com/hanfei1991)).
+* Simplify FileCacheFactory [#48805](https://github.com/ClickHouse/ClickHouse/pull/48805) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix double whitespace in exception message [#48815](https://github.com/ClickHouse/ClickHouse/pull/48815) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a test for [#38128](https://github.com/ClickHouse/ClickHouse/issues/38128) [#48817](https://github.com/ClickHouse/ClickHouse/pull/48817) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove excessive logging [#48826](https://github.com/ClickHouse/ClickHouse/pull/48826) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* remove duplicate indentwith in clang-format [#48834](https://github.com/ClickHouse/ClickHouse/pull/48834) ([cluster](https://github.com/infdahai)).
+* Try fix flacky test_concurrent_alter_move_and_drop [#48843](https://github.com/ClickHouse/ClickHouse/pull/48843) ([Sergei Trifonov](https://github.com/serxa)).
+* fix the race wait loading parts [#48844](https://github.com/ClickHouse/ClickHouse/pull/48844) ([Sema Checherinda](https://github.com/CheSema)).
+* suppress assert of progress for test_system_replicated_fetches [#48856](https://github.com/ClickHouse/ClickHouse/pull/48856) ([Han Fei](https://github.com/hanfei1991)).
+* Fix: do not run test_store_cleanup_disk_s3 in parallel [#48863](https://github.com/ClickHouse/ClickHouse/pull/48863) ([Igor Nikonov](https://github.com/devcrafter)).
+* Update README.md [#48883](https://github.com/ClickHouse/ClickHouse/pull/48883) ([Tyler Hannan](https://github.com/tylerhannan)).
+* Fix test reference files for join using nullable column [#48893](https://github.com/ClickHouse/ClickHouse/pull/48893) ([Vladimir C](https://github.com/vdimir)).
+* bitNot marked as NO_SANITIZE_UNDEFINED [#48899](https://github.com/ClickHouse/ClickHouse/pull/48899) ([Vladimir C](https://github.com/vdimir)).
+* Fix order by in test_storage_delta [#48903](https://github.com/ClickHouse/ClickHouse/pull/48903) ([Vladimir C](https://github.com/vdimir)).
+* Fix segfault when set is not built yet [#48904](https://github.com/ClickHouse/ClickHouse/pull/48904) ([Alexander Gololobov](https://github.com/davenger)).
+* A non significant change (does not affect anything): add support for signed integers in the maskBits function [#48920](https://github.com/ClickHouse/ClickHouse/pull/48920) ([caipengxiang](https://github.com/awfeequdng)).
+* Follow-up to [#48866](https://github.com/ClickHouse/ClickHouse/issues/48866) [#48929](https://github.com/ClickHouse/ClickHouse/pull/48929) ([Robert Schulze](https://github.com/rschu1ze)).
+* Un-flake 01079_new_range_reader_segfault [#48934](https://github.com/ClickHouse/ClickHouse/pull/48934) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add building stage to the fasttests report, respect existing status on rerun [#48935](https://github.com/ClickHouse/ClickHouse/pull/48935) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update Settings.h [#48948](https://github.com/ClickHouse/ClickHouse/pull/48948) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Update cluster.py [#48949](https://github.com/ClickHouse/ClickHouse/pull/48949) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Docs: Replace annoying three spaces in enumerations by a single space [#48951](https://github.com/ClickHouse/ClickHouse/pull/48951) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix flaky 02706_arrow_different_dictionaries [#48952](https://github.com/ClickHouse/ClickHouse/pull/48952) ([Kruglov Pavel](https://github.com/Avogar)).
+* Use default `{replica}`, `{shard}` arguments in Replicated engine [#48961](https://github.com/ClickHouse/ClickHouse/pull/48961) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Rename quantileApprox -> quantileGK [#48969](https://github.com/ClickHouse/ClickHouse/pull/48969) ([Vladimir C](https://github.com/vdimir)).
+* Don't throw logical error when column is not found in Parquet/Arrow schema [#48987](https://github.com/ClickHouse/ClickHouse/pull/48987) ([Kruglov Pavel](https://github.com/Avogar)).
+* Reimplement [#48986](https://github.com/ClickHouse/ClickHouse/issues/48986) [#49005](https://github.com/ClickHouse/ClickHouse/pull/49005) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Dont allow bad changelogs [#49006](https://github.com/ClickHouse/ClickHouse/pull/49006) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update README.md [#49007](https://github.com/ClickHouse/ClickHouse/pull/49007) ([Nick-71](https://github.com/Nick-71)).
+* Remove outdated test [#49014](https://github.com/ClickHouse/ClickHouse/pull/49014) ([alesapin](https://github.com/alesapin)).
+* Fix typo [#49027](https://github.com/ClickHouse/ClickHouse/pull/49027) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix assertion after [#48636](https://github.com/ClickHouse/ClickHouse/issues/48636) [#49029](https://github.com/ClickHouse/ClickHouse/pull/49029) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix build error for big-endian platforms [#49037](https://github.com/ClickHouse/ClickHouse/pull/49037) ([ltrk2](https://github.com/ltrk2)).
+* Update version_date.tsv and changelogs after v22.8.17.17-lts [#49046](https://github.com/ClickHouse/ClickHouse/pull/49046) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.1.7.30-stable [#49047](https://github.com/ClickHouse/ClickHouse/pull/49047) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.3.2.37-lts [#49048](https://github.com/ClickHouse/ClickHouse/pull/49048) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Remove some code [#49054](https://github.com/ClickHouse/ClickHouse/pull/49054) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove some dead code in poco [#49075](https://github.com/ClickHouse/ClickHouse/pull/49075) ([Robert Schulze](https://github.com/rschu1ze)).
+* Prevent false positive report by static analyzer [#49078](https://github.com/ClickHouse/ClickHouse/pull/49078) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update version_date.tsv and changelogs after v23.2.6.34-stable [#49080](https://github.com/ClickHouse/ClickHouse/pull/49080) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Enforce documentation change for a new-feature PR [#49090](https://github.com/ClickHouse/ClickHouse/pull/49090) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update clickhouse-test [#49094](https://github.com/ClickHouse/ClickHouse/pull/49094) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Disable long 02581 in debug, enable with sanitizers [#49105](https://github.com/ClickHouse/ClickHouse/pull/49105) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix flaky integration test test_async_query_sending [#49107](https://github.com/ClickHouse/ClickHouse/pull/49107) ([Kruglov Pavel](https://github.com/Avogar)).
+* Correct functional test to reflect interoperability [#49108](https://github.com/ClickHouse/ClickHouse/pull/49108) ([ltrk2](https://github.com/ltrk2)).
+* Cleanup build guide [#49119](https://github.com/ClickHouse/ClickHouse/pull/49119) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix building iceberg without avro [#49125](https://github.com/ClickHouse/ClickHouse/pull/49125) ([Azat Khuzhin](https://github.com/azat)).
+* Add slash for close tag of user_defined_zookeeper_path [#49131](https://github.com/ClickHouse/ClickHouse/pull/49131) ([Hollin](https://github.com/Hooollin)).
+* Improve some lambdas [#49133](https://github.com/ClickHouse/ClickHouse/pull/49133) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Do not randomize prefetch settings for debug build [#49134](https://github.com/ClickHouse/ClickHouse/pull/49134) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Don't throw LOGICAL_ERROR when reading from remote if there is no local replica [#49136](https://github.com/ClickHouse/ClickHouse/pull/49136) ([Raúl Marín](https://github.com/Algunenano)).
+* Docs: Make caption of processors_profile_log page consistent with other pages [#49138](https://github.com/ClickHouse/ClickHouse/pull/49138) ([Robert Schulze](https://github.com/rschu1ze)).
+* Improve test reports [#49151](https://github.com/ClickHouse/ClickHouse/pull/49151) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add a note regarding private/public repo to logs [#49152](https://github.com/ClickHouse/ClickHouse/pull/49152) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* suppress two timeout tests [#49175](https://github.com/ClickHouse/ClickHouse/pull/49175) ([Han Fei](https://github.com/hanfei1991)).
+* Document makeDateTime() and its variants [#49183](https://github.com/ClickHouse/ClickHouse/pull/49183) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix after [#49110](https://github.com/ClickHouse/ClickHouse/issues/49110) [#49206](https://github.com/ClickHouse/ClickHouse/pull/49206) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
diff --git a/docs/changelogs/v23.4.2.11-stable.md b/docs/changelogs/v23.4.2.11-stable.md
new file mode 100644
index 00000000000..3c572b9c1cb
--- /dev/null
+++ b/docs/changelogs/v23.4.2.11-stable.md
@@ -0,0 +1,20 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.4.2.11-stable (b6442320f9d) FIXME as compared to v23.4.1.1943-stable (3920eb987f7)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Revert "Fix GCS native copy ([#48981](https://github.com/ClickHouse/ClickHouse/issues/48981))" [#49194](https://github.com/ClickHouse/ClickHouse/pull/49194) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix race on Outdated parts loading [#49223](https://github.com/ClickHouse/ClickHouse/pull/49223) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Implement status comment [#48468](https://github.com/ClickHouse/ClickHouse/pull/48468) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update curl to 8.0.1 (for CVEs) [#48765](https://github.com/ClickHouse/ClickHouse/pull/48765) ([Boris Kuschel](https://github.com/bkuschel)).
+* Fallback auth gh api [#49314](https://github.com/ClickHouse/ClickHouse/pull/49314) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/en/development/architecture.md b/docs/en/development/architecture.md
index 50b338844df..ba81b31b8ef 100644
--- a/docs/en/development/architecture.md
+++ b/docs/en/development/architecture.md
@@ -79,8 +79,8 @@ In most cases, the read method is only responsible for reading the specified col
 
 But there are notable exceptions:
 
--   The AST query is passed to the `read` method, and the table engine can use it to derive index usage and to read fewer data from a table.
--   Sometimes the table engine can process data itself to a specific stage. For example, `StorageDistributed` can send a query to remote servers, ask them to process data to a stage where data from different remote servers can be merged, and return that preprocessed data. The query interpreter then finishes processing the data.
+- The AST query is passed to the `read` method, and the table engine can use it to derive index usage and to read fewer data from a table.
+- Sometimes the table engine can process data itself to a specific stage. For example, `StorageDistributed` can send a query to remote servers, ask them to process data to a stage where data from different remote servers can be merged, and return that preprocessed data. The query interpreter then finishes processing the data.
 
 The table’s `read` method can return multiple `IBlockInputStream` objects to allow parallel data processing. These multiple block input streams can read from a table in parallel. Then you can wrap these streams with various transformations (such as expression evaluation or filtering) that can be calculated independently and create a `UnionBlockInputStream` on top of them, to read from multiple streams in parallel.
 
@@ -98,7 +98,7 @@ A hand-written recursive descent parser parses a query. For example, `ParserSele
 
 ## Interpreters {#interpreters}
 
-Interpreters are responsible for creating the query execution pipeline from an `AST`. There are simple interpreters, such as `InterpreterExistsQuery` and `InterpreterDropQuery`, or the more sophisticated `InterpreterSelectQuery`. The query execution pipeline is a combination of block input or output streams. For example, the result of interpreting the `SELECT` query is the `IBlockInputStream` to read the result set from; the result of the INSERT query is the `IBlockOutputStream` to write data for insertion to, and the result of interpreting the `INSERT SELECT` query is the `IBlockInputStream` that returns an empty result set on the first read, but that copies data from `SELECT` to `INSERT` at the same time.
+Interpreters are responsible for creating the query execution pipeline from an `AST`. There are simple interpreters, such as `InterpreterExistsQuery` and `InterpreterDropQuery`, or the more sophisticated `InterpreterSelectQuery`. The query execution pipeline is a combination of block input or output streams. For example, the result of interpreting the `SELECT` query is the `IBlockInputStream` to read the result set from; the result of the `INSERT` query is the `IBlockOutputStream` to write data for insertion to, and the result of interpreting the `INSERT SELECT` query is the `IBlockInputStream` that returns an empty result set on the first read, but that copies data from `SELECT` to `INSERT` at the same time.
 
 `InterpreterSelectQuery` uses `ExpressionAnalyzer` and `ExpressionActions` machinery for query analysis and transformations. This is where most rule-based query optimizations are done. `ExpressionAnalyzer` is quite messy and should be rewritten: various query transformations and optimizations should be extracted to separate classes to allow modular transformations of query.
 
@@ -132,9 +132,9 @@ Aggregation states can be serialized and deserialized to pass over the network d
 
 The server implements several different interfaces:
 
--   An HTTP interface for any foreign clients.
--   A TCP interface for the native ClickHouse client and for cross-server communication during distributed query execution.
--   An interface for transferring data for replication.
+- An HTTP interface for any foreign clients.
+- A TCP interface for the native ClickHouse client and for cross-server communication during distributed query execution.
+- An interface for transferring data for replication.
 
 Internally, it is just a primitive multithread server without coroutines or fibers. Since the server is not designed to process a high rate of simple queries but to process a relatively low rate of complex queries, each of them can process a vast amount of data for analytics.
 
@@ -172,7 +172,7 @@ Global thread pool is `GlobalThreadPool` singleton class. To allocate thread fro
 
 Global pool is universal and all pools described below are implemented on top of it. This can be thought of as a hierarchy of pools. Any specialized pool takes its threads from the global pool using `ThreadPool` class. So the main purpose of any specialized pool is to apply limit on the number of simultaneous jobs and do job scheduling. If there are more jobs scheduled than threads in a pool, `ThreadPool` accumulates jobs in a queue with priorities. Each job has an integer priority. Default priority is zero. All jobs with higher priority values are started before any job with lower priority value. But there is no difference between already executing jobs, thus priority matters only when the pool in overloaded.
 
-IO thread pool is implemented as a plain `ThreadPool` accessible via `IOThreadPool::get()` method. It is configured in the same way as global pool with `max_io_thread_pool_size`, `max_io_thread_pool_free_size` and `io_thread_pool_queue_size` settings. The main purpose of IO thread pool is to avoid exhaustion of the global pool with IO jobs, which could prevent queries from fully utilizing CPU.
+IO thread pool is implemented as a plain `ThreadPool` accessible via `IOThreadPool::get()` method. It is configured in the same way as global pool with `max_io_thread_pool_size`, `max_io_thread_pool_free_size` and `io_thread_pool_queue_size` settings. The main purpose of IO thread pool is to avoid exhaustion of the global pool with IO jobs, which could prevent queries from fully utilizing CPU. Backup to S3 does significant amount of IO operations and to avoid impact on interactive queries there is a separate `BackupsIOThreadPool` configured with `max_backups_io_thread_pool_size`, `max_backups_io_thread_pool_free_size` and `backups_io_thread_pool_queue_size` settings.
 
 For periodic task execution there is `BackgroundSchedulePool` class. You can register tasks using `BackgroundSchedulePool::TaskHolder` objects and the pool ensures that no task runs two jobs at the same time. It also allows you to postpone task execution to a specific instant in the future or temporarily deactivate task. Global `Context` provides a few instances of this class for different purposes. For general purpose tasks `Context::getSchedulePool()` is used.
 
diff --git a/docs/en/development/build-cross-osx.md b/docs/en/development/build-cross-osx.md
index 1df88dbb235..ce8d1b77526 100644
--- a/docs/en/development/build-cross-osx.md
+++ b/docs/en/development/build-cross-osx.md
@@ -11,14 +11,14 @@ This is intended for continuous integration checks that run on Linux servers. If
 
 The cross-build for macOS is based on the [Build instructions](../development/build.md), follow them first.
 
-## Install Clang-14
+## Install Clang-16
 
 Follow the instructions from https://apt.llvm.org/ for your Ubuntu or Debian setup.
 For example the commands for Bionic are like:
 
 ``` bash
-sudo echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-14 main" >> /etc/apt/sources.list
-sudo apt-get install clang-14
+sudo echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-16 main" >> /etc/apt/sources.list
+sudo apt-get install clang-16
 ```
 
 ## Install Cross-Compilation Toolset {#install-cross-compilation-toolset}
@@ -55,7 +55,7 @@ curl -L 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX1
 cd ClickHouse
 mkdir build-darwin
 cd build-darwin
-CC=clang-14 CXX=clang++-14 cmake -DCMAKE_AR:FILEPATH=${CCTOOLS}/bin/x86_64-apple-darwin-ar -DCMAKE_INSTALL_NAME_TOOL=${CCTOOLS}/bin/x86_64-apple-darwin-install_name_tool -DCMAKE_RANLIB:FILEPATH=${CCTOOLS}/bin/x86_64-apple-darwin-ranlib -DLINKER_NAME=${CCTOOLS}/bin/x86_64-apple-darwin-ld -DCMAKE_TOOLCHAIN_FILE=cmake/darwin/toolchain-x86_64.cmake ..
+CC=clang-16 CXX=clang++-16 cmake -DCMAKE_AR:FILEPATH=${CCTOOLS}/bin/x86_64-apple-darwin-ar -DCMAKE_INSTALL_NAME_TOOL=${CCTOOLS}/bin/x86_64-apple-darwin-install_name_tool -DCMAKE_RANLIB:FILEPATH=${CCTOOLS}/bin/x86_64-apple-darwin-ranlib -DLINKER_NAME=${CCTOOLS}/bin/x86_64-apple-darwin-ld -DCMAKE_TOOLCHAIN_FILE=cmake/darwin/toolchain-x86_64.cmake ..
 ninja
 ```
 
diff --git a/docs/en/development/build-cross-riscv.md b/docs/en/development/build-cross-riscv.md
index a20913e7a32..e3550a046c7 100644
--- a/docs/en/development/build-cross-riscv.md
+++ b/docs/en/development/build-cross-riscv.md
@@ -11,7 +11,7 @@ This is for the case when you have Linux machine and want to use it to build `cl
 
 The cross-build for RISC-V 64 is based on the [Build instructions](../development/build.md), follow them first.
 
-## Install Clang-13
+## Install Clang-16
 
 Follow the instructions from https://apt.llvm.org/ for your Ubuntu or Debian setup or do
 ```
@@ -23,7 +23,7 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 ``` bash
 cd ClickHouse
 mkdir build-riscv64
-CC=clang-14 CXX=clang++-14 cmake . -Bbuild-riscv64 -G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-riscv64.cmake -DGLIBC_COMPATIBILITY=OFF -DENABLE_LDAP=OFF  -DOPENSSL_NO_ASM=ON -DENABLE_JEMALLOC=ON -DENABLE_PARQUET=OFF -DUSE_UNWIND=OFF -DENABLE_GRPC=OFF -DENABLE_HDFS=OFF -DENABLE_MYSQL=OFF
+CC=clang-16 CXX=clang++-16 cmake . -Bbuild-riscv64 -G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-riscv64.cmake -DGLIBC_COMPATIBILITY=OFF -DENABLE_LDAP=OFF  -DOPENSSL_NO_ASM=ON -DENABLE_JEMALLOC=ON -DENABLE_PARQUET=OFF -DUSE_UNWIND=OFF -DENABLE_GRPC=OFF -DENABLE_HDFS=OFF -DENABLE_MYSQL=OFF
 ninja -C build-riscv64
 ```
 
diff --git a/docs/en/development/build-cross-s390x.md b/docs/en/development/build-cross-s390x.md
new file mode 100644
index 00000000000..be2c37f5f41
--- /dev/null
+++ b/docs/en/development/build-cross-s390x.md
@@ -0,0 +1,123 @@
+---
+slug: /en/development/build-cross-s390x
+sidebar_position: 69
+title: How to Build, Run and Debug ClickHouse on Linux for s390x (zLinux)
+sidebar_label: Build on Linux for s390x (zLinux)
+---
+
+As of writing (2023/3/10) building for s390x considered to be experimental. Not all features can be enabled, has broken features and is currently under active development. 
+
+
+## Building
+
+As s390x does not support boringssl, it uses OpenSSL and has two related build options. 
+- By default, the s390x build will dynamically link to OpenSSL libraries. It will build OpenSSL shared objects, so it's not necessary to install OpenSSL beforehand. (This option is recommended in all cases.)
+- Another option is to build OpenSSL in-tree. In this case two build flags need to be supplied to cmake
+```bash
+-DENABLE_OPENSSL_DYNAMIC=0 -DENABLE_OPENSSL=1
+```
+
+These instructions assume that the host machine is x86_64 and has all the tooling required to build natively based on the [build instructions](../development/build.md). It also assumes that the host is Ubuntu 22.04 but the following instructions should also work on Ubuntu 20.04.
+
+In addition to installing the tooling used to build natively, the following additional packages need to be installed:
+
+```bash
+apt-get install binutils-s390x-linux-gnu libc6-dev-s390x-cross gcc-s390x-linux-gnu binfmt-support qemu-user-static
+```
+
+If you wish to cross compile rust code install the rust cross compile target for s390x:
+```bash
+rustup target add s390x-unknown-linux-gnu
+```
+
+To build for s390x:
+```bash
+cmake -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-s390x.cmake ..
+ninja
+```
+
+## Running
+
+Once built, the binary can be run with, eg.:
+
+```bash
+qemu-s390x-static -L /usr/s390x-linux-gnu ./clickhouse
+```
+
+## Debugging
+
+Install LLDB:
+
+```bash
+apt-get install lldb-15
+```
+
+To Debug a s390x executable, run clickhouse using QEMU in debug mode:
+
+```bash
+qemu-s390x-static -g 31338 -L /usr/s390x-linux-gnu ./clickhouse
+```
+
+In another shell run LLDB and attach, replace `<Clickhouse Parent Directory>` and `<build directory>` with the values corresponding to your environment.
+```bash
+lldb-15
+(lldb) target create ./clickhouse
+Current executable set to '/<Clickhouse Parent Directory>/ClickHouse/<build directory>/programs/clickhouse' (s390x).
+(lldb) settings set target.source-map <build directory> /<Clickhouse Parent Directory>/ClickHouse
+(lldb) gdb-remote 31338
+Process 1 stopped
+* thread #1, stop reason = signal SIGTRAP
+    frame #0: 0x0000004020e74cd0
+->  0x4020e74cd0: lgr    %r2, %r15
+    0x4020e74cd4: aghi   %r15, -160
+    0x4020e74cd8: xc     0(8,%r15), 0(%r15)
+    0x4020e74cde: brasl  %r14, 275429939040
+(lldb) b main
+Breakpoint 1: 9 locations.
+(lldb) c
+Process 1 resuming
+Process 1 stopped
+* thread #1, stop reason = breakpoint 1.1
+    frame #0: 0x0000004005cd9fc0 clickhouse`main(argc_=1, argv_=0x0000004020e594a8) at main.cpp:450:17
+   447  #if !defined(FUZZING_MODE)
+   448  int main(int argc_, char ** argv_)
+   449  {
+-> 450      inside_main = true;
+   451      SCOPE_EXIT({ inside_main = false; });
+   452
+   453      /// PHDR cache is required for query profiler to work reliably
+```
+
+## Visual Studio Code integration
+
+- [CodeLLDB extension](https://github.com/vadimcn/vscode-lldb) is required for visual debugging, the [Command Variable](https://github.com/rioj7/command-variable) extension can help dynamic launches if using [cmake variants](https://github.com/microsoft/vscode-cmake-tools/blob/main/docs/variants.md).
+- Make sure to set the backend to your llvm installation eg. `"lldb.library": "/usr/lib/x86_64-linux-gnu/liblldb-15.so"`
+- Launcher:
+```json
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug",
+            "type": "lldb",
+            "request": "custom",
+            "targetCreateCommands": ["target create ${command:cmake.launchTargetDirectory}/clickhouse"],
+            "processCreateCommands": ["settings set target.source-map ${input:targetdir} ${workspaceFolder}", "gdb-remote 31338"],
+            "sourceMap": { "${input:targetdir}": "${workspaceFolder}" },
+        }
+    ],
+	"inputs": [
+        {
+            "id": "targetdir",
+            "type": "command",
+            "command": "extension.commandvariable.transform",
+            "args": {
+                "text": "${command:cmake.launchTargetDirectory}",
+                "find": ".*/([^/]+)/[^/]+$",
+                "replace": "$1"
+            }
+        }
+    ]
+}
+```
+- Make sure to run the clickhouse executable in debug mode prior to launch. (It is also possible to create a `preLaunchTask` that automates this)
\ No newline at end of file
diff --git a/docs/en/development/build-osx.md b/docs/en/development/build-osx.md
index 63d1905bb61..e65de4a37e0 100644
--- a/docs/en/development/build-osx.md
+++ b/docs/en/development/build-osx.md
@@ -13,7 +13,7 @@ You can install pre-built ClickHouse as described in [Quick Start](https://click
 The build works on x86_64 (Intel) and arm64 (Apple Silicon) based on macOS 10.15 (Catalina) or higher with Homebrew's vanilla Clang.
 
 :::note
-It is also possible to compile with Apple's XCode `apple-clang` or Homebrew's `gcc`, but it's strongly discouraged.
+It is also possible to compile with Apple's XCode `apple-clang`, but it's strongly discouraged.
 :::
 
 ## Install Homebrew {#install-homebrew}
@@ -75,20 +75,6 @@ cmake --open .
 # The resulting binary will be created at: ./programs/Debug/clickhouse
 ```
 
-To build using Homebrew's vanilla GCC compiler (this option is only for development experiments, and is **absolutely not recommended** unless you really know what you are doing):
-
-``` bash
-cd ClickHouse
-mkdir build
-export PATH=$(brew --prefix binutils)/bin:$PATH
-export PATH=$(brew --prefix gcc)/bin:$PATH
-export CC=$(brew --prefix gcc)/bin/gcc-11
-export CXX=$(brew --prefix gcc)/bin/g++-11
-cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -S . -B build
-cmake --build build
-# The resulting binary will be created at: build/programs/clickhouse
-```
-
 ## Caveats {#caveats}
 
 If you intend to run `clickhouse-server`, make sure to increase the system’s `maxfiles` variable.
diff --git a/docs/en/development/build.md b/docs/en/development/build.md
index d52b018a5a7..c35e077a166 100644
--- a/docs/en/development/build.md
+++ b/docs/en/development/build.md
@@ -9,27 +9,27 @@ description: How to build ClickHouse on Linux
 
 Supported platforms:
 
--   x86_64
--   AArch64
--   Power9 (experimental)
+- x86_64
+- AArch64
+- Power9 (experimental)
 
-## Normal Build for Development on Ubuntu
+## Building on Ubuntu
 
-The following tutorial is based on the Ubuntu Linux system. With appropriate changes, it should also work on any other Linux distribution.
+The following tutorial is based on Ubuntu Linux.
+With appropriate changes, it should also work on any other Linux distribution.
+The minimum recommended Ubuntu version for development is 22.04 LTS.
 
 ### Install Prerequisites {#install-prerequisites}
 
 ``` bash
-sudo apt-get install git cmake ccache python3 ninja-build yasm gawk
+sudo apt-get install git cmake ccache python3 ninja-build nasm yasm gawk lsb-release wget software-properties-common gnupg
 ```
 
-Or cmake3 instead of cmake on older systems.
+### Install and Use the Clang compiler
 
-### Install the latest clang (recommended)
+On Ubuntu/Debian you can use LLVM's automatic installation script, see [here](https://apt.llvm.org/).
 
-On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
-
-```bash
+``` bash
 sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 ```
 
@@ -40,19 +40,22 @@ sudo apt-get install software-properties-common
 sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 ```
 
-For other Linux distribution - check the availability of the [prebuild packages](https://releases.llvm.org/download.html) or build clang [from sources](https://clang.llvm.org/get_started.html).
+For other Linux distribution - check the availability of LLVM's [prebuild packages](https://releases.llvm.org/download.html).
 
-#### Use the latest clang for Builds
+As of April 2023, any version of Clang >= 15 will work.
+GCC as a compiler is not supported
+To build with a specific Clang version:
+
+:::tip
+This is optional, if you are following along and just now installed Clang then check
+to see what version you have installed before setting this environment variable.
+:::
 
 ``` bash
-export CC=clang-15
-export CXX=clang++-15
+export CC=clang-16
+export CXX=clang++-16
 ```
 
-In this example we use version 15 that is the latest as of Sept 2022.
-
-Gcc cannot be used.
-
 ### Checkout ClickHouse Sources {#checkout-clickhouse-sources}
 
 ``` bash
@@ -70,79 +73,46 @@ git clone --recursive --shallow-submodules https://github.com/ClickHouse/ClickHo
 ``` bash
 cd ClickHouse
 mkdir build
-cd build
-cmake ..
-ninja
+cmake -S . -B build
+cmake --build build  # or: `cd build; ninja`
 ```
 
-To create an executable, run `ninja clickhouse`.
-This will create the `programs/clickhouse` executable, which can be used with `client` or `server` arguments.
+To create an executable, run `cmake --build build --target clickhouse` (or: `cd build; ninja clickhouse`).
+This will create executable `build/programs/clickhouse` which can be used with `client` or `server` arguments.
 
-## How to Build ClickHouse on Any Linux {#how-to-build-clickhouse-on-any-linux}
+## Building on Any Linux {#how-to-build-clickhouse-on-any-linux}
 
 The build requires the following components:
 
--   Git (is used only to checkout the sources, it’s not needed for the build)
--   CMake 3.15 or newer
--   Ninja
--   C++ compiler: clang-14 or newer
--   Linker: lld
--   Yasm
--   Gawk
+- Git (used to checkout the sources, not needed for the build)
+- CMake 3.20 or newer
+- Compiler: Clang 15 or newer
+- Linker: lld 15 or newer
+- Ninja
+- Yasm
+- Gawk
 
 If all the components are installed, you may build in the same way as the steps above.
 
-Example for Ubuntu Eoan:
-``` bash
-sudo apt update
-sudo apt install git cmake ninja-build clang++ python yasm gawk
-git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-mkdir build && cd build
-cmake ../ClickHouse
-ninja
-```
-
 Example for OpenSUSE Tumbleweed:
+
 ``` bash
-sudo zypper install git cmake ninja clang-c++ python lld yasm gawk
+sudo zypper install git cmake ninja clang-c++ python lld nasm yasm gawk
 git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-mkdir build && cd build
-cmake ../ClickHouse
-ninja
+mkdir build
+cmake -S . -B build
+cmake --build build
 ```
 
 Example for Fedora Rawhide:
+
 ``` bash
 sudo yum update
-sudo yum --nogpg install git cmake make clang python3 ccache yasm gawk
+sudo yum --nogpg install git cmake make clang python3 ccache nasm yasm gawk
 git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-mkdir build && cd build
-cmake ../ClickHouse
-make -j $(nproc)
-```
-
-Here is an example of how to build `clang` and all the llvm infrastructure from sources:
-
-```
-git clone git@github.com:llvm/llvm-project.git
-mkdir llvm-build && cd llvm-build
-cmake -DCMAKE_BUILD_TYPE:STRING=Release -DLLVM_ENABLE_PROJECTS=all ../llvm-project/llvm/
-make -j16
-sudo make install
-hash clang
-clang --version
-```
-
-You can install the older clang like clang-11 from packages and then use it to build the new clang from sources.
-
-Here is an example of how to install the new `cmake` from the official website:
-
-```
-wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.sh
-chmod +x cmake-3.22.2-linux-x86_64.sh
-./cmake-3.22.2-linux-x86_64.sh
-export PATH=/home/milovidov/work/cmake-3.22.2-linux-x86_64/bin/:${PATH}
-hash cmake
+mkdir build
+cmake -S . -B build
+cmake --build build
 ```
 
 ## You Don’t Have to Build ClickHouse {#you-dont-have-to-build-clickhouse}
@@ -159,4 +129,3 @@ The CI checks build the binaries on each commit to [ClickHouse](https://github.c
 1. Find the type of package for your operating system that you need and download the files.
 
 ![build artifact check](images/find-build-artifact.png)
-
diff --git a/docs/en/development/building_and_benchmarking_deflate_qpl.md b/docs/en/development/building_and_benchmarking_deflate_qpl.md
new file mode 100644
index 00000000000..0501c1cbdcb
--- /dev/null
+++ b/docs/en/development/building_and_benchmarking_deflate_qpl.md
@@ -0,0 +1,331 @@
+---
+slug: /en/development/building_and_benchmarking_deflate_qpl
+sidebar_position: 73
+sidebar_label: Building and Benchmarking DEFLATE_QPL
+description: How to build Clickhouse and run benchmark with DEFLATE_QPL Codec
+---
+
+# Build Clickhouse with DEFLATE_QPL
+
+- Make sure your target machine meet the QPL required [prerequisites](https://intel.github.io/qpl/documentation/get_started_docs/installation.html#prerequisites)
+- Pass the following flag to CMake when building ClickHouse:
+
+``` bash
+cmake -DENABLE_QPL=1 ..
+```
+
+- For generic requirements, please refer to Clickhouse generic [build instructions](/docs/en/development/build.md)
+
+# Run Benchmark with DEFLATE_QPL
+
+## Files list
+
+The folders `benchmark_sample` under [qpl-cmake](https://github.com/ClickHouse/ClickHouse/tree/master/contrib/qpl-cmake) give example to run benchmark with python scripts:
+
+`client_scripts` contains python scripts for running typical benchmark, for example:
+- `client_stressing_test.py`: The python script for query stress test with [1~4] server instances.
+- `queries_ssb.sql`: The file lists all queries for [Star Schema Benchmark](https://clickhouse.com/docs/en/getting-started/example-datasets/star-schema/)
+- `allin1_ssb.sh`: This shell script executes benchmark workflow all in one automatically.
+
+`database_files` means it will store database files according to lz4/deflate/zstd codec.
+
+## Run benchmark automatically for Star Schema:
+
+``` bash
+$ cd ./benchmark_sample/client_scripts
+$ sh run_ssb.sh
+```
+
+After complete, please check all the results in this folder:`./output/`
+
+In case you run into failure, please manually run benchmark as below sections.
+
+## Definition
+
+[CLICKHOUSE_EXE] means the path of clickhouse executable program.
+
+## Environment
+
+- CPU: Sapphire Rapid
+- OS Requirements refer to [System Requirements for QPL](https://intel.github.io/qpl/documentation/get_started_docs/installation.html#system-requirements)
+- IAA Setup refer to [Accelerator Configuration](https://intel.github.io/qpl/documentation/get_started_docs/installation.html#accelerator-configuration)
+- Install python modules:
+
+``` bash
+pip3 install clickhouse_driver numpy
+```
+
+[Self-check for IAA]
+
+``` bash
+$ accel-config list | grep -P 'iax|state'
+```
+
+Expected output like this:
+``` bash
+    "dev":"iax1",
+    "state":"enabled",
+            "state":"enabled",
+```
+
+If you see nothing output, it means IAA is not ready to work. Please check IAA setup again.
+
+## Generate raw data
+
+``` bash
+$ cd ./benchmark_sample
+$ mkdir rawdata_dir && cd rawdata_dir
+```
+
+Use [`dbgen`](https://clickhouse.com/docs/en/getting-started/example-datasets/star-schema) to generate 100 million rows data with the parameters:
+-s 20
+
+The files like `*.tbl` are expected to output under `./benchmark_sample/rawdata_dir/ssb-dbgen`:
+
+## Database setup
+
+Set up database with LZ4 codec
+
+``` bash
+$ cd ./database_dir/lz4
+$ [CLICKHOUSE_EXE] server -C config_lz4.xml >&/dev/null&
+$ [CLICKHOUSE_EXE] client
+```
+
+Here you should see the message `Connected to ClickHouse server` from console which means client successfully setup connection with server.
+
+Complete below three steps mentioned in [Star Schema Benchmark](https://clickhouse.com/docs/en/getting-started/example-datasets/star-schema)
+- Creating tables in ClickHouse
+- Inserting data. Here should use `./benchmark_sample/rawdata_dir/ssb-dbgen/*.tbl` as input data.
+- Converting “star schema” to de-normalized “flat schema”
+
+Set up database with with IAA Deflate codec
+
+``` bash
+$ cd ./database_dir/deflate
+$ [CLICKHOUSE_EXE] server -C config_deflate.xml >&/dev/null&
+$ [CLICKHOUSE_EXE] client
+```
+Complete three steps same as lz4 above
+
+Set up database with with ZSTD codec
+
+``` bash
+$ cd ./database_dir/zstd
+$ [CLICKHOUSE_EXE] server -C config_zstd.xml >&/dev/null&
+$ [CLICKHOUSE_EXE] client
+```
+Complete three steps same as lz4 above
+
+[self-check]
+For each codec(lz4/zstd/deflate), please execute below query to make sure the databases are created successfully:
+```sql
+select count() from lineorder_flat
+```
+You are expected to see below output:
+```sql
+┌───count()─┐
+│ 119994608 │
+└───────────┘
+```
+[Self-check for IAA Deflate codec]
+
+At the first time you execute insertion or query from client, clickhouse server console is expected to print this log:
+```text
+Hardware-assisted DeflateQpl codec is ready!
+```
+If you never find this, but see another log as below:
+```text
+Initialization of hardware-assisted DeflateQpl codec failed
+```
+That means IAA devices is not ready, you need check IAA setup again.
+
+## Benchmark with single instance 
+
+- Before start benchmark, Please disable C6 and set CPU frequency governor to be `performance`
+
+``` bash
+$ cpupower idle-set -d 3
+$ cpupower frequency-set -g performance
+```
+
+- To eliminate impact of memory bound on cross sockets, we use `numactl` to bind server on one socket and client on another socket.
+- Single instance means single server connected with single client
+
+Now run benchmark for LZ4/Deflate/ZSTD respectively:
+
+LZ4:
+
+``` bash
+$ cd ./database_dir/lz4 
+$ numactl -m 0 -N 0 [CLICKHOUSE_EXE] server -C config_lz4.xml >&/dev/null&
+$ cd ./client_scripts
+$ numactl -m 1 -N 1 python3 client_stressing_test.py queries_ssb.sql 1 > lz4.log
+```
+
+IAA deflate:
+
+``` bash
+$ cd ./database_dir/deflate
+$ numactl -m 0 -N 0 [CLICKHOUSE_EXE] server -C config_deflate.xml >&/dev/null&
+$ cd ./client_scripts
+$ numactl -m 1 -N 1 python3 client_stressing_test.py queries_ssb.sql 1 > deflate.log
+```
+
+ZSTD:
+
+``` bash
+$ cd ./database_dir/zstd
+$ numactl -m 0 -N 0 [CLICKHOUSE_EXE] server -C config_zstd.xml >&/dev/null&
+$ cd ./client_scripts
+$ numactl -m 1 -N 1 python3 client_stressing_test.py queries_ssb.sql 1 > zstd.log
+```
+
+Now three logs should be output as expected:
+```text
+lz4.log
+deflate.log
+zstd.log
+```
+
+How to check performance metrics:
+
+We focus on QPS, please search the keyword: `QPS_Final` and collect statistics
+
+## Benchmark with multi-instances
+
+- To reduce impact of memory bound on too much threads, We recommend run benchmark with multi-instances.
+- Multi-instance means multiple（2 or 4）servers connected with respective client.
+- The cores of one socket need to be divided equally and assigned to the servers respectively.
+- For multi-instances, must create new folder for each codec and insert dataset by following the similar steps as single instance.
+
+There are 2 differences: 
+- For client side, you need launch clickhouse with the assigned port during table creation and data insertion.
+- For server side, you need launch clickhouse with the specific xml config file in which port has been assigned. All customized xml config files for multi-instances has been provided under ./server_config.
+
+Here we assume there are 60 cores per socket and take 2 instances for example.
+Launch server for first instance
+LZ4:
+
+``` bash
+$ cd ./database_dir/lz4
+$ numactl -C 0-29,120-149 [CLICKHOUSE_EXE] server -C config_lz4.xml >&/dev/null&
+```
+
+ZSTD:
+
+``` bash
+$ cd ./database_dir/zstd
+$ numactl -C 0-29,120-149 [CLICKHOUSE_EXE] server -C config_zstd.xml >&/dev/null&
+```
+
+IAA Deflate:
+
+``` bash
+$ cd ./database_dir/deflate
+$ numactl -C 0-29,120-149 [CLICKHOUSE_EXE] server -C config_deflate.xml >&/dev/null&
+```
+
+[Launch server for second instance]
+
+LZ4:
+
+``` bash
+$ cd ./database_dir && mkdir lz4_s2 && cd lz4_s2
+$ cp ../../server_config/config_lz4_s2.xml ./
+$ numactl -C 30-59,150-179 [CLICKHOUSE_EXE] server -C config_lz4_s2.xml >&/dev/null&
+```
+
+ZSTD:
+
+``` bash
+$ cd ./database_dir && mkdir zstd_s2 && cd zstd_s2
+$ cp ../../server_config/config_zstd_s2.xml ./
+$ numactl -C 30-59,150-179 [CLICKHOUSE_EXE] server -C config_zstd_s2.xml >&/dev/null&
+```
+
+IAA Deflate:
+
+``` bash
+$ cd ./database_dir && mkdir deflate_s2 && cd deflate_s2
+$ cp ../../server_config/config_deflate_s2.xml ./
+$ numactl -C 30-59,150-179 [CLICKHOUSE_EXE] server -C config_deflate_s2.xml >&/dev/null&
+```
+
+Creating tables && Inserting data for second instance
+
+Creating tables:
+
+``` bash
+$ [CLICKHOUSE_EXE] client -m --port=9001 
+```
+
+Inserting data:
+
+``` bash
+$ [CLICKHOUSE_EXE] client --query "INSERT INTO [TBL_FILE_NAME] FORMAT CSV" < [TBL_FILE_NAME].tbl  --port=9001
+```
+
+- [TBL_FILE_NAME] represents the name of a file named with the regular expression: *. tbl under `./benchmark_sample/rawdata_dir/ssb-dbgen`.
+- `--port=9001` stands for the assigned port for server instance which is also defined in config_lz4_s2.xml/config_zstd_s2.xml/config_deflate_s2.xml. For even more instances, you need replace it with the value: 9002/9003 which stand for s3/s4 instance respectively. If you don't assign it, the port is 9000 by default which has been used by first instance.
+
+Benchmarking with 2 instances
+
+LZ4:
+
+``` bash
+$ cd ./database_dir/lz4
+$ numactl -C 0-29,120-149 [CLICKHOUSE_EXE] server -C config_lz4.xml >&/dev/null&
+$ cd ./database_dir/lz4_s2
+$ numactl -C 30-59,150-179 [CLICKHOUSE_EXE] server -C config_lz4_s2.xml >&/dev/null&
+$ cd ./client_scripts
+$ numactl -m 1 -N 1 python3 client_stressing_test.py queries_ssb.sql 2  > lz4_2insts.log
+```
+
+ZSTD:
+
+``` bash
+$ cd ./database_dir/zstd
+$ numactl -C 0-29,120-149 [CLICKHOUSE_EXE] server -C config_zstd.xml >&/dev/null&
+$ cd ./database_dir/zstd_s2
+$ numactl -C 30-59,150-179 [CLICKHOUSE_EXE] server -C config_zstd_s2.xml >&/dev/null& 
+$ cd ./client_scripts
+$ numactl -m 1 -N 1 python3 client_stressing_test.py queries_ssb.sql 2 > zstd_2insts.log
+```
+
+IAA deflate
+
+``` bash
+$ cd ./database_dir/deflate
+$ numactl -C 0-29,120-149 [CLICKHOUSE_EXE] server -C config_deflate.xml >&/dev/null&
+$ cd ./database_dir/deflate_s2
+$ numactl -C 30-59,150-179 [CLICKHOUSE_EXE] server -C config_deflate_s2.xml >&/dev/null&
+$ cd ./client_scripts
+$ numactl -m 1 -N 1 python3 client_stressing_test.py queries_ssb.sql 2 > deflate_2insts.log
+```
+
+Here the last argument: `2` of client_stressing_test.py stands for the number of instances. For more instances, you need replace it with the value: 3 or 4. This script support up to 4 instances/
+
+Now three logs should be output as expected:
+
+``` text
+lz4_2insts.log
+deflate_2insts.log
+zstd_2insts.log
+```
+How to check performance metrics:
+
+We focus on QPS, please search the keyword: `QPS_Final` and collect statistics
+
+Benchmark setup for 4 instances is similar with 2 instances above.
+We recommend use 2 instances benchmark data as final report for review.
+
+## Tips
+
+Each time before launch new clickhouse server, please make sure no background clickhouse process running, please check and kill old one:
+
+``` bash
+$ ps -aux| grep clickhouse
+$ kill -9 [PID]
+```
+By comparing the query list in ./client_scripts/queries_ssb.sql with official [Star Schema Benchmark](https://clickhouse.com/docs/en/getting-started/example-datasets/star-schema), you will find 3 queries are not included: Q1.2/Q1.3/Q3.4 . This is because cpu utilization% is very low <10% for these queries which means cannot demonstrate performance differences.
diff --git a/docs/en/development/continuous-integration.md b/docs/en/development/continuous-integration.md
index 232eee5b3cf..738c5458cc3 100644
--- a/docs/en/development/continuous-integration.md
+++ b/docs/en/development/continuous-integration.md
@@ -102,7 +102,7 @@ Builds ClickHouse in various configurations for use in further steps. You have t
 
 ### Report Details
 
-- **Compiler**: `clang-15`, optionally with the name of a target platform
+- **Compiler**: `clang-16`, optionally with the name of a target platform
 - **Build type**: `Debug` or `RelWithDebInfo` (cmake).
 - **Sanitizer**: `none` (without sanitizers), `address` (ASan), `memory` (MSan), `undefined` (UBSan), or `thread` (TSan).
 - **Status**: `success` or `fail`
diff --git a/docs/en/development/contrib.md b/docs/en/development/contrib.md
index 04158a0c3f7..4b296c43db4 100644
--- a/docs/en/development/contrib.md
+++ b/docs/en/development/contrib.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/development/contrib
-sidebar_position: 71
+sidebar_position: 72
 sidebar_label: Third-Party Libraries
 description: A list of third-party libraries used
 ---
diff --git a/docs/en/development/developer-instruction.md b/docs/en/development/developer-instruction.md
index b46cc10f99d..1f3ab1aae2c 100644
--- a/docs/en/development/developer-instruction.md
+++ b/docs/en/development/developer-instruction.md
@@ -39,9 +39,15 @@ Next, you need to download the source files onto your working machine. This is c
 
 In the command line terminal run:
 
-    git clone --recursive --shallow-submodules git@github.com:your_github_username/ClickHouse.git
+    git clone --shallow-submodules git@github.com:your_github_username/ClickHouse.git
     cd ClickHouse
 
+Or (if you'd like to use sparse checkout for submodules and avoid checking out unneeded files):
+
+    git clone git@github.com:your_github_username/ClickHouse.git
+    cd ClickHouse
+    ./contrib/update-submodules.sh
+
 Note: please, substitute *your_github_username* with what is appropriate!
 
 This command will create a directory `ClickHouse` containing the working copy of the project.
@@ -67,7 +73,7 @@ It generally means that the SSH keys for connecting to GitHub are missing. These
 
 You can also clone the repository via https protocol:
 
-    git clone --recursive--shallow-submodules https://github.com/ClickHouse/ClickHouse.git
+    git clone --recursive --shallow-submodules https://github.com/ClickHouse/ClickHouse.git
 
 This, however, will not let you send your changes to the server. You can still use it temporarily and add the SSH keys later replacing the remote address of the repository with `git remote` command.
 
@@ -146,7 +152,7 @@ While inside the `build` directory, configure your build by running CMake. Befor
     export CC=clang CXX=clang++
     cmake ..
 
-If you installed clang using the automatic installation script above, also specify the version of clang installed in the first command, e.g. `export CC=clang-15 CXX=clang++-15`. The clang version will be in the script output.
+If you installed clang using the automatic installation script above, also specify the version of clang installed in the first command, e.g. `export CC=clang-16 CXX=clang++-16`. The clang version will be in the script output.
 
 The `CC` variable specifies the compiler for C (short for C Compiler), and `CXX` variable instructs which C++ compiler is to be used for building.
 
diff --git a/docs/en/development/style.md b/docs/en/development/style.md
index 35683aa7822..5b03468623d 100644
--- a/docs/en/development/style.md
+++ b/docs/en/development/style.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/development/style
-sidebar_position: 69
+sidebar_position: 70
 sidebar_label: C++ Guide
 description: A list of recommendations regarding coding style, naming convention, formatting and more
 ---
@@ -370,8 +370,8 @@ If the file contains a single function, name the file the same way as the functi
 
 **11.** If the name contains an abbreviation, then:
 
--   For variable names, the abbreviation should use lowercase letters `mysql_connection` (not `mySQL_connection`).
--   For names of classes and functions, keep the uppercase letters in the abbreviation`MySQLConnection` (not `MySqlConnection`).
+- For variable names, the abbreviation should use lowercase letters `mysql_connection` (not `mySQL_connection`).
+- For names of classes and functions, keep the uppercase letters in the abbreviation`MySQLConnection` (not `MySqlConnection`).
 
 **12.** Constructor arguments that are used just to initialize the class members should be named the same way as the class members, but with an underscore at the end.
 
@@ -434,9 +434,9 @@ In application code, memory must be freed by the object that owns it.
 
 Examples:
 
--   The easiest way is to place an object on the stack, or make it a member of another class.
--   For a large number of small objects, use containers.
--   For automatic deallocation of a small number of objects that reside in the heap, use `shared_ptr/unique_ptr`.
+- The easiest way is to place an object on the stack, or make it a member of another class.
+- For a large number of small objects, use containers.
+- For automatic deallocation of a small number of objects that reside in the heap, use `shared_ptr/unique_ptr`.
 
 **2.** Resource management.
 
@@ -504,10 +504,10 @@ This is not recommended, but it is allowed.
 
 Use the following options:
 
--   Create a function (`done()` or `finalize()`) that will do all the work in advance that might lead to an exception. If that function was called, there should be no exceptions in the destructor later.
--   Tasks that are too complex (such as sending messages over the network) can be put in separate method that the class user will have to call before destruction.
--   If there is an exception in the destructor, it’s better to log it than to hide it (if the logger is available).
--   In simple applications, it is acceptable to rely on `std::terminate` (for cases of `noexcept` by default in C++11) to handle exceptions.
+- Create a function (`done()` or `finalize()`) that will do all the work in advance that might lead to an exception. If that function was called, there should be no exceptions in the destructor later.
+- Tasks that are too complex (such as sending messages over the network) can be put in separate method that the class user will have to call before destruction.
+- If there is an exception in the destructor, it’s better to log it than to hide it (if the logger is available).
+- In simple applications, it is acceptable to rely on `std::terminate` (for cases of `noexcept` by default in C++11) to handle exceptions.
 
 **6.** Anonymous code blocks.
 
@@ -529,11 +529,11 @@ ready_any.set();
 
 In offline data processing programs:
 
--   Try to get the best possible performance on a single CPU core. You can then parallelize your code if necessary.
+- Try to get the best possible performance on a single CPU core. You can then parallelize your code if necessary.
 
 In server applications:
 
--   Use the thread pool to process requests. At this point, we haven’t had any tasks that required userspace context switching.
+- Use the thread pool to process requests. At this point, we haven’t had any tasks that required userspace context switching.
 
 Fork is not used for parallelization.
 
diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index 9ae49e8f707..1d3e7d4964e 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/development/tests
-sidebar_position: 70
+sidebar_position: 71
 sidebar_label: Testing
 title: ClickHouse Testing
 description: Most of ClickHouse features can be tested with functional tests and they are mandatory to use for every change in ClickHouse code that can be tested that way.
@@ -31,6 +31,9 @@ folder and run the following command:
 PATH=$PATH:<path to clickhouse-client> tests/clickhouse-test 01428_hash_set_nan_key
 ```
 
+Test results (`stderr` and `stdout`) are written to files `01428_hash_set_nan_key.[stderr|stdout]` which
+are located near the test file itself (so for `queries/0_stateless/foo.sql` output will be in `queries/0_stateless/foo.stdout`).
+
 For more options, see `tests/clickhouse-test --help`. You can simply run all tests or run subset of tests filtered by substring in test name: `./clickhouse-test substring`. There are also options to run tests in parallel or in randomized order.
 
 ### Adding a New Test
@@ -68,7 +71,7 @@ SELECT 1
 | `global` | Same as `shard`. Prefer `shard` ||
 | `zookeeper` | Test requires Zookeeper or ClickHouse Keeper to run | Test uses `ReplicatedMergeTree` |
 | `replica` | Same as `zookeeper`. Prefer `zookeeper` ||
-| `no-fasttest`|  Test is not run under [Fast test](continuous-integration#fast-test) | Test uses `MySQL` table engine which is disabled in Fast test|
+| `no-fasttest`|  Test is not run under [Fast test](continuous-integration.md#fast-test) | Test uses `MySQL` table engine which is disabled in Fast test|
 | `no-[asan, tsan, msan, ubsan]` | Disables tests in build with [sanitizers](#sanitizers) | Test is run under QEMU which doesn't work with sanitizers |
 | `no-replicated-database` |||
 | `no-ordinary-database` |||
@@ -191,11 +194,11 @@ If the system clickhouse-server is already running and you do not want to stop i
 Build tests allow to check that build is not broken on various alternative configurations and on some foreign systems. These tests are automated as well.
 
 Examples:
--   cross-compile for Darwin x86_64 (macOS)
--   cross-compile for FreeBSD x86_64
--   cross-compile for Linux AArch64
--   build on Ubuntu with libraries from system packages (discouraged)
--   build with shared linking of libraries (discouraged)
+- cross-compile for Darwin x86_64 (macOS)
+- cross-compile for FreeBSD x86_64
+- cross-compile for Linux AArch64
+- build on Ubuntu with libraries from system packages (discouraged)
+- build with shared linking of libraries (discouraged)
 
 For example, build with system packages is bad practice, because we cannot guarantee what exact version of packages a system will have. But this is really needed by Debian maintainers. For this reason we at least have to support this variant of build. Another example: shared linking is a common source of trouble, but it is needed for some enthusiasts.
 
diff --git a/docs/en/engines/_category_.yml b/docs/en/engines/_category_.yml
index 8c6ba12c6f1..2aa5df72955 100644
--- a/docs/en/engines/_category_.yml
+++ b/docs/en/engines/_category_.yml
@@ -4,5 +4,4 @@ collapsible: true
 collapsed: true
 link:
   type: generated-index
-  title: Database & Table Engines
   slug: /en/engines
diff --git a/docs/en/engines/database-engines/atomic.md b/docs/en/engines/database-engines/atomic.md
index 3ea5008c80a..0224e1aba21 100644
--- a/docs/en/engines/database-engines/atomic.md
+++ b/docs/en/engines/database-engines/atomic.md
@@ -59,4 +59,4 @@ For [ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table
 
 ## See Also
 
--   [system.databases](../../operations/system-tables/databases.md) system table
+- [system.databases](../../operations/system-tables/databases.md) system table
diff --git a/docs/en/engines/database-engines/index.md b/docs/en/engines/database-engines/index.md
index 835383f503f..233cbbb4247 100644
--- a/docs/en/engines/database-engines/index.md
+++ b/docs/en/engines/database-engines/index.md
@@ -11,18 +11,18 @@ Database engines allow you to work with tables. By default, ClickHouse uses the
 
 Here is a complete list of available database engines. Follow the links for more details:
 
--   [Atomic](../../engines/database-engines/atomic.md)
+- [Atomic](../../engines/database-engines/atomic.md)
 
--   [MySQL](../../engines/database-engines/mysql.md)
+- [MySQL](../../engines/database-engines/mysql.md)
 
--   [MaterializedMySQL](../../engines/database-engines/materialized-mysql.md)
+- [MaterializedMySQL](../../engines/database-engines/materialized-mysql.md)
 
--   [Lazy](../../engines/database-engines/lazy.md)
+- [Lazy](../../engines/database-engines/lazy.md)
 
--   [PostgreSQL](../../engines/database-engines/postgresql.md)
+- [PostgreSQL](../../engines/database-engines/postgresql.md)
 
--   [MaterializedPostgreSQL](../../engines/database-engines/materialized-postgresql.md)
+- [MaterializedPostgreSQL](../../engines/database-engines/materialized-postgresql.md)
 
--   [Replicated](../../engines/database-engines/replicated.md)
+- [Replicated](../../engines/database-engines/replicated.md)
 
--   [SQLite](../../engines/database-engines/sqlite.md)
+- [SQLite](../../engines/database-engines/sqlite.md)
diff --git a/docs/en/engines/database-engines/materialized-mysql.md b/docs/en/engines/database-engines/materialized-mysql.md
index 899c8d024f1..1f1c996d4bf 100644
--- a/docs/en/engines/database-engines/materialized-mysql.md
+++ b/docs/en/engines/database-engines/materialized-mysql.md
@@ -6,7 +6,7 @@ sidebar_position: 70
 
 # [experimental] MaterializedMySQL 
 
-:::warning
+:::note
 This is an experimental feature that should not be used in production.
 :::
 
@@ -22,10 +22,10 @@ ENGINE = MaterializedMySQL('host:port', ['database' | database], 'user', 'passwo
 
 **Engine Parameters**
 
--   `host:port` — MySQL server endpoint.
--   `database` — MySQL database name.
--   `user` — MySQL user.
--   `password` — User password.
+- `host:port` — MySQL server endpoint.
+- `database` — MySQL database name.
+- `user` — MySQL user.
+- `password` — User password.
 
 ## Engine Settings
 
@@ -245,7 +245,7 @@ extra care needs to be taken.
 
 You may specify overrides for tables that do not exist yet.
 
-:::warning
+:::important
 It is easy to break replication with table overrides if not used with care. For example:
     
 * If an ALIAS column is added with a table override, and a column with the same name is later added to the source
diff --git a/docs/en/engines/database-engines/materialized-postgresql.md b/docs/en/engines/database-engines/materialized-postgresql.md
index b43f71a7576..08e9f998626 100644
--- a/docs/en/engines/database-engines/materialized-postgresql.md
+++ b/docs/en/engines/database-engines/materialized-postgresql.md
@@ -26,10 +26,10 @@ ENGINE = MaterializedPostgreSQL('host:port', 'database', 'user', 'password') [SE
 
 **Engine Parameters**
 
--   `host:port` — PostgreSQL server endpoint.
--   `database` — PostgreSQL database name.
--   `user` — PostgreSQL user.
--   `password` — User password.
+- `host:port` — PostgreSQL server endpoint.
+- `database` — PostgreSQL database name.
+- `user` — PostgreSQL user.
+- `password` — User password.
 
 ## Example of Use {#example-of-use}
 
@@ -120,9 +120,9 @@ Warning: for this case dots in table name are not allowed.
 
 2. Each replicated table must have one of the following [replica identity](https://www.postgresql.org/docs/10/sql-altertable.html#SQL-CREATETABLE-REPLICA-IDENTITY):
 
--   primary key (by default)
+- primary key (by default)
 
--   index
+- index
 
 ``` bash
 postgres# CREATE TABLE postgres_table (a Integer NOT NULL, b Integer, c Integer NOT NULL, d Integer, e Integer NOT NULL);
@@ -145,7 +145,7 @@ FROM pg_class
 WHERE oid = 'postgres_table'::regclass;
 ```
 
-:::warning
+:::note
 Replication of [**TOAST**](https://www.postgresql.org/docs/9.5/storage-toast.html) values is not supported. The default value for the data type will be used.
 :::
 
@@ -171,7 +171,7 @@ Replication of [**TOAST**](https://www.postgresql.org/docs/9.5/storage-toast.htm
 
     Possible values:
 
-    -   Positive integer.
+    - Positive integer.
 
     Default value: `65536`.
 
diff --git a/docs/en/engines/database-engines/mysql.md b/docs/en/engines/database-engines/mysql.md
index e4ff734d55f..20434ad124e 100644
--- a/docs/en/engines/database-engines/mysql.md
+++ b/docs/en/engines/database-engines/mysql.md
@@ -12,9 +12,9 @@ The `MySQL` database engine translate queries to the MySQL server so you can per
 
 You cannot perform the following queries:
 
--   `RENAME`
--   `CREATE TABLE`
--   `ALTER`
+- `RENAME`
+- `CREATE TABLE`
+- `ALTER`
 
 ## Creating a Database {#creating-a-database}
 
@@ -25,10 +25,10 @@ ENGINE = MySQL('host:port', ['database' | database], 'user', 'password')
 
 **Engine Parameters**
 
--   `host:port` — MySQL server address.
--   `database` — Remote database name.
--   `user` — MySQL user.
--   `password` — User password.
+- `host:port` — MySQL server address.
+- `database` — Remote database name.
+- `user` — MySQL user.
+- `password` — User password.
 
 ## Data Types Support {#data_types-support}
 
@@ -60,7 +60,7 @@ These variables are supported:
 - `version`
 - `max_allowed_packet`
 
-:::warning
+:::note
 By now these variables are stubs and don't correspond to anything.
 :::
 
diff --git a/docs/en/engines/database-engines/postgresql.md b/docs/en/engines/database-engines/postgresql.md
index 939995a61c5..294d1202bdd 100644
--- a/docs/en/engines/database-engines/postgresql.md
+++ b/docs/en/engines/database-engines/postgresql.md
@@ -21,12 +21,12 @@ ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `schema`, `use
 
 **Engine Parameters**
 
--   `host:port` — PostgreSQL server address.
--   `database` — Remote database name.
--   `user` — PostgreSQL user.
--   `password` — User password.
--   `schema` — PostgreSQL schema.
--   `use_table_cache` —  Defines if the database table structure is cached or not. Optional. Default value: `0`.
+- `host:port` — PostgreSQL server address.
+- `database` — Remote database name.
+- `user` — PostgreSQL user.
+- `password` — User password.
+- `schema` — PostgreSQL schema.
+- `use_table_cache` —  Defines if the database table structure is cached or not. Optional. Default value: `0`.
 
 ## Data Types Support {#data_types-support}
 
@@ -140,3 +140,4 @@ DESCRIBE TABLE test_database.test_table;
 ## Related content
 
 - Blog: [ClickHouse and PostgreSQL - a match made in data heaven - part 1](https://clickhouse.com/blog/migrating-data-between-clickhouse-postgres)
+- Blog: [ClickHouse and PostgreSQL - a Match Made in Data Heaven - part 2](https://clickhouse.com/blog/migrating-data-between-clickhouse-postgres-part-2)
diff --git a/docs/en/engines/database-engines/replicated.md b/docs/en/engines/database-engines/replicated.md
index 43d1ce5ec3f..5672633c4a2 100644
--- a/docs/en/engines/database-engines/replicated.md
+++ b/docs/en/engines/database-engines/replicated.md
@@ -17,9 +17,9 @@ CREATE DATABASE testdb ENGINE = Replicated('zoo_path', 'shard_name', 'replica_na
 
 **Engine Parameters**
 
--   `zoo_path` — ZooKeeper path. The same ZooKeeper path corresponds to the same database.
--   `shard_name` — Shard name. Database replicas are grouped into shards by `shard_name`.
--   `replica_name` — Replica name. Replica names must be different for all replicas of the same shard.
+- `zoo_path` — ZooKeeper path. The same ZooKeeper path corresponds to the same database.
+- `shard_name` — Shard name. Database replicas are grouped into shards by `shard_name`.
+- `replica_name` — Replica name. Replica names must be different for all replicas of the same shard.
 
 For [ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication) tables if no arguments provided, then default arguments are used: `/clickhouse/tables/{uuid}/{shard}` and `{replica}`. These can be changed in the server settings [default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path) and [default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name). Macro `{uuid}` is unfolded to table's uuid, `{shard}` and `{replica}` are unfolded to values from server config, not from database engine arguments. But in the future, it will be possible to use `shard_name` and `replica_name` of Replicated database.
 
diff --git a/docs/en/engines/database-engines/sqlite.md b/docs/en/engines/database-engines/sqlite.md
index eef0bb84088..fc2a6525a68 100644
--- a/docs/en/engines/database-engines/sqlite.md
+++ b/docs/en/engines/database-engines/sqlite.md
@@ -17,7 +17,7 @@ Allows to connect to [SQLite](https://www.sqlite.org/index.html) database and pe
 
 **Engine Parameters**
 
--   `db_path` — Path to a file with SQLite database.
+- `db_path` — Path to a file with SQLite database.
 
 ## Data Types Support {#data_types-support}
 
diff --git a/docs/en/engines/table-engines/index.md b/docs/en/engines/table-engines/index.md
index 31563e2e727..d7c582164de 100644
--- a/docs/en/engines/table-engines/index.md
+++ b/docs/en/engines/table-engines/index.md
@@ -9,12 +9,12 @@ toc_title: Introduction
 
 The table engine (type of table) determines:
 
--   How and where data is stored, where to write it to, and where to read it from.
--   Which queries are supported, and how.
--   Concurrent data access.
--   Use of indexes, if present.
--   Whether multithread request execution is possible.
--   Data replication parameters.
+- How and where data is stored, where to write it to, and where to read it from.
+- Which queries are supported, and how.
+- Concurrent data access.
+- Use of indexes, if present.
+- Whether multithread request execution is possible.
+- Data replication parameters.
 
 ## Engine Families {#engine-families}
 
@@ -24,13 +24,13 @@ The most universal and functional table engines for high-load tasks. The propert
 
 Engines in the family:
 
--   [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#mergetree)
--   [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md#replacingmergetree)
--   [SummingMergeTree](../../engines/table-engines/mergetree-family/summingmergetree.md#summingmergetree)
--   [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md#aggregatingmergetree)
--   [CollapsingMergeTree](../../engines/table-engines/mergetree-family/collapsingmergetree.md#table_engine-collapsingmergetree)
--   [VersionedCollapsingMergeTree](../../engines/table-engines/mergetree-family/versionedcollapsingmergetree.md#versionedcollapsingmergetree)
--   [GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md#graphitemergetree)
+- [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#mergetree)
+- [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md#replacingmergetree)
+- [SummingMergeTree](../../engines/table-engines/mergetree-family/summingmergetree.md#summingmergetree)
+- [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md#aggregatingmergetree)
+- [CollapsingMergeTree](../../engines/table-engines/mergetree-family/collapsingmergetree.md#table_engine-collapsingmergetree)
+- [VersionedCollapsingMergeTree](../../engines/table-engines/mergetree-family/versionedcollapsingmergetree.md#versionedcollapsingmergetree)
+- [GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md#graphitemergetree)
 
 ### Log {#log}
 
@@ -38,9 +38,9 @@ Lightweight [engines](../../engines/table-engines/log-family/index.md) with mini
 
 Engines in the family:
 
--   [TinyLog](../../engines/table-engines/log-family/tinylog.md#tinylog)
--   [StripeLog](../../engines/table-engines/log-family/stripelog.md#stripelog)
--   [Log](../../engines/table-engines/log-family/log.md#log)
+- [TinyLog](../../engines/table-engines/log-family/tinylog.md#tinylog)
+- [StripeLog](../../engines/table-engines/log-family/stripelog.md#stripelog)
+- [Log](../../engines/table-engines/log-family/log.md#log)
 
 ### Integration Engines {#integration-engines}
 
@@ -49,34 +49,34 @@ Engines for communicating with other data storage and processing systems.
 Engines in the family:
 
 
--   [ODBC](../../engines/table-engines/integrations/odbc.md)
--   [JDBC](../../engines/table-engines/integrations/jdbc.md)
--   [MySQL](../../engines/table-engines/integrations/mysql.md)
--   [MongoDB](../../engines/table-engines/integrations/mongodb.md)
--   [HDFS](../../engines/table-engines/integrations/hdfs.md)
--   [S3](../../engines/table-engines/integrations/s3.md)
--   [Kafka](../../engines/table-engines/integrations/kafka.md)
--   [EmbeddedRocksDB](../../engines/table-engines/integrations/embedded-rocksdb.md)
--   [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md)
--   [PostgreSQL](../../engines/table-engines/integrations/postgresql.md)
+- [ODBC](../../engines/table-engines/integrations/odbc.md)
+- [JDBC](../../engines/table-engines/integrations/jdbc.md)
+- [MySQL](../../engines/table-engines/integrations/mysql.md)
+- [MongoDB](../../engines/table-engines/integrations/mongodb.md)
+- [HDFS](../../engines/table-engines/integrations/hdfs.md)
+- [S3](../../engines/table-engines/integrations/s3.md)
+- [Kafka](../../engines/table-engines/integrations/kafka.md)
+- [EmbeddedRocksDB](../../engines/table-engines/integrations/embedded-rocksdb.md)
+- [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md)
+- [PostgreSQL](../../engines/table-engines/integrations/postgresql.md)
 
 ### Special Engines {#special-engines}
 
 Engines in the family:
 
--   [Distributed](../../engines/table-engines/special/distributed.md#distributed)
--   [MaterializedView](../../engines/table-engines/special/materializedview.md#materializedview)
--   [Dictionary](../../engines/table-engines/special/dictionary.md#dictionary)
--   [Merge](../../engines/table-engines/special/merge.md#merge)
--   [File](../../engines/table-engines/special/file.md#file)
--   [Null](../../engines/table-engines/special/null.md#null)
--   [Set](../../engines/table-engines/special/set.md#set)
--   [Join](../../engines/table-engines/special/join.md#join)
--   [URL](../../engines/table-engines/special/url.md#table_engines-url)
--   [View](../../engines/table-engines/special/view.md#table_engines-view)
--   [Memory](../../engines/table-engines/special/memory.md#memory)
--   [Buffer](../../engines/table-engines/special/buffer.md#buffer)
--   [KeeperMap](../../engines/table-engines/special/keepermap.md)
+- [Distributed](../../engines/table-engines/special/distributed.md#distributed)
+- [MaterializedView](../../engines/table-engines/special/materializedview.md#materializedview)
+- [Dictionary](../../engines/table-engines/special/dictionary.md#dictionary)
+- [Merge](../../engines/table-engines/special/merge.md#merge)
+- [File](../../engines/table-engines/special/file.md#file)
+- [Null](../../engines/table-engines/special/null.md#null)
+- [Set](../../engines/table-engines/special/set.md#set)
+- [Join](../../engines/table-engines/special/join.md#join)
+- [URL](../../engines/table-engines/special/url.md#table_engines-url)
+- [View](../../engines/table-engines/special/view.md#table_engines-view)
+- [Memory](../../engines/table-engines/special/memory.md#memory)
+- [Buffer](../../engines/table-engines/special/buffer.md#buffer)
+- [KeeperMap](../../engines/table-engines/special/keepermap.md)
 
 ## Virtual Columns {#table_engines-virtual_columns}
 
diff --git a/docs/en/engines/table-engines/integrations/ExternalDistributed.md b/docs/en/engines/table-engines/integrations/ExternalDistributed.md
index 4e0f66ebd4f..3fb3fe88b55 100644
--- a/docs/en/engines/table-engines/integrations/ExternalDistributed.md
+++ b/docs/en/engines/table-engines/integrations/ExternalDistributed.md
@@ -22,17 +22,17 @@ See a detailed description of the [CREATE TABLE](../../../sql-reference/statemen
 
 The table structure can differ from the original table structure:
 
--   Column names should be the same as in the original table, but you can use just some of these columns and in any order.
--   Column types may differ from those in the original table. ClickHouse tries to [cast](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) values to the ClickHouse data types.
+- Column names should be the same as in the original table, but you can use just some of these columns and in any order.
+- Column types may differ from those in the original table. ClickHouse tries to [cast](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) values to the ClickHouse data types.
 
 **Engine Parameters**
 
--   `engine` — The table engine `MySQL` or `PostgreSQL`.
--   `host:port` — MySQL or PostgreSQL server address.
--   `database` — Remote database name.
--   `table` — Remote table name.
--   `user` — User name.
--   `password` — User password.
+- `engine` — The table engine `MySQL` or `PostgreSQL`.
+- `host:port` — MySQL or PostgreSQL server address.
+- `database` — Remote database name.
+- `table` — Remote table name.
+- `user` — User name.
+- `password` — User password.
 
 ## Implementation Details {#implementation-details}
 
@@ -48,6 +48,6 @@ You can specify any number of shards and any number of replicas for each shard.
 
 **See Also**
 
--   [MySQL table engine](../../../engines/table-engines/integrations/mysql.md)
--   [PostgreSQL table engine](../../../engines/table-engines/integrations/postgresql.md)
--   [Distributed table engine](../../../engines/table-engines/special/distributed.md)
+- [MySQL table engine](../../../engines/table-engines/integrations/mysql.md)
+- [PostgreSQL table engine](../../../engines/table-engines/integrations/postgresql.md)
+- [Distributed table engine](../../../engines/table-engines/special/distributed.md)
diff --git a/docs/en/engines/table-engines/integrations/deltalake.md b/docs/en/engines/table-engines/integrations/deltalake.md
index 99183ac7308..3e2e177e28f 100644
--- a/docs/en/engines/table-engines/integrations/deltalake.md
+++ b/docs/en/engines/table-engines/integrations/deltalake.md
@@ -18,8 +18,8 @@ CREATE TABLE deltalake
 
 **Engine parameters**
 
--   `url` — Bucket url with path to the existing Delta Lake table.
--   `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file.
+- `url` — Bucket url with path to the existing Delta Lake table.
+- `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file.
 
 Engine parameters can be specified using [Named Collections](../../../operations/named-collections.md)
 
@@ -49,4 +49,4 @@ CREATE TABLE deltalake ENGINE=DeltaLake(deltalake_conf, filename = 'test_table')
 
 ## See also
 
--  [deltaLake table function](../../../sql-reference/table-functions/deltalake.md)
+- [deltaLake table function](../../../sql-reference/table-functions/deltalake.md)
diff --git a/docs/en/engines/table-engines/integrations/hdfs.md b/docs/en/engines/table-engines/integrations/hdfs.md
index 7c04a6594a6..b9db0fae68f 100644
--- a/docs/en/engines/table-engines/integrations/hdfs.md
+++ b/docs/en/engines/table-engines/integrations/hdfs.md
@@ -17,7 +17,7 @@ ENGINE = HDFS(URI, format)
 **Engine Parameters**
 
 - `URI` - whole file URI in HDFS. The path part of `URI` may contain globs. In this case the table would be readonly.
--  `format` - specifies one of the available file formats. To perform
+- `format` - specifies one of the available file formats. To perform
 `SELECT` queries, the format must be supported for input, and to perform
 `INSERT` queries – for output. The available formats are listed in the
 [Formats](../../../interfaces/formats.md#formats) section.
@@ -58,13 +58,13 @@ SELECT * FROM hdfs_engine_table LIMIT 2
 
 ## Implementation Details {#implementation-details}
 
--   Reads and writes can be parallel.
--   Not supported:
-    -   `ALTER` and `SELECT...SAMPLE` operations.
-    -   Indexes.
-    -   [Zero-copy](../../../operations/storing-data.md#zero-copy) replication is possible, but not recommended.
+- Reads and writes can be parallel.
+- Not supported:
+    - `ALTER` and `SELECT...SAMPLE` operations.
+    - Indexes.
+    - [Zero-copy](../../../operations/storing-data.md#zero-copy) replication is possible, but not recommended.
   
-  :::warning Zero-copy replication is not ready for production
+  :::note Zero-copy replication is not ready for production
   Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
   :::
 
@@ -72,10 +72,10 @@ SELECT * FROM hdfs_engine_table LIMIT 2
 
 Multiple path components can have globs. For being processed file should exists and matches to the whole path pattern. Listing of files determines during `SELECT` (not at `CREATE` moment).
 
--   `*` — Substitutes any number of any characters except `/` including empty string.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
+- `*` — Substitutes any number of any characters except `/` including empty string.
+- `?` — Substitutes any single character.
+- `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
+- `{N..M}` — Substitutes any number in range from N to M including both borders.
 
 Constructions with `{}` are similar to the [remote](../../../sql-reference/table-functions/remote.md) table function.
 
@@ -83,12 +83,12 @@ Constructions with `{}` are similar to the [remote](../../../sql-reference/table
 
 1.  Suppose we have several files in TSV format with the following URIs on HDFS:
 
-    -  'hdfs://hdfs1:9000/some_dir/some_file_1'
-    -  'hdfs://hdfs1:9000/some_dir/some_file_2'
-    -  'hdfs://hdfs1:9000/some_dir/some_file_3'
-    -  'hdfs://hdfs1:9000/another_dir/some_file_1'
-    -  'hdfs://hdfs1:9000/another_dir/some_file_2'
-    -  'hdfs://hdfs1:9000/another_dir/some_file_3'
+    - 'hdfs://hdfs1:9000/some_dir/some_file_1'
+    - 'hdfs://hdfs1:9000/some_dir/some_file_2'
+    - 'hdfs://hdfs1:9000/some_dir/some_file_3'
+    - 'hdfs://hdfs1:9000/another_dir/some_file_1'
+    - 'hdfs://hdfs1:9000/another_dir/some_file_2'
+    - 'hdfs://hdfs1:9000/another_dir/some_file_3'
 
 1.  There are several ways to make a table consisting of all six files:
 
@@ -110,7 +110,7 @@ Table consists of all the files in both directories (all files should satisfy fo
 CREATE TABLE table_with_asterisk (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/{some,another}_dir/*', 'TSV')
 ```
 
-:::warning
+:::note
 If the listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 :::
 
@@ -145,7 +145,7 @@ Similar to GraphiteMergeTree, the HDFS engine supports extended configuration us
 
 
 | **parameter**                                         | **default value**       |
-| -                                                     | -                       |
+| -                                                  | -                    |
 | rpc\_client\_connect\_tcpnodelay                      | true                    |
 | dfs\_client\_read\_shortcircuit                       | true                    |
 | output\_replace-datanode-on-failure                   | true                    |
@@ -195,7 +195,7 @@ Similar to GraphiteMergeTree, the HDFS engine supports extended configuration us
 #### ClickHouse extras {#clickhouse-extras}
 
 | **parameter**                                         | **default value**       |
-| -                                                     | -                       |
+| -                                                  | -                    |
 |hadoop\_kerberos\_keytab                               | ""                      |
 |hadoop\_kerberos\_principal                            | ""                      |
 |libhdfs3\_conf                                         | ""                      |
@@ -230,9 +230,9 @@ libhdfs3 support HDFS namenode HA.
 
 ## Virtual Columns {#virtual-columns}
 
--   `_path` — Path to the file.
--   `_file` — Name of the file.
+- `_path` — Path to the file.
+- `_file` — Name of the file.
 
 **See Also**
 
--   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
+- [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
diff --git a/docs/en/engines/table-engines/integrations/hive.md b/docs/en/engines/table-engines/integrations/hive.md
index fd16e717c89..adcb73605bb 100644
--- a/docs/en/engines/table-engines/integrations/hive.md
+++ b/docs/en/engines/table-engines/integrations/hive.md
@@ -28,17 +28,17 @@ PARTITION BY expr
 See a detailed description of the [CREATE TABLE](../../../sql-reference/statements/create/table.md#create-table-query) query.
 
 The table structure can differ from the original Hive table structure:
--   Column names should be the same as in the original Hive table, but you can use just some of these columns and in any order, also you can use some alias columns calculated from other columns.
--   Column types should be the same from those in the original Hive table.
--   Partition by expression should be consistent with the original Hive table, and columns in partition by expression should be in the table structure.
+- Column names should be the same as in the original Hive table, but you can use just some of these columns and in any order, also you can use some alias columns calculated from other columns.
+- Column types should be the same from those in the original Hive table.
+- Partition by expression should be consistent with the original Hive table, and columns in partition by expression should be in the table structure.
 
 **Engine Parameters**
 
--   `thrift://host:port` — Hive Metastore address
+- `thrift://host:port` — Hive Metastore address
 
--   `database` — Remote database name.
+- `database` — Remote database name.
 
--   `table` — Remote table name.
+- `table` — Remote table name.
 
 ## Usage Example {#usage-example}
 
diff --git a/docs/en/engines/table-engines/integrations/hudi.md b/docs/en/engines/table-engines/integrations/hudi.md
index a14134ecdfa..a11e915aa3d 100644
--- a/docs/en/engines/table-engines/integrations/hudi.md
+++ b/docs/en/engines/table-engines/integrations/hudi.md
@@ -18,8 +18,8 @@ CREATE TABLE hudi_table
 
 **Engine parameters**
 
--   `url` — Bucket url with the path to an existing Hudi table.
--   `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file.
+- `url` — Bucket url with the path to an existing Hudi table.
+- `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file.
 
 Engine parameters can be specified using [Named Collections](../../../operations/named-collections.md)
 
@@ -49,4 +49,4 @@ CREATE TABLE hudi_table ENGINE=Hudi(hudi_conf, filename = 'test_table')
 
 ## See also
 
--  [hudi table function](/docs/en/sql-reference/table-functions/hudi.md)
+- [hudi table function](/docs/en/sql-reference/table-functions/hudi.md)
diff --git a/docs/en/engines/table-engines/integrations/iceberg.md b/docs/en/engines/table-engines/integrations/iceberg.md
index 4322fc6b773..77cefc9283d 100644
--- a/docs/en/engines/table-engines/integrations/iceberg.md
+++ b/docs/en/engines/table-engines/integrations/iceberg.md
@@ -18,8 +18,8 @@ CREATE TABLE iceberg_table
 
 **Engine parameters**
 
--   `url` — url with the path to an existing Iceberg table.
--   `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file.
+- `url` — url with the path to an existing Iceberg table.
+- `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file.
 
 Engine parameters can be specified using [Named Collections](../../../operations/named-collections.md)
 
@@ -49,4 +49,4 @@ CREATE TABLE iceberg_table ENGINE=Iceberg(iceberg_conf, filename = 'test_table')
 
 ## See also
 
--  [iceberg table function](/docs/en/sql-reference/table-functions/iceberg.md)
+- [iceberg table function](/docs/en/sql-reference/table-functions/iceberg.md)
diff --git a/docs/en/engines/table-engines/integrations/index.md b/docs/en/engines/table-engines/integrations/index.md
index 7a8b537aea8..b321a644d32 100644
--- a/docs/en/engines/table-engines/integrations/index.md
+++ b/docs/en/engines/table-engines/integrations/index.md
@@ -10,20 +10,20 @@ ClickHouse provides various means for integrating with external systems, includi
 
 List of supported integrations:
 
--   [ODBC](../../../engines/table-engines/integrations/odbc.md)
--   [JDBC](../../../engines/table-engines/integrations/jdbc.md)
--   [MySQL](../../../engines/table-engines/integrations/mysql.md)
--   [MongoDB](../../../engines/table-engines/integrations/mongodb.md)
--   [HDFS](../../../engines/table-engines/integrations/hdfs.md)
--   [S3](../../../engines/table-engines/integrations/s3.md)
--   [Kafka](../../../engines/table-engines/integrations/kafka.md)
--   [EmbeddedRocksDB](../../../engines/table-engines/integrations/embedded-rocksdb.md)
--   [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md)
--   [PostgreSQL](../../../engines/table-engines/integrations/postgresql.md)
--   [SQLite](../../../engines/table-engines/integrations/sqlite.md)
--   [Hive](../../../engines/table-engines/integrations/hive.md)
--   [ExternalDistributed](../../../engines/table-engines/integrations/ExternalDistributed.md)
--   [MaterializedPostgreSQL](../../../engines/table-engines/integrations/materialized-postgresql.md)
--   [NATS](../../../engines/table-engines/integrations/nats.md)
--   [DeltaLake](../../../engines/table-engines/integrations/deltalake.md)
--   [Hudi](../../../engines/table-engines/integrations/hudi.md)
+- [ODBC](../../../engines/table-engines/integrations/odbc.md)
+- [JDBC](../../../engines/table-engines/integrations/jdbc.md)
+- [MySQL](../../../engines/table-engines/integrations/mysql.md)
+- [MongoDB](../../../engines/table-engines/integrations/mongodb.md)
+- [HDFS](../../../engines/table-engines/integrations/hdfs.md)
+- [S3](../../../engines/table-engines/integrations/s3.md)
+- [Kafka](../../../engines/table-engines/integrations/kafka.md)
+- [EmbeddedRocksDB](../../../engines/table-engines/integrations/embedded-rocksdb.md)
+- [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md)
+- [PostgreSQL](../../../engines/table-engines/integrations/postgresql.md)
+- [SQLite](../../../engines/table-engines/integrations/sqlite.md)
+- [Hive](../../../engines/table-engines/integrations/hive.md)
+- [ExternalDistributed](../../../engines/table-engines/integrations/ExternalDistributed.md)
+- [MaterializedPostgreSQL](../../../engines/table-engines/integrations/materialized-postgresql.md)
+- [NATS](../../../engines/table-engines/integrations/nats.md)
+- [DeltaLake](../../../engines/table-engines/integrations/deltalake.md)
+- [Hudi](../../../engines/table-engines/integrations/hudi.md)
diff --git a/docs/en/engines/table-engines/integrations/jdbc.md b/docs/en/engines/table-engines/integrations/jdbc.md
index 6853b5d1df7..99f851dcf3e 100644
--- a/docs/en/engines/table-engines/integrations/jdbc.md
+++ b/docs/en/engines/table-engines/integrations/jdbc.md
@@ -25,14 +25,14 @@ ENGINE = JDBC(datasource_uri, external_database, external_table)
 **Engine Parameters**
 
 
--   `datasource_uri` — URI or name of an external DBMS.
+- `datasource_uri` — URI or name of an external DBMS.
 
     URI Format: `jdbc:<driver_name>://<host_name>:<port>/?user=<username>&password=<password>`.
     Example for MySQL: `jdbc:mysql://localhost:3306/?user=root&password=root`.
 
--   `external_database` — Database in an external DBMS.
+- `external_database` — Database in an external DBMS.
 
--   `external_table` — Name of the table in `external_database` or a select query like `select * from table1 where column1=1`.
+- `external_table` — Name of the table in `external_database` or a select query like `select * from table1 where column1=1`.
 
 ## Usage Example {#usage-example}
 
@@ -91,4 +91,4 @@ FROM system.numbers
 
 ## See Also {#see-also}
 
--   [JDBC table function](../../../sql-reference/table-functions/jdbc.md).
+- [JDBC table function](../../../sql-reference/table-functions/jdbc.md).
diff --git a/docs/en/engines/table-engines/integrations/kafka.md b/docs/en/engines/table-engines/integrations/kafka.md
index ef422632d3e..ccfca4c1f1f 100644
--- a/docs/en/engines/table-engines/integrations/kafka.md
+++ b/docs/en/engines/table-engines/integrations/kafka.md
@@ -10,17 +10,17 @@ This engine works with [Apache Kafka](http://kafka.apache.org/).
 
 Kafka lets you:
 
--   Publish or subscribe to data flows.
--   Organize fault-tolerant storage.
--   Process streams as they become available.
+- Publish or subscribe to data flows.
+- Organize fault-tolerant storage.
+- Process streams as they become available.
 
 ## Creating a Table {#table_engine-kafka-creating-a-table}
 
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 (
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
+    name1 [type1] [ALIAS expr1],
+    name2 [type2] [ALIAS expr2],
     ...
 ) ENGINE = Kafka()
 SETTINGS
@@ -46,27 +46,27 @@ SETTINGS
 
 Required parameters:
 
--   `kafka_broker_list` — A comma-separated list of brokers (for example, `localhost:9092`).
--   `kafka_topic_list` — A list of Kafka topics.
--   `kafka_group_name` — A group of Kafka consumers. Reading margins are tracked for each group separately. If you do not want messages to be duplicated in the cluster, use the same group name everywhere.
--   `kafka_format` — Message format. Uses the same notation as the SQL `FORMAT` function, such as `JSONEachRow`. For more information, see the [Formats](../../../interfaces/formats.md) section.
+- `kafka_broker_list` — A comma-separated list of brokers (for example, `localhost:9092`).
+- `kafka_topic_list` — A list of Kafka topics.
+- `kafka_group_name` — A group of Kafka consumers. Reading margins are tracked for each group separately. If you do not want messages to be duplicated in the cluster, use the same group name everywhere.
+- `kafka_format` — Message format. Uses the same notation as the SQL `FORMAT` function, such as `JSONEachRow`. For more information, see the [Formats](../../../interfaces/formats.md) section.
 
 Optional parameters:
 
--   `kafka_row_delimiter` — Delimiter character, which ends the message. **This setting is deprecated and is no longer used, not left for compatibility reasons.**
--   `kafka_schema` — Parameter that must be used if the format requires a schema definition. For example, [Cap’n Proto](https://capnproto.org/) requires the path to the schema file and the name of the root `schema.capnp:Message` object.
--   `kafka_num_consumers` — The number of consumers per table. Specify more consumers if the throughput of one consumer is insufficient. The total number of consumers should not exceed the number of partitions in the topic, since only one consumer can be assigned per partition, and must not be greater than the number of physical cores on the server where ClickHouse is deployed. Default: `1`.
--   `kafka_max_block_size` — The maximum batch size (in messages) for poll. Default: [max_insert_block_size](../../../operations/settings/settings.md#setting-max_insert_block_size).
--   `kafka_skip_broken_messages` — Kafka message parser tolerance to schema-incompatible messages per block. If `kafka_skip_broken_messages = N` then the engine skips *N* Kafka messages that cannot be parsed (a message equals a row of data). Default: `0`.
--   `kafka_commit_every_batch` — Commit every consumed and handled batch instead of a single commit after writing a whole block. Default: `0`.
--   `kafka_client_id` — Client identifier. Empty by default.
--   `kafka_poll_timeout_ms` — Timeout for single poll from Kafka. Default: [stream_poll_timeout_ms](../../../operations/settings/settings.md#stream_poll_timeout_ms).
--   `kafka_poll_max_batch_size` — Maximum amount of messages to be polled in a single Kafka poll. Default: [max_block_size](../../../operations/settings/settings.md#setting-max_block_size).
--   `kafka_flush_interval_ms` — Timeout for flushing data from Kafka. Default: [stream_flush_interval_ms](../../../operations/settings/settings.md#stream-flush-interval-ms).
--   `kafka_thread_per_consumer` — Provide independent thread for each consumer. When enabled, every consumer flush the data independently, in parallel (otherwise — rows from several consumers squashed to form one block). Default: `0`.
--   `kafka_handle_error_mode` — How to handle errors for Kafka engine. Possible values: default, stream.
--   `kafka_commit_on_select` —  Commit messages when select query is made. Default: `false`.
--   `kafka_max_rows_per_message` — The maximum number of rows written in one kafka message for row-based formats. Default : `1`.
+- `kafka_row_delimiter` — Delimiter character, which ends the message. **This setting is deprecated and is no longer used, not left for compatibility reasons.**
+- `kafka_schema` — Parameter that must be used if the format requires a schema definition. For example, [Cap’n Proto](https://capnproto.org/) requires the path to the schema file and the name of the root `schema.capnp:Message` object.
+- `kafka_num_consumers` — The number of consumers per table. Specify more consumers if the throughput of one consumer is insufficient. The total number of consumers should not exceed the number of partitions in the topic, since only one consumer can be assigned per partition, and must not be greater than the number of physical cores on the server where ClickHouse is deployed. Default: `1`.
+- `kafka_max_block_size` — The maximum batch size (in messages) for poll. Default: [max_insert_block_size](../../../operations/settings/settings.md#setting-max_insert_block_size).
+- `kafka_skip_broken_messages` — Kafka message parser tolerance to schema-incompatible messages per block. If `kafka_skip_broken_messages = N` then the engine skips *N* Kafka messages that cannot be parsed (a message equals a row of data). Default: `0`.
+- `kafka_commit_every_batch` — Commit every consumed and handled batch instead of a single commit after writing a whole block. Default: `0`.
+- `kafka_client_id` — Client identifier. Empty by default.
+- `kafka_poll_timeout_ms` — Timeout for single poll from Kafka. Default: [stream_poll_timeout_ms](../../../operations/settings/settings.md#stream_poll_timeout_ms).
+- `kafka_poll_max_batch_size` — Maximum amount of messages to be polled in a single Kafka poll. Default: [max_block_size](../../../operations/settings/settings.md#setting-max_block_size).
+- `kafka_flush_interval_ms` — Timeout for flushing data from Kafka. Default: [stream_flush_interval_ms](../../../operations/settings/settings.md#stream-flush-interval-ms).
+- `kafka_thread_per_consumer` — Provide independent thread for each consumer. When enabled, every consumer flush the data independently, in parallel (otherwise — rows from several consumers squashed to form one block). Default: `0`.
+- `kafka_handle_error_mode` — How to handle errors for Kafka engine. Possible values: default, stream.
+- `kafka_commit_on_select` —  Commit messages when select query is made. Default: `false`.
+- `kafka_max_rows_per_message` — The maximum number of rows written in one kafka message for row-based formats. Default : `1`.
 
 Examples:
 
@@ -102,7 +102,7 @@ Examples:
 
 <summary>Deprecated Method for Creating a Table</summary>
 
-:::warning
+:::note
 Do not use this method in new projects. If possible, switch old projects to the method described above.
 :::
 
@@ -113,6 +113,10 @@ Kafka(kafka_broker_list, kafka_topic_list, kafka_group_name, kafka_format
 
 </details>
 
+:::info
+The Kafka table engine doesn't support columns with [default value](../../../sql-reference/statements/create/table.md#default_value). If you need columns with default value, you can add them at materialized view level (see below).
+:::
+
 ## Description {#description}
 
 The delivered messages are tracked automatically, so each message in a group is only counted once. If you want to get the data twice, then create a copy of the table with another group name.
@@ -235,14 +239,14 @@ Example:
 
 ## Virtual Columns {#virtual-columns}
 
--   `_topic` — Kafka topic.
--   `_key` — Key of the message.
--   `_offset` — Offset of the message.
--   `_timestamp` — Timestamp of the message.
--   `_timestamp_ms` — Timestamp in milliseconds of the message.
--   `_partition` — Partition of Kafka topic.
--   `_headers.name` — Array of message's headers keys.
--   `_headers.value` — Array of message's headers values.
+- `_topic` — Kafka topic.
+- `_key` — Key of the message.
+- `_offset` — Offset of the message.
+- `_timestamp` — Timestamp of the message.
+- `_timestamp_ms` — Timestamp in milliseconds of the message.
+- `_partition` — Partition of Kafka topic.
+- `_headers.name` — Array of message's headers keys.
+- `_headers.value` — Array of message's headers values.
 
 ## Data formats support {#data-formats-support}
 
@@ -254,5 +258,5 @@ The number of rows in one Kafka message depends on whether the format is row-bas
 
 **See Also**
 
--   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
--   [background_message_broker_schedule_pool_size](../../../operations/settings/settings.md#background_message_broker_schedule_pool_size)
+- [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
+- [background_message_broker_schedule_pool_size](../../../operations/server-configuration-parameters/settings.md#background_message_broker_schedule_pool_size)
diff --git a/docs/en/engines/table-engines/integrations/materialized-postgresql.md b/docs/en/engines/table-engines/integrations/materialized-postgresql.md
index 11e7928c3ed..e112ca3bbb1 100644
--- a/docs/en/engines/table-engines/integrations/materialized-postgresql.md
+++ b/docs/en/engines/table-engines/integrations/materialized-postgresql.md
@@ -19,11 +19,11 @@ PRIMARY KEY key;
 
 **Engine Parameters**
 
--   `host:port` — PostgreSQL server address.
--   `database` — Remote database name.
--   `table` — Remote table name.
--   `user` — PostgreSQL user.
--   `password` — User password.
+- `host:port` — PostgreSQL server address.
+- `database` — Remote database name.
+- `table` — Remote table name.
+- `user` — PostgreSQL user.
+- `password` — User password.
 
 ## Requirements {#requirements}
 
@@ -33,11 +33,13 @@ PRIMARY KEY key;
 
 3. Only database [Atomic](https://en.wikipedia.org/wiki/Atomicity_(database_systems)) is allowed.
 
+4. The `MaterializedPostgreSQL` table engine only works for PostgreSQL versions >= 11 as the implementation requires the [pg_replication_slot_advance](https://pgpedia.info/p/pg_replication_slot_advance.html) PostgreSQL function.
+
 ## Virtual columns {#virtual-columns}
 
--   `_version` — Transaction counter. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `_version` — Transaction counter. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
--   `_sign` — Deletion mark. Type: [Int8](../../../sql-reference/data-types/int-uint.md). Possible values:
+- `_sign` — Deletion mark. Type: [Int8](../../../sql-reference/data-types/int-uint.md). Possible values:
     - `1` — Row is not deleted,
     - `-1` — Row is deleted.
 
@@ -52,6 +54,6 @@ PRIMARY KEY key;
 SELECT key, value, _version FROM postgresql_db.postgresql_replica;
 ```
 
-:::warning
+:::note
 Replication of [**TOAST**](https://www.postgresql.org/docs/9.5/storage-toast.html) values is not supported. The default value for the data type will be used.
 :::
diff --git a/docs/en/engines/table-engines/integrations/mongodb.md b/docs/en/engines/table-engines/integrations/mongodb.md
index be45ce88c67..a647ac9993f 100644
--- a/docs/en/engines/table-engines/integrations/mongodb.md
+++ b/docs/en/engines/table-engines/integrations/mongodb.md
@@ -21,17 +21,17 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name
 
 **Engine Parameters**
 
--   `host:port` — MongoDB server address.
+- `host:port` — MongoDB server address.
 
--   `database` — Remote database name.
+- `database` — Remote database name.
 
--   `collection` — Remote collection name.
+- `collection` — Remote collection name.
 
--   `user` — MongoDB user.
+- `user` — MongoDB user.
 
--   `password` — User password.
+- `password` — User password.
 
--   `options` — MongoDB connection string options (optional parameter).
+- `options` — MongoDB connection string options (optional parameter).
 
 ## Usage Example {#usage-example}
 
diff --git a/docs/en/engines/table-engines/integrations/mysql.md b/docs/en/engines/table-engines/integrations/mysql.md
index e00347c3163..6ff6221c877 100644
--- a/docs/en/engines/table-engines/integrations/mysql.md
+++ b/docs/en/engines/table-engines/integrations/mysql.md
@@ -31,25 +31,25 @@ See a detailed description of the [CREATE TABLE](../../../sql-reference/statemen
 
 The table structure can differ from the original MySQL table structure:
 
--   Column names should be the same as in the original MySQL table, but you can use just some of these columns and in any order.
--   Column types may differ from those in the original MySQL table. ClickHouse tries to [cast](../../../engines/database-engines/mysql.md#data_types-support) values to the ClickHouse data types.
--   The [external_table_functions_use_nulls](../../../operations/settings/settings.md#external-table-functions-use-nulls) setting defines how to handle Nullable columns. Default value: 1. If 0, the table function does not make Nullable columns and inserts default values instead of nulls. This is also applicable for NULL values inside arrays.
+- Column names should be the same as in the original MySQL table, but you can use just some of these columns and in any order.
+- Column types may differ from those in the original MySQL table. ClickHouse tries to [cast](../../../engines/database-engines/mysql.md#data_types-support) values to the ClickHouse data types.
+- The [external_table_functions_use_nulls](../../../operations/settings/settings.md#external-table-functions-use-nulls) setting defines how to handle Nullable columns. Default value: 1. If 0, the table function does not make Nullable columns and inserts default values instead of nulls. This is also applicable for NULL values inside arrays.
 
 **Engine Parameters**
 
--   `host:port` — MySQL server address.
+- `host:port` — MySQL server address.
 
--   `database` — Remote database name.
+- `database` — Remote database name.
 
--   `table` — Remote table name.
+- `table` — Remote table name.
 
--   `user` — MySQL user.
+- `user` — MySQL user.
 
--   `password` — User password.
+- `password` — User password.
 
--   `replace_query` — Flag that converts `INSERT INTO` queries to `REPLACE INTO`. If `replace_query=1`, the query is substituted.
+- `replace_query` — Flag that converts `INSERT INTO` queries to `REPLACE INTO`. If `replace_query=1`, the query is substituted.
 
--   `on_duplicate_clause` — The `ON DUPLICATE KEY on_duplicate_clause` expression that is added to the `INSERT` query.
+- `on_duplicate_clause` — The `ON DUPLICATE KEY on_duplicate_clause` expression that is added to the `INSERT` query.
 
     Example: `INSERT INTO t (c1,c2) VALUES ('a', 2) ON DUPLICATE KEY UPDATE c2 = c2 + 1`, where `on_duplicate_clause` is `UPDATE c2 = c2 + 1`. See the [MySQL documentation](https://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html) to find which `on_duplicate_clause` you can use with the `ON DUPLICATE KEY` clause.
 
@@ -121,8 +121,8 @@ Allows to automatically close the connection after query execution, i.e. disable
 
 Possible values:
 
--   1 — Auto-close connection is allowed, so the connection reuse is disabled
--   0 — Auto-close connection is not allowed, so the connection reuse is enabled
+- 1 — Auto-close connection is allowed, so the connection reuse is disabled
+- 0 — Auto-close connection is not allowed, so the connection reuse is enabled
 
 Default value: `1`.
 
@@ -132,8 +132,8 @@ Sets the number of retries for pool with failover.
 
 Possible values:
 
--   Positive integer.
--   0 — There are no retries for pool with failover.
+- Positive integer.
+- 0 — There are no retries for pool with failover.
 
 Default value: `3`.
 
@@ -143,7 +143,7 @@ Size of connection pool (if all connections are in use, the query will wait unti
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `16`.
 
@@ -153,7 +153,7 @@ Timeout (in seconds) for waiting for free connection (in case of there is alread
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `5`.
 
@@ -163,7 +163,7 @@ Connect timeout (in seconds).
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `10`.
 
@@ -173,11 +173,11 @@ Read/write timeout (in seconds).
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `300`.
 
 ## See Also {#see-also}
 
--   [The mysql table function](../../../sql-reference/table-functions/mysql.md)
--   [Using MySQL as a dictionary source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
+- [The mysql table function](../../../sql-reference/table-functions/mysql.md)
+- [Using MySQL as a dictionary source](../../../sql-reference/dictionaries/index.md#dictionary-sources#dicts-external_dicts_dict_sources-mysql)
diff --git a/docs/en/engines/table-engines/integrations/nats.md b/docs/en/engines/table-engines/integrations/nats.md
index f2856c89238..7f09c516d6f 100644
--- a/docs/en/engines/table-engines/integrations/nats.md
+++ b/docs/en/engines/table-engines/integrations/nats.md
@@ -45,9 +45,9 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 Required parameters:
 
--   `nats_url` – host:port (for example, `localhost:5672`)..
--   `nats_subjects` – List of subject for NATS table to subscribe/publsh to. Supports wildcard subjects like `foo.*.bar` or `baz.>`
--   `nats_format` – Message format. Uses the same notation as the SQL `FORMAT` function, such as `JSONEachRow`. For more information, see the [Formats](../../../interfaces/formats.md) section.
+- `nats_url` – host:port (for example, `localhost:5672`)..
+- `nats_subjects` – List of subject for NATS table to subscribe/publsh to. Supports wildcard subjects like `foo.*.bar` or `baz.>`
+- `nats_format` – Message format. Uses the same notation as the SQL `FORMAT` function, such as `JSONEachRow`. For more information, see the [Formats](../../../interfaces/formats.md) section.
 
 Optional parameters:
 
diff --git a/docs/en/engines/table-engines/integrations/odbc.md b/docs/en/engines/table-engines/integrations/odbc.md
index aabc37442f9..37e08dc1420 100644
--- a/docs/en/engines/table-engines/integrations/odbc.md
+++ b/docs/en/engines/table-engines/integrations/odbc.md
@@ -28,15 +28,15 @@ See a detailed description of the [CREATE TABLE](../../../sql-reference/statemen
 
 The table structure can differ from the source table structure:
 
--   Column names should be the same as in the source table, but you can use just some of these columns and in any order.
--   Column types may differ from those in the source table. ClickHouse tries to [cast](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) values to the ClickHouse data types.
--   The [external_table_functions_use_nulls](../../../operations/settings/settings.md#external-table-functions-use-nulls) setting defines how to handle Nullable columns. Default value: 1. If 0, the table function does not make Nullable columns and inserts default values instead of nulls. This is also applicable for NULL values inside arrays.
+- Column names should be the same as in the source table, but you can use just some of these columns and in any order.
+- Column types may differ from those in the source table. ClickHouse tries to [cast](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) values to the ClickHouse data types.
+- The [external_table_functions_use_nulls](../../../operations/settings/settings.md#external-table-functions-use-nulls) setting defines how to handle Nullable columns. Default value: 1. If 0, the table function does not make Nullable columns and inserts default values instead of nulls. This is also applicable for NULL values inside arrays.
 
 **Engine Parameters**
 
--   `connection_settings` — Name of the section with connection settings in the `odbc.ini` file.
--   `external_database` — Name of a database in an external DBMS.
--   `external_table` — Name of a table in the `external_database`.
+- `connection_settings` — Name of the section with connection settings in the `odbc.ini` file.
+- `external_database` — Name of a database in an external DBMS.
+- `external_table` — Name of a table in the `external_database`.
 
 ## Usage Example {#usage-example}
 
@@ -126,5 +126,5 @@ SELECT * FROM odbc_t
 
 ## See Also {#see-also}
 
--   [ODBC dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
--   [ODBC table function](../../../sql-reference/table-functions/odbc.md)
+- [ODBC dictionaries](../../../sql-reference/dictionaries/index.md#dictionary-sources#dicts-external_dicts_dict_sources-odbc)
+- [ODBC table function](../../../sql-reference/table-functions/odbc.md)
diff --git a/docs/en/engines/table-engines/integrations/postgresql.md b/docs/en/engines/table-engines/integrations/postgresql.md
index b73d28c8508..f27d4d48f75 100644
--- a/docs/en/engines/table-engines/integrations/postgresql.md
+++ b/docs/en/engines/table-engines/integrations/postgresql.md
@@ -13,8 +13,8 @@ The PostgreSQL engine allows to perform `SELECT` and `INSERT` queries on data th
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 (
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
+    name1 type1 [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
+    name2 type2 [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
     ...
 ) ENGINE = PostgreSQL('host:port', 'database', 'table', 'user', 'password'[, `schema`]);
 ```
@@ -23,19 +23,19 @@ See a detailed description of the [CREATE TABLE](../../../sql-reference/statemen
 
 The table structure can differ from the original PostgreSQL table structure:
 
--   Column names should be the same as in the original PostgreSQL table, but you can use just some of these columns and in any order.
--   Column types may differ from those in the original PostgreSQL table. ClickHouse tries to [cast](../../../engines/database-engines/postgresql.md#data_types-support) values to the ClickHouse data types.
--   The [external_table_functions_use_nulls](../../../operations/settings/settings.md#external-table-functions-use-nulls) setting defines how to handle Nullable columns. Default value: 1. If 0, the table function does not make Nullable columns and inserts default values instead of nulls. This is also applicable for NULL values inside arrays.
+- Column names should be the same as in the original PostgreSQL table, but you can use just some of these columns and in any order.
+- Column types may differ from those in the original PostgreSQL table. ClickHouse tries to [cast](../../../engines/database-engines/postgresql.md#data_types-support) values to the ClickHouse data types.
+- The [external_table_functions_use_nulls](../../../operations/settings/settings.md#external-table-functions-use-nulls) setting defines how to handle Nullable columns. Default value: 1. If 0, the table function does not make Nullable columns and inserts default values instead of nulls. This is also applicable for NULL values inside arrays.
 
 **Engine Parameters**
 
--   `host:port` — PostgreSQL server address.
--   `database` — Remote database name.
--   `table` — Remote table name.
--   `user` — PostgreSQL user.
--   `password` — User password.
--   `schema` — Non-default table schema. Optional.
--   `on conflict ...` — example: `ON CONFLICT DO NOTHING`. Optional. Note: adding this option will make insertion less efficient.
+- `host:port` — PostgreSQL server address.
+- `database` — Remote database name.
+- `table` — Remote table name.
+- `user` — PostgreSQL user.
+- `password` — User password.
+- `schema` — Non-default table schema. Optional.
+- `on conflict ...` — example: `ON CONFLICT DO NOTHING`. Optional. Note: adding this option will make insertion less efficient.
 
 or via config (since version 21.11):
 
@@ -74,7 +74,7 @@ All joins, aggregations, sorting, `IN [ array ]` conditions and the `LIMIT` samp
 
 PostgreSQL `Array` types are converted into ClickHouse arrays.
 
-:::warning
+:::note
 Be careful - in PostgreSQL an array data, created like a `type_name[]`, may contain multi-dimensional arrays of different dimensions in different table rows in same column. But in ClickHouse it is only allowed to have multidimensional arrays of the same count of dimensions in all table rows in same column.
 :::
 
@@ -111,7 +111,7 @@ In the example below replica `example01-1` has the highest priority:
 
 ## Usage Example {#usage-example}
 
-Table in PostgreSQL:
+### Table in PostgreSQL
 
 ``` text
 postgres=# CREATE TABLE "public"."test" (
@@ -134,7 +134,9 @@ postgresql> SELECT * FROM test;
  (1 row)
 ```
 
-Table in ClickHouse, retrieving data from the PostgreSQL table created above:
+### Creating Table in ClickHouse, and connecting to  PostgreSQL table created above
+
+This example uses the [PostgreSQL table engine](/docs/en/engines/table-engines/integrations/postgresql.md) to connect the ClickHouse table to the PostgreSQL table:
 
 ``` sql
 CREATE TABLE default.postgresql_table
@@ -146,6 +148,35 @@ CREATE TABLE default.postgresql_table
 ENGINE = PostgreSQL('localhost:5432', 'public', 'test', 'postges_user', 'postgres_password');
 ```
 
+### Inserting initial data from PostgreSQL table into ClickHouse table, using a SELECT query
+
+The [postgresql table function](/docs/en/sql-reference/table-functions/postgresql.md) copies the data from PostgreSQL to ClickHouse, which is often used for improving the query performance of the data by querying or performing analytics in ClickHouse rather than in PostgreSQL, or can also be used for migrating data from PostgreSQL to ClickHouse:
+
+``` sql
+INSERT INTO default.postgresql_table
+SELECT * FROM postgresql('localhost:5432', 'public', 'test', 'postges_user', 'postgres_password');
+```
+
+### Inserting incremental data from PostgreSQL table into ClickHouse table
+
+If then performing ongoing synchronization between the PostgreSQL table and ClickHouse table after the initial insert, you can use a WHERE clause in ClickHouse to insert only data added to PostgreSQL based on a timestamp or unique sequence ID.
+
+This would require keeping track of the max ID or timestamp previously added, such as the following:
+
+``` sql
+SELECT max(`int_id`) AS maxIntID FROM default.postgresql_table;
+```
+
+Then inserting values from PostgreSQL table greater than the max
+
+``` sql
+INSERT INTO default.postgresql_table
+SELECT * FROM postgresql('localhost:5432', 'public', 'test', 'postges_user', 'postgres_password');
+WHERE int_id > maxIntID;
+```
+
+### Selecting data from the resulting ClickHouse table
+
 ``` sql
 SELECT * FROM postgresql_table WHERE str IN ('test');
 ```
@@ -156,7 +187,7 @@ SELECT * FROM postgresql_table WHERE str IN ('test');
 └────────────────┴──────┴────────┘
 ```
 
-Using Non-default Schema:
+### Using Non-default Schema
 
 ```text
 postgres=# CREATE SCHEMA "nice.schema";
@@ -173,8 +204,10 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 
 **See Also**
 
--   [The `postgresql` table function](../../../sql-reference/table-functions/postgresql.md)
--   [Using PostgreSQL as a dictionary source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
+- [The `postgresql` table function](../../../sql-reference/table-functions/postgresql.md)
+- [Using PostgreSQL as a dictionary source](../../../sql-reference/dictionaries/index.md#dictionary-sources#dicts-external_dicts_dict_sources-postgresql)
 
 ## Related content
+
 - Blog: [ClickHouse and PostgreSQL - a match made in data heaven - part 1](https://clickhouse.com/blog/migrating-data-between-clickhouse-postgres)
+- Blog: [ClickHouse and PostgreSQL - a Match Made in Data Heaven - part 2](https://clickhouse.com/blog/migrating-data-between-clickhouse-postgres-part-2)
diff --git a/docs/en/engines/table-engines/integrations/rabbitmq.md b/docs/en/engines/table-engines/integrations/rabbitmq.md
index eec8691a165..08062278904 100644
--- a/docs/en/engines/table-engines/integrations/rabbitmq.md
+++ b/docs/en/engines/table-engines/integrations/rabbitmq.md
@@ -10,8 +10,8 @@ This engine allows integrating ClickHouse with [RabbitMQ](https://www.rabbitmq.c
 
 `RabbitMQ` lets you:
 
--   Publish or subscribe to data flows.
--   Process streams as they become available.
+- Publish or subscribe to data flows.
+- Process streams as they become available.
 
 ## Creating a Table {#table_engine-rabbitmq-creating-a-table}
 
@@ -51,9 +51,9 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 Required parameters:
 
--   `rabbitmq_host_port` – host:port (for example, `localhost:5672`).
--   `rabbitmq_exchange_name` – RabbitMQ exchange name.
--   `rabbitmq_format` – Message format. Uses the same notation as the SQL `FORMAT` function, such as `JSONEachRow`. For more information, see the [Formats](../../../interfaces/formats.md) section.
+- `rabbitmq_host_port` – host:port (for example, `localhost:5672`).
+- `rabbitmq_exchange_name` – RabbitMQ exchange name.
+- `rabbitmq_format` – Message format. Uses the same notation as the SQL `FORMAT` function, such as `JSONEachRow`. For more information, see the [Formats](../../../interfaces/formats.md) section.
 
 Optional parameters:
 
@@ -138,24 +138,24 @@ There can be no more than one exchange per table. One exchange can be shared bet
 
 Exchange type options:
 
--   `direct` - Routing is based on the exact matching of keys. Example table key list: `key1,key2,key3,key4,key5`, message key can equal any of them.
--   `fanout` - Routing to all tables (where exchange name is the same) regardless of the keys.
--   `topic` - Routing is based on patterns with dot-separated keys. Examples: `*.logs`, `records.*.*.2020`, `*.2018,*.2019,*.2020`.
--   `headers` - Routing is based on `key=value` matches with a setting `x-match=all` or `x-match=any`. Example table key list: `x-match=all,format=logs,type=report,year=2020`.
--   `consistent_hash` - Data is evenly distributed between all bound tables (where the exchange name is the same). Note that this exchange type must be enabled with RabbitMQ plugin: `rabbitmq-plugins enable rabbitmq_consistent_hash_exchange`.
+- `direct` - Routing is based on the exact matching of keys. Example table key list: `key1,key2,key3,key4,key5`, message key can equal any of them.
+- `fanout` - Routing to all tables (where exchange name is the same) regardless of the keys.
+- `topic` - Routing is based on patterns with dot-separated keys. Examples: `*.logs`, `records.*.*.2020`, `*.2018,*.2019,*.2020`.
+- `headers` - Routing is based on `key=value` matches with a setting `x-match=all` or `x-match=any`. Example table key list: `x-match=all,format=logs,type=report,year=2020`.
+- `consistent_hash` - Data is evenly distributed between all bound tables (where the exchange name is the same). Note that this exchange type must be enabled with RabbitMQ plugin: `rabbitmq-plugins enable rabbitmq_consistent_hash_exchange`.
 
 Setting `rabbitmq_queue_base` may be used for the following cases:
 
--   to let different tables share queues, so that multiple consumers could be registered for the same queues, which makes a better performance. If using `rabbitmq_num_consumers` and/or `rabbitmq_num_queues` settings, the exact match of queues is achieved in case these parameters are the same.
--   to be able to restore reading from certain durable queues when not all messages were successfully consumed. To resume consumption from one specific queue - set its name in `rabbitmq_queue_base` setting and do not specify `rabbitmq_num_consumers` and `rabbitmq_num_queues` (defaults to 1). To resume consumption from all queues, which were declared for a specific table - just specify the same settings: `rabbitmq_queue_base`, `rabbitmq_num_consumers`, `rabbitmq_num_queues`. By default, queue names will be unique to tables.
--   to reuse queues as they are declared durable and not auto-deleted. (Can be deleted via any of RabbitMQ CLI tools.)
+- to let different tables share queues, so that multiple consumers could be registered for the same queues, which makes a better performance. If using `rabbitmq_num_consumers` and/or `rabbitmq_num_queues` settings, the exact match of queues is achieved in case these parameters are the same.
+- to be able to restore reading from certain durable queues when not all messages were successfully consumed. To resume consumption from one specific queue - set its name in `rabbitmq_queue_base` setting and do not specify `rabbitmq_num_consumers` and `rabbitmq_num_queues` (defaults to 1). To resume consumption from all queues, which were declared for a specific table - just specify the same settings: `rabbitmq_queue_base`, `rabbitmq_num_consumers`, `rabbitmq_num_queues`. By default, queue names will be unique to tables.
+- to reuse queues as they are declared durable and not auto-deleted. (Can be deleted via any of RabbitMQ CLI tools.)
 
 To improve performance, received messages are grouped into blocks the size of [max_insert_block_size](../../../operations/server-configuration-parameters/settings.md#settings-max_insert_block_size). If the block wasn’t formed within [stream_flush_interval_ms](../../../operations/server-configuration-parameters/settings.md) milliseconds, the data will be flushed to the table regardless of the completeness of the block.
 
 If `rabbitmq_num_consumers` and/or `rabbitmq_num_queues` settings are specified along with `rabbitmq_exchange_type`, then:
 
--   `rabbitmq-consistent-hash-exchange` plugin must be enabled.
--   `message_id` property of the published messages must be specified (unique for each message/batch).
+- `rabbitmq-consistent-hash-exchange` plugin must be enabled.
+- `message_id` property of the published messages must be specified (unique for each message/batch).
 
 For insert query there is message metadata, which is added for each published message: `messageID` and `republished` flag (true, if published more than once) - can be accessed via message headers.
 
diff --git a/docs/en/engines/table-engines/integrations/s3.md b/docs/en/engines/table-engines/integrations/s3.md
index 723425429a5..595bc0c344f 100644
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@@ -12,17 +12,18 @@ This engine provides integration with [Amazon S3](https://aws.amazon.com/s3/) ec
 
 ``` sql
 CREATE TABLE s3_engine_table (name String, value UInt32)
-    ENGINE = S3(path, [aws_access_key_id, aws_secret_access_key,] format, [compression])
+    ENGINE = S3(path [, NOSIGN | aws_access_key_id, aws_secret_access_key,] format, [compression])
     [PARTITION BY expr]
     [SETTINGS ...]
 ```
 
 **Engine parameters**
 
--   `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings. For more information see [below](#wildcards-in-path).
--   `format` — The [format](../../../interfaces/formats.md#formats) of the file.
--   `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file. For more information see [Using S3 for Data Storage](../mergetree-family/mergetree.md#table_engine-mergetree-s3).
--   `compression` — Compression type. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. Parameter is optional. By default, it will autodetect compression by file extension.
+- `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings. For more information see [below](#wildcards-in-path).
+- `NOSIGN` - If this keyword is provided in place of credentials, all the requests will not be signed. 
+- `format` — The [format](../../../interfaces/formats.md#formats) of the file.
+- `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file. For more information see [Using S3 for Data Storage](../mergetree-family/mergetree.md#table_engine-mergetree-s3).
+- `compression` — Compression type. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. Parameter is optional. By default, it will autodetect compression by file extension.
 
 ### PARTITION BY
 
@@ -50,20 +51,20 @@ SELECT * FROM s3_engine_table LIMIT 2;
 ```
 ## Virtual columns {#virtual-columns}
 
--   `_path` — Path to the file.
--   `_file` — Name of the file.
+- `_path` — Path to the file.
+- `_file` — Name of the file.
 
 For more information about virtual columns see [here](../../../engines/table-engines/index.md#table_engines-virtual_columns).
 
 ## Implementation Details {#implementation-details}
 
--   Reads and writes can be parallel
--   Not supported:
-    -   `ALTER` and `SELECT...SAMPLE` operations.
-    -   Indexes.
-    -   [Zero-copy](../../../operations/storing-data.md#zero-copy) replication is possible, but not supported.
+- Reads and writes can be parallel
+- Not supported:
+    - `ALTER` and `SELECT...SAMPLE` operations.
+    - Indexes.
+    - [Zero-copy](../../../operations/storing-data.md#zero-copy) replication is possible, but not supported.
 
-  :::warning Zero-copy replication is not ready for production
+  :::note Zero-copy replication is not ready for production
   Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
   :::
 
@@ -71,14 +72,14 @@ For more information about virtual columns see [here](../../../engines/table-eng
 
 `path` argument can specify multiple files using bash-like wildcards. For being processed file should exist and match to the whole path pattern. Listing of files is determined during `SELECT` (not at `CREATE` moment).
 
--   `*` — Substitutes any number of any characters except `/` including empty string.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders. N and M can have leading zeroes e.g. `000..078`.
+- `*` — Substitutes any number of any characters except `/` including empty string.
+- `?` — Substitutes any single character.
+- `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
+- `{N..M}` — Substitutes any number in range from N to M including both borders. N and M can have leading zeroes e.g. `000..078`.
 
 Constructions with `{}` are similar to the [remote](../../../sql-reference/table-functions/remote.md) table function.
 
-:::warning
+:::note
 If the listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 :::
 
@@ -95,12 +96,12 @@ CREATE TABLE big_table (name String, value UInt32)
 
 Suppose we have several files in CSV format with the following URIs on S3:
 
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/some_folder/some_file_1.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/some_folder/some_file_2.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/some_folder/some_file_3.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/another_folder/some_file_1.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/another_folder/some_file_2.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/another_folder/some_file_3.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/some_folder/some_file_1.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/some_folder/some_file_2.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/some_folder/some_file_3.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/another_folder/some_file_1.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/another_folder/some_file_2.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/another_folder/some_file_3.csv'
 
 
 There are several ways to make a table consisting of all six files:
@@ -130,14 +131,17 @@ CREATE TABLE table_with_asterisk (name String, value UInt32)
 
 The following settings can be set before query execution or placed into configuration file.
 
--   `s3_max_single_part_upload_size` — The maximum size of object to upload using singlepart upload to S3. Default value is `64Mb`.
--   `s3_min_upload_part_size` — The minimum size of part to upload during multipart upload to [S3 Multipart upload](https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html). Default value is `512Mb`.
--   `s3_max_redirects` — Max number of S3 redirects hops allowed. Default value is `10`.
--   `s3_single_read_retries` — The maximum number of attempts during single read. Default value is `4`.
--   `s3_max_put_rps` — Maximum PUT requests per second rate before throttling. Default value is `0` (unlimited).
--   `s3_max_put_burst` — Max number of requests that can be issued simultaneously before hitting request per second limit. By default (`0` value) equals to `s3_max_put_rps`.
--   `s3_max_get_rps` — Maximum GET requests per second rate before throttling. Default value is `0` (unlimited).
--   `s3_max_get_burst` — Max number of requests that can be issued simultaneously before hitting request per second limit. By default (`0` value) equals to `s3_max_get_rps`.
+- `s3_max_single_part_upload_size` — The maximum size of object to upload using singlepart upload to S3. Default value is `32Mb`.
+- `s3_min_upload_part_size` — The minimum size of part to upload during multipart upload to [S3 Multipart upload](https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html). Default value is `16Mb`.
+- `s3_max_redirects` — Max number of S3 redirects hops allowed. Default value is `10`.
+- `s3_single_read_retries` — The maximum number of attempts during single read. Default value is `4`.
+- `s3_max_put_rps` — Maximum PUT requests per second rate before throttling. Default value is `0` (unlimited).
+- `s3_max_put_burst` — Max number of requests that can be issued simultaneously before hitting request per second limit. By default (`0` value) equals to `s3_max_put_rps`.
+- `s3_max_get_rps` — Maximum GET requests per second rate before throttling. Default value is `0` (unlimited).
+- `s3_max_get_burst` — Max number of requests that can be issued simultaneously before hitting request per second limit. By default (`0` value) equals to `s3_max_get_rps`.
+- `s3_upload_part_size_multiply_factor` - Multiply `s3_min_upload_part_size` by this factor each time `s3_multiply_parts_count_threshold` parts were uploaded from a single write to S3. Default values is `2`.
+- `s3_upload_part_size_multiply_parts_count_threshold` - Each time this number of parts was uploaded to S3 `s3_min_upload_part_size multiplied` by `s3_upload_part_size_multiply_factor`. DEfault value us `500`.
+- `s3_max_inflight_parts_for_one_file` - Limits the number of put requests that can be run concurenly for one object. Its number should be limited. The value `0` means unlimited. Default value is `20`. Each inflight part has a buffer with size `s3_min_upload_part_size` for the first `s3_upload_part_size_multiply_factor` parts and more when file is big enought, see `upload_part_size_multiply_factor`. With default settings one uploaded file consumes not more than `320Mb` for a file which is less than `8G`. The consumption is greater for a larger file.
 
 Security consideration: if malicious user can specify arbitrary S3 URLs, `s3_max_redirects` must be set to zero to avoid [SSRF](https://en.wikipedia.org/wiki/Server-side_request_forgery) attacks; or alternatively, `remote_host_filter` must be specified in server configuration.
 
@@ -145,15 +149,20 @@ Security consideration: if malicious user can specify arbitrary S3 URLs, `s3_max
 
 The following settings can be specified in configuration file for given endpoint (which will be matched by exact prefix of a URL):
 
--   `endpoint` — Specifies prefix of an endpoint. Mandatory.
--   `access_key_id` and `secret_access_key` — Specifies credentials to use with given endpoint. Optional.
--   `use_environment_credentials` — If set to `true`, S3 client will try to obtain credentials from environment variables and [Amazon EC2](https://en.wikipedia.org/wiki/Amazon_Elastic_Compute_Cloud) metadata for given endpoint. Optional, default value is `false`.
--   `region` — Specifies S3 region name. Optional.
--   `use_insecure_imds_request` — If set to `true`, S3 client will use insecure IMDS request while obtaining credentials from Amazon EC2 metadata. Optional, default value is `false`.
--   `header` —  Adds specified HTTP header to a request to given endpoint. Optional, can be specified multiple times.
--   `server_side_encryption_customer_key_base64` — If specified, required headers for accessing S3 objects with SSE-C encryption will be set. Optional.
--   `max_single_read_retries` — The maximum number of attempts during single read. Default value is `4`. Optional.
--   `max_put_rps`, `max_put_burst`, `max_get_rps` and `max_get_burst` - Throttling settings (see description above) to use for specific endpoint instead of per query. Optional.
+- `endpoint` — Specifies prefix of an endpoint. Mandatory.
+- `access_key_id` and `secret_access_key` — Specifies credentials to use with given endpoint. Optional.
+- `use_environment_credentials` — If set to `true`, S3 client will try to obtain credentials from environment variables and [Amazon EC2](https://en.wikipedia.org/wiki/Amazon_Elastic_Compute_Cloud) metadata for given endpoint. Optional, default value is `false`.
+- `region` — Specifies S3 region name. Optional.
+- `use_insecure_imds_request` — If set to `true`, S3 client will use insecure IMDS request while obtaining credentials from Amazon EC2 metadata. Optional, default value is `false`.
+- `expiration_window_seconds` — Grace period for checking if expiration-based credentials have expired. Optional, default value is `120`.
+- `no_sign_request` - Ignore all the credentials so requests are not signed. Useful for accessing public buckets.
+- `header` —  Adds specified HTTP header to a request to given endpoint. Optional, can be specified multiple times.
+- `server_side_encryption_customer_key_base64` — If specified, required headers for accessing S3 objects with SSE-C encryption will be set. Optional.
+- `server_side_encryption_kms_key_id` - If specified, required headers for accessing S3 objects with [SSE-KMS encryption](https://docs.aws.amazon.com/AmazonS3/latest/userguide/UsingKMSEncryption.html) will be set. If an empty string is specified, the AWS managed S3 key will be used. Optional.
+- `server_side_encryption_kms_encryption_context` - If specified alongside `server_side_encryption_kms_key_id`, the given encryption context header for SSE-KMS will be set. Optional.
+- `server_side_encryption_kms_bucket_key_enabled` - If specified alongside `server_side_encryption_kms_key_id`, the header to enable S3 bucket keys for SSE-KMS will be set. Optional, can be `true` or `false`, defaults to nothing (matches the bucket-level setting).
+- `max_single_read_retries` — The maximum number of attempts during single read. Default value is `4`. Optional.
+- `max_put_rps`, `max_put_burst`, `max_get_rps` and `max_get_burst` - Throttling settings (see description above) to use for specific endpoint instead of per query. Optional.
 
 **Example:**
 
@@ -166,13 +175,29 @@ The following settings can be specified in configuration file for given endpoint
         <!-- <region>us-west-1</region> -->
         <!-- <use_environment_credentials>false</use_environment_credentials> -->
         <!-- <use_insecure_imds_request>false</use_insecure_imds_request> -->
+        <!-- <expiration_window_seconds>120</expiration_window_seconds> -->
+        <!-- <no_sign_request>false</no_sign_request> -->
         <!-- <header>Authorization: Bearer SOME-TOKEN</header> -->
         <!-- <server_side_encryption_customer_key_base64>BASE64-ENCODED-KEY</server_side_encryption_customer_key_base64> -->
+        <!-- <server_side_encryption_kms_key_id>KMS_KEY_ID</server_side_encryption_kms_key_id> -->
+        <!-- <server_side_encryption_kms_encryption_context>KMS_ENCRYPTION_CONTEXT</server_side_encryption_kms_encryption_context> -->
+        <!-- <server_side_encryption_kms_bucket_key_enabled>true</server_side_encryption_kms_bucket_key_enabled> -->
         <!-- <max_single_read_retries>4</max_single_read_retries> -->
     </endpoint-name>
 </s3>
 ```
 
+## Accessing public buckets
+
+ClickHouse tries to fetch credentials from many different types of sources.
+Sometimes, it can produce problems when accessing some buckets that are public causing the client to return `403` error code.
+This issue can be avoided by using `NOSIGN` keyword, forcing the client to ignore all the credentials, and not sign the requests.
+
+``` sql
+CREATE TABLE big_table (name String, value UInt32)
+    ENGINE = S3('https://datasets-documentation.s3.eu-west-3.amazonaws.com/aapl_stock.csv', NOSIGN, 'CSVWithNames');
+```
+
 ## See also
 
--  [s3 table function](../../../sql-reference/table-functions/s3.md)
+- [s3 table function](../../../sql-reference/table-functions/s3.md)
diff --git a/docs/en/engines/table-engines/integrations/sqlite.md b/docs/en/engines/table-engines/integrations/sqlite.md
index ba11b73339d..20597d37a87 100644
--- a/docs/en/engines/table-engines/integrations/sqlite.md
+++ b/docs/en/engines/table-engines/integrations/sqlite.md
@@ -20,8 +20,8 @@ The engine allows to import and export data to SQLite and supports queries to SQ
 
 **Engine Parameters**
 
--   `db_path` — Path to SQLite file with a database.
--   `table` — Name of a table in the SQLite database.
+- `db_path` — Path to SQLite file with a database.
+- `table` — Name of a table in the SQLite database.
 
 ## Usage Example {#usage-example}
 
@@ -56,5 +56,5 @@ SELECT * FROM sqlite_db.table2 ORDER BY col1;
 
 **See Also**
 
--   [SQLite](../../../engines/database-engines/sqlite.md) engine
--   [sqlite](../../../sql-reference/table-functions/sqlite.md) table function
+- [SQLite](../../../engines/database-engines/sqlite.md) engine
+- [sqlite](../../../sql-reference/table-functions/sqlite.md) table function
diff --git a/docs/en/engines/table-engines/log-family/index.md b/docs/en/engines/table-engines/log-family/index.md
index 9e671163bbf..aca24e68378 100644
--- a/docs/en/engines/table-engines/log-family/index.md
+++ b/docs/en/engines/table-engines/log-family/index.md
@@ -10,9 +10,9 @@ These engines were developed for scenarios when you need to quickly write many s
 
 Engines of the family:
 
--   [StripeLog](/docs/en/engines/table-engines/log-family/stripelog.md)
--   [Log](/docs/en/engines/table-engines/log-family/log.md)
--   [TinyLog](/docs/en/engines/table-engines/log-family/tinylog.md)
+- [StripeLog](/docs/en/engines/table-engines/log-family/stripelog.md)
+- [Log](/docs/en/engines/table-engines/log-family/log.md)
+- [TinyLog](/docs/en/engines/table-engines/log-family/tinylog.md)
 
 `Log` family table engines can store data to [HDFS](/docs/en/engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-hdfs) or [S3](/docs/en/engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-s3) distributed file systems.
 
@@ -20,21 +20,21 @@ Engines of the family:
 
 Engines:
 
--   Store data on a disk.
+- Store data on a disk.
 
--   Append data to the end of file when writing.
+- Append data to the end of file when writing.
 
--   Support locks for concurrent data access.
+- Support locks for concurrent data access.
 
     During `INSERT` queries, the table is locked, and other queries for reading and writing data both wait for the table to unlock. If there are no data writing queries, any number of data reading queries can be performed concurrently.
 
--   Do not support [mutations](/docs/en/sql-reference/statements/alter/index.md#alter-mutations).
+- Do not support [mutations](/docs/en/sql-reference/statements/alter/index.md#alter-mutations).
 
--   Do not support indexes.
+- Do not support indexes.
 
     This means that `SELECT` queries for ranges of data are not efficient.
 
--   Do not write data atomically.
+- Do not write data atomically.
 
     You can get a table with corrupted data if something breaks the write operation, for example, abnormal server shutdown.
 
diff --git a/docs/en/engines/table-engines/log-family/stripelog.md b/docs/en/engines/table-engines/log-family/stripelog.md
index 747713fe69a..6aaa6caf654 100644
--- a/docs/en/engines/table-engines/log-family/stripelog.md
+++ b/docs/en/engines/table-engines/log-family/stripelog.md
@@ -29,8 +29,8 @@ The `StripeLog` engine stores all the columns in one file. For each `INSERT` que
 
 For each table ClickHouse writes the files:
 
--   `data.bin` — Data file.
--   `index.mrk` — File with marks. Marks contain offsets for each column of each data block inserted.
+- `data.bin` — Data file.
+- `index.mrk` — File with marks. Marks contain offsets for each column of each data block inserted.
 
 The `StripeLog` engine does not support the `ALTER UPDATE` and `ALTER DELETE` operations.
 
diff --git a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
index 9677f75a358..2b8b43802ea 100644
--- a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -43,7 +43,7 @@ When creating an `AggregatingMergeTree` table the same [clauses](../../../engine
 
 <summary>Deprecated Method for Creating a Table</summary>
 
-:::warning
+:::note
 Do not use this method in new projects and, if possible, switch the old projects to the method described above.
 :::
 
@@ -122,3 +122,7 @@ FROM test.mv_visits
 GROUP BY StartDate
 ORDER BY StartDate;
 ```
+
+## Related Content
+
+- Blog: [Using Aggregate Combinators in ClickHouse](https://clickhouse.com/blog/aggregate-functions-combinators-in-clickhouse-for-arrays-maps-and-states)
diff --git a/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
index 0bd665116f0..0043e1b6748 100644
--- a/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -45,7 +45,7 @@ When creating a `CollapsingMergeTree` table, the same [query clauses](../../../e
 
 <summary>Deprecated Method for Creating a Table</summary>
 
-:::warning
+:::note
 Do not use this method in new projects and, if possible, switch old projects to the method described above.
 :::
 
@@ -60,7 +60,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 All of the parameters excepting `sign` have the same meaning as in `MergeTree`.
 
--   `sign` — Name of the column with the type of row: `1` — “state” row, `-1` — “cancel” row.
+- `sign` — Name of the column with the type of row: `1` — “state” row, `-1` — “cancel” row.
 
     Column Data Type — `Int8`.
 
diff --git a/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md
index b1e79c4c3fd..edb320a2507 100644
--- a/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -6,7 +6,7 @@ sidebar_label: Custom Partitioning Key
 
 # Custom Partitioning Key
 
-:::warning
+:::note
 In most cases you do not need a partition key, and in most other cases you do not need a partition key more granular than by months.
 
 You should never use too granular of partitioning. Don't partition your data by client identifiers or names. Instead, make a client identifier or name the first column in the ORDER BY expression.
@@ -77,11 +77,11 @@ The `name` column contains the names of the partition data parts. You can use th
 
 Let’s break down the name of the part: `201901_1_9_2_11`:
 
--   `201901` is the partition name.
--   `1` is the minimum number of the data block.
--   `9` is the maximum number of the data block.
--   `2` is the chunk level (the depth of the merge tree it is formed from).
--   `11` is the mutation version (if a part mutated)
+- `201901` is the partition name.
+- `1` is the minimum number of the data block.
+- `9` is the maximum number of the data block.
+- `2` is the chunk level (the depth of the merge tree it is formed from).
+- `11` is the mutation version (if a part mutated)
 
 :::info
 The parts of old-type tables have the name: `20190117_20190123_2_2_0` (minimum date - maximum date - minimum block number - maximum block number - level).
@@ -159,15 +159,15 @@ FROM session_log
 GROUP BY UserID;
 ```
 
-:::warning
+:::note
 Performance of such a query heavily depends on the table layout. Because of that the optimisation is not enabled by default.
 :::
 
 The key factors for a good performance:
 
--   number of partitions involved in the query should be sufficiently large (more than `max_threads / 2`), otherwise query will underutilize the machine
--   partitions shouldn't be too small, so batch processing won't degenerate into row-by-row processing
--   partitions should be comparable in size, so all threads will do roughly the same amount of work
+- number of partitions involved in the query should be sufficiently large (more than `max_threads / 2`), otherwise query will underutilize the machine
+- partitions shouldn't be too small, so batch processing won't degenerate into row-by-row processing
+- partitions should be comparable in size, so all threads will do roughly the same amount of work
 
 :::info
 It's recommended to apply some hash function to columns in `partition by` clause in order to distribute data evenly between partitions.
@@ -175,6 +175,6 @@ It's recommended to apply some hash function to columns in `partition by` clause
 
 Relevant settings are:
 
--   `allow_aggregate_partitions_independently` - controls if the use of optimisation is enabled
--   `force_aggregate_partitions_independently` - forces its use when it's applicable from the correctness standpoint, but getting disabled by internal logic that estimates its expediency
--   `max_number_of_partitions_for_independent_aggregation` - hard limit on the maximal number of partitions table could have
+- `allow_aggregate_partitions_independently` - controls if the use of optimisation is enabled
+- `force_aggregate_partitions_independently` - forces its use when it's applicable from the correctness standpoint, but getting disabled by internal logic that estimates its expediency
+- `max_number_of_partitions_for_independent_aggregation` - hard limit on the maximal number of partitions table could have
diff --git a/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
index 104ec049ec4..c96e40d127c 100644
--- a/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
@@ -33,19 +33,19 @@ See a detailed description of the [CREATE TABLE](../../../sql-reference/statemen
 
 A table for the Graphite data should have the following columns for the following data:
 
--   Metric name (Graphite sensor). Data type: `String`.
+- Metric name (Graphite sensor). Data type: `String`.
 
--   Time of measuring the metric. Data type: `DateTime`.
+- Time of measuring the metric. Data type: `DateTime`.
 
--   Value of the metric. Data type: `Float64`.
+- Value of the metric. Data type: `Float64`.
 
--   Version of the metric. Data type: any numeric (ClickHouse saves the rows with the highest version or the last written if versions are the same. Other rows are deleted during the merge of data parts).
+- Version of the metric. Data type: any numeric (ClickHouse saves the rows with the highest version or the last written if versions are the same. Other rows are deleted during the merge of data parts).
 
 The names of these columns should be set in the rollup configuration.
 
 **GraphiteMergeTree parameters**
 
--   `config_section` — Name of the section in the configuration file, where are the rules of rollup set.
+- `config_section` — Name of the section in the configuration file, where are the rules of rollup set.
 
 **Query clauses**
 
@@ -55,7 +55,7 @@ When creating a `GraphiteMergeTree` table, the same [clauses](../../../engines/t
 
 <summary>Deprecated Method for Creating a Table</summary>
 
-:::warning
+:::note
 Do not use this method in new projects and, if possible, switch old projects to the method described above.
 :::
 
@@ -73,7 +73,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 All of the parameters excepting `config_section` have the same meaning as in `MergeTree`.
 
--   `config_section` — Name of the section in the configuration file, where are the rules of rollup set.
+- `config_section` — Name of the section in the configuration file, where are the rules of rollup set.
 
 </details>
 
@@ -129,7 +129,7 @@ default
     ...
 ```
 
-:::warning
+:::important
 Patterns must be strictly ordered:
 
 1. Patterns without `function` or `retention`.
@@ -141,18 +141,18 @@ When processing a row, ClickHouse checks the rules in the `pattern` sections. Ea
 
 Fields for `pattern` and `default` sections:
 
--   `rule_type` - a rule's type. It's applied only to a particular metrics. The engine use it to separate plain and tagged metrics. Optional parameter. Default value: `all`.
+- `rule_type` - a rule's type. It's applied only to a particular metrics. The engine use it to separate plain and tagged metrics. Optional parameter. Default value: `all`.
 It's unnecessary when performance is not critical, or only one metrics type is used, e.g. plain metrics. By default only one type of rules set is created. Otherwise, if any of special types is defined, two different sets are created. One for plain metrics (root.branch.leaf) and one for tagged metrics (root.branch.leaf;tag1=value1).
 The default rules are ended up in both sets.
 Valid values:
-    -   `all` (default) - a universal rule, used when `rule_type` is omitted.
-    -   `plain` - a rule for plain metrics. The field `regexp` is processed as regular expression.
-    -   `tagged` - a rule for tagged metrics (metrics are stored in DB in the format of `someName?tag1=value1&tag2=value2&tag3=value3`). Regular expression must be sorted by tags' names, first tag must be `__name__` if exists. The field `regexp` is processed as regular expression.
-    -   `tag_list` - a rule for tagged matrics, a simple DSL for easier metric description in graphite format `someName;tag1=value1;tag2=value2`, `someName`, or `tag1=value1;tag2=value2`. The field `regexp` is translated into a `tagged` rule. The sorting by tags' names is unnecessary, ti will be done automatically. A tag's value (but not a name) can be set as a regular expression, e.g. `env=(dev|staging)`.
--   `regexp` – A pattern for the metric name (a regular or DSL).
--   `age` – The minimum age of the data in seconds.
--   `precision`– How precisely to define the age of the data in seconds. Should be a divisor for 86400 (seconds in a day).
--   `function` – The name of the aggregating function to apply to data whose age falls within the range `[age, age + precision]`. Accepted functions: min / max / any / avg. The average is calculated imprecisely, like the average of the averages.
+    - `all` (default) - a universal rule, used when `rule_type` is omitted.
+    - `plain` - a rule for plain metrics. The field `regexp` is processed as regular expression.
+    - `tagged` - a rule for tagged metrics (metrics are stored in DB in the format of `someName?tag1=value1&tag2=value2&tag3=value3`). Regular expression must be sorted by tags' names, first tag must be `__name__` if exists. The field `regexp` is processed as regular expression.
+    - `tag_list` - a rule for tagged metrics, a simple DSL for easier metric description in graphite format `someName;tag1=value1;tag2=value2`, `someName`, or `tag1=value1;tag2=value2`. The field `regexp` is translated into a `tagged` rule. The sorting by tags' names is unnecessary, ti will be done automatically. A tag's value (but not a name) can be set as a regular expression, e.g. `env=(dev|staging)`.
+- `regexp` – A pattern for the metric name (a regular or DSL).
+- `age` – The minimum age of the data in seconds.
+- `precision`– How precisely to define the age of the data in seconds. Should be a divisor for 86400 (seconds in a day).
+- `function` – The name of the aggregating function to apply to data whose age falls within the range `[age, age + precision]`. Accepted functions: min / max / any / avg. The average is calculated imprecisely, like the average of the averages.
 
 ### Configuration Example without rules types {#configuration-example}
 
@@ -263,6 +263,6 @@ Valid values:
 </graphite_rollup>
 ```
 
-:::warning
+:::note
 Data rollup is performed during merges. Usually, for old partitions, merges are not started, so for rollup it is necessary to trigger an unscheduled merge using [optimize](../../../sql-reference/statements/optimize.md). Or use additional tools, for example [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer).
 :::
diff --git a/docs/en/engines/table-engines/mergetree-family/invertedindexes.md b/docs/en/engines/table-engines/mergetree-family/invertedindexes.md
index aa11258dc4a..31f5a87a2b6 100644
--- a/docs/en/engines/table-engines/mergetree-family/invertedindexes.md
+++ b/docs/en/engines/table-engines/mergetree-family/invertedindexes.md
@@ -15,7 +15,7 @@ tokenized cells of the string column. For example, the string cell "I will be a
 " wi", "wil", "ill", "ll ", "l b", " be" etc. The more fine-granular the input strings are tokenized, the bigger but also the more
 useful the resulting inverted index will be.
 
-:::warning
+:::note
 Inverted indexes are experimental and should not be used in production environments yet. They may change in the future in backward-incompatible
 ways, for example with respect to their DDL/DQL syntax or performance/compression characteristics.
 :::
@@ -191,3 +191,7 @@ is performance. In practice, users often search for multiple terms at once. For
 '%big%'` can be evaluated directly using an inverted index by forming the union of the row id lists for terms "little" and "big". This also
 means that the parameter `GRANULARITY` supplied to index creation has no meaning (it may be removed from the syntax in the future).
 :::
+
+## Related Content
+
+- Blog: [Introducing Inverted Indices in ClickHouse](https://clickhouse.com/blog/clickhouse-search-with-inverted-indices)
diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index 7c0416d3ea4..79ced0b6ce5 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -12,19 +12,19 @@ Engines in the `MergeTree` family are designed for inserting a very large amount
 
 Main features:
 
--   Stores data sorted by primary key.
+- Stores data sorted by primary key.
 
     This allows you to create a small sparse index that helps find data faster.
 
--   Partitions can be used if the [partitioning key](/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md) is specified.
+- Partitions can be used if the [partitioning key](/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md) is specified.
 
     ClickHouse supports certain operations with partitions that are more efficient than general operations on the same data with the same result. ClickHouse also automatically cuts off the partition data where the partitioning key is specified in the query.
 
--   Data replication support.
+- Data replication support.
 
     The family of `ReplicatedMergeTree` tables provides data replication. For more information, see [Data replication](/docs/en/engines/table-engines/mergetree-family/replication.md).
 
--   Data sampling support.
+- Data sampling support.
 
     If necessary, you can set the data sampling method in the table.
 
@@ -192,7 +192,7 @@ The `index_granularity` setting can be omitted because 8192 is the default value
 
 <summary>Deprecated Method for Creating a Table</summary>
 
-:::warning
+:::note
 Do not use this method in new projects. If possible, switch old projects to the method described above.
 :::
 
@@ -207,10 +207,10 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 **MergeTree() Parameters**
 
--   `date-column` — The name of a column of the [Date](/docs/en/sql-reference/data-types/date.md) type. ClickHouse automatically creates partitions by month based on this column. The partition names are in the `"YYYYMM"` format.
--   `sampling_expression` — An expression for sampling.
--   `(primary, key)` — Primary key. Type: [Tuple()](/docs/en/sql-reference/data-types/tuple.md)
--   `index_granularity` — The granularity of an index. The number of data rows between the “marks” of an index. The value 8192 is appropriate for most tasks.
+- `date-column` — The name of a column of the [Date](/docs/en/sql-reference/data-types/date.md) type. ClickHouse automatically creates partitions by month based on this column. The partition names are in the `"YYYYMM"` format.
+- `sampling_expression` — An expression for sampling.
+- `(primary, key)` — Primary key. Type: [Tuple()](/docs/en/sql-reference/data-types/tuple.md)
+- `index_granularity` — The granularity of an index. The number of data rows between the “marks” of an index. The value 8192 is appropriate for most tasks.
 
 **Example**
 
@@ -250,9 +250,9 @@ Take the `(CounterID, Date)` primary key as an example. In this case, the sortin
 
 If the data query specifies:
 
--   `CounterID in ('a', 'h')`, the server reads the data in the ranges of marks `[0, 3)` and `[6, 8)`.
--   `CounterID IN ('a', 'h') AND Date = 3`, the server reads the data in the ranges of marks `[1, 3)` and `[7, 8)`.
--   `Date = 3`, the server reads the data in the range of marks `[1, 10]`.
+- `CounterID in ('a', 'h')`, the server reads the data in the ranges of marks `[0, 3)` and `[6, 8)`.
+- `CounterID IN ('a', 'h') AND Date = 3`, the server reads the data in the ranges of marks `[1, 3)` and `[7, 8)`.
+- `Date = 3`, the server reads the data in the range of marks `[1, 10]`.
 
 The examples above show that it is always more effective to use an index than a full scan.
 
@@ -268,18 +268,18 @@ You can use `Nullable`-typed expressions in the `PRIMARY KEY` and `ORDER BY` cla
 
 The number of columns in the primary key is not explicitly limited. Depending on the data structure, you can include more or fewer columns in the primary key. This may:
 
--   Improve the performance of an index.
+- Improve the performance of an index.
 
     If the primary key is `(a, b)`, then adding another column `c` will improve the performance if the following conditions are met:
 
-    -   There are queries with a condition on column `c`.
-    -   Long data ranges (several times longer than the `index_granularity`) with identical values for `(a, b)` are common. In other words, when adding another column allows you to skip quite long data ranges.
+    - There are queries with a condition on column `c`.
+    - Long data ranges (several times longer than the `index_granularity`) with identical values for `(a, b)` are common. In other words, when adding another column allows you to skip quite long data ranges.
 
--   Improve data compression.
+- Improve data compression.
 
     ClickHouse sorts data by primary key, so the higher the consistency, the better the compression.
 
--   Provide additional logic when merging data parts in the [CollapsingMergeTree](/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md/#table_engine-collapsingmergetree) and [SummingMergeTree](/docs/en/engines/table-engines/mergetree-family/summingmergetree.md) engines.
+- Provide additional logic when merging data parts in the [CollapsingMergeTree](/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md/#table_engine-collapsingmergetree) and [SummingMergeTree](/docs/en/engines/table-engines/mergetree-family/summingmergetree.md) engines.
 
     In this case it makes sense to specify the *sorting key* that is different from the primary key.
 
@@ -377,8 +377,9 @@ CREATE TABLE table_name
     i32 Int32,
     s String,
     ...
-    INDEX a (u64 * i32, s) TYPE minmax GRANULARITY 3,
-    INDEX b (u64 * length(s)) TYPE set(1000) GRANULARITY 4
+    INDEX idx1 u64 TYPE bloom_filter GRANULARITY 3,
+    INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 3,
+    INDEX idx3 u64 * length(s) TYPE set(1000) GRANULARITY 4
 ) ENGINE = MergeTree()
 ...
 ```
@@ -386,8 +387,25 @@ CREATE TABLE table_name
 Indices from the example can be used by ClickHouse to reduce the amount of data to read from disk in the following queries:
 
 ``` sql
-SELECT count() FROM table WHERE s < 'z'
-SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234
+SELECT count() FROM table WHERE u64 == 10;
+SELECT count() FROM table WHERE u64 * i32 >= 1234
+SELECT count() FROM table WHERE u64 * length(s) == 1234
+```
+
+Data skipping indexes can also be created on composite columns:
+
+```sql
+-- on columns of type Map:
+INDEX map_key_index mapKeys(map_column) TYPE bloom_filter
+INDEX map_value_index mapValues(map_column) TYPE bloom_filter
+
+-- on columns of type Tuple:
+INDEX tuple_1_index tuple_column.1 TYPE bloom_filter
+INDEX tuple_2_index tuple_column.2 TYPE bloom_filter
+
+-- on columns of type Nested:
+INDEX nested_1_index col.nested_col1 TYPE bloom_filter
+INDEX nested_2_index col.nested_col2 TYPE bloom_filter
 ```
 
 ### Available Types of Indices {#available-types-of-indices}
@@ -421,6 +439,50 @@ Syntax: `ngrambf_v1(n, size_of_bloom_filter_in_bytes, number_of_hash_functions,
 - `number_of_hash_functions` — The number of hash functions used in the Bloom filter.
 - `random_seed` — The seed for Bloom filter hash functions.
 
+Users can create [UDF](/docs/en/sql-reference/statements/create/function.md) to estimate the parameters set of `ngrambf_v1`. Query statements are as follows:  
+
+```sql
+CREATE FUNCTION bfEstimateFunctions [ON CLUSTER cluster]   
+AS  
+(total_nubmer_of_all_grams, size_of_bloom_filter_in_bits) -> round((size_of_bloom_filter_in_bits / total_nubmer_of_all_grams) * log(2));   
+  
+CREATE FUNCTION bfEstimateBmSize [ON CLUSTER cluster]   
+AS  
+(total_nubmer_of_all_grams,  probability_of_false_positives) -> ceil((total_nubmer_of_all_grams * log(probability_of_false_positives)) / log(1 / pow(2, log(2))));  
+    
+CREATE FUNCTION bfEstimateFalsePositive [ON CLUSTER cluster]  
+AS   
+(total_nubmer_of_all_grams, number_of_hash_functions, size_of_bloom_filter_in_bytes) -> pow(1 - exp(-number_of_hash_functions/ (size_of_bloom_filter_in_bytes / total_nubmer_of_all_grams)), number_of_hash_functions);  
+  
+CREATE FUNCTION bfEstimateGramNumber [ON CLUSTER cluster]   
+AS  
+(number_of_hash_functions, probability_of_false_positives, size_of_bloom_filter_in_bytes) -> ceil(size_of_bloom_filter_in_bytes / (-number_of_hash_functions / log(1 - exp(log(probability_of_false_positives) / number_of_hash_functions))))
+
+```  
+To use those functions,we need to specify two parameter at least.
+For example, if there 4300 ngrams in the granule and we expect false positives to be less than 0.0001. The other parameters can be estimated by executing following queries:   
+  
+
+```sql
+--- estimate number of bits in the filter
+SELECT bfEstimateBmSize(4300, 0.0001) / 8 as size_of_bloom_filter_in_bytes;  
+
+┌─size_of_bloom_filter_in_bytes─┐
+│                         10304 │
+└───────────────────────────────┘
+  
+--- estimate number of hash functions
+SELECT bfEstimateFunctions(4300, bfEstimateBmSize(4300, 0.0001)) as number_of_hash_functions
+  
+┌─number_of_hash_functions─┐
+│                       13 │
+└──────────────────────────┘
+
+```
+Of course, you can also use those functions to estimate parameters by other conditions.
+The functions refer to the content [here](https://hur.st/bloomfilter).
+
+
 #### Token Bloom Filter
 
 The same as `ngrambf_v1`, but stores tokens instead of ngrams. Tokens are sequences separated by non-alphanumeric characters.
@@ -432,67 +494,58 @@ Syntax: `tokenbf_v1(size_of_bloom_filter_in_bytes, number_of_hash_functions, ran
 - An experimental index to support approximate nearest neighbor (ANN) search. See [here](annindexes.md) for details.
 - An experimental inverted index to support full-text search. See [here](invertedindexes.md) for details.
 
-## Example of index creation for Map data type
-
-```
-INDEX map_key_index mapKeys(map_column) TYPE bloom_filter GRANULARITY 1
-INDEX map_key_index mapValues(map_column) TYPE bloom_filter GRANULARITY 1
-```
-
-
-``` sql
-INDEX sample_index (u64 * length(s)) TYPE minmax GRANULARITY 4
-INDEX sample_index2 (u64 * length(str), i32 + f64 * 100, date, str) TYPE set(100) GRANULARITY 4
-INDEX sample_index3 (lower(str), str) TYPE ngrambf_v1(3, 256, 2, 0) GRANULARITY 4
-```
-
 ### Functions Support {#functions-support}
 
 Conditions in the `WHERE` clause contains calls of the functions that operate with columns. If the column is a part of an index, ClickHouse tries to use this index when performing the functions. ClickHouse supports different subsets of functions for using indexes.
 
-The `set` index can be used with all functions. Function subsets for other indexes are shown in the table below.
+Indexes of type `set` can be utilized by all functions. The other index types are supported as follows:
 
-| Function (operator) / Index                                                                                | primary key | minmax | ngrambf_v1 | tokenbf_v1 | bloom_filter |
-|------------------------------------------------------------------------------------------------------------|-------------|--------|-------------|-------------|---------------|
-| [equals (=, ==)](/docs/en/sql-reference/functions/comparison-functions.md/#function-equals)                 | ✔           | ✔      | ✔           | ✔           | ✔             |
-| [notEquals(!=, &lt;&gt;)](/docs/en/sql-reference/functions/comparison-functions.md/#function-notequals)         | ✔           | ✔      | ✔           | ✔           | ✔             |
-| [like](/docs/en/sql-reference/functions/string-search-functions.md/#function-like)                          | ✔           | ✔      | ✔           | ✔           | ✗             |
-| [notLike](/docs/en/sql-reference/functions/string-search-functions.md/#function-notlike)                    | ✔           | ✔      | ✔           | ✔           | ✗             |
-| [startsWith](/docs/en/sql-reference/functions/string-functions.md/#startswith)                              | ✔           | ✔      | ✔           | ✔           | ✗             |
-| [endsWith](/docs/en/sql-reference/functions/string-functions.md/#endswith)                                  | ✗           | ✗      | ✔           | ✔           | ✗             |
-| [multiSearchAny](/docs/en/sql-reference/functions/string-search-functions.md/#function-multisearchany)      | ✗           | ✗      | ✔           | ✗           | ✗             |
-| [in](/docs/en/sql-reference/functions/in-functions#in-functions)                                        | ✔           | ✔      | ✔           | ✔           | ✔             |
-| [notIn](/docs/en/sql-reference/functions/in-functions#in-functions)                                     | ✔           | ✔      | ✔           | ✔           | ✔             |
-| [less (<)](/docs/en/sql-reference/functions/comparison-functions.md/#function-less)                        | ✔           | ✔      | ✗           | ✗           | ✗             |
-| [greater (>)](/docs/en/sql-reference/functions/comparison-functions.md/#function-greater)                  | ✔           | ✔      | ✗           | ✗           | ✗             |
-| [lessOrEquals (<=)](/docs/en/sql-reference/functions/comparison-functions.md/#function-lessorequals)       | ✔           | ✔      | ✗           | ✗           | ✗             |
-| [greaterOrEquals (>=)](/docs/en/sql-reference/functions/comparison-functions.md/#function-greaterorequals) | ✔           | ✔      | ✗           | ✗           | ✗             |
-| [empty](/docs/en/sql-reference/functions/array-functions#function-empty)                                | ✔           | ✔      | ✗           | ✗           | ✗             |
-| [notEmpty](/docs/en/sql-reference/functions/array-functions#function-notempty)                          | ✔           | ✔      | ✗           | ✗           | ✗             |
-| hasToken                                                                                                   | ✗           | ✗      | ✗           | ✔           | ✗             |
-| hasTokenOrNull                                                                                                   | ✗           | ✗      | ✗           | ✔           | ✗             |
-| hasTokenCaseInsensitive                                                                                                   | ✗           | ✗      | ✗           | ✔           | ✗             |
-| hasTokenCaseInsensitiveOrNull                                                                                                   | ✗           | ✗      | ✗           | ✔           | ✗             |
+| Function (operator) / Index                                                                                | primary key | minmax | ngrambf_v1 | tokenbf_v1 | bloom_filter | inverted |
+|------------------------------------------------------------------------------------------------------------|-------------|--------|------------|------------|--------------|----------|
+| [equals (=, ==)](/docs/en/sql-reference/functions/comparison-functions.md/#function-equals)                | ✔           | ✔      | ✔          | ✔          | ✔            | ✔        |
+| [notEquals(!=, &lt;&gt;)](/docs/en/sql-reference/functions/comparison-functions.md/#function-notequals)    | ✔           | ✔      | ✔          | ✔          | ✔            | ✔        |
+| [like](/docs/en/sql-reference/functions/string-search-functions.md/#function-like)                         | ✔           | ✔      | ✔          | ✔          | ✗            | ✔        |
+| [notLike](/docs/en/sql-reference/functions/string-search-functions.md/#function-notlike)                   | ✔           | ✔      | ✔          | ✔          | ✗            | ✔        |
+| [startsWith](/docs/en/sql-reference/functions/string-functions.md/#startswith)                             | ✔           | ✔      | ✔          | ✔          | ✗            | ✔        |
+| [endsWith](/docs/en/sql-reference/functions/string-functions.md/#endswith)                                 | ✗           | ✗      | ✔          | ✔          | ✗            | ✔        |
+| [multiSearchAny](/docs/en/sql-reference/functions/string-search-functions.md/#function-multisearchany)     | ✗           | ✗      | ✔          | ✗          | ✗            | ✔        |
+| [in](/docs/en/sql-reference/functions/in-functions#in-functions)                                           | ✔           | ✔      | ✔          | ✔          | ✔            | ✔        |
+| [notIn](/docs/en/sql-reference/functions/in-functions#in-functions)                                        | ✔           | ✔      | ✔          | ✔          | ✔            | ✔        |
+| [less (<)](/docs/en/sql-reference/functions/comparison-functions.md/#function-less)                        | ✔           | ✔      | ✗          | ✗          | ✗            | ✗        |
+| [greater (>)](/docs/en/sql-reference/functions/comparison-functions.md/#function-greater)                  | ✔           | ✔      | ✗          | ✗          | ✗            | ✗        |
+| [lessOrEquals (<=)](/docs/en/sql-reference/functions/comparison-functions.md/#function-lessorequals)       | ✔           | ✔      | ✗          | ✗          | ✗            | ✗        |
+| [greaterOrEquals (>=)](/docs/en/sql-reference/functions/comparison-functions.md/#function-greaterorequals) | ✔           | ✔      | ✗          | ✗          | ✗            | ✗        |
+| [empty](/docs/en/sql-reference/functions/array-functions#function-empty)                                   | ✔           | ✔      | ✗          | ✗          | ✗            | ✗        |
+| [notEmpty](/docs/en/sql-reference/functions/array-functions#function-notempty)                             | ✔           | ✔      | ✗          | ✗          | ✗            | ✗        |
+| [has](/docs/en/sql-reference/functions/array-functions#function-has)                                       | ✗           | ✗      | ✔          | ✔          | ✔            | ✔        |
+| [hasAny](/docs/en/sql-reference/functions/array-functions#function-hasAny)                                 | ✗           | ✗      | ✗          | ✗          | ✔            | ✗        |
+| [hasAll](/docs/en/sql-reference/functions/array-functions#function-hasAll)                                 | ✗           | ✗      | ✗          | ✗          | ✔            | ✗        |
+| hasToken                                                                                                   | ✗           | ✗      | ✗          | ✔          | ✗            | ✔        |
+| hasTokenOrNull                                                                                             | ✗           | ✗      | ✗          | ✔          | ✗            | ✔        |
+| hasTokenCaseInsensitive (*)                                                                                | ✗           | ✗      | ✗          | ✔          | ✗            | ✗        |
+| hasTokenCaseInsensitiveOrNull (*)                                                                          | ✗           | ✗      | ✗          | ✔          | ✗            | ✗        |
 
 Functions with a constant argument that is less than ngram size can’t be used by `ngrambf_v1` for query optimization.
 
+(*) For `hasTokenCaseInsensitive` and `hasTokenCaseInsensitiveOrNull` to be effective, the `tokenbf_v1` index must be created on lowercased data, for example `INDEX idx (lower(str_col)) TYPE tokenbf_v1(512, 3, 0)`.
+
 :::note
 Bloom filters can have false positive matches, so the `ngrambf_v1`, `tokenbf_v1`, and `bloom_filter` indexes can not be used for optimizing queries where the result of a function is expected to be false.
 
 For example:
 
--   Can be optimized:
-    -   `s LIKE '%test%'`
-    -   `NOT s NOT LIKE '%test%'`
-    -   `s = 1`
-    -   `NOT s != 1`
-    -   `startsWith(s, 'test')`
--   Can not be optimized:
-    -   `NOT s LIKE '%test%'`
-    -   `s NOT LIKE '%test%'`
-    -   `NOT s = 1`
-    -   `s != 1`
-    -   `NOT startsWith(s, 'test')`
+- Can be optimized:
+    - `s LIKE '%test%'`
+    - `NOT s NOT LIKE '%test%'`
+    - `s = 1`
+    - `NOT s != 1`
+    - `startsWith(s, 'test')`
+- Can not be optimized:
+    - `NOT s LIKE '%test%'`
+    - `s NOT LIKE '%test%'`
+    - `NOT s = 1`
+    - `s != 1`
+    - `NOT startsWith(s, 'test')`
 :::
 
 
@@ -605,11 +658,11 @@ TTL expr
 
 Type of TTL rule may follow each TTL expression. It affects an action which is to be done once the expression is satisfied (reaches current time):
 
--   `DELETE` - delete expired rows (default action);
--   `RECOMPRESS codec_name` - recompress data part with the `codec_name`;
--   `TO DISK 'aaa'` - move part to the disk `aaa`;
--   `TO VOLUME 'bbb'` - move part to the disk `bbb`;
--   `GROUP BY` - aggregate expired rows.
+- `DELETE` - delete expired rows (default action);
+- `RECOMPRESS codec_name` - recompress data part with the `codec_name`;
+- `TO DISK 'aaa'` - move part to the disk `aaa`;
+- `TO VOLUME 'bbb'` - move part to the disk `bbb`;
+- `GROUP BY` - aggregate expired rows.
 
 `DELETE` action can be used together with `WHERE` clause to delete only some of the expired rows based on a filtering condition:
 ``` sql
@@ -674,7 +727,7 @@ TTL d + INTERVAL 1 MONTH RECOMPRESS CODEC(ZSTD(17)), d + INTERVAL 1 YEAR RECOMPR
 SETTINGS min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0;
 ```
 
-Creating a table, where expired rows are aggregated. In result rows `x` contains the maximum value accross the grouped rows, `y` — the minimum value, and `d` — any occasional value from grouped rows.
+Creating a table, where expired rows are aggregated. In result rows `x` contains the maximum value across the grouped rows, `y` — the minimum value, and `d` — any occasional value from grouped rows.
 
 ``` sql
 CREATE TABLE table_for_aggregation
@@ -713,16 +766,22 @@ Data part is the minimum movable unit for `MergeTree`-engine tables. The data be
 
 ### Terms {#terms}
 
--   Disk — Block device mounted to the filesystem.
--   Default disk — Disk that stores the path specified in the [path](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-path) server setting.
--   Volume — Ordered set of equal disks (similar to [JBOD](https://en.wikipedia.org/wiki/Non-RAID_drive_architectures)).
--   Storage policy — Set of volumes and the rules for moving data between them.
+- Disk — Block device mounted to the filesystem.
+- Default disk — Disk that stores the path specified in the [path](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-path) server setting.
+- Volume — Ordered set of equal disks (similar to [JBOD](https://en.wikipedia.org/wiki/Non-RAID_drive_architectures)).
+- Storage policy — Set of volumes and the rules for moving data between them.
 
 The names given to the described entities can be found in the system tables, [system.storage_policies](/docs/en/operations/system-tables/storage_policies.md/#system_tables-storage_policies) and [system.disks](/docs/en/operations/system-tables/disks.md/#system_tables-disks). To apply one of the configured storage policies for a table, use the `storage_policy` setting of `MergeTree`-engine family tables.
 
 ### Configuration {#table_engine-mergetree-multiple-volumes_configure}
 
-Disks, volumes and storage policies should be declared inside the `<storage_configuration>` tag either in the main file `config.xml` or in a distinct file in the `config.d` directory.
+Disks, volumes and storage policies should be declared inside the `<storage_configuration>` tag either in a file in the `config.d` directory.
+
+:::tip
+Disks can also be declared in the `SETTINGS` section of a query.  This is useful
+for adhoc analysis to temporarily attach a disk that is, for example, hosted at a URL.
+See [dynamic storage](#dynamic-storage) for more details.
+:::
 
 Configuration structure:
 
@@ -750,9 +809,9 @@ Configuration structure:
 
 Tags:
 
--   `<disk_name_N>` — Disk name. Names must be different for all disks.
--   `path` — path under which a server will store data (`data` and `shadow` folders), should be terminated with ‘/’.
--   `keep_free_space_bytes` — the amount of free disk space to be reserved.
+- `<disk_name_N>` — Disk name. Names must be different for all disks.
+- `path` — path under which a server will store data (`data` and `shadow` folders), should be terminated with ‘/’.
+- `keep_free_space_bytes` — the amount of free disk space to be reserved.
 
 The order of the disk definition is not important.
 
@@ -788,14 +847,14 @@ Storage policies configuration markup:
 
 Tags:
 
--   `policy_name_N` — Policy name. Policy names must be unique.
--   `volume_name_N` — Volume name. Volume names must be unique.
--   `disk` — a disk within a volume.
--   `max_data_part_size_bytes` — the maximum size of a part that can be stored on any of the volume’s disks. If the a size of a merged part estimated to be bigger than `max_data_part_size_bytes` then this part will be written to a next volume. Basically this feature allows to keep new/small parts on a hot (SSD) volume and move them to a cold (HDD) volume when they reach large size. Do not use this setting if your policy has only one volume.
--   `move_factor` — when the amount of available space gets lower than this factor, data automatically starts to move on the next volume if any (by default, 0.1). ClickHouse sorts existing parts by size from largest to smallest (in descending order) and selects parts with the total size that is sufficient to meet the `move_factor` condition. If the total size of all parts is insufficient, all parts will be moved.
--   `prefer_not_to_merge` — Disables merging of data parts on this volume. When this setting is enabled, merging data on this volume is not allowed. This allows controlling how ClickHouse works with slow disks.
--   `perform_ttl_move_on_insert` — Disables TTL move on data part INSERT. By default if we insert a data part that already expired by the TTL move rule it immediately goes to a volume/disk declared in move rule. This can significantly slowdown insert in case if destination volume/disk is slow (e.g. S3).
--   `load_balancing` - Policy for disk balancing, `round_robin` or `least_used`.
+- `policy_name_N` — Policy name. Policy names must be unique.
+- `volume_name_N` — Volume name. Volume names must be unique.
+- `disk` — a disk within a volume.
+- `max_data_part_size_bytes` — the maximum size of a part that can be stored on any of the volume’s disks. If the a size of a merged part estimated to be bigger than `max_data_part_size_bytes` then this part will be written to a next volume. Basically this feature allows to keep new/small parts on a hot (SSD) volume and move them to a cold (HDD) volume when they reach large size. Do not use this setting if your policy has only one volume.
+- `move_factor` — when the amount of available space gets lower than this factor, data automatically starts to move on the next volume if any (by default, 0.1). ClickHouse sorts existing parts by size from largest to smallest (in descending order) and selects parts with the total size that is sufficient to meet the `move_factor` condition. If the total size of all parts is insufficient, all parts will be moved.
+- `prefer_not_to_merge` — Disables merging of data parts on this volume. When this setting is enabled, merging data on this volume is not allowed. This allows controlling how ClickHouse works with slow disks.
+- `perform_ttl_move_on_insert` — Disables TTL move on data part INSERT. By default if we insert a data part that already expired by the TTL move rule it immediately goes to a volume/disk declared in move rule. This can significantly slowdown insert in case if destination volume/disk is slow (e.g. S3).
+- `load_balancing` - Policy for disk balancing, `round_robin` or `least_used`.
 
 Cofiguration examples:
 
@@ -865,16 +924,97 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
 The `default` storage policy implies using only one volume, which consists of only one disk given in `<path>`.
 You could change storage policy after table creation with [ALTER TABLE ... MODIFY SETTING] query, new policy should include all old disks and volumes with same names.
 
-The number of threads performing background moves of data parts can be changed by [background_move_pool_size](/docs/en/operations/settings/settings.md/#background_move_pool_size) setting.
+The number of threads performing background moves of data parts can be changed by [background_move_pool_size](/docs/en/operations/server-configuration-parameters/settings.md/#background_move_pool_size) setting.
+
+### Dynamic Storage
+
+This example query shows how to attach a table stored at a URL and configure the
+remote storage within the query. The web storage is not configured in the ClickHouse
+configuration files; all the settings are in the CREATE/ATTACH query.
+
+:::note
+The example uses `type=web`, but any disk type can be configured as dynamic, even Local disk. Local disks require a path argument to be inside the server config parameter `custom_local_disks_base_directory`, which has no default, so set that also when using local disk.
+:::
+
+```sql
+ATTACH TABLE uk_price_paid UUID 'cf712b4f-2ca8-435c-ac23-c4393efe52f7'
+(
+    price UInt32,
+    date Date,
+    postcode1 LowCardinality(String),
+    postcode2 LowCardinality(String),
+    type Enum8('other' = 0, 'terraced' = 1, 'semi-detached' = 2, 'detached' = 3, 'flat' = 4),
+    is_new UInt8,
+    duration Enum8('unknown' = 0, 'freehold' = 1, 'leasehold' = 2),
+    addr1 String,
+    addr2 String,
+    street LowCardinality(String),
+    locality LowCardinality(String),
+    town LowCardinality(String),
+    district LowCardinality(String),
+    county LowCardinality(String)
+)
+ENGINE = MergeTree
+ORDER BY (postcode1, postcode2, addr1, addr2)
+  # highlight-start
+  SETTINGS disk = disk(
+      type=web,
+      endpoint='https://raw.githubusercontent.com/ClickHouse/web-tables-demo/main/web/'
+      );
+  # highlight-end
+```
+
+### Nested Dynamic Storage
+
+This example query builds on the above dynamic disk configuration and shows how to
+use a local disk to cache data from a table stored at a URL. Neither the cache disk
+nor the web storage is configured in the ClickHouse configuration files; both are
+configured in the CREATE/ATTACH query settings.
+
+In the settings highlighted below notice that the disk of `type=web` is nested within 
+the disk of `type=cache`.
+
+```sql
+ATTACH TABLE uk_price_paid UUID 'cf712b4f-2ca8-435c-ac23-c4393efe52f7'
+(
+    price UInt32,
+    date Date,
+    postcode1 LowCardinality(String),
+    postcode2 LowCardinality(String),
+    type Enum8('other' = 0, 'terraced' = 1, 'semi-detached' = 2, 'detached' = 3, 'flat' = 4),
+    is_new UInt8,
+    duration Enum8('unknown' = 0, 'freehold' = 1, 'leasehold' = 2),
+    addr1 String,
+    addr2 String,
+    street LowCardinality(String),
+    locality LowCardinality(String),
+    town LowCardinality(String),
+    district LowCardinality(String),
+    county LowCardinality(String)
+)
+ENGINE = MergeTree
+ORDER BY (postcode1, postcode2, addr1, addr2)
+  # highlight-start
+  SETTINGS disk = disk(
+    type=cache,
+    max_size='1Gi',
+    path='/var/lib/clickhouse/custom_disk_cache/',
+    disk=disk(
+      type=web,
+      endpoint='https://raw.githubusercontent.com/ClickHouse/web-tables-demo/main/web/'
+      )
+  );
+  # highlight-end
+```
 
 ### Details {#details}
 
 In the case of `MergeTree` tables, data is getting to disk in different ways:
 
--   As a result of an insert (`INSERT` query).
--   During background merges and [mutations](/docs/en/sql-reference/statements/alter/index.md#alter-mutations).
--   When downloading from another replica.
--   As a result of partition freezing [ALTER TABLE … FREEZE PARTITION](/docs/en/sql-reference/statements/alter/partition.md/#alter_freeze-partition).
+- As a result of an insert (`INSERT` query).
+- During background merges and [mutations](/docs/en/sql-reference/statements/alter/index.md#alter-mutations).
+- When downloading from another replica.
+- As a result of partition freezing [ALTER TABLE … FREEZE PARTITION](/docs/en/sql-reference/statements/alter/partition.md/#alter_freeze-partition).
 
 In all these cases except for mutations and partition freezing, a part is stored on a volume and a disk according to the given storage policy:
 
@@ -898,7 +1038,7 @@ User can assign new big parts to different disks of a [JBOD](https://en.wikipedi
 ## Using S3 for Data Storage {#table_engine-mergetree-s3}
 
 :::note
-Google Cloud Storage (GCS) is also supported using the type `s3`. See [GCS backed MergeTree](/docs/en/integrations/data-ingestion/s3/gcs-merge-tree.md).
+Google Cloud Storage (GCS) is also supported using the type `s3`. See [GCS backed MergeTree](/docs/en/integrations/gcs).
 :::
 
 `MergeTree` family table engines can store data to [S3](https://aws.amazon.com/s3/) using a disk with type `s3`.
@@ -915,7 +1055,11 @@ Configuration markup:
             <access_key_id>your_access_key_id</access_key_id>
             <secret_access_key>your_secret_access_key</secret_access_key>
             <region></region>
+            <header>Authorization: Bearer SOME-TOKEN</header>
             <server_side_encryption_customer_key_base64>your_base64_encoded_customer_key</server_side_encryption_customer_key_base64>
+            <server_side_encryption_kms_key_id>your_kms_key_id</server_side_encryption_kms_key_id>
+            <server_side_encryption_kms_encryption_context>your_kms_encryption_context</server_side_encryption_kms_encryption_context>
+            <server_side_encryption_kms_bucket_key_enabled>true</server_side_encryption_kms_bucket_key_enabled>
             <proxy>
                 <uri>http://proxy1</uri>
                 <uri>http://proxy2</uri>
@@ -947,29 +1091,34 @@ ClickHouse versions 22.3 through 22.7 use a different cache configuration, see [
 
 Required parameters:
 
--   `endpoint` — S3 endpoint URL in `path` or `virtual hosted` [styles](https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html). Endpoint URL should contain a bucket and root path to store data.
--   `access_key_id` — S3 access key id.
--   `secret_access_key` — S3 secret access key.
+- `endpoint` — S3 endpoint URL in `path` or `virtual hosted` [styles](https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html). Endpoint URL should contain a bucket and root path to store data.
+- `access_key_id` — S3 access key id.
+- `secret_access_key` — S3 secret access key.
 
 Optional parameters:
 
--   `region` — S3 region name.
--   `support_batch_delete` — This controls the check to see if batch deletes are supported. Set this to `false` when using Google Cloud Storage (GCS) as GCS does not support batch deletes and preventing the checks will prevent error messages in the logs.
--   `use_environment_credentials` — Reads AWS credentials from the Environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY and AWS_SESSION_TOKEN if they exist. Default value is `false`.
--   `use_insecure_imds_request` — If set to `true`, S3 client will use insecure IMDS request while obtaining credentials from Amazon EC2 metadata. Default value is `false`.
--   `proxy` — Proxy configuration for S3 endpoint. Each `uri` element inside `proxy` block should contain a proxy URL.
--   `connect_timeout_ms` — Socket connect timeout in milliseconds. Default value is `10 seconds`.
--   `request_timeout_ms` — Request timeout in milliseconds. Default value is `5 seconds`.
--   `retry_attempts` — Number of retry attempts in case of failed request. Default value is `10`.
--   `single_read_retries` — Number of retry attempts in case of connection drop during read. Default value is `4`.
--   `min_bytes_for_seek` — Minimal number of bytes to use seek operation instead of sequential read. Default value is `1 Mb`.
--   `metadata_path` — Path on local FS to store metadata files for S3. Default value is `/var/lib/clickhouse/disks/<disk_name>/`.
--   `skip_access_check` — If true, disk access checks will not be performed on disk start-up. Default value is `false`.
--   `server_side_encryption_customer_key_base64` — If specified, required headers for accessing S3 objects with SSE-C encryption will be set.
--   `s3_max_put_rps` — Maximum PUT requests per second rate before throttling. Default value is `0` (unlimited).
--   `s3_max_put_burst` — Max number of requests that can be issued simultaneously before hitting request per second limit. By default (`0` value) equals to `s3_max_put_rps`.
--   `s3_max_get_rps` — Maximum GET requests per second rate before throttling. Default value is `0` (unlimited).
--   `s3_max_get_burst` — Max number of requests that can be issued simultaneously before hitting request per second limit. By default (`0` value) equals to `s3_max_get_rps`.
+- `region` — S3 region name.
+- `support_batch_delete` — This controls the check to see if batch deletes are supported. Set this to `false` when using Google Cloud Storage (GCS) as GCS does not support batch deletes and preventing the checks will prevent error messages in the logs.
+- `use_environment_credentials` — Reads AWS credentials from the Environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY and AWS_SESSION_TOKEN if they exist. Default value is `false`.
+- `use_insecure_imds_request` — If set to `true`, S3 client will use insecure IMDS request while obtaining credentials from Amazon EC2 metadata. Default value is `false`.
+- `expiration_window_seconds` — Grace period for checking if expiration-based credentials have expired. Optional, default value is `120`.
+- `proxy` — Proxy configuration for S3 endpoint. Each `uri` element inside `proxy` block should contain a proxy URL.
+- `connect_timeout_ms` — Socket connect timeout in milliseconds. Default value is `10 seconds`.
+- `request_timeout_ms` — Request timeout in milliseconds. Default value is `5 seconds`.
+- `retry_attempts` — Number of retry attempts in case of failed request. Default value is `10`.
+- `single_read_retries` — Number of retry attempts in case of connection drop during read. Default value is `4`.
+- `min_bytes_for_seek` — Minimal number of bytes to use seek operation instead of sequential read. Default value is `1 Mb`.
+- `metadata_path` — Path on local FS to store metadata files for S3. Default value is `/var/lib/clickhouse/disks/<disk_name>/`.
+- `skip_access_check` — If true, disk access checks will not be performed on disk start-up. Default value is `false`.
+- `header` —  Adds specified HTTP header to a request to given endpoint. Optional, can be specified multiple times.
+- `server_side_encryption_customer_key_base64` — If specified, required headers for accessing S3 objects with SSE-C encryption will be set.
+- `server_side_encryption_kms_key_id` - If specified, required headers for accessing S3 objects with [SSE-KMS encryption](https://docs.aws.amazon.com/AmazonS3/latest/userguide/UsingKMSEncryption.html) will be set. If an empty string is specified, the AWS managed S3 key will be used. Optional.
+- `server_side_encryption_kms_encryption_context` - If specified alongside `server_side_encryption_kms_key_id`, the given encryption context header for SSE-KMS will be set. Optional.
+- `server_side_encryption_kms_bucket_key_enabled` - If specified alongside `server_side_encryption_kms_key_id`, the header to enable S3 bucket keys for SSE-KMS will be set. Optional, can be `true` or `false`, defaults to nothing (matches the bucket-level setting).
+- `s3_max_put_rps` — Maximum PUT requests per second rate before throttling. Default value is `0` (unlimited).
+- `s3_max_put_burst` — Max number of requests that can be issued simultaneously before hitting request per second limit. By default (`0` value) equals to `s3_max_put_rps`.
+- `s3_max_get_rps` — Maximum GET requests per second rate before throttling. Default value is `0` (unlimited).
+- `s3_max_get_burst` — Max number of requests that can be issued simultaneously before hitting request per second limit. By default (`0` value) equals to `s3_max_get_rps`.
 
 ### Configuring the cache
 
@@ -984,12 +1133,12 @@ This is the cache configuration from above:
 ```
 
 These parameters define the cache layer:
--   `type` — If a disk is of type `cache` it caches mark and index files in memory.
--   `disk` — The name of the disk that will be cached.
+- `type` — If a disk is of type `cache` it caches mark and index files in memory.
+- `disk` — The name of the disk that will be cached.
 
 Cache parameters:
--   `path` — The path where metadata for the cache is stored.
--   `max_size` — The size (amount of memory) that the cache can grow to.
+- `path` — The path where metadata for the cache is stored.
+- `max_size` — The size (amount of memory) that the cache can grow to.
 
 :::tip
 There are several other cache parameters that you can use to tune your storage, see [using local cache](/docs/en/operations/storing-data.md/#using-local-cache) for the details.
@@ -1070,11 +1219,12 @@ Authentication parameters (the disk will try all available methods **and** Manag
 * `account_name` and `account_key` - For authentication using Shared Key.
 
 Limit parameters (mainly for internal usage):
-* `max_single_part_upload_size` - Limits the size of a single block upload to Blob Storage.
+* `s3_max_single_part_upload_size` - Limits the size of a single block upload to Blob Storage.
 * `min_bytes_for_seek` - Limits the size of a seekable region.
 * `max_single_read_retries` - Limits the number of attempts to read a chunk of data from Blob Storage.
 * `max_single_download_retries` - Limits the number of attempts to download a readable buffer from Blob Storage.
 * `thread_pool_size` - Limits the number of threads with which `IDiskRemote` is instantiated.
+* `s3_max_inflight_parts_for_one_file` - Limits the number of put requests that can be run concurenly for one object.
 
 Other parameters:
 * `metadata_path` - Path on local FS to store metadata files for Blob Storage. Default value is `/var/lib/clickhouse/disks/<disk_name>/`.
@@ -1084,15 +1234,15 @@ Other parameters:
 
 Examples of working configurations can be found in integration tests directory (see e.g. [test_merge_tree_azure_blob_storage](https://github.com/ClickHouse/ClickHouse/blob/master/tests/integration/test_merge_tree_azure_blob_storage/configs/config.d/storage_conf.xml) or [test_azure_blob_storage_zero_copy_replication](https://github.com/ClickHouse/ClickHouse/blob/master/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml)).
 
-  :::warning Zero-copy replication is not ready for production
+  :::note Zero-copy replication is not ready for production
   Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
   :::
 
 ## Virtual Columns {#virtual-columns}
 
--   `_part` — Name of a part.
--   `_part_index` — Sequential index of the part in the query result.
--   `_partition_id` — Name of a partition.
--   `_part_uuid` — Unique part identifier (if enabled MergeTree setting `assign_part_uuids`).
--   `_partition_value` — Values (a tuple) of a `partition by` expression.
--   `_sample_factor` — Sample factor (from the query).
+- `_part` — Name of a part.
+- `_part_index` — Sequential index of the part in the query result.
+- `_partition_id` — Name of a partition.
+- `_part_uuid` — Unique part identifier (if enabled MergeTree setting `assign_part_uuids`).
+- `_partition_value` — Values (a tuple) of a `partition by` expression.
+- `_sample_factor` — Sample factor (from the query).
diff --git a/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md
index f5d81182898..7db2f3b465a 100644
--- a/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md
@@ -20,17 +20,17 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
     name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
     name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
     ...
-) ENGINE = ReplacingMergeTree([ver])
+) ENGINE = ReplacingMergeTree([ver [, is_deleted]])
 [PARTITION BY expr]
 [ORDER BY expr]
 [PRIMARY KEY expr]
 [SAMPLE BY expr]
-[SETTINGS name=value, ...]
+[SETTINGS name=value, clean_deleted_rows=value, ...]
 ```
 
 For a description of request parameters, see [statement description](../../../sql-reference/statements/create/table.md).
 
-:::warning
+:::note
 Uniqueness of rows is determined by the `ORDER BY` table section, not `PRIMARY KEY`.
 :::
 
@@ -88,6 +88,20 @@ SELECT * FROM mySecondReplacingMT FINAL;
 └─────┴─────────┴─────────────────────┘
 ```
 
+### is_deleted
+
+`is_deleted` —  Name of a column used during a merge to determine whether the data in this row represents the state or is to be deleted; `1` is a “deleted“ row, `0` is a “state“ row.
+
+  Column data type — `UInt8`.
+
+:::note
+`is_deleted` can only be enabled when `ver` is used.
+
+The row is deleted when `OPTIMIZE ... FINAL CLEANUP` or `OPTIMIZE ... FINAL` is used, or if the engine setting `clean_deleted_rows` has been set to `Always`.
+
+No matter the operation on the data, the version must be increased. If two inserted rows have the same version number, the last inserted row is the one kept.
+:::
+
 ## Query clauses
 
 When creating a `ReplacingMergeTree` table the same [clauses](../../../engines/table-engines/mergetree-family/mergetree.md) are required, as when creating a `MergeTree` table.
@@ -96,7 +110,7 @@ When creating a `ReplacingMergeTree` table the same [clauses](../../../engines/t
 
 <summary>Deprecated Method for Creating a Table</summary>
 
-:::warning
+:::note
 Do not use this method in new projects and, if possible, switch old projects to the method described above.
 :::
 
@@ -111,6 +125,6 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 All of the parameters excepting `ver` have the same meaning as in `MergeTree`.
 
--   `ver` - column with the version. Optional parameter. For a description, see the text above.
+- `ver` - column with the version. Optional parameter. For a description, see the text above.
 
 </details>
diff --git a/docs/en/engines/table-engines/mergetree-family/replication.md b/docs/en/engines/table-engines/mergetree-family/replication.md
index 37ab8ac9fd3..01782ac25bd 100644
--- a/docs/en/engines/table-engines/mergetree-family/replication.md
+++ b/docs/en/engines/table-engines/mergetree-family/replication.md
@@ -8,24 +8,31 @@ sidebar_label: Data Replication
 
 :::note
 In ClickHouse Cloud replication is managed for you. Please create your tables without adding arguments.  For example, in the text below you would replace:
+
+```sql
+ENGINE = ReplicatedReplacingMergeTree(
+    '/clickhouse/tables/{shard}/table_name',
+    '{replica}',
+    ver
+)
 ```
-ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/table_name', '{replica}', ver)
-```
+
 with:
-```
+
+```sql
 ENGINE = ReplicatedReplacingMergeTree
 ```
 :::
 
 Replication is only supported for tables in the MergeTree family:
 
--   ReplicatedMergeTree
--   ReplicatedSummingMergeTree
--   ReplicatedReplacingMergeTree
--   ReplicatedAggregatingMergeTree
--   ReplicatedCollapsingMergeTree
--   ReplicatedVersionedCollapsingMergeTree
--   ReplicatedGraphiteMergeTree
+- ReplicatedMergeTree
+- ReplicatedSummingMergeTree
+- ReplicatedReplacingMergeTree
+- ReplicatedAggregatingMergeTree
+- ReplicatedCollapsingMergeTree
+- ReplicatedVersionedCollapsingMergeTree
+- ReplicatedGraphiteMergeTree
 
 Replication works at the level of an individual table, not the entire server. A server can store both replicated and non-replicated tables at the same time.
 
@@ -35,15 +42,15 @@ Compressed data for `INSERT` and `ALTER` queries is replicated (for more informa
 
 `CREATE`, `DROP`, `ATTACH`, `DETACH` and `RENAME` queries are executed on a single server and are not replicated:
 
--   The `CREATE TABLE` query creates a new replicatable table on the server where the query is run. If this table already exists on other servers, it adds a new replica.
--   The `DROP TABLE` query deletes the replica located on the server where the query is run.
--   The `RENAME` query renames the table on one of the replicas. In other words, replicated tables can have different names on different replicas.
+- The `CREATE TABLE` query creates a new replicatable table on the server where the query is run. If this table already exists on other servers, it adds a new replica.
+- The `DROP TABLE` query deletes the replica located on the server where the query is run.
+- The `RENAME` query renames the table on one of the replicas. In other words, replicated tables can have different names on different replicas.
 
-ClickHouse uses [ClickHouse Keeper](/docs/en/guides/sre/keeper/clickhouse-keeper.md) for storing replicas meta information. It is possible to use ZooKeeper version 3.4.5 or newer, but ClickHouse Keeper is recommended.
+ClickHouse uses [ClickHouse Keeper](/docs/en/guides/sre/keeper/index.md) for storing replicas meta information. It is possible to use ZooKeeper version 3.4.5 or newer, but ClickHouse Keeper is recommended.
 
 To use replication, set parameters in the [zookeeper](/docs/en/operations/server-configuration-parameters/settings.md/#server-settings_zookeeper) server configuration section.
 
-:::warning
+:::note
 Don’t neglect the security setting. ClickHouse supports the `digest` [ACL scheme](https://zookeeper.apache.org/doc/current/zookeeperProgrammers.html#sc_ZooKeeperAccessControl) of the ZooKeeper security subsystem.
 :::
 
@@ -112,7 +119,7 @@ For each `INSERT` query, approximately ten entries are added to ZooKeeper throug
 
 For very large clusters, you can use different ZooKeeper clusters for different shards. However, from our experience this has not proven necessary based on production clusters with approximately 300 servers.
 
-Replication is asynchronous and multi-master. `INSERT` queries (as well as `ALTER`) can be sent to any available server. Data is inserted on the server where the query is run, and then it is copied to the other servers. Because it is asynchronous, recently inserted data appears on the other replicas with some latency. If part of the replicas are not available, the data is written when they become available. If a replica is available, the latency is the amount of time it takes to transfer the block of compressed data over the network. The number of threads performing background tasks for replicated tables can be set by [background_schedule_pool_size](/docs/en/operations/settings/settings.md/#background_schedule_pool_size) setting.
+Replication is asynchronous and multi-master. `INSERT` queries (as well as `ALTER`) can be sent to any available server. Data is inserted on the server where the query is run, and then it is copied to the other servers. Because it is asynchronous, recently inserted data appears on the other replicas with some latency. If part of the replicas are not available, the data is written when they become available. If a replica is available, the latency is the amount of time it takes to transfer the block of compressed data over the network. The number of threads performing background tasks for replicated tables can be set by [background_schedule_pool_size](/docs/en/operations/server-configuration-parameters/settings.md/#background_schedule_pool_size) setting.
 
 `ReplicatedMergeTree` engine uses a separate thread pool for replicated fetches. Size of the pool is limited by the [background_fetches_pool_size](/docs/en/operations/settings/settings.md/#background_fetches_pool_size) setting which can be tuned with a server restart.
 
@@ -144,7 +151,7 @@ ENGINE = ReplicatedReplacingMergeTree
 The `Replicated` prefix is added to the table engine name. For example:`ReplicatedMergeTree`.
 
 :::tip
-Adding `Replicated` is optional in ClickHouse Cloud, as all of the tables are replicated.  
+Adding `Replicated` is optional in ClickHouse Cloud, as all of the tables are replicated.
 :::
 
 ### Replicated\*MergeTree parameters
@@ -309,8 +316,8 @@ Create a MergeTree table with a different name. Move all the data from the direc
 
 If you want to get rid of a `ReplicatedMergeTree` table without launching the server:
 
--   Delete the corresponding `.sql` file in the metadata directory (`/var/lib/clickhouse/metadata/`).
--   Delete the corresponding path in ClickHouse Keeper (`/path_to_table/replica_name`).
+- Delete the corresponding `.sql` file in the metadata directory (`/var/lib/clickhouse/metadata/`).
+- Delete the corresponding path in ClickHouse Keeper (`/path_to_table/replica_name`).
 
 After this, you can launch the server, create a `MergeTree` table, move the data to its directory, and then restart the server.
 
@@ -320,8 +327,8 @@ If the data in ClickHouse Keeper was lost or damaged, you can save data by movin
 
 **See Also**
 
--   [background_schedule_pool_size](/docs/en/operations/settings/settings.md/#background_schedule_pool_size)
--   [background_fetches_pool_size](/docs/en/operations/settings/settings.md/#background_fetches_pool_size)
--   [execute_merges_on_single_replica_time_threshold](/docs/en/operations/settings/settings.md/#execute-merges-on-single-replica-time-threshold)
--   [max_replicated_fetches_network_bandwidth](/docs/en/operations/settings/merge-tree-settings.md/#max_replicated_fetches_network_bandwidth)
--   [max_replicated_sends_network_bandwidth](/docs/en/operations/settings/merge-tree-settings.md/#max_replicated_sends_network_bandwidth)
+- [background_schedule_pool_size](/docs/en/operations/server-configuration-parameters/settings.md/#background_schedule_pool_size)
+- [background_fetches_pool_size](/docs/en/operations/server-configuration-parameters/settings.md/#background_fetches_pool_size)
+- [execute_merges_on_single_replica_time_threshold](/docs/en/operations/settings/settings.md/#execute-merges-on-single-replica-time-threshold)
+- [max_replicated_fetches_network_bandwidth](/docs/en/operations/settings/merge-tree-settings.md/#max_replicated_fetches_network_bandwidth)
+- [max_replicated_sends_network_bandwidth](/docs/en/operations/settings/merge-tree-settings.md/#max_replicated_sends_network_bandwidth)
diff --git a/docs/en/engines/table-engines/mergetree-family/summingmergetree.md b/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
index b2b6272c58e..c3cbb0d2a03 100644
--- a/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
@@ -44,7 +44,7 @@ When creating a `SummingMergeTree` table the same [clauses](../../../engines/tab
 
 <summary>Deprecated Method for Creating a Table</summary>
 
-:::warning
+:::note
 Do not use this method in new projects and, if possible, switch the old projects to the method described above.
 :::
 
@@ -59,7 +59,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 All of the parameters excepting `columns` have the same meaning as in `MergeTree`.
 
--   `columns` — tuple with names of columns values of which will be summarized. Optional parameter. For a description, see the text above.
+- `columns` — tuple with names of columns values of which will be summarized. Optional parameter. For a description, see the text above.
 
 </details>
 
@@ -122,8 +122,8 @@ Table can have nested data structures that are processed in a special way.
 
 If the name of a nested table ends with `Map` and it contains at least two columns that meet the following criteria:
 
--   the first column is numeric `(*Int*, Date, DateTime)` or a string `(String, FixedString)`, let’s call it `key`,
--   the other columns are arithmetic `(*Int*, Float32/64)`, let’s call it `(values...)`,
+- the first column is numeric `(*Int*, Date, DateTime)` or a string `(String, FixedString)`, let’s call it `key`,
+- the other columns are arithmetic `(*Int*, Float32/64)`, let’s call it `(values...)`,
 
 then this nested table is interpreted as a mapping of `key => (values...)`, and when merging its rows, the elements of two data sets are merged by `key` with a summation of the corresponding `(values...)`.
 
@@ -186,3 +186,7 @@ ARRAY JOIN
 When requesting data, use the [sumMap(key, value)](../../../sql-reference/aggregate-functions/reference/summap.md) function for aggregation of `Map`.
 
 For nested data structure, you do not need to specify its columns in the tuple of columns for summation.
+
+## Related Content
+
+- Blog: [Using Aggregate Combinators in ClickHouse](https://clickhouse.com/blog/aggregate-functions-combinators-in-clickhouse-for-arrays-maps-and-states)
diff --git a/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
index 2891907f79a..22a15c0e15e 100644
--- a/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
@@ -8,8 +8,8 @@ sidebar_label:  VersionedCollapsingMergeTree
 
 This engine:
 
--   Allows quick writing of object states that are continually changing.
--   Deletes old object states in the background. This significantly reduces the volume of storage.
+- Allows quick writing of object states that are continually changing.
+- Deletes old object states in the background. This significantly reduces the volume of storage.
 
 See the section [Collapsing](#table_engines_versionedcollapsingmergetree) for details.
 
@@ -58,7 +58,7 @@ When creating a `VersionedCollapsingMergeTree` table, the same [clauses](../../.
 
 <summary>Deprecated Method for Creating a Table</summary>
 
-:::warning
+:::note
 Do not use this method in new projects. If possible, switch old projects to the method described above.
 :::
 
@@ -73,11 +73,11 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 All of the parameters except `sign` and `version` have the same meaning as in `MergeTree`.
 
--   `sign` — Name of the column with the type of row: `1` is a “state” row, `-1` is a “cancel” row.
+- `sign` — Name of the column with the type of row: `1` is a “state” row, `-1` is a “cancel” row.
 
     Column Data Type — `Int8`.
 
--   `version` — Name of the column with the version of the object state.
+- `version` — Name of the column with the version of the object state.
 
     The column data type should be `UInt*`.
 
diff --git a/docs/en/engines/table-engines/special/buffer.md b/docs/en/engines/table-engines/special/buffer.md
index 5f28fafbc26..f7d84b9b452 100644
--- a/docs/en/engines/table-engines/special/buffer.md
+++ b/docs/en/engines/table-engines/special/buffer.md
@@ -86,7 +86,7 @@ If the set of columns in the Buffer table does not match the set of columns in a
 If the types do not match for one of the columns in the Buffer table and a subordinate table, an error message is entered in the server log, and the buffer is cleared.
 The same happens if the subordinate table does not exist when the buffer is flushed.
 
-:::warning
+:::note
 Running ALTER on the Buffer table in releases made before 26 Oct 2021 will cause a `Block structure mismatch` error (see [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117) and [#30565](https://github.com/ClickHouse/ClickHouse/pull/30565)), so deleting the Buffer table and then recreating is the only option. Check that this error is fixed in your release before trying to run ALTER on the Buffer table.
 :::
 
diff --git a/docs/en/engines/table-engines/special/dictionary.md b/docs/en/engines/table-engines/special/dictionary.md
index e487ca2002f..3517ebfcdc6 100644
--- a/docs/en/engines/table-engines/special/dictionary.md
+++ b/docs/en/engines/table-engines/special/dictionary.md
@@ -6,7 +6,7 @@ sidebar_label: Dictionary
 
 # Dictionary Table Engine
 
-The `Dictionary` engine displays the [dictionary](../../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) data as a ClickHouse table.
+The `Dictionary` engine displays the [dictionary](../../../sql-reference/dictionaries/index.md) data as a ClickHouse table.
 
 ## Example {#example}
 
@@ -97,4 +97,4 @@ select * from products limit 1;
 
 **See Also**
 
--   [Dictionary function](../../../sql-reference/table-functions/dictionary.md#dictionary-function)
+- [Dictionary function](../../../sql-reference/table-functions/dictionary.md#dictionary-function)
diff --git a/docs/en/engines/table-engines/special/distributed.md b/docs/en/engines/table-engines/special/distributed.md
index f4f541843d3..d1a0b13b363 100644
--- a/docs/en/engines/table-engines/special/distributed.md
+++ b/docs/en/engines/table-engines/special/distributed.md
@@ -141,6 +141,10 @@ Clusters are configured in the [server configuration file](../../../operations/c
              be used as current user for the query.
         -->
         <!-- <secret></secret> -->
+        
+        <!-- Optional. Whether distributed DDL queries (ON CLUSTER clause) are allowed for this cluster. Default: true (allowed). -->        
+        <!-- <allow_distributed_ddl_queries>true</allow_distributed_ddl_queries> -->
+        
         <shard>
             <!-- Optional. Shard weight when writing data. Default: 1. -->
             <weight>1</weight>
@@ -184,7 +188,7 @@ The parameters `host`, `port`, and optionally `user`, `password`, `secure`, `com
 
 - `host` – The address of the remote server. You can use either the domain or the IPv4 or IPv6 address. If you specify the domain, the server makes a DNS request when it starts, and the result is stored as long as the server is running. If the DNS request fails, the server does not start. If you change the DNS record, restart the server.
 - `port` – The TCP port for messenger activity (`tcp_port` in the config, usually set to 9000). Not to be confused with `http_port`.
-- `user` – Name of the user for connecting to a remote server. Default value is the `default` user. This user must have access to connect to the specified server. Access is configured in the `users.xml` file. For more information, see the section [Access rights](../../../operations/access-rights.md).
+- `user` – Name of the user for connecting to a remote server. Default value is the `default` user. This user must have access to connect to the specified server. Access is configured in the `users.xml` file. For more information, see the section [Access rights](../../../guides/sre/user-management/index.md).
 - `password` – The password for connecting to a remote server (not masked). Default value: empty string.
 - `secure` - Whether to use a secure SSL/TLS connection. Usually also requires specifying the port (the default secure port is `9440`). The server should listen on `<tcp_port_secure>9440</tcp_port_secure>` and be configured with correct certificates.
 - `compression` - Use data compression. Default value: `true`.
@@ -225,8 +229,8 @@ A simple remainder from the division is a limited solution for sharding and isn
 
 You should be concerned about the sharding scheme in the following cases:
 
--   Queries are used that require joining data (`IN` or `JOIN`) by a specific key. If data is sharded by this key, you can use local `IN` or `JOIN` instead of `GLOBAL IN` or `GLOBAL JOIN`, which is much more efficient.
--   A large number of servers is used (hundreds or more) with a large number of small queries, for example, queries for data of individual clients (e.g. websites, advertisers, or partners). In order for the small queries to not affect the entire cluster, it makes sense to locate data for a single client on a single shard. Alternatively, you can set up bi-level sharding: divide the entire cluster into “layers”, where a layer may consist of multiple shards. Data for a single client is located on a single layer, but shards can be added to a layer as necessary, and data is randomly distributed within them. `Distributed` tables are created for each layer, and a single shared distributed table is created for global queries.
+- Queries are used that require joining data (`IN` or `JOIN`) by a specific key. If data is sharded by this key, you can use local `IN` or `JOIN` instead of `GLOBAL IN` or `GLOBAL JOIN`, which is much more efficient.
+- A large number of servers is used (hundreds or more) with a large number of small queries, for example, queries for data of individual clients (e.g. websites, advertisers, or partners). In order for the small queries to not affect the entire cluster, it makes sense to locate data for a single client on a single shard. Alternatively, you can set up bi-level sharding: divide the entire cluster into “layers”, where a layer may consist of multiple shards. Data for a single client is located on a single layer, but shards can be added to a layer as necessary, and data is randomly distributed within them. `Distributed` tables are created for each layer, and a single shared distributed table is created for global queries.
 
 Data is written asynchronously. When inserted in the table, the data block is just written to the local file system. The data is sent to the remote servers in the background as soon as possible. The periodicity for sending data is managed by the [distributed_directory_monitor_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_sleep_time_ms) and [distributed_directory_monitor_max_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_max_sleep_time_ms) settings. The `Distributed` engine sends each file with inserted data separately, but you can enable batch sending of files with the [distributed_directory_monitor_batch_inserts](../../../operations/settings/settings.md#distributed_directory_monitor_batch_inserts) setting. This setting improves cluster performance by better utilizing local server and network resources. You should check whether data is sent successfully by checking the list of files (data waiting to be sent) in the table directory: `/var/lib/clickhouse/data/database/table/`. The number of threads performing background tasks can be set by [background_distributed_schedule_pool_size](../../../operations/settings/settings.md#background_distributed_schedule_pool_size) setting.
 
@@ -238,7 +242,7 @@ When querying a `Distributed` table, `SELECT` queries are sent to all shards and
 
 When the `max_parallel_replicas` option is enabled, query processing is parallelized across all replicas within a single shard. For more information, see the section [max_parallel_replicas](../../../operations/settings/settings.md#settings-max_parallel_replicas).
 
-To learn more about how distibuted `in` and `global in` queries are processed, refer to [this](../../../sql-reference/operators/in.md#select-distributed-subqueries) documentation.
+To learn more about how distributed `in` and `global in` queries are processed, refer to [this](../../../sql-reference/operators/in.md#select-distributed-subqueries) documentation.
 
 ## Virtual Columns {#virtual-columns}
 
@@ -252,6 +256,6 @@ Since [remote](../../../sql-reference/table-functions/remote.md) and [cluster](.
 
 **See Also**
 
--   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns) description
--   [background_distributed_schedule_pool_size](../../../operations/settings/settings.md#background_distributed_schedule_pool_size) setting
--   [shardNum()](../../../sql-reference/functions/other-functions.md#shard-num) and [shardCount()](../../../sql-reference/functions/other-functions.md#shard-count) functions
+- [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns) description
+- [background_distributed_schedule_pool_size](../../../operations/settings/settings.md#background_distributed_schedule_pool_size) setting
+- [shardNum()](../../../sql-reference/functions/other-functions.md#shardnum) and [shardCount()](../../../sql-reference/functions/other-functions.md#shardcount) functions
diff --git a/docs/en/engines/table-engines/special/executable.md b/docs/en/engines/table-engines/special/executable.md
index 5d01762f61b..25049d7b46e 100644
--- a/docs/en/engines/table-engines/special/executable.md
+++ b/docs/en/engines/table-engines/special/executable.md
@@ -120,7 +120,7 @@ Some comments about the `sentiment` table:
 - The `TabSeparated` format means our Python script needs to generate rows of raw data that contain tab-separated values
 - The query selects two columns from `hackernews`. The Python script will need to parse out those column values from the incoming rows
 
-Here is the defintion of `sentiment.py`:
+Here is the definition of `sentiment.py`:
 
 ```python
 #!/usr/local/bin/python3.9
diff --git a/docs/en/engines/table-engines/special/file.md b/docs/en/engines/table-engines/special/file.md
index 8314c511236..9c4e87487b4 100644
--- a/docs/en/engines/table-engines/special/file.md
+++ b/docs/en/engines/table-engines/special/file.md
@@ -10,9 +10,9 @@ The File table engine keeps the data in a file in one of the supported [file for
 
 Usage scenarios:
 
--   Data export from ClickHouse to file.
--   Convert data from one format to another.
--   Updating data in ClickHouse via editing a file on a disk.
+- Data export from ClickHouse to file.
+- Convert data from one format to another.
+- Updating data in ClickHouse via editing a file on a disk.
 
 ## Usage in ClickHouse Server {#usage-in-clickhouse-server}
 
@@ -31,7 +31,7 @@ When creating table using `File(Format)` it creates empty subdirectory in that f
 
 You may manually create this subfolder and file in server filesystem and then [ATTACH](../../../sql-reference/statements/attach.md) it to table information with matching name, so you can query data from that file.
 
-:::warning
+:::note
 Be careful with this functionality, because ClickHouse does not keep track of external changes to such files. The result of simultaneous writes via ClickHouse and outside of ClickHouse is undefined.
 :::
 
@@ -78,14 +78,14 @@ $ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64
 
 ## Details of Implementation {#details-of-implementation}
 
--   Multiple `SELECT` queries can be performed concurrently, but `INSERT` queries will wait each other.
--   Supported creating new file by `INSERT` query.
--   If file exists, `INSERT` would append new values in it.
--   Not supported:
-    -   `ALTER`
-    -   `SELECT ... SAMPLE`
-    -   Indices
-    -   Replication
+- Multiple `SELECT` queries can be performed concurrently, but `INSERT` queries will wait each other.
+- Supported creating new file by `INSERT` query.
+- If file exists, `INSERT` would append new values in it.
+- Not supported:
+    - `ALTER`
+    - `SELECT ... SAMPLE`
+    - Indices
+    - Replication
 
 ## PARTITION BY
 
diff --git a/docs/en/engines/table-engines/special/generate.md b/docs/en/engines/table-engines/special/generate.md
index 77d90082ddc..9fcdb47e555 100644
--- a/docs/en/engines/table-engines/special/generate.md
+++ b/docs/en/engines/table-engines/special/generate.md
@@ -9,13 +9,13 @@ The GenerateRandom table engine produces random data for given table schema.
 
 Usage examples:
 
--   Use in test to populate reproducible large table.
--   Generate random input for fuzzing tests.
+- Use in test to populate reproducible large table.
+- Generate random input for fuzzing tests.
 
 ## Usage in ClickHouse Server {#usage-in-clickhouse-server}
 
 ``` sql
-ENGINE = GenerateRandom([random_seed] [,max_string_length] [,max_array_length])
+ENGINE = GenerateRandom([random_seed [,max_string_length [,max_array_length]]])
 ```
 
 The `max_array_length` and `max_string_length` parameters specify maximum length of all
@@ -49,9 +49,9 @@ SELECT * FROM generate_engine_table LIMIT 3
 
 ## Details of Implementation {#details-of-implementation}
 
--   Not supported:
-    -   `ALTER`
-    -   `SELECT ... SAMPLE`
-    -   `INSERT`
-    -   Indices
-    -   Replication
+- Not supported:
+    - `ALTER`
+    - `SELECT ... SAMPLE`
+    - `INSERT`
+    - Indices
+    - Replication
diff --git a/docs/en/engines/table-engines/special/index.md b/docs/en/engines/table-engines/special/index.md
index 2247aeae5af..a1c5056de22 100644
--- a/docs/en/engines/table-engines/special/index.md
+++ b/docs/en/engines/table-engines/special/index.md
@@ -8,8 +8,8 @@ sidebar_label: Special
 
 There are three main categories of table engines:
 
--   [MergeTree engine family](../../../engines/table-engines/mergetree-family/index.md) for main production use.
--   [Log engine family](../../../engines/table-engines/log-family/index.md) for small temporary data.
--   [Table engines for integrations](../../../engines/table-engines/integrations/index.md).
+- [MergeTree engine family](../../../engines/table-engines/mergetree-family/index.md) for main production use.
+- [Log engine family](../../../engines/table-engines/log-family/index.md) for small temporary data.
+- [Table engines for integrations](../../../engines/table-engines/integrations/index.md).
 
 The remaining engines are unique in their purpose and are not grouped into families yet, thus they are placed in this “special” category.
diff --git a/docs/en/engines/table-engines/special/join.md b/docs/en/engines/table-engines/special/join.md
index a7cc525dd6c..e9f0678beee 100644
--- a/docs/en/engines/table-engines/special/join.md
+++ b/docs/en/engines/table-engines/special/join.md
@@ -54,8 +54,8 @@ You can use `INSERT` queries to add data to the `Join`-engine tables. If the tab
 
 Main use-cases for `Join`-engine tables are following:
 
--   Place the table to the right side in a `JOIN` clause.
--   Call the [joinGet](/docs/en/sql-reference/functions/other-functions.md/#joinget) function, which lets you extract data from the table the same way as from a dictionary.
+- Place the table to the right side in a `JOIN` clause.
+- Call the [joinGet](/docs/en/sql-reference/functions/other-functions.md/#joinget) function, which lets you extract data from the table the same way as from a dictionary.
 
 ### Deleting Data {#deleting-data}
 
diff --git a/docs/en/engines/table-engines/special/keepermap.md b/docs/en/engines/table-engines/special/keepermap.md
index 680413039e7..a1c7009b712 100644
--- a/docs/en/engines/table-engines/special/keepermap.md
+++ b/docs/en/engines/table-engines/special/keepermap.md
@@ -78,7 +78,8 @@ Of course, it's possible to manually run `CREATE TABLE` with same path on nonrel
 
 ### Inserts
 
-When new rows are inserted into `KeeperMap`, if the key already exists, the value will be updated, otherwise new key is created.
+When new rows are inserted into `KeeperMap`, if the key does not exist, a new entry for the key is created.
+If the key exists, and setting `keeper_map_strict_mode` is set to `true`, an exception is thrown, otherwise, the value for the key is overwritten.
 
 Example:
 
@@ -89,6 +90,7 @@ INSERT INTO keeper_map_table VALUES ('some key', 1, 'value', 3.2);
 ### Deletes
 
 Rows can be deleted using `DELETE` query or `TRUNCATE`. 
+If the key exists, and setting `keeper_map_strict_mode` is set to `true`, fetching and deleting data will succeed only if it can be executed atomically.
 
 ```sql
 DELETE FROM keeper_map_table WHERE key LIKE 'some%' AND v1 > 1;
@@ -105,7 +107,12 @@ TRUNCATE TABLE keeper_map_table;
 ### Updates
 
 Values can be updated using `ALTER TABLE` query. Primary key cannot be updated.
+If setting `keeper_map_strict_mode` is set to `true`, fetching and updating data will succeed only if it's executed atomically.
 
 ```sql
 ALTER TABLE keeper_map_table UPDATE v1 = v1 * 10 + 2 WHERE key LIKE 'some%' AND v3 > 3.1;
 ```
+
+## Related content
+
+- Blog: [Building a Real-time Analytics Apps with ClickHouse and Hex](https://clickhouse.com/blog/building-real-time-applications-with-clickhouse-and-hex-notebook-keeper-engine)
diff --git a/docs/en/engines/table-engines/special/merge.md b/docs/en/engines/table-engines/special/merge.md
index ccdb5b5fad7..bd6149406a9 100644
--- a/docs/en/engines/table-engines/special/merge.md
+++ b/docs/en/engines/table-engines/special/merge.md
@@ -78,11 +78,11 @@ SELECT * FROM WatchLog;
 
 ## Virtual Columns {#virtual-columns}
 
--   `_table` — Contains the name of the table from which data was read. Type: [String](../../../sql-reference/data-types/string.md).
+- `_table` — Contains the name of the table from which data was read. Type: [String](../../../sql-reference/data-types/string.md).
 
     You can set the constant conditions on `_table` in the `WHERE/PREWHERE` clause (for example, `WHERE _table='xyz'`). In this case the read operation is performed only for that tables where the condition on `_table` is satisfied, so the `_table` column acts as an index.
 
 **See Also**
 
--   [Virtual columns](../../../engines/table-engines/special/index.md#table_engines-virtual_columns)
--   [merge](../../../sql-reference/table-functions/merge.md) table function
+- [Virtual columns](../../../engines/table-engines/special/index.md#table_engines-virtual_columns)
+- [merge](../../../sql-reference/table-functions/merge.md) table function
diff --git a/docs/en/engines/table-engines/special/url.md b/docs/en/engines/table-engines/special/url.md
index af8a80c75b0..a4530767e11 100644
--- a/docs/en/engines/table-engines/special/url.md
+++ b/docs/en/engines/table-engines/special/url.md
@@ -14,7 +14,7 @@ Syntax: `URL(URL [,Format] [,CompressionMethod])`
 
 - The `Format` must be one that ClickHouse can use in `SELECT` queries and, if necessary, in `INSERTs`. For the full list of supported formats, see [Formats](../../../interfaces/formats.md#formats).
 
-    If this argument is not specified, ClickHouse detectes the format automatically from the suffix of the `URL` parameter. If the suffix of `URL` parameter does not match any supported formats, it fails to create table. For example, for engine expression `URL('http://localhost/test.json')`, `JSON` format is applied.
+    If this argument is not specified, ClickHouse detects the format automatically from the suffix of the `URL` parameter. If the suffix of `URL` parameter does not match any supported formats, it fails to create table. For example, for engine expression `URL('http://localhost/test.json')`, `JSON` format is applied.
 
 - `CompressionMethod` indicates that whether the HTTP body should be compressed. If the compression is enabled, the HTTP packets sent by the URL engine contain 'Content-Encoding' header to indicate which compression method is used.
 
@@ -91,11 +91,11 @@ SELECT * FROM url_engine_table
 
 ## Details of Implementation {#details-of-implementation}
 
--   Reads and writes can be parallel
--   Not supported:
-    -   `ALTER` and `SELECT...SAMPLE` operations.
-    -   Indexes.
-    -   Replication.
+- Reads and writes can be parallel
+- Not supported:
+    - `ALTER` and `SELECT...SAMPLE` operations.
+    - Indexes.
+    - Replication.
 
 ## PARTITION BY
 
diff --git a/docs/en/getting-started/example-datasets/_category_.yml b/docs/en/getting-started/example-datasets/_category_.yml
deleted file mode 100644
index 2ee34c63e93..00000000000
--- a/docs/en/getting-started/example-datasets/_category_.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-position: 1
-label: 'Example Datasets'
-collapsible: true
-collapsed: true
-link:
-  type: doc
-  id: en/getting-started/example-datasets/
diff --git a/docs/en/getting-started/example-datasets/amazon-reviews.md b/docs/en/getting-started/example-datasets/amazon-reviews.md
new file mode 100644
index 00000000000..f35806aa66f
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/amazon-reviews.md
@@ -0,0 +1,476 @@
+---
+slug: /en/getting-started/example-datasets/amazon-reviews
+sidebar_label: Amazon customer reviews
+---
+
+# Amazon customer reviews dataset
+
+[**Amazon Customer Reviews**](https://s3.amazonaws.com/amazon-reviews-pds/readme.html) (a.k.a. Product Reviews) is one of Amazon’s iconic products. In a period of over two decades since the first review in 1995, millions of Amazon customers have contributed over a hundred million reviews to express opinions and describe their experiences regarding products on the Amazon.com website. This makes Amazon Customer Reviews a rich source of information for academic researchers in the fields of Natural Language Processing (NLP), Information Retrieval (IR), and Machine Learning (ML), amongst others. By accessing the dataset, you agree to the [license terms](https://s3.amazonaws.com/amazon-reviews-pds/license.txt).
+
+The data is in a tab-separated format in gzipped files are up in AWS S3. Let's walk through the steps to insert it into ClickHouse.
+
+:::note
+The queries below were executed on a **Production** instance of [ClickHouse Cloud](https://clickhouse.cloud).
+:::
+
+
+1. Without inserting the data into ClickHouse, we can query it in place. Let's grab some rows so we can see what they look like:
+
+```sql
+SELECT *
+FROM s3('https://s3.amazonaws.com/amazon-reviews-pds/tsv/amazon_reviews_us_Wireless_v1_00.tsv.gz',
+    'TabSeparatedWithNames',
+    'marketplace String,
+    customer_id Int64,
+    review_id String,
+    product_id String,
+    product_parent Int64,
+    product_title String,
+    product_category String,
+    star_rating Int64,
+    helpful_votes Int64,
+    total_votes Int64,
+    vine Bool,
+    verified_purchase Bool,
+    review_headline String,
+    review_body String,
+    review_date Date'
+)
+LIMIT 10;
+```
+
+The rows look like:
+
+```response
+┌─marketplace─┬─customer_id─┬─review_id──────┬─product_id─┬─product_parent─┬─product_title──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┬─product_category─┬─star_rating─┬─helpful_votes─┬─total_votes─┬─vine──┬─verified_purchase─┬─review_headline───────────┬─review_body────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┬─review_date─┐
+│ US          │    16414143 │ R3W4P9UBGNGH1U │ B00YL0EKWE │      852431543 │ LG G4 Case Hard Transparent Slim Clear Cover for LG G4                                                                                                                                                                                                     │ Wireless         │           2 │             1 │           3 │ false │ true              │ Looks good, functions meh │ 2 issues  - Once I turned on the circle apps and installed this case,  my battery drained twice as fast as usual.  I ended up turning off the circle apps, which kind of makes the case just a case...  with a hole in it.  Second,  the wireless charging doesn't work.  I have a Motorola 360 watch and a Qi charging pad. The watch charges fine but this case doesn't. But hey, it looks nice. │  2015-08-31 │
+│ US          │    50800750 │ R15V54KBMTQWAY │ B00XK95RPQ │      516894650 │ Selfie Stick Fiblastiq&trade; Extendable Wireless Bluetooth Selfie Stick with built-in Bluetooth Adjustable Phone Holder                                                                                                                                   │ Wireless         │           4 │             0 │           0 │ false │ false             │ A fun little gadget       │ I’m embarrassed to admit that until recently, I have had a very negative opinion about “selfie sticks” aka “monopods” aka “narcissticks.” But having reviewed a number of them recently, they’re growing on me. This one is pretty nice and simple to set up and with easy instructions illustrated on the back of the box (not sure why some reviewers have stated that there are no instructions when they are clearly printed on the box unless they received different packaging than I did). Once assembled, the pairing via bluetooth and use of the stick are easy and intuitive. Nothing to it.<br /><br />The stick comes with a USB charging cable but arrived with a charge so you can use it immediately, though it’s probably a good idea to charge it right away so that you have no interruption of use out of the box. Make sure the stick is switched to on (it will light up) and extend your stick to the length you desire up to about a yard’s length and snap away.<br /><br />The phone clamp held the phone sturdily so I wasn’t worried about it slipping out. But the longer you extend the stick, the harder it is to maneuver.  But that will happen with any stick and is not specific to this one in particular.<br /><br />Two things that could improve this: 1) add the option to clamp this in portrait orientation instead of having to try and hold the stick at the portrait angle, which makes it feel unstable; 2) add the opening for a tripod so that this can be used to sit upright on a table for skyping and facetime eliminating the need to hold the phone up with your hand, causing fatigue.<br /><br />But other than that, this is a nice quality monopod for a variety of picture taking opportunities.<br /><br />I received a sample in exchange for my honest opinion. │  2015-08-31 │
+│ US          │    15184378 │ RY8I449HNXSVF  │ B00SXRXUKO │      984297154 │ Tribe AB40 Water Resistant Sports Armband with Key Holder for 4.7-Inch iPhone 6S/6/5/5S/5C, Galaxy S4 + Screen Protector - Dark Pink                                                                                                                       │ Wireless         │           5 │             0 │           0 │ false │ true              │ Five Stars                │ Fits iPhone 6 well                                                                                                                                                                                                                                         │  2015-08-31 │
+│ US          │    10203548 │ R18TLJYCKJFLSR │ B009V5X1CE │      279912704 │ RAVPower® Element 10400mAh External Battery USB Portable Charger (Dual USB Outputs, Ultra Compact Design), Travel Charger for iPhone 6,iPhone 6 plus,iPhone 5, 5S, 5C, 4S, 4, iPad Air, 4, 3, 2, Mini 2 (Apple adapters not included); Samsung Galaxy S5, S4, S3, S2, Note 3, Note 2; HTC One, EVO, Thunderbolt, Incredible, Droid DNA, Motorola ATRIX, Droid, Moto X, Google Glass, Nexus 4, Nexus 5, Nexus 7, │ Wireless         │           5 │             0 │           0 │ false │ true              │ Great charger             │ Great charger.  I easily get 3+ charges on a Samsung Galaxy 3.  Works perfectly for camping trips or long days on the boat.                                                                                                                                │  2015-08-31 │
+│ US          │      488280 │ R1NK26SWS53B8Q │ B00D93OVF0 │      662791300 │ Fosmon Micro USB Value Pack Bundle for Samsung Galaxy Exhilarate - Includes Home / Travel Charger, Car / Vehicle Charger and USB Cable                                                                                                                     │ Wireless         │           5 │             0 │           0 │ false │ true              │ Five Stars                │ Great for the price :-)                                                                                                                                                                                                                                    │  2015-08-31 │
+│ US          │    13334021 │ R11LOHEDYJALTN │ B00XVGJMDQ │      421688488 │ iPhone 6 Case, Vofolen Impact Resistant Protective Shell iPhone 6S Wallet Cover Shockproof Rubber Bumper Case Anti-scratches Hard Cover Skin Card Slot Holder for iPhone 6 6S                                                                              │ Wireless         │           5 │             0 │           0 │ false │ true              │ Five Stars                │ Great Case, better customer service!                                                                                                                                                                                                                       │  2015-08-31 │
+│ US          │    27520697 │ R3ALQVQB2P9LA7 │ B00KQW1X1C │      554285554 │ Nokia Lumia 630 RM-978 White Factory Unlocked - International Version No Warranty                                                                                                                                                                          │ Wireless         │           4 │             0 │           0 │ false │ true              │ Four Stars                │ Easy to set up and use. Great functions for the price                                                                                                                                                                                                      │  2015-08-31 │
+│ US          │    48086021 │ R3MWLXLNO21PDQ │ B00IP1MQNK │      488006702 │ Lumsing 10400mah external battery                                                                                                                                                                                                                          │ Wireless         │           5 │             0 │           0 │ false │ true              │ Five Stars                │ Works great                                                                                                                                                                                                                                                │  2015-08-31 │
+│ US          │    12738196 │ R2L15IS24CX0LI │ B00HVORET8 │      389677711 │ iPhone 5S Battery Case - iPhone 5 Battery Case , Maxboost Atomic S [MFI Certified] External Protective Battery Charging Case Power Bank Charger All Versions of Apple iPhone 5/5S [Juice Battery Pack]                                                     │ Wireless         │           5 │             0 │           0 │ false │ true              │ So far so good            │ So far so good. It is essentially identical to the one it replaced from another company. That one stopped working after 7 months so I am a bit apprehensive about this one.                                                                                │  2015-08-31 │
+│ US          │    15867807 │ R1DJ8976WPWVZU │ B00HX3G6J6 │      299654876 │ HTC One M8 Screen Protector, Skinomi TechSkin Full Coverage Screen Protector for HTC One M8 Clear HD Anti-Bubble Film │ Wireless         │           3 │             0 │           0 │ false │ true              │ seems durable but these are always harder to get on ... │ seems durable but these are always harder to get on right than people make them out to be. also send to curl up at the edges after a while. with today's smartphones, you hardly need screen protectors anyway. │  2015-08-31 │
+└─────────────┴─────────────┴────────────────┴────────────┴────────────────┴───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────┴─────────────┴───────────────┴─────────────┴───────┴───────────────────┴─────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────┘
+```
+
+:::note
+Normally you would not need to pass in the schema into the `s3` table function - ClickHouse can infer the names and data types of the columns. However, this particular dataset uses a non-standard tab-separated format, but the `s3` function seems to work fine with this non-standard format if you include the schema.
+:::
+
+2. Let's define a new table named `amazon_reviews`. We'll optimize some of the column data types - and choose a primary key (the `ORDER BY` clause):
+
+```sql
+CREATE TABLE amazon_reviews
+(
+    review_date Date,
+    marketplace LowCardinality(String),
+    customer_id UInt64,
+    review_id String,
+    product_id String,
+    product_parent UInt64,
+    product_title String,
+    product_category LowCardinality(String),
+    star_rating UInt8,
+    helpful_votes UInt32,
+    total_votes UInt32,
+    vine Bool,
+    verified_purchase Bool,
+    review_headline String,
+    review_body String
+)
+ENGINE = MergeTree
+ORDER BY (marketplace, review_date, product_category);
+```
+
+3. We are now ready to insert the data into ClickHouse. Before we do, check out the [list of files in the dataset](https://s3.amazonaws.com/amazon-reviews-pds/tsv/index.txt) and decide which ones you want to include.
+
+4. We will insert all of the US reviews - which is about 151M rows. The following `INSERT` command uses the `s3Cluster` table function, which allows the processing of mulitple S3 files in parallel using all the nodes of your cluster. We also use a wildcard to insert any file that starts with the name `https://s3.amazonaws.com/amazon-reviews-pds/tsv/amazon_reviews_us_`:
+
+```sql
+INSERT INTO amazon_reviews
+WITH
+   transform(vine, ['Y','N'],[true, false]) AS vine,
+   transform(verified_purchase, ['Y','N'],[true, false]) AS verified_purchase
+SELECT
+   *
+FROM s3Cluster(
+    'default',
+    'https://s3.amazonaws.com/amazon-reviews-pds/tsv/amazon_reviews_us_*.tsv.gz',
+    'TSVWithNames',
+    'review_date Date,
+    marketplace LowCardinality(String),
+    customer_id UInt64,
+    review_id String,
+    product_id String,
+    product_parent UInt64,
+    product_title String,
+    product_category LowCardinality(String),
+    star_rating UInt8,
+    helpful_votes UInt32,
+    total_votes UInt32,
+    vine FixedString(1),
+    verified_purchase FixedString(1),
+    review_headline String,
+    review_body String'
+    )
+SETTINGS input_format_allow_errors_num = 1000000;
+```
+
+:::tip
+In ClickHouse Cloud, there is a cluster named `default`. Change `default` to the name of your cluster...or use the `s3` table function (instead of `s3Cluster`) if you do not have a cluster.
+:::
+
+5. That query doesn't take long - within 5 minutes or so you should see all the rows inserted:
+
+```sql
+SELECT formatReadableQuantity(count())
+FROM amazon_reviews
+```
+
+```response
+┌─formatReadableQuantity(count())─┐
+│ 150.96 million                  │
+└─────────────────────────────────┘
+```
+
+6. Let's see how much space our data is using:
+
+```sql
+SELECT
+    disk_name,
+    formatReadableSize(sum(data_compressed_bytes) AS size) AS compressed,
+    formatReadableSize(sum(data_uncompressed_bytes) AS usize) AS uncompressed,
+    round(usize / size, 2) AS compr_rate,
+    sum(rows) AS rows,
+    count() AS part_count
+FROM system.parts
+WHERE (active = 1) AND (table = 'amazon_reviews')
+GROUP BY disk_name
+ORDER BY size DESC;
+```
+The original data was about 70G, but compressed in ClickHouse it takes up about 30G:
+
+```response
+┌─disk_name─┬─compressed─┬─uncompressed─┬─compr_rate─┬──────rows─┬─part_count─┐
+│ s3disk    │ 30.00 GiB  │ 70.61 GiB    │       2.35 │ 150957260 │          9 │
+└───────────┴────────────┴──────────────┴────────────┴───────────┴────────────┘
+```
+
+7. Let's run some queries...here are the top 10 most-helpful reviews on Amazon:
+
+```sql
+SELECT
+    product_title,
+    review_headline
+FROM amazon_reviews
+ORDER BY helpful_votes DESC
+LIMIT 10;
+```
+
+Notice the query has to process all 151M rows, and it takes about 17 seconds:
+
+```response
+┌─product_title────────────────────────────────────────────────────────────────────────────┬─review_headline───────────────────────────────────────────────────────┐
+│ Kindle: Amazon's Original Wireless Reading Device (1st generation)                       │ Why and how the Kindle changes everything                             │
+│ BIC Cristal For Her Ball Pen, 1.0mm, Black, 16ct (MSLP16-Blk)                            │ FINALLY!                                                              │
+│ The Mountain Kids 100% Cotton Three Wolf Moon T-Shirt                                    │ Dual Function Design                                                  │
+│ Kindle Keyboard 3G, Free 3G + Wi-Fi, 6" E Ink Display                                    │ Kindle vs. Nook (updated)                                             │
+│ Kindle Fire HD 7", Dolby Audio, Dual-Band Wi-Fi                                          │ You Get What You Pay For                                              │
+│ Kindle Fire (Previous Generation - 1st)                                                  │ A great device WHEN you consider price and function, with a few flaws │
+│ Fifty Shades of Grey: Book One of the Fifty Shades Trilogy (Fifty Shades of Grey Series) │ Did a teenager write this???                                          │
+│ Wheelmate Laptop Steering Wheel Desk                                                     │ Perfect for an Starfleet Helmsman                                     │
+│ Kindle Wireless Reading Device (6" Display, U.S. Wireless)                               │ BEWARE of the SIGNIFICANT DIFFERENCES between Kindle 1 and Kindle 2!  │
+│ Tuscan Dairy Whole Vitamin D Milk, Gallon, 128 oz                                        │ Make this your only stock and store                                   │
+└──────────────────────────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┘
+
+10 rows in set. Elapsed: 17.595 sec. Processed 150.96 million rows, 15.36 GB (8.58 million rows/s., 872.89 MB/s.)
+```
+
+8. Here are the top 10 products in Amazon with the most reviews:
+
+```sql
+SELECT
+    any(product_title),
+    count()
+FROM amazon_reviews
+GROUP BY product_id
+ORDER BY 2 DESC
+LIMIT 10;
+```
+
+```response
+┌─any(product_title)────────────────────────────┬─count()─┐
+│ Candy Crush Saga                              │   50051 │
+│ The Secret Society® - Hidden Mystery          │   41255 │
+│ Google Chromecast HDMI Streaming Media Player │   35977 │
+│ Minecraft                                     │   35129 │
+│ Bosch Season 1                                │   33610 │
+│ Gone Girl: A Novel                            │   33240 │
+│ Subway Surfers                                │   32328 │
+│ The Fault in Our Stars                        │   30149 │
+│ Amazon.com eGift Cards                        │   28879 │
+│ Crossy Road                                   │   28111 │
+└───────────────────────────────────────────────┴─────────┘
+
+10 rows in set. Elapsed: 16.684 sec. Processed 195.05 million rows, 20.86 GB (11.69 million rows/s., 1.25 GB/s.)
+```
+
+9. Here are the average review ratings per month for each product (an actual [Amazon job interview question](https://datalemur.com/questions/sql-avg-review-ratings)!):
+
+```sql
+SELECT
+    toStartOfMonth(review_date) AS month,
+    any(product_title),
+    avg(star_rating) AS avg_stars
+FROM amazon_reviews
+GROUP BY
+    month,
+    product_id
+ORDER BY
+    month DESC,
+    product_id ASC
+LIMIT 20;
+```
+
+It calculates all the monthly averages for each product, but we only returned 20 rows:
+
+```response
+┌──────month─┬─any(product_title)──────────────────────────────────────────────────────────────────────┬─avg_stars─┐
+│ 2015-08-01 │ Mystiqueshapes Girls Ballet Tutu Neon Lime Green                                        │         4 │
+│ 2015-08-01 │ Adult Ballet Tutu Yellow                                                                │         5 │
+│ 2015-08-01 │ The Way Things Work: An Illustrated Encyclopedia of Technology                          │         5 │
+│ 2015-08-01 │ Hilda Boswell's Treasury of Poetry                                                      │         5 │
+│ 2015-08-01 │ Treasury of Poetry                                                                      │         5 │
+│ 2015-08-01 │ Uncle Remus Stories                                                                     │         5 │
+│ 2015-08-01 │ The Book of Daniel                                                                      │         5 │
+│ 2015-08-01 │ Berenstains' B Book                                                                     │         5 │
+│ 2015-08-01 │ The High Hills (Brambly Hedge)                                                          │       4.5 │
+│ 2015-08-01 │ Fuzzypeg Goes to School (The Little Grey Rabbit library)                                │         5 │
+│ 2015-08-01 │ Dictionary in French: The Cat in the Hat (Beginner Series)                              │         5 │
+│ 2015-08-01 │ Windfallen                                                                              │         5 │
+│ 2015-08-01 │ The Monk Who Sold His Ferrari: A Remarkable Story About Living Your Dreams              │         5 │
+│ 2015-08-01 │ Illustrissimi: The Letters of Pope John Paul I                                          │         5 │
+│ 2015-08-01 │ Social Contract: A Personal Inquiry into the Evolutionary Sources of Order and Disorder │         5 │
+│ 2015-08-01 │ Mexico The Beautiful Cookbook: Authentic Recipes from the Regions of Mexico             │       4.5 │
+│ 2015-08-01 │ Alanbrooke                                                                              │         5 │
+│ 2015-08-01 │ Back to Cape Horn                                                                       │         4 │
+│ 2015-08-01 │ Ovett: An Autobiography (Willow books)                                                  │         5 │
+│ 2015-08-01 │ The Birds of West Africa (Collins Field Guides)                                         │         4 │
+└────────────┴─────────────────────────────────────────────────────────────────────────────────────────┴───────────┘
+
+20 rows in set. Elapsed: 52.827 sec. Processed 251.46 million rows, 35.26 GB (4.76 million rows/s., 667.55 MB/s.)
+```
+
+10. Here are the total number of votes per product category. This query is fast because `product_category` is in the primary key:
+
+```sql
+SELECT
+    sum(total_votes),
+    product_category
+FROM amazon_reviews
+GROUP BY product_category
+ORDER BY 1 DESC;
+```
+
+```response
+┌─sum(total_votes)─┬─product_category─────────┐
+│        103877874 │ Books                    │
+│         25330411 │ Digital_Ebook_Purchase   │
+│         23065953 │ Video DVD                │
+│         18048069 │ Music                    │
+│         17292294 │ Mobile_Apps              │
+│         15977124 │ Health & Personal Care   │
+│         13554090 │ PC                       │
+│         13065746 │ Kitchen                  │
+│         12537926 │ Home                     │
+│         11067538 │ Beauty                   │
+│         10418643 │ Wireless                 │
+│          9089085 │ Toys                     │
+│          9071484 │ Sports                   │
+│          7335647 │ Electronics              │
+│          6885504 │ Apparel                  │
+│          6710085 │ Video Games              │
+│          6556319 │ Camera                   │
+│          6305478 │ Lawn and Garden          │
+│          5954422 │ Office Products          │
+│          5339437 │ Home Improvement         │
+│          5284343 │ Outdoors                 │
+│          5125199 │ Pet Products             │
+│          4733251 │ Grocery                  │
+│          4697750 │ Shoes                    │
+│          4666487 │ Automotive               │
+│          4361518 │ Digital_Video_Download   │
+│          4033550 │ Tools                    │
+│          3559010 │ Baby                     │
+│          3317662 │ Home Entertainment       │
+│          2559501 │ Video                    │
+│          2204328 │ Furniture                │
+│          2157587 │ Musical Instruments      │
+│          1881662 │ Software                 │
+│          1676081 │ Jewelry                  │
+│          1499945 │ Watches                  │
+│          1224071 │ Digital_Music_Purchase   │
+│           847918 │ Luggage                  │
+│           503939 │ Major Appliances         │
+│           392001 │ Digital_Video_Games      │
+│           348990 │ Personal_Care_Appliances │
+│           321372 │ Digital_Software         │
+│           169585 │ Mobile_Electronics       │
+│            72970 │ Gift Card                │
+└──────────────────┴──────────────────────────┘
+
+43 rows in set. Elapsed: 0.423 sec. Processed 150.96 million rows, 756.20 MB (356.70 million rows/s., 1.79 GB/s.)
+```
+
+11. Let's find the products with the word **"awful"** occurring most frequently in the review. This is a big task - over 151M strings have to be parsed looking for a single word:
+
+```sql
+SELECT
+    product_id,
+    any(product_title),
+    avg(star_rating),
+    count() AS count
+FROM amazon_reviews
+WHERE position(review_body, 'awful') > 0
+GROUP BY product_id
+ORDER BY count DESC
+LIMIT 50;
+```
+
+The query takes a couple of minutes, but the results are a fun read:
+
+```response
+
+┌─product_id─┬─any(product_title)───────────────────────────────────────────────────────────────────────┬───avg(star_rating)─┬─count─┐
+│ 0345803485 │ Fifty Shades of Grey: Book One of the Fifty Shades Trilogy (Fifty Shades of Grey Series) │ 1.3870967741935485 │   248 │
+│ B007J4T2G8 │ Fifty Shades of Grey (Fifty Shades, Book 1)                                              │ 1.4439834024896265 │   241 │
+│ B006LSZECO │ Gone Girl: A Novel                                                                       │ 2.2986425339366514 │   221 │
+│ B00008OWZG │ St. Anger                                                                                │ 1.6565656565656566 │   198 │
+│ B00BD99JMW │ Allegiant (Divergent Trilogy, Book 3)                                                    │ 1.8342541436464088 │   181 │
+│ B0000YUXI0 │ Mavala Switzerland Mavala Stop Nail Biting                                               │  4.473684210526316 │   171 │
+│ B004S8F7QM │ Cards Against Humanity                                                                   │  4.753012048192771 │   166 │
+│ 031606792X │ Breaking Dawn (The Twilight Saga, Book 4)                                                │           1.796875 │   128 │
+│ 006202406X │ Allegiant (Divergent Series)                                                             │ 1.4242424242424243 │    99 │
+│ B0051VVOB2 │ Kindle Fire (Previous Generation - 1st)                                                  │ 2.7448979591836733 │    98 │
+│ B00I3MP3SG │ Pilot                                                                                    │ 1.8762886597938144 │    97 │
+│ 030758836X │ Gone Girl                                                                                │            2.15625 │    96 │
+│ B0009X29WK │ Precious Cat Ultra Premium Clumping Cat Litter                                           │ 3.0759493670886076 │    79 │
+│ B00JB3MVCW │ Noah                                                                                     │ 1.2027027027027026 │    74 │
+│ B00BAXFECK │ The Goldfinch: A Novel (Pulitzer Prize for Fiction)                                      │  2.643835616438356 │    73 │
+│ B00N28818A │ Amazon Prime Video                                                                       │ 1.4305555555555556 │    72 │
+│ B007FTE2VW │ SimCity - Limited Edition                                                                │ 1.2794117647058822 │    68 │
+│ 0439023513 │ Mockingjay (The Hunger Games)                                                            │ 2.6417910447761193 │    67 │
+│ B00178630A │ Diablo III - PC/Mac                                                                      │           1.671875 │    64 │
+│ B000OCEWGW │ Liquid Ass                                                                               │             4.8125 │    64 │
+│ B005ZOBNOI │ The Fault in Our Stars                                                                   │  4.316666666666666 │    60 │
+│ B00L9B7IKE │ The Girl on the Train: A Novel                                                           │ 2.0677966101694913 │    59 │
+│ B007S6Y6VS │ Garden of Life Raw Organic Meal                                                          │ 2.8793103448275863 │    58 │
+│ B0064X7B4A │ Words With Friends                                                                       │ 2.2413793103448274 │    58 │
+│ B003WUYPPG │ Unbroken: A World War II Story of Survival, Resilience, and Redemption                   │  4.620689655172414 │    58 │
+│ B00006HBUJ │ Star Wars: Episode II - Attack of the Clones (Widescreen Edition)                        │ 2.2982456140350878 │    57 │
+│ B000XUBFE2 │ The Book Thief                                                                           │  4.526315789473684 │    57 │
+│ B0006399FS │ How to Dismantle an Atomic Bomb                                                          │ 1.9821428571428572 │    56 │
+│ B003ZSJ212 │ Star Wars: The Complete Saga (Episodes I-VI) (Packaging May Vary) [Blu-ray]              │  2.309090909090909 │    55 │
+│ 193700788X │ Dead Ever After (Sookie Stackhouse/True Blood)                                           │ 1.5185185185185186 │    54 │
+│ B004FYEZMQ │ Mass Effect 3                                                                            │  2.056603773584906 │    53 │
+│ B000CFYAMC │ The Room                                                                                 │ 3.9615384615384617 │    52 │
+│ B0031JK95S │ Garden of Life Raw Organic Meal                                                          │ 3.3137254901960786 │    51 │
+│ B0012JY4G4 │ Color Oops Hair Color Remover Extra Strength 1 Each                                      │ 3.9019607843137254 │    51 │
+│ B007VTVRFA │ SimCity - Limited Edition                                                                │ 1.2040816326530612 │    49 │
+│ B00CE18P0K │ Pilot                                                                                    │ 1.7142857142857142 │    49 │
+│ 0316015849 │ Twilight (The Twilight Saga, Book 1)                                                     │ 1.8979591836734695 │    49 │
+│ B00DR0PDNE │ Google Chromecast HDMI Streaming Media Player                                            │ 2.5416666666666665 │    48 │
+│ B000056OWC │ The First Years: 4-Stage Bath System                                                     │ 1.2127659574468086 │    47 │
+│ B007IXWKUK │ Fifty Shades Darker (Fifty Shades, Book 2)                                               │ 1.6304347826086956 │    46 │
+│ 1892112000 │ To Train Up a Child                                                                      │ 1.4130434782608696 │    46 │
+│ 043935806X │ Harry Potter and the Order of the Phoenix (Book 5)                                       │  3.977272727272727 │    44 │
+│ B00BGO0Q9O │ Fitbit Flex Wireless Wristband with Sleep Function, Black                                │ 1.9318181818181819 │    44 │
+│ B003XF1XOQ │ Mockingjay (Hunger Games Trilogy, Book 3)                                                │  2.772727272727273 │    44 │
+│ B00DD2B52Y │ Spring Breakers                                                                          │ 1.2093023255813953 │    43 │
+│ B0064X7FVE │ The Weather Channel: Forecast, Radar & Alerts                                            │ 1.5116279069767442 │    43 │
+│ B0083PWAPW │ Kindle Fire HD 7", Dolby Audio, Dual-Band Wi-Fi                                          │  2.627906976744186 │    43 │
+│ B00192KCQ0 │ Death Magnetic                                                                           │ 3.5714285714285716 │    42 │
+│ B007S6Y74O │ Garden of Life Raw Organic Meal                                                          │  3.292682926829268 │    41 │
+│ B0052QYLUM │ Infant Optics DXR-5 Portable Video Baby Monitor                                          │ 2.1463414634146343 │    41 │
+└────────────┴──────────────────────────────────────────────────────────────────────────────────────────┴────────────────────┴───────┘
+
+50 rows in set. Elapsed: 60.052 sec. Processed 150.96 million rows, 68.93 GB (2.51 million rows/s., 1.15 GB/s.)
+```
+
+12. We can run the same query again, except this time we search for **awesome** in the reviews:
+
+```sql
+SELECT
+    product_id,
+    any(product_title),
+    avg(star_rating),
+    count() AS count
+FROM amazon_reviews
+WHERE position(review_body, 'awesome') > 0
+GROUP BY product_id
+ORDER BY count DESC
+LIMIT 50;
+```
+
+It runs quite a bit faster - which means the cache is helping us out here:
+
+```response
+
+┌─product_id─┬─any(product_title)────────────────────────────────────────────────────┬───avg(star_rating)─┬─count─┐
+│ B00992CF6W │ Minecraft                                                             │  4.848130353039482 │  4787 │
+│ B009UX2YAC │ Subway Surfers                                                        │  4.866720955483171 │  3684 │
+│ B00QW8TYWO │ Crossy Road                                                           │  4.935217903415784 │  2547 │
+│ B00DJFIMW6 │ Minion Rush: Despicable Me Official Game                              │  4.850450450450451 │  2220 │
+│ B00AREIAI8 │ My Horse                                                              │  4.865313653136531 │  2168 │
+│ B00I8Q77Y0 │ Flappy Wings (not Flappy Bird)                                        │ 4.8246561886051085 │  2036 │
+│ B0054JZC6E │ 101-in-1 Games                                                        │  4.792542016806722 │  1904 │
+│ B00G5LQ5MU │ Escape The Titanic                                                    │  4.724673710379117 │  1609 │
+│ B0086700CM │ Temple Run                                                            │   4.87636130685458 │  1561 │
+│ B009HKL4B8 │ The Sims Freeplay                                                     │  4.763942931258106 │  1542 │
+│ B00I6IKSZ0 │ Pixel Gun 3D (Pocket Edition) - multiplayer shooter with skin creator │  4.849894291754757 │  1419 │
+│ B006OC2ANS │ BLOOD & GLORY                                                         │ 4.8561538461538465 │  1300 │
+│ B00FATEJYE │ Injustice: Gods Among Us (Kindle Tablet Edition)                      │  4.789265982636149 │  1267 │
+│ B00B2V66VS │ Temple Run 2                                                          │  4.764705882352941 │  1173 │
+│ B00JOT3HQ2 │ Geometry Dash Lite                                                    │  4.909747292418772 │  1108 │
+│ B00DUGCLY4 │ Guess The Emoji                                                       │  4.813606710158434 │  1073 │
+│ B00DR0PDNE │ Google Chromecast HDMI Streaming Media Player                         │  4.607276119402985 │  1072 │
+│ B00FAPF5U0 │ Candy Crush Saga                                                      │  4.825757575757576 │  1056 │
+│ B0051VVOB2 │ Kindle Fire (Previous Generation - 1st)                               │  4.600407747196738 │   981 │
+│ B007JPG04E │ FRONTLINE COMMANDO                                                    │             4.8125 │   912 │
+│ B00PTB7B34 │ Call of Duty®: Heroes                                                 │  4.876404494382022 │   890 │
+│ B00846GKTW │ Style Me Girl - Free 3D Fashion Dressup                               │  4.785714285714286 │   882 │
+│ B004S8F7QM │ Cards Against Humanity                                                │  4.931034482758621 │   754 │
+│ B00FAX6XQC │ DEER HUNTER CLASSIC                                                   │  4.700272479564033 │   734 │
+│ B00PSGW79I │ Buddyman: Kick                                                        │  4.888736263736264 │   728 │
+│ B00CTQ6SIG │ The Simpsons: Tapped Out                                              │  4.793948126801153 │   694 │
+│ B008JK6W5K │ Logo Quiz                                                             │  4.782106782106782 │   693 │
+│ B00EDTSKLU │ Geometry Dash                                                         │  4.942028985507246 │   690 │
+│ B00CSR2J9I │ Hill Climb Racing                                                     │  4.880059970014993 │   667 │
+│ B005ZXWMUS │ Netflix                                                               │  4.722306525037936 │   659 │
+│ B00CRFAAYC │ Fab Tattoo Artist FREE                                                │  4.907435508345979 │   659 │
+│ B00DHQHQCE │ Battle Beach                                                          │  4.863287250384024 │   651 │
+│ B00BGA9WK2 │ PlayStation 4 500GB Console [Old Model]                               │  4.688751926040061 │   649 │
+│ B008Y7SMQU │ Logo Quiz - Fun Plus Free                                             │             4.7888 │   625 │
+│ B0083PWAPW │ Kindle Fire HD 7", Dolby Audio, Dual-Band Wi-Fi                       │  4.593900481540931 │   623 │
+│ B008XG1X18 │ Pinterest                                                             │ 4.8148760330578515 │   605 │
+│ B007SYWFRM │ Ice Age Village                                                       │ 4.8566666666666665 │   600 │
+│ B00K7WGUKA │ Don't Tap The White Tile (Piano Tiles)                                │  4.922689075630252 │   595 │
+│ B00BWYQ9YE │ Kindle Fire HDX 7", HDX Display (Previous Generation - 3rd)           │  4.649913344887349 │   577 │
+│ B00IZLM8MY │ High School Story                                                     │  4.840425531914893 │   564 │
+│ B004MC8CA2 │ Bible                                                                 │  4.884476534296029 │   554 │
+│ B00KNWYDU8 │ Dragon City                                                           │  4.861111111111111 │   540 │
+│ B009ZKSPDK │ Survivalcraft                                                         │  4.738317757009346 │   535 │
+│ B00A4O6NMG │ My Singing Monsters                                                   │  4.845559845559846 │   518 │
+│ B002MQYOFW │ The Hunger Games (Hunger Games Trilogy, Book 1)                       │  4.846899224806202 │   516 │
+│ B005ZFOOE8 │ iHeartRadio – Free Music & Internet Radio                             │  4.837301587301587 │   504 │
+│ B00AIUUXHC │ Hungry Shark Evolution                                                │  4.846311475409836 │   488 │
+│ B00E8KLWB4 │ The Secret Society® - Hidden Mystery                                  │  4.669438669438669 │   481 │
+│ B006D1ONE4 │ Where's My Water?                                                     │  4.916317991631799 │   478 │
+│ B00G6ZTM3Y │ Terraria                                                              │  4.728421052631579 │   475 │
+└────────────┴───────────────────────────────────────────────────────────────────────┴────────────────────┴───────┘
+
+50 rows in set. Elapsed: 33.954 sec. Processed 150.96 million rows, 68.95 GB (4.45 million rows/s., 2.03 GB/s.)
+```
\ No newline at end of file
diff --git a/docs/en/getting-started/example-datasets/cell-towers.md b/docs/en/getting-started/example-datasets/cell-towers.md
index b19d09c777a..048eecb285b 100644
--- a/docs/en/getting-started/example-datasets/cell-towers.md
+++ b/docs/en/getting-started/example-datasets/cell-towers.md
@@ -1,9 +1,10 @@
 ---
 slug: /en/getting-started/example-datasets/cell-towers
-sidebar_label: Cell Towers
+sidebar_label: Geo Data
 sidebar_position: 3
-title: "Cell Towers"
+title: "Geo Data using the Cell Tower Dataset"
 ---
+
 import ConnectionDetails from '@site/docs/en/_snippets/_gather_your_details_http.mdx';
 
 import Tabs from '@theme/Tabs';
@@ -163,7 +164,7 @@ SELECT mcc, count() FROM cell_towers GROUP BY mcc ORDER BY count() DESC LIMIT 10
 
 Based on the above query and the [MCC list](https://en.wikipedia.org/wiki/Mobile_country_code), the countries with the most cell towers are: the USA, Germany, and Russia.
 
-You may want to create a [Dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) in ClickHouse to decode these values.
+You may want to create a [Dictionary](../../sql-reference/dictionaries/index.md) in ClickHouse to decode these values.
 
 ## Use case: Incorporate geo data {#use-case}
 
@@ -307,7 +308,7 @@ To build a Superset dashboard using the OpenCelliD dataset you should:
   ![Choose clickhouse connect as database type](@site/docs/en/getting-started/example-datasets/images/superset-choose-a-database.png)
 
 :::note
-  If **ClickHouse Connect** is not one of your options, then you will need to install it.  The comand is `pip install clickhouse-connect`, and more info is [available here](https://pypi.org/project/clickhouse-connect/).
+  If **ClickHouse Connect** is not one of your options, then you will need to install it. The command is `pip install clickhouse-connect`, and more info is [available here](https://pypi.org/project/clickhouse-connect/).
 :::
 
 #### Add your connection details:
diff --git a/docs/en/getting-started/example-datasets/covid19.md b/docs/en/getting-started/example-datasets/covid19.md
new file mode 100644
index 00000000000..3a7fae89ae0
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/covid19.md
@@ -0,0 +1,265 @@
+---
+slug: /en/getting-started/example-datasets/covid19
+sidebar_label: COVID-19 Open-Data
+---
+
+# COVID-19 Open-Data
+
+COVID-19 Open-Data attempts to assemble the largest Covid-19 epidemiological database, in addition to a powerful set of expansive covariates. It includes open, publicly sourced, licensed data relating to demographics, economy, epidemiology, geography, health, hospitalizations, mobility, government response, weather, and more.
+
+The details are in GitHub [here](https://github.com/GoogleCloudPlatform/covid-19-open-data).
+
+It's easy to insert this data into ClickHouse...
+
+:::note
+The following commands were executed on a **Production** instance of [ClickHouse Cloud](https://clickhouse.cloud). You can easily run them on a local install as well.
+:::
+
+1. Let's see what the data looks like:
+
+```sql
+DESCRIBE url(
+    'https://storage.googleapis.com/covid19-open-data/v3/epidemiology.csv',
+    'CSVWithNames'
+);
+```
+
+The CSV file has 10 columns:
+
+```response
+┌─name─────────────────┬─type─────────────┐
+│ date                 │ Nullable(String) │
+│ location_key         │ Nullable(String) │
+│ new_confirmed        │ Nullable(Int64)  │
+│ new_deceased         │ Nullable(Int64)  │
+│ new_recovered        │ Nullable(Int64)  │
+│ new_tested           │ Nullable(Int64)  │
+│ cumulative_confirmed │ Nullable(Int64)  │
+│ cumulative_deceased  │ Nullable(Int64)  │
+│ cumulative_recovered │ Nullable(Int64)  │
+│ cumulative_tested    │ Nullable(Int64)  │
+└──────────────────────┴──────────────────┘
+
+10 rows in set. Elapsed: 0.745 sec.
+```
+
+2. Now let's view some of the rows:
+
+```sql
+SELECT *
+FROM url('https://storage.googleapis.com/covid19-open-data/v3/epidemiology.csv')
+LIMIT 100;
+```
+
+Notice the `url` function easily reads data from a CSV file:
+
+```response
+┌─c1─────────┬─c2───────────┬─c3────────────┬─c4───────────┬─c5────────────┬─c6─────────┬─c7───────────────────┬─c8──────────────────┬─c9───────────────────┬─c10───────────────┐
+│ date       │ location_key │ new_confirmed │ new_deceased │ new_recovered │ new_tested │ cumulative_confirmed │ cumulative_deceased │ cumulative_recovered │ cumulative_tested │
+│ 2020-04-03 │ AD           │ 24            │ 1            │ ᴺᵁᴸᴸ          │ ᴺᵁᴸᴸ       │ 466                  │ 17                  │ ᴺᵁᴸᴸ                 │ ᴺᵁᴸᴸ              │
+│ 2020-04-04 │ AD           │ 57            │ 0            │ ᴺᵁᴸᴸ          │ ᴺᵁᴸᴸ       │ 523                  │ 17                  │ ᴺᵁᴸᴸ                 │ ᴺᵁᴸᴸ              │
+│ 2020-04-05 │ AD           │ 17            │ 4            │ ᴺᵁᴸᴸ          │ ᴺᵁᴸᴸ       │ 540                  │ 21                  │ ᴺᵁᴸᴸ                 │ ᴺᵁᴸᴸ              │
+│ 2020-04-06 │ AD           │ 11            │ 1            │ ᴺᵁᴸᴸ          │ ᴺᵁᴸᴸ       │ 551                  │ 22                  │ ᴺᵁᴸᴸ                 │ ᴺᵁᴸᴸ              │
+│ 2020-04-07 │ AD           │ 15            │ 2            │ ᴺᵁᴸᴸ          │ ᴺᵁᴸᴸ       │ 566                  │ 24                  │ ᴺᵁᴸᴸ                 │ ᴺᵁᴸᴸ              │
+│ 2020-04-08 │ AD           │ 23            │ 2            │ ᴺᵁᴸᴸ          │ ᴺᵁᴸᴸ       │ 589                  │ 26                  │ ᴺᵁᴸᴸ                 │ ᴺᵁᴸᴸ              │
+└────────────┴──────────────┴───────────────┴──────────────┴───────────────┴────────────┴──────────────────────┴─────────────────────┴──────────────────────┴───────────────────┘
+```
+
+3. We will create a table now that we know what the data looks like:
+
+```sql
+CREATE TABLE covid19 (
+    date Date,
+    location_key LowCardinality(String),
+    new_confirmed Int32,
+    new_deceased Int32,
+    new_recovered Int32,
+    new_tested Int32,
+    cumulative_confirmed Int32,
+    cumulative_deceased Int32,
+    cumulative_recovered Int32,
+    cumulative_tested Int32
+)
+ENGINE = MergeTree
+ORDER BY (location_key, date);
+```
+
+4. The following command inserts the entire dataset into the `covid19` table:
+
+```sql
+INSERT INTO covid19
+   SELECT *
+   FROM
+      url(
+        'https://storage.googleapis.com/covid19-open-data/v3/epidemiology.csv',
+        CSVWithNames,
+        'date Date,
+        location_key LowCardinality(String),
+        new_confirmed Int32,
+        new_deceased Int32,
+        new_recovered Int32,
+        new_tested Int32,
+        cumulative_confirmed Int32,
+        cumulative_deceased Int32,
+        cumulative_recovered Int32,
+        cumulative_tested Int32'
+    );
+```
+
+5. It goes pretty quick - let's see how many rows were inserted:
+
+```sql
+SELECT formatReadableQuantity(count())
+FROM covid19;
+```
+
+```response
+┌─formatReadableQuantity(count())─┐
+│ 12.53 million                   │
+└─────────────────────────────────┘
+```
+
+6. Let's see how many total cases of Covid-19 were recorded:
+
+```sql
+SELECT formatReadableQuantity(sum(new_confirmed))
+FROM covid19;
+```
+
+```response
+┌─formatReadableQuantity(sum(new_confirmed))─┐
+│ 1.39 billion                               │
+└────────────────────────────────────────────┘
+```
+
+7. You will notice the data has a lot of 0's for dates - either weekends or days where numbers were not reported each day. We can use a window function to smooth out the daily averages of new cases:
+
+```sql
+SELECT
+   AVG(new_confirmed) OVER (PARTITION BY location_key ORDER BY date ROWS BETWEEN 2 PRECEDING AND 2 FOLLOWING) AS cases_smoothed,
+   new_confirmed,
+   location_key,
+   date
+FROM covid19;
+```
+
+8. This query determines the latest values for each location. We can't use `max(date)` because not all countries reported every day, so we grab the last row using `ROW_NUMBER`:
+
+```sql
+WITH latest_deaths_data AS
+   ( SELECT location_key,
+            date,
+            new_deceased,
+            new_confirmed,
+            ROW_NUMBER() OVER (PARTITION BY location_key ORDER BY date DESC) as rn
+     FROM covid19)
+SELECT location_key,
+       date,
+       new_deceased,
+       new_confirmed,
+       rn
+FROM latest_deaths_data
+WHERE rn=1;
+```
+
+9. We can use `lagInFrame` to determine the `LAG` of new cases each day. In this query we filter by the `US_DC` location:
+
+```sql
+SELECT
+   new_confirmed - lagInFrame(new_confirmed,1) OVER (PARTITION BY location_key ORDER BY date) AS confirmed_cases_delta,
+   new_confirmed,
+   location_key,
+   date
+FROM covid19
+WHERE location_key = 'US_DC';
+```
+
+The response look like:
+
+```response
+┌─confirmed_cases_delta─┬─new_confirmed─┬─location_key─┬───────date─┐
+│                     0 │             0 │ US_DC        │ 2020-03-08 │
+│                     2 │             2 │ US_DC        │ 2020-03-09 │
+│                    -2 │             0 │ US_DC        │ 2020-03-10 │
+│                     6 │             6 │ US_DC        │ 2020-03-11 │
+│                    -6 │             0 │ US_DC        │ 2020-03-12 │
+│                     0 │             0 │ US_DC        │ 2020-03-13 │
+│                     6 │             6 │ US_DC        │ 2020-03-14 │
+│                    -5 │             1 │ US_DC        │ 2020-03-15 │
+│                     4 │             5 │ US_DC        │ 2020-03-16 │
+│                     4 │             9 │ US_DC        │ 2020-03-17 │
+│                    -1 │             8 │ US_DC        │ 2020-03-18 │
+│                    24 │            32 │ US_DC        │ 2020-03-19 │
+│                   -26 │             6 │ US_DC        │ 2020-03-20 │
+│                    15 │            21 │ US_DC        │ 2020-03-21 │
+│                    -3 │            18 │ US_DC        │ 2020-03-22 │
+│                     3 │            21 │ US_DC        │ 2020-03-23 │
+```
+
+10. This query calculates the percentage of change in new cases each day, and includes a simple `increase` or `decrease` column in the result set:
+
+```sql
+WITH confirmed_lag AS (
+  SELECT
+    *,
+    lagInFrame(new_confirmed) OVER(
+      PARTITION BY location_key
+      ORDER BY date
+    ) AS confirmed_previous_day
+  FROM covid19
+),
+confirmed_percent_change AS (
+  SELECT
+    *,
+    COALESCE(ROUND((new_confirmed - confirmed_previous_day) / confirmed_previous_day * 100), 0) AS percent_change
+  FROM confirmed_lag
+)
+SELECT
+  date,
+  new_confirmed,
+  percent_change,
+  CASE
+    WHEN percent_change > 0 THEN 'increase'
+    WHEN percent_change = 0 THEN 'no change'
+    ELSE 'decrease'
+  END AS trend
+FROM confirmed_percent_change
+WHERE location_key = 'US_DC';
+```
+
+The results look like
+
+```response
+┌───────date─┬─new_confirmed─┬─percent_change─┬─trend─────┐
+│ 2020-03-08 │             0 │            nan │ decrease  │
+│ 2020-03-09 │             2 │            inf │ increase  │
+│ 2020-03-10 │             0 │           -100 │ decrease  │
+│ 2020-03-11 │             6 │            inf │ increase  │
+│ 2020-03-12 │             0 │           -100 │ decrease  │
+│ 2020-03-13 │             0 │            nan │ decrease  │
+│ 2020-03-14 │             6 │            inf │ increase  │
+│ 2020-03-15 │             1 │            -83 │ decrease  │
+│ 2020-03-16 │             5 │            400 │ increase  │
+│ 2020-03-17 │             9 │             80 │ increase  │
+│ 2020-03-18 │             8 │            -11 │ decrease  │
+│ 2020-03-19 │            32 │            300 │ increase  │
+│ 2020-03-20 │             6 │            -81 │ decrease  │
+│ 2020-03-21 │            21 │            250 │ increase  │
+│ 2020-03-22 │            18 │            -14 │ decrease  │
+│ 2020-03-23 │            21 │             17 │ increase  │
+│ 2020-03-24 │            46 │            119 │ increase  │
+│ 2020-03-25 │            48 │              4 │ increase  │
+│ 2020-03-26 │            36 │            -25 │ decrease  │
+│ 2020-03-27 │            37 │              3 │ increase  │
+│ 2020-03-28 │            38 │              3 │ increase  │
+│ 2020-03-29 │            59 │             55 │ increase  │
+│ 2020-03-30 │            94 │             59 │ increase  │
+│ 2020-03-31 │            91 │             -3 │ decrease  │
+│ 2020-04-01 │            67 │            -26 │ decrease  │
+│ 2020-04-02 │           104 │             55 │ increase  │
+│ 2020-04-03 │           145 │             39 │ increase  │
+```
+
+:::note
+As mentioned in the [GitHub repo](https://github.com/GoogleCloudPlatform/covid-19-open-data), the dataset is no longer updated as of September 15, 2022.
+:::
\ No newline at end of file
diff --git a/docs/en/getting-started/example-datasets/criteo.md b/docs/en/getting-started/example-datasets/criteo.md
index 3bd0230d4cc..a2e0fda0cb0 100644
--- a/docs/en/getting-started/example-datasets/criteo.md
+++ b/docs/en/getting-started/example-datasets/criteo.md
@@ -3,14 +3,56 @@ slug: /en/getting-started/example-datasets/criteo
 sidebar_label: Terabyte Click Logs from Criteo
 ---
 
-# Terabyte of Click Logs from Criteo 
+# Terabyte of Click Logs from Criteo
 
 Download the data from http://labs.criteo.com/downloads/download-terabyte-click-logs/
 
 Create a table to import the log to:
 
 ``` sql
-CREATE TABLE criteo_log (date Date, clicked UInt8, int1 Int32, int2 Int32, int3 Int32, int4 Int32, int5 Int32, int6 Int32, int7 Int32, int8 Int32, int9 Int32, int10 Int32, int11 Int32, int12 Int32, int13 Int32, cat1 String, cat2 String, cat3 String, cat4 String, cat5 String, cat6 String, cat7 String, cat8 String, cat9 String, cat10 String, cat11 String, cat12 String, cat13 String, cat14 String, cat15 String, cat16 String, cat17 String, cat18 String, cat19 String, cat20 String, cat21 String, cat22 String, cat23 String, cat24 String, cat25 String, cat26 String) ENGINE = Log
+CREATE TABLE criteo_log (
+    date Date,
+    clicked UInt8,
+    int1 Int32,
+    int2 Int32,
+    int3 Int32,
+    int4 Int32,
+    int5 Int32,
+    int6 Int32,
+    int7 Int32,
+    int8 Int32,
+    int9 Int32,
+    int10 Int32,
+    int11 Int32,
+    int12 Int32,
+    int13 Int32,
+    cat1 String,
+    cat2 String,
+    cat3 String,
+    cat4 String,
+    cat5 String,
+    cat6 String,
+    cat7 String,
+    cat8 String,
+    cat9 String,
+    cat10 String,
+    cat11 String,
+    cat12 String,
+    cat13 String,
+    cat14 String,
+    cat15 String,
+    cat16 String,
+    cat17 String,
+    cat18 String,
+    cat19 String,
+    cat20 String,
+    cat21 String,
+    cat22 String,
+    cat23 String,
+    cat24 String,
+    cat25 String,
+    cat26 String
+) ENGINE = Log;
 ```
 
 Download the data:
@@ -73,7 +115,52 @@ ORDER BY (date, icat1)
 Transform data from the raw log and put it in the second table:
 
 ``` sql
-INSERT INTO criteo SELECT date, clicked, int1, int2, int3, int4, int5, int6, int7, int8, int9, int10, int11, int12, int13, reinterpretAsUInt32(unhex(cat1)) AS icat1, reinterpretAsUInt32(unhex(cat2)) AS icat2, reinterpretAsUInt32(unhex(cat3)) AS icat3, reinterpretAsUInt32(unhex(cat4)) AS icat4, reinterpretAsUInt32(unhex(cat5)) AS icat5, reinterpretAsUInt32(unhex(cat6)) AS icat6, reinterpretAsUInt32(unhex(cat7)) AS icat7, reinterpretAsUInt32(unhex(cat8)) AS icat8, reinterpretAsUInt32(unhex(cat9)) AS icat9, reinterpretAsUInt32(unhex(cat10)) AS icat10, reinterpretAsUInt32(unhex(cat11)) AS icat11, reinterpretAsUInt32(unhex(cat12)) AS icat12, reinterpretAsUInt32(unhex(cat13)) AS icat13, reinterpretAsUInt32(unhex(cat14)) AS icat14, reinterpretAsUInt32(unhex(cat15)) AS icat15, reinterpretAsUInt32(unhex(cat16)) AS icat16, reinterpretAsUInt32(unhex(cat17)) AS icat17, reinterpretAsUInt32(unhex(cat18)) AS icat18, reinterpretAsUInt32(unhex(cat19)) AS icat19, reinterpretAsUInt32(unhex(cat20)) AS icat20, reinterpretAsUInt32(unhex(cat21)) AS icat21, reinterpretAsUInt32(unhex(cat22)) AS icat22, reinterpretAsUInt32(unhex(cat23)) AS icat23, reinterpretAsUInt32(unhex(cat24)) AS icat24, reinterpretAsUInt32(unhex(cat25)) AS icat25, reinterpretAsUInt32(unhex(cat26)) AS icat26 FROM criteo_log;
+INSERT INTO
+    criteo
+SELECT
+    date,
+    clicked,
+    int1,
+    int2,
+    int3,
+    int4,
+    int5,
+    int6,
+    int7,
+    int8,
+    int9,
+    int10,
+    int11,
+    int12,
+    int13,
+    reinterpretAsUInt32(unhex(cat1)) AS icat1,
+    reinterpretAsUInt32(unhex(cat2)) AS icat2,
+    reinterpretAsUInt32(unhex(cat3)) AS icat3,
+    reinterpretAsUInt32(unhex(cat4)) AS icat4,
+    reinterpretAsUInt32(unhex(cat5)) AS icat5,
+    reinterpretAsUInt32(unhex(cat6)) AS icat6,
+    reinterpretAsUInt32(unhex(cat7)) AS icat7,
+    reinterpretAsUInt32(unhex(cat8)) AS icat8,
+    reinterpretAsUInt32(unhex(cat9)) AS icat9,
+    reinterpretAsUInt32(unhex(cat10)) AS icat10,
+    reinterpretAsUInt32(unhex(cat11)) AS icat11,
+    reinterpretAsUInt32(unhex(cat12)) AS icat12,
+    reinterpretAsUInt32(unhex(cat13)) AS icat13,
+    reinterpretAsUInt32(unhex(cat14)) AS icat14,
+    reinterpretAsUInt32(unhex(cat15)) AS icat15,
+    reinterpretAsUInt32(unhex(cat16)) AS icat16,
+    reinterpretAsUInt32(unhex(cat17)) AS icat17,
+    reinterpretAsUInt32(unhex(cat18)) AS icat18,
+    reinterpretAsUInt32(unhex(cat19)) AS icat19,
+    reinterpretAsUInt32(unhex(cat20)) AS icat20,
+    reinterpretAsUInt32(unhex(cat21)) AS icat21,
+    reinterpretAsUInt32(unhex(cat22)) AS icat22,
+    reinterpretAsUInt32(unhex(cat23)) AS icat23,
+    reinterpretAsUInt32(unhex(cat24)) AS icat24,
+    reinterpretAsUInt32(unhex(cat25)) AS icat25,
+    reinterpretAsUInt32(unhex(cat26)) AS icat26
+FROM
+    criteo_log;
 
 DROP TABLE criteo_log;
 ```
diff --git a/docs/en/getting-started/example-datasets/environmental-sensors.md b/docs/en/getting-started/example-datasets/environmental-sensors.md
new file mode 100644
index 00000000000..309a6dc6c0f
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/environmental-sensors.md
@@ -0,0 +1,172 @@
+---
+slug: /en/getting-started/example-datasets/environmental-sensors
+sidebar_label: Environmental Sensors Data
+---
+
+# Environmental Sensors Data
+
+[Sensor.Community](https://sensor.community/en/) is a contributors-driven global sensor network that creates Open Environmental Data. The data is collected from sensors all over the globe. Anyone can purchase a sensor and place it wherever they like. The APIs to download the data is in [GitHub](https://github.com/opendata-stuttgart/meta/wiki/APIs) and the data is freely available under the [Database Contents License (DbCL)](https://opendatacommons.org/licenses/dbcl/1-0/).
+
+:::important
+The dataset has over 20 billion records, so be careful just copying-and-pasting the commands below unless your resources can handle that type of volume. The commands below were executed on a **Production** instance of [ClickHouse Cloud](https://clickhouse.cloud).
+:::
+
+1. The data is in S3, so we can use the `s3` table function to create a table from the files. We can also query the data in place. Let's look at a few rows before attempting to insert it into ClickHouse:
+
+```sql
+SELECT *
+FROM s3(
+    'https://clickhouse-public-datasets.s3.eu-central-1.amazonaws.com/sensors/monthly/2019-06_bmp180.csv.zst',
+    'CSVWithNames'
+   )
+LIMIT 10
+SETTINGS format_csv_delimiter = ';';
+```
+
+The data is in CSV files but uses a semi-colon for the delimiter. The rows look like:
+
+```response
+┌─sensor_id─┬─sensor_type─┬─location─┬────lat─┬────lon─┬─timestamp───────────┬──pressure─┬─altitude─┬─pressure_sealevel─┬─temperature─┐
+│      9119 │ BMP180      │     4594 │ 50.994 │  7.126 │ 2019-06-01T00:00:00 │    101471 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ              │        19.9 │
+│     21210 │ BMP180      │    10762 │ 42.206 │ 25.326 │ 2019-06-01T00:00:00 │     99525 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ              │        19.3 │
+│     19660 │ BMP180      │     9978 │ 52.434 │ 17.056 │ 2019-06-01T00:00:04 │    101570 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ              │        15.3 │
+│     12126 │ BMP180      │     6126 │ 57.908 │  16.49 │ 2019-06-01T00:00:05 │ 101802.56 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ              │        8.07 │
+│     15845 │ BMP180      │     8022 │ 52.498 │ 13.466 │ 2019-06-01T00:00:05 │    101878 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ              │          23 │
+│     16415 │ BMP180      │     8316 │ 49.312 │  6.744 │ 2019-06-01T00:00:06 │    100176 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ              │        14.7 │
+│      7389 │ BMP180      │     3735 │ 50.136 │ 11.062 │ 2019-06-01T00:00:06 │     98905 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ              │        12.1 │
+│     13199 │ BMP180      │     6664 │ 52.514 │  13.44 │ 2019-06-01T00:00:07 │ 101855.54 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ              │       19.74 │
+│     12753 │ BMP180      │     6440 │ 44.616 │  2.032 │ 2019-06-01T00:00:07 │     99475 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ              │          17 │
+│     16956 │ BMP180      │     8594 │ 52.052 │ 8.354 │ 2019-06-01T00:00:08 │   101322 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ              │        17.2 │
+└───────────┴─────────────┴──────────┴────────┴───────┴─────────────────────┴──────────┴──────────┴───────────────────┴─────────────┘
+```
+
+2. We will use the following `MergeTree` table to store the data in ClickHouse:
+
+```sql
+CREATE TABLE sensors
+(
+    sensor_id UInt16,
+    sensor_type Enum('BME280', 'BMP180', 'BMP280', 'DHT22', 'DS18B20', 'HPM', 'HTU21D', 'PMS1003', 'PMS3003', 'PMS5003', 'PMS6003', 'PMS7003', 'PPD42NS', 'SDS011'),
+    location UInt32,
+    lat Float32,
+    lon Float32,
+    timestamp DateTime,
+    P1 Float32,
+    P2 Float32,
+    P0 Float32,
+    durP1 Float32,
+    ratioP1 Float32,
+    durP2 Float32,
+    ratioP2 Float32,
+    pressure Float32,
+    altitude Float32,
+    pressure_sealevel Float32,
+    temperature Float32,
+    humidity Float32,
+    date Date MATERIALIZED toDate(timestamp)
+)
+ENGINE = MergeTree
+ORDER BY (timestamp, sensor_id);
+```
+
+3. ClickHouse Cloud services have a cluster named `default`. We will use the `s3Cluster` table function, which reads S3 files in parallel from the nodes in your cluster. (If you do not have a cluster, just use the `s3` function and remove the cluster name.)
+
+This query will take a while - it's about 1.67T of data uncompressed:
+
+```sql
+INSERT INTO sensors
+    SELECT *
+    FROM s3Cluster(
+        'default',
+        'https://clickhouse-public-datasets.s3.amazonaws.com/sensors/monthly/*.csv.zst',
+        'CSVWithNames',
+        $$ sensor_id UInt16,
+        sensor_type String,
+        location UInt32,
+        lat Float32,
+        lon Float32,
+        timestamp DateTime,
+        P1 Float32,
+        P2 Float32,
+        P0 Float32,
+        durP1 Float32,
+        ratioP1 Float32,
+        durP2 Float32,
+        ratioP2 Float32,
+        pressure Float32,
+        altitude Float32,
+        pressure_sealevel Float32,
+        temperature Float32,
+        humidity Float32 $$
+    )
+SETTINGS
+    format_csv_delimiter = ';',
+    input_format_allow_errors_ratio = '0.5',
+    input_format_allow_errors_num = 10000,
+    input_format_parallel_parsing = 0,
+    date_time_input_format = 'best_effort',
+    max_insert_threads = 32,
+    parallel_distributed_insert_select = 1;
+```
+
+Here is the response - showing the number of rows and the speed of processing. It is input at a rate of over 6M rows per second!
+
+```response
+0 rows in set. Elapsed: 3419.330 sec. Processed 20.69 billion rows, 1.67 TB (6.05 million rows/s., 488.52 MB/s.)
+```
+
+4. Let's see how much storage disk is needed for the `sensors` table:
+
+```sql
+SELECT
+    disk_name,
+    formatReadableSize(sum(data_compressed_bytes) AS size) AS compressed,
+    formatReadableSize(sum(data_uncompressed_bytes) AS usize) AS uncompressed,
+    round(usize / size, 2) AS compr_rate,
+    sum(rows) AS rows,
+    count() AS part_count
+FROM system.parts
+WHERE (active = 1) AND (table = 'sensors')
+GROUP BY
+    disk_name
+ORDER BY size DESC;
+```
+
+The 1.67T is compressed down to 310 GiB, and there are 20.69 billion rows:
+
+```response
+┌─disk_name─┬─compressed─┬─uncompressed─┬─compr_rate─┬────────rows─┬─part_count─┐
+│ s3disk    │ 310.21 GiB │ 1.30 TiB     │       4.29 │ 20693971809 │        472 │
+└───────────┴────────────┴──────────────┴────────────┴─────────────┴────────────┘
+```
+
+5. Let's analyze the data now that it's in ClickHouse. Notice the quantity of data increases over time as more sensors are deployed:
+
+```sql
+SELECT
+    date,
+    count()
+FROM sensors
+GROUP BY date
+ORDER BY date ASC;
+```
+
+We can create a chart in the SQL Console to visualize the results:
+
+![Number of events per day](./images/sensors_01.png)
+
+6. This query counts the number of overly hot and humid days:
+
+```sql
+WITH
+    toYYYYMMDD(timestamp) AS day
+SELECT day, count() FROM sensors
+WHERE temperature >= 40 AND temperature <= 50 AND humidity >= 90
+GROUP BY day
+ORDER BY day asc;
+```
+
+Here's a visualization of the result:
+
+![Hot and humid days](./images/sensors_02.png)
+
diff --git a/docs/en/getting-started/example-datasets/github.md b/docs/en/getting-started/example-datasets/github.md
index 239637a34e9..02965ed5e33 100644
--- a/docs/en/getting-started/example-datasets/github.md
+++ b/docs/en/getting-started/example-datasets/github.md
@@ -1,12 +1,13 @@
 ---
 slug: /en/getting-started/example-datasets/github
-sidebar_label: GitHub Repo Analysis
+sidebar_label: Github Repo
+sidebar_position: 1
 description: Analyze the ClickHouse GitHub repo or any repository of your choosing
 ---
 
-# ClickHouse GitHub data
+# Writing Queries in ClickHouse using GitHub Data
 
-This dataset contains all of the commits and changes for the ClickHouse repository. It can be generated using the native `git-import` tool distributed with ClickHouse. 
+This dataset contains all of the commits and changes for the ClickHouse repository. It can be generated using the native `git-import` tool distributed with ClickHouse.
 
 The generated data provides a `tsv` file for each of the following tables:
 
@@ -323,7 +324,7 @@ Note a more complex variant of this query exists where we find the [line-by-line
 
 ## Find the current active files
 
-This is important for later analysis when we only want to consider the current files in the repository. We estimate this set as the files which haven't been renamed or deleted (and then re-added/re-named). 
+This is important for later analysis when we only want to consider the current files in the repository. We estimate this set as the files which haven't been renamed or deleted (and then re-added/re-named).
 
 **Note there appears to have been a broken commit history in relation to files under the `dbms`, `libs`, `tests/testflows/` directories during their renames. We also thus exclude these.**
 
@@ -417,7 +418,7 @@ git ls-files | grep -v -E 'generated\.cpp|^(contrib|docs?|website|libs/(libcityh
 
 The difference here is caused by a few factors:
 
-- A rename can occur alongside other modifications to the file. These are listed as separate events in file_changes but with the same time. The `argMax` function has no way of distinguishing these - it picks the first value. The natural ordering of the inserts (the only means of knowing the correct order) is not maintained across the union so modified events can be selected. For example, below the `src/Functions/geometryFromColumn.h` file has several modifications before being renamed to `src/Functions/geometryConverters.h`. Our current solution may pick a Modify event as the latest change causing `src/Functions/geometryFromColumn.h` to be retained. 
+- A rename can occur alongside other modifications to the file. These are listed as separate events in file_changes but with the same time. The `argMax` function has no way of distinguishing these - it picks the first value. The natural ordering of the inserts (the only means of knowing the correct order) is not maintained across the union so modified events can be selected. For example, below the `src/Functions/geometryFromColumn.h` file has several modifications before being renamed to `src/Functions/geometryConverters.h`. Our current solution may pick a Modify event as the latest change causing `src/Functions/geometryFromColumn.h` to be retained.
 
 [play](https://play.clickhouse.com/play?user=play#U0VMRUNUCiAgICAgIGNoYW5nZV90eXBlLAogICAgICBwYXRoLAogICAgICBvbGRfcGF0aCwKICAgICAgdGltZSwKICAgICAgY29tbWl0X2hhc2gKICBGUk9NIGdpdF9jbGlja2hvdXNlLmZpbGVfY2hhbmdlcwogIFdIRVJFIChwYXRoID0gJ3NyYy9GdW5jdGlvbnMvZ2VvbWV0cnlGcm9tQ29sdW1uLmgnKSBPUiAob2xkX3BhdGggPSAnc3JjL0Z1bmN0aW9ucy9nZW9tZXRyeUZyb21Db2x1bW4uaCcpCg==)
 
@@ -1386,7 +1387,7 @@ LIMIT 1 BY day_of_week
 7 rows in set. Elapsed: 0.004 sec. Processed 21.82 thousand rows, 140.02 KB (4.88 million rows/s., 31.29 MB/s.)
 ```
 
-This is still a little simple and doesn't reflect people's work. 
+This is still a little simple and doesn't reflect people's work.
 
 A better metric might be who is the top contributor each day as a fraction of the total work performed in the last year. Note that we treat the deletion and adding code equally.
 
@@ -1952,7 +1953,7 @@ SELECT
 
 Most contributors write more code than tests, as you'd expect.
 
-What about who adds the most comments when contributing code? 
+What about who adds the most comments when contributing code?
 
 [play](https://play.clickhouse.com/play?user=play#U0VMRUNUCiAgICBhdXRob3IsCiAgICBhdmcocmF0aW9fY29tbWVudHMpIEFTIGF2Z19yYXRpb19jb21tZW50cywKICAgIHN1bShjb2RlKSBBUyBjb2RlCkZST00KKAogICAgU0VMRUNUCiAgICAgICAgYXV0aG9yLAogICAgICAgIGNvbW1pdF9oYXNoLAogICAgICAgIGNvdW50SWYobGluZV90eXBlID0gJ0NvbW1lbnQnKSBBUyBjb21tZW50cywKICAgICAgICBjb3VudElmKGxpbmVfdHlwZSA9ICdDb2RlJykgQVMgY29kZSwKICAgICAgICBpZihjb21tZW50cyA+IDAsIGNvbW1lbnRzIC8gKGNvbW1lbnRzICsgY29kZSksIDApIEFTIHJhdGlvX2NvbW1lbnRzCiAgICBGUk9NIGdpdF9jbGlja2hvdXNlLmxpbmVfY2hhbmdlcwogICAgR1JPVVAgQlkKICAgICAgICBhdXRob3IsCiAgICAgICAgY29tbWl0X2hhc2gKKQpHUk9VUCBCWSBhdXRob3IKT1JERVIgQlkgY29kZSBERVNDCkxJTUlUIDEwCg==)
 
@@ -2393,7 +2394,7 @@ WHERE (path = 'src/Storages/StorageReplicatedMergeTree.cpp') AND (change_type =
 
 This makes viewing the full history of a file challenging since we don't have a single value connecting all line or file changes.
 
-To address this, we can use User Defined Functions (UDFs). These cannot, currently, be recursive, so to identify the history of a file we must define a series of UDFs which call each other explicitly. 
+To address this, we can use User Defined Functions (UDFs). These cannot, currently, be recursive, so to identify the history of a file we must define a series of UDFs which call each other explicitly.
 
 This means we can only track renames to a maximum depth - the below example is 5 deep. It is unlikely a file will be renamed more times than this, so for now, this is sufficient.
 
@@ -2498,7 +2499,9 @@ LIMIT 20
 We welcome exact and improved solutions here.
 
 
-# Related Content
+## Related Content
 
-- [Git commits and our community](https://clickhouse.com/blog/clickhouse-git-community-commits)
-- [Window and array functions for Git commit sequences](https://clickhouse.com/blog/clickhouse-window-array-functions-git-commits)
+- Blog: [Git commits and our community](https://clickhouse.com/blog/clickhouse-git-community-commits)
+- Blog: [Window and array functions for Git commit sequences](https://clickhouse.com/blog/clickhouse-window-array-functions-git-commits)
+- Blog: [Building a Real-time Analytics Apps with ClickHouse and Hex](https://clickhouse.com/blog/building-real-time-applications-with-clickhouse-and-hex-notebook-keeper-engine)
+- Blog: [A Story of Open-source GitHub Activity using ClickHouse + Grafana](https://clickhouse.com/blog/introduction-to-clickhouse-and-grafana-webinar)
diff --git a/docs/en/getting-started/example-datasets/images/sensors_01.png b/docs/en/getting-started/example-datasets/images/sensors_01.png
new file mode 100644
index 00000000000..1804bda6d1b
Binary files /dev/null and b/docs/en/getting-started/example-datasets/images/sensors_01.png differ
diff --git a/docs/en/getting-started/example-datasets/images/sensors_02.png b/docs/en/getting-started/example-datasets/images/sensors_02.png
new file mode 100644
index 00000000000..8226f4578d0
Binary files /dev/null and b/docs/en/getting-started/example-datasets/images/sensors_02.png differ
diff --git a/docs/en/getting-started/example-datasets/metrica.md b/docs/en/getting-started/example-datasets/metrica.md
index e966f6c20d6..e21237f39bb 100644
--- a/docs/en/getting-started/example-datasets/metrica.md
+++ b/docs/en/getting-started/example-datasets/metrica.md
@@ -84,7 +84,7 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
 1680609
 ```
 
-## An example JOIN 
+## An example JOIN
 
 The hits and visits dataset is used in the ClickHouse test
 routines, this is one of the queries from the test suite. The rest
@@ -131,10 +131,10 @@ FORMAT PrettyCompact"
 
 ## Next Steps
 
-[A Practical Introduction to Sparse Primary Indexes in ClickHouse](../../guides/improving-query-performance/sparse-primary-indexes/sparse-primary-indexes-intro.md) uses the hits dataset to discuss the differences in ClickHouse indexing compared to traditional relational databases, how ClickHouse builds and uses a sparse primary index, and indexing best practices.
+[A Practical Introduction to Sparse Primary Indexes in ClickHouse](/docs/en/guides/best-practices/sparse-primary-indexes.md) uses the hits dataset to discuss the differences in ClickHouse indexing compared to traditional relational databases, how ClickHouse builds and uses a sparse primary index, and indexing best practices.
 
 Additional examples of queries to these tables can be found among the ClickHouse [stateful tests](https://github.com/ClickHouse/ClickHouse/blob/d7129855757f38ceec3e4ecc6dafacdabe9b178f/tests/queries/1_stateful/00172_parallel_join.sql).
 
 :::note
-The test suite uses a database name `test`, and the tables are named `hits` and `visits`.  You can rename your database and tables, or edit the SQL from the test file.  
+The test suite uses a database name `test`, and the tables are named `hits` and `visits`.  You can rename your database and tables, or edit the SQL from the test file.
 :::
diff --git a/docs/en/getting-started/example-datasets/nyc-taxi.md b/docs/en/getting-started/example-datasets/nyc-taxi.md
index 69098f63037..9730faa873c 100644
--- a/docs/en/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/en/getting-started/example-datasets/nyc-taxi.md
@@ -5,17 +5,19 @@ sidebar_position: 2
 description: Data for billions of taxi and for-hire vehicle (Uber, Lyft, etc.) trips originating in New York City since 2009
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
 # New York Taxi Data
 
 The New York taxi data consists of 3+ billion taxi and for-hire vehicle (Uber, Lyft, etc.) trips originating in New York City since 2009. The dataset can be obtained in a couple of ways:
 
-- insert the data directly into ClickHouse Cloud from S3
+- insert the data directly into ClickHouse Cloud from S3 or GCS
 - download prepared partitions
 
-## Retrieve the Data from S3
+## Create the table trips
 
-Let's grab a small subset of the data for getting familiar with it. The data is in TSV files in AWS S3, which is easily streamed into
-ClickHouse Cloud using the `s3` table function. Start by creating a table for the taxi rides:
+Start by creating a table for the taxi rides:
 
 ```sql
 CREATE TABLE trips (
@@ -38,9 +40,50 @@ CREATE TABLE trips (
     dropoff_ntaname     LowCardinality(String)
 )
 ENGINE = MergeTree
-PRIMARY KEY (pickup_datetime, dropoff_datetime)
+PRIMARY KEY (pickup_datetime, dropoff_datetime);
 ```
 
+## Load the Data directly from Object Storage
+
+Let's grab a small subset of the data for getting familiar with it. The data is in TSV files in object storage, which is easily streamed into
+ClickHouse Cloud using the `s3` table function. 
+
+The same data is stored in both S3 and GCS; choose either tab.
+
+<Tabs groupId="storageVendor">
+<TabItem value="gcs" label="GCS" default>
+
+The following command streams three files from a GCS bucket into the `trips` table (the `{0..2}` syntax is a wildcard for the values 0, 1, and 2):
+
+```sql
+INSERT INTO trips
+SELECT
+    trip_id,
+    pickup_datetime,
+    dropoff_datetime,
+    pickup_longitude,
+    pickup_latitude,
+    dropoff_longitude,
+    dropoff_latitude,
+    passenger_count,
+    trip_distance,
+    fare_amount,
+    extra,
+    tip_amount,
+    tolls_amount,
+    total_amount,
+    payment_type,
+    pickup_ntaname,
+    dropoff_ntaname
+FROM s3(
+    'https://storage.googleapis.com/clickhouse-public-datasets/nyc-taxi/trips_{0..2}.gz',
+    'TabSeparatedWithNames'
+);
+```
+
+</TabItem>
+<TabItem value="s3" label="S3">
+
 The following command streams three files from an S3 bucket into the `trips` table (the `{0..2}` syntax is a wildcard for the values 0, 1, and 2):
 
 ```sql
@@ -66,14 +109,19 @@ SELECT
 FROM s3(
     'https://datasets-documentation.s3.eu-west-3.amazonaws.com/nyc-taxi/trips_{0..2}.gz',
     'TabSeparatedWithNames'
-)
+);
 ```
 
+</TabItem>
+</Tabs>
+
+## Sample Queries
+
 Let's see how many rows were inserted:
 
 ```sql
 SELECT count()
-FROM trips
+FROM trips;
 ```
 
 Each TSV file has about 1M rows, and the three files have 3,000,317 rows. Let's look at a few rows:
@@ -81,7 +129,7 @@ Each TSV file has about 1M rows, and the three files have 3,000,317 rows. Let's
 ```sql
 SELECT *
 FROM trips
-LIMIT 10
+LIMIT 10;
 ```
 
 Notice there are columns for the pickup and dropoff dates, geo coordinates, fare details, New York neighborhoods, and more:
@@ -110,7 +158,7 @@ SELECT
 FROM trips
 GROUP BY pickup_ntaname
 ORDER BY count DESC
-LIMIT 10
+LIMIT 10;
 ```
 
 The result is:
@@ -137,7 +185,7 @@ SELECT
    passenger_count,
    avg(total_amount)
 FROM trips
-GROUP BY passenger_count
+GROUP BY passenger_count;
 ```
 
 ```response
@@ -165,7 +213,7 @@ SELECT
    count(*)
 FROM trips
 GROUP BY passenger_count, year, distance
-ORDER BY year, count(*) DESC
+ORDER BY year, count(*) DESC;
 ```
 
 The first part of the result is:
@@ -189,6 +237,10 @@ The first part of the result is:
 
 ## Download of Prepared Partitions {#download-of-prepared-partitions}
 
+:::note
+The following steps provide information about the original dataset, and a method for loading prepared partitions into a self-managed ClickHouse server environment.
+:::
+
 See https://github.com/toddwschneider/nyc-taxi-data and http://tech.marksblogg.com/billion-nyc-taxi-rides-redshift.html for the description of a dataset and instructions for downloading.
 
 Downloading will result in about 227 GB of uncompressed data in CSV files. The download takes about an hour over a 1 Gbit connection (parallel downloading from s3.amazonaws.com recovers at least half of a 1 Gbit channel).
@@ -211,7 +263,7 @@ If you will run the queries described below, you have to use the full table name
 Q1:
 
 ``` sql
-SELECT cab_type, count(*) FROM trips_mergetree GROUP BY cab_type
+SELECT cab_type, count(*) FROM trips_mergetree GROUP BY cab_type;
 ```
 
 0.490 seconds.
@@ -219,7 +271,7 @@ SELECT cab_type, count(*) FROM trips_mergetree GROUP BY cab_type
 Q2:
 
 ``` sql
-SELECT passenger_count, avg(total_amount) FROM trips_mergetree GROUP BY passenger_count
+SELECT passenger_count, avg(total_amount) FROM trips_mergetree GROUP BY passenger_count;
 ```
 
 1.224 seconds.
@@ -227,7 +279,7 @@ SELECT passenger_count, avg(total_amount) FROM trips_mergetree GROUP BY passenge
 Q3:
 
 ``` sql
-SELECT passenger_count, toYear(pickup_date) AS year, count(*) FROM trips_mergetree GROUP BY passenger_count, year
+SELECT passenger_count, toYear(pickup_date) AS year, count(*) FROM trips_mergetree GROUP BY passenger_count, year;
 ```
 
 2.104 seconds.
@@ -238,7 +290,7 @@ Q4:
 SELECT passenger_count, toYear(pickup_date) AS year, round(trip_distance) AS distance, count(*)
 FROM trips_mergetree
 GROUP BY passenger_count, year, distance
-ORDER BY year, count(*) DESC
+ORDER BY year, count(*) DESC;
 ```
 
 3.593 seconds.
@@ -254,19 +306,19 @@ Creating a table on three servers:
 On each server:
 
 ``` sql
-CREATE TABLE default.trips_mergetree_third ( trip_id UInt32,  vendor_id Enum8('1' = 1, '2' = 2, 'CMT' = 3, 'VTS' = 4, 'DDS' = 5, 'B02512' = 10, 'B02598' = 11, 'B02617' = 12, 'B02682' = 13, 'B02764' = 14),  pickup_date Date,  pickup_datetime DateTime,  dropoff_date Date,  dropoff_datetime DateTime,  store_and_fwd_flag UInt8,  rate_code_id UInt8,  pickup_longitude Float64,  pickup_latitude Float64,  dropoff_longitude Float64,  dropoff_latitude Float64,  passenger_count UInt8,  trip_distance Float64,  fare_amount Float32,  extra Float32,  mta_tax Float32,  tip_amount Float32,  tolls_amount Float32,  ehail_fee Float32,  improvement_surcharge Float32,  total_amount Float32,  payment_type_ Enum8('UNK' = 0, 'CSH' = 1, 'CRE' = 2, 'NOC' = 3, 'DIS' = 4),  trip_type UInt8,  pickup FixedString(25),  dropoff FixedString(25),  cab_type Enum8('yellow' = 1, 'green' = 2, 'uber' = 3),  pickup_nyct2010_gid UInt8,  pickup_ctlabel Float32,  pickup_borocode UInt8,  pickup_boroname Enum8('' = 0, 'Manhattan' = 1, 'Bronx' = 2, 'Brooklyn' = 3, 'Queens' = 4, 'Staten Island' = 5),  pickup_ct2010 FixedString(6),  pickup_boroct2010 FixedString(7),  pickup_cdeligibil Enum8(' ' = 0, 'E' = 1, 'I' = 2),  pickup_ntacode FixedString(4),  pickup_ntaname Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195),  pickup_puma UInt16,  dropoff_nyct2010_gid UInt8,  dropoff_ctlabel Float32,  dropoff_borocode UInt8,  dropoff_boroname Enum8('' = 0, 'Manhattan' = 1, 'Bronx' = 2, 'Brooklyn' = 3, 'Queens' = 4, 'Staten Island' = 5),  dropoff_ct2010 FixedString(6),  dropoff_boroct2010 FixedString(7),  dropoff_cdeligibil Enum8(' ' = 0, 'E' = 1, 'I' = 2),  dropoff_ntacode FixedString(4),  dropoff_ntaname Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195),  dropoff_puma UInt16) ENGINE = MergeTree(pickup_date, pickup_datetime, 8192)
+CREATE TABLE default.trips_mergetree_third ( trip_id UInt32,  vendor_id Enum8('1' = 1, '2' = 2, 'CMT' = 3, 'VTS' = 4, 'DDS' = 5, 'B02512' = 10, 'B02598' = 11, 'B02617' = 12, 'B02682' = 13, 'B02764' = 14),  pickup_date Date,  pickup_datetime DateTime,  dropoff_date Date,  dropoff_datetime DateTime,  store_and_fwd_flag UInt8,  rate_code_id UInt8,  pickup_longitude Float64,  pickup_latitude Float64,  dropoff_longitude Float64,  dropoff_latitude Float64,  passenger_count UInt8,  trip_distance Float64,  fare_amount Float32,  extra Float32,  mta_tax Float32,  tip_amount Float32,  tolls_amount Float32,  ehail_fee Float32,  improvement_surcharge Float32,  total_amount Float32,  payment_type_ Enum8('UNK' = 0, 'CSH' = 1, 'CRE' = 2, 'NOC' = 3, 'DIS' = 4),  trip_type UInt8,  pickup FixedString(25),  dropoff FixedString(25),  cab_type Enum8('yellow' = 1, 'green' = 2, 'uber' = 3),  pickup_nyct2010_gid UInt8,  pickup_ctlabel Float32,  pickup_borocode UInt8,  pickup_boroname Enum8('' = 0, 'Manhattan' = 1, 'Bronx' = 2, 'Brooklyn' = 3, 'Queens' = 4, 'Staten Island' = 5),  pickup_ct2010 FixedString(6),  pickup_boroct2010 FixedString(7),  pickup_cdeligibil Enum8(' ' = 0, 'E' = 1, 'I' = 2),  pickup_ntacode FixedString(4),  pickup_ntaname Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195),  pickup_puma UInt16,  dropoff_nyct2010_gid UInt8,  dropoff_ctlabel Float32,  dropoff_borocode UInt8,  dropoff_boroname Enum8('' = 0, 'Manhattan' = 1, 'Bronx' = 2, 'Brooklyn' = 3, 'Queens' = 4, 'Staten Island' = 5),  dropoff_ct2010 FixedString(6),  dropoff_boroct2010 FixedString(7),  dropoff_cdeligibil Enum8(' ' = 0, 'E' = 1, 'I' = 2),  dropoff_ntacode FixedString(4),  dropoff_ntaname Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195),  dropoff_puma UInt16) ENGINE = MergeTree(pickup_date, pickup_datetime, 8192);
 ```
 
 On the source server:
 
 ``` sql
-CREATE TABLE trips_mergetree_x3 AS trips_mergetree_third ENGINE = Distributed(perftest, default, trips_mergetree_third, rand())
+CREATE TABLE trips_mergetree_x3 AS trips_mergetree_third ENGINE = Distributed(perftest, default, trips_mergetree_third, rand());
 ```
 
 The following query redistributes data:
 
 ``` sql
-INSERT INTO trips_mergetree_x3 SELECT * FROM trips_mergetree
+INSERT INTO trips_mergetree_x3 SELECT * FROM trips_mergetree;
 ```
 
 This takes 2454 seconds.
diff --git a/docs/en/getting-started/example-datasets/nypd_complaint_data.md b/docs/en/getting-started/example-datasets/nypd_complaint_data.md
index 8b02ac23cf9..a178fe456a6 100644
--- a/docs/en/getting-started/example-datasets/nypd_complaint_data.md
+++ b/docs/en/getting-started/example-datasets/nypd_complaint_data.md
@@ -16,7 +16,7 @@ While working through this guide you will:
 
 The dataset used in this guide comes from the NYC Open Data team, and contains data about "all valid felony, misdemeanor, and violation crimes reported to the New York City Police Department (NYPD)". At the time of writing, the data file is 166MB, but it is updated regularly.
 
-**Source**: [data.cityofnewyork.us](https://data.cityofnewyork.us/Public-Safety/NYPD-Complaint-Data-Current-Year-To-Date-/5uac-w243)  
+**Source**: [data.cityofnewyork.us](https://data.cityofnewyork.us/Public-Safety/NYPD-Complaint-Data-Current-Year-To-Date-/5uac-w243)
 **Terms of use**: https://www1.nyc.gov/home/terms-of-use.page
 
 ## Prerequisites
@@ -35,7 +35,7 @@ The examples in this guide assume that you have saved the TSV file to `${HOME}/N
 
 ## Familiarize yourself with the TSV file
 
-Before starting to work with the ClickHouse database familiarize yourself with the data. 
+Before starting to work with the ClickHouse database familiarize yourself with the data.
 
 ### Look at the fields in the source TSV file
 
@@ -47,15 +47,15 @@ clickhouse-local --query \
 
 Sample response
 ```response
-CMPLNT_NUM                  Nullable(Float64)					
-ADDR_PCT_CD                 Nullable(Float64)					
-BORO_NM                     Nullable(String)					
-CMPLNT_FR_DT                Nullable(String)					
-CMPLNT_FR_TM                Nullable(String)					
+CMPLNT_NUM                  Nullable(Float64)
+ADDR_PCT_CD                 Nullable(Float64)
+BORO_NM                     Nullable(String)
+CMPLNT_FR_DT                Nullable(String)
+CMPLNT_FR_TM                Nullable(String)
 ```
 
 :::tip
-Most of the time the above command will let you know which fields in the input data are numeric, and which are strings, and which are tuples.  This is not always the case.  Because ClickHouse is routineley used with datasets containing billions of records there is a default number (100) of rows examined to [infer the schema](../../guides/developer/working-with-json/json-semi-structured.md/#relying-on-schema-inference) in order to avoid parsing billions of rows to infer the schema. The response below may not match what you see, as the dataset is updated several times each year. Looking at the Data Dictionary you can see that CMPLNT_NUM is specified as text, and not numeric.  By overriding the default of 100 rows for inference with the setting `SETTINGS input_format_max_rows_to_read_for_schema_inference=2000`
+Most of the time the above command will let you know which fields in the input data are numeric, and which are strings, and which are tuples.  This is not always the case.  Because ClickHouse is routineley used with datasets containing billions of records there is a default number (100) of rows examined to [infer the schema](/docs/en/integrations/data-ingestion/data-formats/json.md#relying-on-schema-inference) in order to avoid parsing billions of rows to infer the schema. The response below may not match what you see, as the dataset is updated several times each year. Looking at the Data Dictionary you can see that CMPLNT_NUM is specified as text, and not numeric.  By overriding the default of 100 rows for inference with the setting `SETTINGS input_format_max_rows_to_read_for_schema_inference=2000`
 you can get a better idea of the content.
 
 Note: as of version 22.5 the default is now 25,000 rows for inferring the schema, so only change the setting if you are on an older version or if you need more than 25,000 rows to be sampled.
@@ -65,46 +65,46 @@ Run this command at your command prompt.  You will be using `clickhouse-local` t
 ```sh
 clickhouse-local --input_format_max_rows_to_read_for_schema_inference=2000 \
 --query \
-"describe file('${HOME}/NYPD_Complaint_Data_Current__Year_To_Date_.tsv', 'TSVWithNames')" 
+"describe file('${HOME}/NYPD_Complaint_Data_Current__Year_To_Date_.tsv', 'TSVWithNames')"
 ```
 
 Result:
 ```response
-CMPLNT_NUM        Nullable(String)					
-ADDR_PCT_CD       Nullable(Float64)					
-BORO_NM           Nullable(String)					
-CMPLNT_FR_DT      Nullable(String)					
-CMPLNT_FR_TM      Nullable(String)					
-CMPLNT_TO_DT      Nullable(String)					
-CMPLNT_TO_TM      Nullable(String)					
-CRM_ATPT_CPTD_CD  Nullable(String)					
-HADEVELOPT        Nullable(String)					
-HOUSING_PSA       Nullable(Float64)					
-JURISDICTION_CODE Nullable(Float64)					
-JURIS_DESC        Nullable(String)					
-KY_CD             Nullable(Float64)					
-LAW_CAT_CD        Nullable(String)					
-LOC_OF_OCCUR_DESC Nullable(String)					
-OFNS_DESC         Nullable(String)					
-PARKS_NM          Nullable(String)					
-PATROL_BORO       Nullable(String)					
-PD_CD             Nullable(Float64)					
-PD_DESC           Nullable(String)					
-PREM_TYP_DESC     Nullable(String)					
-RPT_DT            Nullable(String)					
-STATION_NAME      Nullable(String)					
-SUSP_AGE_GROUP    Nullable(String)					
-SUSP_RACE         Nullable(String)					
-SUSP_SEX          Nullable(String)					
-TRANSIT_DISTRICT  Nullable(Float64)					
-VIC_AGE_GROUP     Nullable(String)					
-VIC_RACE          Nullable(String)					
-VIC_SEX           Nullable(String)					
-X_COORD_CD        Nullable(Float64)					
-Y_COORD_CD        Nullable(Float64)					
-Latitude          Nullable(Float64)					
-Longitude         Nullable(Float64)					
-Lat_Lon           Tuple(Nullable(Float64), Nullable(Float64))					
+CMPLNT_NUM        Nullable(String)
+ADDR_PCT_CD       Nullable(Float64)
+BORO_NM           Nullable(String)
+CMPLNT_FR_DT      Nullable(String)
+CMPLNT_FR_TM      Nullable(String)
+CMPLNT_TO_DT      Nullable(String)
+CMPLNT_TO_TM      Nullable(String)
+CRM_ATPT_CPTD_CD  Nullable(String)
+HADEVELOPT        Nullable(String)
+HOUSING_PSA       Nullable(Float64)
+JURISDICTION_CODE Nullable(Float64)
+JURIS_DESC        Nullable(String)
+KY_CD             Nullable(Float64)
+LAW_CAT_CD        Nullable(String)
+LOC_OF_OCCUR_DESC Nullable(String)
+OFNS_DESC         Nullable(String)
+PARKS_NM          Nullable(String)
+PATROL_BORO       Nullable(String)
+PD_CD             Nullable(Float64)
+PD_DESC           Nullable(String)
+PREM_TYP_DESC     Nullable(String)
+RPT_DT            Nullable(String)
+STATION_NAME      Nullable(String)
+SUSP_AGE_GROUP    Nullable(String)
+SUSP_RACE         Nullable(String)
+SUSP_SEX          Nullable(String)
+TRANSIT_DISTRICT  Nullable(Float64)
+VIC_AGE_GROUP     Nullable(String)
+VIC_RACE          Nullable(String)
+VIC_SEX           Nullable(String)
+X_COORD_CD        Nullable(Float64)
+Y_COORD_CD        Nullable(Float64)
+Latitude          Nullable(Float64)
+Longitude         Nullable(Float64)
+Lat_Lon           Tuple(Nullable(Float64), Nullable(Float64))
 New Georeferenced Column Nullable(String)
 ```
 
@@ -362,7 +362,7 @@ The dates shown as `1925` above are from errors in the data.  There are several
 
 The decisions made above on the data types used for the columns are reflected in the table schema
 below. We also need to decide on the `ORDER BY` and `PRIMARY KEY` used for the table.  At least one
-of `ORDER BY` or `PRIMARY KEY` must be specified.  Here are some guidelines on deciding on the 
+of `ORDER BY` or `PRIMARY KEY` must be specified.  Here are some guidelines on deciding on the
 columns to includes in `ORDER BY`, and more information is in the *Next Steps* section at the end
 of this document.
 
@@ -380,7 +380,7 @@ decide that we would look at the types of crimes reported over time in the five
 New York City.  These fields might be then included in the `ORDER BY`:
 
 | Column      | Description (from the data dictionary)                 |
-| ----------- | ---------------------------------------------------    |
+| ----------- | --------------------------------------------------- |
 | OFNS_DESC   | Description of offense corresponding with key code     |
 | RPT_DT      | Date event was reported to police                      |
 | BORO_NM     | The name of the borough in which the incident occurred |
@@ -420,7 +420,7 @@ ORDER BY ( borough, offense_description, date_reported )
 Putting together the changes to data types and the `ORDER BY` tuple gives this table structure:
 
 ```sql
-CREATE TABLE NYPD_Complaint ( 
+CREATE TABLE NYPD_Complaint (
     complaint_number     String,
     precinct             UInt8,
     borough              LowCardinality(String),
@@ -429,7 +429,7 @@ CREATE TABLE NYPD_Complaint (
     was_crime_completed  String,
     housing_authority    String,
     housing_level_code   UInt32,
-    jurisdiction_code    UInt8, 
+    jurisdiction_code    UInt8,
     jurisdiction         LowCardinality(String),
     offense_code         UInt8,
     offense_level        LowCardinality(String),
@@ -478,7 +478,7 @@ Query id: 6a5b10bf-9333-4090-b36e-c7f08b1d9e01
 
 Row 1:
 ──────
-partition_key: 
+partition_key:
 sorting_key:   borough, offense_description, date_reported
 primary_key:   borough, offense_description, date_reported
 table:         NYPD_Complaint
@@ -495,7 +495,7 @@ We will use `clickhouse-local` tool for data preprocessing and `clickhouse-clien
 :::tip
 `table='input'` appears in the arguments to clickhouse-local below.  clickhouse-local takes the provided input (`cat ${HOME}/NYPD_Complaint_Data_Current__Year_To_Date_.tsv`) and inserts the input into a table.  By default the table is named `table`.  In this guide the name of the table is set to `input` to make the data flow clearer. The final argument to clickhouse-local is a query that selects from the table (`FROM input`) which is then piped to `clickhouse-client` to populate the table `NYPD_Complaint`.
 :::
-  
+
 ```sql
 cat ${HOME}/NYPD_Complaint_Data_Current__Year_To_Date_.tsv \
   | clickhouse-local --table='input' --input-format='TSVWithNames' \
@@ -512,12 +512,12 @@ cat ${HOME}/NYPD_Complaint_Data_Current__Year_To_Date_.tsv \
       CRM_ATPT_CPTD_CD                            AS was_crime_completed,
       HADEVELOPT                                  AS housing_authority_development,
       HOUSING_PSA                                 AS housing_level_code,
-      JURISDICTION_CODE                           AS jurisdiction_code, 
+      JURISDICTION_CODE                           AS jurisdiction_code,
       JURIS_DESC                                  AS jurisdiction,
       KY_CD                                       AS offense_code,
       LAW_CAT_CD                                  AS offense_level,
       LOC_OF_OCCUR_DESC                           AS location_descriptor,
-      OFNS_DESC                                   AS offense_description, 
+      OFNS_DESC                                   AS offense_description,
       PARKS_NM                                    AS park_name,
       PATROL_BORO                                 AS patrol_borough,
       PD_CD,
@@ -529,7 +529,7 @@ cat ${HOME}/NYPD_Complaint_Data_Current__Year_To_Date_.tsv \
       SUSP_RACE                                   AS suspect_race,
       SUSP_SEX                                    AS suspect_sex,
       TRANSIT_DISTRICT                            AS transit_district,
-      VIC_AGE_GROUP                               AS victim_age_group,   
+      VIC_AGE_GROUP                               AS victim_age_group,
       VIC_RACE                                    AS victim_race,
       VIC_SEX                                     AS victim_sex,
       X_COORD_CD                                  AS NY_x_coordinate,
@@ -538,7 +538,7 @@ cat ${HOME}/NYPD_Complaint_Data_Current__Year_To_Date_.tsv \
       Longitude
     FROM input" \
   | clickhouse-client --query='INSERT INTO NYPD_Complaint FORMAT TSV'
-```  
+```
 
 ## Validate the Data {#validate-data}
 
@@ -560,7 +560,7 @@ Result:
 │  208993 │
 └─────────┘
 
-1 row in set. Elapsed: 0.001 sec. 
+1 row in set. Elapsed: 0.001 sec.
 ```
 
 The size of the dataset in ClickHouse is just 12% of the original TSV file, compare the size of the original TSV file with the size of the table:
@@ -651,4 +651,4 @@ Query id: 8cdcdfd4-908f-4be0-99e3-265722a2ab8d
 
 ## Next Steps
 
-[A Practical Introduction to Sparse Primary Indexes in ClickHouse](../../guides/improving-query-performance/sparse-primary-indexes/sparse-primary-indexes-intro.md) discusses the differences in ClickHouse indexing compared to traditional relational databases, how ClickHouse builds and uses a sparse primary index, and indexing best practices.
+[A Practical Introduction to Sparse Primary Indexes in ClickHouse](/docs/en/guides/best-practices/sparse-primary-indexes.md) discusses the differences in ClickHouse indexing compared to traditional relational databases, how ClickHouse builds and uses a sparse primary index, and indexing best practices.
diff --git a/docs/en/getting-started/example-datasets/ontime.md b/docs/en/getting-started/example-datasets/ontime.md
index 7a6e78206b9..9efa1afb5c4 100644
--- a/docs/en/getting-started/example-datasets/ontime.md
+++ b/docs/en/getting-started/example-datasets/ontime.md
@@ -390,9 +390,9 @@ You can also play with the data in Playground, [example](https://play.clickhouse
 
 This performance test was created by Vadim Tkachenko. See:
 
--   https://www.percona.com/blog/2009/10/02/analyzing-air-traffic-performance-with-infobright-and-monetdb/
--   https://www.percona.com/blog/2009/10/26/air-traffic-queries-in-luciddb/
--   https://www.percona.com/blog/2009/11/02/air-traffic-queries-in-infinidb-early-alpha/
--   https://www.percona.com/blog/2014/04/21/using-apache-hadoop-and-impala-together-with-mysql-for-data-analysis/
--   https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
--   http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
+- https://www.percona.com/blog/2009/10/02/analyzing-air-traffic-performance-with-infobright-and-monetdb/
+- https://www.percona.com/blog/2009/10/26/air-traffic-queries-in-luciddb/
+- https://www.percona.com/blog/2009/11/02/air-traffic-queries-in-infinidb-early-alpha/
+- https://www.percona.com/blog/2014/04/21/using-apache-hadoop-and-impala-together-with-mysql-for-data-analysis/
+- https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
+- http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
diff --git a/docs/en/getting-started/example-datasets/recipes.md b/docs/en/getting-started/example-datasets/recipes.md
index 4cc94c3ce5b..e0a66022d37 100644
--- a/docs/en/getting-started/example-datasets/recipes.md
+++ b/docs/en/getting-started/example-datasets/recipes.md
@@ -50,13 +50,13 @@ clickhouse-client --query "
 This is a showcase how to parse custom CSV, as it requires multiple tunes.
 
 Explanation:
--   The dataset is in CSV format, but it requires some preprocessing on insertion; we use table function [input](../../sql-reference/table-functions/input.md) to perform preprocessing;
--   The structure of CSV file is specified in the argument of the table function `input`;
--   The field `num` (row number) is unneeded - we parse it from file and ignore;
--   We use `FORMAT CSVWithNames` but the header in CSV will be ignored (by command line parameter `--input_format_with_names_use_header 0`), because the header does not contain the name for the first field;
--   File is using only double quotes to enclose CSV strings; some strings are not enclosed in double quotes, and single quote must not be parsed as the string enclosing - that's why we also add the `--format_csv_allow_single_quote 0` parameter;
--   Some strings from CSV cannot parse, because they contain `\M/` sequence at the beginning of the value; the only value starting with backslash in CSV can be `\N` that is parsed as SQL NULL. We add `--input_format_allow_errors_num 10` parameter and up to ten malformed records can be skipped;
--   There are arrays for ingredients, directions and NER fields; these arrays are represented in unusual form: they are serialized into string as JSON and then placed in CSV - we parse them as String and then use [JSONExtract](../../sql-reference/functions/json-functions.md) function to transform it to Array.
+- The dataset is in CSV format, but it requires some preprocessing on insertion; we use table function [input](../../sql-reference/table-functions/input.md) to perform preprocessing;
+- The structure of CSV file is specified in the argument of the table function `input`;
+- The field `num` (row number) is unneeded - we parse it from file and ignore;
+- We use `FORMAT CSVWithNames` but the header in CSV will be ignored (by command line parameter `--input_format_with_names_use_header 0`), because the header does not contain the name for the first field;
+- File is using only double quotes to enclose CSV strings; some strings are not enclosed in double quotes, and single quote must not be parsed as the string enclosing - that's why we also add the `--format_csv_allow_single_quote 0` parameter;
+- Some strings from CSV cannot parse, because they contain `\M/` sequence at the beginning of the value; the only value starting with backslash in CSV can be `\N` that is parsed as SQL NULL. We add `--input_format_allow_errors_num 10` parameter and up to ten malformed records can be skipped;
+- There are arrays for ingredients, directions and NER fields; these arrays are represented in unusual form: they are serialized into string as JSON and then placed in CSV - we parse them as String and then use [JSONExtract](../../sql-reference/functions/json-functions.md) function to transform it to Array.
 
 ## Validate the Inserted Data
 
@@ -80,7 +80,7 @@ Result:
 
 ### Top Components by the Number of Recipes:
 
-In this example we learn how to use [arrayJoin](../../sql-reference/functions/array-join/) function to expand an array into a set of rows.
+In this example we learn how to use [arrayJoin](../../sql-reference/functions/array-join.md) function to expand an array into a set of rows.
 
 Query:
 
@@ -185,7 +185,7 @@ Result:
 10 rows in set. Elapsed: 0.215 sec. Processed 2.23 million rows, 1.48 GB (10.35 million rows/s., 6.86 GB/s.)
 ```
 
-In this example, we involve [has](../../sql-reference/functions/array-functions/#hasarr-elem) function to filter by array elements and sort by the number of directions.
+In this example, we involve [has](../../sql-reference/functions/array-functions.md#hasarr-elem) function to filter by array elements and sort by the number of directions.
 
 There is a wedding cake that requires the whole 126 steps to produce! Show that directions:
 
diff --git a/docs/en/getting-started/example-datasets/reddit-comments.md b/docs/en/getting-started/example-datasets/reddit-comments.md
new file mode 100644
index 00000000000..e1e372746c9
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/reddit-comments.md
@@ -0,0 +1,636 @@
+---
+slug: /en/getting-started/example-datasets/reddit-comments
+sidebar_label: Reddit comments
+---
+
+# Reddit comments dataset
+
+This dataset contains publicly-available comments on Reddit that go back to December, 2005, to March, 2023, and contains over 7B rows of data. The raw data is in JSON format in compressed `.zst` files and the rows look like the following:
+
+```json
+{"controversiality":0,"body":"A look at Vietnam and Mexico exposes the myth of market liberalisation.","subreddit_id":"t5_6","link_id":"t3_17863","stickied":false,"subreddit":"reddit.com","score":2,"ups":2,"author_flair_css_class":null,"created_utc":1134365188,"author_flair_text":null,"author":"frjo","id":"c13","edited":false,"parent_id":"t3_17863","gilded":0,"distinguished":null,"retrieved_on":1473738411}
+{"created_utc":1134365725,"author_flair_css_class":null,"score":1,"ups":1,"subreddit":"reddit.com","stickied":false,"link_id":"t3_17866","subreddit_id":"t5_6","controversiality":0,"body":"The site states \"What can I use it for? Meeting notes, Reports, technical specs Sign-up sheets, proposals and much more...\", just like any other new breeed of sites that want us to store everything we have on the web. And they even guarantee multiple levels of security and encryption etc. But what prevents these web site operators fom accessing and/or stealing Meeting notes, Reports, technical specs Sign-up sheets, proposals and much more, for competitive or personal gains...? I am pretty sure that most of them are honest, but what's there to prevent me from setting up a good useful site and stealing all your data? Call me paranoid - I am.","retrieved_on":1473738411,"distinguished":null,"gilded":0,"id":"c14","edited":false,"parent_id":"t3_17866","author":"zse7zse","author_flair_text":null}
+{"gilded":0,"distinguished":null,"retrieved_on":1473738411,"author":"[deleted]","author_flair_text":null,"edited":false,"id":"c15","parent_id":"t3_17869","subreddit":"reddit.com","score":0,"ups":0,"created_utc":1134366848,"author_flair_css_class":null,"body":"Jython related topics by Frank Wierzbicki","controversiality":0,"subreddit_id":"t5_6","stickied":false,"link_id":"t3_17869"}
+{"gilded":0,"retrieved_on":1473738411,"distinguished":null,"author_flair_text":null,"author":"[deleted]","edited":false,"parent_id":"t3_17870","id":"c16","subreddit":"reddit.com","created_utc":1134367660,"author_flair_css_class":null,"score":1,"ups":1,"body":"[deleted]","controversiality":0,"stickied":false,"link_id":"t3_17870","subreddit_id":"t5_6"}
+{"gilded":0,"retrieved_on":1473738411,"distinguished":null,"author_flair_text":null,"author":"rjoseph","edited":false,"id":"c17","parent_id":"t3_17817","subreddit":"reddit.com","author_flair_css_class":null,"created_utc":1134367754,"score":1,"ups":1,"body":"Saft is by far the best extension you could tak onto your Safari","controversiality":0,"link_id":"t3_17817","stickied":false,"subreddit_id":"t5_6"}
+```
+
+A shoutout to Percona for the [motivation behind ingesting this dataset](https://www.percona.com/blog/big-data-set-reddit-comments-analyzing-clickhouse/), which we have downloaded and stored in an S3 bucket.
+
+:::note
+The following commands were executed on ClickHouse Cloud. To run this on your own cluster, replace `default` in the `s3Cluster` function call with the name of your cluster. If you do not have a cluster, then replace the `s3Cluster` function with the `s3` function.
+:::
+
+1. Let's create a table for the Reddit data:
+
+```sql
+CREATE TABLE reddit
+(
+    subreddit LowCardinality(String),
+    subreddit_id LowCardinality(String),
+    subreddit_type Enum('public' = 1, 'restricted' = 2, 'user' = 3, 'archived' = 4, 'gold_restricted' = 5, 'private' = 6),
+    author LowCardinality(String),
+    body String CODEC(ZSTD(6)),
+    created_date Date DEFAULT toDate(created_utc),
+    created_utc DateTime,
+    retrieved_on DateTime,
+    id String,
+    parent_id String,
+    link_id String,
+    score Int32,
+    total_awards_received UInt16,
+    controversiality UInt8,
+    gilded UInt8,
+    collapsed_because_crowd_control UInt8,
+    collapsed_reason Enum('' = 0, 'comment score below threshold' = 1, 'may be sensitive content' = 2, 'potentially toxic' = 3, 'potentially toxic content' = 4),
+    distinguished Enum('' = 0, 'moderator' = 1, 'admin' = 2, 'special' = 3),
+    removal_reason Enum('' = 0, 'legal' = 1),
+    author_created_utc DateTime,
+    author_fullname LowCardinality(String),
+    author_patreon_flair UInt8,
+    author_premium UInt8,
+    can_gild UInt8,
+    can_mod_post UInt8,
+    collapsed UInt8,
+    is_submitter UInt8,
+    _edited String,
+    locked UInt8,
+    quarantined UInt8,
+    no_follow UInt8,
+    send_replies UInt8,
+    stickied UInt8,
+    author_flair_text LowCardinality(String)
+)
+ENGINE = MergeTree
+ORDER BY (subreddit, created_date, author);
+```
+
+:::note
+The names of the files in S3 start with `RC_YYYY-MM` where `YYYY-MM` goes from `2005-12` to `2023-02`. The compression changes a couple of times though, so the file extensions are not consistent. For example:
+
+- the file names are initially `RC_2005-12.bz2` to `RC_2017-11.bz2`
+- then they look like `RC_2017-12.xz` to `RC_2018-09.xz`
+- and finally `RC_2018-10.zst` to `RC_2023-02.zst`
+:::
+
+2. We are going to start with one month of data, but if you want to simply insert every row - skip ahead to step 8 below. The following file has 86M records from December, 2017:
+
+```sql
+INSERT INTO reddit
+    SELECT *
+    FROM s3Cluster(
+        'default',
+        'https://clickhouse-public-datasets.s3.eu-central-1.amazonaws.com/reddit/original/RC_2017-12.xz',
+        'JSONEachRow'
+    );
+```
+
+If you do not have a cluster, use `s3` instead of `s3Cluster`:
+
+```sql
+INSERT INTO reddit
+    SELECT *
+    FROM s3(
+        'https://clickhouse-public-datasets.s3.eu-central-1.amazonaws.com/reddit/original/RC_2017-12.xz',
+        'JSONEachRow'
+    );
+```
+
+3. It will take a while depending on your resources, but when it's done verify it worked:
+
+```sql
+SELECT formatReadableQuantity(count())
+FROM reddit;
+```
+
+```response
+┌─formatReadableQuantity(count())─┐
+│ 85.97 million                   │
+└─────────────────────────────────┘
+```
+
+4. Let's see how many unique subreddits were in December of 2017:
+
+```sql
+SELECT uniqExact(subreddit)
+FROM reddit;
+```
+
+```response
+┌─uniqExact(subreddit)─┐
+│                91613 │
+└──────────────────────┘
+
+1 row in set. Elapsed: 1.572 sec. Processed 85.97 million rows, 367.43 MB (54.71 million rows/s., 233.80 MB/s.)
+```
+
+5. This query returns the top 10 subreddits (in terms of number of comments):
+
+```sql
+SELECT
+    subreddit,
+    count() AS c
+FROM reddit
+GROUP BY subreddit
+ORDER BY c DESC
+LIMIT 20;
+```
+
+```response
+┌─subreddit───────┬───────c─┐
+│ AskReddit       │ 5245881 │
+│ politics        │ 1753120 │
+│ nfl             │ 1220266 │
+│ nba             │  960388 │
+│ The_Donald      │  931857 │
+│ news            │  796617 │
+│ worldnews       │  765709 │
+│ CFB             │  710360 │
+│ gaming          │  602761 │
+│ movies          │  601966 │
+│ soccer          │  590628 │
+│ Bitcoin         │  583783 │
+│ pics            │  563408 │
+│ StarWars        │  562514 │
+│ funny           │  547563 │
+│ leagueoflegends │  517213 │
+│ teenagers       │  492020 │
+│ DestinyTheGame  │  477377 │
+│ todayilearned   │  472650 │
+│ videos          │  450581 │
+└─────────────────┴─────────┘
+
+20 rows in set. Elapsed: 0.368 sec. Processed 85.97 million rows, 367.43 MB (233.34 million rows/s., 997.25 MB/s.)
+```
+
+6. Here are the top 10 authors in December of 2017, in terms of number of comments posted:
+
+```sql
+SELECT
+    author,
+    count() AS c
+FROM reddit
+GROUP BY author
+ORDER BY c DESC
+LIMIT 10;
+```
+
+```response
+┌─author──────────┬───────c─┐
+│ [deleted]       │ 5913324 │
+│ AutoModerator   │  784886 │
+│ ImagesOfNetwork │   83241 │
+│ BitcoinAllBot   │   54484 │
+│ imguralbumbot   │   45822 │
+│ RPBot           │   29337 │
+│ WikiTextBot     │   25982 │
+│ Concise_AMA_Bot │   19974 │
+│ MTGCardFetcher  │   19103 │
+│ TotesMessenger  │   19057 │
+└─────────────────┴─────────┘
+
+10 rows in set. Elapsed: 8.143 sec. Processed 85.97 million rows, 711.05 MB (10.56 million rows/s., 87.32 MB/s.)
+```
+
+7.  We already inserted some data, but we will start over:
+
+```sql
+TRUNCATE TABLE reddit;
+```
+
+8. This is a fun dataset and it looks like we can find some great information, so let's go ahead and insert the entire dataset from 2005 to 2023. When you're ready, run this command to insert all the rows. (It takes a while - up to 17 hours!)
+
+```sql
+INSERT INTO reddit
+SELECT *
+FROM s3Cluster(
+    'default',
+    'https://clickhouse-public-datasets.s3.amazonaws.com/reddit/original/RC*',
+    'JSONEachRow'
+    )
+SETTINGS zstd_window_log_max = 31;
+```
+
+The response looks like:
+
+```response
+0 rows in set. Elapsed: 61187.839 sec. Processed 6.74 billion rows, 2.06 TB (110.17 thousand rows/s., 33.68 MB/s.)
+```
+
+8. Let's see how many rows were inserted and how much disk space the table is using:
+
+
+```sql
+SELECT
+    sum(rows) AS count,
+    formatReadableQuantity(count),
+    formatReadableSize(sum(bytes)) AS disk_size,
+    formatReadableSize(sum(data_uncompressed_bytes)) AS uncompressed_size
+FROM system.parts
+WHERE (table = 'reddit') AND active
+```
+
+Notice the compression of disk storage is about 1/3 of the uncompressed size:
+
+```response
+┌──────count─┬─formatReadableQuantity(sum(rows))─┬─disk_size──┬─uncompressed_size─┐
+│ 6739503568 │ 6.74 billion                      │ 501.10 GiB │ 1.51 TiB          │
+└────────────┴───────────────────────────────────┴────────────┴───────────────────┘
+
+1 row in set. Elapsed: 0.010 sec.
+```
+
+9. The following query shows how many comments, authors and subreddits we have for each month:
+
+```sql
+SELECT
+    toStartOfMonth(created_utc) AS firstOfMonth,
+    count() AS c,
+    bar(c, 0, 50000000, 25) AS bar_count,
+    uniq(author) AS authors,
+    bar(authors, 0, 5000000, 25) AS bar_authors,
+    uniq(subreddit) AS subreddits,
+    bar(subreddits, 0, 100000, 25) AS bar_subreddits
+FROM reddit
+GROUP BY firstOfMonth
+ORDER BY firstOfMonth ASC;
+```
+
+This is a substantial query that has to process all 6.74 billion rows, but we still get an impressive response time (about 3 minutes):
+
+```response
+┌─firstOfMonth─┬─────────c─┬─bar_count─────────────────┬─authors─┬─bar_authors───────────────┬─subreddits─┬─bar_subreddits────────────┐
+│   2005-12-01 │      1075 │                           │     394 │                           │          1 │                           │
+│   2006-01-01 │      3666 │                           │     791 │                           │          2 │                           │
+│   2006-02-01 │      9095 │                           │    1464 │                           │         18 │                           │
+│   2006-03-01 │     13859 │                           │    1958 │                           │         15 │                           │
+│   2006-04-01 │     19090 │                           │    2334 │                           │         21 │                           │
+│   2006-05-01 │     26859 │                           │    2698 │                           │         21 │                           │
+│   2006-06-01 │     29163 │                           │    3043 │                           │         19 │                           │
+│   2006-07-01 │     37031 │                           │    3532 │                           │         22 │                           │
+│   2006-08-01 │     50559 │                           │    4750 │                           │         24 │                           │
+│   2006-09-01 │     50675 │                           │    4908 │                           │         21 │                           │
+│   2006-10-01 │     54148 │                           │    5654 │                           │         31 │                           │
+│   2006-11-01 │     62021 │                           │    6490 │                           │         23 │                           │
+│   2006-12-01 │     61018 │                           │    6707 │                           │         24 │                           │
+│   2007-01-01 │     81341 │                           │    7931 │                           │         23 │                           │
+│   2007-02-01 │     95634 │                           │    9020 │                           │         21 │                           │
+│   2007-03-01 │    112444 │                           │   10842 │                           │         23 │                           │
+│   2007-04-01 │    126773 │                           │   10701 │                           │         26 │                           │
+│   2007-05-01 │    170097 │                           │   11365 │                           │         25 │                           │
+│   2007-06-01 │    178800 │                           │   11267 │                           │         22 │                           │
+│   2007-07-01 │    203319 │                           │   12482 │                           │         25 │                           │
+│   2007-08-01 │    225111 │                           │   14124 │                           │         30 │                           │
+│   2007-09-01 │    259497 │ ▏                         │   15416 │                           │         33 │                           │
+│   2007-10-01 │    274170 │ ▏                         │   15302 │                           │         36 │                           │
+│   2007-11-01 │    372983 │ ▏                         │   15134 │                           │         43 │                           │
+│   2007-12-01 │    363390 │ ▏                         │   15915 │                           │         31 │                           │
+│   2008-01-01 │    452990 │ ▏                         │   18857 │                           │        126 │                           │
+│   2008-02-01 │    441768 │ ▏                         │   18266 │                           │        173 │                           │
+│   2008-03-01 │    463728 │ ▏                         │   18947 │                           │        292 │                           │
+│   2008-04-01 │    468317 │ ▏                         │   18590 │                           │        323 │                           │
+│   2008-05-01 │    536380 │ ▎                         │   20861 │                           │        375 │                           │
+│   2008-06-01 │    577684 │ ▎                         │   22557 │                           │        575 │ ▏                         │
+│   2008-07-01 │    592610 │ ▎                         │   23123 │                           │        657 │ ▏                         │
+│   2008-08-01 │    595959 │ ▎                         │   23729 │                           │        707 │ ▏                         │
+│   2008-09-01 │    680892 │ ▎                         │   26374 │ ▏                         │        801 │ ▏                         │
+│   2008-10-01 │    789874 │ ▍                         │   28970 │ ▏                         │        893 │ ▏                         │
+│   2008-11-01 │    792310 │ ▍                         │   30272 │ ▏                         │       1024 │ ▎                         │
+│   2008-12-01 │    850359 │ ▍                         │   34073 │ ▏                         │       1103 │ ▎                         │
+│   2009-01-01 │   1051649 │ ▌                         │   38978 │ ▏                         │       1316 │ ▎                         │
+│   2009-02-01 │    944711 │ ▍                         │   43390 │ ▏                         │       1132 │ ▎                         │
+│   2009-03-01 │   1048643 │ ▌                         │   46516 │ ▏                         │       1203 │ ▎                         │
+│   2009-04-01 │   1094599 │ ▌                         │   48284 │ ▏                         │       1334 │ ▎                         │
+│   2009-05-01 │   1201257 │ ▌                         │   52512 │ ▎                         │       1395 │ ▎                         │
+│   2009-06-01 │   1258750 │ ▋                         │   57728 │ ▎                         │       1473 │ ▎                         │
+│   2009-07-01 │   1470290 │ ▋                         │   60098 │ ▎                         │       1686 │ ▍                         │
+│   2009-08-01 │   1750688 │ ▉                         │   67347 │ ▎                         │       1777 │ ▍                         │
+│   2009-09-01 │   2032276 │ █                         │   78051 │ ▍                         │       1784 │ ▍                         │
+│   2009-10-01 │   2242017 │ █                         │   93409 │ ▍                         │       2071 │ ▌                         │
+│   2009-11-01 │   2207444 │ █                         │   95940 │ ▍                         │       2141 │ ▌                         │
+│   2009-12-01 │   2560510 │ █▎                        │  104239 │ ▌                         │       2141 │ ▌                         │
+│   2010-01-01 │   2884096 │ █▍                        │  114314 │ ▌                         │       2313 │ ▌                         │
+│   2010-02-01 │   2687779 │ █▎                        │  115683 │ ▌                         │       2522 │ ▋                         │
+│   2010-03-01 │   3228254 │ █▌                        │  125775 │ ▋                         │       2890 │ ▋                         │
+│   2010-04-01 │   3209898 │ █▌                        │  128936 │ ▋                         │       3170 │ ▊                         │
+│   2010-05-01 │   3267363 │ █▋                        │  131851 │ ▋                         │       3166 │ ▊                         │
+│   2010-06-01 │   3532867 │ █▊                        │  139522 │ ▋                         │       3301 │ ▊                         │
+│   2010-07-01 │   4032737 │ ██                        │  153451 │ ▊                         │       3662 │ ▉                         │
+│   2010-08-01 │   4247982 │ ██                        │  164071 │ ▊                         │       3653 │ ▉                         │
+│   2010-09-01 │   4704069 │ ██▎                       │  186613 │ ▉                         │       4009 │ █                         │
+│   2010-10-01 │   5032368 │ ██▌                       │  203800 │ █                         │       4154 │ █                         │
+│   2010-11-01 │   5689002 │ ██▊                       │  226134 │ █▏                        │       4383 │ █                         │
+│   2010-12-01 │   5972642 │ ██▉                       │  245824 │ █▏                        │       4692 │ █▏                        │
+│   2011-01-01 │   6603329 │ ███▎                      │  270025 │ █▎                        │       5141 │ █▎                        │
+│   2011-02-01 │   6363114 │ ███▏                      │  277593 │ █▍                        │       5202 │ █▎                        │
+│   2011-03-01 │   7556165 │ ███▊                      │  314748 │ █▌                        │       5445 │ █▎                        │
+│   2011-04-01 │   7571398 │ ███▊                      │  329920 │ █▋                        │       6128 │ █▌                        │
+│   2011-05-01 │   8803949 │ ████▍                     │  365013 │ █▊                        │       6834 │ █▋                        │
+│   2011-06-01 │   9766511 │ ████▉                     │  393945 │ █▉                        │       7519 │ █▉                        │
+│   2011-07-01 │  10557466 │ █████▎                    │  424235 │ ██                        │       8293 │ ██                        │
+│   2011-08-01 │  12316144 │ ██████▏                   │  475326 │ ██▍                       │       9657 │ ██▍                       │
+│   2011-09-01 │  12150412 │ ██████                    │  503142 │ ██▌                       │      10278 │ ██▌                       │
+│   2011-10-01 │  13470278 │ ██████▋                   │  548801 │ ██▋                       │      10922 │ ██▋                       │
+│   2011-11-01 │  13621533 │ ██████▊                   │  574435 │ ██▊                       │      11572 │ ██▉                       │
+│   2011-12-01 │  14509469 │ ███████▎                  │  622849 │ ███                       │      12335 │ ███                       │
+│   2012-01-01 │  16350205 │ ████████▏                 │  696110 │ ███▍                      │      14281 │ ███▌                      │
+│   2012-02-01 │  16015695 │ ████████                  │  722892 │ ███▌                      │      14949 │ ███▋                      │
+│   2012-03-01 │  17881943 │ ████████▉                 │  789664 │ ███▉                      │      15795 │ ███▉                      │
+│   2012-04-01 │  19044534 │ █████████▌                │  842491 │ ████▏                     │      16440 │ ████                      │
+│   2012-05-01 │  20388260 │ ██████████▏               │  886176 │ ████▍                     │      16974 │ ████▏                     │
+│   2012-06-01 │  21897913 │ ██████████▉               │  946798 │ ████▋                     │      17952 │ ████▍                     │
+│   2012-07-01 │  24087517 │ ████████████              │ 1018636 │ █████                     │      19069 │ ████▊                     │
+│   2012-08-01 │  25703326 │ ████████████▊             │ 1094445 │ █████▍                    │      20553 │ █████▏                    │
+│   2012-09-01 │  23419524 │ ███████████▋              │ 1088491 │ █████▍                    │      20831 │ █████▏                    │
+│   2012-10-01 │  24788236 │ ████████████▍             │ 1131885 │ █████▋                    │      21868 │ █████▍                    │
+│   2012-11-01 │  24648302 │ ████████████▎             │ 1167608 │ █████▊                    │      21791 │ █████▍                    │
+│   2012-12-01 │  26080276 │ █████████████             │ 1218402 │ ██████                    │      22622 │ █████▋                    │
+│   2013-01-01 │  30365867 │ ███████████████▏          │ 1341703 │ ██████▋                   │      24696 │ ██████▏                   │
+│   2013-02-01 │  27213960 │ █████████████▌            │ 1304756 │ ██████▌                   │      24514 │ ██████▏                   │
+│   2013-03-01 │  30771274 │ ███████████████▍          │ 1391703 │ ██████▉                   │      25730 │ ██████▍                   │
+│   2013-04-01 │  33259557 │ ████████████████▋         │ 1485971 │ ███████▍                  │      27294 │ ██████▊                   │
+│   2013-05-01 │  33126225 │ ████████████████▌         │ 1506473 │ ███████▌                  │      27299 │ ██████▊                   │
+│   2013-06-01 │  32648247 │ ████████████████▎         │ 1506650 │ ███████▌                  │      27450 │ ██████▊                   │
+│   2013-07-01 │  34922133 │ █████████████████▍        │ 1561771 │ ███████▊                  │      28294 │ ███████                   │
+│   2013-08-01 │  34766579 │ █████████████████▍        │ 1589781 │ ███████▉                  │      28943 │ ███████▏                  │
+│   2013-09-01 │  31990369 │ ███████████████▉          │ 1570342 │ ███████▊                  │      29408 │ ███████▎                  │
+│   2013-10-01 │  35940040 │ █████████████████▉        │ 1683770 │ ████████▍                 │      30273 │ ███████▌                  │
+│   2013-11-01 │  37396497 │ ██████████████████▋       │ 1757467 │ ████████▊                 │      31173 │ ███████▊                  │
+│   2013-12-01 │  39810216 │ ███████████████████▉      │ 1846204 │ █████████▏                │      32326 │ ████████                  │
+│   2014-01-01 │  42420655 │ █████████████████████▏    │ 1927229 │ █████████▋                │      35603 │ ████████▉                 │
+│   2014-02-01 │  38703362 │ ███████████████████▎      │ 1874067 │ █████████▎                │      37007 │ █████████▎                │
+│   2014-03-01 │  42459956 │ █████████████████████▏    │ 1959888 │ █████████▊                │      37948 │ █████████▍                │
+│   2014-04-01 │  42440735 │ █████████████████████▏    │ 1951369 │ █████████▊                │      38362 │ █████████▌                │
+│   2014-05-01 │  42514094 │ █████████████████████▎    │ 1970197 │ █████████▊                │      39078 │ █████████▊                │
+│   2014-06-01 │  41990650 │ ████████████████████▉     │ 1943850 │ █████████▋                │      38268 │ █████████▌                │
+│   2014-07-01 │  46868899 │ ███████████████████████▍  │ 2059346 │ ██████████▎               │      40634 │ ██████████▏               │
+│   2014-08-01 │  46990813 │ ███████████████████████▍  │ 2117335 │ ██████████▌               │      41764 │ ██████████▍               │
+│   2014-09-01 │  44992201 │ ██████████████████████▍   │ 2124708 │ ██████████▌               │      41890 │ ██████████▍               │
+│   2014-10-01 │  47497520 │ ███████████████████████▋  │ 2206535 │ ███████████               │      43109 │ ██████████▊               │
+│   2014-11-01 │  46118074 │ ███████████████████████   │ 2239747 │ ███████████▏              │      43718 │ ██████████▉               │
+│   2014-12-01 │  48807699 │ ████████████████████████▍ │ 2372945 │ ███████████▊              │      43823 │ ██████████▉               │
+│   2015-01-01 │  53851542 │ █████████████████████████ │ 2499536 │ ████████████▍             │      47172 │ ███████████▊              │
+│   2015-02-01 │  48342747 │ ████████████████████████▏ │ 2448496 │ ████████████▏             │      47229 │ ███████████▊              │
+│   2015-03-01 │  54564441 │ █████████████████████████ │ 2550534 │ ████████████▊             │      48156 │ ████████████              │
+│   2015-04-01 │  55005780 │ █████████████████████████ │ 2609443 │ █████████████             │      49865 │ ████████████▍             │
+│   2015-05-01 │  54504410 │ █████████████████████████ │ 2585535 │ ████████████▉             │      50137 │ ████████████▌             │
+│   2015-06-01 │  54258492 │ █████████████████████████ │ 2595129 │ ████████████▉             │      49598 │ ████████████▍             │
+│   2015-07-01 │  58451788 │ █████████████████████████ │ 2720026 │ █████████████▌            │      55022 │ █████████████▊            │
+│   2015-08-01 │  58075327 │ █████████████████████████ │ 2743994 │ █████████████▋            │      55302 │ █████████████▊            │
+│   2015-09-01 │  55574825 │ █████████████████████████ │ 2672793 │ █████████████▎            │      53960 │ █████████████▍            │
+│   2015-10-01 │  59494045 │ █████████████████████████ │ 2816426 │ ██████████████            │      70210 │ █████████████████▌        │
+│   2015-11-01 │  57117500 │ █████████████████████████ │ 2847146 │ ██████████████▏           │      71363 │ █████████████████▊        │
+│   2015-12-01 │  58523312 │ █████████████████████████ │ 2854840 │ ██████████████▎           │      94559 │ ███████████████████████▋  │
+│   2016-01-01 │  61991732 │ █████████████████████████ │ 2920366 │ ██████████████▌           │     108438 │ █████████████████████████ │
+│   2016-02-01 │  59189875 │ █████████████████████████ │ 2854683 │ ██████████████▎           │     109916 │ █████████████████████████ │
+│   2016-03-01 │  63918864 │ █████████████████████████ │ 2969542 │ ██████████████▊           │      84787 │ █████████████████████▏    │
+│   2016-04-01 │  64271256 │ █████████████████████████ │ 2999086 │ ██████████████▉           │      61647 │ ███████████████▍          │
+│   2016-05-01 │  65212004 │ █████████████████████████ │ 3034674 │ ███████████████▏          │      67465 │ ████████████████▊         │
+│   2016-06-01 │  65867743 │ █████████████████████████ │ 3057604 │ ███████████████▎          │      75170 │ ██████████████████▊       │
+│   2016-07-01 │  66974735 │ █████████████████████████ │ 3199374 │ ███████████████▉          │      77732 │ ███████████████████▍      │
+│   2016-08-01 │  69654819 │ █████████████████████████ │ 3239957 │ ████████████████▏         │      63080 │ ███████████████▊          │
+│   2016-09-01 │  67024973 │ █████████████████████████ │ 3190864 │ ███████████████▉          │      62324 │ ███████████████▌          │
+│   2016-10-01 │  71826553 │ █████████████████████████ │ 3284340 │ ████████████████▍         │      62549 │ ███████████████▋          │
+│   2016-11-01 │  71022319 │ █████████████████████████ │ 3300822 │ ████████████████▌         │      69718 │ █████████████████▍        │
+│   2016-12-01 │  72942967 │ █████████████████████████ │ 3430324 │ █████████████████▏        │      71705 │ █████████████████▉        │
+│   2017-01-01 │  78946585 │ █████████████████████████ │ 3572093 │ █████████████████▊        │      78198 │ ███████████████████▌      │
+│   2017-02-01 │  70609487 │ █████████████████████████ │ 3421115 │ █████████████████         │      69823 │ █████████████████▍        │
+│   2017-03-01 │  79723106 │ █████████████████████████ │ 3638122 │ ██████████████████▏       │      73865 │ ██████████████████▍       │
+│   2017-04-01 │  77478009 │ █████████████████████████ │ 3620591 │ ██████████████████        │      74387 │ ██████████████████▌       │
+│   2017-05-01 │  79810360 │ █████████████████████████ │ 3650820 │ ██████████████████▎       │      74356 │ ██████████████████▌       │
+│   2017-06-01 │  79901711 │ █████████████████████████ │ 3737614 │ ██████████████████▋       │      72114 │ ██████████████████        │
+│   2017-07-01 │  81798725 │ █████████████████████████ │ 3872330 │ ███████████████████▎      │      76052 │ ███████████████████       │
+│   2017-08-01 │  84658503 │ █████████████████████████ │ 3960093 │ ███████████████████▊      │      77798 │ ███████████████████▍      │
+│   2017-09-01 │  83165192 │ █████████████████████████ │ 3880501 │ ███████████████████▍      │      78402 │ ███████████████████▌      │
+│   2017-10-01 │  85828912 │ █████████████████████████ │ 3980335 │ ███████████████████▉      │      80685 │ ████████████████████▏     │
+│   2017-11-01 │  84965681 │ █████████████████████████ │ 4026749 │ ████████████████████▏     │      82659 │ ████████████████████▋     │
+│   2017-12-01 │  85973810 │ █████████████████████████ │ 4196354 │ ████████████████████▉     │      91984 │ ██████████████████████▉   │
+│   2018-01-01 │  91558594 │ █████████████████████████ │ 4364443 │ █████████████████████▊    │     102577 │ █████████████████████████ │
+│   2018-02-01 │  86467179 │ █████████████████████████ │ 4277899 │ █████████████████████▍    │     104610 │ █████████████████████████ │
+│   2018-03-01 │  96490262 │ █████████████████████████ │ 4422470 │ ██████████████████████    │     112559 │ █████████████████████████ │
+│   2018-04-01 │  98101232 │ █████████████████████████ │ 4572434 │ ██████████████████████▊   │     105284 │ █████████████████████████ │
+│   2018-05-01 │ 100109100 │ █████████████████████████ │ 4698908 │ ███████████████████████▍  │     103910 │ █████████████████████████ │
+│   2018-06-01 │ 100009462 │ █████████████████████████ │ 4697426 │ ███████████████████████▍  │     101107 │ █████████████████████████ │
+│   2018-07-01 │ 108151359 │ █████████████████████████ │ 5099492 │ █████████████████████████ │     106184 │ █████████████████████████ │
+│   2018-08-01 │ 107330940 │ █████████████████████████ │ 5084082 │ █████████████████████████ │     109985 │ █████████████████████████ │
+│   2018-09-01 │ 104473929 │ █████████████████████████ │ 5011953 │ █████████████████████████ │     109710 │ █████████████████████████ │
+│   2018-10-01 │ 112346556 │ █████████████████████████ │ 5320405 │ █████████████████████████ │     112533 │ █████████████████████████ │
+│   2018-11-01 │ 112573001 │ █████████████████████████ │ 5353282 │ █████████████████████████ │     112211 │ █████████████████████████ │
+│   2018-12-01 │ 121953600 │ █████████████████████████ │ 5611543 │ █████████████████████████ │     118291 │ █████████████████████████ │
+│   2019-01-01 │ 129386587 │ █████████████████████████ │ 6016687 │ █████████████████████████ │     125725 │ █████████████████████████ │
+│   2019-02-01 │ 120645639 │ █████████████████████████ │ 5974488 │ █████████████████████████ │     125420 │ █████████████████████████ │
+│   2019-03-01 │ 137650471 │ █████████████████████████ │ 6410197 │ █████████████████████████ │     135924 │ █████████████████████████ │
+│   2019-04-01 │ 138473643 │ █████████████████████████ │ 6416384 │ █████████████████████████ │     139844 │ █████████████████████████ │
+│   2019-05-01 │ 142463421 │ █████████████████████████ │ 6574836 │ █████████████████████████ │     142012 │ █████████████████████████ │
+│   2019-06-01 │ 134172939 │ █████████████████████████ │ 6601267 │ █████████████████████████ │     140997 │ █████████████████████████ │
+│   2019-07-01 │ 145965083 │ █████████████████████████ │ 6901822 │ █████████████████████████ │     147802 │ █████████████████████████ │
+│   2019-08-01 │ 146854393 │ █████████████████████████ │ 6993882 │ █████████████████████████ │     151888 │ █████████████████████████ │
+│   2019-09-01 │ 137540219 │ █████████████████████████ │ 7001362 │ █████████████████████████ │     148839 │ █████████████████████████ │
+│   2019-10-01 │ 129771456 │ █████████████████████████ │ 6825690 │ █████████████████████████ │     144453 │ █████████████████████████ │
+│   2019-11-01 │ 107990259 │ █████████████████████████ │ 6368286 │ █████████████████████████ │     141768 │ █████████████████████████ │
+│   2019-12-01 │ 112895934 │ █████████████████████████ │ 6640902 │ █████████████████████████ │     148277 │ █████████████████████████ │
+│   2020-01-01 │  54354879 │ █████████████████████████ │ 4782339 │ ███████████████████████▉  │     111658 │ █████████████████████████ │
+│   2020-02-01 │  22696923 │ ███████████▎              │ 3135175 │ ███████████████▋          │      79521 │ ███████████████████▉      │
+│   2020-03-01 │   3466677 │ █▋                        │  987960 │ ████▉                     │      40901 │ ██████████▏               │
+└──────────────┴───────────┴───────────────────────────┴─────────┴───────────────────────────┴────────────┴───────────────────────────┘
+
+172 rows in set. Elapsed: 184.809 sec. Processed 6.74 billion rows, 89.56 GB (36.47 million rows/s., 484.62 MB/s.)
+```
+
+10. Here are the top 10 subreddits of 2022:
+
+```sql
+SELECT
+    subreddit,
+    count() AS count
+FROM reddit
+WHERE toYear(created_utc) = 2022
+GROUP BY subreddit
+ORDER BY count DESC
+LIMIT 10;
+```
+
+The response is:
+
+```response
+┌─subreddit────────┬───count─┐
+│ AskReddit        │ 3858203 │
+│ politics         │ 1356782 │
+│ memes            │ 1249120 │
+│ nfl              │  883667 │
+│ worldnews        │  866065 │
+│ teenagers        │  777095 │
+│ AmItheAsshole    │  752720 │
+│ dankmemes        │  657932 │
+│ nba              │  514184 │
+│ unpopularopinion │  473649 │
+└──────────────────┴─────────┘
+
+10 rows in set. Elapsed: 27.824 sec. Processed 6.74 billion rows, 53.26 GB (242.22 million rows/s., 1.91 GB/s.)
+```
+
+11. Let's see which subreddits had the biggest increase in commnents from 2018 to 2019:
+
+```sql
+SELECT
+    subreddit,
+    newcount - oldcount AS diff
+FROM
+(
+    SELECT
+        subreddit,
+        count(*) AS newcount
+    FROM reddit
+    WHERE toYear(created_utc) = 2019
+    GROUP BY subreddit
+)
+ALL INNER JOIN
+(
+    SELECT
+        subreddit,
+        count(*) AS oldcount
+    FROM reddit
+    WHERE toYear(created_utc) = 2018
+    GROUP BY subreddit
+) USING (subreddit)
+ORDER BY diff DESC
+LIMIT 50
+SETTINGS joined_subquery_requires_alias = 0;
+```
+
+It looks like memes and teenagers were busy on Reddit in 2019:
+
+```response
+┌─subreddit────────────┬─────diff─┐
+│ memes                │ 15368369 │
+│ AskReddit            │ 14663662 │
+│ teenagers            │ 12266991 │
+│ AmItheAsshole        │ 11561538 │
+│ dankmemes            │ 11305158 │
+│ unpopularopinion     │  6332772 │
+│ PewdiepieSubmissions │  5930818 │
+│ Market76             │  5014668 │
+│ relationship_advice  │  3776383 │
+│ freefolk             │  3169236 │
+│ Minecraft            │  3160241 │
+│ classicwow           │  2907056 │
+│ Animemes             │  2673398 │
+│ gameofthrones        │  2402835 │
+│ PublicFreakout       │  2267605 │
+│ ShitPostCrusaders    │  2207266 │
+│ RoastMe              │  2195715 │
+│ gonewild             │  2148649 │
+│ AnthemTheGame        │  1803818 │
+│ entitledparents      │  1706270 │
+│ MortalKombat         │  1679508 │
+│ Cringetopia          │  1620555 │
+│ pokemon              │  1615266 │
+│ HistoryMemes         │  1608289 │
+│ Brawlstars           │  1574977 │
+│ iamatotalpieceofshit │  1558315 │
+│ trashy               │  1518549 │
+│ ChapoTrapHouse       │  1505748 │
+│ Pikabu               │  1501001 │
+│ Showerthoughts       │  1475101 │
+│ cursedcomments       │  1465607 │
+│ ukpolitics           │  1386043 │
+│ wallstreetbets       │  1384431 │
+│ interestingasfuck    │  1378900 │
+│ wholesomememes       │  1353333 │
+│ AskOuija             │  1233263 │
+│ borderlands3         │  1197192 │
+│ aww                  │  1168257 │
+│ insanepeoplefacebook │  1155473 │
+│ FortniteCompetitive  │  1122778 │
+│ EpicSeven            │  1117380 │
+│ FreeKarma4U          │  1116423 │
+│ YangForPresidentHQ   │  1086700 │
+│ SquaredCircle        │  1044089 │
+│ MurderedByWords      │  1042511 │
+│ AskMen               │  1024434 │
+│ thedivision          │  1016634 │
+│ barstoolsports       │   985032 │
+│ nfl                  │   978340 │
+│ BattlefieldV         │   971408 │
+└──────────────────────┴──────────┘
+
+50 rows in set. Elapsed: 65.954 sec. Processed 13.48 billion rows, 79.67 GB (204.37 million rows/s., 1.21 GB/s.)
+```
+
+12. One more query: let's compare ClickHouse mentions to other technologies like Snowflake and Postgres. This query is a big one because it has to search all the comments three times for a substring, and unfortunately ClickHouse user are obviously not very active on Reddit yet:
+
+```sql
+SELECT
+    toStartOfQuarter(created_utc) AS quarter,
+    sum(if(positionCaseInsensitive(body, 'clickhouse') > 0, 1, 0)) AS clickhouse,
+    sum(if(positionCaseInsensitive(body, 'snowflake') > 0, 1, 0)) AS snowflake,
+    sum(if(positionCaseInsensitive(body, 'postgres') > 0, 1, 0)) AS postgres
+FROM reddit
+GROUP BY quarter
+ORDER BY quarter ASC;
+```
+
+```response
+┌────Quarter─┬─clickhouse─┬─snowflake─┬─postgres─┐
+│ 2005-10-01 │          0 │         0 │        0 │
+│ 2006-01-01 │          0 │         2 │       23 │
+│ 2006-04-01 │          0 │         2 │       24 │
+│ 2006-07-01 │          0 │         4 │       13 │
+│ 2006-10-01 │          0 │        23 │       73 │
+│ 2007-01-01 │          0 │        14 │       91 │
+│ 2007-04-01 │          0 │        10 │       59 │
+│ 2007-07-01 │          0 │        39 │      116 │
+│ 2007-10-01 │          0 │        45 │      125 │
+│ 2008-01-01 │          0 │        53 │      234 │
+│ 2008-04-01 │          0 │        79 │      303 │
+│ 2008-07-01 │          0 │       102 │      174 │
+│ 2008-10-01 │          0 │       156 │      323 │
+│ 2009-01-01 │          0 │       206 │      208 │
+│ 2009-04-01 │          0 │       178 │      417 │
+│ 2009-07-01 │          0 │       300 │      295 │
+│ 2009-10-01 │          0 │       633 │      589 │
+│ 2010-01-01 │          0 │       555 │      501 │
+│ 2010-04-01 │          0 │       587 │      469 │
+│ 2010-07-01 │          0 │       770 │      821 │
+│ 2010-10-01 │          0 │      1480 │      550 │
+│ 2011-01-01 │          0 │      1482 │      568 │
+│ 2011-04-01 │          0 │      1558 │      406 │
+│ 2011-07-01 │          0 │      2163 │      628 │
+│ 2011-10-01 │          0 │      4064 │      566 │
+│ 2012-01-01 │          0 │      4621 │      662 │
+│ 2012-04-01 │          0 │      5737 │      785 │
+│ 2012-07-01 │          0 │      6097 │     1127 │
+│ 2012-10-01 │          0 │      7986 │      600 │
+│ 2013-01-01 │          0 │      9704 │      839 │
+│ 2013-04-01 │          0 │      8161 │      853 │
+│ 2013-07-01 │          0 │      9704 │     1028 │
+│ 2013-10-01 │          0 │     12879 │     1404 │
+│ 2014-01-01 │          0 │     12317 │     1548 │
+│ 2014-04-01 │          0 │     13181 │     1577 │
+│ 2014-07-01 │          0 │     15640 │     1710 │
+│ 2014-10-01 │          0 │     19479 │     1959 │
+│ 2015-01-01 │          0 │     20411 │     2104 │
+│ 2015-04-01 │          1 │     20309 │     9112 │
+│ 2015-07-01 │          0 │     20325 │     4771 │
+│ 2015-10-01 │          0 │     25087 │     3030 │
+│ 2016-01-01 │          0 │     23462 │     3126 │
+│ 2016-04-01 │          3 │     25496 │     2757 │
+│ 2016-07-01 │          4 │     28233 │     2928 │
+│ 2016-10-01 │          2 │     45445 │     2449 │
+│ 2017-01-01 │          9 │     76019 │     2808 │
+│ 2017-04-01 │          9 │     67919 │     2803 │
+│ 2017-07-01 │         13 │     68974 │     2771 │
+│ 2017-10-01 │         12 │     69730 │     2906 │
+│ 2018-01-01 │         17 │     67476 │     3152 │
+│ 2018-04-01 │          3 │     67139 │     3986 │
+│ 2018-07-01 │         14 │     67979 │     3609 │
+│ 2018-10-01 │         28 │     74147 │     3850 │
+│ 2019-01-01 │         14 │     80250 │     4305 │
+│ 2019-04-01 │         30 │     70307 │     3872 │
+│ 2019-07-01 │         33 │     77149 │     4164 │
+│ 2019-10-01 │         13 │     76746 │     3541 │
+│ 2020-01-01 │         16 │     54475 │      846 │
+└────────────┴────────────┴───────────┴──────────┘
+
+58 rows in set. Elapsed: 2663.751 sec. Processed 6.74 billion rows, 1.21 TB (2.53 million rows/s., 454.37 MB/s.)
+```
\ No newline at end of file
diff --git a/docs/en/getting-started/example-datasets/star-schema.md b/docs/en/getting-started/example-datasets/star-schema.md
index 1702be70410..72ced87ef55 100644
--- a/docs/en/getting-started/example-datasets/star-schema.md
+++ b/docs/en/getting-started/example-datasets/star-schema.md
@@ -18,7 +18,7 @@ $ make
 
 Generating data:
 
-:::warning    
+:::note    
 With `-s 100` dbgen generates 600 million rows (67 GB), while while `-s 1000` it generates 6 billion rows (which takes a lot of time)
 :::
 
diff --git a/docs/en/getting-started/example-datasets/uk-price-paid.md b/docs/en/getting-started/example-datasets/uk-price-paid.md
index 2a89bfda2e7..8ed79c3986f 100644
--- a/docs/en/getting-started/example-datasets/uk-price-paid.md
+++ b/docs/en/getting-started/example-datasets/uk-price-paid.md
@@ -1,17 +1,17 @@
 ---
 slug: /en/getting-started/example-datasets/uk-price-paid
-sidebar_label: UK Property Price Paid
+sidebar_label: UK Property Prices
 sidebar_position: 1
-title: "UK Property Price Paid"
 ---
 
-The dataset contains data about prices paid for real-estate property in England and Wales. The data is available since year 1995.
-The size of the dataset in uncompressed form is about 4 GiB and it will take about 278 MiB in ClickHouse.
+# The UK property prices dataset
 
-Source: https://www.gov.uk/government/statistical-data-sets/price-paid-data-downloads
-Description of the fields: https://www.gov.uk/guidance/about-the-price-paid-data
+Projections are a great way to improve the performance of queries that you run frequently. We will demonstrate the power of projections
+using the UK property dataset, which contains data about prices paid for real-estate property in England and Wales. The data is available since 1995, and the size of the dataset in uncompressed form is about 4 GiB (which will only take about 278 MiB in ClickHouse).
 
-Contains HM Land Registry data © Crown copyright and database right 2021. This data is licensed under the Open Government Licence v3.0.
+- Source: https://www.gov.uk/government/statistical-data-sets/price-paid-data-downloads
+- Description of the fields: https://www.gov.uk/guidance/about-the-price-paid-data
+- Contains HM Land Registry data © Crown copyright and database right 2021. This data is licensed under the Open Government Licence v3.0.
 
 ## Create the Table {#create-table}
 
diff --git a/docs/en/getting-started/example-datasets/youtube-dislikes.md b/docs/en/getting-started/example-datasets/youtube-dislikes.md
new file mode 100644
index 00000000000..5f4ef696b8b
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/youtube-dislikes.md
@@ -0,0 +1,487 @@
+---
+slug: /en/getting-started/example-datasets/youtube-dislikes
+sidebar_label: YouTube Dislikes
+description: A collection is dislikes of YouTube videos.
+---
+
+# YouTube dataset of dislikes
+
+In November of 2021, YouTube removed the public ***dislike*** count from all of its videos. While creators can still see the number of dislikes, viewers can only see how many ***likes*** a video has received.
+
+:::important
+The dataset has over 4.55 billion records, so be careful just copying-and-pasting the commands below unless your resources can handle that type of volume. The commands below were executed on a **Production** instance of [ClickHouse Cloud](https://clickhouse.cloud).
+:::
+
+The data is in a JSON format and can be downloaded from [archive.org](https://archive.org/download/dislikes_youtube_2021_12_video_json_files). We have made this same data available in S3 so that it can be downloaded more efficiently into a ClickHouse Cloud instance.
+
+Here are the steps to create a table in ClickHouse Cloud and insert the data.
+
+:::note
+The steps below will easily work on a local install of ClickHouse too. The only change would be to use the `s3` function instead of `s3cluster` (unless you have a cluster configured - in which case change `default` to the name of your cluster).
+:::
+
+## Step-by-step instructions
+
+1. Let's see what the data looks like. The `s3cluster` table function returns a table, so we can `DESCRIBE` the reult:
+
+```sql
+DESCRIBE s3Cluster(
+    'default',
+    'https://clickhouse-public-datasets.s3.amazonaws.com/youtube/original/files/*.zst',
+    'JSONLines'
+);
+```
+
+ClickHouse infers the following schema from the JSON file:
+
+```response
+┌─name────────────────┬─type─────────────────────────────────┐
+│ id                  │ Nullable(String)                     │
+│ fetch_date          │ Nullable(Int64)                      │
+│ upload_date         │ Nullable(String)                     │
+│ title               │ Nullable(String)                     │
+│ uploader_id         │ Nullable(String)                     │
+│ uploader            │ Nullable(String)                     │
+│ uploader_sub_count  │ Nullable(Int64)                      │
+│ is_age_limit        │ Nullable(Bool)                       │
+│ view_count          │ Nullable(Int64)                      │
+│ like_count          │ Nullable(Int64)                      │
+│ dislike_count       │ Nullable(Int64)                      │
+│ is_crawlable        │ Nullable(Bool)                       │
+│ is_live_content     │ Nullable(Bool)                       │
+│ has_subtitles       │ Nullable(Bool)                       │
+│ is_ads_enabled      │ Nullable(Bool)                       │
+│ is_comments_enabled │ Nullable(Bool)                       │
+│ description         │ Nullable(String)                     │
+│ rich_metadata       │ Array(Map(String, Nullable(String))) │
+│ super_titles        │ Array(Map(String, Nullable(String))) │
+│ uploader_badges     │ Nullable(String)                     │
+│ video_badges        │ Nullable(String)                     │
+└─────────────────────┴──────────────────────────────────────┘
+```
+
+2. Based on the inferred schema, we cleaned up the data types and added a primary key. Define the following table:
+
+```sql
+CREATE TABLE youtube
+(
+    `id` String,
+    `fetch_date` DateTime,
+    `upload_date_str` String,
+    `upload_date` Date,
+    `title` String,
+    `uploader_id` String,
+    `uploader` String,
+    `uploader_sub_count` Int64,
+    `is_age_limit` Bool,
+    `view_count` Int64,
+    `like_count` Int64,
+    `dislike_count` Int64,
+    `is_crawlable` Bool,
+    `has_subtitles` Bool,
+    `is_ads_enabled` Bool,
+    `is_comments_enabled` Bool,
+    `description` String,
+    `rich_metadata` Array(Map(String, String)),
+    `super_titles` Array(Map(String, String)),
+    `uploader_badges` String,
+    `video_badges` String
+)
+ENGINE = MergeTree
+ORDER BY (uploader, upload_date);
+```
+
+3. The following command streams the records from the S3 files into the `youtube` table.
+
+:::important
+This inserts a lot of data - 4.65 billion rows. If you do not want the entire dataset, simply add a `LIMIT` clause with the desired number of rows.
+:::
+
+```sql
+INSERT INTO youtube
+SETTINGS input_format_null_as_default = 1
+SELECT
+    id,
+    parseDateTimeBestEffortUSOrZero(toString(fetch_date)) AS fetch_date,
+    upload_date AS upload_date_str,
+    toDate(parseDateTimeBestEffortUSOrZero(upload_date::String)) AS upload_date,
+    ifNull(title, '') AS title,
+    uploader_id,
+    ifNull(uploader, '') AS uploader,
+    uploader_sub_count,
+    is_age_limit,
+    view_count,
+    like_count,
+    dislike_count,
+    is_crawlable,
+    has_subtitles,
+    is_ads_enabled,
+    is_comments_enabled,
+    ifNull(description, '') AS description,
+    rich_metadata,
+    super_titles,
+    ifNull(uploader_badges, '') AS uploader_badges,
+    ifNull(video_badges, '') AS video_badges
+FROM s3(
+    'https://clickhouse-public-datasets.s3.amazonaws.com/youtube/original/files/*.zst',
+    'JSONLines'
+)
+```
+
+Some comments about our `INSERT` command:
+
+- The `parseDateTimeBestEffortUSOrZero` function is handy when the incoming date fields may not be in the proper format. If `fetch_date` does not get parsed properly, it will be set to `0`
+- The `upload_date` column contains valid dates, but it also contains strings like "4 hours ago" - which is certainly not a valid date. We decided to store the original value in `upload_date_str` and attempt to parse it with `toDate(parseDateTimeBestEffortUSOrZero(upload_date::String))`. If the parsing fails we just get `0`
+- We used `ifNull` to avoid getting `NULL` values in our table. If an incoming value is `NULL`, the `ifNull` function is setting the value to an empty string
+
+4. Open a new tab in the SQL Console of ClickHouse Cloud (or a new `clickhouse-client` window) and watch the count increase. It will take a while to insert 4.56B rows, depending on your server resources. (Without any tweaking of settings, it takes about 4.5 hours.)
+
+```sql
+SELECT formatReadableQuantity(count())
+FROM youtube
+```
+
+```response
+┌─formatReadableQuantity(count())─┐
+│ 4.56 billion                    │
+└─────────────────────────────────┘
+```
+
+5. Once the data is inserted, go ahead and count the number of dislikes of your favorite videos or channels. Let's see how many videos were uploaded by ClickHouse:
+
+```sql
+SELECT count()
+FROM youtube
+WHERE uploader = 'ClickHouse';
+```
+
+```response
+┌─count()─┐
+│      84 │
+└─────────┘
+
+1 row in set. Elapsed: 0.570 sec. Processed 237.57 thousand rows, 5.77 MB (416.54 thousand rows/s., 10.12 MB/s.)
+```
+
+:::note
+The query above runs so quickly because we chose `uploader` as the first column of the primary key - so it only had to process 237k rows.
+:::
+
+6. Let's look and likes and dislikes of ClickHouse videos:
+
+```sql
+SELECT
+    title,
+    like_count,
+    dislike_count
+FROM youtube
+WHERE uploader = 'ClickHouse'
+ORDER BY dislike_count DESC;
+```
+
+The response looks like:
+
+```response
+┌─title────────────────────────────────────────────────────────────────────────────────────────────────┬─like_count─┬─dislike_count─┐
+│ ClickHouse v21.11 Release Webinar                                                                    │         52 │             3 │
+│ ClickHouse Introduction                                                                              │         97 │             3 │
+│ Casa Modelo Algarve                                                                                  │        180 │             3 │
+│ Профайлер запросов:  трудный путь                                                                    │         33 │             3 │
+│ ClickHouse в Курсометре                                                                              │          4 │             2 │
+│ 10 Good Reasons to Use ClickHouse                                                                    │         27 │             2 │
+...
+
+84 rows in set. Elapsed: 0.013 sec. Processed 155.65 thousand rows, 16.94 MB (11.96 million rows/s., 1.30 GB/s.)
+```
+
+7. Here is a search for videos with **ClickHouse** in the `title` or `description` fields:
+
+```sql
+SELECT
+    view_count,
+    like_count,
+    dislike_count,
+    concat('https://youtu.be/', id) AS url,
+    title
+FROM youtube
+WHERE (title ILIKE '%ClickHouse%') OR (description ILIKE '%ClickHouse%')
+ORDER BY
+    like_count DESC,
+    view_count DESC;
+```
+
+This query has to process every row, and also parse through two columns of strings. Even then, we get decent performance at 4.15M rows/second:
+
+```response
+1174 rows in set. Elapsed: 1099.368 sec. Processed 4.56 billion rows, 1.98 TB (4.15 million rows/s., 1.80 GB/s.)
+```
+
+The results look like:
+
+```response
+┌─view_count─┬─like_count─┬─dislike_count─┬─url──────────────────────────┬─title──────────────────────────────────────────────────────────────────────────────────────────────────┐
+│       1919 │         63 │             1 │ https://youtu.be/b9MeoOtAivQ │ ClickHouse v21.10 Release Webinar                                                                      │
+│       8710 │         62 │             4 │ https://youtu.be/PeV1mC2z--M │ What is JDBC DriverManager? | JDBC                                                                     │
+│       3534 │         62 │             1 │ https://youtu.be/8nWRhK9gw10 │ CLICKHOUSE - Arquitetura Modular                                                                       │
+```
+
+## Questions
+
+### If someone disables comments does it lower the chance someone will actually click like or dislike?
+
+When commenting is disabled, are people more likely to like or dislike to express their feelings about a video?
+
+```sql
+SELECT
+    concat('< ', formatReadableQuantity(view_range)) AS views,
+    is_comments_enabled,
+    total_clicks / num_views AS prob_like_dislike
+FROM
+(
+    SELECT
+        is_comments_enabled,
+        power(10, CEILING(log10(view_count + 1))) AS view_range,
+        sum(like_count + dislike_count) AS total_clicks,
+        sum(view_count) AS num_views
+    FROM youtube
+    GROUP BY
+        view_range,
+        is_comments_enabled
+) WHERE view_range > 1
+ORDER BY
+    is_comments_enabled ASC,
+    num_views ASC;
+```
+
+```response
+┌─views─────────────┬─is_comments_enabled─┬────prob_like_dislike─┐
+│ < 10.00           │ false               │  0.08224180712685371 │
+│ < 100.00          │ false               │  0.06346337759167248 │
+│ < 1.00 thousand   │ false               │  0.03201883652987105 │
+│ < 10.00 thousand  │ false               │  0.01716073540410903 │
+│ < 10.00 billion   │ false               │ 0.004555639481829971 │
+│ < 100.00 thousand │ false               │  0.01293351460515323 │
+│ < 1.00 billion    │ false               │ 0.004761811192464957 │
+│ < 1.00 million    │ false               │ 0.010472604018980551 │
+│ < 10.00 million   │ false               │  0.00788902538420125 │
+│ < 100.00 million  │ false               │  0.00579152804250582 │
+│ < 10.00           │ true                │  0.09819517478134059 │
+│ < 100.00          │ true                │  0.07403784478585775 │
+│ < 1.00 thousand   │ true                │  0.03846294910067627 │
+│ < 10.00 billion   │ true                │ 0.005615217329358215 │
+│ < 10.00 thousand  │ true                │  0.02505881391701455 │
+│ < 1.00 billion    │ true                │ 0.007434998802482997 │
+│ < 100.00 thousand │ true                │ 0.022694648130822004 │
+│ < 100.00 million  │ true                │ 0.011761563746575625 │
+│ < 1.00 million    │ true                │ 0.020776022304589435 │
+│ < 10.00 million   │ true                │ 0.016917095718089584 │
+└───────────────────┴─────────────────────┴──────────────────────┘
+
+22 rows in set. Elapsed: 8.460 sec. Processed 4.56 billion rows, 77.48 GB (538.73 million rows/s., 9.16 GB/s.)
+```
+
+Enabling comments seems to be correlated with a higher rate of engagement.
+
+
+### How does the number of videos change over time - notable events?
+
+```sql
+SELECT
+    toStartOfMonth(toDateTime(upload_date)) AS month,
+    uniq(uploader_id) AS uploaders,
+    count() as num_videos,
+    sum(view_count) as view_count
+FROM youtube
+GROUP BY month
+ORDER BY month ASC;
+```
+
+```response
+┌──────month─┬─uploaders─┬─num_videos─┬───view_count─┐
+│ 2005-04-01 │         5 │          6 │    213597737 │
+│ 2005-05-01 │         6 │          9 │      2944005 │
+│ 2005-06-01 │       165 │        351 │     18624981 │
+│ 2005-07-01 │       395 │       1168 │     94164872 │
+│ 2005-08-01 │      1171 │       3128 │    124540774 │
+│ 2005-09-01 │      2418 │       5206 │    475536249 │
+│ 2005-10-01 │      6750 │      13747 │    737593613 │
+│ 2005-11-01 │     13706 │      28078 │   1896116976 │
+│ 2005-12-01 │     24756 │      49885 │   2478418930 │
+│ 2006-01-01 │     49992 │     100447 │   4532656581 │
+│ 2006-02-01 │     67882 │     138485 │   5677516317 │
+│ 2006-03-01 │    103358 │     212237 │   8430301366 │
+│ 2006-04-01 │    114615 │     234174 │   9980760440 │
+│ 2006-05-01 │    152682 │     332076 │  14129117212 │
+│ 2006-06-01 │    193962 │     429538 │  17014143263 │
+│ 2006-07-01 │    234401 │     530311 │  18721143410 │
+│ 2006-08-01 │    281280 │     614128 │  20473502342 │
+│ 2006-09-01 │    312434 │     679906 │  23158422265 │
+│ 2006-10-01 │    404873 │     897590 │  27357846117 │
+```
+
+A spike of uploaders [around covid is noticeable](https://www.theverge.com/2020/3/27/21197642/youtube-with-me-style-videos-views-coronavirus-cook-workout-study-home-beauty).
+
+
+### More subtitiles over time and when
+
+With advances in speech recognition, it’s easier than ever to create subtitles for video with youtube adding auto-captioning in late 2009 - was the jump then?
+
+```sql
+SELECT
+    toStartOfMonth(upload_date) AS month,
+    countIf(has_subtitles) / count() AS percent_subtitles,
+    percent_subtitles - any(percent_subtitles) OVER (
+        ORDER BY month ASC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING
+    ) AS previous
+FROM youtube
+GROUP BY month
+ORDER BY month ASC;
+```
+
+```response
+┌──────month─┬───percent_subtitles─┬────────────────previous─┐
+│ 2015-01-01 │  0.2652653881082824 │      0.2652653881082824 │
+│ 2015-02-01 │  0.3147556050309162 │    0.049490216922633834 │
+│ 2015-03-01 │ 0.32460464492371877 │    0.009849039892802558 │
+│ 2015-04-01 │ 0.33471963051468445 │    0.010114985590965686 │
+│ 2015-05-01 │  0.3168087575501062 │   -0.017910872964578273 │
+│ 2015-06-01 │  0.3162609788438222 │  -0.0005477787062839745 │
+│ 2015-07-01 │ 0.31828767677518033 │   0.0020266979313581235 │
+│ 2015-08-01 │  0.3045551564286859 │   -0.013732520346494415 │
+│ 2015-09-01 │   0.311221133995152 │    0.006665977566466086 │
+│ 2015-10-01 │ 0.30574870926812175 │   -0.005472424727030245 │
+│ 2015-11-01 │ 0.31125409712077234 │   0.0055053878526505895 │
+│ 2015-12-01 │  0.3190967954651779 │    0.007842698344405541 │
+│ 2016-01-01 │ 0.32636021432496176 │    0.007263418859783877 │
+
+```
+
+The data results show a spike in 2009. Apparently at that, time YouTube was removing their community captions feature, which allowed you to upload captions for other people's video.
+This prompted a very successful campaign to have creators add captions to their videos for hard of hearing and deaf viewers.
+
+
+### Top uploaders over time
+
+```sql
+WITH uploaders AS
+    (
+        SELECT uploader
+        FROM youtube
+        GROUP BY uploader
+        ORDER BY sum(view_count) DESC
+        LIMIT 10
+    )
+SELECT
+    month,
+    uploader,
+    sum(view_count) AS total_views,
+    avg(dislike_count / like_count) AS like_to_dislike_ratio
+FROM youtube
+WHERE uploader IN (uploaders)
+GROUP BY
+    toStartOfMonth(upload_date) AS month,
+    uploader
+ORDER BY
+    month ASC,
+    total_views DESC;
+```
+
+```response
+┌──────month─┬─uploader───────────────────┬─total_views─┬─like_to_dislike_ratio─┐
+│ 1970-01-01 │ T-Series                   │    10957099 │  0.022784656361208206 │
+│ 1970-01-01 │ Ryan's World               │           0 │  0.003035559410234172 │
+│ 1970-01-01 │ SET India                  │           0 │                   nan │
+│ 2006-09-01 │ Cocomelon - Nursery Rhymes │   256406497 │    0.7005566715978622 │
+│ 2007-06-01 │ Cocomelon - Nursery Rhymes │    33641320 │    0.7088650914344298 │
+│ 2008-02-01 │ WWE                        │    43733469 │   0.07198856488734842 │
+│ 2008-03-01 │ WWE                        │    16514541 │    0.1230603715431997 │
+│ 2008-04-01 │ WWE                        │     5907295 │    0.2089399470159618 │
+│ 2008-05-01 │ WWE                        │     7779627 │   0.09101676560436774 │
+│ 2008-06-01 │ WWE                        │     7018780 │    0.0974184753155297 │
+│ 2008-07-01 │ WWE                        │     4686447 │    0.1263845422065158 │
+│ 2008-08-01 │ WWE                        │     4514312 │   0.08384574274791441 │
+│ 2008-09-01 │ WWE                        │     3717092 │   0.07872802579349912 │
+```
+
+### How do like ratio changes as views go up?
+
+```sql
+SELECT
+    concat('< ', formatReadableQuantity(view_range)) AS view_range,
+    is_comments_enabled,
+    round(like_ratio, 2) AS like_ratio
+FROM
+(
+SELECT
+    power(10, CEILING(log10(view_count + 1))) as view_range,
+    is_comments_enabled,
+    avg(like_count / dislike_count) as like_ratio
+FROM youtube WHERE dislike_count > 0
+GROUP BY
+    view_range,
+    is_comments_enabled HAVING view_range > 1
+ORDER BY
+    view_range ASC,
+    is_comments_enabled ASC
+);
+```
+
+```response
+┌─view_range────────┬─is_comments_enabled─┬─like_ratio─┐
+│ < 10.00           │ false               │       0.66 │
+│ < 10.00           │ true                │       0.66 │
+│ < 100.00          │ false               │          3 │
+│ < 100.00          │ true                │       3.95 │
+│ < 1.00 thousand   │ false               │       8.45 │
+│ < 1.00 thousand   │ true                │      13.07 │
+│ < 10.00 thousand  │ false               │      18.57 │
+│ < 10.00 thousand  │ true                │      30.92 │
+│ < 100.00 thousand │ false               │      23.55 │
+│ < 100.00 thousand │ true                │      42.13 │
+│ < 1.00 million    │ false               │      19.23 │
+│ < 1.00 million    │ true                │      37.86 │
+│ < 10.00 million   │ false               │      12.13 │
+│ < 10.00 million   │ true                │      30.72 │
+│ < 100.00 million  │ false               │       6.67 │
+│ < 100.00 million  │ true                │      23.32 │
+│ < 1.00 billion    │ false               │       3.08 │
+│ < 1.00 billion    │ true                │      20.69 │
+│ < 10.00 billion   │ false               │       1.77 │
+│ < 10.00 billion   │ true                │       19.5 │
+└───────────────────┴─────────────────────┴────────────┘
+```
+
+### How are views distributed?
+
+```sql
+SELECT
+    labels AS percentile,
+    round(quantiles) AS views
+FROM
+(
+    SELECT
+        quantiles(0.999, 0.99, 0.95, 0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1)(view_count) AS quantiles,
+        ['99.9th', '99th', '95th', '90th', '80th', '70th','60th', '50th', '40th', '30th', '20th', '10th'] AS labels
+    FROM youtube
+)
+ARRAY JOIN
+    quantiles,
+    labels;
+```
+
+```response
+┌─percentile─┬───views─┐
+│ 99.9th     │ 1216624 │
+│ 99th       │  143519 │
+│ 95th       │   13542 │
+│ 90th       │    4054 │
+│ 80th       │     950 │
+│ 70th       │     363 │
+│ 60th       │     177 │
+│ 50th       │      97 │
+│ 40th       │      57 │
+│ 30th       │      32 │
+│ 20th       │      16 │
+│ 10th       │       6 │
+└────────────┴─────────┘
+```
\ No newline at end of file
diff --git a/docs/en/getting-started/install.md b/docs/en/getting-started/install.md
index 0867f3a0795..3f6c2577c94 100644
--- a/docs/en/getting-started/install.md
+++ b/docs/en/getting-started/install.md
@@ -14,75 +14,35 @@ import CodeBlock from '@theme/CodeBlock';
 You have three options for getting up and running with ClickHouse:
 
 - **[ClickHouse Cloud](https://clickhouse.com/cloud/):** The official ClickHouse as a service, - built by, maintained and supported by the creators of ClickHouse
-- **[Self-managed ClickHouse](#self-managed-install):** ClickHouse can run on any Linux, FreeBSD, or macOS with x86-64, ARM, or PowerPC64LE CPU architecture
-- **[Docker Image](https://hub.docker.com/r/clickhouse/clickhouse-server/):** Read the guide with the official image in Docker Hub
+- **[Quick Install](#quick-install):** an easy-to-download binary for testing and developing with ClickHouse
+- **[Production Deployments](#available-installation-options):** ClickHouse can run on any Linux, FreeBSD, or macOS with x86-64, ARM, or PowerPC64LE CPU architecture
+- **[Docker Image](https://hub.docker.com/r/clickhouse/clickhouse-server/):** use the official Docker image in Docker Hub
 
 ## ClickHouse Cloud
 
 The quickest and easiest way to get up and running with ClickHouse is to create a new service in [ClickHouse Cloud](https://clickhouse.cloud/).
 
-## Self-Managed Install
+## Quick Install
 
 :::tip
 For production installs of a specific release version see the [installation options](#available-installation-options) down below.
 :::
 
-<Tabs>
-<TabItem value="linux" label="Linux" default>
+On Linux and macOS:
 
-1. The simplest way to download ClickHouse locally is to run the following command. If your operating system is supported, an appropriate ClickHouse binary will be downloaded and made runnable:
+1. If you are just getting started and want to see what ClickHouse can do, the simplest way to download ClickHouse locally is to run the following command. It downloads a single binary for your operating system that can be used to run the ClickHouse server, clickhouse-client, clickhouse-local,
+ClickHouse Keeper, and other tools:
 
   ```bash
   curl https://clickhouse.com/ | sh
   ```
 
-1. Run the `install` command, which defines a collection of useful symlinks along with the files and folders used by ClickHouse - all of which you can see in the output of the install script:
-
-  ```bash
-  sudo ./clickhouse install
-  ```
-
-1. At the end of the install script, you are prompted for a password for the `default` user. Feel free to enter a password, or you can optionally leave it blank:
-
-  ```response
-  Creating log directory /var/log/clickhouse-server.
-  Creating data directory /var/lib/clickhouse.
-  Creating pid directory /var/run/clickhouse-server.
-   chown -R clickhouse:clickhouse '/var/log/clickhouse-server'
-   chown -R clickhouse:clickhouse '/var/run/clickhouse-server'
-   chown  clickhouse:clickhouse '/var/lib/clickhouse'
-  Enter password for default user:
-  ```
-  You should see the following output:
-
-  ```response
-   ClickHouse has been successfully installed.
-
-   Start clickhouse-server with:
-    sudo clickhouse start
-
-   Start clickhouse-client with:
-    clickhouse-client
-  ```
-
 1. Run the following command to start the ClickHouse server:
     ```bash
-    sudo clickhouse start
+    ./clickhouse server
     ```
 
-</TabItem>
-<TabItem value="macos" label="macOS">
-
-1. The simplest way to download ClickHouse locally is to run the following command. If your operating system is supported, an appropriate ClickHouse binary will be downloaded and made runnable:
-  ```bash
-  curl https://clickhouse.com/ | sh
-  ```
-
-1. Run the ClickHouse server:
-
-  ```bash
-  ./clickhouse server
-  ```
+    The first time you run this script, the necessary files and folders are created in the current directory, then the server starts.
 
 1. Open a new terminal and use the **clickhouse-client** to connect to your service:
 
@@ -101,15 +61,14 @@ For production installs of a specific release version see the [installation opti
 
   You are ready to start sending DDL and SQL commands to ClickHouse!
 
-</TabItem>
-</Tabs>
-
 
 :::tip
-The [Quick Start](/docs/en/quick-start.mdx/#step-1-get-clickhouse) walks through the steps to download and run ClickHouse, connect to it, and insert data.
+The [Quick Start](/docs/en/quick-start.mdx) walks through the steps for creating tables and inserting data.
 :::
 
-## Available Installation Options {#available-installation-options}
+## Production Deployments {#available-installation-options}
+
+For production deployments of ClickHouse, choose from one of the following install options.
 
 ### From DEB Packages {#install-from-deb-packages}
 
@@ -118,9 +77,12 @@ It is recommended to use official pre-compiled `deb` packages for Debian or Ubun
 #### Setup the Debian repository
 ``` bash
 sudo apt-get install -y apt-transport-https ca-certificates dirmngr
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8919F6BD2B48D754
+GNUPGHOME=$(mktemp -d)
+sudo GNUPGHOME="$GNUPGHOME" gpg --no-default-keyring --keyring /usr/share/keyrings/clickhouse-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8919F6BD2B48D754
+sudo rm -r "$GNUPGHOME"
+sudo chmod +r /usr/share/keyrings/clickhouse-keyring.gpg
 
-echo "deb https://packages.clickhouse.com/deb stable main" | sudo tee \
+echo "deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb stable main" | sudo tee \
     /etc/apt/sources.list.d/clickhouse.list
 sudo apt-get update
 ```
@@ -174,15 +136,16 @@ clickhouse-client # or "clickhouse-client --password" if you set up a password.
 
 </details>
 
-You can replace `stable` with `lts` to use different [release kinds](/docs/en/faq/operations/production.md) based on your needs.
+You can replace `stable` with `lts` to use different [release kinds](/knowledgebase/production) based on your needs.
 
 You can also download and install packages manually from [here](https://packages.clickhouse.com/deb/pool/main/c/).
 
 #### Install standalone ClickHouse Keeper
 
 :::tip
-If you are going to run ClickHouse Keeper on the same server as ClickHouse server you
-do not need to install ClickHouse Keeper as it is included with ClickHouse server.  This command is only needed on standalone ClickHouse Keeper servers.
+In production environment we [strongly recommend](/docs/en/operations/tips.md#L143-L144) running ClickHouse Keeper on dedicated nodes.
+In test environments, if you decide to run ClickHouse Server and ClickHouse Keeper on the same server,  you do not need to install ClickHouse Keeper as it is included with ClickHouse server.
+This command is only needed on standalone ClickHouse Keeper servers.
 :::
 
 ```bash
@@ -199,11 +162,11 @@ sudo systemctl status clickhouse-keeper
 
 #### Packages {#packages}
 
--   `clickhouse-common-static` — Installs ClickHouse compiled binary files.
--   `clickhouse-server` — Creates a symbolic link for `clickhouse-server` and installs the default server configuration.
--   `clickhouse-client` — Creates a symbolic link for `clickhouse-client` and other client-related tools. and installs client configuration files.
--   `clickhouse-common-static-dbg` — Installs ClickHouse compiled binary files with debug info.
--   `clickhouse-keeper` - Used to install ClickHouse Keeper on dedicated ClickHouse Keeper nodes.  If you are running ClickHouse Keeper on the same server as ClickHouse server, then you do not need to install this package. Installs ClickHouse Keeper and the default ClickHouse Keeper configuration files.
+- `clickhouse-common-static` — Installs ClickHouse compiled binary files.
+- `clickhouse-server` — Creates a symbolic link for `clickhouse-server` and installs the default server configuration.
+- `clickhouse-client` — Creates a symbolic link for `clickhouse-client` and other client-related tools. and installs client configuration files.
+- `clickhouse-common-static-dbg` — Installs ClickHouse compiled binary files with debug info.
+- `clickhouse-keeper` - Used to install ClickHouse Keeper on dedicated ClickHouse Keeper nodes.  If you are running ClickHouse Keeper on the same server as ClickHouse server, then you do not need to install this package. Installs ClickHouse Keeper and the default ClickHouse Keeper configuration files.
 
 :::info
 If you need to install specific version of ClickHouse you have to install all packages with the same version:
@@ -222,6 +185,15 @@ sudo yum install -y yum-utils
 sudo yum-config-manager --add-repo https://packages.clickhouse.com/rpm/clickhouse.repo
 ```
 
+For systems with `zypper` package manager (openSUSE, SLES):
+
+``` bash
+sudo zypper addrepo -r https://packages.clickhouse.com/rpm/clickhouse.repo -g
+sudo zypper --gpg-auto-import-keys refresh clickhouse-stable
+```
+
+Later any `yum install` can be replaced by `zypper install`. To specify a particular version, add `-$VERSION` to the end of the package name, e.g. `clickhouse-client-22.2.2.22`.
+
 #### Install ClickHouse server and client
 
 ```bash
@@ -240,8 +212,9 @@ clickhouse-client # or "clickhouse-client --password" if you set up a password.
 #### Install standalone ClickHouse Keeper
 
 :::tip
-If you are going to run ClickHouse Keeper on the same server as ClickHouse server you
-do not need to install ClickHouse Keeper as it is included with ClickHouse server.  This command is only needed on standalone ClickHouse Keeper servers.
+In production environment we [strongly recommend](/docs/en/operations/tips.md#L143-L144) running ClickHouse Keeper on dedicated nodes.
+In test environments, if you decide to run ClickHouse Server and ClickHouse Keeper on the same server,  you do not need to install ClickHouse Keeper as it is included with ClickHouse server.
+This command is only needed on standalone ClickHouse Keeper servers.
 :::
 
 ```bash
@@ -272,7 +245,7 @@ clickhouse-client # or "clickhouse-client --password" if you set up a password.
 
 </details>
 
-You can replace `stable` with `lts` to use different [release kinds](/docs/en/faq/operations/production.md) based on your needs.
+You can replace `stable` with `lts` to use different [release kinds](/knowledgebase/production) based on your needs.
 
 Then run these commands to install packages:
 
@@ -467,8 +440,8 @@ We recommend using a minimum of 4GB of RAM to perform non-trivial queries. The C
 
 The required volume of RAM generally depends on:
 
--   The complexity of queries.
--   The amount of data that is processed in queries.
+- The complexity of queries.
+- The amount of data that is processed in queries.
 
 To calculate the required volume of RAM, you may estimate the size of temporary data for [GROUP BY](/docs/en/sql-reference/statements/select/group-by.md#select-group-by-clause), [DISTINCT](/docs/en/sql-reference/statements/select/distinct.md#select-distinct), [JOIN](/docs/en/sql-reference/statements/select/join.md#select-join) and other operations you use.
 
@@ -480,11 +453,11 @@ The ClickHouse binary requires at least 2.5 GB of disk space for installation.
 
 The volume of storage required for your data may be calculated separately based on
 
--   an estimation of the data volume.
+- an estimation of the data volume.
 
     You can take a sample of the data and get the average size of a row from it. Then multiply the value by the number of rows you plan to store.
 
--   The data compression coefficient.
+- The data compression coefficient.
 
     To estimate the data compression coefficient, load a sample of your data into ClickHouse, and compare the actual size of the data with the size of the table stored. For example, clickstream data is usually compressed by 6-10 times.
 
diff --git a/docs/en/getting-started/playground.md b/docs/en/getting-started/playground.md
index e995ea6ef8b..6a6d4092177 100644
--- a/docs/en/getting-started/playground.md
+++ b/docs/en/getting-started/playground.md
@@ -1,5 +1,5 @@
 ---
-sidebar_label: Playground
+sidebar_label: ClickHouse Playground
 sidebar_position: 2
 keywords: [clickhouse, playground, getting, started, docs]
 description: The ClickHouse Playground allows people to experiment with ClickHouse by running queries instantly, without setting up their server or cluster.
@@ -11,7 +11,7 @@ slug: /en/getting-started/playground
 [ClickHouse Playground](https://play.clickhouse.com/play?user=play) allows people to experiment with ClickHouse by running queries instantly, without setting up their server or cluster.
 Several example datasets are available in Playground.
 
-You can make queries to Playground using any HTTP client, for example [curl](https://curl.haxx.se) or [wget](https://www.gnu.org/software/wget/), or set up a connection using [JDBC](../interfaces/jdbc.md) or [ODBC](../interfaces/odbc.md) drivers. More information about software products that support ClickHouse is available [here](../interfaces).
+You can make queries to Playground using any HTTP client, for example [curl](https://curl.haxx.se) or [wget](https://www.gnu.org/software/wget/), or set up a connection using [JDBC](../interfaces/jdbc.md) or [ODBC](../interfaces/odbc.md) drivers. More information about software products that support ClickHouse is available [here](../integrations/index.mdx).
 
 ## Credentials {#credentials}
 
@@ -26,8 +26,8 @@ You can make queries to Playground using any HTTP client, for example [curl](htt
 
 The queries are executed as a read-only user. It implies some limitations:
 
--   DDL queries are not allowed
--   INSERT queries are not allowed
+- DDL queries are not allowed
+- INSERT queries are not allowed
 
 The service also have quotas on its usage.
 
diff --git a/docs/en/interfaces/cli.md b/docs/en/interfaces/cli.md
index e3b40d83efe..f670d464006 100644
--- a/docs/en/interfaces/cli.md
+++ b/docs/en/interfaces/cli.md
@@ -119,7 +119,7 @@ When processing a query, the client shows:
 1.  Progress, which is updated no more than 10 times per second (by default). For quick queries, the progress might not have time to be displayed.
 2.  The formatted query after parsing, for debugging.
 3.  The result in the specified format.
-4.  The number of lines in the result, the time passed, and the average speed of query processing.
+4.  The number of lines in the result, the time passed, and the average speed of query processing. All data amounts refer to uncompressed data.
 
 You can cancel a long query by pressing Ctrl+C. However, you will still need to wait for a little for the server to abort the request. It is not possible to cancel a query at certain stages. If you do not wait and press Ctrl+C a second time, the client will exit.
 
@@ -148,8 +148,8 @@ Format a query as usual, then place the values that you want to pass from the ap
 {<name>:<data type>}
 ```
 
--   `name` — Placeholder identifier. In the console client it should be used in app parameters as `--param_<name> = value`.
--   `data type` — [Data type](../sql-reference/data-types/index.md) of the app parameter value. For example, a data structure like `(integer, ('string', integer))` can have the `Tuple(UInt8, Tuple(String, UInt8))` data type (you can also use another [integer](../sql-reference/data-types/int-uint.md) types). It's also possible to pass table, database, column names as a parameter, in that case you would need to use `Identifier` as a data type.
+- `name` — Placeholder identifier. In the console client it should be used in app parameters as `--param_<name> = value`.
+- `data type` — [Data type](../sql-reference/data-types/index.md) of the app parameter value. For example, a data structure like `(integer, ('string', integer))` can have the `Tuple(UInt8, Tuple(String, UInt8))` data type (you can also use another [integer](../sql-reference/data-types/int-uint.md) types). It's also possible to pass table, database, column names as a parameter, in that case you would need to use `Identifier` as a data type.
 
 #### Example {#example}
 
@@ -162,37 +162,37 @@ $ clickhouse-client --param_tbl="numbers" --param_db="system" --param_col="numbe
 
 You can pass parameters to `clickhouse-client` (all parameters have a default value) using:
 
--   From the Command Line
+- From the Command Line
 
     Command-line options override the default values and settings in configuration files.
 
--   Configuration files.
+- Configuration files.
 
     Settings in the configuration files override the default values.
 
 ### Command Line Options {#command-line-options}
 
--   `--host, -h` – The server name, ‘localhost’ by default. You can use either the name or the IPv4 or IPv6 address.
--   `--port` – The port to connect to. Default value: 9000. Note that the HTTP interface and the native interface use different ports.
--   `--user, -u` – The username. Default value: default.
--   `--password` – The password. Default value: empty string.
--   `--ask-password` - Prompt the user to enter a password.
--   `--query, -q` – The query to process when using non-interactive mode. You must specify either `query` or `queries-file` option.
--   `--queries-file` – file path with queries to execute. You must specify either `query` or `queries-file` option.
--   `--database, -d` – Select the current default database. Default value: the current database from the server settings (‘default’ by default).
--   `--multiline, -m` – If specified, allow multiline queries (do not send the query on Enter).
--   `--multiquery, -n` – If specified, allow processing multiple queries separated by semicolons.
--   `--format, -f` – Use the specified default format to output the result.
--   `--vertical, -E` – If specified, use the [Vertical format](../interfaces/formats.md#vertical) by default to output the result. This is the same as `–format=Vertical`. In this format, each value is printed on a separate line, which is helpful when displaying wide tables.
--   `--time, -t` – If specified, print the query execution time to ‘stderr’ in non-interactive mode.
--   `--stacktrace` – If specified, also print the stack trace if an exception occurs.
--   `--config-file` – The name of the configuration file.
--   `--secure` – If specified, will connect to server over secure connection (TLS). You might need to configure your CA certificates in the [configuration file](#configuration_files). The available configuration settings are the same as for [server-side TLS configuration](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-openssl).
--   `--history_file` — Path to a file containing command history.
--   `--param_<name>` — Value for a [query with parameters](#cli-queries-with-parameters).
--   `--hardware-utilization` — Print hardware utilization information in progress bar.
--   `--print-profile-events` – Print `ProfileEvents` packets.
--   `--profile-events-delay-ms` – Delay between printing `ProfileEvents` packets (-1 - print only totals, 0 - print every single packet).
+- `--host, -h` – The server name, ‘localhost’ by default. You can use either the name or the IPv4 or IPv6 address.
+- `--port` – The port to connect to. Default value: 9000. Note that the HTTP interface and the native interface use different ports.
+- `--user, -u` – The username. Default value: default.
+- `--password` – The password. Default value: empty string.
+- `--ask-password` - Prompt the user to enter a password.
+- `--query, -q` – The query to process when using non-interactive mode. Cannot be used simultaneously with `--queries-file`.
+- `--queries-file` – file path with queries to execute. Cannot be used simultaneously with `--query`.
+- `--multiquery, -n` – If specified, multiple queries separated by semicolons can be listed after the `--query` option. For convenience, it is also possible to omit `--query` and pass the queries directly after `--multiquery`.
+- `--multiline, -m` – If specified, allow multiline queries (do not send the query on Enter).
+- `--database, -d` – Select the current default database. Default value: the current database from the server settings (‘default’ by default).
+- `--format, -f` – Use the specified default format to output the result.
+- `--vertical, -E` – If specified, use the [Vertical format](../interfaces/formats.md#vertical) by default to output the result. This is the same as `–format=Vertical`. In this format, each value is printed on a separate line, which is helpful when displaying wide tables.
+- `--time, -t` – If specified, print the query execution time to ‘stderr’ in non-interactive mode.
+- `--stacktrace` – If specified, also print the stack trace if an exception occurs.
+- `--config-file` – The name of the configuration file.
+- `--secure` – If specified, will connect to server over secure connection (TLS). You might need to configure your CA certificates in the [configuration file](#configuration_files). The available configuration settings are the same as for [server-side TLS configuration](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-openssl).
+- `--history_file` — Path to a file containing command history.
+- `--param_<name>` — Value for a [query with parameters](#cli-queries-with-parameters).
+- `--hardware-utilization` — Print hardware utilization information in progress bar.
+- `--print-profile-events` – Print `ProfileEvents` packets.
+- `--profile-events-delay-ms` – Delay between printing `ProfileEvents` packets (-1 - print only totals, 0 - print every single packet).
 
 Since version 20.5, `clickhouse-client` has automatic syntax highlighting (always enabled).
 
@@ -200,10 +200,10 @@ Since version 20.5, `clickhouse-client` has automatic syntax highlighting (alway
 
 `clickhouse-client` uses the first existing file of the following:
 
--   Defined in the `--config-file` parameter.
--   `./clickhouse-client.xml`
--   `~/.clickhouse-client/config.xml`
--   `/etc/clickhouse-client/config.xml`
+- Defined in the `--config-file` parameter.
+- `./clickhouse-client.xml`
+- `~/.clickhouse-client/config.xml`
+- `/etc/clickhouse-client/config.xml`
 
 Example of a config file:
 
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index b2b2c6d5b1e..2ab9e8caec4 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -1,7 +1,7 @@
 ---
 slug: /en/interfaces/formats
 sidebar_position: 21
-sidebar_label: Input and Output Formats
+sidebar_label: View all formats...
 title: Formats for Input and Output Data
 ---
 
@@ -38,6 +38,7 @@ The supported formats are:
 | [JSONCompactStrings](#jsoncompactstrings)                                                 | ✗    | ✔      |
 | [JSONCompactColumns](#jsoncompactcolumns)                                                 | ✔    | ✔      |
 | [JSONEachRow](#jsoneachrow)                                                               | ✔    | ✔      |
+| [PrettyJSONEachRow](#prettyjsoneachrow)                                                   | ✗    | ✔      |
 | [JSONEachRowWithProgress](#jsoneachrowwithprogress)                                       | ✗    | ✔      |
 | [JSONStringsEachRow](#jsonstringseachrow)                                                 | ✔    | ✔      |
 | [JSONStringsEachRowWithProgress](#jsonstringseachrowwithprogress)                         | ✗    | ✔      |
@@ -68,6 +69,7 @@ The supported formats are:
 | [Avro](#data-format-avro)                                                                 | ✔    | ✔      |
 | [AvroConfluent](#data-format-avro-confluent)                                              | ✔    | ✗      |
 | [Parquet](#data-format-parquet)                                                           | ✔    | ✔      |
+| [ParquetMetadata](#data-format-parquet-metadata)                                          | ✔    | ✗      |
 | [Arrow](#data-format-arrow)                                                               | ✔    | ✔      |
 | [ArrowStream](#data-format-arrow-stream)                                                  | ✔    | ✔      |
 | [ORC](#data-format-orc)                                                                   | ✔    | ✔      |
@@ -78,7 +80,7 @@ The supported formats are:
 | [Null](#null)                                                                             | ✗    | ✔      |
 | [XML](#xml)                                                                               | ✗    | ✔      |
 | [CapnProto](#capnproto)                                                                   | ✔    | ✔      |
-| [LineAsString](#lineasstring)                                                             | ✔    | ✗      |
+| [LineAsString](#lineasstring)                                                             | ✔    | ✔      |
 | [Regexp](#data-format-regexp)                                                             | ✔    | ✗      |
 | [RawBLOB](#rawblob)                                                                       | ✔    | ✔      |
 | [MsgPack](#msgpack)                                                                       | ✔    | ✔      |
@@ -154,7 +156,7 @@ Arrays are written as a list of comma-separated values in square brackets. Numbe
 In input data, ENUM values can be represented as names or as ids. First, we try to match the input value to the ENUM name. If we fail and the input value is a number, we try to match this number to ENUM id.
 If input data contains only ENUM ids, it's recommended to enable the setting [input_format_tsv_enum_as_number](/docs/en/operations/settings/settings-formats.md/#input_format_tsv_enum_as_number) to optimize ENUM parsing.
 
-Each element of [Nested](/docs/en/sql-reference/data-types/nested-data-structures/nested.md) structures is represented as an array.
+Each element of [Nested](/docs/en/sql-reference/data-types/nested-data-structures/index.md) structures is represented as an array.
 
 For example:
 
@@ -205,7 +207,7 @@ Differs from the `TabSeparated` format in that the column names are written in t
 
 During parsing, the first row is expected to contain the column names. You can use column names to determine their position and to check their correctness.
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from the input data will be mapped to the columns of the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -217,7 +219,7 @@ This format is also available under the name `TSVWithNames`.
 
 Differs from the `TabSeparated` format in that the column names are written to the first row, while the column types are in the second row.
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from the input data will be mapped to the columns in the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -255,11 +257,11 @@ where `delimiter_i` is a delimiter between values (`$` symbol can be escaped as
 `column_i` is a name or index of a column whose values are to be selected or inserted (if empty, then column will be skipped),
 `serializeAs_i` is an escaping rule for the column values. The following escaping rules are supported:
 
--   `CSV`, `JSON`, `XML` (similar to the formats of the same names)
--   `Escaped` (similar to `TSV`)
--   `Quoted` (similar to `Values`)
--   `Raw` (without escaping, similar to `TSVRaw`)
--   `None` (no escaping rule, see further)
+- `CSV`, `JSON`, `XML` (similar to the formats of the same names)
+- `Escaped` (similar to `TSV`)
+- `Quoted` (similar to `Values`)
+- `Raw` (without escaping, similar to `TSVRaw`)
+- `None` (no escaping rule, see further)
 
 If an escaping rule is omitted, then `None` will be used. `XML` is suitable only for output.
 
@@ -275,15 +277,15 @@ The `format_template_rows_between_delimiter` setting specifies the delimiter bet
 
 Setting `format_template_resultset` specifies the path to the file, which contains a format string for resultset. Format string for resultset has the same syntax as a format string for row and allows to specify a prefix, a suffix and a way to print some additional information. It contains the following placeholders instead of column names:
 
--   `data` is the rows with data in `format_template_row` format, separated by `format_template_rows_between_delimiter`. This placeholder must be the first placeholder in the format string.
--   `totals` is the row with total values in `format_template_row` format (when using WITH TOTALS)
--   `min` is the row with minimum values in `format_template_row` format (when extremes are set to 1)
--   `max` is the row with maximum values in `format_template_row` format (when extremes are set to 1)
--   `rows` is the total number of output rows
--   `rows_before_limit` is the minimal number of rows there would have been without LIMIT. Output only if the query contains LIMIT. If the query contains GROUP BY, rows_before_limit_at_least is the exact number of rows there would have been without a LIMIT.
--   `time` is the request execution time in seconds
--   `rows_read` is the number of rows has been read
--   `bytes_read` is the number of bytes (uncompressed) has been read
+- `data` is the rows with data in `format_template_row` format, separated by `format_template_rows_between_delimiter`. This placeholder must be the first placeholder in the format string.
+- `totals` is the row with total values in `format_template_row` format (when using WITH TOTALS)
+- `min` is the row with minimum values in `format_template_row` format (when extremes are set to 1)
+- `max` is the row with maximum values in `format_template_row` format (when extremes are set to 1)
+- `rows` is the total number of output rows
+- `rows_before_limit` is the minimal number of rows there would have been without LIMIT. Output only if the query contains LIMIT. If the query contains GROUP BY, rows_before_limit_at_least is the exact number of rows there would have been without a LIMIT.
+- `time` is the request execution time in seconds
+- `rows_read` is the number of rows has been read
+- `bytes_read` is the number of bytes (uncompressed) has been read
 
 The placeholders `data`, `totals`, `min` and `max` must not have escaping rule specified (or `None` must be specified explicitly). The remaining placeholders may have any escaping rule specified.
 If the `format_template_resultset` setting is an empty string, `${data}` is used as the default value.
@@ -470,7 +472,7 @@ The CSV format supports the output of totals and extremes the same way as `TabSe
 
 Also prints the header row with column names, similar to [TabSeparatedWithNames](#tabseparatedwithnames).
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from input data will be mapped to the columns from the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -480,7 +482,7 @@ Otherwise, the first row will be skipped.
 
 Also prints two header rows with column names and types, similar to [TabSeparatedWithNamesAndTypes](#tabseparatedwithnamesandtypes).
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from input data will be mapped to the columns from the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -500,7 +502,7 @@ There is also `CustomSeparatedIgnoreSpaces` format, which is similar to [Templat
 
 Also prints the header row with column names, similar to [TabSeparatedWithNames](#tabseparatedwithnames).
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from input data will be mapped to the columns from the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -510,7 +512,7 @@ Otherwise, the first row will be skipped.
 
 Also prints two header rows with column names and types, similar to [TabSeparatedWithNamesAndTypes](#tabseparatedwithnamesandtypes).
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from input data will be mapped to the columns from the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -619,8 +621,8 @@ ClickHouse supports [NULL](/docs/en/sql-reference/syntax.md), which is displayed
 
 **See Also**
 
--   [JSONEachRow](#jsoneachrow) format
--   [output_format_json_array_of_rows](/docs/en/operations/settings/settings-formats.md/#output_format_json_array_of_rows) setting
+- [JSONEachRow](#jsoneachrow) format
+- [output_format_json_array_of_rows](/docs/en/operations/settings/settings-formats.md/#output_format_json_array_of_rows) setting
 
 For JSON input format, if setting [input_format_json_validate_types_from_metadata](/docs/en/operations/settings/settings-formats.md/#input_format_json_validate_types_from_metadata) is set to 1,
 the types from metadata in input data will be compared with the types of the corresponding columns from the table.
@@ -684,7 +686,7 @@ Example:
 ## JSONColumns {#jsoncolumns}
 
 :::tip
-The output of the JSONColumns* formats provides the ClickHouse field name and then the content of each row of the table for that field; 
+The output of the JSONColumns* formats provides the ClickHouse field name and then the content of each row of the table for that field;
 visually, the data is rotated 90 degrees to the left.
 :::
 
@@ -917,6 +919,40 @@ Example:
 
 While importing data columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 
+## PrettyJSONEachRow {#prettyjsoneachrow}
+
+Differs from JSONEachRow only in that JSON is pretty formatted with new line delimiters and 4 space indents. Suitable only for output.
+
+Example
+
+```json
+{
+    "num": "42",
+    "str": "hello",
+    "arr": [
+        "0",
+        "1"
+    ],
+    "tuple": {
+        "num": 42,
+        "str": "world"
+    }
+}
+{
+    "num": "43",
+    "str": "hello",
+    "arr": [
+        "0",
+        "1",
+        "2"
+    ],
+    "tuple": {
+        "num": 43,
+        "str": "world"
+    }
+}
+```
+
 ## JSONStringsEachRow {#jsonstringseachrow}
 
 Differs from JSONEachRow only in that data fields are output in strings, not in typed JSON values.
@@ -969,7 +1005,7 @@ Differs from `JSONEachRow`/`JSONStringsEachRow` in that ClickHouse will also yie
 
 Differs from `JSONCompactEachRow` format in that it also prints the header row with column names, similar to [TabSeparatedWithNames](#tabseparatedwithnames).
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from input data will be mapped to the columns from the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -979,7 +1015,7 @@ Otherwise, the first row will be skipped.
 
 Differs from `JSONCompactEachRow` format in that it also prints two header rows with column names and types, similar to [TabSeparatedWithNamesAndTypes](#tabseparatedwithnamesandtypes).
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from input data will be mapped to the columns from the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -991,7 +1027,7 @@ the types from input data will be compared with the types of the corresponding c
 
 Differs from `JSONCompactStringsEachRow` in that in that it also prints the header row with column names, similar to [TabSeparatedWithNames](#tabseparatedwithnames).
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from input data will be mapped to the columns from the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -1001,7 +1037,7 @@ Otherwise, the first row will be skipped.
 
 Differs from `JSONCompactStringsEachRow` in that it also prints two header rows with column names and types, similar to [TabSeparatedWithNamesAndTypes](#tabseparatedwithnamesandtypes).
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from input data will be mapped to the columns from the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -1096,8 +1132,8 @@ INSERT INTO UserActivity FORMAT JSONEachRow {"PageViews":5, "UserID":"4324182021
 
 ClickHouse allows:
 
--   Any order of key-value pairs in the object.
--   Omitting some values.
+- Any order of key-value pairs in the object.
+- Omitting some values.
 
 ClickHouse ignores spaces between elements and commas after the objects. You can pass all the objects in one line. You do not have to separate them with line breaks.
 
@@ -1117,10 +1153,10 @@ CREATE TABLE IF NOT EXISTS example_table
 ) ENGINE = Memory;
 ```
 
--   If `input_format_defaults_for_omitted_fields = 0`, then the default value for `x` and `a` equals `0` (as the default value for the `UInt32` data type).
--   If `input_format_defaults_for_omitted_fields = 1`, then the default value for `x` equals `0`, but the default value of `a` equals `x * 2`.
+- If `input_format_defaults_for_omitted_fields = 0`, then the default value for `x` and `a` equals `0` (as the default value for the `UInt32` data type).
+- If `input_format_defaults_for_omitted_fields = 1`, then the default value for `x` equals `0`, but the default value of `a` equals `x * 2`.
 
-:::warning
+:::note
 When inserting data with `input_format_defaults_for_omitted_fields = 1`, ClickHouse consumes more computational resources, compared to insertion with `input_format_defaults_for_omitted_fields = 0`.
 :::
 
@@ -1150,7 +1186,7 @@ Any set of bytes can be output in the strings. Use the `JSONEachRow` format if y
 
 ### Usage of Nested Structures {#jsoneachrow-nested}
 
-If you have a table with [Nested](/docs/en/sql-reference/data-types/nested-data-structures/nested.md) data type columns, you can insert JSON data with the same structure. Enable this feature with the [input_format_import_nested_json](/docs/en/operations/settings/settings-formats.md/#input_format_import_nested_json) setting.
+If you have a table with [Nested](/docs/en/sql-reference/data-types/nested-data-structures/index.md) data type columns, you can insert JSON data with the same structure. Enable this feature with the [input_format_import_nested_json](/docs/en/operations/settings/settings-formats.md/#input_format_import_nested_json) setting.
 
 For example, consider the following table:
 
@@ -1232,51 +1268,53 @@ Each row is formatted as a single document and each column is formatted as a sin
 
 For output it uses the following correspondence between ClickHouse types and BSON types:
 
-| ClickHouse type                                                                                           | BSON Type                                                                                                 |
-|-----------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|
-| [Bool](/docs/en/sql-reference/data-types/boolean.md)                                                            | `\x08` boolean                                                                                            |
-| [Int8/UInt8](/docs/en/sql-reference/data-types/int-uint.md)                                                     | `\x10` int32                                                                                              |
-| [Int16UInt16](/docs/en/sql-reference/data-types/int-uint.md)                                                    | `\x10` int32                                                                                              |
-| [Int32](/docs/en/sql-reference/data-types/int-uint.md)                                                          | `\x10` int32                                                                                              |
-| [UInt32](/docs/en/sql-reference/data-types/int-uint.md)                                                         | `\x12` int64                                                                                              |
-| [Int64/UInt64](/docs/en/sql-reference/data-types/int-uint.md)                                                   | `\x12` int64                                                                                              |
-| [Float32/Float64](/docs/en/sql-reference/data-types/float.md)                                                   | `\x01` double                                                                                             |
-| [Date](/docs/en/sql-reference/data-types/date.md)/[Date32](/docs/en/sql-reference/data-types/date32.md)               | `\x10` int32                                                                                              |
-| [DateTime](/docs/en/sql-reference/data-types/datetime.md)                                                       | `\x12` int64                                                                                                |
-| [DateTime64](/docs/en/sql-reference/data-types/datetime64.md)                                                   | `\x09` datetime                                                                                             |
-| [Decimal32](/docs/en/sql-reference/data-types/decimal.md)                                                       | `\x10` int32                                                                                                |
-| [Decimal64](/docs/en/sql-reference/data-types/decimal.md)                                                       | `\x12` int64                                                                                                |
-| [Decimal128](/docs/en/sql-reference/data-types/decimal.md)                                                      | `\x05` binary, `\x00` binary subtype, size = 16                                                               |
-| [Decimal256](/docs/en/sql-reference/data-types/decimal.md)                                                      | `\x05` binary, `\x00` binary subtype, size = 32                                                               |
-| [Int128/UInt128](/docs/en/sql-reference/data-types/int-uint.md)                                                 | `\x05` binary, `\x00` binary subtype, size = 16                                                               |
-| [Int256/UInt256](/docs/en/sql-reference/data-types/int-uint.md)                                                 | `\x05` binary, `\x00` binary subtype, size = 32                                                               |
+| ClickHouse type                                                                                                       | BSON Type                                                                                                     |
+|-----------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|
+| [Bool](/docs/en/sql-reference/data-types/boolean.md)                                                                  | `\x08` boolean                                                                                                |
+| [Int8/UInt8](/docs/en/sql-reference/data-types/int-uint.md)/[Enum8](/docs/en/sql-reference/data-types/enum.md)        | `\x10` int32                                                                                                  |
+| [Int16/UInt16](/docs/en/sql-reference/data-types/int-uint.md)/[Enum16](/docs/en/sql-reference/data-types/enum.md)      | `\x10` int32                                                                                                  |
+| [Int32](/docs/en/sql-reference/data-types/int-uint.md)                                                                | `\x10` int32                                                                                                  |
+| [UInt32](/docs/en/sql-reference/data-types/int-uint.md)                                                               | `\x12` int64                                                                                                  |
+| [Int64/UInt64](/docs/en/sql-reference/data-types/int-uint.md)                                                         | `\x12` int64                                                                                                  |
+| [Float32/Float64](/docs/en/sql-reference/data-types/float.md)                                                         | `\x01` double                                                                                                 |
+| [Date](/docs/en/sql-reference/data-types/date.md)/[Date32](/docs/en/sql-reference/data-types/date32.md)               | `\x10` int32                                                                                                  |
+| [DateTime](/docs/en/sql-reference/data-types/datetime.md)                                                             | `\x12` int64                                                                                                  |
+| [DateTime64](/docs/en/sql-reference/data-types/datetime64.md)                                                         | `\x09` datetime                                                                                               |
+| [Decimal32](/docs/en/sql-reference/data-types/decimal.md)                                                             | `\x10` int32                                                                                                  |
+| [Decimal64](/docs/en/sql-reference/data-types/decimal.md)                                                             | `\x12` int64                                                                                                  |
+| [Decimal128](/docs/en/sql-reference/data-types/decimal.md)                                                            | `\x05` binary, `\x00` binary subtype, size = 16                                                               |
+| [Decimal256](/docs/en/sql-reference/data-types/decimal.md)                                                            | `\x05` binary, `\x00` binary subtype, size = 32                                                               |
+| [Int128/UInt128](/docs/en/sql-reference/data-types/int-uint.md)                                                       | `\x05` binary, `\x00` binary subtype, size = 16                                                               |
+| [Int256/UInt256](/docs/en/sql-reference/data-types/int-uint.md)                                                       | `\x05` binary, `\x00` binary subtype, size = 32                                                               |
 | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md) | `\x05` binary, `\x00` binary subtype or \x02 string if setting output_format_bson_string_as_string is enabled |
-| [UUID](/docs/en/sql-reference/data-types/uuid.md)                                                               | `\x05` binary, `\x04` uuid subtype, size = 16                                                                 |
-| [Array](/docs/en/sql-reference/data-types/array.md)                                                             | `\x04` array                                                                                                |
-| [Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                             | `\x04` array                                                                                                |
-| [Named Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                       | `\x03` document                                                                                             |
-| [Map](/docs/en/sql-reference/data-types/map.md) (with String keys)                                              | `\x03` document                                                                                             |
+| [UUID](/docs/en/sql-reference/data-types/uuid.md)                                                                     | `\x05` binary, `\x04` uuid subtype, size = 16                                                                 |
+| [Array](/docs/en/sql-reference/data-types/array.md)                                                                   | `\x04` array                                                                                                  |
+| [Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                                   | `\x04` array                                                                                                  |
+| [Named Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                             | `\x03` document                                                                                               |
+| [Map](/docs/en/sql-reference/data-types/map.md)                                                                       | `\x03` document                                                                                               |
+| [IPv4](/docs/en/sql-reference/data-types/domains/ipv4.md)                                                             | `\x10` int32                                                                                                  |
+| [IPv6](/docs/en/sql-reference/data-types/domains/ipv6.md)                                                             | `\x05` binary, `\x00` binary subtype                                                                          |
 
 For input it uses the following correspondence between BSON types and ClickHouse types:
 
-| BSON Type                                | ClickHouse Type                                                                                                                                              |
-|------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `\x01` double                            | [Float32/Float64](/docs/en/sql-reference/data-types/float.md)                                                                                                      |
-| `\x02` string                            | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                    |
-| `\x03` document                          | [Map](/docs/en/sql-reference/data-types/map.md)/[Named Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                                |
-| `\x04` array                             | [Array](/docs/en/sql-reference/data-types/array.md)/[Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                                  |
-| `\x05` binary, `\x00` binary subtype     | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                    |
-| `\x05` binary, `\x02` old binary subtype | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                    |
-| `\x05` binary, `\x03` old uuid subtype   | [UUID](/docs/en/sql-reference/data-types/uuid.md)                                                                                                                  |
-| `\x05` binary, `\x04` uuid subtype       | [UUID](/docs/en/sql-reference/data-types/uuid.md)                                                                                                                  |
-| `\x07` ObjectId                          | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                    |
-| `\x08` boolean                           | [Bool](/docs/en/sql-reference/data-types/boolean.md)                                                                                                               |
-| `\x09` datetime                          | [DateTime64](/docs/en/sql-reference/data-types/datetime64.md)                                                                                                      |
-| `\x0A` null value                        | [NULL](/docs/en/sql-reference/data-types/nullable.md)                                                                                                              |
-| `\x0D` JavaScript code                   | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                    |
-| `\x0E` symbol                            | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                    |
-| `\x10` int32                             | [Int32/UInt32](/docs/en/sql-reference/data-types/int-uint.md)/[Decimal32](/docs/en/sql-reference/data-types/decimal.md)                                                         |
-| `\x12` int64                             | [Int64/UInt64](/docs/en/sql-reference/data-types/int-uint.md)/[Decimal64](/docs/en/sql-reference/data-types/decimal.md)/[DateTime64](/docs/en/sql-reference/data-types/datetime64.md) |
+| BSON Type                                | ClickHouse Type                                                                                                                                                                                                                             |
+|------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `\x01` double                            | [Float32/Float64](/docs/en/sql-reference/data-types/float.md)                                                                                                                                                                               |
+| `\x02` string                            | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                                                                                       |
+| `\x03` document                          | [Map](/docs/en/sql-reference/data-types/map.md)/[Named Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                                                                                                   |
+| `\x04` array                             | [Array](/docs/en/sql-reference/data-types/array.md)/[Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                                                                                                     |
+| `\x05` binary, `\x00` binary subtype     | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)/[IPv6](/docs/en/sql-reference/data-types/domains/ipv6.md)                                                             |
+| `\x05` binary, `\x02` old binary subtype | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                                                                                       |
+| `\x05` binary, `\x03` old uuid subtype   | [UUID](/docs/en/sql-reference/data-types/uuid.md)                                                                                                                                                                                           |
+| `\x05` binary, `\x04` uuid subtype       | [UUID](/docs/en/sql-reference/data-types/uuid.md)                                                                                                                                                                                           |
+| `\x07` ObjectId                          | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                                                                                       |
+| `\x08` boolean                           | [Bool](/docs/en/sql-reference/data-types/boolean.md)                                                                                                                                                                                        |
+| `\x09` datetime                          | [DateTime64](/docs/en/sql-reference/data-types/datetime64.md)                                                                                                                                                                               |
+| `\x0A` null value                        | [NULL](/docs/en/sql-reference/data-types/nullable.md)                                                                                                                                                                                       |
+| `\x0D` JavaScript code                   | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                                                                                       |
+| `\x0E` symbol                            | [String](/docs/en/sql-reference/data-types/string.md)/[FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                                                                                       |
+| `\x10` int32                             | [Int32/UInt32](/docs/en/sql-reference/data-types/int-uint.md)/[Decimal32](/docs/en/sql-reference/data-types/decimal.md)/[IPv4](/docs/en/sql-reference/data-types/domains/ipv4.md)/[Enum8/Enum16](/docs/en/sql-reference/data-types/enum.md) |
+| `\x12` int64                             | [Int64/UInt64](/docs/en/sql-reference/data-types/int-uint.md)/[Decimal64](/docs/en/sql-reference/data-types/decimal.md)/[DateTime64](/docs/en/sql-reference/data-types/datetime64.md)                                                       |
 
 Other BSON types are not supported. Also, it performs conversion between different integer types (for example, you can insert BSON int32 value into ClickHouse UInt8).
 Big integers and decimals (Int128/UInt128/Int256/UInt256/Decimal128/Decimal256) can be parsed from BSON Binary value with `\x00` binary subtype. In this case this format will validate that the size of binary data equals the size of expected value.
@@ -1445,10 +1483,10 @@ For [NULL](/docs/en/sql-reference/syntax.md/#null-literal) support, an additiona
 
 Similar to [RowBinary](#rowbinary), but with added header:
 
--   [LEB128](https://en.wikipedia.org/wiki/LEB128)-encoded number of columns (N)
--   N `String`s specifying column names
+- [LEB128](https://en.wikipedia.org/wiki/LEB128)-encoded number of columns (N)
+- N `String`s specifying column names
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from input data will be mapped to the columns from the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -1458,11 +1496,11 @@ Otherwise, the first row will be skipped.
 
 Similar to [RowBinary](#rowbinary), but with added header:
 
--   [LEB128](https://en.wikipedia.org/wiki/LEB128)-encoded number of columns (N)
--   N `String`s specifying column names
--   N `String`s specifying column types
+- [LEB128](https://en.wikipedia.org/wiki/LEB128)-encoded number of columns (N)
+- N `String`s specifying column names
+- N `String`s specifying column types
 
-:::warning
+:::note
 If setting [input_format_with_names_use_header](/docs/en/operations/settings/settings-formats.md/#input_format_with_names_use_header) is set to 1,
 the columns from input data will be mapped to the columns from the table by their names, columns with unknown names will be skipped if setting [input_format_skip_unknown_fields](/docs/en/operations/settings/settings-formats.md/#input_format_skip_unknown_fields) is set to 1.
 Otherwise, the first row will be skipped.
@@ -1608,27 +1646,34 @@ See also [Format Schema](#formatschema).
 
 The table below shows supported data types and how they match ClickHouse [data types](/docs/en/sql-reference/data-types/index.md) in `INSERT` and `SELECT` queries.
 
-| CapnProto data type (`INSERT`) | ClickHouse data type                                      | CapnProto data type (`SELECT`) |
-|--------------------------------|-----------------------------------------------------------|--------------------------------|
-| `UINT8`, `BOOL`                | [UInt8](/docs/en/sql-reference/data-types/int-uint.md)          | `UINT8`                        |
-| `INT8`                         | [Int8](/docs/en/sql-reference/data-types/int-uint.md)           | `INT8`                         |
-| `UINT16`                       | [UInt16](/docs/en/sql-reference/data-types/int-uint.md), [Date](/docs/en/sql-reference/data-types/date.md)         | `UINT16`                       |
-| `INT16`                        | [Int16](/docs/en/sql-reference/data-types/int-uint.md)          | `INT16`                        |
-| `UINT32`                       | [UInt32](/docs/en/sql-reference/data-types/int-uint.md), [DateTime](/docs/en/sql-reference/data-types/datetime.md)         | `UINT32`                       |
-| `INT32`                        | [Int32](/docs/en/sql-reference/data-types/int-uint.md)          | `INT32`                        |
-| `UINT64`                       | [UInt64](/docs/en/sql-reference/data-types/int-uint.md)         | `UINT64`                       |
-| `INT64`                        | [Int64](/docs/en/sql-reference/data-types/int-uint.md), [DateTime64](/docs/en/sql-reference/data-types/datetime.md)          | `INT64`                        |
-| `FLOAT32`                      | [Float32](/docs/en/sql-reference/data-types/float.md)           | `FLOAT32`                      |
-| `FLOAT64`                      | [Float64](/docs/en/sql-reference/data-types/float.md)           | `FLOAT64`                      |
-| `TEXT, DATA`                   | [String](/docs/en/sql-reference/data-types/string.md), [FixedString](/docs/en/sql-reference/data-types/fixedstring.md)               | `TEXT, DATA`                       |
-| `union(T, Void), union(Void, T)`          | [Nullable(T)](/docs/en/sql-reference/data-types/date.md)       | `union(T, Void), union(Void, T)`                       |
-| `ENUM`                         | [Enum(8\|16)](/docs/en/sql-reference/data-types/enum.md)        | `ENUM`                         |
-| `LIST`                         | [Array](/docs/en/sql-reference/data-types/array.md)             | `LIST`                         |
-| `STRUCT`                       | [Tuple](/docs/en/sql-reference/data-types/tuple.md)             | `STRUCT`                       |
+| CapnProto data type (`INSERT`)                       | ClickHouse data type                                                                                                                                                           | CapnProto data type (`SELECT`)                       |
+|------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------|
+| `UINT8`, `BOOL`                                      | [UInt8](/docs/en/sql-reference/data-types/int-uint.md)                                                                                                                         | `UINT8`                                              |
+| `INT8`                                               | [Int8](/docs/en/sql-reference/data-types/int-uint.md)                                                                                                                          | `INT8`                                               |
+| `UINT16`                                             | [UInt16](/docs/en/sql-reference/data-types/int-uint.md), [Date](/docs/en/sql-reference/data-types/date.md)                                                                     | `UINT16`                                             |
+| `INT16`                                              | [Int16](/docs/en/sql-reference/data-types/int-uint.md)                                                                                                                         | `INT16`                                              |
+| `UINT32`                                             | [UInt32](/docs/en/sql-reference/data-types/int-uint.md), [DateTime](/docs/en/sql-reference/data-types/datetime.md)                                                             | `UINT32`                                             |
+| `INT32`                                              | [Int32](/docs/en/sql-reference/data-types/int-uint.md), [Decimal32](/docs/en/sql-reference/data-types/decimal.md)                                                              | `INT32`                                              |
+| `UINT64`                                             | [UInt64](/docs/en/sql-reference/data-types/int-uint.md)                                                                                                                        | `UINT64`                                             |
+| `INT64`                                              | [Int64](/docs/en/sql-reference/data-types/int-uint.md), [DateTime64](/docs/en/sql-reference/data-types/datetime.md), [Decimal64](/docs/en/sql-reference/data-types/decimal.md) | `INT64`                                              |
+| `FLOAT32`                                            | [Float32](/docs/en/sql-reference/data-types/float.md)                                                                                                                          | `FLOAT32`                                            |
+| `FLOAT64`                                            | [Float64](/docs/en/sql-reference/data-types/float.md)                                                                                                                          | `FLOAT64`                                            |
+| `TEXT, DATA`                                         | [String](/docs/en/sql-reference/data-types/string.md), [FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                                         | `TEXT, DATA`                                         |
+| `union(T, Void), union(Void, T)`                     | [Nullable(T)](/docs/en/sql-reference/data-types/date.md)                                                                                                                       | `union(T, Void), union(Void, T)`                     |
+| `ENUM`                                               | [Enum(8/16)](/docs/en/sql-reference/data-types/enum.md)                                                                                                                        | `ENUM`                                               |
+| `LIST`                                               | [Array](/docs/en/sql-reference/data-types/array.md)                                                                                                                            | `LIST`                                               |
+| `STRUCT`                                             | [Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                                                                                            | `STRUCT`                                             |
+| `UINT32`                                             | [IPv4](/docs/en/sql-reference/data-types/domains/ipv4.md)                                                                                                                      | `UINT32`                                             |
+| `DATA`                                               | [IPv6](/docs/en/sql-reference/data-types/domains/ipv6.md)                                                                                                                      | `DATA`                                               |
+| `DATA`                                               | [Int128/UInt128/Int256/UInt256](/docs/en/sql-reference/data-types/int-uint.md)                                                                                                 | `DATA`                                               |
+| `DATA`                                               | [Decimal128/Decimal256](/docs/en/sql-reference/data-types/decimal.md)                                                                                                          | `DATA`                                               |
+| `STRUCT(entries LIST(STRUCT(key Key, value Value)))` | [Map](/docs/en/sql-reference/data-types/map.md)                                                                                                                                | `STRUCT(entries LIST(STRUCT(key Key, value Value)))` |
+
+Integer types can be converted into each other during input/output.
 
 For working with `Enum` in CapnProto format use the [format_capn_proto_enum_comparising_mode](/docs/en/operations/settings/settings-formats.md/#format_capn_proto_enum_comparising_mode) setting.
 
-Arrays can be nested and can have a value of the `Nullable` type as an argument. `Tuple` type also can be nested.
+Arrays can be nested and can have a value of the `Nullable` type as an argument. `Tuple` and `Map` types also can be nested.
 
 ### Inserting and Selecting Data {#inserting-and-selecting-data-capnproto}
 
@@ -1772,7 +1817,7 @@ message MessageType {
 ```
 
 ClickHouse tries to find a column named `x.y.z` (or `x_y_z` or `X.y_Z` and so on).
-Nested messages are suitable to input or output a [nested data structures](/docs/en/sql-reference/data-types/nested-data-structures/nested.md).
+Nested messages are suitable to input or output a [nested data structures](/docs/en/sql-reference/data-types/nested-data-structures/index.md).
 
 Default values defined in a protobuf schema like this
 
@@ -1804,21 +1849,30 @@ ClickHouse Avro format supports reading and writing [Avro data files](https://av
 
 The table below shows supported data types and how they match ClickHouse [data types](/docs/en/sql-reference/data-types/index.md) in `INSERT` and `SELECT` queries.
 
-| Avro data type `INSERT`                     | ClickHouse data type                                                                               | Avro data type `SELECT`      |
-|---------------------------------------------|----------------------------------------------------------------------------------------------------|------------------------------|
-| `boolean`, `int`, `long`, `float`, `double` | [Int(8\|16\|32)](/docs/en/sql-reference/data-types/int-uint.md), [UInt(8\|16\|32)](/docs/en/sql-reference/data-types/int-uint.md) | `int`                        |
-| `boolean`, `int`, `long`, `float`, `double` | [Int64](/docs/en/sql-reference/data-types/int-uint.md), [UInt64](/docs/en/sql-reference/data-types/int-uint.md) | `long`                       |
-| `boolean`, `int`, `long`, `float`, `double` | [Float32](/docs/en/sql-reference/data-types/float.md)                                                    | `float`                      |
-| `boolean`, `int`, `long`, `float`, `double` | [Float64](/docs/en/sql-reference/data-types/float.md)                                                    | `double`                     |
-| `bytes`, `string`, `fixed`, `enum`          | [String](/docs/en/sql-reference/data-types/string.md)                                                    | `bytes` or `string` \*       |
-| `bytes`, `string`, `fixed`                  | [FixedString(N)](/docs/en/sql-reference/data-types/fixedstring.md)                                       | `fixed(N)`                   |
-| `enum`                                      | [Enum(8\|16)](/docs/en/sql-reference/data-types/enum.md)                                                                    | `enum`                       |
-| `array(T)`                                  | [Array(T)](/docs/en/sql-reference/data-types/array.md)                                                   | `array(T)`                   |
-| `union(null, T)`, `union(T, null)`          | [Nullable(T)](/docs/en/sql-reference/data-types/date.md)                                                 | `union(null, T)`             |
-| `null`                                      | [Nullable(Nothing)](/docs/en/sql-reference/data-types/special-data-types/nothing.md)                     | `null`                       |
-| `int (date)` \**                            | [Date](/docs/en/sql-reference/data-types/date.md)                                                        | `int (date)` \**             |
-| `long (timestamp-millis)` \**               | [DateTime64(3)](/docs/en/sql-reference/data-types/datetime.md)                                           | `long (timestamp-millis)` \* |
-| `long (timestamp-micros)` \**               | [DateTime64(6)](/docs/en/sql-reference/data-types/datetime.md)                                           | `long (timestamp-micros)` \* |
+| Avro data type `INSERT`                     | ClickHouse data type                                                                                                          | Avro data type `SELECT`       |
+|---------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|-------------------------------|
+| `boolean`, `int`, `long`, `float`, `double` | [Int(8\16\32)](/docs/en/sql-reference/data-types/int-uint.md), [UInt(8\16\32)](/docs/en/sql-reference/data-types/int-uint.md) | `int`                         |
+| `boolean`, `int`, `long`, `float`, `double` | [Int64](/docs/en/sql-reference/data-types/int-uint.md), [UInt64](/docs/en/sql-reference/data-types/int-uint.md)               | `long`                        |
+| `boolean`, `int`, `long`, `float`, `double` | [Float32](/docs/en/sql-reference/data-types/float.md)                                                                         | `float`                       |
+| `boolean`, `int`, `long`, `float`, `double` | [Float64](/docs/en/sql-reference/data-types/float.md)                                                                         | `double`                      |
+| `bytes`, `string`, `fixed`, `enum`          | [String](/docs/en/sql-reference/data-types/string.md)                                                                         | `bytes` or `string` \*        |
+| `bytes`, `string`, `fixed`                  | [FixedString(N)](/docs/en/sql-reference/data-types/fixedstring.md)                                                            | `fixed(N)`                    |
+| `enum`                                      | [Enum(8\16)](/docs/en/sql-reference/data-types/enum.md)                                                                       | `enum`                        |
+| `array(T)`                                  | [Array(T)](/docs/en/sql-reference/data-types/array.md)                                                                        | `array(T)`                    |
+| `map(V, K)`                                 | [Map(V, K)](/docs/en/sql-reference/data-types/map.md)                                                                         | `map(string, K)`              |
+| `union(null, T)`, `union(T, null)`          | [Nullable(T)](/docs/en/sql-reference/data-types/date.md)                                                                      | `union(null, T)`              |
+| `null`                                      | [Nullable(Nothing)](/docs/en/sql-reference/data-types/special-data-types/nothing.md)                                          | `null`                        |
+| `int (date)` \**                            | [Date](/docs/en/sql-reference/data-types/date.md), [Date32](docs/en/sql-reference/data-types/date32.md)                       | `int (date)` \**              |
+| `long (timestamp-millis)` \**               | [DateTime64(3)](/docs/en/sql-reference/data-types/datetime.md)                                                                | `long (timestamp-millis)` \** |
+| `long (timestamp-micros)` \**               | [DateTime64(6)](/docs/en/sql-reference/data-types/datetime.md)                                                                | `long (timestamp-micros)` \** |
+| `bytes (decimal)`  \**                      | [DateTime64(N)](/docs/en/sql-reference/data-types/datetime.md)                                                                | `bytes (decimal)`  \**        |
+| `int`                                       | [IPv4](/docs/en/sql-reference/data-types/domains/ipv4.md)                                                                     | `int`                         |
+| `fixed(16)`                                 | [IPv6](/docs/en/sql-reference/data-types/domains/ipv6.md)                                                                     | `fixed(16)`                   |
+| `bytes (decimal)` \**                       | [Decimal(P, S)](/docs/en/sql-reference/data-types/decimal.md)                                                                 | `bytes (decimal)` \**         |
+| `string (uuid)` \**                         | [UUID](/docs/en/sql-reference/data-types/uuid.md)                                                                             | `string (uuid)` \**           |
+| `fixed(16)`                                 | [Int128/UInt128](/docs/en/sql-reference/data-types/int-uint.md)                                                               | `fixed(16)`                   |
+| `fixed(32)`                                 | [Int256/UInt256](/docs/en/sql-reference/data-types/int-uint.md)                                                               | `fixed(32)`                   |
+
 
 \* `bytes` is default, controlled by [output_format_avro_string_column_pattern](/docs/en/operations/settings/settings-formats.md/#output_format_avro_string_column_pattern)
 \** [Avro logical types](https://avro.apache.org/docs/current/spec.html#Logical+Types)
@@ -1854,11 +1908,18 @@ $ clickhouse-client --query="SELECT * FROM {some_table} FORMAT Avro" > file.avro
 
 Column names must:
 
--   start with `[A-Za-z_]`
--   subsequently contain only `[A-Za-z0-9_]`
+- start with `[A-Za-z_]`
+- subsequently contain only `[A-Za-z0-9_]`
 
 Output Avro file compression and sync interval can be configured with [output_format_avro_codec](/docs/en/operations/settings/settings-formats.md/#output_format_avro_codec) and [output_format_avro_sync_interval](/docs/en/operations/settings/settings-formats.md/#output_format_avro_sync_interval) respectively.
 
+### Example Data {#example-data-avro}
+
+Using the ClickHouse [DESCRIBE](/docs/en/sql-reference/statements/describe-table) function, you can quickly view the inferred format of an Avro file like the following example. This example includes the URL of a publicly accessible Avro file in the ClickHouse S3 public bucket:
+
+``` DESCRIBE url('https://clickhouse-public-datasets.s3.eu-central-1.amazonaws.com/hits.avro','Avro');
+```
+
 ## AvroConfluent {#data-format-avro-confluent}
 
 AvroConfluent supports decoding single-object Avro messages commonly used with [Kafka](https://kafka.apache.org/) and [Confluent Schema Registry](https://docs.confluent.io/current/schema-registry/index.html).
@@ -1906,7 +1967,7 @@ SET format_avro_schema_registry_url = 'http://schema-registry';
 SELECT * FROM topic1_stream;
 ```
 
-:::warning
+:::note
 Setting `format_avro_schema_registry_url` needs to be configured in `users.xml` to maintain it’s value after a restart. Also you can use the `format_avro_schema_registry_url` setting of the `Kafka` table engine.
 :::
 
@@ -1918,28 +1979,31 @@ Setting `format_avro_schema_registry_url` needs to be configured in `users.xml`
 
 The table below shows supported data types and how they match ClickHouse [data types](/docs/en/sql-reference/data-types/index.md) in `INSERT` and `SELECT` queries.
 
-| Parquet data type (`INSERT`)                  | ClickHouse data type                                            | Parquet data type (`SELECT`) |
-|-----------------------------------------------|-----------------------------------------------------------------|------------------------------|
-| `BOOL`                                        | [Bool](/docs/en/sql-reference/data-types/boolean.md)            | `BOOL`                       |
-| `UINT8`, `BOOL`                               | [UInt8](/docs/en/sql-reference/data-types/int-uint.md)          | `UINT8`                      |
-| `INT8`                                        | [Int8](/docs/en/sql-reference/data-types/int-uint.md)           | `INT8`                       |
-| `UINT16`                                      | [UInt16](/docs/en/sql-reference/data-types/int-uint.md)         | `UINT16`                     |
-| `INT16`                                       | [Int16](/docs/en/sql-reference/data-types/int-uint.md)          | `INT16`                      |
-| `UINT32`                                      | [UInt32](/docs/en/sql-reference/data-types/int-uint.md)         | `UINT32`                     |
-| `INT32`                                       | [Int32](/docs/en/sql-reference/data-types/int-uint.md)          | `INT32`                      |
-| `UINT64`                                      | [UInt64](/docs/en/sql-reference/data-types/int-uint.md)         | `UINT64`                     |
-| `INT64`                                       | [Int64](/docs/en/sql-reference/data-types/int-uint.md)          | `INT64`                      |
-| `FLOAT`                                       | [Float32](/docs/en/sql-reference/data-types/float.md)           | `FLOAT`                      |
-| `DOUBLE`                                      | [Float64](/docs/en/sql-reference/data-types/float.md)           | `DOUBLE`                     |
-| `DATE`                                        | [Date32](/docs/en/sql-reference/data-types/date.md)             | `DATE`                       |
-| `TIME (ms)`                                   | [DateTime](/docs/en/sql-reference/data-types/datetime.md)       | `UINT32`                     |
-| `TIMESTAMP`, `TIME (us, ns)`                  | [DateTime64](/docs/en/sql-reference/data-types/datetime64.md)   | `TIMESTAMP`                  |
-| `STRING`, `BINARY`                            | [String](/docs/en/sql-reference/data-types/string.md)           | `BINARY`                     |
-| `STRING`, `BINARY`, `FIXED_LENGTH_BYTE_ARRAY` | [FixedString](/docs/en/sql-reference/data-types/fixedstring.md) | `FIXED_LENGTH_BYTE_ARRAY`    |
-| `DECIMAL`                                     | [Decimal](/docs/en/sql-reference/data-types/decimal.md)         | `DECIMAL`                    |
-| `LIST`                                        | [Array](/docs/en/sql-reference/data-types/array.md)             | `LIST`                       |
-| `STRUCT`                                      | [Tuple](/docs/en/sql-reference/data-types/tuple.md)             | `STRUCT`                     |
-| `MAP`                                         | [Map](/docs/en/sql-reference/data-types/map.md)                 | `MAP`                        |
+| Parquet data type (`INSERT`)                  | ClickHouse data type                                                                                       | Parquet data type (`SELECT`)  |
+|-----------------------------------------------|------------------------------------------------------------------------------------------------------------|-------------------------------|
+| `BOOL`                                        | [Bool](/docs/en/sql-reference/data-types/boolean.md)                                                       | `BOOL`                        |
+| `UINT8`, `BOOL`                               | [UInt8](/docs/en/sql-reference/data-types/int-uint.md)                                                     | `UINT8`                       |
+| `INT8`                                        | [Int8](/docs/en/sql-reference/data-types/int-uint.md)/[Enum8](/docs/en/sql-reference/data-types/enum.md)   | `INT8`                        |
+| `UINT16`                                      | [UInt16](/docs/en/sql-reference/data-types/int-uint.md)                                                    | `UINT16`                      |
+| `INT16`                                       | [Int16](/docs/en/sql-reference/data-types/int-uint.md)/[Enum16](/docs/en/sql-reference/data-types/enum.md) | `INT16`                       |
+| `UINT32`                                      | [UInt32](/docs/en/sql-reference/data-types/int-uint.md)                                                    | `UINT32`                      |
+| `INT32`                                       | [Int32](/docs/en/sql-reference/data-types/int-uint.md)                                                     | `INT32`                       |
+| `UINT64`                                      | [UInt64](/docs/en/sql-reference/data-types/int-uint.md)                                                    | `UINT64`                      |
+| `INT64`                                       | [Int64](/docs/en/sql-reference/data-types/int-uint.md)                                                     | `INT64`                       |
+| `FLOAT`                                       | [Float32](/docs/en/sql-reference/data-types/float.md)                                                      | `FLOAT`                       |
+| `DOUBLE`                                      | [Float64](/docs/en/sql-reference/data-types/float.md)                                                      | `DOUBLE`                      |
+| `DATE`                                        | [Date32](/docs/en/sql-reference/data-types/date.md)                                                        | `DATE`                        |
+| `TIME (ms)`                                   | [DateTime](/docs/en/sql-reference/data-types/datetime.md)                                                  | `UINT32`                      |
+| `TIMESTAMP`, `TIME (us, ns)`                  | [DateTime64](/docs/en/sql-reference/data-types/datetime64.md)                                              | `TIMESTAMP`                   |
+| `STRING`, `BINARY`                            | [String](/docs/en/sql-reference/data-types/string.md)                                                      | `BINARY`                      |
+| `STRING`, `BINARY`, `FIXED_LENGTH_BYTE_ARRAY` | [FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                            | `FIXED_LENGTH_BYTE_ARRAY`     |
+| `DECIMAL`                                     | [Decimal](/docs/en/sql-reference/data-types/decimal.md)                                                    | `DECIMAL`                     |
+| `LIST`                                        | [Array](/docs/en/sql-reference/data-types/array.md)                                                        | `LIST`                        |
+| `STRUCT`                                      | [Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                        | `STRUCT`                      |
+| `MAP`                                         | [Map](/docs/en/sql-reference/data-types/map.md)                                                            | `MAP`                         |
+| `UINT32`                                      | [IPv4](/docs/en/sql-reference/data-types/domains/ipv4.md)                                                  | `UINT32`                      |
+| `FIXED_LENGTH_BYTE_ARRAY`, `BINARY`           | [IPv6](/docs/en/sql-reference/data-types/domains/ipv6.md)                                                  | `FIXED_LENGTH_BYTE_ARRAY`     |
+| `FIXED_LENGTH_BYTE_ARRAY`, `BINARY`           | [Int128/UInt128/Int256/UInt256](/docs/en/sql-reference/data-types/int-uint.md)                     | `FIXED_LENGTH_BYTE_ARRAY`     |
 
 Arrays can be nested and can have a value of the `Nullable` type as an argument. `Tuple` and `Map` types also can be nested.
 
@@ -1967,12 +2031,145 @@ To exchange data with Hadoop, you can use [HDFS table engine](/docs/en/engines/t
 
 - [output_format_parquet_row_group_size](/docs/en/operations/settings/settings-formats.md/#output_format_parquet_row_group_size) - row group size in rows while data output. Default value - `1000000`.
 - [output_format_parquet_string_as_string](/docs/en/operations/settings/settings-formats.md/#output_format_parquet_string_as_string) - use Parquet String type instead of Binary for String columns. Default value - `false`.
-- [input_format_parquet_import_nested](/docs/en/operations/settings/settings-formats.md/#input_format_parquet_import_nested) - allow inserting array of structs into [Nested](/docs/en/sql-reference/data-types/nested-data-structures/nested.md) table in Parquet input format. Default value - `false`.
+- [input_format_parquet_import_nested](/docs/en/operations/settings/settings-formats.md/#input_format_parquet_import_nested) - allow inserting array of structs into [Nested](/docs/en/sql-reference/data-types/nested-data-structures/index.md) table in Parquet input format. Default value - `false`.
 - [input_format_parquet_case_insensitive_column_matching](/docs/en/operations/settings/settings-formats.md/#input_format_parquet_case_insensitive_column_matching) - ignore case when matching Parquet columns with ClickHouse columns. Default value - `false`.
 - [input_format_parquet_allow_missing_columns](/docs/en/operations/settings/settings-formats.md/#input_format_parquet_allow_missing_columns) - allow missing columns while reading Parquet data. Default value - `false`.
 - [input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference](/docs/en/operations/settings/settings-formats.md/#input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference) - allow skipping columns with unsupported types while schema inference for Parquet format. Default value - `false`.
 - [output_format_parquet_fixed_string_as_fixed_byte_array](/docs/en/operations/settings/settings-formats.md/#output_format_parquet_fixed_string_as_fixed_byte_array) - use Parquet FIXED_LENGTH_BYTE_ARRAY type instead of Binary/String for FixedString columns. Default value - `true`.
 - [output_format_parquet_version](/docs/en/operations/settings/settings-formats.md/#output_format_parquet_version) - The version of Parquet format used in output format. Default value - `2.latest`.
+- [output_format_parquet_compression_method](/docs/en/operations/settings/settings-formats.md/#output_format_parquet_compression_method) - compression method used in output Parquet format. Default value - `snappy`.
+
+## ParquetMetadata {data-format-parquet-metadata}
+
+Special format for reading Parquet file metadata (https://parquet.apache.org/docs/file-format/metadata/). It always outputs one row with the next structure/content:
+- num_columns - the number of columns
+- num_rows - the total number of rows
+- num_row_groups - the total number of row groups
+- format_version - parquet format version, always 1.0 or 2.6
+- total_uncompressed_size - total uncompressed bytes size of the data, calculated as the sum of total_byte_size from all row groups
+- total_compressed_size - total compressed bytes size of the data, calculated as the sum of total_compressed_size from all row groups
+- columns - the list of columns metadata with the next structure:
+  - name - column name
+  - path - column path (differs from name for nested column)
+  - max_definition_level - maximum definition level
+  - max_repetition_level - maximum repetition level
+  - physical_type - column physical type
+  - logical_type - column logical type
+  - compression - compression used for this column
+  - total_uncompressed_size - total uncompressed bytes size of the column, calculated as the sum of total_uncompressed_size of the column from all row groups
+  - total_compressed_size - total compressed bytes size of the column,  calculated as the sum of total_compressed_size of the column from all row groups 
+  - space_saved - percent of space saved by compression, calculated as (1 - total_compressed_size/total_uncompressed_size).
+  - encodings - the list of encodings used for this column
+- row_groups - the list of row groups metadata with the next structure:
+  - num_columns - the number of columns in the row group
+  - num_rows - the number of rows in the row group
+  - total_uncompressed_size - total uncompressed bytes size of the row group
+  - total_compressed_size - total compressed bytes size of the row group
+  - columns - the list of column chunks metadata with the next structure:
+     - name - column name
+     - path - column path
+     - total_compressed_size - total compressed bytes size of the column
+     - total_uncompressed_size - total uncompressed bytes size of the row group
+     - have_statistics - boolean flag that indicates if column chunk metadata contains column statistics
+     - statistics - column chunk statistics (all fields are NULL if have_statistics = false) with the next structure:
+        - num_values - the number of non-null values in the column chunk
+        - null_count - the number of NULL values in the column chunk
+        - distinct_count - the number of distinct values in the column chunk
+        - min - the minimum value of the column chunk
+        - max - the maximum column of the column chunk
+
+Example:
+
+```sql
+SELECT * FROM file(data.parquet, ParquetMetadata) format PrettyJSONEachRow
+```
+
+```json
+{
+    "num_columns": "2",
+    "num_rows": "100000",
+    "num_row_groups": "2",
+    "format_version": "2.6",
+    "metadata_size": "577",
+    "total_uncompressed_size": "282436",
+    "total_compressed_size": "26633",
+    "columns": [
+        {
+            "name": "number",
+            "path": "number",
+            "max_definition_level": "0",
+            "max_repetition_level": "0",
+            "physical_type": "INT32",
+            "logical_type": "Int(bitWidth=16, isSigned=false)",
+            "compression": "LZ4",
+            "total_uncompressed_size": "133321",
+            "total_compressed_size": "13293",
+            "space_saved": "90.03%",
+            "encodings": [
+                "RLE_DICTIONARY",
+                "PLAIN",
+                "RLE"
+            ]
+        },
+        {
+            "name": "concat('Hello', toString(modulo(number, 1000)))",
+            "path": "concat('Hello', toString(modulo(number, 1000)))",
+            "max_definition_level": "0",
+            "max_repetition_level": "0",
+            "physical_type": "BYTE_ARRAY",
+            "logical_type": "None",
+            "compression": "LZ4",
+            "total_uncompressed_size": "149115",
+            "total_compressed_size": "13340",
+            "space_saved": "91.05%",
+            "encodings": [
+                "RLE_DICTIONARY",
+                "PLAIN",
+                "RLE"
+            ]
+        }
+    ],
+    "row_groups": [
+        {
+            "num_columns": "2",
+            "num_rows": "65409",
+            "total_uncompressed_size": "179809",
+            "total_compressed_size": "14163",
+            "columns": [
+                {
+                    "name": "number",
+                    "path": "number",
+                    "total_compressed_size": "7070",
+                    "total_uncompressed_size": "85956",
+                    "have_statistics": true,
+                    "statistics": {
+                        "num_values": "65409",
+                        "null_count": "0",
+                        "distinct_count": null,
+                        "min": "0",
+                        "max": "999"
+                    }
+                },
+                {
+                    "name": "concat('Hello', toString(modulo(number, 1000)))",
+                    "path": "concat('Hello', toString(modulo(number, 1000)))",
+                    "total_compressed_size": "7093",
+                    "total_uncompressed_size": "93853",
+                    "have_statistics": true,
+                    "statistics": {
+                        "num_values": "65409",
+                        "null_count": "0",
+                        "distinct_count": null,
+                        "min": "Hello0",
+                        "max": "Hello999"
+                    }
+                }
+            ]
+        },
+        ...
+    ]
+}
+```
 
 ## Arrow {#data-format-arrow}
 
@@ -1984,29 +2181,32 @@ To exchange data with Hadoop, you can use [HDFS table engine](/docs/en/engines/t
 
 The table below shows supported data types and how they match ClickHouse [data types](/docs/en/sql-reference/data-types/index.md) in `INSERT` and `SELECT` queries.
 
-| Arrow data type (`INSERT`)              | ClickHouse data type                                            | Arrow data type (`SELECT`) |
-|-----------------------------------------|-----------------------------------------------------------------|----------------------------|
-| `BOOL`                                  | [Bool](/docs/en/sql-reference/data-types/boolean.md)            | `BOOL`                     |
-| `UINT8`, `BOOL`                         | [UInt8](/docs/en/sql-reference/data-types/int-uint.md)          | `UINT8`                    |
-| `INT8`                                  | [Int8](/docs/en/sql-reference/data-types/int-uint.md)           | `INT8`                     |
-| `UINT16`                                | [UInt16](/docs/en/sql-reference/data-types/int-uint.md)         | `UINT16`                   |
-| `INT16`                                 | [Int16](/docs/en/sql-reference/data-types/int-uint.md)          | `INT16`                    |
-| `UINT32`                                | [UInt32](/docs/en/sql-reference/data-types/int-uint.md)         | `UINT32`                   |
-| `INT32`                                 | [Int32](/docs/en/sql-reference/data-types/int-uint.md)          | `INT32`                    |
-| `UINT64`                                | [UInt64](/docs/en/sql-reference/data-types/int-uint.md)         | `UINT64`                   |
-| `INT64`                                 | [Int64](/docs/en/sql-reference/data-types/int-uint.md)          | `INT64`                    |
-| `FLOAT`, `HALF_FLOAT`                   | [Float32](/docs/en/sql-reference/data-types/float.md)           | `FLOAT32`                  |
-| `DOUBLE`                                | [Float64](/docs/en/sql-reference/data-types/float.md)           | `FLOAT64`                  |
-| `DATE32`                                | [Date32](/docs/en/sql-reference/data-types/date32.md)           | `UINT16`                   |
-| `DATE64`                                | [DateTime](/docs/en/sql-reference/data-types/datetime.md)       | `UINT32`                   |
-| `TIMESTAMP`, `TIME32`, `TIME64`         | [DateTime64](/docs/en/sql-reference/data-types/datetime64.md)   | `UINT32`                   |
-| `STRING`, `BINARY`                      | [String](/docs/en/sql-reference/data-types/string.md)           | `BINARY`                   |
-| `STRING`, `BINARY`, `FIXED_SIZE_BINARY` | [FixedString](/docs/en/sql-reference/data-types/fixedstring.md) | `FIXED_SIZE_BINARY`        |
-| `DECIMAL`                               | [Decimal](/docs/en/sql-reference/data-types/decimal.md)         | `DECIMAL`                  |
-| `DECIMAL256`                            | [Decimal256](/docs/en/sql-reference/data-types/decimal.md)      | `DECIMAL256`               |
-| `LIST`                                  | [Array](/docs/en/sql-reference/data-types/array.md)             | `LIST`                     |
-| `STRUCT`                                | [Tuple](/docs/en/sql-reference/data-types/tuple.md)             | `STRUCT`                   |
-| `MAP`                                   | [Map](/docs/en/sql-reference/data-types/map.md)                 | `MAP`                      |
+| Arrow data type (`INSERT`)              | ClickHouse data type                                                                                       | Arrow data type (`SELECT`) |
+|-----------------------------------------|------------------------------------------------------------------------------------------------------------|----------------------------|
+| `BOOL`                                  | [Bool](/docs/en/sql-reference/data-types/boolean.md)                                                       | `BOOL`                     |
+| `UINT8`, `BOOL`                         | [UInt8](/docs/en/sql-reference/data-types/int-uint.md)                                                     | `UINT8`                    |
+| `INT8`                                  | [Int8](/docs/en/sql-reference/data-types/int-uint.md)/[Enum8](/docs/en/sql-reference/data-types/enum.md)   | `INT8`                     |
+| `UINT16`                                | [UInt16](/docs/en/sql-reference/data-types/int-uint.md)                                                    | `UINT16`                   |
+| `INT16`                                 | [Int16](/docs/en/sql-reference/data-types/int-uint.md)/[Enum16](/docs/en/sql-reference/data-types/enum.md) | `INT16`                    |
+| `UINT32`                                | [UInt32](/docs/en/sql-reference/data-types/int-uint.md)                                                    | `UINT32`                   |
+| `INT32`                                 | [Int32](/docs/en/sql-reference/data-types/int-uint.md)                                                     | `INT32`                    |
+| `UINT64`                                | [UInt64](/docs/en/sql-reference/data-types/int-uint.md)                                                    | `UINT64`                   |
+| `INT64`                                 | [Int64](/docs/en/sql-reference/data-types/int-uint.md)                                                     | `INT64`                    |
+| `FLOAT`, `HALF_FLOAT`                   | [Float32](/docs/en/sql-reference/data-types/float.md)                                                      | `FLOAT32`                  |
+| `DOUBLE`                                | [Float64](/docs/en/sql-reference/data-types/float.md)                                                      | `FLOAT64`                  |
+| `DATE32`                                | [Date32](/docs/en/sql-reference/data-types/date32.md)                                                      | `UINT16`                   |
+| `DATE64`                                | [DateTime](/docs/en/sql-reference/data-types/datetime.md)                                                  | `UINT32`                   |
+| `TIMESTAMP`, `TIME32`, `TIME64`         | [DateTime64](/docs/en/sql-reference/data-types/datetime64.md)                                              | `UINT32`                   |
+| `STRING`, `BINARY`                      | [String](/docs/en/sql-reference/data-types/string.md)                                                      | `BINARY`                   |
+| `STRING`, `BINARY`, `FIXED_SIZE_BINARY` | [FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                            | `FIXED_SIZE_BINARY`        |
+| `DECIMAL`                               | [Decimal](/docs/en/sql-reference/data-types/decimal.md)                                                    | `DECIMAL`                  |
+| `DECIMAL256`                            | [Decimal256](/docs/en/sql-reference/data-types/decimal.md)                                                 | `DECIMAL256`               |
+| `LIST`                                  | [Array](/docs/en/sql-reference/data-types/array.md)                                                        | `LIST`                     |
+| `STRUCT`                                | [Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                        | `STRUCT`                   |
+| `MAP`                                   | [Map](/docs/en/sql-reference/data-types/map.md)                                                            | `MAP`                      |
+| `UINT32`                                | [IPv4](/docs/en/sql-reference/data-types/domains/ipv4.md)                                                  | `UINT32`                   |
+| `FIXED_SIZE_BINARY`, `BINARY`           | [IPv6](/docs/en/sql-reference/data-types/domains/ipv6.md)                                                  | `FIXED_SIZE_BINARY`        |
+| `FIXED_SIZE_BINARY`, `BINARY`           | [Int128/UInt128/Int256/UInt256](/docs/en/sql-reference/data-types/int-uint.md)                     | `FIXED_SIZE_BINARY`        |
 
 Arrays can be nested and can have a value of the `Nullable` type as an argument. `Tuple` and `Map` types also can be nested.
 
@@ -2041,6 +2241,7 @@ $ clickhouse-client --query="SELECT * FROM {some_table} FORMAT Arrow" > {filenam
 - [input_format_arrow_allow_missing_columns](/docs/en/operations/settings/settings-formats.md/#input_format_arrow_allow_missing_columns) - allow missing columns while reading Arrow data. Default value - `false`.
 - [input_format_arrow_skip_columns_with_unsupported_types_in_schema_inference](/docs/en/operations/settings/settings-formats.md/#input_format_arrow_skip_columns_with_unsupported_types_in_schema_inference) - allow skipping columns with unsupported types while schema inference for Arrow format. Default value - `false`.
 - [output_format_arrow_fixed_string_as_fixed_byte_array](/docs/en/operations/settings/settings-formats.md/#output_format_arrow_fixed_string_as_fixed_byte_array) - use Arrow FIXED_SIZE_BINARY type instead of Binary/String for FixedString columns. Default value - `true`.
+- [output_format_arrow_compression_method](/docs/en/operations/settings/settings-formats.md/#output_format_arrow_compression_method) - compression method used in output Arrow format. Default value - `lz4_frame`.
 
 ## ArrowStream {#data-format-arrow-stream}
 
@@ -2054,22 +2255,26 @@ $ clickhouse-client --query="SELECT * FROM {some_table} FORMAT Arrow" > {filenam
 
 The table below shows supported data types and how they match ClickHouse [data types](/docs/en/sql-reference/data-types/index.md) in `INSERT` and `SELECT` queries.
 
-| ORC data type (`INSERT`)              | ClickHouse data type                                    | ORC data type (`SELECT`) |
-|---------------------------------------|---------------------------------------------------------|--------------------------|
-| `Boolean`                             | [UInt8](/docs/en/sql-reference/data-types/int-uint.md)        | `Boolean`                |
-| `Tinyint`                             | [Int8](/docs/en/sql-reference/data-types/int-uint.md)         | `Tinyint`                |
-| `Smallint`                            | [Int16](/docs/en/sql-reference/data-types/int-uint.md)        | `Smallint`               |
-| `Int`                                 | [Int32](/docs/en/sql-reference/data-types/int-uint.md)        | `Int`                    |
-| `Bigint`                              | [Int64](/docs/en/sql-reference/data-types/int-uint.md)        | `Bigint`                 |
-| `Float`                               | [Float32](/docs/en/sql-reference/data-types/float.md)         | `Float`                  |
-| `Double`                              | [Float64](/docs/en/sql-reference/data-types/float.md)         | `Double`                 |
-| `Decimal`                             | [Decimal](/docs/en/sql-reference/data-types/decimal.md)       | `Decimal`                |
-| `Date`                                | [Date32](/docs/en/sql-reference/data-types/date32.md)         | `Date`                   |
-| `Timestamp`                           | [DateTime64](/docs/en/sql-reference/data-types/datetime64.md) | `Timestamp`              |
-| `String`, `Char`, `Varchar`, `Binary` | [String](/docs/en/sql-reference/data-types/string.md)         | `Binary`                 |
-| `List`                                | [Array](/docs/en/sql-reference/data-types/array.md)           | `List`                   |
-| `Struct`                              | [Tuple](/docs/en/sql-reference/data-types/tuple.md)           | `Struct`                 |
-| `Map`                                 | [Map](/docs/en/sql-reference/data-types/map.md)               | `Map`                    |
+| ORC data type (`INSERT`)              | ClickHouse data type                                                                                              | ORC data type (`SELECT`) |
+|---------------------------------------|-------------------------------------------------------------------------------------------------------------------|--------------------------|
+| `Boolean`                             | [UInt8](/docs/en/sql-reference/data-types/int-uint.md)                                                            | `Boolean`                |
+| `Tinyint`                             | [Int8/UInt8](/docs/en/sql-reference/data-types/int-uint.md)/[Enum8](/docs/en/sql-reference/data-types/enum.md)    | `Tinyint`                |
+| `Smallint`                            | [Int16/UInt16](/docs/en/sql-reference/data-types/int-uint.md)/[Enum16](/docs/en/sql-reference/data-types/enum.md) | `Smallint`               |
+| `Int`                                 | [Int32/UInt32](/docs/en/sql-reference/data-types/int-uint.md)                                                     | `Int`                    |
+| `Bigint`                              | [Int64/UInt32](/docs/en/sql-reference/data-types/int-uint.md)                                                     | `Bigint`                 |
+| `Float`                               | [Float32](/docs/en/sql-reference/data-types/float.md)                                                             | `Float`                  |
+| `Double`                              | [Float64](/docs/en/sql-reference/data-types/float.md)                                                             | `Double`                 |
+| `Decimal`                             | [Decimal](/docs/en/sql-reference/data-types/decimal.md)                                                           | `Decimal`                |
+| `Date`                                | [Date32](/docs/en/sql-reference/data-types/date32.md)                                                             | `Date`                   |
+| `Timestamp`                           | [DateTime64](/docs/en/sql-reference/data-types/datetime64.md)                                                     | `Timestamp`              |
+| `String`, `Char`, `Varchar`, `Binary` | [String](/docs/en/sql-reference/data-types/string.md)                                                             | `Binary`                 |
+| `List`                                | [Array](/docs/en/sql-reference/data-types/array.md)                                                               | `List`                   |
+| `Struct`                              | [Tuple](/docs/en/sql-reference/data-types/tuple.md)                                                               | `Struct`                 |
+| `Map`                                 | [Map](/docs/en/sql-reference/data-types/map.md)                                                                   | `Map`                    |
+| `Int`                                 | [IPv4](/docs/en/sql-reference/data-types/int-uint.md)                                                             | `Int`                    |
+| `Binary`                              | [IPv6](/docs/en/sql-reference/data-types/domains/ipv6.md)                                                         | `Binary`                 |
+| `Binary`                              | [Int128/UInt128/Int256/UInt256](/docs/en/sql-reference/data-types/int-uint.md)                                    | `Binary`                 |
+| `Binary`                              | [Decimal256](/docs/en/sql-reference/data-types/decimal.md)                                                        | `Binary`                 |
 
 Other types are not supported.
 
@@ -2096,6 +2301,7 @@ $ clickhouse-client --query="SELECT * FROM {some_table} FORMAT ORC" > {filename.
 ### Arrow format settings {#parquet-format-settings}
 
 - [output_format_arrow_string_as_string](/docs/en/operations/settings/settings-formats.md/#output_format_arrow_string_as_string) - use Arrow String type instead of Binary for String columns. Default value - `false`.
+- [output_format_orc_compression_method](/docs/en/operations/settings/settings-formats.md/#output_format_orc_compression_method) - compression method used in output ORC format. Default value - `none`.
 - [input_format_arrow_import_nested](/docs/en/operations/settings/settings-formats.md/#input_format_arrow_import_nested) - allow inserting array of structs into Nested table in Arrow input format. Default value - `false`.
 - [input_format_arrow_case_insensitive_column_matching](/docs/en/operations/settings/settings-formats.md/#input_format_arrow_case_insensitive_column_matching) - ignore case when matching Arrow columns with ClickHouse columns. Default value - `false`.
 - [input_format_arrow_allow_missing_columns](/docs/en/operations/settings/settings-formats.md/#input_format_arrow_allow_missing_columns) - allow missing columns while reading Arrow data. Default value - `false`.
@@ -2133,17 +2339,17 @@ Each line of imported data is parsed according to the regular expression.
 
 When working with the `Regexp` format, you can use the following settings:
 
--   `format_regexp` — [String](/docs/en/sql-reference/data-types/string.md). Contains regular expression in the [re2](https://github.com/google/re2/wiki/Syntax) format.
+- `format_regexp` — [String](/docs/en/sql-reference/data-types/string.md). Contains regular expression in the [re2](https://github.com/google/re2/wiki/Syntax) format.
 
--   `format_regexp_escaping_rule` — [String](/docs/en/sql-reference/data-types/string.md). The following escaping rules are supported:
+- `format_regexp_escaping_rule` — [String](/docs/en/sql-reference/data-types/string.md). The following escaping rules are supported:
 
-    -   CSV (similarly to [CSV](#csv))
-    -   JSON (similarly to [JSONEachRow](#jsoneachrow))
-    -   Escaped (similarly to [TSV](#tabseparated))
-    -   Quoted (similarly to [Values](#data-format-values))
-    -   Raw (extracts subpatterns as a whole, no escaping rules, similarly to [TSVRaw](#tabseparatedraw))
+    - CSV (similarly to [CSV](#csv))
+    - JSON (similarly to [JSONEachRow](#jsoneachrow))
+    - Escaped (similarly to [TSV](#tabseparated))
+    - Quoted (similarly to [Values](#data-format-values))
+    - Raw (extracts subpatterns as a whole, no escaping rules, similarly to [TSVRaw](#tabseparatedraw))
 
--   `format_regexp_skip_unmatched` — [UInt8](/docs/en/sql-reference/data-types/int-uint.md). Defines the need to throw an exception in case the `format_regexp` expression does not match the imported data. Can be set to `0` or `1`.
+- `format_regexp_skip_unmatched` — [UInt8](/docs/en/sql-reference/data-types/int-uint.md). Defines the need to throw an exception in case the `format_regexp` expression does not match the imported data. Can be set to `0` or `1`.
 
 **Usage**
 
@@ -2264,20 +2470,28 @@ ClickHouse supports reading and writing [MessagePack](https://msgpack.org/) data
 
 ### Data Types Matching {#data-types-matching-msgpack}
 
-| MessagePack data type (`INSERT`)                                   | ClickHouse data type                                      | MessagePack data type (`SELECT`)   |
-|--------------------------------------------------------------------|-----------------------------------------------------------|------------------------------------|
-| `uint N`, `positive fixint`                                        | [UIntN](/docs/en/sql-reference/data-types/int-uint.md)          | `uint N`                           |
-| `int N`, `negative fixint`                                         | [IntN](/docs/en/sql-reference/data-types/int-uint.md)           | `int N`                            |
-| `bool`                                                             | [UInt8](/docs/en/sql-reference/data-types/int-uint.md)          | `uint 8`                           |
-| `fixstr`, `str 8`, `str 16`, `str 32`, `bin 8`, `bin 16`, `bin 32` | [String](/docs/en/sql-reference/data-types/string.md)           | `bin 8`, `bin 16`, `bin 32`        |
-| `fixstr`, `str 8`, `str 16`, `str 32`, `bin 8`, `bin 16`, `bin 32` | [FixedString](/docs/en/sql-reference/data-types/fixedstring.md) | `bin 8`, `bin 16`, `bin 32`        |
-| `float 32`                                                         | [Float32](/docs/en/sql-reference/data-types/float.md)           | `float 32`                         |
-| `float 64`                                                         | [Float64](/docs/en/sql-reference/data-types/float.md)           | `float 64`                         |
-| `uint 16`                                                          | [Date](/docs/en/sql-reference/data-types/date.md)               | `uint 16`                          |
-| `uint 32`                                                          | [DateTime](/docs/en/sql-reference/data-types/datetime.md)       | `uint 32`                          |
-| `uint 64`                                                          | [DateTime64](/docs/en/sql-reference/data-types/datetime.md)     | `uint 64`                          |
-| `fixarray`, `array 16`, `array 32`                                 | [Array](/docs/en/sql-reference/data-types/array.md)             | `fixarray`, `array 16`, `array 32` |
-| `fixmap`, `map 16`, `map 32`                                       | [Map](/docs/en/sql-reference/data-types/map.md)                 | `fixmap`, `map 16`, `map 32`       |
+| MessagePack data type (`INSERT`)                                   | ClickHouse data type                                                                                    | MessagePack data type (`SELECT`) |
+|--------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------|----------------------------------|
+| `uint N`, `positive fixint`                                        | [UIntN](/docs/en/sql-reference/data-types/int-uint.md)                                                  | `uint N`                         |
+| `int N`, `negative fixint`                                         | [IntN](/docs/en/sql-reference/data-types/int-uint.md)                                                   | `int N`                          |
+| `bool`                                                             | [UInt8](/docs/en/sql-reference/data-types/int-uint.md)                                                  | `uint 8`                         |
+| `fixstr`, `str 8`, `str 16`, `str 32`, `bin 8`, `bin 16`, `bin 32` | [String](/docs/en/sql-reference/data-types/string.md)                                                   | `bin 8`, `bin 16`, `bin 32`      |
+| `fixstr`, `str 8`, `str 16`, `str 32`, `bin 8`, `bin 16`, `bin 32` | [FixedString](/docs/en/sql-reference/data-types/fixedstring.md)                                         | `bin 8`, `bin 16`, `bin 32`      |
+| `float 32`                                                         | [Float32](/docs/en/sql-reference/data-types/float.md)                                                   | `float 32`                       |
+| `float 64`                                                         | [Float64](/docs/en/sql-reference/data-types/float.md)                                                   | `float 64`                       |
+| `uint 16`                                                          | [Date](/docs/en/sql-reference/data-types/date.md)                                                       | `uint 16`                        |
+| `int 32`                                                           | [Date32](/docs/en/sql-reference/data-types/date32.md)                                                   | `int 32`                         |
+| `uint 32`                                                          | [DateTime](/docs/en/sql-reference/data-types/datetime.md)                                               | `uint 32`                        |
+| `uint 64`                                                          | [DateTime64](/docs/en/sql-reference/data-types/datetime.md)                                             | `uint 64`                        |
+| `fixarray`, `array 16`, `array 32`                                 | [Array](/docs/en/sql-reference/data-types/array.md)/[Tuple](/docs/en/sql-reference/data-types/tuple.md) | `fixarray`, `array 16`, `array 32` |
+| `fixmap`, `map 16`, `map 32`                                       | [Map](/docs/en/sql-reference/data-types/map.md)                                                         | `fixmap`, `map 16`, `map 32`     |
+| `uint 32`                                                          | [IPv4](/docs/en/sql-reference/data-types/domains/ipv4.md)                                               | `uint 32`                        |
+| `bin 8`                                                            | [String](/docs/en/sql-reference/data-types/string.md)                                                   | `bin 8`                          |
+| `int 8`                                                            | [Enum8](/docs/en/sql-reference/data-types/enum.md)                                                      | `int 8`                          |
+| `bin 8`                                                            | [(U)Int128/(U)Int256](/docs/en/sql-reference/data-types/int-uint.md)                                    | `bin 8`                          |
+| `int 32`                                                           | [Decimal32](/docs/en/sql-reference/data-types/decimal.md)                                               | `int 32`                         |
+| `int 64`                                                           | [Decimal64](/docs/en/sql-reference/data-types/decimal.md)                                               | `int 64`                         |
+| `bin 8`                                                            | [Decimal128/Decimal256](/docs/en/sql-reference/data-types/decimal.md)                                   | `bin 8 `                         |
 
 Example:
 
diff --git a/docs/en/interfaces/grpc.md b/docs/en/interfaces/grpc.md
index 807663be646..3087ad20eac 100644
--- a/docs/en/interfaces/grpc.md
+++ b/docs/en/interfaces/grpc.md
@@ -10,14 +10,14 @@ sidebar_label: gRPC Interface
 
 ClickHouse supports [gRPC](https://grpc.io/) interface. It is an open source remote procedure call system that uses HTTP/2 and [Protocol Buffers](https://en.wikipedia.org/wiki/Protocol_Buffers). The implementation of gRPC in ClickHouse supports:
 
--   SSL;
--   authentication;
--   sessions;
--   compression;
--   parallel queries through the same channel;
--   cancellation of queries;
--   getting progress and logs;
--   external tables.
+- SSL;
+- authentication;
+- sessions;
+- compression;
+- parallel queries through the same channel;
+- cancellation of queries;
+- getting progress and logs;
+- external tables.
 
 The specification of the interface is described in [clickhouse_grpc.proto](https://github.com/ClickHouse/ClickHouse/blob/master/src/Server/grpc_protos/clickhouse_grpc.proto).
 
@@ -64,15 +64,15 @@ Or you can use a built-in Python client. It is placed in [utils/grpc-client/clic
 
 The client supports the following arguments:
 
--   `--help` – Shows a help message and exits.
--   `--host HOST, -h HOST` – A server name. Default value: `localhost`. You can use IPv4 or IPv6 addresses also.
--   `--port PORT` – A port to connect to. This port should be enabled in the ClickHouse server configuration (see `grpc_port`). Default value: `9100`.
--   `--user USER_NAME, -u USER_NAME` – A user name. Default value: `default`.
--   `--password PASSWORD` – A password. Default value: empty string.
--   `--query QUERY, -q QUERY` – A query to process when using non-interactive mode.
--   `--database DATABASE, -d DATABASE` – A default database. If not specified, the current database set in the server settings is used (`default` by default).
--   `--format OUTPUT_FORMAT, -f OUTPUT_FORMAT` – A result output [format](formats.md). Default value for interactive mode: `PrettyCompact`.
--   `--debug` – Enables showing debug information.
+- `--help` – Shows a help message and exits.
+- `--host HOST, -h HOST` – A server name. Default value: `localhost`. You can use IPv4 or IPv6 addresses also.
+- `--port PORT` – A port to connect to. This port should be enabled in the ClickHouse server configuration (see `grpc_port`). Default value: `9100`.
+- `--user USER_NAME, -u USER_NAME` – A user name. Default value: `default`.
+- `--password PASSWORD` – A password. Default value: empty string.
+- `--query QUERY, -q QUERY` – A query to process when using non-interactive mode.
+- `--database DATABASE, -d DATABASE` – A default database. If not specified, the current database set in the server settings is used (`default` by default).
+- `--format OUTPUT_FORMAT, -f OUTPUT_FORMAT` – A result output [format](formats.md). Default value for interactive mode: `PrettyCompact`.
+- `--debug` – Enables showing debug information.
 
 To run the client in an interactive mode call it without `--query` argument.
 
diff --git a/docs/en/interfaces/http.md b/docs/en/interfaces/http.md
index 9af6df0c87d..3a7f6d4d854 100644
--- a/docs/en/interfaces/http.md
+++ b/docs/en/interfaces/http.md
@@ -293,11 +293,11 @@ X-ClickHouse-Progress: {"read_rows":"8783786","read_bytes":"819092887","total_ro
 
 Possible header fields:
 
--   `read_rows` — Number of rows read.
--   `read_bytes` — Volume of data read in bytes.
--   `total_rows_to_read` — Total number of rows to be read.
--   `written_rows` — Number of rows written.
--   `written_bytes` — Volume of data written in bytes.
+- `read_rows` — Number of rows read.
+- `read_bytes` — Volume of data read in bytes.
+- `total_rows_to_read` — Total number of rows to be read.
+- `written_rows` — Number of rows written.
+- `written_bytes` — Volume of data written in bytes.
 
 Running requests do not stop automatically if the HTTP connection is lost. Parsing and data formatting are performed on the server-side, and using the network might be ineffective.
 The optional ‘query_id’ parameter can be passed as the query ID (any string). For more information, see the section “Settings, replace_running_query”.
@@ -309,6 +309,7 @@ The HTTP interface allows passing external data (external temporary tables) for
 ## Response Buffering {#response-buffering}
 
 You can enable response buffering on the server-side. The `buffer_size` and `wait_end_of_query` URL parameters are provided for this purpose.
+Also settings `http_response_buffer_size` and `http_wait_end_of_query` can be used.
 
 `buffer_size` determines the number of bytes in the result to buffer in the server memory. If a result body is larger than this threshold, the buffer is written to the HTTP channel, and the remaining data is sent directly to the HTTP channel.
 
@@ -332,6 +333,35 @@ You can create a query with parameters and pass values for them from the corresp
 $ curl -sS "<address>?param_id=2&param_phrase=test" -d "SELECT * FROM table WHERE int_column = {id:UInt8} and string_column = {phrase:String}"
 ```
 
+### Tabs in URL Parameters
+
+Query parameters are parsed from the "escaped" format. This has some benefits, such as the possibility to unambiguously parse nulls as `\N`. This means the tab character should be encoded as `\t` (or `\` and a tab). For example, the following contains an actual tab between `abc` and `123` and the input string is split into two values:
+
+```bash
+curl -sS "http://localhost:8123" -d "SELECT splitByChar('\t', 'abc      123')"
+```
+
+```response
+['abc','123']
+```
+
+However, if you try to encode an actual tab using `%09` in a URL parameter, it won't get parsed properly:
+
+```bash
+curl -sS "http://localhost:8123?param_arg1=abc%09123" -d "SELECT splitByChar('\t', {arg1:String})"
+Code: 457. DB::Exception: Value abc	123 cannot be parsed as String for query parameter 'arg1' because it isn't parsed completely: only 3 of 7 bytes was parsed: abc. (BAD_QUERY_PARAMETER) (version 23.4.1.869 (official build))
+```
+
+If you are using URL parameters, you will need to encode the `\t` as `%5C%09`. For example:
+
+```bash
+curl -sS "http://localhost:8123?param_arg1=abc%5C%09123" -d "SELECT splitByChar('\t', {arg1:String})"
+```
+
+```response
+['abc','123']
+```
+
 ## Predefined HTTP Interface {#predefined_http_interface}
 
 ClickHouse supports specific queries through the HTTP interface. For example, you can write data to a table as follows:
@@ -344,7 +374,7 @@ ClickHouse also supports Predefined HTTP Interface which can help you more easil
 
 Example:
 
--   First of all, add this section to server configuration file:
+- First of all, add this section to server configuration file:
 
 <!-- -->
 
@@ -363,7 +393,7 @@ Example:
 </http_handlers>
 ```
 
--   You can now request the URL directly for data in the Prometheus format:
+- You can now request the URL directly for data in the Prometheus format:
 
 <!-- -->
 
@@ -418,22 +448,22 @@ As you can see from the example if `http_handlers` is configured in the config.x
 Now `rule` can configure `method`, `headers`, `url`, `handler`:
 - `method` is responsible for matching the method part of the HTTP request. `method` fully conforms to the definition of [method](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods) in the HTTP protocol. It is an optional configuration. If it is not defined in the configuration file, it does not match the method portion of the HTTP request.
 
--   `url` is responsible for matching the URL part of the HTTP request. It is compatible with [RE2](https://github.com/google/re2)’s regular expressions. It is an optional configuration. If it is not defined in the configuration file, it does not match the URL portion of the HTTP request.
+- `url` is responsible for matching the URL part of the HTTP request. It is compatible with [RE2](https://github.com/google/re2)’s regular expressions. It is an optional configuration. If it is not defined in the configuration file, it does not match the URL portion of the HTTP request.
 
--   `headers` are responsible for matching the header part of the HTTP request. It is compatible with RE2’s regular expressions. It is an optional configuration. If it is not defined in the configuration file, it does not match the header portion of the HTTP request.
+- `headers` are responsible for matching the header part of the HTTP request. It is compatible with RE2’s regular expressions. It is an optional configuration. If it is not defined in the configuration file, it does not match the header portion of the HTTP request.
 
--   `handler` contains the main processing part. Now `handler` can configure `type`, `status`, `content_type`, `response_content`, `query`, `query_param_name`.
+- `handler` contains the main processing part. Now `handler` can configure `type`, `status`, `content_type`, `response_content`, `query`, `query_param_name`.
     `type` currently supports three types: [predefined_query_handler](#predefined_query_handler), [dynamic_query_handler](#dynamic_query_handler), [static](#static).
 
-    -   `query` — use with `predefined_query_handler` type, executes query when the handler is called.
+    - `query` — use with `predefined_query_handler` type, executes query when the handler is called.
 
-    -   `query_param_name` — use with `dynamic_query_handler` type, extracts and executes the value corresponding to the `query_param_name` value in HTTP request parameters.
+    - `query_param_name` — use with `dynamic_query_handler` type, extracts and executes the value corresponding to the `query_param_name` value in HTTP request parameters.
 
-    -   `status` — use with `static` type, response status code.
+    - `status` — use with `static` type, response status code.
 
-    -   `content_type` — use with any type, response [content-type](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type).
+    - `content_type` — use with any type, response [content-type](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type).
 
-    -   `response_content` — use with `static` type, response content sent to client, when using the prefix ‘file://’ or ‘config://’, find the content from the file or configuration sends to client.
+    - `response_content` — use with `static` type, response content sent to client, when using the prefix ‘file://’ or ‘config://’, find the content from the file or configuration sends to client.
 
 Next are the configuration methods for different `type`.
 
@@ -445,7 +475,7 @@ Next are the configuration methods for different `type`.
 
 The following example defines the values of [max_threads](../operations/settings/settings.md#settings-max_threads) and `max_final_threads` settings, then queries the system table to check whether these settings were set successfully.
 
-:::warning
+:::note
 To keep the default `handlers` such as` query`, `play`,` ping`, add the `<defaults/>` rule.
 :::
 
@@ -476,7 +506,7 @@ $ curl -H 'XXX:TEST_HEADER_VALUE' -H 'PARAMS_XXX:max_threads' 'http://localhost:
 max_final_threads   2
 ```
 
-:::warning
+:::note
 In one `predefined_query_handler` only supports one `query` of an insert type.
 :::
 
diff --git a/docs/en/interfaces/jdbc.md b/docs/en/interfaces/jdbc.md
index b2ff2829af9..2b68316cc3d 100644
--- a/docs/en/interfaces/jdbc.md
+++ b/docs/en/interfaces/jdbc.md
@@ -8,6 +8,6 @@ sidebar_label: JDBC Driver
 
 Use the [official JDBC driver](https://github.com/ClickHouse/clickhouse-jdbc) (and Java client) to access ClickHouse from your Java applications.
 
--   Third-party drivers:
-    -   [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC)
-    -   [clickhouse4j](https://github.com/blynkkk/clickhouse4j)
+- Third-party drivers:
+    - [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC)
+    - [clickhouse4j](https://github.com/blynkkk/clickhouse4j)
diff --git a/docs/en/interfaces/mysql.md b/docs/en/interfaces/mysql.md
index c2d6038125b..fab3ba42758 100644
--- a/docs/en/interfaces/mysql.md
+++ b/docs/en/interfaces/mysql.md
@@ -57,9 +57,9 @@ If user password is specified using [SHA256](../operations/settings/settings-use
 
 Restrictions:
 
--   prepared queries are not supported
+- prepared queries are not supported
 
--   some data types are sent as strings
+- some data types are sent as strings
 
 To cancel a long query use `KILL QUERY connection_id` statement (it is replaced with `KILL QUERY WHERE query_id = connection_id` while proceeding). For example:
 
diff --git a/docs/en/interfaces/overview.md b/docs/en/interfaces/overview.md
index e5fa503e8fc..8f16dcf5f83 100644
--- a/docs/en/interfaces/overview.md
+++ b/docs/en/interfaces/overview.md
@@ -6,23 +6,23 @@ keywords: [clickhouse, network, interfaces, http, tcp, grpc, command-line, clien
 description: ClickHouse provides three network interfaces
 ---
 
-# Interfaces
+# Drivers and Interfaces
 
 ClickHouse provides three network interfaces (they can be optionally wrapped in TLS for additional security):
 
--   [HTTP](http.md), which is documented and easy to use directly.
--   [Native TCP](../interfaces/tcp.md), which has less overhead.
--   [gRPC](grpc.md).
+- [HTTP](http.md), which is documented and easy to use directly.
+- [Native TCP](../interfaces/tcp.md), which has less overhead.
+- [gRPC](grpc.md).
 
 In most cases it is recommended to use an appropriate tool or library instead of interacting with those directly. The following are officially supported by ClickHouse:
 
--   [Command-line client](../interfaces/cli.md)
--   [JDBC driver](../interfaces/jdbc.md)
--   [ODBC driver](../interfaces/odbc.md)
--   [C++ client library](../interfaces/cpp.md)
+- [Command-line client](../interfaces/cli.md)
+- [JDBC driver](../interfaces/jdbc.md)
+- [ODBC driver](../interfaces/odbc.md)
+- [C++ client library](../interfaces/cpp.md)
 
 There are also a wide range of third-party libraries for working with ClickHouse:
 
--   [Client libraries](../interfaces/third-party/client-libraries.md)
--   [Integrations](../interfaces/third-party/integrations.md)
--   [Visual interfaces](../interfaces/third-party/gui.md)
+- [Client libraries](../interfaces/third-party/client-libraries.md)
+- [Integrations](../interfaces/third-party/integrations.md)
+- [Visual interfaces](../interfaces/third-party/gui.md)
diff --git a/docs/en/interfaces/postgresql.md b/docs/en/interfaces/postgresql.md
index 9ff83559787..1146274b012 100644
--- a/docs/en/interfaces/postgresql.md
+++ b/docs/en/interfaces/postgresql.md
@@ -8,7 +8,7 @@ sidebar_label: PostgreSQL Interface
 
 ClickHouse supports the PostgreSQL wire protocol, which allows you to use Postgres clients to connect to ClickHouse. In a sense, ClickHouse can pretend to be a PostgreSQL instance - allowing you to connect a PostgreSQL client application to ClickHouse that is not already directly supported by ClickHouse (for example, Amazon Redshift).
 
-To enable the PostgreSQL wire protocol, add the [postgresql_port](../operations/server-configuration-parameters/settings#server_configuration_parameters-postgresql_port) setting to your server's configuration file. For example, you could define the port in a new XML file in your `config.d` folder:
+To enable the PostgreSQL wire protocol, add the [postgresql_port](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-postgresql_port) setting to your server's configuration file. For example, you could define the port in a new XML file in your `config.d` folder:
 
 ```xml
 <clickhouse>
@@ -54,7 +54,7 @@ default=>
 
 And that's it! You now have a PostgreSQL client connected to ClickHouse, and all commands and queries are executed on ClickHouse.
 
-:::caution
+:::note
 The PostgreSQL protocol currently only supports plain-text passwords.
 :::
 
diff --git a/docs/en/interfaces/schema-inference.md b/docs/en/interfaces/schema-inference.md
index 25bdb0c36a3..c448d0aee47 100644
--- a/docs/en/interfaces/schema-inference.md
+++ b/docs/en/interfaces/schema-inference.md
@@ -117,7 +117,7 @@ clickhouse-local --file='hobbies.jsonl' --table='hobbies' --query='SELECT * FROM
 4	47	Brayan	['movies','skydiving']
 ```
 
-# Using structure from insertion table {#using-structure-from-insertion-table}
+## Using structure from insertion table {#using-structure-from-insertion-table}
 
 When table functions `file/s3/url/hdfs` are used to insert data into a table,
 there is an option to use the structure from the insertion table instead of extracting it from the data.
@@ -222,7 +222,7 @@ INSERT INTO hobbies4 SELECT id, empty(hobbies) ? NULL : hobbies[1] FROM file(hob
 
 In this case, there are some operations performed on the column `hobbies` in the `SELECT` query to insert it into the table, so ClickHouse cannot use the structure from the insertion table, and schema inference will be used.
 
-# Schema inference cache {#schema-inference-cache}
+## Schema inference cache {#schema-inference-cache}
 
 For most input formats schema inference reads some data to determine its structure and this process can take some time.
 To prevent inferring the same schema every time ClickHouse read the data from the same file, the inferred schema is cached and when accessing the same file again, ClickHouse will use the schema from the cache.
@@ -326,14 +326,14 @@ SELECT count() FROM system.schema_inference_cache WHERE storage='S3'
 └─────────┘
 ```
 
-# Text formats {#text-formats}
+## Text formats {#text-formats}
 
 For text formats, ClickHouse reads the data row by row, extracts column values according to the format,
 and then uses some recursive parsers and heuristics to determine the type for each value. The maximum number of rows read from the data in schema inference
 is controlled by the setting `input_format_max_rows_to_read_for_schema_inference` with default value 25000.
 By default, all inferred types are [Nullable](../sql-reference/data-types/nullable.md), but you can change this by setting `schema_inference_make_columns_nullable` (see examples in the [settings](#settings-for-text-formats) section).
 
-## JSON formats {#json-formats}
+### JSON formats {#json-formats}
 
 In JSON formats ClickHouse parses values according to the JSON specification and then tries to find the most appropriate data type for them.
 
@@ -464,9 +464,9 @@ most likely this column contains only Nulls or empty Arrays/Maps.
 ...
 ```
 
-### JSON settings {#json-settings}
+#### JSON settings {#json-settings}
 
-#### input_format_json_read_objects_as_strings
+##### input_format_json_read_objects_as_strings
 
 Enabling this setting allows reading nested JSON objects as strings.
 This setting can be used to read nested JSON objects without using JSON object type.
@@ -486,7 +486,7 @@ DESC format(JSONEachRow, $$
 └──────┴──────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-#### input_format_json_try_infer_numbers_from_strings
+##### input_format_json_try_infer_numbers_from_strings
 
 Enabling this setting allows inferring numbers from string values.
 
@@ -507,7 +507,7 @@ DESC format(JSONEachRow, $$
 └───────┴─────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-#### input_format_json_read_numbers_as_strings
+##### input_format_json_read_numbers_as_strings
 
 Enabling this setting allows reading numeric values as strings.
 
@@ -528,7 +528,7 @@ DESC format(JSONEachRow, $$
 └───────┴──────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-#### input_format_json_read_bools_as_numbers
+##### input_format_json_read_bools_as_numbers
 
 Enabling this setting allows reading Bool values as numbers.
 
@@ -549,7 +549,7 @@ DESC format(JSONEachRow, $$
 └───────┴─────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-## CSV {#csv}
+### CSV {#csv}
 
 In CSV format ClickHouse extracts column values from the row according to delimiters. ClickHouse expects all types except numbers and strings to be enclosed in double quotes. If the value is in double quotes, ClickHouse tries to parse
 the data inside quotes using the recursive parser and then tries to find the most appropriate data type for it. If the value is not in double quotes, ClickHouse tries to parse it as a number,
@@ -726,7 +726,7 @@ $$)
 └──────────────┴───────────────┘
 ```
 
-## TSV/TSKV {#tsv-tskv}
+### TSV/TSKV {#tsv-tskv}
 
 In TSV/TSKV formats ClickHouse extracts column value from the row according to tabular delimiters and then parses extracted value using
 the recursive parser to determine the most appropriate type. If the type cannot be determined, ClickHouse treats this value as String.
@@ -1019,7 +1019,7 @@ DESC format(TSV, '[1,2,3]	42.42	Hello World!')
 └──────┴──────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-## CustomSeparated {#custom-separated}
+### CustomSeparated {#custom-separated}
 
 In CustomSeparated format ClickHouse first extracts all column values from the row according to specified delimiters and then tries to infer
 the data type for each value according to escaping rule.
@@ -1080,7 +1080,7 @@ $$)
 └────────┴───────────────┴────────────┘
 ```
 
-## Template {#template}
+### Template {#template}
 
 In Template format ClickHouse first extracts all column values from the row according to the specified template and then tries to infer the 
 data type for each value according to its escaping rule.
@@ -1120,7 +1120,7 @@ $$)
 └──────────┴────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-## Regexp {#regexp}
+### Regexp {#regexp}
 
 Similar to Template, in Regexp format ClickHouse first extracts all column values from the row according to specified regular expression and then tries to infer
 data type for each value according to the specified escaping rule.
@@ -1142,9 +1142,9 @@ Line: value_1=2, value_2="Some string 2", value_3="[4, 5, NULL]"$$)
 └──────┴────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-## Settings for text formats {settings-for-text-formats}
+### Settings for text formats {#settings-for-text-formats}
 
-### input_format_max_rows_to_read_for_schema_inference
+#### input_format_max_rows_to_read_for_schema_inference
 
 This setting controls the maximum number of rows to be read while schema inference.
 The more rows are read, the more time is spent on schema inference, but the greater the chance to
@@ -1152,7 +1152,7 @@ correctly determine the types (especially when the data contains a lot of nulls)
 
 Default value: `25000`.
 
-### column_names_for_schema_inference
+#### column_names_for_schema_inference
 
 The list of column names to use in schema inference for formats without explicit column names. Specified names will be used instead of default `c1,c2,c3,...`. The format: `column1,column2,column3,...`.
 
@@ -1169,7 +1169,7 @@ DESC format(TSV, 'Hello, World!	42	[1, 2, 3]') settings column_names_for_schema_
 └──────┴────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-### schema_inference_hints
+#### schema_inference_hints
 
 The list of column names and types to use in schema inference instead of automatically determined types. The format: 'column_name1 column_type1, column_name2 column_type2, ...'.
 This setting can be used to specify the types of columns that could not be determined automatically or for optimizing the schema.
@@ -1189,7 +1189,7 @@ DESC format(JSONEachRow, '{"id" : 1, "age" : 25, "name" : "Josh", "status" : nul
 └─────────┴─────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-### schema_inference_make_columns_nullable
+#### schema_inference_make_columns_nullable
 
 Controls making inferred types `Nullable` in schema inference for formats without information about nullability.
 If the setting is enabled, all inferred type will be `Nullable`, if disabled, the inferred type will be `Nullable` only if the column contains `NULL` in a sample that is parsed during schema inference.
@@ -1232,7 +1232,7 @@ DESC format(JSONEachRow, $$
 └─────────┴──────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-### input_format_try_infer_integers
+#### input_format_try_infer_integers
 
 If enabled, ClickHouse will try to infer integers instead of floats in schema inference for text formats.
 If all numbers in the column from sample data are integers, the result type will be `Int64`, if at least one number is float, the result type will be `Float64`.
@@ -1289,7 +1289,7 @@ DESC format(JSONEachRow, $$
 └────────┴───────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-### input_format_try_infer_datetimes
+#### input_format_try_infer_datetimes
 
 If enabled, ClickHouse will try to infer type `DateTime64` from string fields in schema inference for text formats.
 If all fields from a column in sample data were successfully parsed as datetimes, the result type will be `DateTime64(9)`,
@@ -1337,7 +1337,7 @@ DESC format(JSONEachRow, $$
 
 Note: Parsing datetimes during schema inference respect setting [date_time_input_format](/docs/en/operations/settings/settings-formats.md#date_time_input_format)
 
-### input_format_try_infer_dates
+#### input_format_try_infer_dates
 
 If enabled, ClickHouse will try to infer type `Date` from string fields in schema inference for text formats.
 If all fields from a column in sample data were successfully parsed as dates, the result type will be `Date`,
@@ -1383,14 +1383,14 @@ DESC format(JSONEachRow, $$
 └──────┴──────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-# Self describing formats {#self-describing-formats}
+## Self describing formats {#self-describing-formats}
 
 Self-describing formats contain information about the structure of the data in the data itself,
 it can be some header with a description, a binary type tree, or some kind of table.
 To automatically infer a schema from files in such formats, ClickHouse reads a part of the data containing
 information about the types and converts it into a schema of the ClickHouse table.
 
-## Formats with -WithNamesAndTypes suffix {#formats-with-names-and-types}
+### Formats with -WithNamesAndTypes suffix {#formats-with-names-and-types}
 
 ClickHouse supports some text formats with the suffix -WithNamesAndTypes. This suffix means that the data contains two additional rows with column names and types before the actual data.
 While schema inference for such formats, ClickHouse reads the first two rows and extracts column names and types.
@@ -1412,7 +1412,7 @@ $$)
 └──────┴──────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-## JSON formats with metadata {#json-with-metadata}
+### JSON formats with metadata {#json-with-metadata}
 
 Some JSON input formats ([JSON](formats.md#json), [JSONCompact](formats.md#json-compact), [JSONColumnsWithMetadata](formats.md#jsoncolumnswithmetadata)) contain metadata with column names and types.
 In schema inference for such formats, ClickHouse reads this metadata.
@@ -1465,7 +1465,7 @@ $$)
 └──────┴──────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-## Avro {#avro}
+### Avro {#avro}
 
 In Avro format ClickHouse reads its schema from the data and converts it to ClickHouse schema using the following type matches:
 
@@ -1473,6 +1473,7 @@ In Avro format ClickHouse reads its schema from the data and converts it to Clic
 |------------------------------------|--------------------------------------------------------------------------------|
 | `boolean`                          | [Bool](../sql-reference/data-types/boolean.md)                                 |
 | `int`                              | [Int32](../sql-reference/data-types/int-uint.md)                               |
+| `int (date)` \*                    | [Date32](../sql-reference/data-types/date32.md)                                |
 | `long`                             | [Int64](../sql-reference/data-types/int-uint.md)                               |
 | `float`                            | [Float32](../sql-reference/data-types/float.md)                                |
 | `double`                           | [Float64](../sql-reference/data-types/float.md)                                |
@@ -1482,10 +1483,14 @@ In Avro format ClickHouse reads its schema from the data and converts it to Clic
 | `array(T)`                         | [Array(T)](../sql-reference/data-types/array.md)                               |
 | `union(null, T)`, `union(T, null)` | [Nullable(T)](../sql-reference/data-types/date.md)                             |
 | `null`                             | [Nullable(Nothing)](../sql-reference/data-types/special-data-types/nothing.md) |
+| `string (uuid)` \*                 | [UUID](../sql-reference/data-types/uuid.md)                                    |
+| `binary (decimal)` \*              | [Decimal(P, S)](../sql-reference/data-types/decimal.md)                         |
+
+\* [Avro logical types](https://avro.apache.org/docs/current/spec.html#Logical+Types)
 
 Other Avro types are not supported.
 
-## Parquet {#parquet}
+### Parquet {#parquet}
 
 In Parquet format ClickHouse reads its schema from the data and converts it to ClickHouse schema using the following type matches:
 
@@ -1513,7 +1518,7 @@ In Parquet format ClickHouse reads its schema from the data and converts it to C
 
 Other Parquet types are not supported. By default, all inferred types are inside `Nullable`, but it can be changed using the setting `schema_inference_make_columns_nullable`.
 
-## Arrow {#arrow}
+### Arrow {#arrow}
 
 In Arrow format ClickHouse reads its schema from the data and converts it to ClickHouse schema using the following type matches:
 
@@ -1541,7 +1546,7 @@ In Arrow format ClickHouse reads its schema from the data and converts it to Cli
 
 Other Arrow types are not supported. By default, all inferred types are inside `Nullable`, but it can be changed using the setting `schema_inference_make_columns_nullable`.
 
-## ORC {#orc}
+### ORC {#orc}
 
 In ORC format ClickHouse reads its schema from the data and converts it to ClickHouse schema using the following type matches:
 
@@ -1564,17 +1569,17 @@ In ORC format ClickHouse reads its schema from the data and converts it to Click
 
 Other ORC types are not supported. By default, all inferred types are inside `Nullable`, but it can be changed using the setting `schema_inference_make_columns_nullable`.
 
-## Native {#native}
+### Native {#native}
 
 Native format is used inside ClickHouse and contains the schema in the data.
 In schema inference, ClickHouse reads the schema from the data without any transformations.
 
-# Formats with external schema {#formats-with-external-schema}
+## Formats with external schema {#formats-with-external-schema}
 
 Such formats require a schema describing the data in a separate file in a specific schema language.
 To automatically infer a schema from files in such formats, ClickHouse reads external schema from a separate file and transforms it to a ClickHouse table schema.
 
-# Protobuf {#protobuf}
+### Protobuf {#protobuf}
 
 In schema inference for Protobuf format ClickHouse uses the following type matches:
 
@@ -1592,7 +1597,7 @@ In schema inference for Protobuf format ClickHouse uses the following type match
 | `repeated T`                  | [Array(T)](../sql-reference/data-types/array.md)  |
 | `message`, `group`            | [Tuple](../sql-reference/data-types/tuple.md)     |
 
-# CapnProto {#capnproto}
+### CapnProto {#capnproto}
 
 In schema inference for CapnProto format ClickHouse uses the following type matches:
 
@@ -1615,13 +1620,13 @@ In schema inference for CapnProto format ClickHouse uses the following type matc
 | `struct`                           | [Tuple](../sql-reference/data-types/tuple.md)          |
 | `union(T, Void)`, `union(Void, T)` | [Nullable(T)](../sql-reference/data-types/nullable.md) |
 
-# Strong-typed binary formats {#strong-typed-binary-formats}
+## Strong-typed binary formats {#strong-typed-binary-formats}
 
 In such formats, each serialized value contains information about its type (and possibly about its name), but there is no information about the whole table.
 In schema inference for such formats, ClickHouse reads data row by row (up to `input_format_max_rows_to_read_for_schema_inference` rows) and extracts
 the type (and possibly name) for each value from the data and then converts these types to ClickHouse types.
 
-## MsgPack {msgpack}
+### MsgPack {#msgpack}
 
 In MsgPack format there is no delimiter between rows, to use schema inference for this format you should specify the number of columns in the table
 using the setting `input_format_msgpack_number_of_columns`. ClickHouse uses the following type matches:
@@ -1641,7 +1646,7 @@ using the setting `input_format_msgpack_number_of_columns`. ClickHouse uses the
 
 By default, all inferred types are inside `Nullable`, but it can be changed using the setting `schema_inference_make_columns_nullable`.
 
-## BSONEachRow {#bsoneachrow}
+### BSONEachRow {#bsoneachrow}
 
 In BSONEachRow each row of data is presented as a BSON document. In schema inference ClickHouse reads BSON documents one by one and extracts
 values, names, and types from the data and then transforms these types to ClickHouse types using the following type matches:
@@ -1661,11 +1666,11 @@ values, names, and types from the data and then transforms these types to ClickH
 
 By default, all inferred types are inside `Nullable`, but it can be changed using the setting `schema_inference_make_columns_nullable`.
 
-# Formats with constant schema {#formats-with-constant-schema}
+## Formats with constant schema {#formats-with-constant-schema}
 
 Data in such formats always have the same schema.
 
-## LineAsString {#line-as-string}
+### LineAsString {#line-as-string}
 
 In this format, ClickHouse reads the whole line from the data into a single column with `String` data type. The inferred type for this format is always `String` and the column name is `line`.
 
@@ -1680,7 +1685,7 @@ DESC format(LineAsString, 'Hello\nworld!')
 └──────┴────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-## JSONAsString {#json-as-string}
+### JSONAsString {#json-as-string}
 
 In this format, ClickHouse reads the whole JSON object from the data into a single column with `String` data type. The inferred type for this format is always `String` and the column name is `json`.
 
@@ -1695,7 +1700,7 @@ DESC format(JSONAsString, '{"x" : 42, "y" : "Hello, World!"}')
 └──────┴────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-## JSONAsObject {#json-as-object}
+### JSONAsObject {#json-as-object}
 
 In this format, ClickHouse reads the whole JSON object from the data into a single column with `Object('json')` data type. Inferred type for this format is always `String` and the column name is `json`.
 
diff --git a/docs/en/interfaces/third-party/client-libraries.md b/docs/en/interfaces/third-party/client-libraries.md
index 4114e47e982..f7603994163 100644
--- a/docs/en/interfaces/third-party/client-libraries.md
+++ b/docs/en/interfaces/third-party/client-libraries.md
@@ -6,71 +6,72 @@ sidebar_label: Client Libraries
 
 # Client Libraries from Third-party Developers
 
-:::warning
+:::note
 ClickHouse Inc does **not** maintain the libraries listed below and hasn’t done any extensive testing to ensure their quality.
 :::
 
--   Python
-    -   [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)
-    -   [clickhouse-driver](https://github.com/mymarilyn/clickhouse-driver)
-    -   [clickhouse-client](https://github.com/yurial/clickhouse-client)
-    -   [aiochclient](https://github.com/maximdanilchenko/aiochclient)
-    -   [asynch](https://github.com/long2ice/asynch)
--   PHP
-    -   [smi2/phpclickhouse](https://packagist.org/packages/smi2/phpClickHouse)
-    -   [8bitov/clickhouse-php-client](https://packagist.org/packages/8bitov/clickhouse-php-client)
-    -   [bozerkins/clickhouse-client](https://packagist.org/packages/bozerkins/clickhouse-client)
-    -   [simpod/clickhouse-client](https://packagist.org/packages/simpod/clickhouse-client)
-    -   [seva-code/php-click-house-client](https://packagist.org/packages/seva-code/php-click-house-client)
-    -   [SeasClick C++ client](https://github.com/SeasX/SeasClick)
-    -   [one-ck](https://github.com/lizhichao/one-ck)
-    -   [glushkovds/phpclickhouse-laravel](https://packagist.org/packages/glushkovds/phpclickhouse-laravel)
-    -   [kolya7k ClickHouse PHP extension](https://github.com//kolya7k/clickhouse-php)
--   Go
-    -   [clickhouse](https://github.com/kshvakov/clickhouse/)
-    -   [go-clickhouse](https://github.com/roistat/go-clickhouse)
-    -   [chconn](https://github.com/vahid-sohrabloo/chconn)
-    -   [mailrugo-clickhouse](https://github.com/mailru/go-clickhouse)
-    -   [golang-clickhouse](https://github.com/leprosus/golang-clickhouse)
-    -   [uptrace/go-clickhouse](https://clickhouse.uptrace.dev/)
--   Swift
-    -   [ClickHouseNIO](https://github.com/patrick-zippenfenig/ClickHouseNIO)
-    -   [ClickHouseVapor ORM](https://github.com/patrick-zippenfenig/ClickHouseVapor)
--   NodeJs
-    -   [clickhouse (NodeJs)](https://github.com/TimonKK/clickhouse)
-    -   [node-clickhouse](https://github.com/apla/node-clickhouse)
-    -   [nestjs-clickhouse](https://github.com/depyronick/nestjs-clickhouse)
-    -   [clickhouse-client](https://github.com/depyronick/clickhouse-client)
-    -   [node-clickhouse-orm](https://github.com/zimv/node-clickhouse-orm)
--   Perl
-    -   [perl-DBD-ClickHouse](https://github.com/elcamlost/perl-DBD-ClickHouse)
-    -   [HTTP-ClickHouse](https://metacpan.org/release/HTTP-ClickHouse)
-    -   [AnyEvent-ClickHouse](https://metacpan.org/release/AnyEvent-ClickHouse)
--   Ruby
-    -   [ClickHouse (Ruby)](https://github.com/shlima/click_house)
-    -   [clickhouse-activerecord](https://github.com/PNixx/clickhouse-activerecord)
--   Rust
-    -   [clickhouse.rs](https://github.com/loyd/clickhouse.rs)
-    -   [clickhouse-rs](https://github.com/suharev7/clickhouse-rs)
-    -   [Klickhouse](https://github.com/Protryon/klickhouse)
--   R
-    -   [RClickHouse](https://github.com/IMSMWU/RClickHouse)
--   Java
-    -   [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java)
-    -   [clickhouse-client](https://github.com/Ecwid/clickhouse-client)
--   Scala
-    -   [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client)
--   Kotlin
-    -   [AORM](https://github.com/TanVD/AORM)
--   C#
-    -   [Octonica.ClickHouseClient](https://github.com/Octonica/ClickHouseClient)
-    -   [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net)
-    -   [ClickHouse.Client](https://github.com/DarkWanderer/ClickHouse.Client)
-    -   [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net)
--   Elixir
-    -   [clickhousex](https://github.com/appodeal/clickhousex/)
-    -   [pillar](https://github.com/sofakingworld/pillar)
--   Nim
-    -   [nim-clickhouse](https://github.com/leonardoce/nim-clickhouse)
--   Haskell
-    -   [hdbc-clickhouse](https://github.com/zaneli/hdbc-clickhouse)
+- Python
+    - [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)
+    - [clickhouse-driver](https://github.com/mymarilyn/clickhouse-driver)
+    - [clickhouse-client](https://github.com/yurial/clickhouse-client)
+    - [aiochclient](https://github.com/maximdanilchenko/aiochclient)
+    - [asynch](https://github.com/long2ice/asynch)
+- PHP
+    - [smi2/phpclickhouse](https://packagist.org/packages/smi2/phpClickHouse)
+    - [8bitov/clickhouse-php-client](https://packagist.org/packages/8bitov/clickhouse-php-client)
+    - [bozerkins/clickhouse-client](https://packagist.org/packages/bozerkins/clickhouse-client)
+    - [simpod/clickhouse-client](https://packagist.org/packages/simpod/clickhouse-client)
+    - [seva-code/php-click-house-client](https://packagist.org/packages/seva-code/php-click-house-client)
+    - [SeasClick C++ client](https://github.com/SeasX/SeasClick)
+    - [one-ck](https://github.com/lizhichao/one-ck)
+    - [glushkovds/phpclickhouse-laravel](https://packagist.org/packages/glushkovds/phpclickhouse-laravel)
+    - [kolya7k ClickHouse PHP extension](https://github.com//kolya7k/clickhouse-php)
+    - [hyvor/clickhouse-php](https://github.com/hyvor/clickhouse-php)
+- Go
+    - [clickhouse](https://github.com/kshvakov/clickhouse/)
+    - [go-clickhouse](https://github.com/roistat/go-clickhouse)
+    - [chconn](https://github.com/vahid-sohrabloo/chconn)
+    - [mailrugo-clickhouse](https://github.com/mailru/go-clickhouse)
+    - [golang-clickhouse](https://github.com/leprosus/golang-clickhouse)
+    - [uptrace/go-clickhouse](https://clickhouse.uptrace.dev/)
+- Swift
+    - [ClickHouseNIO](https://github.com/patrick-zippenfenig/ClickHouseNIO)
+    - [ClickHouseVapor ORM](https://github.com/patrick-zippenfenig/ClickHouseVapor)
+- NodeJs
+    - [clickhouse (NodeJs)](https://github.com/TimonKK/clickhouse)
+    - [node-clickhouse](https://github.com/apla/node-clickhouse)
+    - [nestjs-clickhouse](https://github.com/depyronick/nestjs-clickhouse)
+    - [clickhouse-client](https://github.com/depyronick/clickhouse-client)
+    - [node-clickhouse-orm](https://github.com/zimv/node-clickhouse-orm)
+- Perl
+    - [perl-DBD-ClickHouse](https://github.com/elcamlost/perl-DBD-ClickHouse)
+    - [HTTP-ClickHouse](https://metacpan.org/release/HTTP-ClickHouse)
+    - [AnyEvent-ClickHouse](https://metacpan.org/release/AnyEvent-ClickHouse)
+- Ruby
+    - [ClickHouse (Ruby)](https://github.com/shlima/click_house)
+    - [clickhouse-activerecord](https://github.com/PNixx/clickhouse-activerecord)
+- Rust
+    - [clickhouse.rs](https://github.com/loyd/clickhouse.rs)
+    - [clickhouse-rs](https://github.com/suharev7/clickhouse-rs)
+    - [Klickhouse](https://github.com/Protryon/klickhouse)
+- R
+    - [RClickHouse](https://github.com/IMSMWU/RClickHouse)
+- Java
+    - [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java)
+    - [clickhouse-client](https://github.com/Ecwid/clickhouse-client)
+- Scala
+    - [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client)
+- Kotlin
+    - [AORM](https://github.com/TanVD/AORM)
+- C#
+    - [Octonica.ClickHouseClient](https://github.com/Octonica/ClickHouseClient)
+    - [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net)
+    - [ClickHouse.Client](https://github.com/DarkWanderer/ClickHouse.Client)
+    - [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net)
+- Elixir
+    - [clickhousex](https://github.com/appodeal/clickhousex/)
+    - [pillar](https://github.com/sofakingworld/pillar)
+- Nim
+    - [nim-clickhouse](https://github.com/leonardoce/nim-clickhouse)
+- Haskell
+    - [hdbc-clickhouse](https://github.com/zaneli/hdbc-clickhouse)
diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index cba6240788a..900764b8128 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -14,11 +14,11 @@ Web interface for ClickHouse in the [Tabix](https://github.com/tabixio/tabix) pr
 
 Features:
 
--   Works with ClickHouse directly from the browser, without the need to install additional software.
--   Query editor with syntax highlighting.
--   Auto-completion of commands.
--   Tools for graphical analysis of query execution.
--   Colour scheme options.
+- Works with ClickHouse directly from the browser, without the need to install additional software.
+- Query editor with syntax highlighting.
+- Auto-completion of commands.
+- Tools for graphical analysis of query execution.
+- Colour scheme options.
 
 [Tabix documentation](https://tabix.io/doc/).
 
@@ -28,21 +28,21 @@ Features:
 
 Features:
 
--   Query builder with syntax highlighting. View the response in a table or JSON view.
--   Export query results as CSV or JSON.
--   List of processes with descriptions. Write mode. Ability to stop (`KILL`) a process.
--   Database graph. Shows all tables and their columns with additional information.
--   A quick view of the column size.
--   Server configuration.
+- Query builder with syntax highlighting. View the response in a table or JSON view.
+- Export query results as CSV or JSON.
+- List of processes with descriptions. Write mode. Ability to stop (`KILL`) a process.
+- Database graph. Shows all tables and their columns with additional information.
+- A quick view of the column size.
+- Server configuration.
 
 The following features are planned for development:
 
--   Database management.
--   User management.
--   Real-time data analysis.
--   Cluster monitoring.
--   Cluster management.
--   Monitoring replicated and Kafka tables.
+- Database management.
+- User management.
+- Real-time data analysis.
+- Cluster monitoring.
+- Cluster management.
+- Monitoring replicated and Kafka tables.
 
 ### LightHouse {#lighthouse}
 
@@ -50,9 +50,9 @@ The following features are planned for development:
 
 Features:
 
--   Table list with filtering and metadata.
--   Table preview with filtering and sorting.
--   Read-only queries execution.
+- Table list with filtering and metadata.
+- Table preview with filtering and sorting.
+- Read-only queries execution.
 
 ### Redash {#redash}
 
@@ -62,9 +62,9 @@ Supports for multiple data sources including ClickHouse, Redash can join results
 
 Features:
 
--   Powerful editor of queries.
--   Database explorer.
--   Visualization tools, that allow you to represent data in different forms.
+- Powerful editor of queries.
+- Database explorer.
+- Visualization tools, that allow you to represent data in different forms.
 
 ### Grafana {#grafana}
 
@@ -92,10 +92,10 @@ Features:
 
 Features:
 
--   Query development with syntax highlight and autocompletion.
--   Table list with filters and metadata search.
--   Table data preview.
--   Full-text search.
+- Query development with syntax highlight and autocompletion.
+- Table list with filters and metadata search.
+- Table data preview.
+- Full-text search.
 
 By default, DBeaver does not connect using a session (the CLI for example does). If you require session support (for example to set settings for your session), edit the driver connection properties and set `session_id` to a random string (it uses the http connection under the hood). Then you can use any setting from the query window.
 
@@ -105,10 +105,10 @@ By default, DBeaver does not connect using a session (the CLI for example does).
 
 Features:
 
--   Autocompletion.
--   Syntax highlighting for the queries and data output.
--   Pager support for the data output.
--   Custom PostgreSQL-like commands.
+- Autocompletion.
+- Syntax highlighting for the queries and data output.
+- Pager support for the data output.
+- Custom PostgreSQL-like commands.
 
 ### clickhouse-flamegraph {#clickhouse-flamegraph}
 
@@ -132,15 +132,15 @@ Features:
 
 Features:
 
--   Support query history (pagination, clear all, etc.)
--   Support selected sql clauses query
--   Support terminating query
--   Support table management (metadata, delete, preview)
--   Support database management (delete, create)
--   Support custom query
--   Support multiple data sources management(connection test, monitoring)
--   Support monitor (processor, connection, query)
--   Support migrate data
+- Support query history (pagination, clear all, etc.)
+- Support selected sql clauses query
+- Support terminating query
+- Support table management (metadata, delete, preview)
+- Support database management (delete, create)
+- Support custom query
+- Support multiple data sources management(connection test, monitoring)
+- Support monitor (processor, connection, query)
+- Support migrate data
 
 ### Bytebase {#bytebase}
 
@@ -148,13 +148,13 @@ Features:
 
 Features:
 
--   Schema review between developers and DBAs.
--   Database-as-Code, version control the schema in VCS such GitLab and trigger the deployment upon code commit.
--   Streamlined deployment with per-environment policy.
--   Full migration history.
--   Schema drift detection.
--   Backup and restore.
--   RBAC.
+- Schema review between developers and DBAs.
+- Database-as-Code, version control the schema in VCS such GitLab and trigger the deployment upon code commit.
+- Streamlined deployment with per-environment policy.
+- Full migration history.
+- Schema drift detection.
+- Backup and restore.
+- RBAC.
 
 ### Zeppelin-Interpreter-for-ClickHouse {#zeppelin-interpreter-for-clickhouse}
 
@@ -166,9 +166,9 @@ Features:
 
 Features:
 
--   An online SQL editor which can run your SQL code without any installing.
--   You can observe all processes and mutations. For those unfinished processes, you can kill them in ui.
--   The Metrics contains Cluster Analysis,Data Analysis,Query Analysis.
+- An online SQL editor which can run your SQL code without any installing.
+- You can observe all processes and mutations. For those unfinished processes, you can kill them in ui.
+- The Metrics contains Cluster Analysis,Data Analysis,Query Analysis.
 
 ### ClickVisual {#clickvisual}
 
@@ -218,12 +218,12 @@ Features:
 
 Features:
 
--   Very fast code completion.
--   ClickHouse syntax highlighting.
--   Support for features specific to ClickHouse, for example, nested columns, table engines.
--   Data Editor.
--   Refactorings.
--   Search and Navigation.
+- Very fast code completion.
+- ClickHouse syntax highlighting.
+- Support for features specific to ClickHouse, for example, nested columns, table engines.
+- Data Editor.
+- Refactorings.
+- Search and Navigation.
 
 ### Yandex DataLens {#yandex-datalens}
 
@@ -231,15 +231,15 @@ Features:
 
 Features:
 
--   Wide range of available visualizations, from simple bar charts to complex dashboards.
--   Dashboards could be made publicly available.
--   Support for multiple data sources including ClickHouse.
--   Storage for materialized data based on ClickHouse.
+- Wide range of available visualizations, from simple bar charts to complex dashboards.
+- Dashboards could be made publicly available.
+- Support for multiple data sources including ClickHouse.
+- Storage for materialized data based on ClickHouse.
 
 DataLens is [available for free](https://cloud.yandex.com/docs/datalens/pricing) for low-load projects, even for commercial use.
 
--   [DataLens documentation](https://cloud.yandex.com/docs/datalens/).
--   [Tutorial](https://cloud.yandex.com/docs/solutions/datalens/data-from-ch-visualization) on visualizing data from a ClickHouse database.
+- [DataLens documentation](https://cloud.yandex.com/docs/datalens/).
+- [Tutorial](https://cloud.yandex.com/docs/solutions/datalens/data-from-ch-visualization) on visualizing data from a ClickHouse database.
 
 ### Holistics Software {#holistics-software}
 
@@ -247,11 +247,11 @@ DataLens is [available for free](https://cloud.yandex.com/docs/datalens/pricing)
 
 Features:
 
--   Automated email, Slack and Google Sheet schedules of reports.
--   SQL editor with visualizations, version control, auto-completion, reusable query components and dynamic filters.
--   Embedded analytics of reports and dashboards via iframe.
--   Data preparation and ETL capabilities.
--   SQL data modelling support for relational mapping of data.
+- Automated email, Slack and Google Sheet schedules of reports.
+- SQL editor with visualizations, version control, auto-completion, reusable query components and dynamic filters.
+- Embedded analytics of reports and dashboards via iframe.
+- Data preparation and ETL capabilities.
+- SQL data modelling support for relational mapping of data.
 
 ### Looker {#looker}
 
@@ -260,9 +260,9 @@ to integrate data with other applications.
 
 Features:
 
--   Easy and agile development using LookML, a language which supports curated
+- Easy and agile development using LookML, a language which supports curated
     [Data Modeling](https://looker.com/platform/data-modeling) to support report writers and end-users.
--   Powerful workflow integration via Looker’s [Data Actions](https://looker.com/platform/actions).
+- Powerful workflow integration via Looker’s [Data Actions](https://looker.com/platform/actions).
 
 [How to configure ClickHouse in Looker.](https://docs.looker.com/setup-and-management/database-config/clickhouse)
 
@@ -272,12 +272,12 @@ Features:
 
 Features:
 
--   Business users-friendly reports builder.
--   Powerful report parameters for SQL filtering and report-specific query customizations.
--   Can connect to ClickHouse both with a native TCP/IP endpoint and a HTTP(S) interface (2 different drivers).
--   It is possible to use all power of ClickHouse SQL dialect in dimensions/measures definitions.
--   [Web API](https://www.seektable.com/help/web-api-integration) for automated reports generation.
--   Supports reports development flow with account data [backup/restore](https://www.seektable.com/help/self-hosted-backup-restore); data models (cubes) / reports configuration is a human-readable XML and can be stored under version control system.
+- Business users-friendly reports builder.
+- Powerful report parameters for SQL filtering and report-specific query customizations.
+- Can connect to ClickHouse both with a native TCP/IP endpoint and a HTTP(S) interface (2 different drivers).
+- It is possible to use all power of ClickHouse SQL dialect in dimensions/measures definitions.
+- [Web API](https://www.seektable.com/help/web-api-integration) for automated reports generation.
+- Supports reports development flow with account data [backup/restore](https://www.seektable.com/help/self-hosted-backup-restore); data models (cubes) / reports configuration is a human-readable XML and can be stored under version control system.
 
 SeekTable is [free](https://www.seektable.com/help/cloud-pricing) for personal/individual usage.
 
diff --git a/docs/en/interfaces/third-party/index.md b/docs/en/interfaces/third-party/index.md
index ad5ed0650a5..adb673d1ff8 100644
--- a/docs/en/interfaces/third-party/index.md
+++ b/docs/en/interfaces/third-party/index.md
@@ -8,10 +8,10 @@ sidebar_position: 24
 
 This is a collection of links to third-party tools that provide some sort of interface to ClickHouse. It can be either visual interface, command-line interface or an API:
 
--   [Client libraries](../../interfaces/third-party/client-libraries.md)
--   [Integrations](../../interfaces/third-party/integrations.md)
--   [GUI](../../interfaces/third-party/gui.md)
--   [Proxies](../../interfaces/third-party/proxy.md)
+- [Client libraries](../../interfaces/third-party/client-libraries.md)
+- [Integrations](../../interfaces/third-party/integrations.md)
+- [GUI](../../interfaces/third-party/gui.md)
+- [Proxies](../../interfaces/third-party/proxy.md)
 
 :::note
 Generic tools that support common API like [ODBC](../../interfaces/odbc.md) or [JDBC](../../interfaces/jdbc.md) usually can work with ClickHouse as well, but are not listed here because there are way too many of them.
diff --git a/docs/en/interfaces/third-party/integrations.md b/docs/en/interfaces/third-party/integrations.md
index 90a4f088be7..3e1b1e84f5d 100644
--- a/docs/en/interfaces/third-party/integrations.md
+++ b/docs/en/interfaces/third-party/integrations.md
@@ -6,110 +6,110 @@ sidebar_label: Integrations
 
 # Integration Libraries from Third-party Developers
 
-:::warning Disclaimer
+:::note Disclaimer
 ClickHouse, Inc. does **not** maintain the tools and libraries listed below and haven’t done extensive testing to ensure their quality.
 :::
 
 ## Infrastructure Products {#infrastructure-products}
 
--   Relational database management systems
-    -   [MySQL](https://www.mysql.com)
-        -   [mysql2ch](https://github.com/long2ice/mysql2ch)
-        -   [ProxySQL](https://github.com/sysown/proxysql/wiki/ClickHouse-Support)
-        -   [clickhouse-mysql-data-reader](https://github.com/Altinity/clickhouse-mysql-data-reader)
-        -   [horgh-replicator](https://github.com/larsnovikov/horgh-replicator)
-    -   [PostgreSQL](https://www.postgresql.org)
-        -   [clickhousedb_fdw](https://github.com/Percona-Lab/clickhousedb_fdw)
-        -   [infi.clickhouse_fdw](https://github.com/Infinidat/infi.clickhouse_fdw) (uses [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm))
-        -   [pg2ch](https://github.com/mkabilov/pg2ch)
-        -   [clickhouse_fdw](https://github.com/adjust/clickhouse_fdw)
-    -   [MSSQL](https://en.wikipedia.org/wiki/Microsoft_SQL_Server)
-        -   [ClickHouseMigrator](https://github.com/zlzforever/ClickHouseMigrator)
--   Message queues
-    -   [Kafka](https://kafka.apache.org)
-        -   [clickhouse_sinker](https://github.com/housepower/clickhouse_sinker) (uses [Go client](https://github.com/ClickHouse/clickhouse-go/))
-        -   [stream-loader-clickhouse](https://github.com/adform/stream-loader)
--   Batch processing
-    -   [Spark](https://spark.apache.org)
-        -   [spark-clickhouse-connector](https://github.com/housepower/spark-clickhouse-connector)
--   Stream processing
-    -   [Flink](https://flink.apache.org)
-        -   [flink-clickhouse-sink](https://github.com/ivi-ru/flink-clickhouse-sink)
--   Object storages
-    -   [S3](https://en.wikipedia.org/wiki/Amazon_S3)
-        -   [clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup)
--   Container orchestration
-    -   [Kubernetes](https://kubernetes.io)
-        -   [clickhouse-operator](https://github.com/Altinity/clickhouse-operator)
--   Configuration management
-    -   [puppet](https://puppet.com)
-        -   [innogames/clickhouse](https://forge.puppet.com/innogames/clickhouse)
-        -   [mfedotov/clickhouse](https://forge.puppet.com/mfedotov/clickhouse)
--   Monitoring
-    -   [Graphite](https://graphiteapp.org)
-        -   [graphouse](https://github.com/ClickHouse/graphouse)
-        -   [carbon-clickhouse](https://github.com/lomik/carbon-clickhouse)
-        -   [graphite-clickhouse](https://github.com/lomik/graphite-clickhouse)
-        -   [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer) - optimizes staled partitions in [\*GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md#graphitemergetree) if rules from [rollup configuration](../../engines/table-engines/mergetree-family/graphitemergetree.md#rollup-configuration) could be applied
-    -   [Grafana](https://grafana.com/)
-        -   [clickhouse-grafana](https://github.com/Vertamedia/clickhouse-grafana)
-    -   [Prometheus](https://prometheus.io/)
-        -   [clickhouse_exporter](https://github.com/f1yegor/clickhouse_exporter)
-        -   [PromHouse](https://github.com/Percona-Lab/PromHouse)
-        -   [clickhouse_exporter](https://github.com/hot-wifi/clickhouse_exporter) (uses [Go client](https://github.com/kshvakov/clickhouse/))
-    -   [Nagios](https://www.nagios.org/)
-        -   [check_clickhouse](https://github.com/exogroup/check_clickhouse/)
-        -   [check_clickhouse.py](https://github.com/innogames/igmonplugins/blob/master/src/check_clickhouse.py)
-    -   [Zabbix](https://www.zabbix.com)
-        -   [clickhouse-zabbix-template](https://github.com/Altinity/clickhouse-zabbix-template)
-    -   [Sematext](https://sematext.com/)
-        -   [clickhouse integration](https://github.com/sematext/sematext-agent-integrations/tree/master/clickhouse)
--   Logging
-    -   [rsyslog](https://www.rsyslog.com/)
-        -   [omclickhouse](https://www.rsyslog.com/doc/master/configuration/modules/omclickhouse.html)
-    -   [fluentd](https://www.fluentd.org)
-        -   [loghouse](https://github.com/flant/loghouse) (for [Kubernetes](https://kubernetes.io))
-    -   [logagent](https://www.sematext.com/logagent)
-        -   [logagent output-plugin-clickhouse](https://sematext.com/docs/logagent/output-plugin-clickhouse/)
--   Geo
-    -   [MaxMind](https://dev.maxmind.com/geoip/)
-        -   [clickhouse-maxmind-geoip](https://github.com/AlexeyKupershtokh/clickhouse-maxmind-geoip)
--   AutoML
-    -   [MindsDB](https://mindsdb.com/)
-        -   [MindsDB](https://github.com/mindsdb/mindsdb) - Predictive AI layer for ClickHouse database.
+- Relational database management systems
+    - [MySQL](https://www.mysql.com)
+        - [mysql2ch](https://github.com/long2ice/mysql2ch)
+        - [ProxySQL](https://github.com/sysown/proxysql/wiki/ClickHouse-Support)
+        - [clickhouse-mysql-data-reader](https://github.com/Altinity/clickhouse-mysql-data-reader)
+        - [horgh-replicator](https://github.com/larsnovikov/horgh-replicator)
+    - [PostgreSQL](https://www.postgresql.org)
+        - [clickhousedb_fdw](https://github.com/Percona-Lab/clickhousedb_fdw)
+        - [infi.clickhouse_fdw](https://github.com/Infinidat/infi.clickhouse_fdw) (uses [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm))
+        - [pg2ch](https://github.com/mkabilov/pg2ch)
+        - [clickhouse_fdw](https://github.com/adjust/clickhouse_fdw)
+    - [MSSQL](https://en.wikipedia.org/wiki/Microsoft_SQL_Server)
+        - [ClickHouseMigrator](https://github.com/zlzforever/ClickHouseMigrator)
+- Message queues
+    - [Kafka](https://kafka.apache.org)
+        - [clickhouse_sinker](https://github.com/housepower/clickhouse_sinker) (uses [Go client](https://github.com/ClickHouse/clickhouse-go/))
+        - [stream-loader-clickhouse](https://github.com/adform/stream-loader)
+- Batch processing
+    - [Spark](https://spark.apache.org)
+        - [spark-clickhouse-connector](https://github.com/housepower/spark-clickhouse-connector)
+- Stream processing
+    - [Flink](https://flink.apache.org)
+        - [flink-clickhouse-sink](https://github.com/ivi-ru/flink-clickhouse-sink)
+- Object storages
+    - [S3](https://en.wikipedia.org/wiki/Amazon_S3)
+        - [clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup)
+- Container orchestration
+    - [Kubernetes](https://kubernetes.io)
+        - [clickhouse-operator](https://github.com/Altinity/clickhouse-operator)
+- Configuration management
+    - [puppet](https://puppet.com)
+        - [innogames/clickhouse](https://forge.puppet.com/innogames/clickhouse)
+        - [mfedotov/clickhouse](https://forge.puppet.com/mfedotov/clickhouse)
+- Monitoring
+    - [Graphite](https://graphiteapp.org)
+        - [graphouse](https://github.com/ClickHouse/graphouse)
+        - [carbon-clickhouse](https://github.com/lomik/carbon-clickhouse)
+        - [graphite-clickhouse](https://github.com/lomik/graphite-clickhouse)
+        - [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer) - optimizes staled partitions in [\*GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md#graphitemergetree) if rules from [rollup configuration](../../engines/table-engines/mergetree-family/graphitemergetree.md#rollup-configuration) could be applied
+    - [Grafana](https://grafana.com/)
+        - [clickhouse-grafana](https://github.com/Vertamedia/clickhouse-grafana)
+    - [Prometheus](https://prometheus.io/)
+        - [clickhouse_exporter](https://github.com/f1yegor/clickhouse_exporter)
+        - [PromHouse](https://github.com/Percona-Lab/PromHouse)
+        - [clickhouse_exporter](https://github.com/hot-wifi/clickhouse_exporter) (uses [Go client](https://github.com/kshvakov/clickhouse/))
+    - [Nagios](https://www.nagios.org/)
+        - [check_clickhouse](https://github.com/exogroup/check_clickhouse/)
+        - [check_clickhouse.py](https://github.com/innogames/igmonplugins/blob/master/src/check_clickhouse.py)
+    - [Zabbix](https://www.zabbix.com)
+        - [clickhouse-zabbix-template](https://github.com/Altinity/clickhouse-zabbix-template)
+    - [Sematext](https://sematext.com/)
+        - [clickhouse integration](https://github.com/sematext/sematext-agent-integrations/tree/master/clickhouse)
+- Logging
+    - [rsyslog](https://www.rsyslog.com/)
+        - [omclickhouse](https://www.rsyslog.com/doc/master/configuration/modules/omclickhouse.html)
+    - [fluentd](https://www.fluentd.org)
+        - [loghouse](https://github.com/flant/loghouse) (for [Kubernetes](https://kubernetes.io))
+    - [logagent](https://www.sematext.com/logagent)
+        - [logagent output-plugin-clickhouse](https://sematext.com/docs/logagent/output-plugin-clickhouse/)
+- Geo
+    - [MaxMind](https://dev.maxmind.com/geoip/)
+        - [clickhouse-maxmind-geoip](https://github.com/AlexeyKupershtokh/clickhouse-maxmind-geoip)
+- AutoML
+    - [MindsDB](https://mindsdb.com/)
+        - [MindsDB](https://github.com/mindsdb/mindsdb) - Predictive AI layer for ClickHouse database.
 
 ## Programming Language Ecosystems {#programming-language-ecosystems}
 
--   Python
-    -   [SQLAlchemy](https://www.sqlalchemy.org)
-        -   [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) (uses [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm))
-    -   [pandas](https://pandas.pydata.org)
-        -   [pandahouse](https://github.com/kszucs/pandahouse)
--   PHP
-    -   [Doctrine](https://www.doctrine-project.org/)
-        -   [dbal-clickhouse](https://packagist.org/packages/friendsofdoctrine/dbal-clickhouse)
--   R
-    -   [dplyr](https://db.rstudio.com/dplyr/)
-        -   [RClickHouse](https://github.com/IMSMWU/RClickHouse) (uses [clickhouse-cpp](https://github.com/artpaul/clickhouse-cpp))
--   Java
-    -   [Hadoop](http://hadoop.apache.org)
-        -   [clickhouse-hdfs-loader](https://github.com/jaykelin/clickhouse-hdfs-loader) (uses [JDBC](../../sql-reference/table-functions/jdbc.md))
--   Scala
-    -   [Akka](https://akka.io)
-        -   [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client)
--   C#
-    -   [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/ado-net-overview)
-        -   [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net)
-        -   [ClickHouse.Client](https://github.com/DarkWanderer/ClickHouse.Client)
-        -   [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net)
-        -   [ClickHouse.Net.Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations)
-        -   [Linq To DB](https://github.com/linq2db/linq2db)
--   Elixir
-    -   [Ecto](https://github.com/elixir-ecto/ecto)
-        -   [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto)
--   Ruby
-    -   [Ruby on Rails](https://rubyonrails.org/)
-        -   [activecube](https://github.com/bitquery/activecube)
-        -   [ActiveRecord](https://github.com/PNixx/clickhouse-activerecord)
-    -   [GraphQL](https://github.com/graphql)
-        -   [activecube-graphql](https://github.com/bitquery/activecube-graphql)
+- Python
+    - [SQLAlchemy](https://www.sqlalchemy.org)
+        - [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) (uses [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm))
+    - [pandas](https://pandas.pydata.org)
+        - [pandahouse](https://github.com/kszucs/pandahouse)
+- PHP
+    - [Doctrine](https://www.doctrine-project.org/)
+        - [dbal-clickhouse](https://packagist.org/packages/friendsofdoctrine/dbal-clickhouse)
+- R
+    - [dplyr](https://db.rstudio.com/dplyr/)
+        - [RClickHouse](https://github.com/IMSMWU/RClickHouse) (uses [clickhouse-cpp](https://github.com/artpaul/clickhouse-cpp))
+- Java
+    - [Hadoop](http://hadoop.apache.org)
+        - [clickhouse-hdfs-loader](https://github.com/jaykelin/clickhouse-hdfs-loader) (uses [JDBC](../../sql-reference/table-functions/jdbc.md))
+- Scala
+    - [Akka](https://akka.io)
+        - [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client)
+- C#
+    - [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/ado-net-overview)
+        - [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net)
+        - [ClickHouse.Client](https://github.com/DarkWanderer/ClickHouse.Client)
+        - [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net)
+        - [ClickHouse.Net.Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations)
+        - [Linq To DB](https://github.com/linq2db/linq2db)
+- Elixir
+    - [Ecto](https://github.com/elixir-ecto/ecto)
+        - [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto)
+- Ruby
+    - [Ruby on Rails](https://rubyonrails.org/)
+        - [activecube](https://github.com/bitquery/activecube)
+        - [ActiveRecord](https://github.com/PNixx/clickhouse-activerecord)
+    - [GraphQL](https://github.com/graphql)
+        - [activecube-graphql](https://github.com/bitquery/activecube-graphql)
diff --git a/docs/en/interfaces/third-party/proxy.md b/docs/en/interfaces/third-party/proxy.md
index 4fd3f31f08b..43063ea4c1d 100644
--- a/docs/en/interfaces/third-party/proxy.md
+++ b/docs/en/interfaces/third-party/proxy.md
@@ -12,9 +12,9 @@ sidebar_label: Proxies
 
 Features:
 
--   Per-user routing and response caching.
--   Flexible limits.
--   Automatic SSL certificate renewal.
+- Per-user routing and response caching.
+- Flexible limits.
+- Automatic SSL certificate renewal.
 
 Implemented in Go.
 
@@ -24,9 +24,9 @@ Implemented in Go.
 
 Features:
 
--   In-memory and on-disk data buffering.
--   Per-table routing.
--   Load-balancing and health checking.
+- In-memory and on-disk data buffering.
+- Per-table routing.
+- Load-balancing and health checking.
 
 Implemented in Go.
 
@@ -36,8 +36,8 @@ Implemented in Go.
 
 Features:
 
--   Group requests and send by threshold or interval.
--   Multiple remote servers.
--   Basic authentication.
+- Group requests and send by threshold or interval.
+- Multiple remote servers.
+- Basic authentication.
 
 Implemented in Go.
diff --git a/docs/en/operations/_category_.yml b/docs/en/operations/_category_.yml
index 08849e7489d..352809f663b 100644
--- a/docs/en/operations/_category_.yml
+++ b/docs/en/operations/_category_.yml
@@ -2,7 +2,3 @@ position: 70
 label: 'Operations'
 collapsible: true
 collapsed: true
-link:
-  type: generated-index
-  title: Operations
-  slug: /en/operations
diff --git a/docs/en/operations/_troubleshooting.md b/docs/en/operations/_troubleshooting.md
index a5c07ed18bd..dbb0dad7976 100644
--- a/docs/en/operations/_troubleshooting.md
+++ b/docs/en/operations/_troubleshooting.md
@@ -1,17 +1,17 @@
 
 [//]: # (This file is included in FAQ > Troubleshooting)
 
--   [Installation](#troubleshooting-installation-errors)
--   [Connecting to the server](#troubleshooting-accepts-no-connections)
--   [Query processing](#troubleshooting-does-not-process-queries)
--   [Efficiency of query processing](#troubleshooting-too-slow)
+- [Installation](#troubleshooting-installation-errors)
+- [Connecting to the server](#troubleshooting-accepts-no-connections)
+- [Query processing](#troubleshooting-does-not-process-queries)
+- [Efficiency of query processing](#troubleshooting-too-slow)
 
 ## Installation {#troubleshooting-installation-errors}
 
 ### You Cannot Get Deb Packages from ClickHouse Repository with Apt-get {#you-cannot-get-deb-packages-from-clickhouse-repository-with-apt-get}
 
--   Check firewall settings.
--   If you cannot access the repository for any reason, download packages as described in the [install guide](../getting-started/install.md) article and install them manually using the `sudo dpkg -i <packages>` command. You will also need the `tzdata` package.
+- Check firewall settings.
+- If you cannot access the repository for any reason, download packages as described in the [install guide](../getting-started/install.md) article and install them manually using the `sudo dpkg -i <packages>` command. You will also need the `tzdata` package.
 
 ### You Cannot Update Deb Packages from ClickHouse Repository with Apt-get {#you-cannot-update-deb-packages-from-clickhouse-repository-with-apt-get}
 
@@ -73,8 +73,8 @@ After that follow the [install guide](../getting-started/install.md#from-rpm-pac
 
 Possible issues:
 
--   The server is not running.
--   Unexpected or wrong configuration parameters.
+- The server is not running.
+- Unexpected or wrong configuration parameters.
 
 ### Server Is Not Running {#server-is-not-running}
 
@@ -98,8 +98,8 @@ The main log of `clickhouse-server` is in `/var/log/clickhouse-server/clickhouse
 
 If the server started successfully, you should see the strings:
 
--   `<Information> Application: starting up.` — Server started.
--   `<Information> Application: Ready for connections.` — Server is running and ready for connections.
+- `<Information> Application: starting up.` — Server started.
+- `<Information> Application: Ready for connections.` — Server is running and ready for connections.
 
 If `clickhouse-server` start failed with a configuration error, you should see the `<Error>` string with an error description. For example:
 
@@ -149,30 +149,30 @@ This command starts the server as an interactive app with standard parameters of
 
 Check:
 
--   Docker settings.
+- Docker settings.
 
     If you run ClickHouse in Docker in an IPv6 network, make sure that `network=host` is set.
 
--   Endpoint settings.
+- Endpoint settings.
 
     Check [listen_host](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-listen_host) and [tcp_port](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port) settings.
 
     ClickHouse server accepts localhost connections only by default.
 
--   HTTP protocol settings.
+- HTTP protocol settings.
 
     Check protocol settings for the HTTP API.
 
--   Secure connection settings.
+- Secure connection settings.
 
     Check:
 
-    -   The [tcp_port_secure](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) setting.
-    -   Settings for [SSL certificates](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-openssl).
+    - The [tcp_port_secure](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) setting.
+    - Settings for [SSL certificates](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-openssl).
 
     Use proper parameters while connecting. For example, use the `port_secure` parameter with `clickhouse_client`.
 
--   User settings.
+- User settings.
 
     You might be using the wrong user name or password.
 
diff --git a/docs/en/operations/access-rights.md b/docs/en/operations/access-rights.md
deleted file mode 100644
index 4c4a06dbe1e..00000000000
--- a/docs/en/operations/access-rights.md
+++ /dev/null
@@ -1,152 +0,0 @@
----
-slug: /en/operations/access-rights
-sidebar_position: 48
-sidebar_label: Access Control and Account Management
-title: Access Control and Account Management
----
-
-ClickHouse supports access control management based on [RBAC](https://en.wikipedia.org/wiki/Role-based_access_control) approach.
-
-ClickHouse access entities:
-- [User account](#user-account-management)
-- [Role](#role-management)
-- [Row Policy](#row-policy-management)
-- [Settings Profile](#settings-profiles-management)
-- [Quota](#quotas-management)
-
-You can configure access entities using:
-
--   SQL-driven workflow.
-
-    You need to [enable](#enabling-access-control) this functionality.
-
--   Server [configuration files](../operations/configuration-files.md) `users.xml` and `config.xml`.
-
-We recommend using SQL-driven workflow. Both of the configuration methods work simultaneously, so if you use the server configuration files for managing accounts and access rights, you can smoothly switch to SQL-driven workflow.
-
-:::warning
-You can’t manage the same access entity by both configuration methods simultaneously.
-:::
-
-To see all users, roles, profiles, etc. and all their grants use [SHOW ACCESS](../sql-reference/statements/show.md#show-access-statement) statement.
-
-## Usage {#access-control-usage}
-
-By default, the ClickHouse server provides the `default` user account which is not allowed using SQL-driven access control and account management but has all the rights and permissions. The `default` user account is used in any cases when the username is not defined, for example, at login from client or in distributed queries. In distributed query processing a default user account is used, if the configuration of the server or cluster does not specify the [user and password](../engines/table-engines/special/distributed.md) properties.
-
-If you just started using ClickHouse, consider the following scenario:
-
-1.  [Enable](#enabling-access-control) SQL-driven access control and account management for the `default` user.
-2.  Log in to the `default` user account and create all the required users. Don’t forget to create an administrator account (`GRANT ALL ON *.* TO admin_user_account WITH GRANT OPTION`).
-3.  [Restrict permissions](../operations/settings/permissions-for-queries.md#permissions_for_queries) for the `default` user and disable SQL-driven access control and account management for it.
-
-### Properties of Current Solution {#access-control-properties}
-
--   You can grant permissions for databases and tables even if they do not exist.
--   If a table was deleted, all the privileges that correspond to this table are not revoked. This means that even if you create a new table with the same name later, all the privileges remain valid. To revoke privileges corresponding to the deleted table, you need to execute, for example, the `REVOKE ALL PRIVILEGES ON db.table FROM ALL` query.
--   There are no lifetime settings for privileges.
-
-## User Account {#user-account-management}
-
-A user account is an access entity that allows to authorize someone in ClickHouse. A user account contains:
-
--   Identification information.
--   [Privileges](../sql-reference/statements/grant.md#grant-privileges) that define a scope of queries the user can execute.
--   Hosts allowed to connect to the ClickHouse server.
--   Assigned and default roles.
--   Settings with their constraints applied by default at user login.
--   Assigned settings profiles.
-
-Privileges can be granted to a user account by the [GRANT](../sql-reference/statements/grant.md) query or by assigning [roles](#role-management). To revoke privileges from a user, ClickHouse provides the [REVOKE](../sql-reference/statements/revoke.md) query. To list privileges for a user, use the [SHOW GRANTS](../sql-reference/statements/show.md#show-grants-statement) statement.
-
-Management queries:
-
--   [CREATE USER](../sql-reference/statements/create/user.md)
--   [ALTER USER](../sql-reference/statements/alter/user.md#alter-user-statement)
--   [DROP USER](../sql-reference/statements/drop.md)
--   [SHOW CREATE USER](../sql-reference/statements/show.md#show-create-user-statement)
--   [SHOW USERS](../sql-reference/statements/show.md#show-users-statement)
-
-### Settings Applying {#access-control-settings-applying}
-
-Settings can be configured differently: for a user account, in its granted roles and in settings profiles. At user login, if a setting is configured for different access entities, the value and constraints of this setting are applied as follows (from higher to lower priority):
-
-1.  User account settings.
-2.  The settings of default roles of the user account. If a setting is configured in some roles, then order of the setting application is undefined.
-3.  The settings from settings profiles assigned to a user or to its default roles. If a setting is configured in some profiles, then order of setting application is undefined.
-4.  Settings applied to all the server by default or from the [default profile](../operations/server-configuration-parameters/settings.md#default-profile).
-
-## Role {#role-management}
-
-Role is a container for access entities that can be granted to a user account.
-
-Role contains:
-
--   [Privileges](../sql-reference/statements/grant.md#grant-privileges)
--   Settings and constraints
--   List of assigned roles
-
-Management queries:
-
--   [CREATE ROLE](../sql-reference/statements/create/role.md)
--   [ALTER ROLE](../sql-reference/statements/alter/role.md#alter-role-statement)
--   [DROP ROLE](../sql-reference/statements/drop.md)
--   [SET ROLE](../sql-reference/statements/set-role.md)
--   [SET DEFAULT ROLE](../sql-reference/statements/set-role.md#set-default-role-statement)
--   [SHOW CREATE ROLE](../sql-reference/statements/show.md#show-create-role-statement)
--   [SHOW ROLES](../sql-reference/statements/show.md#show-roles-statement)
-
-Privileges can be granted to a role by the [GRANT](../sql-reference/statements/grant.md) query. To revoke privileges from a role ClickHouse provides the [REVOKE](../sql-reference/statements/revoke.md) query.
-
-## Row Policy {#row-policy-management}
-
-Row policy is a filter that defines which of the rows are available to a user or a role. Row policy contains filters for one particular table, as well as a list of roles and/or users which should use this row policy.
-
-:::warning
-Row policies makes sense only for users with readonly access. If user can modify table or copy partitions between tables, it defeats the restrictions of row policies.
-:::
-
-Management queries:
-
--   [CREATE ROW POLICY](../sql-reference/statements/create/row-policy.md)
--   [ALTER ROW POLICY](../sql-reference/statements/alter/row-policy.md#alter-row-policy-statement)
--   [DROP ROW POLICY](../sql-reference/statements/drop.md#drop-row-policy-statement)
--   [SHOW CREATE ROW POLICY](../sql-reference/statements/show.md#show-create-row-policy-statement)
--   [SHOW POLICIES](../sql-reference/statements/show.md#show-policies-statement)
-
-## Settings Profile {#settings-profiles-management}
-
-Settings profile is a collection of [settings](../operations/settings/index.md). Settings profile contains settings and constraints, as well as a list of roles and/or users to which this profile is applied.
-
-Management queries:
-
--   [CREATE SETTINGS PROFILE](../sql-reference/statements/create/settings-profile.md#create-settings-profile-statement)
--   [ALTER SETTINGS PROFILE](../sql-reference/statements/alter/settings-profile.md#alter-settings-profile-statement)
--   [DROP SETTINGS PROFILE](../sql-reference/statements/drop.md#drop-settings-profile-statement)
--   [SHOW CREATE SETTINGS PROFILE](../sql-reference/statements/show.md#show-create-settings-profile-statement)
--   [SHOW PROFILES](../sql-reference/statements/show.md#show-profiles-statement)
-
-## Quota {#quotas-management}
-
-Quota limits resource usage. See [Quotas](../operations/quotas.md).
-
-Quota contains a set of limits for some durations, as well as a list of roles and/or users which should use this quota.
-
-Management queries:
-
--   [CREATE QUOTA](../sql-reference/statements/create/quota.md)
--   [ALTER QUOTA](../sql-reference/statements/alter/quota.md#alter-quota-statement)
--   [DROP QUOTA](../sql-reference/statements/drop.md#drop-quota-statement)
--   [SHOW CREATE QUOTA](../sql-reference/statements/show.md#show-create-quota-statement)
--   [SHOW QUOTA](../sql-reference/statements/show.md#show-quota-statement)
--   [SHOW QUOTAS](../sql-reference/statements/show.md#show-quotas-statement)
-
-## Enabling SQL-driven Access Control and Account Management {#enabling-access-control}
-
--   Setup a directory for configurations storage.
-
-    ClickHouse stores access entity configurations in the folder set in the [access_control_path](../operations/server-configuration-parameters/settings.md#access_control_path) server configuration parameter.
-
--   Enable SQL-driven access control and account management for at least one user account.
-
-    By default, SQL-driven access control and account management is disabled for all users. You need to configure at least one user in the `users.xml` configuration file and set the value of the [access_management](../operations/settings/settings-users.md#access_management-user-setting) setting to 1.
diff --git a/docs/en/operations/backup.md b/docs/en/operations/backup.md
index f1a5649cd4c..6da61833c12 100644
--- a/docs/en/operations/backup.md
+++ b/docs/en/operations/backup.md
@@ -1,5 +1,6 @@
 ---
 slug: /en/operations/backup
+description: In order to effectively mitigate possible human errors, you should carefully prepare a strategy for backing up and restoring your data.
 ---
 
 # Backup and Restore
@@ -29,7 +30,7 @@ slug: /en/operations/backup
 ```
 
 :::note ALL
-`ALL` is only applicable to the `RESTORE` command.
+`ALL` is only applicable to the `RESTORE` command prior to version 23.4 of Clickhouse.
 :::
 
 ## Background
@@ -213,7 +214,7 @@ To write backups to an S3 bucket you need three pieces of information:
   for example `Abc+123`
 
 :::note
-Creating an S3 bucket is covered in [Use S3 Object Storage as a ClickHouse disk](/docs/en/integrations/data-ingestion/s3/configuring-s3-for-clickhouse-use.md), just come back to this doc after saving the policy, there is no need to configure ClickHouse to use the S3 bucket.
+Creating an S3 bucket is covered in [Use S3 Object Storage as a ClickHouse disk](/docs/en/integrations/data-ingestion/s3/index.md#configuring-s3-for-clickhouse-use), just come back to this doc after saving the policy, there is no need to configure ClickHouse to use the S3 bucket.
 :::
 
 The destination for a backup will be specified like this:
@@ -330,7 +331,7 @@ It is also possible to `BACKUP`/`RESTORE` to S3 by configuring an S3 disk in the
             <s3>
                 <volumes>
                     <main>
-                        <disk>s3</disk>
+                        <disk>s3_plain</disk>
                     </main>
                 </volumes>
             </s3>
@@ -382,3 +383,19 @@ Data can be restored from backup using the `ALTER TABLE ... ATTACH PARTITION ...
 For more information about queries related to partition manipulations, see the [ALTER documentation](../sql-reference/statements/alter/partition.md#alter_manipulations-with-partitions).
 
 A third-party tool is available to automate this approach: [clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup).
+
+## Settings to disallow concurrent backup/restore
+
+To disallow concurrent backup/restore, you can use these settings respectively.
+
+```xml
+<clickhouse>
+    <backups>
+        <allow_concurrent_backups>false</allow_concurrent_backups>
+        <allow_concurrent_restores>false</allow_concurrent_restores>
+    </backups>
+</clickhouse>
+```
+
+The default value for both is true, so by default concurrent backup/restores are allowed.
+When these settings are false on a cluster, only 1 backup/restore is allowed to run on a cluster at a time.
\ No newline at end of file
diff --git a/docs/en/operations/caches.md b/docs/en/operations/caches.md
index 0f9156048c4..5bc16b6f51d 100644
--- a/docs/en/operations/caches.md
+++ b/docs/en/operations/caches.md
@@ -3,6 +3,7 @@ slug: /en/operations/caches
 sidebar_position: 65
 sidebar_label: Caches
 title: "Cache Types"
+description: When performing queries, ClickHouse uses different caches.
 ---
 
 When performing queries, ClickHouse uses different caches.
@@ -22,6 +23,6 @@ Additional cache types:
 - [Dictionaries](../sql-reference/dictionaries/index.md) data cache.
 - Schema inference cache.
 - [Filesystem cache](storing-data.md) over S3, Azure, Local and other disks.
-- [(Experimental) Query cache](query-cache.md).
+- [Query cache](query-cache.md).
 
 To drop one of the caches, use [SYSTEM DROP ... CACHE](../sql-reference/statements/system.md#drop-mark-cache) statements.
diff --git a/docs/en/operations/clickhouse-keeper.md b/docs/en/operations/clickhouse-keeper.md
deleted file mode 100644
index 10bad586a54..00000000000
--- a/docs/en/operations/clickhouse-keeper.md
+++ /dev/null
@@ -1,378 +0,0 @@
----
-slug: /en/operations/clickhouse-keeper
-sidebar_position: 66
-sidebar_label: ClickHouse Keeper
----
-
-# ClickHouse Keeper
-import SelfManaged from '@site/docs/en/_snippets/_self_managed_only_automated.md';
-
-<SelfManaged />
-
-ClickHouse Keeper provides the coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is compatible with ZooKeeper.
-
-## Implementation details {#implementation-details}
-
-ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, and has quite a simple and powerful data model. ZooKeeper's coordination algorithm, ZooKeeper Atomic Broadcast (ZAB), doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper ClickHouse Keeper is written in C++ and uses the [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows linearizability for reads and writes, and has several open-source implementations in different languages.
-
-By default, ClickHouse Keeper provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with ClickHouse Keeper. Snapshots and logs have an incompatible format with ZooKeeper, but the `clickhouse-keeper-converter` tool enables the conversion of ZooKeeper data to ClickHouse Keeper snapshots. The interserver protocol in ClickHouse Keeper is also incompatible with ZooKeeper so a mixed ZooKeeper / ClickHouse Keeper cluster is impossible.
-
-ClickHouse Keeper supports Access Control Lists (ACLs) the same way as [ZooKeeper](https://zookeeper.apache.org/doc/r3.1.2/zookeeperProgrammers.html#sc_ZooKeeperAccessControl) does. ClickHouse Keeper supports the same set of permissions and has the identical built-in schemes: `world`, `auth` and `digest`. The digest authentication scheme uses the pair `username:password`, the password is encoded in Base64.
-
-:::note
-External integrations are not supported.
-:::
-
-## Configuration {#configuration}
-
-ClickHouse Keeper can be used as a standalone replacement for ZooKeeper or as an internal part of the ClickHouse server. In both cases the configuration is almost the same `.xml` file. The main ClickHouse Keeper configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
-
--    `tcp_port` — Port for a client to connect (default for ZooKeeper is `2181`).
--    `tcp_port_secure` — Secure port for an SSL connection between client and keeper-server.
--    `server_id` — Unique server id, each participant of the ClickHouse Keeper cluster must have a unique number (1, 2, 3, and so on).
--    `log_storage_path` — Path to coordination logs, just like ZooKeeper it is best to store logs on non-busy nodes.
--    `snapshot_storage_path` — Path to coordination snapshots.
-
-Other common parameters are inherited from the ClickHouse server config (`listen_host`, `logger`, and so on).
-
-Internal coordination settings are located in the `<keeper_server>.<coordination_settings>` section:
-
--    `operation_timeout_ms` — Timeout for a single client operation (ms) (default: 10000).
--    `min_session_timeout_ms` — Min timeout for client session (ms) (default: 10000).
--    `session_timeout_ms` — Max timeout for client session (ms) (default: 100000).
--    `dead_session_check_period_ms` — How often ClickHouse Keeper checks for dead sessions and removes them (ms) (default: 500).
--    `heart_beat_interval_ms` — How often a ClickHouse Keeper leader will send heartbeats to followers (ms) (default: 500).
--    `election_timeout_lower_bound_ms` — If the follower does not receive a heartbeat from the leader in this interval, then it can initiate leader election (default: 1000). Must be less than or equal to `election_timeout_upper_bound_ms`. Ideally they shouldn't be equal.
--    `election_timeout_upper_bound_ms` — If the follower does not receive a heartbeat from the leader in this interval, then it must initiate leader election (default: 2000).
--    `rotate_log_storage_interval` — How many log records to store in a single file (default: 100000).
--    `reserved_log_items` — How many coordination log records to store before compaction (default: 100000).
--    `snapshot_distance` — How often ClickHouse Keeper will create new snapshots (in the number of records in logs) (default: 100000).
--    `snapshots_to_keep` — How many snapshots to keep (default: 3).
--    `stale_log_gap` — Threshold when leader considers follower as stale and sends the snapshot to it instead of logs (default: 10000).
--    `fresh_log_gap` — When node became fresh (default: 200).
--    `max_requests_batch_size` - Max size of batch in requests count before it will be sent to RAFT (default: 100).
--    `force_sync` — Call `fsync` on each write to coordination log (default: true).
--    `quorum_reads` — Execute read requests as writes through whole RAFT consensus with similar speed (default: false).
--    `raft_logs_level` — Text logging level about coordination (trace, debug, and so on) (default: system default).
--    `auto_forwarding` — Allow to forward write requests from followers to the leader (default: true).
--    `shutdown_timeout` — Wait to finish internal connections and shutdown (ms) (default: 5000).
--    `startup_timeout` — If the server doesn't connect to other quorum participants in the specified timeout it will terminate (ms) (default: 30000).
--    `four_letter_word_white_list` — White list of 4lw commands (default: `conf,cons,crst,envi,ruok,srst,srvr,stat,wchs,dirs,mntr,isro,rcvr,apiv,csnp,lgif,rqld`).
-
-Quorum configuration is located in the `<keeper_server>.<raft_configuration>` section and contain servers description.
-
-The only parameter for the whole quorum is `secure`, which enables encrypted connection for communication between quorum participants. The parameter can be set `true` if SSL connection is required for internal communication between nodes, or left unspecified otherwise.
-
-The main parameters for each `<server>` are:
-
--    `id` — Server identifier in a quorum.
--    `hostname` — Hostname where this server is placed.
--    `port` — Port where this server listens for connections.
-
-:::note
-In the case of a change in the topology of your ClickHouse Keeper cluster (e.g., replacing a server), please make sure to keep the mapping of `server_id` to `hostname` consistent and avoid shuffling or reusing an existing `server_id` for different servers (e.g., it can happen if your rely on automation scripts to deploy ClickHouse Keeper)
-:::
-
-Examples of configuration for quorum with three nodes can be found in [integration tests](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) with `test_keeper_` prefix. Example configuration for server #1:
-
-```xml
-<keeper_server>
-    <tcp_port>2181</tcp_port>
-    <server_id>1</server_id>
-    <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
-    <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
-
-    <coordination_settings>
-        <operation_timeout_ms>10000</operation_timeout_ms>
-        <session_timeout_ms>30000</session_timeout_ms>
-        <raft_logs_level>trace</raft_logs_level>
-    </coordination_settings>
-
-    <raft_configuration>
-        <server>
-            <id>1</id>
-            <hostname>zoo1</hostname>
-            <port>9444</port>
-        </server>
-        <server>
-            <id>2</id>
-            <hostname>zoo2</hostname>
-            <port>9444</port>
-        </server>
-        <server>
-            <id>3</id>
-            <hostname>zoo3</hostname>
-            <port>9444</port>
-        </server>
-    </raft_configuration>
-</keeper_server>
-```
-
-## How to run {#how-to-run}
-
-ClickHouse Keeper is bundled into the ClickHouse server package, just add configuration of `<keeper_server>` and start ClickHouse server as always. If you want to run standalone ClickHouse Keeper you can start it in a similar way with:
-
-```bash
-clickhouse-keeper --config /etc/your_path_to_config/config.xml
-```
-
-If you don't have the symlink (`clickhouse-keeper`) you can create it or specify `keeper` as an argument to `clickhouse`:
-
-```bash
-clickhouse keeper --config /etc/your_path_to_config/config.xml
-```
-
-## Four Letter Word Commands {#four-letter-word-commands}
-
-ClickHouse Keeper also provides 4lw commands which are almost the same with Zookeeper. Each command is composed of four letters such as `mntr`, `stat` etc. There are some more interesting commands: `stat` gives some general information about the server and connected clients, while `srvr` and `cons` give extended details on server and connections respectively.
-
-The 4lw commands has a white list configuration `four_letter_word_white_list` which has default value `conf,cons,crst,envi,ruok,srst,srvr,stat,wchs,dirs,mntr,isro,rcvr,apiv,csnp,lgif,rqld`.
-
-You can issue the commands to ClickHouse Keeper via telnet or nc, at the client port.
-
-```
-echo mntr | nc localhost 9181
-```
-
-Bellow is the detailed 4lw commands:
-
-- `ruok`: Tests if server is running in a non-error state. The server will respond with `imok` if it is running. Otherwise it will not respond at all. A response of `imok` does not necessarily indicate that the server has joined the quorum, just that the server process is active and bound to the specified client port. Use "stat" for details on state wrt quorum and client connection information.
-
-```
-imok
-```
-
-- `mntr`: Outputs a list of variables that could be used for monitoring the health of the cluster.
-
-```
-zk_version      v21.11.1.1-prestable-7a4a0b0edef0ad6e0aa662cd3b90c3f4acf796e7
-zk_avg_latency  0
-zk_max_latency  0
-zk_min_latency  0
-zk_packets_received     68
-zk_packets_sent 68
-zk_num_alive_connections        1
-zk_outstanding_requests 0
-zk_server_state leader
-zk_znode_count  4
-zk_watch_count  1
-zk_ephemerals_count     0
-zk_approximate_data_size        723
-zk_open_file_descriptor_count   310
-zk_max_file_descriptor_count    10240
-zk_followers    0
-zk_synced_followers     0
-```
-
-- `srvr`: Lists full details for the server.
-
-```
-ClickHouse Keeper version: v21.11.1.1-prestable-7a4a0b0edef0ad6e0aa662cd3b90c3f4acf796e7
-Latency min/avg/max: 0/0/0
-Received: 2
-Sent : 2
-Connections: 1
-Outstanding: 0
-Zxid: 34
-Mode: leader
-Node count: 4
-```
-
-- `stat`: Lists brief details for the server and connected clients.
-
-```
-ClickHouse Keeper version: v21.11.1.1-prestable-7a4a0b0edef0ad6e0aa662cd3b90c3f4acf796e7
-Clients:
- 192.168.1.1:52852(recved=0,sent=0)
- 192.168.1.1:52042(recved=24,sent=48)
-Latency min/avg/max: 0/0/0
-Received: 4
-Sent : 4
-Connections: 1
-Outstanding: 0
-Zxid: 36
-Mode: leader
-Node count: 4
-```
-
-- `srst`: Reset server statistics. The command will affect the result of `srvr`, `mntr` and `stat`.
-
-```
-Server stats reset.
-```
-
-- `conf`: Print details about serving configuration.
-
-```
-server_id=1
-tcp_port=2181
-four_letter_word_white_list=*
-log_storage_path=./coordination/logs
-snapshot_storage_path=./coordination/snapshots
-max_requests_batch_size=100
-session_timeout_ms=30000
-operation_timeout_ms=10000
-dead_session_check_period_ms=500
-heart_beat_interval_ms=500
-election_timeout_lower_bound_ms=1000
-election_timeout_upper_bound_ms=2000
-reserved_log_items=1000000000000000
-snapshot_distance=10000
-auto_forwarding=true
-shutdown_timeout=5000
-startup_timeout=240000
-raft_logs_level=information
-snapshots_to_keep=3
-rotate_log_storage_interval=100000
-stale_log_gap=10000
-fresh_log_gap=200
-max_requests_batch_size=100
-quorum_reads=false
-force_sync=false
-compress_logs=true
-compress_snapshots_with_zstd_format=true
-configuration_change_tries_count=20
-```
-
-- `cons`: List full connection/session details for all clients connected to this server. Includes information on numbers of packets received/sent, session id, operation latencies, last operation performed, etc...
-
-```
- 192.168.1.1:52163(recved=0,sent=0,sid=0xffffffffffffffff,lop=NA,est=1636454787393,to=30000,lzxid=0xffffffffffffffff,lresp=0,llat=0,minlat=0,avglat=0,maxlat=0)
- 192.168.1.1:52042(recved=9,sent=18,sid=0x0000000000000001,lop=List,est=1636454739887,to=30000,lcxid=0x0000000000000005,lzxid=0x0000000000000005,lresp=1636454739892,llat=0,minlat=0,avglat=0,maxlat=0)
-```
-
-- `crst`: Reset connection/session statistics for all connections.
-
-```
-Connection stats reset.
-```
-
-- `envi`: Print details about serving environment
-
-```
-Environment:
-clickhouse.keeper.version=v21.11.1.1-prestable-7a4a0b0edef0ad6e0aa662cd3b90c3f4acf796e7
-host.name=ZBMAC-C02D4054M.local
-os.name=Darwin
-os.arch=x86_64
-os.version=19.6.0
-cpu.count=12
-user.name=root
-user.home=/Users/JackyWoo/
-user.dir=/Users/JackyWoo/project/jd/clickhouse/cmake-build-debug/programs/
-user.tmp=/var/folders/b4/smbq5mfj7578f2jzwn602tt40000gn/T/
-```
-
-
-- `dirs`: Shows the total size of snapshot and log files in bytes
-
-```
-snapshot_dir_size: 0
-log_dir_size: 3875
-```
-
-- `isro`: Tests if server is running in read-only mode. The server will respond with "ro" if in read-only mode or "rw" if not in read-only mode.
-
-```
-rw
-```
-
-- `wchs`: Lists brief information on watches for the server.
-
-```
-1 connections watching 1 paths
-Total watches:1
-```
-
-- `wchc`: Lists detailed information on watches for the server, by session. This outputs a list of sessions (connections) with associated watches (paths). Note, depending on the number of watches this operation may be expensive (ie impact server performance), use it carefully.
-
-```
-0x0000000000000001
-    /clickhouse/task_queue/ddl
-```
-
-- `wchp`: Lists detailed information on watches for the server, by path. This outputs a list of paths (znodes) with associated sessions. Note, depending on the number of watches this operation may be expensive (i. e. impact server performance), use it carefully.
-
-```
-/clickhouse/task_queue/ddl
-    0x0000000000000001
-```
-
-- `dump`: Lists the outstanding sessions and ephemeral nodes. This only works on the leader.
-
-```
-Sessions dump (2):
-0x0000000000000001
-0x0000000000000002
-Sessions with Ephemerals (1):
-0x0000000000000001
- /clickhouse/task_queue/ddl
-```
-
-- `csnp`: Schedule a snapshot creation task. Return the last committed log index of the scheduled snapshot if success or `Failed to schedule snapshot creation task.` if failed. Note that `lgif` command can help you determine whether the snapshot is done.
-
-```
-100
-```
-
-- `lgif`: Keeper log information. `first_log_idx` : my first log index in log store; `first_log_term` : my first log term; `last_log_idx` : my last log index in log store; `last_log_term` : my last log term; `last_committed_log_idx` : my last committed log index in state machine; `leader_committed_log_idx` : leader's committed log index from my perspective; `target_committed_log_idx` : target log index should be committed to; `last_snapshot_idx` : the largest committed log index in last snapshot.
-
-```
-first_log_idx   1
-first_log_term  1
-last_log_idx    101
-last_log_term   1
-last_committed_log_idx  100
-leader_committed_log_idx    101
-target_committed_log_idx    101
-last_snapshot_idx   50
-```
-
-- `rqld`: Request to become new leader. Return `Sent leadership request to leader.` if request sent or `Failed to send leadership request to leader.` if request not sent. Note that if node is already leader the outcome is same as the request is sent. 
-
-```
-Sent leadership request to leader.
-```
-
-## Migration from ZooKeeper {#migration-from-zookeeper}
-
-Seamlessly migration from ZooKeeper to ClickHouse Keeper is impossible you have to stop your ZooKeeper cluster, convert data and start ClickHouse Keeper. `clickhouse-keeper-converter` tool allows converting ZooKeeper logs and snapshots to ClickHouse Keeper snapshot. It works only with ZooKeeper > 3.4. Steps for migration:
-
-1. Stop all ZooKeeper nodes.
-
-2. Optional, but recommended: find ZooKeeper leader node, start and stop it again. It will force ZooKeeper to create a consistent snapshot.
-
-3. Run `clickhouse-keeper-converter` on a leader, for example:
-
-```bash
-clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
-```
-
-4. Copy snapshot to ClickHouse server nodes with a configured `keeper` or start ClickHouse Keeper instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become a leader.
-
-
-
-## Recovering after losing quorum
-
-Because ClickHouse Keeper uses Raft it can tolerate certain amount of node crashes depending on the cluster size. \
-E.g. for a 3-node cluster, it will continue working correctly if only 1 node crashes.
-
-Cluster configuration can be dynamically configured but there are some limitations. Reconfiguration relies on Raft also
-so to add/remove a node from the cluster you need to have a quorum. If you lose too many nodes in your cluster at the same time without any chance
-of starting them again, Raft will stop working and not allow you to reconfigure your cluster using the conventional way.
-
-Nevertheless, ClickHouse Keeper has a recovery mode which allows you to forcefully reconfigure your cluster with only 1 node.
-This should be done only as your last resort if you cannot start your nodes again, or start a new instance on the same endpoint.
-
-Important things to note before continuing:
-- Make sure that the failed nodes cannot connect to the cluster again.
-- Do not start any of the new nodes until it's specified in the steps.
-
-After making sure that the above things are true, you need to do following:
-1. Pick a single Keeper node to be your new leader. Be aware that the data of that node will be used for the entire cluster so we recommend to use a node with the most up to date state.
-2. Before doing anything else, make a backup of the `log_storage_path` and `snapshot_storage_path` folders of the picked node.
-3. Reconfigure the cluster on all of the nodes you want to use.
-4. Send the four letter command `rcvr` to the node you picked which will move the node to the recovery mode OR stop Keeper instance on the picked node and start it again with the `--force-recovery` argument.
-5. One by one, start Keeper instances on the new nodes making sure that `mntr` returns `follower` for the `zk_server_state` before starting the next one.
-6. While in the recovery mode, the leader node will return error message for `mntr` command until it achieves quorum with the new nodes and refuse any requests from the client and the followers.
-7. After quorum is achieved, the leader node will return to the normal mode of operation, accepting all the requests using Raft - verify with `mntr` which should return `leader` for the `zk_server_state`.
diff --git a/docs/en/operations/configuration-files.md b/docs/en/operations/configuration-files.md
index 2e241ec1980..b3583e156ad 100644
--- a/docs/en/operations/configuration-files.md
+++ b/docs/en/operations/configuration-files.md
@@ -14,10 +14,10 @@ All XML files should have the same root element, usually `<clickhouse>`. As for
 
 Some settings specified in the main configuration file can be overridden in other configuration files:
 
--   The `replace` or `remove` attributes can be specified for the elements of these configuration files.
--   If neither is specified, it combines the contents of elements recursively, replacing values of duplicate children.
--   If `replace` is specified, it replaces the entire element with the specified one.
--   If `remove` is specified, it deletes the element.
+- The `replace` or `remove` attributes can be specified for the elements of these configuration files.
+- If neither is specified, it combines the contents of elements recursively, replacing values of duplicate children.
+- If `replace` is specified, it replaces the entire element with the specified one.
+- If `remove` is specified, it deletes the element.
 
 You can also declare attributes as coming from environment variables by using `from_env="VARIABLE_NAME"`:
 
diff --git a/docs/en/operations/external-authenticators/kerberos.md b/docs/en/operations/external-authenticators/kerberos.md
index 95944e96194..27dc23c9792 100644
--- a/docs/en/operations/external-authenticators/kerberos.md
+++ b/docs/en/operations/external-authenticators/kerberos.md
@@ -59,11 +59,11 @@ With filtering by realm:
 </clickhouse>
 ```
 
-:::warning
+:::note
 You can define only one `kerberos` section. The presence of multiple `kerberos` sections will force ClickHouse to disable Kerberos authentication.
 :::
 
-:::warning
+:::note
 `principal` and `realm` sections cannot be specified at the same time. The presence of both `principal` and `realm` sections will force ClickHouse to disable Kerberos authentication.
 :::
 
@@ -103,7 +103,7 @@ Example (goes into `users.xml`):
 </clickhouse>
 ```
 
-:::warning
+:::note
 Note that Kerberos authentication cannot be used alongside with any other authentication mechanism. The presence of any other sections like `password` alongside `kerberos` will force ClickHouse to shutdown.
 :::
 
@@ -113,7 +113,7 @@ Note, that now, once user `my_user` uses `kerberos`, Kerberos must be enabled in
 
 ### Enabling Kerberos using SQL {#enabling-kerberos-using-sql}
 
-When [SQL-driven Access Control and Account Management](../access-rights.md#access-control) is enabled in ClickHouse, users identified by Kerberos can also be created using SQL statements.
+When [SQL-driven Access Control and Account Management](/docs/en/guides/sre/user-management/index.md#access-control) is enabled in ClickHouse, users identified by Kerberos can also be created using SQL statements.
 
 ```sql
 CREATE USER my_user IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'
diff --git a/docs/en/operations/external-authenticators/ldap.md b/docs/en/operations/external-authenticators/ldap.md
index eba560f6ea5..ee2336e9378 100644
--- a/docs/en/operations/external-authenticators/ldap.md
+++ b/docs/en/operations/external-authenticators/ldap.md
@@ -112,7 +112,7 @@ At each login attempt, ClickHouse tries to "bind" to the specified DN defined by
 
 Note, that user `my_user` refers to `my_ldap_server`. This LDAP server must be configured in the main `config.xml` file as described previously.
 
-When SQL-driven [Access Control and Account Management](../access-rights.md#access-control) is enabled, users that are authenticated by LDAP servers can also be created using the [CREATE USER](../../sql-reference/statements/create/user.md#create-user-statement) statement.
+When SQL-driven [Access Control and Account Management](/docs/en/guides/sre/user-management/index.md#access-control) is enabled, users that are authenticated by LDAP servers can also be created using the [CREATE USER](/docs/en/sql-reference/statements/create/user.md#create-user-statement) statement.
 
 Query:
 
@@ -120,11 +120,11 @@ Query:
 CREATE USER my_user IDENTIFIED WITH ldap SERVER 'my_ldap_server';
 ```
 
-## LDAP Exernal User Directory {#ldap-external-user-directory}
+## LDAP External User Directory {#ldap-external-user-directory}
 
 In addition to the locally defined users, a remote LDAP server can be used as a source of user definitions. To achieve this, specify previously defined LDAP server name (see [LDAP Server Definition](#ldap-server-definition)) in the `ldap` section inside the `users_directories` section of the `config.xml` file.
 
-At each login attempt, ClickHouse tries to find the user definition locally and authenticate it as usual. If the user is not defined, ClickHouse will assume the definition exists in the external LDAP directory and will try to "bind" to the specified DN at the LDAP server using the provided credentials. If successful, the user will be considered existing and authenticated. The user will be assigned roles from the list specified in the `roles` section. Additionally, LDAP "search" can be performed and results can be transformed and treated as role names and then be assigned to the user if the `role_mapping` section is also configured. All this implies that the SQL-driven [Access Control and Account Management](../access-rights.md#access-control) is enabled and roles are created using the [CREATE ROLE](../../sql-reference/statements/create/role.md#create-role-statement) statement.
+At each login attempt, ClickHouse tries to find the user definition locally and authenticate it as usual. If the user is not defined, ClickHouse will assume the definition exists in the external LDAP directory and will try to "bind" to the specified DN at the LDAP server using the provided credentials. If successful, the user will be considered existing and authenticated. The user will be assigned roles from the list specified in the `roles` section. Additionally, LDAP "search" can be performed and results can be transformed and treated as role names and then be assigned to the user if the `role_mapping` section is also configured. All this implies that the SQL-driven [Access Control and Account Management](/docs/en/guides/sre/user-management/index.md#access-control) is enabled and roles are created using the [CREATE ROLE](/docs/en/sql-reference/statements/create/role.md#create-role-statement) statement.
 
 **Example**
 
@@ -173,7 +173,7 @@ Note that `my_ldap_server` referred in the `ldap` section inside the `user_direc
 - `roles` — Section with a list of locally defined roles that will be assigned to each user retrieved from the LDAP server.
     - If no roles are specified here or assigned during role mapping (below), user will not be able to perform any actions after authentication.
 - `role_mapping` — Section with LDAP search parameters and mapping rules.
-    - When a user authenticates, while still bound to LDAP, an LDAP search is performed using `search_filter` and the name of the logged-in user. For each entry found during that search, the value of the specified attribute is extracted. For each attribute value that has the specified prefix, the prefix is removed, and the rest of the value becomes the name of a local role defined in ClickHouse, which is expected to be created beforehand by the [CREATE ROLE](../../sql-reference/statements/create/role.md#create-role-statement) statement.
+    - When a user authenticates, while still bound to LDAP, an LDAP search is performed using `search_filter` and the name of the logged-in user. For each entry found during that search, the value of the specified attribute is extracted. For each attribute value that has the specified prefix, the prefix is removed, and the rest of the value becomes the name of a local role defined in ClickHouse, which is expected to be created beforehand by the [CREATE ROLE](/docs/en/sql-reference/statements/create/role.md#create-role-statement) statement.
     - There can be multiple `role_mapping` sections defined inside the same `ldap` section. All of them will be applied.
         - `base_dn` — Template used to construct the base DN for the LDAP search.
             - The resulting DN will be constructed by replacing all `{user_name}`, `{bind_dn}`, and `{user_dn}` substrings of the template with the actual user name, bind DN, and user DN during each LDAP search.
diff --git a/docs/en/operations/monitoring.md b/docs/en/operations/monitoring.md
index 2b3c4bdbbdf..ebf981690a9 100644
--- a/docs/en/operations/monitoring.md
+++ b/docs/en/operations/monitoring.md
@@ -2,6 +2,7 @@
 slug: /en/operations/monitoring
 sidebar_position: 45
 sidebar_label: Monitoring
+description: You can monitor the utilization of hardware resources and also ClickHouse server metrics.
 ---
 
 # Monitoring
@@ -11,15 +12,15 @@ import SelfManaged from '@site/docs/en/_snippets/_self_managed_only_automated.md
 
 You can monitor:
 
--   Utilization of hardware resources.
--   ClickHouse server metrics.
+- Utilization of hardware resources.
+- ClickHouse server metrics.
 
 ## Resource Utilization {#resource-utilization}
 
 ClickHouse also monitors the state of hardware resources by itself such as:
 
--   Load and temperature on processors.
--   Utilization of storage system, RAM and network.
+- Load and temperature on processors.
+- Utilization of storage system, RAM and network.
 
 This data is collected in the `system.asynchronous_metric_log` table.
 
@@ -31,8 +32,8 @@ To track server events use server logs. See the [logger](../operations/server-co
 
 ClickHouse collects:
 
--   Different metrics of how the server uses computational resources.
--   Common statistics on query processing.
+- Different metrics of how the server uses computational resources.
+- Common statistics on query processing.
 
 You can find metrics in the [system.metrics](../operations/system-tables/metrics.md#system_tables-metrics), [system.events](../operations/system-tables/events.md#system_tables-events), and [system.asynchronous_metrics](../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) tables.
 
diff --git a/docs/en/operations/named-collections.md b/docs/en/operations/named-collections.md
index f3cfa4a5372..a521a369721 100644
--- a/docs/en/operations/named-collections.md
+++ b/docs/en/operations/named-collections.md
@@ -2,34 +2,115 @@
 slug: /en/operations/named-collections
 sidebar_position: 69
 sidebar_label: "Named collections"
+title: "Named collections"
 ---
 
-# Storing details for connecting to external sources in configuration files
+Named collections provide a way to store collections of key-value pairs to be 
+used to configure integrations with external sources. You can use named collections with
+dictionaries, tables, table functions, and object storage. 
 
-Details for connecting to external sources (dictionaries, tables, table functions) can be saved
-in configuration files and thus simplify the creation of objects and hide credentials
-from users with only SQL access.
+Named collections can be configured with DDL or in configuration files and are applied
+when ClickHouse starts. They simplify the creation of objects and the hiding of credentials
+from users without administrative access.
 
-Parameters can be set in XML `<format>CSV</format>` and overridden in SQL `, format = 'TSV'`.
-The parameters in SQL can be overridden using format `key` = `value`: `compression_method = 'gzip'`.
+The keys in a named collection must match the parameter names of the corresponding
+function, table engine, database, etc. In the examples below the parameter list is
+linked to for each type.
 
-Named collections are stored in the `config.xml` file of the ClickHouse server in the `<named_collections>` section and are applied when ClickHouse starts.
+Parameters set in a named collection can be overridden in SQL, this is shown in the examples
+below.
 
-Example of configuration:
-```xml
-$ cat /etc/clickhouse-server/config.d/named_collections.xml
+## Storing named collections in the system database
+
+### DDL example
+
+```sql
+CREATE NAMED COLLECTION name AS
+key_1 = 'value',
+key_2 = 'value2',
+url = 'https://connection.url/'
+```
+
+### Permissions to create named collections with DDL
+
+To manage named collections with DDL a user must have the `named_control_collection` privilege.  This can be assigned by adding a file to `/etc/clickhouse-server/users.d/`.  The example gives the user `default` both the `access_management` and `named_collection_control` privileges:
+
+```xml title='/etc/clickhouse-server/users.d/user_default.xml'
+<clickhouse>
+  <users>
+    <default>
+      <password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex replace=true>
+      <access_management>1</access_management>
+      <!-- highlight-start -->
+      <named_collection_control>1</named_collection_control>
+      <!-- highlight-end -->
+    </default>
+  </users>
+</clickhouse>
+```
+
+:::tip
+In the above example the `passowrd_sha256_hex` value is the hexadecimal representation of the SHA256 hash of the password.  This configuration for the user `default` has the attribute `replace=true` as in the default configuration has a plain text `password` set, and it is not possible to have both plain text and sha256 hex passwords set for a user. 
+:::
+
+## Storing named collections in configuration files
+
+### XML example
+
+```xml title='/etc/clickhouse-server/config.d/named_collections.xml'
 <clickhouse>
      <named_collections>
-     ...
+        <name>
+            <key_1>value</key_1>
+            <key_2>value_2</key_2>
+            <url>https://connection.url/</url>
+        </name>
      </named_collections>
 </clickhouse>
 ```
 
-## Named collections for accessing S3.
+## Modifying named collections
+
+Named collections that are created with DDL queries can be altered or dropped with DDL. Named collections created with XML files can be managed by editing or deleting the corresponding XML.
+
+### Alter a DDL named collection
+
+Change or add the keys `key1` and `key3` of the collection `collection2`:
+```sql
+ALTER NAMED COLLECTION collection2 SET key1=4, key3='value3'
+```
+
+Remove the key `key2` from `collection2`:
+```sql
+ALTER NAMED COLLECTION collection2 DELETE key2
+```
+
+Change or add the key `key1` and delete the key `key3` of the collection `collection2`:
+```sql
+ALTER NAMED COLLECTION collection2 SET key1=4, DELETE key3
+```
+
+### Drop the DDL named collection `collection2`:
+```sql
+DROP NAMED COLLECTION collection2
+```
+
+## Named collections for accessing S3
 
 The description of parameters see [s3 Table Function](../sql-reference/table-functions/s3.md).
 
-Example of configuration:
+### DDL example
+
+```sql
+CREATE NAMED COLLECTION s3_mydata AS
+access_key_id = 'AKIAIOSFODNN7EXAMPLE',
+secret_access_key = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
+format = 'CSV',
+url = 'https://s3.us-east-1.amazonaws.com/yourbucket/mydata/'
+```
+
+### XML example
+
 ```xml
 <clickhouse>
     <named_collections>
@@ -43,23 +124,23 @@ Example of configuration:
 </clickhouse>
 ```
 
-### Example of using named collections with the s3 function
+### s3() function and S3 Table named collection examples
+
+Both of the following examples use the same named collection `s3_mydata`:
+
+#### s3() function
 
 ```sql
 INSERT INTO FUNCTION s3(s3_mydata, filename = 'test_file.tsv.gz',
    format = 'TSV', structure = 'number UInt64', compression_method = 'gzip')
 SELECT * FROM numbers(10000);
-
-SELECT count()
-FROM s3(s3_mydata, filename = 'test_file.tsv.gz')
-
-┌─count()─┐
-│   10000 │
-└─────────┘
-1 rows in set. Elapsed: 0.279 sec. Processed 10.00 thousand rows, 90.00 KB (35.78 thousand rows/s., 322.02 KB/s.)
 ```
 
-### Example of using named collections with an S3 table
+:::tip
+The first argument to the `s3()` function above is the name of the collection, `s3_mydata`.  Without named collections, the access key ID, secret, format, and URL would all be passed in every call to the `s3()` function.
+:::
+
+#### S3 table
 
 ```sql
 CREATE TABLE s3_engine_table (number Int64)
@@ -78,7 +159,22 @@ SELECT * FROM s3_engine_table LIMIT 3;
 
 The description of parameters see [mysql](../sql-reference/table-functions/mysql.md).
 
-Example of configuration:
+### DDL example
+
+```sql
+CREATE NAMED COLLECTION mymysql AS
+user = 'myuser',
+password = 'mypass',
+host = '127.0.0.1',
+port = 3306,
+database = 'test',
+connection_pool_size = 8,
+on_duplicate_clause = 1,
+replace_query = 1
+```
+
+### XML example
+
 ```xml
 <clickhouse>
     <named_collections>
@@ -96,7 +192,11 @@ Example of configuration:
 </clickhouse>
 ```
 
-### Example of using named collections with the mysql function
+### mysql() function, MySQL table, MySQL database, and Dictionary named collection examples
+
+The four following examples use the same named collection `mymysql`:
+
+#### mysql() function
 
 ```sql
 SELECT count() FROM mysql(mymysql, table = 'test');
@@ -105,8 +205,11 @@ SELECT count() FROM mysql(mymysql, table = 'test');
 │       3 │
 └─────────┘
 ```
+:::note
+The named collection does not specify the `table` parameter, so it is specified in the function call as `table = 'test'`.
+:::
 
-### Example of using named collections with an MySQL table
+#### MySQL table
 
 ```sql
 CREATE TABLE mytable(A Int64) ENGINE = MySQL(mymysql, table = 'test', connection_pool_size=3, replace_query=0);
@@ -117,7 +220,11 @@ SELECT count() FROM mytable;
 └─────────┘
 ```
 
-### Example of using named collections with database with engine MySQL
+:::note
+The DDL overrides the named collection setting for connection_pool_size.
+:::
+
+#### MySQL database
 
 ```sql
 CREATE DATABASE mydatabase ENGINE = MySQL(mymysql);
@@ -130,7 +237,7 @@ SHOW TABLES FROM mydatabase;
 └────────┘
 ```
 
-### Example of using named collections with a dictionary with source MySQL
+#### MySQL Dictionary
 
 ```sql
 CREATE DICTIONARY dict (A Int64, B String)
@@ -150,6 +257,17 @@ SELECT dictGet('dict', 'B', 2);
 
 The description of parameters see [postgresql](../sql-reference/table-functions/postgresql.md).
 
+```sql
+CREATE NAMED COLLECTION mypg AS
+user = 'pguser',
+password = 'jw8s0F4',
+host = '127.0.0.1',
+port = 5432,
+database = 'test',
+schema = 'test_schema',
+connection_pool_size = 8
+```
+
 Example of configuration:
 ```xml
 <clickhouse>
@@ -229,12 +347,22 @@ SELECT dictGet('dict', 'b', 2);
 └─────────────────────────┘
 ```
 
-## Named collections for accessing remote ClickHouse database
+## Named collections for accessing a remote ClickHouse database
 
 The description of parameters see [remote](../sql-reference/table-functions/remote.md/#parameters).
 
 Example of configuration:
 
+```sql
+CREATE NAMED COLLECTION remote1 AS
+host = 'remote_host',
+port = 9000,
+database = 'system',
+user = 'foo',
+password = 'secret',
+secure = 1
+```
+
 ```xml
 <clickhouse>
     <named_collections>
@@ -244,10 +372,12 @@ Example of configuration:
             <database>system</database>
             <user>foo</user>
             <password>secret</password>
+            <secure>1</secure>
         </remote1>
     </named_collections>
 </clickhouse>
 ```
+`secure` is not needed for connection because of `remoteSecure`, but it can be used for dictionaries.
 
 ### Example of using named collections with the `remote`/`remoteSecure` functions
 
@@ -284,3 +414,4 @@ SELECT dictGet('dict', 'b', 1);
 │ a                       │
 └─────────────────────────┘
 ```
+
diff --git a/docs/en/operations/opentelemetry.md b/docs/en/operations/opentelemetry.md
index 1de5a09db0c..70f64d08ba3 100644
--- a/docs/en/operations/opentelemetry.md
+++ b/docs/en/operations/opentelemetry.md
@@ -7,7 +7,7 @@ title: "[experimental] Tracing ClickHouse with OpenTelemetry"
 
 [OpenTelemetry](https://opentelemetry.io/) is an open standard for collecting traces and metrics from the distributed application. ClickHouse has some support for OpenTelemetry.
 
-:::warning    
+:::note    
 This is an experimental feature that will change in backwards-incompatible ways in future releases.
 :::
 
@@ -61,3 +61,7 @@ FROM system.opentelemetry_span_log
 ```
 
 In case of any errors, the part of the log data for which the error has occurred will be silently lost. Check the server log for error messages if the data does not arrive.
+
+## Related Content
+
+- Blog: [Building an Observability Solution with ClickHouse - Part 2 - Traces](https://clickhouse.com/blog/storing-traces-and-spans-open-telemetry-in-clickhouse)
diff --git a/docs/en/operations/optimizing-performance/index.md b/docs/en/operations/optimizing-performance/index.md
index e25f3b4adb7..83e9430ed27 100644
--- a/docs/en/operations/optimizing-performance/index.md
+++ b/docs/en/operations/optimizing-performance/index.md
@@ -6,4 +6,4 @@ sidebar_position: 52
 
 # Optimizing Performance
 
--   [Sampling query profiler](../../operations/optimizing-performance/sampling-query-profiler.md)
+- [Sampling query profiler](../../operations/optimizing-performance/sampling-query-profiler.md)
diff --git a/docs/en/operations/optimizing-performance/sampling-query-profiler.md b/docs/en/operations/optimizing-performance/sampling-query-profiler.md
index 72eb655101f..f5d0e5d6aed 100644
--- a/docs/en/operations/optimizing-performance/sampling-query-profiler.md
+++ b/docs/en/operations/optimizing-performance/sampling-query-profiler.md
@@ -7,17 +7,29 @@ import SelfManaged from '@site/docs/en/_snippets/_self_managed_only_no_roadmap.m
 
 # Sampling Query Profiler
 
-<SelfManaged />
-
 ClickHouse runs sampling profiler that allows analyzing query execution. Using profiler you can find source code routines that used the most frequently during query execution. You can trace CPU time and wall-clock time spent including idle time.
 
-To use profiler:
+Query profiler is automatically enabled in ClickHouse Cloud and you can run a sample query as follows
 
--   Setup the [trace_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-trace_log) section of the server configuration.
+``` sql
+SELECT
+    count(),
+    arrayStringConcat(arrayMap(x -> concat(demangle(addressToSymbol(x)), '\n    ', addressToLine(x)), trace), '\n') AS sym
+FROM system.trace_log
+WHERE (query_id = 'ebca3574-ad0a-400a-9cbc-dca382f5998c') AND (event_date = today())
+GROUP BY trace
+ORDER BY count() DESC
+LIMIT 10
+SETTINGS allow_introspection_functions = 1
+```
+
+In self-managed deployments, to use query profiler:
+
+- Setup the [trace_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-trace_log) section of the server configuration.
 
     This section configures the [trace_log](../../operations/system-tables/trace_log.md#system_tables-trace_log) system table containing the results of the profiler functioning. It is configured by default. Remember that data in this table is valid only for a running server. After the server restart, ClickHouse does not clean up the table and all the stored virtual memory address may become invalid.
 
--   Setup the [query_profiler_cpu_time_period_ns](../../operations/settings/settings.md#query_profiler_cpu_time_period_ns) or [query_profiler_real_time_period_ns](../../operations/settings/settings.md#query_profiler_real_time_period_ns) settings. Both settings can be used simultaneously.
+- Setup the [query_profiler_cpu_time_period_ns](../../operations/settings/settings.md#query_profiler_cpu_time_period_ns) or [query_profiler_real_time_period_ns](../../operations/settings/settings.md#query_profiler_real_time_period_ns) settings. Both settings can be used simultaneously.
 
     These settings allow you to configure profiler timers. As these are the session settings, you can get different sampling frequency for the whole server, individual users or user profiles, for your interactive session, and for each individual query.
 
@@ -25,13 +37,13 @@ The default sampling frequency is one sample per second and both CPU and real ti
 
 To analyze the `trace_log` system table:
 
--   Install the `clickhouse-common-static-dbg` package. See [Install from DEB Packages](../../getting-started/install.md#install-from-deb-packages).
+- Install the `clickhouse-common-static-dbg` package. See [Install from DEB Packages](../../getting-started/install.md#install-from-deb-packages).
 
--   Allow introspection functions by the [allow_introspection_functions](../../operations/settings/settings.md#settings-allow_introspection_functions) setting.
+- Allow introspection functions by the [allow_introspection_functions](../../operations/settings/settings.md#settings-allow_introspection_functions) setting.
 
     For security reasons, introspection functions are disabled by default.
 
--   Use the `addressToLine`, `addressToLineWithInlines`, `addressToSymbol` and `demangle` [introspection functions](../../sql-reference/functions/introspection.md) to get function names and their positions in ClickHouse code. To get a profile for some query, you need to aggregate data from the `trace_log` table. You can aggregate data by individual functions or by the whole stack traces.
+- Use the `addressToLine`, `addressToLineWithInlines`, `addressToSymbol` and `demangle` [introspection functions](../../sql-reference/functions/introspection.md) to get function names and their positions in ClickHouse code. To get a profile for some query, you need to aggregate data from the `trace_log` table. You can aggregate data by individual functions or by the whole stack traces.
 
 If you need to visualize `trace_log` info, try [flamegraph](../../interfaces/third-party/gui.md#clickhouse-flamegraph-clickhouse-flamegraph) and [speedscope](https://github.com/laplab/clickhouse-speedscope).
 
@@ -39,14 +51,14 @@ If you need to visualize `trace_log` info, try [flamegraph](../../interfaces/thi
 
 In this example we:
 
--   Filtering `trace_log` data by a query identifier and the current date.
+- Filtering `trace_log` data by a query identifier and the current date.
 
--   Aggregating by stack trace.
+- Aggregating by stack trace.
 
--   Using introspection functions, we will get a report of:
+- Using introspection functions, we will get a report of:
 
-    -   Names of symbols and corresponding source code functions.
-    -   Source code locations of these functions.
+    - Names of symbols and corresponding source code functions.
+    - Source code locations of these functions.
 
 <!-- -->
 
diff --git a/docs/en/operations/query-cache.md b/docs/en/operations/query-cache.md
index 1a486de7904..bfa51650cd8 100644
--- a/docs/en/operations/query-cache.md
+++ b/docs/en/operations/query-cache.md
@@ -1,10 +1,10 @@
 ---
 slug: /en/operations/query-cache
 sidebar_position: 65
-sidebar_label: Query Cache [experimental]
+sidebar_label: Query Cache
 ---
 
-# Query Cache [experimental]
+# Query Cache
 
 The query cache allows to compute `SELECT` queries just once and to serve further executions of the same query directly from the cache.
 Depending on the type of the queries, this can dramatically reduce latency and resource consumption of the ClickHouse server.
@@ -29,21 +29,10 @@ Transactionally inconsistent caching is traditionally provided by client tools o
 the same caching logic and configuration is often duplicated. With ClickHouse's query cache, the caching logic moves to the server side.
 This reduces maintenance effort and avoids redundancy.
 
-:::warning
-The query cache is an experimental feature that should not be used in production. There are known cases (e.g. in distributed query
-processing) where wrong results are returned.
-:::
-
 ## Configuration Settings and Usage
 
-As long as the result cache is experimental it must be activated using the following configuration setting:
-
-```sql
-SET allow_experimental_query_cache = true;
-```
-
-Afterwards, setting [use_query_cache](settings/settings.md#use-query-cache) can be used to control whether a specific query or all queries
-of the current session should utilize the query cache. For example, the first execution of query
+Setting [use_query_cache](settings/settings.md#use-query-cache) can be used to control whether a specific query or all queries of the
+current session should utilize the query cache. For example, the first execution of query
 
 ```sql
 SELECT some_expensive_calculation(column_1, column_2)
@@ -85,8 +74,35 @@ make the matching more natural, all query-level settings related to the query ca
 
 If the query was aborted due to an exception or user cancellation, no entry is written into the query cache.
 
-The size of the query cache, the maximum number of cache entries and the maximum size of cache entries (in bytes and in records) can
-be configured using different [server configuration options](server-configuration-parameters/settings.md#server_configuration_parameters_query-cache).
+The size of the query cache in bytes, the maximum number of cache entries and the maximum size of individual cache entries (in bytes and in
+records) can be configured using different [server configuration options](server-configuration-parameters/settings.md#server_configuration_parameters_query-cache).
+
+It is also possible to limit the cache usage of individual users using [settings profiles](settings/settings-profiles.md) and [settings
+constraints](settings/constraints-on-settings.md). More specifically, you can restrict the maximum amount of memory (in bytes) a user may
+allocate in the query cache and the the maximum number of stored query results. For that, first provide configurations
+[query_cache_max_size_in_bytes](settings/settings.md#query-cache-max-size-in-bytes) and
+[query_cache_max_entries](settings/settings.md#query-cache-size-max-items) in a user profile in `users.xml`, then make both settings
+readonly:
+
+``` xml
+<profiles>
+    <default>
+        <!-- The maximum cache size in bytes for user/profile 'default' -->
+        <query_cache_max_size_in_bytes>10000</query_cache_max_size_in_bytes>
+        <!-- The maximum number of SELECT query results stored in the cache for user/profile 'default' -->
+        <query_cache_max_entries>100</query_cache_max_entries>
+        <!-- Make both settings read-only so the user cannot change them -->
+        <constraints>
+            <query_cache_max_size_in_bytes>
+                <readonly/>
+            </query_cache_max_size_in_bytes>
+            <query_cache_max_entries>
+                <readonly/>
+            <query_cache_max_entries>
+        </constraints>
+    </default>
+</profiles>
+```
 
 To define how long a query must run at least such that its result can be cached, you can use setting
 [query_cache_min_query_duration](settings/settings.md#query-cache-min-query-duration). For example, the result of query
@@ -103,6 +119,20 @@ cached - for that use setting [query_cache_min_query_runs](settings/settings.md#
 Entries in the query cache become stale after a certain time period (time-to-live). By default, this period is 60 seconds but a different
 value can be specified at session, profile or query level using setting [query_cache_ttl](settings/settings.md#query-cache-ttl).
 
+Entries in the query cache are compressed by default. This reduces the overall memory consumption at the cost of slower writes into / reads
+from the query cache. To disable compression, use setting [query_cache_compress_entries](settings/settings.md#query-cache-compress-entries).
+
+ClickHouse reads table data in blocks of [max_block_size](settings/settings.md#settings-max_block_size) rows. Due to filtering, aggregation,
+etc., result blocks are typically much smaller than 'max_block_size' but there are also cases where they are much bigger. Setting
+[query_cache_squash_partial_results](settings/settings.md#query-cache-squash-partial-results) (enabled by default) controls if result blocks
+are squashed (if they are tiny) or split (if they are large) into blocks of 'max_block_size' size before insertion into the query result
+cache. This reduces performance of writes into the query cache but improves compression rate of cache entries and provides more natural
+block granularity when query results are later served from the query cache.
+
+As a result, the query cache stores for each query multiple (partial)
+result blocks. While this behavior is a good default, it can be suppressed using setting
+[query_cache_squash_partial_query_results](settings/settings.md#query-cache-squash-partial-query-results).
+
 Also, results of queries with non-deterministic functions such as `rand()` and `now()` are not cached. This can be overruled using
 setting [query_cache_store_results_of_queries_with_nondeterministic_functions](settings/settings.md#query-cache-store-results-of-queries-with-nondeterministic-functions).
 
@@ -110,3 +140,7 @@ Finally, entries in the query cache are not shared between users due to security
 row policy on a table by running the same query as another user B for whom no such policy exists. However, if necessary, cache entries can
 be marked accessible by other users (i.e. shared) by supplying setting
 [query_cache_share_between_users](settings/settings.md#query-cache-share-between-users).
+
+## Related Content
+
+- Blog: [Introducing the ClickHouse Query Cache](https://clickhouse.com/blog/introduction-to-the-clickhouse-query-cache-and-design)
diff --git a/docs/en/operations/quotas.md b/docs/en/operations/quotas.md
index f1f3ca78802..2f0cdec0983 100644
--- a/docs/en/operations/quotas.md
+++ b/docs/en/operations/quotas.md
@@ -12,8 +12,8 @@ The system also has a feature for limiting the complexity of a single query. See
 
 In contrast to query complexity restrictions, quotas:
 
--   Place restrictions on a set of queries that can be run over a period of time, instead of limiting a single query.
--   Account for resources spent on all remote servers for distributed query processing.
+- Place restrictions on a set of queries that can be run over a period of time, instead of limiting a single query.
+- Account for resources spent on all remote servers for distributed query processing.
 
 Let’s look at the section of the ‘users.xml’ file that defines quotas.
 
diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md
index 17d03dfa4ec..7ebf387f2ed 100644
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@@ -2,6 +2,7 @@
 slug: /en/operations/server-configuration-parameters/settings
 sidebar_position: 57
 sidebar_label: Server Settings
+description: This section contains descriptions of server settings that cannot be changed at the session or query level.
 ---
 
 # Server Settings
@@ -24,7 +25,7 @@ Default value: 3600.
 
 Data compression settings for [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)-engine tables.
 
-:::warning
+:::note
 Don’t use it if you have just started using ClickHouse.
 :::
 
@@ -44,17 +45,17 @@ Configuration template:
 
 `<case>` fields:
 
--   `min_part_size` – The minimum size of a data part.
--   `min_part_size_ratio` – The ratio of the data part size to the table size.
--   `method` – Compression method. Acceptable values: `lz4`, `lz4hc`, `zstd`,`deflate_qpl`.
--   `level` – Compression level. See [Codecs](../../sql-reference/statements/create/table.md#create-query-general-purpose-codecs).
+- `min_part_size` – The minimum size of a data part.
+- `min_part_size_ratio` – The ratio of the data part size to the table size.
+- `method` – Compression method. Acceptable values: `lz4`, `lz4hc`, `zstd`,`deflate_qpl`.
+- `level` – Compression level. See [Codecs](../../sql-reference/statements/create/table.md#create-query-general-purpose-codecs).
 
 You can configure multiple `<case>` sections.
 
 Actions when conditions are met:
 
--   If a data part matches a condition set, ClickHouse uses the specified compression method.
--   If a data part matches multiple condition sets, ClickHouse uses the first matched condition set.
+- If a data part matches a condition set, ClickHouse uses the specified compression method.
+- If a data part matches multiple condition sets, ClickHouse uses the first matched condition set.
 
 If no conditions met for a data part, ClickHouse uses the `lz4` compression.
 
@@ -164,7 +165,7 @@ List of prefixes for [custom settings](../../operations/settings/index.md#custom
 
 **See Also**
 
--   [Custom settings](../../operations/settings/index.md#custom_settings)
+- [Custom settings](../../operations/settings/index.md#custom_settings)
 
 ## core_dump {#server_configuration_parameters-core_dump}
 
@@ -172,7 +173,7 @@ Configures soft limit for core dump file size.
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `1073741824` (1 GB).
 
@@ -207,7 +208,7 @@ Default value: `3600` (1 hour).
 ## database_catalog_unused_dir_rm_timeout_sec {#database_catalog_unused_dir_rm_timeout_sec}
 
 Parameter of a task that cleans up garbage from `store/` directory.
-If some subdirectory is not used by clickhouse-server and it was previousely "hidden"
+If some subdirectory is not used by clickhouse-server and it was previously "hidden"
 (see [database_catalog_unused_dir_hide_timeout_sec](../../operations/server-configuration-parameters/settings.md#database_catalog_unused_dir_hide_timeout_sec))
 and this directory was not modified for last
 `database_catalog_unused_dir_rm_timeout_sec` seconds, the task will remove this directory.
@@ -256,6 +257,7 @@ The path to the table in ZooKeeper.
 ``` xml
 <default_replica_path>/clickhouse/tables/{uuid}/{shard}</default_replica_path>
 ```
+
 ## default_replica_name {#default_replica_name}
 
  The replica name in ZooKeeper.
@@ -272,10 +274,10 @@ The path to the config file for dictionaries.
 
 Path:
 
--   Specify the absolute path or the path relative to the server config file.
--   The path can contain wildcards \* and ?.
+- Specify the absolute path or the path relative to the server config file.
+- The path can contain wildcards \* and ?.
 
-See also “[Dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md)”.
+See also “[Dictionaries](../../sql-reference/dictionaries/index.md)”.
 
 **Example**
 
@@ -289,8 +291,8 @@ The path to the config file for executable user defined functions.
 
 Path:
 
--   Specify the absolute path or the path relative to the server config file.
--   The path can contain wildcards \* and ?.
+- Specify the absolute path or the path relative to the server config file.
+- The path can contain wildcards \* and ?.
 
 See also “[Executable User Defined Functions](../../sql-reference/functions/index.md#executable-user-defined-functions).”.
 
@@ -333,15 +335,15 @@ Sending data to [Graphite](https://github.com/graphite-project).
 
 Settings:
 
--   host – The Graphite server.
--   port – The port on the Graphite server.
--   interval – The interval for sending, in seconds.
--   timeout – The timeout for sending data, in seconds.
--   root_path – Prefix for keys.
--   metrics – Sending data from the [system.metrics](../../operations/system-tables/metrics.md#system_tables-metrics) table.
--   events – Sending deltas data accumulated for the time period from the [system.events](../../operations/system-tables/events.md#system_tables-events) table.
--   events_cumulative – Sending cumulative data from the [system.events](../../operations/system-tables/events.md#system_tables-events) table.
--   asynchronous_metrics – Sending data from the [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) table.
+- host – The Graphite server.
+- port – The port on the Graphite server.
+- interval – The interval for sending, in seconds.
+- timeout – The timeout for sending data, in seconds.
+- root_path – Prefix for keys.
+- metrics – Sending data from the [system.metrics](../../operations/system-tables/metrics.md#system_tables-metrics) table.
+- events – Sending deltas data accumulated for the time period from the [system.events](../../operations/system-tables/events.md#system_tables-events) table.
+- events_cumulative – Sending cumulative data from the [system.events](../../operations/system-tables/events.md#system_tables-events) table.
+- asynchronous_metrics – Sending data from the [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) table.
 
 You can configure multiple `<graphite>` clauses. For instance, you can use this for sending different data at different intervals.
 
@@ -417,6 +419,7 @@ Opens `https://tabix.io/` when accessing `http://localhost: http_port`.
   <![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]>
 </http_server_default_response>
 ```
+
 ## hsts_max_age  {#hsts-max-age}
 
 Expired time for HSTS in seconds. The default value is 0 means clickhouse disabled HSTS. If you set a positive number, the HSTS will be enabled and the max-age is the number you set.
@@ -513,10 +516,10 @@ These credentials are common for replication via `HTTP` and `HTTPS`.
 
 The section contains the following parameters:
 
--   `user` — Username.
--   `password` — Password.
--   `allow_empty` — If `true`, then other replicas are allowed to connect without authentication even if credentials are set. If `false`, then connections without authentication are refused. Default value: `false`.
--   `old` — Contains old `user` and `password` used during credential rotation. Several `old` sections can be specified.
+- `user` — Username.
+- `password` — Password.
+- `allow_empty` — If `true`, then other replicas are allowed to connect without authentication even if credentials are set. If `false`, then connections without authentication are refused. Default value: `false`.
+- `old` — Contains old `user` and `password` used during credential rotation. Several `old` sections can be specified.
 
 **Credentials Rotation**
 
@@ -581,12 +584,12 @@ Backlog (queue size of pending connections) of the listen socket.
 Default value: `4096` (as in linux [5.4+](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=19f92a030ca6d772ab44b22ee6a01378a8cb32d4)).
 
 Usually this value does not need to be changed, since:
--  default value is large enough,
--  and for accepting client's connections server has separate thread.
+- default value is large enough,
+- and for accepting client's connections server has separate thread.
 
 So even if you have `TcpExtListenOverflows` (from `nstat`) non zero and this counter grows for ClickHouse server it does not mean that this value need to be increased, since:
--  usually if 4096 is not enough it shows some internal ClickHouse scaling issue, so it is better to report an issue.
--  and it does not mean that the server can handle more connections later (and even if it could, by that moment clients may be gone or disconnected).
+- usually if 4096 is not enough it shows some internal ClickHouse scaling issue, so it is better to report an issue.
+- and it does not mean that the server can handle more connections later (and even if it could, by that moment clients may be gone or disconnected).
 
 Examples:
 
@@ -600,13 +603,13 @@ Logging settings.
 
 Keys:
 
--   `level` – Logging level. Acceptable values: `trace`, `debug`, `information`, `warning`, `error`.
--   `log` – The log file. Contains all the entries according to `level`.
--   `errorlog` – Error log file.
--   `size` – Size of the file. Applies to `log` and `errorlog`. Once the file reaches `size`, ClickHouse archives and renames it, and creates a new log file in its place.
--   `count` – The number of archived log files that ClickHouse stores.
--   `console` – Send `log` and `errorlog` to the console instead of file. To enable, set to `1` or `true`.
--   `stream_compress` – Compress `log` and `errorlog` with `lz4` stream compression. To enable, set to `1` or `true`.
+- `level` – Logging level. Acceptable values: `trace`, `debug`, `information`, `warning`, `error`.
+- `log` – The log file. Contains all the entries according to `level`.
+- `errorlog` – Error log file.
+- `size` – Size of the file. Applies to `log` and `errorlog`. Once the file reaches `size`, ClickHouse archives and renames it, and creates a new log file in its place.
+- `count` – The number of archived log files that ClickHouse stores.
+- `console` – Send `log` and `errorlog` to the console instead of file. To enable, set to `1` or `true`.
+- `stream_compress` – Compress `log` and `errorlog` with `lz4` stream compression. To enable, set to `1` or `true`.
 
 **Example**
 
@@ -646,12 +649,12 @@ Writing to the syslog is also supported. Config example:
 
 Keys for syslog:
 
--   use_syslog — Required setting if you want to write to the syslog.
--   address — The host\[:port\] of syslogd. If omitted, the local daemon is used.
--   hostname — Optional. The name of the host that logs are sent from.
--   facility — [The syslog facility keyword](https://en.wikipedia.org/wiki/Syslog#Facility) in uppercase letters with the “LOG_” prefix: (`LOG_USER`, `LOG_DAEMON`, `LOG_LOCAL3`, and so on).
+- use_syslog — Required setting if you want to write to the syslog.
+- address — The host\[:port\] of syslogd. If omitted, the local daemon is used.
+- hostname — Optional. The name of the host that logs are sent from.
+- facility — [The syslog facility keyword](https://en.wikipedia.org/wiki/Syslog#Facility) in uppercase letters with the “LOG_” prefix: (`LOG_USER`, `LOG_DAEMON`, `LOG_LOCAL3`, and so on).
     Default value: `LOG_USER` if `address` is specified, `LOG_DAEMON` otherwise.
--   format – Message format. Possible values: `bsd` and `syslog.`
+- format – Message format. Possible values: `bsd` and `syslog.`
 
 ## send_crash_reports {#server_configuration_parameters-send_crash_reports}
 
@@ -662,13 +665,13 @@ The server will need access to the public Internet via IPv4 (at the time of writ
 
 Keys:
 
--   `enabled` – Boolean flag to enable the feature, `false` by default. Set to `true` to allow sending crash reports.
--   `endpoint` – You can override the Sentry endpoint URL for sending crash reports. It can be either a separate Sentry account or your self-hosted Sentry instance. Use the [Sentry DSN](https://docs.sentry.io/error-reporting/quickstart/?platform=native#configure-the-sdk) syntax.
--   `anonymize` - Avoid attaching the server hostname to the crash report.
--   `http_proxy` - Configure HTTP proxy for sending crash reports.
--   `debug` - Sets the Sentry client into debug mode.
--   `tmp_path` - Filesystem path for temporary crash report state.
--   `environment` - An arbitrary name of an environment in which the ClickHouse server is running. It will be mentioned in each crash report. The default value is `test` or `prod` depending on the version of ClickHouse.
+- `enabled` – Boolean flag to enable the feature, `false` by default. Set to `true` to allow sending crash reports.
+- `endpoint` – You can override the Sentry endpoint URL for sending crash reports. It can be either a separate Sentry account or your self-hosted Sentry instance. Use the [Sentry DSN](https://docs.sentry.io/error-reporting/quickstart/?platform=native#configure-the-sdk) syntax.
+- `anonymize` - Avoid attaching the server hostname to the crash report.
+- `http_proxy` - Configure HTTP proxy for sending crash reports.
+- `debug` - Sets the Sentry client into debug mode.
+- `tmp_path` - Filesystem path for temporary crash report state.
+- `environment` - An arbitrary name of an environment in which the ClickHouse server is running. It will be mentioned in each crash report. The default value is `test` or `prod` depending on the version of ClickHouse.
 
 **Recommended way to use**
 
@@ -710,8 +713,8 @@ Limits total RAM usage by the ClickHouse server.
 
 Possible values:
 
--   Positive integer.
--   0 — Auto.
+- Positive integer.
+- 0 — Auto.
 
 Default value: `0`.
 
@@ -721,8 +724,8 @@ The default `max_server_memory_usage` value is calculated as `memory_amount * ma
 
 **See also**
 
--   [max_memory_usage](../../operations/settings/query-complexity.md#settings_max_memory_usage)
--   [max_server_memory_usage_to_ram_ratio](#max_server_memory_usage_to_ram_ratio)
+- [max_memory_usage](../../operations/settings/query-complexity.md#settings_max_memory_usage)
+- [max_server_memory_usage_to_ram_ratio](#max_server_memory_usage_to_ram_ratio)
 
 ## max_server_memory_usage_to_ram_ratio {#max_server_memory_usage_to_ram_ratio}
 
@@ -730,8 +733,8 @@ Defines the fraction of total physical RAM amount, available to the ClickHouse s
 
 Possible values:
 
--   Positive double.
--   0 — The ClickHouse server can use all available RAM.
+- Positive double.
+- 0 — The ClickHouse server can use all available RAM.
 
 Default value: `0.9`.
 
@@ -747,30 +750,30 @@ On hosts with low RAM and swap, you possibly need setting `max_server_memory_usa
 
 **See Also**
 
--   [max_server_memory_usage](#max_server_memory_usage)
+- [max_server_memory_usage](#max_server_memory_usage)
 
 ## concurrent_threads_soft_limit_num {#concurrent_threads_soft_limit_num}
 The maximum number of query processing threads, excluding threads for retrieving data from remote servers, allowed to run all queries. This is not a hard limit. In case if the limit is reached the query will still get at least one thread to run. Query can upscale to desired number of threads during execution if more threads become available.
 
 Possible values:
 
--   Positive integer.
--   0 — No limit.
+- Positive integer.
+- 0 — No limit.
 
 Default value: `0`.
 
 **See Also**
 
--   [Concurrency Control](/docs/en/development/architecture.md#concurrency-control)
+- [Concurrency Control](/docs/en/development/architecture.md#concurrency-control)
 
 ## concurrent_threads_soft_limit_ratio_to_cores {#concurrent_threads_soft_limit_ratio_to_cores}
 The maximum number of query processing threads as multiple of number of logical cores.
-More details: [concurrent_threads_soft_limit_num](#concurrent-threads-soft-limit-num).
+More details: [concurrent_threads_soft_limit_num](#concurrent_threads_soft_limit_num).
 
 Possible values:
 
--   Positive integer.
--   0 — No limit.
+- Positive integer.
+- 0 — No limit.
 
 Default value: `0`.
 
@@ -791,8 +794,8 @@ These settings can be modified at runtime and will take effect immediately. Quer
 
 Possible values:
 
--   Positive integer.
--   0 — No limit.
+- Positive integer.
+- 0 — No limit.
 
 Default value: `100`.
 
@@ -812,8 +815,8 @@ These settings can be modified at runtime and will take effect immediately. Quer
 
 Possible values:
 
--   Positive integer.
--   0 — No limit.
+- Positive integer.
+- 0 — No limit.
 
 Default value: `0`.
 
@@ -833,8 +836,8 @@ These settings can be modified at runtime and will take effect immediately. Quer
 
 Possible values:
 
--   Positive integer.
--   0 — No limit.
+- Positive integer.
+- 0 — No limit.
 
 Default value: `0`.
 
@@ -850,8 +853,8 @@ The maximum number of simultaneously processed queries related to MergeTree tabl
 
 Possible values:
 
--   Positive integer.
--   0 — No limit.
+- Positive integer.
+- 0 — No limit.
 
 Default value: `0`.
 
@@ -871,8 +874,8 @@ Modifying the setting for one query or user does not affect other queries.
 
 Possible values:
 
--   Positive integer.
--   0 — No limit.
+- Positive integer.
+- 0 — No limit.
 
 Default value: `0`.
 
@@ -884,7 +887,7 @@ Default value: `0`.
 
 **See Also**
 
--   [max_concurrent_queries](#max-concurrent-queries)
+- [max_concurrent_queries](#max-concurrent-queries)
 
 ## max_connections {#max-connections}
 
@@ -914,9 +917,9 @@ We recommend using this option in macOS since the `getrlimit()` function returns
 
 Restriction on deleting tables.
 
-If the size of a [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table exceeds `max_table_size_to_drop` (in bytes), you can’t delete it using a DROP query.
+If the size of a [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table exceeds `max_table_size_to_drop` (in bytes), you can’t delete it using a [DROP](../../sql-reference/statements/drop.md) query or [TRUNCATE](../../sql-reference/statements/truncate.md) query.
 
-If you still need to delete the table without restarting the ClickHouse server, create the `<clickhouse-path>/flags/force_drop_table` file and run the DROP query.
+This setting does not require a restart of the Clickhouse server to apply. Another way to disable the restriction is to create the `<clickhouse-path>/flags/force_drop_table` file.
 
 Default value: 50 GB.
 
@@ -928,13 +931,35 @@ The value 0 means that you can delete all tables without any restrictions.
 <max_table_size_to_drop>0</max_table_size_to_drop>
 ```
 
+## max_partition_size_to_drop {#max-partition-size-to-drop}
+
+Restriction on dropping partitions.
+
+If the size of a [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table exceeds `max_partition_size_to_drop` (in bytes), you can’t drop a partition using a [DROP PARTITION](../../sql-reference/statements/alter/partition.md#drop-partitionpart) query.
+
+This setting does not require a restart of the Clickhouse server to apply. Another way to disable the restriction is to create the `<clickhouse-path>/flags/force_drop_table` file.
+
+Default value: 50 GB.
+
+The value 0 means that you can drop partitions without any restrictions.
+
+:::note
+This limitation does not restrict drop table and truncate table, see [max_table_size_to_drop](#max-table-size-to-drop)
+:::
+
+**Example**
+
+``` xml
+<max_partition_size_to_drop>0</max_partition_size_to_drop>
+```
+
 ## max_thread_pool_size {#max-thread-pool-size}
 
 ClickHouse uses threads from the Global Thread pool to process queries. If there is no idle thread to process a query, then a new thread is created in the pool. `max_thread_pool_size` limits the maximum number of threads in the pool.
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `10000`.
 
@@ -950,7 +975,7 @@ If the number of **idle** threads in the Global Thread pool is greater than `max
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `1000`.
 
@@ -966,7 +991,8 @@ The maximum number of jobs that can be scheduled on the Global Thread pool. Incr
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
+- 0 — No limit.
 
 Default value: `10000`.
 
@@ -976,15 +1002,78 @@ Default value: `10000`.
 <thread_pool_queue_size>12000</thread_pool_queue_size>
 ```
 
-## background_pool_size {#background_pool_size}
+## max_io_thread_pool_size {#max-io-thread-pool-size}
 
-Sets the number of threads performing background merges and mutations for tables with MergeTree engines. This setting is also could be applied  at server startup from the `default` profile configuration for backward compatibility at the ClickHouse server start. You can only increase the number of threads at runtime. To lower the number of threads you have to restart the server. By adjusting this setting, you manage CPU and disk load. Smaller pool size utilizes less CPU and disk resources, but background processes advance slower which might eventually impact query performance.
-
-Before changing it, please also take a look at related MergeTree settings, such as `number_of_free_entries_in_pool_to_lower_max_size_of_merge` and `number_of_free_entries_in_pool_to_execute_mutation`.
+ClickHouse uses threads from the IO Thread pool to do some IO operations (e.g. to interact with S3). `max_io_thread_pool_size` limits the maximum number of threads in the pool.
 
 Possible values:
 
--   Any positive integer.
+- Positive integer.
+
+Default value: `100`.
+
+## max_io_thread_pool_free_size {#max-io-thread-pool-free-size}
+
+If the number of **idle** threads in the IO Thread pool exceeds `max_io_thread_pool_free_size`, ClickHouse will release resources occupied by idling threads and decrease the pool size. Threads can be created again if necessary.
+
+Possible values:
+
+- Positive integer.
+
+Default value: `0`.
+
+## io_thread_pool_queue_size {#io-thread-pool-queue-size}
+
+The maximum number of jobs that can be scheduled on the IO Thread pool.
+
+Possible values:
+
+- Positive integer.
+- 0 — No limit.
+
+Default value: `10000`.
+
+## max_backups_io_thread_pool_size {#max-backups-io-thread-pool-size}
+
+ClickHouse uses threads from the Backups IO Thread pool to do S3 backup IO operations. `max_backups_io_thread_pool_size` limits the maximum number of threads in the pool.
+
+Possible values:
+
+- Positive integer.
+
+Default value: `1000`.
+
+## max_backups_io_thread_pool_free_size {#max-backups-io-thread-pool-free-size}
+
+If the number of **idle** threads in the Backups IO Thread pool exceeds `max_backup_io_thread_pool_free_size`, ClickHouse will release resources occupied by idling threads and decrease the pool size. Threads can be created again if necessary.
+
+Possible values:
+
+- Positive integer.
+- Zero.
+
+Default value: `0`.
+
+## backups_io_thread_pool_queue_size {#backups-io-thread-pool-queue-size}
+
+The maximum number of jobs that can be scheduled on the Backups IO Thread pool. It is recommended to keep this queue unlimited due to the current S3 backup logic.
+
+Possible values:
+
+- Positive integer.
+- 0 — No limit.
+
+Default value: `0`.
+
+## background_pool_size {#background_pool_size}
+
+Sets the number of threads performing background merges and mutations for tables with MergeTree engines. This setting is also could be applied at server startup from the `default` profile configuration for backward compatibility at the ClickHouse server start. You can only increase the number of threads at runtime. To lower the number of threads you have to restart the server. By adjusting this setting, you manage CPU and disk load. Smaller pool size utilizes less CPU and disk resources, but background processes advance slower which might eventually impact query performance.
+
+Before changing it, please also take a look at related MergeTree settings, such as [number_of_free_entries_in_pool_to_lower_max_size_of_merge](../../operations/settings/merge-tree-settings.md#number-of-free-entries-in-pool-to-lower-max-size-of-merge) and [number_of_free_entries_in_pool_to_execute_mutation](../../operations/settings/merge-tree-settings.md#number-of-free-entries-in-pool-to-execute-mutation).
+
+Possible values:
+
+- Any positive integer.
 
 Default value: 16.
 
@@ -996,13 +1085,13 @@ Default value: 16.
 
 ## background_merges_mutations_concurrency_ratio {#background_merges_mutations_concurrency_ratio}
 
-Sets a ratio between the number of threads and the number of background merges and mutations that can be executed concurrently. For example if the ratio equals to 2 and
-`background_pool_size` is set to 16 then ClickHouse can execute 32 background merges concurrently. This is possible, because background operation could be suspended and postponed. This is needed to give small merges more execution priority. You can only increase this ratio at runtime. To lower it you have to restart the server.
+Sets a ratio between the number of threads and the number of background merges and mutations that can be executed concurrently. For example, if the ratio equals to 2 and
+`background_pool_size` is set to 16 then ClickHouse can execute 32 background merges concurrently. This is possible, because background operations could be suspended and postponed. This is needed to give small merges more execution priority. You can only increase this ratio at runtime. To lower it you have to restart the server.
 The same as for `background_pool_size` setting `background_merges_mutations_concurrency_ratio` could be applied from the `default` profile for backward compatibility.
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 2.
 
@@ -1012,6 +1101,33 @@ Default value: 2.
 <background_merges_mutations_concurrency_ratio>3</background_merges_mutations_concurrency_ratio>
 ```
 
+## merges_mutations_memory_usage_soft_limit {#merges_mutations_memory_usage_soft_limit}
+
+Sets the limit on how much RAM is allowed to use for performing merge and mutation operations.
+Zero means unlimited.
+If ClickHouse reaches this limit, it won't schedule any new background merge or mutation operations but will continue to execute already scheduled tasks.
+
+Possible values:
+
+-   Any positive integer.
+
+**Example**
+
+```xml
+<merges_mutations_memory_usage_soft_limit>0</merges_mutations_memory_usage_soft_limit>
+```
+
+## merges_mutations_memory_usage_to_ram_ratio {#merges_mutations_memory_usage_to_ram_ratio}
+
+The default `merges_mutations_memory_usage_soft_limit` value is calculated as `memory_amount * merges_mutations_memory_usage_to_ram_ratio`.
+
+Default value: `0.5`.
+
+**See also**
+
+-   [max_memory_usage](../../operations/settings/query-complexity.md#settings_max_memory_usage)
+-   [merges_mutations_memory_usage_soft_limit](#merges_mutations_memory_usage_soft_limit)
+
 ## background_merges_mutations_scheduling_policy {#background_merges_mutations_scheduling_policy}
 
 Algorithm used to select next merge or mutation to be executed by background thread pool. Policy may be changed at runtime without server restart.
@@ -1019,8 +1135,8 @@ Could be applied from the `default` profile for backward compatibility.
 
 Possible values:
 
--   "round_robin" — Every concurrent merge and mutation is executed in round-robin order to ensure starvation-free operation. Smaller merges are completed faster than bigger ones just because they have fewer blocks to merge.
--   "shortest_task_first" — Always execute smaller merge or mutation. Merges and mutations are assigned priorities based on their resulting size. Merges with smaller sizes are strictly preferred over bigger ones. This policy ensures the fastest possible merge of small parts but can lead to indefinite starvation of big merges in partitions heavily overloaded by INSERTs.
+- "round_robin" — Every concurrent merge and mutation is executed in round-robin order to ensure starvation-free operation. Smaller merges are completed faster than bigger ones just because they have fewer blocks to merge.
+- "shortest_task_first" — Always execute smaller merge or mutation. Merges and mutations are assigned priorities based on their resulting size. Merges with smaller sizes are strictly preferred over bigger ones. This policy ensures the fastest possible merge of small parts but can lead to indefinite starvation of big merges in partitions heavily overloaded by INSERTs.
 
 Default value: "round_robin".
 
@@ -1036,7 +1152,7 @@ Sets the number of threads performing background moves for tables with MergeTree
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 8.
 
@@ -1048,11 +1164,11 @@ Default value: 8.
 
 ## background_fetches_pool_size {#background_fetches_pool_size}
 
-Sets the number of threads performing background fetches for tables with ReplicatedMergeTree engines. Could be increased at runtime and could be applied at server startup from the `default` profile for backward compatibility.
+Sets the number of threads performing background fetches for tables with ReplicatedMergeTree engines. Could be increased at runtime.
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 8.
 
@@ -1064,11 +1180,11 @@ Default value: 8.
 
 ## background_common_pool_size {#background_common_pool_size}
 
-Sets the number of threads performing background non-specialized operations like cleaning the filesystem etc. for tables with MergeTree engines. Could be increased at runtime and could be applied at server startup from the `default` profile for backward compatibility.
+Sets the number of threads performing background non-specialized operations like cleaning the filesystem etc. for tables with MergeTree engines. Could be increased at runtime.
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 8.
 
@@ -1078,6 +1194,25 @@ Default value: 8.
 <background_common_pool_size>36</background_common_pool_size>
 ```
 
+## background_buffer_flush_schedule_pool_size {#background_buffer_flush_schedule_pool_size}
+
+Sets the number of threads performing background flush in [Buffer](../../engines/table-engines/special/buffer.md)-engine tables.
+
+Possible values:
+
+- Any positive integer.
+
+Default value: 16.
+
+## background_schedule_pool_size {#background_schedule_pool_size}
+
+Sets the number of threads performing background tasks for [replicated](../../engines/table-engines/mergetree-family/replication.md) tables, [Kafka](../../engines/table-engines/integrations/kafka.md) streaming, [DNS cache updates](../../operations/server-configuration-parameters/settings.md/#server-settings-dns-cache-update-period).
+
+Possible values:
+
+- Any positive integer.
+
+Default value: 128.
 
 
 ## merge_tree {#server_configuration_parameters-merge_tree}
@@ -1147,26 +1282,26 @@ Support for SSL is provided by the `libpoco` library. The available configuratio
 
 Keys for server/client settings:
 
--   privateKeyFile – The path to the file with the secret key of the PEM certificate. The file may contain a key and certificate at the same time.
--   certificateFile – The path to the client/server certificate file in PEM format. You can omit it if `privateKeyFile` contains the certificate.
--   caConfig (default: none) – The path to the file or directory that contains trusted CA certificates. If this points to a file, it must be in PEM format and can contain several CA certificates. If this points to a directory, it must contain one .pem file per CA certificate. The filenames are looked up by the CA subject name hash value. Details can be found in the man page of [SSL_CTX_load_verify_locations](https://www.openssl.org/docs/man3.0/man3/SSL_CTX_load_verify_locations.html).
--   verificationMode (default: relaxed) – The method for checking the node’s certificates. Details are in the description of the [Context](https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/Context.h) class. Possible values: `none`, `relaxed`, `strict`, `once`.
--   verificationDepth (default: 9) – The maximum length of the verification chain. Verification will fail if the certificate chain length exceeds the set value.
--   loadDefaultCAFile (default: true) – Wether built-in CA certificates for OpenSSL will be used. ClickHouse assumes that builtin CA certificates are in the file `/etc/ssl/cert.pem` (resp. the directory `/etc/ssl/certs`) or in file (resp. directory) specified by the environment variable `SSL_CERT_FILE` (resp. `SSL_CERT_DIR`).
--   cipherList (default: `ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH`) - Supported OpenSSL encryptions.
--   cacheSessions (default: false) – Enables or disables caching sessions. Must be used in combination with `sessionIdContext`. Acceptable values: `true`, `false`.
--   sessionIdContext (default: `${application.name}`) – A unique set of random characters that the server appends to each generated identifier. The length of the string must not exceed `SSL_MAX_SSL_SESSION_ID_LENGTH`. This parameter is always recommended since it helps avoid problems both if the server caches the session and if the client requested caching. Default value: `${application.name}`.
--   sessionCacheSize (default: [1024\*20](https://github.com/ClickHouse/boringssl/blob/master/include/openssl/ssl.h#L1978)) – The maximum number of sessions that the server caches. A value of 0 means unlimited sessions.
--   sessionTimeout (default: [2h](https://github.com/ClickHouse/boringssl/blob/master/include/openssl/ssl.h#L1926)) – Time for caching the session on the server.
--   extendedVerification (default: false) – If enabled, verify that the certificate CN or SAN matches the peer hostname.
--   requireTLSv1 (default: false) – Require a TLSv1 connection. Acceptable values: `true`, `false`.
--   requireTLSv1_1 (default: false) – Require a TLSv1.1 connection. Acceptable values: `true`, `false`.
--   requireTLSv1_2 (default: false) – Require a TLSv1.2 connection. Acceptable values: `true`, `false`.
--   fips (default: false) – Activates OpenSSL FIPS mode. Supported if the library’s OpenSSL version supports FIPS.
--   privateKeyPassphraseHandler (default: `KeyConsoleHandler`)– Class (PrivateKeyPassphraseHandler subclass) that requests the passphrase for accessing the private key. For example: `<privateKeyPassphraseHandler>`, `<name>KeyFileHandler</name>`, `<options><password>test</password></options>`, `</privateKeyPassphraseHandler>`.
--   invalidCertificateHandler (default: `ConsoleCertificateHandler`) – Class (a subclass of CertificateHandler) for verifying invalid certificates. For example: `<invalidCertificateHandler> <name>ConsoleCertificateHandler</name> </invalidCertificateHandler>` .
--   disableProtocols (default: "") – Protocols that are not allowed to use.
--   preferServerCiphers (default: false) – Preferred server ciphers on the client.
+- privateKeyFile – The path to the file with the secret key of the PEM certificate. The file may contain a key and certificate at the same time.
+- certificateFile – The path to the client/server certificate file in PEM format. You can omit it if `privateKeyFile` contains the certificate.
+- caConfig (default: none) – The path to the file or directory that contains trusted CA certificates. If this points to a file, it must be in PEM format and can contain several CA certificates. If this points to a directory, it must contain one .pem file per CA certificate. The filenames are looked up by the CA subject name hash value. Details can be found in the man page of [SSL_CTX_load_verify_locations](https://www.openssl.org/docs/man3.0/man3/SSL_CTX_load_verify_locations.html).
+- verificationMode (default: relaxed) – The method for checking the node’s certificates. Details are in the description of the [Context](https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/Context.h) class. Possible values: `none`, `relaxed`, `strict`, `once`.
+- verificationDepth (default: 9) – The maximum length of the verification chain. Verification will fail if the certificate chain length exceeds the set value.
+- loadDefaultCAFile (default: true) – Wether built-in CA certificates for OpenSSL will be used. ClickHouse assumes that builtin CA certificates are in the file `/etc/ssl/cert.pem` (resp. the directory `/etc/ssl/certs`) or in file (resp. directory) specified by the environment variable `SSL_CERT_FILE` (resp. `SSL_CERT_DIR`).
+- cipherList (default: `ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH`) - Supported OpenSSL encryptions.
+- cacheSessions (default: false) – Enables or disables caching sessions. Must be used in combination with `sessionIdContext`. Acceptable values: `true`, `false`.
+- sessionIdContext (default: `${application.name}`) – A unique set of random characters that the server appends to each generated identifier. The length of the string must not exceed `SSL_MAX_SSL_SESSION_ID_LENGTH`. This parameter is always recommended since it helps avoid problems both if the server caches the session and if the client requested caching. Default value: `${application.name}`.
+- sessionCacheSize (default: [1024\*20](https://github.com/ClickHouse/boringssl/blob/master/include/openssl/ssl.h#L1978)) – The maximum number of sessions that the server caches. A value of 0 means unlimited sessions.
+- sessionTimeout (default: [2h](https://github.com/ClickHouse/boringssl/blob/master/include/openssl/ssl.h#L1926)) – Time for caching the session on the server.
+- extendedVerification (default: false) – If enabled, verify that the certificate CN or SAN matches the peer hostname.
+- requireTLSv1 (default: false) – Require a TLSv1 connection. Acceptable values: `true`, `false`.
+- requireTLSv1_1 (default: false) – Require a TLSv1.1 connection. Acceptable values: `true`, `false`.
+- requireTLSv1_2 (default: false) – Require a TLSv1.2 connection. Acceptable values: `true`, `false`.
+- fips (default: false) – Activates OpenSSL FIPS mode. Supported if the library’s OpenSSL version supports FIPS.
+- privateKeyPassphraseHandler (default: `KeyConsoleHandler`)– Class (PrivateKeyPassphraseHandler subclass) that requests the passphrase for accessing the private key. For example: `<privateKeyPassphraseHandler>`, `<name>KeyFileHandler</name>`, `<options><password>test</password></options>`, `</privateKeyPassphraseHandler>`.
+- invalidCertificateHandler (default: `ConsoleCertificateHandler`) – Class (a subclass of CertificateHandler) for verifying invalid certificates. For example: `<invalidCertificateHandler> <name>ConsoleCertificateHandler</name> </invalidCertificateHandler>` .
+- disableProtocols (default: "") – Protocols that are not allowed to use.
+- preferServerCiphers (default: false) – Preferred server ciphers on the client.
 
 **Example of settings:**
 
@@ -1206,12 +1341,14 @@ Queries are logged in the [system.part_log](../../operations/system-tables/part_
 
 Use the following parameters to configure logging:
 
--   `database` – Name of the database.
--   `table` – Name of the system table.
--   `partition_by` — [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
--   `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` defined.
--   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
--   `storage_policy` – Name of storage policy to use for the table (optional)
+- `database` - Name of the database.
+- `table` - Name of the system table.
+- `partition_by` - [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
+- `order_by` - [Custom sorting key](../../engines/table-engines/mergetree-family/mergetree.md#order_by) for a system table. Can't be used if `engine` defined.
+- `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` or `order_by` defined.
+- `flush_interval_milliseconds` - Interval for flushing data from the buffer in memory to the table.
+- `storage_policy` - Name of storage policy to use for the table (optional).
+- `settings` - [Additional parameters](../../engines/table-engines/mergetree-family/mergetree#settings) that control the behavior of the MergeTree (optional).
 
 **Example**
 
@@ -1238,28 +1375,40 @@ The trailing slash is mandatory.
 <path>/var/lib/clickhouse/</path>
 ```
 
-## prometheus {#server_configuration_parameters-prometheus}
+## Prometheus {#server_configuration_parameters-prometheus}
 
 Exposing metrics data for scraping from [Prometheus](https://prometheus.io).
 
 Settings:
 
--   `endpoint` – HTTP endpoint for scraping metrics by prometheus server. Start from ‘/’.
--   `port` – Port for `endpoint`.
--   `metrics` – Flag that sets to expose metrics from the [system.metrics](../../operations/system-tables/metrics.md#system_tables-metrics) table.
--   `events` – Flag that sets to expose metrics from the [system.events](../../operations/system-tables/events.md#system_tables-events) table.
--   `asynchronous_metrics` – Flag that sets to expose current metrics values from the [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) table.
+- `endpoint` – HTTP endpoint for scraping metrics by prometheus server. Start from ‘/’.
+- `port` – Port for `endpoint`.
+- `metrics` – Flag that sets to expose metrics from the [system.metrics](../../operations/system-tables/metrics.md#system_tables-metrics) table.
+- `events` – Flag that sets to expose metrics from the [system.events](../../operations/system-tables/events.md#system_tables-events) table.
+- `asynchronous_metrics` – Flag that sets to expose current metrics values from the [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) table.
 
 **Example**
 
 ``` xml
- <prometheus>
+<clickhouse>
+    <listen_host>0.0.0.0</listen_host>
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <!-- highlight-start -->
+    <prometheus>
         <endpoint>/metrics</endpoint>
-        <port>8001</port>
+        <port>9363</port>
         <metrics>true</metrics>
         <events>true</events>
         <asynchronous_metrics>true</asynchronous_metrics>
     </prometheus>
+    <!-- highlight-end -->
+</clickhouse>
+```
+
+Check (replace `127.0.0.1` with the IP addr or hostname of your ClickHouse server):
+```bash
+curl 127.0.0.1:9363/metrics
 ```
 
 ## query_log {#server_configuration_parameters-query-log}
@@ -1270,12 +1419,14 @@ Queries are logged in the [system.query_log](../../operations/system-tables/quer
 
 Use the following parameters to configure logging:
 
--   `database` – Name of the database.
--   `table` – Name of the system table the queries will be logged in.
--   `partition_by` — [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
--   `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` defined.
--   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
--   `storage_policy` – Name of storage policy to use for the table (optional)
+- `database` - Name of the database.
+- `table` - Name of the system table the queries will be logged in.
+- `partition_by` - [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
+- `order_by` - [Custom sorting key](../../engines/table-engines/mergetree-family/mergetree.md#order_by) for a system table. Can't be used if `engine` defined.
+- `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` or `order_by` defined.
+- `flush_interval_milliseconds` - Interval for flushing data from the buffer in memory to the table.
+- `storage_policy` - Name of storage policy to use for the table (optional).
+- `settings` - [Additional parameters](../../engines/table-engines/mergetree-family/mergetree#settings) that control the behavior of the MergeTree (optional).
 
 If the table does not exist, ClickHouse will create it. If the structure of the query log changed when the ClickHouse server was updated, the table with the old structure is renamed, and a new table is created automatically.
 
@@ -1296,25 +1447,25 @@ If the table does not exist, ClickHouse will create it. If the structure of the
 
 The following settings are available:
 
--   `size`: The maximum cache size in bytes. 0 means the query cache is disabled. Default value: `1073741824` (1 GiB).
--   `max_entries`: The maximum number of `SELECT` query results stored in the cache. Default value: `1024`.
--   `max_entry_size`: The maximum size in bytes `SELECT` query results may have to be saved in the cache. Default value: `1048576` (1 MiB).
--   `max_entry_rows`: The maximum number of rows `SELECT` query results may have to be saved in the cache. Default value: `30000000` (30 mil).
+- `max_size_in_bytes`: The maximum cache size in bytes. 0 means the query cache is disabled. Default value: `1073741824` (1 GiB).
+- `max_entries`: The maximum number of `SELECT` query results stored in the cache. Default value: `1024`.
+- `max_entry_size_in_bytes`: The maximum size in bytes `SELECT` query results may have to be saved in the cache. Default value: `1048576` (1 MiB).
+- `max_entry_size_in_rows`: The maximum number of rows `SELECT` query results may have to be saved in the cache. Default value: `30000000` (30 mil).
 
 Changed settings take effect immediately.
 
-:::warning
-Data for the query cache is allocated in DRAM. If memory is scarce, make sure to set a small value for `size` or disable the query cache altogether.
+:::note
+Data for the query cache is allocated in DRAM. If memory is scarce, make sure to set a small value for `max_size_in_bytes` or disable the query cache altogether.
 :::
 
 **Example**
 
 ```xml
 <query_cache>
-    <size>1073741824</size>
+    <max_size_in_bytes>1073741824</max_size_in_bytes>
     <max_entries>1024</max_entries>
-    <max_entry_size>1048576</max_entry_size>
-    <max_entry_rows>30000000</max_entry_rows>
+    <max_entry_size_in_bytes>1048576</max_entry_size_in_bytes>
+    <max_entry_size_in_rows>30000000</max_entry_size_in_rows>
 </query_cache>
 ```
 
@@ -1326,12 +1477,14 @@ Queries are logged in the [system.query_thread_log](../../operations/system-tabl
 
 Use the following parameters to configure logging:
 
--   `database` – Name of the database.
--   `table` – Name of the system table the queries will be logged in.
--   `partition_by` — [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
--   `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` defined.
--   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
--   `storage_policy` – Name of storage policy to use for the table (optional)
+- `database` - Name of the database.
+- `table` - Name of the system table the queries will be logged in.
+- `partition_by` - [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
+- `order_by` - [Custom sorting key](../../engines/table-engines/mergetree-family/mergetree.md#order_by) for a system table. Can't be used if `engine` defined.
+- `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` or `order_by` defined.
+- `flush_interval_milliseconds` - Interval for flushing data from the buffer in memory to the table.
+- `storage_policy` - Name of storage policy to use for the table (optional).
+- `settings` - [Additional parameters](../../engines/table-engines/mergetree-family/mergetree#settings) that control the behavior of the MergeTree (optional).
 
 If the table does not exist, ClickHouse will create it. If the structure of the query thread log changed when the ClickHouse server was updated, the table with the old structure is renamed, and a new table is created automatically.
 
@@ -1354,12 +1507,14 @@ Queries are logged in the [system.query_views_log](../../operations/system-table
 
 Use the following parameters to configure logging:
 
--   `database` – Name of the database.
--   `table` – Name of the system table the queries will be logged in.
--   `partition_by` — [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
--   `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` defined.
--   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
--   `storage_policy` – Name of storage policy to use for the table (optional)
+- `database` - Name of the database.
+- `table` - Name of the system table the queries will be logged in.
+- `partition_by` - [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
+- `order_by` - [Custom sorting key](../../engines/table-engines/mergetree-family/mergetree.md#order_by) for a system table. Can't be used if `engine` defined.
+- `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` or `order_by` defined.
+- `flush_interval_milliseconds` - Interval for flushing data from the buffer in memory to the table.
+- `storage_policy` - Name of storage policy to use for the table (optional).
+- `settings` - [Additional parameters](../../engines/table-engines/mergetree-family/mergetree#settings) that control the behavior of the MergeTree (optional).
 
 If the table does not exist, ClickHouse will create it. If the structure of the query views log changed when the ClickHouse server was updated, the table with the old structure is renamed, and a new table is created automatically.
 
@@ -1380,13 +1535,15 @@ Settings for the [text_log](../../operations/system-tables/text_log.md#system_ta
 
 Parameters:
 
--   `level` — Maximum Message Level (by default `Trace`) which will be stored in a table.
--   `database` — Database name.
--   `table` — Table name.
--   `partition_by` — [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
--   `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` defined.
--   `flush_interval_milliseconds` — Interval for flushing data from the buffer in memory to the table.
--   `storage_policy` – Name of storage policy to use for the table (optional)
+- `level` - Maximum Message Level (by default `Trace`) which will be stored in a table.
+- `database` - Database name.
+- `table` - Table name.
+- `partition_by` - [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
+- `order_by` - [Custom sorting key](../../engines/table-engines/mergetree-family/mergetree.md#order_by) for a system table. Can't be used if `engine` defined.
+- `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` or `order_by` defined.
+- `flush_interval_milliseconds` - Interval for flushing data from the buffer in memory to the table.
+- `storage_policy` - Name of storage policy to use for the table (optional).
+- `settings` - [Additional parameters](../../engines/table-engines/mergetree-family/mergetree#settings) that control the behavior of the MergeTree (optional).
 
 **Example**
 ```xml
@@ -1409,12 +1566,14 @@ Settings for the [trace_log](../../operations/system-tables/trace_log.md#system_
 
 Parameters:
 
--   `database` — Database for storing a table.
--   `table` — Table name.
--   `partition_by` — [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
--   `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/index.md) for a system table. Can't be used if `partition_by` defined.
--   `flush_interval_milliseconds` — Interval for flushing data from the buffer in memory to the table.
--   `storage_policy` – Name of storage policy to use for the table (optional)
+- `database` - Database for storing a table.
+- `table` - Table name.
+- `partition_by` - [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
+- `order_by` - [Custom sorting key](../../engines/table-engines/mergetree-family/mergetree.md#order_by) for a system table. Can't be used if `engine` defined.
+- `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/index.md) for a system table. Can't be used if `partition_by` or `order_by` defined.
+- `flush_interval_milliseconds` - Interval for flushing data from the buffer in memory to the table.
+- `storage_policy` - Name of storage policy to use for the table (optional).
+- `settings` - [Additional parameters](../../engines/table-engines/mergetree-family/mergetree#settings) that control the behavior of the MergeTree (optional).
 
 The default server configuration file `config.xml` contains the following settings section:
 
@@ -1471,7 +1630,7 @@ For the value of the `incl` attribute, see the section “[Configuration files](
 
 **See Also**
 
--   [skip_unavailable_shards](../../operations/settings/settings.md#settings-skip_unavailable_shards)
+- [skip_unavailable_shards](../../operations/settings/settings.md#settings-skip_unavailable_shards)
 
 ## timezone {#server_configuration_parameters-timezone}
 
@@ -1645,11 +1804,11 @@ Default value: `0`.
 
 **See also**
 
--   [max_temporary_data_on_disk_size_for_user](../../operations/settings/query-complexity.md#settings_max_temporary_data_on_disk_size_for_user)
--   [max_temporary_data_on_disk_size_for_query](../../operations/settings/query-complexity.md#settings_max_temporary_data_on_disk_size_for_query)
--   [tmp_path](#tmp-path)
--   [tmp_policy](#tmp-policy)
--   [max_server_memory_usage](#max_server_memory_usage)
+- [max_temporary_data_on_disk_size_for_user](../../operations/settings/query-complexity.md#settings_max_temporary_data_on_disk_size_for_user)
+- [max_temporary_data_on_disk_size_for_query](../../operations/settings/query-complexity.md#settings_max_temporary_data_on_disk_size_for_query)
+- [tmp_path](#tmp-path)
+- [tmp_policy](#tmp-policy)
+- [max_server_memory_usage](#max_server_memory_usage)
 
 ## uncompressed_cache_size {#server-settings-uncompressed_cache_size}
 
@@ -1699,10 +1858,10 @@ The directory with user defined files. Used for SQL user defined functions [SQL
 
 Path to the file that contains:
 
--   User configurations.
--   Access rights.
--   Settings profiles.
--   Quota settings.
+- User configurations.
+- Access rights.
+- Settings profiles.
+- Quota settings.
 
 **Example**
 
@@ -1718,7 +1877,7 @@ ClickHouse uses ZooKeeper for storing metadata of replicas when using replicated
 
 This section contains the following parameters:
 
--   `node` — ZooKeeper endpoint. You can set multiple endpoints.
+- `node` — ZooKeeper endpoint. You can set multiple endpoints.
 
     For example:
 
@@ -1761,9 +1920,9 @@ This section contains the following parameters:
 
 **See Also**
 
--   [Replication](../../engines/table-engines/mergetree-family/replication.md)
--   [ZooKeeper Programmer’s Guide](http://zookeeper.apache.org/doc/current/zookeeperProgrammers.html)
--   [Optional secured communication between ClickHouse and Zookeeper](../ssl-zookeeper.md#secured-communication-with-zookeeper)
+- [Replication](../../engines/table-engines/mergetree-family/replication.md)
+- [ZooKeeper Programmer’s Guide](http://zookeeper.apache.org/doc/current/zookeeperProgrammers.html)
+- [Optional secured communication between ClickHouse and Zookeeper](../ssl-zookeeper.md#secured-communication-with-zookeeper)
 
 ## use_minimalistic_part_header_in_zookeeper {#server-settings-use_minimalistic_part_header_in_zookeeper}
 
@@ -1771,18 +1930,18 @@ Storage method for data part headers in ZooKeeper.
 
 This setting only applies to the `MergeTree` family. It can be specified:
 
--   Globally in the [merge_tree](#server_configuration_parameters-merge_tree) section of the `config.xml` file.
+- Globally in the [merge_tree](#server_configuration_parameters-merge_tree) section of the `config.xml` file.
 
     ClickHouse uses the setting for all the tables on the server. You can change the setting at any time. Existing tables change their behaviour when the setting changes.
 
--   For each table.
+- For each table.
 
     When creating a table, specify the corresponding [engine setting](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table). The behaviour of an existing table with this setting does not change, even if the global setting changes.
 
 **Possible values**
 
--   0 — Functionality is turned off.
--   1 — Functionality is turned on.
+- 0 — Functionality is turned off.
+- 1 — Functionality is turned on.
 
 If `use_minimalistic_part_header_in_zookeeper = 1`, then [replicated](../../engines/table-engines/mergetree-family/replication.md) tables store the headers of the data parts compactly using a single `znode`. If the table contains many columns, this storage method significantly reduces the volume of the data stored in Zookeeper.
 
@@ -1810,13 +1969,23 @@ The update is performed asynchronously, in a separate system thread.
 
 **See also**
 
--   [background_schedule_pool_size](../../operations/settings/settings.md#background_schedule_pool_size)
+- [background_schedule_pool_size](../../operations/settings/settings.md#background_schedule_pool_size)
 
 ## distributed_ddl {#server-settings-distributed_ddl}
 
 Manage executing [distributed ddl queries](../../sql-reference/distributed-ddl.md)  (CREATE, DROP, ALTER, RENAME) on cluster.
 Works only if [ZooKeeper](#server-settings_zookeeper) is enabled.
 
+The configurable settings within `<distributed_ddl>` include:
+
+- **path**: the path in Keeper for the `task_queue` for DDL queries
+- **profile**: the profile used to execute the DDL queries
+- **pool_size**: how many `ON CLUSTER` queries can be run simultaneously
+- **max_tasks_in_queue**: the maximum number of tasks that can be in the queue. Default is 1,000
+- **task_max_lifetime**: delete node if its age is greater than this value. Default is `7 * 24 * 60 * 60` (a week in seconds)
+- **cleanup_delay_period**:  cleaning starts after new node event is received if the last cleaning wasn't made sooner than `cleanup_delay_period` seconds ago. Default is 60 seconds
+
+
 **Example**
 
 ```xml
@@ -1853,14 +2022,14 @@ Default value: `/var/lib/clickhouse/access/`.
 
 **See also**
 
-- [Access Control and Account Management](../../operations/access-rights.md#access-control)
+- [Access Control and Account Management](../../guides/sre/user-management/index.md#access-control)
 
 ## user_directories {#user_directories}
 
 Section of the configuration file that contains settings:
--   Path to configuration file with predefined users.
--   Path to folder where users created by SQL commands are stored.
--   ZooKeeper node path where users created by SQL commands are stored and replicated (experimental).
+- Path to configuration file with predefined users.
+- Path to folder where users created by SQL commands are stored.
+- ZooKeeper node path where users created by SQL commands are stored and replicated (experimental).
 
 If this section is specified, the path from [users_config](../../operations/server-configuration-parameters/settings.md#users-config) and [access_control_path](../../operations/server-configuration-parameters/settings.md#access_control_path) won't be used.
 
@@ -1895,8 +2064,8 @@ Users, roles, row policies, quotas, and profiles can be also stored in ZooKeeper
 You can also define sections `memory` — means storing information only in memory, without writing to disk, and `ldap` — means storing information on an LDAP server.
 
 To add an LDAP server as a remote user directory of users that are not defined locally, define a single `ldap` section with a following parameters:
--   `server` — one of LDAP server names defined in `ldap_servers` config section. This parameter is mandatory and cannot be empty.
--   `roles` — section with a list of locally defined roles that will be assigned to each user retrieved from the LDAP server. If no roles are specified, user will not be able to perform any actions after authentication. If any of the listed roles is not defined locally at the time of authentication, the authentication attempt will fail as if the provided password was incorrect.
+- `server` — one of LDAP server names defined in `ldap_servers` config section. This parameter is mandatory and cannot be empty.
+- `roles` — section with a list of locally defined roles that will be assigned to each user retrieved from the LDAP server. If no roles are specified, user will not be able to perform any actions after authentication. If any of the listed roles is not defined locally at the time of authentication, the authentication attempt will fail as if the provided password was incorrect.
 
 **Example**
 
@@ -1916,7 +2085,7 @@ Sets the memory size (in bytes) for a stack trace at every peak allocation step.
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `4194304`.
 
@@ -1926,8 +2095,8 @@ Allows to collect random allocations and deallocations and writes them in the [s
 
 Possible values:
 
--   Positive integer.
--   0 — Writing of random allocations and deallocations in the `system.trace_log` system table is disabled.
+- Positive integer.
+- 0 — Writing of random allocations and deallocations in the `system.trace_log` system table is disabled.
 
 Default value: `0`.
 
@@ -1937,7 +2106,7 @@ Sets the cache size (in bytes) for mapped files. This setting allows to avoid fr
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `1000`.
 
@@ -1947,7 +2116,7 @@ Sets the cache size (in bytes) for [compiled expressions](../../operations/cache
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `134217728`.
 
@@ -1957,6 +2126,23 @@ Sets the cache size (in elements) for [compiled expressions](../../operations/ca
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `10000`.
+
+## display_secrets_in_show_and_select {#display_secrets_in_show_and_select}
+
+Enables or disables showing secrets in `SHOW` and `SELECT` queries for tables, databases,
+table functions, and dictionaries.
+
+User wishing to see secrets must also have
+[`format_display_secrets_in_show_and_select` format setting](../settings/formats#format_display_secrets_in_show_and_select)
+turned on and a
+[`displaySecretsInShowAndSelect`](../../sql-reference/statements/grant#grant-display-secrets) privilege.
+
+Possible values:
+
+-   0 — Disabled.
+-   1 — Enabled.
+
+Default value: 0.
diff --git a/docs/en/operations/settings/constraints-on-settings.md b/docs/en/operations/settings/constraints-on-settings.md
index 83ef46053a4..1895a79cd3e 100644
--- a/docs/en/operations/settings/constraints-on-settings.md
+++ b/docs/en/operations/settings/constraints-on-settings.md
@@ -40,7 +40,7 @@ If the user tries to violate the constraints an exception is thrown and the sett
 There are supported few types of constraints: `min`, `max`, `readonly` (with alias `const`) and `changeable_in_readonly`. The `min` and `max` constraints specify upper and lower boundaries for a numeric setting and can be used in combination. The `readonly` or `const` constraint specifies that the user cannot change the corresponding setting at all. The `changeable_in_readonly` constraint type allows user to change the setting within `min`/`max` range even if `readonly` setting is set to 1, otherwise settings are not allow to be changed in `readonly=1` mode. Note that `changeable_in_readonly` is supported only if `settings_constraints_replace_previous` is enabled:
 ``` xml
 <access_control_improvements>
-  <settings_constraints_replace_previous>true<settings_constraints_replace_previous>
+  <settings_constraints_replace_previous>true</settings_constraints_replace_previous>
 </access_control_improvements>
 ```
 
diff --git a/docs/en/operations/settings/index.md b/docs/en/operations/settings/index.md
index fae282c861f..eb1d5db5676 100644
--- a/docs/en/operations/settings/index.md
+++ b/docs/en/operations/settings/index.md
@@ -22,9 +22,9 @@ The order of priority for defining a setting is:
 
 3. Query settings
 
-    -   When starting the ClickHouse console client in non-interactive mode, set the startup parameter `--setting=value`.
-    -   When using the HTTP API, pass CGI parameters (`URL?setting_1=value&setting_2=value...`).
-    -   Define settings in the [SETTINGS](../../sql-reference/statements/select/index.md#settings-in-select-query) clause of the SELECT query. The setting value is applied only to that query and is reset to the default or previous value after the query is executed.
+    - When starting the ClickHouse console client in non-interactive mode, set the startup parameter `--setting=value`.
+    - When using the HTTP API, pass CGI parameters (`URL?setting_1=value&setting_2=value...`).
+    - Define settings in the [SETTINGS](../../sql-reference/statements/select/index.md#settings-in-select-query) clause of the SELECT query. The setting value is applied only to that query and is reset to the default or previous value after the query is executed.
 
 View the [Settings](./settings.md) page for a description of the ClickHouse settings.
 
@@ -93,4 +93,4 @@ SELECT getSetting('custom_a');
 
 **See Also**
 
--   [Server Configuration Settings](../../operations/server-configuration-parameters/settings.md)
+- [Server Configuration Settings](../../operations/server-configuration-parameters/settings.md)
diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index 5bc174727ad..0b1207ee7b6 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -13,7 +13,7 @@ If the number of broken parts in a single partition exceeds the `max_suspicious_
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 100.
 
@@ -54,7 +54,7 @@ If the number of active parts in a single partition exceeds the `parts_to_throw_
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 300.
 
@@ -69,7 +69,7 @@ If the number of active parts in a single partition exceeds the `parts_to_delay_
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 150.
 
@@ -81,7 +81,7 @@ If the number of inactive parts in a single partition more than the `inactive_pa
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 0 (unlimited).
 
@@ -91,7 +91,7 @@ If the number of inactive parts in a single partition in the table at least that
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 0 (unlimited).
 
@@ -101,7 +101,7 @@ The value in seconds, which is used to calculate the `INSERT` delay, if the numb
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 1.
 
@@ -127,7 +127,7 @@ If the total number of active parts in all partitions of a table exceeds the `ma
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 100000.
 
@@ -146,8 +146,8 @@ The number of most recently inserted blocks for which ClickHouse Keeper stores h
 
 Possible values:
 
--   Any positive integer.
--   0 (disable deduplication)
+- Any positive integer.
+- 0 (disable deduplication)
 
 Default value: 100.
 
@@ -161,8 +161,8 @@ The number of the most recently inserted blocks in the non-replicated [MergeTree
 
 Possible values:
 
--   Any positive integer.
--   0 (disable deduplication).
+- Any positive integer.
+- 0 (disable deduplication).
 
 Default value: 0.
 
@@ -174,7 +174,7 @@ The number of seconds after which the hash sums of the inserted blocks are remov
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 604800 (1 week).
 
@@ -188,8 +188,8 @@ The number of most recently async inserted blocks for which ClickHouse Keeper st
 
 Possible values:
 
--   Any positive integer.
--   0 (disable deduplication for async_inserts)
+- Any positive integer.
+- 0 (disable deduplication for async_inserts)
 
 Default value: 10000.
 
@@ -203,7 +203,7 @@ The number of seconds after which the hash sums of the async inserts are removed
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 604800 (1 week).
 
@@ -229,7 +229,7 @@ The minimum interval (in milliseconds) to update the `use_async_block_ids_cache`
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 100.
 
@@ -241,7 +241,7 @@ How many records may be in the ClickHouse Keeper log if there is inactive replic
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 1000
 
@@ -251,7 +251,7 @@ Keep about this number of last records in ZooKeeper log, even if they are obsole
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 10
 
@@ -261,7 +261,7 @@ If the time passed since a replication log (ClickHouse Keeper or ZooKeeper) entr
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 3600
 
@@ -271,7 +271,7 @@ If the sum of the size of parts exceeds this threshold and the time since a repl
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 10,737,418,240
 
@@ -281,7 +281,7 @@ When this setting has a value greater than zero, only a single replica starts th
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 0 (seconds)
 
@@ -289,13 +289,13 @@ Default value: 0 (seconds)
 
 When this setting has a value greater than than zero only a single replica starts the merge immediately if merged part on shared storage and `allow_remote_fs_zero_copy_replication` is enabled.
 
-:::warning Zero-copy replication is not ready for production
+:::note Zero-copy replication is not ready for production
 Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
 :::
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 10800
 
@@ -305,7 +305,7 @@ Recompression works slow in most cases, so we don't start merge with recompressi
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 7200
 
@@ -315,7 +315,7 @@ If true, this replica never merges parts and always downloads merged parts from
 
 Possible values:
 
--   true, false
+- true, false
 
 Default value: false
 
@@ -325,7 +325,7 @@ Max broken parts, if more - deny automatic deletion.
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 100
 
@@ -336,7 +336,7 @@ Max size of all broken parts, if more - deny automatic deletion.
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 1,073,741,824
 
@@ -346,7 +346,7 @@ Do not apply ALTER if number of files for modification(deletion, addition) is gr
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 75
 
@@ -356,7 +356,7 @@ Do not apply ALTER, if the number of files for deletion is greater than this set
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 50
 
@@ -366,7 +366,7 @@ If the ratio of wrong parts to total number of parts is less than this - allow t
 
 Possible values:
 
--   Float, 0.0 - 1.0
+- Float, 0.0 - 1.0
 
 Default value: 0.5
 
@@ -376,7 +376,7 @@ Limit parallel fetches from endpoint (actually pool size).
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 15
 
@@ -386,7 +386,7 @@ HTTP connection timeout for part fetch requests. Inherited from default profile
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: Inherited from default profile `http_connection_timeout` if not set explicitly.
 
@@ -396,7 +396,7 @@ If true, replicated tables replicas on this node will try to acquire leadership.
 
 Possible values:
 
--   true, false
+- true, false
 
 Default value: true
 
@@ -406,7 +406,7 @@ ZooKeeper session expiration check period, in seconds.
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 60
 
@@ -416,7 +416,7 @@ Do not remove old local parts when repairing lost replica.
 
 Possible values:
 
--   true, false
+- true, false
 
 Default value: true
 
@@ -426,8 +426,8 @@ HTTP connection timeout (in seconds) for part fetch requests. Inherited from def
 
 Possible values:
 
--   Any positive integer.
--   0 - Use value of `http_connection_timeout`.
+- Any positive integer.
+- 0 - Use value of `http_connection_timeout`.
 
 Default value: 0.
 
@@ -437,8 +437,8 @@ HTTP send timeout (in seconds) for part fetch requests. Inherited from default p
 
 Possible values:
 
--   Any positive integer.
--   0 - Use value of `http_send_timeout`.
+- Any positive integer.
+- 0 - Use value of `http_send_timeout`.
 
 Default value: 0.
 
@@ -448,8 +448,8 @@ HTTP receive timeout (in seconds) for fetch part requests. Inherited from defaul
 
 Possible values:
 
--   Any positive integer.
--   0 - Use value of `http_receive_timeout`.
+- Any positive integer.
+- 0 - Use value of `http_receive_timeout`.
 
 Default value: 0.
 
@@ -463,8 +463,8 @@ The setting isn't followed perfectly accurately.
 
 Possible values:
 
--   Positive integer.
--   0 — Unlimited.
+- Positive integer.
+- 0 — Unlimited.
 
 Default value: `0`.
 
@@ -482,8 +482,8 @@ The setting isn't followed perfectly accurately.
 
 Possible values:
 
--   Positive integer.
--   0 — Unlimited.
+- Positive integer.
+- 0 — Unlimited.
 
 Default value: `0`.
 
@@ -497,7 +497,7 @@ The time (in seconds) of storing inactive parts to protect against data loss dur
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 480.
 
@@ -520,7 +520,7 @@ The maximum total parts size (in bytes) to be merged into one part, if there are
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 161061273600 (150 GB).
 
@@ -534,7 +534,7 @@ The maximum total part size (in bytes) to be merged into one part, with the mini
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 1048576 (1 MB)
 
@@ -547,19 +547,45 @@ The number of rows that are read from the merged parts into memory.
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 8192
 
 Merge reads rows from parts in blocks of `merge_max_block_size` rows, then merges and writes the result into a new part. The read block is placed in RAM, so `merge_max_block_size` affects the size of the RAM required for the merge. Thus, merges can consume a large amount of RAM for tables with very wide rows (if the average row size is 100kb, then when merging 10 parts, (100kb * 10 * 8192) = ~ 8GB of RAM). By decreasing `merge_max_block_size`, you can reduce the amount of RAM required for a merge but slow down a merge.
 
+## number_of_free_entries_in_pool_to_lower_max_size_of_merge {#number-of-free-entries-in-pool-to-lower-max-size-of-merge}
+
+When there is less than specified number of free entries in pool (or replicated queue), start to lower maximum size of merge to process (or to put in queue). 
+This is to allow small merges to process - not filling the pool with long running merges.
+
+Possible values:
+
+- Any positive integer.
+
+Default value: 8
+
+## number_of_free_entries_in_pool_to_execute_mutation {#number-of-free-entries-in-pool-to-execute-mutation}
+
+When there is less than specified number of free entries in pool, do not execute part mutations. 
+This is to leave free threads for regular merges and avoid "Too many parts".
+
+Possible values:
+
+- Any positive integer.
+
+Default value: 20
+
+**Usage**
+
+The value of the `number_of_free_entries_in_pool_to_execute_mutation` setting should be less than the value of the [background_pool_size](/docs/en/operations/server-configuration-parameters/settings#background_pool_size) * [background_pool_size](/docs/en/operations/server-configuration-parameters/settings#background_merges_mutations_concurrency_ratio). Otherwise, ClickHouse throws an exception.
+
 ## max_part_loading_threads {#max-part-loading-threads}
 
 The maximum number of threads that read parts when ClickHouse starts.
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: auto (number of CPU cores).
 
@@ -573,7 +599,7 @@ The setting value specified when the table is created can be overridden via quer
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: -1 (unlimited).
 
@@ -583,7 +609,7 @@ Merge parts if every part in the range is older than the value of `min_age_to_fo
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: 0 — Disabled.
 
@@ -593,7 +619,7 @@ Whether `min_age_to_force_merge_seconds` should be applied only on the entire pa
 
 Possible values:
 
--   true, false
+- true, false
 
 Default value: false
 
@@ -603,8 +629,8 @@ Enables to allow floating-point number as a partition key.
 
 Possible values:
 
--   0 — Floating-point partition key not allowed.
--   1 — Floating-point partition key allowed.
+- 0 — Floating-point partition key not allowed.
+- 1 — Floating-point partition key allowed.
 
 Default value: `0`.
 
@@ -614,8 +640,8 @@ Enables the check at table creation, that the data type of a column for sampling
 
 Possible values:
 
--   true  — The check is enabled.
--   false — The check is disabled at table creation.
+- true  — The check is enabled.
+- false — The check is disabled at table creation.
 
 Default value: `true`.
 
@@ -627,8 +653,8 @@ Sets minimal amount of bytes to enable balancing when distributing new big parts
 
 Possible values:
 
--   Positive integer.
--   0 — Balancing is disabled.
+- Positive integer.
+- 0 — Balancing is disabled.
 
 Default value: `0`.
 
@@ -644,8 +670,8 @@ The setting is applicable to `MergeTree` tables with enabled [data replication](
 
 Possible values:
 
--   0 — Parts are removed.
--   1 — Parts are detached.
+- 0 — Parts are removed.
+- 1 — Parts are detached.
 
 Default value: `0`.
 
@@ -655,7 +681,7 @@ Sets the interval in seconds for ClickHouse to execute the cleanup of old tempor
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: `60` seconds.
 
@@ -665,7 +691,7 @@ Sets the interval in seconds for ClickHouse to execute the cleanup of old parts,
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: `1` second.
 
@@ -675,8 +701,8 @@ Max number of concurrently executed queries related to the MergeTree table. Quer
 
 Possible values:
 
--   Positive integer.
--   0 — No limit.
+- Positive integer.
+- 0 — No limit.
 
 Default value: `0` (no limit).
 
@@ -692,8 +718,8 @@ The minimal number of marks read by the query for applying the [max_concurrent_q
 
 Possible values:
 
--   Positive integer.
--   0 — Disabled (`max_concurrent_queries` limit applied to no queries).
+- Positive integer.
+- 0 — Disabled (`max_concurrent_queries` limit applied to no queries).
 
 Default value: `0` (limit never applied).
 
@@ -805,3 +831,13 @@ You can see which parts of `s` were stored using the sparse serialization:
 │ s      │ Sparse             │
 └────────┴────────────────────┘
 ```
+
+## clean_deleted_rows
+
+Enable/disable automatic deletion of rows flagged as `is_deleted` when perform `OPTIMIZE ... FINAL` on a table using the ReplacingMergeTree engine. When disabled, the `CLEANUP` keyword has to be added to the `OPTIMIZE ... FINAL` to have the same behaviour.
+
+Possible values:
+
+- `Always` or `Never`.
+
+Default value: `Never`
\ No newline at end of file
diff --git a/docs/en/operations/settings/permissions-for-queries.md b/docs/en/operations/settings/permissions-for-queries.md
index c565de9b21a..9e9c564d426 100644
--- a/docs/en/operations/settings/permissions-for-queries.md
+++ b/docs/en/operations/settings/permissions-for-queries.md
@@ -21,8 +21,8 @@ Restricts permissions for read data, write data, and change settings queries.
 
 When set to 1, allows:
 
--   All types of read queries (like SELECT and equivalent queries).
--   Queries that modify only session context (like USE).
+- All types of read queries (like SELECT and equivalent queries).
+- Queries that modify only session context (like USE).
 
 When set to 2, allows the above plus:
 - SET and CREATE TEMPORARY TABLE
@@ -33,9 +33,9 @@ When set to 2, allows the above plus:
 
 Possible values:
 
--   0 — Read, Write, and Change settings queries are allowed.
--   1 — Only Read data queries are allowed.
--   2 — Read data and Change settings queries are allowed.
+- 0 — Read, Write, and Change settings queries are allowed.
+- 1 — Only Read data queries are allowed.
+- 2 — Read data and Change settings queries are allowed.
 
 Default value: 0
 
@@ -54,8 +54,8 @@ Allows or denies [DDL](https://en.wikipedia.org/wiki/Data_definition_language) q
 
 Possible values:
 
--   0 — DDL queries are not allowed.
--   1 — DDL queries are allowed.
+- 0 — DDL queries are not allowed.
+- 1 — DDL queries are allowed.
 
 Default value: 1
 
diff --git a/docs/en/operations/settings/query-complexity.md b/docs/en/operations/settings/query-complexity.md
index 7a6b2340d29..163ed5d5826 100644
--- a/docs/en/operations/settings/query-complexity.md
+++ b/docs/en/operations/settings/query-complexity.md
@@ -26,7 +26,7 @@ It can take one of two values: `throw` or `break`. Restrictions on aggregation (
 
 The maximum amount of RAM to use for running a query on a single server.
 
-In the default configuration file, the maximum is 10 GB.
+The default setting is unlimited (set to `0`).
 
 The setting does not consider the volume of available memory or the total volume of memory on the machine.
 The restriction applies to a single query within a single server.
@@ -101,8 +101,8 @@ Enables or disables execution of `GROUP BY` clauses in external memory. See [GRO
 
 Possible values:
 
--   Maximum volume of RAM (in bytes) that can be used by the single [GROUP BY](../../sql-reference/statements/select/group-by.md#select-group-by-clause) operation.
--   0 — `GROUP BY` in external memory disabled.
+- Maximum volume of RAM (in bytes) that can be used by the single [GROUP BY](../../sql-reference/statements/select/group-by.md#select-group-by-clause) operation.
+- 0 — `GROUP BY` in external memory disabled.
 
 Default value: 0.
 
@@ -257,8 +257,8 @@ ClickHouse can proceed with different actions when the limit is reached. Use the
 
 Possible values:
 
--   Positive integer.
--   0 — Unlimited number of rows.
+- Positive integer.
+- 0 — Unlimited number of rows.
 
 Default value: 0.
 
@@ -274,8 +274,8 @@ ClickHouse can proceed with different actions when the limit is reached. Use [jo
 
 Possible values:
 
--   Positive integer.
--   0 — Memory control is disabled.
+- Positive integer.
+- 0 — Memory control is disabled.
 
 Default value: 0.
 
@@ -283,27 +283,27 @@ Default value: 0.
 
 Defines what action ClickHouse performs when any of the following join limits is reached:
 
--   [max_bytes_in_join](#settings-max_bytes_in_join)
--   [max_rows_in_join](#settings-max_rows_in_join)
+- [max_bytes_in_join](#settings-max_bytes_in_join)
+- [max_rows_in_join](#settings-max_rows_in_join)
 
 Possible values:
 
--   `THROW` — ClickHouse throws an exception and breaks operation.
--   `BREAK` — ClickHouse breaks operation and does not throw an exception.
+- `THROW` — ClickHouse throws an exception and breaks operation.
+- `BREAK` — ClickHouse breaks operation and does not throw an exception.
 
 Default value: `THROW`.
 
 **See Also**
 
--   [JOIN clause](../../sql-reference/statements/select/join.md#select-join)
--   [Join table engine](../../engines/table-engines/special/join.md)
+- [JOIN clause](../../sql-reference/statements/select/join.md#select-join)
+- [Join table engine](../../engines/table-engines/special/join.md)
 
 ## max_partitions_per_insert_block {#max-partitions-per-insert-block}
 
 Limits the maximum number of partitions in a single inserted block.
 
--   Positive integer.
--   0 — Unlimited number of partitions.
+- Positive integer.
+- 0 — Unlimited number of partitions.
 
 Default value: 100.
 
diff --git a/docs/en/operations/settings/settings-formats.md b/docs/en/operations/settings/settings-formats.md
index 3580d83f704..3b87b829c92 100644
--- a/docs/en/operations/settings/settings-formats.md
+++ b/docs/en/operations/settings/settings-formats.md
@@ -7,6 +7,23 @@ toc_max_heading_level: 2
 
 # Format settings {#format-settings}
 
+## format_display_secrets_in_show_and_select {#format_display_secrets_in_show_and_select}
+
+Enables or disables showing secrets in `SHOW` and `SELECT` queries for tables, databases,
+table functions, and dictionaries.
+
+User wishing to see secrets must also have
+[`display_secrets_in_show_and_select` server setting](../server-configuration-parameters/settings#display_secrets_in_show_and_select)
+turned on and a
+[`displaySecretsInShowAndSelect`](../../sql-reference/statements/grant#grant-display-secrets) privilege.
+
+Possible values:
+
+-   0 — Disabled.
+-   1 — Enabled.
+
+Default value: 0.
+
 ## input_format_skip_unknown_fields {#input_format_skip_unknown_fields}
 
 Enables or disables skipping insertion of extra data.
@@ -24,8 +41,8 @@ Supported formats:
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
@@ -52,8 +69,8 @@ Supported formats:
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
@@ -72,8 +89,8 @@ Supported formats:
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
@@ -87,8 +104,8 @@ When this option is enabled, extended table metadata are sent from server to cli
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
@@ -103,8 +120,8 @@ For complex default expressions `input_format_defaults_for_omitted_fields` must
 
 Possible values:
 
--   0 — Inserting `NULL` into a not nullable column causes an exception.
--   1 — `NULL` fields are initialized with default column values.
+- 0 — Inserting `NULL` into a not nullable column causes an exception.
+- 1 — `NULL` fields are initialized with default column values.
 
 Default value: `1`.
 
@@ -142,7 +159,7 @@ y	Nullable(String)
 z	IPv4
 ```
 
-:::warning
+:::note
 If the `schema_inference_hints` is not formated properly, or if there is a typo or a wrong datatype, etc... the whole schema_inference_hints will be ignored.
 :::
 
@@ -179,11 +196,11 @@ The setting does not apply to [date and time functions](../../sql-reference/func
 
 Possible values:
 
--   `'best_effort'` — Enables extended parsing.
+- `'best_effort'` — Enables extended parsing.
 
     ClickHouse can parse the basic `YYYY-MM-DD HH:MM:SS` format and all [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) date and time formats. For example, `'2018-06-08T01:02:03.000Z'`.
 
--   `'basic'` — Use basic parser.
+- `'basic'` — Use basic parser.
 
     ClickHouse can parse only the basic `YYYY-MM-DD HH:MM:SS` or `YYYY-MM-DD` format. For example, `2019-08-20 10:18:56` or `2019-08-20`.
 
@@ -191,8 +208,8 @@ Default value: `'basic'`.
 
 See also:
 
--   [DateTime data type.](../../sql-reference/data-types/datetime.md)
--   [Functions for working with dates and times.](../../sql-reference/functions/date-time-functions.md)
+- [DateTime data type.](../../sql-reference/data-types/datetime.md)
+- [Functions for working with dates and times.](../../sql-reference/functions/date-time-functions.md)
 
 ## date_time_output_format {#date_time_output_format}
 
@@ -200,15 +217,15 @@ Allows choosing different output formats of the text representation of date and
 
 Possible values:
 
--   `simple` - Simple output format.
+- `simple` - Simple output format.
 
     ClickHouse output date and time `YYYY-MM-DD hh:mm:ss` format. For example, `2019-08-20 10:18:56`. The calculation is performed according to the data type's time zone (if present) or server time zone.
 
--   `iso` - ISO output format.
+- `iso` - ISO output format.
 
     ClickHouse output date and time in [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) `YYYY-MM-DDThh:mm:ssZ` format. For example, `2019-08-20T10:18:56Z`. Note that output is in UTC (`Z` means UTC).
 
--   `unix_timestamp` - Unix timestamp output format.
+- `unix_timestamp` - Unix timestamp output format.
 
     ClickHouse output date and time in [Unix timestamp](https://en.wikipedia.org/wiki/Unix_time) format. For example `1566285536`.
 
@@ -216,8 +233,8 @@ Default value: `simple`.
 
 See also:
 
--   [DateTime data type.](../../sql-reference/data-types/datetime.md)
--   [Functions for working with dates and times.](../../sql-reference/functions/date-time-functions.md)
+- [DateTime data type.](../../sql-reference/data-types/datetime.md)
+- [Functions for working with dates and times.](../../sql-reference/functions/date-time-functions.md)
 
 ## input_format_ipv4_default_on_conversion_error {#input_format_ipv4_default_on_conversion_error}
 
@@ -298,8 +315,8 @@ By default, when inserting data into a `Distributed` table with more than one sh
 
 Possible values:
 
--   0 — Insertion is rejected if there are multiple shards and no distributed key is given.
--   1 — Insertion is done randomly among all available shards when no distributed key is given.
+- 0 — Insertion is rejected if there are multiple shards and no distributed key is given.
+- 1 — Insertion is done randomly among all available shards when no distributed key is given.
 
 Default value: `0`.
 
@@ -311,18 +328,18 @@ Enables or disables the insertion of JSON data with nested objects.
 
 Supported formats:
 
--   [JSONEachRow](../../interfaces/formats.md/#jsoneachrow)
+- [JSONEachRow](../../interfaces/formats.md/#jsoneachrow)
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0.
 
 See also:
 
--   [Usage of Nested Structures](../../interfaces/formats.md/#jsoneachrow-nested) with the `JSONEachRow` format.
+- [Usage of Nested Structures](../../interfaces/formats.md/#jsoneachrow-nested) with the `JSONEachRow` format.
 
 ## input_format_json_read_bools_as_numbers {#input_format_json_read_bools_as_numbers}
 
@@ -373,8 +390,8 @@ Such integers are enclosed in quotes by default. This behavior is compatible wit
 
 Possible values:
 
--   0 — Integers are output without quotes.
--   1 — Integers are enclosed in quotes.
+- 0 — Integers are output without quotes.
+- 1 — Integers are enclosed in quotes.
 
 Default value: 1.
 
@@ -390,8 +407,8 @@ Enables `+nan`, `-nan`, `+inf`, `-inf` outputs in [JSON](../../interfaces/format
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0.
 
@@ -526,8 +543,8 @@ Enables the ability to output all rows as a JSON array in the [JSONEachRow](../.
 
 Possible values:
 
--   1 — ClickHouse outputs all rows as an array, each row in the `JSONEachRow` format.
--   0 — ClickHouse outputs each row separately in the `JSONEachRow` format.
+- 1 — ClickHouse outputs all rows as an array, each row in the `JSONEachRow` format.
+- 0 — ClickHouse outputs each row separately in the `JSONEachRow` format.
 
 Default value: `0`.
 
@@ -594,8 +611,8 @@ When enabled, always treat enum values as enum ids for TSV input format. It's re
 
 Possible values:
 
--   0 — Enum values are parsed as values or as enum IDs.
--   1 — Enum values are parsed only as enum IDs.
+- 0 — Enum values are parsed as values or as enum IDs.
+- 1 — Enum values are parsed only as enum IDs.
 
 Default value: 0.
 
@@ -743,8 +760,8 @@ When enabled, always treat enum values as enum ids for CSV input format. It's re
 
 Possible values:
 
--   0 — Enum values are parsed as values or as enum IDs.
--   1 — Enum values are parsed only as enum IDs.
+- 0 — Enum values are parsed as values or as enum IDs.
+- 1 — Enum values are parsed only as enum IDs.
 
 Default value: 0.
 
@@ -873,11 +890,11 @@ Enables or disables the full SQL parser if the fast stream parser can’t parse
 
 Possible values:
 
--   0 — Disabled.
+- 0 — Disabled.
 
     In this case, you must provide formatted data. See the [Formats](../../interfaces/formats.md) section.
 
--   1 — Enabled.
+- 1 — Enabled.
 
     In this case, you can use an SQL expression as a value, but data insertion is much slower this way. If you insert only formatted data, then ClickHouse behaves as if the setting value is 0.
 
@@ -923,8 +940,8 @@ Enables or disables template deduction for SQL expressions in [Values](../../int
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
@@ -934,9 +951,9 @@ For the following query:
 INSERT INTO test VALUES (lower('Hello')), (lower('world')), (lower('INSERT')), (upper('Values')), ...
 ```
 
--   If `input_format_values_interpret_expressions=1` and `format_values_deduce_templates_of_expressions=0`, expressions are interpreted separately for each row (this is very slow for large number of rows).
--   If `input_format_values_interpret_expressions=0` and `format_values_deduce_templates_of_expressions=1`, expressions in the first, second and third rows are parsed using template `lower(String)` and interpreted together, expression in the forth row is parsed with another template (`upper(String)`).
--   If `input_format_values_interpret_expressions=1` and `format_values_deduce_templates_of_expressions=1`, the same as in previous case, but also allows fallback to interpreting expressions separately if it’s not possible to deduce template.
+- If `input_format_values_interpret_expressions=1` and `format_values_deduce_templates_of_expressions=0`, expressions are interpreted separately for each row (this is very slow for large number of rows).
+- If `input_format_values_interpret_expressions=0` and `format_values_deduce_templates_of_expressions=1`, expressions in the first, second and third rows are parsed using template `lower(String)` and interpreted together, expression in the forth row is parsed with another template (`upper(String)`).
+- If `input_format_values_interpret_expressions=1` and `format_values_deduce_templates_of_expressions=1`, the same as in previous case, but also allows fallback to interpreting expressions separately if it’s not possible to deduce template.
 
 ### input_format_values_accurate_types_of_literals {#input_format_values_accurate_types_of_literals}
 
@@ -950,11 +967,11 @@ This setting is used only when `input_format_values_deduce_templates_of_expressi
 
 Possible values:
 
--   0 — Disabled.
+- 0 — Disabled.
 
     In this case, ClickHouse may use a more general type for some literals (e.g., `Float64` or `Int64` instead of `UInt64` for `42`), but it may cause overflow and precision issues.
 
--   1 — Enabled.
+- 1 — Enabled.
 
     In this case, ClickHouse checks the actual type of literal and uses an expression template of the corresponding type. In some cases, it may significantly slow down expression evaluation in `Values`.
 
@@ -964,12 +981,12 @@ Default value: 1.
 
 ### input_format_arrow_import_nested {#input_format_arrow_import_nested}
 
-Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs in [Arrow](../../interfaces/formats.md/#data_types-matching-arrow) input format.
+Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/index.md) columns as an array of structs in [Arrow](../../interfaces/formats.md/#data_types-matching-arrow) input format.
 
 Possible values:
 
--   0 — Data can not be inserted into `Nested` columns as an array of structs.
--   1 — Data can be inserted into `Nested` columns as an array of structs.
+- 0 — Data can not be inserted into `Nested` columns as an array of structs.
+- 1 — Data can be inserted into `Nested` columns as an array of structs.
 
 Default value: `0`.
 
@@ -997,8 +1014,8 @@ Allows to convert the [LowCardinality](../../sql-reference/data-types/lowcardina
 
 Possible values:
 
--   0 — The `LowCardinality` type is not converted to the `DICTIONARY` type.
--   1 — The `LowCardinality` type is converted to the `DICTIONARY` type.
+- 0 — The `LowCardinality` type is not converted to the `DICTIONARY` type.
+- 1 — The `LowCardinality` type is converted to the `DICTIONARY` type.
 
 Default value: `0`.
 
@@ -1014,16 +1031,22 @@ Use Arrow FIXED_SIZE_BINARY type instead of Binary/String for FixedString column
 
 Enabled by default.
 
+### output_format_arrow_compression_method {#output_format_arrow_compression_method}
+
+Compression method used in output Arrow format. Supported codecs: `lz4_frame`, `zstd`, `none` (uncompressed)
+
+Default value: `none`.
+
 ## ORC format settings {#orc-format-settings}
 
 ### input_format_orc_import_nested {#input_format_orc_import_nested}
 
-Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs in [ORC](../../interfaces/formats.md/#data-format-orc) input format.
+Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/index.md) columns as an array of structs in [ORC](../../interfaces/formats.md/#data-format-orc) input format.
 
 Possible values:
 
--   0 — Data can not be inserted into `Nested` columns as an array of structs.
--   1 — Data can be inserted into `Nested` columns as an array of structs.
+- 0 — Data can not be inserted into `Nested` columns as an array of structs.
+- 1 — Data can be inserted into `Nested` columns as an array of structs.
 
 Default value: `0`.
 
@@ -1057,16 +1080,22 @@ Use ORC String type instead of Binary for String columns.
 
 Disabled by default.
 
+### output_format_orc_compression_method {#output_format_orc_compression_method}
+
+Compression method used in output ORC format. Supported codecs: `lz4`, `snappy`, `zlib`, `zstd`, `none` (uncompressed)
+
+Default value: `none`.
+
 ## Parquet format settings {#parquet-format-settings}
 
 ### input_format_parquet_import_nested {#input_format_parquet_import_nested}
 
-Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs in [Parquet](../../interfaces/formats.md/#data-format-parquet) input format.
+Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/index.md) columns as an array of structs in [Parquet](../../interfaces/formats.md/#data-format-parquet) input format.
 
 Possible values:
 
--   0 — Data can not be inserted into `Nested` columns as an array of structs.
--   1 — Data can be inserted into `Nested` columns as an array of structs.
+- 0 — Data can not be inserted into `Nested` columns as an array of structs.
+- 1 — Data can be inserted into `Nested` columns as an array of structs.
 
 Default value: `0`.
 
@@ -1112,6 +1141,12 @@ The version of Parquet format used in output format. Supported versions: `1.0`,
 
 Default value: `2.latest`.
 
+### output_format_parquet_compression_method {#output_format_parquet_compression_method}
+
+Compression method used in output Parquet format. Supported codecs: `snappy`, `lz4`, `brotli`, `zstd`, `gzip`, `none` (uncompressed)
+
+Default value: `lz4`.
+
 ## Hive format settings {#hive-format-settings}
 
 ### input_format_hive_text_fields_delimiter {#input_format_hive_text_fields_delimiter}
@@ -1174,8 +1209,8 @@ Enables using fields that are not specified in [Avro](../../interfaces/formats.m
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0.
 
@@ -1193,9 +1228,9 @@ Type: string
 
 Possible values:
 
--   `null` — No compression
--   `deflate` — Compress with Deflate (zlib)
--   `snappy` — Compress with [Snappy](https://google.github.io/snappy/)
+- `null` — No compression
+- `deflate` — Compress with Deflate (zlib)
+- `snappy` — Compress with [Snappy](https://google.github.io/snappy/)
 
 Default value: `snappy` (if available) or `deflate`.
 
@@ -1242,8 +1277,8 @@ Limits the width of value displayed in [Pretty](../../interfaces/formats.md/#pre
 
 Possible values:
 
--   Positive integer.
--   0 — The value is cut completely.
+- Positive integer.
+- 0 — The value is cut completely.
 
 Default value: `10000` symbols.
 
@@ -1318,8 +1353,8 @@ Adds row numbers to output in the [Pretty](../../interfaces/formats.md/#pretty)
 
 Possible values:
 
--   0 — Output without row numbers.
--   1 — Output with row numbers.
+- 0 — Output without row numbers.
+- 1 — Output with row numbers.
 
 Default value: `0`.
 
@@ -1363,12 +1398,12 @@ Sets the field escaping rule for [CustomSeparated](../../interfaces/formats.md/#
 
 Possible values:
 
--   `'Escaped'` — Similarly to [TSV](../../interfaces/formats.md/#tabseparated).
--   `'Quoted'` — Similarly to [Values](../../interfaces/formats.md/#data-format-values).
--   `'CSV'` — Similarly to [CSV](../../interfaces/formats.md/#csv).
--   `'JSON'` — Similarly to [JSONEachRow](../../interfaces/formats.md/#jsoneachrow).
--   `'XML'` — Similarly to [XML](../../interfaces/formats.md/#xml).
--   `'Raw'` — Extracts subpatterns as a whole, no escaping rules, similarly to [TSVRaw](../../interfaces/formats.md/#tabseparatedraw).
+- `'Escaped'` — Similarly to [TSV](../../interfaces/formats.md/#tabseparated).
+- `'Quoted'` — Similarly to [Values](../../interfaces/formats.md/#data-format-values).
+- `'CSV'` — Similarly to [CSV](../../interfaces/formats.md/#csv).
+- `'JSON'` — Similarly to [JSONEachRow](../../interfaces/formats.md/#jsoneachrow).
+- `'XML'` — Similarly to [XML](../../interfaces/formats.md/#xml).
+- `'Raw'` — Extracts subpatterns as a whole, no escaping rules, similarly to [TSVRaw](../../interfaces/formats.md/#tabseparatedraw).
 
 Default value: `'Escaped'`.
 
@@ -1416,12 +1451,12 @@ Field escaping rule.
 
 Possible values:
 
--   `'Escaped'` — Similarly to [TSV](../../interfaces/formats.md/#tabseparated).
--   `'Quoted'` — Similarly to [Values](../../interfaces/formats.md/#data-format-values).
--   `'CSV'` — Similarly to [CSV](../../interfaces/formats.md/#csv).
--   `'JSON'` — Similarly to [JSONEachRow](../../interfaces/formats.md/#jsoneachrow).
--   `'XML'` — Similarly to [XML](../../interfaces/formats.md/#xml).
--   `'Raw'` — Extracts subpatterns as a whole, no escaping rules, similarly to [TSVRaw](../../interfaces/formats.md/#tabseparatedraw).
+- `'Escaped'` — Similarly to [TSV](../../interfaces/formats.md/#tabseparated).
+- `'Quoted'` — Similarly to [Values](../../interfaces/formats.md/#data-format-values).
+- `'CSV'` — Similarly to [CSV](../../interfaces/formats.md/#csv).
+- `'JSON'` — Similarly to [JSONEachRow](../../interfaces/formats.md/#jsoneachrow).
+- `'XML'` — Similarly to [XML](../../interfaces/formats.md/#xml).
+- `'Raw'` — Extracts subpatterns as a whole, no escaping rules, similarly to [TSVRaw](../../interfaces/formats.md/#tabseparatedraw).
 
 Default value: `Raw`.
 
@@ -1439,9 +1474,9 @@ Determines how to map ClickHouse `Enum` data type and [CapnProto](../../interfac
 
 Possible values:
 
--   `'by_values'` — Values in enums should be the same, names can be different.
--   `'by_names'` — Names in enums should be the same, values can be different.
--   `'by_name_case_insensitive'` — Names in enums should be the same case-insensitive, values can be different.
+- `'by_values'` — Values in enums should be the same, names can be different.
+- `'by_names'` — Names in enums should be the same, values can be different.
+- `'by_name_case_insensitive'` — Names in enums should be the same case-insensitive, values can be different.
 
 Default value: `'by_values'`.
 
@@ -1474,7 +1509,7 @@ Default value: `65505`.
 
 The name of table that will be used in the output INSERT statement.
 
-Default value: `'table''`.
+Default value: `table`.
 
 ### output_format_sql_insert_include_column_names {#output_format_sql_insert_include_column_names}
 
@@ -1514,4 +1549,12 @@ Disabled by default.
 
 The maximum allowed size for String in RowBinary format. It prevents allocating large amount of memory in case of corrupted data. 0 means there is no limit.
 
-Default value: `1GiB`
+Default value: `1GiB`.
+
+## Native format settings {#native-format-settings}
+
+### input_format_native_allow_types_conversion {#input_format_native_allow_types_conversion}
+
+Allow types conversion in Native input format between columns from input data and requested columns.
+
+Enabled by default.
diff --git a/docs/en/operations/settings/settings-profiles.md b/docs/en/operations/settings/settings-profiles.md
index 4527152583f..2f39a75453c 100644
--- a/docs/en/operations/settings/settings-profiles.md
+++ b/docs/en/operations/settings/settings-profiles.md
@@ -9,7 +9,7 @@ sidebar_label: Settings Profiles
 A settings profile is a collection of settings grouped under the same name.
 
 :::note
-ClickHouse also supports [SQL-driven workflow](../../operations/access-rights.md#access-control) for managing settings profiles. We recommend using it.
+ClickHouse also supports [SQL-driven workflow](../../guides/sre/user-management/index.md#access-control) for managing settings profiles. We recommend using it.
 :::
 
 The profile can have any name. You can specify the same profile for different users. The most important thing you can write in the settings profile is `readonly=1`, which ensures read-only access.
diff --git a/docs/en/operations/settings/settings-users.md b/docs/en/operations/settings/settings-users.md
index b55d64fc4f7..1f41eafd02e 100644
--- a/docs/en/operations/settings/settings-users.md
+++ b/docs/en/operations/settings/settings-users.md
@@ -9,7 +9,7 @@ sidebar_label: User Settings
 The `users` section of the `user.xml` configuration file contains user settings.
 
 :::note
-ClickHouse also supports [SQL-driven workflow](../../operations/access-rights.md#access-control) for managing users. We recommend using it.
+ClickHouse also supports [SQL-driven workflow](../../guides/sre/user-management/index.md#access-control) for managing users. We recommend using it.
 :::
 
 Structure of the `users` section:
@@ -38,6 +38,10 @@ Structure of the `users` section:
                 </table_name>
             </database_name>
         </databases>
+        
+        <grants>
+            <query>GRANT SELECT ON system.*</query>
+        </grants>
     </user_name>
     <!-- Other users settings -->
 </users>
@@ -47,13 +51,13 @@ Structure of the `users` section:
 
 Password can be specified in plaintext or in SHA256 (hex format).
 
--   To assign a password in plaintext (**not recommended**), place it in a `password` element.
+- To assign a password in plaintext (**not recommended**), place it in a `password` element.
 
     For example, `<password>qwerty</password>`. The password can be left blank.
 
 <a id="password_sha256_hex"></a>
 
--   To assign a password using its SHA256 hash, place it in a `password_sha256_hex` element.
+- To assign a password using its SHA256 hash, place it in a `password_sha256_hex` element.
 
     For example, `<password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>`.
 
@@ -65,7 +69,7 @@ Password can be specified in plaintext or in SHA256 (hex format).
 
 <a id="password_double_sha1_hex"></a>
 
--   For compatibility with MySQL clients, password can be specified in double SHA1 hash. Place it in `password_double_sha1_hex` element.
+- For compatibility with MySQL clients, password can be specified in double SHA1 hash. Place it in `password_double_sha1_hex` element.
 
     For example, `<password_double_sha1_hex>08b4a0f1de6ad37da17359e592c8d74788a83eb0</password_double_sha1_hex>`.
 
@@ -77,32 +81,54 @@ Password can be specified in plaintext or in SHA256 (hex format).
 
 ### access_management {#access_management-user-setting}
 
-This setting enables or disables using of SQL-driven [access control and account management](../../operations/access-rights.md#access-control) for the user.
+This setting enables or disables using of SQL-driven [access control and account management](../../guides/sre/user-management/index.md#access-control) for the user.
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0.
 
+### grants {#grants-user-setting}
+
+This setting allows to grant any rights to selected user.
+Each element of the list should be `GRANT` query without any grantees specified.
+
+Example:
+
+```xml
+<user1>
+    <grants>
+        <query>GRANT SHOW ON *.*</query>
+        <query>GRANT CREATE ON *.* WITH GRANT OPTION</query>
+        <query>GRANT SELECT ON system.*</query>
+    </grants>
+</user1>
+```
+
+This setting can't be specified at the same time with
+`dictionaries`, `access_management`, `named_collection_control`, `show_named_collections_secrets`
+and `allow_databases` settings.
+
+
 ### user_name/networks {#user-namenetworks}
 
 List of networks from which the user can connect to the ClickHouse server.
 
 Each element of the list can have one of the following forms:
 
--   `<ip>` — IP address or network mask.
+- `<ip>` — IP address or network mask.
 
     Examples: `213.180.204.3`, `10.0.0.1/8`, `10.0.0.1/255.255.255.0`, `2a02:6b8::3`, `2a02:6b8::3/64`, `2a02:6b8::3/ffff:ffff:ffff:ffff::`.
 
--   `<host>` — Hostname.
+- `<host>` — Hostname.
 
     Example: `example01.host.ru`.
 
     To check access, a DNS query is performed, and all returned IP addresses are compared to the peer address.
 
--   `<host_regexp>` — Regular expression for hostnames.
+- `<host_regexp>` — Regular expression for hostnames.
 
     Example, `^example\d\d-\d\d-\d\.host\.ru$`
 
@@ -118,7 +144,7 @@ To open access for user from any network, specify:
 <ip>::/0</ip>
 ```
 
-:::warning
+:::note
 It’s insecure to open access from any network unless you have a firewall properly configured or the server is not directly connected to Internet.
 :::
 
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index f960d2df98e..4f3b4e43358 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -40,6 +40,39 @@ SETTINGS additional_table_filters = (('table_1', 'x != 2'))
 └───┴──────┘
 ```
 
+## additional_result_filter
+
+An additional filter expression to apply to the result of `SELECT` query.
+This setting is not applied to any subquery.
+
+Default value: `''`.
+
+**Example**
+
+``` sql
+insert into table_1 values (1, 'a'), (2, 'bb'), (3, 'ccc'), (4, 'dddd');
+```
+```response
+┌─x─┬─y────┐
+│ 1 │ a    │
+│ 2 │ bb   │
+│ 3 │ ccc  │
+│ 4 │ dddd │
+└───┴──────┘
+```
+```sql
+SELECT *
+FROM table_1
+SETTINGS additional_result_filter = 'x != 2'
+```
+```response
+┌─x─┬─y────┐
+│ 1 │ a    │
+│ 3 │ ccc  │
+│ 4 │ dddd │
+└───┴──────┘
+```
+
 ## allow_nondeterministic_mutations {#allow_nondeterministic_mutations}
 
 User-level setting that allows mutations on replicated tables to make use of non-deterministic functions such as `dictGet`.
@@ -71,17 +104,17 @@ ClickHouse applies this setting when the query contains the product of distribut
 
 Restrictions:
 
--   Only applied for IN and JOIN subqueries.
--   Only if the FROM section uses a distributed table containing more than one shard.
--   If the subquery concerns a distributed table containing more than one shard.
--   Not used for a table-valued [remote](../../sql-reference/table-functions/remote.md) function.
+- Only applied for IN and JOIN subqueries.
+- Only if the FROM section uses a distributed table containing more than one shard.
+- If the subquery concerns a distributed table containing more than one shard.
+- Not used for a table-valued [remote](../../sql-reference/table-functions/remote.md) function.
 
 Possible values:
 
--   `deny` — Default value. Prohibits using these types of subqueries (returns the “Double-distributed in/JOIN subqueries is denied” exception).
--   `local` — Replaces the database and table in the subquery with local ones for the destination server (shard), leaving the normal `IN`/`JOIN.`
--   `global` — Replaces the `IN`/`JOIN` query with `GLOBAL IN`/`GLOBAL JOIN.`
--   `allow` — Allows the use of these types of subqueries.
+- `deny` — Default value. Prohibits using these types of subqueries (returns the “Double-distributed in/JOIN subqueries is denied” exception).
+- `local` — Replaces the database and table in the subquery with local ones for the destination server (shard), leaving the normal `IN`/`JOIN.`
+- `global` — Replaces the `IN`/`JOIN` query with `GLOBAL IN`/`GLOBAL JOIN.`
+- `allow` — Allows the use of these types of subqueries.
 
 ## prefer_global_in_and_join {#prefer-global-in-and-join}
 
@@ -89,8 +122,8 @@ Enables the replacement of `IN`/`JOIN` operators with `GLOBAL IN`/`GLOBAL JOIN`.
 
 Possible values:
 
--   0 — Disabled. `IN`/`JOIN` operators are not replaced with `GLOBAL IN`/`GLOBAL JOIN`.
--   1 — Enabled. `IN`/`JOIN` operators are replaced with `GLOBAL IN`/`GLOBAL JOIN`.
+- 0 — Disabled. `IN`/`JOIN` operators are not replaced with `GLOBAL IN`/`GLOBAL JOIN`.
+- 1 — Enabled. `IN`/`JOIN` operators are replaced with `GLOBAL IN`/`GLOBAL JOIN`.
 
 Default value: `0`.
 
@@ -104,7 +137,7 @@ Another use case of `prefer_global_in_and_join` is accessing tables created by
 
 **See also:**
 
--   [Distributed subqueries](../../sql-reference/operators/in.md/#select-distributed-subqueries) for more information on how to use `GLOBAL IN`/`GLOBAL JOIN`
+- [Distributed subqueries](../../sql-reference/operators/in.md/#select-distributed-subqueries) for more information on how to use `GLOBAL IN`/`GLOBAL JOIN`
 
 ## enable_optimize_predicate_expression {#enable-optimize-predicate-expression}
 
@@ -114,8 +147,8 @@ Predicate pushdown may significantly reduce network traffic for distributed quer
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
@@ -162,8 +195,8 @@ Use data skipping indexes during query execution.
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
@@ -277,14 +310,14 @@ Sets the safety threshold for data volume generated by function [range](../../sq
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `500,000,000`.
 
 **See Also**
 
--   [max_block_size](#setting-max_block_size)
--   [min_insert_block_size_rows](#min-insert-block-size-rows)
+- [max_block_size](#setting-max_block_size)
+- [min_insert_block_size_rows](#min-insert-block-size-rows)
 
 ## enable_http_compression {#settings-enable_http_compression}
 
@@ -294,8 +327,8 @@ For more information, read the [HTTP interface description](../../interfaces/htt
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0.
 
@@ -315,8 +348,8 @@ For more information, read the [HTTP interface description](../../interfaces/htt
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0.
 
@@ -326,7 +359,7 @@ Sets the maximum URI length of an HTTP request.
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: 1048576.
 
@@ -336,7 +369,7 @@ Sets the maximum number of addresses generated from patterns for the [remote](..
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `1000`.
 
@@ -346,7 +379,7 @@ Sets the maximum number of addresses generated from patterns for external storag
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `1000`.
 
@@ -358,8 +391,8 @@ For more information, read the [HTTP interface description](../../interfaces/htt
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0.
 
@@ -369,8 +402,8 @@ Limits the maximum number of HTTP GET redirect hops for [URL](../../engines/tabl
 
 Possible values:
 
--   Any positive integer number of hops.
--   0 — No hops allowed.
+- Any positive integer number of hops.
+- 0 — No hops allowed.
 
 Default value: 0.
 
@@ -383,8 +416,8 @@ This setting is applicable to [INSERT ... SELECT](../../sql-reference/statements
 
 Possible values:
 
--   0 — Inserting `NULL` into a not nullable column causes an exception.
--   1 — Default column value is inserted instead of `NULL`.
+- 0 — Inserting `NULL` into a not nullable column causes an exception.
+- 1 — Default column value is inserted instead of `NULL`.
 
 Default value: `1`.
 
@@ -394,10 +427,10 @@ Sets default strictness for [JOIN clauses](../../sql-reference/statements/select
 
 Possible values:
 
--   `ALL` — If the right table has several matching rows, ClickHouse creates a [Cartesian product](https://en.wikipedia.org/wiki/Cartesian_product) from matching rows. This is the normal `JOIN` behaviour from standard SQL.
--   `ANY` — If the right table has several matching rows, only the first one found is joined. If the right table has only one matching row, the results of `ANY` and `ALL` are the same.
--   `ASOF` — For joining sequences with an uncertain match.
--   `Empty string` — If `ALL` or `ANY` is not specified in the query, ClickHouse throws an exception.
+- `ALL` — If the right table has several matching rows, ClickHouse creates a [Cartesian product](https://en.wikipedia.org/wiki/Cartesian_product) from matching rows. This is the normal `JOIN` behaviour from standard SQL.
+- `ANY` — If the right table has several matching rows, only the first one found is joined. If the right table has only one matching row, the results of `ANY` and `ALL` are the same.
+- `ASOF` — For joining sequences with an uncertain match.
+- `Empty string` — If `ALL` or `ANY` is not specified in the query, ClickHouse throws an exception.
 
 Default value: `ALL`.
 
@@ -419,6 +452,8 @@ Possible values:
 
  The first phase of a grace join reads the right table and splits it into N buckets depending on the hash value of key columns (initially, N is `grace_hash_join_initial_buckets`). This is done in a way to ensure that each bucket can be processed independently. Rows from the first bucket are added to an in-memory hash table while the others are saved to disk. If the hash table grows beyond the memory limit (e.g., as set by [`max_bytes_in_join`](/docs/en/operations/settings/query-complexity.md/#settings-max_bytes_in_join)), the number of buckets is increased and the assigned bucket for each row. Any rows which don’t belong to the current bucket are flushed and reassigned.
 
+ Supports `INNER/LEFT/RIGHT/FULL ALL/ANY JOIN`.
+
 - hash
 
  [Hash join algorithm](https://en.wikipedia.org/wiki/Hash_join) is used. The most generic implementation that supports all combinations of kind and strictness and multiple join keys that are combined with `OR` in the `JOIN ON` section.
@@ -460,22 +495,22 @@ Possible values:
 
 Changes the behaviour of join operations with `ANY` strictness.
 
-:::warning
+:::note
 This setting applies only for `JOIN` operations with [Join](../../engines/table-engines/special/join.md) engine tables.
 :::
 
 Possible values:
 
--   0 — If the right table has more than one matching row, only the first one found is joined.
--   1 — If the right table has more than one matching row, only the last one found is joined.
+- 0 — If the right table has more than one matching row, only the first one found is joined.
+- 1 — If the right table has more than one matching row, only the last one found is joined.
 
 Default value: 0.
 
 See also:
 
--   [JOIN clause](../../sql-reference/statements/select/join.md/#select-join)
--   [Join table engine](../../engines/table-engines/special/join.md)
--   [join_default_strictness](#settings-join_default_strictness)
+- [JOIN clause](../../sql-reference/statements/select/join.md/#select-join)
+- [Join table engine](../../engines/table-engines/special/join.md)
+- [join_default_strictness](#settings-join_default_strictness)
 
 ## join_use_nulls {#join_use_nulls}
 
@@ -483,8 +518,8 @@ Sets the type of [JOIN](../../sql-reference/statements/select/join.md) behaviour
 
 Possible values:
 
--   0 — The empty cells are filled with the default value of the corresponding field type.
--   1 — `JOIN` behaves the same way as in standard SQL. The type of the corresponding field is converted to [Nullable](../../sql-reference/data-types/nullable.md/#data_type-nullable), and empty cells are filled with [NULL](../../sql-reference/syntax.md).
+- 0 — The empty cells are filled with the default value of the corresponding field type.
+- 1 — `JOIN` behaves the same way as in standard SQL. The type of the corresponding field is converted to [Nullable](../../sql-reference/data-types/nullable.md/#data_type-nullable), and empty cells are filled with [NULL](../../sql-reference/syntax.md).
 
 Default value: 0.
 
@@ -496,14 +531,14 @@ Columns for these keys are filled with either default value or `NULL` in corresp
 
 Possible values:
 
--   0 — The default value for the aggregation key type is used to produce missing values.
--   1 — ClickHouse executes `GROUP BY` the same way as the SQL standard says. The types of aggregation keys are converted to [Nullable](/docs/en/sql-reference/data-types/nullable.md/#data_type-nullable). Columns for corresponding aggregation keys are filled with [NULL](/docs/en/sql-reference/syntax.md) for rows that didn't use it.
+- 0 — The default value for the aggregation key type is used to produce missing values.
+- 1 — ClickHouse executes `GROUP BY` the same way as the SQL standard says. The types of aggregation keys are converted to [Nullable](/docs/en/sql-reference/data-types/nullable.md/#data_type-nullable). Columns for corresponding aggregation keys are filled with [NULL](/docs/en/sql-reference/syntax.md) for rows that didn't use it.
 
 Default value: 0.
 
 See also:
 
--   [GROUP BY clause](/docs/en/sql-reference/statements/select/group-by.md)
+- [GROUP BY clause](/docs/en/sql-reference/statements/select/group-by.md)
 
 ## partial_merge_join_optimizations {#partial_merge_join_optimizations}
 
@@ -513,8 +548,8 @@ By default, this setting enables improvements that could lead to wrong results.
 
 Possible values:
 
--   0 — Optimizations disabled.
--   1 — Optimizations enabled.
+- 0 — Optimizations disabled.
+- 1 — Optimizations enabled.
 
 Default value: 1.
 
@@ -530,7 +565,7 @@ ClickHouse server:
 
 Possible values:
 
--   Any positive integer. Recommended range of values: \[1000, 100000\].
+- Any positive integer. Recommended range of values: \[1000, 100000\].
 
 Default value: 65536.
 
@@ -542,7 +577,7 @@ The bigger the value of the setting, the more RAM is used and the less disk I/O
 
 Possible values:
 
--   Any positive integer, starting from 2.
+- Any positive integer, starting from 2.
 
 Default value: 64.
 
@@ -550,30 +585,41 @@ Default value: 64.
 
 Enables legacy ClickHouse server behaviour in `ANY INNER|LEFT JOIN` operations.
 
-:::warning
+:::note
 Use this setting only for backward compatibility if your use cases depend on legacy `JOIN` behaviour.
 :::
 
 When the legacy behaviour is enabled:
 
--   Results of `t1 ANY LEFT JOIN t2` and `t2 ANY RIGHT JOIN t1` operations are not equal because ClickHouse uses the logic with many-to-one left-to-right table keys mapping.
--   Results of `ANY INNER JOIN` operations contain all rows from the left table like the `SEMI LEFT JOIN` operations do.
+- Results of `t1 ANY LEFT JOIN t2` and `t2 ANY RIGHT JOIN t1` operations are not equal because ClickHouse uses the logic with many-to-one left-to-right table keys mapping.
+- Results of `ANY INNER JOIN` operations contain all rows from the left table like the `SEMI LEFT JOIN` operations do.
 
 When the legacy behaviour is disabled:
 
--   Results of `t1 ANY LEFT JOIN t2` and `t2 ANY RIGHT JOIN t1` operations are equal because ClickHouse uses the logic which provides one-to-many keys mapping in `ANY RIGHT JOIN` operations.
--   Results of `ANY INNER JOIN` operations contain one row per key from both the left and right tables.
+- Results of `t1 ANY LEFT JOIN t2` and `t2 ANY RIGHT JOIN t1` operations are equal because ClickHouse uses the logic which provides one-to-many keys mapping in `ANY RIGHT JOIN` operations.
+- Results of `ANY INNER JOIN` operations contain one row per key from both the left and right tables.
 
 Possible values:
 
--   0 — Legacy behaviour is disabled.
--   1 — Legacy behaviour is enabled.
+- 0 — Legacy behaviour is disabled.
+- 1 — Legacy behaviour is enabled.
 
 Default value: 0.
 
 See also:
 
--   [JOIN strictness](../../sql-reference/statements/select/join.md/#join-settings)
+- [JOIN strictness](../../sql-reference/statements/select/join.md/#join-settings)
+
+## max_rows_in_set_to_optimize_join
+
+Maximal size of the set to filter joined tables by each other's row sets before joining.
+
+Possible values:
+
+- 0 — Disable.
+- Any positive integer.
+
+Default value: 100000.
 
 ## temporary_files_codec {#temporary_files_codec}
 
@@ -581,8 +627,8 @@ Sets compression codec for temporary files used in sorting and joining operation
 
 Possible values:
 
--   LZ4 — [LZ4](https://en.wikipedia.org/wiki/LZ4_(compression_algorithm)) compression is applied.
--   NONE — No compression is applied.
+- LZ4 — [LZ4](https://en.wikipedia.org/wiki/LZ4_(compression_algorithm)) compression is applied.
+- NONE — No compression is applied.
 
 Default value: LZ4.
 
@@ -606,7 +652,7 @@ If the number of rows to be read from a file of a [MergeTree](../../engines/tabl
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `163840`.
 
@@ -616,7 +662,7 @@ The minimum number of lines to read from one file before the [MergeTree](../../e
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `163840`.
 
@@ -626,7 +672,7 @@ If the number of bytes to read from one file of a [MergeTree](../../engines/tabl
 
 Possible value:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `251658240`.
 
@@ -636,7 +682,7 @@ The minimum number of bytes to read from one file before [MergeTree](../../engin
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `251658240`.
 
@@ -646,7 +692,7 @@ If the distance between two data blocks to be read in one file is less than `mer
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 0.
 
@@ -656,7 +702,7 @@ If the distance between two data blocks to be read in one file is less than `mer
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 0.
 
@@ -666,7 +712,7 @@ When searching for data, ClickHouse checks the data marks in the index file. If
 
 Possible values:
 
--   Any positive even integer.
+- Any positive even integer.
 
 Default value: 8.
 
@@ -678,7 +724,7 @@ The cache of uncompressed blocks stores data extracted for queries. ClickHouse u
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 128 ✕ 8192.
 
@@ -690,7 +736,7 @@ The cache of uncompressed blocks stores data extracted for queries. ClickHouse u
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 2013265920.
 
@@ -702,8 +748,8 @@ ClickHouse uses this setting when reading data from tables. If the total storage
 
 Possible values:
 
--   0 — Direct I/O is disabled.
--   Positive integer.
+- 0 — Direct I/O is disabled.
+- Positive integer.
 
 Default value: 0.
 
@@ -713,14 +759,14 @@ Sets the method of data compression that is used for communication between serve
 
 Possible values:
 
--   `LZ4` — sets LZ4 compression method.
--   `ZSTD` — sets ZSTD compression method.
+- `LZ4` — sets LZ4 compression method.
+- `ZSTD` — sets ZSTD compression method.
 
 Default value: `LZ4`.
 
 **See Also**
 
--   [network_zstd_compression_level](#network_zstd_compression_level)
+- [network_zstd_compression_level](#network_zstd_compression_level)
 
 ## network_zstd_compression_level {#network_zstd_compression_level}
 
@@ -728,7 +774,7 @@ Adjusts the level of ZSTD compression. Used only when [network_compression_metho
 
 Possible values:
 
--   Positive integer from 1 to 15.
+- Positive integer from 1 to 15.
 
 Default value: `1`.
 
@@ -756,8 +802,8 @@ Only the queries with the following type will get to the log:
 - `QUERY_FINISH`
 - `EXCEPTION_WHILE_PROCESSING`
 
--   Type: milliseconds
--   Default value: 0 (any query)
+- Type: milliseconds
+- Default value: 0 (any query)
 
 ## log_queries_min_type {#settings-log-queries-min-type}
 
@@ -785,8 +831,8 @@ Query threads log into the [system.query_thread_log](../../operations/system-tab
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: `1`.
 
@@ -814,8 +860,8 @@ Allows to log formatted queries to the [system.query_log](../../operations/syste
 
 Possible values:
 
--   0 — Formatted queries are not logged in the system table.
--   1 — Formatted queries are logged in the system table.
+- 0 — Formatted queries are not logged in the system table.
+- 1 — Formatted queries are logged in the system table.
 
 Default value: `0`.
 
@@ -827,7 +873,7 @@ It can be used to improve the readability of server logs. Additionally, it helps
 
 Possible values:
 
--   Any string no longer than [max_query_size](#settings-max_query_size). If the max_query_size is exceeded, the server throws an exception.
+- Any string no longer than [max_query_size](#settings-max_query_size). If the max_query_size is exceeded, the server throws an exception.
 
 Default value: empty string.
 
@@ -857,8 +903,8 @@ Write time that processor spent during execution/waiting for data to `system.pro
 
 See also:
 
--   [`system.processors_profile_log`](../../operations/system-tables/processors_profile_log.md#system-processors_profile_log)
--   [`EXPLAIN PIPELINE`](../../sql-reference/statements/explain.md#explain-pipeline)
+- [`system.processors_profile_log`](../../operations/system-tables/processors_profile_log.md)
+- [`EXPLAIN PIPELINE`](../../sql-reference/statements/explain.md#explain-pipeline)
 
 ## max_insert_block_size {#settings-max_insert_block_size}
 
@@ -878,8 +924,8 @@ Sets the minimum number of rows in the block that can be inserted into a table b
 
 Possible values:
 
--   Positive integer.
--   0 — Squashing disabled.
+- Positive integer.
+- 0 — Squashing disabled.
 
 Default value: 1048576.
 
@@ -889,8 +935,8 @@ Sets the minimum number of bytes in the block which can be inserted into a table
 
 Possible values:
 
--   Positive integer.
--   0 — Squashing disabled.
+- Positive integer.
+- 0 — Squashing disabled.
 
 Default value: 268435456.
 
@@ -902,8 +948,8 @@ Sets the time in seconds. If a replica's lag is greater than or equal to the set
 
 Possible values:
 
--   Positive integer.
--   0 — Replica lags are not checked.
+- Positive integer.
+- 0 — Replica lags are not checked.
 
 To prevent the use of any replica with a non-zero lag, set this parameter to 1.
 
@@ -930,8 +976,8 @@ The maximum number of threads to execute the `INSERT SELECT` query.
 
 Possible values:
 
--   0 (or 1) — `INSERT SELECT` no parallel execution.
--   Positive integer. Bigger than 1.
+- 0 (or 1) — `INSERT SELECT` no parallel execution.
+- Positive integer. Bigger than 1.
 
 Default value: 0.
 
@@ -942,7 +988,7 @@ Higher values will lead to higher memory usage.
 
 The maximum size of blocks of uncompressed data before compressing for writing to a table. By default, 1,048,576 (1 MiB). Specifying a smaller block size generally leads to slightly reduced compression ratio, the compression and decompression speed increases slightly due to cache locality, and memory consumption is reduced.
 
-:::warning
+:::note
 This is an expert-level setting, and you shouldn't change it if you're just getting started with ClickHouse.
 :::
 
@@ -960,16 +1006,16 @@ We are writing a UInt32-type column (4 bytes per value). When writing 8192 rows,
 
 We are writing a URL column with the String type (average size of 60 bytes per value). When writing 8192 rows, the average will be slightly less than 500 KB of data. Since this is more than 65,536, a compressed block will be formed for each mark. In this case, when reading data from the disk in the range of a single mark, extra data won’t be decompressed.
 
-:::warning
+:::note
 This is an expert-level setting, and you shouldn't change it if you're just getting started with ClickHouse.
 :::
 
 ## max_query_size {#settings-max_query_size}
 
-The maximum part of a query that can be taken to RAM for parsing with the SQL parser.
-The INSERT query also contains data for INSERT that is processed by a separate stream parser (that consumes O(1) RAM), which is not included in this restriction.
+The maximum number of bytes of a query string parsed by the SQL parser.
+Data in the VALUES clause of INSERT queries is processed by a separate stream parser (that consumes O(1) RAM) and not affected by this restriction.
 
-Default value: 256 KiB.
+Default value: 262144 (= 256 KiB).
 
 ## max_parser_depth {#max_parser_depth}
 
@@ -977,8 +1023,8 @@ Limits maximum recursion depth in the recursive descent parser. Allows controlli
 
 Possible values:
 
--   Positive integer.
--   0 — Recursion depth is unlimited.
+- Positive integer.
+- 0 — Recursion depth is unlimited.
 
 Default value: 1000.
 
@@ -988,6 +1034,16 @@ The interval in microseconds for checking whether request execution has been can
 
 Default value: 100,000 (checks for cancelling and sends the progress ten times per second).
 
+## idle_connection_timeout {#idle_connection_timeout}
+
+Timeout to close idle TCP connections after specified number of seconds.
+
+Possible values:
+
+- Positive integer (0 - close immediately, after 0 seconds).
+
+Default value: 3600.
+
 ## connect_timeout, receive_timeout, send_timeout {#connect-timeout-receive-timeout-send-timeout}
 
 Timeouts in seconds on the socket used for communicating with the client.
@@ -1028,8 +1084,8 @@ If the value is exceeded, the server throws an exception.
 
 Possible values:
 
--   Positive integer.
--   0 — Unlimited depth.
+- Positive integer.
+- 0 — Unlimited depth.
 
 Default value: `5`.
 
@@ -1041,8 +1097,8 @@ The setting isn't followed perfectly accurately.
 
 Possible values:
 
--   Positive integer.
--   0 — Unlimited.
+- Positive integer.
+- 0 — Unlimited.
 
 Default value: `0`.
 
@@ -1062,8 +1118,8 @@ The setting isn't followed perfectly accurately.
 
 Possible values:
 
--   Positive integer.
--   0 — Unlimited.
+- Positive integer.
+- 0 — Unlimited.
 
 Default value: `0`.
 
@@ -1080,7 +1136,13 @@ Could be used for throttling speed when replicating the data to add or replace n
 The timeout in milliseconds for connecting to a remote server for a Distributed table engine, if the ‘shard’ and ‘replica’ sections are used in the cluster definition.
 If unsuccessful, several attempts are made to connect to various replicas.
 
-Default value: 50.
+Default value: 1000.
+
+## connect_timeout_with_failover_secure_ms
+
+Connection timeout for selecting first healthy replica (for secure connections)
+
+Default value: 1000.
 
 ## connection_pool_max_wait_ms {#connection-pool-max-wait-ms}
 
@@ -1125,6 +1187,36 @@ Disable limit on kafka_num_consumers that depends on the number of available CPU
 
 Default value: false.
 
+## postgresql_connection_pool_size {#postgresql-connection-pool-size}
+
+Connection pool size for PostgreSQL table engine and database engine.
+
+Default value: 16
+
+## postgresql_connection_pool_size {#postgresql-connection-pool-size}
+
+Connection pool push/pop timeout on empty pool for PostgreSQL table engine and database engine. By default it will block on empty pool.
+
+Default value: 5000
+
+## postgresql_connection_pool_auto_close_connection {#postgresql-connection-pool-auto-close-connection}
+
+Close connection before returning connection to the pool.
+
+Default value: true.
+
+## odbc_bridge_connection_pool_size {#odbc-bridge-connection-pool-size}
+
+Connection pool size for each connection settings string in ODBC bridge.
+
+Default value: 16
+
+## odbc_bridge_use_connection_pooling {#odbc-bridge-use-connection-pooling}
+
+Use connection pooling in ODBC bridge. If set to false, a new connection is created every time.
+
+Default value: true
+
 ## use_uncompressed_cache {#setting-use_uncompressed_cache}
 
 Whether to use a cache of uncompressed blocks. Accepts 0 or 1. By default, 0 (disabled).
@@ -1174,15 +1266,15 @@ Specifies the algorithm of replicas selection that is used for distributed query
 
 ClickHouse supports the following algorithms of choosing replicas:
 
--   [Random](#load_balancing-random) (by default)
--   [Nearest hostname](#load_balancing-nearest_hostname)
--   [In order](#load_balancing-in_order)
--   [First or random](#load_balancing-first_or_random)
--   [Round robin](#load_balancing-round_robin)
+- [Random](#load_balancing-random) (by default)
+- [Nearest hostname](#load_balancing-nearest_hostname)
+- [In order](#load_balancing-in_order)
+- [First or random](#load_balancing-first_or_random)
+- [Round robin](#load_balancing-round_robin)
 
 See also:
 
--   [distributed_replica_max_ignored_errors](#settings-distributed_replica_max_ignored_errors)
+- [distributed_replica_max_ignored_errors](#settings-distributed_replica_max_ignored_errors)
 
 ### Random (by Default) {#load_balancing-random}
 
@@ -1242,13 +1334,15 @@ Enables/disables preferable using the localhost replica when processing distribu
 
 Possible values:
 
--   1 — ClickHouse always sends a query to the localhost replica if it exists.
--   0 — ClickHouse uses the balancing strategy specified by the [load_balancing](#settings-load_balancing) setting.
+- 1 — ClickHouse always sends a query to the localhost replica if it exists.
+- 0 — ClickHouse uses the balancing strategy specified by the [load_balancing](#settings-load_balancing) setting.
 
 Default value: 1.
 
-:::warning
-Disable this setting if you use [max_parallel_replicas](#settings-max_parallel_replicas).
+:::note
+Disable this setting if you use [max_parallel_replicas](#settings-max_parallel_replicas) without [parallel_replicas_custom_key](#settings-parallel_replicas_custom_key).
+If [parallel_replicas_custom_key](#settings-parallel_replicas_custom_key) is set, disable this setting only if it's used on a cluster with multiple shards containing multiple replicas.
+If it's used on a cluster with a single shard and multiple replicas, disabling this setting will have negative effects.
 :::
 
 ## totals_mode {#totals-mode}
@@ -1267,22 +1361,59 @@ The maximum number of replicas for each shard when executing a query.
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `1`.
 
 **Additional Info**
 
-This setting is useful for replicated tables with a sampling key. A query may be processed faster if it is executed on several servers in parallel. But the query performance may degrade in the following cases:
+This options will produce different results depending on the settings used.
+
+:::note
+This setting will produce incorrect results when joins or subqueries are involved, and all tables don't meet certain requirements. See [Distributed Subqueries and max_parallel_replicas](../../sql-reference/operators/in.md/#max_parallel_replica-subqueries) for more details.
+:::
+
+### Parallel processing using `SAMPLE` key
+
+A query may be processed faster if it is executed on several servers in parallel. But the query performance may degrade in the following cases:
 
 - The position of the sampling key in the partitioning key does not allow efficient range scans.
 - Adding a sampling key to the table makes filtering by other columns less efficient.
 - The sampling key is an expression that is expensive to calculate.
 - The cluster latency distribution has a long tail, so that querying more servers increases the query overall latency.
 
-:::warning
-This setting will produce incorrect results when joins or subqueries are involved, and all tables don't meet certain requirements. See [Distributed Subqueries and max_parallel_replicas](../../sql-reference/operators/in.md/#max_parallel_replica-subqueries) for more details.
-:::
+### Parallel processing using [parallel_replicas_custom_key](#settings-parallel_replicas_custom_key)
+
+This setting is useful for any replicated table.
+
+## parallel_replicas_custom_key {#settings-parallel_replicas_custom_key}
+
+An arbitrary integer expression that can be used to split work between replicas for a specific table.
+The value can be any integer expression.
+A query may be processed faster if it is executed on several servers in parallel but it depends on the used [parallel_replicas_custom_key](#settings-parallel_replicas_custom_key)
+and [parallel_replicas_custom_key_filter_type](#settings-parallel_replicas_custom_key_filter_type).
+
+Simple expressions using primary keys are preferred.
+
+If the setting is used on a cluster that consists of a single shard with multiple replicas, those replicas will be converted into virtual shards.
+Otherwise, it will behave same as for `SAMPLE` key, it will use multiple replicas of each shard.
+
+## parallel_replicas_custom_key_filter_type {#settings-parallel_replicas_custom_key_filter_type}
+
+How to use `parallel_replicas_custom_key` expression for splitting work between replicas.
+
+Possible values:
+
+- `default` — Use the default implementation using modulo operation on the `parallel_replicas_custom_key`.
+- `range` — Split the entire value space of the expression in the ranges. This type of filtering is useful if values of `parallel_replicas_custom_key` are uniformly spread across the entire integer space, e.g. hash values.
+
+Default value: `default`.
+
+## allow_experimental_parallel_reading_from_replicas
+
+If true, ClickHouse will send a SELECT query to all replicas of a table (up to `max_parallel_replicas`) . It will work for any kind of MergeTree table.
+
+Default value: `false`.
 
 ## compile_expressions {#compile-expressions}
 
@@ -1307,14 +1438,14 @@ Enables or disables JIT-compilation of aggregate functions to native code. Enabl
 
 Possible values:
 
--   0 — Aggregation is done without JIT compilation.
--   1 — Aggregation is done using JIT compilation.
+- 0 — Aggregation is done without JIT compilation.
+- 1 — Aggregation is done using JIT compilation.
 
 Default value: `1`.
 
 **See Also**
 
--   [min_count_to_compile_aggregate_expression](#min_count_to_compile_aggregate_expression)
+- [min_count_to_compile_aggregate_expression](#min_count_to_compile_aggregate_expression)
 
 ## min_count_to_compile_aggregate_expression {#min_count_to_compile_aggregate_expression}
 
@@ -1322,8 +1453,8 @@ The minimum number of identical aggregate expressions to start JIT-compilation.
 
 Possible values:
 
--   Positive integer.
--   0 — Identical aggregate expressions are always JIT-compiled.
+- Positive integer.
+- 0 — Identical aggregate expressions are always JIT-compiled.
 
 Default value: `3`.
 
@@ -1334,8 +1465,8 @@ and [enable_writes_to_query_cache](#enable-writes-to-query-cache) control in mor
 
 Possible values:
 
-- 0 - Yes
-- 1 - No
+- 0 - Disabled
+- 1 - Enabled
 
 Default value: `0`.
 
@@ -1392,6 +1523,28 @@ Possible values:
 
 Default value: `0`
 
+## query_cache_compress_entries {#query-cache-compress-entries}
+
+Compress entries in the [query cache](../query-cache.md). Lessens the memory consumption of the query cache at the cost of slower inserts into / reads from it.
+
+Possible values:
+
+- 0 - Disabled
+- 1 - Enabled
+
+Default value: `1`
+
+## query_cache_squash_partial_results {#query-cache-squash-partial-results}
+
+Squash partial result blocks to blocks of size [max_block_size](#setting-max_block_size). Reduces performance of inserts into the [query cache](../query-cache.md) but improves the compressability of cache entries (see [query_cache_compress-entries](#query_cache_compress_entries)).
+
+Possible values:
+
+- 0 - Disabled
+- 1 - Enabled
+
+Default value: `1`
+
 ## query_cache_ttl {#query-cache-ttl}
 
 After this time in seconds entries in the [query cache](../query-cache.md) become stale.
@@ -1414,13 +1567,33 @@ Possible values:
 
 Default value: `0`.
 
+## query_cache_max_size_in_bytes {#query-cache-max-size-in-bytes}
+
+The maximum amount of memory (in bytes) the current user may allocate in the [query cache](../query-cache.md). 0 means unlimited.
+
+Possible values:
+
+- Positive integer >= 0.
+
+Default value: 0 (no restriction).
+
+## query_cache_max_entries {#query-cache-max-entries}
+
+The maximum number of query results the current user may store in the [query cache](../query-cache.md). 0 means unlimited.
+
+Possible values:
+
+- Positive integer >= 0.
+
+Default value: 0 (no restriction).
+
 ## insert_quorum {#settings-insert_quorum}
 
 Enables the quorum writes.
 
--   If `insert_quorum < 2`, the quorum writes are disabled.
--   If `insert_quorum >= 2`, the quorum writes are enabled.
--   If `insert_quorum = 'auto'`, use majority number (`number_of_replicas / 2 + 1`) as quorum number.
+- If `insert_quorum < 2`, the quorum writes are disabled.
+- If `insert_quorum >= 2`, the quorum writes are enabled.
+- If `insert_quorum = 'auto'`, use majority number (`number_of_replicas / 2 + 1`) as quorum number.
 
 Default value: 0 - disabled.
 
@@ -1432,14 +1605,14 @@ When `insert_quorum_parallel` is disabled, all replicas in the quorum are consis
 
 ClickHouse generates an exception:
 
--   If the number of available replicas at the time of the query is less than the `insert_quorum`.
--   When `insert_quorum_parallel` is disabled and an attempt to write data is made when the previous block has not yet been inserted in `insert_quorum` of replicas. This situation may occur if the user tries to perform another `INSERT` query to the same table before the previous one with `insert_quorum` is completed.
+- If the number of available replicas at the time of the query is less than the `insert_quorum`.
+- When `insert_quorum_parallel` is disabled and an attempt to write data is made when the previous block has not yet been inserted in `insert_quorum` of replicas. This situation may occur if the user tries to perform another `INSERT` query to the same table before the previous one with `insert_quorum` is completed.
 
 See also:
 
--   [insert_quorum_timeout](#settings-insert_quorum_timeout)
--   [insert_quorum_parallel](#settings-insert_quorum_parallel)
--   [select_sequential_consistency](#settings-select_sequential_consistency)
+- [insert_quorum_timeout](#settings-insert_quorum_timeout)
+- [insert_quorum_parallel](#settings-insert_quorum_parallel)
+- [select_sequential_consistency](#settings-select_sequential_consistency)
 
 ## insert_quorum_timeout {#settings-insert_quorum_timeout}
 
@@ -1449,9 +1622,9 @@ Default value: 600 000 milliseconds (ten minutes).
 
 See also:
 
--   [insert_quorum](#settings-insert_quorum)
--   [insert_quorum_parallel](#settings-insert_quorum_parallel)
--   [select_sequential_consistency](#settings-select_sequential_consistency)
+- [insert_quorum](#settings-insert_quorum)
+- [insert_quorum_parallel](#settings-insert_quorum_parallel)
+- [select_sequential_consistency](#settings-select_sequential_consistency)
 
 ## insert_quorum_parallel {#settings-insert_quorum_parallel}
 
@@ -1459,16 +1632,16 @@ Enables or disables parallelism for quorum `INSERT` queries. If enabled, additio
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
 See also:
 
--   [insert_quorum](#settings-insert_quorum)
--   [insert_quorum_timeout](#settings-insert_quorum_timeout)
--   [select_sequential_consistency](#settings-select_sequential_consistency)
+- [insert_quorum](#settings-insert_quorum)
+- [insert_quorum_timeout](#settings-insert_quorum_timeout)
+- [select_sequential_consistency](#settings-select_sequential_consistency)
 
 ## select_sequential_consistency {#settings-select_sequential_consistency}
 
@@ -1476,8 +1649,8 @@ Enables or disables sequential consistency for `SELECT` queries. Requires `inser
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0.
 
@@ -1489,9 +1662,9 @@ When `insert_quorum_parallel` is enabled (the default), then `select_sequential_
 
 See also:
 
--   [insert_quorum](#settings-insert_quorum)
--   [insert_quorum_timeout](#settings-insert_quorum_timeout)
--   [insert_quorum_parallel](#settings-insert_quorum_parallel)
+- [insert_quorum](#settings-insert_quorum)
+- [insert_quorum_timeout](#settings-insert_quorum_timeout)
+- [insert_quorum_parallel](#settings-insert_quorum_parallel)
 
 ## insert_deduplicate {#settings-insert-deduplicate}
 
@@ -1499,8 +1672,8 @@ Enables or disables block deduplication of `INSERT` (for Replicated\* tables).
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
@@ -1509,20 +1682,21 @@ For the replicated tables by default the only 100 of the most recent blocks for
 For not replicated tables see [non_replicated_deduplication_window](merge-tree-settings.md/#non-replicated-deduplication-window).
 
 ## Asynchronous Insert settings
+
 ### async_insert {#async-insert}
 
-Enables or disables asynchronous inserts. This makes sense only for insertion over HTTP protocol. Note that deduplication isn't working for such inserts.
+Enables or disables asynchronous inserts. Note that deduplication is disabled by default, see [async_insert_deduplicate](#async-insert-deduplicate).
 
 If enabled, the data is combined into batches before the insertion into tables, so it is possible to do small and frequent insertions into ClickHouse (up to 15000 queries per second) without buffer tables.
 
-The data is inserted either after the [async_insert_max_data_size](#async-insert-max-data-size) is exceeded or after [async_insert_busy_timeout_ms](#async-insert-busy-timeout-ms) milliseconds since the first `INSERT` query. If the [async_insert_stale_timeout_ms](#async-insert-stale-timeout-ms) is set to a non-zero value, the data is inserted after `async_insert_stale_timeout_ms` milliseconds since the last query.
+The data is inserted either after the [async_insert_max_data_size](#async-insert-max-data-size) is exceeded or after [async_insert_busy_timeout_ms](#async-insert-busy-timeout-ms) milliseconds since the first `INSERT` query. If the [async_insert_stale_timeout_ms](#async-insert-stale-timeout-ms) is set to a non-zero value, the data is inserted after `async_insert_stale_timeout_ms` milliseconds since the last query. Also the buffer will be flushed to disk if at least [async_insert_max_query_number](#async-insert-max-query-number) async insert queries per block were received. This last setting takes effect only if [async_insert_deduplicate](#async-insert-deduplicate) is enabled.
 
 If [wait_for_async_insert](#wait-for-async-insert) is enabled, every client will wait for the data to be processed and flushed to the table. Otherwise, the query would be processed almost instantly, even if the data is not inserted.
 
 Possible values:
 
--   0 — Insertions are made synchronously, one after another.
--   1 — Multiple asynchronous insertions enabled.
+- 0 — Insertions are made synchronously, one after another.
+- 1 — Multiple asynchronous insertions enabled.
 
 Default value: `0`.
 
@@ -1532,8 +1706,8 @@ The maximum number of threads for background data parsing and insertion.
 
 Possible values:
 
--   Positive integer.
--   0 — Asynchronous insertions are disabled.
+- Positive integer.
+- 0 — Asynchronous insertions are disabled.
 
 Default value: `16`.
 
@@ -1543,8 +1717,8 @@ Enables or disables waiting for processing of asynchronous insertion. If enabled
 
 Possible values:
 
--   0 — Server returns `OK` even if the data is not yet inserted.
--   1 — Server returns `OK` only after the data is inserted.
+- 0 — Server returns `OK` even if the data is not yet inserted.
+- 1 — Server returns `OK` only after the data is inserted.
 
 Default value: `1`.
 
@@ -1554,8 +1728,8 @@ The timeout in seconds for waiting for processing of asynchronous insertion.
 
 Possible values:
 
--   Positive integer.
--   0 — Disabled.
+- Positive integer.
+- 0 — Disabled.
 
 Default value: [lock_acquire_timeout](#lock_acquire_timeout).
 
@@ -1565,19 +1739,19 @@ The maximum size of the unparsed data in bytes collected per query before being
 
 Possible values:
 
--   Positive integer.
--   0 — Asynchronous insertions are disabled.
+- Positive integer.
+- 0 — Asynchronous insertions are disabled.
 
 Default value: `100000`.
 
 ### async_insert_max_query_number {#async-insert-max-query-number}
 
-The maximum number of insert queries per block before being inserted. This setting takes effect only if [async_insert_deduplicate](#settings-async-insert-deduplicate) is enabled.
+The maximum number of insert queries per block before being inserted. This setting takes effect only if [async_insert_deduplicate](#async-insert-deduplicate) is enabled.
 
 Possible values:
 
--   Positive integer.
--   0 — Asynchronous insertions are disabled.
+- Positive integer.
+- 0 — Asynchronous insertions are disabled.
 
 Default value: `450`.
 
@@ -1587,8 +1761,8 @@ The maximum timeout in milliseconds since the first `INSERT` query before insert
 
 Possible values:
 
--   Positive integer.
--   0 — Timeout disabled.
+- Positive integer.
+- 0 — Timeout disabled.
 
 Default value: `200`.
 
@@ -1598,22 +1772,23 @@ The maximum timeout in milliseconds since the last `INSERT` query before dumping
 
 Possible values:
 
--   Positive integer.
--   0 — Timeout disabled.
+- Positive integer.
+- 0 — Timeout disabled.
 
 Default value: `0`.
-### async_insert_deduplicate {#settings-async-insert-deduplicate}
+
+### async_insert_deduplicate {#async-insert-deduplicate}
 
 Enables or disables insert deduplication of `ASYNC INSERT` (for Replicated\* tables).
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
-By default, async inserts are inserted into replicated tables by the `INSERT` statement enabling [async_isnert](#async-insert) are deduplicated (see [Data Replication](../../engines/table-engines/mergetree-family/replication.md)).
+By default, async inserts are inserted into replicated tables by the `INSERT` statement enabling [async_insert](#async-insert) are deduplicated (see [Data Replication](../../engines/table-engines/mergetree-family/replication.md)).
 For the replicated tables, by default, only 10000 of the most recent inserts for each partition are deduplicated (see [replicated_deduplication_window_for_async_inserts](merge-tree-settings.md/#replicated-deduplication-window-async-inserts), [replicated_deduplication_window_seconds_for_async_inserts](merge-tree-settings.md/#replicated-deduplication-window-seconds-async-inserts)).
 We recommend enabling the [async_block_ids_cache](merge-tree-settings.md/#use-async-block-ids-cache) to increase the efficiency of deduplication.
 This function does not work for non-replicated tables.
@@ -1644,7 +1819,7 @@ user can avoid the same inserted data being deduplicated.
 
 Possible values:
 
--  Any string
+- Any string
 
 Default value: empty string (disabled)
 
@@ -1687,8 +1862,8 @@ The setting sets the maximum number of retries for ClickHouse Keeper (or ZooKeep
 
 Possible values:
 
--   Positive integer.
--   0 — Retries are disabled
+- Positive integer.
+- 0 — Retries are disabled
 
 Default value: 0
 
@@ -1708,8 +1883,8 @@ Initial timeout(in milliseconds) to retry a failed Keeper request during INSERT
 
 Possible values:
 
--   Positive integer.
--   0 — No timeout
+- Positive integer.
+- 0 — No timeout
 
 Default value: 100
 
@@ -1719,8 +1894,8 @@ Maximum timeout (in milliseconds) to retry a failed Keeper request during INSERT
 
 Possible values:
 
--   Positive integer.
--   0 — Maximum timeout is not limited
+- Positive integer.
+- 0 — Maximum timeout is not limited
 
 Default value: 10000
 
@@ -1730,8 +1905,8 @@ Limits the data volume (in bytes) that is received or transmitted over the netwo
 
 Possible values:
 
--   Positive integer.
--   0 — Data volume control is disabled.
+- Positive integer.
+- 0 — Data volume control is disabled.
 
 Default value: 0.
 
@@ -1741,8 +1916,8 @@ Limits the speed of the data exchange over the network in bytes per second. This
 
 Possible values:
 
--   Positive integer.
--   0 — Bandwidth control is disabled.
+- Positive integer.
+- 0 — Bandwidth control is disabled.
 
 Default value: 0.
 
@@ -1752,8 +1927,8 @@ Limits the speed of the data exchange over the network in bytes per second. This
 
 Possible values:
 
--   Positive integer.
--   0 — Control of the data speed is disabled.
+- Positive integer.
+- 0 — Control of the data speed is disabled.
 
 Default value: 0.
 
@@ -1763,8 +1938,8 @@ Limits the speed that data is exchanged at over the network in bytes per second.
 
 Possible values:
 
--   Positive integer.
--   0 — Control of the data speed is disabled.
+- Positive integer.
+- 0 — Control of the data speed is disabled.
 
 Default value: 0.
 
@@ -1774,11 +1949,11 @@ Specifies which of the `uniq*` functions should be used to perform the [COUNT(DI
 
 Possible values:
 
--   [uniq](../../sql-reference/aggregate-functions/reference/uniq.md/#agg_function-uniq)
--   [uniqCombined](../../sql-reference/aggregate-functions/reference/uniqcombined.md/#agg_function-uniqcombined)
--   [uniqCombined64](../../sql-reference/aggregate-functions/reference/uniqcombined64.md/#agg_function-uniqcombined64)
--   [uniqHLL12](../../sql-reference/aggregate-functions/reference/uniqhll12.md/#agg_function-uniqhll12)
--   [uniqExact](../../sql-reference/aggregate-functions/reference/uniqexact.md/#agg_function-uniqexact)
+- [uniq](../../sql-reference/aggregate-functions/reference/uniq.md/#agg_function-uniq)
+- [uniqCombined](../../sql-reference/aggregate-functions/reference/uniqcombined.md/#agg_function-uniqcombined)
+- [uniqCombined64](../../sql-reference/aggregate-functions/reference/uniqcombined64.md/#agg_function-uniqcombined64)
+- [uniqHLL12](../../sql-reference/aggregate-functions/reference/uniqhll12.md/#agg_function-uniqhll12)
+- [uniqExact](../../sql-reference/aggregate-functions/reference/uniqexact.md/#agg_function-uniqexact)
 
 Default value: `uniqExact`.
 
@@ -1788,25 +1963,25 @@ Enables or disables silently skipping of unavailable shards.
 
 Shard is considered unavailable if all its replicas are unavailable. A replica is unavailable in the following cases:
 
--   ClickHouse can’t connect to replica for any reason.
+- ClickHouse can’t connect to replica for any reason.
 
     When connecting to a replica, ClickHouse performs several attempts. If all these attempts fail, the replica is considered unavailable.
 
--   Replica can’t be resolved through DNS.
+- Replica can’t be resolved through DNS.
 
     If replica’s hostname can’t be resolved through DNS, it can indicate the following situations:
 
-    -   Replica’s host has no DNS record. It can occur in systems with dynamic DNS, for example, [Kubernetes](https://kubernetes.io), where nodes can be unresolvable during downtime, and this is not an error.
+    - Replica’s host has no DNS record. It can occur in systems with dynamic DNS, for example, [Kubernetes](https://kubernetes.io), where nodes can be unresolvable during downtime, and this is not an error.
 
-    -   Configuration error. ClickHouse configuration file contains a wrong hostname.
+    - Configuration error. ClickHouse configuration file contains a wrong hostname.
 
 Possible values:
 
--   1 — skipping enabled.
+- 1 — skipping enabled.
 
     If a shard is unavailable, ClickHouse returns a result based on partial data and does not report node availability issues.
 
--   0 — skipping disabled.
+- 0 — skipping disabled.
 
     If a shard is unavailable, ClickHouse throws an exception.
 
@@ -1818,9 +1993,9 @@ Do not merge aggregation states from different servers for distributed query pro
 
 Possible values:
 
--   `0` — Disabled (final query processing is done on the initiator node).
--   `1` - Do not merge aggregation states from different servers for distributed query processing (query completelly processed on the shard, initiator only proxy the data), can be used in case it is for certain that there are different keys on different shards.
--   `2` - Same as `1` but applies `ORDER BY` and `LIMIT` (it is not possible when the query processed completelly on the remote node, like for `distributed_group_by_no_merge=1`) on the initiator (can be used for queries with `ORDER BY` and/or `LIMIT`).
+- `0` — Disabled (final query processing is done on the initiator node).
+- `1` - Do not merge aggregation states from different servers for distributed query processing (query completely processed on the shard, initiator only proxy the data), can be used in case it is for certain that there are different keys on different shards.
+- `2` - Same as `1` but applies `ORDER BY` and `LIMIT` (it is not possible when the query processed completely on the remote node, like for `distributed_group_by_no_merge=1`) on the initiator (can be used for queries with `ORDER BY` and/or `LIMIT`).
 
 Default value: `0`
 
@@ -1858,28 +2033,28 @@ FORMAT PrettyCompactMonoBlock
 Enables or disables [LIMIT](#limit) applying on each shard separatelly.
 
 This will allow to avoid:
--  Sending extra rows over network;
--  Processing rows behind the limit on the initiator.
+- Sending extra rows over network;
+- Processing rows behind the limit on the initiator.
 
 Starting from 21.9 version you cannot get inaccurate results anymore, since `distributed_push_down_limit` changes query execution only if at least one of the conditions met:
--  [distributed_group_by_no_merge](#distributed-group-by-no-merge) > 0.
--  Query **does not have** `GROUP BY`/`DISTINCT`/`LIMIT BY`, but it has `ORDER BY`/`LIMIT`.
--  Query **has** `GROUP BY`/`DISTINCT`/`LIMIT BY` with `ORDER BY`/`LIMIT` and:
-    -  [optimize_skip_unused_shards](#optimize-skip-unused-shards) is enabled.
-    -  [optimize_distributed_group_by_sharding_key](#optimize-distributed-group-by-sharding-key) is enabled.
+- [distributed_group_by_no_merge](#distributed-group-by-no-merge) > 0.
+- Query **does not have** `GROUP BY`/`DISTINCT`/`LIMIT BY`, but it has `ORDER BY`/`LIMIT`.
+- Query **has** `GROUP BY`/`DISTINCT`/`LIMIT BY` with `ORDER BY`/`LIMIT` and:
+    - [optimize_skip_unused_shards](#optimize-skip-unused-shards) is enabled.
+    - [optimize_distributed_group_by_sharding_key](#optimize-distributed-group-by-sharding-key) is enabled.
 
 Possible values:
 
--  0 — Disabled.
--  1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: `1`.
 
 See also:
 
--   [distributed_group_by_no_merge](#distributed-group-by-no-merge)
--   [optimize_skip_unused_shards](#optimize-skip-unused-shards)
--   [optimize_distributed_group_by_sharding_key](#optimize-distributed-group-by-sharding-key)
+- [distributed_group_by_no_merge](#distributed-group-by-no-merge)
+- [optimize_skip_unused_shards](#optimize-skip-unused-shards)
+- [optimize_distributed_group_by_sharding_key](#optimize-distributed-group-by-sharding-key)
 
 ## optimize_skip_unused_shards_limit {#optimize-skip-unused-shards-limit}
 
@@ -1895,8 +2070,8 @@ Enables or disables skipping of unused shards for [SELECT](../../sql-reference/s
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0
 
@@ -1906,8 +2081,8 @@ Rewrite IN in query for remote shards to exclude values that does not belong to
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1 (since it requires `optimize_skip_unused_shards` anyway, which `0` by default)
 
@@ -1917,8 +2092,8 @@ Allow nondeterministic (like `rand` or `dictGet`, since later has some caveats w
 
 Possible values:
 
--   0 — Disallowed.
--   1 — Allowed.
+- 0 — Disallowed.
+- 1 — Allowed.
 
 Default value: 0
 
@@ -1928,9 +2103,9 @@ Controls [`optimize_skip_unused_shards`](#optimize-skip-unused-shards) (hence st
 
 Possible values:
 
--   0 — Disabled, `optimize_skip_unused_shards` works always.
--   1 — Enables `optimize_skip_unused_shards` only for the first level.
--   2 — Enables `optimize_skip_unused_shards` up to the second level.
+- 0 — Disabled, `optimize_skip_unused_shards` works always.
+- 1 — Enables `optimize_skip_unused_shards` only for the first level.
+- 2 — Enables `optimize_skip_unused_shards` up to the second level.
 
 Default value: 0
 
@@ -1940,9 +2115,9 @@ Enables or disables query execution if [optimize_skip_unused_shards](#optimize-s
 
 Possible values:
 
--   0 — Disabled. ClickHouse does not throw an exception.
--   1 — Enabled. Query execution is disabled only if the table has a sharding key.
--   2 — Enabled. Query execution is disabled regardless of whether a sharding key is defined for the table.
+- 0 — Disabled. ClickHouse does not throw an exception.
+- 1 — Enabled. Query execution is disabled only if the table has a sharding key.
+- 2 — Enabled. Query execution is disabled regardless of whether a sharding key is defined for the table.
 
 Default value: 0
 
@@ -1952,9 +2127,9 @@ Controls [`force_optimize_skip_unused_shards`](#force-optimize-skip-unused-shard
 
 Possible values:
 
--   0 - Disabled, `force_optimize_skip_unused_shards` works always.
--   1 — Enables `force_optimize_skip_unused_shards` only for the first level.
--   2 — Enables `force_optimize_skip_unused_shards` up to the second level.
+- 0 - Disabled, `force_optimize_skip_unused_shards` works always.
+- 1 — Enables `force_optimize_skip_unused_shards` only for the first level.
+- 2 — Enables `force_optimize_skip_unused_shards` up to the second level.
 
 Default value: 0
 
@@ -1979,16 +2154,16 @@ The following types of queries are not supported (support for some of them may b
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0
 
 See also:
 
--   [distributed_group_by_no_merge](#distributed-group-by-no-merge)
--   [distributed_push_down_limit](#distributed-push-down-limit)
--   [optimize_skip_unused_shards](#optimize-skip-unused-shards)
+- [distributed_group_by_no_merge](#distributed-group-by-no-merge)
+- [distributed_push_down_limit](#distributed-push-down-limit)
+- [optimize_skip_unused_shards](#optimize-skip-unused-shards)
 
 :::note
 Right now it requires `optimize_skip_unused_shards` (the reason behind this is that one day it may be enabled by default, and it will work correctly only if data was inserted via Distributed table, i.e. data is distributed according to sharding_key).
@@ -2002,8 +2177,8 @@ By default, `OPTIMIZE` returns successfully even if it didn’t do anything. Thi
 
 Possible values:
 
--   1 — Throwing an exception is enabled.
--   0 — Throwing an exception is disabled.
+- 1 — Throwing an exception is enabled.
+- 0 — Throwing an exception is disabled.
 
 Default value: 0.
 
@@ -2017,8 +2192,8 @@ By default, `OPTIMIZE TABLE ... FINAL` query rewrites the one part even if there
 
 Possible values:
 
--   1 - Enable optimization.
--   0 - Disable optimization.
+- 1 - Enable optimization.
+- 0 - Disable optimization.
 
 Default value: 0.
 
@@ -2028,19 +2203,19 @@ Enables or disables optimization by transforming some functions to reading subco
 
 These functions can be transformed:
 
--   [length](../../sql-reference/functions/array-functions.md/#array_functions-length) to read the [size0](../../sql-reference/data-types/array.md/#array-size) subcolumn.
--   [empty](../../sql-reference/functions/array-functions.md/#function-empty) to read the [size0](../../sql-reference/data-types/array.md/#array-size) subcolumn.
--   [notEmpty](../../sql-reference/functions/array-functions.md/#function-notempty) to read the [size0](../../sql-reference/data-types/array.md/#array-size) subcolumn.
--   [isNull](../../sql-reference/operators/index.md#operator-is-null) to read the [null](../../sql-reference/data-types/nullable.md/#finding-null) subcolumn.
--   [isNotNull](../../sql-reference/operators/index.md#is-not-null) to read the [null](../../sql-reference/data-types/nullable.md/#finding-null) subcolumn.
--   [count](../../sql-reference/aggregate-functions/reference/count.md) to read the [null](../../sql-reference/data-types/nullable.md/#finding-null) subcolumn.
--   [mapKeys](../../sql-reference/functions/tuple-map-functions.md/#mapkeys) to read the [keys](../../sql-reference/data-types/map.md/#map-subcolumns) subcolumn.
--   [mapValues](../../sql-reference/functions/tuple-map-functions.md/#mapvalues) to read the [values](../../sql-reference/data-types/map.md/#map-subcolumns) subcolumn.
+- [length](../../sql-reference/functions/array-functions.md/#array_functions-length) to read the [size0](../../sql-reference/data-types/array.md/#array-size) subcolumn.
+- [empty](../../sql-reference/functions/array-functions.md/#function-empty) to read the [size0](../../sql-reference/data-types/array.md/#array-size) subcolumn.
+- [notEmpty](../../sql-reference/functions/array-functions.md/#function-notempty) to read the [size0](../../sql-reference/data-types/array.md/#array-size) subcolumn.
+- [isNull](../../sql-reference/operators/index.md#operator-is-null) to read the [null](../../sql-reference/data-types/nullable.md/#finding-null) subcolumn.
+- [isNotNull](../../sql-reference/operators/index.md#is-not-null) to read the [null](../../sql-reference/data-types/nullable.md/#finding-null) subcolumn.
+- [count](../../sql-reference/aggregate-functions/reference/count.md) to read the [null](../../sql-reference/data-types/nullable.md/#finding-null) subcolumn.
+- [mapKeys](../../sql-reference/functions/tuple-map-functions.md/#mapkeys) to read the [keys](../../sql-reference/data-types/map.md/#map-subcolumns) subcolumn.
+- [mapValues](../../sql-reference/functions/tuple-map-functions.md/#mapvalues) to read the [values](../../sql-reference/data-types/map.md/#map-subcolumns) subcolumn.
 
 Possible values:
 
--   0 — Optimization disabled.
--   1 — Optimization enabled.
+- 0 — Optimization disabled.
+- 1 — Optimization enabled.
 
 Default value: `0`.
 
@@ -2057,49 +2232,49 @@ Default value: `1`.
 
 See also:
 
--   [optimize_functions_to_subcolumns](#optimize-functions-to-subcolumns)
+- [optimize_functions_to_subcolumns](#optimize-functions-to-subcolumns)
 
 ## distributed_replica_error_half_life {#settings-distributed_replica_error_half_life}
 
--   Type: seconds
--   Default value: 60 seconds
+- Type: seconds
+- Default value: 60 seconds
 
 Controls how fast errors in distributed tables are zeroed. If a replica is unavailable for some time, accumulates 5 errors, and distributed_replica_error_half_life is set to 1 second, then the replica is considered normal 3 seconds after the last error.
 
 See also:
 
--   [load_balancing](#load_balancing-round_robin)
--   [Table engine Distributed](../../engines/table-engines/special/distributed.md)
--   [distributed_replica_error_cap](#settings-distributed_replica_error_cap)
--   [distributed_replica_max_ignored_errors](#settings-distributed_replica_max_ignored_errors)
+- [load_balancing](#load_balancing-round_robin)
+- [Table engine Distributed](../../engines/table-engines/special/distributed.md)
+- [distributed_replica_error_cap](#settings-distributed_replica_error_cap)
+- [distributed_replica_max_ignored_errors](#settings-distributed_replica_max_ignored_errors)
 
 ## distributed_replica_error_cap {#settings-distributed_replica_error_cap}
 
--   Type: unsigned int
--   Default value: 1000
+- Type: unsigned int
+- Default value: 1000
 
 The error count of each replica is capped at this value, preventing a single replica from accumulating too many errors.
 
 See also:
 
--   [load_balancing](#load_balancing-round_robin)
--   [Table engine Distributed](../../engines/table-engines/special/distributed.md)
--   [distributed_replica_error_half_life](#settings-distributed_replica_error_half_life)
--   [distributed_replica_max_ignored_errors](#settings-distributed_replica_max_ignored_errors)
+- [load_balancing](#load_balancing-round_robin)
+- [Table engine Distributed](../../engines/table-engines/special/distributed.md)
+- [distributed_replica_error_half_life](#settings-distributed_replica_error_half_life)
+- [distributed_replica_max_ignored_errors](#settings-distributed_replica_max_ignored_errors)
 
 ## distributed_replica_max_ignored_errors {#settings-distributed_replica_max_ignored_errors}
 
--   Type: unsigned int
--   Default value: 0
+- Type: unsigned int
+- Default value: 0
 
 The number of errors that will be ignored while choosing replicas (according to `load_balancing` algorithm).
 
 See also:
 
--   [load_balancing](#load_balancing-round_robin)
--   [Table engine Distributed](../../engines/table-engines/special/distributed.md)
--   [distributed_replica_error_cap](#settings-distributed_replica_error_cap)
--   [distributed_replica_error_half_life](#settings-distributed_replica_error_half_life)
+- [load_balancing](#load_balancing-round_robin)
+- [Table engine Distributed](../../engines/table-engines/special/distributed.md)
+- [distributed_replica_error_cap](#settings-distributed_replica_error_cap)
+- [distributed_replica_error_half_life](#settings-distributed_replica_error_half_life)
 
 ## distributed_directory_monitor_sleep_time_ms {#distributed_directory_monitor_sleep_time_ms}
 
@@ -2107,7 +2282,7 @@ Base interval for the [Distributed](../../engines/table-engines/special/distribu
 
 Possible values:
 
--   A positive integer number of milliseconds.
+- A positive integer number of milliseconds.
 
 Default value: 100 milliseconds.
 
@@ -2117,7 +2292,7 @@ Maximum interval for the [Distributed](../../engines/table-engines/special/distr
 
 Possible values:
 
--   A positive integer number of milliseconds.
+- A positive integer number of milliseconds.
 
 Default value: 30000 milliseconds (30 seconds).
 
@@ -2129,8 +2304,8 @@ When batch sending is enabled, the [Distributed](../../engines/table-engines/spe
 
 Possible values:
 
--   1 — Enabled.
--   0 — Disabled.
+- 1 — Enabled.
+- 0 — Disabled.
 
 Default value: 0.
 
@@ -2144,8 +2319,8 @@ So installing this setting to `1` will disable batching for such batches (i.e. t
 
 Possible values:
 
--   1 — Enabled.
--   0 — Disabled.
+- 1 — Enabled.
+- 0 — Disabled.
 
 Default value: 0.
 
@@ -2153,7 +2328,7 @@ Default value: 0.
 This setting also affects broken batches (that may appears because of abnormal server (machine) termination and no `fsync_after_insert`/`fsync_directories` for [Distributed](../../engines/table-engines/special/distributed.md) table engine).
 :::
 
-:::warning
+:::note
 You should not rely on automatic batch splitting, since this may hurt performance.
 :::
 
@@ -2161,13 +2336,13 @@ You should not rely on automatic batch splitting, since this may hurt performanc
 
 Sets the priority ([nice](https://en.wikipedia.org/wiki/Nice_(Unix))) for threads that execute queries. The OS scheduler considers this priority when choosing the next thread to run on each available CPU core.
 
-:::warning
+:::note
 To use this setting, you need to set the `CAP_SYS_NICE` capability. The `clickhouse-server` package sets it up during installation. Some virtual environments do not allow you to set the `CAP_SYS_NICE` capability. In this case, `clickhouse-server` shows a message about it at the start.
 :::
 
 Possible values:
 
--   You can set values in the range `[-20, 19]`.
+- You can set values in the range `[-20, 19]`.
 
 Lower values mean higher priority. Threads with low `nice` priority values are executed more frequently than threads with high values. High values are preferable for long-running non-interactive queries because it allows them to quickly give up resources in favour of short interactive queries when they arrive.
 
@@ -2179,14 +2354,14 @@ Sets the period for a real clock timer of the [query profiler](../../operations/
 
 Possible values:
 
--   Positive integer number, in nanoseconds.
+- Positive integer number, in nanoseconds.
 
     Recommended values:
 
             - 10000000 (100 times a second) nanoseconds and less for single queries.
             - 1000000000 (once a second) for cluster-wide profiling.
 
--   0 for turning off the timer.
+- 0 for turning off the timer.
 
 Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
@@ -2194,7 +2369,7 @@ Default value: 1000000000 nanoseconds (once a second).
 
 See also:
 
--   System table [trace_log](../../operations/system-tables/trace_log.md/#system_tables-trace_log)
+- System table [trace_log](../../operations/system-tables/trace_log.md/#system_tables-trace_log)
 
 ## query_profiler_cpu_time_period_ns {#query_profiler_cpu_time_period_ns}
 
@@ -2202,14 +2377,14 @@ Sets the period for a CPU clock timer of the [query profiler](../../operations/o
 
 Possible values:
 
--   A positive integer number of nanoseconds.
+- A positive integer number of nanoseconds.
 
     Recommended values:
 
             - 10000000 (100 times a second) nanoseconds and more for single queries.
             - 1000000000 (once a second) for cluster-wide profiling.
 
--   0 for turning off the timer.
+- 0 for turning off the timer.
 
 Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
@@ -2217,7 +2392,7 @@ Default value: 1000000000 nanoseconds.
 
 See also:
 
--   System table [trace_log](../../operations/system-tables/trace_log.md/#system_tables-trace_log)
+- System table [trace_log](../../operations/system-tables/trace_log.md/#system_tables-trace_log)
 
 ## memory_profiler_step {#memory_profiler_step}
 
@@ -2225,9 +2400,9 @@ Sets the step of memory profiler. Whenever query memory usage becomes larger tha
 
 Possible values:
 
--   A positive integer number of bytes.
+- A positive integer number of bytes.
 
--   0 for turning off the memory profiler.
+- 0 for turning off the memory profiler.
 
 Default value: 4,194,304 bytes (4 MiB).
 
@@ -2237,9 +2412,9 @@ Sets the probability of collecting stacktraces at random allocations and dealloc
 
 Possible values:
 
--   A positive floating-point number in the range [0..1].
+- A positive floating-point number in the range [0..1].
 
--   0.0 for turning off the memory sampling.
+- 0.0 for turning off the memory sampling.
 
 Default value: 0.0.
 
@@ -2249,8 +2424,8 @@ Enables or disables collecting stacktraces on each update of profile events alon
 
 Possible values:
 
--   1 — Tracing of profile events enabled.
--   0 — Tracing of profile events disabled.
+- 1 — Tracing of profile events enabled.
+- 0 — Tracing of profile events disabled.
 
 Default value: 0.
 
@@ -2260,15 +2435,15 @@ Enables or disables [introspections functions](../../sql-reference/functions/int
 
 Possible values:
 
--   1 — Introspection functions enabled.
--   0 — Introspection functions disabled.
+- 1 — Introspection functions enabled.
+- 0 — Introspection functions disabled.
 
 Default value: 0.
 
 **See Also**
 
--   [Sampling Query Profiler](../../operations/optimizing-performance/sampling-query-profiler.md)
--   System table [trace_log](../../operations/system-tables/trace_log.md/#system_tables-trace_log)
+- [Sampling Query Profiler](../../operations/optimizing-performance/sampling-query-profiler.md)
+- System table [trace_log](../../operations/system-tables/trace_log.md/#system_tables-trace_log)
 
 ## input_format_parallel_parsing {#input-format-parallel-parsing}
 
@@ -2276,8 +2451,8 @@ Enables or disables order-preserving parallel parsing of data formats. Supported
 
 Possible values:
 
--   1 — Enabled.
--   0 — Disabled.
+- 1 — Enabled.
+- 0 — Disabled.
 
 Default value: `1`.
 
@@ -2287,15 +2462,15 @@ Enables or disables parallel formatting of data formats. Supported only for [TSV
 
 Possible values:
 
--   1 — Enabled.
--   0 — Disabled.
+- 1 — Enabled.
+- 0 — Disabled.
 
 Default value: `1`.
 
 ## min_chunk_bytes_for_parallel_parsing {#min-chunk-bytes-for-parallel-parsing}
 
--   Type: unsigned int
--   Default value: 1 MiB
+- Type: unsigned int
+- Default value: 1 MiB
 
 The minimum chunk size in bytes, which each thread will parse in parallel.
 
@@ -2305,7 +2480,7 @@ Sleep time for merge selecting when no part is selected. A lower setting trigger
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: `5000`.
 
@@ -2317,9 +2492,9 @@ If we execute `INSERT INTO distributed_table_a SELECT ... FROM distributed_table
 
 Possible values:
 
--   0 — Disabled.
--   1 — `SELECT` will be executed on each shard from the underlying table of the distributed engine.
--   2 — `SELECT` and `INSERT` will be executed on each shard from/to the underlying table of the distributed engine.
+- 0 — Disabled.
+- 1 — `SELECT` will be executed on each shard from the underlying table of the distributed engine.
+- 2 — `SELECT` and `INSERT` will be executed on each shard from/to the underlying table of the distributed engine.
 
 Default value: 0.
 
@@ -2331,15 +2506,15 @@ By default, when inserting data into a `Distributed` table, the ClickHouse serve
 
 Possible values:
 
--   0 — Data is inserted in asynchronous mode.
--   1 — Data is inserted in synchronous mode.
+- 0 — Data is inserted in asynchronous mode.
+- 1 — Data is inserted in synchronous mode.
 
 Default value: `0`.
 
 **See Also**
 
--   [Distributed Table Engine](../../engines/table-engines/special/distributed.md/#distributed)
--   [Managing Distributed Tables](../../sql-reference/statements/system.md/#query-language-system-distributed)
+- [Distributed Table Engine](../../engines/table-engines/special/distributed.md/#distributed)
+- [Managing Distributed Tables](../../sql-reference/statements/system.md/#query-language-system-distributed)
 
 ## insert_shard_id {#insert_shard_id}
 
@@ -2355,8 +2530,8 @@ SELECT uniq(shard_num) FROM system.clusters WHERE cluster = 'requested_cluster';
 
 Possible values:
 
--   0 — Disabled.
--   Any number from `1` to `shards_num` of corresponding [Distributed](../../engines/table-engines/special/distributed.md/#distributed) table.
+- 0 — Disabled.
+- Any number from `1` to `shards_num` of corresponding [Distributed](../../engines/table-engines/special/distributed.md/#distributed) table.
 
 Default value: `0`.
 
@@ -2394,8 +2569,8 @@ Uses compact format for storing blocks for async (`insert_distributed_sync`) INS
 
 Possible values:
 
--   0 — Uses `user[:password]@host:port#default_database` directory format.
--   1 — Uses `[shard{shard_index}[_replica{replica_index}]]` directory format.
+- 0 — Uses `user[:password]@host:port#default_database` directory format.
+- 1 — Uses `[shard{shard_index}[_replica{replica_index}]]` directory format.
 
 Default value: `1`.
 
@@ -2406,43 +2581,19 @@ Default value: `1`.
 
 ## background_buffer_flush_schedule_pool_size {#background_buffer_flush_schedule_pool_size}
 
-Sets the number of threads performing background flush in [Buffer](../../engines/table-engines/special/buffer.md)-engine tables. This setting is applied at the ClickHouse server start and can’t be changed in a user session.
-
-Possible values:
-
--   Any positive integer.
-
-Default value: 16.
+That setting was moved to the [server configuration parameters](../../operations/server-configuration-parameters/settings.md/#background_buffer_flush_schedule_pool_size).
 
 ## background_move_pool_size {#background_move_pool_size}
 
-Sets the number of threads performing background moves of data parts for [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-multiple-volumes)-engine tables. This setting is applied at the ClickHouse server start and can’t be changed in a user session.
-
-Possible values:
-
--   Any positive integer.
-
-Default value: 8.
+That setting was moved to the [server configuration parameters](../../operations/server-configuration-parameters/settings.md/#background_move_pool_size).
 
 ## background_schedule_pool_size {#background_schedule_pool_size}
 
-Sets the number of threads performing background tasks for [replicated](../../engines/table-engines/mergetree-family/replication.md) tables, [Kafka](../../engines/table-engines/integrations/kafka.md) streaming, [DNS cache updates](../../operations/server-configuration-parameters/settings.md/#server-settings-dns-cache-update-period). This setting is applied at ClickHouse server start and can’t be changed in a user session.
-
-Possible values:
-
--   Any positive integer.
-
-Default value: 128.
+That setting was moved to the [server configuration parameters](../../operations/server-configuration-parameters/settings.md/#background_schedule_pool_size).
 
 ## background_fetches_pool_size {#background_fetches_pool_size}
 
-Sets the number of threads performing background fetches for [replicated](../../engines/table-engines/mergetree-family/replication.md) tables. This setting is applied at the ClickHouse server start and can’t be changed in a user session. For production usage with frequent small insertions or slow ZooKeeper cluster it is recommended to use default value.
-
-Possible values:
-
--   Any positive integer.
-
-Default value: 8.
+That setting was moved to the [server configuration parameters](../../operations/server-configuration-parameters/settings.md/#background_fetches_pool_size).
 
 ## always_fetch_merged_part {#always_fetch_merged_part}
 
@@ -2452,39 +2603,22 @@ When merging is prohibited, the replica never merges parts and always downloads
 
 Possible values:
 
--   0 — `Replicated*MergeTree`-engine tables merge data parts at the replica.
--   1 — `Replicated*MergeTree`-engine tables do not merge data parts at the replica. The tables download merged data parts from other replicas.
+- 0 — `Replicated*MergeTree`-engine tables merge data parts at the replica.
+- 1 — `Replicated*MergeTree`-engine tables do not merge data parts at the replica. The tables download merged data parts from other replicas.
 
 Default value: 0.
 
 **See Also**
 
--   [Data Replication](../../engines/table-engines/mergetree-family/replication.md)
+- [Data Replication](../../engines/table-engines/mergetree-family/replication.md)
 
 ## background_distributed_schedule_pool_size {#background_distributed_schedule_pool_size}
 
-Sets the number of threads performing background tasks for [distributed](../../engines/table-engines/special/distributed.md) sends. This setting is applied at the ClickHouse server start and can’t be changed in a user session.
-
-Possible values:
-
--   Any positive integer.
-
-Default value: 16.
+That setting was moved to the [server configuration parameters](../../operations/server-configuration-parameters/settings.md/#background_distributed_schedule_pool_size).
 
 ## background_message_broker_schedule_pool_size {#background_message_broker_schedule_pool_size}
 
-Sets the number of threads performing background tasks for message streaming. This setting is applied at the ClickHouse server start and can’t be changed in a user session.
-
-Possible values:
-
--   Any positive integer.
-
-Default value: 16.
-
-**See Also**
-
--   [Kafka](../../engines/table-engines/integrations/kafka.md/#kafka) engine.
--   [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md/#rabbitmq-engine) engine.
+That setting was moved to the [server configuration parameters](../../operations/server-configuration-parameters/settings.md/#background_message_broker_schedule_pool_size).
 
 ## validate_polygons {#validate_polygons}
 
@@ -2505,8 +2639,8 @@ By default, `NULL` values can’t be compared because `NULL` means undefined val
 
 Possible values:
 
--   0 — Comparison of `NULL` values in `IN` operator returns `false`.
--   1 — Comparison of `NULL` values in `IN` operator returns `true`.
+- 0 — Comparison of `NULL` values in `IN` operator returns `false`.
+- 1 — Comparison of `NULL` values in `IN` operator returns `true`.
 
 Default value: 0.
 
@@ -2553,7 +2687,7 @@ Result:
 
 **See Also**
 
--   [NULL Processing in IN Operators](../../sql-reference/operators/in.md/#in-null-processing)
+- [NULL Processing in IN Operators](../../sql-reference/operators/in.md/#in-null-processing)
 
 ## low_cardinality_max_dictionary_size {#low_cardinality_max_dictionary_size}
 
@@ -2561,7 +2695,7 @@ Sets a maximum size in rows of a shared global dictionary for the [LowCardinalit
 
 Possible values:
 
--   Any positive integer.
+- Any positive integer.
 
 Default value: 8192.
 
@@ -2573,8 +2707,8 @@ By default, the ClickHouse server monitors the size of dictionaries and if a dic
 
 Possible values:
 
--   1 — Creating several dictionaries for the data part is prohibited.
--   0 — Creating several dictionaries for the data part is not prohibited.
+- 1 — Creating several dictionaries for the data part is prohibited.
+- 0 — Creating several dictionaries for the data part is not prohibited.
 
 Default value: 0.
 
@@ -2588,8 +2722,8 @@ This setting is required mainly for third-party clients which do not support `Lo
 
 Possible values:
 
--   1 — Usage of `LowCardinality` is not restricted.
--   0 — Usage of `LowCardinality` is restricted.
+- 1 — Usage of `LowCardinality` is not restricted.
+- 0 — Usage of `LowCardinality` is restricted.
 
 Default value: 1.
 
@@ -2599,16 +2733,16 @@ Allows or restricts using [LowCardinality](../../sql-reference/data-types/lowcar
 
 For small fixed values using of `LowCardinality` is usually inefficient, because ClickHouse stores a numeric index for each row. As a result:
 
--   Disk space usage can rise.
--   RAM consumption can be higher, depending on a dictionary size.
--   Some functions can work slower due to extra coding/encoding operations.
+- Disk space usage can rise.
+- RAM consumption can be higher, depending on a dictionary size.
+- Some functions can work slower due to extra coding/encoding operations.
 
 Merge times in [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)-engine tables can grow due to all the reasons described above.
 
 Possible values:
 
--   1 — Usage of `LowCardinality` is not restricted.
--   0 — Usage of `LowCardinality` is restricted.
+- 1 — Usage of `LowCardinality` is not restricted.
+- 0 — Usage of `LowCardinality` is restricted.
 
 Default value: 0.
 
@@ -2618,14 +2752,14 @@ Sets the minimum number of rows in the block which can be inserted into a table
 
 Possible values:
 
--   Any positive integer.
--   0 — Squashing disabled.
+- Any positive integer.
+- 0 — Squashing disabled.
 
 Default value: 1048576.
 
 **See Also**
 
--   [min_insert_block_size_rows](#min-insert-block-size-rows)
+- [min_insert_block_size_rows](#min-insert-block-size-rows)
 
 ## min_insert_block_size_bytes_for_materialized_views {#min-insert-block-size-bytes-for-materialized-views}
 
@@ -2633,14 +2767,14 @@ Sets the minimum number of bytes in the block which can be inserted into a table
 
 Possible values:
 
--   Any positive integer.
--   0 — Squashing disabled.
+- Any positive integer.
+- 0 — Squashing disabled.
 
 Default value: 268435456.
 
 **See also**
 
--   [min_insert_block_size_bytes](#min-insert-block-size-bytes)
+- [min_insert_block_size_bytes](#min-insert-block-size-bytes)
 
 ## optimize_read_in_order {#optimize_read_in_order}
 
@@ -2648,14 +2782,14 @@ Enables [ORDER BY](../../sql-reference/statements/select/order-by.md/#optimize_r
 
 Possible values:
 
--   0 — `ORDER BY` optimization is disabled.
--   1 — `ORDER BY` optimization is enabled.
+- 0 — `ORDER BY` optimization is disabled.
+- 1 — `ORDER BY` optimization is enabled.
 
 Default value: `1`.
 
 **See Also**
 
--   [ORDER BY Clause](../../sql-reference/statements/select/order-by.md/#optimize_read_in_order)
+- [ORDER BY Clause](../../sql-reference/statements/select/order-by.md/#optimize_read_in_order)
 
 ## optimize_aggregation_in_order {#optimize_aggregation_in_order}
 
@@ -2663,14 +2797,14 @@ Enables [GROUP BY](../../sql-reference/statements/select/group-by.md) optimizati
 
 Possible values:
 
--   0 — `GROUP BY` optimization is disabled.
--   1 — `GROUP BY` optimization is enabled.
+- 0 — `GROUP BY` optimization is disabled.
+- 1 — `GROUP BY` optimization is enabled.
 
 Default value: `0`.
 
 **See Also**
 
--   [GROUP BY optimization](../../sql-reference/statements/select/group-by.md/#aggregation-in-order)
+- [GROUP BY optimization](../../sql-reference/statements/select/group-by.md/#aggregation-in-order)
 
 ## mutations_sync {#mutations_sync}
 
@@ -2678,16 +2812,16 @@ Allows to execute `ALTER TABLE ... UPDATE|DELETE` queries ([mutations](../../sql
 
 Possible values:
 
--   0 - Mutations execute asynchronously.
--   1 - The query waits for all mutations to complete on the current server.
--   2 - The query waits for all mutations to complete on all replicas (if they exist).
+- 0 - Mutations execute asynchronously.
+- 1 - The query waits for all mutations to complete on the current server.
+- 2 - The query waits for all mutations to complete on all replicas (if they exist).
 
 Default value: `0`.
 
 **See Also**
 
--   [Synchronicity of ALTER Queries](../../sql-reference/statements/alter/index.md#synchronicity-of-alter-queries)
--   [Mutations](../../sql-reference/statements/alter/index.md#mutations)
+- [Synchronicity of ALTER Queries](../../sql-reference/statements/alter/index.md#synchronicity-of-alter-queries)
+- [Mutations](../../sql-reference/statements/alter/index.md#mutations)
 
 ## ttl_only_drop_parts {#ttl_only_drop_parts}
 
@@ -2701,15 +2835,15 @@ Dropping whole parts instead of partial cleaning TTL-d rows allows having shorte
 
 Possible values:
 
--   0 — The complete dropping of data parts is disabled.
--   1 — The complete dropping of data parts is enabled.
+- 0 — The complete dropping of data parts is disabled.
+- 1 — The complete dropping of data parts is enabled.
 
 Default value: `0`.
 
 **See Also**
 
--   [CREATE TABLE query clauses and settings](../../engines/table-engines/mergetree-family/mergetree.md/#mergetree-query-clauses) (`merge_with_ttl_timeout` setting)
--   [Table TTL](../../engines/table-engines/mergetree-family/mergetree.md/#mergetree-table-ttl)
+- [CREATE TABLE query clauses and settings](../../engines/table-engines/mergetree-family/mergetree.md/#mergetree-query-clauses) (`merge_with_ttl_timeout` setting)
+- [Table TTL](../../engines/table-engines/mergetree-family/mergetree.md/#mergetree-table-ttl)
 
 ## lock_acquire_timeout {#lock_acquire_timeout}
 
@@ -2719,21 +2853,21 @@ Locking timeout is used to protect from deadlocks while executing read/write ope
 
 Possible values:
 
--   Positive integer (in seconds).
--   0 — No locking timeout.
+- Positive integer (in seconds).
+- 0 — No locking timeout.
 
 Default value: `120` seconds.
 
 ## cast_keep_nullable {#cast_keep_nullable}
 
-Enables or disables keeping of the `Nullable` data type in [CAST](../../sql-reference/functions/type-conversion-functions.md/#type_conversion_function-cast) operations.
+Enables or disables keeping of the `Nullable` data type in [CAST](../../sql-reference/functions/type-conversion-functions.md/#castx-t) operations.
 
 When the setting is enabled and the argument of `CAST` function is `Nullable`, the result is also transformed to `Nullable` type. When the setting is disabled, the result always has the destination type exactly.
 
 Possible values:
 
--  0 — The `CAST` result has exactly the destination type specified.
--  1 — If the argument type is `Nullable`, the `CAST` result is transformed to `Nullable(DestinationDataType)`.
+- 0 — The `CAST` result has exactly the destination type specified.
+- 1 — If the argument type is `Nullable`, the `CAST` result is transformed to `Nullable(DestinationDataType)`.
 
 Default value: `0`.
 
@@ -2771,7 +2905,7 @@ Result:
 
 **See Also**
 
--   [CAST](../../sql-reference/functions/type-conversion-functions.md/#type_conversion_function-cast) function
+- [CAST](../../sql-reference/functions/type-conversion-functions.md/#type_conversion_function-cast) function
 
 ## system_events_show_zero_values {#system_events_show_zero_values}
 
@@ -2781,8 +2915,8 @@ Some monitoring systems require passing all the metrics values to them for each
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: `0`.
 
@@ -2825,11 +2959,11 @@ Possible values:
 
 Default value: `0`.
 
-:::warning
+:::note
 Nullable primary key usually indicates bad design. It is forbidden in almost all main stream DBMS. The feature is mainly for [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) and is not heavily tested. Use with care.
 :::
 
-:::warning
+:::note
 Do not enable this feature in version `<= 21.8`. It's not properly implemented and may lead to server crash.
 :::
 
@@ -2840,8 +2974,8 @@ It is implemented via query rewrite (similar to [count_distinct_implementation](
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 0.
 
@@ -2872,9 +3006,9 @@ Sets a mode for combining `SELECT` query results. The setting is only used when
 
 Possible values:
 
--   `'DISTINCT'` — ClickHouse outputs rows as a result of combining queries removing duplicate rows.
--   `'ALL'` — ClickHouse outputs all rows as a result of combining queries including duplicate rows.
--   `''` — ClickHouse generates an exception when used with `UNION`.
+- `'DISTINCT'` — ClickHouse outputs rows as a result of combining queries removing duplicate rows.
+- `'ALL'` — ClickHouse outputs all rows as a result of combining queries including duplicate rows.
+- `''` — ClickHouse generates an exception when used with `UNION`.
 
 Default value: `''`.
 
@@ -2951,8 +3085,8 @@ Enables special logic to perform merges on replicas.
 
 Possible values:
 
--   Positive integer (in seconds).
--   0 — Special merges logic is not used. Merges happen in the usual way on all the replicas.
+- Positive integer (in seconds).
+- 0 — Special merges logic is not used. Merges happen in the usual way on all the replicas.
 
 Default value: `0`.
 
@@ -2966,12 +3100,12 @@ It can be useful when merges are CPU bounded not IO bounded (performing heavy da
 
 ## max_final_threads {#max-final-threads}
 
-Sets the maximum number of parallel threads for the `SELECT` query data read phase with the [FINAL](../../sql-reference/statements/select/from.md/#select-from-final) modifier.
+Sets the maximum number of parallel threads for the `SELECT` query data read phase with the [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier.
 
 Possible values:
 
--   Positive integer.
--   0 or 1 — Disabled. `SELECT` queries are executed in a single thread.
+- Positive integer.
+- 0 or 1 — Disabled. `SELECT` queries are executed in a single thread.
 
 Default value: `16`.
 
@@ -2981,9 +3115,9 @@ Sets the probability that the ClickHouse can start a trace for executed queries
 
 Possible values:
 
--   0 — The trace for all executed queries is disabled (if no parent trace context is supplied).
--   Positive floating-point number in the range [0..1]. For example, if the setting value is `0,5`, ClickHouse can start a trace on average for half of the queries.
--   1 — The trace for all executed queries is enabled.
+- 0 — The trace for all executed queries is disabled (if no parent trace context is supplied).
+- Positive floating-point number in the range [0..1]. For example, if the setting value is `0,5`, ClickHouse can start a trace on average for half of the queries.
+- 1 — The trace for all executed queries is enabled.
 
 Default value: `0`.
 
@@ -2993,8 +3127,8 @@ Enables or disables data transformation before the insertion, as if merge was do
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: 1.
 
@@ -3061,9 +3195,9 @@ Possible values:
 
 Default value: `0`.
 
-## s3_truncate_on_insert 
+## s3_truncate_on_insert
 
-Enables or disables truncate before inserts in s3 engine tables. If disabled, an exception will be thrown on insert attempts if an S3 object already exists. 
+Enables or disables truncate before inserts in s3 engine tables. If disabled, an exception will be thrown on insert attempts if an S3 object already exists.
 
 Possible values:
 - 0 — `INSERT` query appends new data to the end of the file.
@@ -3071,9 +3205,9 @@ Possible values:
 
 Default value: `0`.
 
-## hdfs_truncate_on_insert 
+## hdfs_truncate_on_insert
 
-Enables or disables truncation before an insert in hdfs engine tables. If disabled, an exception will be thrown on an attempt to insert if a file in HDFS already exists. 
+Enables or disables truncation before an insert in hdfs engine tables. If disabled, an exception will be thrown on an attempt to insert if a file in HDFS already exists.
 
 Possible values:
 - 0 — `INSERT` query appends new data to the end of the file.
@@ -3081,11 +3215,11 @@ Possible values:
 
 Default value: `0`.
 
-## engine_file_allow_create_multiple_files 
+## engine_file_allow_create_multiple_files
 
 Enables or disables creating a new file on each insert in file engine tables if the format has the suffix (`JSON`, `ORC`, `Parquet`, etc.). If enabled, on each insert a new file will be created with a name following this pattern:
 
-`data.Parquet` -> `data.1.Parquet` -> `data.2.Parquet`, etc. 
+`data.Parquet` -> `data.1.Parquet` -> `data.2.Parquet`, etc.
 
 Possible values:
 - 0 — `INSERT` query appends new data to the end of the file.
@@ -3093,11 +3227,11 @@ Possible values:
 
 Default value: `0`.
 
-## s3_create_new_file_on_insert 
+## s3_create_new_file_on_insert
 
 Enables or disables creating a new file on each insert in s3 engine tables. If enabled, on each insert a new S3 object will be created with the key, similar to this pattern:
 
-initial: `data.Parquet.gz` -> `data.1.Parquet.gz` -> `data.2.Parquet.gz`, etc. 
+initial: `data.Parquet.gz` -> `data.1.Parquet.gz` -> `data.2.Parquet.gz`, etc.
 
 Possible values:
 - 0 — `INSERT` query appends new data to the end of the file.
@@ -3109,7 +3243,7 @@ Default value: `0`.
 
 Enables or disables creating a new file on each insert in HDFS engine tables. If enabled, on each insert a new HDFS file will be created with the name, similar to this pattern:
 
-initial: `data.Parquet.gz` -> `data.1.Parquet.gz` -> `data.2.Parquet.gz`, etc. 
+initial: `data.Parquet.gz` -> `data.1.Parquet.gz` -> `data.2.Parquet.gz`, etc.
 
 Possible values:
 - 0 — `INSERT` query appends new data to the end of the file.
@@ -3117,25 +3251,14 @@ Possible values:
 
 Default value: `0`.
 
-## allow_experimental_geo_types {#allow-experimental-geo-types}
-
-Allows working with experimental [geo data types](../../sql-reference/data-types/geo.md).
-
-Possible values:
-
--   0 — Working with geo data types is disabled.
--   1 — Working with geo data types is enabled.
-
-Default value: `0`.
-
 ## database_atomic_wait_for_drop_and_detach_synchronously {#database_atomic_wait_for_drop_and_detach_synchronously}
 
 Adds a modifier `SYNC` to all `DROP` and `DETACH` queries.
 
 Possible values:
 
--   0 — Queries will be executed with delay.
--   1 — Queries will be executed without delay.
+- 0 — Queries will be executed with delay.
+- 1 — Queries will be executed without delay.
 
 Default value: `0`.
 
@@ -3145,8 +3268,8 @@ Sets the `SHOW TABLE` query display.
 
 Possible values:
 
--   0 — The query will be displayed without table UUID.
--   1 — The query will be displayed with table UUID.
+- 0 — The query will be displayed without table UUID.
+- 1 — The query will be displayed with table UUID.
 
 Default value: `0`.
 
@@ -3156,8 +3279,8 @@ Allows creation of experimental [live views](../../sql-reference/statements/crea
 
 Possible values:
 
--   0 — Working with live views is disabled.
--   1 — Working with live views is enabled.
+- 0 — Working with live views is disabled.
+- 1 — Working with live views is enabled.
 
 Default value: `0`.
 
@@ -3185,8 +3308,8 @@ HTTP connection timeout (in seconds).
 
 Possible values:
 
--   Any positive integer.
--   0 - Disabled (infinite timeout).
+- Any positive integer.
+- 0 - Disabled (infinite timeout).
 
 Default value: 1.
 
@@ -3196,8 +3319,8 @@ HTTP send timeout (in seconds).
 
 Possible values:
 
--   Any positive integer.
--   0 - Disabled (infinite timeout).
+- Any positive integer.
+- 0 - Disabled (infinite timeout).
 
 Default value: 180.
 
@@ -3207,8 +3330,8 @@ HTTP receive timeout (in seconds).
 
 Possible values:
 
--   Any positive integer.
--   0 - Disabled (infinite timeout).
+- Any positive integer.
+- 0 - Disabled (infinite timeout).
 
 Default value: 180.
 
@@ -3218,8 +3341,8 @@ Defines the level of detail for the [CHECK TABLE](../../sql-reference/statements
 
 Possible values:
 
--   0 — the query shows a check status for every individual data part of a table.
--   1 — the query shows the general table check status.
+- 0 — the query shows a check status for every individual data part of a table.
+- 1 — the query shows the general table check status.
 
 Default value: `0`.
 
@@ -3273,8 +3396,8 @@ Sets the maximum number of rows to get from the query result. It adjusts the val
 
 Possible values:
 
--   0 — The number of rows is not limited.
--   Positive integer.
+- 0 — The number of rows is not limited.
+- Positive integer.
 
 Default value: `0`.
 
@@ -3284,8 +3407,8 @@ Sets the number of rows to skip before starting to return rows from the query. I
 
 Possible values:
 
--   0 — No rows are skipped .
--   Positive integer.
+- 0 — No rows are skipped .
+- Positive integer.
 
 Default value: `0`.
 
@@ -3321,8 +3444,8 @@ Enables to fuse aggregate functions with identical argument. It rewrites query c
 
 Possible values:
 
--   0 — Functions with identical argument are not fused.
--   1 — Functions with identical argument are fused.
+- 0 — Functions with identical argument are not fused.
+- 1 — Functions with identical argument are fused.
 
 Default value: `0`.
 
@@ -3362,8 +3485,8 @@ Enables to create databases with [Replicated](../../engines/database-engines/rep
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled.
+- 0 — Disabled.
+- 1 — Enabled.
 
 Default value: `0`.
 
@@ -3373,8 +3496,8 @@ Sets how long initial DDL query should wait for Replicated database to precess p
 
 Possible values:
 
--   Positive integer.
--   0 — Unlimited.
+- Positive integer.
+- 0 — Unlimited.
 
 Default value: `300`.
 
@@ -3384,9 +3507,9 @@ Sets timeout for DDL query responses from all hosts in cluster. If a DDL request
 
 Possible values:
 
--   Positive integer.
--   0 — Async mode.
--   Negative integer — infinite timeout.
+- Positive integer.
+- 0 — Async mode.
+- Negative integer — infinite timeout.
 
 Default value: `180`.
 
@@ -3396,21 +3519,21 @@ Sets format of distributed DDL query result.
 
 Possible values:
 
--   `throw` — Returns result set with query execution status for all hosts where query is finished. If query has failed on some hosts, then it will rethrow the first exception. If query is not finished yet on some hosts and [distributed_ddl_task_timeout](#distributed_ddl_task_timeout) exceeded, then it throws `TIMEOUT_EXCEEDED` exception.
--   `none` — Is similar to throw, but distributed DDL query returns no result set.
--   `null_status_on_timeout` — Returns `NULL` as execution status in some rows of result set instead of throwing `TIMEOUT_EXCEEDED` if query is not finished on the corresponding hosts.
--   `never_throw` — Do not throw `TIMEOUT_EXCEEDED` and do not rethrow exceptions if query has failed on some hosts.
+- `throw` — Returns result set with query execution status for all hosts where query is finished. If query has failed on some hosts, then it will rethrow the first exception. If query is not finished yet on some hosts and [distributed_ddl_task_timeout](#distributed_ddl_task_timeout) exceeded, then it throws `TIMEOUT_EXCEEDED` exception.
+- `none` — Is similar to throw, but distributed DDL query returns no result set.
+- `null_status_on_timeout` — Returns `NULL` as execution status in some rows of result set instead of throwing `TIMEOUT_EXCEEDED` if query is not finished on the corresponding hosts.
+- `never_throw` — Do not throw `TIMEOUT_EXCEEDED` and do not rethrow exceptions if query has failed on some hosts.
 
 Default value: `throw`.
 
 ## flatten_nested {#flatten-nested}
 
-Sets the data format of a [nested](../../sql-reference/data-types/nested-data-structures/nested.md) columns.
+Sets the data format of a [nested](../../sql-reference/data-types/nested-data-structures/index.md) columns.
 
 Possible values:
 
--   1 — Nested column is flattened to separate arrays.
--   0 — Nested column stays a single array of tuples.
+- 1 — Nested column is flattened to separate arrays.
+- 0 — Nested column stays a single array of tuples.
 
 Default value: `1`.
 
@@ -3470,12 +3593,12 @@ SETTINGS index_granularity = 8192 │
 
 ## external_table_functions_use_nulls {#external-table-functions-use-nulls}
 
-Defines how [mysql](../../sql-reference/table-functions/mysql.md), [postgresql](../../sql-reference/table-functions/postgresql.md) and [odbc](../../sql-reference/table-functions/odbc.md)] table functions use Nullable columns.
+Defines how [mysql](../../sql-reference/table-functions/mysql.md), [postgresql](../../sql-reference/table-functions/postgresql.md) and [odbc](../../sql-reference/table-functions/odbc.md) table functions use Nullable columns.
 
 Possible values:
 
--   0 — The table function explicitly uses Nullable columns.
--   1 — The table function implicitly uses Nullable columns.
+- 0 — The table function explicitly uses Nullable columns.
+- 1 — The table function implicitly uses Nullable columns.
 
 Default value: `1`.
 
@@ -3483,25 +3606,25 @@ Default value: `1`.
 
 If the setting is set to `0`, the table function does not make Nullable columns and inserts default values instead of NULL. This is also applicable for NULL values inside arrays.
 
-## allow_experimental_projection_optimization {#allow-experimental-projection-optimization}
+## optimize_use_projections {#optimize_use_projections}
 
 Enables or disables [projection](../../engines/table-engines/mergetree-family/mergetree.md/#projections) optimization when processing `SELECT` queries.
 
 Possible values:
 
--   0 — Projection optimization disabled.
--   1 — Projection optimization enabled.
+- 0 — Projection optimization disabled.
+- 1 — Projection optimization enabled.
 
 Default value: `1`.
 
 ## force_optimize_projection {#force-optimize-projection}
 
-Enables or disables the obligatory use of [projections](../../engines/table-engines/mergetree-family/mergetree.md/#projections) in `SELECT` queries, when projection optimization is enabled (see [allow_experimental_projection_optimization](#allow-experimental-projection-optimization) setting).
+Enables or disables the obligatory use of [projections](../../engines/table-engines/mergetree-family/mergetree.md/#projections) in `SELECT` queries, when projection optimization is enabled (see [optimize_use_projections](#optimize_use_projections) setting).
 
 Possible values:
 
--   0 — Projection optimization is not obligatory.
--   1 — Projection optimization is obligatory.
+- 0 — Projection optimization is not obligatory.
+- 1 — Projection optimization is obligatory.
 
 Default value: `0`.
 
@@ -3511,9 +3634,9 @@ Allows to set up waiting for actions to be executed on replicas by [ALTER](../..
 
 Possible values:
 
--   0 — Do not wait.
--   1 — Wait for own execution.
--   2 — Wait for everyone.
+- 0 — Do not wait.
+- 1 — Wait for own execution.
+- 2 — Wait for everyone.
 
 Default value: `1`.
 
@@ -3523,9 +3646,9 @@ Specifies how long (in seconds) to wait for inactive replicas to execute [ALTER]
 
 Possible values:
 
--   0 — Do not wait.
--   Negative integer — Wait for unlimited time.
--   Positive integer — The number of seconds to wait.
+- 0 — Do not wait.
+- Negative integer — Wait for unlimited time.
+- Positive integer — The number of seconds to wait.
 
 Default value: `120` seconds.
 
@@ -3535,7 +3658,7 @@ Sets the maximum number of matches for a single regular expression per row. Use
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `1000`.
 
@@ -3545,7 +3668,7 @@ Sets the maximum number of retries during a single HTTP read.
 
 Possible values:
 
--   Positive integer.
+- Positive integer.
 
 Default value: `1024`.
 
@@ -3555,9 +3678,9 @@ Allows a user to write to [query_log](../../operations/system-tables/query_log.m
 
 Possible values:
 
--   0 — Queries are not logged in the system tables.
--   Positive floating-point number in the range [0..1]. For example, if the setting value is `0.5`, about half of the queries are logged in the system tables.
--   1 — All queries are logged in the system tables.
+- 0 — Queries are not logged in the system tables.
+- Positive floating-point number in the range [0..1]. For example, if the setting value is `0.5`, about half of the queries are logged in the system tables.
+- 1 — All queries are logged in the system tables.
 
 Default value: `1`.
 
@@ -3567,9 +3690,9 @@ Allows calculating the [if](../../sql-reference/functions/conditional-functions.
 
 Possible values:
 
--   `enable` — Enables short-circuit function evaluation for functions that are suitable for it (can throw an exception or computationally heavy).
--   `force_enable` — Enables short-circuit function evaluation for all functions.
--   `disable` — Disables short-circuit function evaluation.
+- `enable` — Enables short-circuit function evaluation for functions that are suitable for it (can throw an exception or computationally heavy).
+- `force_enable` — Enables short-circuit function evaluation for all functions.
+- `disable` — Disables short-circuit function evaluation.
 
 Default value: `enable`.
 
@@ -3579,8 +3702,8 @@ Defines the maximum length for each regular expression in the [hyperscan multi-m
 
 Possible values:
 
--   Positive integer.
--   0 - The length is not limited.
+- Positive integer.
+- 0 - The length is not limited.
 
 Default value: `0`.
 
@@ -3614,7 +3737,7 @@ Exception: Regexp length too large.
 
 **See Also**
 
--   [max_hyperscan_regexp_total_length](#max-hyperscan-regexp-total-length)
+- [max_hyperscan_regexp_total_length](#max-hyperscan-regexp-total-length)
 
 ## max_hyperscan_regexp_total_length {#max-hyperscan-regexp-total-length}
 
@@ -3622,8 +3745,8 @@ Sets the maximum length total of all regular expressions in each [hyperscan mult
 
 Possible values:
 
--   Positive integer.
--   0 - The length is not limited.
+- Positive integer.
+- 0 - The length is not limited.
 
 Default value: `0`.
 
@@ -3657,7 +3780,7 @@ Exception: Total regexp lengths too large.
 
 **See Also**
 
--   [max_hyperscan_regexp_length](#max-hyperscan-regexp-length)
+- [max_hyperscan_regexp_length](#max-hyperscan-regexp-length)
 
 ## enable_positional_arguments {#enable-positional-arguments}
 
@@ -3665,8 +3788,8 @@ Enables or disables supporting positional arguments for [GROUP BY](../../sql-ref
 
 Possible values:
 
--   0 — Positional arguments aren't supported.
--   1 — Positional arguments are supported: column numbers can use instead of column names.
+- 0 — Positional arguments aren't supported.
+- 1 — Positional arguments are supported: column numbers can use instead of column names.
 
 Default value: `1`.
 
@@ -3695,13 +3818,13 @@ Result:
 ## enable_extended_results_for_datetime_functions {#enable-extended-results-for-datetime-functions}
 
 Enables or disables returning results of type:
--   `Date32` with extended range (compared to type `Date`) for functions [toStartOfYear](../../sql-reference/functions/date-time-functions.md/#tostartofyear), [toStartOfISOYear](../../sql-reference/functions/date-time-functions.md/#tostartofisoyear), [toStartOfQuarter](../../sql-reference/functions/date-time-functions.md/#tostartofquarter), [toStartOfMonth](../../sql-reference/functions/date-time-functions.md/#tostartofmonth), [toStartOfWeek](../../sql-reference/functions/date-time-functions.md/#tostartofweek), [toMonday](../../sql-reference/functions/date-time-functions.md/#tomonday) and [toLastDayOfMonth](../../sql-reference/functions/date-time-functions.md/#tolastdayofmonth).
--   `DateTime64` with extended range (compared to type `DateTime`) for functions [toStartOfDay](../../sql-reference/functions/date-time-functions.md/#tostartofday), [toStartOfHour](../../sql-reference/functions/date-time-functions.md/#tostartofhour), [toStartOfMinute](../../sql-reference/functions/date-time-functions.md/#tostartofminute), [toStartOfFiveMinutes](../../sql-reference/functions/date-time-functions.md/#tostartoffiveminutes), [toStartOfTenMinutes](../../sql-reference/functions/date-time-functions.md/#tostartoftenminutes), [toStartOfFifteenMinutes](../../sql-reference/functions/date-time-functions.md/#tostartoffifteenminutes) and [timeSlot](../../sql-reference/functions/date-time-functions.md/#timeslot).
+- `Date32` with extended range (compared to type `Date`) for functions [toStartOfYear](../../sql-reference/functions/date-time-functions.md/#tostartofyear), [toStartOfISOYear](../../sql-reference/functions/date-time-functions.md/#tostartofisoyear), [toStartOfQuarter](../../sql-reference/functions/date-time-functions.md/#tostartofquarter), [toStartOfMonth](../../sql-reference/functions/date-time-functions.md/#tostartofmonth), [toStartOfWeek](../../sql-reference/functions/date-time-functions.md/#tostartofweek), [toMonday](../../sql-reference/functions/date-time-functions.md/#tomonday) and [toLastDayOfMonth](../../sql-reference/functions/date-time-functions.md/#tolastdayofmonth).
+- `DateTime64` with extended range (compared to type `DateTime`) for functions [toStartOfDay](../../sql-reference/functions/date-time-functions.md/#tostartofday), [toStartOfHour](../../sql-reference/functions/date-time-functions.md/#tostartofhour), [toStartOfMinute](../../sql-reference/functions/date-time-functions.md/#tostartofminute), [toStartOfFiveMinutes](../../sql-reference/functions/date-time-functions.md/#tostartoffiveminutes), [toStartOfTenMinutes](../../sql-reference/functions/date-time-functions.md/#tostartoftenminutes), [toStartOfFifteenMinutes](../../sql-reference/functions/date-time-functions.md/#tostartoffifteenminutes) and [timeSlot](../../sql-reference/functions/date-time-functions.md/#timeslot).
 
 Possible values:
 
--   0 — Functions return `Date` or `DateTime` for all types of arguments.
--   1 — Functions return `Date32` or `DateTime64` for `Date32` or `DateTime64` arguments and `Date` or `DateTime` otherwise.
+- 0 — Functions return `Date` or `DateTime` for all types of arguments.
+- 1 — Functions return `Date32` or `DateTime64` for `Date32` or `DateTime64` arguments and `Date` or `DateTime` otherwise.
 
 Default value: `0`.
 
@@ -3713,31 +3836,31 @@ Works only for [*MergeTree](../../engines/table-engines/mergetree-family/index.m
 
 Possible values:
 
--   0 — Automatic `PREWHERE` optimization is disabled.
--   1 — Automatic `PREWHERE` optimization is enabled.
+- 0 — Automatic `PREWHERE` optimization is disabled.
+- 1 — Automatic `PREWHERE` optimization is enabled.
 
 Default value: `1`.
 
 ## optimize_move_to_prewhere_if_final {#optimize_move_to_prewhere_if_final}
 
-Enables or disables automatic [PREWHERE](../../sql-reference/statements/select/prewhere.md) optimization in [SELECT](../../sql-reference/statements/select/index.md) queries with [FINAL](../../sql-reference/statements/select/from.md/#select-from-final) modifier.
+Enables or disables automatic [PREWHERE](../../sql-reference/statements/select/prewhere.md) optimization in [SELECT](../../sql-reference/statements/select/index.md) queries with [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier.
 
 Works only for [*MergeTree](../../engines/table-engines/mergetree-family/index.md) tables.
 
 Possible values:
 
--   0 — Automatic `PREWHERE` optimization in `SELECT` queries with `FINAL` modifier is disabled.
--   1 — Automatic `PREWHERE` optimization in `SELECT` queries with `FINAL` modifier is enabled.
+- 0 — Automatic `PREWHERE` optimization in `SELECT` queries with `FINAL` modifier is disabled.
+- 1 — Automatic `PREWHERE` optimization in `SELECT` queries with `FINAL` modifier is enabled.
 
 Default value: `0`.
 
 **See Also**
 
--   [optimize_move_to_prewhere](#optimize_move_to_prewhere) setting
+- [optimize_move_to_prewhere](#optimize_move_to_prewhere) setting
 
 ## optimize_using_constraints
 
-Use [constraints](../../sql-reference/statements/create/table#constraints) for query optimization. The default is `false`.
+Use [constraints](../../sql-reference/statements/create/table.md#constraints) for query optimization. The default is `false`.
 
 Possible values:
 
@@ -3745,7 +3868,7 @@ Possible values:
 
 ## optimize_append_index
 
-Use [constraints](../../sql-reference/statements/create/table#constraints) in order to append index condition. The default is `false`.
+Use [constraints](../../sql-reference/statements/create/table.md#constraints) in order to append index condition. The default is `false`.
 
 Possible values:
 
@@ -3753,7 +3876,7 @@ Possible values:
 
 ## optimize_substitute_columns
 
-Use [constraints](../../sql-reference/statements/create/table#constraints) for column substitution. The default is `false`.
+Use [constraints](../../sql-reference/statements/create/table.md#constraints) for column substitution. The default is `false`.
 
 Possible values:
 
@@ -3765,8 +3888,8 @@ Enables describing subcolumns for a [DESCRIBE](../../sql-reference/statements/de
 
 Possible values:
 
--   0 — Subcolumns are not included in `DESCRIBE` queries.
--   1 — Subcolumns are included in `DESCRIBE` queries.
+- 0 — Subcolumns are not included in `DESCRIBE` queries.
+- 1 — Subcolumns are included in `DESCRIBE` queries.
 
 Default value: `0`.
 
@@ -3782,8 +3905,8 @@ Applicable to [ATTACH PARTITION|PART](../../sql-reference/statements/alter/parti
 
 Possible values:
 
--   0 — disable verbosity.
--   1 — enable verbosity.
+- 0 — disable verbosity.
+- 1 — enable verbosity.
 
 Default value: `0`.
 
@@ -3816,8 +3939,8 @@ This is an experimental setting. Sets the minimum amount of memory for reading l
 
 Possible values:
 
--   Positive integer.
--   0 — Big files read with only copying data from kernel to userspace.
+- Positive integer.
+- 0 — Big files read with only copying data from kernel to userspace.
 
 Default value: `0`.
 
@@ -3827,8 +3950,8 @@ Enables or disables waiting unfinished queries when shutdown server.
 
 Possible values:
 
--   0 — Disabled.
--   1 — Enabled. The wait time equal shutdown_wait_unfinished config.
+- 0 — Disabled.
+- 1 — Enabled. The wait time equal shutdown_wait_unfinished config.
 
 Default value: 0.
 
@@ -3940,8 +4063,8 @@ INSERT INTO FUNCTION null('foo String') VALUES ('bar') SETTINGS max_threads=1;
 
 Possible values:
 
--   0 — Disallow.
--   1 — Allow.
+- 0 — Disallow.
+- 1 — Allow.
 
 Default value: `0`.
 
@@ -3951,7 +4074,7 @@ Use this setting only for backward compatibility if your use cases depend on old
 
 ## final {#final}
 
-Automatically applies [FINAL](../../sql-reference/statements/select/from/#final-modifier) modifier to all tables in a query, to tables where [FINAL](../../sql-reference/statements/select/from/#final-modifier) is applicable, including joined tables and tables in sub-queries, and 
+Automatically applies [FINAL](../../sql-reference/statements/select/from.md#final-modifier) modifier to all tables in a query, to tables where [FINAL](../../sql-reference/statements/select/from.md#final-modifier) is applicable, including joined tables and tables in sub-queries, and
 distributed tables.
 
 Possible values:
@@ -3997,7 +4120,7 @@ SELECT * FROM test;
 
 ## asterisk_include_materialized_columns {#asterisk_include_materialized_columns}
 
-Include [MATERIALIZED](../../sql-reference/statements/create/table/#materialized) columns for wildcard query (`SELECT *`).
+Include [MATERIALIZED](../../sql-reference/statements/create/table.md#materialized) columns for wildcard query (`SELECT *`).
 
 Possible values:
 
@@ -4008,7 +4131,7 @@ Default value: `0`.
 
 ## asterisk_include_alias_columns {#asterisk_include_alias_columns}
 
-Include [ALIAS](../../sql-reference/statements/create/table/#alias) columns for wildcard query (`SELECT *`).
+Include [ALIAS](../../sql-reference/statements/create/table.md#alias) columns for wildcard query (`SELECT *`).
 
 Possible values:
 
@@ -4016,3 +4139,123 @@ Possible values:
 - 1 - enabled
 
 Default value: `0`.
+
+## async_socket_for_remote {#async_socket_for_remote}
+
+Enables asynchronous read from socket while executing remote query.
+
+Enabled by default.
+
+## async_query_sending_for_remote {#async_query_sending_for_remote}
+
+Enables asynchronous connection creation and query sending while executing remote query.
+
+Enabled by default.
+
+## use_hedged_requests {#use_hedged_requests}
+
+Enables hedged requests logic for remote queries. It allows to establish many connections with different replicas for query.
+New connection is enabled in case existent connection(s) with replica(s) were not established within `hedged_connection_timeout`
+or no data was received within `receive_data_timeout`. Query uses the first connection which send non empty progress packet (or data packet, if `allow_changing_replica_until_first_data_packet`);
+other connections are cancelled. Queries with `max_parallel_replicas > 1` are supported.
+
+Enabled by default.
+
+## hedged_connection_timeout {#hedged_connection_timeout}
+
+If we can't establish connection with replica after this timeout in hedged requests, we start working with the next replica without cancelling connection to the previous.
+Timeout value is in milliseconds.
+
+Default value: `50`.
+
+## receive_data_timeout {#receive_data_timeout}
+
+This timeout is set when the query is sent to the replica in hedged requests, if we don't receive first packet of data and we don't make any progress in query execution after this timeout,
+we start working with the next replica, without cancelling connection to the previous.
+Timeout value is in milliseconds.
+
+Default value: `2000`
+
+## allow_changing_replica_until_first_data_packet {#allow_changing_replica_until_first_data_packet}
+
+If it's enabled, in hedged requests we can start new connection until receiving first data packet even if we have already made some progress
+(but progress haven't updated for `receive_data_timeout` timeout), otherwise we disable changing replica after the first time we made progress.
+
+## partial_result_on_first_cancel {#partial_result_on_first_cancel}
+When set to `true` and the user wants to interrupt a query (for example using `Ctrl+C` on the client), then the query continues execution only on data that was already read from the table. Afterwards, it will return a partial result of the query for the part of the table that was read. To fully stop the execution of a query without a partial result, the user should send 2 cancel requests.
+
+**Example without setting on Ctrl+C**
+```sql
+SELECT sum(number) FROM numbers(10000000000)
+
+Cancelling query.
+Ok.
+Query was cancelled.
+
+0 rows in set. Elapsed: 1.334 sec. Processed 52.65 million rows, 421.23 MB (39.48 million rows/s., 315.85 MB/s.)
+```
+
+**Example with setting on Ctrl+C**
+```sql
+SELECT sum(number) FROM numbers(10000000000) SETTINGS partial_result_on_first_cancel=true
+
+┌──────sum(number)─┐
+│ 1355411451286266 │
+└──────────────────┘
+
+1 row in set. Elapsed: 1.331 sec. Processed 52.13 million rows, 417.05 MB (39.17 million rows/s., 313.33 MB/s.)
+```
+
+Possible values: `true`, `false`
+
+Default value: `false`
+## function_json_value_return_type_allow_nullable
+
+Control whether allow to return `NULL` when value is not exist for JSON_VALUE function.
+
+```sql
+SELECT JSON_VALUE('{"hello":"world"}', '$.b') settings function_json_value_return_type_allow_nullable=true;
+
+┌─JSON_VALUE('{"hello":"world"}', '$.b')─┐
+│ ᴺᵁᴸᴸ                                   │
+└────────────────────────────────────────┘
+
+1 row in set. Elapsed: 0.001 sec.
+```
+
+Possible values:
+
+- true — Allow.
+- false — Disallow.
+
+Default value: `false`.
+
+## function_json_value_return_type_allow_complex
+
+Control whether allow to return complex type (such as: struct, array, map) for json_value function.
+
+```sql
+SELECT JSON_VALUE('{"hello":{"world":"!"}}', '$.hello') settings function_json_value_return_type_allow_complex=true
+
+┌─JSON_VALUE('{"hello":{"world":"!"}}', '$.hello')─┐
+│ {"world":"!"}                                    │
+└──────────────────────────────────────────────────┘
+
+1 row in set. Elapsed: 0.001 sec.
+```
+
+Possible values:
+
+- true — Allow.
+- false — Disallow.
+
+Default value: `false`.
+
+## zstd_window_log_max
+
+Allows you to select the max window log of ZSTD (it will not be used for MergeTree family)
+
+Type: Int64
+
+Default: 0
+
diff --git a/docs/en/operations/storing-data.md b/docs/en/operations/storing-data.md
index 203fe4e42d2..5804ad8545b 100644
--- a/docs/en/operations/storing-data.md
+++ b/docs/en/operations/storing-data.md
@@ -45,11 +45,11 @@ Configuration markup:
 
 Required parameters:
 
--   `endpoint` — HDFS endpoint URL in `path` format. Endpoint URL should contain a root path to store data.
+- `endpoint` — HDFS endpoint URL in `path` format. Endpoint URL should contain a root path to store data.
 
 Optional parameters:
 
--   `min_bytes_for_seek` — The minimal number of bytes to use seek operation instead of sequential read. Default value: `1 Mb`.
+- `min_bytes_for_seek` — The minimal number of bytes to use seek operation instead of sequential read. Default value: `1 Mb`.
 
 ## Using Virtual File System for Data Encryption {#encrypted-virtual-file-system}
 
@@ -78,16 +78,16 @@ When writing the same file to `disk2`, it will actually be written to the physic
 
 Required parameters:
 
--   `type` — `encrypted`. Otherwise the encrypted disk is not created.
--   `disk` — Type of disk for data storage.
--   `key` — The key for encryption and decryption. Type: [Uint64](/docs/en/sql-reference/data-types/int-uint.md). You can use `key_hex` parameter to encrypt in hexadecimal form.
+- `type` — `encrypted`. Otherwise the encrypted disk is not created.
+- `disk` — Type of disk for data storage.
+- `key` — The key for encryption and decryption. Type: [Uint64](/docs/en/sql-reference/data-types/int-uint.md). You can use `key_hex` parameter to encode the key in hexadecimal form.
     You can specify multiple keys using the `id` attribute (see example above).
 
 Optional parameters:
 
--   `path` — Path to the location on the disk where the data will be saved. If not specified, the data will be saved in the root directory.
--   `current_key_id` — The key used for encryption. All the specified keys can be used for decryption, and you can always switch to another key while maintaining access to previously encrypted data.
--   `algorithm` — [Algorithm](/docs/en/sql-reference/statements/create/table.md/#create-query-encryption-codecs) for encryption. Possible values: `AES_128_CTR`, `AES_192_CTR` or `AES_256_CTR`. Default value: `AES_128_CTR`. The key length depends on the algorithm: `AES_128_CTR` — 16 bytes, `AES_192_CTR` — 24 bytes, `AES_256_CTR` — 32 bytes.
+- `path` — Path to the location on the disk where the data will be saved. If not specified, the data will be saved in the root directory.
+- `current_key_id` — The key used for encryption. All the specified keys can be used for decryption, and you can always switch to another key while maintaining access to previously encrypted data.
+- `algorithm` — [Algorithm](/docs/en/sql-reference/statements/create/table.md/#create-query-encryption-codecs) for encryption. Possible values: `AES_128_CTR`, `AES_192_CTR` or `AES_256_CTR`. Default value: `AES_128_CTR`. The key length depends on the algorithm: `AES_128_CTR` — 16 bytes, `AES_192_CTR` — 24 bytes, `AES_256_CTR` — 32 bytes.
 
 Example of disk configuration:
 
@@ -135,11 +135,13 @@ Example of configuration for versions later or equal to 22.8:
             </cache>
         </disks>
         <policies>
-            <volumes>
-                <main>
-                    <disk>cache</disk>
-                </main>
-            </volumes>
+            <s3-cache>
+                <volumes>
+                    <main>
+                        <disk>cache</disk>
+                    </main>
+                </volumes>
+            </s3-cache>
         <policies>
     </storage_configuration>
 ```
@@ -159,16 +161,20 @@ Example of configuration for versions earlier than 22.8:
             </s3>
         </disks>
         <policies>
-            <volumes>
-                <main>
-                    <disk>s3</disk>
-                </main>
-            </volumes>
+            <s3-cache>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                </volumes>
+            </s3-cache>
         <policies>
     </storage_configuration>
 ```
 
-Cache **configuration settings**:
+File Cache **disk configuration settings**:
+
+These settings should be defined in the disk configuration section.
 
 - `path` - path to the directory with cache. Default: None, this setting is obligatory.
 
@@ -178,7 +184,7 @@ Cache **configuration settings**:
 
 - `enable_filesystem_query_cache_limit` - allow to limit the size of cache which is downloaded within each query (depends on user setting `max_query_cache_size`). Default: `false`.
 
-- `enable_cache_hits_threshold` - a number, which defines how many times some data needs to be read before it will be cached. Default: `0`, e.g. the data is cached at the first attempt to read it.
+- `enable_cache_hits_threshold` - number which defines how many times some data needs to be read before it will be cached. Default: `0`, e.g. the data is cached at the first attempt to read it.
 
 - `do_not_evict_index_and_mark_files` - do not evict small frequently used files according to cache policy. Default: `false`. This setting was added in version 22.8. If you used filesystem cache before this version, then it will not work on versions starting from 22.8 if this setting is set to `true`. If you want to use this setting, clear old cache created before version 22.8 before upgrading.
 
@@ -186,21 +192,23 @@ Cache **configuration settings**:
 
 - `max_elements` - a limit for a number of cache files. Default: `1048576`.
 
-Cache **query settings**:
+File Cache **query/profile settings**:
+
+Some of these settings will disable cache features per query/profile that are enabled by default or in disk configuration settings. For example, you can enable cache in disk configuration and disable it per query/profile setting `enable_filesystem_cache` to `false`. Also setting `cache_on_write_operations` to `true` in disk configuration means that "write-though" cache is enabled. But if you need to disable this general setting per specific queries then setting `enable_filesystem_cache_on_write_operations` to `false` means that write operations cache will be disabled for a specific query/profile.
 
 - `enable_filesystem_cache` - allows to disable cache per query even if storage policy was configured with `cache` disk type. Default: `true`.
 
 - `read_from_filesystem_cache_if_exists_otherwise_bypass_cache` - allows to use cache in query only if it already exists, otherwise query data will not be written to local cache storage. Default: `false`.
 
-- `enable_filesystem_cache_on_write_operations` - turn on `write-through` cache. This setting works only if setting `cache_on_write_operations` in cache configuration is turned on.
+- `enable_filesystem_cache_on_write_operations` - turn on `write-through` cache. This setting works only if setting `cache_on_write_operations` in cache configuration is turned on. Default: `false`.
 
-- `enable_filesystem_cache_log` - turn on logging to `system.filesystem_cache_log` table. Gives a detailed view of cache usage per query. Default: `false`.
+- `enable_filesystem_cache_log` - turn on logging to `system.filesystem_cache_log` table. Gives a detailed view of cache usage per query. It can be turn on for specific queries or enabled in a profile. Default: `false`.
 
 - `max_query_cache_size` - a limit for the cache size, which can be written to local cache storage. Requires enabled `enable_filesystem_query_cache_limit` in cache configuration. Default: `false`.
 
-- `skip_download_if_exceeds_query_cache` - allows to change the behaviour of setting `max_query_cache_size`. Default: `true`. If this setting is turned on and cache download limit during query was reached, no more cache will be downloaded to cache storage. If this setting is turned off and cache download limit during query was reached, cache will still be written by cost of evicting previously downloaded (within current query) data, e.g. second behaviour allows to preserve `last recentltly used` behaviour while keeping query cache limit.
+- `skip_download_if_exceeds_query_cache` - allows to change the behaviour of setting `max_query_cache_size`. Default: `true`. If this setting is turned on and cache download limit during query was reached, no more cache will be downloaded to cache storage. If this setting is turned off and cache download limit during query was reached, cache will still be written by cost of evicting previously downloaded (within current query) data, e.g. second behaviour allows to preserve `last recently used` behaviour while keeping query cache limit.
 
-** Warning **
+**Warning**
 Cache configuration settings and cache query settings correspond to the latest ClickHouse version, for earlier versions something might not be supported.
 
 Cache **system tables**:
@@ -211,7 +219,7 @@ Cache **system tables**:
 
 Cache **commands**:
 
-- `SYSTEM DROP FILESYSTEM CACHE (<path>) (ON CLUSTER)`
+- `SYSTEM DROP FILESYSTEM CACHE (<cache_name>) (ON CLUSTER)` -- `ON CLUSTER` is only supported when no `<cache_name>` is provided
 
 - `SHOW FILESYSTEM CACHES` -- show list of filesystem caches which were configured on the server. (For versions <= `22.8` the command is named `SHOW CACHES`)
 
@@ -227,10 +235,10 @@ Result:
 └───────────┘
 ```
 
-- `DESCRIBE CACHE '<cache_name>'` - show cache configuration and some general statistics for a specific cache. Cache name can be taken from `SHOW CACHES` command. (For versions <= `22.8` the command is named `DESCRIBE CACHE`)
+- `DESCRIBE FILESYSTEM CACHE '<cache_name>'` - show cache configuration and some general statistics for a specific cache. Cache name can be taken from `SHOW FILESYSTEM CACHES` command. (For versions <= `22.8` the command is named `DESCRIBE CACHE`)
 
 ```sql
-DESCRIBE CACHE 's3_cache'
+DESCRIBE FILESYSTEM CACHE 's3_cache'
 ```
 
 ``` text
@@ -442,14 +450,14 @@ SETTINGS storage_policy='web';
 
 Required parameters:
 
--   `type` — `web`. Otherwise the disk is not created.
--   `endpoint` — The endpoint URL in `path` format. Endpoint URL must contain a root path to store data, where they were uploaded.
+- `type` — `web`. Otherwise the disk is not created.
+- `endpoint` — The endpoint URL in `path` format. Endpoint URL must contain a root path to store data, where they were uploaded.
 
 Optional parameters:
 
--   `min_bytes_for_seek` — The minimal number of bytes to use seek operation instead of sequential read. Default value: `1` Mb.
--   `remote_fs_read_backoff_threashold` — The maximum wait time when trying to read data for remote disk. Default value: `10000` seconds.
--   `remote_fs_read_backoff_max_tries` — The maximum number of attempts to read with backoff. Default value: `5`.
+- `min_bytes_for_seek` — The minimal number of bytes to use seek operation instead of sequential read. Default value: `1` Mb.
+- `remote_fs_read_backoff_threashold` — The maximum wait time when trying to read data for remote disk. Default value: `10000` seconds.
+- `remote_fs_read_backoff_max_tries` — The maximum number of attempts to read with backoff. Default value: `5`.
 
 If a query fails with an exception `DB:Exception Unreachable URL`, then you can try to adjust the settings: [http_connection_timeout](/docs/en/operations/settings/settings.md/#http_connection_timeout), [http_receive_timeout](/docs/en/operations/settings/settings.md/#http_receive_timeout), [keep_alive_timeout](/docs/en/operations/server-configuration-parameters/settings.md/#keep-alive-timeout).
 
@@ -467,6 +475,6 @@ Use [http_max_single_read_retries](/docs/en/operations/settings/settings.md/#htt
 
 Zero-copy replication is possible, but not recommended, with  `S3` and `HDFS` disks. Zero-copy replication means that if the data is stored remotely on several machines and needs to be synchronized, then only the metadata is replicated (paths to the data parts), but not the data itself.
 
-:::warning Zero-copy replication is not ready for production
+:::note Zero-copy replication is not ready for production
 Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
 :::
diff --git a/docs/en/operations/system-tables/asynchronous_metric_log.md b/docs/en/operations/system-tables/asynchronous_metric_log.md
index 8a2f25629f6..4290799b6bc 100644
--- a/docs/en/operations/system-tables/asynchronous_metric_log.md
+++ b/docs/en/operations/system-tables/asynchronous_metric_log.md
@@ -7,11 +7,11 @@ Contains the historical values for `system.asynchronous_metrics`, which are save
 
 Columns:
 
--   `event_date` ([Date](../../sql-reference/data-types/date.md)) — Event date.
--   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Event time.
--   `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Event time with microseconds resolution.
--   `name` ([String](../../sql-reference/data-types/string.md)) — Metric name.
--   `value` ([Float64](../../sql-reference/data-types/float.md)) — Metric value.
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — Event date.
+- `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Event time.
+- `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Event time with microseconds resolution.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Metric name.
+- `value` ([Float64](../../sql-reference/data-types/float.md)) — Metric value.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/asynchronous_metrics.md b/docs/en/operations/system-tables/asynchronous_metrics.md
index 551aa771ec9..f357341da67 100644
--- a/docs/en/operations/system-tables/asynchronous_metrics.md
+++ b/docs/en/operations/system-tables/asynchronous_metrics.md
@@ -7,9 +7,9 @@ Contains metrics that are calculated periodically in the background. For example
 
 Columns:
 
--   `metric` ([String](../../sql-reference/data-types/string.md)) — Metric name.
--   `value` ([Float64](../../sql-reference/data-types/float.md)) — Metric value.
--   `description` ([String](../../sql-reference/data-types/string.md) - Metric description)
+- `metric` ([String](../../sql-reference/data-types/string.md)) — Metric name.
+- `value` ([Float64](../../sql-reference/data-types/float.md)) — Metric value.
+- `description` ([String](../../sql-reference/data-types/string.md) - Metric description)
 
 **Example**
 
@@ -32,9 +32,592 @@ SELECT * FROM system.asynchronous_metrics LIMIT 10
 └─────────────────────────────────────────┴────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
+## Metric descriptions
+
+
+### AsynchronousHeavyMetricsCalculationTimeSpent
+
+Time in seconds spent for calculation of asynchronous heavy (tables related) metrics (this is the overhead of asynchronous metrics).
+
+### AsynchronousHeavyMetricsUpdateInterval
+
+Heavy (tables related) metrics update interval
+
+### AsynchronousMetricsCalculationTimeSpent
+
+Time in seconds spent for calculation of asynchronous metrics (this is the overhead of asynchronous metrics).
+
+### AsynchronousMetricsUpdateInterval
+
+Metrics update interval
+
+### BlockActiveTime_*name*
+
+Time in seconds the block device had the IO requests queued. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockDiscardBytes_*name*
+
+Number of discarded bytes on the block device. These operations are relevant for SSD. Discard operations are not used by ClickHouse, but can be used by other processes on the system. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockDiscardMerges_*name*
+
+Number of discard operations requested from the block device and merged together by the OS IO scheduler. These operations are relevant for SSD. Discard operations are not used by ClickHouse, but can be used by other processes on the system. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockDiscardOps_*name*
+
+Number of discard operations requested from the block device. These operations are relevant for SSD. Discard operations are not used by ClickHouse, but can be used by other processes on the system. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockDiscardTime_*name*
+
+Time in seconds spend in discard operations requested from the block device, summed across all the operations. These operations are relevant for SSD. Discard operations are not used by ClickHouse, but can be used by other processes on the system. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockInFlightOps_*name*
+
+This value counts the number of I/O requests that have been issued to the device driver but have not yet completed. It does not include IO requests that are in the queue but not yet issued to the device driver. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockQueueTime_*name*
+
+This value counts the number of milliseconds that IO requests have waited on this block device. If there are multiple IO requests waiting, this value will increase as the product of the number of milliseconds times the number of requests waiting. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockReadBytes_*name*
+
+Number of bytes read from the block device. It can be lower than the number of bytes read from the filesystem due to the usage of the OS page cache, that saves IO. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockReadMerges_*name*
+
+Number of read operations requested from the block device and merged together by the OS IO scheduler. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockReadOps_*name*
+
+Number of read operations requested from the block device. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockReadTime_*name*
+
+Time in seconds spend in read operations requested from the block device, summed across all the operations. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockWriteBytes_*name*
+
+Number of bytes written to the block device. It can be lower than the number of bytes written to the filesystem due to the usage of the OS page cache, that saves IO. A write to the block device may happen later than the corresponding write to the filesystem due to write-through caching. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockWriteMerges_*name*
+
+Number of write operations requested from the block device and merged together by the OS IO scheduler. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockWriteOps_*name*
+
+Number of write operations requested from the block device. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### BlockWriteTime_*name*
+
+Time in seconds spend in write operations requested from the block device, summed across all the operations. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Source: `/sys/block`. See https://www.kernel.org/doc/Documentation/block/stat.txt
+
+### CPUFrequencyMHz_*name*
+
+The current frequency of the CPU, in MHz. Most of the modern CPUs adjust the frequency dynamically for power saving and Turbo Boosting.
+
+### CompiledExpressionCacheBytes
+
+Total bytes used for the cache of JIT-compiled code.
+
+### CompiledExpressionCacheCount
+
+Total entries in the cache of JIT-compiled code.
+
+### DiskAvailable_*name*
+
+Available bytes on the disk (virtual filesystem). Remote filesystems can show a large value like 16 EiB.
+
+### DiskTotal_*name*
+
+The total size in bytes of the disk (virtual filesystem). Remote filesystems can show a large value like 16 EiB.
+
+### DiskUnreserved_*name*
+
+Available bytes on the disk (virtual filesystem) without the reservations for merges, fetches, and moves. Remote filesystems can show a large value like 16 EiB.
+
+### DiskUsed_*name*
+
+Used bytes on the disk (virtual filesystem). Remote filesystems not always provide this information.
+
+### FilesystemCacheBytes
+
+Total bytes in the `cache` virtual filesystem. This cache is hold on disk.
+
+### FilesystemCacheFiles
+
+Total number of cached file segments in the `cache` virtual filesystem. This cache is hold on disk.
+
+### FilesystemLogsPathAvailableBytes
+
+Available bytes on the volume where ClickHouse logs path is mounted. If this value approaches zero, you should tune the log rotation in the configuration file.
+
+### FilesystemLogsPathAvailableINodes
+
+The number of available inodes on the volume where ClickHouse logs path is mounted.
+
+### FilesystemLogsPathTotalBytes
+
+The size of the volume where ClickHouse logs path is mounted, in bytes. It's recommended to have at least 10 GB for logs.
+
+### FilesystemLogsPathTotalINodes
+
+The total number of inodes on the volume where ClickHouse logs path is mounted.
+
+### FilesystemLogsPathUsedBytes
+
+Used bytes on the volume where ClickHouse logs path is mounted.
+
+### FilesystemLogsPathUsedINodes
+
+The number of used inodes on the volume where ClickHouse logs path is mounted.
+
+### FilesystemMainPathAvailableBytes
+
+Available bytes on the volume where the main ClickHouse path is mounted.
+
+### FilesystemMainPathAvailableINodes
+
+The number of available inodes on the volume where the main ClickHouse path is mounted. If it is close to zero, it indicates a misconfiguration, and you will get 'no space left on device' even when the disk is not full.
+
+### FilesystemMainPathTotalBytes
+
+The size of the volume where the main ClickHouse path is mounted, in bytes.
+
+### FilesystemMainPathTotalINodes
+
+The total number of inodes on the volume where the main ClickHouse path is mounted. If it is less than 25 million, it indicates a misconfiguration.
+
+### FilesystemMainPathUsedBytes
+
+Used bytes on the volume where the main ClickHouse path is mounted.
+
+### FilesystemMainPathUsedINodes
+
+The number of used inodes on the volume where the main ClickHouse path is mounted. This value mostly corresponds to the number of files.
+
+### HTTPThreads
+
+Number of threads in the server of the HTTP interface (without TLS).
+
+### InterserverThreads
+
+Number of threads in the server of the replicas communication protocol (without TLS).
+
+### Jitter
+
+The difference in time the thread for calculation of the asynchronous metrics was scheduled to wake up and the time it was in fact, woken up. A proxy-indicator of overall system latency and responsiveness.
+
+### LoadAverage_*N*
+
+The whole system load, averaged with exponential smoothing over 1 minute. The load represents the number of threads across all the processes (the scheduling entities of the OS kernel), that are currently running by CPU or waiting for IO, or ready to run but not being scheduled at this point of time. This number includes all the processes, not only clickhouse-server. The number can be greater than the number of CPU cores, if the system is overloaded, and many processes are ready to run but waiting for CPU or IO.
+
+### MMapCacheCells
+
+The number of files opened with `mmap` (mapped in memory). This is used for queries with the setting `local_filesystem_read_method` set to  `mmap`. The files opened with `mmap` are kept in the cache to avoid costly TLB flushes.
+
+### MarkCacheBytes
+
+Total size of mark cache in bytes
+
+### MarkCacheFiles
+
+Total number of mark files cached in the mark cache
+
+### MaxPartCountForPartition
+
+Maximum number of parts per partition across all partitions of all tables of MergeTree family. Values larger than 300 indicates misconfiguration, overload, or massive data loading.
+
+### MemoryCode
+
+The amount of virtual memory mapped for the pages of machine code of the server process, in bytes.
+
+### MemoryDataAndStack
+
+The amount of virtual memory mapped for the use of stack and for the allocated memory, in bytes. It is unspecified whether it includes the per-thread stacks and most of the allocated memory, that is allocated with the 'mmap' system call. This metric exists only for completeness reasons. I recommend to use the `MemoryResident` metric for monitoring.
+
+### MemoryResident
+
+The amount of physical memory used by the server process, in bytes.
+
+### MemoryShared
+
+The amount of memory used by the server process, that is also shared by another processes, in bytes. ClickHouse does not use shared memory, but some memory can be labeled by OS as shared for its own reasons. This metric does not make a lot of sense to watch, and it exists only for completeness reasons.
+
+### MemoryVirtual
+
+The size of the virtual address space allocated by the server process, in bytes. The size of the virtual address space is usually much greater than the physical memory consumption, and should not be used as an estimate for the memory consumption. The large values of this metric are totally normal, and makes only technical sense.
+
+### MySQLThreads
+
+Number of threads in the server of the MySQL compatibility protocol.
+
+### NetworkReceiveBytes_*name*
+
+ Number of bytes received via the network interface. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### NetworkReceiveDrop_*name*
+
+ Number of bytes a packet was dropped while received via the network interface. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### NetworkReceiveErrors_*name*
+
+ Number of times error happened receiving via the network interface. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### NetworkReceivePackets_*name*
+
+ Number of network packets received via the network interface. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### NetworkSendBytes_*name*
+
+ Number of bytes sent via the network interface. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### NetworkSendDrop_*name*
+
+ Number of times a packed was dropped while sending via the network interface. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### NetworkSendErrors_*name*
+
+ Number of times error (e.g. TCP retransmit) happened while sending via the network interface. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### NetworkSendPackets_*name*
+
+ Number of network packets sent via the network interface. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### NumberOfDatabases
+
+Total number of databases on the server.
+
+### NumberOfDetachedByUserParts
+
+The total number of parts detached from MergeTree tables by users with the `ALTER TABLE DETACH` query (as opposed to unexpected, broken or ignored parts). The server does not care about detached parts and they can be removed.
+
+### NumberOfDetachedParts
+
+The total number of parts detached from MergeTree tables. A part can be detached by a user with the `ALTER TABLE DETACH` query or by the server itself it the part is broken, unexpected or unneeded. The server does not care about detached parts and they can be removed.
+
+### NumberOfTables
+
+Total number of tables summed across the databases on the server, excluding the databases that cannot contain MergeTree tables. The excluded database engines are those who generate the set of tables on the fly, like `Lazy`, `MySQL`, `PostgreSQL`, `SQlite`.
+
+### OSContextSwitches
+
+The number of context switches that the system underwent on the host machine. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSGuestNiceTime
+
+The ratio of time spent running a virtual CPU for guest operating systems under the control of the Linux kernel, when a guest was set to a higher priority (See `man procfs`). This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. This metric is irrelevant for ClickHouse, but still exists for completeness. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSGuestNiceTimeCPU_*N*
+
+The ratio of time spent running a virtual CPU for guest operating systems under the control of the Linux kernel, when a guest was set to a higher priority (See `man procfs`). This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. This metric is irrelevant for ClickHouse, but still exists for completeness. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSGuestNiceTimeNormalized
+
+The value is similar to `OSGuestNiceTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores. This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric.
+
+### OSGuestTime
+
+The ratio of time spent running a virtual CPU for guest operating systems under the control of the Linux kernel (See `man procfs`). This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. This metric is irrelevant for ClickHouse, but still exists for completeness. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSGuestTimeCPU_*N*
+
+The ratio of time spent running a virtual CPU for guest operating systems under the control of the Linux kernel (See `man procfs`). This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. This metric is irrelevant for ClickHouse, but still exists for completeness. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSGuestTimeNormalized
+
+The value is similar to `OSGuestTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores. This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric.
+
+### OSIOWaitTime
+
+The ratio of time the CPU core was not running the code but when the OS kernel did not run any other process on this CPU as the processes were waiting for IO. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSIOWaitTimeCPU_*N*
+
+The ratio of time the CPU core was not running the code but when the OS kernel did not run any other process on this CPU as the processes were waiting for IO. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSIOWaitTimeNormalized
+
+The value is similar to `OSIOWaitTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores. This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric.
+
+### OSIdleTime
+
+The ratio of time the CPU core was idle (not even ready to run a process waiting for IO) from the OS kernel standpoint. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. This does not include the time when the CPU was under-utilized due to the reasons internal to the CPU (memory loads, pipeline stalls, branch mispredictions, running another SMT core). The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSIdleTimeCPU_*N*
+
+The ratio of time the CPU core was idle (not even ready to run a process waiting for IO) from the OS kernel standpoint. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. This does not include the time when the CPU was under-utilized due to the reasons internal to the CPU (memory loads, pipeline stalls, branch mispredictions, running another SMT core). The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSIdleTimeNormalized
+
+The value is similar to `OSIdleTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores. This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric.
+
+### OSInterrupts
+
+The number of interrupts on the host machine. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSIrqTime
+
+The ratio of time spent for running hardware interrupt requests on the CPU. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. A high number of this metric may indicate hardware misconfiguration or a very high network load. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSIrqTimeCPU_*N*
+
+The ratio of time spent for running hardware interrupt requests on the CPU. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. A high number of this metric may indicate hardware misconfiguration or a very high network load. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSIrqTimeNormalized
+
+The value is similar to `OSIrqTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores. This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric.
+
+### OSMemoryAvailable
+
+The amount of memory available to be used by programs, in bytes. This is very similar to the `OSMemoryFreePlusCached` metric. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSMemoryBuffers
+
+The amount of memory used by OS kernel buffers, in bytes. This should be typically small, and large values may indicate a misconfiguration of the OS. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSMemoryCached
+
+The amount of memory used by the OS page cache, in bytes. Typically, almost all available memory is used by the OS page cache - high values of this metric are normal and expected. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSMemoryFreePlusCached
+
+The amount of free memory plus OS page cache memory on the host system, in bytes. This memory is available to be used by programs. The value should be very similar to `OSMemoryAvailable`. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSMemoryFreeWithoutCached
+
+The amount of free memory on the host system, in bytes. This does not include the memory used by the OS page cache memory, in bytes. The page cache memory is also available for usage by programs, so the value of this metric can be confusing. See the `OSMemoryAvailable` metric instead. For convenience we also provide the `OSMemoryFreePlusCached` metric, that should be somewhat similar to OSMemoryAvailable. See also https://www.linuxatemyram.com/. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSMemoryTotal
+
+The total amount of memory on the host system, in bytes.
+
+### OSNiceTime
+
+The ratio of time the CPU core was running userspace code with higher priority. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSNiceTimeCPU_*N*
+
+The ratio of time the CPU core was running userspace code with higher priority. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSNiceTimeNormalized
+
+The value is similar to `OSNiceTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores. This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric.
+
+### OSOpenFiles
+
+The total number of opened files on the host machine. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSProcessesBlocked
+
+Number of threads blocked waiting for I/O to complete (`man procfs`). This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSProcessesCreated
+
+The number of processes created. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSProcessesRunning
+
+The number of runnable (running or ready to run) threads by the operating system. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server.
+
+### OSSoftIrqTime
+
+The ratio of time spent for running software interrupt requests on the CPU. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. A high number of this metric may indicate inefficient software running on the system. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSSoftIrqTimeCPU_*N*
+
+The ratio of time spent for running software interrupt requests on the CPU. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. A high number of this metric may indicate inefficient software running on the system. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSSoftIrqTimeNormalized
+
+The value is similar to `OSSoftIrqTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores. This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric.
+
+### OSStealTime
+
+The ratio of time spent in other operating systems by the CPU when running in a virtualized environment. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Not every virtualized environments present this metric, and most of them don't. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSStealTimeCPU_*N*
+
+The ratio of time spent in other operating systems by the CPU when running in a virtualized environment. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. Not every virtualized environments present this metric, and most of them don't. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSStealTimeNormalized
+
+The value is similar to `OSStealTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores. This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric.
+
+### OSSystemTime
+
+The ratio of time the CPU core was running OS kernel (system) code. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSSystemTimeCPU_*N*
+
+The ratio of time the CPU core was running OS kernel (system) code. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSSystemTimeNormalized
+
+The value is similar to `OSSystemTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores. This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric.
+
+### OSThreadsRunnable
+
+The total number of 'runnable' threads, as the OS kernel scheduler seeing it.
+
+### OSThreadsTotal
+
+The total number of threads, as the OS kernel scheduler seeing it.
+
+### OSUptime
+
+The uptime of the host server (the machine where ClickHouse is running), in seconds.
+
+### OSUserTime
+
+The ratio of time the CPU core was running userspace code. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. This includes also the time when the CPU was under-utilized due to the reasons internal to the CPU (memory loads, pipeline stalls, branch mispredictions, running another SMT core). The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSUserTimeCPU_*N*
+
+The ratio of time the CPU core was running userspace code. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server. This includes also the time when the CPU was under-utilized due to the reasons internal to the CPU (memory loads, pipeline stalls, branch mispredictions, running another SMT core). The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores].
+
+### OSUserTimeNormalized
+
+The value is similar to `OSUserTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores. This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric.
+
+### PostgreSQLThreads
+
+Number of threads in the server of the PostgreSQL compatibility protocol.
+
+### ReplicasMaxAbsoluteDelay
+
+Maximum difference in seconds between the most fresh replicated part and the most fresh data part still to be replicated, across Replicated tables. A very high value indicates a replica with no data.
+
+### ReplicasMaxInsertsInQueue
+
+Maximum number of INSERT operations in the queue (still to be replicated) across Replicated tables.
+
+### ReplicasMaxMergesInQueue
+
+Maximum number of merge operations in the queue (still to be applied) across Replicated tables.
+
+### ReplicasMaxQueueSize
+
+Maximum queue size (in the number of operations like get, merge) across Replicated tables.
+
+### ReplicasMaxRelativeDelay
+
+Maximum difference between the replica delay and the delay of the most up-to-date replica of the same table, across Replicated tables.
+
+### ReplicasSumInsertsInQueue
+
+Sum of INSERT operations in the queue (still to be replicated) across Replicated tables.
+
+### ReplicasSumMergesInQueue
+
+Sum of merge operations in the queue (still to be applied) across Replicated tables.
+
+### ReplicasSumQueueSize
+
+Sum queue size (in the number of operations like get, merge) across Replicated tables.
+
+### TCPThreads
+
+Number of threads in the server of the TCP protocol (without TLS).
+
+### Temperature_*N*
+
+The temperature of the corresponding device in ℃. A sensor can return an unrealistic value. Source: `/sys/class/thermal`
+
+### Temperature_*name*
+
+The temperature reported by the corresponding hardware monitor and the corresponding sensor in ℃. A sensor can return an unrealistic value. Source: `/sys/class/hwmon`
+
+### TotalBytesOfMergeTreeTables
+
+Total amount of bytes (compressed, including data and indices) stored in all tables of MergeTree family.
+
+### TotalPartsOfMergeTreeTables
+
+Total amount of data parts in all tables of MergeTree family. Numbers larger than 10 000 will negatively affect the server startup time and it may indicate unreasonable choice of the partition key.
+
+### TotalRowsOfMergeTreeTables
+
+Total amount of rows (records) stored in all tables of MergeTree family.
+
+### UncompressedCacheBytes
+
+Total size of uncompressed cache in bytes. Uncompressed cache does not usually improve the performance and should be mostly avoided.
+
+### UncompressedCacheCells
+
+Total number of entries in the uncompressed cache. Each entry represents a decompressed block of data. Uncompressed cache does not usually improve performance and should be mostly avoided.
+
+### Uptime
+
+The server uptime in seconds. It includes the time spent for server initialization before accepting connections.
+
+### jemalloc.active
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.allocated
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.arenas.all.dirty_purged
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.arenas.all.muzzy_purged
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.arenas.all.pactive
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.arenas.all.pdirty
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.arenas.all.pmuzzy
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.background_thread.num_runs
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.background_thread.num_threads
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.background_thread.run_intervals
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.epoch
+
+An internal incremental update number of the statistics of jemalloc (Jason Evans' memory allocator), used in all other `jemalloc` metrics.
+
+### jemalloc.mapped
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.metadata
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.metadata_thp
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.resident
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
+### jemalloc.retained
+
+An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html
+
 **See Also**
 
--   [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
--   [system.metrics](../../operations/system-tables/metrics.md#system_tables-metrics) — Contains instantly calculated metrics.
--   [system.events](../../operations/system-tables/events.md#system_tables-events) — Contains a number of events that have occurred.
--   [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` and `system.events`.
+- [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
+- [system.metrics](../../operations/system-tables/metrics.md#system_tables-metrics) — Contains instantly calculated metrics.
+- [system.events](../../operations/system-tables/events.md#system_tables-events) — Contains a number of events that have occurred.
+- [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` and `system.events`.
diff --git a/docs/en/operations/system-tables/build_options.md b/docs/en/operations/system-tables/build_options.md
new file mode 100644
index 00000000000..5225d0ff99d
--- /dev/null
+++ b/docs/en/operations/system-tables/build_options.md
@@ -0,0 +1,27 @@
+---
+slug: /en/operations/system-tables/build_options
+---
+# build_options
+
+Contains information about the ClickHouse server's build options.
+
+Columns:
+
+- `name` (String) — Name of the build option, e.g. `USE_ODBC`
+- `value` (String) — Value of the build option, e.g. `1`
+
+**Example**
+
+``` sql
+SELECT * FROM system.build_options LIMIT 5
+```
+
+``` text
+┌─name─────────────┬─value─┐
+│ USE_BROTLI       │ 1     │
+│ USE_BZIP2        │ 1     │
+│ USE_CAPNP        │ 1     │
+│ USE_CASSANDRA    │ 1     │
+│ USE_DATASKETCHES │ 1     │
+└──────────────────┴───────┘
+```
diff --git a/docs/en/operations/system-tables/clusters.md b/docs/en/operations/system-tables/clusters.md
index 2c5e2699b4f..deb9a0aaeb3 100644
--- a/docs/en/operations/system-tables/clusters.md
+++ b/docs/en/operations/system-tables/clusters.md
@@ -7,19 +7,22 @@ Contains information about clusters available in the config file and the servers
 
 Columns:
 
--   `cluster` ([String](../../sql-reference/data-types/string.md)) — The cluster name.
--   `shard_num` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The shard number in the cluster, starting from 1.
--   `shard_weight` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The relative weight of the shard when writing data.
--   `replica_num` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The replica number in the shard, starting from 1.
--   `host_name` ([String](../../sql-reference/data-types/string.md)) — The host name, as specified in the config.
--   `host_address` ([String](../../sql-reference/data-types/string.md)) — The host IP address obtained from DNS.
--   `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The port to use for connecting to the server.
--   `is_local` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the host is local.
--   `user` ([String](../../sql-reference/data-types/string.md)) — The name of the user for connecting to the server.
--   `default_database` ([String](../../sql-reference/data-types/string.md)) — The default database name.
--   `errors_count` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of times this host failed to reach replica.
--   `slowdowns_count` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of slowdowns that led to changing replica when establishing a connection with hedged requests.
--   `estimated_recovery_time` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Seconds remaining until the replica error count is zeroed and it is considered to be back to normal.
+- `cluster` ([String](../../sql-reference/data-types/string.md)) — The cluster name.
+- `shard_num` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The shard number in the cluster, starting from 1.
+- `shard_weight` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The relative weight of the shard when writing data.
+- `replica_num` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The replica number in the shard, starting from 1.
+- `host_name` ([String](../../sql-reference/data-types/string.md)) — The host name, as specified in the config.
+- `host_address` ([String](../../sql-reference/data-types/string.md)) — The host IP address obtained from DNS.
+- `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The port to use for connecting to the server.
+- `is_local` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the host is local.
+- `user` ([String](../../sql-reference/data-types/string.md)) — The name of the user for connecting to the server.
+- `default_database` ([String](../../sql-reference/data-types/string.md)) — The default database name.
+- `errors_count` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of times this host failed to reach replica.
+- `slowdowns_count` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of slowdowns that led to changing replica when establishing a connection with hedged requests.
+- `estimated_recovery_time` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Seconds remaining until the replica error count is zeroed and it is considered to be back to normal.
+- `database_shard_name` ([String](../../sql-reference/data-types/string.md)) — The name of the `Replicated` database shard (for clusters that belong to a `Replicated` database).
+- `database_replica_name` ([String](../../sql-reference/data-types/string.md)) — The name of the `Replicated` database replica (for clusters that belong to a `Replicated` database).
+- `is_active` ([Nullable(UInt8)](../../sql-reference/data-types/int-uint.md)) — The status of the `Replicated` database replica (for clusters that belong to a `Replicated` database): 1 means "replica is online", 0 means "replica is offline", `NULL` means "unknown".
 
 **Example**
 
@@ -47,6 +50,9 @@ default_database:
 errors_count:            0
 slowdowns_count:         0
 estimated_recovery_time: 0
+database_shard_name:
+database_replica_name:
+is_active:               NULL
 
 Row 2:
 ──────
@@ -63,10 +69,13 @@ default_database:
 errors_count:            0
 slowdowns_count:         0
 estimated_recovery_time: 0
+database_shard_name:
+database_replica_name:
+is_active:               NULL
 ```
 
 **See Also**
 
--   [Table engine Distributed](../../engines/table-engines/special/distributed.md)
--   [distributed_replica_error_cap setting](../../operations/settings/settings.md#settings-distributed_replica_error_cap)
--   [distributed_replica_error_half_life setting](../../operations/settings/settings.md#settings-distributed_replica_error_half_life)
+- [Table engine Distributed](../../engines/table-engines/special/distributed.md)
+- [distributed_replica_error_cap setting](../../operations/settings/settings.md#settings-distributed_replica_error_cap)
+- [distributed_replica_error_half_life setting](../../operations/settings/settings.md#settings-distributed_replica_error_half_life)
diff --git a/docs/en/operations/system-tables/columns.md b/docs/en/operations/system-tables/columns.md
index bdb35e24e37..ccdc2d8c742 100644
--- a/docs/en/operations/system-tables/columns.md
+++ b/docs/en/operations/system-tables/columns.md
@@ -11,27 +11,27 @@ Columns from [temporary tables](../../sql-reference/statements/create/table.md#t
 
 The `system.columns` table contains the following columns (the column type is shown in brackets):
 
--   `database` ([String](../../sql-reference/data-types/string.md)) — Database name.
--   `table` ([String](../../sql-reference/data-types/string.md)) — Table name.
--   `name` ([String](../../sql-reference/data-types/string.md)) — Column name.
--   `type` ([String](../../sql-reference/data-types/string.md)) — Column type.
--   `position` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Ordinal position of a column in a table starting with 1.
--   `default_kind` ([String](../../sql-reference/data-types/string.md)) — Expression type (`DEFAULT`, `MATERIALIZED`, `ALIAS`) for the default value, or an empty string if it is not defined.
--   `default_expression` ([String](../../sql-reference/data-types/string.md)) — Expression for the default value, or an empty string if it is not defined.
--   `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of compressed data, in bytes.
--   `data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of decompressed data, in bytes.
--   `marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of marks, in bytes.
--   `comment` ([String](../../sql-reference/data-types/string.md)) — Comment on the column, or an empty string if it is not defined.
--   `is_in_partition_key` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the column is in the partition expression.
--   `is_in_sorting_key` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the column is in the sorting key expression.
--   `is_in_primary_key` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the column is in the primary key expression.
--   `is_in_sampling_key` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the column is in the sampling key expression.
--   `compression_codec` ([String](../../sql-reference/data-types/string.md)) — Compression codec name.
--   `character_octet_length` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum length in bytes for binary data, character data, or text data and images. In ClickHouse makes sense only for `FixedString` data type. Otherwise, the `NULL` value is returned.
--   `numeric_precision` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Accuracy of approximate numeric data, exact numeric data, integer data, or monetary data. In ClickHouse it is bitness for integer types and decimal precision for `Decimal` types. Otherwise, the `NULL` value is returned.
--   `numeric_precision_radix` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The base of the number system is the accuracy of approximate numeric data, exact numeric data, integer data or monetary data. In ClickHouse it's 2 for integer types and 10 for `Decimal` types. Otherwise, the `NULL` value is returned.
--   `numeric_scale` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The scale of approximate numeric data, exact numeric data, integer data, or monetary data. In ClickHouse makes sense only for `Decimal` types. Otherwise, the `NULL` value is returned.
--   `datetime_precision` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Decimal precision of `DateTime64` data type. For other data types, the `NULL` value is returned.
+- `database` ([String](../../sql-reference/data-types/string.md)) — Database name.
+- `table` ([String](../../sql-reference/data-types/string.md)) — Table name.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Column name.
+- `type` ([String](../../sql-reference/data-types/string.md)) — Column type.
+- `position` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Ordinal position of a column in a table starting with 1.
+- `default_kind` ([String](../../sql-reference/data-types/string.md)) — Expression type (`DEFAULT`, `MATERIALIZED`, `ALIAS`) for the default value, or an empty string if it is not defined.
+- `default_expression` ([String](../../sql-reference/data-types/string.md)) — Expression for the default value, or an empty string if it is not defined.
+- `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of compressed data, in bytes.
+- `data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of decompressed data, in bytes.
+- `marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of marks, in bytes.
+- `comment` ([String](../../sql-reference/data-types/string.md)) — Comment on the column, or an empty string if it is not defined.
+- `is_in_partition_key` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the column is in the partition expression.
+- `is_in_sorting_key` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the column is in the sorting key expression.
+- `is_in_primary_key` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the column is in the primary key expression.
+- `is_in_sampling_key` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the column is in the sampling key expression.
+- `compression_codec` ([String](../../sql-reference/data-types/string.md)) — Compression codec name.
+- `character_octet_length` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum length in bytes for binary data, character data, or text data and images. In ClickHouse makes sense only for `FixedString` data type. Otherwise, the `NULL` value is returned.
+- `numeric_precision` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Accuracy of approximate numeric data, exact numeric data, integer data, or monetary data. In ClickHouse it is bitness for integer types and decimal precision for `Decimal` types. Otherwise, the `NULL` value is returned.
+- `numeric_precision_radix` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The base of the number system is the accuracy of approximate numeric data, exact numeric data, integer data or monetary data. In ClickHouse it's 2 for integer types and 10 for `Decimal` types. Otherwise, the `NULL` value is returned.
+- `numeric_scale` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The scale of approximate numeric data, exact numeric data, integer data, or monetary data. In ClickHouse makes sense only for `Decimal` types. Otherwise, the `NULL` value is returned.
+- `datetime_precision` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Decimal precision of `DateTime64` data type. For other data types, the `NULL` value is returned.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/contributors.md b/docs/en/operations/system-tables/contributors.md
index b871bb20f2e..f00329e2dbe 100644
--- a/docs/en/operations/system-tables/contributors.md
+++ b/docs/en/operations/system-tables/contributors.md
@@ -7,7 +7,7 @@ Contains information about contributors. The order is random at query execution
 
 Columns:
 
--   `name` (String) — Contributor (author) name from git log.
+- `name` (String) — Contributor (author) name from git log.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/crash-log.md b/docs/en/operations/system-tables/crash-log.md
index a44b0db8e9b..4d015a513a2 100644
--- a/docs/en/operations/system-tables/crash-log.md
+++ b/docs/en/operations/system-tables/crash-log.md
@@ -7,17 +7,17 @@ Contains information about stack traces for fatal errors. The table does not exi
 
 Columns:
 
--   `event_date` ([DateTime](../../sql-reference/data-types/datetime.md)) — Date of the event.
--   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Time of the event.
--   `timestamp_ns` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Timestamp of the event with nanoseconds.
--   `signal` ([Int32](../../sql-reference/data-types/int-uint.md)) — Signal number.
--   `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Thread ID.
--   `query_id` ([String](../../sql-reference/data-types/string.md)) — Query ID.
--   `trace` ([Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Stack trace at the moment of crash. Each element is a virtual memory address inside ClickHouse server process.
--   `trace_full` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Stack trace at the moment of crash. Each element contains a called method inside ClickHouse server process.
--   `version` ([String](../../sql-reference/data-types/string.md)) — ClickHouse server version.
--   `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ClickHouse server revision.
--   `build_id` ([String](../../sql-reference/data-types/string.md)) — BuildID that is generated by compiler.
+- `event_date` ([DateTime](../../sql-reference/data-types/datetime.md)) — Date of the event.
+- `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Time of the event.
+- `timestamp_ns` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Timestamp of the event with nanoseconds.
+- `signal` ([Int32](../../sql-reference/data-types/int-uint.md)) — Signal number.
+- `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Thread ID.
+- `query_id` ([String](../../sql-reference/data-types/string.md)) — Query ID.
+- `trace` ([Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Stack trace at the moment of crash. Each element is a virtual memory address inside ClickHouse server process.
+- `trace_full` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Stack trace at the moment of crash. Each element contains a called method inside ClickHouse server process.
+- `version` ([String](../../sql-reference/data-types/string.md)) — ClickHouse server version.
+- `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ClickHouse server revision.
+- `build_id` ([String](../../sql-reference/data-types/string.md)) — BuildID that is generated by compiler.
 
 **Example**
 
@@ -46,6 +46,6 @@ build_id:
 ```
 
 **See also**
--   [trace_log](../../operations/system-tables/trace_log.md) system table
+- [trace_log](../../operations/system-tables/trace_log.md) system table
 
 [Original article](https://clickhouse.com/docs/en/operations/system-tables/crash-log)
diff --git a/docs/en/operations/system-tables/data_skipping_indices.md b/docs/en/operations/system-tables/data_skipping_indices.md
index f1e233b33f7..188d94c50da 100644
--- a/docs/en/operations/system-tables/data_skipping_indices.md
+++ b/docs/en/operations/system-tables/data_skipping_indices.md
@@ -7,16 +7,16 @@ Contains information about existing data skipping indices in all the tables.
 
 Columns:
 
--   `database` ([String](../../sql-reference/data-types/string.md)) — Database name.
--   `table` ([String](../../sql-reference/data-types/string.md)) — Table name.
--   `name` ([String](../../sql-reference/data-types/string.md)) — Index name.
--   `type` ([String](../../sql-reference/data-types/string.md)) — Index type.
--   `type_full` ([String](../../sql-reference/data-types/string.md)) — Index type expression from create statement.
--   `expr` ([String](../../sql-reference/data-types/string.md)) — Expression for the index calculation.
--   `granularity` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of granules in the block.
--   `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of compressed data, in bytes.
--   `data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of decompressed data, in bytes.
--   `marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of marks, in bytes.
+- `database` ([String](../../sql-reference/data-types/string.md)) — Database name.
+- `table` ([String](../../sql-reference/data-types/string.md)) — Table name.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Index name.
+- `type` ([String](../../sql-reference/data-types/string.md)) — Index type.
+- `type_full` ([String](../../sql-reference/data-types/string.md)) — Index type expression from create statement.
+- `expr` ([String](../../sql-reference/data-types/string.md)) — Expression for the index calculation.
+- `granularity` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of granules in the block.
+- `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of compressed data, in bytes.
+- `data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of decompressed data, in bytes.
+- `marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of marks, in bytes.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/data_type_families.md b/docs/en/operations/system-tables/data_type_families.md
index f914d5545d3..1392e977f60 100644
--- a/docs/en/operations/system-tables/data_type_families.md
+++ b/docs/en/operations/system-tables/data_type_families.md
@@ -7,9 +7,9 @@ Contains information about supported [data types](../../sql-reference/data-types
 
 Columns:
 
--   `name` ([String](../../sql-reference/data-types/string.md)) — Data type name.
--   `case_insensitive` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Property that shows whether you can use a data type name in a query in case insensitive manner or not. For example, `Date` and `date` are both valid.
--   `alias_to` ([String](../../sql-reference/data-types/string.md)) — Data type name for which `name` is an alias.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Data type name.
+- `case_insensitive` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Property that shows whether you can use a data type name in a query in case insensitive manner or not. For example, `Date` and `date` are both valid.
+- `alias_to` ([String](../../sql-reference/data-types/string.md)) — Data type name for which `name` is an alias.
 
 **Example**
 
@@ -34,4 +34,4 @@ SELECT * FROM system.data_type_families WHERE alias_to = 'String'
 
 **See Also**
 
--   [Syntax](../../sql-reference/syntax.md) — Information about supported syntax.
+- [Syntax](../../sql-reference/syntax.md) — Information about supported syntax.
diff --git a/docs/en/operations/system-tables/databases.md b/docs/en/operations/system-tables/databases.md
index 8f0cc6e56d2..f3d3d388c36 100644
--- a/docs/en/operations/system-tables/databases.md
+++ b/docs/en/operations/system-tables/databases.md
@@ -7,13 +7,13 @@ Contains information about the databases that are available to the current user.
 
 Columns:
 
--   `name` ([String](../../sql-reference/data-types/string.md)) — Database name.
--   `engine` ([String](../../sql-reference/data-types/string.md)) — [Database engine](../../engines/database-engines/index.md).
--   `data_path` ([String](../../sql-reference/data-types/string.md)) — Data path.
--   `metadata_path` ([String](../../sql-reference/data-types/enum.md)) — Metadata path.
--   `uuid` ([UUID](../../sql-reference/data-types/uuid.md)) — Database UUID.
--   `comment` ([String](../../sql-reference/data-types/enum.md)) — Database comment.
--   `engine_full` ([String](../../sql-reference/data-types/enum.md)) — Parameters of the database engine.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Database name.
+- `engine` ([String](../../sql-reference/data-types/string.md)) — [Database engine](../../engines/database-engines/index.md).
+- `data_path` ([String](../../sql-reference/data-types/string.md)) — Data path.
+- `metadata_path` ([String](../../sql-reference/data-types/enum.md)) — Metadata path.
+- `uuid` ([UUID](../../sql-reference/data-types/uuid.md)) — Database UUID.
+- `comment` ([String](../../sql-reference/data-types/enum.md)) — Database comment.
+- `engine_full` ([String](../../sql-reference/data-types/enum.md)) — Parameters of the database engine.
 
 The `name` column from this system table is used for implementing the `SHOW DATABASES` query.
 
diff --git a/docs/en/operations/system-tables/dictionaries.md b/docs/en/operations/system-tables/dictionaries.md
index 4b256f0de97..8632581144c 100644
--- a/docs/en/operations/system-tables/dictionaries.md
+++ b/docs/en/operations/system-tables/dictionaries.md
@@ -3,40 +3,40 @@ slug: /en/operations/system-tables/dictionaries
 ---
 # dictionaries
 
-Contains information about [dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
+Contains information about [dictionaries](../../sql-reference/dictionaries/index.md).
 
 Columns:
 
--   `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database containing the dictionary created by DDL query. Empty string for other dictionaries.
--   `name` ([String](../../sql-reference/data-types/string.md)) — [Dictionary name](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md).
--   `uuid` ([UUID](../../sql-reference/data-types/uuid.md)) — Dictionary UUID.
--   `status` ([Enum8](../../sql-reference/data-types/enum.md)) — Dictionary status. Possible values:
-    -   `NOT_LOADED` — Dictionary was not loaded because it was not used.
-    -   `LOADED` — Dictionary loaded successfully.
-    -   `FAILED` — Unable to load the dictionary as a result of an error.
-    -   `LOADING` — Dictionary is loading now.
-    -   `LOADED_AND_RELOADING` — Dictionary is loaded successfully, and is being reloaded right now (frequent reasons: [SYSTEM RELOAD DICTIONARY](../../sql-reference/statements/system.md#query_language-system-reload-dictionary) query, timeout, dictionary config has changed).
-    -   `FAILED_AND_RELOADING` — Could not load the dictionary as a result of an error and is loading now.
--   `origin` ([String](../../sql-reference/data-types/string.md)) — Path to the configuration file that describes the dictionary.
--   `type` ([String](../../sql-reference/data-types/string.md)) — Type of a dictionary allocation. [Storing Dictionaries in Memory](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md).
--   `key.names` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Array of [key names](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-key) provided by the dictionary.
--   `key.types` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Corresponding array of [key types](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-key) provided by the dictionary.
--   `attribute.names` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Array of [attribute names](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes) provided by the dictionary.
--   `attribute.types` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Corresponding array of [attribute types](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes) provided by the dictionary.
--   `bytes_allocated` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Amount of RAM allocated for the dictionary.
--   `query_count` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of queries since the dictionary was loaded or since the last successful reboot.
--   `hit_rate` ([Float64](../../sql-reference/data-types/float.md)) — For cache dictionaries, the percentage of uses for which the value was in the cache.
--   `found_rate` ([Float64](../../sql-reference/data-types/float.md)) — The percentage of uses for which the value was found.
--   `element_count` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of items stored in the dictionary.
--   `load_factor` ([Float64](../../sql-reference/data-types/float.md)) — Percentage filled in the dictionary (for a hashed dictionary, the percentage filled in the hash table).
--   `source` ([String](../../sql-reference/data-types/string.md)) — Text describing the [data source](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md) for the dictionary.
--   `lifetime_min` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Minimum [lifetime](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) of the dictionary in memory, after which ClickHouse tries to reload the dictionary (if `invalidate_query` is set, then only if it has changed). Set in seconds.
--   `lifetime_max` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Maximum [lifetime](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) of the dictionary in memory, after which ClickHouse tries to reload the dictionary (if `invalidate_query` is set, then only if it has changed). Set in seconds.
--   `loading_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Start time for loading the dictionary.
--   `last_successful_update_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — End time for loading or updating the dictionary. Helps to monitor some troubles with dictionary sources and investigate the causes.
--   `loading_duration` ([Float32](../../sql-reference/data-types/float.md)) — Duration of a dictionary loading.
--   `last_exception` ([String](../../sql-reference/data-types/string.md)) — Text of the error that occurs when creating or reloading the dictionary if the dictionary couldn’t be created.
--   `comment` ([String](../../sql-reference/data-types/string.md)) — Text of the comment to dictionary.
+- `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database containing the dictionary created by DDL query. Empty string for other dictionaries.
+- `name` ([String](../../sql-reference/data-types/string.md)) — [Dictionary name](../../sql-reference/dictionaries/index.md).
+- `uuid` ([UUID](../../sql-reference/data-types/uuid.md)) — Dictionary UUID.
+- `status` ([Enum8](../../sql-reference/data-types/enum.md)) — Dictionary status. Possible values:
+    - `NOT_LOADED` — Dictionary was not loaded because it was not used.
+    - `LOADED` — Dictionary loaded successfully.
+    - `FAILED` — Unable to load the dictionary as a result of an error.
+    - `LOADING` — Dictionary is loading now.
+    - `LOADED_AND_RELOADING` — Dictionary is loaded successfully, and is being reloaded right now (frequent reasons: [SYSTEM RELOAD DICTIONARY](../../sql-reference/statements/system.md#query_language-system-reload-dictionary) query, timeout, dictionary config has changed).
+    - `FAILED_AND_RELOADING` — Could not load the dictionary as a result of an error and is loading now.
+- `origin` ([String](../../sql-reference/data-types/string.md)) — Path to the configuration file that describes the dictionary.
+- `type` ([String](../../sql-reference/data-types/string.md)) — Type of a dictionary allocation. [Storing Dictionaries in Memory](../../sql-reference/dictionaries/index.md#storig-dictionaries-in-memory).
+- `key.names` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Array of [key names](../../sql-reference/dictionaries/index.md#dictionary-key-and-fields#ext_dict_structure-key) provided by the dictionary.
+- `key.types` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Corresponding array of [key types](../../sql-reference/dictionaries/index.md#dictionary-key-and-fields#ext_dict_structure-key) provided by the dictionary.
+- `attribute.names` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Array of [attribute names](../../sql-reference/dictionaries/index.md#dictionary-key-and-fields#ext_dict_structure-attributes) provided by the dictionary.
+- `attribute.types` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Corresponding array of [attribute types](../../sql-reference/dictionaries/index.md#dictionary-key-and-fields#ext_dict_structure-attributes) provided by the dictionary.
+- `bytes_allocated` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Amount of RAM allocated for the dictionary.
+- `query_count` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of queries since the dictionary was loaded or since the last successful reboot.
+- `hit_rate` ([Float64](../../sql-reference/data-types/float.md)) — For cache dictionaries, the percentage of uses for which the value was in the cache.
+- `found_rate` ([Float64](../../sql-reference/data-types/float.md)) — The percentage of uses for which the value was found.
+- `element_count` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of items stored in the dictionary.
+- `load_factor` ([Float64](../../sql-reference/data-types/float.md)) — Percentage filled in the dictionary (for a hashed dictionary, the percentage filled in the hash table).
+- `source` ([String](../../sql-reference/data-types/string.md)) — Text describing the [data source](../../sql-reference/dictionaries/index.md#dictionary-sources) for the dictionary.
+- `lifetime_min` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Minimum [lifetime](../../sql-reference/dictionaries/index.md#dictionary-updates) of the dictionary in memory, after which ClickHouse tries to reload the dictionary (if `invalidate_query` is set, then only if it has changed). Set in seconds.
+- `lifetime_max` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Maximum [lifetime](../../sql-reference/dictionaries/index.md#dictionary-updates) of the dictionary in memory, after which ClickHouse tries to reload the dictionary (if `invalidate_query` is set, then only if it has changed). Set in seconds.
+- `loading_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Start time for loading the dictionary.
+- `last_successful_update_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — End time for loading or updating the dictionary. Helps to monitor some troubles with dictionary sources and investigate the causes.
+- `loading_duration` ([Float32](../../sql-reference/data-types/float.md)) — Duration of a dictionary loading.
+- `last_exception` ([String](../../sql-reference/data-types/string.md)) — Text of the error that occurs when creating or reloading the dictionary if the dictionary couldn’t be created.
+- `comment` ([String](../../sql-reference/data-types/string.md)) — Text of the comment to dictionary.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/disks.md b/docs/en/operations/system-tables/disks.md
index a079f3338d2..ed67e2a2416 100644
--- a/docs/en/operations/system-tables/disks.md
+++ b/docs/en/operations/system-tables/disks.md
@@ -7,12 +7,12 @@ Contains information about disks defined in the [server configuration](../../eng
 
 Columns:
 
--   `name` ([String](../../sql-reference/data-types/string.md)) — Name of a disk in the server configuration.
--   `path` ([String](../../sql-reference/data-types/string.md)) — Path to the mount point in the file system.
--   `free_space` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Free space on disk in bytes.
--   `total_space` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Disk volume in bytes.
--   `unreserved_space` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Free space which is not taken by reservations (`free_space` minus the size of reservations taken by merges, inserts, and other disk write operations currently running).
--   `keep_free_space` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Amount of disk space that should stay free on disk in bytes. Defined in the `keep_free_space_bytes` parameter of disk configuration.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Name of a disk in the server configuration.
+- `path` ([String](../../sql-reference/data-types/string.md)) — Path to the mount point in the file system.
+- `free_space` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Free space on disk in bytes.
+- `total_space` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Disk volume in bytes.
+- `unreserved_space` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Free space which is not taken by reservations (`free_space` minus the size of reservations taken by merges, inserts, and other disk write operations currently running).
+- `keep_free_space` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Amount of disk space that should stay free on disk in bytes. Defined in the `keep_free_space_bytes` parameter of disk configuration.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/distributed_ddl_queue.md b/docs/en/operations/system-tables/distributed_ddl_queue.md
index acc68372a4c..8cccf946621 100644
--- a/docs/en/operations/system-tables/distributed_ddl_queue.md
+++ b/docs/en/operations/system-tables/distributed_ddl_queue.md
@@ -7,18 +7,18 @@ Contains information about [distributed ddl queries (ON CLUSTER clause)](../../s
 
 Columns:
 
--   `entry` ([String](../../sql-reference/data-types/string.md)) — Query id.
--   `host_name` ([String](../../sql-reference/data-types/string.md)) — Hostname.
--   `host_address` ([String](../../sql-reference/data-types/string.md)) — IP address that the Hostname resolves to.
--   `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — Host Port.
--   `status` ([Enum8](../../sql-reference/data-types/enum.md)) — Status of the query.
--   `cluster` ([String](../../sql-reference/data-types/string.md)) — Cluster name.
--   `query` ([String](../../sql-reference/data-types/string.md)) — Query executed.
--   `initiator` ([String](../../sql-reference/data-types/string.md)) — Node that executed the query.
--   `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query start time.
--   `query_finish_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query finish time.
--   `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Duration of query execution (in milliseconds).
--   `exception_code` ([Enum8](../../sql-reference/data-types/enum.md)) — Exception code from [ClickHouse Keeper](../../operations/tips.md#zookeeper).
+- `entry` ([String](../../sql-reference/data-types/string.md)) — Query id.
+- `host_name` ([String](../../sql-reference/data-types/string.md)) — Hostname.
+- `host_address` ([String](../../sql-reference/data-types/string.md)) — IP address that the Hostname resolves to.
+- `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — Host Port.
+- `status` ([Enum8](../../sql-reference/data-types/enum.md)) — Status of the query.
+- `cluster` ([String](../../sql-reference/data-types/string.md)) — Cluster name.
+- `query` ([String](../../sql-reference/data-types/string.md)) — Query executed.
+- `initiator` ([String](../../sql-reference/data-types/string.md)) — Node that executed the query.
+- `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query start time.
+- `query_finish_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query finish time.
+- `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Duration of query execution (in milliseconds).
+- `exception_code` ([Enum8](../../sql-reference/data-types/enum.md)) — Exception code from [ClickHouse Keeper](../../operations/tips.md#zookeeper).
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/distribution_queue.md b/docs/en/operations/system-tables/distribution_queue.md
index 8f461590ee1..0dee805c022 100644
--- a/docs/en/operations/system-tables/distribution_queue.md
+++ b/docs/en/operations/system-tables/distribution_queue.md
@@ -7,25 +7,25 @@ Contains information about local files that are in the queue to be sent to the s
 
 Columns:
 
--   `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database.
+- `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database.
 
--   `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table.
+- `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table.
 
--   `data_path` ([String](../../sql-reference/data-types/string.md)) — Path to the folder with local files.
+- `data_path` ([String](../../sql-reference/data-types/string.md)) — Path to the folder with local files.
 
--   `is_blocked` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag indicates whether sending local files to the server is blocked.
+- `is_blocked` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag indicates whether sending local files to the server is blocked.
 
--   `error_count` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of errors.
+- `error_count` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of errors.
 
--   `data_files` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of local files in a folder.
+- `data_files` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of local files in a folder.
 
--   `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of compressed data in local files, in bytes.
+- `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of compressed data in local files, in bytes.
 
--   `broken_data_files` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of files that has been marked as broken (due to an error).
+- `broken_data_files` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of files that has been marked as broken (due to an error).
 
--   `broken_data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of compressed data in broken files, in bytes.
+- `broken_data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of compressed data in broken files, in bytes.
 
--   `last_exception` ([String](../../sql-reference/data-types/string.md)) — Text message about the last error that occurred (if any).
+- `last_exception` ([String](../../sql-reference/data-types/string.md)) — Text message about the last error that occurred (if any).
 
 **Example**
 
@@ -48,4 +48,4 @@ last_exception:
 
 **See Also**
 
--   [Distributed table engine](../../engines/table-engines/special/distributed.md)
+- [Distributed table engine](../../engines/table-engines/special/distributed.md)
diff --git a/docs/en/operations/system-tables/dropped_tables.md b/docs/en/operations/system-tables/dropped_tables.md
new file mode 100644
index 00000000000..144c03109ac
--- /dev/null
+++ b/docs/en/operations/system-tables/dropped_tables.md
@@ -0,0 +1,37 @@
+---
+slug: /en/operations/system-tables/dropped_tables
+---
+# dropped_tables
+
+Contains information about tables that drop table has been executed but data cleanup has not been actually performed.
+
+Columns:
+
+- `index` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Index in marked_dropped_tables queue.
+- `database` ([String](../../sql-reference/data-types/string.md)) — Database.
+- `table` ([String](../../sql-reference/data-types/string.md)) — Table name.
+- `uuid` ([UUID](../../sql-reference/data-types/uuid.md)) — Table uuid.
+- `engine` ([String](../../sql-reference/data-types/string.md)) — Table engine name.
+- `metadata_dropped_path` ([String](../../sql-reference/data-types/string.md)) — Path of table's metadata file in metadate_dropped directory.
+- `table_dropped_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The time when the next attempt to remove table's data is scheduled on. Usually it's the table when the table was dropped plus `database_atomic_delay_before_drop_table_sec`
+
+**Example**
+
+The following example shows how to get information about dropped_tables.
+
+``` sql
+SELECT *
+FROM system.dropped_tables\G
+```
+
+``` text
+Row 1:
+──────
+index:                 0
+database:              default
+table:                 test
+uuid:                  03141bb2-e97a-4d7c-a172-95cc066bb3bd
+engine:                MergeTree
+metadata_dropped_path: /data/ClickHouse/build/programs/data/metadata_dropped/default.test.03141bb2-e97a-4d7c-a172-95cc066bb3bd.sql
+table_dropped_time:    2023-03-16 23:43:31
+```
diff --git a/docs/en/operations/system-tables/errors.md b/docs/en/operations/system-tables/errors.md
index 48437f43b7d..01762962152 100644
--- a/docs/en/operations/system-tables/errors.md
+++ b/docs/en/operations/system-tables/errors.md
@@ -7,13 +7,13 @@ Contains error codes with the number of times they have been triggered.
 
 Columns:
 
--   `name` ([String](../../sql-reference/data-types/string.md)) — name of the error (`errorCodeToName`).
--   `code` ([Int32](../../sql-reference/data-types/int-uint.md)) — code number of the error.
--   `value` ([UInt64](../../sql-reference/data-types/int-uint.md)) — the number of times this error has been happened.
--   `last_error_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — time when the last error happened.
--   `last_error_message` ([String](../../sql-reference/data-types/string.md)) — message for the last error.
--   `last_error_trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — A [stack trace](https://en.wikipedia.org/wiki/Stack_trace) which represents a list of physical addresses where the called methods are stored.
--   `remote` ([UInt8](../../sql-reference/data-types/int-uint.md)) — remote exception (i.e. received during one of the distributed query).
+- `name` ([String](../../sql-reference/data-types/string.md)) — name of the error (`errorCodeToName`).
+- `code` ([Int32](../../sql-reference/data-types/int-uint.md)) — code number of the error.
+- `value` ([UInt64](../../sql-reference/data-types/int-uint.md)) — the number of times this error has been happened.
+- `last_error_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — time when the last error happened.
+- `last_error_message` ([String](../../sql-reference/data-types/string.md)) — message for the last error.
+- `last_error_trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — A [stack trace](https://en.wikipedia.org/wiki/Stack_trace) which represents a list of physical addresses where the called methods are stored.
+- `remote` ([UInt8](../../sql-reference/data-types/int-uint.md)) — remote exception (i.e. received during one of the distributed query).
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/events.md b/docs/en/operations/system-tables/events.md
index 68217a6daaf..ba5602ee292 100644
--- a/docs/en/operations/system-tables/events.md
+++ b/docs/en/operations/system-tables/events.md
@@ -7,9 +7,9 @@ Contains information about the number of events that have occurred in the system
 
 Columns:
 
--   `event` ([String](../../sql-reference/data-types/string.md)) — Event name.
--   `value` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of events occurred.
--   `description` ([String](../../sql-reference/data-types/string.md)) — Event description.
+- `event` ([String](../../sql-reference/data-types/string.md)) — Event name.
+- `value` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of events occurred.
+- `description` ([String](../../sql-reference/data-types/string.md)) — Event description.
 
 **Example**
 
@@ -29,7 +29,7 @@ SELECT * FROM system.events LIMIT 5
 
 **See Also**
 
--   [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) — Contains periodically calculated metrics.
--   [system.metrics](../../operations/system-tables/metrics.md#system_tables-metrics) — Contains instantly calculated metrics.
--   [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
--   [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
+- [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) — Contains periodically calculated metrics.
+- [system.metrics](../../operations/system-tables/metrics.md#system_tables-metrics) — Contains instantly calculated metrics.
+- [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
+- [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
diff --git a/docs/en/operations/system-tables/functions.md b/docs/en/operations/system-tables/functions.md
index cb4d8e938eb..60bfa08975b 100644
--- a/docs/en/operations/system-tables/functions.md
+++ b/docs/en/operations/system-tables/functions.md
@@ -7,8 +7,8 @@ Contains information about normal and aggregate functions.
 
 Columns:
 
--   `name`(`String`) – The name of the function.
--   `is_aggregate`(`UInt8`) — Whether the function is aggregate.
+- `name`(`String`) – The name of the function.
+- `is_aggregate`(`UInt8`) — Whether the function is aggregate.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/grants.md b/docs/en/operations/system-tables/grants.md
index 7f41f5f07dd..b12f656cb75 100644
--- a/docs/en/operations/system-tables/grants.md
+++ b/docs/en/operations/system-tables/grants.md
@@ -6,20 +6,20 @@ slug: /en/operations/system-tables/grants
 Privileges granted to ClickHouse user accounts.
 
 Columns:
--    `user_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — User name.
+- `user_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — User name.
 
--    `role_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Role assigned to user account.
+- `role_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Role assigned to user account.
 
--    `access_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Access parameters for ClickHouse user account.
+- `access_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Access parameters for ClickHouse user account.
 
--    `database` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Name of a database.
+- `database` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Name of a database.
 
--    `table` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Name of a table.
+- `table` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Name of a table.
 
--    `column` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Name of a column to which access is granted.
+- `column` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Name of a column to which access is granted.
 
--    `is_partial_revoke` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Logical value. It shows whether some privileges have been revoked. Possible values:
+- `is_partial_revoke` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Logical value. It shows whether some privileges have been revoked. Possible values:
 - `0` — The row describes a partial revoke.
 - `1` — The row describes a grant.
 
--    `grant_option` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Permission is granted `WITH GRANT OPTION`, see [GRANT](../../sql-reference/statements/grant.md#grant-privigele-syntax).
+- `grant_option` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Permission is granted `WITH GRANT OPTION`, see [GRANT](../../sql-reference/statements/grant.md#grant-privigele-syntax).
diff --git a/docs/en/operations/system-tables/graphite_retentions.md b/docs/en/operations/system-tables/graphite_retentions.md
index 230fa4cede9..19a751b6ef2 100644
--- a/docs/en/operations/system-tables/graphite_retentions.md
+++ b/docs/en/operations/system-tables/graphite_retentions.md
@@ -7,12 +7,12 @@ Contains information about parameters [graphite_rollup](../../operations/server-
 
 Columns:
 
--   `config_name` (String) - `graphite_rollup` parameter name.
--   `regexp` (String) - A pattern for the metric name.
--   `function` (String) - The name of the aggregating function.
--   `age` (UInt64) - The minimum age of the data in seconds.
--   `precision` (UInt64) - How precisely to define the age of the data in seconds.
--   `priority` (UInt16) - Pattern priority.
--   `is_default` (UInt8) - Whether the pattern is the default.
--   `Tables.database` (Array(String)) - Array of names of database tables that use the `config_name` parameter.
--   `Tables.table` (Array(String)) - Array of table names that use the `config_name` parameter.
+- `config_name` (String) - `graphite_rollup` parameter name.
+- `regexp` (String) - A pattern for the metric name.
+- `function` (String) - The name of the aggregating function.
+- `age` (UInt64) - The minimum age of the data in seconds.
+- `precision` (UInt64) - How precisely to define the age of the data in seconds.
+- `priority` (UInt16) - Pattern priority.
+- `is_default` (UInt8) - Whether the pattern is the default.
+- `Tables.database` (Array(String)) - Array of names of database tables that use the `config_name` parameter.
+- `Tables.table` (Array(String)) - Array of table names that use the `config_name` parameter.
diff --git a/docs/en/operations/system-tables/index.md b/docs/en/operations/system-tables/index.md
index 284ba866cc8..508419783ef 100644
--- a/docs/en/operations/system-tables/index.md
+++ b/docs/en/operations/system-tables/index.md
@@ -11,14 +11,14 @@ pagination_next: 'en/operations/system-tables/asynchronous_metric_log'
 
 System tables provide information about:
 
--   Server states, processes, and environment.
--   Server’s internal processes.
+- Server states, processes, and environment.
+- Server’s internal processes.
 
 System tables:
 
--   Located in the `system` database.
--   Available only for reading data.
--   Can’t be dropped or altered, but can be detached.
+- Located in the `system` database.
+- Available only for reading data.
+- Can’t be dropped or altered, but can be detached.
 
 Most of system tables store their data in RAM. A ClickHouse server creates such system tables at the start.
 
@@ -26,12 +26,12 @@ Unlike other system tables, the system log tables [metric_log](../../operations/
 
 System log tables can be customized by creating a config file with the same name as the table under `/etc/clickhouse-server/config.d/`, or setting corresponding elements in `/etc/clickhouse-server/config.xml`. Elements can be customized are:
 
--   `database`: database the system log table belongs to. This option is deprecated now. All system log tables are under database `system`.
--   `table`: table to insert data.
--   `partition_by`: specify [PARTITION BY](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) expression.
--   `ttl`: specify table [TTL](../../sql-reference/statements/alter/ttl.md) expression.
--   `flush_interval_milliseconds`: interval of flushing data to disk.
--   `engine`: provide full engine expression (starting with `ENGINE =` ) with parameters. This option is contradict with `partition_by` and `ttl`. If set together, the server would raise an exception and exit.
+- `database`: database the system log table belongs to. This option is deprecated now. All system log tables are under database `system`.
+- `table`: table to insert data.
+- `partition_by`: specify [PARTITION BY](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) expression.
+- `ttl`: specify table [TTL](../../sql-reference/statements/alter/ttl.md) expression.
+- `flush_interval_milliseconds`: interval of flushing data to disk.
+- `engine`: provide full engine expression (starting with `ENGINE =` ) with parameters. This option is contradict with `partition_by` and `ttl`. If set together, the server would raise an exception and exit.
 
 An example:
 
@@ -56,8 +56,8 @@ By default, table growth is unlimited. To control a size of a table, you can use
 
 For collecting system metrics ClickHouse server uses:
 
--   `CAP_NET_ADMIN` capability.
--   [procfs](https://en.wikipedia.org/wiki/Procfs) (only in Linux).
+- `CAP_NET_ADMIN` capability.
+- [procfs](https://en.wikipedia.org/wiki/Procfs) (only in Linux).
 
 **procfs**
 
@@ -65,13 +65,13 @@ If ClickHouse server does not have `CAP_NET_ADMIN` capability, it tries to fall
 
 If procfs is supported and enabled on the system, ClickHouse server collects these metrics:
 
--   `OSCPUVirtualTimeMicroseconds`
--   `OSCPUWaitMicroseconds`
--   `OSIOWaitMicroseconds`
--   `OSReadChars`
--   `OSWriteChars`
--   `OSReadBytes`
--   `OSWriteBytes`
+- `OSCPUVirtualTimeMicroseconds`
+- `OSCPUWaitMicroseconds`
+- `OSIOWaitMicroseconds`
+- `OSReadChars`
+- `OSWriteChars`
+- `OSReadBytes`
+- `OSWriteBytes`
 
 ## Related content
 
diff --git a/docs/en/operations/system-tables/information_schema.md b/docs/en/operations/system-tables/information_schema.md
index a8e516f02a3..07e9a9e2f58 100644
--- a/docs/en/operations/system-tables/information_schema.md
+++ b/docs/en/operations/system-tables/information_schema.md
@@ -22,10 +22,10 @@ SHOW TABLES FROM INFORMATION_SCHEMA;
 
 `INFORMATION_SCHEMA` contains the following views:
 
--   [COLUMNS](#columns)
--   [SCHEMATA](#schemata)
--   [TABLES](#tables)
--   [VIEWS](#views)
+- [COLUMNS](#columns)
+- [SCHEMATA](#schemata)
+- [TABLES](#tables)
+- [VIEWS](#views)
 
 ## COLUMNS {#columns}
 
@@ -33,29 +33,29 @@ Contains columns read from the [system.columns](../../operations/system-tables/c
 
 Columns:
 
--   `table_catalog` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
--   `table_schema` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
--   `table_name` ([String](../../sql-reference/data-types/string.md)) — Table name.
--   `column_name` ([String](../../sql-reference/data-types/string.md)) — Column name.
--   `ordinal_position` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Ordinal position of a column in a table starting with 1.
--   `column_default` ([String](../../sql-reference/data-types/string.md)) — Expression for the default value, or an empty string if it is not defined.
--   `is_nullable` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the column type is `Nullable`.
--   `data_type` ([String](../../sql-reference/data-types/string.md)) — Column type.
--   `character_maximum_length` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum length in bytes for binary data, character data, or text data and images. In ClickHouse makes sense only for `FixedString` data type. Otherwise, the `NULL` value is returned.
--   `character_octet_length` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum length in bytes for binary data, character data, or text data and images. In ClickHouse makes sense only for `FixedString` data type. Otherwise, the `NULL` value is returned.
--   `numeric_precision` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Accuracy of approximate numeric data, exact numeric data, integer data, or monetary data. In ClickHouse it is bitness for integer types and decimal precision for `Decimal` types. Otherwise, the `NULL` value is returned.
--   `numeric_precision_radix` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The base of the number system is the accuracy of approximate numeric data, exact numeric data, integer data or monetary data. In ClickHouse it's 2 for integer types and 10 for `Decimal` types. Otherwise, the `NULL` value is returned.
--   `numeric_scale` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The scale of approximate numeric data, exact numeric data, integer data, or monetary data. In ClickHouse makes sense only for `Decimal` types. Otherwise, the `NULL` value is returned.
--   `datetime_precision` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Decimal precision of `DateTime64` data type. For other data types, the `NULL` value is returned.
--   `character_set_catalog` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `character_set_schema` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `character_set_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `collation_catalog` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `collation_schema` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `collation_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `domain_catalog` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `domain_schema` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `domain_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `table_catalog` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
+- `table_schema` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
+- `table_name` ([String](../../sql-reference/data-types/string.md)) — Table name.
+- `column_name` ([String](../../sql-reference/data-types/string.md)) — Column name.
+- `ordinal_position` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Ordinal position of a column in a table starting with 1.
+- `column_default` ([String](../../sql-reference/data-types/string.md)) — Expression for the default value, or an empty string if it is not defined.
+- `is_nullable` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the column type is `Nullable`.
+- `data_type` ([String](../../sql-reference/data-types/string.md)) — Column type.
+- `character_maximum_length` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum length in bytes for binary data, character data, or text data and images. In ClickHouse makes sense only for `FixedString` data type. Otherwise, the `NULL` value is returned.
+- `character_octet_length` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum length in bytes for binary data, character data, or text data and images. In ClickHouse makes sense only for `FixedString` data type. Otherwise, the `NULL` value is returned.
+- `numeric_precision` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Accuracy of approximate numeric data, exact numeric data, integer data, or monetary data. In ClickHouse it is bitness for integer types and decimal precision for `Decimal` types. Otherwise, the `NULL` value is returned.
+- `numeric_precision_radix` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The base of the number system is the accuracy of approximate numeric data, exact numeric data, integer data or monetary data. In ClickHouse it's 2 for integer types and 10 for `Decimal` types. Otherwise, the `NULL` value is returned.
+- `numeric_scale` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The scale of approximate numeric data, exact numeric data, integer data, or monetary data. In ClickHouse makes sense only for `Decimal` types. Otherwise, the `NULL` value is returned.
+- `datetime_precision` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Decimal precision of `DateTime64` data type. For other data types, the `NULL` value is returned.
+- `character_set_catalog` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `character_set_schema` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `character_set_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `collation_catalog` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `collation_schema` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `collation_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `domain_catalog` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `domain_schema` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `domain_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
 
 **Example**
 
@@ -101,13 +101,13 @@ Contains columns read from the [system.databases](../../operations/system-tables
 
 Columns:
 
--   `catalog_name` ([String](../../sql-reference/data-types/string.md)) — The name of the database.
--   `schema_name` ([String](../../sql-reference/data-types/string.md)) — The name of the database.
--   `schema_owner` ([String](../../sql-reference/data-types/string.md)) — Schema owner name, always `'default'`.
--   `default_character_set_catalog` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `default_character_set_schema` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `default_character_set_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
--   `sql_path` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `catalog_name` ([String](../../sql-reference/data-types/string.md)) — The name of the database.
+- `schema_name` ([String](../../sql-reference/data-types/string.md)) — The name of the database.
+- `schema_owner` ([String](../../sql-reference/data-types/string.md)) — Schema owner name, always `'default'`.
+- `default_character_set_catalog` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `default_character_set_schema` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `default_character_set_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `sql_path` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
 
 **Example**
 
@@ -137,15 +137,15 @@ Contains columns read from the [system.tables](../../operations/system-tables/ta
 
 Columns:
 
--   `table_catalog` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
--   `table_schema` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
--   `table_name` ([String](../../sql-reference/data-types/string.md)) — Table name.
--   `table_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Table type. Possible values:
-    -   `BASE TABLE`
-    -   `VIEW`
-    -   `FOREIGN TABLE`
-    -   `LOCAL TEMPORARY`
-    -   `SYSTEM VIEW`
+- `table_catalog` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
+- `table_schema` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
+- `table_name` ([String](../../sql-reference/data-types/string.md)) — Table name.
+- `table_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Table type. Possible values:
+    - `BASE TABLE`
+    - `VIEW`
+    - `FOREIGN TABLE`
+    - `LOCAL TEMPORARY`
+    - `SYSTEM VIEW`
 
 **Example**
 
@@ -172,18 +172,18 @@ Contains columns read from the [system.tables](../../operations/system-tables/ta
 
 Columns:
 
--   `table_catalog` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
--   `table_schema` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
--   `table_name` ([String](../../sql-reference/data-types/string.md)) — Table name.
--   `view_definition` ([String](../../sql-reference/data-types/string.md)) — `SELECT` query for view.
--   `check_option` ([String](../../sql-reference/data-types/string.md)) — `NONE`, no checking.
--   `is_updatable` ([Enum8](../../sql-reference/data-types/enum.md)) — `NO`, the view is not updated.
--   `is_insertable_into` ([Enum8](../../sql-reference/data-types/enum.md)) — Shows whether the created view is [materialized](../../sql-reference/statements/create/view.md/#materialized-view). Possible values:
-    -   `NO` — The created view is not materialized.
-    -   `YES` — The created view is materialized.
--   `is_trigger_updatable` ([Enum8](../../sql-reference/data-types/enum.md)) — `NO`, the trigger is not updated.
--   `is_trigger_deletable` ([Enum8](../../sql-reference/data-types/enum.md)) — `NO`, the trigger is not deleted.
--   `is_trigger_insertable_into` ([Enum8](../../sql-reference/data-types/enum.md)) — `NO`, no data is inserted into the trigger.
+- `table_catalog` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
+- `table_schema` ([String](../../sql-reference/data-types/string.md)) — The name of the database in which the table is located.
+- `table_name` ([String](../../sql-reference/data-types/string.md)) — Table name.
+- `view_definition` ([String](../../sql-reference/data-types/string.md)) — `SELECT` query for view.
+- `check_option` ([String](../../sql-reference/data-types/string.md)) — `NONE`, no checking.
+- `is_updatable` ([Enum8](../../sql-reference/data-types/enum.md)) — `NO`, the view is not updated.
+- `is_insertable_into` ([Enum8](../../sql-reference/data-types/enum.md)) — Shows whether the created view is [materialized](../../sql-reference/statements/create/view.md/#materialized-view). Possible values:
+    - `NO` — The created view is not materialized.
+    - `YES` — The created view is materialized.
+- `is_trigger_updatable` ([Enum8](../../sql-reference/data-types/enum.md)) — `NO`, the trigger is not updated.
+- `is_trigger_deletable` ([Enum8](../../sql-reference/data-types/enum.md)) — `NO`, the trigger is not deleted.
+- `is_trigger_insertable_into` ([Enum8](../../sql-reference/data-types/enum.md)) — `NO`, no data is inserted into the trigger.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/merge_tree_settings.md b/docs/en/operations/system-tables/merge_tree_settings.md
index 672c79e335b..d8539908bf7 100644
--- a/docs/en/operations/system-tables/merge_tree_settings.md
+++ b/docs/en/operations/system-tables/merge_tree_settings.md
@@ -7,11 +7,11 @@ Contains information about settings for `MergeTree` tables.
 
 Columns:
 
--   `name` (String) — Setting name.
--   `value` (String) — Setting value.
--   `description` (String) — Setting description.
--   `type` (String) — Setting type (implementation specific string value).
--   `changed` (UInt8) — Whether the setting was explicitly defined in the config or explicitly changed.
+- `name` (String) — Setting name.
+- `value` (String) — Setting value.
+- `description` (String) — Setting description.
+- `type` (String) — Setting type (implementation specific string value).
+- `changed` (UInt8) — Whether the setting was explicitly defined in the config or explicitly changed.
 
 **Example**
 ```sql
diff --git a/docs/en/operations/system-tables/merges.md b/docs/en/operations/system-tables/merges.md
index a5055639393..ec1d4c8e656 100644
--- a/docs/en/operations/system-tables/merges.md
+++ b/docs/en/operations/system-tables/merges.md
@@ -7,20 +7,20 @@ Contains information about merges and part mutations currently in process for ta
 
 Columns:
 
--   `database` (String) — The name of the database the table is in.
--   `table` (String) — Table name.
--   `elapsed` (Float64) — The time elapsed (in seconds) since the merge started.
--   `progress` (Float64) — The percentage of completed work from 0 to 1.
--   `num_parts` (UInt64) — The number of pieces to be merged.
--   `result_part_name` (String) — The name of the part that will be formed as the result of merging.
--   `is_mutation` (UInt8) — 1 if this process is a part mutation.
--   `total_size_bytes_compressed` (UInt64) — The total size of the compressed data in the merged chunks.
--   `total_size_marks` (UInt64) — The total number of marks in the merged parts.
--   `bytes_read_uncompressed` (UInt64) — Number of bytes read, uncompressed.
--   `rows_read` (UInt64) — Number of rows read.
--   `bytes_written_uncompressed` (UInt64) — Number of bytes written, uncompressed.
--   `rows_written` (UInt64) — Number of rows written.
--   `memory_usage` (UInt64) — Memory consumption of the merge process.
--   `thread_id` (UInt64) — Thread ID of the merge process.
--   `merge_type` — The type of current merge. Empty if it's an mutation.
--   `merge_algorithm` — The algorithm used in current merge. Empty if it's an mutation.
+- `database` (String) — The name of the database the table is in.
+- `table` (String) — Table name.
+- `elapsed` (Float64) — The time elapsed (in seconds) since the merge started.
+- `progress` (Float64) — The percentage of completed work from 0 to 1.
+- `num_parts` (UInt64) — The number of pieces to be merged.
+- `result_part_name` (String) — The name of the part that will be formed as the result of merging.
+- `is_mutation` (UInt8) — 1 if this process is a part mutation.
+- `total_size_bytes_compressed` (UInt64) — The total size of the compressed data in the merged chunks.
+- `total_size_marks` (UInt64) — The total number of marks in the merged parts.
+- `bytes_read_uncompressed` (UInt64) — Number of bytes read, uncompressed.
+- `rows_read` (UInt64) — Number of rows read.
+- `bytes_written_uncompressed` (UInt64) — Number of bytes written, uncompressed.
+- `rows_written` (UInt64) — Number of rows written.
+- `memory_usage` (UInt64) — Memory consumption of the merge process.
+- `thread_id` (UInt64) — Thread ID of the merge process.
+- `merge_type` — The type of current merge. Empty if it's an mutation.
+- `merge_algorithm` — The algorithm used in current merge. Empty if it's an mutation.
diff --git a/docs/en/operations/system-tables/metric_log.md b/docs/en/operations/system-tables/metric_log.md
index b22e672a31b..9ea0dde3f80 100644
--- a/docs/en/operations/system-tables/metric_log.md
+++ b/docs/en/operations/system-tables/metric_log.md
@@ -6,9 +6,9 @@ slug: /en/operations/system-tables/metric_log
 Contains history of metrics values from tables `system.metrics` and `system.events`, periodically flushed to disk.
 
 Columns:
--   `event_date` ([Date](../../sql-reference/data-types/date.md)) — Event date.
--   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Event time.
--   `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Event time with microseconds resolution.
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — Event date.
+- `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Event time.
+- `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Event time with microseconds resolution.
 
 **Example**
 
@@ -45,8 +45,8 @@ CurrentMetric_DistributedFilesToInsert:                          0
 
 **See also**
 
--   [metric_log setting](../../operations/server-configuration-parameters/settings.md#metric_log) — Enabling and disabling the setting.
--   [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md) — Contains periodically calculated metrics.
--   [system.events](../../operations/system-tables/events.md#system_tables-events) — Contains a number of events that occurred.
--   [system.metrics](../../operations/system-tables/metrics.md) — Contains instantly calculated metrics.
--   [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
+- [metric_log setting](../../operations/server-configuration-parameters/settings.md#metric_log) — Enabling and disabling the setting.
+- [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md) — Contains periodically calculated metrics.
+- [system.events](../../operations/system-tables/events.md#system_tables-events) — Contains a number of events that occurred.
+- [system.metrics](../../operations/system-tables/metrics.md) — Contains instantly calculated metrics.
+- [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
diff --git a/docs/en/operations/system-tables/metrics.md b/docs/en/operations/system-tables/metrics.md
index 141fc3c82c2..5a7dfd03eb4 100644
--- a/docs/en/operations/system-tables/metrics.md
+++ b/docs/en/operations/system-tables/metrics.md
@@ -7,9 +7,9 @@ Contains metrics which can be calculated instantly, or have a current value. For
 
 Columns:
 
--   `metric` ([String](../../sql-reference/data-types/string.md)) — Metric name.
--   `value` ([Int64](../../sql-reference/data-types/int-uint.md)) — Metric value.
--   `description` ([String](../../sql-reference/data-types/string.md)) — Metric description.
+- `metric` ([String](../../sql-reference/data-types/string.md)) — Metric name.
+- `value` ([Int64](../../sql-reference/data-types/int-uint.md)) — Metric value.
+- `description` ([String](../../sql-reference/data-types/string.md)) — Metric description.
 
 The list of supported metrics you can find in the [src/Common/CurrentMetrics.cpp](https://github.com/ClickHouse/ClickHouse/blob/master/src/Common/CurrentMetrics.cpp) source file of ClickHouse.
 
@@ -34,9 +34,723 @@ SELECT * FROM system.metrics LIMIT 10
 └──────────────────────────────────────┴───────┴────────────────────────────────────────────────────────────────────────┘
 ```
 
+## Metric descriptions
+
+### AggregatorThreads
+
+Number of threads in the Aggregator thread pool.
+
+### AggregatorThreadsActive
+
+Number of threads in the Aggregator thread pool running a task.
+
+### AsyncInsertCacheSize
+
+Number of async insert hash id in cache
+
+### AsynchronousInsertThreads
+
+Number of threads in the AsynchronousInsert thread pool.
+
+### AsynchronousInsertThreadsActive
+
+Number of threads in the AsynchronousInsert thread pool running a task.
+
+### AsynchronousReadWait
+
+Number of threads waiting for asynchronous read.
+
+### BackgroundBufferFlushSchedulePoolSize
+
+Limit on number of tasks in BackgroundBufferFlushSchedulePool
+
+### BackgroundBufferFlushSchedulePoolTask
+
+Number of active tasks in BackgroundBufferFlushSchedulePool. This pool is used for periodic Buffer flushes
+
+### BackgroundCommonPoolSize
+
+Limit on number of tasks in an associated background pool
+
+### BackgroundCommonPoolTask
+
+Number of active tasks in an associated background pool
+
+### BackgroundDistributedSchedulePoolSize
+
+Limit on number of tasks in BackgroundDistributedSchedulePool
+
+### BackgroundDistributedSchedulePoolTask
+
+Number of active tasks in BackgroundDistributedSchedulePool. This pool is used for distributed sends that is done in background.
+
+### BackgroundFetchesPoolSize
+
+Limit on number of simultaneous fetches in an associated background pool
+
+### BackgroundFetchesPoolTask
+
+Number of active fetches in an associated background pool
+
+### BackgroundMergesAndMutationsPoolSize
+
+Limit on number of active merges and mutations in an associated background pool
+
+### BackgroundMergesAndMutationsPoolTask
+
+Number of active merges and mutations in an associated background pool
+
+### BackgroundMessageBrokerSchedulePoolSize
+
+Limit on number of tasks in BackgroundProcessingPool for message streaming
+
+### BackgroundMessageBrokerSchedulePoolTask
+
+Number of active tasks in BackgroundProcessingPool for message streaming
+
+### BackgroundMovePoolSize
+
+Limit on number of tasks in BackgroundProcessingPool for moves
+
+### BackgroundMovePoolTask
+
+Number of active tasks in BackgroundProcessingPool for moves
+
+### BackgroundSchedulePoolSize
+
+Limit on number of tasks in BackgroundSchedulePool. This pool is used for periodic ReplicatedMergeTree tasks, like cleaning old data parts, altering data parts, replica re-initialization, etc.
+
+### BackgroundSchedulePoolTask
+
+Number of active tasks in BackgroundSchedulePool. This pool is used for periodic ReplicatedMergeTree tasks, like cleaning old data parts, altering data parts, replica re-initialization, etc.
+
+### BackupsIOThreads
+
+Number of threads in the BackupsIO thread pool.
+
+### BackupsIOThreadsActive
+
+Number of threads in the BackupsIO thread pool running a task.
+
+### BackupsThreads
+
+Number of threads in the thread pool for BACKUP.
+
+### BackupsThreadsActive
+
+Number of threads in thread pool for BACKUP running a task.
+
+### BrokenDistributedFilesToInsert
+
+Number of files for asynchronous insertion into Distributed tables that has been marked as broken. This metric will starts from 0 on start. Number of files for every shard is summed.
+
+### CacheDetachedFileSegments
+
+Number of existing detached cache file segments
+
+### CacheDictionaryThreads
+
+Number of threads in the CacheDictionary thread pool.
+
+### CacheDictionaryThreadsActive
+
+Number of threads in the CacheDictionary thread pool running a task.
+
+### CacheDictionaryUpdateQueueBatches
+
+Number of 'batches' (a set of keys) in update queue in CacheDictionaries.
+
+### CacheDictionaryUpdateQueueKeys
+
+Exact number of keys in update queue in CacheDictionaries.
+
+### CacheFileSegments
+
+Number of existing cache file segments
+
+### ContextLockWait
+
+Number of threads waiting for lock in Context. This is global lock.
+
+### DDLWorkerThreads
+
+Number of threads in the DDLWorker thread pool for ON CLUSTER queries.
+
+### DDLWorkerThreadsActive
+
+Number of threads in the DDLWORKER thread pool for ON CLUSTER queries running a task.
+
+### DatabaseCatalogThreads
+
+Number of threads in the DatabaseCatalog thread pool.
+
+### DatabaseCatalogThreadsActive
+
+Number of threads in the DatabaseCatalog thread pool running a task.
+
+### DatabaseOnDiskThreads
+
+Number of threads in the DatabaseOnDisk thread pool.
+
+### DatabaseOnDiskThreadsActive
+
+Number of threads in the DatabaseOnDisk thread pool running a task.
+
+### DatabaseOrdinaryThreads
+
+Number of threads in the Ordinary database thread pool.
+
+### DatabaseOrdinaryThreadsActive
+
+Number of threads in the Ordinary database thread pool running a task.
+
+### DelayedInserts
+
+Number of INSERT queries that are throttled due to high number of active data parts for partition in a MergeTree table.
+
+### DestroyAggregatesThreads
+
+Number of threads in the thread pool for destroy aggregate states.
+
+### DestroyAggregatesThreadsActive
+
+Number of threads in the thread pool for destroy aggregate states running a task.
+
+### DictCacheRequests
+
+Number of requests in fly to data sources of dictionaries of cache type.
+
+### DiskObjectStorageAsyncThreads
+
+Number of threads in the async thread pool for DiskObjectStorage.
+
+### DiskObjectStorageAsyncThreadsActive
+
+Number of threads in the async thread pool for DiskObjectStorage running a task.
+
+### DiskSpaceReservedForMerge
+
+Disk space reserved for currently running background merges. It is slightly more than the total size of currently merging parts.
+
+### DistributedFilesToInsert
+
+Number of pending files to process for asynchronous insertion into Distributed tables. Number of files for every shard is summed.
+
+### DistributedSend
+
+Number of connections to remote servers sending data that was INSERTed into Distributed tables. Both synchronous and asynchronous mode.
+
+### EphemeralNode
+
+Number of ephemeral nodes hold in ZooKeeper.
+
+### FilesystemCacheElements
+
+Filesystem cache elements (file segments)
+
+### FilesystemCacheReadBuffers
+
+Number of active cache buffers
+
+### FilesystemCacheSize
+
+Filesystem cache size in bytes
+
+### GlobalThread
+
+Number of threads in global thread pool.
+
+### GlobalThreadActive
+
+Number of threads in global thread pool running a task.
+
+### HTTPConnection
+
+Number of connections to HTTP server
+
+### HashedDictionaryThreads
+
+Number of threads in the HashedDictionary thread pool.
+
+### HashedDictionaryThreadsActive
+
+Number of threads in the HashedDictionary thread pool running a task.
+
+### IOPrefetchThreads
+
+Number of threads in the IO prefertch thread pool.
+
+### IOPrefetchThreadsActive
+
+Number of threads in the IO prefetch thread pool running a task.
+
+### IOThreads
+
+Number of threads in the IO thread pool.
+
+### IOThreadsActive
+
+Number of threads in the IO thread pool running a task.
+
+### IOUringInFlightEvents
+
+Number of io_uring SQEs in flight
+
+### IOUringPendingEvents
+
+Number of io_uring SQEs waiting to be submitted
+
+### IOWriterThreads
+
+Number of threads in the IO writer thread pool.
+
+### IOWriterThreadsActive
+
+Number of threads in the IO writer thread pool running a task.
+
+### InterserverConnection
+
+Number of connections from other replicas to fetch parts
+
+### KafkaAssignedPartitions
+
+Number of partitions Kafka tables currently assigned to
+
+### KafkaBackgroundReads
+
+Number of background reads currently working (populating materialized views from Kafka)
+
+### KafkaConsumers
+
+Number of active Kafka consumers
+
+### KafkaConsumersInUse
+
+Number of consumers which are currently used by direct or background reads
+
+### KafkaConsumersWithAssignment
+
+Number of active Kafka consumers which have some partitions assigned.
+
+### KafkaLibrdkafkaThreads
+
+Number of active librdkafka threads
+
+### KafkaProducers
+
+Number of active Kafka producer created
+
+### KafkaWrites
+
+Number of currently running inserts to Kafka
+
+### KeeperAliveConnections
+
+Number of alive connections
+
+### KeeperOutstandingRequets
+
+Number of outstanding requests
+
+### LocalThread
+
+Number of threads in local thread pools. The threads in local thread pools are taken from the global thread pool.
+
+### LocalThreadActive
+
+Number of threads in local thread pools running a task.
+
+### MMappedAllocBytes
+
+Sum bytes of mmapped allocations
+
+### MMappedAllocs
+
+Total number of mmapped allocations
+
+### MMappedFileBytes
+
+Sum size of mmapped file regions.
+
+### MMappedFiles
+
+Total number of mmapped files.
+
+### MarksLoaderThreads
+
+Number of threads in thread pool for loading marks.
+
+### MarksLoaderThreadsActive
+
+Number of threads in the thread pool for loading marks running a task.
+
+### MaxDDLEntryID
+
+Max processed DDL entry of DDLWorker.
+
+### MaxPushedDDLEntryID
+
+Max DDL entry of DDLWorker that pushed to zookeeper.
+
+### MemoryTracking
+
+Total amount of memory (bytes) allocated by the server.
+
+### Merge
+
+Number of executing background merges
+
+### MergeTreeAllRangesAnnouncementsSent
+
+The current number of announcement being sent in flight from the remote server to the initiator server about the set of data parts (for MergeTree tables). Measured on the remote server side.
+
+### MergeTreeBackgroundExecutorThreads
+
+Number of threads in the MergeTreeBackgroundExecutor thread pool.
+
+### MergeTreeBackgroundExecutorThreadsActive
+
+Number of threads in the MergeTreeBackgroundExecutor thread pool running a task.
+
+### MergeTreeDataSelectExecutorThreads
+
+Number of threads in the MergeTreeDataSelectExecutor thread pool.
+
+### MergeTreeDataSelectExecutorThreadsActive
+
+Number of threads in the MergeTreeDataSelectExecutor thread pool running a task.
+
+### MergeTreePartsCleanerThreads
+
+Number of threads in the MergeTree parts cleaner thread pool.
+
+### MergeTreePartsCleanerThreadsActive
+
+Number of threads in the MergeTree parts cleaner thread pool running a task.
+
+### MergeTreePartsLoaderThreads
+
+Number of threads in the MergeTree parts loader thread pool.
+
+### MergeTreePartsLoaderThreadsActive
+
+Number of threads in the MergeTree parts loader thread pool running a task.
+
+### MergeTreeReadTaskRequestsSent
+
+The current number of callback requests in flight from the remote server back to the initiator server to choose the read task (for MergeTree tables). Measured on the remote server side.
+
+### Move
+
+Number of currently executing moves
+
+### MySQLConnection
+
+Number of client connections using MySQL protocol
+
+### NetworkReceive
+
+Number of threads receiving data from network. Only ClickHouse-related network interaction is included, not by 3rd party libraries.
+
+### NetworkSend
+
+Number of threads sending data to network. Only ClickHouse-related network interaction is included, not by 3rd party libraries.
+
+### OpenFileForRead
+
+Number of files open for reading
+
+### OpenFileForWrite
+
+Number of files open for writing
+
+### ParallelFormattingOutputFormatThreads
+
+Number of threads in the ParallelFormattingOutputFormatThreads thread pool.
+
+### ParallelFormattingOutputFormatThreadsActive
+
+Number of threads in the ParallelFormattingOutputFormatThreads thread pool running a task.
+
+### ParallelParsingInputFormatThreads
+
+Number of threads in the ParallelParsingInputFormat thread pool.
+
+### ParallelParsingInputFormatThreadsActive
+
+Number of threads in the ParallelParsingInputFormat thread pool running a task.
+
+### PartMutation
+
+Number of mutations (ALTER DELETE/UPDATE)
+
+### PartsActive
+
+Active data part, used by current and upcoming SELECTs.
+
+### PartsCommitted
+
+Deprecated. See PartsActive.
+
+### PartsCompact
+
+Compact parts.
+
+### PartsDeleteOnDestroy
+
+Part was moved to another disk and should be deleted in own destructor.
+
+### PartsDeleting
+
+Not active data part with identity refcounter, it is deleting right now by a cleaner.
+
+### PartsInMemory
+
+In-memory parts.
+
+### PartsOutdated
+
+Not active data part, but could be used by only current SELECTs, could be deleted after SELECTs finishes.
+
+### PartsPreActive
+
+The part is in data_parts, but not used for SELECTs.
+
+### PartsPreCommitted
+
+Deprecated. See PartsPreActive.
+
+### PartsTemporary
+
+The part is generating now, it is not in data_parts list.
+
+### PartsWide
+
+Wide parts.
+
+### PendingAsyncInsert
+
+Number of asynchronous inserts that are waiting for flush.
+
+### PostgreSQLConnection
+
+Number of client connections using PostgreSQL protocol
+
+### Query
+
+Number of executing queries
+
+### QueryPreempted
+
+Number of queries that are stopped and waiting due to 'priority' setting.
+
+### QueryThread
+
+Number of query processing threads
+
+### RWLockActiveReaders
+
+Number of threads holding read lock in a table RWLock.
+
+### RWLockActiveWriters
+
+Number of threads holding write lock in a table RWLock.
+
+### RWLockWaitingReaders
+
+Number of threads waiting for read on a table RWLock.
+
+### RWLockWaitingWriters
+
+Number of threads waiting for write on a table RWLock.
+
+### Read
+
+Number of read (read, pread, io_getevents, etc.) syscalls in fly
+
+### ReadTaskRequestsSent
+
+The current number of callback requests in flight from the remote server back to the initiator server to choose the read task (for s3Cluster table function and similar). Measured on the remote server side.
+
+### ReadonlyReplica
+
+Number of Replicated tables that are currently in readonly state due to re-initialization after ZooKeeper session loss or due to startup without ZooKeeper configured.
+
+### RemoteRead
+
+Number of read with remote reader in fly
+
+### ReplicatedChecks
+
+Number of data parts checking for consistency
+
+### ReplicatedFetch
+
+Number of data parts being fetched from replica
+
+### ReplicatedSend
+
+Number of data parts being sent to replicas
+
+### RestartReplicaThreads
+
+Number of threads in the RESTART REPLICA thread pool.
+
+### RestartReplicaThreadsActive
+
+Number of threads in the RESTART REPLICA thread pool running a task.
+
+### RestoreThreads
+
+Number of threads in the thread pool for RESTORE.
+
+### RestoreThreadsActive
+
+Number of threads in the thread pool for RESTORE running a task.
+
+### Revision
+
+Revision of the server. It is a number incremented for every release or release candidate except patch releases.
+
+### S3Requests
+
+S3 requests
+
+### SendExternalTables
+
+Number of connections that are sending data for external tables to remote servers. External tables are used to implement GLOBAL IN and GLOBAL JOIN operators with distributed subqueries.
+
+### SendScalars
+
+Number of connections that are sending data for scalars to remote servers.
+
+### StartupSystemTablesThreads
+
+Number of threads in the StartupSystemTables thread pool.
+
+### StartupSystemTablesThreadsActive
+
+Number of threads in the StartupSystemTables thread pool running a task.
+
+### StorageBufferBytes
+
+Number of bytes in buffers of Buffer tables
+
+### StorageBufferRows
+
+Number of rows in buffers of Buffer tables
+
+### StorageDistributedThreads
+
+Number of threads in the StorageDistributed thread pool.
+
+### StorageDistributedThreadsActive
+
+Number of threads in the StorageDistributed thread pool running a task.
+
+### StorageHiveThreads
+
+Number of threads in the StorageHive thread pool.
+
+### StorageHiveThreadsActive
+
+Number of threads in the StorageHive thread pool running a task.
+
+### StorageS3Threads
+
+Number of threads in the StorageS3 thread pool.
+
+### StorageS3ThreadsActive
+
+Number of threads in the StorageS3 thread pool running a task.
+
+### SystemReplicasThreads
+
+Number of threads in the system.replicas thread pool.
+
+### SystemReplicasThreadsActive
+
+Number of threads in the system.replicas thread pool running a task.
+
+### TCPConnection
+
+Number of connections to TCP server (clients with native interface), also included server-server distributed query connections
+
+### TablesLoaderThreads
+
+Number of threads in the tables loader thread pool.
+
+### TablesLoaderThreadsActive
+
+Number of threads in the tables loader thread pool running a task.
+
+### TablesToDropQueueSize
+
+Number of dropped tables, that are waiting for background data removal.
+
+### TemporaryFilesForAggregation
+
+Number of temporary files created for external aggregation
+
+### TemporaryFilesForJoin
+
+Number of temporary files created for JOIN
+
+### TemporaryFilesForSort
+
+Number of temporary files created for external sorting
+
+### TemporaryFilesUnknown
+
+Number of temporary files created without known purpose
+
+### ThreadPoolFSReaderThreads
+
+Number of threads in the thread pool for local_filesystem_read_method=threadpool.
+
+### ThreadPoolFSReaderThreadsActive
+
+Number of threads in the thread pool for local_filesystem_read_method=threadpool running a task.
+
+### ThreadPoolRemoteFSReaderThreads
+
+Number of threads in the thread pool for remote_filesystem_read_method=threadpool.
+
+### ThreadPoolRemoteFSReaderThreadsActive
+
+Number of threads in the thread pool for remote_filesystem_read_method=threadpool running a task.
+
+### ThreadsInOvercommitTracker
+
+Number of waiting threads inside of OvercommitTracker
+
+### TotalTemporaryFiles
+
+Number of temporary files created
+
+### VersionInteger
+
+Version of the server in a single integer number in base-1000. For example, version 11.22.33 is translated to 11022033.
+
+### Write
+
+Number of write (write, pwrite, io_getevents, etc.) syscalls in fly
+
+### ZooKeeperRequest
+
+Number of requests to ZooKeeper in fly.
+
+### ZooKeeperSession
+
+Number of sessions (connections) to ZooKeeper. Should be no more than one, because using more than one connection to ZooKeeper may lead to bugs due to lack of linearizability (stale reads) that ZooKeeper consistency model allows.
+
+### ZooKeeperWatch
+
+Number of watches (event subscriptions) in ZooKeeper.
+
 **See Also**
 
--   [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) — Contains periodically calculated metrics.
--   [system.events](../../operations/system-tables/events.md#system_tables-events) — Contains a number of events that occurred.
--   [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` and `system.events`.
--   [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
+- [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) — Contains periodically calculated metrics.
+- [system.events](../../operations/system-tables/events.md#system_tables-events) — Contains a number of events that occurred.
+- [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` and `system.events`.
+- [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
diff --git a/docs/en/operations/system-tables/moves.md b/docs/en/operations/system-tables/moves.md
index 54f07540507..cd543ce7536 100644
--- a/docs/en/operations/system-tables/moves.md
+++ b/docs/en/operations/system-tables/moves.md
@@ -7,21 +7,21 @@ The table contains information about in-progress [data part moves](/docs/en/sql-
 
 Columns:
 
--   `database` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the database.
+- `database` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the database.
 
--   `table` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the table containing moving data part.
+- `table` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the table containing moving data part.
 
--   `elapsed` ([Float64](../../sql-reference/data-types/float.md)) — Time elapsed (in seconds) since data part movement started.
+- `elapsed` ([Float64](../../sql-reference/data-types/float.md)) — Time elapsed (in seconds) since data part movement started.
 
--   `target_disk_name` ([String](disks.md)) — Name of [disk](/docs/en/operations/system-tables/disks/) to which the data part is moving.
+- `target_disk_name` ([String](disks.md)) — Name of [disk](/docs/en/operations/system-tables/disks/) to which the data part is moving.
 
--   `target_disk_path` ([String](disks.md)) — Path to the mount point of the [disk](/docs/en/operations/system-tables/disks/) in the file system.
+- `target_disk_path` ([String](disks.md)) — Path to the mount point of the [disk](/docs/en/operations/system-tables/disks/) in the file system.
 
--   `part_name` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the data part being moved.
+- `part_name` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the data part being moved.
 
--   `part_size` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Data part size.
+- `part_size` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Data part size.
 
--   `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Identifier of a thread performing the movement.
+- `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Identifier of a thread performing the movement.
 
 **Example**
 
@@ -37,6 +37,6 @@ SELECT * FROM system.moves
 
 **See Also**
 
--   [MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree.md) table engine
--   [Using Multiple Block Devices for Data Storage](/docs/en/engines/table-engines/mergetree-family/mergetree#table_engine-mergetree-multiple-volumes)
--   [ALTER TABLE ... MOVE PART](/docs/en/sql-reference/statements/alter/partition#move-partitionpart) command
+- [MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree.md) table engine
+- [Using Multiple Block Devices for Data Storage](/docs/en/engines/table-engines/mergetree-family/mergetree#table_engine-mergetree-multiple-volumes)
+- [ALTER TABLE ... MOVE PART](/docs/en/sql-reference/statements/alter/partition#move-partitionpart) command
diff --git a/docs/en/operations/system-tables/mutations.md b/docs/en/operations/system-tables/mutations.md
index d65bccb9aaa..64e86992af9 100644
--- a/docs/en/operations/system-tables/mutations.md
+++ b/docs/en/operations/system-tables/mutations.md
@@ -5,31 +5,31 @@ slug: /en/operations/system-tables/mutations
 
 The table contains information about [mutations](/docs/en/sql-reference/statements/alter/index.md#mutations) of [MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree.md) tables and their progress. Each mutation command is represented by a single row.
 
-Columns:
+## Columns:
 
--   `database` ([String](/docs/en/sql-reference/data-types/string.md)) — The name of the database to which the mutation was applied.
+- `database` ([String](/docs/en/sql-reference/data-types/string.md)) — The name of the database to which the mutation was applied.
 
--   `table` ([String](/docs/en/sql-reference/data-types/string.md)) — The name of the table to which the mutation was applied.
+- `table` ([String](/docs/en/sql-reference/data-types/string.md)) — The name of the table to which the mutation was applied.
 
--   `mutation_id` ([String](/docs/en/sql-reference/data-types/string.md)) — The ID of the mutation. For replicated tables these IDs correspond to znode names in the `<table_path_in_clickhouse_keeper>/mutations/` directory in ClickHouse Keeper. For non-replicated tables the IDs correspond to file names in the data directory of the table.
+- `mutation_id` ([String](/docs/en/sql-reference/data-types/string.md)) — The ID of the mutation. For replicated tables these IDs correspond to znode names in the `<table_path_in_clickhouse_keeper>/mutations/` directory in ClickHouse Keeper. For non-replicated tables the IDs correspond to file names in the data directory of the table.
 
--   `command` ([String](/docs/en/sql-reference/data-types/string.md)) — The mutation command string (the part of the query after `ALTER TABLE [db.]table`).
+- `command` ([String](/docs/en/sql-reference/data-types/string.md)) — The mutation command string (the part of the query after `ALTER TABLE [db.]table`).
 
--   `create_time` ([DateTime](/docs/en/sql-reference/data-types/datetime.md)) —  Date and time when the mutation command was submitted for execution.
+- `create_time` ([DateTime](/docs/en/sql-reference/data-types/datetime.md)) —  Date and time when the mutation command was submitted for execution.
 
--   `block_numbers.partition_id` ([Array](/docs/en/sql-reference/data-types/array.md)([String](/docs/en/sql-reference/data-types/string.md))) — For mutations of replicated tables, the array contains the partitions' IDs (one record for each partition). For mutations of non-replicated tables the array is empty.
+- `block_numbers.partition_id` ([Array](/docs/en/sql-reference/data-types/array.md)([String](/docs/en/sql-reference/data-types/string.md))) — For mutations of replicated tables, the array contains the partitions' IDs (one record for each partition). For mutations of non-replicated tables the array is empty.
 
--   `block_numbers.number` ([Array](/docs/en/sql-reference/data-types/array.md)([Int64](/docs/en/sql-reference/data-types/int-uint.md))) — For mutations of replicated tables, the array contains one record for each partition, with the block number that was acquired by the mutation. Only parts that contain blocks with numbers less than this number will be mutated in the partition.
+- `block_numbers.number` ([Array](/docs/en/sql-reference/data-types/array.md)([Int64](/docs/en/sql-reference/data-types/int-uint.md))) — For mutations of replicated tables, the array contains one record for each partition, with the block number that was acquired by the mutation. Only parts that contain blocks with numbers less than this number will be mutated in the partition.
 
     In non-replicated tables, block numbers in all partitions form a single sequence. This means that for mutations of non-replicated tables, the column will contain one record with a single block number acquired by the mutation.
 
--   `parts_to_do_names` ([Array](/docs/en/sql-reference/data-types/array.md)([String](/docs/en/sql-reference/data-types/string.md))) — An array of names of data parts that need to be mutated for the mutation to complete.
+- `parts_to_do_names` ([Array](/docs/en/sql-reference/data-types/array.md)([String](/docs/en/sql-reference/data-types/string.md))) — An array of names of data parts that need to be mutated for the mutation to complete.
 
--   `parts_to_do` ([Int64](/docs/en/sql-reference/data-types/int-uint.md)) — The number of data parts that need to be mutated for the mutation to complete.
+- `parts_to_do` ([Int64](/docs/en/sql-reference/data-types/int-uint.md)) — The number of data parts that need to be mutated for the mutation to complete.
 
--   `is_done` ([UInt8](/docs/en/sql-reference/data-types/int-uint.md)) — The flag whether the mutation is done or not. Possible values:
-    -   `1` if the mutation is completed,
-    -   `0` if the mutation is still in process.
+- `is_done` ([UInt8](/docs/en/sql-reference/data-types/int-uint.md)) — The flag whether the mutation is done or not. Possible values:
+    - `1` if the mutation is completed,
+    - `0` if the mutation is still in process.
 
 :::note
 Even if `parts_to_do = 0` it is possible that a mutation of a replicated table is not completed yet because of a long-running `INSERT` query, that will create a new data part needed to be mutated.
@@ -37,14 +37,27 @@ Even if `parts_to_do = 0` it is possible that a mutation of a replicated table i
 
 If there were problems with mutating some data parts, the following columns contain additional information:
 
--   `latest_failed_part` ([String](/docs/en/sql-reference/data-types/string.md)) — The name of the most recent part that could not be mutated.
+- `latest_failed_part` ([String](/docs/en/sql-reference/data-types/string.md)) — The name of the most recent part that could not be mutated.
 
--   `latest_fail_time` ([DateTime](/docs/en/sql-reference/data-types/datetime.md)) — The date and time of the most recent part mutation failure.
+- `latest_fail_time` ([DateTime](/docs/en/sql-reference/data-types/datetime.md)) — The date and time of the most recent part mutation failure.
 
--   `latest_fail_reason` ([String](/docs/en/sql-reference/data-types/string.md)) — The exception message that caused the most recent part mutation failure.
+- `latest_fail_reason` ([String](/docs/en/sql-reference/data-types/string.md)) — The exception message that caused the most recent part mutation failure.
+
+## Monitoring Mutations
+
+To track the progress on the system.mutations table, use a query like the following - this requires read permissions on the system.* tables:
+
+``` sql
+SELECT * FROM clusterAllReplicas('cluster_name', 'db', system.mutations)
+WHERE is_done=0 AND table='tmp';
+```
+
+:::tip
+replace `tmp` in `table='tmp'` with the name of the table that you are checking mutations on.
+:::
 
 **See Also**
 
--   [Mutations](/docs/en/sql-reference/statements/alter/index.md#mutations)
--   [MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree.md) table engine
--   [ReplicatedMergeTree](/docs/en/engines/table-engines/mergetree-family/replication.md) family
+- [Mutations](/docs/en/sql-reference/statements/alter/index.md#mutations)
+- [MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree.md) table engine
+- [ReplicatedMergeTree](/docs/en/engines/table-engines/mergetree-family/replication.md) family
diff --git a/docs/en/operations/system-tables/opentelemetry_span_log.md b/docs/en/operations/system-tables/opentelemetry_span_log.md
index 9d8aea46218..a605a46c14c 100644
--- a/docs/en/operations/system-tables/opentelemetry_span_log.md
+++ b/docs/en/operations/system-tables/opentelemetry_span_log.md
@@ -7,23 +7,30 @@ Contains information about [trace spans](https://opentracing.io/docs/overview/sp
 
 Columns:
 
--   `trace_id` ([UUID](../../sql-reference/data-types/uuid.md)) — ID of the trace for executed query.
+- `trace_id` ([UUID](../../sql-reference/data-types/uuid.md)) — ID of the trace for executed query.
 
--   `span_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — ID of the `trace span`.
+- `span_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — ID of the `trace span`.
 
--   `parent_span_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — ID of the parent `trace span`.
+- `parent_span_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — ID of the parent `trace span`.
 
--   `operation_name` ([String](../../sql-reference/data-types/string.md)) — The name of the operation.
+- `operation_name` ([String](../../sql-reference/data-types/string.md)) — The name of the operation.
 
--   `start_time_us` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The start time of the `trace span` (in microseconds).
+- `kind` ([Enum8](../../sql-reference/data-types/enum.md)) — The [SpanKind](https://opentelemetry.io/docs/reference/specification/trace/api/#spankind) of the span.
+    - `INTERNAL` — Indicates that the span represents an internal operation within an application.
+    - `SERVER` — Indicates that the span covers server-side handling of a synchronous RPC or other remote request.
+    - `CLIENT` — Indicates that the span describes a request to some remote service.
+    - `PRODUCER` — Indicates that the span describes the initiators of an asynchronous request. This parent span will often end before the corresponding child CONSUMER span, possibly even before the child span starts.
+    - `CONSUMER` - Indicates that the span describes a child of an asynchronous PRODUCER request.
 
--   `finish_time_us` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The finish time of the `trace span` (in microseconds).
+- `start_time_us` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The start time of the `trace span` (in microseconds).
 
--   `finish_date` ([Date](../../sql-reference/data-types/date.md)) — The finish date of the `trace span`.
+- `finish_time_us` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The finish time of the `trace span` (in microseconds).
 
--   `attribute.names` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — [Attribute](https://opentelemetry.io/docs/go/instrumentation/#attributes) names depending on the `trace span`. They are filled in according to the recommendations in the [OpenTelemetry](https://opentelemetry.io/) standard.
+- `finish_date` ([Date](../../sql-reference/data-types/date.md)) — The finish date of the `trace span`.
 
--   `attribute.values` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Attribute values depending on the `trace span`. They are filled in according to the recommendations in the `OpenTelemetry` standard.
+- `attribute.names` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — [Attribute](https://opentelemetry.io/docs/go/instrumentation/#attributes) names depending on the `trace span`. They are filled in according to the recommendations in the [OpenTelemetry](https://opentelemetry.io/) standard.
+
+- `attribute.values` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Attribute values depending on the `trace span`. They are filled in according to the recommendations in the `OpenTelemetry` standard.
 
 **Example**
 
@@ -42,6 +49,7 @@ trace_id:         cdab0847-0d62-61d5-4d38-dd65b19a1914
 span_id:          701487461015578150
 parent_span_id:   2991972114672045096
 operation_name:   DB::Block DB::InterpreterSelectQuery::getSampleBlockImpl()
+kind:             INTERNAL
 start_time_us:    1612374594529090
 finish_time_us:   1612374594529108
 finish_date:      2021-02-03
@@ -51,4 +59,4 @@ attribute.values: []
 
 **See Also**
 
--   [OpenTelemetry](../../operations/opentelemetry.md)
+- [OpenTelemetry](../../operations/opentelemetry.md)
diff --git a/docs/en/operations/system-tables/part_log.md b/docs/en/operations/system-tables/part_log.md
index 8ccde889289..c9e34962c79 100644
--- a/docs/en/operations/system-tables/part_log.md
+++ b/docs/en/operations/system-tables/part_log.md
@@ -9,41 +9,41 @@ This table contains information about events that occurred with [data parts](../
 
 The `system.part_log` table contains the following columns:
 
--   `query_id` ([String](../../sql-reference/data-types/string.md)) — Identifier of the `INSERT` query that created this data part.
--   `event_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Type of the event that occurred with the data part. Can have one of the following values:
-    -   `NEW_PART` — Inserting of a new data part.
-    -   `MERGE_PARTS` — Merging of data parts.
-    -   `DOWNLOAD_PART` — Downloading a data part.
-    -   `REMOVE_PART` — Removing or detaching a data part using [DETACH PARTITION](../../sql-reference/statements/alter/partition.md#alter_detach-partition).
-    -   `MUTATE_PART` — Mutating of a data part.
-    -   `MOVE_PART` — Moving the data part from the one disk to another one.
--   `merge_reason` ([Enum8](../../sql-reference/data-types/enum.md)) — The reason for the event with type `MERGE_PARTS`. Can have one of the following values:
-    -   `NOT_A_MERGE` — The current event has the type other than `MERGE_PARTS`.
-    -   `REGULAR_MERGE` — Some regular merge.
-    -   `TTL_DELETE_MERGE` — Cleaning up expired data.
-    -   `TTL_RECOMPRESS_MERGE` — Recompressing data part with the.
--   `merge_algorithm` ([Enum8](../../sql-reference/data-types/enum.md)) — Merge algorithm for the event with type `MERGE_PARTS`. Can have one of the following values:
-    -   `UNDECIDED`
-    -   `HORIZONTAL`
-    -   `VERTICAL`
--   `event_date` ([Date](../../sql-reference/data-types/date.md)) — Event date.
--   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Event time.
--   `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Event time with microseconds precision.
--   `duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Duration.
--   `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database the data part is in.
--   `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table the data part is in.
--   `part_name` ([String](../../sql-reference/data-types/string.md)) — Name of the data part.
--   `partition_id` ([String](../../sql-reference/data-types/string.md)) — ID of the partition that the data part was inserted to. The column takes the `all` value if the partitioning is by `tuple()`.
--   `path_on_disk` ([String](../../sql-reference/data-types/string.md)) — Absolute path to the folder with data part files.
--   `rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows in the data part.
--   `size_in_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of the data part in bytes.
--   `merged_from` ([Array(String)](../../sql-reference/data-types/array.md)) — An array of names of the parts which the current part was made up from (after the merge).
--   `bytes_uncompressed` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of uncompressed bytes.
--   `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows was read during the merge.
--   `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of bytes was read during the merge.
--   `peak_memory_usage` ([Int64](../../sql-reference/data-types/int-uint.md)) — The maximum difference between the amount of allocated and freed memory in context of this thread.
--   `error` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The code number of the occurred error.
--   `exception` ([String](../../sql-reference/data-types/string.md)) — Text message of the occurred error.
+- `query_id` ([String](../../sql-reference/data-types/string.md)) — Identifier of the `INSERT` query that created this data part.
+- `event_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Type of the event that occurred with the data part. Can have one of the following values:
+    - `NEW_PART` — Inserting of a new data part.
+    - `MERGE_PARTS` — Merging of data parts.
+    - `DOWNLOAD_PART` — Downloading a data part.
+    - `REMOVE_PART` — Removing or detaching a data part using [DETACH PARTITION](../../sql-reference/statements/alter/partition.md#alter_detach-partition).
+    - `MUTATE_PART` — Mutating of a data part.
+    - `MOVE_PART` — Moving the data part from the one disk to another one.
+- `merge_reason` ([Enum8](../../sql-reference/data-types/enum.md)) — The reason for the event with type `MERGE_PARTS`. Can have one of the following values:
+    - `NOT_A_MERGE` — The current event has the type other than `MERGE_PARTS`.
+    - `REGULAR_MERGE` — Some regular merge.
+    - `TTL_DELETE_MERGE` — Cleaning up expired data.
+    - `TTL_RECOMPRESS_MERGE` — Recompressing data part with the.
+- `merge_algorithm` ([Enum8](../../sql-reference/data-types/enum.md)) — Merge algorithm for the event with type `MERGE_PARTS`. Can have one of the following values:
+    - `UNDECIDED`
+    - `HORIZONTAL`
+    - `VERTICAL`
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — Event date.
+- `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Event time.
+- `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Event time with microseconds precision.
+- `duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Duration.
+- `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database the data part is in.
+- `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table the data part is in.
+- `part_name` ([String](../../sql-reference/data-types/string.md)) — Name of the data part.
+- `partition_id` ([String](../../sql-reference/data-types/string.md)) — ID of the partition that the data part was inserted to. The column takes the `all` value if the partitioning is by `tuple()`.
+- `path_on_disk` ([String](../../sql-reference/data-types/string.md)) — Absolute path to the folder with data part files.
+- `rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows in the data part.
+- `size_in_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of the data part in bytes.
+- `merged_from` ([Array(String)](../../sql-reference/data-types/array.md)) — An array of names of the parts which the current part was made up from (after the merge).
+- `bytes_uncompressed` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of uncompressed bytes.
+- `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows was read during the merge.
+- `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of bytes was read during the merge.
+- `peak_memory_usage` ([Int64](../../sql-reference/data-types/int-uint.md)) — The maximum difference between the amount of allocated and freed memory in context of this thread.
+- `error` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The code number of the occurred error.
+- `exception` ([String](../../sql-reference/data-types/string.md)) — Text message of the occurred error.
 
 The `system.part_log` table is created after the first inserting data to the `MergeTree` table.
 
diff --git a/docs/en/operations/system-tables/parts.md b/docs/en/operations/system-tables/parts.md
index 106d3c59dea..e61c6ed2ba4 100644
--- a/docs/en/operations/system-tables/parts.md
+++ b/docs/en/operations/system-tables/parts.md
@@ -9,107 +9,107 @@ Each row describes one data part.
 
 Columns:
 
--   `partition` ([String](../../sql-reference/data-types/string.md)) – The partition name. To learn what a partition is, see the description of the [ALTER](../../sql-reference/statements/alter/index.md#query_language_queries_alter) query.
+- `partition` ([String](../../sql-reference/data-types/string.md)) – The partition name. To learn what a partition is, see the description of the [ALTER](../../sql-reference/statements/alter/index.md#query_language_queries_alter) query.
 
     Formats:
 
-    -   `YYYYMM` for automatic partitioning by month.
-    -   `any_string` when partitioning manually.
+    - `YYYYMM` for automatic partitioning by month.
+    - `any_string` when partitioning manually.
 
--   `name` ([String](../../sql-reference/data-types/string.md)) – Name of the data part.
+- `name` ([String](../../sql-reference/data-types/string.md)) – Name of the data part.
 
--   `part_type` ([String](../../sql-reference/data-types/string.md)) — The data part storing format.
+- `part_type` ([String](../../sql-reference/data-types/string.md)) — The data part storing format.
 
     Possible Values:
 
-    -   `Wide` — Each column is stored in a separate file in a filesystem.
-    -   `Compact` — All columns are stored in one file in a filesystem.
+    - `Wide` — Each column is stored in a separate file in a filesystem.
+    - `Compact` — All columns are stored in one file in a filesystem.
 
     Data storing format is controlled by the `min_bytes_for_wide_part` and `min_rows_for_wide_part` settings of the [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table.
 
-   -   `active` ([UInt8](../../sql-reference/data-types/int-uint.md)) – Flag that indicates whether the data part is active. If a data part is active, it’s used in a table. Otherwise, it’s deleted. Inactive data parts remain after merging.
+   - `active` ([UInt8](../../sql-reference/data-types/int-uint.md)) – Flag that indicates whether the data part is active. If a data part is active, it’s used in a table. Otherwise, it’s deleted. Inactive data parts remain after merging.
 
--   `marks` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The number of marks. To get the approximate number of rows in a data part, multiply `marks` by the index granularity (usually 8192) (this hint does not work for adaptive granularity).
+- `marks` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The number of marks. To get the approximate number of rows in a data part, multiply `marks` by the index granularity (usually 8192) (this hint does not work for adaptive granularity).
 
--   `rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The number of rows.
+- `rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The number of rows.
 
--   `bytes_on_disk` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of all the data part files in bytes.
+- `bytes_on_disk` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of all the data part files in bytes.
 
--   `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of compressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
+- `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of compressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
 
--   `data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of uncompressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
+- `data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of uncompressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
 
--   `marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The size of the file with marks.
+- `marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The size of the file with marks.
 
--   `secondary_indices_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of compressed data for secondary indices in the data part. All the auxiliary files (for example, files with marks) are not included.
+- `secondary_indices_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of compressed data for secondary indices in the data part. All the auxiliary files (for example, files with marks) are not included.
 
--   `secondary_indices_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of uncompressed data for secondary indices in the data part. All the auxiliary files (for example, files with marks) are not included.
+- `secondary_indices_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of uncompressed data for secondary indices in the data part. All the auxiliary files (for example, files with marks) are not included.
 
--   `secondary_indices_marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The size of the file with marks for secondary indices.
+- `secondary_indices_marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The size of the file with marks for secondary indices.
 
--   `modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) – The time the directory with the data part was modified. This usually corresponds to the time of data part creation.
+- `modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) – The time the directory with the data part was modified. This usually corresponds to the time of data part creation.
 
--   `remove_time` ([DateTime](../../sql-reference/data-types/datetime.md)) – The time when the data part became inactive.
+- `remove_time` ([DateTime](../../sql-reference/data-types/datetime.md)) – The time when the data part became inactive.
 
--   `refcount` ([UInt32](../../sql-reference/data-types/int-uint.md)) – The number of places where the data part is used. A value greater than 2 indicates that the data part is used in queries or merges.
+- `refcount` ([UInt32](../../sql-reference/data-types/int-uint.md)) – The number of places where the data part is used. A value greater than 2 indicates that the data part is used in queries or merges.
 
--   `min_date` ([Date](../../sql-reference/data-types/date.md)) – The minimum value of the date key in the data part.
+- `min_date` ([Date](../../sql-reference/data-types/date.md)) – The minimum value of the date key in the data part.
 
--   `max_date` ([Date](../../sql-reference/data-types/date.md)) – The maximum value of the date key in the data part.
+- `max_date` ([Date](../../sql-reference/data-types/date.md)) – The maximum value of the date key in the data part.
 
--   `min_time` ([DateTime](../../sql-reference/data-types/datetime.md)) – The minimum value of the date and time key in the data part.
+- `min_time` ([DateTime](../../sql-reference/data-types/datetime.md)) – The minimum value of the date and time key in the data part.
 
--   `max_time`([DateTime](../../sql-reference/data-types/datetime.md)) – The maximum value of the date and time key in the data part.
+- `max_time`([DateTime](../../sql-reference/data-types/datetime.md)) – The maximum value of the date and time key in the data part.
 
--   `partition_id` ([String](../../sql-reference/data-types/string.md)) – ID of the partition.
+- `partition_id` ([String](../../sql-reference/data-types/string.md)) – ID of the partition.
 
--   `min_block_number` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The minimum number of data parts that make up the current part after merging.
+- `min_block_number` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The minimum number of data parts that make up the current part after merging.
 
--   `max_block_number` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The maximum number of data parts that make up the current part after merging.
+- `max_block_number` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The maximum number of data parts that make up the current part after merging.
 
--   `level` ([UInt32](../../sql-reference/data-types/int-uint.md)) – Depth of the merge tree. Zero means that the current part was created by insert rather than by merging other parts.
+- `level` ([UInt32](../../sql-reference/data-types/int-uint.md)) – Depth of the merge tree. Zero means that the current part was created by insert rather than by merging other parts.
 
--   `data_version` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Number that is used to determine which mutations should be applied to the data part (mutations with a version higher than `data_version`).
+- `data_version` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Number that is used to determine which mutations should be applied to the data part (mutations with a version higher than `data_version`).
 
--   `primary_key_bytes_in_memory` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The amount of memory (in bytes) used by primary key values.
+- `primary_key_bytes_in_memory` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The amount of memory (in bytes) used by primary key values.
 
--   `primary_key_bytes_in_memory_allocated` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The amount of memory (in bytes) reserved for primary key values.
+- `primary_key_bytes_in_memory_allocated` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The amount of memory (in bytes) reserved for primary key values.
 
--   `is_frozen` ([UInt8](../../sql-reference/data-types/int-uint.md)) – Flag that shows that a partition data backup exists. 1, the backup exists. 0, the backup does not exist. For more details, see [FREEZE PARTITION](../../sql-reference/statements/alter/partition.md/#alter_freeze-partition)
+- `is_frozen` ([UInt8](../../sql-reference/data-types/int-uint.md)) – Flag that shows that a partition data backup exists. 1, the backup exists. 0, the backup does not exist. For more details, see [FREEZE PARTITION](../../sql-reference/statements/alter/partition.md/#alter_freeze-partition)
 
--   `database` ([String](../../sql-reference/data-types/string.md)) – Name of the database.
+- `database` ([String](../../sql-reference/data-types/string.md)) – Name of the database.
 
--   `table` ([String](../../sql-reference/data-types/string.md)) – Name of the table.
+- `table` ([String](../../sql-reference/data-types/string.md)) – Name of the table.
 
--   `engine` ([String](../../sql-reference/data-types/string.md)) – Name of the table engine without parameters.
+- `engine` ([String](../../sql-reference/data-types/string.md)) – Name of the table engine without parameters.
 
--   `path` ([String](../../sql-reference/data-types/string.md)) – Absolute path to the folder with data part files.
+- `path` ([String](../../sql-reference/data-types/string.md)) – Absolute path to the folder with data part files.
 
--   `disk_name` ([String](../../sql-reference/data-types/string.md)) – Name of a disk that stores the data part.
+- `disk_name` ([String](../../sql-reference/data-types/string.md)) – Name of a disk that stores the data part.
 
--   `hash_of_all_files` ([String](../../sql-reference/data-types/string.md)) – [sipHash128](../../sql-reference/functions/hash-functions.md/#hash_functions-siphash128) of compressed files.
+- `hash_of_all_files` ([String](../../sql-reference/data-types/string.md)) – [sipHash128](../../sql-reference/functions/hash-functions.md/#hash_functions-siphash128) of compressed files.
 
--   `hash_of_uncompressed_files` ([String](../../sql-reference/data-types/string.md)) – [sipHash128](../../sql-reference/functions/hash-functions.md/#hash_functions-siphash128) of uncompressed files (files with marks, index file etc.).
+- `hash_of_uncompressed_files` ([String](../../sql-reference/data-types/string.md)) – [sipHash128](../../sql-reference/functions/hash-functions.md/#hash_functions-siphash128) of uncompressed files (files with marks, index file etc.).
 
--   `uncompressed_hash_of_compressed_files` ([String](../../sql-reference/data-types/string.md)) – [sipHash128](../../sql-reference/functions/hash-functions.md/#hash_functions-siphash128) of data in the compressed files as if they were uncompressed.
+- `uncompressed_hash_of_compressed_files` ([String](../../sql-reference/data-types/string.md)) – [sipHash128](../../sql-reference/functions/hash-functions.md/#hash_functions-siphash128) of data in the compressed files as if they were uncompressed.
 
--   `delete_ttl_info_min` ([DateTime](../../sql-reference/data-types/datetime.md)) — The minimum value of the date and time key for [TTL DELETE rule](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl).
+- `delete_ttl_info_min` ([DateTime](../../sql-reference/data-types/datetime.md)) — The minimum value of the date and time key for [TTL DELETE rule](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl).
 
--   `delete_ttl_info_max` ([DateTime](../../sql-reference/data-types/datetime.md)) — The maximum value of the date and time key for [TTL DELETE rule](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl).
+- `delete_ttl_info_max` ([DateTime](../../sql-reference/data-types/datetime.md)) — The maximum value of the date and time key for [TTL DELETE rule](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl).
 
--   `move_ttl_info.expression` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Array of expressions. Each expression defines a [TTL MOVE rule](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl).
+- `move_ttl_info.expression` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Array of expressions. Each expression defines a [TTL MOVE rule](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl).
 
-:::warning
+:::note
 The `move_ttl_info.expression` array is kept mostly for backward compatibility, now the simpliest way to check `TTL MOVE` rule is to use the `move_ttl_info.min` and `move_ttl_info.max` fields.
 :::
 
--   `move_ttl_info.min` ([Array](../../sql-reference/data-types/array.md)([DateTime](../../sql-reference/data-types/datetime.md))) — Array of date and time values. Each element describes the minimum key value for a [TTL MOVE rule](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl).
+- `move_ttl_info.min` ([Array](../../sql-reference/data-types/array.md)([DateTime](../../sql-reference/data-types/datetime.md))) — Array of date and time values. Each element describes the minimum key value for a [TTL MOVE rule](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl).
 
--   `move_ttl_info.max` ([Array](../../sql-reference/data-types/array.md)([DateTime](../../sql-reference/data-types/datetime.md))) — Array of date and time values. Each element describes the maximum key value for a [TTL MOVE rule](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl).
+- `move_ttl_info.max` ([Array](../../sql-reference/data-types/array.md)([DateTime](../../sql-reference/data-types/datetime.md))) — Array of date and time values. Each element describes the maximum key value for a [TTL MOVE rule](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl).
 
--   `bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Alias for `bytes_on_disk`.
+- `bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Alias for `bytes_on_disk`.
 
--   `marks_size` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Alias for `marks_bytes`.
+- `marks_size` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Alias for `marks_bytes`.
 
 **Example**
 
@@ -165,5 +165,5 @@ move_ttl_info.max:                     []
 
 **See Also**
 
--   [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)
--   [TTL for Columns and Tables](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl)
+- [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)
+- [TTL for Columns and Tables](../../engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-ttl)
diff --git a/docs/en/operations/system-tables/parts_columns.md b/docs/en/operations/system-tables/parts_columns.md
index d389d5bbb29..00d7164af59 100644
--- a/docs/en/operations/system-tables/parts_columns.md
+++ b/docs/en/operations/system-tables/parts_columns.md
@@ -9,93 +9,93 @@ Each row describes one data part.
 
 Columns:
 
--   `partition` ([String](../../sql-reference/data-types/string.md)) — The partition name. To learn what a partition is, see the description of the [ALTER](../../sql-reference/statements/alter/index.md#query_language_queries_alter) query.
+- `partition` ([String](../../sql-reference/data-types/string.md)) — The partition name. To learn what a partition is, see the description of the [ALTER](../../sql-reference/statements/alter/index.md#query_language_queries_alter) query.
 
     Formats:
 
-    -   `YYYYMM` for automatic partitioning by month.
-    -   `any_string` when partitioning manually.
+    - `YYYYMM` for automatic partitioning by month.
+    - `any_string` when partitioning manually.
 
--   `name` ([String](../../sql-reference/data-types/string.md)) — Name of the data part.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Name of the data part.
 
--   `part_type` ([String](../../sql-reference/data-types/string.md)) — The data part storing format.
+- `part_type` ([String](../../sql-reference/data-types/string.md)) — The data part storing format.
 
     Possible values:
 
-    -   `Wide` — Each column is stored in a separate file in a filesystem.
-    -   `Compact` — All columns are stored in one file in a filesystem.
+    - `Wide` — Each column is stored in a separate file in a filesystem.
+    - `Compact` — All columns are stored in one file in a filesystem.
 
     Data storing format is controlled by the `min_bytes_for_wide_part` and `min_rows_for_wide_part` settings of the [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table.
 
--   `active` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the data part is active. If a data part is active, it’s used in a table. Otherwise, it’s deleted. Inactive data parts remain after merging.
+- `active` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the data part is active. If a data part is active, it’s used in a table. Otherwise, it’s deleted. Inactive data parts remain after merging.
 
--   `marks` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of marks. To get the approximate number of rows in a data part, multiply `marks` by the index granularity (usually 8192) (this hint does not work for adaptive granularity).
+- `marks` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of marks. To get the approximate number of rows in a data part, multiply `marks` by the index granularity (usually 8192) (this hint does not work for adaptive granularity).
 
--   `rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows.
+- `rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows.
 
--   `bytes_on_disk` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of all the data part files in bytes.
+- `bytes_on_disk` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of all the data part files in bytes.
 
--   `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of compressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
+- `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of compressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
 
--   `data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of uncompressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
+- `data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of uncompressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
 
--   `marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of the file with marks.
+- `marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of the file with marks.
 
--   `modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The time the directory with the data part was modified. This usually corresponds to the time of data part creation.
+- `modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The time the directory with the data part was modified. This usually corresponds to the time of data part creation.
 
--   `remove_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The time when the data part became inactive.
+- `remove_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The time when the data part became inactive.
 
--   `refcount` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of places where the data part is used. A value greater than 2 indicates that the data part is used in queries or merges.
+- `refcount` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of places where the data part is used. A value greater than 2 indicates that the data part is used in queries or merges.
 
--   `min_date` ([Date](../../sql-reference/data-types/date.md)) — The minimum value of the date key in the data part.
+- `min_date` ([Date](../../sql-reference/data-types/date.md)) — The minimum value of the date key in the data part.
 
--   `max_date` ([Date](../../sql-reference/data-types/date.md)) — The maximum value of the date key in the data part.
+- `max_date` ([Date](../../sql-reference/data-types/date.md)) — The maximum value of the date key in the data part.
 
--   `partition_id` ([String](../../sql-reference/data-types/string.md)) — ID of the partition.
+- `partition_id` ([String](../../sql-reference/data-types/string.md)) — ID of the partition.
 
--   `min_block_number` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The minimum number of data parts that make up the current part after merging.
+- `min_block_number` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The minimum number of data parts that make up the current part after merging.
 
--   `max_block_number` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The maximum number of data parts that make up the current part after merging.
+- `max_block_number` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The maximum number of data parts that make up the current part after merging.
 
--   `level` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Depth of the merge tree. Zero means that the current part was created by insert rather than by merging other parts.
+- `level` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Depth of the merge tree. Zero means that the current part was created by insert rather than by merging other parts.
 
--   `data_version` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number that is used to determine which mutations should be applied to the data part (mutations with a version higher than `data_version`).
+- `data_version` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number that is used to determine which mutations should be applied to the data part (mutations with a version higher than `data_version`).
 
--   `primary_key_bytes_in_memory` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The amount of memory (in bytes) used by primary key values.
+- `primary_key_bytes_in_memory` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The amount of memory (in bytes) used by primary key values.
 
--   `primary_key_bytes_in_memory_allocated` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The amount of memory (in bytes) reserved for primary key values.
+- `primary_key_bytes_in_memory_allocated` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The amount of memory (in bytes) reserved for primary key values.
 
--   `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database.
+- `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database.
 
--   `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table.
+- `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table.
 
--   `engine` ([String](../../sql-reference/data-types/string.md)) — Name of the table engine without parameters.
+- `engine` ([String](../../sql-reference/data-types/string.md)) — Name of the table engine without parameters.
 
--   `disk_name` ([String](../../sql-reference/data-types/string.md)) — Name of a disk that stores the data part.
+- `disk_name` ([String](../../sql-reference/data-types/string.md)) — Name of a disk that stores the data part.
 
--   `path` ([String](../../sql-reference/data-types/string.md)) — Absolute path to the folder with data part files.
+- `path` ([String](../../sql-reference/data-types/string.md)) — Absolute path to the folder with data part files.
 
--   `column` ([String](../../sql-reference/data-types/string.md)) — Name of the column.
+- `column` ([String](../../sql-reference/data-types/string.md)) — Name of the column.
 
--   `type` ([String](../../sql-reference/data-types/string.md)) — Column type.
+- `type` ([String](../../sql-reference/data-types/string.md)) — Column type.
 
--   `column_position` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Ordinal position of a column in a table starting with 1.
+- `column_position` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Ordinal position of a column in a table starting with 1.
 
--   `default_kind` ([String](../../sql-reference/data-types/string.md)) — Expression type (`DEFAULT`, `MATERIALIZED`, `ALIAS`) for the default value, or an empty string if it is not defined.
+- `default_kind` ([String](../../sql-reference/data-types/string.md)) — Expression type (`DEFAULT`, `MATERIALIZED`, `ALIAS`) for the default value, or an empty string if it is not defined.
 
--   `default_expression` ([String](../../sql-reference/data-types/string.md)) — Expression for the default value, or an empty string if it is not defined.
+- `default_expression` ([String](../../sql-reference/data-types/string.md)) — Expression for the default value, or an empty string if it is not defined.
 
--   `column_bytes_on_disk` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of the column in bytes.
+- `column_bytes_on_disk` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of the column in bytes.
 
--   `column_data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of compressed data in the column, in bytes.
+- `column_data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of compressed data in the column, in bytes.
 
--   `column_data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of the decompressed data in the column, in bytes.
+- `column_data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Total size of the decompressed data in the column, in bytes.
 
--   `column_marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of the column with marks, in bytes.
+- `column_marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of the column with marks, in bytes.
 
--   `bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Alias for `bytes_on_disk`.
+- `bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Alias for `bytes_on_disk`.
 
--   `marks_size` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Alias for `marks_bytes`.
+- `marks_size` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Alias for `marks_bytes`.
 
 **Example**
 
@@ -146,4 +146,4 @@ column_marks_bytes:                    48
 
 **See Also**
 
--   [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)
+- [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)
diff --git a/docs/en/operations/system-tables/processes.md b/docs/en/operations/system-tables/processes.md
index 76219813ad7..2e729920ed0 100644
--- a/docs/en/operations/system-tables/processes.md
+++ b/docs/en/operations/system-tables/processes.md
@@ -7,17 +7,17 @@ This system table is used for implementing the `SHOW PROCESSLIST` query.
 
 Columns:
 
--   `user` (String) – The user who made the query. Keep in mind that for distributed processing, queries are sent to remote servers under the `default` user. The field contains the username for a specific query, not for a query that this query initiated.
--   `address` (String) – The IP address the request was made from. The same for distributed processing. To track where a distributed query was originally made from, look at `system.processes` on the query requestor server.
--   `elapsed` (Float64) – The time in seconds since request execution started.
--   `rows_read` (UInt64) – The number of rows read from the table. For distributed processing, on the requestor server, this is the total for all remote servers.
--   `bytes_read` (UInt64) – The number of uncompressed bytes read from the table. For distributed processing, on the requestor server, this is the total for all remote servers.
--   `total_rows_approx` (UInt64) – The approximation of the total number of rows that should be read. For distributed processing, on the requestor server, this is the total for all remote servers. It can be updated during request processing, when new sources to process become known.
--   `memory_usage` (UInt64) – Amount of RAM the request uses. It might not include some types of dedicated memory. See the [max_memory_usage](../../operations/settings/query-complexity.md#settings_max_memory_usage) setting.
--   `query` (String) – The query text. For `INSERT`, it does not include the data to insert.
--   `query_id` (String) – Query ID, if defined.
--   `is_cancelled` (Int8) – Was query cancelled.
--   `is_all_data_sent` (Int8) – Was all data sent to the client (in other words query had been finished on the server).
+- `user` (String) – The user who made the query. Keep in mind that for distributed processing, queries are sent to remote servers under the `default` user. The field contains the username for a specific query, not for a query that this query initiated.
+- `address` (String) – The IP address the request was made from. The same for distributed processing. To track where a distributed query was originally made from, look at `system.processes` on the query requestor server.
+- `elapsed` (Float64) – The time in seconds since request execution started.
+- `rows_read` (UInt64) – The number of rows read from the table. For distributed processing, on the requestor server, this is the total for all remote servers.
+- `bytes_read` (UInt64) – The number of uncompressed bytes read from the table. For distributed processing, on the requestor server, this is the total for all remote servers.
+- `total_rows_approx` (UInt64) – The approximation of the total number of rows that should be read. For distributed processing, on the requestor server, this is the total for all remote servers. It can be updated during request processing, when new sources to process become known.
+- `memory_usage` (UInt64) – Amount of RAM the request uses. It might not include some types of dedicated memory. See the [max_memory_usage](../../operations/settings/query-complexity.md#settings_max_memory_usage) setting.
+- `query` (String) – The query text. For `INSERT`, it does not include the data to insert.
+- `query_id` (String) – Query ID, if defined.
+- `is_cancelled` (Int8) – Was query cancelled.
+- `is_all_data_sent` (Int8) – Was all data sent to the client (in other words query had been finished on the server).
 
 ```sql
 SELECT * FROM system.processes LIMIT 10 FORMAT Vertical;
diff --git a/docs/en/operations/system-tables/processors_profile_log.md b/docs/en/operations/system-tables/processors_profile_log.md
index a2e7a9ebabd..5eedb5a5dae 100644
--- a/docs/en/operations/system-tables/processors_profile_log.md
+++ b/docs/en/operations/system-tables/processors_profile_log.md
@@ -1,24 +1,26 @@
-# system.processors_profile_log {#system-processors_profile_log}
+# processors_profile_log
 
 This table contains profiling on processors level (that you can find in [`EXPLAIN PIPELINE`](../../sql-reference/statements/explain.md#explain-pipeline)).
 
 Columns:
 
--   `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the event happened.
--   `event_time` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — The date and time when the event happened.
--   `id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — ID of processor
--   `parent_ids` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Parent processors IDs
--   `query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the query
--   `name` ([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)) — Name of the processor.
--   `elapsed_us` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of microseconds this processor was executed.
--   `input_wait_elapsed_us` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of microseconds this processor was waiting for data (from other processor).
--   `output_wait_elapsed_us` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of microseconds this processor was waiting because output port was full.
--   `plan_step` ([UInt64](../../sql-reference/data-types/int-uint.md)) — ID of the query plan step which created this processor. The value is zero if the processor was not added from any step.
--   `plan_group` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Group of the processor if it was created by query plan step. A group is a logical partitioning of processors added from the same query plan step. Group is used only for beautifying the result of EXPLAIN PIPELINE result.
--   `input_rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows consumed by processor.
--   `input_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of bytes consumed by processor.
--   `output_rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows generated by processor.
--   `output_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of bytes generated by processor.
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the event happened.
+- `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the event happened.
+- `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — The date and time with microseconds precision when the event happened.
+- `id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — ID of processor
+- `parent_ids` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Parent processors IDs
+- `plan_step` ([UInt64](../../sql-reference/data-types/int-uint.md)) — ID of the query plan step which created this processor. The value is zero if the processor was not added from any step.
+- `plan_group` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Group of the processor if it was created by query plan step. A group is a logical partitioning of processors added from the same query plan step. Group is used only for beautifying the result of EXPLAIN PIPELINE result.
+- `initial_query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the initial query (for distributed query execution).
+- `query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the query
+- `name` ([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)) — Name of the processor.
+- `elapsed_us` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of microseconds this processor was executed.
+- `input_wait_elapsed_us` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of microseconds this processor was waiting for data (from other processor).
+- `output_wait_elapsed_us` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of microseconds this processor was waiting because output port was full.
+- `input_rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows consumed by processor.
+- `input_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of bytes consumed by processor.
+- `output_rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows generated by processor.
+- `output_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of bytes generated by processor.
 **Example**
 
 Query:
@@ -67,10 +69,10 @@ Result:
 
 Here you can see:
 
--  `ExpressionTransform` was executing `sleep(1)` function, so it `work` will takes 1e6, and so `elapsed_us` > 1e6.
--  `SourceFromSingleChunk` need to wait, because `ExpressionTransform` does not accept any data during execution of `sleep(1)`, so it will be in `PortFull` state for 1e6 us, and so `output_wait_elapsed_us` > 1e6.
--  `LimitsCheckingTransform`/`NullSource`/`LazyOutputFormat` need to wait until `ExpressionTransform` will execute `sleep(1)` to process the result, so `input_wait_elapsed_us` > 1e6.
+- `ExpressionTransform` was executing `sleep(1)` function, so it `work` will takes 1e6, and so `elapsed_us` > 1e6.
+- `SourceFromSingleChunk` need to wait, because `ExpressionTransform` does not accept any data during execution of `sleep(1)`, so it will be in `PortFull` state for 1e6 us, and so `output_wait_elapsed_us` > 1e6.
+- `LimitsCheckingTransform`/`NullSource`/`LazyOutputFormat` need to wait until `ExpressionTransform` will execute `sleep(1)` to process the result, so `input_wait_elapsed_us` > 1e6.
 
 **See Also**
 
--   [`EXPLAIN PIPELINE`](../../sql-reference/statements/explain.md#explain-pipeline)
\ No newline at end of file
+- [`EXPLAIN PIPELINE`](../../sql-reference/statements/explain.md#explain-pipeline)
diff --git a/docs/en/operations/system-tables/query_log.md b/docs/en/operations/system-tables/query_log.md
index a04214f6488..71e1452cef1 100644
--- a/docs/en/operations/system-tables/query_log.md
+++ b/docs/en/operations/system-tables/query_log.md
@@ -34,82 +34,83 @@ You can use the [log_formatted_queries](../../operations/settings/settings.md#se
 
 Columns:
 
--   `type` ([Enum8](../../sql-reference/data-types/enum.md)) — Type of an event that occurred when executing the query. Values:
-    -   `'QueryStart' = 1` — Successful start of query execution.
-    -   `'QueryFinish' = 2` — Successful end of query execution.
-    -   `'ExceptionBeforeStart' = 3` — Exception before the start of query execution.
-    -   `'ExceptionWhileProcessing' = 4` — Exception during the query execution.
--   `event_date` ([Date](../../sql-reference/data-types/date.md)) — Query starting date.
--   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query starting time.
--   `event_time_microseconds` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query starting time with microseconds precision.
--   `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Start time of query execution.
--   `query_start_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Start time of query execution with microsecond precision.
--   `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Duration of query execution in milliseconds.
--   `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total number of rows read from all tables and table functions participated in query. It includes usual subqueries, subqueries for `IN` and `JOIN`. For distributed queries `read_rows` includes the total number of rows read at all replicas. Each replica sends it’s `read_rows` value, and the server-initiator of the query summarizes all received and local values. The cache volumes do not affect this value.
--   `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total number of bytes read from all tables and table functions participated in query. It includes usual subqueries, subqueries for `IN` and `JOIN`. For distributed queries `read_bytes` includes the total number of rows read at all replicas. Each replica sends it’s `read_bytes` value, and the server-initiator of the query summarizes all received and local values. The cache volumes do not affect this value.
--   `written_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` queries, the number of written rows. For other queries, the column value is 0.
--   `written_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` queries, the number of written bytes. For other queries, the column value is 0.
--   `result_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of rows in a result of the `SELECT` query, or a number of rows in the `INSERT` query.
--   `result_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — RAM volume in bytes used to store a query result.
--   `memory_usage` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Memory consumption by the query.
--   `current_database` ([String](../../sql-reference/data-types/string.md)) — Name of the current database.
--   `query` ([String](../../sql-reference/data-types/string.md)) — Query string.
--   `formatted_query` ([String](../../sql-reference/data-types/string.md)) — Formatted query string.
--   `normalized_query_hash` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Identical hash value without the values of literals for similar queries.
--   `query_kind` ([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)) — Type of the query.
--   `databases` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the databases present in the query.
--   `tables` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the tables present in the query.
--   `views` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the (materialized or live) views present in the query.
--   `columns` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the columns present in the query.
--   `projections` ([String](../../sql-reference/data-types/string.md)) — Names of the projections used during the query execution.
--   `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — Code of an exception.
--   `exception` ([String](../../sql-reference/data-types/string.md)) — Exception message.
--   `stack_trace` ([String](../../sql-reference/data-types/string.md)) — [Stack trace](https://en.wikipedia.org/wiki/Stack_trace). An empty string, if the query was completed successfully.
--   `is_initial_query` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Query type. Possible values:
-    -   1 — Query was initiated by the client.
-    -   0 — Query was initiated by another query as part of distributed query execution.
--   `user` ([String](../../sql-reference/data-types/string.md)) — Name of the user who initiated the current query.
--   `query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the query.
--   `address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address that was used to make the query.
--   `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The client port that was used to make the query.
--   `initial_user` ([String](../../sql-reference/data-types/string.md)) — Name of the user who ran the initial query (for distributed query execution).
--   `initial_query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the initial query (for distributed query execution).
--   `initial_address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address that the parent query was launched from.
--   `initial_port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The client port that was used to make the parent query.
--   `initial_query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Initial query starting time (for distributed query execution).
--   `initial_query_start_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Initial query starting time with microseconds precision (for distributed query execution).
--   `interface` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Interface that the query was initiated from. Possible values:
-    -   1 — TCP.
-    -   2 — HTTP.
--   `os_user` ([String](../../sql-reference/data-types/string.md)) — Operating system username who runs [clickhouse-client](../../interfaces/cli.md).
--   `client_hostname` ([String](../../sql-reference/data-types/string.md)) — Hostname of the client machine where the [clickhouse-client](../../interfaces/cli.md) or another TCP client is run.
--   `client_name` ([String](../../sql-reference/data-types/string.md)) — The [clickhouse-client](../../interfaces/cli.md) or another TCP client name.
--   `client_revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Revision of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
--   `client_version_major` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Major version of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
--   `client_version_minor` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Minor version of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
--   `client_version_patch` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Patch component of the [clickhouse-client](../../interfaces/cli.md) or another TCP client version.
--   `http_method` (UInt8) — HTTP method that initiated the query. Possible values:
-    -   0 — The query was launched from the TCP interface.
-    -   1 — `GET` method was used.
-    -   2 — `POST` method was used.
--   `http_user_agent` ([String](../../sql-reference/data-types/string.md)) — HTTP header `UserAgent` passed in the HTTP query.
--   `http_referer` ([String](../../sql-reference/data-types/string.md)) — HTTP header `Referer` passed in the HTTP query (contains an absolute or partial address of the page making the query).
--   `forwarded_for` ([String](../../sql-reference/data-types/string.md)) — HTTP header `X-Forwarded-For` passed in the HTTP query.
--   `quota_key` ([String](../../sql-reference/data-types/string.md)) — The `quota key` specified in the [quotas](../../operations/quotas.md) setting (see `keyed`).
--   `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ClickHouse revision.
--   `ProfileEvents` ([Map(String, UInt64)](../../sql-reference/data-types/array.md)) — ProfileEvents that measure different metrics. The description of them could be found in the table [system.events](../../operations/system-tables/events.md#system_tables-events)
--   `Settings` ([Map(String, String)](../../sql-reference/data-types/array.md)) — Settings that were changed when the client ran the query. To enable logging changes to settings, set the `log_query_settings` parameter to 1.
--   `log_comment` ([String](../../sql-reference/data-types/string.md)) — Log comment. It can be set to arbitrary string no longer than [max_query_size](../../operations/settings/settings.md#settings-max_query_size). An empty string if it is not defined.
--   `thread_ids` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Thread ids that are participating in query execution.
--   `used_aggregate_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `aggregate functions`, which were used during query execution.
--   `used_aggregate_function_combinators` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `aggregate functions combinators`, which were used during query execution.
--   `used_database_engines` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `database engines`, which were used during query execution.
--   `used_data_type_families` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `data type families`, which were used during query execution.
--   `used_dictionaries` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `dictionaries`, which were used during query execution.
--   `used_formats` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `formats`, which were used during query execution.
--   `used_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `functions`, which were used during query execution.
--   `used_storages` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `storages`, which were used during query execution.
--   `used_table_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `table functions`, which were used during query execution.
+- `type` ([Enum8](../../sql-reference/data-types/enum.md)) — Type of an event that occurred when executing the query. Values:
+    - `'QueryStart' = 1` — Successful start of query execution.
+    - `'QueryFinish' = 2` — Successful end of query execution.
+    - `'ExceptionBeforeStart' = 3` — Exception before the start of query execution.
+    - `'ExceptionWhileProcessing' = 4` — Exception during the query execution.
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — Query starting date.
+- `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query starting time.
+- `event_time_microseconds` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query starting time with microseconds precision.
+- `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Start time of query execution.
+- `query_start_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Start time of query execution with microsecond precision.
+- `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Duration of query execution in milliseconds.
+- `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total number of rows read from all tables and table functions participated in query. It includes usual subqueries, subqueries for `IN` and `JOIN`. For distributed queries `read_rows` includes the total number of rows read at all replicas. Each replica sends it’s `read_rows` value, and the server-initiator of the query summarizes all received and local values. The cache volumes do not affect this value.
+- `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total number of bytes read from all tables and table functions participated in query. It includes usual subqueries, subqueries for `IN` and `JOIN`. For distributed queries `read_bytes` includes the total number of rows read at all replicas. Each replica sends it’s `read_bytes` value, and the server-initiator of the query summarizes all received and local values. The cache volumes do not affect this value.
+- `written_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` queries, the number of written rows. For other queries, the column value is 0.
+- `written_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` queries, the number of written bytes. For other queries, the column value is 0.
+- `result_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of rows in a result of the `SELECT` query, or a number of rows in the `INSERT` query.
+- `result_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — RAM volume in bytes used to store a query result.
+- `memory_usage` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Memory consumption by the query.
+- `current_database` ([String](../../sql-reference/data-types/string.md)) — Name of the current database.
+- `query` ([String](../../sql-reference/data-types/string.md)) — Query string.
+- `formatted_query` ([String](../../sql-reference/data-types/string.md)) — Formatted query string.
+- `normalized_query_hash` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Identical hash value without the values of literals for similar queries.
+- `query_kind` ([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)) — Type of the query.
+- `databases` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the databases present in the query.
+- `tables` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the tables present in the query.
+- `columns` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the columns present in the query.
+- `partitions` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the partitions present in the query.
+- `projections` ([String](../../sql-reference/data-types/string.md)) — Names of the projections used during the query execution.
+- `views` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the (materialized or live) views present in the query.
+- `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — Code of an exception.
+- `exception` ([String](../../sql-reference/data-types/string.md)) — Exception message.
+- `stack_trace` ([String](../../sql-reference/data-types/string.md)) — [Stack trace](https://en.wikipedia.org/wiki/Stack_trace). An empty string, if the query was completed successfully.
+- `is_initial_query` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Query type. Possible values:
+    - 1 — Query was initiated by the client.
+    - 0 — Query was initiated by another query as part of distributed query execution.
+- `user` ([String](../../sql-reference/data-types/string.md)) — Name of the user who initiated the current query.
+- `query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the query.
+- `address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address that was used to make the query.
+- `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The client port that was used to make the query.
+- `initial_user` ([String](../../sql-reference/data-types/string.md)) — Name of the user who ran the initial query (for distributed query execution).
+- `initial_query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the initial query (for distributed query execution).
+- `initial_address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address that the parent query was launched from.
+- `initial_port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The client port that was used to make the parent query.
+- `initial_query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Initial query starting time (for distributed query execution).
+- `initial_query_start_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Initial query starting time with microseconds precision (for distributed query execution).
+- `interface` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Interface that the query was initiated from. Possible values:
+    - 1 — TCP.
+    - 2 — HTTP.
+- `os_user` ([String](../../sql-reference/data-types/string.md)) — Operating system username who runs [clickhouse-client](../../interfaces/cli.md).
+- `client_hostname` ([String](../../sql-reference/data-types/string.md)) — Hostname of the client machine where the [clickhouse-client](../../interfaces/cli.md) or another TCP client is run.
+- `client_name` ([String](../../sql-reference/data-types/string.md)) — The [clickhouse-client](../../interfaces/cli.md) or another TCP client name.
+- `client_revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Revision of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
+- `client_version_major` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Major version of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
+- `client_version_minor` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Minor version of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
+- `client_version_patch` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Patch component of the [clickhouse-client](../../interfaces/cli.md) or another TCP client version.
+- `http_method` (UInt8) — HTTP method that initiated the query. Possible values:
+    - 0 — The query was launched from the TCP interface.
+    - 1 — `GET` method was used.
+    - 2 — `POST` method was used.
+- `http_user_agent` ([String](../../sql-reference/data-types/string.md)) — HTTP header `UserAgent` passed in the HTTP query.
+- `http_referer` ([String](../../sql-reference/data-types/string.md)) — HTTP header `Referer` passed in the HTTP query (contains an absolute or partial address of the page making the query).
+- `forwarded_for` ([String](../../sql-reference/data-types/string.md)) — HTTP header `X-Forwarded-For` passed in the HTTP query.
+- `quota_key` ([String](../../sql-reference/data-types/string.md)) — The `quota key` specified in the [quotas](../../operations/quotas.md) setting (see `keyed`).
+- `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ClickHouse revision.
+- `ProfileEvents` ([Map(String, UInt64)](../../sql-reference/data-types/map.md)) — ProfileEvents that measure different metrics. The description of them could be found in the table [system.events](../../operations/system-tables/events.md#system_tables-events)
+- `Settings` ([Map(String, String)](../../sql-reference/data-types/map.md)) — Settings that were changed when the client ran the query. To enable logging changes to settings, set the `log_query_settings` parameter to 1.
+- `log_comment` ([String](../../sql-reference/data-types/string.md)) — Log comment. It can be set to arbitrary string no longer than [max_query_size](../../operations/settings/settings.md#settings-max_query_size). An empty string if it is not defined.
+- `thread_ids` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Thread ids that are participating in query execution.
+- `used_aggregate_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `aggregate functions`, which were used during query execution.
+- `used_aggregate_function_combinators` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `aggregate functions combinators`, which were used during query execution.
+- `used_database_engines` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `database engines`, which were used during query execution.
+- `used_data_type_families` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `data type families`, which were used during query execution.
+- `used_dictionaries` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `dictionaries`, which were used during query execution.
+- `used_formats` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `formats`, which were used during query execution.
+- `used_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `functions`, which were used during query execution.
+- `used_storages` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `storages`, which were used during query execution.
+- `used_table_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `table functions`, which were used during query execution.
 
 **Example**
 
@@ -189,4 +190,4 @@ used_table_functions:                  []
 
 **See Also**
 
--   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — This table contains information about each query execution thread.
+- [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — This table contains information about each query execution thread.
diff --git a/docs/en/operations/system-tables/query_thread_log.md b/docs/en/operations/system-tables/query_thread_log.md
index d7bbaa63471..cdd23bb15db 100644
--- a/docs/en/operations/system-tables/query_thread_log.md
+++ b/docs/en/operations/system-tables/query_thread_log.md
@@ -18,52 +18,52 @@ You can use the [log_queries_probability](../../operations/settings/settings.md#
 
 Columns:
 
--   `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the thread has finished execution of the query.
--   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the thread has finished execution of the query.
--   `event_time_microsecinds` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the thread has finished execution of the query with microseconds precision.
--   `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Start time of query execution.
--   `query_start_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Start time of query execution with microsecond precision.
--   `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Duration of query execution.
--   `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of read rows.
--   `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of read bytes.
--   `written_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` queries, the number of written rows. For other queries, the column value is 0.
--   `written_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` queries, the number of written bytes. For other queries, the column value is 0.
--   `memory_usage` ([Int64](../../sql-reference/data-types/int-uint.md)) — The difference between the amount of allocated and freed memory in context of this thread.
--   `peak_memory_usage` ([Int64](../../sql-reference/data-types/int-uint.md)) — The maximum difference between the amount of allocated and freed memory in context of this thread.
--   `thread_name` ([String](../../sql-reference/data-types/string.md)) — Name of the thread.
--   `thread_number` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Internal thread ID.
--   `thread_id` ([Int32](../../sql-reference/data-types/int-uint.md)) — thread ID.
--   `master_thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — OS initial ID of initial thread.
--   `query` ([String](../../sql-reference/data-types/string.md)) — Query string.
--   `is_initial_query` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Query type. Possible values:
-    -   1 — Query was initiated by the client.
-    -   0 — Query was initiated by another query for distributed query execution.
--   `user` ([String](../../sql-reference/data-types/string.md)) — Name of the user who initiated the current query.
--   `query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the query.
--   `address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address that was used to make the query.
--   `port` ([UInt16](../../sql-reference/data-types/int-uint.md#uint-ranges)) — The client port that was used to make the query.
--   `initial_user` ([String](../../sql-reference/data-types/string.md)) — Name of the user who ran the initial query (for distributed query execution).
--   `initial_query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the initial query (for distributed query execution).
--   `initial_address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address that the parent query was launched from.
--   `initial_port` ([UInt16](../../sql-reference/data-types/int-uint.md#uint-ranges)) — The client port that was used to make the parent query.
--   `interface` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Interface that the query was initiated from. Possible values:
-    -   1 — TCP.
-    -   2 — HTTP.
--   `os_user` ([String](../../sql-reference/data-types/string.md)) — OS’s username who runs [clickhouse-client](../../interfaces/cli.md).
--   `client_hostname` ([String](../../sql-reference/data-types/string.md)) — Hostname of the client machine where the [clickhouse-client](../../interfaces/cli.md) or another TCP client is run.
--   `client_name` ([String](../../sql-reference/data-types/string.md)) — The [clickhouse-client](../../interfaces/cli.md) or another TCP client name.
--   `client_revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Revision of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
--   `client_version_major` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Major version of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
--   `client_version_minor` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Minor version of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
--   `client_version_patch` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Patch component of the [clickhouse-client](../../interfaces/cli.md) or another TCP client version.
--   `http_method` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — HTTP method that initiated the query. Possible values:
-    -   0 — The query was launched from the TCP interface.
-    -   1 — `GET` method was used.
-    -   2 — `POST` method was used.
--   `http_user_agent` ([String](../../sql-reference/data-types/string.md)) — The `UserAgent` header passed in the HTTP request.
--   `quota_key` ([String](../../sql-reference/data-types/string.md)) — The “quota key” specified in the [quotas](../../operations/quotas.md) setting (see `keyed`).
--   `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ClickHouse revision.
--   `ProfileEvents` ([Map(String, UInt64)](../../sql-reference/data-types/array.md)) — ProfileEvents that measure different metrics for this thread. The description of them could be found in the table [system.events](#system_tables-events).
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the thread has finished execution of the query.
+- `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the thread has finished execution of the query.
+- `event_time_microsecinds` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the thread has finished execution of the query with microseconds precision.
+- `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Start time of query execution.
+- `query_start_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Start time of query execution with microsecond precision.
+- `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Duration of query execution.
+- `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of read rows.
+- `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of read bytes.
+- `written_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` queries, the number of written rows. For other queries, the column value is 0.
+- `written_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` queries, the number of written bytes. For other queries, the column value is 0.
+- `memory_usage` ([Int64](../../sql-reference/data-types/int-uint.md)) — The difference between the amount of allocated and freed memory in context of this thread.
+- `peak_memory_usage` ([Int64](../../sql-reference/data-types/int-uint.md)) — The maximum difference between the amount of allocated and freed memory in context of this thread.
+- `thread_name` ([String](../../sql-reference/data-types/string.md)) — Name of the thread.
+- `thread_number` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Internal thread ID.
+- `thread_id` ([Int32](../../sql-reference/data-types/int-uint.md)) — thread ID.
+- `master_thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — OS initial ID of initial thread.
+- `query` ([String](../../sql-reference/data-types/string.md)) — Query string.
+- `is_initial_query` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Query type. Possible values:
+    - 1 — Query was initiated by the client.
+    - 0 — Query was initiated by another query for distributed query execution.
+- `user` ([String](../../sql-reference/data-types/string.md)) — Name of the user who initiated the current query.
+- `query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the query.
+- `address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address that was used to make the query.
+- `port` ([UInt16](../../sql-reference/data-types/int-uint.md#uint-ranges)) — The client port that was used to make the query.
+- `initial_user` ([String](../../sql-reference/data-types/string.md)) — Name of the user who ran the initial query (for distributed query execution).
+- `initial_query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the initial query (for distributed query execution).
+- `initial_address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address that the parent query was launched from.
+- `initial_port` ([UInt16](../../sql-reference/data-types/int-uint.md#uint-ranges)) — The client port that was used to make the parent query.
+- `interface` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Interface that the query was initiated from. Possible values:
+    - 1 — TCP.
+    - 2 — HTTP.
+- `os_user` ([String](../../sql-reference/data-types/string.md)) — OS’s username who runs [clickhouse-client](../../interfaces/cli.md).
+- `client_hostname` ([String](../../sql-reference/data-types/string.md)) — Hostname of the client machine where the [clickhouse-client](../../interfaces/cli.md) or another TCP client is run.
+- `client_name` ([String](../../sql-reference/data-types/string.md)) — The [clickhouse-client](../../interfaces/cli.md) or another TCP client name.
+- `client_revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Revision of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
+- `client_version_major` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Major version of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
+- `client_version_minor` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Minor version of the [clickhouse-client](../../interfaces/cli.md) or another TCP client.
+- `client_version_patch` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Patch component of the [clickhouse-client](../../interfaces/cli.md) or another TCP client version.
+- `http_method` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — HTTP method that initiated the query. Possible values:
+    - 0 — The query was launched from the TCP interface.
+    - 1 — `GET` method was used.
+    - 2 — `POST` method was used.
+- `http_user_agent` ([String](../../sql-reference/data-types/string.md)) — The `UserAgent` header passed in the HTTP request.
+- `quota_key` ([String](../../sql-reference/data-types/string.md)) — The “quota key” specified in the [quotas](../../operations/quotas.md) setting (see `keyed`).
+- `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ClickHouse revision.
+- `ProfileEvents` ([Map(String, UInt64)](../../sql-reference/data-types/array.md)) — ProfileEvents that measure different metrics for this thread. The description of them could be found in the table [system.events](#system_tables-events).
 
 **Example**
 
@@ -116,5 +116,5 @@ ProfileEvents:        {'Query':1,'SelectQuery':1,'ReadCompressedBytes':36,'Compr
 
 **See Also**
 
--   [system.query_log](../../operations/system-tables/query_log.md#system_tables-query_log) — Description of the `query_log` system table which contains common information about queries execution.
--   [system.query_views_log](../../operations/system-tables/query_views_log.md#system_tables-query_views_log) — This table contains information about each view executed during a query.
+- [system.query_log](../../operations/system-tables/query_log.md#system_tables-query_log) — Description of the `query_log` system table which contains common information about queries execution.
+- [system.query_views_log](../../operations/system-tables/query_views_log.md#system_tables-query_views_log) — This table contains information about each view executed during a query.
diff --git a/docs/en/operations/system-tables/query_views_log.md b/docs/en/operations/system-tables/query_views_log.md
index 55cab49e52f..e107e4f926c 100644
--- a/docs/en/operations/system-tables/query_views_log.md
+++ b/docs/en/operations/system-tables/query_views_log.md
@@ -18,33 +18,33 @@ You can use the [log_queries_probability](../../operations/settings/settings.md#
 
 Columns:
 
--   `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the last event of the view happened.
--   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the view finished execution.
--   `event_time_microseconds` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the view finished execution with microseconds precision.
--   `view_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Duration of view execution (sum of its stages) in milliseconds.
--   `initial_query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the initial query (for distributed query execution).
--   `view_name` ([String](../../sql-reference/data-types/string.md)) — Name of the view.
--   `view_uuid` ([UUID](../../sql-reference/data-types/uuid.md)) — UUID of the view.
--   `view_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Type of the view. Values:
-    -   `'Default' = 1` — [Default views](../../sql-reference/statements/create/view.md#normal). Should not appear in this log.
-    -   `'Materialized' = 2` — [Materialized views](../../sql-reference/statements/create/view.md#materialized).
-    -   `'Live' = 3` — [Live views](../../sql-reference/statements/create/view.md#live-view).
--   `view_query` ([String](../../sql-reference/data-types/string.md)) — The query executed by the view.
--   `view_target` ([String](../../sql-reference/data-types/string.md)) — The name of the view target table.
--   `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of read rows.
--   `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of read bytes.
--   `written_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of written rows.
--   `written_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of written bytes.
--   `peak_memory_usage` ([Int64](../../sql-reference/data-types/int-uint.md)) — The maximum difference between the amount of allocated and freed memory in context of this view.
--   `ProfileEvents` ([Map(String, UInt64)](../../sql-reference/data-types/array.md)) — ProfileEvents that measure different metrics. The description of them could be found in the table [system.events](../../operations/system-tables/events.md#system_tables-events).
--   `status` ([Enum8](../../sql-reference/data-types/enum.md)) — Status of the view. Values:
-    -   `'QueryStart' = 1` — Successful start the view execution. Should not appear.
-    -   `'QueryFinish' = 2` — Successful end of the view execution.
-    -   `'ExceptionBeforeStart' = 3` — Exception before the start of the view execution.
-    -   `'ExceptionWhileProcessing' = 4` — Exception during the view execution.
--   `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — Code of an exception.
--   `exception` ([String](../../sql-reference/data-types/string.md)) — Exception message.
--   `stack_trace` ([String](../../sql-reference/data-types/string.md)) — [Stack trace](https://en.wikipedia.org/wiki/Stack_trace). An empty string, if the query was completed successfully.
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the last event of the view happened.
+- `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the view finished execution.
+- `event_time_microseconds` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the view finished execution with microseconds precision.
+- `view_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Duration of view execution (sum of its stages) in milliseconds.
+- `initial_query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the initial query (for distributed query execution).
+- `view_name` ([String](../../sql-reference/data-types/string.md)) — Name of the view.
+- `view_uuid` ([UUID](../../sql-reference/data-types/uuid.md)) — UUID of the view.
+- `view_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Type of the view. Values:
+    - `'Default' = 1` — [Default views](../../sql-reference/statements/create/view.md#normal). Should not appear in this log.
+    - `'Materialized' = 2` — [Materialized views](../../sql-reference/statements/create/view.md#materialized).
+    - `'Live' = 3` — [Live views](../../sql-reference/statements/create/view.md#live-view).
+- `view_query` ([String](../../sql-reference/data-types/string.md)) — The query executed by the view.
+- `view_target` ([String](../../sql-reference/data-types/string.md)) — The name of the view target table.
+- `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of read rows.
+- `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of read bytes.
+- `written_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of written rows.
+- `written_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of written bytes.
+- `peak_memory_usage` ([Int64](../../sql-reference/data-types/int-uint.md)) — The maximum difference between the amount of allocated and freed memory in context of this view.
+- `ProfileEvents` ([Map(String, UInt64)](../../sql-reference/data-types/array.md)) — ProfileEvents that measure different metrics. The description of them could be found in the table [system.events](../../operations/system-tables/events.md#system_tables-events).
+- `status` ([Enum8](../../sql-reference/data-types/enum.md)) — Status of the view. Values:
+    - `'QueryStart' = 1` — Successful start the view execution. Should not appear.
+    - `'QueryFinish' = 2` — Successful end of the view execution.
+    - `'ExceptionBeforeStart' = 3` — Exception before the start of the view execution.
+    - `'ExceptionWhileProcessing' = 4` — Exception during the view execution.
+- `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — Code of an exception.
+- `exception` ([String](../../sql-reference/data-types/string.md)) — Exception message.
+- `stack_trace` ([String](../../sql-reference/data-types/string.md)) — [Stack trace](https://en.wikipedia.org/wiki/Stack_trace). An empty string, if the query was completed successfully.
 
 **Example**
 
@@ -83,5 +83,5 @@ stack_trace:
 
 **See Also**
 
--   [system.query_log](../../operations/system-tables/query_log.md#system_tables-query_log) — Description of the `query_log` system table which contains common information about queries execution.
--   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — This table contains information about each query execution thread.
+- [system.query_log](../../operations/system-tables/query_log.md#system_tables-query_log) — Description of the `query_log` system table which contains common information about queries execution.
+- [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — This table contains information about each query execution thread.
diff --git a/docs/en/operations/system-tables/quota_usage.md b/docs/en/operations/system-tables/quota_usage.md
index 7286ad9efa9..0dca7c525f2 100644
--- a/docs/en/operations/system-tables/quota_usage.md
+++ b/docs/en/operations/system-tables/quota_usage.md
@@ -30,4 +30,4 @@ Columns:
 
 ## See Also {#see-also}
 
--   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
+- [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
diff --git a/docs/en/operations/system-tables/quotas.md b/docs/en/operations/system-tables/quotas.md
index ca8fc4d166f..a9748a2b464 100644
--- a/docs/en/operations/system-tables/quotas.md
+++ b/docs/en/operations/system-tables/quotas.md
@@ -20,9 +20,9 @@ Columns:
 - `apply_to_all` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Logical value. It shows which users the quota is applied to. Values:
     - `0` — The quota applies to users specify in the `apply_to_list`.
     - `1` — The quota applies to all users except those listed in `apply_to_except`.
-- `apply_to_list` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of user names/[roles](../../operations/access-rights.md#role-management) that the quota should be applied to.
+- `apply_to_list` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of user names/[roles](../../guides/sre/user-management/index.md#role-management) that the quota should be applied to.
 - `apply_to_except` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of user names/roles that the quota should not apply to.
 
 ## See Also {#see-also}
 
--   [SHOW QUOTAS](../../sql-reference/statements/show.md#show-quotas-statement)
+- [SHOW QUOTAS](../../sql-reference/statements/show.md#show-quotas-statement)
diff --git a/docs/en/operations/system-tables/quotas_usage.md b/docs/en/operations/system-tables/quotas_usage.md
index e29ffff6b41..a04018ac2c8 100644
--- a/docs/en/operations/system-tables/quotas_usage.md
+++ b/docs/en/operations/system-tables/quotas_usage.md
@@ -33,4 +33,4 @@ Columns:
 
 ## See Also {#see-also}
 
--   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
+- [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
diff --git a/docs/en/operations/system-tables/replicas.md b/docs/en/operations/system-tables/replicas.md
index e711d9a7784..122a03ca629 100644
--- a/docs/en/operations/system-tables/replicas.md
+++ b/docs/en/operations/system-tables/replicas.md
@@ -50,6 +50,7 @@ last_queue_update:           2021-10-12 14:50:08
 absolute_delay:              99
 total_replicas:              5
 active_replicas:             5
+lost_part_count:             0
 last_queue_update_exception:
 zookeeper_exception:
 replica_is_active:           {'r1':1,'r2':1}
@@ -57,42 +58,43 @@ replica_is_active:           {'r1':1,'r2':1}
 
 Columns:
 
--   `database` (`String`) - Database name
--   `table` (`String`) - Table name
--   `engine` (`String`) - Table engine name
--   `is_leader` (`UInt8`) - Whether the replica is the leader.
+- `database` (`String`) - Database name
+- `table` (`String`) - Table name
+- `engine` (`String`) - Table engine name
+- `is_leader` (`UInt8`) - Whether the replica is the leader.
     Multiple replicas can be leaders at the same time. A replica can be prevented from becoming a leader using the `merge_tree` setting `replicated_can_become_leader`. The leaders are responsible for scheduling background merges.
     Note that writes can be performed to any replica that is available and has a session in ZK, regardless of whether it is a leader.
--   `can_become_leader` (`UInt8`) - Whether the replica can be a leader.
--   `is_readonly` (`UInt8`) - Whether the replica is in read-only mode.
+- `can_become_leader` (`UInt8`) - Whether the replica can be a leader.
+- `is_readonly` (`UInt8`) - Whether the replica is in read-only mode.
     This mode is turned on if the config does not have sections with ClickHouse Keeper, if an unknown error occurred when reinitializing sessions in ClickHouse Keeper, and during session reinitialization in ClickHouse Keeper.
--   `is_session_expired` (`UInt8`) - the session with ClickHouse Keeper has expired. Basically the same as `is_readonly`.
--   `future_parts` (`UInt32`) - The number of data parts that will appear as the result of INSERTs or merges that haven’t been done yet.
--   `parts_to_check` (`UInt32`) - The number of data parts in the queue for verification. A part is put in the verification queue if there is suspicion that it might be damaged.
--   `zookeeper_path` (`String`) - Path to table data in ClickHouse Keeper.
--   `replica_name` (`String`) - Replica name in ClickHouse Keeper. Different replicas of the same table have different names.
--   `replica_path` (`String`) - Path to replica data in ClickHouse Keeper. The same as concatenating ‘zookeeper_path/replicas/replica_path’.
--   `columns_version` (`Int32`) - Version number of the table structure. Indicates how many times ALTER was performed. If replicas have different versions, it means some replicas haven’t made all of the ALTERs yet.
--   `queue_size` (`UInt32`) - Size of the queue for operations waiting to be performed. Operations include inserting blocks of data, merges, and certain other actions. It usually coincides with `future_parts`.
--   `inserts_in_queue` (`UInt32`) - Number of inserts of blocks of data that need to be made. Insertions are usually replicated fairly quickly. If this number is large, it means something is wrong.
--   `merges_in_queue` (`UInt32`) - The number of merges waiting to be made. Sometimes merges are lengthy, so this value may be greater than zero for a long time.
--   `part_mutations_in_queue` (`UInt32`) - The number of mutations waiting to be made.
--   `queue_oldest_time` (`DateTime`) - If `queue_size` greater than 0, shows when the oldest operation was added to the queue.
--   `inserts_oldest_time` (`DateTime`) - See `queue_oldest_time`
--   `merges_oldest_time` (`DateTime`) - See `queue_oldest_time`
--   `part_mutations_oldest_time` (`DateTime`) - See `queue_oldest_time`
+- `is_session_expired` (`UInt8`) - the session with ClickHouse Keeper has expired. Basically the same as `is_readonly`.
+- `future_parts` (`UInt32`) - The number of data parts that will appear as the result of INSERTs or merges that haven’t been done yet.
+- `parts_to_check` (`UInt32`) - The number of data parts in the queue for verification. A part is put in the verification queue if there is suspicion that it might be damaged.
+- `zookeeper_path` (`String`) - Path to table data in ClickHouse Keeper.
+- `replica_name` (`String`) - Replica name in ClickHouse Keeper. Different replicas of the same table have different names.
+- `replica_path` (`String`) - Path to replica data in ClickHouse Keeper. The same as concatenating ‘zookeeper_path/replicas/replica_path’.
+- `columns_version` (`Int32`) - Version number of the table structure. Indicates how many times ALTER was performed. If replicas have different versions, it means some replicas haven’t made all of the ALTERs yet.
+- `queue_size` (`UInt32`) - Size of the queue for operations waiting to be performed. Operations include inserting blocks of data, merges, and certain other actions. It usually coincides with `future_parts`.
+- `inserts_in_queue` (`UInt32`) - Number of inserts of blocks of data that need to be made. Insertions are usually replicated fairly quickly. If this number is large, it means something is wrong.
+- `merges_in_queue` (`UInt32`) - The number of merges waiting to be made. Sometimes merges are lengthy, so this value may be greater than zero for a long time.
+- `part_mutations_in_queue` (`UInt32`) - The number of mutations waiting to be made.
+- `queue_oldest_time` (`DateTime`) - If `queue_size` greater than 0, shows when the oldest operation was added to the queue.
+- `inserts_oldest_time` (`DateTime`) - See `queue_oldest_time`
+- `merges_oldest_time` (`DateTime`) - See `queue_oldest_time`
+- `part_mutations_oldest_time` (`DateTime`) - See `queue_oldest_time`
 
 The next 4 columns have a non-zero value only where there is an active session with ZK.
 
--   `log_max_index` (`UInt64`) - Maximum entry number in the log of general activity.
--   `log_pointer` (`UInt64`) - Maximum entry number in the log of general activity that the replica copied to its execution queue, plus one. If `log_pointer` is much smaller than `log_max_index`, something is wrong.
--   `last_queue_update` (`DateTime`) - When the queue was updated last time.
--   `absolute_delay` (`UInt64`) - How big lag in seconds the current replica has.
--   `total_replicas` (`UInt8`) - The total number of known replicas of this table.
--   `active_replicas` (`UInt8`) - The number of replicas of this table that have a session in ClickHouse Keeper (i.e., the number of functioning replicas).
--   `last_queue_update_exception` (`String`) - When the queue contains broken entries. Especially important when ClickHouse breaks backward compatibility between versions and log entries written by newer versions aren't parseable by old versions.
--   `zookeeper_exception` (`String`) - The last exception message, got if the error happened when fetching the info from ClickHouse Keeper.
--   `replica_is_active` ([Map(String, UInt8)](../../sql-reference/data-types/map.md)) — Map between replica name and is replica active.
+- `log_max_index` (`UInt64`) - Maximum entry number in the log of general activity.
+- `log_pointer` (`UInt64`) - Maximum entry number in the log of general activity that the replica copied to its execution queue, plus one. If `log_pointer` is much smaller than `log_max_index`, something is wrong.
+- `last_queue_update` (`DateTime`) - When the queue was updated last time.
+- `absolute_delay` (`UInt64`) - How big lag in seconds the current replica has.
+- `total_replicas` (`UInt8`) - The total number of known replicas of this table.
+- `active_replicas` (`UInt8`) - The number of replicas of this table that have a session in ClickHouse Keeper (i.e., the number of functioning replicas).
+- `lost_part_count` (`UInt64`) - The number of data parts lost in the table by all replicas in total since table creation. Value is persisted in ClickHouse Keeper and can only increase.
+- `last_queue_update_exception` (`String`) - When the queue contains broken entries. Especially important when ClickHouse breaks backward compatibility between versions and log entries written by newer versions aren't parseable by old versions.
+- `zookeeper_exception` (`String`) - The last exception message, got if the error happened when fetching the info from ClickHouse Keeper.
+- `replica_is_active` ([Map(String, UInt8)](../../sql-reference/data-types/map.md)) — Map between replica name and is replica active.
 
 If you request all the columns, the table may work a bit slowly, since several reads from ClickHouse Keeper are made for each row.
 If you do not request the last 4 columns (log_max_index, log_pointer, total_replicas, active_replicas), the table works quickly.
diff --git a/docs/en/operations/system-tables/replicated_fetches.md b/docs/en/operations/system-tables/replicated_fetches.md
index 9bd068e3c58..0f9be7bac83 100644
--- a/docs/en/operations/system-tables/replicated_fetches.md
+++ b/docs/en/operations/system-tables/replicated_fetches.md
@@ -7,37 +7,37 @@ Contains information about currently running background fetches.
 
 Columns:
 
--   `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database.
+- `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database.
 
--   `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table.
+- `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table.
 
--   `elapsed` ([Float64](../../sql-reference/data-types/float.md)) — The time elapsed (in seconds) since showing currently running background fetches started.
+- `elapsed` ([Float64](../../sql-reference/data-types/float.md)) — The time elapsed (in seconds) since showing currently running background fetches started.
 
--   `progress` ([Float64](../../sql-reference/data-types/float.md)) — The percentage of completed work from 0 to 1.
+- `progress` ([Float64](../../sql-reference/data-types/float.md)) — The percentage of completed work from 0 to 1.
 
--   `result_part_name` ([String](../../sql-reference/data-types/string.md)) — The name of the part that will be formed as the result of showing currently running background fetches.
+- `result_part_name` ([String](../../sql-reference/data-types/string.md)) — The name of the part that will be formed as the result of showing currently running background fetches.
 
--   `result_part_path` ([String](../../sql-reference/data-types/string.md)) — Absolute path to the part that will be formed as the result of showing currently running background fetches.
+- `result_part_path` ([String](../../sql-reference/data-types/string.md)) — Absolute path to the part that will be formed as the result of showing currently running background fetches.
 
--   `partition_id` ([String](../../sql-reference/data-types/string.md)) — ID of the partition.
+- `partition_id` ([String](../../sql-reference/data-types/string.md)) — ID of the partition.
 
--   `total_size_bytes_compressed` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The total size (in bytes) of the compressed data in the result part.
+- `total_size_bytes_compressed` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The total size (in bytes) of the compressed data in the result part.
 
--   `bytes_read_compressed` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of compressed bytes read from the result part.
+- `bytes_read_compressed` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of compressed bytes read from the result part.
 
--   `source_replica_path` ([String](../../sql-reference/data-types/string.md)) — Absolute path to the source replica.
+- `source_replica_path` ([String](../../sql-reference/data-types/string.md)) — Absolute path to the source replica.
 
--   `source_replica_hostname` ([String](../../sql-reference/data-types/string.md)) — Hostname of the source replica.
+- `source_replica_hostname` ([String](../../sql-reference/data-types/string.md)) — Hostname of the source replica.
 
--   `source_replica_port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — Port number of the source replica.
+- `source_replica_port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — Port number of the source replica.
 
--   `interserver_scheme` ([String](../../sql-reference/data-types/string.md)) — Name of the interserver scheme.
+- `interserver_scheme` ([String](../../sql-reference/data-types/string.md)) — Name of the interserver scheme.
 
--   `URI` ([String](../../sql-reference/data-types/string.md)) — Uniform resource identifier.
+- `URI` ([String](../../sql-reference/data-types/string.md)) — Uniform resource identifier.
 
--   `to_detached` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The flag indicates whether the currently running background fetch is being performed using the `TO DETACHED` expression.
+- `to_detached` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The flag indicates whether the currently running background fetch is being performed using the `TO DETACHED` expression.
 
--   `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
+- `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
 
 **Example**
 
@@ -68,4 +68,4 @@ thread_id:                   54
 
 **See Also**
 
--   [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system.md/#managing-replicatedmergetree-tables)
+- [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system.md/#managing-replicatedmergetree-tables)
diff --git a/docs/en/operations/system-tables/replication_queue.md b/docs/en/operations/system-tables/replication_queue.md
index dcc61b8e6a7..dd8f6328688 100644
--- a/docs/en/operations/system-tables/replication_queue.md
+++ b/docs/en/operations/system-tables/replication_queue.md
@@ -7,55 +7,55 @@ Contains information about tasks from replication queues stored in ClickHouse Ke
 
 Columns:
 
--   `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database.
+- `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database.
 
--   `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table.
+- `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table.
 
--   `replica_name` ([String](../../sql-reference/data-types/string.md)) — Replica name in ClickHouse Keeper. Different replicas of the same table have different names.
+- `replica_name` ([String](../../sql-reference/data-types/string.md)) — Replica name in ClickHouse Keeper. Different replicas of the same table have different names.
 
--   `position` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Position of the task in the queue.
+- `position` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Position of the task in the queue.
 
--   `node_name` ([String](../../sql-reference/data-types/string.md)) — Node name in ClickHouse Keeper.
+- `node_name` ([String](../../sql-reference/data-types/string.md)) — Node name in ClickHouse Keeper.
 
--   `type` ([String](../../sql-reference/data-types/string.md)) — Type of the task in the queue, one of:
+- `type` ([String](../../sql-reference/data-types/string.md)) — Type of the task in the queue, one of:
 
-    -   `GET_PART` — Get the part from another replica.
-    -   `ATTACH_PART` — Attach the part, possibly from our own replica (if found in the `detached` folder). You may think of it as a `GET_PART` with some optimizations as they're nearly identical.
-    -   `MERGE_PARTS` — Merge the parts.
-    -   `DROP_RANGE` — Delete the parts in the specified partition in the specified number range.
-    -   `CLEAR_COLUMN` — NOTE: Deprecated. Drop specific column from specified partition.
-    -   `CLEAR_INDEX` — NOTE: Deprecated. Drop specific index from specified partition.
-    -   `REPLACE_RANGE` — Drop a certain range of parts and replace them with new ones.
-    -   `MUTATE_PART` — Apply one or several mutations to the part.
-    -   `ALTER_METADATA` — Apply alter modification according to global /metadata and /columns paths.
+    - `GET_PART` — Get the part from another replica.
+    - `ATTACH_PART` — Attach the part, possibly from our own replica (if found in the `detached` folder). You may think of it as a `GET_PART` with some optimizations as they're nearly identical.
+    - `MERGE_PARTS` — Merge the parts.
+    - `DROP_RANGE` — Delete the parts in the specified partition in the specified number range.
+    - `CLEAR_COLUMN` — NOTE: Deprecated. Drop specific column from specified partition.
+    - `CLEAR_INDEX` — NOTE: Deprecated. Drop specific index from specified partition.
+    - `REPLACE_RANGE` — Drop a certain range of parts and replace them with new ones.
+    - `MUTATE_PART` — Apply one or several mutations to the part.
+    - `ALTER_METADATA` — Apply alter modification according to global /metadata and /columns paths.
 
--   `create_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Date and time when the task was submitted for execution.
+- `create_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Date and time when the task was submitted for execution.
 
--   `required_quorum` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of replicas waiting for the task to complete with confirmation of completion. This column is only relevant for the `GET_PARTS` task.
+- `required_quorum` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of replicas waiting for the task to complete with confirmation of completion. This column is only relevant for the `GET_PARTS` task.
 
--   `source_replica` ([String](../../sql-reference/data-types/string.md)) — Name of the source replica.
+- `source_replica` ([String](../../sql-reference/data-types/string.md)) — Name of the source replica.
 
--   `new_part_name` ([String](../../sql-reference/data-types/string.md)) — Name of the new part.
+- `new_part_name` ([String](../../sql-reference/data-types/string.md)) — Name of the new part.
 
--   `parts_to_merge` ([Array](../../sql-reference/data-types/array.md) ([String](../../sql-reference/data-types/string.md))) — Names of parts to merge or update.
+- `parts_to_merge` ([Array](../../sql-reference/data-types/array.md) ([String](../../sql-reference/data-types/string.md))) — Names of parts to merge or update.
 
--   `is_detach` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The flag indicates whether the `DETACH_PARTS` task is in the queue.
+- `is_detach` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The flag indicates whether the `DETACH_PARTS` task is in the queue.
 
--   `is_currently_executing` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The flag indicates whether a specific task is being performed right now.
+- `is_currently_executing` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The flag indicates whether a specific task is being performed right now.
 
--   `num_tries` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of failed attempts to complete the task.
+- `num_tries` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of failed attempts to complete the task.
 
--   `last_exception` ([String](../../sql-reference/data-types/string.md)) — Text message about the last error that occurred (if any).
+- `last_exception` ([String](../../sql-reference/data-types/string.md)) — Text message about the last error that occurred (if any).
 
--   `last_attempt_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Date and time when the task was last attempted.
+- `last_attempt_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Date and time when the task was last attempted.
 
--   `num_postponed` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of postponed tasks.
+- `num_postponed` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of postponed tasks.
 
--   `postpone_reason` ([String](../../sql-reference/data-types/string.md)) — The reason why the task was postponed.
+- `postpone_reason` ([String](../../sql-reference/data-types/string.md)) — The reason why the task was postponed.
 
--   `last_postpone_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Date and time when the task was last postponed.
+- `last_postpone_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Date and time when the task was last postponed.
 
--   `merge_type` ([String](../../sql-reference/data-types/string.md)) — Type of the current merge. Empty if it's a mutation.
+- `merge_type` ([String](../../sql-reference/data-types/string.md)) — Type of the current merge. Empty if it's a mutation.
 
 **Example**
 
@@ -89,4 +89,4 @@ last_postpone_time:     1970-01-01 03:00:00
 
 **See Also**
 
--   [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system.md#query-language-system-replicated)
+- [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system.md#query-language-system-replicated)
diff --git a/docs/en/operations/system-tables/role-grants.md b/docs/en/operations/system-tables/role-grants.md
index 22f69fce7fb..ffe1f1d74e2 100644
--- a/docs/en/operations/system-tables/role-grants.md
+++ b/docs/en/operations/system-tables/role-grants.md
@@ -14,9 +14,9 @@ Columns:
 - `granted_role_name` ([String](../../sql-reference/data-types/string.md)) — Name of role granted to the `role_name` role. To grant one role to another one use `GRANT role1 TO role2`.
 
 - `granted_role_is_default` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Flag that shows whether `granted_role` is a default role. Possible values:
-    -   1 — `granted_role` is a default role.
-    -   0 — `granted_role` is not a default role.
+    - 1 — `granted_role` is a default role.
+    - 0 — `granted_role` is not a default role.
 
 - `with_admin_option` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Flag that shows whether `granted_role` is a role with [ADMIN OPTION](../../sql-reference/statements/grant.md#admin-option-privilege) privilege. Possible values:
-    -   1 — The role has `ADMIN OPTION` privilege.
-    -   0 — The role without `ADMIN OPTION` privilege.
+    - 1 — The role has `ADMIN OPTION` privilege.
+    - 0 — The role without `ADMIN OPTION` privilege.
diff --git a/docs/en/operations/system-tables/roles.md b/docs/en/operations/system-tables/roles.md
index 729c98c89f3..1614e0580b8 100644
--- a/docs/en/operations/system-tables/roles.md
+++ b/docs/en/operations/system-tables/roles.md
@@ -3,7 +3,7 @@ slug: /en/operations/system-tables/roles
 ---
 # roles
 
-Contains information about configured [roles](../../operations/access-rights.md#role-management).
+Contains information about configured [roles](../../guides/sre/user-management/index.md#role-management).
 
 Columns:
 
@@ -13,4 +13,4 @@ Columns:
 
 ## See Also {#see-also}
 
--   [SHOW ROLES](../../sql-reference/statements/show.md#show-roles-statement)
+- [SHOW ROLES](../../sql-reference/statements/show.md#show-roles-statement)
diff --git a/docs/en/operations/system-tables/row_policies.md b/docs/en/operations/system-tables/row_policies.md
index b21a9500825..e92ba1ece74 100644
--- a/docs/en/operations/system-tables/row_policies.md
+++ b/docs/en/operations/system-tables/row_policies.md
@@ -6,30 +6,30 @@ slug: /en/operations/system-tables/row_policies
 Contains filters for one particular table, as well as a list of roles and/or users which should use this row policy.
 
 Columns:
--    `name` ([String](../../sql-reference/data-types/string.md)) — Name of a row policy.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Name of a row policy.
 
--    `short_name` ([String](../../sql-reference/data-types/string.md)) — Short name of a row policy. Names of row policies are compound, for example: myfilter ON mydb.mytable. Here "myfilter ON mydb.mytable" is the name of the row policy, "myfilter" is it's short name.
+- `short_name` ([String](../../sql-reference/data-types/string.md)) — Short name of a row policy. Names of row policies are compound, for example: myfilter ON mydb.mytable. Here "myfilter ON mydb.mytable" is the name of the row policy, "myfilter" is it's short name.
 
--    `database` ([String](../../sql-reference/data-types/string.md)) — Database name.
+- `database` ([String](../../sql-reference/data-types/string.md)) — Database name.
 
--    `table` ([String](../../sql-reference/data-types/string.md)) — Table name.
+- `table` ([String](../../sql-reference/data-types/string.md)) — Table name. Empty if policy for database.
 
--    `id` ([UUID](../../sql-reference/data-types/uuid.md)) — Row policy ID.
+- `id` ([UUID](../../sql-reference/data-types/uuid.md)) — Row policy ID.
 
--    `storage` ([String](../../sql-reference/data-types/string.md)) — Name of the directory where the row policy is stored.
+- `storage` ([String](../../sql-reference/data-types/string.md)) — Name of the directory where the row policy is stored.
 
--    `select_filter` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Condition which is used to filter rows.
+- `select_filter` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Condition which is used to filter rows.
 
--    `is_restrictive` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether the row policy restricts access to rows, see [CREATE ROW POLICY](../../sql-reference/statements/create/row-policy.md#create-row-policy-as). Value:
+- `is_restrictive` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether the row policy restricts access to rows, see [CREATE ROW POLICY](../../sql-reference/statements/create/row-policy.md#create-row-policy-as). Value:
 - `0` — The row policy is defined with `AS PERMISSIVE` clause.
 - `1` — The row policy is defined with `AS RESTRICTIVE` clause.
 
--    `apply_to_all` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows that the row policies set for all roles and/or users.
+- `apply_to_all` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows that the row policies set for all roles and/or users.
 
--    `apply_to_list` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of the roles and/or users to which the row policies is applied.
+- `apply_to_list` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of the roles and/or users to which the row policies is applied.
 
--    `apply_to_except` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — The row policies is applied to all roles and/or users excepting of the listed ones.
+- `apply_to_except` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — The row policies is applied to all roles and/or users excepting of the listed ones.
 
 ## See Also {#see-also}
 
--   [SHOW POLICIES](../../sql-reference/statements/show.md#show-policies-statement)
+- [SHOW POLICIES](../../sql-reference/statements/show.md#show-policies-statement)
diff --git a/docs/en/operations/system-tables/schema_inference_cache.md b/docs/en/operations/system-tables/schema_inference_cache.md
index 8a65f29bc30..8624ee9cec9 100644
--- a/docs/en/operations/system-tables/schema_inference_cache.md
+++ b/docs/en/operations/system-tables/schema_inference_cache.md
@@ -66,4 +66,4 @@ schema:                 id Nullable(Float64), age Nullable(Float64), name Nullab
 
 
 **See also**
--   [Automatic schema inference from input data](/docs/en/interfaces/schema-inference.md)
+- [Automatic schema inference from input data](/docs/en/interfaces/schema-inference.md)
diff --git a/docs/en/operations/system-tables/server_settings.md b/docs/en/operations/system-tables/server_settings.md
index e1bf8c3d63f..3085b1acaf4 100644
--- a/docs/en/operations/system-tables/server_settings.md
+++ b/docs/en/operations/system-tables/server_settings.md
@@ -8,12 +8,12 @@ Currently, the table shows only settings from the first layer of `config.xml` an
 
 Columns:
 
--   `name` ([String](../../sql-reference/data-types/string.md)) — Server setting name.
--   `value` ([String](../../sql-reference/data-types/string.md)) — Server setting value.
--   `default` ([String](../../sql-reference/data-types/string.md)) — Server setting default value.
--   `changed` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether a setting was specified in `config.xml`
--   `description` ([String](../../sql-reference/data-types/string.md)) — Short server setting description.
--   `type` ([String](../../sql-reference/data-types/string.md)) — Server setting value type.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Server setting name.
+- `value` ([String](../../sql-reference/data-types/string.md)) — Server setting value.
+- `default` ([String](../../sql-reference/data-types/string.md)) — Server setting default value.
+- `changed` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether a setting was specified in `config.xml`
+- `description` ([String](../../sql-reference/data-types/string.md)) — Short server setting description.
+- `type` ([String](../../sql-reference/data-types/string.md)) — Server setting value type.
 
 **Example**
 
@@ -47,6 +47,6 @@ SELECT * FROM system.server_settings WHERE changed AND name='max_thread_pool_siz
 
 **See also**
 
--   [Settings](../../operations/system-tables/settings.md)
--   [Configuration Files](../../operations/configuration-files.md)
--   [Server Settings](../../operations/server-configuration-parameters/settings.md)
+- [Settings](../../operations/system-tables/settings.md)
+- [Configuration Files](../../operations/configuration-files.md)
+- [Server Settings](../../operations/server-configuration-parameters/settings.md)
diff --git a/docs/en/operations/system-tables/session_log.md b/docs/en/operations/system-tables/session_log.md
index cdf86b57ef6..661d34677e4 100644
--- a/docs/en/operations/system-tables/session_log.md
+++ b/docs/en/operations/system-tables/session_log.md
@@ -7,42 +7,42 @@ Contains information about all successful and failed login and logout events.
 
 Columns:
 
--   `type` ([Enum8](../../sql-reference/data-types/enum.md)) — Login/logout result. Possible values:
-    -   `LoginFailure` — Login error.
-    -   `LoginSuccess` — Successful login.
-    -   `Logout` — Logout from the system.
--   `auth_id` ([UUID](../../sql-reference/data-types/uuid.md)) — Authentication ID, which is a UUID that is automatically generated each time user logins.
--   `session_id` ([String](../../sql-reference/data-types/string.md)) — Session ID that is passed by client via [HTTP](../../interfaces/http.md) interface.
--   `event_date` ([Date](../../sql-reference/data-types/date.md)) — Login/logout date.
--   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Login/logout time.
--   `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Login/logout starting time with microseconds precision.
--   `user` ([String](../../sql-reference/data-types/string.md)) — User name.
--   `auth_type` ([Enum8](../../sql-reference/data-types/enum.md)) — The authentication type. Possible values:
-    -   `NO_PASSWORD`
-    -   `PLAINTEXT_PASSWORD`
-    -   `SHA256_PASSWORD`
-    -   `DOUBLE_SHA1_PASSWORD`
-    -   `LDAP`
-    -   `KERBEROS`
-    -   `SSL_CERTIFICATE`
--   `profiles` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — The list of profiles set for all roles and/or users.
--   `roles` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — The list of roles to which the profile is applied.
--   `settings` ([Array](../../sql-reference/data-types/array.md)([Tuple](../../sql-reference/data-types/tuple.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md), [String](../../sql-reference/data-types/string.md)))) — Settings that were changed when the client logged in/out.
--   `client_address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — The IP address that was used to log in/out.
--   `client_port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The client port that was used to log in/out.
--   `interface` ([Enum8](../../sql-reference/data-types/enum.md)) — The interface from which the login was initiated. Possible values:
-    -   `TCP`
-    -   `HTTP`
-    -   `gRPC`
-    -   `MySQL`
-    -   `PostgreSQL`
--   `client_hostname` ([String](../../sql-reference/data-types/string.md)) — The hostname of the client machine where the [clickhouse-client](../../interfaces/cli.md) or another TCP client is run.
--   `client_name` ([String](../../sql-reference/data-types/string.md)) — The `clickhouse-client` or another TCP client name.
--   `client_revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Revision of the `clickhouse-client` or another TCP client.
--   `client_version_major` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The major version of the `clickhouse-client` or another TCP client.
--   `client_version_minor` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The minor version of the `clickhouse-client` or another TCP client.
--   `client_version_patch` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Patch component of the `clickhouse-client` or another TCP client version.
--   `failure_reason` ([String](../../sql-reference/data-types/string.md)) — The exception message containing the reason for the login/logout failure.
+- `type` ([Enum8](../../sql-reference/data-types/enum.md)) — Login/logout result. Possible values:
+    - `LoginFailure` — Login error.
+    - `LoginSuccess` — Successful login.
+    - `Logout` — Logout from the system.
+- `auth_id` ([UUID](../../sql-reference/data-types/uuid.md)) — Authentication ID, which is a UUID that is automatically generated each time user logins.
+- `session_id` ([String](../../sql-reference/data-types/string.md)) — Session ID that is passed by client via [HTTP](../../interfaces/http.md) interface.
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — Login/logout date.
+- `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Login/logout time.
+- `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Login/logout starting time with microseconds precision.
+- `user` ([String](../../sql-reference/data-types/string.md)) — User name.
+- `auth_type` ([Enum8](../../sql-reference/data-types/enum.md)) — The authentication type. Possible values:
+    - `NO_PASSWORD`
+    - `PLAINTEXT_PASSWORD`
+    - `SHA256_PASSWORD`
+    - `DOUBLE_SHA1_PASSWORD`
+    - `LDAP`
+    - `KERBEROS`
+    - `SSL_CERTIFICATE`
+- `profiles` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — The list of profiles set for all roles and/or users.
+- `roles` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — The list of roles to which the profile is applied.
+- `settings` ([Array](../../sql-reference/data-types/array.md)([Tuple](../../sql-reference/data-types/tuple.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md), [String](../../sql-reference/data-types/string.md)))) — Settings that were changed when the client logged in/out.
+- `client_address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — The IP address that was used to log in/out.
+- `client_port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The client port that was used to log in/out.
+- `interface` ([Enum8](../../sql-reference/data-types/enum.md)) — The interface from which the login was initiated. Possible values:
+    - `TCP`
+    - `HTTP`
+    - `gRPC`
+    - `MySQL`
+    - `PostgreSQL`
+- `client_hostname` ([String](../../sql-reference/data-types/string.md)) — The hostname of the client machine where the [clickhouse-client](../../interfaces/cli.md) or another TCP client is run.
+- `client_name` ([String](../../sql-reference/data-types/string.md)) — The `clickhouse-client` or another TCP client name.
+- `client_revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Revision of the `clickhouse-client` or another TCP client.
+- `client_version_major` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The major version of the `clickhouse-client` or another TCP client.
+- `client_version_minor` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The minor version of the `clickhouse-client` or another TCP client.
+- `client_version_patch` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Patch component of the `clickhouse-client` or another TCP client version.
+- `failure_reason` ([String](../../sql-reference/data-types/string.md)) — The exception message containing the reason for the login/logout failure.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/settings.md b/docs/en/operations/system-tables/settings.md
index a3dfa937abe..afae45077cc 100644
--- a/docs/en/operations/system-tables/settings.md
+++ b/docs/en/operations/system-tables/settings.md
@@ -7,16 +7,16 @@ Contains information about session settings for current user.
 
 Columns:
 
--   `name` ([String](../../sql-reference/data-types/string.md)) — Setting name.
--   `value` ([String](../../sql-reference/data-types/string.md)) — Setting value.
--   `changed` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether a setting is changed from its default value.
--   `description` ([String](../../sql-reference/data-types/string.md)) — Short setting description.
--   `min` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Minimum value of the setting, if any is set via [constraints](../../operations/settings/constraints-on-settings.md#constraints-on-settings). If the setting has no minimum value, contains [NULL](../../sql-reference/syntax.md#null-literal).
--   `max` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Maximum value of the setting, if any is set via [constraints](../../operations/settings/constraints-on-settings.md#constraints-on-settings). If the setting has no maximum value, contains [NULL](../../sql-reference/syntax.md#null-literal).
--   `readonly` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether the current user can change the setting:
-    -   `0` — Current user can change the setting.
-    -   `1` — Current user can’t change the setting.
--   `default` ([String](../../sql-reference/data-types/string.md)) — Setting default value.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Setting name.
+- `value` ([String](../../sql-reference/data-types/string.md)) — Setting value.
+- `changed` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether a setting is changed from its default value.
+- `description` ([String](../../sql-reference/data-types/string.md)) — Short setting description.
+- `min` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Minimum value of the setting, if any is set via [constraints](../../operations/settings/constraints-on-settings.md#constraints-on-settings). If the setting has no minimum value, contains [NULL](../../sql-reference/syntax.md#null-literal).
+- `max` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Maximum value of the setting, if any is set via [constraints](../../operations/settings/constraints-on-settings.md#constraints-on-settings). If the setting has no maximum value, contains [NULL](../../sql-reference/syntax.md#null-literal).
+- `readonly` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether the current user can change the setting:
+    - `0` — Current user can change the setting.
+    - `1` — Current user can’t change the setting.
+- `default` ([String](../../sql-reference/data-types/string.md)) — Setting default value.
 
 **Example**
 
@@ -38,8 +38,8 @@ WHERE name LIKE '%min_i%'
 
 Using of `WHERE changed` can be useful, for example, when you want to check:
 
--   Whether settings in configuration files are loaded correctly and are in use.
--   Settings that changed in the current session.
+- Whether settings in configuration files are loaded correctly and are in use.
+- Settings that changed in the current session.
 
 <!-- -->
 
@@ -49,7 +49,7 @@ SELECT * FROM system.settings WHERE changed AND name='load_balancing'
 
 **See also**
 
--   [Settings](../../operations/settings/index.md#session-settings-intro)
--   [Permissions for Queries](../../operations/settings/permissions-for-queries.md#settings_readonly)
--   [Constraints on Settings](../../operations/settings/constraints-on-settings.md)
--   [SHOW SETTINGS](../../sql-reference/statements/show.md#show-settings) statement
+- [Settings](../../operations/settings/index.md#session-settings-intro)
+- [Permissions for Queries](../../operations/settings/permissions-for-queries.md#settings_readonly)
+- [Constraints on Settings](../../operations/settings/constraints-on-settings.md)
+- [SHOW SETTINGS](../../sql-reference/statements/show.md#show-settings) statement
diff --git a/docs/en/operations/system-tables/settings_profile_elements.md b/docs/en/operations/system-tables/settings_profile_elements.md
index f4c77dfc76a..c1fc562e1e9 100644
--- a/docs/en/operations/system-tables/settings_profile_elements.md
+++ b/docs/en/operations/system-tables/settings_profile_elements.md
@@ -10,22 +10,22 @@ Describes the content of the settings profile:
 - Parent settings profiles.
 
 Columns:
--    `profile_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Setting profile name.
+- `profile_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Setting profile name.
 
--    `user_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — User name.
+- `user_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — User name.
 
--    `role_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Role name.
+- `role_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Role name.
 
--    `index` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Sequential number of the settings profile element.
+- `index` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Sequential number of the settings profile element.
 
--    `setting_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Setting name.
+- `setting_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Setting name.
 
--    `value` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Setting value.
+- `value` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Setting value.
 
--    `min` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — The minimum value of the setting. `NULL` if not set.
+- `min` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — The minimum value of the setting. `NULL` if not set.
 
--    `max` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — The maximum value of the setting. NULL if not set.
+- `max` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — The maximum value of the setting. NULL if not set.
 
--    `readonly` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges))) — Profile that allows only read queries.
+- `readonly` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges))) — Profile that allows only read queries.
 
--    `inherit_profile` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — A parent profile for this setting profile. `NULL` if not set. Setting profile will inherit all the settings' values and constraints (`min`, `max`, `readonly`) from its parent profiles.
+- `inherit_profile` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — A parent profile for this setting profile. `NULL` if not set. Setting profile will inherit all the settings' values and constraints (`min`, `max`, `readonly`) from its parent profiles.
diff --git a/docs/en/operations/system-tables/settings_profiles.md b/docs/en/operations/system-tables/settings_profiles.md
index ef9068ae1b8..635a4e47dfd 100644
--- a/docs/en/operations/system-tables/settings_profiles.md
+++ b/docs/en/operations/system-tables/settings_profiles.md
@@ -6,20 +6,20 @@ slug: /en/operations/system-tables/settings_profiles
 Contains properties of configured setting profiles.
 
 Columns:
--    `name` ([String](../../sql-reference/data-types/string.md)) — Setting profile name.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Setting profile name.
 
--    `id` ([UUID](../../sql-reference/data-types/uuid.md)) — Setting profile ID.
+- `id` ([UUID](../../sql-reference/data-types/uuid.md)) — Setting profile ID.
 
--    `storage` ([String](../../sql-reference/data-types/string.md)) — Path to the storage of setting profiles. Configured in the `access_control_path` parameter.
+- `storage` ([String](../../sql-reference/data-types/string.md)) — Path to the storage of setting profiles. Configured in the `access_control_path` parameter.
 
--    `num_elements` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of elements for this profile in the `system.settings_profile_elements` table.
+- `num_elements` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of elements for this profile in the `system.settings_profile_elements` table.
 
--    `apply_to_all` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows that the settings profile set for all roles and/or users.
+- `apply_to_all` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows that the settings profile set for all roles and/or users.
 
--    `apply_to_list` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of the roles and/or users to which the setting profile is applied.
+- `apply_to_list` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of the roles and/or users to which the setting profile is applied.
 
--    `apply_to_except` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — The setting profile is applied to all roles and/or users excepting of the listed ones.
+- `apply_to_except` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — The setting profile is applied to all roles and/or users excepting of the listed ones.
 
 ## See Also {#see-also}
 
--   [SHOW PROFILES](../../sql-reference/statements/show.md#show-profiles-statement)
+- [SHOW PROFILES](../../sql-reference/statements/show.md#show-profiles-statement)
diff --git a/docs/en/operations/system-tables/stack_trace.md b/docs/en/operations/system-tables/stack_trace.md
index c64cf067220..52ee7088597 100644
--- a/docs/en/operations/system-tables/stack_trace.md
+++ b/docs/en/operations/system-tables/stack_trace.md
@@ -9,10 +9,14 @@ To analyze stack frames, use the `addressToLine`, `addressToLineWithInlines`, `a
 
 Columns:
 
--   `thread_name` ([String](../../sql-reference/data-types/string.md)) — Thread name.
--   `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
--   `query_id` ([String](../../sql-reference/data-types/string.md)) — Query identifier that can be used to get details about a query that was running from the [query_log](../system-tables/query_log.md) system table.
--   `trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — A [stack trace](https://en.wikipedia.org/wiki/Stack_trace) which represents a list of physical addresses where the called methods are stored.
+- `thread_name` ([String](../../sql-reference/data-types/string.md)) — Thread name.
+- `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
+- `query_id` ([String](../../sql-reference/data-types/string.md)) — Query identifier that can be used to get details about a query that was running from the [query_log](../system-tables/query_log.md) system table.
+- `trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — A [stack trace](https://en.wikipedia.org/wiki/Stack_trace) which represents a list of physical addresses where the called methods are stored.
+
+:::tip
+Check out the Knowledge Base for some handy queries, including [how to see what threads are currently running](https://clickhouse.com/docs/knowledgebase/find-expensive-queries) and [useful queries for troubleshooting](https://clickhouse.com/docs/knowledgebase/useful-queries-for-troubleshooting).
+:::
 
 **Example**
 
@@ -88,7 +92,7 @@ res:       /lib/x86_64-linux-gnu/libc-2.27.so
 
 **See Also**
 
--   [Introspection Functions](../../sql-reference/functions/introspection.md) — Which introspection functions are available and how to use them.
--   [system.trace_log](../system-tables/trace_log.md) — Contains stack traces collected by the sampling query profiler.
--   [arrayMap](../../sql-reference/functions/array-functions.md#array-map) — Description and usage example of the `arrayMap` function.
--   [arrayFilter](../../sql-reference/functions/array-functions.md#array-filter) — Description and usage example of the `arrayFilter` function.
+- [Introspection Functions](../../sql-reference/functions/introspection.md) — Which introspection functions are available and how to use them.
+- [system.trace_log](../system-tables/trace_log.md) — Contains stack traces collected by the sampling query profiler.
+- [arrayMap](../../sql-reference/functions/array-functions.md#array-map) — Description and usage example of the `arrayMap` function.
+- [arrayFilter](../../sql-reference/functions/array-functions.md#array-filter) — Description and usage example of the `arrayFilter` function.
diff --git a/docs/en/operations/system-tables/storage_policies.md b/docs/en/operations/system-tables/storage_policies.md
index 966b677c7e3..5c7184b2b22 100644
--- a/docs/en/operations/system-tables/storage_policies.md
+++ b/docs/en/operations/system-tables/storage_policies.md
@@ -7,12 +7,20 @@ Contains information about storage policies and volumes defined in the [server c
 
 Columns:
 
--   `policy_name` ([String](../../sql-reference/data-types/string.md)) — Name of the storage policy.
--   `volume_name` ([String](../../sql-reference/data-types/string.md)) — Volume name defined in the storage policy.
--   `volume_priority` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Volume order number in the configuration, the data fills the volumes according this priority, i.e. data during inserts and merges is written to volumes with a lower priority (taking into account other rules: TTL, `max_data_part_size`, `move_factor`).
--   `disks` ([Array(String)](../../sql-reference/data-types/array.md)) — Disk names, defined in the storage policy.
--   `max_data_part_size` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Maximum size of a data part that can be stored on volume disks (0 — no limit).
--   `move_factor` ([Float64](../../sql-reference/data-types/float.md)) — Ratio of free disk space. When the ratio exceeds the value of configuration parameter, ClickHouse start to move data to the next volume in order.
--   `prefer_not_to_merge` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Value of the `prefer_not_to_merge` setting. When this setting is enabled, merging data on this volume is not allowed. This allows controlling how ClickHouse works with slow disks.
+- `policy_name` ([String](../../sql-reference/data-types/string.md)) — Name of the storage policy.
+- `volume_name` ([String](../../sql-reference/data-types/string.md)) — Volume name defined in the storage policy.
+- `volume_priority` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Volume order number in the configuration, the data fills the volumes according this priority, i.e. data during inserts and merges is written to volumes with a lower priority (taking into account other rules: TTL, `max_data_part_size`, `move_factor`).
+- `disks` ([Array(String)](../../sql-reference/data-types/array.md)) — Disk names, defined in the storage policy.
+- `volume_type` ([Enum8](../../sql-reference/data-types/enum.md))  — Type of volume. Can have one of the following values:
+    - `JBOD` 
+    - `SINGLE_DISK`
+    - `UNKNOWN`
+- `max_data_part_size` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Maximum size of a data part that can be stored on volume disks (0 — no limit).
+- `move_factor` ([Float64](../../sql-reference/data-types/float.md)) — Ratio of free disk space. When the ratio exceeds the value of configuration parameter, ClickHouse start to move data to the next volume in order.
+- `prefer_not_to_merge` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Value of the `prefer_not_to_merge` setting. When this setting is enabled, merging data on this volume is not allowed. This allows controlling how ClickHouse works with slow disks.
+- `perform_ttl_move_on_insert` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Value of the `perform_ttl_move_on_insert` setting. — Disables TTL move on data part INSERT. By default if we insert a data part that already expired by the TTL move rule it immediately goes to a volume/disk declared in move rule. This can significantly slowdown insert in case if destination volume/disk is slow (e.g. S3).
+- `load_balancing` ([Enum8](../../sql-reference/data-types/enum.md))  — Policy for disk balancing. Can have one of the following values:
+    - `ROUND_ROBIN`
+    - `LEAST_USED`
 
 If the storage policy contains more then one volume, then information for each volume is stored in the individual row of the table.
diff --git a/docs/en/operations/system-tables/table_engines.md b/docs/en/operations/system-tables/table_engines.md
index 5178f1640c7..08594739ecf 100644
--- a/docs/en/operations/system-tables/table_engines.md
+++ b/docs/en/operations/system-tables/table_engines.md
@@ -7,14 +7,14 @@ Contains description of table engines supported by server and their feature supp
 
 This table contains the following columns (the column type is shown in brackets):
 
--   `name` (String) — The name of table engine.
--   `supports_settings` (UInt8) — Flag that indicates if table engine supports `SETTINGS` clause.
--   `supports_skipping_indices` (UInt8) — Flag that indicates if table engine supports [skipping indices](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-data_skipping-indexes).
--   `supports_ttl` (UInt8) — Flag that indicates if table engine supports [TTL](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
--   `supports_sort_order` (UInt8) — Flag that indicates if table engine supports clauses `PARTITION_BY`, `PRIMARY_KEY`, `ORDER_BY` and `SAMPLE_BY`.
--   `supports_replication` (UInt8) — Flag that indicates if table engine supports [data replication](../../engines/table-engines/mergetree-family/replication.md).
--   `supports_duduplication` (UInt8) — Flag that indicates if table engine supports data deduplication.
--   `supports_parallel_insert` (UInt8) — Flag that indicates if table engine supports parallel insert (see [`max_insert_threads`](../../operations/settings/settings.md#settings-max-insert-threads) setting).
+- `name` (String) — The name of table engine.
+- `supports_settings` (UInt8) — Flag that indicates if table engine supports `SETTINGS` clause.
+- `supports_skipping_indices` (UInt8) — Flag that indicates if table engine supports [skipping indices](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-data_skipping-indexes).
+- `supports_ttl` (UInt8) — Flag that indicates if table engine supports [TTL](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
+- `supports_sort_order` (UInt8) — Flag that indicates if table engine supports clauses `PARTITION_BY`, `PRIMARY_KEY`, `ORDER_BY` and `SAMPLE_BY`.
+- `supports_replication` (UInt8) — Flag that indicates if table engine supports [data replication](../../engines/table-engines/mergetree-family/replication.md).
+- `supports_duduplication` (UInt8) — Flag that indicates if table engine supports data deduplication.
+- `supports_parallel_insert` (UInt8) — Flag that indicates if table engine supports parallel insert (see [`max_insert_threads`](../../operations/settings/settings.md#settings-max-insert-threads) setting).
 
 Example:
 
@@ -34,6 +34,6 @@ WHERE name in ('Kafka', 'MergeTree', 'ReplicatedCollapsingMergeTree')
 
 **See also**
 
--   MergeTree family [query clauses](../../engines/table-engines/mergetree-family/mergetree.md#mergetree-query-clauses)
--   Kafka [settings](../../engines/table-engines/integrations/kafka.md#table_engine-kafka-creating-a-table)
--   Join [settings](../../engines/table-engines/special/join.md#join-limitations-and-settings)
+- MergeTree family [query clauses](../../engines/table-engines/mergetree-family/mergetree.md#mergetree-query-clauses)
+- Kafka [settings](../../engines/table-engines/integrations/kafka.md#table_engine-kafka-creating-a-table)
+- Join [settings](../../engines/table-engines/special/join.md#join-limitations-and-settings)
diff --git a/docs/en/operations/system-tables/tables.md b/docs/en/operations/system-tables/tables.md
index 497e23dd7ca..82e9fa206ea 100644
--- a/docs/en/operations/system-tables/tables.md
+++ b/docs/en/operations/system-tables/tables.md
@@ -11,67 +11,67 @@ Contains metadata of each table that the server knows about.
 
 Columns:
 
--   `database` ([String](../../sql-reference/data-types/string.md)) — The name of the database the table is in.
+- `database` ([String](../../sql-reference/data-types/string.md)) — The name of the database the table is in.
 
--   `name` ([String](../../sql-reference/data-types/string.md)) — Table name.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Table name.
 
--   `uuid` ([UUID](../../sql-reference/data-types/uuid.md)) — Table uuid (Atomic database).
+- `uuid` ([UUID](../../sql-reference/data-types/uuid.md)) — Table uuid (Atomic database).
 
--   `engine` ([String](../../sql-reference/data-types/string.md)) — Table engine name (without parameters).
+- `engine` ([String](../../sql-reference/data-types/string.md)) — Table engine name (without parameters).
 
--   `is_temporary` ([UInt8](../../sql-reference/data-types/int-uint.md)) - Flag that indicates whether the table is temporary.
+- `is_temporary` ([UInt8](../../sql-reference/data-types/int-uint.md)) - Flag that indicates whether the table is temporary.
 
--   `data_paths` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Paths to the table data in the file systems.
+- `data_paths` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Paths to the table data in the file systems.
 
--   `metadata_path` ([String](../../sql-reference/data-types/string.md)) - Path to the table metadata in the file system.
+- `metadata_path` ([String](../../sql-reference/data-types/string.md)) - Path to the table metadata in the file system.
 
--   `metadata_modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) - Time of latest modification of the table metadata.
+- `metadata_modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) - Time of latest modification of the table metadata.
 
--   `dependencies_database` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Database dependencies.
+- `dependencies_database` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Database dependencies.
 
--   `dependencies_table` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Table dependencies ([MaterializedView](../../engines/table-engines/special/materializedview.md) tables based on the current table).
+- `dependencies_table` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Table dependencies ([MaterializedView](../../engines/table-engines/special/materializedview.md) tables based on the current table).
 
--   `create_table_query` ([String](../../sql-reference/data-types/string.md)) - The query that was used to create the table.
+- `create_table_query` ([String](../../sql-reference/data-types/string.md)) - The query that was used to create the table.
 
--   `engine_full` ([String](../../sql-reference/data-types/string.md)) - Parameters of the table engine.
+- `engine_full` ([String](../../sql-reference/data-types/string.md)) - Parameters of the table engine.
 
--   `as_select` ([String](../../sql-reference/data-types/string.md)) - `SELECT` query for view.
+- `as_select` ([String](../../sql-reference/data-types/string.md)) - `SELECT` query for view.
 
--   `partition_key` ([String](../../sql-reference/data-types/string.md)) - The partition key expression specified in the table.
+- `partition_key` ([String](../../sql-reference/data-types/string.md)) - The partition key expression specified in the table.
 
--   `sorting_key` ([String](../../sql-reference/data-types/string.md)) - The sorting key expression specified in the table.
+- `sorting_key` ([String](../../sql-reference/data-types/string.md)) - The sorting key expression specified in the table.
 
--   `primary_key` ([String](../../sql-reference/data-types/string.md)) - The primary key expression specified in the table.
+- `primary_key` ([String](../../sql-reference/data-types/string.md)) - The primary key expression specified in the table.
 
--   `sampling_key` ([String](../../sql-reference/data-types/string.md)) - The sampling key expression specified in the table.
+- `sampling_key` ([String](../../sql-reference/data-types/string.md)) - The sampling key expression specified in the table.
 
--   `storage_policy` ([String](../../sql-reference/data-types/string.md)) - The storage policy:
+- `storage_policy` ([String](../../sql-reference/data-types/string.md)) - The storage policy:
 
-    -   [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes)
-    -   [Distributed](../../engines/table-engines/special/distributed.md#distributed)
+    - [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes)
+    - [Distributed](../../engines/table-engines/special/distributed.md#distributed)
 
--   `total_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of rows, if it is possible to quickly determine exact number of rows in the table, otherwise `NULL` (including underying `Buffer` table).
+- `total_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of rows, if it is possible to quickly determine exact number of rows in the table, otherwise `NULL` (including underying `Buffer` table).
 
--   `total_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of bytes, if it is possible to quickly determine exact number of bytes for the table on storage, otherwise `NULL` (does not includes any underlying storage).
+- `total_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of bytes, if it is possible to quickly determine exact number of bytes for the table on storage, otherwise `NULL` (does not includes any underlying storage).
 
-    -   If the table stores data on disk, returns used space on disk (i.e. compressed).
-    -   If the table stores data in memory, returns approximated number of used bytes in memory.
+    - If the table stores data on disk, returns used space on disk (i.e. compressed).
+    - If the table stores data in memory, returns approximated number of used bytes in memory.
 
--   `lifetime_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of rows INSERTed since server start (only for `Buffer` tables).
+- `lifetime_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of rows INSERTed since server start (only for `Buffer` tables).
 
--   `lifetime_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of bytes INSERTed since server start (only for `Buffer` tables).
+- `lifetime_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of bytes INSERTed since server start (only for `Buffer` tables).
 
--   `comment` ([String](../../sql-reference/data-types/string.md)) - The comment for the table.
+- `comment` ([String](../../sql-reference/data-types/string.md)) - The comment for the table.
 
--   `has_own_data` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the table itself stores some data on disk or only accesses some other source.
+- `has_own_data` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the table itself stores some data on disk or only accesses some other source.
 
--   `loading_dependencies_database` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Database  loading dependencies (list of objects which should be loaded before the current object).
+- `loading_dependencies_database` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Database  loading dependencies (list of objects which should be loaded before the current object).
 
--   `loading_dependencies_table` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Table loading dependencies (list of objects which should be loaded before the current object).
+- `loading_dependencies_table` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Table loading dependencies (list of objects which should be loaded before the current object).
 
--   `loading_dependent_database` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Dependent loading database.
+- `loading_dependent_database` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Dependent loading database.
 
--   `loading_dependent_table` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Dependent loading table.
+- `loading_dependent_table` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Dependent loading table.
 
 The `system.tables` table is used in `SHOW TABLES` query implementation.
 
diff --git a/docs/en/operations/system-tables/text_log.md b/docs/en/operations/system-tables/text_log.md
index c0ddacc719c..897cefab0be 100644
--- a/docs/en/operations/system-tables/text_log.md
+++ b/docs/en/operations/system-tables/text_log.md
@@ -7,28 +7,28 @@ Contains logging entries. The logging level which goes to this table can be limi
 
 Columns:
 
--   `event_date` (Date) — Date of the entry.
--   `event_time` (DateTime) — Time of the entry.
--   `event_time_microseconds` (DateTime) — Time of the entry with microseconds precision.
--   `microseconds` (UInt32) — Microseconds of the entry.
--   `thread_name` (String) — Name of the thread from which the logging was done.
--   `thread_id` (UInt64) — OS thread ID.
--   `level` (`Enum8`) — Entry level. Possible values:
-    -   `1` or `'Fatal'`.
-    -   `2` or `'Critical'`.
-    -   `3` or `'Error'`.
-    -   `4` or `'Warning'`.
-    -   `5` or `'Notice'`.
-    -   `6` or `'Information'`.
-    -   `7` or `'Debug'`.
-    -   `8` or `'Trace'`.
--   `query_id` (String) — ID of the query.
--   `logger_name` (LowCardinality(String)) — Name of the logger (i.e. `DDLWorker`).
--   `message` (String) — The message itself.
--   `revision` (UInt32) — ClickHouse revision.
--   `source_file` (LowCardinality(String)) — Source file from which the logging was done.
--   `source_line` (UInt64) — Source line from which the logging was done.
--   `message_format_string` (LowCardinality(String)) — A format string that was used to format the message.
+- `event_date` (Date) — Date of the entry.
+- `event_time` (DateTime) — Time of the entry.
+- `event_time_microseconds` (DateTime) — Time of the entry with microseconds precision.
+- `microseconds` (UInt32) — Microseconds of the entry.
+- `thread_name` (String) — Name of the thread from which the logging was done.
+- `thread_id` (UInt64) — OS thread ID.
+- `level` (`Enum8`) — Entry level. Possible values:
+    - `1` or `'Fatal'`.
+    - `2` or `'Critical'`.
+    - `3` or `'Error'`.
+    - `4` or `'Warning'`.
+    - `5` or `'Notice'`.
+    - `6` or `'Information'`.
+    - `7` or `'Debug'`.
+    - `8` or `'Trace'`.
+- `query_id` (String) — ID of the query.
+- `logger_name` (LowCardinality(String)) — Name of the logger (i.e. `DDLWorker`).
+- `message` (String) — The message itself.
+- `revision` (UInt32) — ClickHouse revision.
+- `source_file` (LowCardinality(String)) — Source file from which the logging was done.
+- `source_line` (UInt64) — Source line from which the logging was done.
+- `message_format_string` (LowCardinality(String)) — A format string that was used to format the message.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/time_zones.md b/docs/en/operations/system-tables/time_zones.md
index 498c9bfd217..906651b2960 100644
--- a/docs/en/operations/system-tables/time_zones.md
+++ b/docs/en/operations/system-tables/time_zones.md
@@ -7,7 +7,7 @@ Contains a list of time zones that are supported by the ClickHouse server. This
 
 Columns:
 
--   `time_zone` (String) — List of supported time zones.
+- `time_zone` (String) — List of supported time zones.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/trace_log.md b/docs/en/operations/system-tables/trace_log.md
index 4994248ce5c..a5aae422be7 100644
--- a/docs/en/operations/system-tables/trace_log.md
+++ b/docs/en/operations/system-tables/trace_log.md
@@ -12,38 +12,38 @@ To analyze logs, use the `addressToLine`, `addressToLineWithInlines`, `addressTo
 
 Columns:
 
--   `event_date` ([Date](../../sql-reference/data-types/date.md)) — Date of sampling moment.
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — Date of sampling moment.
 
--   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Timestamp of the sampling moment.
+- `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Timestamp of the sampling moment.
 
--   `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Timestamp of the sampling moment with microseconds precision.
+- `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Timestamp of the sampling moment with microseconds precision.
 
--   `timestamp_ns` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Timestamp of the sampling moment in nanoseconds.
+- `timestamp_ns` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Timestamp of the sampling moment in nanoseconds.
 
--   `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ClickHouse server build revision.
+- `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ClickHouse server build revision.
 
     When connecting to the server by `clickhouse-client`, you see the string similar to `Connected to ClickHouse server version 19.18.1 revision 54429.`. This field contains the `revision`, but not the `version` of a server.
 
--   `trace_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Trace type:
+- `trace_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Trace type:
 
-    -   `Real` represents collecting stack traces by wall-clock time.
-    -   `CPU` represents collecting stack traces by CPU time.
-    -   `Memory` represents collecting allocations and deallocations when memory allocation exceeds the subsequent watermark.
-    -   `MemorySample` represents collecting random allocations and deallocations.
-    -   `MemoryPeak` represents collecting updates of peak memory usage.
-    -   `ProfileEvent` represents collecting of increments of profile events.
+    - `Real` represents collecting stack traces by wall-clock time.
+    - `CPU` represents collecting stack traces by CPU time.
+    - `Memory` represents collecting allocations and deallocations when memory allocation exceeds the subsequent watermark.
+    - `MemorySample` represents collecting random allocations and deallocations.
+    - `MemoryPeak` represents collecting updates of peak memory usage.
+    - `ProfileEvent` represents collecting of increments of profile events.
 
--   `thread_number` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
+- `thread_number` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
 
--   `query_id` ([String](../../sql-reference/data-types/string.md)) — Query identifier that can be used to get details about a query that was running from the [query_log](#system_tables-query_log) system table.
+- `query_id` ([String](../../sql-reference/data-types/string.md)) — Query identifier that can be used to get details about a query that was running from the [query_log](#system_tables-query_log) system table.
 
--   `trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Stack trace at the moment of sampling. Each element is a virtual memory address inside ClickHouse server process.
+- `trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Stack trace at the moment of sampling. Each element is a virtual memory address inside ClickHouse server process.
 
--   `size` ([Int64](../../sql-reference/data-types/int-uint.md)) - For trace types `Memory`, `MemorySample` or `MemoryPeak` is the amount of memory allocated, for other trace types is 0.
+- `size` ([Int64](../../sql-reference/data-types/int-uint.md)) - For trace types `Memory`, `MemorySample` or `MemoryPeak` is the amount of memory allocated, for other trace types is 0.
 
--   `event` ([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)) - For trace type `ProfileEvent` is the name of updated profile event, for other trace types is an empty string.
+- `event` ([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)) - For trace type `ProfileEvent` is the name of updated profile event, for other trace types is an empty string.
 
--   `increment` ([UInt64](../../sql-reference/data-types/int-uint.md)) - For trace type `ProfileEvent` is the amount of incremnt of profile event, for other trace types is 0.
+- `increment` ([UInt64](../../sql-reference/data-types/int-uint.md)) - For trace type `ProfileEvent` is the amount of incremnt of profile event, for other trace types is 0.
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/users.md b/docs/en/operations/system-tables/users.md
index b8c0403b8d6..58cdb82d31f 100644
--- a/docs/en/operations/system-tables/users.md
+++ b/docs/en/operations/system-tables/users.md
@@ -3,33 +3,33 @@ slug: /en/operations/system-tables/users
 ---
 # users
 
-Contains a list of [user accounts](../../operations/access-rights.md#user-account-management) configured at the server.
+Contains a list of [user accounts](../../guides/sre/user-management/index.md#user-account-management) configured at the server.
 
 Columns:
--    `name` ([String](../../sql-reference/data-types/string.md)) — User name.
+- `name` ([String](../../sql-reference/data-types/string.md)) — User name.
 
--    `id` ([UUID](../../sql-reference/data-types/uuid.md)) — User ID.
+- `id` ([UUID](../../sql-reference/data-types/uuid.md)) — User ID.
 
--    `storage` ([String](../../sql-reference/data-types/string.md)) — Path to the storage of users. Configured in the `access_control_path` parameter.
+- `storage` ([String](../../sql-reference/data-types/string.md)) — Path to the storage of users. Configured in the `access_control_path` parameter.
 
--    `auth_type` ([Enum8](../../sql-reference/data-types/enum.md)('no_password' = 0,'plaintext_password' = 1, 'sha256_password' = 2, 'double_sha1_password' = 3, 'ldap' = 4, 'kerberos' = 5, 'ssl_certificate' = 6)) — Shows the authentication type. There are multiple ways of user identification: with no password, with plain text password, with [SHA256](https://ru.wikipedia.org/wiki/SHA-2)-encoded password or with [double SHA-1](https://ru.wikipedia.org/wiki/SHA-1)-encoded password.
+- `auth_type` ([Enum8](../../sql-reference/data-types/enum.md)('no_password' = 0, 'plaintext_password' = 1, 'sha256_password' = 2, 'double_sha1_password' = 3, 'ldap' = 4, 'kerberos' = 5, 'ssl_certificate' = 6, 'bcrypt_password' = 7)) — Shows the authentication type. There are multiple ways of user identification: with no password, with plain text password, with [SHA256](https://en.wikipedia.org/wiki/SHA-2)-encoded password, with [double SHA-1](https://en.wikipedia.org/wiki/SHA-1)-encoded password or with [bcrypt](https://en.wikipedia.org/wiki/Bcrypt)-encoded password.
 
--    `auth_params` ([String](../../sql-reference/data-types/string.md)) — Authentication parameters in the JSON format depending on the `auth_type`.
+- `auth_params` ([String](../../sql-reference/data-types/string.md)) — Authentication parameters in the JSON format depending on the `auth_type`.
 
--    `host_ip` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — IP addresses of hosts that are allowed to connect to the ClickHouse server.
+- `host_ip` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — IP addresses of hosts that are allowed to connect to the ClickHouse server.
 
--    `host_names` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Names of hosts that are allowed to connect to the ClickHouse server.
+- `host_names` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Names of hosts that are allowed to connect to the ClickHouse server.
 
--    `host_names_regexp` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Regular expression for host names that are allowed to connect to the ClickHouse server.
+- `host_names_regexp` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Regular expression for host names that are allowed to connect to the ClickHouse server.
 
--    `host_names_like` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Names of hosts that are allowed to connect to the ClickHouse server, set using the LIKE predicate.
+- `host_names_like` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Names of hosts that are allowed to connect to the ClickHouse server, set using the LIKE predicate.
 
--    `default_roles_all` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows that all granted roles set for user by default.
+- `default_roles_all` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows that all granted roles set for user by default.
 
--    `default_roles_list` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of granted roles provided by default.
+- `default_roles_list` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of granted roles provided by default.
 
--    `default_roles_except` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — All the granted roles set as default excepting of the listed ones.
+- `default_roles_except` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — All the granted roles set as default excepting of the listed ones.
 
 ## See Also {#see-also}
 
--   [SHOW USERS](../../sql-reference/statements/show.md#show-users-statement)
+- [SHOW USERS](../../sql-reference/statements/show.md#show-users-statement)
diff --git a/docs/en/operations/system-tables/zookeeper.md b/docs/en/operations/system-tables/zookeeper.md
index 503debf4302..7f948a238ac 100644
--- a/docs/en/operations/system-tables/zookeeper.md
+++ b/docs/en/operations/system-tables/zookeeper.md
@@ -16,20 +16,20 @@ It can be used to do a batch of Keeper path queries.
 
 Columns:
 
--   `name` (String) — The name of the node.
--   `path` (String) — The path to the node.
--   `value` (String) — Node value.
--   `dataLength` (Int32) — Size of the value.
--   `numChildren` (Int32) — Number of descendants.
--   `czxid` (Int64) — ID of the transaction that created the node.
--   `mzxid` (Int64) — ID of the transaction that last changed the node.
--   `pzxid` (Int64) — ID of the transaction that last deleted or added descendants.
--   `ctime` (DateTime) — Time of node creation.
--   `mtime` (DateTime) — Time of the last modification of the node.
--   `version` (Int32) — Node version: the number of times the node was changed.
--   `cversion` (Int32) — Number of added or removed descendants.
--   `aversion` (Int32) — Number of changes to the ACL.
--   `ephemeralOwner` (Int64) — For ephemeral nodes, the ID of the session that owns this node.
+- `name` (String) — The name of the node.
+- `path` (String) — The path to the node.
+- `value` (String) — Node value.
+- `dataLength` (Int32) — Size of the value.
+- `numChildren` (Int32) — Number of descendants.
+- `czxid` (Int64) — ID of the transaction that created the node.
+- `mzxid` (Int64) — ID of the transaction that last changed the node.
+- `pzxid` (Int64) — ID of the transaction that last deleted or added descendants.
+- `ctime` (DateTime) — Time of node creation.
+- `mtime` (DateTime) — Time of the last modification of the node.
+- `version` (Int32) — Node version: the number of times the node was changed.
+- `cversion` (Int32) — Number of added or removed descendants.
+- `aversion` (Int32) — Number of changes to the ACL.
+- `ephemeralOwner` (Int64) — For ephemeral nodes, the ID of the session that owns this node.
 
 Example:
 
diff --git a/docs/en/operations/system-tables/zookeeper_connection.md b/docs/en/operations/system-tables/zookeeper_connection.md
new file mode 100644
index 00000000000..9438cda1808
--- /dev/null
+++ b/docs/en/operations/system-tables/zookeeper_connection.md
@@ -0,0 +1,29 @@
+---
+slug: /en/operations/system-tables/zookeeper_connection
+---
+#zookeeper_connection
+
+This table does not exist if ZooKeeper is not configured. The 'system.zookeeper_connection' table shows current connections to ZooKeeper (including auxiliary ZooKeepers). Each row shows information about one connection.
+
+Columns:
+
+-   `name` ([String](../../sql-reference/data-types/string.md)) — ZooKeeper cluster's name.
+-   `host` ([String](../../sql-reference/data-types/string.md)) — The hostname/IP of the ZooKeeper node that ClickHouse connected to.
+-   `port` ([String](../../sql-reference/data-types/string.md)) — The port of the ZooKeeper node that ClickHouse connected to.
+-   `index` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The index of the ZooKeeper node that ClickHouse connected to. The index is from ZooKeeper config.
+-   `connected_time` ([String](../../sql-reference/data-types/string.md)) — When the connection was established
+-   `is_expired` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Is the current connection expired.
+-   `keeper_api_version` ([String](../../sql-reference/data-types/string.md)) — Keeper API version.
+-   `client_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Session id of the connection.
+
+Example:
+
+``` sql
+SELECT * FROM system.zookeeper_connection;
+```
+
+``` text
+┌─name──────────────┬─host─────────┬─port─┬─index─┬──────connected_time─┬─is_expired─┬─keeper_api_version─┬──────────client_id─┐
+│ default_zookeeper │ 127.0.0.1    │ 2181 │     0 │ 2023-05-19 14:30:16 │          0 │                  0 │ 216349144108826660 │
+└───────────────────┴──────────────┴──────┴───────┴─────────────────────┴────────────┴────────────────────┴────────────────────┘
+```
diff --git a/docs/en/operations/system-tables/zookeeper_log.md b/docs/en/operations/system-tables/zookeeper_log.md
index 58c44325737..970ed192a48 100644
--- a/docs/en/operations/system-tables/zookeeper_log.md
+++ b/docs/en/operations/system-tables/zookeeper_log.md
@@ -9,46 +9,46 @@ For requests, only columns with request parameters are filled in, and the remain
 
 Columns with request parameters:
 
--   `type` ([Enum](../../sql-reference/data-types/enum.md)) — Event type in the ZooKeeper client. Can have one of the following values:
-    -   `Request` — The request has been sent.
-    -   `Response` — The response was received.
-    -   `Finalize` — The connection is lost, no response was received.
--   `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the event happened.
--   `event_time` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — The date and time when the event happened.
--   `address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address of ZooKeeper server that was used to make the request.
--   `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The port of ZooKeeper server that was used to make the request.
--   `session_id` ([Int64](../../sql-reference/data-types/int-uint.md)) — The session ID that the ZooKeeper server sets for each connection.
--   `xid` ([Int32](../../sql-reference/data-types/int-uint.md)) — The ID of the request within the session. This is usually a sequential request number. It is the same for the request row and the paired `response`/`finalize` row.
--   `has_watch` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The request whether the [watch](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#ch_zkWatches) has been set.
--   `op_num` ([Enum](../../sql-reference/data-types/enum.md)) — The type of request or response.
--   `path` ([String](../../sql-reference/data-types/string.md)) — The path to the ZooKeeper node specified in the request, or an empty string  if the request not requires specifying a path.
--   `data` ([String](../../sql-reference/data-types/string.md)) — The data written to the ZooKeeper node (for the `SET` and `CREATE` requests — what the request wanted to write, for the response to the `GET` request — what was read) or an empty string.
--   `is_ephemeral` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Is the ZooKeeper node being created as an [ephemeral](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#Ephemeral+Nodes).
--   `is_sequential` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Is the ZooKeeper node being created as an [sequential](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#Sequence+Nodes+--+Unique+Naming).
--   `version` ([Nullable(Int32)](../../sql-reference/data-types/nullable.md)) — The version of the ZooKeeper node that the request expects when executing. This is supported for `CHECK`, `SET`, `REMOVE` requests (is relevant `-1` if the request does not check the version or `NULL` for other requests that do not support version checking).
--   `requests_size` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of requests included in the multi request (this is a special request that consists of several consecutive ordinary requests and executes them atomically). All requests included in multi request will have the same `xid`.
--   `request_idx` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of the request included in multi request (for multi request — `0`, then in order from `1`).
+- `type` ([Enum](../../sql-reference/data-types/enum.md)) — Event type in the ZooKeeper client. Can have one of the following values:
+    - `Request` — The request has been sent.
+    - `Response` — The response was received.
+    - `Finalize` — The connection is lost, no response was received.
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the event happened.
+- `event_time` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — The date and time when the event happened.
+- `address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address of ZooKeeper server that was used to make the request.
+- `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The port of ZooKeeper server that was used to make the request.
+- `session_id` ([Int64](../../sql-reference/data-types/int-uint.md)) — The session ID that the ZooKeeper server sets for each connection.
+- `xid` ([Int32](../../sql-reference/data-types/int-uint.md)) — The ID of the request within the session. This is usually a sequential request number. It is the same for the request row and the paired `response`/`finalize` row.
+- `has_watch` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The request whether the [watch](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#ch_zkWatches) has been set.
+- `op_num` ([Enum](../../sql-reference/data-types/enum.md)) — The type of request or response.
+- `path` ([String](../../sql-reference/data-types/string.md)) — The path to the ZooKeeper node specified in the request, or an empty string  if the request not requires specifying a path.
+- `data` ([String](../../sql-reference/data-types/string.md)) — The data written to the ZooKeeper node (for the `SET` and `CREATE` requests — what the request wanted to write, for the response to the `GET` request — what was read) or an empty string.
+- `is_ephemeral` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Is the ZooKeeper node being created as an [ephemeral](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#Ephemeral+Nodes).
+- `is_sequential` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Is the ZooKeeper node being created as an [sequential](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#Sequence+Nodes+--+Unique+Naming).
+- `version` ([Nullable(Int32)](../../sql-reference/data-types/nullable.md)) — The version of the ZooKeeper node that the request expects when executing. This is supported for `CHECK`, `SET`, `REMOVE` requests (is relevant `-1` if the request does not check the version or `NULL` for other requests that do not support version checking).
+- `requests_size` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of requests included in the multi request (this is a special request that consists of several consecutive ordinary requests and executes them atomically). All requests included in multi request will have the same `xid`.
+- `request_idx` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of the request included in multi request (for multi request — `0`, then in order from `1`).
 
 Columns with request response parameters:
 
--   `zxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — ZooKeeper transaction ID. The serial number issued by the ZooKeeper server in response to a successfully executed request (`0` if the request was not executed/returned an error/the client does not know whether the request was executed).
--   `error` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — Error code. Can have many values, here are just some of them:
-    -   `ZOK` — The request was executed seccessfully.
-    -   `ZCONNECTIONLOSS` — The connection was lost.
-    -   `ZOPERATIONTIMEOUT` — The request execution timeout has expired.
-	-   `ZSESSIONEXPIRED` — The session has expired.
-    -   `NULL` — The request is completed.
--   `watch_type` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — The type of the `watch` event (for responses with `op_num` = `Watch`), for the remaining responses: `NULL`.
--   `watch_state` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — The status of the `watch` event (for responses with `op_num` = `Watch`), for the remaining responses: `NULL`.
--   `path_created` ([String](../../sql-reference/data-types/string.md)) — The path to the created ZooKeeper node (for responses to the `CREATE` request), may differ from the `path` if the node is created as a `sequential`.
--   `stat_czxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — The `zxid` of the change that caused this ZooKeeper node to be created.
--   `stat_mzxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — The `zxid` of the change that last modified this ZooKeeper node.
--   `stat_pzxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — The transaction ID of the change that last modified childern of this ZooKeeper node.
--   `stat_version` ([Int32](../../sql-reference/data-types/int-uint.md)) — The number of changes to the data of this ZooKeeper node.
--   `stat_cversion` ([Int32](../../sql-reference/data-types/int-uint.md)) — The number of changes to the children of this ZooKeeper node.
--   `stat_dataLength` ([Int32](../../sql-reference/data-types/int-uint.md)) — The length of the data field of this ZooKeeper node.
--   `stat_numChildren` ([Int32](../../sql-reference/data-types/int-uint.md)) — The number of children of this ZooKeeper node.
--   `children` ([Array(String)](../../sql-reference/data-types/array.md)) — The list of child ZooKeeper nodes (for responses to `LIST` request).
+- `zxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — ZooKeeper transaction ID. The serial number issued by the ZooKeeper server in response to a successfully executed request (`0` if the request was not executed/returned an error/the client does not know whether the request was executed).
+- `error` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — Error code. Can have many values, here are just some of them:
+    - `ZOK` — The request was executed seccessfully.
+    - `ZCONNECTIONLOSS` — The connection was lost.
+    - `ZOPERATIONTIMEOUT` — The request execution timeout has expired.
+	- `ZSESSIONEXPIRED` — The session has expired.
+    - `NULL` — The request is completed.
+- `watch_type` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — The type of the `watch` event (for responses with `op_num` = `Watch`), for the remaining responses: `NULL`.
+- `watch_state` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — The status of the `watch` event (for responses with `op_num` = `Watch`), for the remaining responses: `NULL`.
+- `path_created` ([String](../../sql-reference/data-types/string.md)) — The path to the created ZooKeeper node (for responses to the `CREATE` request), may differ from the `path` if the node is created as a `sequential`.
+- `stat_czxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — The `zxid` of the change that caused this ZooKeeper node to be created.
+- `stat_mzxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — The `zxid` of the change that last modified this ZooKeeper node.
+- `stat_pzxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — The transaction ID of the change that last modified childern of this ZooKeeper node.
+- `stat_version` ([Int32](../../sql-reference/data-types/int-uint.md)) — The number of changes to the data of this ZooKeeper node.
+- `stat_cversion` ([Int32](../../sql-reference/data-types/int-uint.md)) — The number of changes to the children of this ZooKeeper node.
+- `stat_dataLength` ([Int32](../../sql-reference/data-types/int-uint.md)) — The length of the data field of this ZooKeeper node.
+- `stat_numChildren` ([Int32](../../sql-reference/data-types/int-uint.md)) — The number of children of this ZooKeeper node.
+- `children` ([Array(String)](../../sql-reference/data-types/array.md)) — The list of child ZooKeeper nodes (for responses to `LIST` request).
 
 **Example**
 
@@ -128,5 +128,5 @@ children:         ['query-0000000006','query-0000000005','query-0000000004','que
 
 **See Also**
 
--   [ZooKeeper](../../operations/tips.md#zookeeper)
--   [ZooKeeper guide](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html)
+- [ZooKeeper](../../operations/tips.md#zookeeper)
+- [ZooKeeper guide](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html)
diff --git a/docs/en/operations/tips.md b/docs/en/operations/tips.md
index da34a6b7e9c..8f6cf6ad147 100644
--- a/docs/en/operations/tips.md
+++ b/docs/en/operations/tips.md
@@ -51,10 +51,14 @@ But for storing archives with rare queries, shelves will work.
 ## RAID {#raid}
 
 When using HDD, you can combine their RAID-10, RAID-5, RAID-6 or RAID-50.
-For Linux, software RAID is better (with `mdadm`). We do not recommend using LVM.
+For Linux, software RAID is better (with `mdadm`). 
 When creating RAID-10, select the `far` layout.
 If your budget allows, choose RAID-10.
 
+LVM by itself (without RAID or `mdadm`) is ok, but making RAID with it or combining it with `mdadm` is a less explored option, and there will be more chances for mistakes
+(selecting wrong chunk size; misalignment of chunks; choosing a wrong raid type; forgetting to cleanup disks). If you are confident
+in using LVM, there is nothing against using it.
+
 If you have more than 4 disks, use RAID-6 (preferred) or RAID-50, instead of RAID-5.
 When using RAID-5, RAID-6 or RAID-50, always increase stripe_cache_size, since the default value is usually not the best choice.
 
@@ -70,7 +74,7 @@ Never set the block size too small or too large.
 You can use RAID-0 on SSD.
 Regardless of RAID use, always use replication for data security.
 
-Enable NCQ with a long queue. For HDD, choose the CFQ scheduler, and for SSD, choose noop. Don’t reduce the ‘readahead’ setting.
+Enable NCQ with a long queue. For HDD, choose the mq-deadline or CFQ scheduler, and for SSD, choose noop. Don’t reduce the ‘readahead’ setting.
 For HDD, enable the write cache.
 
 Make sure that [`fstrim`](https://en.wikipedia.org/wiki/Trim_(computing)) is enabled for NVME and SSD disks in your OS (usually it's implemented using a cronjob or systemd service).
@@ -126,7 +130,7 @@ Otherwise you may get `Illegal instruction` crashes when hypervisor is run on ol
 
 ## ClickHouse Keeper and ZooKeeper {#zookeeper}
 
-ClickHouse Keeper is recommended to replace ZooKeeper for ClickHouse clusters.  See the documentation for [ClickHouse Keeper](clickhouse-keeper.md)
+ClickHouse Keeper is recommended to replace ZooKeeper for ClickHouse clusters.  See the documentation for [ClickHouse Keeper](../guides/sre/keeper/index.md)
 
 If you would like to continue using ZooKeeper then it is best to use a fresh version of ZooKeeper – 3.4.9 or later. The version in stable Linux distributions may be outdated.
 
@@ -134,7 +138,7 @@ You should never use manually written scripts to transfer data between different
 
 If you want to divide an existing ZooKeeper cluster into two, the correct way is to increase the number of its replicas and then reconfigure it as two independent clusters.
 
-You can run ClickHouse Keeper on the same server as ClickHouse in test environments, or in environments with low ingestion rate. 
+You can run ClickHouse Keeper on the same server as ClickHouse in test environments, or in environments with low ingestion rate.
 For production environments we suggest to use separate servers for ClickHouse and ZooKeeper/Keeper, or place ClickHouse files and Keeper files on to separate disks. Because ZooKeeper/Keeper are very sensitive for disk latency and ClickHouse may utilize all available system resources.
 
 You can have ZooKeeper observers in an ensemble but ClickHouse servers should not interact with observers.
diff --git a/docs/en/operations/utilities/clickhouse-benchmark.md b/docs/en/operations/utilities/clickhouse-benchmark.md
index 0126cda160a..8620b44c368 100644
--- a/docs/en/operations/utilities/clickhouse-benchmark.md
+++ b/docs/en/operations/utilities/clickhouse-benchmark.md
@@ -41,24 +41,24 @@ clickhouse-benchmark [keys] < queries_file;
 
 ## Keys {#clickhouse-benchmark-keys}
 
--   `--query=QUERY` — Query to execute. If this parameter is not passed, `clickhouse-benchmark` will read queries from standard input.
--   `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` sends simultaneously. Default value: 1.
--   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (to disable reports set 0). Default value: 1.
--   `-h HOST`, `--host=HOST` — Server host. Default value: `localhost`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-h` keys.
--   `-p N`, `--port=N` — Server port. Default value: 9000. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-p` keys.
--   `-i N`, `--iterations=N` — Total number of queries. Default value: 0 (repeat forever).
--   `-r`, `--randomize` — Random order of queries execution if there is more than one input query.
--   `-s`, `--secure` — Using `TLS` connection.
--   `-t N`, `--timelimit=N` — Time limit in seconds. `clickhouse-benchmark` stops sending queries when the specified time limit is reached. Default value: 0 (time limit disabled).
--   `--confidence=N` — Level of confidence for T-test. Possible values: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Default value: 5. In the [comparison mode](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` performs the [Independent two-sample Student’s t-test](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) to determine whether the two distributions aren’t different with the selected level of confidence.
--   `--cumulative` — Printing cumulative data instead of data per interval.
--   `--database=DATABASE_NAME` — ClickHouse database name. Default value: `default`.
--   `--json=FILEPATH` — `JSON` output. When the key is set, `clickhouse-benchmark` outputs a report to the specified JSON-file.
--   `--user=USERNAME` — ClickHouse user name. Default value: `default`.
--   `--password=PSWD` — ClickHouse user password. Default value: empty string.
--   `--stacktrace` — Stack traces output. When the key is set, `clickhouse-bencmark` outputs stack traces of exceptions.
--   `--stage=WORD` — Query processing stage at server. ClickHouse stops query processing and returns an answer to `clickhouse-benchmark` at the specified stage. Possible values: `complete`, `fetch_columns`, `with_mergeable_state`. Default value: `complete`.
--   `--help` — Shows the help message.
+- `--query=QUERY` — Query to execute. If this parameter is not passed, `clickhouse-benchmark` will read queries from standard input.
+- `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` sends simultaneously. Default value: 1.
+- `-d N`, `--delay=N` — Interval in seconds between intermediate reports (to disable reports set 0). Default value: 1.
+- `-h HOST`, `--host=HOST` — Server host. Default value: `localhost`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-h` keys.
+- `-p N`, `--port=N` — Server port. Default value: 9000. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-p` keys.
+- `-i N`, `--iterations=N` — Total number of queries. Default value: 0 (repeat forever).
+- `-r`, `--randomize` — Random order of queries execution if there is more than one input query.
+- `-s`, `--secure` — Using `TLS` connection.
+- `-t N`, `--timelimit=N` — Time limit in seconds. `clickhouse-benchmark` stops sending queries when the specified time limit is reached. Default value: 0 (time limit disabled).
+- `--confidence=N` — Level of confidence for T-test. Possible values: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Default value: 5. In the [comparison mode](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` performs the [Independent two-sample Student’s t-test](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) to determine whether the two distributions aren’t different with the selected level of confidence.
+- `--cumulative` — Printing cumulative data instead of data per interval.
+- `--database=DATABASE_NAME` — ClickHouse database name. Default value: `default`.
+- `--json=FILEPATH` — `JSON` output. When the key is set, `clickhouse-benchmark` outputs a report to the specified JSON-file.
+- `--user=USERNAME` — ClickHouse user name. Default value: `default`.
+- `--password=PSWD` — ClickHouse user password. Default value: empty string.
+- `--stacktrace` — Stack traces output. When the key is set, `clickhouse-bencmark` outputs stack traces of exceptions.
+- `--stage=WORD` — Query processing stage at server. ClickHouse stops query processing and returns an answer to `clickhouse-benchmark` at the specified stage. Possible values: `complete`, `fetch_columns`, `with_mergeable_state`. Default value: `complete`.
+- `--help` — Shows the help message.
 
 If you want to apply some [settings](../../operations/settings/index.md) for queries, pass them as a key `--<session setting name>= SETTING_VALUE`. For example, `--max_memory_usage=1048576`.
 
@@ -91,19 +91,19 @@ localhost:9000, queries 10, QPS: 6.772, RPS: 67904487.440, MiB/s: 518.070, resul
 
 In the report you can find:
 
--   Number of queries in the `Queries executed:` field.
+- Number of queries in the `Queries executed:` field.
 
--   Status string containing (in order):
+- Status string containing (in order):
 
-    -   Endpoint of ClickHouse server.
-    -   Number of processed queries.
-    -   QPS: How many queries the server performed per second during a period specified in the `--delay` argument.
-    -   RPS: How many rows the server reads per second during a period specified in the `--delay` argument.
-    -   MiB/s: How many mebibytes the server reads per second during a period specified in the `--delay` argument.
-    -   result RPS: How many rows placed by the server to the result of a query per second during a period specified in the `--delay` argument.
-    -   result MiB/s. How many mebibytes placed by the server to the result of a query per second during a period specified in the `--delay` argument.
+    - Endpoint of ClickHouse server.
+    - Number of processed queries.
+    - QPS: How many queries the server performed per second during a period specified in the `--delay` argument.
+    - RPS: How many rows the server reads per second during a period specified in the `--delay` argument.
+    - MiB/s: How many mebibytes the server reads per second during a period specified in the `--delay` argument.
+    - result RPS: How many rows placed by the server to the result of a query per second during a period specified in the `--delay` argument.
+    - result MiB/s. How many mebibytes placed by the server to the result of a query per second during a period specified in the `--delay` argument.
 
--   Percentiles of queries execution time.
+- Percentiles of queries execution time.
 
 ## Comparison Mode {#clickhouse-benchmark-comparison-mode}
 
diff --git a/docs/en/operations/utilities/clickhouse-copier.md b/docs/en/operations/utilities/clickhouse-copier.md
index 87280bc3ba8..a9b82404b90 100644
--- a/docs/en/operations/utilities/clickhouse-copier.md
+++ b/docs/en/operations/utilities/clickhouse-copier.md
@@ -8,7 +8,7 @@ sidebar_label: clickhouse-copier
 
 Copies data from the tables in one cluster to tables in another (or the same) cluster.
 
-:::warning    
+:::note    
 To get a consistent copy, the data in the source tables and partitions should not change during the entire process.
 :::
 
@@ -16,12 +16,12 @@ You can run multiple `clickhouse-copier` instances on different servers to perfo
 
 After starting, `clickhouse-copier`:
 
--   Connects to ClickHouse Keeper and receives:
+- Connects to ClickHouse Keeper and receives:
 
-    -   Copying jobs.
-    -   The state of the copying jobs.
+    - Copying jobs.
+    - The state of the copying jobs.
 
--   It performs the jobs.
+- It performs the jobs.
 
     Each running process chooses the “closest” shard of the source cluster and copies the data into the destination cluster, resharding the data if necessary.
 
@@ -39,12 +39,12 @@ $ clickhouse-copier --daemon --config keeper.xml --task-path /task/path --base-d
 
 Parameters:
 
--   `daemon` — Starts `clickhouse-copier` in daemon mode.
--   `config` — The path to the `keeper.xml` file with the parameters for the connection to ClickHouse Keeper.
--   `task-path` — The path to the ClickHouse Keeper node. This node is used for syncing `clickhouse-copier` processes and storing tasks. Tasks are stored in `$task-path/description`.
--   `task-file` — Optional path to file with task configuration for initial upload to ClickHouse Keeper.
--   `task-upload-force` — Force upload `task-file` even if node already exists.
--   `base-dir` — The path to logs and auxiliary files. When it starts, `clickhouse-copier` creates `clickhouse-copier_YYYYMMHHSS_<PID>` subdirectories in `$base-dir`. If this parameter is omitted, the directories are created in the directory where `clickhouse-copier` was launched.
+- `daemon` — Starts `clickhouse-copier` in daemon mode.
+- `config` — The path to the `keeper.xml` file with the parameters for the connection to ClickHouse Keeper.
+- `task-path` — The path to the ClickHouse Keeper node. This node is used for syncing `clickhouse-copier` processes and storing tasks. Tasks are stored in `$task-path/description`.
+- `task-file` — Optional path to file with task configuration for initial upload to ClickHouse Keeper.
+- `task-upload-force` — Force upload `task-file` even if node already exists.
+- `base-dir` — The path to logs and auxiliary files. When it starts, `clickhouse-copier` creates `clickhouse-copier_YYYYMMHHSS_<PID>` subdirectories in `$base-dir`. If this parameter is omitted, the directories are created in the directory where `clickhouse-copier` was launched.
 
 ## Format of keeper.xml {#format-of-zookeeper-xml}
 
diff --git a/docs/en/operations/utilities/clickhouse-format.md b/docs/en/operations/utilities/clickhouse-format.md
index bf2e618b791..101310cc65e 100644
--- a/docs/en/operations/utilities/clickhouse-format.md
+++ b/docs/en/operations/utilities/clickhouse-format.md
@@ -27,7 +27,7 @@ $ clickhouse-format --query "select number from numbers(10) where number%2 order
 
 Result:
 
-```text
+```sql
 SELECT number
 FROM numbers(10)
 WHERE number % 2
@@ -54,7 +54,7 @@ $ clickhouse-format -n <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNIO
 
 Result:
 
-```text
+```sql
 SELECT *
 FROM
 (
@@ -75,7 +75,7 @@ $ clickhouse-format --seed Hello --obfuscate <<< "SELECT cost_first_screen BETWE
 
 Result:
 
-```text
+```sql
 SELECT treasury_mammoth_hazelnut BETWEEN nutmeg AND span, CASE WHEN chive >= 116 THEN switching ELSE ANYTHING END;
 ```
 
@@ -87,7 +87,7 @@ $ clickhouse-format --seed World --obfuscate <<< "SELECT cost_first_screen BETWE
 
 Result:
 
-```text
+```sql
 SELECT horse_tape_summer BETWEEN folklore AND moccasins, CASE WHEN intestine >= 116 THEN nonconformist ELSE FORESTRY END;
 ```
 
@@ -99,7 +99,7 @@ $ clickhouse-format --backslash <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELE
 
 Result:
 
-```text
+```sql
 SELECT * \
 FROM  \
 ( \
diff --git a/docs/en/operations/utilities/clickhouse-local.md b/docs/en/operations/utilities/clickhouse-local.md
index a4fa5579638..0443a80cf17 100644
--- a/docs/en/operations/utilities/clickhouse-local.md
+++ b/docs/en/operations/utilities/clickhouse-local.md
@@ -4,52 +4,202 @@ sidebar_position: 60
 sidebar_label: clickhouse-local
 ---
 
-# clickhouse-local 
+# clickhouse-local
 
-The `clickhouse-local` program enables you to perform fast processing on local files, without having to deploy and configure the ClickHouse server.
+## Related Content
 
-Accepts data that represent tables and queries them using [ClickHouse SQL dialect](../../sql-reference/).
+- Blog: [Extracting, Converting, and Querying Data in Local Files using clickhouse-local](https://clickhouse.com/blog/extracting-converting-querying-local-files-with-sql-clickhouse-local)
 
-`clickhouse-local` uses the same core as ClickHouse server, so it supports most of the features and the same set of formats and table engines.
+## When to use clickhouse-local vs. ClickHouse
 
-By default `clickhouse-local` does not have access to data on the same host, but it supports loading server configuration using `--config-file` argument.
+`clickhouse-local` is an easy-to-use version of ClickHouse that is ideal for developers who need to perform fast processing on local and remote files using SQL without having to install a full database server. With `clickhouse-local`, developers can use SQL commands (using the [ClickHouse SQL dialect](../../sql-reference/index.md)) directly from the command line, providing a simple and efficient way to access ClickHouse features without the need for a full ClickHouse installation. One of the main benefits of `clickhouse-local` is that it is already included when installing [clickhouse-client](https://clickhouse.com/docs/en/integrations/sql-clients/clickhouse-client-local). This means that developers can get started with `clickhouse-local` quickly, without the need for a complex installation process.
 
-:::warning
-It is not recommended to load production server configuration into `clickhouse-local` because data can be damaged in case of human error.
+While `clickhouse-local` is a great tool for development and testing purposes, and for processing files, it is not suitable for serving end users or applications. In these scenarios, it is recommended to use the open-source [ClickHouse](https://clickhouse.com/docs/en/install). ClickHouse is a powerful OLAP database that is designed to handle large-scale analytical workloads. It provides fast and efficient processing of complex queries on large datasets, making it ideal for use in production environments where high-performance is critical. Additionally, ClickHouse offers a wide range of features such as replication, sharding, and high availability, which are essential for scaling up to handle large datasets and serving applications. If you need to handle larger datasets or serve end users or applications, we recommend using open-source ClickHouse instead of `clickhouse-local`.
+
+Please read the docs below that show example use cases for `clickhouse-local`, such as [querying local CSVs](#query-data-in-a-csv-file-using-sql) or [reading a parquet file in S3](#query-data-in-a-parquet-file-in-aws-s3).
+
+## Download clickhouse-local
+
+`clickhouse-local` is executed using the same `clickhouse` binary that runs the ClickHouse server and `clickhouse-client`. The easiest way to download the latest version is with the following command:
+
+```bash
+curl https://clickhouse.com/ | sh
+```
+
+:::note
+The binary you just downloaded can run all sorts of ClickHouse tools and utilities. If you want to run ClickHouse as a database server, check out the [Quick Start](../../quick-start.mdx).
+:::
+
+## Query data in a CSV file using SQL
+
+A common use of `clickhouse-local` is to run ad-hoc queries on files: where you don't have to insert the data into a table. `clickhouse-local` can stream the data from a file into a temporary table and execute your SQL.
+
+If the file is sitting on the same machine as `clickhouse-local`, use the `file` table engine. The following `reviews.tsv` file contains a sampling of Amazon product reviews:
+
+```bash
+./clickhouse local -q "SELECT * FROM file('reviews.tsv')"
+```
+
+ClickHouse knows the file uses a tab-separated format from filename extension. If you need to explicitly specify the format, simply add one of the [many ClickHouse input formats](../../interfaces/formats.md):
+```bash
+./clickhouse local -q "SELECT * FROM file('reviews.tsv', 'TabSeparated')"
+```
+
+The `file` table function creates a table, and you can use `DESCRIBE` to see the inferred schema:
+
+```bash
+./clickhouse local -q "DESCRIBE file('reviews.tsv')"
+```
+
+```response
+marketplace	Nullable(String)
+customer_id	Nullable(Int64)
+review_id	Nullable(String)
+product_id	Nullable(String)
+product_parent	Nullable(Int64)
+product_title	Nullable(String)
+product_category	Nullable(String)
+star_rating	Nullable(Int64)
+helpful_votes	Nullable(Int64)
+total_votes	Nullable(Int64)
+vine	Nullable(String)
+verified_purchase	Nullable(String)
+review_headline	Nullable(String)
+review_body	Nullable(String)
+review_date	Nullable(Date)
+```
+
+Let's find a product with the highest rating:
+
+```bash
+./clickhouse local -q "SELECT
+    argMax(product_title,star_rating),
+    max(star_rating)
+FROM file('reviews.tsv')"
+```
+
+```response
+Monopoly Junior Board Game	5
+```
+
+## Query data in a Parquet file in AWS S3
+
+If you have a file in S3, use `clickhouse-local` and the `s3` table function to query the file in place (without inserting the data into a ClickHouse table). We have a file named `house_0.parquet` in a public bucket that contains home prices of property sold in the United Kingdom. Let's see how many rows it has:
+
+```bash
+./clickhouse local -q "
+SELECT count()
+FROM s3('https://datasets-documentation.s3.eu-west-3.amazonaws.com/house_parquet/house_0.parquet')"
+```
+
+The file has 2.7M rows:
+
+```response
+2772030
+```
+
+It's always useful to see what the inferred schema that ClickHouse determines from the file:
+
+```bash
+./clickhouse local -q "DESCRIBE s3('https://datasets-documentation.s3.eu-west-3.amazonaws.com/house_parquet/house_0.parquet')"
+```
+
+```response
+price	Nullable(Int64)
+date	Nullable(UInt16)
+postcode1	Nullable(String)
+postcode2	Nullable(String)
+type	Nullable(String)
+is_new	Nullable(UInt8)
+duration	Nullable(String)
+addr1	Nullable(String)
+addr2	Nullable(String)
+street	Nullable(String)
+locality	Nullable(String)
+town	Nullable(String)
+district	Nullable(String)
+county	Nullable(String)
+```
+
+Let's see what the most expensive neighborhoods are:
+
+```bash
+./clickhouse local -q "
+SELECT
+    town,
+    district,
+    count() AS c,
+    round(avg(price)) AS price,
+    bar(price, 0, 5000000, 100)
+FROM s3('https://datasets-documentation.s3.eu-west-3.amazonaws.com/house_parquet/house_0.parquet')
+GROUP BY
+    town,
+    district
+HAVING c >= 100
+ORDER BY price DESC
+LIMIT 10"
+```
+
+```response
+LONDON	CITY OF LONDON	886	2271305	█████████████████████████████████████████████▍
+LEATHERHEAD	ELMBRIDGE	206	1176680	███████████████████████▌
+LONDON	CITY OF WESTMINSTER	12577	1108221	██████████████████████▏
+LONDON	KENSINGTON AND CHELSEA	8728	1094496	█████████████████████▉
+HYTHE	FOLKESTONE AND HYTHE	130	1023980	████████████████████▍
+CHALFONT ST GILES	CHILTERN	113	835754	████████████████▋
+AMERSHAM	BUCKINGHAMSHIRE	113	799596	███████████████▉
+VIRGINIA WATER	RUNNYMEDE	356	789301	███████████████▊
+BARNET	ENFIELD	282	740514	██████████████▊
+NORTHWOOD	THREE RIVERS	184	731609	██████████████▋
+```
+
+:::tip
+When you are ready to insert your files into ClickHouse, startup a ClickHouse server and insert the results of your `file` and `s3` table functions into a `MergeTree` table. View the [Quick Start](../../quick-start.mdx) for more details.
 :::
 
-For temporary data, a unique temporary data directory is created by default.
 
 ## Usage {#usage}
 
-Basic usage:
+By default `clickhouse-local` has access to data of a ClickHouse server on the same host, and it does not depend on the server's configuration. It also supports loading server configuration using `--config-file` argument. For temporary data, a unique temporary data directory is created by default.
+
+Basic usage (Linux):
 
 ``` bash
-$ clickhouse-local --structure "table_structure" --input-format "format_of_incoming_data" \
-    --query "query"
+$ clickhouse-local --structure "table_structure" --input-format "format_of_incoming_data" --query "query"
 ```
 
+Basic usage (Mac):
+
+``` bash
+$ ./clickhouse local --structure "table_structure" --input-format "format_of_incoming_data" --query "query"
+```
+
+:::note
+`clickhouse-local` is also supported on Windows through WSL2.
+:::
+
 Arguments:
 
--   `-S`, `--structure` — table structure for input data.
--   `--input-format` — input format, `TSV` by default.
--   `-f`, `--file` — path to data, `stdin` by default.
--   `-q`, `--query` — queries to execute with `;` as delimeter. You must specify either `query` or `queries-file` option.
--   `--queries-file` - file path with queries to execute. You must specify either `query` or `queries-file` option.
--   `-N`, `--table` — table name where to put output data, `table` by default.
--   `--format`, `--output-format` — output format, `TSV` by default.
--   `-d`, `--database` — default database, `_local` by default.
--   `--stacktrace` — whether to dump debug output in case of exception.
--   `--echo` — print query before execution.
--   `--verbose` — more details on query execution.
--   `--logger.console` — Log to console.
--   `--logger.log` — Log file name.
--   `--logger.level` — Log level.
--   `--ignore-error` — do not stop processing if a query failed.
--   `-c`, `--config-file` — path to configuration file in same format as for ClickHouse server, by default the configuration empty.
--   `--no-system-tables` — do not attach system tables.
--   `--help` — arguments references for `clickhouse-local`.
--   `-V`, `--version` — print version information and exit.
+- `-S`, `--structure` — table structure for input data.
+- `--input-format` — input format, `TSV` by default.
+- `-f`, `--file` — path to data, `stdin` by default.
+- `-q`, `--query` — queries to execute with `;` as delimiter. Cannot be used simultaneously with `--queries-file`.
+- `--queries-file` - file path with queries to execute. Cannot be used simultaneously with `--query`.
+- `--multiquery, -n` – If specified, multiple queries separated by semicolons can be listed after the `--query` option. For convenience, it is also possible to omit `--query` and pass the queries directly after `--multiquery`.
+- `-N`, `--table` — table name where to put output data, `table` by default.
+- `--format`, `--output-format` — output format, `TSV` by default.
+- `-d`, `--database` — default database, `_local` by default.
+- `--stacktrace` — whether to dump debug output in case of exception.
+- `--echo` — print query before execution.
+- `--verbose` — more details on query execution.
+- `--logger.console` — Log to console.
+- `--logger.log` — Log file name.
+- `--logger.level` — Log level.
+- `--ignore-error` — do not stop processing if a query failed.
+- `-c`, `--config-file` — path to configuration file in same format as for ClickHouse server, by default the configuration empty.
+- `--no-system-tables` — do not attach system tables.
+- `--help` — arguments references for `clickhouse-local`.
+- `-V`, `--version` — print version information and exit.
 
 Also there are arguments for each ClickHouse configuration variable which are more commonly used instead of `--config-file`.
 
diff --git a/docs/en/operations/utilities/index.md b/docs/en/operations/utilities/index.md
index a8c0239c102..112a51cfa97 100644
--- a/docs/en/operations/utilities/index.md
+++ b/docs/en/operations/utilities/index.md
@@ -1,16 +1,16 @@
 ---
 slug: /en/operations/utilities/
 sidebar_position: 56
-sidebar_label: Overview
+sidebar_label: List of tools and utilities
 pagination_next: 'en/operations/utilities/clickhouse-copier'
 ---
 
-# ClickHouse Utilities 
+# List of tools and utilities
 
--   [clickhouse-local](../../operations/utilities/clickhouse-local.md) — Allows running SQL queries on data without starting the ClickHouse server, similar to how `awk` does this.
--   [clickhouse-copier](../../operations/utilities/clickhouse-copier.md) — Copies (and reshards) data from one cluster to another cluster.
--   [clickhouse-benchmark](../../operations/utilities/clickhouse-benchmark.md) — Loads server with the custom queries and settings.
--   [clickhouse-format](../../operations/utilities/clickhouse-format.md) — Enables formatting input queries.
--   [ClickHouse obfuscator](../../operations/utilities/clickhouse-obfuscator.md) — Obfuscates data.
--   [ClickHouse compressor](../../operations/utilities/clickhouse-compressor.md) — Compresses and decompresses data.
--   [clickhouse-odbc-bridge](../../operations/utilities/odbc-bridge.md) — A proxy server for ODBC driver.
+- [clickhouse-local](../../operations/utilities/clickhouse-local.md) — Allows running SQL queries on data without starting the ClickHouse server, similar to how `awk` does this.
+- [clickhouse-copier](../../operations/utilities/clickhouse-copier.md) — Copies (and reshards) data from one cluster to another cluster.
+- [clickhouse-benchmark](../../operations/utilities/clickhouse-benchmark.md) — Loads server with the custom queries and settings.
+- [clickhouse-format](../../operations/utilities/clickhouse-format.md) — Enables formatting input queries.
+- [ClickHouse obfuscator](../../operations/utilities/clickhouse-obfuscator.md) — Obfuscates data.
+- [ClickHouse compressor](../../operations/utilities/clickhouse-compressor.md) — Compresses and decompresses data.
+- [clickhouse-odbc-bridge](../../operations/utilities/odbc-bridge.md) — A proxy server for ODBC driver.
diff --git a/docs/en/sql-reference/_category_.yml b/docs/en/sql-reference/_category_.yml
index d799ecef539..45eaa6e7c16 100644
--- a/docs/en/sql-reference/_category_.yml
+++ b/docs/en/sql-reference/_category_.yml
@@ -1,7 +1,7 @@
-position: 15
+position: 1
 label: 'SQL Reference'
 collapsible: true
 collapsed: true
 link:
-  type: doc
-  id: en/sql-reference/index
+  type: generated-index
+  slug: /en/sql-reference
diff --git a/docs/en/sql-reference/aggregate-functions/combinators.md b/docs/en/sql-reference/aggregate-functions/combinators.md
index 704e88c6313..e1db5d8d23e 100644
--- a/docs/en/sql-reference/aggregate-functions/combinators.md
+++ b/docs/en/sql-reference/aggregate-functions/combinators.md
@@ -44,7 +44,7 @@ If you apply this combinator, the aggregate function returns the same value but
 
 **Arguments**
 
--   `x` — Aggregate function parameters.
+- `x` — Aggregate function parameters.
 
 **Returned values**
 
@@ -72,11 +72,11 @@ If you apply this combinator, the aggregate function does not return the resulti
 
 To work with these states, use:
 
--   [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) table engine.
--   [finalizeAggregation](../../sql-reference/functions/other-functions.md#function-finalizeaggregation) function.
--   [runningAccumulate](../../sql-reference/functions/other-functions.md#runningaccumulate) function.
--   [-Merge](#aggregate_functions_combinators-merge) combinator.
--   [-MergeState](#aggregate_functions_combinators-mergestate) combinator.
+- [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) table engine.
+- [finalizeAggregation](../../sql-reference/functions/other-functions.md#function-finalizeaggregation) function.
+- [runningAccumulate](../../sql-reference/functions/other-functions.md#runningaccumulate) function.
+- [-Merge](#aggregate_functions_combinators-merge) combinator.
+- [-MergeState](#aggregate_functions_combinators-mergestate) combinator.
 
 ## -Merge
 
@@ -111,7 +111,7 @@ If an aggregate function does not have input values, with this combinator it ret
 
 **Arguments**
 
--   `x` — Aggregate function parameters.
+- `x` — Aggregate function parameters.
 
 **Returned values**
 
@@ -171,12 +171,12 @@ This combinator converts a result of an aggregate function to the [Nullable](../
 
 **Arguments**
 
--   `x` — Aggregate function parameters.
+- `x` — Aggregate function parameters.
 
 **Returned values**
 
--   The result of the aggregate function, converted to the `Nullable` data type.
--   `NULL`, if there is nothing to aggregate.
+- The result of the aggregate function, converted to the `Nullable` data type.
+- `NULL`, if there is nothing to aggregate.
 
 Type: `Nullable(aggregate function return type)`.
 
@@ -228,15 +228,15 @@ Lets you divide data into groups, and then separately aggregates the data in tho
 
 **Arguments**
 
--   `start` — Starting value of the whole required interval for `resampling_key` values.
--   `stop` — Ending value of the whole required interval for `resampling_key` values. The whole interval does not include the `stop` value `[start, stop)`.
--   `step` — Step for separating the whole interval into subintervals. The `aggFunction` is executed over each of those subintervals independently.
--   `resampling_key` — Column whose values are used for separating data into intervals.
--   `aggFunction_params` — `aggFunction` parameters.
+- `start` — Starting value of the whole required interval for `resampling_key` values.
+- `stop` — Ending value of the whole required interval for `resampling_key` values. The whole interval does not include the `stop` value `[start, stop)`.
+- `step` — Step for separating the whole interval into subintervals. The `aggFunction` is executed over each of those subintervals independently.
+- `resampling_key` — Column whose values are used for separating data into intervals.
+- `aggFunction_params` — `aggFunction` parameters.
 
 **Returned values**
 
--   Array of `aggFunction` results for each subinterval.
+- Array of `aggFunction` results for each subinterval.
 
 **Example**
 
@@ -285,3 +285,8 @@ FROM people
 │ [3,2]  │ [11.5,12.949999809265137] │
 └────────┴───────────────────────────┘
 ```
+
+
+## Related Content
+
+- Blog: [Using Aggregate Combinators in ClickHouse](https://clickhouse.com/blog/aggregate-functions-combinators-in-clickhouse-for-arrays-maps-and-states)
diff --git a/docs/en/sql-reference/aggregate-functions/index.md b/docs/en/sql-reference/aggregate-functions/index.md
index 56a55c6b7a0..8951ac4ee6a 100644
--- a/docs/en/sql-reference/aggregate-functions/index.md
+++ b/docs/en/sql-reference/aggregate-functions/index.md
@@ -10,8 +10,8 @@ Aggregate functions work in the [normal](http://www.sql-tutorial.com/sql-aggrega
 
 ClickHouse also supports:
 
--   [Parametric aggregate functions](../../sql-reference/aggregate-functions/parametric-functions.md#aggregate_functions_parametric), which accept other parameters in addition to columns.
--   [Combinators](../../sql-reference/aggregate-functions/combinators.md#aggregate_functions_combinators), which change the behavior of aggregate functions.
+- [Parametric aggregate functions](../../sql-reference/aggregate-functions/parametric-functions.md#aggregate_functions_parametric), which accept other parameters in addition to columns.
+- [Combinators](../../sql-reference/aggregate-functions/combinators.md#aggregate_functions_combinators), which change the behavior of aggregate functions.
 
 
 ## NULL Processing
diff --git a/docs/en/sql-reference/aggregate-functions/parametric-functions.md b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
index 40184c0aa02..1b20f74d466 100644
--- a/docs/en/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
@@ -28,7 +28,7 @@ The functions uses [A Streaming Parallel Decision Tree Algorithm](http://jmlr.or
 
 **Returned values**
 
--   [Array](../../sql-reference/data-types/array.md) of [Tuples](../../sql-reference/data-types/tuple.md) of the following format:
+- [Array](../../sql-reference/data-types/array.md) of [Tuples](../../sql-reference/data-types/tuple.md) of the following format:
 
         ```
         [(lower_1, upper_1, height_1), ... (lower_N, upper_N, height_N)]
@@ -90,35 +90,35 @@ Checks whether the sequence contains an event chain that matches the pattern.
 sequenceMatch(pattern)(timestamp, cond1, cond2, ...)
 ```
 
-:::warning
+:::note
 Events that occur at the same second may lay in the sequence in an undefined order affecting the result.
 :::
 
 **Arguments**
 
--   `timestamp` — Column considered to contain time data. Typical data types are `Date` and `DateTime`. You can also use any of the supported [UInt](../../sql-reference/data-types/int-uint.md) data types.
+- `timestamp` — Column considered to contain time data. Typical data types are `Date` and `DateTime`. You can also use any of the supported [UInt](../../sql-reference/data-types/int-uint.md) data types.
 
--   `cond1`, `cond2` — Conditions that describe the chain of events. Data type: `UInt8`. You can pass up to 32 condition arguments. The function takes only the events described in these conditions into account. If the sequence contains data that isn’t described in a condition, the function skips them.
+- `cond1`, `cond2` — Conditions that describe the chain of events. Data type: `UInt8`. You can pass up to 32 condition arguments. The function takes only the events described in these conditions into account. If the sequence contains data that isn’t described in a condition, the function skips them.
 
 **Parameters**
 
--   `pattern` — Pattern string. See [Pattern syntax](#sequence-function-pattern-syntax).
+- `pattern` — Pattern string. See [Pattern syntax](#sequence-function-pattern-syntax).
 
 **Returned values**
 
--   1, if the pattern is matched.
--   0, if the pattern isn’t matched.
+- 1, if the pattern is matched.
+- 0, if the pattern isn’t matched.
 
 Type: `UInt8`.
 
 <a name="sequence-function-pattern-syntax"></a>
 **Pattern syntax**
 
--   `(?N)` — Matches the condition argument at position `N`. Conditions are numbered in the `[1, 32]` range. For example, `(?1)` matches the argument passed to the `cond1` parameter.
+- `(?N)` — Matches the condition argument at position `N`. Conditions are numbered in the `[1, 32]` range. For example, `(?1)` matches the argument passed to the `cond1` parameter.
 
--   `.*` — Matches any number of events. You do not need conditional arguments to match this element of the pattern.
+- `.*` — Matches any number of events. You do not need conditional arguments to match this element of the pattern.
 
--   `(?t operator value)` — Sets the time in seconds that should separate two events. For example, pattern `(?1)(?t>1800)(?2)` matches events that occur more than 1800 seconds from each other. An arbitrary number of any events can lay between these events. You can use the `>=`, `>`, `<`, `<=`, `==` operators.
+- `(?t operator value)` — Sets the time in seconds that should separate two events. For example, pattern `(?1)(?t>1800)(?2)` matches events that occur more than 1800 seconds from each other. An arbitrary number of any events can lay between these events. You can use the `>=`, `>`, `<`, `<=`, `==` operators.
 
 **Examples**
 
@@ -170,13 +170,13 @@ SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2, number = 4) FROM
 
 **See Also**
 
--   [sequenceCount](#function-sequencecount)
+- [sequenceCount](#function-sequencecount)
 
 ## sequenceCount(pattern)(time, cond1, cond2, …)
 
 Counts the number of event chains that matched the pattern. The function searches event chains that do not overlap. It starts to search for the next chain after the current chain is matched.
 
-:::warning
+:::note
 Events that occur at the same second may lay in the sequence in an undefined order affecting the result.
 :::
 
@@ -186,17 +186,17 @@ sequenceCount(pattern)(timestamp, cond1, cond2, ...)
 
 **Arguments**
 
--   `timestamp` — Column considered to contain time data. Typical data types are `Date` and `DateTime`. You can also use any of the supported [UInt](../../sql-reference/data-types/int-uint.md) data types.
+- `timestamp` — Column considered to contain time data. Typical data types are `Date` and `DateTime`. You can also use any of the supported [UInt](../../sql-reference/data-types/int-uint.md) data types.
 
--   `cond1`, `cond2` — Conditions that describe the chain of events. Data type: `UInt8`. You can pass up to 32 condition arguments. The function takes only the events described in these conditions into account. If the sequence contains data that isn’t described in a condition, the function skips them.
+- `cond1`, `cond2` — Conditions that describe the chain of events. Data type: `UInt8`. You can pass up to 32 condition arguments. The function takes only the events described in these conditions into account. If the sequence contains data that isn’t described in a condition, the function skips them.
 
 **Parameters**
 
--   `pattern` — Pattern string. See [Pattern syntax](#sequence-function-pattern-syntax).
+- `pattern` — Pattern string. See [Pattern syntax](#sequence-function-pattern-syntax).
 
 **Returned values**
 
--   Number of non-overlapping event chains that are matched.
+- Number of non-overlapping event chains that are matched.
 
 Type: `UInt64`.
 
@@ -229,7 +229,7 @@ SELECT sequenceCount('(?1).*(?2)')(time, number = 1, number = 2) FROM t
 
 **See Also**
 
--   [sequenceMatch](#function-sequencematch)
+- [sequenceMatch](#function-sequencematch)
 
 ## windowFunnel
 
@@ -237,11 +237,11 @@ Searches for event chains in a sliding time window and calculates the maximum nu
 
 The function works according to the algorithm:
 
--   The function searches for data that triggers the first condition in the chain and sets the event counter to 1. This is the moment when the sliding window starts.
+- The function searches for data that triggers the first condition in the chain and sets the event counter to 1. This is the moment when the sliding window starts.
 
--   If events from the chain occur sequentially within the window, the counter is incremented. If the sequence of events is disrupted, the counter isn’t incremented.
+- If events from the chain occur sequentially within the window, the counter is incremented. If the sequence of events is disrupted, the counter isn’t incremented.
 
--   If the data has multiple event chains at varying points of completion, the function will only output the size of the longest chain.
+- If the data has multiple event chains at varying points of completion, the function will only output the size of the longest chain.
 
 **Syntax**
 
@@ -251,16 +251,16 @@ windowFunnel(window, [mode, [mode, ... ]])(timestamp, cond1, cond2, ..., condN)
 
 **Arguments**
 
--   `timestamp` — Name of the column containing the timestamp. Data types supported: [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md#data_type-datetime) and other unsigned integer types (note that even though timestamp supports the `UInt64` type, it’s value can’t exceed the Int64 maximum, which is 2^63 - 1).
--   `cond` — Conditions or data describing the chain of events. [UInt8](../../sql-reference/data-types/int-uint.md).
+- `timestamp` — Name of the column containing the timestamp. Data types supported: [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md#data_type-datetime) and other unsigned integer types (note that even though timestamp supports the `UInt64` type, it’s value can’t exceed the Int64 maximum, which is 2^63 - 1).
+- `cond` — Conditions or data describing the chain of events. [UInt8](../../sql-reference/data-types/int-uint.md).
 
 **Parameters**
 
--   `window` — Length of the sliding window, it is the time interval between the first and the last condition. The unit of `window` depends on the `timestamp` itself and varies. Determined using the expression `timestamp of cond1 <= timestamp of cond2 <= ... <= timestamp of condN <= timestamp of cond1 + window`.
--   `mode` — It is an optional argument. One or more modes can be set.
-    -   `'strict_deduplication'` — If the same condition holds for the sequence of events, then such repeating event interrupts further processing.
-    -   `'strict_order'` — Don't allow interventions of other events. E.g. in the case of `A->B->D->C`, it stops finding `A->B->C` at the `D` and the max event level is 2.
-    -   `'strict_increase'` — Apply conditions only to events with strictly increasing timestamps.
+- `window` — Length of the sliding window, it is the time interval between the first and the last condition. The unit of `window` depends on the `timestamp` itself and varies. Determined using the expression `timestamp of cond1 <= timestamp of cond2 <= ... <= timestamp of condN <= timestamp of cond1 + window`.
+- `mode` — It is an optional argument. One or more modes can be set.
+    - `'strict_deduplication'` — If the same condition holds for the sequence of events, then such repeating event interrupts further processing.
+    - `'strict_order'` — Don't allow interventions of other events. E.g. in the case of `A->B->D->C`, it stops finding `A->B->C` at the `D` and the max event level is 2.
+    - `'strict_increase'` — Apply conditions only to events with strictly increasing timestamps.
 
 **Returned value**
 
@@ -341,14 +341,14 @@ retention(cond1, cond2, ..., cond32);
 
 **Arguments**
 
--   `cond` — An expression that returns a `UInt8` result (1 or 0).
+- `cond` — An expression that returns a `UInt8` result (1 or 0).
 
 **Returned value**
 
 The array of 1 or 0.
 
--   1 — Condition was met for the event.
--   0 — Condition wasn’t met for the event.
+- 1 — Condition was met for the event.
+- 0 — Condition wasn’t met for the event.
 
 Type: `UInt8`.
 
@@ -481,9 +481,9 @@ Result:
 
 Where:
 
--   `r1`- the number of unique visitors who visited the site during 2020-01-01 (the `cond1` condition).
--   `r2`- the number of unique visitors who visited the site during a specific time period between 2020-01-01 and 2020-01-02 (`cond1` and `cond2` conditions).
--   `r3`- the number of unique visitors who visited the site during a specific time period between 2020-01-01 and 2020-01-03 (`cond1` and `cond3` conditions).
+- `r1`- the number of unique visitors who visited the site during 2020-01-01 (the `cond1` condition).
+- `r2`- the number of unique visitors who visited the site during a specific time period between 2020-01-01 and 2020-01-02 (`cond1` and `cond2` conditions).
+- `r3`- the number of unique visitors who visited the site during a specific time period between 2020-01-01 and 2020-01-03 (`cond1` and `cond3` conditions).
 
 ## uniqUpTo(N)(x)
 
@@ -524,11 +524,11 @@ sequenceNextNode(direction, base)(timestamp, event_column, base_condition, event
 
 **Parameters**
 
--   `direction` — Used to navigate to directions.
+- `direction` — Used to navigate to directions.
     - forward — Moving forward.
     - backward — Moving backward.
 
--   `base` — Used to set the base point.
+- `base` — Used to set the base point.
     - head — Set the base point to the first event.
     - tail — Set the base point to the last event.
     - first_match — Set the base point to the first matched `event1`.
@@ -536,15 +536,15 @@ sequenceNextNode(direction, base)(timestamp, event_column, base_condition, event
 
 **Arguments**
 
--   `timestamp` — Name of the column containing the timestamp. Data types supported: [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md#data_type-datetime) and other unsigned integer types.
--   `event_column` — Name of the column containing the value of the next event to be returned. Data types supported: [String](../../sql-reference/data-types/string.md) and [Nullable(String)](../../sql-reference/data-types/nullable.md).
--   `base_condition` — Condition that the base point must fulfill.
--   `event1`, `event2`, ... — Conditions describing the chain of events. [UInt8](../../sql-reference/data-types/int-uint.md).
+- `timestamp` — Name of the column containing the timestamp. Data types supported: [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md#data_type-datetime) and other unsigned integer types.
+- `event_column` — Name of the column containing the value of the next event to be returned. Data types supported: [String](../../sql-reference/data-types/string.md) and [Nullable(String)](../../sql-reference/data-types/nullable.md).
+- `base_condition` — Condition that the base point must fulfill.
+- `event1`, `event2`, ... — Conditions describing the chain of events. [UInt8](../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--  `event_column[next_index]` — If the pattern is matched and next value exists.
--  `NULL` - If the pattern isn’t matched or next value doesn't exist.
+- `event_column[next_index]` — If the pattern is matched and next value exists.
+- `NULL` - If the pattern isn’t matched or next value doesn't exist.
 
 Type: [Nullable(String)](../../sql-reference/data-types/nullable.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/anyheavy.md b/docs/en/sql-reference/aggregate-functions/reference/anyheavy.md
index 88a56463de1..9fbc21910f8 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/anyheavy.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/anyheavy.md
@@ -13,7 +13,7 @@ anyHeavy(column)
 
 **Arguments**
 
--   `column` – The column name.
+- `column` – The column name.
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/argmax.md b/docs/en/sql-reference/aggregate-functions/reference/argmax.md
index 7b99c831010..65c43ab04c0 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/argmax.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/argmax.md
@@ -15,12 +15,12 @@ argMax(arg, val)
 
 **Arguments**
 
--   `arg` — Argument.
--   `val` — Value.
+- `arg` — Argument.
+- `val` — Value.
 
 **Returned value**
 
--   `arg` value that corresponds to maximum `val` value.
+- `arg` value that corresponds to maximum `val` value.
 
 Type: matches `arg` type.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/argmin.md b/docs/en/sql-reference/aggregate-functions/reference/argmin.md
index 945dda5e46d..a7c21e3f15b 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/argmin.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/argmin.md
@@ -15,12 +15,12 @@ argMin(arg, val)
 
 **Arguments**
 
--   `arg` — Argument.
--   `val` — Value.
+- `arg` — Argument.
+- `val` — Value.
 
 **Returned value**
 
--   `arg` value that corresponds to minimum `val` value.
+- `arg` value that corresponds to minimum `val` value.
 
 Type: matches `arg` type.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/avg.md b/docs/en/sql-reference/aggregate-functions/reference/avg.md
index dd37fe62b95..5463d8a1874 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/avg.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/avg.md
@@ -15,12 +15,12 @@ avg(x)
 
 **Arguments**
 
--   `x` — input values, must be [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `x` — input values, must be [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), or [Decimal](../../../sql-reference/data-types/decimal.md).
 
 **Returned value**
 
--   The arithmetic mean, always as [Float64](../../../sql-reference/data-types/float.md).
--   `NaN` if the input parameter `x` is empty.
+- The arithmetic mean, always as [Float64](../../../sql-reference/data-types/float.md).
+- `NaN` if the input parameter `x` is empty.
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/avgweighted.md b/docs/en/sql-reference/aggregate-functions/reference/avgweighted.md
index 00dffdc33d2..99d3bac763d 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/avgweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/avgweighted.md
@@ -15,8 +15,8 @@ avgWeighted(x, weight)
 
 **Arguments**
 
--   `x` — Values.
--   `weight` — Weights of the values.
+- `x` — Values.
+- `weight` — Weights of the values.
 
 `x` and `weight` must both be
 [Integer](../../../sql-reference/data-types/int-uint.md),
@@ -26,8 +26,8 @@ but may have different types.
 
 **Returned value**
 
--   `NaN` if all the weights are equal to 0 or the supplied weights parameter is empty.
--   Weighted mean otherwise.
+- `NaN` if all the weights are equal to 0 or the supplied weights parameter is empty.
+- Weighted mean otherwise.
 
 **Return type** is always [Float64](../../../sql-reference/data-types/float.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/contingency.md b/docs/en/sql-reference/aggregate-functions/reference/contingency.md
index e75537778fe..1b53ca1528f 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/contingency.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/contingency.md
@@ -5,7 +5,7 @@ sidebar_position: 350
 
 # contingency
 
-The `contingency` function calculates the [contingency coefficient](https://en.wikipedia.org/wiki/Contingency_table#Cram%C3%A9r's_V_and_the_contingency_coefficient_C), a value that measures the association between two columns in a table. The computation is similar to [the `cramersV` function](./cramersv) but with a different denominator in the square root.
+The `contingency` function calculates the [contingency coefficient](https://en.wikipedia.org/wiki/Contingency_table#Cram%C3%A9r's_V_and_the_contingency_coefficient_C), a value that measures the association between two columns in a table. The computation is similar to [the `cramersV` function](./cramersv.md) but with a different denominator in the square root.
 
 
 **Syntax**
@@ -16,11 +16,11 @@ contingency(column1, column2)
 
 **Arguments**
 
--   `column1` and `column2` are the columns to be compared
+- `column1` and `column2` are the columns to be compared
 
 **Returned value**
 
--  a value between 0 to 1. The larger the result, the closer the association of the two columns.
+- a value between 0 to 1. The larger the result, the closer the association of the two columns.
 
 **Return type** is always [Float64](../../../sql-reference/data-types/float.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/count.md b/docs/en/sql-reference/aggregate-functions/reference/count.md
index 356f731ff16..a98c8e50174 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/count.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/count.md
@@ -9,20 +9,20 @@ Counts the number of rows or not-NULL values.
 
 ClickHouse supports the following syntaxes for `count`:
 
--   `count(expr)` or `COUNT(DISTINCT expr)`.
--   `count()` or `COUNT(*)`. The `count()` syntax is ClickHouse-specific.
+- `count(expr)` or `COUNT(DISTINCT expr)`.
+- `count()` or `COUNT(*)`. The `count()` syntax is ClickHouse-specific.
 
 **Arguments**
 
 The function can take:
 
--   Zero parameters.
--   One [expression](../../../sql-reference/syntax.md#syntax-expressions).
+- Zero parameters.
+- One [expression](../../../sql-reference/syntax.md#syntax-expressions).
 
 **Returned value**
 
--   If the function is called without parameters it counts the number of rows.
--   If the [expression](../../../sql-reference/syntax.md#syntax-expressions) is passed, then the function counts how many times this expression returned not null. If the expression returns a [Nullable](../../../sql-reference/data-types/nullable.md)-type value, then the result of `count` stays not `Nullable`. The function returns 0 if the expression returned `NULL` for all the rows.
+- If the function is called without parameters it counts the number of rows.
+- If the [expression](../../../sql-reference/syntax.md#syntax-expressions) is passed, then the function counts how many times this expression returned not null. If the expression returns a [Nullable](../../../sql-reference/data-types/nullable.md)-type value, then the result of `count` stays not `Nullable`. The function returns 0 if the expression returned `NULL` for all the rows.
 
 In both cases the type of the returned value is [UInt64](../../../sql-reference/data-types/int-uint.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/cramersv.md b/docs/en/sql-reference/aggregate-functions/reference/cramersv.md
index fa37e3b5781..f412724ea08 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/cramersv.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/cramersv.md
@@ -15,11 +15,11 @@ cramersV(column1, column2)
 
 **Arguments**
 
--   `column1` and `column2` are the columns to be compared
+- `column1` and `column2` are the columns to be compared
 
 **Returned value**
 
--  a value between 0 (corresponding to no association between the columns' values) to 1 (complete association).
+- a value between 0 (corresponding to no association between the columns' values) to 1 (complete association).
 
 **Return type** is always [Float64](../../../sql-reference/data-types/float.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/cramersvbiascorrected.md b/docs/en/sql-reference/aggregate-functions/reference/cramersvbiascorrected.md
index 51524033147..8e577efbc4d 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/cramersvbiascorrected.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/cramersvbiascorrected.md
@@ -6,7 +6,7 @@ sidebar_position: 352
 # cramersVBiasCorrected
 
 
-Cramér's V is a measure of association between two columns in a table. The result of the [`cramersV` function](./cramersv) ranges from 0 (corresponding to no association between the variables) to 1 and can reach 1 only when each value is completely determined by the other. The function can be heavily biased, so this version of Cramér's V uses the [bias correction](https://en.wikipedia.org/wiki/Cram%C3%A9r%27s_V#Bias_correction).
+Cramér's V is a measure of association between two columns in a table. The result of the [`cramersV` function](./cramersv.md) ranges from 0 (corresponding to no association between the variables) to 1 and can reach 1 only when each value is completely determined by the other. The function can be heavily biased, so this version of Cramér's V uses the [bias correction](https://en.wikipedia.org/wiki/Cram%C3%A9r%27s_V#Bias_correction).
 
 
 
@@ -18,11 +18,11 @@ cramersVBiasCorrected(column1, column2)
 
 **Arguments**
 
--   `column1` and `column2` are the columns to be compared
+- `column1` and `column2` are the columns to be compared
 
 **Returned value**
 
--  a value between 0 (corresponding to no association between the columns' values) to 1 (complete association).
+- a value between 0 (corresponding to no association between the columns' values) to 1 (complete association).
 
 **Return type** is always [Float64](../../../sql-reference/data-types/float.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/deltasum.md b/docs/en/sql-reference/aggregate-functions/reference/deltasum.md
index d5d9e9369a4..37d9d08cbdb 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/deltasum.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/deltasum.md
@@ -19,7 +19,7 @@ deltaSum(value)
 
 **Arguments**
 
--   `value` — Input values, must be [Integer](../../data-types/int-uint.md) or [Float](../../data-types/float.md) type.
+- `value` — Input values, must be [Integer](../../data-types/int-uint.md) or [Float](../../data-types/float.md) type.
 
 **Returned value**
 
@@ -71,4 +71,4 @@ Result:
 
 ## See Also
 
--   [runningDifference](../../functions/other-functions.md#other_functions-runningdifference)
+- [runningDifference](../../functions/other-functions.md#other_functions-runningdifference)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md b/docs/en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
index e08e69b7cf6..c51d86389b0 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
@@ -6,7 +6,7 @@ title: deltaSumTimestamp
 
 Adds the difference between consecutive rows. If the difference is negative, it is ignored.
 
-This function is primarily for [materialized views](../../../sql-reference/statements/create/view.md#materialized) that are ordered by some time bucket-aligned timestamp, for example, a `toStartOfMinute` bucket. Because the rows in such a materialized view will all have the same timestamp, it is impossible for them to be merged in the "right" order. This function keeps track of the `timestamp` of the values it's seen, so it's possible to order the states correctly during merging.
+This function is primarily for [materialized views](../../../sql-reference/statements/create/view.md#materialized) that store data ordered by some time bucket-aligned timestamp, for example, a `toStartOfMinute` bucket. Because the rows in such a materialized view will all have the same timestamp, it is impossible for them to be merged in the correct order, without storing the original, unrounded timestamp value. The `deltaSumTimestamp` function keeps track of the original `timestamp` of the values it's seen, so the values (states) of the function are correctly computed during merging of parts.
 
 To calculate the delta sum across an ordered collection you can simply use the [deltaSum](../../../sql-reference/aggregate-functions/reference/deltasum.md#agg_functions-deltasum) function.
 
@@ -18,12 +18,12 @@ deltaSumTimestamp(value, timestamp)
 
 **Arguments**
 
--   `value` — Input values, must be some [Integer](../../data-types/int-uint.md) type or [Float](../../data-types/float.md) type or a [Date](../../data-types/date.md) or [DateTime](../../data-types/datetime.md).
--   `timestamp` — The parameter for order values, must be some [Integer](../../data-types/int-uint.md) type or [Float](../../data-types/float.md) type or a [Date](../../data-types/date.md) or [DateTime](../../data-types/datetime.md).
+- `value` — Input values, must be some [Integer](../../data-types/int-uint.md) type or [Float](../../data-types/float.md) type or a [Date](../../data-types/date.md) or [DateTime](../../data-types/datetime.md).
+- `timestamp` — The parameter for order values, must be some [Integer](../../data-types/int-uint.md) type or [Float](../../data-types/float.md) type or a [Date](../../data-types/date.md) or [DateTime](../../data-types/datetime.md).
 
 **Returned value**
 
--   Accumulated differences between consecutive values, ordered by the `timestamp` parameter.
+- Accumulated differences between consecutive values, ordered by the `timestamp` parameter.
 
 Type: [Integer](../../data-types/int-uint.md) or [Float](../../data-types/float.md) or [Date](../../data-types/date.md) or [DateTime](../../data-types/datetime.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/entropy.md b/docs/en/sql-reference/aggregate-functions/reference/entropy.md
index d86f4f4197a..fc8d627ecab 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/entropy.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/entropy.md
@@ -15,11 +15,11 @@ entropy(val)
 
 **Arguments**
 
--   `val` — Column of values of any type.
+- `val` — Column of values of any type.
 
 **Returned value**
 
--   Shannon entropy.
+- Shannon entropy.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/exponentialmovingaverage.md b/docs/en/sql-reference/aggregate-functions/reference/exponentialmovingaverage.md
index 2587bc5533f..a8203c6b3f4 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/exponentialmovingaverage.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/exponentialmovingaverage.md
@@ -11,19 +11,19 @@ sidebar_title: exponentialMovingAverage
 **Syntax**
 
 ```sql
-exponentialMovingAverage(x)(value, timestamp)
+exponentialMovingAverage(x)(value, timeunit)
 ```
 
-Each `value` corresponds to the determinate `timestamp`. The half-life `x` is the time lag at which the exponential weights decay by one-half. The function returns a weighted average: the older the time point, the less weight the corresponding value is considered to be.
+Each `value` corresponds to the determinate `timeunit`. The half-life `x` is the time lag at which the exponential weights decay by one-half. The function returns a weighted average: the older the time point, the less weight the corresponding value is considered to be.
 
 **Arguments**
 
--   `value` — Value. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
--   `timestamp` — Timestamp. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `value` — Value. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `timeunit` — Timeunit. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md). Timeunit is not timestamp (seconds), it's -- an index of the time interval. Can be calculated using [intDiv](../../functions/arithmetic-functions.md#intdiva-b).
 
 **Parameters**
 
--   `x` — Half-life period. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `x` — Half-life period. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
 
 **Returned values**
 
@@ -148,3 +148,58 @@ Result:
 │     1 │   49 │                0.825 │ █████████████████████████████████████████▎│
 └───────┴──────┴──────────────────────┴────────────────────────────────────────────┘
 ```
+
+```sql
+CREATE TABLE data
+ENGINE = Memory AS
+SELECT
+    10 AS value,
+    toDateTime('2020-01-01') + (3600 * number) AS time
+FROM numbers_mt(10);
+
+
+-- Calculate timeunit using intDiv
+SELECT
+    value,
+    time,
+    exponentialMovingAverage(1)(value, intDiv(toUInt32(time), 3600)) OVER (ORDER BY time ASC) AS res,
+    intDiv(toUInt32(time), 3600) AS timeunit
+FROM data
+ORDER BY time ASC;
+
+┌─value─┬────────────────time─┬─────────res─┬─timeunit─┐
+│    10 │ 2020-01-01 00:00:00 │           5 │   438288 │
+│    10 │ 2020-01-01 01:00:00 │         7.5 │   438289 │
+│    10 │ 2020-01-01 02:00:00 │        8.75 │   438290 │
+│    10 │ 2020-01-01 03:00:00 │       9.375 │   438291 │
+│    10 │ 2020-01-01 04:00:00 │      9.6875 │   438292 │
+│    10 │ 2020-01-01 05:00:00 │     9.84375 │   438293 │
+│    10 │ 2020-01-01 06:00:00 │    9.921875 │   438294 │
+│    10 │ 2020-01-01 07:00:00 │   9.9609375 │   438295 │
+│    10 │ 2020-01-01 08:00:00 │  9.98046875 │   438296 │
+│    10 │ 2020-01-01 09:00:00 │ 9.990234375 │   438297 │
+└───────┴─────────────────────┴─────────────┴──────────┘
+
+
+-- Calculate timeunit using toRelativeHourNum
+SELECT
+    value,
+    time,
+    exponentialMovingAverage(1)(value, toRelativeHourNum(time)) OVER (ORDER BY time ASC) AS res,
+    toRelativeHourNum(time) AS timeunit
+FROM data
+ORDER BY time ASC;
+
+┌─value─┬────────────────time─┬─────────res─┬─timeunit─┐
+│    10 │ 2020-01-01 00:00:00 │           5 │   438288 │
+│    10 │ 2020-01-01 01:00:00 │         7.5 │   438289 │
+│    10 │ 2020-01-01 02:00:00 │        8.75 │   438290 │
+│    10 │ 2020-01-01 03:00:00 │       9.375 │   438291 │
+│    10 │ 2020-01-01 04:00:00 │      9.6875 │   438292 │
+│    10 │ 2020-01-01 05:00:00 │     9.84375 │   438293 │
+│    10 │ 2020-01-01 06:00:00 │    9.921875 │   438294 │
+│    10 │ 2020-01-01 07:00:00 │   9.9609375 │   438295 │
+│    10 │ 2020-01-01 08:00:00 │  9.98046875 │   438296 │
+│    10 │ 2020-01-01 09:00:00 │ 9.990234375 │   438297 │
+└───────┴─────────────────────┴─────────────┴──────────┘
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/first_value.md b/docs/en/sql-reference/aggregate-functions/reference/first_value.md
new file mode 100644
index 00000000000..f343ca3f66c
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/first_value.md
@@ -0,0 +1,55 @@
+---
+slug: /en/sql-reference/aggregate-functions/reference/first_value
+sidebar_position: 7
+---
+
+# first_value
+
+Selects the first encountered value, similar to `any`, but could accept NULL.
+
+## examples
+
+```sql
+insert into test_data (a,b) values (1,null), (2,3), (4, 5), (6,null)
+```
+
+### example1
+The NULL value is ignored at default.
+```sql
+select first_value(b) from test_data
+```
+
+```text
+┌─first_value_ignore_nulls(b)─┐
+│                           3 │
+└─────────────────────────────┘
+
+```
+
+### example2
+The NULL value is ignored.
+```sql
+select first_value(b) ignore nulls from test_data
+```
+
+```text
+┌─first_value_ignore_nulls(b)─┐
+│                           3 │
+└─────────────────────────────┘
+
+```
+
+### example3
+The NULL value is accepted.
+```sql
+select first_value(b) respect nulls from test_data
+```
+
+```text
+
+┌─first_value_respect_nulls(b)─┐
+│                         ᴺᵁᴸᴸ │
+└──────────────────────────────┘
+```
+
+
diff --git a/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat.md b/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
index aafa643a972..d745e8a0e7a 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
@@ -15,19 +15,19 @@ groupArrayInsertAt(default_x, size)(x, pos)
 
 If in one query several values are inserted into the same position, the function behaves in the following ways:
 
--   If a query is executed in a single thread, the first one of the inserted values is used.
--   If a query is executed in multiple threads, the resulting value is an undetermined one of the inserted values.
+- If a query is executed in a single thread, the first one of the inserted values is used.
+- If a query is executed in multiple threads, the resulting value is an undetermined one of the inserted values.
 
 **Arguments**
 
--   `x` — Value to be inserted. [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in one of the [supported data types](../../../sql-reference/data-types/index.md).
--   `pos` — Position at which the specified element `x` is to be inserted. Index numbering in the array starts from zero. [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
--   `default_x` — Default value for substituting in empty positions. Optional parameter. [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in the data type configured for the `x` parameter. If `default_x` is not defined, the [default values](../../../sql-reference/statements/create/table.md#create-default-values) are used.
--   `size` — Length of the resulting array. Optional parameter. When using this parameter, the default value `default_x` must be specified. [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
+- `x` — Value to be inserted. [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in one of the [supported data types](../../../sql-reference/data-types/index.md).
+- `pos` — Position at which the specified element `x` is to be inserted. Index numbering in the array starts from zero. [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
+- `default_x` — Default value for substituting in empty positions. Optional parameter. [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in the data type configured for the `x` parameter. If `default_x` is not defined, the [default values](../../../sql-reference/statements/create/table.md#create-default-values) are used.
+- `size` — Length of the resulting array. Optional parameter. When using this parameter, the default value `default_x` must be specified. [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
 
 **Returned value**
 
--   Array with inserted values.
+- Array with inserted values.
 
 Type: [Array](../../../sql-reference/data-types/array.md#data-type-array).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg.md b/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
index 8fa1939e7d3..32c0608afeb 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
@@ -16,12 +16,12 @@ The function can take the window size as a parameter. If left unspecified, the f
 
 **Arguments**
 
--   `numbers_for_summing` — [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in a numeric data type value.
--   `window_size` — Size of the calculation window.
+- `numbers_for_summing` — [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in a numeric data type value.
+- `window_size` — Size of the calculation window.
 
 **Returned values**
 
--   Array of the same size and type as the input data.
+- Array of the same size and type as the input data.
 
 The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero). It truncates the decimal places insignificant for the resulting data type.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum.md b/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
index a51857418c6..6f2a60dd080 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
@@ -16,12 +16,12 @@ The function can take the window size as a parameter. If left unspecified, the f
 
 **Arguments**
 
--   `numbers_for_summing` — [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in a numeric data type value.
--   `window_size` — Size of the calculation window.
+- `numbers_for_summing` — [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in a numeric data type value.
+- `window_size` — Size of the calculation window.
 
 **Returned values**
 
--   Array of the same size and type as the input data.
+- Array of the same size and type as the input data.
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/grouparraysample.md b/docs/en/sql-reference/aggregate-functions/reference/grouparraysample.md
index 26c41c6636b..393087161df 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/grouparraysample.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/grouparraysample.md
@@ -15,13 +15,13 @@ groupArraySample(max_size[, seed])(x)
 
 **Arguments**
 
--   `max_size` — Maximum size of the resulting array. [UInt64](../../data-types/int-uint.md).
--   `seed` — Seed for the random number generator. Optional. [UInt64](../../data-types/int-uint.md). Default value: `123456`.
--   `x` — Argument (column name or expression).
+- `max_size` — Maximum size of the resulting array. [UInt64](../../data-types/int-uint.md).
+- `seed` — Seed for the random number generator. Optional. [UInt64](../../data-types/int-uint.md). Default value: `123456`.
+- `x` — Argument (column name or expression).
 
 **Returned values**
 
--   Array of randomly selected `x` arguments.
+- Array of randomly selected `x` arguments.
 
 Type: [Array](../../data-types/array.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/groupbitand.md b/docs/en/sql-reference/aggregate-functions/reference/groupbitand.md
index f89e3796aaa..5f57407a419 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/groupbitand.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/groupbitand.md
@@ -13,11 +13,11 @@ groupBitAnd(expr)
 
 **Arguments**
 
-`expr` – An expression that results in `UInt*` type.
+`expr` – An expression that results in `UInt*` or `Int*` type.
 
 **Return value**
 
-Value of the `UInt*` type.
+Value of the `UInt*` or `Int*` type.
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/groupbitor.md b/docs/en/sql-reference/aggregate-functions/reference/groupbitor.md
index 75b34d9c5a3..59be69540b0 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/groupbitor.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/groupbitor.md
@@ -13,11 +13,11 @@ groupBitOr(expr)
 
 **Arguments**
 
-`expr` – An expression that results in `UInt*` type.
+`expr` – An expression that results in `UInt*` or `Int*` type.
 
 **Returned value**
 
-Value of the `UInt*` type.
+Value of the `UInt*` or `Int*` type.
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/groupbitxor.md b/docs/en/sql-reference/aggregate-functions/reference/groupbitxor.md
index ca6fb9f8352..b00876a2fdf 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/groupbitxor.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/groupbitxor.md
@@ -13,11 +13,11 @@ groupBitXor(expr)
 
 **Arguments**
 
-`expr` – An expression that results in `UInt*` type.
+`expr` – An expression that results in `UInt*` or `Int*` type.
 
 **Return value**
 
-Value of the `UInt*` type.
+Value of the `UInt*` or `Int*` type.
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/index.md b/docs/en/sql-reference/aggregate-functions/reference/index.md
index bd8e72e0fec..50208352f38 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/index.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/index.md
@@ -9,75 +9,77 @@ toc_hidden: true
 
 Standard aggregate functions:
 
--   [count](../../../sql-reference/aggregate-functions/reference/count.md)
--   [min](../../../sql-reference/aggregate-functions/reference/min.md)
--   [max](../../../sql-reference/aggregate-functions/reference/max.md)
--   [sum](../../../sql-reference/aggregate-functions/reference/sum.md)
--   [avg](../../../sql-reference/aggregate-functions/reference/avg.md)
--   [any](../../../sql-reference/aggregate-functions/reference/any.md)
--   [stddevPop](../../../sql-reference/aggregate-functions/reference/stddevpop.md)
--   [stddevSamp](../../../sql-reference/aggregate-functions/reference/stddevsamp.md)
--   [varPop](../../../sql-reference/aggregate-functions/reference/varpop.md)
--   [varSamp](../../../sql-reference/aggregate-functions/reference/varsamp.md)
--   [covarPop](../../../sql-reference/aggregate-functions/reference/covarpop.md)
--   [covarSamp](../../../sql-reference/aggregate-functions/reference/covarsamp.md)
+- [count](../../../sql-reference/aggregate-functions/reference/count.md)
+- [min](../../../sql-reference/aggregate-functions/reference/min.md)
+- [max](../../../sql-reference/aggregate-functions/reference/max.md)
+- [sum](../../../sql-reference/aggregate-functions/reference/sum.md)
+- [avg](../../../sql-reference/aggregate-functions/reference/avg.md)
+- [any](../../../sql-reference/aggregate-functions/reference/any.md)
+- [stddevPop](../../../sql-reference/aggregate-functions/reference/stddevpop.md)
+- [stddevSamp](../../../sql-reference/aggregate-functions/reference/stddevsamp.md)
+- [varPop](../../../sql-reference/aggregate-functions/reference/varpop.md)
+- [varSamp](../../../sql-reference/aggregate-functions/reference/varsamp.md)
+- [covarPop](../../../sql-reference/aggregate-functions/reference/covarpop.md)
+- [covarSamp](../../../sql-reference/aggregate-functions/reference/covarsamp.md)
 
 ClickHouse-specific aggregate functions:
 
--   [anyHeavy](../../../sql-reference/aggregate-functions/reference/anyheavy.md)
--   [anyLast](../../../sql-reference/aggregate-functions/reference/anylast.md)
--   [argMin](../../../sql-reference/aggregate-functions/reference/argmin.md)
--   [argMax](../../../sql-reference/aggregate-functions/reference/argmax.md)
--   [avgWeighted](../../../sql-reference/aggregate-functions/reference/avgweighted.md)
--   [topK](../../../sql-reference/aggregate-functions/reference/topk.md)
--   [topKWeighted](../../../sql-reference/aggregate-functions/reference/topkweighted.md)
--   [groupArray](../../../sql-reference/aggregate-functions/reference/grouparray.md)
--   [groupArrayLast](../../../sql-reference/aggregate-functions/reference/grouparraylast.md)
--   [groupUniqArray](../../../sql-reference/aggregate-functions/reference/groupuniqarray.md)
--   [groupArrayInsertAt](../../../sql-reference/aggregate-functions/reference/grouparrayinsertat.md)
--   [groupArrayMovingAvg](../../../sql-reference/aggregate-functions/reference/grouparraymovingavg.md)
--   [groupArrayMovingSum](../../../sql-reference/aggregate-functions/reference/grouparraymovingsum.md)
--   [groupBitAnd](../../../sql-reference/aggregate-functions/reference/groupbitand.md)
--   [groupBitOr](../../../sql-reference/aggregate-functions/reference/groupbitor.md)
--   [groupBitXor](../../../sql-reference/aggregate-functions/reference/groupbitxor.md)
--   [groupBitmap](../../../sql-reference/aggregate-functions/reference/groupbitmap.md)
--   [groupBitmapAnd](../../../sql-reference/aggregate-functions/reference/groupbitmapand.md)
--   [groupBitmapOr](../../../sql-reference/aggregate-functions/reference/groupbitmapor.md)
--   [groupBitmapXor](../../../sql-reference/aggregate-functions/reference/groupbitmapxor.md)
--   [sumWithOverflow](../../../sql-reference/aggregate-functions/reference/sumwithoverflow.md)
--   [sumMap](../../../sql-reference/aggregate-functions/reference/summap.md)
--   [minMap](../../../sql-reference/aggregate-functions/reference/minmap.md)
--   [maxMap](../../../sql-reference/aggregate-functions/reference/maxmap.md)
--   [skewSamp](../../../sql-reference/aggregate-functions/reference/skewsamp.md)
--   [skewPop](../../../sql-reference/aggregate-functions/reference/skewpop.md)
--   [kurtSamp](../../../sql-reference/aggregate-functions/reference/kurtsamp.md)
--   [kurtPop](../../../sql-reference/aggregate-functions/reference/kurtpop.md)
--   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md)
--   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md)
--   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md)
--   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md)
--   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md)
--   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md)
--   [quantile](../../../sql-reference/aggregate-functions/reference/quantile.md)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md)
--   [quantileExact](../../../sql-reference/aggregate-functions/reference/quantileexact.md)
--   [quantileExactLow](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexactlow)
--   [quantileExactHigh](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexacthigh)
--   [quantileExactWeighted](../../../sql-reference/aggregate-functions/reference/quantileexactweighted.md)
--   [quantileTiming](../../../sql-reference/aggregate-functions/reference/quantiletiming.md)
--   [quantileTimingWeighted](../../../sql-reference/aggregate-functions/reference/quantiletimingweighted.md)
--   [quantileDeterministic](../../../sql-reference/aggregate-functions/reference/quantiledeterministic.md)
--   [quantileTDigest](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md)
--   [quantileTDigestWeighted](../../../sql-reference/aggregate-functions/reference/quantiletdigestweighted.md)
--   [quantileBFloat16](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16)
--   [quantileBFloat16Weighted](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16weighted)
--   [simpleLinearRegression](../../../sql-reference/aggregate-functions/reference/simplelinearregression.md)
--   [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md)
--   [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md)
--   [categoricalInformationValue](../../../sql-reference/aggregate-functions/reference/categoricalinformationvalue.md)
--   [contingency](./contingency.md)
--   [cramersV](./cramersv.md)
--   [cramersVBiasCorrected](./cramersvbiascorrected.md)
--   [theilsU](./theilsu.md)
--   [maxIntersections](./maxintersections.md)
--   [maxIntersectionsPosition](./maxintersectionsposition.md)
+- [anyHeavy](../../../sql-reference/aggregate-functions/reference/anyheavy.md)
+- [anyLast](../../../sql-reference/aggregate-functions/reference/anylast.md)
+- [first_value](../../../sql-reference/aggregate-functions/reference/first_value.md)
+- [last_value](../../../sql-reference/aggregate-functions/reference/last_value.md)
+- [argMin](../../../sql-reference/aggregate-functions/reference/argmin.md)
+- [argMax](../../../sql-reference/aggregate-functions/reference/argmax.md)
+- [avgWeighted](../../../sql-reference/aggregate-functions/reference/avgweighted.md)
+- [topK](../../../sql-reference/aggregate-functions/reference/topk.md)
+- [topKWeighted](../../../sql-reference/aggregate-functions/reference/topkweighted.md)
+- [groupArray](../../../sql-reference/aggregate-functions/reference/grouparray.md)
+- [groupArrayLast](../../../sql-reference/aggregate-functions/reference/grouparraylast.md)
+- [groupUniqArray](../../../sql-reference/aggregate-functions/reference/groupuniqarray.md)
+- [groupArrayInsertAt](../../../sql-reference/aggregate-functions/reference/grouparrayinsertat.md)
+- [groupArrayMovingAvg](../../../sql-reference/aggregate-functions/reference/grouparraymovingavg.md)
+- [groupArrayMovingSum](../../../sql-reference/aggregate-functions/reference/grouparraymovingsum.md)
+- [groupBitAnd](../../../sql-reference/aggregate-functions/reference/groupbitand.md)
+- [groupBitOr](../../../sql-reference/aggregate-functions/reference/groupbitor.md)
+- [groupBitXor](../../../sql-reference/aggregate-functions/reference/groupbitxor.md)
+- [groupBitmap](../../../sql-reference/aggregate-functions/reference/groupbitmap.md)
+- [groupBitmapAnd](../../../sql-reference/aggregate-functions/reference/groupbitmapand.md)
+- [groupBitmapOr](../../../sql-reference/aggregate-functions/reference/groupbitmapor.md)
+- [groupBitmapXor](../../../sql-reference/aggregate-functions/reference/groupbitmapxor.md)
+- [sumWithOverflow](../../../sql-reference/aggregate-functions/reference/sumwithoverflow.md)
+- [sumMap](../../../sql-reference/aggregate-functions/reference/summap.md)
+- [minMap](../../../sql-reference/aggregate-functions/reference/minmap.md)
+- [maxMap](../../../sql-reference/aggregate-functions/reference/maxmap.md)
+- [skewSamp](../../../sql-reference/aggregate-functions/reference/skewsamp.md)
+- [skewPop](../../../sql-reference/aggregate-functions/reference/skewpop.md)
+- [kurtSamp](../../../sql-reference/aggregate-functions/reference/kurtsamp.md)
+- [kurtPop](../../../sql-reference/aggregate-functions/reference/kurtpop.md)
+- [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md)
+- [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md)
+- [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md)
+- [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md)
+- [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md)
+- [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md)
+- [quantile](../../../sql-reference/aggregate-functions/reference/quantile.md)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md)
+- [quantileExact](../../../sql-reference/aggregate-functions/reference/quantileexact.md)
+- [quantileExactLow](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexactlow)
+- [quantileExactHigh](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexacthigh)
+- [quantileExactWeighted](../../../sql-reference/aggregate-functions/reference/quantileexactweighted.md)
+- [quantileTiming](../../../sql-reference/aggregate-functions/reference/quantiletiming.md)
+- [quantileTimingWeighted](../../../sql-reference/aggregate-functions/reference/quantiletimingweighted.md)
+- [quantileDeterministic](../../../sql-reference/aggregate-functions/reference/quantiledeterministic.md)
+- [quantileTDigest](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md)
+- [quantileTDigestWeighted](../../../sql-reference/aggregate-functions/reference/quantiletdigestweighted.md)
+- [quantileBFloat16](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16)
+- [quantileBFloat16Weighted](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16weighted)
+- [simpleLinearRegression](../../../sql-reference/aggregate-functions/reference/simplelinearregression.md)
+- [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md)
+- [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md)
+- [categoricalInformationValue](../../../sql-reference/aggregate-functions/reference/categoricalinformationvalue.md)
+- [contingency](./contingency.md)
+- [cramersV](./cramersv.md)
+- [cramersVBiasCorrected](./cramersvbiascorrected.md)
+- [theilsU](./theilsu.md)
+- [maxIntersections](./maxintersections.md)
+- [maxIntersectionsPosition](./maxintersectionsposition.md)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/intervalLengthSum.md b/docs/en/sql-reference/aggregate-functions/reference/intervalLengthSum.md
index e161a8c5754..5990345b765 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/intervalLengthSum.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/intervalLengthSum.md
@@ -15,8 +15,8 @@ intervalLengthSum(start, end)
 
 **Arguments**
 
--   `start` — The starting value of the interval. [Int32](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [Int64](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [UInt32](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [UInt64](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [Float32](../../../sql-reference/data-types/float.md#float32-float64), [Float64](../../../sql-reference/data-types/float.md#float32-float64), [DateTime](../../../sql-reference/data-types/datetime.md#data_type-datetime) or [Date](../../../sql-reference/data-types/date.md#data_type-date).
--   `end` — The ending value of the interval. [Int32](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [Int64](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [UInt32](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [UInt64](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [Float32](../../../sql-reference/data-types/float.md#float32-float64), [Float64](../../../sql-reference/data-types/float.md#float32-float64), [DateTime](../../../sql-reference/data-types/datetime.md#data_type-datetime) or [Date](../../../sql-reference/data-types/date.md#data_type-date).
+- `start` — The starting value of the interval. [Int32](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [Int64](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [UInt32](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [UInt64](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [Float32](../../../sql-reference/data-types/float.md#float32-float64), [Float64](../../../sql-reference/data-types/float.md#float32-float64), [DateTime](../../../sql-reference/data-types/datetime.md#data_type-datetime) or [Date](../../../sql-reference/data-types/date.md#data_type-date).
+- `end` — The ending value of the interval. [Int32](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [Int64](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [UInt32](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [UInt64](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64), [Float32](../../../sql-reference/data-types/float.md#float32-float64), [Float64](../../../sql-reference/data-types/float.md#float32-float64), [DateTime](../../../sql-reference/data-types/datetime.md#data_type-datetime) or [Date](../../../sql-reference/data-types/date.md#data_type-date).
 
 :::note
 Arguments must be of the same data type. Otherwise, an exception will be thrown.
@@ -24,7 +24,7 @@ Arguments must be of the same data type. Otherwise, an exception will be thrown.
 
 **Returned value**
 
--   Total length of union of all ranges (segments on numeric axis). Depending on the type of the argument, the return value may be [UInt64](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64) or [Float64](../../../sql-reference/data-types/float.md#float32-float64) type.
+- Total length of union of all ranges (segments on numeric axis). Depending on the type of the argument, the return value may be [UInt64](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64) or [Float64](../../../sql-reference/data-types/float.md#float32-float64) type.
 
 **Examples**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/kolmogorovsmirnovtest.md b/docs/en/sql-reference/aggregate-functions/reference/kolmogorovsmirnovtest.md
new file mode 100644
index 00000000000..3da9645181e
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/kolmogorovsmirnovtest.md
@@ -0,0 +1,118 @@
+---
+slug: /en/sql-reference/aggregate-functions/reference/kolmogorovsmirnovtest
+sidebar_position: 300
+sidebar_label: kolmogorovSmirnovTest
+---
+
+# kolmogorovSmirnovTest
+
+Applies Kolmogorov-Smirnov's test to samples from two populations.
+
+**Syntax**
+
+``` sql
+kolmogorovSmirnovTest([alternative, computation_method])(sample_data, sample_index)
+```
+
+Values of both samples are in the `sample_data` column. If `sample_index` equals to 0 then the value in that row belongs to the sample from the first population. Otherwise it belongs to the sample from the second population.
+Samples must belong to continuous, one-dimensional probability distributions.
+
+**Arguments**
+
+- `sample_data` — Sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `sample_index` — Sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
+
+**Parameters**
+
+- `alternative` — alternative hypothesis. (Optional, default: `'two-sided'`.) [String](../../../sql-reference/data-types/string.md).
+    Let F(x) and G(x) be the CDFs of the first and second distributions respectively.
+    - `'two-sided'`
+        The null hypothesis is that samples come from the same distribution, e.g. F(x) = G(x) for all x.
+        And the alternative is that the distributions are not identical.
+    - `'greater'`
+        The null hypothesis is that values in the first sample are *stohastically smaller* than those in the second one,
+        e.g. the CDF of first distribution lies above and hence to the left of that for the second one.
+        Which in fact means that F(x) >= G(x) for all x. And the alternative in this case is that F(x) < G(x) for at least one x.
+    - `'less'`.
+        The null hypothesis is that values in the first sample are *stohastically greater* than those in the second one,
+        e.g. the CDF of first distribution lies below and hence to the right of that for the second one.
+        Which in fact means that F(x) <= G(x) for all x. And the alternative in this case is that F(x) > G(x) for at least one x.
+- `computation_method` — the method used to compute p-value. (Optional, default: `'auto'`.) [String](../../../sql-reference/data-types/string.md).
+    - `'exact'` - calculation is performed using precise probability distribution of the test statistics. Compute intensive and wasteful except for small samples.
+    - `'asymp'` (`'asymptotic'`) - calculation is performed using an approximation. For large sample sizes, the exact and asymptotic p-values are very similar.
+    - `'auto'`  - the `'exact'` method is used when a maximum number of samples is less than 10'000.
+
+
+**Returned values**
+
+[Tuple](../../../sql-reference/data-types/tuple.md) with two elements:
+
+- calculated statistic. [Float64](../../../sql-reference/data-types/float.md).
+- calculated p-value. [Float64](../../../sql-reference/data-types/float.md).
+
+
+**Example**
+
+Query:
+
+``` sql
+SELECT kolmogorovSmirnovTest('less', 'exact')(value, num)
+FROM
+(
+    SELECT
+        randNormal(0, 10) AS value,
+        0 AS num
+    FROM numbers(10000)
+    UNION ALL
+    SELECT
+        randNormal(0, 10) AS value,
+        1 AS num
+    FROM numbers(10000)
+)
+```
+
+Result:
+
+``` text
+┌─kolmogorovSmirnovTest('less', 'exact')(value, num)─┐
+│ (0.009899999999999996,0.37528595205132287)         │
+└────────────────────────────────────────────────────┘
+```
+
+Note:
+P-value is bigger than 0.05 (for confidence level of 95%), so null hypothesis is not rejected.
+
+
+Query:
+
+``` sql
+SELECT kolmogorovSmirnovTest('two-sided', 'exact')(value, num)
+FROM
+(
+    SELECT
+        randStudentT(10) AS value,
+        0 AS num
+    FROM numbers(100)
+    UNION ALL
+    SELECT
+        randNormal(0, 10) AS value,
+        1 AS num
+    FROM numbers(100)
+)
+```
+
+Result:
+
+``` text
+┌─kolmogorovSmirnovTest('two-sided', 'exact')(value, num)─┐
+│ (0.4100000000000002,6.61735760482795e-8)                │
+└─────────────────────────────────────────────────────────┘
+```
+
+Note:
+P-value is less than 0.05 (for confidence level of 95%), so null hypothesis is rejected.
+
+
+**See Also**
+
+- [Kolmogorov-Smirnov'test](https://en.wikipedia.org/wiki/Kolmogorov%E2%80%93Smirnov_test)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/last_value.md b/docs/en/sql-reference/aggregate-functions/reference/last_value.md
new file mode 100644
index 00000000000..7b6e14e4a55
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/last_value.md
@@ -0,0 +1,53 @@
+---
+slug: /en/sql-reference/aggregate-functions/reference/last_value
+sidebar_position: 8
+---
+
+# last_value
+
+Selects the last encountered value, similar to `anyLast`, but could accept NULL.
+
+
+## examples
+
+```sql
+insert into test_data (a,b) values (1,null), (2,3), (4, 5), (6,null)
+```
+
+### example1
+The NULL value is ignored at default.
+```sql
+select last_value(b) from test_data
+```
+
+```text
+┌─last_value_ignore_nulls(b)─┐
+│                          5 │
+└────────────────────────────┘
+```
+
+### example2
+The NULL value is ignored.
+```sql
+select last_value(b) ignore nulls from test_data
+```
+
+```text
+┌─last_value_ignore_nulls(b)─┐
+│                          5 │
+└────────────────────────────┘
+```
+
+### example3
+The NULL value is accepted.
+```sql
+select last_value(b) respect nulls from test_data
+```
+
+```text
+┌─last_value_respect_nulls(b)─┐
+│                        ᴺᵁᴸᴸ │
+└─────────────────────────────┘
+```
+
+
diff --git a/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md b/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
index 70c75b898c6..af744f445d9 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
@@ -19,23 +19,23 @@ The null hypothesis is that two populations are stochastically equal. Also one-s
 
 **Arguments**
 
--   `sample_data` — sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
--   `sample_index` — sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
+- `sample_data` — sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `sample_index` — sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
 
 **Parameters**
 
--   `alternative` — alternative hypothesis. (Optional, default: `'two-sided'`.) [String](../../../sql-reference/data-types/string.md).
-    -   `'two-sided'`;
-    -   `'greater'`;
-    -   `'less'`.
--   `continuity_correction` — if not 0 then continuity correction in the normal approximation for the p-value is applied. (Optional, default: 1.) [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `alternative` — alternative hypothesis. (Optional, default: `'two-sided'`.) [String](../../../sql-reference/data-types/string.md).
+    - `'two-sided'`;
+    - `'greater'`;
+    - `'less'`.
+- `continuity_correction` — if not 0 then continuity correction in the normal approximation for the p-value is applied. (Optional, default: 1.) [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
 [Tuple](../../../sql-reference/data-types/tuple.md) with two elements:
 
--   calculated U-statistic. [Float64](../../../sql-reference/data-types/float.md).
--   calculated p-value. [Float64](../../../sql-reference/data-types/float.md).
+- calculated U-statistic. [Float64](../../../sql-reference/data-types/float.md).
+- calculated p-value. [Float64](../../../sql-reference/data-types/float.md).
 
 
 **Example**
@@ -69,5 +69,5 @@ Result:
 
 **See Also**
 
--   [Mann–Whitney U test](https://en.wikipedia.org/wiki/Mann%E2%80%93Whitney_U_test)
--   [Stochastic ordering](https://en.wikipedia.org/wiki/Stochastic_ordering)
+- [Mann–Whitney U test](https://en.wikipedia.org/wiki/Mann%E2%80%93Whitney_U_test)
+- [Stochastic ordering](https://en.wikipedia.org/wiki/Stochastic_ordering)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/meanztest.md b/docs/en/sql-reference/aggregate-functions/reference/meanztest.md
index 89742ca1509..1cf2bebf26f 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/meanztest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/meanztest.md
@@ -19,23 +19,23 @@ The null hypothesis is that means of populations are equal. Normal distribution
 
 **Arguments**
 
--   `sample_data` — Sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
--   `sample_index` — Sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
+- `sample_data` — Sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `sample_index` — Sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
 
 **Parameters**
 
--   `population_variance_x` — Variance for population x. [Float](../../../sql-reference/data-types/float.md).
--   `population_variance_y` — Variance for population y. [Float](../../../sql-reference/data-types/float.md).
--   `confidence_level` — Confidence level in order to calculate confidence intervals. [Float](../../../sql-reference/data-types/float.md).
+- `population_variance_x` — Variance for population x. [Float](../../../sql-reference/data-types/float.md).
+- `population_variance_y` — Variance for population y. [Float](../../../sql-reference/data-types/float.md).
+- `confidence_level` — Confidence level in order to calculate confidence intervals. [Float](../../../sql-reference/data-types/float.md).
 
 **Returned values**
 
 [Tuple](../../../sql-reference/data-types/tuple.md) with four elements:
 
--   calculated t-statistic. [Float64](../../../sql-reference/data-types/float.md).
--   calculated p-value. [Float64](../../../sql-reference/data-types/float.md).
--   calculated confidence-interval-low. [Float64](../../../sql-reference/data-types/float.md).
--   calculated confidence-interval-high. [Float64](../../../sql-reference/data-types/float.md).
+- calculated t-statistic. [Float64](../../../sql-reference/data-types/float.md).
+- calculated p-value. [Float64](../../../sql-reference/data-types/float.md).
+- calculated confidence-interval-low. [Float64](../../../sql-reference/data-types/float.md).
+- calculated confidence-interval-high. [Float64](../../../sql-reference/data-types/float.md).
 
 
 **Example**
diff --git a/docs/en/sql-reference/aggregate-functions/reference/median.md b/docs/en/sql-reference/aggregate-functions/reference/median.md
index 5ac3c6ef721..f20b23a0c8b 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/median.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/median.md
@@ -9,15 +9,15 @@ The `median*` functions are the aliases for the corresponding `quantile*` functi
 
 Functions:
 
--   `median` — Alias for [quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile).
--   `medianDeterministic` — Alias for [quantileDeterministic](../../../sql-reference/aggregate-functions/reference/quantiledeterministic.md#quantiledeterministic).
--   `medianExact` — Alias for [quantileExact](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexact).
--   `medianExactWeighted` — Alias for [quantileExactWeighted](../../../sql-reference/aggregate-functions/reference/quantileexactweighted.md#quantileexactweighted).
--   `medianTiming` — Alias for [quantileTiming](../../../sql-reference/aggregate-functions/reference/quantiletiming.md#quantiletiming).
--   `medianTimingWeighted` — Alias for [quantileTimingWeighted](../../../sql-reference/aggregate-functions/reference/quantiletimingweighted.md#quantiletimingweighted).
--   `medianTDigest` — Alias for [quantileTDigest](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md#quantiletdigest).
--   `medianTDigestWeighted` — Alias for [quantileTDigestWeighted](../../../sql-reference/aggregate-functions/reference/quantiletdigestweighted.md#quantiletdigestweighted).
--   `medianBFloat16` — Alias for [quantileBFloat16](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16).
+- `median` — Alias for [quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile).
+- `medianDeterministic` — Alias for [quantileDeterministic](../../../sql-reference/aggregate-functions/reference/quantiledeterministic.md#quantiledeterministic).
+- `medianExact` — Alias for [quantileExact](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexact).
+- `medianExactWeighted` — Alias for [quantileExactWeighted](../../../sql-reference/aggregate-functions/reference/quantileexactweighted.md#quantileexactweighted).
+- `medianTiming` — Alias for [quantileTiming](../../../sql-reference/aggregate-functions/reference/quantiletiming.md#quantiletiming).
+- `medianTimingWeighted` — Alias for [quantileTimingWeighted](../../../sql-reference/aggregate-functions/reference/quantiletimingweighted.md#quantiletimingweighted).
+- `medianTDigest` — Alias for [quantileTDigest](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md#quantiletdigest).
+- `medianTDigestWeighted` — Alias for [quantileTDigestWeighted](../../../sql-reference/aggregate-functions/reference/quantiletdigestweighted.md#quantiletdigestweighted).
+- `medianBFloat16` — Alias for [quantileBFloat16](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16).
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantile.md b/docs/en/sql-reference/aggregate-functions/reference/quantile.md
index 414574e00e6..91b6b1b0d80 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantile.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantile.md
@@ -23,18 +23,18 @@ Alias: `median`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
--   Approximate quantile of the specified level.
+- Approximate quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -65,5 +65,5 @@ Result:
 
 **See Also**
 
--   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantileGK.md b/docs/en/sql-reference/aggregate-functions/reference/quantileGK.md
new file mode 100644
index 00000000000..7352781d126
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantileGK.md
@@ -0,0 +1,76 @@
+---
+slug: /en/sql-reference/aggregate-functions/reference/quantileGK
+sidebar_position: 204
+---
+
+# quantileGK
+
+Computes the [quantile](https://en.wikipedia.org/wiki/Quantile) of a numeric data sequence using the [Greenwald-Khanna](http://infolab.stanford.edu/~datar/courses/cs361a/papers/quantiles.pdf) algorithm. The Greenwald-Khanna algorithm is an algorithm used to compute quantiles on a stream of data in a highly efficient manner. It was introduced by Michael Greenwald and Sanjeev Khanna in 2001. It is widely used in databases and big data systems where computing accurate quantiles on a large stream of data in real-time is necessary. The algorithm is highly efficient, taking only O(log n) space and O(log log n) time per item (where n is the size of the input). It is also highly accurate, providing an approximate quantile value with high probability.
+
+`quantileGK` is different from other quantile functions in ClickHouse, because it enables user to control the accuracy of the approximate quantile result.
+
+**Syntax**
+
+``` sql
+quantileGK(accuracy, level)(expr)
+```
+
+Alias: `medianGK`.
+
+**Arguments**
+
+- `accuracy` — Accuracy of quantile. Constant positive integer. Larger accuracy value means less error. For example, if the accuracy argument is set to 100, the computed quantile will have an error no greater than 1% with high probability. There is a trade-off between the accuracy of the computed quantiles and the computational complexity of the algorithm. A larger accuracy requires more memory and computational resources to compute the quantile accurately, while a smaller accuracy argument allows for a faster and more memory-efficient computation but with a slightly lower accuracy.
+
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+
+
+**Returned value**
+
+- Quantile of the specified level and accuracy.
+
+
+Type:
+
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+
+**Example**
+
+``` sql
+SELECT quantileGK(1, 0.25)(number + 1)
+FROM numbers(1000)
+
+┌─quantileGK(1, 0.25)(plus(number, 1))─┐
+│                                    1 │
+└──────────────────────────────────────┘
+
+SELECT quantileGK(10, 0.25)(number + 1)
+FROM numbers(1000)
+
+┌─quantileGK(10, 0.25)(plus(number, 1))─┐
+│                                   156 │
+└───────────────────────────────────────┘
+
+SELECT quantileGK(100, 0.25)(number + 1)
+FROM numbers(1000)
+
+┌─quantileGK(100, 0.25)(plus(number, 1))─┐
+│                                    251 │
+└────────────────────────────────────────┘
+
+SELECT quantileGK(1000, 0.25)(number + 1)
+FROM numbers(1000)
+
+┌─quantileGK(1000, 0.25)(plus(number, 1))─┐
+│                                     249 │
+└─────────────────────────────────────────┘
+```
+
+
+**See Also**
+
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md b/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
index 94feca9e69e..4377f2f1b17 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
@@ -18,15 +18,15 @@ Alias: `medianBFloat16`
 
 **Arguments**
 
--   `expr` — Column with numeric data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md).
+- `expr` — Column with numeric data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md).
 
 **Parameters**
 
--   `level` — Level of quantile. Optional. Possible values are in the range from 0 to 1. Default value: 0.5. [Float](../../../sql-reference/data-types/float.md).
+- `level` — Level of quantile. Optional. Possible values are in the range from 0 to 1. Default value: 0.5. [Float](../../../sql-reference/data-types/float.md).
 
 **Returned value**
 
--   Approximate quantile of the specified level.
+- Approximate quantile of the specified level.
 
 Type: [Float64](../../../sql-reference/data-types/float.md#float32-float64).
 
@@ -64,5 +64,5 @@ Like `quantileBFloat16` but takes into account the weight of each sequence membe
 
 **See Also**
 
--   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiledeterministic.md b/docs/en/sql-reference/aggregate-functions/reference/quantiledeterministic.md
index 26826afd126..7235c47da70 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiledeterministic.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiledeterministic.md
@@ -21,19 +21,19 @@ Alias: `medianDeterministic`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
--   `determinator` — Number whose hash is used instead of a random number generator in the reservoir sampling algorithm to make the result of sampling deterministic. As a determinator you can use any deterministic positive number, for example, a user id or an event id. If the same determinator value occures too often, the function works incorrectly.
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `determinator` — Number whose hash is used instead of a random number generator in the reservoir sampling algorithm to make the result of sampling deterministic. As a determinator you can use any deterministic positive number, for example, a user id or an event id. If the same determinator value occurs too often, the function works incorrectly.
 
 **Returned value**
 
--   Approximate quantile of the specified level.
+- Approximate quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -64,5 +64,5 @@ Result:
 
 **See Also**
 
--   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantileexact.md b/docs/en/sql-reference/aggregate-functions/reference/quantileexact.md
index 04fe597a34e..d7d7413c283 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantileexact.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantileexact.md
@@ -23,18 +23,18 @@ Alias: `medianExact`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
--   Quantile of the specified level.
+- Quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -82,18 +82,18 @@ Alias: `medianExactLow`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
--   Quantile of the specified level.
+- Quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -132,18 +132,18 @@ Alias: `medianExactHigh`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
--   Quantile of the specified level.
+- Quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -179,21 +179,21 @@ quantileExactExclusive(level)(expr)
 
 **Arguments**
 
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Parameters**
 
--   `level` — Level of quantile. Optional. Possible values: (0, 1) — bounds not included. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median). [Float](../../../sql-reference/data-types/float.md).
+- `level` — Level of quantile. Optional. Possible values: (0, 1) — bounds not included. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median). [Float](../../../sql-reference/data-types/float.md).
 
 **Returned value**
 
--   Quantile of the specified level.
+- Quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -231,21 +231,21 @@ quantileExactInclusive(level)(expr)
 
 **Arguments**
 
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Parameters**
 
--   `level` — Level of quantile. Optional. Possible values: [0, 1] — bounds included. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median). [Float](../../../sql-reference/data-types/float.md).
+- `level` — Level of quantile. Optional. Possible values: [0, 1] — bounds included. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median). [Float](../../../sql-reference/data-types/float.md).
 
 **Returned value**
 
--   Quantile of the specified level.
+- Quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -267,5 +267,5 @@ Result:
 
 **See Also**
 
--   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted.md b/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted.md
index 16e6438a3bf..34def8d7411 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted.md
@@ -21,19 +21,19 @@ Alias: `medianExactWeighted`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
--   `weight` — Column with weights of sequence members. Weight is a number of value occurrences.
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `weight` — Column with weights of sequence members. Weight is a number of value occurrences.
 
 **Returned value**
 
--   Quantile of the specified level.
+- Quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -64,5 +64,5 @@ Result:
 
 **See Also**
 
--   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantileinterpolatedweighted.md b/docs/en/sql-reference/aggregate-functions/reference/quantileinterpolatedweighted.md
index 07fcd187217..41d2627fb7b 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantileinterpolatedweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantileinterpolatedweighted.md
@@ -21,19 +21,19 @@ Alias: `medianInterpolatedWeighted`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
--   `weight` — Column with weights of sequence members. Weight is a number of value occurrences.
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `weight` — Column with weights of sequence members. Weight is a number of value occurrences.
 
 **Returned value**
 
--   Quantile of the specified level.
+- Quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -64,5 +64,5 @@ Result:
 
 **See Also**
 
--   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiles.md b/docs/en/sql-reference/aggregate-functions/reference/quantiles.md
index 57151915336..38db39d2eec 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiles.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiles.md
@@ -29,21 +29,21 @@ quantilesExactExclusive(level1, level2, ...)(expr)
 
 **Arguments**
 
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Parameters**
 
--   `level` — Levels of quantiles. Possible values: (0, 1) — bounds not included. [Float](../../../sql-reference/data-types/float.md).
+- `level` — Levels of quantiles. Possible values: (0, 1) — bounds not included. [Float](../../../sql-reference/data-types/float.md).
 
 **Returned value**
 
--   [Array](../../../sql-reference/data-types/array.md) of quantiles of the specified levels.
+- [Array](../../../sql-reference/data-types/array.md) of quantiles of the specified levels.
 
 Type of array values:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -81,21 +81,21 @@ quantilesExactInclusive(level1, level2, ...)(expr)
 
 **Arguments**
 
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Parameters**
 
--   `level` — Levels of quantiles. Possible values: [0, 1] — bounds included. [Float](../../../sql-reference/data-types/float.md).
+- `level` — Levels of quantiles. Possible values: [0, 1] — bounds included. [Float](../../../sql-reference/data-types/float.md).
 
 **Returned value**
 
--   [Array](../../../sql-reference/data-types/array.md) of quantiles of the specified levels.
+- [Array](../../../sql-reference/data-types/array.md) of quantiles of the specified levels.
 
 Type of array values:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -114,3 +114,59 @@ Result:
 │ [249.75,499.5,749.25,899.1,949.05,989.01,998.001]                   │
 └─────────────────────────────────────────────────────────────────────┘
 ```
+
+## quantilesGK
+
+`quantilesGK` works similarly with `quantileGK` but allows us to calculate quantities at different levels simultaneously and returns an array.
+
+**Syntax**
+
+``` sql
+quantilesGK(accuracy, level1, level2, ...)(expr)
+```
+
+**Returned value**
+
+- [Array](../../../sql-reference/data-types/array.md) of quantiles of the specified levels.
+
+Type of array values:
+
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+
+**Example**
+
+Query:
+
+
+``` sql
+SELECT quantilesGK(1, 0.25, 0.5, 0.75)(number + 1)
+FROM numbers(1000)
+
+┌─quantilesGK(1, 0.25, 0.5, 0.75)(plus(number, 1))─┐
+│ [1,1,1]                                          │
+└──────────────────────────────────────────────────┘
+
+SELECT quantilesGK(10, 0.25, 0.5, 0.75)(number + 1)
+FROM numbers(1000)
+
+┌─quantilesGK(10, 0.25, 0.5, 0.75)(plus(number, 1))─┐
+│ [156,413,659]                                     │
+└───────────────────────────────────────────────────┘
+
+
+SELECT quantilesGK(100, 0.25, 0.5, 0.75)(number + 1)
+FROM numbers(1000)
+
+┌─quantilesGK(100, 0.25, 0.5, 0.75)(plus(number, 1))─┐
+│ [251,498,741]                                      │
+└────────────────────────────────────────────────────┘
+
+SELECT quantilesGK(1000, 0.25, 0.5, 0.75)(number + 1)
+FROM numbers(1000)
+
+┌─quantilesGK(1000, 0.25, 0.5, 0.75)(plus(number, 1))─┐
+│ [249,499,749]                                       │
+└─────────────────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md
index 5da37a4832f..796e87b02d8 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md
@@ -23,18 +23,18 @@ Alias: `medianTDigest`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
--   Approximate quantile of the specified level.
+- Approximate quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -54,5 +54,5 @@ Result:
 
 **See Also**
 
--   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
index e7abe08e39f..7b9addbbdde 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
@@ -27,19 +27,19 @@ Alias: `medianTDigestWeighted`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
--   `weight` — Column with weights of sequence elements. Weight is a number of value occurrences.
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `expr` — Expression over the column values resulting in numeric [data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md).
+- `weight` — Column with weights of sequence elements. Weight is a number of value occurrences.
 
 **Returned value**
 
--   Approximate quantile of the specified level.
+- Approximate quantile of the specified level.
 
 Type:
 
--   [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
--   [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
--   [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
+- [Float64](../../../sql-reference/data-types/float.md) for numeric data type input.
+- [Date](../../../sql-reference/data-types/date.md) if input values have the `Date` type.
+- [DateTime](../../../sql-reference/data-types/datetime.md) if input values have the `DateTime` type.
 
 **Example**
 
@@ -59,5 +59,5 @@ Result:
 
 **See Also**
 
--   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiletiming.md b/docs/en/sql-reference/aggregate-functions/reference/quantiletiming.md
index ead381b4497..b5b1c8a0c01 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiletiming.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiletiming.md
@@ -21,19 +21,19 @@ Alias: `medianTiming`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
 
--   `expr` — [Expression](../../../sql-reference/syntax.md#syntax-expressions) over a column values returning a [Float\*](../../../sql-reference/data-types/float.md)-type number.
+- `expr` — [Expression](../../../sql-reference/syntax.md#syntax-expressions) over a column values returning a [Float\*](../../../sql-reference/data-types/float.md)-type number.
 
-    -   If negative values are passed to the function, the behavior is undefined.
-    -   If the value is greater than 30,000 (a page loading time of more than 30 seconds), it is assumed to be 30,000.
+    - If negative values are passed to the function, the behavior is undefined.
+    - If the value is greater than 30,000 (a page loading time of more than 30 seconds), it is assumed to be 30,000.
 
 **Accuracy**
 
 The calculation is accurate if:
 
--   Total number of values does not exceed 5670.
--   Total number of values exceeds 5670, but the page loading time is less than 1024ms.
+- Total number of values does not exceed 5670.
+- Total number of values exceeds 5670, but the page loading time is less than 1024ms.
 
 Otherwise, the result of the calculation is rounded to the nearest multiple of 16 ms.
 
@@ -43,7 +43,7 @@ For calculating page loading time quantiles, this function is more effective and
 
 **Returned value**
 
--   Quantile of the specified level.
+- Quantile of the specified level.
 
 Type: `Float32`.
 
@@ -85,5 +85,5 @@ Result:
 
 **See Also**
 
--   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted.md b/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
index f65c6b1e6ec..df483aac01e 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
@@ -21,21 +21,21 @@ Alias: `medianTimingWeighted`.
 
 **Arguments**
 
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
+- `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` value in the range of `[0.01, 0.99]`. Default value: 0.5. At `level=0.5` the function calculates [median](https://en.wikipedia.org/wiki/Median).
 
--   `expr` — [Expression](../../../sql-reference/syntax.md#syntax-expressions) over a column values returning a [Float\*](../../../sql-reference/data-types/float.md)-type number.
+- `expr` — [Expression](../../../sql-reference/syntax.md#syntax-expressions) over a column values returning a [Float\*](../../../sql-reference/data-types/float.md)-type number.
 
         - If negative values are passed to the function, the behavior is undefined.
         - If the value is greater than 30,000 (a page loading time of more than 30 seconds), it is assumed to be 30,000.
 
--   `weight` — Column with weights of sequence elements. Weight is a number of value occurrences.
+- `weight` — Column with weights of sequence elements. Weight is a number of value occurrences.
 
 **Accuracy**
 
 The calculation is accurate if:
 
--   Total number of values does not exceed 5670.
--   Total number of values exceeds 5670, but the page loading time is less than 1024ms.
+- Total number of values does not exceed 5670.
+- Total number of values exceeds 5670, but the page loading time is less than 1024ms.
 
 Otherwise, the result of the calculation is rounded to the nearest multiple of 16 ms.
 
@@ -45,7 +45,7 @@ For calculating page loading time quantiles, this function is more effective and
 
 **Returned value**
 
--   Quantile of the specified level.
+- Quantile of the specified level.
 
 Type: `Float32`.
 
@@ -118,5 +118,5 @@ Result:
 
 **See Also**
 
--   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
--   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
+- [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
+- [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/rankCorr.md b/docs/en/sql-reference/aggregate-functions/reference/rankCorr.md
index 231eb2b091b..27f2dd124e4 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/rankCorr.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/rankCorr.md
@@ -15,12 +15,12 @@ rankCorr(x, y)
 
 **Arguments**
 
--   `x` — Arbitrary value. [Float32](../../../sql-reference/data-types/float.md#float32-float64) or [Float64](../../../sql-reference/data-types/float.md#float32-float64).
--   `y` — Arbitrary value. [Float32](../../../sql-reference/data-types/float.md#float32-float64) or [Float64](../../../sql-reference/data-types/float.md#float32-float64).
+- `x` — Arbitrary value. [Float32](../../../sql-reference/data-types/float.md#float32-float64) or [Float64](../../../sql-reference/data-types/float.md#float32-float64).
+- `y` — Arbitrary value. [Float32](../../../sql-reference/data-types/float.md#float32-float64) or [Float64](../../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value(s)**
 
--   Returns a rank correlation coefficient of the ranks of x and y. The value of the correlation coefficient ranges from -1 to +1. If less than two arguments are passed, the function will return an exception. The value close to +1 denotes a high linear relationship, and with an increase of one random variable, the second random variable also increases. The value close to -1 denotes a high linear relationship, and with an increase of one random variable, the second random variable decreases. The value close or equal to 0 denotes no relationship between the two random variables.
+- Returns a rank correlation coefficient of the ranks of x and y. The value of the correlation coefficient ranges from -1 to +1. If less than two arguments are passed, the function will return an exception. The value close to +1 denotes a high linear relationship, and with an increase of one random variable, the second random variable also increases. The value close to -1 denotes a high linear relationship, and with an increase of one random variable, the second random variable decreases. The value close or equal to 0 denotes no relationship between the two random variables.
 
 Type: [Float64](../../../sql-reference/data-types/float.md#float32-float64).
 
@@ -55,4 +55,4 @@ Result:
 ```
 **See Also**
 
--   [Spearman's rank correlation coefficient](https://en.wikipedia.org/wiki/Spearman%27s_rank_correlation_coefficient)
\ No newline at end of file
+- [Spearman's rank correlation coefficient](https://en.wikipedia.org/wiki/Spearman%27s_rank_correlation_coefficient)
\ No newline at end of file
diff --git a/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression.md b/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression.md
index a6380b78a79..bcff05ada47 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression.md
@@ -13,8 +13,8 @@ simpleLinearRegression(x, y)
 
 Parameters:
 
--   `x` — Column with dependent variable values.
--   `y` — Column with explanatory variable values.
+- `x` — Column with dependent variable values.
+- `y` — Column with explanatory variable values.
 
 Returned values:
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/sparkbar.md b/docs/en/sql-reference/aggregate-functions/reference/sparkbar.md
index 05ea373d4da..e21dad5b2f5 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/sparkbar.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/sparkbar.md
@@ -21,18 +21,18 @@ sparkbar(buckets[, min_x, max_x])(x, y)
 
 **Parameters**
 
--   `buckets` — The number of segments. Type: [Integer](../../../sql-reference/data-types/int-uint.md).
--   `min_x` — The interval start. Optional parameter.
--   `max_x` — The interval end. Optional parameter.
+- `buckets` — The number of segments. Type: [Integer](../../../sql-reference/data-types/int-uint.md).
+- `min_x` — The interval start. Optional parameter.
+- `max_x` — The interval end. Optional parameter.
 
 **Arguments**
 
--   `x` — The field with values.
--   `y` — The field with the frequency of values.
+- `x` — The field with values.
+- `y` — The field with the frequency of values.
 
 **Returned value**
 
--   The frequency histogram.
+- The frequency histogram.
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md b/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
index 8126a80e25e..9481172c25b 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
@@ -72,5 +72,5 @@ The query will return a column of predicted values. Note that first argument of
 
 **See Also**
 
--   [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md#agg_functions-stochasticlogisticregression)
--   [Difference between linear and logistic regressions](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
+- [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md#agg_functions-stochasticlogisticregression)
+- [Difference between linear and logistic regressions](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md b/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
index 41eeb70c04f..0a040689681 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
@@ -52,5 +52,5 @@ stochasticLogisticRegression(1.0, 1.0, 10, 'SGD')
 
 **See Also**
 
--   [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md#agg_functions-stochasticlinearregression)
--   [Difference between linear and logistic regressions.](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
+- [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md#agg_functions-stochasticlinearregression)
+- [Difference between linear and logistic regressions.](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/studentttest.md b/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
index 5ce0c769576..29b43851f44 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
@@ -19,22 +19,22 @@ The null hypothesis is that means of populations are equal. Normal distribution
 
 **Arguments**
 
--   `sample_data` — Sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
--   `sample_index` — Sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
+- `sample_data` — Sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `sample_index` — Sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
 
 **Parameters**
 
--   `confidence_level` — Confidence level in order to calculate confidence intervals. [Float](../../../sql-reference/data-types/float.md).
+- `confidence_level` — Confidence level in order to calculate confidence intervals. [Float](../../../sql-reference/data-types/float.md).
 
 
 **Returned values**
 
 [Tuple](../../../sql-reference/data-types/tuple.md) with two or four elements (if the optional `confidence_level` is specified):
 
--   calculated t-statistic. [Float64](../../../sql-reference/data-types/float.md).
--   calculated p-value. [Float64](../../../sql-reference/data-types/float.md).
--   [calculated confidence-interval-low.] [Float64](../../../sql-reference/data-types/float.md).
--   [calculated confidence-interval-high.] [Float64](../../../sql-reference/data-types/float.md).
+- calculated t-statistic. [Float64](../../../sql-reference/data-types/float.md).
+- calculated p-value. [Float64](../../../sql-reference/data-types/float.md).
+- [calculated confidence-interval-low.] [Float64](../../../sql-reference/data-types/float.md).
+- [calculated confidence-interval-high.] [Float64](../../../sql-reference/data-types/float.md).
 
 
 **Example**
@@ -68,5 +68,5 @@ Result:
 
 **See Also**
 
--   [Student's t-test](https://en.wikipedia.org/wiki/Student%27s_t-test)
--   [welchTTest function](welchttest.md#welchttest)
+- [Student's t-test](https://en.wikipedia.org/wiki/Student%27s_t-test)
+- [welchTTest function](welchttest.md#welchttest)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/sumcount.md b/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
index b7773b0d09b..a59b87022d6 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
@@ -14,11 +14,11 @@ sumCount(x)
 
 **Arguments**
 
--   `x` — Input value, must be [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `x` — Input value, must be [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), or [Decimal](../../../sql-reference/data-types/decimal.md).
 
 **Returned value**
 
--   Tuple `(sum, count)`, where `sum` is the sum of numbers and `count` is the number of rows with not-NULL values.
+- Tuple `(sum, count)`, where `sum` is the sum of numbers and `count` is the number of rows with not-NULL values.
 
 Type: [Tuple](../../../sql-reference/data-types/tuple.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/sumkahan.md b/docs/en/sql-reference/aggregate-functions/reference/sumkahan.md
index 3e0783e9ad2..1a729b18b42 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/sumkahan.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/sumkahan.md
@@ -17,11 +17,11 @@ sumKahan(x)
 
 **Arguments**
 
--   `x` — Input value, must be [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `x` — Input value, must be [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), or [Decimal](../../../sql-reference/data-types/decimal.md).
 
 **Returned value**
 
--  the sum of numbers, with type [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), or [Decimal](../../../sql-reference/data-types/decimal.md) depends on type of input arguments
+- the sum of numbers, with type [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), or [Decimal](../../../sql-reference/data-types/decimal.md) depends on type of input arguments
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/theilsu.md b/docs/en/sql-reference/aggregate-functions/reference/theilsu.md
index f2103d7862b..ef19438a53a 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/theilsu.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/theilsu.md
@@ -16,11 +16,11 @@ theilsU(column1, column2)
 
 **Arguments**
 
--   `column1` and `column2` are the columns to be compared
+- `column1` and `column2` are the columns to be compared
 
 **Returned value**
 
--  a value between -1 and 1
+- a value between -1 and 1
 
 **Return type** is always [Float64](../../../sql-reference/data-types/float.md).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/topk.md b/docs/en/sql-reference/aggregate-functions/reference/topk.md
index b025f6f6d54..bde29275f79 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/topk.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/topk.md
@@ -19,13 +19,13 @@ We recommend using the `N < 10` value; performance is reduced with large `N` val
 
 **Arguments**
 
--   `N` – The number of elements to return.
+- `N` – The number of elements to return.
 
 If the parameter is omitted, default value 10 is used.
 
 **Arguments**
 
--   `x` – The value to calculate frequency.
+- `x` – The value to calculate frequency.
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md b/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md
index 32b234fd6b8..03932e88a6a 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md
@@ -15,9 +15,9 @@ topKWeighted(N)(x, weight)
 
 **Arguments**
 
--   `N` — The number of elements to return.
--   `x` — The value.
--   `weight` — The weight. Every value is accounted `weight` times for frequency calculation. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `N` — The number of elements to return.
+- `x` — The value.
+- `weight` — The weight. Every value is accounted `weight` times for frequency calculation. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
@@ -42,4 +42,4 @@ Result:
 
 **See Also**
 
--   [topK](../../../sql-reference/aggregate-functions/reference/topk.md)
+- [topK](../../../sql-reference/aggregate-functions/reference/topk.md)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniq.md b/docs/en/sql-reference/aggregate-functions/reference/uniq.md
index d72311b3ede..b1c8336630b 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniq.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniq.md
@@ -17,24 +17,24 @@ The function takes a variable number of parameters. Parameters can be `Tuple`, `
 
 **Returned value**
 
--   A [UInt64](../../../sql-reference/data-types/int-uint.md)-type number.
+- A [UInt64](../../../sql-reference/data-types/int-uint.md)-type number.
 
 **Implementation details**
 
 Function:
 
--   Calculates a hash for all parameters in the aggregate, then uses it in calculations.
+- Calculates a hash for all parameters in the aggregate, then uses it in calculations.
 
--   Uses an adaptive sampling algorithm. For the calculation state, the function uses a sample of element hash values up to 65536. This algorithm is very accurate and very efficient on the CPU. When the query contains several of these functions, using `uniq` is almost as fast as using other aggregate functions.
+- Uses an adaptive sampling algorithm. For the calculation state, the function uses a sample of element hash values up to 65536. This algorithm is very accurate and very efficient on the CPU. When the query contains several of these functions, using `uniq` is almost as fast as using other aggregate functions.
 
--   Provides the result deterministically (it does not depend on the query processing order).
+- Provides the result deterministically (it does not depend on the query processing order).
 
 We recommend using this function in almost all scenarios.
 
 **See Also**
 
--   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
--   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
--   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
--   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
--   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
+- [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
+- [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
+- [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
+- [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
+- [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md b/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
index f1287c6ff9b..2f3efde859d 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
@@ -21,19 +21,19 @@ The function takes a variable number of parameters. Parameters can be `Tuple`, `
 
 **Returned value**
 
--   A number [UInt64](../../../sql-reference/data-types/int-uint.md)-type number.
+- A number [UInt64](../../../sql-reference/data-types/int-uint.md)-type number.
 
 **Implementation details**
 
 Function:
 
--   Calculates a hash (64-bit hash for `String` and 32-bit otherwise) for all parameters in the aggregate, then uses it in calculations.
+- Calculates a hash (64-bit hash for `String` and 32-bit otherwise) for all parameters in the aggregate, then uses it in calculations.
 
--   Uses a combination of three algorithms: array, hash table, and HyperLogLog with an error correction table.
+- Uses a combination of three algorithms: array, hash table, and HyperLogLog with an error correction table.
 
         For a small number of distinct elements, an array is used. When the set size is larger, a hash table is used. For a larger number of elements, HyperLogLog is used, which will occupy a fixed amount of memory.
 
--   Provides the result deterministically (it does not depend on the query processing order).
+- Provides the result deterministically (it does not depend on the query processing order).
 
 :::note    
 Since it uses 32-bit hash for non-`String` type, the result will have very high error for cardinalities significantly larger than `UINT_MAX` (error will raise quickly after a few tens of billions of distinct values), hence in this case you should use [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
@@ -41,14 +41,14 @@ Since it uses 32-bit hash for non-`String` type, the result will have very high
 
 Compared to the [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) function, the `uniqCombined`:
 
--   Consumes several times less memory.
--   Calculates with several times higher accuracy.
--   Usually has slightly lower performance. In some scenarios, `uniqCombined` can perform better than `uniq`, for example, with distributed queries that transmit a large number of aggregation states over the network.
+- Consumes several times less memory.
+- Calculates with several times higher accuracy.
+- Usually has slightly lower performance. In some scenarios, `uniqCombined` can perform better than `uniq`, for example, with distributed queries that transmit a large number of aggregation states over the network.
 
 **See Also**
 
--   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
--   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
--   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
--   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
--   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
+- [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
+- [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
+- [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
+- [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
+- [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqexact.md b/docs/en/sql-reference/aggregate-functions/reference/uniqexact.md
index 901c631b756..fd68a464881 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqexact.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqexact.md
@@ -21,7 +21,7 @@ The function takes a variable number of parameters. Parameters can be `Tuple`, `
 
 **See Also**
 
--   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
--   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqcombined)
--   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqhll12)
--   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
+- [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
+- [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqcombined)
+- [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqhll12)
+- [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md b/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
index b598ad23df3..8594ebb3782 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
@@ -17,25 +17,25 @@ The function takes a variable number of parameters. Parameters can be `Tuple`, `
 
 **Returned value**
 
--   A [UInt64](../../../sql-reference/data-types/int-uint.md)-type number.
+- A [UInt64](../../../sql-reference/data-types/int-uint.md)-type number.
 
 **Implementation details**
 
 Function:
 
--   Calculates a hash for all parameters in the aggregate, then uses it in calculations.
+- Calculates a hash for all parameters in the aggregate, then uses it in calculations.
 
--   Uses the HyperLogLog algorithm to approximate the number of different argument values.
+- Uses the HyperLogLog algorithm to approximate the number of different argument values.
 
         2^12 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
 
--   Provides the determinate result (it does not depend on the query processing order).
+- Provides the determinate result (it does not depend on the query processing order).
 
 We do not recommend using this function. In most cases, use the [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) or [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined) function.
 
 **See Also**
 
--   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
--   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
--   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
--   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
+- [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
+- [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
+- [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
+- [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqthetasketch.md b/docs/en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
index e2adf672909..45970f144cb 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
@@ -16,24 +16,24 @@ The function takes a variable number of parameters. Parameters can be `Tuple`, `
 
 **Returned value**
 
--   A [UInt64](../../../sql-reference/data-types/int-uint.md)-type number.
+- A [UInt64](../../../sql-reference/data-types/int-uint.md)-type number.
 
 **Implementation details**
 
 Function:
 
--   Calculates a hash for all parameters in the aggregate, then uses it in calculations.
+- Calculates a hash for all parameters in the aggregate, then uses it in calculations.
 
--   Uses the [KMV](https://datasketches.apache.org/docs/Theta/InverseEstimate.html) algorithm to approximate the number of different argument values.
+- Uses the [KMV](https://datasketches.apache.org/docs/Theta/InverseEstimate.html) algorithm to approximate the number of different argument values.
 
         4096(2^12) 64-bit sketch are used. The size of the state is about 41 KB.
 
--   The relative error is 3.125% (95% confidence), see the [relative error table](https://datasketches.apache.org/docs/Theta/ThetaErrorTable.html) for detail.
+- The relative error is 3.125% (95% confidence), see the [relative error table](https://datasketches.apache.org/docs/Theta/ThetaErrorTable.html) for detail.
 
 **See Also**
 
--   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
--   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
--   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
--   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
--   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
+- [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
+- [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
+- [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
+- [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
+- [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/welchttest.md b/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
index ab35f8794e6..4f1085e65b4 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
@@ -19,21 +19,21 @@ The null hypothesis is that means of populations are equal. Normal distribution
 
 **Arguments**
 
--   `sample_data` — Sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
--   `sample_index` — Sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
+- `sample_data` — Sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+- `sample_index` — Sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
 
 **Parameters**
 
--   `confidence_level` — Confidence level in order to calculate confidence intervals. [Float](../../../sql-reference/data-types/float.md).
+- `confidence_level` — Confidence level in order to calculate confidence intervals. [Float](../../../sql-reference/data-types/float.md).
 
 **Returned values**
 
 [Tuple](../../../sql-reference/data-types/tuple.md) with two or four elements (if the optional `confidence_level` is specified)
 
--   calculated t-statistic. [Float64](../../../sql-reference/data-types/float.md).
--   calculated p-value. [Float64](../../../sql-reference/data-types/float.md).
--   calculated confidence-interval-low. [Float64](../../../sql-reference/data-types/float.md).
--   calculated confidence-interval-high. [Float64](../../../sql-reference/data-types/float.md).
+- calculated t-statistic. [Float64](../../../sql-reference/data-types/float.md).
+- calculated p-value. [Float64](../../../sql-reference/data-types/float.md).
+- calculated confidence-interval-low. [Float64](../../../sql-reference/data-types/float.md).
+- calculated confidence-interval-high. [Float64](../../../sql-reference/data-types/float.md).
 
 
 **Example**
@@ -67,5 +67,5 @@ Result:
 
 **See Also**
 
--   [Welch's t-test](https://en.wikipedia.org/wiki/Welch%27s_t-test)
--   [studentTTest function](studentttest.md#studentttest)
+- [Welch's t-test](https://en.wikipedia.org/wiki/Welch%27s_t-test)
+- [studentTTest function](studentttest.md#studentttest)
diff --git a/docs/en/sql-reference/data-types/aggregatefunction.md b/docs/en/sql-reference/data-types/aggregatefunction.md
index d8547f03714..fe6d7ebe0dc 100644
--- a/docs/en/sql-reference/data-types/aggregatefunction.md
+++ b/docs/en/sql-reference/data-types/aggregatefunction.md
@@ -12,9 +12,9 @@ Aggregate functions can have an implementation-defined intermediate state that c
 
 **Parameters**
 
--   Name of the aggregate function. If the function is parametric, specify its parameters too.
+- Name of the aggregate function. If the function is parametric, specify its parameters too.
 
--   Types of the aggregate function arguments.
+- Types of the aggregate function arguments.
 
 **Example**
 
@@ -63,3 +63,8 @@ SELECT uniqMerge(state) FROM (SELECT uniqState(UserID) AS state FROM table GROUP
 ## Usage Example
 
 See [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) engine description.
+
+
+## Related Content
+
+- Blog: [Using Aggregate Combinators in ClickHouse](https://clickhouse.com/blog/aggregate-functions-combinators-in-clickhouse-for-arrays-maps-and-states)
diff --git a/docs/en/sql-reference/data-types/array.md b/docs/en/sql-reference/data-types/array.md
index 707acbda760..20ce7d2ed52 100644
--- a/docs/en/sql-reference/data-types/array.md
+++ b/docs/en/sql-reference/data-types/array.md
@@ -46,8 +46,6 @@ SELECT [1, 2] AS x, toTypeName(x)
 
 ## Working with Data Types
 
-The maximum size of an array is limited to one million elements.
-
 When creating an array on the fly, ClickHouse automatically defines the argument type as the narrowest data type that can store all the listed arguments. If there are any [Nullable](../../sql-reference/data-types/nullable.md#data_type-nullable) or literal [NULL](../../sql-reference/syntax.md#null-literal) values, the type of an array element also becomes [Nullable](../../sql-reference/data-types/nullable.md).
 
 If ClickHouse couldn’t determine the data type, it generates an exception. For instance, this happens when trying to create an array with strings and numbers simultaneously (`SELECT array(1, 'a')`).
diff --git a/docs/en/sql-reference/data-types/date.md b/docs/en/sql-reference/data-types/date.md
index d43a00312dd..048466f7ae4 100644
--- a/docs/en/sql-reference/data-types/date.md
+++ b/docs/en/sql-reference/data-types/date.md
@@ -39,6 +39,6 @@ SELECT * FROM dt;
 
 **See Also**
 
--   [Functions for working with dates and times](../../sql-reference/functions/date-time-functions.md)
--   [Operators for working with dates and times](../../sql-reference/operators/index.md#operators-datetime)
--   [`DateTime` data type](../../sql-reference/data-types/datetime.md)
+- [Functions for working with dates and times](../../sql-reference/functions/date-time-functions.md)
+- [Operators for working with dates and times](../../sql-reference/operators/index.md#operators-datetime)
+- [`DateTime` data type](../../sql-reference/data-types/datetime.md)
diff --git a/docs/en/sql-reference/data-types/date32.md b/docs/en/sql-reference/data-types/date32.md
index 826dc20a96d..7cf8b1b95fe 100644
--- a/docs/en/sql-reference/data-types/date32.md
+++ b/docs/en/sql-reference/data-types/date32.md
@@ -35,6 +35,6 @@ SELECT * FROM new;
 
 **See Also**
 
--   [toDate32](../../sql-reference/functions/type-conversion-functions.md#todate32)
--   [toDate32OrZero](../../sql-reference/functions/type-conversion-functions.md#todate32-or-zero)
--   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null)
+- [toDate32](../../sql-reference/functions/type-conversion-functions.md#todate32)
+- [toDate32OrZero](../../sql-reference/functions/type-conversion-functions.md#todate32-or-zero)
+- [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null)
diff --git a/docs/en/sql-reference/data-types/datetime.md b/docs/en/sql-reference/data-types/datetime.md
index b10ceb79d13..059c6acdb9e 100644
--- a/docs/en/sql-reference/data-types/datetime.md
+++ b/docs/en/sql-reference/data-types/datetime.md
@@ -62,8 +62,8 @@ SELECT * FROM dt;
 └─────────────────────┴──────────┘
 ```
 
--   When inserting datetime as an integer, it is treated as Unix Timestamp (UTC). `1546300800` represents `'2019-01-01 00:00:00'` UTC. However, as `timestamp` column has `Asia/Istanbul` (UTC+3) timezone specified, when outputting as string the value will be shown as `'2019-01-01 03:00:00'`
--   When inserting string value as datetime, it is treated as being in column timezone. `'2019-01-01 00:00:00'` will be treated as being in `Asia/Istanbul` timezone and saved as `1546290000`.
+- When inserting datetime as an integer, it is treated as Unix Timestamp (UTC). `1546300800` represents `'2019-01-01 00:00:00'` UTC. However, as `timestamp` column has `Asia/Istanbul` (UTC+3) timezone specified, when outputting as string the value will be shown as `'2019-01-01 03:00:00'`
+- When inserting string value as datetime, it is treated as being in column timezone. `'2019-01-01 00:00:00'` will be treated as being in `Asia/Istanbul` timezone and saved as `1546290000`.
 
 **2.** Filtering on `DateTime` values
 
@@ -137,11 +137,11 @@ Time shifts for multiple days. Some pacific islands changed their timezone offse
 
 ## See Also
 
--   [Type conversion functions](../../sql-reference/functions/type-conversion-functions.md)
--   [Functions for working with dates and times](../../sql-reference/functions/date-time-functions.md)
--   [Functions for working with arrays](../../sql-reference/functions/array-functions.md)
--   [The `date_time_input_format` setting](../../operations/settings/settings.md#settings-date_time_input_format)
--   [The `date_time_output_format` setting](../../operations/settings/settings.md#settings-date_time_output_format)
--   [The `timezone` server configuration parameter](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
--   [Operators for working with dates and times](../../sql-reference/operators/index.md#operators-datetime)
--   [The `Date` data type](../../sql-reference/data-types/date.md)
+- [Type conversion functions](../../sql-reference/functions/type-conversion-functions.md)
+- [Functions for working with dates and times](../../sql-reference/functions/date-time-functions.md)
+- [Functions for working with arrays](../../sql-reference/functions/array-functions.md)
+- [The `date_time_input_format` setting](../../operations/settings/settings.md#settings-date_time_input_format)
+- [The `date_time_output_format` setting](../../operations/settings/settings.md#settings-date_time_output_format)
+- [The `timezone` server configuration parameter](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
+- [Operators for working with dates and times](../../sql-reference/operators/index.md#operators-datetime)
+- [The `Date` data type](../../sql-reference/data-types/date.md)
diff --git a/docs/en/sql-reference/data-types/datetime64.md b/docs/en/sql-reference/data-types/datetime64.md
index fa3a1eecd46..2d4035831fa 100644
--- a/docs/en/sql-reference/data-types/datetime64.md
+++ b/docs/en/sql-reference/data-types/datetime64.md
@@ -52,8 +52,8 @@ SELECT * FROM dt;
 └─────────────────────────┴──────────┘
 ```
 
--   When inserting datetime as an integer, it is treated as an appropriately scaled Unix Timestamp (UTC). `1546300800000` (with precision 3) represents `'2019-01-01 00:00:00'` UTC. However, as `timestamp` column has `Asia/Istanbul` (UTC+3) timezone specified, when outputting as a string the value will be shown as `'2019-01-01 03:00:00'`. Inserting datetime as a decimal will treat it similarly as an integer, except the value before the decimal point is the Unix Timestamp up to and including the seconds, and after the decimal point will be treated as the precision.
--   When inserting string value as datetime, it is treated as being in column timezone. `'2019-01-01 00:00:00'` will be treated as being in `Asia/Istanbul` timezone and stored as `1546290000000`.
+- When inserting datetime as an integer, it is treated as an appropriately scaled Unix Timestamp (UTC). `1546300800000` (with precision 3) represents `'2019-01-01 00:00:00'` UTC. However, as `timestamp` column has `Asia/Istanbul` (UTC+3) timezone specified, when outputting as a string the value will be shown as `'2019-01-01 03:00:00'`. Inserting datetime as a decimal will treat it similarly as an integer, except the value before the decimal point is the Unix Timestamp up to and including the seconds, and after the decimal point will be treated as the precision.
+- When inserting string value as datetime, it is treated as being in column timezone. `'2019-01-01 00:00:00'` will be treated as being in `Asia/Istanbul` timezone and stored as `1546290000000`.
 
 2. Filtering on `DateTime64` values
 
@@ -113,12 +113,12 @@ FROM dt;
 
 **See Also**
 
--   [Type conversion functions](../../sql-reference/functions/type-conversion-functions.md)
--   [Functions for working with dates and times](../../sql-reference/functions/date-time-functions.md)
--   [Functions for working with arrays](../../sql-reference/functions/array-functions.md)
--   [The `date_time_input_format` setting](../../operations/settings/settings.md#settings-date_time_input_format)
--   [The `date_time_output_format` setting](../../operations/settings/settings.md#settings-date_time_output_format)
--   [The `timezone` server configuration parameter](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
--   [Operators for working with dates and times](../../sql-reference/operators/index.md#operators-datetime)
--   [`Date` data type](../../sql-reference/data-types/date.md)
--   [`DateTime` data type](../../sql-reference/data-types/datetime.md)
+- [Type conversion functions](../../sql-reference/functions/type-conversion-functions.md)
+- [Functions for working with dates and times](../../sql-reference/functions/date-time-functions.md)
+- [Functions for working with arrays](../../sql-reference/functions/array-functions.md)
+- [The `date_time_input_format` setting](../../operations/settings/settings.md#settings-date_time_input_format)
+- [The `date_time_output_format` setting](../../operations/settings/settings.md#settings-date_time_output_format)
+- [The `timezone` server configuration parameter](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
+- [Operators for working with dates and times](../../sql-reference/operators/index.md#operators-datetime)
+- [`Date` data type](../../sql-reference/data-types/date.md)
+- [`DateTime` data type](../../sql-reference/data-types/datetime.md)
diff --git a/docs/en/sql-reference/data-types/decimal.md b/docs/en/sql-reference/data-types/decimal.md
index 7e4cb5ecaac..8df8b2519e3 100644
--- a/docs/en/sql-reference/data-types/decimal.md
+++ b/docs/en/sql-reference/data-types/decimal.md
@@ -10,8 +10,8 @@ Signed fixed-point numbers that keep precision during add, subtract and multiply
 
 ## Parameters
 
--   P - precision. Valid range: \[ 1 : 76 \]. Determines how many decimal digits number can have (including fraction).
--   S - scale. Valid range: \[ 0 : P \]. Determines how many decimal digits fraction can have.
+- P - precision. Valid range: \[ 1 : 76 \]. Determines how many decimal digits number can have (including fraction).
+- S - scale. Valid range: \[ 0 : P \]. Determines how many decimal digits fraction can have.
 
 Depending on P parameter value Decimal(P, S) is a synonym for:
 - P from \[ 1 : 9 \] - for Decimal32(S)
@@ -21,10 +21,10 @@ Depending on P parameter value Decimal(P, S) is a synonym for:
 
 ## Decimal Value Ranges
 
--   Decimal32(S) - ( -1 \* 10^(9 - S), 1 \* 10^(9 - S) )
--   Decimal64(S) - ( -1 \* 10^(18 - S), 1 \* 10^(18 - S) )
--   Decimal128(S) - ( -1 \* 10^(38 - S), 1 \* 10^(38 - S) )
--   Decimal256(S) - ( -1 \* 10^(76 - S), 1 \* 10^(76 - S) )
+- Decimal32(S) - ( -1 \* 10^(9 - S), 1 \* 10^(9 - S) )
+- Decimal64(S) - ( -1 \* 10^(18 - S), 1 \* 10^(18 - S) )
+- Decimal128(S) - ( -1 \* 10^(38 - S), 1 \* 10^(38 - S) )
+- Decimal256(S) - ( -1 \* 10^(76 - S), 1 \* 10^(76 - S) )
 
 For example, Decimal32(4) can contain numbers from -99999.9999 to 99999.9999 with 0.0001 step.
 
@@ -38,16 +38,16 @@ Because modern CPUs do not support 128-bit integers natively, operations on Deci
 
 Binary operations on Decimal result in wider result type (with any order of arguments).
 
--   `Decimal64(S1) <op> Decimal32(S2) -> Decimal64(S)`
--   `Decimal128(S1) <op> Decimal32(S2) -> Decimal128(S)`
--   `Decimal128(S1) <op> Decimal64(S2) -> Decimal128(S)`
--   `Decimal256(S1) <op> Decimal<32|64|128>(S2) -> Decimal256(S)`
+- `Decimal64(S1) <op> Decimal32(S2) -> Decimal64(S)`
+- `Decimal128(S1) <op> Decimal32(S2) -> Decimal128(S)`
+- `Decimal128(S1) <op> Decimal64(S2) -> Decimal128(S)`
+- `Decimal256(S1) <op> Decimal<32|64|128>(S2) -> Decimal256(S)`
 
 Rules for scale:
 
--   add, subtract: S = max(S1, S2).
--   multiply: S = S1 + S2.
--   divide: S = S1.
+- add, subtract: S = max(S1, S2).
+- multiply: S = S1 + S2.
+- divide: S = S1.
 
 For similar operations between Decimal and integers, the result is Decimal of the same size as an argument.
 
@@ -109,5 +109,5 @@ DB::Exception: Can't compare.
 ```
 
 **See also**
--   [isDecimalOverflow](../../sql-reference/functions/other-functions.md#is-decimal-overflow)
--   [countDigits](../../sql-reference/functions/other-functions.md#count-digits)
+- [isDecimalOverflow](../../sql-reference/functions/other-functions.md#is-decimal-overflow)
+- [countDigits](../../sql-reference/functions/other-functions.md#count-digits)
diff --git a/docs/en/sql-reference/data-types/domains/index.md b/docs/en/sql-reference/data-types/domains/index.md
index f6f14186dcc..13ec1735d4d 100644
--- a/docs/en/sql-reference/data-types/domains/index.md
+++ b/docs/en/sql-reference/data-types/domains/index.md
@@ -10,20 +10,20 @@ Domains are special-purpose types that add some extra features atop of existing
 
 You can use domains anywhere corresponding base type can be used, for example:
 
--   Create a column of a domain type
--   Read/write values from/to domain column
--   Use it as an index if a base type can be used as an index
--   Call functions with values of domain column
+- Create a column of a domain type
+- Read/write values from/to domain column
+- Use it as an index if a base type can be used as an index
+- Call functions with values of domain column
 
 ### Extra Features of Domains
 
--   Explicit column type name in `SHOW CREATE TABLE` or `DESCRIBE TABLE`
--   Input from human-friendly format with `INSERT INTO domain_table(domain_column) VALUES(...)`
--   Output to human-friendly format for `SELECT domain_column FROM domain_table`
--   Loading data from an external source in the human-friendly format: `INSERT INTO domain_table FORMAT CSV ...`
+- Explicit column type name in `SHOW CREATE TABLE` or `DESCRIBE TABLE`
+- Input from human-friendly format with `INSERT INTO domain_table(domain_column) VALUES(...)`
+- Output to human-friendly format for `SELECT domain_column FROM domain_table`
+- Loading data from an external source in the human-friendly format: `INSERT INTO domain_table FORMAT CSV ...`
 
 ### Limitations
 
--   Can’t convert index column of base type to domain type via `ALTER TABLE`.
--   Can’t implicitly convert string values into domain values when inserting data from another column or table.
--   Domain adds no constrains on stored values.
+- Can’t convert index column of base type to domain type via `ALTER TABLE`.
+- Can’t implicitly convert string values into domain values when inserting data from another column or table.
+- Domain adds no constrains on stored values.
diff --git a/docs/en/sql-reference/data-types/enum.md b/docs/en/sql-reference/data-types/enum.md
index a685b341414..02e73a0360e 100644
--- a/docs/en/sql-reference/data-types/enum.md
+++ b/docs/en/sql-reference/data-types/enum.md
@@ -12,8 +12,8 @@ Named values can be declared as `'string' = integer` pairs or `'string'` names .
 
 ClickHouse supports:
 
--   8-bit `Enum`. It can contain up to 256 values enumerated in the `[-128, 127]` range.
--   16-bit `Enum`. It can contain up to 65536 values enumerated in the `[-32768, 32767]` range.
+- 8-bit `Enum`. It can contain up to 256 values enumerated in the `[-128, 127]` range.
+- 16-bit `Enum`. It can contain up to 65536 values enumerated in the `[-32768, 32767]` range.
 
 ClickHouse automatically chooses the type of `Enum` when data is inserted. You can also use `Enum8` or `Enum16` types to be sure in the size of storage.
 
diff --git a/docs/en/sql-reference/data-types/fixedstring.md b/docs/en/sql-reference/data-types/fixedstring.md
index e28f957e49c..a56b3fccbc1 100644
--- a/docs/en/sql-reference/data-types/fixedstring.md
+++ b/docs/en/sql-reference/data-types/fixedstring.md
@@ -20,17 +20,17 @@ The `FixedString` type is efficient when data has the length of precisely `N` by
 
 Examples of the values that can be efficiently stored in `FixedString`-typed columns:
 
--   The binary representation of IP addresses (`FixedString(16)` for IPv6).
--   Language codes (ru_RU, en_US … ).
--   Currency codes (USD, RUB … ).
--   Binary representation of hashes (`FixedString(16)` for MD5, `FixedString(32)` for SHA256).
+- The binary representation of IP addresses (`FixedString(16)` for IPv6).
+- Language codes (ru_RU, en_US … ).
+- Currency codes (USD, RUB … ).
+- Binary representation of hashes (`FixedString(16)` for MD5, `FixedString(32)` for SHA256).
 
 To store UUID values, use the [UUID](../../sql-reference/data-types/uuid.md) data type.
 
 When inserting the data, ClickHouse:
 
--   Complements a string with null bytes if the string contains fewer than `N` bytes.
--   Throws the `Too large value for FixedString(N)` exception if the string contains more than `N` bytes.
+- Complements a string with null bytes if the string contains fewer than `N` bytes.
+- Throws the `Too large value for FixedString(N)` exception if the string contains more than `N` bytes.
 
 When selecting the data, ClickHouse does not remove the null bytes at the end of the string. If you use the `WHERE` clause, you should add null bytes manually to match the `FixedString` value. The following example illustrates how to use the `WHERE` clause with `FixedString`.
 
diff --git a/docs/en/sql-reference/data-types/float.md b/docs/en/sql-reference/data-types/float.md
index 38c414fa8cd..3b55271f707 100644
--- a/docs/en/sql-reference/data-types/float.md
+++ b/docs/en/sql-reference/data-types/float.md
@@ -6,7 +6,7 @@ sidebar_label: Float32, Float64
 
 # Float32, Float64
 
-:::warning
+:::note
 If you need accurate calculations, in particular if you work with financial or business data requiring a high precision you should consider using Decimal instead. Floats might lead to inaccurate results as illustrated below:
 
 ```
@@ -30,19 +30,19 @@ SELECT sumKahan(my_float), sumKahan(my_decimal) FROM float_vs_decimal;
 
 Types are equivalent to types of C:
 
--   `Float32` — `float`.
--   `Float64` — `double`.
+- `Float32` — `float`.
+- `Float64` — `double`.
 
 Aliases:
 
--   `Float32` — `FLOAT`.
--   `Float64` — `DOUBLE`.
+- `Float32` — `FLOAT`.
+- `Float64` — `DOUBLE`.
 
 When creating tables, numeric parameters for floating point numbers can be set (e.g. `FLOAT(12)`, `FLOAT(15, 22)`, `DOUBLE(12)`, `DOUBLE(4, 18)`), but ClickHouse ignores them.
 
 ## Using Floating-point Numbers
 
--   Computations with floating-point numbers might produce a rounding error.
+- Computations with floating-point numbers might produce a rounding error.
 
 <!-- -->
 
@@ -56,15 +56,15 @@ SELECT 1 - 0.9
 └─────────────────────┘
 ```
 
--   The result of the calculation depends on the calculation method (the processor type and architecture of the computer system).
--   Floating-point calculations might result in numbers such as infinity (`Inf`) and “not-a-number” (`NaN`). This should be taken into account when processing the results of calculations.
--   When parsing floating-point numbers from text, the result might not be the nearest machine-representable number.
+- The result of the calculation depends on the calculation method (the processor type and architecture of the computer system).
+- Floating-point calculations might result in numbers such as infinity (`Inf`) and “not-a-number” (`NaN`). This should be taken into account when processing the results of calculations.
+- When parsing floating-point numbers from text, the result might not be the nearest machine-representable number.
 
 ## NaN and Inf
 
 In contrast to standard SQL, ClickHouse supports the following categories of floating-point numbers:
 
--   `Inf` – Infinity.
+- `Inf` – Infinity.
 
 <!-- -->
 
@@ -78,7 +78,7 @@ SELECT 0.5 / 0
 └────────────────┘
 ```
 
--   `-Inf` — Negative infinity.
+- `-Inf` — Negative infinity.
 
 <!-- -->
 
@@ -92,7 +92,7 @@ SELECT -0.5 / 0
 └─────────────────┘
 ```
 
--   `NaN` — Not a number.
+- `NaN` — Not a number.
 
 <!-- -->
 
diff --git a/docs/en/sql-reference/data-types/index.md b/docs/en/sql-reference/data-types/index.md
index ef6a0fb3ea5..88663968e50 100644
--- a/docs/en/sql-reference/data-types/index.md
+++ b/docs/en/sql-reference/data-types/index.md
@@ -1,13 +1,33 @@
 ---
 slug: /en/sql-reference/data-types/
-sidebar_label: Data Types
+sidebar_label: List of data types
 sidebar_position: 37
 ---
 
-# Data Types 
+# ClickHouse Data Types
 
-ClickHouse can store various kinds of data in table cells.
+ClickHouse can store various kinds of data in table cells. This section describes the supported data types and special considerations for using and/or implementing them if any.
 
-This section describes the supported data types and special considerations for using and/or implementing them if any.
+:::note
+You can check whether a data type name is case-sensitive in the [system.data_type_families](../../operations/system-tables/data_type_families.md#system_tables-data_type_families) table.
+:::
 
-You can check whether data type name is case-sensitive in the [system.data_type_families](../../operations/system-tables/data_type_families.md#system_tables-data_type_families) table.
+ClickHouse data types include:
+
+- **Integer types**: [signed and unsigned integers](./int-uint.md) (`UInt8`, `UInt16`, `UInt32`, `UInt64`, `UInt128`, `UInt256`, `Int8`, `Int16`, `Int32`, `Int64`, `Int128`, `Int256`)
+- **Floating-point numbers**: [floats](./float.md)(`Float32` and `Float64`) and [`Decimal` values](./decimal.md)
+- **Boolean**: ClickHouse has a [`Boolean` type](./boolean.md)
+- **Strings**: [`String`](./string.md) and [`FixedString`](./fixedstring.md)
+- **Dates**: use [`Date`](./date.md) and [`Date32`](./date32.md) for days, and [`DateTime`](./datetime.md) and [`DateTime64`](./datetime64.md) for instances in time
+- **JSON**: the [`JSON` object](./json.md) stores a JSON document in a single column
+- **UUID**: a performant option for storing [`UUID` values](./uuid.md)
+- **Low cardinality types**: use an [`Enum`](./enum.md) when you have a handful of unique values, or use [`LowCardinality`](./lowcardinality.md) when you have up to 10,000 unique values of a column
+- **Arrays**: any column can be defined as an [`Array` of values](./array.md)
+- **Maps**: use [`Map`](./map.md) for storing key/value pairs
+- **Aggregation function types**: use [`SimpleAggregateFunction`](./simpleaggregatefunction.md) and [`AggregateFunction`](./aggregatefunction.md) for storing the intermediate status of aggregate function results
+- **Nested data structures**: A [`Nested` data structure](./nested-data-structures/index.md) is like a table inside a cell
+- **Tuples**: A [`Tuple` of elements](./tuple.md), each having an individual type.
+- **Nullable**: [`Nullable`](./nullable.md) allows you to store a value as `NULL` when a value is "missing" (instead of the column gettings its default value for the data type)
+- **IP addresses**: use [`IPv4`](./domains/ipv4.md) and [`IPv6`](./domains/ipv6.md) to efficiently store IP addresses
+- **Geo types**: for [geographical data](./geo.md), including `Point`, `Ring`, `Polygon` and `MultiPolygon`
+- **Special data types**: including [`Expression`](./special-data-types/expression.md), [`Set`](./special-data-types/set.md), [`Nothing`](./special-data-types/nothing.md) and [`Interval`](./special-data-types/interval.md)
diff --git a/docs/en/sql-reference/data-types/int-uint.md b/docs/en/sql-reference/data-types/int-uint.md
index b8a55b62e36..b551143d92f 100644
--- a/docs/en/sql-reference/data-types/int-uint.md
+++ b/docs/en/sql-reference/data-types/int-uint.md
@@ -12,25 +12,25 @@ When creating tables, numeric parameters for integer numbers can be set (e.g. `T
 
 ## Int Ranges
 
--   `Int8` — \[-128 : 127\]
--   `Int16` — \[-32768 : 32767\]
--   `Int32` — \[-2147483648 : 2147483647\]
--   `Int64` — \[-9223372036854775808 : 9223372036854775807\]
--   `Int128` — \[-170141183460469231731687303715884105728 : 170141183460469231731687303715884105727\]
--   `Int256` — \[-57896044618658097711785492504343953926634992332820282019728792003956564819968 : 57896044618658097711785492504343953926634992332820282019728792003956564819967\]
+- `Int8` — \[-128 : 127\]
+- `Int16` — \[-32768 : 32767\]
+- `Int32` — \[-2147483648 : 2147483647\]
+- `Int64` — \[-9223372036854775808 : 9223372036854775807\]
+- `Int128` — \[-170141183460469231731687303715884105728 : 170141183460469231731687303715884105727\]
+- `Int256` — \[-57896044618658097711785492504343953926634992332820282019728792003956564819968 : 57896044618658097711785492504343953926634992332820282019728792003956564819967\]
 
 Aliases:
 
--   `Int8` — `TINYINT`, `BOOL`, `BOOLEAN`, `INT1`.
--   `Int16` — `SMALLINT`, `INT2`.
--   `Int32` — `INT`, `INT4`, `INTEGER`.
--   `Int64` — `BIGINT`.
+- `Int8` — `TINYINT`, `BOOL`, `BOOLEAN`, `INT1`.
+- `Int16` — `SMALLINT`, `INT2`.
+- `Int32` — `INT`, `INT4`, `INTEGER`.
+- `Int64` — `BIGINT`.
 
 ## UInt Ranges
 
--   `UInt8` — \[0 : 255\]
--   `UInt16` — \[0 : 65535\]
--   `UInt32` — \[0 : 4294967295\]
--   `UInt64` — \[0 : 18446744073709551615\]
--   `UInt128` — \[0 : 340282366920938463463374607431768211455\]
--   `UInt256` — \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
+- `UInt8` — \[0 : 255\]
+- `UInt16` — \[0 : 65535\]
+- `UInt32` — \[0 : 4294967295\]
+- `UInt64` — \[0 : 18446744073709551615\]
+- `UInt128` — \[0 : 340282366920938463463374607431768211455\]
+- `UInt256` — \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
diff --git a/docs/en/sql-reference/data-types/json.md b/docs/en/sql-reference/data-types/json.md
index d9099ba5ad3..f727f0d75f7 100644
--- a/docs/en/sql-reference/data-types/json.md
+++ b/docs/en/sql-reference/data-types/json.md
@@ -6,15 +6,15 @@ sidebar_label: JSON
 
 # JSON
 
-:::warning
-This feature is experimental and is not production ready. If you need to work with JSON documents, consider using [this guide](/docs/en/guides/developer/working-with-json/json-load-data.md) instead.
+:::note
+This feature is experimental and is not production ready. If you need to work with JSON documents, consider using [this guide](/docs/en/integrations/data-ingestion/data-formats/json.md) instead.
 :::
 
 Stores JavaScript Object Notation (JSON) documents in a single column.
 
 `JSON` is an alias for `Object('json')`.
 
-:::warning
+:::note
 The JSON data type is an experimental feature. To use it, set `allow_experimental_object_type = 1`.
 :::
 
diff --git a/docs/en/sql-reference/data-types/lowcardinality.md b/docs/en/sql-reference/data-types/lowcardinality.md
index 58a99baa09e..7810f4c5324 100644
--- a/docs/en/sql-reference/data-types/lowcardinality.md
+++ b/docs/en/sql-reference/data-types/lowcardinality.md
@@ -16,7 +16,7 @@ LowCardinality(data_type)
 
 **Parameters**
 
--   `data_type` — [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), and numbers excepting [Decimal](../../sql-reference/data-types/decimal.md). `LowCardinality` is not efficient for some data types, see the [allow_suspicious_low_cardinality_types](../../operations/settings/settings.md#allow_suspicious_low_cardinality_types) setting description.
+- `data_type` — [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), and numbers excepting [Decimal](../../sql-reference/data-types/decimal.md). `LowCardinality` is not efficient for some data types, see the [allow_suspicious_low_cardinality_types](../../operations/settings/settings.md#allow_suspicious_low_cardinality_types) setting description.
 
 ## Description
 
@@ -44,19 +44,19 @@ ORDER BY id
 
 Settings:
 
--   [low_cardinality_max_dictionary_size](../../operations/settings/settings.md#low_cardinality_max_dictionary_size)
--   [low_cardinality_use_single_dictionary_for_part](../../operations/settings/settings.md#low_cardinality_use_single_dictionary_for_part)
--   [low_cardinality_allow_in_native_format](../../operations/settings/settings.md#low_cardinality_allow_in_native_format)
--   [allow_suspicious_low_cardinality_types](../../operations/settings/settings.md#allow_suspicious_low_cardinality_types)
--   [output_format_arrow_low_cardinality_as_dictionary](../../operations/settings/settings.md#output-format-arrow-low-cardinality-as-dictionary)
+- [low_cardinality_max_dictionary_size](../../operations/settings/settings.md#low_cardinality_max_dictionary_size)
+- [low_cardinality_use_single_dictionary_for_part](../../operations/settings/settings.md#low_cardinality_use_single_dictionary_for_part)
+- [low_cardinality_allow_in_native_format](../../operations/settings/settings.md#low_cardinality_allow_in_native_format)
+- [allow_suspicious_low_cardinality_types](../../operations/settings/settings.md#allow_suspicious_low_cardinality_types)
+- [output_format_arrow_low_cardinality_as_dictionary](../../operations/settings/settings.md#output-format-arrow-low-cardinality-as-dictionary)
 
 Functions:
 
--   [toLowCardinality](../../sql-reference/functions/type-conversion-functions.md#tolowcardinality)
+- [toLowCardinality](../../sql-reference/functions/type-conversion-functions.md#tolowcardinality)
 
 ## Related content
 
--   [Reducing ClickHouse Storage Cost with the Low Cardinality Type – Lessons from an Instana Engineer](https://www.instana.com/blog/reducing-clickhouse-storage-cost-with-the-low-cardinality-type-lessons-from-an-instana-engineer/)
--   [String Optimization (video presentation in Russian)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [Slides in English](https://github.com/ClickHouse/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf)
+- [Reducing ClickHouse Storage Cost with the Low Cardinality Type – Lessons from an Instana Engineer](https://www.instana.com/blog/reducing-clickhouse-storage-cost-with-the-low-cardinality-type-lessons-from-an-instana-engineer/)
+- [String Optimization (video presentation in Russian)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [Slides in English](https://github.com/ClickHouse/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf)
 - Blog: [Optimizing ClickHouse with Schemas and Codecs](https://clickhouse.com/blog/optimize-clickhouse-codecs-compression-schema)
 - Blog: [Working with time series data in ClickHouse](https://clickhouse.com/blog/working-with-time-series-data-and-functions-ClickHouse)
diff --git a/docs/en/sql-reference/data-types/map.md b/docs/en/sql-reference/data-types/map.md
index b0659746ba7..0ea183d73d8 100644
--- a/docs/en/sql-reference/data-types/map.md
+++ b/docs/en/sql-reference/data-types/map.md
@@ -10,8 +10,8 @@ sidebar_label: Map(key, value)
 
 **Parameters**
 
--   `key` — The key part of the pair. [String](../../sql-reference/data-types/string.md), [Integer](../../sql-reference/data-types/int-uint.md), [LowCardinality](../../sql-reference/data-types/lowcardinality.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UUID](../../sql-reference/data-types/uuid.md), [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), [Date32](../../sql-reference/data-types/date32.md), [Enum](../../sql-reference/data-types/enum.md).
--   `value` — The value part of the pair. Arbitrary type, including [Map](../../sql-reference/data-types/map.md) and [Array](../../sql-reference/data-types/array.md).
+- `key` — The key part of the pair. [String](../../sql-reference/data-types/string.md), [Integer](../../sql-reference/data-types/int-uint.md), [LowCardinality](../../sql-reference/data-types/lowcardinality.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UUID](../../sql-reference/data-types/uuid.md), [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), [Date32](../../sql-reference/data-types/date32.md), [Enum](../../sql-reference/data-types/enum.md).
+- `value` — The value part of the pair. Arbitrary type, including [Map](../../sql-reference/data-types/map.md) and [Array](../../sql-reference/data-types/array.md).
 
 To get the value from an `a Map('key', 'value')` column, use `a['key']` syntax. This lookup works now with a linear complexity.
 
@@ -106,5 +106,10 @@ Result:
 
 **See Also**
 
--   [map()](../../sql-reference/functions/tuple-map-functions.md#function-map) function
--   [CAST()](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) function
+- [map()](../../sql-reference/functions/tuple-map-functions.md#function-map) function
+- [CAST()](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) function
+
+
+## Related content
+
+- Blog: [Building an Observability Solution with ClickHouse - Part 2 - Traces](https://clickhouse.com/blog/storing-traces-and-spans-open-telemetry-in-clickhouse)
diff --git a/docs/en/sql-reference/data-types/nested-data-structures/index.md b/docs/en/sql-reference/data-types/nested-data-structures/index.md
index 1d958c018d8..d118170cd39 100644
--- a/docs/en/sql-reference/data-types/nested-data-structures/index.md
+++ b/docs/en/sql-reference/data-types/nested-data-structures/index.md
@@ -1,7 +1,105 @@
 ---
-slug: /en/sql-reference/data-types/nested-data-structures/
-sidebar_label: Nested Data Structures
-sidebar_position: 54
+slug: /en/sql-reference/data-types/nested-data-structures/nested
+sidebar_position: 57
+sidebar_label: Nested(Name1 Type1, Name2 Type2, ...)
 ---
 
-# Nested Data Structures
+# Nested
+
+## Nested(name1 Type1, Name2 Type2, …)
+
+A nested data structure is like a table inside a cell. The parameters of a nested data structure – the column names and types – are specified the same way as in a [CREATE TABLE](../../../sql-reference/statements/create/table.md) query. Each table row can correspond to any number of rows in a nested data structure.
+
+Example:
+
+``` sql
+CREATE TABLE test.visits
+(
+    CounterID UInt32,
+    StartDate Date,
+    Sign Int8,
+    IsNew UInt8,
+    VisitID UInt64,
+    UserID UInt64,
+    ...
+    Goals Nested
+    (
+        ID UInt32,
+        Serial UInt32,
+        EventTime DateTime,
+        Price Int64,
+        OrderID String,
+        CurrencyID UInt32
+    ),
+    ...
+) ENGINE = CollapsingMergeTree(StartDate, intHash32(UserID), (CounterID, StartDate, intHash32(UserID), VisitID), 8192, Sign)
+```
+
+This example declares the `Goals` nested data structure, which contains data about conversions (goals reached). Each row in the ‘visits’ table can correspond to zero or any number of conversions.
+
+When [flatten_nested](../../../operations/settings/settings.md#flatten-nested) is set to `0` (which is not by default), arbitrary levels of nesting are supported.
+
+In most cases, when working with a nested data structure, its columns are specified with column names separated by a dot. These columns make up an array of matching types. All the column arrays of a single nested data structure have the same length.
+
+Example:
+
+``` sql
+SELECT
+    Goals.ID,
+    Goals.EventTime
+FROM test.visits
+WHERE CounterID = 101500 AND length(Goals.ID) < 5
+LIMIT 10
+```
+
+``` text
+┌─Goals.ID───────────────────────┬─Goals.EventTime───────────────────────────────────────────────────────────────────────────┐
+│ [1073752,591325,591325]        │ ['2014-03-17 16:38:10','2014-03-17 16:38:48','2014-03-17 16:42:27']                       │
+│ [1073752]                      │ ['2014-03-17 00:28:25']                                                                   │
+│ [1073752]                      │ ['2014-03-17 10:46:20']                                                                   │
+│ [1073752,591325,591325,591325] │ ['2014-03-17 13:59:20','2014-03-17 22:17:55','2014-03-17 22:18:07','2014-03-17 22:18:51'] │
+│ []                             │ []                                                                                        │
+│ [1073752,591325,591325]        │ ['2014-03-17 11:37:06','2014-03-17 14:07:47','2014-03-17 14:36:21']                       │
+│ []                             │ []                                                                                        │
+│ []                             │ []                                                                                        │
+│ [591325,1073752]               │ ['2014-03-17 00:46:05','2014-03-17 00:46:05']                                             │
+│ [1073752,591325,591325,591325] │ ['2014-03-17 13:28:33','2014-03-17 13:30:26','2014-03-17 18:51:21','2014-03-17 18:51:45'] │
+└────────────────────────────────┴───────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+It is easiest to think of a nested data structure as a set of multiple column arrays of the same length.
+
+The only place where a SELECT query can specify the name of an entire nested data structure instead of individual columns is the ARRAY JOIN clause. For more information, see “ARRAY JOIN clause”. Example:
+
+``` sql
+SELECT
+    Goal.ID,
+    Goal.EventTime
+FROM test.visits
+ARRAY JOIN Goals AS Goal
+WHERE CounterID = 101500 AND length(Goals.ID) < 5
+LIMIT 10
+```
+
+``` text
+┌─Goal.ID─┬──────Goal.EventTime─┐
+│ 1073752 │ 2014-03-17 16:38:10 │
+│  591325 │ 2014-03-17 16:38:48 │
+│  591325 │ 2014-03-17 16:42:27 │
+│ 1073752 │ 2014-03-17 00:28:25 │
+│ 1073752 │ 2014-03-17 10:46:20 │
+│ 1073752 │ 2014-03-17 13:59:20 │
+│  591325 │ 2014-03-17 22:17:55 │
+│  591325 │ 2014-03-17 22:18:07 │
+│  591325 │ 2014-03-17 22:18:51 │
+│ 1073752 │ 2014-03-17 11:37:06 │
+└─────────┴─────────────────────┘
+```
+
+You can’t perform SELECT for an entire nested data structure. You can only explicitly list individual columns that are part of it.
+
+For an INSERT query, you should pass all the component column arrays of a nested data structure separately (as if they were individual column arrays). During insertion, the system checks that they have the same length.
+
+For a DESCRIBE query, the columns in a nested data structure are listed separately in the same way.
+
+The ALTER query for elements in a nested data structure has limitations.
diff --git a/docs/en/sql-reference/data-types/nested-data-structures/nested.md b/docs/en/sql-reference/data-types/nested-data-structures/nested.md
deleted file mode 100644
index d118170cd39..00000000000
--- a/docs/en/sql-reference/data-types/nested-data-structures/nested.md
+++ /dev/null
@@ -1,105 +0,0 @@
----
-slug: /en/sql-reference/data-types/nested-data-structures/nested
-sidebar_position: 57
-sidebar_label: Nested(Name1 Type1, Name2 Type2, ...)
----
-
-# Nested
-
-## Nested(name1 Type1, Name2 Type2, …)
-
-A nested data structure is like a table inside a cell. The parameters of a nested data structure – the column names and types – are specified the same way as in a [CREATE TABLE](../../../sql-reference/statements/create/table.md) query. Each table row can correspond to any number of rows in a nested data structure.
-
-Example:
-
-``` sql
-CREATE TABLE test.visits
-(
-    CounterID UInt32,
-    StartDate Date,
-    Sign Int8,
-    IsNew UInt8,
-    VisitID UInt64,
-    UserID UInt64,
-    ...
-    Goals Nested
-    (
-        ID UInt32,
-        Serial UInt32,
-        EventTime DateTime,
-        Price Int64,
-        OrderID String,
-        CurrencyID UInt32
-    ),
-    ...
-) ENGINE = CollapsingMergeTree(StartDate, intHash32(UserID), (CounterID, StartDate, intHash32(UserID), VisitID), 8192, Sign)
-```
-
-This example declares the `Goals` nested data structure, which contains data about conversions (goals reached). Each row in the ‘visits’ table can correspond to zero or any number of conversions.
-
-When [flatten_nested](../../../operations/settings/settings.md#flatten-nested) is set to `0` (which is not by default), arbitrary levels of nesting are supported.
-
-In most cases, when working with a nested data structure, its columns are specified with column names separated by a dot. These columns make up an array of matching types. All the column arrays of a single nested data structure have the same length.
-
-Example:
-
-``` sql
-SELECT
-    Goals.ID,
-    Goals.EventTime
-FROM test.visits
-WHERE CounterID = 101500 AND length(Goals.ID) < 5
-LIMIT 10
-```
-
-``` text
-┌─Goals.ID───────────────────────┬─Goals.EventTime───────────────────────────────────────────────────────────────────────────┐
-│ [1073752,591325,591325]        │ ['2014-03-17 16:38:10','2014-03-17 16:38:48','2014-03-17 16:42:27']                       │
-│ [1073752]                      │ ['2014-03-17 00:28:25']                                                                   │
-│ [1073752]                      │ ['2014-03-17 10:46:20']                                                                   │
-│ [1073752,591325,591325,591325] │ ['2014-03-17 13:59:20','2014-03-17 22:17:55','2014-03-17 22:18:07','2014-03-17 22:18:51'] │
-│ []                             │ []                                                                                        │
-│ [1073752,591325,591325]        │ ['2014-03-17 11:37:06','2014-03-17 14:07:47','2014-03-17 14:36:21']                       │
-│ []                             │ []                                                                                        │
-│ []                             │ []                                                                                        │
-│ [591325,1073752]               │ ['2014-03-17 00:46:05','2014-03-17 00:46:05']                                             │
-│ [1073752,591325,591325,591325] │ ['2014-03-17 13:28:33','2014-03-17 13:30:26','2014-03-17 18:51:21','2014-03-17 18:51:45'] │
-└────────────────────────────────┴───────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-It is easiest to think of a nested data structure as a set of multiple column arrays of the same length.
-
-The only place where a SELECT query can specify the name of an entire nested data structure instead of individual columns is the ARRAY JOIN clause. For more information, see “ARRAY JOIN clause”. Example:
-
-``` sql
-SELECT
-    Goal.ID,
-    Goal.EventTime
-FROM test.visits
-ARRAY JOIN Goals AS Goal
-WHERE CounterID = 101500 AND length(Goals.ID) < 5
-LIMIT 10
-```
-
-``` text
-┌─Goal.ID─┬──────Goal.EventTime─┐
-│ 1073752 │ 2014-03-17 16:38:10 │
-│  591325 │ 2014-03-17 16:38:48 │
-│  591325 │ 2014-03-17 16:42:27 │
-│ 1073752 │ 2014-03-17 00:28:25 │
-│ 1073752 │ 2014-03-17 10:46:20 │
-│ 1073752 │ 2014-03-17 13:59:20 │
-│  591325 │ 2014-03-17 22:17:55 │
-│  591325 │ 2014-03-17 22:18:07 │
-│  591325 │ 2014-03-17 22:18:51 │
-│ 1073752 │ 2014-03-17 11:37:06 │
-└─────────┴─────────────────────┘
-```
-
-You can’t perform SELECT for an entire nested data structure. You can only explicitly list individual columns that are part of it.
-
-For an INSERT query, you should pass all the component column arrays of a nested data structure separately (as if they were individual column arrays). During insertion, the system checks that they have the same length.
-
-For a DESCRIBE query, the columns in a nested data structure are listed separately in the same way.
-
-The ALTER query for elements in a nested data structure has limitations.
diff --git a/docs/en/sql-reference/data-types/nullable.md b/docs/en/sql-reference/data-types/nullable.md
index 230b4af7960..28180f7f991 100644
--- a/docs/en/sql-reference/data-types/nullable.md
+++ b/docs/en/sql-reference/data-types/nullable.md
@@ -8,7 +8,7 @@ sidebar_label: Nullable
 
 Allows to store special marker ([NULL](../../sql-reference/syntax.md)) that denotes “missing value” alongside normal values allowed by `TypeName`. For example, a `Nullable(Int8)` type column can store `Int8` type values, and the rows that do not have a value will store `NULL`.
 
-For a `TypeName`, you can’t use composite data types [Array](../../sql-reference/data-types/array.md) and [Tuple](../../sql-reference/data-types/tuple.md). Composite data types can contain `Nullable` type values, such as `Array(Nullable(Int8))`.
+For a `TypeName`, you can’t use composite data types [Array](../../sql-reference/data-types/array.md), [Map](../../sql-reference/data-types/map.md) and [Tuple](../../sql-reference/data-types/tuple.md). Composite data types can contain `Nullable` type values, such as `Array(Nullable(Int8))`.
 
 A `Nullable` type field can’t be included in table indexes.
 
diff --git a/docs/en/sql-reference/data-types/simpleaggregatefunction.md b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
index 342a0294eb6..517a28576f0 100644
--- a/docs/en/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
@@ -9,20 +9,20 @@ The common way to produce an aggregate function value is by calling the aggregat
 
 The following aggregate functions are supported:
 
--   [`any`](../../sql-reference/aggregate-functions/reference/any.md#agg_function-any)
--   [`anyLast`](../../sql-reference/aggregate-functions/reference/anylast.md#anylastx)
--   [`min`](../../sql-reference/aggregate-functions/reference/min.md#agg_function-min)
--   [`max`](../../sql-reference/aggregate-functions/reference/max.md#agg_function-max)
--   [`sum`](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum)
--   [`sumWithOverflow`](../../sql-reference/aggregate-functions/reference/sumwithoverflow.md#sumwithoverflowx)
--   [`groupBitAnd`](../../sql-reference/aggregate-functions/reference/groupbitand.md#groupbitand)
--   [`groupBitOr`](../../sql-reference/aggregate-functions/reference/groupbitor.md#groupbitor)
--   [`groupBitXor`](../../sql-reference/aggregate-functions/reference/groupbitxor.md#groupbitxor)
--   [`groupArrayArray`](../../sql-reference/aggregate-functions/reference/grouparray.md#agg_function-grouparray)
--   [`groupUniqArrayArray`](../../sql-reference/aggregate-functions/reference/groupuniqarray.md)
--   [`sumMap`](../../sql-reference/aggregate-functions/reference/summap.md#agg_functions-summap)
--   [`minMap`](../../sql-reference/aggregate-functions/reference/minmap.md#agg_functions-minmap)
--   [`maxMap`](../../sql-reference/aggregate-functions/reference/maxmap.md#agg_functions-maxmap)
+- [`any`](../../sql-reference/aggregate-functions/reference/any.md#agg_function-any)
+- [`anyLast`](../../sql-reference/aggregate-functions/reference/anylast.md#anylastx)
+- [`min`](../../sql-reference/aggregate-functions/reference/min.md#agg_function-min)
+- [`max`](../../sql-reference/aggregate-functions/reference/max.md#agg_function-max)
+- [`sum`](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum)
+- [`sumWithOverflow`](../../sql-reference/aggregate-functions/reference/sumwithoverflow.md#sumwithoverflowx)
+- [`groupBitAnd`](../../sql-reference/aggregate-functions/reference/groupbitand.md#groupbitand)
+- [`groupBitOr`](../../sql-reference/aggregate-functions/reference/groupbitor.md#groupbitor)
+- [`groupBitXor`](../../sql-reference/aggregate-functions/reference/groupbitxor.md#groupbitxor)
+- [`groupArrayArray`](../../sql-reference/aggregate-functions/reference/grouparray.md#agg_function-grouparray)
+- [`groupUniqArrayArray`](../../sql-reference/aggregate-functions/reference/groupuniqarray.md)
+- [`sumMap`](../../sql-reference/aggregate-functions/reference/summap.md#agg_functions-summap)
+- [`minMap`](../../sql-reference/aggregate-functions/reference/minmap.md#agg_functions-minmap)
+- [`maxMap`](../../sql-reference/aggregate-functions/reference/maxmap.md#agg_functions-maxmap)
 
 
 :::note    
@@ -33,8 +33,8 @@ Values of the `SimpleAggregateFunction(func, Type)` look and stored the same way
 
 **Parameters**
 
--   Name of the aggregate function.
--   Types of the aggregate function arguments.
+- Name of the aggregate function.
+- Types of the aggregate function arguments.
 
 **Example**
 
diff --git a/docs/en/sql-reference/data-types/special-data-types/interval.md b/docs/en/sql-reference/data-types/special-data-types/interval.md
index 5169bc646c9..bedbcf0bd28 100644
--- a/docs/en/sql-reference/data-types/special-data-types/interval.md
+++ b/docs/en/sql-reference/data-types/special-data-types/interval.md
@@ -8,25 +8,24 @@ sidebar_label: Interval
 
 The family of data types representing time and date intervals. The resulting types of the [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) operator.
 
-:::warning    
-`Interval` data type values can’t be stored in tables.
-:::
-
 Structure:
 
--   Time interval as an unsigned integer value.
--   Type of an interval.
+- Time interval as an unsigned integer value.
+- Type of an interval.
 
 Supported interval types:
 
--   `SECOND`
--   `MINUTE`
--   `HOUR`
--   `DAY`
--   `WEEK`
--   `MONTH`
--   `QUARTER`
--   `YEAR`
+- `NANOSECOND`
+- `MICROSECOND`
+- `MILLISECOND`
+- `SECOND`
+- `MINUTE`
+- `HOUR`
+- `DAY`
+- `WEEK`
+- `MONTH`
+- `QUARTER`
+- `YEAR`
 
 For each interval type, there is a separate data type. For example, the `DAY` interval corresponds to the `IntervalDay` data type:
 
@@ -81,5 +80,5 @@ Code: 43. DB::Exception: Received from localhost:9000. DB::Exception: Wrong argu
 
 ## See Also
 
--   [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) operator
--   [toInterval](../../../sql-reference/functions/type-conversion-functions.md#function-tointerval) type conversion functions
+- [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) operator
+- [toInterval](../../../sql-reference/functions/type-conversion-functions.md#function-tointerval) type conversion functions
diff --git a/docs/en/sql-reference/data-types/string.md b/docs/en/sql-reference/data-types/string.md
index fce16320240..f891a9303e5 100644
--- a/docs/en/sql-reference/data-types/string.md
+++ b/docs/en/sql-reference/data-types/string.md
@@ -13,7 +13,7 @@ When creating tables, numeric parameters for string fields can be set (e.g. `VAR
 
 Aliases:
 
--   `String` — `LONGTEXT`, `MEDIUMTEXT`, `TINYTEXT`, `TEXT`, `LONGBLOB`, `MEDIUMBLOB`, `TINYBLOB`, `BLOB`, `VARCHAR`, `CHAR`.
+- `String` — `LONGTEXT`, `MEDIUMTEXT`, `TINYTEXT`, `TEXT`, `LONGBLOB`, `MEDIUMBLOB`, `TINYBLOB`, `BLOB`, `VARCHAR`, `CHAR`.
 
 ## Encodings
 
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/_snippet_dictionary_in_cloud.md b/docs/en/sql-reference/dictionaries/_snippet_dictionary_in_cloud.md
similarity index 100%
rename from docs/en/sql-reference/dictionaries/external-dictionaries/_snippet_dictionary_in_cloud.md
rename to docs/en/sql-reference/dictionaries/_snippet_dictionary_in_cloud.md
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/_category_.yml b/docs/en/sql-reference/dictionaries/external-dictionaries/_category_.yml
deleted file mode 100644
index af79ff9af23..00000000000
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/_category_.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-position: 37
-label: 'Dictionaries'
-collapsible: true
-collapsed: true
-link:
-  type: generated-index
-  title: Dictionaries
-  slug: /en/sql-reference/dictionaries/external-dictionaries
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
deleted file mode 100644
index ee9cd2c1f2e..00000000000
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-slug: /en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical
-sidebar_position: 45
-sidebar_label: Hierarchical dictionaries
----
-
-# Hierarchical Dictionaries 
-
-ClickHouse supports hierarchical dictionaries with a [numeric key](../../dictionaries/external-dictionaries/external-dicts-dict-structure.md#numeric-key).
-
-Look at the following hierarchical structure:
-
-``` text
-0 (Common parent)
-│
-├── 1 (Russia)
-│   │
-│   └── 2 (Moscow)
-│       │
-│       └── 3 (Center)
-│
-└── 4 (Great Britain)
-    │
-    └── 5 (London)
-```
-
-This hierarchy can be expressed as the following dictionary table.
-
-| region_id | parent_region | region_name  |
-|------------|----------------|---------------|
-| 1          | 0              | Russia        |
-| 2          | 1              | Moscow        |
-| 3          | 2              | Center        |
-| 4          | 0              | Great Britain |
-| 5          | 4              | London        |
-
-This table contains a column `parent_region` that contains the key of the nearest parent for the element.
-
-ClickHouse supports the [hierarchical](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#hierarchical-dict-attr) property for [external dictionary](../../../sql-reference/dictionaries/external-dictionaries/) attributes. This property allows you to configure the hierarchical dictionary similar to described above.
-
-The [dictGetHierarchy](../../../sql-reference/functions/ext-dict-functions.md#dictgethierarchy) function allows you to get the parent chain of an element.
-
-For our example, the structure of dictionary can be the following:
-
-``` xml
-<dictionary>
-    <structure>
-        <id>
-            <name>region_id</name>
-        </id>
-
-        <attribute>
-            <name>parent_region</name>
-            <type>UInt64</type>
-            <null_value>0</null_value>
-            <hierarchical>true</hierarchical>
-        </attribute>
-
-        <attribute>
-            <name>region_name</name>
-            <type>String</type>
-            <null_value></null_value>
-        </attribute>
-
-    </structure>
-</dictionary>
-```
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
deleted file mode 100644
index 4dc6fd33849..00000000000
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ /dev/null
@@ -1,751 +0,0 @@
----
-slug: /en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout
-sidebar_position: 41
-sidebar_label: Storing Dictionaries in Memory
----
-import CloudDetails from '@site/docs/en/sql-reference/dictionaries/external-dictionaries/_snippet_dictionary_in_cloud.md';
-
-# Storing Dictionaries in Memory
-
-There are a variety of ways to store dictionaries in memory.
-
-We recommend [flat](#flat), [hashed](#dicts-external_dicts_dict_layout-hashed) and [complex_key_hashed](#complex-key-hashed), which provide optimal processing speed.
-
-Caching is not recommended because of potentially poor performance and difficulties in selecting optimal parameters. Read more in the section [cache](#cache).
-
-There are several ways to improve dictionary performance:
-
--   Call the function for working with the dictionary after `GROUP BY`.
--   Mark attributes to extract as injective. An attribute is called injective if different attribute values correspond to different keys. So when `GROUP BY` uses a function that fetches an attribute value by the key, this function is automatically taken out of `GROUP BY`.
-
-ClickHouse generates an exception for errors with dictionaries. Examples of errors:
-
--   The dictionary being accessed could not be loaded.
--   Error querying a `cached` dictionary.
-
-You can view the list of dictionaries and their statuses in the [system.dictionaries](../../../operations/system-tables/dictionaries.md) table.
-
-<CloudDetails />
-
-The configuration looks like this:
-
-``` xml
-<clickhouse>
-    <dictionary>
-        ...
-        <layout>
-            <layout_type>
-                <!-- layout settings -->
-            </layout_type>
-        </layout>
-        ...
-    </dictionary>
-</clickhouse>
-```
-
-Corresponding [DDL-query](../../../sql-reference/statements/create/dictionary.md):
-
-``` sql
-CREATE DICTIONARY (...)
-...
-LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
-...
-```
-
-Dictionaries without word `complex-key*` in a layout have a key with [UInt64](../../../sql-reference/data-types/int-uint.md) type, `complex-key*` dictionaries have a composite key (complex, with arbitrary types).
-
-[UInt64](../../../sql-reference/data-types/int-uint.md) keys in XML dictionaries are defined with `<id>` tag.
-
-Configuration example (column key_column has UInt64 type):
-```xml
-...
-<structure>
-    <id>
-        <name>key_column</name>
-    </id>
-...
-```
-
-Composite `complex` keys XML dictionaries are defined `<key>` tag.
-
-Configuration example of a composite key (key has one element with [String](../../../sql-reference/data-types/string.md) type):
-```xml
-...
-<structure>
-    <key>
-        <attribute>
-            <name>country_code</name>
-            <type>String</type>
-        </attribute>
-    </key>
-...
-```
-
-## Ways to Store Dictionaries in Memory
-
--   [flat](#flat)
--   [hashed](#dicts-external_dicts_dict_layout-hashed)
--   [sparse_hashed](#dicts-external_dicts_dict_layout-sparse_hashed)
--   [complex_key_hashed](#complex-key-hashed)
--   [complex_key_sparse_hashed](#complex-key-sparse-hashed)
--   [hashed_array](#dicts-external_dicts_dict_layout-hashed-array)
--   [complex_key_hashed_array](#complex-key-hashed-array)
--   [range_hashed](#range-hashed)
--   [complex_key_range_hashed](#complex-key-range-hashed)
--   [cache](#cache)
--   [complex_key_cache](#complex-key-cache)
--   [ssd_cache](#ssd-cache)
--   [complex_key_ssd_cache](#complex-key-ssd-cache)
--   [direct](#direct)
--   [complex_key_direct](#complex-key-direct)
--   [ip_trie](#ip-trie)
-
-### flat
-
-The dictionary is completely stored in memory in the form of flat arrays. How much memory does the dictionary use? The amount is proportional to the size of the largest key (in space used).
-
-The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type and the value is limited to `max_array_size` (by default — 500,000). If a larger key is discovered when creating the dictionary, ClickHouse throws an exception and does not create the dictionary. Dictionary flat arrays initial size is controlled by `initial_array_size` setting (by default — 1024).
-
-All types of sources are supported. When updating, data (from a file or from a table) is read in it entirety.
-
-This method provides the best performance among all available methods of storing the dictionary.
-
-Configuration example:
-
-``` xml
-<layout>
-  <flat>
-    <initial_array_size>50000</initial_array_size>
-    <max_array_size>5000000</max_array_size>
-  </flat>
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(FLAT(INITIAL_ARRAY_SIZE 50000 MAX_ARRAY_SIZE 5000000))
-```
-
-### hashed
-
-The dictionary is completely stored in memory in the form of a hash table. The dictionary can contain any number of elements with any identifiers In practice, the number of keys can reach tens of millions of items.
-
-The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
-
-All types of sources are supported. When updating, data (from a file or from a table) is read in its entirety.
-
-Configuration example:
-
-``` xml
-<layout>
-  <hashed />
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(HASHED())
-```
-
-If `shards` greater then 1 (default is `1`) the dictionary will load data in parallel, useful if you have huge amount of elements in one dictionary.
-
-Configuration example:
-
-``` xml
-<layout>
-  <hashed>
-    <shards>10</shards>
-    <!-- Size of the backlog for blocks in parallel queue.
-
-         Since the bottleneck in parallel loading is rehash, and so to avoid
-         stalling because of thread is doing rehash, you need to have some
-         backlog.
-
-         10000 is good balance between memory and speed.
-         Even for 10e10 elements and can handle all the load without starvation. -->
-    <shard_load_queue_backlog>10000</shard_load_queue_backlog>
-  </hashed>
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(HASHED(SHARDS 10 [SHARD_LOAD_QUEUE_BACKLOG 10000]))
-```
-
-### sparse_hashed
-
-Similar to `hashed`, but uses less memory in favor more CPU usage.
-
-The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
-
-Configuration example:
-
-``` xml
-<layout>
-  <sparse_hashed />
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(SPARSE_HASHED())
-```
-
-It is also possible to use `shards` for this type of dictionary, and again it is more important for `sparse_hashed` then for `hashed`, since `sparse_hashed` is slower.
-
-### complex_key_hashed
-
-This type of storage is for use with composite [keys](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Similar to `hashed`.
-
-Configuration example:
-
-``` xml
-<layout>
-  <complex_key_hashed>
-    <shards>1</shards>
-    <!-- <shard_load_queue_backlog>10000</shard_load_queue_backlog> -->
-  </complex_key_hashed>
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(COMPLEX_KEY_HASHED([SHARDS 1] [SHARD_LOAD_QUEUE_BACKLOG 10000]))
-```
-
-### complex_key_sparse_hashed
-
-This type of storage is for use with composite [keys](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Similar to [sparse_hashed](#dicts-external_dicts_dict_layout-sparse_hashed).
-
-Configuration example:
-
-``` xml
-<layout>
-  <complex_key_sparse_hashed>
-    <shards>1</shards>
-  </complex_key_sparse_hashed>
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(COMPLEX_KEY_SPARSE_HASHED([SHARDS 1] [SHARD_LOAD_QUEUE_BACKLOG 10000]))
-```
-
-### hashed_array
-
-The dictionary is completely stored in memory. Each attribute is stored in an array. The key attribute is stored in the form of a hashed table where value is an index in the attributes array. The dictionary can contain any number of elements with any identifiers. In practice, the number of keys can reach tens of millions of items.
-
-The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
-
-All types of sources are supported. When updating, data (from a file or from a table) is read in its entirety.
-
-Configuration example:
-
-``` xml
-<layout>
-  <hashed_array>
-  </hashed_array>
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(HASHED_ARRAY())
-```
-
-### complex_key_hashed_array
-
-This type of storage is for use with composite [keys](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Similar to [hashed_array](#dicts-external_dicts_dict_layout-hashed-array).
-
-Configuration example:
-
-``` xml
-<layout>
-  <complex_key_hashed_array />
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(COMPLEX_KEY_HASHED_ARRAY())
-```
-
-### range_hashed
-
-The dictionary is stored in memory in the form of a hash table with an ordered array of ranges and their corresponding values.
-
-The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
-This storage method works the same way as hashed and allows using date/time (arbitrary numeric type) ranges in addition to the key.
-
-Example: The table contains discounts for each advertiser in the format:
-
-``` text
-┌─advertiser_id─┬─discount_start_date─┬─discount_end_date─┬─amount─┐
-│           123 │          2015-01-16 │        2015-01-31 │   0.25 │
-│           123 │          2015-01-01 │        2015-01-15 │   0.15 │
-│           456 │          2015-01-01 │        2015-01-15 │   0.05 │
-└───────────────┴─────────────────────┴───────────────────┴────────┘
-```
-
-To use a sample for date ranges, define the `range_min` and `range_max` elements in the [structure](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). These elements must contain elements `name` and `type` (if `type` is not specified, the default type will be used - Date). `type` can be any numeric type (Date / DateTime / UInt64 / Int32 / others).
-
-:::warning
-Values of `range_min` and `range_max` should fit in `Int64` type.
-:::
-
-Example:
-
-``` xml
-<layout>
-    <range_hashed>
-        <!-- Strategy for overlapping ranges (min/max). Default: min (return a matching range with the min(range_min -> range_max) value) -->
-        <range_lookup_strategy>min</range_lookup_strategy>
-    </range_hashed>
-</layout>
-<structure>
-    <id>
-        <name>advertiser_id</name>
-    </id>
-    <range_min>
-        <name>discount_start_date</name>
-        <type>Date</type>
-    </range_min>
-    <range_max>
-        <name>discount_end_date</name>
-        <type>Date</type>
-    </range_max>
-    ...
-```
-
-or
-
-``` sql
-CREATE DICTIONARY discounts_dict (
-    advertiser_id UInt64,
-    discount_start_date Date,
-    discount_end_date Date,
-    amount Float64
-)
-PRIMARY KEY id
-SOURCE(CLICKHOUSE(TABLE 'discounts'))
-LIFETIME(MIN 1 MAX 1000)
-LAYOUT(RANGE_HASHED(range_lookup_strategy 'max'))
-RANGE(MIN discount_start_date MAX discount_end_date)
-```
-
-To work with these dictionaries, you need to pass an additional argument to the `dictGet` function, for which a range is selected:
-
-``` sql
-dictGet('dict_name', 'attr_name', id, date)
-```
-Query example:
-
-``` sql
-SELECT dictGet('discounts_dict', 'amount', 1, '2022-10-20'::Date);
-```
-
-This function returns the value for the specified `id`s and the date range that includes the passed date.
-
-Details of the algorithm:
-
--   If the `id` is not found or a range is not found for the `id`, it returns the default value of the attribute's type.
--   If there are overlapping ranges and `range_lookup_strategy=min`, it returns a matching range with minimal `range_min`, if several ranges found, it returns a range with minimal `range_max`, if again several ranges found (several ranges had the same `range_min` and `range_max` it returns a random range of them.
--   If there are overlapping ranges and `range_lookup_strategy=max`, it returns a matching range with maximal `range_min`, if several ranges found, it returns a range with maximal `range_max`, if again several ranges found (several ranges had the same `range_min` and `range_max` it returns a random range of them.
--   If the `range_max` is `NULL`, the range is open. `NULL` is treated as maximal possible value. For the `range_min` `1970-01-01` or `0` (-MAX_INT) can be used as the open value.
-
-Configuration example:
-
-``` xml
-<clickhouse>
-    <dictionary>
-        ...
-
-        <layout>
-            <range_hashed />
-        </layout>
-
-        <structure>
-            <id>
-                <name>Abcdef</name>
-            </id>
-            <range_min>
-                <name>StartTimeStamp</name>
-                <type>UInt64</type>
-            </range_min>
-            <range_max>
-                <name>EndTimeStamp</name>
-                <type>UInt64</type>
-            </range_max>
-            <attribute>
-                <name>XXXType</name>
-                <type>String</type>
-                <null_value />
-            </attribute>
-        </structure>
-
-    </dictionary>
-</clickhouse>
-```
-
-or
-
-``` sql
-CREATE DICTIONARY somedict(
-    Abcdef UInt64,
-    StartTimeStamp UInt64,
-    EndTimeStamp UInt64,
-    XXXType String DEFAULT ''
-)
-PRIMARY KEY Abcdef
-RANGE(MIN StartTimeStamp MAX EndTimeStamp)
-```
-
-Configuration example with overlapping ranges and open ranges:
-
-```sql
-CREATE TABLE discounts
-(
-    advertiser_id UInt64,
-    discount_start_date Date,
-    discount_end_date Nullable(Date),
-    amount Float64
-)
-ENGINE = Memory;
-
-INSERT INTO discounts VALUES (1, '2015-01-01', Null, 0.1);
-INSERT INTO discounts VALUES (1, '2015-01-15', Null, 0.2);
-INSERT INTO discounts VALUES (2, '2015-01-01', '2015-01-15', 0.3);
-INSERT INTO discounts VALUES (2, '2015-01-04', '2015-01-10', 0.4);
-INSERT INTO discounts VALUES (3, '1970-01-01', '2015-01-15', 0.5);
-INSERT INTO discounts VALUES (3, '1970-01-01', '2015-01-10', 0.6);
-
-SELECT * FROM discounts ORDER BY advertiser_id, discount_start_date;
-┌─advertiser_id─┬─discount_start_date─┬─discount_end_date─┬─amount─┐
-│             1 │          2015-01-01 │              ᴺᵁᴸᴸ │    0.1 │
-│             1 │          2015-01-15 │              ᴺᵁᴸᴸ │    0.2 │
-│             2 │          2015-01-01 │        2015-01-15 │    0.3 │
-│             2 │          2015-01-04 │        2015-01-10 │    0.4 │
-│             3 │          1970-01-01 │        2015-01-15 │    0.5 │
-│             3 │          1970-01-01 │        2015-01-10 │    0.6 │
-└───────────────┴─────────────────────┴───────────────────┴────────┘
-
--- RANGE_LOOKUP_STRATEGY 'max'
-
-CREATE DICTIONARY discounts_dict
-(
-    advertiser_id UInt64,
-    discount_start_date Date,
-    discount_end_date Nullable(Date),
-    amount Float64
-)
-PRIMARY KEY advertiser_id
-SOURCE(CLICKHOUSE(TABLE discounts))
-LIFETIME(MIN 600 MAX 900)
-LAYOUT(RANGE_HASHED(RANGE_LOOKUP_STRATEGY 'max'))
-RANGE(MIN discount_start_date MAX discount_end_date);
-
-select dictGet('discounts_dict', 'amount', 1, toDate('2015-01-14')) res;
-┌─res─┐
-│ 0.1 │ -- the only one range is matching: 2015-01-01 - Null
-└─────┘
-
-select dictGet('discounts_dict', 'amount', 1, toDate('2015-01-16')) res;
-┌─res─┐
-│ 0.2 │ -- two ranges are matching, range_min 2015-01-15 (0.2) is bigger than 2015-01-01 (0.1)
-└─────┘
-
-select dictGet('discounts_dict', 'amount', 2, toDate('2015-01-06')) res;
-┌─res─┐
-│ 0.4 │ -- two ranges are matching, range_min 2015-01-04 (0.4) is bigger than 2015-01-01 (0.3)
-└─────┘
-
-select dictGet('discounts_dict', 'amount', 3, toDate('2015-01-01')) res;
-┌─res─┐
-│ 0.5 │ -- two ranges are matching, range_min are equal, 2015-01-15 (0.5) is bigger than 2015-01-10 (0.6)
-└─────┘
-
-DROP DICTIONARY discounts_dict;
-
--- RANGE_LOOKUP_STRATEGY 'min'
-
-CREATE DICTIONARY discounts_dict
-(
-    advertiser_id UInt64,
-    discount_start_date Date,
-    discount_end_date Nullable(Date),
-    amount Float64
-)
-PRIMARY KEY advertiser_id
-SOURCE(CLICKHOUSE(TABLE discounts))
-LIFETIME(MIN 600 MAX 900)
-LAYOUT(RANGE_HASHED(RANGE_LOOKUP_STRATEGY 'min'))
-RANGE(MIN discount_start_date MAX discount_end_date);
-
-select dictGet('discounts_dict', 'amount', 1, toDate('2015-01-14')) res;
-┌─res─┐
-│ 0.1 │ -- the only one range is matching: 2015-01-01 - Null
-└─────┘
-
-select dictGet('discounts_dict', 'amount', 1, toDate('2015-01-16')) res;
-┌─res─┐
-│ 0.1 │ -- two ranges are matching, range_min 2015-01-01 (0.1) is less than 2015-01-15 (0.2)
-└─────┘
-
-select dictGet('discounts_dict', 'amount', 2, toDate('2015-01-06')) res;
-┌─res─┐
-│ 0.3 │ -- two ranges are matching, range_min 2015-01-01 (0.3) is less than 2015-01-04 (0.4)
-└─────┘
-
-select dictGet('discounts_dict', 'amount', 3, toDate('2015-01-01')) res;
-┌─res─┐
-│ 0.6 │ -- two ranges are matching, range_min are equal, 2015-01-10 (0.6) is less than 2015-01-15 (0.5)
-└─────┘
-```
-
-### complex_key_range_hashed
-
-The dictionary is stored in memory in the form of a hash table with an ordered array of ranges and their corresponding values (see [range_hashed](#range-hashed)). This type of storage is for use with composite [keys](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md).
-
-Configuration example:
-
-``` sql
-CREATE DICTIONARY range_dictionary
-(
-  CountryID UInt64,
-  CountryKey String,
-  StartDate Date,
-  EndDate Date,
-  Tax Float64 DEFAULT 0.2
-)
-PRIMARY KEY CountryID, CountryKey
-SOURCE(CLICKHOUSE(TABLE 'date_table'))
-LIFETIME(MIN 1 MAX 1000)
-LAYOUT(COMPLEX_KEY_RANGE_HASHED())
-RANGE(MIN StartDate MAX EndDate);
-```
-
-### cache
-
-The dictionary is stored in a cache that has a fixed number of cells. These cells contain frequently used elements.
-
-The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
-
-When searching for a dictionary, the cache is searched first. For each block of data, all keys that are not found in the cache or are outdated are requested from the source using `SELECT attrs... FROM db.table WHERE id IN (k1, k2, ...)`. The received data is then written to the cache.
-
-If keys are not found in dictionary, then update cache task is created and added into update queue. Update queue properties can be controlled with settings `max_update_queue_size`, `update_queue_push_timeout_milliseconds`, `query_wait_timeout_milliseconds`, `max_threads_for_updates`.
-
-For cache dictionaries, the expiration [lifetime](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) of data in the cache can be set. If more time than `lifetime` has passed since loading the data in a cell, the cell’s value is not used and key becomes expired. The key is re-requested the next time it needs to be used. This behaviour can be configured with setting `allow_read_expired_keys`.
-
-This is the least effective of all the ways to store dictionaries. The speed of the cache depends strongly on correct settings and the usage scenario. A cache type dictionary performs well only when the hit rates are high enough (recommended 99% and higher). You can view the average hit rate in the [system.dictionaries](../../../operations/system-tables/dictionaries.md) table.
-
-If setting `allow_read_expired_keys` is set to 1, by default 0. Then dictionary can support asynchronous updates. If a client requests keys and all of them are in cache, but some of them are expired, then dictionary will return expired keys for a client and request them asynchronously from the source.
-
-To improve cache performance, use a subquery with `LIMIT`, and call the function with the dictionary externally.
-
-All types of sources are supported.
-
-Example of settings:
-
-``` xml
-<layout>
-    <cache>
-        <!-- The size of the cache, in number of cells. Rounded up to a power of two. -->
-        <size_in_cells>1000000000</size_in_cells>
-        <!-- Allows to read expired keys. -->
-        <allow_read_expired_keys>0</allow_read_expired_keys>
-        <!-- Max size of update queue. -->
-        <max_update_queue_size>100000</max_update_queue_size>
-        <!-- Max timeout in milliseconds for push update task into queue. -->
-        <update_queue_push_timeout_milliseconds>10</update_queue_push_timeout_milliseconds>
-        <!-- Max wait timeout in milliseconds for update task to complete. -->
-        <query_wait_timeout_milliseconds>60000</query_wait_timeout_milliseconds>
-        <!-- Max threads for cache dictionary update. -->
-        <max_threads_for_updates>4</max_threads_for_updates>
-    </cache>
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
-```
-
-Set a large enough cache size. You need to experiment to select the number of cells:
-
-1.  Set some value.
-2.  Run queries until the cache is completely full.
-3.  Assess memory consumption using the `system.dictionaries` table.
-4.  Increase or decrease the number of cells until the required memory consumption is reached.
-
-:::warning
-Do not use ClickHouse as a source, because it is slow to process queries with random reads.
-:::
-
-### complex_key_cache
-
-This type of storage is for use with composite [keys](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Similar to `cache`.
-
-### ssd_cache
-
-Similar to `cache`, but stores data on SSD and index in RAM. All cache dictionary settings related to update queue can also be applied to SSD cache dictionaries.
-
-The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
-
-``` xml
-<layout>
-    <ssd_cache>
-        <!-- Size of elementary read block in bytes. Recommended to be equal to SSD's page size. -->
-        <block_size>4096</block_size>
-        <!-- Max cache file size in bytes. -->
-        <file_size>16777216</file_size>
-        <!-- Size of RAM buffer in bytes for reading elements from SSD. -->
-        <read_buffer_size>131072</read_buffer_size>
-        <!-- Size of RAM buffer in bytes for aggregating elements before flushing to SSD. -->
-        <write_buffer_size>1048576</write_buffer_size>
-        <!-- Path where cache file will be stored. -->
-        <path>/var/lib/clickhouse/user_files/test_dict</path>
-    </ssd_cache>
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
-    PATH '/var/lib/clickhouse/user_files/test_dict'))
-```
-
-### complex_key_ssd_cache
-
-This type of storage is for use with composite [keys](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Similar to `ssd_cache`.
-
-### direct
-
-The dictionary is not stored in memory and directly goes to the source during the processing of a request.
-
-The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
-
-All types of [sources](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md), except local files, are supported.
-
-Configuration example:
-
-``` xml
-<layout>
-  <direct />
-</layout>
-```
-
-or
-
-``` sql
-LAYOUT(DIRECT())
-```
-
-### complex_key_direct
-
-This type of storage is for use with composite [keys](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Similar to `direct`.
-
-### ip_trie
-
-This type of storage is for mapping network prefixes (IP addresses) to metadata such as ASN.
-
-**Example**
-
-Suppose we have a table in ClickHouse that contains our IP prefixes and mappings:
-
-```sql
-CREATE TABLE my_ip_addresses (
-	prefix String,
-	asn UInt32,
-	cca2 String
-)
-ENGINE = MergeTree
-PRIMARY KEY prefix;
-```
-
-```sql
-INSERT INTO my_ip_addresses VALUES
-	('202.79.32.0/20', 17501, 'NP'),
-    ('2620:0:870::/48', 3856, 'US'),
-    ('2a02:6b8:1::/48', 13238, 'RU'),
-    ('2001:db8::/32', 65536, 'ZZ')
-;
-```
-
-Let's define an `ip_trie` dictionary for this table. The `ip_trie` layout requires a composite key:
-
-``` xml
-<structure>
-    <key>
-        <attribute>
-            <name>prefix</name>
-            <type>String</type>
-        </attribute>
-    </key>
-    <attribute>
-            <name>asn</name>
-            <type>UInt32</type>
-            <null_value />
-    </attribute>
-    <attribute>
-            <name>cca2</name>
-            <type>String</type>
-            <null_value>??</null_value>
-    </attribute>
-    ...
-</structure>
-<layout>
-    <ip_trie>
-        <!-- Key attribute `prefix` can be retrieved via dictGetString. -->
-        <!-- This option increases memory usage. -->
-        <access_to_key_from_attributes>true</access_to_key_from_attributes>
-    </ip_trie>
-</layout>
-```
-
-or
-
-``` sql
-CREATE DICTIONARY my_ip_trie_dictionary (
-    prefix String,
-    asn UInt32,
-    cca2 String DEFAULT '??'
-)
-PRIMARY KEY prefix
-SOURCE(CLICKHOUSE(TABLE 'my_ip_addresses'))
-LAYOUT(IP_TRIE)
-LIFETIME(3600);
-```
-
-The key must have only one `String` type attribute that contains an allowed IP prefix. Other types are not supported yet.
-
-For queries, you must use the same functions (`dictGetT` with a tuple) as for dictionaries with composite keys. The syntax is:
-
-``` sql
-dictGetT('dict_name', 'attr_name', tuple(ip))
-```
-
-The function takes either `UInt32` for IPv4, or `FixedString(16)` for IPv6. For example:
-
-``` sql
-select dictGet('my_ip_trie_dictionary', 'asn', tuple(IPv6StringToNum('2001:db8::1')))
-```
-
-Other types are not supported yet. The function returns the attribute for the prefix that corresponds to this IP address. If there are overlapping prefixes, the most specific one is returned.
-
-Data must completely fit into RAM.
-
-## Related Content
-
-- [Using dictionaries to accelerate queries](https://clickhouse.com/blog/faster-queries-dictionaries-clickhouse)
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
deleted file mode 100644
index 8e9dbd392aa..00000000000
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ /dev/null
@@ -1,142 +0,0 @@
----
-slug: /en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime
-sidebar_position: 42
-sidebar_label: Dictionary Updates
----
-import CloudDetails from '@site/docs/en/sql-reference/dictionaries/external-dictionaries/_snippet_dictionary_in_cloud.md';
-
-# Dictionary Updates 
-
-ClickHouse periodically updates the dictionaries. The update interval for fully downloaded dictionaries and the invalidation interval for cached dictionaries are defined in the `lifetime` tag in seconds.
-
-Dictionary updates (other than loading for first use) do not block queries. During updates, the old version of a dictionary is used. If an error occurs during an update, the error is written to the server log, and queries continue using the old version of dictionaries.
-
-Example of settings:
-
-<CloudDetails />
-
-``` xml
-<dictionary>
-    ...
-    <lifetime>300</lifetime>
-    ...
-</dictionary>
-```
-
-or
-
-``` sql
-CREATE DICTIONARY (...)
-...
-LIFETIME(300)
-...
-```
-
-Setting `<lifetime>0</lifetime>` (`LIFETIME(0)`) prevents dictionaries from updating.
-
-You can set a time interval for updates, and ClickHouse will choose a uniformly random time within this range. This is necessary in order to distribute the load on the dictionary source when updating on a large number of servers.
-
-Example of settings:
-
-``` xml
-<dictionary>
-    ...
-    <lifetime>
-        <min>300</min>
-        <max>360</max>
-    </lifetime>
-    ...
-</dictionary>
-```
-
-or
-
-``` sql
-LIFETIME(MIN 300 MAX 360)
-```
-
-If `<min>0</min>` and `<max>0</max>`, ClickHouse does not reload the dictionary by timeout.
-In this case, ClickHouse can reload the dictionary earlier if the dictionary configuration file was changed or the `SYSTEM RELOAD DICTIONARY` command was executed.
-
-When updating the dictionaries, the ClickHouse server applies different logic depending on the type of [source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md):
-
--   For a text file, it checks the time of modification. If the time differs from the previously recorded time, the dictionary is updated.
--   For MySQL source, the time of modification is checked using a `SHOW TABLE STATUS` query (in case of MySQL 8 you need to disable meta-information caching in MySQL by `set global information_schema_stats_expiry=0`).
--   Dictionaries from other sources are updated every time by default.
-
-For other sources (ODBC, PostgreSQL, ClickHouse, etc), you can set up a query that will update the dictionaries only if they really changed, rather than each time. To do this, follow these steps:
-
--   The dictionary table must have a field that always changes when the source data is updated.
--   The settings of the source must specify a query that retrieves the changing field. The ClickHouse server interprets the query result as a row, and if this row has changed relative to its previous state, the dictionary is updated. Specify the query in the `<invalidate_query>` field in the settings for the [source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md).
-
-Example of settings:
-
-``` xml
-<dictionary>
-    ...
-    <odbc>
-      ...
-      <invalidate_query>SELECT update_time FROM dictionary_source where id = 1</invalidate_query>
-    </odbc>
-    ...
-</dictionary>
-```
-
-or
-
-``` sql
-...
-SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source where id = 1'))
-...
-```
-
-For `Cache`, `ComplexKeyCache`, `SSDCache`, and `SSDComplexKeyCache` dictionaries both synchronious and asynchronious updates are supported.
-
-It is also possible for `Flat`, `Hashed`, `ComplexKeyHashed` dictionaries to only request data that was changed after the previous update. If `update_field` is specified as part of the dictionary source configuration, value of the previous update time in seconds will be added to the data request. Depends on source type (Executable, HTTP, MySQL, PostgreSQL, ClickHouse, or ODBC) different logic will be applied to `update_field` before request data from an external source.
-
--   If the source is HTTP then `update_field` will be added as a query parameter with the last update time as the parameter value.
--   If the source is Executable then `update_field` will be added as an executable script argument with the last update time as the argument value.
--   If the source is ClickHouse, MySQL, PostgreSQL, ODBC there will be an additional part of `WHERE`, where `update_field` is compared as greater or equal with the last update time.
-    - Per default, this `WHERE`-condition is checked at the highest level of the SQL-Query. Alternatively, the condition can be checked in any other `WHERE`-clause within the query using the `{condition}`-keyword. Example:
-    ```sql
-    ...
-    SOURCE(CLICKHOUSE(... 
-        update_field 'added_time' 
-        QUERY '
-            SELECT my_arr.1 AS x, my_arr.2 AS y, creation_time 
-            FROM (
-                SELECT arrayZip(x_arr, y_arr) AS my_arr, creation_time 
-                FROM dictionary_source
-                WHERE {condition}
-            )'
-    ))
-    ...
-    ```
-
-If `update_field` option is set, additional option `update_lag` can be set. Value of `update_lag` option is subtracted from previous update time before request updated data.
-
-Example of settings:
-
-``` xml
-<dictionary>
-    ...
-        <clickhouse>
-            ...
-            <update_field>added_time</update_field>
-            <update_lag>15</update_lag>
-        </clickhouse>
-    ...
-</dictionary>
-```
-
-or
-
-``` sql
-...
-SOURCE(CLICKHOUSE(... update_field 'added_time' update_lag 15))
-...
-```
-
-## Related Content
-
-- [Using dictionaries to accelerate queries](https://clickhouse.com/blog/faster-queries-dictionaries-clickhouse)
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
deleted file mode 100644
index 8ef19a181e7..00000000000
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
+++ /dev/null
@@ -1,140 +0,0 @@
----
-slug: /en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon
-sidebar_position: 46
-sidebar_label: Polygon Dictionaries With Grids
-title: "Polygon dictionaries"
----
-import CloudDetails from '@site/docs/en/sql-reference/dictionaries/external-dictionaries/_snippet_dictionary_in_cloud.md';
-
-Polygon dictionaries allow you to efficiently search for the polygon containing specified points.
-For example: defining a city area by geographical coordinates.
-
-Example of a polygon dictionary configuration:
-
-<CloudDetails />
-
-``` xml
-<dictionary>
-    <structure>
-        <key>
-            <attribute>
-                <name>key</name>
-                <type>Array(Array(Array(Array(Float64))))</type>
-            </attribute>
-        </key>
-
-        <attribute>
-            <name>name</name>
-            <type>String</type>
-            <null_value></null_value>
-        </attribute>
-
-        <attribute>
-            <name>value</name>
-            <type>UInt64</type>
-            <null_value>0</null_value>
-        </attribute>
-    </structure>
-
-    <layout>
-        <polygon>
-            <store_polygon_key_column>1</store_polygon_key_column>
-        </polygon>
-    </layout>
-
-    ...
-</dictionary>
-```
-
-The corresponding [DDL-query](../../../sql-reference/statements/create/dictionary.md#create-dictionary-query):
-``` sql
-CREATE DICTIONARY polygon_dict_name (
-    key Array(Array(Array(Array(Float64)))),
-    name String,
-    value UInt64
-)
-PRIMARY KEY key
-LAYOUT(POLYGON(STORE_POLYGON_KEY_COLUMN 1))
-...
-```
-
-When configuring the polygon dictionary, the key must have one of two types:
-
--   A simple polygon. It is an array of points.
--   MultiPolygon. It is an array of polygons. Each polygon is a two-dimensional array of points. The first element of this array is the outer boundary of the polygon, and subsequent elements specify areas to be excluded from it.
-
-Points can be specified as an array or a tuple of their coordinates. In the current implementation, only two-dimensional points are supported.
-
-The user can [upload their own data](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md) in all formats supported by ClickHouse.
-
-There are 3 types of [in-memory storage](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md) available:
-
--   `POLYGON_SIMPLE`. This is a naive implementation, where a linear pass through all polygons is made for each query, and membership is checked for each one without using additional indexes.
-
--   `POLYGON_INDEX_EACH`. A separate index is built for each polygon, which allows you to quickly check whether it belongs in most cases (optimized for geographical regions).
-Also, a grid is superimposed on the area under consideration, which significantly narrows the number of polygons under consideration.
-The grid is created by recursively dividing the cell into 16 equal parts and is configured with two parameters.
-The division stops when the recursion depth reaches `MAX_DEPTH` or when the cell crosses no more than `MIN_INTERSECTIONS` polygons.
-To respond to the query, there is a corresponding cell, and the index for the polygons stored in it is accessed alternately.
-
--   `POLYGON_INDEX_CELL`. This placement also creates the grid described above. The same options are available. For each sheet cell, an index is built on all pieces of polygons that fall into it, which allows you to quickly respond to a request.
-
--   `POLYGON`. Synonym to `POLYGON_INDEX_CELL`.
-
-Dictionary queries are carried out using standard [functions](../../../sql-reference/functions/ext-dict-functions.md) for working with dictionaries.
-An important difference is that here the keys will be the points for which you want to find the polygon containing them.
-
-**Example**
-
-Example of working with the dictionary defined above:
-
-``` sql
-CREATE TABLE points (
-    x Float64,
-    y Float64
-)
-...
-SELECT tuple(x, y) AS key, dictGet(dict_name, 'name', key), dictGet(dict_name, 'value', key) FROM points ORDER BY x, y;
-```
-
-As a result of executing the last command for each point in the 'points' table, a minimum area polygon containing this point will be found, and the requested attributes will be output.
-
-**Example**
-
-You can read columns from polygon dictionaries via SELECT query, just turn on the `store_polygon_key_column = 1` in the dictionary configuration or corresponding DDL-query.
-
-Query:
-
-``` sql
-CREATE TABLE polygons_test_table
-(
-    key Array(Array(Array(Tuple(Float64, Float64)))),
-    name String
-) ENGINE = TinyLog;
-
-INSERT INTO polygons_test_table VALUES ([[[(3, 1), (0, 1), (0, -1), (3, -1)]]], 'Value');
-
-CREATE DICTIONARY polygons_test_dictionary
-(
-    key Array(Array(Array(Tuple(Float64, Float64)))),
-    name String
-)
-PRIMARY KEY key
-SOURCE(CLICKHOUSE(TABLE 'polygons_test_table'))
-LAYOUT(POLYGON(STORE_POLYGON_KEY_COLUMN 1))
-LIFETIME(0);
-
-SELECT * FROM polygons_test_dictionary;
-```
-
-Result:
-
-``` text
-┌─key─────────────────────────────┬─name──┐
-│ [[[(3,1),(0,1),(0,-1),(3,-1)]]] │ Value │
-└─────────────────────────────────┴───────┘
-```
-
-## Related Content
-
-- [Exploring massive, real-world data sets: 100+ Years of Weather Records in ClickHouse](https://clickhouse.com/blog/real-world-data-noaa-climate-data)
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
deleted file mode 100644
index 897945a6d9d..00000000000
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ /dev/null
@@ -1,847 +0,0 @@
----
-slug: /en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources
-sidebar_position: 43
-sidebar_label: Dictionary Sources
----
-import CloudDetails from '@site/docs/en/sql-reference/dictionaries/external-dictionaries/_snippet_dictionary_in_cloud.md';
-
-# Dictionary Sources
-
-<CloudDetails />
-
-A dictionary can be connected to ClickHouse from many different sources.
-
-If the dictionary is configured using an xml-file, the configuration looks like this:
-
-``` xml
-<clickhouse>
-  <dictionary>
-    ...
-    <source>
-      <source_type>
-        <!-- Source configuration -->
-      </source_type>
-    </source>
-    ...
-  </dictionary>
-  ...
-</clickhouse>
-```
-
-In case of [DDL-query](../../../sql-reference/statements/create/dictionary.md), the configuration described above will look like:
-
-``` sql
-CREATE DICTIONARY dict_name (...)
-...
-SOURCE(SOURCE_TYPE(param1 val1 ... paramN valN)) -- Source configuration
-...
-```
-
-The source is configured in the `source` section.
-
-For source types [Local file](#dicts-external_dicts_dict_sources-local_file), [Executable file](#dicts-external_dicts_dict_sources-executable), [HTTP(s)](#dicts-external_dicts_dict_sources-http), [ClickHouse](#dicts-external_dicts_dict_sources-clickhouse)
-optional settings are available:
-
-``` xml
-<source>
-  <file>
-    <path>/opt/dictionaries/os.tsv</path>
-    <format>TabSeparated</format>
-  </file>
-  <settings>
-      <format_csv_allow_single_quotes>0</format_csv_allow_single_quotes>
-  </settings>
-</source>
-```
-
-or
-
-``` sql
-SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
-SETTINGS(format_csv_allow_single_quotes = 0)
-```
-
-Types of sources (`source_type`):
-
--   [Local file](#dicts-external_dicts_dict_sources-local_file)
--   [Executable File](#dicts-external_dicts_dict_sources-executable)
--   [Executable Pool](#dicts-external_dicts_dict_sources-executable_pool)
--   [HTTP(s)](#dicts-external_dicts_dict_sources-http)
--   DBMS
-    -   [ODBC](#odbc)
-    -   [MySQL](#mysql)
-    -   [ClickHouse](#clickhouse)
-    -   [MongoDB](#mongodb)
-    -   [Redis](#redis)
-    -   [Cassandra](#cassandra)
-    -   [PostgreSQL](#postgresql)
-
-## Local File
-
-Example of settings:
-
-``` xml
-<source>
-  <file>
-    <path>/opt/dictionaries/os.tsv</path>
-    <format>TabSeparated</format>
-  </file>
-</source>
-```
-
-or
-
-``` sql
-SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
-```
-
-Setting fields:
-
--   `path` – The absolute path to the file.
--   `format` – The file format. All the formats described in [Formats](../../../interfaces/formats.md#formats) are supported.
-
-When a dictionary with source `FILE` is created via DDL command (`CREATE DICTIONARY ...`), the source file needs to be located in the `user_files` directory to prevent DB users from accessing arbitrary files on the ClickHouse node.
-
-**See Also**
-
--   [Dictionary function](../../../sql-reference/table-functions/dictionary.md#dictionary-function)
-
-## Executable File
-
-Working with executable files depends on [how the dictionary is stored in memory](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md). If the dictionary is stored using `cache` and `complex_key_cache`, ClickHouse requests the necessary keys by sending a request to the executable file’s STDIN. Otherwise, ClickHouse starts the executable file and treats its output as dictionary data.
-
-Example of settings:
-
-``` xml
-<source>
-    <executable>
-        <command>cat /opt/dictionaries/os.tsv</command>
-        <format>TabSeparated</format>
-        <implicit_key>false</implicit_key>
-    </executable>
-</source>
-```
-
-Setting fields:
-
--   `command` — The absolute path to the executable file, or the file name (if the command's directory is in the `PATH`).
--   `format` — The file format. All the formats described in [Formats](../../../interfaces/formats.md#formats) are supported.
--   `command_termination_timeout` — The executable script should contain a main read-write loop. After the dictionary is destroyed, the pipe is closed, and the executable file will have `command_termination_timeout` seconds to shutdown before ClickHouse will send a SIGTERM signal to the child process. `command_termination_timeout` is specified in seconds. Default value is 10. Optional parameter.
--   `command_read_timeout` - Timeout for reading data from command stdout in milliseconds. Default value 10000. Optional parameter.
--   `command_write_timeout` - Timeout for writing data to command stdin in milliseconds. Default value 10000. Optional parameter.
--   `implicit_key` — The executable source file can return only values, and the correspondence to the requested keys is determined implicitly — by the order of rows in the result. Default value is false.
--   `execute_direct` - If `execute_direct` = `1`, then `command` will be searched inside user_scripts folder specified by [user_scripts_path](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_scripts_path). Additional script arguments can be specified using a whitespace separator. Example: `script_name arg1 arg2`. If `execute_direct` = `0`, `command` is passed as argument for `bin/sh -c`. Default value is `0`. Optional parameter.
--   `send_chunk_header` - controls whether to send row count before sending a chunk of data to process. Optional. Default value is `false`.
-
-That dictionary source can be configured only via XML configuration. Creating dictionaries with executable source via DDL is disabled; otherwise, the DB user would be able to execute arbitrary binaries on the ClickHouse node.
-
-## Executable Pool
-
-Executable pool allows loading data from pool of processes. This source does not work with dictionary layouts that need to load all data from source. Executable pool works if the dictionary [is stored](external-dicts-dict-layout.md#ways-to-store-dictionaries-in-memory) using `cache`, `complex_key_cache`, `ssd_cache`, `complex_key_ssd_cache`, `direct`, or `complex_key_direct` layouts.
-
-Executable pool will spawn a pool of processes with the specified command and keep them running until they exit. The program should read data from STDIN while it is available and output the result to STDOUT. It can wait for the next block of data on STDIN. ClickHouse will not close STDIN after processing a block of data, but will pipe another chunk of data when needed. The executable script should be ready for this way of data processing — it should poll STDIN and flush data to STDOUT early.
-
-Example of settings:
-
-``` xml
-<source>
-    <executable_pool>
-        <command><command>while read key; do printf "$key\tData for key $key\n"; done</command</command>
-        <format>TabSeparated</format>
-        <pool_size>10</pool_size>
-        <max_command_execution_time>10<max_command_execution_time>
-        <implicit_key>false</implicit_key>
-    </executable_pool>
-</source>
-```
-
-Setting fields:
-
--   `command` — The absolute path to the executable file, or the file name (if the program directory is written to `PATH`).
--   `format` — The file format. All the formats described in “[Formats](../../../interfaces/formats.md#formats)” are supported.
--   `pool_size` — Size of pool. If 0 is specified as `pool_size` then there is no pool size restrictions. Default value is `16`.
--   `command_termination_timeout` — executable script should contain main read-write loop. After dictionary is destroyed, pipe is closed, and executable file will have `command_termination_timeout` seconds to shutdown, before ClickHouse will send SIGTERM signal to child process. Specified in seconds. Default value is 10. Optional parameter.
--   `max_command_execution_time` — Maximum executable script command execution time for processing block of data. Specified in seconds. Default value is 10. Optional parameter.
--   `command_read_timeout` - timeout for reading data from command stdout in milliseconds. Default value 10000. Optional parameter.
--   `command_write_timeout` - timeout for writing data to command stdin in milliseconds. Default value 10000. Optional parameter.
--   `implicit_key` — The executable source file can return only values, and the correspondence to the requested keys is determined implicitly — by the order of rows in the result. Default value is false. Optional parameter.
--   `execute_direct` - If `execute_direct` = `1`, then `command` will be searched inside user_scripts folder specified by [user_scripts_path](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_scripts_path). Additional script arguments can be specified using whitespace separator. Example: `script_name arg1 arg2`. If `execute_direct` = `0`, `command` is passed as argument for `bin/sh -c`. Default value is `1`. Optional parameter.
--   `send_chunk_header` - controls whether to send row count before sending a chunk of data to process. Optional. Default value is `false`.
-
-That dictionary source can be configured only via XML configuration. Creating dictionaries with executable source via DDL is disabled, otherwise, the DB user would be able to execute arbitrary binary on ClickHouse node.
-
-## Http(s)
-
-Working with an HTTP(s) server depends on [how the dictionary is stored in memory](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md). If the dictionary is stored using `cache` and `complex_key_cache`, ClickHouse requests the necessary keys by sending a request via the `POST` method.
-
-Example of settings:
-
-``` xml
-<source>
-    <http>
-        <url>http://[::1]/os.tsv</url>
-        <format>TabSeparated</format>
-        <credentials>
-            <user>user</user>
-            <password>password</password>
-        </credentials>
-        <headers>
-            <header>
-                <name>API-KEY</name>
-                <value>key</value>
-            </header>
-        </headers>
-    </http>
-</source>
-```
-
-or
-
-``` sql
-SOURCE(HTTP(
-    url 'http://[::1]/os.tsv'
-    format 'TabSeparated'
-    credentials(user 'user' password 'password')
-    headers(header(name 'API-KEY' value 'key'))
-))
-```
-
-In order for ClickHouse to access an HTTPS resource, you must [configure openSSL](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-openssl) in the server configuration.
-
-Setting fields:
-
--   `url` – The source URL.
--   `format` – The file format. All the formats described in “[Formats](../../../interfaces/formats.md#formats)” are supported.
--   `credentials` – Basic HTTP authentication. Optional parameter.
--   `user` – Username required for the authentication.
--   `password` – Password required for the authentication.
--   `headers` – All custom HTTP headers entries used for the HTTP request. Optional parameter.
--   `header` – Single HTTP header entry.
--   `name` – Identifiant name used for the header send on the request.
--   `value` – Value set for a specific identifiant name.
-
-When creating a dictionary using the DDL command (`CREATE DICTIONARY ...`) remote hosts for HTTP dictionaries are checked against the contents of `remote_url_allow_hosts` section from config to prevent database users to access arbitrary HTTP server.
-
-### Known Vulnerability of the ODBC Dictionary Functionality
-
-:::note
-When connecting to the database through the ODBC driver connection parameter `Servername` can be substituted. In this case values of `USERNAME` and `PASSWORD` from `odbc.ini` are sent to the remote server and can be compromised.
-:::
-
-**Example of insecure use**
-
-Let’s configure unixODBC for PostgreSQL. Content of `/etc/odbc.ini`:
-
-``` text
-[gregtest]
-Driver = /usr/lib/psqlodbca.so
-Servername = localhost
-PORT = 5432
-DATABASE = test_db
-#OPTION = 3
-USERNAME = test
-PASSWORD = test
-```
-
-If you then make a query such as
-
-``` sql
-SELECT * FROM odbc('DSN=gregtest;Servername=some-server.com', 'test_db');
-```
-
-ODBC driver will send values of `USERNAME` and `PASSWORD` from `odbc.ini` to `some-server.com`.
-
-### Example of Connecting Postgresql
-
-Ubuntu OS.
-
-Installing unixODBC and the ODBC driver for PostgreSQL:
-
-``` bash
-$ sudo apt-get install -y unixodbc odbcinst odbc-postgresql
-```
-
-Configuring `/etc/odbc.ini` (or `~/.odbc.ini` if you signed in under a user that runs ClickHouse):
-
-``` text
-    [DEFAULT]
-    Driver = myconnection
-
-    [myconnection]
-    Description         = PostgreSQL connection to my_db
-    Driver              = PostgreSQL Unicode
-    Database            = my_db
-    Servername          = 127.0.0.1
-    UserName            = username
-    Password            = password
-    Port                = 5432
-    Protocol            = 9.3
-    ReadOnly            = No
-    RowVersioning       = No
-    ShowSystemTables    = No
-    ConnSettings        =
-```
-
-The dictionary configuration in ClickHouse:
-
-``` xml
-<clickhouse>
-    <dictionary>
-        <name>table_name</name>
-        <source>
-            <odbc>
-                <!-- You can specify the following parameters in connection_string: -->
-                <!-- DSN=myconnection;UID=username;PWD=password;HOST=127.0.0.1;PORT=5432;DATABASE=my_db -->
-                <connection_string>DSN=myconnection</connection_string>
-                <table>postgresql_table</table>
-            </odbc>
-        </source>
-        <lifetime>
-            <min>300</min>
-            <max>360</max>
-        </lifetime>
-        <layout>
-            <hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>id</name>
-            </id>
-            <attribute>
-                <name>some_column</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-</clickhouse>
-```
-
-or
-
-``` sql
-CREATE DICTIONARY table_name (
-    id UInt64,
-    some_column UInt64 DEFAULT 0
-)
-PRIMARY KEY id
-SOURCE(ODBC(connection_string 'DSN=myconnection' table 'postgresql_table'))
-LAYOUT(HASHED())
-LIFETIME(MIN 300 MAX 360)
-```
-
-You may need to edit `odbc.ini` to specify the full path to the library with the driver `DRIVER=/usr/local/lib/psqlodbcw.so`.
-
-### Example of Connecting MS SQL Server
-
-Ubuntu OS.
-
-Installing the ODBC driver for connecting to MS SQL:
-
-``` bash
-$ sudo apt-get install tdsodbc freetds-bin sqsh
-```
-
-Configuring the driver:
-
-```bash
-    $ cat /etc/freetds/freetds.conf
-    ...
-
-    [MSSQL]
-    host = 192.168.56.101
-    port = 1433
-    tds version = 7.0
-    client charset = UTF-8
-
-    # test TDS connection
-    $ sqsh -S MSSQL -D database -U user -P password
-
-
-    $ cat /etc/odbcinst.ini
-
-    [FreeTDS]
-    Description     = FreeTDS
-    Driver          = /usr/lib/x86_64-linux-gnu/odbc/libtdsodbc.so
-    Setup           = /usr/lib/x86_64-linux-gnu/odbc/libtdsS.so
-    FileUsage       = 1
-    UsageCount      = 5
-
-    $ cat /etc/odbc.ini
-    # $ cat ~/.odbc.ini # if you signed in under a user that runs ClickHouse
-
-    [MSSQL]
-    Description     = FreeTDS
-    Driver          = FreeTDS
-    Servername      = MSSQL
-    Database        = test
-    UID             = test
-    PWD             = test
-    Port            = 1433
-
-
-    # (optional) test ODBC connection (to use isql-tool install the [unixodbc](https://packages.debian.org/sid/unixodbc)-package)
-    $ isql -v MSSQL "user" "password"
-```
-
-Remarks:
-- to determine the earliest TDS version that is supported by a particular SQL Server version, refer to the product documentation or look at [MS-TDS Product Behavior](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-tds/135d0ebe-5c4c-4a94-99bf-1811eccb9f4a)
-
-Configuring the dictionary in ClickHouse:
-
-``` xml
-<clickhouse>
-    <dictionary>
-        <name>test</name>
-        <source>
-            <odbc>
-                <table>dict</table>
-                <connection_string>DSN=MSSQL;UID=test;PWD=test</connection_string>
-            </odbc>
-        </source>
-
-        <lifetime>
-            <min>300</min>
-            <max>360</max>
-        </lifetime>
-
-        <layout>
-            <flat />
-        </layout>
-
-        <structure>
-            <id>
-                <name>k</name>
-            </id>
-            <attribute>
-                <name>s</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-</clickhouse>
-```
-
-or
-
-``` sql
-CREATE DICTIONARY test (
-    k UInt64,
-    s String DEFAULT ''
-)
-PRIMARY KEY k
-SOURCE(ODBC(table 'dict' connection_string 'DSN=MSSQL;UID=test;PWD=test'))
-LAYOUT(FLAT())
-LIFETIME(MIN 300 MAX 360)
-```
-
-## DBMS
-
-### ODBC
-
-You can use this method to connect any database that has an ODBC driver.
-
-Example of settings:
-
-``` xml
-<source>
-    <odbc>
-        <db>DatabaseName</db>
-        <table>ShemaName.TableName</table>
-        <connection_string>DSN=some_parameters</connection_string>
-        <invalidate_query>SQL_QUERY</invalidate_query>
-        <query>SELECT id, value_1, value_2 FROM ShemaName.TableName</query>
-    </odbc>
-</source>
-```
-
-or
-
-``` sql
-SOURCE(ODBC(
-    db 'DatabaseName'
-    table 'SchemaName.TableName'
-    connection_string 'DSN=some_parameters'
-    invalidate_query 'SQL_QUERY'
-    query 'SELECT id, value_1, value_2 FROM db_name.table_name'
-))
-```
-
-Setting fields:
-
--   `db` – Name of the database. Omit it if the database name is set in the `<connection_string>` parameters.
--   `table` – Name of the table and schema if exists.
--   `connection_string` – Connection string.
--   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Updating dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md).
--   `query` – The custom query. Optional parameter.
-
-:::note
-The `table` and `query` fields cannot be used together. And either one of the `table` or `query` fields must be declared.
-:::
-
-ClickHouse receives quoting symbols from ODBC-driver and quote all settings in queries to driver, so it’s necessary to set table name accordingly to table name case in database.
-
-If you have a problems with encodings when using Oracle, see the corresponding [FAQ](../../../faq/integration/oracle-odbc.md) item.
-
-### Mysql
-
-Example of settings:
-
-``` xml
-<source>
-  <mysql>
-      <port>3306</port>
-      <user>clickhouse</user>
-      <password>qwerty</password>
-      <replica>
-          <host>example01-1</host>
-          <priority>1</priority>
-      </replica>
-      <replica>
-          <host>example01-2</host>
-          <priority>1</priority>
-      </replica>
-      <db>db_name</db>
-      <table>table_name</table>
-      <where>id=10</where>
-      <invalidate_query>SQL_QUERY</invalidate_query>
-      <fail_on_connection_loss>true</fail_on_connection_loss>
-      <query>SELECT id, value_1, value_2 FROM db_name.table_name</query>
-  </mysql>
-</source>
-```
-
-or
-
-``` sql
-SOURCE(MYSQL(
-    port 3306
-    user 'clickhouse'
-    password 'qwerty'
-    replica(host 'example01-1' priority 1)
-    replica(host 'example01-2' priority 1)
-    db 'db_name'
-    table 'table_name'
-    where 'id=10'
-    invalidate_query 'SQL_QUERY'
-    fail_on_connection_loss 'true'
-    query 'SELECT id, value_1, value_2 FROM db_name.table_name'
-))
-```
-
-Setting fields:
-
--   `port` – The port on the MySQL server. You can specify it for all replicas, or for each one individually (inside `<replica>`).
-
--   `user` – Name of the MySQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
-
--   `password` – Password of the MySQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
-
--   `replica` – Section of replica configurations. There can be multiple sections.
-
-        - `replica/host` – The MySQL host.
-        - `replica/priority` – The replica priority. When attempting to connect, ClickHouse traverses the replicas in order of priority. The lower the number, the higher the priority.
-
--   `db` – Name of the database.
-
--   `table` – Name of the table.
-
--   `where` – The selection criteria. The syntax for conditions is the same as for `WHERE` clause in MySQL, for example, `id > 10 AND id < 20`. Optional parameter.
-
--   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Updating dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md).
-
--   `fail_on_connection_loss` – The configuration parameter that controls behavior of the server on connection loss. If `true`, an exception is thrown immediately if the connection between client and server was lost. If `false`, the ClickHouse server retries to execute the query three times before throwing an exception. Note that retrying leads to increased response times. Default value: `false`.
-
--   `query` – The custom query. Optional parameter.
-
-:::note
-The `table` or `where` fields cannot be used together with the `query` field. And either one of the `table` or `query` fields must be declared.
-:::
-
-:::note
-There is no explicit parameter `secure`. When establishing an SSL-connection security is mandatory.
-:::
-
-MySQL can be connected to on a local host via sockets. To do this, set `host` and `socket`.
-
-Example of settings:
-
-``` xml
-<source>
-  <mysql>
-      <host>localhost</host>
-      <socket>/path/to/socket/file.sock</socket>
-      <user>clickhouse</user>
-      <password>qwerty</password>
-      <db>db_name</db>
-      <table>table_name</table>
-      <where>id=10</where>
-      <invalidate_query>SQL_QUERY</invalidate_query>
-      <fail_on_connection_loss>true</fail_on_connection_loss>
-	  <query>SELECT id, value_1, value_2 FROM db_name.table_name</query>
-  </mysql>
-</source>
-```
-
-or
-
-``` sql
-SOURCE(MYSQL(
-    host 'localhost'
-    socket '/path/to/socket/file.sock'
-    user 'clickhouse'
-    password 'qwerty'
-    db 'db_name'
-    table 'table_name'
-    where 'id=10'
-    invalidate_query 'SQL_QUERY'
-    fail_on_connection_loss 'true'
-	query 'SELECT id, value_1, value_2 FROM db_name.table_name'
-))
-```
-
-### ClickHouse
-
-Example of settings:
-
-``` xml
-<source>
-    <clickhouse>
-        <host>example01-01-1</host>
-        <port>9000</port>
-        <user>default</user>
-        <password></password>
-        <db>default</db>
-        <table>ids</table>
-        <where>id=10</where>
-        <secure>1</secure>
-		<query>SELECT id, value_1, value_2 FROM default.ids</query>
-    </clickhouse>
-</source>
-```
-
-or
-
-``` sql
-SOURCE(CLICKHOUSE(
-    host 'example01-01-1'
-    port 9000
-    user 'default'
-    password ''
-    db 'default'
-    table 'ids'
-    where 'id=10'
-    secure 1
-	query 'SELECT id, value_1, value_2 FROM default.ids'
-));
-```
-
-Setting fields:
-
--   `host` – The ClickHouse host. If it is a local host, the query is processed without any network activity. To improve fault tolerance, you can create a [Distributed](../../../engines/table-engines/special/distributed.md) table and enter it in subsequent configurations.
--   `port` – The port on the ClickHouse server.
--   `user` – Name of the ClickHouse user.
--   `password` – Password of the ClickHouse user.
--   `db` – Name of the database.
--   `table` – Name of the table.
--   `where` – The selection criteria. May be omitted.
--   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Updating dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md).
--   `secure` - Use ssl for connection.
--   `query` – The custom query. Optional parameter.
-
-:::note
-The `table` or `where` fields cannot be used together with the `query` field. And either one of the `table` or `query` fields must be declared.
-:::
-
-### Mongodb
-
-Example of settings:
-
-``` xml
-<source>
-    <mongodb>
-        <host>localhost</host>
-        <port>27017</port>
-        <user></user>
-        <password></password>
-        <db>test</db>
-        <collection>dictionary_source</collection>
-    </mongodb>
-</source>
-```
-
-or
-
-``` sql
-SOURCE(MONGODB(
-    host 'localhost'
-    port 27017
-    user ''
-    password ''
-    db 'test'
-    collection 'dictionary_source'
-))
-```
-
-Setting fields:
-
--   `host` – The MongoDB host.
--   `port` – The port on the MongoDB server.
--   `user` – Name of the MongoDB user.
--   `password` – Password of the MongoDB user.
--   `db` – Name of the database.
--   `collection` – Name of the collection.
-
-### Redis
-
-Example of settings:
-
-``` xml
-<source>
-    <redis>
-        <host>localhost</host>
-        <port>6379</port>
-        <storage_type>simple</storage_type>
-        <db_index>0</db_index>
-    </redis>
-</source>
-```
-
-or
-
-``` sql
-SOURCE(REDIS(
-    host 'localhost'
-    port 6379
-    storage_type 'simple'
-    db_index 0
-))
-```
-
-Setting fields:
-
--   `host` – The Redis host.
--   `port` – The port on the Redis server.
--   `storage_type` – The structure of internal Redis storage using for work with keys. `simple` is for simple sources and for hashed single key sources, `hash_map` is for hashed sources with two keys. Ranged sources and cache sources with complex key are unsupported. May be omitted, default value is `simple`.
--   `db_index` – The specific numeric index of Redis logical database. May be omitted, default value is 0.
-
-### Cassandra
-
-Example of settings:
-
-``` xml
-<source>
-    <cassandra>
-        <host>localhost</host>
-        <port>9042</port>
-        <user>username</user>
-        <password>qwerty123</password>
-        <keyspase>database_name</keyspase>
-        <column_family>table_name</column_family>
-        <allow_filering>1</allow_filering>
-        <partition_key_prefix>1</partition_key_prefix>
-        <consistency>One</consistency>
-        <where>"SomeColumn" = 42</where>
-        <max_threads>8</max_threads>
-        <query>SELECT id, value_1, value_2 FROM database_name.table_name</query>
-    </cassandra>
-</source>
-```
-
-Setting fields:
-
--   `host` – The Cassandra host or comma-separated list of hosts.
--   `port` – The port on the Cassandra servers. If not specified, default port 9042 is used.
--   `user` – Name of the Cassandra user.
--   `password` – Password of the Cassandra user.
--   `keyspace` – Name of the keyspace (database).
--   `column_family` – Name of the column family (table).
--   `allow_filering` – Flag to allow or not potentially expensive conditions on clustering key columns. Default value is 1.
--   `partition_key_prefix` – Number of partition key columns in primary key of the Cassandra table. Required for compose key dictionaries. Order of key columns in the dictionary definition must be the same as in Cassandra. Default value is 1 (the first key column is a partition key and other key columns are clustering key).
--   `consistency` – Consistency level. Possible values: `One`, `Two`, `Three`, `All`, `EachQuorum`, `Quorum`, `LocalQuorum`, `LocalOne`, `Serial`, `LocalSerial`. Default value is `One`.
--   `where` – Optional selection criteria.
--   `max_threads` – The maximum number of threads to use for loading data from multiple partitions in compose key dictionaries.
--   `query` – The custom query. Optional parameter.
-
-:::note
-The `column_family` or `where` fields cannot be used together with the `query` field. And either one of the `column_family` or `query` fields must be declared.
-:::
-
-### PostgreSQL
-
-Example of settings:
-
-``` xml
-<source>
-  <postgresql>
-      <port>5432</port>
-      <user>clickhouse</user>
-      <password>qwerty</password>
-      <db>db_name</db>
-      <table>table_name</table>
-      <where>id=10</where>
-      <invalidate_query>SQL_QUERY</invalidate_query>
-      <query>SELECT id, value_1, value_2 FROM db_name.table_name</query>
-  </postgresql>
-</source>
-```
-
-or
-
-``` sql
-SOURCE(POSTGRESQL(
-    port 5432
-    host 'postgresql-hostname'
-    user 'postgres_user'
-    password 'postgres_password'
-    db 'db_name'
-    table 'table_name'
-    replica(host 'example01-1' port 5432 priority 1)
-    replica(host 'example01-2' port 5432 priority 2)
-    where 'id=10'
-    invalidate_query 'SQL_QUERY'
-    query 'SELECT id, value_1, value_2 FROM db_name.table_name'
-))
-```
-
-Setting fields:
-
--   `host` – The host on the PostgreSQL server. You can specify it for all replicas, or for each one individually (inside `<replica>`).
--   `port` – The port on the PostgreSQL server. You can specify it for all replicas, or for each one individually (inside `<replica>`).
--   `user` – Name of the PostgreSQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
--   `password` – Password of the PostgreSQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
--   `replica` – Section of replica configurations. There can be multiple sections:
-    -   `replica/host` – The PostgreSQL host.
-    -   `replica/port` – The PostgreSQL port.
-    -   `replica/priority` – The replica priority. When attempting to connect, ClickHouse traverses the replicas in order of priority. The lower the number, the higher the priority.
--   `db` – Name of the database.
--   `table` – Name of the table.
--   `where` – The selection criteria. The syntax for conditions is the same as for `WHERE` clause in PostgreSQL. For example, `id > 10 AND id < 20`. Optional parameter.
--   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Updating dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md).
--   `query` – The custom query. Optional parameter.
-
-:::note
-The `table` or `where` fields cannot be used together with the `query` field. And either one of the `table` or `query` fields must be declared.
-:::
-
-## Null
-
-A special source that can be used to create dummy (empty) dictionaries. Such dictionaries can useful for tests or with setups with separated data and query nodes at nodes with Distributed tables.
-
-``` sql
-CREATE DICTIONARY null_dict (
-    id              UInt64,
-    val             UInt8,
-    default_val     UInt8 DEFAULT 123,
-    nullable_val    Nullable(UInt8)
-)
-PRIMARY KEY id
-SOURCE(NULL())
-LAYOUT(FLAT())
-LIFETIME(0);
-```
-
-## Related Content
-
-- [Using dictionaries to accelerate queries](https://clickhouse.com/blog/faster-queries-dictionaries-clickhouse)
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
deleted file mode 100644
index 8271a342941..00000000000
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ /dev/null
@@ -1,181 +0,0 @@
----
-slug: /en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure
-sidebar_position: 44
-sidebar_label: Dictionary Key and Fields
----
-import CloudDetails from '@site/docs/en/sql-reference/dictionaries/external-dictionaries/_snippet_dictionary_in_cloud.md';
-
-# Dictionary Key and Fields
-
-<CloudDetails />
-
-The `structure` clause describes the dictionary key and fields available for queries.
-
-XML description:
-
-``` xml
-<dictionary>
-    <structure>
-        <id>
-            <name>Id</name>
-        </id>
-
-        <attribute>
-            <!-- Attribute parameters -->
-        </attribute>
-
-        ...
-
-    </structure>
-</dictionary>
-```
-
-Attributes are described in the elements:
-
--   `<id>` — [Key column](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-key).
--   `<attribute>` — [Data column](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes). There can be a multiple number of attributes.
-
-DDL query:
-
-``` sql
-CREATE DICTIONARY dict_name (
-    Id UInt64,
-    -- attributes
-)
-PRIMARY KEY Id
-...
-```
-
-Attributes are described in the query body:
-
--   `PRIMARY KEY` — [Key column](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-key)
--   `AttrName AttrType` — [Data column](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes). There can be a multiple number of attributes.
-
-## Key
-
-ClickHouse supports the following types of keys:
-
--   Numeric key. `UInt64`. Defined in the `<id>` tag or using `PRIMARY KEY` keyword.
--   Composite key. Set of values of different types. Defined in the tag `<key>` or `PRIMARY KEY` keyword.
-
-An xml structure can contain either `<id>` or `<key>`. DDL-query must contain single `PRIMARY KEY`.
-
-:::warning    
-You must not describe key as an attribute.
-:::
-
-### Numeric Key
-
-Type: `UInt64`.
-
-Configuration example:
-
-``` xml
-<id>
-    <name>Id</name>
-</id>
-```
-
-Configuration fields:
-
--   `name` – The name of the column with keys.
-
-For DDL-query:
-
-``` sql
-CREATE DICTIONARY (
-    Id UInt64,
-    ...
-)
-PRIMARY KEY Id
-...
-```
-
--   `PRIMARY KEY` – The name of the column with keys.
-
-### Composite Key
-
-The key can be a `tuple` from any types of fields. The [layout](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md) in this case must be `complex_key_hashed` or `complex_key_cache`.
-
-:::tip
-A composite key can consist of a single element. This makes it possible to use a string as the key, for instance.
-:::
-
-The key structure is set in the element `<key>`. Key fields are specified in the same format as the dictionary [attributes](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Example:
-
-``` xml
-<structure>
-    <key>
-        <attribute>
-            <name>field1</name>
-            <type>String</type>
-        </attribute>
-        <attribute>
-            <name>field2</name>
-            <type>UInt32</type>
-        </attribute>
-        ...
-    </key>
-...
-```
-
-or
-
-``` sql
-CREATE DICTIONARY (
-    field1 String,
-    field2 String
-    ...
-)
-PRIMARY KEY field1, field2
-...
-```
-
-For a query to the `dictGet*` function, a tuple is passed as the key. Example: `dictGetString('dict_name', 'attr_name', tuple('string for field1', num_for_field2))`.
-
-## Attributes
-
-Configuration example:
-
-``` xml
-<structure>
-    ...
-    <attribute>
-        <name>Name</name>
-        <type>ClickHouseDataType</type>
-        <null_value></null_value>
-        <expression>rand64()</expression>
-        <hierarchical>true</hierarchical>
-        <injective>true</injective>
-        <is_object_id>true</is_object_id>
-    </attribute>
-</structure>
-```
-
-or
-
-``` sql
-CREATE DICTIONARY somename (
-    Name ClickHouseDataType DEFAULT '' EXPRESSION rand64() HIERARCHICAL INJECTIVE IS_OBJECT_ID
-)
-```
-
-Configuration fields:
-
-| Tag                                                  | Description                                                                                                                                                                                                                                                                                                                                     | Required |
-|------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
-| `name`                                               | Column name.                                                                                                                                                                                                                                                                                                                                    | Yes      |
-| `type`                                               | ClickHouse data type: [UInt8](../../../sql-reference/data-types/int-uint.md), [UInt16](../../../sql-reference/data-types/int-uint.md), [UInt32](../../../sql-reference/data-types/int-uint.md), [UInt64](../../../sql-reference/data-types/int-uint.md), [Int8](../../../sql-reference/data-types/int-uint.md), [Int16](../../../sql-reference/data-types/int-uint.md), [Int32](../../../sql-reference/data-types/int-uint.md), [Int64](../../../sql-reference/data-types/int-uint.md), [Float32](../../../sql-reference/data-types/float.md), [Float64](../../../sql-reference/data-types/float.md), [UUID](../../../sql-reference/data-types/uuid.md), [Decimal32](../../../sql-reference/data-types/decimal.md), [Decimal64](../../../sql-reference/data-types/decimal.md), [Decimal128](../../../sql-reference/data-types/decimal.md), [Decimal256](../../../sql-reference/data-types/decimal.md),[Date](../../../sql-reference/data-types/date), [Date32](../../../sql-reference/data-types/date32.md), [DateTime](../../../sql-reference/data-types/datetime.md), [DateTime64](../../../sql-reference/data-types/datetime64.md), [String](../../../sql-reference/data-types/string.md), [Array](../../../sql-reference/data-types/array.md).<br/>ClickHouse tries to cast value from dictionary to the specified data type. For example, for MySQL, the field might be `TEXT`, `VARCHAR`, or `BLOB` in the MySQL source table, but it can be uploaded as `String` in ClickHouse.<br/>[Nullable](../../../sql-reference/data-types/nullable.md) is currently supported for [Flat](external-dicts-dict-layout.md#flat), [Hashed](external-dicts-dict-layout.md#dicts-external_dicts_dict_layout-hashed), [ComplexKeyHashed](external-dicts-dict-layout.md#complex-key-hashed), [Direct](external-dicts-dict-layout.md#direct), [ComplexKeyDirect](external-dicts-dict-layout.md#complex-key-direct), [RangeHashed](external-dicts-dict-layout.md#range-hashed), [Polygon](external-dicts-dict-polygon.md), [Cache](external-dicts-dict-layout.md#cache), [ComplexKeyCache](external-dicts-dict-layout.md#complex-key-cache), [SSDCache](external-dicts-dict-layout.md#ssd-cache), [SSDComplexKeyCache](external-dicts-dict-layout.md#complex-key-ssd-cache) dictionaries. In [IPTrie](external-dicts-dict-layout.md#ip-trie) dictionaries `Nullable` types are not supported.       | Yes      |
-| `null_value`                                         | Default value for a non-existing element.<br/>In the example, it is an empty string. [NULL](../../syntax.md#null-literal) value can be used only for the `Nullable` types (see the previous line with types description).                                                                                                                                                                                                                       | Yes      |
-| `expression`                                         | [Expression](../../../sql-reference/syntax.md#syntax-expressions) that ClickHouse executes on the value.<br/>The expression can be a column name in the remote SQL database. Thus, you can use it to create an alias for the remote column.<br/><br/>Default value: no expression.                                                              | No       |
-| <a name="hierarchical-dict-attr"></a> `hierarchical` | If `true`, the attribute contains the value of a parent key for the current key. See [Hierarchical Dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md).<br/><br/>Default value: `false`.                                                                                               | No       |
-| `injective`                                          | Flag that shows whether the `id -> attribute` image is [injective](https://en.wikipedia.org/wiki/Injective_function).<br/>If `true`, ClickHouse can automatically place after the `GROUP BY` clause the requests to dictionaries with injection. Usually it significantly reduces the amount of such requests.<br/><br/>Default value: `false`. | No       |
-| `is_object_id`                                       | Flag that shows whether the query is executed for a MongoDB document by `ObjectID`.<br/><br/>Default value: `false`.                                                                                                                                                                                                                            | No       |
-
-**See Also**
-
--   [Functions for working with dictionaries](../../../sql-reference/functions/ext-dict-functions.md).
-
-## Related Content
-
-- [Using dictionaries to accelerate queries](https://clickhouse.com/blog/faster-queries-dictionaries-clickhouse)
\ No newline at end of file
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
deleted file mode 100644
index a923511ca5e..00000000000
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-slug: /en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict
-sidebar_position: 40
-sidebar_label: Configuring a Dictionary
----
-import CloudDetails from '@site/docs/en/sql-reference/dictionaries/external-dictionaries/_snippet_dictionary_in_cloud.md';
-
-# Configuring a Dictionary
-
-<CloudDetails />
-
-If dictionary is configured using xml file, than dictionary configuration has the following structure:
-
-``` xml
-<dictionary>
-    <name>dict_name</name>
-
-    <structure>
-      <!-- Complex key configuration -->
-    </structure>
-
-    <source>
-      <!-- Source configuration -->
-    </source>
-
-    <layout>
-      <!-- Memory layout configuration -->
-    </layout>
-
-    <lifetime>
-      <!-- Lifetime of dictionary in memory -->
-    </lifetime>
-</dictionary>
-```
-
-Corresponding [DDL-query](../../../sql-reference/statements/create/dictionary.md) has the following structure:
-
-``` sql
-CREATE DICTIONARY dict_name
-(
-    ... -- attributes
-)
-PRIMARY KEY ... -- complex or single key configuration
-SOURCE(...) -- Source configuration
-LAYOUT(...) -- Memory layout configuration
-LIFETIME(...) -- Lifetime of dictionary in memory
-```
-
--   `name` – The identifier that can be used to access the dictionary. Use the characters `[a-zA-Z0-9_\-]`.
--   [source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md) — Source of the dictionary.
--   [layout](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md) — Dictionary layout in memory.
--   [structure](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md) — Structure of the dictionary . A key and attributes that can be retrieved by this key.
--   [lifetime](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) — Frequency of dictionary updates.
-
-## Related Content
-
-- [Using dictionaries to accelerate queries](https://clickhouse.com/blog/faster-queries-dictionaries-clickhouse)
\ No newline at end of file
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md
deleted file mode 100644
index 8621c68b428..00000000000
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-slug: /en/sql-reference/dictionaries/external-dictionaries/external-dicts
-sidebar_position: 39
-sidebar_label: General Description
----
-import CloudDetails from '@site/docs/en/sql-reference/dictionaries/external-dictionaries/_snippet_dictionary_in_cloud.md';
-
-# Dictionaries 
-
-:::tip Tutorial
-If you are getting started with Dictionaries in ClickHouse we have a tutorial that covers that topic.  Take a look [here](/docs/en/tutorial.md).
-:::
-
-You can add your own dictionaries from various data sources. The source for a dictionary can be a ClickHouse table, a local text or executable file, an HTTP(s) resource, or another DBMS. For more information, see “[Dictionary Sources](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md)”.
-
-ClickHouse:
-
--   Fully or partially stores dictionaries in RAM.
--   Periodically updates dictionaries and dynamically loads missing values. In other words, dictionaries can be loaded dynamically.
--   Allows creating dictionaries with xml files or [DDL queries](../../../sql-reference/statements/create/dictionary.md).
-
-The configuration of dictionaries can be located in one or more xml-files. The path to the configuration is specified in the [dictionaries_config](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_config) parameter.
-
-Dictionaries can be loaded at server startup or at first use, depending on the [dictionaries_lazy_load](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_lazy_load) setting.
-
-The [dictionaries](../../../operations/system-tables/dictionaries.md#system_tables-dictionaries) system table contains information about dictionaries configured at server. For each dictionary you can find there:
-
--   Status of the dictionary.
--   Configuration parameters.
--   Metrics like amount of RAM allocated for the dictionary or a number of queries since the dictionary was successfully loaded.
-
-<CloudDetails />
-
-## Creating a dictionary with a DDL query
-
-Dictionaries can be created with [DDL queries](../../../sql-reference/statements/create/dictionary.md), and this is the recommended method because with DDL created dictionaries:
-- No additional records are added to server configuration files
-- The dictionaries can be worked with as first-class entities, like tables or views
-- Data can be read directly, using familiar SELECT rather than dictionary table functions
-- The dictionaries can be easily renamed
-
-## Creating a dictionary with a configuration file
-
-:::note
-Creating a dictionary with a configuration file is not applicable to ClickHouse Cloud. Please use DDL (see above), and create your dictionary as user `default`.
-:::
-
-The dictionary configuration file has the following format:
-
-``` xml
-<clickhouse>
-    <comment>An optional element with any content. Ignored by the ClickHouse server.</comment>
-
-    <!--Optional element. File name with substitutions-->
-    <include_from>/etc/metrika.xml</include_from>
-
-
-    <dictionary>
-        <!-- Dictionary configuration. -->
-        <!-- There can be any number of <dictionary> sections in the configuration file. -->
-    </dictionary>
-
-</clickhouse>
-```
-
-You can [configure](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md) any number of dictionaries in the same file.
-
-
-:::note    
-You can convert values for a small dictionary by describing it in a `SELECT` query (see the [transform](../../../sql-reference/functions/other-functions.md) function). This functionality is not related to dictionaries.
-:::
-
-## See Also
-
--   [Configuring a Dictionary](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md)
--   [Storing Dictionaries in Memory](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md)
--   [Dictionary Updates](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md)
--   [Dictionary Sources](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md)
--   [Dictionary Key and Fields](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md)
--   [Functions for Working with Dictionaries](../../../sql-reference/functions/ext-dict-functions.md)
-
-## Related Content
-
-- [Using dictionaries to accelerate queries](https://clickhouse.com/blog/faster-queries-dictionaries-clickhouse)
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/regexp-tree.md b/docs/en/sql-reference/dictionaries/external-dictionaries/regexp-tree.md
deleted file mode 100644
index 5ad15b11d07..00000000000
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/regexp-tree.md
+++ /dev/null
@@ -1,76 +0,0 @@
----
-slug: /en/sql-reference/dictionaries/external-dictionaries/regexp-tree
-sidebar_position: 47
-sidebar_label: RegExp Tree Dictionary
-title: "RegExp Tree Dictionary"
----
-import CloudDetails from '@site/docs/en/sql-reference/dictionaries/external-dictionaries/_snippet_dictionary_in_cloud.md';
-
-Regexp Tree dictionary stores multiple trees of regular expressions with attributions. Users can retrieve strings in the dictionary. If a string matches the root of the regexp tree, we will collect the corresponding attributes of the matched root and continue to walk the children. If any of the children matches the string, we will collect attributes and rewrite the old ones if conflicts occur, then continue the traverse until we reach leaf nodes.
-
-Example of the ddl query for creating Regexp Tree dictionary:
-
-<CloudDetails />
-
-```sql
-create dictionary regexp_dict
-(
-    regexp String,
-    name String,
-    version String
-)
-PRIMARY KEY(regexp)
-SOURCE(YAMLRegExpTree(PATH '/var/lib/clickhouse/user_files/regexp_tree.yaml'))
-LAYOUT(regexp_tree)
-...
-```
-
-We only allow `YAMLRegExpTree` to work with regexp_tree dicitionary layout. If you want to use other sources, please set variable `regexp_dict_allow_other_sources` true.
-
-**Source**
-
-We introduce a type of source called `YAMLRegExpTree` representing the structure of Regexp Tree dictionary. An Example of a valid yaml config is like:
-
-```xml
-- regexp: 'Linux/(\d+[\.\d]*).+tlinux'
-  name: 'TencentOS'
-  version: '\1'
-
-- regexp: '\d+/tclwebkit(?:\d+[\.\d]*)'
-  name: 'Andriod'
-  versions:
-    - regexp: '33/tclwebkit'
-      version: '13'
-    - regexp: '3[12]/tclwebkit'
-      version: '12'
-    - regexp: '30/tclwebkit'
-      version: '11'
-    - regexp: '29/tclwebkit'
-      version: '10'
-```
-
-The key `regexp` represents the regular expression of a tree node. The name of key is same as the dictionary key. The `name` and `version` is user-defined attributions in the dicitionary. The `versions` (which can be any name that not appear in attributions or the key) indicates the children nodes of this tree. 
-
-**Back Reference**
-
-The value of an attribution could contain a back reference which refers to a capture group of the matched regular expression. Reference number ranges from 1 to 9 and writes as `$1` or `\1`.
-
-During the query execution, the back reference in the value will be replaced by the matched capture group.
-
-**Query**
-
-Due to the specialty of Regexp Tree dictionary, we only allow functions `dictGet`, `dictGetOrDefault` and `dictGetOrNull` work with it.
-
-Example:
-
-```sql
-SELECT dictGet('regexp_dict', ('name', 'version'), '31/tclwebkit1024');
-```
-
-Result:
-
-```
-┌─dictGet('regexp_dict', ('name', 'version'), '31/tclwebkit1024')─┐
-│ ('Andriod','12')                                                │
-└─────────────────────────────────────────────────────────────────┘
-```
diff --git a/docs/en/sql-reference/dictionaries/index.md b/docs/en/sql-reference/dictionaries/index.md
index 9e6eed47d4a..f7b4be64851 100644
--- a/docs/en/sql-reference/dictionaries/index.md
+++ b/docs/en/sql-reference/dictionaries/index.md
@@ -1,9 +1,12 @@
 ---
-slug: /en/sql-reference/dictionaries/
-sidebar_label: Dictionaries
+slug: /en/sql-reference/dictionaries
+sidebar_label: Defining Dictionaries
 sidebar_position: 35
 ---
 
+import SelfManaged from '@site/docs/en/_snippets/_self_managed_only_no_roadmap.md';
+import CloudDetails from '@site/docs/en/sql-reference/dictionaries/_snippet_dictionary_in_cloud.md';
+
 # Dictionaries
 
 A dictionary is a mapping (`key -> attributes`) that is convenient for various types of reference lists.
@@ -12,5 +15,2452 @@ ClickHouse supports special functions for working with dictionaries that can be
 
 ClickHouse supports:
 
--   [Dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md#dicts-external-dicts) with a [set of functions](../../sql-reference/functions/ext-dict-functions.md).
--   [Embedded dictionaries](../../sql-reference/dictionaries/internal-dicts.md#internal_dicts) with a specific [set of functions](../../sql-reference/functions/ym-dict-functions.md).
+- Dictionaries with a [set of functions](../../sql-reference/functions/ext-dict-functions.md).
+- [Embedded dictionaries](#embedded_dictionaries) with a specific [set of functions](../../sql-reference/functions/ym-dict-functions.md).
+
+
+:::tip Tutorial
+If you are getting started with Dictionaries in ClickHouse we have a tutorial that covers that topic.  Take a look [here](/docs/en/tutorial.md).
+:::
+
+You can add your own dictionaries from various data sources. The source for a dictionary can be a ClickHouse table, a local text or executable file, an HTTP(s) resource, or another DBMS. For more information, see “[Dictionary Sources](#dictionary-sources)”.
+
+ClickHouse:
+
+- Fully or partially stores dictionaries in RAM.
+- Periodically updates dictionaries and dynamically loads missing values. In other words, dictionaries can be loaded dynamically.
+- Allows creating dictionaries with xml files or [DDL queries](../../sql-reference/statements/create/dictionary.md).
+
+The configuration of dictionaries can be located in one or more xml-files. The path to the configuration is specified in the [dictionaries_config](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_config) parameter.
+
+Dictionaries can be loaded at server startup or at first use, depending on the [dictionaries_lazy_load](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_lazy_load) setting.
+
+The [dictionaries](../../operations/system-tables/dictionaries.md#system_tables-dictionaries) system table contains information about dictionaries configured at server. For each dictionary you can find there:
+
+- Status of the dictionary.
+- Configuration parameters.
+- Metrics like amount of RAM allocated for the dictionary or a number of queries since the dictionary was successfully loaded.
+
+<CloudDetails />
+
+## Creating a dictionary with a DDL query {#creating-a-dictionary-with-a-ddl-query}
+
+Dictionaries can be created with [DDL queries](../../sql-reference/statements/create/dictionary.md), and this is the recommended method because with DDL created dictionaries:
+- No additional records are added to server configuration files
+- The dictionaries can be worked with as first-class entities, like tables or views
+- Data can be read directly, using familiar SELECT rather than dictionary table functions
+- The dictionaries can be easily renamed
+
+## Creating a dictionary with a configuration file
+
+:::note
+Creating a dictionary with a configuration file is not applicable to ClickHouse Cloud. Please use DDL (see above), and create your dictionary as user `default`.
+:::
+
+The dictionary configuration file has the following format:
+
+``` xml
+<clickhouse>
+    <comment>An optional element with any content. Ignored by the ClickHouse server.</comment>
+
+    <!--Optional element. File name with substitutions-->
+    <include_from>/etc/metrika.xml</include_from>
+
+
+    <dictionary>
+        <!-- Dictionary configuration. -->
+        <!-- There can be any number of dictionary sections in a configuration file. -->
+    </dictionary>
+
+</clickhouse>
+```
+
+You can [configure](#configuring-a-dictionary) any number of dictionaries in the same file.
+
+
+:::note
+You can convert values for a small dictionary by describing it in a `SELECT` query (see the [transform](../../sql-reference/functions/other-functions.md) function). This functionality is not related to dictionaries.
+:::
+
+## Configuring a Dictionary {#configuring-a-dictionary}
+
+<CloudDetails />
+
+If dictionary is configured using xml file, than dictionary configuration has the following structure:
+
+``` xml
+<dictionary>
+    <name>dict_name</name>
+
+    <structure>
+      <!-- Complex key configuration -->
+    </structure>
+
+    <source>
+      <!-- Source configuration -->
+    </source>
+
+    <layout>
+      <!-- Memory layout configuration -->
+    </layout>
+
+    <lifetime>
+      <!-- Lifetime of dictionary in memory -->
+    </lifetime>
+</dictionary>
+```
+
+Corresponding [DDL-query](../../sql-reference/statements/create/dictionary.md) has the following structure:
+
+``` sql
+CREATE DICTIONARY dict_name
+(
+    ... -- attributes
+)
+PRIMARY KEY ... -- complex or single key configuration
+SOURCE(...) -- Source configuration
+LAYOUT(...) -- Memory layout configuration
+LIFETIME(...) -- Lifetime of dictionary in memory
+```
+
+## Storing Dictionaries in Memory {#storig-dictionaries-in-memory}
+
+There are a variety of ways to store dictionaries in memory.
+
+We recommend [flat](#flat), [hashed](#hashed) and [complex_key_hashed](#complex_key_hashed), which provide optimal processing speed.
+
+Caching is not recommended because of potentially poor performance and difficulties in selecting optimal parameters. Read more in the section [cache](#cache).
+
+There are several ways to improve dictionary performance:
+
+- Call the function for working with the dictionary after `GROUP BY`.
+- Mark attributes to extract as injective. An attribute is called injective if different attribute values correspond to different keys. So when `GROUP BY` uses a function that fetches an attribute value by the key, this function is automatically taken out of `GROUP BY`.
+
+ClickHouse generates an exception for errors with dictionaries. Examples of errors:
+
+- The dictionary being accessed could not be loaded.
+- Error querying a `cached` dictionary.
+
+You can view the list of dictionaries and their statuses in the [system.dictionaries](../../operations/system-tables/dictionaries.md) table.
+
+<CloudDetails />
+
+The configuration looks like this:
+
+``` xml
+<clickhouse>
+    <dictionary>
+        ...
+        <layout>
+            <layout_type>
+                <!-- layout settings -->
+            </layout_type>
+        </layout>
+        ...
+    </dictionary>
+</clickhouse>
+```
+
+Corresponding [DDL-query](../../sql-reference/statements/create/dictionary.md):
+
+``` sql
+CREATE DICTIONARY (...)
+...
+LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
+...
+```
+
+Dictionaries without word `complex-key*` in a layout have a key with [UInt64](../../sql-reference/data-types/int-uint.md) type, `complex-key*` dictionaries have a composite key (complex, with arbitrary types).
+
+[UInt64](../../sql-reference/data-types/int-uint.md) keys in XML dictionaries are defined with `<id>` tag.
+
+Configuration example (column key_column has UInt64 type):
+```xml
+...
+<structure>
+    <id>
+        <name>key_column</name>
+    </id>
+...
+```
+
+Composite `complex` keys XML dictionaries are defined `<key>` tag.
+
+Configuration example of a composite key (key has one element with [String](../../sql-reference/data-types/string.md) type):
+```xml
+...
+<structure>
+    <key>
+        <attribute>
+            <name>country_code</name>
+            <type>String</type>
+        </attribute>
+    </key>
+...
+```
+
+## Ways to Store Dictionaries in Memory
+
+- [flat](#flat)
+- [hashed](#hashed)
+- [sparse_hashed](#sparse_hashed)
+- [complex_key_hashed](#complex_key_hashed)
+- [complex_key_sparse_hashed](#complex_key_sparse_hashed)
+- [hashed_array](#hashed_array)
+- [complex_key_hashed_array](#complex_key_hashed_array)
+- [range_hashed](#range_hashed)
+- [complex_key_range_hashed](#complex_key_range_hashed)
+- [cache](#cache)
+- [complex_key_cache](#complex_key_cache)
+- [ssd_cache](#ssd_cache)
+- [complex_key_ssd_cache](#complex_key_ssd_cache)
+- [direct](#direct)
+- [complex_key_direct](#complex_key_direct)
+- [ip_trie](#ip_trie)
+
+### flat
+
+The dictionary is completely stored in memory in the form of flat arrays. How much memory does the dictionary use? The amount is proportional to the size of the largest key (in space used).
+
+The dictionary key has the [UInt64](../../sql-reference/data-types/int-uint.md) type and the value is limited to `max_array_size` (by default — 500,000). If a larger key is discovered when creating the dictionary, ClickHouse throws an exception and does not create the dictionary. Dictionary flat arrays initial size is controlled by `initial_array_size` setting (by default — 1024).
+
+All types of sources are supported. When updating, data (from a file or from a table) is read in it entirety.
+
+This method provides the best performance among all available methods of storing the dictionary.
+
+Configuration example:
+
+``` xml
+<layout>
+  <flat>
+    <initial_array_size>50000</initial_array_size>
+    <max_array_size>5000000</max_array_size>
+  </flat>
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(FLAT(INITIAL_ARRAY_SIZE 50000 MAX_ARRAY_SIZE 5000000))
+```
+
+### hashed
+
+The dictionary is completely stored in memory in the form of a hash table. The dictionary can contain any number of elements with any identifiers In practice, the number of keys can reach tens of millions of items.
+
+The dictionary key has the [UInt64](../../sql-reference/data-types/int-uint.md) type.
+
+All types of sources are supported. When updating, data (from a file or from a table) is read in its entirety.
+
+Configuration example:
+
+``` xml
+<layout>
+  <hashed />
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(HASHED())
+```
+
+Configuration example:
+
+``` xml
+<layout>
+  <hashed>
+    <!-- If shards greater then 1 (default is `1`) the dictionary will load
+         data in parallel, useful if you have huge amount of elements in one
+         dictionary. -->
+    <shards>10</shards>
+
+    <!-- Size of the backlog for blocks in parallel queue.
+
+         Since the bottleneck in parallel loading is rehash, and so to avoid
+         stalling because of thread is doing rehash, you need to have some
+         backlog.
+
+         10000 is good balance between memory and speed.
+         Even for 10e10 elements and can handle all the load without starvation. -->
+    <shard_load_queue_backlog>10000</shard_load_queue_backlog>
+
+    <!-- Maximum load factor of the hash table, with greater values, the memory
+         is utilized more efficiently (less memory is wasted) but read/performance
+         may deteriorate.
+
+         Valid values: [0.5, 0.99]
+         Default: 0.5 -->
+    <max_load_factor>0.5</max_load_factor>
+  </hashed>
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(HASHED([SHARDS 1] [SHARD_LOAD_QUEUE_BACKLOG 10000] [MAX_LOAD_FACTOR 0.5]))
+```
+
+### sparse_hashed
+
+Similar to `hashed`, but uses less memory in favor more CPU usage.
+
+The dictionary key has the [UInt64](../../sql-reference/data-types/int-uint.md) type.
+
+Configuration example:
+
+``` xml
+<layout>
+  <sparse_hashed>
+    <!-- <shards>1</shards> -->
+    <!-- <shard_load_queue_backlog>10000</shard_load_queue_backlog> -->
+    <!-- <max_load_factor>0.5</max_load_factor> -->
+  </sparse_hashed>
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(SPARSE_HASHED([SHARDS 1] [SHARD_LOAD_QUEUE_BACKLOG 10000] [MAX_LOAD_FACTOR 0.5]))
+```
+
+It is also possible to use `shards` for this type of dictionary, and again it is more important for `sparse_hashed` then for `hashed`, since `sparse_hashed` is slower.
+
+### complex_key_hashed
+
+This type of storage is for use with composite [keys](#dictionary-key-and-fields). Similar to `hashed`.
+
+Configuration example:
+
+``` xml
+<layout>
+  <complex_key_hashed>
+    <!-- <shards>1</shards> -->
+    <!-- <shard_load_queue_backlog>10000</shard_load_queue_backlog> -->
+    <!-- <max_load_factor>0.5</max_load_factor> -->
+  </complex_key_hashed>
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(COMPLEX_KEY_HASHED([SHARDS 1] [SHARD_LOAD_QUEUE_BACKLOG 10000] [MAX_LOAD_FACTOR 0.5]))
+```
+
+### complex_key_sparse_hashed
+
+This type of storage is for use with composite [keys](#dictionary-key-and-fields). Similar to [sparse_hashed](#sparse_hashed).
+
+Configuration example:
+
+``` xml
+<layout>
+  <complex_key_sparse_hashed>
+    <!-- <shards>1</shards> -->
+    <!-- <shard_load_queue_backlog>10000</shard_load_queue_backlog> -->
+    <!-- <max_load_factor>0.5</max_load_factor> -->
+  </complex_key_sparse_hashed>
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(COMPLEX_KEY_SPARSE_HASHED([SHARDS 1] [SHARD_LOAD_QUEUE_BACKLOG 10000] [MAX_LOAD_FACTOR 0.5]))
+```
+
+### hashed_array
+
+The dictionary is completely stored in memory. Each attribute is stored in an array. The key attribute is stored in the form of a hashed table where value is an index in the attributes array. The dictionary can contain any number of elements with any identifiers. In practice, the number of keys can reach tens of millions of items.
+
+The dictionary key has the [UInt64](../../sql-reference/data-types/int-uint.md) type.
+
+All types of sources are supported. When updating, data (from a file or from a table) is read in its entirety.
+
+Configuration example:
+
+``` xml
+<layout>
+  <hashed_array>
+  </hashed_array>
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(HASHED_ARRAY())
+```
+
+### complex_key_hashed_array
+
+This type of storage is for use with composite [keys](#dictionary-key-and-fields). Similar to [hashed_array](#hashed_array).
+
+Configuration example:
+
+``` xml
+<layout>
+  <complex_key_hashed_array />
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(COMPLEX_KEY_HASHED_ARRAY())
+```
+
+### range_hashed {#range_hashed}
+
+The dictionary is stored in memory in the form of a hash table with an ordered array of ranges and their corresponding values.
+
+The dictionary key has the [UInt64](../../sql-reference/data-types/int-uint.md) type.
+This storage method works the same way as hashed and allows using date/time (arbitrary numeric type) ranges in addition to the key.
+
+Example: The table contains discounts for each advertiser in the format:
+
+``` text
+┌─advertiser_id─┬─discount_start_date─┬─discount_end_date─┬─amount─┐
+│           123 │          2015-01-16 │        2015-01-31 │   0.25 │
+│           123 │          2015-01-01 │        2015-01-15 │   0.15 │
+│           456 │          2015-01-01 │        2015-01-15 │   0.05 │
+└───────────────┴─────────────────────┴───────────────────┴────────┘
+```
+
+To use a sample for date ranges, define the `range_min` and `range_max` elements in the [structure](#dictionary-key-and-fields). These elements must contain elements `name` and `type` (if `type` is not specified, the default type will be used - Date). `type` can be any numeric type (Date / DateTime / UInt64 / Int32 / others).
+
+:::note
+Values of `range_min` and `range_max` should fit in `Int64` type.
+:::
+
+Example:
+
+``` xml
+<layout>
+    <range_hashed>
+        <!-- Strategy for overlapping ranges (min/max). Default: min (return a matching range with the min(range_min -> range_max) value) -->
+        <range_lookup_strategy>min</range_lookup_strategy>
+    </range_hashed>
+</layout>
+<structure>
+    <id>
+        <name>advertiser_id</name>
+    </id>
+    <range_min>
+        <name>discount_start_date</name>
+        <type>Date</type>
+    </range_min>
+    <range_max>
+        <name>discount_end_date</name>
+        <type>Date</type>
+    </range_max>
+    ...
+```
+
+or
+
+``` sql
+CREATE DICTIONARY discounts_dict (
+    advertiser_id UInt64,
+    discount_start_date Date,
+    discount_end_date Date,
+    amount Float64
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'discounts'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(RANGE_HASHED(range_lookup_strategy 'max'))
+RANGE(MIN discount_start_date MAX discount_end_date)
+```
+
+To work with these dictionaries, you need to pass an additional argument to the `dictGet` function, for which a range is selected:
+
+``` sql
+dictGet('dict_name', 'attr_name', id, date)
+```
+Query example:
+
+``` sql
+SELECT dictGet('discounts_dict', 'amount', 1, '2022-10-20'::Date);
+```
+
+This function returns the value for the specified `id`s and the date range that includes the passed date.
+
+Details of the algorithm:
+
+- If the `id` is not found or a range is not found for the `id`, it returns the default value of the attribute's type.
+- If there are overlapping ranges and `range_lookup_strategy=min`, it returns a matching range with minimal `range_min`, if several ranges found, it returns a range with minimal `range_max`, if again several ranges found (several ranges had the same `range_min` and `range_max` it returns a random range of them.
+- If there are overlapping ranges and `range_lookup_strategy=max`, it returns a matching range with maximal `range_min`, if several ranges found, it returns a range with maximal `range_max`, if again several ranges found (several ranges had the same `range_min` and `range_max` it returns a random range of them.
+- If the `range_max` is `NULL`, the range is open. `NULL` is treated as maximal possible value. For the `range_min` `1970-01-01` or `0` (-MAX_INT) can be used as the open value.
+
+Configuration example:
+
+``` xml
+<clickhouse>
+    <dictionary>
+        ...
+
+        <layout>
+            <range_hashed />
+        </layout>
+
+        <structure>
+            <id>
+                <name>Abcdef</name>
+            </id>
+            <range_min>
+                <name>StartTimeStamp</name>
+                <type>UInt64</type>
+            </range_min>
+            <range_max>
+                <name>EndTimeStamp</name>
+                <type>UInt64</type>
+            </range_max>
+            <attribute>
+                <name>XXXType</name>
+                <type>String</type>
+                <null_value />
+            </attribute>
+        </structure>
+
+    </dictionary>
+</clickhouse>
+```
+
+or
+
+``` sql
+CREATE DICTIONARY somedict(
+    Abcdef UInt64,
+    StartTimeStamp UInt64,
+    EndTimeStamp UInt64,
+    XXXType String DEFAULT ''
+)
+PRIMARY KEY Abcdef
+RANGE(MIN StartTimeStamp MAX EndTimeStamp)
+```
+
+Configuration example with overlapping ranges and open ranges:
+
+```sql
+CREATE TABLE discounts
+(
+    advertiser_id UInt64,
+    discount_start_date Date,
+    discount_end_date Nullable(Date),
+    amount Float64
+)
+ENGINE = Memory;
+
+INSERT INTO discounts VALUES (1, '2015-01-01', Null, 0.1);
+INSERT INTO discounts VALUES (1, '2015-01-15', Null, 0.2);
+INSERT INTO discounts VALUES (2, '2015-01-01', '2015-01-15', 0.3);
+INSERT INTO discounts VALUES (2, '2015-01-04', '2015-01-10', 0.4);
+INSERT INTO discounts VALUES (3, '1970-01-01', '2015-01-15', 0.5);
+INSERT INTO discounts VALUES (3, '1970-01-01', '2015-01-10', 0.6);
+
+SELECT * FROM discounts ORDER BY advertiser_id, discount_start_date;
+┌─advertiser_id─┬─discount_start_date─┬─discount_end_date─┬─amount─┐
+│             1 │          2015-01-01 │              ᴺᵁᴸᴸ │    0.1 │
+│             1 │          2015-01-15 │              ᴺᵁᴸᴸ │    0.2 │
+│             2 │          2015-01-01 │        2015-01-15 │    0.3 │
+│             2 │          2015-01-04 │        2015-01-10 │    0.4 │
+│             3 │          1970-01-01 │        2015-01-15 │    0.5 │
+│             3 │          1970-01-01 │        2015-01-10 │    0.6 │
+└───────────────┴─────────────────────┴───────────────────┴────────┘
+
+-- RANGE_LOOKUP_STRATEGY 'max'
+
+CREATE DICTIONARY discounts_dict
+(
+    advertiser_id UInt64,
+    discount_start_date Date,
+    discount_end_date Nullable(Date),
+    amount Float64
+)
+PRIMARY KEY advertiser_id
+SOURCE(CLICKHOUSE(TABLE discounts))
+LIFETIME(MIN 600 MAX 900)
+LAYOUT(RANGE_HASHED(RANGE_LOOKUP_STRATEGY 'max'))
+RANGE(MIN discount_start_date MAX discount_end_date);
+
+select dictGet('discounts_dict', 'amount', 1, toDate('2015-01-14')) res;
+┌─res─┐
+│ 0.1 │ -- the only one range is matching: 2015-01-01 - Null
+└─────┘
+
+select dictGet('discounts_dict', 'amount', 1, toDate('2015-01-16')) res;
+┌─res─┐
+│ 0.2 │ -- two ranges are matching, range_min 2015-01-15 (0.2) is bigger than 2015-01-01 (0.1)
+└─────┘
+
+select dictGet('discounts_dict', 'amount', 2, toDate('2015-01-06')) res;
+┌─res─┐
+│ 0.4 │ -- two ranges are matching, range_min 2015-01-04 (0.4) is bigger than 2015-01-01 (0.3)
+└─────┘
+
+select dictGet('discounts_dict', 'amount', 3, toDate('2015-01-01')) res;
+┌─res─┐
+│ 0.5 │ -- two ranges are matching, range_min are equal, 2015-01-15 (0.5) is bigger than 2015-01-10 (0.6)
+└─────┘
+
+DROP DICTIONARY discounts_dict;
+
+-- RANGE_LOOKUP_STRATEGY 'min'
+
+CREATE DICTIONARY discounts_dict
+(
+    advertiser_id UInt64,
+    discount_start_date Date,
+    discount_end_date Nullable(Date),
+    amount Float64
+)
+PRIMARY KEY advertiser_id
+SOURCE(CLICKHOUSE(TABLE discounts))
+LIFETIME(MIN 600 MAX 900)
+LAYOUT(RANGE_HASHED(RANGE_LOOKUP_STRATEGY 'min'))
+RANGE(MIN discount_start_date MAX discount_end_date);
+
+select dictGet('discounts_dict', 'amount', 1, toDate('2015-01-14')) res;
+┌─res─┐
+│ 0.1 │ -- the only one range is matching: 2015-01-01 - Null
+└─────┘
+
+select dictGet('discounts_dict', 'amount', 1, toDate('2015-01-16')) res;
+┌─res─┐
+│ 0.1 │ -- two ranges are matching, range_min 2015-01-01 (0.1) is less than 2015-01-15 (0.2)
+└─────┘
+
+select dictGet('discounts_dict', 'amount', 2, toDate('2015-01-06')) res;
+┌─res─┐
+│ 0.3 │ -- two ranges are matching, range_min 2015-01-01 (0.3) is less than 2015-01-04 (0.4)
+└─────┘
+
+select dictGet('discounts_dict', 'amount', 3, toDate('2015-01-01')) res;
+┌─res─┐
+│ 0.6 │ -- two ranges are matching, range_min are equal, 2015-01-10 (0.6) is less than 2015-01-15 (0.5)
+└─────┘
+```
+
+### complex_key_range_hashed
+
+The dictionary is stored in memory in the form of a hash table with an ordered array of ranges and their corresponding values (see [range_hashed](#range_hashed)). This type of storage is for use with composite [keys](#dictionary-key-and-fields).
+
+Configuration example:
+
+``` sql
+CREATE DICTIONARY range_dictionary
+(
+  CountryID UInt64,
+  CountryKey String,
+  StartDate Date,
+  EndDate Date,
+  Tax Float64 DEFAULT 0.2
+)
+PRIMARY KEY CountryID, CountryKey
+SOURCE(CLICKHOUSE(TABLE 'date_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_RANGE_HASHED())
+RANGE(MIN StartDate MAX EndDate);
+```
+
+### cache
+
+The dictionary is stored in a cache that has a fixed number of cells. These cells contain frequently used elements.
+
+The dictionary key has the [UInt64](../../sql-reference/data-types/int-uint.md) type.
+
+When searching for a dictionary, the cache is searched first. For each block of data, all keys that are not found in the cache or are outdated are requested from the source using `SELECT attrs... FROM db.table WHERE id IN (k1, k2, ...)`. The received data is then written to the cache.
+
+If keys are not found in dictionary, then update cache task is created and added into update queue. Update queue properties can be controlled with settings `max_update_queue_size`, `update_queue_push_timeout_milliseconds`, `query_wait_timeout_milliseconds`, `max_threads_for_updates`.
+
+For cache dictionaries, the expiration [lifetime](#dictionary-updates) of data in the cache can be set. If more time than `lifetime` has passed since loading the data in a cell, the cell’s value is not used and key becomes expired. The key is re-requested the next time it needs to be used. This behaviour can be configured with setting `allow_read_expired_keys`.
+
+This is the least effective of all the ways to store dictionaries. The speed of the cache depends strongly on correct settings and the usage scenario. A cache type dictionary performs well only when the hit rates are high enough (recommended 99% and higher). You can view the average hit rate in the [system.dictionaries](../../operations/system-tables/dictionaries.md) table.
+
+If setting `allow_read_expired_keys` is set to 1, by default 0. Then dictionary can support asynchronous updates. If a client requests keys and all of them are in cache, but some of them are expired, then dictionary will return expired keys for a client and request them asynchronously from the source.
+
+To improve cache performance, use a subquery with `LIMIT`, and call the function with the dictionary externally.
+
+All types of sources are supported.
+
+Example of settings:
+
+``` xml
+<layout>
+    <cache>
+        <!-- The size of the cache, in number of cells. Rounded up to a power of two. -->
+        <size_in_cells>1000000000</size_in_cells>
+        <!-- Allows to read expired keys. -->
+        <allow_read_expired_keys>0</allow_read_expired_keys>
+        <!-- Max size of update queue. -->
+        <max_update_queue_size>100000</max_update_queue_size>
+        <!-- Max timeout in milliseconds for push update task into queue. -->
+        <update_queue_push_timeout_milliseconds>10</update_queue_push_timeout_milliseconds>
+        <!-- Max wait timeout in milliseconds for update task to complete. -->
+        <query_wait_timeout_milliseconds>60000</query_wait_timeout_milliseconds>
+        <!-- Max threads for cache dictionary update. -->
+        <max_threads_for_updates>4</max_threads_for_updates>
+    </cache>
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
+```
+
+Set a large enough cache size. You need to experiment to select the number of cells:
+
+1.  Set some value.
+2.  Run queries until the cache is completely full.
+3.  Assess memory consumption using the `system.dictionaries` table.
+4.  Increase or decrease the number of cells until the required memory consumption is reached.
+
+:::note
+Do not use ClickHouse as a source, because it is slow to process queries with random reads.
+:::
+
+### complex_key_cache
+
+This type of storage is for use with composite [keys](#dictionary-key-and-fields). Similar to `cache`.
+
+### ssd_cache
+
+Similar to `cache`, but stores data on SSD and index in RAM. All cache dictionary settings related to update queue can also be applied to SSD cache dictionaries.
+
+The dictionary key has the [UInt64](../../sql-reference/data-types/int-uint.md) type.
+
+``` xml
+<layout>
+    <ssd_cache>
+        <!-- Size of elementary read block in bytes. Recommended to be equal to SSD's page size. -->
+        <block_size>4096</block_size>
+        <!-- Max cache file size in bytes. -->
+        <file_size>16777216</file_size>
+        <!-- Size of RAM buffer in bytes for reading elements from SSD. -->
+        <read_buffer_size>131072</read_buffer_size>
+        <!-- Size of RAM buffer in bytes for aggregating elements before flushing to SSD. -->
+        <write_buffer_size>1048576</write_buffer_size>
+        <!-- Path where cache file will be stored. -->
+        <path>/var/lib/clickhouse/user_files/test_dict</path>
+    </ssd_cache>
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
+    PATH '/var/lib/clickhouse/user_files/test_dict'))
+```
+
+### complex_key_ssd_cache
+
+This type of storage is for use with composite [keys](#dictionary-key-and-fields). Similar to `ssd_cache`.
+
+### direct
+
+The dictionary is not stored in memory and directly goes to the source during the processing of a request.
+
+The dictionary key has the [UInt64](../../sql-reference/data-types/int-uint.md) type.
+
+All types of [sources](#dictionary-sources), except local files, are supported.
+
+Configuration example:
+
+``` xml
+<layout>
+  <direct />
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(DIRECT())
+```
+
+### complex_key_direct
+
+This type of storage is for use with composite [keys](#dictionary-key-and-fields). Similar to `direct`.
+
+### ip_trie
+
+This type of storage is for mapping network prefixes (IP addresses) to metadata such as ASN.
+
+**Example**
+
+Suppose we have a table in ClickHouse that contains our IP prefixes and mappings:
+
+```sql
+CREATE TABLE my_ip_addresses (
+	prefix String,
+	asn UInt32,
+	cca2 String
+)
+ENGINE = MergeTree
+PRIMARY KEY prefix;
+```
+
+```sql
+INSERT INTO my_ip_addresses VALUES
+	('202.79.32.0/20', 17501, 'NP'),
+    ('2620:0:870::/48', 3856, 'US'),
+    ('2a02:6b8:1::/48', 13238, 'RU'),
+    ('2001:db8::/32', 65536, 'ZZ')
+;
+```
+
+Let's define an `ip_trie` dictionary for this table. The `ip_trie` layout requires a composite key:
+
+``` xml
+<structure>
+    <key>
+        <attribute>
+            <name>prefix</name>
+            <type>String</type>
+        </attribute>
+    </key>
+    <attribute>
+            <name>asn</name>
+            <type>UInt32</type>
+            <null_value />
+    </attribute>
+    <attribute>
+            <name>cca2</name>
+            <type>String</type>
+            <null_value>??</null_value>
+    </attribute>
+    ...
+</structure>
+<layout>
+    <ip_trie>
+        <!-- Key attribute `prefix` can be retrieved via dictGetString. -->
+        <!-- This option increases memory usage. -->
+        <access_to_key_from_attributes>true</access_to_key_from_attributes>
+    </ip_trie>
+</layout>
+```
+
+or
+
+``` sql
+CREATE DICTIONARY my_ip_trie_dictionary (
+    prefix String,
+    asn UInt32,
+    cca2 String DEFAULT '??'
+)
+PRIMARY KEY prefix
+SOURCE(CLICKHOUSE(TABLE 'my_ip_addresses'))
+LAYOUT(IP_TRIE)
+LIFETIME(3600);
+```
+
+The key must have only one `String` type attribute that contains an allowed IP prefix. Other types are not supported yet.
+
+The syntax is:
+
+``` sql
+dictGetT('dict_name', 'attr_name', ip)
+```
+
+The function takes either `UInt32` for IPv4, or `FixedString(16)` for IPv6. For example:
+
+``` sql
+SELECT dictGet('my_ip_trie_dictionary', 'cca2', toIPv4('202.79.32.10')) AS result;
+
+┌─result─┐
+│ NP     │
+└────────┘
+
+
+SELECT dictGet('my_ip_trie_dictionary', 'asn', IPv6StringToNum('2001:db8::1')) AS result;
+
+┌─result─┐
+│  65536 │
+└────────┘
+
+
+SELECT dictGet('my_ip_trie_dictionary', ('asn', 'cca2'), IPv6StringToNum('2001:db8::1')) AS result;
+
+┌─result───────┐
+│ (65536,'ZZ') │
+└──────────────┘
+```
+
+Other types are not supported yet. The function returns the attribute for the prefix that corresponds to this IP address. If there are overlapping prefixes, the most specific one is returned.
+
+Data must completely fit into RAM.
+
+## Dictionary Updates {#dictionary-updates}
+
+ClickHouse periodically updates the dictionaries. The update interval for fully downloaded dictionaries and the invalidation interval for cached dictionaries are defined in the `lifetime` tag in seconds.
+
+Dictionary updates (other than loading for first use) do not block queries. During updates, the old version of a dictionary is used. If an error occurs during an update, the error is written to the server log, and queries continue using the old version of dictionaries.
+
+Example of settings:
+
+<CloudDetails />
+
+``` xml
+<dictionary>
+    ...
+    <lifetime>300</lifetime>
+    ...
+</dictionary>
+```
+
+or
+
+``` sql
+CREATE DICTIONARY (...)
+...
+LIFETIME(300)
+...
+```
+
+Setting `<lifetime>0</lifetime>` (`LIFETIME(0)`) prevents dictionaries from updating.
+
+You can set a time interval for updates, and ClickHouse will choose a uniformly random time within this range. This is necessary in order to distribute the load on the dictionary source when updating on a large number of servers.
+
+Example of settings:
+
+``` xml
+<dictionary>
+    ...
+    <lifetime>
+        <min>300</min>
+        <max>360</max>
+    </lifetime>
+    ...
+</dictionary>
+```
+
+or
+
+``` sql
+LIFETIME(MIN 300 MAX 360)
+```
+
+If `<min>0</min>` and `<max>0</max>`, ClickHouse does not reload the dictionary by timeout.
+In this case, ClickHouse can reload the dictionary earlier if the dictionary configuration file was changed or the `SYSTEM RELOAD DICTIONARY` command was executed.
+
+When updating the dictionaries, the ClickHouse server applies different logic depending on the type of [source](#dictionary-sources):
+
+- For a text file, it checks the time of modification. If the time differs from the previously recorded time, the dictionary is updated.
+- For MySQL source, the time of modification is checked using a `SHOW TABLE STATUS` query (in case of MySQL 8 you need to disable meta-information caching in MySQL by `set global information_schema_stats_expiry=0`).
+- Dictionaries from other sources are updated every time by default.
+
+For other sources (ODBC, PostgreSQL, ClickHouse, etc), you can set up a query that will update the dictionaries only if they really changed, rather than each time. To do this, follow these steps:
+
+- The dictionary table must have a field that always changes when the source data is updated.
+- The settings of the source must specify a query that retrieves the changing field. The ClickHouse server interprets the query result as a row, and if this row has changed relative to its previous state, the dictionary is updated. Specify the query in the `<invalidate_query>` field in the settings for the [source](#dictionary-sources).
+
+Example of settings:
+
+``` xml
+<dictionary>
+    ...
+    <odbc>
+      ...
+      <invalidate_query>SELECT update_time FROM dictionary_source where id = 1</invalidate_query>
+    </odbc>
+    ...
+</dictionary>
+```
+
+or
+
+``` sql
+...
+SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source where id = 1'))
+...
+```
+
+For `Cache`, `ComplexKeyCache`, `SSDCache`, and `SSDComplexKeyCache` dictionaries both synchronious and asynchronous updates are supported.
+
+It is also possible for `Flat`, `Hashed`, `ComplexKeyHashed` dictionaries to only request data that was changed after the previous update. If `update_field` is specified as part of the dictionary source configuration, value of the previous update time in seconds will be added to the data request. Depends on source type (Executable, HTTP, MySQL, PostgreSQL, ClickHouse, or ODBC) different logic will be applied to `update_field` before request data from an external source.
+
+- If the source is HTTP then `update_field` will be added as a query parameter with the last update time as the parameter value.
+- If the source is Executable then `update_field` will be added as an executable script argument with the last update time as the argument value.
+- If the source is ClickHouse, MySQL, PostgreSQL, ODBC there will be an additional part of `WHERE`, where `update_field` is compared as greater or equal with the last update time.
+    - Per default, this `WHERE`-condition is checked at the highest level of the SQL-Query. Alternatively, the condition can be checked in any other `WHERE`-clause within the query using the `{condition}`-keyword. Example:
+    ```sql
+    ...
+    SOURCE(CLICKHOUSE(...
+        update_field 'added_time'
+        QUERY '
+            SELECT my_arr.1 AS x, my_arr.2 AS y, creation_time
+            FROM (
+                SELECT arrayZip(x_arr, y_arr) AS my_arr, creation_time
+                FROM dictionary_source
+                WHERE {condition}
+            )'
+    ))
+    ...
+    ```
+
+If `update_field` option is set, additional option `update_lag` can be set. Value of `update_lag` option is subtracted from previous update time before request updated data.
+
+Example of settings:
+
+``` xml
+<dictionary>
+    ...
+        <clickhouse>
+            ...
+            <update_field>added_time</update_field>
+            <update_lag>15</update_lag>
+        </clickhouse>
+    ...
+</dictionary>
+```
+
+or
+
+``` sql
+...
+SOURCE(CLICKHOUSE(... update_field 'added_time' update_lag 15))
+...
+```
+
+## Dictionary Sources {#dictionary-sources}
+
+<CloudDetails />
+
+A dictionary can be connected to ClickHouse from many different sources.
+
+If the dictionary is configured using an xml-file, the configuration looks like this:
+
+``` xml
+<clickhouse>
+  <dictionary>
+    ...
+    <source>
+      <source_type>
+        <!-- Source configuration -->
+      </source_type>
+    </source>
+    ...
+  </dictionary>
+  ...
+</clickhouse>
+```
+
+In case of [DDL-query](../../sql-reference/statements/create/dictionary.md), the configuration described above will look like:
+
+``` sql
+CREATE DICTIONARY dict_name (...)
+...
+SOURCE(SOURCE_TYPE(param1 val1 ... paramN valN)) -- Source configuration
+...
+```
+
+The source is configured in the `source` section.
+
+For source types [Local file](#local_file), [Executable file](#executable), [HTTP(s)](#https), [ClickHouse](#clickhouse)
+optional settings are available:
+
+``` xml
+<source>
+  <file>
+    <path>/opt/dictionaries/os.tsv</path>
+    <format>TabSeparated</format>
+  </file>
+  <settings>
+      <format_csv_allow_single_quotes>0</format_csv_allow_single_quotes>
+  </settings>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
+SETTINGS(format_csv_allow_single_quotes = 0)
+```
+
+Types of sources (`source_type`):
+
+- [Local file](#local_file)
+- [Executable File](#executable)
+- [Executable Pool](#executable_pool)
+- [HTTP(s)](#http)
+- DBMS
+    - [ODBC](#odbc)
+    - [MySQL](#mysql)
+    - [ClickHouse](#clickhouse)
+    - [MongoDB](#mongodb)
+    - [Redis](#redis)
+    - [Cassandra](#cassandra)
+    - [PostgreSQL](#postgresql)
+
+## Local File {#local_file}
+
+Example of settings:
+
+``` xml
+<source>
+  <file>
+    <path>/opt/dictionaries/os.tsv</path>
+    <format>TabSeparated</format>
+  </file>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
+```
+
+Setting fields:
+
+- `path` – The absolute path to the file.
+- `format` – The file format. All the formats described in [Formats](../../interfaces/formats.md#formats) are supported.
+
+When a dictionary with source `FILE` is created via DDL command (`CREATE DICTIONARY ...`), the source file needs to be located in the `user_files` directory to prevent DB users from accessing arbitrary files on the ClickHouse node.
+
+**See Also**
+
+- [Dictionary function](../../sql-reference/table-functions/dictionary.md#dictionary-function)
+
+## Executable File {#executable}
+
+Working with executable files depends on [how the dictionary is stored in memory](#storig-dictionaries-in-memory). If the dictionary is stored using `cache` and `complex_key_cache`, ClickHouse requests the necessary keys by sending a request to the executable file’s STDIN. Otherwise, ClickHouse starts the executable file and treats its output as dictionary data.
+
+Example of settings:
+
+``` xml
+<source>
+    <executable>
+        <command>cat /opt/dictionaries/os.tsv</command>
+        <format>TabSeparated</format>
+        <implicit_key>false</implicit_key>
+    </executable>
+</source>
+```
+
+Setting fields:
+
+- `command` — The absolute path to the executable file, or the file name (if the command's directory is in the `PATH`).
+- `format` — The file format. All the formats described in [Formats](../../interfaces/formats.md#formats) are supported.
+- `command_termination_timeout` — The executable script should contain a main read-write loop. After the dictionary is destroyed, the pipe is closed, and the executable file will have `command_termination_timeout` seconds to shutdown before ClickHouse will send a SIGTERM signal to the child process. `command_termination_timeout` is specified in seconds. Default value is 10. Optional parameter.
+- `command_read_timeout` - Timeout for reading data from command stdout in milliseconds. Default value 10000. Optional parameter.
+- `command_write_timeout` - Timeout for writing data to command stdin in milliseconds. Default value 10000. Optional parameter.
+- `implicit_key` — The executable source file can return only values, and the correspondence to the requested keys is determined implicitly — by the order of rows in the result. Default value is false.
+- `execute_direct` - If `execute_direct` = `1`, then `command` will be searched inside user_scripts folder specified by [user_scripts_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_scripts_path). Additional script arguments can be specified using a whitespace separator. Example: `script_name arg1 arg2`. If `execute_direct` = `0`, `command` is passed as argument for `bin/sh -c`. Default value is `0`. Optional parameter.
+- `send_chunk_header` - controls whether to send row count before sending a chunk of data to process. Optional. Default value is `false`.
+
+That dictionary source can be configured only via XML configuration. Creating dictionaries with executable source via DDL is disabled; otherwise, the DB user would be able to execute arbitrary binaries on the ClickHouse node.
+
+## Executable Pool {#executable_pool}
+
+Executable pool allows loading data from pool of processes. This source does not work with dictionary layouts that need to load all data from source. Executable pool works if the dictionary [is stored](#ways-to-store-dictionaries-in-memory) using `cache`, `complex_key_cache`, `ssd_cache`, `complex_key_ssd_cache`, `direct`, or `complex_key_direct` layouts.
+
+Executable pool will spawn a pool of processes with the specified command and keep them running until they exit. The program should read data from STDIN while it is available and output the result to STDOUT. It can wait for the next block of data on STDIN. ClickHouse will not close STDIN after processing a block of data, but will pipe another chunk of data when needed. The executable script should be ready for this way of data processing — it should poll STDIN and flush data to STDOUT early.
+
+Example of settings:
+
+``` xml
+<source>
+    <executable_pool>
+        <command><command>while read key; do printf "$key\tData for key $key\n"; done</command</command>
+        <format>TabSeparated</format>
+        <pool_size>10</pool_size>
+        <max_command_execution_time>10<max_command_execution_time>
+        <implicit_key>false</implicit_key>
+    </executable_pool>
+</source>
+```
+
+Setting fields:
+
+- `command` — The absolute path to the executable file, or the file name (if the program directory is written to `PATH`).
+- `format` — The file format. All the formats described in “[Formats](../../interfaces/formats.md#formats)” are supported.
+- `pool_size` — Size of pool. If 0 is specified as `pool_size` then there is no pool size restrictions. Default value is `16`.
+- `command_termination_timeout` — executable script should contain main read-write loop. After dictionary is destroyed, pipe is closed, and executable file will have `command_termination_timeout` seconds to shutdown, before ClickHouse will send SIGTERM signal to child process. Specified in seconds. Default value is 10. Optional parameter.
+- `max_command_execution_time` — Maximum executable script command execution time for processing block of data. Specified in seconds. Default value is 10. Optional parameter.
+- `command_read_timeout` - timeout for reading data from command stdout in milliseconds. Default value 10000. Optional parameter.
+- `command_write_timeout` - timeout for writing data to command stdin in milliseconds. Default value 10000. Optional parameter.
+- `implicit_key` — The executable source file can return only values, and the correspondence to the requested keys is determined implicitly — by the order of rows in the result. Default value is false. Optional parameter.
+- `execute_direct` - If `execute_direct` = `1`, then `command` will be searched inside user_scripts folder specified by [user_scripts_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_scripts_path). Additional script arguments can be specified using whitespace separator. Example: `script_name arg1 arg2`. If `execute_direct` = `0`, `command` is passed as argument for `bin/sh -c`. Default value is `1`. Optional parameter.
+- `send_chunk_header` - controls whether to send row count before sending a chunk of data to process. Optional. Default value is `false`.
+
+That dictionary source can be configured only via XML configuration. Creating dictionaries with executable source via DDL is disabled, otherwise, the DB user would be able to execute arbitrary binary on ClickHouse node.
+
+## Http(s) {#https}
+
+Working with an HTTP(s) server depends on [how the dictionary is stored in memory](#storig-dictionaries-in-memory). If the dictionary is stored using `cache` and `complex_key_cache`, ClickHouse requests the necessary keys by sending a request via the `POST` method.
+
+Example of settings:
+
+``` xml
+<source>
+    <http>
+        <url>http://[::1]/os.tsv</url>
+        <format>TabSeparated</format>
+        <credentials>
+            <user>user</user>
+            <password>password</password>
+        </credentials>
+        <headers>
+            <header>
+                <name>API-KEY</name>
+                <value>key</value>
+            </header>
+        </headers>
+    </http>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(HTTP(
+    url 'http://[::1]/os.tsv'
+    format 'TabSeparated'
+    credentials(user 'user' password 'password')
+    headers(header(name 'API-KEY' value 'key'))
+))
+```
+
+In order for ClickHouse to access an HTTPS resource, you must [configure openSSL](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-openssl) in the server configuration.
+
+Setting fields:
+
+- `url` – The source URL.
+- `format` – The file format. All the formats described in “[Formats](../../interfaces/formats.md#formats)” are supported.
+- `credentials` – Basic HTTP authentication. Optional parameter.
+- `user` – Username required for the authentication.
+- `password` – Password required for the authentication.
+- `headers` – All custom HTTP headers entries used for the HTTP request. Optional parameter.
+- `header` – Single HTTP header entry.
+- `name` – Identifiant name used for the header send on the request.
+- `value` – Value set for a specific identifiant name.
+
+When creating a dictionary using the DDL command (`CREATE DICTIONARY ...`) remote hosts for HTTP dictionaries are checked against the contents of `remote_url_allow_hosts` section from config to prevent database users to access arbitrary HTTP server.
+
+### Known Vulnerability of the ODBC Dictionary Functionality
+
+:::note
+When connecting to the database through the ODBC driver connection parameter `Servername` can be substituted. In this case values of `USERNAME` and `PASSWORD` from `odbc.ini` are sent to the remote server and can be compromised.
+:::
+
+**Example of insecure use**
+
+Let’s configure unixODBC for PostgreSQL. Content of `/etc/odbc.ini`:
+
+``` text
+[gregtest]
+Driver = /usr/lib/psqlodbca.so
+Servername = localhost
+PORT = 5432
+DATABASE = test_db
+#OPTION = 3
+USERNAME = test
+PASSWORD = test
+```
+
+If you then make a query such as
+
+``` sql
+SELECT * FROM odbc('DSN=gregtest;Servername=some-server.com', 'test_db');
+```
+
+ODBC driver will send values of `USERNAME` and `PASSWORD` from `odbc.ini` to `some-server.com`.
+
+### Example of Connecting Postgresql
+
+Ubuntu OS.
+
+Installing unixODBC and the ODBC driver for PostgreSQL:
+
+``` bash
+$ sudo apt-get install -y unixodbc odbcinst odbc-postgresql
+```
+
+Configuring `/etc/odbc.ini` (or `~/.odbc.ini` if you signed in under a user that runs ClickHouse):
+
+``` text
+    [DEFAULT]
+    Driver = myconnection
+
+    [myconnection]
+    Description         = PostgreSQL connection to my_db
+    Driver              = PostgreSQL Unicode
+    Database            = my_db
+    Servername          = 127.0.0.1
+    UserName            = username
+    Password            = password
+    Port                = 5432
+    Protocol            = 9.3
+    ReadOnly            = No
+    RowVersioning       = No
+    ShowSystemTables    = No
+    ConnSettings        =
+```
+
+The dictionary configuration in ClickHouse:
+
+``` xml
+<clickhouse>
+    <dictionary>
+        <name>table_name</name>
+        <source>
+            <odbc>
+                <!-- You can specify the following parameters in connection_string: -->
+                <!-- DSN=myconnection;UID=username;PWD=password;HOST=127.0.0.1;PORT=5432;DATABASE=my_db -->
+                <connection_string>DSN=myconnection</connection_string>
+                <table>postgresql_table</table>
+            </odbc>
+        </source>
+        <lifetime>
+            <min>300</min>
+            <max>360</max>
+        </lifetime>
+        <layout>
+            <hashed/>
+        </layout>
+        <structure>
+            <id>
+                <name>id</name>
+            </id>
+            <attribute>
+                <name>some_column</name>
+                <type>UInt64</type>
+                <null_value>0</null_value>
+            </attribute>
+        </structure>
+    </dictionary>
+</clickhouse>
+```
+
+or
+
+``` sql
+CREATE DICTIONARY table_name (
+    id UInt64,
+    some_column UInt64 DEFAULT 0
+)
+PRIMARY KEY id
+SOURCE(ODBC(connection_string 'DSN=myconnection' table 'postgresql_table'))
+LAYOUT(HASHED())
+LIFETIME(MIN 300 MAX 360)
+```
+
+You may need to edit `odbc.ini` to specify the full path to the library with the driver `DRIVER=/usr/local/lib/psqlodbcw.so`.
+
+### Example of Connecting MS SQL Server
+
+Ubuntu OS.
+
+Installing the ODBC driver for connecting to MS SQL:
+
+``` bash
+$ sudo apt-get install tdsodbc freetds-bin sqsh
+```
+
+Configuring the driver:
+
+```bash
+    $ cat /etc/freetds/freetds.conf
+    ...
+
+    [MSSQL]
+    host = 192.168.56.101
+    port = 1433
+    tds version = 7.0
+    client charset = UTF-8
+
+    # test TDS connection
+    $ sqsh -S MSSQL -D database -U user -P password
+
+
+    $ cat /etc/odbcinst.ini
+
+    [FreeTDS]
+    Description     = FreeTDS
+    Driver          = /usr/lib/x86_64-linux-gnu/odbc/libtdsodbc.so
+    Setup           = /usr/lib/x86_64-linux-gnu/odbc/libtdsS.so
+    FileUsage       = 1
+    UsageCount      = 5
+
+    $ cat /etc/odbc.ini
+    # $ cat ~/.odbc.ini # if you signed in under a user that runs ClickHouse
+
+    [MSSQL]
+    Description     = FreeTDS
+    Driver          = FreeTDS
+    Servername      = MSSQL
+    Database        = test
+    UID             = test
+    PWD             = test
+    Port            = 1433
+
+
+    # (optional) test ODBC connection (to use isql-tool install the [unixodbc](https://packages.debian.org/sid/unixodbc)-package)
+    $ isql -v MSSQL "user" "password"
+```
+
+Remarks:
+- to determine the earliest TDS version that is supported by a particular SQL Server version, refer to the product documentation or look at [MS-TDS Product Behavior](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-tds/135d0ebe-5c4c-4a94-99bf-1811eccb9f4a)
+
+Configuring the dictionary in ClickHouse:
+
+``` xml
+<clickhouse>
+    <dictionary>
+        <name>test</name>
+        <source>
+            <odbc>
+                <table>dict</table>
+                <connection_string>DSN=MSSQL;UID=test;PWD=test</connection_string>
+            </odbc>
+        </source>
+
+        <lifetime>
+            <min>300</min>
+            <max>360</max>
+        </lifetime>
+
+        <layout>
+            <flat />
+        </layout>
+
+        <structure>
+            <id>
+                <name>k</name>
+            </id>
+            <attribute>
+                <name>s</name>
+                <type>String</type>
+                <null_value></null_value>
+            </attribute>
+        </structure>
+    </dictionary>
+</clickhouse>
+```
+
+or
+
+``` sql
+CREATE DICTIONARY test (
+    k UInt64,
+    s String DEFAULT ''
+)
+PRIMARY KEY k
+SOURCE(ODBC(table 'dict' connection_string 'DSN=MSSQL;UID=test;PWD=test'))
+LAYOUT(FLAT())
+LIFETIME(MIN 300 MAX 360)
+```
+
+## DBMS
+
+### ODBC
+
+You can use this method to connect any database that has an ODBC driver.
+
+Example of settings:
+
+``` xml
+<source>
+    <odbc>
+        <db>DatabaseName</db>
+        <table>ShemaName.TableName</table>
+        <connection_string>DSN=some_parameters</connection_string>
+        <invalidate_query>SQL_QUERY</invalidate_query>
+        <query>SELECT id, value_1, value_2 FROM ShemaName.TableName</query>
+    </odbc>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(ODBC(
+    db 'DatabaseName'
+    table 'SchemaName.TableName'
+    connection_string 'DSN=some_parameters'
+    invalidate_query 'SQL_QUERY'
+    query 'SELECT id, value_1, value_2 FROM db_name.table_name'
+))
+```
+
+Setting fields:
+
+- `db` – Name of the database. Omit it if the database name is set in the `<connection_string>` parameters.
+- `table` – Name of the table and schema if exists.
+- `connection_string` – Connection string.
+- `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Updating dictionaries](#dictionary-updates).
+- `query` – The custom query. Optional parameter.
+
+:::note
+The `table` and `query` fields cannot be used together. And either one of the `table` or `query` fields must be declared.
+:::
+
+ClickHouse receives quoting symbols from ODBC-driver and quote all settings in queries to driver, so it’s necessary to set table name accordingly to table name case in database.
+
+If you have a problems with encodings when using Oracle, see the corresponding [FAQ](/knowledgebase/oracle-odbc) item.
+
+### Mysql
+
+Example of settings:
+
+``` xml
+<source>
+  <mysql>
+      <port>3306</port>
+      <user>clickhouse</user>
+      <password>qwerty</password>
+      <replica>
+          <host>example01-1</host>
+          <priority>1</priority>
+      </replica>
+      <replica>
+          <host>example01-2</host>
+          <priority>1</priority>
+      </replica>
+      <db>db_name</db>
+      <table>table_name</table>
+      <where>id=10</where>
+      <invalidate_query>SQL_QUERY</invalidate_query>
+      <fail_on_connection_loss>true</fail_on_connection_loss>
+      <query>SELECT id, value_1, value_2 FROM db_name.table_name</query>
+  </mysql>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(MYSQL(
+    port 3306
+    user 'clickhouse'
+    password 'qwerty'
+    replica(host 'example01-1' priority 1)
+    replica(host 'example01-2' priority 1)
+    db 'db_name'
+    table 'table_name'
+    where 'id=10'
+    invalidate_query 'SQL_QUERY'
+    fail_on_connection_loss 'true'
+    query 'SELECT id, value_1, value_2 FROM db_name.table_name'
+))
+```
+
+Setting fields:
+
+- `port` – The port on the MySQL server. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+
+- `user` – Name of the MySQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+
+- `password` – Password of the MySQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+
+- `replica` – Section of replica configurations. There can be multiple sections.
+
+        - `replica/host` – The MySQL host.
+        - `replica/priority` – The replica priority. When attempting to connect, ClickHouse traverses the replicas in order of priority. The lower the number, the higher the priority.
+
+- `db` – Name of the database.
+
+- `table` – Name of the table.
+
+- `where` – The selection criteria. The syntax for conditions is the same as for `WHERE` clause in MySQL, for example, `id > 10 AND id < 20`. Optional parameter.
+
+- `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Updating dictionaries](#dictionary-updates).
+
+- `fail_on_connection_loss` – The configuration parameter that controls behavior of the server on connection loss. If `true`, an exception is thrown immediately if the connection between client and server was lost. If `false`, the ClickHouse server retries to execute the query three times before throwing an exception. Note that retrying leads to increased response times. Default value: `false`.
+
+- `query` – The custom query. Optional parameter.
+
+:::note
+The `table` or `where` fields cannot be used together with the `query` field. And either one of the `table` or `query` fields must be declared.
+:::
+
+:::note
+There is no explicit parameter `secure`. When establishing an SSL-connection security is mandatory.
+:::
+
+MySQL can be connected to on a local host via sockets. To do this, set `host` and `socket`.
+
+Example of settings:
+
+``` xml
+<source>
+  <mysql>
+      <host>localhost</host>
+      <socket>/path/to/socket/file.sock</socket>
+      <user>clickhouse</user>
+      <password>qwerty</password>
+      <db>db_name</db>
+      <table>table_name</table>
+      <where>id=10</where>
+      <invalidate_query>SQL_QUERY</invalidate_query>
+      <fail_on_connection_loss>true</fail_on_connection_loss>
+	  <query>SELECT id, value_1, value_2 FROM db_name.table_name</query>
+  </mysql>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(MYSQL(
+    host 'localhost'
+    socket '/path/to/socket/file.sock'
+    user 'clickhouse'
+    password 'qwerty'
+    db 'db_name'
+    table 'table_name'
+    where 'id=10'
+    invalidate_query 'SQL_QUERY'
+    fail_on_connection_loss 'true'
+	query 'SELECT id, value_1, value_2 FROM db_name.table_name'
+))
+```
+
+### ClickHouse
+
+Example of settings:
+
+``` xml
+<source>
+    <clickhouse>
+        <host>example01-01-1</host>
+        <port>9000</port>
+        <user>default</user>
+        <password></password>
+        <db>default</db>
+        <table>ids</table>
+        <where>id=10</where>
+        <secure>1</secure>
+		<query>SELECT id, value_1, value_2 FROM default.ids</query>
+    </clickhouse>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(CLICKHOUSE(
+    host 'example01-01-1'
+    port 9000
+    user 'default'
+    password ''
+    db 'default'
+    table 'ids'
+    where 'id=10'
+    secure 1
+	query 'SELECT id, value_1, value_2 FROM default.ids'
+));
+```
+
+Setting fields:
+
+- `host` – The ClickHouse host. If it is a local host, the query is processed without any network activity. To improve fault tolerance, you can create a [Distributed](../../engines/table-engines/special/distributed.md) table and enter it in subsequent configurations.
+- `port` – The port on the ClickHouse server.
+- `user` – Name of the ClickHouse user.
+- `password` – Password of the ClickHouse user.
+- `db` – Name of the database.
+- `table` – Name of the table.
+- `where` – The selection criteria. May be omitted.
+- `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Updating dictionaries](#dictionary-updates).
+- `secure` - Use ssl for connection.
+- `query` – The custom query. Optional parameter.
+
+:::note
+The `table` or `where` fields cannot be used together with the `query` field. And either one of the `table` or `query` fields must be declared.
+:::
+
+### Mongodb
+
+Example of settings:
+
+``` xml
+<source>
+    <mongodb>
+        <host>localhost</host>
+        <port>27017</port>
+        <user></user>
+        <password></password>
+        <db>test</db>
+        <collection>dictionary_source</collection>
+        <options>ssl=true</options>
+    </mongodb>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(MONGODB(
+    host 'localhost'
+    port 27017
+    user ''
+    password ''
+    db 'test'
+    collection 'dictionary_source'
+    options 'ssl=true'
+))
+```
+
+Setting fields:
+
+- `host` – The MongoDB host.
+- `port` – The port on the MongoDB server.
+- `user` – Name of the MongoDB user.
+- `password` – Password of the MongoDB user.
+- `db` – Name of the database.
+- `collection` – Name of the collection.
+- `options` -  MongoDB connection string options (optional parameter).
+
+
+### Redis
+
+Example of settings:
+
+``` xml
+<source>
+    <redis>
+        <host>localhost</host>
+        <port>6379</port>
+        <storage_type>simple</storage_type>
+        <db_index>0</db_index>
+    </redis>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(REDIS(
+    host 'localhost'
+    port 6379
+    storage_type 'simple'
+    db_index 0
+))
+```
+
+Setting fields:
+
+- `host` – The Redis host.
+- `port` – The port on the Redis server.
+- `storage_type` – The structure of internal Redis storage using for work with keys. `simple` is for simple sources and for hashed single key sources, `hash_map` is for hashed sources with two keys. Ranged sources and cache sources with complex key are unsupported. May be omitted, default value is `simple`.
+- `db_index` – The specific numeric index of Redis logical database. May be omitted, default value is 0.
+
+### Cassandra
+
+Example of settings:
+
+``` xml
+<source>
+    <cassandra>
+        <host>localhost</host>
+        <port>9042</port>
+        <user>username</user>
+        <password>qwerty123</password>
+        <keyspase>database_name</keyspase>
+        <column_family>table_name</column_family>
+        <allow_filering>1</allow_filering>
+        <partition_key_prefix>1</partition_key_prefix>
+        <consistency>One</consistency>
+        <where>"SomeColumn" = 42</where>
+        <max_threads>8</max_threads>
+        <query>SELECT id, value_1, value_2 FROM database_name.table_name</query>
+    </cassandra>
+</source>
+```
+
+Setting fields:
+
+- `host` – The Cassandra host or comma-separated list of hosts.
+- `port` – The port on the Cassandra servers. If not specified, default port 9042 is used.
+- `user` – Name of the Cassandra user.
+- `password` – Password of the Cassandra user.
+- `keyspace` – Name of the keyspace (database).
+- `column_family` – Name of the column family (table).
+- `allow_filering` – Flag to allow or not potentially expensive conditions on clustering key columns. Default value is 1.
+- `partition_key_prefix` – Number of partition key columns in primary key of the Cassandra table. Required for compose key dictionaries. Order of key columns in the dictionary definition must be the same as in Cassandra. Default value is 1 (the first key column is a partition key and other key columns are clustering key).
+- `consistency` – Consistency level. Possible values: `One`, `Two`, `Three`, `All`, `EachQuorum`, `Quorum`, `LocalQuorum`, `LocalOne`, `Serial`, `LocalSerial`. Default value is `One`.
+- `where` – Optional selection criteria.
+- `max_threads` – The maximum number of threads to use for loading data from multiple partitions in compose key dictionaries.
+- `query` – The custom query. Optional parameter.
+
+:::note
+The `column_family` or `where` fields cannot be used together with the `query` field. And either one of the `column_family` or `query` fields must be declared.
+:::
+
+### PostgreSQL
+
+Example of settings:
+
+``` xml
+<source>
+  <postgresql>
+      <port>5432</port>
+      <user>clickhouse</user>
+      <password>qwerty</password>
+      <db>db_name</db>
+      <table>table_name</table>
+      <where>id=10</where>
+      <invalidate_query>SQL_QUERY</invalidate_query>
+      <query>SELECT id, value_1, value_2 FROM db_name.table_name</query>
+  </postgresql>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(POSTGRESQL(
+    port 5432
+    host 'postgresql-hostname'
+    user 'postgres_user'
+    password 'postgres_password'
+    db 'db_name'
+    table 'table_name'
+    replica(host 'example01-1' port 5432 priority 1)
+    replica(host 'example01-2' port 5432 priority 2)
+    where 'id=10'
+    invalidate_query 'SQL_QUERY'
+    query 'SELECT id, value_1, value_2 FROM db_name.table_name'
+))
+```
+
+Setting fields:
+
+- `host` – The host on the PostgreSQL server. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+- `port` – The port on the PostgreSQL server. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+- `user` – Name of the PostgreSQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+- `password` – Password of the PostgreSQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+- `replica` – Section of replica configurations. There can be multiple sections:
+    - `replica/host` – The PostgreSQL host.
+    - `replica/port` – The PostgreSQL port.
+    - `replica/priority` – The replica priority. When attempting to connect, ClickHouse traverses the replicas in order of priority. The lower the number, the higher the priority.
+- `db` – Name of the database.
+- `table` – Name of the table.
+- `where` – The selection criteria. The syntax for conditions is the same as for `WHERE` clause in PostgreSQL. For example, `id > 10 AND id < 20`. Optional parameter.
+- `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Updating dictionaries](#dictionary-updates).
+- `query` – The custom query. Optional parameter.
+
+:::note
+The `table` or `where` fields cannot be used together with the `query` field. And either one of the `table` or `query` fields must be declared.
+:::
+
+## Null
+
+A special source that can be used to create dummy (empty) dictionaries. Such dictionaries can useful for tests or with setups with separated data and query nodes at nodes with Distributed tables.
+
+``` sql
+CREATE DICTIONARY null_dict (
+    id              UInt64,
+    val             UInt8,
+    default_val     UInt8 DEFAULT 123,
+    nullable_val    Nullable(UInt8)
+)
+PRIMARY KEY id
+SOURCE(NULL())
+LAYOUT(FLAT())
+LIFETIME(0);
+```
+
+## Dictionary Key and Fields {#dictionary-key-and-fields}
+
+<CloudDetails />
+
+The `structure` clause describes the dictionary key and fields available for queries.
+
+XML description:
+
+``` xml
+<dictionary>
+    <structure>
+        <id>
+            <name>Id</name>
+        </id>
+
+        <attribute>
+            <!-- Attribute parameters -->
+        </attribute>
+
+        ...
+
+    </structure>
+</dictionary>
+```
+
+Attributes are described in the elements:
+
+- `<id>` — Key column
+- `<attribute>` — Data column: there can be a multiple number of attributes.
+
+DDL query:
+
+``` sql
+CREATE DICTIONARY dict_name (
+    Id UInt64,
+    -- attributes
+)
+PRIMARY KEY Id
+...
+```
+
+Attributes are described in the query body:
+
+- `PRIMARY KEY` — Key column
+- `AttrName AttrType` — Data column. There can be a multiple number of attributes.
+
+## Key
+
+ClickHouse supports the following types of keys:
+
+- Numeric key. `UInt64`. Defined in the `<id>` tag or using `PRIMARY KEY` keyword.
+- Composite key. Set of values of different types. Defined in the tag `<key>` or `PRIMARY KEY` keyword.
+
+An xml structure can contain either `<id>` or `<key>`. DDL-query must contain single `PRIMARY KEY`.
+
+:::note
+You must not describe key as an attribute.
+:::
+
+### Numeric Key
+
+Type: `UInt64`.
+
+Configuration example:
+
+``` xml
+<id>
+    <name>Id</name>
+</id>
+```
+
+Configuration fields:
+
+- `name` – The name of the column with keys.
+
+For DDL-query:
+
+``` sql
+CREATE DICTIONARY (
+    Id UInt64,
+    ...
+)
+PRIMARY KEY Id
+...
+```
+
+- `PRIMARY KEY` – The name of the column with keys.
+
+### Composite Key
+
+The key can be a `tuple` from any types of fields. The [layout](#storig-dictionaries-in-memory) in this case must be `complex_key_hashed` or `complex_key_cache`.
+
+:::tip
+A composite key can consist of a single element. This makes it possible to use a string as the key, for instance.
+:::
+
+The key structure is set in the element `<key>`. Key fields are specified in the same format as the dictionary [attributes](#dictionary-key-and-fields). Example:
+
+``` xml
+<structure>
+    <key>
+        <attribute>
+            <name>field1</name>
+            <type>String</type>
+        </attribute>
+        <attribute>
+            <name>field2</name>
+            <type>UInt32</type>
+        </attribute>
+        ...
+    </key>
+...
+```
+
+or
+
+``` sql
+CREATE DICTIONARY (
+    field1 String,
+    field2 String
+    ...
+)
+PRIMARY KEY field1, field2
+...
+```
+
+For a query to the `dictGet*` function, a tuple is passed as the key. Example: `dictGetString('dict_name', 'attr_name', tuple('string for field1', num_for_field2))`.
+
+## Attributes
+
+Configuration example:
+
+``` xml
+<structure>
+    ...
+    <attribute>
+        <name>Name</name>
+        <type>ClickHouseDataType</type>
+        <null_value></null_value>
+        <expression>rand64()</expression>
+        <hierarchical>true</hierarchical>
+        <injective>true</injective>
+        <is_object_id>true</is_object_id>
+    </attribute>
+</structure>
+```
+
+or
+
+``` sql
+CREATE DICTIONARY somename (
+    Name ClickHouseDataType DEFAULT '' EXPRESSION rand64() HIERARCHICAL INJECTIVE IS_OBJECT_ID
+)
+```
+
+Configuration fields:
+
+| Tag                                                  | Description                                                                                                                                                                                                                                                                                                                                     | Required |
+|------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
+| `name`                                               | Column name.                                                                                                                                                                                                                                                                                                                                    | Yes      |
+| `type`                                               | ClickHouse data type: [UInt8](../../sql-reference/data-types/int-uint.md), [UInt16](../../sql-reference/data-types/int-uint.md), [UInt32](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md), [Int8](../../sql-reference/data-types/int-uint.md), [Int16](../../sql-reference/data-types/int-uint.md), [Int32](../../sql-reference/data-types/int-uint.md), [Int64](../../sql-reference/data-types/int-uint.md), [Float32](../../sql-reference/data-types/float.md), [Float64](../../sql-reference/data-types/float.md), [UUID](../../sql-reference/data-types/uuid.md), [Decimal32](../../sql-reference/data-types/decimal.md), [Decimal64](../../sql-reference/data-types/decimal.md), [Decimal128](../../sql-reference/data-types/decimal.md), [Decimal256](../../sql-reference/data-types/decimal.md),[Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md), [DateTime64](../../sql-reference/data-types/datetime64.md), [String](../../sql-reference/data-types/string.md), [Array](../../sql-reference/data-types/array.md).<br/>ClickHouse tries to cast value from dictionary to the specified data type. For example, for MySQL, the field might be `TEXT`, `VARCHAR`, or `BLOB` in the MySQL source table, but it can be uploaded as `String` in ClickHouse.<br/>[Nullable](../../sql-reference/data-types/nullable.md) is currently supported for [Flat](#flat), [Hashed](#hashed), [ComplexKeyHashed](#complex_key_hashed), [Direct](#direct), [ComplexKeyDirect](#complex_key_direct), [RangeHashed](#range_hashed), Polygon, [Cache](#cache), [ComplexKeyCache](#complex_key_cache), [SSDCache](#ssd_cache), [SSDComplexKeyCache](#complex_key_ssd_cache) dictionaries. In [IPTrie](#ip_trie) dictionaries `Nullable` types are not supported.       | Yes      |
+| `null_value`                                         | Default value for a non-existing element.<br/>In the example, it is an empty string. [NULL](../syntax.md#null) value can be used only for the `Nullable` types (see the previous line with types description).                                                                                                                                                                                                                       | Yes      |
+| `expression`                                         | [Expression](../../sql-reference/syntax.md#expressions) that ClickHouse executes on the value.<br/>The expression can be a column name in the remote SQL database. Thus, you can use it to create an alias for the remote column.<br/><br/>Default value: no expression.                                                              | No       |
+| <a name="hierarchical-dict-attr"></a> `hierarchical` | If `true`, the attribute contains the value of a parent key for the current key. See [Hierarchical Dictionaries](#hierarchical-dictionaries).<br/><br/>Default value: `false`.                                                                                               | No       |
+| `injective`                                          | Flag that shows whether the `id -> attribute` image is [injective](https://en.wikipedia.org/wiki/Injective_function).<br/>If `true`, ClickHouse can automatically place after the `GROUP BY` clause the requests to dictionaries with injection. Usually it significantly reduces the amount of such requests.<br/><br/>Default value: `false`. | No       |
+| `is_object_id`                                       | Flag that shows whether the query is executed for a MongoDB document by `ObjectID`.<br/><br/>Default value: `false`.
+
+## Hierarchical Dictionaries {#hierarchical-dictionaries}
+
+ClickHouse supports hierarchical dictionaries with a [numeric key](#numeric-key).
+
+Look at the following hierarchical structure:
+
+``` text
+0 (Common parent)
+│
+├── 1 (Russia)
+│   │
+│   └── 2 (Moscow)
+│       │
+│       └── 3 (Center)
+│
+└── 4 (Great Britain)
+    │
+    └── 5 (London)
+```
+
+This hierarchy can be expressed as the following dictionary table.
+
+| region_id | parent_region | region_name  |
+|------------|----------------|---------------|
+| 1          | 0              | Russia        |
+| 2          | 1              | Moscow        |
+| 3          | 2              | Center        |
+| 4          | 0              | Great Britain |
+| 5          | 4              | London        |
+
+This table contains a column `parent_region` that contains the key of the nearest parent for the element.
+
+ClickHouse supports the hierarchical property for external dictionary attributes. This property allows you to configure the hierarchical dictionary similar to described above.
+
+The [dictGetHierarchy](../../sql-reference/functions/ext-dict-functions.md#dictgethierarchy) function allows you to get the parent chain of an element.
+
+For our example, the structure of dictionary can be the following:
+
+``` xml
+<dictionary>
+    <structure>
+        <id>
+            <name>region_id</name>
+        </id>
+
+        <attribute>
+            <name>parent_region</name>
+            <type>UInt64</type>
+            <null_value>0</null_value>
+            <hierarchical>true</hierarchical>
+        </attribute>
+
+        <attribute>
+            <name>region_name</name>
+            <type>String</type>
+            <null_value></null_value>
+        </attribute>
+
+    </structure>
+</dictionary>
+```
+
+## Polygon dictionaries {#polygon-dictionaries}
+
+Polygon dictionaries allow you to efficiently search for the polygon containing specified points.
+For example: defining a city area by geographical coordinates.
+
+Example of a polygon dictionary configuration:
+
+<CloudDetails />
+
+``` xml
+<dictionary>
+    <structure>
+        <key>
+            <attribute>
+                <name>key</name>
+                <type>Array(Array(Array(Array(Float64))))</type>
+            </attribute>
+        </key>
+
+        <attribute>
+            <name>name</name>
+            <type>String</type>
+            <null_value></null_value>
+        </attribute>
+
+        <attribute>
+            <name>value</name>
+            <type>UInt64</type>
+            <null_value>0</null_value>
+        </attribute>
+    </structure>
+
+    <layout>
+        <polygon>
+            <store_polygon_key_column>1</store_polygon_key_column>
+        </polygon>
+    </layout>
+
+    ...
+</dictionary>
+```
+
+The corresponding [DDL-query](../../sql-reference/statements/create/dictionary.md#create-dictionary-query):
+``` sql
+CREATE DICTIONARY polygon_dict_name (
+    key Array(Array(Array(Array(Float64)))),
+    name String,
+    value UInt64
+)
+PRIMARY KEY key
+LAYOUT(POLYGON(STORE_POLYGON_KEY_COLUMN 1))
+...
+```
+
+When configuring the polygon dictionary, the key must have one of two types:
+
+- A simple polygon. It is an array of points.
+- MultiPolygon. It is an array of polygons. Each polygon is a two-dimensional array of points. The first element of this array is the outer boundary of the polygon, and subsequent elements specify areas to be excluded from it.
+
+Points can be specified as an array or a tuple of their coordinates. In the current implementation, only two-dimensional points are supported.
+
+The user can upload their own data in all formats supported by ClickHouse.
+
+There are 3 types of [in-memory storage](#storig-dictionaries-in-memory) available:
+
+- `POLYGON_SIMPLE`. This is a naive implementation, where a linear pass through all polygons is made for each query, and membership is checked for each one without using additional indexes.
+
+- `POLYGON_INDEX_EACH`. A separate index is built for each polygon, which allows you to quickly check whether it belongs in most cases (optimized for geographical regions).
+Also, a grid is superimposed on the area under consideration, which significantly narrows the number of polygons under consideration.
+The grid is created by recursively dividing the cell into 16 equal parts and is configured with two parameters.
+The division stops when the recursion depth reaches `MAX_DEPTH` or when the cell crosses no more than `MIN_INTERSECTIONS` polygons.
+To respond to the query, there is a corresponding cell, and the index for the polygons stored in it is accessed alternately.
+
+- `POLYGON_INDEX_CELL`. This placement also creates the grid described above. The same options are available. For each sheet cell, an index is built on all pieces of polygons that fall into it, which allows you to quickly respond to a request.
+
+- `POLYGON`. Synonym to `POLYGON_INDEX_CELL`.
+
+Dictionary queries are carried out using standard [functions](../../sql-reference/functions/ext-dict-functions.md) for working with dictionaries.
+An important difference is that here the keys will be the points for which you want to find the polygon containing them.
+
+**Example**
+
+Example of working with the dictionary defined above:
+
+``` sql
+CREATE TABLE points (
+    x Float64,
+    y Float64
+)
+...
+SELECT tuple(x, y) AS key, dictGet(dict_name, 'name', key), dictGet(dict_name, 'value', key) FROM points ORDER BY x, y;
+```
+
+As a result of executing the last command for each point in the 'points' table, a minimum area polygon containing this point will be found, and the requested attributes will be output.
+
+**Example**
+
+You can read columns from polygon dictionaries via SELECT query, just turn on the `store_polygon_key_column = 1` in the dictionary configuration or corresponding DDL-query.
+
+Query:
+
+``` sql
+CREATE TABLE polygons_test_table
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    name String
+) ENGINE = TinyLog;
+
+INSERT INTO polygons_test_table VALUES ([[[(3, 1), (0, 1), (0, -1), (3, -1)]]], 'Value');
+
+CREATE DICTIONARY polygons_test_dictionary
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    name String
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(TABLE 'polygons_test_table'))
+LAYOUT(POLYGON(STORE_POLYGON_KEY_COLUMN 1))
+LIFETIME(0);
+
+SELECT * FROM polygons_test_dictionary;
+```
+
+Result:
+
+``` text
+┌─key─────────────────────────────┬─name──┐
+│ [[[(3,1),(0,1),(0,-1),(3,-1)]]] │ Value │
+└─────────────────────────────────┴───────┘
+```
+
+## Regular Expression Tree Dictionary {#regexp-tree-dictionary}
+
+Regular expression tree dictionaries are a special type of dictionary which represent the mapping from key to attributes using a tree of regular expressions. There are some use cases, e.g. parsing of [user agent](https://en.wikipedia.org/wiki/User_agent) strings, which can be expressed elegantly with regexp tree dictionaries.
+
+### Use Regular Expression Tree Dictionary in ClickHouse Open-Source
+
+Regular expression tree dictionaries are defined in ClickHouse open-source using the YAMLRegExpTree source which is provided the path to a YAML file containing the regular expression tree.
+
+```sql
+CREATE DICTIONARY regexp_dict
+(
+    regexp String,
+    name String,
+    version String
+)
+PRIMARY KEY(regexp)
+SOURCE(YAMLRegExpTree(PATH '/var/lib/clickhouse/user_files/regexp_tree.yaml'))
+LAYOUT(regexp_tree)
+...
+```
+
+The dictionary source `YAMLRegExpTree` represents the structure of a regexp tree. For example:
+
+```yaml
+- regexp: 'Linux/(\d+[\.\d]*).+tlinux'
+  name: 'TencentOS'
+  version: '\1'
+
+- regexp: '\d+/tclwebkit(?:\d+[\.\d]*)'
+  name: 'Android'
+  versions:
+    - regexp: '33/tclwebkit'
+      version: '13'
+    - regexp: '3[12]/tclwebkit'
+      version: '12'
+    - regexp: '30/tclwebkit'
+      version: '11'
+    - regexp: '29/tclwebkit'
+      version: '10'
+```
+
+This config consists of a list of regular expression tree nodes. Each node has the following structure:
+
+- **regexp**: the regular expression of the node.
+- **attributes**: a list of user-defined dictionary attributes. In this example, there are two attributes: `name` and `version`. The first node defines both attributes. The second node only defines attribute `name`. Attribute `version` is provided by the child nodes of the second node.
+  - The value of an attribute may contain **back references**, referring to capture groups of the matched regular expression. In the example, the value of attribute `version` in the first node consists of a back-reference `\1` to capture group `(\d+[\.\d]*)` in the regular expression. Back-reference numbers range from 1 to 9 and are written as `$1` or `\1` (for number 1). The back reference is replaced by the matched capture group during query execution.
+- **child nodes**: a list of children of a regexp tree node, each of which has its own attributes and (potentially) children nodes. String matching proceeds in a depth-first fashion. If a string matches a regexp node, the dictionary checks if it also matches the nodes' child nodes. If that is the case, the attributes of the deepest matching node are assigned. Attributes of a child node overwrite equally named attributes of parent nodes. The name of child nodes in YAML files can be arbitrary, e.g. `versions` in above example.
+
+Regexp tree dictionaries only allow access using the functions `dictGet` and `dictGetOrDefault`.
+
+Example:
+
+```sql
+SELECT dictGet('regexp_dict', ('name', 'version'), '31/tclwebkit1024');
+```
+
+Result:
+
+```text
+┌─dictGet('regexp_dict', ('name', 'version'), '31/tclwebkit1024')─┐
+│ ('Android','12')                                                │
+└─────────────────────────────────────────────────────────────────┘
+```
+
+In this case, we first match the regular expression `\d+/tclwebkit(?:\d+[\.\d]*)` in the top layer's second node. The dictionary then continues to look into the child nodes and finds that the string also matches `3[12]/tclwebkit`. As a result, the value of attribute `name` is `Android` (defined in the first layer) and the value of attribute `version` is `12` (defined the child node).
+
+With a powerful YAML configure file, we can use a regexp tree dictionaries as a user agent string parser. We support [uap-core](https://github.com/ua-parser/uap-core) and demonstrate how to use it in the functional test [02504_regexp_dictionary_ua_parser](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/02504_regexp_dictionary_ua_parser.sh)
+
+### Use Regular Expression Tree Dictionary in ClickHouse Cloud
+
+Above used `YAMLRegExpTree` source works in ClickHouse Open Source but not in ClickHouse Cloud. To use regexp tree dictionaries in ClickHouse could, first create a regexp tree dictionary from a YAML file locally in ClickHouse Open Source, then dump this dictionary into a CSV file using the `dictionary` table function and the [INTO OUTFILE](../statements/select/into-outfile.md) clause.
+
+```sql
+SELECT * FROM dictionary(regexp_dict) INTO OUTFILE('regexp_dict.csv')
+```
+
+The content of csv file is:
+
+```text
+1,0,"Linux/(\d+[\.\d]*).+tlinux","['version','name']","['\\1','TencentOS']"
+2,0,"(\d+)/tclwebkit(\d+[\.\d]*)","['comment','version','name']","['test $1 and $2','$1','Android']"
+3,2,"33/tclwebkit","['version']","['13']"
+4,2,"3[12]/tclwebkit","['version']","['12']"
+5,2,"3[12]/tclwebkit","['version']","['11']"
+6,2,"3[12]/tclwebkit","['version']","['10']"
+```
+
+The schema of dumped file is:
+
+- `id UInt64`: the id of the RegexpTree node.
+- `parent_id UInt64`: the id of the parent of a node.
+- `regexp String`: the regular expression string.
+- `keys Array(String)`: the names of user-defined attributes.
+- `values Array(String)`: the values of user-defined attributes.
+
+To create the dictionary in ClickHouse Cloud, first create a table `regexp_dictionary_source_table` with below table structure:
+
+```sql
+CREATE TABLE regexp_dictionary_source_table
+(
+    id UInt64,
+    parent_id UInt64,
+    regexp String,
+    keys   Array(String),
+    values Array(String)
+) ENGINE=Memory;
+```
+
+Then update the local CSV by
+
+```bash
+clickhouse client \
+    --host MY_HOST \
+    --secure \
+    --password MY_PASSWORD \
+    --query "
+    INSERT INTO regexp_dictionary_source_table 
+    SELECT * FROM input ('id UInt64, parent_id UInt64, regexp String, keys Array(String), values Array(String)') 
+    FORMAT CSV" < regexp_dict.csv
+```
+
+You can see how to [Insert Local Files](https://clickhouse.com/docs/en/integrations/data-ingestion/insert-local-files) for more details. After we initialize the source table, we can create a RegexpTree by table source:
+
+``` sql
+CREATE DICTIONARY regexp_dict
+(
+    regexp String,
+    name String,
+    version String
+PRIMARY KEY(regexp)
+SOURCE(CLICKHOUSE(TABLE 'regexp_dictionary_source_table'))
+LIFETIME(0)
+LAYOUT(regexp_tree);
+```
+
+## Embedded Dictionaries {#embedded-dictionaries}
+
+<SelfManaged />
+
+ClickHouse contains a built-in feature for working with a geobase.
+
+This allows you to:
+
+- Use a region’s ID to get its name in the desired language.
+- Use a region’s ID to get the ID of a city, area, federal district, country, or continent.
+- Check whether a region is part of another region.
+- Get a chain of parent regions.
+
+All the functions support “translocality,” the ability to simultaneously use different perspectives on region ownership. For more information, see the section “Functions for working with web analytics dictionaries”.
+
+The internal dictionaries are disabled in the default package.
+To enable them, uncomment the parameters `path_to_regions_hierarchy_file` and `path_to_regions_names_files` in the server configuration file.
+
+The geobase is loaded from text files.
+
+Place the `regions_hierarchy*.txt` files into the `path_to_regions_hierarchy_file` directory. This configuration parameter must contain the path to the `regions_hierarchy.txt` file (the default regional hierarchy), and the other files (`regions_hierarchy_ua.txt`) must be located in the same directory.
+
+Put the `regions_names_*.txt` files in the `path_to_regions_names_files` directory.
+
+You can also create these files yourself. The file format is as follows:
+
+`regions_hierarchy*.txt`: TabSeparated (no header), columns:
+
+- region ID (`UInt32`)
+- parent region ID (`UInt32`)
+- region type (`UInt8`): 1 - continent, 3 - country, 4 - federal district, 5 - region, 6 - city; other types do not have values
+- population (`UInt32`) — optional column
+
+`regions_names_*.txt`: TabSeparated (no header), columns:
+
+- region ID (`UInt32`)
+- region name (`String`) — Can’t contain tabs or line feeds, even escaped ones.
+
+A flat array is used for storing in RAM. For this reason, IDs shouldn’t be more than a million.
+
+Dictionaries can be updated without restarting the server. However, the set of available dictionaries is not updated.
+For updates, the file modification times are checked. If a file has changed, the dictionary is updated.
+The interval to check for changes is configured in the `builtin_dictionaries_reload_interval` parameter.
+Dictionary updates (other than loading at first use) do not block queries. During updates, queries use the old versions of dictionaries. If an error occurs during an update, the error is written to the server log, and queries continue using the old version of dictionaries.
+
+We recommend periodically updating the dictionaries with the geobase. During an update, generate new files and write them to a separate location. When everything is ready, rename them to the files used by the server.
+
+There are also functions for working with OS identifiers and search engines, but they shouldn’t be used.
+
+## Embedded Dictionaries
+
+<SelfManaged />
+
+ClickHouse contains a built-in feature for working with a geobase.
+
+This allows you to:
+
+- Use a region’s ID to get its name in the desired language.
+- Use a region’s ID to get the ID of a city, area, federal district, country, or continent.
+- Check whether a region is part of another region.
+- Get a chain of parent regions.
+
+All the functions support “translocality,” the ability to simultaneously use different perspectives on region ownership. For more information, see the section “Functions for working with web analytics dictionaries”.
+
+The internal dictionaries are disabled in the default package.
+To enable them, uncomment the parameters `path_to_regions_hierarchy_file` and `path_to_regions_names_files` in the server configuration file.
+
+The geobase is loaded from text files.
+
+Place the `regions_hierarchy*.txt` files into the `path_to_regions_hierarchy_file` directory. This configuration parameter must contain the path to the `regions_hierarchy.txt` file (the default regional hierarchy), and the other files (`regions_hierarchy_ua.txt`) must be located in the same directory.
+
+Put the `regions_names_*.txt` files in the `path_to_regions_names_files` directory.
+
+You can also create these files yourself. The file format is as follows:
+
+`regions_hierarchy*.txt`: TabSeparated (no header), columns:
+
+- region ID (`UInt32`)
+- parent region ID (`UInt32`)
+- region type (`UInt8`): 1 - continent, 3 - country, 4 - federal district, 5 - region, 6 - city; other types do not have values
+- population (`UInt32`) — optional column
+
+`regions_names_*.txt`: TabSeparated (no header), columns:
+
+- region ID (`UInt32`)
+- region name (`String`) — Can’t contain tabs or line feeds, even escaped ones.
+
+A flat array is used for storing in RAM. For this reason, IDs shouldn’t be more than a million.
+
+Dictionaries can be updated without restarting the server. However, the set of available dictionaries is not updated.
+For updates, the file modification times are checked. If a file has changed, the dictionary is updated.
+The interval to check for changes is configured in the `builtin_dictionaries_reload_interval` parameter.
+Dictionary updates (other than loading at first use) do not block queries. During updates, queries use the old versions of dictionaries. If an error occurs during an update, the error is written to the server log, and queries continue using the old version of dictionaries.
+
+We recommend periodically updating the dictionaries with the geobase. During an update, generate new files and write them to a separate location. When everything is ready, rename them to the files used by the server.
+
+There are also functions for working with OS identifiers and search engines, but they shouldn’t be used.
diff --git a/docs/en/sql-reference/dictionaries/internal-dicts.md b/docs/en/sql-reference/dictionaries/internal-dicts.md
deleted file mode 100644
index 11c6ee93aa6..00000000000
--- a/docs/en/sql-reference/dictionaries/internal-dicts.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-slug: /en/sql-reference/dictionaries/internal-dicts
-sidebar_position: 39
-sidebar_label: Embedded Dictionaries
----
-import SelfManaged from '@site/docs/en/_snippets/_self_managed_only_no_roadmap.md';
-
-# Embedded Dictionaries
-
-<SelfManaged />
-
-ClickHouse contains a built-in feature for working with a geobase.
-
-This allows you to:
-
--   Use a region’s ID to get its name in the desired language.
--   Use a region’s ID to get the ID of a city, area, federal district, country, or continent.
--   Check whether a region is part of another region.
--   Get a chain of parent regions.
-
-All the functions support “translocality,” the ability to simultaneously use different perspectives on region ownership. For more information, see the section “Functions for working with web analytics dictionaries”.
-
-The internal dictionaries are disabled in the default package.
-To enable them, uncomment the parameters `path_to_regions_hierarchy_file` and `path_to_regions_names_files` in the server configuration file.
-
-The geobase is loaded from text files.
-
-Place the `regions_hierarchy*.txt` files into the `path_to_regions_hierarchy_file` directory. This configuration parameter must contain the path to the `regions_hierarchy.txt` file (the default regional hierarchy), and the other files (`regions_hierarchy_ua.txt`) must be located in the same directory.
-
-Put the `regions_names_*.txt` files in the `path_to_regions_names_files` directory.
-
-You can also create these files yourself. The file format is as follows:
-
-`regions_hierarchy*.txt`: TabSeparated (no header), columns:
-
--   region ID (`UInt32`)
--   parent region ID (`UInt32`)
--   region type (`UInt8`): 1 - continent, 3 - country, 4 - federal district, 5 - region, 6 - city; other types do not have values
--   population (`UInt32`) — optional column
-
-`regions_names_*.txt`: TabSeparated (no header), columns:
-
--   region ID (`UInt32`)
--   region name (`String`) — Can’t contain tabs or line feeds, even escaped ones.
-
-A flat array is used for storing in RAM. For this reason, IDs shouldn’t be more than a million.
-
-Dictionaries can be updated without restarting the server. However, the set of available dictionaries is not updated.
-For updates, the file modification times are checked. If a file has changed, the dictionary is updated.
-The interval to check for changes is configured in the `builtin_dictionaries_reload_interval` parameter.
-Dictionary updates (other than loading at first use) do not block queries. During updates, queries use the old versions of dictionaries. If an error occurs during an update, the error is written to the server log, and queries continue using the old version of dictionaries.
-
-We recommend periodically updating the dictionaries with the geobase. During an update, generate new files and write them to a separate location. When everything is ready, rename them to the files used by the server.
-
-There are also functions for working with OS identifiers and search engines, but they shouldn’t be used.
diff --git a/docs/en/sql-reference/distributed-ddl.md b/docs/en/sql-reference/distributed-ddl.md
index ff5155391be..d170f3765c2 100644
--- a/docs/en/sql-reference/distributed-ddl.md
+++ b/docs/en/sql-reference/distributed-ddl.md
@@ -18,6 +18,6 @@ In order to run these queries correctly, each host must have the same cluster de
 
 The local version of the query will eventually be executed on each host in the cluster, even if some hosts are currently not available.
 
-:::warning    
+:::important    
 The order for executing queries within a single host is guaranteed.
-:::
\ No newline at end of file
+:::
diff --git a/docs/en/sql-reference/functions/arithmetic-functions.md b/docs/en/sql-reference/functions/arithmetic-functions.md
index c5244cf62e3..64fae0e82f0 100644
--- a/docs/en/sql-reference/functions/arithmetic-functions.md
+++ b/docs/en/sql-reference/functions/arithmetic-functions.md
@@ -1,12 +1,14 @@
 ---
 slug: /en/sql-reference/functions/arithmetic-functions
-sidebar_position: 34
+sidebar_position: 5
 sidebar_label: Arithmetic
 ---
 
 # Arithmetic Functions
 
-For all arithmetic functions, the result type is calculated as the smallest number type that the result fits in, if there is such a type. The minimum is taken simultaneously based on the number of bits, whether it is signed, and whether it floats. If there are not enough bits, the highest bit type is taken.
+The result type of all arithmetic functions is the smallest type which can represent all possible results. Size promotion happens for integers up to 32 bit, e.g. `UInt8 + UInt16 = UInt32`. If one of the inters has 64 or more bits, the result is of the same type as the bigger of the input integers, e.g. `UInt16 + UInt128 = UInt128`. While this introduces a risk of overflows around the value range boundary, it ensures that calculations are performed quickly using the maximum native integer width of 64 bit.
+
+The result of addition or multiplication of two integers is unsigned unless one of the integers is signed.
 
 Example:
 
@@ -20,39 +22,78 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
 └───────────────┴────────────────────────┴─────────────────────────────────┴──────────────────────────────────────────┘
 ```
 
-Arithmetic functions work for any pair of types from UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, or Float64.
+Arithmetic functions work for any pair of `UInt8`, `UInt16`, `UInt32`, `UInt64`, `Int8`, `Int16`, `Int32`, `Int64`, `Float32`, or `Float64` values.
 
-Overflow is produced the same way as in C++.
+Overflows are produced the same way as in C++.
 
-## plus(a, b), a + b operator
+## plus
 
-Calculates the sum of the numbers.
-You can also add integer numbers with a date or date and time. In the case of a date, adding an integer means adding the corresponding number of days. For a date with time, it means adding the corresponding number of seconds.
+Calculates the sum of two values `a` and `b`.
 
-## minus(a, b), a - b operator
+**Syntax**
 
-Calculates the difference. The result is always signed.
+```sql
+plus(a, b)
+```
 
-You can also calculate integer numbers from a date or date with time. The idea is the same – see above for ‘plus’.
+It is possible to add an integer and a date or date with time. The former operation increments the number of days in the date, the latter operation increments the number of seconds in the date with time.
 
-## multiply(a, b), a \* b operator
+Alias: `a + b` (operator)
 
-Calculates the product of the numbers.
+## minus
 
-## divide(a, b), a / b operator
+Calculates the difference of two values `a` and `b`. The result is always signed.
 
-Calculates the quotient of the numbers. The result type is always a floating-point type.
-It is not integer division. For integer division, use the ‘intDiv’ function.
-When dividing by zero you get ‘inf’, ‘-inf’, or ‘nan’.
+Similar to `plus`, it is possible to subtract an integer from a date or date with time.
 
-## intDiv(a, b)
+**Syntax**
 
-Calculates the quotient of the numbers. Divides into integers, rounding down (by the absolute value).
+```sql
+minus(a, b)
+```
 
-Returns an integer of the type of the dividend (the first parameter).
+Alias: `a - b` (operator)
+
+## multiply
+
+Calculates the product of two values `a` and `b`.
+
+**Syntax**
+
+```sql
+multiply(a, b)
+```
+
+Alias: `a \* b` (operator)
+
+## divide
+
+Calculates the quotient of two values `a` and `b`. The result is always a floating-point value. If you need integer division, you can use the `intDiv` function.
+
+Division by 0 returns `inf`, `-inf`, or `nan`.
+
+**Syntax**
+
+```sql
+divide(a, b)
+```
+
+Alias: `a / b` (operator)
+
+## intDiv
+
+Performs an integer division of two values `a` by `b`, i.e. computes the quotient rounded down to the next smallest integer.
+
+The result has the same type as the dividend (the first parameter).
 
 An exception is thrown when dividing by zero, when the quotient does not fit in the range of the dividend, or when dividing a minimal negative number by minus one.
 
+**Syntax**
+
+```sql
+intDiv(a, b)
+```
+
 **Example**
 
 Query:
@@ -62,6 +103,7 @@ SELECT
     intDiv(toFloat64(1), 0.001) AS res,
     toTypeName(res)
 ```
+
 ```response
 ┌──res─┬─toTypeName(intDiv(toFloat64(1), 0.001))─┐
 │ 1000 │ Int64                                   │
@@ -73,30 +115,65 @@ SELECT
     intDiv(1, 0.001) AS res,
     toTypeName(res)
 ```
+
 ```response
 Received exception from server (version 23.2.1):
 Code: 153. DB::Exception: Received from localhost:9000. DB::Exception: Cannot perform integer division, because it will produce infinite or too large number: While processing intDiv(1, 0.001) AS res, toTypeName(res). (ILLEGAL_DIVISION)
 ```
 
-## intDivOrZero(a, b)
+## intDivOrZero
 
-Differs from ‘intDiv’ in that it returns zero when dividing by zero or when dividing a minimal negative number by minus one.
+Same as `intDiv` but returns zero when dividing by zero or when dividing a minimal negative number by minus one.
 
-## modulo(a, b), a % b operator
+**Syntax**
+
+```sql
+intDivOrZero(a, b)
+```
+
+## modulo
+
+Calculates the remainder of the division of two values `a` by `b`.
 
-Calculates the remainder when dividing `a` by `b`.
 The result type is an integer if both inputs are integers. If one of the inputs is a floating-point number, the result is a floating-point number.
+
 The remainder is computed like in C++. Truncated division is used for negative numbers.
+
 An exception is thrown when dividing by zero or when dividing a minimal negative number by minus one.
 
-## moduloOrZero(a, b)
+**Syntax**
 
-Differs from [modulo](#modulo) in that it returns zero when the divisor is zero.
+```sql
+modulo(a, b)
+```
 
-## positiveModulo(a, b), positive_modulo(a, b), pmod(a, b)
-Calculates the remainder when dividing `a` by `b`. Similar to the function `modulo` except that `positive_modulo` always returns a non-negative number.
+Alias: `a % b` (operator)
 
-Notice that `positive_modulo` is 4-5 times slower than `modulo`. You should not use `positive_modulo` unless you want to get a positive result and don't care about performance too much.
+## moduloOrZero
+
+Like [modulo](#modulo) but returns zero when the divisor is zero.
+
+**Syntax**
+
+```sql
+moduloOrZero(a, b)
+```
+
+## positiveModulo(a, b)
+
+Like [modulo](#modulo) but always returns a non-negative number.
+
+This function is 4-5 times slower than `modulo`.
+
+**Syntax**
+
+```sql
+positiveModulo(a, b)
+```
+
+Alias:
+- `positive_modulo(a, b)`
+- `pmod(a, b)`
 
 **Example**
 
@@ -108,51 +185,67 @@ SELECT positiveModulo(-1, 10)
 
 Result:
 
-```text
-
+```result
 ┌─positiveModulo(-1, 10)─┐
 │                      9 │
 └────────────────────────┘
 ```
 
-## negate(a), -a operator
+## negate
 
-Calculates a number with the reverse sign. The result is always signed.
-
-## abs(a)
-
-Calculates the absolute value of the number (a). That is, if a \< 0, it returns -a. For unsigned types it does not do anything. For signed integer types, it returns an unsigned number.
-
-## gcd(a, b)
-
-Returns the greatest common divisor of the numbers.
-An exception is thrown when dividing by zero or when dividing a minimal negative number by minus one.
-
-## lcm(a, b)
-
-Returns the least common multiple of the numbers.
-An exception is thrown when dividing by zero or when dividing a minimal negative number by minus one.
-
-## max2
-
-Compares two values and returns the maximum. The returned value is converted to [Float64](../../sql-reference/data-types/float.md).
+Negates a value `a`. The result is always signed.
 
 **Syntax**
 
 ```sql
-max2(value1, value2)
+negate(a)
 ```
 
-**Arguments**
+Alias: `-a`
 
--   `value1` — First value. [Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
--   `value2` — Second value. [Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+## abs
 
-**Returned value**
+Calculates the absolute value of `a`. Has no effect if `a` is of an unsigned type. If `a` is of a signed type, it returns an unsigned number.
 
--   The maximum of two values.
+**Syntax**
 
-Type: [Float](../../sql-reference/data-types/float.md).
+```sql
+abs(a)
+```
+
+## gcd
+
+Returns the greatest common divisor of two values `a` and `b`.
+
+An exception is thrown when dividing by zero or when dividing a minimal negative number by minus one.
+
+**Syntax**
+
+```sql
+gcd(a, b)
+```
+
+## lcm(a, b)
+
+Returns the least common multiple of two values `a` and `b`.
+
+An exception is thrown when dividing by zero or when dividing a minimal negative number by minus one.
+
+**Syntax**
+
+```sql
+lcm(a, b)
+```
+
+## max2
+
+Returns the bigger of two values `a` and `b`. The returned value is of type [Float64](../../sql-reference/data-types/float.md).
+
+**Syntax**
+
+```sql
+max2(a, b)
+```
 
 **Example**
 
@@ -164,7 +257,7 @@ SELECT max2(-1, 2);
 
 Result:
 
-```text
+```result
 ┌─max2(-1, 2)─┐
 │           2 │
 └─────────────┘
@@ -172,25 +265,14 @@ Result:
 
 ## min2
 
-Compares two values and returns the minimum. The returned value is converted to [Float64](../../sql-reference/data-types/float.md).
+Returns the smaller of two values `a` and `b`. The returned value is of type [Float64](../../sql-reference/data-types/float.md).
 
 **Syntax**
 
 ```sql
-min2(value1, value2)
+min2(a, b)
 ```
 
-**Arguments**
-
--   `value1` — First value. [Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
--   `value2` — Second value. [Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
-
-**Returned value**
-
--   The minimum of two values.
-
-Type: [Float](../../sql-reference/data-types/float.md).
-
 **Example**
 
 Query:
@@ -201,21 +283,19 @@ SELECT min2(-1, 2);
 
 Result:
 
-```text
+```result
 ┌─min2(-1, 2)─┐
 │          -1 │
 └─────────────┘
 ```
 
-## multiplyDecimal(a, b[, result_scale])
+## multiplyDecimal
 
-Performs multiplication on two decimals. Result value will be of type [Decimal256](../../sql-reference/data-types/decimal.md).
-Result scale can be explicitly specified by `result_scale` argument (const Integer in range `[0, 76]`). If not specified, the result scale is the max scale of given arguments.
+Multiplies two decimals `a` and `b`. The result value will be of type [Decimal256](../../sql-reference/data-types/decimal.md).
 
-:::note    
-These functions work significantly slower than usual `multiply`.
-In case you don't really need controlled precision and/or need fast computation, consider using [multiply](#multiply)
-:::
+The scale of the result can be explicitly specified by `result_scale`. If `result_scale` is not specified, it is assumed to be the maximum scale of the input values.
+
+This function work significantly slower than usual `multiply`. In case no control over the result precision is needed and/or fast computation is desired, consider using `multiply`.
 
 **Syntax**
 
@@ -225,31 +305,34 @@ multiplyDecimal(a, b[, result_scale])
 
 **Arguments**
 
--   `a` — First value: [Decimal](../../sql-reference/data-types/decimal.md).
--   `b` — Second value: [Decimal](../../sql-reference/data-types/decimal.md).
--   `result_scale` — Scale of result: [Int/UInt](../../sql-reference/data-types/int-uint.md).
+- `a` — First value: [Decimal](../../sql-reference/data-types/decimal.md).
+- `b` — Second value: [Decimal](../../sql-reference/data-types/decimal.md).
+- `result_scale` — Scale of result: [Int/UInt](../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   The result of multiplication with given scale.
+- The result of multiplication with given scale.
 
 Type: [Decimal256](../../sql-reference/data-types/decimal.md).
 
 **Example**
 
-```text
+```result
 ┌─multiplyDecimal(toDecimal256(-12, 0), toDecimal32(-2.1, 1), 1)─┐
 │                                                           25.2 │
 └────────────────────────────────────────────────────────────────┘
 ```
 
-**Difference from regular multiplication:**
+**Differences compared to regular multiplication:**
+
 ```sql
 SELECT toDecimal64(-12.647, 3) * toDecimal32(2.1239, 4);
 SELECT toDecimal64(-12.647, 3) as a, toDecimal32(2.1239, 4) as b, multiplyDecimal(a, b);
 ```
 
-```text
+Result:
+
+```result
 ┌─multiply(toDecimal64(-12.647, 3), toDecimal32(2.1239, 4))─┐
 │                                               -26.8609633 │
 └───────────────────────────────────────────────────────────┘
@@ -270,7 +353,9 @@ SELECT
     a * b;
 ```
 
-```text
+Result:
+
+```result
 ┌─────────────a─┬─────────────b─┬─multiplyDecimal(toDecimal64(-12.647987876, 9), toDecimal64(123.967645643, 9))─┐
 │ -12.647987876 │ 123.967645643 │                                                               -1567.941279108 │
 └───────────────┴───────────────┴───────────────────────────────────────────────────────────────────────────────┘
@@ -279,15 +364,14 @@ Received exception from server (version 22.11.1):
 Code: 407. DB::Exception: Received from localhost:9000. DB::Exception: Decimal math overflow: While processing toDecimal64(-12.647987876, 9) AS a, toDecimal64(123.967645643, 9) AS b, a * b. (DECIMAL_OVERFLOW)
 ```
 
-## divideDecimal(a, b[, result_scale])
+## divideDecimal
 
-Performs division on two decimals. Result value will be of type [Decimal256](../../sql-reference/data-types/decimal.md).
-Result scale can be explicitly specified by `result_scale` argument (const Integer in range `[0, 76]`). If not specified, the result scale is the max scale of given arguments.
 
-:::note    
-These function work significantly slower than usual `divide`.
-In case you don't really need controlled precision and/or need fast computation, consider using [divide](#divide).
-:::
+Divides two decimals `a` and `b`. The result value will be of type [Decimal256](../../sql-reference/data-types/decimal.md).
+
+The scale of the result can be explicitly specified by `result_scale`. If `result_scale` is not specified, it is assumed to be the maximum scale of the input values.
+
+This function work significantly slower than usual `divide`. In case no control over the result precision is needed and/or fast computation is desired, consider using `divide`.
 
 **Syntax**
 
@@ -297,31 +381,34 @@ divideDecimal(a, b[, result_scale])
 
 **Arguments**
 
--   `a` — First value: [Decimal](../../sql-reference/data-types/decimal.md).
--   `b` — Second value: [Decimal](../../sql-reference/data-types/decimal.md).
--   `result_scale` — Scale of result: [Int/UInt](../../sql-reference/data-types/int-uint.md).
+- `a` — First value: [Decimal](../../sql-reference/data-types/decimal.md).
+- `b` — Second value: [Decimal](../../sql-reference/data-types/decimal.md).
+- `result_scale` — Scale of result: [Int/UInt](../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   The result of division with given scale.
+- The result of division with given scale.
 
 Type: [Decimal256](../../sql-reference/data-types/decimal.md).
 
 **Example**
 
-```text
+```result
 ┌─divideDecimal(toDecimal256(-12, 0), toDecimal32(2.1, 1), 10)─┐
 │                                                -5.7142857142 │
 └──────────────────────────────────────────────────────────────┘
 ```
 
-**Difference from regular division:**
+**Differences compared to regular division:**
+
 ```sql
 SELECT toDecimal64(-12, 1) / toDecimal32(2.1, 1);
 SELECT toDecimal64(-12, 1) as a, toDecimal32(2.1, 1) as b, divideDecimal(a, b, 1), divideDecimal(a, b, 5);
 ```
 
-```text
+Result:
+
+```result
 ┌─divide(toDecimal64(-12, 1), toDecimal32(2.1, 1))─┐
 │                                             -5.7 │
 └──────────────────────────────────────────────────┘
@@ -336,7 +423,9 @@ SELECT toDecimal64(-12, 0) / toDecimal32(2.1, 1);
 SELECT toDecimal64(-12, 0) as a, toDecimal32(2.1, 1) as b, divideDecimal(a, b, 1), divideDecimal(a, b, 5);
 ```
 
-```text
+Result:
+
+```result
 DB::Exception: Decimal result's scale is less than argument's one: While processing toDecimal64(-12, 0) / toDecimal32(2.1, 1). (ARGUMENT_OUT_OF_BOUND)
 
 ┌───a─┬───b─┬─divideDecimal(toDecimal64(-12, 0), toDecimal32(2.1, 1), 1)─┬─divideDecimal(toDecimal64(-12, 0), toDecimal32(2.1, 1), 5)─┐
diff --git a/docs/en/sql-reference/functions/array-functions.md b/docs/en/sql-reference/functions/array-functions.md
index 9d2f89c1837..3e70f94a0d2 100644
--- a/docs/en/sql-reference/functions/array-functions.md
+++ b/docs/en/sql-reference/functions/array-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/array-functions
-sidebar_position: 35
+sidebar_position: 10
 sidebar_label: Arrays
 ---
 
@@ -18,7 +18,7 @@ empty([x])
 
 An array is considered empty if it does not contain any elements.
 
-:::note    
+:::note
 Can be optimized by enabling the [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns) setting. With `optimize_functions_to_subcolumns = 1` the function reads only [size0](../../sql-reference/data-types/array.md#array-size) subcolumn instead of reading and processing the whole array column. The query `SELECT empty(arr) FROM TABLE;` transforms to `SELECT arr.size0 = 0 FROM TABLE;`.
 :::
 
@@ -26,11 +26,11 @@ The function also works for [strings](string-functions.md#empty) or [UUID](uuid-
 
 **Arguments**
 
--   `[x]` — Input array. [Array](../data-types/array.md).
+- `[x]` — Input array. [Array](../data-types/array.md).
 
 **Returned value**
 
--   Returns `1` for an empty array or `0` for a non-empty array.
+- Returns `1` for an empty array or `0` for a non-empty array.
 
 Type: [UInt8](../data-types/int-uint.md).
 
@@ -62,7 +62,7 @@ notEmpty([x])
 
 An array is considered non-empty if it contains at least one element.
 
-:::note    
+:::note
 Can be optimized by enabling the [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns) setting. With `optimize_functions_to_subcolumns = 1` the function reads only [size0](../../sql-reference/data-types/array.md#array-size) subcolumn instead of reading and processing the whole array column. The query `SELECT notEmpty(arr) FROM table` transforms to `SELECT arr.size0 != 0 FROM TABLE`.
 :::
 
@@ -70,11 +70,11 @@ The function also works for [strings](string-functions.md#notempty) or [UUID](uu
 
 **Arguments**
 
--   `[x]` — Input array. [Array](../data-types/array.md).
+- `[x]` — Input array. [Array](../data-types/array.md).
 
 **Returned value**
 
--   Returns `1` for a non-empty array or `0` for an empty array.
+- Returns `1` for a non-empty array or `0` for an empty array.
 
 Type: [UInt8](../data-types/int-uint.md).
 
@@ -118,38 +118,41 @@ Accepts zero arguments and returns an empty array of the appropriate type.
 
 Accepts an empty array and returns a one-element array that is equal to the default value.
 
-
 ## range(end), range(\[start, \] end \[, step\])
 
 Returns an array of numbers from `start` to `end - 1` by `step`. The supported types are [UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64](../data-types/int-uint.md).
 
 **Syntax**
+
 ``` sql
 range([start, ] end [, step])
 ```
 
 **Arguments**
 
--   `start` — The first element of the array. Optional, required if `step` is used. Default value: 0.
--   `end` — The number before which the array is constructed. Required.
--   `step` — Determines the incremental step between each element in the array. Optional. Default value: 1.
+- `start` — The first element of the array. Optional, required if `step` is used. Default value: 0.
+- `end` — The number before which the array is constructed. Required.
+- `step` — Determines the incremental step between each element in the array. Optional. Default value: 1.
 
 **Returned value**
 
--   Array of numbers from `start` to `end - 1` by `step`.
+- Array of numbers from `start` to `end - 1` by `step`.
 
 **Implementation details**
 
--   All arguments `start`, `end`, `step` must be below data types: `UInt8`, `UInt16`, `UInt32`, `UInt64`,`Int8`, `Int16`, `Int32`, `Int64`, as well as elements of the returned array, which's type is a super type of all arguments's.
--   An exception is thrown if query results in arrays with a total length of more than number of elements specified by the [function_range_max_elements_in_block](../../operations/settings/settings.md#settings-function_range_max_elements_in_block) setting.
+- All arguments `start`, `end`, `step` must be below data types: `UInt8`, `UInt16`, `UInt32`, `UInt64`,`Int8`, `Int16`, `Int32`, `Int64`, as well as elements of the returned array, which's type is a super type of all arguments's.
+- An exception is thrown if query results in arrays with a total length of more than number of elements specified by the [function_range_max_elements_in_block](../../operations/settings/settings.md#settings-function_range_max_elements_in_block) setting.
 
 **Examples**
 
 Query:
+
 ``` sql
 SELECT range(5), range(1, 5), range(1, 5, 2), range(-1, 5, 2);
 ```
+
 Result:
+
 ```txt
 ┌─range(5)────┬─range(1, 5)─┬─range(1, 5, 2)─┬─range(-1, 5, 2)─┐
 │ [0,1,2,3,4] │ [1,2,3,4]   │ [1,3]          │ [-1,1,3]        │
@@ -176,7 +179,7 @@ arrayConcat(arrays)
 
 **Arguments**
 
--   `arrays` – Arbitrary number of arguments of [Array](../../sql-reference/data-types/array.md) type.
+- `arrays` – Arbitrary number of arguments of [Array](../../sql-reference/data-types/array.md) type.
     **Example**
 
 <!-- -->
@@ -226,19 +229,19 @@ hasAll(set, subset)
 
 **Arguments**
 
--   `set` – Array of any type with a set of elements.
--   `subset` – Array of any type with elements that should be tested to be a subset of `set`.
+- `set` – Array of any type with a set of elements.
+- `subset` – Array of any type with elements that should be tested to be a subset of `set`.
 
 **Return values**
 
--   `1`, if `set` contains all of the elements from `subset`.
--   `0`, otherwise.
+- `1`, if `set` contains all of the elements from `subset`.
+- `0`, otherwise.
 
 **Peculiar properties**
 
--   An empty array is a subset of any array.
--   `Null` processed as a value.
--   Order of values in both of arrays does not matter.
+- An empty array is a subset of any array.
+- `Null` processed as a value.
+- Order of values in both of arrays does not matter.
 
 **Examples**
 
@@ -264,18 +267,18 @@ hasAny(array1, array2)
 
 **Arguments**
 
--   `array1` – Array of any type with a set of elements.
--   `array2` – Array of any type with a set of elements.
+- `array1` – Array of any type with a set of elements.
+- `array2` – Array of any type with a set of elements.
 
 **Return values**
 
--   `1`, if `array1` and `array2` have one similar element at least.
--   `0`, otherwise.
+- `1`, if `array1` and `array2` have one similar element at least.
+- `0`, otherwise.
 
 **Peculiar properties**
 
--   `Null` processed as a value.
--   Order of values in both of arrays does not matter.
+- `Null` processed as a value.
+- Order of values in both of arrays does not matter.
 
 **Examples**
 
@@ -301,24 +304,25 @@ In other words, the functions will check whether all the elements of `array2` ar
 the `hasAll` function. In addition, it will check that the elements are observed in the same order in both `array1` and `array2`.
 
 For Example:
+
 - `hasSubstr([1,2,3,4], [2,3])` returns 1. However, `hasSubstr([1,2,3,4], [3,2])` will return `0`.
 - `hasSubstr([1,2,3,4], [1,2,3])` returns 1. However, `hasSubstr([1,2,3,4], [1,2,4])` will return `0`.
 
 **Arguments**
 
--   `array1` – Array of any type with a set of elements.
--   `array2` – Array of any type with a set of elements.
+- `array1` – Array of any type with a set of elements.
+- `array2` – Array of any type with a set of elements.
 
 **Return values**
 
--   `1`, if `array1` contains `array2`.
--   `0`, otherwise.
+- `1`, if `array1` contains `array2`.
+- `0`, otherwise.
 
 **Peculiar properties**
 
--   The function will return `1` if `array2` is empty.
--   `Null` processed as a value. In other words `hasSubstr([1, 2, NULL, 3, 4], [2,3])` will return `0`. However, `hasSubstr([1, 2, NULL, 3, 4], [2,NULL,3])` will return `1`
--   Order of values in both of arrays does matter.
+- The function will return `1` if `array2` is empty.
+- `Null` processed as a value. In other words `hasSubstr([1, 2, NULL, 3, 4], [2,3])` will return `0`. However, `hasSubstr([1, 2, NULL, 3, 4], [2,NULL,3])` will return `1`
+- Order of values in both of arrays does matter.
 
 **Examples**
 
@@ -484,7 +488,7 @@ arrayPopBack(array)
 
 **Arguments**
 
--   `array` – Array.
+- `array` – Array.
 
 **Example**
 
@@ -508,7 +512,7 @@ arrayPopFront(array)
 
 **Arguments**
 
--   `array` – Array.
+- `array` – Array.
 
 **Example**
 
@@ -532,8 +536,8 @@ arrayPushBack(array, single_value)
 
 **Arguments**
 
--   `array` – Array.
--   `single_value` – A single value. Only numbers can be added to an array with numbers, and only strings can be added to an array of strings. When adding numbers, ClickHouse automatically sets the `single_value` type for the data type of the array. For more information about the types of data in ClickHouse, see “[Data types](../../sql-reference/data-types/index.md#data_types)”. Can be `NULL`. The function adds a `NULL` element to an array, and the type of array elements converts to `Nullable`.
+- `array` – Array.
+- `single_value` – A single value. Only numbers can be added to an array with numbers, and only strings can be added to an array of strings. When adding numbers, ClickHouse automatically sets the `single_value` type for the data type of the array. For more information about the types of data in ClickHouse, see “[Data types](../../sql-reference/data-types/index.md#data_types)”. Can be `NULL`. The function adds a `NULL` element to an array, and the type of array elements converts to `Nullable`.
 
 **Example**
 
@@ -557,8 +561,8 @@ arrayPushFront(array, single_value)
 
 **Arguments**
 
--   `array` – Array.
--   `single_value` – A single value. Only numbers can be added to an array with numbers, and only strings can be added to an array of strings. When adding numbers, ClickHouse automatically sets the `single_value` type for the data type of the array. For more information about the types of data in ClickHouse, see “[Data types](../../sql-reference/data-types/index.md#data_types)”. Can be `NULL`. The function adds a `NULL` element to an array, and the type of array elements converts to `Nullable`.
+- `array` – Array.
+- `single_value` – A single value. Only numbers can be added to an array with numbers, and only strings can be added to an array of strings. When adding numbers, ClickHouse automatically sets the `single_value` type for the data type of the array. For more information about the types of data in ClickHouse, see “[Data types](../../sql-reference/data-types/index.md#data_types)”. Can be `NULL`. The function adds a `NULL` element to an array, and the type of array elements converts to `Nullable`.
 
 **Example**
 
@@ -582,11 +586,11 @@ arrayResize(array, size[, extender])
 
 **Arguments:**
 
--   `array` — Array.
--   `size` — Required length of the array.
-    -   If `size` is less than the original size of the array, the array is truncated from the right.
--   If `size` is larger than the initial size of the array, the array is extended to the right with `extender` values or default values for the data type of the array items.
--   `extender` — Value for extending an array. Can be `NULL`.
+- `array` — Array.
+- `size` — Required length of the array.
+  - If `size` is less than the original size of the array, the array is truncated from the right.
+- If `size` is larger than the initial size of the array, the array is extended to the right with `extender` values or default values for the data type of the array items.
+- `extender` — Value for extending an array. Can be `NULL`.
 
 **Returned value:**
 
@@ -642,7 +646,7 @@ SELECT arraySlice([1, 2, NULL, 4, 5], 2, 3) AS res;
 
 Array elements set to `NULL` are handled as normal values.
 
-## arraySort(\[func,\] arr, …)
+## arraySort(\[func,\] arr, …) {#array_functions-sort}
 
 Sorts the elements of the `arr` array in ascending order. If the `func` function is specified, sorting order is determined by the result of the `func` function applied to the elements of the array. If `func` accepts multiple arguments, the `arraySort` function is passed several arrays that the arguments of `func` will correspond to. Detailed examples are shown at the end of `arraySort` description.
 
@@ -682,10 +686,10 @@ SELECT arraySort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf]);
 └───────────────────────────────────────────────────────────┘
 ```
 
--   `-Inf` values are first in the array.
--   `NULL` values are last in the array.
--   `NaN` values are right before `NULL`.
--   `Inf` values are right before `NaN`.
+- `-Inf` values are first in the array.
+- `NULL` values are last in the array.
+- `NaN` values are right before `NULL`.
+- `Inf` values are right before `NaN`.
 
 Note that `arraySort` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You can pass a lambda function to it as the first argument. In this case, sorting order is determined by the result of the lambda function applied to the elements of the array.
 
@@ -739,11 +743,15 @@ SELECT arraySort((x, y) -> -y, [0, 1, 2], [1, 2, 3]) as res;
 └─────────┘
 ```
 
-:::note    
+:::note
 To improve sorting efficiency, the [Schwartzian transform](https://en.wikipedia.org/wiki/Schwartzian_transform) is used.
 :::
 
-## arrayReverseSort(\[func,\] arr, …)
+## arrayPartialSort(\[func,\] limit, arr, …)
+
+Same as `arraySort` with additional `limit` argument allowing partial sorting. Returns an array of the same size as the original array where elements in range `[1..limit]` are sorted in ascending order. Remaining elements `(limit..N]` shall contain elements in unspecified order.
+
+## arrayReverseSort(\[func,\] arr, …) {#array_functions-reverse-sort}
 
 Sorts the elements of the `arr` array in descending order. If the `func` function is specified, `arr` is sorted according to the result of the `func` function applied to the elements of the array, and then the sorted array is reversed. If `func` accepts multiple arguments, the `arrayReverseSort` function is passed several arrays that the arguments of `func` will correspond to. Detailed examples are shown at the end of `arrayReverseSort` description.
 
@@ -783,10 +791,10 @@ SELECT arrayReverseSort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf]) as res;
 └───────────────────────────────────────┘
 ```
 
--   `Inf` values are first in the array.
--   `NULL` values are last in the array.
--   `NaN` values are right before `NULL`.
--   `-Inf` values are right before `NaN`.
+- `Inf` values are first in the array.
+- `NULL` values are last in the array.
+- `NaN` values are right before `NULL`.
+- `-Inf` values are right before `NaN`.
 
 Note that the `arrayReverseSort` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You can pass a lambda function to it as the first argument. Example is shown below.
 
@@ -802,8 +810,8 @@ SELECT arrayReverseSort((x) -> -x, [1, 2, 3]) as res;
 
 The array is sorted in the following way:
 
-1.  At first, the source array (\[1, 2, 3\]) is sorted according to the result of the lambda function applied to the elements of the array. The result is an array \[3, 2, 1\].
-2.  Array that is obtained on the previous step, is reversed. So, the final result is \[1, 2, 3\].
+1. At first, the source array (\[1, 2, 3\]) is sorted according to the result of the lambda function applied to the elements of the array. The result is an array \[3, 2, 1\].
+2. Array that is obtained on the previous step, is reversed. So, the final result is \[1, 2, 3\].
 
 The lambda function can accept multiple arguments. In this case, you need to pass the `arrayReverseSort` function several arrays of identical length that the arguments of lambda function will correspond to. The resulting array will consist of elements from the first input array; elements from the next input array(s) specify the sorting keys. For example:
 
@@ -819,8 +827,8 @@ SELECT arrayReverseSort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
 
 In this example, the array is sorted in the following way:
 
-1.  At first, the source array (\[‘hello’, ‘world’\]) is sorted according to the result of the lambda function applied to the elements of the arrays. The elements that are passed in the second array (\[2, 1\]), define the sorting keys for corresponding elements from the source array. The result is an array \[‘world’, ‘hello’\].
-2.  Array that was sorted on the previous step, is reversed. So, the final result is \[‘hello’, ‘world’\].
+1. At first, the source array (\[‘hello’, ‘world’\]) is sorted according to the result of the lambda function applied to the elements of the arrays. The elements that are passed in the second array (\[2, 1\]), define the sorting keys for corresponding elements from the source array. The result is an array \[‘world’, ‘hello’\].
+2. Array that was sorted on the previous step, is reversed. So, the final result is \[‘hello’, ‘world’\].
 
 Other examples are shown below.
 
@@ -844,6 +852,10 @@ SELECT arrayReverseSort((x, y) -> -y, [4, 3, 5], [1, 2, 3]) AS res;
 └─────────┘
 ```
 
+## arrayPartialReverseSort(\[func,\] limit, arr, …)
+
+Same as `arrayReverseSort` with additional `limit` argument allowing partial sorting. Returns an array of the same size as the original array where elements in range `[1..limit]` are sorted in descending order. Remaining elements `(limit..N]` shall contain elements in unspecified order.
+
 ## arrayUniq(arr, …)
 
 If one argument is passed, it counts the number of different elements in the array.
@@ -857,7 +869,7 @@ A special function. See the section [“ArrayJoin function”](../../sql-referen
 
 ## arrayDifference
 
-Calculates the difference between adjacent array elements. Returns an array where the first element will be 0, the second is the difference between `a[1] - a[0]`, etc. The type of elements in the resulting array is determined by the type inference rules for subtraction (e.g. `UInt8` - `UInt8` = `Int16`).
+Calculates an array of differences between adjacent array elements. The first element of the result array will be 0, the second `a[1] - a[0]`, the third `a[2] - a[1]`, etc. The type of elements in the result array is determined by the type inference rules for subtraction (e.g. `UInt8` - `UInt8` = `Int16`).
 
 **Syntax**
 
@@ -867,11 +879,11 @@ arrayDifference(array)
 
 **Arguments**
 
--   `array` – [Array](https://clickhouse.com/docs/en/data_types/array/).
+- `array` – [Array](https://clickhouse.com/docs/en/data_types/array/).
 
 **Returned values**
 
-Returns an array of differences between adjacent elements.
+Returns an array of differences between adjacent array elements.
 
 Type: [UInt\*](https://clickhouse.com/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.com/docs/en/data_types/int_uint/#int-ranges), [Float\*](https://clickhouse.com/docs/en/data_types/float/).
 
@@ -919,7 +931,7 @@ arrayDistinct(array)
 
 **Arguments**
 
--   `array` – [Array](https://clickhouse.com/docs/en/data_types/array/).
+- `array` – [Array](https://clickhouse.com/docs/en/data_types/array/).
 
 **Returned values**
 
@@ -987,8 +999,8 @@ arrayReduce(agg_func, arr1, arr2, ..., arrN)
 
 **Arguments**
 
--   `agg_func` — The name of an aggregate function which should be a constant [string](../../sql-reference/data-types/string.md).
--   `arr` — Any number of [array](../../sql-reference/data-types/array.md) type columns as the parameters of the aggregation function.
+- `agg_func` — The name of an aggregate function which should be a constant [string](../../sql-reference/data-types/string.md).
+- `arr` — Any number of [array](../../sql-reference/data-types/array.md) type columns as the parameters of the aggregation function.
 
 **Returned value**
 
@@ -1052,13 +1064,13 @@ arrayReduceInRanges(agg_func, ranges, arr1, arr2, ..., arrN)
 
 **Arguments**
 
--   `agg_func` — The name of an aggregate function which should be a constant [string](../../sql-reference/data-types/string.md).
--   `ranges` — The ranges to aggretate which should be an [array](../../sql-reference/data-types/array.md) of [tuples](../../sql-reference/data-types/tuple.md) which containing the index and the length of each range.
--   `arr` — Any number of [Array](../../sql-reference/data-types/array.md) type columns as the parameters of the aggregation function.
+- `agg_func` — The name of an aggregate function which should be a constant [string](../../sql-reference/data-types/string.md).
+- `ranges` — The ranges to aggretate which should be an [array](../../sql-reference/data-types/array.md) of [tuples](../../sql-reference/data-types/tuple.md) which containing the index and the length of each range.
+- `arr` — Any number of [Array](../../sql-reference/data-types/array.md) type columns as the parameters of the aggregation function.
 
 **Returned value**
 
--   Array containing results of the aggregate function over specified ranges.
+- Array containing results of the aggregate function over specified ranges.
 
 Type: [Array](../../sql-reference/data-types/array.md).
 
@@ -1108,8 +1120,8 @@ Converts an array of arrays to a flat array.
 
 Function:
 
--   Applies to any depth of nested arrays.
--   Does not change arrays that are already flat.
+- Applies to any depth of nested arrays.
+- Does not change arrays that are already flat.
 
 The flattened array contains all the elements from all source arrays.
 
@@ -1123,7 +1135,7 @@ Alias: `flatten`.
 
 **Arguments**
 
--   `array_of_arrays` — [Array](../../sql-reference/data-types/array.md) of arrays. For example, `[[1,2,3], [4,5]]`.
+- `array_of_arrays` — [Array](../../sql-reference/data-types/array.md) of arrays. For example, `[[1,2,3], [4,5]]`.
 
 **Examples**
 
@@ -1185,13 +1197,13 @@ arrayZip(arr1, arr2, ..., arrN)
 
 **Arguments**
 
--   `arrN` — [Array](../../sql-reference/data-types/array.md).
+- `arrN` — [Array](../../sql-reference/data-types/array.md).
 
 The function can take any number of arrays of different types. All the input arrays must be of equal size.
 
 **Returned value**
 
--   Array with elements from the source arrays grouped into [tuples](../../sql-reference/data-types/tuple.md). Data types in the tuple are the same as types of the input arrays and in the same order as arrays are passed.
+- Array with elements from the source arrays grouped into [tuples](../../sql-reference/data-types/tuple.md). Data types in the tuple are the same as types of the input arrays and in the same order as arrays are passed.
 
 Type: [Array](../../sql-reference/data-types/array.md).
 
@@ -1213,7 +1225,7 @@ Result:
 
 ## arrayAUC
 
-Calculate AUC (Area Under the Curve, which is a concept in machine learning, see more details: https://en.wikipedia.org/wiki/Receiver_operating_characteristic#Area_under_the_curve).
+Calculate AUC (Area Under the Curve, which is a concept in machine learning, see more details: <https://en.wikipedia.org/wiki/Receiver_operating_characteristic#Area_under_the_curve>).
 
 **Syntax**
 
@@ -1433,12 +1445,12 @@ arrayMin([func,] arr)
 
 **Arguments**
 
--   `func` — Function. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
--   `arr` — Array. [Array](../../sql-reference/data-types/array.md).
+- `func` — Function. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
+- `arr` — Array. [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   The minimum of function values (or the array minimum).
+- The minimum of function values (or the array minimum).
 
 Type: if `func` is specified, matches `func` return value type, else matches the array elements type.
 
@@ -1488,12 +1500,12 @@ arrayMax([func,] arr)
 
 **Arguments**
 
--   `func` — Function. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
--   `arr` — Array. [Array](../../sql-reference/data-types/array.md).
+- `func` — Function. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
+- `arr` — Array. [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   The maximum of function values (or the array maximum).
+- The maximum of function values (or the array maximum).
 
 Type: if `func` is specified, matches `func` return value type, else matches the array elements type.
 
@@ -1543,12 +1555,12 @@ arraySum([func,] arr)
 
 **Arguments**
 
--   `func` — Function. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
--   `arr` — Array. [Array](../../sql-reference/data-types/array.md).
+- `func` — Function. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
+- `arr` — Array. [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   The sum of the function values (or the array sum).
+- The sum of the function values (or the array sum).
 
 Type: for decimal numbers in source array (or for converted values, if `func` is specified) — [Decimal128](../../sql-reference/data-types/decimal.md), for floating point numbers — [Float64](../../sql-reference/data-types/float.md), for numeric unsigned — [UInt64](../../sql-reference/data-types/int-uint.md), and for numeric signed — [Int64](../../sql-reference/data-types/int-uint.md).
 
@@ -1598,12 +1610,12 @@ arrayAvg([func,] arr)
 
 **Arguments**
 
--   `func` — Function. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
--   `arr` — Array. [Array](../../sql-reference/data-types/array.md).
+- `func` — Function. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
+- `arr` — Array. [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   The average of function values (or the array average).
+- The average of function values (or the array average).
 
 Type: [Float64](../../sql-reference/data-types/float.md).
 
@@ -1639,7 +1651,23 @@ Result:
 
 ## arrayCumSum(\[func,\] arr1, …)
 
-Returns an array of partial sums of elements in the source array (a running sum). If the `func` function is specified, then the values of the array elements are converted by `func(arr1[i], …, arrN[i])` before summing.
+Returns an array of the partial (running) sums of the elements in the source array `arr1`. If `func` is specified, then the sum is computed from applying `func` to `arr1`, `arr2`, ..., `arrN`, i.e. `func(arr1[i], …, arrN[i])`.
+
+**Syntax**
+
+``` sql
+arrayCumSum(arr)
+```
+
+**Arguments**
+
+- `arr` — [Array](../../sql-reference/data-types/array.md) of numeric values.
+
+**Returned value**
+
+- Returns an array of the partial sums of the elements in the source array.
+
+Type: [UInt\*](https://clickhouse.com/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.com/docs/en/data_types/int_uint/#int-ranges), [Float\*](https://clickhouse.com/docs/en/data_types/float/).
 
 Example:
 
@@ -1655,9 +1683,25 @@ SELECT arrayCumSum([1, 1, 1, 1]) AS res
 
 Note that the `arrayCumSum` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You can pass a lambda function to it as the first argument.
 
-## arrayCumSumNonNegative(arr)
+## arrayCumSumNonNegative(\[func,\] arr1, …)
 
-Same as `arrayCumSum`, returns an array of partial sums of elements in the source array (a running sum). Different `arrayCumSum`, when then returned value contains a value less than zero, the value is replace with zero and the subsequent calculation is performed with zero parameters. For example:
+Same as `arrayCumSum`, returns an array of the partial (running) sums of the elements in the source array. If `func` is specified, then the sum is computed from applying `func` to `arr1`, `arr2`, ..., `arrN`, i.e. `func(arr1[i], …, arrN[i])`. Unlike `arrayCumSum`, if the current running sum is smaller than `0`, it is replaced by `0`.
+
+**Syntax**
+
+``` sql
+arrayCumSumNonNegative(arr)
+```
+
+**Arguments**
+
+- `arr` — [Array](../../sql-reference/data-types/array.md) of numeric values.
+
+**Returned value**
+
+- Returns an array of non-negative partial sums of elements in the source array.
+
+Type: [UInt\*](https://clickhouse.com/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.com/docs/en/data_types/int_uint/#int-ranges), [Float\*](https://clickhouse.com/docs/en/data_types/float/).
 
 ``` sql
 SELECT arrayCumSumNonNegative([1, 1, -4, 1]) AS res
@@ -1668,6 +1712,7 @@ SELECT arrayCumSumNonNegative([1, 1, -4, 1]) AS res
 │ [1,2,0,1] │
 └───────────┘
 ```
+
 Note that the `arraySumNonNegative` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You can pass a lambda function to it as the first argument.
 
 ## arrayProduct
@@ -1682,11 +1727,11 @@ arrayProduct(arr)
 
 **Arguments**
 
--   `arr` — [Array](../../sql-reference/data-types/array.md) of numeric values.
+- `arr` — [Array](../../sql-reference/data-types/array.md) of numeric values.
 
 **Returned value**
 
--   A product of array's elements.
+- A product of array's elements.
 
 Type: [Float64](../../sql-reference/data-types/float.md).
 
diff --git a/docs/en/sql-reference/functions/array-join.md b/docs/en/sql-reference/functions/array-join.md
index d6256ba2dc5..bbb9ca1ba04 100644
--- a/docs/en/sql-reference/functions/array-join.md
+++ b/docs/en/sql-reference/functions/array-join.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/array-join
-sidebar_position: 61
+sidebar_position: 15
 sidebar_label: arrayJoin
 ---
 
@@ -78,6 +78,22 @@ GROUP BY
 │           1 │ Bobruisk │ Firefox │
 └─────────────┴──────────┴─────────┘
 ```
+### Important note!
+Using multiple `arrayJoin` with same expression may not produce expected results due to optimizations.
+For that cases, consider modifying repeated array expression with extra operations that do not affect join result - e.g. `arrayJoin(arraySort(arr))`, `arrayJoin(arrayConcat(arr, []))`
+
+Example:
+```sql
+SELECT
+    arrayJoin(dice) as first_throw,
+    /* arrayJoin(dice) as second_throw */ -- is technically correct, but will annihilate result set
+    arrayJoin(arrayConcat(dice, [])) as second_throw -- intentionally changed expression to force re-evaluation
+FROM (
+    SELECT [1, 2, 3, 4, 5, 6] as dice
+);
+```
+
+
 
 Note the [ARRAY JOIN](../statements/select/array-join.md) syntax in the SELECT query, which provides broader possibilities.
 `ARRAY JOIN` allows you to convert multiple arrays with the same number of elements at a time.
diff --git a/docs/en/sql-reference/functions/bit-functions.md b/docs/en/sql-reference/functions/bit-functions.md
index 1648ce35056..5b342fe4f24 100644
--- a/docs/en/sql-reference/functions/bit-functions.md
+++ b/docs/en/sql-reference/functions/bit-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/bit-functions
-sidebar_position: 48
+sidebar_position: 20
 sidebar_label: Bit
 ---
 
@@ -34,12 +34,12 @@ bitShiftLeft(a, b)
 
 **Arguments**
 
--   `a` — A value to shift. [Integer types](../../sql-reference/data-types/int-uint.md), [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
--   `b` — The number of shift positions. [Unsigned integer types](../../sql-reference/data-types/int-uint.md), 64 bit types or less are allowed.
+- `a` — A value to shift. [Integer types](../../sql-reference/data-types/int-uint.md), [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+- `b` — The number of shift positions. [Unsigned integer types](../../sql-reference/data-types/int-uint.md), 64 bit types or less are allowed.
 
 **Returned value**
 
--   Shifted value.
+- Shifted value.
 
 The type of the returned value is the same as the type of the input value.
 
@@ -81,12 +81,12 @@ bitShiftRight(a, b)
 
 **Arguments**
 
--   `a` — A value to shift. [Integer types](../../sql-reference/data-types/int-uint.md), [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
--   `b` — The number of shift positions. [Unsigned integer types](../../sql-reference/data-types/int-uint.md), 64 bit types or less are allowed.
+- `a` — A value to shift. [Integer types](../../sql-reference/data-types/int-uint.md), [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+- `b` — The number of shift positions. [Unsigned integer types](../../sql-reference/data-types/int-uint.md), 64 bit types or less are allowed.
 
 **Returned value**
 
--   Shifted value.
+- Shifted value.
 
 The type of the returned value is the same as the type of the input value.
 
@@ -179,8 +179,8 @@ SELECT bitTest(number, index)
 
 **Arguments**
 
--   `number` – Integer number.
--   `index` – Position of bit.
+- `number` – Integer number.
+- `index` – Position of bit.
 
 **Returned values**
 
@@ -244,8 +244,8 @@ SELECT bitTestAll(number, index1, index2, index3, index4, ...)
 
 **Arguments**
 
--   `number` – Integer number.
--   `index1`, `index2`, `index3`, `index4` – Positions of bit. For example, for set of positions (`index1`, `index2`, `index3`, `index4`) is true if and only if all of its positions are true (`index1` ⋀ `index2`, ⋀ `index3` ⋀ `index4`).
+- `number` – Integer number.
+- `index1`, `index2`, `index3`, `index4` – Positions of bit. For example, for set of positions (`index1`, `index2`, `index3`, `index4`) is true if and only if all of its positions are true (`index1` ⋀ `index2`, ⋀ `index3` ⋀ `index4`).
 
 **Returned values**
 
@@ -309,12 +309,12 @@ SELECT bitTestAny(number, index1, index2, index3, index4, ...)
 
 **Arguments**
 
--   `number` – Integer number.
--   `index1`, `index2`, `index3`, `index4` – Positions of bit.
+- `number` – Integer number.
+- `index1`, `index2`, `index3`, `index4` – Positions of bit.
 
 **Returned values**
 
-Returns result of logical disjuction.
+Returns result of logical disjunction.
 
 Type: `UInt8`.
 
@@ -364,11 +364,11 @@ bitCount(x)
 
 **Arguments**
 
--   `x` — [Integer](../../sql-reference/data-types/int-uint.md) or [floating-point](../../sql-reference/data-types/float.md) number. The function uses the value representation in memory. It allows supporting floating-point numbers.
+- `x` — [Integer](../../sql-reference/data-types/int-uint.md) or [floating-point](../../sql-reference/data-types/float.md) number. The function uses the value representation in memory. It allows supporting floating-point numbers.
 
 **Returned value**
 
--   Number of bits set to one in the input number.
+- Number of bits set to one in the input number.
 
 The function does not convert input value to a larger type ([sign extension](https://en.wikipedia.org/wiki/Sign_extension)). So, for example, `bitCount(toUInt8(-1)) = 8`.
 
@@ -404,12 +404,12 @@ bitHammingDistance(int1, int2)
 
 **Arguments**
 
--   `int1` — First integer value. [Int64](../../sql-reference/data-types/int-uint.md).
--   `int2` — Second integer value. [Int64](../../sql-reference/data-types/int-uint.md).
+- `int1` — First integer value. [Int64](../../sql-reference/data-types/int-uint.md).
+- `int2` — Second integer value. [Int64](../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   The Hamming distance.
+- The Hamming distance.
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md).
 
diff --git a/docs/en/sql-reference/functions/bitmap-functions.md b/docs/en/sql-reference/functions/bitmap-functions.md
index 9751de8abed..9b66d00656b 100644
--- a/docs/en/sql-reference/functions/bitmap-functions.md
+++ b/docs/en/sql-reference/functions/bitmap-functions.md
@@ -1,22 +1,18 @@
 ---
 slug: /en/sql-reference/functions/bitmap-functions
-sidebar_position: 49
+sidebar_position: 25
 sidebar_label: Bitmap
 ---
 
 # Bitmap Functions
 
-Bitmap functions work for two bitmaps Object value calculation, it is to return new bitmap or cardinality while using formula calculation, such as and, or, xor, and not, etc.
-
-There are 2 kinds of construction methods for Bitmap Object. One is to be constructed by aggregation function groupBitmap with -State, the other is to be constructed by Array Object. It is also to convert Bitmap Object to Array Object.
-
-RoaringBitmap is wrapped into a data structure while actual storage of Bitmap objects. When the cardinality is less than or equal to 32, it uses Set objet. When the cardinality is greater than 32, it uses RoaringBitmap object. That is why storage of low cardinality set is faster.
-
-For more information on RoaringBitmap, see: [CRoaring](https://github.com/RoaringBitmap/CRoaring).
+Bitmaps can be constructed in two ways. The first way is constructed by aggregation function groupBitmap with `-State`, the other way is to constructed a bitmap from an Array object.
 
 ## bitmapBuild
 
-Build a bitmap from unsigned integer array.
+Builds a bitmap from an unsigned integer array.
+
+**Syntax**
 
 ``` sql
 bitmapBuild(array)
@@ -24,7 +20,7 @@ bitmapBuild(array)
 
 **Arguments**
 
--   `array` – Unsigned integer array.
+- `array` – Unsigned integer array.
 
 **Example**
 
@@ -40,7 +36,9 @@ SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res);
 
 ## bitmapToArray
 
-Convert bitmap to integer array.
+Converts bitmap to an integer array.
+
+**Syntax**
 
 ``` sql
 bitmapToArray(bitmap)
@@ -48,7 +46,7 @@ bitmapToArray(bitmap)
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -56,6 +54,8 @@ bitmapToArray(bitmap)
 SELECT bitmapToArray(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─────────┐
 │ [1,2,3,4,5] │
@@ -64,7 +64,9 @@ SELECT bitmapToArray(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 
 ## bitmapSubsetInRange
 
-Return subset in specified range (not include the range_end).
+Returns the subset of a bitmap with bits within a value interval.
+
+**Syntax**
 
 ``` sql
 bitmapSubsetInRange(bitmap, range_start, range_end)
@@ -72,9 +74,9 @@ bitmapSubsetInRange(bitmap, range_start, range_end)
 
 **Arguments**
 
--   `bitmap` – [Bitmap object](#bitmap_functions-bitmapbuild).
--   `range_start` – Range start point. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
--   `range_end` – Range end point (excluded). Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+- `bitmap` – [Bitmap object](#bitmap_functions-bitmapbuild).
+- `range_start` – Start of the range (inclusive). Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+- `range_end` – End of the range (exclusive). Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
@@ -82,6 +84,8 @@ bitmapSubsetInRange(bitmap, range_start, range_end)
 SELECT bitmapToArray(bitmapSubsetInRange(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res───────────────┐
 │ [30,31,32,33,100] │
@@ -90,7 +94,7 @@ SELECT bitmapToArray(bitmapSubsetInRange(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,
 
 ## bitmapSubsetLimit
 
-Creates a subset of bitmap with n elements taken between `range_start` and `cardinality_limit`.
+Returns a subset of a bitmap with smallest bit value `range_start` and at most `cardinality_limit` elements.
 
 **Syntax**
 
@@ -100,20 +104,12 @@ bitmapSubsetLimit(bitmap, range_start, cardinality_limit)
 
 **Arguments**
 
--   `bitmap` – [Bitmap object](#bitmap_functions-bitmapbuild).
--   `range_start` – The subset starting point. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
--   `cardinality_limit` – The subset cardinality upper limit. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
-
-**Returned value**
-
-The subset.
-
-Type: [Bitmap object](#bitmap_functions-bitmapbuild).
+- `bitmap` – [Bitmap object](#bitmap_functions-bitmapbuild).
+- `range_start` – Start of the range (inclusive). Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+- `cardinality_limit` – Maximum cardinality of the subset. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res;
 ```
@@ -128,7 +124,7 @@ Result:
 
 ## subBitmap
 
-Returns the bitmap elements, starting from the `offset` position. The number of returned elements is limited by the `cardinality_limit` parameter. Analog of the [substring](string-functions.md#substring)) string function, but for bitmap.
+Returns a subset of the bitmap, starting from position `offset`. The maximum cardinality of the returned bitmap is `cardinality_limit`.
 
 **Syntax**
 
@@ -138,20 +134,12 @@ subBitmap(bitmap, offset, cardinality_limit)
 
 **Arguments**
 
--   `bitmap` – The bitmap. Type: [Bitmap object](#bitmap_functions-bitmapbuild).
--   `offset` – The position of the first element of the subset. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
--   `cardinality_limit` – The maximum number of elements in the subset. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
-
-**Returned value**
-
-The subset.
-
-Type: [Bitmap object](#bitmap_functions-bitmapbuild).
+- `bitmap` – The bitmap. Type: [Bitmap object](#bitmap_functions-bitmapbuild).
+- `offset` – The position of the first element of the subset. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+- `cardinality_limit` – The maximum number of elements in the subset. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT bitmapToArray(subBitmap(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(10), toUInt32(10))) AS res;
 ```
@@ -169,18 +157,18 @@ Result:
 Checks whether the bitmap contains an element.
 
 ``` sql
-bitmapContains(haystack, needle)
+bitmapContains(bitmap, needle)
 ```
 
 **Arguments**
 
--   `haystack` – [Bitmap object](#bitmap_functions-bitmapbuild), where the function searches.
--   `needle` – Value that the function searches. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+- `bitmap` – [Bitmap object](#bitmap_functions-bitmapbuild).
+- `needle` – Searched bit value. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   0 — If `haystack` does not contain `needle`.
--   1 — If `haystack` contains `needle`.
+- 0 — If `bitmap` does not contain `needle`.
+- 1 — If `bitmap` contains `needle`.
 
 Type: `UInt8`.
 
@@ -190,6 +178,8 @@ Type: `UInt8`.
 SELECT bitmapContains(bitmapBuild([1,5,7,9]), toUInt32(9)) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─┐
 │  1  │
@@ -198,22 +188,25 @@ SELECT bitmapContains(bitmapBuild([1,5,7,9]), toUInt32(9)) AS res;
 
 ## bitmapHasAny
 
-Checks whether two bitmaps have intersection by some elements.
+Checks whether two bitmaps intersect.
+
+If `bitmap2` contains exactly one element, consider using [bitmapContains](#bitmap_functions-bitmapcontains) instead as it works more efficiently.
+
+**Syntax**
 
 ``` sql
 bitmapHasAny(bitmap1, bitmap2)
 ```
 
-If you are sure that `bitmap2` contains strictly one element, consider using the [bitmapContains](#bitmap_functions-bitmapcontains) function. It works more efficiently.
-
 **Arguments**
 
--   `bitmap*` – Bitmap object.
+- `bitmap1` – Bitmap object 1.
+- `bitmap2` – Bitmap object 2.
 
 **Return values**
 
--   `1`, if `bitmap1` and `bitmap2` have one similar element at least.
--   `0`, otherwise.
+- `1`, if `bitmap1` and `bitmap2` have at least one shared element.
+- `0`, otherwise.
 
 **Example**
 
@@ -221,6 +214,8 @@ If you are sure that `bitmap2` contains strictly one element, consider using the
 SELECT bitmapHasAny(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─┐
 │  1  │
@@ -229,16 +224,21 @@ SELECT bitmapHasAny(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 
 ## bitmapHasAll
 
-Analogous to `hasAll(array, array)` returns 1 if the first bitmap contains all the elements of the second one, 0 otherwise.
-If the second argument is an empty bitmap then returns 1.
+Returns 1 if the first bitmap contains all elements of the second bitmap, otherwise 0.
+If the second bitmap is empty, returns 1.
+
+Also see `hasAll(array, array)`.
+
+**Syntax**
 
 ``` sql
-bitmapHasAll(bitmap,bitmap)
+bitmapHasAll(bitmap1, bitmap2)
 ```
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap1` – Bitmap object 1.
+- `bitmap2` – Bitmap object 2.
 
 **Example**
 
@@ -246,6 +246,8 @@ bitmapHasAll(bitmap,bitmap)
 SELECT bitmapHasAll(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─┐
 │  0  │
@@ -254,7 +256,9 @@ SELECT bitmapHasAll(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 
 ## bitmapCardinality
 
-Retrun bitmap cardinality of type UInt64.
+Returns the cardinality of a bitmap.
+
+**Syntax**
 
 ``` sql
 bitmapCardinality(bitmap)
@@ -262,7 +266,7 @@ bitmapCardinality(bitmap)
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -270,6 +274,8 @@ bitmapCardinality(bitmap)
 SELECT bitmapCardinality(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─┐
 │   5 │
@@ -278,13 +284,17 @@ SELECT bitmapCardinality(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 
 ## bitmapMin
 
-Retrun the smallest value of type UInt64 in the set, UINT32_MAX if the set is empty.
+Computes the smallest bit set in a bitmap, or UINT32_MAX if the bitmap is empty.
 
-    bitmapMin(bitmap)
+**Syntax**
+
+```sql 
+bitmapMin(bitmap)
+```
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -292,6 +302,8 @@ Retrun the smallest value of type UInt64 in the set, UINT32_MAX if the set is em
 SELECT bitmapMin(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 ```
 
+Result:
+
 ``` text
  ┌─res─┐
  │   1 │
@@ -300,13 +312,17 @@ SELECT bitmapMin(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 
 ## bitmapMax
 
-Retrun the greatest value of type UInt64 in the set, 0 if the set is empty.
+Computes the greatest bit set in a bitmap, or 0 if the bitmap is empty.
 
-    bitmapMax(bitmap)
+**Syntax**
+
+```sql 
+bitmapMax(bitmap)
+```
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -314,6 +330,8 @@ Retrun the greatest value of type UInt64 in the set, 0 if the set is empty.
 SELECT bitmapMax(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 ```
 
+Result:
+
 ``` text
  ┌─res─┐
  │   5 │
@@ -322,15 +340,21 @@ SELECT bitmapMax(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 
 ## bitmapTransform
 
-Transform an array of values in a bitmap to another array of values, the result is a new bitmap.
+Replaces at most N bits in a bitmap. The old and new value of the i-th replaced bit is given by `from_array[i]` and `to_array[i]`.
 
-    bitmapTransform(bitmap, from_array, to_array)
+The result depends on the array ordering if `from_array` and `to_array`.
+
+**Syntax**
+
+``` sql
+bitmapTransform(bitmap, from_array, to_array)
+```
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
--   `from_array` – UInt32 array. For idx in range \[0, from_array.size()), if bitmap contains from_array\[idx\], then replace it with to_array\[idx\]. Note that the result depends on array ordering if there are common elements between from_array and to_array.
--   `to_array` – UInt32 array, its size shall be the same to from_array.
+- `bitmap` – Bitmap object.
+- `from_array` – UInt32 array. For idx in range \[0, from_array.size()), if bitmap contains from_array\[idx\], then replace it with to_array\[idx\].
+- `to_array` – UInt32 array with the same size as `from_array`.
 
 **Example**
 
@@ -338,6 +362,8 @@ Transform an array of values in a bitmap to another array of values, the result
 SELECT bitmapToArray(bitmapTransform(bitmapBuild([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]), cast([5,999,2] as Array(UInt32)), cast([2,888,20] as Array(UInt32)))) AS res;
 ```
 
+Result:
+
 ``` text
  ┌─res───────────────────┐
  │ [1,3,4,6,7,8,9,10,20] │
@@ -346,7 +372,9 @@ SELECT bitmapToArray(bitmapTransform(bitmapBuild([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
 
 ## bitmapAnd
 
-Two bitmap and calculation, the result is a new bitmap.
+Computes the logical conjunction of two two bitmaps.
+
+**Syntax**
 
 ``` sql
 bitmapAnd(bitmap,bitmap)
@@ -354,7 +382,7 @@ bitmapAnd(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -362,6 +390,8 @@ bitmapAnd(bitmap,bitmap)
 SELECT bitmapToArray(bitmapAnd(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─┐
 │ [3] │
@@ -370,7 +400,9 @@ SELECT bitmapToArray(bitmapAnd(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS re
 
 ## bitmapOr
 
-Two bitmap or calculation, the result is a new bitmap.
+Computes the logical disjunction of two bitmaps.
+
+**Syntax**
 
 ``` sql
 bitmapOr(bitmap,bitmap)
@@ -378,7 +410,7 @@ bitmapOr(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -386,6 +418,8 @@ bitmapOr(bitmap,bitmap)
 SELECT bitmapToArray(bitmapOr(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─────────┐
 │ [1,2,3,4,5] │
@@ -394,7 +428,9 @@ SELECT bitmapToArray(bitmapOr(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
 
 ## bitmapXor
 
-Two bitmap xor calculation, the result is a new bitmap.
+Xor-s two bitmaps.
+
+**Syntax**
 
 ``` sql
 bitmapXor(bitmap,bitmap)
@@ -402,7 +438,7 @@ bitmapXor(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -410,6 +446,8 @@ bitmapXor(bitmap,bitmap)
 SELECT bitmapToArray(bitmapXor(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res───────┐
 │ [1,2,4,5] │
@@ -418,7 +456,9 @@ SELECT bitmapToArray(bitmapXor(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS re
 
 ## bitmapAndnot
 
-Two bitmap andnot calculation, the result is a new bitmap.
+Computes the logical conjunction of two bitmaps and negates the result.
+
+**Syntax**
 
 ``` sql
 bitmapAndnot(bitmap,bitmap)
@@ -426,7 +466,7 @@ bitmapAndnot(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -434,6 +474,8 @@ bitmapAndnot(bitmap,bitmap)
 SELECT bitmapToArray(bitmapAndnot(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res───┐
 │ [1,2] │
@@ -442,7 +484,9 @@ SELECT bitmapToArray(bitmapAndnot(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS
 
 ## bitmapAndCardinality
 
-Two bitmap and calculation, return cardinality of type UInt64.
+Returns the cardinality of the logical conjunction of two bitmaps.
+
+**Syntax**
 
 ``` sql
 bitmapAndCardinality(bitmap,bitmap)
@@ -450,7 +494,7 @@ bitmapAndCardinality(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -458,6 +502,8 @@ bitmapAndCardinality(bitmap,bitmap)
 SELECT bitmapAndCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─┐
 │   1 │
@@ -466,7 +512,7 @@ SELECT bitmapAndCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 
 ## bitmapOrCardinality
 
-Two bitmap or calculation, return cardinality of type UInt64.
+Returns the cardinality of the logical disjunction of two bitmaps.
 
 ``` sql
 bitmapOrCardinality(bitmap,bitmap)
@@ -474,7 +520,7 @@ bitmapOrCardinality(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -482,6 +528,8 @@ bitmapOrCardinality(bitmap,bitmap)
 SELECT bitmapOrCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─┐
 │   5 │
@@ -490,7 +538,7 @@ SELECT bitmapOrCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 
 ## bitmapXorCardinality
 
-Two bitmap xor calculation, return cardinality of type UInt64.
+Returns the cardinality of the XOR of two bitmaps.
 
 ``` sql
 bitmapXorCardinality(bitmap,bitmap)
@@ -498,7 +546,7 @@ bitmapXorCardinality(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -506,6 +554,8 @@ bitmapXorCardinality(bitmap,bitmap)
 SELECT bitmapXorCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─┐
 │   4 │
@@ -514,7 +564,7 @@ SELECT bitmapXorCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 
 ## bitmapAndnotCardinality
 
-Two bitmap andnot calculation, return cardinality of type UInt64.
+Returns the cardinality of the AND-NOT operation of two bitmaps.
 
 ``` sql
 bitmapAndnotCardinality(bitmap,bitmap)
@@ -522,7 +572,7 @@ bitmapAndnotCardinality(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – Bitmap object.
+- `bitmap` – Bitmap object.
 
 **Example**
 
@@ -530,6 +580,8 @@ bitmapAndnotCardinality(bitmap,bitmap)
 SELECT bitmapAndnotCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res─┐
 │   2 │
diff --git a/docs/en/sql-reference/functions/comparison-functions.md b/docs/en/sql-reference/functions/comparison-functions.md
index 586c0dc54e6..297d84eb8a5 100644
--- a/docs/en/sql-reference/functions/comparison-functions.md
+++ b/docs/en/sql-reference/functions/comparison-functions.md
@@ -1,34 +1,89 @@
 ---
 slug: /en/sql-reference/functions/comparison-functions
-sidebar_position: 36
+sidebar_position: 35
 sidebar_label: Comparison
 ---
 
 # Comparison Functions
 
-Comparison functions always return 0 or 1 (Uint8).
+Below comparison functions return 0 or 1 as Uint8.
 
 The following types can be compared:
+- numbers
+- strings and fixed strings
+- dates
+- dates with times
 
--   numbers
--   strings and fixed strings
--   dates
--   dates with times
+Only values within the same group can be compared (e.g. UInt16 and UInt64) but not across groups (e.g. UInt16 and DateTime).
 
-within each group, but not between different groups.
+Strings are compared byte-by-byte. Note that this may lead to unexpected results if one of the strings contains UTF-8 encoded multi-byte characters.
 
-For example, you can’t compare a date with a string. You have to use a function to convert the string to a date, or vice versa.
+A string S1 which has another string S2 as prefix is considered longer than S2.
 
-Strings are compared by bytes. A shorter string is smaller than all strings that start with it and that contain at least one more character.
+## equals, `=`, `==` operators
 
-### equals, a `=` b and a `==` b operator
+**Syntax**
 
-### notEquals, a `!=` b and a `<>` b operator
+```sql
+equals(a, b)
+```
 
-### less, `<` operator
+Alias:
+- `a = b` (operator)
+- `a == b` (operator)
 
-### greater, `>` operator
+## notEquals, `!=`, `<>` operators
 
-### lessOrEquals, `<=` operator
+**Syntax**
 
-### greaterOrEquals, `>=` operator
+```sql
+notEquals(a, b)
+```
+
+Alias:
+- `a != b` (operator)
+- `a <> b` (operator)
+
+## less, `<` operator
+
+**Syntax**
+
+```sql
+less(a, b)
+```
+
+Alias:
+- `a < b` (operator)
+
+## greater, `>` operator
+
+**Syntax**
+
+```sql
+greater(a, b)
+```
+
+Alias:
+- `a > b` (operator)
+
+## lessOrEquals, `<=` operator
+
+**Syntax**
+
+```sql
+lessOrEquals(a, b)
+```
+
+Alias:
+- `a <= b` (operator)
+
+## greaterOrEquals, `>=` operator
+
+**Syntax**
+
+```sql
+greaterOrEquals(a, b)
+```
+
+Alias:
+- `a >= b` (operator)
diff --git a/docs/en/sql-reference/functions/conditional-functions.md b/docs/en/sql-reference/functions/conditional-functions.md
index ff1ac237025..eb4e98961f1 100644
--- a/docs/en/sql-reference/functions/conditional-functions.md
+++ b/docs/en/sql-reference/functions/conditional-functions.md
@@ -1,39 +1,40 @@
 ---
 slug: /en/sql-reference/functions/conditional-functions
-sidebar_position: 43
-sidebar_label: 'Conditional '
+sidebar_position: 40
+sidebar_label: Conditional
 ---
 
 # Conditional Functions
 
 ## if
 
-Controls conditional branching. Unlike most systems, ClickHouse always evaluate both expressions `then` and `else`.
+Performs conditional branching.
+
+If the condition `cond` evaluates to a non-zero value, the function returns the result of the expression `then`. If `cond` evaluates to zero or `NULL`, then the result of the `else` expression is returned.
+
+Setting [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) controls whether short-circuit evaluation is used. If enabled, the `then` expression is evaluated only on rows where `cond` is `true` and the `else` expression where `cond` is `false`. For example, with short-circuit evaluation, no division-by-zero exception is thrown when executing the query `SELECT if(number = 0, 0, intDiv(42, number)) FROM numbers(10)`.
+
+`then` and `else` must be of a similar type.
 
 **Syntax**
 
 ``` sql
 if(cond, then, else)
 ```
-
-If the condition `cond` evaluates to a non-zero value, returns the result of the expression `then`, and the result of the expression `else`, if present, is skipped. If the `cond` is zero or `NULL`, then the result of the `then` expression is skipped and the result of the `else` expression, if present, is returned.
-
-You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `if` function according to a short scheme. If this setting is enabled, `then` expression is evaluated only on rows where `cond` is true, `else` expression – where `cond` is false. For example, an exception about division by zero is not thrown when executing the query `SELECT if(number = 0, 0, intDiv(42, number)) FROM numbers(10)`, because `intDiv(42, number)` will be evaluated only for numbers that doesn't satisfy condition `number = 0`.
+Alias: `cond ? then : else` (ternary operator)
 
 **Arguments**
 
--   `cond` – The condition for evaluation that can be zero or not. The type is UInt8, Nullable(UInt8) or NULL.
--   `then` – The expression to return if condition is met.
--   `else` – The expression to return if condition is not met.
+- `cond` – The evaluated condition. UInt8, Nullable(UInt8) or NULL.
+- `then` – The expression returned if `condition` is true.
+- `else` – The expression returned if `condition` is `false` or NULL.
 
 **Returned values**
 
-The function executes `then` and `else` expressions and returns its result, depending on whether the condition `cond` ended up being zero or not.
+The result of either the `then` and `else` expressions, depending on condition `cond`.
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT if(1, plus(2, 2), plus(2, 6));
 ```
@@ -46,30 +47,34 @@ Result:
 └────────────┘
 ```
 
-Query:
+## multiIf
+
+Allows to write the [CASE](../../sql-reference/operators/index.md#operator_case) operator more compactly in the query.
+
+**Syntax**
 
 ``` sql
-SELECT if(0, plus(2, 2), plus(2, 6));
+multiIf(cond_1, then_1, cond_2, then_2, ..., else)
 ```
 
-Result:
+Setting [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) controls whether short-circuit evaluation is used. If enabled, the `then_i` expression is evaluated only on rows where `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}) AND cond_i)` is `true`, `cond_i` will be evaluated only on rows where `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}))` is `true`. For example, with short-circuit evaluation, no division-by-zero exception is thrown when executing the query `SELECT multiIf(number = 2, intDiv(1, number), number = 5) FROM numbers(10)`.
+
+**Arguments**
+
+The function accepts `2N+1` parameters:
+- `cond_N` — The N-th evaluated condition which controls if `then_N` is returned.
+- `then_N` — The result of the function when `cond_N` is true.
+- `else` — The result of the function if none of conditions is true.
+
+**Returned values**
+
+The result of either any of the `then_N` or `else` expressions, depending on the conditions `cond_N`.
+
+**Example**
+
+Assuming this table:
 
 ``` text
-┌─plus(2, 6)─┐
-│          8 │
-└────────────┘
-```
-
--   `then` and `else` must have the lowest common type.
-
-**Example:**
-
-Take this `LEFT_RIGHT` table:
-
-``` sql
-SELECT *
-FROM LEFT_RIGHT
-
 ┌─left─┬─right─┐
 │ ᴺᵁᴸᴸ │     4 │
 │    1 │     3 │
@@ -79,69 +84,6 @@ FROM LEFT_RIGHT
 └──────┴───────┘
 ```
 
-The following query compares `left` and `right` values:
-
-``` sql
-SELECT
-    left,
-    right,
-    if(left < right, 'left is smaller than right', 'right is greater or equal than left') AS is_smaller
-FROM LEFT_RIGHT
-WHERE isNotNull(left) AND isNotNull(right)
-
-┌─left─┬─right─┬─is_smaller──────────────────────────┐
-│    1 │     3 │ left is smaller than right          │
-│    2 │     2 │ right is greater or equal than left │
-│    3 │     1 │ right is greater or equal than left │
-└──────┴───────┴─────────────────────────────────────┘
-```
-
-Note: `NULL` values are not used in this example, check [NULL values in conditionals](#null-values-in-conditionals) section.
-
-## Ternary Operator
-
-It works same as `if` function.
-
-Syntax: `cond ? then : else`
-
-Returns `then` if the `cond` evaluates to be true (greater than zero), otherwise returns `else`.
-
--   `cond` must be of type of `UInt8`, and `then` and `else` must have the lowest common type.
-
--   `then` and `else` can be `NULL`
-
-**See also**
-
--   [ifNotFinite](../../sql-reference/functions/other-functions.md#ifnotfinite).
-
-## multiIf
-
-Allows you to write the [CASE](../../sql-reference/operators/index.md#operator_case) operator more compactly in the query.
-
-**Syntax**
-
-``` sql
-multiIf(cond_1, then_1, cond_2, then_2, ..., else)
-```
-
-You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `multiIf` function according to a short scheme. If this setting is enabled, `then_i` expression is evaluated only on rows where `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}) AND cond_i)` is true, `cond_i` will be evaluated only on rows where `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}))` is true. For example, an exception about division by zero is not thrown when executing the query `SELECT multiIf(number = 2, intDiv(1, number), number = 5) FROM numbers(10)`.
-
-**Arguments**
-
--   `cond_N` — The condition for the function to return `then_N`.
--   `then_N` — The result of the function when executed.
--   `else` — The result of the function if none of the conditions is met.
-
-The function accepts `2N+1` parameters.
-
-**Returned values**
-
-The function returns one of the values `then_N` or `else`, depending on the conditions `cond_N`.
-
-**Example**
-
-Again using `LEFT_RIGHT` table.
-
 ``` sql
 SELECT
     left,
@@ -210,3 +152,85 @@ FROM LEFT_RIGHT
 │    4 │  ᴺᵁᴸᴸ │ Both equal       │
 └──────┴───────┴──────────────────┘
 ```
+
+## greatest
+
+Returns the greatest across a list of values.  All of the list members must be of comparable types.
+
+Examples:
+
+```sql
+SELECT greatest(1, 2, toUInt8(3), 3.) result,  toTypeName(result) type;
+```
+```response
+┌─result─┬─type────┐
+│      3 │ Float64 │
+└────────┴─────────┘
+```
+
+:::note
+The type returned is a Float64 as the UInt8 must be promoted to 64 bit for the comparison.
+:::
+
+```sql
+SELECT greatest(['hello'], ['there'], ['world'])
+```
+```response
+┌─greatest(['hello'], ['there'], ['world'])─┐
+│ ['world']                                 │
+└───────────────────────────────────────────┘
+```
+
+```sql
+SELECT greatest(toDateTime32(now() + toIntervalDay(1)), toDateTime64(now(), 3))
+```
+```response
+┌─greatest(toDateTime32(plus(now(), toIntervalDay(1))), toDateTime64(now(), 3))─┐
+│                                                       2023-05-12 01:16:59.000 │
+└──---──────────────────────────────────────────────────────────────────────────┘
+```
+
+:::note
+The type returned is a DateTime64 as the DataTime32 must be promoted to 64 bit for the comparison.
+:::
+
+## least
+
+Returns the least across a list of values.  All of the list members must be of comparable types.
+
+Examples:
+
+```sql
+SELECT least(1, 2, toUInt8(3), 3.) result,  toTypeName(result) type;
+```
+```response
+┌─result─┬─type────┐
+│      1 │ Float64 │
+└────────┴─────────┘
+```
+
+:::note
+The type returned is a Float64 as the UInt8 must be promoted to 64 bit for the comparison.
+:::
+
+```sql
+SELECT least(['hello'], ['there'], ['world'])
+```
+```response
+┌─least(['hello'], ['there'], ['world'])─┐
+│ ['hello']                              │
+└────────────────────────────────────────┘
+```
+
+```sql
+SELECT least(toDateTime32(now() + toIntervalDay(1)), toDateTime64(now(), 3))
+```
+```response
+┌─least(toDateTime32(plus(now(), toIntervalDay(1))), toDateTime64(now(), 3))─┐
+│                                                    2023-05-12 01:16:59.000 │
+└────────────────────────────────────────────────────────────────────────────┘
+```
+
+:::note
+The type returned is a DateTime64 as the DataTime32 must be promoted to 64 bit for the comparison.
+:::
diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index 49b0bc25edd..668864c49af 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -1,14 +1,14 @@
 ---
 slug: /en/sql-reference/functions/date-time-functions
-sidebar_position: 39
+sidebar_position: 45
 sidebar_label: Dates and Times
 ---
 
 # Functions for Working with Dates and Times
 
-Support for time zones.
+Most functions in this section accept an optional time zone argument, e.g. `Europe/Amsterdam`. In this case, the time zone is the specified one instead of the local (default) one.
 
-All functions for working with the date and time that have a logical use for the time zone can accept a second optional time zone argument. Example: Asia/Yekaterinburg. In this case, they use the specified time zone instead of the local (default) one.
+**Example**
 
 ``` sql
 SELECT
@@ -24,14 +24,127 @@ SELECT
 └─────────────────────┴────────────┴────────────┴─────────────────────┘
 ```
 
-## timeZone
+## makeDate
 
-Returns the timezone of the server.
-If it is executed in the context of a distributed table, then it generates a normal column with values relevant to each shard. Otherwise it produces a constant value.
+Creates a [Date](../../sql-reference/data-types/date.md)
+- from a year, month and day argument, or
+- from a year and day of year argument.
 
 **Syntax**
 
 ``` sql
+makeDate(year, month, day);
+makeDate(year, day_of_year);
+```
+
+Alias:
+- `MAKEDATE(year, month, day);`
+- `MAKEDATE(year, day_of_year);`
+
+**Arguments**
+
+- `year` — Year. [Integer](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `month` — Month. [Integer](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `day` — Day. [Integer](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `day_of_year` — Day of the year. [Integer](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+
+**Returned value**
+
+- A date created from the arguments.
+
+Type: [Date](../../sql-reference/data-types/date.md).
+
+**Example**
+
+Create a Date from a year, month and day:
+
+``` sql
+SELECT makeDate(2023, 2, 28) AS Date;
+```
+
+Result:
+
+``` text
+┌───────date─┐
+│ 2023-02-28 │
+└────────────┘
+```
+
+Create a Date from a year and day of year argument:
+
+``` sql
+SELECT makeDate(2023, 42) AS Date;
+```
+
+Result:
+
+``` text
+┌───────date─┐
+│ 2023-02-11 │
+└────────────┘
+```
+## makeDate32
+
+Like [makeDate](#makeDate) but produces a [Date32](../../sql-reference/data-types/date32.md).
+
+## makeDateTime
+
+Creates a [DateTime](../../sql-reference/data-types/datetime.md) from a year, month, day, hour, minute and second argument.
+
+**Syntax**
+
+``` sql
+makeDateTime(year, month, day, hour, minute, second[, timezone])
+```
+
+**Arguments**
+
+- `year` — Year. [Integer](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `month` — Month. [Integer](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `day` — Day. [Integer](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `hour` — Hour. [Integer](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `minute` — Minute. [Integer](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `second` — Second. [Integer](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `timezone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional).
+
+**Returned value**
+
+- A date with time created from the arguments.
+
+Type: [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Example**
+
+``` sql
+SELECT makeDateTime(2023, 2, 28, 17, 12, 33) AS DateTime;
+```
+
+Result:
+
+``` text
+┌────────────DateTime─┐
+│ 2023-02-28 17:12:33 │
+└─────────────────────┘
+```
+
+## makeDateTime64
+
+Like [makeDateTime](#makedatetime) but produces a [DateTime64](../../sql-reference/data-types/datetime64.md).
+
+**Syntax**
+
+``` sql
+makeDateTime32(year, month, day, hour, minute, second[, fraction[, precision[, timezone]]])
+```
+
+## timeZone
+
+Returns the timezone of the server.
+If the function is executed in the context of a distributed table, it generates a normal column with values relevant to each shard, otherwise it produces a constant value.
+
+**Syntax**
+
+```sql
 timeZone()
 ```
 
@@ -39,13 +152,13 @@ Alias: `timezone`.
 
 **Returned value**
 
--   Timezone.
+- Timezone.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 ## toTimeZone
 
-Converts time or date and time to the specified time zone. The time zone is an attribute of the `Date` and `DateTime` data types. The internal value (number of seconds) of the table field or of the resultset's column does not change, the column's type changes and its string representation changes accordingly.
+Converts a date or date with time to the specified time zone. Does not change the internal value (number of unix seconds) of the data, only the value's time zone attribute and the value's string representation changes.
 
 **Syntax**
 
@@ -57,19 +170,17 @@ Alias: `toTimezone`.
 
 **Arguments**
 
--   `value` — Time or date and time. [DateTime64](../../sql-reference/data-types/datetime64.md).
--   `timezone` — Timezone for the returned value. [String](../../sql-reference/data-types/string.md). This argument is a constant, because `toTimezone` changes the timezone of a column (timezone is an attribute of `DateTime*` types).
+- `value` — Time or date and time. [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `timezone` — Timezone for the returned value. [String](../../sql-reference/data-types/string.md). This argument is a constant, because `toTimezone` changes the timezone of a column (timezone is an attribute of `DateTime*` types).
 
 **Returned value**
 
--   Date and time.
+- Date and time.
 
 Type: [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Example**
 
-Query:
-
 ```sql
 SELECT toDateTime('2019-01-01 00:00:00', 'UTC') AS time_utc,
     toTypeName(time_utc) AS type_utc,
@@ -99,8 +210,6 @@ type_samoa: DateTime('US/Samoa')
 int32samoa: 1546300800
 ```
 
-`toTimeZone(time_utc, 'Asia/Yekaterinburg')` changes the `DateTime('UTC')` type to `DateTime('Asia/Yekaterinburg')`. The value (Unixtimestamp) 1546300800 stays the same, but the string representation (the result of the toString() function) changes from `time_utc:   2019-01-01 00:00:00` to `time_yekat: 2019-01-01 05:00:00`.
-
 ## timeZoneOf
 
 Returns the timezone name of [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md) data types.
@@ -115,17 +224,16 @@ Alias: `timezoneOf`.
 
 **Arguments**
 
--   `value` — Date and time. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `value` — Date and time. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
 **Returned value**
 
--   Timezone name.
+- Timezone name.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 **Example**
 
-Query:
 ``` sql
 SELECT timezoneOf(now());
 ```
@@ -139,8 +247,9 @@ Result:
 
 ## timeZoneOffset
 
-Returns a timezone offset in seconds from [UTC](https://en.wikipedia.org/wiki/Coordinated_Universal_Time). The function takes into account [daylight saving time](https://en.wikipedia.org/wiki/Daylight_saving_time) and historical timezone changes at the specified date and time.
-[IANA timezone database](https://www.iana.org/time-zones) is used to calculate the offset.
+Returns the timezone offset in seconds from [UTC](https://en.wikipedia.org/wiki/Coordinated_Universal_Time).
+The function [daylight saving time](https://en.wikipedia.org/wiki/Daylight_saving_time) and historical timezone changes at the specified date and time into account.
+The [IANA timezone database](https://www.iana.org/time-zones) is used to calculate the offset.
 
 **Syntax**
 
@@ -152,18 +261,16 @@ Alias: `timezoneOffset`.
 
 **Arguments**
 
--   `value` — Date and time. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `value` — Date and time. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
 **Returned value**
 
--   Offset from UTC in seconds.
+- Offset from UTC in seconds.
 
 Type: [Int32](../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT toDateTime('2021-04-21 10:20:30', 'America/New_York') AS Time, toTypeName(Time) AS Type,
        timeZoneOffset(Time) AS Offset_in_seconds, (Offset_in_seconds / 3600) AS Offset_in_hours;
@@ -179,39 +286,39 @@ Result:
 
 ## toYear
 
-Converts a date or date with time to a UInt16 number containing the year number (AD).
+Converts a date or date with time to the year number (AD) as UInt16 value.
 
 Alias: `YEAR`.
 
 ## toQuarter
 
-Converts a date or date with time to a UInt8 number containing the quarter number.
+Converts a date or date with time to the quarter number as UInt8 value.
 
 Alias: `QUARTER`.
 
 ## toMonth
 
-Converts a date or date with time to a UInt8 number containing the month number (1-12).
+Converts a date or date with time to the month number (1-12) as UInt8 value.
 
 Alias: `MONTH`.
 
 ## toDayOfYear
 
-Converts a date or date with time to a UInt16 number containing the number of the day of the year (1-366).
+Converts a date or date with time to the number of the day of the year (1-366) as UInt16 value.
 
 Alias: `DAYOFYEAR`.
 
 ## toDayOfMonth
 
-Converts a date or date with time to a UInt8 number containing the number of the day of the month (1-31).
+Converts a date or date with time to the number of the day in the month (1-31) as UInt8 value.
 
 Aliases: `DAYOFMONTH`, `DAY`.
 
 ## toDayOfWeek
 
-Converts a date or date with time to a UInt8 number containing the number of the day of the week.
+Converts a date or date with time to the number of the day in the week as UInt8 value.
 
-The two-argument form of `toDayOfWeek()` enables you to specify whether the week starts on Monday or Sunday, and whether the return value should be in the range from 0 to 6 or 1 to 7. If the mode argument is ommited, the default mode is 0. The time zone of the date can be specified as the third argument.
+The two-argument form of `toDayOfWeek()` enables you to specify whether the week starts on Monday or Sunday, and whether the return value should be in the range from 0 to 6 or 1 to 7. If the mode argument is omitted, the default mode is 0. The time zone of the date can be specified as the third argument.
 
 | Mode | First day of week | Range                                          |
 |------|-------------------|------------------------------------------------|
@@ -230,60 +337,73 @@ toDayOfWeek(t[, mode[, timezone]])
 
 ## toHour
 
-Converts a date with time to a UInt8 number containing the number of the hour in 24-hour time (0-23).
-This function assumes that if clocks are moved ahead, it is by one hour and occurs at 2 a.m., and if clocks are moved back, it is by one hour and occurs at 3 a.m. (which is not always true – even in Moscow the clocks were twice changed at a different time).
+Converts a date with time the number of the hour in 24-hour time (0-23) as UInt8 value.
+
+Assumes that if clocks are moved ahead, it is by one hour and occurs at 2 a.m., and if clocks are moved back, it is by one hour and occurs at 3 a.m. (which is not always true – even in Moscow the clocks were twice changed at a different time).
 
 Alias: `HOUR`.
 
 ## toMinute
 
-Converts a date with time to a UInt8 number containing the number of the minute of the hour (0-59).
+Converts a date with time to the number of the minute of the hour (0-59) as UInt8 value.
 
 Alias: `MINUTE`.
 
 ## toSecond
 
-Converts a date with time to a UInt8 number containing the number of the second in the minute (0-59).
-Leap seconds are not accounted for.
+Converts a date with time to the second in the minute (0-59) as UInt8 value. Leap seconds are not considered.
 
 Alias: `SECOND`.
 
 ## toUnixTimestamp
 
-For DateTime argument: converts value to the number with type UInt32 -- Unix Timestamp (https://en.wikipedia.org/wiki/Unix_time).
-For String argument: converts the input string to the datetime according to the timezone (optional second argument, server timezone is used by default) and returns the corresponding unix timestamp.
+Converts a string, a date or a date with time to the [Unix Timestamp](https://en.wikipedia.org/wiki/Unix_time) in `UInt32` representation.
+
+If the function is called with a string, it accepts an optional timezone argument.
 
 **Syntax**
 
 ``` sql
-toUnixTimestamp(datetime)
+toUnixTimestamp(date)
 toUnixTimestamp(str, [timezone])
 ```
 
 **Returned value**
 
--   Returns the unix timestamp.
+- Returns the unix timestamp.
 
 Type: `UInt32`.
 
 **Example**
 
-Query:
-
 ``` sql
-SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp
+SELECT
+    '2017-11-05 08:07:47' AS dt_str,
+    toUnixTimestamp(dt_str) AS from_str,
+    toUnixTimestamp(dt_str, 'Asia/Tokyo') AS from_str_tokyo,
+    toUnixTimestamp(toDateTime(dt_str)) AS from_datetime,
+    toUnixTimestamp(toDateTime64(dt_str, 0)) AS from_datetime64,
+    toUnixTimestamp(toDate(dt_str)) AS from_date,
+    toUnixTimestamp(toDate32(dt_str)) AS from_date32
+FORMAT Vertical;
 ```
 
 Result:
 
 ``` text
-┌─unix_timestamp─┐
-│     1509836867 │
-└────────────────┘
+Row 1:
+──────
+dt_str:          2017-11-05 08:07:47
+from_str:        1509869267
+from_str_tokyo:  1509836867
+from_datetime:   1509869267
+from_datetime64: 1509869267
+from_date:       1509840000
+from_date32:     1509840000
 ```
 
 :::note
-The return type of `toStartOf*`, `toLastDayOfMonth`, `toMonday`, `timeSlot` functions described below is determined by the configuration parameter [enable_extended_results_for_datetime_functions](../../operations/settings/settings#enable-extended-results-for-datetime-functions) which is `0` by default.
+The return type of `toStartOf*`, `toLastDayOfMonth`, `toMonday`, `timeSlot` functions described below is determined by the configuration parameter [enable_extended_results_for_datetime_functions](../../operations/settings/settings.md#enable-extended-results-for-datetime-functions) which is `0` by default.
 
 Behavior for
 * `enable_extended_results_for_datetime_functions = 0`: Functions `toStartOfYear`, `toStartOfISOYear`, `toStartOfQuarter`, `toStartOfMonth`, `toStartOfWeek`, `toLastDayOfMonth`, `toMonday` return `Date` or `DateTime`. Functions `toStartOfDay`, `toStartOfHour`, `toStartOfFifteenMinutes`, `toStartOfTenMinutes`, `toStartOfFiveMinutes`, `toStartOfMinute`, `timeSlot` return `DateTime`. Though these functions can take values of the extended types `Date32` and `DateTime64` as an argument, passing them a time outside the normal range (year 1970 to 2149 for `Date` / 2106 for `DateTime`) will produce wrong results.
@@ -367,12 +487,12 @@ toStartOfSecond(value, [timezone])
 
 **Arguments**
 
--   `value` — Date and time. [DateTime64](../../sql-reference/data-types/datetime64.md).
--   `timezone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). If not specified, the function uses the timezone of the `value` parameter. [String](../../sql-reference/data-types/string.md).
+- `value` — Date and time. [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `timezone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). If not specified, the function uses the timezone of the `value` parameter. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Input value without sub-seconds.
+- Input value without sub-seconds.
 
 Type: [DateTime64](../../sql-reference/data-types/datetime64.md).
 
@@ -410,7 +530,7 @@ Result:
 
 **See also**
 
--   [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) server configuration parameter.
+- [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) server configuration parameter.
 
 ## toStartOfFiveMinutes
 
@@ -499,9 +619,9 @@ The following table describes how the mode argument works.
 
 For mode values with a meaning of “with 4 or more days this year,” weeks are numbered according to ISO 8601:1988:
 
--   If the week containing January 1 has 4 or more days in the new year, it is week 1.
+- If the week containing January 1 has 4 or more days in the new year, it is week 1.
 
--   Otherwise, it is the last week of the previous year, and the next week is week 1.
+- Otherwise, it is the last week of the previous year, and the next week is week 1.
 
 For mode values with a meaning of “contains January 1”, the week contains January 1 is week 1. It does not matter how many days in the new year the week contained, even if it contained only one day.
 
@@ -513,9 +633,9 @@ toWeek(t[, mode[, time_zone]])
 
 **Arguments**
 
--   `t` – Date or DateTime.
--   `mode` – Optional parameter, Range of values is \[0,9\], default is 0.
--   `Timezone` – Optional parameter, it behaves like any other conversion function.
+- `t` – Date or DateTime.
+- `mode` – Optional parameter, Range of values is \[0,9\], default is 0.
+- `Timezone` – Optional parameter, it behaves like any other conversion function.
 
 **Example**
 
@@ -570,7 +690,7 @@ age('unit', startdate, enddate, [timezone])
 
 **Arguments**
 
--   `unit` — The type of interval for result. [String](../../sql-reference/data-types/string.md).
+- `unit` — The type of interval for result. [String](../../sql-reference/data-types/string.md).
     Possible values:
 
     - `second` (possible abbreviations: `ss`, `s`)
@@ -582,11 +702,11 @@ age('unit', startdate, enddate, [timezone])
     - `quarter` (possible abbreviations: `qq`, `q`)
     - `year` (possible abbreviations: `yyyy`, `yy`)
 
--   `startdate` — The first time value to subtract (the subtrahend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `startdate` — The first time value to subtract (the subtrahend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
--   `enddate` — The second time value to subtract from (the minuend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `enddate` — The second time value to subtract from (the minuend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
--   `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) (optional). If specified, it is applied to both `startdate` and `enddate`. If not specified, timezones of `startdate` and `enddate` are used. If they are not the same, the result is unspecified. [String](../../sql-reference/data-types/string.md).
+- `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) (optional). If specified, it is applied to both `startdate` and `enddate`. If not specified, timezones of `startdate` and `enddate` are used. If they are not the same, the result is unspecified. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -596,8 +716,6 @@ Type: [Int](../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT age('hour', toDateTime('2018-01-01 22:30:00'), toDateTime('2018-01-02 23:00:00'));
 ```
@@ -610,8 +728,6 @@ Result:
 └───────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-Query:
-
 ``` sql
 SELECT
     toDate('2022-01-01') AS e,
@@ -645,11 +761,11 @@ For an alternative to `date\_diff`, see function `age`.
 date_diff('unit', startdate, enddate, [timezone])
 ```
 
-Aliases: `dateDiff`, `DATE_DIFF`.
+Aliases: `dateDiff`, `DATE_DIFF`, `timestampDiff`, `timestamp_diff`, `TIMESTAMP_DIFF`.
 
 **Arguments**
 
--   `unit` — The type of interval for result. [String](../../sql-reference/data-types/string.md).
+- `unit` — The type of interval for result. [String](../../sql-reference/data-types/string.md).
     Possible values:
 
     - `second` (possible abbreviations: `ss`, `s`)
@@ -661,11 +777,11 @@ Aliases: `dateDiff`, `DATE_DIFF`.
     - `quarter` (possible abbreviations: `qq`, `q`)
     - `year` (possible abbreviations: `yyyy`, `yy`)
 
--   `startdate` — The first time value to subtract (the subtrahend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `startdate` — The first time value to subtract (the subtrahend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
--   `enddate` — The second time value to subtract from (the minuend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `enddate` — The second time value to subtract from (the minuend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
--   `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) (optional). If specified, it is applied to both `startdate` and `enddate`. If not specified, timezones of `startdate` and `enddate` are used. If they are not the same, the result is unspecified. [String](../../sql-reference/data-types/string.md).
+- `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) (optional). If specified, it is applied to both `startdate` and `enddate`. If not specified, timezones of `startdate` and `enddate` are used. If they are not the same, the result is unspecified. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -675,8 +791,6 @@ Type: [Int](../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT dateDiff('hour', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'));
 ```
@@ -689,8 +803,6 @@ Result:
 └────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-Query:
-
 ``` sql
 SELECT
     toDate('2022-01-01') AS e,
@@ -722,7 +834,7 @@ Alias: `dateTrunc`.
 
 **Arguments**
 
--   `unit` — The type of interval to truncate the result. [String Literal](../syntax.md#syntax-string-literal).
+- `unit` — The type of interval to truncate the result. [String Literal](../syntax.md#syntax-string-literal).
     Possible values:
 
     - `second`
@@ -734,12 +846,12 @@ Alias: `dateTrunc`.
     - `quarter`
     - `year`
 
--   `value` — Date and time. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
--   `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). If not specified, the function uses the timezone of the `value` parameter. [String](../../sql-reference/data-types/string.md).
+- `value` — Date and time. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). If not specified, the function uses the timezone of the `value` parameter. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Value, truncated to the specified part of date.
+- Value, truncated to the specified part of date.
 
 Type: [DateTime](../../sql-reference/data-types/datetime.md).
 
@@ -775,7 +887,7 @@ Result:
 
 **See Also**
 
--   [toStartOfInterval](#tostartofintervaltime-or-data-interval-x-unit-time-zone)
+- [toStartOfInterval](#tostartofintervaltime-or-data-interval-x-unit-time-zone)
 
 ## date\_add
 
@@ -791,7 +903,7 @@ Aliases: `dateAdd`, `DATE_ADD`.
 
 **Arguments**
 
--   `unit` — The type of interval to add. [String](../../sql-reference/data-types/string.md).
+- `unit` — The type of interval to add. [String](../../sql-reference/data-types/string.md).
     Possible values:
 
     - `second`
@@ -803,8 +915,8 @@ Aliases: `dateAdd`, `DATE_ADD`.
     - `quarter`
     - `year`
 
--   `value` — Value of interval to add. [Int](../../sql-reference/data-types/int-uint.md).
--   `date` — The date or date with time to which `value` is added. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `value` — Value of interval to add. [Int](../../sql-reference/data-types/int-uint.md).
+- `date` — The date or date with time to which `value` is added. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
@@ -814,8 +926,6 @@ Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-ref
 
 **Example**
 
-Query:
-
 ```sql
 SELECT date_add(YEAR, 3, toDate('2018-01-01'));
 ```
@@ -842,7 +952,7 @@ Aliases: `dateSub`, `DATE_SUB`.
 
 **Arguments**
 
--   `unit` — The type of interval to subtract. Note: The unit should be unquoted.
+- `unit` — The type of interval to subtract. Note: The unit should be unquoted.
 
     Possible values:
 
@@ -855,8 +965,8 @@ Aliases: `dateSub`, `DATE_SUB`.
     - `quarter`
     - `year`
 
--   `value` — Value of interval to subtract. [Int](../../sql-reference/data-types/int-uint.md).
--   `date` — The date or date with time from which `value` is subtracted. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `value` — Value of interval to subtract. [Int](../../sql-reference/data-types/int-uint.md).
+- `date` — The date or date with time from which `value` is subtracted. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
@@ -866,8 +976,6 @@ Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-ref
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT date_sub(YEAR, 3, toDate('2018-01-01'));
 ```
@@ -894,9 +1002,9 @@ Aliases: `timeStampAdd`, `TIMESTAMP_ADD`.
 
 **Arguments**
 
--   `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
--   `value` — Value of interval to add. [Int](../../sql-reference/data-types/int-uint.md).
--   `unit` — The type of interval to add. [String](../../sql-reference/data-types/string.md).
+- `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `value` — Value of interval to add. [Int](../../sql-reference/data-types/int-uint.md).
+- `unit` — The type of interval to add. [String](../../sql-reference/data-types/string.md).
     Possible values:
 
     - `second`
@@ -916,8 +1024,6 @@ Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-ref
 
 **Example**
 
-Query:
-
 ```sql
 select timestamp_add(toDate('2018-01-01'), INTERVAL 3 MONTH);
 ```
@@ -944,7 +1050,7 @@ Aliases: `timeStampSub`, `TIMESTAMP_SUB`.
 
 **Arguments**
 
--   `unit` — The type of interval to subtract. [String](../../sql-reference/data-types/string.md).
+- `unit` — The type of interval to subtract. [String](../../sql-reference/data-types/string.md).
     Possible values:
 
     - `second`
@@ -956,8 +1062,8 @@ Aliases: `timeStampSub`, `TIMESTAMP_SUB`.
     - `quarter`
     - `year`
 
--   `value` — Value of interval to subtract. [Int](../../sql-reference/data-types/int-uint.md).
--   `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `value` — Value of interval to subtract. [Int](../../sql-reference/data-types/int-uint.md).
+- `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
@@ -967,8 +1073,6 @@ Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-ref
 
 **Example**
 
-Query:
-
 ```sql
 select timestamp_sub(MONTH, 5, toDateTime('2018-12-18 01:02:03'));
 ```
@@ -993,11 +1097,11 @@ now([timezone])
 
 **Arguments**
 
--   `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). [String](../../sql-reference/data-types/string.md).
+- `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Current date and time.
+- Current date and time.
 
 Type: [DateTime](../../sql-reference/data-types/datetime.md).
 
@@ -1043,12 +1147,12 @@ now64([scale], [timezone])
 
 **Arguments**
 
--   `scale` - Tick size (precision): 10<sup>-precision</sup> seconds. Valid range: [ 0 : 9 ]. Typically are used - 3 (default) (milliseconds), 6 (microseconds), 9 (nanoseconds).
--   `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). [String](../../sql-reference/data-types/string.md).
+- `scale` - Tick size (precision): 10<sup>-precision</sup> seconds. Valid range: [ 0 : 9 ]. Typically are used - 3 (default) (milliseconds), 6 (microseconds), 9 (nanoseconds).
+- `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Current date and time with sub-second precision.
+- Current date and time with sub-second precision.
 
 Type: [DateTime64](../../sql-reference/data-types/datetime64.md).
 
@@ -1080,11 +1184,11 @@ nowInBlock([timezone])
 
 **Arguments**
 
--   `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). [String](../../sql-reference/data-types/string.md).
+- `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Current date and time at the moment of processing of each block of data.
+- Current date and time at the moment of processing of each block of data.
 
 Type: [DateTime](../../sql-reference/data-types/datetime.md).
 
@@ -1126,15 +1230,60 @@ Rounds the time to the half hour.
 
 ## toYYYYMM
 
-Converts a date or date with time to a UInt32 number containing the year and month number (YYYY \* 100 + MM).
+Converts a date or date with time to a UInt32 number containing the year and month number (YYYY \* 100 + MM). Accepts a second optional timezone argument. If provided, the timezone must be a string constant.
+
+**Example**
+
+``` sql
+SELECT
+    toYYYYMM(now(), 'US/Eastern')
+```
+
+Result:
+
+``` text
+┌─toYYYYMM(now(), 'US/Eastern')─┐
+│                        202303 │
+└───────────────────────────────┘
+```
 
 ## toYYYYMMDD
 
-Converts a date or date with time to a UInt32 number containing the year and month number (YYYY \* 10000 + MM \* 100 + DD).
+Converts a date or date with time to a UInt32 number containing the year and month number (YYYY \* 10000 + MM \* 100 + DD). Accepts a second optional timezone argument. If provided, the timezone must be a string constant.
+
+**Example**
+
+```sql
+SELECT
+    toYYYYMMDD(now(), 'US/Eastern')
+```
+
+Result:
+
+```response
+┌─toYYYYMMDD(now(), 'US/Eastern')─┐
+│                        20230302 │
+└─────────────────────────────────┘
+```
 
 ## toYYYYMMDDhhmmss
 
-Converts a date or date with time to a UInt64 number containing the year and month number (YYYY \* 10000000000 + MM \* 100000000 + DD \* 1000000 + hh \* 10000 + mm \* 100 + ss).
+Converts a date or date with time to a UInt64 number containing the year and month number (YYYY \* 10000000000 + MM \* 100000000 + DD \* 1000000 + hh \* 10000 + mm \* 100 + ss). Accepts a second optional timezone argument. If provided, the timezone must be a string constant.
+
+**Example**
+
+```sql
+SELECT
+    toYYYYMMDDhhmmss(now(), 'US/Eastern')
+```
+
+Result:
+
+```response
+┌─toYYYYMMDDhhmmss(now(), 'US/Eastern')─┐
+│                        20230302112209 │
+└───────────────────────────────────────┘
+```
 
 ## addYears, addMonths, addWeeks, addDays, addHours, addMinutes, addSeconds, addQuarters
 
@@ -1199,12 +1348,14 @@ SELECT timeSlots(toDateTime64('1980-12-12 21:01:02.1234', 4, 'UTC'), toDecimal64
 └───────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-## formatDateTime
+## formatDateTime {#date_time_functions-formatDateTime}
 
 Formats a Time according to the given Format string. Format is a constant expression, so you cannot have multiple formats for a single result column.
 
 formatDateTime uses MySQL datetime format style, refer to https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html#function_date-format.
 
+The opposite operation of this function is [parseDateTime](/docs/en/sql-reference/functions/type-conversion-functions.md#type_conversion_functions-parseDateTime).
+
 Alias: `DATE_FORMAT`.
 
 **Syntax**
@@ -1224,12 +1375,12 @@ Using replacement fields, you can define a pattern for the resulting string. “
 |----------|---------------------------------------------------------|------------|
 | %a       | abbreviated weekday name (Mon-Sun)                      | Mon        |
 | %b       | abbreviated month name (Jan-Dec)                        | Jan        |
-| %c       | month as a decimal number (01-12)                       | 01         |
+| %c       | month as an integer number (01-12)                      | 01         |
 | %C       | year divided by 100 and truncated to integer (00-99)    | 20         |
 | %d       | day of the month, zero-padded (01-31)                   | 02         |
 | %D       | Short MM/DD/YY date, equivalent to %m/%d/%y             | 01/02/18   |
 | %e       | day of the month, space-padded (1-31)                   | &nbsp; 2   |
-| %f       | fractional second from the fractional part of DateTime64 | 1234560   |
+| %f       | fractional second, see 'Note 1' below                   | 1234560    |
 | %F       | short YYYY-MM-DD date, equivalent to %Y-%m-%d           | 2018-01-02 |
 | %g       | two-digit year format, aligned to ISO 8601, abbreviated from four-digit notation                                | 18       |
 | %G       | four-digit year format for ISO week number, calculated from the week-based year [defined by the ISO 8601](https://en.wikipedia.org/wiki/ISO_8601#Week_dates) standard, normally useful only with %V  | 2018         |
@@ -1240,29 +1391,31 @@ Using replacement fields, you can define a pattern for the resulting string. “
 | %j       | day of the year (001-366)                               | 002        |
 | %k       | hour in 24h format (00-23)                              | 22         |
 | %l       | hour in 12h format (01-12)                              | 09         |
-| %m       | month as a decimal number (01-12)                       | 01         |
-| %M       | minute (00-59)                                          | 33         |
+| %m       | month as an integer number (01-12)                      | 01         |
+| %M       | full month name (January-December), see 'Note 2' below  | January    |
 | %n       | new-line character (‘’)                                 |            |
 | %p       | AM or PM designation                                    | PM         |
 | %Q       | Quarter (1-4)                                           | 1          |
-| %r       | 12-hour HH:MM AM/PM time, equivalent to %H:%M %p        | 10:30 PM   |
-| %R       | 24-hour HH:MM time, equivalent to %H:%M                 | 22:33      |
+| %r       | 12-hour HH:MM AM/PM time, equivalent to %H:%i %p        | 10:30 PM   |
+| %R       | 24-hour HH:MM time, equivalent to %H:%i                 | 22:33      |
 | %s       | second (00-59)                                          | 44         |
 | %S       | second (00-59)                                          | 44         |
 | %t       | horizontal-tab character (’)                            |            |
-| %T       | ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S | 22:33:44   |
+| %T       | ISO 8601 time format (HH:MM:SS), equivalent to %H:%i:%S | 22:33:44   |
 | %u       | ISO 8601 weekday as number with Monday as 1 (1-7)       | 2          |
 | %V       | ISO 8601 week number (01-53)                            | 01         |
-| %w       | weekday as a decimal number with Sunday as 0 (0-6)      | 2          |
+| %w       | weekday as a integer number with Sunday as 0 (0-6)      | 2          |
 | %W       | full weekday name (Monday-Sunday)                       | Monday     |
 | %y       | Year, last two digits (00-99)                           | 18         |
 | %Y       | Year                                                    | 2018       |
 | %z       | Time offset from UTC as +HHMM or -HHMM                  | -0500      |
 | %%       | a % sign                                                | %          |
 
-**Example**
+Note 1: In ClickHouse versions earlier than v23.4, `%f` prints a single zero (0) if the formatted value is a Date, Date32 or DateTime (which have no fractional seconds) or a DateTime64 with a precision of 0. The previous behavior can be restored using setting `formatdatetime_f_prints_single_zero = 1`.
 
-Query:
+Note 2: In ClickHouse versions earlier than v23.4, `%M` prints the minute (00-59) instead of the full month name (January-December). The previous behavior can be restored using setting `formatdatetime_parsedatetime_m_is_month_name = 0`.
+
+**Example**
 
 ``` sql
 SELECT formatDateTime(toDate('2010-01-04'), '%g')
@@ -1276,8 +1429,6 @@ Result:
 └────────────────────────────────────────────┘
 ```
 
-Query:
-
 ``` sql
 SELECT formatDateTime(toDateTime64('2010-01-04 12:34:56.123456', 7), '%f')
 ```
@@ -1292,17 +1443,18 @@ Result:
 
 **See Also**
 
--   [formatDateTimeInJodaSyntax](##formatDateTimeInJodaSyntax)
+- [formatDateTimeInJodaSyntax](##formatDateTimeInJodaSyntax)
 
 
-## formatDateTimeInJodaSyntax
+## formatDateTimeInJodaSyntax {#date_time_functions-formatDateTimeInJodaSyntax}
 
 Similar to formatDateTime, except that it formats datetime in Joda style instead of MySQL style. Refer to https://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html.
 
+The opposite operation of this function is [parseDateTimeInJodaSyntax](/docs/en/sql-reference/functions/type-conversion-functions.md#type_conversion_functions-parseDateTimeInJodaSyntax).
 
 **Replacement fields**
 
-Using replacement fields, you can define a pattern for the resulting string. 
+Using replacement fields, you can define a pattern for the resulting string.
 
 
 | Placeholder | Description                              | Presentation  | Examples                           |
@@ -1333,8 +1485,6 @@ Using replacement fields, you can define a pattern for the resulting string.
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT formatDateTimeInJodaSyntax(toDateTime('2010-01-04 12:34:56'), 'yyyy-MM-dd HH:mm:ss')
 ```
@@ -1360,20 +1510,18 @@ dateName(date_part, date)
 
 **Arguments**
 
--   `date_part` — Date part. Possible values: 'year', 'quarter', 'month', 'week', 'dayofyear', 'day', 'weekday', 'hour', 'minute', 'second'. [String](../../sql-reference/data-types/string.md).
--   `date` — Date. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
--   `timezone` — Timezone. Optional. [String](../../sql-reference/data-types/string.md).
+- `date_part` — Date part. Possible values: 'year', 'quarter', 'month', 'week', 'dayofyear', 'day', 'weekday', 'hour', 'minute', 'second'. [String](../../sql-reference/data-types/string.md).
+- `date` — Date. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `timezone` — Timezone. Optional. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   The specified part of date.
+- The specified part of date.
 
 Type: [String](../../sql-reference/data-types/string.md#string)
 
 **Example**
 
-Query:
-
 ```sql
 WITH toDateTime('2021-04-14 11:22:33') AS date_value
 SELECT
@@ -1402,18 +1550,16 @@ monthName(date)
 
 **Arguments**
 
--   `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
--   The name of the month.
+- The name of the month.
 
 Type: [String](../../sql-reference/data-types/string.md#string)
 
 **Example**
 
-Query:
-
 ```sql
 WITH toDateTime('2021-04-14 11:22:33') AS date_value
 SELECT monthName(date_value);
@@ -1427,28 +1573,26 @@ Result:
 └───────────────────────┘
 ```
 
-## FROM\_UNIXTIME
+## fromUnixTimestamp
 
 Function converts Unix timestamp to a calendar date and a time of a day. When there is only a single argument of [Integer](../../sql-reference/data-types/int-uint.md) type, it acts in the same way as [toDateTime](../../sql-reference/functions/type-conversion-functions.md#todatetime) and return [DateTime](../../sql-reference/data-types/datetime.md) type.
 
-FROM_UNIXTIME uses MySQL datetime format style, refer to https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html#function_date-format.
+fromUnixTimestamp uses MySQL datetime format style, refer to https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html#function_date-format.
 
-Alias: `fromUnixTimestamp`.
+Alias: `FROM_UNIXTIME`.
 
 **Example:**
 
-Query:
-
 ```sql
-SELECT FROM_UNIXTIME(423543535);
+SELECT fromUnixTimestamp(423543535);
 ```
 
 Result:
 
 ```text
-┌─FROM_UNIXTIME(423543535)─┐
-│      1983-06-04 10:58:55 │
-└──────────────────────────┘
+┌─fromUnixTimestamp(423543535)─┐
+│          1983-06-04 10:58:55 │
+└──────────────────────────────┘
 ```
 
 When there are two or three arguments, the first an [Integer](../../sql-reference/data-types/int-uint.md), [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md), the second a constant format string and the third an optional constant time zone string — it acts in the same way as [formatDateTime](#formatdatetime) and return [String](../../sql-reference/data-types/string.md#string) type.
@@ -1456,7 +1600,7 @@ When there are two or three arguments, the first an [Integer](../../sql-referenc
 For example:
 
 ```sql
-SELECT FROM_UNIXTIME(1234334543, '%Y-%m-%d %R:%S') AS DateTime;
+SELECT fromUnixTimestamp(1234334543, '%Y-%m-%d %R:%S') AS DateTime;
 ```
 
 ```text
@@ -1467,26 +1611,25 @@ SELECT FROM_UNIXTIME(1234334543, '%Y-%m-%d %R:%S') AS DateTime;
 
 **See Also**
 
--   [fromUnixTimestampInJodaSyntax](##fromUnixTimestampInJodaSyntax)
-
+- [fromUnixTimestampInJodaSyntax](##fromUnixTimestampInJodaSyntax)
 
 ## fromUnixTimestampInJodaSyntax
-Similar to FROM_UNIXTIME, except that it formats time in Joda style instead of MySQL style. Refer to https://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html.
+
+Similar to fromUnixTimestamp, except that it formats time in Joda style instead of MySQL style. Refer to https://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html.
 
 **Example:**
-Query:
+
 ``` sql
 SELECT fromUnixTimestampInJodaSyntax(1669804872, 'yyyy-MM-dd HH:mm:ss', 'UTC');
 ```
 
 Result:
 ```
-┌─fromUnixTimestampInJodaSyntax(1669804872, 'yyyy-MM-dd HH:mm:ss', 'UTC')─┐
+┌─fromUnixTimestampInJodaSyntax(1669804872, 'yyyy-MM-dd HH:mm:ss', 'UTC')────┐
 │ 2022-11-30 10:41:12                                                        │
 └────────────────────────────────────────────────────────────────────────────┘
 ```
 
-
 ## toModifiedJulianDay
 
 Converts a [Proleptic Gregorian calendar](https://en.wikipedia.org/wiki/Proleptic_Gregorian_calendar) date in text form `YYYY-MM-DD` to a [Modified Julian Day](https://en.wikipedia.org/wiki/Julian_day#Variants) number in Int32. This function supports date from `0000-01-01` to `9999-12-31`. It raises an exception if the argument cannot be parsed as a date, or the date is invalid.
@@ -1499,18 +1642,16 @@ toModifiedJulianDay(date)
 
 **Arguments**
 
--   `date` — Date in text form. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+- `date` — Date in text form. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
 
 **Returned value**
 
--   Modified Julian Day number.
+- Modified Julian Day number.
 
 Type: [Int32](../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT toModifiedJulianDay('2020-01-01');
 ```
@@ -1535,18 +1676,16 @@ toModifiedJulianDayOrNull(date)
 
 **Arguments**
 
--   `date` — Date in text form. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+- `date` — Date in text form. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
 
 **Returned value**
 
--   Modified Julian Day number.
+- Modified Julian Day number.
 
 Type: [Nullable(Int32)](../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT toModifiedJulianDayOrNull('2020-01-01');
 ```
@@ -1571,18 +1710,16 @@ fromModifiedJulianDay(day)
 
 **Arguments**
 
--   `day` — Modified Julian Day number. [Any integral types](../../sql-reference/data-types/int-uint.md).
+- `day` — Modified Julian Day number. [Any integral types](../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Date in text form.
+- Date in text form.
 
 Type: [String](../../sql-reference/data-types/string.md)
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT fromModifiedJulianDay(58849);
 ```
@@ -1607,18 +1744,16 @@ fromModifiedJulianDayOrNull(day)
 
 **Arguments**
 
--   `day` — Modified Julian Day number. [Any integral types](../../sql-reference/data-types/int-uint.md).
+- `day` — Modified Julian Day number. [Any integral types](../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Date in text form.
+- Date in text form.
 
 Type: [Nullable(String)](../../sql-reference/data-types/string.md)
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT fromModifiedJulianDayOrNull(58849);
 ```
diff --git a/docs/en/sql-reference/functions/distance-functions.md b/docs/en/sql-reference/functions/distance-functions.md
index 293e02f8a54..660af6912b0 100644
--- a/docs/en/sql-reference/functions/distance-functions.md
+++ b/docs/en/sql-reference/functions/distance-functions.md
@@ -1,7 +1,10 @@
 ---
 slug: /en/sql-reference/functions/distance-functions
+sidebar_position: 55
+sidebar_label: Distance
 ---
-# Distance functions
+
+# Distance Functions
 
 ## L1Norm
 
@@ -17,11 +20,11 @@ Alias: `normL1`.
 
 **Arguments**
 
--   `vector` — [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector` — [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   L1-norm or [taxicab geometry](https://en.wikipedia.org/wiki/Taxicab_geometry) distance.
+- L1-norm or [taxicab geometry](https://en.wikipedia.org/wiki/Taxicab_geometry) distance.
 
 Type: [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
 
@@ -55,11 +58,11 @@ Alias: `normL2`.
 
 **Arguments**
 
--   `vector` — [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector` — [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   L2-norm or [Euclidean distance](https://en.wikipedia.org/wiki/Euclidean_distance).
+- L2-norm or [Euclidean distance](https://en.wikipedia.org/wiki/Euclidean_distance).
 
 Type: [Float](../../sql-reference/data-types/float.md).
 
@@ -93,11 +96,11 @@ Alias: `normLinf`.
 
 **Arguments**
 
--   `vector` — [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector` — [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   Linf-norm or the maximum absolute value.
+- Linf-norm or the maximum absolute value.
 
 Type: [Float](../../sql-reference/data-types/float.md).
 
@@ -131,12 +134,12 @@ Alias: `normLp`.
 
 **Arguments**
 
--   `vector` — [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
--   `p` — The power. Possible values: real number in `[1; inf)`. [UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+- `vector` — [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `p` — The power. Possible values: real number in `[1; inf)`. [UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
 
 **Returned value**
 
--   [Lp-norm](https://en.wikipedia.org/wiki/Norm_(mathematics)#p-norm)
+- [Lp-norm](https://en.wikipedia.org/wiki/Norm_(mathematics)#p-norm)
 
 Type: [Float](../../sql-reference/data-types/float.md).
 
@@ -170,12 +173,12 @@ Alias: `distanceL1`.
 
 **Arguments**
 
--   `vector1` — First vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
--   `vector2` — Second vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector1` — First vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector2` — Second vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   1-norm distance.
+- 1-norm distance.
 
 Type: [Float](../../sql-reference/data-types/float.md).
 
@@ -209,12 +212,12 @@ Alias: `distanceL2`.
 
 **Arguments**
 
--   `vector1` — First vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
--   `vector2` — Second vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector1` — First vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector2` — Second vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   2-norm distance.
+- 2-norm distance.
 
 Type: [Float](../../sql-reference/data-types/float.md).
 
@@ -248,12 +251,12 @@ Alias: `distanceLinf`.
 
 **Arguments**
 
--   `vector1` — First vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
--   `vector1` — Second vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector1` — First vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector1` — Second vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   Infinity-norm distance.
+- Infinity-norm distance.
 
 Type: [Float](../../sql-reference/data-types/float.md).
 
@@ -287,13 +290,13 @@ Alias: `distanceLp`.
 
 **Arguments**
 
--   `vector1` — First vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
--   `vector2` — Second vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
--   `p` — The power. Possible values: real number from `[1; inf)`. [UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+- `vector1` — First vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector2` — Second vector. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `p` — The power. Possible values: real number from `[1; inf)`. [UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
 
 **Returned value**
 
--   p-norm distance.
+- p-norm distance.
 
 Type: [Float](../../sql-reference/data-types/float.md).
 
@@ -328,11 +331,11 @@ Alias: `normalizeL1`.
 
 **Arguments**
 
--   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
--   Unit vector.
+- Unit vector.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md) of [Float](../../sql-reference/data-types/float.md).
 
@@ -366,11 +369,11 @@ Alias: `normalizeL1`.
 
 **Arguments**
 
--   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
--   Unit vector.
+- Unit vector.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md) of [Float](../../sql-reference/data-types/float.md).
 
@@ -404,11 +407,11 @@ Alias: `normalizeLinf `.
 
 **Arguments**
 
--   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
--   Unit vector.
+- Unit vector.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md) of [Float](../../sql-reference/data-types/float.md).
 
@@ -442,12 +445,12 @@ Alias: `normalizeLp `.
 
 **Arguments**
 
--   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
--   `p` — The power. Possible values: any number from [1;inf). [UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+- `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+- `p` — The power. Possible values: any number from [1;inf). [UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
 
 **Returned value**
 
--   Unit vector.
+- Unit vector.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md) of [Float](../../sql-reference/data-types/float.md).
 
@@ -479,12 +482,12 @@ cosineDistance(vector1, vector2)
 
 **Arguments**
 
--   `vector1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
--   `vector2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+- `vector2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   Cosine of the angle between two vectors substracted from one.
+- Cosine of the angle between two vectors substracted from one.
 
 Type: [Float](../../sql-reference/data-types/float.md).
 
diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index cccc02c2553..618dd3f4b4f 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/encoding-functions
-sidebar_position: 52
+sidebar_position: 65
 sidebar_label: Encoding
 ---
 
@@ -18,11 +18,11 @@ char(number_1, [number_2, ..., number_n]);
 
 **Arguments**
 
--   `number_1, number_2, ..., number_n` — Numerical arguments interpreted as integers. Types: [Int](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md).
+- `number_1, number_2, ..., number_n` — Numerical arguments interpreted as integers. Types: [Int](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md).
 
 **Returned value**
 
--   a string of given bytes.
+- a string of given bytes.
 
 Type: `String`.
 
@@ -98,11 +98,11 @@ Values of [UUID](../data-types/uuid.md) type are encoded as big-endian order str
 
 **Arguments**
 
--   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
--   A string with the hexadecimal representation of the argument.
+- A string with the hexadecimal representation of the argument.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -185,13 +185,13 @@ unhex(arg)
 
 **Arguments**
 
--   `arg` — A string containing any number of hexadecimal digits. Type: [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md).
+- `arg` — A string containing any number of hexadecimal digits. Type: [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md).
 
 Supports both uppercase and lowercase letters `A-F`. The number of hexadecimal digits does not have to be even. If it is odd, the last digit is interpreted as the least significant half of the `00-0F` byte. If the argument string contains anything other than hexadecimal digits, some implementation-defined result is returned (an exception isn’t thrown). For a numeric argument the inverse of hex(N) is not performed by unhex().
 
 **Returned value**
 
--   A binary string (BLOB).
+- A binary string (BLOB).
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -247,11 +247,11 @@ Values of [UUID](../data-types/uuid.md) type are encoded as big-endian order str
 
 **Arguments**
 
--   `arg` — A value to convert to binary. [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md), or [DateTime](../../sql-reference/data-types/datetime.md).
+- `arg` — A value to convert to binary. [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md), or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
--   A string with the binary representation of the argument.
+- A string with the binary representation of the argument.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -338,11 +338,11 @@ Supports binary digits `0` and `1`. The number of binary digits does not have to
 
 **Arguments**
 
--   `arg` — A string containing any number of binary digits. [String](../../sql-reference/data-types/string.md).
+- `arg` — A string containing any number of binary digits. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   A binary string (BLOB).
+- A binary string (BLOB).
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -396,11 +396,11 @@ bitPositionsToArray(arg)
 
 **Arguments**
 
--   `arg` — Integer value. [Int/UInt](../../sql-reference/data-types/int-uint.md).
+- `arg` — Integer value. [Int/UInt](../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   An array containing a list of positions of bits that equal `1`, in ascending order.
+- An array containing a list of positions of bits that equal `1`, in ascending order.
 
 Type: [Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md)).
 
diff --git a/docs/en/sql-reference/functions/encryption-functions.md b/docs/en/sql-reference/functions/encryption-functions.md
index 1edb20fd9ed..1224b7bc92b 100644
--- a/docs/en/sql-reference/functions/encryption-functions.md
+++ b/docs/en/sql-reference/functions/encryption-functions.md
@@ -1,8 +1,7 @@
 ---
 slug: /en/sql-reference/functions/encryption-functions
-sidebar_position: 67
+sidebar_position: 70
 sidebar_label: Encryption
-title: "Encryption functions"
 ---
 
 These functions  implement encryption and decryption of data with AES (Advanced Encryption Standard) algorithm.
@@ -17,11 +16,11 @@ Note that these functions work slowly until ClickHouse 21.1.
 
 This function encrypts data using these modes:
 
--   aes-128-ecb, aes-192-ecb, aes-256-ecb
--   aes-128-cbc, aes-192-cbc, aes-256-cbc
--   aes-128-ofb, aes-192-ofb, aes-256-ofb
--   aes-128-gcm, aes-192-gcm, aes-256-gcm
--   aes-128-ctr, aes-192-ctr, aes-256-ctr
+- aes-128-ecb, aes-192-ecb, aes-256-ecb
+- aes-128-cbc, aes-192-cbc, aes-256-cbc
+- aes-128-ofb, aes-192-ofb, aes-256-ofb
+- aes-128-gcm, aes-192-gcm, aes-256-gcm
+- aes-128-ctr, aes-192-ctr, aes-256-ctr
 
 **Syntax**
 
@@ -31,15 +30,15 @@ encrypt('mode', 'plaintext', 'key' [, iv, aad])
 
 **Arguments**
 
--   `mode` — Encryption mode. [String](../../sql-reference/data-types/string.md#string).
--   `plaintext` — Text thats need to be encrypted. [String](../../sql-reference/data-types/string.md#string).
--   `key` — Encryption key. [String](../../sql-reference/data-types/string.md#string).
--   `iv` — Initialization vector. Required for `-gcm` modes, optinal for others. [String](../../sql-reference/data-types/string.md#string).
--   `aad` — Additional authenticated data. It isn't encrypted, but it affects decryption. Works only in `-gcm` modes, for others would throw an exception. [String](../../sql-reference/data-types/string.md#string).
+- `mode` — Encryption mode. [String](../../sql-reference/data-types/string.md#string).
+- `plaintext` — Text thats need to be encrypted. [String](../../sql-reference/data-types/string.md#string).
+- `key` — Encryption key. [String](../../sql-reference/data-types/string.md#string).
+- `iv` — Initialization vector. Required for `-gcm` modes, optinal for others. [String](../../sql-reference/data-types/string.md#string).
+- `aad` — Additional authenticated data. It isn't encrypted, but it affects decryption. Works only in `-gcm` modes, for others would throw an exception. [String](../../sql-reference/data-types/string.md#string).
 
 **Returned value**
 
--   Ciphertext binary string. [String](../../sql-reference/data-types/string.md#string).
+- Ciphertext binary string. [String](../../sql-reference/data-types/string.md#string).
 
 **Examples**
 
@@ -112,9 +111,9 @@ Will produce the same ciphertext as `encrypt` on equal inputs. But when `key` or
 
 Supported encryption modes:
 
--   aes-128-ecb, aes-192-ecb, aes-256-ecb
--   aes-128-cbc, aes-192-cbc, aes-256-cbc
--   aes-128-ofb, aes-192-ofb, aes-256-ofb
+- aes-128-ecb, aes-192-ecb, aes-256-ecb
+- aes-128-cbc, aes-192-cbc, aes-256-cbc
+- aes-128-ofb, aes-192-ofb, aes-256-ofb
 
 **Syntax**
 
@@ -124,10 +123,10 @@ aes_encrypt_mysql('mode', 'plaintext', 'key' [, iv])
 
 **Arguments**
 
--   `mode` — Encryption mode. [String](../../sql-reference/data-types/string.md#string).
--   `plaintext` — Text that needs to be encrypted. [String](../../sql-reference/data-types/string.md#string).
--   `key` — Encryption key. If key is longer than required by mode, MySQL-specific key folding is performed. [String](../../sql-reference/data-types/string.md#string).
--   `iv` — Initialization vector. Optional, only first 16 bytes are taken into account [String](../../sql-reference/data-types/string.md#string).
+- `mode` — Encryption mode. [String](../../sql-reference/data-types/string.md#string).
+- `plaintext` — Text that needs to be encrypted. [String](../../sql-reference/data-types/string.md#string).
+- `key` — Encryption key. If key is longer than required by mode, MySQL-specific key folding is performed. [String](../../sql-reference/data-types/string.md#string).
+- `iv` — Initialization vector. Optional, only first 16 bytes are taken into account [String](../../sql-reference/data-types/string.md#string).
 
 **Returned value**
 
@@ -217,11 +216,11 @@ mysql> SELECT aes_encrypt('Secret', '123456789101213141516171819202122', 'iviviv
 
 This function decrypts ciphertext into a plaintext using these modes:
 
--   aes-128-ecb, aes-192-ecb, aes-256-ecb
--   aes-128-cbc, aes-192-cbc, aes-256-cbc
--   aes-128-ofb, aes-192-ofb, aes-256-ofb
--   aes-128-gcm, aes-192-gcm, aes-256-gcm
--   aes-128-ctr, aes-192-ctr, aes-256-ctr
+- aes-128-ecb, aes-192-ecb, aes-256-ecb
+- aes-128-cbc, aes-192-cbc, aes-256-cbc
+- aes-128-ofb, aes-192-ofb, aes-256-ofb
+- aes-128-gcm, aes-192-gcm, aes-256-gcm
+- aes-128-ctr, aes-192-ctr, aes-256-ctr
 
 **Syntax**
 
@@ -231,15 +230,15 @@ decrypt('mode', 'ciphertext', 'key' [, iv, aad])
 
 **Arguments**
 
--   `mode` — Decryption mode. [String](../../sql-reference/data-types/string.md#string).
--   `ciphertext` — Encrypted text that needs to be decrypted. [String](../../sql-reference/data-types/string.md#string).
--   `key` — Decryption key. [String](../../sql-reference/data-types/string.md#string).
--   `iv` — Initialization vector. Required for `-gcm` modes, optinal for others. [String](../../sql-reference/data-types/string.md#string).
--   `aad` — Additional authenticated data. Won't decrypt if this value is incorrect. Works only in `-gcm` modes, for others would throw an exception. [String](../../sql-reference/data-types/string.md#string).
+- `mode` — Decryption mode. [String](../../sql-reference/data-types/string.md#string).
+- `ciphertext` — Encrypted text that needs to be decrypted. [String](../../sql-reference/data-types/string.md#string).
+- `key` — Decryption key. [String](../../sql-reference/data-types/string.md#string).
+- `iv` — Initialization vector. Required for `-gcm` modes, optinal for others. [String](../../sql-reference/data-types/string.md#string).
+- `aad` — Additional authenticated data. Won't decrypt if this value is incorrect. Works only in `-gcm` modes, for others would throw an exception. [String](../../sql-reference/data-types/string.md#string).
 
 **Returned value**
 
--   Decrypted String. [String](../../sql-reference/data-types/string.md#string).
+- Decrypted String. [String](../../sql-reference/data-types/string.md#string).
 
 **Examples**
 
@@ -349,10 +348,10 @@ Will produce same plaintext as `decrypt` on equal inputs. But when `key` or `iv`
 
 Supported decryption modes:
 
--   aes-128-ecb, aes-192-ecb, aes-256-ecb
--   aes-128-cbc, aes-192-cbc, aes-256-cbc
--   aes-128-cfb128
--   aes-128-ofb, aes-192-ofb, aes-256-ofb
+- aes-128-ecb, aes-192-ecb, aes-256-ecb
+- aes-128-cbc, aes-192-cbc, aes-256-cbc
+- aes-128-cfb128
+- aes-128-ofb, aes-192-ofb, aes-256-ofb
 
 **Syntax**
 
@@ -362,14 +361,14 @@ aes_decrypt_mysql('mode', 'ciphertext', 'key' [, iv])
 
 **Arguments**
 
--   `mode` — Decryption mode. [String](../../sql-reference/data-types/string.md#string).
--   `ciphertext` — Encrypted text that needs to be decrypted. [String](../../sql-reference/data-types/string.md#string).
--   `key` — Decryption key. [String](../../sql-reference/data-types/string.md#string).
--   `iv` — Initialization vector. Optinal. [String](../../sql-reference/data-types/string.md#string).
+- `mode` — Decryption mode. [String](../../sql-reference/data-types/string.md#string).
+- `ciphertext` — Encrypted text that needs to be decrypted. [String](../../sql-reference/data-types/string.md#string).
+- `key` — Decryption key. [String](../../sql-reference/data-types/string.md#string).
+- `iv` — Initialization vector. Optinal. [String](../../sql-reference/data-types/string.md#string).
 
 **Returned value**
 
--   Decrypted String. [String](../../sql-reference/data-types/string.md#string).
+- Decrypted String. [String](../../sql-reference/data-types/string.md#string).
 
 **Examples**
 
diff --git a/docs/en/sql-reference/functions/ext-dict-functions.md b/docs/en/sql-reference/functions/ext-dict-functions.md
index b4b7ec5ab21..7d8aa2c0390 100644
--- a/docs/en/sql-reference/functions/ext-dict-functions.md
+++ b/docs/en/sql-reference/functions/ext-dict-functions.md
@@ -1,16 +1,16 @@
 ---
 slug: /en/sql-reference/functions/ext-dict-functions
-sidebar_position: 58
+sidebar_position: 50
 sidebar_label: Dictionaries
 ---
 
 # Functions for Working with Dictionaries
 
-:::note    
+:::note
 For dictionaries created with [DDL queries](../../sql-reference/statements/create/dictionary.md), the `dict_name` parameter must be fully specified, like `<database>.<dict_name>`. Otherwise, the current database is used.
 :::
 
-For information on connecting and configuring dictionaries, see [Dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
+For information on connecting and configuring dictionaries, see [Dictionaries](../../sql-reference/dictionaries/index.md).
 
 ## dictGet, dictGetOrDefault, dictGetOrNull
 
@@ -24,16 +24,16 @@ dictGetOrNull('dict_name', attr_name, id_expr)
 
 **Arguments**
 
--   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
--   `attr_names` — Name of the column of the dictionary, [String literal](../../sql-reference/syntax.md#syntax-string-literal), or tuple of column names, [Tuple](../../sql-reference/data-types/tuple.md)([String literal](../../sql-reference/syntax.md#syntax-string-literal)).
--   `id_expr` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning dictionary key-type value or [Tuple](../../sql-reference/data-types/tuple.md)-type value depending on the dictionary configuration.
--   `default_value_expr` — Values returned if the dictionary does not contain a row with the `id_expr` key. [Expression](../../sql-reference/syntax.md#syntax-expressions) or [Tuple](../../sql-reference/data-types/tuple.md)([Expression](../../sql-reference/syntax.md#syntax-expressions)), returning the value (or values) in the data types configured for the `attr_names` attribute.
+- `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
+- `attr_names` — Name of the column of the dictionary, [String literal](../../sql-reference/syntax.md#syntax-string-literal), or tuple of column names, [Tuple](../../sql-reference/data-types/tuple.md)([String literal](../../sql-reference/syntax.md#syntax-string-literal)).
+- `id_expr` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning dictionary key-type value or [Tuple](../../sql-reference/data-types/tuple.md)-type value depending on the dictionary configuration.
+- `default_value_expr` — Values returned if the dictionary does not contain a row with the `id_expr` key. [Expression](../../sql-reference/syntax.md#syntax-expressions) or [Tuple](../../sql-reference/data-types/tuple.md)([Expression](../../sql-reference/syntax.md#syntax-expressions)), returning the value (or values) in the data types configured for the `attr_names` attribute.
 
 **Returned value**
 
--   If ClickHouse parses the attribute successfully in the [attribute’s data type](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes), functions return the value of the dictionary attribute that corresponds to `id_expr`.
+- If ClickHouse parses the attribute successfully in the [attribute’s data type](../../sql-reference/dictionaries/index.md#dictionary-key-and-fields#ext_dict_structure-attributes), functions return the value of the dictionary attribute that corresponds to `id_expr`.
 
--   If there is no the key, corresponding to `id_expr`, in the dictionary, then:
+- If there is no the key, corresponding to `id_expr`, in the dictionary, then:
 
         - `dictGet` returns the content of the `<null_value>` element specified for the attribute in the dictionary configuration.
         - `dictGetOrDefault` returns the value passed as the `default_value_expr` parameter.
@@ -226,7 +226,7 @@ Result:
 
 **See Also**
 
--   [Dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md)
+- [Dictionaries](../../sql-reference/dictionaries/index.md)
 
 ## dictHas
 
@@ -238,19 +238,19 @@ dictHas('dict_name', id_expr)
 
 **Arguments**
 
--   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
--   `id_expr` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning dictionary key-type value or [Tuple](../../sql-reference/data-types/tuple.md)-type value depending on the dictionary configuration.
+- `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
+- `id_expr` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning dictionary key-type value or [Tuple](../../sql-reference/data-types/tuple.md)-type value depending on the dictionary configuration.
 
 **Returned value**
 
--   0, if there is no key.
--   1, if there is a key.
+- 0, if there is no key.
+- 1, if there is a key.
 
 Type: `UInt8`.
 
 ## dictGetHierarchy
 
-Creates an array, containing all the parents of a key in the [hierarchical dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md).
+Creates an array, containing all the parents of a key in the [hierarchical dictionary](../../sql-reference/dictionaries/index.md#hierarchical-dictionaries).
 
 **Syntax**
 
@@ -260,12 +260,12 @@ dictGetHierarchy('dict_name', key)
 
 **Arguments**
 
--   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
--   `key` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
+- `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
+- `key` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
 
 **Returned value**
 
--   Parents for the key.
+- Parents for the key.
 
 Type: [Array(UInt64)](../../sql-reference/data-types/array.md).
 
@@ -279,14 +279,14 @@ dictIsIn('dict_name', child_id_expr, ancestor_id_expr)
 
 **Arguments**
 
--   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
--   `child_id_expr` — Key to be checked. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
--   `ancestor_id_expr` — Alleged ancestor of the `child_id_expr` key. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
+- `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
+- `child_id_expr` — Key to be checked. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
+- `ancestor_id_expr` — Alleged ancestor of the `child_id_expr` key. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
 
 **Returned value**
 
--   0, if `child_id_expr` is not a child of `ancestor_id_expr`.
--   1, if `child_id_expr` is a child of `ancestor_id_expr` or if `child_id_expr` is an `ancestor_id_expr`.
+- 0, if `child_id_expr` is not a child of `ancestor_id_expr`.
+- 1, if `child_id_expr` is a child of `ancestor_id_expr` or if `child_id_expr` is an `ancestor_id_expr`.
 
 Type: `UInt8`.
 
@@ -302,12 +302,12 @@ dictGetChildren(dict_name, key)
 
 **Arguments**
 
--   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
--   `key` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
+- `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
+- `key` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
 
 **Returned values**
 
--   First-level descendants for the key.
+- First-level descendants for the key.
 
 Type: [Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md)).
 
@@ -351,13 +351,13 @@ dictGetDescendants(dict_name, key, level)
 
 **Arguments**
 
--   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
--   `key` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
--   `level` — Hierarchy level. If `level = 0` returns all descendants to the end. [UInt8](../../sql-reference/data-types/int-uint.md).
+- `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
+- `key` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
+- `level` — Hierarchy level. If `level = 0` returns all descendants to the end. [UInt8](../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   Descendants for the key.
+- Descendants for the key.
 
 Type: [Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md)).
 
@@ -409,14 +409,14 @@ ClickHouse supports specialized functions that convert dictionary attribute valu
 
 Functions:
 
--   `dictGetInt8`, `dictGetInt16`, `dictGetInt32`, `dictGetInt64`
--   `dictGetUInt8`, `dictGetUInt16`, `dictGetUInt32`, `dictGetUInt64`
--   `dictGetFloat32`, `dictGetFloat64`
--   `dictGetDate`
--   `dictGetDateTime`
--   `dictGetUUID`
--   `dictGetString`
--   `dictGetIPv4`, `dictGetIPv6`
+- `dictGetInt8`, `dictGetInt16`, `dictGetInt32`, `dictGetInt64`
+- `dictGetUInt8`, `dictGetUInt16`, `dictGetUInt32`, `dictGetUInt64`
+- `dictGetFloat32`, `dictGetFloat64`
+- `dictGetDate`
+- `dictGetDateTime`
+- `dictGetUUID`
+- `dictGetString`
+- `dictGetIPv4`, `dictGetIPv6`
 
 All these functions have the `OrDefault` modification. For example, `dictGetDateOrDefault`.
 
@@ -429,16 +429,16 @@ dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
 
 **Arguments**
 
--   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
--   `attr_name` — Name of the column of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
--   `id_expr` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md) or [Tuple](../../sql-reference/data-types/tuple.md)-type value depending on the dictionary configuration.
--   `default_value_expr` — Value returned if the dictionary does not contain a row with the `id_expr` key. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning the value in the data type configured for the `attr_name` attribute.
+- `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
+- `attr_name` — Name of the column of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
+- `id_expr` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md) or [Tuple](../../sql-reference/data-types/tuple.md)-type value depending on the dictionary configuration.
+- `default_value_expr` — Value returned if the dictionary does not contain a row with the `id_expr` key. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning the value in the data type configured for the `attr_name` attribute.
 
 **Returned value**
 
--   If ClickHouse parses the attribute successfully in the [attribute’s data type](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes), functions return the value of the dictionary attribute that corresponds to `id_expr`.
+- If ClickHouse parses the attribute successfully in the [attribute’s data type](../../sql-reference/dictionaries/index.md#dictionary-key-and-fields#ext_dict_structure-attributes), functions return the value of the dictionary attribute that corresponds to `id_expr`.
 
--   If there is no requested `id_expr` in the dictionary then:
+- If there is no requested `id_expr` in the dictionary then:
 
         - `dictGet[Type]` returns the content of the `<null_value>` element specified for the attribute in the dictionary configuration.
         - `dictGet[Type]OrDefault` returns the value passed as the `default_value_expr` parameter.
diff --git a/docs/en/sql-reference/functions/files.md b/docs/en/sql-reference/functions/files.md
index 91279cd991a..5cd2d8e0a74 100644
--- a/docs/en/sql-reference/functions/files.md
+++ b/docs/en/sql-reference/functions/files.md
@@ -1,13 +1,14 @@
 ---
 slug: /en/sql-reference/functions/files
-sidebar_position: 43
+sidebar_position: 75
 sidebar_label: Files
-title: "Functions for Working with Files"
 ---
 
 ## file
 
-Reads file as a String. The file content is not parsed, so any information is read as one string and placed into the specified column.
+Reads file as string and loads the data into the specified column. The actual file content is not interpreted.
+
+Also see table function [file](../table-functions/file.md).
 
 **Syntax**
 
@@ -17,8 +18,8 @@ file(path[, default])
 
 **Arguments**
 
--   `path` — The relative path to the file from [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Path to file support following wildcards: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc', 'def'` — strings.
--   `default` — The value that will be returned in the case when a file does not exist or cannot be accessed. Data types supported: [String](../../sql-reference/data-types/string.md) and [NULL](../../sql-reference/syntax.md#null-literal).
+- `path` — The path of the file relative to [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Supports the following wildcards: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` are numbers and `'abc', 'def'` are strings.
+- `default` — The value that will be returned in the case the file does not exist or cannot be accessed. Supported data types: [String](../../sql-reference/data-types/string.md) and [NULL](../../sql-reference/syntax.md#null-literal).
 
 **Example**
 
@@ -29,8 +30,3 @@ Query:
 ``` sql
 INSERT INTO table SELECT file('a.txt'), file('b.txt');
 ```
-
-**See Also**
-
--   [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path)
--   [file](../table-functions/file.md)
diff --git a/docs/en/sql-reference/functions/functions-for-nulls.md b/docs/en/sql-reference/functions/functions-for-nulls.md
index 7dc798aa6c1..0b7df54b776 100644
--- a/docs/en/sql-reference/functions/functions-for-nulls.md
+++ b/docs/en/sql-reference/functions/functions-for-nulls.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/functions-for-nulls
-sidebar_position: 63
+sidebar_position: 135
 sidebar_label: Nullable
 ---
 
@@ -18,12 +18,12 @@ Alias: `ISNULL`.
 
 **Arguments**
 
--   `x` — A value with a non-compound data type.
+- `x` — A value with a non-compound data type.
 
 **Returned value**
 
--   `1` if `x` is `NULL`.
--   `0` if `x` is not `NULL`.
+- `1` if `x` is `NULL`.
+- `0` if `x` is not `NULL`.
 
 **Example**
 
@@ -58,12 +58,12 @@ isNotNull(x)
 
 **Arguments:**
 
--   `x` — A value with a non-compound data type.
+- `x` — A value with a non-compound data type.
 
 **Returned value**
 
--   `0` if `x` is `NULL`.
--   `1` if `x` is not `NULL`.
+- `0` if `x` is `NULL`.
+- `1` if `x` is not `NULL`.
 
 **Example**
 
@@ -98,12 +98,12 @@ coalesce(x,...)
 
 **Arguments:**
 
--   Any number of parameters of a non-compound type. All parameters must be compatible by data type.
+- Any number of parameters of a non-compound type. All parameters must be compatible by data type.
 
 **Returned values**
 
--   The first non-`NULL` argument.
--   `NULL`, if all arguments are `NULL`.
+- The first non-`NULL` argument.
+- `NULL`, if all arguments are `NULL`.
 
 **Example**
 
@@ -141,13 +141,13 @@ ifNull(x,alt)
 
 **Arguments:**
 
--   `x` — The value to check for `NULL`.
--   `alt` — The value that the function returns if `x` is `NULL`.
+- `x` — The value to check for `NULL`.
+- `alt` — The value that the function returns if `x` is `NULL`.
 
 **Returned values**
 
--   The value `x`, if `x` is not `NULL`.
--   The value `alt`, if `x` is `NULL`.
+- The value `x`, if `x` is not `NULL`.
+- The value `alt`, if `x` is `NULL`.
 
 **Example**
 
@@ -185,8 +185,8 @@ nullIf(x, y)
 
 **Returned values**
 
--   `NULL`, if the arguments are equal.
--   The `x` value, if the arguments are not equal.
+- `NULL`, if the arguments are equal.
+- The `x` value, if the arguments are not equal.
 
 **Example**
 
@@ -220,12 +220,12 @@ assumeNotNull(x)
 
 **Arguments:**
 
--   `x` — The original value.
+- `x` — The original value.
 
 **Returned values**
 
--   The original value from the non-`Nullable` type, if it is not `NULL`.
--   Implementation specific result if the original value was `NULL`.
+- The original value from the non-`Nullable` type, if it is not `NULL`.
+- Implementation specific result if the original value was `NULL`.
 
 **Example**
 
@@ -282,11 +282,11 @@ toNullable(x)
 
 **Arguments:**
 
--   `x` — The value of any non-compound type.
+- `x` — The value of any non-compound type.
 
 **Returned value**
 
--   The input value with a `Nullable` type.
+- The input value with a `Nullable` type.
 
 **Example**
 
diff --git a/docs/en/sql-reference/functions/geo/coordinates.md b/docs/en/sql-reference/functions/geo/coordinates.md
index 1e023415890..1cbc1933206 100644
--- a/docs/en/sql-reference/functions/geo/coordinates.md
+++ b/docs/en/sql-reference/functions/geo/coordinates.md
@@ -15,10 +15,10 @@ greatCircleDistance(lon1Deg, lat1Deg, lon2Deg, lat2Deg)
 
 **Input parameters**
 
--   `lon1Deg` — Longitude of the first point in degrees. Range: `[-180°, 180°]`.
--   `lat1Deg` — Latitude of the first point in degrees. Range: `[-90°, 90°]`.
--   `lon2Deg` — Longitude of the second point in degrees. Range: `[-180°, 180°]`.
--   `lat2Deg` — Latitude of the second point in degrees. Range: `[-90°, 90°]`.
+- `lon1Deg` — Longitude of the first point in degrees. Range: `[-180°, 180°]`.
+- `lat1Deg` — Latitude of the first point in degrees. Range: `[-90°, 90°]`.
+- `lon2Deg` — Longitude of the second point in degrees. Range: `[-180°, 180°]`.
+- `lat2Deg` — Latitude of the second point in degrees. Range: `[-90°, 90°]`.
 
 Positive values correspond to North latitude and East longitude, and negative values correspond to South latitude and West longitude.
 
@@ -31,13 +31,13 @@ Generates an exception when the input parameter values fall outside of the range
 **Example**
 
 ``` sql
-SELECT greatCircleDistance(55.755831, 37.617673, -55.755831, -37.617673)
+SELECT greatCircleDistance(55.755831, 37.617673, -55.755831, -37.617673) AS greatCircleDistance
 ```
 
 ``` text
-┌─greatCircleDistance(55.755831, 37.617673, -55.755831, -37.617673)─┐
-│                                                14132374.194975413 │
-└───────────────────────────────────────────────────────────────────┘
+┌─greatCircleDistance─┐
+│            14128352 │
+└─────────────────────┘
 ```
 
 ## geoDistance
@@ -47,6 +47,37 @@ The performance is the same as for `greatCircleDistance` (no performance drawbac
 
 Technical note: for close enough points we calculate the distance using planar approximation with the metric on the tangent plane at the midpoint of the coordinates.
 
+``` sql
+geoDistance(lon1Deg, lat1Deg, lon2Deg, lat2Deg)
+```
+
+**Input parameters**
+
+- `lon1Deg` — Longitude of the first point in degrees. Range: `[-180°, 180°]`.
+- `lat1Deg` — Latitude of the first point in degrees. Range: `[-90°, 90°]`.
+- `lon2Deg` — Longitude of the second point in degrees. Range: `[-180°, 180°]`.
+- `lat2Deg` — Latitude of the second point in degrees. Range: `[-90°, 90°]`.
+
+Positive values correspond to North latitude and East longitude, and negative values correspond to South latitude and West longitude.
+
+**Returned value**
+
+The distance between two points on the Earth’s surface, in meters.
+
+Generates an exception when the input parameter values fall outside of the range.
+
+**Example**
+
+``` sql
+SELECT geoDistance(38.8976, -77.0366, 39.9496, -75.1503) AS geoDistance
+```
+
+``` text
+┌─geoDistance─┐
+│   212458.73 │
+└─────────────┘
+```
+
 ## greatCircleAngle
 
 Calculates the central angle between two points on the Earth’s surface using [the great-circle formula](https://en.wikipedia.org/wiki/Great-circle_distance).
@@ -57,10 +88,10 @@ greatCircleAngle(lon1Deg, lat1Deg, lon2Deg, lat2Deg)
 
 **Input parameters**
 
--   `lon1Deg` — Longitude of the first point in degrees.
--   `lat1Deg` — Latitude of the first point in degrees.
--   `lon2Deg` — Longitude of the second point in degrees.
--   `lat2Deg` — Latitude of the second point in degrees.
+- `lon1Deg` — Longitude of the first point in degrees.
+- `lat1Deg` — Latitude of the first point in degrees.
+- `lon2Deg` — Longitude of the second point in degrees.
+- `lat2Deg` — Latitude of the second point in degrees.
 
 **Returned value**
 
@@ -89,9 +120,9 @@ pointInEllipses(x, y, x₀, y₀, a₀, b₀,...,xₙ, yₙ, aₙ, bₙ)
 
 **Input parameters**
 
--   `x, y` — Coordinates of a point on the plane.
--   `xᵢ, yᵢ` — Coordinates of the center of the `i`-th ellipsis.
--   `aᵢ, bᵢ` — Axes of the `i`-th ellipsis in units of x, y coordinates.
+- `x, y` — Coordinates of a point on the plane.
+- `xᵢ, yᵢ` — Coordinates of the center of the `i`-th ellipsis.
+- `aᵢ, bᵢ` — Axes of the `i`-th ellipsis in units of x, y coordinates.
 
 The input parameters must be `2+4⋅n`, where `n` is the number of ellipses.
 
@@ -121,9 +152,9 @@ pointInPolygon((x, y), [(a, b), (c, d) ...], ...)
 
 **Input values**
 
--   `(x, y)` — Coordinates of a point on the plane. Data type — [Tuple](../../../sql-reference/data-types/tuple.md) — A tuple of two numbers.
--   `[(a, b), (c, d) ...]` — Polygon vertices. Data type — [Array](../../../sql-reference/data-types/array.md). Each vertex is represented by a pair of coordinates `(a, b)`. Vertices should be specified in a clockwise or counterclockwise order. The minimum number of vertices is 3. The polygon must be constant.
--   The function also supports polygons with holes (cut out sections). In this case, add polygons that define the cut out sections using additional arguments of the function. The function does not support non-simply-connected polygons.
+- `(x, y)` — Coordinates of a point on the plane. Data type — [Tuple](../../../sql-reference/data-types/tuple.md) — A tuple of two numbers.
+- `[(a, b), (c, d) ...]` — Polygon vertices. Data type — [Array](../../../sql-reference/data-types/array.md). Each vertex is represented by a pair of coordinates `(a, b)`. Vertices should be specified in a clockwise or counterclockwise order. The minimum number of vertices is 3. The polygon must be constant.
+- The function also supports polygons with holes (cut out sections). In this case, add polygons that define the cut out sections using additional arguments of the function. The function does not support non-simply-connected polygons.
 
 **Returned values**
 
diff --git a/docs/en/sql-reference/functions/geo/geohash.md b/docs/en/sql-reference/functions/geo/geohash.md
index baed8243935..ce16af44e90 100644
--- a/docs/en/sql-reference/functions/geo/geohash.md
+++ b/docs/en/sql-reference/functions/geo/geohash.md
@@ -18,13 +18,13 @@ geohashEncode(longitude, latitude, [precision])
 
 **Input values**
 
--   longitude - longitude part of the coordinate you want to encode. Floating in range`[-180°, 180°]`
--   latitude - latitude part of the coordinate you want to encode. Floating in range `[-90°, 90°]`
--   precision - Optional, length of the resulting encoded string, defaults to `12`. Integer in range `[1, 12]`. Any value less than `1` or greater than `12` is silently converted to `12`.
+- longitude - longitude part of the coordinate you want to encode. Floating in range`[-180°, 180°]`
+- latitude - latitude part of the coordinate you want to encode. Floating in range `[-90°, 90°]`
+- precision - Optional, length of the resulting encoded string, defaults to `12`. Integer in range `[1, 12]`. Any value less than `1` or greater than `12` is silently converted to `12`.
 
 **Returned values**
 
--   alphanumeric `String` of encoded coordinate (modified version of the base32-encoding alphabet is used).
+- alphanumeric `String` of encoded coordinate (modified version of the base32-encoding alphabet is used).
 
 **Example**
 
@@ -44,11 +44,11 @@ Decodes any [geohash](#geohash)-encoded string into longitude and latitude.
 
 **Input values**
 
--   encoded string - geohash-encoded string.
+- encoded string - geohash-encoded string.
 
 **Returned values**
 
--   (longitude, latitude) - 2-tuple of `Float64` values of longitude and latitude.
+- (longitude, latitude) - 2-tuple of `Float64` values of longitude and latitude.
 
 **Example**
 
@@ -74,11 +74,11 @@ geohashesInBox(longitude_min, latitude_min, longitude_max, latitude_max, precisi
 
 **Arguments**
 
--   `longitude_min` — Minimum longitude. Range: `[-180°, 180°]`. Type: [Float](../../../sql-reference/data-types/float.md).
--   `latitude_min` — Minimum latitude. Range: `[-90°, 90°]`. Type: [Float](../../../sql-reference/data-types/float.md).
--   `longitude_max` — Maximum longitude. Range: `[-180°, 180°]`. Type: [Float](../../../sql-reference/data-types/float.md).
--   `latitude_max` — Maximum latitude. Range: `[-90°, 90°]`. Type: [Float](../../../sql-reference/data-types/float.md).
--   `precision` — Geohash precision. Range: `[1, 12]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+- `longitude_min` — Minimum longitude. Range: `[-180°, 180°]`. Type: [Float](../../../sql-reference/data-types/float.md).
+- `latitude_min` — Minimum latitude. Range: `[-90°, 90°]`. Type: [Float](../../../sql-reference/data-types/float.md).
+- `longitude_max` — Maximum longitude. Range: `[-180°, 180°]`. Type: [Float](../../../sql-reference/data-types/float.md).
+- `latitude_max` — Maximum latitude. Range: `[-90°, 90°]`. Type: [Float](../../../sql-reference/data-types/float.md).
+- `precision` — Geohash precision. Range: `[1, 12]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 :::note    
 All coordinate parameters must be of the same type: either `Float32` or `Float64`.
@@ -86,8 +86,8 @@ All coordinate parameters must be of the same type: either `Float32` or `Float64
 
 **Returned values**
 
--   Array of precision-long strings of geohash-boxes covering provided area, you should not rely on order of items.
--   `[]` - Empty array if minimum latitude and longitude values aren’t less than corresponding maximum values.
+- Array of precision-long strings of geohash-boxes covering provided area, you should not rely on order of items.
+- `[]` - Empty array if minimum latitude and longitude values aren’t less than corresponding maximum values.
 
 Type: [Array](../../../sql-reference/data-types/array.md)([String](../../../sql-reference/data-types/string.md)).
 
diff --git a/docs/en/sql-reference/functions/geo/h3.md b/docs/en/sql-reference/functions/geo/h3.md
index ce15fed0f21..1f695a13598 100644
--- a/docs/en/sql-reference/functions/geo/h3.md
+++ b/docs/en/sql-reference/functions/geo/h3.md
@@ -26,12 +26,12 @@ h3IsValid(h3index)
 
 **Parameter**
 
--   `h3index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `h3index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   1 — The number is a valid H3 index.
--   0 — The number is not a valid H3 index.
+- 1 — The number is a valid H3 index.
+- 0 — The number is not a valid H3 index.
 
 Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
@@ -63,12 +63,12 @@ h3GetResolution(h3index)
 
 **Parameter**
 
--   `h3index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `h3index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   Index resolution. Range: `[0, 15]`.
--   If the index is not valid, the function returns a random value. Use [h3IsValid](#h3isvalid) to verify the index.
+- Index resolution. Range: `[0, 15]`.
+- If the index is not valid, the function returns a random value. Use [h3IsValid](#h3isvalid) to verify the index.
 
 Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
@@ -100,11 +100,11 @@ h3EdgeAngle(resolution)
 
 **Parameter**
 
--   `resolution` — Index resolution. Type: [UInt8](../../../sql-reference/data-types/int-uint.md). Range: `[0, 15]`.
+- `resolution` — Index resolution. Type: [UInt8](../../../sql-reference/data-types/int-uint.md). Range: `[0, 15]`.
 
 **Returned values**
 
--   The average length of the [H3](#h3index) hexagon edge in grades. Type: [Float64](../../../sql-reference/data-types/float.md).
+- The average length of the [H3](#h3index) hexagon edge in grades. Type: [Float64](../../../sql-reference/data-types/float.md).
 
 **Example**
 
@@ -134,11 +134,11 @@ h3EdgeLengthM(resolution)
 
 **Parameter**
 
--   `resolution` — Index resolution. Type: [UInt8](../../../sql-reference/data-types/int-uint.md). Range: `[0, 15]`.
+- `resolution` — Index resolution. Type: [UInt8](../../../sql-reference/data-types/int-uint.md). Range: `[0, 15]`.
 
 **Returned values**
 
--   The average length of the [H3](#h3index) hexagon edge in meters. Type: [Float64](../../../sql-reference/data-types/float.md).
+- The average length of the [H3](#h3index) hexagon edge in meters. Type: [Float64](../../../sql-reference/data-types/float.md).
 
 **Example**
 
@@ -168,11 +168,11 @@ h3EdgeLengthKm(resolution)
 
 **Parameter**
 
--   `resolution` — Index resolution. Type: [UInt8](../../../sql-reference/data-types/int-uint.md). Range: `[0, 15]`.
+- `resolution` — Index resolution. Type: [UInt8](../../../sql-reference/data-types/int-uint.md). Range: `[0, 15]`.
 
 **Returned values**
 
--   The average length of the [H3](#h3index) hexagon edge in kilometers. Type: [Float64](../../../sql-reference/data-types/float.md).
+- The average length of the [H3](#h3index) hexagon edge in kilometers. Type: [Float64](../../../sql-reference/data-types/float.md).
 
 **Example**
 
@@ -202,14 +202,14 @@ geoToH3(lon, lat, resolution)
 
 **Arguments**
 
--   `lon` — Longitude. Type: [Float64](../../../sql-reference/data-types/float.md).
--   `lat` — Latitude. Type: [Float64](../../../sql-reference/data-types/float.md).
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+- `lon` — Longitude. Type: [Float64](../../../sql-reference/data-types/float.md).
+- `lat` — Latitude. Type: [Float64](../../../sql-reference/data-types/float.md).
+- `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   Hexagon index number.
--   0 in case of error.
+- Hexagon index number.
+- 0 in case of error.
 
 Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
@@ -241,11 +241,11 @@ h3ToGeo(h3Index)
 
 **Arguments**
 
--   `h3Index` — H3 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `h3Index` — H3 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   A tuple consisting of two values: `tuple(lon,lat)`. `lon` — Longitude. [Float64](../../../sql-reference/data-types/float.md). `lat` — Latitude. [Float64](../../../sql-reference/data-types/float.md).
+- A tuple consisting of two values: `tuple(lon,lat)`. `lon` — Longitude. [Float64](../../../sql-reference/data-types/float.md). `lat` — Latitude. [Float64](../../../sql-reference/data-types/float.md).
 
 **Example**
 
@@ -275,11 +275,11 @@ h3ToGeoBoundary(h3Index)
 
 **Arguments**
 
--   `h3Index` — H3 Index. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `h3Index` — H3 Index. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--    Array of pairs '(lon, lat)'.
+- Array of pairs '(lon, lat)'.
 Type: [Array](../../../sql-reference/data-types/array.md)([Float64](../../../sql-reference/data-types/float.md), [Float64](../../../sql-reference/data-types/float.md)).
 
 
@@ -311,12 +311,12 @@ h3kRing(h3index, k)
 
 **Arguments**
 
--   `h3index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `k` — Radius. Type: [integer](../../../sql-reference/data-types/int-uint.md)
+- `h3index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `k` — Radius. Type: [integer](../../../sql-reference/data-types/int-uint.md)
 
 **Returned values**
 
--   Array of H3 indexes.
+- Array of H3 indexes.
 
 Type: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-reference/data-types/int-uint.md)).
 
@@ -354,11 +354,11 @@ h3GetBaseCell(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Hexagon base cell number.
+- Hexagon base cell number.
 
 Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
@@ -390,11 +390,11 @@ h3HexAreaM2(resolution)
 
 **Parameter**
 
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+- `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Area in square meters.
+- Area in square meters.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
@@ -426,11 +426,11 @@ h3HexAreaKm2(resolution)
 
 **Parameter**
 
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+- `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Area in square kilometers.
+- Area in square kilometers.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
@@ -462,13 +462,13 @@ h3IndexesAreNeighbors(index1, index2)
 
 **Arguments**
 
--   `index1` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `index2` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index1` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index2` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   `1` — Indexes are neighbours.
--   `0` — Indexes are not neighbours.
+- `1` — Indexes are neighbours.
+- `0` — Indexes are not neighbours.
 
 Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
@@ -500,12 +500,12 @@ h3ToChildren(index, resolution)
 
 **Arguments**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   Array of the child H3-indexes.
+- Array of the child H3-indexes.
 
 Type: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-reference/data-types/int-uint.md)).
 
@@ -537,12 +537,12 @@ h3ToParent(index, resolution)
 
 **Arguments**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Parent H3 index.
+- Parent H3 index.
 
 Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
@@ -572,11 +572,11 @@ h3ToString(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   String representation of the H3 index.
+- String representation of the H3 index.
 
 Type: [String](../../../sql-reference/data-types/string.md).
 
@@ -608,11 +608,11 @@ stringToH3(index_str)
 
 **Parameter**
 
--   `index_str` — String representation of the H3 index. Type: [String](../../../sql-reference/data-types/string.md).
+- `index_str` — String representation of the H3 index. Type: [String](../../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Hexagon index number. Returns 0 on error. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- Hexagon index number. Returns 0 on error. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
@@ -642,11 +642,11 @@ h3GetResolution(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+- Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
@@ -676,12 +676,12 @@ h3IsResClassIII(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   `1` — Index has a resolution with Class III orientation.
--   `0` — Index doesn't have a resolution with Class III orientation.
+- `1` — Index has a resolution with Class III orientation.
+- `0` — Index doesn't have a resolution with Class III orientation.
 
 Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
@@ -713,12 +713,12 @@ h3IsPentagon(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   `1` — Index represents a pentagonal cell.
--   `0` — Index doesn't represent a pentagonal cell.
+- `1` — Index represents a pentagonal cell.
+- `0` — Index doesn't represent a pentagonal cell.
 
 Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
@@ -750,11 +750,11 @@ h3GetFaces(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   Array containing icosahedron faces intersected by a given H3 index.
+- Array containing icosahedron faces intersected by a given H3 index.
 
 Type: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-reference/data-types/int-uint.md)).
 
@@ -786,11 +786,11 @@ h3CellAreaM2(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Cell area in square meters.
+- Cell area in square meters.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
@@ -822,11 +822,11 @@ h3CellAreaRads2(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Cell area in square radians.
+- Cell area in square radians.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
@@ -858,8 +858,8 @@ h3ToCenterChild(index, resolution)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
@@ -895,11 +895,11 @@ h3ExactEdgeLengthM(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--  Exact edge length in meters.
+- Exact edge length in meters.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
@@ -931,11 +931,11 @@ h3ExactEdgeLengthKm(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--  Exact edge length in kilometers.
+- Exact edge length in kilometers.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
@@ -967,11 +967,11 @@ h3ExactEdgeLengthRads(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--  Exact edge length in radians.
+- Exact edge length in radians.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
@@ -1003,11 +1003,11 @@ h3NumHexagons(resolution)
 
 **Parameter**
 
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+- `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--  Number of H3 indices.
+- Number of H3 indices.
 
 Type: [Int64](../../../sql-reference/data-types/int-uint.md).
 
@@ -1039,12 +1039,12 @@ h3PointDistM(lat1, lon1, lat2, lon2)
 
 **Arguments**
 
--   `lat1`, `lon1` — Latitude and Longitude of point1 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
--   `lat2`, `lon2` — Latitude and Longitude of point2 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
+- `lat1`, `lon1` — Latitude and Longitude of point1 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
+- `lat2`, `lon2` — Latitude and Longitude of point2 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
 
 **Returned values**
 
--  Haversine or great circle distance in meters.
+- Haversine or great circle distance in meters.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
@@ -1076,12 +1076,12 @@ h3PointDistKm(lat1, lon1, lat2, lon2)
 
 **Arguments**
 
--   `lat1`, `lon1` — Latitude and Longitude of point1 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
--   `lat2`, `lon2` — Latitude and Longitude of point2 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
+- `lat1`, `lon1` — Latitude and Longitude of point1 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
+- `lat2`, `lon2` — Latitude and Longitude of point2 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
 
 **Returned values**
 
--  Haversine or great circle distance in kilometers.
+- Haversine or great circle distance in kilometers.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
@@ -1113,12 +1113,12 @@ h3PointDistRads(lat1, lon1, lat2, lon2)
 
 **Arguments**
 
--   `lat1`, `lon1` — Latitude and Longitude of point1 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
--   `lat2`, `lon2` — Latitude and Longitude of point2 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
+- `lat1`, `lon1` — Latitude and Longitude of point1 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
+- `lat2`, `lon2` — Latitude and Longitude of point2 in degrees. Type: [Float64](../../../sql-reference/data-types/float.md).
 
 **Returned values**
 
--  Haversine or great circle distance in radians.
+- Haversine or great circle distance in radians.
 
 Type: [Float64](../../../sql-reference/data-types/float.md).
 
@@ -1150,7 +1150,7 @@ h3GetRes0Indexes()
 
 **Returned values**
 
--  Array of all the resolution 0 H3 indexes.
+- Array of all the resolution 0 H3 indexes.
 
 Type: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-reference/data-types/int-uint.md)).
 
@@ -1183,11 +1183,11 @@ h3GetPentagonIndexes(resolution)
 
 **Parameter**
 
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+- `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--  Array of all pentagon H3 indexes.
+- Array of all pentagon H3 indexes.
 
 Type: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-reference/data-types/int-uint.md)).
 
@@ -1219,8 +1219,8 @@ h3Line(start,end)
 
 **Parameter**
 
--   `start` — Hexagon index number that represents a starting point. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `end` — Hexagon index number that represents an ending point. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `start` — Hexagon index number that represents a starting point. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `end` — Hexagon index number that represents an ending point. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
@@ -1256,12 +1256,12 @@ h3Distance(start,end)
 
 **Parameter**
 
--   `start` — Hexagon index number that represents a starting point. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `end` — Hexagon index number that represents an ending point. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `start` — Hexagon index number that represents a starting point. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `end` — Hexagon index number that represents an ending point. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--  Number of grid cells.
+- Number of grid cells.
 
 Type: [Int64](../../../sql-reference/data-types/int-uint.md).
 
@@ -1297,12 +1297,12 @@ h3HexRing(index, k)
 
 **Parameter**
 
--   `index` — Hexagon index number that represents the origin. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `k` — Distance. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number that represents the origin. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `k` — Distance. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   Array of H3 indexes.
+- Array of H3 indexes.
 
 Type: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-reference/data-types/int-uint.md)).
 
@@ -1334,12 +1334,12 @@ h3GetUnidirectionalEdge(originIndex, destinationIndex)
 
 **Parameter**
 
--   `originIndex` — Origin Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `destinationIndex` — Destination Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `originIndex` — Origin Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `destinationIndex` — Destination Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--  Unidirectional Edge Hexagon Index number.
+- Unidirectional Edge Hexagon Index number.
 
 Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
@@ -1371,12 +1371,12 @@ h3UnidirectionalEdgeisValid(index)
 
 **Parameter**
 
--   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   1 — The H3 index is a valid unidirectional edge.
--   0 — The H3 index is not a valid unidirectional edge.
+- 1 — The H3 index is a valid unidirectional edge.
+- 0 — The H3 index is not a valid unidirectional edge.
 
 Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
@@ -1408,11 +1408,11 @@ h3GetOriginIndexFromUnidirectionalEdge(edge)
 
 **Parameter**
 
--   `edge` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `edge` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--  Origin Hexagon Index number.
+- Origin Hexagon Index number.
 
 Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
@@ -1444,11 +1444,11 @@ h3GetDestinationIndexFromUnidirectionalEdge(edge)
 
 **Parameter**
 
--   `edge` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `edge` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--  Destination Hexagon Index number.
+- Destination Hexagon Index number.
 
 Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
@@ -1480,7 +1480,7 @@ h3GetIndexesFromUnidirectionalEdge(edge)
 
 **Parameter**
 
--   `edge` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `edge` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
@@ -1519,7 +1519,7 @@ h3GetUnidirectionalEdgesFromHexagon(index)
 
 **Parameter**
 
--   `index` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
@@ -1555,11 +1555,11 @@ h3GetUnidirectionalEdgeBoundary(index)
 
 **Parameter**
 
--   `index` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `index` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--    Array of pairs '(lon, lat)'.
+- Array of pairs '(lon, lat)'.
      Type: [Array](../../../sql-reference/data-types/array.md)([Float64](../../../sql-reference/data-types/float.md), [Float64](../../../sql-reference/data-types/float.md)).
 
 
diff --git a/docs/en/sql-reference/functions/geo/index.md b/docs/en/sql-reference/functions/geo/index.md
index 3d5ca806c7e..d46e60281e2 100644
--- a/docs/en/sql-reference/functions/geo/index.md
+++ b/docs/en/sql-reference/functions/geo/index.md
@@ -8,67 +8,67 @@ title: "Geo Functions"
 
 ## Geographical Coordinates Functions
 
--   [greatCircleDistance](./coordinates.md#greatcircledistance)
--   [geoDistance](./coordinates.md#geodistance)
--   [greatCircleAngle](./coordinates.md#greatcircleangle)
--   [pointInEllipses](./coordinates.md#pointinellipses)
--   [pointInPolygon](./coordinates.md#pointinpolygon)
+- [greatCircleDistance](./coordinates.md#greatcircledistance)
+- [geoDistance](./coordinates.md#geodistance)
+- [greatCircleAngle](./coordinates.md#greatcircleangle)
+- [pointInEllipses](./coordinates.md#pointinellipses)
+- [pointInPolygon](./coordinates.md#pointinpolygon)
 
 ## Geohash Functions
--   [geohashEncode](./geohash.md#geohashencode)
--   [geohashDecode](./geohash.md#geohashdecode)
--   [geohashesInBox](./geohash.md#geohashesinbox)
+- [geohashEncode](./geohash.md#geohashencode)
+- [geohashDecode](./geohash.md#geohashdecode)
+- [geohashesInBox](./geohash.md#geohashesinbox)
 
 ## H3 Indexes Functions
 
--   [h3IsValid](./h3.md#h3isvalid)
--   [h3GetResolution](./h3.md#h3getresolution)
--   [h3EdgeAngle](./h3.md#h3edgeangle)
--   [h3EdgeLengthM](./h3.md#h3edgelengthm)
--   [h3EdgeLengthKm](./h3.md#h3edgelengthkm)
--   [geoToH3](./h3.md#geotoh3)
--   [h3ToGeo](./h3.md#h3togeo)
--   [h3ToGeoBoundary](./h3.md#h3togeoboundary)
--   [h3kRing](./h3.md#h3kring)
--   [h3GetBaseCell](./h3.md#h3getbasecell)
--   [h3HexAreaM2](./h3.md#h3hexaream2)
--   [h3HexAreaKm2](./h3.md#h3hexareakm2)
--   [h3IndexesAreNeighbors](./h3.md#h3indexesareneighbors)
--   [h3ToChildren](./h3.md#h3tochildren)
--   [h3ToParent](./h3.md#h3toparent)
--   [h3ToString](./h3.md#h3tostring)
--   [stringToH3](./h3.md#stringtoh3)
--   [h3GetResolution](./h3.md#h3getresolution)
--   [h3IsResClassIII](./h3.md#h3isresclassiii)
--   [h3IsPentagon](./h3.md#h3ispentagon)
--   [h3GetFaces](./h3.md#h3getfaces)
--   [h3CellAreaM2](./h3.md#h3cellaream2)
--   [h3CellAreaRads2](./h3.md#h3cellarearads2)
--   [h3ToCenterChild](./h3.md#h3tocenterchild)
--   [h3ExactEdgeLengthM](./h3.md#h3exactedgelengthm)
--   [h3ExactEdgeLengthKm](./h3.md#h3exactedgelengthkm)
--   [h3ExactEdgeLengthRads](./h3.md#h3exactedgelengthrads)
--   [h3NumHexagons](./h3.md#h3numhexagons)
--   [h3Line](./h3.md#h3line)
--   [h3Distance](./h3.md#h3distance)
--   [h3HexRing](./h3.md#h3hexring)
--   [h3GetUnidirectionalEdge](./h3.md#h3getunidirectionaledge)
--   [h3UnidirectionalEdgeIsValid](./h3.md#h3unidirectionaledgeisvalid)
--   [h3GetOriginIndexFromUnidirectionalEdge](./h3.md#h3getoriginindexfromunidirectionaledge)
--   [h3GetDestinationIndexFromUnidirectionalEdge](./h3.md#h3getdestinationindexfromunidirectionaledge)
--   [h3GetIndexesFromUnidirectionalEdge](./h3.md#h3getindexesfromunidirectionaledge)
--   [h3GetUnidirectionalEdgesFromHexagon](./h3.md#h3getunidirectionaledgesfromhexagon)
--   [h3GetUnidirectionalEdgeBoundary](./h3.md#h3getunidirectionaledgeboundary)
+- [h3IsValid](./h3.md#h3isvalid)
+- [h3GetResolution](./h3.md#h3getresolution)
+- [h3EdgeAngle](./h3.md#h3edgeangle)
+- [h3EdgeLengthM](./h3.md#h3edgelengthm)
+- [h3EdgeLengthKm](./h3.md#h3edgelengthkm)
+- [geoToH3](./h3.md#geotoh3)
+- [h3ToGeo](./h3.md#h3togeo)
+- [h3ToGeoBoundary](./h3.md#h3togeoboundary)
+- [h3kRing](./h3.md#h3kring)
+- [h3GetBaseCell](./h3.md#h3getbasecell)
+- [h3HexAreaM2](./h3.md#h3hexaream2)
+- [h3HexAreaKm2](./h3.md#h3hexareakm2)
+- [h3IndexesAreNeighbors](./h3.md#h3indexesareneighbors)
+- [h3ToChildren](./h3.md#h3tochildren)
+- [h3ToParent](./h3.md#h3toparent)
+- [h3ToString](./h3.md#h3tostring)
+- [stringToH3](./h3.md#stringtoh3)
+- [h3GetResolution](./h3.md#h3getresolution)
+- [h3IsResClassIII](./h3.md#h3isresclassiii)
+- [h3IsPentagon](./h3.md#h3ispentagon)
+- [h3GetFaces](./h3.md#h3getfaces)
+- [h3CellAreaM2](./h3.md#h3cellaream2)
+- [h3CellAreaRads2](./h3.md#h3cellarearads2)
+- [h3ToCenterChild](./h3.md#h3tocenterchild)
+- [h3ExactEdgeLengthM](./h3.md#h3exactedgelengthm)
+- [h3ExactEdgeLengthKm](./h3.md#h3exactedgelengthkm)
+- [h3ExactEdgeLengthRads](./h3.md#h3exactedgelengthrads)
+- [h3NumHexagons](./h3.md#h3numhexagons)
+- [h3Line](./h3.md#h3line)
+- [h3Distance](./h3.md#h3distance)
+- [h3HexRing](./h3.md#h3hexring)
+- [h3GetUnidirectionalEdge](./h3.md#h3getunidirectionaledge)
+- [h3UnidirectionalEdgeIsValid](./h3.md#h3unidirectionaledgeisvalid)
+- [h3GetOriginIndexFromUnidirectionalEdge](./h3.md#h3getoriginindexfromunidirectionaledge)
+- [h3GetDestinationIndexFromUnidirectionalEdge](./h3.md#h3getdestinationindexfromunidirectionaledge)
+- [h3GetIndexesFromUnidirectionalEdge](./h3.md#h3getindexesfromunidirectionaledge)
+- [h3GetUnidirectionalEdgesFromHexagon](./h3.md#h3getunidirectionaledgesfromhexagon)
+- [h3GetUnidirectionalEdgeBoundary](./h3.md#h3getunidirectionaledgeboundary)
 
 ## S2 Index Functions
 
--   [geoToS2](./s2.md#geotos2)
--   [s2ToGeo](./s2.md#s2togeo)
--   [s2GetNeighbors](./s2.md#s2getneighbors)
--   [s2CellsIntersect](./s2.md#s2cellsintersect)
--   [s2CapContains](./s2.md#s2capcontains)
--   [s2CapUnion](./s2.md#s2capunion)
--   [s2RectAdd](./s2.md#s2rectadd)
--   [s2RectContains](./s2.md#s2rectcontains)
--   [s2RectUnion](./s2.md#s2rectunion)
--   [s2RectIntersection](./s2.md#s2rectintersection)
+- [geoToS2](./s2.md#geotos2)
+- [s2ToGeo](./s2.md#s2togeo)
+- [s2GetNeighbors](./s2.md#s2getneighbors)
+- [s2CellsIntersect](./s2.md#s2cellsintersect)
+- [s2CapContains](./s2.md#s2capcontains)
+- [s2CapUnion](./s2.md#s2capunion)
+- [s2RectAdd](./s2.md#s2rectadd)
+- [s2RectContains](./s2.md#s2rectcontains)
+- [s2RectUnion](./s2.md#s2rectunion)
+- [s2RectIntersection](./s2.md#s2rectintersection)
diff --git a/docs/en/sql-reference/functions/geo/polygon.md b/docs/en/sql-reference/functions/geo/polygon.md
new file mode 100644
index 00000000000..4a8653965c2
--- /dev/null
+++ b/docs/en/sql-reference/functions/geo/polygon.md
@@ -0,0 +1,396 @@
+---
+slug: /en/sql-reference/functions/geo/polygons
+sidebar_label: Polygons
+title: "Functions for Working with Polygons"
+---
+
+## readWKTMultiPolygon
+
+Converts a WKT (Well Known Text) MultiPolygon into a MultiPolygon type.
+
+### Example
+
+``` sql
+SELECT
+    toTypeName(readWKTMultiPolygon('MULTIPOLYGON(((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))')) AS type,
+    readWKTMultiPolygon('MULTIPOLYGON(((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))') AS output FORMAT Markdown
+
+```
+| type | output |
+|:-|:-|
+| MultiPolygon | [[[(2,0),(10,0),(10,10),(0,10),(2,0)],[(4,4),(5,4),(5,5),(4,5),(4,4)]],[[(-10,-10),(-10,-9),(-9,10),(-10,-10)]]] |
+
+
+### Input parameters
+
+String starting with `MULTIPOLYGON` 
+
+### Returned value
+
+MultiPolygon
+
+## readWKTPolygon
+
+Converts a WKT (Well Known Text) MultiPolygon into a Polygon type.
+
+### Example
+
+``` sql
+SELECT
+    toTypeName(readWKTPolygon('POLYGON((2 0,10 0,10 10,0 10,2 0))')) AS type,
+    readWKTPolygon('POLYGON((2 0,10 0,10 10,0 10,2 0))') AS output
+FORMAT Markdown
+```
+| type | output |
+|:-|:-|
+| Polygon | [[(2,0),(10,0),(10,10),(0,10),(2,0)]] |
+
+### Input parameters
+
+String starting with `POLYGON`
+
+### Returned value
+
+Polygon
+
+## polygonsWithinSpherical
+
+Returns true or false depending on whether or not one polygon lies completely inside another polygon. Reference https://www.boost.org/doc/libs/1_62_0/libs/geometry/doc/html/geometry/reference/algorithms/within/within_2.html
+
+### Example
+
+``` sql
+select polygonsWithinSpherical([[[(4.3613577, 50.8651821), (4.349556, 50.8535879), (4.3602419, 50.8435626), (4.3830299, 50.8428851), (4.3904543, 50.8564867), (4.3613148, 50.8651279)]]], [[[(4.346693, 50.858306), (4.367945, 50.852455), (4.366227, 50.840809), (4.344961, 50.833264), (4.338074, 50.848677), (4.346693, 50.858306)]]]);
+```
+```response
+0
+```
+
+### Input parameters
+
+### Returned value
+
+UInt8, 0 for false, 1 for true
+
+## polygonsDistanceSpherical
+
+Calculates the minimal distance between two points where one point belongs to the first polygon and the second to another polygon. Spherical means that coordinates are interpreted as coordinates on a pure and ideal sphere, which is not true for the Earth. Using this type of coordinate system speeds up execution, but of course is not precise. 
+
+### Example
+
+``` sql
+SELECT polygonsDistanceSpherical([[[(0, 0), (0, 0.1), (0.1, 0.1), (0.1, 0)]]], [[[(10., 10.), (10., 40.), (40., 40.), (40., 10.), (10., 10.)]]])
+```
+```response
+0.24372872211133834
+```
+
+### Input parameters
+
+Two polygons
+
+### Returned value
+
+Float64
+
+## polygonsDistanceCartesian
+
+Calculates distance between two polygons
+
+### Example
+
+``` sql
+SELECT polygonsDistanceCartesian([[[(0, 0), (0, 0.1), (0.1, 0.1), (0.1, 0)]]], [[[(10., 10.), (10., 40.), (40., 40.), (40., 10.), (10., 10.)]]])
+```
+```response
+14.000714267493642
+```
+
+### Input parameters
+
+Two polygons
+
+### Returned value
+
+Float64
+
+## polygonsEqualsCartesian
+
+Returns true if two polygons are equal
+
+### Example
+
+``` sql
+SELECT polygonsEqualsCartesian([[[(1., 1.), (1., 4.), (4., 4.), (4., 1.)]]], [[[(1., 1.), (1., 4.), (4., 4.), (4., 1.), (1., 1.)]]])
+```
+```response
+1
+```
+
+### Input parameters
+
+Two polygons
+
+### Returned value
+
+UInt8, 0 for false, 1 for true
+
+## polygonsSymDifferenceSpherical
+
+Calculates the spatial set theoretic symmetric difference (XOR) between two polygons
+
+### Example
+
+``` sql
+SELECT wkt(arraySort(polygonsSymDifferenceSpherical([[(50., 50.), (50., -50.), (-50., -50.), (-50., 50.), (50., 50.)], [(10., 10.), (10., 40.), (40., 40.), (40., 10.), (10., 10.)], [(-10., -10.), (-10., -40.), (-40., -40.), (-40., -10.), (-10., -10.)]], [[(-20., -20.), (-20., 20.), (20., 20.), (20., -20.), (-20., -20.)]])));
+```
+```response
+MULTIPOLYGON(((-20 -10.3067,-10 -10,-10 -20.8791,-20 -20,-20 -10.3067)),((10 20.8791,20 20,20 10.3067,10 10,10 20.8791)),((50 50,50 -50,-50 -50,-50 50,50 50),(20 10.3067,40 10,40 40,10 40,10 20.8791,-20 20,-20 -10.3067,-40 -10,-40 -40,-10 -40,-10 -20.8791,20 -20,20 10.3067)))
+```
+
+### Input parameters
+
+Polygons
+
+### Returned value
+
+MultiPolygon
+
+## polygonsSymDifferenceCartesian
+
+The same as `polygonsSymDifferenceSpherical`, but the coordinates are in the Cartesian coordinate system; which is more close to the model of the real Earth.
+
+### Example
+
+``` sql
+SELECT wkt(polygonsSymDifferenceCartesian([[[(0, 0), (0, 3), (1, 2.9), (2, 2.6), (2.6, 2), (2.9, 1), (3, 0), (0, 0)]]], [[[(1., 1.), (1., 4.), (4., 4.), (4., 1.), (1., 1.)]]]))
+```
+```response
+MULTIPOLYGON(((1 2.9,1 1,2.9 1,3 0,0 0,0 3,1 2.9)),((1 2.9,1 4,4 4,4 1,2.9 1,2.6 2,2 2.6,1 2.9)))
+```
+
+### Input parameters
+
+Polygons
+
+### Returned value
+
+MultiPolygon
+
+## polygonsIntersectionSpherical
+
+Calculates the intersection (AND) between polygons, coordinates are spherical.
+
+### Example
+
+``` sql
+SELECT wkt(arrayMap(a -> arrayMap(b -> arrayMap(c -> (round(c.1, 6), round(c.2, 6)), b), a), polygonsIntersectionSpherical([[[(4.3613577, 50.8651821), (4.349556, 50.8535879), (4.3602419, 50.8435626), (4.3830299, 50.8428851), (4.3904543, 50.8564867), (4.3613148, 50.8651279)]]], [[[(4.346693, 50.858306), (4.367945, 50.852455), (4.366227, 50.840809), (4.344961, 50.833264), (4.338074, 50.848677), (4.346693, 50.858306)]]])))
+```
+```response
+MULTIPOLYGON(((4.3666 50.8434,4.36024 50.8436,4.34956 50.8536,4.35268 50.8567,4.36794 50.8525,4.3666 50.8434)))
+```
+
+### Input parameters
+
+Polygons
+
+### Returned value
+
+MultiPolygon
+
+## polygonsWithinCartesian
+
+Returns true if the second polygon is within the first polygon.
+
+### Example
+
+``` sql
+SELECT polygonsWithinCartesian([[[(2., 2.), (2., 3.), (3., 3.), (3., 2.)]]], [[[(1., 1.), (1., 4.), (4., 4.), (4., 1.), (1., 1.)]]])
+```
+```response
+1
+```
+
+### Input parameters
+
+Two polygons
+
+### Returned value
+
+UInt8, 0 for false, 1 for true
+
+## polygonConvexHullCartesian
+
+Calculates a convex hull. [Reference](https://www.boost.org/doc/libs/1_61_0/libs/geometry/doc/html/geometry/reference/algorithms/convex_hull.html)
+
+Coordinates are in Cartesian coordinate system.
+
+### Example
+
+``` sql
+SELECT wkt(polygonConvexHullCartesian([[[(0., 0.), (0., 5.), (5., 5.), (5., 0.), (2., 3.)]]]))
+```
+```response
+POLYGON((0 0,0 5,5 5,5 0,0 0))
+```
+
+### Input parameters
+
+MultiPolygon
+
+### Returned value
+
+Polygon
+
+## polygonAreaSpherical
+
+Calculates the surface area of a polygon.
+
+### Example
+
+``` sql
+SELECT round(polygonAreaSpherical([[[(4.346693, 50.858306), (4.367945, 50.852455), (4.366227, 50.840809), (4.344961, 50.833264), (4.338074, 50.848677), (4.346693, 50.858306)]]]), 14)
+```
+```response
+9.387704e-8
+```
+
+### Input parameters
+
+Polygon
+
+### Returned value
+
+Float
+
+## polygonsUnionSpherical
+
+Calculates a union (OR).
+
+### Example
+
+``` sql
+SELECT wkt(polygonsUnionSpherical([[[(4.3613577, 50.8651821), (4.349556, 50.8535879), (4.3602419, 50.8435626), (4.3830299, 50.8428851), (4.3904543, 50.8564867), (4.3613148, 50.8651279)]]], [[[(4.346693, 50.858306), (4.367945, 50.852455), (4.366227, 50.840809), (4.344961, 50.833264), (4.338074, 50.848677), (4.346693, 50.858306)]]]))
+```
+```response
+MULTIPOLYGON(((4.36661 50.8434,4.36623 50.8408,4.34496 50.8333,4.33807 50.8487,4.34669 50.8583,4.35268 50.8567,4.36136 50.8652,4.36131 50.8651,4.39045 50.8565,4.38303 50.8429,4.36661 50.8434)))
+```
+
+### Input parameters
+
+Polygons
+
+### Returned value
+
+MultiPolygon
+
+## polygonPerimeterSpherical
+
+Calculates the perimeter of the polygon.
+
+### Example
+
+This is the polygon representing Zimbabwe:
+
+
+```
+POLYGON((30.0107 -15.6462,30.0502 -15.6401,30.09 -15.6294,30.1301 -15.6237,30.1699 -15.6322,30.1956 -15.6491,30.2072 -15.6532,30.2231 -15.6497,30.231 -15.6447,30.2461 -15.6321,30.2549 -15.6289,30.2801 -15.6323,30.2962 -15.639,30.3281 -15.6524,30.3567 -15.6515,30.3963 -15.636,30.3977 -15.7168,30.3993 -15.812,30.4013 -15.9317,30.4026 -16.0012,30.5148 -16.0004,30.5866 -16,30.7497 -15.9989,30.8574 -15.9981,30.9019 -16.0071,30.9422 -16.0345,30.9583 -16.0511,30.9731 -16.062,30.9898 -16.0643,31.012 -16.0549,31.0237 -16.0452,31.0422 -16.0249,31.0569 -16.0176,31.0654 -16.0196,31.0733 -16.0255,31.0809 -16.0259,31.089 -16.0119,31.1141 -15.9969,31.1585 -16.0002,31.26 -16.0235,31.2789 -16.0303,31.2953 -16.0417,31.3096 -16.059,31.3284 -16.0928,31.3409 -16.1067,31.3603 -16.1169,31.3703 -16.1237,31.3746 -16.1329,31.3778 -16.1422,31.384 -16.1488,31.3877 -16.1496,31.3956 -16.1477,31.3996 -16.1473,31.4043 -16.1499,31.4041 -16.1545,31.4027 -16.1594,31.4046 -16.1623,31.4241 -16.1647,31.4457 -16.165,31.4657 -16.1677,31.4806 -16.178,31.5192 -16.1965,31.6861 -16.2072,31.7107 -16.2179,31.7382 -16.2398,31.7988 -16.3037,31.8181 -16.3196,31.8601 -16.3408,31.8719 -16.3504,31.8807 -16.368,31.8856 -16.4063,31.8944 -16.4215,31.9103 -16.4289,32.0141 -16.4449,32.2118 -16.4402,32.2905 -16.4518,32.3937 -16.4918,32.5521 -16.5534,32.6718 -16.5998,32.6831 -16.6099,32.6879 -16.6243,32.6886 -16.6473,32.6987 -16.6868,32.7252 -16.7064,32.7309 -16.7087,32.7313 -16.7088,32.7399 -16.7032,32.7538 -16.6979,32.7693 -16.6955,32.8007 -16.6973,32.862 -16.7105,32.8934 -16.7124,32.9096 -16.7081,32.9396 -16.6898,32.9562 -16.6831,32.9685 -16.6816,32.9616 -16.7103,32.9334 -16.8158,32.9162 -16.8479,32.9005 -16.8678,32.8288 -16.9351,32.8301 -16.9415,32.8868 -17.0382,32.9285 -17.1095,32.9541 -17.1672,32.9678 -17.2289,32.9691 -17.2661,32.9694 -17.2761,32.9732 -17.2979,32.9836 -17.3178,32.9924 -17.3247,33.0147 -17.3367,33.0216 -17.3456,33.0225 -17.3615,33.0163 -17.3772,33.0117 -17.384,32.9974 -17.405,32.9582 -17.4785,32.9517 -17.4862,32.943 -17.4916,32.9366 -17.4983,32.9367 -17.5094,32.9472 -17.5432,32.9517 -17.5514,32.9691 -17.5646,33.0066 -17.581,33.0204 -17.5986,33.0245 -17.6192,33.0206 -17.6385,33.0041 -17.6756,33.0002 -17.7139,33.0032 -17.7577,32.9991 -17.7943,32.9736 -17.8106,32.957 -17.818,32.9461 -17.8347,32.9397 -17.8555,32.9369 -17.875,32.9384 -17.8946,32.9503 -17.9226,32.9521 -17.9402,32.9481 -17.9533,32.9404 -17.96,32.9324 -17.9649,32.9274 -17.9729,32.929 -17.9823,32.9412 -17.9963,32.9403 -18.0048,32.9349 -18.0246,32.9371 -18.0471,32.9723 -18.1503,32.9755 -18.1833,32.9749 -18.1908,32.9659 -18.2122,32.9582 -18.2254,32.9523 -18.233,32.9505 -18.2413,32.955 -18.2563,32.9702 -18.2775,33.0169 -18.3137,33.035 -18.3329,33.0428 -18.352,33.0381 -18.3631,33.0092 -18.3839,32.9882 -18.4132,32.9854 -18.4125,32.9868 -18.4223,32.9995 -18.4367,33.003 -18.4469,32.9964 -18.4671,32.9786 -18.4801,32.9566 -18.4899,32.9371 -18.501,32.9193 -18.51,32.9003 -18.5153,32.8831 -18.5221,32.8707 -18.5358,32.8683 -18.5526,32.8717 -18.5732,32.8845 -18.609,32.9146 -18.6659,32.9223 -18.6932,32.9202 -18.7262,32.9133 -18.753,32.9025 -18.7745,32.8852 -18.7878,32.8589 -18.79,32.8179 -18.787,32.7876 -18.7913,32.6914 -18.8343,32.6899 -18.8432,32.6968 -18.8972,32.7032 -18.9119,32.7158 -18.9198,32.7051 -18.9275,32.6922 -18.9343,32.6825 -18.9427,32.6811 -18.955,32.6886 -18.9773,32.6903 -18.9882,32.6886 -19.001,32.6911 -19.0143,32.699 -19.0222,32.7103 -19.026,32.7239 -19.0266,32.786 -19.0177,32.8034 -19.0196,32.8142 -19.0238,32.82 -19.0283,32.823 -19.0352,32.8253 -19.0468,32.8302 -19.0591,32.8381 -19.0669,32.8475 -19.0739,32.8559 -19.0837,32.8623 -19.1181,32.8332 -19.242,32.8322 -19.2667,32.8287 -19.2846,32.8207 -19.3013,32.8061 -19.3234,32.7688 -19.3636,32.7665 -19.3734,32.7685 -19.4028,32.7622 -19.4434,32.7634 -19.464,32.7739 -19.4759,32.7931 -19.4767,32.8113 -19.4745,32.8254 -19.4792,32.8322 -19.5009,32.8325 -19.5193,32.8254 -19.5916,32.8257 -19.6008,32.8282 -19.6106,32.8296 -19.6237,32.8254 -19.6333,32.8195 -19.642,32.8163 -19.6521,32.8196 -19.6743,32.831 -19.6852,32.8491 -19.6891,32.8722 -19.6902,32.8947 -19.6843,32.9246 -19.6553,32.9432 -19.6493,32.961 -19.6588,32.9624 -19.6791,32.9541 -19.7178,32.9624 -19.7354,32.9791 -19.7514,33.0006 -19.7643,33.0228 -19.7731,33.0328 -19.7842,33.0296 -19.8034,33.0229 -19.8269,33.0213 -19.8681,33.002 -19.927,32.9984 -20.0009,33.0044 -20.0243,33.0073 -20.032,32.9537 -20.0302,32.9401 -20.0415,32.9343 -20.0721,32.9265 -20.0865,32.9107 -20.0911,32.8944 -20.094,32.8853 -20.103,32.8779 -20.1517,32.8729 -20.1672,32.8593 -20.1909,32.8571 -20.2006,32.8583 -20.2075,32.8651 -20.2209,32.8656 -20.2289,32.8584 -20.2595,32.853 -20.2739,32.8452 -20.2867,32.8008 -20.3386,32.7359 -20.4142,32.7044 -20.4718,32.6718 -20.5318,32.6465 -20.558,32.6037 -20.5648,32.5565 -20.5593,32.5131 -20.5646,32.4816 -20.603,32.4711 -20.6455,32.4691 -20.6868,32.4835 -20.7942,32.4972 -20.8981,32.491 -20.9363,32.4677 -20.9802,32.4171 -21.0409,32.3398 -21.1341,32.3453 -21.1428,32.3599 -21.1514,32.3689 -21.163,32.3734 -21.1636,32.3777 -21.1634,32.3806 -21.1655,32.3805 -21.1722,32.3769 -21.1785,32.373 -21.184,32.3717 -21.1879,32.4446 -21.3047,32.4458 -21.309,32.4472 -21.3137,32.4085 -21.2903,32.373 -21.3279,32.3245 -21.3782,32.2722 -21.4325,32.2197 -21.4869,32.1673 -21.5413,32.1148 -21.5956,32.0624 -21.65,32.01 -21.7045,31.9576 -21.7588,31.9052 -21.8132,31.8527 -21.8676,31.8003 -21.922,31.7478 -21.9764,31.6955 -22.0307,31.6431 -22.0852,31.5907 -22.1396,31.5382 -22.1939,31.4858 -22.2483,31.4338 -22.302,31.3687 -22.345,31.2889 -22.3973,31.2656 -22.3655,31.2556 -22.358,31.2457 -22.3575,31.2296 -22.364,31.2215 -22.3649,31.2135 -22.3619,31.1979 -22.3526,31.1907 -22.3506,31.1837 -22.3456,31.1633 -22.3226,31.1526 -22.3164,31.1377 -22.3185,31.1045 -22.3334,31.097 -22.3349,31.0876 -22.3369,31.0703 -22.3337,31.0361 -22.3196,30.9272 -22.2957,30.8671 -22.2896,30.8379 -22.2823,30.8053 -22.2945,30.6939 -22.3028,30.6743 -22.3086,30.6474 -22.3264,30.6324 -22.3307,30.6256 -22.3286,30.6103 -22.3187,30.6011 -22.3164,30.5722 -22.3166,30.5074 -22.3096,30.4885 -22.3102,30.4692 -22.3151,30.4317 -22.3312,30.4127 -22.3369,30.3721 -22.3435,30.335 -22.3447,30.3008 -22.337,30.2693 -22.3164,30.2553 -22.3047,30.2404 -22.2962,30.2217 -22.2909,30.197 -22.2891,30.1527 -22.2948,30.1351 -22.2936,30.1111 -22.2823,30.0826 -22.2629,30.0679 -22.2571,30.0381 -22.2538,30.0359 -22.2506,30.0345 -22.2461,30.0155 -22.227,30.0053 -22.2223,29.9838 -22.2177,29.974 -22.214,29.9467 -22.1983,29.9321 -22.1944,29.896 -22.1914,29.8715 -22.1793,29.8373 -22.1724,29.7792 -22.1364,29.7589 -22.1309,29.6914 -22.1341,29.6796 -22.1383,29.6614 -22.1265,29.6411 -22.1292,29.604 -22.1451,29.5702 -22.142,29.551 -22.146,29.5425 -22.1625,29.5318 -22.1724,29.5069 -22.1701,29.4569 -22.1588,29.4361 -22.1631,29.3995 -22.1822,29.378 -22.1929,29.3633 -22.1923,29.3569 -22.1909,29.3501 -22.1867,29.2736 -22.1251,29.2673 -22.1158,29.2596 -22.0961,29.2541 -22.0871,29.2444 -22.0757,29.2393 -22.0726,29.1449 -22.0753,29.108 -22.0692,29.0708 -22.051,29.0405 -22.0209,29.0216 -21.9828,29.0138 -21.9404,29.0179 -21.8981,29.0289 -21.8766,29.0454 -21.8526,29.0576 -21.8292,29.0553 -21.81,29.0387 -21.7979,28.9987 -21.786,28.9808 -21.7748,28.9519 -21.7683,28.891 -21.7649,28.8609 -21.7574,28.7142 -21.6935,28.6684 -21.68,28.6297 -21.6513,28.6157 -21.6471,28.5859 -21.6444,28.554 -21.6366,28.5429 -21.6383,28.5325 -21.6431,28.4973 -21.6515,28.4814 -21.6574,28.4646 -21.6603,28.4431 -21.6558,28.3618 -21.6163,28.3219 -21.6035,28.2849 -21.5969,28.1657 -21.5952,28.0908 -21.5813,28.0329 -21.5779,28.0166 -21.5729,28.0026 -21.5642,27.9904 -21.5519,27.9847 -21.5429,27.9757 -21.5226,27.9706 -21.5144,27.9637 -21.5105,27.9581 -21.5115,27.9532 -21.5105,27.9493 -21.5008,27.9544 -21.4878,27.9504 -21.482,27.9433 -21.4799,27.9399 -21.478,27.9419 -21.4685,27.9496 -21.4565,27.953 -21.4487,27.9502 -21.4383,27.9205 -21.3812,27.9042 -21.3647,27.8978 -21.3554,27.8962 -21.3479,27.8967 -21.3324,27.8944 -21.3243,27.885 -21.3102,27.8491 -21.2697,27.8236 -21.2317,27.7938 -21.1974,27.7244 -21.1497,27.7092 -21.1345,27.6748 -21.0901,27.6666 -21.0712,27.6668 -21.0538,27.679 -21.0007,27.6804 -20.9796,27.6727 -20.9235,27.6726 -20.9137,27.6751 -20.8913,27.6748 -20.8799,27.676 -20.8667,27.6818 -20.8576,27.689 -20.849,27.6944 -20.8377,27.7096 -20.7567,27.7073 -20.7167,27.6825 -20.6373,27.6904 -20.6015,27.7026 -20.5661,27.7056 -20.5267,27.6981 -20.5091,27.6838 -20.4961,27.666 -20.4891,27.6258 -20.4886,27.5909 -20.4733,27.5341 -20.483,27.4539 -20.4733,27.3407 -20.473,27.306 -20.4774,27.2684 -20.4958,27.284 -20.3515,27.266 -20.2342,27.2149 -20.1105,27.2018 -20.093,27.1837 -20.0823,27.1629 -20.0766,27.1419 -20.0733,27.1297 -20.0729,27.1198 -20.0739,27.1096 -20.0732,27.0973 -20.0689,27.0865 -20.0605,27.0692 -20.0374,27.0601 -20.0276,27.0267 -20.0101,26.9943 -20.0068,26.9611 -20.0072,26.9251 -20.0009,26.8119 -19.9464,26.7745 -19.9398,26.7508 -19.9396,26.731 -19.9359,26.7139 -19.9274,26.6986 -19.9125,26.6848 -19.8945,26.6772 -19.8868,26.6738 -19.8834,26.6594 -19.8757,26.6141 -19.8634,26.5956 -19.8556,26.5819 -19.8421,26.5748 -19.8195,26.5663 -19.8008,26.5493 -19.7841,26.5089 -19.7593,26.4897 -19.7519,26.4503 -19.7433,26.4319 -19.7365,26.4128 -19.7196,26.3852 -19.6791,26.3627 -19.6676,26.3323 -19.6624,26.3244 -19.6591,26.3122 -19.6514,26.3125 -19.6496,26.3191 -19.6463,26.3263 -19.6339,26.3335 -19.613,26.331 -19.605,26.3211 -19.592,26.3132 -19.5842,26.3035 -19.5773,26.2926 -19.5725,26.2391 -19.5715,26.1945 -19.5602,26.1555 -19.5372,26.1303 -19.5011,26.0344 -19.2437,26.0114 -19.1998,25.9811 -19.1618,25.9565 -19.1221,25.9486 -19.1033,25.9449 -19.0792,25.9481 -19.0587,25.9644 -19.0216,25.9678 -19.001,25.9674 -18.9999,25.9407 -18.9213,25.8153 -18.814,25.7795 -18.7388,25.7734 -18.6656,25.7619 -18.6303,25.7369 -18.6087,25.6983 -18.5902,25.6695 -18.566,25.6221 -18.5011,25.6084 -18.4877,25.5744 -18.4657,25.5085 -18.3991,25.4956 -18.3789,25.4905 -18.3655,25.4812 -18.3234,25.4732 -18.3034,25.4409 -18.2532,25.4088 -18.176,25.3875 -18.139,25.3574 -18.1158,25.3234 -18.0966,25.2964 -18.0686,25.255 -18.0011,25.2261 -17.9319,25.2194 -17.908,25.2194 -17.8798,25.2598 -17.7941,25.2667 -17.8009,25.2854 -17.8093,25.3159 -17.8321,25.3355 -17.8412,25.3453 -17.8426,25.3765 -17.8412,25.4095 -17.853,25.4203 -17.8549,25.4956 -17.8549,25.5007 -17.856,25.5102 -17.8612,25.5165 -17.8623,25.5221 -17.8601,25.5309 -17.851,25.5368 -17.8487,25.604 -17.8362,25.657 -17.8139,25.6814 -17.8115,25.6942 -17.8194,25.7064 -17.8299,25.7438 -17.8394,25.766 -17.8498,25.786 -17.8622,25.7947 -17.8727,25.8044 -17.8882,25.8497 -17.9067,25.8636 -17.9238,25.8475 -17.9294,25.8462 -17.9437,25.8535 -17.96,25.8636 -17.9716,25.9245 -17.999,25.967 -18.0005,25.9785 -17.999,26.0337 -17.9716,26.0406 -17.9785,26.0466 -17.9663,26.0625 -17.9629,26.0812 -17.9624,26.0952 -17.9585,26.0962 -17.9546,26.0942 -17.9419,26.0952 -17.9381,26.1012 -17.9358,26.1186 -17.9316,26.1354 -17.9226,26.1586 -17.9183,26.1675 -17.9136,26.203 -17.8872,26.2119 -17.8828,26.2211 -17.8863,26.2282 -17.8947,26.2339 -17.904,26.2392 -17.9102,26.2483 -17.9134,26.2943 -17.9185,26.3038 -17.9228,26.312 -17.9284,26.3183 -17.9344,26.3255 -17.936,26.3627 -17.9306,26.4086 -17.939,26.4855 -17.9793,26.5271 -17.992,26.5536 -17.9965,26.5702 -18.0029,26.5834 -18.0132,26.5989 -18.03,26.6127 -18.0412,26.6288 -18.0492,26.6857 -18.0668,26.7 -18.0692,26.7119 -18.0658,26.7406 -18.0405,26.7536 -18.033,26.7697 -18.029,26.794 -18.0262,26.8883 -17.9846,26.912 -17.992,26.9487 -17.9689,26.9592 -17.9647,27.0063 -17.9627,27.0213 -17.9585,27.0485 -17.9443,27.0782 -17.917,27.1154 -17.8822,27.149 -17.8425,27.1465 -17.8189,27.1453 -17.7941,27.147 -17.7839,27.1571 -17.7693,27.4221 -17.5048,27.5243 -17.4151,27.5773 -17.3631,27.6045 -17.3128,27.6249 -17.2333,27.6412 -17.1985,27.7773 -17.0012,27.8169 -16.9596,27.8686 -16.9297,28.023 -16.8654,28.1139 -16.8276,28.2125 -16.7486,28.2801 -16.7065,28.6433 -16.5688,28.6907 -16.5603,28.7188 -16.5603,28.7328 -16.5581,28.7414 -16.5507,28.7611 -16.5323,28.7693 -16.5152,28.8089 -16.4863,28.8225 -16.4708,28.8291 -16.4346,28.8331 -16.4264,28.8572 -16.3882,28.857 -16.3655,28.8405 -16.3236,28.8368 -16.3063,28.8403 -16.2847,28.8642 -16.2312,28.8471 -16.2027,28.8525 -16.1628,28.8654 -16.1212,28.871 -16.0872,28.8685 -16.0822,28.8638 -16.0766,28.8593 -16.0696,28.8572 -16.0605,28.8603 -16.0494,28.8741 -16.0289,28.8772 -16.022,28.8989 -15.9955,28.9324 -15.9637,28.9469 -15.9572,28.9513 -15.9553,28.9728 -15.9514,29.0181 -15.9506,29.0423 -15.9463,29.0551 -15.9344,29.0763 -15.8954,29.0862 -15.8846,29.1022 -15.8709,29.1217 -15.8593,29.1419 -15.8545,29.151 -15.8488,29.1863 -15.8128,29.407 -15.7142,29.4221 -15.711,29.5085 -15.7036,29.5262 -15.6928,29.5634 -15.6621,29.5872 -15.6557,29.6086 -15.6584,29.628 -15.6636,29.6485 -15.6666,29.6728 -15.6633,29.73 -15.6447,29.7733 -15.6381,29.8143 -15.6197,29.8373 -15.6148,29.8818 -15.6188,29.9675 -15.6415,30.0107 -15.6462))
+```
+
+``` sql
+SELECT round(polygonPerimeterSpherical([(30.010654, -15.646227), (30.050238, -15.640129), (30.090029, -15.629381), (30.130129, -15.623696), (30.16992, -15.632171), (30.195552, -15.649121), (30.207231, -15.653152), (30.223147, -15.649741), (30.231002, -15.644677), (30.246091, -15.632068), (30.254876, -15.628864), (30.280094, -15.632275), (30.296196, -15.639042), (30.32805, -15.652428), (30.356679, -15.651498), (30.396263, -15.635995), (30.39771, -15.716817), (30.39926, -15.812005), (30.401327, -15.931688), (30.402568, -16.001244), (30.514809, -16.000418), (30.586587, -16.000004), (30.74973, -15.998867), (30.857424, -15.998144), (30.901865, -16.007136), (30.942173, -16.034524), (30.958296, -16.05106), (30.973075, -16.062016), (30.989767, -16.06429), (31.012039, -16.054885), (31.023718, -16.045169), (31.042218, -16.024912), (31.056895, -16.017574), (31.065421, -16.019641), (31.073328, -16.025532), (31.080872, -16.025946), (31.089037, -16.01189), (31.1141, -15.996904), (31.15849, -16.000211), (31.259983, -16.023465), (31.278897, -16.030287), (31.29533, -16.041655), (31.309592, -16.059019), (31.328351, -16.092815), (31.340908, -16.106664), (31.360339, -16.116896), (31.37026, -16.123718), (31.374601, -16.132916), (31.377754, -16.142218), (31.384006, -16.148832), (31.387727, -16.149556), (31.395582, -16.147695), (31.399613, -16.147282), (31.404315, -16.149866), (31.404057, -16.154517), (31.402713, -16.159374), (31.404574, -16.162268), (31.424107, -16.164749), (31.445708, -16.164955), (31.465655, -16.167746), (31.480641, -16.177978), (31.519192, -16.196478), (31.686107, -16.207227), (31.710705, -16.217872), (31.738197, -16.239783), (31.798761, -16.303655), (31.818088, -16.319571), (31.86005, -16.340759), (31.871935, -16.35037), (31.88072, -16.368044), (31.88563, -16.406284), (31.894363, -16.421477), (31.910279, -16.428919), (32.014149, -16.444938), (32.211759, -16.440184), (32.290463, -16.45176), (32.393661, -16.491757), (32.5521, -16.553355), (32.671783, -16.599761), (32.6831, -16.609889), (32.687906, -16.624255), (32.68863, -16.647303), (32.698655, -16.686784), (32.725217, -16.706421), (32.73095, -16.708656), (32.731314, -16.708798), (32.739893, -16.703217), (32.753845, -16.697946), (32.769348, -16.695466), (32.800664, -16.697326), (32.862004, -16.710452), (32.893372, -16.712415), (32.909598, -16.708075), (32.93957, -16.689781), (32.95621, -16.683063), (32.968509, -16.681615999999998), (32.961585, -16.710348), (32.933369, -16.815768), (32.916213, -16.847911), (32.900503, -16.867755), (32.828776, -16.935141), (32.83012, -16.941549), (32.886757, -17.038184), (32.928512, -17.109497), (32.954143, -17.167168), (32.967786, -17.22887), (32.96909, -17.266115), (32.969439, -17.276102), (32.973212, -17.297909), (32.983599, -17.317753), (32.992384, -17.324678), (33.014656, -17.336667), (33.021633, -17.345555), (33.022459, -17.361471), (33.016258, -17.377181), (33.011651, -17.383991), (32.997448, -17.404983), (32.958174, -17.478467), (32.951663, -17.486218), (32.942981, -17.491593), (32.936573, -17.498311), (32.936676, -17.509369), (32.947218, -17.543166), (32.951663, -17.551434), (32.969129, -17.56456), (33.006646, -17.580993), (33.020392, -17.598563), (33.024526, -17.619233), (33.020599, -17.638457), (33.004063, -17.675561), (33.000238, -17.713905), (33.003184, -17.757726), (32.999102, -17.794313), (32.973573, -17.810643), (32.957037, -17.817981), (32.946082, -17.834724), (32.939674, -17.855498), (32.936883, -17.875032), (32.938433, -17.894566), (32.950267, -17.922574), (32.952128, -17.940247), (32.948149, -17.95327), (32.940397, -17.959988), (32.932439, -17.964949), (32.927375, -17.972907), (32.928977, -17.982312), (32.941224, -17.996265), (32.940294, -18.004843), (32.934919, -18.024583), (32.93709, -18.047114), (32.972282, -18.150261), (32.975537, -18.183333), (32.974865, -18.190775), (32.965925, -18.212169), (32.958174, -18.225398), (32.952283, -18.233046), (32.950525999999996, -18.241314), (32.95497, -18.256301), (32.970163, -18.277488), (33.016878, -18.313661), (33.034965, -18.332885), (33.042768, -18.352005), (33.038066, -18.363064), (33.00923, -18.383941), (32.988198, -18.41319), (32.985356, -18.412467), (32.986803, -18.422285), (32.999515, -18.436651), (33.003029, -18.446883), (32.996414, -18.46714), (32.978586, -18.48006), (32.956624, -18.489878), (32.937142, -18.50104), (32.919313, -18.510032), (32.900296, -18.515303), (32.88314, -18.522124), (32.870737, -18.535767), (32.868257, -18.552613), (32.871668, -18.57318), (32.884483, -18.609044), (32.914559, -18.665888), (32.92231, -18.693173), (32.920243, -18.726246), (32.913267, -18.753014), (32.902518, -18.774512), (32.885207, -18.787844), (32.858852, -18.790015), (32.817924, -18.787018), (32.787642, -18.791255), (32.69142, -18.83425), (32.68987, -18.843241), (32.696794, -18.897192), (32.703202, -18.911868), (32.71576, -18.919826), (32.705063, -18.927474), (32.692247, -18.934295), (32.682532, -18.942667), (32.681085, -18.954966), (32.68863, -18.97729), (32.690283, -18.988246), (32.68863, -19.000958), (32.691058, -19.01429), (32.698965, -19.022249), (32.710282, -19.025969), (32.723873, -19.026589), (32.785988, -19.017701), (32.803351, -19.019561), (32.814203, -19.023799), (32.819991, -19.028346), (32.822988, -19.035168), (32.825262, -19.046847), (32.830223, -19.059146), (32.83813, -19.066897), (32.847483, -19.073925), (32.855906, -19.083744), (32.862262, -19.118057), (32.83322, -19.241977), (32.832187, -19.266678), (32.828673, -19.284558), (32.820715, -19.301301), (32.806142, -19.323419), (32.768831, -19.363623), (32.766454, -19.373442), (32.768521, -19.402794), (32.762217, -19.443412), (32.763354, -19.463979), (32.773947, -19.475864), (32.793119, -19.476691), (32.811309, -19.474521), (32.825365, -19.479172), (32.832187, -19.500876), (32.832497000000004, -19.519273), (32.825365, -19.59162), (32.825675, -19.600818), (32.828156, -19.610636), (32.829603, -19.623659), (32.825365, -19.633271), (32.819474, -19.641952), (32.81627, -19.652081), (32.819629, -19.674302), (32.83105, -19.685154), (32.849137, -19.689081), (32.872184, -19.690218), (32.894715, -19.684327), (32.924584, -19.655285), (32.943188, -19.64929), (32.960964, -19.658799), (32.962411, -19.679056), (32.954143, -19.717813), (32.962411, -19.735383), (32.979051, -19.751403), (33.0006, -19.764322), (33.022769, -19.773107), (33.032795, -19.784166), (33.029642, -19.80339), (33.022873, -19.826851), (33.021322, -19.868088), (33.001995, -19.927), (32.998378, -20.000897), (33.004373, -20.024255), (33.007266, -20.032006), (32.95373, -20.030249), (32.940087, -20.041515), (32.934299, -20.072107), (32.926548, -20.086473), (32.910683, -20.091124), (32.894405, -20.094018), (32.88531, -20.10301), (32.877869, -20.151689), (32.872908, -20.167192), (32.859265, -20.190859), (32.857095, -20.200575), (32.858335, -20.207499), (32.865053, -20.220935), (32.86557, -20.228893), (32.858438, -20.259486), (32.852961, -20.273852), (32.845209, -20.286668), (32.800767, -20.338551), (32.735862, -20.414205), (32.704443, -20.471773), (32.671783, -20.531821), (32.646462, -20.557969), (32.603674, -20.56479), (32.556545, -20.559312), (32.513136, -20.564583), (32.481614, -20.603031), (32.471072, -20.645509), (32.469108, -20.68685), (32.483474, -20.794233), (32.49722, -20.898103), (32.491019, -20.936344), (32.467661, -20.980165), (32.417122, -21.040937), (32.339814, -21.134058), (32.345343, -21.142843), (32.359864, -21.151421), (32.368856, -21.162997), (32.373352, -21.163617), (32.377744, -21.16341), (32.380638, -21.165477), (32.380535, -21.172195), (32.376866, -21.178499), (32.37299, -21.183977), (32.37175, -21.187905), (32.444613, -21.304693), (32.445849, -21.308994), (32.447197, -21.313685), (32.408543, -21.290327), (32.37299, -21.327948), (32.324517, -21.378177), (32.272221, -21.432541), (32.219718, -21.486904), (32.167318, -21.541268), (32.114814, -21.595632), (32.062415, -21.649995), (32.010015, -21.704462), (31.957615, -21.758826), (31.905215, -21.813189), (31.852712, -21.867553), (31.800312, -21.92202), (31.747808, -21.976384), (31.695512, -22.030747), (31.643112, -22.085214), (31.590712, -22.139578), (31.538209, -22.193941), (31.485809, -22.248305), (31.433822, -22.302048), (31.36871, -22.345043), (31.288922, -22.39734), (31.265616, -22.365507), (31.255642, -22.357962), (31.24572, -22.357549), (31.229597, -22.363957), (31.221536, -22.364887), (31.213474, -22.36189), (31.197868, -22.352588), (31.190685, -22.350624), (31.183657, -22.34556), (31.163348, -22.322616), (31.152599, -22.316414), (31.137717, -22.318482), (31.10454, -22.333364), (31.097048, -22.334922), (31.087642, -22.336878), (31.07033, -22.333674), (31.036121, -22.319618), (30.927187, -22.295744), (30.867087, -22.289646), (30.83789, -22.282308), (30.805282, -22.294504), (30.693919, -22.302772), (30.674282, -22.30856), (30.647410999999998, -22.32644), (30.632424, -22.330677), (30.625551, -22.32861), (30.610307, -22.318688), (30.601108, -22.316414), (30.57217, -22.316621), (30.507367, -22.309593), (30.488454, -22.310213), (30.46923, -22.315071), (30.431713, -22.331194), (30.412696, -22.336878), (30.372078, -22.343493), (30.334975, -22.344733), (30.300765, -22.336982), (30.269346, -22.316414), (30.25529, -22.304736), (30.240407, -22.296157), (30.2217, -22.290886), (30.196999, -22.289129), (30.15266, -22.294814), (30.13509, -22.293574), (30.111113, -22.282308), (30.082587, -22.262878), (30.067911, -22.25709), (30.038145, -22.253783), (30.035872, -22.250579), (30.034528, -22.246135), (30.015511, -22.227014), (30.005279, -22.22226), (29.983782, -22.217713), (29.973963, -22.213992), (29.946678, -22.198282), (29.932105, -22.194355), (29.896035, -22.191358), (29.871489, -22.179265), (29.837331, -22.172444), (29.779246, -22.136374), (29.758886, -22.130896), (29.691448, -22.1341), (29.679614, -22.138338), (29.661424, -22.126452), (29.641064, -22.129242), (29.60396, -22.145055), (29.570164, -22.141955), (29.551043, -22.145986), (29.542517, -22.162522), (29.53182, -22.172444), (29.506912, -22.170067), (29.456889, -22.158801), (29.436115, -22.163142), (29.399528, -22.182159), (29.378031, -22.192908), (29.363250999999998, -22.192288), (29.356947, -22.190944000000002), (29.350074, -22.186707), (29.273644, -22.125108), (29.26734, -22.115807), (29.259588, -22.096066), (29.254111, -22.087074), (29.244395, -22.075706), (29.239331, -22.072605), (29.144867, -22.075292), (29.10797, -22.069194), (29.070763, -22.051004), (29.040532, -22.020929), (29.021567, -21.982791), (29.013815, -21.940417), (29.017949, -21.898145), (29.028905, -21.876648), (29.045441, -21.852567), (29.057637, -21.829209), (29.05526, -21.809985), (29.038723, -21.797893), (28.998726, -21.786008), (28.980846, -21.774845), (28.951907, -21.768334), (28.891032, -21.764924), (28.860853, -21.757379), (28.714195, -21.693507), (28.66841, -21.679968), (28.629704, -21.651339), (28.6157, -21.647101), (28.585934, -21.644414), (28.553998, -21.636559), (28.542939, -21.638316), (28.532501, -21.643071), (28.497309, -21.651546), (28.481393, -21.657437), (28.464598, -21.660331), (28.443101, -21.655783), (28.361762, -21.616302), (28.321919, -21.603486), (28.284867, -21.596872), (28.165702, -21.595218), (28.090771, -21.581266), (28.032893, -21.577855), (28.016563, -21.572894), (28.002559, -21.564212), (27.990415, -21.551913), (27.984731, -21.542922), (27.975739, -21.522561), (27.970571, -21.514396), (27.963698, -21.510469), (27.958066, -21.511502), (27.953208, -21.510469), (27.949281, -21.500754), (27.954448, -21.487835), (27.950418, -21.482047), (27.943338, -21.479876), (27.939876, -21.478016), (27.941943, -21.468508), (27.949642, -21.456519), (27.953001, -21.448664), (27.950211, -21.438329), (27.920549, -21.381174), (27.904219, -21.364741), (27.897811, -21.35544), (27.896157, -21.347895), (27.896674, -21.332392), (27.8944, -21.32433), (27.884995, -21.310171), (27.849132, -21.269657), (27.823604, -21.231726), (27.793838, -21.197413), (27.724385, -21.149664), (27.709192, -21.134471), (27.674775, -21.090133), (27.666611, -21.071219), (27.666817, -21.053753), (27.678961, -21.000733), (27.680356, -20.979649), (27.672657, -20.923528), (27.672605, -20.913709), (27.675085, -20.891282), (27.674775, -20.879913), (27.676016, -20.866684), (27.681803, -20.857589), (27.689038, -20.849011), (27.694412, -20.837744999999998), (27.709605, -20.756716), (27.707332, -20.716719), (27.682475, -20.637344), (27.690382, -20.60148), (27.702629, -20.566134), (27.705575, -20.526653), (27.698133, -20.509083), (27.683767, -20.49606), (27.66599, -20.489136), (27.625786, -20.488619), (27.590853, -20.473323), (27.534112, -20.483038), (27.45391, -20.473323), (27.340739, -20.473013), (27.306012, -20.477354), (27.268392, -20.49575), (27.283998, -20.35147), (27.266015, -20.234164), (27.214907, -20.110451), (27.201781, -20.092984), (27.183746, -20.082339), (27.16292, -20.076551), (27.141888, -20.073347), (27.129692, -20.072934), (27.119771, -20.073864), (27.109642, -20.073244), (27.097343, -20.068903), (27.086491, -20.060532), (27.069231, -20.03738), (27.060136, -20.027562), (27.02665, -20.010095), (26.9943, -20.006788), (26.961072, -20.007201), (26.925054, -20.000897), (26.811882, -19.94643), (26.774469, -19.939815), (26.750801, -19.939609), (26.730957, -19.935888), (26.713904, -19.927413), (26.698608, -19.91253), (26.684758, -19.894547), (26.67717, -19.886815), (26.673803, -19.883385), (26.659437, -19.875737), (26.614065, -19.863438), (26.595565, -19.855583), (26.581922, -19.842147), (26.574791, -19.819513), (26.566316, -19.800806), (26.549263, -19.784063), (26.508852, -19.759258), (26.489731, -19.75192), (26.450251, -19.743342), (26.431854, -19.73652), (26.412837, -19.71957), (26.385242, -19.679056), (26.362711, -19.667584), (26.332325, -19.662416), (26.324367, -19.659109), (26.312171, -19.651358), (26.312481, -19.649601), (26.319096, -19.646293), (26.326331, -19.633891), (26.333462, -19.613014), (26.330981, -19.604952), (26.32106, -19.592033), (26.313205, -19.584178), (26.30349, -19.577254), (26.292638, -19.572499), (26.239101, -19.571466), (26.194452, -19.560200000000002), (26.155488, -19.537153), (26.13027, -19.501082), (26.034359, -19.243734), (26.011414, -19.199809), (25.981132, -19.161775), (25.956534, -19.122088), (25.948576, -19.103277), (25.944855, -19.079196), (25.948059, -19.058732), (25.964389, -19.021629), (25.9678, -19.000958), (25.967449, -18.999925), (25.940721, -18.921273), (25.815251, -18.813993), (25.779491, -18.738752), (25.773393, -18.665578), (25.761921, -18.630335), (25.736909, -18.608734), (25.698255, -18.590234), (25.669523, -18.566049), (25.622084, -18.501143), (25.608442, -18.487708), (25.574439, -18.465693), (25.508499, -18.399134), (25.49558, -18.378877), (25.490516, -18.365545), (25.481163, -18.323377), (25.473204, -18.303429), (25.440855, -18.2532), (25.408816, -18.175995), (25.387525, -18.138995), (25.357449, -18.115844), (25.323446, -18.09662), (25.296368, -18.068612), (25.255026, -18.001122), (25.226088, -17.931876), (25.21937, -17.908001), (25.21937, -17.879786), (25.259781, -17.794107), (25.266705, -17.800928), (25.285412, -17.809299), (25.315901, -17.83214), (25.335538, -17.841235), (25.345254, -17.842579), (25.376466, -17.841235), (25.409539, -17.853018), (25.420288, -17.854878), (25.49558, -17.854878), (25.500748, -17.856015), (25.510153, -17.861183), (25.516458, -17.862319), (25.522142, -17.860149), (25.530927, -17.850951), (25.536818, -17.848677), (25.603997, -17.836171), (25.657017, -17.81395), (25.681409, -17.81147), (25.694224, -17.819428), (25.70642, -17.829867), (25.743834, -17.839375), (25.765951, -17.849814), (25.786002, -17.862216), (25.794683, -17.872655), (25.804399, -17.888158), (25.849667, -17.906658), (25.86362, -17.923814), (25.847497, -17.929395), (25.846153, -17.943658), (25.853490999999998, -17.959988), (25.86362, -17.971563), (25.924495, -17.998952), (25.966973, -18.000502), (25.978548, -17.998952), (26.033739, -17.971563), (26.04056, -17.978488), (26.046554, -17.966292), (26.062471, -17.962882), (26.081178, -17.962365), (26.095234, -17.958541), (26.096164, -17.954614), (26.0942, -17.941901), (26.095234, -17.938077), (26.101228, -17.935803), (26.118591, -17.931566), (26.135438, -17.922574), (26.158589, -17.918337), (26.167477, -17.913582), (26.203031, -17.887227), (26.211919, -17.882783), (26.221117, -17.886297), (26.228249, -17.894669), (26.233933, -17.903971), (26.239204, -17.910172), (26.248299, -17.913376), (26.294291, -17.918543), (26.3038, -17.922781), (26.311965, -17.928362), (26.318269, -17.934356), (26.325504, -17.93601), (26.362711, -17.930636), (26.408599, -17.939007), (26.485494, -17.979315), (26.527145, -17.992027), (26.553604, -17.996471), (26.570243, -18.002879), (26.583369, -18.013215), (26.598872, -18.029958), (26.612721, -18.041223), (26.628844, -18.049181), (26.685689, -18.066751), (26.700003, -18.069232), (26.71194, -18.065821), (26.740569, -18.0405), (26.753591, -18.032955), (26.769714, -18.029028), (26.794002, -18.026237), (26.88826, -17.984586), (26.912031, -17.992027), (26.94867, -17.968876), (26.95916, -17.964742), (27.006289, -17.962675), (27.021275, -17.958541), (27.048457, -17.944278), (27.078171, -17.916993), (27.11543, -17.882163), (27.149019, -17.842476), (27.146539, -17.818911), (27.145299, -17.794107), (27.146952, -17.783875), (27.157081, -17.769302), (27.422078, -17.504822), (27.524294, -17.415112), (27.577314, -17.363125), (27.604495, -17.312792), (27.624856, -17.233314), (27.641186, -17.198484), (27.777301, -17.001183), (27.816886, -16.959636), (27.868562, -16.929663), (28.022993, -16.865393), (28.113922, -16.827551), (28.21252, -16.748589), (28.280113, -16.706524), (28.643295, -16.568755), (28.690734, -16.56028), (28.718794, -16.56028), (28.73285, -16.55811), (28.741377, -16.550668), (28.761117, -16.532271), (28.769282, -16.515218), (28.808866, -16.486279), (28.822509, -16.470776), (28.829124, -16.434603), (28.833051, -16.426438), (28.857236, -16.388198), (28.857029, -16.36546), (28.840492, -16.323602), (28.836772, -16.306342), (28.840286, -16.284741), (28.86416, -16.231205), (28.847107, -16.202679), (28.852481, -16.162785), (28.8654, -16.121237), (28.870981, -16.087234), (28.868501, -16.08217), (28.86385, -16.076589), (28.859303, -16.069561), (28.857236, -16.060466), (28.860336, -16.049407), (28.874082, -16.028943), (28.877183, -16.022018), (28.898887, -15.995457), (28.932373, -15.963727), (28.946862, -15.957235), (28.951287, -15.955252), (28.972784, -15.951428), (29.018053, -15.950602), (29.042341, -15.946261), (29.055053, -15.934375), (29.076344, -15.895411), (29.086162, -15.884559), (29.102182, -15.870916), (29.121716, -15.859341), (29.141869, -15.854483), (29.150964, -15.848799), (29.186311, -15.812832), (29.406969, -15.714233), (29.422059, -15.711030000000001), (29.508462, -15.703588), (29.526239, -15.692839), (29.563446, -15.662144), (29.587217, -15.655736), (29.608559, -15.658422999999999), (29.62799, -15.663591), (29.648505, -15.666588), (29.672793, -15.663281), (29.73005, -15.644677), (29.773252, -15.638062), (29.814283, -15.619666), (29.837331, -15.614808), (29.881773, -15.618839), (29.967504, -15.641473), (30.010654, -15.646227)]), 6)
+```
+```response
+0.45539
+```
+
+### Input parameters
+
+### Returned value
+
+## polygonsIntersectionCartesian
+
+Calculates the intersection of polygons.
+
+### Example
+
+``` sql
+SELECT wkt(polygonsIntersectionCartesian([[[(0., 0.), (0., 3.), (1., 2.9), (2., 2.6), (2.6, 2.), (2.9, 1.), (3., 0.), (0., 0.)]]], [[[(1., 1.), (1., 4.), (4., 4.), (4., 1.), (1., 1.)]]]))
+```
+```response
+MULTIPOLYGON(((1 2.9,2 2.6,2.6 2,2.9 1,1 1,1 2.9)))
+```
+
+### Input parameters
+
+Polygons
+
+### Returned value
+
+MultiPolygon
+
+## polygonAreaCartesian
+
+Calculates the area of a polygon
+
+### Example
+
+``` sql
+SELECT polygonAreaCartesian([[[(0., 0.), (0., 5.), (5., 5.), (5., 0.)]]])
+```
+```response
+25
+```
+
+### Input parameters
+
+Polygon
+
+### Returned value
+
+Float64
+
+## polygonPerimeterCartesian
+
+Calculates the perimeter of a polygon.
+
+### Example
+
+``` sql
+SELECT polygonPerimeterCartesian([[[(0., 0.), (0., 5.), (5., 5.), (5., 0.)]]])
+```
+```response
+15
+```
+
+### Input parameters
+
+Polygon
+
+### Returned value
+
+Float64
+
+## polygonsUnionCartesian
+
+Calculates the union of polygons.
+
+### Example
+
+``` sql
+SELECT wkt(polygonsUnionCartesian([[[(0., 0.), (0., 3.), (1., 2.9), (2., 2.6), (2.6, 2.), (2.9, 1), (3., 0.), (0., 0.)]]], [[[(1., 1.), (1., 4.), (4., 4.), (4., 1.), (1., 1.)]]]))
+```
+```response
+MULTIPOLYGON(((1 2.9,1 4,4 4,4 1,2.9 1,3 0,0 0,0 3,1 2.9)))
+```
+
+### Input parameters
+
+Polygons
+
+### Returned value
+
+MultiPolygon
+
+For more information on geometry systems, see this [presentation](https://archive.fosdem.org/2020/schedule/event/working_with_spatial_trajectories_in_boost_geometry/attachments/slides/3988/export/events/attachments/working_with_spatial_trajectories_in_boost_geometry/slides/3988/FOSDEM20_vissarion.pdf) about the Boost library, which is what ClickHouse uses.
+
diff --git a/docs/en/sql-reference/functions/geo/s2.md b/docs/en/sql-reference/functions/geo/s2.md
index 3cd66cfaaeb..63fe5ca8530 100644
--- a/docs/en/sql-reference/functions/geo/s2.md
+++ b/docs/en/sql-reference/functions/geo/s2.md
@@ -21,12 +21,12 @@ geoToS2(lon, lat)
 
 **Arguments**
 
--   `lon` — Longitude. [Float64](../../../sql-reference/data-types/float.md).
--   `lat` — Latitude. [Float64](../../../sql-reference/data-types/float.md).
+- `lon` — Longitude. [Float64](../../../sql-reference/data-types/float.md).
+- `lat` — Latitude. [Float64](../../../sql-reference/data-types/float.md).
 
 **Returned values**
 
--   S2 point index.
+- S2 point index.
 
 Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
@@ -58,11 +58,11 @@ s2ToGeo(s2index)
 
 **Arguments**
 
--   `s2index` — S2 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2index` — S2 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   A tuple consisting of two values: `tuple(lon,lat)`.
+- A tuple consisting of two values: `tuple(lon,lat)`.
 
 Type: `lon` — [Float64](../../../sql-reference/data-types/float.md). `lat` — [Float64](../../../sql-reference/data-types/float.md).
 
@@ -84,7 +84,7 @@ Result:
 
 ## s2GetNeighbors
 
-Returns S2 neighbor indixes corresponding to the provided [S2](#s2index). Each cell in the S2 system is a quadrilateral bounded by four geodesics. So, each cell has 4 neighbors. 
+Returns S2 neighbor indexes corresponding to the provided [S2](#s2index). Each cell in the S2 system is a quadrilateral bounded by four geodesics. So, each cell has 4 neighbors.
 
 **Syntax**
 
@@ -94,11 +94,11 @@ s2GetNeighbors(s2index)
 
 **Arguments**
 
--   `s2index` — S2 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2index` — S2 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   An array consisting of 4 neighbor indexes: `array[s2index1, s2index3, s2index2, s2index4]`.
+- An array consisting of 4 neighbor indexes: `array[s2index1, s2index3, s2index2, s2index4]`.
 
 Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
@@ -130,12 +130,12 @@ s2CellsIntersect(s2index1, s2index2)
 
 **Arguments**
 
--   `siIndex1`, `s2index2` — S2 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `siIndex1`, `s2index2` — S2 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   1 — If the cells intersect.
--   0 — If the cells don't intersect.
+- 1 — If the cells intersect.
+- 0 — If the cells don't intersect.
 
 Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
@@ -167,14 +167,14 @@ s2CapContains(center, degrees, point)
 
 **Arguments**
 
--   `center` — S2 point index corresponding to the cap. [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `degrees` — Radius of the cap in degrees. [Float64](../../../sql-reference/data-types/float.md).
--   `point` — S2 point index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `center` — S2 point index corresponding to the cap. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `degrees` — Radius of the cap in degrees. [Float64](../../../sql-reference/data-types/float.md).
+- `point` — S2 point index. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   1 — If the cap contains the S2 point index.
--   0 — If the cap doesn't contain the S2 point index.
+- 1 — If the cap contains the S2 point index.
+- 0 — If the cap doesn't contain the S2 point index.
 
 Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
@@ -206,13 +206,13 @@ s2CapUnion(center1, radius1, center2, radius2)
 
 **Arguments**
 
--   `center1`, `center2` — S2 point indixes corresponding to the two input caps. [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `radius1`, `radius2` — Radius of the two input caps in degrees. [Float64](../../../sql-reference/data-types/float.md).
+- `center1`, `center2` — S2 point indexes corresponding to the two input caps. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `radius1`, `radius2` — Radius of the two input caps in degrees. [Float64](../../../sql-reference/data-types/float.md).
 
 **Returned values**
 
--   `center` — S2 point index corresponding the center of the smallest cap containing the two input caps. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `radius` — Radius of the smallest cap containing the two input caps. Type: [Float64](../../../sql-reference/data-types/float.md).
+- `center` — S2 point index corresponding the center of the smallest cap containing the two input caps. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `radius` — Radius of the smallest cap containing the two input caps. Type: [Float64](../../../sql-reference/data-types/float.md).
 
 **Example**
 
@@ -242,14 +242,14 @@ s2RectAdd(s2pointLow, s2pointHigh, s2Point)
 
 **Arguments**
 
--   `s2PointLow` — Low S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `s2PointHigh` — High S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `s2Point` — Target S2 point index that the bound rectangle should be grown to include. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2PointLow` — Low S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2PointHigh` — High S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2Point` — Target S2 point index that the bound rectangle should be grown to include. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   `s2PointLow` — Low S2 cell id corresponding to the grown rectangle. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `s2PointHigh` — Hight S2 cell id corresponding to the grown rectangle. Type: [UInt64](../../../sql-reference/data-types/float.md).
+- `s2PointLow` — Low S2 cell id corresponding to the grown rectangle. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2PointHigh` — Hight S2 cell id corresponding to the grown rectangle. Type: [UInt64](../../../sql-reference/data-types/float.md).
 
 **Example**
 
@@ -279,14 +279,14 @@ s2RectContains(s2PointLow, s2PointHi, s2Point)
 
 **Arguments**
 
--   `s2PointLow` — Low S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `s2PointHigh` — High S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `s2Point` — Target S2 point index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2PointLow` — Low S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2PointHigh` — High S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2Point` — Target S2 point index. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   1 — If the rectangle contains the given S2 point.
--   0 — If the rectangle doesn't contain the given S2 point.
+- 1 — If the rectangle contains the given S2 point.
+- 0 — If the rectangle doesn't contain the given S2 point.
 
 **Example**
 
@@ -316,13 +316,13 @@ s2RectUnion(s2Rect1PointLow, s2Rect1PointHi, s2Rect2PointLow, s2Rect2PointHi)
 
 **Arguments**
 
--   `s2Rect1PointLow`, `s2Rect1PointHi` — Low and High S2 point indexes corresponding to the first rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `s2Rect2PointLow`, `s2Rect2PointHi` — Low and High S2 point indexes corresponding to the second rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2Rect1PointLow`, `s2Rect1PointHi` — Low and High S2 point indexes corresponding to the first rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2Rect2PointLow`, `s2Rect2PointHi` — Low and High S2 point indexes corresponding to the second rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   `s2UnionRect2PointLow` — Low S2 cell id corresponding to the union rectangle. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `s2UnionRect2PointHi` — High S2 cell id corresponding to the union rectangle. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2UnionRect2PointLow` — Low S2 cell id corresponding to the union rectangle. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2UnionRect2PointHi` — High S2 cell id corresponding to the union rectangle. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
@@ -352,13 +352,13 @@ s2RectIntersection(s2Rect1PointLow, s2Rect1PointHi, s2Rect2PointLow, s2Rect2Poin
 
 **Arguments**
 
--   `s2Rect1PointLow`, `s2Rect1PointHi` — Low and High S2 point indexes corresponding to the first rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `s2Rect2PointLow`, `s2Rect2PointHi` — Low and High S2 point indexes corresponding to the second rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2Rect1PointLow`, `s2Rect1PointHi` — Low and High S2 point indexes corresponding to the first rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2Rect2PointLow`, `s2Rect2PointHi` — Low and High S2 point indexes corresponding to the second rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   `s2UnionRect2PointLow` — Low S2 cell id corresponding to the rectangle containing the intersection of the given rectangles. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `s2UnionRect2PointHi` — High S2 cell id corresponding to the rectangle containing the intersection of the given rectangles. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2UnionRect2PointLow` — Low S2 cell id corresponding to the rectangle containing the intersection of the given rectangles. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `s2UnionRect2PointHi` — High S2 cell id corresponding to the rectangle containing the intersection of the given rectangles. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
diff --git a/docs/en/sql-reference/functions/hash-functions.md b/docs/en/sql-reference/functions/hash-functions.md
index 69dc73e2fb0..635c8f4e0ec 100644
--- a/docs/en/sql-reference/functions/hash-functions.md
+++ b/docs/en/sql-reference/functions/hash-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/hash-functions
-sidebar_position: 50
+sidebar_position: 85
 sidebar_label: Hash
 ---
 
@@ -64,7 +64,7 @@ This is a cryptographic hash function. It works at least three times faster than
 The function [interprets](/docs/en/sql-reference/functions/type-conversion-functions.md/#type_conversion_functions-reinterpretAsString) all the input parameters as strings and calculates the hash value for each of them. It then combines the hashes by the following algorithm:
 
 1.  The first and the second hash value are concatenated to an array which is hashed.
-2.  The previously calculated hash value and the hash of the third input paramter are hashed in a similar way.
+2.  The previously calculated hash value and the hash of the third input parameter are hashed in a similar way.
 3.  This calculation is repeated for all remaining hash values of the original input.
 
 **Arguments**
@@ -125,7 +125,7 @@ SELECT sipHash64Keyed((506097522914230528, 1084818905618843912), array('e','x','
 
 Like [sipHash64](#hash_functions-siphash64) but produces a 128-bit hash value, i.e. the final xor-folding state is done up to 128 bits.
 
-:::warning
+:::note
 This 128-bit variant differs from the reference implementation and it's weaker.
 This version exists because, when it was written, there was no official 128-bit extension for SipHash.
 New projects should probably use [sipHash128Reference](#hash_functions-siphash128reference).
@@ -165,7 +165,7 @@ Result:
 
 Same as [sipHash128](#hash_functions-siphash128) but additionally takes an explicit key argument instead of using a fixed key.
 
-:::warning
+:::note
 This 128-bit variant differs from the reference implementation and it's weaker.
 This version exists because, when it was written, there was no official 128-bit extension for SipHash.
 New projects should probably use [sipHash128ReferenceKeyed](#hash_functions-siphash128referencekeyed).
@@ -279,6 +279,8 @@ cityHash64(par1,...)
 
 This is a fast non-cryptographic hash function. It uses the CityHash algorithm for string parameters and implementation-specific fast non-cryptographic hash function for parameters with other data types. The function uses the CityHash combinator to get the final results.
 
+Note that Google changed the algorithm of CityHash after it has been added to ClickHouse. In other words, ClickHouse's cityHash64 and Google's upstream CityHash now produce different results. ClickHouse cityHash64 corresponds to CityHash v1.0.2.
+
 **Arguments**
 
 The function takes a variable number of input parameters. Arguments can be any of the [supported data types](/docs/en/sql-reference/data-types/index.md). For some data types calculated value of hash function may be the same for the same values even if types of arguments differ (integers of different size, named and unnamed `Tuple` with the same data, `Map` and the corresponding `Array(Tuple(key, value))` type with the same data).
@@ -335,11 +337,11 @@ Even in these cases, we recommend applying the function offline and pre-calculat
 
 **Arguments**
 
--   `s` — Input string for SHA hash calculation. [String](/docs/en/sql-reference/data-types/string.md).
+- `s` — Input string for SHA hash calculation. [String](/docs/en/sql-reference/data-types/string.md).
 
 **Returned value**
 
--   SHA hash as a hex-unencoded FixedString. SHA-1 returns as FixedString(20), SHA-224 as FixedString(28), SHA-256 — FixedString(32), SHA-512 — FixedString(64).
+- SHA hash as a hex-unencoded FixedString. SHA-1 returns as FixedString(20), SHA-224 as FixedString(28), SHA-256 — FixedString(32), SHA-512 — FixedString(64).
 
 Type: [FixedString](/docs/en/sql-reference/data-types/fixedstring.md).
 
@@ -441,11 +443,11 @@ SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:0
 
 ## javaHash
 
-Calculates JavaHash from a [string](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/String.java#l1452), 
-[Byte](https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/Byte.java#l405), 
-[Short](https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/Short.java#l410), 
-[Integer](https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/Integer.java#l959), 
-[Long](https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/Long.java#l1060). 
+Calculates JavaHash from a [string](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/String.java#l1452),
+[Byte](https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/Byte.java#l405),
+[Short](https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/Short.java#l410),
+[Integer](https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/Integer.java#l959),
+[Long](https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/Long.java#l1060).
 This hash function is neither fast nor having a good quality. The only reason to use it is when this algorithm is already used in another system and you have to calculate exactly the same result.
 
 Note that Java only support calculating signed integers hash, so if you want to calculate unsigned integers hash you must cast it to proper signed ClickHouse types.
@@ -502,7 +504,7 @@ javaHashUTF16LE(stringUtf16le)
 
 **Arguments**
 
--   `stringUtf16le` — a string in UTF-16LE encoding.
+- `stringUtf16le` — a string in UTF-16LE encoding.
 
 **Returned value**
 
@@ -607,8 +609,8 @@ Both functions take a variable number of input parameters. Arguments can be any
 
 **Returned Value**
 
--   The `murmurHash2_32` function returns hash value having the [UInt32](/docs/en/sql-reference/data-types/int-uint.md) data type.
--   The `murmurHash2_64` function returns hash value having the [UInt64](/docs/en/sql-reference/data-types/int-uint.md) data type.
+- The `murmurHash2_32` function returns hash value having the [UInt32](/docs/en/sql-reference/data-types/int-uint.md) data type.
+- The `murmurHash2_64` function returns hash value having the [UInt64](/docs/en/sql-reference/data-types/int-uint.md) data type.
 
 **Example**
 
@@ -634,11 +636,11 @@ gccMurmurHash(par1, ...)
 
 **Arguments**
 
--   `par1, ...` — A variable number of parameters that can be any of the [supported data types](/docs/en/sql-reference/data-types/index.md/#data_types).
+- `par1, ...` — A variable number of parameters that can be any of the [supported data types](/docs/en/sql-reference/data-types/index.md/#data_types).
 
 **Returned value**
 
--   Calculated hash value.
+- Calculated hash value.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
@@ -660,6 +662,45 @@ Result:
 └──────────────────────┴─────────────────────┘
 ```
 
+
+## kafkaMurmurHash
+
+Calculates a 32-bit [MurmurHash2](https://github.com/aappleby/smhasher) hash value using the same hash seed as [Kafka](https://github.com/apache/kafka/blob/461c5cfe056db0951d9b74f5adc45973670404d7/clients/src/main/java/org/apache/kafka/common/utils/Utils.java#L482) and without the highest bit to be compatible with [Default Partitioner](https://github.com/apache/kafka/blob/139f7709bd3f5926901a21e55043388728ccca78/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java#L328).
+
+**Syntax**
+
+```sql
+MurmurHash(par1, ...)
+```
+
+**Arguments**
+
+- `par1, ...` — A variable number of parameters that can be any of the [supported data types](/docs/en/sql-reference/data-types/index.md/#data_types).
+
+**Returned value**
+
+- Calculated hash value.
+
+Type: [UInt32](/docs/en/sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT
+    kafkaMurmurHash('foobar') AS res1,
+    kafkaMurmurHash(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS res2
+```
+
+Result:
+
+```response
+┌───────res1─┬─────res2─┐
+│ 1357151166 │ 85479775 │
+└────────────┴──────────┘
+```
+
 ## murmurHash3_32, murmurHash3_64
 
 Produces a [MurmurHash3](https://github.com/aappleby/smhasher) hash value.
@@ -675,8 +716,8 @@ Both functions take a variable number of input parameters. Arguments can be any
 
 **Returned Value**
 
--   The `murmurHash3_32` function returns a [UInt32](/docs/en/sql-reference/data-types/int-uint.md) data type hash value.
--   The `murmurHash3_64` function returns a [UInt64](/docs/en/sql-reference/data-types/int-uint.md) data type hash value.
+- The `murmurHash3_32` function returns a [UInt32](/docs/en/sql-reference/data-types/int-uint.md) data type hash value.
+- The `murmurHash3_64` function returns a [UInt64](/docs/en/sql-reference/data-types/int-uint.md) data type hash value.
 
 **Example**
 
@@ -702,7 +743,7 @@ murmurHash3_128(expr)
 
 **Arguments**
 
--   `expr` — A list of [expressions](/docs/en/sql-reference/syntax.md/#syntax-expressions). [String](/docs/en/sql-reference/data-types/string.md).
+- `expr` — A list of [expressions](/docs/en/sql-reference/syntax.md/#syntax-expressions). [String](/docs/en/sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -738,7 +779,7 @@ xxh3(expr)
 
 **Arguments**
 
--   `expr` — A list of [expressions](/docs/en/sql-reference/syntax.md/#syntax-expressions) of any data type.
+- `expr` — A list of [expressions](/docs/en/sql-reference/syntax.md/#syntax-expressions) of any data type.
 
 **Returned value**
 
@@ -798,7 +839,7 @@ Result:
 
 **See Also**
 
--   [xxHash](http://cyan4973.github.io/xxHash/).
+- [xxHash](http://cyan4973.github.io/xxHash/).
 
 ## ngramSimHash
 
@@ -814,12 +855,12 @@ ngramSimHash(string[, ngramsize])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Hash value.
+- Hash value.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
@@ -853,12 +894,12 @@ ngramSimHashCaseInsensitive(string[, ngramsize])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Hash value.
+- Hash value.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
@@ -892,12 +933,12 @@ ngramSimHashUTF8(string[, ngramsize])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Hash value.
+- Hash value.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
@@ -931,12 +972,12 @@ ngramSimHashCaseInsensitiveUTF8(string[, ngramsize])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Hash value.
+- Hash value.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
@@ -970,12 +1011,12 @@ wordShingleSimHash(string[, shinglesize])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Hash value.
+- Hash value.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
@@ -1009,12 +1050,12 @@ wordShingleSimHashCaseInsensitive(string[, shinglesize])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Hash value.
+- Hash value.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
@@ -1048,12 +1089,12 @@ wordShingleSimHashUTF8(string[, shinglesize])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optinal. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optinal. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Hash value.
+- Hash value.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
@@ -1087,12 +1128,12 @@ wordShingleSimHashCaseInsensitiveUTF8(string[, shinglesize])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Hash value.
+- Hash value.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
@@ -1126,13 +1167,13 @@ ngramMinHash(string[, ngramsize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two hashes — the minimum and the maximum.
+- Tuple with two hashes — the minimum and the maximum.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([UInt64](/docs/en/sql-reference/data-types/int-uint.md), [UInt64](/docs/en/sql-reference/data-types/int-uint.md)).
 
@@ -1166,13 +1207,13 @@ ngramMinHashCaseInsensitive(string[, ngramsize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two hashes — the minimum and the maximum.
+- Tuple with two hashes — the minimum and the maximum.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([UInt64](/docs/en/sql-reference/data-types/int-uint.md), [UInt64](/docs/en/sql-reference/data-types/int-uint.md)).
 
@@ -1206,13 +1247,13 @@ ngramMinHashUTF8(string[, ngramsize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two hashes — the minimum and the maximum.
+- Tuple with two hashes — the minimum and the maximum.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([UInt64](/docs/en/sql-reference/data-types/int-uint.md), [UInt64](/docs/en/sql-reference/data-types/int-uint.md)).
 
@@ -1246,13 +1287,13 @@ ngramMinHashCaseInsensitiveUTF8(string [, ngramsize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two hashes — the minimum and the maximum.
+- Tuple with two hashes — the minimum and the maximum.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([UInt64](/docs/en/sql-reference/data-types/int-uint.md), [UInt64](/docs/en/sql-reference/data-types/int-uint.md)).
 
@@ -1284,13 +1325,13 @@ ngramMinHashArg(string[, ngramsize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two tuples with `hashnum` n-grams each.
+- Tuple with two tuples with `hashnum` n-grams each.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md)), [Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md))).
 
@@ -1322,13 +1363,13 @@ ngramMinHashArgCaseInsensitive(string[, ngramsize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two tuples with `hashnum` n-grams each.
+- Tuple with two tuples with `hashnum` n-grams each.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md)), [Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md))).
 
@@ -1360,13 +1401,13 @@ ngramMinHashArgUTF8(string[, ngramsize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two tuples with `hashnum` n-grams each.
+- Tuple with two tuples with `hashnum` n-grams each.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md)), [Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md))).
 
@@ -1398,13 +1439,13 @@ ngramMinHashArgCaseInsensitiveUTF8(string[, ngramsize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two tuples with `hashnum` n-grams each.
+- Tuple with two tuples with `hashnum` n-grams each.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md)), [Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md))).
 
@@ -1438,13 +1479,13 @@ wordShingleMinHash(string[, shinglesize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two hashes — the minimum and the maximum.
+- Tuple with two hashes — the minimum and the maximum.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([UInt64](/docs/en/sql-reference/data-types/int-uint.md), [UInt64](/docs/en/sql-reference/data-types/int-uint.md)).
 
@@ -1478,13 +1519,13 @@ wordShingleMinHashCaseInsensitive(string[, shinglesize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two hashes — the minimum and the maximum.
+- Tuple with two hashes — the minimum and the maximum.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([UInt64](/docs/en/sql-reference/data-types/int-uint.md), [UInt64](/docs/en/sql-reference/data-types/int-uint.md)).
 
@@ -1518,13 +1559,13 @@ wordShingleMinHashUTF8(string[, shinglesize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two hashes — the minimum and the maximum.
+- Tuple with two hashes — the minimum and the maximum.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([UInt64](/docs/en/sql-reference/data-types/int-uint.md), [UInt64](/docs/en/sql-reference/data-types/int-uint.md)).
 
@@ -1558,13 +1599,13 @@ wordShingleMinHashCaseInsensitiveUTF8(string[, shinglesize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two hashes — the minimum and the maximum.
+- Tuple with two hashes — the minimum and the maximum.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([UInt64](/docs/en/sql-reference/data-types/int-uint.md), [UInt64](/docs/en/sql-reference/data-types/int-uint.md)).
 
@@ -1596,13 +1637,13 @@ wordShingleMinHashArg(string[, shinglesize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two tuples with `hashnum` word shingles each.
+- Tuple with two tuples with `hashnum` word shingles each.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md)), [Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md))).
 
@@ -1634,13 +1675,13 @@ wordShingleMinHashArgCaseInsensitive(string[, shinglesize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two tuples with `hashnum` word shingles each.
+- Tuple with two tuples with `hashnum` word shingles each.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md)), [Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md))).
 
@@ -1672,13 +1713,13 @@ wordShingleMinHashArgUTF8(string[, shinglesize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two tuples with `hashnum` word shingles each.
+- Tuple with two tuples with `hashnum` word shingles each.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md)), [Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md))).
 
@@ -1710,13 +1751,13 @@ wordShingleMinHashArgCaseInsensitiveUTF8(string[, shinglesize, hashnum])
 
 **Arguments**
 
--   `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
--   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+- `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
--   Tuple with two tuples with `hashnum` word shingles each.
+- Tuple with two tuples with `hashnum` word shingles each.
 
 Type: [Tuple](/docs/en/sql-reference/data-types/tuple.md)([Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md)), [Tuple](/docs/en/sql-reference/data-types/tuple.md)([String](/docs/en/sql-reference/data-types/string.md))).
 
diff --git a/docs/en/sql-reference/functions/in-functions.md b/docs/en/sql-reference/functions/in-functions.md
index 185672227da..193c54cea44 100644
--- a/docs/en/sql-reference/functions/in-functions.md
+++ b/docs/en/sql-reference/functions/in-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/in-functions
-sidebar_position: 60
+sidebar_position: 90
 sidebar_label: IN Operator
 ---
 
diff --git a/docs/en/sql-reference/functions/index.md b/docs/en/sql-reference/functions/index.md
index 22e79ec6623..42d402e9d44 100644
--- a/docs/en/sql-reference/functions/index.md
+++ b/docs/en/sql-reference/functions/index.md
@@ -1,10 +1,10 @@
 ---
 slug: /en/sql-reference/functions/
-sidebar_position: 32
-sidebar_label: Functions
+sidebar_position: 1
+sidebar_label: Overview
 ---
 
-# Functions
+# Regular Functions
 
 There are at least\* two types of functions - regular functions (they are just called “functions”) and aggregate functions. These are completely different concepts. Regular functions work as if they are applied to each row separately (for each row, the result of the function does not depend on the other rows). Aggregate functions accumulate a set of values from various rows (i.e. they depend on the entire set of rows).
 
@@ -37,8 +37,8 @@ Functions can be implemented in different ways for constant and non-constant arg
 
 Functions have the following behaviors:
 
--   If at least one of the arguments of the function is `NULL`, the function result is also `NULL`.
--   Special behavior that is specified individually in the description of each function. In the ClickHouse source code, these functions have `UseDefaultImplementationForNulls=false`.
+- If at least one of the arguments of the function is `NULL`, the function result is also `NULL`.
+- Special behavior that is specified individually in the description of each function. In the ClickHouse source code, these functions have `UseDefaultImplementationForNulls=false`.
 
 ## Constancy
 
@@ -59,244 +59,6 @@ A lambda function that accepts multiple arguments can also be passed to a higher
 
 For some functions the first argument (the lambda function) can be omitted. In this case, identical mapping is assumed.
 
-## SQL User Defined Functions
+## User Defined Functions (UDFs)
 
-Custom functions from lambda expressions can be created using the [CREATE FUNCTION](../statements/create/function.md) statement. To delete these functions use the [DROP FUNCTION](../statements/drop.md#drop-function) statement.
-
-## Executable User Defined Functions
-ClickHouse can call any external executable program or script to process data.
-
-The configuration of executable user defined functions can be located in one or more xml-files. The path to the configuration is specified in the [user_defined_executable_functions_config](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_defined_executable_functions_config) parameter.
-
-A function configuration contains the following settings:
-
--   `name` - a function name.
--   `command` - script name to execute or command if `execute_direct` is false.
--   `argument` - argument description with the `type`, and optional `name` of an argument. Each argument is described in a separate setting. Specifying name is necessary if argument names are part of serialization for user defined function format like [Native](../../interfaces/formats.md#native) or [JSONEachRow](../../interfaces/formats.md#jsoneachrow). Default argument name value is `c` + argument_number.
--   `format` - a [format](../../interfaces/formats.md) in which arguments are passed to the command.
--   `return_type` - the type of a returned value.
--   `return_name` - name of retuned value. Specifying return name is necessary if return name is part of serialization for user defined function format like [Native](../../interfaces/formats.md#native) or [JSONEachRow](../../interfaces/formats.md#jsoneachrow). Optional. Default value is `result`.
--   `type` - an executable type. If `type` is set to `executable` then single command is started. If it is set to `executable_pool` then a pool of commands is created.
--   `max_command_execution_time` - maximum execution time in seconds for processing block of data. This setting is valid for `executable_pool` commands only. Optional. Default value is `10`.
--   `command_termination_timeout` - time in seconds during which a command should finish after its pipe is closed. After that time `SIGTERM` is sent to the process executing the command. Optional. Default value is `10`.
--   `command_read_timeout` - timeout for reading data from command stdout in milliseconds. Default value 10000. Optional parameter.
--   `command_write_timeout` - timeout for writing data to command stdin in milliseconds. Default value 10000. Optional parameter.
--   `pool_size` - the size of a command pool. Optional. Default value is `16`.
--   `send_chunk_header` - controls whether to send row count before sending a chunk of data to process. Optional. Default value is `false`.
--   `execute_direct` - If `execute_direct` = `1`, then `command` will be searched inside user_scripts folder specified by [user_scripts_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_scripts_path). Additional script arguments can be specified using whitespace separator. Example: `script_name arg1 arg2`. If `execute_direct` = `0`, `command` is passed as argument for `bin/sh -c`. Default value is `1`. Optional parameter.
--   `lifetime` - the reload interval of a function in seconds. If it is set to `0` then the function is not reloaded. Default value is `0`. Optional parameter.
-
-The command must read arguments from `STDIN` and must output the result to `STDOUT`. The command must process arguments iteratively. That is after processing a chunk of arguments it must wait for the next chunk.
-
-**Example**
-
-Creating `test_function` using XML configuration.
-File test_function.xml.
-```xml
-<functions>
-    <function>
-        <type>executable</type>
-        <name>test_function_python</name>
-        <return_type>String</return_type>
-        <argument>
-            <type>UInt64</type>
-            <name>value</name>
-        </argument>
-        <format>TabSeparated</format>
-        <command>test_function.py</command>
-    </function>
-</functions>
-```
-
-Script file inside `user_scripts` folder `test_function.py`.
-
-```python
-#!/usr/bin/python3
-
-import sys
-
-if __name__ == '__main__':
-    for line in sys.stdin:
-        print("Value " + line, end='')
-        sys.stdout.flush()
-```
-
-Query:
-
-``` sql
-SELECT test_function_python(toUInt64(2));
-```
-
-Result:
-
-``` text
-┌─test_function_python(2)─┐
-│ Value 2                 │
-└─────────────────────────┘
-```
-
-Creating `test_function_sum` manually specifying `execute_direct` to `0` using XML configuration.
-File test_function.xml.
-```xml
-<functions>
-    <function>
-        <type>executable</type>
-        <name>test_function_sum</name>
-        <return_type>UInt64</return_type>
-        <argument>
-            <type>UInt64</type>
-            <name>lhs</name>
-        </argument>
-        <argument>
-            <type>UInt64</type>
-            <name>rhs</name>
-        </argument>
-        <format>TabSeparated</format>
-        <command>cd /; clickhouse-local --input-format TabSeparated --output-format TabSeparated --structure 'x UInt64, y UInt64' --query "SELECT x + y FROM table"</command>
-        <execute_direct>0</execute_direct>
-    </function>
-</functions>
-```
-
-Query:
-
-``` sql
-SELECT test_function_sum(2, 2);
-```
-
-Result:
-
-``` text
-┌─test_function_sum(2, 2)─┐
-│                       4 │
-└─────────────────────────┘
-```
-
-Creating `test_function_sum_json` with named arguments and format [JSONEachRow](../../interfaces/formats.md#jsoneachrow) using XML configuration.
-File test_function.xml.
-```xml
-<functions>
-    <function>
-        <type>executable</type>
-        <name>test_function_sum_json</name>
-        <return_type>UInt64</return_type>
-        <return_name>result_name</return_name>
-        <argument>
-            <type>UInt64</type>
-            <name>argument_1</name>
-        </argument>
-        <argument>
-            <type>UInt64</type>
-            <name>argument_2</name>
-        </argument>
-        <format>JSONEachRow</format>
-        <command>test_function_sum_json.py</command>
-    </function>
-</functions>
-```
-
-Script file inside `user_scripts` folder `test_function_sum_json.py`.
-
-```python
-#!/usr/bin/python3
-
-import sys
-import json
-
-if __name__ == '__main__':
-    for line in sys.stdin:
-        value = json.loads(line)
-        first_arg = int(value['argument_1'])
-        second_arg = int(value['argument_2'])
-        result = {'result_name': first_arg + second_arg}
-        print(json.dumps(result), end='\n')
-        sys.stdout.flush()
-```
-
-Query:
-
-``` sql
-SELECT test_function_sum_json(2, 2);
-```
-
-Result:
-
-``` text
-┌─test_function_sum_json(2, 2)─┐
-│                            4 │
-└──────────────────────────────┘
-```
-
-Executable user defined functions can take constant parameters configured in `command` setting (works only for user defined functions with `executable` type).
-File test_function_parameter_python.xml.
-```xml
-<functions>
-    <function>
-        <type>executable</type>
-        <name>test_function_parameter_python</name>
-        <return_type>String</return_type>
-        <argument>
-            <type>UInt64</type>
-        </argument>
-        <format>TabSeparated</format>
-        <command>test_function_parameter_python.py {test_parameter:UInt64}</command>
-    </function>
-</functions>
-```
-
-Script file inside `user_scripts` folder `test_function_parameter_python.py`.
-
-```python
-#!/usr/bin/python3
-
-import sys
-
-if __name__ == "__main__":
-    for line in sys.stdin:
-        print("Parameter " + str(sys.argv[1]) + " value " + str(line), end="")
-        sys.stdout.flush()
-```
-
-Query:
-
-``` sql
-SELECT test_function_parameter_python(1)(2);
-```
-
-Result:
-
-``` text
-┌─test_function_parameter_python(1)(2)─┐
-│ Parameter 1 value 2                  │
-└──────────────────────────────────────┘
-```
-
-## Error Handling
-
-Some functions might throw an exception if the data is invalid. In this case, the query is canceled and an error text is returned to the client. For distributed processing, when an exception occurs on one of the servers, the other servers also attempt to abort the query.
-
-## Evaluation of Argument Expressions
-
-In almost all programming languages, one of the arguments might not be evaluated for certain operators. This is usually the operators `&&`, `||`, and `?:`.
-But in ClickHouse, arguments of functions (operators) are always evaluated. This is because entire parts of columns are evaluated at once, instead of calculating each row separately.
-
-## Performing Functions for Distributed Query Processing
-
-For distributed query processing, as many stages of query processing as possible are performed on remote servers, and the rest of the stages (merging intermediate results and everything after that) are performed on the requestor server.
-
-This means that functions can be performed on different servers.
-For example, in the query `SELECT f(sum(g(x))) FROM distributed_table GROUP BY h(y),`
-
--   if a `distributed_table` has at least two shards, the functions ‘g’ and ‘h’ are performed on remote servers, and the function ‘f’ is performed on the requestor server.
--   if a `distributed_table` has only one shard, all the ‘f’, ‘g’, and ‘h’ functions are performed on this shard’s server.
-
-The result of a function usually does not depend on which server it is performed on. However, sometimes this is important.
-For example, functions that work with dictionaries use the dictionary that exists on the server they are running on.
-Another example is the `hostName` function, which returns the name of the server it is running on in order to make `GROUP BY` by servers in a `SELECT` query.
-
-If a function in a query is performed on the requestor server, but you need to perform it on remote servers, you can wrap it in an ‘any’ aggregate function or add it to a key in `GROUP BY`.
-
-
-## Related Content
-
-- [User-defined functions in ClickHouse Cloud](https://clickhouse.com/blog/user-defined-functions-clickhouse-udfs)
+ClickHouse supports user-defined functions. See [UDFs](/docs/en/sql-reference/functions/udf.md).
diff --git a/docs/en/sql-reference/functions/introspection.md b/docs/en/sql-reference/functions/introspection.md
index 9357f75b8e6..8cb35483555 100644
--- a/docs/en/sql-reference/functions/introspection.md
+++ b/docs/en/sql-reference/functions/introspection.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/introspection
-sidebar_position: 65
+sidebar_position: 100
 sidebar_label: Introspection
 ---
 
@@ -8,15 +8,15 @@ sidebar_label: Introspection
 
 You can use functions described in this chapter to introspect [ELF](https://en.wikipedia.org/wiki/Executable_and_Linkable_Format) and [DWARF](https://en.wikipedia.org/wiki/DWARF) for query profiling.
 
-:::warning    
+:::note    
 These functions are slow and may impose security considerations.
 :::
 
 For proper operation of introspection functions:
 
--   Install the `clickhouse-common-static-dbg` package.
+- Install the `clickhouse-common-static-dbg` package.
 
--   Set the [allow_introspection_functions](../../operations/settings/settings.md#settings-allow_introspection_functions) setting to 1.
+- Set the [allow_introspection_functions](../../operations/settings/settings.md#settings-allow_introspection_functions) setting to 1.
 
         For security reasons introspection functions are disabled by default.
 
@@ -36,17 +36,17 @@ addressToLine(address_of_binary_instruction)
 
 **Arguments**
 
--   `address_of_binary_instruction` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Address of instruction in a running process.
+- `address_of_binary_instruction` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Address of instruction in a running process.
 
 **Returned value**
 
--   Source code filename and the line number in this file delimited by colon.
+- Source code filename and the line number in this file delimited by colon.
 
         For example, `/build/obj-x86_64-linux-gnu/../src/Common/ThreadPool.cpp:199`, where `199` is a line number.
 
--   Name of a binary, if the function couldn’t find the debug information.
+- Name of a binary, if the function couldn’t find the debug information.
 
--   Empty string, if the address is not valid.
+- Empty string, if the address is not valid.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -129,15 +129,15 @@ addressToLineWithInlines(address_of_binary_instruction)
 
 **Arguments**
 
--   `address_of_binary_instruction` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Address of instruction in a running process.
+- `address_of_binary_instruction` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Address of instruction in a running process.
 
 **Returned value**
 
--   Array which first element is source code filename and the line number in this file delimited by colon. And from second element, inline functions' source code filename and line number and function name are listed.
+- Array which first element is source code filename and the line number in this file delimited by colon. And from second element, inline functions' source code filename and line number and function name are listed.
 
--   Array with single element which is name of a binary, if the function couldn’t find the debug information.
+- Array with single element which is name of a binary, if the function couldn’t find the debug information.
 
--   Empty array, if the address is not valid.
+- Empty array, if the address is not valid.
 
 Type: [Array(String)](../../sql-reference/data-types/array.md).
 
@@ -232,12 +232,12 @@ addressToSymbol(address_of_binary_instruction)
 
 **Arguments**
 
--   `address_of_binary_instruction` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Address of instruction in a running process.
+- `address_of_binary_instruction` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Address of instruction in a running process.
 
 **Returned value**
 
--   Symbol from ClickHouse object files.
--   Empty string, if the address is not valid.
+- Symbol from ClickHouse object files.
+- Empty string, if the address is not valid.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -329,12 +329,12 @@ demangle(symbol)
 
 **Arguments**
 
--   `symbol` ([String](../../sql-reference/data-types/string.md)) — Symbol from an object file.
+- `symbol` ([String](../../sql-reference/data-types/string.md)) — Symbol from an object file.
 
 **Returned value**
 
--   Name of the C++ function.
--   Empty string if a symbol is not valid.
+- Name of the C++ function.
+- Empty string if a symbol is not valid.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -425,7 +425,7 @@ tid()
 
 **Returned value**
 
--   Current thread id. [Uint64](../../sql-reference/data-types/int-uint.md#uint-ranges).
+- Current thread id. [Uint64](../../sql-reference/data-types/int-uint.md#uint-ranges).
 
 **Example**
 
@@ -455,11 +455,11 @@ logTrace('message')
 
 **Arguments**
 
--   `message` — Message that is emitted to server log. [String](../../sql-reference/data-types/string.md#string).
+- `message` — Message that is emitted to server log. [String](../../sql-reference/data-types/string.md#string).
 
 **Returned value**
 
--   Always returns 0.
+- Always returns 0.
 
 **Example**
 
diff --git a/docs/en/sql-reference/functions/ip-address-functions.md b/docs/en/sql-reference/functions/ip-address-functions.md
index 3843ca0fc36..0dc1db1161b 100644
--- a/docs/en/sql-reference/functions/ip-address-functions.md
+++ b/docs/en/sql-reference/functions/ip-address-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/ip-address-functions
-sidebar_position: 55
+sidebar_position: 95
 sidebar_label: IP Addresses
 ---
 
@@ -147,11 +147,11 @@ IPv6StringToNum(string)
 
 **Argument**
 
--   `string` — IP address. [String](../../sql-reference/data-types/string.md).
+- `string` — IP address. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   IPv6 address in binary format.
+- IPv6 address in binary format.
 
 Type: [FixedString(16)](../../sql-reference/data-types/fixedstring.md).
 
@@ -175,7 +175,7 @@ Result:
 
 **See Also**
 
--   [cutIPv6](#cutipv6x-bytestocutforipv6-bytestocutforipv4).
+- [cutIPv6](#cutipv6x-bytestocutforipv6-bytestocutforipv4).
 
 ## IPv6StringToNumOrDefault(s)
 
@@ -280,12 +280,20 @@ SELECT
 
 ## toIPv4OrDefault(string)
 
-Same as `toIPv4`, but if the IPv4 address has an invalid format, it returns 0.
+Same as `toIPv4`, but if the IPv4 address has an invalid format, it returns `0.0.0.0` (0 IPv4).
 
 ## toIPv4OrNull(string)
 
 Same as `toIPv4`, but if the IPv4 address has an invalid format, it returns null.
 
+## toIPv6OrDefault(string)
+
+Same as `toIPv6`, but if the IPv6 address has an invalid format, it returns `::` (0 IPv6).
+
+## toIPv6OrNull(string)
+
+Same as `toIPv6`, but if the IPv6 address has an invalid format, it returns null.
+
 ## toIPv6
 
 Converts a string form of IPv6 address to [IPv6](../../sql-reference/data-types/domains/ipv6.md) type. If the IPv6 address has an invalid format, returns an empty value.
@@ -301,11 +309,11 @@ toIPv6(string)
 
 **Argument**
 
--   `string` — IP address. [String](../../sql-reference/data-types/string.md)
+- `string` — IP address. [String](../../sql-reference/data-types/string.md)
 
 **Returned value**
 
--   IP address.
+- IP address.
 
 Type: [IPv6](../../sql-reference/data-types/domains/ipv6.md).
 
@@ -362,11 +370,11 @@ isIPv4String(string)
 
 **Arguments**
 
--   `string` — IP address. [String](../../sql-reference/data-types/string.md).
+- `string` — IP address. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   `1` if `string` is IPv4 address, `0` otherwise.
+- `1` if `string` is IPv4 address, `0` otherwise.
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md).
 
@@ -400,11 +408,11 @@ isIPv6String(string)
 
 **Arguments**
 
--   `string` — IP address. [String](../../sql-reference/data-types/string.md).
+- `string` — IP address. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   `1` if `string` is IPv6 address, `0` otherwise.
+- `1` if `string` is IPv6 address, `0` otherwise.
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md).
 
@@ -441,12 +449,12 @@ This function accepts both IPv4 and IPv6 addresses (and networks) represented as
 
 **Arguments**
 
--   `address` — An IPv4 or IPv6 address. [String](../../sql-reference/data-types/string.md).
--   `prefix` — An IPv4 or IPv6 network prefix in CIDR. [String](../../sql-reference/data-types/string.md).
+- `address` — An IPv4 or IPv6 address. [String](../../sql-reference/data-types/string.md).
+- `prefix` — An IPv4 or IPv6 network prefix in CIDR. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   `1` or `0`.
+- `1` or `0`.
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md).
 
@@ -508,11 +516,11 @@ This function performs reverse DNS resolutions on both IPv4 and IPv6.
 
 **Arguments**
 
--   `address` — An IPv4 or IPv6 address. [String](../../sql-reference/data-types/string.md).
+- `address` — An IPv4 or IPv6 address. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Associated domains (PTR records).
+- Associated domains (PTR records).
 
 Type: Type: [Array(String)](../../sql-reference/data-types/array.md).
 
diff --git a/docs/en/sql-reference/functions/json-functions.md b/docs/en/sql-reference/functions/json-functions.md
index bfe2a541647..31d53ba0359 100644
--- a/docs/en/sql-reference/functions/json-functions.md
+++ b/docs/en/sql-reference/functions/json-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/json-functions
-sidebar_position: 56
+sidebar_position: 105
 sidebar_label: JSON
 ---
 
@@ -109,9 +109,9 @@ SELECT JSONHas('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4) = 0
 
 `indices_or_keys` is a list of zero or more arguments each of them can be either string or integer.
 
--   String = access object member by key.
--   Positive integer = access the n-th member/key from the beginning.
--   Negative integer = access the n-th member/key from the end.
+- String = access object member by key.
+- Positive integer = access the n-th member/key from the beginning.
+- Negative integer = access the n-th member/key from the end.
 
 Minimum index of the element is 1. Thus the element 0 does not exist.
 
@@ -206,6 +206,7 @@ Examples:
 ``` sql
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'Tuple(String, Array(Float64))') = ('hello',[-100,200,300])
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'Tuple(b Array(Float64), a String)') = ([-100,200,300],'hello')
+SELECT JSONExtract('{"a": "hello", "b": "world"}', 'Map(String, String)') = map('a',  'hello', 'b', 'world');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Nullable(Int8))') = [-100, NULL, NULL]
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4, 'Nullable(Int64)') = NULL
 SELECT JSONExtract('{"passed": true}', 'passed', 'UInt8') = 1
@@ -235,8 +236,8 @@ JSONExtractKeys(json[, a, b, c...])
 
 **Arguments**
 
--   `json` — [String](../../sql-reference/data-types/string.md) with valid JSON.
--   `a, b, c...` — Comma-separated indices or keys that specify the path to the inner field in a nested JSON object. Each argument can be either a [String](../../sql-reference/data-types/string.md) to get the field by the key or an [Integer](../../sql-reference/data-types/int-uint.md) to get the N-th field (indexed from 1, negative integers count from the end). If not set, the whole JSON is parsed as the top-level object. Optional parameter.
+- `json` — [String](../../sql-reference/data-types/string.md) with valid JSON.
+- `a, b, c...` — Comma-separated indices or keys that specify the path to the inner field in a nested JSON object. Each argument can be either a [String](../../sql-reference/data-types/string.md) to get the field by the key or an [Integer](../../sql-reference/data-types/int-uint.md) to get the N-th field (indexed from 1, negative integers count from the end). If not set, the whole JSON is parsed as the top-level object. Optional parameter.
 
 **Returned value**
 
@@ -297,13 +298,13 @@ JSONExtractKeysAndValuesRaw(json[, p, a, t, h])
 
 **Arguments**
 
--   `json` — [String](../../sql-reference/data-types/string.md) with valid JSON.
--   `p, a, t, h` — Comma-separated indices or keys that specify the path to the inner field in a nested JSON object. Each argument can be either a [string](../../sql-reference/data-types/string.md) to get the field by the key or an [integer](../../sql-reference/data-types/int-uint.md) to get the N-th field (indexed from 1, negative integers count from the end). If not set, the whole JSON is parsed as the top-level object. Optional parameter.
+- `json` — [String](../../sql-reference/data-types/string.md) with valid JSON.
+- `p, a, t, h` — Comma-separated indices or keys that specify the path to the inner field in a nested JSON object. Each argument can be either a [string](../../sql-reference/data-types/string.md) to get the field by the key or an [integer](../../sql-reference/data-types/int-uint.md) to get the N-th field (indexed from 1, negative integers count from the end). If not set, the whole JSON is parsed as the top-level object. Optional parameter.
 
 **Returned values**
 
--   Array with `('key', 'value')` tuples. Both tuple members are strings.
--   Empty array if the requested object does not exist, or input JSON is invalid.
+- Array with `('key', 'value')` tuples. Both tuple members are strings.
+- Empty array if the requested object does not exist, or input JSON is invalid.
 
 Type: [Array](../../sql-reference/data-types/array.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md), [String](../../sql-reference/data-types/string.md)).
 
@@ -401,7 +402,7 @@ Before version 21.11 the order of arguments was wrong, i.e. JSON_QUERY(path, jso
 
 Parses a JSON and extract a value as JSON scalar.
 
-If the value does not exist, an empty string will be returned.
+If the value does not exist, an empty string will be returned by default, and by SET `function_return_type_allow_nullable` = `true`, `NULL` will be returned. If the value is complex type (such as: struct, array, map), an empty string will be returned by default, and by SET `function_json_value_return_type_allow_complex` = `true`, the complex value will be returned.
 
 Example:
 
@@ -410,6 +411,8 @@ SELECT JSON_VALUE('{"hello":"world"}', '$.hello');
 SELECT JSON_VALUE('{"array":[[0, 1, 2, 3, 4, 5], [0, -1, -2, -3, -4, -5]]}', '$.array[*][0 to 2, 4]');
 SELECT JSON_VALUE('{"hello":2}', '$.hello');
 SELECT toTypeName(JSON_VALUE('{"hello":2}', '$.hello'));
+select JSON_VALUE('{"hello":"world"}', '$.b') settings function_return_type_allow_nullable=true;
+select JSON_VALUE('{"hello":{"world":"!"}}', '$.hello') settings function_json_value_return_type_allow_complex=true;
 ```
 
 Result:
@@ -440,11 +443,11 @@ toJSONString(value)
 
 **Arguments**
 
--   `value` — Value to serialize. Value may be of any data type.
+- `value` — Value to serialize. Value may be of any data type.
 
 **Returned value**
 
--   JSON representation of the value.
+- JSON representation of the value.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -469,8 +472,8 @@ Result:
 
 **See Also**
 
--   [output_format_json_quote_64bit_integers](../../operations/settings/settings.md#session_settings-output_format_json_quote_64bit_integers)
--   [output_format_json_quote_denormals](../../operations/settings/settings.md#settings-output_format_json_quote_denormals)
+- [output_format_json_quote_64bit_integers](../../operations/settings/settings.md#session_settings-output_format_json_quote_64bit_integers)
+- [output_format_json_quote_denormals](../../operations/settings/settings.md#settings-output_format_json_quote_denormals)
 
 
 ## JSONArrayLength
@@ -487,11 +490,11 @@ Alias: `JSON_ARRAY_LENGTH(json)`.
 
 **Arguments**
 
--   `json` — [String](../../sql-reference/data-types/string.md) with valid JSON.
+- `json` — [String](../../sql-reference/data-types/string.md) with valid JSON.
 
 **Returned value**
 
--   If `json` is a valid JSON array string, returns the number of array elements, otherwise returns NULL.
+- If `json` is a valid JSON array string, returns the number of array elements, otherwise returns NULL.
 
 Type: [Nullable(UInt64)](../../sql-reference/data-types/int-uint.md).
 
diff --git a/docs/en/sql-reference/functions/logical-functions.md b/docs/en/sql-reference/functions/logical-functions.md
index 137753d12c9..f5a1a6aac12 100644
--- a/docs/en/sql-reference/functions/logical-functions.md
+++ b/docs/en/sql-reference/functions/logical-functions.md
@@ -1,18 +1,18 @@
 ---
 slug: /en/sql-reference/functions/logical-functions
-sidebar_position: 37
+sidebar_position: 110
 sidebar_label: Logical
 ---
 
 # Logical Functions
 
-Performs logical operations on arguments of any numeric types, but returns a [UInt8](../../sql-reference/data-types/int-uint.md) number equal to 0, 1 or `NULL` in some cases.
+Below functions perform logical operations on arguments of arbitrary numeric types. They return either 0 or 1 as [UInt8](../../sql-reference/data-types/int-uint.md) or in some cases `NULL`.
 
-Zero as an argument is considered `false`, while any non-zero value is considered `true`.
+Zero as an argument is considered `false`, non-zero values are considered `true`.
 
 ## and
 
-Calculates the result of the logical conjunction between two or more values. Corresponds to [Logical AND Operator](../../sql-reference/operators/index.md#logical-and-operator).
+Calculates the logical conjunction between two or more values. 
 
 **Syntax**
 
@@ -20,24 +20,24 @@ Calculates the result of the logical conjunction between two or more values. Cor
 and(val1, val2...)
 ```
 
-You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `and` function according to a short scheme. If this setting is enabled, `vali` is evaluated only on rows where `(val1 AND val2 AND ... AND val{i-1})` is true. For example, an exception about division by zero is not thrown when executing the query `SELECT and(number = 2, intDiv(1, number)) FROM numbers(10)`.
+Setting [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) controls whether short-circuit evaluation is used. If enabled, `val_i` is evaluated only if `(val_1 AND val_2 AND ... AND val_{i-1})` is `true`. For example, with short-circuit evaluation, no division-by-zero exception is thrown when executing the query `SELECT and(number = 2, intDiv(1, number)) FROM numbers(5)`.
+
+Alias: The [AND Operator](../../sql-reference/operators/index.md#logical-and-operator).
 
 **Arguments**
 
--   `val1, val2, ...` — List of at least two values. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
+- `val1, val2, ...` — List of at least two values. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
 
 **Returned value**
 
--   `0`, if there is at least one zero value argument.
--   `NULL`, if there are no zero values arguments and there is at least one `NULL` argument.
--   `1`, otherwise.
+- `0`, if there at least one argument evaluates to `false`,
+- `NULL`, if no argumetn evaluates to `false` and at least one argument is `NULL`,
+- `1`, otherwise.
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md) or [Nullable](../../sql-reference/data-types/nullable.md)([UInt8](../../sql-reference/data-types/int-uint.md)).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT and(0, 1, -2);
 ```
@@ -66,7 +66,7 @@ Result:
 
 ## or
 
-Calculates the result of the logical disjunction between two or more values. Corresponds to [Logical OR Operator](../../sql-reference/operators/index.md#logical-or-operator).
+Calculates the logical disjunction between two or more values.
 
 **Syntax**
 
@@ -74,24 +74,24 @@ Calculates the result of the logical disjunction between two or more values. Cor
 or(val1, val2...)
 ```
 
-You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `or` function according to a short scheme. If this setting is enabled, `vali` is evaluated only on rows where `((NOT val1) AND (NOT val2) AND ... AND (NOT val{i-1}))` is true. For example, an exception about division by zero is not thrown when executing the query `SELECT or(number = 0, intDiv(1, number) != 0) FROM numbers(10)`.
+Setting [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) controls whether short-circuit evaluation is used. If enabled, `val_i` is evaluated only if `((NOT val_1) AND (NOT val_2) AND ... AND (NOT val_{i-1}))` is `true`. For example, with short-circuit evaluation, no division-by-zero exception is thrown when executing the query `SELECT or(number = 0, intDiv(1, number) != 0) FROM numbers(5)`.
+
+Alias: The [OR Operator](../../sql-reference/operators/index.md#logical-or-operator).
 
 **Arguments**
 
--   `val1, val2, ...` — List of at least two values. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
+- `val1, val2, ...` — List of at least two values. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
 
 **Returned value**
 
--   `1`, if there is at least one non-zero value.
--   `0`, if there are only zero values.
--   `NULL`, if there are only zero values and `NULL`.
+- `1`, if at least one argument evaluates to `true`,
+- `0`, if all arguments evaluate to `false`,
+- `NULL`, if all arguments evaluate to `false` and at least one argument is `NULL`.
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md) or [Nullable](../../sql-reference/data-types/nullable.md)([UInt8](../../sql-reference/data-types/int-uint.md)).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT or(1, 0, 0, 2, NULL);
 ```
@@ -120,7 +120,7 @@ Result:
 
 ## not
 
-Calculates the result of the logical negation of the value. Corresponds to [Logical Negation Operator](../../sql-reference/operators/index.md#logical-negation-operator).
+Calculates logical negation of a value.
 
 **Syntax**
 
@@ -128,22 +128,22 @@ Calculates the result of the logical negation of the value. Corresponds to [Logi
 not(val);
 ```
 
+Alias: The [Negation Operator](../../sql-reference/operators/index.md#logical-negation-operator).
+
 **Arguments**
 
--   `val` — The value. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
+- `val` — The value. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
 
 **Returned value**
 
--   `1`, if the `val` is `0`.
--   `0`, if the `val` is a non-zero value.
--   `NULL`, if the `val` is a `NULL` value.
+- `1`, if `val` evaluates to `false`,
+- `0`, if `val` evaluates to `true`,
+- `NULL`, if `val` is `NULL`.
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md) or [Nullable](../../sql-reference/data-types/nullable.md)([UInt8](../../sql-reference/data-types/int-uint.md)).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT NOT(1);
 ```
@@ -158,7 +158,7 @@ Result:
 
 ## xor
 
-Calculates the result of the logical exclusive disjunction between two or more values. For more than two values the function works as if it calculates `XOR` of the first two values and then uses the result with the next value to calculate `XOR` and so on.
+Calculates the logical exclusive disjunction between two or more values. For more than two values the function first xor-s the first two values, then xor-s the result with the third value etc.
 
 **Syntax**
 
@@ -168,20 +168,18 @@ xor(val1, val2...)
 
 **Arguments**
 
--   `val1, val2, ...` — List of at least two values. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
+- `val1, val2, ...` — List of at least two values. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
 
 **Returned value**
 
--   `1`, for two values: if one of the values is zero and other is not.
--   `0`, for two values: if both values are zero or non-zero at the same time.
--   `NULL`, if there is at least one `NULL` value.
+- `1`, for two values: if one of the values evaluates to `false` and other does not,
+- `0`, for two values: if both values evaluate to `false` or to both `true`,
+- `NULL`, if at least one of the inputs is `NULL`
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md) or [Nullable](../../sql-reference/data-types/nullable.md)([UInt8](../../sql-reference/data-types/int-uint.md)).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT xor(0, 1, 1);
 ```
diff --git a/docs/en/sql-reference/functions/machine-learning-functions.md b/docs/en/sql-reference/functions/machine-learning-functions.md
index 98408ef459c..44ce4dcd211 100644
--- a/docs/en/sql-reference/functions/machine-learning-functions.md
+++ b/docs/en/sql-reference/functions/machine-learning-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/machine-learning-functions
-sidebar_position: 64
+sidebar_position: 115
 sidebar_label: Machine Learning
 ---
 
@@ -16,4 +16,4 @@ The [stochasticLinearRegression](../../sql-reference/aggregate-functions/referen
 
 ## stochasticLogisticRegression
 
-The [stochasticLogisticRegression](../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md#agg_functions-stochasticlogisticregression) aggregate function implements stochastic gradient descent method for binary classification problem. Uses `evalMLMethod` to predict on new data.
\ No newline at end of file
+The [stochasticLogisticRegression](../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md#agg_functions-stochasticlogisticregression) aggregate function implements stochastic gradient descent method for binary classification problem. Uses `evalMLMethod` to predict on new data.
diff --git a/docs/en/sql-reference/functions/math-functions.md b/docs/en/sql-reference/functions/math-functions.md
index 10bc73c4a72..9851378d4fd 100644
--- a/docs/en/sql-reference/functions/math-functions.md
+++ b/docs/en/sql-reference/functions/math-functions.md
@@ -1,120 +1,260 @@
 ---
 slug: /en/sql-reference/functions/math-functions
-sidebar_position: 44
+sidebar_position: 125
 sidebar_label: Mathematical
 ---
 
 # Mathematical Functions
 
-All the functions return a Float64 number. The accuracy of the result is close to the maximum precision possible, but the result might not coincide with the machine representable number nearest to the corresponding real number.
+All the functions return a Float64 number. Results are generally as close to the actual result as possible, but in some cases less precise than the machine-representable number.
 
-## e()
+## e
 
-Returns a Float64 number that is close to the number e.
+Returns e.
 
-## pi()
+**Syntax**
 
-Returns a Float64 number that is close to the number π.
+```sql
+e()
+```
 
-## exp(x)
+## pi
 
-Accepts a numeric argument and returns a Float64 number close to the exponent of the argument.
+Returns π.
 
-## log(x), ln(x)
+**Syntax**
 
-Accepts a numeric argument and returns a Float64 number close to the natural logarithm of the argument.
+```sql
+pi()
+```
 
-## exp2(x)
+## exp
 
-Accepts a numeric argument and returns a Float64 number close to 2 to the power of x.
+Returns e to the power of the given argument.
 
-## log2(x)
+**Syntax**
 
-Accepts a numeric argument and returns a Float64 number close to the binary logarithm of the argument.
+```sql
+exp(x)
+```
 
-## exp10(x)
+## log
 
-Accepts a numeric argument and returns a Float64 number close to 10 to the power of x.
+Returns the natural logarithm of the argument.
 
-## log10(x)
+**Syntax**
 
-Accepts a numeric argument and returns a Float64 number close to the decimal logarithm of the argument.
+```sql
+log(x)
+```
 
-## sqrt(x)
+Alias: `ln(x)`
 
-Accepts a numeric argument and returns a Float64 number close to the square root of the argument.
+## exp2
 
-## cbrt(x)
+Returns 2 to the power of the given argumetn
 
-Accepts a numeric argument and returns a Float64 number close to the cubic root of the argument.
+**Syntax**
 
-## erf(x)
+```sql
+exp2(x)
+```
 
-If ‘x’ is non-negative, then `erf(x / σ√2)` is the probability that a random variable having a normal distribution with standard deviation ‘σ’ takes the value that is separated from the expected value by more than ‘x’.
+## intExp2
 
-Example (three sigma rule):
+Like `exp` but returns a UInt64.
+
+**Syntax**
+
+```sql
+intExp2(x)
+```
+
+## log2
+
+Returns the binary logarithm of the argument.
+
+**Syntax**
+
+```sql
+log2(x)
+```
+
+## exp10
+
+Returns 10 to the power of the given argumetn
+
+**Syntax**
+
+```sql
+exp10(x)
+```
+
+## intExp10
+
+Like `exp10` but returns a UInt64.
+
+**Syntax**
+
+```sql
+intExp10(x)
+```
+
+## log10
+
+Returns the decimal logarithm of the argument.
+
+**Syntax**
+
+```sql
+log10(x)
+```
+
+## sqrt
+
+Returns the square root of the argument.
+
+```sql
+sqrt(x)
+```
+
+## cbrt
+
+Returns the cubic root of the argument.
+
+```sql
+cbrt(x)
+```
+
+## erf
+
+If `x` is non-negative, then `erf(x / σ√2)` is the probability that a random variable having a normal distribution with standard deviation `σ` takes the value that is separated from the expected value by more than `x`.
+
+**Syntax**
+
+```sql
+erf(x)
+```
+
+**Example**
+
+(three sigma rule)
 
 ``` sql
 SELECT erf(3 / sqrt(2));
 ```
 
-``` text
+```result
 ┌─erf(divide(3, sqrt(2)))─┐
 │      0.9973002039367398 │
 └─────────────────────────┘
 ```
 
-## erfc(x)
+## erfc
 
-Accepts a numeric argument and returns a Float64 number close to 1 - erf(x), but without loss of precision for large ‘x’ values.
+Returns a number close to `1 - erf(x)` without loss of precision for large ‘x’ values.
 
-## lgamma(x)
+**Syntax**
 
-The logarithm of the gamma function.
+```sql
+erfc(x)
+```
 
-## tgamma(x)
+## lgamma
 
-Gamma function.
+Returns the logarithm of the gamma function.
 
-## sin(x)
+**Syntax**
 
-The sine.
+```sql
+lgamma(x)
+```
 
-## cos(x)
+## tgamma
 
-The cosine.
+Returns the gamma function.
 
-## tan(x)
+**Syntax**
 
-The tangent.
+```sql
+gamma(x)
+```
 
-## asin(x)
+## sin
 
-The arc sine.
+Returns the sine of the argument
 
-## acos(x)
+**Syntax**
 
-The arc cosine.
+```sql
+sin(x)
+```
 
-## atan(x)
+## cos
 
-The arc tangent.
+Returns the cosine of the argument.
 
-## pow(x, y), power(x, y)
+**Syntax**
 
-Takes two numeric arguments x and y. Returns a Float64 number close to x to the power of y.
+```sql
+cos(x)
+```
 
-## intExp2
+## tan
 
-Accepts a numeric argument and returns a UInt64 number close to 2 to the power of x.
+Returns the tangent of the argument.
 
-## intExp10
+**Syntax**
 
-Accepts a numeric argument and returns a UInt64 number close to 10 to the power of x.
+```sql
+tan(x)
+```
 
-## cosh(x)
+## asin
 
-[Hyperbolic cosine](https://in.mathworks.com/help/matlab/ref/cosh.html).
+Returns the arc sine of the argument.
+
+**Syntax**
+
+```sql
+asin(x)
+```
+
+## acos
+
+Returns the arc cosine of the argument.
+
+**Syntax**
+
+```sql
+acos(x)
+```
+
+## atan
+
+Returns the arc tangent of the argument.
+
+**Syntax**
+
+```sql
+atan(x)
+```
+
+## pow
+
+Returns `x` to the power of `y`.
+
+**Syntax**
+
+```sql
+pow(x, y)
+```
+
+Alias: `power(x, y)`
+
+## cosh
+
+Returns the [hyperbolic cosine](https://in.mathworks.com/help/matlab/ref/cosh.html) of the argument.
 
 **Syntax**
 
@@ -124,33 +264,31 @@ cosh(x)
 
 **Arguments**
 
--   `x` — The angle, in radians. Values from the interval: `-∞ < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `x` — The angle, in radians. Values from the interval: `-∞ < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value**
 
--   Values from the interval: `1 <= cosh(x) < +∞`.
+- Values from the interval: `1 <= cosh(x) < +∞`.
 
 Type: [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT cosh(0);
 ```
 
 Result:
 
-``` text
+```result
 ┌─cosh(0)──┐
 │        1 │
 └──────────┘
 ```
 
-## acosh(x)
+## acosh
 
-[Inverse hyperbolic cosine](https://www.mathworks.com/help/matlab/ref/acosh.html).
+Returns the [inverse hyperbolic cosine](https://www.mathworks.com/help/matlab/ref/acosh.html).
 
 **Syntax**
 
@@ -160,37 +298,31 @@ acosh(x)
 
 **Arguments**
 
--   `x` — Hyperbolic cosine of angle. Values from the interval: `1 <= x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `x` — Hyperbolic cosine of angle. Values from the interval: `1 <= x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value**
 
--   The angle, in radians. Values from the interval: `0 <= acosh(x) < +∞`.
+- The angle, in radians. Values from the interval: `0 <= acosh(x) < +∞`.
 
 Type: [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT acosh(1);
 ```
 
 Result:
 
-``` text
+```result
 ┌─acosh(1)─┐
 │        0 │
 └──────────┘
 ```
 
-**See Also**
+## sinh
 
--   [cosh(x)](../../sql-reference/functions/math-functions.md#coshx)
-
-## sinh(x)
-
-[Hyperbolic sine](https://www.mathworks.com/help/matlab/ref/sinh.html).
+Returns the [hyperbolic sine](https://www.mathworks.com/help/matlab/ref/sinh.html).
 
 **Syntax**
 
@@ -200,33 +332,31 @@ sinh(x)
 
 **Arguments**
 
--   `x` — The angle, in radians. Values from the interval: `-∞ < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `x` — The angle, in radians. Values from the interval: `-∞ < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value**
 
--   Values from the interval: `-∞ < sinh(x) < +∞`.
+- Values from the interval: `-∞ < sinh(x) < +∞`.
 
 Type: [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT sinh(0);
 ```
 
 Result:
 
-``` text
+```result
 ┌─sinh(0)──┐
 │        0 │
 └──────────┘
 ```
 
-## asinh(x)
+## asinh
 
-[Inverse hyperbolic sine](https://www.mathworks.com/help/matlab/ref/asinh.html).
+Returns the [inverse hyperbolic sine](https://www.mathworks.com/help/matlab/ref/asinh.html).
 
 **Syntax**
 
@@ -236,37 +366,31 @@ asinh(x)
 
 **Arguments**
 
--   `x` — Hyperbolic sine of angle. Values from the interval: `-∞ < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `x` — Hyperbolic sine of angle. Values from the interval: `-∞ < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value**
 
--   The angle, in radians. Values from the interval: `-∞ < asinh(x) < +∞`.
+- The angle, in radians. Values from the interval: `-∞ < asinh(x) < +∞`.
 
 Type: [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT asinh(0);
 ```
 
 Result:
 
-``` text
+```result
 ┌─asinh(0)─┐
 │        0 │
 └──────────┘
 ```
 
-**See Also**
+## atanh
 
--   [sinh(x)](../../sql-reference/functions/math-functions.md#sinhx)
-
-## atanh(x)
-
-[Inverse hyperbolic tangent](https://www.mathworks.com/help/matlab/ref/atanh.html).
+Returns the [inverse hyperbolic tangent](https://www.mathworks.com/help/matlab/ref/atanh.html).
 
 **Syntax**
 
@@ -276,33 +400,31 @@ atanh(x)
 
 **Arguments**
 
--   `x` — Hyperbolic tangent of angle. Values from the interval: `–1 < x < 1`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `x` — Hyperbolic tangent of angle. Values from the interval: `–1 < x < 1`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value**
 
--   The angle, in radians. Values from the interval: `-∞ < atanh(x) < +∞`.
+- The angle, in radians. Values from the interval: `-∞ < atanh(x) < +∞`.
 
 Type: [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT atanh(0);
 ```
 
 Result:
 
-``` text
+```result
 ┌─atanh(0)─┐
 │        0 │
 └──────────┘
 ```
 
-## atan2(y, x)
+## atan2
 
-The [function](https://en.wikipedia.org/wiki/Atan2) calculates the angle in the Euclidean plane, given in radians, between the positive x axis and the ray to the point `(x, y) ≠ (0, 0)`.
+Returns the [atan2](https://en.wikipedia.org/wiki/Atan2) as the angle in the Euclidean plane, given in radians, between the positive x axis and the ray to the point `(x, y) ≠ (0, 0)`.
 
 **Syntax**
 
@@ -312,34 +434,32 @@ atan2(y, x)
 
 **Arguments**
 
--   `y` — y-coordinate of the point through which the ray passes. [Float64](../../sql-reference/data-types/float.md#float32-float64).
--   `x` — x-coordinate of the point through which the ray passes. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `y` — y-coordinate of the point through which the ray passes. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `x` — x-coordinate of the point through which the ray passes. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value**
 
--   The angle `θ` such that `−π < θ ≤ π`, in radians.
+- The angle `θ` such that `−π < θ ≤ π`, in radians.
 
 Type: [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT atan2(1, 1);
 ```
 
 Result:
 
-``` text
+```result
 ┌────────atan2(1, 1)─┐
 │ 0.7853981633974483 │
 └────────────────────┘
 ```
 
-## hypot(x, y)
+## hypot
 
-Calculates the length of the hypotenuse of a right-angle triangle. The [function](https://en.wikipedia.org/wiki/Hypot) avoids problems that occur when squaring very large or very small numbers.
+Returns the length of the hypotenuse of a right-angle triangle. [Hypot](https://en.wikipedia.org/wiki/Hypot) avoids problems that occur when squaring very large or very small numbers.
 
 **Syntax**
 
@@ -349,34 +469,32 @@ hypot(x, y)
 
 **Arguments**
 
--   `x` — The first cathetus of a right-angle triangle. [Float64](../../sql-reference/data-types/float.md#float32-float64).
--   `y` — The second cathetus of a right-angle triangle. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `x` — The first cathetus of a right-angle triangle. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `y` — The second cathetus of a right-angle triangle. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value**
 
--   The length of the hypotenuse of a right-angle triangle.
+- The length of the hypotenuse of a right-angle triangle.
 
 Type: [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT hypot(1, 1);
 ```
 
 Result:
 
-``` text
+```result
 ┌────────hypot(1, 1)─┐
 │ 1.4142135623730951 │
 └────────────────────┘
 ```
 
-## log1p(x)
+## log1p
 
-Calculates `log(1+x)`. The [function](https://en.wikipedia.org/wiki/Natural_logarithm#lnp1) `log1p(x)` is more accurate than `log(1+x)` for small values of x.
+Calculates `log(1+x)`. The [calculation](https://en.wikipedia.org/wiki/Natural_logarithm#lnp1) `log1p(x)` is more accurate than `log(1+x)` for small values of x.
 
 **Syntax**
 
@@ -386,35 +504,29 @@ log1p(x)
 
 **Arguments**
 
--   `x` — Values from the interval: `-1 < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `x` — Values from the interval: `-1 < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value**
 
--   Values from the interval: `-∞ < log1p(x) < +∞`.
+- Values from the interval: `-∞ < log1p(x) < +∞`.
 
 Type: [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT log1p(0);
 ```
 
 Result:
 
-``` text
+```result
 ┌─log1p(0)─┐
 │        0 │
 └──────────┘
 ```
 
-**See Also**
-
--   [log(x)](../../sql-reference/functions/math-functions.md#logx-lnx)
-
-## sign(x)
+## sign
 
 Returns the sign of a real number.
 
@@ -426,13 +538,13 @@ sign(x)
 
 **Arguments**
 
--   `x` — Values from  `-∞` to `+∞`. Support all numeric types in ClickHouse.
+- `x` — Values from  `-∞` to `+∞`. Support all numeric types in ClickHouse.
 
 **Returned value**
 
 - -1 for `x < 0`
--  0 for `x = 0`
--  1 for `x > 0`
+- 0 for `x = 0`
+- 1 for `x > 0`
 
 **Examples**
 
@@ -444,7 +556,7 @@ SELECT sign(0);
 
 Result:
 
-``` text
+```result
 ┌─sign(0)─┐
 │       0 │
 └─────────┘
@@ -458,7 +570,7 @@ SELECT sign(1);
 
 Result:
 
-``` text
+```result
 ┌─sign(1)─┐
 │       1 │
 └─────────┘
@@ -472,15 +584,15 @@ SELECT sign(-1);
 
 Result:
 
-``` text
+```result
 ┌─sign(-1)─┐
 │       -1 │
 └──────────┘
 ```
 
-## degrees(x)
+## degrees
 
-Converts the input value in radians to degrees.
+Converts radians to degrees.
 
 **Syntax**
 
@@ -490,33 +602,31 @@ degrees(x)
 
 **Arguments**
 
--   `x` — Input in radians. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `x` — Input in radians. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value**
 
--   Value in degrees.
+- Value in degrees.
 
 Type: [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT degrees(3.141592653589793);
 ```
 
 Result:
 
-``` text
+```result
 ┌─degrees(3.141592653589793)─┐
 │                        180 │
 └────────────────────────────┘
 ```
 
-## radians(x)
+## radians
 
-Converts the input value in degrees to radians.
+Converts degrees to radians.
 
 **Syntax**
 
@@ -526,34 +636,31 @@ radians(x)
 
 **Arguments**
 
--   `x` — Input in degrees. [Float64](../../sql-reference/data-types/float.md#float32-float64).
+- `x` — Input in degrees. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Returned value**
 
--   Value in radians.
+- Value in radians.
 
 Type: [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT radians(180);
 ```
 
 Result:
 
-``` text
+```result
 ┌──────radians(180)─┐
 │ 3.141592653589793 │
 └───────────────────┘
 ```
 
+## factorial
 
-## factorial(n)
-
-Computes the factorial of an integer value. It works with any native integer type including UInt(8|16|32|64) and Int(8|16|32|64). The return type is UInt64.
+Computes the factorial of an integer value. Works with any native integer type including UInt(8|16|32|64) and Int(8|16|32|64). The return type is UInt64.
 
 The factorial of 0 is 1. Likewise, the factorial() function returns 1 for any negative value. The maximum positive value for the input argument is 20, a value of 21 or greater will cause exception throw.
 
@@ -566,21 +673,19 @@ factorial(n)
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT factorial(10);
 ```
 
 Result:
 
-``` text
+```result
 ┌─factorial(10)─┐
 │       3628800 │
 └───────────────┘
 ```
 
-## width_bucket(operand, low, high, count)
+## width_bucket
 
 Returns the number of the bucket in which `operand` falls in a histogram having `count` equal-width buckets spanning the range `low` to `high`. Returns `0` if `operand < low`, and returns `count+1` if `operand >= high`.
 
@@ -591,21 +696,18 @@ Returns the number of the bucket in which `operand` falls in a histogram having
 ```sql
 widthBucket(operand, low, high, count)
 ```
-
-There is also a case insensitive alias called `WIDTH_BUCKET` to provide compatibility with other databases.
+Alias: `WIDTH_BUCKET`
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT widthBucket(10.15, -8.6, 23, 18);
 ```
 
 Result:
 
-``` text
+```result
 ┌─widthBucket(10.15, -8.6, 23, 18)─┐
 │                               11 │
 └──────────────────────────────────┘
-```
\ No newline at end of file
+```
diff --git a/docs/en/sql-reference/functions/nlp-functions.md b/docs/en/sql-reference/functions/nlp-functions.md
index f68448af2be..f10415783a5 100644
--- a/docs/en/sql-reference/functions/nlp-functions.md
+++ b/docs/en/sql-reference/functions/nlp-functions.md
@@ -1,11 +1,10 @@
 ---
 slug: /en/sql-reference/functions/nlp-functions
-sidebar_position: 67
-sidebar_label: NLP
-title: "[experimental] Natural Language Processing functions"
+sidebar_position: 130
+sidebar_label: NLP (experimental)
 ---
 
-:::warning
+:::note
 This is an experimental feature that is currently in development and is not ready for general use. It will change in unpredictable backwards-incompatible ways in future releases. Set `allow_experimental_nlp_functions = 1` to enable it.
 :::
 
@@ -13,18 +12,18 @@ This is an experimental feature that is currently in development and is not read
 
 Performs stemming on a given word.
 
-**Syntax**
+### Syntax
 
 ``` sql
 stem('language', word)
 ```
 
-**Arguments**
+### Arguments
 
--   `language` — Language which rules will be applied. Must be in lowercase. [String](../../sql-reference/data-types/string.md#string).
--   `word` — word that needs to be stemmed. Must be in lowercase. [String](../../sql-reference/data-types/string.md#string).
+- `language` — Language which rules will be applied. Use the two letter [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
+- `word` — word that needs to be stemmed. Must be in lowercase. [String](../../sql-reference/data-types/string.md#string).
 
-**Examples**
+### Examples
 
 Query:
 
@@ -39,23 +38,58 @@ Result:
 │ ['I','think','it','is','a','bless','in','disguis'] │
 └────────────────────────────────────────────────────┘
 ```
+### Supported languages for stem()
+
+:::note
+The stem() function uses the [Snowball stemming](https://snowballstem.org/) library, see the Snowball website for updated languages etc.
+:::
+
+- Arabic
+- Armenian
+- Basque
+- Catalan
+- Danish
+- Dutch
+- English
+- Finnish
+- French
+- German
+- Greek
+- Hindi
+- Hungarian
+- Indonesian
+- Irish
+- Italian
+- Lithuanian
+- Nepali
+- Norwegian
+- Porter
+- Portuguese
+- Romanian
+- Russian
+- Serbian
+- Spanish
+- Swedish
+- Tamil
+- Turkish
+- Yiddish
 
 ## lemmatize
 
 Performs lemmatization on a given word. Needs dictionaries to operate, which can be obtained [here](https://github.com/vpodpecan/lemmagen3/tree/master/src/lemmagen3/models).
 
-**Syntax**
+### Syntax
 
 ``` sql
 lemmatize('language', word)
 ```
 
-**Arguments**
+### Arguments
 
--   `language` — Language which rules will be applied. [String](../../sql-reference/data-types/string.md#string).
--   `word` — Word that needs to be lemmatized. Must be lowercase. [String](../../sql-reference/data-types/string.md#string).
+- `language` — Language which rules will be applied. [String](../../sql-reference/data-types/string.md#string).
+- `word` — Word that needs to be lemmatized. Must be lowercase. [String](../../sql-reference/data-types/string.md#string).
 
-**Examples**
+### Examples
 
 Query:
 
@@ -71,12 +105,18 @@ Result:
 └─────────────────────┘
 ```
 
-Configuration:
+### Configuration
+
+This configuration specifies that the dictionary `en.bin` should be used for lemmatization of English (`en`) words.  The `.bin` files can be downloaded from 
+[here](https://github.com/vpodpecan/lemmagen3/tree/master/src/lemmagen3/models).
+
 ``` xml
 <lemmatizers>
     <lemmatizer>
+        <!-- highlight-start -->
         <lang>en</lang>
         <path>en.bin</path>
+        <!-- highlight-end -->
     </lemmatizer>
 </lemmatizers>
 ```
@@ -89,18 +129,18 @@ With the `plain` extension type we need to provide a path to a simple text file,
 
 With the `wordnet` extension type we need to provide a path to a directory with WordNet thesaurus in it. Thesaurus must contain a WordNet sense index.
 
-**Syntax**
+### Syntax
 
 ``` sql
 synonyms('extension_name', word)
 ```
 
-**Arguments**
+### Arguments
 
--   `extension_name` — Name of the extension in which search will be performed. [String](../../sql-reference/data-types/string.md#string).
--   `word` — Word that will be searched in extension. [String](../../sql-reference/data-types/string.md#string).
+- `extension_name` — Name of the extension in which search will be performed. [String](../../sql-reference/data-types/string.md#string).
+- `word` — Word that will be searched in extension. [String](../../sql-reference/data-types/string.md#string).
 
-**Examples**
+### Examples
 
 Query:
 
@@ -116,7 +156,7 @@ Result:
 └──────────────────────────────────────────┘
 ```
 
-Configuration:
+### Configuration
 ``` xml
 <synonyms_extensions>
     <extension>
@@ -138,17 +178,17 @@ Detects the language of the UTF8-encoded input string. The function uses the [CL
 
 The `detectLanguage` function works best when providing over 200 characters in the input string.
 
-**Syntax**
+### Syntax
 
 ``` sql
 detectLanguage('text_to_be_analyzed')
 ```
 
-**Arguments**
+### Arguments
 
--   `text_to_be_analyzed` — A collection (or sentences) of strings to analyze. [String](../../sql-reference/data-types/string.md#string).
+- `text_to_be_analyzed` — A collection (or sentences) of strings to analyze. [String](../../sql-reference/data-types/string.md#string).
 
-**Returned value**
+### Returned value
 
 - The 2-letter ISO code of the detected language
 
@@ -157,7 +197,7 @@ Other possible results:
 - `un` = unknown, can not detect any language.
 - `other` = the detected language does not have 2 letter code.
 
-**Examples**
+### Examples
 
 Query:
 
@@ -176,22 +216,22 @@ fr
 Similar to the `detectLanguage` function, but `detectLanguageMixed` returns a `Map` of 2-letter language codes that are mapped to the percentage of the certain language in the text.
 
 
-**Syntax**
+### Syntax
 
 ``` sql
 detectLanguageMixed('text_to_be_analyzed')
 ```
 
-**Arguments**
+### Arguments
 
--   `text_to_be_analyzed` — A collection (or sentences) of strings to analyze. [String](../../sql-reference/data-types/string.md#string).
+- `text_to_be_analyzed` — A collection (or sentences) of strings to analyze. [String](../../sql-reference/data-types/string.md#string).
 
-**Returned value**
+### Returned value
 
-- `Map(String, Float32)`: The keys are 2-letter ISO codes and the values are a perentage of text found for that language
+- `Map(String, Float32)`: The keys are 2-letter ISO codes and the values are a percentage of text found for that language
 
 
-**Examples**
+### Examples
 
 Query:
 
@@ -212,17 +252,17 @@ Result:
 Similar to the `detectLanguage` function, except the `detectLanguageUnknown` function works with non-UTF8-encoded strings. Prefer this version when your character set is UTF-16 or UTF-32.
 
 
-**Syntax**
+### Syntax
 
 ``` sql
 detectLanguageUnknown('text_to_be_analyzed')
 ```
 
-**Arguments**
+### Arguments
 
--   `text_to_be_analyzed` — A collection (or sentences) of strings to analyze. [String](../../sql-reference/data-types/string.md#string).
+- `text_to_be_analyzed` — A collection (or sentences) of strings to analyze. [String](../../sql-reference/data-types/string.md#string).
 
-**Returned value**
+### Returned value
 
 - The 2-letter ISO code of the detected language
 
@@ -231,7 +271,7 @@ Other possible results:
 - `un` = unknown, can not detect any language.
 - `other` = the detected language does not have 2 letter code.
 
-**Examples**
+### Examples
 
 Query:
 
@@ -252,21 +292,21 @@ Result:
 The `detectCharset` function detects the character set of the non-UTF8-encoded input string.
 
 
-**Syntax**
+### Syntax
 
 ``` sql
 detectCharset('text_to_be_analyzed')
 ```
 
-**Arguments**
+### Arguments
 
--   `text_to_be_analyzed` — A collection (or sentences) of strings to analyze. [String](../../sql-reference/data-types/string.md#string).
+- `text_to_be_analyzed` — A collection (or sentences) of strings to analyze. [String](../../sql-reference/data-types/string.md#string).
 
-**Returned value**
+### Returned value
 
 - A `String` containing the code of the detected character set
 
-**Examples**
+### Examples
 
 Query:
 
diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 7146484361e..efe1a77c285 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/other-functions
-sidebar_position: 67
+sidebar_position: 140
 sidebar_label: Other
 ---
 
@@ -23,11 +23,11 @@ getMacro(name);
 
 **Arguments**
 
--   `name` — Name to retrieve from the `macros` section. [String](../../sql-reference/data-types/string.md#string).
+- `name` — Name to retrieve from the `macros` section. [String](../../sql-reference/data-types/string.md#string).
 
 **Returned value**
 
--   Value of the specified macro.
+- Value of the specified macro.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -82,7 +82,7 @@ This function is case-insensitive.
 
 **Returned value**
 
--   String with the fully qualified domain name.
+- String with the fully qualified domain name.
 
 Type: `String`.
 
@@ -112,17 +112,17 @@ basename( expr )
 
 **Arguments**
 
--   `expr` — Expression resulting in a [String](../../sql-reference/data-types/string.md) type value. All the backslashes must be escaped in the resulting value.
+- `expr` — Expression resulting in a [String](../../sql-reference/data-types/string.md) type value. All the backslashes must be escaped in the resulting value.
 
 **Returned Value**
 
 A string that contains:
 
--   The trailing part of a string after the last slash or backslash.
+- The trailing part of a string after the last slash or backslash.
 
         If the input string contains a path ending with slash or backslash, for example, `/` or `c:\`, the function returns an empty string.
 
--   The original string if there are no slashes or backslashes.
+- The original string if there are no slashes or backslashes.
 
 **Example**
 
@@ -196,11 +196,11 @@ byteSize(argument [, ...])
 
 **Arguments**
 
--   `argument` — Value.
+- `argument` — Value.
 
 **Returned value**
 
--   Estimation of byte size of the arguments in memory.
+- Estimation of byte size of the arguments in memory.
 
 Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
@@ -306,7 +306,7 @@ You can use this function in table engine parameters in a CREATE TABLE query whe
 
 ## currentUser()
 
-Returns the login of current user. Login of user, that initiated query, will be returned in case distibuted query.
+Returns the login of current user. Login of user, that initiated query, will be returned in case distributed query.
 
 ``` sql
 SELECT currentUser();
@@ -316,8 +316,8 @@ Alias: `user()`, `USER()`.
 
 **Returned values**
 
--   Login of current user.
--   Login of user that initiated query in case of disributed query.
+- Login of current user.
+- Login of user that initiated query in case of distributed query.
 
 Type: `String`.
 
@@ -353,12 +353,12 @@ isConstant(x)
 
 **Arguments**
 
--   `x` — Expression to check.
+- `x` — Expression to check.
 
 **Returned values**
 
--   `1` — `x` is constant.
--   `0` — `x` is non-constant.
+- `1` — `x` is constant.
+- `0` — `x` is non-constant.
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md).
 
@@ -424,13 +424,13 @@ Checks whether floating point value is finite.
 
 **Arguments**
 
--   `x` — Value to be checked for infinity. Type: [Float\*](../../sql-reference/data-types/float.md).
--   `y` — Fallback value. Type: [Float\*](../../sql-reference/data-types/float.md).
+- `x` — Value to be checked for infinity. Type: [Float\*](../../sql-reference/data-types/float.md).
+- `y` — Fallback value. Type: [Float\*](../../sql-reference/data-types/float.md).
 
 **Returned value**
 
--   `x` if `x` is finite.
--   `y` if `x` is not finite.
+- `x` if `x` is finite.
+- `y` if `x` is not finite.
 
 **Example**
 
@@ -464,9 +464,9 @@ Allows building a unicode-art diagram.
 
 **Arguments**
 
--   `x` — Size to display.
--   `min, max` — Integer constants. The value must fit in `Int64`.
--   `width` — Constant, positive integer, can be fractional.
+- `x` — Size to display.
+- `min, max` — Integer constants. The value must fit in `Int64`.
+- `width` — Constant, positive integer, can be fractional.
 
 The band is drawn with accuracy to one eighth of a symbol.
 
@@ -670,8 +670,8 @@ formatReadableTimeDelta(column[, maximum_unit])
 
 **Arguments**
 
--   `column` — A column with numeric time delta.
--   `maximum_unit` — Optional. Maximum unit to show. Acceptable values seconds, minutes, hours, days, months, years.
+- `column` — A column with numeric time delta.
+- `maximum_unit` — Optional. Maximum unit to show. Acceptable values seconds, minutes, hours, days, months, years.
 
 Example:
 
@@ -715,12 +715,12 @@ parseTimeDelta(timestr)
 
 **Arguments**
 
--   `timestr` — A sequence of numbers followed by something resembling a time unit.
+- `timestr` — A sequence of numbers followed by something resembling a time unit.
 
 
 **Returned value**
 
--   A floating-point number with the number of seconds.
+- A floating-point number with the number of seconds.
 
 **Example**
 
@@ -792,7 +792,7 @@ neighbor(column, offset[, default_value])
 
 The result of the function depends on the affected data blocks and the order of data in the block.
 
-:::warning    
+:::tip
 It can reach the neighbor rows only inside the currently processed data block.
 :::
 
@@ -801,14 +801,14 @@ To prevent that you can make a subquery with [ORDER BY](../../sql-reference/stat
 
 **Arguments**
 
--   `column` — A column name or scalar expression.
--   `offset` — The number of rows forwards or backwards from the current row of `column`. [Int64](../../sql-reference/data-types/int-uint.md).
--   `default_value` — Optional. The value to be returned if offset goes beyond the scope of the block. Type of data blocks affected.
+- `column` — A column name or scalar expression.
+- `offset` — The number of rows forwards or backwards from the current row of `column`. [Int64](../../sql-reference/data-types/int-uint.md).
+- `default_value` — Optional. The value to be returned if offset goes beyond the scope of the block. Type of data blocks affected.
 
 **Returned values**
 
--   Value for `column` in `offset` distance from current row if `offset` value is not outside block bounds.
--   Default value for `column` if `offset` value is outside block bounds. If `default_value` is given, then it will be used.
+- Value for `column` in `offset` distance from current row if `offset` value is not outside block bounds.
+- Default value for `column` if `offset` value is outside block bounds. If `default_value` is given, then it will be used.
 
 Type: type of data blocks affected or default value type.
 
@@ -902,7 +902,7 @@ Result:
 Calculates the difference between successive row values ​​in the data block.
 Returns 0 for the first row and the difference from the previous row for each subsequent row.
 
-:::warning    
+:::tip
 It can reach the previous row only inside the currently processed data block.
 :::
 
@@ -986,7 +986,7 @@ Each event has a start time and an end time. The start time is included in the e
 The function calculates the total number of active (concurrent) events for each event start time.
 
 
-:::warning    
+:::tip
 Events must be ordered by the start time in ascending order. If this requirement is violated the function raises an exception. Every data block is processed separately. If events from different data blocks overlap then they can not be processed correctly.
 :::
 
@@ -998,12 +998,12 @@ runningConcurrency(start, end)
 
 **Arguments**
 
--   `start` — A column with the start time of events. [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), or [DateTime64](../../sql-reference/data-types/datetime64.md).
--   `end` — A column with the end time of events.  [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `start` — A column with the start time of events. [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `end` — A column with the end time of events.  [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
 **Returned values**
 
--   The number of concurrent events at each event start time.
+- The number of concurrent events at each event start time.
 
 Type: [UInt32](../../sql-reference/data-types/int-uint.md)
 
@@ -1059,12 +1059,12 @@ getSizeOfEnumType(value)
 
 **Arguments:**
 
--   `value` — Value of type `Enum`.
+- `value` — Value of type `Enum`.
 
 **Returned values**
 
--   The number of fields with `Enum` input values.
--   An exception is thrown if the type is not `Enum`.
+- The number of fields with `Enum` input values.
+- An exception is thrown if the type is not `Enum`.
 
 **Example**
 
@@ -1088,11 +1088,11 @@ blockSerializedSize(value[, value[, ...]])
 
 **Arguments**
 
--   `value` — Any value.
+- `value` — Any value.
 
 **Returned values**
 
--   The number of bytes that will be written to disk for block of values (without compression).
+- The number of bytes that will be written to disk for block of values (without compression).
 
 **Example**
 
@@ -1120,11 +1120,11 @@ toColumnTypeName(value)
 
 **Arguments:**
 
--   `value` — Any type of value.
+- `value` — Any type of value.
 
 **Returned values**
 
--   A string with the name of the class that is used for representing the `value` data type in RAM.
+- A string with the name of the class that is used for representing the `value` data type in RAM.
 
 **Example of the difference between`toTypeName ' and ' toColumnTypeName`**
 
@@ -1160,11 +1160,11 @@ dumpColumnStructure(value)
 
 **Arguments:**
 
--   `value` — Any type of value.
+- `value` — Any type of value.
 
 **Returned values**
 
--   A string describing the structure that is used for representing the `value` data type in RAM.
+- A string describing the structure that is used for representing the `value` data type in RAM.
 
 **Example**
 
@@ -1190,13 +1190,13 @@ defaultValueOfArgumentType(expression)
 
 **Arguments:**
 
--   `expression` — Arbitrary type of value or an expression that results in a value of an arbitrary type.
+- `expression` — Arbitrary type of value or an expression that results in a value of an arbitrary type.
 
 **Returned values**
 
--   `0` for numbers.
--   Empty string for strings.
--   `ᴺᵁᴸᴸ` for [Nullable](../../sql-reference/data-types/nullable.md).
+- `0` for numbers.
+- Empty string for strings.
+- `ᴺᵁᴸᴸ` for [Nullable](../../sql-reference/data-types/nullable.md).
 
 **Example**
 
@@ -1232,13 +1232,13 @@ defaultValueOfTypeName(type)
 
 **Arguments:**
 
--   `type` — A string representing a type name.
+- `type` — A string representing a type name.
 
 **Returned values**
 
--   `0` for numbers.
--   Empty string for strings.
--   `ᴺᵁᴸᴸ` for [Nullable](../../sql-reference/data-types/nullable.md).
+- `0` for numbers.
+- Empty string for strings.
+- `ᴺᵁᴸᴸ` for [Nullable](../../sql-reference/data-types/nullable.md).
 
 **Example**
 
@@ -1377,8 +1377,8 @@ SELECT replicate(x, arr);
 
 **Arguments:**
 
--   `arr` — Original array. ClickHouse creates a new array of the same length as the original and fills it with the value `x`.
--   `x` — The value that the resulting array will be filled with.
+- `arr` — Original array. ClickHouse creates a new array of the same length as the original and fills it with the value `x`.
+- `x` — The value that the resulting array will be filled with.
 
 **Returned value**
 
@@ -1414,7 +1414,7 @@ filesystemAvailable()
 
 **Returned value**
 
--   The amount of remaining space available in bytes.
+- The amount of remaining space available in bytes.
 
 Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
@@ -1446,7 +1446,7 @@ filesystemFree()
 
 **Returned value**
 
--   Amount of free space in bytes.
+- Amount of free space in bytes.
 
 Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
@@ -1478,7 +1478,7 @@ filesystemCapacity()
 
 **Returned value**
 
--   Capacity information of the filesystem in bytes.
+- Capacity information of the filesystem in bytes.
 
 Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
@@ -1510,8 +1510,8 @@ initializeAggregation (aggregate_function, arg1, arg2, ..., argN)
 
 **Arguments**
 
--   `aggregate_function` — Name of the aggregation function to initialize. [String](../../sql-reference/data-types/string.md).
--   `arg` — Arguments of aggregate function.
+- `aggregate_function` — Name of the aggregation function to initialize. [String](../../sql-reference/data-types/string.md).
+- `arg` — Arguments of aggregate function.
 
 **Returned value(s)**
 
@@ -1568,7 +1568,7 @@ INSERT INTO metrics VALUES (0, initializeAggregation('sumState', toUInt64(42)))
 ```
 
 **See Also**
--   [arrayReduce](../../sql-reference/functions/array-functions.md#arrayreduce)
+- [arrayReduce](../../sql-reference/functions/array-functions.md#arrayreduce)
 
 ## finalizeAggregation
 
@@ -1582,11 +1582,11 @@ finalizeAggregation(state)
 
 **Arguments**
 
--   `state` — State of aggregation. [AggregateFunction](../../sql-reference/data-types/aggregatefunction.md#data-type-aggregatefunction).
+- `state` — State of aggregation. [AggregateFunction](../../sql-reference/data-types/aggregatefunction.md#data-type-aggregatefunction).
 
 **Returned value(s)**
 
--   Value/values that was aggregated.
+- Value/values that was aggregated.
 
 Type: Value of any types that was aggregated.
 
@@ -1667,14 +1667,14 @@ Result:
 ```
 
 **See Also**
--   [arrayReduce](../../sql-reference/functions/array-functions.md#arrayreduce)
--   [initializeAggregation](#initializeaggregation)
+- [arrayReduce](../../sql-reference/functions/array-functions.md#arrayreduce)
+- [initializeAggregation](#initializeaggregation)
 
 ## runningAccumulate
 
 Accumulates states of an aggregate function for each row of a data block.
 
-:::warning    
+:::tip
 The state is reset for each new data block.
 :::
 
@@ -1686,12 +1686,12 @@ runningAccumulate(agg_state[, grouping]);
 
 **Arguments**
 
--   `agg_state` — State of the aggregate function. [AggregateFunction](../../sql-reference/data-types/aggregatefunction.md#data-type-aggregatefunction).
--   `grouping` — Grouping key. Optional. The state of the function is reset if the `grouping` value is changed. It can be any of the [supported data types](../../sql-reference/data-types/index.md) for which the equality operator is defined.
+- `agg_state` — State of the aggregate function. [AggregateFunction](../../sql-reference/data-types/aggregatefunction.md#data-type-aggregatefunction).
+- `grouping` — Grouping key. Optional. The state of the function is reset if the `grouping` value is changed. It can be any of the [supported data types](../../sql-reference/data-types/index.md) for which the equality operator is defined.
 
 **Returned value**
 
--   Each resulting row contains a result of the aggregate function, accumulated for all the input rows from 0 to the current position. `runningAccumulate` resets states for each new data block or when the `grouping` value changes.
+- Each resulting row contains a result of the aggregate function, accumulated for all the input rows from 0 to the current position. `runningAccumulate` resets states for each new data block or when the `grouping` value changes.
 
 Type depends on the aggregate function used.
 
@@ -1792,9 +1792,9 @@ joinGet(join_storage_table_name, `value_column`, join_keys)
 
 **Arguments**
 
--   `join_storage_table_name` — an [identifier](../../sql-reference/syntax.md#syntax-identifiers) indicates where search is performed. The identifier is searched in the default database (see parameter `default_database` in the config file). To override the default database, use the `USE db_name` or specify the database and the table through the separator `db_name.db_table`, see the example.
--   `value_column` — name of the column of the table that contains required data.
--   `join_keys` — list of keys.
+- `join_storage_table_name` — an [identifier](../../sql-reference/syntax.md#syntax-identifiers) indicates where search is performed. The identifier is searched in the default database (see parameter `default_database` in the config file). To override the default database, use the `USE db_name` or specify the database and the table through the separator `db_name.db_table`, see the example.
+- `value_column` — name of the column of the table that contains required data.
+- `join_keys` — list of keys.
 
 **Returned value**
 
@@ -1939,13 +1939,13 @@ randomPrintableASCII(length)
 
 **Arguments**
 
--   `length` — Resulting string length. Positive integer.
+- `length` — Resulting string length. Positive integer.
 
         If you pass `length < 0`, behavior of the function is undefined.
 
 **Returned value**
 
--   String with a random set of [ASCII](https://en.wikipedia.org/wiki/ASCII#Printable_characters) printable characters.
+- String with a random set of [ASCII](https://en.wikipedia.org/wiki/ASCII#Printable_characters) printable characters.
 
 Type: [String](../../sql-reference/data-types/string.md)
 
@@ -1975,11 +1975,11 @@ randomString(length)
 
 **Arguments**
 
--   `length` — String length. Positive integer.
+- `length` — String length. Positive integer.
 
 **Returned value**
 
--   String filled with random bytes.
+- String filled with random bytes.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -2007,8 +2007,8 @@ len: 30
 
 **See Also**
 
--   [generateRandom](../../sql-reference/table-functions/generate.md#generaterandom)
--   [randomPrintableASCII](../../sql-reference/functions/other-functions.md#randomascii)
+- [generateRandom](../../sql-reference/table-functions/generate.md#generaterandom)
+- [randomPrintableASCII](../../sql-reference/functions/other-functions.md#randomascii)
 
 
 ## randomFixedString
@@ -2023,11 +2023,11 @@ randomFixedString(length);
 
 **Arguments**
 
--   `length` — String length in bytes. [UInt64](../../sql-reference/data-types/int-uint.md).
+- `length` — String length in bytes. [UInt64](../../sql-reference/data-types/int-uint.md).
 
 **Returned value(s)**
 
--   String filled with random bytes.
+- String filled with random bytes.
 
 Type: [FixedString](../../sql-reference/data-types/fixedstring.md).
 
@@ -2060,11 +2060,11 @@ randomStringUTF8(length);
 
 **Arguments**
 
--   `length` — Required length of the resulting string in code points. [UInt64](../../sql-reference/data-types/int-uint.md).
+- `length` — Required length of the resulting string in code points. [UInt64](../../sql-reference/data-types/int-uint.md).
 
 **Returned value(s)**
 
--   UTF-8 random string.
+- UTF-8 random string.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -2097,11 +2097,11 @@ getSetting('custom_setting');
 
 **Parameter**
 
--   `custom_setting` — The setting name. [String](../../sql-reference/data-types/string.md).
+- `custom_setting` — The setting name. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   The setting current value.
+- The setting current value.
 
 **Example**
 
@@ -2118,7 +2118,7 @@ SELECT getSetting('custom_a');
 
 **See Also**
 
--   [Custom Settings](../../operations/settings/index.md#custom_settings)
+- [Custom Settings](../../operations/settings/index.md#custom_settings)
 
 ## isDecimalOverflow
 
@@ -2132,13 +2132,13 @@ isDecimalOverflow(d, [p])
 
 **Arguments**
 
--   `d` — value. [Decimal](../../sql-reference/data-types/decimal.md).
--   `p` — precision. Optional. If omitted, the initial precision of the first argument is used. Using of this paratemer could be helpful for data extraction to another DBMS or file. [UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges).
+- `d` — value. [Decimal](../../sql-reference/data-types/decimal.md).
+- `p` — precision. Optional. If omitted, the initial precision of the first argument is used. Using of this paratemer could be helpful for data extraction to another DBMS or file. [UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges).
 
 **Returned values**
 
--   `1` — Decimal value has more digits then it's precision allow,
--   `0` — Decimal value satisfies the specified precision.
+- `1` — Decimal value has more digits then it's precision allow,
+- `0` — Decimal value satisfies the specified precision.
 
 **Example**
 
@@ -2169,7 +2169,7 @@ countDigits(x)
 
 **Arguments**
 
--   `x` — [Int](../../sql-reference/data-types/int-uint.md) or [Decimal](../../sql-reference/data-types/decimal.md) value.
+- `x` — [Int](../../sql-reference/data-types/int-uint.md) or [Decimal](../../sql-reference/data-types/decimal.md) value.
 
 **Returned value**
 
@@ -2177,7 +2177,7 @@ Number of digits.
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges).
 
-:::note    
+:::note
 For `Decimal` values takes into account their scales: calculates result over underlying integer type which is `(value * scale)`. For example: `countDigits(42) = 2`, `countDigits(42.000) = 5`, `countDigits(0.04200) = 4`. I.e. you may check decimal overflow for `Decimal64` with `countDecimal(x) > 18`. It's a slow variant of [isDecimalOverflow](#is-decimal-overflow).
 :::
 
@@ -2201,7 +2201,7 @@ Result:
 
 **Returned value**
 
--   Variable name for the error code.
+- Variable name for the error code.
 
 Type: [LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md).
 
@@ -2230,11 +2230,11 @@ tcpPort()
 
 **Arguments**
 
--   None.
+- None.
 
 **Returned value**
 
--   The TCP port number.
+- The TCP port number.
 
 Type: [UInt16](../../sql-reference/data-types/int-uint.md).
 
@@ -2256,11 +2256,11 @@ Result:
 
 **See Also**
 
--   [tcp_port](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port)
+- [tcp_port](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port)
 
 ## currentProfiles
 
-Returns a list of the current [settings profiles](../../operations/access-rights.md#settings-profiles-management) for the current user. 
+Returns a list of the current [settings profiles](../../guides/sre/user-management/index.md#settings-profiles-management) for the current user.
 
 The command [SET PROFILE](../../sql-reference/statements/set.md#query-set) could be used to change the current setting profile. If the command `SET PROFILE` was not used the function returns the profiles specified at the current user's definition (see [CREATE USER](../../sql-reference/statements/create/user.md#create-user-statement)).
 
@@ -2272,7 +2272,7 @@ currentProfiles()
 
 **Returned value**
 
--   List of the current user settings profiles. 
+- List of the current user settings profiles.
 
 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
@@ -2288,7 +2288,7 @@ enabledProfiles()
 
 **Returned value**
 
--   List of the enabled settings profiles. 
+- List of the enabled settings profiles.
 
 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
@@ -2304,7 +2304,7 @@ defaultProfiles()
 
 **Returned value**
 
--   List of the default settings profiles. 
+- List of the default settings profiles.
 
 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
@@ -2320,7 +2320,7 @@ currentRoles()
 
 **Returned value**
 
--   List of the current roles for the current user. 
+- List of the current roles for the current user.
 
 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
@@ -2336,13 +2336,13 @@ enabledRoles()
 
 **Returned value**
 
--   List of the enabled roles for the current user. 
+- List of the enabled roles for the current user.
 
 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
 ## defaultRoles
 
-Returns the names of the roles which are enabled by default for the current user when he logins. Initially these are all roles granted to the current user (see [GRANT](../../sql-reference/statements/grant/#grant-select)), but that can be changed with the [SET DEFAULT ROLE](../../sql-reference/statements/set-role.md#set-default-role-statement) statement. 
+Returns the names of the roles which are enabled by default for the current user when he logins. Initially these are all roles granted to the current user (see [GRANT](../../sql-reference/statements/grant.md#grant-select)), but that can be changed with the [SET DEFAULT ROLE](../../sql-reference/statements/set-role.md#set-default-role-statement) statement.
 
 **Syntax**
 
@@ -2352,7 +2352,7 @@ defaultRoles()
 
 **Returned value**
 
--   List of the default roles for the current user. 
+- List of the default roles for the current user.
 
 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
@@ -2368,22 +2368,22 @@ getServerPort(port_name)
 
 **Arguments**
 
--   `port_name` — The name of the server port. [String](../../sql-reference/data-types/string.md#string). Possible values:
+- `port_name` — The name of the server port. [String](../../sql-reference/data-types/string.md#string). Possible values:
 
-    -   'tcp_port'
-    -   'tcp_port_secure'
-    -   'http_port'
-    -   'https_port'
-    -   'interserver_http_port'
-    -   'interserver_https_port'
-    -   'mysql_port'
-    -   'postgresql_port'
-    -   'grpc_port'
-    -   'prometheus.port'
+    - 'tcp_port'
+    - 'tcp_port_secure'
+    - 'http_port'
+    - 'https_port'
+    - 'interserver_http_port'
+    - 'interserver_https_port'
+    - 'mysql_port'
+    - 'postgresql_port'
+    - 'grpc_port'
+    - 'prometheus.port'
 
 **Returned value**
 
--   The number of the server port.
+- The number of the server port.
 
 Type: [UInt16](../../sql-reference/data-types/int-uint.md).
 
@@ -2417,7 +2417,7 @@ queryID()
 
 **Returned value**
 
--   The ID of the current query.
+- The ID of the current query.
 
 Type: [String](../../sql-reference/data-types/string.md)
 
@@ -2453,7 +2453,7 @@ initialQueryID()
 
 **Returned value**
 
--   The ID of the initial current query.
+- The ID of the initial current query.
 
 Type: [String](../../sql-reference/data-types/string.md)
 
@@ -2488,7 +2488,7 @@ shardNum()
 
 **Returned value**
 
--   Shard index or constant `0`.
+- Shard index or constant `0`.
 
 Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
@@ -2499,7 +2499,7 @@ In the following example a configuration with two shards is used. The query is e
 Query:
 
 ``` sql
-CREATE TABLE shard_num_example (dummy UInt8) 
+CREATE TABLE shard_num_example (dummy UInt8)
     ENGINE=Distributed(test_cluster_two_shards_localhost, system, one, dummy);
 SELECT dummy, shardNum(), shardCount() FROM shard_num_example;
 ```
@@ -2515,7 +2515,7 @@ Result:
 
 **See Also**
 
--   [Distributed Table Engine](../../engines/table-engines/special/distributed.md)
+- [Distributed Table Engine](../../engines/table-engines/special/distributed.md)
 
 ## shardCount
 
@@ -2530,7 +2530,7 @@ shardCount()
 
 **Returned value**
 
--   Total number of shards or `0`.
+- Total number of shards or `0`.
 
 Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
@@ -2550,11 +2550,11 @@ getOSKernelVersion()
 
 **Arguments**
 
--   None.
+- None.
 
 **Returned value**
 
--   The current OS kernel version.
+- The current OS kernel version.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -2586,11 +2586,11 @@ zookeeperSessionUptime()
 
 **Arguments**
 
--   None.
+- None.
 
 **Returned value**
 
--   Uptime of the current ZooKeeper session in seconds.
+- Uptime of the current ZooKeeper session in seconds.
 
 Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
diff --git a/docs/en/sql-reference/functions/random-functions.md b/docs/en/sql-reference/functions/random-functions.md
index eb6866d28ea..e90d537fb74 100644
--- a/docs/en/sql-reference/functions/random-functions.md
+++ b/docs/en/sql-reference/functions/random-functions.md
@@ -1,58 +1,44 @@
 ---
 slug: /en/sql-reference/functions/random-functions
-sidebar_position: 51
-sidebar_label: Pseudo-Random Numbers
+sidebar_position: 145
+sidebar_label: Random Numbers
 ---
 
-# Functions for Generating Pseudo-Random Numbers
+# Functions for Generating Random Numbers
 
-All the functions accept zero arguments or one argument. If an argument is passed, it can be any type, and its value is not used for anything. The only purpose of this argument is to prevent common subexpression elimination, so that two different instances of the same function return different columns with different random numbers.
+All functions in this section accept zero or one arguments. The only use of the argument (if provided) is to prevent prevent [common subexpression
+elimination](../../sql-reference/functions/index.md#common-subexpression-elimination) such that two different execution of the same random
+function in a query return different random values.
 
-:::note    
-Non-cryptographic generators of pseudo-random numbers are used.
+Related content
+- Blog: [Generating random data in ClickHouse](https://clickhouse.com/blog/generating-random-test-distribution-data-for-clickhouse)
+
+:::note
+The random numbers are generated by non-cryptographic algorithms.
 :::
 
 ## rand, rand32
 
-Returns a pseudo-random UInt32 number, evenly distributed among all UInt32-type numbers.
+Returns a random UInt32 number, evenly distributed across the range of all possible UInt32 numbers.
 
 Uses a linear congruential generator.
 
 ## rand64
 
-Returns a pseudo-random UInt64 number, evenly distributed among all UInt64-type numbers.
+Returns a random UInt64 number, evenly distributed across the range of all possible UInt64 numbers.
 
 Uses a linear congruential generator.
 
 ## randCanonical
-The function generates pseudo random results with independent and identically distributed uniformly distributed values in [0, 1).
 
-Non-deterministic. Return type is Float64.
+Returns a Float64 value, evenly distributed in [0, 1).
 
 ## randConstant
 
-Produces a constant column with a random value.
-
-**Syntax**
-
-``` sql
-randConstant([x])
-```
-
-**Arguments**
-
--   `x` — [Expression](../../sql-reference/syntax.md#syntax-expressions) resulting in any of the [supported data types](../../sql-reference/data-types/index.md#data_types). The resulting value is discarded, but the expression itself if used for bypassing [common subexpression elimination](../../sql-reference/functions/index.md#common-subexpression-elimination) if the function is called multiple times in one query. Optional parameter.
-
-**Returned value**
-
--   Pseudo-random number.
-
-Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+Like `rand` but produces a constant column with a random value.
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT rand(), rand(1), rand(number), randConstant(), randConstant(1), randConstant(number)
 FROM numbers(3)
@@ -60,7 +46,7 @@ FROM numbers(3)
 
 Result:
 
-``` text
+``` result
 ┌─────rand()─┬────rand(1)─┬─rand(number)─┬─randConstant()─┬─randConstant(1)─┬─randConstant(number)─┐
 │ 3047369878 │ 4132449925 │   4044508545 │     2740811946 │      4229401477 │           1924032898 │
 │ 2938880146 │ 1267722397 │   4154983056 │     2740811946 │      4229401477 │           1924032898 │
@@ -68,17 +54,11 @@ Result:
 └────────────┴────────────┴──────────────┴────────────────┴─────────────────┴──────────────────────┘
 ```
 
-# Functions for Generating Random Numbers based on Distributions
-
-:::note    
-These functions are available starting from 22.10.
-:::
-
-
+# Functions for Generating Random Numbers based on a Distribution
 
 ## randUniform
 
-Return random number based on [continuous uniform distribution](https://en.wikipedia.org/wiki/Continuous_uniform_distribution) in a specified range from `min` to `max`.
+Returns a Float64 drawn uniformly from the interval between `min` and `max` ([continuous uniform distribution](https://en.wikipedia.org/wiki/Continuous_uniform_distribution)).
 
 **Syntax**
 
@@ -93,21 +73,19 @@ randUniform(min, max)
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randUniform(5.5, 10) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌─randUniform(5.5, 10)─┐
 │    8.094978491443102 │
 │   7.3181248914450885 │
@@ -117,40 +95,36 @@ Result:
 └──────────────────────┘
 ```
 
-
-
 ## randNormal
 
-Return random number based on [normal distribution](https://en.wikipedia.org/wiki/Normal_distribution).
+Returns a Float64 drawn from a [normal distribution](https://en.wikipedia.org/wiki/Normal_distribution).
 
 **Syntax**
 
 ``` sql
-randNormal(meam, variance)
+randNormal(mean, variance)
 ```
 
 **Arguments**
 
-- `meam` - `Float64` mean value of distribution,
+- `mean` - `Float64` - mean value of distribution,
 - `variance` - `Float64` - [variance](https://en.wikipedia.org/wiki/Variance).
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randNormal(10, 2) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌──randNormal(10, 2)─┐
 │ 13.389228911709653 │
 │  8.622949707401295 │
@@ -160,40 +134,36 @@ Result:
 └────────────────────┘
 ```
 
-
-
 ## randLogNormal
 
-Return random number based on [log-normal distribution](https://en.wikipedia.org/wiki/Log-normal_distribution).
+Returns a Float64 drawn from a [log-normal distribution](https://en.wikipedia.org/wiki/Log-normal_distribution).
 
 **Syntax**
 
 ``` sql
-randLogNormal(meam, variance)
+randLogNormal(mean, variance)
 ```
 
 **Arguments**
 
-- `meam` - `Float64` mean value of distribution,
+- `mean` - `Float64` - mean value of distribution,
 - `variance` - `Float64` - [variance](https://en.wikipedia.org/wiki/Variance).
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randLogNormal(100, 5) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌─randLogNormal(100, 5)─┐
 │  1.295699673937363e48 │
 │  9.719869109186684e39 │
@@ -203,11 +173,9 @@ Result:
 └───────────────────────┘
 ```
 
-
-
 ## randBinomial
 
-Return random number based on [binomial distribution](https://en.wikipedia.org/wiki/Binomial_distribution).
+Returns a UInt64 drawn from a [binomial distribution](https://en.wikipedia.org/wiki/Binomial_distribution).
 
 **Syntax**
 
@@ -217,26 +185,24 @@ randBinomial(experiments, probability)
 
 **Arguments**
 
-- `experiments` - `UInt64` number of experiments,
+- `experiments` - `UInt64` - number of experiments,
 - `probability` - `Float64` - probability of success in each experiment (values in `0...1` range only).
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randBinomial(100, .75) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌─randBinomial(100, 0.75)─┐
 │                      74 │
 │                      78 │
@@ -246,11 +212,9 @@ Result:
 └─────────────────────────┘
 ```
 
-
-
 ## randNegativeBinomial
 
-Return random number based on [negative binomial distribution](https://en.wikipedia.org/wiki/Negative_binomial_distribution).
+Returns a UInt64 drawn from a [negative binomial distribution](https://en.wikipedia.org/wiki/Negative_binomial_distribution).
 
 **Syntax**
 
@@ -260,26 +224,24 @@ randNegativeBinomial(experiments, probability)
 
 **Arguments**
 
-- `experiments` - `UInt64` number of experiments,
+- `experiments` - `UInt64` - number of experiments,
 - `probability` - `Float64` - probability of failure in each experiment (values in `0...1` range only).
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randNegativeBinomial(100, .75) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌─randNegativeBinomial(100, 0.75)─┐
 │                              33 │
 │                              32 │
@@ -289,11 +251,9 @@ Result:
 └─────────────────────────────────┘
 ```
 
-
-
 ## randPoisson
 
-Return random number based on [Poisson distribution](https://en.wikipedia.org/wiki/Poisson_distribution).
+Returns a UInt64 drawn from a [Poisson distribution](https://en.wikipedia.org/wiki/Poisson_distribution).
 
 **Syntax**
 
@@ -303,25 +263,23 @@ randPoisson(n)
 
 **Arguments**
 
-- `n` - `UInt64` mean number of occurrences.
+- `n` - `UInt64` - mean number of occurrences.
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randPoisson(10) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌─randPoisson(10)─┐
 │               8 │
 │               8 │
@@ -331,11 +289,9 @@ Result:
 └─────────────────┘
 ```
 
-
-
 ## randBernoulli
 
-Return random number based on [Bernoulli distribution](https://en.wikipedia.org/wiki/Bernoulli_distribution).
+Returns a UInt64 drawn from a [Bernoulli distribution](https://en.wikipedia.org/wiki/Bernoulli_distribution).
 
 **Syntax**
 
@@ -349,21 +305,19 @@ randBernoulli(probability)
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randBernoulli(.75) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌─randBernoulli(0.75)─┐
 │                   1 │
 │                   1 │
@@ -373,11 +327,9 @@ Result:
 └─────────────────────┘
 ```
 
-
-
 ## randExponential
 
-Return random number based on [exponential distribution](https://en.wikipedia.org/wiki/Exponential_distribution).
+Returns a Float64 drawn from a [exponential distribution](https://en.wikipedia.org/wiki/Exponential_distribution).
 
 **Syntax**
 
@@ -387,25 +339,23 @@ randExponential(lambda)
 
 **Arguments**
 
-- `lambda` - `Float64` lambda value.
+- `lambda` - `Float64` - lambda value.
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randExponential(1/10) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌─randExponential(divide(1, 10))─┐
 │              44.71628934340778 │
 │              4.211013337903262 │
@@ -415,11 +365,9 @@ Result:
 └────────────────────────────────┘
 ```
 
-
-
 ## randChiSquared
 
-Return random number based on [Chi-square distribution](https://en.wikipedia.org/wiki/Chi-squared_distribution) - a distribution of a sum of the squares of k independent standard normal random variables.
+Returns a Float64 drawn from a [Chi-square distribution](https://en.wikipedia.org/wiki/Chi-squared_distribution) - a distribution of a sum of the squares of k independent standard normal random variables.
 
 **Syntax**
 
@@ -429,25 +377,23 @@ randChiSquared(degree_of_freedom)
 
 **Arguments**
 
-- `degree_of_freedom` - `Float64` degree of freedom.
+- `degree_of_freedom` - `Float64` - degree of freedom.
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randChiSquared(10) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌─randChiSquared(10)─┐
 │ 10.015463656521543 │
 │  9.621799919882768 │
@@ -457,11 +403,9 @@ Result:
 └────────────────────┘
 ```
 
-
-
 ## randStudentT
 
-Return random number based on [Student's t-distribution](https://en.wikipedia.org/wiki/Student%27s_t-distribution).
+Returns a Float64 drawn from a [Student's t-distribution](https://en.wikipedia.org/wiki/Student%27s_t-distribution).
 
 **Syntax**
 
@@ -471,25 +415,23 @@ randStudentT(degree_of_freedom)
 
 **Arguments**
 
-- `degree_of_freedom` - `Float64` degree of freedom.
+- `degree_of_freedom` - `Float64` - degree of freedom.
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randStudentT(10) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌─────randStudentT(10)─┐
 │   1.2217309938538725 │
 │   1.7941971681200541 │
@@ -499,11 +441,9 @@ Result:
 └──────────────────────┘
 ```
 
-
-
 ## randFisherF
 
-Return random number based on [F-distribution](https://en.wikipedia.org/wiki/F-distribution).
+Returns a Float64 drawn from a [F-distribution](https://en.wikipedia.org/wiki/F-distribution).
 
 **Syntax**
 
@@ -513,26 +453,24 @@ randFisherF(d1, d2)
 
 **Arguments**
 
-- `d1` - `Float64` d1 degree of freedom in `X = (S1 / d1) / (S2 / d2)`,
-- `d2` - `Float64` d2 degree of freedom in `X = (S1 / d1) / (S2 / d2)`,
+- `d1` - `Float64` - d1 degree of freedom in `X = (S1 / d1) / (S2 / d2)`,
+- `d2` - `Float64` - d2 degree of freedom in `X = (S1 / d1) / (S2 / d2)`,
 
 **Returned value**
 
-- Pseudo-random number.
+- Random number.
 
 Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT randFisherF(10, 3) FROM numbers(5)
 ```
 
 Result:
 
-``` text
+``` result
 ┌──randFisherF(10, 3)─┐
 │   7.286287504216609 │
 │ 0.26590779413050386 │
@@ -542,35 +480,61 @@ Result:
 └─────────────────────┘
 ```
 
-
-
-
-# Random Functions for Working with Strings
+# Functions for Generating Random Strings
 
 ## randomString
 
+Returns a random String of specified `length`. Not all characters may be printable.
+
+**Syntax**
+
+```sql
+randomString(length)
+```
+
 ## randomFixedString
 
+Like `randomString` but returns a FixedString.
+
 ## randomPrintableASCII
 
+Returns a random String of specified `length`. All characters are printable.
+
+**Syntax**
+
+```sql
+randomPrintableASCII(length)
+```
+
 ## randomStringUTF8
 
+Returns a random String containing `length` many UTF8 codepoints. Not all characters may be printable
+
+**Syntax**
+
+```sql
+randomStringUTF8(length)
+```
+
 ## fuzzBits
 
 **Syntax**
 
-``` sql
-fuzzBits([s], [prob])
-```
+Inverts the bits of String or FixedString `s`, each with probability `prob`.
 
-Inverts bits of `s`, each with probability `prob`.
+**Syntax**
+
+``` sql
+fuzzBits(s, prob)
+```
 
 **Arguments**
 - `s` - `String` or `FixedString`
 - `prob` - constant `Float32/64`
 
 **Returned value**
-Fuzzed string with same as s type.
+
+Fuzzed string with same type as `s`.
 
 **Example**
 
@@ -581,13 +545,10 @@ FROM numbers(3)
 
 Result:
 
-``` text
+``` result
 ┌─fuzzBits(materialize('abacaba'), 0.1)─┐
 │ abaaaja                               │
 │ a*cjab+                               │
 │ aeca2A                                │
 └───────────────────────────────────────┘
 ```
-
-## Related content
-- Blog: [Generating random data in ClickHouse](https://clickhouse.com/blog/generating-random-test-distribution-data-for-clickhouse)
diff --git a/docs/en/sql-reference/functions/rounding-functions.md b/docs/en/sql-reference/functions/rounding-functions.md
index 01ee720cfd3..e9a0ed72466 100644
--- a/docs/en/sql-reference/functions/rounding-functions.md
+++ b/docs/en/sql-reference/functions/rounding-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/rounding-functions
-sidebar_position: 45
+sidebar_position: 155
 sidebar_label: Rounding
 ---
 
@@ -38,11 +38,11 @@ round(expression [, decimal_places])
 
 **Arguments**
 
--   `expression` — A number to be rounded. Can be any [expression](../../sql-reference/syntax.md#syntax-expressions) returning the numeric [data type](../../sql-reference/data-types/index.md#data_types).
--   `decimal-places` — An integer value.
-    -   If `decimal-places > 0` then the function rounds the value to the right of the decimal point.
-    -   If `decimal-places < 0` then the function rounds the value to the left of the decimal point.
-    -   If `decimal-places = 0` then the function rounds the value to integer. In this case the argument can be omitted.
+- `expression` — A number to be rounded. Can be any [expression](../../sql-reference/syntax.md#syntax-expressions) returning the numeric [data type](../../sql-reference/data-types/index.md#data_types).
+- `decimal-places` — An integer value.
+    - If `decimal-places > 0` then the function rounds the value to the right of the decimal point.
+    - If `decimal-places < 0` then the function rounds the value to the left of the decimal point.
+    - If `decimal-places = 0` then the function rounds the value to integer. In this case the argument can be omitted.
 
 **Returned value:**
 
@@ -101,27 +101,27 @@ round(3.65, 1) = 3.6
 
 **See Also**
 
--   [roundBankers](#roundbankers)
+- [roundBankers](#roundbankers)
 
 ## roundBankers
 
 Rounds a number to a specified decimal position.
 
--   If the rounding number is halfway between two numbers, the function uses banker’s rounding.
+- If the rounding number is halfway between two numbers, the function uses banker’s rounding.
 
         Banker's rounding is a method of rounding fractional numbers. When the rounding number is halfway between two numbers, it's rounded to the nearest even digit at the specified decimal position. For example: 3.5 rounds up to 4, 2.5 rounds down to 2.
 
         It's the default rounding method for floating point numbers defined in [IEEE 754](https://en.wikipedia.org/wiki/IEEE_754#Roundings_to_nearest). The [round](#rounding_functions-round) function performs the same rounding for floating point numbers. The `roundBankers` function also rounds integers the same way, for example, `roundBankers(45, -1) = 40`.
 
--   In other cases, the function rounds numbers to the nearest integer.
+- In other cases, the function rounds numbers to the nearest integer.
 
 Using banker’s rounding, you can reduce the effect that rounding numbers has on the results of summing or subtracting these numbers.
 
 For example, sum numbers 1.5, 2.5, 3.5, 4.5 with different rounding:
 
--   No rounding: 1.5 + 2.5 + 3.5 + 4.5 = 12.
--   Banker’s rounding: 2 + 2 + 4 + 4 = 12.
--   Rounding to the nearest integer: 2 + 3 + 4 + 5 = 14.
+- No rounding: 1.5 + 2.5 + 3.5 + 4.5 = 12.
+- Banker’s rounding: 2 + 2 + 4 + 4 = 12.
+- Rounding to the nearest integer: 2 + 3 + 4 + 5 = 14.
 
 **Syntax**
 
@@ -131,11 +131,11 @@ roundBankers(expression [, decimal_places])
 
 **Arguments**
 
--   `expression` — A number to be rounded. Can be any [expression](../../sql-reference/syntax.md#syntax-expressions) returning the numeric [data type](../../sql-reference/data-types/index.md#data_types).
--   `decimal-places` — Decimal places. An integer number.
-    -   `decimal-places > 0` — The function rounds the number to the given position right of the decimal point. Example: `roundBankers(3.55, 1) = 3.6`.
-    -   `decimal-places < 0` — The function rounds the number to the given position left of the decimal point. Example: `roundBankers(24.55, -1) = 20`.
-    -   `decimal-places = 0` — The function rounds the number to an integer. In this case the argument can be omitted. Example: `roundBankers(2.5) = 2`.
+- `expression` — A number to be rounded. Can be any [expression](../../sql-reference/syntax.md#syntax-expressions) returning the numeric [data type](../../sql-reference/data-types/index.md#data_types).
+- `decimal-places` — Decimal places. An integer number.
+    - `decimal-places > 0` — The function rounds the number to the given position right of the decimal point. Example: `roundBankers(3.55, 1) = 3.6`.
+    - `decimal-places < 0` — The function rounds the number to the given position left of the decimal point. Example: `roundBankers(24.55, -1) = 20`.
+    - `decimal-places = 0` — The function rounds the number to an integer. In this case the argument can be omitted. Example: `roundBankers(2.5) = 2`.
 
 **Returned value**
 
@@ -182,7 +182,7 @@ roundBankers(10.755, 2) = 10.76
 
 **See Also**
 
--   [round](#rounding_functions-round)
+- [round](#rounding_functions-round)
 
 ## roundToExp2(num)
 
@@ -194,7 +194,14 @@ Accepts a number. If the number is less than one, it returns 0. Otherwise, it ro
 
 ## roundAge(num)
 
-Accepts a number. If the number is less than 18, it returns 0. Otherwise, it rounds the number down to a number from the set: 18, 25, 35, 45, 55. 
+Accepts a number. If the number is
+- smaller than 1, it returns 0,
+- between 1 and 17, it returns 17,
+- between 18 and 24, it returns 18,
+- between 25 and 34, it returns 25,
+- between 35 and 44, it returns 35,
+- between 45 and 54, it returns 45,
+- larger than 55, it returns 55.
 
 ## roundDown(num, arr)
 
diff --git a/docs/en/sql-reference/functions/splitting-merging-functions.md b/docs/en/sql-reference/functions/splitting-merging-functions.md
index 6015bb79b87..7336e53fc24 100644
--- a/docs/en/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/en/sql-reference/functions/splitting-merging-functions.md
@@ -1,14 +1,14 @@
 ---
 slug: /en/sql-reference/functions/splitting-merging-functions
-sidebar_position: 47
-sidebar_label: Splitting and Merging Strings and Arrays
+sidebar_position: 165
+sidebar_label: Splitting Strings
 ---
 
-# Functions for Splitting and Merging Strings and Arrays
+# Functions for Splitting Strings
 
-## splitByChar(separator, s[, max_substrings])
+## splitByChar
 
-Splits a string into substrings separated by a specified character. It uses a constant string `separator` which consists of exactly one character.
+Splits a string into substrings separated by a specified character. Uses a constant string `separator` which consists of exactly one character.
 Returns an array of selected substrings. Empty substrings may be selected if the separator occurs at the beginning or end of the string, or if there are multiple consecutive separators.
 
 **Syntax**
@@ -19,17 +19,17 @@ splitByChar(separator, s[, max_substrings]))
 
 **Arguments**
 
--   `separator` — The separator which should contain exactly one character. [String](../../sql-reference/data-types/string.md).
--   `s` — The string to split. [String](../../sql-reference/data-types/string.md).
--   `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
+- `separator` — The separator which should contain exactly one character. [String](../../sql-reference/data-types/string.md).
+- `s` — The string to split. [String](../../sql-reference/data-types/string.md).
+- `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
 
 **Returned value(s)**
 
 Returns an array of selected substrings. Empty substrings may be selected when:
 
--   A separator occurs at the beginning or end of the string;
--   There are multiple consecutive separators;
--   The original string `s` is empty.
+- A separator occurs at the beginning or end of the string;
+- There are multiple consecutive separators;
+- The original string `s` is empty.
 
 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
@@ -39,13 +39,15 @@ Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-refere
 SELECT splitByChar(',', '1,2,3,abcde');
 ```
 
+Result:
+
 ``` text
 ┌─splitByChar(',', '1,2,3,abcde')─┐
 │ ['1','2','3','abcde']           │
 └─────────────────────────────────┘
 ```
 
-## splitByString(separator, s[, max_substrings])
+## splitByString
 
 Splits a string into substrings separated by a string. It uses a constant string `separator` of multiple characters as the separator. If the string `separator` is empty, it will split the string `s` into an array of single characters.
 
@@ -57,9 +59,9 @@ splitByString(separator, s[, max_substrings]))
 
 **Arguments**
 
--   `separator` — The separator. [String](../../sql-reference/data-types/string.md).
--   `s` — The string to split. [String](../../sql-reference/data-types/string.md).
--   `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
+- `separator` — The separator. [String](../../sql-reference/data-types/string.md).
+- `s` — The string to split. [String](../../sql-reference/data-types/string.md).
+- `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
 
 
 **Returned value(s)**
@@ -68,9 +70,9 @@ Returns an array of selected substrings. Empty substrings may be selected when:
 
 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
--   A non-empty separator occurs at the beginning or end of the string;
--   There are multiple consecutive non-empty separators;
--   The original string `s` is empty while the separator is not empty.
+- A non-empty separator occurs at the beginning or end of the string;
+- There are multiple consecutive non-empty separators;
+- The original string `s` is empty while the separator is not empty.
 
 **Example**
 
@@ -78,6 +80,8 @@ Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-refere
 SELECT splitByString(', ', '1, 2 3, 4,5, abcde');
 ```
 
+Result:
+
 ``` text
 ┌─splitByString(', ', '1, 2 3, 4,5, abcde')─┐
 │ ['1','2 3','4,5','abcde']                 │
@@ -88,13 +92,15 @@ SELECT splitByString(', ', '1, 2 3, 4,5, abcde');
 SELECT splitByString('', 'abcde');
 ```
 
+Result:
+
 ``` text
 ┌─splitByString('', 'abcde')─┐
 │ ['a','b','c','d','e']      │
 └────────────────────────────┘
 ```
 
-## splitByRegexp(regexp, s[, max_substrings])
+## splitByRegexp
 
 Splits a string into substrings separated by a regular expression. It uses a regular expression string `regexp` as the separator. If the `regexp` is empty, it will split the string `s` into an array of single characters. If no match is found for this regular expression, the string `s` won't be split.
 
@@ -106,25 +112,23 @@ splitByRegexp(regexp, s[, max_substrings]))
 
 **Arguments**
 
--   `regexp` — Regular expression. Constant. [String](../data-types/string.md) or [FixedString](../data-types/fixedstring.md).
--   `s` — The string to split. [String](../../sql-reference/data-types/string.md).
--   `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
+- `regexp` — Regular expression. Constant. [String](../data-types/string.md) or [FixedString](../data-types/fixedstring.md).
+- `s` — The string to split. [String](../../sql-reference/data-types/string.md).
+- `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
 
 
 **Returned value(s)**
 
 Returns an array of selected substrings. Empty substrings may be selected when:
 
--   A non-empty regular expression match occurs at the beginning or end of the string;
--   There are multiple consecutive non-empty regular expression matches;
--   The original string `s` is empty while the regular expression is not empty.
+- A non-empty regular expression match occurs at the beginning or end of the string;
+- There are multiple consecutive non-empty regular expression matches;
+- The original string `s` is empty while the regular expression is not empty.
 
 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT splitByRegexp('\\d+', 'a12bc23de345f');
 ```
@@ -137,8 +141,6 @@ Result:
 └────────────────────────────────────────┘
 ```
 
-Query:
-
 ``` sql
 SELECT splitByRegexp('', 'abcde');
 ```
@@ -151,7 +153,7 @@ Result:
 └────────────────────────────┘
 ```
 
-## splitByWhitespace(s[, max_substrings])
+## splitByWhitespace
 
 Splits a string into substrings separated by whitespace characters. 
 Returns an array of selected substrings.
@@ -164,8 +166,8 @@ splitByWhitespace(s[, max_substrings]))
 
 **Arguments**
 
--   `s` — The string to split. [String](../../sql-reference/data-types/string.md).
--   `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
+- `s` — The string to split. [String](../../sql-reference/data-types/string.md).
+- `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
 
 
 **Returned value(s)**
@@ -180,13 +182,15 @@ Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-refere
 SELECT splitByWhitespace('  1!  a,  b.  ');
 ```
 
+Result:
+
 ``` text
 ┌─splitByWhitespace('  1!  a,  b.  ')─┐
 │ ['1!','a,','b.']                    │
 └─────────────────────────────────────┘
 ```
 
-## splitByNonAlpha(s[, max_substrings])
+## splitByNonAlpha
 
 Splits a string into substrings separated by whitespace and punctuation characters. 
 Returns an array of selected substrings.
@@ -199,8 +203,8 @@ splitByNonAlpha(s[, max_substrings]))
 
 **Arguments**
 
--   `s` — The string to split. [String](../../sql-reference/data-types/string.md).
--   `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
+- `s` — The string to split. [String](../../sql-reference/data-types/string.md).
+- `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
 
 
 **Returned value(s)**
@@ -221,23 +225,32 @@ SELECT splitByNonAlpha('  1!  a,  b.  ');
 └───────────────────────────────────┘
 ```
 
-## arrayStringConcat(arr\[, separator\])
+## arrayStringConcat
 
 Concatenates string representations of values listed in the array with the separator. `separator` is an optional parameter: a constant string, set to an empty string by default.
 Returns the string.
 
+**Syntax**
+
+```sql
+arrayStringConcat(arr\[, separator\])
+```
+
 **Example**
 
 ``` sql
 SELECT arrayStringConcat(['12/05/2021', '12:50:00'], ' ') AS DateString;
 ```
+
+Result:
+
 ```text
 ┌─DateString──────────┐
 │ 12/05/2021 12:50:00 │
 └─────────────────────┘
 ```
 
-## alphaTokens(s[, max_substrings]), splitByAlpha(s[, max_substrings])
+## alphaTokens
 
 Selects substrings of consecutive bytes from the ranges a-z and A-Z.Returns an array of substrings.
 
@@ -245,13 +258,14 @@ Selects substrings of consecutive bytes from the ranges a-z and A-Z.Returns an a
 
 ``` sql
 alphaTokens(s[, max_substrings]))
-splitByAlpha(s[, max_substrings])
 ```
 
+Alias: `splitByAlpha`
+
 **Arguments**
 
--   `s` — The string to split. [String](../../sql-reference/data-types/string.md).
--   `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
+- `s` — The string to split. [String](../../sql-reference/data-types/string.md).
+- `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.
 
 **Returned value(s)**
 
@@ -271,7 +285,7 @@ SELECT alphaTokens('abca1abc');
 └─────────────────────────┘
 ```
 
-## extractAllGroups(text, regexp)
+## extractAllGroups
 
 Extracts all groups from non-overlapping substrings matched by a regular expression.
 
@@ -283,21 +297,19 @@ extractAllGroups(text, regexp)
 
 **Arguments**
 
--   `text` — [String](../data-types/string.md) or [FixedString](../data-types/fixedstring.md).
--   `regexp` — Regular expression. Constant. [String](../data-types/string.md) or [FixedString](../data-types/fixedstring.md).
+- `text` — [String](../data-types/string.md) or [FixedString](../data-types/fixedstring.md).
+- `regexp` — Regular expression. Constant. [String](../data-types/string.md) or [FixedString](../data-types/fixedstring.md).
 
 **Returned values**
 
--   If the function finds at least one matching group, it returns `Array(Array(String))` column, clustered by group_id (1 to N, where N is number of capturing groups in `regexp`).
+- If the function finds at least one matching group, it returns `Array(Array(String))` column, clustered by group_id (1 to N, where N is number of capturing groups in `regexp`).
 
--   If there is no matching group, returns an empty array.
+- If there is no matching group, returns an empty array.
 
 Type: [Array](../data-types/array.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT extractAllGroups('abc=123, 8="hkl"', '("[^"]+"|\\w+)=("[^"]+"|\\w+)');
 ```
@@ -312,7 +324,7 @@ Result:
 
 ## ngrams
 
-Splits the UTF-8 string into n-grams of `ngramsize` symbols.
+Splits a UTF-8 string into n-grams of `ngramsize` symbols.
 
 **Syntax** 
 
@@ -322,19 +334,17 @@ ngrams(string, ngramsize)
 
 **Arguments**
 
--   `string` — String. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
--   `ngramsize` — The size of an n-gram. [UInt](../../sql-reference/data-types/int-uint.md).
+- `string` — String. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+- `ngramsize` — The size of an n-gram. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   Array with n-grams.
+- Array with n-grams.
 
 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT ngrams('ClickHouse', 3);
 ```
@@ -353,18 +363,16 @@ Splits a string into tokens using non-alphanumeric ASCII characters as separator
 
 **Arguments**
 
--   `input_string` — Any set of bytes represented as the [String](../../sql-reference/data-types/string.md) data type object.
+- `input_string` — Any set of bytes represented as the [String](../../sql-reference/data-types/string.md) data type object.
 
 **Returned value**
 
--   The resulting array of tokens from input string.
+- The resulting array of tokens from input string.
 
 Type: [Array](../data-types/array.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT tokens('test1,;\\ test2,;\\ test3,;\\   test4') AS tokens;
 ```
diff --git a/docs/en/sql-reference/functions/string-functions.md b/docs/en/sql-reference/functions/string-functions.md
index 845be6e04c7..8662d08431c 100644
--- a/docs/en/sql-reference/functions/string-functions.md
+++ b/docs/en/sql-reference/functions/string-functions.md
@@ -1,50 +1,46 @@
 ---
 slug: /en/sql-reference/functions/string-functions
-sidebar_position: 40
+sidebar_position: 170
 sidebar_label: Strings
 ---
 
 # Functions for Working with Strings
 
-:::note    
-Functions for [searching](../../sql-reference/functions/string-search-functions.md) and [replacing](../../sql-reference/functions/string-replace-functions.md) in strings are described separately.
-:::
+Functions for [searching](string-search-functions.md) in strings and for [replacing](string-replace-functions.md) in strings are described separately.
 
 ## empty
 
 Checks whether the input string is empty.
 
+A string is considered non-empty if it contains at least one byte, even if this byte is a space or the null byte.
+
+The function is also available for [arrays](array-functions.md#function-empty) and [UUIDs](uuid-functions.md#empty).
+
 **Syntax**
 
 ``` sql
 empty(x)
 ```
 
-A string is considered non-empty if it contains at least one byte, even if this is a space or a null byte.
-
-The function also works for [arrays](array-functions.md#function-empty) or [UUID](uuid-functions.md#empty).
-
 **Arguments**
 
--   `x` — Input value. [String](../data-types/string.md).
+- `x` — Input value. [String](../data-types/string.md).
 
 **Returned value**
 
--   Returns `1` for an empty string or `0` for a non-empty string.
+- Returns `1` for an empty string or `0` for a non-empty string.
 
 Type: [UInt8](../data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ```sql
 SELECT empty('');
 ```
 
 Result:
 
-```text
+```result
 ┌─empty('')─┐
 │         1 │
 └───────────┘
@@ -54,37 +50,35 @@ Result:
 
 Checks whether the input string is non-empty.
 
+A string is considered non-empty if it contains at least one byte, even if this byte is a space or the null byte.
+
+The function is also available for [arrays](array-functions.md#function-notempty) and [UUIDs](uuid-functions.md#notempty).
+
 **Syntax**
 
 ``` sql
 notEmpty(x)
 ```
 
-A string is considered non-empty if it contains at least one byte, even if this is a space or a null byte.
-
-The function also works for [arrays](array-functions.md#function-notempty) or [UUID](uuid-functions.md#notempty).
-
 **Arguments**
 
--   `x` — Input value. [String](../data-types/string.md).
+- `x` — Input value. [String](../data-types/string.md).
 
 **Returned value**
 
--   Returns `1` for a non-empty string or `0` for an empty string string.
+- Returns `1` for a non-empty string or `0` for an empty string string.
 
 Type: [UInt8](../data-types/int-uint.md).
 
 **Example**
 
-Query:
-
 ```sql
 SELECT notEmpty('text');
 ```
 
 Result:
 
-```text
+```result
 ┌─notEmpty('text')─┐
 │                1 │
 └──────────────────┘
@@ -92,58 +86,51 @@ Result:
 
 ## length
 
-Returns the length of a string in bytes (not in characters, and not in code points).
-The result type is UInt64.
+Returns the length of a string in bytes (not: in characters or Unicode code points).
+
 The function also works for arrays.
 
 ## lengthUTF8
 
-Returns the length of a string in Unicode code points (not in characters), assuming that the string contains a set of bytes that make up UTF-8 encoded text. If this assumption is not met, it returns some result (it does not throw an exception).
-The result type is UInt64.
+Returns the length of a string in Unicode code points (not: in bytes or characters). It assumes that the string contains valid UTF-8 encoded text. If this assumption is violated, no exception is thrown and the result is undefined.
 
-## char_length, CHAR_LENGTH
-
-Returns the length of a string in Unicode code points (not in characters), assuming that the string contains a set of bytes that make up UTF-8 encoded text. If this assumption is not met, it returns some result (it does not throw an exception).
-The result type is UInt64.
-
-## character_length, CHARACTER_LENGTH
-
-Returns the length of a string in Unicode code points (not in characters), assuming that the string contains a set of bytes that make up UTF-8 encoded text. If this assumption is not met, it returns some result (it does not throw an exception).
-The result type is UInt64.
+Alias:
+- `CHAR_LENGTH``
+- `CHARACTER_LENGTH`
 
 ## leftPad
 
-Pads the current string from the left with spaces or a specified string (multiple times, if needed) until the resulting string reaches the given length. Similarly to the MySQL `LPAD` function.
+Pads a string from the left with spaces or with a specified string (multiple times, if needed) until the resulting string reaches the specified `length`.
 
 **Syntax**
 
 ``` sql
-leftPad('string', 'length'[, 'pad_string'])
+leftPad(string, length[, pad_string])
 ```
 
+Alias: `LPAD`
+
 **Arguments**
 
--   `string` — Input string that needs to be padded. [String](../data-types/string.md).
--   `length` — The length of the resulting string. [UInt or Int](../data-types/int-uint.md). If the value is less than the input string length, then the input string is shortened to `length` characters.
--   `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
+- `string` — Input string that should be padded. [String](../data-types/string.md).
+- `length` — The length of the resulting string. [UInt or Int](../data-types/int-uint.md). If the value is smaller than the input string length, then the input string is shortened to `length` characters.
+- `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
 
 **Returned value**
 
--   The resulting string of the given length.
+- A left-padded string of the given length.
 
 Type: [String](../data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT leftPad('abc', 7, '*'), leftPad('def', 7);
 ```
 
 Result:
 
-``` text
+```result
 ┌─leftPad('abc', 7, '*')─┬─leftPad('def', 7)─┐
 │ ****abc                │     def           │
 └────────────────────────┴───────────────────┘
@@ -151,37 +138,35 @@ Result:
 
 ## leftPadUTF8
 
-Pads the current string from the left with spaces or a specified string (multiple times, if needed) until the resulting string reaches the given length. Similarly to the MySQL `LPAD` function. While in the [leftPad](#leftpad) function the length is measured in bytes, here in the `leftPadUTF8` function it is measured in code points.
+Pads the string from the left with spaces or a specified string (multiple times, if needed) until the resulting string reaches the given length. Unlike [leftPad](#leftpad) which measures the string length in bytes, the string length is measured in code points.
 
 **Syntax**
 
 ``` sql
-leftPadUTF8('string','length'[, 'pad_string'])
+leftPadUTF8(string, length[, pad_string])
 ```
 
 **Arguments**
 
--   `string` — Input string that needs to be padded. [String](../data-types/string.md).
--   `length` — The length of the resulting string. [UInt or Int](../data-types/int-uint.md). If the value is less than the input string length, then the input string is shortened to `length` characters.
--   `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
+- `string` — Input string that should be padded. [String](../data-types/string.md).
+- `length` — The length of the resulting string. [UInt or Int](../data-types/int-uint.md). If the value is smaller than the input string length, then the input string is shortened to `length` characters.
+- `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
 
 **Returned value**
 
--   The resulting string of the given length.
+- A left-padded string of the given length.
 
 Type: [String](../data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT leftPadUTF8('абвг', 7, '*'), leftPadUTF8('дежз', 7);
 ```
 
 Result:
 
-``` text
+```result
 ┌─leftPadUTF8('абвг', 7, '*')─┬─leftPadUTF8('дежз', 7)─┐
 │ ***абвг                     │    дежз                │
 └─────────────────────────────┴────────────────────────┘
@@ -189,37 +174,37 @@ Result:
 
 ## rightPad
 
-Pads the current string from the right with spaces or a specified string (multiple times, if needed) until the resulting string reaches the given length. Similarly to the MySQL `RPAD` function.
+Pads a string from the right with spaces or with a specified string (multiple times, if needed) until the resulting string reaches the specified `length`.
 
 **Syntax**
 
 ``` sql
-rightPad('string', 'length'[, 'pad_string'])
+rightPad(string, length[, pad_string])
 ```
 
+Alias: `RPAD`
+
 **Arguments**
 
--   `string` — Input string that needs to be padded. [String](../data-types/string.md).
--   `length` — The length of the resulting string. [UInt or Int](../data-types/int-uint.md). If the value is less than the input string length, then the input string is shortened to `length` characters.
--   `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
+- `string` — Input string that should be padded. [String](../data-types/string.md).
+- `length` — The length of the resulting string. [UInt or Int](../data-types/int-uint.md). If the value is smaller than the input string length, then the input string is shortened to `length` characters.
+- `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
 
 **Returned value**
 
--   The resulting string of the given length.
+- A left-padded string of the given length.
 
 Type: [String](../data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT rightPad('abc', 7, '*'), rightPad('abc', 7);
 ```
 
 Result:
 
-``` text
+```result
 ┌─rightPad('abc', 7, '*')─┬─rightPad('abc', 7)─┐
 │ abc****                 │ abc                │
 └─────────────────────────┴────────────────────┘
@@ -227,81 +212,89 @@ Result:
 
 ## rightPadUTF8
 
-Pads the current string from the right with spaces or a specified string (multiple times, if needed) until the resulting string reaches the given length. Similarly to the MySQL `RPAD` function. While in the [rightPad](#rightpad) function the length is measured in bytes, here in the `rightPadUTF8` function it is measured in code points.
+Pads the string from the right with spaces or a specified string (multiple times, if needed) until the resulting string reaches the given length. Unlike [rightPad](#rightpad) which measures the string length in bytes, the string length is measured in code points.
 
 **Syntax**
 
 ``` sql
-rightPadUTF8('string','length'[, 'pad_string'])
+rightPadUTF8(string, length[, pad_string])
 ```
 
 **Arguments**
 
--   `string` — Input string that needs to be padded. [String](../data-types/string.md).
--   `length` — The length of the resulting string. [UInt or Int](../data-types/int-uint.md). If the value is less than the input string length, then the input string is shortened to `length` characters.
--   `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
+- `string` — Input string that should be padded. [String](../data-types/string.md).
+- `length` — The length of the resulting string. [UInt or Int](../data-types/int-uint.md). If the value is smaller than the input string length, then the input string is shortened to `length` characters.
+- `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
 
 **Returned value**
 
--   The resulting string of the given length.
+- A right-padded string of the given length.
 
 Type: [String](../data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT rightPadUTF8('абвг', 7, '*'), rightPadUTF8('абвг', 7);
 ```
 
 Result:
 
-``` text
+```result
 ┌─rightPadUTF8('абвг', 7, '*')─┬─rightPadUTF8('абвг', 7)─┐
 │ абвг***                      │ абвг                    │
 └──────────────────────────────┴─────────────────────────┘
 ```
 
-## lower, lcase
+## lower
 
-Converts ASCII Latin symbols in a string to lowercase.
+Converts the ASCII Latin symbols in a string to lowercase.
 
-## upper, ucase
+Alias: `lcase`
 
-Converts ASCII Latin symbols in a string to uppercase.
+## upper
+
+Converts the ASCII Latin symbols in a string to uppercase.
+
+Alias: `ucase`
 
 ## lowerUTF8
 
-Converts a string to lowercase, assuming the string contains a set of bytes that make up a UTF-8 encoded text.
-It does not detect the language. E.g. for Turkish the result might not be exactly correct (i/İ vs. i/I).
+Converts a string to lowercase, assuming that the string contains valid UTF-8 encoded text. If this assumption is violated, no exception is thrown and the result is undefined.
+
+Does not detect the language, e.g. for Turkish the result might not be exactly correct (i/İ vs. i/I).
+
 If the length of the UTF-8 byte sequence is different for upper and lower case of a code point, the result may be incorrect for this code point.
-If the string contains a sequence of bytes that are not valid UTF-8, then the behavior is undefined.
 
 ## upperUTF8
 
-Converts a string to uppercase, assuming the string contains a set of bytes that make up a UTF-8 encoded text.
-It does not detect the language. E.g. for Turkish the result might not be exactly correct (i/İ vs. i/I).
+Converts a string to uppercase, assuming that the string contains valid UTF-8 encoded text. If this assumption is violated, no exception is thrown and the result is undefined.
+
+Does not detect the language, e.g. for Turkish the result might not be exactly correct (i/İ vs. i/I).
+
 If the length of the UTF-8 byte sequence is different for upper and lower case of a code point, the result may be incorrect for this code point.
-If the string contains a sequence of bytes that are not valid UTF-8, then the behavior is undefined.
 
 ## isValidUTF8
 
-Returns 1, if the set of bytes is valid UTF-8 encoded, otherwise 0.
+Returns 1, if the set of bytes constitutes valid UTF-8-encoded text, otherwise 0.
 
 ## toValidUTF8
 
 Replaces invalid UTF-8 characters by the `�` (U+FFFD) character. All running in a row invalid characters are collapsed into the one replacement character.
 
+**Syntax**
+
 ``` sql
 toValidUTF8(input_string)
 ```
 
 **Arguments**
 
--   `input_string` — Any set of bytes represented as the [String](../../sql-reference/data-types/string.md) data type object.
+- `input_string` — Any set of bytes represented as the [String](../../sql-reference/data-types/string.md) data type object.
 
-Returned value: Valid UTF-8 string.
+**Returned value**
+
+- A valid UTF-8 string.
 
 **Example**
 
@@ -309,7 +302,7 @@ Returned value: Valid UTF-8 string.
 SELECT toValidUTF8('\x61\xF0\x80\x80\x80b');
 ```
 
-``` text
+```result
 ┌─toValidUTF8('a����b')─┐
 │ a�b                   │
 └───────────────────────┘
@@ -317,9 +310,7 @@ SELECT toValidUTF8('\x61\xF0\x80\x80\x80b');
 
 ## repeat
 
-Repeats a string as many times as specified and concatenates the replicated values as a single string.
-
-Alias: `REPEAT`.
+Concatenates a string as many times with itself as specified.
 
 **Syntax**
 
@@ -327,14 +318,52 @@ Alias: `REPEAT`.
 repeat(s, n)
 ```
 
+Alias: `REPEAT`
+
 **Arguments**
 
--   `s` — The string to repeat. [String](../../sql-reference/data-types/string.md).
--   `n` — The number of times to repeat the string. [UInt](../../sql-reference/data-types/int-uint.md).
+- `s` — The string to repeat. [String](../../sql-reference/data-types/string.md).
+- `n` — The number of times to repeat the string. [UInt* or Int*](../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
-The single string, which contains the string `s` repeated `n` times. If `n` \< 1, the function returns empty string.
+A string containing string `s` repeated `n` times. If `n` <= 0, the function returns the empty string.
+
+Type: `String`.
+
+**Example**
+
+``` sql
+SELECT repeat('abc', 10);
+```
+
+Result:
+
+```result
+┌─repeat('abc', 10)──────────────┐
+│ abcabcabcabcabcabcabcabcabcabc │
+└────────────────────────────────┘
+```
+
+## space
+
+Concatenates a space (` `) as many times with itself as specified.
+
+**Syntax**
+
+``` sql
+space(n)
+```
+
+Alias: `SPACE`.
+
+**Arguments**
+
+- `n` — The number of times to repeat the space. [UInt* or Int*](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+The string containing string ` ` repeated `n` times. If `n` <= 0, the function returns the empty string.
 
 Type: `String`.
 
@@ -343,44 +372,54 @@ Type: `String`.
 Query:
 
 ``` sql
-SELECT repeat('abc', 10);
+SELECT space(3);
 ```
 
 Result:
 
 ``` text
-┌─repeat('abc', 10)──────────────┐
-│ abcabcabcabcabcabcabcabcabcabc │
-└────────────────────────────────┘
+┌─space(3) ────┐
+│              │
+└──────────────┘
 ```
 
 ## reverse
 
-Reverses the string (as a sequence of bytes).
+Reverses the sequence of bytes in a string.
 
 ## reverseUTF8
 
-Reverses a sequence of Unicode code points, assuming that the string contains a set of bytes representing a UTF-8 text. Otherwise, it does something else (it does not throw an exception).
+Reverses a sequence of Unicode code points in a string. Assumes that the string contains valid UTF-8 encoded text. If this assumption is violated, no exception is thrown and the result is undefined.
 
-## format(pattern, s0, s1, …)
+## format
 
-Formatting constant pattern with the string listed in the arguments. `pattern` is a simplified Python format pattern. Format string contains “replacement fields” surrounded by curly braces `{}`. Anything that is not contained in braces is considered literal text, which is copied unchanged to the output. If you need to include a brace character in the literal text, it can be escaped by doubling: `{{ '{{' }}` and `{{ '}}' }}`. Field names can be numbers (starting from zero) or empty (then they are treated as consequence numbers).
+Format the `pattern` string with the strings listed in the arguments, similar to formatting in Python. The pattern string can contain replacement fields surrounded by curly braces `{}`. Anything not contained in braces is considered literal text and copied verbatim into the output. Literal brace character can be escaped by two braces: `{{ '{{' }}` and `{{ '}}' }}`. Field names can be numbers (starting from zero) or empty (then they are implicitely given monotonically increasing numbers).
+
+**Syntax**
+
+```sql
+format(pattern, s0, s1, …)
+```
+
+**Example**
 
 ``` sql
 SELECT format('{1} {0} {1}', 'World', 'Hello')
 ```
 
-``` text
+```result
 ┌─format('{1} {0} {1}', 'World', 'Hello')─┐
 │ Hello World Hello                       │
 └─────────────────────────────────────────┘
 ```
 
+With implicit numbers:
+
 ``` sql
 SELECT format('{} {}', 'Hello', 'World')
 ```
 
-``` text
+```result
 ┌─format('{} {}', 'Hello', 'World')─┐
 │ Hello World                       │
 └───────────────────────────────────┘
@@ -388,7 +427,7 @@ SELECT format('{} {}', 'Hello', 'World')
 
 ## concat
 
-Concatenates the strings listed in the arguments, without a separator.
+Concatenates the strings listed in the arguments without separator.
 
 **Syntax**
 
@@ -402,21 +441,19 @@ Values of type String or FixedString.
 
 **Returned values**
 
-Returns the String that results from concatenating the arguments.
+The String created by concatenating the arguments.
 
-If any of argument values is `NULL`, `concat` returns `NULL`.
+If any of arguments is `NULL`, the function returns `NULL`.
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT concat('Hello, ', 'World!');
 ```
 
 Result:
 
-``` text
+```result
 ┌─concat('Hello, ', 'World!')─┐
 │ Hello, World!               │
 └─────────────────────────────┘
@@ -424,9 +461,9 @@ Result:
 
 ## concatAssumeInjective
 
-Same as [concat](#concat), the difference is that you need to ensure that `concat(s1, s2, ...) → sn` is injective, it will be used for optimization of GROUP BY.
+Like [concat](#concat) but assumes that `concat(s1, s2, ...) → sn` is injective. Can be used for optimization of GROUP BY.
 
-The function is named “injective” if it always returns different result for different values of arguments. In other words: different arguments never yield identical result.
+A function is called injective if it returns for different arguments different results. In other words: different arguments never produce identical result.
 
 **Syntax**
 
@@ -440,9 +477,9 @@ Values of type String or FixedString.
 
 **Returned values**
 
-Returns the String that results from concatenating the arguments.
+The String created by concatenating the arguments.
 
-If any of argument values is `NULL`, `concatAssumeInjective` returns `NULL`.
+If any of argument values is `NULL`, the function returns `NULL`.
 
 **Example**
 
@@ -454,7 +491,7 @@ INSERT INTO key_val VALUES ('Hello, ','World',1), ('Hello, ','World',2), ('Hello
 SELECT * from key_val;
 ```
 
-``` text
+```result
 ┌─key1────┬─key2─────┬─value─┐
 │ Hello,  │ World    │     1 │
 │ Hello,  │ World    │     2 │
@@ -463,15 +500,13 @@ SELECT * from key_val;
 └─────────┴──────────┴───────┘
 ```
 
-Query:
-
 ``` sql
 SELECT concat(key1, key2), sum(value) FROM key_val GROUP BY concatAssumeInjective(key1, key2);
 ```
 
 Result:
 
-``` text
+```result
 ┌─concat(key1, key2)─┬─sum(value)─┐
 │ Hello, World!      │          3 │
 │ Hello, World!      │          2 │
@@ -479,25 +514,88 @@ Result:
 └────────────────────┴────────────┘
 ```
 
-## substring(s, offset, length), mid(s, offset, length), substr(s, offset, length)
+## concatWithSeparator
 
-Returns a substring starting with the byte from the ‘offset’ index that is ‘length’ bytes long. Character indexing starts from one (as in standard SQL).
+Concatenates the given strings with a given separator.
 
-## substringUTF8(s, offset, length)
+**Syntax**
 
-The same as ‘substring’, but for Unicode code points. Works under the assumption that the string contains a set of bytes representing a UTF-8 encoded text. If this assumption is not met, it returns some result (it does not throw an exception).
+``` sql
+concatWithSeparator(sep, expr1, expr2, expr3...)
+```
 
-## appendTrailingCharIfAbsent(s, c)
+**Arguments**
 
-If the ‘s’ string is non-empty and does not contain the ‘c’ character at the end, it appends the ‘c’ character to the end.
+- sep — separator. Const [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+- exprN — expression to be concatenated. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
 
-## convertCharset(s, from, to)
+**Returned values**
 
-Returns the string ‘s’ that was converted from the encoding in ‘from’ to the encoding in ‘to’.
+The String created by concatenating the arguments.
 
-## base58Encode(plaintext)
+If any of the argument values is `NULL`, the function returns `NULL`.
 
-Accepts a String and encodes it using [Base58](https://tools.ietf.org/id/draft-msporny-base58-01.html) encoding scheme using "Bitcoin" alphabet.
+**Example**
+
+``` sql
+SELECT concatWithSeparator('a', '1', '2', '3', '4')
+```
+
+Result:
+
+```result
+┌─concatWithSeparator('a', '1', '2', '3', '4')─┐
+│ 1a2a3a4                           │
+└───────────────────────────────────┘
+```
+
+## concatWithSeparatorAssumeInjective
+
+Like `concatWithSeparator` but assumes that `concatWithSeparator(sep, expr1, expr2, expr3...) → result` is injective. Can be used for optimization of GROUP BY.
+
+A function is called injective if it returns for different arguments different results. In other words: different arguments never produce identical result.
+
+## substring(s, offset, length)
+
+Returns a substring with `length` many bytes, starting at the byte at index `offset`. Character indexing starts from 1.
+
+**Syntax**
+
+```sql
+substring(s, offset, length)
+```
+
+Alias:
+- `substr`
+- `mid`
+
+## substringUTF8
+
+Like `substring` but for Unicode code points. Assumes that the string contains valid UTF-8 encoded text. If this assumption is violated, no exception is thrown and the result is undefined.
+
+## appendTrailingCharIfAbsent
+
+Appends character `c` to string `s` if `s` is non-empty and does not end with character `c`.
+
+**Syntax**
+
+```sql
+appendTrailingCharIfAbsent(s, c)
+```
+
+## convertCharset
+
+Returns string `s` converted from the encoding `from` to encoding `to`.
+
+**Syntax**
+
+```sql
+convertCharset(s, from, to)
+```
+
+## base58Encode
+
+Encodes a String using [Base58](https://tools.ietf.org/id/draft-msporny-base58-01.html) in the "Bitcoin" alphabet.
 
 **Syntax**
 
@@ -511,117 +609,107 @@ base58Encode(plaintext)
 
 **Returned value**
 
--   A string containing encoded value of 1st argument.
+- A string containing the encoded value of the argument.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT base58Encode('Encoded');
 ```
 
 Result:
-```text
+
+```result
 ┌─base58Encode('Encoded')─┐
 │ 3dc8KtHrwM              │
 └─────────────────────────┘
 ```
 
-## base58Decode(encoded_text)
+## base58Decode
 
 Accepts a String and decodes it using [Base58](https://tools.ietf.org/id/draft-msporny-base58-01.html) encoding scheme using "Bitcoin" alphabet.
 
 **Syntax**
 
 ```sql
-base58Decode(encoded_text)
+base58Decode(encoded)
 ```
 
 **Arguments**
 
-- `encoded_text` — [String](../../sql-reference/data-types/string.md) column or constant. If the string is not a valid base58-encoded value, an exception is thrown.
+- `encoded` — [String](../../sql-reference/data-types/string.md) column or constant. If the string is not a valid Base58-encoded value, an exception is thrown.
 
 **Returned value**
 
--   A string containing decoded value of 1st argument.
+- A string containing the decoded value of the argument.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT base58Decode('3dc8KtHrwM');
 ```
 
 Result:
-```text
+
+```result
 ┌─base58Decode('3dc8KtHrwM')─┐
 │ Encoded                    │
 └────────────────────────────┘
 ```
 
-## tryBase58Decode(s)
+## tryBase58Decode
 
-Similar to base58Decode, but returns an empty string in case of error.
+Like `base58Decode` but returns an empty string in case of error.
 
-## base64Encode(s)
+## base64Encode
 
-Encodes ‘s’ FixedString or String into base64.
+Encodes a String or FixedString as base64.
 
 Alias: `TO_BASE64`.
 
-## base64Decode(s)
+## base64Decode
 
-Decode base64-encoded FixedString or String ‘s’ into original string. In case of failure raises an exception.
+Decodes a base64-encoded String or FixedString. Throws an exception in case of error.
 
 Alias: `FROM_BASE64`.
 
-## tryBase64Decode(s)
+## tryBase64Decode
 
-Similar to base64Decode, but returns an empty string in case of error.
+Like `base64Decode` but returns an empty string in case of error.
 
-## endsWith(s, suffix)
+## endsWith
 
-Returns whether to end with the specified suffix. Returns 1 if the string ends with the specified suffix, otherwise it returns 0.
+Returns whether string `str` ends with `suffix`.
 
-## startsWith(str, prefix)
+**Syntax**
 
-Returns 1 whether string starts with the specified prefix, otherwise it returns 0.
+```sql
+endsWith(str, suffix)
+```
+
+## startsWith
+
+Returns whether string `str` starts with `prefix`.
+
+**Syntax**
+
+```sql
+startsWith(str, prefix)
+```
+
+**Example**
 
 ``` sql
 SELECT startsWith('Spider-Man', 'Spi');
 ```
 
-**Returned values**
-
--   1, if the string starts with the specified prefix.
--   0, if the string does not start with the specified prefix.
-
-**Example**
-
-Query:
-
-``` sql
-SELECT startsWith('Hello, world!', 'He');
-```
-
-Result:
-
-``` text
-┌─startsWith('Hello, world!', 'He')─┐
-│                                 1 │
-└───────────────────────────────────┘
-```
-
 ## trim
 
-Removes all specified characters from the start or end of a string.
-By default removes all consecutive occurrences of common whitespace (ASCII character 32) from both ends of a string.
+Removes the specified characters from the start or end of a string. If not specified otherwise, the function removes whitespace (ASCII-character 32).
 
 **Syntax**
 
@@ -631,26 +719,24 @@ trim([[LEADING|TRAILING|BOTH] trim_character FROM] input_string)
 
 **Arguments**
 
--   `trim_character` — Specified characters for trim. [String](../../sql-reference/data-types/string.md).
--   `input_string` — String for trim. [String](../../sql-reference/data-types/string.md).
+- `trim_character` — Specified characters for trim. [String](../../sql-reference/data-types/string.md).
+- `input_string` — String for trim. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
-A string without leading and (or) trailing specified characters.
+A string without leading and/or trailing specified characters.
 
 Type: `String`.
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT trim(BOTH ' ()' FROM '(   Hello, world!   )');
 ```
 
 Result:
 
-``` text
+```result
 ┌─trim(BOTH ' ()' FROM '(   Hello, world!   )')─┐
 │ Hello, world!                                 │
 └───────────────────────────────────────────────┘
@@ -658,7 +744,7 @@ Result:
 
 ## trimLeft
 
-Removes all consecutive occurrences of common whitespace (ASCII character 32) from the beginning of a string. It does not remove other kinds of whitespace characters (tab, no-break space, etc.).
+Removes the consecutive occurrences of whitespace (ASCII-character 32) from the start of a string.
 
 **Syntax**
 
@@ -670,7 +756,7 @@ Alias: `ltrim(input_string)`.
 
 **Arguments**
 
--   `input_string` — string to trim. [String](../../sql-reference/data-types/string.md).
+- `input_string` — string to trim. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -680,15 +766,13 @@ Type: `String`.
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT trimLeft('     Hello, world!     ');
 ```
 
 Result:
 
-``` text
+```result
 ┌─trimLeft('     Hello, world!     ')─┐
 │ Hello, world!                       │
 └─────────────────────────────────────┘
@@ -696,7 +780,7 @@ Result:
 
 ## trimRight
 
-Removes all consecutive occurrences of common whitespace (ASCII character 32) from the end of a string. It does not remove other kinds of whitespace characters (tab, no-break space, etc.).
+Removes the consecutive occurrences of whitespace (ASCII-character 32) from the end of a string.
 
 **Syntax**
 
@@ -708,7 +792,7 @@ Alias: `rtrim(input_string)`.
 
 **Arguments**
 
--   `input_string` — string to trim. [String](../../sql-reference/data-types/string.md).
+- `input_string` — string to trim. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -718,15 +802,13 @@ Type: `String`.
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT trimRight('     Hello, world!     ');
 ```
 
 Result:
 
-``` text
+```result
 ┌─trimRight('     Hello, world!     ')─┐
 │      Hello, world!                   │
 └──────────────────────────────────────┘
@@ -734,7 +816,7 @@ Result:
 
 ## trimBoth
 
-Removes all consecutive occurrences of common whitespace (ASCII character 32) from both ends of a string. It does not remove other kinds of whitespace characters (tab, no-break space, etc.).
+Removes the consecutive occurrences of whitespace (ASCII-character 32) from both ends of a string.
 
 **Syntax**
 
@@ -746,7 +828,7 @@ Alias: `trim(input_string)`.
 
 **Arguments**
 
--   `input_string` — string to trim. [String](../../sql-reference/data-types/string.md).
+- `input_string` — string to trim. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -756,33 +838,31 @@ Type: `String`.
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT trimBoth('     Hello, world!     ');
 ```
 
 Result:
 
-``` text
+```result
 ┌─trimBoth('     Hello, world!     ')─┐
 │ Hello, world!                       │
 └─────────────────────────────────────┘
 ```
 
-## CRC32(s)
+## CRC32
 
-Returns the CRC32 checksum of a string, using CRC-32-IEEE 802.3 polynomial and initial value `0xffffffff` (zlib implementation).
+Returns the CRC32 checksum of a string using CRC-32-IEEE 802.3 polynomial and initial value `0xffffffff` (zlib implementation).
 
 The result type is UInt32.
 
-## CRC32IEEE(s)
+## CRC32IEEE
 
 Returns the CRC32 checksum of a string, using CRC-32-IEEE 802.3 polynomial.
 
 The result type is UInt32.
 
-## CRC64(s)
+## CRC64
 
 Returns the CRC64 checksum of a string, using CRC-64-ECMA polynomial.
 
@@ -800,25 +880,23 @@ normalizeQuery(x)
 
 **Arguments**
 
--   `x` — Sequence of characters. [String](../../sql-reference/data-types/string.md).
+- `x` — Sequence of characters. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Sequence of characters with placeholders.
+- Sequence of characters with placeholders.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT normalizeQuery('[1, 2, 3, x]') AS query;
 ```
 
 Result:
 
-``` text
+```result
 ┌─query────┐
 │ [?.., x] │
 └──────────┘
@@ -826,7 +904,7 @@ Result:
 
 ## normalizedQueryHash
 
-Returns identical 64bit hash values without the values of literals for similar queries. It helps to analyze query log.
+Returns identical 64bit hash values without the values of literals for similar queries. Can be helpful to analyze query log.
 
 **Syntax**
 
@@ -836,25 +914,23 @@ normalizedQueryHash(x)
 
 **Arguments**
 
--   `x` — Sequence of characters. [String](../../sql-reference/data-types/string.md).
+- `x` — Sequence of characters. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Hash value.
+- Hash value.
 
 Type: [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT normalizedQueryHash('SELECT 1 AS `xyz`') != normalizedQueryHash('SELECT 1 AS `abc`') AS res;
 ```
 
 Result:
 
-``` text
+```result
 ┌─res─┐
 │   1 │
 └─────┘
@@ -862,7 +938,7 @@ Result:
 
 ## normalizeUTF8NFC
 
-Converts a string to [NFC normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string contains a set of bytes that make up a UTF-8 encoded text.
+Converts a string to [NFC normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string is valid UTF8-encoded text.
 
 **Syntax**
 
@@ -872,25 +948,23 @@ normalizeUTF8NFC(words)
 
 **Arguments**
 
--   `words` — Input string that contains UTF-8 encoded text. [String](../../sql-reference/data-types/string.md).
+- `words` — UTF8-encoded input string. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   String transformed to NFC normalization form.
+- String transformed to NFC normalization form.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT length('â'), normalizeUTF8NFC('â') AS nfc, length(nfc) AS nfc_len;
 ```
 
 Result:
 
-``` text
+```result
 ┌─length('â')─┬─nfc─┬─nfc_len─┐
 │           2 │ â   │       2 │
 └─────────────┴─────┴─────────┘
@@ -898,7 +972,7 @@ Result:
 
 ## normalizeUTF8NFD
 
-Converts a string to [NFD normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string contains a set of bytes that make up a UTF-8 encoded text.
+Converts a string to [NFD normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string is valid UTF8-encoded text.
 
 **Syntax**
 
@@ -908,25 +982,23 @@ normalizeUTF8NFD(words)
 
 **Arguments**
 
--   `words` — Input string that contains UTF-8 encoded text. [String](../../sql-reference/data-types/string.md).
+- `words` — UTF8-encoded input string. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   String transformed to NFD normalization form.
+- String transformed to NFD normalization form.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT length('â'), normalizeUTF8NFD('â') AS nfd, length(nfd) AS nfd_len;
 ```
 
 Result:
 
-``` text
+```result
 ┌─length('â')─┬─nfd─┬─nfd_len─┐
 │           2 │ â   │       3 │
 └─────────────┴─────┴─────────┘
@@ -934,7 +1006,7 @@ Result:
 
 ## normalizeUTF8NFKC
 
-Converts a string to [NFKC normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string contains a set of bytes that make up a UTF-8 encoded text.
+Converts a string to [NFKC normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string is valid UTF8-encoded text.
 
 **Syntax**
 
@@ -944,25 +1016,23 @@ normalizeUTF8NFKC(words)
 
 **Arguments**
 
--   `words` — Input string that contains UTF-8 encoded text. [String](../../sql-reference/data-types/string.md).
+- `words` — UTF8-encoded input string. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   String transformed to NFKC normalization form.
+- String transformed to NFKC normalization form.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT length('â'), normalizeUTF8NFKC('â') AS nfkc, length(nfkc) AS nfkc_len;
 ```
 
 Result:
 
-``` text
+```result
 ┌─length('â')─┬─nfkc─┬─nfkc_len─┐
 │           2 │ â    │        2 │
 └─────────────┴──────┴──────────┘
@@ -970,7 +1040,7 @@ Result:
 
 ## normalizeUTF8NFKD
 
-Converts a string to [NFKD normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string contains a set of bytes that make up a UTF-8 encoded text.
+Converts a string to [NFKD normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string is valid UTF8-encoded text.
 
 **Syntax**
 
@@ -980,25 +1050,23 @@ normalizeUTF8NFKD(words)
 
 **Arguments**
 
--   `words` — Input string that contains UTF-8 encoded text. [String](../../sql-reference/data-types/string.md).
+- `words` — UTF8-encoded input string. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   String transformed to NFKD normalization form.
+- String transformed to NFKD normalization form.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT length('â'), normalizeUTF8NFKD('â') AS nfkd, length(nfkd) AS nfkd_len;
 ```
 
 Result:
 
-``` text
+```result
 ┌─length('â')─┬─nfkd─┬─nfkd_len─┐
 │           2 │ â    │        3 │
 └─────────────┴──────┴──────────┘
@@ -1006,9 +1074,10 @@ Result:
 
 ## encodeXMLComponent
 
-Escapes characters to place string into XML text node or attribute.
+Escapes characters with special meaning in XML such that they can afterwards be place into a XML text node or attribute.
 
-The following five XML predefined entities will be replaced: `<`, `&`, `>`, `"`, `'`.
+The following characters are replaced: `<`, `&`, `>`, `"`, `'`.
+Also see the [list of XML and HTML character entity references](https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references).
 
 **Syntax**
 
@@ -1018,18 +1087,16 @@ encodeXMLComponent(x)
 
 **Arguments**
 
--   `x` — The sequence of characters. [String](../../sql-reference/data-types/string.md).
+- `x` — An input string. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   The sequence of characters with escape characters.
+- The escaped string.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT encodeXMLComponent('Hello, "world"!');
 SELECT encodeXMLComponent('<123>');
@@ -1039,7 +1106,7 @@ SELECT encodeXMLComponent('\'foo\'');
 
 Result:
 
-``` text
+```result
 Hello, &quot;world&quot;!
 &lt;123&gt;
 &amp;clickhouse
@@ -1048,7 +1115,8 @@ Hello, &quot;world&quot;!
 
 ## decodeXMLComponent
 
-Replaces XML predefined entities with characters. Predefined entities are `&quot;` `&amp;` `&apos;` `&gt;` `&lt;`
+Un-escapes substrings with special meaning in XML. These substrings are: `&quot;` `&amp;` `&apos;` `&gt;` `&lt;`
+
 This function also replaces numeric character references with Unicode characters. Both decimal (like `&#10003;`) and hexadecimal (`&#x2713;`) forms are supported.
 
 **Syntax**
@@ -1059,18 +1127,16 @@ decodeXMLComponent(x)
 
 **Arguments**
 
--   `x` — A sequence of characters. [String](../../sql-reference/data-types/string.md).
+- `x` — An input string. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   The sequence of characters after replacement.
+- The un-escaped string.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT decodeXMLComponent('&apos;foo&apos;');
 SELECT decodeXMLComponent('&lt; &#x3A3; &gt;');
@@ -1078,25 +1144,20 @@ SELECT decodeXMLComponent('&lt; &#x3A3; &gt;');
 
 Result:
 
-``` text
+```result
 'foo'
 < Σ >
 ```
 
-**See Also**
-
--   [List of XML and HTML character entity references](https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references)
-
-
-
 ## extractTextFromHTML
 
-A function to extract text from HTML or XHTML.
-It does not necessarily 100% conform to any of the HTML, XML or XHTML standards, but the implementation is reasonably accurate and it is fast. The rules are the following:
+This function extracts plain text from HTML or XHTML.
 
-1. Comments are skipped. Example: `<!-- test -->`. Comment must end with `-->`. Nested comments are not possible.
+It does not conform 100% to the HTML, XML or XHTML specification but the implementation is reasonably accurate and fast. The rules are the following:
+
+1. Comments are skipped. Example: `<!-- test -->`. Comment must end with `-->`. Nested comments are disallowed.
 Note: constructions like `<!-->` and `<!--->` are not valid comments in HTML but they are skipped by other rules.
-2. CDATA is pasted verbatim. Note: CDATA is XML/XHTML specific. But it is processed for "best-effort" approach.
+2. CDATA is pasted verbatim. Note: CDATA is XML/XHTML-specific  and processed on a "best-effort" basis.
 3. `script` and `style` elements are removed with all their content. Note: it is assumed that closing tag cannot appear inside content. For example, in JS string literal has to be escaped like `"<\/script>"`.
 Note: comments and CDATA are possible inside `script` or `style` - then closing tags are not searched inside CDATA. Example: `<script><![CDATA[</script>]]></script>`. But they are still searched inside comments. Sometimes it becomes complicated: `<script>var x = "<!--"; </script> var y = "-->"; alert(x + y);</script>`
 Note: `script` and `style` can be the names of XML namespaces - then they are not treated like usual `script` or `style` elements. Example: `<script:a>Hello</script:a>`.
@@ -1121,11 +1182,11 @@ extractTextFromHTML(x)
 
 **Arguments**
 
--   `x` — input text. [String](../../sql-reference/data-types/string.md).
+- `x` — input text. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Extracted text.
+- Extracted text.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -1135,8 +1196,6 @@ The first example contains several tags and a comment and also shows whitespace
 The second example shows `CDATA` and `script` tag processing.
 In the third example text is extracted from the full HTML response received by the [url](../../sql-reference/table-functions/url.md) function.
 
-Query:
-
 ``` sql
 SELECT extractTextFromHTML(' <p> A text <i>with</i><b>tags</b>. <!-- comments --> </p> ');
 SELECT extractTextFromHTML('<![CDATA[The content within <b>CDATA</b>]]> <script>alert("Script");</script>');
@@ -1145,54 +1204,52 @@ SELECT extractTextFromHTML(html) FROM url('http://www.donothingfor2minutes.com/'
 
 Result:
 
-``` text
+```result
 A text with tags .
 The content within <b>CDATA</b>
 Do Nothing for 2 Minutes 2:00 &nbsp;
 ```
 
-## ascii(s) {#ascii}
+## ascii {#ascii}
 
-Returns the ASCII code point of the first character of str.  The result type is Int32.
+Returns the ASCII code point (as Int32) of the first character of string `s`.
 
-If s is empty, the result is 0. If the first character is not an ASCII character or not part of the Latin-1 Supplement range of UTF-16, the result is undefined.
+If `s` is empty, the result is 0. If the first character is not an ASCII character or not part of the Latin-1 supplement range of UTF-16, the result is undefined.
 
+**Syntax**
 
+```sql
+ascii(s)
+```
 
-## concatWithSeparator
+## soundex
 
-Returns the concatenation strings separated by string separator. If any of the argument values is `NULL`, the function returns `NULL`.
+Returns the [Soundex code](https://en.wikipedia.org/wiki/Soundex) of a string.
 
 **Syntax**
 
 ``` sql
-concatWithSeparator(sep, expr1, expr2, expr3...)
+soundex(val)
 ```
 
 **Arguments**
--   sep — separator. Const [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
--   exprN — expression to be concatenated. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
 
-**Returned values**
--   The concatenated String.
+- `val` - Input value. [String](../data-types/string.md)
+
+**Returned value**
+
+- The Soundex code of the input value. [String](../data-types/string.md)
 
 **Example**
 
-Query:
-
 ``` sql
-SELECT concatWithSeparator('a', '1', '2', '3', '4')
+select soundex('aksel');
 ```
 
 Result:
 
-``` text
-┌─concatWithSeparator('a', '1', '2', '3', '4')─┐
-│ 1a2a3a4                           │
-└───────────────────────────────────┘
+```result
+┌─soundex('aksel')─┐
+│ A240             │
+└──────────────────┘
 ```
-
-## concatWithSeparatorAssumeInjective
-Same as concatWithSeparator, the difference is that you need to ensure that concatWithSeparator(sep, expr1, expr2, expr3...) → result is injective, it will be used for optimization of GROUP BY.
-
-The function is named “injective” if it always returns different result for different values of arguments. In other words: different arguments never yield identical result.
diff --git a/docs/en/sql-reference/functions/string-replace-functions.md b/docs/en/sql-reference/functions/string-replace-functions.md
index 50e15f70f5d..56c527d734e 100644
--- a/docs/en/sql-reference/functions/string-replace-functions.md
+++ b/docs/en/sql-reference/functions/string-replace-functions.md
@@ -1,34 +1,54 @@
 ---
 slug: /en/sql-reference/functions/string-replace-functions
-sidebar_position: 42
+sidebar_position: 150
 sidebar_label: Replacing in Strings
 ---
 
-# Functions for Searching and Replacing in Strings
+# Functions for Replacing in Strings
 
-:::note
-Functions for [searching](../../sql-reference/functions/string-search-functions.md) and [other manipulations with strings](../../sql-reference/functions/string-functions.md) are described separately.
-:::
+[General strings functions](string-functions.md) and [functions for searchin in strings](string-search-functions.md) are described separately.
 
-## replaceOne(haystack, pattern, replacement)
+## replaceOne
 
-Replaces the first occurrence of the substring ‘pattern’ (if it exists) in ‘haystack’ by the ‘replacement’ string.
-‘pattern’ and ‘replacement’ must be constants.
+Replaces the first occurrence of the substring `pattern` in `haystack` by the `replacement` string.
 
-## replaceAll(haystack, pattern, replacement), replace(haystack, pattern, replacement)
+**Syntax**
 
-Replaces all occurrences of the substring ‘pattern’ in ‘haystack’ by the ‘replacement’ string.
+```sql
+replaceOne(haystack, pattern, replacement)
+```
 
-## replaceRegexpOne(haystack, pattern, replacement)
+## replaceAll
 
-Replaces the first occurrence of the substring matching the regular expression ‘pattern’ in ‘haystack‘ by the ‘replacement‘ string.
-‘pattern‘ must be a constant [re2 regular expression](https://github.com/google/re2/wiki/Syntax).
-‘replacement’ must be a plain constant string or a constant string containing substitutions `\0-\9`.
+Replaces all occurrences of the substring `pattern` in `haystack` by the `replacement` string.
+
+**Syntax**
+
+```sql
+replaceAll(haystack, pattern, replacement)
+```
+
+Alias: `replace`.
+
+## replaceRegexpOne
+
+Replaces the first occurrence of the substring matching the regular expression `pattern` (in [re2 syntax](https://github.com/google/re2/wiki/Syntax)) in `haystack` by the `replacement` string.
+
+`replacement` can containing substitutions `\0-\9`.
 Substitutions `\1-\9` correspond to the 1st to 9th capturing group (submatch), substitution `\0` corresponds to the entire match.
-To use a verbatim `\` character in the ‘pattern‘ or ‘replacement‘ string, escape it using `\`.
-Also keep in mind that string literals require an extra escaping.
 
-Example 1. Converting ISO dates to American format:
+To use a verbatim `\` character in the `pattern` or `replacement` strings, escape it using `\`.
+Also keep in mind that string literals require extra escaping.
+
+**Syntax**
+
+```sql
+replaceRegexpOne(haystack, pattern, replacement)
+```
+
+**Example**
+
+Converting ISO dates to American format:
 
 ``` sql
 SELECT DISTINCT
@@ -39,6 +59,8 @@ LIMIT 7
 FORMAT TabSeparated
 ```
 
+Result:
+
 ``` text
 2014-03-17      03/17/2014
 2014-03-18      03/18/2014
@@ -49,81 +71,91 @@ FORMAT TabSeparated
 2014-03-23      03/23/2014
 ```
 
-Example 2. Copying a string ten times:
+Copying a string ten times:
 
 ``` sql
 SELECT replaceRegexpOne('Hello, World!', '.*', '\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0') AS res
 ```
 
+Result:
+
 ``` text
 ┌─res────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
 │ Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World! │
 └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-## replaceRegexpAll(haystack, pattern, replacement)
+## replaceRegexpAll
 
-Like ‘replaceRegexpOne‘, but replaces all occurrences of the pattern. Example:
+Like `replaceRegexpOne` but replaces all occurrences of the pattern.
+
+Alias: `REGEXP_REPLACE`.
+
+**Example**
 
 ``` sql
 SELECT replaceRegexpAll('Hello, World!', '.', '\\0\\0') AS res
 ```
 
+Result:
+
 ``` text
 ┌─res────────────────────────┐
 │ HHeelllloo,,  WWoorrlldd!! │
 └────────────────────────────┘
 ```
 
-As an exception, if a regular expression worked on an empty substring, the replacement is not made more than once.
-Example:
+As an exception, if a regular expression worked on an empty substring, the replacement is not made more than once, e.g.:
 
 ``` sql
 SELECT replaceRegexpAll('Hello, World!', '^', 'here: ') AS res
 ```
 
+Result:
+
 ``` text
 ┌─res─────────────────┐
 │ here: Hello, World! │
 └─────────────────────┘
 ```
 
-## regexpQuoteMeta(s)
+## regexpQuoteMeta
+
+Adds a backslash before these characters with special meaning in regular expressions: `\0`, `\\`, `|`, `(`, `)`, `^`, `$`, `.`, `[`, `]`, `?`, `*`, `+`, `{`, `:`, `-`.
 
-The function adds a backslash before some predefined characters in the string.
-Predefined characters: `\0`, `\\`, `|`, `(`, `)`, `^`, `$`, `.`, `[`, `]`, `?`, `*`, `+`, `{`, `:`, `-`.
 This implementation slightly differs from re2::RE2::QuoteMeta. It escapes zero byte as `\0` instead of `\x00` and it escapes only required characters.
-For more information, see the link: [RE2](https://github.com/google/re2/blob/master/re2/re2.cc#L473)
+For more information, see [RE2](https://github.com/google/re2/blob/master/re2/re2.cc#L473)
 
+**Syntax**
 
-## translate(s, from, to)
+```sql
+regexpQuoteMeta(s)
+```
 
-The function replaces characters in the string ‘s’ in accordance with one-to-one character mapping defined by ‘from’ and ‘to’ strings. ‘from’ and ‘to’ must be constant ASCII strings of the same size. Non-ASCII characters in the original string are not modified.
+## translate
 
-Example:
+Replaces characters in the string `s` using a one-to-one character mapping defined by `from` and `to` strings. `from` and `to` must be constant ASCII strings of the same size. Non-ASCII characters in the original string are not modified.
+
+**Syntax**
+
+```sql
+translate(s, from, to)
+```
+
+**Example**
 
 ``` sql
 SELECT translate('Hello, World!', 'delor', 'DELOR') AS res
 ```
 
+Result:
+
 ``` text
 ┌─res───────────┐
 │ HELLO, WORLD! │
 └───────────────┘
 ```
 
-## translateUTF8(string, from, to)
+## translateUTF8
 
-Similar to previous function, but works with UTF-8 arguments. ‘from’ and ‘to’ must be valid constant UTF-8 strings of the same size.
-
-Example:
-
-``` sql
-SELECT translateUTF8('Hélló, Wórld¡', 'óé¡', 'oe!') AS res
-```
-
-``` text
-┌─res───────────┐
-│ Hello, World! │
-└───────────────┘
-```
+Like [translate](#translate) but assumes `s`, `from` and `to` are UTF-8 encoded strings.
diff --git a/docs/en/sql-reference/functions/string-search-functions.md b/docs/en/sql-reference/functions/string-search-functions.md
index 2f660d820d1..3d8f89f7295 100644
--- a/docs/en/sql-reference/functions/string-search-functions.md
+++ b/docs/en/sql-reference/functions/string-search-functions.md
@@ -1,24 +1,26 @@
 ---
 slug: /en/sql-reference/functions/string-search-functions
-sidebar_position: 41
+sidebar_position: 160
 sidebar_label: Searching in Strings
 ---
 
 # Functions for Searching in Strings
 
-The search is case-sensitive by default in all these functions. There are separate variants for case insensitive search.
+All functions in this section search by default case-sensitively. Case-insensitive search is usually provided by separate function variants.
+Note that case-insensitive search follows the lowercase-uppercase rules of the English language. E.g. Uppercased `i` in English language is
+`I` whereas in Turkish language it is `İ` - results for languages other than English may be unexpected.
 
-:::note
-Functions for [replacing](../../sql-reference/functions/string-replace-functions.md) and [other manipulations with strings](../../sql-reference/functions/string-functions.md) are described separately.
-:::
+Functions in this section also assume that the searched string and the search string are single-byte encoded text. If this assumption is
+violated, no exception is thrown and results are undefined. Search with UTF-8 encoded strings is usually provided by separate function
+variants. Likewise, if a UTF-8 function variant is used and the input strings are not UTF-8 encoded text, no exception is thrown and the
+results are undefined. Note that no automatic Unicode normalization is performed, you can use the
+[normalizeUTF8*()](https://clickhouse.com/docs/en/sql-reference/functions/string-functions/) functions for that.
 
-## position(haystack, needle), locate(haystack, needle)
+[General strings functions](string-functions.md) and [functions for replacing in strings](string-replace-functions.md) are described separately.
 
-Searches for the substring `needle` in the string `haystack`.
+## position
 
-Returns the position (in bytes) of the found substring in the string, starting from 1.
-
-For a case-insensitive search, use the function [positionCaseInsensitive](#positioncaseinsensitive).
+Returns the position (in bytes, starting at 1) of a substring `needle` in a string `haystack`.
 
 **Syntax**
 
@@ -26,35 +28,33 @@ For a case-insensitive search, use the function [positionCaseInsensitive](#posit
 position(haystack, needle[, start_pos])
 ```
 
-``` sql
-position(needle IN haystack)
-```
-
-Alias: `locate(haystack, needle[, start_pos])`.
-
-:::note
-Syntax of `position(needle IN haystack)` provides SQL-compatibility, the function works the same way as to `position(haystack, needle)`.
-:::
+Alias:
+- `position(needle IN haystack)`
+- `locate(haystack, needle[, start_pos])`.
 
 **Arguments**
 
--   `haystack` — String, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – Position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md). Optional.
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `start_pos` – Position (1-based) in `haystack` at which the search starts. [UInt](../../sql-reference/data-types/int-uint.md). Optional.
 
 **Returned values**
 
--   Starting position in bytes (counting from 1), if substring was found.
--   0, if the substring was not found.
+- Starting position in bytes and counting from 1, if the substring was found.
+- 0, if the substring was not found.
+
+If substring `needle` is empty, these rules apply:
+- if no `start_pos` was specified: return `1`
+- if `start_pos = 0`: return `1`
+- if `start_pos >= 1` and `start_pos <= length(haystack) + 1`: return `start_pos`
+- otherwise: return `0`
+
+The same rules also apply to functions `positionCaseInsensitive`, `positionUTF8` and `positionCaseInsensitiveUTF8`
 
 Type: `Integer`.
 
 **Examples**
 
-The phrase “Hello, world!” contains a set of bytes representing a single-byte encoded text. The function returns some expected result:
-
-Query:
-
 ``` sql
 SELECT position('Hello, world!', '!');
 ```
@@ -67,6 +67,8 @@ Result:
 └────────────────────────────────┘
 ```
 
+Example with `start_pos` argument:
+
 ``` sql
 SELECT
     position('Hello, world!', 'o', 1),
@@ -79,29 +81,21 @@ SELECT
 └───────────────────────────────────┴───────────────────────────────────┘
 ```
 
-The same phrase in Russian contains characters which can’t be represented using a single byte. The function returns some unexpected result (use [positionUTF8](#positionutf8) function for multi-byte encoded text):
+Example for `needle IN haystack` syntax:
 
-Query:
-
-``` sql
-SELECT position('Привет, мир!', '!');
+```sql
+SELECT 6 = position('/' IN s) FROM (SELECT 'Hello/World' AS s);
 ```
 
 Result:
 
-``` text
-┌─position('Привет, мир!', '!')─┐
-│                            21 │
-└───────────────────────────────┘
+```text
+┌─equals(6, position(s, '/'))─┐
+│                           1 │
+└─────────────────────────────┘
 ```
 
-If argument `needle` is empty the following rules apply:
-- if no `start_pos` was specified: return `1`
-- if `start_pos = 0`: return `1`
-- if `start_pos >= 1` and `start_pos <= length(haystack) + 1`: return `start_pos`
-- otherwise: return `0`
-
-The same rules also apply to functions `positionCaseInsensitive`, `positionUTF8` and `positionCaseInsensitiveUTF8`
+Examples with empty `needle` substring:
 
 ``` sql
 SELECT
@@ -120,223 +114,59 @@ SELECT
 └─────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┘
 ```
 
-
-**Examples for POSITION(needle IN haystack) syntax**
-
-Query:
-
-```sql
-SELECT 3 = position('c' IN 'abc');
-```
-
-Result:
-
-```text
-┌─equals(3, position('abc', 'c'))─┐
-│                               1 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-```sql
-SELECT 6 = position('/' IN s) FROM (SELECT 'Hello/World' AS s);
-```
-
-Result:
-
-```text
-┌─equals(6, position(s, '/'))─┐
-│                           1 │
-└─────────────────────────────┘
-```
-
 ## positionCaseInsensitive
 
-The same as [position](#position) returns the position (in bytes) of the found substring in the string, starting from 1. Use the function for a case-insensitive search.
-
-Works under the assumption that the string contains a set of bytes representing a single-byte encoded text. If this assumption is not met and a character can’t be represented using a single byte, the function does not throw an exception and returns some unexpected result. If character can be represented using two bytes, it will use two bytes and so on.
-
-**Syntax**
-
-``` sql
-positionCaseInsensitive(haystack, needle[, start_pos])
-```
-
-**Arguments**
-
--   `haystack` — String, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` — Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md).
-
-**Returned values**
-
--   Starting position in bytes (counting from 1), if substring was found.
--   0, if the substring was not found.
-
-Type: `Integer`.
-
-**Example**
-
-Query:
-
-``` sql
-SELECT positionCaseInsensitive('Hello, world!', 'hello');
-```
-
-Result:
-
-``` text
-┌─positionCaseInsensitive('Hello, world!', 'hello')─┐
-│                                                 1 │
-└───────────────────────────────────────────────────┘
-```
+Like [position](#position) but searches case-insensitively.
 
 ## positionUTF8
 
-Returns the position (in Unicode points) of the found substring in the string, starting from 1.
-
-Works under the assumption that the string contains a set of bytes representing a UTF-8 encoded text. If this assumption is not met, the function does not throw an exception and returns some unexpected result. If character can be represented using two Unicode points, it will use two and so on.
-
-For a case-insensitive search, use the function [positionCaseInsensitiveUTF8](#positioncaseinsensitiveutf8).
-
-**Syntax**
-
-``` sql
-positionUTF8(haystack, needle[, start_pos])
-```
-
-**Arguments**
-
--   `haystack` — String, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` — Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
-
-**Returned values**
-
--   Starting position in Unicode points (counting from 1), if substring was found.
--   0, if the substring was not found.
-
-Type: `Integer`.
+Like [position](#position) but assumes `haystack` and `needle` are UTF-8 encoded strings.
 
 **Examples**
 
-The phrase “Hello, world!” in Russian contains a set of Unicode points representing a single-point encoded text. The function returns some expected result:
-
-Query:
+Function `positionUTF8` correctly counts character `ö` (represented by two points) as a single Unicode codepoint:
 
 ``` sql
-SELECT positionUTF8('Привет, мир!', '!');
+SELECT positionUTF8('Motörhead', 'r');
 ```
 
 Result:
 
 ``` text
-┌─positionUTF8('Привет, мир!', '!')─┐
-│                                12 │
-└───────────────────────────────────┘
-```
-
-The phrase “Salut, étudiante!”, where character `é` can be represented using a one point (`U+00E9`) or two points (`U+0065U+0301`) the function can be returned some unexpected result:
-
-Query for the letter `é`, which is represented one Unicode point `U+00E9`:
-
-``` sql
-SELECT positionUTF8('Salut, étudiante!', '!');
-```
-
-Result:
-
-``` text
-┌─positionUTF8('Salut, étudiante!', '!')─┐
-│                                     17 │
-└────────────────────────────────────────┘
-```
-
-Query for the letter `é`, which is represented two Unicode points `U+0065U+0301`:
-
-``` sql
-SELECT positionUTF8('Salut, étudiante!', '!');
-```
-
-Result:
-
-``` text
-┌─positionUTF8('Salut, étudiante!', '!')─┐
-│                                     18 │
-└────────────────────────────────────────┘
+┌─position('Motörhead', 'r')─┐
+│                          5 │
+└────────────────────────────┘
 ```
 
 ## positionCaseInsensitiveUTF8
 
-The same as [positionUTF8](#positionutf8), but is case-insensitive. Returns the position (in Unicode points) of the found substring in the string, starting from 1.
-
-Works under the assumption that the string contains a set of bytes representing a UTF-8 encoded text. If this assumption is not met, the function does not throw an exception and returns some unexpected result. If character can be represented using two Unicode points, it will use two and so on.
-
-**Syntax**
-
-``` sql
-positionCaseInsensitiveUTF8(haystack, needle[, start_pos])
-```
-
-**Arguments**
-
--   `haystack` — String, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` — Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
-
-**Returned value**
-
--   Starting position in Unicode points (counting from 1), if substring was found.
--   0, if the substring was not found.
-
-Type: `Integer`.
-
-**Example**
-
-Query:
-
-``` sql
-SELECT positionCaseInsensitiveUTF8('Привет, мир!', 'Мир');
-```
-
-Result:
-
-``` text
-┌─positionCaseInsensitiveUTF8('Привет, мир!', 'Мир')─┐
-│                                                  9 │
-└────────────────────────────────────────────────────┘
-```
+Like [positionUTF8](#positionutf8) but searches case-insensitively.
 
 ## multiSearchAllPositions
 
-The same as [position](../../sql-reference/functions/string-search-functions.md#position) but returns `Array` of positions (in bytes) of the found corresponding substrings in the string. Positions are indexed starting from 1.
+Like [position](#position) but returns an array of positions (in bytes, starting at 1) for multiple `needle` substrings in a `haystack` string.
 
-The search is performed on sequences of bytes without respect to string encoding and collation.
-
--   For case-insensitive ASCII search, use the function `multiSearchAllPositionsCaseInsensitive`.
--   For search in UTF-8, use the function [multiSearchAllPositionsUTF8](#multiSearchAllPositionsUTF8).
--   For case-insensitive UTF-8 search, use the function multiSearchAllPositionsCaseInsensitiveUTF8.
+:::note
+All `multiSearch*()` functions only support up to 2<sup>8</sup> needles.
+:::
 
 **Syntax**
 
 ``` sql
-multiSearchAllPositions(haystack, [needle1, needle2, ..., needlen])
+multiSearchAllPositions(haystack, [needle1, needle2, ..., needleN])
 ```
 
 **Arguments**
 
--   `haystack` — String, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Substrings to be searched. Array
 
 **Returned values**
 
--   Array of starting positions in bytes (counting from 1), if the corresponding substring was found and 0 if not found.
+- Array of the starting position in bytes and counting from 1 (if the substring was found) or 0 (if the substring was not found)
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world']);
 ```
@@ -351,103 +181,172 @@ Result:
 
 ## multiSearchAllPositionsUTF8
 
-See `multiSearchAllPositions`.
+Like [multiSearchAllPositions](#multiSearchAllPositions) but assumes `haystack` and the `needle`-s are UTF-8 encoded strings.
 
-## multiSearchFirstPosition(haystack, \[needle<sub>1</sub>, needle<sub>2</sub>, …, needle<sub>n</sub>\])
+## multiSearchFirstPosition
 
-The same as `position` but returns the leftmost offset of the string `haystack` that is matched to some of the needles.
+Like `position` but returns the leftmost offset in a `haystack` string which matches any of multiple `needle` strings.
 
-For a case-insensitive search or/and in UTF-8 format use functions `multiSearchFirstPositionCaseInsensitive, multiSearchFirstPositionUTF8, multiSearchFirstPositionCaseInsensitiveUTF8`.
+Functions `multiSearchFirstPositionCaseInsensitive`, `multiSearchFirstPositionUTF8` and `multiSearchFirstPositionCaseInsensitiveUTF8` provide case-insensitive and/or UTF-8 variants of this function.
 
-## multiSearchFirstIndex(haystack, \[needle<sub>1</sub>, needle<sub>2</sub>, …, needle<sub>n</sub>\])
+**Syntax**
+
+```sql
+multiSearchFirstPosition(haystack, \[needle<sub>1</sub>, needle<sub>2</sub>, …, needle<sub>n</sub>\])
+```
+
+## multiSearchFirstIndex
 
 Returns the index `i` (starting from 1) of the leftmost found needle<sub>i</sub> in the string `haystack` and 0 otherwise.
 
-For a case-insensitive search or/and in UTF-8 format use functions `multiSearchFirstIndexCaseInsensitive, multiSearchFirstIndexUTF8, multiSearchFirstIndexCaseInsensitiveUTF8`.
+Functions `multiSearchFirstIndexCaseInsensitive`, `multiSearchFirstIndexUTF8` and `multiSearchFirstIndexCaseInsensitiveUTF8` provide case-insensitive and/or UTF-8 variants of this function.
 
-## multiSearchAny(haystack, \[needle<sub>1</sub>, needle<sub>2</sub>, …, needle<sub>n</sub>\])
+**Syntax**
+
+```sql
+multiSearchFirstIndex(haystack, \[needle<sub>1</sub>, needle<sub>2</sub>, …, needle<sub>n</sub>\])
+```
+
+## multiSearchAny
 
 Returns 1, if at least one string needle<sub>i</sub> matches the string `haystack` and 0 otherwise.
 
-For a case-insensitive search or/and in UTF-8 format use functions `multiSearchAnyCaseInsensitive, multiSearchAnyUTF8, multiSearchAnyCaseInsensitiveUTF8`.
+Functions `multiSearchAnyCaseInsensitive`, `multiSearchAnyUTF8` and `multiSearchAnyCaseInsensitiveUTF8` provide case-insensitive and/or UTF-8 variants of this function.
 
-:::note
-In all `multiSearch*` functions the number of needles should be less than 2<sup>8</sup> because of implementation specification.
-:::
+**Syntax**
 
-## match(haystack, pattern)
+```sql
+multiSearchAny(haystack, \[needle<sub>1</sub>, needle<sub>2</sub>, …, needle<sub>n</sub>\])
+```
 
-Checks whether string `haystack` matches the regular expression `pattern`. The pattern is an [re2 regular expression](https://github.com/google/re2/wiki/Syntax) which has a more limited syntax than Perl regular expressions.
+## match
 
-Returns 1 in case of a match, and 0 otherwise.
+Returns whether string `haystack` matches the regular expression `pattern` in [re2 regular syntax](https://github.com/google/re2/wiki/Syntax).
 
-Matching is based on UTF-8, e.g. `.` matches the Unicode code point `¥` which is represented in UTF-8 using two bytes. The regular expression must not contain null bytes.
-If the haystack or the pattern are not valid UTF-8, then the behavior is undefined.
-No automatic Unicode normalization is performed, you can use the [normalizeUTF8*()](https://clickhouse.com/docs/en/sql-reference/functions/string-functions/) functions for that.
+Matching is based on UTF-8, e.g. `.` matches the Unicode code point `¥` which is represented in UTF-8 using two bytes. The regular
+expression must not contain null bytes. If the haystack or the pattern are not valid UTF-8, then the behavior is undefined.
 
 Unlike re2's default behavior, `.` matches line breaks. To disable this, prepend the pattern with `(?-s)`.
 
-For patterns to search for substrings in a string, it is better to use functions [like](#like) or [position](#position) since they work much faster.
+If you only want to search substrings in a string, you can use functions [like](#like) or [position](#position) instead - they work much faster than this function.
 
-## multiMatchAny(haystack, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+**Syntax**
 
-The same as `match`, but returns 0 if none of the regular expressions are matched and 1 if any of the patterns matches. For patterns to search substrings in a string, it is better to use `multiSearchAny` since it works much faster.
+```sql
+match(haystack, pattern)
+```
+
+Alias: `haystack REGEXP pattern operator`
+
+## multiMatchAny
+
+Like `match` but returns 1 if at least one of the patterns match and 0 otherwise.
 
 :::note
-Functions `multiMatchAny`, `multiMatchAnyIndex`, `multiMatchAllIndices` and their fuzzy equivalents (`multiFuzzyMatchAny`,
-`multiFuzzyMatchAnyIndex`, `multiFuzzyMatchAllIndices`) use the (Vectorscan)[https://github.com/VectorCamp/vectorscan] library. As such,
-they are only enabled if ClickHouse is compiled with support for vectorscan.
+Functions in the `multi[Fuzzy]Match*()` family use the the (Vectorscan)[https://github.com/VectorCamp/vectorscan] library. As such, they are only enabled if ClickHouse is compiled with support for vectorscan.
+
+To turn off all functions that use hyperscan, use setting `SET allow_hyperscan = 0;`.
 
 Due to restrictions of vectorscan, the length of the `haystack` string must be less than 2<sup>32</sup> bytes.
 
 Hyperscan is generally vulnerable to regular expression denial of service (ReDoS) attacks (e.g. see
 (here)[https://www.usenix.org/conference/usenixsecurity22/presentation/turonova], (here)[https://doi.org/10.1007/s10664-021-10033-1] and
-(here)[ https://doi.org/10.1145/3236024.3236027]. Users are adviced to check the provided patterns carefully.
+(here)[https://doi.org/10.1145/3236024.3236027]. Users are adviced to check the provided patterns carefully.
 :::
 
-## multiMatchAnyIndex(haystack, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+If you only want to search multiple substrings in a string, you can use function [multiSearchAny](#multisearchany) instead - it works much faster than this function.
 
-The same as `multiMatchAny`, but returns any index that matches the haystack.
+**Syntax**
 
-## multiMatchAllIndices(haystack, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```sql
+multiMatchAny(haystack, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
 
-The same as `multiMatchAny`, but returns the array of all indices that match the haystack in any order.
+## multiMatchAnyIndex
 
-## multiFuzzyMatchAny(haystack, distance, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+Like `multiMatchAny` but returns any index that matches the haystack.
 
-The same as `multiMatchAny`, but returns 1 if any pattern matches the haystack within a constant [edit distance](https://en.wikipedia.org/wiki/Edit_distance). This function relies on the experimental feature of [hyperscan](https://intel.github.io/hyperscan/dev-reference/compilation.html#approximate-matching) library, and can be slow for some corner cases. The performance depends on the edit distance value and patterns used, but it's always more expensive compared to a non-fuzzy variants.
+**Syntax**
 
-## multiFuzzyMatchAnyIndex(haystack, distance, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```sql
+multiMatchAnyIndex(haystack, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
 
-The same as `multiFuzzyMatchAny`, but returns any index that matches the haystack within a constant edit distance.
+## multiMatchAllIndices
 
-## multiFuzzyMatchAllIndices(haystack, distance, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+Like `multiMatchAny` but returns the array of all indices that match the haystack in any order.
 
-The same as `multiFuzzyMatchAny`, but returns the array of all indices in any order that match the haystack within a constant edit distance.
+**Syntax**
+
+```sql
+multiMatchAllIndices(haystack, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
+
+## multiFuzzyMatchAny
+
+Like `multiMatchAny` but returns 1 if any pattern matches the haystack within a constant [edit distance](https://en.wikipedia.org/wiki/Edit_distance). This function relies on the experimental feature of [hyperscan](https://intel.github.io/hyperscan/dev-reference/compilation.html#approximate-matching) library, and can be slow for some corner cases. The performance depends on the edit distance value and patterns used, but it's always more expensive compared to a non-fuzzy variants.
 
 :::note
-`multiFuzzyMatch*` functions do not support UTF-8 regular expressions, and such expressions are treated as bytes because of hyperscan restriction.
+`multiFuzzyMatch*()` function family do not support UTF-8 regular expressions (it threats them as a sequence of bytes) due to restrictions of hyperscan.
 :::
 
-:::note
-To turn off all functions that use hyperscan, use setting `SET allow_hyperscan = 0;`.
-:::
+**Syntax**
 
-## extract(haystack, pattern)
+```sql
+multiFuzzyMatchAny(haystack, distance, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
 
-Extracts a fragment of a string using a regular expression. If ‘haystack’ does not match the ‘pattern’ regex, an empty string is returned. If the regex does not contain subpatterns, it takes the fragment that matches the entire regex. Otherwise, it takes the fragment that matches the first subpattern.
+## multiFuzzyMatchAnyIndex
 
-## extractAll(haystack, pattern)
+Like `multiFuzzyMatchAny` but returns any index that matches the haystack within a constant edit distance.
 
-Extracts all the fragments of a string using a regular expression. If ‘haystack’ does not match the ‘pattern’ regex, an empty string is returned. Returns an array of strings consisting of all matches to the regex. In general, the behavior is the same as the ‘extract’ function (it takes the first subpattern, or the entire expression if there isn’t a subpattern).
+**Syntax**
+
+```sql
+multiFuzzyMatchAnyIndex(haystack, distance, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
+
+## multiFuzzyMatchAllIndices
+
+Like `multiFuzzyMatchAny` but returns the array of all indices in any order that match the haystack within a constant edit distance.
+
+**Syntax**
+
+```sql
+multiFuzzyMatchAllIndices(haystack, distance, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
+
+## extract
+
+Extracts a fragment of a string using a regular expression. If `haystack` does not match the `pattern` regex, an empty string is returned.
+
+For regex without subpatterns, the function uses the fragment that matches the entire regex. Otherwise, it uses the fragment that matches the first subpattern.
+
+**Syntax**
+
+```sql
+extract(haystack, pattern)
+```
+
+## extractAll
+
+Extracts all fragments of a string using a regular expression. If `haystack` does not match the `pattern` regex, an empty string is returned.
+
+Returns an array of strings consisting of all matches of the regex.
+
+The behavior with respect to subpatterns is the same as in function `extract`.
+
+**Syntax**
+
+```sql
+extractAll(haystack, pattern)
+```
 
 ## extractAllGroupsHorizontal
 
 Matches all groups of the `haystack` string using the `pattern` regular expression. Returns an array of arrays, where the first array includes all fragments matching the first group, the second array - matching the second group, etc.
 
-:::note
-`extractAllGroupsHorizontal` function is slower than [extractAllGroupsVertical](#extractallgroups-vertical).
-:::
+This function is slower than [extractAllGroupsVertical](#extractallgroups-vertical).
 
 **Syntax**
 
@@ -457,19 +356,17 @@ extractAllGroupsHorizontal(haystack, pattern)
 
 **Arguments**
 
--   `haystack` — Input string. Type: [String](../../sql-reference/data-types/string.md).
--   `pattern` — Regular expression with [re2 syntax](https://github.com/google/re2/wiki/Syntax). Must contain groups, each group enclosed in parentheses. If `pattern` contains no groups, an exception is thrown. Type: [String](../../sql-reference/data-types/string.md).
+- `haystack` — Input string. Type: [String](../../sql-reference/data-types/string.md).
+- `pattern` — Regular expression with [re2 syntax](https://github.com/google/re2/wiki/Syntax). Must contain groups, each group enclosed in parentheses. If `pattern` contains no groups, an exception is thrown. Type: [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Type: [Array](../../sql-reference/data-types/array.md).
+- Type: [Array](../../sql-reference/data-types/array.md).
 
 If `haystack` does not match the `pattern` regex, an array of empty arrays is returned.
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT extractAllGroupsHorizontal('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)');
 ```
@@ -482,10 +379,6 @@ Result:
 └──────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-**See Also**
-
--   [extractAllGroupsVertical](#extractallgroups-vertical)
-
 ## extractAllGroupsVertical
 
 Matches all groups of the `haystack` string using the `pattern` regular expression. Returns an array of arrays, where each array includes matching fragments from every group. Fragments are grouped in order of appearance in the `haystack`.
@@ -498,19 +391,17 @@ extractAllGroupsVertical(haystack, pattern)
 
 **Arguments**
 
--   `haystack` — Input string. Type: [String](../../sql-reference/data-types/string.md).
--   `pattern` — Regular expression with [re2 syntax](https://github.com/google/re2/wiki/Syntax). Must contain groups, each group enclosed in parentheses. If `pattern` contains no groups, an exception is thrown. Type: [String](../../sql-reference/data-types/string.md).
+- `haystack` — Input string. Type: [String](../../sql-reference/data-types/string.md).
+- `pattern` — Regular expression with [re2 syntax](https://github.com/google/re2/wiki/Syntax). Must contain groups, each group enclosed in parentheses. If `pattern` contains no groups, an exception is thrown. Type: [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Type: [Array](../../sql-reference/data-types/array.md).
+- Type: [Array](../../sql-reference/data-types/array.md).
 
 If `haystack` does not match the `pattern` regex, an empty array is returned.
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)');
 ```
@@ -523,119 +414,88 @@ Result:
 └────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-**See Also**
+## like
 
--   [extractAllGroupsHorizontal](#extractallgroups-horizontal)
+Returns whether string `haystack` matches the LIKE expression `pattern`.
 
-## like(haystack, pattern), haystack LIKE pattern operator
+A LIKE expression can contain normal characters and the following metasymbols:
 
-Checks whether a string matches a LIKE expression.
-A LIKE expression contains a mix of normal characters and the following metasymbols:
-
--   `%` indicates an arbitrary number of arbitrary characters (including zero characters).
-
--   `_` indicates a single arbitrary character.
-
--   `\` is for escaping literals `%`, `_` and `\`.
+- `%` indicates an arbitrary number of arbitrary characters (including zero characters).
+- `_` indicates a single arbitrary character.
+- `\` is for escaping literals `%`, `_` and `\`.
 
 Matching is based on UTF-8, e.g. `_` matches the Unicode code point `¥` which is represented in UTF-8 using two bytes.
-If the haystack or the pattern are not valid UTF-8, then the behavior is undefined.
+
+If the haystack or the LIKE expression are not valid UTF-8, the behavior is undefined.
+
 No automatic Unicode normalization is performed, you can use the [normalizeUTF8*()](https://clickhouse.com/docs/en/sql-reference/functions/string-functions/) functions for that.
 
-To match against literals `%`, `_` and `/` (which are LIKE metacharacters), prepend them with a backslash, i.e. `\%`, `\_` and `\\`.
-The backslash loses its special meaning, i.e. is interpreted literally, if it prepends a character different than `%`, `_` or `\`.
+To match against literal `%`, `_` and `/` (which are LIKE metacharacters), prepend them with a backslash: `\%`, `\_` and `\\`.
+The backslash loses its special meaning (i.e. is interpreted literally) if it prepends a character different than `%`, `_` or `\`.
 Note that ClickHouse requires backslashes in strings [to be quoted as well](../syntax.md#string), so you would actually need to write `\\%`, `\\_` and `\\\\`.
 
-For patterns of the form `%needle%`, the function is as fast as the `position` function.
-Other LIKE expressions are internally converted to a regular expression and executed with a performance similar to function `match`.
-
-## notLike(haystack, pattern), haystack NOT LIKE pattern operator
-
-The same thing as ‘like’, but negative.
-
-## ilike
-
-Case insensitive variant of [like](https://clickhouse.com/docs/en/sql-reference/functions/string-search-functions/#function-like) function. You can use `ILIKE` operator instead of the `ilike` function.
-
-The function ignores the language, e.g. for Turkish (i/İ), the result might be incorrect.
+For LIKE expressions of the form `%needle%`, the function is as fast as the `position` function.
+All other LIKE expressions are internally converted to a regular expression and executed with a performance similar to function `match`.
 
 **Syntax**
 
-``` sql
-ilike(haystack, pattern)
+```sql
+like(haystack, pattern)
 ```
 
-**Arguments**
+Alias: `haystack LIKE pattern` (operator)
 
--   `haystack` — Input string. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `pattern` — If `pattern` does not contain percent signs or underscores, then the `pattern` only represents the string itself. An underscore (`_`) in `pattern` stands for (matches) any single character. A percent sign (`%`) matches any sequence of zero or more characters.
+## notLike
 
-Some `pattern` examples:
+Like `like` but negates the result.
 
-``` text
-'abc' ILIKE 'abc'    true
-'abc' ILIKE 'a%'     true
-'abc' ILIKE '_b_'    true
-'abc' ILIKE 'c'      false
+Alias: `haystack NOT LIKE pattern` (operator)
+
+## ilike
+
+Like `like` but searches case-insensitively.
+
+Alias: `haystack ILIKE pattern` (operator)
+
+## notILike
+
+Like `ilike` but negates the result.
+
+Alias: `haystack NOT ILIKE pattern` (operator)
+
+## ngramDistance
+
+Calculates the 4-gram distance between a `haystack` string and a `needle` string. For that, it counts the symmetric difference between two multisets of 4-grams and normalizes it by the sum of their cardinalities. Returns a Float32 between 0 and 1. The smaller the result is, the more strings are similar to each other. Throws an exception if constant `needle` or `haystack` arguments are more than 32Kb in size. If any of non-constant `haystack` or `needle` arguments is more than 32Kb in size, the distance is always 1.
+
+Functions `ngramDistanceCaseInsensitive, ngramDistanceUTF8, ngramDistanceCaseInsensitiveUTF8` provide case-insensitive and/or UTF-8 variants of this function.
+
+**Syntax**
+
+```sql
+ngramDistance(haystack, needle)
 ```
 
-**Returned values**
+## ngramSearch
 
--   True, if the string matches `pattern`.
--   False, if the string does not match `pattern`.
+Like `ngramDistance` but calculates the non-symmetric difference between a `needle` string and a `haystack` string, i.e. the number of n-grams from needle minus the common number of n-grams normalized by the number of `needle` n-grams. Returns a Float32 between 0 and 1. The bigger the result is, the more likely `needle` is in the `haystack`. This function is useful for fuzzy string search. Also see function `soundex`.
 
-**Example**
-
-Input table:
-
-``` text
-┌─id─┬─name─────┬─days─┐
-│  1 │ January  │   31 │
-│  2 │ February │   29 │
-│  3 │ March    │   31 │
-│  4 │ April    │   30 │
-└────┴──────────┴──────┘
-```
-
-Query:
-
-``` sql
-SELECT * FROM Months WHERE ilike(name, '%j%');
-```
-
-Result:
-
-``` text
-┌─id─┬─name────┬─days─┐
-│  1 │ January │   31 │
-└────┴─────────┴──────┘
-```
-
-**See Also**
-
-
-
-## ngramDistance(haystack, needle)
-
-Calculates the 4-gram distance between `haystack` and `needle`: counts the symmetric difference between two multisets of 4-grams and normalizes it by the sum of their cardinalities. Returns float number from 0 to 1 – the closer to zero, the more strings are similar to each other. If the constant `needle` or `haystack` is more than 32Kb, throws an exception. If some of the non-constant `haystack` or `needle` strings are more than 32Kb, the distance is always one.
-
-For case-insensitive search or/and in UTF-8 format use functions `ngramDistanceCaseInsensitive, ngramDistanceUTF8, ngramDistanceCaseInsensitiveUTF8`.
-
-## ngramSearch(haystack, needle)
-
-Same as `ngramDistance` but calculates the non-symmetric difference between `needle` and `haystack` – the number of n-grams from needle minus the common number of n-grams normalized by the number of `needle` n-grams. The closer to one, the more likely `needle` is in the `haystack`. Can be useful for fuzzy string search.
-
-For case-insensitive search or/and in UTF-8 format use functions `ngramSearchCaseInsensitive, ngramSearchUTF8, ngramSearchCaseInsensitiveUTF8`.
+Functions `ngramSearchCaseInsensitive, ngramSearchUTF8, ngramSearchCaseInsensitiveUTF8` provide case-insensitive and/or UTF-8 variants of this function.
 
 :::note
-For UTF-8 case we use 3-gram distance. All these are not perfectly fair n-gram distances. We use 2-byte hashes to hash n-grams and then calculate the (non-)symmetric difference between these hash tables – collisions may occur. With UTF-8 case-insensitive format we do not use fair `tolower` function – we zero the 5-th bit (starting from zero) of each codepoint byte and first bit of zeroth byte if bytes more than one – this works for Latin and mostly for all Cyrillic letters.
+The UTF-8 variants use the 3-gram distance. These are not perfectly fair n-gram distances. We use 2-byte hashes to hash n-grams and then calculate the (non-)symmetric difference between these hash tables – collisions may occur. With UTF-8 case-insensitive format we do not use fair `tolower` function – we zero the 5-th bit (starting from zero) of each codepoint byte and first bit of zeroth byte if bytes more than one – this works for Latin and mostly for all Cyrillic letters.
 :::
 
+**Syntax**
+
+```sql
+ngramSearch(haystack, needle)
+```
+
 ## countSubstrings
 
-Returns the number of substring occurrences.
+Returns how often substring `needle` occurs in string `haystack`.
 
-For a case-insensitive search, use [countSubstringsCaseInsensitive](../../sql-reference/functions/string-search-functions.md#countSubstringsCaseInsensitive) or [countSubstringsCaseInsensitiveUTF8](../../sql-reference/functions/string-search-functions.md#countSubstringsCaseInsensitiveUTF8) functions.
+Functions `countSubstringsCaseInsensitive` and `countSubstringsCaseInsensitiveUTF8` provide a case-insensitive and case-insensitive + UTF-8 variants of this function.
 
 **Syntax**
 
@@ -645,34 +505,18 @@ countSubstrings(haystack, needle[, start_pos])
 
 **Arguments**
 
--   `haystack` — The string to search in. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — The substring to search for. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – Position of the first character in the string to start search. Optional. [UInt](../../sql-reference/data-types/int-uint.md).
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `start_pos` – Position (1-based) in `haystack` at which the search starts. [UInt](../../sql-reference/data-types/int-uint.md). Optional.
 
 **Returned values**
 
--   Number of occurrences.
+- The number of occurrences.
 
 Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 **Examples**
 
-Query:
-
-``` sql
-SELECT countSubstrings('foobar.com', '.');
-```
-
-Result:
-
-``` text
-┌─countSubstrings('foobar.com', '.')─┐
-│                                  1 │
-└────────────────────────────────────┘
-```
-
-Query:
-
 ``` sql
 SELECT countSubstrings('aaaa', 'aa');
 ```
@@ -685,7 +529,7 @@ Result:
 └───────────────────────────────┘
 ```
 
-Query:
+Example with `start_pos` argument:
 
 ```sql
 SELECT countSubstrings('abc___abc', 'abc', 4);
@@ -699,125 +543,7 @@ Result:
 └────────────────────────────────────────┘
 ```
 
-## countSubstringsCaseInsensitive
-
-Returns the number of substring occurrences case-insensitive.
-
-**Syntax**
-
-``` sql
-countSubstringsCaseInsensitive(haystack, needle[, start_pos])
-```
-
-**Arguments**
-
--   `haystack` — The string to search in. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — The substring to search for. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` — Position of the first character in the string to start search. Optional. [UInt](../../sql-reference/data-types/int-uint.md).
-
-**Returned values**
-
--   Number of occurrences.
-
-Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT countSubstringsCaseInsensitive('aba', 'B');
-```
-
-Result:
-
-``` text
-┌─countSubstringsCaseInsensitive('aba', 'B')─┐
-│                                          1 │
-└────────────────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT countSubstringsCaseInsensitive('foobar.com', 'CoM');
-```
-
-Result:
-
-``` text
-┌─countSubstringsCaseInsensitive('foobar.com', 'CoM')─┐
-│                                                   1 │
-└─────────────────────────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT countSubstringsCaseInsensitive('abC___abC', 'aBc', 2);
-```
-
-Result:
-
-``` text
-┌─countSubstringsCaseInsensitive('abC___abC', 'aBc', 2)─┐
-│                                                     1 │
-└───────────────────────────────────────────────────────┘
-```
-
-## countSubstringsCaseInsensitiveUTF8
-
-Returns the number of substring occurrences in `UTF-8` case-insensitive.
-
-**Syntax**
-
-``` sql
-SELECT countSubstringsCaseInsensitiveUTF8(haystack, needle[, start_pos])
-```
-
-**Arguments**
-
--   `haystack` — The string to search in. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — The substring to search for. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` — Position of the first character in the string to start search. Optional. [UInt](../../sql-reference/data-types/int-uint.md).
-
-**Returned values**
-
--   Number of occurrences.
-
-Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT countSubstringsCaseInsensitiveUTF8('абв', 'A');
-```
-
-Result:
-
-``` text
-┌─countSubstringsCaseInsensitiveUTF8('абв', 'A')─┐
-│                                              1 │
-└────────────────────────────────────────────────┘
-```
-
-Query:
-
-```sql
-SELECT countSubstringsCaseInsensitiveUTF8('аБв__АбВ__абв', 'Абв');
-```
-
-Result:
-
-``` text
-┌─countSubstringsCaseInsensitiveUTF8('аБв__АбВ__абв', 'Абв')─┐
-│                                                          3 │
-└────────────────────────────────────────────────────────────┘
-```
-
-## countMatches(haystack, pattern)
+## countMatches
 
 Returns the number of regular expression matches for a `pattern` in a `haystack`.
 
@@ -829,19 +555,17 @@ countMatches(haystack, pattern)
 
 **Arguments**
 
--   `haystack` — The string to search in. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `pattern` — The regular expression with [re2 syntax](https://github.com/google/re2/wiki/Syntax). [String](../../sql-reference/data-types/string.md).
+- `haystack` — The string to search in. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `pattern` — The regular expression with [re2 syntax](https://github.com/google/re2/wiki/Syntax). [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   The number of matches.
+- The number of matches.
 
 Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 **Examples**
 
-Query:
-
 ``` sql
 SELECT countMatches('foobar.com', 'o+');
 ```
@@ -854,8 +578,6 @@ Result:
 └──────────────────────────────────┘
 ```
 
-Query:
-
 ``` sql
 SELECT countMatches('aaaa', 'aa');
 ```
@@ -868,7 +590,7 @@ Result:
 └───────────────────────────────┘
 ```
 
-## regexpExtract(haystack, pattern[, index])
+## regexpExtract
 
 Extracts the first string in haystack that matches the regexp pattern and corresponds to the regex group index.
 
@@ -882,9 +604,9 @@ Alias: `REGEXP_EXTRACT(haystack, pattern[, index])`.
 
 **Arguments**
 
--   `haystack` — String, in which regexp pattern will to be matched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `pattern` — String, regexp expression, must be constant. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `index` – An integer number greater or equal 0 with default 1. It represents which regex group to extract. [UInt or Int](../../sql-reference/data-types/int-uint.md). Optional.
+- `haystack` — String, in which regexp pattern will to be matched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `pattern` — String, regexp expression, must be constant. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `index` – An integer number greater or equal 0 with default 1. It represents which regex group to extract. [UInt or Int](../../sql-reference/data-types/int-uint.md). Optional.
 
 **Returned values**
 
@@ -899,8 +621,12 @@ SELECT
     regexpExtract('100-200', '(\\d+)-(\\d+)', 1),
     regexpExtract('100-200', '(\\d+)-(\\d+)', 2),
     regexpExtract('100-200', '(\\d+)-(\\d+)', 0),
-    regexpExtract('100-200', '(\\d+)-(\\d+)')
+    regexpExtract('100-200', '(\\d+)-(\\d+)');
+```
 
+Result:
+
+``` text
 ┌─regexpExtract('100-200', '(\\d+)-(\\d+)', 1)─┬─regexpExtract('100-200', '(\\d+)-(\\d+)', 2)─┬─regexpExtract('100-200', '(\\d+)-(\\d+)', 0)─┬─regexpExtract('100-200', '(\\d+)-(\\d+)')─┐
 │ 100                                          │ 200                                          │ 100-200                                      │ 100                                       │
 └──────────────────────────────────────────────┴──────────────────────────────────────────────┴──────────────────────────────────────────────┴───────────────────────────────────────────┘
diff --git a/docs/en/sql-reference/functions/time-window-functions.md b/docs/en/sql-reference/functions/time-window-functions.md
index c0eed01cccd..d8f23c92e61 100644
--- a/docs/en/sql-reference/functions/time-window-functions.md
+++ b/docs/en/sql-reference/functions/time-window-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/time-window-functions
-sidebar_position: 68
+sidebar_position: 175
 sidebar_label: Time Window
 ---
 
@@ -118,4 +118,4 @@ hopEnd(time_attr, hop_interval, window_interval [, timezone]);
 
 ## Related content
 
-- Blog: [Working with time series data in ClickHouse](https://clickhouse.com/blog/working-with-time-series-data-and-functions-ClickHouse)
\ No newline at end of file
+- Blog: [Working with time series data in ClickHouse](https://clickhouse.com/blog/working-with-time-series-data-and-functions-ClickHouse)
diff --git a/docs/en/sql-reference/functions/tuple-functions.md b/docs/en/sql-reference/functions/tuple-functions.md
index a31ec3c41d2..1739920c9f0 100644
--- a/docs/en/sql-reference/functions/tuple-functions.md
+++ b/docs/en/sql-reference/functions/tuple-functions.md
@@ -1,8 +1,7 @@
 ---
 slug: /en/sql-reference/functions/tuple-functions
-sidebar_position: 66
+sidebar_position: 180
 sidebar_label: Tuples
-title: "Functions for Working with Tuples"
 ---
 
 ## tuple
@@ -22,15 +21,15 @@ tuple(x, y, …)
 ## tupleElement
 
 A function that allows getting a column from a tuple.
-‘N’ is the column index, starting from 1. ‘N’ must be a constant. ‘N’ must be a strict postive integer no greater than the size of the tuple.
-There is no cost to execute the function.
 
-The function implements the operator `x.N`.
+If the second argument is a number `n`, it is the column index, starting from 1. If the second argument is a string `s`, it represents the name of the element. Besides, we can provide the third optional argument, such that when index out of bounds or element for such name does not exist, the default value returned instead of throw exception. The second and third arguments if provided are always must be constant. There is no cost to execute the function.
+
+The function implements the operator `x.n` and `x.s`.
 
 **Syntax**
 
 ``` sql
-tupleElement(tuple, n)
+tupleElement(tuple, n/s [, default_value])
 ```
 
 ## untuple
@@ -47,11 +46,11 @@ You can use the `EXCEPT` expression to skip columns as a result of the query.
 
 **Arguments**
 
--   `x` — A `tuple` function, column, or tuple of elements. [Tuple](../../sql-reference/data-types/tuple.md).
+- `x` — A `tuple` function, column, or tuple of elements. [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
--   None.
+- None.
 
 **Examples**
 
@@ -111,7 +110,7 @@ Result:
 
 **See Also**
 
--   [Tuple](../../sql-reference/data-types/tuple.md)
+- [Tuple](../../sql-reference/data-types/tuple.md)
 
 ## tupleHammingDistance
 
@@ -125,16 +124,16 @@ tupleHammingDistance(tuple1, tuple2)
 
 **Arguments**
 
--   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
--   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
 
 Tuples should have the same type of the elements.
 
 **Returned value**
 
--   The Hamming distance.
+- The Hamming distance.
 
-Type: The result type is calculed the same way it is for [Arithmetic functions](../../sql-reference/functions/arithmetic-functions.md), based on the number of elements in the input tuples.
+Type: The result type is calculated the same way it is for [Arithmetic functions](../../sql-reference/functions/arithmetic-functions.md), based on the number of elements in the input tuples.
 
 ``` sql
 SELECT
@@ -195,11 +194,11 @@ tupleToNameValuePairs(tuple)
 
 **Arguments**
 
--   `tuple` — Named tuple. [Tuple](../../sql-reference/data-types/tuple.md) with any types of values.
+- `tuple` — Named tuple. [Tuple](../../sql-reference/data-types/tuple.md) with any types of values.
 
 **Returned value**
 
--   An array with (name, value) pairs.
+- An array with (name, value) pairs.
 
 Type: [Array](../../sql-reference/data-types/array.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md), ...)).
 
@@ -208,7 +207,7 @@ Type: [Array](../../sql-reference/data-types/array.md)([Tuple](../../sql-referen
 Query:
 
 ``` sql
-CREATE TABLE tupletest (`col` Tuple(user_ID UInt64, session_ID UInt64) ENGINE = Memory;
+CREATE TABLE tupletest (col Tuple(user_ID UInt64, session_ID UInt64)) ENGINE = Memory;
 
 INSERT INTO tupletest VALUES (tuple( 100, 2502)), (tuple(1,100));
 
@@ -224,14 +223,14 @@ Result:
 └───────────────────────────────────────┘
 ```
 
-It is possible to transform colums to rows using this function:
+It is possible to transform columns to rows using this function:
 
 ``` sql
-CREATE TABLE tupletest (`col` Tuple(CPU Float64, Memory Float64, Disk Float64)) ENGINE = Memory;
+CREATE TABLE tupletest (col Tuple(CPU Float64, Memory Float64, Disk Float64)) ENGINE = Memory;
 
 INSERT INTO tupletest VALUES(tuple(3.3, 5.5, 6.6));
 
-SELECT arrayJoin(tupleToNameValuePairs(col))FROM tupletest;
+SELECT arrayJoin(tupleToNameValuePairs(col)) FROM tupletest;
 ```
 
 Result:
@@ -272,12 +271,12 @@ Alias: `vectorSum`.
 
 **Arguments**
 
--   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
--   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
--   Tuple with the sum.
+- Tuple with the sum.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md).
 
@@ -311,12 +310,12 @@ Alias: `vectorDifference`.
 
 **Arguments**
 
--   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
--   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
--   Tuple with the result of subtraction.
+- Tuple with the result of subtraction.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md).
 
@@ -348,12 +347,12 @@ tupleMultiply(tuple1, tuple2)
 
 **Arguments**
 
--   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
--   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
--   Tuple with the multiplication.
+- Tuple with the multiplication.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md).
 
@@ -385,12 +384,12 @@ tupleDivide(tuple1, tuple2)
 
 **Arguments**
 
--   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
--   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
--   Tuple with the result of division.
+- Tuple with the result of division.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md).
 
@@ -422,11 +421,11 @@ tupleNegate(tuple)
 
 **Arguments**
 
--   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
--   Tuple with the result of negation.
+- Tuple with the result of negation.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md).
 
@@ -458,12 +457,12 @@ tupleMultiplyByNumber(tuple, number)
 
 **Arguments**
 
--   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
--   `number` — Multiplier. [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+- `number` — Multiplier. [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
 
 **Returned value**
 
--   Tuple with multiplied values.
+- Tuple with multiplied values.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md).
 
@@ -495,12 +494,12 @@ tupleDivideByNumber(tuple, number)
 
 **Arguments**
 
--   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
--   `number` — Divider. [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+- `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+- `number` — Divider. [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
 
 **Returned value**
 
--   Tuple with divided values.
+- Tuple with divided values.
 
 Type: [Tuple](../../sql-reference/data-types/tuple.md).
 
@@ -534,12 +533,12 @@ Alias: `scalarProduct`.
 
 **Arguments**
 
--   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
--   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+- `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
--   Scalar product.
+- Scalar product.
 
 Type: [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
 
diff --git a/docs/en/sql-reference/functions/tuple-map-functions.md b/docs/en/sql-reference/functions/tuple-map-functions.md
index 4a6780df292..8283de95994 100644
--- a/docs/en/sql-reference/functions/tuple-map-functions.md
+++ b/docs/en/sql-reference/functions/tuple-map-functions.md
@@ -1,8 +1,7 @@
 ---
 slug: /en/sql-reference/functions/tuple-map-functions
-sidebar_position: 46
+sidebar_position: 120
 sidebar_label: Maps
-title: "Functions for Maps"
 ---
 
 ## map
@@ -17,12 +16,12 @@ map(key1, value1[, key2, value2, ...])
 
 **Arguments**
 
--   `key` — The key part of the pair. [String](../../sql-reference/data-types/string.md), [Integer](../../sql-reference/data-types/int-uint.md), [LowCardinality](../../sql-reference/data-types/lowcardinality.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UUID](../../sql-reference/data-types/uuid.md), [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), [Date32](../../sql-reference/data-types/date32.md), [Enum](../../sql-reference/data-types/enum.md).
--   `value` — The value part of the pair. Arbitrary type, including [Map](../../sql-reference/data-types/map.md) and [Array](../../sql-reference/data-types/array.md).
+- `key` — The key part of the pair. [String](../../sql-reference/data-types/string.md), [Integer](../../sql-reference/data-types/int-uint.md), [LowCardinality](../../sql-reference/data-types/lowcardinality.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UUID](../../sql-reference/data-types/uuid.md), [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), [Date32](../../sql-reference/data-types/date32.md), [Enum](../../sql-reference/data-types/enum.md).
+- `value` — The value part of the pair. Arbitrary type, including [Map](../../sql-reference/data-types/map.md) and [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
--   Data structure as `key:value` pairs.
+- Data structure as `key:value` pairs.
 
 Type: [Map(key, value)](../../sql-reference/data-types/map.md).
 
@@ -64,7 +63,153 @@ Result:
 
 **See Also**
 
--   [Map(key, value)](../../sql-reference/data-types/map.md) data type
+- [Map(key, value)](../../sql-reference/data-types/map.md) data type
+
+## mapFromArrays
+
+Merges an [Array](../../sql-reference/data-types/array.md) of keys and an [Array](../../sql-reference/data-types/array.md) of values into a [Map(key, value)](../../sql-reference/data-types/map.md). Notice that the second argument could also be a [Map](../../sql-reference/data-types/map.md), thus it is casted to an Array when executing.
+
+
+The function is a more convenient alternative to `CAST((key_array, value_array_or_map), 'Map(key_type, value_type)')`. For example, instead of writing `CAST((['aa', 'bb'], [4, 5]), 'Map(String, UInt32)')`, you can write `mapFromArrays(['aa', 'bb'], [4, 5])`.
+
+
+**Syntax**
+
+```sql
+mapFromArrays(keys, values)
+```
+
+Alias: `MAP_FROM_ARRAYS(keys, values)`
+
+**Arguments**
+
+- `keys` — Given key array to create a map from. The nested type of array must be: [String](../../sql-reference/data-types/string.md), [Integer](../../sql-reference/data-types/int-uint.md), [LowCardinality](../../sql-reference/data-types/lowcardinality.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UUID](../../sql-reference/data-types/uuid.md), [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), [Date32](../../sql-reference/data-types/date32.md), [Enum](../../sql-reference/data-types/enum.md)
+- `values`  - Given value array or map to create a map from.
+
+**Returned value**
+
+- A map whose keys and values are constructed from the key array and value array/map.
+
+**Example**
+
+Query:
+
+```sql
+select mapFromArrays(['a', 'b', 'c'], [1, 2, 3])
+
+
+┌─mapFromArrays(['a', 'b', 'c'], [1, 2, 3])─┐
+│ {'a':1,'b':2,'c':3}                       │
+└───────────────────────────────────────────┘
+
+SELECT mapFromArrays([1, 2, 3], map('a', 1, 'b', 2, 'c', 3))
+
+┌─mapFromArrays([1, 2, 3], map('a', 1, 'b', 2, 'c', 3))─┐
+│ {1:('a',1),2:('b',2),3:('c',3)}                       │
+└───────────────────────────────────────────────────────┘
+```
+
+## extractKeyValuePairs
+
+Extracts key-value pairs, i.e. a [Map(String, String)](../../sql-reference/data-types/map.md), from a string. Parsing is robust towards noise (e.g. log files).
+
+A key-value pair consists of a key, followed by a `key_value_delimiter` and a value. Key value pairs must be separated by `pair_delimiter`. Quoted keys and values are also supported. 
+
+**Syntax**
+
+``` sql
+extractKeyValuePairs(data[, key_value_delimiter[, pair_delimiter[, quoting_character]]])
+```
+
+Alias:
+- `str_to_map`
+- `mapFromString`
+
+**Arguments**
+
+- `data` - String to extract key-value pairs from. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+- `key_value_delimiter` - Character to be used as delimiter between the key and the value. Defaults to `:`. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+- `pair_delimiters` - Set of character to be used as delimiters between pairs. Defaults to ` `, `,` and `;`. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+- `quoting_character` - Character to be used as quoting character. Defaults to `"`. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+
+**Returned values**
+
+- A [Map(String, String)](../../sql-reference/data-types/map.md) of key-value pairs.
+
+**Examples**
+
+Simple case:
+
+``` sql
+SELECT extractKeyValuePairs('name:neymar, age:31 team:psg,nationality:brazil') as kv
+```
+
+Result:
+
+``` Result:
+┌─kv──────────────────────────────────────────────────────────────────────┐
+│ {'name':'neymar','age':'31','team':'psg','nationality':'brazil'}        │
+└─────────────────────────────────────────────────────────────────────────┘
+```
+
+Single quote as quoting character:
+
+``` sql
+SELECT extractKeyValuePairs('name:\'neymar\';\'age\':31;team:psg;nationality:brazil,last_key:last_value', ':', ';,', '\'') as kv
+```
+
+Result:
+
+``` text
+┌─kv───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ {'name':'neymar','age':'31','team':'psg','nationality':'brazil','last_key':'last_value'}                                 │
+└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+Escape sequences without escape sequences support:
+
+``` sql
+SELECT extractKeyValuePairs('age:a\\x0A\\n\\0') AS kv
+```
+
+Result:
+
+``` text
+┌─kv─────────────────────┐
+│ {'age':'a\\x0A\\n\\0'} │
+└────────────────────────┘
+```
+
+## extractKeyValuePairsWithEscaping
+
+Same as `extractKeyValuePairs` but with escaping support.
+
+Supported escape sequences: `\x`, `\N`, `\a`, `\b`, `\e`, `\f`, `\n`, `\r`, `\t`, `\v` and `\0`.
+Non standard escape sequences are returned as it is (including the backslash) unless they are one of the following:
+`\\`, `'`, `"`, `backtick`, `/`, `=` or ASCII control characters (c <= 31).
+
+This function will satisfy the use case where pre-escaping and post-escaping are not suitable. For instance, consider the following
+input string: `a: "aaaa\"bbb"`. The expected output is: `a: aaaa\"bbbb`.
+- Pre-escaping: Pre-escaping it will output: `a: "aaaa"bbb"` and `extractKeyValuePairs` will then output: `a: aaaa`
+- Post-escaping: `extractKeyValuePairs` will output `a: aaaa\` and post-escaping will keep it as it is.
+
+Leading escape sequences will be skipped in keys and will be considered invalid for values.
+
+**Examples**
+
+Escape sequences with escape sequence support turned on:
+
+``` sql
+SELECT extractKeyValuePairsWithEscaping('age:a\\x0A\\n\\0') AS kv
+```
+
+Result:
+
+``` result
+┌─kv────────────────┐
+│ {'age':'a\n\n\0'} │
+└───────────────────┘
+```
 
 ## mapAdd
 
@@ -82,7 +227,7 @@ Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sq
 
 **Returned value**
 
--   Depending on the arguments returns one [map](../../sql-reference/data-types/map.md) or [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2), where the first array contains the sorted keys and the second array contains values.
+- Depending on the arguments returns one [map](../../sql-reference/data-types/map.md) or [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2), where the first array contains the sorted keys and the second array contains values.
 
 **Example**
 
@@ -130,7 +275,7 @@ Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sq
 
 **Returned value**
 
--   Depending on the arguments returns one [map](../../sql-reference/data-types/map.md) or [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2), where the first array contains the sorted keys and the second array contains values.
+- Depending on the arguments returns one [map](../../sql-reference/data-types/map.md) or [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2), where the first array contains the sorted keys and the second array contains values.
 
 **Example**
 
@@ -183,17 +328,17 @@ Arguments are [maps](../../sql-reference/data-types/map.md) or two [arrays](../.
 
 Mapped arrays:
 
--   `keys` — Array of keys. [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#uint-ranges)).
--   `values` — Array of values. [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#uint-ranges)).
--   `max` — Maximum key value. Optional. [Int8, Int16, Int32, Int64, Int128, Int256](../../sql-reference/data-types/int-uint.md#int-ranges).
+- `keys` — Array of keys. [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#uint-ranges)).
+- `values` — Array of values. [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#uint-ranges)).
+- `max` — Maximum key value. Optional. [Int8, Int16, Int32, Int64, Int128, Int256](../../sql-reference/data-types/int-uint.md#int-ranges).
 
 or
 
--   `map` — Map with integer keys. [Map](../../sql-reference/data-types/map.md).
+- `map` — Map with integer keys. [Map](../../sql-reference/data-types/map.md).
 
 **Returned value**
 
--   Depending on the arguments returns a [map](../../sql-reference/data-types/map.md) or a [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array): keys in sorted order, and values the corresponding keys.
+- Depending on the arguments returns a [map](../../sql-reference/data-types/map.md) or a [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array): keys in sorted order, and values the corresponding keys.
 
 **Example**
 
@@ -235,14 +380,14 @@ Determines  whether the `map` contains the `key` parameter.
 mapContains(map, key)
 ```
 
-**Parameters**
+**Arguments**
 
--   `map` — Map. [Map](../../sql-reference/data-types/map.md).
--   `key` — Key. Type matches the type of keys of `map` parameter.
+- `map` — Map. [Map](../../sql-reference/data-types/map.md).
+- `key` — Key. Type matches the type of keys of `map` parameter.
 
 **Returned value**
 
--   `1` if `map` contains `key`, `0` if not.
+- `1` if `map` contains `key`, `0` if not.
 
 Type: [UInt8](../../sql-reference/data-types/int-uint.md).
 
@@ -280,13 +425,13 @@ Can be optimized by enabling the [optimize_functions_to_subcolumns](../../operat
 mapKeys(map)
 ```
 
-**Parameters**
+**Arguments**
 
--   `map` — Map. [Map](../../sql-reference/data-types/map.md).
+- `map` — Map. [Map](../../sql-reference/data-types/map.md).
 
 **Returned value**
 
--   Array containing all keys from the `map`.
+- Array containing all keys from the `map`.
 
 Type: [Array](../../sql-reference/data-types/array.md).
 
@@ -323,13 +468,13 @@ Can be optimized by enabling the [optimize_functions_to_subcolumns](../../operat
 mapValues(map)
 ```
 
-**Parameters**
+**Arguments**
 
--   `map` — Map. [Map](../../sql-reference/data-types/map.md).
+- `map` — Map. [Map](../../sql-reference/data-types/map.md).
 
 **Returned value**
 
--   Array containing all the values from `map`.
+- Array containing all the values from `map`.
 
 Type: [Array](../../sql-reference/data-types/array.md).
 
@@ -352,25 +497,24 @@ Result:
 │ ['eleven','11']  │
 │ ['twelve','6.0'] │
 └──────────────────┘
-```  
-  
-## mapContainsKeyLike  
-  
+```
+
+## mapContainsKeyLike
+
 **Syntax**
 
 ```sql
 mapContainsKeyLike(map, pattern)
-```  
-  
-**Parameters**
-  
--   `map` — Map. [Map](../../sql-reference/data-types/map.md).  
--   `pattern`  - String pattern to match.  
-  
+```
+
+**Arguments**
+- `map` — Map. [Map](../../sql-reference/data-types/map.md).
+- `pattern`  - String pattern to match.
+
 **Returned value**
 
--   `1` if `map` contains `key` like specified pattern, `0` if not.  
-  
+- `1` if `map` contains `key` like specified pattern, `0` if not.
+
 **Example**
 
 Query:
@@ -381,34 +525,34 @@ CREATE TABLE test (a Map(String,String)) ENGINE = Memory;
 INSERT INTO test VALUES ({'abc':'abc','def':'def'}), ({'hij':'hij','klm':'klm'});
 
 SELECT mapContainsKeyLike(a, 'a%') FROM test;
-```  
-  
-Result:  
-  
+```
+
+Result:
+
 ```text
 ┌─mapContainsKeyLike(a, 'a%')─┐
 │                           1 │
 │                           0 │
-└─────────────────────────────┘  
-```  
-  
-## mapExtractKeyLike  
-  
+└─────────────────────────────┘
+```
+
+## mapExtractKeyLike
+
 **Syntax**
 
 ```sql
 mapExtractKeyLike(map, pattern)
-```  
-  
-**Parameters**
-  
--   `map` — Map. [Map](../../sql-reference/data-types/map.md).  
--   `pattern`  - String pattern to match.  
-  
+```
+
+**Arguments**
+
+- `map` — Map. [Map](../../sql-reference/data-types/map.md).
+- `pattern`  - String pattern to match.
+
 **Returned value**
 
-- A map contained elements the key of which matchs the specified pattern. If there are no elements matched the pattern, it will return an empty map.
-  
+- A map contained elements the key of which matches the specified pattern. If there are no elements matched the pattern, it will return an empty map.
+
 **Example**
 
 Query:
@@ -419,34 +563,34 @@ CREATE TABLE test (a Map(String,String)) ENGINE = Memory;
 INSERT INTO test VALUES ({'abc':'abc','def':'def'}), ({'hij':'hij','klm':'klm'});
 
 SELECT mapExtractKeyLike(a, 'a%') FROM test;
-```  
-  
-Result:  
-  
+```
+
+Result:
+
 ```text
 ┌─mapExtractKeyLike(a, 'a%')─┐
 │ {'abc':'abc'}              │
 │ {}                         │
 └────────────────────────────┘
-```  
-  
-## mapApply  
-  
+```
+
+## mapApply
+
 **Syntax**
 
 ```sql
 mapApply(func, map)
-```  
-  
-**Parameters**
-  
--   `func`  - [Lambda function](../../sql-reference/functions/index.md#higher-order-functions---operator-and-lambdaparams-expr-function).
--   `map` — [Map](../../sql-reference/data-types/map.md).
+```
+
+**Arguments**
+
+- `func`  - [Lambda function](../../sql-reference/functions/index.md#higher-order-functions---operator-and-lambdaparams-expr-function).
+- `map` — [Map](../../sql-reference/data-types/map.md).
 
 **Returned value**
 
 - Returns a map obtained from the original map by application of `func(map1[i], …, mapN[i])` for each element.
-  
+
 **Example**
 
 Query:
@@ -458,36 +602,36 @@ FROM
     SELECT map('key1', number, 'key2', number * 2) AS _map
     FROM numbers(3)
 )
-```  
-  
-Result:  
-  
+```
+
+Result:
+
 ```text
 ┌─r─────────────────────┐
 │ {'key1':0,'key2':0}   │
 │ {'key1':10,'key2':20} │
 │ {'key1':20,'key2':40} │
 └───────────────────────┘
-```  
+```
+
+## mapFilter
 
-## mapFilter  
-  
 **Syntax**
 
 ```sql
 mapFilter(func, map)
-```  
-  
-**Parameters**
+```
 
--   `func`  - [Lambda function](../../sql-reference/functions/index.md#higher-order-functions---operator-and-lambdaparams-expr-function).
--   `map` — [Map](../../sql-reference/data-types/map.md).  
+**Arguments**
+
+- `func`  - [Lambda function](../../sql-reference/functions/index.md#higher-order-functions---operator-and-lambdaparams-expr-function).
+- `map` — [Map](../../sql-reference/data-types/map.md).
 
 **Returned value**
 
 - Returns a map containing only the elements in `map` for which `func(map1[i], …, mapN[i])` returns something other than 0.
-  
-  
+
+
 **Example**
 
 Query:
@@ -499,48 +643,195 @@ FROM
     SELECT map('key1', number, 'key2', number * 2) AS _map
     FROM numbers(3)
 )
-```  
-  
-Result:  
-  
+```
+
+Result:
+
 ```text
 ┌─r───────────────────┐
 │ {'key1':0,'key2':0} │
 │ {'key2':2}          │
 │ {'key1':2,'key2':4} │
 └─────────────────────┘
-```  
+```
 
 
-## mapUpdate  
-  
+## mapUpdate
+
 **Syntax**
 
 ```sql
 mapUpdate(map1, map2)
-```  
-  
-**Parameters**
+```
 
--   `map1` [Map](../../sql-reference/data-types/map.md).
--   `map2` [Map](../../sql-reference/data-types/map.md).
+**Arguments**
+
+- `map1` [Map](../../sql-reference/data-types/map.md).
+- `map2` [Map](../../sql-reference/data-types/map.md).
 
 **Returned value**
 
 - Returns a map1 with values updated of values for the corresponding keys in map2.
-  
+
 **Example**
 
 Query:
 
 ```sql
 SELECT mapUpdate(map('key1', 0, 'key3', 0), map('key1', 10, 'key2', 10)) AS map;
-```  
-  
-Result:  
-  
+```
+
+Result:
+
 ```text
 ┌─map────────────────────────────┐
 │ {'key3':0,'key1':10,'key2':10} │
 └────────────────────────────────┘
-```  
+```
+
+## mapConcat
+
+**Syntax**
+
+```sql
+mapConcat(maps)
+```
+
+**Arguments**
+
+-   `maps` – Arbitrary number of arguments of [Map](../../sql-reference/data-types/map.md) type.
+
+**Returned value**
+
+- Returns a map with concatenated maps passed as arguments. If there are same keys in two or more maps, all of them are added to the result map, but only the first one is accessible via operator `[]`
+
+**Examples**
+
+Query:
+
+```sql
+SELECT mapConcat(map('key1', 1, 'key3', 3), map('key2', 2)) AS map;
+```
+
+Result:
+
+```text
+┌─map──────────────────────────┐
+│ {'key1':1,'key3':3,'key2':2} │
+└──────────────────────────────┘
+```
+
+Query:
+
+```sql
+SELECT mapConcat(map('key1', 1, 'key2', 2), map('key1', 3)) AS map, map['key1'];
+```
+
+Result:
+
+```text
+┌─map──────────────────────────┬─elem─┐
+│ {'key1':1,'key2':2,'key1':3} │    1 │
+└──────────────────────────────┴──────┘
+```
+
+## mapExists(\[func,\], map)
+
+Returns 1 if there is at least one key-value pair in `map` for which `func(key, value)` returns something other than 0. Otherwise, it returns 0.
+
+Note that the `mapExists` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You can pass a lambda function to it as the first argument.
+
+**Example**
+
+Query:
+
+```sql
+SELECT mapExists((k, v) -> (v = 1), map('k1', 1, 'k2', 2)) AS res
+```
+
+Result:
+
+```text
+┌─res─┐
+│   1 │
+└─────┘
+```
+
+## mapAll(\[func,\] map)
+
+Returns 1 if `func(key, value)` returns something other than 0 for all key-value pairs in `map`. Otherwise, it returns 0.
+
+Note that the `mapAll` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You can pass a lambda function to it as the first argument.
+
+**Example**
+
+Query:
+
+```sql
+SELECT mapAll((k, v) -> (v = 1), map('k1', 1, 'k2', 2)) AS res
+```
+
+Result:
+
+```text
+┌─res─┐
+│   0 │
+└─────┘
+```
+
+## mapSort(\[func,\], map)
+
+Sorts the elements of the `map` in ascending order. If the `func` function is specified, sorting order is determined by the result of the `func` function applied to the keys and values of the map.
+
+**Examples**
+
+``` sql
+SELECT mapSort(map('key2', 2, 'key3', 1, 'key1', 3)) AS map;
+```
+
+``` text
+┌─map──────────────────────────┐
+│ {'key1':3,'key2':2,'key3':1} │
+└──────────────────────────────┘
+```
+
+``` sql
+SELECT mapSort((k, v) -> v, map('key2', 2, 'key3', 1, 'key1', 3)) AS map;
+```
+
+``` text
+┌─map──────────────────────────┐
+│ {'key3':1,'key2':2,'key1':3} │
+└──────────────────────────────┘
+```
+
+For more details see the [reference](../../sql-reference/functions/array-functions.md#array_functions-sort) for `arraySort` function.
+
+## mapReverseSort(\[func,\], map)
+
+Sorts the elements of the `map` in descending order. If the `func` function is specified, sorting order is determined by the result of the `func` function applied to the keys and values of the map.
+
+
+**Examples**
+
+``` sql
+SELECT mapReverseSort(map('key2', 2, 'key3', 1, 'key1', 3)) AS map;
+```
+
+``` text
+┌─map──────────────────────────┐
+│ {'key3':1,'key2':2,'key1':3} │
+└──────────────────────────────┘
+```
+
+``` sql
+SELECT mapReverseSort((k, v) -> v, map('key2', 2, 'key3', 1, 'key1', 3)) AS map;
+```
+
+``` text
+┌─map──────────────────────────┐
+│ {'key1':3,'key2':2,'key3':1} │
+└──────────────────────────────┘
+```
+
+For more details see the [reference](../../sql-reference/functions/array-functions.md#array_functions-reverse-sort) for `arrayReverseSort` function.
diff --git a/docs/en/sql-reference/functions/type-conversion-functions.md b/docs/en/sql-reference/functions/type-conversion-functions.md
index 5d96113fe50..c7c66cc771f 100644
--- a/docs/en/sql-reference/functions/type-conversion-functions.md
+++ b/docs/en/sql-reference/functions/type-conversion-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/type-conversion-functions
-sidebar_position: 38
+sidebar_position: 185
 sidebar_label: Type Conversion
 ---
 
@@ -8,25 +8,61 @@ sidebar_label: Type Conversion
 
 ## Common Issues with Data Conversion
 
+ClickHouse generally uses the [same behavior as C++ programs](https://en.cppreference.com/w/cpp/language/implicit_conversion).
+
+`to<type>` functions and [cast](#castx-t) behave differently in some cases, for example in case of [LowCardinality](../data-types/lowcardinality.md): [cast](#castx-t) removes [LowCardinality](../data-types/lowcardinality.md) trait `to<type>` functions don't. The same with [Nullable](../data-types/nullable.md), this behaviour is not compatible with SQL standard, and it can be changed using [cast_keep_nullable](../../operations/settings/settings.md/#cast_keep_nullable) setting.
+
+:::note
 Be aware of potential data loss if values of a datatype are converted to a smaller datatype (for example from `Int64` to `Int32`) or between
 incompatible datatypes (for example from `String` to `Int`). Make sure to check carefully if the result is as expected.
+:::
 
-ClickHouse generally uses the [same behavior as C++ programs](https://en.cppreference.com/w/cpp/language/implicit_conversion).
+Example:
+
+```sql
+SELECT
+    toTypeName(toLowCardinality('') AS val) AS source_type,
+    toTypeName(toString(val)) AS to_type_result_type,
+    toTypeName(CAST(val, 'String')) AS cast_result_type
+
+┌─source_type────────────┬─to_type_result_type────┬─cast_result_type─┐
+│ LowCardinality(String) │ LowCardinality(String) │ String           │
+└────────────────────────┴────────────────────────┴──────────────────┘
+
+SELECT
+    toTypeName(toNullable('') AS val) AS source_type,
+    toTypeName(toString(val)) AS to_type_result_type,
+    toTypeName(CAST(val, 'String')) AS cast_result_type
+    
+┌─source_type──────┬─to_type_result_type─┬─cast_result_type─┐
+│ Nullable(String) │ Nullable(String)    │ String           │
+└──────────────────┴─────────────────────┴──────────────────┘
+
+SELECT
+    toTypeName(toNullable('') AS val) AS source_type,
+    toTypeName(toString(val)) AS to_type_result_type,
+    toTypeName(CAST(val, 'String')) AS cast_result_type
+SETTINGS cast_keep_nullable = 1
+
+┌─source_type──────┬─to_type_result_type─┬─cast_result_type─┐
+│ Nullable(String) │ Nullable(String)    │ Nullable(String) │
+└──────────────────┴─────────────────────┴──────────────────┘
+```
 
 ## toInt(8\|16\|32\|64\|128\|256)
 
 Converts an input value to a value the [Int](/docs/en/sql-reference/data-types/int-uint.md) data type. This function family includes:
 
--   `toInt8(expr)` — Converts to a value of data type `Int8`.
--   `toInt16(expr)` — Converts to a value of data type `Int16`.
--   `toInt32(expr)` — Converts to a value of data type `Int32`.
--   `toInt64(expr)` — Converts to a value of data type `Int64`.
--   `toInt128(expr)` — Converts to a value of data type `Int128`.
--   `toInt256(expr)` — Converts to a value of data type `Int256`.
+- `toInt8(expr)` — Converts to a value of data type `Int8`.
+- `toInt16(expr)` — Converts to a value of data type `Int16`.
+- `toInt32(expr)` — Converts to a value of data type `Int32`.
+- `toInt64(expr)` — Converts to a value of data type `Int64`.
+- `toInt128(expr)` — Converts to a value of data type `Int128`.
+- `toInt256(expr)` — Converts to a value of data type `Int256`.
 
 **Arguments**
 
--   `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions) returning a number or a string with the decimal representation of a number. Binary, octal, and hexadecimal representations of numbers are not supported. Leading zeroes are stripped.
+- `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions) returning a number or a string with the decimal representation of a number. Binary, octal, and hexadecimal representations of numbers are not supported. Leading zeroes are stripped.
 
 **Returned value**
 
@@ -117,19 +153,19 @@ Result:
 
 Converts an input value to the [UInt](/docs/en/sql-reference/data-types/int-uint.md) data type. This function family includes:
 
--   `toUInt8(expr)` — Converts to a value of data type `UInt8`.
--   `toUInt16(expr)` — Converts to a value of data type `UInt16`.
--   `toUInt32(expr)` — Converts to a value of data type `UInt32`.
--   `toUInt64(expr)` — Converts to a value of data type `UInt64`.
--   `toUInt256(expr)` — Converts to a value of data type `UInt256`.
+- `toUInt8(expr)` — Converts to a value of data type `UInt8`.
+- `toUInt16(expr)` — Converts to a value of data type `UInt16`.
+- `toUInt32(expr)` — Converts to a value of data type `UInt32`.
+- `toUInt64(expr)` — Converts to a value of data type `UInt64`.
+- `toUInt256(expr)` — Converts to a value of data type `UInt256`.
 
 **Arguments**
 
--   `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions) returning a number or a string with the decimal representation of a number. Binary, octal, and hexadecimal representations of numbers are not supported. Leading zeroes are stripped.
+- `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions) returning a number or a string with the decimal representation of a number. Binary, octal, and hexadecimal representations of numbers are not supported. Leading zeroes are stripped.
 
 **Returned value**
 
--   Integer value in the `UInt8`, `UInt16`, `UInt32`, `UInt64` or `UInt256` data type.
+- Integer value in the `UInt8`, `UInt16`, `UInt32`, `UInt64` or `UInt256` data type.
 
 Functions use [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning they truncate fractional digits of numbers.
 
@@ -304,11 +340,11 @@ toDate32(expr)
 
 **Arguments**
 
--   `expr` — The value. [String](/docs/en/sql-reference/data-types/string.md), [UInt32](/docs/en/sql-reference/data-types/int-uint.md) or [Date](/docs/en/sql-reference/data-types/date.md).
+- `expr` — The value. [String](/docs/en/sql-reference/data-types/string.md), [UInt32](/docs/en/sql-reference/data-types/int-uint.md) or [Date](/docs/en/sql-reference/data-types/date.md).
 
 **Returned value**
 
--   A calendar date. Type [Date32](/docs/en/sql-reference/data-types/date32.md).
+- A calendar date. Type [Date32](/docs/en/sql-reference/data-types/date32.md).
 
 **Example**
 
@@ -422,13 +458,13 @@ toDateTime64(expr, scale, [timezone])
 
 **Arguments**
 
--   `expr` — The value. [String](/docs/en/sql-reference/data-types/string.md), [UInt32](/docs/en/sql-reference/data-types/int-uint.md), [Float](/docs/en/sql-reference/data-types/float.md) or [DateTime](/docs/en/sql-reference/data-types/datetime.md).
--   `scale` - Tick size (precision): 10<sup>-precision</sup> seconds. Valid range: [ 0 : 9 ].
--   `timezone` - Time zone of the specified datetime64 object.
+- `expr` — The value. [String](/docs/en/sql-reference/data-types/string.md), [UInt32](/docs/en/sql-reference/data-types/int-uint.md), [Float](/docs/en/sql-reference/data-types/float.md) or [DateTime](/docs/en/sql-reference/data-types/datetime.md).
+- `scale` - Tick size (precision): 10<sup>-precision</sup> seconds. Valid range: [ 0 : 9 ].
+- `timezone` - Time zone of the specified datetime64 object.
 
 **Returned value**
 
--   A calendar date and time of day, with sub-second precision.
+- A calendar date and time of day, with sub-second precision.
 
 Type: [DateTime64](/docs/en/sql-reference/data-types/datetime64.md).
 
@@ -488,33 +524,33 @@ SELECT toDateTime64('2019-01-01 00:00:00', 3, 'Asia/Istanbul') AS value, toTypeN
 
 Converts `value` to the [Decimal](/docs/en/sql-reference/data-types/decimal.md) data type with precision of `S`. The `value` can be a number or a string. The `S` (scale) parameter specifies the number of decimal places.
 
--   `toDecimal32(value, S)`
--   `toDecimal64(value, S)`
--   `toDecimal128(value, S)`
--   `toDecimal256(value, S)`
+- `toDecimal32(value, S)`
+- `toDecimal64(value, S)`
+- `toDecimal128(value, S)`
+- `toDecimal256(value, S)`
 
 ## toDecimal(32\|64\|128\|256)OrNull
 
 Converts an input string to a [Nullable(Decimal(P,S))](/docs/en/sql-reference/data-types/decimal.md) data type value. This family of functions includes:
 
--   `toDecimal32OrNull(expr, S)` — Results in `Nullable(Decimal32(S))` data type.
--   `toDecimal64OrNull(expr, S)` — Results in `Nullable(Decimal64(S))` data type.
--   `toDecimal128OrNull(expr, S)` — Results in `Nullable(Decimal128(S))` data type.
--   `toDecimal256OrNull(expr, S)` — Results in `Nullable(Decimal256(S))` data type.
+- `toDecimal32OrNull(expr, S)` — Results in `Nullable(Decimal32(S))` data type.
+- `toDecimal64OrNull(expr, S)` — Results in `Nullable(Decimal64(S))` data type.
+- `toDecimal128OrNull(expr, S)` — Results in `Nullable(Decimal128(S))` data type.
+- `toDecimal256OrNull(expr, S)` — Results in `Nullable(Decimal256(S))` data type.
 
 These functions should be used instead of `toDecimal*()` functions, if you prefer to get a `NULL` value instead of an exception in the event of an input value parsing error.
 
 **Arguments**
 
--   `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions), returns a value in the [String](/docs/en/sql-reference/data-types/string.md) data type. ClickHouse expects the textual representation of the decimal number. For example, `'1.111'`.
--   `S` — Scale, the number of decimal places in the resulting value.
+- `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions), returns a value in the [String](/docs/en/sql-reference/data-types/string.md) data type. ClickHouse expects the textual representation of the decimal number. For example, `'1.111'`.
+- `S` — Scale, the number of decimal places in the resulting value.
 
 **Returned value**
 
 A value in the `Nullable(Decimal(P,S))` data type. The value contains:
 
--   Number with `S` decimal places, if ClickHouse interprets the input string as a number.
--   `NULL`, if ClickHouse can’t interpret the input string as a number or if the input number contains more than `S` decimal places.
+- Number with `S` decimal places, if ClickHouse interprets the input string as a number.
+- `NULL`, if ClickHouse can’t interpret the input string as a number or if the input number contains more than `S` decimal places.
 
 **Examples**
 
@@ -551,24 +587,24 @@ Result:
 
 Converts an input string to a [Decimal(P,S)](/docs/en/sql-reference/data-types/decimal.md) data type value. This family of functions includes:
 
--   `toDecimal32OrDefault(expr, S)` — Results in `Decimal32(S)` data type.
--   `toDecimal64OrDefault(expr, S)` — Results in `Decimal64(S)` data type.
--   `toDecimal128OrDefault(expr, S)` — Results in `Decimal128(S)` data type.
--   `toDecimal256OrDefault(expr, S)` — Results in `Decimal256(S)` data type.
+- `toDecimal32OrDefault(expr, S)` — Results in `Decimal32(S)` data type.
+- `toDecimal64OrDefault(expr, S)` — Results in `Decimal64(S)` data type.
+- `toDecimal128OrDefault(expr, S)` — Results in `Decimal128(S)` data type.
+- `toDecimal256OrDefault(expr, S)` — Results in `Decimal256(S)` data type.
 
 These functions should be used instead of `toDecimal*()` functions, if you prefer to get a default value instead of an exception in the event of an input value parsing error.
 
 **Arguments**
 
--   `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions), returns a value in the [String](/docs/en/sql-reference/data-types/string.md) data type. ClickHouse expects the textual representation of the decimal number. For example, `'1.111'`.
--   `S` — Scale, the number of decimal places in the resulting value.
+- `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions), returns a value in the [String](/docs/en/sql-reference/data-types/string.md) data type. ClickHouse expects the textual representation of the decimal number. For example, `'1.111'`.
+- `S` — Scale, the number of decimal places in the resulting value.
 
 **Returned value**
 
 A value in the `Decimal(P,S)` data type. The value contains:
 
--   Number with `S` decimal places, if ClickHouse interprets the input string as a number.
--   Default `Decimal(P,S)` data type value, if ClickHouse can’t interpret the input string as a number or if the input number contains more than `S` decimal places.
+- Number with `S` decimal places, if ClickHouse interprets the input string as a number.
+- Default `Decimal(P,S)` data type value, if ClickHouse can’t interpret the input string as a number or if the input number contains more than `S` decimal places.
 
 **Examples**
 
@@ -604,24 +640,24 @@ Result:
 
 Converts an input value to the [Decimal(P,S)](/docs/en/sql-reference/data-types/decimal.md) data type. This family of functions includes:
 
--   `toDecimal32OrZero( expr, S)` — Results in `Decimal32(S)` data type.
--   `toDecimal64OrZero( expr, S)` — Results in `Decimal64(S)` data type.
--   `toDecimal128OrZero( expr, S)` — Results in `Decimal128(S)` data type.
--   `toDecimal256OrZero( expr, S)` — Results in `Decimal256(S)` data type.
+- `toDecimal32OrZero( expr, S)` — Results in `Decimal32(S)` data type.
+- `toDecimal64OrZero( expr, S)` — Results in `Decimal64(S)` data type.
+- `toDecimal128OrZero( expr, S)` — Results in `Decimal128(S)` data type.
+- `toDecimal256OrZero( expr, S)` — Results in `Decimal256(S)` data type.
 
 These functions should be used instead of `toDecimal*()` functions, if you prefer to get a `0` value instead of an exception in the event of an input value parsing error.
 
 **Arguments**
 
--   `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions), returns a value in the [String](/docs/en/sql-reference/data-types/string.md) data type. ClickHouse expects the textual representation of the decimal number. For example, `'1.111'`.
--   `S` — Scale, the number of decimal places in the resulting value.
+- `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions), returns a value in the [String](/docs/en/sql-reference/data-types/string.md) data type. ClickHouse expects the textual representation of the decimal number. For example, `'1.111'`.
+- `S` — Scale, the number of decimal places in the resulting value.
 
 **Returned value**
 
 A value in the `Nullable(Decimal(P,S))` data type. The value contains:
 
--   Number with `S` decimal places, if ClickHouse interprets the input string as a number.
--   0 with `S` decimal places, if ClickHouse can’t interpret the input string as a number or if the input number contains more than `S` decimal places.
+- Number with `S` decimal places, if ClickHouse interprets the input string as a number.
+- 0 with `S` decimal places, if ClickHouse can’t interpret the input string as a number or if the input number contains more than `S` decimal places.
 
 **Example**
 
@@ -737,6 +773,44 @@ Result:
 └────────────┴───────┘
 ```
 
+## toDecimalString
+
+Converts a numeric value to String with the number of fractional digits in the output specified by the user.
+
+**Syntax**
+
+``` sql
+toDecimalString(number, scale)
+```
+
+**Parameters**
+
+- `number` — Value to be represented as String, [Int, UInt](/docs/en/sql-reference/data-types/int-uint.md), [Float](/docs/en/sql-reference/data-types/float.md), [Decimal](/docs/en/sql-reference/data-types/decimal.md),
+- `scale` — Number of fractional digits, [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+    * Maximum scale for [Decimal](/docs/en/sql-reference/data-types/decimal.md) and [Int, UInt](/docs/en/sql-reference/data-types/int-uint.md) types is 77 (it is the maximum possible number of significant digits for Decimal),
+    * Maximum scale for [Float](/docs/en/sql-reference/data-types/float.md) is 60.
+
+**Returned value**
+
+- Input value represented as [String](/docs/en/sql-reference/data-types/string.md) with given number of fractional digits (scale).
+    The number is rounded up or down according to common arithmetics in case requested scale is smaller than original number's scale.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT toDecimalString(CAST('64.32', 'Float64'), 5);
+```
+
+Result:
+
+```response
+┌toDecimalString(CAST('64.32', 'Float64'), 5)─┐
+│ 64.32000                                    │
+└─────────────────────────────────────────────┘
+```
+
 ## reinterpretAsUInt(8\|16\|32\|64)
 
 ## reinterpretAsInt(8\|16\|32\|64)
@@ -773,11 +847,11 @@ reinterpretAsUUID(fixed_string)
 
 **Arguments**
 
--   `fixed_string` — Big-endian byte string. [FixedString](/docs/en/sql-reference/data-types/fixedstring.md/#fixedstring).
+- `fixed_string` — Big-endian byte string. [FixedString](/docs/en/sql-reference/data-types/fixedstring.md/#fixedstring).
 
 **Returned value**
 
--   The UUID type value. [UUID](/docs/en/sql-reference/data-types/uuid.md/#uuid-data-type).
+- The UUID type value. [UUID](/docs/en/sql-reference/data-types/uuid.md/#uuid-data-type).
 
 **Examples**
 
@@ -829,12 +903,12 @@ reinterpret(x, type)
 
 **Arguments**
 
--   `x` — Any type.
--   `type` — Destination type. [String](/docs/en/sql-reference/data-types/string.md).
+- `x` — Any type.
+- `type` — Destination type. [String](/docs/en/sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Destination type value.
+- Destination type value.
 
 **Examples**
 
@@ -868,13 +942,13 @@ x::t
 
 **Arguments**
 
--   `x` — A value to convert. May be of any type.
--   `T` — The name of the target data type. [String](/docs/en/sql-reference/data-types/string.md).
--   `t` — The target data type.
+- `x` — A value to convert. May be of any type.
+- `T` — The name of the target data type. [String](/docs/en/sql-reference/data-types/string.md).
+- `t` — The target data type.
 
 **Returned value**
 
--    Converted value.
+- Converted value.
 
 :::note
 If the input value does not fit the bounds of the target type, the result overflows. For example, `CAST(-1, 'UInt8')` returns `255`.
@@ -956,7 +1030,7 @@ Result:
 
 **See also**
 
--   [cast_keep_nullable](/docs/en/operations/settings/settings.md/#cast_keep_nullable) setting
+- [cast_keep_nullable](../../operations/settings/settings.md/#cast_keep_nullable) setting
 
 ## accurateCast(x, T)
 
@@ -1004,12 +1078,12 @@ accurateCastOrNull(x, T)
 
 **Parameters**
 
--   `x` — Input value.
--   `T` — The name of the returned data type.
+- `x` — Input value.
+- `T` — The name of the returned data type.
 
 **Returned value**
 
--   The value, converted to the specified data type `T`.
+- The value, converted to the specified data type `T`.
 
 **Example**
 
@@ -1057,13 +1131,13 @@ accurateCastOrDefault(x, T)
 
 **Parameters**
 
--   `x` — Input value.
--   `T` — The name of the returned data type.
--   `default_value` — Default value of returned data type.
+- `x` — Input value.
+- `T` — The name of the returned data type.
+- `default_value` — Default value of returned data type.
 
 **Returned value**
 
--   The value converted to the specified data type `T`.
+- The value converted to the specified data type `T`.
 
 **Example**
 
@@ -1120,11 +1194,11 @@ toIntervalYear(number)
 
 **Arguments**
 
--   `number` — Duration of interval. Positive integer number.
+- `number` — Duration of interval. Positive integer number.
 
 **Returned values**
 
--   The value in `Interval` data type.
+- The value in `Interval` data type.
 
 **Example**
 
@@ -1148,6 +1222,102 @@ Result:
 └───────────────────────────┴──────────────────────────────┘
 ```
 
+## parseDateTime {#type_conversion_functions-parseDateTime}
+
+Converts a [String](/docs/en/sql-reference/data-types/string.md) to [DateTime](/docs/en/sql-reference/data-types/datetime.md) according to a [MySQL format string](https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html#function_date-format).
+
+This function is the opposite operation of function [formatDateTime](/docs/en/sql-reference/functions/date-time-functions.md#date_time_functions-formatDateTime).
+
+**Syntax**
+
+``` sql
+parseDateTime(str, format[, timezone])
+```
+
+**Arguments**
+
+- `str` — the String to be parsed
+- `format` — the format string
+- `timezone` — [Timezone](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-timezone). Optional.
+
+**Returned value(s)**
+
+Returns DateTime values parsed from input string according to a MySQL style format string.
+
+**Supported format specifiers**
+
+All format specifiers listed in [formatDateTime](/docs/en/sql-reference/functions/date-time-functions.md#date_time_functions-formatDateTime) except:
+- %Q: Quarter (1-4) 
+
+**Example**
+
+``` sql
+SELECT parseDateTime('2021-01-04+23:00:00', '%Y-%m-%d+%H:%i:%s')
+
+┌─parseDateTime('2021-01-04+23:00:00', '%Y-%m-%d+%H:%i:%s')─┐
+│                                       2021-01-04 23:00:00 │
+└───────────────────────────────────────────────────────────┘
+```
+
+Alias: `TO_TIMESTAMP`.
+
+## parseDateTimeOrZero
+
+Same as for [parseDateTime](#type_conversion_functions-parseDateTime) except that it returns zero date when it encounters a date format that cannot be processed.
+
+## parseDateTimeOrNull
+
+Same as for [parseDateTime](#type_conversion_functions-parseDateTime) except that it returns `NULL` when it encounters a date format that cannot be processed.
+
+Alias: `str_to_date`.
+
+## parseDateTimeInJodaSyntax {#type_conversion_functions-parseDateTimeInJodaSyntax}
+
+Similar to [parseDateTime](#parsedatetime), except that the format string is in [Joda](https://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html) instead of MySQL syntax.
+
+This function is the opposite operation of function [formatDateTimeInJodaSyntax](/docs/en/sql-reference/functions/date-time-functions.md#date_time_functions-formatDateTimeInJodaSyntax).
+
+**Syntax**
+
+``` sql
+parseDateTimeInJodaSyntax(str, format[, timezone])
+```
+
+**Arguments**
+
+- `str` — the String to be parsed
+- `format` — the format string
+- `timezone` — [Timezone](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-timezone). Optional.
+
+**Returned value(s)**
+
+Returns DateTime values parsed from input string according to a Joda style format.
+
+**Supported format specifiers**
+
+All format specifiers listed in [formatDateTimeInJoda](/docs/en/sql-reference/functions/date-time-functions.md#date_time_functions-formatDateTime) are supported, except:
+- S: fraction of second
+- z: time zone
+- Z: time zone offset/id
+
+**Example**
+
+``` sql
+SELECT parseDateTimeInJodaSyntax('2023-02-24 14:53:31', 'yyyy-MM-dd HH:mm:ss', 'Europe/Minsk')
+
+┌─parseDateTimeInJodaSyntax('2023-02-24 14:53:31', 'yyyy-MM-dd HH:mm:ss', 'Europe/Minsk')─┐
+│                                                                     2023-02-24 14:53:31 │
+└─────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+## parseDateTimeInJodaSyntaxOrZero
+
+Same as for [parseDateTimeInJodaSyntax](#type_conversion_functions-parseDateTimeInJodaSyntax) except that it returns zero date when it encounters a date format that cannot be processed.
+
+## parseDateTimeInJodaSyntaxOrNull
+
+Same as for [parseDateTimeInJodaSyntax](#type_conversion_functions-parseDateTimeInJodaSyntax) except that it returns `NULL` when it encounters a date format that cannot be processed.
+
 ## parseDateTimeBestEffort
 ## parseDateTime32BestEffort
 
@@ -1163,22 +1333,22 @@ parseDateTimeBestEffort(time_string [, time_zone])
 
 **Arguments**
 
--   `time_string` — String containing a date and time to convert. [String](/docs/en/sql-reference/data-types/string.md).
--   `time_zone` — Time zone. The function parses `time_string` according to the time zone. [String](/docs/en/sql-reference/data-types/string.md).
+- `time_string` — String containing a date and time to convert. [String](/docs/en/sql-reference/data-types/string.md).
+- `time_zone` — Time zone. The function parses `time_string` according to the time zone. [String](/docs/en/sql-reference/data-types/string.md).
 
 **Supported non-standard formats**
 
--   A string containing 9..10 digit [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
--   A string with a date and a time component: `YYYYMMDDhhmmss`, `DD/MM/YYYY hh:mm:ss`, `DD-MM-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
--   A string with a date, but no time component: `YYYY`, `YYYYMM`, `YYYY*MM`, `DD/MM/YYYY`, `DD-MM-YY` etc.
--   A string with a day and time: `DD`, `DD hh`, `DD hh:mm`. In this case `YYYY-MM` are substituted as `2000-01`.
--   A string that includes the date and time along with time zone offset information: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. For example, `2020-12-12 17:36:00 -5:00`.
+- A string containing 9..10 digit [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
+- A string with a date and a time component: `YYYYMMDDhhmmss`, `DD/MM/YYYY hh:mm:ss`, `DD-MM-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
+- A string with a date, but no time component: `YYYY`, `YYYYMM`, `YYYY*MM`, `DD/MM/YYYY`, `DD-MM-YY` etc.
+- A string with a day and time: `DD`, `DD hh`, `DD hh:mm`. In this case `YYYY-MM` are substituted as `2000-01`.
+- A string that includes the date and time along with time zone offset information: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. For example, `2020-12-12 17:36:00 -5:00`.
 
 For all of the formats with separator the function parses months names expressed by their full name or by the first three letters of a month name. Examples: `24/DEC/18`, `24-Dec-18`, `01-September-2018`.
 
 **Returned value**
 
--   `time_string` converted to the [DateTime](/docs/en/sql-reference/data-types/datetime.md) data type.
+- `time_string` converted to the [DateTime](/docs/en/sql-reference/data-types/datetime.md) data type.
 
 **Examples**
 
@@ -1258,10 +1428,10 @@ Result:
 
 **See Also**
 
--   [RFC 1123](https://tools.ietf.org/html/rfc1123)
--   [toDate](#todate)
--   [toDateTime](#todatetime)
--   [ISO 8601 announcement by @xkcd](https://xkcd.com/1179/)
+- [RFC 1123](https://tools.ietf.org/html/rfc1123)
+- [toDate](#todate)
+- [toDateTime](#todatetime)
+- [ISO 8601 announcement by @xkcd](https://xkcd.com/1179/)
 
 ## parseDateTimeBestEffortUS
 
@@ -1297,13 +1467,13 @@ parseDateTime64BestEffort(time_string [, precision [, time_zone]])
 
 **Parameters**
 
--   `time_string` — String containing a date or date with time to convert. [String](/docs/en/sql-reference/data-types/string.md).
--   `precision` — Required precision. `3` — for milliseconds, `6` — for microseconds. Default — `3`. Optional. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
--   `time_zone` — [Timezone](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](/docs/en/sql-reference/data-types/string.md).
+- `time_string` — String containing a date or date with time to convert. [String](/docs/en/sql-reference/data-types/string.md).
+- `precision` — Required precision. `3` — for milliseconds, `6` — for microseconds. Default — `3`. Optional. [UInt8](/docs/en/sql-reference/data-types/int-uint.md).
+- `time_zone` — [Timezone](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](/docs/en/sql-reference/data-types/string.md).
 
 **Returned value**
 
--   `time_string` converted to the [DateTime](/docs/en/sql-reference/data-types/datetime.md) data type.
+- `time_string` converted to the [DateTime](/docs/en/sql-reference/data-types/datetime.md) data type.
 
 **Examples**
 
@@ -1351,7 +1521,6 @@ Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort), except that
 
 Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort), except that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity and returns zero date or zero date time when it encounters a date format that cannot be processed.
 
-
 ## toLowCardinality
 
 Converts input parameter to the [LowCardinality](/docs/en/sql-reference/data-types/lowcardinality.md) version of same data type.
@@ -1366,11 +1535,11 @@ toLowCardinality(expr)
 
 **Arguments**
 
--   `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions) resulting in one of the [supported data types](/docs/en/sql-reference/data-types/index.md/#data_types).
+- `expr` — [Expression](/docs/en/sql-reference/syntax.md/#syntax-expressions) resulting in one of the [supported data types](/docs/en/sql-reference/data-types/index.md/#data_types).
 
 **Returned values**
 
--   Result of `expr`.
+- Result of `expr`.
 
 Type: `LowCardinality(expr_result_type)`
 
@@ -1412,11 +1581,11 @@ toUnixTimestamp64Nano(value)
 
 **Arguments**
 
--   `value` — DateTime64 value with any precision.
+- `value` — DateTime64 value with any precision.
 
 **Returned value**
 
--   `value` converted to the `Int64` data type.
+- `value` converted to the `Int64` data type.
 
 **Examples**
 
@@ -1468,12 +1637,12 @@ fromUnixTimestamp64Nano(value [, timezone])
 
 **Arguments**
 
--   `value` — `Int64` value with any precision.
--   `timezone` — `String` (optional) timezone name of the result.
+- `value` — `Int64` value with any precision.
+- `timezone` — `String` (optional) timezone name of the result.
 
 **Returned value**
 
--   `value` converted to the `DateTime64` data type.
+- `value` converted to the `DateTime64` data type.
 
 **Example**
 
@@ -1504,12 +1673,12 @@ formatRow(format, x, y, ...)
 
 **Arguments**
 
--   `format` — Text format. For example, [CSV](/docs/en/interfaces/formats.md/#csv), [TSV](/docs/en/interfaces/formats.md/#tabseparated).
--   `x`,`y`, ... — Expressions.
+- `format` — Text format. For example, [CSV](/docs/en/interfaces/formats.md/#csv), [TSV](/docs/en/interfaces/formats.md/#tabseparated).
+- `x`,`y`, ... — Expressions.
 
 **Returned value**
 
--   A formatted string. (for text formats it's usually terminated with the new line character).
+- A formatted string. (for text formats it's usually terminated with the new line character).
 
 **Example**
 
@@ -1575,12 +1744,12 @@ formatRowNoNewline(format, x, y, ...)
 
 **Arguments**
 
--   `format` — Text format. For example, [CSV](/docs/en/interfaces/formats.md/#csv), [TSV](/docs/en/interfaces/formats.md/#tabseparated).
--   `x`,`y`, ... — Expressions.
+- `format` — Text format. For example, [CSV](/docs/en/interfaces/formats.md/#csv), [TSV](/docs/en/interfaces/formats.md/#tabseparated).
+- `x`,`y`, ... — Expressions.
 
 **Returned value**
 
--   A formatted string.
+- A formatted string.
 
 **Example**
 
@@ -1613,12 +1782,12 @@ snowflakeToDateTime(value [, time_zone])
 
 **Parameters**
 
--   `value` — Snowflake ID. [Int64](/docs/en/sql-reference/data-types/int-uint.md).
--   `time_zone` — [Timezone](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](/docs/en/sql-reference/data-types/string.md).
+- `value` — Snowflake ID. [Int64](/docs/en/sql-reference/data-types/int-uint.md).
+- `time_zone` — [Timezone](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](/docs/en/sql-reference/data-types/string.md).
 
 **Returned value**
 
--  Input value converted to the [DateTime](/docs/en/sql-reference/data-types/datetime.md) data type.
+- Input value converted to the [DateTime](/docs/en/sql-reference/data-types/datetime.md) data type.
 
 **Example**
 
@@ -1649,12 +1818,12 @@ snowflakeToDateTime64(value [, time_zone])
 
 **Parameters**
 
--   `value` — Snowflake ID. [Int64](/docs/en/sql-reference/data-types/int-uint.md).
--   `time_zone` — [Timezone](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](/docs/en/sql-reference/data-types/string.md).
+- `value` — Snowflake ID. [Int64](/docs/en/sql-reference/data-types/int-uint.md).
+- `time_zone` — [Timezone](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](/docs/en/sql-reference/data-types/string.md).
 
 **Returned value**
 
--  Input value converted to the [DateTime64](/docs/en/sql-reference/data-types/datetime64.md) data type.
+- Input value converted to the [DateTime64](/docs/en/sql-reference/data-types/datetime64.md) data type.
 
 **Example**
 
@@ -1685,11 +1854,11 @@ dateTimeToSnowflake(value)
 
 **Parameters**
 
--   `value` — Date and time. [DateTime](/docs/en/sql-reference/data-types/datetime.md).
+- `value` — Date and time. [DateTime](/docs/en/sql-reference/data-types/datetime.md).
 
 **Returned value**
 
--   Input value converted to the [Int64](/docs/en/sql-reference/data-types/int-uint.md) data type as the first Snowflake ID at that time.
+- Input value converted to the [Int64](/docs/en/sql-reference/data-types/int-uint.md) data type as the first Snowflake ID at that time.
 
 **Example**
 
@@ -1719,11 +1888,11 @@ dateTime64ToSnowflake(value)
 
 **Parameters**
 
--   `value` — Date and time. [DateTime64](/docs/en/sql-reference/data-types/datetime64.md).
+- `value` — Date and time. [DateTime64](/docs/en/sql-reference/data-types/datetime64.md).
 
 **Returned value**
 
--   Input value converted to the [Int64](/docs/en/sql-reference/data-types/int-uint.md) data type as the first Snowflake ID at that time.
+- Input value converted to the [Int64](/docs/en/sql-reference/data-types/int-uint.md) data type as the first Snowflake ID at that time.
 
 **Example**
 
diff --git a/docs/en/sql-reference/functions/udf.md b/docs/en/sql-reference/functions/udf.md
new file mode 100644
index 00000000000..a58c1364780
--- /dev/null
+++ b/docs/en/sql-reference/functions/udf.md
@@ -0,0 +1,249 @@
+---
+slug: /en/sql-reference/functions/udf
+sidebar_position: 15
+sidebar_label: UDF
+---
+
+# UDFs User Defined Functions
+
+
+## Executable User Defined Functions
+ClickHouse can call any external executable program or script to process data.
+
+The configuration of executable user defined functions can be located in one or more xml-files. The path to the configuration is specified in the [user_defined_executable_functions_config](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_defined_executable_functions_config) parameter.
+
+A function configuration contains the following settings:
+
+- `name` - a function name.
+- `command` - script name to execute or command if `execute_direct` is false.
+- `argument` - argument description with the `type`, and optional `name` of an argument. Each argument is described in a separate setting. Specifying name is necessary if argument names are part of serialization for user defined function format like [Native](../../interfaces/formats.md#native) or [JSONEachRow](../../interfaces/formats.md#jsoneachrow). Default argument name value is `c` + argument_number.
+- `format` - a [format](../../interfaces/formats.md) in which arguments are passed to the command.
+- `return_type` - the type of a returned value.
+- `return_name` - name of retuned value. Specifying return name is necessary if return name is part of serialization for user defined function format like [Native](../../interfaces/formats.md#native) or [JSONEachRow](../../interfaces/formats.md#jsoneachrow). Optional. Default value is `result`.
+- `type` - an executable type. If `type` is set to `executable` then single command is started. If it is set to `executable_pool` then a pool of commands is created.
+- `max_command_execution_time` - maximum execution time in seconds for processing block of data. This setting is valid for `executable_pool` commands only. Optional. Default value is `10`.
+- `command_termination_timeout` - time in seconds during which a command should finish after its pipe is closed. After that time `SIGTERM` is sent to the process executing the command. Optional. Default value is `10`.
+- `command_read_timeout` - timeout for reading data from command stdout in milliseconds. Default value 10000. Optional parameter.
+- `command_write_timeout` - timeout for writing data to command stdin in milliseconds. Default value 10000. Optional parameter.
+- `pool_size` - the size of a command pool. Optional. Default value is `16`.
+- `send_chunk_header` - controls whether to send row count before sending a chunk of data to process. Optional. Default value is `false`.
+- `execute_direct` - If `execute_direct` = `1`, then `command` will be searched inside user_scripts folder specified by [user_scripts_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_scripts_path). Additional script arguments can be specified using whitespace separator. Example: `script_name arg1 arg2`. If `execute_direct` = `0`, `command` is passed as argument for `bin/sh -c`. Default value is `1`. Optional parameter.
+- `lifetime` - the reload interval of a function in seconds. If it is set to `0` then the function is not reloaded. Default value is `0`. Optional parameter.
+
+The command must read arguments from `STDIN` and must output the result to `STDOUT`. The command must process arguments iteratively. That is after processing a chunk of arguments it must wait for the next chunk.
+
+**Example**
+
+Creating `test_function` using XML configuration.
+File `test_function.xml` (`/etc/clickhouse-server/test_function.xml` with default path settings).
+```xml
+<functions>
+    <function>
+        <type>executable</type>
+        <name>test_function_python</name>
+        <return_type>String</return_type>
+        <argument>
+            <type>UInt64</type>
+            <name>value</name>
+        </argument>
+        <format>TabSeparated</format>
+        <command>test_function.py</command>
+    </function>
+</functions>
+```
+
+Script file inside `user_scripts` folder `test_function.py` (`/var/lib/clickhouse/user_scripts/test_function.py` with default path settings).
+
+```python
+#!/usr/bin/python3
+
+import sys
+
+if __name__ == '__main__':
+    for line in sys.stdin:
+        print("Value " + line, end='')
+        sys.stdout.flush()
+```
+
+Query:
+
+``` sql
+SELECT test_function_python(toUInt64(2));
+```
+
+Result:
+
+``` text
+┌─test_function_python(2)─┐
+│ Value 2                 │
+└─────────────────────────┘
+```
+
+Creating `test_function_sum` manually specifying `execute_direct` to `0` using XML configuration.
+File `test_function.xml` (`/etc/clickhouse-server/test_function.xml` with default path settings).
+```xml
+<functions>
+    <function>
+        <type>executable</type>
+        <name>test_function_sum</name>
+        <return_type>UInt64</return_type>
+        <argument>
+            <type>UInt64</type>
+            <name>lhs</name>
+        </argument>
+        <argument>
+            <type>UInt64</type>
+            <name>rhs</name>
+        </argument>
+        <format>TabSeparated</format>
+        <command>cd /; clickhouse-local --input-format TabSeparated --output-format TabSeparated --structure 'x UInt64, y UInt64' --query "SELECT x + y FROM table"</command>
+        <execute_direct>0</execute_direct>
+    </function>
+</functions>
+```
+
+Query:
+
+``` sql
+SELECT test_function_sum(2, 2);
+```
+
+Result:
+
+``` text
+┌─test_function_sum(2, 2)─┐
+│                       4 │
+└─────────────────────────┘
+```
+
+Creating `test_function_sum_json` with named arguments and format [JSONEachRow](../../interfaces/formats.md#jsoneachrow) using XML configuration.
+File `test_function.xml` (`/etc/clickhouse-server/test_function.xml` with default path settings).
+```xml
+<functions>
+    <function>
+        <type>executable</type>
+        <name>test_function_sum_json</name>
+        <return_type>UInt64</return_type>
+        <return_name>result_name</return_name>
+        <argument>
+            <type>UInt64</type>
+            <name>argument_1</name>
+        </argument>
+        <argument>
+            <type>UInt64</type>
+            <name>argument_2</name>
+        </argument>
+        <format>JSONEachRow</format>
+        <command>test_function_sum_json.py</command>
+    </function>
+</functions>
+```
+
+Script file inside `user_scripts` folder `test_function_sum_json.py` (`/var/lib/clickhouse/user_scripts/test_function_sum_json.py` with default path settings).
+
+```python
+#!/usr/bin/python3
+
+import sys
+import json
+
+if __name__ == '__main__':
+    for line in sys.stdin:
+        value = json.loads(line)
+        first_arg = int(value['argument_1'])
+        second_arg = int(value['argument_2'])
+        result = {'result_name': first_arg + second_arg}
+        print(json.dumps(result), end='\n')
+        sys.stdout.flush()
+```
+
+Query:
+
+``` sql
+SELECT test_function_sum_json(2, 2);
+```
+
+Result:
+
+``` text
+┌─test_function_sum_json(2, 2)─┐
+│                            4 │
+└──────────────────────────────┘
+```
+
+Executable user defined functions can take constant parameters configured in `command` setting (works only for user defined functions with `executable` type).
+File `test_function_parameter_python.xml` (`/etc/clickhouse-server/test_function_parameter_python.xml` with default path settings).
+```xml
+<functions>
+    <function>
+        <type>executable</type>
+        <name>test_function_parameter_python</name>
+        <return_type>String</return_type>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <format>TabSeparated</format>
+        <command>test_function_parameter_python.py {test_parameter:UInt64}</command>
+    </function>
+</functions>
+```
+
+Script file inside `user_scripts` folder `test_function_parameter_python.py` (`/var/lib/clickhouse/user_scripts/test_function_parameter_python.py` with default path settings).
+
+```python
+#!/usr/bin/python3
+
+import sys
+
+if __name__ == "__main__":
+    for line in sys.stdin:
+        print("Parameter " + str(sys.argv[1]) + " value " + str(line), end="")
+        sys.stdout.flush()
+```
+
+Query:
+
+``` sql
+SELECT test_function_parameter_python(1)(2);
+```
+
+Result:
+
+``` text
+┌─test_function_parameter_python(1)(2)─┐
+│ Parameter 1 value 2                  │
+└──────────────────────────────────────┘
+```
+
+## Error Handling
+
+Some functions might throw an exception if the data is invalid. In this case, the query is canceled and an error text is returned to the client. For distributed processing, when an exception occurs on one of the servers, the other servers also attempt to abort the query.
+
+## Evaluation of Argument Expressions
+
+In almost all programming languages, one of the arguments might not be evaluated for certain operators. This is usually the operators `&&`, `||`, and `?:`.
+But in ClickHouse, arguments of functions (operators) are always evaluated. This is because entire parts of columns are evaluated at once, instead of calculating each row separately.
+
+## Performing Functions for Distributed Query Processing
+
+For distributed query processing, as many stages of query processing as possible are performed on remote servers, and the rest of the stages (merging intermediate results and everything after that) are performed on the requestor server.
+
+This means that functions can be performed on different servers.
+For example, in the query `SELECT f(sum(g(x))) FROM distributed_table GROUP BY h(y),`
+
+- if a `distributed_table` has at least two shards, the functions ‘g’ and ‘h’ are performed on remote servers, and the function ‘f’ is performed on the requestor server.
+- if a `distributed_table` has only one shard, all the ‘f’, ‘g’, and ‘h’ functions are performed on this shard’s server.
+
+The result of a function usually does not depend on which server it is performed on. However, sometimes this is important.
+For example, functions that work with dictionaries use the dictionary that exists on the server they are running on.
+Another example is the `hostName` function, which returns the name of the server it is running on in order to make `GROUP BY` by servers in a `SELECT` query.
+
+If a function in a query is performed on the requestor server, but you need to perform it on remote servers, you can wrap it in an ‘any’ aggregate function or add it to a key in `GROUP BY`.
+
+## SQL User Defined Functions
+
+Custom functions from lambda expressions can be created using the [CREATE FUNCTION](../statements/create/function.md) statement. To delete these functions use the [DROP FUNCTION](../statements/drop.md#drop-function) statement.
+
+## Related Content
+
+### [User-defined functions in ClickHouse Cloud](https://clickhouse.com/blog/user-defined-functions-clickhouse-udfs)
diff --git a/docs/en/sql-reference/functions/ulid-functions.md b/docs/en/sql-reference/functions/ulid-functions.md
index 94167945f76..eb69b1779ae 100644
--- a/docs/en/sql-reference/functions/ulid-functions.md
+++ b/docs/en/sql-reference/functions/ulid-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/ulid-functions
-sidebar_position: 54
+sidebar_position: 190
 sidebar_label: ULID
 ---
 
@@ -18,7 +18,7 @@ generateULID([x])
 
 **Arguments**
 
--   `x` — [Expression](../../sql-reference/syntax.md#syntax-expressions) resulting in any of the [supported data types](../../sql-reference/data-types/index.md#data_types). The resulting value is discarded, but the expression itself if used for bypassing [common subexpression elimination](../../sql-reference/functions/index.md#common-subexpression-elimination) if the function is called multiple times in one query. Optional parameter.
+- `x` — [Expression](../../sql-reference/syntax.md#syntax-expressions) resulting in any of the [supported data types](../../sql-reference/data-types/index.md#data_types). The resulting value is discarded, but the expression itself if used for bypassing [common subexpression elimination](../../sql-reference/functions/index.md#common-subexpression-elimination) if the function is called multiple times in one query. Optional parameter.
 
 **Returned value**
 
@@ -48,6 +48,39 @@ SELECT generateULID(1), generateULID(2)
 └────────────────────────────┴────────────────────────────┘
 ```
 
+## ULIDStringToDateTime
+
+This function extracts the timestamp from a ULID.
+
+**Syntax**
+
+``` sql
+ULIDStringToDateTime(ulid[, timezone])
+```
+
+**Arguments**
+
+- `ulid` — Input ULID. [String](/docs/en/sql-reference/data-types/string.md) or [FixedString(26)](/docs/en/sql-reference/data-types/fixedstring.md).
+- `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+- Timestamp with milliseconds precision.
+
+Type: [DateTime64(3)](/docs/en/sql-reference/data-types/datetime64.md).
+
+**Usage example**
+
+``` sql
+SELECT ULIDStringToDateTime('01GNB2S2FGN2P93QPXDNB4EN2R')
+```
+
+``` text
+┌─ULIDStringToDateTime('01GNB2S2FGN2P93QPXDNB4EN2R')─┐
+│                            2022-12-28 00:40:37.616 │
+└────────────────────────────────────────────────────┘
+```
+
 ## See Also
 
--   [UUID](../../sql-reference/functions/uuid-functions.md)
+- [UUID](../../sql-reference/functions/uuid-functions.md)
diff --git a/docs/en/sql-reference/functions/uniqtheta-functions.md b/docs/en/sql-reference/functions/uniqtheta-functions.md
index b2d3712abfc..abe58e48715 100644
--- a/docs/en/sql-reference/functions/uniqtheta-functions.md
+++ b/docs/en/sql-reference/functions/uniqtheta-functions.md
@@ -1,5 +1,7 @@
 ---
 slug: /en/sql-reference/functions/uniqtheta-functions
+sidebar_position: 210
+sidebar_label: uniqTheta
 ---
 
 # uniqTheta Functions
@@ -21,7 +23,7 @@ uniqThetaUnion(uniqThetaSketch,uniqThetaSketch)
 
 **Arguments**
 
--   `uniqThetaSketch` – uniqThetaSketch object.
+- `uniqThetaSketch` – uniqThetaSketch object.
 
 **Example**
 
@@ -47,7 +49,7 @@ uniqThetaIntersect(uniqThetaSketch,uniqThetaSketch)
 
 **Arguments**
 
--   `uniqThetaSketch` – uniqThetaSketch object.
+- `uniqThetaSketch` – uniqThetaSketch object.
 
 **Example**
 
@@ -73,7 +75,7 @@ uniqThetaNot(uniqThetaSketch,uniqThetaSketch)
 
 **Arguments**
 
--   `uniqThetaSketch` – uniqThetaSketch object.
+- `uniqThetaSketch` – uniqThetaSketch object.
 
 **Example**
 
@@ -91,4 +93,4 @@ from
 
 **See Also**
 
--   [uniqThetaSketch](../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
+- [uniqThetaSketch](../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
diff --git a/docs/en/sql-reference/functions/url-functions.md b/docs/en/sql-reference/functions/url-functions.md
index b515f6ad518..f6871c86c4f 100644
--- a/docs/en/sql-reference/functions/url-functions.md
+++ b/docs/en/sql-reference/functions/url-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/url-functions
-sidebar_position: 54
+sidebar_position: 200
 sidebar_label: URLs
 ---
 
@@ -28,7 +28,7 @@ domain(url)
 
 **Arguments**
 
--   `url` — URL. Type: [String](../../sql-reference/data-types/string.md).
+- `url` — URL. Type: [String](../../sql-reference/data-types/string.md).
 
 The URL can be specified with or without a scheme. Examples:
 
@@ -48,8 +48,8 @@ clickhouse.com
 
 **Returned values**
 
--   Host name. If ClickHouse can parse the input string as a URL.
--   Empty string. If ClickHouse can’t parse the input string as a URL.
+- Host name. If ClickHouse can parse the input string as a URL.
+- Empty string. If ClickHouse can’t parse the input string as a URL.
 
 Type: `String`.
 
@@ -79,7 +79,7 @@ topLevelDomain(url)
 
 **Arguments**
 
--   `url` — URL. Type: [String](../../sql-reference/data-types/string.md).
+- `url` — URL. Type: [String](../../sql-reference/data-types/string.md).
 
 The URL can be specified with or without a scheme. Examples:
 
@@ -91,8 +91,8 @@ https://clickhouse.com/time/
 
 **Returned values**
 
--   Domain name. If ClickHouse can parse the input string as a URL.
--   Empty string. If ClickHouse cannot parse the input string as a URL.
+- Domain name. If ClickHouse can parse the input string as a URL.
+- Empty string. If ClickHouse cannot parse the input string as a URL.
 
 Type: `String`.
 
@@ -118,9 +118,9 @@ Returns the part of the domain that includes top-level subdomains up to the “f
 
 For example:
 
--   `cutToFirstSignificantSubdomain('https://news.clickhouse.com.tr/') = 'clickhouse.com.tr'`.
--   `cutToFirstSignificantSubdomain('www.tr') = 'tr'`.
--   `cutToFirstSignificantSubdomain('tr') = ''`.
+- `cutToFirstSignificantSubdomain('https://news.clickhouse.com.tr/') = 'clickhouse.com.tr'`.
+- `cutToFirstSignificantSubdomain('www.tr') = 'tr'`.
+- `cutToFirstSignificantSubdomain('tr') = ''`.
 
 ### cutToFirstSignificantSubdomainWithWWW
 
@@ -128,9 +128,9 @@ Returns the part of the domain that includes top-level subdomains up to the “f
 
 For example:
 
--   `cutToFirstSignificantSubdomain('https://news.clickhouse.com.tr/') = 'clickhouse.com.tr'`.
--   `cutToFirstSignificantSubdomain('www.tr') = 'www.tr'`.
--   `cutToFirstSignificantSubdomain('tr') = ''`.
+- `cutToFirstSignificantSubdomain('https://news.clickhouse.com.tr/') = 'clickhouse.com.tr'`.
+- `cutToFirstSignificantSubdomain('www.tr') = 'www.tr'`.
+- `cutToFirstSignificantSubdomain('tr') = ''`.
 
 ### cutToFirstSignificantSubdomainCustom
 
@@ -157,12 +157,12 @@ cutToFirstSignificantSubdomain(URL, TLD)
 
 **Parameters**
 
--   `URL` — URL. [String](../../sql-reference/data-types/string.md).
--   `TLD` — Custom TLD list name. [String](../../sql-reference/data-types/string.md).
+- `URL` — URL. [String](../../sql-reference/data-types/string.md).
+- `TLD` — Custom TLD list name. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Part of the domain that includes top-level subdomains up to the first significant subdomain.
+- Part of the domain that includes top-level subdomains up to the first significant subdomain.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -184,7 +184,7 @@ Result:
 
 **See Also**
 
--   [firstSignificantSubdomain](#firstsignificantsubdomain).
+- [firstSignificantSubdomain](#firstsignificantsubdomain).
 
 ### cutToFirstSignificantSubdomainCustomWithWWW
 
@@ -211,12 +211,12 @@ cutToFirstSignificantSubdomainCustomWithWWW(URL, TLD)
 
 **Parameters**
 
--   `URL` — URL. [String](../../sql-reference/data-types/string.md).
--   `TLD` — Custom TLD list name. [String](../../sql-reference/data-types/string.md).
+- `URL` — URL. [String](../../sql-reference/data-types/string.md).
+- `TLD` — Custom TLD list name. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   Part of the domain that includes top-level subdomains up to the first significant subdomain without stripping `www`.
+- Part of the domain that includes top-level subdomains up to the first significant subdomain without stripping `www`.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -238,7 +238,7 @@ Result:
 
 **See Also**
 
--   [firstSignificantSubdomain](#firstsignificantsubdomain).
+- [firstSignificantSubdomain](#firstsignificantsubdomain).
 
 ### firstSignificantSubdomainCustom
 
@@ -265,12 +265,12 @@ firstSignificantSubdomainCustom(URL, TLD)
 
 **Parameters**
 
--   `URL` — URL. [String](../../sql-reference/data-types/string.md).
--   `TLD` — Custom TLD list name. [String](../../sql-reference/data-types/string.md).
+- `URL` — URL. [String](../../sql-reference/data-types/string.md).
+- `TLD` — Custom TLD list name. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   First significant subdomain.
+- First significant subdomain.
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -292,7 +292,7 @@ Result:
 
 **See Also**
 
--   [firstSignificantSubdomain](#firstsignificantsubdomain).
+- [firstSignificantSubdomain](#firstsignificantsubdomain).
 
 ### port(URL\[, default_port = 0\])
 
@@ -418,11 +418,11 @@ netloc(URL)
 
 **Arguments**
 
--   `url` — URL. [String](../../sql-reference/data-types/string.md).
+- `url` — URL. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   `username:password@host:port`.
+- `username:password@host:port`.
 
 Type: `String`.
 
@@ -474,12 +474,12 @@ cutURLParameter(URL, name)
 
 **Arguments**
 
--   `url` — URL. [String](../../sql-reference/data-types/string.md).
--   `name` — name of URL parameter. [String](../../sql-reference/data-types/string.md) or [Array](../../sql-reference/data-types/array.md) of Strings.
+- `url` — URL. [String](../../sql-reference/data-types/string.md).
+- `name` — name of URL parameter. [String](../../sql-reference/data-types/string.md) or [Array](../../sql-reference/data-types/array.md) of Strings.
 
 **Returned value**
 
--   URL with `name` URL parameter removed.
+- URL with `name` URL parameter removed.
 
 Type: `String`.
 
diff --git a/docs/en/sql-reference/functions/uuid-functions.md b/docs/en/sql-reference/functions/uuid-functions.md
index 474e3248d1f..c338add3a57 100644
--- a/docs/en/sql-reference/functions/uuid-functions.md
+++ b/docs/en/sql-reference/functions/uuid-functions.md
@@ -1,12 +1,10 @@
 ---
 slug: /en/sql-reference/functions/uuid-functions
-sidebar_position: 53
-sidebar_label: UUID
+sidebar_position: 205
+sidebar_label: UUIDs
 ---
 
-# Functions for Working with UUID
-
-The functions for working with UUID are listed below.
+# Functions for Working with UUIDs
 
 ## generateUUIDv4
 
@@ -20,7 +18,7 @@ generateUUIDv4([x])
 
 **Arguments**
 
--   `x` — [Expression](../../sql-reference/syntax.md#syntax-expressions) resulting in any of the [supported data types](../../sql-reference/data-types/index.md#data_types). The resulting value is discarded, but the expression itself if used for bypassing [common subexpression elimination](../../sql-reference/functions/index.md#common-subexpression-elimination) if the function is called multiple times in one query. Optional parameter.
+- `x` — [Expression](../../sql-reference/syntax.md#syntax-expressions) resulting in any of the [supported data types](../../sql-reference/data-types/index.md#data_types). The resulting value is discarded, but the expression itself if used for bypassing [common subexpression elimination](../../sql-reference/functions/index.md#common-subexpression-elimination) if the function is called multiple times in one query. Optional parameter.
 
 **Returned value**
 
@@ -69,11 +67,11 @@ The function also works for [arrays](array-functions.md#function-empty) or [stri
 
 **Arguments**
 
--   `x` — Input UUID. [UUID](../data-types/uuid.md).
+- `x` — Input UUID. [UUID](../data-types/uuid.md).
 
 **Returned value**
 
--   Returns `1` for an empty UUID or `0` for a non-empty UUID. 
+- Returns `1` for an empty UUID or `0` for a non-empty UUID. 
 
 Type: [UInt8](../data-types/int-uint.md).
 
@@ -111,11 +109,11 @@ The function also works for [arrays](array-functions.md#function-notempty) or [s
 
 **Arguments**
 
--   `x` — Input UUID. [UUID](../data-types/uuid.md).
+- `x` — Input UUID. [UUID](../data-types/uuid.md).
 
 **Returned value**
 
--   Returns `1` for a non-empty UUID or `0` for an empty UUID. 
+- Returns `1` for a non-empty UUID or `0` for an empty UUID. 
 
 Type: [UInt8](../data-types/int-uint.md).
 
@@ -165,8 +163,8 @@ SELECT toUUID('61f0c404-5cb3-11e7-907b-a6006ad3dba0') AS uuid
 
 **Arguments**
 
--   `string` — String of 36 characters or FixedString(36). [String](../../sql-reference/syntax.md#string).
--   `default` — UUID to be used as the default if the first argument cannot be converted to a UUID type. [UUID](/docs/en/sql-reference/data-types/uuid.md).
+- `string` — String of 36 characters or FixedString(36). [String](../../sql-reference/syntax.md#string).
+- `default` — UUID to be used as the default if the first argument cannot be converted to a UUID type. [UUID](/docs/en/sql-reference/data-types/uuid.md).
 
 **Returned value**
 
@@ -265,8 +263,8 @@ UUIDStringToNum(string[, variant = 1])
 
 **Arguments**
 
--   `string` — String of 36 characters or FixedString(36). [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `variant` — Integer, representing a variant as specified by [RFC4122](https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.1). 1 = `Big-endian` (default), 2 = `Microsoft`.
+- `string` — String of 36 characters or FixedString(36). [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `variant` — Integer, representing a variant as specified by [RFC4122](https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.1). 1 = `Big-endian` (default), 2 = `Microsoft`.
 
 **Returned value**
 
@@ -310,8 +308,8 @@ UUIDNumToString(binary[, variant = 1])
 
 **Arguments**
 
--   `binary` — [FixedString(16)](../../sql-reference/data-types/fixedstring.md) as a binary representation of a UUID.
--   `variant` — Integer, representing a variant as specified by [RFC4122](https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.1). 1 = `Big-endian` (default), 2 = `Microsoft`.
+- `binary` — [FixedString(16)](../../sql-reference/data-types/fixedstring.md) as a binary representation of a UUID.
+- `variant` — Integer, representing a variant as specified by [RFC4122](https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.1). 1 = `Big-endian` (default), 2 = `Microsoft`.
 
 **Returned value**
 
@@ -355,10 +353,10 @@ serverUUID()
 
 **Returned value**
 
--   The UUID of the server. 
+- The UUID of the server. 
 
 Type: [UUID](../data-types/uuid.md).
 
 ## See Also
 
--   [dictGetUUID](../../sql-reference/functions/ext-dict-functions.md#ext_dict_functions-other)
+- [dictGetUUID](../../sql-reference/functions/ext-dict-functions.md#ext_dict_functions-other)
diff --git a/docs/en/sql-reference/functions/ym-dict-functions.md b/docs/en/sql-reference/functions/ym-dict-functions.md
index cf25b67a15a..a516f09d709 100644
--- a/docs/en/sql-reference/functions/ym-dict-functions.md
+++ b/docs/en/sql-reference/functions/ym-dict-functions.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/functions/ym-dict-functions
-sidebar_position: 59
+sidebar_position: 60
 sidebar_label: Embedded Dictionaries
 ---
 
@@ -118,13 +118,13 @@ regionToTopContinent(id[, geobase])
 
 **Arguments**
 
--   `id` — Region ID from the geobase. [UInt32](../../sql-reference/data-types/int-uint.md).
--   `geobase` — Dictionary key. See [Multiple Geobases](#multiple-geobases). [String](../../sql-reference/data-types/string.md). Optional.
+- `id` — Region ID from the geobase. [UInt32](../../sql-reference/data-types/int-uint.md).
+- `geobase` — Dictionary key. See [Multiple Geobases](#multiple-geobases). [String](../../sql-reference/data-types/string.md). Optional.
 
 **Returned value**
 
--   Identifier of the top level continent (the latter when you climb the hierarchy of regions).
--   0, if there is none.
+- Identifier of the top level continent (the latter when you climb the hierarchy of regions).
+- 0, if there is none.
 
 Type: `UInt32`.
 
diff --git a/docs/en/sql-reference/index.md b/docs/en/sql-reference/index.md
new file mode 100644
index 00000000000..eddc5b204d9
--- /dev/null
+++ b/docs/en/sql-reference/index.md
@@ -0,0 +1,22 @@
+---
+keywords: [clickhouse, docs, sql reference, sql statements, sql, syntax]
+title: SQL Reference
+---
+
+import { TwoColumnList } from '/src/components/two_column_list'
+import { ClickableSquare } from '/src/components/clickable_square'
+import { HorizontalDivide } from '/src/components/horizontal_divide'
+import { ViewAllLink } from '/src/components/view_all_link'
+import { VideoContainer } from '/src/components/video_container'
+
+import LinksDeployment from './sql-reference-links.json'
+
+# ClickHouse SQL Reference
+
+ClickHouse supports a declarative query language based on SQL that is identical to the ANSI SQL standard in many cases.
+
+Supported queries include GROUP BY, ORDER BY, subqueries in FROM, JOIN clause, IN operator, window functions and scalar subqueries.
+
+<HorizontalDivide />
+
+<TwoColumnList items={LinksDeployment} />
\ No newline at end of file
diff --git a/docs/en/sql-reference/operators/exists.md b/docs/en/sql-reference/operators/exists.md
index 4bc29389c9c..5e96e11b924 100644
--- a/docs/en/sql-reference/operators/exists.md
+++ b/docs/en/sql-reference/operators/exists.md
@@ -7,7 +7,7 @@ The `EXISTS` operator checks how many records are in the result of a subquery. I
 
 `EXISTS` can be used in a [WHERE](../../sql-reference/statements/select/where.md) clause.
 
-:::warning    
+:::tip    
 References to main query tables and columns are not supported in a subquery.
 :::
 
diff --git a/docs/en/sql-reference/operators/in.md b/docs/en/sql-reference/operators/in.md
index 58119cfc4f5..8a8c86624d2 100644
--- a/docs/en/sql-reference/operators/in.md
+++ b/docs/en/sql-reference/operators/in.md
@@ -158,7 +158,7 @@ Now let’s examine a query with IN:
 SELECT uniq(UserID) FROM distributed_table WHERE CounterID = 101500 AND UserID IN (SELECT UserID FROM local_table WHERE CounterID = 34)
 ```
 
--   Calculation of the intersection of audiences of two sites.
+- Calculation of the intersection of audiences of two sites.
 
 This query will be sent to all remote servers as
 
@@ -233,8 +233,9 @@ If `some_predicate` is not selective enough, it will return large amount of data
 
 ### Distributed Subqueries and max_parallel_replicas
 
-When max_parallel_replicas is greater than 1, distributed queries are further transformed. For example, the following:
+When [max_parallel_replicas](#settings-max_parallel_replicas) is greater than 1, distributed queries are further transformed.
 
+For example, the following:
 ```sql
 SELECT CounterID, count() FROM distributed_table_1 WHERE UserID IN (SELECT UserID FROM local_table_2 WHERE CounterID < 100)
 SETTINGS max_parallel_replicas=3
@@ -247,8 +248,12 @@ SELECT CounterID, count() FROM local_table_1 WHERE UserID IN (SELECT UserID FROM
 SETTINGS parallel_replicas_count=3, parallel_replicas_offset=M
 ```
 
-where M is between 1 and 3 depending on which replica the local query is executing on. These settings affect every MergeTree-family table in the query and have the same effect as applying `SAMPLE 1/3 OFFSET (M-1)/3` on each table.
+where M is between 1 and 3 depending on which replica the local query is executing on.
 
-Therefore adding the max_parallel_replicas setting will only produce correct results if both tables have the same replication scheme and are sampled by UserID or a subkey of it. In particular, if local_table_2 does not have a sampling key, incorrect results will be produced. The same rule applies to JOIN.
+These settings affect every MergeTree-family table in the query and have the same effect as applying `SAMPLE 1/3 OFFSET (M-1)/3` on each table.
+
+Therefore adding the [max_parallel_replicas](#settings-max_parallel_replicas) setting will only produce correct results if both tables have the same replication scheme and are sampled by UserID or a subkey of it. In particular, if local_table_2 does not have a sampling key, incorrect results will be produced. The same rule applies to JOIN.
 
 One workaround if local_table_2 does not meet the requirements, is to use `GLOBAL IN` or `GLOBAL JOIN`.
+
+If a table doesn't have a sampling key, more flexible options for [parallel_replicas_custom_key](#settings-parallel_replicas_custom_key) can be used that can produce different and more optimal behaviour.
diff --git a/docs/en/sql-reference/operators/index.md b/docs/en/sql-reference/operators/index.md
index 0fe7ebbf4b6..c8ed2627e2b 100644
--- a/docs/en/sql-reference/operators/index.md
+++ b/docs/en/sql-reference/operators/index.md
@@ -159,12 +159,12 @@ Extract parts from a given date. For example, you can retrieve a month from a gi
 
 The `part` parameter specifies which part of the date to retrieve. The following values are available:
 
--   `DAY` — The day of the month. Possible values: 1–31.
--   `MONTH` — The number of a month. Possible values: 1–12.
--   `YEAR` — The year.
--   `SECOND` — The second. Possible values: 0–59.
--   `MINUTE` — The minute. Possible values: 0–59.
--   `HOUR` — The hour. Possible values: 0–23.
+- `DAY` — The day of the month. Possible values: 1–31.
+- `MONTH` — The number of a month. Possible values: 1–12.
+- `YEAR` — The year.
+- `SECOND` — The second. Possible values: 0–59.
+- `MINUTE` — The minute. Possible values: 0–59.
+- `HOUR` — The hour. Possible values: 0–23.
 
 The `part` parameter is case-insensitive.
 
@@ -229,7 +229,7 @@ Types of intervals:
 
 You can also use a string literal when setting the `INTERVAL` value. For example, `INTERVAL 1 HOUR` is identical to the `INTERVAL '1 hour'` or `INTERVAL '1' hour`.
 
-:::warning    
+:::tip    
 Intervals with different types can’t be combined. You can’t use expressions like `INTERVAL 4 DAY 1 HOUR`. Specify intervals in units that are smaller or equal to the smallest unit of the interval, for example, `INTERVAL 25 HOUR`. You can use consecutive operations, like in the example below.
 :::
 
@@ -285,8 +285,8 @@ SELECT toDateTime('2014-10-26 00:00:00', 'Asia/Istanbul') AS time, time + 60 * 6
 
 **See Also**
 
--   [Interval](../../sql-reference/data-types/special-data-types/interval.md) data type
--   [toInterval](../../sql-reference/functions/type-conversion-functions.md#function-tointerval) type conversion functions
+- [Interval](../../sql-reference/data-types/special-data-types/interval.md) data type
+- [toInterval](../../sql-reference/functions/type-conversion-functions.md#function-tointerval) type conversion functions
 
 ## Logical AND Operator
 
@@ -355,10 +355,10 @@ ClickHouse supports the `IS NULL` and `IS NOT NULL` operators.
 
 ### IS NULL
 
--   For [Nullable](../../sql-reference/data-types/nullable.md) type values, the `IS NULL` operator returns:
-    -   `1`, if the value is `NULL`.
-    -   `0` otherwise.
--   For other values, the `IS NULL` operator always returns `0`.
+- For [Nullable](../../sql-reference/data-types/nullable.md) type values, the `IS NULL` operator returns:
+    - `1`, if the value is `NULL`.
+    - `0` otherwise.
+- For other values, the `IS NULL` operator always returns `0`.
 
 Can be optimized by enabling the [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns) setting. With `optimize_functions_to_subcolumns = 1` the function reads only [null](../../sql-reference/data-types/nullable.md#finding-null) subcolumn instead of reading and processing the whole column data. The query `SELECT n IS NULL FROM table` transforms to `SELECT n.null FROM TABLE`.
 
@@ -376,10 +376,10 @@ SELECT x+100 FROM t_null WHERE y IS NULL
 
 ### IS NOT NULL
 
--   For [Nullable](../../sql-reference/data-types/nullable.md) type values, the `IS NOT NULL` operator returns:
-    -   `0`, if the value is `NULL`.
-    -   `1` otherwise.
--   For other values, the `IS NOT NULL` operator always returns `1`.
+- For [Nullable](../../sql-reference/data-types/nullable.md) type values, the `IS NOT NULL` operator returns:
+    - `0`, if the value is `NULL`.
+    - `1` otherwise.
+- For other values, the `IS NOT NULL` operator always returns `1`.
 
 <!-- -->
 
diff --git a/docs/en/sql-reference/sql-reference-links.json b/docs/en/sql-reference/sql-reference-links.json
new file mode 100644
index 00000000000..3811ad18462
--- /dev/null
+++ b/docs/en/sql-reference/sql-reference-links.json
@@ -0,0 +1,12 @@
+[
+	{
+		"title": "Statements",
+		"description": "A list of available SQL statements in ClickHouse",
+		"url": "/docs/en/sql-reference/statements/"
+	},
+	{
+	"title": "Database and Table Engines",
+	"description": "Engines determine where and how your data is stored",
+	"url": "/docs/en/engines/table-engines"
+	}
+]
diff --git a/docs/en/sql-reference/statements/alter/column.md b/docs/en/sql-reference/statements/alter/column.md
index d580efa4992..378f41c1199 100644
--- a/docs/en/sql-reference/statements/alter/column.md
+++ b/docs/en/sql-reference/statements/alter/column.md
@@ -18,14 +18,14 @@ Each action is an operation on a column.
 
 The following actions are supported:
 
--   [ADD COLUMN](#add-column) — Adds a new column to the table.
--   [DROP COLUMN](#drop-column) — Deletes the column.
--   [RENAME COLUMN](#rename-column) — Renames an existing column.
--   [CLEAR COLUMN](#clear-column) — Resets column values.
--   [COMMENT COLUMN](#comment-column) — Adds a text comment to the column.
--   [MODIFY COLUMN](#modify-column) — Changes column’s type, default expression and TTL.
--   [MODIFY COLUMN REMOVE](#modify-column-remove) — Removes one of the column properties.
--   [MATERIALIZE COLUMN](#materialize-column) — Materializes the column in the parts where the column is missing.
+- [ADD COLUMN](#add-column) — Adds a new column to the table.
+- [DROP COLUMN](#drop-column) — Deletes the column.
+- [RENAME COLUMN](#rename-column) — Renames an existing column.
+- [CLEAR COLUMN](#clear-column) — Resets column values.
+- [COMMENT COLUMN](#comment-column) — Adds a text comment to the column.
+- [MODIFY COLUMN](#modify-column) — Changes column’s type, default expression and TTL.
+- [MODIFY COLUMN REMOVE](#modify-column-remove) — Removes one of the column properties.
+- [MATERIALIZE COLUMN](#materialize-column) — Materializes the column in the parts where the column is missing.
 
 These actions are described in detail below.
 
@@ -75,7 +75,7 @@ Deletes the column with the name `name`. If the `IF EXISTS` clause is specified,
 
 Deletes data from the file system. Since this deletes entire files, the query is completed almost instantly.
 
-:::warning    
+:::tip    
 You can’t delete a column if it is referenced by [materialized view](/docs/en/sql-reference/statements/create/view.md/#materialized). Otherwise, it returns an error.
 :::
 
@@ -132,7 +132,7 @@ Comments are stored in the `comment_expression` column returned by the [DESCRIBE
 Example:
 
 ``` sql
-ALTER TABLE visits COMMENT COLUMN browser 'The table shows the browser used for accessing the site.'
+ALTER TABLE visits COMMENT COLUMN browser 'This column shows the browser used for accessing the site.'
 ```
 
 ## MODIFY COLUMN
@@ -144,13 +144,13 @@ ALTER COLUMN [IF EXISTS] name TYPE [type] [default_expr] [codec] [TTL] [AFTER na
 
 This query changes the `name` column properties:
 
--   Type
+- Type
 
--   Default expression
+- Default expression
 
--   Compression Codec
+- Compression Codec
 
--   TTL
+- TTL
 
 For examples of columns compression CODECS modifying, see [Column Compression Codecs](../create/table.md/#codecs).
 
diff --git a/docs/en/sql-reference/statements/alter/comment.md b/docs/en/sql-reference/statements/alter/comment.md
index f8742765619..cc49c6abf80 100644
--- a/docs/en/sql-reference/statements/alter/comment.md
+++ b/docs/en/sql-reference/statements/alter/comment.md
@@ -16,7 +16,7 @@ ALTER TABLE [db].name [ON CLUSTER cluster] MODIFY COMMENT 'Comment'
 
 **Examples**
 
-Creating a table with comment (for more information, see the [COMMENT] clause(../../../sql-reference/statements/create/table.md#comment-table)):
+Creating a table with comment (for more information, see the [COMMENT](../../../sql-reference/statements/create/table.md#comment-table) clause):
 
 ``` sql
 CREATE TABLE table_with_comment
diff --git a/docs/en/sql-reference/statements/alter/constraint.md b/docs/en/sql-reference/statements/alter/constraint.md
index 844b24d7374..7a8f5809320 100644
--- a/docs/en/sql-reference/statements/alter/constraint.md
+++ b/docs/en/sql-reference/statements/alter/constraint.md
@@ -17,7 +17,7 @@ See more on [constraints](../../../sql-reference/statements/create/table.md#cons
 
 Queries will add or remove metadata about constraints from table so they are processed immediately.
 
-:::warning
+:::tip
 Constraint check **will not be executed** on existing data if it was added.
 :::
 
diff --git a/docs/en/sql-reference/statements/alter/delete.md b/docs/en/sql-reference/statements/alter/delete.md
index 30ed96c0b9c..b6f45b67d52 100644
--- a/docs/en/sql-reference/statements/alter/delete.md
+++ b/docs/en/sql-reference/statements/alter/delete.md
@@ -25,6 +25,10 @@ The synchronicity of the query processing is defined by the [mutations_sync](/do
 
 **See also**
 
--   [Mutations](/docs/en/sql-reference/statements/alter/index.md#mutations)
--   [Synchronicity of ALTER Queries](/docs/en/sql-reference/statements/alter/index.md#synchronicity-of-alter-queries)
--   [mutations_sync](/docs/en/operations/settings/settings.md/#mutations_sync) setting
+- [Mutations](/docs/en/sql-reference/statements/alter/index.md#mutations)
+- [Synchronicity of ALTER Queries](/docs/en/sql-reference/statements/alter/index.md#synchronicity-of-alter-queries)
+- [mutations_sync](/docs/en/operations/settings/settings.md/#mutations_sync) setting
+
+## Related content
+
+- Blog: [Handling Updates and Deletes in ClickHouse](https://clickhouse.com/blog/handling-updates-and-deletes-in-clickhouse)
diff --git a/docs/en/sql-reference/statements/alter/index.md b/docs/en/sql-reference/statements/alter/index.md
index 5d7b92bd34d..7a687a067aa 100644
--- a/docs/en/sql-reference/statements/alter/index.md
+++ b/docs/en/sql-reference/statements/alter/index.md
@@ -8,14 +8,14 @@ sidebar_label: ALTER
 
 Most `ALTER TABLE` queries modify table settings or data:
 
--   [COLUMN](/docs/en/sql-reference/statements/alter/column.md)
--   [PARTITION](/docs/en/sql-reference/statements/alter/partition.md)
--   [DELETE](/docs/en/sql-reference/statements/alter/delete.md)
--   [UPDATE](/docs/en/sql-reference/statements/alter/update.md)
--   [ORDER BY](/docs/en/sql-reference/statements/alter/order-by.md)
--   [INDEX](/docs/en/sql-reference/statements/alter/skipping-index.md)
--   [CONSTRAINT](/docs/en/sql-reference/statements/alter/constraint.md)
--   [TTL](/docs/en/sql-reference/statements/alter/ttl.md)
+- [COLUMN](/docs/en/sql-reference/statements/alter/column.md)
+- [PARTITION](/docs/en/sql-reference/statements/alter/partition.md)
+- [DELETE](/docs/en/sql-reference/statements/alter/delete.md)
+- [UPDATE](/docs/en/sql-reference/statements/alter/update.md)
+- [ORDER BY](/docs/en/sql-reference/statements/alter/order-by.md)
+- [INDEX](/docs/en/sql-reference/statements/alter/skipping-index.md)
+- [CONSTRAINT](/docs/en/sql-reference/statements/alter/constraint.md)
+- [TTL](/docs/en/sql-reference/statements/alter/ttl.md)
 
 :::note    
 Most `ALTER TABLE` queries are supported only for [\*MergeTree](/docs/en/engines/table-engines/mergetree-family/index.md) tables, as well as [Merge](/docs/en/engines/table-engines/special/merge.md) and [Distributed](/docs/en/engines/table-engines/special/distributed.md).
@@ -23,16 +23,16 @@ Most `ALTER TABLE` queries are supported only for [\*MergeTree](/docs/en/engines
 
 These `ALTER` statements manipulate views:
 
--   [ALTER TABLE ... MODIFY QUERY](/docs/en/sql-reference/statements/alter/view.md) — Modifies a [Materialized view](/docs/en/sql-reference/statements/create/view.md/#materialized) structure.
--   [ALTER LIVE VIEW](/docs/en/sql-reference/statements/alter/view.md/#alter-live-view) — Refreshes a [Live view](/docs/en/sql-reference/statements/create/view.md/#live-view).
+- [ALTER TABLE ... MODIFY QUERY](/docs/en/sql-reference/statements/alter/view.md) — Modifies a [Materialized view](/docs/en/sql-reference/statements/create/view.md/#materialized) structure.
+- [ALTER LIVE VIEW](/docs/en/sql-reference/statements/alter/view.md/#alter-live-view) — Refreshes a [Live view](/docs/en/sql-reference/statements/create/view.md/#live-view).
 
 These `ALTER` statements modify entities related to role-based access control:
 
--   [USER](/docs/en/sql-reference/statements/alter/user.md)
--   [ROLE](/docs/en/sql-reference/statements/alter/role.md)
--   [QUOTA](/docs/en/sql-reference/statements/alter/quota.md)
--   [ROW POLICY](/docs/en/sql-reference/statements/alter/row-policy.md)
--   [SETTINGS PROFILE](/docs/en/sql-reference/statements/alter/settings-profile.md)
+- [USER](/docs/en/sql-reference/statements/alter/user.md)
+- [ROLE](/docs/en/sql-reference/statements/alter/role.md)
+- [QUOTA](/docs/en/sql-reference/statements/alter/quota.md)
+- [ROW POLICY](/docs/en/sql-reference/statements/alter/row-policy.md)
+- [SETTINGS PROFILE](/docs/en/sql-reference/statements/alter/settings-profile.md)
 
 [ALTER TABLE ... MODIFY COMMENT](/docs/en/sql-reference/statements/alter/comment.md) statement adds, modifies, or removes comments to the table, regardless if it was set before or not.
 
@@ -61,3 +61,7 @@ For all `ALTER` queries, if `alter_sync = 2` and some replicas are not active fo
 :::
 
 For `ALTER TABLE ... UPDATE|DELETE` queries the synchronicity is defined by the [mutations_sync](/docs/en/operations/settings/settings.md/#mutations_sync) setting.
+
+## Related content
+
+- Blog: [Handling Updates and Deletes in ClickHouse](https://clickhouse.com/blog/handling-updates-and-deletes-in-clickhouse)
diff --git a/docs/en/sql-reference/statements/alter/partition.md b/docs/en/sql-reference/statements/alter/partition.md
index aad52efb39d..a0aa74e6d25 100644
--- a/docs/en/sql-reference/statements/alter/partition.md
+++ b/docs/en/sql-reference/statements/alter/partition.md
@@ -7,20 +7,20 @@ title: "Manipulating Partitions and Parts"
 
 The following operations with [partitions](/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md) are available:
 
--   [DETACH PARTITION\|PART](#detach-partitionpart) — Moves a partition or part to the `detached` directory and forget it.
--   [DROP PARTITION\|PART](#drop-partitionpart) — Deletes a partition or part.
--   [ATTACH PARTITION\|PART](#attach-partitionpart) — Adds a partition or part from the `detached` directory to the table.
--   [ATTACH PARTITION FROM](#attach-partition-from) — Copies the data partition from one table to another and adds.
--   [REPLACE PARTITION](#replace-partition) — Copies the data partition from one table to another and replaces.
--   [MOVE PARTITION TO TABLE](#move-partition-to-table) — Moves the data partition from one table to another.
--   [CLEAR COLUMN IN PARTITION](#clear-column-in-partition) — Resets the value of a specified column in a partition.
--   [CLEAR INDEX IN PARTITION](#clear-index-in-partition) — Resets the specified secondary index in a partition.
--   [FREEZE PARTITION](#freeze-partition) — Creates a backup of a partition.
--   [UNFREEZE PARTITION](#unfreeze-partition) — Removes a backup of a partition.
--   [FETCH PARTITION\|PART](#fetch-partitionpart) — Downloads a part or partition from another server.
--   [MOVE PARTITION\|PART](#move-partitionpart) — Move partition/data part to another disk or volume.
--   [UPDATE IN PARTITION](#update-in-partition) — Update data inside the partition by condition.
--   [DELETE IN PARTITION](#delete-in-partition) — Delete data inside the partition by condition.
+- [DETACH PARTITION\|PART](#detach-partitionpart) — Moves a partition or part to the `detached` directory and forget it.
+- [DROP PARTITION\|PART](#drop-partitionpart) — Deletes a partition or part.
+- [ATTACH PARTITION\|PART](#attach-partitionpart) — Adds a partition or part from the `detached` directory to the table.
+- [ATTACH PARTITION FROM](#attach-partition-from) — Copies the data partition from one table to another and adds.
+- [REPLACE PARTITION](#replace-partition) — Copies the data partition from one table to another and replaces.
+- [MOVE PARTITION TO TABLE](#move-partition-to-table) — Moves the data partition from one table to another.
+- [CLEAR COLUMN IN PARTITION](#clear-column-in-partition) — Resets the value of a specified column in a partition.
+- [CLEAR INDEX IN PARTITION](#clear-index-in-partition) — Resets the specified secondary index in a partition.
+- [FREEZE PARTITION](#freeze-partition) — Creates a backup of a partition.
+- [UNFREEZE PARTITION](#unfreeze-partition) — Removes a backup of a partition.
+- [FETCH PARTITION\|PART](#fetch-partitionpart) — Downloads a part or partition from another server.
+- [MOVE PARTITION\|PART](#move-partitionpart) — Move partition/data part to another disk or volume.
+- [UPDATE IN PARTITION](#update-in-partition) — Update data inside the partition by condition.
+- [DELETE IN PARTITION](#delete-in-partition) — Delete data inside the partition by condition.
 
 <!-- -->
 
@@ -103,13 +103,17 @@ ALTER TABLE table2 [ON CLUSTER cluster] ATTACH PARTITION partition_expr FROM tab
 ```
 
 This query copies the data partition from `table1` to `table2`.
-Note that data will be deleted neither from `table1` nor from `table2`.
+
+Note that:
+
+- Data will be deleted neither from `table1` nor from `table2`.
+- `table1` may be a temporary table.
 
 For the query to run successfully, the following conditions must be met:
 
--   Both tables must have the same structure.
--   Both tables must have the same partition key, the same order by key and the same primary key.
--   Both tables must have the same storage policy (a disk where the partition is stored should be available for both tables).
+- Both tables must have the same structure.
+- Both tables must have the same partition key, the same order by key and the same primary key.
+- Both tables must have the same storage policy.
 
 ## REPLACE PARTITION
 
@@ -117,13 +121,18 @@ For the query to run successfully, the following conditions must be met:
 ALTER TABLE table2 [ON CLUSTER cluster] REPLACE PARTITION partition_expr FROM table1
 ```
 
-This query copies the data partition from the `table1` to `table2` and replaces existing partition in the `table2`. Note that data won’t be deleted from `table1`.
+This query copies the data partition from the `table1` to `table2` and replaces existing partition in the `table2`.
+
+Note that:
+
+- Data won’t be deleted from `table1`.
+- `table1` may be a temporary table.
 
 For the query to run successfully, the following conditions must be met:
 
--   Both tables must have the same structure.
--   Both tables must have the same partition key, the same order by key and the same primary key.
--   Both tables must have the same storage policy (a disk where the partition is stored should be available for both tables).
+- Both tables must have the same structure.
+- Both tables must have the same partition key, the same order by key and the same primary key.
+- Both tables must have the same storage policy.
 
 ## MOVE PARTITION TO TABLE
 
@@ -135,10 +144,10 @@ This query moves the data partition from the `table_source` to `table_dest` with
 
 For the query to run successfully, the following conditions must be met:
 
--   Both tables must have the same structure.
--   Both tables must have the same partition key, the same order by key and the same primary key.
--   Both tables must have the same storage policy (a disk where the partition is stored should be available for both tables).
--   Both tables must be the same engine family (replicated or non-replicated).
+- Both tables must have the same structure.
+- Both tables must have the same partition key, the same order by key and the same primary key.
+- Both tables must have the same storage policy.
+- Both tables must be the same engine family (replicated or non-replicated).
 
 ## CLEAR COLUMN IN PARTITION
 
@@ -170,9 +179,9 @@ Note that for old-styled tables you can specify the prefix of the partition name
 
 At the time of execution, for a data snapshot, the query creates hardlinks to a table data. Hardlinks are placed in the directory `/var/lib/clickhouse/shadow/N/...`, where:
 
--   `/var/lib/clickhouse/` is the working ClickHouse directory specified in the config.
--   `N` is the incremental number of the backup.
--   if the `WITH NAME` parameter is specified, then the value of the `'backup_name'` parameter is used instead of the incremental number.
+- `/var/lib/clickhouse/` is the working ClickHouse directory specified in the config.
+- `N` is the incremental number of the backup.
+- if the `WITH NAME` parameter is specified, then the value of the `'backup_name'` parameter is used instead of the incremental number.
 
 :::note
 If you use [a set of disks for data storage in a table](/docs/en/engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-multiple-volumes), the `shadow/N` directory appears on every disk, storing data parts that matched by the `PARTITION` expression.
@@ -240,8 +249,8 @@ ALTER TABLE users ATTACH PART 201901_2_2_0;
 
 Note that:
 
--   The `ALTER ... FETCH PARTITION|PART` query isn’t replicated. It places the part or partition to the `detached` directory only on the local server.
--   The `ALTER TABLE ... ATTACH` query is replicated. It adds the data to all replicas. The data is added to one of the replicas from the `detached` directory, and to the others - from neighboring replicas.
+- The `ALTER ... FETCH PARTITION|PART` query isn’t replicated. It places the part or partition to the `detached` directory only on the local server.
+- The `ALTER TABLE ... ATTACH` query is replicated. It adds the data to all replicas. The data is added to one of the replicas from the `detached` directory, and to the others - from neighboring replicas.
 
 Before downloading, the system checks if the partition exists and the table structure matches. The most appropriate replica is selected automatically from the healthy replicas.
 
@@ -257,9 +266,9 @@ ALTER TABLE table_name [ON CLUSTER cluster] MOVE PARTITION|PART partition_expr T
 
 The `ALTER TABLE t MOVE` query:
 
--   Not replicated, because different replicas can have different storage policies.
--   Returns an error if the specified disk or volume is not configured. Query also returns an error if conditions of data moving, that specified in the storage policy, can’t be applied.
--   Can return an error in the case, when data to be moved is already moved by a background process, concurrent `ALTER TABLE t MOVE` query or as a result of background data merging. A user shouldn’t perform any additional actions in this case.
+- Not replicated, because different replicas can have different storage policies.
+- Returns an error if the specified disk or volume is not configured. Query also returns an error if conditions of data moving, that specified in the storage policy, can’t be applied.
+- Can return an error in the case, when data to be moved is already moved by a background process, concurrent `ALTER TABLE t MOVE` query or as a result of background data merging. A user shouldn’t perform any additional actions in this case.
 
 Example:
 
@@ -275,18 +284,22 @@ Manipulates data in the specifies partition matching the specified filtering exp
 Syntax:
 
 ``` sql
-ALTER TABLE [db.]table [ON CLUSTER cluster] UPDATE column1 = expr1 [, ...] [IN PARTITION partition_id] WHERE filter_expr
+ALTER TABLE [db.]table [ON CLUSTER cluster] UPDATE column1 = expr1 [, ...] [IN PARTITION partition_expr] WHERE filter_expr
 ```
 
 ### Example
 
 ``` sql
+-- using partition name
 ALTER TABLE mt UPDATE x = x + 1 IN PARTITION 2 WHERE p = 2;
+
+-- using partition id
+ALTER TABLE mt UPDATE x = x + 1 IN PARTITION ID '2' WHERE p = 2;
 ```
 
 ### See Also
 
--   [UPDATE](/docs/en/sql-reference/statements/alter/update.md/#alter-table-update-statements)
+- [UPDATE](/docs/en/sql-reference/statements/alter/update.md/#alter-table-update-statements)
 
 ## DELETE IN PARTITION
 
@@ -295,27 +308,31 @@ Deletes data in the specifies partition matching the specified filtering express
 Syntax:
 
 ``` sql
-ALTER TABLE [db.]table [ON CLUSTER cluster] DELETE [IN PARTITION partition_id] WHERE filter_expr
+ALTER TABLE [db.]table [ON CLUSTER cluster] DELETE [IN PARTITION partition_expr] WHERE filter_expr
 ```
 
 ### Example
 
 ``` sql
+-- using partition name
 ALTER TABLE mt DELETE IN PARTITION 2 WHERE p = 2;
+
+-- using partition id
+ALTER TABLE mt DELETE IN PARTITION ID '2' WHERE p = 2;
 ```
 
 ### See Also
 
--   [DELETE](/docs/en/sql-reference/statements/alter/delete.md/#alter-mutations)
+- [DELETE](/docs/en/sql-reference/statements/alter/delete.md/#alter-mutations)
 
 ## How to Set Partition Expression
 
 You can specify the partition expression in `ALTER ... PARTITION` queries in different ways:
 
--   As a value from the `partition` column of the `system.parts` table. For example, `ALTER TABLE visits DETACH PARTITION 201901`.
--   As a tuple of expressions or constants that matches (in types) the table partitioning keys tuple. In the case of a single element partitioning key, the expression should be wrapped in the `tuple (...)` function. For example, `ALTER TABLE visits DETACH PARTITION tuple(toYYYYMM(toDate('2019-01-25')))`.
--   Using the partition ID. Partition ID is a string identifier of the partition (human-readable, if possible) that is used as the names of partitions in the file system and in ZooKeeper. The partition ID must be specified in the `PARTITION ID` clause, in a single quotes. For example, `ALTER TABLE visits DETACH PARTITION ID '201901'`.
--   In the [ALTER ATTACH PART](#alter_attach-partition) and [DROP DETACHED PART](#alter_drop-detached) query, to specify the name of a part, use string literal with a value from the `name` column of the [system.detached_parts](/docs/en/operations/system-tables/detached_parts.md/#system_tables-detached_parts) table. For example, `ALTER TABLE visits ATTACH PART '201901_1_1_0'`.
+- As a value from the `partition` column of the `system.parts` table. For example, `ALTER TABLE visits DETACH PARTITION 201901`.
+- As a tuple of expressions or constants that matches (in types) the table partitioning keys tuple. In the case of a single element partitioning key, the expression should be wrapped in the `tuple (...)` function. For example, `ALTER TABLE visits DETACH PARTITION tuple(toYYYYMM(toDate('2019-01-25')))`.
+- Using the partition ID. Partition ID is a string identifier of the partition (human-readable, if possible) that is used as the names of partitions in the file system and in ZooKeeper. The partition ID must be specified in the `PARTITION ID` clause, in a single quotes. For example, `ALTER TABLE visits DETACH PARTITION ID '201901'`.
+- In the [ALTER ATTACH PART](#alter_attach-partition) and [DROP DETACHED PART](#alter_drop-detached) query, to specify the name of a part, use string literal with a value from the `name` column of the [system.detached_parts](/docs/en/operations/system-tables/detached_parts.md/#system_tables-detached_parts) table. For example, `ALTER TABLE visits ATTACH PART '201901_1_1_0'`.
 
 Usage of quotes when specifying the partition depends on the type of partition expression. For example, for the `String` type, you have to specify its name in quotes (`'`). For the `Date` and `Int*` types no quotes are needed.
 
diff --git a/docs/en/sql-reference/statements/alter/projection.md b/docs/en/sql-reference/statements/alter/projection.md
index 908d28d7ab1..030e9352a00 100644
--- a/docs/en/sql-reference/statements/alter/projection.md
+++ b/docs/en/sql-reference/statements/alter/projection.md
@@ -17,7 +17,7 @@ Projections will create internally a new hidden table, this means that more IO a
 Example, If the projection has defined a different primary key, all the data from the original table will be duplicated.
 :::
 
-You can see more technical details about how projections work internally on this [page](/docs/en/guides/improving-query-performance/sparse-primary-indexes/sparse-primary-indexes-multiple.md/#option-3-projections).
+You can see more technical details about how projections work internally on this [page](/docs/en/guides/best-practices/sparse-primary-indexes.md/#option-3-projections).
 
 ## Example filtering without using primary keys
 
@@ -37,7 +37,7 @@ Using `ALTER TABLE`, we could add the Projection to an existing table:
 ```
 ALTER TABLE visits_order ADD PROJECTION user_name_projection (
 SELECT
-* 
+*
 ORDER BY user_name
 )
 
@@ -128,7 +128,7 @@ SELECT
     user_agent,
     sum(pages_visited)
 FROM visits
-GROUP BY user_id
+GROUP BY user_agent
 ```
 
 As mentioned before, we could review the `system.query_log` table. On the `projections` field we have the name of the projection used or empty if none has been used:
@@ -161,6 +161,6 @@ The commands `ADD`, `DROP` and `CLEAR` are lightweight in a sense that they only
 
 Also, they are replicated, syncing projections metadata via ClickHouse Keeper or ZooKeeper.
 
-:::note    
+:::note
 Projection manipulation is supported only for tables with [`*MergeTree`](/docs/en/engines/table-engines/mergetree-family/mergetree.md) engine (including [replicated](/docs/en/engines/table-engines/mergetree-family/replication.md) variants).
 :::
diff --git a/docs/en/sql-reference/statements/alter/setting.md b/docs/en/sql-reference/statements/alter/setting.md
index f68f035146a..e18ec0cc293 100644
--- a/docs/en/sql-reference/statements/alter/setting.md
+++ b/docs/en/sql-reference/statements/alter/setting.md
@@ -58,4 +58,4 @@ ALTER TABLE example_table RESET SETTING max_part_loading_threads;
 
 **See Also**
 
--   [MergeTree settings](../../../operations/settings/merge-tree-settings.md)
+- [MergeTree settings](../../../operations/settings/merge-tree-settings.md)
diff --git a/docs/en/sql-reference/statements/alter/skipping-index.md b/docs/en/sql-reference/statements/alter/skipping-index.md
index 87124c86eac..67af76986da 100644
--- a/docs/en/sql-reference/statements/alter/skipping-index.md
+++ b/docs/en/sql-reference/statements/alter/skipping-index.md
@@ -10,11 +10,11 @@ sidebar_label: INDEX
 
 The following operations are available:
 
--   `ALTER TABLE [db].table_name [ON CLUSTER cluster] ADD INDEX name expression TYPE type GRANULARITY value [FIRST|AFTER name]` - Adds index description to tables metadata.
+- `ALTER TABLE [db].table_name [ON CLUSTER cluster] ADD INDEX name expression TYPE type GRANULARITY value [FIRST|AFTER name]` - Adds index description to tables metadata.
 
--   `ALTER TABLE [db].table_name [ON CLUSTER cluster] DROP INDEX name` - Removes index description from tables metadata and deletes index files from disk. Implemented as a [mutation](/docs/en/sql-reference/statements/alter/index.md#mutations).
+- `ALTER TABLE [db].table_name [ON CLUSTER cluster] DROP INDEX name` - Removes index description from tables metadata and deletes index files from disk. Implemented as a [mutation](/docs/en/sql-reference/statements/alter/index.md#mutations).
 
--   `ALTER TABLE [db.]table_name [ON CLUSTER cluster] MATERIALIZE INDEX name [IN PARTITION partition_name]` - Rebuilds the secondary index `name` for the specified `partition_name`. Implemented as a [mutation](/docs/en/sql-reference/statements/alter/index.md#mutations). If `IN PARTITION` part is omitted then it rebuilds the index for the whole table data.
+- `ALTER TABLE [db.]table_name [ON CLUSTER cluster] MATERIALIZE INDEX name [IN PARTITION partition_name]` - Rebuilds the secondary index `name` for the specified `partition_name`. Implemented as a [mutation](/docs/en/sql-reference/statements/alter/index.md#mutations). If `IN PARTITION` part is omitted then it rebuilds the index for the whole table data.
 
 The first two commands are lightweight in a sense that they only change metadata or remove files.
 
diff --git a/docs/en/sql-reference/statements/alter/update.md b/docs/en/sql-reference/statements/alter/update.md
index 92f0f111b92..ab7d0ca7378 100644
--- a/docs/en/sql-reference/statements/alter/update.md
+++ b/docs/en/sql-reference/statements/alter/update.md
@@ -24,6 +24,11 @@ The synchronicity of the query processing is defined by the [mutations_sync](/do
 
 **See also**
 
--   [Mutations](/docs/en/sql-reference/statements/alter/index.md#mutations)
--   [Synchronicity of ALTER Queries](/docs/en/sql-reference/statements/alter/index.md#synchronicity-of-alter-queries)
--   [mutations_sync](/docs/en/operations/settings/settings.md/#mutations_sync) setting
+- [Mutations](/docs/en/sql-reference/statements/alter/index.md#mutations)
+- [Synchronicity of ALTER Queries](/docs/en/sql-reference/statements/alter/index.md#synchronicity-of-alter-queries)
+- [mutations_sync](/docs/en/operations/settings/settings.md/#mutations_sync) setting
+
+
+## Related content
+
+- Blog: [Handling Updates and Deletes in ClickHouse](https://clickhouse.com/blog/handling-updates-and-deletes-in-clickhouse)
diff --git a/docs/en/sql-reference/statements/alter/user.md b/docs/en/sql-reference/statements/alter/user.md
index 31db89164d7..8785610f58a 100644
--- a/docs/en/sql-reference/statements/alter/user.md
+++ b/docs/en/sql-reference/statements/alter/user.md
@@ -25,10 +25,10 @@ To use `ALTER USER` you must have the [ALTER USER](../../../sql-reference/statem
 
 Specifies users or roles which are allowed to receive [privileges](../../../sql-reference/statements/grant.md#grant-privileges) from this user on the condition this user has also all required access granted with [GRANT OPTION](../../../sql-reference/statements/grant.md#grant-privigele-syntax). Options of the `GRANTEES` clause:
 
--   `user` — Specifies a user this user can grant privileges to.
--   `role` — Specifies a role this user can grant privileges to.
--   `ANY` — This user can grant privileges to anyone. It's the default setting.
--   `NONE` — This user can grant privileges to none.
+- `user` — Specifies a user this user can grant privileges to.
+- `role` — Specifies a role this user can grant privileges to.
+- `ANY` — This user can grant privileges to anyone. It's the default setting.
+- `NONE` — This user can grant privileges to none.
 
 You can exclude any user or role by using the `EXCEPT` expression. For example, `ALTER USER user1 GRANTEES ANY EXCEPT user2`. It means if `user1` has some privileges granted with `GRANT OPTION` it will be able to grant those privileges to anyone except `user2`.
 
diff --git a/docs/en/sql-reference/statements/alter/view.md b/docs/en/sql-reference/statements/alter/view.md
index e382cdace30..5c5bf0355f6 100644
--- a/docs/en/sql-reference/statements/alter/view.md
+++ b/docs/en/sql-reference/statements/alter/view.md
@@ -6,11 +6,166 @@ sidebar_label: VIEW
 
 # ALTER TABLE … MODIFY QUERY Statement
 
-You can modify `SELECT` query that was specified when a [materialized view](../create/view.md#materialized) was created with the `ALTER TABLE … MODIFY QUERY` statement. Use it when the materialized view was created without the `TO [db.]name` clause. The `allow_experimental_alter_materialized_view_structure` setting must be enabled. 
+You can modify `SELECT` query that was specified when a [materialized view](../create/view.md#materialized) was created with the `ALTER TABLE … MODIFY QUERY` statement without interrupting ingestion process. 
 
-If a materialized view uses the `TO [db.]name` construction, you must [DETACH](../detach.md) the view, run [ALTER TABLE](index.md) query for the target table, and then [ATTACH](../attach.md) the previously detached (`DETACH`) view.
+The `allow_experimental_alter_materialized_view_structure` setting must be enabled. 
 
-**Example**
+This command is created to change materialized view created with `TO [db.]name` clause. It does not change the structure of the underling storage table and it does not change the columns' definition of the materialized view, because of this the application of this command is very limited for materialized views are created without `TO [db.]name` clause.
+
+**Example with TO table**
+
+```sql
+CREATE TABLE events (ts DateTime, event_type String) 
+ENGINE = MergeTree ORDER BY (event_type, ts);
+
+CREATE TABLE events_by_day (ts DateTime, event_type String, events_cnt UInt64) 
+ENGINE = SummingMergeTree ORDER BY (event_type, ts);
+
+CREATE MATERIALIZED VIEW mv TO events_by_day AS 
+SELECT toStartOfDay(ts) ts, event_type, count() events_cnt
+FROM events
+GROUP BY ts, event_type; 
+
+INSERT INTO events 
+SELECT Date '2020-01-01' + interval number * 900 second, 
+       ['imp', 'click'][number%2+1]
+FROM numbers(100);
+
+SELECT ts, event_type, sum(events_cnt)
+FROM events_by_day
+GROUP BY ts, event_type
+ORDER BY ts, event_type;
+
+┌──────────────────ts─┬─event_type─┬─sum(events_cnt)─┐
+│ 2020-01-01 00:00:00 │ click      │              48 │
+│ 2020-01-01 00:00:00 │ imp        │              48 │
+│ 2020-01-02 00:00:00 │ click      │               2 │
+│ 2020-01-02 00:00:00 │ imp        │               2 │
+└─────────────────────┴────────────┴─────────────────┘
+
+-- Let's add the new measurment `cost` 
+-- and the new dimension `browser`.
+
+ALTER TABLE events 
+  ADD COLUMN browser String,
+  ADD COLUMN cost Float64;
+
+-- Column do not have to match in a materialized view and TO
+-- (destination table), so the next alter does not break insertion.
+
+ALTER TABLE events_by_day 
+    ADD COLUMN cost Float64,
+    ADD COLUMN browser String after event_type,
+    MODIFY ORDER BY (event_type, ts, browser);
+
+INSERT INTO events 
+SELECT Date '2020-01-02' + interval number * 900 second, 
+       ['imp', 'click'][number%2+1],
+       ['firefox', 'safary', 'chrome'][number%3+1],
+       10/(number+1)%33
+FROM numbers(100);
+
+-- New columns `browser` and `cost` are empty because we did not change Materialized View yet.
+
+SELECT ts, event_type, browser, sum(events_cnt) events_cnt, round(sum(cost),2) cost
+FROM events_by_day
+GROUP BY ts, event_type, browser
+ORDER BY ts, event_type;
+
+┌──────────────────ts─┬─event_type─┬─browser─┬─events_cnt─┬─cost─┐
+│ 2020-01-01 00:00:00 │ click      │         │         48 │    0 │
+│ 2020-01-01 00:00:00 │ imp        │         │         48 │    0 │
+│ 2020-01-02 00:00:00 │ click      │         │         50 │    0 │
+│ 2020-01-02 00:00:00 │ imp        │         │         50 │    0 │
+│ 2020-01-03 00:00:00 │ click      │         │          2 │    0 │
+│ 2020-01-03 00:00:00 │ imp        │         │          2 │    0 │
+└─────────────────────┴────────────┴─────────┴────────────┴──────┘
+
+SET allow_experimental_alter_materialized_view_structure=1;
+  
+ALTER TABLE mv MODIFY QUERY 
+  SELECT toStartOfDay(ts) ts, event_type, browser,
+  count() events_cnt,
+  sum(cost) cost
+  FROM events
+  GROUP BY ts, event_type, browser;
+
+INSERT INTO events 
+SELECT Date '2020-01-03' + interval number * 900 second, 
+       ['imp', 'click'][number%2+1],
+       ['firefox', 'safary', 'chrome'][number%3+1],
+       10/(number+1)%33
+FROM numbers(100);
+
+SELECT ts, event_type, browser, sum(events_cnt) events_cnt, round(sum(cost),2) cost
+FROM events_by_day
+GROUP BY ts, event_type, browser
+ORDER BY ts, event_type;
+
+┌──────────────────ts─┬─event_type─┬─browser─┬─events_cnt─┬──cost─┐
+│ 2020-01-01 00:00:00 │ click      │         │         48 │     0 │
+│ 2020-01-01 00:00:00 │ imp        │         │         48 │     0 │
+│ 2020-01-02 00:00:00 │ click      │         │         50 │     0 │
+│ 2020-01-02 00:00:00 │ imp        │         │         50 │     0 │
+│ 2020-01-03 00:00:00 │ click      │ firefox │         16 │  6.84 │
+│ 2020-01-03 00:00:00 │ click      │         │          2 │     0 │
+│ 2020-01-03 00:00:00 │ click      │ safary  │         16 │  9.82 │
+│ 2020-01-03 00:00:00 │ click      │ chrome  │         16 │  5.63 │
+│ 2020-01-03 00:00:00 │ imp        │         │          2 │     0 │
+│ 2020-01-03 00:00:00 │ imp        │ firefox │         16 │ 15.14 │
+│ 2020-01-03 00:00:00 │ imp        │ safary  │         16 │  6.14 │
+│ 2020-01-03 00:00:00 │ imp        │ chrome  │         16 │  7.89 │
+│ 2020-01-04 00:00:00 │ click      │ safary  │          1 │   0.1 │
+│ 2020-01-04 00:00:00 │ click      │ firefox │          1 │   0.1 │
+│ 2020-01-04 00:00:00 │ imp        │ firefox │          1 │   0.1 │
+│ 2020-01-04 00:00:00 │ imp        │ chrome  │          1 │   0.1 │
+└─────────────────────┴────────────┴─────────┴────────────┴───────┘
+
+-- !!! During `MODIFY ORDER BY` PRIMARY KEY was implicitly introduced.
+
+SHOW CREATE TABLE events_by_day FORMAT TSVRaw
+
+CREATE TABLE test.events_by_day
+(
+    `ts` DateTime,
+    `event_type` String,
+    `browser` String,
+    `events_cnt` UInt64,
+    `cost` Float64
+)
+ENGINE = SummingMergeTree
+PRIMARY KEY (event_type, ts)
+ORDER BY (event_type, ts, browser)
+SETTINGS index_granularity = 8192
+
+-- !!! The columns' definition is unchanged but it does not matter, we are not quering 
+-- MATERIALIZED VIEW, we are quering TO (storage) table.
+-- SELECT section is updated.
+
+SHOW CREATE TABLE mv FORMAT TSVRaw;
+
+CREATE MATERIALIZED VIEW test.mv TO test.events_by_day
+(
+    `ts` DateTime,
+    `event_type` String,
+    `events_cnt` UInt64
+) AS
+SELECT
+    toStartOfDay(ts) AS ts,
+    event_type,
+    browser,
+    count() AS events_cnt,
+    sum(cost) AS cost
+FROM test.events
+GROUP BY
+    ts,
+    event_type,
+    browser
+```
+
+**Example without TO table**
+
+The application is very limited because you can only change the `SELECT` section without adding new columns.
 
 ```sql
 CREATE TABLE src_table (`a` UInt32) ENGINE = MergeTree ORDER BY a;
@@ -25,6 +180,7 @@ SELECT * FROM mv;
 └───┘
 ```
 ```sql
+set allow_experimental_alter_materialized_view_structure=1;
 ALTER TABLE mv MODIFY QUERY SELECT a * 2 as a FROM src_table;
 INSERT INTO src_table (a) VALUES (3), (4);
 SELECT * FROM mv;
diff --git a/docs/en/sql-reference/statements/check-table.md b/docs/en/sql-reference/statements/check-table.md
index 8c4b8ab90a2..0209d59b018 100644
--- a/docs/en/sql-reference/statements/check-table.md
+++ b/docs/en/sql-reference/statements/check-table.md
@@ -16,15 +16,15 @@ The `CHECK TABLE` query compares actual file sizes with the expected values whic
 The query response contains the `result` column with a single row. The row has a value of
 [Boolean](../../sql-reference/data-types/boolean.md) type:
 
--   0 - The data in the table is corrupted.
--   1 - The data maintains integrity.
+- 0 - The data in the table is corrupted.
+- 1 - The data maintains integrity.
 
 The `CHECK TABLE` query supports the following table engines:
 
--   [Log](../../engines/table-engines/log-family/log.md)
--   [TinyLog](../../engines/table-engines/log-family/tinylog.md)
--   [StripeLog](../../engines/table-engines/log-family/stripelog.md)
--   [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)
+- [Log](../../engines/table-engines/log-family/log.md)
+- [TinyLog](../../engines/table-engines/log-family/tinylog.md)
+- [StripeLog](../../engines/table-engines/log-family/stripelog.md)
+- [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)
 
 Performed over the tables with another table engines causes an exception.
 
diff --git a/docs/en/sql-reference/statements/create/database.md b/docs/en/sql-reference/statements/create/database.md
index 7954d1362f1..a2f5b2b9fba 100644
--- a/docs/en/sql-reference/statements/create/database.md
+++ b/docs/en/sql-reference/statements/create/database.md
@@ -18,8 +18,8 @@ CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster] [ENGINE = engine(..
 
 If the `db_name` database already exists, then ClickHouse does not create a new database and:
 
--   Doesn’t throw an exception if clause is specified.
--   Throws an exception if clause isn’t specified.
+- Doesn’t throw an exception if clause is specified.
+- Throws an exception if clause isn’t specified.
 
 ### ON CLUSTER
 
diff --git a/docs/en/sql-reference/statements/create/dictionary.md b/docs/en/sql-reference/statements/create/dictionary.md
index e789dd9257f..29c72d62f24 100644
--- a/docs/en/sql-reference/statements/create/dictionary.md
+++ b/docs/en/sql-reference/statements/create/dictionary.md
@@ -5,7 +5,7 @@ sidebar_label: DICTIONARY
 title: "CREATE DICTIONARY"
 ---
 
-Creates a new [dictionary](../../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) with given [structure](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md), [source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md), [layout](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md) and [lifetime](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md).
+Creates a new [dictionary](../../../sql-reference/dictionaries/index.md) with given [structure](../../../sql-reference/dictionaries/index.md#dictionary-key-and-fields), [source](../../../sql-reference/dictionaries/index.md#dictionary-sources), [layout](../../../sql-reference/dictionaries/index.md#storig-dictionaries-in-memory) and [lifetime](../../../sql-reference/dictionaries/index.md#dictionary-updates).
 
 ## Syntax
 
@@ -29,7 +29,7 @@ The dictionary structure consists of attributes. Dictionary attributes are speci
 
 `ON CLUSTER` clause allows creating dictionary on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
 
-Depending on dictionary [layout](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md) one or more attributes can be specified as dictionary keys.
+Depending on dictionary [layout](../../../sql-reference/dictionaries/index.md#storig-dictionaries-in-memory) one or more attributes can be specified as dictionary keys.
 
 ## SOURCE
 
@@ -125,9 +125,9 @@ LAYOUT(HASHED())
 
 ### Create a dictionary from another database
 
-Please see the details in [Dictionary sources](/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md/#dbms).
+Please see the details in [Dictionary sources](/docs/en/sql-reference/dictionaries/index.md#dictionary-sources/#dbms).
 
 **See Also**
 
-- For more information, see the [Dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) section.
-- [system.dictionaries](../../../operations/system-tables/dictionaries.md) — This table contains information about [Dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
+- For more information, see the [Dictionaries](../../../sql-reference/dictionaries/index.md) section.
+- [system.dictionaries](../../../operations/system-tables/dictionaries.md) — This table contains information about [Dictionaries](../../../sql-reference/dictionaries/index.md).
diff --git a/docs/en/sql-reference/statements/create/function.md b/docs/en/sql-reference/statements/create/function.md
index 80d20e8ccad..db65cb4448c 100644
--- a/docs/en/sql-reference/statements/create/function.md
+++ b/docs/en/sql-reference/statements/create/function.md
@@ -2,11 +2,10 @@
 slug: /en/sql-reference/statements/create/function
 sidebar_position: 38
 sidebar_label: FUNCTION
+title: "CREATE FUNCTION -user defined function (UDF)"
 ---
 
-# CREATE FUNCTION &mdash; user defined function (UDF)
-
-Creates a user defined function from a lambda expression. The expression must consist of function parameters, constants, operators, or other function calls.
+Creates a user defined function (UDF) from a lambda expression. The expression must consist of function parameters, constants, operators, or other function calls.
 
 **Syntax**
 
@@ -17,9 +16,9 @@ A function can have an arbitrary number of parameters.
 
 There are a few restrictions:
 
--   The name of a function must be unique among user defined and system functions.
--   Recursive functions are not allowed.
--   All variables used by a function must be specified in its parameter list.
+- The name of a function must be unique among user defined and system functions.
+- Recursive functions are not allowed.
+- All variables used by a function must be specified in its parameter list.
 
 If any restriction is violated then an exception is raised.
 
@@ -61,4 +60,6 @@ Result:
 
 ## Related Content
 
-- [User-defined functions in ClickHouse Cloud](https://clickhouse.com/blog/user-defined-functions-clickhouse-udfs)
+### [Executable UDFs](/docs/en/sql-reference/functions/udf.md).
+
+### [User-defined functions in ClickHouse Cloud](https://clickhouse.com/blog/user-defined-functions-clickhouse-udfs)
diff --git a/docs/en/sql-reference/statements/create/index.md b/docs/en/sql-reference/statements/create/index.md
index b9062249f65..14e29d051d7 100644
--- a/docs/en/sql-reference/statements/create/index.md
+++ b/docs/en/sql-reference/statements/create/index.md
@@ -8,13 +8,13 @@ sidebar_label: CREATE
 
 Create queries make a new entity of one of the following kinds:
 
--   [DATABASE](../../../sql-reference/statements/create/database.md)
--   [TABLE](../../../sql-reference/statements/create/table.md)
--   [VIEW](../../../sql-reference/statements/create/view.md)
--   [DICTIONARY](../../../sql-reference/statements/create/dictionary.md)
--   [FUNCTION](../../../sql-reference/statements/create/function.md)
--   [USER](../../../sql-reference/statements/create/user.md)
--   [ROLE](../../../sql-reference/statements/create/role.md)
--   [ROW POLICY](../../../sql-reference/statements/create/row-policy.md)
--   [QUOTA](../../../sql-reference/statements/create/quota.md)
--   [SETTINGS PROFILE](../../../sql-reference/statements/create/settings-profile.md)
+- [DATABASE](../../../sql-reference/statements/create/database.md)
+- [TABLE](../../../sql-reference/statements/create/table.md)
+- [VIEW](../../../sql-reference/statements/create/view.md)
+- [DICTIONARY](../../../sql-reference/statements/create/dictionary.md)
+- [FUNCTION](../../../sql-reference/statements/create/function.md)
+- [USER](../../../sql-reference/statements/create/user.md)
+- [ROLE](../../../sql-reference/statements/create/role.md)
+- [ROW POLICY](../../../sql-reference/statements/create/row-policy.md)
+- [QUOTA](../../../sql-reference/statements/create/quota.md)
+- [SETTINGS PROFILE](../../../sql-reference/statements/create/settings-profile.md)
diff --git a/docs/en/sql-reference/statements/create/quota.md b/docs/en/sql-reference/statements/create/quota.md
index 3952743b480..7c31f93fff7 100644
--- a/docs/en/sql-reference/statements/create/quota.md
+++ b/docs/en/sql-reference/statements/create/quota.md
@@ -5,7 +5,7 @@ sidebar_label: QUOTA
 title: "CREATE QUOTA"
 ---
 
-Creates a [quota](../../../operations/access-rights.md#quotas-management) that can be assigned to a user or a role.
+Creates a [quota](../../../guides/sre/user-management/index.md#quotas-management) that can be assigned to a user or a role.
 
 Syntax:
 
diff --git a/docs/en/sql-reference/statements/create/role.md b/docs/en/sql-reference/statements/create/role.md
index 68fdd51e957..9b14e220e1f 100644
--- a/docs/en/sql-reference/statements/create/role.md
+++ b/docs/en/sql-reference/statements/create/role.md
@@ -5,7 +5,7 @@ sidebar_label: ROLE
 title: "CREATE ROLE"
 ---
 
-Creates new [roles](../../../operations/access-rights.md#role-management). Role is a set of [privileges](../../../sql-reference/statements/grant.md#grant-privileges). A [user](../../../sql-reference/statements/create/user.md) assigned a role gets all the privileges of this role.
+Creates new [roles](../../../guides/sre/user-management/index.md#role-management). Role is a set of [privileges](../../../sql-reference/statements/grant.md#grant-privileges). A [user](../../../sql-reference/statements/create/user.md) assigned a role gets all the privileges of this role.
 
 Syntax:
 
@@ -22,7 +22,7 @@ User can have default roles which apply at user login. To set default roles, use
 
 To revoke a role, use the [REVOKE](../../../sql-reference/statements/revoke.md) statement.
 
-To delete role, use the [DROP ROLE](../../../sql-reference/statements/drop#drop-role-statement) statement. The deleted role is being automatically revoked from all the users and roles to which it was assigned.
+To delete role, use the [DROP ROLE](../../../sql-reference/statements/drop.md#drop-role-statement) statement. The deleted role is being automatically revoked from all the users and roles to which it was assigned.
 
 ## Examples
 
diff --git a/docs/en/sql-reference/statements/create/row-policy.md b/docs/en/sql-reference/statements/create/row-policy.md
index 31ce9221eea..83bb2e6bb9a 100644
--- a/docs/en/sql-reference/statements/create/row-policy.md
+++ b/docs/en/sql-reference/statements/create/row-policy.md
@@ -5,17 +5,17 @@ sidebar_label: ROW POLICY
 title: "CREATE ROW POLICY"
 ---
 
-Creates a [row policy](../../../operations/access-rights.md#row-policy-management), i.e. a filter used to determine which rows a user can read from a table.
+Creates a [row policy](../../../guides/sre/user-management/index.md#row-policy-management), i.e. a filter used to determine which rows a user can read from a table.
 
-:::warning    
+:::tip
 Row policies makes sense only for users with readonly access. If user can modify table or copy partitions between tables, it defeats the restrictions of row policies.
 :::
 
 Syntax:
 
 ``` sql
-CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name1 [ON CLUSTER cluster_name1] ON [db1.]table1
-        [, policy_name2 [ON CLUSTER cluster_name2] ON [db2.]table2 ...]
+CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name1 [ON CLUSTER cluster_name1] ON [db1.]table1|db1.*
+        [, policy_name2 [ON CLUSTER cluster_name2] ON [db2.]table2|db2.* ...]
     [FOR SELECT] USING condition
     [AS {PERMISSIVE | RESTRICTIVE}]
     [TO {role1 [, role2 ...] | ALL | ALL EXCEPT role1 [, role2 ...]}]
@@ -31,7 +31,7 @@ In the section `TO` you can provide a list of users and roles this policy should
 
 Keyword `ALL` means all the ClickHouse users including current user. Keyword `ALL EXCEPT` allow to exclude some users from the all users list, for example, `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
 
-:::note    
+:::note
 If there are no row policies defined for a table then any user can `SELECT` all the row from the table. Defining one or more row policies for the table makes the access to the table depending on the row policies no matter if those row policies are defined for the current user or not. For example, the following policy
 
 `CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter`
@@ -76,6 +76,20 @@ CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 AS RESTRICTIVE TO peter, antonio
 
 enables the user `peter` to see rows only if both `b=1` AND `c=2`.
 
+Database policies are combined with table policies.
+
+For example, the following policies
+
+``` sql
+CREATE ROW POLICY pol1 ON mydb.* USING b=1 TO mira, peter
+CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 AS RESTRICTIVE TO peter, antonio
+```
+
+enables the user `peter` to see table1 rows only if both `b=1` AND `c=2`, although
+any other table in mydb would have only `b=1` policy applied for the user.
+
+
+
 ## ON CLUSTER Clause
 
 Allows creating row policies on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
@@ -88,3 +102,5 @@ Allows creating row policies on a cluster, see [Distributed DDL](../../../sql-re
 `CREATE ROW POLICY filter2 ON mydb.mytable USING a<1000 AND b=5 TO ALL EXCEPT mira`
 
 `CREATE ROW POLICY filter3 ON mydb.mytable USING 1 TO admin`
+
+`CREATE ROW POLICY filter4 ON mydb.* USING 1 TO admin`
diff --git a/docs/en/sql-reference/statements/create/settings-profile.md b/docs/en/sql-reference/statements/create/settings-profile.md
index c2424ff6046..8e221a4d82f 100644
--- a/docs/en/sql-reference/statements/create/settings-profile.md
+++ b/docs/en/sql-reference/statements/create/settings-profile.md
@@ -5,7 +5,7 @@ sidebar_label: SETTINGS PROFILE
 title: "CREATE SETTINGS PROFILE"
 ---
 
-Creates [settings profiles](../../../operations/access-rights.md#settings-profiles-management) that can be assigned to a user or a role.
+Creates [settings profiles](../../../guides/sre/user-management/index.md#settings-profiles-management) that can be assigned to a user or a role.
 
 Syntax:
 
@@ -27,7 +27,7 @@ CREATE USER robin IDENTIFIED BY 'password';
 Create the `max_memory_usage_profile` settings profile with value and constraints for the `max_memory_usage` setting and assign it to user `robin`:
 
 ``` sql
-CREATE 
-SETTINGS PROFILE max_memory_usage_profile SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000 
+CREATE
+SETTINGS PROFILE max_memory_usage_profile SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000
 TO robin
 ```
diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 54977e1b0ab..de44a001472 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -110,25 +110,23 @@ If the type is not `Nullable` and if `NULL` is specified, it will be treated as
 
 See also [data_type_default_nullable](../../../operations/settings/settings.md#data_type_default_nullable) setting.
 
-## Default Values
+## Default Values {#default_values}
 
-The column description can specify an expression for a default value, in one of the following ways: `DEFAULT expr`, `MATERIALIZED expr`, `ALIAS expr`.
+The column description can specify a default value expression in the form of `DEFAULT expr`, `MATERIALIZED expr`, or `ALIAS expr`. Example: `URLDomain String DEFAULT domain(URL)`.
 
-Example: `URLDomain String DEFAULT domain(URL)`.
+The expression `expr` is optional. If it is omitted, the column type must be specified explicitly and the default value will be `0` for numeric columns, `''` (the empty string) for string columns, `[]` (the empty array) for array columns, `1970-01-01` for date columns, or `NULL` for nullable columns.
 
-If an expression for the default value is not defined, the default values will be set to zeros for numbers, empty strings for strings, empty arrays for arrays, and `1970-01-01` for dates or zero unix timestamp for DateTime, NULL for Nullable.
+The column type of a default value column can be omitted in which case it is inferred from `expr`'s type. For example the type of column `EventDate DEFAULT toDate(EventTime)` will be date.
 
-If the default expression is defined, the column type is optional. If there isn’t an explicitly defined type, the default expression type is used. Example: `EventDate DEFAULT toDate(EventTime)` – the ‘Date’ type will be used for the ‘EventDate’ column.
+If both a data type and a default value expression are specified, an implicit type casting function inserted which converts the expression to the specified type. Example: `Hits UInt32 DEFAULT 0` is internally represented as `Hits UInt32 DEFAULT toUInt32(0)`.
 
-If the data type and default expression are defined explicitly, this expression will be cast to the specified type using type casting functions. Example: `Hits UInt32 DEFAULT 0` means the same thing as `Hits UInt32 DEFAULT toUInt32(0)`.
-
-Default expressions may be defined as an arbitrary expression from table constants and columns. When creating and changing the table structure, it checks that expressions do not contain loops. For INSERT, it checks that expressions are resolvable – that all columns they can be calculated from have been passed.
+A default value expression `expr` may reference arbitrary table columns and constants. ClickHouse checks that changes of the table structure do not introduce loops in the expression calculation. For INSERT, it checks that expressions are resolvable – that all columns they can be calculated from have been passed.
 
 ### DEFAULT
 
 `DEFAULT expr`
 
-Normal default value. If the INSERT query does not specify the corresponding column, it will be filled in by computing the corresponding expression.
+Normal default value. If the value of such a column is not specified in an INSERT query, it is computed from `expr`.
 
 Example:
 
@@ -154,9 +152,9 @@ SELECT * FROM test;
 
 `MATERIALIZED expr`
 
-Materialized expression. Such a column can’t be specified for INSERT, because it is always calculated.
-For an INSERT without a list of columns, these columns are not considered.
-In addition, this column is not substituted when using an asterisk in a SELECT query. This is to preserve the invariant that the dump obtained using `SELECT *` can be inserted back into the table using INSERT without specifying the list of columns.
+Materialized expression. Values of such columns are always calculated, they cannot be specified in INSERT queries.
+
+Also, default value columns of this type are not included in the result of `SELECT *`. This is to preserve the invariant that the result of a `SELECT *` can always be inserted back into the table using `INSERT`. This behavior can be disabled with setting `asterisk_include_materialized_columns`.
 
 Example:
 
@@ -192,8 +190,9 @@ SELECT * FROM test SETTINGS asterisk_include_materialized_columns=1;
 
 `EPHEMERAL [expr]`
 
-Ephemeral column. Such a column isn't stored in the table and cannot be SELECTed, but can be referenced in the defaults of CREATE statement. If `expr` is omitted type for column is required.
-INSERT without list of columns will skip such column, so SELECT/INSERT invariant is preserved -  the dump obtained using `SELECT *` can be inserted back into the table using INSERT without specifying the list of columns.
+Ephemeral column. Columns of this type are not stored in the table and it is not possible to SELECT from them. The only purpose of ephemeral columns is to build default value expressions of other columns from them.
+
+An insert without explicitly specified columns will skip columns of this type. This is to preserve the invariant that the result of a `SELECT *` can always be inserted back into the table using `INSERT`.
 
 Example:
 
@@ -205,7 +204,7 @@ CREATE OR REPLACE TABLE test
     hexed FixedString(4) DEFAULT unhex(unhexed)
 )
 ENGINE = MergeTree
-ORDER BY id
+ORDER BY id;
 
 INSERT INTO test (id, unhexed) Values (1, '5a90b714');
 
@@ -227,9 +226,9 @@ hex(hexed): 5A90B714
 
 `ALIAS expr`
 
-Synonym. Such a column isn’t stored in the table at all.
-Its values can’t be inserted in a table, and it is not substituted when using an asterisk in a SELECT query.
-It can be used in SELECTs if the alias is expanded during query parsing.
+Calculated columns (synonym). Column of this type are not stored in the table and it is not possible to INSERT values into them.
+
+When SELECT queries explicitly reference columns of this type, the value is computed at query time from `expr`. By default, `SELECT *` excludes ALIAS columns. This behavior can be disabled with setting `asteriks_include_alias_columns`.
 
 When using the ALTER query to add new columns, old data for these columns is not written. Instead, when reading old data that does not have values for the new columns, expressions are computed on the fly by default. However, if running the expressions requires different columns that are not indicated in the query, these columns will additionally be read, but only for the blocks of data that need it.
 
@@ -286,7 +285,7 @@ ENGINE = engine
 PRIMARY KEY(expr1[, expr2,...]);
 ```
 
-:::warning
+:::tip
 You can't combine both ways in one query.
 :::
 
@@ -314,7 +313,9 @@ Defines storage time for values. Can be specified only for MergeTree-family tabl
 
 ## Column Compression Codecs
 
-By default, ClickHouse applies the `lz4` compression method. For `MergeTree`-engine family you can change the default compression method in the [compression](../../../operations/server-configuration-parameters/settings.md#server-settings-compression) section of a server configuration.
+By default, ClickHouse applies `lz4` compression in the self-managed version, and `zstd` in ClickHouse Cloud. 
+
+For `MergeTree`-engine family you can change the default compression method in the [compression](../../../operations/server-configuration-parameters/settings.md#server-settings-compression) section of a server configuration.
 
 You can also define the compression method for each individual column in the `CREATE TABLE` query.
 
@@ -342,16 +343,16 @@ ALTER TABLE codec_example MODIFY COLUMN float_value CODEC(Default);
 
 Codecs can be combined in a pipeline, for example, `CODEC(Delta, Default)`.
 
-:::warning
+:::tip
 You can’t decompress ClickHouse database files with external utilities like `lz4`. Instead, use the special [clickhouse-compressor](https://github.com/ClickHouse/ClickHouse/tree/master/programs/compressor) utility.
 :::
 
 Compression is supported for the following table engines:
 
--   [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) family. Supports column compression codecs and selecting the default compression method by [compression](../../../operations/server-configuration-parameters/settings.md#server-settings-compression) settings.
--   [Log](../../../engines/table-engines/log-family/index.md) family. Uses the `lz4` compression method by default and supports column compression codecs.
--   [Set](../../../engines/table-engines/special/set.md). Only supported the default compression.
--   [Join](../../../engines/table-engines/special/join.md). Only supported the default compression.
+- [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) family. Supports column compression codecs and selecting the default compression method by [compression](../../../operations/server-configuration-parameters/settings.md#server-settings-compression) settings.
+- [Log](../../../engines/table-engines/log-family/index.md) family. Uses the `lz4` compression method by default and supports column compression codecs.
+- [Set](../../../engines/table-engines/special/set.md). Only supported the default compression.
+- [Join](../../../engines/table-engines/special/join.md). Only supported the default compression.
 
 ClickHouse supports general purpose codecs and specialized codecs.
 
@@ -379,10 +380,10 @@ High compression levels are useful for asymmetric scenarios, like compress once,
 
 `DEFLATE_QPL` — [Deflate compression algorithm](https://github.com/intel/qpl) implemented by Intel® Query Processing Library. Some limitations apply:
 
--   DEFLATE_QPL is experimental and can only be used after setting configuration parameter `allow_experimental_codecs=1`.
--   DEFLATE_QPL only works if ClickHouse was compiled with support for AVX2 or AVX512 instructions
--   DEFLATE_QPL works best if the system has a Intel® IAA (In-Memory Analytics Accelerator) offloading device
--   DEFLATE_QPL-compressed data can only be transferred between ClickHouse nodes compiled with support for AVX2/AVX512
+- DEFLATE_QPL is experimental and can only be used after setting configuration parameter `allow_experimental_codecs=1`.
+- DEFLATE_QPL requires a ClickHouse build compiled with SSE 4.2 instructions (by default, this is the case). Refer to [Build Clickhouse with DEFLATE_QPL](/docs/en/development/building_and_benchmarking_deflate_qpl.md/#Build-Clickhouse-with-DEFLATE_QPL) for more details.
+- DEFLATE_QPL works best if the system has a Intel® IAA (In-Memory Analytics Accelerator) offloading device. Refer to [Accelerator Configuration](https://intel.github.io/qpl/documentation/get_started_docs/installation.html#accelerator-configuration) and [Benchmark with DEFLATE_QPL](/docs/en/development/building_and_benchmarking_deflate_qpl.md/#Run-Benchmark-with-DEFLATE_QPL) for more details.
+- DEFLATE_QPL-compressed data can only be transferred between ClickHouse nodes compiled with SSE 4.2 enabled.
 
 ### Specialized Codecs
 
@@ -394,15 +395,15 @@ These codecs are designed to make compression more effective by using specific f
 
 #### DoubleDelta
 
-`DoubleDelta` — Calculates delta of deltas and writes it in compact binary form. Optimal compression rates are achieved for monotonic sequences with a constant stride, such as time series data. Can be used with any fixed-width type. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. Uses 1 extra bit for 32-byte deltas: 5-bit prefixes instead of 4-bit prefixes. For additional information, see Compressing Time Stamps in [Gorilla: A Fast, Scalable, In-Memory Time Series Database](http://www.vldb.org/pvldb/vol8/p1816-teller.pdf).
+`DoubleDelta(bytes_size)` — Calculates delta of deltas and writes it in compact binary form. Possible `bytes_size` values: 1, 2, 4, 8, the default value is `sizeof(type)` if equal to 1, 2, 4, or 8. In all other cases, it’s 1. Optimal compression rates are achieved for monotonic sequences with a constant stride, such as time series data. Can be used with any fixed-width type. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. Uses 1 extra bit for 32-bit deltas: 5-bit prefixes instead of 4-bit prefixes. For additional information, see Compressing Time Stamps in [Gorilla: A Fast, Scalable, In-Memory Time Series Database](http://www.vldb.org/pvldb/vol8/p1816-teller.pdf).
 
 #### Gorilla
 
-`Gorilla` — Calculates XOR between current and previous floating point value and writes it in compact binary form. The smaller the difference between consecutive values is, i.e. the slower the values of the series changes, the better the compression rate. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. For additional information, see section 4.1 in [Gorilla: A Fast, Scalable, In-Memory Time Series Database](https://doi.org/10.14778/2824032.2824078).
+`Gorilla(bytes_size)` — Calculates XOR between current and previous floating point value and writes it in compact binary form. The smaller the difference between consecutive values is, i.e. the slower the values of the series changes, the better the compression rate. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. Possible `bytes_size` values: 1, 2, 4, 8, the default value is `sizeof(type)` if equal to 1, 2, 4, or 8. In all other cases, it’s 1. For additional information, see section 4.1 in [Gorilla: A Fast, Scalable, In-Memory Time Series Database](https://doi.org/10.14778/2824032.2824078).
 
 #### FPC
 
-`FPC` - Repeatedly predicts the next floating point value in the sequence using the better of two predictors, then XORs the actual with the predicted value, and leading-zero compresses the result. Similar to Gorilla, this is efficient when storing a series of floating point values that change slowly. For 64-bit values (double), FPC is faster than Gorilla, for 32-bit values your mileage may vary. For a detailed description of the algorithm see [High Throughput Compression of Double-Precision Floating-Point Data](https://userweb.cs.txstate.edu/~burtscher/papers/dcc07a.pdf).
+`FPC(level, float_size)` - Repeatedly predicts the next floating point value in the sequence using the better of two predictors, then XORs the actual with the predicted value, and leading-zero compresses the result. Similar to Gorilla, this is efficient when storing a series of floating point values that change slowly. For 64-bit values (double), FPC is faster than Gorilla, for 32-bit values your mileage may vary. Possible `level` values: 1-28, the default value is 12.  Possible `float_size` values: 4, 8, the default value is `sizeof(type)` if type is Float. In all other cases, it’s 4. For a detailed description of the algorithm see [High Throughput Compression of Double-Precision Floating-Point Data](https://userweb.cs.txstate.edu/~burtscher/papers/dcc07a.pdf).
 
 #### T64
 
@@ -437,11 +438,11 @@ Encryption codecs:
 
 These codecs use a fixed nonce and encryption is therefore deterministic. This makes it compatible with deduplicating engines such as [ReplicatedMergeTree](../../../engines/table-engines/mergetree-family/replication.md) but has a weakness: when the same data block is encrypted twice, the resulting ciphertext will be exactly the same so an adversary who can read the disk can see this equivalence (although only the equivalence, without getting its content).
 
-:::warning
+:::note
 Most engines including the "\*MergeTree" family create index files on disk without applying codecs. This means plaintext will appear on disk if an encrypted column is indexed.
 :::
 
-:::warning
+:::note
 If you perform a SELECT query mentioning a specific value in an encrypted column (such as in its WHERE clause), the value may appear in [system.query_log](../../../operations/system-tables/query_log.md). You may want to disable the logging.
 :::
 
@@ -473,12 +474,12 @@ ENGINE = MergeTree ORDER BY x;
 
 ClickHouse supports temporary tables which have the following characteristics:
 
--   Temporary tables disappear when the session ends, including if the connection is lost.
--   A temporary table uses the Memory engine only.
--   The DB can’t be specified for a temporary table. It is created outside of databases.
--   Impossible to create a temporary table with distributed DDL query on all cluster servers (by using `ON CLUSTER`): this table exists only in the current session.
--   If a temporary table has the same name as another one and a query specifies the table name without specifying the DB, the temporary table will be used.
--   For distributed query processing, temporary tables used in a query are passed to remote servers.
+- Temporary tables disappear when the session ends, including if the connection is lost.
+- A temporary table uses the Memory table engine when engine is not specified and it may use any table engine except Replicated and `KeeperMap` engines.
+- The DB can’t be specified for a temporary table. It is created outside of databases.
+- Impossible to create a temporary table with distributed DDL query on all cluster servers (by using `ON CLUSTER`): this table exists only in the current session.
+- If a temporary table has the same name as another one and a query specifies the table name without specifying the DB, the temporary table will be used.
+- For distributed query processing, temporary tables used in a query are passed to remote servers.
 
 To create a temporary table, use the following syntax:
 
@@ -488,7 +489,7 @@ CREATE TEMPORARY TABLE [IF NOT EXISTS] table_name
     name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
     name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
     ...
-)
+) [ENGINE = engine]
 ```
 
 In most cases, temporary tables are not created manually, but when using external data for a query, or for distributed `(GLOBAL) IN`. For more information, see the appropriate sections
@@ -576,7 +577,7 @@ SELECT * FROM base.t1;
 You can add a comment to the table when you creating it.
 
 :::note
-The comment is supported for all table engines except [Kafka](../../../engines/table-engines/integrations/kafka.md), [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md) and [EmbeddedRocksDB](../../../engines/table-engines/integrations/embedded-rocksdb.md).
+The comment clause is supported by all table engines except [Kafka](../../../engines/table-engines/integrations/kafka.md), [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md) and [EmbeddedRocksDB](../../../engines/table-engines/integrations/embedded-rocksdb.md).
 :::
 
 
diff --git a/docs/en/sql-reference/statements/create/user.md b/docs/en/sql-reference/statements/create/user.md
index a756b3d4a0d..d168be63c36 100644
--- a/docs/en/sql-reference/statements/create/user.md
+++ b/docs/en/sql-reference/statements/create/user.md
@@ -5,7 +5,7 @@ sidebar_label: USER
 title: "CREATE USER"
 ---
 
-Creates [user accounts](../../../operations/access-rights.md#user-account-management).
+Creates [user accounts](../../../guides/sre/user-management/index.md#user-account-management).
 
 Syntax:
 
@@ -26,36 +26,112 @@ CREATE USER [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name1]
 
 There are multiple ways of user identification:
 
--   `IDENTIFIED WITH no_password`
--   `IDENTIFIED WITH plaintext_password BY 'qwerty'`
--   `IDENTIFIED WITH sha256_password BY 'qwerty'` or `IDENTIFIED BY 'password'`
--   `IDENTIFIED WITH sha256_hash BY 'hash'` or `IDENTIFIED WITH sha256_hash BY 'hash' SALT 'salt'`
--   `IDENTIFIED WITH double_sha1_password BY 'qwerty'`
--   `IDENTIFIED WITH double_sha1_hash BY 'hash'`
--   `IDENTIFIED WITH ldap SERVER 'server_name'`
--   `IDENTIFIED WITH kerberos` or `IDENTIFIED WITH kerberos REALM 'realm'`
--   `IDENTIFIED WITH ssl_certificate CN 'mysite.com:user'`
+- `IDENTIFIED WITH no_password`
+- `IDENTIFIED WITH plaintext_password BY 'qwerty'`
+- `IDENTIFIED WITH sha256_password BY 'qwerty'` or `IDENTIFIED BY 'password'`
+- `IDENTIFIED WITH sha256_hash BY 'hash'` or `IDENTIFIED WITH sha256_hash BY 'hash' SALT 'salt'`
+- `IDENTIFIED WITH double_sha1_password BY 'qwerty'`
+- `IDENTIFIED WITH double_sha1_hash BY 'hash'`
+- `IDENTIFIED WITH bcrypt_password BY 'qwerty'`
+- `IDENTIFIED WITH bcrypt_hash BY 'hash'`
+- `IDENTIFIED WITH ldap SERVER 'server_name'`
+- `IDENTIFIED WITH kerberos` or `IDENTIFIED WITH kerberos REALM 'realm'`
+- `IDENTIFIED WITH ssl_certificate CN 'mysite.com:user'`
+- `IDENTIFIED BY 'qwerty'`
 
-For identification with sha256_hash using `SALT` - hash must be calculated from concatination of 'password' and 'salt'.
+## Examples
+
+1. The following username is `name1` and does not require a password - which obviously doesn't provide much security:
+
+    ```sql
+    CREATE USER name1 NOT IDENTIFIED
+    ```
+
+2. To specify a plaintext password:
+
+    ```sql
+    CREATE USER name2 IDENTIFIED WITH plaintext_password BY 'my_password'
+    ```
+
+    :::tip
+    The password is stored in a SQL text file in `/var/lib/clickhouse/access`, so it's not a good idea to use `plaintext_password`. Try `sha256_password` instead, as demonstrated next...
+    :::
+
+3. The most common option is to use a password that is hashed using SHA-256. ClickHouse will hash the password for you when you specify `IDENTIFIED WITH sha256_password`. For example:
+
+    ```sql
+    CREATE USER name3 IDENTIFIED WITH sha256_password BY 'my_password'
+    ```
+
+    The `name3` user can now login using `my_password`, but the password is stored as the hashed value above. THe following SQL file was created in `/var/lib/clickhouse/access` and gets executed at server startup:
+
+    ```bash
+    /var/lib/clickhouse/access $ cat 3843f510-6ebd-a52d-72ac-e021686d8a93.sql
+    ATTACH USER name3 IDENTIFIED WITH sha256_hash BY '0C268556C1680BEF0640AAC1E7187566704208398DA31F03D18C74F5C5BE5053' SALT '4FB16307F5E10048196966DD7E6876AE53DE6A1D1F625488482C75F14A5097C7';
+    ```
+
+    :::tip
+    If you have already created a hash value and corresponding salt value for a username, then you can use `IDENTIFIED WITH sha256_hash BY 'hash'` or `IDENTIFIED WITH sha256_hash BY 'hash' SALT 'salt'`. For identification with `sha256_hash` using `SALT` - hash must be calculated from concatenation of 'password' and 'salt'.
+    :::
+
+4. The `double_sha1_password` is not typically needed, but comes in handy when working with clients that require it (like the MySQL interface):
+
+    ```sql
+    CREATE USER name4 IDENTIFIED WITH double_sha1_password BY 'my_password'
+    ```
+
+    ClickHouse generates and runs the following query:
+
+    ```response
+    CREATE USER name4 IDENTIFIED WITH double_sha1_hash BY 'CCD3A959D6A004B9C3807B728BC2E55B67E10518'
+    ```
+
+5. The `bcrypt_password` is the most secure option for storing passwords. It uses the [bcrypt](https://en.wikipedia.org/wiki/Bcrypt) algorithm, which is resilient against brute force attacks even if the password hash is compromised.
+
+    ```sql
+    CREATE USER name5 IDENTIFIED WITH bcrypt_password BY 'my_password'
+    ```
+
+    The length of the password is limited to 72 characters with this method. The bcrypt work factor parameter, which defines the amount of computations and time needed to compute the hash and verify the password, can be modified in the server configuration:
+
+    ```xml
+    <bcrypt_workfactor>12</bcrypt_workfactor>
+    ```
+
+    The work factor must be between 4 and 31, with a default value of 12.
+
+6. The type of the password can also be omitted:
+
+    ```sql
+    CREATE USER name6 IDENTIFIED BY 'my_password'
+    ```
+
+    In this case, ClickHouse will use the default password type specified in the server configuration:
+
+    ```xml
+    <default_password_type>sha256_password</default_password_type>
+    ```
+
+    The available password types are: `plaintext_password`, `sha256_password`, `double_sha1_password`.
 
 ## User Host
 
 User host is a host from which a connection to ClickHouse server could be established. The host can be specified in the `HOST` query section in the following ways:
 
--   `HOST IP 'ip_address_or_subnetwork'` — User can connect to ClickHouse server only from the specified IP address or a [subnetwork](https://en.wikipedia.org/wiki/Subnetwork). Examples: `HOST IP '192.168.0.0/16'`, `HOST IP '2001:DB8::/32'`. For use in production, only specify `HOST IP` elements (IP addresses and their masks), since using `host` and `host_regexp` might cause extra latency.
--   `HOST ANY` — User can connect from any location. This is a default option.
--   `HOST LOCAL` — User can connect only locally.
--   `HOST NAME 'fqdn'` — User host can be specified as FQDN. For example, `HOST NAME 'mysite.com'`.
--   `HOST REGEXP 'regexp'` — You can use [pcre](http://www.pcre.org/) regular expressions when specifying user hosts. For example, `HOST REGEXP '.*\.mysite\.com'`.
--   `HOST LIKE 'template'` — Allows you to use the [LIKE](../../../sql-reference/functions/string-search-functions.md#function-like) operator to filter the user hosts. For example, `HOST LIKE '%'` is equivalent to `HOST ANY`, `HOST LIKE '%.mysite.com'` filters all the hosts in the `mysite.com` domain.
+- `HOST IP 'ip_address_or_subnetwork'` — User can connect to ClickHouse server only from the specified IP address or a [subnetwork](https://en.wikipedia.org/wiki/Subnetwork). Examples: `HOST IP '192.168.0.0/16'`, `HOST IP '2001:DB8::/32'`. For use in production, only specify `HOST IP` elements (IP addresses and their masks), since using `host` and `host_regexp` might cause extra latency.
+- `HOST ANY` — User can connect from any location. This is a default option.
+- `HOST LOCAL` — User can connect only locally.
+- `HOST NAME 'fqdn'` — User host can be specified as FQDN. For example, `HOST NAME 'mysite.com'`.
+- `HOST REGEXP 'regexp'` — You can use [pcre](http://www.pcre.org/) regular expressions when specifying user hosts. For example, `HOST REGEXP '.*\.mysite\.com'`.
+- `HOST LIKE 'template'` — Allows you to use the [LIKE](../../../sql-reference/functions/string-search-functions.md#function-like) operator to filter the user hosts. For example, `HOST LIKE '%'` is equivalent to `HOST ANY`, `HOST LIKE '%.mysite.com'` filters all the hosts in the `mysite.com` domain.
 
 Another way of specifying host is to use `@` syntax following the username. Examples:
 
--   `CREATE USER mira@'127.0.0.1'` — Equivalent to the `HOST IP` syntax.
--   `CREATE USER mira@'localhost'` — Equivalent to the `HOST LOCAL` syntax.
--   `CREATE USER mira@'192.168.%.%'` — Equivalent to the `HOST LIKE` syntax.
+- `CREATE USER mira@'127.0.0.1'` — Equivalent to the `HOST IP` syntax.
+- `CREATE USER mira@'localhost'` — Equivalent to the `HOST LOCAL` syntax.
+- `CREATE USER mira@'192.168.%.%'` — Equivalent to the `HOST LIKE` syntax.
 
-:::warning
+:::tip
 ClickHouse treats `user_name@'address'` as a username as a whole. Thus, technically you can create multiple users with the same `user_name` and different constructions after `@`. However, we do not recommend to do so.
 :::
 
@@ -63,10 +139,10 @@ ClickHouse treats `user_name@'address'` as a username as a whole. Thus, technica
 
 Specifies users or roles which are allowed to receive [privileges](../../../sql-reference/statements/grant.md#grant-privileges) from this user on the condition this user has also all required access granted with [GRANT OPTION](../../../sql-reference/statements/grant.md#grant-privigele-syntax). Options of the `GRANTEES` clause:
 
--   `user` — Specifies a user this user can grant privileges to.
--   `role` — Specifies a role this user can grant privileges to.
--   `ANY` — This user can grant privileges to anyone. It's the default setting.
--   `NONE` — This user can grant privileges to none.
+- `user` — Specifies a user this user can grant privileges to.
+- `role` — Specifies a role this user can grant privileges to.
+- `ANY` — This user can grant privileges to anyone. It's the default setting.
+- `NONE` — This user can grant privileges to none.
 
 You can exclude any user or role by using the `EXCEPT` expression. For example, `CREATE USER user1 GRANTEES ANY EXCEPT user2`. It means if `user1` has some privileges granted with `GRANT OPTION` it will be able to grant those privileges to anyone except `user2`.
 
diff --git a/docs/en/sql-reference/statements/create/view.md b/docs/en/sql-reference/statements/create/view.md
index acdede3c673..10b15638152 100644
--- a/docs/en/sql-reference/statements/create/view.md
+++ b/docs/en/sql-reference/statements/create/view.md
@@ -70,6 +70,12 @@ A materialized view is implemented as follows: when inserting data to the table
 Materialized views in ClickHouse use **column names** instead of column order during insertion into destination table. If some column names are not present in the `SELECT` query result, ClickHouse uses a default value, even if the column is not [Nullable](../../data-types/nullable.md). A safe practice would be to add aliases for every column when using Materialized views.
 
 Materialized views in ClickHouse are implemented more like insert triggers. If there’s some aggregation in the view query, it’s applied only to the batch of freshly inserted data. Any changes to existing data of source table (like update, delete, drop partition, etc.) does not change the materialized view.
+
+Materialized views in ClickHouse do not have deterministic behaviour in case of errors. This means that blocks that had been already written will be preserved in the destination table, but all blocks after error will not.
+
+By default if pushing to one of views fails, then the INSERT query will fail too, and some blocks may not be written to the destination table. This can be changed using `materialized_views_ignore_errors` setting (you should set it for `INSERT` query), if you will set `materialized_views_ignore_errors=true`, then any errors while pushing to views will be ignored and all blocks will be written to the destination table.
+
+Also note, that `materialized_views_ignore_errors` set to `true` by default for `system.*_log` tables.
 :::
 
 If you specify `POPULATE`, the existing table data is inserted into the view when creating it, as if making a `CREATE TABLE ... AS SELECT ...` . Otherwise, the query contains only the data inserted in the table after creating the view. We **do not recommend** using `POPULATE`, since data inserted in the table during the view creation will not be inserted in it.
@@ -229,7 +235,7 @@ Most common uses of live view tables include:
 - Watching metrics from system tables using periodic refresh.
 
 **See Also**
--   [ALTER LIVE VIEW](../alter/view.md#alter-live-view)
+- [ALTER LIVE VIEW](../alter/view.md#alter-live-view)
 
 ## Window View [Experimental]
 
@@ -358,3 +364,4 @@ The window view is useful in the following scenarios:
 ## Related Content
 
 - Blog: [Working with time series data in ClickHouse](https://clickhouse.com/blog/working-with-time-series-data-and-functions-ClickHouse)
+- Blog: [Building an Observability Solution with ClickHouse - Part 2 - Traces](https://clickhouse.com/blog/storing-traces-and-spans-open-telemetry-in-clickhouse)
diff --git a/docs/en/sql-reference/statements/delete.md b/docs/en/sql-reference/statements/delete.md
index e1987e50af4..fa9f08e225f 100644
--- a/docs/en/sql-reference/statements/delete.md
+++ b/docs/en/sql-reference/statements/delete.md
@@ -8,7 +8,7 @@ title: DELETE Statement
 ---
 
 ``` sql
-DELETE FROM [db.]table [ON CLUSTER cluster] [WHERE expr]
+DELETE FROM [db.]table [ON CLUSTER cluster] WHERE expr
 ```
 
 `DELETE FROM` removes rows from the table `[db.]table` that match the expression `expr`. The deleted rows are marked as deleted immediately and will be automatically filtered out of all subsequent queries. Cleanup of data happens asynchronously in the background. This feature is only available for the MergeTree table engine family.
@@ -21,21 +21,6 @@ DELETE FROM hits WHERE Title LIKE '%hello%';
 
 Lightweight deletes are asynchronous by default. Set `mutations_sync` equal to 1 to wait for one replica to process the statement, and set `mutations_sync` to 2 to wait for all replicas.
 
-:::note
-This feature is experimental and requires you to set `allow_experimental_lightweight_delete` to true:
-
-```sql
-SET allow_experimental_lightweight_delete = true;
-```
-
-:::
-
-An [alternative way to delete rows](./alter/delete.md) in ClickHouse is `ALTER TABLE ... DELETE`, which might be more efficient if you do bulk deletes only occasionally and don't need the operation to be applied instantly. In most use cases the new lightweight `DELETE FROM` behavior will be considerably faster.
-
-:::warning
-Even though deletes are becoming more lightweight in ClickHouse, they should still not be used as aggressively as on an OLTP system. Lightweight deletes are currently efficient for wide parts, but for compact parts, they can be a heavyweight operation, and it may be better to use `ALTER TABLE` for some scenarios.
-:::
-
 :::note
 `DELETE FROM` requires the `ALTER DELETE` privilege:
 ```sql
@@ -51,7 +36,7 @@ The idea behind Lightweight Delete is that when a `DELETE FROM table ...` query
 The mask is implemented as a hidden `_row_exists` system column that stores True for all visible rows and False for deleted ones. This column is only present in a part if some rows in this part were deleted. In other words, the column is not persisted when it has all values equal to True.
 
 ## SELECT query
-When the column is present `SELECT ... FROM table WHERE condition` query internally is extended by an additional predicate on `_row_exists` and becomes similar to 
+When the column is present `SELECT ... FROM table WHERE condition` query internally is extended by an additional predicate on `_row_exists` and becomes similar to
 ```sql
     SELECT ... FROM table PREWHERE _row_exists WHERE condition
 ```
@@ -70,6 +55,7 @@ With the described implementation now we can see what can negatively affect 'DEL
 - Table having a very large number of data parts
 - Having a lot of data in Compact parts—in a Compact part, all columns are stored in one file.
 
-:::note
-This implementation might change in the future.
-:::
+
+## Related content
+
+- Blog: [Handling Updates and Deletes in ClickHouse](https://clickhouse.com/blog/handling-updates-and-deletes-in-clickhouse)
diff --git a/docs/en/sql-reference/statements/describe-table.md b/docs/en/sql-reference/statements/describe-table.md
index 4864743abbc..20f7061dedd 100644
--- a/docs/en/sql-reference/statements/describe-table.md
+++ b/docs/en/sql-reference/statements/describe-table.md
@@ -15,18 +15,18 @@ DESC|DESCRIBE TABLE [db.]table [INTO OUTFILE filename] [FORMAT format]
 
 The `DESCRIBE` statement returns a row for each table column with the following [String](../../sql-reference/data-types/string.md) values:
 
--   `name` — A column name.
--   `type` — A column type.
--   `default_type` — A clause that is used in the column [default expression](../../sql-reference/statements/create/table.md#create-default-values): `DEFAULT`, `MATERIALIZED` or `ALIAS`. If there is no default expression, then empty string is returned.
--   `default_expression` — An expression specified after the `DEFAULT` clause.
--   `comment` — A [column comment](../../sql-reference/statements/alter/column.md#alter_comment-column).
--   `codec_expression` — A [codec](../../sql-reference/statements/create/table.md#codecs) that is applied to the column.
--   `ttl_expression` — A [TTL](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl) expression.
--   `is_subcolumn` — A flag that equals `1` for internal subcolumns. It is included into the result only if subcolumn description is enabled by the [describe_include_subcolumns](../../operations/settings/settings.md#describe_include_subcolumns) setting.
+- `name` — A column name.
+- `type` — A column type.
+- `default_type` — A clause that is used in the column [default expression](../../sql-reference/statements/create/table.md#create-default-values): `DEFAULT`, `MATERIALIZED` or `ALIAS`. If there is no default expression, then empty string is returned.
+- `default_expression` — An expression specified after the `DEFAULT` clause.
+- `comment` — A [column comment](../../sql-reference/statements/alter/column.md#alter_comment-column).
+- `codec_expression` — A [codec](../../sql-reference/statements/create/table.md#codecs) that is applied to the column.
+- `ttl_expression` — A [TTL](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl) expression.
+- `is_subcolumn` — A flag that equals `1` for internal subcolumns. It is included into the result only if subcolumn description is enabled by the [describe_include_subcolumns](../../operations/settings/settings.md#describe_include_subcolumns) setting.
 
-All columns in [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) data structures are described separately. The name of each column is prefixed with a parent column name and a dot.
+All columns in [Nested](../../sql-reference/data-types/nested-data-structures/index.md) data structures are described separately. The name of each column is prefixed with a parent column name and a dot.
 
-To show internal subcolumns of other data types, use the [describe_include_subcolumns](../../operations/settings/settings.md#describe_include_subcolumns) setting. 
+To show internal subcolumns of other data types, use the [describe_include_subcolumns](../../operations/settings/settings.md#describe_include_subcolumns) setting.
 
 **Example**
 
@@ -66,4 +66,4 @@ The second query additionally shows subcolumns:
 
 **See Also**
 
--   [describe_include_subcolumns](../../operations/settings/settings.md#describe_include_subcolumns) setting.
+- [describe_include_subcolumns](../../operations/settings/settings.md#describe_include_subcolumns) setting.
diff --git a/docs/en/sql-reference/statements/detach.md b/docs/en/sql-reference/statements/detach.md
index aa87b1ef613..6f08168bbef 100644
--- a/docs/en/sql-reference/statements/detach.md
+++ b/docs/en/sql-reference/statements/detach.md
@@ -22,7 +22,7 @@ System log tables can be also attached back (e.g. `query_log`, `text_log`, etc).
 
 Note that you can not detach permanently the table which is already detached (temporary). But you can attach it back and then detach permanently again.
 
-Also you can not [DROP](../../sql-reference/statements/drop#drop-table) the detached table, or [CREATE TABLE](../../sql-reference/statements/create/table.md) with the same name as detached permanently, or replace it with the other table with [RENAME TABLE](../../sql-reference/statements/rename.md) query.
+Also you can not [DROP](../../sql-reference/statements/drop.md#drop-table) the detached table, or [CREATE TABLE](../../sql-reference/statements/create/table.md) with the same name as detached permanently, or replace it with the other table with [RENAME TABLE](../../sql-reference/statements/rename.md) query.
 
 The `SYNC` modifier executes the action without delay.
 
@@ -72,5 +72,5 @@ Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table defa
 
 **See Also**
 
--   [Materialized View](../../sql-reference/statements/create/view.md#materialized)
--   [Dictionaries](../../sql-reference/dictionaries/index.md)
+- [Materialized View](../../sql-reference/statements/create/view.md#materialized)
+- [Dictionaries](../../sql-reference/dictionaries/index.md)
diff --git a/docs/en/sql-reference/statements/drop.md b/docs/en/sql-reference/statements/drop.md
index 8a83a8fae1d..b6208c2fd52 100644
--- a/docs/en/sql-reference/statements/drop.md
+++ b/docs/en/sql-reference/statements/drop.md
@@ -22,6 +22,10 @@ DROP DATABASE [IF EXISTS] db [ON CLUSTER cluster] [SYNC]
 
 Deletes the table.
 
+:::tip
+Also see [UNDROP TABLE](/docs/en/sql-reference/statements/undrop.md)
+:::
+
 Syntax:
 
 ``` sql
diff --git a/docs/en/sql-reference/statements/exchange.md b/docs/en/sql-reference/statements/exchange.md
index 33f3e08d547..babb29ae977 100644
--- a/docs/en/sql-reference/statements/exchange.md
+++ b/docs/en/sql-reference/statements/exchange.md
@@ -41,4 +41,4 @@ EXCHANGE DICTIONARIES [db0.]dict_A AND [db1.]dict_B [ON CLUSTER cluster]
 
 **See Also**
 
--   [Dictionaries](../../sql-reference/dictionaries/index.md)
+- [Dictionaries](../../sql-reference/dictionaries/index.md)
diff --git a/docs/en/sql-reference/statements/explain.md b/docs/en/sql-reference/statements/explain.md
index 5081abf2fb8..1c93707402f 100644
--- a/docs/en/sql-reference/statements/explain.md
+++ b/docs/en/sql-reference/statements/explain.md
@@ -45,11 +45,11 @@ Union
 
 ## EXPLAIN Types
 
--  `AST` — Abstract syntax tree.
--  `SYNTAX` — Query text after AST-level optimizations.
--  `QUERY TREE` — Query tree after Query Tree level optimizations.
--  `PLAN` — Query execution plan.
--  `PIPELINE` — Query execution pipeline.
+- `AST` — Abstract syntax tree.
+- `SYNTAX` — Query text after AST-level optimizations.
+- `QUERY TREE` — Query tree after Query Tree level optimizations.
+- `PLAN` — Query execution plan.
+- `PIPELINE` — Query execution pipeline.
 
 ### EXPLAIN AST
 
@@ -115,9 +115,9 @@ CROSS JOIN system.numbers AS c
 
 Settings:
 
--   `run_passes` — Run all query tree passes before dumping the query tree. Defaul: `1`.
--   `dump_passes` — Dump information about used passes before dumping the query tree. Default: `0`.
--   `passes` — Specifies how many passes to run. If set to `-1`, runs all the passes. Default: `-1`.
+- `run_passes` — Run all query tree passes before dumping the query tree. Defaul: `1`.
+- `dump_passes` — Dump information about used passes before dumping the query tree. Default: `0`.
+- `passes` — Specifies how many passes to run. If set to `-1`, runs all the passes. Default: `-1`.
 
 Example:
 ```sql
@@ -143,11 +143,11 @@ Dump query plan steps.
 
 Settings:
 
--   `header` — Prints output header for step. Default: 0.
--   `description` — Prints step description. Default: 1.
--   `indexes` — Shows used indexes, the number of filtered parts and the number of filtered granules for every index applied. Default: 0. Supported for [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) tables.
--   `actions` — Prints detailed information about step actions. Default: 0.
--   `json` — Prints query plan steps as a row in [JSON](../../interfaces/formats.md#json) format. Default: 0. It is recommended to use [TSVRaw](../../interfaces/formats.md#tabseparatedraw) format to avoid unnecessary escaping.
+- `header` — Prints output header for step. Default: 0.
+- `description` — Prints step description. Default: 1.
+- `indexes` — Shows used indexes, the number of filtered parts and the number of filtered granules for every index applied. Default: 0. Supported for [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) tables.
+- `actions` — Prints detailed information about step actions. Default: 0.
+- `json` — Prints query plan steps as a row in [JSON](../../interfaces/formats.md#json) format. Default: 0. It is recommended to use [TSVRaw](../../interfaces/formats.md#tabseparatedraw) format to avoid unnecessary escaping.
 
 Example:
 
@@ -276,12 +276,12 @@ EXPLAIN json = 1, description = 0, header = 1 SELECT 1, 2 + dummy;
 
 With `indexes` = 1, the `Indexes` key is added. It contains an array of used indexes. Each index is described as JSON with `Type` key (a string `MinMax`, `Partition`, `PrimaryKey` or `Skip`) and optional keys:
 
--   `Name` — The index name (currently only used for `Skip` indexes).
--   `Keys` — The array of columns used by the index.
--   `Condition` —  The used condition.
--   `Description` — The index description (currently only used for `Skip` indexes).
--   `Parts` — The number of parts before/after the index is applied.
--   `Granules` — The number of granules before/after the index is applied.
+- `Name` — The index name (currently only used for `Skip` indexes).
+- `Keys` — The array of columns used by the index.
+- `Condition` —  The used condition.
+- `Description` — The index description (currently only used for `Skip` indexes).
+- `Parts` — The number of parts before/after the index is applied.
+- `Granules` — The number of granules before/after the index is applied.
 
 Example:
 
@@ -380,9 +380,9 @@ EXPLAIN json = 1, actions = 1, description = 0 SELECT 1 FORMAT TSVRaw;
 
 Settings:
 
--   `header` — Prints header for each output port. Default: 0.
--   `graph` — Prints a graph described in the [DOT](https://en.wikipedia.org/wiki/DOT_(graph_description_language)) graph description language. Default: 0.
--   `compact` — Prints graph in compact mode if `graph` setting is enabled. Default: 1.
+- `header` — Prints header for each output port. Default: 0.
+- `graph` — Prints a graph described in the [DOT](https://en.wikipedia.org/wiki/DOT_(graph_description_language)) graph description language. Default: 0.
+- `compact` — Prints graph in compact mode if `graph` setting is enabled. Default: 1.
 
 Example:
 
diff --git a/docs/en/sql-reference/statements/grant.md b/docs/en/sql-reference/statements/grant.md
index 3383ea70a2b..e6073f3523a 100644
--- a/docs/en/sql-reference/statements/grant.md
+++ b/docs/en/sql-reference/statements/grant.md
@@ -6,10 +6,10 @@ sidebar_label: GRANT
 
 # GRANT Statement
 
--   Grants [privileges](#grant-privileges) to ClickHouse user accounts or roles.
--   Assigns roles to user accounts or to the other roles.
+- Grants [privileges](#grant-privileges) to ClickHouse user accounts or roles.
+- Assigns roles to user accounts or to the other roles.
 
-To revoke privileges, use the [REVOKE](../../sql-reference/statements/revoke.md) statement. Also you can list granted privileges with the [SHOW GRANTS](../../sql-reference/statements/show.md#show-grants-statement) statement.
+To revoke privileges, use the [REVOKE](../../sql-reference/statements/revoke.md) statement. Also you can list granted privileges with the [SHOW GRANTS](../../sql-reference/statements/show.md#show-grants) statement.
 
 ## Granting Privilege Syntax
 
@@ -17,9 +17,9 @@ To revoke privileges, use the [REVOKE](../../sql-reference/statements/revoke.md)
 GRANT [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...] ON {db.table|db.*|*.*|table|*} TO {user | role | CURRENT_USER} [,...] [WITH GRANT OPTION] [WITH REPLACE OPTION]
 ```
 
--   `privilege` — Type of privilege.
--   `role` — ClickHouse user role.
--   `user` — ClickHouse user account.
+- `privilege` — Type of privilege.
+- `role` — ClickHouse user role.
+- `user` — ClickHouse user account.
 
 The `WITH GRANT OPTION` clause grants `user` or `role` with permission to execute the `GRANT` query. Users can grant privileges of the same scope they have and less.
 The `WITH REPLACE OPTION` clause replace old privileges by new privileges for the `user` or `role`, if is not specified it appends privileges.
@@ -30,12 +30,24 @@ The `WITH REPLACE OPTION` clause replace old privileges by new privileges for th
 GRANT [ON CLUSTER cluster_name] role [,...] TO {user | another_role | CURRENT_USER} [,...] [WITH ADMIN OPTION] [WITH REPLACE OPTION]
 ```
 
--   `role` — ClickHouse user role.
--   `user` — ClickHouse user account.
+- `role` — ClickHouse user role.
+- `user` — ClickHouse user account.
 
 The `WITH ADMIN OPTION` clause grants [ADMIN OPTION](#admin-option-privilege) privilege to `user` or `role`.
 The `WITH REPLACE OPTION` clause replace old roles by new role for the `user` or `role`, if is not specified it appends roles.
 
+## Grant Current Grants Syntax
+``` sql
+GRANT CURRENT GRANTS{(privilege[(column_name [,...])] [,...] ON {db.table|db.*|*.*|table|*}) | ON {db.table|db.*|*.*|table|*}} TO {user | role | CURRENT_USER} [,...] [WITH GRANT OPTION] [WITH REPLACE OPTION]
+```
+
+-   `privilege` — Type of privilege.
+-   `role` — ClickHouse user role.
+-   `user` — ClickHouse user account.
+
+Using the `CURRENT GRANTS` statement allows you to give all specified privileges to the given user or role.
+If none of the privileges were specified, then the given user or role will receive all available privileges for `CURRENT_USER`.
+
 ## Usage
 
 To use `GRANT`, your account must have the `GRANT OPTION` privilege. You can grant privileges only inside the scope of your account privileges.
@@ -48,9 +60,9 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
 
 It means that `john` has the permission to execute:
 
--   `SELECT x,y FROM db.table`.
--   `SELECT x FROM db.table`.
--   `SELECT y FROM db.table`.
+- `SELECT x,y FROM db.table`.
+- `SELECT x FROM db.table`.
+- `SELECT y FROM db.table`.
 
 `john` can’t execute `SELECT z FROM db.table`. The `SELECT * FROM db.table` also is not available. Processing this query, ClickHouse does not return any data, even `x` and `y`. The only exception is if a table contains only `x` and `y` columns. In this case ClickHouse returns all the data.
 
@@ -70,150 +82,152 @@ Privileges have a hierarchical structure. A set of permitted queries depends on
 
 Hierarchy of privileges:
 
--   [SELECT](#grant-select)
--   [INSERT](#grant-insert)
--   [ALTER](#grant-alter)
-    -   `ALTER TABLE`
-        -   `ALTER UPDATE`
-        -   `ALTER DELETE`
-        -   `ALTER COLUMN`
-            -   `ALTER ADD COLUMN`
-            -   `ALTER DROP COLUMN`
-            -   `ALTER MODIFY COLUMN`
-            -   `ALTER COMMENT COLUMN`
-            -   `ALTER CLEAR COLUMN`
-            -   `ALTER RENAME COLUMN`
-        -   `ALTER INDEX`
-            -   `ALTER ORDER BY`
-            -   `ALTER SAMPLE BY`
-            -   `ALTER ADD INDEX`
-            -   `ALTER DROP INDEX`
-            -   `ALTER MATERIALIZE INDEX`
-            -   `ALTER CLEAR INDEX`
-        -   `ALTER CONSTRAINT`
-            -   `ALTER ADD CONSTRAINT`
-            -   `ALTER DROP CONSTRAINT`
-        -   `ALTER TTL`
-            -   `ALTER MATERIALIZE TTL`
-        -   `ALTER SETTINGS`
-        -   `ALTER MOVE PARTITION`
-        -   `ALTER FETCH PARTITION`
-        -   `ALTER FREEZE PARTITION`
-    -   `ALTER VIEW`
-        -   `ALTER VIEW REFRESH`
-        -   `ALTER VIEW MODIFY QUERY`
--   [CREATE](#grant-create)
-    -   `CREATE DATABASE`
-    -   `CREATE TABLE`
-        -   `CREATE TEMPORARY TABLE`
-    -   `CREATE VIEW`
-    -   `CREATE DICTIONARY`
-    -   `CREATE FUNCTION`
--   [DROP](#grant-drop)
-    -   `DROP DATABASE`
-    -   `DROP TABLE`
-    -   `DROP VIEW`
-    -   `DROP DICTIONARY`
-    -   `DROP FUNCTION`
--   [TRUNCATE](#grant-truncate)
--   [OPTIMIZE](#grant-optimize)
--   [SHOW](#grant-show)
-    -   `SHOW DATABASES`
-    -   `SHOW TABLES`
-    -   `SHOW COLUMNS`
-    -   `SHOW DICTIONARIES`
--   [KILL QUERY](#grant-kill-query)
--   [ACCESS MANAGEMENT](#grant-access-management)
-    -   `CREATE USER`
-    -   `ALTER USER`
-    -   `DROP USER`
-    -   `CREATE ROLE`
-    -   `ALTER ROLE`
-    -   `DROP ROLE`
-    -   `CREATE ROW POLICY`
-    -   `ALTER ROW POLICY`
-    -   `DROP ROW POLICY`
-    -   `CREATE QUOTA`
-    -   `ALTER QUOTA`
-    -   `DROP QUOTA`
-    -   `CREATE SETTINGS PROFILE`
-    -   `ALTER SETTINGS PROFILE`
-    -   `DROP SETTINGS PROFILE`
-    -   `SHOW ACCESS`
-        -   `SHOW_USERS`
-        -   `SHOW_ROLES`
-        -   `SHOW_ROW_POLICIES`
-        -   `SHOW_QUOTAS`
-        -   `SHOW_SETTINGS_PROFILES`
-    -   `ROLE ADMIN`
--   [SYSTEM](#grant-system)
-    -   `SYSTEM SHUTDOWN`
-    -   `SYSTEM DROP CACHE`
-        -   `SYSTEM DROP DNS CACHE`
-        -   `SYSTEM DROP MARK CACHE`
-        -   `SYSTEM DROP UNCOMPRESSED CACHE`
-    -   `SYSTEM RELOAD`
-        -   `SYSTEM RELOAD CONFIG`
-        -   `SYSTEM RELOAD DICTIONARY`
-            -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`
-        -   `SYSTEM RELOAD FUNCTION`
-        -   `SYSTEM RELOAD FUNCTIONS`
-    -   `SYSTEM MERGES`
-    -   `SYSTEM TTL MERGES`
-    -   `SYSTEM FETCHES`
-    -   `SYSTEM MOVES`
-    -   `SYSTEM SENDS`
-        -   `SYSTEM DISTRIBUTED SENDS`
-        -   `SYSTEM REPLICATED SENDS`
-    -   `SYSTEM REPLICATION QUEUES`
-    -   `SYSTEM SYNC REPLICA`
-    -   `SYSTEM RESTART REPLICA`
-    -   `SYSTEM FLUSH`
-        -   `SYSTEM FLUSH DISTRIBUTED`
-        -   `SYSTEM FLUSH LOGS`
-    -   `CLUSTER` (see also `access_control_improvements.on_cluster_queries_require_cluster_grant` configuration directive)
--   [INTROSPECTION](#grant-introspection)
-    -   `addressToLine`
-    -   `addressToLineWithInlines`
-    -   `addressToSymbol`
-    -   `demangle`
--   [SOURCES](#grant-sources)
-    -   `FILE`
-    -   `URL`
-    -   `REMOTE`
-    -   `YSQL`
-    -   `ODBC`
-    -   `JDBC`
-    -   `HDFS`
-    -   `S3`
--   [dictGet](#grant-dictget)
+- [SELECT](#grant-select)
+- [INSERT](#grant-insert)
+- [ALTER](#grant-alter)
+    - `ALTER TABLE`
+        - `ALTER UPDATE`
+        - `ALTER DELETE`
+        - `ALTER COLUMN`
+            - `ALTER ADD COLUMN`
+            - `ALTER DROP COLUMN`
+            - `ALTER MODIFY COLUMN`
+            - `ALTER COMMENT COLUMN`
+            - `ALTER CLEAR COLUMN`
+            - `ALTER RENAME COLUMN`
+        - `ALTER INDEX`
+            - `ALTER ORDER BY`
+            - `ALTER SAMPLE BY`
+            - `ALTER ADD INDEX`
+            - `ALTER DROP INDEX`
+            - `ALTER MATERIALIZE INDEX`
+            - `ALTER CLEAR INDEX`
+        - `ALTER CONSTRAINT`
+            - `ALTER ADD CONSTRAINT`
+            - `ALTER DROP CONSTRAINT`
+        - `ALTER TTL`
+            - `ALTER MATERIALIZE TTL`
+        - `ALTER SETTINGS`
+        - `ALTER MOVE PARTITION`
+        - `ALTER FETCH PARTITION`
+        - `ALTER FREEZE PARTITION`
+    - `ALTER VIEW`
+        - `ALTER VIEW REFRESH`
+        - `ALTER VIEW MODIFY QUERY`
+- [CREATE](#grant-create)
+    - `CREATE DATABASE`
+    - `CREATE TABLE`
+        - `CREATE ARBITRARY TEMPORARY TABLE`
+            - `CREATE TEMPORARY TABLE`
+    - `CREATE VIEW`
+    - `CREATE DICTIONARY`
+    - `CREATE FUNCTION`
+- [DROP](#grant-drop)
+    - `DROP DATABASE`
+    - `DROP TABLE`
+    - `DROP VIEW`
+    - `DROP DICTIONARY`
+    - `DROP FUNCTION`
+- [TRUNCATE](#grant-truncate)
+- [OPTIMIZE](#grant-optimize)
+- [SHOW](#grant-show)
+    - `SHOW DATABASES`
+    - `SHOW TABLES`
+    - `SHOW COLUMNS`
+    - `SHOW DICTIONARIES`
+- [KILL QUERY](#grant-kill-query)
+- [ACCESS MANAGEMENT](#grant-access-management)
+    - `CREATE USER`
+    - `ALTER USER`
+    - `DROP USER`
+    - `CREATE ROLE`
+    - `ALTER ROLE`
+    - `DROP ROLE`
+    - `CREATE ROW POLICY`
+    - `ALTER ROW POLICY`
+    - `DROP ROW POLICY`
+    - `CREATE QUOTA`
+    - `ALTER QUOTA`
+    - `DROP QUOTA`
+    - `CREATE SETTINGS PROFILE`
+    - `ALTER SETTINGS PROFILE`
+    - `DROP SETTINGS PROFILE`
+    - `SHOW ACCESS`
+        - `SHOW_USERS`
+        - `SHOW_ROLES`
+        - `SHOW_ROW_POLICIES`
+        - `SHOW_QUOTAS`
+        - `SHOW_SETTINGS_PROFILES`
+    - `ROLE ADMIN`
+- [SYSTEM](#grant-system)
+    - `SYSTEM SHUTDOWN`
+    - `SYSTEM DROP CACHE`
+        - `SYSTEM DROP DNS CACHE`
+        - `SYSTEM DROP MARK CACHE`
+        - `SYSTEM DROP UNCOMPRESSED CACHE`
+    - `SYSTEM RELOAD`
+        - `SYSTEM RELOAD CONFIG`
+        - `SYSTEM RELOAD DICTIONARY`
+            - `SYSTEM RELOAD EMBEDDED DICTIONARIES`
+        - `SYSTEM RELOAD FUNCTION`
+        - `SYSTEM RELOAD FUNCTIONS`
+    - `SYSTEM MERGES`
+    - `SYSTEM TTL MERGES`
+    - `SYSTEM FETCHES`
+    - `SYSTEM MOVES`
+    - `SYSTEM SENDS`
+        - `SYSTEM DISTRIBUTED SENDS`
+        - `SYSTEM REPLICATED SENDS`
+    - `SYSTEM REPLICATION QUEUES`
+    - `SYSTEM SYNC REPLICA`
+    - `SYSTEM RESTART REPLICA`
+    - `SYSTEM FLUSH`
+        - `SYSTEM FLUSH DISTRIBUTED`
+        - `SYSTEM FLUSH LOGS`
+    - `CLUSTER` (see also `access_control_improvements.on_cluster_queries_require_cluster_grant` configuration directive)
+- [INTROSPECTION](#grant-introspection)
+    - `addressToLine`
+    - `addressToLineWithInlines`
+    - `addressToSymbol`
+    - `demangle`
+- [SOURCES](#grant-sources)
+    - `FILE`
+    - `URL`
+    - `REMOTE`
+    - `YSQL`
+    - `ODBC`
+    - `JDBC`
+    - `HDFS`
+    - `S3`
+- [dictGet](#grant-dictget)
+- [displaySecretsInShowAndSelect](#grant-display-secrets)
 
 Examples of how this hierarchy is treated:
 
--   The `ALTER` privilege includes all other `ALTER*` privileges.
--   `ALTER CONSTRAINT` includes `ALTER ADD CONSTRAINT` and `ALTER DROP CONSTRAINT` privileges.
+- The `ALTER` privilege includes all other `ALTER*` privileges.
+- `ALTER CONSTRAINT` includes `ALTER ADD CONSTRAINT` and `ALTER DROP CONSTRAINT` privileges.
 
 Privileges are applied at different levels. Knowing of a level suggests syntax available for privilege.
 
 Levels (from lower to higher):
 
--   `COLUMN` — Privilege can be granted for column, table, database, or globally.
--   `TABLE` — Privilege can be granted for table, database, or globally.
--   `VIEW` — Privilege can be granted for view, database, or globally.
--   `DICTIONARY` — Privilege can be granted for dictionary, database, or globally.
--   `DATABASE` — Privilege can be granted for database or globally.
--   `GLOBAL` — Privilege can be granted only globally.
--   `GROUP` — Groups privileges of different levels. When `GROUP`-level privilege is granted, only that privileges from the group are granted which correspond to the used syntax.
+- `COLUMN` — Privilege can be granted for column, table, database, or globally.
+- `TABLE` — Privilege can be granted for table, database, or globally.
+- `VIEW` — Privilege can be granted for view, database, or globally.
+- `DICTIONARY` — Privilege can be granted for dictionary, database, or globally.
+- `DATABASE` — Privilege can be granted for database or globally.
+- `GLOBAL` — Privilege can be granted only globally.
+- `GROUP` — Groups privileges of different levels. When `GROUP`-level privilege is granted, only that privileges from the group are granted which correspond to the used syntax.
 
 Examples of allowed syntax:
 
--   `GRANT SELECT(x) ON db.table TO user`
--   `GRANT SELECT ON db.* TO user`
+- `GRANT SELECT(x) ON db.table TO user`
+- `GRANT SELECT ON db.* TO user`
 
 Examples of disallowed syntax:
 
--   `GRANT CREATE USER(x) ON db.table TO user`
--   `GRANT CREATE USER ON db.* TO user`
+- `GRANT CREATE USER(x) ON db.table TO user`
+- `GRANT CREATE USER ON db.* TO user`
 
 The special privilege [ALL](#grant-all) grants all the privileges to a user account or a role.
 
@@ -263,73 +277,74 @@ The granted privilege allows `john` to insert data to the `x` and/or `y` columns
 
 Allows executing [ALTER](../../sql-reference/statements/alter/index.md) queries according to the following hierarchy of privileges:
 
--   `ALTER`. Level: `COLUMN`.
-    -   `ALTER TABLE`. Level: `GROUP`
-        -   `ALTER UPDATE`. Level: `COLUMN`. Aliases: `UPDATE`
-        -   `ALTER DELETE`. Level: `COLUMN`. Aliases: `DELETE`
-        -   `ALTER COLUMN`. Level: `GROUP`
-            -   `ALTER ADD COLUMN`. Level: `COLUMN`. Aliases: `ADD COLUMN`
-            -   `ALTER DROP COLUMN`. Level: `COLUMN`. Aliases: `DROP COLUMN`
-            -   `ALTER MODIFY COLUMN`. Level: `COLUMN`. Aliases: `MODIFY COLUMN`
-            -   `ALTER COMMENT COLUMN`. Level: `COLUMN`. Aliases: `COMMENT COLUMN`
-            -   `ALTER CLEAR COLUMN`. Level: `COLUMN`. Aliases: `CLEAR COLUMN`
-            -   `ALTER RENAME COLUMN`. Level: `COLUMN`. Aliases: `RENAME COLUMN`
-        -   `ALTER INDEX`. Level: `GROUP`. Aliases: `INDEX`
-            -   `ALTER ORDER BY`. Level: `TABLE`. Aliases: `ALTER MODIFY ORDER BY`, `MODIFY ORDER BY`
-            -   `ALTER SAMPLE BY`. Level: `TABLE`. Aliases: `ALTER MODIFY SAMPLE BY`, `MODIFY SAMPLE BY`
-            -   `ALTER ADD INDEX`. Level: `TABLE`. Aliases: `ADD INDEX`
-            -   `ALTER DROP INDEX`. Level: `TABLE`. Aliases: `DROP INDEX`
-            -   `ALTER MATERIALIZE INDEX`. Level: `TABLE`. Aliases: `MATERIALIZE INDEX`
-            -   `ALTER CLEAR INDEX`. Level: `TABLE`. Aliases: `CLEAR INDEX`
-        -   `ALTER CONSTRAINT`. Level: `GROUP`. Aliases: `CONSTRAINT`
-            -   `ALTER ADD CONSTRAINT`. Level: `TABLE`. Aliases: `ADD CONSTRAINT`
-            -   `ALTER DROP CONSTRAINT`. Level: `TABLE`. Aliases: `DROP CONSTRAINT`
-        -   `ALTER TTL`. Level: `TABLE`. Aliases: `ALTER MODIFY TTL`, `MODIFY TTL`
-            -   `ALTER MATERIALIZE TTL`. Level: `TABLE`. Aliases: `MATERIALIZE TTL`
-        -   `ALTER SETTINGS`. Level: `TABLE`. Aliases: `ALTER SETTING`, `ALTER MODIFY SETTING`, `MODIFY SETTING`
-        -   `ALTER MOVE PARTITION`. Level: `TABLE`. Aliases: `ALTER MOVE PART`, `MOVE PARTITION`, `MOVE PART`
-        -   `ALTER FETCH PARTITION`. Level: `TABLE`. Aliases: `ALTER FETCH PART`, `FETCH PARTITION`, `FETCH PART`
-        -   `ALTER FREEZE PARTITION`. Level: `TABLE`. Aliases: `FREEZE PARTITION`
-    -   `ALTER VIEW` Level: `GROUP`
-        -   `ALTER VIEW REFRESH`. Level: `VIEW`. Aliases: `ALTER LIVE VIEW REFRESH`, `REFRESH VIEW`
-        -   `ALTER VIEW MODIFY QUERY`. Level: `VIEW`. Aliases: `ALTER TABLE MODIFY QUERY`
+- `ALTER`. Level: `COLUMN`.
+    - `ALTER TABLE`. Level: `GROUP`
+        - `ALTER UPDATE`. Level: `COLUMN`. Aliases: `UPDATE`
+        - `ALTER DELETE`. Level: `COLUMN`. Aliases: `DELETE`
+        - `ALTER COLUMN`. Level: `GROUP`
+            - `ALTER ADD COLUMN`. Level: `COLUMN`. Aliases: `ADD COLUMN`
+            - `ALTER DROP COLUMN`. Level: `COLUMN`. Aliases: `DROP COLUMN`
+            - `ALTER MODIFY COLUMN`. Level: `COLUMN`. Aliases: `MODIFY COLUMN`
+            - `ALTER COMMENT COLUMN`. Level: `COLUMN`. Aliases: `COMMENT COLUMN`
+            - `ALTER CLEAR COLUMN`. Level: `COLUMN`. Aliases: `CLEAR COLUMN`
+            - `ALTER RENAME COLUMN`. Level: `COLUMN`. Aliases: `RENAME COLUMN`
+        - `ALTER INDEX`. Level: `GROUP`. Aliases: `INDEX`
+            - `ALTER ORDER BY`. Level: `TABLE`. Aliases: `ALTER MODIFY ORDER BY`, `MODIFY ORDER BY`
+            - `ALTER SAMPLE BY`. Level: `TABLE`. Aliases: `ALTER MODIFY SAMPLE BY`, `MODIFY SAMPLE BY`
+            - `ALTER ADD INDEX`. Level: `TABLE`. Aliases: `ADD INDEX`
+            - `ALTER DROP INDEX`. Level: `TABLE`. Aliases: `DROP INDEX`
+            - `ALTER MATERIALIZE INDEX`. Level: `TABLE`. Aliases: `MATERIALIZE INDEX`
+            - `ALTER CLEAR INDEX`. Level: `TABLE`. Aliases: `CLEAR INDEX`
+        - `ALTER CONSTRAINT`. Level: `GROUP`. Aliases: `CONSTRAINT`
+            - `ALTER ADD CONSTRAINT`. Level: `TABLE`. Aliases: `ADD CONSTRAINT`
+            - `ALTER DROP CONSTRAINT`. Level: `TABLE`. Aliases: `DROP CONSTRAINT`
+        - `ALTER TTL`. Level: `TABLE`. Aliases: `ALTER MODIFY TTL`, `MODIFY TTL`
+            - `ALTER MATERIALIZE TTL`. Level: `TABLE`. Aliases: `MATERIALIZE TTL`
+        - `ALTER SETTINGS`. Level: `TABLE`. Aliases: `ALTER SETTING`, `ALTER MODIFY SETTING`, `MODIFY SETTING`
+        - `ALTER MOVE PARTITION`. Level: `TABLE`. Aliases: `ALTER MOVE PART`, `MOVE PARTITION`, `MOVE PART`
+        - `ALTER FETCH PARTITION`. Level: `TABLE`. Aliases: `ALTER FETCH PART`, `FETCH PARTITION`, `FETCH PART`
+        - `ALTER FREEZE PARTITION`. Level: `TABLE`. Aliases: `FREEZE PARTITION`
+    - `ALTER VIEW` Level: `GROUP`
+        - `ALTER VIEW REFRESH`. Level: `VIEW`. Aliases: `ALTER LIVE VIEW REFRESH`, `REFRESH VIEW`
+        - `ALTER VIEW MODIFY QUERY`. Level: `VIEW`. Aliases: `ALTER TABLE MODIFY QUERY`
 
 Examples of how this hierarchy is treated:
 
--   The `ALTER` privilege includes all other `ALTER*` privileges.
--   `ALTER CONSTRAINT` includes `ALTER ADD CONSTRAINT` and `ALTER DROP CONSTRAINT` privileges.
+- The `ALTER` privilege includes all other `ALTER*` privileges.
+- `ALTER CONSTRAINT` includes `ALTER ADD CONSTRAINT` and `ALTER DROP CONSTRAINT` privileges.
 
 **Notes**
 
--   The `MODIFY SETTING` privilege allows modifying table engine settings. It does not affect settings or server configuration parameters.
--   The `ATTACH` operation needs the [CREATE](#grant-create) privilege.
--   The `DETACH` operation needs the [DROP](#grant-drop) privilege.
--   To stop mutation by the [KILL MUTATION](../../sql-reference/statements/kill.md#kill-mutation) query, you need to have a privilege to start this mutation. For example, if you want to stop the `ALTER UPDATE` query, you need the `ALTER UPDATE`, `ALTER TABLE`, or `ALTER` privilege.
+- The `MODIFY SETTING` privilege allows modifying table engine settings. It does not affect settings or server configuration parameters.
+- The `ATTACH` operation needs the [CREATE](#grant-create) privilege.
+- The `DETACH` operation needs the [DROP](#grant-drop) privilege.
+- To stop mutation by the [KILL MUTATION](../../sql-reference/statements/kill.md#kill-mutation) query, you need to have a privilege to start this mutation. For example, if you want to stop the `ALTER UPDATE` query, you need the `ALTER UPDATE`, `ALTER TABLE`, or `ALTER` privilege.
 
 ### CREATE
 
 Allows executing [CREATE](../../sql-reference/statements/create/index.md) and [ATTACH](../../sql-reference/statements/attach.md) DDL-queries according to the following hierarchy of privileges:
 
--   `CREATE`. Level: `GROUP`
-    -   `CREATE DATABASE`. Level: `DATABASE`
-    -   `CREATE TABLE`. Level: `TABLE`
-        -   `CREATE TEMPORARY TABLE`. Level: `GLOBAL`
-    -   `CREATE VIEW`. Level: `VIEW`
-    -   `CREATE DICTIONARY`. Level: `DICTIONARY`
+- `CREATE`. Level: `GROUP`
+    - `CREATE DATABASE`. Level: `DATABASE`
+    - `CREATE TABLE`. Level: `TABLE`
+        - `CREATE ARBITRARY TEMPORARY TABLE`. Level: `GLOBAL`
+            - `CREATE TEMPORARY TABLE`. Level: `GLOBAL`
+    - `CREATE VIEW`. Level: `VIEW`
+    - `CREATE DICTIONARY`. Level: `DICTIONARY`
 
 **Notes**
 
--   To delete the created table, a user needs [DROP](#grant-drop).
+- To delete the created table, a user needs [DROP](#grant-drop).
 
 ### DROP
 
 Allows executing [DROP](../../sql-reference/statements/drop.md) and [DETACH](../../sql-reference/statements/detach.md) queries according to the following hierarchy of privileges:
 
--   `DROP`. Level: `GROUP`
-    -   `DROP DATABASE`. Level: `DATABASE`
-    -   `DROP TABLE`. Level: `TABLE`
-    -   `DROP VIEW`. Level: `VIEW`
-    -   `DROP DICTIONARY`. Level: `DICTIONARY`
+- `DROP`. Level: `GROUP`
+    - `DROP DATABASE`. Level: `DATABASE`
+    - `DROP TABLE`. Level: `TABLE`
+    - `DROP VIEW`. Level: `VIEW`
+    - `DROP DICTIONARY`. Level: `DICTIONARY`
 
 ### TRUNCATE
 
@@ -347,11 +362,11 @@ Privilege level: `TABLE`.
 
 Allows executing `SHOW`, `DESCRIBE`, `USE`, and `EXISTS` queries according to the following hierarchy of privileges:
 
--   `SHOW`. Level: `GROUP`
-    -   `SHOW DATABASES`. Level: `DATABASE`. Allows to execute `SHOW DATABASES`, `SHOW CREATE DATABASE`, `USE <database>` queries.
-    -   `SHOW TABLES`. Level: `TABLE`. Allows to execute `SHOW TABLES`, `EXISTS <table>`, `CHECK <table>` queries.
-    -   `SHOW COLUMNS`. Level: `COLUMN`. Allows to execute `SHOW CREATE TABLE`, `DESCRIBE` queries.
-    -   `SHOW DICTIONARIES`. Level: `DICTIONARY`. Allows to execute `SHOW DICTIONARIES`, `SHOW CREATE DICTIONARY`, `EXISTS <dictionary>` queries.
+- `SHOW`. Level: `GROUP`
+    - `SHOW DATABASES`. Level: `DATABASE`. Allows to execute `SHOW DATABASES`, `SHOW CREATE DATABASE`, `USE <database>` queries.
+    - `SHOW TABLES`. Level: `TABLE`. Allows to execute `SHOW TABLES`, `EXISTS <table>`, `CHECK <table>` queries.
+    - `SHOW COLUMNS`. Level: `COLUMN`. Allows to execute `SHOW CREATE TABLE`, `DESCRIBE` queries.
+    - `SHOW DICTIONARIES`. Level: `DICTIONARY`. Allows to execute `SHOW DICTIONARIES`, `SHOW CREATE DICTIONARY`, `EXISTS <dictionary>` queries.
 
 **Notes**
 
@@ -371,29 +386,29 @@ Privilege level: `GLOBAL`.
 
 Allows a user to execute queries that manage users, roles and row policies.
 
--   `ACCESS MANAGEMENT`. Level: `GROUP`
-    -   `CREATE USER`. Level: `GLOBAL`
-    -   `ALTER USER`. Level: `GLOBAL`
-    -   `DROP USER`. Level: `GLOBAL`
-    -   `CREATE ROLE`. Level: `GLOBAL`
-    -   `ALTER ROLE`. Level: `GLOBAL`
-    -   `DROP ROLE`. Level: `GLOBAL`
-    -   `ROLE ADMIN`. Level: `GLOBAL`
-    -   `CREATE ROW POLICY`. Level: `GLOBAL`. Aliases: `CREATE POLICY`
-    -   `ALTER ROW POLICY`. Level: `GLOBAL`. Aliases: `ALTER POLICY`
-    -   `DROP ROW POLICY`. Level: `GLOBAL`. Aliases: `DROP POLICY`
-    -   `CREATE QUOTA`. Level: `GLOBAL`
-    -   `ALTER QUOTA`. Level: `GLOBAL`
-    -   `DROP QUOTA`. Level: `GLOBAL`
-    -   `CREATE SETTINGS PROFILE`. Level: `GLOBAL`. Aliases: `CREATE PROFILE`
-    -   `ALTER SETTINGS PROFILE`. Level: `GLOBAL`. Aliases: `ALTER PROFILE`
-    -   `DROP SETTINGS PROFILE`. Level: `GLOBAL`. Aliases: `DROP PROFILE`
-    -   `SHOW ACCESS`. Level: `GROUP`
-        -   `SHOW_USERS`. Level: `GLOBAL`. Aliases: `SHOW CREATE USER`
-        -   `SHOW_ROLES`. Level: `GLOBAL`. Aliases: `SHOW CREATE ROLE`
-        -   `SHOW_ROW_POLICIES`. Level: `GLOBAL`. Aliases: `SHOW POLICIES`, `SHOW CREATE ROW POLICY`, `SHOW CREATE POLICY`
-        -   `SHOW_QUOTAS`. Level: `GLOBAL`. Aliases: `SHOW CREATE QUOTA`
-        -   `SHOW_SETTINGS_PROFILES`. Level: `GLOBAL`. Aliases: `SHOW PROFILES`, `SHOW CREATE SETTINGS PROFILE`, `SHOW CREATE PROFILE`
+- `ACCESS MANAGEMENT`. Level: `GROUP`
+    - `CREATE USER`. Level: `GLOBAL`
+    - `ALTER USER`. Level: `GLOBAL`
+    - `DROP USER`. Level: `GLOBAL`
+    - `CREATE ROLE`. Level: `GLOBAL`
+    - `ALTER ROLE`. Level: `GLOBAL`
+    - `DROP ROLE`. Level: `GLOBAL`
+    - `ROLE ADMIN`. Level: `GLOBAL`
+    - `CREATE ROW POLICY`. Level: `GLOBAL`. Aliases: `CREATE POLICY`
+    - `ALTER ROW POLICY`. Level: `GLOBAL`. Aliases: `ALTER POLICY`
+    - `DROP ROW POLICY`. Level: `GLOBAL`. Aliases: `DROP POLICY`
+    - `CREATE QUOTA`. Level: `GLOBAL`
+    - `ALTER QUOTA`. Level: `GLOBAL`
+    - `DROP QUOTA`. Level: `GLOBAL`
+    - `CREATE SETTINGS PROFILE`. Level: `GLOBAL`. Aliases: `CREATE PROFILE`
+    - `ALTER SETTINGS PROFILE`. Level: `GLOBAL`. Aliases: `ALTER PROFILE`
+    - `DROP SETTINGS PROFILE`. Level: `GLOBAL`. Aliases: `DROP PROFILE`
+    - `SHOW ACCESS`. Level: `GROUP`
+        - `SHOW_USERS`. Level: `GLOBAL`. Aliases: `SHOW CREATE USER`
+        - `SHOW_ROLES`. Level: `GLOBAL`. Aliases: `SHOW CREATE ROLE`
+        - `SHOW_ROW_POLICIES`. Level: `GLOBAL`. Aliases: `SHOW POLICIES`, `SHOW CREATE ROW POLICY`, `SHOW CREATE POLICY`
+        - `SHOW_QUOTAS`. Level: `GLOBAL`. Aliases: `SHOW CREATE QUOTA`
+        - `SHOW_SETTINGS_PROFILES`. Level: `GLOBAL`. Aliases: `SHOW PROFILES`, `SHOW CREATE SETTINGS PROFILE`, `SHOW CREATE PROFILE`
 
 The `ROLE ADMIN` privilege allows a user to assign and revoke any roles including those which are not assigned to the user with the admin option.
 
@@ -401,29 +416,29 @@ The `ROLE ADMIN` privilege allows a user to assign and revoke any roles includin
 
 Allows a user to execute [SYSTEM](../../sql-reference/statements/system.md) queries according to the following hierarchy of privileges.
 
--   `SYSTEM`. Level: `GROUP`
-    -   `SYSTEM SHUTDOWN`. Level: `GLOBAL`. Aliases: `SYSTEM KILL`, `SHUTDOWN`
-    -   `SYSTEM DROP CACHE`. Aliases: `DROP CACHE`
-        -   `SYSTEM DROP DNS CACHE`. Level: `GLOBAL`. Aliases: `SYSTEM DROP DNS`, `DROP DNS CACHE`, `DROP DNS`
-        -   `SYSTEM DROP MARK CACHE`. Level: `GLOBAL`. Aliases: `SYSTEM DROP MARK`, `DROP MARK CACHE`, `DROP MARKS`
-        -   `SYSTEM DROP UNCOMPRESSED CACHE`. Level: `GLOBAL`. Aliases: `SYSTEM DROP UNCOMPRESSED`, `DROP UNCOMPRESSED CACHE`, `DROP UNCOMPRESSED`
-    -   `SYSTEM RELOAD`. Level: `GROUP`
-        -   `SYSTEM RELOAD CONFIG`. Level: `GLOBAL`. Aliases: `RELOAD CONFIG`
-        -   `SYSTEM RELOAD DICTIONARY`. Level: `GLOBAL`. Aliases: `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARY`, `RELOAD DICTIONARIES`
-            -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Level: `GLOBAL`. Aliases: `RELOAD EMBEDDED DICTIONARIES`
-    -   `SYSTEM MERGES`. Level: `TABLE`. Aliases: `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, `START MERGES`
-    -   `SYSTEM TTL MERGES`. Level: `TABLE`. Aliases: `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, `START TTL MERGES`
-    -   `SYSTEM FETCHES`. Level: `TABLE`. Aliases: `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, `START FETCHES`
-    -   `SYSTEM MOVES`. Level: `TABLE`. Aliases: `SYSTEM STOP MOVES`, `SYSTEM START MOVES`, `STOP MOVES`, `START MOVES`
-    -   `SYSTEM SENDS`. Level: `GROUP`. Aliases: `SYSTEM STOP SENDS`, `SYSTEM START SENDS`, `STOP SENDS`, `START SENDS`
-        -   `SYSTEM DISTRIBUTED SENDS`. Level: `TABLE`. Aliases: `SYSTEM STOP DISTRIBUTED SENDS`, `SYSTEM START DISTRIBUTED SENDS`, `STOP DISTRIBUTED SENDS`, `START DISTRIBUTED SENDS`
-        -   `SYSTEM REPLICATED SENDS`. Level: `TABLE`. Aliases: `SYSTEM STOP REPLICATED SENDS`, `SYSTEM START REPLICATED SENDS`, `STOP REPLICATED SENDS`, `START REPLICATED SENDS`
-    -   `SYSTEM REPLICATION QUEUES`. Level: `TABLE`. Aliases: `SYSTEM STOP REPLICATION QUEUES`, `SYSTEM START REPLICATION QUEUES`, `STOP REPLICATION QUEUES`, `START REPLICATION QUEUES`
-    -   `SYSTEM SYNC REPLICA`. Level: `TABLE`. Aliases: `SYNC REPLICA`
-    -   `SYSTEM RESTART REPLICA`. Level: `TABLE`. Aliases: `RESTART REPLICA`
-    -   `SYSTEM FLUSH`. Level: `GROUP`
-        -   `SYSTEM FLUSH DISTRIBUTED`. Level: `TABLE`. Aliases: `FLUSH DISTRIBUTED`
-        -   `SYSTEM FLUSH LOGS`. Level: `GLOBAL`. Aliases: `FLUSH LOGS`
+- `SYSTEM`. Level: `GROUP`
+    - `SYSTEM SHUTDOWN`. Level: `GLOBAL`. Aliases: `SYSTEM KILL`, `SHUTDOWN`
+    - `SYSTEM DROP CACHE`. Aliases: `DROP CACHE`
+        - `SYSTEM DROP DNS CACHE`. Level: `GLOBAL`. Aliases: `SYSTEM DROP DNS`, `DROP DNS CACHE`, `DROP DNS`
+        - `SYSTEM DROP MARK CACHE`. Level: `GLOBAL`. Aliases: `SYSTEM DROP MARK`, `DROP MARK CACHE`, `DROP MARKS`
+        - `SYSTEM DROP UNCOMPRESSED CACHE`. Level: `GLOBAL`. Aliases: `SYSTEM DROP UNCOMPRESSED`, `DROP UNCOMPRESSED CACHE`, `DROP UNCOMPRESSED`
+    - `SYSTEM RELOAD`. Level: `GROUP`
+        - `SYSTEM RELOAD CONFIG`. Level: `GLOBAL`. Aliases: `RELOAD CONFIG`
+        - `SYSTEM RELOAD DICTIONARY`. Level: `GLOBAL`. Aliases: `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARY`, `RELOAD DICTIONARIES`
+            - `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Level: `GLOBAL`. Aliases: `RELOAD EMBEDDED DICTIONARIES`
+    - `SYSTEM MERGES`. Level: `TABLE`. Aliases: `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, `START MERGES`
+    - `SYSTEM TTL MERGES`. Level: `TABLE`. Aliases: `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, `START TTL MERGES`
+    - `SYSTEM FETCHES`. Level: `TABLE`. Aliases: `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, `START FETCHES`
+    - `SYSTEM MOVES`. Level: `TABLE`. Aliases: `SYSTEM STOP MOVES`, `SYSTEM START MOVES`, `STOP MOVES`, `START MOVES`
+    - `SYSTEM SENDS`. Level: `GROUP`. Aliases: `SYSTEM STOP SENDS`, `SYSTEM START SENDS`, `STOP SENDS`, `START SENDS`
+        - `SYSTEM DISTRIBUTED SENDS`. Level: `TABLE`. Aliases: `SYSTEM STOP DISTRIBUTED SENDS`, `SYSTEM START DISTRIBUTED SENDS`, `STOP DISTRIBUTED SENDS`, `START DISTRIBUTED SENDS`
+        - `SYSTEM REPLICATED SENDS`. Level: `TABLE`. Aliases: `SYSTEM STOP REPLICATED SENDS`, `SYSTEM START REPLICATED SENDS`, `STOP REPLICATED SENDS`, `START REPLICATED SENDS`
+    - `SYSTEM REPLICATION QUEUES`. Level: `TABLE`. Aliases: `SYSTEM STOP REPLICATION QUEUES`, `SYSTEM START REPLICATION QUEUES`, `STOP REPLICATION QUEUES`, `START REPLICATION QUEUES`
+    - `SYSTEM SYNC REPLICA`. Level: `TABLE`. Aliases: `SYNC REPLICA`
+    - `SYSTEM RESTART REPLICA`. Level: `TABLE`. Aliases: `RESTART REPLICA`
+    - `SYSTEM FLUSH`. Level: `GROUP`
+        - `SYSTEM FLUSH DISTRIBUTED`. Level: `TABLE`. Aliases: `FLUSH DISTRIBUTED`
+        - `SYSTEM FLUSH LOGS`. Level: `GLOBAL`. Aliases: `FLUSH LOGS`
 
 The `SYSTEM RELOAD EMBEDDED DICTIONARIES` privilege implicitly granted by the `SYSTEM RELOAD DICTIONARY ON *.*` privilege.
 
@@ -431,36 +446,36 @@ The `SYSTEM RELOAD EMBEDDED DICTIONARIES` privilege implicitly granted by the `S
 
 Allows using [introspection](../../operations/optimizing-performance/sampling-query-profiler.md) functions.
 
--   `INTROSPECTION`. Level: `GROUP`. Aliases: `INTROSPECTION FUNCTIONS`
-    -   `addressToLine`. Level: `GLOBAL`
-    -   `addressToLineWithInlines`. Level: `GLOBAL`
-    -   `addressToSymbol`. Level: `GLOBAL`
-    -   `demangle`. Level: `GLOBAL`
+- `INTROSPECTION`. Level: `GROUP`. Aliases: `INTROSPECTION FUNCTIONS`
+    - `addressToLine`. Level: `GLOBAL`
+    - `addressToLineWithInlines`. Level: `GLOBAL`
+    - `addressToSymbol`. Level: `GLOBAL`
+    - `demangle`. Level: `GLOBAL`
 
 ### SOURCES
 
 Allows using external data sources. Applies to [table engines](../../engines/table-engines/index.md) and [table functions](../../sql-reference/table-functions/index.md#table-functions).
 
--   `SOURCES`. Level: `GROUP`
-    -   `FILE`. Level: `GLOBAL`
-    -   `URL`. Level: `GLOBAL`
-    -   `REMOTE`. Level: `GLOBAL`
-    -   `YSQL`. Level: `GLOBAL`
-    -   `ODBC`. Level: `GLOBAL`
-    -   `JDBC`. Level: `GLOBAL`
-    -   `HDFS`. Level: `GLOBAL`
-    -   `S3`. Level: `GLOBAL`
+- `SOURCES`. Level: `GROUP`
+    - `FILE`. Level: `GLOBAL`
+    - `URL`. Level: `GLOBAL`
+    - `REMOTE`. Level: `GLOBAL`
+    - `YSQL`. Level: `GLOBAL`
+    - `ODBC`. Level: `GLOBAL`
+    - `JDBC`. Level: `GLOBAL`
+    - `HDFS`. Level: `GLOBAL`
+    - `S3`. Level: `GLOBAL`
 
 The `SOURCES` privilege enables use of all the sources. Also you can grant a privilege for each source individually. To use sources, you need additional privileges.
 
 Examples:
 
--   To create a table with the [MySQL table engine](../../engines/table-engines/integrations/mysql.md), you need `CREATE TABLE (ON db.table_name)` and `MYSQL` privileges.
--   To use the [mysql table function](../../sql-reference/table-functions/mysql.md), you need `CREATE TEMPORARY TABLE` and `MYSQL` privileges.
+- To create a table with the [MySQL table engine](../../engines/table-engines/integrations/mysql.md), you need `CREATE TABLE (ON db.table_name)` and `MYSQL` privileges.
+- To use the [mysql table function](../../sql-reference/table-functions/mysql.md), you need `CREATE TEMPORARY TABLE` and `MYSQL` privileges.
 
 ### dictGet
 
--   `dictGet`. Aliases: `dictHas`, `dictGetHierarchy`, `dictIsIn`
+- `dictGet`. Aliases: `dictHas`, `dictGetHierarchy`, `dictIsIn`
 
 Allows a user to execute [dictGet](../../sql-reference/functions/ext-dict-functions.md#dictget), [dictHas](../../sql-reference/functions/ext-dict-functions.md#dicthas), [dictGetHierarchy](../../sql-reference/functions/ext-dict-functions.md#dictgethierarchy), [dictIsIn](../../sql-reference/functions/ext-dict-functions.md#dictisin) functions.
 
@@ -468,8 +483,17 @@ Privilege level: `DICTIONARY`.
 
 **Examples**
 
--   `GRANT dictGet ON mydb.mydictionary TO john`
--   `GRANT dictGet ON mydictionary TO john`
+- `GRANT dictGet ON mydb.mydictionary TO john`
+- `GRANT dictGet ON mydictionary TO john`
+
+
+### displaySecretsInShowAndSelect {#grant-display-secrets}
+
+Allows a user to view secrets in `SHOW` and `SELECT` queries if both
+[`display_secrets_in_show_and_select` server setting](../../operations/server-configuration-parameters/settings#display_secrets_in_show_and_select)
+and
+[`format_display_secrets_in_show_and_select` format setting](../../operations/settings/formats#format_display_secrets_in_show_and_select)
+are turned on.
 
 ### ALL
 
diff --git a/docs/en/sql-reference/statements/index.md b/docs/en/sql-reference/statements/index.md
index b286d8c932d..5aa61cf8d21 100644
--- a/docs/en/sql-reference/statements/index.md
+++ b/docs/en/sql-reference/statements/index.md
@@ -1,32 +1,32 @@
 ---
 slug: /en/sql-reference/statements/
 sidebar_position: 1
-sidebar_label: Statements
+sidebar_label: List of statements
 ---
 
-# ClickHouse SQL Statements 
+# ClickHouse SQL Statements
 
 Statements represent various kinds of action you can perform using SQL queries. Each kind of statement has it’s own syntax and usage details that are described separately:
 
--   [SELECT](/docs/en/sql-reference/statements/select/index.md)
--   [INSERT INTO](/docs/en/sql-reference/statements/insert-into.md)
--   [CREATE](/docs/en/sql-reference/statements/create/index.md)
--   [ALTER](/docs/en/sql-reference/statements/alter/index.md)
--   [SYSTEM](/docs/en/sql-reference/statements/system.md)
--   [SHOW](/docs/en/sql-reference/statements/show.md)
--   [GRANT](/docs/en/sql-reference/statements/grant.md)
--   [REVOKE](/docs/en/sql-reference/statements/revoke.md)
--   [ATTACH](/docs/en/sql-reference/statements/attach.md)
--   [CHECK TABLE](/docs/en/sql-reference/statements/check-table.md)
--   [DESCRIBE TABLE](/docs/en/sql-reference/statements/describe-table.md)
--   [DETACH](/docs/en/sql-reference/statements/detach.md)
--   [DROP](/docs/en/sql-reference/statements/drop.md)
--   [EXISTS](/docs/en/sql-reference/statements/exists.md)
--   [KILL](/docs/en/sql-reference/statements/kill.md)
--   [OPTIMIZE](/docs/en/sql-reference/statements/optimize.md)
--   [RENAME](/docs/en/sql-reference/statements/rename.md)
--   [SET](/docs/en/sql-reference/statements/set.md)
--   [SET ROLE](/docs/en/sql-reference/statements/set-role.md)
--   [TRUNCATE](/docs/en/sql-reference/statements/truncate.md)
--   [USE](/docs/en/sql-reference/statements/use.md)
--   [EXPLAIN](/docs/en/sql-reference/statements/explain.md)
+- [SELECT](/docs/en/sql-reference/statements/select/index.md)
+- [INSERT INTO](/docs/en/sql-reference/statements/insert-into.md)
+- [CREATE](/docs/en/sql-reference/statements/create/index.md)
+- [ALTER](/docs/en/sql-reference/statements/alter/index.md)
+- [SYSTEM](/docs/en/sql-reference/statements/system.md)
+- [SHOW](/docs/en/sql-reference/statements/show.md)
+- [GRANT](/docs/en/sql-reference/statements/grant.md)
+- [REVOKE](/docs/en/sql-reference/statements/revoke.md)
+- [ATTACH](/docs/en/sql-reference/statements/attach.md)
+- [CHECK TABLE](/docs/en/sql-reference/statements/check-table.md)
+- [DESCRIBE TABLE](/docs/en/sql-reference/statements/describe-table.md)
+- [DETACH](/docs/en/sql-reference/statements/detach.md)
+- [DROP](/docs/en/sql-reference/statements/drop.md)
+- [EXISTS](/docs/en/sql-reference/statements/exists.md)
+- [KILL](/docs/en/sql-reference/statements/kill.md)
+- [OPTIMIZE](/docs/en/sql-reference/statements/optimize.md)
+- [RENAME](/docs/en/sql-reference/statements/rename.md)
+- [SET](/docs/en/sql-reference/statements/set.md)
+- [SET ROLE](/docs/en/sql-reference/statements/set-role.md)
+- [TRUNCATE](/docs/en/sql-reference/statements/truncate.md)
+- [USE](/docs/en/sql-reference/statements/use.md)
+- [EXPLAIN](/docs/en/sql-reference/statements/explain.md)
diff --git a/docs/en/sql-reference/statements/insert-into.md b/docs/en/sql-reference/statements/insert-into.md
index 03a4ab3453c..d6e30827f9b 100644
--- a/docs/en/sql-reference/statements/insert-into.md
+++ b/docs/en/sql-reference/statements/insert-into.md
@@ -4,7 +4,7 @@ sidebar_position: 33
 sidebar_label: INSERT INTO
 ---
 
-# INSERT INTO Statement 
+# INSERT INTO Statement
 
 Inserts data into a table.
 
@@ -64,8 +64,8 @@ INSERT INTO insert_select_testtable VALUES (1, DEFAULT, 1) ;
 
 If a list of columns does not include all existing columns, the rest of the columns are filled with:
 
--   The values calculated from the `DEFAULT` expressions specified in the table definition.
--   Zeros and empty strings, if `DEFAULT` expressions are not defined.
+- The values calculated from the `DEFAULT` expressions specified in the table definition.
+- Zeros and empty strings, if `DEFAULT` expressions are not defined.
 
 Data can be passed to the INSERT in any [format](../../interfaces/formats.md#formats) supported by ClickHouse. The format must be specified explicitly in the query:
 
@@ -89,7 +89,14 @@ INSERT INTO t FORMAT TabSeparated
 22  Qwerty
 ```
 
-You can insert data separately from the query by using the command-line client or the HTTP interface. For more information, see the section “[Interfaces](../../interfaces)”.
+You can insert data separately from the query by using the [command-line client](/docs/en/integrations/sql-clients/clickhouse-client-local) or the [HTTP interface](/docs/en/interfaces/http/).
+
+:::note
+If you want to specify `SETTINGS` for `INSERT` query then you have to do it _before_ `FORMAT` clause since everything after `FORMAT format_name` is treated as data. For example:
+```sql
+INSERT INTO table SETTINGS ... FORMAT format_name data_set
+```
+:::
 
 ## Constraints
 
@@ -122,7 +129,7 @@ To insert a default value instead of `NULL` into a column with not nullable data
 INSERT INTO [db.]table [(c1, c2, c3)] FROM INFILE file_name [COMPRESSION type] FORMAT format_name
 ```
 
-Use the syntax above to insert data from a file, or files, stored on the **client** side. `file_name` and `type` are string literals. Input file [format](../../interfaces/formats.md) must be set in the `FORMAT` clause. 
+Use the syntax above to insert data from a file, or files, stored on the **client** side. `file_name` and `type` are string literals. Input file [format](../../interfaces/formats.md) must be set in the `FORMAT` clause.
 
 Compressed files are supported. The compression type is detected by the extension of the file name. Or it can be explicitly specified in a `COMPRESSION` clause. Supported types are: `'none'`, `'gzip'`, `'deflate'`, `'br'`, `'xz'`, `'zstd'`, `'lz4'`, `'bz2'`.
 
@@ -184,7 +191,7 @@ INSERT INTO [TABLE] FUNCTION table_func ...
 
 ``` sql
 CREATE TABLE simple_table (id UInt32, text String) ENGINE=MergeTree() ORDER BY id;
-INSERT INTO TABLE FUNCTION remote('localhost', default.simple_table) 
+INSERT INTO TABLE FUNCTION remote('localhost', default.simple_table)
     VALUES (100, 'inserted via remote()');
 SELECT * FROM simple_table;
 ```
@@ -201,22 +208,22 @@ Result:
 
 `INSERT` sorts the input data by primary key and splits them into partitions by a partition key. If you insert data into several partitions at once, it can significantly reduce the performance of the `INSERT` query. To avoid this:
 
--   Add data in fairly large batches, such as 100,000 rows at a time.
--   Group data by a partition key before uploading it to ClickHouse.
+- Add data in fairly large batches, such as 100,000 rows at a time.
+- Group data by a partition key before uploading it to ClickHouse.
 
 Performance will not decrease if:
 
--   Data is added in real time.
--   You upload data that is usually sorted by time.
+- Data is added in real time.
+- You upload data that is usually sorted by time.
 
 It's also possible to asynchronously insert data in small but frequent inserts. The data from such insertions is combined into batches and then safely inserted into a table. To enable the asynchronous mode, switch on the [async_insert](../../operations/settings/settings.md#async-insert) setting. Note that asynchronous insertions are supported only over HTTP protocol, and deduplication is not supported for them.
 
 **See Also**
 
--   [async_insert](../../operations/settings/settings.md#async-insert)
--   [async_insert_threads](../../operations/settings/settings.md#async-insert-threads)
--   [wait_for_async_insert](../../operations/settings/settings.md#wait-for-async-insert)
--   [wait_for_async_insert_timeout](../../operations/settings/settings.md#wait-for-async-insert-timeout)
--   [async_insert_max_data_size](../../operations/settings/settings.md#async-insert-max-data-size)
--   [async_insert_busy_timeout_ms](../../operations/settings/settings.md#async-insert-busy-timeout-ms)
--   [async_insert_stale_timeout_ms](../../operations/settings/settings.md#async-insert-stale-timeout-ms)
+- [async_insert](../../operations/settings/settings.md#async-insert)
+- [async_insert_threads](../../operations/settings/settings.md#async-insert-threads)
+- [wait_for_async_insert](../../operations/settings/settings.md#wait-for-async-insert)
+- [wait_for_async_insert_timeout](../../operations/settings/settings.md#wait-for-async-insert-timeout)
+- [async_insert_max_data_size](../../operations/settings/settings.md#async-insert-max-data-size)
+- [async_insert_busy_timeout_ms](../../operations/settings/settings.md#async-insert-busy-timeout-ms)
+- [async_insert_stale_timeout_ms](../../operations/settings/settings.md#async-insert-stale-timeout-ms)
diff --git a/docs/en/sql-reference/statements/optimize.md b/docs/en/sql-reference/statements/optimize.md
index 78615a2f9ad..45d336c42f2 100644
--- a/docs/en/sql-reference/statements/optimize.md
+++ b/docs/en/sql-reference/statements/optimize.md
@@ -7,7 +7,7 @@ title: "OPTIMIZE Statement"
 
 This query tries to initialize an unscheduled merge of data parts for tables.
 
-:::warning
+:::note
 `OPTIMIZE` can’t fix the `Too many parts` error.
 :::
 
@@ -21,10 +21,10 @@ The `OPTIMIZE` query is supported for [MergeTree](../../engines/table-engines/me
 
 When `OPTIMIZE` is used with the [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) family of table engines, ClickHouse creates a task for merging and waits for execution on all replicas (if the [alter_sync](../../operations/settings/settings.md#alter-sync) setting is set to `2`) or on current replica (if the [alter_sync](../../operations/settings/settings.md#alter-sync) setting is set to `1`).
 
--   If `OPTIMIZE` does not perform a merge for any reason, it does not notify the client. To enable notifications, use the [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop) setting.
--   If you specify a `PARTITION`, only the specified partition is optimized. [How to set partition expression](alter/partition.md#how-to-set-partition-expression).
--   If you specify `FINAL`, optimization is performed even when all the data is already in one part. You can control this behaviour with [optimize_skip_merged_partitions](../../operations/settings/settings.md#optimize-skip-merged-partitions). Also, the merge is forced even if concurrent merges are performed.
--   If you specify `DEDUPLICATE`, then completely identical rows (unless by-clause is specified) will be deduplicated (all columns are compared), it makes sense only for the MergeTree engine.
+- If `OPTIMIZE` does not perform a merge for any reason, it does not notify the client. To enable notifications, use the [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop) setting.
+- If you specify a `PARTITION`, only the specified partition is optimized. [How to set partition expression](alter/partition.md#how-to-set-partition-expression).
+- If you specify `FINAL`, optimization is performed even when all the data is already in one part. You can control this behaviour with [optimize_skip_merged_partitions](../../operations/settings/settings.md#optimize-skip-merged-partitions). Also, the merge is forced even if concurrent merges are performed.
+- If you specify `DEDUPLICATE`, then completely identical rows (unless by-clause is specified) will be deduplicated (all columns are compared), it makes sense only for the MergeTree engine.
 
 You can specify how long (in seconds) to wait for inactive replicas to execute `OPTIMIZE` queries by the [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout) setting.
 
@@ -34,7 +34,7 @@ If the `alter_sync` is set to `2` and some replicas are not active for more than
 
 ## BY expression
 
-If you want to perform deduplication on custom set of columns rather than on all, you can specify list of columns explicitly or use any combination of [`*`](../../sql-reference/statements/select/index.md#asterisk), [`COLUMNS`](../../sql-reference/statements/select/index.md#columns-expression) or [`EXCEPT`](../../sql-reference/statements/select/index.md#except-modifier) expressions. The explictly written or implicitly expanded list of columns must include all columns specified in row ordering expression (both primary and sorting keys) and partitioning expression (partitioning key).
+If you want to perform deduplication on custom set of columns rather than on all, you can specify list of columns explicitly or use any combination of [`*`](../../sql-reference/statements/select/index.md#asterisk), [`COLUMNS`](../../sql-reference/statements/select/index.md#columns-expression) or [`EXCEPT`](../../sql-reference/statements/select/index.md#except-modifier) expressions. The explicitly written or implicitly expanded list of columns must include all columns specified in row ordering expression (both primary and sorting keys) and partitioning expression (partitioning key).
 
 :::note    
 Notice that `*` behaves just like in `SELECT`: [MATERIALIZED](../../sql-reference/statements/create/table.md#materialized) and [ALIAS](../../sql-reference/statements/create/table.md#alias) columns are not used for expansion.
diff --git a/docs/en/sql-reference/statements/rename.md b/docs/en/sql-reference/statements/rename.md
index cc33a7c41d4..a2d4b15df13 100644
--- a/docs/en/sql-reference/statements/rename.md
+++ b/docs/en/sql-reference/statements/rename.md
@@ -60,4 +60,4 @@ RENAME DICTIONARY [db0.]dict_A TO [db1.]dict_B [,...] [ON CLUSTER cluster]
 
 **See Also**
 
--   [Dictionaries](../../sql-reference/dictionaries/index.md)
+- [Dictionaries](../../sql-reference/dictionaries/index.md)
diff --git a/docs/en/sql-reference/statements/select/array-join.md b/docs/en/sql-reference/statements/select/array-join.md
index a1b5e0cdb36..9045ec4aba3 100644
--- a/docs/en/sql-reference/statements/select/array-join.md
+++ b/docs/en/sql-reference/statements/select/array-join.md
@@ -23,8 +23,8 @@ You can specify only one `ARRAY JOIN` clause in a `SELECT` query.
 
 Supported types of `ARRAY JOIN` are listed below:
 
--   `ARRAY JOIN` - In base case, empty arrays are not included in the result of `JOIN`.
--   `LEFT ARRAY JOIN` - The result of `JOIN` contains rows with empty arrays. The value for an empty array is set to the default value for the array element type (usually 0, empty string or NULL).
+- `ARRAY JOIN` - In base case, empty arrays are not included in the result of `JOIN`.
+- `LEFT ARRAY JOIN` - The result of `JOIN` contains rows with empty arrays. The value for an empty array is set to the default value for the array element type (usually 0, empty string or NULL).
 
 ## Basic ARRAY JOIN Examples
 
@@ -146,7 +146,7 @@ ARRAY JOIN arr AS a, arrayEnumerate(arr) AS num, arrayMap(x -> x + 1, arr) AS ma
 └───────┴─────────┴───┴─────┴────────┘
 ```
 
-The example below uses the [arrayEnumerate](../../../sql-reference/functions/array-functions#array_functions-arrayenumerate) function:
+The example below uses the [arrayEnumerate](../../../sql-reference/functions/array-functions.md#array_functions-arrayenumerate) function:
 
 ``` sql
 SELECT s, arr, a, num, arrayEnumerate(arr)
@@ -166,8 +166,8 @@ ARRAY JOIN arr AS a, arrayEnumerate(arr) AS num;
 Multiple arrays with different sizes can be joined by using: `SETTINGS enable_unaligned_array_join = 1`. Example:
 
 ```sql
-SELECT s, arr, a, b 
-FROM arrays_test ARRAY JOIN arr as a, [['a','b'],['c']] as b 
+SELECT s, arr, a, b
+FROM arrays_test ARRAY JOIN arr as a, [['a','b'],['c']] as b
 SETTINGS enable_unaligned_array_join = 1;
 ```
 
@@ -185,7 +185,7 @@ SETTINGS enable_unaligned_array_join = 1;
 
 ## ARRAY JOIN with Nested Data Structure
 
-`ARRAY JOIN` also works with [nested data structures](../../../sql-reference/data-types/nested-data-structures/nested.md):
+`ARRAY JOIN` also works with [nested data structures](../../../sql-reference/data-types/nested-data-structures/index.md):
 
 ``` sql
 CREATE TABLE nested_test
@@ -278,7 +278,7 @@ ARRAY JOIN nest AS n;
 └───────┴─────┴─────┴─────────┴────────────┘
 ```
 
-Example of using the [arrayEnumerate](../../../sql-reference/functions/array-functions#array_functions-arrayenumerate) function:
+Example of using the [arrayEnumerate](../../../sql-reference/functions/array-functions.md#array_functions-arrayenumerate) function:
 
 ``` sql
 SELECT s, `n.x`, `n.y`, `nest.x`, `nest.y`, num
diff --git a/docs/en/sql-reference/statements/select/distinct.md b/docs/en/sql-reference/statements/select/distinct.md
index b2d940af3bb..10326b0ef8f 100644
--- a/docs/en/sql-reference/statements/select/distinct.md
+++ b/docs/en/sql-reference/statements/select/distinct.md
@@ -105,6 +105,6 @@ Take this implementation specificity into account when programming queries.
 
 It is possible to obtain the same result by applying [GROUP BY](../../../sql-reference/statements/select/group-by.md) across the same set of values as specified as `SELECT` clause, without using any aggregate functions. But there are few differences from `GROUP BY` approach:
 
--   `DISTINCT` can be applied together with `GROUP BY`.
--   When [ORDER BY](../../../sql-reference/statements/select/order-by.md) is omitted and [LIMIT](../../../sql-reference/statements/select/limit.md) is defined, the query stops running immediately after the required number of different rows has been read.
--   Data blocks are output as they are processed, without waiting for the entire query to finish running.
+- `DISTINCT` can be applied together with `GROUP BY`.
+- When [ORDER BY](../../../sql-reference/statements/select/order-by.md) is omitted and [LIMIT](../../../sql-reference/statements/select/limit.md) is defined, the query stops running immediately after the required number of different rows has been read.
+- Data blocks are output as they are processed, without waiting for the entire query to finish running.
diff --git a/docs/en/sql-reference/statements/select/except.md b/docs/en/sql-reference/statements/select/except.md
index f73cbff9819..cc4bb9d1c24 100644
--- a/docs/en/sql-reference/statements/select/except.md
+++ b/docs/en/sql-reference/statements/select/except.md
@@ -149,5 +149,5 @@ Result:
 
 **See Also**
 
--   [UNION](union.md#union-clause)
--   [INTERSECT](intersect.md#intersect-clause)
+- [UNION](union.md#union-clause)
+- [INTERSECT](intersect.md#intersect-clause)
diff --git a/docs/en/sql-reference/statements/select/from.md b/docs/en/sql-reference/statements/select/from.md
index fb6c1f94902..4ca8e8287c0 100644
--- a/docs/en/sql-reference/statements/select/from.md
+++ b/docs/en/sql-reference/statements/select/from.md
@@ -7,9 +7,9 @@ sidebar_label: FROM
 
 The `FROM` clause specifies the source to read data from:
 
--   [Table](../../../engines/table-engines/index.md)
--   [Subquery](../../../sql-reference/statements/select/index.md) 
--   [Table function](../../../sql-reference/table-functions/index.md#table-functions)
+- [Table](../../../engines/table-engines/index.md)
+- [Subquery](../../../sql-reference/statements/select/index.md) 
+- [Table function](../../../sql-reference/table-functions/index.md#table-functions)
 
 [JOIN](../../../sql-reference/statements/select/join.md) and [ARRAY JOIN](../../../sql-reference/statements/select/array-join.md) clauses may also be used to extend the functionality of the `FROM` clause.
 
@@ -31,8 +31,8 @@ There are drawbacks to using `FINAL` (see below).
 
 Queries that use `FINAL` are executed slightly slower than similar queries that do not, because:
 
--   Data is merged during query execution.
--   Queries with `FINAL` read primary key columns in addition to the columns specified in the query.
+- Data is merged during query execution.
+- Queries with `FINAL` read primary key columns in addition to the columns specified in the query.
 
 **In most cases, avoid using `FINAL`.** The common approach is to use different queries that assume the background processes of the `MergeTree` engine have’t happened yet and deal with it by applying aggregation (for example, to discard duplicates).
 
diff --git a/docs/en/sql-reference/statements/select/group-by.md b/docs/en/sql-reference/statements/select/group-by.md
index 2a4b06660c7..36d401ba04a 100644
--- a/docs/en/sql-reference/statements/select/group-by.md
+++ b/docs/en/sql-reference/statements/select/group-by.md
@@ -7,13 +7,13 @@ sidebar_label: GROUP BY
 
 `GROUP BY` clause switches the `SELECT` query into an aggregation mode, which works as follows:
 
--   `GROUP BY` clause contains a list of expressions (or a single expression, which is considered to be the list of length one). This list acts as a “grouping key”, while each individual expression will be referred to as a “key expression”.
--   All the expressions in the [SELECT](../../../sql-reference/statements/select/index.md), [HAVING](../../../sql-reference/statements/select/having), and [ORDER BY](../../../sql-reference/statements/select/order-by.md) clauses **must** be calculated based on key expressions **or** on [aggregate functions](../../../sql-reference/aggregate-functions/index.md) over non-key expressions (including plain columns). In other words, each column selected from the table must be used either in a key expression or inside an aggregate function, but not both.
--   Result of aggregating `SELECT` query will contain as many rows as there were unique values of “grouping key” in source table. Usually, this significantly reduces the row count, often by orders of magnitude, but not necessarily: row count stays the same if all “grouping key” values were distinct.
+- `GROUP BY` clause contains a list of expressions (or a single expression, which is considered to be the list of length one). This list acts as a “grouping key”, while each individual expression will be referred to as a “key expression”.
+- All the expressions in the [SELECT](../../../sql-reference/statements/select/index.md), [HAVING](../../../sql-reference/statements/select/having.md), and [ORDER BY](../../../sql-reference/statements/select/order-by.md) clauses **must** be calculated based on key expressions **or** on [aggregate functions](../../../sql-reference/aggregate-functions/index.md) over non-key expressions (including plain columns). In other words, each column selected from the table must be used either in a key expression or inside an aggregate function, but not both.
+- Result of aggregating `SELECT` query will contain as many rows as there were unique values of “grouping key” in source table. Usually, this significantly reduces the row count, often by orders of magnitude, but not necessarily: row count stays the same if all “grouping key” values were distinct.
 
 When you want to group data in the table by column numbers instead of column names, enable the setting [enable_positional_arguments](../../../operations/settings/settings.md#enable-positional-arguments).
 
-:::note    
+:::note
 There’s an additional way to run aggregation over a table. If a query contains table columns only inside aggregate functions, the `GROUP BY clause` can be omitted, and aggregation by an empty set of keys is assumed. Such queries always return exactly one row.
 :::
 
@@ -57,8 +57,8 @@ The subtotals are calculated in the reverse order: at first subtotals are calcul
 
 In the subtotals rows the values of already "grouped" key expressions are set to `0` or empty line.
 
-:::note    
-Mind that [HAVING](../../../sql-reference/statements/select/having) clause can affect the subtotals results.
+:::note
+Mind that [HAVING](../../../sql-reference/statements/select/having.md) clause can affect the subtotals results.
 :::
 
 **Example**
@@ -125,8 +125,8 @@ SELECT year, month, day, count(*) FROM t GROUP BY year, month, day WITH ROLLUP;
 
 In the subtotals rows the values of all "grouped" key expressions are set to `0` or empty line.
 
-:::note    
-Mind that [HAVING](../../../sql-reference/statements/select/having) clause can affect the subtotals results.
+:::note
+Mind that [HAVING](../../../sql-reference/statements/select/having.md) clause can affect the subtotals results.
 :::
 
 **Example**
@@ -220,17 +220,17 @@ If the `WITH TOTALS` modifier is specified, another row will be calculated. This
 
 This extra row is only produced in `JSON*`, `TabSeparated*`, and `Pretty*` formats, separately from the other rows:
 
--   In `XML` and `JSON*` formats, this row is output as a separate ‘totals’ field.
--   In `TabSeparated*`, `CSV*` and `Vertical` formats, the row comes after the main result, preceded by an empty row (after the other data).
--   In `Pretty*` formats, the row is output as a separate table after the main result.
--   In `Template` format, the row is output according to specified template.
--   In the other formats it is not available.
+- In `XML` and `JSON*` formats, this row is output as a separate ‘totals’ field.
+- In `TabSeparated*`, `CSV*` and `Vertical` formats, the row comes after the main result, preceded by an empty row (after the other data).
+- In `Pretty*` formats, the row is output as a separate table after the main result.
+- In `Template` format, the row is output according to specified template.
+- In the other formats it is not available.
 
-:::note    
-totals is output in the results of `SELECT` queries, and is not output in `INSERT INTO ... SELECT`. 
+:::note
+totals is output in the results of `SELECT` queries, and is not output in `INSERT INTO ... SELECT`.
 :::
 
-`WITH TOTALS` can be run in different ways when [HAVING](../../../sql-reference/statements/select/having) is present. The behavior depends on the `totals_mode` setting.
+`WITH TOTALS` can be run in different ways when [HAVING](../../../sql-reference/statements/select/having.md) is present. The behavior depends on the `totals_mode` setting.
 
 ### Configuring Totals Processing
 
diff --git a/docs/en/sql-reference/statements/select/index.md b/docs/en/sql-reference/statements/select/index.md
index 5a8893f6f28..2863c5c0116 100644
--- a/docs/en/sql-reference/statements/select/index.md
+++ b/docs/en/sql-reference/statements/select/index.md
@@ -4,7 +4,7 @@ sidebar_position: 32
 sidebar_label: SELECT
 ---
 
-# SELECT Query 
+# SELECT Query
 
 `SELECT` queries perform data retrieval. By default, the requested data is returned to the client, while in conjunction with [INSERT INTO](../../../sql-reference/statements/insert-into.md) it can be forwarded to a different table.
 
@@ -34,24 +34,24 @@ All clauses are optional, except for the required list of expressions immediatel
 
 Specifics of each optional clause are covered in separate sections, which are listed in the same order as they are executed:
 
--   [WITH clause](../../../sql-reference/statements/select/with.md)
--   [SELECT clause](#select-clause)
--   [DISTINCT clause](../../../sql-reference/statements/select/distinct.md)
--   [FROM clause](../../../sql-reference/statements/select/from.md)
--   [SAMPLE clause](../../../sql-reference/statements/select/sample.md)
--   [JOIN clause](../../../sql-reference/statements/select/join.md)
--   [PREWHERE clause](../../../sql-reference/statements/select/prewhere.md)
--   [WHERE clause](../../../sql-reference/statements/select/where.md)
--   [GROUP BY clause](../../../sql-reference/statements/select/group-by.md)
--   [LIMIT BY clause](../../../sql-reference/statements/select/limit-by.md)
--   [HAVING clause](../../../sql-reference/statements/select/having)
--   [LIMIT clause](../../../sql-reference/statements/select/limit.md)
--   [OFFSET clause](../../../sql-reference/statements/select/offset.md)
--   [UNION clause](../../../sql-reference/statements/select/union.md)
--   [INTERSECT clause](../../../sql-reference/statements/select/intersect.md)
--   [EXCEPT clause](../../../sql-reference/statements/select/except.md)
--   [INTO OUTFILE clause](../../../sql-reference/statements/select/into-outfile.md)
--   [FORMAT clause](../../../sql-reference/statements/select/format.md)
+- [WITH clause](../../../sql-reference/statements/select/with.md)
+- [SELECT clause](#select-clause)
+- [DISTINCT clause](../../../sql-reference/statements/select/distinct.md)
+- [FROM clause](../../../sql-reference/statements/select/from.md)
+- [SAMPLE clause](../../../sql-reference/statements/select/sample.md)
+- [JOIN clause](../../../sql-reference/statements/select/join.md)
+- [PREWHERE clause](../../../sql-reference/statements/select/prewhere.md)
+- [WHERE clause](../../../sql-reference/statements/select/where.md)
+- [GROUP BY clause](../../../sql-reference/statements/select/group-by.md)
+- [LIMIT BY clause](../../../sql-reference/statements/select/limit-by.md)
+- [HAVING clause](../../../sql-reference/statements/select/having.md)
+- [LIMIT clause](../../../sql-reference/statements/select/limit.md)
+- [OFFSET clause](../../../sql-reference/statements/select/offset.md)
+- [UNION clause](../../../sql-reference/statements/select/union.md)
+- [INTERSECT clause](../../../sql-reference/statements/select/intersect.md)
+- [EXCEPT clause](../../../sql-reference/statements/select/except.md)
+- [INTO OUTFILE clause](../../../sql-reference/statements/select/into-outfile.md)
+- [FORMAT clause](../../../sql-reference/statements/select/format.md)
 
 ## SELECT Clause
 
@@ -123,11 +123,11 @@ Columns that matched the `COLUMNS` expression can have different data types. If
 
 You can put an asterisk in any part of a query instead of an expression. When the query is analyzed, the asterisk is expanded to a list of all table columns (excluding the `MATERIALIZED` and `ALIAS` columns). There are only a few cases when using an asterisk is justified:
 
--   When creating a table dump.
--   For tables containing just a few columns, such as system tables.
--   For getting information about what columns are in a table. In this case, set `LIMIT 1`. But it is better to use the `DESC TABLE` query.
--   When there is strong filtration on a small number of columns using `PREWHERE`.
--   In subqueries (since columns that aren’t needed for the external query are excluded from subqueries).
+- When creating a table dump.
+- For tables containing just a few columns, such as system tables.
+- For getting information about what columns are in a table. In this case, set `LIMIT 1`. But it is better to use the `DESC TABLE` query.
+- When there is strong filtration on a small number of columns using `PREWHERE`.
+- In subqueries (since columns that aren’t needed for the external query are excluded from subqueries).
 
 In all other cases, we do not recommend using the asterisk, since it only gives you the drawbacks of a columnar DBMS instead of the advantages. In other words using the asterisk is not recommended.
 
@@ -151,17 +151,17 @@ The `GROUP BY`, `ORDER BY`, and `LIMIT BY` clauses can support positional argume
 
 If the query omits the `DISTINCT`, `GROUP BY` and `ORDER BY` clauses and the `IN` and `JOIN` subqueries, the query will be completely stream processed, using O(1) amount of RAM. Otherwise, the query might consume a lot of RAM if the appropriate restrictions are not specified:
 
--   `max_memory_usage`
--   `max_rows_to_group_by`
--   `max_rows_to_sort`
--   `max_rows_in_distinct`
--   `max_bytes_in_distinct`
--   `max_rows_in_set`
--   `max_bytes_in_set`
--   `max_rows_in_join`
--   `max_bytes_in_join`
--   `max_bytes_before_external_sort`
--   `max_bytes_before_external_group_by`
+- `max_memory_usage`
+- `max_rows_to_group_by`
+- `max_rows_to_sort`
+- `max_rows_in_distinct`
+- `max_bytes_in_distinct`
+- `max_rows_in_set`
+- `max_bytes_in_set`
+- `max_rows_in_join`
+- `max_bytes_in_join`
+- `max_bytes_before_external_sort`
+- `max_bytes_before_external_group_by`
 
 For more information, see the section “Settings”. It is possible to use external sorting (saving temporary tables to a disk) and external aggregation.
 
diff --git a/docs/en/sql-reference/statements/select/intersect.md b/docs/en/sql-reference/statements/select/intersect.md
index ea7a39421a5..8c0ee6b2e96 100644
--- a/docs/en/sql-reference/statements/select/intersect.md
+++ b/docs/en/sql-reference/statements/select/intersect.md
@@ -153,5 +153,5 @@ Result:
 
 **See Also**
 
--   [UNION](union.md#union-clause)
--   [EXCEPT](except.md#except-clause)
+- [UNION](union.md#union-clause)
+- [EXCEPT](except.md#except-clause)
diff --git a/docs/en/sql-reference/statements/select/into-outfile.md b/docs/en/sql-reference/statements/select/into-outfile.md
index a14b23f6689..352af16042a 100644
--- a/docs/en/sql-reference/statements/select/into-outfile.md
+++ b/docs/en/sql-reference/statements/select/into-outfile.md
@@ -12,7 +12,7 @@ Compressed files are supported. Compression type is detected by the extension of
 **Syntax**
 
 ```sql
-SELECT <expr_list> INTO OUTFILE file_name [AND STDOUT] [COMPRESSION type [LEVEL level]]
+SELECT <expr_list> INTO OUTFILE file_name [AND STDOUT] [APPEND] [COMPRESSION type [LEVEL level]]
 ```
 
 `file_name` and `type` are string literals. Supported compression types are: `'none'`, `'gzip'`, `'deflate'`, `'br'`, `'xz'`, `'zstd'`, `'lz4'`, `'bz2'`.
@@ -21,10 +21,11 @@ SELECT <expr_list> INTO OUTFILE file_name [AND STDOUT] [COMPRESSION type [LEVEL
 
 ## Implementation Details
 
--   This functionality is available in the [command-line client](../../../interfaces/cli.md) and [clickhouse-local](../../../operations/utilities/clickhouse-local.md). Thus a query sent via [HTTP interface](../../../interfaces/http.md) will fail.
--   The query will fail if a file with the same file name already exists.
--   The default [output format](../../../interfaces/formats.md) is `TabSeparated` (like in the command-line client batch mode). Use [FORMAT](format.md) clause to change it.
--   If `AND STDOUT` is mentioned in the query then the output that is written to the file is also displayed on standard output. If used with compression, the plaintext is displayed on standard output.
+- This functionality is available in the [command-line client](../../../interfaces/cli.md) and [clickhouse-local](../../../operations/utilities/clickhouse-local.md). Thus a query sent via [HTTP interface](../../../interfaces/http.md) will fail.
+- The query will fail if a file with the same file name already exists.
+- The default [output format](../../../interfaces/formats.md) is `TabSeparated` (like in the command-line client batch mode). Use [FORMAT](format.md) clause to change it.
+- If `AND STDOUT` is mentioned in the query then the output that is written to the file is also displayed on standard output. If used with compression, the plaintext is displayed on standard output.
+- If `APPEND` is mentioned in the query then the output is appended to an existing file. If compression is used, append cannot be used.
 
 **Example**
 
diff --git a/docs/en/sql-reference/statements/select/join.md b/docs/en/sql-reference/statements/select/join.md
index 62d3e9fd69a..08ffae838f8 100644
--- a/docs/en/sql-reference/statements/select/join.md
+++ b/docs/en/sql-reference/statements/select/join.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/statements/select/join
-sidebar_label: JOIN
+sidebar_label: Joining Tables
 ---
 
 # JOIN Clause
@@ -18,24 +18,28 @@ FROM <left_table>
 
 Expressions from `ON` clause and columns from `USING` clause are called “join keys”. Unless otherwise stated, join produces a [Cartesian product](https://en.wikipedia.org/wiki/Cartesian_product) from rows with matching “join keys”, which might produce results with much more rows than the source tables.
 
+## Related Content
+
+- Blog: [ClickHouse: A Blazingly Fast DBMS with Full SQL Join Support - Part 1](https://clickhouse.com/blog/clickhouse-fully-supports-joins)
+
 ## Supported Types of JOIN
 
 All standard [SQL JOIN](https://en.wikipedia.org/wiki/Join_(SQL)) types are supported:
 
--   `INNER JOIN`, only matching rows are returned.
--   `LEFT OUTER JOIN`, non-matching rows from left table are returned in addition to matching rows.
--   `RIGHT OUTER JOIN`, non-matching rows from right table are returned in addition to matching rows.
--   `FULL OUTER JOIN`, non-matching rows from both tables are returned in addition to matching rows.
--   `CROSS JOIN`, produces cartesian product of whole tables, “join keys” are **not** specified.
+- `INNER JOIN`, only matching rows are returned.
+- `LEFT OUTER JOIN`, non-matching rows from left table are returned in addition to matching rows.
+- `RIGHT OUTER JOIN`, non-matching rows from right table are returned in addition to matching rows.
+- `FULL OUTER JOIN`, non-matching rows from both tables are returned in addition to matching rows.
+- `CROSS JOIN`, produces cartesian product of whole tables, “join keys” are **not** specified.
 
 `JOIN` without specified type implies `INNER`. Keyword `OUTER` can be safely omitted. Alternative syntax for `CROSS JOIN` is specifying multiple tables in [FROM clause](../../../sql-reference/statements/select/from.md) separated by commas.
 
 Additional join types available in ClickHouse:
 
--   `LEFT SEMI JOIN` and `RIGHT SEMI JOIN`, a whitelist on “join keys”, without producing a cartesian product.
--   `LEFT ANTI JOIN` and `RIGHT ANTI JOIN`, a blacklist on “join keys”, without producing a cartesian product.
--   `LEFT ANY JOIN`, `RIGHT ANY JOIN` and `INNER ANY JOIN`, partially (for opposite side of `LEFT` and `RIGHT`) or completely (for `INNER` and `FULL`) disables the cartesian product for standard `JOIN` types.
--   `ASOF JOIN` and `LEFT ASOF JOIN`, joining sequences with a non-exact match. `ASOF JOIN` usage is described below.
+- `LEFT SEMI JOIN` and `RIGHT SEMI JOIN`, a whitelist on “join keys”, without producing a cartesian product.
+- `LEFT ANTI JOIN` and `RIGHT ANTI JOIN`, a blacklist on “join keys”, without producing a cartesian product.
+- `LEFT ANY JOIN`, `RIGHT ANY JOIN` and `INNER ANY JOIN`, partially (for opposite side of `LEFT` and `RIGHT`) or completely (for `INNER` and `FULL`) disables the cartesian product for standard `JOIN` types.
+- `ASOF JOIN` and `LEFT ASOF JOIN`, joining sequences with a non-exact match. `ASOF JOIN` usage is described below.
 
 :::note
 When [join_algorithm](../../../operations/settings/settings.md#settings-join_algorithm) is set to `partial_merge`, `RIGHT JOIN` and `FULL JOIN` are supported only with `ALL` strictness (`SEMI`, `ANTI`, `ANY`, and `ASOF` are not supported).
@@ -47,6 +51,7 @@ The default join type can be overridden using [join_default_strictness](../../..
 
 The behavior of ClickHouse server for `ANY JOIN` operations depends on the [any_join_distinct_right_table_keys](../../../operations/settings/settings.md#any_join_distinct_right_table_keys) setting.
 
+
 **See also**
 
 - [join_algorithm](../../../operations/settings/settings.md#settings-join_algorithm)
@@ -57,6 +62,8 @@ The behavior of ClickHouse server for `ANY JOIN` operations depends on the [any_
 - [join_on_disk_max_files_to_merge](../../../operations/settings/settings.md#join_on_disk_max_files_to_merge)
 - [any_join_distinct_right_table_keys](../../../operations/settings/settings.md#any_join_distinct_right_table_keys)
 
+Use the `cross_to_inner_join_rewrite` setting to define the behavior when ClickHouse fails to rewrite a `CROSS JOIN` as an `INNER JOIN`. The default value is `1`, which  allows the join to continue but it will be slower. Set `cross_to_inner_join_rewrite` to `0` if you want an error to be thrown, and set it to `2` to not run the cross joins but instead force a rewrite of all comma/cross joins. If the rewriting fails when the value is `2`, you will receive an error message stating "Please, try to simplify `WHERE` section".
+
 ## ON Section Conditions
 
 An `ON` section can contain several conditions combined using the `AND` and `OR` operators. Conditions specifying join keys must refer both left and right tables and must use the equality operator. Other conditions may use other logical operators but they must refer either the left or the right table of a query.
@@ -159,9 +166,9 @@ Result:
 
 Algorithm requires the special column in tables. This column:
 
--   Must contain an ordered sequence.
--   Can be one of the following types: [Int, UInt](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md), [Decimal](../../../sql-reference/data-types/decimal.md).
--   Can’t be the only column in the `JOIN` clause.
+- Must contain an ordered sequence.
+- Can be one of the following types: [Int, UInt](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md), [Decimal](../../../sql-reference/data-types/decimal.md).
+- Can’t be the only column in the `JOIN` clause.
 
 Syntax `ASOF JOIN ... ON`:
 
@@ -191,7 +198,7 @@ For example, consider the following tables:
 
          table_1                           table_2
       event   | ev_time | user_id       event   | ev_time | user_id
-    ----------|---------|----------   ----------|---------|----------
+    ----------|---------|---------- ----------|---------|----------
                   ...                               ...
     event_1_1 |  12:00  |  42         event_2_1 |  11:59  |   42
                   ...                 event_2_2 |  12:30  |   42
@@ -208,8 +215,8 @@ For example, consider the following tables:
 
 There are two ways to execute join involving distributed tables:
 
--   When using a normal `JOIN`, the query is sent to remote servers. Subqueries are run on each of them in order to make the right table, and the join is performed with this table. In other words, the right table is formed on each server separately.
--   When using `GLOBAL ... JOIN`, first the requestor server runs a subquery to calculate the right table. This temporary table is passed to each remote server, and queries are run on them using the temporary data that was transmitted.
+- When using a normal `JOIN`, the query is sent to remote servers. Subqueries are run on each of them in order to make the right table, and the join is performed with this table. In other words, the right table is formed on each server separately.
+- When using `GLOBAL ... JOIN`, first the requestor server runs a subquery to calculate the right table. This temporary table is passed to each remote server, and queries are run on them using the temporary data that was transmitted.
 
 Be careful when using `GLOBAL`. For more information, see the [Distributed subqueries](../../../sql-reference/operators/in.md#select-distributed-subqueries) section.
 
@@ -267,12 +274,12 @@ The `USING` clause specifies one or more columns to join, which establishes the
 
 For multiple `JOIN` clauses in a single `SELECT` query:
 
--   Taking all the columns via `*` is available only if tables are joined, not subqueries.
--   The `PREWHERE` clause is not available.
+- Taking all the columns via `*` is available only if tables are joined, not subqueries.
+- The `PREWHERE` clause is not available.
 
 For `ON`, `WHERE`, and `GROUP BY` clauses:
 
--   Arbitrary expressions cannot be used in `ON`, `WHERE`, and `GROUP BY` clauses, but you can define an expression in a `SELECT` clause and then use it in these clauses via an alias.
+- Arbitrary expressions cannot be used in `ON`, `WHERE`, and `GROUP BY` clauses, but you can define an expression in a `SELECT` clause and then use it in these clauses via an alias.
 
 ### Performance
 
@@ -282,7 +289,7 @@ Each time a query is run with the same `JOIN`, the subquery is run again because
 
 In some cases, it is more efficient to use [IN](../../../sql-reference/operators/in.md) instead of `JOIN`.
 
-If you need a `JOIN` for joining with dimension tables (these are relatively small tables that contain dimension properties, such as names for advertising campaigns), a `JOIN` might not be very convenient due to the fact that the right table is re-accessed for every query. For such cases, there is a “dictionaries” feature that you should use instead of `JOIN`. For more information, see the [Dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) section.
+If you need a `JOIN` for joining with dimension tables (these are relatively small tables that contain dimension properties, such as names for advertising campaigns), a `JOIN` might not be very convenient due to the fact that the right table is re-accessed for every query. For such cases, there is a “dictionaries” feature that you should use instead of `JOIN`. For more information, see the [Dictionaries](../../../sql-reference/dictionaries/index.md) section.
 
 ### Memory Limitations
 
@@ -290,8 +297,8 @@ By default, ClickHouse uses the [hash join](https://en.wikipedia.org/wiki/Hash_j
 
 If you need to restrict `JOIN` operation memory consumption use the following settings:
 
--   [max_rows_in_join](../../../operations/settings/query-complexity.md#settings-max_rows_in_join) — Limits number of rows in the hash table.
--   [max_bytes_in_join](../../../operations/settings/query-complexity.md#settings-max_bytes_in_join) — Limits size of the hash table.
+- [max_rows_in_join](../../../operations/settings/query-complexity.md#settings-max_rows_in_join) — Limits number of rows in the hash table.
+- [max_bytes_in_join](../../../operations/settings/query-complexity.md#settings-max_bytes_in_join) — Limits size of the hash table.
 
 When any of these limits is reached, ClickHouse acts as the [join_overflow_mode](../../../operations/settings/query-complexity.md#settings-join_overflow_mode) setting instructs.
 
diff --git a/docs/en/sql-reference/statements/select/limit-by.md b/docs/en/sql-reference/statements/select/limit-by.md
index 28f3d7e86d7..4cfc56ecbf9 100644
--- a/docs/en/sql-reference/statements/select/limit-by.md
+++ b/docs/en/sql-reference/statements/select/limit-by.md
@@ -9,8 +9,8 @@ A query with the `LIMIT n BY expressions` clause selects the first `n` rows for
 
 ClickHouse supports the following syntax variants:
 
--   `LIMIT [offset_value, ]n BY expressions`
--   `LIMIT n OFFSET offset_value BY expressions`
+- `LIMIT [offset_value, ]n BY expressions`
+- `LIMIT n OFFSET offset_value BY expressions`
 
 During query processing, ClickHouse selects data ordered by sorting key. The sorting key is set explicitly using an [ORDER BY](order-by.md#select-order-by) clause or implicitly as a property of the table engine (row order is only guaranteed when using [ORDER BY](order-by.md#select-order-by), otherwise the row blocks will not be ordered due to multi-threading). Then ClickHouse applies `LIMIT n BY expressions` and returns the first `n` rows for each distinct combination of `expressions`. If `OFFSET` is specified, then for each data block that belongs to a distinct combination of `expressions`, ClickHouse skips `offset_value` number of rows from the beginning of the block and returns a maximum of `n` rows as a result. If `offset_value` is bigger than the number of rows in the data block, ClickHouse returns zero rows from the block.
 
diff --git a/docs/en/sql-reference/statements/select/order-by.md b/docs/en/sql-reference/statements/select/order-by.md
index e231a1cc72c..712395a0357 100644
--- a/docs/en/sql-reference/statements/select/order-by.md
+++ b/docs/en/sql-reference/statements/select/order-by.md
@@ -16,8 +16,8 @@ If the ORDER BY clause is omitted, the order of the rows is also undefined, and
 
 There are two approaches to `NaN` and `NULL` sorting order:
 
--   By default or with the `NULLS LAST` modifier: first the values, then `NaN`, then `NULL`.
--   With the `NULLS FIRST` modifier: first `NULL`, then `NaN`, then other values.
+- By default or with the `NULLS LAST` modifier: first the values, then `NaN`, then `NULL`.
+- With the `NULLS FIRST` modifier: first `NULL`, then `NaN`, then other values.
 
 ### Example
 
@@ -544,6 +544,54 @@ Result:
 └─────┴──────────┴───────┘
 ```
 
+## Filling grouped by sorting prefix
+
+It can be useful to fill rows which have the same values in particular columns independently, - a good example is filling missing values in time series.
+Assume there is the following time series table:
+``` sql
+CREATE TABLE timeseries
+(
+    `sensor_id` UInt64,
+    `timestamp` DateTime64(3, 'UTC'),
+    `value` Float64
+)
+ENGINE = Memory;
+
+SELECT * FROM timeseries;
+
+┌─sensor_id─┬───────────────timestamp─┬─value─┐
+│       234 │ 2021-12-01 00:00:03.000 │     3 │
+│       432 │ 2021-12-01 00:00:01.000 │     1 │
+│       234 │ 2021-12-01 00:00:07.000 │     7 │
+│       432 │ 2021-12-01 00:00:05.000 │     5 │
+└───────────┴─────────────────────────┴───────┘
+```
+And we'd like to fill missing values for each sensor independently with 1 second interval.
+The way to achieve it is to use `sensor_id` column as sorting prefix for filling column `timestamp`:
+```
+SELECT *
+FROM timeseries
+ORDER BY
+    sensor_id,
+    timestamp WITH FILL
+INTERPOLATE ( value AS 9999 )
+
+┌─sensor_id─┬───────────────timestamp─┬─value─┐
+│       234 │ 2021-12-01 00:00:03.000 │     3 │
+│       234 │ 2021-12-01 00:00:04.000 │  9999 │
+│       234 │ 2021-12-01 00:00:05.000 │  9999 │
+│       234 │ 2021-12-01 00:00:06.000 │  9999 │
+│       234 │ 2021-12-01 00:00:07.000 │     7 │
+│       432 │ 2021-12-01 00:00:01.000 │     1 │
+│       432 │ 2021-12-01 00:00:02.000 │  9999 │
+│       432 │ 2021-12-01 00:00:03.000 │  9999 │
+│       432 │ 2021-12-01 00:00:04.000 │  9999 │
+│       432 │ 2021-12-01 00:00:05.000 │     5 │
+└───────────┴─────────────────────────┴───────┘
+```
+Here, the `value` column was interpolated with `9999` just to make filled rows more noticeable.
+This behavior is controlled by setting `use_with_fill_by_sorting_prefix` (enabled by default)
+
 ## Related content
 
 - Blog: [Working with time series data in ClickHouse](https://clickhouse.com/blog/working-with-time-series-data-and-functions-ClickHouse)
diff --git a/docs/en/sql-reference/statements/select/sample.md b/docs/en/sql-reference/statements/select/sample.md
index fb44d7c5a44..137f86cc8b9 100644
--- a/docs/en/sql-reference/statements/select/sample.md
+++ b/docs/en/sql-reference/statements/select/sample.md
@@ -11,9 +11,9 @@ When data sampling is enabled, the query is not performed on all the data, but o
 
 Approximated query processing can be useful in the following cases:
 
--   When you have strict latency requirements (like below 100ms) but you can’t justify the cost of additional hardware resources to meet them.
--   When your raw data is not accurate, so approximation does not noticeably degrade the quality.
--   Business requirements target approximate results (for cost-effectiveness, or to market exact results to premium users).
+- When you have strict latency requirements (like below 100ms) but you can’t justify the cost of additional hardware resources to meet them.
+- When your raw data is not accurate, so approximation does not noticeably degrade the quality.
+- Business requirements target approximate results (for cost-effectiveness, or to market exact results to premium users).
 
 :::note    
 You can only use sampling with the tables in the [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) family, and only if the sampling expression was specified during table creation (see [MergeTree engine](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table)).
@@ -21,9 +21,9 @@ You can only use sampling with the tables in the [MergeTree](../../../engines/ta
 
 The features of data sampling are listed below:
 
--   Data sampling is a deterministic mechanism. The result of the same `SELECT .. SAMPLE` query is always the same.
--   Sampling works consistently for different tables. For tables with a single sampling key, a sample with the same coefficient always selects the same subset of possible data. For example, a sample of user IDs takes rows with the same subset of all the possible user IDs from different tables. This means that you can use the sample in subqueries in the [IN](../../../sql-reference/operators/in.md) clause. Also, you can join samples using the [JOIN](../../../sql-reference/statements/select/join.md) clause.
--   Sampling allows reading less data from a disk. Note that you must specify the sampling key correctly. For more information, see [Creating a MergeTree Table](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table).
+- Data sampling is a deterministic mechanism. The result of the same `SELECT .. SAMPLE` query is always the same.
+- Sampling works consistently for different tables. For tables with a single sampling key, a sample with the same coefficient always selects the same subset of possible data. For example, a sample of user IDs takes rows with the same subset of all the possible user IDs from different tables. This means that you can use the sample in subqueries in the [IN](../../../sql-reference/operators/in.md) clause. Also, you can join samples using the [JOIN](../../../sql-reference/statements/select/join.md) clause.
+- Sampling allows reading less data from a disk. Note that you must specify the sampling key correctly. For more information, see [Creating a MergeTree Table](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table).
 
 For the `SAMPLE` clause the following syntax is supported:
 
@@ -34,7 +34,7 @@ For the `SAMPLE` clause the following syntax is supported:
 | `SAMPLE k OFFSET m`  |  Here `k` and `m` are the numbers from 0 to 1. The query is executed on a sample of `k` fraction of the data. The data used for the sample is offset by `m` fraction. [Read more](#select-sample-offset)  |
 
 
-## SAMPLE K
+## SAMPLE K {#select-sample-k}
 
 Here `k` is the number from 0 to 1 (both fractional and decimal notations are supported). For example, `SAMPLE 1/2` or `SAMPLE 0.5`.
 
@@ -54,7 +54,7 @@ ORDER BY PageViews DESC LIMIT 1000
 
 In this example, the query is executed on a sample from 0.1 (10%) of data. Values of aggregate functions are not corrected automatically, so to get an approximate result, the value `count()` is manually multiplied by 10.
 
-## SAMPLE N
+## SAMPLE N {#select-sample-n}
 
 Here `n` is a sufficiently large integer. For example, `SAMPLE 10000000`.
 
@@ -90,7 +90,7 @@ FROM visits
 SAMPLE 10000000
 ```
 
-## SAMPLE K OFFSET M
+## SAMPLE K OFFSET M {#select-sample-offset}
 
 Here `k` and `m` are numbers from 0 to 1. Examples are shown below.
 
diff --git a/docs/en/sql-reference/statements/select/union.md b/docs/en/sql-reference/statements/select/union.md
index 002aeaa4488..92a4ed1bb20 100644
--- a/docs/en/sql-reference/statements/select/union.md
+++ b/docs/en/sql-reference/statements/select/union.md
@@ -81,8 +81,8 @@ Queries that are parts of `UNION/UNION ALL/UNION DISTINCT` can be run simultaneo
 
 **See Also**
 
--   [insert_null_as_default](../../../operations/settings/settings.md#insert_null_as_default) setting.
--   [union_default_mode](../../../operations/settings/settings.md#union-default-mode) setting.
+- [insert_null_as_default](../../../operations/settings/settings.md#insert_null_as_default) setting.
+- [union_default_mode](../../../operations/settings/settings.md#union-default-mode) setting.
 
 
 [Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/union/) <!-- hide -->
diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index 18b019dd017..21c0010498a 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -6,13 +6,22 @@ sidebar_label: SHOW
 
 # SHOW Statements
 
-## SHOW CREATE TABLE
+N.B. `SHOW CREATE (TABLE|DATABASE|USER)` hides secrets unless
+[`display_secrets_in_show_and_select` server setting](../../operations/server-configuration-parameters/settings#display_secrets_in_show_and_select)
+is turned on,
+[`format_display_secrets_in_show_and_select` format setting](../../operations/settings/formats#format_display_secrets_in_show_and_select)
+is turned on and user has
+[`displaySecretsInShowAndSelect`](grant.md#grant-display-secrets) privilege.
+
+## SHOW CREATE TABLE | DICTIONARY | VIEW | DATABASE
 
 ``` sql
-SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY|VIEW] [db.]table|view [INTO OUTFILE filename] [FORMAT format]
+SHOW [CREATE] [TEMPORARY] TABLE|DICTIONARY|VIEW|DATABASE [db.]table|view [INTO OUTFILE filename] [FORMAT format]
 ```
 
-Returns a single `String`-type ‘statement’ column, which contains a single value – the `CREATE` query used for creating the specified object.
+Returns a single column of type String containing the CREATE query used for creating the specified object.
+
+`SHOW TABLE t` and `SHOW DATABASE db` have the same meaning as `SHOW CREATE TABLE|DATABASE t|db`, but `SHOW t` and `SHOW db` are not supported.
 
 Note that if you use this statement to get `CREATE` query of system tables, you will get a *fake* query, which only declares table structure, but cannot be used to create table.
 
@@ -21,16 +30,16 @@ Note that if you use this statement to get `CREATE` query of system tables, you
 Prints a list of all databases.
 
 ```sql
-SHOW DATABASES [LIKE | ILIKE | NOT LIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE filename] [FORMAT format]
+SHOW DATABASES [[NOT] LIKE | ILIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE filename] [FORMAT format]
 ```
 
 This statement is identical to the query:
 
 ```sql
-SELECT name FROM system.databases [WHERE name LIKE | ILIKE | NOT LIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE filename] [FORMAT format]
+SELECT name FROM system.databases [WHERE name [NOT] LIKE | ILIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE filename] [FORMAT format]
 ```
 
-### Examples
+**Examples**
 
 Getting database names, containing the symbols sequence 'de' in their names:
 
@@ -92,32 +101,16 @@ Result:
 └────────────────────────────────┘
 ```
 
-### See Also
+**See also**
 
--   [CREATE DATABASE](https://clickhouse.com/docs/en/sql-reference/statements/create/database/#query-language-create-database)
-
-## SHOW PROCESSLIST
-
-``` sql
-SHOW PROCESSLIST [INTO OUTFILE filename] [FORMAT format]
-```
-
-Outputs the content of the [system.processes](../../operations/system-tables/processes.md#system_tables-processes) table, that contains a list of queries that is being processed at the moment, excepting `SHOW PROCESSLIST` queries.
-
-The `SELECT * FROM system.processes` query returns data about all the current queries.
-
-Tip (execute in the console):
-
-``` bash
-$ watch -n1 "clickhouse-client --query='SHOW PROCESSLIST'"
-```
+- [CREATE DATABASE](https://clickhouse.com/docs/en/sql-reference/statements/create/database/#query-language-create-database)
 
 ## SHOW TABLES
 
 Displays a list of tables.
 
 ```sql
-SHOW [TEMPORARY] TABLES [{FROM | IN} <db>] [LIKE | ILIKE | NOT LIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
+SHOW [FULL] [TEMPORARY] TABLES [{FROM | IN} <db>] [[NOT] LIKE | ILIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
 ```
 
 If the `FROM` clause is not specified, the query returns the list of tables from the current database.
@@ -125,10 +118,10 @@ If the `FROM` clause is not specified, the query returns the list of tables from
 This statement is identical to the query:
 
 ```sql
-SELECT name FROM system.tables [WHERE name LIKE | ILIKE | NOT LIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
+SELECT name FROM system.tables [WHERE name [NOT] LIKE | ILIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
 ```
 
-### Examples
+**Examples**
 
 Getting table names, containing the symbols sequence 'user' in their names:
 
@@ -191,14 +184,62 @@ Result:
 └────────────────────────────────┘
 ```
 
-### See Also
+**See also**
 
--   [Create Tables](https://clickhouse.com/docs/en/getting-started/tutorial/#create-tables)
--   [SHOW CREATE TABLE](https://clickhouse.com/docs/en/sql-reference/statements/show/#show-create-table)
+- [Create Tables](https://clickhouse.com/docs/en/getting-started/tutorial/#create-tables)
+- [SHOW CREATE TABLE](https://clickhouse.com/docs/en/sql-reference/statements/show/#show-create-table)
+
+## SHOW COLUMNS
+
+Displays a list of columns
+
+```sql
+SHOW [EXTENDED] [FULL] COLUMNS {FROM | IN} <table> [{FROM | IN} <db>] [{[NOT] {LIKE | ILIKE} '<pattern>' | WHERE <expr>}] [LIMIT <N>] [INTO
+OUTFILE <filename>] [FORMAT <format>]
+```
+
+The database and table name can be specified in abbreviated form as `<db>.<table>`, i.e. `FROM tab FROM db` and `FROM db.tab` are
+equivalent. If no database is specified, the query returns the list of columns from the current database.
+
+The optional keyword `EXTENDED` currently has no effect, it only exists for MySQL compatibility.
+
+The optional keyword `FULL` causes the output to include the collation, comment and privilege columns.
+
+`SHOW COLUMNS` produces a result table with the following structure:
+- field - The name of the column (String)
+- type - The column data type (String)
+- null - If the column data type is Nullable (UInt8)
+- key - `PRI` if the column is part of the primary key, `SOR` if the column is part of the sorting key, empty otherwise (String)
+- default - Default expression of the column if it is of type `ALIAS`, `DEFAULT`, or `MATERIALIZED`, otherwise `NULL`. (Nullable(String))
+- extra - Additional information, currently unused (String)
+- collation - (only if `FULL` keyword was specified) Collation of the column, always `NULL` because ClickHouse has no per-column collations (Nullable(String))
+- comment - (only if `FULL` keyword was specified) Comment on the column (String)
+- privilege - (only if `FULL` keyword was specified) The privilege you have on this column, currently not available (String)
+
+**Examples**
+
+Getting information about all columns in table 'order' starting with 'delivery_':
+
+```sql
+SHOW COLUMNS FROM 'orders' LIKE 'delivery_%'
+```
+
+Result:
+
+``` text
+┌─field───────────┬─type─────┬─null─┬─key─────┬─default─┬─extra─┐
+│ delivery_date   │ DateTime │    0 │ PRI SOR │ ᴺᵁᴸᴸ    │       │
+│ delivery_status │ Bool     │    0 │         │ ᴺᵁᴸᴸ    │       │
+└─────────────────┴──────────┴──────┴─────────┴─────────┴───────┘
+```
+
+**See also**
+
+- [system.columns](https://clickhouse.com/docs/en/operations/system-tables/columns)
 
 ## SHOW DICTIONARIES
 
-Displays a list of [Dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
+Displays a list of [Dictionaries](../../sql-reference/dictionaries/index.md).
 
 ``` sql
 SHOW DICTIONARIES [FROM <db>] [LIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
@@ -212,7 +253,7 @@ You can get the same results as the `SHOW DICTIONARIES` query in the following w
 SELECT name FROM system.dictionaries WHERE database = <db> [AND name LIKE <pattern>] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
 ```
 
-**Example**
+**Examples**
 
 The following query selects the first two rows from the list of tables in the `system` database, whose names contain `reg`.
 
@@ -227,11 +268,82 @@ SHOW DICTIONARIES FROM db LIKE '%reg%' LIMIT 2
 └──────────────┘
 ```
 
+## SHOW INDEX
+
+Displays a list of primary and data skipping indexes of a table.
+
+```sql
+SHOW [EXTENDED] {INDEX | INDEXES | KEYS } {FROM | IN} <table> [{FROM | IN} <db>] [WHERE <expr>] [INTO OUTFILE <filename>] [FORMAT <format>]
+```
+
+The database and table name can be specified in abbreviated form as `<db>.<table>`, i.e. `FROM tab FROM db` and `FROM db.tab` are
+equivalent. If no database is specified, the query assumes the current database as database.
+
+The optional keyword `EXTENDED` currently has no effect, it only exists for MySQL compatibility.
+
+`SHOW INDEX` produces a result table with the following structure:
+- table - The name of the table (String)
+- non_unique - 0 if the index can contain duplicates, 1 otherwise (UInt8)
+- key_name - The name of the index, `PRIMARY` if the index is a primary key index (String)
+- seq_in_index - Currently unused
+- column_name - Currently unused
+- collation - The sorting of the column in the index, `A` if ascending, `D` if descending, `NULL` if unsorted (Nullable(String))
+- cardinality - Currently unused
+- sub_part - Currently unused
+- packed - Currently unused
+- null - Currently unused
+- index_type - The index type, e.g. `primary`, `minmax`, `bloom_filter` etc. (String)
+- comment - Currently unused
+- index_comment - Currently unused
+- visible - If the index is visible to the optimizer, always `YES` (String)
+- expression - The index expression (String)
+
+**Examples**
+
+Getting information about all indexes in table 'tbl'
+
+```sql
+SHOW INDEX FROM 'tbl'
+```
+
+Result:
+
+``` text
+┌─table─┬─non_unique─┬─key_name─┬─seq_in_index─┬─column_name─┬─collation─┬─cardinality─┬─sub_part─┬─packed─┬─null─┬─index_type───┬─comment─┬─index_comment─┬─visible─┬─expression─┐
+│ tbl   │          0 │ blf_idx  │ ᴺᵁᴸᴸ         │ ᴺᵁᴸᴸ        │ ᴺᵁᴸᴸ      │ ᴺᵁᴸᴸ        │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ   │ ᴺᵁᴸᴸ │ bloom_filter │ ᴺᵁᴸᴸ    │ ᴺᵁᴸᴸ          │ YES     │ d, b       │
+│ tbl   │          0 │ mm1_idx  │ ᴺᵁᴸᴸ         │ ᴺᵁᴸᴸ        │ ᴺᵁᴸᴸ      │ ᴺᵁᴸᴸ        │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ   │ ᴺᵁᴸᴸ │ minmax       │ ᴺᵁᴸᴸ    │ ᴺᵁᴸᴸ          │ YES     │ a, c, d    │
+│ tbl   │          0 │ mm2_idx  │ ᴺᵁᴸᴸ         │ ᴺᵁᴸᴸ        │ ᴺᵁᴸᴸ      │ ᴺᵁᴸᴸ        │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ   │ ᴺᵁᴸᴸ │ minmax       │ ᴺᵁᴸᴸ    │ ᴺᵁᴸᴸ          │ YES     │ c, d, e    │
+│ tbl   │          0 │ PRIMARY  │ ᴺᵁᴸᴸ         │ ᴺᵁᴸᴸ        │ A         │ ᴺᵁᴸᴸ        │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ   │ ᴺᵁᴸᴸ │ primary      │ ᴺᵁᴸᴸ    │ ᴺᵁᴸᴸ          │ YES     │ c, a       │
+│ tbl   │          0 │ set_idx  │ ᴺᵁᴸᴸ         │ ᴺᵁᴸᴸ        │ ᴺᵁᴸᴸ      │ ᴺᵁᴸᴸ        │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ   │ ᴺᵁᴸᴸ │ set          │ ᴺᵁᴸᴸ    │ ᴺᵁᴸᴸ          │ YES     │ e          │
+└───────┴────────────┴──────────┴──────────────┴─────────────┴───────────┴─────────────┴──────────┴────────┴──────┴──────────────┴─────────┴───────────────┴─────────┴────────────┘
+```
+
+**See also**
+
+- [system.tables](../../operations/system-tables/tables.md)
+- [system.data_skipping_indices](../../operations/system-tables/data_skipping_indices.md)
+
+## SHOW PROCESSLIST
+
+``` sql
+SHOW PROCESSLIST [INTO OUTFILE filename] [FORMAT format]
+```
+
+Outputs the content of the [system.processes](../../operations/system-tables/processes.md#system_tables-processes) table, that contains a list of queries that is being processed at the moment, excepting `SHOW PROCESSLIST` queries.
+
+The `SELECT * FROM system.processes` query returns data about all the current queries.
+
+Tip (execute in the console):
+
+``` bash
+$ watch -n1 "clickhouse-client --query='SHOW PROCESSLIST'"
+```
+
 ## SHOW GRANTS
 
 Shows privileges for a user.
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW GRANTS [FOR user1 [, user2 ...]]
@@ -243,9 +355,7 @@ If user is not specified, the query returns privileges for the current user.
 
 Shows parameters that were used at a [user creation](../../sql-reference/statements/create/user.md).
 
-`SHOW CREATE USER` does not output user passwords.
-
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW CREATE USER [name1 [, name2 ...] | CURRENT_USER]
@@ -255,7 +365,7 @@ SHOW CREATE USER [name1 [, name2 ...] | CURRENT_USER]
 
 Shows parameters that were used at a [role creation](../../sql-reference/statements/create/role.md).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW CREATE ROLE name1 [, name2 ...]
@@ -265,7 +375,7 @@ SHOW CREATE ROLE name1 [, name2 ...]
 
 Shows parameters that were used at a [row policy creation](../../sql-reference/statements/create/row-policy.md).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW CREATE [ROW] POLICY name ON [database1.]table1 [, [database2.]table2 ...]
@@ -275,7 +385,7 @@ SHOW CREATE [ROW] POLICY name ON [database1.]table1 [, [database2.]table2 ...]
 
 Shows parameters that were used at a [quota creation](../../sql-reference/statements/create/quota.md).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW CREATE QUOTA [name1 [, name2 ...] | CURRENT]
@@ -285,7 +395,7 @@ SHOW CREATE QUOTA [name1 [, name2 ...] | CURRENT]
 
 Shows parameters that were used at a [settings profile creation](../../sql-reference/statements/create/settings-profile.md).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW CREATE [SETTINGS] PROFILE name1 [, name2 ...]
@@ -293,9 +403,9 @@ SHOW CREATE [SETTINGS] PROFILE name1 [, name2 ...]
 
 ## SHOW USERS
 
-Returns a list of [user account](../../operations/access-rights.md#user-account-management) names. To view user accounts parameters, see the system table [system.users](../../operations/system-tables/users.md#system_tables-users).
+Returns a list of [user account](../../guides/sre/user-management/index.md#user-account-management) names. To view user accounts parameters, see the system table [system.users](../../operations/system-tables/users.md#system_tables-users).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW USERS
@@ -303,18 +413,18 @@ SHOW USERS
 
 ## SHOW ROLES
 
-Returns a list of [roles](../../operations/access-rights.md#role-management). To view another parameters, see system tables [system.roles](../../operations/system-tables/roles.md#system_tables-roles) and [system.role_grants](../../operations/system-tables/role-grants.md#system_tables-role_grants).
+Returns a list of [roles](../../guides/sre/user-management/index.md#role-management). To view another parameters, see system tables [system.roles](../../operations/system-tables/roles.md#system_tables-roles) and [system.role_grants](../../operations/system-tables/role-grants.md#system_tables-role_grants).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW [CURRENT|ENABLED] ROLES
 ```
 ## SHOW PROFILES
 
-Returns a list of [setting profiles](../../operations/access-rights.md#settings-profiles-management). To view user accounts parameters, see the system table [settings_profiles](../../operations/system-tables/settings_profiles.md#system_tables-settings_profiles).
+Returns a list of [setting profiles](../../guides/sre/user-management/index.md#settings-profiles-management). To view user accounts parameters, see the system table [settings_profiles](../../operations/system-tables/settings_profiles.md#system_tables-settings_profiles).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW [SETTINGS] PROFILES
@@ -322,9 +432,9 @@ SHOW [SETTINGS] PROFILES
 
 ## SHOW POLICIES
 
-Returns a list of [row policies](../../operations/access-rights.md#row-policy-management) for the specified table. To view user accounts parameters, see the system table [system.row_policies](../../operations/system-tables/row_policies.md#system_tables-row_policies).
+Returns a list of [row policies](../../guides/sre/user-management/index.md#row-policy-management) for the specified table. To view user accounts parameters, see the system table [system.row_policies](../../operations/system-tables/row_policies.md#system_tables-row_policies).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW [ROW] POLICIES [ON [db.]table]
@@ -332,9 +442,9 @@ SHOW [ROW] POLICIES [ON [db.]table]
 
 ## SHOW QUOTAS
 
-Returns a list of [quotas](../../operations/access-rights.md#quotas-management). To view quotas parameters, see the system table [system.quotas](../../operations/system-tables/quotas.md#system_tables-quotas).
+Returns a list of [quotas](../../guides/sre/user-management/index.md#quotas-management). To view quotas parameters, see the system table [system.quotas](../../operations/system-tables/quotas.md#system_tables-quotas).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW QUOTAS
@@ -344,16 +454,16 @@ SHOW QUOTAS
 
 Returns a [quota](../../operations/quotas.md) consumption for all users or for current user. To view another parameters, see system tables [system.quotas_usage](../../operations/system-tables/quotas_usage.md#system_tables-quotas_usage) and [system.quota_usage](../../operations/system-tables/quota_usage.md#system_tables-quota_usage).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW [CURRENT] QUOTA
 ```
 ## SHOW ACCESS
 
-Shows all [users](../../operations/access-rights.md#user-account-management), [roles](../../operations/access-rights.md#role-management), [profiles](../../operations/access-rights.md#settings-profiles-management), etc. and all their [grants](../../sql-reference/statements/grant.md#grant-privileges).
+Shows all [users](../../guides/sre/user-management/index.md#user-account-management), [roles](../../guides/sre/user-management/index.md#role-management), [profiles](../../guides/sre/user-management/index.md#settings-profiles-management), etc. and all their [grants](../../sql-reference/statements/grant.md#grant-privileges).
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW ACCESS
@@ -366,13 +476,14 @@ Returns a list of clusters. All available clusters are listed in the [system.clu
 `SHOW CLUSTER name` query displays the contents of system.clusters table for this cluster.
 :::
 
-### Syntax
+**Syntax**
 
 ``` sql
 SHOW CLUSTER '<name>'
-SHOW CLUSTERS [LIKE|NOT LIKE '<pattern>'] [LIMIT <N>]
+SHOW CLUSTERS [[NOT] LIKE|ILIKE '<pattern>'] [LIMIT <N>]
 ```
-### Examples
+
+**Examples**
 
 Query:
 
@@ -509,7 +620,7 @@ Result:
 
 **See Also**
 
--   [system.settings](../../operations/system-tables/settings.md) table
+- [system.settings](../../operations/system-tables/settings.md) table
 
 ## SHOW ENGINES
 
@@ -521,4 +632,4 @@ Outputs the content of the [system.table_engines](../../operations/system-tables
 
 **See Also**
 
--   [system.table_engines](../../operations/system-tables/table_engines.md) table
\ No newline at end of file
+- [system.table_engines](../../operations/system-tables/table_engines.md) table
diff --git a/docs/en/sql-reference/statements/system.md b/docs/en/sql-reference/statements/system.md
index f9f55acfcec..c5596b7ba5f 100644
--- a/docs/en/sql-reference/statements/system.md
+++ b/docs/en/sql-reference/statements/system.md
@@ -8,7 +8,7 @@ sidebar_label: SYSTEM
 
 ## RELOAD EMBEDDED DICTIONARIES
 
-Reload all [Internal dictionaries](../../sql-reference/dictionaries/internal-dicts.md).
+Reload all [Internal dictionaries](../../sql-reference/dictionaries/index.md).
 By default, internal dictionaries are disabled.
 Always returns `Ok.` regardless of the result of the internal dictionary update.
 
@@ -76,7 +76,7 @@ Resets the mark cache.
 
 ## DROP REPLICA
 
-Dead replicas can be dropped using following syntax:
+Dead replicas of `ReplicatedMergeTree` tables can be dropped using following syntax:
 
 ``` sql
 SYSTEM DROP REPLICA 'replica_name' FROM TABLE database.table;
@@ -85,13 +85,25 @@ SYSTEM DROP REPLICA 'replica_name';
 SYSTEM DROP REPLICA 'replica_name' FROM ZKPATH '/path/to/table/in/zk';
 ```
 
-Queries will remove the replica path in ZooKeeper. It is useful when the replica is dead and its metadata cannot be removed from ZooKeeper by `DROP TABLE` because there is no such table anymore. It will only drop the inactive/stale replica, and it cannot drop local replica, please use `DROP TABLE` for that. `DROP REPLICA` does not drop any tables and does not remove any data or metadata from disk.
+Queries will remove the `ReplicatedMergeTree` replica path in ZooKeeper. It is useful when the replica is dead and its metadata cannot be removed from ZooKeeper by `DROP TABLE` because there is no such table anymore. It will only drop the inactive/stale replica, and it cannot drop local replica, please use `DROP TABLE` for that. `DROP REPLICA` does not drop any tables and does not remove any data or metadata from disk.
 
 The first one removes metadata of `'replica_name'` replica of `database.table` table.
 The second one does the same for all replicated tables in the database.
 The third one does the same for all replicated tables on the local server.
 The fourth one is useful to remove metadata of dead replica when all other replicas of a table were dropped. It requires the table path to be specified explicitly. It must be the same path as was passed to the first argument of `ReplicatedMergeTree` engine on table creation.
 
+## DROP DATABASE REPLICA
+
+Dead replicas of `Replicated` databases can be dropped using following syntax:
+
+``` sql
+SYSTEM DROP DATABASE REPLICA 'replica_name' [FROM SHARD 'shard_name'] FROM DATABASE database;
+SYSTEM DROP DATABASE REPLICA 'replica_name' [FROM SHARD 'shard_name'];
+SYSTEM DROP DATABASE REPLICA 'replica_name' [FROM SHARD 'shard_name'] FROM ZKPATH '/path/to/table/in/zk';
+```
+
+Similar to `SYSTEM DROP REPLICA`, but removes the `Replicated` database replica path from ZooKeeper when there's no database to run `DROP DATABASE`. Please note that it does not remove `ReplicatedMergeTree` replicas (so you may need `SYSTEM DROP REPLICA` as well). Shard and replica names are the names that were specified in `Replicated` engine arguments when creating the database. Also, these names can be obtained from `database_shard_name` and `database_replica_name` columns in `system.clusters`. If the `FROM SHARD` clause is missing, then `replica_name` must be a full replica name in `shard_name|replica_name` format.
+
 ## DROP UNCOMPRESSED CACHE
 
 Reset the uncompressed data cache.
@@ -114,11 +126,11 @@ This will also create system tables even if message queue is empty.
 
 ## RELOAD CONFIG
 
-Reloads ClickHouse configuration. Used when configuration is stored in ZooKeeper.
+Reloads ClickHouse configuration. Used when configuration is stored in ZooKeeper. Note that `SYSTEM RELOAD CONFIG` does not reload `USER` configuration stored in ZooKeeper, it only reloads `USER` configuration that is stored in `users.xml`.  To reload all `USER` config use `SYSTEM RELOAD USERS`
 
 ## RELOAD USERS
 
-Reloads all access storages, including: users.xml, local disk access storage, replicated (in ZooKeeper) access storage. Note that `SYSTEM RELOAD CONFIG` will only reload users.xml access storage.
+Reloads all access storages, including: users.xml, local disk access storage, replicated (in ZooKeeper) access storage. 
 
 ## SHUTDOWN
 
@@ -224,6 +236,14 @@ Clears freezed backup with the specified name from all the disks. See more about
 SYSTEM UNFREEZE WITH NAME <backup_name>
 ```
 
+### WAIT LOADING PARTS
+
+Wait until all asynchronously loading data parts of a table (outdated data parts) will became loaded.
+
+``` sql
+SYSTEM WAIT LOADING PARTS [db.]merge_tree_family_table_name
+```
+
 ## Managing ReplicatedMergeTree Tables
 
 ClickHouse can manage background replication related processes in [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md#table_engines-replication) tables.
@@ -280,13 +300,17 @@ SYSTEM START REPLICATION QUEUES [[db.]replicated_merge_tree_family_table_name]
 
 ### SYNC REPLICA
 
-Wait until a `ReplicatedMergeTree` table will be synced with other replicas in a cluster. Will run until `receive_timeout` if fetches currently disabled for the table.
+Wait until a `ReplicatedMergeTree` table will be synced with other replicas in a cluster, but no more than `receive_timeout` seconds.
 
 ``` sql
-SYSTEM SYNC REPLICA [ON CLUSTER cluster_name] [db.]replicated_merge_tree_family_table_name
+SYSTEM SYNC REPLICA [ON CLUSTER cluster_name] [db.]replicated_merge_tree_family_table_name [STRICT | LIGHTWEIGHT | PULL]
 ```
 
-After running this statement the `[db.]replicated_merge_tree_family_table_name` fetches commands from the common replicated log into its own replication queue, and then the query waits till the replica processes all of the fetched commands.
+After running this statement the `[db.]replicated_merge_tree_family_table_name` fetches commands from the common replicated log into its own replication queue, and then the query waits till the replica processes all of the fetched commands. The following modifiers are supported:
+
+ - If a `STRICT` modifier was specified then the query waits for the replication queue to become empty. The `STRICT` version may never succeed if new entries constantly appear in the replication queue.
+ - If a `LIGHTWEIGHT` modifier was specified then the query waits only for `GET_PART`, `ATTACH_PART`, `DROP_RANGE`, `REPLACE_RANGE` and `DROP_PART` entries to be processed.
+ - If a `PULL` modifier was specified then the query pulls new replication queue entries from ZooKeeper, but does not wait for anything to be processed.
 
 ### RESTART REPLICA
 
@@ -312,7 +336,7 @@ One may execute query after:
 Replica attaches locally found parts and sends info about them to Zookeeper.
 Parts present on a replica before metadata loss are not re-fetched from other ones if not being outdated (so replica restoration does not mean re-downloading all data over the network).
 
-:::warning
+:::note
 Parts in all states are moved to `detached/` folder. Parts active before data loss (committed) are attached.
 :::
 
@@ -369,7 +393,7 @@ SYSTEM DROP FILESYSTEM CACHE
 It's too heavy and has potential for misuse.
 :::
 
-Will do sync syscall. 
+Will do sync syscall.
 
 ```sql
 SYSTEM SYNC FILE CACHE
diff --git a/docs/en/sql-reference/statements/undrop.md b/docs/en/sql-reference/statements/undrop.md
new file mode 100644
index 00000000000..40ac1ab4f99
--- /dev/null
+++ b/docs/en/sql-reference/statements/undrop.md
@@ -0,0 +1,99 @@
+---
+slug: /en/sql-reference/statements/undrop
+sidebar_label: UNDROP
+---
+
+# UNDROP TABLE
+
+Cancels the dropping of the table.
+
+Beginning with ClickHouse version 23.3 it is possible to UNDROP a table in an Atomic database
+within `database_atomic_delay_before_drop_table_sec` (8 minutes by default) of issuing the DROP TABLE statement.  Dropped tables are listed in 
+a system table called `system.dropped_tables`.
+
+If you have a materialized view without a `TO` clause associated with the dropped table, then you will also have to UNDROP the inner table of that view.
+
+:::note
+UNDROP TABLE is experimental.  To use it add this setting: 
+```sql
+set allow_experimental_undrop_table_query = 1;
+```
+:::
+
+:::tip
+Also see [DROP TABLE](/docs/en/sql-reference/statements/drop.md)
+:::
+
+Syntax:
+
+``` sql
+UNDROP TABLE [db.]name [UUID '<uuid>'] [ON CLUSTER cluster]
+```
+
+**Example**
+
+``` sql
+set allow_experimental_undrop_table_query = 1;
+```
+
+```sql
+CREATE TABLE undropMe
+(
+    `id` UInt8
+)
+ENGINE = MergeTree
+ORDER BY id
+```
+
+```sql
+DROP TABLE undropMe
+```
+```sql
+SELECT *
+FROM system.dropped_tables
+FORMAT Vertical
+```
+```response
+Row 1:
+──────
+index:                 0
+database:              default
+table:                 undropMe
+uuid:                  aa696a1a-1d70-4e60-a841-4c80827706cc
+engine:                MergeTree
+metadata_dropped_path: /var/lib/clickhouse/metadata_dropped/default.undropMe.aa696a1a-1d70-4e60-a841-4c80827706cc.sql
+table_dropped_time:    2023-04-05 14:12:12
+
+1 row in set. Elapsed: 0.001 sec. 
+```
+```sql
+UNDROP TABLE undropMe
+```
+```response
+Ok.
+```
+```sql
+SELECT *
+FROM system.dropped_tables
+FORMAT Vertical
+```
+```response
+Ok.
+
+0 rows in set. Elapsed: 0.001 sec. 
+```
+```sql
+DESCRIBE TABLE undropMe
+FORMAT Vertical
+```
+```response
+Row 1:
+──────
+name:               id
+type:               UInt8
+default_type:       
+default_expression: 
+comment:            
+codec_expression:   
+ttl_expression:     
+```
diff --git a/docs/en/sql-reference/statements/watch.md b/docs/en/sql-reference/statements/watch.md
index 90d19e6be0e..5230479cbd2 100644
--- a/docs/en/sql-reference/statements/watch.md
+++ b/docs/en/sql-reference/statements/watch.md
@@ -6,7 +6,7 @@ sidebar_label: WATCH
 
 # WATCH Statement (Experimental)
 
-:::warning    
+:::note    
 This is an experimental feature that may change in backwards-incompatible ways in the future releases. Enable live views and `WATCH` query using `set allow_experimental_live_view = 1`.
 :::
 
@@ -107,4 +107,4 @@ The `FORMAT` clause works the same way as for the [SELECT](../../sql-reference/s
 
 :::note    
 The [JSONEachRowWithProgress](../../interfaces/formats.md#jsoneachrowwithprogress) format should be used when watching [LIVE VIEW](./create/view.md#live-view) tables over the HTTP interface. The progress messages will be added to the output to keep the long-lived HTTP connection alive until the query result changes. The interval between progress messages is controlled using the [live_view_heartbeat_interval](./create/view.md#live-view-settings) setting.
-:::
\ No newline at end of file
+:::
diff --git a/docs/en/sql-reference/syntax.md b/docs/en/sql-reference/syntax.md
index 63c5042f9e8..f5651c2dcb6 100644
--- a/docs/en/sql-reference/syntax.md
+++ b/docs/en/sql-reference/syntax.md
@@ -14,7 +14,7 @@ The `INSERT` query uses both parsers:
 INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
 ```
 
-The `INSERT INTO t VALUES` fragment is parsed by the full parser, and the data `(1, 'Hello, world'), (2, 'abc'), (3, 'def')` is parsed by the fast stream parser. You can also turn on the full parser for the data by using the [input_format_values_interpret_expressions](../operations/settings/settings-formats.md#settings-input_format_values_interpret_expressions) setting. When `input_format_values_interpret_expressions = 1`, ClickHouse first tries to parse values with the fast stream parser. If it fails, ClickHouse tries to use the full parser for the data, treating it like an SQL [expression](#syntax-expressions).
+The `INSERT INTO t VALUES` fragment is parsed by the full parser, and the data `(1, 'Hello, world'), (2, 'abc'), (3, 'def')` is parsed by the fast stream parser. You can also turn on the full parser for the data by using the [input_format_values_interpret_expressions](../operations/settings/settings-formats.md#input_format_values_interpret_expressions) setting. When `input_format_values_interpret_expressions = 1`, ClickHouse first tries to parse values with the fast stream parser. If it fails, ClickHouse tries to use the full parser for the data, treating it like an SQL [expression](#expressions).
 
 Data can have any format. When a query is received, the server calculates no more than [max_query_size](../operations/settings/settings.md#settings-max_query_size) bytes of the request in RAM (by default, 1 MB), and the rest is stream parsed.
 It allows for avoiding issues with large `INSERT` queries.
@@ -31,30 +31,30 @@ There may be any number of space symbols between syntactical constructions (incl
 
 ClickHouse supports either SQL-style and C-style comments:
 
--   SQL-style comments start with `--`, `#!` or `# ` and continue to the end of the line, a space after `--` and `#!` can be omitted.
--   C-style are from `/*` to `*/`and can be multiline, spaces are not required either.
+- SQL-style comments start with `--`, `#!` or `# ` and continue to the end of the line, a space after `--` and `#!` can be omitted.
+- C-style are from `/*` to `*/`and can be multiline, spaces are not required either.
 
 ## Keywords
 
 Keywords are case-insensitive when they correspond to:
 
--   SQL standard. For example, `SELECT`, `select` and `SeLeCt` are all valid.
--   Implementation in some popular DBMS (MySQL or Postgres). For example, `DateTime` is the same as `datetime`.
+- SQL standard. For example, `SELECT`, `select` and `SeLeCt` are all valid.
+- Implementation in some popular DBMS (MySQL or Postgres). For example, `DateTime` is the same as `datetime`.
 
 You can check whether a data type name is case-sensitive in the [system.data_type_families](../operations/system-tables/data_type_families.md#system_tables-data_type_families) table.
 
 In contrast to standard SQL, all other keywords (including functions names) are **case-sensitive**.
 
-Keywords are not reserved; they are treated as such only in the corresponding context. If you use [identifiers](#syntax-identifiers) with the same name as the keywords, enclose them into double-quotes or backticks. For example, the query `SELECT "FROM" FROM table_name` is valid if the table `table_name` has column with the name `"FROM"`.
+Keywords are not reserved; they are treated as such only in the corresponding context. If you use [identifiers](#identifiers) with the same name as the keywords, enclose them into double-quotes or backticks. For example, the query `SELECT "FROM" FROM table_name` is valid if the table `table_name` has column with the name `"FROM"`.
 
 ## Identifiers
 
 Identifiers are:
 
--   Cluster, database, table, partition, and column names.
--   Functions.
--   Data types.
--   [Expression aliases](#syntax-expression_aliases).
+- Cluster, database, table, partition, and column names.
+- Functions.
+- Data types.
+- [Expression aliases](#expression_aliases).
 
 Identifiers can be quoted or non-quoted. The latter is preferred.
 
@@ -70,10 +70,10 @@ There are numeric, string, compound, and `NULL` literals.
 
 Numeric literal tries to be parsed:
 
--   First, as a 64-bit signed number, using the [strtoull](https://en.cppreference.com/w/cpp/string/byte/strtoul) function.
--   If unsuccessful, as a 64-bit unsigned number, using the [strtoll](https://en.cppreference.com/w/cpp/string/byte/strtol) function.
--   If unsuccessful, as a floating-point number using the [strtod](https://en.cppreference.com/w/cpp/string/byte/strtof) function.
--   Otherwise, it returns an error.
+- First, as a 64-bit signed number, using the [strtoull](https://en.cppreference.com/w/cpp/string/byte/strtoul) function.
+- If unsuccessful, as a 64-bit unsigned number, using the [strtoll](https://en.cppreference.com/w/cpp/string/byte/strtol) function.
+- If unsuccessful, as a floating-point number using the [strtod](https://en.cppreference.com/w/cpp/string/byte/strtof) function.
+- Otherwise, it returns an error.
 
 Literal value has the smallest type that the value fits in.
 For example, 1 is parsed as `UInt8`, but 256 is parsed as `UInt16`. For more information, see [Data types](../sql-reference/data-types/index.md).
@@ -86,8 +86,8 @@ Examples: `1`, `10_000_000`, `0xffff_ffff`, `18446744073709551615`, `0xDEADBEEF`
 String literals must be enclosed in single quotes, double quotes are not supported.
 Escaping works either
 
--   using a preceding single quote where the single-quote character `'` (and only this character) can be escaped as `''`, or
--   using a preceding backslash with the following supported escape sequences: `\\`, `\'`, `\b`, `\f`, `\r`, `\n`, `\t`, `\0`, `\a`, `\v`, `\xHH`. The backslash loses its special meaning, i.e. will be interpreted literally, if it precedes characters different than the listed ones.
+- using a preceding single quote where the single-quote character `'` (and only this character) can be escaped as `''`, or
+- using a preceding backslash with the following supported escape sequences: `\\`, `\'`, `\b`, `\f`, `\r`, `\n`, `\t`, `\0`, `\a`, `\v`, `\xHH`. The backslash loses its special meaning, i.e. will be interpreted literally, if it precedes characters different than the listed ones.
 
 In string literals, you need to escape at least `'` and `\` using escape codes `\'` (or: `''`) and `\\`.
 
@@ -108,7 +108,7 @@ Depending on the data format (input or output), `NULL` may have a different repr
 
 There are many nuances to processing `NULL`. For example, if at least one of the arguments of a comparison operation is `NULL`, the result of this operation is also `NULL`. The same is true for multiplication, addition, and other operations. For more information, read the documentation for each operation.
 
-In queries, you can check `NULL` using the [IS NULL](../sql-reference/operators/index.md#operator-is-null) and [IS NOT NULL](../sql-reference/operators/index.md) operators and the related functions `isNull` and `isNotNull`.
+In queries, you can check `NULL` using the [IS NULL](../sql-reference/operators/index.md#is-null) and [IS NOT NULL](../sql-reference/operators/index.md#is-not-null) operators and the related functions `isNull` and `isNotNull`.
 
 ### Heredoc
 
@@ -149,7 +149,7 @@ For example, the following SQL defines parameters named `a`, `b`, `c` and `d` -
 SET param_a = 13;
 SET param_b = 'str';
 SET param_c = '2022-08-04 18:30:53';
-SET param_d = {'10': [11, 12], '13': [14, 15]}';
+SET param_d = {'10': [11, 12], '13': [14, 15]};
 
 SELECT
    {a: UInt32},
@@ -166,7 +166,7 @@ Result:
 
 If you are using `clickhouse-client`, the parameters are specified as `--param_name=value`. For example, the following parameter has the name `message` and it is retrieved as a `String`:
 
-```sql
+```bash
 clickhouse-client --param_message='hello' --query="SELECT {message: String}"
 ```
 
@@ -190,7 +190,7 @@ Query parameters are not general text substitutions which can be used in arbitra
 ## Functions
 
 Function calls are written like an identifier with a list of arguments (possibly empty) in round brackets. In contrast to standard SQL, the brackets are required, even for an empty argument list. Example: `now()`.
-There are regular and aggregate functions (see the section “Aggregate functions”). Some aggregate functions can contain two lists of arguments in brackets. Example: `quantile (0.9) (x)`. These aggregate functions are called “parametric” functions, and the arguments in the first list are called “parameters”. The syntax of aggregate functions without parameters is the same as for regular functions.
+There are regular and aggregate functions (see the section [Aggregate functions](/docs/en/sql-reference/aggregate-functions/index.md)). Some aggregate functions can contain two lists of arguments in brackets. Example: `quantile (0.9) (x)`. These aggregate functions are called “parametric” functions, and the arguments in the first list are called “parameters”. The syntax of aggregate functions without parameters is the same as for regular functions.
 
 ## Operators
 
@@ -199,7 +199,7 @@ For example, the expression `1 + 2 * 3 + 4` is transformed to `plus(plus(1, mult
 
 ## Data Types and Database Table Engines
 
-Data types and table engines in the `CREATE` query are written the same way as identifiers or functions. In other words, they may or may not contain an argument list in brackets. For more information, see the sections “Data types,” “Table engines,” and “CREATE”.
+Data types and table engines in the `CREATE` query are written the same way as identifiers or functions. In other words, they may or may not contain an argument list in brackets. For more information, see the sections [Data types](/docs/en/sql-reference/data-types/index.md), [Table engines](/docs/en/engines/table-engines/index.md), and [CREATE](/docs/en/sql-reference/statements/create/index.md).
 
 ## Expression Aliases
 
@@ -209,19 +209,19 @@ An alias is a user-defined name for expression in a query.
 expr AS alias
 ```
 
--   `AS` — The keyword for defining aliases. You can define the alias for a table name or a column name in a `SELECT` clause without using the `AS` keyword.
+- `AS` — The keyword for defining aliases. You can define the alias for a table name or a column name in a `SELECT` clause without using the `AS` keyword.
 
-        For example, `SELECT table_name_alias.column_name FROM table_name table_name_alias`.
+    For example, `SELECT table_name_alias.column_name FROM table_name table_name_alias`.
 
-        In the [CAST](./functions/type-conversion-functions.md#type_conversion_function-cast) function, the `AS` keyword has another meaning. See the description of the function.
+    In the [CAST](./functions/type-conversion-functions.md#castx-t) function, the `AS` keyword has another meaning. See the description of the function.
 
--   `expr` — Any expression supported by ClickHouse.
+- `expr` — Any expression supported by ClickHouse.
 
-        For example, `SELECT column_name * 2 AS double FROM some_table`.
+    For example, `SELECT column_name * 2 AS double FROM some_table`.
 
--   `alias` — Name for `expr`. Aliases should comply with the [identifiers](#syntax-identifiers) syntax.
+- `alias` — Name for `expr`. Aliases should comply with the [identifiers](#identifiers) syntax.
 
-        For example, `SELECT "table t".column_name FROM table_name AS "table t"`.
+    For example, `SELECT "table t".column_name FROM table_name AS "table t"`.
 
 ### Notes on Usage
 
@@ -254,11 +254,11 @@ Received exception from server (version 18.14.17):
 Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: Aggregate function sum(b) is found inside another aggregate function in query.
 ```
 
-In this example, we declared table `t` with column `b`. Then, when selecting data, we defined the `sum(b) AS b` alias. As aliases are global, ClickHouse substituted the literal `b` in the expression `argMax(a, b)` with the expression `sum(b)`. This substitution caused the exception. You can change this default behavior by setting [prefer_column_name_to_alias](../operations/settings/settings.md#prefer_column_name_to_alias) to `1`.
+In this example, we declared table `t` with column `b`. Then, when selecting data, we defined the `sum(b) AS b` alias. As aliases are global, ClickHouse substituted the literal `b` in the expression `argMax(a, b)` with the expression `sum(b)`. This substitution caused the exception. You can change this default behavior by setting [prefer_column_name_to_alias](../operations/settings/settings.md#prefer-column-name-to-alias) to `1`.
 
 ## Asterisk
 
-In a `SELECT` query, an asterisk can replace the expression. For more information, see the section “SELECT”.
+In a `SELECT` query, an asterisk can replace the expression. For more information, see the section [SELECT](/docs/en/sql-reference/statements/select/index.md#asterisk).
 
 ## Expressions
 
diff --git a/docs/en/sql-reference/table-functions/cluster.md b/docs/en/sql-reference/table-functions/cluster.md
index 4904553c39a..904c678750c 100644
--- a/docs/en/sql-reference/table-functions/cluster.md
+++ b/docs/en/sql-reference/table-functions/cluster.md
@@ -25,7 +25,7 @@ clusterAllReplicas('cluster_name', db, table[, sharding_key])
 
 - `cluster_name` – Name of a cluster that is used to build a set of addresses and connection parameters to remote and local servers. 
 - `db.table` or `db`, `table` - Name of a database and a table.  
-- `sharding_key` -  A sharding key. Optional. Needs to be specified if the cluster has more than one shard. 
+- `sharding_key` - A sharding key. Optional. Needs to be specified if the cluster has more than one shard. 
 
 **Returned value**
 
@@ -47,13 +47,13 @@ Using the `cluster` and `clusterAllReplicas` table functions are less efficient
 
 The `cluster` and `clusterAllReplicas` table functions can be useful in the following cases:
 
--   Accessing a specific cluster for data comparison, debugging, and testing.
--   Queries to various ClickHouse clusters and replicas for research purposes.
--   Infrequent distributed requests that are made manually.
+- Accessing a specific cluster for data comparison, debugging, and testing.
+- Queries to various ClickHouse clusters and replicas for research purposes.
+- Infrequent distributed requests that are made manually.
 
 Connection settings like `host`, `port`, `user`, `password`, `compression`, `secure` are taken from `<remote_servers>` config section. See details in [Distributed engine](../../engines/table-engines/special/distributed.md).
 
 **See Also**
 
--   [skip_unavailable_shards](../../operations/settings/settings.md#settings-skip_unavailable_shards)
--   [load_balancing](../../operations/settings/settings.md#settings-load_balancing)
+- [skip_unavailable_shards](../../operations/settings/settings.md#settings-skip_unavailable_shards)
+- [load_balancing](../../operations/settings/settings.md#settings-load_balancing)
diff --git a/docs/en/sql-reference/table-functions/dictionary.md b/docs/en/sql-reference/table-functions/dictionary.md
index 8a8cba8ff24..73d5039a64b 100644
--- a/docs/en/sql-reference/table-functions/dictionary.md
+++ b/docs/en/sql-reference/table-functions/dictionary.md
@@ -1,11 +1,11 @@
 ---
 slug: /en/sql-reference/table-functions/dictionary
 sidebar_position: 54
-sidebar_label: dictionary function
+sidebar_label: dictionary
 title: dictionary
 ---
 
-Displays the [dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) data as a ClickHouse table. Works the same way as [Dictionary](../../engines/table-engines/special/dictionary.md) engine.
+Displays the [dictionary](../../sql-reference/dictionaries/index.md) data as a ClickHouse table. Works the same way as [Dictionary](../../engines/table-engines/special/dictionary.md) engine.
 
 **Syntax**
 
@@ -15,7 +15,7 @@ dictionary('dict')
 
 **Arguments**
 
--   `dict` — A dictionary name. [String](../../sql-reference/data-types/string.md).
+- `dict` — A dictionary name. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -56,4 +56,4 @@ Result:
 
 **See Also**
 
--   [Dictionary engine](../../engines/table-engines/special/dictionary.md#dictionary)
+- [Dictionary engine](../../engines/table-engines/special/dictionary.md#dictionary)
diff --git a/docs/en/sql-reference/table-functions/executable.md b/docs/en/sql-reference/table-functions/executable.md
index 635188763cf..c6aba61aedb 100644
--- a/docs/en/sql-reference/table-functions/executable.md
+++ b/docs/en/sql-reference/table-functions/executable.md
@@ -20,7 +20,7 @@ A key advantage between ordinary UDF functions and the `executable` table functi
 The `executable` table function requires three parameters and accepts an optional list of input queries:
 
 ```sql
-executable(script_name, format, structure, [input_query...])
+executable(script_name, format, structure, [input_query...] [,SETTINGS ...])
 ```
 
 - `script_name`: the file name of the script. saved in the `user_scripts` folder (the default folder of the `user_scripts_path` setting)
@@ -83,9 +83,18 @@ The response looks like:
 └────┴────────────┘
 ```
 
+## Settings
+
+- `send_chunk_header` - controls whether to send row count before sending a chunk of data to process. Default value is `false`.
+- `pool_size` — Size of pool. If 0 is specified as `pool_size` then there is no pool size restrictions. Default value is `16`.
+- `max_command_execution_time` — Maximum executable script command execution time for processing block of data. Specified in seconds. Default value is 10.
+- `command_termination_timeout` — executable script should contain main read-write loop. After table function is destroyed, pipe is closed, and executable file will have `command_termination_timeout` seconds to shutdown, before ClickHouse will send SIGTERM signal to child process. Specified in seconds. Default value is 10.
+- `command_read_timeout` - timeout for reading data from command stdout in milliseconds. Default value 10000.
+- `command_write_timeout` - timeout for writing data to command stdin in milliseconds. Default value 10000.
+
 ## Passing Query Results to a Script
 
-Be sure to check out the example in the `Executable` table engine on [how to pass query results to a script](../../engines/table-engines/special/executable#passing-query-results-to-a-script). Here is how you execute the same script in that example using the `executable` table function:
+Be sure to check out the example in the `Executable` table engine on [how to pass query results to a script](../../engines/table-engines/special/executable.md#passing-query-results-to-a-script). Here is how you execute the same script in that example using the `executable` table function:
 
 ```sql
 SELECT * FROM executable(
@@ -94,4 +103,4 @@ SELECT * FROM executable(
     'id UInt64, sentiment Float32',
     (SELECT id, comment FROM hackernews WHERE id > 0 AND comment != '' LIMIT 20)
 );
-```
\ No newline at end of file
+```
diff --git a/docs/en/sql-reference/table-functions/file.md b/docs/en/sql-reference/table-functions/file.md
index d2ef66dde73..28c2dc9f1f3 100644
--- a/docs/en/sql-reference/table-functions/file.md
+++ b/docs/en/sql-reference/table-functions/file.md
@@ -6,27 +6,73 @@ sidebar_label: file
 
 # file
 
-Creates a table from a file. This table function is similar to [url](../../sql-reference/table-functions/url.md) and [hdfs](../../sql-reference/table-functions/hdfs.md) ones.
+Provides a table-like interface to SELECT from and INSERT to files. This table function is similar to the [s3](/docs/en/sql-reference/table-functions/url.md) table function.  Use file() when working with local files, and s3() when working with buckets in S3, GCS, or MinIO.
 
-`file` function can be used in `SELECT` and `INSERT` queries on data in [File](../../engines/table-engines/special/file.md) tables.
+The `file` function can be used in `SELECT` and `INSERT` queries to read from or write to files.
 
 **Syntax**
 
 ``` sql
-file(path [,format] [,structure])
+file(path [,format] [,structure] [,compression])
 ```
 
 **Parameters**
 
--   `path` — The relative path to the file from [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Path to file support following globs in read-only mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc', 'def'` — strings.
--   `format` — The [format](../../interfaces/formats.md#formats) of the file.
--   `structure` — Structure of the table. Format: `'column1_name column1_type, column2_name column2_type, ...'`.
+- `path` — The relative path to the file from [user_files_path](/docs/en/operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Path to file support following globs in read-only mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc', 'def'` — strings.
+- `format` — The [format](/docs/en/interfaces/formats.md#formats) of the file.
+- `structure` — Structure of the table. Format: `'column1_name column1_type, column2_name column2_type, ...'`.
+- `compression` — The existing compression type when used in a `SELECT` query, or the desired compression type when used in an `INSERT` query.  The supported compression types are `gz`, `br`, `xz`, `zst`, `lz4`, and `bz2`.
 
 **Returned value**
 
 A table with the specified structure for reading or writing data in the specified file.
 
-**Examples**
+## File Write Examples
+
+### Write to a TSV file
+
+```sql
+INSERT INTO TABLE FUNCTION
+file('test.tsv', 'TSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
+VALUES (1, 2, 3), (3, 2, 1), (1, 3, 2)
+```
+
+As a result, the data is written into the file `test.tsv`:
+
+```bash
+# cat /var/lib/clickhouse/user_files/test.tsv 
+1	2	3
+3	2	1
+1	3	2
+```
+
+### Partitioned Write to multiple TSV files
+
+If you specify `PARTITION BY` expression when inserting data into a file() function, a separate file is created for each partition value. Splitting the data into separate files helps to improve reading operations efficiency.
+
+```sql
+INSERT INTO TABLE FUNCTION
+file('test_{_partition_id}.tsv', 'TSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
+PARTITION BY column3
+VALUES (1, 2, 3), (3, 2, 1), (1, 3, 2)
+```
+
+As a result, the data is written into three files: `test_1.tsv`, `test_2.tsv`, and `test_3.tsv`.
+
+```bash
+# cat /var/lib/clickhouse/user_files/test_1.tsv
+3	2	1
+
+# cat /var/lib/clickhouse/user_files/test_2.tsv
+1	3	2
+
+# cat /var/lib/clickhouse/user_files/test_3.tsv
+1	2	3
+```
+
+## File Read Examples
+
+### SELECT from a CSV file
 
 Setting `user_files_path` and the contents of the file `test.csv`:
 
@@ -43,7 +89,9 @@ $ cat /var/lib/clickhouse/user_files/test.csv
 Getting data from a table in `test.csv` and selecting the first two rows from it:
 
 ``` sql
-SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 2;
+SELECT * FROM
+file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
+LIMIT 2;
 ```
 
 ``` text
@@ -53,17 +101,24 @@ SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 U
 └─────────┴─────────┴─────────┘
 ```
 
-Getting the first 10 lines of a table that contains 3 columns of [UInt32](../../sql-reference/data-types/int-uint.md) type from a CSV file:
+Getting the first 10 lines of a table that contains 3 columns of [UInt32](/docs/en/sql-reference/data-types/int-uint.md) type from a CSV file:
 
 ``` sql
-SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 10;
+SELECT * FROM
+file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
+LIMIT 10;
 ```
 
-Inserting data from a file into a table:
+### Inserting data from a file into a table:
 
 ``` sql
-INSERT INTO FUNCTION file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') VALUES (1, 2, 3), (3, 2, 1);
-SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32');
+INSERT INTO FUNCTION
+file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
+VALUES (1, 2, 3), (3, 2, 1);
+```
+```sql
+SELECT * FROM
+file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32');
 ```
 
 ``` text
@@ -77,11 +132,11 @@ SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 U
 
 Multiple path components can have globs. For being processed file must exist and match to the whole path pattern (not only suffix or prefix).
 
--   `*` — Substitutes any number of any characters except `/` including empty string.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
--   `**` - Fetches all files inside the folder recursively.
+- `*` — Substitutes any number of any characters except `/` including empty string.
+- `?` — Substitutes any single character.
+- `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
+- `{N..M}` — Substitutes any number in range from N to M including both borders.
+- `**` - Fetches all files inside the folder recursively.
 
 Constructions with `{}` are similar to the [remote](remote.md) table function.
 
@@ -89,12 +144,12 @@ Constructions with `{}` are similar to the [remote](remote.md) table function.
 
 Suppose we have several files with the following relative paths:
 
--   'some_dir/some_file_1'
--   'some_dir/some_file_2'
--   'some_dir/some_file_3'
--   'another_dir/some_file_1'
--   'another_dir/some_file_2'
--   'another_dir/some_file_3'
+- 'some_dir/some_file_1'
+- 'some_dir/some_file_2'
+- 'some_dir/some_file_3'
+- 'another_dir/some_file_1'
+- 'another_dir/some_file_2'
+- 'another_dir/some_file_3'
 
 Query the number of rows in these files:
 
@@ -108,7 +163,7 @@ Query the number of rows in all files of these two directories:
 SELECT count(*) FROM file('{some,another}_dir/*', 'TSV', 'name String, value UInt32');
 ```
 
-:::warning    
+:::note    
 If your listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 :::
 
@@ -138,9 +193,9 @@ SELECT count(*) FROM file('big_dir/**/file002', 'CSV', 'name String, value UInt3
 
 ## Virtual Columns
 
--   `_path` — Path to the file.
--   `_file` — Name of the file.
+- `_path` — Path to the file.
+- `_file` — Name of the file.
 
 **See Also**
 
--   [Virtual columns](../../engines/table-engines/index.md#table_engines-virtual_columns)
+- [Virtual columns](/docs/en/engines/table-engines/index.md#table_engines-virtual_columns)
diff --git a/docs/en/sql-reference/table-functions/format.md b/docs/en/sql-reference/table-functions/format.md
index 811eae12942..2813eef5bcf 100644
--- a/docs/en/sql-reference/table-functions/format.md
+++ b/docs/en/sql-reference/table-functions/format.md
@@ -16,9 +16,9 @@ format(format_name, [structure], data)
 
 **Parameters**
 
--   `format_name` — The [format](../../interfaces/formats.md#formats) of the data.
--   `structure` - Structure of the table. Optional. Format 'column1_name column1_type, column2_name column2_type, ...'.
--   `data` — String literal or constant expression that returns a string containing data in specified format
+- `format_name` — The [format](../../interfaces/formats.md#formats) of the data.
+- `structure` - Structure of the table. Optional. Format 'column1_name column1_type, column2_name column2_type, ...'.
+- `data` — String literal or constant expression that returns a string containing data in specified format
 
 **Returned value**
 
@@ -95,4 +95,4 @@ $$)
 
 **See Also**
 
--   [Formats](../../interfaces/formats.md)
+- [Formats](../../interfaces/formats.md)
diff --git a/docs/en/sql-reference/table-functions/gcs.md b/docs/en/sql-reference/table-functions/gcs.md
new file mode 100644
index 00000000000..bfa7f36fa48
--- /dev/null
+++ b/docs/en/sql-reference/table-functions/gcs.md
@@ -0,0 +1,184 @@
+---
+slug: /en/sql-reference/table-functions/gcs
+sidebar_position: 45
+sidebar_label: s3
+keywords: [gcs, bucket]
+---
+
+# gcs Table Function
+
+Provides a table-like interface to select/insert files in [Google Cloud Storage](https://cloud.google.com/storage/).
+
+**Syntax**
+
+``` sql
+gcs(path [,hmac_key, hmac_secret] [,format] [,structure] [,compression])
+```
+
+:::tip GCS
+The GCS Table Function integrates with Google Cloud Storage by using the GCS XML API and HMAC keys. See the [Google interoperability docs]( https://cloud.google.com/storage/docs/interoperability) for more details about the endpoint and HMAC. 
+
+:::
+
+**Arguments**
+
+-   `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings.
+
+  :::note GCS
+  The GCS path is in this format as the endpoint for the Google XML API is different than the JSON API:
+  ```
+  https://storage.googleapis.com/<bucket>/<folder>/<filename(s)>
+  ```
+  and not ~~https://storage.cloud.google.com~~.
+  :::
+
+-   `format` — The [format](../../interfaces/formats.md#formats) of the file.
+-   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
+-   `compression` — Parameter is optional. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. By default, it will autodetect compression by file extension.
+
+**Returned value**
+
+A table with the specified structure for reading or writing data in the specified file.
+
+**Examples**
+
+Selecting the first two rows from the table from GCS file `https://storage.googleapis.com/my-test-bucket-768/data.csv`:
+
+``` sql
+SELECT *
+FROM gcs('https://storage.googleapis.com/my-test-bucket-768/data.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
+LIMIT 2;
+```
+
+``` text
+┌─column1─┬─column2─┬─column3─┐
+│       1 │       2 │       3 │
+│       3 │       2 │       1 │
+└─────────┴─────────┴─────────┘
+```
+
+The similar but from file with `gzip` compression:
+
+``` sql
+SELECT *
+FROM gcs('https://storage.googleapis.com/my-test-bucket-768/data.csv.gz', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32', 'gzip')
+LIMIT 2;
+```
+
+``` text
+┌─column1─┬─column2─┬─column3─┐
+│       1 │       2 │       3 │
+│       3 │       2 │       1 │
+└─────────┴─────────┴─────────┘
+```
+
+## Usage
+
+Suppose that we have several files with following URIs on GCS:
+
+-   'https://storage.googleapis.com/my-test-bucket-768/some_prefix/some_file_1.csv'
+-   'https://storage.googleapis.com/my-test-bucket-768/some_prefix/some_file_2.csv'
+-   'https://storage.googleapis.com/my-test-bucket-768/some_prefix/some_file_3.csv'
+-   'https://storage.googleapis.com/my-test-bucket-768/some_prefix/some_file_4.csv'
+-   'https://storage.googleapis.com/my-test-bucket-768/another_prefix/some_file_1.csv'
+-   'https://storage.googleapis.com/my-test-bucket-768/another_prefix/some_file_2.csv'
+-   'https://storage.googleapis.com/my-test-bucket-768/another_prefix/some_file_3.csv'
+-   'https://storage.googleapis.com/my-test-bucket-768/another_prefix/some_file_4.csv'
+
+Count the amount of rows in files ending with numbers from 1 to 3:
+
+``` sql
+SELECT count(*)
+FROM gcs('https://storage.googleapis.com/my-test-bucket-768/{some,another}_prefix/some_file_{1..3}.csv', 'CSV', 'name String, value UInt32')
+```
+
+``` text
+┌─count()─┐
+│      18 │
+└─────────┘
+```
+
+Count the total amount of rows in all files in these two directories:
+
+``` sql
+SELECT count(*)
+FROM gcs('https://storage.googleapis.com/my-test-bucket-768/{some,another}_prefix/*', 'CSV', 'name String, value UInt32')
+```
+
+``` text
+┌─count()─┐
+│      24 │
+└─────────┘
+```
+
+:::warning
+If your listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
+:::
+
+Count the total amount of rows in files named `file-000.csv`, `file-001.csv`, … , `file-999.csv`:
+
+``` sql
+SELECT count(*)
+FROM gcs('https://storage.googleapis.com/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV', 'name String, value UInt32');
+```
+
+``` text
+┌─count()─┐
+│      12 │
+└─────────┘
+```
+
+Insert data into file `test-data.csv.gz`:
+
+``` sql
+INSERT INTO FUNCTION gcs('https://storage.googleapis.com/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip')
+VALUES ('test-data', 1), ('test-data-2', 2);
+```
+
+Insert data into file `test-data.csv.gz` from existing table:
+
+``` sql
+INSERT INTO FUNCTION gcs('https://storage.googleapis.com/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip')
+SELECT name, value FROM existing_table;
+```
+
+Glob ** can be used for recursive directory traversal. Consider the below example, it will fetch all files from `my-test-bucket-768` directory recursively:
+
+``` sql
+SELECT * FROM gcs('https://storage.googleapis.com/my-test-bucket-768/**', 'CSV', 'name String, value UInt32', 'gzip');
+```
+
+The below get data from all `test-data.csv.gz` files from any folder inside `my-test-bucket` directory recursively:
+
+``` sql
+SELECT * FROM gcs('https://storage.googleapis.com/my-test-bucket-768/**/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip');
+```
+
+## Partitioned Write
+
+If you specify `PARTITION BY` expression when inserting data into `GCS` table, a separate file is created for each partition value. Splitting the data into separate files helps to improve reading operations efficiency.
+
+**Examples**
+
+1. Using partition ID in a key creates separate files:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    gcs('http://bucket.amazonaws.com/my_bucket/file_{_partition_id}.csv', 'CSV', 'a String, b UInt32, c UInt32')
+    PARTITION BY a VALUES ('x', 2, 3), ('x', 4, 5), ('y', 11, 12), ('y', 13, 14), ('z', 21, 22), ('z', 23, 24);
+```
+As a result, the data is written into three files: `file_x.csv`, `file_y.csv`, and `file_z.csv`.
+
+2. Using partition ID in a bucket name creates files in different buckets:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    gcs('http://bucket.amazonaws.com/my_bucket_{_partition_id}/file.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24);
+```
+As a result, the data is written into three files in different buckets: `my_bucket_1/file.csv`, `my_bucket_10/file.csv`, and `my_bucket_20/file.csv`.
+
+**See Also**
+
+-   [S3 table function](s3.md)
+-   [S3 engine](../../engines/table-engines/integrations/s3.md)
diff --git a/docs/en/sql-reference/table-functions/generate.md b/docs/en/sql-reference/table-functions/generate.md
index b53ccdd42b5..bfc114daa72 100644
--- a/docs/en/sql-reference/table-functions/generate.md
+++ b/docs/en/sql-reference/table-functions/generate.md
@@ -16,11 +16,11 @@ generateRandom('name TypeName[, name TypeName]...', [, 'random_seed'[, 'max_stri
 
 **Arguments**
 
--   `name` — Name of corresponding column.
--   `TypeName` — Type of corresponding column.
--   `max_array_length` — Maximum elements for all generated arrays or maps. Defaults to `10`.
--   `max_string_length` — Maximum string length for all generated strings. Defaults to `10`.
--   `random_seed` — Specify random seed manually to produce stable results. If NULL — seed is randomly generated.
+- `name` — Name of corresponding column.
+- `TypeName` — Type of corresponding column.
+- `max_array_length` — Maximum elements for all generated arrays or maps. Defaults to `10`.
+- `max_string_length` — Maximum string length for all generated strings. Defaults to `10`.
+- `random_seed` — Specify random seed manually to produce stable results. If NULL — seed is randomly generated.
 
 **Returned Value**
 
diff --git a/docs/en/sql-reference/table-functions/hdfs.md b/docs/en/sql-reference/table-functions/hdfs.md
index 97a253a5356..6ba24211131 100644
--- a/docs/en/sql-reference/table-functions/hdfs.md
+++ b/docs/en/sql-reference/table-functions/hdfs.md
@@ -14,9 +14,9 @@ hdfs(URI, format, structure)
 
 **Input parameters**
 
--   `URI` — The relative URI to the file in HDFS. Path to file support following globs in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, \``'abc', 'def'` — strings.
--   `format` — The [format](../../interfaces/formats.md#formats) of the file.
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
+- `URI` — The relative URI to the file in HDFS. Path to file support following globs in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, \``'abc', 'def'` — strings.
+- `format` — The [format](../../interfaces/formats.md#formats) of the file.
+- `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
 
 **Returned value**
 
@@ -43,10 +43,10 @@ LIMIT 2
 
 Multiple path components can have globs. For being processed file should exists and matches to the whole path pattern (not only suffix or prefix).
 
--   `*` — Substitutes any number of any characters except `/` including empty string.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
+- `*` — Substitutes any number of any characters except `/` including empty string.
+- `?` — Substitutes any single character.
+- `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
+- `{N..M}` — Substitutes any number in range from N to M including both borders.
 
 Constructions with `{}` are similar to the [remote table function](../../sql-reference/table-functions/remote.md)).
 
@@ -54,12 +54,12 @@ Constructions with `{}` are similar to the [remote table function](../../sql-ref
 
 1.  Suppose that we have several files with following URIs on HDFS:
 
--   ‘hdfs://hdfs1:9000/some_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_3’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_3’
+- ‘hdfs://hdfs1:9000/some_dir/some_file_1’
+- ‘hdfs://hdfs1:9000/some_dir/some_file_2’
+- ‘hdfs://hdfs1:9000/some_dir/some_file_3’
+- ‘hdfs://hdfs1:9000/another_dir/some_file_1’
+- ‘hdfs://hdfs1:9000/another_dir/some_file_2’
+- ‘hdfs://hdfs1:9000/another_dir/some_file_3’
 
 2.  Query the amount of rows in these files:
 
@@ -79,7 +79,7 @@ SELECT count(*)
 FROM hdfs('hdfs://hdfs1:9000/{some,another}_dir/*', 'TSV', 'name String, value UInt32')
 ```
 
-:::warning    
+:::note    
 If your listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 :::
 
@@ -94,9 +94,9 @@ FROM hdfs('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name Strin
 
 ## Virtual Columns
 
--   `_path` — Path to the file.
--   `_file` — Name of the file.
+- `_path` — Path to the file.
+- `_file` — Name of the file.
 
 **See Also**
 
--   [Virtual columns](../../engines/table-engines/index.md#table_engines-virtual_columns)
+- [Virtual columns](../../engines/table-engines/index.md#table_engines-virtual_columns)
diff --git a/docs/en/sql-reference/table-functions/hdfsCluster.md b/docs/en/sql-reference/table-functions/hdfsCluster.md
index 231c552610f..afd1fd28a5a 100644
--- a/docs/en/sql-reference/table-functions/hdfsCluster.md
+++ b/docs/en/sql-reference/table-functions/hdfsCluster.md
@@ -6,7 +6,7 @@ sidebar_label: hdfsCluster
 
 # hdfsCluster Table Function
 
-Allows processing files from HDFS in parallel from many nodes in a specified cluster. On initiator it creates a connection to all nodes in the cluster, discloses asterics in HDFS file path, and dispatches each file dynamically. On the worker node it asks the initiator about the next task to process and processes it. This is repeated until all tasks are finished.
+Allows processing files from HDFS in parallel from many nodes in a specified cluster. On initiator it creates a connection to all nodes in the cluster, discloses asterisks in HDFS file path, and dispatches each file dynamically. On the worker node it asks the initiator about the next task to process and processes it. This is repeated until all tasks are finished.
 
 **Syntax**
 
@@ -16,10 +16,10 @@ hdfsCluster(cluster_name, URI, format, structure)
 
 **Arguments**
 
--   `cluster_name` — Name of a cluster that is used to build a set of addresses and connection parameters to remote and local servers.
--   `URI` — URI to a file or a bunch of files. Supports following wildcards in readonly mode: `*`, `?`, `{'abc','def'}` and `{N..M}` where `N`, `M` — numbers, `abc`, `def` — strings. For more information see [Wildcards In Path](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
--   `format` — The [format](../../interfaces/formats.md#formats) of the file.
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
+- `cluster_name` — Name of a cluster that is used to build a set of addresses and connection parameters to remote and local servers.
+- `URI` — URI to a file or a bunch of files. Supports following wildcards in readonly mode: `*`, `?`, `{'abc','def'}` and `{N..M}` where `N`, `M` — numbers, `abc`, `def` — strings. For more information see [Wildcards In Path](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
+- `format` — The [format](../../interfaces/formats.md#formats) of the file.
+- `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
 
 **Returned value**
 
@@ -29,12 +29,12 @@ A table with the specified structure for reading data in the specified file.
 
 1.  Suppose that we have a ClickHouse cluster named `cluster_simple`, and several files with following URIs on HDFS:
 
--   ‘hdfs://hdfs1:9000/some_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_3’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_3’
+- ‘hdfs://hdfs1:9000/some_dir/some_file_1’
+- ‘hdfs://hdfs1:9000/some_dir/some_file_2’
+- ‘hdfs://hdfs1:9000/some_dir/some_file_3’
+- ‘hdfs://hdfs1:9000/another_dir/some_file_1’
+- ‘hdfs://hdfs1:9000/another_dir/some_file_2’
+- ‘hdfs://hdfs1:9000/another_dir/some_file_3’
 
 2.  Query the amount of rows in these files:
 
@@ -50,11 +50,11 @@ SELECT count(*)
 FROM hdfsCluster('cluster_simple', 'hdfs://hdfs1:9000/{some,another}_dir/*', 'TSV', 'name String, value UInt32')
 ```
 
-:::warning    
+:::note    
 If your listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 :::
 
 **See Also**
 
--   [HDFS engine](../../engines/table-engines/integrations/hdfs.md)
--   [HDFS table function](../../sql-reference/table-functions/hdfs.md)
+- [HDFS engine](../../engines/table-engines/integrations/hdfs.md)
+- [HDFS table function](../../sql-reference/table-functions/hdfs.md)
diff --git a/docs/en/sql-reference/table-functions/iceberg.md b/docs/en/sql-reference/table-functions/iceberg.md
index fda4d274005..713b0f9bbf5 100644
--- a/docs/en/sql-reference/table-functions/iceberg.md
+++ b/docs/en/sql-reference/table-functions/iceberg.md
@@ -32,7 +32,13 @@ A table with the specified structure for reading data in the specified Iceberg t
 SELECT * FROM iceberg('http://test.s3.amazonaws.com/clickhouse-bucket/test_table', 'test', 'test')
 ```
 
-Using named collections:
+:::important
+ClickHouse currently supports reading v1 (v2 support is coming soon!) of the Iceberg format via the `iceberg` table function and `Iceberg` table engine.
+:::
+
+## Defining a named collection
+
+Here is an example of configuring a named collection for storing the URL and credentials:
 
 ```xml
 <clickhouse>
diff --git a/docs/en/sql-reference/table-functions/index.md b/docs/en/sql-reference/table-functions/index.md
index b49c2f8da20..b16295db36a 100644
--- a/docs/en/sql-reference/table-functions/index.md
+++ b/docs/en/sql-reference/table-functions/index.md
@@ -10,16 +10,16 @@ Table functions are methods for constructing tables.
 
 You can use table functions in:
 
--  [FROM](../../sql-reference/statements/select/from.md) clause of the `SELECT` query.
+- [FROM](../../sql-reference/statements/select/from.md) clause of the `SELECT` query.
 
    The method for creating a temporary table that is available only in the current query. The table is deleted when the query finishes.
 
--   [CREATE TABLE AS table_function()](../../sql-reference/statements/create/table.md) query.
+- [CREATE TABLE AS table_function()](../../sql-reference/statements/create/table.md) query.
 
    It's one of the methods of creating a table.
 
--   [INSERT INTO TABLE FUNCTION](../../sql-reference/statements/insert-into.md#inserting-into-table-function) query.
+- [INSERT INTO TABLE FUNCTION](../../sql-reference/statements/insert-into.md#inserting-into-table-function) query.
 
-:::warning
+:::note
 You can’t use table functions if the [allow_ddl](../../operations/settings/permissions-for-queries.md#settings_allow_ddl) setting is disabled.
 :::
diff --git a/docs/en/sql-reference/table-functions/input.md b/docs/en/sql-reference/table-functions/input.md
index b07bc1bb431..6aa1cab00c1 100644
--- a/docs/en/sql-reference/table-functions/input.md
+++ b/docs/en/sql-reference/table-functions/input.md
@@ -24,7 +24,7 @@ with all transferred data is not created.
 
 **Examples**
 
--   Let the `test` table has the following structure `(a String, b String)`
+- Let the `test` table has the following structure `(a String, b String)`
     and data in `data.csv` has a different structure `(col1 String, col2 Date, col3 Int32)`. Query for insert
     data from the `data.csv` into the `test` table with simultaneous conversion looks like this:
 
@@ -34,7 +34,7 @@ with all transferred data is not created.
 $ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT lower(col1), col3 * col3 FROM input('col1 String, col2 Date, col3 Int32') FORMAT CSV";
 ```
 
--   If `data.csv` contains data of the same structure `test_structure` as the table `test` then these two queries are equal:
+- If `data.csv` contains data of the same structure `test_structure` as the table `test` then these two queries are equal:
 
 <!-- -->
 
diff --git a/docs/en/sql-reference/table-functions/merge.md b/docs/en/sql-reference/table-functions/merge.md
index ce3cdded3f2..ba0d19b804e 100644
--- a/docs/en/sql-reference/table-functions/merge.md
+++ b/docs/en/sql-reference/table-functions/merge.md
@@ -24,4 +24,4 @@ merge('db_name', 'tables_regexp')
 
 **See Also**
 
--   [Merge](../../engines/table-engines/special/merge.md) table engine
+- [Merge](../../engines/table-engines/special/merge.md) table engine
diff --git a/docs/en/sql-reference/table-functions/mongodb.md b/docs/en/sql-reference/table-functions/mongodb.md
index dd063ae1796..042225dd1f0 100644
--- a/docs/en/sql-reference/table-functions/mongodb.md
+++ b/docs/en/sql-reference/table-functions/mongodb.md
@@ -16,19 +16,19 @@ mongodb(host:port, database, collection, user, password, structure [, options])
 
 **Arguments**
 
--   `host:port` — MongoDB server address.
+- `host:port` — MongoDB server address.
 
--   `database` — Remote database name.
+- `database` — Remote database name.
 
--   `collection` — Remote collection name.
+- `collection` — Remote collection name.
 
--   `user` — MongoDB user.
+- `user` — MongoDB user.
 
--   `password` — User password.
+- `password` — User password.
 
--   `structure` - The schema for the ClickHouse table returned from this function.
+- `structure` - The schema for the ClickHouse table returned from this function.
 
--   `options` - MongoDB connection string options (optional parameter).
+- `options` - MongoDB connection string options (optional parameter).
 
 
 **Returned Value**
@@ -70,5 +70,5 @@ SELECT * FROM mongodb(
 
 **See Also**
 
--   [The `MongoDB` table engine](../../engines/table-engines/integrations/mongodb.md)
--   [Using MongoDB as a dictionary source](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources/#mongodb)
+- [The `MongoDB` table engine](/docs/en/engines/table-engines/integrations/mongodb.md)
+- [Using MongoDB as a dictionary source](/docs/en/sql-reference/dictionaries/index.md#mongodb)
diff --git a/docs/en/sql-reference/table-functions/mysql.md b/docs/en/sql-reference/table-functions/mysql.md
index b995319c645..8d7656365f5 100644
--- a/docs/en/sql-reference/table-functions/mysql.md
+++ b/docs/en/sql-reference/table-functions/mysql.md
@@ -16,21 +16,21 @@ mysql('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_
 
 **Arguments**
 
--   `host:port` — MySQL server address.
+- `host:port` — MySQL server address.
 
--   `database` — Remote database name.
+- `database` — Remote database name.
 
--   `table` — Remote table name.
+- `table` — Remote table name.
 
--   `user` — MySQL user.
+- `user` — MySQL user.
 
--   `password` — User password.
+- `password` — User password.
 
--   `replace_query` — Flag that converts `INSERT INTO` queries to `REPLACE INTO`. Possible values:
+- `replace_query` — Flag that converts `INSERT INTO` queries to `REPLACE INTO`. Possible values:
     - `0` - The query is executed as `INSERT INTO`.
     - `1` - The query is executed as `REPLACE INTO`.
 
--   `on_duplicate_clause` — The `ON DUPLICATE KEY on_duplicate_clause` expression that is added to the `INSERT` query. Can be specified only with `replace_query = 0` (if you simultaneously pass `replace_query = 1` and `on_duplicate_clause`, ClickHouse generates an exception).
+- `on_duplicate_clause` — The `ON DUPLICATE KEY on_duplicate_clause` expression that is added to the `INSERT` query. Can be specified only with `replace_query = 0` (if you simultaneously pass `replace_query = 1` and `on_duplicate_clause`, ClickHouse generates an exception).
 
     Example: `INSERT INTO t (c1,c2) VALUES ('a', 2) ON DUPLICATE KEY UPDATE c2 = c2 + 1;`
 
@@ -56,7 +56,7 @@ SELECT name FROM mysql(`mysql1:3306|mysql2:3306|mysql3:3306`, 'mysql_database',
 
 A table object with the same columns as the original MySQL table.
 
-:::note    
+:::note
 In the `INSERT` query to distinguish table function `mysql(...)` from table name with column names list, you must use keywords `FUNCTION` or `TABLE FUNCTION`. See examples below.
 :::
 
@@ -109,5 +109,5 @@ SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123');
 
 **See Also**
 
--   [The ‘MySQL’ table engine](../../engines/table-engines/integrations/mysql.md)
--   [Using MySQL as a dictionary source](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
+- [The ‘MySQL’ table engine](../../engines/table-engines/integrations/mysql.md)
+- [Using MySQL as a dictionary source](../../sql-reference/dictionaries/index.md#dictionary-sources#dicts-external_dicts_dict_sources-mysql)
diff --git a/docs/en/sql-reference/table-functions/null.md b/docs/en/sql-reference/table-functions/null.md
index 04d7f08f259..d27295f1916 100644
--- a/docs/en/sql-reference/table-functions/null.md
+++ b/docs/en/sql-reference/table-functions/null.md
@@ -15,7 +15,7 @@ null('structure')
 
 **Parameter**
 
--   `structure` — A list of columns and column types. [String](../../sql-reference/data-types/string.md).
+- `structure` — A list of columns and column types. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -38,4 +38,4 @@ DROP TABLE IF EXISTS t;
 
 See also:
 
--   [Null table engine](../../engines/table-engines/special/null.md)
+- [Null table engine](../../engines/table-engines/special/null.md)
diff --git a/docs/en/sql-reference/table-functions/odbc.md b/docs/en/sql-reference/table-functions/odbc.md
index 7e13424bc8a..781ebacc680 100644
--- a/docs/en/sql-reference/table-functions/odbc.md
+++ b/docs/en/sql-reference/table-functions/odbc.md
@@ -14,9 +14,9 @@ odbc(connection_settings, external_database, external_table)
 
 Parameters:
 
--   `connection_settings` — Name of the section with connection settings in the `odbc.ini` file.
--   `external_database` — Name of a database in an external DBMS.
--   `external_table` — Name of a table in the `external_database`.
+- `connection_settings` — Name of the section with connection settings in the `odbc.ini` file.
+- `external_database` — Name of a database in an external DBMS.
+- `external_table` — Name of a table in the `external_database`.
 
 To safely implement ODBC connections, ClickHouse uses a separate program `clickhouse-odbc-bridge`. If the ODBC driver is loaded directly from `clickhouse-server`, driver problems can crash the ClickHouse server. ClickHouse automatically starts `clickhouse-odbc-bridge` when it is required. The ODBC bridge program is installed from the same package as the `clickhouse-server`.
 
@@ -101,5 +101,5 @@ SELECT * FROM odbc('DSN=mysqlconn', 'test', 'test')
 
 ## See Also
 
--   [ODBC dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
--   [ODBC table engine](../../engines/table-engines/integrations/odbc.md).
+- [ODBC dictionaries](../../sql-reference/dictionaries/index.md#dictionary-sources#dicts-external_dicts_dict_sources-odbc)
+- [ODBC table engine](../../engines/table-engines/integrations/odbc.md).
diff --git a/docs/en/sql-reference/table-functions/postgresql.md b/docs/en/sql-reference/table-functions/postgresql.md
index 87fc6ecb234..3e147fb8417 100644
--- a/docs/en/sql-reference/table-functions/postgresql.md
+++ b/docs/en/sql-reference/table-functions/postgresql.md
@@ -16,18 +16,18 @@ postgresql('host:port', 'database', 'table', 'user', 'password'[, `schema`])
 
 **Arguments**
 
--   `host:port` — PostgreSQL server address.
--   `database` — Remote database name.
--   `table` — Remote table name.
--   `user` — PostgreSQL user.
--   `password` — User password.
--   `schema` — Non-default table schema. Optional.
+- `host:port` — PostgreSQL server address.
+- `database` — Remote database name.
+- `table` — Remote table name.
+- `user` — PostgreSQL user.
+- `password` — User password.
+- `schema` — Non-default table schema. Optional.
 
 **Returned Value**
 
 A table object with the same columns as the original PostgreSQL table.
 
-:::note    
+:::note
 In the `INSERT` query to distinguish table function `postgresql(...)` from table name with column names list you must use keywords `FUNCTION` or `TABLE FUNCTION`. See examples below.
 :::
 
@@ -43,7 +43,7 @@ All joins, aggregations, sorting, `IN [ array ]` conditions and the `LIMIT` samp
 
 PostgreSQL Array types converts into ClickHouse arrays.
 
-:::note    
+:::note
 Be careful, in PostgreSQL an array data type column like Integer[] may contain arrays of different dimensions in different rows, but in ClickHouse it is only allowed to have multidimensional arrays of the same dimension in all rows.
 :::
 
@@ -129,8 +129,10 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 
 **See Also**
 
--   [The PostgreSQL table engine](../../engines/table-engines/integrations/postgresql.md)
--   [Using PostgreSQL as a dictionary source](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
+- [The PostgreSQL table engine](../../engines/table-engines/integrations/postgresql.md)
+- [Using PostgreSQL as a dictionary source](../../sql-reference/dictionaries/index.md#dictionary-sources#dicts-external_dicts_dict_sources-postgresql)
 
 ## Related content
+
 - Blog: [ClickHouse and PostgreSQL - a match made in data heaven - part 1](https://clickhouse.com/blog/migrating-data-between-clickhouse-postgres)
+- Blog: [ClickHouse and PostgreSQL - a Match Made in Data Heaven - part 2](https://clickhouse.com/blog/migrating-data-between-clickhouse-postgres-part-2)
diff --git a/docs/en/sql-reference/table-functions/remote.md b/docs/en/sql-reference/table-functions/remote.md
index ccaf9565144..bf0abd49fc6 100644
--- a/docs/en/sql-reference/table-functions/remote.md
+++ b/docs/en/sql-reference/table-functions/remote.md
@@ -53,7 +53,7 @@ The `remote` table function can be useful in the following cases:
 - Infrequent distributed requests that are made manually.
 - Distributed requests where the set of servers is re-defined each time.
 
-### Adresses
+### Addresses
 
 ``` text
 example01-01-1
diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index d7199717798..a9ddc286ec5 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -12,7 +12,7 @@ Provides a table-like interface to select/insert files in [Amazon S3](https://aw
 **Syntax**
 
 ``` sql
-s3(path [,aws_access_key_id, aws_secret_access_key] [,format] [,structure] [,compression])
+s3(path [, NOSIGN | aws_access_key_id, aws_secret_access_key] [,format] [,structure] [,compression])
 ```
 
 :::tip GCS
@@ -23,7 +23,7 @@ For GCS, substitute your HMAC key and HMAC secret where you see `aws_access_key_
 
 **Arguments**
 
--   `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings. For more information see [here](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
+- `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings. For more information see [here](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
 
   :::note GCS
   The GCS path is in this format as the endpoint for the Google XML API is different than the JSON API:
@@ -33,9 +33,10 @@ For GCS, substitute your HMAC key and HMAC secret where you see `aws_access_key_
   and not ~~https://storage.cloud.google.com~~.
   :::
 
--   `format` — The [format](../../interfaces/formats.md#formats) of the file.
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
--   `compression` — Parameter is optional. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. By default, it will autodetect compression by file extension.
+- `NOSIGN` - If this keyword is provided in place of credentials, all the requests will not be signed. 
+- `format` — The [format](../../interfaces/formats.md#formats) of the file.
+- `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
+- `compression` — Parameter is optional. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. By default, it will autodetect compression by file extension.
 
 **Returned value**
 
@@ -43,48 +44,54 @@ A table with the specified structure for reading or writing data in the specifie
 
 **Examples**
 
-Selecting the first two rows from the table from S3 file `https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/data.csv`:
+Selecting the first 5 rows from the table from S3 file `https://datasets-documentation.s3.eu-west-3.amazonaws.com/aapl_stock.csv`:
 
 ``` sql
 SELECT *
-FROM s3('https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/data.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
-LIMIT 2;
+FROM s3(
+   'https://datasets-documentation.s3.eu-west-3.amazonaws.com/aapl_stock.csv',
+   'CSVWithNames'
+)
+LIMIT 5;
 ```
 
-``` text
-┌─column1─┬─column2─┬─column3─┐
-│       1 │       2 │       3 │
-│       3 │       2 │       1 │
-└─────────┴─────────┴─────────┘
+```response
+┌───────Date─┬────Open─┬────High─┬─────Low─┬───Close─┬───Volume─┬─OpenInt─┐
+│ 1984-09-07 │ 0.42388 │ 0.42902 │ 0.41874 │ 0.42388 │ 23220030 │       0 │
+│ 1984-09-10 │ 0.42388 │ 0.42516 │ 0.41366 │ 0.42134 │ 18022532 │       0 │
+│ 1984-09-11 │ 0.42516 │ 0.43668 │ 0.42516 │ 0.42902 │ 42498199 │       0 │
+│ 1984-09-12 │ 0.42902 │ 0.43157 │ 0.41618 │ 0.41618 │ 37125801 │       0 │
+│ 1984-09-13 │ 0.43927 │ 0.44052 │ 0.43927 │ 0.43927 │ 57822062 │       0 │
+└────────────┴─────────┴─────────┴─────────┴─────────┴──────────┴─────────┘
 ```
 
-The similar but from file with `gzip` compression:
+:::note
+ClickHouse uses filename extensions to determine the format of the data. For example, we could have run the previous command without the `CSVWithNames`:
 
 ``` sql
 SELECT *
-FROM s3('https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/data.csv.gz', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32', 'gzip')
-LIMIT 2;
+FROM s3(
+   'https://datasets-documentation.s3.eu-west-3.amazonaws.com/aapl_stock.csv'
+)
+LIMIT 5;
 ```
 
-``` text
-┌─column1─┬─column2─┬─column3─┐
-│       1 │       2 │       3 │
-│       3 │       2 │       1 │
-└─────────┴─────────┴─────────┘
-```
+ClickHouse also can determine the compression of the file. For example, if the file was zipped up with a `.csv.gz` extension, ClickHouse would decompress the file automatically.
+:::
+
 
 ## Usage
 
 Suppose that we have several files with following URIs on S3:
 
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/some_prefix/some_file_1.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/some_prefix/some_file_2.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/some_prefix/some_file_3.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/some_prefix/some_file_4.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/another_prefix/some_file_1.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/another_prefix/some_file_2.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/another_prefix/some_file_3.csv'
--   'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/another_prefix/some_file_4.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/some_prefix/some_file_1.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/some_prefix/some_file_2.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/some_prefix/some_file_3.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/some_prefix/some_file_4.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/another_prefix/some_file_1.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/another_prefix/some_file_2.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/another_prefix/some_file_3.csv'
+- 'https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/another_prefix/some_file_4.csv'
 
 Count the amount of rows in files ending with numbers from 1 to 3:
 
@@ -112,7 +119,7 @@ FROM s3('https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/
 └─────────┘
 ```
 
-:::warning
+:::tip
 If your listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 :::
 
@@ -179,6 +186,22 @@ INSERT INTO TABLE FUNCTION
 ```
 As a result, the data is written into three files in different buckets: `my_bucket_1/file.csv`, `my_bucket_10/file.csv`, and `my_bucket_20/file.csv`.
 
+## Accessing public buckets
+
+ClickHouse tries to fetch credentials from many different types of sources.
+Sometimes, it can produce problems when accessing some buckets that are public causing the client to return `403` error code.
+This issue can be avoided by using `NOSIGN` keyword, forcing the client to ignore all the credentials, and not sign the requests.
+
+``` sql
+SELECT *
+FROM s3(
+   'https://datasets-documentation.s3.eu-west-3.amazonaws.com/aapl_stock.csv',
+   NOSIGN,
+   'CSVWithNames'
+)
+LIMIT 5;
+```
+
 **See Also**
 
--   [S3 engine](../../engines/table-engines/integrations/s3.md)
+- [S3 engine](../../engines/table-engines/integrations/s3.md)
diff --git a/docs/en/sql-reference/table-functions/s3Cluster.md b/docs/en/sql-reference/table-functions/s3Cluster.md
index f420a69596c..a1d9b9cdad4 100644
--- a/docs/en/sql-reference/table-functions/s3Cluster.md
+++ b/docs/en/sql-reference/table-functions/s3Cluster.md
@@ -5,7 +5,7 @@ sidebar_label: s3Cluster
 title: "s3Cluster Table Function"
 ---
 
-Allows processing files from [Amazon S3](https://aws.amazon.com/s3/) in parallel from many nodes in a specified cluster. On initiator it creates a connection to all nodes in the cluster, discloses asterics in S3 file path, and dispatches each file dynamically. On the worker node it asks the initiator about the next task to process and processes it. This is repeated until all tasks are finished.
+Allows processing files from [Amazon S3](https://aws.amazon.com/s3/) in parallel from many nodes in a specified cluster. On initiator it creates a connection to all nodes in the cluster, discloses asterisks in S3 file path, and dispatches each file dynamically. On the worker node it asks the initiator about the next task to process and processes it. This is repeated until all tasks are finished.
 
 **Syntax**
 
@@ -15,11 +15,11 @@ s3Cluster(cluster_name, source, [,access_key_id, secret_access_key] [,format] [,
 
 **Arguments**
 
--   `cluster_name` — Name of a cluster that is used to build a set of addresses and connection parameters to remote and local servers.
--   `source` — URL to a file or a bunch of files. Supports following wildcards in readonly mode: `*`, `?`, `{'abc','def'}` and `{N..M}` where `N`, `M` — numbers, `abc`, `def` — strings. For more information see [Wildcards In Path](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
--   `access_key_id` and `secret_access_key` — Keys that specify credentials to use with given endpoint. Optional.
--   `format` — The [format](../../interfaces/formats.md#formats) of the file.
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
+- `cluster_name` — Name of a cluster that is used to build a set of addresses and connection parameters to remote and local servers.
+- `source` — URL to a file or a bunch of files. Supports following wildcards in readonly mode: `*`, `?`, `{'abc','def'}` and `{N..M}` where `N`, `M` — numbers, `abc`, `def` — strings. For more information see [Wildcards In Path](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
+- `access_key_id` and `secret_access_key` — Keys that specify credentials to use with given endpoint. Optional.
+- `format` — The [format](../../interfaces/formats.md#formats) of the file.
+- `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
 
 **Returned value**
 
@@ -42,11 +42,11 @@ SELECT * FROM s3Cluster(
 
 Count the total amount of rows in all files in the cluster `cluster_simple`:
 
-:::warning    
+:::tip    
 If your listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 :::
 
 **See Also**
 
--   [S3 engine](../../engines/table-engines/integrations/s3.md)
--   [s3 table function](../../sql-reference/table-functions/s3.md)
+- [S3 engine](../../engines/table-engines/integrations/s3.md)
+- [s3 table function](../../sql-reference/table-functions/s3.md)
diff --git a/docs/en/sql-reference/table-functions/sqlite.md b/docs/en/sql-reference/table-functions/sqlite.md
index 1895f32421e..344fab4fad2 100644
--- a/docs/en/sql-reference/table-functions/sqlite.md
+++ b/docs/en/sql-reference/table-functions/sqlite.md
@@ -15,12 +15,12 @@ Allows to perform queries on a data stored in an [SQLite](../../engines/database
 
 **Arguments** 
 
--   `db_path` — Path to a file with an SQLite database. [String](../../sql-reference/data-types/string.md).
--   `table_name` — Name of a table in the SQLite database. [String](../../sql-reference/data-types/string.md).
+- `db_path` — Path to a file with an SQLite database. [String](../../sql-reference/data-types/string.md).
+- `table_name` — Name of a table in the SQLite database. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
--   A table object with the same columns as in the original `SQLite` table.
+- A table object with the same columns as in the original `SQLite` table.
 
 **Example**
 
@@ -42,4 +42,4 @@ Result:
 
 **See Also** 
 
--   [SQLite](../../engines/table-engines/integrations/sqlite.md) table engine
+- [SQLite](../../engines/table-engines/integrations/sqlite.md) table engine
diff --git a/docs/en/sql-reference/table-functions/url.md b/docs/en/sql-reference/table-functions/url.md
index 014dc3ae853..f157a850a12 100644
--- a/docs/en/sql-reference/table-functions/url.md
+++ b/docs/en/sql-reference/table-functions/url.md
@@ -13,7 +13,7 @@ sidebar_label: url
 **Syntax**
 
 ``` sql
-url(URL [,format] [,structure])
+url(URL [,format] [,structure] [,headers])
 ```
 
 **Parameters**
@@ -21,6 +21,7 @@ url(URL [,format] [,structure])
 - `URL` — HTTP or HTTPS server address, which can accept `GET` or `POST` requests (for `SELECT` or `INSERT` queries correspondingly). Type: [String](../../sql-reference/data-types/string.md).
 - `format` — [Format](../../interfaces/formats.md#formats) of the data. Type: [String](../../sql-reference/data-types/string.md).
 - `structure` — Table structure in `'UserID UInt64, Name String'` format. Determines column names and types. Type: [String](../../sql-reference/data-types/string.md).
+- `headers` - Headers in `'headers('key1'='value1', 'key2'='value2')'` format. You can set headers for HTTP call.
 
 **Returned value**
 
@@ -31,7 +32,7 @@ A table with the specified format and structure and with data from the defined `
 Getting the first 3 lines of a table that contains columns of `String` and [UInt32](../../sql-reference/data-types/int-uint.md) type from HTTP-server which answers in [CSV](../../interfaces/formats.md#csv) format.
 
 ``` sql
-SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3;
+SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32', headers('Accept'='text/csv; charset=utf-8')) LIMIT 3;
 ```
 
 Inserting data from a `URL` into a table:
@@ -46,3 +47,12 @@ SELECT * FROM test_table;
 
 Patterns in curly brackets `{ }` are used to generate a set of shards or to specify failover addresses. Supported pattern types and examples see in the description of the [remote](remote.md#globs-in-addresses) function.
 Character `|` inside patterns is used to specify failover addresses. They are iterated in the same order as listed in the pattern. The number of generated addresses is limited by [glob_expansion_max_elements](../../operations/settings/settings.md#glob_expansion_max_elements) setting.
+
+## Virtual Columns
+
+- `_path` — Path to the `URL`.
+- `_file` — Resource name of the `URL`.
+
+**See Also**
+
+- [Virtual columns](/docs/en/engines/table-engines/index.md#table_engines-virtual_columns)
diff --git a/docs/en/sql-reference/table-functions/urlCluster.md b/docs/en/sql-reference/table-functions/urlCluster.md
new file mode 100644
index 00000000000..8f19632c433
--- /dev/null
+++ b/docs/en/sql-reference/table-functions/urlCluster.md
@@ -0,0 +1,62 @@
+---
+slug: /en/sql-reference/table-functions/urlCluster
+sidebar_position: 55
+sidebar_label: urlCluster
+---
+
+# urlCluster Table Function
+
+Allows processing files from URL in parallel from many nodes in a specified cluster. On initiator it creates a connection to all nodes in the cluster, discloses asterics in URL file path, and dispatches each file dynamically. On the worker node it asks the initiator about the next task to process and processes it. This is repeated until all tasks are finished.
+
+**Syntax**
+
+``` sql
+urlCluster(cluster_name, URL, format, structure)
+```
+
+**Arguments**
+
+-   `cluster_name` — Name of a cluster that is used to build a set of addresses and connection parameters to remote and local servers.
+- `URL` — HTTP or HTTPS server address, which can accept `GET` requests. Type: [String](../../sql-reference/data-types/string.md).
+- `format` — [Format](../../interfaces/formats.md#formats) of the data. Type: [String](../../sql-reference/data-types/string.md).
+- `structure` — Table structure in `'UserID UInt64, Name String'` format. Determines column names and types. Type: [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+A table with the specified format and structure and with data from the defined `URL`.
+
+**Examples**
+
+Getting the first 3 lines of a table that contains columns of `String` and [UInt32](../../sql-reference/data-types/int-uint.md) type from HTTP-server which answers in [CSV](../../interfaces/formats.md#csv) format.
+
+1. Create a basic HTTP server using the standard Python 3 tools and start it:
+
+```python
+from http.server import BaseHTTPRequestHandler, HTTPServer
+
+class CSVHTTPServer(BaseHTTPRequestHandler):
+    def do_GET(self):
+        self.send_response(200)
+        self.send_header('Content-type', 'text/csv')
+        self.end_headers()
+
+        self.wfile.write(bytes('Hello,1\nWorld,2\n', "utf-8"))
+
+if __name__ == "__main__":
+    server_address = ('127.0.0.1', 12345)
+    HTTPServer(server_address, CSVHTTPServer).serve_forever()
+```
+
+``` sql
+SELECT * FROM urlCluster('cluster_simple','http://127.0.0.1:12345', CSV, 'column1 String, column2 UInt32')
+```
+
+## Globs in URL
+
+Patterns in curly brackets `{ }` are used to generate a set of shards or to specify failover addresses. Supported pattern types and examples see in the description of the [remote](remote.md#globs-in-addresses) function.
+Character `|` inside patterns is used to specify failover addresses. They are iterated in the same order as listed in the pattern. The number of generated addresses is limited by [glob_expansion_max_elements](../../operations/settings/settings.md#glob_expansion_max_elements) setting.
+
+**See Also**
+
+-   [HDFS engine](../../engines/table-engines/special/url.md)
+-   [URL table function](../../sql-reference/table-functions/url.md)
\ No newline at end of file
diff --git a/docs/en/sql-reference/table-functions/view.md b/docs/en/sql-reference/table-functions/view.md
index 074481cc522..2c21fe9ff4b 100644
--- a/docs/en/sql-reference/table-functions/view.md
+++ b/docs/en/sql-reference/table-functions/view.md
@@ -15,11 +15,11 @@ view(subquery)
 
 **Arguments**
 
--   `subquery` — `SELECT` query.
+- `subquery` — `SELECT` query.
 
 **Returned value**
 
--   A table.
+- A table.
 
 **Example**
 
@@ -63,4 +63,4 @@ SELECT * FROM cluster(`cluster_name`, view(SELECT a, b, c FROM table_name));
 
 **See Also**
 
--   [View Table Engine](https://clickhouse.com/docs/en/engines/table-engines/special/view/)
+- [View Table Engine](https://clickhouse.com/docs/en/engines/table-engines/special/view/)
diff --git a/docs/en/sql-reference/transactions.md b/docs/en/sql-reference/transactions.md
new file mode 100644
index 00000000000..68fbfe0b22a
--- /dev/null
+++ b/docs/en/sql-reference/transactions.md
@@ -0,0 +1,260 @@
+---
+slug: /en/guides/developer/transactional
+---
+# Transactional (ACID) support
+
+INSERT into one partition* in one table* of MergeTree* family up to max_insert_block_size rows* is transactional (ACID):
+- Atomic: INSERT is succeeded or rejected as a whole: if confirmation is sent to the client, all rows INSERTed; if error is sent to the client, no rows INSERTed.
+- Consistent: if there are no table constraints violated, then all rows in an INSERT are inserted and the INSERT succeeds; if constraints are violated, then no rows are inserted.
+- Isolated: concurrent clients observe a consistent snapshot of the table–the state of the table either as if before INSERT or after successful INSERT; no partial state is seen;
+- Durable: successful INSERT is written to the filesystem before answering to the client, on single replica or multiple replicas (controlled by the `insert_quorum` setting), and ClickHouse can ask the OS to sync the filesystem data on the storage media (controlled by the `fsync_after_insert` setting).
+* If table has many partitions and INSERT covers many partitions–then insertion into every partition is transactional on its own;
+* INSERT into multiple tables with one statement is possible if materialized views are involved;
+* INSERT into Distributed table is not transactional as a whole, while insertion into every shard is transactional;
+* another example: insert into Buffer tables is neither atomic nor isolated or consistent or durable;
+* atomicity is ensured even if `async_insert` is enabled, but it can be turned off by the wait_for_async_insert setting;
+* max_insert_block_size is 1 000 000 by default and can be adjusted as needed;
+* if client did not receive the answer from the server, the client does not know if transaction succeeded, and it can repeat the transaction, using exactly-once insertion properties;
+* ClickHouse is using MVCC with snapshot isolation internally;
+* all ACID properties are valid even in case of server kill / crash;
+* either insert_quorum into different AZ or fsync should be enabled to ensure durable inserts in typical setup;
+* "consistency" in ACID terms does not cover the semantics of distributed systems, see https://jepsen.io/consistency which is controlled by different settings (select_sequential_consistency)
+* this explanation does not cover a new transactions feature that allow to have full-featured transactions over multiple tables, materialized views, for multiple SELECTs, etc.
+
+## Transactions, Commit, and Rollback
+
+In addition to the functionality described at the top of this document, ClickHouse has experimental support for transactions, commits, and rollback functionality.
+
+### Requirements
+
+- Deploy ClickHouse Keeper or ZooKeeper to track transactions
+- Atomic DB only (Default)
+- Non-Replicated MergeTree table engine only
+- Enable experimental transaction support by adding this setting in `config.d/transactions.xml`:
+  ```xml
+  <clickhouse>
+    <allow_experimental_transactions>1</allow_experimental_transactions>
+  </clickhouse>
+  ```
+
+### Notes
+- This is an experimental feature, and changes should be expected.
+- If an exception occurs during a transaction, you cannot commit the transaction.  This includes all exceptions, including `UNKNOWN_FUNCTION` exceptions caused by typos.  
+- Nested transactions are not supported; finish the current transaction and start a new one instead
+
+### Configuration
+
+These examples are with a single node ClickHouse server with ClickHouse Keeper enabled.
+
+#### Enable experimental transaction support
+
+```xml title=/etc/clickhouse-server/config.d/transactions.xml
+<clickhouse>
+    <allow_experimental_transactions>1</allow_experimental_transactions>
+</clickhouse>
+```
+
+#### Basic configuration for a single ClickHouse server node with ClickHouse Keeper enabled
+
+:::note
+See the [deployment](docs/en/deployment-guides/terminology.md) documentation for details on deploying ClickHouse server and a proper quorum of ClickHouse Keeper nodes.  The configuration shown here is for experimental purposes.
+:::
+
+```xml title=/etc/clickhouse-server/config.d/config.xml
+<clickhouse replace="true">
+    <logger>
+        <level>debug</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>3</count>
+    </logger>
+    <display_name>node 1</display_name>
+    <listen_host>0.0.0.0</listen_host>
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <zookeeper>
+        <node>
+            <host>clickhouse-01</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+        <coordination_settings>
+            <operation_timeout_ms>10000</operation_timeout_ms>
+            <session_timeout_ms>30000</session_timeout_ms>
+            <raft_logs_level>information</raft_logs_level>
+        </coordination_settings>
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>clickhouse-keeper-01</hostname>
+                <port>9234</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
+```
+
+### Example
+
+#### Verify that experimental transactions are enabled
+
+Issue a `BEGIN TRANSACTION` followed by a `ROLLBACK` to verify that experimental transactions are enabled, and that ClickHouse Keeper is enabled as it is used to track transactions. 
+
+```sql
+BEGIN TRANSACTION
+```
+```response
+Ok.
+```
+
+:::tip
+If you see the following error, then check your configuration file to make sure that `allow_experimental_transactions` is set to `1` (or any value other than `0` or `false`).
+```
+Code: 48. DB::Exception: Received from localhost:9000.
+DB::Exception: Transactions are not supported.
+(NOT_IMPLEMENTED)
+```
+
+You can also check ClickHouse Keeper by issuing
+```
+echo ruok | nc localhost 9181
+```
+ClickHouse Keeper should respond with `imok`.
+:::
+
+```sql
+ROLLBACK
+```
+```response
+Ok.
+```
+
+#### Create a table for testing
+
+:::tip
+Creation of tables is not transactional.  Run this DDL query outside of a transaction.
+:::
+
+```sql
+CREATE TABLE mergetree_table
+(
+    `n` Int64
+)
+ENGINE = MergeTree
+ORDER BY n
+```
+```response
+Ok.
+```
+
+#### Begin a transaction and insert a row
+
+```sql
+BEGIN TRANSACTION
+```
+```response
+Ok.
+```
+
+```sql
+INSERT INTO mergetree_table FORMAT Values (10)
+```
+```response
+Ok.
+```
+
+```sql
+SELECT *
+FROM mergetree_table
+```
+```response
+┌──n─┐
+│ 10 │
+└────┘
+```
+:::note
+You can query the table from within a transaction and see that the row was inserted even though it has not yet been committed.
+:::
+
+#### Rollback the transaction, and query the table again
+
+Verify that the transaction is rolled back:
+```sql
+ROLLBACK
+```
+```response
+Ok.
+```
+```sql
+SELECT *
+FROM mergetree_table
+```
+```response
+Ok.
+
+0 rows in set. Elapsed: 0.002 sec.
+```
+
+#### Complete a transaction and query the table again
+
+```sql
+BEGIN TRANSACTION
+```
+```response
+Ok.
+```
+
+```sql
+INSERT INTO mergetree_table FORMAT Values (42)
+```
+```response
+Ok.
+```
+
+```sql
+COMMIT
+```
+```response
+Ok. Elapsed: 0.002 sec.
+```
+
+```sql
+SELECT *
+FROM mergetree_table
+```
+```response
+┌──n─┐
+│ 42 │
+└────┘
+```
+
+### Transactions introspection
+
+You can inspect transactions by querying the `system.transactions` table, but note that you cannot query that
+table from a session that is in a transaction–open a second `clickhouse client` session to query that table.
+
+```sql
+SELECT *
+FROM system.transactions
+FORMAT Vertical
+```
+```response
+Row 1:
+──────
+tid:         (33,61,'51e60bce-6b82-4732-9e1d-b40705ae9ab8')
+tid_hash:    11240433987908122467
+elapsed:     210.017820947
+is_readonly: 1
+state:       RUNNING
+```
+
+## More Details
+
+See this [meta issue](https://github.com/ClickHouse/ClickHouse/issues/48794) to find much more extensive tests and to keep up to date with the progress.
+
diff --git a/docs/en/sql-reference/window-functions/index.md b/docs/en/sql-reference/window-functions/index.md
index 59d49830852..7ee2102c14d 100644
--- a/docs/en/sql-reference/window-functions/index.md
+++ b/docs/en/sql-reference/window-functions/index.md
@@ -80,7 +80,7 @@ WINDOW window_name as ([[PARTITION BY grouping_column] [ORDER BY sorting_column]
 - `PARTITION BY` - defines how to break a resultset into groups.
 - `ORDER BY` - defines how to order rows inside the group during calculation aggregate_function.
 - `ROWS or RANGE` - defines bounds of a frame, aggregate_function is calculated within a frame.
-- `WINDOW` - allows to reuse a window definition with multiple exressions.
+- `WINDOW` - allows to reuse a window definition with multiple expressions.
 
 ### Functions
 
@@ -140,8 +140,8 @@ ORDER BY
 │        1 │     1 │     1 │ [1,2,3]      │   <┐   
 │        1 │     2 │     2 │ [1,2,3]      │    │  1-st group
 │        1 │     3 │     3 │ [1,2,3]      │   <┘ 
-│        2 │     0 │     0 │ [0]          │   <-  2-nd group
-│        3 │     0 │     0 │ [0]          │   <-  3-d group
+│        2 │     0 │     0 │ [0]          │   <- 2-nd group
+│        3 │     0 │     0 │ [0]          │   <- 3-d group
 └──────────┴───────┴───────┴──────────────┘
 ```
 
diff --git a/docs/get-clickhouse-docs.sh b/docs/get-clickhouse-docs.sh
new file mode 100755
index 00000000000..92ba8058dcc
--- /dev/null
+++ b/docs/get-clickhouse-docs.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+set -e
+# The script to clone or update the user-guides documentation repo
+# https://github.com/ClickHouse/clickhouse-docs
+
+WORKDIR=$(dirname "$0")
+WORKDIR=$(readlink -f "${WORKDIR}")
+cd "$WORKDIR"
+
+UPDATE_PERIOD_HOURS=${UPDATE_PERIOD_HOURS:=24}
+
+if [ -d "clickhouse-docs" ]; then
+  git -C clickhouse-docs pull
+else
+  if [ -n "$1" ]; then
+    url_type="$1"
+  else
+    read -rp "Enter the URL type (ssh | https): " url_type
+  fi
+  case "$url_type" in
+  ssh)
+    git_url=git@github.com:ClickHouse/clickhouse-docs.git
+    ;;
+  https)
+    git_url=https://github.com/ClickHouse/clickhouse-docs.git
+    ;;
+  *)
+    echo "Url type must be 'ssh' or 'https'"
+    exit 1
+    ;;
+  esac
+
+  if [ -n "$2" ]; then
+    set_git_hook="$2"
+  elif [ -z "$1" ]; then
+    read -rp "Would you like to setup git hook for automatic update? (y|n): " set_git_hook
+  fi
+
+  git clone "$git_url" "clickhouse-docs"
+
+  if [ "$set_git_hook" = "y" ]; then
+    hook_command="$(pwd)/pull-clickhouse-docs-hook.sh $UPDATE_PERIOD_HOURS ||:"
+    hook_file=$(realpath "$(pwd)/../.git/hooks/post-checkout")
+    if grep -Faq "pull-clickhouse-docs-hook.sh" "$hook_file" 2>/dev/null; then
+      echo "Looks like the update hook already exists, will not add another one"
+    else
+      echo "Appending '$hook_command' to $hook_file"
+      echo "$hook_command" >> "$hook_file"
+      chmod u+x "$hook_file"  # Just in case it did not exist before append
+    fi
+  elif [ ! "$set_git_hook" = "n" ]; then
+    echo "Expected 'y' or 'n', got '$set_git_hook', will not setup git hook"
+  fi
+fi
diff --git a/docs/pull-clickhouse-docs-hook.sh b/docs/pull-clickhouse-docs-hook.sh
new file mode 100755
index 00000000000..bd93a1d3997
--- /dev/null
+++ b/docs/pull-clickhouse-docs-hook.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -e
+# The script to update user-guides documentation repo
+# https://github.com/ClickHouse/clickhouse-docs
+
+WORKDIR=$(dirname "$0")
+WORKDIR=$(readlink -f "${WORKDIR}")
+cd "$WORKDIR"
+
+UPDATE_PERIOD_HOURS="${1:-24}"  # By default update once per 24 hours; 0 means "always update"
+
+if [ ! -d "clickhouse-docs" ]; then
+    echo "There's no clickhouse-docs/ dir, run get-clickhouse-docs.sh first to clone the repo"
+    exit 1
+fi
+
+# Do not update it too often
+LAST_FETCH_TS=$(stat -c %Y clickhouse-docs/.git/FETCH_HEAD 2>/dev/null || echo 0)
+CURRENT_TS=$(date +%s)
+HOURS_SINCE_LAST_FETCH=$(( (CURRENT_TS - LAST_FETCH_TS) / 60 / 60 ))
+
+if [ "$HOURS_SINCE_LAST_FETCH" -lt "$UPDATE_PERIOD_HOURS" ]; then
+    exit 0;
+fi
+
+echo "Updating clickhouse-docs..."
+git -C clickhouse-docs pull
diff --git a/docs/ru/development/developer-instruction.md b/docs/ru/development/developer-instruction.md
index 80472178ae2..7294bc2ae87 100644
--- a/docs/ru/development/developer-instruction.md
+++ b/docs/ru/development/developer-instruction.md
@@ -41,9 +41,15 @@ ClickHouse не работает и не собирается на 32-битны
 
 Выполните в терминале:
 
-    git clone git@github.com:your_github_username/ClickHouse.git --recursive
+    git clone --shallow-submodules git@github.com:your_github_username/ClickHouse.git
     cd ClickHouse
 
+Или (если вы хотите использовать sparse checkout для submodules):
+
+    git clone git@github.com:your_github_username/ClickHouse.git
+    cd ClickHouse
+    ./contrib/update-submodules.sh
+
 Замените слово `your_github_username` в команде для git на имя вашего аккаунта на GitHub.
 
 Эта команда создаст директорию ClickHouse, содержащую рабочую копию проекта.
diff --git a/docs/ru/engines/database-engines/materialized-mysql.md b/docs/ru/engines/database-engines/materialized-mysql.md
index c214e08dce1..df56b7a0bd6 100644
--- a/docs/ru/engines/database-engines/materialized-mysql.md
+++ b/docs/ru/engines/database-engines/materialized-mysql.md
@@ -97,7 +97,7 @@ CREATE DATABASE mysql ENGINE = MaterializedMySQL('localhost:3306', 'db', 'user',
 
 ### DDL-запросы {#ddl-queries}
 
-DDL-запросы в MySQL конвертируются в соответствующие DDL-запросы в ClickHouse ([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop), [RENAME](../../sql-reference/statements/rename.md)). Если ClickHouse не может конвертировать какой-либо DDL-запрос, он его игнорирует.
+DDL-запросы в MySQL конвертируются в соответствующие DDL-запросы в ClickHouse ([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop.md), [RENAME](../../sql-reference/statements/rename.md)). Если ClickHouse не может конвертировать какой-либо DDL-запрос, он его игнорирует.
 
 ### Репликация данных {#data-replication}
 
diff --git a/docs/ru/engines/table-engines/integrations/kafka.md b/docs/ru/engines/table-engines/integrations/kafka.md
index 58e03ba30cc..832486c038a 100644
--- a/docs/ru/engines/table-engines/integrations/kafka.md
+++ b/docs/ru/engines/table-engines/integrations/kafka.md
@@ -211,4 +211,4 @@ ClickHouse может поддерживать учетные данные Kerbe
 **Смотрите также**
 
 -   [Виртуальные столбцы](index.md#table_engines-virtual_columns)
--   [background_message_broker_schedule_pool_size](../../../operations/settings/settings.md#background_message_broker_schedule_pool_size)
+-   [background_message_broker_schedule_pool_size](../../../operations/server-configuration-parameters/settings.md#background_message_broker_schedule_pool_size)
diff --git a/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
index dac490468d0..e3b4238a200 100644
--- a/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -89,7 +89,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 └─────────────────────┴───────────┴──────────┴──────┘
 ```
 
-Первая строка отменяет предыдущее состояние объекта (пользователя). Она должен повторять все поля из ключа сортировки для отменённого состояния за исключением `Sign`.
+Первая строка отменяет предыдущее состояние объекта (пользователя). Она должна повторять все поля из ключа сортировки для отменённого состояния за исключением `Sign`.
 
 Вторая строка содержит текущее состояние.
 
diff --git a/docs/ru/engines/table-engines/mergetree-family/mergetree.md b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
index 7269cc023e4..812b0c0a2d4 100644
--- a/docs/ru/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
@@ -89,7 +89,7 @@ ORDER BY expr
     -   `min_merge_bytes_to_use_direct_io` — минимальный объём данных при слиянии, необходимый для прямого (небуферизованного) чтения/записи (direct I/O) на диск. При слиянии частей данных ClickHouse вычисляет общий объём хранения всех данных, подлежащих слиянию. Если общий объём хранения всех данных для чтения превышает `min_bytes_to_use_direct_io` байт, тогда ClickHouse  использует флаг `O_DIRECT` при чтении данных с диска. Если `min_merge_bytes_to_use_direct_io = 0`, тогда прямой ввод-вывод отключен. Значение по умолчанию: `10 * 1024 * 1024 * 1024` байтов.
     -   `merge_with_ttl_timeout` — минимальное время в секундах перед повторным слиянием для удаления данных с истекшим TTL. По умолчанию: `14400` секунд (4 часа).
     -   `merge_with_recompression_ttl_timeout` — минимальное время в секундах перед повторным слиянием для повторного сжатия данных с истекшим TTL. По умолчанию: `14400` секунд (4 часа).
-    -   `try_fetch_recompressed_part_timeout` — время ожидания (в секундах) перед началом слияния с повторным сжатием. В течение этого времени ClickHouse пытается извлечь сжатую часть из реплики, которая назначила это слияние. Значение по умолчанию: `7200` секунд (2 часа).   
+    -   `try_fetch_recompressed_part_timeout` — время ожидания (в секундах) перед началом слияния с повторным сжатием. В течение этого времени ClickHouse пытается извлечь сжатую часть из реплики, которая назначила это слияние. Значение по умолчанию: `7200` секунд (2 часа).
     -   `write_final_mark` — включает или отключает запись последней засечки индекса в конце куска данных, указывающей за последний байт. По умолчанию — 1. Не отключайте её.
     -   `merge_max_block_size` — максимальное количество строк в блоке для операций слияния. Значение по умолчанию: 8192.
     -   `storage_policy` — политика хранения данных. Смотрите [Хранение данных таблицы на нескольких блочных устройствах](#table_engine-mergetree-multiple-volumes).
@@ -337,7 +337,7 @@ SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234
 
     Поддерживаемые типы данных: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`.
 
-    Фильтром могут пользоваться функции: [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions), [notIn](../../../sql-reference/functions/in-functions), [has](../../../sql-reference/functions/array-functions#hasarr-elem), [hasAny](../../../sql-reference/functions/array-functions#hasany), [hasAll](../../../sql-reference/functions/array-functions#hasall).
+    Фильтром могут пользоваться функции: [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions.md), [notIn](../../../sql-reference/functions/in-functions.md), [has](../../../sql-reference/functions/array-functions.md#hasarr-elem), [hasAny](../../../sql-reference/functions/array-functions.md#hasany), [hasAll](../../../sql-reference/functions/array-functions.md#hasall).
 
 **Примеры**
 
@@ -361,14 +361,14 @@ INDEX b (u64 * length(str), i32 + f64 * 100, date, str) TYPE set(100) GRANULARIT
 | [startsWith](../../../sql-reference/functions/string-functions.md#startswith)                              | ✔           | ✔      | ✔           | ✔           | ✗             |
 | [endsWith](../../../sql-reference/functions/string-functions.md#endswith)                                  | ✗           | ✗      | ✔           | ✔           | ✗             |
 | [multiSearchAny](../../../sql-reference/functions/string-search-functions.md#function-multisearchany)      | ✗           | ✗      | ✔           | ✗           | ✗             |
-| [in](../../../sql-reference/functions/in-functions#in-functions)                                        | ✔           | ✔      | ✔           | ✔           | ✔             |
-| [notIn](../../../sql-reference/functions/in-functions#in-functions)                                     | ✔           | ✔      | ✔           | ✔           | ✔             |
+| [in](../../../sql-reference/functions/in-functions.md#in-functions)                                        | ✔           | ✔      | ✔           | ✔           | ✔             |
+| [notIn](../../../sql-reference/functions/in-functions.md#in-functions)                                     | ✔           | ✔      | ✔           | ✔           | ✔             |
 | [less (\<)](../../../sql-reference/functions/comparison-functions.md#function-less)                        | ✔           | ✔      | ✗           | ✗           | ✗             |
 | [greater (\>)](../../../sql-reference/functions/comparison-functions.md#function-greater)                  | ✔           | ✔      | ✗           | ✗           | ✗             |
 | [lessOrEquals (\<=)](../../../sql-reference/functions/comparison-functions.md#function-lessorequals)       | ✔           | ✔      | ✗           | ✗           | ✗             |
 | [greaterOrEquals (\>=)](../../../sql-reference/functions/comparison-functions.md#function-greaterorequals) | ✔           | ✔      | ✗           | ✗           | ✗             |
-| [empty](../../../sql-reference/functions/array-functions#function-empty)                                | ✔           | ✔      | ✗           | ✗           | ✗             |
-| [notEmpty](../../../sql-reference/functions/array-functions#function-notempty)                          | ✔           | ✔      | ✗           | ✗           | ✗             |
+| [empty](../../../sql-reference/functions/array-functions.md#function-empty)                                | ✔           | ✔      | ✗           | ✗           | ✗             |
+| [notEmpty](../../../sql-reference/functions/array-functions.md#function-notempty)                          | ✔           | ✔      | ✗           | ✗           | ✗             |
 | hasToken                                                                                                   | ✗           | ✗      | ✗           | ✔           | ✗             |
 
 Функции с постоянным агрументом, который меньше, чем размер ngram не могут использовать индекс `ngrambf_v1` для оптимизации запроса.
@@ -391,12 +391,12 @@ INDEX b (u64 * length(str), i32 + f64 * 100, date, str) TYPE set(100) GRANULARIT
 ## Проекции {#projections}
 Проекции похожи на [материализованные представления](../../../sql-reference/statements/create/view.md#materialized), но определяются на уровне кусков данных. Это обеспечивает гарантии согласованности данных наряду с автоматическим использованием в запросах.
 
-Проекции — это экспериментальная возможность. Чтобы включить поддержку проекций, установите настройку [allow_experimental_projection_optimization](../../../operations/settings/settings.md#allow-experimental-projection-optimization) в значение `1`. См. также настройку [force_optimize_projection ](../../../operations/settings/settings.md#force-optimize-projection).
+Проекции — это экспериментальная возможность. Чтобы включить поддержку проекций, установите настройку [optimize_use_projections](../../../operations/settings/settings.md#allow-experimental-projection-optimization) в значение `1`. См. также настройку [force_optimize_projection ](../../../operations/settings/settings.md#optimize_use_projections).
 
 Проекции не поддерживаются для запросов `SELECT` с модификатором [FINAL](../../../sql-reference/statements/select/from.md#select-from-final).
 
 ### Запрос проекции {#projection-query}
-Запрос проекции — это то, что определяет проекцию. Такой запрос неявно выбирает данные из родительской таблицы. 
+Запрос проекции — это то, что определяет проекцию. Такой запрос неявно выбирает данные из родительской таблицы.
 **Синтаксис**
 
 ```sql
@@ -406,9 +406,9 @@ SELECT <column list expr> [GROUP BY] <group keys expr> [ORDER BY] <expr>
 Проекции можно изменить или удалить с помощью запроса [ALTER](../../../sql-reference/statements/alter/projection.md).
 
 ### Хранение проекции {#projection-storage}
-Проекции хранятся в каталоге куска данных. Это похоже на хранение индексов, но используется подкаталог, в котором хранится анонимный кусок таблицы `MergeTree`. Таблица создается запросом определения проекции. 
-Если присутствует секция `GROUP BY`, то используется движок [AggregatingMergeTree](aggregatingmergetree.md), а все агрегатные функции преобразуются в `AggregateFunction`. 
-Если присутствует секция `ORDER BY`, таблица `MergeTree` использует ее в качестве выражения для первичного ключа. 
+Проекции хранятся в каталоге куска данных. Это похоже на хранение индексов, но используется подкаталог, в котором хранится анонимный кусок таблицы `MergeTree`. Таблица создается запросом определения проекции.
+Если присутствует секция `GROUP BY`, то используется движок [AggregatingMergeTree](aggregatingmergetree.md), а все агрегатные функции преобразуются в `AggregateFunction`.
+Если присутствует секция `ORDER BY`, таблица `MergeTree` использует ее в качестве выражения для первичного ключа.
 Во время процесса слияния кусок данных проекции объединяется с помощью процедуры слияния хранилища. Контрольная сумма куска данных родительской таблицы включает кусок данных проекции. Другие процедуры аналогичны индексам пропуска данных.
 
 ### Анализ запросов {#projection-query-analysis}
@@ -499,7 +499,7 @@ TTL expr
 За каждым `TTL` выражением может следовать тип действия, которое выполняется после достижения времени, соответствующего результату `TTL` выражения:
 
 -   `DELETE` - удалить данные (действие по умолчанию);
--   `RECOMPRESS codec_name` - повторно сжать данные с помощью кодека `codec_name`;   
+-   `RECOMPRESS codec_name` - повторно сжать данные с помощью кодека `codec_name`;
 -   `TO DISK 'aaa'` - переместить данные на диск `aaa`;
 -   `TO VOLUME 'bbb'` - переместить данные на том `bbb`;
 -   `GROUP BY` -  агрегировать данные.
@@ -584,7 +584,7 @@ TTL d + INTERVAL 1 MONTH GROUP BY k1, k2 SET x = max(x), y = min(y);
 
 Данные с истекшим `TTL` удаляются, когда ClickHouse мёржит куски данных.
 
-Когда ClickHouse видит, что некоторые данные устарели, он выполняет внеплановые мёржи. Для управление частотой подобных мёржей, можно задать настройку `merge_with_ttl_timeout`. Если её значение слишком низкое, придется выполнять много внеплановых мёржей, которые могут начать потреблять значительную долю ресурсов сервера.
+Когда ClickHouse видит, что некоторые данные устарели, он выполняет внеплановые мёржи. Для управления частотой подобных мёржей, можно задать настройку `merge_with_ttl_timeout`. Если её значение слишком низкое, придется выполнять много внеплановых мёржей, которые могут начать потреблять значительную долю ресурсов сервера.
 
 Если вы выполните запрос `SELECT` между слияниями вы можете получить устаревшие данные. Чтобы избежать этого используйте запрос [OPTIMIZE](../../../engines/table-engines/mergetree-family/mergetree.md#misc_operations-optimize) перед `SELECT`.
 
@@ -679,7 +679,7 @@ TTL d + INTERVAL 1 MONTH GROUP BY k1, k2 SET x = max(x), y = min(y);
 -   `policy_name_N` — название политики. Названия политик должны быть уникальны.
 -   `volume_name_N` — название тома. Названия томов должны быть уникальны.
 -   `disk` — диск, находящийся внутри тома.
--   `max_data_part_size_bytes` — максимальный размер куска данных, который может находится на любом из дисков этого тома. Если в результате слияния размер куска ожидается больше, чем max_data_part_size_bytes, то этот кусок будет записан в следующий том. В основном эта функция позволяет хранить новые / мелкие куски на горячем (SSD) томе и перемещать их на холодный (HDD) том, когда они достигают большого размера. Не используйте этот параметр, если политика имеет только один том. 
+-   `max_data_part_size_bytes` — максимальный размер куска данных, который может находиться на любом из дисков этого тома. Если в результате слияния размер куска ожидается больше, чем max_data_part_size_bytes, то этот кусок будет записан в следующий том. В основном эта функция позволяет хранить новые / мелкие куски на горячем (SSD) томе и перемещать их на холодный (HDD) том, когда они достигают большого размера. Не используйте этот параметр, если политика имеет только один том.
 -   `move_factor` — доля доступного свободного места на томе, если места становится меньше, то данные начнут перемещение на следующий том, если он есть (по умолчанию 0.1). Для перемещения куски сортируются по размеру от большего к меньшему (по убыванию) и выбираются куски, совокупный размер которых достаточен для соблюдения условия `move_factor`, если совокупный размер всех партов недостаточен, будут перемещены все парты.
 -   `prefer_not_to_merge` — Отключает слияние кусков данных, хранящихся на данном томе. Если данная настройка включена, то слияние данных, хранящихся на данном томе, не допускается. Это позволяет контролировать работу ClickHouse с медленными дисками.
 
@@ -730,7 +730,7 @@ TTL d + INTERVAL 1 MONTH GROUP BY k1, k2 SET x = max(x), y = min(y);
 
 В приведенном примере, политика `hdd_in_order` реализует прицип [round-robin](https://ru.wikipedia.org/wiki/Round-robin_(%D0%B0%D0%BB%D0%B3%D0%BE%D1%80%D0%B8%D1%82%D0%BC)). Так как в политике есть всего один том (`single`), то все записи производятся на его диски по круговому циклу. Такая политика может быть полезна при наличии в системе нескольких похожих дисков, но при этом не сконфигурирован RAID. Учтите, что каждый отдельный диск ненадёжен и чтобы не потерять важные данные это необходимо скомпенсировать за счет хранения данных в трёх копиях.
 
-Если система содержит диски различных типов, то может пригодиться политика `moving_from_ssd_to_hdd`. В томе `hot` находится один SSD-диск (`fast_ssd`), а также задается ограничение на максимальный размер куска, который может храниться на этом томе (1GB). Все куски такой таблицы больше 1GB будут записываться сразу на том `cold`, в котором содержится один HDD-диск `disk1`. Также, при заполнении диска `fast_ssd` более чем на 80% данные будут переносится на диск `disk1` фоновым процессом.
+Если система содержит диски различных типов, то может пригодиться политика `moving_from_ssd_to_hdd`. В томе `hot` находится один SSD-диск (`fast_ssd`), а также задается ограничение на максимальный размер куска, который может храниться на этом томе (1GB). Все куски такой таблицы больше 1GB будут записываться сразу на том `cold`, в котором содержится один HDD-диск `disk1`. Также при заполнении диска `fast_ssd` более чем на 80% данные будут переноситься на диск `disk1` фоновым процессом.
 
 Порядок томов в политиках хранения важен, при достижении условий на переполнение тома данные переносятся на следующий. Порядок дисков в томах так же важен, данные пишутся по очереди на каждый из них.
 
@@ -752,7 +752,7 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
 Изменить политику хранения после создания таблицы можно при помощи запроса [ALTER TABLE ... MODIFY SETTING]. При этом необходимо учесть, что новая политика должна содержать все тома и диски предыдущей политики с теми же именами.
 
 
-Количество потоков для фоновых перемещений кусков между дисками можно изменить с помощью настройки [background_move_pool_size](../../../operations/settings/settings.md#background_move_pool_size)
+Количество потоков для фоновых перемещений кусков между дисками можно изменить с помощью настройки [background_move_pool_size](../../../operations/server-configuration-parameters/settings.md#background_move_pool_size)
 
 ### Особенности работы {#details}
 
diff --git a/docs/ru/engines/table-engines/mergetree-family/replication.md b/docs/ru/engines/table-engines/mergetree-family/replication.md
index 22cb2196ef1..2b4d89dbe0a 100644
--- a/docs/ru/engines/table-engines/mergetree-family/replication.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replication.md
@@ -64,9 +64,9 @@ ClickHouse хранит метаинформацию о репликах в [Apa
 
 Для очень больших кластеров, можно использовать разные кластеры ZooKeeper для разных шардов. Впрочем, на кластере Яндекс.Метрики (примерно 300 серверов) такой необходимости не возникает.
 
-Репликация асинхронная, мульти-мастер. Запросы `INSERT` и `ALTER` можно направлять на любой доступный сервер. Данные вставятся на сервер, где выполнен запрос, а затем скопируются на остальные серверы. В связи с асинхронностью, только что вставленные данные появляются на остальных репликах с небольшой задержкой. Если часть реплик недоступна, данные на них запишутся тогда, когда они станут доступны. Если реплика доступна, то задержка составляет столько времени, сколько требуется для передачи блока сжатых данных по сети. Количество потоков для выполнения фоновых задач можно задать с помощью настройки [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size).
+Репликация асинхронная, мульти-мастер. Запросы `INSERT` и `ALTER` можно направлять на любой доступный сервер. Данные вставятся на сервер, где выполнен запрос, а затем скопируются на остальные серверы. В связи с асинхронностью, только что вставленные данные появляются на остальных репликах с небольшой задержкой. Если часть реплик недоступна, данные на них запишутся тогда, когда они станут доступны. Если реплика доступна, то задержка составляет столько времени, сколько требуется для передачи блока сжатых данных по сети. Количество потоков для выполнения фоновых задач можно задать с помощью настройки [background_schedule_pool_size](../../../operations/server-configuration-parameters/settings.md#background_schedule_pool_size).
 
-Движок `ReplicatedMergeTree` использует отдельный пул потоков для скачивания кусков данных. Размер пула ограничен настройкой [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size), которую можно указать при перезапуске сервера.
+Движок `ReplicatedMergeTree` использует отдельный пул потоков для скачивания кусков данных. Размер пула ограничен настройкой [background_fetches_pool_size](../../../operations/server-configuration-parameters/settings.md#background_fetches_pool_size), которую можно указать при перезапуске сервера.
 
 По умолчанию, запрос INSERT ждёт подтверждения записи только от одной реплики. Если данные были успешно записаны только на одну реплику, и сервер с этой репликой перестал существовать, то записанные данные будут потеряны. Вы можете включить подтверждение записи от нескольких реплик, используя настройку `insert_quorum`.
 
@@ -251,8 +251,8 @@ $ sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
 
 **Смотрите также**
 
--   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
--   [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size)
+-   [background_schedule_pool_size](../../../operations/server-configuration-parameters/settings.md#background_schedule_pool_size)
+-   [background_fetches_pool_size](../../../operations/server-configuration-parameters/settings.md#background_fetches_pool_size)
 -   [execute_merges_on_single_replica_time_threshold](../../../operations/settings/settings.md#execute-merges-on-single-replica-time-threshold)
 -   [max_replicated_fetches_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth)
 -   [max_replicated_sends_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth)
diff --git a/docs/ru/engines/table-engines/special/buffer.md b/docs/ru/engines/table-engines/special/buffer.md
index 4987dafc11f..574d9273088 100644
--- a/docs/ru/engines/table-engines/special/buffer.md
+++ b/docs/ru/engines/table-engines/special/buffer.md
@@ -66,4 +66,4 @@ CREATE TABLE merge.hits_buffer AS merge.hits ENGINE = Buffer(merge, hits, 16, 10
 
 Таблицы типа Buffer используются в тех случаях, когда от большого количества серверов поступает слишком много INSERT-ов в единицу времени, и нет возможности заранее самостоятельно буферизовать данные перед вставкой, в результате чего, INSERT-ы не успевают выполняться.
 
-Заметим, что даже для таблиц типа Buffer не имеет смысла вставлять данные по одной строке, так как таким образом будет достигнута скорость всего лишь в несколько тысяч строк в секунду, тогда как при вставке более крупными блоками, достижимо более миллиона строк в секунду (смотрите раздел [«Производительность»](../../../introduction/performance/).
+Заметим, что даже для таблиц типа Buffer не имеет смысла вставлять данные по одной строке, так как таким образом будет достигнута скорость всего лишь в несколько тысяч строк в секунду, тогда как при вставке более крупными блоками, достижимо более миллиона строк в секунду (смотрите раздел [«Производительность»](../../../introduction/performance.md).
diff --git a/docs/ru/faq/operations/multi-region-replication.md b/docs/ru/faq/operations/multi-region-replication.md
index bfe3231c247..eb53a69e7f6 100644
--- a/docs/ru/faq/operations/multi-region-replication.md
+++ b/docs/ru/faq/operations/multi-region-replication.md
@@ -10,4 +10,4 @@ The short answer is "yes". However, we recommend keeping latency between all reg
 
 Configuration-wise there's no difference compared to single-region replication, simply use hosts that are located in different locations for replicas.
 
-For more information, see [full article on data replication](../../engines/table-engines/mergetree-family/replication/).
+For more information, see [full article on data replication](../../engines/table-engines/mergetree-family/replication.md).
diff --git a/docs/ru/getting-started/install.md b/docs/ru/getting-started/install.md
index 02d8c62669d..f041db43d0f 100644
--- a/docs/ru/getting-started/install.md
+++ b/docs/ru/getting-started/install.md
@@ -77,15 +77,37 @@ clickhouse-client # or "clickhouse-client --password" if you set up a password.
 
 Команда ClickHouse в Яндексе рекомендует использовать официальные предкомпилированные `rpm` пакеты для CentOS, RedHat и всех остальных дистрибутивов Linux, основанных на rpm.
 
+#### Установка официального репозитория
+
 Сначала нужно подключить официальный репозиторий:
 
 ``` bash
 sudo yum install -y yum-utils
 sudo yum-config-manager --add-repo https://packages.clickhouse.com/rpm/clickhouse.repo
-sudo yum install -y clickhouse-server clickhouse-client
+```
 
-sudo /etc/init.d/clickhouse-server start
-clickhouse-client # or "clickhouse-client --password" if you set up a password.
+Для систем с пакетным менеджером `zypper` (openSUSE, SLES):
+
+``` bash
+sudo zypper addrepo -r https://packages.clickhouse.com/rpm/clickhouse.repo -g
+sudo zypper --gpg-auto-import-keys refresh clickhouse-stable
+```
+
+Далее любая команда `yum install` может быть заменена на `zypper install`. Чтобы указать желаемую версию, необходимо добавить `-$VERSION` в имени пакета, например `clickhouse-client-22.2.2.22`.
+
+#### Установка сервера и клиента
+
+``` bash
+sudo yum install -y clickhouse-server clickhouse-client
+```
+
+#### Запуск сервера
+
+``` bash
+sudo systemctl enable clickhouse-server
+sudo systemctl start clickhouse-server
+sudo systemctl status clickhouse-server
+clickhouse-client # илм "clickhouse-client --password" если установлен пароль
 ```
 
 <details markdown="1">
diff --git a/docs/ru/getting-started/tutorial.md b/docs/ru/getting-started/tutorial.md
index 803da2952fd..60a7463f70f 100644
--- a/docs/ru/getting-started/tutorial.md
+++ b/docs/ru/getting-started/tutorial.md
@@ -477,7 +477,7 @@ clickhouse-client --query "INSERT INTO tutorial.hits_v1 FORMAT TSV" --max_insert
 clickhouse-client --query "INSERT INTO tutorial.visits_v1 FORMAT TSV" --max_insert_block_size=100000 < visits_v1.tsv
 ```
 
-ClickHouse has a lot of [settings to tune](../operations/settings/) and one way to specify them in console client is via arguments, as we can see with `--max_insert_block_size`. The easiest way to figure out what settings are available, what do they mean and what the defaults are is to query the `system.settings` table:
+ClickHouse has a lot of [settings to tune](../operations/settings/index.md) and one way to specify them in console client is via arguments, as we can see with `--max_insert_block_size`. The easiest way to figure out what settings are available, what do they mean and what the defaults are is to query the `system.settings` table:
 
 ``` sql
 SELECT name, value, changed, description
diff --git a/docs/ru/interfaces/cli.md b/docs/ru/interfaces/cli.md
index 8a4ec083242..4c22eae0207 100644
--- a/docs/ru/interfaces/cli.md
+++ b/docs/ru/interfaces/cli.md
@@ -132,7 +132,7 @@ $ clickhouse-client --param_tbl="numbers" --param_db="system" --param_col="numbe
 -   `--queries-file` - путь к файлу с запросами для выполнения. Необходимо указать только одну из опций: `query` или `queries-file`.
 -   `--database, -d` — выбрать текущую БД. Без указания значение берется из настроек сервера (по умолчанию — БД ‘default’).
 -   `--multiline, -m` — если указано — разрешить многострочные запросы, не отправлять запрос по нажатию Enter.
--   `--multiquery, -n` — если указано — разрешить выполнять несколько запросов, разделённых точкой с запятой.
+-   `--multiquery, -n` — Если указано, то после опции `--query` могут быть перечислены несколько запросов, разделенных точкой с запятой. Для удобства можно также опустить `--query` и передавать запросы непосредственно после `--multiquery`.
 -   `--format, -f` — использовать указанный формат по умолчанию для вывода результата.
 -   `--vertical, -E` — если указано, использовать по умолчанию формат [Vertical](../interfaces/formats.md#vertical) для вывода результата. То же самое, что `–format=Vertical`. В этом формате каждое значение выводится на отдельной строке, что удобно для отображения широких таблиц.
 -   `--time, -t` — если указано, в неинтерактивном режиме вывести время выполнения запроса в поток ‘stderr’.
diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index 59c77d082cf..bef5c223281 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -974,7 +974,7 @@ Array представлены как длина в формате varint (unsig
 столбцы из входных данных будут сопоставлены со столбцами таблицы по их именам, столбцы с неизвестными именами будут пропущены, если включен параметр [input_format_skip_unknown_fields](../operations/settings/settings.md#input_format_skip_unknown_fields).
 В противном случае первая строка будет пропущена.
 :::
-   
+
 ## RowBinaryWithNamesAndTypes {#rowbinarywithnamesandtypes}
 
 То же самое что [RowBinary](#rowbinary), но добавляется заголовок:
@@ -1326,7 +1326,7 @@ ClickHouse поддерживает настраиваемую точность
 
 Неподдерживаемые типы данных Parquet: `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
 
-Типы данных столбцов в ClickHouse могут отличаться от типов данных соответствующих полей файла в формате Parquet. При вставке данных ClickHouse интерпретирует типы данных в соответствии с таблицей выше, а затем [приводит](../sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) данные к тому типу, который установлен для столбца таблицы.
+Типы данных столбцов в ClickHouse могут отличаться от типов данных соответствующих полей файла в формате Parquet. При вставке данных ClickHouse интерпретирует типы данных в соответствии с таблицей выше, а затем [приводит](../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) данные к тому типу, который установлен для столбца таблицы.
 
 ### Вставка и выборка данных {#inserting-and-selecting-data}
 
@@ -1386,7 +1386,7 @@ ClickHouse поддерживает настраиваемую точность
 
 Неподдерживаемые типы данных Arrow: `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
 
-Типы данных столбцов в ClickHouse могут отличаться от типов данных соответствующих полей файла в формате Arrow. При вставке данных ClickHouse интерпретирует типы данных в соответствии с таблицей выше, а затем [приводит](../sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) данные к тому типу, который установлен для столбца таблицы.
+Типы данных столбцов в ClickHouse могут отличаться от типов данных соответствующих полей файла в формате Arrow. При вставке данных ClickHouse интерпретирует типы данных в соответствии с таблицей выше, а затем [приводит](../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) данные к тому типу, который установлен для столбца таблицы.
 
 ### Вставка данных {#inserting-data-arrow}
 
@@ -1444,7 +1444,7 @@ ClickHouse поддерживает настраиваемую точность
 
 Неподдерживаемые типы данных ORC: `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
 
-Типы данных столбцов в таблицах ClickHouse могут отличаться от типов данных для соответствующих полей ORC. При вставке данных ClickHouse интерпретирует типы данных ORC согласно таблице соответствия, а затем [приводит](../sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) данные к типу, установленному для столбца таблицы ClickHouse.
+Типы данных столбцов в таблицах ClickHouse могут отличаться от типов данных для соответствующих полей ORC. При вставке данных ClickHouse интерпретирует типы данных ORC согласно таблице соответствия, а затем [приводит](../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) данные к типу, установленному для столбца таблицы ClickHouse.
 
 ### Вставка данных {#inserting-data-2}
 
diff --git a/docs/ru/interfaces/http.md b/docs/ru/interfaces/http.md
index 62e97e3f61d..b8c5ee77f0c 100644
--- a/docs/ru/interfaces/http.md
+++ b/docs/ru/interfaces/http.md
@@ -243,7 +243,7 @@ $ echo 'SELECT 1' | curl -H 'X-ClickHouse-User: user' -H 'X-ClickHouse-Key: pass
 Если пользователь не задан,то используется `default`. Если пароль не задан, то используется пустой пароль.
 Также в параметрах URL вы можете указать любые настройки, которые будут использованы для обработки одного запроса, или целые профили настроек. Пример:http://localhost:8123/?profile=web&max_rows_to_read=1000000000&query=SELECT+1
 
-Подробнее смотрите в разделе [Настройки](../operations/settings/).
+Подробнее смотрите в разделе [Настройки](../operations/settings/index.md).
 
 ``` bash
 $ echo 'SELECT number FROM system.numbers LIMIT 10' | curl 'http://localhost:8123/?' --data-binary @-
diff --git a/docs/ru/interfaces/third-party/client-libraries.md b/docs/ru/interfaces/third-party/client-libraries.md
index 6c63fb4c730..a4659e9ac4e 100644
--- a/docs/ru/interfaces/third-party/client-libraries.md
+++ b/docs/ru/interfaces/third-party/client-libraries.md
@@ -8,6 +8,7 @@ sidebar_label: "Клиентские библиотеки от сторонни
 
 :::danger "Disclaimer"
     Яндекс не поддерживает перечисленные ниже библиотеки и не проводит тщательного тестирования для проверки их качества.
+:::
 
 -   Python:
     -   [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)
@@ -24,6 +25,7 @@ sidebar_label: "Клиентские библиотеки от сторонни
     -   [SeasClick C++ client](https://github.com/SeasX/SeasClick)
     -   [glushkovds/phpclickhouse-laravel](https://packagist.org/packages/glushkovds/phpclickhouse-laravel)
     -   [kolya7k ClickHouse PHP extension](https://github.com//kolya7k/clickhouse-php)
+    -   [hyvor/clickhouse-php](https://github.com/hyvor/clickhouse-php)
 -   Go
     -   [clickhouse](https://github.com/kshvakov/clickhouse/)
     -   [go-clickhouse](https://github.com/roistat/go-clickhouse)
diff --git a/docs/ru/interfaces/third-party/gui.md b/docs/ru/interfaces/third-party/gui.md
index c34b799347b..34d2f0e371a 100644
--- a/docs/ru/interfaces/third-party/gui.md
+++ b/docs/ru/interfaces/third-party/gui.md
@@ -177,19 +177,20 @@ sidebar_label: "Визуальные интерфейсы от сторонни
 
 ### Yandex DataLens {#yandex-datalens}
 
-[Yandex DataLens](https://cloud.yandex.ru/services/datalens) — cервис визуализации и анализа данных.
+[Yandex DataLens](https://datalens.yandex.ru) — cервис визуализации и анализа данных.
 
 Основные возможности:
 
 -   Широкий выбор инструментов визуализации, от простых столбчатых диаграмм до сложных дашбордов.
 -   Возможность опубликовать дашборды на широкую аудиторию.
 -   Поддержка множества источников данных, включая ClickHouse.
--   Хранение материализованных данных в кластере ClickHouse DataLens.
 
-Для небольших проектов DataLens [доступен бесплатно](https://cloud.yandex.ru/docs/datalens/pricing), в том числе и для коммерческого использования.
+DataLens [доступен бесплатно](https://cloud.yandex.ru/docs/datalens/pricing), в том числе и для коммерческого использования.
 
+-   [Знакомство с DataLens](https://youtu.be/57ngi_6BINE).
+-   [Чат сообщества DataLens](https://t.me/YandexDataLens)
 -   [Документация DataLens](https://cloud.yandex.ru/docs/datalens/).
--   [Пособие по визуализации данных из ClickHouse](https://cloud.yandex.ru/docs/solutions/datalens/data-from-ch-visualization).
+-   [Сценарий по визуализации данных из ClickHouse](https://cloud.yandex.ru/docs/solutions/datalens/data-from-ch-visualization).
 
 ### Holistics Software {#holistics-software}
 
diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 67be83e13b2..3a931529b32 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -325,21 +325,21 @@ clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --
 Например, для кластера из 3 нод, алгоритм кворума продолжает работать при отказе не более чем одной ноды.
 
 Конфигурация кластера может быть изменена динамически с некоторыми ограничениями.
-Переконфигурация также использует Raft, поэтому для добавление новой ноды кластера или исключения старой ноды из него требуется достижения кворума в рамках текущей конфигурации кластера.
+Переконфигурация также использует Raft, поэтому для добавления новой ноды кластера или исключения старой ноды требуется достижение кворума в рамках текущей конфигурации кластера.
 Если в вашем кластере произошел отказ большего числа нод, чем допускает Raft для вашей текущей конфигурации и у вас нет возможности восстановить их работоспособность, Raft перестанет работать и не позволит изменить конфигурацию стандартным механизмом.
 
-Тем не менее ClickHousr Keeper имеет возможность запуститься в режиме восстановления, который позволяет переконфигурировать класте используя только одну ноду кластера.
+Тем не менее ClickHouse Keeper имеет возможность запуститься в режиме восстановления, который позволяет переконфигурировать кластер используя только одну ноду кластера.
 Этот механизм может использоваться только как крайняя мера, когда вы не можете восстановить существующие ноды кластера или запустить новый сервер с тем же идентификатором.
 
 Важно:
 - Удостоверьтесь, что отказавшие ноды не смогут в дальнейшем подключиться к кластеру в будущем.
-- Не запускайте новые ноды, пока не завешите процедуру ниже.
+- Не запускайте новые ноды, пока не завершите процедуру ниже.
 
 После того, как выполнили действия выше выполните следующие шаги.
-1. Выберете одну ноду Keeper, которая станет новым лидером. Учтите, что данные которые с этой ноды будут испольщзованы всем кластером, поэтому рекомендуется выбрать ноду с наиболее актуальным состоянием.
+1. Выберете одну ноду Keeper, которая станет новым лидером. Учтите, что данные с этой ноды будут использованы всем кластером, поэтому рекомендуется выбрать ноду с наиболее актуальным состоянием.
 2. Перед дальнейшими действиям сделайте резервную копию данных из директорий `log_storage_path` и `snapshot_storage_path`.
 3. Измените настройки на всех нодах кластера, которые вы собираетесь использовать.
-4. Отправьте команду `rcvr` на ноду, которую вы выбрали или остановите ее и запустите заново с аргументом `--force-recovery`. Это переведет ноду в режим восстановления.
+4. Отправьте команду `rcvr` на ноду, которую вы выбрали, или остановите ее и запустите заново с аргументом `--force-recovery`. Это переведет ноду в режим восстановления.
 5. Запускайте остальные ноды кластера по одной и проверяйте, что команда `mntr` возвращает `follower` в выводе состояния `zk_server_state` перед тем, как запустить следующую ноду.
-6. Пока нода работает в режиме восстановления, лидер будет возвращать ошибку на запрос `mntr` пока кворум не будет достигнут с помощью новых нод. Любые запросы от клиентов и постедователей будут возвращать ошибку.
+6. Пока нода работает в режиме восстановления, лидер будет возвращать ошибку на запрос `mntr` пока кворум не будет достигнут с помощью новых нод. Любые запросы от клиентов и последователей будут возвращать ошибку.
 7. После достижения кворума лидер перейдет в нормальный режим работы и станет обрабатывать все запросы через Raft. Удостоверьтесь, что запрос `mntr` возвращает `leader` в выводе состояния `zk_server_state`.
diff --git a/docs/ru/operations/opentelemetry.md b/docs/ru/operations/opentelemetry.md
index b6c5e89bcc6..4e127e9e0f0 100644
--- a/docs/ru/operations/opentelemetry.md
+++ b/docs/ru/operations/opentelemetry.md
@@ -10,6 +10,7 @@ ClickHouse поддерживает [OpenTelemetry](https://opentelemetry.io/) 
 
 :::danger "Предупреждение"
 Поддержка стандарта экспериментальная и будет со временем меняться.
+:::
 
 ## Обеспечение поддержки контекста трассировки в ClickHouse
 
diff --git a/docs/ru/operations/optimizing-performance/sampling-query-profiler.md b/docs/ru/operations/optimizing-performance/sampling-query-profiler.md
index c77f6a1f290..3d5ec993fdf 100644
--- a/docs/ru/operations/optimizing-performance/sampling-query-profiler.md
+++ b/docs/ru/operations/optimizing-performance/sampling-query-profiler.md
@@ -30,7 +30,7 @@ To analyze the `trace_log` system table:
 
 -   Use the `addressToLine`, `addressToSymbol` and `demangle` [introspection functions](../../sql-reference/functions/introspection.md) to get function names and their positions in ClickHouse code. To get a profile for some query, you need to aggregate data from the `trace_log` table. You can aggregate data by individual functions or by the whole stack traces.
 
-If you need to visualize `trace_log` info, try [flamegraph](../../interfaces/third-party/gui/#clickhouse-flamegraph) and [speedscope](https://github.com/laplab/clickhouse-speedscope).
+If you need to visualize `trace_log` info, try [flamegraph](../../interfaces/third-party/gui.md#clickhouse-flamegraph) and [speedscope](https://github.com/laplab/clickhouse-speedscope).
 
 ## Example {#example}
 
diff --git a/docs/ru/operations/server-configuration-parameters/settings.md b/docs/ru/operations/server-configuration-parameters/settings.md
index bffa3c39a60..787153d4d19 100644
--- a/docs/ru/operations/server-configuration-parameters/settings.md
+++ b/docs/ru/operations/server-configuration-parameters/settings.md
@@ -26,6 +26,7 @@ ClickHouse перезагружает встроенные словари с з
 
 :::danger "Внимание"
     Лучше не использовать, если вы только начали работать с ClickHouse.
+:::
 
 Общий вид конфигурации:
 
@@ -46,7 +47,7 @@ ClickHouse перезагружает встроенные словари с з
 -   `min_part_size` - Минимальный размер части таблицы.
 -   `min_part_size_ratio` - Отношение размера минимальной части таблицы к полному размеру таблицы.
 -   `method` - Метод сжатия. Возможные значения: `lz4`, `lz4hc`, `zstd`,`deflate_qpl`.
--   `level` – Уровень сжатия. См. [Кодеки](../../sql-reference/statements/create/table/#create-query-common-purpose-codecs).
+-   `level` – Уровень сжатия. См. [Кодеки](../../sql-reference/statements/create/table.md#create-query-common-purpose-codecs).
 
 Можно сконфигурировать несколько разделов `<case>`.
 
@@ -151,7 +152,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 ## custom_settings_prefixes {#custom_settings_prefixes}
 
-Список префиксов для [пользовательских настроек](../../operations/settings/#custom_settings). Префиксы должны перечисляться через запятую.
+Список префиксов для [пользовательских настроек](../../operations/settings/index.md#custom_settings). Префиксы должны перечисляться через запятую.
 
 **Пример**
 
@@ -161,7 +162,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 **См. также**
 
--   [Пользовательские настройки](../../operations/settings#custom_settings)
+-   [Пользовательские настройки](../../operations/settings/index.md#custom_settings)
 
 ## core_dump {#server_configuration_parameters-core_dump}
 
@@ -224,6 +225,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 ``` xml
 <default_replica_path>/clickhouse/tables/{uuid}/{shard}</default_replica_path>
 ```
+
 ## default_replica_name {#default_replica_name}
 
 Имя реплики в ZooKeeper.
@@ -915,6 +917,72 @@ ClickHouse использует потоки из глобального пул
 <thread_pool_queue_size>12000</thread_pool_queue_size>
 ```
 
+## background_buffer_flush_schedule_pool_size {#background_buffer_flush_schedule_pool_size}
+
+Задает количество потоков для выполнения фонового сброса данных в таблицах с движком [Buffer](../../engines/table-engines/special/buffer.md).
+
+Допустимые значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 16.
+
+## background_move_pool_size {#background_move_pool_size}
+
+Задает количество потоков для фоновых перемещений кусков между дисками. Работает для таблиц с движком [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes).
+
+Допустимые значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 8.
+
+## background_schedule_pool_size {#background_schedule_pool_size}
+
+Задает количество потоков для выполнения фоновых задач. Работает для [реплицируемых](../../engines/table-engines/mergetree-family/replication.md) таблиц, стримов в [Kafka](../../engines/table-engines/integrations/kafka.md) и обновления IP адресов у записей во внутреннем [DNS кеше](../server-configuration-parameters/settings.md#server-settings-dns-cache-update-period).
+
+Допустимые значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 128.
+
+## background_fetches_pool_size {#background_fetches_pool_size}
+
+Задает количество потоков для скачивания кусков данных для [реплицируемых](../../engines/table-engines/mergetree-family/replication.md) таблиц. Для использования в продакшене с частыми небольшими вставками или медленным кластером ZooKeeper рекомендуется использовать значение по умолчанию.
+
+Допустимые значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 8.
+
+## background_distributed_schedule_pool_size {#background_distributed_schedule_pool_size}
+
+Задает количество потоков для выполнения фоновых задач. Работает для таблиц с движком [Distributed](../../engines/table-engines/special/distributed.md).
+
+Допустимые значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 16.
+
+## background_message_broker_schedule_pool_size {#background_message_broker_schedule_pool_size}
+
+Задает количество потоков для фонового потокового вывода сообщений.
+
+Допустимые значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 16.
+
+**Смотрите также**
+
+-   Движок [Kafka](../../engines/table-engines/integrations/kafka.md#kafka).
+-   Движок [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md#rabbitmq-engine).
+
+
 ## merge_tree {#server_configuration_parameters-merge_tree}
 
 Тонкая настройка таблиц семейства [MergeTree](../../operations/server-configuration-parameters/settings.md).
@@ -1064,6 +1132,7 @@ ClickHouse использует потоки из глобального пул
 
 :::danger "Обратите внимание"
     Завершающий слеш обязателен.
+:::
 
 **Пример**
 
@@ -1330,6 +1399,7 @@ TCP порт для защищённого обмена данными с кли
 
 :::danger "Обратите внимание"
     Завершающий слеш обязателен.
+:::
 
 **Пример**
 
diff --git a/docs/ru/operations/settings/settings-users.md b/docs/ru/operations/settings/settings-users.md
index a8d5f0ec453..50f4eb5ae6b 100644
--- a/docs/ru/operations/settings/settings-users.md
+++ b/docs/ru/operations/settings/settings-users.md
@@ -37,6 +37,10 @@ sidebar_label: "Настройки пользователей"
                 <table_name>
             </database_name>
         </databases>
+        
+        <grants>
+            <query>GRANT SELECT ON system.*</query>
+        </grants>
     </user_name>
     <!-- Other users settings -->
 </users>
@@ -89,6 +93,27 @@ sidebar_label: "Настройки пользователей"
 
 Значение по умолчанию: 0.
 
+### grants {#grants-user-setting}
+
+Настройка позволяет указать набор прав для заданного пользователя.
+Каждый элемент списка должен представлять собой `GRANT` запрос без указания пользователей в самом запросе.
+
+Пример:
+
+```xml
+<user1>
+    <grants>
+        <query>GRANT SHOW ON *.*</query>
+        <query>GRANT CREATE ON *.* WITH GRANT OPTION</query>
+        <query>GRANT SELECT ON system.*</query>
+    </grants>
+</user1>
+```
+
+Настройка не может быть выставлена одновременно с
+`dictionaries`, `access_management`, `named_collection_control`, `show_named_collections_secrets`
+или `allow_databases`.
+
 ### user_name/networks {#user-namenetworks}
 
 Список сетей, из которых пользователь может подключиться к серверу ClickHouse.
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 4025966ac21..fa3ea582c55 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -1122,6 +1122,7 @@ SELECT type, query FROM system.query_log WHERE log_comment = 'log_comment test'
     :::note "Предупреждение"
     Эта настройка экспертного уровня, не используйте ее, если вы только начинаете работать с Clickhouse.
     :::
+
 ## max_query_size {#settings-max_query_size}
 
 Максимальный кусок запроса, который будет считан в оперативку для разбора парсером языка SQL.
@@ -2517,68 +2518,27 @@ SELECT idx, i FROM null_in WHERE i IN (1, NULL) SETTINGS transform_null_in = 1;
 
 ## background_buffer_flush_schedule_pool_size {#background_buffer_flush_schedule_pool_size}
 
-Задает количество потоков для выполнения фонового сброса данных в таблицах с движком [Buffer](../../engines/table-engines/special/buffer.md). Настройка применяется при запуске сервера ClickHouse и не может быть изменена в пользовательском сеансе.
-
-Допустимые значения:
-
--   Положительное целое число.
-
-Значение по умолчанию: 16.
+Параметр перенесен в [серверную конфигурацию](../../operations/server-configuration-parameters/settings.md/#background_buffer_flush_schedule_pool_size).
 
 ## background_move_pool_size {#background_move_pool_size}
 
-Задает количество потоков для фоновых перемещений кусков между дисками. Работает для таблиц с движком [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes). Настройка применяется при запуске сервера ClickHouse и не может быть изменена в пользовательском сеансе.
-
-Допустимые значения:
-
--   Положительное целое число.
-
-Значение по умолчанию: 8.
+Параметр перенесен в [серверную конфигурацию](../../operations/server-configuration-parameters/settings.md/#background_move_pool_size).
 
 ## background_schedule_pool_size {#background_schedule_pool_size}
 
-Задает количество потоков для выполнения фоновых задач. Работает для [реплицируемых](../../engines/table-engines/mergetree-family/replication.md) таблиц, стримов в [Kafka](../../engines/table-engines/integrations/kafka.md) и обновления IP адресов у записей во внутреннем [DNS кеше](../server-configuration-parameters/settings.md#server-settings-dns-cache-update-period). Настройка применяется при запуске сервера ClickHouse и не может быть изменена в пользовательском сеансе.
-
-Допустимые значения:
-
--   Положительное целое число.
-
-Значение по умолчанию: 128.
+Параметр перенесен в [серверную конфигурацию](../../operations/server-configuration-parameters/settings.md/#background_schedule_pool_size).
 
 ## background_fetches_pool_size {#background_fetches_pool_size}
 
-Задает количество потоков для скачивания кусков данных для [реплицируемых](../../engines/table-engines/mergetree-family/replication.md) таблиц. Настройка применяется при запуске сервера ClickHouse и не может быть изменена в пользовательском сеансе. Для использования в продакшене с частыми небольшими вставками или медленным кластером ZooKeeper рекомендуется использовать значение по умолчанию.
-
-Допустимые значения:
-
--   Положительное целое число.
-
-Значение по умолчанию: 8.
+Параметр перенесен в [серверную конфигурацию](../../operations/server-configuration-parameters/settings.md/#background_fetches_pool_size).
 
 ## background_distributed_schedule_pool_size {#background_distributed_schedule_pool_size}
 
-Задает количество потоков для выполнения фоновых задач. Работает для таблиц с движком [Distributed](../../engines/table-engines/special/distributed.md). Настройка применяется при запуске сервера ClickHouse и не может быть изменена в пользовательском сеансе.
-
-Допустимые значения:
-
--   Положительное целое число.
-
-Значение по умолчанию: 16.
+Параметр перенесен в [серверную конфигурацию](../../operations/server-configuration-parameters/settings.md/#background_distributed_schedule_pool_size).
 
 ## background_message_broker_schedule_pool_size {#background_message_broker_schedule_pool_size}
 
-Задает количество потоков для фонового потокового вывода сообщений. Настройка применяется при запуске сервера ClickHouse и не может быть изменена в пользовательском сеансе.
-
-Допустимые значения:
-
--   Положительное целое число.
-
-Значение по умолчанию: 16.
-
-**Смотрите также**
-
--   Движок [Kafka](../../engines/table-engines/integrations/kafka.md#kafka).
--   Движок [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md#rabbitmq-engine).
+Параметр перенесен в [серверную конфигурацию](../../operations/server-configuration-parameters/settings.md/#background_message_broker_schedule_pool_size).
 
 ## format_avro_schema_registry_url {#format_avro_schema_registry_url}
 
@@ -3225,16 +3185,6 @@ SELECT * FROM test2;
 
 Значение по умолчанию: `0`.
 
-## allow_experimental_geo_types {#allow-experimental-geo-types}
-
-Разрешает использование экспериментальных типов данных для работы с [географическими структурами](../../sql-reference/data-types/geo.md).
-
-Возможные значения:
--   0 — использование типов данных для работы с географическими структурами не поддерживается.
--   1 — использование типов данных для работы с географическими структурами поддерживается.
-
-Значение по умолчанию: `0`.
-
 ## database_atomic_wait_for_drop_and_detach_synchronously {#database_atomic_wait_for_drop_and_detach_synchronously}
 
 Добавляет модификатор `SYNC` ко всем запросам `DROP` и `DETACH`.
@@ -3388,6 +3338,7 @@ SELECT * FROM test LIMIT 10 OFFSET 100;
 │ 109 │
 └─────┘
 ```
+
 ## http_connection_timeout {#http_connection_timeout}
 
 Тайм-аут для HTTP-соединения (в секундах).
@@ -3627,7 +3578,7 @@ SETTINGS index_granularity = 8192 │
 
 Строка с идентификатором снэпшота, из которого будет выполняться [исходный дамп таблиц PostgreSQL](../../engines/database-engines/materialized-postgresql.md). Эта настройка должна использоваться совместно с [materialized_postgresql_replication_slot](#materialized-postgresql-replication-slot).
 
-## allow_experimental_projection_optimization {#allow-experimental-projection-optimization}
+## optimize_use_projections {#optimize_use_projections}
 
 Включает или отключает поддержку [проекций](../../engines/table-engines/mergetree-family/mergetree.md#projections) при обработке запросов `SELECT`.
 
@@ -3640,7 +3591,7 @@ SETTINGS index_granularity = 8192 │
 
 ## force_optimize_projection {#force-optimize-projection}
 
-Включает или отключает обязательное использование [проекций](../../engines/table-engines/mergetree-family/mergetree.md#projections) в запросах `SELECT`, если поддержка проекций включена (см. настройку [allow_experimental_projection_optimization](#allow-experimental-projection-optimization)).
+Включает или отключает обязательное использование [проекций](../../engines/table-engines/mergetree-family/mergetree.md#projections) в запросах `SELECT`, если поддержка проекций включена (см. настройку [optimize_use_projections](#optimize_use_projections)).
 
 Возможные значения:
 
@@ -4084,3 +4035,32 @@ ALTER TABLE test FREEZE SETTINGS alter_partition_verbose_result = 1;
 Задает символ, который интерпретируется как суффикс после результирующего набора данных формата [CustomSeparated](../../interfaces/formats.md#format-customseparated).
 
 Значение по умолчанию: `''`.
+
+## partial_result_on_first_cancel {#partial_result_on_first_cancel}
+Если установлено значение `true` и пользователь хочет прервать запрос (например, с помощью `Ctrl+C` на клиенте), то запрос продолжает выполнение только для данных, которые уже были считаны из таблицы. После этого он вернет частичный результат запроса для той части таблицы, которая была прочитана. Чтобы полностью остановить выполнение запроса без частичного результата, пользователь должен отправить 2 запроса отмены.
+
+**Пример с выключенной настройкой при нажатии Ctrl+C**
+```sql
+SELECT sum(number) FROM numbers(10000000000)
+
+Cancelling query.
+Ok.
+Query was cancelled.
+
+0 rows in set. Elapsed: 1.334 sec. Processed 52.65 million rows, 421.23 MB (39.48 million rows/s., 315.85 MB/s.)
+```
+
+**Пример с включенной настройкой при нажатии Ctrl+C**
+```sql
+SELECT sum(number) FROM numbers(10000000000) SETTINGS partial_result_on_first_cancel=true
+
+┌──────sum(number)─┐
+│ 1355411451286266 │
+└──────────────────┘
+
+1 row in set. Elapsed: 1.331 sec. Processed 52.13 million rows, 417.05 MB (39.17 million rows/s., 313.33 MB/s.)
+```
+
+Возможные значения:: `true`, `false`
+
+Значение по умолчанию: `false`
diff --git a/docs/ru/operations/storing-data.md b/docs/ru/operations/storing-data.md
index 2f5c9c95ea4..56081c82bc9 100644
--- a/docs/ru/operations/storing-data.md
+++ b/docs/ru/operations/storing-data.md
@@ -82,7 +82,7 @@ sidebar_label: "Хранение данных на внешних дисках"
 
 -   `type` — `encrypted`. Иначе зашифрованный диск создан не будет.
 -   `disk` — тип диска для хранения данных.
--   `key` — ключ для шифрования и расшифровки. Тип: [Uint64](../sql-reference/data-types/int-uint.md). Вы можете использовать параметр `key_hex` для шифрования в шестнадцатеричной форме.
+-   `key` — ключ для шифрования и расшифровки. Тип: [UInt64](../sql-reference/data-types/int-uint.md). Вы можете использовать параметр `key_hex` для шифрования в шестнадцатеричной форме.
     Вы можете указать несколько ключей, используя атрибут `id` (смотрите пример выше).
 
 Необязательные параметры:
diff --git a/docs/ru/operations/system-tables/information_schema.md b/docs/ru/operations/system-tables/information_schema.md
index 6a9b8134dad..691fec19039 100644
--- a/docs/ru/operations/system-tables/information_schema.md
+++ b/docs/ru/operations/system-tables/information_schema.md
@@ -178,7 +178,7 @@ table_type:    BASE TABLE
 -   `view_definition` ([String](../../sql-reference/data-types/string.md)) — `SELECT` запрос для представления.
 -   `check_option` ([String](../../sql-reference/data-types/string.md)) — `NONE`, нет проверки.
 -   `is_updatable` ([Enum8](../../sql-reference/data-types/enum.md)) — `NO`, представление не обновляется.
--   `is_insertable_into` ([Enum8](../../sql-reference/data-types/enum.md)) — показывает является ли представление [материализованным](../../sql-reference/statements/create/view/#materialized). Возможные значения:
+-   `is_insertable_into` ([Enum8](../../sql-reference/data-types/enum.md)) — показывает является ли представление [материализованным](../../sql-reference/statements/create/view.md#materialized). Возможные значения:
     -   `NO` — создано обычное представление.
     -   `YES` — создано материализованное представление.
 -   `is_trigger_updatable` ([Enum8](../../sql-reference/data-types/enum.md)) — `NO`, триггер не обновляется.
diff --git a/docs/ru/operations/system-tables/replicated_fetches.md b/docs/ru/operations/system-tables/replicated_fetches.md
index 0b91a02cf14..c13f058aae1 100644
--- a/docs/ru/operations/system-tables/replicated_fetches.md
+++ b/docs/ru/operations/system-tables/replicated_fetches.md
@@ -68,4 +68,4 @@ thread_id:                   54
 
 **Смотрите также**
 
--   [Управление таблицами ReplicatedMergeTree](../../sql-reference/statements/system/#query-language-system-replicated)
+-   [Управление таблицами ReplicatedMergeTree](../../sql-reference/statements/system.md#query-language-system-replicated)
diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index d3185f4fcb0..73de78d1c15 100644
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -60,7 +60,7 @@ clickhouse-benchmark [keys] < queries_file;
 -   `--stage=WORD` — стадия обработки запроса на сервере. ClickHouse останавливает обработку запроса и возвращает ответ `clickhouse-benchmark` на заданной стадии. Возможные значения: `complete`, `fetch_columns`, `with_mergeable_state`. Значение по умолчанию: `complete`.
 -   `--help` — показывает справку.
 
-Если нужно применить [настройки](../../operations/settings/) для запросов, их можно передать как ключ `--<session setting name>= SETTING_VALUE`. Например, `--max_memory_usage=1048576`.
+Если нужно применить [настройки](../../operations/settings/index.md) для запросов, их можно передать как ключ `--<session setting name>= SETTING_VALUE`. Например, `--max_memory_usage=1048576`.
 
 ## Вывод {#clickhouse-benchmark-output}
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md b/docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
index 7be933d67d7..50434419651 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
@@ -7,7 +7,7 @@ sidebar_position: 141
 
 Суммирует разницу между последовательными строками. Если разница отрицательна — она будет проигнорирована.
 
-Эта функция предназначена в первую очередь для [материализованных представлений](../../../sql-reference/statements/create/view.md#materialized), упорядоченных по некоторому временному бакету согласно timestamp, например, по бакету `toStartOfMinute`. Поскольку строки в таком материализованном представлении будут иметь одинаковый timestamp, невозможно объединить их в "правом" порядке. Функция отслеживает `timestamp` наблюдаемых значений, поэтому возможно правильно упорядочить состояния во время слияния.
+Эта функция предназначена в первую очередь для [материализованных представлений](../../../sql-reference/statements/create/view.md#materialized), хранящих данные, упорядоченные по некоторому округленному временному интервалу, согласно timestamp, например, по бакету `toStartOfMinute`. Поскольку строки в таком материализованном представлении будут иметь одинаковый timestamp, их невозможно объединить в правильном порядке без хранения исходного, неокругленного значения timestamp. Функция  `deltaSumTimestamp` отслеживает исходные `timestamp` наблюдаемых значений, поэтому значения (состояния) функции правильно вычисляются во время слияния кусков.
 
 Чтобы вычислить разницу между упорядоченными последовательными строками, вы можете использовать функцию [deltaSum](../../../sql-reference/aggregate-functions/reference/deltasum.md#agg_functions-deltasum) вместо функции `deltaSumTimestamp`.
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/kolmogorovsmirnovtest.md b/docs/ru/sql-reference/aggregate-functions/reference/kolmogorovsmirnovtest.md
new file mode 100644
index 00000000000..2f8c6bb6760
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/kolmogorovsmirnovtest.md
@@ -0,0 +1,117 @@
+---
+slug: /ru/sql-reference/aggregate-functions/reference/kolmogorovsmirnovtest
+sidebar_position: 300
+sidebar_label: kolmogorovSmirnovTest
+---
+
+# kolmogorovSmirnovTest {#kolmogorovSmirnovTest}
+
+Проводит статистический тест Колмогорова-Смирнова для двух независимых выборок.
+
+**Синтаксис**
+
+``` sql
+kolmogorovSmirnovTest([alternative, computation_method])(sample_data, sample_index)
+```
+
+Значения выборок берутся из столбца `sample_data`. Если  `sample_index` равно 0, то значение из этой строки принадлежит первой выборке. Во всех остальных случаях значение принадлежит второй выборке.
+Выборки должны принадлежать непрерывным одномерным распределениям.
+
+**Аргументы**
+
+-   `sample_data` — данные выборок. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+-   `sample_index` — индексы выборок. [Integer](../../../sql-reference/data-types/int-uint.md).
+
+**Параметры**
+
+- `alternative` — альтернативная гипотеза (Необязательный параметр, по умолчанию: `'two-sided'`.) [String](../../../sql-reference/data-types/string.md).
+    Пусть F(x) и G(x) - функции распределения первой и второй выборки соотвественно.
+    - `'two-sided'`
+        Нулевая гипотеза состоит в том, что выборки происходит из одного и того же распределение, то есть F(x) = G(x) для любого x.
+        Альтернатива - выборки принадлежат разным распределениям.
+    - `'greater'`
+        Нулевая гипотеза состоит в том, что элементы первой выборки в асимптотически почти наверное меньше элементов из второй выборки,
+        то есть функция распределения первой выборки лежит выше и соотвественно левее, чем функция распределения второй выборки.
+        Таким образом это означает, что F(x) >= G(x) for любого x, а альтернатива в этом случае состоит в том, что F(x) < G(x) хотя бы для одного x.
+    - `'less'`.
+        Нулевая гипотеза состоит в том, что элементы первой выборки в асимптотически почти наверное больше элементов из второй выборки,
+        то есть функция распределения первой выборки лежит ниже и соотвественно правее, чем функция распределения второй выборки.
+        Таким образом это означает, что F(x) <= G(x) for любого x, а альтернатива в этом случае состоит в том, что F(x) > G(x) хотя бы для одного x.
+- `computation_method` — метод, используемый для вычисления p-value. (Необязательный параметр, по умолчанию: `'auto'`.) [String](../../../sql-reference/data-types/string.md).
+    - `'exact'` - вычисление производится с помощью вычисления точного распределения статистики. Требует большого количества вычислительных ресурсов и расточительно для больших выборок.
+    - `'asymp'`(`'asymptotic'`) - используется приближенное вычисление. Для больших выборок приближенный результат и точный почти идентичны.
+    - `'auto'`  - значение вычисляется точно (с помощью метода `'exact'`), если максимальный размер двух выборок не превышает 10'000.
+
+**Возвращаемые значения**
+
+[Кортеж](../../../sql-reference/data-types/tuple.md) с двумя элементами:
+
+-   вычисленное статистики. [Float64](../../../sql-reference/data-types/float.md).
+-   вычисленное p-value. [Float64](../../../sql-reference/data-types/float.md).
+
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT kolmogorovSmirnovTest('less', 'exact')(value, num)
+FROM
+(
+    SELECT
+        randNormal(0, 10) AS value,
+        0 AS num
+    FROM numbers(10000)
+    UNION ALL
+    SELECT
+        randNormal(0, 10) AS value,
+        1 AS num
+    FROM numbers(10000)
+)
+```
+
+Результат:
+
+``` text
+┌─kolmogorovSmirnovTest('less', 'exact')(value, num)─┐
+│ (0.009899999999999996,0.37528595205132287)         │
+└────────────────────────────────────────────────────┘
+```
+
+Заметки:
+P-value больше чем 0.05 (для уровня значимости 95%), то есть нулевая гипотеза не отвергается.
+
+
+Запрос:
+
+``` sql
+SELECT kolmogorovSmirnovTest('two-sided', 'exact')(value, num)
+FROM
+(
+    SELECT
+        randStudentT(10) AS value,
+        0 AS num
+    FROM numbers(100)
+    UNION ALL
+    SELECT
+        randNormal(0, 10) AS value,
+        1 AS num
+    FROM numbers(100)
+)
+```
+
+Результат:
+
+``` text
+┌─kolmogorovSmirnovTest('two-sided', 'exact')(value, num)─┐
+│ (0.4100000000000002,6.61735760482795e-8)                │
+└─────────────────────────────────────────────────────────┘
+```
+
+Заметки:
+P-value меньше чем 0.05 (для уровня значимости 95%), то есть нулевая гипотеза отвергается.
+
+
+**Смотрите также**
+
+- [Критерий согласия Колмогорова-Смирнова](https://ru.wikipedia.org/wiki/%D0%9A%D1%80%D0%B8%D1%82%D0%B5%D1%80%D0%B8%D0%B9_%D1%81%D0%BE%D0%B3%D0%BB%D0%B0%D1%81%D0%B8%D1%8F_%D0%9A%D0%BE%D0%BB%D0%BC%D0%BE%D0%B3%D0%BE%D1%80%D0%BE%D0%B2%D0%B0)
diff --git a/docs/ru/sql-reference/data-types/aggregatefunction.md b/docs/ru/sql-reference/data-types/aggregatefunction.md
index 21b452acb1d..e42b467e4af 100644
--- a/docs/ru/sql-reference/data-types/aggregatefunction.md
+++ b/docs/ru/sql-reference/data-types/aggregatefunction.md
@@ -6,7 +6,7 @@ sidebar_label: AggregateFunction
 
 # AggregateFunction {#data-type-aggregatefunction}
 
-Агрегатные функции могут обладать определяемым реализацией промежуточным состоянием, которое может быть сериализовано в тип данных, соответствующий AggregateFunction(…), и быть записано в таблицу обычно посредством [материализованного представления] (../../sql-reference/statements/create/view.md). Чтобы получить промежуточное состояние, обычно используются агрегатные функции с суффиксом `-State`. Чтобы в дальнейшем получить агрегированные данные необходимо использовать те же агрегатные функции с суффиксом `-Merge`.
+Агрегатные функции могут обладать определяемым реализацией промежуточным состоянием, которое может быть сериализовано в тип данных, соответствующий AggregateFunction(…), и быть записано в таблицу обычно посредством [материализованного представления](../../sql-reference/statements/create/view.md). Чтобы получить промежуточное состояние, обычно используются агрегатные функции с суффиксом `-State`. Чтобы в дальнейшем получить агрегированные данные необходимо использовать те же агрегатные функции с суффиксом `-Merge`.
 
 `AggregateFunction(name, types_of_arguments…)` — параметрический тип данных.
 
diff --git a/docs/ru/sql-reference/data-types/datetime.md b/docs/ru/sql-reference/data-types/datetime.md
index b513c51397e..e8d4a3ee9fd 100644
--- a/docs/ru/sql-reference/data-types/datetime.md
+++ b/docs/ru/sql-reference/data-types/datetime.md
@@ -27,9 +27,9 @@ DateTime([timezone])
 
 Консольный клиент ClickHouse по умолчанию использует часовой пояс сервера, если для значения `DateTime` часовой пояс не был задан в явном виде при инициализации типа данных. Чтобы использовать часовой пояс клиента, запустите [clickhouse-client](../../interfaces/cli.md) с параметром `--use_client_time_zone`.
 
-ClickHouse отображает значения в зависимости от значения параметра [date\_time\_output\_format](../../operations/settings/#settings-date_time_output_format). Текстовый формат по умолчанию `YYYY-MM-DD hh:mm:ss`. Кроме того, вы можете поменять отображение с помощью функции [formatDateTime](../../sql-reference/functions/date-time-functions.md#formatdatetime).
+ClickHouse отображает значения в зависимости от значения параметра [date\_time\_output\_format](../../operations/settings/index.md#settings-date_time_output_format). Текстовый формат по умолчанию `YYYY-MM-DD hh:mm:ss`. Кроме того, вы можете поменять отображение с помощью функции [formatDateTime](../../sql-reference/functions/date-time-functions.md#formatdatetime).
 
-При вставке данных в ClickHouse, можно использовать различные форматы даты и времени в зависимости от значения настройки [date_time_input_format](../../operations/settings/#settings-date_time_input_format).
+При вставке данных в ClickHouse, можно использовать различные форматы даты и времени в зависимости от значения настройки [date_time_input_format](../../operations/settings/index.md#settings-date_time_input_format).
 
 ## Примеры {#primery}
 
@@ -119,8 +119,8 @@ FROM dt
 -   [Функции преобразования типов](../../sql-reference/functions/type-conversion-functions.md)
 -   [Функции для работы с датой и временем](../../sql-reference/functions/date-time-functions.md)
 -   [Функции для работы с массивами](../../sql-reference/functions/array-functions.md)
--   [Настройка `date_time_input_format`](../../operations/settings/#settings-date_time_input_format)
--   [Настройка `date_time_output_format`](../../operations/settings/)
+-   [Настройка `date_time_input_format`](../../operations/settings/index.md#settings-date_time_input_format)
+-   [Настройка `date_time_output_format`](../../operations/settings/index.md)
 -   [Конфигурационный параметр сервера `timezone`](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
 -   [Операторы для работы с датой и временем](../../sql-reference/operators/index.md#operators-datetime)
 -   [Тип данных `Date`](date.md)
diff --git a/docs/ru/sql-reference/data-types/geo.md b/docs/ru/sql-reference/data-types/geo.md
index a7c5f79b0be..52c7dd97da0 100644
--- a/docs/ru/sql-reference/data-types/geo.md
+++ b/docs/ru/sql-reference/data-types/geo.md
@@ -8,12 +8,8 @@ sidebar_label: Географические структуры
 
 ClickHouse поддерживает типы данных для отображения географических объектов — точек (местоположений), территорий и т.п.
 
-:::danger "Предупреждение"
-    Сейчас использование типов данных для работы с географическими структурами является экспериментальной возможностью. Чтобы использовать эти типы данных, включите настройку `allow_experimental_geo_types = 1`.
-
 **См. также**
 - [Хранение географических структур данных](https://ru.wikipedia.org/wiki/GeoJSON).
-- Настройка [allow_experimental_geo_types](../../operations/settings/settings.md#allow-experimental-geo-types).
 
 ## Point {#point-data-type}
 
@@ -24,7 +20,6 @@ ClickHouse поддерживает типы данных для отображ
 Запрос:
 
 ```sql
-SET allow_experimental_geo_types = 1;
 CREATE TABLE geo_point (p Point) ENGINE = Memory();
 INSERT INTO geo_point VALUES((10, 10));
 SELECT p, toTypeName(p) FROM geo_point;
@@ -46,7 +41,6 @@ SELECT p, toTypeName(p) FROM geo_point;
 Запрос:
 
 ```sql
-SET allow_experimental_geo_types = 1;
 CREATE TABLE geo_ring (r Ring) ENGINE = Memory();
 INSERT INTO geo_ring VALUES([(0, 0), (10, 0), (10, 10), (0, 10)]);
 SELECT r, toTypeName(r) FROM geo_ring;
@@ -68,7 +62,6 @@ SELECT r, toTypeName(r) FROM geo_ring;
 Запись в этой таблице описывает многоугольник с одной дырой:
 
 ```sql
-SET allow_experimental_geo_types = 1;
 CREATE TABLE geo_polygon (pg Polygon) ENGINE = Memory();
 INSERT INTO geo_polygon VALUES([[(20, 20), (50, 20), (50, 50), (20, 50)], [(30, 30), (50, 50), (50, 30)]]);
 SELECT pg, toTypeName(pg) FROM geo_polygon;
@@ -91,7 +84,6 @@ SELECT pg, toTypeName(pg) FROM geo_polygon;
 Запись в этой таблице описывает элемент, состоящий из двух многоугольников — первый без дыр, а второй с одной дырой:
 
 ```sql
-SET allow_experimental_geo_types = 1;
 CREATE TABLE geo_multipolygon (mpg MultiPolygon) ENGINE = Memory();
 INSERT INTO geo_multipolygon VALUES([[[(0, 0), (10, 0), (10, 10), (0, 10)]], [[(20, 20), (50, 20), (50, 50), (20, 50)],[(30, 30), (50, 50), (50, 30)]]]);
 SELECT mpg, toTypeName(mpg) FROM geo_multipolygon;
diff --git a/docs/ru/sql-reference/data-types/special-data-types/interval.md b/docs/ru/sql-reference/data-types/special-data-types/interval.md
index 856275ed8f2..109ceee7852 100644
--- a/docs/ru/sql-reference/data-types/special-data-types/interval.md
+++ b/docs/ru/sql-reference/data-types/special-data-types/interval.md
@@ -10,6 +10,7 @@ sidebar_label: Interval
 
 :::danger "Внимание"
     Нельзя использовать типы данных `Interval` для хранения данных в таблице.
+:::
 
 Структура:
 
diff --git a/docs/ru/sql-reference/data-types/tuple.md b/docs/ru/sql-reference/data-types/tuple.md
index 76370d01c0d..8953134d154 100644
--- a/docs/ru/sql-reference/data-types/tuple.md
+++ b/docs/ru/sql-reference/data-types/tuple.md
@@ -34,7 +34,7 @@ SELECT tuple(1,'a') AS x, toTypeName(x)
 
 ## Особенности работы с типами данных {#osobennosti-raboty-s-tipami-dannykh}
 
-При создании кортежа «на лету» ClickHouse автоматически определяет тип каждого аргументов как минимальный из типов, который может сохранить значение аргумента. Если аргумент — [NULL](../../sql-reference/data-types/tuple.md#null-literal), то тип элемента кортежа — [Nullable](nullable.md).
+При создании кортежа «на лету» ClickHouse автоматически определяет тип всех аргументов как минимальный из типов, который может сохранить значение аргумента. Если аргумент — [NULL](../../sql-reference/data-types/tuple.md#null-literal), то тип элемента кортежа — [Nullable](nullable.md).
 
 Пример автоматического определения типа данных:
 
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
index 64637edc4a4..24f29d3bf53 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
@@ -61,7 +61,7 @@ LAYOUT(POLYGON(STORE_POLYGON_KEY_COLUMN 1))
 -   Мультиполигон. Представляет из себя массив полигонов. Каждый полигон задается двумерным массивом точек — первый элемент этого массива задает внешнюю границу полигона,
 последующие элементы могут задавать дырки, вырезаемые из него.
 
-Точки могут задаваться массивом или кортежем из своих координат. В текущей реализации поддерживается только двумерные точки.
+Точки могут задаваться массивом или кортежем из своих координат. В текущей реализации поддерживаются только двумерные точки.
 
 Пользователь может [загружать свои собственные данные](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md) во всех поддерживаемых ClickHouse форматах.
 
@@ -80,7 +80,7 @@ LAYOUT(POLYGON(STORE_POLYGON_KEY_COLUMN 1))
 -   `POLYGON`. Синоним к `POLYGON_INDEX_CELL`.
 
 Запросы к словарю осуществляются с помощью стандартных [функций](../../../sql-reference/functions/ext-dict-functions.md) для работы со внешними словарями.
-Важным отличием является то, что здесь ключами будут являются точки, для которых хочется найти содержащий их полигон.
+Важным отличием является то, что здесь ключами являются точки, для которых хочется найти содержащий их полигон.
 
 **Пример**
 
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
index 8c01b8295bf..a711287ae8e 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
@@ -59,6 +59,7 @@ ClickHouse поддерживает следующие виды ключей:
 
 :::danger "Обратите внимание"
     Ключ не надо дополнительно описывать в атрибутах.
+:::
 
 ### Числовой ключ {#ext_dict-numeric-key}
 
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts.md
index 314fefab5eb..a262a354889 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts.md
@@ -14,7 +14,7 @@ ClickHouse:
 - Периодически обновляет их и динамически подгружает отсутствующие значения.
 - Позволяет создавать внешние словари с помощью xml-файлов или [DDL-запросов](../../statements/create/dictionary.md#create-dictionary-query).
 
-Конфигурация внешних словарей может находится в одном или нескольких xml-файлах. Путь к конфигурации указывается в параметре [dictionaries_config](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_config).
+Конфигурация внешних словарей может находиться в одном или нескольких xml-файлах. Путь к конфигурации указывается в параметре [dictionaries_config](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_config).
 
 Словари могут загружаться при старте сервера или при первом использовании, в зависимости от настройки [dictionaries_lazy_load](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_lazy_load).
 
diff --git a/docs/ru/sql-reference/functions/array-functions.md b/docs/ru/sql-reference/functions/array-functions.md
index bb2716b2741..c43323d68fd 100644
--- a/docs/ru/sql-reference/functions/array-functions.md
+++ b/docs/ru/sql-reference/functions/array-functions.md
@@ -695,7 +695,11 @@ SELECT arraySort((x, y) -> -y, [0, 1, 2], [1, 2, 3]) as res;
 :::note "Примечание"
     Для улучшения эффективности сортировки применяется [преобразование Шварца](https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B5%D0%BE%D0%B1%D1%80%D0%B0%D0%B7%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D0%B5_%D0%A8%D0%B2%D0%B0%D1%80%D1%86%D0%B0).
 :::
-    
+
+## arrayPartialSort(\[func,\] limit, arr, …) {#array_functions-sort}
+
+То же, что и `arraySort` с дополнительным аргументом `limit`, позволяющим частичную сортировку. Возвращает массив того же размера, как и исходный, в котором элементы `[1..limit]` отсортированы в возрастающем порядке. Остальные элементы `(limit..N]` остаются в неспецифицированном порядке.
+
 ## arrayReverseSort(\[func,\] arr, …) {#array_functions-reverse-sort}
 
 Возвращает массив `arr`, отсортированный в нисходящем порядке. Если указана функция `func`, то массив `arr` сначала сортируется в порядке, который определяется функцией `func`, а затем отсортированный массив переворачивается. Если функция `func` принимает несколько аргументов, то в функцию `arrayReverseSort` необходимо передавать несколько массивов, которые будут соответствовать аргументам функции `func`. Подробные примеры рассмотрены в конце описания функции `arrayReverseSort`.
@@ -797,6 +801,10 @@ SELECT arrayReverseSort((x, y) -> -y, [4, 3, 5], [1, 2, 3]) AS res;
 └─────────┘
 ```
 
+## arrayPartialReverseSort(\[func,\] limit, arr, …) {#array_functions-sort}
+
+То же, что и `arrayReverseSort` с дополнительным аргументом `limit`, позволяющим частичную сортировку. Возвращает массив того же размера, как и исходный, в котором элементы `[1..limit]` отсортированы в убывающем порядке. Остальные элементы `(limit..N]` остаются в неспецифицированном порядке.
+
 ## arrayUniq(arr, …) {#array-functions-arrayuniq}
 
 Если передан один аргумент, считает количество разных элементов в массиве.
diff --git a/docs/ru/sql-reference/functions/date-time-functions.md b/docs/ru/sql-reference/functions/date-time-functions.md
index 8fbcaf9568b..5111441c0b9 100644
--- a/docs/ru/sql-reference/functions/date-time-functions.md
+++ b/docs/ru/sql-reference/functions/date-time-functions.md
@@ -235,13 +235,13 @@ SELECT toDateTime('2021-04-21 10:20:30', 'Europe/Moscow') AS Time, toTypeName(Ti
 
 ## toUnixTimestamp {#to-unix-timestamp}
 
-Переводит дату-с-временем в число типа UInt32 -- Unix Timestamp (https://en.wikipedia.org/wiki/Unix_time).
-Для аргумента String, строка конвертируется в дату и время в соответствии с часовым поясом (необязательный второй аргумент, часовой пояс сервера используется по умолчанию).
+Переводит строку, дату или дату-с-временем в [Unix Timestamp](https://en.wikipedia.org/wiki/Unix_time), имеющий тип `UInt32`.
+Строка может сопровождаться вторым (необязательным) аргументом, указывающим часовой пояс.
 
 **Синтаксис**
 
 ``` sql
-toUnixTimestamp(datetime)
+toUnixTimestamp(date)
 toUnixTimestamp(str, [timezone])
 ```
 
@@ -256,19 +256,33 @@ toUnixTimestamp(str, [timezone])
 Запрос:
 
 ``` sql
-SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp;
+SELECT
+    '2017-11-05 08:07:47' AS dt_str,
+    toUnixTimestamp(dt_str) AS from_str,
+    toUnixTimestamp(dt_str, 'Asia/Tokyo') AS from_str_tokyo,
+    toUnixTimestamp(toDateTime(dt_str)) AS from_datetime,
+    toUnixTimestamp(toDateTime64(dt_str, 0)) AS from_datetime64,
+    toUnixTimestamp(toDate(dt_str)) AS from_date,
+    toUnixTimestamp(toDate32(dt_str)) AS from_date32
+FORMAT Vertical;
 ```
 
 Результат:
 
 ``` text
-┌─unix_timestamp─┐
-│     1509836867 │
-└────────────────┘
+Row 1:
+──────
+dt_str:          2017-11-05 08:07:47
+from_str:        1509869267
+from_str_tokyo:  1509836867
+from_datetime:   1509869267
+from_datetime64: 1509869267
+from_date:       1509840000
+from_date32:     1509840000
 ```
 
 :::note
-Тип возвращаемого значения описанными далее функциями `toStartOf*`, `toLastDayOfMonth`, `toMonday`, `timeSlot` определяется конфигурационным параметром [enable_extended_results_for_datetime_functions](../../operations/settings/settings#enable-extended-results-for-datetime-functions) имеющим по умолчанию значение `0`.
+Тип возвращаемого значения описанными далее функциями `toStartOf*`, `toLastDayOfMonth`, `toMonday`, `timeSlot` определяется конфигурационным параметром [enable_extended_results_for_datetime_functions](../../operations/settings/settings.md#enable-extended-results-for-datetime-functions) имеющим по умолчанию значение `0`.
 
 Поведение для
 * `enable_extended_results_for_datetime_functions = 0`: Функции `toStartOf*`, `toLastDayOfMonth`, `toMonday` возвращают `Date` или `DateTime`. Функции `toStartOfDay`, `toStartOfHour`, `toStartOfFifteenMinutes`, `toStartOfTenMinutes`, `toStartOfFiveMinutes`, `toStartOfMinute`, `timeSlot` возвращают `DateTime`. Хотя эти функции могут принимать значения типа `Date32` или `DateTime64` в качестве аргумента, при обработке аргумента вне нормального диапазона значений (`1970` - `2148` для `Date` и `1970-01-01 00:00:00`-`2106-02-07 08:28:15` для `DateTime`) будет получен некорректный результат.
diff --git a/docs/ru/sql-reference/functions/encryption-functions.md b/docs/ru/sql-reference/functions/encryption-functions.md
index 68a32b80e5b..711d903110c 100644
--- a/docs/ru/sql-reference/functions/encryption-functions.md
+++ b/docs/ru/sql-reference/functions/encryption-functions.md
@@ -107,7 +107,7 @@ SELECT comment, hex(secret) FROM encryption_test WHERE comment LIKE '%gcm%';
 
 ## aes_encrypt_mysql {#aes_encrypt_mysql}
 
-Совместима с шифрованием myqsl, результат может быть расшифрован функцией [AES_DECRYPT](https://dev.mysql.com/doc/refman/8.0/en/encryption-functions.html#function_aes-decrypt).
+Совместима с шифрованием mysql, результат может быть расшифрован функцией [AES_DECRYPT](https://dev.mysql.com/doc/refman/8.0/en/encryption-functions.html#function_aes-decrypt).
 
 При одинаковых входящих значениях зашифрованный текст будет совпадать с результатом, возвращаемым функцией `encrypt`. Однако если `key` или `iv` длиннее, чем должны быть, `aes_encrypt_mysql` будет работать аналогично функции `aes_encrypt` в MySQL: свернет ключ и проигнорирует лишнюю часть `iv`.
 
@@ -298,7 +298,7 @@ SELECT comment, decrypt('aes-256-ofb', secret, '12345678910121314151617181920212
 
 ## aes_decrypt_mysql {#aes_decrypt_mysql}
 
-Совместима с шифрованием myqsl и может расшифровать данные, зашифрованные функцией [AES_ENCRYPT](https://dev.mysql.com/doc/refman/8.0/en/encryption-functions.html#function_aes-encrypt).
+Совместима с шифрованием mysql и может расшифровать данные, зашифрованные функцией [AES_ENCRYPT](https://dev.mysql.com/doc/refman/8.0/en/encryption-functions.html#function_aes-encrypt).
 
 При одинаковых входящих значениях расшифрованный текст будет совпадать с результатом, возвращаемым функцией `decrypt`. Однако если `key` или `iv` длиннее, чем должны быть, `aes_decrypt_mysql` будет работать аналогично функции `aes_decrypt` в MySQL: свернет ключ и проигнорирует лишнюю часть `iv`.
 
diff --git a/docs/ru/sql-reference/functions/introspection.md b/docs/ru/sql-reference/functions/introspection.md
index 7d04dff6b72..26497ef21d3 100644
--- a/docs/ru/sql-reference/functions/introspection.md
+++ b/docs/ru/sql-reference/functions/introspection.md
@@ -22,7 +22,7 @@ sidebar_label: "Функции интроспекции"
 
 ClickHouse сохраняет отчеты профилировщика в [журнал трассировки](../../operations/system-tables/trace_log.md#system_tables-trace_log) в системной таблице. Убедитесь, что таблица и профилировщик настроены правильно.
 
-## addresssToLine {#addresstoline}
+## addressToLine {#addresstoline}
 
 Преобразует адрес виртуальной памяти внутри процесса сервера ClickHouse в имя файла и номер строки в исходном коде ClickHouse.
 
diff --git a/docs/ru/sql-reference/functions/other-functions.md b/docs/ru/sql-reference/functions/other-functions.md
index f457b54ae28..de54f1b3607 100644
--- a/docs/ru/sql-reference/functions/other-functions.md
+++ b/docs/ru/sql-reference/functions/other-functions.md
@@ -2136,7 +2136,7 @@ countDigits(x)
 :::note "Примечание"
     Для `Decimal` значений учитывается их масштаб: вычисляется результат по базовому целочисленному типу, полученному как `(value * scale)`. Например: `countDigits(42) = 2`, `countDigits(42.000) = 5`, `countDigits(0.04200) = 4`. То есть вы можете проверить десятичное переполнение для `Decimal64` с помощью `countDecimal(x) > 18`. Это медленный вариант [isDecimalOverflow](#is-decimal-overflow).
 :::
- 
+
 **Пример**
 
 Запрос:
@@ -2297,7 +2297,7 @@ enabledRoles()
 
 ## defaultRoles {#default-roles}
 
-Возвращает имена ролей, которые задаются по умолчанию для текущего пользователя при входе в систему. Изначально это все роли, которые разрешено использовать текущему пользователю (см. [GRANT](../../sql-reference/statements/grant/#grant-select)). Список ролей по умолчанию может быть изменен с помощью выражения [SET DEFAULT ROLE](../../sql-reference/statements/set-role.md#set-default-role-statement).
+Возвращает имена ролей, которые задаются по умолчанию для текущего пользователя при входе в систему. Изначально это все роли, которые разрешено использовать текущему пользователю (см. [GRANT](../../sql-reference/statements/grant.md#grant-select)). Список ролей по умолчанию может быть изменен с помощью выражения [SET DEFAULT ROLE](../../sql-reference/statements/set-role.md#set-default-role-statement).
 
 **Синтаксис**
 
diff --git a/docs/ru/sql-reference/functions/type-conversion-functions.md b/docs/ru/sql-reference/functions/type-conversion-functions.md
index c2beb55fee1..298b7bbc93e 100644
--- a/docs/ru/sql-reference/functions/type-conversion-functions.md
+++ b/docs/ru/sql-reference/functions/type-conversion-functions.md
@@ -553,6 +553,44 @@ SELECT toFixedString('foo\0bar', 8) AS s, toStringCutToZero(s) AS s_cut;
 └────────────┴───────┘
 ```
 
+## toDecimalString
+
+Принимает любой численный тип первым аргументом, возвращает строковое десятичное представление числа с точностью, заданной вторым аргументом.
+
+**Синтаксис**
+
+``` sql
+toDecimalString(number, scale)
+```
+
+**Параметры**
+
+-   `number` — Значение любого числового типа: [Int, UInt](/docs/ru/sql-reference/data-types/int-uint.md), [Float](/docs/ru/sql-reference/data-types/float.md), [Decimal](/docs/ru/sql-reference/data-types/decimal.md),
+-   `scale` — Требуемое количество десятичных знаков после запятой, [UInt8](/docs/ru/sql-reference/data-types/int-uint.md).
+    * Значение `scale` для типов [Decimal](/docs/ru/sql-reference/data-types/decimal.md) и [Int, UInt](/docs/ru/sql-reference/data-types/int-uint.md) должно не превышать 77 (так как это наибольшее количество значимых символов для этих типов),
+    * Значение `scale` для типа [Float](/docs/ru/sql-reference/data-types/float.md) не должно превышать 60.
+
+**Возвращаемое значение**
+
+-   Строка ([String](/docs/en/sql-reference/data-types/string.md)), представляющая собой десятичное представление входного числа с заданной длиной дробной части.
+    При необходимости число округляется по стандартным правилам арифметики.
+
+**Пример использования**
+
+Запрос:
+
+``` sql
+SELECT toDecimalString(CAST('64.32', 'Float64'), 5);
+```
+
+Результат:
+
+```response
+┌─toDecimalString(CAST('64.32', 'Float64'), 5)┐
+│ 64.32000                                    │
+└─────────────────────────────────────────────┘
+```
+
 ## reinterpretAsUInt(8\|16\|32\|64) {#reinterpretasuint8163264}
 
 ## reinterpretAsInt(8\|16\|32\|64) {#reinterpretasint8163264}
diff --git a/docs/ru/sql-reference/operators/exists.md b/docs/ru/sql-reference/operators/exists.md
index 3fc085fe021..38855abbcf3 100644
--- a/docs/ru/sql-reference/operators/exists.md
+++ b/docs/ru/sql-reference/operators/exists.md
@@ -8,7 +8,8 @@ slug: /ru/sql-reference/operators/exists
 `EXISTS` может быть использован в секции [WHERE](../../sql-reference/statements/select/where.md).
 
 :::danger "Предупреждение"
-    Ссылки на таблицы или столбцы основного запроса не поддерживаются в подзапросе. 
+    Ссылки на таблицы или столбцы основного запроса не поддерживаются в подзапросе.
+:::
 
 **Синтаксис**
 
diff --git a/docs/ru/sql-reference/operators/in.md b/docs/ru/sql-reference/operators/in.md
index fa679b890a7..60400fb2b31 100644
--- a/docs/ru/sql-reference/operators/in.md
+++ b/docs/ru/sql-reference/operators/in.md
@@ -38,9 +38,9 @@ SELECT '1' IN (SELECT 1);
 └──────────────────────┘
 ```
 
-Если в качестве правой части оператора указано имя таблицы (например, `UserID IN users`), то это эквивалентно подзапросу `UserID IN (SELECT * FROM users)`. Это используется при работе с внешними данными, отправляемым вместе с запросом. Например, вместе с запросом может быть отправлено множество идентификаторов посетителей, загруженное во временную таблицу users, по которому следует выполнить фильтрацию.
+Если в качестве правой части оператора указано имя таблицы (например, `UserID IN users`), то это эквивалентно подзапросу `UserID IN (SELECT * FROM users)`. Это используется при работе с внешними данными, отправляемыми вместе с запросом. Например, вместе с запросом может быть отправлено множество идентификаторов посетителей, загруженное во временную таблицу users, по которому следует выполнить фильтрацию.
 
-Если в качестве правой части оператора, указано имя таблицы, имеющий движок Set (подготовленное множество, постоянно находящееся в оперативке), то множество не будет создаваться заново при каждом запросе.
+Если в качестве правой части оператора, указано имя таблицы, имеющей движок Set (подготовленное множество, постоянно находящееся в оперативке), то множество не будет создаваться заново при каждом запросе.
 
 В подзапросе может быть указано более одного столбца для фильтрации кортежей.
 Пример:
@@ -49,9 +49,9 @@ SELECT '1' IN (SELECT 1);
 SELECT (CounterID, UserID) IN (SELECT CounterID, UserID FROM ...) FROM ...
 ```
 
-Типы столбцов слева и справа оператора IN, должны совпадать.
+Типы столбцов слева и справа оператора IN должны совпадать.
 
-Оператор IN и подзапрос могут встречаться в любой части запроса, в том числе в агрегатных и лямбда функциях.
+Оператор IN и подзапрос могут встречаться в любой части запроса, в том числе в агрегатных и лямбда-функциях.
 Пример:
 
 ``` sql
@@ -122,7 +122,7 @@ FROM t_null
 
 Существует два варианта IN-ов с подзапросами (аналогично для JOIN-ов): обычный `IN` / `JOIN` и `GLOBAL IN` / `GLOBAL JOIN`. Они отличаются способом выполнения при распределённой обработке запроса.
 
-:::note "Attention"
+:::note "Внимание"
 Помните, что алгоритмы, описанные ниже, могут работать иначе в зависимости от [настройки](../../operations/settings/settings.md) `distributed_product_mode`.
 :::
 При использовании обычного IN-а, запрос отправляется на удалённые серверы, и на каждом из них выполняются подзапросы в секциях `IN` / `JOIN`.
@@ -228,7 +228,7 @@ SELECT CounterID, count() FROM distributed_table_1 WHERE UserID IN (SELECT UserI
 SETTINGS max_parallel_replicas=3
 ```
 
-преобразуются на каждом сервере в
+преобразуется на каждом сервере в
 
 ```sql
 SELECT CounterID, count() FROM local_table_1 WHERE UserID IN (SELECT UserID FROM local_table_2 WHERE CounterID < 100)
diff --git a/docs/ru/sql-reference/operators/index.md b/docs/ru/sql-reference/operators/index.md
index 57c426cb5ad..b5fec3cb38c 100644
--- a/docs/ru/sql-reference/operators/index.md
+++ b/docs/ru/sql-reference/operators/index.md
@@ -263,6 +263,7 @@ SELECT toDateTime('2014-10-26 00:00:00', 'Europe/Moscow') AS time, time + 60 * 6
 │ 2014-10-26 00:00:00 │ 2014-10-26 23:00:00 │ 2014-10-27 00:00:00 │
 └─────────────────────┴─────────────────────┴─────────────────────┘
 ```
+:::
 
 **Смотрите также**
 
diff --git a/docs/ru/sql-reference/statements/alter/partition.md b/docs/ru/sql-reference/statements/alter/partition.md
index 95d02c062bd..90688c9ece2 100644
--- a/docs/ru/sql-reference/statements/alter/partition.md
+++ b/docs/ru/sql-reference/statements/alter/partition.md
@@ -102,7 +102,11 @@ ALTER TABLE table2 [ON CLUSTER cluster] ATTACH PARTITION partition_expr FROM tab
 ```
 
 Копирует партицию из таблицы `table1` в таблицу `table2`.
-Обратите внимание, что данные не удаляются ни из `table1`, ни из `table2`.
+
+Обратите внимание, что:
+
+- Данные не удаляются ни из `table1`, ни из `table2`.
+- `table1` может быть временной таблицей.
 
 Следует иметь в виду:
 
@@ -118,7 +122,12 @@ ALTER TABLE table2 [ON CLUSTER cluster] ATTACH PARTITION partition_expr FROM tab
 ALTER TABLE table2 [ON CLUSTER cluster] REPLACE PARTITION partition_expr FROM table1
 ```
 
-Копирует партицию из таблицы `table1` в таблицу `table2` с заменой существующих данных в `table2`. Данные из `table1` не удаляются.
+Копирует партицию из таблицы `table1` в таблицу `table2` с заменой существующих данных в `table2`.
+
+Обратите внимание, что:
+
+- Данные из `table1` не удаляются.
+- `table1` может быть временной таблицей.
 
 Следует иметь в виду:
 
diff --git a/docs/ru/sql-reference/statements/alter/view.md b/docs/ru/sql-reference/statements/alter/view.md
index 2d4823bba3a..e6f6730ff99 100644
--- a/docs/ru/sql-reference/statements/alter/view.md
+++ b/docs/ru/sql-reference/statements/alter/view.md
@@ -6,7 +6,7 @@ sidebar_label: VIEW
 
 # Выражение ALTER TABLE … MODIFY QUERY {#alter-modify-query}
 
-Вы можеие изменить запрос `SELECT`, который был задан при создании [материализованного представления](../create/view.md#materialized), с помощью запроса 'ALTER TABLE … MODIFY QUERY'. Используйте его если при создании материализованного представления не использовалась секция `TO [db.]name`. Настройка `allow_experimental_alter_materialized_view_structure` должна быть включена. 
+Вы можете изменить запрос `SELECT`, который был задан при создании [материализованного представления](../create/view.md#materialized), с помощью запроса 'ALTER TABLE … MODIFY QUERY'. Используйте его если при создании материализованного представления не использовалась секция `TO [db.]name`. Настройка `allow_experimental_alter_materialized_view_structure` должна быть включена. 
 
 Если при создании материализованного представления использовалась конструкция `TO [db.]name`, то для изменения отсоедините представление с помощью [DETACH](../detach.md), измените таблицу с помощью [ALTER TABLE](index.md), а затем снова присоедините запрос с помощью [ATTACH](../attach.md).
 
diff --git a/docs/ru/sql-reference/statements/create/table.md b/docs/ru/sql-reference/statements/create/table.md
index c29d575cac1..64eae49be6c 100644
--- a/docs/ru/sql-reference/statements/create/table.md
+++ b/docs/ru/sql-reference/statements/create/table.md
@@ -260,8 +260,8 @@ ENGINE = MergeTree()
 
 Кодеки шифрования:
 
--   `CODEC('AES-128-GCM-SIV')` — Зашифровывает данные с помощью AES-128 в режиме [RFC 8452](https://tools.ietf.org/html/rfc8452) GCM-SIV. 
--   `CODEC('AES-256-GCM-SIV')` — Зашифровывает данные с помощью AES-256 в режиме GCM-SIV. 
+-   `CODEC('AES-128-GCM-SIV')` — Зашифровывает данные с помощью AES-128 в режиме [RFC 8452](https://tools.ietf.org/html/rfc8452) GCM-SIV.
+-   `CODEC('AES-256-GCM-SIV')` — Зашифровывает данные с помощью AES-256 в режиме GCM-SIV.
 
 Эти кодеки используют фиксированный одноразовый ключ шифрования. Таким образом, это детерминированное шифрование. Оно совместимо с поддерживающими дедупликацию движками, в частности, [ReplicatedMergeTree](../../../engines/table-engines/mergetree-family/replication.md). Однако у шифрования имеется недостаток: если дважды зашифровать один и тот же блок данных, текст на выходе получится одинаковым, и злоумышленник, у которого есть доступ к диску, заметит эту эквивалентность (при этом доступа к содержимому он не получит).
 
@@ -274,10 +274,10 @@ ENGINE = MergeTree()
 **Пример**
 
 ```sql
-CREATE TABLE mytable 
+CREATE TABLE mytable
 (
     x String Codec(AES_128_GCM_SIV)
-) 
+)
 ENGINE = MergeTree ORDER BY x;
 ```
 
@@ -287,10 +287,10 @@ ENGINE = MergeTree ORDER BY x;
 **Пример**
 
 ```sql
-CREATE TABLE mytable 
+CREATE TABLE mytable
 (
     x String Codec(Delta, LZ4, AES_128_GCM_SIV)
-) 
+)
 ENGINE = MergeTree ORDER BY x;
 ```
 
@@ -299,9 +299,9 @@ ENGINE = MergeTree ORDER BY x;
 ClickHouse поддерживает временные таблицы со следующими характеристиками:
 
 -   Временные таблицы исчезают после завершения сессии, в том числе при обрыве соединения.
--   Временная таблица использует только модуль памяти.
+-   Временная таблица использует движок таблиц Memory когда движок не указан и она может использовать любой движок таблиц за исключением движков Replicated и `KeeperMap`.
 -   Невозможно указать базу данных для временной таблицы. Она создается вне баз данных.
--   Невозможно создать временную таблицу распределнным DDL запросом на всех серверах кластера (с опцией `ON CLUSTER`): такая таблица существует только в рамках существующей сессии.
+-   Невозможно создать временную таблицу распределённым DDL запросом на всех серверах кластера (с опцией `ON CLUSTER`): такая таблица существует только в рамках существующей сессии.
 -   Если временная таблица имеет то же имя, что и некоторая другая, то, при упоминании в запросе без указания БД, будет использована временная таблица.
 -   При распределённой обработке запроса, используемые в запросе временные таблицы, передаются на удалённые серверы.
 
@@ -313,7 +313,7 @@ CREATE TEMPORARY TABLE [IF NOT EXISTS] table_name
     name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
     name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
     ...
-)
+) [ENGINE = engine]
 ```
 
 В большинстве случаев, временные таблицы создаются не вручную, а при использовании внешних данных для запроса, или при распределённом `(GLOBAL) IN`. Подробнее см. соответствующие разделы
@@ -344,7 +344,9 @@ REPLACE TABLE myOldTable SELECT * FROM myOldTable WHERE CounterID <12345;
 
 ### Синтаксис
 
+```sql
 {CREATE [OR REPLACE]|REPLACE} TABLE [db.]table_name
+```
 
 Для данного запроса можно использовать любые варианты синтаксиса запроса `CREATE`. Запрос `REPLACE` для несуществующей таблицы вызовет ошибку.
 
diff --git a/docs/ru/sql-reference/statements/grant.md b/docs/ru/sql-reference/statements/grant.md
index 7c281634c98..9b8fafabfcc 100644
--- a/docs/ru/sql-reference/statements/grant.md
+++ b/docs/ru/sql-reference/statements/grant.md
@@ -37,6 +37,19 @@ GRANT [ON CLUSTER cluster_name] role [,...] TO {user | another_role | CURRENT_US
 `WITH ADMIN OPTION` присваивает привилегию [ADMIN OPTION](#admin-option-privilege) пользователю или роли.
 `WITH REPLACE OPTION` заменяет все старые роли новыми ролями для пользователя `user` или `role`, если не указано, добавляет новые новые роли.
 
+## Синтаксис присвоения текущих привилегий {#grant-current-grants-syntax}
+
+```sql
+GRANT CURRENT GRANTS{(privilege[(column_name [,...])] [,...] ON {db.table|db.*|*.*|table|*}) | ON {db.table|db.*|*.*|table|*}} TO {user | role | CURRENT_USER} [,...] [WITH GRANT OPTION] [WITH REPLACE OPTION]
+```
+
+- `privilege` — Тип привилегии
+- `role` — Роль пользователя ClickHouse.
+- `user` — Пользователь ClickHouse.
+
+Использование выражения `CURRENT GRANTS` позволяет присвоить все указанные и доступные для присвоения привилегии.
+Если список привелегий не задан, то указанный пользователь или роль получат все доступные привилегии для `CURRENT_USER`.
+
 ## Использование {#grant-usage}
 
 Для использования `GRANT` пользователь должен иметь привилегию `GRANT OPTION`. Пользователь может выдавать привилегии только внутри области действий назначенных ему самому привилегий.
@@ -107,7 +120,8 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
 - [CREATE](#grant-create)
     - `CREATE DATABASE`
     - `CREATE TABLE`
-        - `CREATE TEMPORARY TABLE`
+        - `CREATE ARBITRARY TEMPORARY TABLE`
+            -   `CREATE TEMPORARY TABLE`
     - `CREATE VIEW`
     - `CREATE DICTIONARY`
     - `CREATE FUNCTION`
@@ -314,7 +328,8 @@ GRANT INSERT(x,y) ON db.table TO john
 - `CREATE`. Уровень: `GROUP`
     - `CREATE DATABASE`. Уровень: `DATABASE`
     - `CREATE TABLE`. Уровень: `TABLE`
-        - `CREATE TEMPORARY TABLE`. Уровень: `GLOBAL`
+        - `CREATE ARBITRARY TEMPORARY TABLE`. Уровень: `GLOBAL`
+            - `CREATE TEMPORARY TABLE`. Уровень: `GLOBAL`
     - `CREATE VIEW`. Уровень: `VIEW`
     - `CREATE DICTIONARY`. Уровень: `DICTIONARY`
 
diff --git a/docs/ru/sql-reference/statements/optimize.md b/docs/ru/sql-reference/statements/optimize.md
index b70bba2d765..26993183232 100644
--- a/docs/ru/sql-reference/statements/optimize.md
+++ b/docs/ru/sql-reference/statements/optimize.md
@@ -10,6 +10,7 @@ sidebar_label: OPTIMIZE
 
 :::danger "Внимание"
     `OPTIMIZE` не устраняет причину появления ошибки `Too many parts`.
+:::
 
 **Синтаксис**
 
diff --git a/docs/ru/sql-reference/statements/select/array-join.md b/docs/ru/sql-reference/statements/select/array-join.md
index 9d2dbf54a2b..6c7fcbba7cc 100644
--- a/docs/ru/sql-reference/statements/select/array-join.md
+++ b/docs/ru/sql-reference/statements/select/array-join.md
@@ -146,7 +146,7 @@ ARRAY JOIN arr AS a, arrayEnumerate(arr) AS num, arrayMap(x -> x + 1, arr) AS ma
 └───────┴─────────┴───┴─────┴────────┘
 ```
 
-В приведенном ниже примере используется функция [arrayEnumerate](../../../sql-reference/functions/array-functions#array_functions-arrayenumerate):
+В приведенном ниже примере используется функция [arrayEnumerate](../../../sql-reference/functions/array-functions.md#array_functions-arrayenumerate):
 
 ``` sql
 SELECT s, arr, a, num, arrayEnumerate(arr)
@@ -259,7 +259,7 @@ ARRAY JOIN nest AS n;
 └───────┴─────┴─────┴─────────┴────────────┘
 ```
 
-Пример использования функции [arrayEnumerate](../../../sql-reference/functions/array-functions#array_functions-arrayenumerate):
+Пример использования функции [arrayEnumerate](../../../sql-reference/functions/array-functions.md#array_functions-arrayenumerate):
 
 ``` sql
 SELECT s, `n.x`, `n.y`, `nest.x`, `nest.y`, num
diff --git a/docs/ru/sql-reference/statements/select/group-by.md b/docs/ru/sql-reference/statements/select/group-by.md
index 450543cb7a2..ea4f357d33c 100644
--- a/docs/ru/sql-reference/statements/select/group-by.md
+++ b/docs/ru/sql-reference/statements/select/group-by.md
@@ -108,7 +108,7 @@ SELECT year, month, day, count(*) FROM t GROUP BY year, month, day WITH ROLLUP;
 
 ## Модификатор WITH CUBE {#with-cube-modifier}
 
-Модификатор `WITH CUBE` применятеся для расчета подытогов по всем комбинациям группировки ключевых выражений в списке `GROUP BY`.
+Модификатор `WITH CUBE` применяется для расчета подытогов по всем комбинациям группировки ключевых выражений в списке `GROUP BY`.
 
 Строки с подытогами добавляются в конец результирующей таблицы. В колонках, по которым выполняется группировка, указывается значение `0` или пустая строка.
 
diff --git a/docs/ru/sql-reference/statements/select/join.md b/docs/ru/sql-reference/statements/select/join.md
index 6853a8c8c90..6be438f8c43 100644
--- a/docs/ru/sql-reference/statements/select/join.md
+++ b/docs/ru/sql-reference/statements/select/join.md
@@ -16,7 +16,7 @@ FROM <left_table>
 (ON <expr_list>)|(USING <column_list>) ...
 ```
 
-Выражения из секции `ON` и столбцы из секции `USING`  называется «ключами соединения». Если не указано иное, при присоединение создаётся [Декартово произведение](https://en.wikipedia.org/wiki/Cartesian_product) из строк с совпадающими значениями ключей соединения, что может привести к получению результатов с гораздо большим количеством строк, чем исходные таблицы.
+Выражения из секции `ON` и столбцы из секции `USING`  называются «ключами соединения». Если не указано иное, при присоединение создаётся [Декартово произведение](https://en.wikipedia.org/wiki/Cartesian_product) из строк с совпадающими значениями ключей соединения, что может привести к получению результатов с гораздо большим количеством строк, чем исходные таблицы.
 
 ## Поддерживаемые типы соединения {#select-join-types}
 
@@ -28,7 +28,7 @@ FROM <left_table>
 -   `FULL OUTER JOIN`, не совпадающие строки из обеих таблиц возвращаются в дополнение к совпадающим строкам.
 -   `CROSS JOIN`, производит декартово произведение таблиц целиком, ключи соединения не указываются.
 
-Без указания типа `JOIN` подразумевается `INNER`. Ключевое слово `OUTER` можно опускать. Альтернативным синтаксисом для `CROSS JOIN` является ли указание нескольких таблиц, разделённых запятыми, в [секции FROM](from.md).
+Без указания типа `JOIN` подразумевается `INNER`. Ключевое слово `OUTER` можно опускать. Альтернативным синтаксисом для `CROSS JOIN` является указание нескольких таблиц, разделённых запятыми, в [секции FROM](from.md).
 
 Дополнительные типы соединений, доступные в ClickHouse:
 
@@ -62,7 +62,7 @@ FROM <left_table>
 
 Строки объединяются только тогда, когда всё составное условие выполнено. Если оно не выполнено, то строки могут попасть в результат в зависимости от типа `JOIN`. Обратите внимание, что если то же самое условие поместить в секцию `WHERE`, то строки, для которых оно не выполняется, никогда не попаду в результат.
 
-Оператор `OR` внутри секции `ON` работает, используя алгоритм хеш-соединения — на каждый агрумент `OR` с ключами соединений для `JOIN` создается отдельная хеш-таблица, поэтому потребление памяти и время выполнения запроса растет линейно при увеличении количества выражений `OR` секции `ON`.
+Оператор `OR` внутри секции `ON` работает, используя алгоритм хеш-соединения — на каждый аргумент `OR` с ключами соединений для `JOIN` создается отдельная хеш-таблица, поэтому потребление памяти и время выполнения запроса растет линейно при увеличении количества выражений `OR` секции `ON`.
 
     :::note "Примечание"
     Если в условии использованы столбцы из разных таблиц, то пока поддерживается только оператор равенства (`=`).
@@ -280,7 +280,7 @@ SELECT a, b, toTypeName(a), toTypeName(b) FROM t_1 FULL JOIN t_2 USING (a, b);
 
 Каждый раз для выполнения запроса с одинаковым `JOIN`, подзапрос выполняется заново — результат не кэшируется. Это можно избежать, используя специальный движок таблиц [Join](../../../engines/table-engines/special/join.md), представляющий собой подготовленное множество для соединения, которое всегда находится в оперативке.
 
-В некоторых случаях это более эффективно использовать [IN](../../operators/in.md) вместо `JOIN`.
+В некоторых случаях более эффективно использовать [IN](../../operators/in.md) вместо `JOIN`.
 
 Если `JOIN` необходим для соединения с таблицами измерений (dimension tables - сравнительно небольшие таблицы, которые содержат свойства измерений - например, имена для рекламных кампаний), то использование `JOIN` может быть не очень удобным из-за громоздкости синтаксиса, а также из-за того, что правая таблица читается заново при каждом запросе. Специально для таких случаев существует функциональность «Внешние словари», которую следует использовать вместо `JOIN`. Дополнительные сведения смотрите в разделе «Внешние словари».
 
diff --git a/docs/ru/sql-reference/statements/select/order-by.md b/docs/ru/sql-reference/statements/select/order-by.md
index 40efb862250..a3390501f2c 100644
--- a/docs/ru/sql-reference/statements/select/order-by.md
+++ b/docs/ru/sql-reference/statements/select/order-by.md
@@ -67,7 +67,7 @@ sidebar_label: ORDER BY
 
 ## Примеры с использованием сравнения {#collation-examples}
 
-Пример с значениями типа [String](../../../sql-reference/data-types/string.md):
+Пример со значениями типа [String](../../../sql-reference/data-types/string.md):
 
 Входная таблица:
 
@@ -241,13 +241,13 @@ SELECT * FROM collate_test ORDER BY s ASC COLLATE 'en';
 └───┴─────────┘
 ```
 
-## Деталь реализации {#implementation-details}
+## Детали реализации {#implementation-details}
 
 Если кроме `ORDER BY` указан также не слишком большой [LIMIT](limit.md), то расходуется меньше оперативки. Иначе расходуется количество памяти, пропорциональное количеству данных для сортировки. При распределённой обработке запроса, если отсутствует [GROUP BY](group-by.md), сортировка частично делается на удалённых серверах, а на сервере-инициаторе запроса производится слияние результатов. Таким образом, при распределённой сортировке, может сортироваться объём данных, превышающий размер памяти на одном сервере.
 
 Существует возможность выполнять сортировку во внешней памяти (с созданием временных файлов на диске), если оперативной памяти не хватает. Для этого предназначена настройка `max_bytes_before_external_sort`. Если она выставлена в 0 (по умолчанию), то внешняя сортировка выключена. Если она включена, то при достижении объёмом данных для сортировки указанного количества байт, накопленные данные будут отсортированы и сброшены во временный файл. После того, как все данные будут прочитаны, будет произведено слияние всех сортированных файлов и выдача результата. Файлы записываются в директорию `/var/lib/clickhouse/tmp/` (по умолчанию, может быть изменено с помощью параметра `tmp_path`) в конфиге.
 
-На выполнение запроса может расходоваться больше памяти, чем `max_bytes_before_external_sort`. Поэтому, значение этой настройки должно быть существенно меньше, чем `max_memory_usage`. Для примера, если на вашем сервере 128 GB оперативки, и вам нужно выполнить один запрос, то выставите `max_memory_usage` в 100 GB, а `max_bytes_before_external_sort` в 80 GB.
+На выполнение запроса может расходоваться больше памяти, чем `max_bytes_before_external_sort`. Поэтому значение этой настройки должно быть существенно меньше, чем `max_memory_usage`. Для примера, если на вашем сервере 128 GB оперативки, и вам нужно выполнить один запрос, то выставьте `max_memory_usage` в 100 GB, а `max_bytes_before_external_sort` в 80 GB.
 
 Внешняя сортировка работает существенно менее эффективно, чем сортировка в оперативке.
 
@@ -366,9 +366,9 @@ ORDER BY
 └────────────┴────────────┴──────────┘
 ```
 
-Поле `d1` не заполняется и использует значение по умолчанию. Поскольку у нас нет повторяющихся значений для `d2`, мы не можем правильно рассчитать последователность заполнения для `d1`. 
+Поле `d1` не заполняется и использует значение по умолчанию. Поскольку у нас нет повторяющихся значений для `d2`, мы не можем правильно рассчитать последовательность заполнения для `d1`. 
 
-Cледующий запрос (с измененым порядком в ORDER BY):
+Cледующий запрос (с измененным порядком в ORDER BY):
 ```sql
 SELECT
     toDate((number * 10) * 86400) AS d1,
diff --git a/docs/ru/sql-reference/statements/select/prewhere.md b/docs/ru/sql-reference/statements/select/prewhere.md
index e37aec814ec..092370d4b3a 100644
--- a/docs/ru/sql-reference/statements/select/prewhere.md
+++ b/docs/ru/sql-reference/statements/select/prewhere.md
@@ -13,7 +13,7 @@ Prewhere — это оптимизация для более эффективн
 
 `PREWHERE` имеет смысл использовать, если есть условия фильтрации, которые использует меньшинство столбцов из тех, что есть в запросе, но достаточно сильно фильтрует данные. Таким образом, сокращается количество читаемых данных.
 
-В запросе может быть одновременно указаны и `PREWHERE`, и `WHERE`. В этом случае `PREWHERE` предшествует `WHERE`.
+В запросе могут быть одновременно указаны и `PREWHERE`, и `WHERE`. В этом случае `PREWHERE` предшествует `WHERE`.
 
 Если значение параметра [optimize_move_to_prewhere](../../../operations/settings/settings.md#optimize_move_to_prewhere) равно 0, эвристика по автоматическому перемещению части выражений из `WHERE` к `PREWHERE` отключается.
 
diff --git a/docs/ru/sql-reference/statements/select/sample.md b/docs/ru/sql-reference/statements/select/sample.md
index e63479d6c27..decef52d06f 100644
--- a/docs/ru/sql-reference/statements/select/sample.md
+++ b/docs/ru/sql-reference/statements/select/sample.md
@@ -10,7 +10,7 @@ sidebar_label: SAMPLE
 Сэмплирование имеет смысл, когда:
 
 1.  Точность результата не важна, например, для оценочных расчетов.
-2.  Возможности аппаратной части не позволяют соответствовать строгим критериям. Например, время ответа должно быть \&lt;100 мс. При этом точность расчета имеет более низкий приоритет.
+2.  Возможности аппаратной части не позволяют соответствовать строгим критериям. Например, время ответа должно быть &lt;100 мс. При этом точность расчета имеет более низкий приоритет.
 3.  Точность результата участвует в бизнес-модели сервиса. Например, пользователи с бесплатной подпиской на сервис могут получать отчеты с меньшей точностью, чем пользователи с премиум подпиской.
 
     :::note "Внимание"
diff --git a/docs/ru/sql-reference/statements/select/union.md b/docs/ru/sql-reference/statements/select/union.md
index 4dad63c2c7c..05d20100452 100644
--- a/docs/ru/sql-reference/statements/select/union.md
+++ b/docs/ru/sql-reference/statements/select/union.md
@@ -26,7 +26,7 @@ SELECT CounterID, 2 AS table, sum(Sign) AS c
 
 Результирующие столбцы сопоставляются по их индексу (порядку внутри `SELECT`). Если имена столбцов не совпадают, то имена для конечного результата берутся из первого запроса.
 
-При объединении выполняет приведение типов. Например, если два запроса имеют одно и то же поле с не-`Nullable` и `Nullable` совместимыми типами, полученные в результате `UNION` данные будут иметь `Nullable` тип.
+При объединении выполняется приведение типов. Например, если два запроса имеют одно и то же поле с не-`Nullable` и `Nullable` совместимыми типами, полученные в результате `UNION` данные будут иметь `Nullable` тип.
 
 Запросы, которые являются частью `UNION`, могут быть заключены в круглые скобки. [ORDER BY](order-by.md) и [LIMIT](limit.md) применяются к отдельным запросам, а не к конечному результату. Если вам нужно применить преобразование к конечному результату, вы можете разместить все объединенные с помощью `UNION` запросы в подзапрос в секции [FROM](from.md).
 
diff --git a/docs/ru/sql-reference/statements/select/with.md b/docs/ru/sql-reference/statements/select/with.md
index 58f380b0a85..c4121a6569a 100644
--- a/docs/ru/sql-reference/statements/select/with.md
+++ b/docs/ru/sql-reference/statements/select/with.md
@@ -5,7 +5,7 @@ sidebar_label: WITH
 
 # Секция WITH {#with-clause}
 
-Clickhouse поддерживает [Общие табличные выражения](https://ru.wikipedia.org/wiki/Иерархические_и_рекурсивные_запросы_в_SQL), то есть позволяет использовать результаты выражений из секции `WITH` в остальной части `SELECT` запроса. Именованные подзапросы могут быть включены в текущий и дочерний контекст запроса в тех местах, где разрешены табличные объекты. Рекурсия предотвращается путем скрытия общего табличного выражения текущего уровня из выражения `WITH`.
+ClickHouse поддерживает [Общие табличные выражения](https://ru.wikipedia.org/wiki/Иерархические_и_рекурсивные_запросы_в_SQL), то есть позволяет использовать результаты выражений из секции `WITH` в остальной части `SELECT` запроса. Именованные подзапросы могут быть включены в текущий и дочерний контекст запроса в тех местах, где разрешены табличные объекты. Рекурсия предотвращается путем скрытия общего табличного выражения текущего уровня из выражения `WITH`.
 
 ## Синтаксис
 
diff --git a/docs/ru/sql-reference/statements/system.md b/docs/ru/sql-reference/statements/system.md
index a7dec7abe27..22a74648eab 100644
--- a/docs/ru/sql-reference/statements/system.md
+++ b/docs/ru/sql-reference/statements/system.md
@@ -269,13 +269,17 @@ SYSTEM START REPLICATION QUEUES [[db.]replicated_merge_tree_family_table_name]
 
 ### SYNC REPLICA {#query_language-system-sync-replica}
 
-Ждет когда таблица семейства `ReplicatedMergeTree` будет синхронизирована с другими репликами в кластере, будет работать до достижения `receive_timeout`, если синхронизация для таблицы отключена в настоящий момент времени:
+Ждет когда таблица семейства `ReplicatedMergeTree` будет синхронизирована с другими репликами в кластере, но не более `receive_timeout` секунд:
 
 ``` sql
-SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name
+SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name [STRICT | LIGHTWEIGHT | PULL]
 ```
 
-После выполнения этого запроса таблица `[db.]replicated_merge_tree_family_table_name` синхронизирует команды из общего реплицированного лога в свою собственную очередь репликации. Затем запрос ждет, пока реплика не обработает все синхронизированные команды.
+После выполнения этого запроса таблица `[db.]replicated_merge_tree_family_table_name` загружает команды из общего реплицированного лога в свою собственную очередь репликации. Затем запрос ждет, пока реплика не обработает все загруженные команды. Поддерживаются следующие модификаторы:
+
+ - Если указан модификатор `STRICT`, то запрос ждёт когда очередь репликации станет пустой. Строгий вариант запроса может никогда не завершиться успешно, если в очереди репликации постоянно появляются новые записи.
+ - Если указан модификатор `LIGHTWEIGHT`, то запрос ждёт когда будут обработаны записи `GET_PART`, `ATTACH_PART`, `DROP_RANGE`, `REPLACE_RANGE` и `DROP_PART`.
+ - Если указан модификатор `PULL`, то запрос только загружает записи очереди репликации из ZooKeeper и не ждёт выполнения чего-либо.
 
 ### RESTART REPLICA {#query_language-system-restart-replica}
 
diff --git a/docs/ru/sql-reference/table-functions/url.md b/docs/ru/sql-reference/table-functions/url.md
index e5d9faeec00..c90968d92af 100644
--- a/docs/ru/sql-reference/table-functions/url.md
+++ b/docs/ru/sql-reference/table-functions/url.md
@@ -21,6 +21,7 @@ url(URL [,format] [,structure])
 - `URL` — HTTP или HTTPS-адрес сервера, который может принимать запросы `GET` или `POST` (для запросов `SELECT` или `INSERT` соответственно). Тип: [String](../../sql-reference/data-types/string.md).
 - `format` — [формат](../../interfaces/formats.md#formats) данных. Тип: [String](../../sql-reference/data-types/string.md).
 - `structure` — структура таблицы в формате `'UserID UInt64, Name String'`. Определяет имена и типы столбцов. Тип: [String](../../sql-reference/data-types/string.md).
+- `headers` -  HTTP-заголовки в формате `'headers('key1'='value1', 'key2'='value2')'`. Определяет заголовки для HTTP вызова.
 
 **Возвращаемое значение**
 
@@ -31,7 +32,7 @@ url(URL [,format] [,structure])
 Получение с HTTP-сервера первых 3 строк таблицы с данными в формате [CSV](../../interfaces/formats.md#csv), содержащей столбцы типа [String](../../sql-reference/data-types/string.md) и [UInt32](../../sql-reference/data-types/int-uint.md).
 
 ``` sql
-SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3;
+SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32', headers('Accept'='text/csv; charset=utf-8')) LIMIT 3;
 ```
 
 Вставка данных в таблицу:
@@ -46,3 +47,12 @@ SELECT * FROM test_table;
 
 Шаблоны в фигурных скобках `{ }` используются, чтобы сгенерировать список шардов или указать альтернативные адреса на случай отказа. Поддерживаемые типы шаблонов и примеры смотрите в описании функции [remote](remote.md#globs-in-addresses).
 Символ `|` внутри шаблонов используется, чтобы задать адреса, если предыдущие оказались недоступны. Эти адреса перебираются в том же порядке, в котором они указаны в шаблоне. Количество адресов, которые могут быть сгенерированы, ограничено настройкой [glob_expansion_max_elements](../../operations/settings/settings.md#glob_expansion_max_elements).
+
+## Виртуальные столбцы
+
+-   `_path` — Путь до `URL`.
+-   `_file` — Имя ресурса `URL`.
+
+**Смотрите также**
+
+-   [Виртуальные столбцы](index.md#table_engines-virtual_columns)
diff --git a/docs/zh/development/build-osx.md b/docs/zh/development/build-osx.md
index 639df253dce..40b8ebe9e51 100644
--- a/docs/zh/development/build-osx.md
+++ b/docs/zh/development/build-osx.md
@@ -46,7 +46,7 @@ $ cd ..
 
 为此，请创建以下文件：
 
-/资源库/LaunchDaemons/limit.maxfiles.plist:
+/Library/LaunchDaemons/limit.maxfiles.plist:
 
 ``` xml
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/docs/zh/development/continuous-integration.md b/docs/zh/development/continuous-integration.md
index a52d77a7a33..56e3e1dfd50 100644
--- a/docs/zh/development/continuous-integration.md
+++ b/docs/zh/development/continuous-integration.md
@@ -34,7 +34,7 @@ git push
 ## 描述信息检查 {#description-check}
 检查pull请求的描述是否符合[PULL_REQUEST_TEMPLATE.md](https://github.com/ClickHouse/ClickHouse/blob/master/.github/PULL_REQUEST_TEMPLATE.md)模板.
 
-您必须为您的更改指定一个更改日志类别(例如，Bug修复), 并且为[CHANGELOG.md](../whats-new/changelog/)编写一条用户可读的消息用来描述更改.
+您必须为您的更改指定一个更改日志类别(例如，Bug修复), 并且为[CHANGELOG.md](../whats-new/changelog/index.md)编写一条用户可读的消息用来描述更改.
 
 ## 推送到DockerHub {#push-to-dockerhub}
 生成用于构建和测试的docker映像, 然后将它们推送到DockerHub.
diff --git a/docs/zh/engines/database-engines/index.md b/docs/zh/engines/database-engines/index.md
index 0b24590686e..2839f819671 100644
--- a/docs/zh/engines/database-engines/index.md
+++ b/docs/zh/engines/database-engines/index.md
@@ -16,7 +16,7 @@ sidebar_position: 27
 
 -   [MaterializeMySQL](../../engines/database-engines/materialized-mysql.md)
 
--   [Lazy](../../engines/database-engines/lazy)
+-   [Lazy](../../engines/database-engines/lazy.md)
 
 -   [Atomic](../../engines/database-engines/atomic.md)
 
diff --git a/docs/zh/engines/database-engines/materialize-mysql.md b/docs/zh/engines/database-engines/materialize-mysql.md
index 10049017c71..5d1394f9456 100644
--- a/docs/zh/engines/database-engines/materialize-mysql.md
+++ b/docs/zh/engines/database-engines/materialize-mysql.md
@@ -38,8 +38,8 @@ ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'passwor
 -   `max_wait_time_when_mysql_unavailable` — 当MySQL不可用时重试间隔(毫秒)。负值禁止重试。默认值: `1000`.
 -   `allows_query_when_mysql_lost` — 当mysql丢失时，允许查询物化表。默认值: `0` (`false`).
 ```
-CREATE DATABASE mysql ENGINE = MaterializeMySQL('localhost:3306', 'db', 'user', '***') 
-     SETTINGS 
+CREATE DATABASE mysql ENGINE = MaterializeMySQL('localhost:3306', 'db', 'user', '***')
+     SETTINGS
         allows_query_when_mysql_lost=true,
         max_wait_time_when_mysql_unavailable=10000;
 ```
@@ -97,7 +97,7 @@ CREATE DATABASE mysql ENGINE = MaterializeMySQL('localhost:3306', 'db', 'user',
 
 ### DDL查询 {#ddl-queries}
 
-MySQL DDL查询转换为相应的ClickHouse DDL查询([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop), [RENAME](../../sql-reference/statements/rename.md))。如果ClickHouse无法解析某个DDL查询，则该查询将被忽略。
+MySQL DDL查询转换为相应的ClickHouse DDL查询([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create.md), [DROP](../../sql-reference/statements/drop.md), [RENAME](../../sql-reference/statements/rename.md))。如果ClickHouse无法解析某个DDL查询，则该查询将被忽略。
 
 ### Data Replication {#data-replication}
 
@@ -148,9 +148,9 @@ mysql> SELECT * FROM test;
 ```
 
 ```text
-+---+------+------+ 
++---+------+------+
 | a |    b |    c |
-+---+------+------+ 
++---+------+------+
 | 2 |  222 | Wow! |
 +---+------+------+
 ```
@@ -177,9 +177,9 @@ SELECT * FROM mysql.test;
 ```
 
 ``` text
-┌─a─┬──b─┐ 
-│ 1 │ 11 │ 
-│ 2 │ 22 │ 
+┌─a─┬──b─┐
+│ 1 │ 11 │
+│ 2 │ 22 │
 └───┴────┘
 ```
 
@@ -190,7 +190,7 @@ SELECT * FROM mysql.test;
 ```
 
 ``` text
-┌─a─┬───b─┬─c────┐ 
-│ 2 │ 222 │ Wow! │ 
+┌─a─┬───b─┬─c────┐
+│ 2 │ 222 │ Wow! │
 └───┴─────┴──────┘
 ```
diff --git a/docs/zh/engines/database-engines/materialized-mysql.md b/docs/zh/engines/database-engines/materialized-mysql.md
index c34d3a6f20d..5c735556c48 100644
--- a/docs/zh/engines/database-engines/materialized-mysql.md
+++ b/docs/zh/engines/database-engines/materialized-mysql.md
@@ -109,7 +109,7 @@ MySQL中的Time 类型，会被ClickHouse转换成微秒来存储
 
 ### DDL Queries {#ddl-queries}
 
-MySQL DDL 语句会被转换成对应的ClickHouse DDL 语句，比如： ([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop), [RENAME](../../sql-reference/statements/rename.md)). 如果ClickHouse 无法解析某些语句DDL 操作，则会跳过。
+MySQL DDL 语句会被转换成对应的ClickHouse DDL 语句，比如： ([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create.md), [DROP](../../sql-reference/statements/drop.md), [RENAME](../../sql-reference/statements/rename.md)). 如果ClickHouse 无法解析某些语句DDL 操作，则会跳过。
 
 
 ### 数据复制 {#data-replication}
@@ -152,17 +152,17 @@ ClickHouse只有一个物理排序，由 `order by` 条件决定。要创建一
 这些是你可以对MaterializedMySQL表重写的模式转换操作:
 
  * 修改列类型。必须与原始类型兼容，否则复制将失败。例如，可以将`UInt32`列修改为`UInt64`，不能将 `String` 列修改为 `Array(String)`。
- * 修改 [column TTL](../table-engines/mergetree-family/mergetree/#mergetree-column-ttl).
+ * 修改 [column TTL](../table-engines/mergetree-family/mergetree.md#mergetree-column-ttl).
  * 修改 [column compression codec](../../sql-reference/statements/create/table.mdx#codecs).
  * 增加 [ALIAS columns](../../sql-reference/statements/create/table.mdx#alias).
- * 增加 [skipping indexes](../table-engines/mergetree-family/mergetree/#table_engine-mergetree-data_skipping-indexes)
- * 增加 [projections](../table-engines/mergetree-family/mergetree/#projections). 
+ * 增加 [skipping indexes](../table-engines/mergetree-family/mergetree.md#table_engine-mergetree-data_skipping-indexes)
+ * 增加 [projections](../table-engines/mergetree-family/mergetree.md#projections).
  请注意，当使用 `SELECT ... FINAL ` (MaterializedMySQL默认是这样做的) 时，预测优化是被禁用的，所以这里是受限的， `INDEX ... TYPE hypothesis `[在v21.12的博客文章中描述]](https://clickhouse.com/blog/en/2021/clickhouse-v21.12-released/)可能在这种情况下更有用。
- * 修改 [PARTITION BY](../table-engines/mergetree-family/custom-partitioning-key/)
- * 修改 [ORDER BY](../table-engines/mergetree-family/mergetree/#mergetree-query-clauses)
- * 修改 [PRIMARY KEY](../table-engines/mergetree-family/mergetree/#mergetree-query-clauses)
- * 增加 [SAMPLE BY](../table-engines/mergetree-family/mergetree/#mergetree-query-clauses)
- * 增加 [table TTL](../table-engines/mergetree-family/mergetree/#mergetree-query-clauses)
+ * 修改 [PARTITION BY](../table-engines/mergetree-family/custom-partitioning-key.md)
+ * 修改 [ORDER BY](../table-engines/mergetree-family/mergetree.md#mergetree-query-clauses)
+ * 修改 [PRIMARY KEY](../table-engines/mergetree-family/mergetree.md#mergetree-query-clauses)
+ * 增加 [SAMPLE BY](../table-engines/mergetree-family/mergetree.md#mergetree-query-clauses)
+ * 增加 [table TTL](../table-engines/mergetree-family/mergetree.md#mergetree-query-clauses)
 
 ```sql
 CREATE DATABASE db_name ENGINE = MaterializedMySQL(...)
diff --git a/docs/zh/engines/database-engines/replicated.md b/docs/zh/engines/database-engines/replicated.md
index df5872e9b19..843d7a3edd5 100644
--- a/docs/zh/engines/database-engines/replicated.md
+++ b/docs/zh/engines/database-engines/replicated.md
@@ -19,7 +19,6 @@ CREATE DATABASE testdb ENGINE = Replicated('zoo_path', 'shard_name', 'replica_na
 -   `shard_name` — 分片的名字。数据库副本按`shard_name`分组到分片中。
 -   `replica_name` — 副本的名字。同一分片的所有副本的副本名称必须不同。
 
-!!! note "警告"
 对于[ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication)表，如果没有提供参数，则使用默认参数:`/clickhouse/tables/{uuid}/{shard}`和`{replica}`。这些可以在服务器设置[default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path)和[default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name)中更改。宏`{uuid}`被展开到表的uuid， `{shard}`和`{replica}`被展开到服务器配置的值，而不是数据库引擎参数。但是在将来，可以使用Replicated数据库的`shard_name`和`replica_name`。
 
 ## 使用方式 {#specifics-and-recommendations}
@@ -52,8 +51,8 @@ CREATE TABLE r.rmt (n UInt64) ENGINE=ReplicatedMergeTree ORDER BY n;
 ```
 
 ``` text
-┌─────hosts────────────┬──status─┬─error─┬─num_hosts_remaining─┬─num_hosts_active─┐ 
-│ shard1|replica1      │    0    │       │          2          │        0         │ 
+┌─────hosts────────────┬──status─┬─error─┬─num_hosts_remaining─┬─num_hosts_active─┐
+│ shard1|replica1      │    0    │       │          2          │        0         │
 │ shard1|other_replica │    0    │       │          1          │        0         │
 │ other_shard|r1       │    0    │       │          0          │        0         │
 └──────────────────────┴─────────┴───────┴─────────────────────┴──────────────────┘
@@ -62,13 +61,13 @@ CREATE TABLE r.rmt (n UInt64) ENGINE=ReplicatedMergeTree ORDER BY n;
 显示系统表:
 
 ``` sql
-SELECT cluster, shard_num, replica_num, host_name, host_address, port, is_local 
+SELECT cluster, shard_num, replica_num, host_name, host_address, port, is_local
 FROM system.clusters WHERE cluster='r';
 ```
 
 ``` text
-┌─cluster─┬─shard_num─┬─replica_num─┬─host_name─┬─host_address─┬─port─┬─is_local─┐ 
-│ r       │     1     │      1      │   node3   │  127.0.0.1   │ 9002 │     0    │ 
+┌─cluster─┬─shard_num─┬─replica_num─┬─host_name─┬─host_address─┬─port─┬─is_local─┐
+│ r       │     1     │      1      │   node3   │  127.0.0.1   │ 9002 │     0    │
 │ r       │     2     │      1      │   node2   │  127.0.0.1   │ 9001 │     0    │
 │ r       │     2     │      2      │   node1   │  127.0.0.1   │ 9000 │     1    │
 └─────────┴───────────┴─────────────┴───────────┴──────────────┴──────┴──────────┘
@@ -83,9 +82,9 @@ node1 :) SELECT materialize(hostName()) AS host, groupArray(n) FROM r.d GROUP BY
 ```
 
 ``` text
-┌─hosts─┬─groupArray(n)─┐ 
-│ node1 │  [1,3,5,7,9]  │   
-│ node2 │  [0,2,4,6,8]  │    
+┌─hosts─┬─groupArray(n)─┐
+│ node1 │  [1,3,5,7,9]  │
+│ node2 │  [0,2,4,6,8]  │
 └───────┴───────────────┘
 ```
 
@@ -98,8 +97,8 @@ node4 :) CREATE DATABASE r ENGINE=Replicated('some/path/r','other_shard','r2');
 集群配置如下所示:
 
 ``` text
-┌─cluster─┬─shard_num─┬─replica_num─┬─host_name─┬─host_address─┬─port─┬─is_local─┐ 
-│ r       │     1     │      1      │   node3   │  127.0.0.1   │ 9002 │     0    │ 
+┌─cluster─┬─shard_num─┬─replica_num─┬─host_name─┬─host_address─┬─port─┬─is_local─┐
+│ r       │     1     │      1      │   node3   │  127.0.0.1   │ 9002 │     0    │
 │ r       │     1     │      2      │   node4   │  127.0.0.1   │ 9003 │     0    │
 │ r       │     2     │      1      │   node2   │  127.0.0.1   │ 9001 │     0    │
 │ r       │     2     │      2      │   node1   │  127.0.0.1   │ 9000 │     1    │
@@ -113,8 +112,8 @@ node2 :) SELECT materialize(hostName()) AS host, groupArray(n) FROM r.d GROUP BY
 ```
 
 ```text
-┌─hosts─┬─groupArray(n)─┐ 
-│ node2 │  [1,3,5,7,9]  │   
-│ node4 │  [0,2,4,6,8]  │    
+┌─hosts─┬─groupArray(n)─┐
+│ node2 │  [1,3,5,7,9]  │
+│ node4 │  [0,2,4,6,8]  │
 └───────┴───────────────┘
 ```
diff --git a/docs/zh/engines/table-engines/integrations/kafka.md b/docs/zh/engines/table-engines/integrations/kafka.md
index 5ab1e0573af..fd4e5e9c10a 100644
--- a/docs/zh/engines/table-engines/integrations/kafka.md
+++ b/docs/zh/engines/table-engines/integrations/kafka.md
@@ -163,4 +163,4 @@ clickhouse也支持自己使用keyfile的方式来维护kerbros的凭证。配
 **另请参阅**
 
 -   [虚拟列](../../../engines/table-engines/index.md#table_engines-virtual_columns)
--   [后台消息代理调度池大小](../../../operations/settings/settings.md#background_message_broker_schedule_pool_size)
+-   [后台消息代理调度池大小](../../../operations/server-configuration-parameters/settings.md#background_message_broker_schedule_pool_size)
diff --git a/docs/zh/engines/table-engines/mergetree-family/mergetree.md b/docs/zh/engines/table-engines/mergetree-family/mergetree.md
index 40aa764e2d3..6775662d555 100644
--- a/docs/zh/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/mergetree.md
@@ -1,6 +1,6 @@
----
-slug: /zh/engines/table-engines/mergetree-family/mergetree
----
+---
+slug: /zh/engines/table-engines/mergetree-family/mergetree
+---
 # MergeTree {#table_engines-mergetree}
 
 Clickhouse 中最强大的表引擎当属 `MergeTree` （合并树）引擎及该系列（`*MergeTree`）中的其他引擎。
@@ -25,8 +25,9 @@ Clickhouse 中最强大的表引擎当属 `MergeTree` （合并树）引擎及
 
     需要的话，您可以给表设置一个采样方法。
 
-!!! note "注意"
-    [合并](../special/merge.md#merge) 引擎并不属于 `*MergeTree` 系列。
+:::info
+[合并](../special/merge.md#merge) 引擎并不属于 `*MergeTree` 系列。
+:::
 
 ## 建表 {#table_engine-mergetree-creating-a-table}
 
@@ -191,7 +192,7 @@ ClickHouse 会为每个数据片段创建一个索引文件来存储这些标记
 
 ClickHouse 不要求主键唯一，所以您可以插入多条具有相同主键的行。
 
-您可以在`PRIMARY KEY`与`ORDER BY`条件中使用`可为空的`类型的表达式，但强烈建议不要这么做。为了启用这项功能，请打开[allow_nullable_key](../../../operations/settings/#allow-nullable-key)，[NULLS_LAST](../../../sql-reference/statements/select/order-by.md/#sorting-of-special-values)规则也适用于`ORDER BY`条件中有NULL值的情况下。
+您可以在`PRIMARY KEY`与`ORDER BY`条件中使用`可为空的`类型的表达式，但强烈建议不要这么做。为了启用这项功能，请打开[allow_nullable_key](../../../operations/settings/index.md#allow-nullable-key)，[NULLS_LAST](../../../sql-reference/statements/select/order-by.md#sorting-of-special-values)规则也适用于`ORDER BY`条件中有NULL值的情况下。
 
 ### 主键的选择 {#zhu-jian-de-xuan-ze}
 
@@ -329,7 +330,7 @@ SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234
 
     支持的数据类型：`Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`, `Array`, `LowCardinality`, `Nullable`。
 
-    以下函数会用到这个索引： [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions), [notIn](../../../sql-reference/functions/in-functions), [has](../../../sql-reference/functions/array-functions)
+    以下函数会用到这个索引： [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions.md), [notIn](../../../sql-reference/functions/in-functions.md), [has](../../../sql-reference/functions/array-functions.md)
 
 ``` sql
 INDEX sample_index (u64 * length(s)) TYPE minmax GRANULARITY 4
@@ -352,19 +353,19 @@ WHERE 子句中的条件可以包含对某列数据进行运算的函数表达
 | [startsWith](../../../sql-reference/functions/string-functions.md#startswith) | ✔           | ✔      | ✔          | ✔          | ✗            |
 | [endsWith](../../../sql-reference/functions/string-functions.md#endswith) | ✗           | ✗      | ✔          | ✔          | ✗            |
 | [multiSearchAny](../../../sql-reference/functions/string-search-functions.md#function-multisearchany) | ✗           | ✗      | ✔          | ✗          | ✗            |
-| [in](../../../sql-reference/functions/in-functions#in-functions) | ✔           | ✔      | ✔          | ✔          | ✔            |
-| [notIn](../../../sql-reference/functions/in-functions#in-functions) | ✔           | ✔      | ✔          | ✔          | ✔            |
+| [in](../../../sql-reference/functions/in-functions.md#in-functions) | ✔           | ✔      | ✔          | ✔          | ✔            |
+| [notIn](../../../sql-reference/functions/in-functions.md#in-functions) | ✔           | ✔      | ✔          | ✔          | ✔            |
 | [less (\<)](../../../sql-reference/functions/comparison-functions.md#function-less) | ✔           | ✔      | ✗          | ✗          | ✗            |
 | [greater (\>)](../../../sql-reference/functions/comparison-functions.md#function-greater) | ✔           | ✔      | ✗          | ✗          | ✗            |
 | [lessOrEquals (\<=)](../../../sql-reference/functions/comparison-functions.md#function-lessorequals) | ✔           | ✔      | ✗          | ✗          | ✗            |
 | [greaterOrEquals (\>=)](../../../sql-reference/functions/comparison-functions.md#function-greaterorequals) | ✔           | ✔      | ✗          | ✗          | ✗            |
-| [empty](../../../sql-reference/functions/array-functions#function-empty) | ✔           | ✔      | ✗          | ✗          | ✗            |
-| [notEmpty](../../../sql-reference/functions/array-functions#function-notempty) | ✔           | ✔      | ✗          | ✗          | ✗            |
+| [empty](../../../sql-reference/functions/array-functions.md#function-empty) | ✔           | ✔      | ✗          | ✗          | ✗            |
+| [notEmpty](../../../sql-reference/functions/array-functions.md#function-notempty) | ✔           | ✔      | ✗          | ✗          | ✗            |
 | hasToken                                                     | ✗           | ✗      | ✗          | ✔          | ✗            |
 
 常量参数小于 ngram 大小的函数不能使用 `ngrambf_v1` 进行查询优化。
 
-!!! note "注意"
+:::note
 布隆过滤器可能会包含不符合条件的匹配，所以 `ngrambf_v1`, `tokenbf_v1` 和 `bloom_filter` 索引不能用于结果返回为假的函数，例如：
 
 - 可以用来优化的场景
@@ -379,6 +380,7 @@ WHERE 子句中的条件可以包含对某列数据进行运算的函数表达
   - `NOT s = 1`
   - `s != 1`
   - `NOT startsWith(s, 'test')`
+:::
 
 ## 并发数据访问 {#concurrent-data-access}
 
@@ -687,7 +689,7 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
 
 `default` 存储策略意味着只使用一个卷，这个卷只包含一个在 `<path>` 中定义的磁盘。您可以使用[ALTER TABLE ... MODIFY SETTING]来修改存储策略，新的存储策略应该包含所有以前的磁盘和卷，并使用相同的名称。
 
-可以通过 [background_move_pool_size](../../../operations/settings/settings.md#background_move_pool_size) 设置调整执行后台任务的线程数。
+可以通过 [background_move_pool_size](../../../operations/server-configuration-parameters/settings.md#background_move_pool_size) 设置调整执行后台任务的线程数。
 
 ### 详细说明 {#details}
 
diff --git a/docs/zh/engines/table-engines/mergetree-family/replication.md b/docs/zh/engines/table-engines/mergetree-family/replication.md
index 791ea448212..04d5e7d467c 100644
--- a/docs/zh/engines/table-engines/mergetree-family/replication.md
+++ b/docs/zh/engines/table-engines/mergetree-family/replication.md
@@ -98,7 +98,7 @@ CREATE TABLE table_name ( ... ) ENGINE = ReplicatedMergeTree('zookeeper_name_con
 
 对于非常大的集群，你可以把不同的 ZooKeeper 集群用于不同的分片。然而，即使 Yandex.Metrica 集群（大约300台服务器）也证明还不需要这么做。
 
-复制是多主异步。 `INSERT` 语句（以及 `ALTER` ）可以发给任意可用的服务器。数据会先插入到执行该语句的服务器上，然后被复制到其他服务器。由于它是异步的，在其他副本上最近插入的数据会有一些延迟。如果部分副本不可用，则数据在其可用时再写入。副本可用的情况下，则延迟时长是通过网络传输压缩数据块所需的时间。为复制表执行后台任务的线程数量，可以通过 [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size) 进行设置。
+复制是多主异步。 `INSERT` 语句（以及 `ALTER` ）可以发给任意可用的服务器。数据会先插入到执行该语句的服务器上，然后被复制到其他服务器。由于它是异步的，在其他副本上最近插入的数据会有一些延迟。如果部分副本不可用，则数据在其可用时再写入。副本可用的情况下，则延迟时长是通过网络传输压缩数据块所需的时间。为复制表执行后台任务的线程数量，可以通过 [background_schedule_pool_size](../../../operations/server-configuration-parameters/settings.md#background_schedule_pool_size) 进行设置。
 
 `ReplicatedMergeTree` 引擎采用一个独立的线程池进行复制拉取。线程池的大小通过 [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size) 进行限定，它可以在重启服务器时进行调整。
 
@@ -282,8 +282,8 @@ sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
 
 **参考**
 
--   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
--   [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size)
+-   [background_schedule_pool_size](../../../operations/server-configuration-parameters/settings.md#background_schedule_pool_size)
+-   [background_fetches_pool_size](../../../operations/server-configuration-parameters/settings.md#background_fetches_pool_size)
 -   [execute_merges_on_single_replica_time_threshold](../../../operations/settings/settings.md#execute-merges-on-single-replica-time-threshold)
 -   [max_replicated_fetches_network_bandwidth](../../../operations/settings/merge-tree-settings.mdx#max_replicated_fetches_network_bandwidth)
 -   [max_replicated_sends_network_bandwidth](../../../operations/settings/merge-tree-settings.mdx#max_replicated_sends_network_bandwidth)
diff --git a/docs/zh/engines/table-engines/special/distributed.md b/docs/zh/engines/table-engines/special/distributed.md
index c832e9e19ba..3c8a7a833d0 100644
--- a/docs/zh/engines/table-engines/special/distributed.md
+++ b/docs/zh/engines/table-engines/special/distributed.md
@@ -45,7 +45,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster] AS [db2.]name2
 
  - [insert_distributed_sync](../../../operations/settings/settings.md#insert_distributed_sync) 设置
  - [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) 查看示例
- 
+
  **分布式设置**
 
 - `fsync_after_insert` - 对异步插入到分布式的文件数据执行`fsync`。确保操作系统将所有插入的数据刷新到启动节点**磁盘上的一个文件**中。
@@ -66,19 +66,20 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster] AS [db2.]name2
 
 - `monitor_max_sleep_time_ms` - 等同于 [distributed_directory_monitor_max_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_max_sleep_time_ms)
 
-!!! note "备注"
+::note
+**稳定性设置** (`fsync_...`):
 
-    **稳定性设置** (`fsync_...`):
+- 只影响异步插入(例如:`insert_distributed_sync=false`), 当数据首先存储在启动节点磁盘上，然后再异步发送到shard。
+— 可能会显著降低`insert`的性能
+- 影响将存储在分布式表文件夹中的数据写入 **接受您插入的节点** 。如果你需要保证写入数据到底层的MergeTree表中，请参阅 `system.merge_tree_settings` 中的持久性设置(`...fsync...`)
 
-    - 只影响异步插入(例如:`insert_distributed_sync=false`), 当数据首先存储在启动节点磁盘上，然后再异步发送到shard。
-    — 可能会显著降低`insert`的性能
-    - 影响将存储在分布式表文件夹中的数据写入 **接受您插入的节点** 。如果你需要保证写入数据到底层的MergeTree表中，请参阅 `system.merge_tree_settings` 中的持久性设置(`...fsync...`)
+**插入限制设置** (`..._insert`) 请见:
 
-    **插入限制设置** (`..._insert`) 请见:
+- [insert_distributed_sync](../../../operations/settings/settings.md#insert_distributed_sync) 设置
+- [prefer_localhost_replica](../../../operations/settings/settings.md#settings-prefer-localhost-replica) 设置
+- `bytes_to_throw_insert` 在 `bytes_to_delay_insert` 之前处理，所以你不应该设置它的值小于 `bytes_to_delay_insert`
+:::
 
-    - [insert_distributed_sync](../../../operations/settings/settings.md#insert_distributed_sync) 设置
-    - [prefer_localhost_replica](../../../operations/settings/settings.md#settings-prefer-localhost-replica) 设置
-    - `bytes_to_throw_insert` 在 `bytes_to_delay_insert` 之前处理，所以你不应该设置它的值小于 `bytes_to_delay_insert`
 **示例**
 
 ``` sql
@@ -214,7 +215,7 @@ SELECT 查询会被发送到所有分片，并且无论数据在分片中如何
 
 
 ## 读取数据 {#distributed-reading-data}
- 
+
 当查询一个`Distributed`表时，`SELECT`查询被发送到所有的分片，不管数据是如何分布在分片上的(它们可以完全随机分布)。当您添加一个新分片时，您不必将旧数据传输到它。相反，您可以使用更重的权重向其写入新数据——数据的分布会稍微不均匀，但查询将正确有效地工作。
 
 当启用`max_parallel_replicas`选项时，查询处理将在单个分片中的所有副本之间并行化。更多信息，请参见[max_parallel_replicas](../../../operations/settings/settings.md#settings-max_parallel_replicas)。
@@ -225,8 +226,9 @@ SELECT 查询会被发送到所有分片，并且无论数据在分片中如何
 
 -   `_shard_num` — 表`system.clusters` 中的  `shard_num` 值 . 数据类型: [UInt32](../../../sql-reference/data-types/int-uint.md).
 
-!!! note "备注"
-    因为 [remote](../../../sql-reference/table-functions/remote.md) 和 [cluster](../../../sql-reference/table-functions/cluster.mdx) 表方法内部创建了分布式表， `_shard_num` 对他们都有效.
+:::note
+因为 [remote](../../../sql-reference/table-functions/remote.md) 和 [cluster](../../../sql-reference/table-functions/cluster.mdx) 表方法内部创建了分布式表， `_shard_num` 对他们都有效.
+:::
 
 **详见**
 -   [虚拟列](../../../engines/table-engines/index.md#table_engines-virtual_columns) 描述
diff --git a/docs/zh/faq/general.md b/docs/zh/faq/general.md
index 5a95b9aad07..530be7f08d8 100644
--- a/docs/zh/faq/general.md
+++ b/docs/zh/faq/general.md
@@ -1,5 +1,5 @@
 ---
-slug: /zh/faq/general
+slug: /zh/faq/general/overview
 ---
 # 常见问题 {#chang-jian-wen-ti}
 
diff --git a/docs/zh/faq/general/columnar-database.md b/docs/zh/faq/general/columnar-database.md
index 57541aec69b..004da067900 100644
--- a/docs/zh/faq/general/columnar-database.md
+++ b/docs/zh/faq/general/columnar-database.md
@@ -7,20 +7,20 @@ sidebar_position: 101
 
 # 什么是列存储数据库? {#what-is-a-columnar-database}
 
-列存储数据库独立存储每个列的数据。这只允许从磁盘读取任何给定查询中使用的列的数据。其代价是，影响整行的操作会按比例变得更昂贵。列存储数据库的同义词是面向列的数据库管理系统。ClickHouse就是这样一个典型的例子。
+列存储数据库独立存储每个列的数据。这只允许从磁盘读取任何给定查询中使用的列的数据。其代价是，影响整行的操作会按比例变得更昂贵。列存储数据库的同义词是面向列的数据库管理系统。ClickHouse 就是这样一个典型的例子。
 
 列存储数据库的主要优点是:
 
 - 查询只使用许多列其中的少数列。
-— 聚合对大量数据的查询。
-— 按列压缩。
+- 聚合对大量数据的查询。
+- 按列压缩。
 
 下面是构建报表时传统的面向行系统和柱状数据库之间的区别:
 
 **传统行存储**
-!(传统行存储)(https://clickhouse.com/docs/en/images/row-oriented.gif)
+![传统行存储](https://clickhouse.com/docs/assets/images/row-oriented-3e6fd5aa48e3075202d242b4799da8fa.gif)
 
 **列存储**
-!(列存储)(https://clickhouse.com/docs/en/images/column-oriented.gif)
+![列存储](https://clickhouse.com/docs/assets/images/column-oriented-d082e49b7743d4ded32c7952bfdb028f.gif)
 
-列存储数据库是分析应用程序的首选，因为它允许在一个表中有许多列以防万一，但不会在读取查询执行时为未使用的列付出代价。面向列的数据库是为大数据处理而设计的，因为和数据仓库一样，它们通常使用分布式的低成本硬件集群来提高吞吐量。ClickHouse结合了[分布式](../../engines/table-engines/special/distributed.md)和[复制式](../../engines/table-engines/mergetree-family/replication.md)两类表。
\ No newline at end of file
+列存储数据库是分析应用程序的首选，因为它允许在一个表中有许多列以防万一，但不会在读取查询执行时为未使用的列付出代价。面向列的数据库是为大数据处理而设计的，因为和数据仓库一样，它们通常使用分布式的低成本硬件集群来提高吞吐量。ClickHouse 结合了[分布式](../../engines/table-engines/special/distributed.md)和[复制式](../../engines/table-engines/mergetree-family/replication.md)两类表。
diff --git a/docs/zh/faq/general/index.md b/docs/zh/faq/general/index.md
index 8b0b42cede2..9693e7ffc82 100644
--- a/docs/zh/faq/general/index.md
+++ b/docs/zh/faq/general/index.md
@@ -21,8 +21,7 @@ sidebar_label: General
 -   [我如何为 ClickHouse贡献代码?](../../faq/general/how-do-i-contribute-code-to-clickhouse.md)
 
 
-
 !!! info "没找到您需要的内容?"
-    请查阅 [其他 F.A.Q. 类别](../../faq/) 或者从左侧导航栏浏览其他文档
-    
+    请查阅 [其他 F.A.Q. 类别](../../faq/index.md) 或者从左侧导航栏浏览其他文档
+
 {## [原始文档](https://clickhouse.com/docs/en/faq/general/) ##}
diff --git a/docs/zh/faq/general/why-clickhouse-is-so-fast.md b/docs/zh/faq/general/why-clickhouse-is-so-fast.md
index a30b56adb9a..1962b8b90c2 100644
--- a/docs/zh/faq/general/why-clickhouse-is-so-fast.md
+++ b/docs/zh/faq/general/why-clickhouse-is-so-fast.md
@@ -9,7 +9,7 @@ sidebar_position: 8
 
 It was designed to be fast. Query execution performance has always been a top priority during the development process, but other important characteristics like user-friendliness, scalability, and security were also considered so ClickHouse could become a real production system.
 
-ClickHouse was initially built as a prototype to do just a single task well: to filter and aggregate data as fast as possible. That’s what needs to be done to build a typical analytical report and that’s what a typical [GROUP BY](../../sql-reference/statements/select/group-by/) query does. ClickHouse team has made several high-level decisions that combined made achieving this task possible:
+ClickHouse was initially built as a prototype to do just a single task well: to filter and aggregate data as fast as possible. That’s what needs to be done to build a typical analytical report and that’s what a typical [GROUP BY](../../sql-reference/statements/select/group-by.md) query does. ClickHouse team has made several high-level decisions that combined made achieving this task possible:
 
 Column-oriented storage
 :   Source data often contain hundreds or even thousands of columns, while a report can use just a few of them. The system needs to avoid reading unnecessary columns, or most expensive disk read operations would be wasted.
diff --git a/docs/zh/faq/integration/index.md b/docs/zh/faq/integration/index.md
index 6678956a0b3..3a3f97761f3 100644
--- a/docs/zh/faq/integration/index.md
+++ b/docs/zh/faq/integration/index.md
@@ -1,5 +1,5 @@
 ---
-slug: /zh/faq/integration/
+slug: /zh/faq/integration/
 title: 关于集成ClickHouse和其他系统的问题
 toc_hidden_folder: true
 sidebar_position: 4
@@ -17,6 +17,6 @@ sidebar_label: Integration
 
 
 !!! info "没看到你要找的东西吗?"
-    查看[其他faq类别](../../faq/)或浏览左边栏中的主要文档文章。
+    查看[其他faq类别](../../faq/index.md)或浏览左边栏中的主要文档文章。
 
 {## [原文](https://clickhouse.com/docs/en/faq/integration/) ##}
\ No newline at end of file
diff --git a/docs/zh/faq/integration/json-import.md b/docs/zh/faq/integration/json-import.md
index 861abacc1e1..2d5c687316d 100644
--- a/docs/zh/faq/integration/json-import.md
+++ b/docs/zh/faq/integration/json-import.md
@@ -7,29 +7,29 @@ sidebar_position: 11
 
 # How to Import JSON Into ClickHouse? {#how-to-import-json-into-clickhouse}
 
-ClickHouse supports a wide range of [data formats for input and output](../../interfaces/formats/). There are multiple JSON variations among them, but the most commonly used for data ingestion is [JSONEachRow](../../interfaces/formats/#jsoneachrow). It expects one JSON object per row, each object separated by a newline.
+ClickHouse supports a wide range of [data formats for input and output](../../interfaces/formats.md). There are multiple JSON variations among them, but the most commonly used for data ingestion is [JSONEachRow](../../interfaces/formats.md#jsoneachrow). It expects one JSON object per row, each object separated by a newline.
 
 ## Examples {#examples}
 
-Using [HTTP interface](../../interfaces/http/):
+Using [HTTP interface](../../interfaces/http.md):
 
 ``` bash
 $ echo '{"foo":"bar"}' | curl 'http://localhost:8123/?query=INSERT%20INTO%20test%20FORMAT%20JSONEachRow' --data-binary @-
 ```
 
-Using [CLI interface](../../interfaces/cli/):
+Using [CLI interface](../../interfaces/cli.md):
 
 ``` bash
 $ echo '{"foo":"bar"}'  | clickhouse-client --query="INSERT INTO test FORMAT JSONEachRow"
 ```
 
-Instead of inserting data manually, you might consider to use one of [client libraries](../../interfaces/) instead.
+Instead of inserting data manually, you might consider to use one of [client libraries](../../interfaces/index.md) instead.
 
 ## Useful Settings {#useful-settings}
 
 -   `input_format_skip_unknown_fields` allows to insert JSON even if there were additional fields not present in table schema (by discarding them).
--   `input_format_import_nested_json` allows to insert nested JSON objects into columns of [Nested](../../sql-reference/data-types/nested-data-structures/nested/) type.
+-   `input_format_import_nested_json` allows to insert nested JSON objects into columns of [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) type.
 
-:::note    
+:::note
 Settings are specified as `GET` parameters for the HTTP interface or as additional command-line arguments prefixed with `--` for the `CLI` interface.
 :::
\ No newline at end of file
diff --git a/docs/zh/faq/operations/delete-old-data.md b/docs/zh/faq/operations/delete-old-data.md
index b2229058cad..24181116bab 100644
--- a/docs/zh/faq/operations/delete-old-data.md
+++ b/docs/zh/faq/operations/delete-old-data.md
@@ -19,7 +19,7 @@ The key advantage of this approach is that it does not need any external system
 TTL can also be used to move data not only to [/dev/null](https://en.wikipedia.org/wiki/Null_device), but also between different storage systems, like from SSD to HDD.
 :::
 
-More details on [configuring TTL](../../engines/table-engines/mergetree-family/mergetree/#table_engine-mergetree-ttl).
+More details on [configuring TTL](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
 
 ## ALTER DELETE {#alter-delete}
 
@@ -41,4 +41,4 @@ More details on [manipulating partitions](../../sql-reference/statements/alter/p
 
 It’s rather radical to drop all data from a table, but in some cases it might be exactly what you need.
 
-More details on [table truncation](../../sql-reference/statements/truncate/).
+More details on [table truncation](../../sql-reference/statements/truncate.md).
\ No newline at end of file
diff --git a/docs/zh/faq/operations/index.md b/docs/zh/faq/operations/index.md
index 071cc872e4e..153eda6199a 100644
--- a/docs/zh/faq/operations/index.md
+++ b/docs/zh/faq/operations/index.md
@@ -1,5 +1,5 @@
 ---
-slug: /zh/faq/operations/
+slug: /zh/faq/operations/
 title: 关于操作ClickHouse服务器和集群的问题
 toc_hidden_folder: true
 sidebar_position: 3
@@ -13,9 +13,9 @@ sidebar_label: Operations
 -   [如果想在生产环境部署，需要用哪个版本的 ClickHouse 呢?](../../faq/operations/production.md)
 -   [是否可能从 ClickHouse 数据表中删除所有旧的数据记录?](../../faq/operations/delete-old-data.md)
 -   [ClickHouse支持多区域复制吗?](../../faq/operations/multi-region-replication.md)
-    
+
 
 !!! info "没看到你要找的东西吗?"
-    查看[其他faq类别](../../faq/)或浏览左边栏中的主要文档文章。
+    查看[其他faq类别](../../faq/index.md)或浏览左边栏中的主要文档文章。
 
 {## [原文](https://clickhouse.com/docs/en/faq/production/) ##}
diff --git a/docs/zh/faq/operations/production.md b/docs/zh/faq/operations/production.md
index cc5cf6b9614..90db050e8d3 100644
--- a/docs/zh/faq/operations/production.md
+++ b/docs/zh/faq/operations/production.md
@@ -67,6 +67,6 @@ For production use, there are two key options: `stable` and `lts`. Here is some
 
 Many teams who initially thought that `lts` is the way to go, often switch to `stable` anyway because of some recent feature that’s important for their product.
 
-:::warning    
-One more thing to keep in mind when upgrading ClickHouse: we’re always keeping eye on compatibility across releases, but sometimes it’s not reasonable to keep and some minor details might change. So make sure you check the [changelog](../../whats-new/changelog/) before upgrading to see if there are any notes about backward-incompatible changes.
+:::warning
+One more thing to keep in mind when upgrading ClickHouse: we’re always keeping eye on compatibility across releases, but sometimes it’s not reasonable to keep and some minor details might change. So make sure you check the [changelog](../../whats-new/changelog/index.md) before upgrading to see if there are any notes about backward-incompatible changes.
 :::
\ No newline at end of file
diff --git a/docs/zh/faq/use-cases/index.md b/docs/zh/faq/use-cases/index.md
index 75ef26368a3..ff0d873b37f 100644
--- a/docs/zh/faq/use-cases/index.md
+++ b/docs/zh/faq/use-cases/index.md
@@ -14,6 +14,6 @@ sidebar_label: 使用案例
 -   [我能把 ClickHouse 当做Key-value 键值存储来使用吗？](../../faq/use-cases/key-value.md)
 
 !!! info "没找到您所需要的内容?"
-    请查看[其他常见问题类别](../../faq/)或浏览左侧边栏中的主要文档文章。
+    请查看[其他常见问题类别](../../faq/index.md)或浏览左侧边栏中的主要文档文章。
 
 {## [原始文档](https://clickhouse.com/docs/en/faq/use-cases/) ##}
diff --git a/docs/zh/getting-started/example-datasets/recipes.mdx b/docs/zh/getting-started/example-datasets/recipes.mdx
index b7ed92962c5..b7f8fe8eafd 100644
--- a/docs/zh/getting-started/example-datasets/recipes.mdx
+++ b/docs/zh/getting-started/example-datasets/recipes.mdx
@@ -1,5 +1,5 @@
---- 
-slug: /zh/getting-started/example-datasets/recipes 
+---
+slug: /zh/getting-started/example-datasets/recipes
 sidebar_label: 食谱数据集
 title: "食谱数据集"
 ---
@@ -8,8 +8,8 @@ RecipeNLG 数据集可在 [此处](https://recipenlg.cs.put.poznan.pl/dataset) 
 
 ## 下载并解压数据集
 
-1. 进入下载页面[https://recipenlg.cs.put.poznan.pl/dataset](https://recipenlg.cs.put.poznan.pl/dataset)。 
-2. 接受条款和条件并下载 zip 文件。 
+1. 进入下载页面[https://recipenlg.cs.put.poznan.pl/dataset](https://recipenlg.cs.put.poznan.pl/dataset)。
+2. 接受条款和条件并下载 zip 文件。
 3. 使用 `unzip` 解压 zip 文件，得到 `full_dataset.csv` 文件。
 
 ## 创建表
@@ -49,13 +49,13 @@ clickhouse-client --query "
 
 这是一个展示如何解析自定义 CSV，这其中涉及了许多调整。
 
-说明： 
-- 数据集为 CSV 格式，但在插入时需要一些预处理；使用表函数 [input](../../sql-reference/table-functions/input.md) 进行预处理； 
-- CSV 文件的结构在表函数 `input` 的参数中指定； 
-- 字段 `num`（行号）是不需要的 - 可以忽略并从文件中进行解析； 
-- 使用 `FORMAT CSVWithNames`，因为标题不包含第一个字段的名称，因此 CSV 中的标题将被忽略（通过命令行参数 `--input_format_with_names_use_header 0`）； 
-- 文件仅使用双引号将 CSV 字符串括起来；一些字符串没有用双引号括起来，单引号也不能被解析为括起来的字符串 - 所以添加`--format_csv_allow_single_quote 0`参数接受文件中的单引号； 
-- 由于某些 CSV 的字符串的开头包含 `\M/` 因此无法被解析； CSV 中唯一可能以反斜杠开头的值是 `\N`，这个值被解析为 SQL NULL。通过添加`--input_format_allow_errors_num 10`参数，允许在导入过程中跳过 10 个格式错误； 
+说明：
+- 数据集为 CSV 格式，但在插入时需要一些预处理；使用表函数 [input](../../sql-reference/table-functions/input.md) 进行预处理；
+- CSV 文件的结构在表函数 `input` 的参数中指定；
+- 字段 `num`（行号）是不需要的 - 可以忽略并从文件中进行解析；
+- 使用 `FORMAT CSVWithNames`，因为标题不包含第一个字段的名称，因此 CSV 中的标题将被忽略（通过命令行参数 `--input_format_with_names_use_header 0`）；
+- 文件仅使用双引号将 CSV 字符串括起来；一些字符串没有用双引号括起来，单引号也不能被解析为括起来的字符串 - 所以添加`--format_csv_allow_single_quote 0`参数接受文件中的单引号；
+- 由于某些 CSV 的字符串的开头包含 `\M/` 因此无法被解析； CSV 中唯一可能以反斜杠开头的值是 `\N`，这个值被解析为 SQL NULL。通过添加`--input_format_allow_errors_num 10`参数，允许在导入过程中跳过 10 个格式错误；
 - 在数据集中的 Ingredients、directions 和 NER 字段为数组；但这些数组并没有以一般形式表示：这些字段作为 JSON 序列化为字符串，然后放入 CSV 中 - 在导入是将它们解析为字符串，然后使用 [JSONExtract](../../sql-reference/functions/json-functions.md ) 函数将其转换为数组。
 
 ## 验证插入的数据
@@ -80,7 +80,7 @@ SELECT count() FROM recipes;
 
 ### 按配方数量排列的顶级组件：
 
-在此示例中，我们学习如何使用 [arrayJoin](../../sql-reference/functions/array-join/) 函数将数组扩展为行的集合。
+在此示例中，我们学习如何使用 [arrayJoin](../../sql-reference/functions/array-join.md) 函数将数组扩展为行的集合。
 
 请求：
 
@@ -185,7 +185,7 @@ LIMIT 10
 10 rows in set. Elapsed: 0.215 sec. Processed 2.23 million rows, 1.48 GB (10.35 million rows/s., 6.86 GB/s.)
 ```
 
-在此示例中，我们使用 [has](../../sql-reference/functions/array-functions/#hasarr-elem) 函数来按过滤数组类型元素并按 directions 的数量进行排序。
+在此示例中，我们使用 [has](../../sql-reference/functions/array-functions.md#hasarr-elem) 函数来按过滤数组类型元素并按 directions 的数量进行排序。
 
 有一个婚礼蛋糕需要整个126个步骤来制作！显示 directions：
 
diff --git a/docs/zh/getting-started/install.md b/docs/zh/getting-started/install.md
index f622c51c0c4..e65cfea62cd 100644
--- a/docs/zh/getting-started/install.md
+++ b/docs/zh/getting-started/install.md
@@ -84,6 +84,17 @@ sudo /etc/init.d/clickhouse-server start
 clickhouse-client # or "clickhouse-client --password" if you set up a password.
 ```
 
+For systems with `zypper` package manager (openSUSE, SLES):
+
+``` bash
+sudo zypper addrepo -r https://packages.clickhouse.com/rpm/clickhouse.repo -g
+sudo zypper --gpg-auto-import-keys refresh clickhouse-stable
+sudo zypper install -y clickhouse-server clickhouse-client
+
+sudo /etc/init.d/clickhouse-server start
+clickhouse-client # or "clickhouse-client --password" if you set up a password.
+```
+
 <details markdown="1">
 
 <summary>Deprecated Method for installing rpm-packages</summary>
diff --git a/docs/zh/getting-started/tutorial.md b/docs/zh/getting-started/tutorial.md
index bef3ecee35f..989cf5f57d8 100644
--- a/docs/zh/getting-started/tutorial.md
+++ b/docs/zh/getting-started/tutorial.md
@@ -617,8 +617,9 @@ INSERT INTO tutorial.hits_all SELECT * FROM tutorial.hits_v1;
 
 启用本机复制[Zookeeper](http://zookeeper.apache.org/)是必需的。 ClickHouse负责所有副本的数据一致性，并在失败后自动运行恢复过程。建议将ZooKeeper集群部署在单独的服务器上（其中没有其他进程，包括运行的ClickHouse）。
 
-!!! note "注意"
-    ZooKeeper不是一个严格的要求：在某些简单的情况下，您可以通过将数据写入应用程序代码中的所有副本来复制数据。 这种方法是**不**建议的，在这种情况下，ClickHouse将无法保证所有副本上的数据一致性。 因此需要由您的应用来保证这一点。
+:::note
+ZooKeeper不是一个严格的要求：在某些简单的情况下，您可以通过将数据写入应用程序代码中的所有副本来复制数据。 这种方法是**不**建议的，在这种情况下，ClickHouse将无法保证所有副本上的数据一致性。 因此需要由您的应用来保证这一点。
+:::
 
 ZooKeeper位置在配置文件中指定:
 
diff --git a/docs/zh/guides/improving-query-performance/skipping-indexes.md b/docs/zh/guides/improving-query-performance/skipping-indexes.md
index 2f9ce09d77f..f9f43e46927 100644
--- a/docs/zh/guides/improving-query-performance/skipping-indexes.md
+++ b/docs/zh/guides/improving-query-performance/skipping-indexes.md
@@ -1,6 +1,6 @@
 ---
 slug: /zh/guides/improving-query-performance/skipping-indexes
-sidebar_label: Data Skipping Indexes
+sidebar_label: 跳数索引
 sidebar_position: 2
 ---
 
@@ -89,7 +89,7 @@ SELECT * FROM skip_table WHERE my_value IN (125, 700)
 
 下图是更直观的展示，这就是如何读取和选择my_value为125的4096行，以及如何跳过以下行而不从磁盘读取:
 
-![Simple Skip](../../../en/guides/improving-query-performance/images/simple_skip.svg)
+![Simple Skip](../../../en/guides/best-practices/images/simple_skip.svg)
 
 通过在执行查询时启用跟踪，用户可以看到关于跳数索引使用情况的详细信息。在clickhouse-client中设置send_logs_level:
 
@@ -126,7 +126,7 @@ Bloom filter是一种数据结构，它允许对集合成员进行高效的是
 * 基本的**bloom_filter**接受一个可选参数，该参数表示在0到1之间允许的“假阳性”率(如果未指定，则使用.025)。
 
 * 更专业的**tokenbf_v1**。需要三个参数，用来优化布隆过滤器：（1）过滤器的大小字节(大过滤器有更少的假阳性，有更高的存储成本)，（2）哈希函数的个数(更多的散列函数可以减少假阳性)。（3）布隆过滤器哈希函数的种子。有关这些参数如何影响布隆过滤器功能的更多细节，请参阅  [这里](https://hur.st/bloomfilter/)  。此索引仅适用于String、FixedString和Map类型的数据。输入表达式被分割为由非字母数字字符分隔的字符序列。例如，列值`This is a candidate for a "full text" search`将被分割为`This` `is` `a` `candidate` `for` `full` `text` `search`。它用于LIKE、EQUALS、in、hasToken()和类似的长字符串中单词和其他值的搜索。例如，一种可能的用途是在非结构的应用程序日志行列中搜索少量的类名或行号。
-  
+
 * 更专业的**ngrambf_v1**。该索引的功能与tokenbf_v1相同。在Bloom filter设置之前需要一个额外的参数，即要索引的ngram的大小。一个ngram是长度为n的任何字符串，比如如果n是4，`A short string`会被分割为`A sh`` sho`, `shor`, `hort`, `ort s`, `or st`, `r str`, ` stri`, `trin`, `ring`。这个索引对于文本搜索也很有用，特别是没有单词间断的语言，比如中文。
 
 ### 跳数索引函数
@@ -150,7 +150,7 @@ Bloom filter是一种数据结构，它允许对集合成员进行高效的是
 
 考虑以下数据分布：
 
-![Bad Skip!](../../../en/guides/improving-query-performance/images/bad_skip_1.svg)
+![Bad Skip!](../../../en/guides/best-practices/images/bad_skip_1.svg)
 
 
 假设主键/顺序是时间戳，并且在visitor_id上有一个索引。考虑下面的查询:
diff --git a/docs/zh/guides/improving-query-performance/sparse-primary-indexes.md b/docs/zh/guides/improving-query-performance/sparse-primary-indexes.md
index e773a02fbc3..eedc913cf82 100644
--- a/docs/zh/guides/improving-query-performance/sparse-primary-indexes.md
+++ b/docs/zh/guides/improving-query-performance/sparse-primary-indexes.md
@@ -1,6 +1,6 @@
 ---
-slug: /zh/guides/improving-query-performance/sparse-primary-indexes
-sidebar_label: Sparse Primary Indexes
+slug: /zh/guides/best-practices
+sidebar_label: 主键稀疏索引
 sidebar_position: 20
 ---
 
@@ -19,21 +19,21 @@ sidebar_position: 20
 :::note
 这篇文章主要关注稀疏索引。
 
-如果想了解<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#table_engine-mergetree-data_skipping-indexes" target="_blank">二级跳数索引</a>，请查看[教程](./skipping-indexes.md). 
+如果想了解<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#table_engine-mergetree-data_skipping-indexes" target="_blank">二级跳数索引</a>，请查看[教程](./skipping-indexes.md).
 
 :::
 
 
-## 数据集 
+## 数据集
 
 在本文中，我们将使用一个匿名的web流量数据集。
 
-- 我们将使用样本数据集中的887万行(事件)的子集。 
+- 我们将使用样本数据集中的887万行(事件)的子集。
 - 未压缩的数据大小为887万个事件和大约700mb。当存储在ClickHouse时，压缩为200mb。
 - 在我们的子集中，每行包含三列，表示在特定时间(EventTime列)单击URL (URL列)的互联网用户(UserID列)。
 
 通过这三个列，我们已经可以制定一些典型的web分析查询，如：
- 
+
 - 某个用户点击次数最多的前10个url是什么？
 - 点击某个URL次数最多的前10名用户是谁？
 - 用户点击特定URL的最频繁时间(比如一周中的几天)是什么？
@@ -44,7 +44,7 @@ sidebar_position: 20
 
 ## 全表扫描
 
-为了了解在没有主键的情况下如何对数据集执行查询，我们通过执行以下SQL DDL语句(使用MergeTree表引擎)创建了一个表：    
+为了了解在没有主键的情况下如何对数据集执行查询，我们通过执行以下SQL DDL语句(使用MergeTree表引擎)创建了一个表：
 
 ```sql
 CREATE TABLE hits_NoPrimaryKey
@@ -70,11 +70,11 @@ FROM url('https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz')
 WHERE URL != '';
 ```
 结果：
-```response 
+```response
 Ok.
 
 0 rows in set. Elapsed: 145.993 sec. Processed 8.87 million rows, 18.40 GB (60.78 thousand rows/s., 126.06 MB/s.)
-``` 
+```
 
 
 ClickHouse客户端输出了执行结果，插入了887万行数据。
@@ -102,7 +102,7 @@ ORDER BY Count DESC
 LIMIT 10;
 ```
 结果：
-```response 
+```response
 ┌─URL────────────────────────────┬─Count─┐
 │ http://auto.ru/chatay-barana.. │   170 │
 │ http://auto.ru/chatay-id=371...│    52 │
@@ -117,10 +117,10 @@ LIMIT 10;
 └────────────────────────────────┴───────┘
 
 10 rows in set. Elapsed: 0.022 sec.
-// highlight-next-line 
-Processed 8.87 million rows, 
+// highlight-next-line
+Processed 8.87 million rows,
 70.45 MB (398.53 million rows/s., 3.17 GB/s.)
-``` 
+```
 
 
 ClickHouse客户端输出表明，ClickHouse执行了一个完整的表扫描！我们的表的887万行中的每一行都被加载到ClickHouse中，这不是可扩展的。
@@ -131,7 +131,7 @@ ClickHouse客户端输出表明，ClickHouse执行了一个完整的表扫描！
 
 ## 包含主键的表
 
-创建一个包含联合主键UserID和URL列的表： 
+创建一个包含联合主键UserID和URL列的表：
 
 ```sql
 CREATE TABLE hits_UserID_URL
@@ -141,7 +141,7 @@ CREATE TABLE hits_UserID_URL
     `EventTime` DateTime
 )
 ENGINE = MergeTree
-// highlight-next-line    
+// highlight-next-line
 PRIMARY KEY (UserID, URL)
 ORDER BY (UserID, URL, EventTime)
 SETTINGS index_granularity = 8192, index_granularity_bytes = 0;
@@ -149,10 +149,10 @@ SETTINGS index_granularity = 8192, index_granularity_bytes = 0;
 
 [//]: # (<details open>)
 <details>
-    <summary><font color="black">
+    <summary><font color="white">
     DDL详情
     </font></summary>
-    <p><font color="black">
+    <p><font color="white">
 
 为了简化本文后面的讨论，并使图和结果可重现，使用DDL语句有如下说明：
 <ul>
@@ -164,7 +164,7 @@ SETTINGS index_granularity = 8192, index_granularity_bytes = 0;
 <li><font face = "monospace">index_granularity</font>: 显式设置为其默认值8192。这意味着对于每一组8192行，主索引将有一个索引条目，例如，如果表包含16384行，那么索引将有两个索引条目。
 </li>
 <br/>
-<li><font face = "monospace">index_granularity_bytes</font>: 设置为0表示禁止<a href="https://clickhouse.com/docs/en/whats-new/changelog/2019/#experimental-features-1" target="_blank"><font color="blue">自适应索引粒度</font></a>。自适应索引粒度意味着ClickHouse自动为一组n行创建一个索引条目
+<li><font face = "monospace">index_granularity_bytes</font>: 设置为0表示禁止<a href="https://clickhouse.com/docs/en/whats-new/changelog/2019/#experimental-features-1" target="_blank"><font color="white">自适应索引粒度</font></a>。自适应索引粒度意味着ClickHouse自动为一组n行创建一个索引条目
 <ul>
 <li>如果n小于8192，但n行的合并行数据大小大于或等于10MB (index_granularity_bytes的默认值)或</li>
 <li>n达到8192</li>
@@ -190,7 +190,7 @@ FROM url('https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz')
 WHERE URL != '';
 ```
 结果：
-```response 
+```response
 0 rows in set. Elapsed: 149.432 sec. Processed 8.87 million rows, 18.40 GB (59.38 thousand rows/s., 123.16 MB/s.)
 ```
 
@@ -219,7 +219,7 @@ FROM system.parts
 WHERE (table = 'hits_UserID_URL') AND (active = 1)
 FORMAT Vertical;
 ```
- 
+
 结果：
 
 ```response
@@ -237,7 +237,7 @@ bytes_on_disk:               207.07 MiB
 ```
 
 客户端输出表明：
- 
+
 - 表数据以<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-data-storage" target="_blank">wide format</a>存储在一个特定目录，每个列有一个数据文件和mark文件。
 - 表有887万行数据。
 - 未压缩的数据有733.28 MB。
@@ -278,8 +278,8 @@ bytes_on_disk:               207.07 MiB
 
 ## 数据按照主键排序存储在磁盘上
 
-上面创建的表有： 
-- 联合<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#primary-keys-and-indexes-in-queries" target="_blank">主键</a> <font face = "monospace">(UserID, URL)</font> 
+上面创建的表有：
+- 联合<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#primary-keys-and-indexes-in-queries" target="_blank">主键</a> <font face = "monospace">(UserID, URL)</font>
 - 联合<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#choosing-a-primary-key-that-differs-from-the-sorting-key" target="_blank">排序键</a> <font face = "monospace">(UserID, URL, EventTime)</font>。
 
 :::note
@@ -293,7 +293,7 @@ bytes_on_disk:               207.07 MiB
 :::
 
 
-插入的行按照主键列(以及排序键的附加EventTime列)的字典序(从小到大)存储在磁盘上。 
+插入的行按照主键列(以及排序键的附加EventTime列)的字典序(从小到大)存储在磁盘上。
 
 :::note
 ClickHouse允许插入具有相同主键列的多行数据。在这种情况下(参见下图中的第1行和第2行)，最终的顺序是由指定的排序键决定的，这里是EventTime列的值。
@@ -307,7 +307,7 @@ ClickHouse允许插入具有相同主键列的多行数据。在这种情况下(
   - 然后是<font face = "monospace">URL</font>，
   - 最后是<font face = "monospace">EventTime</font>：
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-01.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-01.png').default} class="image"/>
 UserID.bin，URL.bin，和EventTime.bin是<font face = "monospace">UserID</font>，<font face = "monospace">URL</font>，和<font face = "monospace">EventTime</font>列的数据文件。
 
 <br/>
@@ -331,13 +331,19 @@ UserID.bin，URL.bin，和EventTime.bin是<font face = "monospace">UserID</font>
 
 下图显示了如何将表中的887万行(列值)组织成1083个颗粒，这是表的DDL语句包含设置<font face = "monospace">index_granularity</font>(设置为默认值8192)的结果。
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-02.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-02.png').default} class="image"/>
 
 第一个(根据磁盘上的物理顺序)8192行(它们的列值)在逻辑上属于颗粒0，然后下一个8192行(它们的列值)属于颗粒1，以此类推。
 
 :::note
 - 最后一个颗粒（1082颗粒）是少于8192行的。
 
+- 我们在本指南开头的“DDL 语句详细信息”中提到，我们禁用了自适应索引粒度（为了简化本指南中的讨论，并使图表和结果可重现）。
+
+  因此，示例表中所有颗粒（除了最后一个）都具有相同大小。
+
+- 对于具有自适应索引粒度的表（默认情况下索引粒度是自适应的），某些粒度的大小可以小于 8192 行，具体取决于行数据大小。
+
 - 我们将主键列(<font face = "monospace">UserID</font>, <font face = "monospace">URL</font>)中的一些列值标记为橙色。
 
   这些橙色标记的列值是每个颗粒中每个主键列的最小值。这里的例外是最后一个颗粒(上图中的颗粒1082)，最后一个颗粒我们标记的是最大的值。
@@ -355,21 +361,21 @@ UserID.bin，URL.bin，和EventTime.bin是<font face = "monospace">UserID</font>
 
 下面的图显示了索引存储了每个颗粒的最小主键列值(在上面的图中用橙色标记的值)。
 例如：
-- 第一个索引条目(下图中的“mark 0”)存储上图中颗粒0的主键列的最小值，  
-- 第二个索引条目(下图中的“mark 1”)存储上图中颗粒1的主键列的最小值，以此类推。 
+- 第一个索引条目(下图中的“mark 0”)存储上图中颗粒0的主键列的最小值，
+- 第二个索引条目(下图中的“mark 1”)存储上图中颗粒1的主键列的最小值，以此类推。
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-03a.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-03a.png').default} class="image"/>
 
-在我们的表中，索引总共有1083个条目，887万行数据和1083个颗粒: 
+在我们的表中，索引总共有1083个条目，887万行数据和1083个颗粒:
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-03b.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-03b.png').default} class="image"/>
 
 :::note
 - 最后一个索引条目(上图中的“mark 1082”)存储了上图中颗粒1082的主键列的最大值。
 
 - 索引条目(索引标记)不是基于表中的特定行，而是基于颗粒。例如，对于上图中的索引条目‘mark 0’，在我们的表中没有<font face = "monospace">UserID</font>为240.923且<font face = "monospace">URL</font>为“goal://metry=10000467796a411…”的行，相反，对于该表，有一个颗粒0，在该颗粒中，最小<font face = "monospace">UserID</font>值是240.923，最小<font face = "monospace">URL</font>值是“goal://metry=10000467796a411…”，这两个值来自不同的行。
 
-- 主索引文件完全加载到主内存中。如果文件大于可用的空闲内存空间，则ClickHouse将发生错误。 
+- 主索引文件完全加载到主内存中。如果文件大于可用的空闲内存空间，则ClickHouse将发生错误。
 :::
 
 
@@ -377,11 +383,11 @@ UserID.bin，URL.bin，和EventTime.bin是<font face = "monospace">UserID</font>
 - UserID index marks:<br/>
   主索引中存储的<font face = "monospace">UserID</font>值按升序排序。<br/>
   上图中的‘mark 1’指示颗粒1中所有表行的UserID值，以及随后所有颗粒中的<font face = "monospace">UserID</font>值，都保证大于或等于4.073.710。
- 
+
  [正如我们稍后将看到的](#query-on-userid-fast), 当查询对主键的第一列进行过滤时，此全局有序使ClickHouse能够对第一个键列的索引标记使用二分查找算法。
 
-- URL index marks:<br/> 
-  主键列<font face = "monospace">UserID</font>和<font face = "monospace">URL</font>有相同的基数，这意味着第一列之后的所有主键列的索引标记通常只表示每个颗粒的数据范围。<br/> 
+- URL index marks:<br/>
+  主键列<font face = "monospace">UserID</font>和<font face = "monospace">URL</font>有相同的基数，这意味着第一列之后的所有主键列的索引标记通常只表示每个颗粒的数据范围。<br/>
   例如，‘mark 0’中的<font face = "monospace">URL</font>列所有的值都大于等于<font face = "monospace">goal://metry=10000467796a411...</font>， 然后颗粒1中的<font face = "monospace">URL</font>并不是如此，这是因为‘mark 1‘与‘mark 0‘具有不同的<font face = "monospace">UserID</font>列值。
 
   稍后我们将更详细地讨论这对查询执行性能的影响。
@@ -401,7 +407,7 @@ GROUP BY URL
 ORDER BY Count DESC
 LIMIT 10;
 ```
- 
+
 结果：
 <a name="query-on-userid-fast"></a>
 
@@ -420,24 +426,24 @@ LIMIT 10;
 └────────────────────────────────┴───────┘
 
 10 rows in set. Elapsed: 0.005 sec.
-// highlight-next-line  
-Processed 8.19 thousand rows, 
+// highlight-next-line
+Processed 8.19 thousand rows,
 740.18 KB (1.53 million rows/s., 138.59 MB/s.)
 ```
 
-ClickHouse客户端的输出显示，没有进行全表扫描，只有8.19万行流到ClickHouse。
+ClickHouse客户端的输出显示，没有进行全表扫描，只有8.19千行流到ClickHouse。
 
 
 如果<a href="https://clickhouse.com/docs/en/operations/server-configuration-parameters/settings/#server_configuration_parameters-logger" target="_blank">trace logging</a>打开了，那ClickHouse服务端日志会显示ClickHouse正在对1083个UserID索引标记执行<a href="https://github.com/ClickHouse/ClickHouse/blob/22.3/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp#L1452" target="_blank">二分查找</a>以便识别可能包含UserID列值为749927693的行的颗粒。这需要19个步骤，平均时间复杂度为<font face = "monospace">O(log2 n)</font>：
 ```response
 ...Executor): Key condition: (column 0 in [749927693, 749927693])
-// highlight-next-line 
+// highlight-next-line
 ...Executor): Running binary search on index range for part all_1_9_2 (1083 marks)
 ...Executor): Found (LEFT) boundary mark: 176
 ...Executor): Found (RIGHT) boundary mark: 177
 ...Executor): Found continuous range in 19 steps
 ...Executor): Selected 1/1 parts by partition key, 1 parts by primary key,
-// highlight-next-line  
+// highlight-next-line
               1/1083 marks by primary key, 1 marks to read from 1 ranges
 ...Reading ...approx. 8192 rows starting from 1441792
 ```
@@ -446,12 +452,12 @@ ClickHouse客户端的输出显示，没有进行全表扫描，只有8.19万行
 我们可以在上面的跟踪日志中看到，1083个现有标记中有一个满足查询。
 
 <details>
-    <summary><font color="black">
+    <summary><font color="white">
     Trace Log详情
     </font></summary>
-    <p><font color="black">
+    <p><font color="white">
 
-Mark 176 was identified (the 'found left boundary mark' is inclusive, the 'found right boundary mark' is exclusive), and therefore all 8192 rows from granule 176 (which starts at row 1.441.792 - we will see that later on in this article) are then streamed into ClickHouse in order to find the actual rows with a UserID column value of <font face = "monospace">749927693</font>. 
+Mark 176 was identified (the 'found left boundary mark' is inclusive, the 'found right boundary mark' is exclusive), and therefore all 8192 rows from granule 176 (which starts at row 1.441.792 - we will see that later on in this article) are then streamed into ClickHouse in order to find the actual rows with a UserID column value of <font face = "monospace">749927693</font>.
 </font></p>
 </details>
 
@@ -465,7 +471,7 @@ GROUP BY URL
 ORDER BY Count DESC
 LIMIT 10;
 ```
- 
+
 结果如下：
 
 ```response
@@ -507,23 +513,23 @@ LIMIT 10;
 
 在**第二阶段(数据读取中)**, ClickHouse定位所选的颗粒，以便将它们的所有行流到ClickHouse引擎中，以便找到实际匹配查询的行。
 
-我们将在下一节更详细地讨论第二阶段。  
+我们将在下一节更详细地讨论第二阶段。
 
 <a name="mark-files"></a>
 
 ## 标记文件用来定位颗粒
 
-下图描述了上表主索引文件的一部分。 
+下图描述了上表主索引文件的一部分。
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-04.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-04.png').default} class="image"/>
 
 如上所述，通过对索引的1083个UserID标记进行二分搜索，确定了第176个标记。因此，它对应的颗粒176可能包含UserID列值为749.927.693的行。
 
 <details>
-    <summary><font color="black">
+    <summary><font color="white">
     颗粒选择的具体过程
     </font></summary>
-    <p><font color="black">
+    <p><font color="white">
 
 上图显示，标记176是第一个UserID值小于749.927.693的索引条目，并且下一个标记(标记177)的颗粒177的最小UserID值大于该值的索引条目。因此，只有标记176对应的颗粒176可能包含UserID列值为749.927.693的行。
 </font></p>
@@ -537,7 +543,7 @@ LIMIT 10;
 
 下图显示了三个标记文件UserID.mrk、URL.mrk、EventTime.mrk，为表的UserID、URL和EventTime列存储颗粒的物理位置。
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-05.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-05.png').default} class="image"/>
 
 我们已经讨论了主索引是一个扁平的未压缩数组文件(primary.idx)，其中包含从0开始编号的索引标记。
 
@@ -545,9 +551,9 @@ LIMIT 10;
 
 一旦ClickHouse确定并选择了可能包含查询所需的匹配行的颗粒的索引标记，就可以在标记文件数组中查找，以获得颗粒的物理位置。
 
-每个特定列的标记文件条目以偏移量的形式存储两个位置: 
+每个特定列的标记文件条目以偏移量的形式存储两个位置:
 
-- 第一个偏移量(上图中的'block_offset')是在包含所选颗粒的压缩版本的压缩列数据文件中定位块。这个压缩块可能包含几个压缩的颗粒。所定位的压缩文件块在读取时被解压到内存中。 
+- 第一个偏移量(上图中的'block_offset')是在包含所选颗粒的压缩版本的压缩列数据文件中定位块。这个压缩块可能包含几个压缩的颗粒。所定位的压缩文件块在读取时被解压到内存中。
 
 - 标记文件的第二个偏移量(上图中的“granule_offset”)提供了颗粒在解压数据块中的位置。
 
@@ -576,7 +582,7 @@ LIMIT 10;
 
 下面的图表和文本说明了我们的查询示例，ClickHouse如何在UserID.bin数据文件中定位176颗粒。
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-06.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-06.png').default} class="image"/>
 
 我们在本文前面讨论过，ClickHouse选择了主索引标记176，因此176颗粒可能包含查询所需的匹配行。
 
@@ -624,7 +630,7 @@ LIMIT 10;
 ```
 
 结果是： <a name="query-on-url-slow"></a>
-```response 
+```response
 ┌─────UserID─┬─Count─┐
 │ 2459550954 │  3741 │
 │ 1084649151 │  2484 │
@@ -639,26 +645,26 @@ LIMIT 10;
 └────────────┴───────┘
 
 10 rows in set. Elapsed: 0.086 sec.
-// highlight-next-line  
-Processed 8.81 million rows, 
+// highlight-next-line
+Processed 8.81 million rows,
 799.69 MB (102.11 million rows/s., 9.27 GB/s.)
-``` 
+```
 
 客户端输出表明，尽管URL列是联合主键的一部分，ClickHouse几乎执行了一一次全表扫描！ClickHouse从表的887万行中读取881万行。
 
 如果启用了trace日志，那么ClickHouse服务日志文件显示，ClickHouse在1083个URL索引标记上使用了通用的排除搜索，以便识别那些可能包含URL列值为"http://public_search"的行。
-```response 
-...Executor): Key condition: (column 1 in ['http://public_search', 
+```response
+...Executor): Key condition: (column 1 in ['http://public_search',
                                            'http://public_search'])
-// highlight-next-line 
-...Executor): Used generic exclusion search over index for part all_1_9_2 
+// highlight-next-line
+...Executor): Used generic exclusion search over index for part all_1_9_2
               with 1537 steps
 ...Executor): Selected 1/1 parts by partition key, 1 parts by primary key,
-// highlight-next-line 
+// highlight-next-line
               1076/1083 marks by primary key, 1076 marks to read from 5 ranges
 ...Executor): Reading approx. 8814592 rows with 10 streams
-``` 
-我们可以在上面的跟踪日志示例中看到，1083个颗粒中有1076个(通过标记)被选中，因为可能包含具有匹配URL值的行。  
+```
+我们可以在上面的跟踪日志示例中看到，1083个颗粒中有1076个(通过标记)被选中，因为可能包含具有匹配URL值的行。
 
 这将导致881万行被读取到ClickHouse引擎中(通过使用10个流并行地读取)，以便识别实际包含URL值"http://public_search"的行。
 
@@ -671,15 +677,15 @@ Processed 8.81 million rows,
 为了说明，我们给出通用的排除搜索算法的工作原理：
 
 <details open>
-    <summary><font color="black">
-    <a name="generic-exclusion-search-algorithm"></a>通用排除搜索算法 
+    <summary><font color="white">
+    <a name="generic-exclusion-search-algorithm"></a>通用排除搜索算法
     </font></summary>
-    <p><font color="black">
+    <p><font color="white">
 
 
 
 
-下面将演示当通过第一个列之后的任何列选择颗粒时，当前一个键列具有或高或低的基数时，ClickHouse<a href="https://github.com/ClickHouse/ClickHouse/blob/22.3/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp#L14444" target="_blank" ><font color="blue">通用排除搜索算法</font></a> 是如何工作的。
+下面将演示当通过第一个列之后的任何列选择颗粒时，当前一个键列具有或高或低的基数时，ClickHouse<a href="https://github.com/ClickHouse/ClickHouse/blob/22.3/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp#L14444" target="_blank" ><font color="white">通用排除搜索算法</font></a> 是如何工作的。
 
 作为这两种情况的例子，我们将假设：
 - 搜索URL值为"W3"的行。
@@ -693,7 +699,7 @@ Processed 8.81 million rows,
 
 假设UserID具有较低的基数。在这种情况下，相同的UserID值很可能分布在多个表行和颗粒上，从而分布在索引标记上。对于具有相同UserID的索引标记，索引标记的URL值按升序排序(因为表行首先按UserID排序，然后按URL排序)。这使得有效的过滤如下所述：
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-07.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-07.png').default} class="image"/>
 
 在上图中，我们的抽象样本数据的颗粒选择过程有三种不同的场景:
 
@@ -704,13 +710,13 @@ Processed 8.81 million rows,
 
 3. 可以排除URL值大于W3的索引标记2和3，因为主索引的索引标记存储了每个颗粒的最小键列值，因此颗粒2和3不可能包含URL值W3。
 
- 
+
 
 **前缀主键高基数**<a name="generic-exclusion-search-slow"></a>
 
 当UserID具有较高的基数时，相同的UserID值不太可能分布在多个表行和颗粒上。这意味着索引标记的URL值不是单调递增的：
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-08.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-08.png').default} class="image"/>
 
 
 正如在上面的图表中所看到的，所有URL值小于W3的标记都被选中，以便将其关联的颗粒的行加载到ClickHouse引擎中。
@@ -736,16 +742,16 @@ Processed 8.81 million rows,
 在我们的示例数据集中，两个键列(UserID、URL)都具有类似的高基数，并且，如前所述，当URL列的前一个键列具有较高基数时，通用排除搜索算法不是很有效。
 
 :::note 看下跳数索引
-因为UserID和URL具有较高的基数，[<font color="blue">根据URL过滤数据</font>](#query-on-url)不是特别有效，对URL列创建[<font color="blue">二级跳数索引</font>](./skipping-indexes.md)同样也不会有太多改善。
+因为UserID和URL具有较高的基数，[<font color="white">根据URL过滤数据</font>](#query-on-url)不是特别有效，对URL列创建[<font color="white">二级跳数索引</font>](./skipping-indexes.md)同样也不会有太多改善。
 
-例如，这两个语句在我们的表的URL列上创建并填充一个<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#primary-keys-and-indexes-in-queries" target="_blank"><font color="blue">minmax</font></a>跳数索引。
+例如，这两个语句在我们的表的URL列上创建并填充一个<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#primary-keys-and-indexes-in-queries" target="_blank"><font color="white">minmax</font></a>跳数索引。
 ```sql
 ALTER TABLE hits_UserID_URL ADD INDEX url_skipping_index URL TYPE minmax GRANULARITY 4;
 ALTER TABLE hits_UserID_URL MATERIALIZE INDEX url_skipping_index;
 ```
 ClickHouse现在创建了一个额外的索引来存储—每组4个连续的颗粒(注意上面ALTER TABLE语句中的GRANULARITY 4子句)—最小和最大的URL值：
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-13a.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-13a.png').default} class="image"/>
 
 第一个索引条目(上图中的mark 0)存储属于表的前4个颗粒的行的最小和最大URL值。
 
@@ -786,15 +792,15 @@ ClickHouse现在创建了一个额外的索引来存储—每组4个连续的颗
 
 当创建有不同主键的第二个表时，查询必须显式地发送给最适合查询的表版本，并且必须显式地插入新数据到两个表中，以保持表的同步：
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-09a.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-09a.png').default} class="image"/>
 
 
 在物化视图中，额外的表被隐藏，数据自动在两个表之间保持同步：
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-09b.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-09b.png').default} class="image"/>
 
 
 projection方式是最透明的选项，因为除了自动保持隐藏的附加表与数据变化同步外，ClickHouse还会自动选择最有效的表版本进行查询：
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-09c.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-09c.png').default} class="image"/>
 
 下面我们使用真实的例子详细讨论下这三种方式。
 
@@ -813,7 +819,7 @@ CREATE TABLE hits_URL_UserID
     `EventTime` DateTime
 )
 ENGINE = MergeTree
-// highlight-next-line  
+// highlight-next-line
 PRIMARY KEY (URL, UserID)
 ORDER BY (URL, UserID, EventTime)
 SETTINGS index_granularity = 8192, index_granularity_bytes = 0;
@@ -822,10 +828,10 @@ SETTINGS index_granularity = 8192, index_granularity_bytes = 0;
 写入887万行源表数据：
 
 ```sql
-INSERT INTO hits_URL_UserID 
+INSERT INTO hits_URL_UserID
 SELECT * from hits_UserID_URL;
 ```
- 
+
 结果：
 
 ```response
@@ -841,10 +847,10 @@ OPTIMIZE TABLE hits_URL_UserID FINAL;
 
 因为我们切换了主键中列的顺序，插入的行现在以不同的字典顺序存储在磁盘上(与我们的原始表相比)，因此该表的1083个颗粒也包含了与以前不同的值：
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-10.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-10.png').default} class="image"/>
 
 主键索引如下：
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-11.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-11.png').default} class="image"/>
 
 现在计算最频繁点击URL"http://public_search"的前10名用户，这时候的查询速度是明显加快的：
 ```sql
@@ -856,7 +862,7 @@ GROUP BY UserID
 ORDER BY Count DESC
 LIMIT 10;
 ```
- 
+
 结果：
 <a name="query-on-url-fast"></a>
 
@@ -875,8 +881,8 @@ LIMIT 10;
 └────────────┴───────┘
 
 10 rows in set. Elapsed: 0.017 sec.
-// highlight-next-line 
-Processed 319.49 thousand rows, 
+// highlight-next-line
+Processed 319.49 thousand rows,
 11.38 MB (18.41 million rows/s., 655.75 MB/s.)
 ```
 
@@ -887,15 +893,15 @@ Processed 319.49 thousand rows,
 将URL作为主索引的第一列，ClickHouse现在对索引标记运行二分搜索。ClickHouse服务器日志文件中对应的跟踪日志：
 
 ```response
-...Executor): Key condition: (column 0 in ['http://public_search', 
+...Executor): Key condition: (column 0 in ['http://public_search',
                                            'http://public_search'])
-// highlight-next-line                                           
+// highlight-next-line
 ...Executor): Running binary search on index range for part all_1_9_2 (1083 marks)
 ...Executor): Found (LEFT) boundary mark: 644
 ...Executor): Found (RIGHT) boundary mark: 683
 ...Executor): Found continuous range in 19 steps
 ...Executor): Selected 1/1 parts by partition key, 1 parts by primary key,
-// highlight-next-line 
+// highlight-next-line
               39/1083 marks by primary key, 39 marks to read from 1 ranges
 ...Executor): Reading approx. 319488 rows with 2 streams
 ```
@@ -907,10 +913,10 @@ ClickHouse只选择了39个索引标记，而不是使用通用排除搜索时
 
 点击下面了解详情：
 <details>
-    <summary><font color="black">
+    <summary><font color="white">
     对UserID的查询过滤性能较差<a name="query-on-userid-slow"></a>
     </font></summary>
-    <p><font color="black">
+    <p><font color="white">
 
 ```sql
 SELECT URL, count(URL) AS Count
@@ -920,7 +926,7 @@ GROUP BY URL
 ORDER BY Count DESC
 LIMIT 10;
 ```
- 
+
 结果
 
 ```response
@@ -938,8 +944,8 @@ LIMIT 10;
 └────────────────────────────────┴───────┘
 
 10 rows in set. Elapsed: 0.024 sec.
-// highlight-next-line  
-Processed 8.02 million rows, 
+// highlight-next-line
+Processed 8.02 million rows,
 73.04 MB (340.26 million rows/s., 3.10 GB/s.)
 ```
 
@@ -947,10 +953,10 @@ Processed 8.02 million rows,
 ```response
 ...Executor): Key condition: (column 1 in [749927693, 749927693])
 // highlight-next-line
-...Executor): Used generic exclusion search over index for part all_1_9_2 
+...Executor): Used generic exclusion search over index for part all_1_9_2
               with 1453 steps
 ...Executor): Selected 1/1 parts by partition key, 1 parts by primary key,
-// highlight-next-line 
+// highlight-next-line
               980/1083 marks by primary key, 980 marks to read from 23 ranges
 ...Executor): Reading approx. 8028160 rows with 10 streams
 ```
@@ -960,7 +966,7 @@ Processed 8.02 million rows,
 
 
 现在我们有了两张表。优化了对UserID和URL的查询过滤，分别:
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-12a.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-12a.png').default} class="image"/>
 
 
 
@@ -981,7 +987,7 @@ ORDER BY (URL, UserID, EventTime)
 POPULATE
 AS SELECT * FROM hits_UserID_URL;
 ```
- 
+
 结果：
 
 ```response
@@ -993,20 +999,20 @@ Ok.
 :::note
 - 我们在视图的主键中切换键列的顺序(与原始表相比)
 - 物化视图由一个隐藏表支持，该表的行顺序和主索引基于给定的主键定义
-- 我们使用POPULATE关键字，以便用源表hits_UserID_URL中的所有887万行立即导入新的物化视图 
+- 我们使用POPULATE关键字，以便用源表hits_UserID_URL中的所有887万行立即导入新的物化视图
 - 如果在源表hits_UserID_URL中插入了新行，那么这些行也会自动插入到隐藏表中
 - 实际上，隐式创建的隐藏表的行顺序和主索引与我们上面显式创建的辅助表相同:
 
 
 
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-12b-1.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-12b-1.png').default} class="image"/>
 
 
 ClickHouse将隐藏表的列数据文件(.bin)、标记文件(.mrk2)和主索引(primary.idx)存储在ClickHouse服务器的数据目录的一个特殊文件夹中：
 
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-12b-2.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-12b-2.png').default} class="image"/>
 
 :::
 
@@ -1021,7 +1027,7 @@ GROUP BY UserID
 ORDER BY Count DESC
 LIMIT 10;
 ```
- 
+
 结果：
 
 ```response
@@ -1039,8 +1045,8 @@ LIMIT 10;
 └────────────┴───────┘
 
 10 rows in set. Elapsed: 0.026 sec.
-// highlight-next-line 
-Processed 335.87 thousand rows, 
+// highlight-next-line
+Processed 335.87 thousand rows,
 13.54 MB (12.91 million rows/s., 520.38 MB/s.)
 ```
 
@@ -1049,13 +1055,13 @@ Processed 335.87 thousand rows,
 ClickHouse服务器日志文件中相应的跟踪日志确认了ClickHouse正在对索引标记运行二分搜索：
 
 ```response
-...Executor): Key condition: (column 0 in ['http://public_search', 
+...Executor): Key condition: (column 0 in ['http://public_search',
                                            'http://public_search'])
 // highlight-next-line
 ...Executor): Running binary search on index range ...
 ...
 ...Executor): Selected 4/4 parts by partition key, 4 parts by primary key,
-// highlight-next-line 
+// highlight-next-line
               41/1083 marks by primary key, 41 marks to read from 4 ranges
 ...Executor): Reading approx. 335872 rows with 4 streams
 ```
@@ -1068,7 +1074,7 @@ ClickHouse服务器日志文件中相应的跟踪日志确认了ClickHouse正在
 <a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#projections" target="_blank">Projections</a>目前是一个实验性的功能，因此我们需要告诉ClickHouse：
 
 ```sql
-SET allow_experimental_projection_optimization = 1;
+SET optimize_use_projections = 1;
 ```
 
 
@@ -1095,11 +1101,11 @@ ALTER TABLE hits_UserID_URL
 - 查询总是(从语法上)针对源表hits_UserID_URL，但是如果隐藏表的行顺序和主索引允许更有效地执行查询，那么将使用该隐藏表
 - 实际上，隐式创建的隐藏表的行顺序和主索引与我们显式创建的辅助表相同：
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-12c-1.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-12c-1.png').default} class="image"/>
 
 ClickHouse将隐藏表的列数据文件(.bin)、标记文件(.mrk2)和主索引(primary.idx)存储在一个特殊的文件夹中(在下面的截图中用橙色标记)，紧挨着源表的数据文件、标记文件和主索引文件：
 
-<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-12c-2.png').default} class="image"/>
+<img src={require('../../../en/guides/best-practices/images/sparse-primary-indexes-12c-2.png').default} class="image"/>
 :::
 
 由投影创建的隐藏表(以及它的主索引)现在可以(隐式地)用于显著加快URL列上查询过滤的执行。注意，查询在语法上针对投影的源表。
@@ -1113,7 +1119,7 @@ GROUP BY UserID
 ORDER BY Count DESC
 LIMIT 10;
 ```
- 
+
 结果：
 
 ```response
@@ -1130,8 +1136,8 @@ LIMIT 10;
 │  765730816 │   536 │
 └────────────┴───────┘
 
-10 rows in set. Elapsed: 0.029 sec. 
-// highlight-next-line 
+10 rows in set. Elapsed: 0.029 sec.
+// highlight-next-line
 Processed 319.49 thousand rows, 1
 1.38 MB (11.05 million rows/s., 393.58 MB/s.)
 ```
@@ -1142,16 +1148,16 @@ ClickHouse服务器日志文件中跟踪日志确认了ClickHouse正在对索引
 
 
 ```response
-...Executor): Key condition: (column 0 in ['http://public_search', 
+...Executor): Key condition: (column 0 in ['http://public_search',
                                            'http://public_search'])
-// highlight-next-line                                           
+// highlight-next-line
 ...Executor): Running binary search on index range for part prj_url_userid (1083 marks)
 ...Executor): ...
 // highlight-next-line
 ...Executor): Choose complete Normal projection prj_url_userid
 ...Executor): projection required columns: URL, UserID
 ...Executor): Selected 1/1 parts by partition key, 1 parts by primary key,
-// highlight-next-line 
+// highlight-next-line
               39/1083 marks by primary key, 39 marks to read from 1 ranges
 ...Executor): Reading approx. 319488 rows with 2 streams
 ```
diff --git a/docs/zh/interfaces/formats.md b/docs/zh/interfaces/formats.md
index 852b327366b..fd3cf743818 100644
--- a/docs/zh/interfaces/formats.md
+++ b/docs/zh/interfaces/formats.md
@@ -685,8 +685,9 @@ CREATE TABLE IF NOT EXISTS example_table
 -   如果`input_format_defaults_for_omitted_fields = 0`, 那么`x`和`a`的默认值等于`0`(作为`UInt32`数据类型的默认值)。
 -   如果`input_format_defaults_for_omitted_fields = 1`, 那么`x`的默认值为`0`，但`a`的默认值为`x * 2`。
 
-!!! note "注意"
+:::warning
 当使用`input_format_defaults_for_omitted_fields = 1`插入数据时，与使用`input_format_defaults_for_omitted_fields = 0`相比，ClickHouse消耗更多的计算资源。
+:::
 
 ### Selecting Data {#selecting-data}
 
@@ -708,8 +709,9 @@ CREATE TABLE IF NOT EXISTS example_table
 
 与[JSON](#json)格式不同，没有替换无效的UTF-8序列。值以与`JSON`相同的方式转义。
 
-!!! note "提示"
+:::info
 字符串中可以输出任意一组字节。如果您确信表中的数据可以被格式化为JSON而不会丢失任何信息，那么就使用`JSONEachRow`格式。
+:::
 
 ### Nested Structures {#jsoneachrow-nested}
 
@@ -1216,9 +1218,9 @@ SET format_avro_schema_registry_url = 'http://schema-registry';
 SELECT * FROM topic1_stream;
 ```
 
-!!! note "警告"
-    设置 `format_avro_schema_registry_url` 需要写入配置文件`users.xml`以在Clickhouse重启后，该设置仍为您的设定值。您也可以在使用Kafka引擎的时候指定该设置。
-
+:::warning
+设置 `format_avro_schema_registry_url` 需要写入配置文件`users.xml`以在Clickhouse重启后，该设置仍为您的设定值。您也可以在使用Kafka引擎的时候指定该设置。
+:::
 
 ## Parquet {#data-format-parquet}
 
diff --git a/docs/zh/interfaces/http.md b/docs/zh/interfaces/http.md
index 11754ed3e2f..c7a0f355a92 100644
--- a/docs/zh/interfaces/http.md
+++ b/docs/zh/interfaces/http.md
@@ -96,7 +96,7 @@ ECT 1
 , expected One of: SHOW TABLES, SHOW DATABASES, SELECT, INSERT, CREATE, ATTACH, RENAME, DROP, DETACH, USE, SET, OPTIMIZE., e.what() = DB::Exception
 ```
 
-默认情况下，返回的数据是`TabSeparated`格式的，更多信息，见[Formats](../interfaces/formats/)部分。
+默认情况下，返回的数据是`TabSeparated`格式的，更多信息，见[Formats](../interfaces/formats.md)部分。
 
 您可以使用查询的FORMAT子句来设置其他格式。
 
@@ -188,8 +188,9 @@ $ curl -vsS "http://localhost:8123/?enable_http_compression=1" -d 'SELECT number
 $ echo "SELECT 1" | gzip -c | curl -sS --data-binary @- -H 'Content-Encoding: gzip' 'http://localhost:8123/'
 ```
 
-!!! note "警告"
-    一些HTTP客户端可能会在默认情况下从服务器解压数据(使用`gzip`和`deflate`)，即使您未正确地使用了压缩设置，您也可能会得到解压数据。
+:::warning
+一些HTTP客户端可能会在默认情况下从服务器解压数据(使用`gzip`和`deflate`)，即使您未正确地使用了压缩设置，您也可能会得到解压数据。
+:::
 
 您可以使用`database`URL参数或`X-ClickHouse-Database`头来指定默认数据库。
 
@@ -447,8 +448,9 @@ $ curl -H 'XXX:TEST_HEADER_VALUE' -H 'PARAMS_XXX:max_threads' 'http://localhost:
 max_final_threads   2
 ```
 
-!!! note "警告"
-    在一个`predefined_query_handler`中，只支持insert类型的一个`查询`。
+:::warning
+在一个`predefined_query_handler`中，只支持insert类型的一个`查询`。
+:::
 
 ### 动态查询 {#dynamic_query_handler}
 
diff --git a/docs/zh/interfaces/third-party/client-libraries.md b/docs/zh/interfaces/third-party/client-libraries.md
index 1d46c19ce8b..4ee74f1d2c3 100644
--- a/docs/zh/interfaces/third-party/client-libraries.md
+++ b/docs/zh/interfaces/third-party/client-libraries.md
@@ -24,6 +24,7 @@ Yandex**没有**维护下面列出的库，也没有做过任何广泛的测试
     -   [SeasClick C++ client](https://github.com/SeasX/SeasClick)
     -   [one-ck](https://github.com/lizhichao/one-ck)
     -   [glushkovds/phpclickhouse-laravel](https://packagist.org/packages/glushkovds/phpclickhouse-laravel)
+    -   [hyvor/clickhouse-php](https://github.com/hyvor/clickhouse-php)
 -   Go
     -   [clickhouse](https://github.com/kshvakov/clickhouse/)
     -   [go-clickhouse](https://github.com/roistat/go-clickhouse)
diff --git a/docs/zh/interfaces/third-party/index.md b/docs/zh/interfaces/third-party/index.md
index 0c6b194d04a..64c0b30a9c0 100644
--- a/docs/zh/interfaces/third-party/index.md
+++ b/docs/zh/interfaces/third-party/index.md
@@ -13,5 +13,6 @@ sidebar_position: 24
 -   [GUI](../../interfaces/third-party/gui.md)
 -   [Proxies](../../interfaces/third-party/proxy.md)
 
-!!! note "注意"
+:::note
 支持通用API的通用工具[ODBC](../../interfaces/odbc.md)或[JDBC](../../interfaces/jdbc.md)，通常也适用于ClickHouse，但这里没有列出，因为它们实在太多了。
+:::
diff --git a/docs/zh/operations/access-rights.md b/docs/zh/operations/access-rights.md
index 713cf991f47..8d640ef32c0 100644
--- a/docs/zh/operations/access-rights.md
+++ b/docs/zh/operations/access-rights.md
@@ -24,9 +24,9 @@ ClickHouse权限实体包括：
 
 我们建议你使用SQL工作流的方式。当然配置的方式也可以同时起作用, 所以如果你正在用服务端配置的方式来管理权限和账户，你可以平滑的切换到SQL驱动的工作流方式。
 
-!!! note "警告"
-    你无法同时使用两个配置的方式来管理同一个权限实体。
-
+:::warning
+你无法同时使用两个配置的方式来管理同一个权限实体。
+:::
 
 ## 用法 {#access-control-usage}
 
diff --git a/docs/zh/operations/backup.md b/docs/zh/operations/backup.md
index e0c5174a9a4..6d491f9c2f7 100644
--- a/docs/zh/operations/backup.md
+++ b/docs/zh/operations/backup.md
@@ -12,8 +12,9 @@ sidebar_label: "\u6570\u636E\u5907\u4EFD"
 
 不同公司有不同的可用资源和业务需求，因此不存在一个通用的解决方案可以应对各种情况下的ClickHouse备份和恢复。 适用于 1GB 数据的方案可能并不适用于几十 PB 数据的情况。 有多种具备各自优缺点的可能方法，将在下面对其进行讨论。最好使用几种方法而不是仅仅使用一种方法来弥补它们的各种缺点。。
 
-!!! note "注"
-    需要注意的是，如果您备份了某些内容并且从未尝试过还原它，那么当您实际需要它时可能无法正常恢复（或者至少需要的时间比业务能够容忍的时间更长）。 因此，无论您选择哪种备份方法，请确保自动还原过程，并定期在备用ClickHouse群集上演练。
+:::note
+需要注意的是，如果您备份了某些内容并且从未尝试过还原它，那么当您实际需要它时可能无法正常恢复（或者至少需要的时间比业务能够容忍的时间更长）。 因此，无论您选择哪种备份方法，请确保自动还原过程，并定期在备用ClickHouse群集上演练。
+:::
 
 ## 将源数据复制到其它地方 {#duplicating-source-data-somewhere-else}
 
diff --git a/docs/zh/operations/optimizing-performance/sampling-query-profiler.md b/docs/zh/operations/optimizing-performance/sampling-query-profiler.md
index 4206274ec0d..5d31ab9b245 100644
--- a/docs/zh/operations/optimizing-performance/sampling-query-profiler.md
+++ b/docs/zh/operations/optimizing-performance/sampling-query-profiler.md
@@ -32,7 +32,7 @@ ClickHouse运行允许分析查询执行的采样探查器。 使用探查器，
 
 -   使用 `addressToLine`, `addressToSymbol` 和 `demangle` [内省功能](../../sql-reference/functions/introspection.md) 获取函数名称及其在ClickHouse代码中的位置。 要获取某些查询的配置文件，您需要从以下内容汇总数据 `trace_log` 桌子 您可以通过单个函数或整个堆栈跟踪聚合数据。
 
-如果你需要想象 `trace_log` 信息，尝试 [flamegraph](../../interfaces/third-party/gui/#clickhouse-flamegraph) 和 [测速镜](https://github.com/laplab/clickhouse-speedscope).
+如果你需要想象 `trace_log` 信息，尝试 [flamegraph](../../interfaces/third-party/gui.md#clickhouse-flamegraph) 和 [测速镜](https://github.com/laplab/clickhouse-speedscope).
 
 ## 示例 {#example}
 
diff --git a/docs/zh/operations/server-configuration-parameters/settings.md b/docs/zh/operations/server-configuration-parameters/settings.md
index 89ae411b9e0..52142eda2e8 100644
--- a/docs/zh/operations/server-configuration-parameters/settings.md
+++ b/docs/zh/operations/server-configuration-parameters/settings.md
@@ -528,8 +528,9 @@ SSL客户端/服务器配置。
 
 包含数据的目录的路径。
 
-!!! note "注"
-    尾部斜杠是强制性的。
+:::note
+尾部斜杠是强制性的。
+:::
 
 **示例**
 
@@ -714,8 +715,9 @@ TCP端口，用于与客户端进行安全通信。 使用它与 [OpenSSL](#serv
 
 用于处理大型查询的临时数据的路径。
 
-!!! note "注"
-    尾部斜杠是强制性的。
+:::note
+尾部斜杠是强制性的。
+:::
 
 **示例**
 
@@ -728,11 +730,12 @@ TCP端口，用于与客户端进行安全通信。 使用它与 [OpenSSL](#serv
 从政策 [`storage_configuration`](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) 存储临时文件。
 如果没有设置 [`tmp_path`](#server-settings-tmp_path) 被使用，否则被忽略。
 
-!!! note "注"
-    - `move_factor` 被忽略
+:::note
+- `move_factor` 被忽略
 - `keep_free_space_bytes` 被忽略
 - `max_data_part_size_bytes` 被忽略
 -您必须在该政策中只有一个卷
+:::
 
 ## uncompressed_cache_size {#server-settings-uncompressed_cache_size}
 
@@ -775,7 +778,7 @@ TCP端口，用于与客户端进行安全通信。 使用它与 [OpenSSL](#serv
 
 ## zookeeper {#server-settings_zookeeper}
 
-包含允许ClickHouse与 [zookpeer](http://zookeeper.apache.org/) 集群。
+包含允许ClickHouse与 [zookeeper](http://zookeeper.apache.org/) 集群。
 
 ClickHouse使用ZooKeeper存储复制表副本的元数据。 如果未使用复制的表，则可以省略此部分参数。
 
diff --git a/docs/zh/operations/settings/settings-profiles.md b/docs/zh/operations/settings/settings-profiles.md
index 1ad394950bf..5051276607f 100644
--- a/docs/zh/operations/settings/settings-profiles.md
+++ b/docs/zh/operations/settings/settings-profiles.md
@@ -8,8 +8,9 @@ sidebar_label: "\u8BBE\u7F6E\u914D\u7F6E"
 
 设置配置是设置的集合，并按照相同的名称进行分组。
 
-!!! note "信息"
-    ClickHouse 还支持用 [SQL驱动的工作流](../../operations/access-rights.md#access-control) 管理设置配置。我们建议使用它。
+:::info
+ClickHouse 还支持用 [SQL驱动的工作流](../../operations/access-rights.md#access-control) 管理设置配置。我们建议使用它。
+:::
 
 设置配置可以任意命名。你可以为不同的用户指定相同的设置配置。您可以在设置配置中写入的最重要的内容是 `readonly=1`，这将确保只读访问。
 
diff --git a/docs/zh/operations/settings/settings-users.md b/docs/zh/operations/settings/settings-users.md
index de4aa27df69..d7fe5bad3c3 100644
--- a/docs/zh/operations/settings/settings-users.md
+++ b/docs/zh/operations/settings/settings-users.md
@@ -10,8 +10,9 @@ sidebar_label: "\u7528\u6237\u8BBE\u7F6E"
 
 `user.xml` 中的 `users` 配置段包含了用户配置
 
-!!! note "提示"
-    ClickHouse还支持 [SQL驱动的工作流](../access-rights.md#access-control) 用于管理用户。 我们建议使用它。
+:::note
+ClickHouse还支持 [SQL驱动的工作流](/docs/en/operations/access-rights#access-control) 用于管理用户。 我们建议使用它。
+:::
 
 `users` 配置段的结构:
 
@@ -78,7 +79,7 @@ sidebar_label: "\u7528\u6237\u8BBE\u7F6E"
 
 ### access_management {#access_management-user-setting}
 
-此设置可为用户启用或禁用 SQL-driven [访问控制和帐户管理](../access-rights.md#access-control) 。
+此设置可为用户启用或禁用 SQL-driven [访问控制和帐户管理](/docs/en/operations/access-rights#access-control) 。
 
 可能的值:
 
diff --git a/docs/zh/operations/settings/settings.md b/docs/zh/operations/settings/settings.md
index 4107a499463..457b208602f 100644
--- a/docs/zh/operations/settings/settings.md
+++ b/docs/zh/operations/settings/settings.md
@@ -266,8 +266,9 @@ INSERT INTO test VALUES (lower('Hello')), (lower('world')), (lower('INSERT')), (
 
 执行时 `INSERT` 查询时，将省略的输入列值替换为相应列的默认值。 此选项仅适用于 [JSONEachRow](../../interfaces/formats.md#jsoneachrow), [CSV](../../interfaces/formats.md#csv) 和 [TabSeparated](../../interfaces/formats.md#tabseparated) 格式。
 
-!!! note "注"
-    启用此选项后，扩展表元数据将从服务器发送到客户端。 它会消耗服务器上的额外计算资源，并可能降低性能。
+:::note
+启用此选项后，扩展表元数据将从服务器发送到客户端。 它会消耗服务器上的额外计算资源，并可能降低性能。
+:::
 
 可能的值:
 
diff --git a/docs/zh/operations/system-tables/data_type_families.md b/docs/zh/operations/system-tables/data_type_families.md
index 18e9455476d..f0e3a9ef896 100644
--- a/docs/zh/operations/system-tables/data_type_families.md
+++ b/docs/zh/operations/system-tables/data_type_families.md
@@ -3,7 +3,7 @@ slug: /zh/operations/system-tables/data_type_families
 ---
 # system.data_type_families {#system_tables-data_type_families}
 
-包含有关受支持的[数据类型](../../sql-reference/data-types/)的信息.
+包含有关受支持的[数据类型](../../sql-reference/data-types/index.md)的信息.
 
 列字段包括:
 
diff --git a/docs/zh/operations/system-tables/parts.md b/docs/zh/operations/system-tables/parts.md
index 0bd728f543f..0ebac3944ff 100644
--- a/docs/zh/operations/system-tables/parts.md
+++ b/docs/zh/operations/system-tables/parts.md
@@ -99,8 +99,9 @@ slug: /zh/operations/system-tables/parts
 
 -   `move_ttl_info.expression` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — 表达式的数组。 每个表达式定义一个 [TTL MOVE 规则](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
 
-    !!! note "警告"
-        保留 `move_ttl_info.expression` 数组主要是为了向后兼容，现在检查 `TTL MOVE` 规则最简单的方法是使用 `move_ttl_info.min` 和 `move_ttl_info.max` 字段。
+:::warning
+保留 `move_ttl_info.expression` 数组主要是为了向后兼容，现在检查 `TTL MOVE` 规则最简单的方法是使用 `move_ttl_info.min` 和 `move_ttl_info.max` 字段。
+:::
 
 -   `move_ttl_info.min` ([Array](../../sql-reference/data-types/array.md)([DateTime](../../sql-reference/data-types/datetime.md))) — 日期值和时间值的数组。数组中的每个元素都描述了一个 [TTL MOVE rule](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl) 的最小键值。
 
diff --git a/docs/zh/operations/system-tables/query_log.md b/docs/zh/operations/system-tables/query_log.md
index 93e5771d4b5..7149282dfcc 100644
--- a/docs/zh/operations/system-tables/query_log.md
+++ b/docs/zh/operations/system-tables/query_log.md
@@ -8,8 +8,9 @@ machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
 
 包含已执行查询的相关信息，例如：开始时间、处理持续时间、错误消息。
 
-!!! note "注"
-    此表不包含以下内容的摄取数据 `INSERT` 查询。
+:::note
+此表不包含以下内容的摄取数据 `INSERT` 查询。
+:::
 
 您可以更改query_log的设置，在服务器配置的 [query_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query-log) 部分。
 
diff --git a/docs/zh/operations/system-tables/replicated_fetches.md b/docs/zh/operations/system-tables/replicated_fetches.md
index 7fd517c72ab..c6c37759755 100644
--- a/docs/zh/operations/system-tables/replicated_fetches.md
+++ b/docs/zh/operations/system-tables/replicated_fetches.md
@@ -68,4 +68,4 @@ thread_id:                   54
 
 **另请参阅**
 
--   [管理 ReplicatedMergeTree 表](../../sql-reference/statements/system/#query-language-system-replicated)
+-   [管理 ReplicatedMergeTree 表](../../sql-reference/statements/system.md#query-language-system-replicated)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/corr.md b/docs/zh/sql-reference/aggregate-functions/reference/corr.md
index 01a89e428ab..48b5bf904f5 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/corr.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/corr.md
@@ -12,5 +12,6 @@ sidebar_position: 107
 
 计算Pearson相关系数: `Σ((x - x̅)(y - y̅)) / sqrt(Σ((x - x̅)^2) * Σ((y - y̅)^2))`。
 
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `corrStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::note
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `corrStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/covarpop.md b/docs/zh/sql-reference/aggregate-functions/reference/covarpop.md
index 93bfee15684..e98270dc896 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/covarpop.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/covarpop.md
@@ -12,5 +12,6 @@ covarPop(x, y)
 
 计算 `Σ((x - x̅)(y - y̅)) / n` 的值。
 
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `covarPopStable` 函数。 它的工作速度较慢，但提供了较低的计算错误。
+:::note
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `covarPopStable` 函数。 它的工作速度较慢，但提供了较低的计算错误。
+:::
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/covarsamp.md b/docs/zh/sql-reference/aggregate-functions/reference/covarsamp.md
index 7c8565211b1..1b8dfc4a60f 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/covarsamp.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/covarsamp.md
@@ -14,5 +14,6 @@ covarSamp(x, y)
 
 返回Float64。 当 `n <= 1`, 返回 +∞。
 
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `covarSampStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::note
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `covarSampStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/grouparrayinsertat.md b/docs/zh/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
index 8431b5a1110..f0672d4fe45 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
@@ -20,7 +20,7 @@ groupArrayInsertAt(default_x, size)(x, pos);
 
 **参数**
 
--   `x` — 要插入的值。生成所[支持的数据类型](../../../sql-reference/data-types/index.md)(数据)的[表达式](../../../sql-reference/syntax#syntax-expressions)。
+-   `x` — 要插入的值。生成所[支持的数据类型](../../../sql-reference/data-types/index.md)(数据)的[表达式](../../../sql-reference/syntax.md#syntax-expressions)。
 -   `pos` — 指定元素 `x` 将被插入的位置。 数组中的索引编号从零开始。 [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
 -   `default_x` — 在空位置替换的默认值。可选参数。生成 `x` 数据类型 (数据) 的[表达式](../../../sql-reference/syntax.md#syntax-expressions)。  如果 `default_x` 未定义，则 [默认值](../../../sql-reference/statements/create.md#create-default-values) 被使用。
 -   `size`— 结果数组的长度。可选参数。如果使用该参数，必须指定默认值 `default_x` 。 [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges)。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantiletiming.md b/docs/zh/sql-reference/aggregate-functions/reference/quantiletiming.md
index 5e14ce6a11c..af7ad77c717 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/quantiletiming.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantiletiming.md
@@ -37,8 +37,9 @@ quantileTiming(level)(expr)
 
 否则，计算结果将四舍五入到16毫秒的最接近倍数。
 
-!!! note "注"
-    对于计算页面加载时间分位数， 此函数比[quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile)更有效和准确。
+:::note
+对于计算页面加载时间分位数， 此函数比[quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile)更有效和准确。
+:::
 
 **返回值**
 
@@ -46,8 +47,9 @@ quantileTiming(level)(expr)
 
 类型: `Float32`。
 
-!!! note "注"
-    如果没有值传递给函数（当使用 `quantileTimingIf`), [NaN](../../../sql-reference/data-types/float.md#data_type-float-nan-inf)被返回。 这样做的目的是将这些案例与导致零的案例区分开来。 参见 [ORDER BY clause](../../../sql-reference/statements/select/order-by.md#select-order-by) 对于 `NaN` 值排序注意事项。
+:::note
+如果没有值传递给函数（当使用 `quantileTimingIf`), [NaN](../../../sql-reference/data-types/float.md#data_type-float-nan-inf)被返回。 这样做的目的是将这些案例与导致零的案例区分开来。 参见 [ORDER BY clause](../../../sql-reference/statements/select/order-by.md#select-order-by) 对于 `NaN` 值排序注意事项。
+:::
 
 **示例**
 
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantiletimingweighted.md b/docs/zh/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
index 2c28583343a..b520a0f96af 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
@@ -39,8 +39,9 @@ quantileTimingWeighted(level)(expr, weight)
 
 否则，计算结果将四舍五入到16毫秒的最接近倍数。
 
-!!! note "注"
-    对于计算页面加载时间分位数， 此函数比[quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile)更有效和准确。
+:::note
+对于计算页面加载时间分位数， 此函数比[quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile)更有效和准确。
+:::
 
 **返回值**
 
@@ -48,8 +49,9 @@ quantileTimingWeighted(level)(expr, weight)
 
 类型: `Float32`。
 
-!!! note "注"
-    如果没有值传递给函数（当使用 `quantileTimingIf`), [NaN](../../../sql-reference/data-types/float.md#data_type-float-nan-inf)被返回。 这样做的目的是将这些案例与导致零的案例区分开来。 参见 [ORDER BY clause](../../../sql-reference/statements/select/order-by.md#select-order-by) 对于 `NaN` 值排序注意事项。
+:::note
+如果没有值传递给函数（当使用 `quantileTimingIf`), [NaN](../../../sql-reference/data-types/float.md#data_type-float-nan-inf)被返回。 这样做的目的是将这些案例与导致零的案例区分开来。 参见 [ORDER BY clause](../../../sql-reference/statements/select/order-by.md#select-order-by) 对于 `NaN` 值排序注意事项。
+:::
 
 **示例**
 
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/stddevpop.md b/docs/zh/sql-reference/aggregate-functions/reference/stddevpop.md
index ea82e21e46f..a113084cdee 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/stddevpop.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/stddevpop.md
@@ -7,5 +7,6 @@ sidebar_position: 30
 
 结果等于 [varPop](../../../sql-reference/aggregate-functions/reference/varpop.md)的平方根。
 
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `stddevPopStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::note
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `stddevPopStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/stddevsamp.md b/docs/zh/sql-reference/aggregate-functions/reference/stddevsamp.md
index efeafb71072..d242f4e3401 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/stddevsamp.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/stddevsamp.md
@@ -7,5 +7,6 @@ sidebar_position: 31
 
 结果等于 [varSamp] (../../../sql-reference/aggregate-functions/reference/varsamp.md)的平方根。
 
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `stddevSampStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::note
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `stddevSampStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/uniqcombined.md b/docs/zh/sql-reference/aggregate-functions/reference/uniqcombined.md
index edc790ec00f..7b4a78d662e 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/uniqcombined.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/uniqcombined.md
@@ -36,8 +36,9 @@ uniqCombined(HLL_precision)(x[, ...])
 
 -   确定性地提供结果（它不依赖于查询处理顺序）。
 
-!!! note "注"
-    由于它对非 `String` 类型使用32位哈希，对于基数显著大于`UINT_MAX` ，结果将有非常高的误差(误差将在几百亿不同值之后迅速提高), 因此这种情况，你应该使用 [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
+:::note
+由于它对非 `String` 类型使用32位哈希，对于基数显著大于`UINT_MAX` ，结果将有非常高的误差(误差将在几百亿不同值之后迅速提高), 因此这种情况，你应该使用 [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
+:::
 
 相比于 [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) 函数, 该 `uniqCombined`:
 
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/varpop.md b/docs/zh/sql-reference/aggregate-functions/reference/varpop.md
index eb17955210b..6d6b0acc615 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/varpop.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/varpop.md
@@ -9,5 +9,6 @@ sidebar_position: 32
 
 换句话说，计算一组数据的离差。 返回 `Float64`。
 
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `varPopStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::note
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `varPopStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/varsamp.md b/docs/zh/sql-reference/aggregate-functions/reference/varsamp.md
index 9b9d0ced92d..508e35445a7 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/varsamp.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/varsamp.md
@@ -11,5 +11,6 @@ sidebar_position: 33
 
 返回 `Float64`。 当 `n <= 1`，返回 `+∞`。
 
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `varSampStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::note
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `varSampStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+:::
diff --git a/docs/zh/sql-reference/ansi.md b/docs/zh/sql-reference/ansi.md
index cdccee0084f..74f13256eba 100644
--- a/docs/zh/sql-reference/ansi.md
+++ b/docs/zh/sql-reference/ansi.md
@@ -6,8 +6,9 @@ sidebar_label: "ANSI\u517C\u5BB9\u6027"
 
 # ClickHouse SQL方言 与ANSI SQL的兼容性{#ansi-sql-compatibility-of-clickhouse-sql-dialect}
 
-!!! note "注"
-    本文参考Annex G所著的[ISO/IEC CD 9075-2:2011](https://www.iso.org/obp/ui/#iso:std:iso-iec:9075:-2:ed-4:v1:en:sec:8)标准.
+:::note
+本文参考Annex G所著的[ISO/IEC CD 9075-2:2011](https://www.iso.org/obp/ui/#iso:std:iso-iec:9075:-2:ed-4:v1:en:sec:8)标准.
+:::
 
 ## 行为差异 {#differences-in-behaviour}
 
diff --git a/docs/zh/sql-reference/data-types/simpleaggregatefunction.md b/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
index b26994a775e..601cb602a78 100644
--- a/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
@@ -25,10 +25,10 @@ slug: /zh/sql-reference/data-types/simpleaggregatefunction
 -   [`argMax`](../../sql-reference/aggregate-functions/reference/argmax.md)
 
 
-!!! note "注"
-    `SimpleAggregateFunction(func, Type)` 的值外观和存储方式于 `Type` 相同, 所以你不需要应用带有 `-Merge`/`-State` 后缀的函数。
-
-    `SimpleAggregateFunction` 的性能优于具有相同聚合函数的 `AggregateFunction` 。
+:::note
+`SimpleAggregateFunction(func, Type)` 的值外观和存储方式于 `Type` 相同, 所以你不需要应用带有 `-Merge`/`-State` 后缀的函数。
+`SimpleAggregateFunction` 的性能优于具有相同聚合函数的 `AggregateFunction` 。
+:::
 
 **参数**
 
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.mdx b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
similarity index 59%
rename from docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.mdx
rename to docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
index 0c924feda73..fe70d29f8da 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.mdx
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
@@ -5,6 +5,4 @@ sidebar_label: Polygon Dictionaries With Grids
 title: "Polygon dictionaries"
 ---
 
-import Content from '@site/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md';
-
-<Content />
+View the [english Dictionaries doc page for details](../../../../en/sql-reference/dictionaries/index.md).
diff --git a/docs/zh/sql-reference/functions/geo/index.mdx b/docs/zh/sql-reference/functions/geo/index.mdx
deleted file mode 100644
index fcfc4bd4717..00000000000
--- a/docs/zh/sql-reference/functions/geo/index.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
----
-slug: /zh/sql-reference/functions/geo/
-sidebar_label: Geo
-sidebar_position: 62
-title: "Geo Functions"
----
-
-import Content from '@site/docs/en/sql-reference/functions/geo/index.md';
-
-<Content />
diff --git a/docs/zh/sql-reference/functions/string-functions.md b/docs/zh/sql-reference/functions/string-functions.md
index 89d64f76074..d1914839d7c 100644
--- a/docs/zh/sql-reference/functions/string-functions.md
+++ b/docs/zh/sql-reference/functions/string-functions.md
@@ -168,3 +168,15 @@ SELECT format('{} {}', 'Hello', 'World')
 ## trimBoth(s) {#trimboths}
 
 返回一个字符串，用于删除任一侧的空白字符。
+
+## soundex(s)
+
+返回一个字符串的soundex值。输出类型是FixedString，示例如下：
+
+``` sql
+select soundex('aksql');
+
+┌─soundex('aksel')─┐
+│ A240             │
+└──────────────────┘
+```
diff --git a/docs/zh/sql-reference/functions/string-search-functions.md b/docs/zh/sql-reference/functions/string-search-functions.md
index 756ac7c16c7..e4167127424 100644
--- a/docs/zh/sql-reference/functions/string-search-functions.md
+++ b/docs/zh/sql-reference/functions/string-search-functions.md
@@ -42,8 +42,9 @@ slug: /zh/sql-reference/functions/string-search-functions
 
 对于不区分大小写的搜索或/和UTF-8格式，使用函数`multiSearchAnyCaseInsensitive，multiSearchAnyUTF8，multiSearchAnyCaseInsensitiveUTF8`。
 
-!!! note "注意"
-    在所有`multiSearch*`函数中，由于实现规范，needles的数量应小于2<sup>8</sup>。
+:::note
+在所有`multiSearch*`函数中，由于实现规范，needles的数量应小于2<sup>8</sup>。
+:::
 
 ## 匹配（大海捞针，模式) {#matchhaystack-pattern}
 
@@ -60,8 +61,9 @@ slug: /zh/sql-reference/functions/string-search-functions
 
 与`match`相同，但如果所有正则表达式都不匹配，则返回0；如果任何模式匹配，则返回1。它使用[超扫描](https://github.com/intel/hyperscan)库。对于在字符串中搜索子字符串的模式，最好使用«multisearchany»，因为它更高效。
 
-!!! note "注意"
-    任何`haystack`字符串的长度必须小于2<sup>32\</sup>字节，否则抛出异常。这种限制是因为hyperscan API而产生的。
+:::note
+任何`haystack`字符串的长度必须小于2<sup>32\</sup>字节，否则抛出异常。这种限制是因为hyperscan API而产生的。
+:::
 
 ## multiMatchAnyIndex（大海捞针，\[模式<sub>1</sub>，模式<sub>2</sub>, …, pattern<sub>n</sub>\]) {#multimatchanyindexhaystack-pattern1-pattern2-patternn}
 
@@ -75,11 +77,13 @@ slug: /zh/sql-reference/functions/string-search-functions
 
 与`multiFuzzyMatchAny`相同，但返回匹配项的匹配能容的索引位置。
 
-!!! note "注意"
-    `multiFuzzyMatch*`函数不支持UTF-8正则表达式，由于hyperscan限制，这些表达式被按字节解析。
+:::note
+`multiFuzzyMatch*`函数不支持UTF-8正则表达式，由于hyperscan限制，这些表达式被按字节解析。
+:::
 
-!!! note "注意"
-    如要关闭所有hyperscan函数的使用，请设置`SET allow_hyperscan = 0;`。
+:::note
+如要关闭所有hyperscan函数的使用，请设置`SET allow_hyperscan = 0;`。
+:::
 
 ## 提取（大海捞针，图案) {#extracthaystack-pattern}
 
@@ -119,5 +123,6 @@ slug: /zh/sql-reference/functions/string-search-functions
 
 对于不区分大小写的搜索或/和UTF-8格式，使用函数`ngramSearchCaseInsensitive，ngramSearchUTF8，ngramSearchCaseInsensitiveUTF8`。
 
-!!! note "注意"
-    对于UTF-8，我们使用3-gram。所有这些都不是完全公平的n-gram距离。我们使用2字节哈希来散列n-gram，然后计算这些哈希表之间的（非）对称差异 - 可能会发生冲突。对于UTF-8不区分大小写的格式，我们不使用公平的`tolower`函数 - 我们将每个Unicode字符字节的第5位（从零开始）和字节的第一位归零 - 这适用于拉丁语，主要用于所有西里尔字母。
+:::note
+对于UTF-8，我们使用3-gram。所有这些都不是完全公平的n-gram距离。我们使用2字节哈希来散列n-gram，然后计算这些哈希表之间的（非）对称差异 - 可能会发生冲突。对于UTF-8不区分大小写的格式，我们不使用公平的`tolower`函数 - 我们将每个Unicode字符字节的第5位（从零开始）和字节的第一位归零 - 这适用于拉丁语，主要用于所有西里尔字母。
+:::
diff --git a/docs/zh/sql-reference/statements/alter/delete.md b/docs/zh/sql-reference/statements/alter/delete.md
index 85d3d3077a7..5eb77c35a93 100644
--- a/docs/zh/sql-reference/statements/alter/delete.md
+++ b/docs/zh/sql-reference/statements/alter/delete.md
@@ -12,8 +12,9 @@ ALTER TABLE [db.]table [ON CLUSTER cluster] DELETE WHERE filter_expr
 
 删除匹配指定过滤表达式的数据。实现为[突变](../../../sql-reference/statements/alter/index.md#mutations).
 
-!!! note "备注"
-    `ALTER TABLE`前缀使得这个语法不同于大多数其他支持SQL的系统。它的目的是表示，与OLTP数据库中的类似查询不同，这是一个不为经常使用而设计的繁重操作。
+:::note
+`ALTER TABLE`前缀使得这个语法不同于大多数其他支持SQL的系统。它的目的是表示，与OLTP数据库中的类似查询不同，这是一个不为经常使用而设计的繁重操作。
+:::
 
 `filter_expr` 的类型必须是`UInt8`。该查询删除表中该表达式接受非零值的行。
 
diff --git a/docs/zh/sql-reference/statements/alter/index.md b/docs/zh/sql-reference/statements/alter/index.md
index b0f0fc21cbe..e173837a16c 100644
--- a/docs/zh/sql-reference/statements/alter/index.md
+++ b/docs/zh/sql-reference/statements/alter/index.md
@@ -1,5 +1,5 @@
 ---
-slug: /zh/sql-reference/statements/alter/
+slug: /zh/sql-reference/statements/alter/overview
 sidebar_position: 35
 sidebar_label: ALTER
 ---
@@ -17,8 +17,9 @@ sidebar_label: ALTER
 -   [CONSTRAINT](../../../sql-reference/statements/alter/constraint.md)
 -   [TTL](../../../sql-reference/statements/alter/ttl.md)
 
-!!! note "备注"
-    大多数 `ALTER TABLE` 查询只支持[\*MergeTree](../../../engines/table-engines/mergetree-family/index.md)表，以及[Merge](../../../engines/table-engines/special/merge.md)和[Distributed](../../../engines/table-engines/special/distributed.md)。
+:::note
+大多数 `ALTER TABLE` 查询只支持[\*MergeTree](../../../engines/table-engines/mergetree-family/index.md)表，以及[Merge](../../../engines/table-engines/special/merge.md)和[Distributed](../../../engines/table-engines/special/distributed.md)。
+:::
 
 这些 `ALTER` 语句操作视图:
 
diff --git a/docs/zh/sql-reference/statements/alter/order-by.md b/docs/zh/sql-reference/statements/alter/order-by.md
index e70a8b59c85..e50c4e6e805 100644
--- a/docs/zh/sql-reference/statements/alter/order-by.md
+++ b/docs/zh/sql-reference/statements/alter/order-by.md
@@ -14,5 +14,6 @@ ALTER TABLE [db].name [ON CLUSTER cluster] MODIFY ORDER BY new_expression
 从某种意义上说，该命令是轻量级的，它只更改元数据。要保持数据部分行按排序键表达式排序的属性，您不能向排序键添加包含现有列的表达式(仅在相同的`ALTER`查询中由`ADD COLUMN`命令添加的列，没有默认的列值)。
 
 
-!!! note "备注"
-    它只适用于[`MergeTree`](../../../engines/table-engines/mergetree-family/mergetree.md)表族(包括[replicated](../../../engines/table-engines/mergetree-family/replication.md)表)。
+:::note
+它只适用于[`MergeTree`](../../../engines/table-engines/mergetree-family/mergetree.md)表族(包括[replicated](../../../engines/table-engines/mergetree-family/replication.md)表)。
+:::
diff --git a/docs/zh/sql-reference/statements/alter/setting.md b/docs/zh/sql-reference/statements/alter/setting.md
index e2d597554e7..2e1e97db331 100644
--- a/docs/zh/sql-reference/statements/alter/setting.md
+++ b/docs/zh/sql-reference/statements/alter/setting.md
@@ -14,8 +14,9 @@ sidebar_label: SETTING
 ALTER TABLE [db].name [ON CLUSTER cluster] MODIFY|RESET SETTING ...
 ```
 
-!!! note "注意"
-    这些查询只能应用于 [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) 表。
+:::note
+这些查询只能应用于 [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) 表。
+:::
 
 
 ## 修改设置 {#alter_modify_setting}
diff --git a/docs/zh/sql-reference/statements/alter/update.md b/docs/zh/sql-reference/statements/alter/update.md
index 522eb0a705b..97b2b43d889 100644
--- a/docs/zh/sql-reference/statements/alter/update.md
+++ b/docs/zh/sql-reference/statements/alter/update.md
@@ -12,8 +12,9 @@ ALTER TABLE [db.]table UPDATE column1 = expr1 [, ...] WHERE filter_expr
 
 操作与指定过滤表达式相匹配的数据。作为一个[变更 mutation](../../../sql-reference/statements/alter/index.md#mutations)来实现.
 
-!!! note "Note"
-    `ALTER TABLE` 的前缀使这个语法与其他大多数支持SQL的系统不同。它的目的是表明，与OLTP数据库中的类似查询不同，这是一个繁重的操作，不是为频繁使用而设计。
+:::note
+`ALTER TABLE` 的前缀使这个语法与其他大多数支持SQL的系统不同。它的目的是表明，与OLTP数据库中的类似查询不同，这是一个繁重的操作，不是为频繁使用而设计。
+:::
 
 `filter_expr`必须是`UInt8`类型。这个查询将指定列的值更新为行中相应表达式的值，对于这些行，`filter_expr`取值为非零。使用`CAST`操作符将数值映射到列的类型上。不支持更新用于计算主键或分区键的列。
 
diff --git a/docs/zh/sql-reference/statements/create/database.md b/docs/zh/sql-reference/statements/create/database.md
index 2c6e53c0f06..3e5b71fb196 100644
--- a/docs/zh/sql-reference/statements/create/database.md
+++ b/docs/zh/sql-reference/statements/create/database.md
@@ -27,4 +27,4 @@ ClickHouse在指定集群的所有服务器上创建`db_name`数据库。 更多
 
 ### ENGINE {#engine}
 
-[MySQL](../../../engines/database-engines/mysql.md) 允许您从远程MySQL服务器检索数据. 默认情况下，ClickHouse使用自己的[database engine](../../../engines/database-engines/index.md). 还有一个[lazy](../../../engines/database-engines/lazy)引擎.
+[MySQL](../../../engines/database-engines/mysql.md) 允许您从远程MySQL服务器检索数据. 默认情况下，ClickHouse使用自己的[database engine](../../../engines/database-engines/index.md). 还有一个[lazy](../../../engines/database-engines/lazy.md)引擎.
diff --git a/docs/zh/sql-reference/statements/create/index.md b/docs/zh/sql-reference/statements/create/index.md
deleted file mode 100644
index f63ed0a7acd..00000000000
--- a/docs/zh/sql-reference/statements/create/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-slug: /zh/sql-reference/statements/create/
-sidebar_label: CREATE
-sidebar_position: 34
----
-
-# CREATE语法 {#create-queries}
-
-CREATE语法包含以下子集:
-
--   [DATABASE](../../../sql-reference/statements/create/database.md)
diff --git a/docs/zh/sql-reference/statements/create/view.md b/docs/zh/sql-reference/statements/create/view.md
index a000c69f1ef..8ce2d20a10c 100644
--- a/docs/zh/sql-reference/statements/create/view.md
+++ b/docs/zh/sql-reference/statements/create/view.md
@@ -63,7 +63,7 @@ ClickHouse 中的物化视图更像是插入触发器。 如果视图查询中
 
 视图看起来与普通表相同。 例如，它们列在`SHOW TABLES`查询的结果中。
 
-删除视图,使用[DROP VIEW](../../../sql-reference/statements/drop#drop-view). `DROP TABLE`也适用于视图。
+删除视图,使用[DROP VIEW](../../../sql-reference/statements/drop.md#drop-view). `DROP TABLE`也适用于视图。
 
 ## Live View (实验性) {#live-view}
 
diff --git a/docs/zh/sql-reference/statements/exchange.md b/docs/zh/sql-reference/statements/exchange.md
index e6ac1dbf1dc..47cefa0d2e6 100644
--- a/docs/zh/sql-reference/statements/exchange.md
+++ b/docs/zh/sql-reference/statements/exchange.md
@@ -9,8 +9,9 @@ sidebar_label: EXCHANGE
 以原子方式交换两个表或字典的名称。
 此任务也可以通过使用[RENAME](./rename.md)来完成，但在这种情况下操作不是原子的。
 
-!!! note "注意"
+:::note
 `EXCHANGE`仅支持[Atomic](../../engines/database-engines/atomic.md)数据库引擎.
+:::
 
 **语法**
 
diff --git a/docs/zh/sql-reference/statements/grant.md b/docs/zh/sql-reference/statements/grant.md
index 12ad2e0fe25..7e7cdbff350 100644
--- a/docs/zh/sql-reference/statements/grant.md
+++ b/docs/zh/sql-reference/statements/grant.md
@@ -55,7 +55,7 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
 
 同样 `john` 有权执行 `GRANT OPTION`，因此他能给其它账号进行和自己账号权限范围相同的授权。
 
-可以使用`*` 号代替表或库名进行授权操作。例如， `GRANT SELECT ONdb.* TO john` 操作运行 `john`对 `db`库的所有表执行 `SELECT`查询。同样，你可以忽略库名。在这种情形下，权限将指向当前的数据库。例如， `GRANT SELECT ON* to john` 对当前数据库的所有表指定授权， `GARNT SELECT ON mytable to john`对当前数据库的 `mytable`表进行授权。
+可以使用`*` 号代替表或库名进行授权操作。例如， `GRANT SELECT ONdb.* TO john` 操作运行 `john`对 `db`库的所有表执行 `SELECT`查询。同样，你可以忽略库名。在这种情形下，权限将指向当前的数据库。例如， `GRANT SELECT ON* to john` 对当前数据库的所有表指定授权， `GRANT SELECT ON mytable to john`对当前数据库的 `mytable`表进行授权。
 
 访问 `systen`数据库总是被允许的（因为这个数据库用来处理sql操作）
 可以一次给多个账号进行多种授权操作。 `GRANT SELECT,INSERT ON *.* TO john,robin` 允许 `john`和`robin` 账号对任意数据库的任意表执行 `INSERT`和 `SELECT`操作。
diff --git a/docs/zh/sql-reference/statements/index.md b/docs/zh/sql-reference/statements/index.md
index cf51dadc8f1..2fdfeb1786f 100644
--- a/docs/zh/sql-reference/statements/index.md
+++ b/docs/zh/sql-reference/statements/index.md
@@ -10,7 +10,7 @@ sidebar_position: 31
 
 -   [SELECT](../../sql-reference/statements/select/index.md)
 -   [INSERT INTO](../../sql-reference/statements/insert-into.md)
--   [CREATE](../../sql-reference/statements/create/index.md)
+-   [CREATE](../../sql-reference/statements/create.md)
 -   [ALTER](../../sql-reference/statements/alter/index.md)
 -   [SYSTEM](../../sql-reference/statements/system.md)
 -   [SHOW](../../sql-reference/statements/show.md)
@@ -20,7 +20,7 @@ sidebar_position: 31
 -   [CHECK TABLE](../../sql-reference/statements/check-table.mdx)
 -   [DESCRIBE TABLE](../../sql-reference/statements/describe-table.mdx)
 -   [DETACH](../../sql-reference/statements/detach.mdx)
--   [DROP](../../sql-reference/statements/drop)
+-   [DROP](../../sql-reference/statements/drop.md)
 -   [EXISTS](../../sql-reference/statements/exists.md)
 -   [KILL](../../sql-reference/statements/kill.mdx)
 -   [OPTIMIZE](../../sql-reference/statements/optimize.mdx)
diff --git a/docs/zh/sql-reference/statements/rename.md b/docs/zh/sql-reference/statements/rename.md
index c26dce306cc..156306fbd3e 100644
--- a/docs/zh/sql-reference/statements/rename.md
+++ b/docs/zh/sql-reference/statements/rename.md
@@ -9,8 +9,9 @@ sidebar_label: RENAME
 重命名数据库、表或字典。 可以在单个查询中重命名多个实体。
 请注意，具有多个实体的`RENAME`查询是非原子操作。 要以原子方式交换实体名称，请使用[EXCHANGE](./exchange.md)语法.
 
-!!! note "注意"
+:::note
 `RENAME`仅支持[Atomic](../../engines/database-engines/atomic.md)数据库引擎.
+:::
 
 **语法**
 
diff --git a/docs/zh/sql-reference/statements/select/array-join.md b/docs/zh/sql-reference/statements/select/array-join.md
index b0352a7bb0a..4162a39f399 100644
--- a/docs/zh/sql-reference/statements/select/array-join.md
+++ b/docs/zh/sql-reference/statements/select/array-join.md
@@ -146,7 +146,7 @@ ARRAY JOIN arr AS a, arrayEnumerate(arr) AS num, arrayMap(x -> x + 1, arr) AS ma
 └───────┴─────────┴───┴─────┴────────┘
 ```
 
-下面的例子使用 [arrayEnumerate](../../../sql-reference/functions/array-functions#array_functions-arrayenumerate) 功能:
+下面的例子使用 [arrayEnumerate](../../../sql-reference/functions/array-functions.md#array_functions-arrayenumerate) 功能:
 
 ``` sql
 SELECT s, arr, a, num, arrayEnumerate(arr)
@@ -259,7 +259,7 @@ ARRAY JOIN nest AS n;
 └───────┴─────┴─────┴─────────┴────────────┘
 ```
 
-使用功能 [arrayEnumerate](../../../sql-reference/functions/array-functions#array_functions-arrayenumerate) 的例子:
+使用功能 [arrayEnumerate](../../../sql-reference/functions/array-functions.md#array_functions-arrayenumerate) 的例子:
 
 ``` sql
 SELECT s, `n.x`, `n.y`, `nest.x`, `nest.y`, num
diff --git a/docs/zh/sql-reference/statements/select/group-by.md b/docs/zh/sql-reference/statements/select/group-by.md
index 31c1649bc30..86511470538 100644
--- a/docs/zh/sql-reference/statements/select/group-by.md
+++ b/docs/zh/sql-reference/statements/select/group-by.md
@@ -8,11 +8,12 @@ sidebar_label: GROUP BY
 `GROUP BY` 子句将 `SELECT` 查询结果转换为聚合模式，其工作原理如下:
 
 -   `GROUP BY` 子句包含表达式列表（或单个表达式 -- 可以认为是长度为1的列表）。 这份名单充当 “grouping key”，而每个单独的表达式将被称为 “key expressions”.
--   在所有的表达式在 [SELECT](../../../sql-reference/statements/select/index.md), [HAVING](../../../sql-reference/statements/select/having)，和 [ORDER BY](../../../sql-reference/statements/select/order-by.md) 子句中 **必须** 基于键表达式进行计算 **或** 上 [聚合函数](../../../sql-reference/aggregate-functions/index.md) 在非键表达式（包括纯列）上。 换句话说，从表中选择的每个列必须用于键表达式或聚合函数内，但不能同时使用。
+-   在所有的表达式在 [SELECT](../../../sql-reference/statements/select/index.md), [HAVING](../../../sql-reference/statements/select/having.md)，和 [ORDER BY](../../../sql-reference/statements/select/order-by.md) 子句中 **必须** 基于键表达式进行计算 **或** 上 [聚合函数](../../../sql-reference/aggregate-functions/index.md) 在非键表达式（包括纯列）上。 换句话说，从表中选择的每个列必须用于键表达式或聚合函数内，但不能同时使用。
 -   聚合结果 `SELECT` 查询将包含尽可能多的行，因为有唯一值 “grouping key” 在源表中。 通常这会显着减少行数，通常是数量级，但不一定：如果所有行数保持不变 “grouping key” 值是不同的。
 
-!!! note "注"
-    还有一种额外的方法可以在表上运行聚合。 如果查询仅在聚合函数中包含表列，则 `GROUP BY` 可以省略，并且通过一个空的键集合来假定聚合。 这样的查询总是只返回一行。
+:::note
+还有一种额外的方法可以在表上运行聚合。 如果查询仅在聚合函数中包含表列，则 `GROUP BY` 可以省略，并且通过一个空的键集合来假定聚合。 这样的查询总是只返回一行。
+:::
 
 ## 空处理 {#null-processing}
 
@@ -57,7 +58,7 @@ sidebar_label: GROUP BY
 -   在 `Pretty*` 格式时，该行在主结果之后作为单独的表输出。
 -   在其他格式中，它不可用。
 
-`WITH TOTALS` 可以以不同的方式运行时 [HAVING](../../../sql-reference/statements/select/having) 是存在的。 该行为取决于 `totals_mode` 设置。
+`WITH TOTALS` 可以以不同的方式运行时 [HAVING](../../../sql-reference/statements/select/having.md) 是存在的。 该行为取决于 `totals_mode` 设置。
 
 ### 配置总和处理 {#configuring-totals-processing}
 
diff --git a/docs/zh/sql-reference/statements/select/index.md b/docs/zh/sql-reference/statements/select/index.md
index 2d4044cbd20..fdf196e198b 100644
--- a/docs/zh/sql-reference/statements/select/index.md
+++ b/docs/zh/sql-reference/statements/select/index.md
@@ -41,7 +41,7 @@ SELECT [DISTINCT] expr_list
 -   [WHERE 子句](../../../sql-reference/statements/select/where.md)
 -   [GROUP BY 子句](../../../sql-reference/statements/select/group-by.md)
 -   [LIMIT BY 子句](../../../sql-reference/statements/select/limit-by.md)
--   [HAVING 子句](../../../sql-reference/statements/select/having)
+-   [HAVING 子句](../../../sql-reference/statements/select/having.md)
 -   [SELECT 子句](#select-clause)
 -   [DISTINCT 子句](../../../sql-reference/statements/select/distinct.md)
 -   [LIMIT 子句](../../../sql-reference/statements/select/limit.md)
diff --git a/docs/zh/sql-reference/statements/select/join.md b/docs/zh/sql-reference/statements/select/join.md
index 08290a02de5..a2686aa5e53 100644
--- a/docs/zh/sql-reference/statements/select/join.md
+++ b/docs/zh/sql-reference/statements/select/join.md
@@ -39,8 +39,9 @@ ClickHouse中提供的其他联接类型:
 
 ## 严格 {#join-settings}
 
-!!! note "注"
-    可以使用以下方式复盖默认的严格性值 [join_default_strictness](../../../operations/settings/settings.md#settings-join_default_strictness) 设置。
+:::note
+可以使用以下方式复盖默认的严格性值 [join_default_strictness](../../../operations/settings/settings.md#settings-join_default_strictness) 设置。
+:::
 
     Also the behavior of ClickHouse server for `ANY JOIN` operations depends on the [any_join_distinct_right_table_keys](../../../operations/settings/settings.md#any_join_distinct_right_table_keys) setting.
 
@@ -91,8 +92,9 @@ USING (equi_column1, ... equi_columnN, asof_column)
 
 `ASOF JOIN`会从 `table_2` 中的用户事件时间戳找出和 `table_1` 中用户事件时间戳中最近的一个时间戳，来满足最接近匹配的条件。如果有得话，则相等的时间戳值是最接近的值。在此例中，`user_id` 列可用于条件匹配，`ev_time` 列可用于最接近匹配。在此例中，`event_1_1` 可以 JOIN `event_2_1`，`event_1_2` 可以JOIN `event_2_3`，但是 `event_2_2` 不能被JOIN。
 
-!!! note "注"
-    `ASOF JOIN`在 [JOIN](../../../engines/table-engines/special/join.md) 表引擎中 **不受** 支持。
+:::note
+`ASOF JOIN`在 [JOIN](../../../engines/table-engines/special/join.md) 表引擎中 **不受** 支持。
+:::
 
 ## 分布式联接 {#global-join}
 
diff --git a/docs/zh/sql-reference/statements/select/limit-by.md b/docs/zh/sql-reference/statements/select/limit-by.md
index 50e3505b7fb..68b88bf8d7a 100644
--- a/docs/zh/sql-reference/statements/select/limit-by.md
+++ b/docs/zh/sql-reference/statements/select/limit-by.md
@@ -14,8 +14,9 @@ ClickHouse支持以下语法变体:
 
 处理查询时，ClickHouse首先选择经由排序键排序过后的数据。排序键可以显式地使用[ORDER BY](order-by.md#select-order-by)从句指定，或隐式地使用表引擎使用的排序键（数据的顺序仅在使用[ORDER BY](order-by.md#select-order-by)时才可以保证，否则由于多线程处理，数据顺序会随机化）。然后ClickHouse执行`LIMIT n BY expressions`从句，将每一行按 `expressions` 的值进行分组，并对每一分组返回前`n`行。如果指定了`OFFSET`，那么对于每一分组，ClickHouse会跳过前`offset_value`行，接着返回前`n`行。如果`offset_value`大于某一分组的行数，ClickHouse会从分组返回0行。
 
-!!! note "注"
-    `LIMIT BY`与[LIMIT](../../../sql-reference/statements/select/limit.md)没有关系。它们可以在同一个查询中使用。
+:::note
+`LIMIT BY`与[LIMIT](../../../sql-reference/statements/select/limit.md)没有关系。它们可以在同一个查询中使用。
+:::
 
 ## 例 {#examples}
 
diff --git a/docs/zh/sql-reference/statements/select/sample.md b/docs/zh/sql-reference/statements/select/sample.md
index f701bd3b805..0993958b029 100644
--- a/docs/zh/sql-reference/statements/select/sample.md
+++ b/docs/zh/sql-reference/statements/select/sample.md
@@ -15,8 +15,9 @@ sidebar_label: SAMPLE
 -   当您的原始数据不准确时，所以近似不会明显降低质量。
 -   业务需求的目标是近似结果（为了成本效益，或者向高级用户推销确切结果）。
 
-!!! note "注"
-    您只能使用采样中的表 [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) 族，并且只有在表创建过程中指定了采样表达式（请参阅 [MergeTree引擎](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table)).
+:::note
+您只能使用采样中的表 [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) 族，并且只有在表创建过程中指定了采样表达式（请参阅 [MergeTree引擎](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table)).
+:::
 
 下面列出了数据采样的功能:
 
diff --git a/docs/zh/sql-reference/statements/select/where.md b/docs/zh/sql-reference/statements/select/where.md
index fe165e8ad16..6c7183840c7 100644
--- a/docs/zh/sql-reference/statements/select/where.md
+++ b/docs/zh/sql-reference/statements/select/where.md
@@ -11,9 +11,10 @@ sidebar_label: WHERE
 
 如果基础表引擎支持，`WHERE`表达式会使用索引和分区进行剪枝。
 
-!!! note "注"
-    有一个叫做过滤优化 [prewhere](../../../sql-reference/statements/select/prewhere.md) 的东西.
-    
+:::note
+有一个叫做过滤优化 [prewhere](../../../sql-reference/statements/select/prewhere.md) 的东西.
+:::
+
 如果需要测试一个 [NULL](../../../sql-reference/syntax.md#null-literal) 值，请使用 [IS NULL](../../operators/index.md#operator-is-null) and [IS NOT NULL](../../operators/index.md#is-not-null) 运算符或 [isNull](../../../sql-reference/functions/functions-for-nulls.md#isnull) 和 [isNotNull](../../../sql-reference/functions/functions-for-nulls.md#isnotnull) 函数。否则带有 NULL 的表达式永远不会通过。
 
 **示例**
diff --git a/docs/zh/sql-reference/statements/system.md b/docs/zh/sql-reference/statements/system.md
index d8d60c28af5..8fd2dd74d26 100644
--- a/docs/zh/sql-reference/statements/system.md
+++ b/docs/zh/sql-reference/statements/system.md
@@ -124,10 +124,9 @@ ClickHouse可以管理 [MergeTree](../../engines/table-engines/mergetree-family/
 SYSTEM STOP MERGES [[db.]merge_tree_family_table_name]
 ```
 
-
-!!! note "Note"
-    `DETACH / ATTACH` 表操作会在后台进行表的merge操作，甚至当所有MergeTree表的合并操作已经停止的情况下。
-
+:::note
+`DETACH / ATTACH` 表操作会在后台进行表的merge操作，甚至当所有MergeTree表的合并操作已经停止的情况下。
+:::
 
 ### START MERGES {#query_language-system-start-merges}
 
@@ -241,7 +240,7 @@ SYSTEM START REPLICATION QUEUES [[db.]replicated_merge_tree_family_table_name]
 
 
 ``` sql
-SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name
+SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name [STRICT | LIGHTWEIGHT | PULL]
 ```
 
 ### RESTART REPLICA {#query_language-system-restart-replica}
diff --git a/docs/zh/sql-reference/table-functions/mysql.md b/docs/zh/sql-reference/table-functions/mysql.md
index 6c9753b9b12..4efee2e616b 100644
--- a/docs/zh/sql-reference/table-functions/mysql.md
+++ b/docs/zh/sql-reference/table-functions/mysql.md
@@ -49,8 +49,9 @@ SELECT name FROM mysql(`mysql1:3306|mysql2:3306|mysql3:3306`, 'mysql_database',
 
 与原始MySQL表具有相同列的表对象。
 
-!!! note "注意"
-    在`INSERT`查询中为了区分`mysql(...)`与带有列名列表的表名的表函数，你必须使用关键字`FUNCTION`或`TABLE FUNCTION`。查看如下示例。
+:::note
+在`INSERT`查询中为了区分`mysql(...)`与带有列名列表的表名的表函数，你必须使用关键字`FUNCTION`或`TABLE FUNCTION`。查看如下示例。
+:::
 
 ## 用法示例 {#usage-example}
 
diff --git a/docs/zh/sql-reference/table-functions/url.md b/docs/zh/sql-reference/table-functions/url.md
index d3b7665d21b..c8ca9b775b2 100644
--- a/docs/zh/sql-reference/table-functions/url.md
+++ b/docs/zh/sql-reference/table-functions/url.md
@@ -41,3 +41,11 @@ CREATE TABLE test_table (column1 String, column2 UInt32) ENGINE=Memory;
 INSERT INTO FUNCTION url('http://127.0.0.1:8123/?query=INSERT+INTO+test_table+FORMAT+CSV', 'CSV', 'column1 String, column2 UInt32') VALUES ('http interface', 42);
 SELECT * FROM test_table;
 ```
+## 虚拟列 {#virtual-columns}
+
+-   `_path` — `URL`路径。
+-   `_file` — 资源名称。
+
+**另请参阅**
+
+-   [虚拟列](https://clickhouse.com/docs/en/operations/table_engines/#table_engines-virtual_columns)
diff --git a/packages/clickhouse-keeper.service b/packages/clickhouse-keeper.service
index 2809074c93a..e4ec5bf4ede 100644
--- a/packages/clickhouse-keeper.service
+++ b/packages/clickhouse-keeper.service
@@ -14,7 +14,8 @@ User=clickhouse
 Group=clickhouse
 Restart=always
 RestartSec=30
-RuntimeDirectory=%p  # %p is resolved to the systemd unit name
+# %p is resolved to the systemd unit name
+RuntimeDirectory=%p
 ExecStart=/usr/bin/clickhouse-keeper --config=/etc/clickhouse-keeper/keeper_config.xml --pid-file=%t/%p/%p.pid
 # Minus means that this file is optional.
 EnvironmentFile=-/etc/default/%p
diff --git a/packages/clickhouse-server.service b/packages/clickhouse-server.service
index 090461df988..7742d8b278a 100644
--- a/packages/clickhouse-server.service
+++ b/packages/clickhouse-server.service
@@ -18,7 +18,7 @@ Group=clickhouse
 Restart=always
 RestartSec=30
 # Since ClickHouse is systemd aware default 1m30sec may not be enough
-TimeoutStartSec=infinity
+TimeoutStartSec=0
 # %p is resolved to the systemd unit name
 RuntimeDirectory=%p 
 ExecStart=/usr/bin/clickhouse-server --config=/etc/clickhouse-server/config.xml --pid-file=%t/%p/%p.pid
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 5b97daf2998..47017a94cb5 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -400,10 +400,6 @@ endif ()
 
 add_custom_target (clickhouse-bundle ALL DEPENDS ${CLICKHOUSE_BUNDLE})
 
-if (USE_GDB_ADD_INDEX)
-    add_custom_command(TARGET clickhouse POST_BUILD COMMAND ${GDB_ADD_INDEX_EXE} clickhouse COMMENT "Adding .gdb-index to clickhouse" VERBATIM)
-endif()
-
 if (USE_BINARY_HASH)
     add_custom_command(TARGET clickhouse POST_BUILD COMMAND ./clickhouse hash-binary > hash && ${OBJCOPY_PATH} --add-section .clickhouse.hash=hash clickhouse COMMENT "Adding section '.clickhouse.hash' to clickhouse binary" VERBATIM)
 endif()
diff --git a/programs/benchmark/Benchmark.cpp b/programs/benchmark/Benchmark.cpp
index 994f9b7ac4d..466a0c194f7 100644
--- a/programs/benchmark/Benchmark.cpp
+++ b/programs/benchmark/Benchmark.cpp
@@ -34,6 +34,7 @@
 #include <Common/Config/configReadClient.h>
 #include <Common/TerminalSize.h>
 #include <Common/StudentTTest.h>
+#include <Common/CurrentMetrics.h>
 #include <filesystem>
 
 
@@ -43,6 +44,12 @@ namespace fs = std::filesystem;
   * The tool emulates a case with fixed amount of simultaneously executing queries.
   */
 
+namespace CurrentMetrics
+{
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
+
 namespace DB
 {
 
@@ -103,7 +110,7 @@ public:
         settings(settings_),
         shared_context(Context::createShared()),
         global_context(Context::createGlobal(shared_context.get())),
-        pool(concurrency)
+        pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, concurrency)
     {
         const auto secure = secure_ ? Protocol::Secure::Enable : Protocol::Secure::Disable;
         size_t connections_cnt = std::max(ports_.size(), hosts_.size());
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 660b8d7c00a..5870327c3b5 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -277,11 +277,11 @@ void Client::initialize(Poco::Util::Application & self)
       */
 
     const char * env_user = getenv("CLICKHOUSE_USER"); // NOLINT(concurrency-mt-unsafe)
-    if (env_user)
+    if (env_user && !config().has("user"))
         config().setString("user", env_user);
 
     const char * env_password = getenv("CLICKHOUSE_PASSWORD"); // NOLINT(concurrency-mt-unsafe)
-    if (env_password)
+    if (env_password && !config().has("password"))
         config().setString("password", env_password);
 
     parseConnectionsCredentials();
@@ -862,7 +862,8 @@ bool Client::processWithFuzzing(const String & full_query)
                 const auto * tmp_pos = text_2.c_str();
                 const auto ast_3 = parseQuery(tmp_pos, tmp_pos + text_2.size(),
                     false /* allow_multi_statements */);
-                const auto text_3 = ast_3->formatForErrorMessage();
+                const auto text_3 = ast_3 ? ast_3->formatForErrorMessage() : "";
+
                 if (text_3 != text_2)
                 {
                     fmt::print(stderr, "Found error: The query formatting is broken.\n");
@@ -877,7 +878,7 @@ bool Client::processWithFuzzing(const String & full_query)
                     fmt::print(stderr, "Text-1 (AST-1 formatted):\n'{}'\n", query_to_execute);
                     fmt::print(stderr, "AST-2 (Text-1 parsed):\n'{}'\n", ast_2->dumpTree());
                     fmt::print(stderr, "Text-2 (AST-2 formatted):\n'{}'\n", text_2);
-                    fmt::print(stderr, "AST-3 (Text-2 parsed):\n'{}'\n", ast_3->dumpTree());
+                    fmt::print(stderr, "AST-3 (Text-2 parsed):\n'{}'\n", ast_3 ? ast_3->dumpTree() : "");
                     fmt::print(stderr, "Text-3 (AST-3 formatted):\n'{}'\n", text_3);
                     fmt::print(stderr, "Text-3 must be equal to Text-2, but it is not.\n");
 
@@ -1180,7 +1181,7 @@ void Client::processOptions(const OptionsDescription & options_description,
 void Client::processConfig()
 {
     /// Batch mode is enabled if one of the following is true:
-    /// - -e (--query) command line option is present.
+    /// - -q (--query) command line option is present.
     ///   The value of the option is used as the text of query (or of multiple queries).
     ///   If stdin is not a terminal, INSERT data for the first query is read from it.
     /// - stdin is not a terminal. In this case queries are read from it.
@@ -1380,6 +1381,13 @@ void Client::readArguments(
                 allow_repeated_settings = true;
             else if (arg == "--allow_merge_tree_settings")
                 allow_merge_tree_settings = true;
+            else if (arg == "--multiquery" && (arg_num + 1) < argc && !std::string_view(argv[arg_num + 1]).starts_with('-'))
+            {
+                /// Transform the abbreviated syntax '--multiquery <SQL>' into the full syntax '--multiquery -q <SQL>'
+                ++arg_num;
+                arg = argv[arg_num];
+                addMultiquery(arg, common_arguments);
+            }
             else
                 common_arguments.emplace_back(arg);
         }
diff --git a/programs/compressor/Compressor.cpp b/programs/compressor/Compressor.cpp
index b60138b5692..cc25747702a 100644
--- a/programs/compressor/Compressor.cpp
+++ b/programs/compressor/Compressor.cpp
@@ -66,6 +66,7 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
     using namespace DB;
     namespace po = boost::program_options;
 
+    bool print_stacktrace = false;
     try
     {
         po::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
@@ -84,6 +85,7 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
             ("level", po::value<int>(), "compression level for codecs specified via flags")
             ("none", "use no compression instead of LZ4")
             ("stat", "print block statistics of compressed data")
+            ("stacktrace", "print stacktrace of exception")
         ;
 
         po::positional_options_description positional_desc;
@@ -107,6 +109,7 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
         bool use_deflate_qpl = options.count("deflate_qpl");
         bool stat_mode = options.count("stat");
         bool use_none = options.count("none");
+        print_stacktrace = options.count("stacktrace");
         unsigned block_size = options["block-size"].as<unsigned>();
         std::vector<std::string> codecs;
         if (options.count("codec"))
@@ -188,11 +191,12 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
             /// Compression
             CompressedWriteBuffer to(*wb, codec, block_size);
             copyData(*rb, to);
+            to.finalize();
         }
     }
     catch (...)
     {
-        std::cerr << getCurrentExceptionMessage(true) << '\n';
+        std::cerr << getCurrentExceptionMessage(print_stacktrace) << '\n';
         return getCurrentExceptionCode();
     }
 
diff --git a/programs/copier/ClusterCopier.cpp b/programs/copier/ClusterCopier.cpp
index bc882719a08..efe7121cace 100644
--- a/programs/copier/ClusterCopier.cpp
+++ b/programs/copier/ClusterCopier.cpp
@@ -6,6 +6,7 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/setThreadName.h>
+#include <Common/CurrentMetrics.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Parsers/ASTFunction.h>
@@ -19,6 +20,12 @@
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 
+namespace CurrentMetrics
+{
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
+
 namespace DB
 {
 
@@ -192,7 +199,7 @@ void ClusterCopier::discoverTablePartitions(const ConnectionTimeouts & timeouts,
 {
     /// Fetch partitions list from a shard
     {
-        ThreadPool thread_pool(num_threads ? num_threads : 2 * getNumberOfPhysicalCPUCores());
+        ThreadPool thread_pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, num_threads ? num_threads : 2 * getNumberOfPhysicalCPUCores());
 
         for (const TaskShardPtr & task_shard : task_table.all_shards)
             thread_pool.scheduleOrThrowOnError([this, timeouts, task_shard]()
@@ -1757,8 +1764,7 @@ void ClusterCopier::dropParticularPartitionPieceFromAllHelpingTables(const TaskT
     LOG_INFO(log, "All helping tables dropped partition {}", partition_name);
 }
 
-String ClusterCopier::getRemoteCreateTable(
-    const DatabaseAndTableName & table, Connection & connection, const Settings & settings)
+String ClusterCopier::getRemoteCreateTable(const DatabaseAndTableName & table, Connection & connection, const Settings & settings)
 {
     auto remote_context = Context::createCopy(context);
     remote_context->setSettings(settings);
@@ -1767,7 +1773,7 @@ String ClusterCopier::getRemoteCreateTable(
 
     QueryPipelineBuilder builder;
     builder.init(Pipe(std::make_shared<RemoteSource>(
-            std::make_shared<RemoteQueryExecutor>(connection, query, InterpreterShowCreateQuery::getSampleBlock(), remote_context), false, false)));
+            std::make_shared<RemoteQueryExecutor>(connection, query, InterpreterShowCreateQuery::getSampleBlock(), remote_context), false, false, /* async_query_sending= */ false)));
     Block block = getBlockWithAllStreamData(std::move(builder));
     return typeid_cast<const ColumnString &>(*block.safeGetByPosition(0).column).getDataAt(0).toString();
 }
@@ -1777,8 +1783,10 @@ ASTPtr ClusterCopier::getCreateTableForPullShard(const ConnectionTimeouts & time
 {
     /// Fetch and parse (possibly) new definition
     auto connection_entry = task_shard.info.pool->get(timeouts, &task_cluster->settings_pull, true);
-    String create_query_pull_str
-        = getRemoteCreateTable(task_shard.task_table.table_pull, *connection_entry, task_cluster->settings_pull);
+    String create_query_pull_str = getRemoteCreateTable(
+            task_shard.task_table.table_pull,
+            *connection_entry,
+            task_cluster->settings_pull);
 
     ParserCreateQuery parser_create_query;
     const auto & settings = getContext()->getSettingsRef();
@@ -1867,8 +1875,8 @@ std::set<String> ClusterCopier::getShardPartitions(const ConnectionTimeouts & ti
     String query;
     {
         WriteBufferFromOwnString wb;
-        wb << "SELECT DISTINCT " << partition_name << " AS partition FROM"
-           << " " << getQuotedTable(task_shard.table_read_shard) << " ORDER BY partition DESC";
+        wb << "SELECT " << partition_name << " AS partition FROM "
+           << getQuotedTable(task_shard.table_read_shard) << " GROUP BY partition ORDER BY partition DESC";
         query = wb.str();
     }
 
@@ -2025,8 +2033,8 @@ UInt64 ClusterCopier::executeQueryOnCluster(
                 /// For unknown reason global context is passed to IStorage::read() method
                 /// So, task_identifier is passed as constructor argument. It is more obvious.
                 auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
-                    *connections.back(), query, header, getContext(),
-                    /*throttler=*/nullptr, Scalars(), Tables(), QueryProcessingStage::Complete);
+                        *connections.back(), query, header, getContext(),
+                        /*throttler=*/nullptr, Scalars(), Tables(), QueryProcessingStage::Complete);
 
                 try
                 {
diff --git a/programs/copier/ClusterCopierApp.cpp b/programs/copier/ClusterCopierApp.cpp
index b2994b90e23..822289dd89c 100644
--- a/programs/copier/ClusterCopierApp.cpp
+++ b/programs/copier/ClusterCopierApp.cpp
@@ -1,4 +1,5 @@
 #include "ClusterCopierApp.h"
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/StatusFile.h>
 #include <Common/TerminalSize.h>
 #include <IO/ConnectionTimeouts.h>
@@ -192,6 +193,8 @@ void ClusterCopierApp::mainImpl()
     if (!task_file.empty())
         copier->uploadTaskDescription(task_path, task_file, config().getBool("task-upload-force", false));
 
+    zkutil::validateZooKeeperConfig(config());
+
     copier->init();
     copier->process(ConnectionTimeouts::getTCPTimeoutsWithoutFailover(context->getSettingsRef()));
 
diff --git a/programs/copier/Internals.h b/programs/copier/Internals.h
index b3c9936cd33..48f4b0fab09 100644
--- a/programs/copier/Internals.h
+++ b/programs/copier/Internals.h
@@ -25,7 +25,6 @@
 #include <Common/formatReadable.h>
 #include <Common/DNSResolver.h>
 #include <Common/CurrentThread.h>
-#include <Common/escapeForFileName.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/ThreadStatus.h>
 #include <Client/Connection.h>
diff --git a/programs/copier/TaskTable.cpp b/programs/copier/TaskTable.cpp
index 451a33a1c02..d055ceb4c7b 100644
--- a/programs/copier/TaskTable.cpp
+++ b/programs/copier/TaskTable.cpp
@@ -4,9 +4,11 @@
 #include "TaskCluster.h"
 
 #include <Parsers/ASTFunction.h>
+#include <Common/escapeForFileName.h>
 
 #include <boost/algorithm/string/join.hpp>
 
+
 namespace DB
 {
 namespace ErrorCodes
diff --git a/programs/copier/ZooKeeperStaff.h b/programs/copier/ZooKeeperStaff.h
index 3d4a11186e3..36dcfa50842 100644
--- a/programs/copier/ZooKeeperStaff.h
+++ b/programs/copier/ZooKeeperStaff.h
@@ -175,7 +175,7 @@ public:
         Coordination::Stat stat{};
         String _some_data;
         auto watch_callback =
-                [stale = stale] (const Coordination::WatchResponse & rsp)
+                [my_stale = stale] (const Coordination::WatchResponse & rsp)
                 {
                     auto logger = &Poco::Logger::get("ClusterCopier");
                     if (rsp.error == Coordination::Error::ZOK)
@@ -184,11 +184,11 @@ public:
                         {
                             case Coordination::CREATED:
                                 LOG_DEBUG(logger, "CleanStateClock change: CREATED, at {}", rsp.path);
-                                stale->store(true);
+                                my_stale->store(true);
                                 break;
                             case Coordination::CHANGED:
                                 LOG_DEBUG(logger, "CleanStateClock change: CHANGED, at {}", rsp.path);
-                                stale->store(true);
+                                my_stale->store(true);
                         }
                     }
                 };
diff --git a/programs/diagnostics/go.mod b/programs/diagnostics/go.mod
index 58487fced80..34c6b0037ae 100644
--- a/programs/diagnostics/go.mod
+++ b/programs/diagnostics/go.mod
@@ -33,6 +33,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
 	github.com/containerd/containerd v1.6.17 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/distribution/distribution v2.8.2+incompatible // indirect
 	github.com/docker/distribution v2.8.1+incompatible // indirect
 	github.com/docker/docker v23.0.0+incompatible // indirect
 	github.com/docker/go-units v0.5.0 // indirect
diff --git a/programs/diagnostics/go.sum b/programs/diagnostics/go.sum
index 71c3cbcd2d6..a95dfb4fd2b 100644
--- a/programs/diagnostics/go.sum
+++ b/programs/diagnostics/go.sum
@@ -126,6 +126,8 @@ github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG
 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/distribution/distribution v2.8.2+incompatible h1:k9+4DKdOG+quPFZXT/mUsiQrGu9vYCp+dXpuPkuqhk8=
+github.com/distribution/distribution v2.8.2+incompatible/go.mod h1:EgLm2NgWtdKgzF9NpMzUKgzmR7AMmb0VQi2B+ZzDRjc=
 github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v23.0.0+incompatible h1:L6c28tNyqZ4/ub9AZC9d5QUuunoHHfEH4/Ue+h/E5nE=
diff --git a/programs/diagnostics/internal/platform/data/file_test.go b/programs/diagnostics/internal/platform/data/file_test.go
index b93c4fc3350..938c34281f1 100644
--- a/programs/diagnostics/internal/platform/data/file_test.go
+++ b/programs/diagnostics/internal/platform/data/file_test.go
@@ -135,7 +135,7 @@ func TestConfigFileFrameCopy(t *testing.T) {
 		sizes := map[string]int64{
 			"users.xml":            int64(2017),
 			"default-password.xml": int64(188),
-			"config.xml":           int64(61260),
+			"config.xml":           int64(61662),
 			"server-include.xml":   int64(168),
 			"user-include.xml":     int64(559),
 		}
diff --git a/programs/diagnostics/testdata/configs/xml/config.xml b/programs/diagnostics/testdata/configs/xml/config.xml
index 18997855955..21a0821f89d 100644
--- a/programs/diagnostics/testdata/configs/xml/config.xml
+++ b/programs/diagnostics/testdata/configs/xml/config.xml
@@ -1260,8 +1260,12 @@
                 <access_key_id>REPLACE_ME</access_key_id>
                 <secret_access_key>REPLACE_ME</secret_access_key>
                 <region></region>
+                <header>Authorization: Bearer SOME-TOKEN</header>
                 <server_side_encryption_customer_key_base64>your_base64_encoded_customer_key
                 </server_side_encryption_customer_key_base64>
+                <server_side_encryption_kms_key_id>REPLACE_ME</server_side_encryption_kms_key_id>
+                <server_side_encryption_kms_encryption_context>REPLACE_ME</server_side_encryption_kms_encryption_context>
+                <server_side_encryption_kms_bucket_key_enabled>true</server_side_encryption_kms_bucket_key_enabled>
                 <proxy>
                     <uri>http://proxy1</uri>
                     <uri>http://proxy2</uri>
diff --git a/programs/extract-from-config/ExtractFromConfig.cpp b/programs/extract-from-config/ExtractFromConfig.cpp
index 25b03550803..5305c61b730 100644
--- a/programs/extract-from-config/ExtractFromConfig.cpp
+++ b/programs/extract-from-config/ExtractFromConfig.cpp
@@ -89,8 +89,12 @@ static std::vector<std::string> extractFromConfig(
     if (has_zk_includes && process_zk_includes)
     {
         DB::ConfigurationPtr bootstrap_configuration(new Poco::Util::XMLConfiguration(config_xml));
+
+        zkutil::validateZooKeeperConfig(*bootstrap_configuration);
+
         zkutil::ZooKeeperPtr zookeeper = std::make_shared<zkutil::ZooKeeper>(
-                *bootstrap_configuration, "zookeeper", nullptr);
+            *bootstrap_configuration, bootstrap_configuration->has("zookeeper") ? "zookeeper" : "keeper", nullptr);
+
         zkutil::ZooKeeperNodeCache zk_node_cache([&] { return zookeeper; });
         config_xml = processor.processConfig(&has_zk_includes, &zk_node_cache);
     }
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index d568012bb26..d83e189f7ef 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -20,7 +20,7 @@
 #include <Common/formatReadable.h>
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/OpenSSLHelpers.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Common/getResource.h>
 #include <base/sleep.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
@@ -222,6 +222,8 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
             ("pid-path", po::value<std::string>()->default_value("var/run/clickhouse-server"), "directory for pid file")
             ("user", po::value<std::string>()->default_value(DEFAULT_CLICKHOUSE_SERVER_USER), "clickhouse user to create")
             ("group", po::value<std::string>()->default_value(DEFAULT_CLICKHOUSE_SERVER_GROUP), "clickhouse group to create")
+            ("noninteractive,y", "run non-interactively")
+            ("link", "create symlink to the binary instead of copying to binary-path")
         ;
 
         po::variables_map options;
@@ -267,8 +269,6 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 
         /// Copy binary to the destination directory.
 
-        /// TODO An option to link instead of copy - useful for developers.
-
         fs::path prefix = options["prefix"].as<std::string>();
         fs::path bin_dir = prefix / options["binary-path"].as<std::string>();
 
@@ -281,76 +281,136 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
         bool old_binary_exists = fs::exists(main_bin_path);
         bool already_installed = false;
 
-        /// Check if the binary is the same file (already installed).
-        if (old_binary_exists && binary_self_canonical_path == fs::canonical(main_bin_path))
+        if (options.count("link"))
         {
-            already_installed = true;
-            fmt::print("ClickHouse binary is already located at {}\n", main_bin_path.string());
-        }
-        /// Check if binary has the same content.
-        else if (old_binary_exists && binary_size == fs::file_size(main_bin_path))
-        {
-            fmt::print("Found already existing ClickHouse binary at {} having the same size. Will check its contents.\n",
-                main_bin_path.string());
-
-            if (filesEqual(binary_self_path.string(), main_bin_path.string()))
+            if (old_binary_exists)
             {
-                already_installed = true;
-                fmt::print("ClickHouse binary is already located at {} and it has the same content as {}\n",
-                    main_bin_path.string(), binary_self_canonical_path.string());
-            }
-        }
+                bool is_symlink = FS::isSymlink(main_bin_path);
+                fs::path points_to;
+                if (is_symlink)
+                    points_to = fs::weakly_canonical(FS::readSymlink(main_bin_path));
 
-        if (already_installed)
-        {
-            if (0 != chmod(main_bin_path.string().c_str(), S_IRUSR | S_IRGRP | S_IROTH | S_IXUSR | S_IXGRP | S_IXOTH))
-                throwFromErrno(fmt::format("Cannot chmod {}", main_bin_path.string()), ErrorCodes::SYSTEM_ERROR);
+                if (is_symlink && points_to == binary_self_canonical_path)
+                {
+                    already_installed = true;
+                }
+                else
+                {
+                    if (!is_symlink)
+                    {
+                        fmt::print("File {} already exists but it's not a symlink. Will rename to {}.\n",
+                                   main_bin_path.string(), main_bin_old_path.string());
+                        fs::rename(main_bin_path, main_bin_old_path);
+                    }
+                    else if (points_to != main_bin_path)
+                    {
+                        fmt::print("Symlink {} already exists but it points to {}. Will replace the old symlink to {}.\n",
+                                   main_bin_path.string(), points_to.string(), binary_self_canonical_path.string());
+                        fs::remove(main_bin_path);
+                    }
+                }
+            }
+
+            if (!already_installed)
+            {
+                if (!fs::exists(bin_dir))
+                {
+                    fmt::print("Creating binary directory {}.\n", bin_dir.string());
+                    fs::create_directories(bin_dir);
+                }
+
+                fmt::print("Creating symlink {} to {}.\n", main_bin_path.string(), binary_self_canonical_path.string());
+                fs::create_symlink(binary_self_canonical_path, main_bin_path);
+
+                if (0 != chmod(binary_self_canonical_path.string().c_str(), S_IRUSR | S_IRGRP | S_IROTH | S_IXUSR | S_IXGRP | S_IXOTH))
+                    throwFromErrno(fmt::format("Cannot chmod {}", binary_self_canonical_path.string()), ErrorCodes::SYSTEM_ERROR);
+            }
         }
         else
         {
-            if (!fs::exists(bin_dir))
+            bool is_symlink = FS::isSymlink(main_bin_path);
+
+            if (!is_symlink)
             {
-                fmt::print("Creating binary directory {}.\n", bin_dir.string());
-                fs::create_directories(bin_dir);
+                /// Check if the binary is the same file (already installed).
+                if (old_binary_exists && binary_self_canonical_path == fs::canonical(main_bin_path))
+                {
+                    already_installed = true;
+                    fmt::print("ClickHouse binary is already located at {}\n", main_bin_path.string());
+                }
+                /// Check if binary has the same content.
+                else if (old_binary_exists && binary_size == fs::file_size(main_bin_path))
+                {
+                    fmt::print("Found already existing ClickHouse binary at {} having the same size. Will check its contents.\n",
+                        main_bin_path.string());
+
+                    if (filesEqual(binary_self_path.string(), main_bin_path.string()))
+                    {
+                        already_installed = true;
+                        fmt::print("ClickHouse binary is already located at {} and it has the same content as {}\n",
+                            main_bin_path.string(), binary_self_canonical_path.string());
+                    }
+                }
             }
 
-            size_t available_space = fs::space(bin_dir).available;
-            if (available_space < binary_size)
-                throw Exception(ErrorCodes::NOT_ENOUGH_SPACE, "Not enough space for clickhouse binary in {}, required {}, available {}.",
-                    bin_dir.string(), ReadableSize(binary_size), ReadableSize(available_space));
-
-            fmt::print("Copying ClickHouse binary to {}\n", main_bin_tmp_path.string());
-
-            try
+            if (already_installed)
             {
-                ReadBufferFromFile in(binary_self_path.string());
-                WriteBufferFromFile out(main_bin_tmp_path.string());
-                copyData(in, out);
-                out.sync();
-
-                if (0 != fchmod(out.getFD(), S_IRUSR | S_IRGRP | S_IROTH | S_IXUSR | S_IXGRP | S_IXOTH))
-                    throwFromErrno(fmt::format("Cannot chmod {}", main_bin_tmp_path.string()), ErrorCodes::SYSTEM_ERROR);
-
-                out.finalize();
+                if (0 != chmod(main_bin_path.string().c_str(), S_IRUSR | S_IRGRP | S_IROTH | S_IXUSR | S_IXGRP | S_IXOTH))
+                    throwFromErrno(fmt::format("Cannot chmod {}", main_bin_path.string()), ErrorCodes::SYSTEM_ERROR);
             }
-            catch (const Exception & e)
+            else
             {
-                if (e.code() == ErrorCodes::CANNOT_OPEN_FILE && geteuid() != 0)
-                    std::cerr << "Install must be run as root: " << formatWithSudo("./clickhouse install") << '\n';
-                throw;
+                if (!fs::exists(bin_dir))
+                {
+                    fmt::print("Creating binary directory {}.\n", bin_dir.string());
+                    fs::create_directories(bin_dir);
+                }
+
+                size_t available_space = fs::space(bin_dir).available;
+                if (available_space < binary_size)
+                    throw Exception(ErrorCodes::NOT_ENOUGH_SPACE, "Not enough space for clickhouse binary in {}, required {}, available {}.",
+                        bin_dir.string(), ReadableSize(binary_size), ReadableSize(available_space));
+
+                fmt::print("Copying ClickHouse binary to {}\n", main_bin_tmp_path.string());
+
+                try
+                {
+                    String source = binary_self_path.string();
+                    String destination = main_bin_tmp_path.string();
+
+                    /// Try to make a hard link first, as an optimization.
+                    /// It is possible if the source and the destination are on the same filesystems.
+                    if (0 != link(source.c_str(), destination.c_str()))
+                    {
+                        ReadBufferFromFile in(binary_self_path.string());
+                        WriteBufferFromFile out(main_bin_tmp_path.string());
+                        copyData(in, out);
+                        out.sync();
+                        out.finalize();
+                    }
+
+                    if (0 != chmod(destination.c_str(), S_IRUSR | S_IRGRP | S_IROTH | S_IXUSR | S_IXGRP | S_IXOTH))
+                        throwFromErrno(fmt::format("Cannot chmod {}", main_bin_tmp_path.string()), ErrorCodes::SYSTEM_ERROR);
+                }
+                catch (const Exception & e)
+                {
+                    if (e.code() == ErrorCodes::CANNOT_OPEN_FILE && geteuid() != 0)
+                        std::cerr << "Install must be run as root: " << formatWithSudo("./clickhouse install") << '\n';
+                    throw;
+                }
+
+                if (old_binary_exists)
+                {
+                    fmt::print("{} already exists, will rename existing binary to {} and put the new binary in place\n",
+                            main_bin_path.string(), main_bin_old_path.string());
+
+                    /// There is file exchange operation in Linux but it's not portable.
+                    fs::rename(main_bin_path, main_bin_old_path);
+                }
+
+                fmt::print("Renaming {} to {}.\n", main_bin_tmp_path.string(), main_bin_path.string());
+                fs::rename(main_bin_tmp_path, main_bin_path);
             }
-
-            if (old_binary_exists)
-            {
-                fmt::print("{} already exists, will rename existing binary to {} and put the new binary in place\n",
-                        main_bin_path.string(), main_bin_old_path.string());
-
-                /// There is file exchange operation in Linux but it's not portable.
-                fs::rename(main_bin_path, main_bin_old_path);
-            }
-
-            fmt::print("Renaming {} to {}.\n", main_bin_tmp_path.string(), main_bin_path.string());
-            fs::rename(main_bin_tmp_path, main_bin_path);
         }
 
         /// Create symlinks.
@@ -384,7 +444,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                 if (is_symlink)
                     points_to = fs::weakly_canonical(FS::readSymlink(symlink_path));
 
-                if (is_symlink && points_to == main_bin_path)
+                if (is_symlink && (points_to == main_bin_path || (options.count("link") && points_to == binary_self_canonical_path)))
                 {
                     need_to_create = false;
                 }
@@ -709,7 +769,9 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
         /// dpkg or apt installers can ask for non-interactive work explicitly.
 
         const char * debian_frontend_var = getenv("DEBIAN_FRONTEND"); // NOLINT(concurrency-mt-unsafe)
-        bool noninteractive = debian_frontend_var && debian_frontend_var == std::string_view("noninteractive");
+        bool noninteractive = (debian_frontend_var && debian_frontend_var == std::string_view("noninteractive"))
+                              || options.count("noninteractive");
+
 
         bool is_interactive = !noninteractive && stdin_is_a_tty && stdout_is_a_tty;
 
diff --git a/programs/keeper/CMakeLists.txt b/programs/keeper/CMakeLists.txt
index 9b01e6920a4..1f1138f49eb 100644
--- a/programs/keeper/CMakeLists.txt
+++ b/programs/keeper/CMakeLists.txt
@@ -69,6 +69,7 @@ if (BUILD_STANDALONE_KEEPER)
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/ProtocolServerAdapter.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/PrometheusRequestHandler.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/PrometheusMetricsWriter.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/waitServersToFinish.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/HTTPRequestHandlerFactoryMain.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/HTTP/HTTPServer.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/HTTP/ReadHeaders.cpp
@@ -114,7 +115,7 @@ if (BUILD_STANDALONE_KEEPER)
     clickhouse_add_executable(clickhouse-keeper ${CLICKHOUSE_KEEPER_STANDALONE_SOURCES})
 
     # Remove some redundant dependencies
-    target_compile_definitions (clickhouse-keeper PRIVATE -DKEEPER_STANDALONE_BUILD)
+    target_compile_definitions (clickhouse-keeper PRIVATE -DCLICKHOUSE_PROGRAM_STANDALONE_BUILD)
     target_compile_definitions (clickhouse-keeper PUBLIC -DWITHOUT_TEXT_LOG)
 
     target_include_directories(clickhouse-keeper PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../src") # uses includes from src directory
@@ -128,6 +129,7 @@ if (BUILD_STANDALONE_KEEPER)
             ch_contrib::lz4
             ch_contrib::zstd
             ch_contrib::cityhash
+            ch_contrib::jemalloc
             common ch_contrib::double_conversion
             ch_contrib::dragonbox_to_chars
             pcg_random
diff --git a/programs/keeper/Keeper.cpp b/programs/keeper/Keeper.cpp
index ed3297ed7cb..7633465c5e5 100644
--- a/programs/keeper/Keeper.cpp
+++ b/programs/keeper/Keeper.cpp
@@ -11,13 +11,15 @@
 #include <Core/ServerUUID.h>
 #include <Common/logger_useful.h>
 #include <Common/ErrorHandlers.h>
+#include <Common/assertProcessUserMatchesDataOwner.h>
+#include <Common/makeSocketAddress.h>
+#include <Server/waitServersToFinish.h>
 #include <base/scope_guard.h>
 #include <base/safeExit.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/TCPServerParams.h>
 #include <Poco/Net/TCPServer.h>
 #include <Poco/Util/HelpFormatter.h>
-#include <Poco/Version.h>
 #include <Poco/Environment.h>
 #include <sys/stat.h>
 #include <pwd.h>
@@ -58,7 +60,7 @@ int mainEntryClickHouseKeeper(int argc, char ** argv)
     }
 }
 
-#ifdef KEEPER_STANDALONE_BUILD
+#ifdef CLICKHOUSE_PROGRAM_STANDALONE_BUILD
 
 // Weak symbols don't work correctly on Darwin
 // so we have a stub implementation to avoid linker errors
@@ -76,92 +78,9 @@ namespace ErrorCodes
     extern const int NO_ELEMENTS_IN_CONFIG;
     extern const int SUPPORT_IS_DISABLED;
     extern const int NETWORK_ERROR;
-    extern const int MISMATCHING_USERS_FOR_PROCESS_AND_DATA;
-    extern const int FAILED_TO_GETPWUID;
     extern const int LOGICAL_ERROR;
 }
 
-namespace
-{
-
-size_t waitServersToFinish(std::vector<DB::ProtocolServerAdapter> & servers, size_t seconds_to_wait)
-{
-    const size_t sleep_max_ms = 1000 * seconds_to_wait;
-    const size_t sleep_one_ms = 100;
-    size_t sleep_current_ms = 0;
-    size_t current_connections = 0;
-    for (;;)
-    {
-        current_connections = 0;
-
-        for (auto & server : servers)
-        {
-            server.stop();
-            current_connections += server.currentConnections();
-        }
-
-        if (!current_connections)
-            break;
-
-        sleep_current_ms += sleep_one_ms;
-        if (sleep_current_ms < sleep_max_ms)
-            std::this_thread::sleep_for(std::chrono::milliseconds(sleep_one_ms));
-        else
-            break;
-    }
-    return current_connections;
-}
-
-Poco::Net::SocketAddress makeSocketAddress(const std::string & host, UInt16 port, Poco::Logger * log)
-{
-    Poco::Net::SocketAddress socket_address;
-    try
-    {
-        socket_address = Poco::Net::SocketAddress(host, port);
-    }
-    catch (const Poco::Net::DNSException & e)
-    {
-        const auto code = e.code();
-        if (code == EAI_FAMILY
-#if defined(EAI_ADDRFAMILY)
-                    || code == EAI_ADDRFAMILY
-#endif
-           )
-        {
-            LOG_ERROR(log, "Cannot resolve listen_host ({}), error {}: {}. "
-                "If it is an IPv6 address and your host has disabled IPv6, then consider to "
-                "specify IPv4 address to listen in <listen_host> element of configuration "
-                "file. Example: <listen_host>0.0.0.0</listen_host>",
-                host, e.code(), e.message());
-        }
-
-        throw;
-    }
-    return socket_address;
-}
-
-std::string getUserName(uid_t user_id)
-{
-    /// Try to convert user id into user name.
-    auto buffer_size = sysconf(_SC_GETPW_R_SIZE_MAX);
-    if (buffer_size <= 0)
-        buffer_size = 1024;
-    std::string buffer;
-    buffer.reserve(buffer_size);
-
-    struct passwd passwd_entry;
-    struct passwd * result = nullptr;
-    const auto error = getpwuid_r(user_id, &passwd_entry, buffer.data(), buffer_size, &result);
-
-    if (error)
-        throwFromErrno("Failed to find user name for " + toString(user_id), ErrorCodes::FAILED_TO_GETPWUID, error);
-    else if (result)
-        return result->pw_name;
-    return toString(user_id);
-}
-
-}
-
 Poco::Net::SocketAddress Keeper::socketBindListen(Poco::Net::ServerSocket & socket, const std::string & host, UInt16 port, [[maybe_unused]] bool secure) const
 {
     auto address = makeSocketAddress(host, port, &logger());
@@ -315,12 +234,12 @@ struct Keeper::KeeperHTTPContext : public IHTTPContext
 
     Poco::Timespan getReceiveTimeout() const override
     {
-        return context->getConfigRef().getUInt64("keeper_server.http_receive_timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
+        return {context->getConfigRef().getInt64("keeper_server.http_receive_timeout", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC), 0};
     }
 
     Poco::Timespan getSendTimeout() const override
     {
-        return context->getConfigRef().getUInt64("keeper_server.http_send_timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
+        return {context->getConfigRef().getInt64("keeper_server.http_send_timeout", DBMS_DEFAULT_SEND_TIMEOUT_SEC), 0};
     }
 
     TinyContextPtr context;
@@ -365,24 +284,7 @@ try
     std::filesystem::create_directories(path);
 
     /// Check that the process user id matches the owner of the data.
-    const auto effective_user_id = geteuid();
-    struct stat statbuf;
-    if (stat(path.c_str(), &statbuf) == 0 && effective_user_id != statbuf.st_uid)
-    {
-        const auto effective_user = getUserName(effective_user_id);
-        const auto data_owner = getUserName(statbuf.st_uid);
-        std::string message = "Effective user of the process (" + effective_user +
-            ") does not match the owner of the data (" + data_owner + ").";
-        if (effective_user_id == 0)
-        {
-            message += " Run under 'sudo -u " + data_owner + "'.";
-            throw Exception::createDeprecated(message, ErrorCodes::MISMATCHING_USERS_FOR_PROCESS_AND_DATA);
-        }
-        else
-        {
-            LOG_WARNING(log, fmt::runtime(message));
-        }
-    }
+    assertProcessUserMatchesDataOwner(path, [&](const std::string & message){ LOG_WARNING(log, fmt::runtime(message)); });
 
     DB::ServerUUID::load(path + "/uuid", log);
 
@@ -445,6 +347,9 @@ try
         return tiny_context->getConfigRef();
     };
 
+    auto tcp_receive_timeout = config().getInt64("keeper_server.socket_receive_timeout_sec", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC);
+    auto tcp_send_timeout = config().getInt64("keeper_server.socket_send_timeout_sec", DBMS_DEFAULT_SEND_TIMEOUT_SEC);
+
     for (const auto & listen_host : listen_hosts)
     {
         /// TCP Keeper
@@ -453,8 +358,8 @@ try
         {
             Poco::Net::ServerSocket socket;
             auto address = socketBindListen(socket, listen_host, port);
-            socket.setReceiveTimeout(config().getUInt64("keeper_server.socket_receive_timeout_sec", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC));
-            socket.setSendTimeout(config().getUInt64("keeper_server.socket_send_timeout_sec", DBMS_DEFAULT_SEND_TIMEOUT_SEC));
+            socket.setReceiveTimeout(Poco::Timespan{tcp_receive_timeout, 0});
+            socket.setSendTimeout(Poco::Timespan{tcp_send_timeout, 0});
             servers->emplace_back(
                 listen_host,
                 port_name,
@@ -462,8 +367,7 @@ try
                 std::make_unique<TCPServer>(
                     new KeeperTCPHandlerFactory(
                         config_getter, tiny_context->getKeeperDispatcher(),
-                            config().getUInt64("keeper_server.socket_receive_timeout_sec", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC),
-                            config().getUInt64("keeper_server.socket_send_timeout_sec", DBMS_DEFAULT_SEND_TIMEOUT_SEC), false), server_pool, socket));
+                        tcp_receive_timeout, tcp_send_timeout, false), server_pool, socket));
         });
 
         const char * secure_port_name = "keeper_server.tcp_port_secure";
@@ -472,8 +376,8 @@ try
 #if USE_SSL
             Poco::Net::SecureServerSocket socket;
             auto address = socketBindListen(socket, listen_host, port, /* secure = */ true);
-            socket.setReceiveTimeout(config().getUInt64("keeper_server.socket_receive_timeout_sec", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC));
-            socket.setSendTimeout(config().getUInt64("keeper_server.socket_send_timeout_sec", DBMS_DEFAULT_SEND_TIMEOUT_SEC));
+            socket.setReceiveTimeout(Poco::Timespan{tcp_receive_timeout, 0});
+            socket.setSendTimeout(Poco::Timespan{tcp_send_timeout, 0});
             servers->emplace_back(
                 listen_host,
                 secure_port_name,
@@ -481,8 +385,7 @@ try
                 std::make_unique<TCPServer>(
                     new KeeperTCPHandlerFactory(
                         config_getter, tiny_context->getKeeperDispatcher(),
-                        config().getUInt64("keeper_server.socket_receive_timeout_sec", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC),
-                        config().getUInt64("keeper_server.socket_send_timeout_sec", DBMS_DEFAULT_SEND_TIMEOUT_SEC), true), server_pool, socket));
+                        tcp_receive_timeout, tcp_send_timeout, true), server_pool, socket));
 #else
             UNUSED(port);
             throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSL support for TCP protocol is disabled because Poco library was built without NetSSL support.");
@@ -490,26 +393,26 @@ try
         });
 
         const auto & config = config_getter();
+        auto http_context = httpContext();
         Poco::Timespan keep_alive_timeout(config.getUInt("keep_alive_timeout", 10), 0);
         Poco::Net::HTTPServerParams::Ptr http_params = new Poco::Net::HTTPServerParams;
-        http_params->setTimeout(DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC);
+        http_params->setTimeout(http_context->getReceiveTimeout());
         http_params->setKeepAliveTimeout(keep_alive_timeout);
 
         /// Prometheus (if defined and not setup yet with http_port)
         port_name = "prometheus.port";
-        createServer(listen_host, port_name, listen_try, [&](UInt16 port)
+        createServer(listen_host, port_name, listen_try, [&, my_http_context = std::move(http_context)](UInt16 port) mutable
         {
             Poco::Net::ServerSocket socket;
             auto address = socketBindListen(socket, listen_host, port);
-            auto http_context = httpContext();
-            socket.setReceiveTimeout(http_context->getReceiveTimeout());
-            socket.setSendTimeout(http_context->getSendTimeout());
+            socket.setReceiveTimeout(my_http_context->getReceiveTimeout());
+            socket.setSendTimeout(my_http_context->getSendTimeout());
             servers->emplace_back(
                 listen_host,
                 port_name,
                 "Prometheus: http://" + address.toString(),
                 std::make_unique<HTTPServer>(
-                    std::move(http_context), createPrometheusMainHandlerFactory(*this, config_getter(), async_metrics, "PrometheusHandler-factory"), server_pool, socket, http_params));
+                    std::move(my_http_context), createPrometheusMainHandlerFactory(*this, config_getter(), async_metrics, "PrometheusHandler-factory"), server_pool, socket, http_params));
         });
     }
 
diff --git a/programs/library-bridge/LibraryBridgeHandlers.cpp b/programs/library-bridge/LibraryBridgeHandlers.cpp
index ab81472be88..9642dd7ee63 100644
--- a/programs/library-bridge/LibraryBridgeHandlers.cpp
+++ b/programs/library-bridge/LibraryBridgeHandlers.cpp
@@ -158,6 +158,8 @@ void ExternalDictionaryLibraryBridgeRequestHandler::handleRequest(HTTPServerRequ
             if (cloned)
             {
                 writeStringBinary("1", out);
+                out.finalize();
+                return;
             }
             else
             {
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index 8e092bdf8e4..e026f87279a 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -26,12 +26,13 @@
 #include <Common/TLDListsHolder.h>
 #include <Common/quoteString.h>
 #include <Common/randomSeed.h>
+#include <Common/ThreadPool.h>
 #include <Loggers/Loggers.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/UseSSL.h>
-#include <IO/IOThreadPool.h>
+#include <IO/SharedThreadPools.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Common/ErrorHandlers.h>
@@ -133,6 +134,11 @@ void LocalServer::initialize(Poco::Util::Application & self)
         config().getUInt("max_io_thread_pool_size", 100),
         config().getUInt("max_io_thread_pool_free_size", 0),
         config().getUInt("io_thread_pool_queue_size", 10000));
+
+    OutdatedPartsLoadingThreadPool::initialize(
+        config().getUInt("max_outdated_parts_loading_thread_pool_size", 16),
+        0, // We don't need any threads one all the parts will be loaded
+        config().getUInt("outdated_part_loading_thread_pool_queue_size", 10000));
 }
 
 
@@ -600,13 +606,13 @@ void LocalServer::processConfig()
     String uncompressed_cache_policy = config().getString("uncompressed_cache_policy", "");
     size_t uncompressed_cache_size = config().getUInt64("uncompressed_cache_size", 0);
     if (uncompressed_cache_size)
-        global_context->setUncompressedCache(uncompressed_cache_size, uncompressed_cache_policy);
+        global_context->setUncompressedCache(uncompressed_cache_policy, uncompressed_cache_size);
 
     /// Size of cache for marks (index of MergeTree family of tables).
     String mark_cache_policy = config().getString("mark_cache_policy", "");
     size_t mark_cache_size = config().getUInt64("mark_cache_size", 5368709120);
     if (mark_cache_size)
-        global_context->setMarkCache(mark_cache_size, mark_cache_policy);
+        global_context->setMarkCache(mark_cache_policy, mark_cache_size);
 
     /// Size of cache for uncompressed blocks of MergeTree indices. Zero means disabled.
     size_t index_uncompressed_cache_size = config().getUInt64("index_uncompressed_cache_size", 0);
@@ -812,8 +818,16 @@ void LocalServer::readArguments(int argc, char ** argv, Arguments & common_argum
 {
     for (int arg_num = 1; arg_num < argc; ++arg_num)
     {
-        const char * arg = argv[arg_num];
-        common_arguments.emplace_back(arg);
+        std::string_view arg = argv[arg_num];
+        if (arg == "--multiquery" && (arg_num + 1) < argc && !std::string_view(argv[arg_num + 1]).starts_with('-'))
+        {
+            /// Transform the abbreviated syntax '--multiquery <SQL>' into the full syntax '--multiquery -q <SQL>'
+            ++arg_num;
+            arg = argv[arg_num];
+            addMultiquery(arg, common_arguments);
+        }
+        else
+            common_arguments.emplace_back(arg);
     }
 }
 
diff --git a/programs/obfuscator/Obfuscator.cpp b/programs/obfuscator/Obfuscator.cpp
index 274ad29a174..add16ec5205 100644
--- a/programs/obfuscator/Obfuscator.cpp
+++ b/programs/obfuscator/Obfuscator.cpp
@@ -30,7 +30,6 @@
 #include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Core/Block.h>
-#include <base/StringRef.h>
 #include <Common/DateLUT.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
diff --git a/programs/obfuscator/README.md b/programs/obfuscator/README.md
new file mode 100644
index 00000000000..371af6344ef
--- /dev/null
+++ b/programs/obfuscator/README.md
@@ -0,0 +1,354 @@
+## clickhouse-obfuscator — a tool for dataset anonymization
+
+### Installation And Usage
+
+```
+curl https://clickhouse.com/ | sh
+./clickhouse obfuscator --help
+```
+
+### Example
+
+```
+./clickhouse obfuscator --seed 123 --input-format TSV --output-format TSV \
+  --structure 'CounterID UInt32, URLDomain String, URL String, SearchPhrase String, Title String' \
+  < source.tsv > result.tsv 
+```
+
+
+### A long, long time ago...
+
+ClickHouse users already know that its biggest advantage is its high-speed processing of analytical queries. But claims like this need to be confirmed with reliable performance testing. That's what we want to talk about today.
+
+![benchmarks.png](https://clickhouse.com/uploads/benchmarks_24f1904cc9.png)
+
+We started running tests in 2013, long before ClickHouse was available as open source. Back then, our main concern was data processing speed for a web analytics product. We started storing this data, which we would later store in ClickHouse, in January 2009. Part of the data had been written to a database starting in 2012, and part was converted from OLAPServer and Metrage (data structures previously used by the solution). For testing, we took the first subset at random from data for 1 billion pageviews. Our web analytics platform didn't have any queries at that point, so we came up with queries that interested us, using all the possible ways to filter, aggregate, and sort the data.
+
+ClickHouse performance was compared with similar systems like Vertica and MonetDB. To avoid bias, testing was performed by an employee who hadn't participated in ClickHouse development, and special cases in the code were not optimized until all the results were obtained. We used the same approach to get a data set for functional testing.
+
+After ClickHouse was released as open source in 2016, people began questioning these tests.
+ 
+## Shortcomings of tests on private data
+ 
+Our performance tests:
+
+- Couldn't be reproduced independently because they used private data that can't be published. Some of the functional tests are not available to external users for the same reason.
+- Needed further development. The set of tests needed to be substantially expanded in order to isolate performance changes in individual parts of the system.
+- Didn't run on a per-commit basis or for individual pull requests. External developers couldn't check their code for performance regressions.
+
+We could solve these problems by throwing out the old tests and writing new ones based on open data, like [flight data for the USA](https://clickhouse.com/docs/en/getting-started/example-datasets/ontime/) and [taxi rides in New York](https://clickhouse.com/docs/en/getting-started/example-datasets/nyc-taxi). Or we could use benchmarks like TPC-H, TPC-DS, and [Star Schema Benchmark](https://clickhouse.com/docs/en/getting-started/example-datasets/star-schema). The disadvantage is that this data was very different from web analytics data, and we would rather keep the test queries.
+
+### Why it's important to use real data
+
+Performance should only be tested on real data from a production environment. Let's look at some examples.
+
+### Example 1
+
+Let's say you fill a database with evenly distributed pseudorandom numbers. Data compression isn't going to work in this case, although data compression is essential to analytical databases. There is no silver bullet solution to the challenge of choosing the right compression algorithm and the right way to integrate it into the system since data compression requires a compromise between the speed of compression and decompression and the potential compression efficiency. But systems that can't compress data are guaranteed losers. If your tests use evenly distributed pseudorandom numbers, this factor is ignored, and the results will be distorted.
+
+Bottom line: Test data must have a realistic compression ratio.
+
+### Example 2
+
+Let's say we are interested in the execution speed of this SQL query:
+
+```sql
+SELECT RegionID, uniq(UserID) AS visitors
+    FROM test.hits
+GROUP BY RegionID
+ORDER BY visitors DESC
+LIMIT 10
+```
+
+This was a typical query for web analytics product. What affects the processing speed?
+
+- How `GROUP BY` is executed.
+- Which data structure is used for calculating the `uniq` aggregate function.
+- How many different RegionIDs there are and how much RAM each state of the `uniq` function requires.
+
+But another important factor is that the amount of data is distributed unevenly between regions. (It probably follows a power law. I put the distribution on a log-log graph, but I can't say for sure.) If this is the case, the states of the `uniq` aggregate function with fewer values must use very little memory. When there are a lot of different aggregation keys, every single byte counts. How can we get generated data that has all these properties? The obvious solution is to use real data.
+
+Many DBMSs implement the HyperLogLog data structure for an approximation of COUNT(DISTINCT), but none of them work very well because this data structure uses a fixed amount of memory. ClickHouse has a function that uses [a combination of three different data structures](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqcombined), depending on the size of the data set.
+
+Bottom line: Test data must represent distribution properties of the real data well enough, meaning cardinality (number of distinct values per column) and cross-column cardinality (number of different values counted across several different columns).
+
+### Example 3
+
+Instead of testing the performance of the ClickHouse DBMS, let's take something simpler, like hash tables. For hash tables, it's essential to choose the right hash function. This is not as important for `std::unordered_map`, because it's a hash table based on chaining, and a prime number is used as the array size. The standard library implementation in GCC and Clang uses a trivial hash function as the default hash function for numeric types. However, `std::unordered_map` is not the best choice when we are looking for maximum speed. With an open-addressing hash table, we can't just use a standard hash function. Choosing the right hash function becomes the deciding factor.
+
+It's easy to find hash table performance tests using random data that don't take the hash functions used into account. Many hash function tests also focus on the calculation speed and certain quality criteria, even though they ignore the data structures used. But the fact is that hash tables and HyperLogLog require different hash function quality criteria.
+
+![alexey_chat.png](https://clickhouse.com/uploads/alexey_chat_3f8db88301.png)
+  
+## Challenge
+
+Our goal was to obtain data for testing performance that had the same structure as our web analytics data with all the properties that are important for benchmarks, but in such a way that there remain no traces of real website users in this data. In other words, the data must be anonymized and still preserve its:
+
+* Compression ratio.
+* Cardinality (the number of distinct values).
+* Mutual cardinality between several different columns.
+* Properties of probability distributions that can be used for data modeling (for example, if we believe that regions are distributed according to a power law, then the exponent — the distribution parameter — should be approximately the same for artificial data and for real data).
+
+How can we get a similar compression ratio for the data? If LZ4 is used, substrings in binary data must be repeated at approximately the same distance, and the repetitions must be approximately the same length. For ZSTD, entropy per byte must also coincide.
+
+The ultimate goal was to create a publicly available tool that anyone can use to anonymize their data sets for publication. This would allow us to debug and test performance on other people's data similar to our production data. We would also like the generated data to be interesting.
+
+However, these are very loosely-defined requirements, and we aren't planning to write up a formal problem statement or specification for this task.
+
+## Possible solutions
+
+I don't want to make it sound like this problem was particularly important. It was never actually included in planning, and no one had intentions to work on it. I hoped that an idea would come up someday, and suddenly I would be in a good mood and be able to put everything else off until later.
+
+### Explicit probabilistic models
+
+- We want to preserve the continuity of time series data. This means that for some types of data, we need to model the difference between neighboring values rather than the value itself.
+- To model "joint cardinality" of columns, we would also have to explicitly reflect dependencies between columns. For instance, there are usually very few IP addresses per user ID, so to generate an IP address, we would have to use a hash value of the user ID as a seed and add a small amount of other pseudorandom data.
+- We weren't sure how to express the dependency that the same user frequently visits URLs with matching domains at approximately the same time.
+
+All this can be written in a C++ "script" with the distributions and dependencies hard coded. However, Markov models are obtained from a combination of statistics with smoothing and adding noise. I started writing a script like this, but after writing explicit models for ten columns, it became unbearably boring — and the "hits" table in the web analytics product had more than 100 columns way back in 2012.
+
+```c++
+EventTime.day(std::discrete_distribution<>({
+    0, 0, 13, 30, 0, 14, 42, 5, 6, 31, 17, 0, 0, 0, 0, 23, 10, ...})(random));
+EventTime.hour(std::discrete_distribution<>({
+    13, 7, 4, 3, 2, 3, 4, 6, 10, 16, 20, 23, 24, 23, 18, 19, 19, ...})(random));
+EventTime.minute(std::uniform_int_distribution<UInt8>(0, 59)(random));
+EventTime.second(std::uniform_int_distribution<UInt8>(0, 59)(random));
+
+UInt64 UserID = hash(4, powerLaw(5000, 1.1));
+UserID = UserID / 10000000000ULL * 10000000000ULL
+    + static_cast<time_t>(EventTime) + UserID % 1000000;
+
+random_with_seed.seed(powerLaw(5000, 1.1));
+auto get_random_with_seed = [&]{ return random_with_seed(); };
+```
+
+Advantages:
+
+- Conceptual simplicity.
+
+Disadvantages:
+
+- A large amount of work is required.
+- The solution only applies to one type of data.
+
+And I preferred a more general solution that can be used for obfuscating any dataset.
+
+In any case, this solution could be improved. Instead of manually selecting models, we could implement a catalog of models and choose the best among them (best fit plus some form of regularization). Or maybe we could use Markov models for all types of fields, not just for text. Dependencies between data could also be extracted automatically. This would require calculating the [relative entropy](https://en.wikipedia.org/wiki/Kullback%E2%80%93Leibler_divergence) (the relative amount of information) between columns. A simpler alternative is to calculate relative cardinalities for each pair of columns (something like "how many different values of A are there on average for a fixed value B"). For instance, this will make it clear that `URLDomain` fully depends on the `URL`, and not vice versa.
+
+But I also rejected this idea because there are too many factors to consider, and it would take too long to write.
+ 
+### Neural networks
+ 
+As I've already mentioned, this task wasn't high on the priority list — no one was even thinking about trying to solve it. But as luck would have it, our colleague Ivan Puzirevsky was teaching at the Higher School of Economics. He asked me if I had any interesting problems that would work as suitable thesis topics for his students. When I offered him this one, he assured me it had potential. So I handed this challenge off to a nice guy "off the street" Sharif (he did have to sign an NDA to access the data, though).
+
+I shared all my ideas with him but emphasized that there were no restrictions on how the problem could be solved, and a good option would be to try approaches that I know nothing about, like using LSTM to generate a text dump of data. This seemed promising after coming across the article [The Unreasonable Effectiveness of Recurrent Neural Networks](http://karpathy.github.io/2015/05/21/rnn-effectiveness/).
+
+The first challenge is that we need to generate structured data, not just text. But it wasn't clear whether a recurrent neural network could generate data with the desired structure. There are two ways to solve this. The first solution is to use separate models for generating the structure and the "filler", and only use the neural network for generating values. But this approach was postponed and then never completed. The second solution is to simply generate a TSV dump as text. Experience has shown that some of the rows in the text won't match the structure, but these rows can be thrown out when loading the data.
+
+The second challenge is that the recurrent neural network generates a sequence of data, and thus dependencies in data must follow in the order of the sequence. But in our data, the order of columns can potentially be in reverse to dependencies between them. We didn't do anything to resolve this problem.
+
+As summer approached, we had the first working Python script that generated data. The data quality seemed decent at first glance:
+
+![python_script.jpg](https://clickhouse.com/uploads/python_script_810d491dfb.jpg)
+
+However, we did run into some difficulties:
+
+1. The size of the model was about a gigabyte. We tried to create a model for data that was several gigabytes in size (for a start). The fact that the resulting model is so large raised concerns. Would it be possible to extract the real data that it was trained on? Unlikely. But I don't know much about machine learning and neural networks, and I haven't read this developer's Python code, so how can I be sure? There were several articles published at the time about how to compress neural networks without loss of quality, but it wasn't implemented. On the one hand, this doesn't seem to be a serious problem since we can opt out of publishing the model and just publish the generated data. On the other hand, if overfitting occurs, the generated data may contain some part of the source data.
+
+2. On a machine with a single CPU, the data generation speed is approximately 100 rows per second. Our goal was to generate at least a billion rows. Calculations showed that this wouldn't be completed before the date of the thesis defense. It didn't make sense to use additional hardware because the goal was to make a data generation tool that anyone could use.
+
+Sharif tried to analyze the quality of data by comparing statistics. Among other things, he calculated the frequency of different characters occurring in the source data and in the generated data. The result was stunning: the most frequent characters were Ð and Ñ.
+
+Don't worry about Sharif, though. He successfully defended his thesis, and we happily forgot about the whole thing.
+
+### Mutation of compressed data
+
+Let's assume that the problem statement has been reduced to a single point: we need to generate data that has the same compression ratio as the source data, and the data must decompress at the same speed. How can we achieve this? We need to edit compressed data bytes directly! This allows us to change the data without changing the size of the compressed data, plus everything will work fast. I wanted to try out this idea right away, despite the fact that the problem it solves is different from what we started with. But that's how it always is.
+
+So how do we edit a compressed file? Let's say we are only interested in LZ4. LZ4 compressed data is composed of sequences, which in turn are strings of not-compressed bytes (literals), followed by a match copy:
+
+1. Literals (copy the following N bytes as is).
+2. Matches with a minimum repeat length of 4 (repeat N bytes in the file at a distance of M).
+
+Source data:
+
+`Hello world Hello.`
+
+Compressed data (arbitrary example):
+
+`literals 12 "Hello world " match 5 12.`
+
+In the compressed file, we leave "match" as-is and change the byte values in "literals". As a result, after decompressing, we get a file in which all repeating sequences at least 4 bytes long are also repeated at the same distance, but they consist of a different set of bytes (basically, the modified file doesn't contain a single byte that was taken from the source file).
+
+But how do we change the bytes? The answer isn't obvious because, in addition to the column types, the data also has its own internal, implicit structure that we would like to preserve. For example, text data is often stored in UTF-8 encoding, and we want the generated data also to be valid UTF-8. I developed a simple heuristic that involves meeting several criteria:
+
+- Null bytes and ASCII control characters are kept as-is.
+- Some punctuation characters remain as-is.
+- ASCII is converted to ASCII, and for everything else, the most significant bit is preserved (or an explicit set of "if" statements is written for different UTF-8 lengths). In one byte class, a new value is picked uniformly at random.
+- Fragments like `https://` are preserved; otherwise, it looks a bit silly.
+
+The only caveat to this approach is that the data model is the source data itself, which means it cannot be published. The model is only fit for generating amounts of data no larger than the source. On the contrary, the previous approaches provide models allowing the generation of data of arbitrary size.
+
+```
+http://ljc.she/kdoqdqwpgafe/klwlpm&qw=962788775I0E7bs7OXeAyAx
+http://ljc.she/kdoqdqwdffhant.am/wcpoyodjit/cbytjgeoocvdtclac
+http://ljc.she/kdoqdqwpgafe/klwlpm&qw=962788775I0E7bs7OXe
+http://ljc.she/kdoqdqwdffhant.am/wcpoyodjit/cbytjgeoocvdtclac
+http://ljc.she/kdoqdqwdbknvj.s/hmqhpsavon.yf#aortxqdvjja
+http://ljc.she/kdoqdqw-bknvj.s/hmqhpsavon.yf#aortxqdvjja
+http://ljc.she/kdoqdqwpdtu-Unu-Rjanjna-bbcohu_qxht
+http://ljc.she/kdoqdqw-bknvj.s/hmqhpsavon.yf#aortxqdvjja
+http://ljc.she/kdoqdqwpdtu-Unu-Rjanjna-bbcohu_qxht
+http://ljc.she/kdoqdqw-bknvj.s/hmqhpsavon.yf#aortxqdvjja
+http://ljc.she/kdoqdqwpdtu-Unu-Rjanjna-bbcohu-702130
+```
+
+The results were positive, and the data was interesting, but something wasn't quite right. The URLs kept the same structure, but in some of them, it was too easy to recognize the original terms, such as "avito" (a popular marketplace in Russia), so I created a heuristic that swapped some of the bytes around.
+
+There were other concerns as well. For example, sensitive information could possibly reside in a FixedString column in binary representation and potentially consist of ASCII control characters and punctuation, which I decided to preserve. However, I didn't take data types into consideration.
+
+Another problem is that if a column stores data in the "length, value" format (this is how String columns are stored), how do I ensure that the length remains correct after the mutation? When I tried to fix this, I immediately lost interest.
+
+### Random permutations
+
+Unfortunately, the problem wasn't solved. We performed a few experiments, and it just got worse. The only thing left was to sit around doing nothing and surf the web randomly since the magic was gone. Luckily, I came across a page that [explained the algorithm](http://fabiensanglard.net/fizzlefade/index.php) for rendering the death of the main character in the game Wolfenstein 3D.
+
+<img src="https://clickhouse.com/uploads/wolfenstein_bb259bd741.gif" alt="wolfenstein.gif" style="width: 764px;">
+
+<br/> 
+
+The animation is really well done — the screen fills up with blood. The article explains that this is actually a pseudorandom permutation. A random permutation of a set of elements is a randomly picked bijective (one-to-one) transformation of the set. In other words, a mapping where each and every derived element corresponds to exactly one original element (and vice versa). In other words, it is a way to randomly iterate through all the elements of a data set. And that is exactly the process shown in the picture: each pixel is filled in random order, without any repetition. If we were to just choose a random pixel at each step, it would take a long time to get to the last one.
+
+The game uses a very simple algorithm for pseudorandom permutation called linear feedback shift register ([LFSR](https://en.wikipedia.org/wiki/Linear-feedback_shift_register)). Similar to pseudorandom number generators, random permutations, or rather their families, can be cryptographically strong when parametrized by a key. This is exactly what we needed for our data transformation. However, the details were trickier. For example, cryptographically strong encryption of N bytes to N bytes with a pre-determined key and initialization vector seems like it would work for a pseudorandom permutation of a set of N-byte strings. Indeed, this is a one-to-one transformation, and it appears to be random. But if we use the same transformation for all of our data, the result may be susceptible to cryptoanalysis because the same initialization vector and key value are used multiple times. This is similar to the [Electronic Codebook](https://en.wikipedia.org/wiki/Block_cipher_mode_of_operation#ECB) mode of operation for a block cipher.
+
+For example, three multiplications and two xorshift operations are used for the [murmurhash](https://github.com/ClickHouse/ClickHouse/blob/master/dbms/src/Common/HashTable/Hash.h#L18) finalizer. This operation is a pseudorandom permutation. However, I should point out that hash functions don't have to be one-to-one (even hashes of N bits to N bits).
+
+Or here's another interesting [example from elementary number theory](https://preshing.com/20121224/how-to-generate-a-sequence-of-unique-random-integers/) from Jeff Preshing's website.
+
+How can we use pseudorandom permutations to solve our problem? We can use them to transform all numeric fields so we can preserve the cardinalities and mutual cardinalities of all combinations of fields. In other words, COUNT(DISTINCT) will return the same value as before the transformation and, furthermore, with any GROUP BY.
+
+It is worth noting that preserving all cardinalities somewhat contradicts our goal of data anonymization. Let's say someone knows that the source data for site sessions contains a user who visited sites from 10 different countries, and they want to find that user in the transformed data. The transformed data also shows that the user visited sites from 10 different countries, which makes it easy to narrow down the search. However, even if they find out what the user was transformed into, it won't be very useful; all of the other data has also been transformed, so they won't be able to figure out what sites the user visited or anything else. But these rules can be applied in a chain. For example, suppose someone knows that the most frequently occurring website in our data is Google, with Yahoo in second place. In that case, they can use the ranking to determine which transformed site identifiers actually mean Yahoo and Google. There's nothing surprising about this since we are working with an informal problem statement, and we are trying to find a balance between the anonymization of data (hiding information) and preserving data properties (disclosure of information). For information about how to approach the data anonymization issue more reliably, read this [article](https://medium.com/georgian-impact-blog/a-brief-introduction-to-differential-privacy-eacf8722283b).
+
+In addition to keeping the original cardinality of values, I also wanted to keep the order of magnitude of the values. What I mean is that if the source data contained numbers under 10, then I want the transformed numbers to also be small. How can we achieve this?
+
+For example, we can divide a set of possible values into size classes and perform permutations within each class separately (maintaining the size classes). The easiest way to do this is to take the nearest power of two or the position of the most significant bit in the number as the size class (these are the same thing). The numbers 0 and 1 will always remain as is. The numbers 2 and 3 will sometimes remain as is (with a probability of 1/2) and will sometimes be swapped (with a probability of 1/2). The set of numbers 1024..2047 will be mapped to one of 1024! (factorial) variants, and so on. For signed numbers, we will keep the sign.
+
+It's also doubtful whether we need a one-to-one function. We can probably just use a cryptographically strong hash function. The transformation won't be one-to-one, but the cardinality will be close to the same.
+
+However, we need a cryptographically strong random permutation so that when we define a key and derive a permutation with that key, restoring the original data from the rearranged data without knowing the key would be difficult.
+
+There is one problem: in addition to knowing nothing about neural networks and machine learning, I am also quite ignorant when it comes to cryptography. That leaves just my courage. I was still reading random web pages and found a link on [Hackers News](https://news.ycombinator.com/item?id=15122540) to a discussion on Fabien Sanglard's page. It had a link to a [blog post](http://antirez.com/news/113) by Redis developer Salvatore Sanfilippo that talked about using a wonderful generic way of getting random permutations, known as a [Feistel network](https://en.wikipedia.org/wiki/Feistel_cipher).
+
+The Feistel network is iterative, consisting of rounds. Each round is a remarkable transformation that allows you to get a one-to-one function from any function. Let's look at how it works.
+
+1. The argument's bits are divided into two halves:
+```
+ arg: xxxxyyyy
+ arg_l: xxxx
+ arg_r: yyyy
+```
+2. The right half replaces the left. In its place, we put the result of XOR on the initial value of the left half and the result of the function applied to the initial value of the right half, like this:
+
+ ```
+ res: yyyyzzzz
+ res_l = yyyy = arg_r
+ res_r = zzzz = arg_l ^ F(arg_r)
+```
+
+There is also a claim that if we use a cryptographically strong pseudorandom function for F and apply a Feistel round at least four times, we'll get a cryptographically strong pseudorandom permutation.
+
+This is like a miracle: we take a function that produces random garbage based on data, insert it into the Feistel network, and we now have a function that produces random garbage based on data, but yet is invertible!
+
+The Feistel network is at the heart of several data encryption algorithms. What we're going to do is something like encryption, only it's really bad. There are two reasons for this:
+
+1. We are encrypting individual values independently and in the same way, similar to the Electronic Codebook mode of operation.
+2. We are storing information about the order of magnitude (the nearest power of two) and the sign of the value, which means that some values do not change at all.
+
+This way, we can obfuscate numeric fields while preserving the properties we need. For example, after using LZ4, the compression ratio should remain approximately the same because the duplicate values in the source data will be repeated in the converted data and at the same distances from each other.
+
+### Markov models
+
+Text models are used for data compression, predictive input, speech recognition, and random string generation. A text model is a probability distribution of all possible strings. Let's say we have an imaginary probability distribution of the texts of all the books that humanity could ever write. To generate a string, we just take a random value with this distribution and return the resulting string (a random book that humanity could write). But how do we find out the probability distribution of all possible strings?
+
+First, this would require too much information. There are 256^10 possible strings that are 10 bytes in length, and it would take quite a lot of memory to explicitly write a table with the probability of each string. Second, we don't have enough statistics to accurately assess the distribution.
+
+This is why we use a probability distribution obtained from rough statistics as the text model. For example, we could calculate the probability of each letter occurring in the text and then generate strings by selecting each next letter with the same probability. This primitive model works, but the strings are still very unnatural.
+
+To improve the model slightly, we could also make use of the conditional probability of the letter's occurrence if it is preceded by N-specific letters. N is a pre-set constant. Let's say N = 5, and we are calculating the probability of the letter "e" occurring after the letters "compr". This text model is called an Order-N Markov model.
+
+```
+P(cata | cat) = 0.8
+P(catb | cat) = 0.05
+P(catc | cat) = 0.1
+...
+```
+
+Let's look at how Markov models work on the website [of Hay Kranen](https://projects.haykranen.nl/markov/demo/). Unlike LSTM neural networks, the models only have enough memory for a small context of fixed-length N, so they generate funny nonsensical texts. Markov models are also used in primitive methods for generating spam, and the generated texts can be easily distinguished from real ones by counting statistics that don't fit the model. There is one advantage: Markov models work much faster than neural networks, which is exactly what we need.
+
+Example for Title (our examples are in Turkish because of the data used):
+
+<blockquote style="font-size: 15px;">
+  <p>Hyunday Butter'dan anket shluha — Politika head manşetleri | STALKER BOXER Çiftede book — Yanudistkarışmanlı Mı Kanal | League el Digitalika Haberler Haberleri — Haberlerisi — Hotels with Centry'ler Neden babah.com</p>
+</blockquote>
+
+We can calculate statistics from the source data, create a Markov model, and generate new data. Note that the model needs smoothing to avoid disclosing information about rare combinations in the source data, but this is not a problem. We use a combination of models from 0 to N. If statistics are insufficient for order N, the N−1 model is used instead.
+
+But we still want to preserve the cardinality of data. In other words, if the source data had 123456 unique URL values, the result should have approximately the same number of unique values. We can use a deterministically initialized random number generator to achieve this. The easiest way is to use a hash function and apply it to the original value. In other words, we get a pseudorandom result that is explicitly determined by the original value.
+
+Another requirement is that the source data may have many different URLs that start with the same prefix but aren't identical. For example: `https://www.clickhouse.com/images/cats/?id=xxxxxx`. We want the result to also have URLs that all start with the same prefix, but a different one. For example: http://ftp.google.kz/cgi-bin/index.phtml?item=xxxxxx. As a random number generator for generating the next character using a Markov model, we'll take a hash function from a moving window of 8 bytes at the specified position (instead of taking it from the entire string).
+
+<pre class='code-with-play'>
+<div class='code'>
+https://www.clickhouse.com/images/cats/?id=12345
+                      ^^^^^^^^
+
+distribution: [aaaa][b][cc][dddd][e][ff][ggggg][h]...
+hash("images/c") % total_count:             ^
+</div>
+</pre>
+
+ It turns out to be exactly what we need. Here's the example of page titles:
+ 
+<pre class='code-with-play'>
+<div class='code'>
+PhotoFunia - Haber7 - Have mükemment.net Oynamak içinde şaşıracak haber, Oyunu Oynanılmaz • apród.hu kínálatában - RT Arabic
+PhotoFunia - Kinobar.Net - apród: Ingyenes | Posti
+PhotoFunia - Peg Perfeo - Castika, Sıradışı Deniz Lokoning Your Code, sire Eminema.tv/
+PhotoFunia - TUT.BY - Your Ayakkanın ve Son Dakika Spor,
+PhotoFunia - big film izle, Del Meireles offilim, Samsung DealeXtreme Değerler NEWSru.com.tv, Smotri.com Mobile yapmak Okey
+PhotoFunia 5 | Galaxy, gt, după ce anal bilgi yarak Ceza RE050A V-Stranç
+PhotoFunia :: Miami olacaksını yerel Haberler Oyun Young video
+PhotoFunia Monstelli'nin En İyi kisa.com.tr –Star Thunder Ekranı
+PhotoFunia Seks - Politika,Ekonomi,Spor GTA SANAYİ VE
+PhotoFunia Taker-Rating Star TV Resmi Söylenen Yatağa każdy dzież wierzchnie
+PhotoFunia TourIndex.Marketime oyunu Oyna Geldolları Mynet Spor,Magazin,Haberler yerel Haberleri ve Solvia, korkusuz Ev SahneTv
+PhotoFunia todo in the Gratis Perky Parti'nin yapıyı by fotogram
+PhotoFunian Dünyasın takımız halles en kulları - TEZ
+</div>
+</pre>
+
+## Results
+
+After trying four methods, I got so tired of this problem that it was time just to choose something, make it into a usable tool, and announce the solution. I chose the solution that uses random permutations and Markov models parametrized by a key. It is implemented as the clickhouse-obfuscator program, which is very easy to use. The input is a table dump in any supported format (such as CSV or JSONEachRow), and the command line parameters specify the table structure (column names and types) and the secret key (any string, which you can forget immediately after use). The output is the same number of rows of obfuscated data.
+
+The program is installed with `clickhouse-client`, has no dependencies, and works on almost any flavor of Linux. You can apply it to any database dump, not just ClickHouse. For instance, you can generate test data from MySQL or PostgreSQL databases or create development databases that are similar to your production databases.
+ 
+```bash
+clickhouse-obfuscator \
+    --seed "$(head -c16 /dev/urandom | base64)" \
+    --input-format TSV --output-format TSV \
+    --structure 'CounterID UInt32, URLDomain String, \
+        URL String, SearchPhrase String, Title String' \
+    < table.tsv > result.tsv
+```
+ 
+```bash
+ clickhouse-obfuscator --help
+```
+
+Of course, everything isn't so cut and dry because data transformed by this program is almost completely reversible. The question is whether it is possible to perform the reverse transformation without knowing the key. If the transformation used a cryptographic algorithm, this operation would be as difficult as a brute-force search. Although the transformation uses some cryptographic primitives, they are not used in the correct way, and the data is susceptible to certain methods of analysis. To avoid problems, these issues are covered in the documentation for the program (access it using --help).
+ 
+In the end, we transformed the data set we needed [for functional and performance testing](https://clickhouse.com/docs/en/getting-started/example-datasets/metrica/), and received approval from our data security team to publish.
+
+Our developers and members of our community use this data for real performance testing when optimizing algorithms inside ClickHouse. Third-party users can provide us with their obfuscated data so that we can make ClickHouse even faster for them. We also released an independent open benchmark for hardware and cloud providers on top of this data: [https://benchmark.clickhouse.com/](https://benchmark.clickhouse.com/)
diff --git a/programs/odbc-bridge/CMakeLists.txt b/programs/odbc-bridge/CMakeLists.txt
index f649e81c50a..118610e4dcd 100644
--- a/programs/odbc-bridge/CMakeLists.txt
+++ b/programs/odbc-bridge/CMakeLists.txt
@@ -35,10 +35,6 @@ target_link_libraries(clickhouse-odbc-bridge PRIVATE
 set_target_properties(clickhouse-odbc-bridge PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
 target_compile_options (clickhouse-odbc-bridge PRIVATE -Wno-reserved-id-macro -Wno-keyword-macro)
 
-if (USE_GDB_ADD_INDEX)
-    add_custom_command(TARGET clickhouse-odbc-bridge POST_BUILD COMMAND ${GDB_ADD_INDEX_EXE} ../clickhouse-odbc-bridge COMMENT "Adding .gdb-index to clickhouse-odbc-bridge" VERBATIM)
-endif()
-
 if (SPLIT_DEBUG_SYMBOLS)
     clickhouse_split_debug_symbols(TARGET clickhouse-odbc-bridge DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/../${SPLITTED_DEBUG_SYMBOLS_DIR} BINARY_PATH ../clickhouse-odbc-bridge)
 else()
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index 6e93246e59a..147ba43a51d 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -30,7 +30,7 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
+    extern const int UNKNOWN_TABLE;
     extern const int BAD_ARGUMENTS;
 }
 
@@ -180,8 +180,19 @@ void ODBCColumnsInfoHandler::handleRequest(HTTPServerRequest & request, HTTPServ
             columns.emplace_back(column_name, std::move(column_type));
         }
 
+        /// Usually this should not happen, since in case of table does not
+        /// exists, the call should be succeeded.
+        /// However it is possible sometimes because internally there are two
+        /// queries in ClickHouse ODBC bridge:
+        /// - system.tables
+        /// - system.columns
+        /// And if between this two queries the table will be removed, them
+        /// there will be no columns
+        ///
+        /// Also sometimes system.columns can return empty result because of
+        /// the cached value of total tables to scan.
         if (columns.empty())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Columns definition was not returned");
+            throw Exception(ErrorCodes::UNKNOWN_TABLE, "Columns definition was not returned");
 
         WriteBufferFromHTTPServerResponse out(
             response,
diff --git a/programs/self-extracting/CMakeLists.txt b/programs/self-extracting/CMakeLists.txt
index 2cc26926b38..f3ff0bbcd78 100644
--- a/programs/self-extracting/CMakeLists.txt
+++ b/programs/self-extracting/CMakeLists.txt
@@ -4,10 +4,10 @@ if (NOT(
         AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR
     )
 )
-    set (COMPRESSOR "${CMAKE_BINARY_DIR}/native/utils/self-extracting-executable/pre_compressor")
-    set (DECOMPRESSOR "--decompressor=${CMAKE_BINARY_DIR}/utils/self-extracting-executable/decompressor")
+    set (COMPRESSOR "${PROJECT_BINARY_DIR}/native/utils/self-extracting-executable/pre_compressor")
+    set (DECOMPRESSOR "--decompressor=${PROJECT_BINARY_DIR}/utils/self-extracting-executable/decompressor")
 else ()
-    set (COMPRESSOR "${CMAKE_BINARY_DIR}/utils/self-extracting-executable/compressor")
+    set (COMPRESSOR "${PROJECT_BINARY_DIR}/utils/self-extracting-executable/compressor")
 endif ()
 
 add_custom_target (self-extracting ALL
diff --git a/programs/server/MetricsTransmitter.cpp b/programs/server/MetricsTransmitter.cpp
index 2f28f0a1d16..ae9fa5ecc2c 100644
--- a/programs/server/MetricsTransmitter.cpp
+++ b/programs/server/MetricsTransmitter.cpp
@@ -87,7 +87,7 @@ void MetricsTransmitter::transmit(std::vector<ProfileEvents::Count> & prev_count
 
     if (send_events)
     {
-        for (size_t i = 0, end = ProfileEvents::end(); i < end; ++i)
+        for (ProfileEvents::Event i = ProfileEvents::Event(0), end = ProfileEvents::end(); i < end; ++i)
         {
             const auto counter = ProfileEvents::global_counters[i].load(std::memory_order_relaxed);
             const auto counter_increment = counter - prev_counters[i];
@@ -100,7 +100,7 @@ void MetricsTransmitter::transmit(std::vector<ProfileEvents::Count> & prev_count
 
     if (send_events_cumulative)
     {
-        for (size_t i = 0, end = ProfileEvents::end(); i < end; ++i)
+        for (ProfileEvents::Event i = ProfileEvents::Event(0), end = ProfileEvents::end(); i < end; ++i)
         {
             const auto counter = ProfileEvents::global_counters[i].load(std::memory_order_relaxed);
             std::string key{ProfileEvents::getName(static_cast<ProfileEvents::Event>(i))};
@@ -110,7 +110,7 @@ void MetricsTransmitter::transmit(std::vector<ProfileEvents::Count> & prev_count
 
     if (send_metrics)
     {
-        for (size_t i = 0, end = CurrentMetrics::end(); i < end; ++i)
+        for (CurrentMetrics::Metric i = CurrentMetrics::Metric(0), end = CurrentMetrics::end(); i < end; ++i)
         {
             const auto value = CurrentMetrics::values[i].load(std::memory_order_relaxed);
 
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 1486a51c710..03ada89e86f 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -27,7 +27,6 @@
 #include <Common/ConcurrencyControl.h>
 #include <Common/Macros.h>
 #include <Common/ShellCommand.h>
-#include <Common/StringUtils/StringUtils.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperNodeCache.h>
 #include <Common/getMultipleKeysFromConfig.h>
@@ -40,10 +39,13 @@
 #include <Common/remapExecutable.h>
 #include <Common/TLDListsHolder.h>
 #include <Common/Config/AbstractConfigurationComparison.h>
+#include <Common/assertProcessUserMatchesDataOwner.h>
+#include <Common/makeSocketAddress.h>
+#include <Server/waitServersToFinish.h>
 #include <Core/ServerUUID.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromFile.h>
-#include <IO/IOThreadPool.h>
+#include <IO/SharedThreadPools.h>
 #include <IO/UseSSL.h>
 #include <Interpreters/ServerAsynchronousMetrics.h>
 #include <Interpreters/DDLWorker.h>
@@ -66,7 +68,6 @@
 #include <TableFunctions/registerTableFunctions.h>
 #include <Formats/registerFormats.h>
 #include <Storages/registerStorages.h>
-#include <QueryPipeline/ConnectionCollector.h>
 #include <Dictionaries/registerDictionaries.h>
 #include <Disks/registerDisks.h>
 #include <IO/Resource/registerSchedulerNodes.h>
@@ -99,9 +100,7 @@
 #include "config_version.h"
 
 #if defined(OS_LINUX)
-#    include <cstddef>
 #    include <cstdlib>
-#    include <sys/socket.h>
 #    include <sys/un.h>
 #    include <sys/mman.h>
 #    include <sys/ptrace.h>
@@ -109,7 +108,6 @@
 #endif
 
 #if USE_SSL
-#    include <Poco/Net/Context.h>
 #    include <Poco/Net/SecureServerSocket.h>
 #endif
 
@@ -135,6 +133,7 @@ namespace CurrentMetrics
     extern const Metric Revision;
     extern const Metric VersionInteger;
     extern const Metric MemoryTracking;
+    extern const Metric MergesMutationsMemoryTracking;
     extern const Metric MaxDDLEntryID;
     extern const Metric MaxPushedDDLEntryID;
 }
@@ -204,40 +203,6 @@ int mainEntryClickHouseServer(int argc, char ** argv)
     }
 }
 
-
-namespace
-{
-
-size_t waitServersToFinish(std::vector<DB::ProtocolServerAdapter> & servers, size_t seconds_to_wait)
-{
-    const size_t sleep_max_ms = 1000 * seconds_to_wait;
-    const size_t sleep_one_ms = 100;
-    size_t sleep_current_ms = 0;
-    size_t current_connections = 0;
-    for (;;)
-    {
-        current_connections = 0;
-
-        for (auto & server : servers)
-        {
-            server.stop();
-            current_connections += server.currentConnections();
-        }
-
-        if (!current_connections)
-            break;
-
-        sleep_current_ms += sleep_one_ms;
-        if (sleep_current_ms < sleep_max_ms)
-            std::this_thread::sleep_for(std::chrono::milliseconds(sleep_one_ms));
-        else
-            break;
-    }
-    return current_connections;
-}
-
-}
-
 namespace DB
 {
 
@@ -248,8 +213,6 @@ namespace ErrorCodes
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
     extern const int INVALID_CONFIG_PARAMETER;
-    extern const int FAILED_TO_GETPWUID;
-    extern const int MISMATCHING_USERS_FOR_PROCESS_AND_DATA;
     extern const int NETWORK_ERROR;
     extern const int CORRUPTED_DATA;
 }
@@ -265,54 +228,6 @@ static std::string getCanonicalPath(std::string && path)
     return std::move(path);
 }
 
-static std::string getUserName(uid_t user_id)
-{
-    /// Try to convert user id into user name.
-    auto buffer_size = sysconf(_SC_GETPW_R_SIZE_MAX);
-    if (buffer_size <= 0)
-        buffer_size = 1024;
-    std::string buffer;
-    buffer.reserve(buffer_size);
-
-    struct passwd passwd_entry;
-    struct passwd * result = nullptr;
-    const auto error = getpwuid_r(user_id, &passwd_entry, buffer.data(), buffer_size, &result);
-
-    if (error)
-        throwFromErrno("Failed to find user name for " + toString(user_id), ErrorCodes::FAILED_TO_GETPWUID, error);
-    else if (result)
-        return result->pw_name;
-    return toString(user_id);
-}
-
-Poco::Net::SocketAddress makeSocketAddress(const std::string & host, UInt16 port, Poco::Logger * log)
-{
-    Poco::Net::SocketAddress socket_address;
-    try
-    {
-        socket_address = Poco::Net::SocketAddress(host, port);
-    }
-    catch (const Poco::Net::DNSException & e)
-    {
-        const auto code = e.code();
-        if (code == EAI_FAMILY
-#if defined(EAI_ADDRFAMILY)
-                    || code == EAI_ADDRFAMILY
-#endif
-           )
-        {
-            LOG_ERROR(log, "Cannot resolve listen_host ({}), error {}: {}. "
-                "If it is an IPv6 address and your host has disabled IPv6, then consider to "
-                "specify IPv4 address to listen in <listen_host> element of configuration "
-                "file. Example: <listen_host>0.0.0.0</listen_host>",
-                host, e.code(), e.message());
-        }
-
-        throw;
-    }
-    return socket_address;
-}
-
 Poco::Net::SocketAddress Server::socketBindListen(
     const Poco::Util::AbstractConfiguration & config,
     Poco::Net::ServerSocket & socket,
@@ -773,6 +688,16 @@ try
         server_settings.max_io_thread_pool_free_size,
         server_settings.io_thread_pool_queue_size);
 
+    BackupsIOThreadPool::initialize(
+        server_settings.max_backups_io_thread_pool_size,
+        server_settings.max_backups_io_thread_pool_free_size,
+        server_settings.backups_io_thread_pool_queue_size);
+
+    OutdatedPartsLoadingThreadPool::initialize(
+        server_settings.max_outdated_parts_loading_thread_pool_size,
+        0, // We don't need any threads one all the parts will be loaded
+        server_settings.outdated_part_loading_thread_pool_queue_size);
+
     /// Initialize global local cache for remote filesystem.
     if (config().has("local_cache_for_remote_fs"))
     {
@@ -810,9 +735,8 @@ try
         }
     );
 
-    ConnectionCollector::init(global_context, server_settings.max_threads_for_connection_collector);
-
-    bool has_zookeeper = config().has("zookeeper");
+    zkutil::validateZooKeeperConfig(config());
+    bool has_zookeeper = zkutil::hasZooKeeperConfig(config());
 
     zkutil::ZooKeeperNodeCache main_config_zk_node_cache([&] { return global_context->getZooKeeper(); });
     zkutil::EventPtr main_config_zk_changed_event = std::make_shared<Poco::Event>();
@@ -954,30 +878,13 @@ try
     std::string default_database = server_settings.default_database.toString();
 
     /// Check that the process user id matches the owner of the data.
-    const auto effective_user_id = geteuid();
-    struct stat statbuf;
-    if (stat(path_str.c_str(), &statbuf) == 0 && effective_user_id != statbuf.st_uid)
-    {
-        const auto effective_user = getUserName(effective_user_id);
-        const auto data_owner = getUserName(statbuf.st_uid);
-        std::string message = "Effective user of the process (" + effective_user +
-            ") does not match the owner of the data (" + data_owner + ").";
-        if (effective_user_id == 0)
-        {
-            message += " Run under 'sudo -u " + data_owner + "'.";
-            throw Exception::createDeprecated(message, ErrorCodes::MISMATCHING_USERS_FOR_PROCESS_AND_DATA);
-        }
-        else
-        {
-            global_context->addWarningMessage(message);
-        }
-    }
+    assertProcessUserMatchesDataOwner(path_str, [&](const std::string & message){ global_context->addWarningMessage(message); });
 
     global_context->setPath(path_str);
 
     StatusFile status{path / "status", StatusFile::write_full_info};
 
-    DB::ServerUUID::load(path / "uuid", log);
+    ServerUUID::load(path / "uuid", log);
 
     /// Try to increase limit on number of open files.
     {
@@ -1188,12 +1095,12 @@ try
         {
             Settings::checkNoSettingNamesAtTopLevel(*config, config_path);
 
-            ServerSettings server_settings;
-            server_settings.loadSettingsFromConfig(*config);
+            ServerSettings server_settings_;
+            server_settings_.loadSettingsFromConfig(*config);
 
-            size_t max_server_memory_usage = server_settings.max_server_memory_usage;
+            size_t max_server_memory_usage = server_settings_.max_server_memory_usage;
 
-            double max_server_memory_usage_to_ram_ratio = server_settings.max_server_memory_usage_to_ram_ratio;
+            double max_server_memory_usage_to_ram_ratio = server_settings_.max_server_memory_usage_to_ram_ratio;
             size_t default_max_server_memory_usage = static_cast<size_t>(memory_amount * max_server_memory_usage_to_ram_ratio);
 
             if (max_server_memory_usage == 0)
@@ -1221,7 +1128,26 @@ try
             total_memory_tracker.setDescription("(total)");
             total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
 
-            total_memory_tracker.setAllowUseJemallocMemory(server_settings.allow_use_jemalloc_memory);
+            size_t merges_mutations_memory_usage_soft_limit = server_settings_.merges_mutations_memory_usage_soft_limit;
+
+            size_t default_merges_mutations_server_memory_usage = static_cast<size_t>(memory_amount * server_settings_.merges_mutations_memory_usage_to_ram_ratio);
+            if (merges_mutations_memory_usage_soft_limit == 0 || merges_mutations_memory_usage_soft_limit > default_merges_mutations_server_memory_usage)
+            {
+                merges_mutations_memory_usage_soft_limit = default_merges_mutations_server_memory_usage;
+                LOG_WARNING(log, "Setting merges_mutations_memory_usage_soft_limit was set to {}"
+                    " ({} available * {:.2f} merges_mutations_memory_usage_to_ram_ratio)",
+                    formatReadableSizeWithBinarySuffix(merges_mutations_memory_usage_soft_limit),
+                    formatReadableSizeWithBinarySuffix(memory_amount),
+                    server_settings_.merges_mutations_memory_usage_to_ram_ratio);
+            }
+
+            LOG_INFO(log, "Merges and mutations memory limit is set to {}",
+                formatReadableSizeWithBinarySuffix(merges_mutations_memory_usage_soft_limit));
+            background_memory_tracker.setSoftLimit(merges_mutations_memory_usage_soft_limit);
+            background_memory_tracker.setDescription("(background)");
+            background_memory_tracker.setMetric(CurrentMetrics::MergesMutationsMemoryTracking);
+
+            total_memory_tracker.setAllowUseJemallocMemory(server_settings_.allow_use_jemalloc_memory);
 
             auto * global_overcommit_tracker = global_context->getGlobalOvercommitTracker();
             total_memory_tracker.setOvercommitTracker(global_overcommit_tracker);
@@ -1234,28 +1160,33 @@ try
             global_context->setMacros(std::make_unique<Macros>(*config, "macros", log));
             global_context->setExternalAuthenticatorsConfig(*config);
 
-            global_context->loadOrReloadDictionaries(*config);
-            global_context->loadOrReloadUserDefinedExecutableFunctions(*config);
+            if (global_context->isServerCompletelyStarted())
+            {
+                /// It does not make sense to reload anything before server has started.
+                /// Moreover, it may break initialization order.
+                global_context->loadOrReloadDictionaries(*config);
+                global_context->loadOrReloadUserDefinedExecutableFunctions(*config);
+            }
 
             global_context->setRemoteHostFilter(*config);
 
-            global_context->setMaxTableSizeToDrop(server_settings.max_table_size_to_drop);
-            global_context->setMaxPartitionSizeToDrop(server_settings.max_partition_size_to_drop);
+            global_context->setMaxTableSizeToDrop(server_settings_.max_table_size_to_drop);
+            global_context->setMaxPartitionSizeToDrop(server_settings_.max_partition_size_to_drop);
 
             ConcurrencyControl::SlotCount concurrent_threads_soft_limit = ConcurrencyControl::Unlimited;
-            if (server_settings.concurrent_threads_soft_limit_num > 0 && server_settings.concurrent_threads_soft_limit_num < concurrent_threads_soft_limit)
-                concurrent_threads_soft_limit = server_settings.concurrent_threads_soft_limit_num;
-            if (server_settings.concurrent_threads_soft_limit_ratio_to_cores > 0)
+            if (server_settings_.concurrent_threads_soft_limit_num > 0 && server_settings_.concurrent_threads_soft_limit_num < concurrent_threads_soft_limit)
+                concurrent_threads_soft_limit = server_settings_.concurrent_threads_soft_limit_num;
+            if (server_settings_.concurrent_threads_soft_limit_ratio_to_cores > 0)
             {
-                auto value = server_settings.concurrent_threads_soft_limit_ratio_to_cores * std::thread::hardware_concurrency();
+                auto value = server_settings_.concurrent_threads_soft_limit_ratio_to_cores * std::thread::hardware_concurrency();
                 if (value > 0 && value < concurrent_threads_soft_limit)
                     concurrent_threads_soft_limit = value;
             }
             ConcurrencyControl::instance().setMaxConcurrency(concurrent_threads_soft_limit);
 
-            global_context->getProcessList().setMaxSize(server_settings.max_concurrent_queries);
-            global_context->getProcessList().setMaxInsertQueriesAmount(server_settings.max_concurrent_insert_queries);
-            global_context->getProcessList().setMaxSelectQueriesAmount(server_settings.max_concurrent_select_queries);
+            global_context->getProcessList().setMaxSize(server_settings_.max_concurrent_queries);
+            global_context->getProcessList().setMaxInsertQueriesAmount(server_settings_.max_concurrent_insert_queries);
+            global_context->getProcessList().setMaxSelectQueriesAmount(server_settings_.max_concurrent_select_queries);
 
             if (config->has("keeper_server"))
                 global_context->updateKeeperConfiguration(*config);
@@ -1266,34 +1197,34 @@ try
             /// This is done for backward compatibility.
             if (global_context->areBackgroundExecutorsInitialized())
             {
-                auto new_pool_size = server_settings.background_pool_size;
-                auto new_ratio = server_settings.background_merges_mutations_concurrency_ratio;
-                global_context->getMergeMutateExecutor()->increaseThreadsAndMaxTasksCount(new_pool_size, new_pool_size * new_ratio);
-                global_context->getMergeMutateExecutor()->updateSchedulingPolicy(server_settings.background_merges_mutations_scheduling_policy.toString());
+                auto new_pool_size = server_settings_.background_pool_size;
+                auto new_ratio = server_settings_.background_merges_mutations_concurrency_ratio;
+                global_context->getMergeMutateExecutor()->increaseThreadsAndMaxTasksCount(new_pool_size, static_cast<size_t>(new_pool_size * new_ratio));
+                global_context->getMergeMutateExecutor()->updateSchedulingPolicy(server_settings_.background_merges_mutations_scheduling_policy.toString());
             }
 
             if (global_context->areBackgroundExecutorsInitialized())
             {
-                auto new_pool_size = server_settings.background_move_pool_size;
+                auto new_pool_size = server_settings_.background_move_pool_size;
                 global_context->getMovesExecutor()->increaseThreadsAndMaxTasksCount(new_pool_size, new_pool_size);
             }
 
             if (global_context->areBackgroundExecutorsInitialized())
             {
-                auto new_pool_size = server_settings.background_fetches_pool_size;
+                auto new_pool_size = server_settings_.background_fetches_pool_size;
                 global_context->getFetchesExecutor()->increaseThreadsAndMaxTasksCount(new_pool_size, new_pool_size);
             }
 
             if (global_context->areBackgroundExecutorsInitialized())
             {
-                auto new_pool_size = server_settings.background_common_pool_size;
+                auto new_pool_size = server_settings_.background_common_pool_size;
                 global_context->getCommonExecutor()->increaseThreadsAndMaxTasksCount(new_pool_size, new_pool_size);
             }
 
-            global_context->getBufferFlushSchedulePool().increaseThreadsCount(server_settings.background_buffer_flush_schedule_pool_size);
-            global_context->getSchedulePool().increaseThreadsCount(server_settings.background_schedule_pool_size);
-            global_context->getMessageBrokerSchedulePool().increaseThreadsCount(server_settings.background_message_broker_schedule_pool_size);
-            global_context->getDistributedSchedulePool().increaseThreadsCount(server_settings.background_distributed_schedule_pool_size);
+            global_context->getBufferFlushSchedulePool().increaseThreadsCount(server_settings_.background_buffer_flush_schedule_pool_size);
+            global_context->getSchedulePool().increaseThreadsCount(server_settings_.background_schedule_pool_size);
+            global_context->getMessageBrokerSchedulePool().increaseThreadsCount(server_settings_.background_message_broker_schedule_pool_size);
+            global_context->getDistributedSchedulePool().increaseThreadsCount(server_settings_.background_distributed_schedule_pool_size);
 
             if (config->has("resources"))
             {
@@ -1304,7 +1235,7 @@ try
             {
                 /// We do not load ZooKeeper configuration on the first config loading
                 /// because TestKeeper server is not started yet.
-                if (config->has("zookeeper"))
+                if (zkutil::hasZooKeeperConfig(*config))
                     global_context->reloadZooKeeperIfChanged(config);
 
                 global_context->reloadAuxiliaryZooKeepersConfigIfChanged(config);
@@ -1366,8 +1297,8 @@ try
                 {
                     Poco::Net::ServerSocket socket;
                     auto address = socketBindListen(config(), socket, listen_host, port);
-                    socket.setReceiveTimeout(config().getUInt64("keeper_server.socket_receive_timeout_sec", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC));
-                    socket.setSendTimeout(config().getUInt64("keeper_server.socket_send_timeout_sec", DBMS_DEFAULT_SEND_TIMEOUT_SEC));
+                    socket.setReceiveTimeout(Poco::Timespan(config().getUInt64("keeper_server.socket_receive_timeout_sec", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC), 0));
+                    socket.setSendTimeout(Poco::Timespan(config().getUInt64("keeper_server.socket_send_timeout_sec", DBMS_DEFAULT_SEND_TIMEOUT_SEC), 0));
                     return ProtocolServerAdapter(
                         listen_host,
                         port_name,
@@ -1389,8 +1320,8 @@ try
 #if USE_SSL
                     Poco::Net::SecureServerSocket socket;
                     auto address = socketBindListen(config(), socket, listen_host, port, /* secure = */ true);
-                    socket.setReceiveTimeout(config().getUInt64("keeper_server.socket_receive_timeout_sec", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC));
-                    socket.setSendTimeout(config().getUInt64("keeper_server.socket_send_timeout_sec", DBMS_DEFAULT_SEND_TIMEOUT_SEC));
+                    socket.setReceiveTimeout(Poco::Timespan(config().getUInt64("keeper_server.socket_receive_timeout_sec", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC), 0));
+                    socket.setSendTimeout(Poco::Timespan(config().getUInt64("keeper_server.socket_send_timeout_sec", DBMS_DEFAULT_SEND_TIMEOUT_SEC), 0));
                     return ProtocolServerAdapter(
                         listen_host,
                         secure_port_name,
@@ -1453,7 +1384,7 @@ try
         LOG_INFO(log, "Uncompressed cache size was lowered to {} because the system has low amount of memory",
             formatReadableSizeWithBinarySuffix(uncompressed_cache_size));
     }
-    global_context->setUncompressedCache(uncompressed_cache_size, uncompressed_cache_policy);
+    global_context->setUncompressedCache(uncompressed_cache_policy, uncompressed_cache_size);
 
     /// Load global settings from default_profile and system_profile.
     global_context->setDefaultProfiles(config());
@@ -1478,7 +1409,7 @@ try
         LOG_INFO(log, "Mark cache size was lowered to {} because the system has low amount of memory",
             formatReadableSizeWithBinarySuffix(mark_cache_size));
     }
-    global_context->setMarkCache(mark_cache_size, mark_cache_policy);
+    global_context->setMarkCache(mark_cache_policy, mark_cache_size);
 
     if (server_settings.index_uncompressed_cache_size)
         global_context->setIndexUncompressedCache(server_settings.index_uncompressed_cache_size);
@@ -1843,19 +1774,19 @@ try
             }
 
             if (current_connections)
-                LOG_INFO(log, "Closed all listening sockets. Waiting for {} outstanding connections.", current_connections);
+                LOG_WARNING(log, "Closed all listening sockets. Waiting for {} outstanding connections.", current_connections);
             else
                 LOG_INFO(log, "Closed all listening sockets.");
 
             /// Killing remaining queries.
-            if (server_settings.shutdown_wait_unfinished_queries)
+            if (!server_settings.shutdown_wait_unfinished_queries)
                 global_context->getProcessList().killAllQueries();
 
             if (current_connections)
                 current_connections = waitServersToFinish(servers, config().getInt("shutdown_wait_unfinished", 5));
 
             if (current_connections)
-                LOG_INFO(log, "Closed connections. But {} remain."
+                LOG_WARNING(log, "Closed connections. But {} remain."
                     " Tip: To increase wait time add to config: <shutdown_wait_unfinished>60</shutdown_wait_unfinished>", current_connections);
             else
                 LOG_INFO(log, "Closed connections.");
@@ -1871,7 +1802,7 @@ try
 
                 /// Dump coverage here, because std::atexit callback would not be called.
                 dumpCoverageReportIfPossible();
-                LOG_INFO(log, "Will shutdown forcefully.");
+                LOG_WARNING(log, "Will shutdown forcefully.");
                 safeExit(0);
             }
         });
diff --git a/programs/server/config.xml b/programs/server/config.xml
index 85cb299e188..5b69d9f6283 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -348,10 +348,6 @@
     <background_distributed_schedule_pool_size>16</background_distributed_schedule_pool_size>
     -->
 
-    <!-- Number of workers to recycle connections in background (see also drain_timeout).
-         If the pool is full, connection will be drained synchronously. -->
-    <!-- <max_threads_for_connection_collector>10</max_threads_for_connection_collector> -->
-
     <!-- On memory constrained environments you may have to set this to value larger than 1.
       -->
     <max_server_memory_usage_to_ram_ratio>0.9</max_server_memory_usage_to_ram_ratio>
@@ -480,6 +476,14 @@
     <allow_no_password>1</allow_no_password>
     <allow_implicit_no_password>1</allow_implicit_no_password>
 
+    <!-- When a user does not specify a password type in the CREATE USER query, the default password type is used.
+         Accepted values are: 'plaintext_password', 'sha256_password', 'double_sha1_password', 'bcrypt_password'.
+      -->
+    <default_password_type>sha256_password</default_password_type>
+
+    <!-- Work factor for bcrypt_password authentication type-->
+    <bcrypt_workfactor>12</bcrypt_workfactor>
+
     <!-- Complexity requirements for user passwords. -->
     <!-- <password_complexity>
         <rule>
@@ -707,13 +711,20 @@
              actions of previous constraint (defined in other profiles) for the same specific setting, including fields that are not set by new constraint.
              It also enables 'changeable_in_readonly' constraint type -->
         <settings_constraints_replace_previous>false</settings_constraints_replace_previous>
+
+        <!-- Number of seconds since last access a role is stored in the Role Cache -->
+        <role_cache_expiration_time_seconds>600</role_cache_expiration_time_seconds>
     </access_control_improvements>
 
     <!-- Default profile of settings. -->
     <default_profile>default</default_profile>
 
-    <!-- Comma-separated list of prefixes for user-defined settings. -->
-    <custom_settings_prefixes></custom_settings_prefixes>
+    <!-- Comma-separated list of prefixes for user-defined settings.
+         The server will allow to set these settings, and retrieve them with the getSetting function.
+         They are also logged in the query_log, similarly to other settings, but have no special effect.
+         The "SQL_" prefix is introduced for compatibility with MySQL - these settings are being set be Tableau.
+    -->
+    <custom_settings_prefixes>SQL_</custom_settings_prefixes>
 
     <!-- System profile of settings. This settings are used by internal processes (Distributed DDL worker and so on). -->
     <!-- <system_profile>default</system_profile> -->
@@ -1126,6 +1137,16 @@
         <ttl>event_date + INTERVAL 30 DAY DELETE</ttl>
         -->
 
+        <!--
+            ORDER BY expr: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree#order_by
+            Example:
+                event_date, event_time
+                event_date, type, query_id
+                event_date, event_time, initial_query_id
+
+        <order_by>event_date, event_time, initial_query_id</order_by>
+        -->
+
         <!-- Instead of partition_by, you can provide full engine expression (starting with ENGINE = ) with parameters,
              Example: <engine>ENGINE = MergeTree PARTITION BY toYYYYMM(event_date) ORDER BY (event_date, event_time) SETTINGS index_granularity = 1024</engine>
           -->
@@ -1287,10 +1308,14 @@
     <!-- Configuration of external dictionaries. See:
          https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
     -->
-    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+    <dictionaries_config>*_dictionary.*ml</dictionaries_config>
 
     <!-- Configuration of user defined executable functions -->
-    <user_defined_executable_functions_config>*_function.xml</user_defined_executable_functions_config>
+    <user_defined_executable_functions_config>*_function.*ml</user_defined_executable_functions_config>
+
+    <!-- Path in ZooKeeper to store user-defined SQL functions created by the command CREATE FUNCTION.
+     If not specified they will be stored locally. -->
+    <!-- <user_defined_zookeeper_path>/clickhouse/user_defined</user_defined_zookeeper_path> -->
 
     <!-- Uncomment if you want data to be compressed 30-100% better.
          Don't do that if you just started using ClickHouse.
@@ -1514,10 +1539,10 @@
 
     <!-- Configuration for the query cache -->
     <!-- <query_cache> -->
-    <!--     <size>1073741824</size> -->
+    <!--     <max_size_in_bytes>1073741824</max_size_in_bytes> -->
     <!--     <max_entries>1024</max_entries> -->
-    <!--     <max_entry_size>1048576</max_entry_size> -->
-    <!--     <max_entry_rows>30000000</max_entry_rows> -->
+    <!--     <max_entry_size_in_bytes>1048576</max_entry_size_in_bytes> -->
+    <!--     <max_entry_size_in_rows>30000000</max_entry_size_in_rows> -->
     <!-- </query_cache> -->
 
     <!-- Uncomment if enable merge tree metadata cache -->
diff --git a/programs/server/dashboard.html b/programs/server/dashboard.html
index fa940e01ad5..97b35ec97c4 100644
--- a/programs/server/dashboard.html
+++ b/programs/server/dashboard.html
@@ -12,7 +12,7 @@
             --chart-background: white;
             --shadow-color: rgba(0, 0, 0, 0.25);
             --input-shadow-color: rgba(0, 255, 0, 1);
-            --error-color: red;
+            --error-color: white;
             --legend-background: rgba(255, 255, 255, 0.75);
             --title-color: #666;
             --text-color: black;
@@ -76,7 +76,7 @@
         #charts
         {
             height: 100%;
-            display: none;
+            display: flex;
             flex-flow: row wrap;
             gap: 1rem;
         }
@@ -121,6 +121,19 @@
         .unconnected #url {
             width: 100%;
         }
+        .unconnected #button-options {
+            display: grid;
+            grid-auto-flow: column;
+            grid-auto-columns: 1fr;
+            gap: 0.3rem;
+        }
+        .unconnected #user {
+            margin-right: 0;
+            width: auto;
+        }
+        .unconnected #password {
+            width: auto;
+        }
         #user {
             margin-right: 0.25rem;
             width: 50%;
@@ -136,7 +149,15 @@
             width: 100%;
 
             display: flex;
-            flex-flow: row nowrap;  
+            flex-flow: row nowrap;
+        }
+        .unconnected #username-password {
+            width: 100%;
+
+            gap: 0.3rem;
+
+            display: grid;
+            grid-template-columns: 1fr 1fr;
         }
 
         .inputs #chart-params {
@@ -177,7 +198,10 @@
         .themes {
             float: right;
             font-size: 20pt;
-            margin-bottom: 1rem;
+            gap: 0.3rem;
+
+            display: flex;
+            justify-content: center;
         }
 
         #toggle-dark, #toggle-light {
@@ -206,6 +230,8 @@
         }
 
         #add, #reload {
+            padding: .25rem 0.5rem;
+            text-align: center;
             font-weight: bold;
             user-select: none;
             cursor: pointer;
@@ -214,16 +240,24 @@
             background: var(--new-chart-background-color);
             color: var(--new-chart-text-color);
             float: right;
-            margin-right: 0 !important;
-            margin-left: 1rem;
+            margin-right: 1rem !important;
+            margin-left: 0rem;
             margin-bottom: 1rem;
         }
 
+        /* .unconnected #reload {
+            margin-left: 3px;
+        } */
+
         #add:hover, #reload:hover {
             background: var(--button-background-color);
         }
 
         #auth-error {
+            align-self: center;
+            width: 60%;
+            padding: .5rem;
+
             color: var(--error-color);
 
             display: flex;
@@ -352,15 +386,15 @@
                 <input spellcheck="false" id="password" type="password" placeholder="password" />
             </div>
         </div>
-        <div>
-            <input id="reload" type="button" value="Reload">
-            <input id="add" type="button" value="Add chart" style="display: none;">
+        <div id="button-options">
             <span class="nowrap themes"><span id="toggle-dark">🌚</span><span id="toggle-light">🌞</span></span>
+            <input id="add" type="button" value="Add chart" style="display: none;">
+            <input id="reload" type="button" value="Reload">
             <div id="chart-params"></div>
         </div>
     </form>
+    <div id="auth-error"></div>
 </div>
-<div id="auth-error"></div>
 <div id="charts"></div>
 <script>
 
@@ -390,10 +424,21 @@ if (location.protocol != 'file:') {
     user = 'default';
 }
 
-const errorCodeRegex = /Code: (\d+)/
 const errorCodeMessageMap = {
     516: 'Error authenticating with database. Please check your connection params and try again.'
 }
+const errorMessages = [
+    {
+        regex: /TypeError: Failed to fetch/,
+        messageFunc: () => 'Error authenticating with database. Please check your connection url and try again.',
+    },
+    {
+        regex: /Code: (\d+)/,
+        messageFunc: (match) => {
+            return errorCodeMessageMap[match[1]]
+        }
+    }
+]
 
 /// This is just a demo configuration of the dashboard.
 
@@ -769,21 +814,6 @@ document.getElementById('reload').addEventListener('click', e => {
     reloadAll();
 });
 
-function showReloadIfNeeded() {
-    const is_any_field_changed = (host != document.getElementById('url').value
-                               || user != document.getElementById('user').value
-                               || password != document.getElementById('password').value);
-    if (is_any_field_changed) {
-        document.getElementById('reload').style.display = '';
-    } else {
-        document.getElementById('reload').style.display = 'none';
-    }
-}
-
-document.getElementById('password').addEventListener('input', e => { showReloadIfNeeded(); })
-document.getElementById('user').addEventListener('input', e => { showReloadIfNeeded(); })
-document.getElementById('url').addEventListener('input', e => { showReloadIfNeeded(); })
-
 function legendAsTooltipPlugin({ className, style = { background: "var(--legend-background)" } } = {}) {
     let legendEl;
 
@@ -875,14 +905,12 @@ async function draw(idx, chart, url_params, query) {
     }
 
     if (error) {
-        const errorMatch = error.match(errorCodeRegex)
-        if (errorMatch && errorMatch[1]) {
-            const code = errorMatch[1]
-            if (errorCodeMessageMap[code]) {
-                const authError = new Error(errorCodeMessageMap[code])
-                authError.code = code
-                throw authError
-            }
+        const errorMatch = errorMessages.find(({ regex }) => error.match(regex))
+        if (errorMatch) {
+            const match = error.match(errorMatch.regex)
+            const message = errorMatch.messageFunc(match)
+            const authError = new Error(message)
+            throw authError
         }
     }
 
@@ -950,7 +978,8 @@ async function draw(idx, chart, url_params, query) {
 
 function showAuthError(message) {
     const charts = document.querySelector('#charts');
-    charts.style.display = 'none';
+    charts.style.height = '0px';
+    charts.style.opacity = '0';
     const add = document.querySelector('#add');
     add.style.display = 'none';
 
@@ -961,7 +990,8 @@ function showAuthError(message) {
 
 function hideAuthError() {
     const charts = document.querySelector('#charts');
-    charts.style.display = 'flex';
+    charts.style.height = 'auto';
+    charts.style.opacity = '1';
 
     const authError = document.querySelector('#auth-error');
     authError.textContent = '';
@@ -972,13 +1002,13 @@ let firstLoad = true;
 
 async function drawAll() {
     let params = getParamsForURL();
-    const charts = document.getElementsByClassName('chart');
+    const chartsArray = document.getElementsByClassName('chart');
 
     if (!firstLoad) {
         hideAuthError();
     }
     await Promise.all([...Array(queries.length)].map(async (_, i) => {
-        return draw(i, charts[i], params, queries[i].query).catch((e) => {
+        return draw(i, chartsArray[i], params, queries[i].query).catch((e) => {
             if (!firstLoad) {
                 showAuthError(e.message);
             }
@@ -995,6 +1025,9 @@ async function drawAll() {
             element.classList.remove('unconnected');
             const add = document.querySelector('#add');
             add.style.display = 'block';
+        } else {
+            const charts = document.querySelector('#charts')
+            charts.style.height = '0px';
         }
     })
 }
diff --git a/programs/server/play.html b/programs/server/play.html
index c511d13cf91..3ee133f0e01 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -398,15 +398,30 @@
             fill: var(--logo-color);
         }
 
+        #cloud-logo
+        {
+            color: var(--background-color);
+            text-shadow: 0rem 0rem 2rem var(--logo-color);
+            font-size: 10vw;
+            display: block;
+        }
+
         #logo:hover
         {
             fill: var(--logo-color-active);
+            color: var(--logo-color-active);
+        }
+
+        #cloud-logo:hover
+        {
+            filter: brightness(150%);
         }
 
         #logo-container
         {
             text-align: center;
             margin-top: 5em;
+            line-height: 0.75;
         }
 
         #chart
@@ -487,6 +502,7 @@
             </g>
         </svg>
         </a>
+        <a id="cloud-logo" href="https://clickhouse.cloud/">☁</a>
     </p>
 </body>
 
@@ -501,11 +517,12 @@
     let previous_query = '';
 
     const current_url = new URL(window.location);
+    const opened_locally = location.protocol == 'file:';
 
     const server_address = current_url.searchParams.get('url');
     if (server_address) {
         document.getElementById('url').value = server_address;
-    } else if (location.protocol != 'file:') {
+    } else if (!opened_locally) {
         /// Substitute the address of the server where the page is served.
         document.getElementById('url').value = location.origin;
     }
@@ -516,6 +533,19 @@
         document.getElementById('user').value = user_from_url;
     }
 
+    const pass_from_url = current_url.searchParams.get('password');
+    if (pass_from_url) {
+        document.getElementById('password').value = pass_from_url;
+	/// Browsers don't allow manipulating history for the 'file:' protocol.
+        if (!opened_locally) {
+            let replaced_pass = current_url.searchParams;
+            replaced_pass.delete('password');
+            window.history.replaceState(null, '',
+                window.location.origin + window.location.pathname + '?'
+                + replaced_pass.toString() + window.location.hash);
+        }
+    }
+
     function postImpl(posted_request_num, query)
     {
         const user = document.getElementById('user').value;
@@ -532,7 +562,7 @@
             '&max_result_rows=1000&max_result_bytes=10000000&result_overflow_mode=break';
 
         // If play.html is opened locally, append username and password to the URL parameter to avoid CORS issue.
-        if (document.location.href.startsWith("file://")) {
+        if (opened_locally) {
             url += '&user=' + encodeURIComponent(user) +
             '&password=' + encodeURIComponent(password)
         }
@@ -541,7 +571,7 @@
 
         xhr.open('POST', url, true);
         // If play.html is open normally, use Basic auth to prevent username and password being exposed in URL parameters
-        if (!document.location.href.startsWith("file://")) {
+        if (!opened_locally) {
             xhr.setRequestHeader("Authorization", "Basic " + btoa(user+":"+password));
         }
         xhr.onreadystatechange = function()
@@ -669,6 +699,33 @@
             elem.selectionStart = selection_start + 4;
             elem.selectionEnd = selection_start + 4;
 
+            e.preventDefault();
+            return false;
+        } else if (e.key === 'Enter' && !(event.metaKey || event.ctrlKey)) {
+            // If the user presses Enter, and the previous line starts with spaces,
+            // then we will insert the same number of spaces.
+            const elem = e.target;
+            if (elem.selectionStart !== elem.selectionEnd) {
+                // If there is a selection, then we will not insert spaces.
+                return;
+            }
+            const cursor_pos = elem.selectionStart;
+
+            const elem_value = elem.value;
+            const text_before_cursor = elem_value.substring(0, cursor_pos);
+            const text_after_cursor = elem_value.substring(cursor_pos);
+            const prev_lines = text_before_cursor.split('\n');
+            const prev_line = prev_lines.pop();
+            const lead_spaces = prev_line.match(/^\s*/)[0];
+            if (!lead_spaces) {
+                return;
+            }
+
+            // Add leading spaces to the current line.
+            elem.value = text_before_cursor + '\n' + lead_spaces + text_after_cursor;
+            elem.selectionStart = cursor_pos + lead_spaces.length + 1;
+            elem.selectionEnd = elem.selectionStart;
+
             e.preventDefault();
             return false;
         }
diff --git a/rust/BLAKE3/Cargo.toml b/rust/BLAKE3/Cargo.toml
index eb8f3467424..ed414fa54c1 100644
--- a/rust/BLAKE3/Cargo.toml
+++ b/rust/BLAKE3/Cargo.toml
@@ -11,3 +11,10 @@ libc = "0.2.132"
 [lib]
 crate-type = ["staticlib"]
 
+[profile.release]
+debug = true
+
+[profile.release-thinlto]
+inherits = "release"
+# BLAKE3 module requires "full" LTO (not "thin") to get additional 10% performance benefit
+lto = true
diff --git a/rust/CMakeLists.txt b/rust/CMakeLists.txt
index ec2377fce71..d229894791a 100644
--- a/rust/CMakeLists.txt
+++ b/rust/CMakeLists.txt
@@ -34,9 +34,18 @@ function(clickhouse_import_crate)
     else()
         set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE};debug")
     endif()
-    # NOTE: we may use LTO for rust too
 
-    corrosion_import_crate(NO_STD ${ARGN})
+    if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
+        set(profile "")
+    else()
+        if (ENABLE_THINLTO)
+            set(profile "release-thinlto")
+        else()
+            set(profile "release")
+        endif()
+    endif()
+
+    corrosion_import_crate(NO_STD ${ARGN} PROFILE ${profile})
 endfunction()
 
 # Add crate from the build directory.
diff --git a/rust/skim/Cargo.toml b/rust/skim/Cargo.toml
index ce137221065..e5801a26f77 100644
--- a/rust/skim/Cargo.toml
+++ b/rust/skim/Cargo.toml
@@ -18,3 +18,8 @@ crate-type = ["staticlib"]
 
 [profile.release]
 debug = true
+
+[profile.release-thinlto]
+inherits = "release"
+# We use LTO here as well to slightly decrease binary size
+lto = true
diff --git a/src/Access/AccessBackup.cpp b/src/Access/AccessBackup.cpp
index 53565e8e5d7..800a54e69b3 100644
--- a/src/Access/AccessBackup.cpp
+++ b/src/Access/AccessBackup.cpp
@@ -72,12 +72,11 @@ namespace
             return std::make_shared<BackupEntryFromMemory>(buf.str());
         }
 
-        static AccessEntitiesInBackup fromBackupEntry(const IBackupEntry & backup_entry, const String & file_path)
+        static AccessEntitiesInBackup fromBackupEntry(std::unique_ptr<ReadBuffer> buf, const String & file_path)
         {
             try
             {
                 AccessEntitiesInBackup res;
-                std::unique_ptr<ReadBuffer> buf = backup_entry.getReadBuffer();
 
                 bool dependencies_found = false;
 
@@ -343,8 +342,8 @@ void AccessRestorerFromBackup::addDataPath(const String & data_path)
     for (const String & filename : filenames)
     {
         String filepath_in_backup = data_path_in_backup_fs / filename;
-        auto backup_entry = backup->readFile(filepath_in_backup);
-        auto ab = AccessEntitiesInBackup::fromBackupEntry(*backup_entry, filepath_in_backup);
+        auto read_buffer_from_backup = backup->readFile(filepath_in_backup);
+        auto ab = AccessEntitiesInBackup::fromBackupEntry(std::move(read_buffer_from_backup), filepath_in_backup);
 
         boost::range::copy(ab.entities, std::back_inserter(entities));
         boost::range::copy(ab.dependencies, std::inserter(dependencies, dependencies.end()));
diff --git a/src/Access/AccessChangesNotifier.cpp b/src/Access/AccessChangesNotifier.cpp
index 05516285efb..b27dda82142 100644
--- a/src/Access/AccessChangesNotifier.cpp
+++ b/src/Access/AccessChangesNotifier.cpp
@@ -47,10 +47,10 @@ scope_guard AccessChangesNotifier::subscribeForChanges(AccessEntityType type, co
     list.push_back(handler);
     auto handler_it = std::prev(list.end());
 
-    return [handlers=handlers, type, handler_it]
+    return [my_handlers = handlers, type, handler_it]
     {
-        std::lock_guard lock2{handlers->mutex};
-        auto & list2 = handlers->by_type[static_cast<size_t>(type)];
+        std::lock_guard lock2{my_handlers->mutex};
+        auto & list2 = my_handlers->by_type[static_cast<size_t>(type)];
         list2.erase(handler_it);
     };
 }
@@ -63,13 +63,13 @@ scope_guard AccessChangesNotifier::subscribeForChanges(const UUID & id, const On
     list.push_back(handler);
     auto handler_it = std::prev(list.end());
 
-    return [handlers=handlers, it, handler_it]
+    return [my_handlers = handlers, it, handler_it]
     {
-        std::lock_guard lock2{handlers->mutex};
+        std::lock_guard lock2{my_handlers->mutex};
         auto & list2 = it->second;
         list2.erase(handler_it);
         if (list2.empty())
-            handlers->by_id.erase(it);
+            my_handlers->by_id.erase(it);
     };
 }
 
diff --git a/src/Access/AccessControl.cpp b/src/Access/AccessControl.cpp
index 91283da241d..6179c823b56 100644
--- a/src/Access/AccessControl.cpp
+++ b/src/Access/AccessControl.cpp
@@ -247,7 +247,7 @@ private:
 AccessControl::AccessControl()
     : MultipleAccessStorage("user directories"),
       context_access_cache(std::make_unique<ContextAccessCache>(*this)),
-      role_cache(std::make_unique<RoleCache>(*this)),
+      role_cache(std::make_unique<RoleCache>(*this, 600)),
       row_policy_cache(std::make_unique<RowPolicyCache>(*this)),
       quota_cache(std::make_unique<QuotaCache>(*this)),
       settings_profiles_cache(std::make_unique<SettingsProfilesCache>(*this)),
@@ -271,8 +271,11 @@ void AccessControl::setUpFromMainConfig(const Poco::Util::AbstractConfiguration
     setImplicitNoPasswordAllowed(config_.getBool("allow_implicit_no_password", true));
     setNoPasswordAllowed(config_.getBool("allow_no_password", true));
     setPlaintextPasswordAllowed(config_.getBool("allow_plaintext_password", true));
+    setDefaultPasswordTypeFromConfig(config_.getString("default_password_type", "sha256_password"));
     setPasswordComplexityRulesFromConfig(config_);
 
+    setBcryptWorkfactor(config_.getInt("bcrypt_workfactor", 12));
+
     /// Optional improvements in access control system.
     /// The default values are false because we need to be compatible with earlier access configurations
     setEnabledUsersWithoutRowPoliciesCanReadRows(config_.getBool("access_control_improvements.users_without_row_policies_can_read_rows", false));
@@ -282,6 +285,8 @@ void AccessControl::setUpFromMainConfig(const Poco::Util::AbstractConfiguration
     setSettingsConstraintsReplacePrevious(config_.getBool("access_control_improvements.settings_constraints_replace_previous", false));
 
     addStoragesFromMainConfig(config_, config_path_, get_zookeeper_function_);
+
+    role_cache = std::make_unique<RoleCache>(*this, config_.getInt("access_control_improvements.role_cache_expiration_time_seconds", 600));
 }
 
 
@@ -651,6 +656,27 @@ bool AccessControl::isPlaintextPasswordAllowed() const
     return allow_plaintext_password;
 }
 
+void AccessControl::setDefaultPasswordTypeFromConfig(const String & type_)
+{
+    for (auto check_type : collections::range(AuthenticationType::MAX))
+    {
+        const auto & info = AuthenticationTypeInfo::get(check_type);
+
+        if (type_ == info.name && info.is_password)
+        {
+            default_password_type = check_type;
+            return;
+        }
+    }
+
+    throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Unknown password type in 'default_password_type' in config");
+}
+
+AuthenticationType AccessControl::getDefaultPasswordType() const
+{
+    return default_password_type;
+}
+
 void AccessControl::setPasswordComplexityRulesFromConfig(const Poco::Util::AbstractConfiguration & config_)
 {
     password_rules->setPasswordComplexityRulesFromConfig(config_);
@@ -671,6 +697,21 @@ std::vector<std::pair<String, String>> AccessControl::getPasswordComplexityRules
     return password_rules->getPasswordComplexityRules();
 }
 
+void AccessControl::setBcryptWorkfactor(int workfactor_)
+{
+    if (workfactor_ < 4)
+        bcrypt_workfactor = 4;
+    else if (workfactor_ > 31)
+        bcrypt_workfactor = 31;
+    else
+        bcrypt_workfactor = workfactor_;
+}
+
+int AccessControl::getBcryptWorkfactor() const
+{
+    return bcrypt_workfactor;
+}
+
 
 std::shared_ptr<const ContextAccess> AccessControl::getContextAccess(
     const UUID & user_id,
diff --git a/src/Access/AccessControl.h b/src/Access/AccessControl.h
index 957a2483cd1..2a8293a49e7 100644
--- a/src/Access/AccessControl.h
+++ b/src/Access/AccessControl.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Access/MultipleAccessStorage.h>
+#include <Access/Common/AuthenticationType.h>
 #include <Common/SettingsChanges.h>
 #include <Common/ZooKeeper/Common.h>
 #include <base/scope_guard.h>
@@ -147,13 +148,20 @@ public:
     void setPlaintextPasswordAllowed(const bool allow_plaintext_password_);
     bool isPlaintextPasswordAllowed() const;
 
-    /// Check complexity requirements for plaintext passwords
+    /// Default password type when the user does not specify it.
+    void setDefaultPasswordTypeFromConfig(const String & type_);
+    AuthenticationType getDefaultPasswordType() const;
 
+    /// Check complexity requirements for passwords
     void setPasswordComplexityRulesFromConfig(const Poco::Util::AbstractConfiguration & config_);
     void setPasswordComplexityRules(const std::vector<std::pair<String, String>> & rules_);
     void checkPasswordComplexityRules(const String & password_) const;
     std::vector<std::pair<String, String>> getPasswordComplexityRules() const;
 
+    /// Workfactor for bcrypt encoded passwords
+    void setBcryptWorkfactor(int workfactor_);
+    int getBcryptWorkfactor() const;
+
     /// Enables logic that users without permissive row policies can still read rows using a SELECT query.
     /// For example, if there two users A, B and a row policy is defined only for A, then
     /// if this setting is true the user B will see all rows, and if this setting is false the user B will see no rows.
@@ -242,6 +250,8 @@ private:
     std::atomic_bool select_from_system_db_requires_grant = false;
     std::atomic_bool select_from_information_schema_requires_grant = false;
     std::atomic_bool settings_constraints_replace_previous = false;
+    std::atomic_int bcrypt_workfactor = 12;
+    std::atomic<AuthenticationType> default_password_type = AuthenticationType::SHA256_PASSWORD;
 };
 
 }
diff --git a/src/Access/AccessRights.cpp b/src/Access/AccessRights.cpp
index 7e21e3c2c4d..cfa14e6c88b 100644
--- a/src/Access/AccessRights.cpp
+++ b/src/Access/AccessRights.cpp
@@ -61,14 +61,25 @@ namespace
                     res.any_database = true;
                     res.any_table = true;
                     res.any_column = true;
+                    res.any_parameter = true;
                     break;
                 }
                 case 1:
                 {
-                    res.any_database = false;
-                    res.database = full_name[0];
-                    res.any_table = true;
-                    res.any_column = true;
+                    if (access_flags.isGlobalWithParameter())
+                    {
+                        res.parameter = full_name[0];
+                        res.any_parameter = false;
+                        res.any_database = false;
+                    }
+                    else
+                    {
+                        res.database = full_name[0];
+                        res.any_database = false;
+                        res.any_parameter = false;
+                        res.any_table = true;
+                        res.any_column = true;
+                    }
                     break;
                 }
                 case 2:
@@ -110,10 +121,35 @@ namespace
                 size_t count_elements_with_diff_columns = sorted.countElementsWithDifferenceInColumnOnly(i);
                 if (count_elements_with_diff_columns == 1)
                 {
-                    /// Easy case: one Element is converted to one AccessRightsElement.
                     const auto & element = sorted[i];
                     if (element.access_flags)
-                        res.emplace_back(element.getResult());
+                    {
+                        const bool all_granted = sorted.size() == 1 && element.access_flags.contains(AccessFlags::allFlags());
+                        if (all_granted)
+                        {
+                            /// Easy case: one Element is converted to one AccessRightsElement.
+                            res.emplace_back(element.getResult());
+                        }
+                        else
+                        {
+                            auto per_parameter = element.access_flags.splitIntoParameterTypes();
+                            if (per_parameter.size() == 1)
+                            {
+                                /// Easy case: one Element is converted to one AccessRightsElement.
+                                res.emplace_back(element.getResult());
+                            }
+                            else
+                            {
+                                /// Difficult case: one element is converted into multiple AccessRightsElements.
+                                for (const auto & [_, parameter_flags] : per_parameter)
+                                {
+                                    auto current_element{element};
+                                    current_element.access_flags = parameter_flags;
+                                    res.emplace_back(current_element.getResult());
+                                }
+                            }
+                        }
+                    }
                     ++i;
                 }
                 else
@@ -137,6 +173,8 @@ namespace
             {
                 return (element.full_name.size() != 3) || (element.full_name[0] != start_element.full_name[0])
                     || (element.full_name[1] != start_element.full_name[1]) || (element.grant_option != start_element.grant_option)
+                    || (element.access_flags.isGlobalWithParameter() != start_element.access_flags.isGlobalWithParameter())
+                    || (element.access_flags.getParameterType() != start_element.access_flags.getParameterType())
                     || (element.is_partial_revoke != start_element.is_partial_revoke);
             });
 
@@ -191,11 +229,19 @@ namespace
         }
     };
 
+    /**
+     *  Levels:
+     *                    1. GLOBAL
+     *  2. DATABASE_LEVEL          2. GLOBAL_WITH_PARAMETER (parameter example: named collection)
+     *  3. TABLE_LEVEL
+     *  4. COLUMN_LEVEL
+     */
 
     enum Level
     {
         GLOBAL_LEVEL,
         DATABASE_LEVEL,
+        GLOBAL_WITH_PARAMETER = DATABASE_LEVEL,
         TABLE_LEVEL,
         COLUMN_LEVEL,
     };
@@ -205,7 +251,7 @@ namespace
         switch (level)
         {
             case GLOBAL_LEVEL: return AccessFlags::allFlagsGrantableOnGlobalLevel();
-            case DATABASE_LEVEL: return AccessFlags::allFlagsGrantableOnDatabaseLevel();
+            case DATABASE_LEVEL: return AccessFlags::allFlagsGrantableOnDatabaseLevel() | AccessFlags::allFlagsGrantableOnGlobalWithParameterLevel();
             case TABLE_LEVEL: return AccessFlags::allFlagsGrantableOnTableLevel();
             case COLUMN_LEVEL: return AccessFlags::allFlagsGrantableOnColumnLevel();
         }
@@ -783,7 +829,14 @@ void AccessRights::grantImplHelper(const AccessRightsElement & element)
 {
     assert(!element.is_partial_revoke);
     assert(!element.grant_option || with_grant_option);
-    if (element.any_database)
+    if (element.isGlobalWithParameter())
+    {
+        if (element.any_parameter)
+            grantImpl<with_grant_option>(element.access_flags);
+        else
+            grantImpl<with_grant_option>(element.access_flags, element.parameter);
+    }
+    else if (element.any_database)
         grantImpl<with_grant_option>(element.access_flags);
     else if (element.any_table)
         grantImpl<with_grant_option>(element.access_flags, element.database);
@@ -858,7 +911,14 @@ template <bool grant_option>
 void AccessRights::revokeImplHelper(const AccessRightsElement & element)
 {
     assert(!element.grant_option || grant_option);
-    if (element.any_database)
+    if (element.isGlobalWithParameter())
+    {
+        if (element.any_parameter)
+            revokeImpl<grant_option>(element.access_flags);
+        else
+            revokeImpl<grant_option>(element.access_flags, element.parameter);
+    }
+    else if (element.any_database)
         revokeImpl<grant_option>(element.access_flags);
     else if (element.any_table)
         revokeImpl<grant_option>(element.access_flags, element.database);
@@ -948,7 +1008,14 @@ template <bool grant_option>
 bool AccessRights::isGrantedImplHelper(const AccessRightsElement & element) const
 {
     assert(!element.grant_option || grant_option);
-    if (element.any_database)
+    if (element.isGlobalWithParameter())
+    {
+        if (element.any_parameter)
+            return isGrantedImpl<grant_option>(element.access_flags);
+        else
+            return isGrantedImpl<grant_option>(element.access_flags, element.parameter);
+    }
+    else if (element.any_database)
         return isGrantedImpl<grant_option>(element.access_flags);
     else if (element.any_table)
         return isGrantedImpl<grant_option>(element.access_flags, element.database);
diff --git a/src/Access/Authentication.cpp b/src/Access/Authentication.cpp
index b9bc0ee961c..f4f5259597a 100644
--- a/src/Access/Authentication.cpp
+++ b/src/Access/Authentication.cpp
@@ -1,5 +1,5 @@
 #include <Access/Authentication.h>
-#include <Access/Common/AuthenticationData.h>
+#include <Access/AuthenticationData.h>
 #include <Access/Credentials.h>
 #include <Access/ExternalAuthenticators.h>
 #include <Access/LDAPClient.h>
@@ -31,6 +31,11 @@ namespace
         return (Util::encodeDoubleSHA1(password) == password_double_sha1);
     }
 
+    bool checkPasswordBcrypt(std::string_view password, const Digest & password_bcrypt)
+    {
+        return Util::checkPasswordBcrypt(password, password_bcrypt);
+    }
+
     bool checkPasswordSHA256(std::string_view password, const Digest & password_sha256, const String & salt)
     {
         return Util::encodeSHA256(String(password).append(salt)) == password_sha256;
@@ -81,6 +86,7 @@ bool Authentication::areCredentialsValid(const Credentials & credentials, const
             case AuthenticationType::PLAINTEXT_PASSWORD:
             case AuthenticationType::SHA256_PASSWORD:
             case AuthenticationType::DOUBLE_SHA1_PASSWORD:
+            case AuthenticationType::BCRYPT_PASSWORD:
             case AuthenticationType::LDAP:
                 throw Authentication::Require<BasicCredentials>("ClickHouse Basic Authentication");
 
@@ -109,6 +115,7 @@ bool Authentication::areCredentialsValid(const Credentials & credentials, const
                 return checkPasswordDoubleSHA1MySQL(mysql_credentials->getScramble(), mysql_credentials->getScrambledPassword(), auth_data.getPasswordHashBinary());
 
             case AuthenticationType::SHA256_PASSWORD:
+            case AuthenticationType::BCRYPT_PASSWORD:
             case AuthenticationType::LDAP:
             case AuthenticationType::KERBEROS:
                 throw Authentication::Require<BasicCredentials>("ClickHouse Basic Authentication");
@@ -146,6 +153,9 @@ bool Authentication::areCredentialsValid(const Credentials & credentials, const
             case AuthenticationType::SSL_CERTIFICATE:
                 throw Authentication::Require<BasicCredentials>("ClickHouse X.509 Authentication");
 
+            case AuthenticationType::BCRYPT_PASSWORD:
+                return checkPasswordBcrypt(basic_credentials->getPassword(), auth_data.getPasswordHashBinary());
+
             case AuthenticationType::MAX:
                 break;
         }
@@ -159,6 +169,7 @@ bool Authentication::areCredentialsValid(const Credentials & credentials, const
             case AuthenticationType::PLAINTEXT_PASSWORD:
             case AuthenticationType::SHA256_PASSWORD:
             case AuthenticationType::DOUBLE_SHA1_PASSWORD:
+            case AuthenticationType::BCRYPT_PASSWORD:
             case AuthenticationType::LDAP:
                 throw Authentication::Require<BasicCredentials>("ClickHouse Basic Authentication");
 
diff --git a/src/Access/Authentication.h b/src/Access/Authentication.h
index ab787851cb2..d1e00a28ebb 100644
--- a/src/Access/Authentication.h
+++ b/src/Access/Authentication.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Access/Common/AuthenticationData.h>
+#include <Access/AuthenticationData.h>
 #include <Common/Exception.h>
 #include <base/types.h>
 
diff --git a/src/Access/AuthenticationData.cpp b/src/Access/AuthenticationData.cpp
new file mode 100644
index 00000000000..3bb0be160f4
--- /dev/null
+++ b/src/Access/AuthenticationData.cpp
@@ -0,0 +1,449 @@
+#include <Access/AccessControl.h>
+#include <Access/AuthenticationData.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTLiteral.h>
+#include <Storages/checkAndGetLiteralArgument.h>
+
+#include <Common/OpenSSLHelpers.h>
+#include <Poco/SHA1Engine.h>
+#include <base/types.h>
+#include <base/hex.h>
+#include <boost/algorithm/hex.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+
+#include "config.h"
+
+#if USE_SSL
+#     include <openssl/crypto.h>
+#     include <openssl/rand.h>
+#     include <openssl/err.h>
+#endif
+
+#if USE_BCRYPT
+#     include <bcrypt.h>
+#endif
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int SUPPORT_IS_DISABLED;
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
+    extern const int OPENSSL_ERROR;
+}
+
+AuthenticationData::Digest AuthenticationData::Util::encodeSHA256(std::string_view text [[maybe_unused]])
+{
+#if USE_SSL
+    Digest hash;
+    hash.resize(32);
+    ::DB::encodeSHA256(text, hash.data());
+    return hash;
+#else
+    throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SHA256 passwords support is disabled, because ClickHouse was built without SSL library");
+#endif
+}
+
+
+AuthenticationData::Digest AuthenticationData::Util::encodeSHA1(std::string_view text)
+{
+    Poco::SHA1Engine engine;
+    engine.update(text.data(), text.size());
+    return engine.digest();
+}
+
+AuthenticationData::Digest AuthenticationData::Util::encodeBcrypt(std::string_view text [[maybe_unused]], int workfactor [[maybe_unused]])
+{
+#if USE_BCRYPT
+    if (text.size() > 72)
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "bcrypt does not support passwords with a length of more than 72 bytes");
+
+    char salt[BCRYPT_HASHSIZE];
+    Digest hash;
+    hash.resize(64);
+
+    int ret = bcrypt_gensalt(workfactor, salt);
+    if (ret != 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "BCrypt library failed: bcrypt_gensalt returned {}", ret);
+
+    ret = bcrypt_hashpw(text.data(), salt, reinterpret_cast<char *>(hash.data()));
+    if (ret != 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "BCrypt library failed: bcrypt_hashpw returned {}", ret);
+
+    return hash;
+#else
+    throw Exception(
+        ErrorCodes::SUPPORT_IS_DISABLED,
+        "bcrypt passwords support is disabled, because ClickHouse was built without bcrypt library");
+#endif
+}
+
+bool AuthenticationData::Util::checkPasswordBcrypt(std::string_view password [[maybe_unused]], const Digest & password_bcrypt [[maybe_unused]])
+{
+#if USE_BCRYPT
+    int ret = bcrypt_checkpw(password.data(), reinterpret_cast<const char *>(password_bcrypt.data()));
+    if (ret == -1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "BCrypt library failed: bcrypt_checkpw returned {}", ret);
+    return (ret == 0);
+#else
+    throw Exception(
+        ErrorCodes::SUPPORT_IS_DISABLED,
+        "bcrypt passwords support is disabled, because ClickHouse was built without bcrypt library");
+#endif
+}
+
+bool operator ==(const AuthenticationData & lhs, const AuthenticationData & rhs)
+{
+    return (lhs.type == rhs.type) && (lhs.password_hash == rhs.password_hash)
+        && (lhs.ldap_server_name == rhs.ldap_server_name) && (lhs.kerberos_realm == rhs.kerberos_realm)
+        && (lhs.ssl_certificate_common_names == rhs.ssl_certificate_common_names);
+}
+
+
+void AuthenticationData::setPassword(const String & password_)
+{
+    switch (type)
+    {
+        case AuthenticationType::PLAINTEXT_PASSWORD:
+            return setPasswordHashBinary(Util::stringToDigest(password_));
+
+        case AuthenticationType::SHA256_PASSWORD:
+            return setPasswordHashBinary(Util::encodeSHA256(password_));
+
+        case AuthenticationType::DOUBLE_SHA1_PASSWORD:
+            return setPasswordHashBinary(Util::encodeDoubleSHA1(password_));
+
+        case AuthenticationType::BCRYPT_PASSWORD:
+        case AuthenticationType::NO_PASSWORD:
+        case AuthenticationType::LDAP:
+        case AuthenticationType::KERBEROS:
+        case AuthenticationType::SSL_CERTIFICATE:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot specify password for authentication type {}", toString(type));
+
+        case AuthenticationType::MAX:
+            break;
+    }
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "setPassword(): authentication type {} not supported", toString(type));
+}
+
+void AuthenticationData::setPasswordBcrypt(const String & password_, int workfactor_)
+{
+    if (type != AuthenticationType::BCRYPT_PASSWORD)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot specify bcrypt password for authentication type {}", toString(type));
+
+    return setPasswordHashBinary(Util::encodeBcrypt(password_, workfactor_));
+}
+
+String AuthenticationData::getPassword() const
+{
+    if (type != AuthenticationType::PLAINTEXT_PASSWORD)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot decode the password");
+    return String(password_hash.data(), password_hash.data() + password_hash.size());
+}
+
+
+void AuthenticationData::setPasswordHashHex(const String & hash)
+{
+    Digest digest;
+    digest.resize(hash.size() / 2);
+
+    try
+    {
+        boost::algorithm::unhex(hash.begin(), hash.end(), digest.data());
+    }
+    catch (const std::exception &)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot read password hash in hex, check for valid characters [0-9a-fA-F] and length");
+    }
+
+    setPasswordHashBinary(digest);
+}
+
+
+String AuthenticationData::getPasswordHashHex() const
+{
+    if (type == AuthenticationType::LDAP || type == AuthenticationType::KERBEROS || type == AuthenticationType::SSL_CERTIFICATE)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot get password hex hash for authentication type {}", toString(type));
+
+    String hex;
+    hex.resize(password_hash.size() * 2);
+    boost::algorithm::hex(password_hash.begin(), password_hash.end(), hex.data());
+    return hex;
+}
+
+
+void AuthenticationData::setPasswordHashBinary(const Digest & hash)
+{
+    switch (type)
+    {
+        case AuthenticationType::PLAINTEXT_PASSWORD:
+        {
+            password_hash = hash;
+            return;
+        }
+
+        case AuthenticationType::SHA256_PASSWORD:
+        {
+            if (hash.size() != 32)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "Password hash for the 'SHA256_PASSWORD' authentication type has length {} "
+                                "but must be exactly 32 bytes.", hash.size());
+            password_hash = hash;
+            return;
+        }
+
+        case AuthenticationType::DOUBLE_SHA1_PASSWORD:
+        {
+            if (hash.size() != 20)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "Password hash for the 'DOUBLE_SHA1_PASSWORD' authentication type has length {} "
+                                "but must be exactly 20 bytes.", hash.size());
+            password_hash = hash;
+            return;
+        }
+
+        case AuthenticationType::BCRYPT_PASSWORD:
+        {
+            /// Depending on the workfactor the resulting hash can be 59 or 60 characters long.
+            /// However the library we use to encode it requires hash string to be 64 characters long,
+            ///  so we also allow the hash of this length.
+
+            if (hash.size() != 59 && hash.size() != 60 && hash.size() != 64)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "Password hash for the 'BCRYPT_PASSWORD' authentication type has length {} "
+                                "but must be 59 or 60 bytes.", hash.size());
+            password_hash = hash;
+            password_hash.resize(64);
+            return;
+        }
+
+        case AuthenticationType::NO_PASSWORD:
+        case AuthenticationType::LDAP:
+        case AuthenticationType::KERBEROS:
+        case AuthenticationType::SSL_CERTIFICATE:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot specify password binary hash for authentication type {}", toString(type));
+
+        case AuthenticationType::MAX:
+            break;
+    }
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "setPasswordHashBinary(): authentication type {} not supported", toString(type));
+}
+
+void AuthenticationData::setSalt(String salt_)
+{
+    if (type != AuthenticationType::SHA256_PASSWORD)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "setSalt(): authentication type {} not supported", toString(type));
+    salt = std::move(salt_);
+}
+
+String AuthenticationData::getSalt() const
+{
+    return salt;
+}
+
+void AuthenticationData::setSSLCertificateCommonNames(boost::container::flat_set<String> common_names_)
+{
+    if (common_names_.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "The 'SSL CERTIFICATE' authentication type requires a non-empty list of common names.");
+    ssl_certificate_common_names = std::move(common_names_);
+}
+
+std::shared_ptr<ASTAuthenticationData> AuthenticationData::toAST() const
+{
+    auto node = std::make_shared<ASTAuthenticationData>();
+    auto auth_type = getType();
+    node->type = auth_type;
+
+    switch (auth_type)
+    {
+        case AuthenticationType::PLAINTEXT_PASSWORD:
+        {
+            node->contains_password = true;
+            node->children.push_back(std::make_shared<ASTLiteral>(getPassword()));
+            break;
+        }
+        case AuthenticationType::SHA256_PASSWORD:
+        {
+            node->contains_hash = true;
+            node->children.push_back(std::make_shared<ASTLiteral>(getPasswordHashHex()));
+
+            if (!getSalt().empty())
+                node->children.push_back(std::make_shared<ASTLiteral>(getSalt()));
+            break;
+        }
+        case AuthenticationType::DOUBLE_SHA1_PASSWORD:
+        {
+            node->contains_hash = true;
+            node->children.push_back(std::make_shared<ASTLiteral>(getPasswordHashHex()));
+            break;
+        }
+        case AuthenticationType::BCRYPT_PASSWORD:
+        {
+            node->contains_hash = true;
+            node->children.push_back(std::make_shared<ASTLiteral>(AuthenticationData::Util::digestToString(getPasswordHashBinary())));
+            break;
+        }
+        case AuthenticationType::LDAP:
+        {
+            node->children.push_back(std::make_shared<ASTLiteral>(getLDAPServerName()));
+            break;
+        }
+        case AuthenticationType::KERBEROS:
+        {
+            const auto & realm = getKerberosRealm();
+
+            if (!realm.empty())
+                node->children.push_back(std::make_shared<ASTLiteral>(realm));
+
+            break;
+        }
+        case AuthenticationType::SSL_CERTIFICATE:
+        {
+            for (const auto & name : getSSLCertificateCommonNames())
+                node->children.push_back(std::make_shared<ASTLiteral>(name));
+
+            break;
+        }
+
+        case AuthenticationType::NO_PASSWORD: [[fallthrough]];
+        case AuthenticationType::MAX:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "AST: Unexpected authentication type {}", toString(auth_type));
+    }
+
+    return node;
+}
+
+
+AuthenticationData AuthenticationData::fromAST(const ASTAuthenticationData & query, ContextPtr context, bool check_password_rules)
+{
+    if (query.type && query.type == AuthenticationType::NO_PASSWORD)
+        return AuthenticationData();
+
+    size_t args_size = query.children.size();
+    ASTs args(args_size);
+    for (size_t i = 0; i < args_size; ++i)
+        args[i] = evaluateConstantExpressionAsLiteral(query.children[i], context);
+
+    if (query.contains_password)
+    {
+        if (!query.type && !context)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot get default password type without context");
+
+        if (check_password_rules && !context)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot check password complexity rules without context");
+
+        if (query.type == AuthenticationType::BCRYPT_PASSWORD && !context)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot get bcrypt work factor without context");
+
+        String value = checkAndGetLiteralArgument<String>(args[0], "password");
+
+        AuthenticationType current_type;
+
+        if (query.type)
+            current_type = *query.type;
+        else
+            current_type = context->getAccessControl().getDefaultPasswordType();
+
+        AuthenticationData auth_data(current_type);
+
+        if (check_password_rules)
+            context->getAccessControl().checkPasswordComplexityRules(value);
+
+        if (query.type == AuthenticationType::BCRYPT_PASSWORD)
+        {
+            int workfactor = context->getAccessControl().getBcryptWorkfactor();
+            auth_data.setPasswordBcrypt(value, workfactor);
+            return auth_data;
+        }
+
+        if (query.type == AuthenticationType::SHA256_PASSWORD)
+        {
+#if USE_SSL
+            ///random generator FIPS complaint
+            uint8_t key[32];
+            if (RAND_bytes(key, sizeof(key)) != 1)
+            {
+                char buf[512] = {0};
+                ERR_error_string_n(ERR_get_error(), buf, sizeof(buf));
+                throw Exception(ErrorCodes::OPENSSL_ERROR, "Cannot generate salt for password. OpenSSL {}", buf);
+            }
+
+            String salt;
+            salt.resize(sizeof(key) * 2);
+            char * buf_pos = salt.data();
+            for (uint8_t k : key)
+            {
+                writeHexByteUppercase(k, buf_pos);
+                buf_pos += 2;
+            }
+            value.append(salt);
+            auth_data.setSalt(salt);
+#else
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+                            "SHA256 passwords support is disabled, because ClickHouse was built without SSL library");
+#endif
+        }
+
+        auth_data.setPassword(value);
+        return auth_data;
+    }
+
+    AuthenticationData auth_data(*query.type);
+
+    if (query.contains_hash)
+    {
+        String value = checkAndGetLiteralArgument<String>(args[0], "hash");
+
+        if (query.type == AuthenticationType::BCRYPT_PASSWORD)
+        {
+            auth_data.setPasswordHashBinary(AuthenticationData::Util::stringToDigest(value));
+            return auth_data;
+        }
+        else
+        {
+            auth_data.setPasswordHashHex(value);
+        }
+
+        if (query.type == AuthenticationType::SHA256_PASSWORD && args_size == 2)
+        {
+            String parsed_salt = checkAndGetLiteralArgument<String>(args[1], "salt");
+            auth_data.setSalt(parsed_salt);
+        }
+    }
+    else if (query.type == AuthenticationType::LDAP)
+    {
+        String value = checkAndGetLiteralArgument<String>(args[0], "ldap_server_name");
+        auth_data.setLDAPServerName(value);
+    }
+    else if (query.type == AuthenticationType::KERBEROS)
+    {
+        if (!args.empty())
+        {
+            String value = checkAndGetLiteralArgument<String>(args[0], "kerberos_realm");
+            auth_data.setKerberosRealm(value);
+        }
+    }
+    else if (query.type == AuthenticationType::SSL_CERTIFICATE)
+    {
+        boost::container::flat_set<String> common_names;
+        for (const auto & arg : args)
+            common_names.insert(checkAndGetLiteralArgument<String>(arg, "common_name"));
+
+        auth_data.setSSLCertificateCommonNames(std::move(common_names));
+    }
+    else
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected ASTAuthenticationData structure");
+    }
+
+    return auth_data;
+}
+
+}
diff --git a/src/Access/Common/AuthenticationData.h b/src/Access/AuthenticationData.h
similarity index 73%
rename from src/Access/Common/AuthenticationData.h
rename to src/Access/AuthenticationData.h
index ced9fcd4b6d..5ebef7d44f2 100644
--- a/src/Access/Common/AuthenticationData.h
+++ b/src/Access/AuthenticationData.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <Access/Common/AuthenticationType.h>
+#include <Parsers/Access/ASTAuthenticationData.h>
+#include <Interpreters/Context_fwd.h>
+
 #include <base/types.h>
 #include <boost/container/flat_set.hpp>
 #include <vector>
@@ -7,47 +11,6 @@
 namespace DB
 {
 
-enum class AuthenticationType
-{
-    /// User doesn't have to enter password.
-    NO_PASSWORD,
-
-    /// Password is stored as is.
-    PLAINTEXT_PASSWORD,
-
-    /// Password is encrypted in SHA256 hash.
-    SHA256_PASSWORD,
-
-    /// SHA1(SHA1(password)).
-    /// This kind of hash is used by the `mysql_native_password` authentication plugin.
-    DOUBLE_SHA1_PASSWORD,
-
-    /// Password is checked by a [remote] LDAP server. Connection will be made at each authentication attempt.
-    LDAP,
-
-    /// Kerberos authentication performed through GSS-API negotiation loop.
-    KERBEROS,
-
-    /// Authentication is done in SSL by checking user certificate.
-    /// Certificates may only be trusted if 'strict' SSL mode is enabled.
-    SSL_CERTIFICATE,
-
-    MAX,
-};
-
-struct AuthenticationTypeInfo
-{
-    const char * const raw_name;
-    const String name; /// Lowercased with underscores, e.g. "sha256_password".
-    static const AuthenticationTypeInfo & get(AuthenticationType type_);
-};
-
-inline String toString(AuthenticationType type_)
-{
-    return AuthenticationTypeInfo::get(type_).raw_name;
-}
-
-
 /// Stores data for checking password when a user logins.
 class AuthenticationData
 {
@@ -80,6 +43,9 @@ public:
     void setSalt(String salt);
     String getSalt() const;
 
+    /// Sets the password using bcrypt hash with specified workfactor
+    void setPasswordBcrypt(const String & password_, int workfactor_);
+
     /// Sets the server name for authentication type LDAP.
     const String & getLDAPServerName() const { return ldap_server_name; }
     void setLDAPServerName(const String & name) { ldap_server_name = name; }
@@ -94,14 +60,20 @@ public:
     friend bool operator ==(const AuthenticationData & lhs, const AuthenticationData & rhs);
     friend bool operator !=(const AuthenticationData & lhs, const AuthenticationData & rhs) { return !(lhs == rhs); }
 
+    static AuthenticationData fromAST(const ASTAuthenticationData & query, ContextPtr context, bool check_password_rules);
+    std::shared_ptr<ASTAuthenticationData> toAST() const;
+
     struct Util
     {
+        static String digestToString(const Digest & text) { return String(text.data(), text.data() + text.size()); }
         static Digest stringToDigest(std::string_view text) { return Digest(text.data(), text.data() + text.size()); }
         static Digest encodeSHA256(std::string_view text);
         static Digest encodeSHA1(std::string_view text);
         static Digest encodeSHA1(const Digest & text) { return encodeSHA1(std::string_view{reinterpret_cast<const char *>(text.data()), text.size()}); }
         static Digest encodeDoubleSHA1(std::string_view text) { return encodeSHA1(encodeSHA1(text)); }
         static Digest encodeDoubleSHA1(const Digest & text) { return encodeSHA1(encodeSHA1(text)); }
+        static Digest encodeBcrypt(std::string_view text, int workfactor);
+        static bool checkPasswordBcrypt(std::string_view password, const Digest & password_bcrypt);
     };
 
 private:
diff --git a/src/Access/Common/AccessFlags.cpp b/src/Access/Common/AccessFlags.cpp
index bef165ba4e6..8612fc2309e 100644
--- a/src/Access/Common/AccessFlags.cpp
+++ b/src/Access/Common/AccessFlags.cpp
@@ -15,6 +15,7 @@ namespace ErrorCodes
 {
     extern const int UNKNOWN_ACCESS_TYPE;
     extern const int LOGICAL_ERROR;
+    extern const int MIXED_ACCESS_PARAMETER_TYPES;
 }
 
 namespace
@@ -96,11 +97,14 @@ namespace
 
         const Flags & getAllFlags() const { return all_flags; }
         const Flags & getGlobalFlags() const { return all_flags_for_target[GLOBAL]; }
+        const Flags & getGlobalWithParameterFlags() const { return all_flags_grantable_on_global_with_parameter_level; }
         const Flags & getDatabaseFlags() const { return all_flags_for_target[DATABASE]; }
         const Flags & getTableFlags() const { return all_flags_for_target[TABLE]; }
         const Flags & getColumnFlags() const { return all_flags_for_target[COLUMN]; }
         const Flags & getDictionaryFlags() const { return all_flags_for_target[DICTIONARY]; }
+        const Flags & getNamedCollectionFlags() const { return all_flags_for_target[NAMED_COLLECTION]; }
         const Flags & getAllFlagsGrantableOnGlobalLevel() const { return getAllFlags(); }
+        const Flags & getAllFlagsGrantableOnGlobalWithParameterLevel() const { return getGlobalWithParameterFlags(); }
         const Flags & getAllFlagsGrantableOnDatabaseLevel() const { return all_flags_grantable_on_database_level; }
         const Flags & getAllFlagsGrantableOnTableLevel() const { return all_flags_grantable_on_table_level; }
         const Flags & getAllFlagsGrantableOnColumnLevel() const { return getColumnFlags(); }
@@ -116,6 +120,7 @@ namespace
             VIEW = TABLE,
             COLUMN,
             DICTIONARY,
+            NAMED_COLLECTION,
         };
 
         struct Node;
@@ -295,6 +300,7 @@ namespace
                 collectAllFlags(child.get());
 
             all_flags_grantable_on_table_level = all_flags_for_target[TABLE] | all_flags_for_target[DICTIONARY] | all_flags_for_target[COLUMN];
+            all_flags_grantable_on_global_with_parameter_level = all_flags_for_target[NAMED_COLLECTION];
             all_flags_grantable_on_database_level = all_flags_for_target[DATABASE] | all_flags_grantable_on_table_level;
         }
 
@@ -345,12 +351,44 @@ namespace
         std::unordered_map<std::string_view, Flags> keyword_to_flags_map;
         std::vector<Flags> access_type_to_flags_mapping;
         Flags all_flags;
-        Flags all_flags_for_target[static_cast<size_t>(DICTIONARY) + 1];
+        Flags all_flags_for_target[static_cast<size_t>(NAMED_COLLECTION) + 1];
         Flags all_flags_grantable_on_database_level;
         Flags all_flags_grantable_on_table_level;
+        Flags all_flags_grantable_on_global_with_parameter_level;
     };
 }
 
+bool AccessFlags::isGlobalWithParameter() const
+{
+    return getParameterType() != AccessFlags::NONE;
+}
+
+std::unordered_map<AccessFlags::ParameterType, AccessFlags> AccessFlags::splitIntoParameterTypes() const
+{
+    std::unordered_map<ParameterType, AccessFlags> result;
+
+    auto named_collection_flags = AccessFlags::allNamedCollectionFlags() & *this;
+    if (named_collection_flags)
+        result.emplace(ParameterType::NAMED_COLLECTION, named_collection_flags);
+
+    auto other_flags = (~AccessFlags::allNamedCollectionFlags()) & *this;
+    if (other_flags)
+        result.emplace(ParameterType::NONE, other_flags);
+
+    return result;
+}
+
+AccessFlags::ParameterType AccessFlags::getParameterType() const
+{
+    if (isEmpty() || !AccessFlags::allGlobalWithParameterFlags().contains(*this))
+        return AccessFlags::NONE;
+
+    /// All flags refer to NAMED COLLECTION access type.
+    if (AccessFlags::allNamedCollectionFlags().contains(*this))
+        return AccessFlags::NAMED_COLLECTION;
+
+    throw Exception(ErrorCodes::MIXED_ACCESS_PARAMETER_TYPES, "Having mixed parameter types: {}", toString());
+}
 
 AccessFlags::AccessFlags(AccessType type) : flags(Helper::instance().accessTypeToFlags(type)) {}
 AccessFlags::AccessFlags(std::string_view keyword) : flags(Helper::instance().keywordToFlags(keyword)) {}
@@ -361,11 +399,14 @@ std::vector<AccessType> AccessFlags::toAccessTypes() const { return Helper::inst
 std::vector<std::string_view> AccessFlags::toKeywords() const { return Helper::instance().flagsToKeywords(flags); }
 AccessFlags AccessFlags::allFlags() { return Helper::instance().getAllFlags(); }
 AccessFlags AccessFlags::allGlobalFlags() { return Helper::instance().getGlobalFlags(); }
+AccessFlags AccessFlags::allGlobalWithParameterFlags() { return Helper::instance().getGlobalWithParameterFlags(); }
 AccessFlags AccessFlags::allDatabaseFlags() { return Helper::instance().getDatabaseFlags(); }
 AccessFlags AccessFlags::allTableFlags() { return Helper::instance().getTableFlags(); }
 AccessFlags AccessFlags::allColumnFlags() { return Helper::instance().getColumnFlags(); }
 AccessFlags AccessFlags::allDictionaryFlags() { return Helper::instance().getDictionaryFlags(); }
+AccessFlags AccessFlags::allNamedCollectionFlags() { return Helper::instance().getNamedCollectionFlags(); }
 AccessFlags AccessFlags::allFlagsGrantableOnGlobalLevel() { return Helper::instance().getAllFlagsGrantableOnGlobalLevel(); }
+AccessFlags AccessFlags::allFlagsGrantableOnGlobalWithParameterLevel() { return Helper::instance().getAllFlagsGrantableOnGlobalWithParameterLevel(); }
 AccessFlags AccessFlags::allFlagsGrantableOnDatabaseLevel() { return Helper::instance().getAllFlagsGrantableOnDatabaseLevel(); }
 AccessFlags AccessFlags::allFlagsGrantableOnTableLevel() { return Helper::instance().getAllFlagsGrantableOnTableLevel(); }
 AccessFlags AccessFlags::allFlagsGrantableOnColumnLevel() { return Helper::instance().getAllFlagsGrantableOnColumnLevel(); }
diff --git a/src/Access/Common/AccessFlags.h b/src/Access/Common/AccessFlags.h
index c4e0b7ac281..270ee1c0045 100644
--- a/src/Access/Common/AccessFlags.h
+++ b/src/Access/Common/AccessFlags.h
@@ -48,8 +48,17 @@ public:
     AccessFlags operator ~() const { AccessFlags res; res.flags = ~flags; return res; }
 
     bool isEmpty() const { return flags.none(); }
+    bool isAll() const { return flags.all(); }
     explicit operator bool() const { return !isEmpty(); }
     bool contains(const AccessFlags & other) const { return (flags & other.flags) == other.flags; }
+    bool isGlobalWithParameter() const;
+    enum ParameterType
+    {
+        NONE,
+        NAMED_COLLECTION,
+    };
+    ParameterType getParameterType() const;
+    std::unordered_map<ParameterType, AccessFlags> splitIntoParameterTypes() const;
 
     friend bool operator ==(const AccessFlags & left, const AccessFlags & right) { return left.flags == right.flags; }
     friend bool operator !=(const AccessFlags & left, const AccessFlags & right) { return !(left == right); }
@@ -76,6 +85,8 @@ public:
     /// Returns all the global flags.
     static AccessFlags allGlobalFlags();
 
+    static AccessFlags allGlobalWithParameterFlags();
+
     /// Returns all the flags related to a database.
     static AccessFlags allDatabaseFlags();
 
@@ -88,10 +99,16 @@ public:
     /// Returns all the flags related to a dictionary.
     static AccessFlags allDictionaryFlags();
 
+    /// Returns all the flags related to a named collection.
+    static AccessFlags allNamedCollectionFlags();
+
     /// Returns all the flags which could be granted on the global level.
     /// The same as allFlags().
     static AccessFlags allFlagsGrantableOnGlobalLevel();
 
+    /// Returns all the flags which could be granted on the global with parameter level.
+    static AccessFlags allFlagsGrantableOnGlobalWithParameterLevel();
+
     /// Returns all the flags which could be granted on the database level.
     /// Returns allDatabaseFlags() | allTableFlags() | allDictionaryFlags() | allColumnFlags().
     static AccessFlags allFlagsGrantableOnDatabaseLevel();
diff --git a/src/Access/Common/AccessRightsElement.cpp b/src/Access/Common/AccessRightsElement.cpp
index 69a2354f25d..e11d43634ec 100644
--- a/src/Access/Common/AccessRightsElement.cpp
+++ b/src/Access/Common/AccessRightsElement.cpp
@@ -21,24 +21,31 @@ namespace
         result += ")";
     }
 
-    void formatONClause(const String & database, bool any_database, const String & table, bool any_table, String & result)
+    void formatONClause(const AccessRightsElement & element, String & result)
     {
         result += "ON ";
-        if (any_database)
+        if (element.isGlobalWithParameter())
+        {
+            if (element.any_parameter)
+                result += "*";
+            else
+                result += backQuoteIfNeed(element.parameter);
+        }
+        else if (element.any_database)
         {
             result += "*.*";
         }
         else
         {
-            if (!database.empty())
+            if (!element.database.empty())
             {
-                result += backQuoteIfNeed(database);
+                result += backQuoteIfNeed(element.database);
                 result += ".";
             }
-            if (any_table)
+            if (element.any_table)
                 result += "*";
             else
-                result += backQuoteIfNeed(table);
+                result += backQuoteIfNeed(element.table);
         }
     }
 
@@ -96,7 +103,7 @@ namespace
         String result;
         formatAccessFlagsWithColumns(element.access_flags, element.columns, element.any_column, result);
         result += " ";
-        formatONClause(element.database, element.any_database, element.table, element.any_table, result);
+        formatONClause(element, result);
         if (with_options)
             formatOptions(element.grant_option, element.is_partial_revoke, result);
         return result;
@@ -122,14 +129,16 @@ namespace
             if (i != elements.size() - 1)
             {
                 const auto & next_element = elements[i + 1];
-                if (element.sameDatabaseAndTable(next_element) && element.sameOptions(next_element))
+                if (element.sameDatabaseAndTableAndParameter(next_element) && element.sameOptions(next_element))
+                {
                     next_element_uses_same_table_and_options = true;
+                }
             }
 
             if (!next_element_uses_same_table_and_options)
             {
                 part += " ";
-                formatONClause(element.database, element.any_database, element.table, element.any_table, part);
+                formatONClause(element, part);
                 if (with_options)
                     formatOptions(element.grant_option, element.is_partial_revoke, part);
                 if (result.empty())
@@ -164,6 +173,7 @@ AccessRightsElement::AccessRightsElement(
     , any_database(false)
     , any_table(false)
     , any_column(false)
+    , any_parameter(false)
 {
 }
 
@@ -188,12 +198,15 @@ AccessRightsElement::AccessRightsElement(
     , any_database(false)
     , any_table(false)
     , any_column(false)
+    , any_parameter(false)
 {
 }
 
 void AccessRightsElement::eraseNonGrantable()
 {
-    if (!any_column)
+    if (isGlobalWithParameter() && !any_parameter)
+        access_flags &= AccessFlags::allFlagsGrantableOnGlobalWithParameterLevel();
+    else if (!any_column)
         access_flags &= AccessFlags::allFlagsGrantableOnColumnLevel();
     else if (!any_table)
         access_flags &= AccessFlags::allFlagsGrantableOnTableLevel();
@@ -215,6 +228,11 @@ String AccessRightsElement::toStringWithoutOptions() const { return toStringImpl
 
 bool AccessRightsElements::empty() const { return std::all_of(begin(), end(), [](const AccessRightsElement & e) { return e.empty(); }); }
 
+bool AccessRightsElements::sameDatabaseAndTableAndParameter() const
+{
+    return (size() < 2) || std::all_of(std::next(begin()), end(), [this](const AccessRightsElement & e) { return e.sameDatabaseAndTableAndParameter(front()); });
+}
+
 bool AccessRightsElements::sameDatabaseAndTable() const
 {
     return (size() < 2) || std::all_of(std::next(begin()), end(), [this](const AccessRightsElement & e) { return e.sameDatabaseAndTable(front()); });
diff --git a/src/Access/Common/AccessRightsElement.h b/src/Access/Common/AccessRightsElement.h
index 5f65b6bcd12..ba625fc43df 100644
--- a/src/Access/Common/AccessRightsElement.h
+++ b/src/Access/Common/AccessRightsElement.h
@@ -11,12 +11,17 @@ namespace DB
 struct AccessRightsElement
 {
     AccessFlags access_flags;
+
     String database;
     String table;
     Strings columns;
+    String parameter;
+
     bool any_database = true;
     bool any_table = true;
     bool any_column = true;
+    bool any_parameter = false;
+
     bool grant_option = false;
     bool is_partial_revoke = false;
 
@@ -44,14 +49,26 @@ struct AccessRightsElement
 
     bool empty() const { return !access_flags || (!any_column && columns.empty()); }
 
-    auto toTuple() const { return std::tie(access_flags, any_database, database, any_table, table, any_column, columns, grant_option, is_partial_revoke); }
+    auto toTuple() const { return std::tie(access_flags, any_database, database, any_table, table, any_column, columns, any_parameter, parameter, grant_option, is_partial_revoke); }
     friend bool operator==(const AccessRightsElement & left, const AccessRightsElement & right) { return left.toTuple() == right.toTuple(); }
     friend bool operator!=(const AccessRightsElement & left, const AccessRightsElement & right) { return !(left == right); }
 
+    bool sameDatabaseAndTableAndParameter(const AccessRightsElement & other) const
+    {
+        return sameDatabaseAndTable(other) && sameParameter(other);
+    }
+
+    bool sameParameter(const AccessRightsElement & other) const
+    {
+        return (parameter == other.parameter) && (any_parameter == other.any_parameter)
+            && (access_flags.getParameterType() == other.access_flags.getParameterType())
+            && (isGlobalWithParameter() == other.isGlobalWithParameter());
+    }
+
     bool sameDatabaseAndTable(const AccessRightsElement & other) const
     {
-        return (database == other.database) && (any_database == other.any_database) && (table == other.table)
-            && (any_table == other.any_table);
+        return (database == other.database) && (any_database == other.any_database)
+            && (table == other.table) && (any_table == other.any_table);
     }
 
     bool sameOptions(const AccessRightsElement & other) const
@@ -67,6 +84,8 @@ struct AccessRightsElement
     /// If the database is empty, replaces it with `current_database`. Otherwise does nothing.
     void replaceEmptyDatabase(const String & current_database);
 
+    bool isGlobalWithParameter() const { return access_flags.isGlobalWithParameter(); }
+
     /// Returns a human-readable representation like "GRANT SELECT, UPDATE(x, y) ON db.table".
     String toString() const;
     String toStringWithoutOptions() const;
@@ -81,6 +100,7 @@ public:
     using Base::Base;
 
     bool empty() const;
+    bool sameDatabaseAndTableAndParameter() const;
     bool sameDatabaseAndTable() const;
     bool sameOptions() const;
 
diff --git a/src/Access/Common/AccessType.h b/src/Access/Common/AccessType.h
index f57cc2886e3..6394c0279a7 100644
--- a/src/Access/Common/AccessType.h
+++ b/src/Access/Common/AccessType.h
@@ -12,9 +12,10 @@ enum class AccessType
 /// Macro M should be defined as M(name, aliases, node_type, parent_group_name)
 /// where name is identifier with underscores (instead of spaces);
 /// aliases is a string containing comma-separated list;
-/// node_type either specifies access type's level (GLOBAL/DATABASE/TABLE/DICTIONARY/VIEW/COLUMNS),
+/// node_type either specifies access type's level (GLOBAL/NAMED_COLLECTION/DATABASE/TABLE/DICTIONARY/VIEW/COLUMNS),
 /// or specifies that the access type is a GROUP of other access types;
 /// parent_group_name is the name of the group containing this access type (or NONE if there is no such group).
+/// NOTE A parent group must be declared AFTER all its children.
 #define APPLY_FOR_ACCESS_TYPES(M) \
     M(SHOW_DATABASES, "", DATABASE, SHOW) /* allows to execute SHOW DATABASES, SHOW CREATE DATABASE, USE <database>;
                                              implicitly enabled by any grant on the database */\
@@ -69,7 +70,7 @@ enum class AccessType
     M(ALTER_FREEZE_PARTITION, "FREEZE PARTITION, UNFREEZE", TABLE, ALTER_TABLE) \
     \
     M(ALTER_DATABASE_SETTINGS, "ALTER DATABASE SETTING, ALTER MODIFY DATABASE SETTING, MODIFY DATABASE SETTING", DATABASE, ALTER_DATABASE) /* allows to execute ALTER MODIFY SETTING */\
-    M(ALTER_NAMED_COLLECTION, "", GROUP, ALTER) /* allows to execute ALTER NAMED COLLECTION */\
+    M(ALTER_NAMED_COLLECTION, "", NAMED_COLLECTION, NAMED_COLLECTION_CONTROL) /* allows to execute ALTER NAMED COLLECTION */\
     \
     M(ALTER_TABLE, "", GROUP, ALTER) \
     M(ALTER_DATABASE, "", GROUP, ALTER) \
@@ -86,10 +87,12 @@ enum class AccessType
     M(CREATE_VIEW, "", VIEW, CREATE) /* allows to execute {CREATE|ATTACH} VIEW;
                                         implicitly enabled by the grant CREATE_TABLE */\
     M(CREATE_DICTIONARY, "", DICTIONARY, CREATE) /* allows to execute {CREATE|ATTACH} DICTIONARY */\
-    M(CREATE_TEMPORARY_TABLE, "", GLOBAL, CREATE) /* allows to create and manipulate temporary tables;
+    M(CREATE_TEMPORARY_TABLE, "", GLOBAL, CREATE_ARBITRARY_TEMPORARY_TABLE) /* allows to create and manipulate temporary tables;
                                                      implicitly enabled by the grant CREATE_TABLE on any table */ \
+    M(CREATE_ARBITRARY_TEMPORARY_TABLE, "", GLOBAL, CREATE)  /* allows to create  and manipulate temporary tables
+                                                                with arbitrary table engine */\
     M(CREATE_FUNCTION, "", GLOBAL, CREATE) /* allows to execute CREATE FUNCTION */ \
-    M(CREATE_NAMED_COLLECTION, "", GLOBAL, CREATE) /* allows to execute CREATE NAMED COLLECTION */ \
+    M(CREATE_NAMED_COLLECTION, "", NAMED_COLLECTION, NAMED_COLLECTION_CONTROL) /* allows to execute CREATE NAMED COLLECTION */ \
     M(CREATE, "", GROUP, ALL) /* allows to execute {CREATE|ATTACH} */ \
     \
     M(DROP_DATABASE, "", DATABASE, DROP) /* allows to execute {DROP|DETACH} DATABASE */\
@@ -98,9 +101,11 @@ enum class AccessType
                                     implicitly enabled by the grant DROP_TABLE */\
     M(DROP_DICTIONARY, "", DICTIONARY, DROP) /* allows to execute {DROP|DETACH} DICTIONARY */\
     M(DROP_FUNCTION, "", GLOBAL, DROP) /* allows to execute DROP FUNCTION */\
-    M(DROP_NAMED_COLLECTION, "", GLOBAL, DROP) /* allows to execute DROP NAMED COLLECTION */\
+    M(DROP_NAMED_COLLECTION, "", NAMED_COLLECTION, NAMED_COLLECTION_CONTROL) /* allows to execute DROP NAMED COLLECTION */\
     M(DROP, "", GROUP, ALL) /* allows to execute {DROP|DETACH} */\
     \
+    M(UNDROP_TABLE, "", TABLE, ALL) /* allows to execute {UNDROP} TABLE */\
+    \
     M(TRUNCATE, "TRUNCATE TABLE", TABLE, ALL) \
     M(OPTIMIZE, "OPTIMIZE TABLE", TABLE, ALL) \
     M(BACKUP, "", TABLE, ALL) /* allows to backup tables */\
@@ -134,9 +139,10 @@ enum class AccessType
     M(SHOW_QUOTAS, "SHOW CREATE QUOTA", GLOBAL, SHOW_ACCESS) \
     M(SHOW_SETTINGS_PROFILES, "SHOW PROFILES, SHOW CREATE SETTINGS PROFILE, SHOW CREATE PROFILE", GLOBAL, SHOW_ACCESS) \
     M(SHOW_ACCESS, "", GROUP, ACCESS_MANAGEMENT) \
-    M(SHOW_NAMED_COLLECTIONS, "SHOW NAMED COLLECTIONS", GLOBAL, ACCESS_MANAGEMENT) \
-    M(SHOW_NAMED_COLLECTIONS_SECRETS, "SHOW NAMED COLLECTIONS SECRETS", GLOBAL, ACCESS_MANAGEMENT) \
     M(ACCESS_MANAGEMENT, "", GROUP, ALL) \
+    M(SHOW_NAMED_COLLECTIONS, "SHOW NAMED COLLECTIONS", NAMED_COLLECTION, NAMED_COLLECTION_CONTROL) \
+    M(SHOW_NAMED_COLLECTIONS_SECRETS, "SHOW NAMED COLLECTIONS SECRETS", NAMED_COLLECTION, NAMED_COLLECTION_CONTROL) \
+    M(NAMED_COLLECTION_CONTROL, "", NAMED_COLLECTION, ALL) \
     \
     M(SYSTEM_SHUTDOWN, "SYSTEM KILL, SHUTDOWN", GLOBAL, SYSTEM) \
     M(SYSTEM_DROP_DNS_CACHE, "SYSTEM DROP DNS, DROP DNS CACHE, DROP DNS", GLOBAL, SYSTEM_DROP_CACHE) \
@@ -179,9 +185,11 @@ enum class AccessType
     M(SYSTEM_FLUSH, "", GROUP, SYSTEM) \
     M(SYSTEM_THREAD_FUZZER, "SYSTEM START THREAD FUZZER, SYSTEM STOP THREAD FUZZER, START THREAD FUZZER, STOP THREAD FUZZER", GLOBAL, SYSTEM) \
     M(SYSTEM_UNFREEZE, "SYSTEM UNFREEZE", GLOBAL, SYSTEM) \
+    M(SYSTEM_FAILPOINT, "SYSTEM ENABLE FAILPOINT, SYSTEM DISABLE FAILPOINT", GLOBAL, SYSTEM) \
     M(SYSTEM, "", GROUP, ALL) /* allows to execute SYSTEM {SHUTDOWN|RELOAD CONFIG|...} */ \
     \
     M(dictGet, "dictHas, dictGetHierarchy, dictIsIn", DICTIONARY, ALL) /* allows to execute functions dictGet(), dictHas(), dictGetHierarchy(), dictIsIn() */\
+    M(displaySecretsInShowAndSelect, "", GLOBAL, ALL) /* allows to show plaintext secrets in SELECT and SHOW queries. display_secrets_in_show_and_select format and server settings must be turned on */\
     \
     M(addressToLine, "", GLOBAL, INTROSPECTION) /* allows to execute function addressToLine() */\
     M(addressToLineWithInlines, "", GLOBAL, INTROSPECTION) /* allows to execute function addressToLineWithInlines() */\
diff --git a/src/Access/Common/AuthenticationData.cpp b/src/Access/Common/AuthenticationData.cpp
deleted file mode 100644
index 0a22eeb92b3..00000000000
--- a/src/Access/Common/AuthenticationData.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-#include <Access/Common/AuthenticationData.h>
-#include <Common/Exception.h>
-#include <Common/OpenSSLHelpers.h>
-#include <Poco/SHA1Engine.h>
-#include <base/types.h>
-#include <boost/algorithm/hex.hpp>
-#include <boost/algorithm/string/case_conv.hpp>
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int SUPPORT_IS_DISABLED;
-    extern const int BAD_ARGUMENTS;
-    extern const int LOGICAL_ERROR;
-    extern const int NOT_IMPLEMENTED;
-}
-
-
-const AuthenticationTypeInfo & AuthenticationTypeInfo::get(AuthenticationType type_)
-{
-    static constexpr auto make_info = [](const char * raw_name_)
-    {
-        String init_name = raw_name_;
-        boost::to_lower(init_name);
-        return AuthenticationTypeInfo{raw_name_, std::move(init_name)};
-    };
-
-    switch (type_)
-    {
-        case AuthenticationType::NO_PASSWORD:
-        {
-            static const auto info = make_info("NO_PASSWORD");
-            return info;
-        }
-        case AuthenticationType::PLAINTEXT_PASSWORD:
-        {
-            static const auto info = make_info("PLAINTEXT_PASSWORD");
-            return info;
-        }
-        case AuthenticationType::SHA256_PASSWORD:
-        {
-            static const auto info = make_info("SHA256_PASSWORD");
-            return info;
-        }
-        case AuthenticationType::DOUBLE_SHA1_PASSWORD:
-        {
-            static const auto info = make_info("DOUBLE_SHA1_PASSWORD");
-            return info;
-        }
-        case AuthenticationType::LDAP:
-        {
-            static const auto info = make_info("LDAP");
-            return info;
-        }
-        case AuthenticationType::KERBEROS:
-        {
-            static const auto info = make_info("KERBEROS");
-            return info;
-        }
-        case AuthenticationType::SSL_CERTIFICATE:
-        {
-            static const auto info = make_info("SSL_CERTIFICATE");
-            return info;
-        }
-        case AuthenticationType::MAX:
-            break;
-    }
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown authentication type: {}", static_cast<int>(type_));
-}
-
-
-AuthenticationData::Digest AuthenticationData::Util::encodeSHA256(std::string_view text [[maybe_unused]])
-{
-#if USE_SSL
-    Digest hash;
-    hash.resize(32);
-    ::DB::encodeSHA256(text, hash.data());
-    return hash;
-#else
-    throw DB::Exception(DB::ErrorCodes::SUPPORT_IS_DISABLED, "SHA256 passwords support is disabled, because ClickHouse was built without SSL library");
-#endif
-}
-
-
-AuthenticationData::Digest AuthenticationData::Util::encodeSHA1(std::string_view text)
-{
-    Poco::SHA1Engine engine;
-    engine.update(text.data(), text.size());
-    return engine.digest();
-}
-
-
-bool operator ==(const AuthenticationData & lhs, const AuthenticationData & rhs)
-{
-    return (lhs.type == rhs.type) && (lhs.password_hash == rhs.password_hash)
-        && (lhs.ldap_server_name == rhs.ldap_server_name) && (lhs.kerberos_realm == rhs.kerberos_realm)
-        && (lhs.ssl_certificate_common_names == rhs.ssl_certificate_common_names);
-}
-
-
-void AuthenticationData::setPassword(const String & password_)
-{
-    switch (type)
-    {
-        case AuthenticationType::PLAINTEXT_PASSWORD:
-            return setPasswordHashBinary(Util::stringToDigest(password_));
-
-        case AuthenticationType::SHA256_PASSWORD:
-            return setPasswordHashBinary(Util::encodeSHA256(password_));
-
-        case AuthenticationType::DOUBLE_SHA1_PASSWORD:
-            return setPasswordHashBinary(Util::encodeDoubleSHA1(password_));
-
-        case AuthenticationType::NO_PASSWORD:
-        case AuthenticationType::LDAP:
-        case AuthenticationType::KERBEROS:
-        case AuthenticationType::SSL_CERTIFICATE:
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot specify password for authentication type {}", toString(type));
-
-        case AuthenticationType::MAX:
-            break;
-    }
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "setPassword(): authentication type {} not supported", toString(type));
-}
-
-
-String AuthenticationData::getPassword() const
-{
-    if (type != AuthenticationType::PLAINTEXT_PASSWORD)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot decode the password");
-    return String(password_hash.data(), password_hash.data() + password_hash.size());
-}
-
-
-void AuthenticationData::setPasswordHashHex(const String & hash)
-{
-    Digest digest;
-    digest.resize(hash.size() / 2);
-
-    try
-    {
-        boost::algorithm::unhex(hash.begin(), hash.end(), digest.data());
-    }
-    catch (const std::exception &)
-    {
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot read password hash in hex, check for valid characters [0-9a-fA-F] and length");
-    }
-
-    setPasswordHashBinary(digest);
-}
-
-
-String AuthenticationData::getPasswordHashHex() const
-{
-    if (type == AuthenticationType::LDAP || type == AuthenticationType::KERBEROS || type == AuthenticationType::SSL_CERTIFICATE)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot get password hex hash for authentication type {}", toString(type));
-
-    String hex;
-    hex.resize(password_hash.size() * 2);
-    boost::algorithm::hex(password_hash.begin(), password_hash.end(), hex.data());
-    return hex;
-}
-
-
-void AuthenticationData::setPasswordHashBinary(const Digest & hash)
-{
-    switch (type)
-    {
-        case AuthenticationType::PLAINTEXT_PASSWORD:
-        {
-            password_hash = hash;
-            return;
-        }
-
-        case AuthenticationType::SHA256_PASSWORD:
-        {
-            if (hash.size() != 32)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                "Password hash for the 'SHA256_PASSWORD' authentication type has length {} "
-                                "but must be exactly 32 bytes.", hash.size());
-            password_hash = hash;
-            return;
-        }
-
-        case AuthenticationType::DOUBLE_SHA1_PASSWORD:
-        {
-            if (hash.size() != 20)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                "Password hash for the 'DOUBLE_SHA1_PASSWORD' authentication type has length {} "
-                                "but must be exactly 20 bytes.", hash.size());
-            password_hash = hash;
-            return;
-        }
-
-        case AuthenticationType::NO_PASSWORD:
-        case AuthenticationType::LDAP:
-        case AuthenticationType::KERBEROS:
-        case AuthenticationType::SSL_CERTIFICATE:
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot specify password binary hash for authentication type {}", toString(type));
-
-        case AuthenticationType::MAX:
-            break;
-    }
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "setPasswordHashBinary(): authentication type {} not supported", toString(type));
-}
-
-void AuthenticationData::setSalt(String salt_)
-{
-    if (type != AuthenticationType::SHA256_PASSWORD)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "setSalt(): authentication type {} not supported", toString(type));
-    salt = std::move(salt_);
-}
-
-String AuthenticationData::getSalt() const
-{
-    return salt;
-}
-
-void AuthenticationData::setSSLCertificateCommonNames(boost::container::flat_set<String> common_names_)
-{
-    if (common_names_.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "The 'SSL CERTIFICATE' authentication type requires a non-empty list of common names.");
-    ssl_certificate_common_names = std::move(common_names_);
-}
-
-}
diff --git a/src/Access/Common/AuthenticationType.cpp b/src/Access/Common/AuthenticationType.cpp
new file mode 100644
index 00000000000..7ab28b5fbaf
--- /dev/null
+++ b/src/Access/Common/AuthenticationType.cpp
@@ -0,0 +1,71 @@
+#include <Access/Common/AuthenticationType.h>
+#include <Common/Exception.h>
+#include <boost/algorithm/string/case_conv.hpp>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+
+const AuthenticationTypeInfo & AuthenticationTypeInfo::get(AuthenticationType type_)
+{
+    static constexpr auto make_info = [](const char * raw_name_, bool is_password_ = false)
+    {
+        String init_name = raw_name_;
+        boost::to_lower(init_name);
+        return AuthenticationTypeInfo{raw_name_, std::move(init_name), is_password_};
+    };
+
+    switch (type_)
+    {
+        case AuthenticationType::NO_PASSWORD:
+        {
+            static const auto info = make_info("NO_PASSWORD");
+            return info;
+        }
+        case AuthenticationType::PLAINTEXT_PASSWORD:
+        {
+            static const auto info = make_info("PLAINTEXT_PASSWORD", true);
+            return info;
+        }
+        case AuthenticationType::SHA256_PASSWORD:
+        {
+            static const auto info = make_info("SHA256_PASSWORD", true);
+            return info;
+        }
+        case AuthenticationType::DOUBLE_SHA1_PASSWORD:
+        {
+            static const auto info = make_info("DOUBLE_SHA1_PASSWORD", true);
+            return info;
+        }
+        case AuthenticationType::LDAP:
+        {
+            static const auto info = make_info("LDAP");
+            return info;
+        }
+        case AuthenticationType::KERBEROS:
+        {
+            static const auto info = make_info("KERBEROS");
+            return info;
+        }
+        case AuthenticationType::SSL_CERTIFICATE:
+        {
+            static const auto info = make_info("SSL_CERTIFICATE");
+            return info;
+        }
+        case AuthenticationType::BCRYPT_PASSWORD:
+        {
+            static const auto info = make_info("BCRYPT_PASSWORD", true);
+            return info;
+        }
+        case AuthenticationType::MAX:
+            break;
+    }
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown authentication type: {}", static_cast<int>(type_));
+}
+
+}
diff --git a/src/Access/Common/AuthenticationType.h b/src/Access/Common/AuthenticationType.h
new file mode 100644
index 00000000000..d7c2d0cdd40
--- /dev/null
+++ b/src/Access/Common/AuthenticationType.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <base/types.h>
+
+namespace DB
+{
+
+enum class AuthenticationType
+{
+    /// User doesn't have to enter password.
+    NO_PASSWORD,
+
+    /// Password is stored as is.
+    PLAINTEXT_PASSWORD,
+
+    /// Password is encrypted in SHA256 hash.
+    SHA256_PASSWORD,
+
+    /// SHA1(SHA1(password)).
+    /// This kind of hash is used by the `mysql_native_password` authentication plugin.
+    DOUBLE_SHA1_PASSWORD,
+
+    /// Password is checked by a [remote] LDAP server. Connection will be made at each authentication attempt.
+    LDAP,
+
+    /// Kerberos authentication performed through GSS-API negotiation loop.
+    KERBEROS,
+
+    /// Authentication is done in SSL by checking user certificate.
+    /// Certificates may only be trusted if 'strict' SSL mode is enabled.
+    SSL_CERTIFICATE,
+
+    /// Password is encrypted in bcrypt hash.
+    BCRYPT_PASSWORD,
+
+    MAX,
+};
+
+struct AuthenticationTypeInfo
+{
+    const char * const raw_name;
+    const String name; /// Lowercased with underscores, e.g. "sha256_password".
+    bool is_password;
+    static const AuthenticationTypeInfo & get(AuthenticationType type_);
+};
+
+inline String toString(AuthenticationType type_)
+{
+    return AuthenticationTypeInfo::get(type_).raw_name;
+}
+
+}
diff --git a/src/Access/Common/RowPolicyDefs.cpp b/src/Access/Common/RowPolicyDefs.cpp
index ba7856116f6..b1f882fe971 100644
--- a/src/Access/Common/RowPolicyDefs.cpp
+++ b/src/Access/Common/RowPolicyDefs.cpp
@@ -22,7 +22,7 @@ String RowPolicyName::toString() const
         name += backQuoteIfNeed(database);
         name += '.';
     }
-    name += backQuoteIfNeed(table_name);
+    name += (table_name == RowPolicyName::ANY_TABLE_MARK ? "*" : backQuoteIfNeed(table_name));
     return name;
 }
 
diff --git a/src/Access/Common/RowPolicyDefs.h b/src/Access/Common/RowPolicyDefs.h
index 792884c56df..7ffc99e1272 100644
--- a/src/Access/Common/RowPolicyDefs.h
+++ b/src/Access/Common/RowPolicyDefs.h
@@ -9,6 +9,8 @@ namespace DB
 /// Represents the full name of a row policy, e.g. "myfilter ON mydb.mytable".
 struct RowPolicyName
 {
+    static constexpr char ANY_TABLE_MARK[] = "";
+
     String short_name;
     String database;
     String table_name;
diff --git a/src/Access/ContextAccess.cpp b/src/Access/ContextAccess.cpp
index fbaacb2263b..04756162b46 100644
--- a/src/Access/ContextAccess.cpp
+++ b/src/Access/ContextAccess.cpp
@@ -81,6 +81,11 @@ namespace
             if ((level == 0) && (max_flags_with_children & create_table))
                 res |= create_temporary_table;
 
+            /// CREATE TABLE (on any database/table) => CREATE_ARBITRARY_TEMPORARY_TABLE (global)
+            static const AccessFlags create_arbitrary_temporary_table = AccessType::CREATE_ARBITRARY_TEMPORARY_TABLE;
+            if ((level == 0) && (max_flags_with_children & create_table))
+                res |= create_arbitrary_temporary_table;
+
             /// ALTER_TTL => ALTER_MATERIALIZE_TTL
             static const AccessFlags alter_ttl = AccessType::ALTER_TTL;
             static const AccessFlags alter_materialize_ttl = AccessType::ALTER_MATERIALIZE_TTL;
@@ -502,13 +507,17 @@ bool ContextAccess::checkAccessImplHelper(AccessFlags flags, const Args &... arg
     if (!flags)
         return true;
 
-    /// Access to temporary tables is controlled in an unusual way, not like normal tables.
-    /// Creating of temporary tables is controlled by AccessType::CREATE_TEMPORARY_TABLES grant,
-    /// and other grants are considered as always given.
-    /// The DatabaseCatalog class won't resolve StorageID for temporary tables
-    /// which shouldn't be accessed.
-    if (getDatabase(args...) == DatabaseCatalog::TEMPORARY_DATABASE)
-        return access_granted();
+    const auto parameter_type = flags.getParameterType();
+    if (parameter_type == AccessFlags::NONE)
+    {
+        /// Access to temporary tables is controlled in an unusual way, not like normal tables.
+        /// Creating of temporary tables is controlled by AccessType::CREATE_TEMPORARY_TABLES grant,
+        /// and other grants are considered as always given.
+        /// The DatabaseCatalog class won't resolve StorageID for temporary tables
+        /// which shouldn't be accessed.
+        if (getDatabase(args...) == DatabaseCatalog::TEMPORARY_DATABASE)
+            return access_granted();
+    }
 
     auto acs = getAccessRightsWithImplicit();
     bool granted;
@@ -606,7 +615,14 @@ template <bool throw_if_denied, bool grant_option>
 bool ContextAccess::checkAccessImplHelper(const AccessRightsElement & element) const
 {
     assert(!element.grant_option || grant_option);
-    if (element.any_database)
+    if (element.isGlobalWithParameter())
+    {
+        if (element.any_parameter)
+            return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags);
+        else
+            return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags, element.parameter);
+    }
+    else if (element.any_database)
         return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags);
     else if (element.any_table)
         return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags, element.database);
diff --git a/src/Access/DiskAccessStorage.cpp b/src/Access/DiskAccessStorage.cpp
index ef88e8a225f..938881fafff 100644
--- a/src/Access/DiskAccessStorage.cpp
+++ b/src/Access/DiskAccessStorage.cpp
@@ -10,6 +10,7 @@
 #include <Interpreters/Access/InterpreterCreateUserQuery.h>
 #include <Interpreters/Access/InterpreterShowGrantsQuery.h>
 #include <Common/logger_useful.h>
+#include <Common/ThreadPool.h>
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Stringifier.h>
@@ -19,6 +20,7 @@
 #include <base/range.h>
 #include <filesystem>
 #include <fstream>
+#include <memory>
 
 
 namespace DB
@@ -317,15 +319,15 @@ void DiskAccessStorage::scheduleWriteLists(AccessEntityType type)
         return; /// If the lists' writing thread is still waiting we can update `types_of_lists_to_write` easily,
                 /// without restarting that thread.
 
-    if (lists_writing_thread.joinable())
-        lists_writing_thread.join();
+    if (lists_writing_thread && lists_writing_thread->joinable())
+        lists_writing_thread->join();
 
     /// Create the 'need_rebuild_lists.mark' file.
     /// This file will be used later to find out if writing lists is successful or not.
     std::ofstream out{getNeedRebuildListsMarkFilePath(directory_path)};
     out.close();
 
-    lists_writing_thread = ThreadFromGlobalPool{&DiskAccessStorage::listsWritingThreadFunc, this};
+    lists_writing_thread = std::make_unique<ThreadFromGlobalPool>(&DiskAccessStorage::listsWritingThreadFunc, this);
     lists_writing_thread_is_waiting = true;
 }
 
@@ -349,10 +351,10 @@ void DiskAccessStorage::listsWritingThreadFunc()
 
 void DiskAccessStorage::stopListsWritingThread()
 {
-    if (lists_writing_thread.joinable())
+    if (lists_writing_thread && lists_writing_thread->joinable())
     {
         lists_writing_thread_should_exit.notify_one();
-        lists_writing_thread.join();
+        lists_writing_thread->join();
     }
 }
 
@@ -740,9 +742,9 @@ void DiskAccessStorage::restoreFromBackup(RestorerFromBackup & restorer)
     bool replace_if_exists = (create_access == RestoreAccessCreationMode::kReplace);
     bool throw_if_exists = (create_access == RestoreAccessCreationMode::kCreate);
 
-    restorer.addDataRestoreTask([this, entities = std::move(entities), replace_if_exists, throw_if_exists]
+    restorer.addDataRestoreTask([this, my_entities = std::move(entities), replace_if_exists, throw_if_exists]
     {
-        for (const auto & [id, entity] : entities)
+        for (const auto & [id, entity] : my_entities)
             insertWithID(id, entity, replace_if_exists, throw_if_exists, /* write_on_disk= */ true);
     });
 }
diff --git a/src/Access/DiskAccessStorage.h b/src/Access/DiskAccessStorage.h
index b1ef1d10ba7..069a966c8e9 100644
--- a/src/Access/DiskAccessStorage.h
+++ b/src/Access/DiskAccessStorage.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/MemoryAccessStorage.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <boost/container/flat_set.hpp>
 
 
@@ -81,7 +81,7 @@ private:
     bool failed_to_write_lists TSA_GUARDED_BY(mutex) = false;
 
     /// List files are written in a separate thread.
-    ThreadFromGlobalPool lists_writing_thread;
+    std::unique_ptr<ThreadFromGlobalPool> lists_writing_thread;
 
     /// Signals `lists_writing_thread` to exit.
     std::condition_variable lists_writing_thread_should_exit;
diff --git a/src/Access/EnabledRoles.cpp b/src/Access/EnabledRoles.cpp
index 456529da942..cebc075a6e3 100644
--- a/src/Access/EnabledRoles.cpp
+++ b/src/Access/EnabledRoles.cpp
@@ -26,10 +26,10 @@ scope_guard EnabledRoles::subscribeForChanges(const OnChangeHandler & handler) c
     handlers->list.push_back(handler);
     auto it = std::prev(handlers->list.end());
 
-    return [handlers=handlers, it]
+    return [my_handlers = handlers, it]
     {
-        std::lock_guard lock2{handlers->mutex};
-        handlers->list.erase(it);
+        std::lock_guard lock2{my_handlers->mutex};
+        my_handlers->list.erase(it);
     };
 }
 
@@ -53,10 +53,10 @@ void EnabledRoles::setRolesInfo(const std::shared_ptr<const EnabledRolesInfo> &
         }
 
         notifications->join(scope_guard(
-            [info = info, handlers_to_notify = std::move(handlers_to_notify)]
+            [my_info = info, my_handlers_to_notify = std::move(handlers_to_notify)]
             {
-                for (const auto & handler : handlers_to_notify)
-                    handler(info);
+                for (const auto & handler : my_handlers_to_notify)
+                    handler(my_info);
             }));
     }
 }
diff --git a/src/Access/EnabledRoles.h b/src/Access/EnabledRoles.h
index e0d773db343..5de76abe409 100644
--- a/src/Access/EnabledRoles.h
+++ b/src/Access/EnabledRoles.h
@@ -44,10 +44,11 @@ private:
     friend class RoleCache;
     explicit EnabledRoles(const Params & params_);
 
-    void setRolesInfo(const std::shared_ptr<const EnabledRolesInfo> & info_, scope_guard * notifications);
-
     const Params params;
 
+    /// Called by RoleCache to store `EnabledRolesInfo` in this `EnabledRoles` after the calculation is done.
+    void setRolesInfo(const std::shared_ptr<const EnabledRolesInfo> & info_, scope_guard * notifications);
+
     std::shared_ptr<const EnabledRolesInfo> info;
     mutable std::mutex info_mutex;
 
diff --git a/src/Access/EnabledRowPolicies.cpp b/src/Access/EnabledRowPolicies.cpp
index c00dcf9e3a7..8ab1bf5928b 100644
--- a/src/Access/EnabledRowPolicies.cpp
+++ b/src/Access/EnabledRowPolicies.cpp
@@ -35,7 +35,13 @@ RowPolicyFilterPtr EnabledRowPolicies::getFilter(const String & database, const
     auto loaded = mixed_filters.load();
     auto it = loaded->find({database, table_name, filter_type});
     if (it == loaded->end())
-        return {};
+    {   /// Look for a policy for database if a table policy not found
+        it = loaded->find({database, RowPolicyName::ANY_TABLE_MARK, filter_type});
+        if (it == loaded->end())
+        {
+            return {};
+        }
+    }
 
     return it->second;
 }
diff --git a/src/Access/MemoryAccessStorage.cpp b/src/Access/MemoryAccessStorage.cpp
index 8fcca235ee8..c4192ee4552 100644
--- a/src/Access/MemoryAccessStorage.cpp
+++ b/src/Access/MemoryAccessStorage.cpp
@@ -297,9 +297,9 @@ void MemoryAccessStorage::restoreFromBackup(RestorerFromBackup & restorer)
     bool replace_if_exists = (create_access == RestoreAccessCreationMode::kReplace);
     bool throw_if_exists = (create_access == RestoreAccessCreationMode::kCreate);
 
-    restorer.addDataRestoreTask([this, entities = std::move(entities), replace_if_exists, throw_if_exists]
+    restorer.addDataRestoreTask([this, my_entities = std::move(entities), replace_if_exists, throw_if_exists]
     {
-        for (const auto & [id, entity] : entities)
+        for (const auto & [id, entity] : my_entities)
             insertWithID(id, entity, replace_if_exists, throw_if_exists);
     });
 }
diff --git a/src/Access/ReplicatedAccessStorage.cpp b/src/Access/ReplicatedAccessStorage.cpp
index a7cb2b6e08e..56d68be9268 100644
--- a/src/Access/ReplicatedAccessStorage.cpp
+++ b/src/Access/ReplicatedAccessStorage.cpp
@@ -1,3 +1,4 @@
+#include <memory>
 #include <Access/AccessEntityIO.h>
 #include <Access/MemoryAccessStorage.h>
 #include <Access/ReplicatedAccessStorage.h>
@@ -13,8 +14,9 @@
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/escapeForFileName.h>
 #include <Common/setThreadName.h>
+#include <Common/ThreadPool.h>
+#include <Common/escapeForFileName.h>
 #include <base/range.h>
 #include <base/sleep.h>
 #include <boost/range/algorithm_ext/erase.hpp>
@@ -72,7 +74,7 @@ void ReplicatedAccessStorage::startWatchingThread()
 {
     bool prev_watching_flag = watching.exchange(true);
     if (!prev_watching_flag)
-        watching_thread = ThreadFromGlobalPool(&ReplicatedAccessStorage::runWatchingThread, this);
+        watching_thread = std::make_unique<ThreadFromGlobalPool>(&ReplicatedAccessStorage::runWatchingThread, this);
 }
 
 void ReplicatedAccessStorage::stopWatchingThread()
@@ -81,8 +83,8 @@ void ReplicatedAccessStorage::stopWatchingThread()
     if (prev_watching_flag)
     {
         watched_queue->finish();
-        if (watching_thread.joinable())
-            watching_thread.join();
+        if (watching_thread && watching_thread->joinable())
+            watching_thread->join();
     }
 }
 
@@ -523,9 +525,9 @@ void ReplicatedAccessStorage::refreshEntities(const zkutil::ZooKeeperPtr & zooke
     }
 
     const String zookeeper_uuids_path = zookeeper_path + "/uuid";
-    auto watch_entities_list = [watched_queue = watched_queue](const Coordination::WatchResponse &)
+    auto watch_entities_list = [my_watched_queue = watched_queue](const Coordination::WatchResponse &)
     {
-        [[maybe_unused]] bool push_result = watched_queue->push(UUIDHelpers::Nil);
+        [[maybe_unused]] bool push_result = my_watched_queue->push(UUIDHelpers::Nil);
     };
     Coordination::Stat stat;
     const auto entity_uuid_strs = zookeeper->getChildrenWatch(zookeeper_uuids_path, &stat, watch_entities_list);
@@ -590,10 +592,10 @@ void ReplicatedAccessStorage::refreshEntityNoLock(const zkutil::ZooKeeperPtr & z
 
 AccessEntityPtr ReplicatedAccessStorage::tryReadEntityFromZooKeeper(const zkutil::ZooKeeperPtr & zookeeper, const UUID & id) const
 {
-    const auto watch_entity = [watched_queue = watched_queue, id](const Coordination::WatchResponse & response)
+    const auto watch_entity = [my_watched_queue = watched_queue, id](const Coordination::WatchResponse & response)
     {
         if (response.type == Coordination::Event::CHANGED)
-            [[maybe_unused]] bool push_result = watched_queue->push(id);
+            [[maybe_unused]] bool push_result = my_watched_queue->push(id);
     };
 
     Coordination::Stat entity_stat;
@@ -674,18 +676,16 @@ void ReplicatedAccessStorage::backup(BackupEntriesCollector & backup_entries_col
         backup_entries_collector.getContext()->getAccessControl());
 
     auto backup_coordination = backup_entries_collector.getBackupCoordination();
-    String current_host_id = backup_entries_collector.getBackupSettings().host_id;
-    backup_coordination->addReplicatedAccessFilePath(zookeeper_path, type, current_host_id, backup_entry_with_path.first);
+    backup_coordination->addReplicatedAccessFilePath(zookeeper_path, type, backup_entry_with_path.first);
 
     backup_entries_collector.addPostTask(
         [backup_entry = backup_entry_with_path.second,
-         zookeeper_path = zookeeper_path,
+         my_zookeeper_path = zookeeper_path,
          type,
-         current_host_id,
          &backup_entries_collector,
          backup_coordination]
         {
-            for (const String & path : backup_coordination->getReplicatedAccessFilePaths(zookeeper_path, type, current_host_id))
+            for (const String & path : backup_coordination->getReplicatedAccessFilePaths(my_zookeeper_path, type))
                 backup_entries_collector.addBackupEntry(path, backup_entry);
         });
 }
@@ -708,9 +708,9 @@ void ReplicatedAccessStorage::restoreFromBackup(RestorerFromBackup & restorer)
     bool replace_if_exists = (create_access == RestoreAccessCreationMode::kReplace);
     bool throw_if_exists = (create_access == RestoreAccessCreationMode::kCreate);
 
-    restorer.addDataRestoreTask([this, entities = std::move(entities), replace_if_exists, throw_if_exists]
+    restorer.addDataRestoreTask([this, my_entities = std::move(entities), replace_if_exists, throw_if_exists]
     {
-        for (const auto & [id, entity] : entities)
+        for (const auto & [id, entity] : my_entities)
             insertWithID(id, entity, replace_if_exists, throw_if_exists);
     });
 }
diff --git a/src/Access/ReplicatedAccessStorage.h b/src/Access/ReplicatedAccessStorage.h
index d9d4b628f8d..555d58e6b04 100644
--- a/src/Access/ReplicatedAccessStorage.h
+++ b/src/Access/ReplicatedAccessStorage.h
@@ -2,7 +2,7 @@
 
 #include <atomic>
 
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <Common/ZooKeeper/Common.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ConcurrentBoundedQueue.h>
@@ -21,7 +21,7 @@ public:
     static constexpr char STORAGE_TYPE[] = "replicated";
 
     ReplicatedAccessStorage(const String & storage_name, const String & zookeeper_path, zkutil::GetZooKeeper get_zookeeper, AccessChangesNotifier & changes_notifier_, bool allow_backup);
-    virtual ~ReplicatedAccessStorage() override;
+    ~ReplicatedAccessStorage() override;
 
     const char * getStorageType() const override { return STORAGE_TYPE; }
 
@@ -43,7 +43,7 @@ private:
     std::mutex cached_zookeeper_mutex;
 
     std::atomic<bool> watching = false;
-    ThreadFromGlobalPool watching_thread;
+    std::unique_ptr<ThreadFromGlobalPool> watching_thread;
     std::shared_ptr<ConcurrentBoundedQueue<UUID>> watched_queue;
 
     std::optional<UUID> insertImpl(const AccessEntityPtr & entity, bool replace_if_exists, bool throw_if_exists) override;
diff --git a/src/Access/RoleCache.cpp b/src/Access/RoleCache.cpp
index 308b771243e..2d94df2eea5 100644
--- a/src/Access/RoleCache.cpp
+++ b/src/Access/RoleCache.cpp
@@ -56,8 +56,10 @@ namespace
 }
 
 
-RoleCache::RoleCache(const AccessControl & access_control_)
-    : access_control(access_control_), cache(600000 /* 10 minutes */) {}
+RoleCache::RoleCache(const AccessControl & access_control_, int expiration_time_seconds)
+    : access_control(access_control_), cache(expiration_time_seconds * 1000 /* 10 minutes by default*/)
+{
+}
 
 
 RoleCache::~RoleCache() = default;
@@ -70,18 +72,18 @@ RoleCache::getEnabledRoles(const std::vector<UUID> & roles, const std::vector<UU
     EnabledRoles::Params params;
     params.current_roles.insert(roles.begin(), roles.end());
     params.current_roles_with_admin_option.insert(roles_with_admin_option.begin(), roles_with_admin_option.end());
-    auto it = enabled_roles.find(params);
-    if (it != enabled_roles.end())
+    auto it = enabled_roles_by_params.find(params);
+    if (it != enabled_roles_by_params.end())
     {
-        auto from_cache = it->second.lock();
-        if (from_cache)
-            return from_cache;
-        enabled_roles.erase(it);
+        if (auto enabled_roles = it->second.enabled_roles.lock())
+            return enabled_roles;
+        enabled_roles_by_params.erase(it);
     }
 
     auto res = std::shared_ptr<EnabledRoles>(new EnabledRoles(params));
-    collectEnabledRoles(*res, nullptr);
-    enabled_roles.emplace(std::move(params), res);
+    SubscriptionsOnRoles subscriptions_on_roles;
+    collectEnabledRoles(*res, subscriptions_on_roles, nullptr);
+    enabled_roles_by_params.emplace(std::move(params), EnabledRolesWithSubscriptions{res, std::move(subscriptions_on_roles)});
     return res;
 }
 
@@ -90,21 +92,23 @@ void RoleCache::collectEnabledRoles(scope_guard * notifications)
 {
     /// `mutex` is already locked.
 
-    for (auto i = enabled_roles.begin(), e = enabled_roles.end(); i != e;)
+    for (auto i = enabled_roles_by_params.begin(), e = enabled_roles_by_params.end(); i != e;)
     {
-        auto elem = i->second.lock();
-        if (!elem)
-            i = enabled_roles.erase(i);
+        auto & item = i->second;
+        if (auto enabled_roles = item.enabled_roles.lock())
+        {
+            collectEnabledRoles(*enabled_roles, item.subscriptions_on_roles, notifications);
+            ++i;
+        }
         else
         {
-            collectEnabledRoles(*elem, notifications);
-            ++i;
+            i = enabled_roles_by_params.erase(i);
         }
     }
 }
 
 
-void RoleCache::collectEnabledRoles(EnabledRoles & enabled, scope_guard * notifications)
+void RoleCache::collectEnabledRoles(EnabledRoles & enabled_roles, SubscriptionsOnRoles & subscriptions_on_roles, scope_guard * notifications)
 {
     /// `mutex` is already locked.
 
@@ -112,43 +116,57 @@ void RoleCache::collectEnabledRoles(EnabledRoles & enabled, scope_guard * notifi
     auto new_info = std::make_shared<EnabledRolesInfo>();
     boost::container::flat_set<UUID> skip_ids;
 
-    auto get_role_function = [this](const UUID & id) { return getRole(id); };
+    /// We need to collect and keep not only enabled roles but also subscriptions for them to be able to recalculate EnabledRolesInfo when some of the roles change.
+    SubscriptionsOnRoles new_subscriptions_on_roles;
+    new_subscriptions_on_roles.reserve(subscriptions_on_roles.size());
 
-    for (const auto & current_role : enabled.params.current_roles)
+    auto get_role_function = [this, &subscriptions_on_roles](const UUID & id) TSA_NO_THREAD_SAFETY_ANALYSIS { return getRole(id, subscriptions_on_roles); };
+
+    for (const auto & current_role : enabled_roles.params.current_roles)
         collectRoles(*new_info, skip_ids, get_role_function, current_role, true, false);
 
-    for (const auto & current_role : enabled.params.current_roles_with_admin_option)
+    for (const auto & current_role : enabled_roles.params.current_roles_with_admin_option)
         collectRoles(*new_info, skip_ids, get_role_function, current_role, true, true);
 
+    /// Remove duplicates from `subscriptions_on_roles`.
+    std::sort(new_subscriptions_on_roles.begin(), new_subscriptions_on_roles.end());
+    new_subscriptions_on_roles.erase(std::unique(new_subscriptions_on_roles.begin(), new_subscriptions_on_roles.end()), new_subscriptions_on_roles.end());
+    subscriptions_on_roles = std::move(new_subscriptions_on_roles);
+
     /// Collect data from the collected roles.
-    enabled.setRolesInfo(new_info, notifications);
+    enabled_roles.setRolesInfo(new_info, notifications);
 }
 
 
-RolePtr RoleCache::getRole(const UUID & role_id)
+RolePtr RoleCache::getRole(const UUID & role_id, SubscriptionsOnRoles & subscriptions_on_roles)
 {
     /// `mutex` is already locked.
 
     auto role_from_cache = cache.get(role_id);
     if (role_from_cache)
+    {
+        subscriptions_on_roles.emplace_back(role_from_cache->second);
         return role_from_cache->first;
+    }
 
-    auto subscription = access_control.subscribeForChanges(role_id,
-                                                    [this, role_id](const UUID &, const AccessEntityPtr & entity)
+    auto on_role_changed_or_removed = [this, role_id](const UUID &, const AccessEntityPtr & entity)
     {
         auto changed_role = entity ? typeid_cast<RolePtr>(entity) : nullptr;
         if (changed_role)
             roleChanged(role_id, changed_role);
         else
             roleRemoved(role_id);
-    });
+    };
+
+    auto subscription_on_role = std::make_shared<scope_guard>(access_control.subscribeForChanges(role_id, on_role_changed_or_removed));
 
     auto role = access_control.tryRead<Role>(role_id);
     if (role)
     {
-        auto cache_value = Poco::SharedPtr<std::pair<RolePtr, scope_guard>>(
-            new std::pair<RolePtr, scope_guard>{role, std::move(subscription)});
+        auto cache_value = Poco::SharedPtr<std::pair<RolePtr, std::shared_ptr<scope_guard>>>(
+            new std::pair<RolePtr, std::shared_ptr<scope_guard>>{role, subscription_on_role});
         cache.add(role_id, cache_value);
+        subscriptions_on_roles.emplace_back(subscription_on_role);
         return role;
     }
 
@@ -162,12 +180,17 @@ void RoleCache::roleChanged(const UUID & role_id, const RolePtr & changed_role)
     scope_guard notifications;
 
     std::lock_guard lock{mutex};
+
     auto role_from_cache = cache.get(role_id);
-    if (!role_from_cache)
-        return;
-    role_from_cache->first = changed_role;
-    cache.update(role_id, role_from_cache);
-    collectEnabledRoles(&notifications);
+    if (role_from_cache)
+    {
+        /// We update the role stored in a cache entry only if that entry has not expired yet.
+        role_from_cache->first = changed_role;
+        cache.update(role_id, role_from_cache);
+    }
+
+    /// An enabled role for some users has been changed, we need to recalculate the access rights.
+    collectEnabledRoles(&notifications); /// collectEnabledRoles() must be called with the `mutex` locked.
 }
 
 
@@ -177,8 +200,12 @@ void RoleCache::roleRemoved(const UUID & role_id)
     scope_guard notifications;
 
     std::lock_guard lock{mutex};
+
+    /// If a cache entry with the role has expired already, that remove() will do nothing.
     cache.remove(role_id);
-    collectEnabledRoles(&notifications);
+
+    /// An enabled role for some users has been removed, we need to recalculate the access rights.
+    collectEnabledRoles(&notifications); /// collectEnabledRoles() must be called with the `mutex` locked.
 }
 
 }
diff --git a/src/Access/RoleCache.h b/src/Access/RoleCache.h
index 51c415d4d1d..b5712a24f46 100644
--- a/src/Access/RoleCache.h
+++ b/src/Access/RoleCache.h
@@ -16,7 +16,7 @@ using RolePtr = std::shared_ptr<const Role>;
 class RoleCache
 {
 public:
-    explicit RoleCache(const AccessControl & access_control_);
+    explicit RoleCache(const AccessControl & access_control_, int expiration_time_seconds);
     ~RoleCache();
 
     std::shared_ptr<const EnabledRoles> getEnabledRoles(
@@ -24,15 +24,29 @@ public:
         const std::vector<UUID> & current_roles_with_admin_option);
 
 private:
-    void collectEnabledRoles(scope_guard * notifications);
-    void collectEnabledRoles(EnabledRoles & enabled, scope_guard * notifications);
-    RolePtr getRole(const UUID & role_id);
+    using SubscriptionsOnRoles = std::vector<std::shared_ptr<scope_guard>>;
+
+    void collectEnabledRoles(scope_guard * notifications) TSA_REQUIRES(mutex);
+    void collectEnabledRoles(EnabledRoles & enabled_roles, SubscriptionsOnRoles & subscriptions_on_roles, scope_guard * notifications) TSA_REQUIRES(mutex);
+    RolePtr getRole(const UUID & role_id, SubscriptionsOnRoles & subscriptions_on_roles) TSA_REQUIRES(mutex);
     void roleChanged(const UUID & role_id, const RolePtr & changed_role);
     void roleRemoved(const UUID & role_id);
 
     const AccessControl & access_control;
-    Poco::AccessExpireCache<UUID, std::pair<RolePtr, scope_guard>> cache;
-    std::map<EnabledRoles::Params, std::weak_ptr<EnabledRoles>> enabled_roles;
+
+    Poco::AccessExpireCache<UUID, std::pair<RolePtr, std::shared_ptr<scope_guard>>> TSA_GUARDED_BY(mutex) cache;
+
+    struct EnabledRolesWithSubscriptions
+    {
+        std::weak_ptr<EnabledRoles> enabled_roles;
+
+        /// We need to keep subscriptions for all enabled roles to be able to recalculate EnabledRolesInfo when some of the roles change.
+        /// `cache` also keeps subscriptions but that's not enough because values can be purged from the `cache` anytime.
+        SubscriptionsOnRoles subscriptions_on_roles;
+    };
+
+    std::map<EnabledRoles::Params, EnabledRolesWithSubscriptions> TSA_GUARDED_BY(mutex) enabled_roles_by_params;
+
     mutable std::mutex mutex;
 };
 
diff --git a/src/Access/RolesOrUsersSet.cpp b/src/Access/RolesOrUsersSet.cpp
index 52374c3739d..c026ae42f76 100644
--- a/src/Access/RolesOrUsersSet.cpp
+++ b/src/Access/RolesOrUsersSet.cpp
@@ -228,25 +228,25 @@ void RolesOrUsersSet::add(const std::vector<UUID> & ids_)
 
 bool RolesOrUsersSet::match(const UUID & id) const
 {
-    return (all || ids.count(id)) && !except_ids.count(id);
+    return (all || ids.contains(id)) && !except_ids.contains(id);
 }
 
 
 bool RolesOrUsersSet::match(const UUID & user_id, const boost::container::flat_set<UUID> & enabled_roles) const
 {
-    if (!all && !ids.count(user_id))
+    if (!all && !ids.contains(user_id))
     {
         bool found_enabled_role = std::any_of(
-            enabled_roles.begin(), enabled_roles.end(), [this](const UUID & enabled_role) { return ids.count(enabled_role); });
+            enabled_roles.begin(), enabled_roles.end(), [this](const UUID & enabled_role) { return ids.contains(enabled_role); });
         if (!found_enabled_role)
             return false;
     }
 
-    if (except_ids.count(user_id))
+    if (except_ids.contains(user_id))
         return false;
 
     bool in_except_list = std::any_of(
-        enabled_roles.begin(), enabled_roles.end(), [this](const UUID & enabled_role) { return except_ids.count(enabled_role); });
+        enabled_roles.begin(), enabled_roles.end(), [this](const UUID & enabled_role) { return except_ids.contains(enabled_role); });
     return !in_except_list;
 }
 
diff --git a/src/Access/RowPolicy.h b/src/Access/RowPolicy.h
index 99e6f1992f5..9c190458620 100644
--- a/src/Access/RowPolicy.h
+++ b/src/Access/RowPolicy.h
@@ -35,6 +35,9 @@ struct RowPolicy : public IAccessEntity
     void setPermissive(bool permissive_ = true) { setRestrictive(!permissive_); }
     bool isPermissive() const { return !isRestrictive(); }
 
+    /// Applied for entire database
+    bool isForDatabase() const { return full_name.table_name == RowPolicyName::ANY_TABLE_MARK; }
+
     /// Sets that the policy is restrictive.
     /// A row is only accessible if at least one of the permissive policies passes,
     /// in addition to all the restrictive policies.
diff --git a/src/Access/RowPolicyCache.cpp b/src/Access/RowPolicyCache.cpp
index 1036df92609..bb9da674477 100644
--- a/src/Access/RowPolicyCache.cpp
+++ b/src/Access/RowPolicyCache.cpp
@@ -16,7 +16,8 @@ namespace DB
 {
 namespace
 {
-    /// Accumulates filters from multiple row policies and joins them using the AND logical operation.
+    /// Helper to accumulate filters from multiple row policies and join them together
+    ///   by AND or OR logical operations.
     class FiltersMixer
     {
     public:
@@ -148,9 +149,11 @@ void RowPolicyCache::ensureAllRowPoliciesRead()
 
     for (const UUID & id : access_control.findAll<RowPolicy>())
     {
-        auto quota = access_control.tryRead<RowPolicy>(id);
-        if (quota)
-            all_policies.emplace(id, PolicyInfo(quota));
+        auto policy = access_control.tryRead<RowPolicy>(id);
+        if (policy)
+        {
+            all_policies.emplace(id, PolicyInfo(policy));
+        }
     }
 }
 
@@ -215,40 +218,105 @@ void RowPolicyCache::mixFiltersFor(EnabledRowPolicies & enabled)
         std::vector<RowPolicyPtr> policies;
     };
 
-    std::unordered_map<MixedFiltersKey, MixerWithNames, Hash> mixers;
+    std::unordered_map<MixedFiltersKey, MixerWithNames, Hash> database_mixers;
 
+    /// populate database_mixers using database-level policies
+    ///  to aggregate (mix) rules per database
     for (const auto & [policy_id, info] : all_policies)
     {
-        const auto & policy = *info.policy;
-        bool match = info.roles->match(enabled.params.user_id, enabled.params.enabled_roles);
-        MixedFiltersKey key;
-        key.database = info.database_and_table_name->first;
-        key.table_name = info.database_and_table_name->second;
-        for (auto filter_type : collections::range(0, RowPolicyFilterType::MAX))
+        if (info.isForDatabase())
         {
-            auto filter_type_i = static_cast<size_t>(filter_type);
-            if (info.parsed_filters[filter_type_i])
+            const auto & policy = *info.policy;
+            bool match = info.roles->match(enabled.params.user_id, enabled.params.enabled_roles);
+            for (auto filter_type : collections::range(0, RowPolicyFilterType::MAX))
             {
-                key.filter_type = filter_type;
-                auto & mixer = mixers[key];
-                mixer.database_and_table_name = info.database_and_table_name;
-                if (match)
+                auto filter_type_i = static_cast<size_t>(filter_type);
+                if (info.parsed_filters[filter_type_i])
                 {
-                    mixer.mixer.add(info.parsed_filters[filter_type_i], policy.isRestrictive());
-                    mixer.policies.push_back(info.policy);
+                    MixedFiltersKey key{info.database_and_table_name->first,
+                        info.database_and_table_name->second,
+                        filter_type};
+
+                    auto & mixer = database_mixers[key];
+                    mixer.database_and_table_name = info.database_and_table_name;
+                    if (match)
+                    {
+                        mixer.mixer.add(info.parsed_filters[filter_type_i], policy.isRestrictive());
+                        mixer.policies.push_back(info.policy);
+                    }
+                }
+            }
+        }
+    }
+
+    std::unordered_map<MixedFiltersKey, MixerWithNames, Hash> table_mixers;
+
+    /// populate table_mixers using database_mixers and table-level policies
+    for (const auto & [policy_id, info] : all_policies)
+    {
+        if (!info.isForDatabase())
+        {
+            const auto & policy = *info.policy;
+            bool match = info.roles->match(enabled.params.user_id, enabled.params.enabled_roles);
+            for (auto filter_type : collections::range(0, RowPolicyFilterType::MAX))
+            {
+                auto filter_type_i = static_cast<size_t>(filter_type);
+                if (info.parsed_filters[filter_type_i])
+                {
+                    MixedFiltersKey key{info.database_and_table_name->first,
+                        info.database_and_table_name->second,
+                        filter_type};
+                    auto table_it = table_mixers.find(key);
+                    if (table_it == table_mixers.end())
+                    {   /// no exact match - create new mixer
+                        MixedFiltersKey database_key = key;
+                        database_key.table_name = RowPolicyName::ANY_TABLE_MARK;
+
+                        auto database_it = database_mixers.find(database_key);
+
+                        if (database_it == database_mixers.end())
+                        {
+                            table_it = table_mixers.try_emplace(key).first;
+                        }
+                        else
+                        {
+                            /// table policies are based on database ones
+                            table_it = table_mixers.insert({key, database_it->second}).first;
+                        }
+                    }
+
+                    auto & mixer = table_it->second; ///  getting table level mixer
+                    mixer.database_and_table_name = info.database_and_table_name;
+                    if (match)
+                    {
+                        mixer.mixer.add(info.parsed_filters[filter_type_i], policy.isRestrictive());
+                        mixer.policies.push_back(info.policy);
+                    }
                 }
             }
         }
     }
 
     auto mixed_filters = boost::make_shared<MixedFiltersMap>();
-    for (auto & [key, mixer] : mixers)
+
+    /// Retrieve aggregated policies from mixers
+    ///  if a table has a policy for this particular table, we have all needed information in table_mixers
+    ///    (policies for the database are already applied)
+    ///  otherwise we would look for a policy for database using RowPolicy::ANY_TABLE_MARK
+    /// Consider restrictive policies a=1 for db.t, b=2 for db.* and c=3 for db.*
+    ///   We are going to have two items in mixed_filters:
+    ///     1. a=1 AND b=2 AND c=3   for db.t (comes from table_mixers, where it had been created with the help of database_mixers)
+    ///     2. b=2 AND c=3  for db.* (comes directly from database_mixers)
+    for (auto * mixer_map_ptr : {&table_mixers, &database_mixers})
     {
-        auto mixed_filter = std::make_shared<RowPolicyFilter>();
-        mixed_filter->database_and_table_name = std::move(mixer.database_and_table_name);
-        mixed_filter->expression = std::move(mixer.mixer).getResult(access_control.isEnabledUsersWithoutRowPoliciesCanReadRows());
-        mixed_filter->policies = std::move(mixer.policies);
-        mixed_filters->emplace(key, std::move(mixed_filter));
+        for (auto & [key, mixer] : *mixer_map_ptr)
+        {
+            auto mixed_filter = std::make_shared<RowPolicyFilter>();
+            mixed_filter->database_and_table_name = std::move(mixer.database_and_table_name);
+            mixed_filter->expression = std::move(mixer.mixer).getResult(access_control.isEnabledUsersWithoutRowPoliciesCanReadRows());
+            mixed_filter->policies = std::move(mixer.policies);
+            mixed_filters->emplace(key, std::move(mixed_filter));
+        }
     }
 
     enabled.mixed_filters.store(mixed_filters);
diff --git a/src/Access/RowPolicyCache.h b/src/Access/RowPolicyCache.h
index 4fbf90d1a2d..df263416509 100644
--- a/src/Access/RowPolicyCache.h
+++ b/src/Access/RowPolicyCache.h
@@ -29,6 +29,7 @@ private:
         explicit PolicyInfo(const RowPolicyPtr & policy_) { setPolicy(policy_); }
         void setPolicy(const RowPolicyPtr & policy_);
 
+        bool isForDatabase() const { return policy->isForDatabase(); }
         RowPolicyPtr policy;
         const RolesOrUsersSet * roles = nullptr;
         std::shared_ptr<const std::pair<String, String>> database_and_table_name;
diff --git a/src/Access/SettingsConstraints.cpp b/src/Access/SettingsConstraints.cpp
index e83ab264f4f..12f584cab83 100644
--- a/src/Access/SettingsConstraints.cpp
+++ b/src/Access/SettingsConstraints.cpp
@@ -105,21 +105,21 @@ void SettingsConstraints::check(const Settings & current_settings, const Setting
         if (SettingsProfileElements::isAllowBackupSetting(element.setting_name))
             continue;
 
-        if (!element.value.isNull())
+        if (element.value)
         {
-            SettingChange value(element.setting_name, element.value);
+            SettingChange value(element.setting_name, *element.value);
             check(current_settings, value);
         }
 
-        if (!element.min_value.isNull())
+        if (element.min_value)
         {
-            SettingChange value(element.setting_name, element.min_value);
+            SettingChange value(element.setting_name, *element.min_value);
             check(current_settings, value);
         }
 
-        if (!element.max_value.isNull())
+        if (element.max_value)
         {
-            SettingChange value(element.setting_name, element.max_value);
+            SettingChange value(element.setting_name, *element.max_value);
             check(current_settings, value);
         }
 
diff --git a/src/Access/SettingsProfileElement.cpp b/src/Access/SettingsProfileElement.cpp
index ce56782d887..9358391cb93 100644
--- a/src/Access/SettingsProfileElement.cpp
+++ b/src/Access/SettingsProfileElement.cpp
@@ -63,18 +63,18 @@ void SettingsProfileElement::init(const ASTSettingsProfileElement & ast, const A
         max_value = ast.max_value;
         writability = ast.writability;
 
-        if (!value.isNull())
-            value = Settings::castValueUtil(setting_name, value);
-        if (!min_value.isNull())
-            min_value = Settings::castValueUtil(setting_name, min_value);
-        if (!max_value.isNull())
-            max_value = Settings::castValueUtil(setting_name, max_value);
+        if (value)
+            value = Settings::castValueUtil(setting_name, *value);
+        if (min_value)
+            min_value = Settings::castValueUtil(setting_name, *min_value);
+        if (max_value)
+            max_value = Settings::castValueUtil(setting_name, *max_value);
     }
 }
 
 bool SettingsProfileElement::isConstraint() const
 {
-    return this->writability || !this->min_value.isNull() || !this->max_value.isNull();
+    return this->writability || this->min_value || this->max_value;
 }
 
 std::shared_ptr<ASTSettingsProfileElement> SettingsProfileElement::toAST() const
@@ -187,8 +187,8 @@ Settings SettingsProfileElements::toSettings() const
     Settings res;
     for (const auto & elem : *this)
     {
-        if (!elem.setting_name.empty() && !isAllowBackupSetting(elem.setting_name) && !elem.value.isNull())
-            res.set(elem.setting_name, elem.value);
+        if (!elem.setting_name.empty() && !isAllowBackupSetting(elem.setting_name) && elem.value)
+            res.set(elem.setting_name, *elem.value);
     }
     return res;
 }
@@ -200,8 +200,8 @@ SettingsChanges SettingsProfileElements::toSettingsChanges() const
     {
         if (!elem.setting_name.empty() && !isAllowBackupSetting(elem.setting_name))
         {
-            if (!elem.value.isNull())
-                res.push_back({elem.setting_name, elem.value});
+            if (elem.value)
+                res.push_back({elem.setting_name, *elem.value});
         }
     }
     return res;
@@ -214,8 +214,8 @@ SettingsConstraints SettingsProfileElements::toSettingsConstraints(const AccessC
         if (!elem.setting_name.empty() && elem.isConstraint() && !isAllowBackupSetting(elem.setting_name))
             res.set(
                 elem.setting_name,
-                elem.min_value,
-                elem.max_value,
+                elem.min_value ? *elem.min_value : Field{},
+                elem.max_value ? *elem.max_value : Field{},
                 elem.writability ? *elem.writability : SettingConstraintWritability::WRITABLE);
     return res;
 }
@@ -240,8 +240,8 @@ bool SettingsProfileElements::isBackupAllowed() const
 {
     for (const auto & setting : *this)
     {
-        if (isAllowBackupSetting(setting.setting_name))
-            return static_cast<bool>(SettingFieldBool{setting.value});
+        if (isAllowBackupSetting(setting.setting_name) && setting.value)
+            return static_cast<bool>(SettingFieldBool{*setting.value});
     }
     return true;
 }
diff --git a/src/Access/SettingsProfileElement.h b/src/Access/SettingsProfileElement.h
index 7f9379c1e47..7078f565295 100644
--- a/src/Access/SettingsProfileElement.h
+++ b/src/Access/SettingsProfileElement.h
@@ -23,9 +23,9 @@ struct SettingsProfileElement
     std::optional<UUID> parent_profile;
 
     String setting_name;
-    Field value;
-    Field min_value;
-    Field max_value;
+    std::optional<Field> value;
+    std::optional<Field> min_value;
+    std::optional<Field> max_value;
     std::optional<SettingConstraintWritability> writability;
 
     auto toTuple() const { return std::tie(parent_profile, setting_name, value, min_value, max_value, writability); }
diff --git a/src/Access/User.h b/src/Access/User.h
index 958d8bb486f..4b4bf90137f 100644
--- a/src/Access/User.h
+++ b/src/Access/User.h
@@ -2,7 +2,7 @@
 
 #include <Access/IAccessEntity.h>
 #include <Access/AccessRights.h>
-#include <Access/Common/AuthenticationData.h>
+#include <Access/AuthenticationData.h>
 #include <Access/Common/AllowedClientHosts.h>
 #include <Access/GrantedRoles.h>
 #include <Access/RolesOrUsersSet.h>
diff --git a/src/Access/UsersConfigAccessStorage.cpp b/src/Access/UsersConfigAccessStorage.cpp
index b893554cb8a..df0e4584709 100644
--- a/src/Access/UsersConfigAccessStorage.cpp
+++ b/src/Access/UsersConfigAccessStorage.cpp
@@ -11,6 +11,10 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/quoteString.h>
 #include <Core/Settings.h>
+#include <Interpreters/executeQuery.h>
+#include <Parsers/Access/ASTGrantQuery.h>
+#include <Parsers/Access/ParserGrantQuery.h>
+#include <Parsers/parseQuery.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/MD5Engine.h>
 #include <Poco/JSON/JSON.h>
@@ -49,7 +53,12 @@ namespace
     UUID generateID(const IAccessEntity & entity) { return generateID(entity.getType(), entity.getName()); }
 
 
-    UserPtr parseUser(const Poco::Util::AbstractConfiguration & config, const String & user_name, const std::unordered_set<UUID> & allowed_profile_ids, bool allow_no_password, bool allow_plaintext_password)
+    UserPtr parseUser(
+        const Poco::Util::AbstractConfiguration & config,
+        const String & user_name,
+        const std::unordered_set<UUID> & allowed_profile_ids,
+        bool allow_no_password,
+        bool allow_plaintext_password)
     {
         auto user = std::make_shared<User>();
         user->setName(user_name);
@@ -207,42 +216,99 @@ namespace
             }
         }
 
-        /// By default all databases are accessible
-        /// and the user can grant everything he has.
-        user->access.grantWithGrantOption(AccessType::ALL);
-
-        if (databases)
+        const auto grants_config = user_config + ".grants";
+        std::optional<Strings> grant_queries;
+        if (config.has(grants_config))
         {
-            user->access.revoke(AccessFlags::allFlags() - AccessFlags::allGlobalFlags());
-            user->access.grantWithGrantOption(AccessFlags::allDictionaryFlags(), IDictionary::NO_DATABASE_TAG);
-            for (const String & database : *databases)
-                user->access.grantWithGrantOption(AccessFlags::allFlags(), database);
-        }
-
-        if (dictionaries)
-        {
-            user->access.revoke(AccessFlags::allDictionaryFlags(), IDictionary::NO_DATABASE_TAG);
-            for (const String & dictionary : *dictionaries)
-                user->access.grantWithGrantOption(AccessFlags::allDictionaryFlags(), IDictionary::NO_DATABASE_TAG, dictionary);
+            Poco::Util::AbstractConfiguration::Keys keys;
+            config.keys(grants_config, keys);
+            grant_queries.emplace();
+            grant_queries->reserve(keys.size());
+            for (const auto & key : keys)
+            {
+                const auto query = config.getString(grants_config + "." + key);
+                grant_queries->push_back(query);
+            }
         }
 
         bool access_management = config.getBool(user_config + ".access_management", false);
-        if (!access_management)
-        {
-            user->access.revoke(AccessType::ACCESS_MANAGEMENT);
-            user->access.revokeGrantOption(AccessType::ALL);
-        }
-
-        bool show_named_collections = config.getBool(user_config + ".show_named_collections", false);
-        if (!show_named_collections)
-        {
-            user->access.revoke(AccessType::SHOW_NAMED_COLLECTIONS);
-        }
-
+        bool named_collection_control = config.getBool(user_config + ".named_collection_control", false);
         bool show_named_collections_secrets = config.getBool(user_config + ".show_named_collections_secrets", false);
-        if (!show_named_collections_secrets)
+
+        if (grant_queries)
+            if (databases || dictionaries || access_management || named_collection_control || show_named_collections_secrets)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Any other access control settings can't be specified with `grants`");
+
+        if (grant_queries)
         {
-            user->access.revoke(AccessType::SHOW_NAMED_COLLECTIONS_SECRETS);
+            ParserGrantQuery parser;
+            parser.parseWithoutGrantees();
+
+            for (const auto & string_query : *grant_queries)
+            {
+                String error_message;
+                const char * pos = string_query.data();
+                auto ast = tryParseQuery(parser, pos, pos + string_query.size(), error_message, false, "", false, 0, 0);
+
+                if (!ast)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Failed to parse grant query. Error: {}", error_message);
+
+                auto & query = ast->as<ASTGrantQuery &>();
+
+                if (query.roles)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Roles can't be granted in config file");
+
+                if (!query.cluster.empty())
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Can't grant on cluster using config file");
+
+                if (query.grantees)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "You can't specify grantees in query using config file");
+
+                for (auto & element : query.access_rights_elements)
+                {
+                    if (query.is_revoke)
+                        user->access.revoke(element);
+                    else
+                        user->access.grant(element);
+                }
+            }
+        }
+        else
+        {
+            /// By default all databases are accessible
+            /// and the user can grant everything he has.
+            user->access.grantWithGrantOption(AccessType::ALL);
+
+            if (databases)
+            {
+                user->access.revoke(AccessFlags::allFlags() - AccessFlags::allGlobalFlags());
+                user->access.grantWithGrantOption(AccessFlags::allDictionaryFlags(), IDictionary::NO_DATABASE_TAG);
+                for (const String & database : *databases)
+                    user->access.grantWithGrantOption(AccessFlags::allFlags(), database);
+            }
+
+            if (dictionaries)
+            {
+                user->access.revoke(AccessFlags::allDictionaryFlags(), IDictionary::NO_DATABASE_TAG);
+                for (const String & dictionary : *dictionaries)
+                    user->access.grantWithGrantOption(AccessFlags::allDictionaryFlags(), IDictionary::NO_DATABASE_TAG, dictionary);
+            }
+
+            if (!access_management)
+            {
+                user->access.revoke(AccessType::ACCESS_MANAGEMENT);
+                user->access.revokeGrantOption(AccessType::ALL);
+            }
+
+            if (!named_collection_control)
+            {
+                user->access.revoke(AccessType::NAMED_COLLECTION_CONTROL);
+            }
+
+            if (!show_named_collections_secrets)
+            {
+                user->access.revoke(AccessType::SHOW_NAMED_COLLECTIONS_SECRETS);
+            }
         }
 
         String default_database = config.getString(user_config + ".default_database", "");
@@ -252,7 +318,11 @@ namespace
     }
 
 
-    std::vector<AccessEntityPtr> parseUsers(const Poco::Util::AbstractConfiguration & config, const std::unordered_set<UUID> & allowed_profile_ids, bool allow_no_password, bool allow_plaintext_password)
+    std::vector<AccessEntityPtr> parseUsers(
+        const Poco::Util::AbstractConfiguration & config,
+        const std::unordered_set<UUID> & allowed_profile_ids,
+        bool allow_no_password,
+        bool allow_plaintext_password)
     {
         Poco::Util::AbstractConfiguration::Keys user_names;
         config.keys("users", user_names);
diff --git a/src/Access/tests/gtest_access_rights_ops.cpp b/src/Access/tests/gtest_access_rights_ops.cpp
index e21ebda2a31..5f1f13ca5a2 100644
--- a/src/Access/tests/gtest_access_rights_ops.cpp
+++ b/src/Access/tests/gtest_access_rights_ops.cpp
@@ -48,12 +48,12 @@ TEST(AccessRights, Union)
     ASSERT_EQ(lhs.toString(),
               "GRANT INSERT ON *.*, "
               "GRANT SHOW, SELECT, ALTER, CREATE DATABASE, CREATE TABLE, CREATE VIEW, "
-              "CREATE DICTIONARY, DROP DATABASE, DROP TABLE, DROP VIEW, DROP DICTIONARY, "
+              "CREATE DICTIONARY, DROP DATABASE, DROP TABLE, DROP VIEW, DROP DICTIONARY, UNDROP TABLE, "
               "TRUNCATE, OPTIMIZE, BACKUP, CREATE ROW POLICY, ALTER ROW POLICY, DROP ROW POLICY, "
               "SHOW ROW POLICIES, SYSTEM MERGES, SYSTEM TTL MERGES, SYSTEM FETCHES, "
               "SYSTEM MOVES, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, "
               "SYSTEM DROP REPLICA, SYSTEM SYNC REPLICA, SYSTEM RESTART REPLICA, "
-              "SYSTEM RESTORE REPLICA, SYSTEM WAIT LOADING PARTS, SYSTEM SYNC DATABASE REPLICA, SYSTEM FLUSH DISTRIBUTED, dictGet ON db1.*");
+              "SYSTEM RESTORE REPLICA, SYSTEM WAIT LOADING PARTS, SYSTEM SYNC DATABASE REPLICA, SYSTEM FLUSH DISTRIBUTED, dictGet ON db1.*, GRANT NAMED COLLECTION CONTROL ON db1");
 }
 
 
diff --git a/src/AggregateFunctions/AggregateFunctionAny.cpp b/src/AggregateFunctions/AggregateFunctionAny.cpp
index 9bc6e6af14f..7f57062126b 100644
--- a/src/AggregateFunctions/AggregateFunctionAny.cpp
+++ b/src/AggregateFunctions/AggregateFunctionAny.cpp
@@ -14,11 +14,29 @@ AggregateFunctionPtr createAggregateFunctionAny(const std::string & name, const
     return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionAnyData>(name, argument_types, parameters, settings));
 }
 
+template <bool RespectNulls = false>
+AggregateFunctionPtr createAggregateFunctionNullableAny(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
+{
+    return AggregateFunctionPtr(
+        createAggregateFunctionSingleNullableValue<AggregateFunctionsSingleValue, AggregateFunctionAnyData, RespectNulls>(
+            name, argument_types, parameters, settings));
+}
+
 AggregateFunctionPtr createAggregateFunctionAnyLast(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
     return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionAnyLastData>(name, argument_types, parameters, settings));
 }
 
+template <bool RespectNulls = false>
+AggregateFunctionPtr createAggregateFunctionNullableAnyLast(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
+{
+    return AggregateFunctionPtr(createAggregateFunctionSingleNullableValue<
+                                AggregateFunctionsSingleValue,
+                                AggregateFunctionAnyLastData,
+                                RespectNulls>(name, argument_types, parameters, settings));
+}
+
 AggregateFunctionPtr createAggregateFunctionAnyHeavy(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
     return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionAnyHeavyData>(name, argument_types, parameters, settings));
@@ -38,9 +56,15 @@ void registerAggregateFunctionsAny(AggregateFunctionFactory & factory)
     factory.registerFunction("first_value",
         { createAggregateFunctionAny, properties },
         AggregateFunctionFactory::CaseInsensitive);
+    factory.registerFunction("first_value_respect_nulls",
+        { createAggregateFunctionNullableAny<true>, properties },
+        AggregateFunctionFactory::CaseInsensitive);
     factory.registerFunction("last_value",
         { createAggregateFunctionAnyLast, properties },
         AggregateFunctionFactory::CaseInsensitive);
+    factory.registerFunction("last_value_respect_nulls",
+        { createAggregateFunctionNullableAnyLast<true>, properties },
+        AggregateFunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionBitwise.cpp b/src/AggregateFunctions/AggregateFunctionBitwise.cpp
index b87e899a685..f5c2deb4588 100644
--- a/src/AggregateFunctions/AggregateFunctionBitwise.cpp
+++ b/src/AggregateFunctions/AggregateFunctionBitwise.cpp
@@ -27,7 +27,7 @@ AggregateFunctionPtr createAggregateFunctionBitwise(const std::string & name, co
                         "is illegal, because it cannot be used in bitwise operations",
                         argument_types[0]->getName(), name);
 
-    AggregateFunctionPtr res(createWithUnsignedIntegerType<AggregateFunctionBitwise, Data>(*argument_types[0], argument_types[0]));
+    AggregateFunctionPtr res(createWithIntegerType<AggregateFunctionBitwise, Data>(*argument_types[0], argument_types[0]));
 
     if (!res)
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
diff --git a/src/AggregateFunctions/AggregateFunctionCorr.cpp b/src/AggregateFunctions/AggregateFunctionCorr.cpp
new file mode 100644
index 00000000000..2e8ff3af933
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionCorr.cpp
@@ -0,0 +1,15 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionStatisticsSimple.h>
+
+
+namespace DB
+{
+
+template <typename T1, typename T2> using AggregateFunctionCorr = AggregateFunctionVarianceSimple<StatFuncTwoArg<T1, T2, CorrMoments>>;
+
+void registerAggregateFunctionsStatisticsCorr(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("corr", createAggregateFunctionStatisticsBinary<AggregateFunctionCorr, StatisticsFunctionKind::corr>, AggregateFunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionCovar.cpp b/src/AggregateFunctions/AggregateFunctionCovar.cpp
new file mode 100644
index 00000000000..9645685483f
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionCovar.cpp
@@ -0,0 +1,20 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionStatisticsSimple.h>
+
+
+namespace DB
+{
+
+template <typename T1, typename T2> using AggregateFunctionCovar = AggregateFunctionVarianceSimple<StatFuncTwoArg<T1, T2, CovarMoments>>;
+
+void registerAggregateFunctionsStatisticsCovar(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("covarSamp", createAggregateFunctionStatisticsBinary<AggregateFunctionCovar, StatisticsFunctionKind::covarSamp>);
+    factory.registerFunction("covarPop", createAggregateFunctionStatisticsBinary<AggregateFunctionCovar, StatisticsFunctionKind::covarPop>);
+
+    /// Synonyms for compatibility.
+    factory.registerAlias("COVAR_SAMP", "covarSamp", AggregateFunctionFactory::CaseInsensitive);
+    factory.registerAlias("COVAR_POP", "covarPop", AggregateFunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionDistinct.h b/src/AggregateFunctions/AggregateFunctionDistinct.h
index e09e0ef621d..4338dcff5c0 100644
--- a/src/AggregateFunctions/AggregateFunctionDistinct.h
+++ b/src/AggregateFunctions/AggregateFunctionDistinct.h
@@ -9,6 +9,7 @@
 #include <Common/HashTable/HashSet.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/SipHash.h>
+#include <IO/ReadHelpersArena.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index 44e206890aa..6cacf66500f 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -2,12 +2,10 @@
 #include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
 
 #include <DataTypes/DataTypeAggregateFunction.h>
-#include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 
-#include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
 
 #include <Interpreters/Context.h>
@@ -21,6 +19,9 @@
 #include <Functions/FunctionFactory.h>
 
 
+static constexpr size_t MAX_AGGREGATE_FUNCTION_NAME_LENGTH = 1000;
+
+
 namespace DB
 {
 struct Settings;
@@ -30,6 +31,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_AGGREGATE_FUNCTION;
     extern const int LOGICAL_ERROR;
     extern const int ILLEGAL_AGGREGATION;
+    extern const int TOO_LARGE_STRING_SIZE;
 }
 
 const String & getAggregateFunctionCanonicalNameIfAny(const String & name)
@@ -70,12 +72,17 @@ static DataTypes convertLowCardinalityTypesToNested(const DataTypes & types)
 AggregateFunctionPtr AggregateFunctionFactory::get(
     const String & name, const DataTypes & argument_types, const Array & parameters, AggregateFunctionProperties & out_properties) const
 {
+    /// This to prevent costly string manipulation in parsing the aggregate function combinators.
+    /// Example: avgArrayArrayArrayArray...(1000 times)...Array
+    if (name.size() > MAX_AGGREGATE_FUNCTION_NAME_LENGTH)
+        throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too long name of aggregate function, maximum: {}", MAX_AGGREGATE_FUNCTION_NAME_LENGTH);
+
     auto types_without_low_cardinality = convertLowCardinalityTypesToNested(argument_types);
 
     /// If one of the types is Nullable, we apply aggregate function combinator "Null" if it's not window function.
     /// Window functions are not real aggregate functions. Applying combinators doesn't make sense for them,
     /// they must handle the nullability themselves
-    auto properties = tryGetPropertiesImpl(name);
+    auto properties = tryGetProperties(name);
     bool is_window_function = properties.has_value() && properties->is_window_function;
     if (!is_window_function && std::any_of(types_without_low_cardinality.begin(), types_without_low_cardinality.end(),
         [](const auto & type) { return type->isNullable(); }))
@@ -216,61 +223,67 @@ AggregateFunctionPtr AggregateFunctionFactory::tryGet(
 }
 
 
-std::optional<AggregateFunctionProperties> AggregateFunctionFactory::tryGetPropertiesImpl(const String & name_param) const
+std::optional<AggregateFunctionProperties> AggregateFunctionFactory::tryGetProperties(String name) const
 {
-    String name = getAliasToOrName(name_param);
-    Value found;
+    if (name.size() > MAX_AGGREGATE_FUNCTION_NAME_LENGTH)
+        throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too long name of aggregate function, maximum: {}", MAX_AGGREGATE_FUNCTION_NAME_LENGTH);
 
-    /// Find by exact match.
-    if (auto it = aggregate_functions.find(name); it != aggregate_functions.end())
+    while (true)
     {
-        found = it->second;
-    }
+        name = getAliasToOrName(name);
+        Value found;
 
-    if (auto jt = case_insensitive_aggregate_functions.find(Poco::toLower(name)); jt != case_insensitive_aggregate_functions.end())
-        found = jt->second;
+        /// Find by exact match.
+        if (auto it = aggregate_functions.find(name); it != aggregate_functions.end())
+        {
+            found = it->second;
+        }
 
-    if (found.creator)
-        return found.properties;
+        if (auto jt = case_insensitive_aggregate_functions.find(Poco::toLower(name)); jt != case_insensitive_aggregate_functions.end())
+            found = jt->second;
 
-    /// Combinators of aggregate functions.
-    /// For every aggregate function 'agg' and combiner '-Comb' there is a combined aggregate function with the name 'aggComb',
-    ///  that can have different number and/or types of arguments, different result type and different behaviour.
+        if (found.creator)
+            return found.properties;
 
-    if (AggregateFunctionCombinatorPtr combinator = AggregateFunctionCombinatorFactory::instance().tryFindSuffix(name))
-    {
-        if (combinator->isForInternalUsageOnly())
+        /// Combinators of aggregate functions.
+        /// For every aggregate function 'agg' and combiner '-Comb' there is a combined aggregate function with the name 'aggComb',
+        ///  that can have different number and/or types of arguments, different result type and different behaviour.
+
+        if (AggregateFunctionCombinatorPtr combinator = AggregateFunctionCombinatorFactory::instance().tryFindSuffix(name))
+        {
+            if (combinator->isForInternalUsageOnly())
+                return {};
+
+            /// NOTE: It's reasonable to also allow to transform properties by combinator.
+            name = name.substr(0, name.size() - combinator->getName().size());
+        }
+        else
             return {};
-
-        String nested_name = name.substr(0, name.size() - combinator->getName().size());
-
-        /// NOTE: It's reasonable to also allow to transform properties by combinator.
-        return tryGetPropertiesImpl(nested_name);
     }
-
-    return {};
 }
 
 
-std::optional<AggregateFunctionProperties> AggregateFunctionFactory::tryGetProperties(const String & name) const
+bool AggregateFunctionFactory::isAggregateFunctionName(String name) const
 {
-    return tryGetPropertiesImpl(name);
-}
+    if (name.size() > MAX_AGGREGATE_FUNCTION_NAME_LENGTH)
+        throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too long name of aggregate function, maximum: {}", MAX_AGGREGATE_FUNCTION_NAME_LENGTH);
 
+    while (true)
+    {
+        if (aggregate_functions.contains(name) || isAlias(name))
+            return true;
 
-bool AggregateFunctionFactory::isAggregateFunctionName(const String & name) const
-{
-    if (aggregate_functions.contains(name) || isAlias(name))
-        return true;
+        String name_lowercase = Poco::toLower(name);
+        if (case_insensitive_aggregate_functions.contains(name_lowercase) || isAlias(name_lowercase))
+            return true;
 
-    String name_lowercase = Poco::toLower(name);
-    if (case_insensitive_aggregate_functions.contains(name_lowercase) || isAlias(name_lowercase))
-        return true;
-
-    if (AggregateFunctionCombinatorPtr combinator = AggregateFunctionCombinatorFactory::instance().tryFindSuffix(name))
-        return isAggregateFunctionName(name.substr(0, name.size() - combinator->getName().size()));
-
-    return false;
+        if (AggregateFunctionCombinatorPtr combinator = AggregateFunctionCombinatorFactory::instance().tryFindSuffix(name))
+        {
+            name = name.substr(0, name.size() - combinator->getName().size());
+        }
+        else
+            return false;
+    }
 }
 
 AggregateFunctionFactory & AggregateFunctionFactory::instance()
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.h b/src/AggregateFunctions/AggregateFunctionFactory.h
index 0a966e4d8b5..dab0d28e851 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.h
+++ b/src/AggregateFunctions/AggregateFunctionFactory.h
@@ -77,9 +77,9 @@ public:
         AggregateFunctionProperties & out_properties) const;
 
     /// Get properties if the aggregate function exists.
-    std::optional<AggregateFunctionProperties> tryGetProperties(const String & name) const;
+    std::optional<AggregateFunctionProperties> tryGetProperties(String name) const;
 
-    bool isAggregateFunctionName(const String & name) const;
+    bool isAggregateFunctionName(String name) const;
 
 private:
     AggregateFunctionPtr getImpl(
@@ -89,8 +89,6 @@ private:
         AggregateFunctionProperties & out_properties,
         bool has_null_arguments) const;
 
-    std::optional<AggregateFunctionProperties> tryGetPropertiesImpl(const String & name) const;
-
     using AggregateFunctions = std::unordered_map<String, Value>;
 
     AggregateFunctions aggregate_functions;
diff --git a/src/AggregateFunctions/AggregateFunctionForEach.h b/src/AggregateFunctions/AggregateFunctionForEach.h
index f041dd11209..480b4cc690e 100644
--- a/src/AggregateFunctions/AggregateFunctionForEach.h
+++ b/src/AggregateFunctions/AggregateFunctionForEach.h
@@ -2,6 +2,8 @@
 
 #include <Columns/ColumnArray.h>
 #include <Common/assert_cast.h>
+#include <Common/Arena.h>
+#include <base/arithmeticOverflow.h>
 #include <DataTypes/DataTypeArray.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 
@@ -20,6 +22,8 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int SIZES_OF_ARRAYS_DONT_MATCH;
+    extern const int TOO_LARGE_ARRAY_SIZE;
+    extern const int LOGICAL_ERROR;
 }
 
 
@@ -65,11 +69,17 @@ private:
         size_t old_size = state.dynamic_array_size;
         if (old_size < new_size)
         {
+            static constexpr size_t MAX_ARRAY_SIZE = 100_GiB;
+            if (new_size > MAX_ARRAY_SIZE)
+                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Suspiciously large array size ({}) in -ForEach aggregate function", new_size);
+
+            size_t allocation_size = 0;
+            if (common::mulOverflow(new_size, nested_size_of_data, allocation_size))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Allocation size ({} * {}) overflows in -ForEach aggregate function, but it should've been prevented by previous checks", new_size, nested_size_of_data);
+
             char * old_state = state.array_of_aggregate_datas;
 
-            char * new_state = arena.alignedAlloc(
-                new_size * nested_size_of_data,
-                nested_func->alignOfData());
+            char * new_state = arena.alignedAlloc(allocation_size, nested_func->alignOfData());
 
             size_t i;
             try
diff --git a/src/AggregateFunctions/AggregateFunctionFourthMoment.cpp b/src/AggregateFunctions/AggregateFunctionFourthMoment.cpp
new file mode 100644
index 00000000000..c0af79c6f56
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionFourthMoment.cpp
@@ -0,0 +1,16 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionStatisticsSimple.h>
+
+
+namespace DB
+{
+
+template <typename T> using AggregateFunctionFourthMoment = AggregateFunctionVarianceSimple<StatFuncOneArg<T, 4>>;
+
+void registerAggregateFunctionsStatisticsFourthMoment(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("kurtSamp", createAggregateFunctionStatisticsUnary<AggregateFunctionFourthMoment, StatisticsFunctionKind::kurtSamp>);
+    factory.registerFunction("kurtPop", createAggregateFunctionStatisticsUnary<AggregateFunctionFourthMoment, StatisticsFunctionKind::kurtPop>);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArray.h b/src/AggregateFunctions/AggregateFunctionGroupArray.h
index eaffb04e2a9..7a5e6a8cb2d 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArray.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArray.h
@@ -288,7 +288,8 @@ public:
         readVarUInt(size, buf);
 
         if (unlikely(size > AGGREGATE_FUNCTION_GROUP_ARRAY_MAX_ARRAY_SIZE))
-            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size");
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                            "Too large array size (maximum: {})", AGGREGATE_FUNCTION_GROUP_ARRAY_MAX_ARRAY_SIZE);
 
         if (limit_num_elems && unlikely(size > max_elems))
             throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size, it should not exceed {}", max_elems);
@@ -366,6 +367,9 @@ struct GroupArrayNodeBase
     {
         UInt64 size;
         readVarUInt(size, buf);
+        if (unlikely(size > AGGREGATE_FUNCTION_GROUP_ARRAY_MAX_ARRAY_SIZE))
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                            "Too large array size (maximum: {})", AGGREGATE_FUNCTION_GROUP_ARRAY_MAX_ARRAY_SIZE);
 
         Node * node = reinterpret_cast<Node *>(arena->alignedAlloc(sizeof(Node) + size, alignof(Node)));
         node->size = size;
@@ -619,7 +623,8 @@ public:
             return;
 
         if (unlikely(elems > AGGREGATE_FUNCTION_GROUP_ARRAY_MAX_ARRAY_SIZE))
-            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size");
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                            "Too large array size (maximum: {})", AGGREGATE_FUNCTION_GROUP_ARRAY_MAX_ARRAY_SIZE);
 
         if (limit_num_elems && unlikely(elems > max_elems))
             throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size, it should not exceed {}", max_elems);
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h b/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
index dbd7b32b9ce..439bb613337 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
@@ -79,7 +79,8 @@ public:
             {
                 length_to_resize = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), params[1]);
                 if (length_to_resize > AGGREGATE_FUNCTION_GROUP_ARRAY_INSERT_AT_MAX_SIZE)
-                    throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size");
+                    throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                                    "Too large array size (maximum: {})", AGGREGATE_FUNCTION_GROUP_ARRAY_INSERT_AT_MAX_SIZE);
             }
         }
 
@@ -167,7 +168,8 @@ public:
         readVarUInt(size, buf);
 
         if (size > AGGREGATE_FUNCTION_GROUP_ARRAY_INSERT_AT_MAX_SIZE)
-            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size");
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                            "Too large array size (maximum: {})", AGGREGATE_FUNCTION_GROUP_ARRAY_INSERT_AT_MAX_SIZE);
 
         Array & arr = data(place).value;
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
index 5ee0be5cbce..e2acccce516 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
@@ -21,18 +21,21 @@ namespace ErrorCodes
 namespace
 {
 
-/// TODO Proper support for Decimal256.
 template <typename T, typename LimitNumberOfElements>
 struct MovingSum
 {
-    using Data = MovingSumData<std::conditional_t<is_decimal<T>, Decimal128, NearestFieldType<T>>>;
+    using Data = MovingSumData<std::conditional_t<is_decimal<T>,
+        std::conditional_t<sizeof(T) <= sizeof(Decimal128), Decimal128, Decimal256>,
+        NearestFieldType<T>>>;
     using Function = MovingImpl<T, LimitNumberOfElements, Data>;
 };
 
 template <typename T, typename LimitNumberOfElements>
 struct MovingAvg
 {
-    using Data = MovingAvgData<std::conditional_t<is_decimal<T>, Decimal128, Float64>>;
+    using Data = MovingAvgData<std::conditional_t<is_decimal<T>,
+        std::conditional_t<sizeof(T) <= sizeof(Decimal128), Decimal128, Decimal256>,
+        Float64>>;
     using Function = MovingImpl<T, LimitNumberOfElements, Data>;
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
index 8d7010c10db..e6f79d7bca1 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
@@ -144,7 +144,8 @@ public:
         readVarUInt(size, buf);
 
         if (unlikely(size > AGGREGATE_FUNCTION_MOVING_MAX_ARRAY_SIZE))
-            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size");
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                            "Too large array size (maximum: {})", AGGREGATE_FUNCTION_MOVING_MAX_ARRAY_SIZE);
 
         if (size > 0)
         {
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmap.cpp b/src/AggregateFunctions/AggregateFunctionGroupBitmap.cpp
index beabfe83c47..fd350b47026 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmap.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmap.cpp
@@ -1,6 +1,5 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/FactoryHelpers.h>
-#include <AggregateFunctions/Helpers.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 
 // TODO include this last because of a broken roaring header. See the comment inside.
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
index 5fe3128fa20..a32bb330884 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
@@ -31,22 +31,28 @@ public:
 
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
-        this->data(place).rbs.add(assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num]);
+        this->data(place).roaring_bitmap_with_small_set.add(assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num]);
     }
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
-        this->data(place).rbs.merge(this->data(rhs).rbs);
+        this->data(place).roaring_bitmap_with_small_set.merge(this->data(rhs).roaring_bitmap_with_small_set);
     }
 
-    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override { this->data(place).rbs.write(buf); }
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        this->data(place).roaring_bitmap_with_small_set.write(buf);
+    }
 
-    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override { this->data(place).rbs.read(buf); }
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
+    {
+        this->data(place).roaring_bitmap_with_small_set.read(buf);
+    }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
         assert_cast<ColumnVector<T> &>(to).getData().push_back(
-            static_cast<T>(this->data(place).rbs.size()));
+            static_cast<T>(this->data(place).roaring_bitmap_with_small_set.size()));
     }
 };
 
@@ -81,7 +87,7 @@ public:
         if (!data_lhs.init)
         {
             data_lhs.init = true;
-            data_lhs.rbs.merge(data_rhs.rbs);
+            data_lhs.roaring_bitmap_with_small_set.merge(data_rhs.roaring_bitmap_with_small_set);
         }
         else
         {
@@ -100,7 +106,7 @@ public:
         if (!data_lhs.init)
         {
             data_lhs.init = true;
-            data_lhs.rbs.merge(data_rhs.rbs);
+            data_lhs.roaring_bitmap_with_small_set.merge(data_rhs.roaring_bitmap_with_small_set);
         }
         else
         {
@@ -128,7 +134,7 @@ public:
         if (*version >= 1)
             DB::writeBoolText(this->data(place).init, buf);
 
-        this->data(place).rbs.write(buf);
+        this->data(place).roaring_bitmap_with_small_set.write(buf);
     }
 
     void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> version, Arena *) const override
@@ -138,13 +144,13 @@ public:
 
         if (*version >= 1)
             DB::readBoolText(this->data(place).init, buf);
-        this->data(place).rbs.read(buf);
+        this->data(place).roaring_bitmap_with_small_set.read(buf);
     }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
         assert_cast<ColumnVector<T> &>(to).getData().push_back(
-            static_cast<T>(this->data(place).rbs.size()));
+            static_cast<T>(this->data(place).roaring_bitmap_with_small_set.size()));
     }
 };
 
@@ -154,7 +160,7 @@ class BitmapAndPolicy
 {
 public:
     static constexpr auto name = "groupBitmapAnd";
-    static void apply(Data & lhs, const Data & rhs) { lhs.rbs.rb_and(rhs.rbs); }
+    static void apply(Data & lhs, const Data & rhs) { lhs.roaring_bitmap_with_small_set.rb_and(rhs.roaring_bitmap_with_small_set); }
 };
 
 template <typename Data>
@@ -162,7 +168,7 @@ class BitmapOrPolicy
 {
 public:
     static constexpr auto name = "groupBitmapOr";
-    static void apply(Data & lhs, const Data & rhs) { lhs.rbs.rb_or(rhs.rbs); }
+    static void apply(Data & lhs, const Data & rhs) { lhs.roaring_bitmap_with_small_set.rb_or(rhs.roaring_bitmap_with_small_set); }
 };
 
 template <typename Data>
@@ -170,7 +176,7 @@ class BitmapXorPolicy
 {
 public:
     static constexpr auto name = "groupBitmapXor";
-    static void apply(Data & lhs, const Data & rhs) { lhs.rbs.rb_xor(rhs.rbs); }
+    static void apply(Data & lhs, const Data & rhs) { lhs.roaring_bitmap_with_small_set.rb_xor(rhs.roaring_bitmap_with_small_set); }
 };
 
 template <typename T, typename Data>
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
index 801526432ae..d99f0bf16ee 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
@@ -20,6 +20,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int TOO_LARGE_ARRAY_SIZE;
+    extern const int INCORRECT_DATA;
+}
+
 enum BitmapKind
 {
     Small = 0,
@@ -41,20 +47,19 @@ private:
     using ValueBuffer = std::vector<T>;
     using RoaringBitmap = std::conditional_t<sizeof(T) >= 8, roaring::Roaring64Map, roaring::Roaring>;
     using Value = std::conditional_t<sizeof(T) >= 8, UInt64, UInt32>;
-    std::shared_ptr<RoaringBitmap> rb = nullptr;
+    std::shared_ptr<RoaringBitmap> roaring_bitmap;
 
     void toLarge()
     {
-        rb = std::make_shared<RoaringBitmap>();
+        roaring_bitmap = std::make_shared<RoaringBitmap>();
         for (const auto & x : small)
-            rb->add(static_cast<Value>(x.getValue()));
+            roaring_bitmap->add(static_cast<Value>(x.getValue()));
         small.clear();
     }
 
 public:
-    bool isLarge() const { return rb != nullptr; }
-
-    bool isSmall() const { return rb == nullptr; }
+    bool isLarge() const { return roaring_bitmap != nullptr; }
+    bool isSmall() const { return roaring_bitmap == nullptr; }
 
     void add(T value)
     {
@@ -63,17 +68,19 @@ public:
             if (small.find(value) == small.end())
             {
                 if (!small.full())
+                {
                     small.insert(value);
+                }
                 else
                 {
                     toLarge();
-                    rb->add(static_cast<Value>(value));
+                    roaring_bitmap->add(static_cast<Value>(value));
                 }
             }
         }
         else
         {
-            rb->add(static_cast<Value>(value));
+            roaring_bitmap->add(static_cast<Value>(value));
         }
     }
 
@@ -82,7 +89,7 @@ public:
         if (isSmall())
             return small.size();
         else
-            return rb->cardinality();
+            return roaring_bitmap->cardinality();
     }
 
     void merge(const RoaringBitmapWithSmallSet & r1)
@@ -92,7 +99,7 @@ public:
             if (isSmall())
                 toLarge();
 
-            *rb |= *r1.rb;
+            *roaring_bitmap |= *r1.roaring_bitmap;
         }
         else
         {
@@ -105,6 +112,7 @@ public:
     {
         UInt8 kind;
         readBinary(kind, in);
+
         if (BitmapKind::Small == kind)
         {
             small.read(in);
@@ -113,26 +121,40 @@ public:
         {
             size_t size;
             readVarUInt(size, in);
+
+            static constexpr size_t max_size = 1_GiB;
+
+            if (size == 0)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect size (0) in groupBitmap.");
+            if (size > max_size)
+                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                                "Too large array size in groupBitmap (maximum: {})", max_size);
+
+            /// TODO: this is unnecessary copying - it will be better to read and deserialize in one pass.
             std::unique_ptr<char[]> buf(new char[size]);
             in.readStrict(buf.get(), size);
-            rb = std::make_shared<RoaringBitmap>(RoaringBitmap::read(buf.get()));
+
+            roaring_bitmap = std::make_shared<RoaringBitmap>(RoaringBitmap::readSafe(buf.get(), size));
         }
+        else
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Unknown type of roaring bitmap");
     }
 
     void write(DB::WriteBuffer & out) const
     {
         UInt8 kind = isLarge() ? BitmapKind::Bitmap : BitmapKind::Small;
         writeBinary(kind, out);
+
         if (BitmapKind::Small == kind)
         {
             small.write(out);
         }
         else if (BitmapKind::Bitmap == kind)
         {
-            auto size = rb->getSizeInBytes();
+            auto size = roaring_bitmap->getSizeInBytes();
             writeVarUInt(size, out);
             std::unique_ptr<char[]> buf(new char[size]);
-            rb->write(buf.get());
+            roaring_bitmap->write(buf.get());
             out.write(buf.get(), size);
         }
     }
@@ -173,7 +195,7 @@ public:
         {
             for (const auto & x : small)
             {
-                if (r1.rb->contains(static_cast<Value>(x.getValue())))
+                if (r1.roaring_bitmap->contains(static_cast<Value>(x.getValue())))
                     buffer.push_back(x.getValue());
             }
 
@@ -187,15 +209,18 @@ public:
         }
         else
         {
-            std::shared_ptr<RoaringBitmap> new_rb = r1.isSmall() ? r1.getNewRoaringBitmapFromSmall() : r1.rb;
-            *rb &= *new_rb;
+            std::shared_ptr<RoaringBitmap> new_rb = r1.isSmall() ? r1.getNewRoaringBitmapFromSmall() : r1.roaring_bitmap;
+            *roaring_bitmap &= *new_rb;
         }
     }
 
     /**
      * Computes the union between two bitmaps.
      */
-    void rb_or(const RoaringBitmapWithSmallSet & r1) { merge(r1); } /// NOLINT
+    void rb_or(const RoaringBitmapWithSmallSet & r1)
+    {
+        merge(r1); /// NOLINT
+    }
 
     /**
      * Computes the symmetric difference (xor) between two bitmaps.
@@ -205,8 +230,8 @@ public:
         if (isSmall())
             toLarge();
 
-        std::shared_ptr<RoaringBitmap> new_rb = r1.isSmall() ? r1.getNewRoaringBitmapFromSmall() : r1.rb;
-        *rb ^= *new_rb;
+        std::shared_ptr<RoaringBitmap> new_rb = r1.isSmall() ? r1.getNewRoaringBitmapFromSmall() : r1.roaring_bitmap;
+        *roaring_bitmap ^= *new_rb;
     }
 
     /**
@@ -234,7 +259,7 @@ public:
         {
             for (const auto & x : small)
             {
-                if (!r1.rb->contains(static_cast<Value>(x.getValue())))
+                if (!r1.roaring_bitmap->contains(static_cast<Value>(x.getValue())))
                     buffer.push_back(x.getValue());
             }
 
@@ -248,8 +273,8 @@ public:
         }
         else
         {
-            std::shared_ptr<RoaringBitmap> new_rb = r1.isSmall() ? r1.getNewRoaringBitmapFromSmall() : r1.rb;
-            *rb -= *new_rb;
+            std::shared_ptr<RoaringBitmap> new_rb = r1.isSmall() ? r1.getNewRoaringBitmapFromSmall() : r1.roaring_bitmap;
+            *roaring_bitmap -= *new_rb;
         }
     }
 
@@ -269,14 +294,14 @@ public:
         {
             for (const auto & x : small)
             {
-                if (r1.rb->contains(static_cast<Value>(x.getValue())))
+                if (r1.roaring_bitmap->contains(static_cast<Value>(x.getValue())))
                     ++ret;
             }
         }
         else
         {
-            std::shared_ptr<RoaringBitmap> new_rb = r1.isSmall() ? r1.getNewRoaringBitmapFromSmall() : r1.rb;
-            ret = (*rb & *new_rb).cardinality();
+            std::shared_ptr<RoaringBitmap> new_rb = r1.isSmall() ? r1.getNewRoaringBitmapFromSmall() : r1.roaring_bitmap;
+            ret = (*roaring_bitmap & *new_rb).cardinality();
         }
         return ret;
     }
@@ -321,8 +346,8 @@ public:
         if (isSmall())
             toLarge();
 
-        std::shared_ptr<RoaringBitmap> new_rb = r1.isSmall() ? r1.getNewRoaringBitmapFromSmall() : r1.rb;
-        return *rb == *new_rb;
+        std::shared_ptr<RoaringBitmap> new_rb = r1.isSmall() ? r1.getNewRoaringBitmapFromSmall() : r1.roaring_bitmap;
+        return *roaring_bitmap == *new_rb;
     }
 
     /**
@@ -343,7 +368,7 @@ public:
             {
                 for (const auto & x : small)
                 {
-                    if (r1.rb->contains(static_cast<Value>(x.getValue())))
+                    if (r1.roaring_bitmap->contains(static_cast<Value>(x.getValue())))
                         return 1;
                 }
             }
@@ -352,13 +377,13 @@ public:
         {
             for (const auto & x : r1.small)
             {
-                if (rb->contains(static_cast<Value>(x.getValue())))
+                if (roaring_bitmap->contains(static_cast<Value>(x.getValue())))
                     return 1;
             }
         }
         else
         {
-            if ((*rb & *r1.rb).cardinality() > 0)
+            if ((*roaring_bitmap & *r1.roaring_bitmap).cardinality() > 0)
                 return 1;
         }
 
@@ -396,7 +421,7 @@ public:
                 // greater then r1 is not a subset.
                 for (const auto & x : small)
                 {
-                    if (!r1.rb->contains(static_cast<Value>(x.getValue())) && ++r1_size > small.size())
+                    if (!r1.roaring_bitmap->contains(static_cast<Value>(x.getValue())) && ++r1_size > small.size())
                         return 0;
                 }
             }
@@ -405,13 +430,13 @@ public:
         {
             for (const auto & x : r1.small)
             {
-                if (!rb->contains(static_cast<Value>(x.getValue())))
+                if (!roaring_bitmap->contains(static_cast<Value>(x.getValue())))
                     return 0;
             }
         }
         else
         {
-            if (!r1.rb->isSubset(*rb))
+            if (!r1.roaring_bitmap->isSubset(*roaring_bitmap))
                 return 0;
         }
         return 1;
@@ -428,46 +453,7 @@ public:
         if (isSmall())
             return small.find(static_cast<T>(x)) != small.end();
         else
-            return rb->contains(static_cast<Value>(x));
-    }
-
-    /**
-     * Remove value
-     */
-    void rb_remove(UInt64 x) /// NOLINT
-    {
-        if (!std::is_same_v<T, UInt64> && x > rb_max())
-            return;
-
-        if (isSmall())
-            toLarge();
-
-        rb->remove(x);
-    }
-
-    /**
-     * compute (in place) the negation of the roaring bitmap within a specified
-     * interval: [range_start, range_end). The number of negated values is
-     * range_end - range_start.
-     * Areas outside the range are passed through unchanged.
-     */
-    void rb_flip(UInt64 begin, UInt64 end) /// NOLINT
-    {
-        if (isSmall())
-            toLarge();
-
-        rb->flip(begin, end);
-    }
-
-    /**
-     * returns the number of integers that are smaller or equal to offsetid.
-     */
-    UInt64 rb_rank(UInt64 x) /// NOLINT
-    {
-        if (isSmall())
-            toLarge();
-
-        return rb->rank(x);
+            return roaring_bitmap->contains(static_cast<Value>(x));
     }
 
     /**
@@ -487,7 +473,7 @@ public:
         }
         else
         {
-            for (auto it = rb->begin(); it != rb->end(); ++it)
+            for (auto it = roaring_bitmap->begin(); it != roaring_bitmap->end(); ++it)
             {
                 res.emplace_back(*it);
                 ++count;
@@ -519,7 +505,7 @@ public:
         }
         else
         {
-            for (auto it = rb->begin(); it != rb->end(); ++it)
+            for (auto it = roaring_bitmap->begin(); it != roaring_bitmap->end(); ++it)
             {
                 if (*it < range_start)
                     continue;
@@ -569,7 +555,7 @@ public:
         else
         {
             UInt64 count = 0;
-            for (auto it = rb->begin(); it != rb->end(); ++it)
+            for (auto it = roaring_bitmap->begin(); it != roaring_bitmap->end(); ++it)
             {
                 if (*it < range_start)
                     continue;
@@ -607,11 +593,11 @@ public:
         {
             UInt64 count = 0;
             UInt64 offset_count = 0;
-            auto it = rb->begin();
-            for (;it != rb->end() && offset_count < offset; ++it)
+            auto it = roaring_bitmap->begin();
+            for (;it != roaring_bitmap->end() && offset_count < offset; ++it)
                 ++offset_count;
 
-            for (;it != rb->end() && count < limit; ++it, ++count)
+            for (;it != roaring_bitmap->end() && count < limit; ++it, ++count)
                 r1.add(*it);
             return count;
         }
@@ -633,7 +619,7 @@ public:
             return min_val;
         }
         else
-            return rb->minimum();
+            return roaring_bitmap->minimum();
     }
 
     UInt64 rb_max() const /// NOLINT
@@ -652,7 +638,7 @@ public:
             return max_val;
         }
         else
-            return rb->maximum();
+            return roaring_bitmap->maximum();
     }
 
     /**
@@ -668,9 +654,9 @@ public:
         {
             if (from_vals[i] == to_vals[i])
                 continue;
-            bool changed = rb->removeChecked(static_cast<Value>(from_vals[i]));
+            bool changed = roaring_bitmap->removeChecked(static_cast<Value>(from_vals[i]));
             if (changed)
-                rb->add(static_cast<Value>(to_vals[i]));
+                roaring_bitmap->add(static_cast<Value>(to_vals[i]));
         }
     }
 };
@@ -680,7 +666,7 @@ struct AggregateFunctionGroupBitmapData
 {
     // If false, all bitmap operations will be treated as merge to initialize the state
     bool init = false;
-    RoaringBitmapWithSmallSet<T, 32> rbs;
+    RoaringBitmapWithSmallSet<T, 32> roaring_bitmap_with_small_set;
     static const char * name() { return "groupBitmap"; }
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h b/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
index f8e426363d8..4cd7a7932b0 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
@@ -4,6 +4,7 @@
 
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
+#include <IO/ReadHelpersArena.h>
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -181,7 +182,6 @@ public:
         auto & set = this->data(place).value;
         size_t size;
         readVarUInt(size, buf);
-        //TODO: set.reserve(size);
 
         for (size_t i = 0; i < size; ++i)
             set.insert(readStringBinaryInto(*arena, buf));
diff --git a/src/AggregateFunctions/AggregateFunctionHistogram.h b/src/AggregateFunctions/AggregateFunctionHistogram.h
index 35e5f241ec9..967bc9bb517 100644
--- a/src/AggregateFunctions/AggregateFunctionHistogram.h
+++ b/src/AggregateFunctions/AggregateFunctionHistogram.h
@@ -2,7 +2,6 @@
 
 #include <base/sort.h>
 
-#include <Common/Arena.h>
 #include <Common/NaNUtils.h>
 
 #include <Columns/ColumnVector.h>
@@ -29,6 +28,7 @@
 namespace DB
 {
 struct Settings;
+class Arena;
 
 namespace ErrorCodes
 {
@@ -292,6 +292,10 @@ public:
         readVarUInt(size, buf);
         if (size > max_bins * 2)
             throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too many bins");
+        static constexpr size_t max_size = 1_GiB;
+        if (size > max_size)
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                            "Too large array size in histogram (maximum: {})", max_size);
 
         buf.readStrict(reinterpret_cast<char *>(points), size * sizeof(WeightedValue));
     }
diff --git a/src/AggregateFunctions/AggregateFunctionIf.h b/src/AggregateFunctions/AggregateFunctionIf.h
index 47f04dad9a4..cd7d7e27a25 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.h
+++ b/src/AggregateFunctions/AggregateFunctionIf.h
@@ -152,6 +152,13 @@ public:
         nested_func->merge(place, rhs, arena);
     }
 
+    bool isAbleToParallelizeMerge() const override { return nested_func->isAbleToParallelizeMerge(); }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, Arena * arena) const override
+    {
+        nested_func->merge(place, rhs, thread_pool, arena);
+    }
+
     void mergeBatch(
         size_t row_begin,
         size_t row_end,
diff --git a/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h b/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h
index 625a2511b0d..16e9388d4bb 100644
--- a/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h
+++ b/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h
@@ -6,7 +6,6 @@
 
 #include <Columns/ColumnsNumber.h>
 
-#include <Common/ArenaAllocator.h>
 #include <Common/assert_cast.h>
 #include <base/arithmeticOverflow.h>
 #include <base/sort.h>
@@ -117,7 +116,7 @@ struct AggregateFunctionIntervalLengthSumData
         readBinary(size, buf);
 
         if (unlikely(size > MAX_ARRAY_SIZE))
-            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size");
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size (maximum: {})", MAX_ARRAY_SIZE);
 
         segments.clear();
         segments.reserve(size);
diff --git a/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp b/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp
new file mode 100644
index 00000000000..9bd06c3ef4d
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp
@@ -0,0 +1,36 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
+namespace DB
+{
+struct Settings;
+
+namespace
+{
+
+AggregateFunctionPtr createAggregateFunctionKolmogorovSmirnovTest(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+{
+    assertBinary(name, argument_types);
+
+    if (!isNumber(argument_types[0]) || !isNumber(argument_types[1]))
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Aggregate function {} only supports numerical types", name);
+
+    return std::make_shared<AggregateFunctionKolmogorovSmirnov>(argument_types, parameters);
+}
+
+
+}
+
+void registerAggregateFunctionKolmogorovSmirnovTest(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("kolmogorovSmirnovTest", createAggregateFunctionKolmogorovSmirnovTest, AggregateFunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.h b/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.h
new file mode 100644
index 00000000000..5629de31c88
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.h
@@ -0,0 +1,331 @@
+#pragma once
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/StatCommon.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnTuple.h>
+#include <Common/Exception.h>
+#include <Common/assert_cast.h>
+#include <Common/PODArray_fwd.h>
+#include <base/types.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+namespace DB
+{
+struct Settings;
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
+}
+
+struct KolmogorovSmirnov : public StatisticalSample<Float64, Float64>
+{
+    enum class Alternative
+    {
+        TwoSided,
+        Less,
+        Greater
+    };
+
+    std::pair<Float64, Float64> getResult(Alternative alternative, String method)
+    {
+        ::sort(x.begin(), x.end());
+        ::sort(y.begin(), y.end());
+
+        Float64 max_s = std::numeric_limits<Float64>::min();
+        Float64 min_s = std::numeric_limits<Float64>::max();
+        Float64 now_s = 0;
+        UInt64 pos_x = 0;
+        UInt64 pos_y = 0;
+        UInt64 pos_tmp;
+        UInt64 n1 = x.size();
+        UInt64 n2 = y.size();
+
+        const Float64 n1_d = 1. / n1;
+        const Float64 n2_d = 1. / n2;
+        const Float64 tol = 1e-7;
+
+        // reference: https://en.wikipedia.org/wiki/Kolmogorov%E2%80%93Smirnov_test
+        while (pos_x < x.size() && pos_y < y.size())
+        {
+            if (likely(fabs(x[pos_x] - y[pos_y]) >= tol))
+            {
+                if (x[pos_x] < y[pos_y])
+                {
+                    now_s += n1_d;
+                    ++pos_x;
+                }
+                else
+                {
+                    now_s -= n2_d;
+                    ++pos_y;
+                }
+            }
+            else
+            {
+                pos_tmp = pos_x + 1;
+                while (pos_tmp < x.size() && unlikely(fabs(x[pos_tmp] - x[pos_x]) <= tol))
+                    pos_tmp++;
+                now_s += n1_d * (pos_tmp - pos_x);
+                pos_x = pos_tmp;
+                pos_tmp = pos_y + 1;
+                while (pos_tmp < y.size() && unlikely(fabs(y[pos_tmp] - y[pos_y]) <= tol))
+                    pos_tmp++;
+                now_s -= n2_d * (pos_tmp - pos_y);
+                pos_y = pos_tmp;
+            }
+            max_s = std::max(max_s, now_s);
+            min_s = std::min(min_s, now_s);
+        }
+        now_s += n1_d * (x.size() - pos_x) - n2_d * (y.size() - pos_y);
+        min_s = std::min(min_s, now_s);
+        max_s = std::max(max_s, now_s);
+
+        Float64 d = 0;
+        if (alternative == Alternative::TwoSided)
+            d = std::max(std::abs(max_s), std::abs(min_s));
+        else if (alternative == Alternative::Less)
+            d = -min_s;
+        else if (alternative == Alternative::Greater)
+            d = max_s;
+
+        UInt64 g = std::__gcd(n1, n2);
+        UInt64 nx_g = n1 / g;
+        UInt64 ny_g = n2 / g;
+
+        if (method == "auto")
+            method = std::max(n1, n2) <= 10000 ? "exact" : "asymptotic";
+        else if (method == "exact" && nx_g >= std::numeric_limits<Int32>::max() / ny_g)
+            method = "asymptotic";
+
+        Float64 p_value = std::numeric_limits<Float64>::infinity();
+
+        if (method == "exact")
+        {
+            /* reference:
+             * Gunar Schröer and Dietrich Trenkler
+             * Exact and Randomization Distributions of Kolmogorov-Smirnov, Tests for Two or Three Samples
+             *
+             * and
+             *
+             * Thomas Viehmann
+             * Numerically more stable computation of the p-values for the two-sample Kolmogorov-Smirnov test
+             */
+            if (n2 > n1)
+                std::swap(n1, n2);
+
+            const Float64 f_n1 = static_cast<Float64>(n1);
+            const Float64 f_n2 = static_cast<Float64>(n2);
+            const Float64 k_d = (0.5 + floor(d * f_n2 * f_n1 - tol)) / (f_n2 * f_n1);
+            PaddedPODArray<Float64> c(n1 + 1);
+
+            auto check = alternative == Alternative::TwoSided ?
+                         [](const Float64 & q, const Float64 & r, const Float64 & s) { return fabs(r - s) >= q; }
+                       : [](const Float64 & q, const Float64 & r, const Float64 & s) { return r - s >= q; };
+
+            c[0] = 0;
+            for (UInt64 j = 1; j <= n1; j++)
+                if (check(k_d, 0., j / f_n1))
+                    c[j] = 1.;
+                else
+                    c[j] = c[j - 1];
+
+            for (UInt64 i = 1; i <= n2; i++)
+            {
+                if (check(k_d, i / f_n2, 0.))
+                    c[0] = 1.;
+                for (UInt64 j = 1; j <= n1; j++)
+                    if (check(k_d, i / f_n2, j / f_n1))
+                        c[j] = 1.;
+                    else
+                    {
+                        Float64 v = i / static_cast<Float64>(i + j);
+                        Float64 w = j / static_cast<Float64>(i + j);
+                        c[j] = v * c[j] + w * c[j - 1];
+                    }
+            }
+            p_value = c[n1];
+        }
+        else if (method == "asymp" || method == "asymptotic")
+        {
+            Float64 n = std::min(n1, n2);
+            Float64 m = std::max(n1, n2);
+            Float64 p = sqrt((n * m) / (n + m)) * d;
+
+            if (alternative == Alternative::TwoSided)
+            {
+                /* reference:
+                 * J.DURBIN
+                 * Distribution theory for tests based on the sample distribution function
+                 */
+                Float64 new_val, old_val, s, w, z;
+                UInt64 k_max = static_cast<UInt64>(sqrt(2 - log(tol)));
+
+                if (p < 1)
+                {
+                    z = - (M_PI_2 * M_PI_4) / (p * p);
+                    w = log(p);
+                    s = 0;
+                    for (UInt64 k = 1; k < k_max; k += 2)
+                        s += exp(k * k * z - w);
+                    p = s / 0.398942280401432677939946059934;
+                }
+                else
+                {
+                    z = -2 * p * p;
+                    s = -1;
+                    UInt64 k = 1;
+                    old_val = 0;
+                    new_val = 1;
+                    while (fabs(old_val - new_val) > tol)
+                    {
+                        old_val = new_val;
+                        new_val += 2 * s * exp(z * k * k);
+                        s *= -1;
+                        k++;
+                    }
+                    p = new_val;
+                }
+                p_value = 1 - p;
+            }
+            else
+            {
+                /* reference:
+                 * J. L. HODGES, Jr
+                 * The significance probability of the Smirnov two-sample test
+                 */
+
+                // Use Hodges' suggested approximation Eqn 5.3
+                // Requires m to be the larger of (n1, n2)
+                Float64 expt = -2 * p * p - 2 * p * (m + 2 * n) / sqrt(m * n * (m + n)) / 3.0;
+                p_value = exp(expt);
+            }
+        }
+        return {d, p_value};
+    }
+
+};
+
+class AggregateFunctionKolmogorovSmirnov final:
+    public IAggregateFunctionDataHelper<KolmogorovSmirnov, AggregateFunctionKolmogorovSmirnov>
+{
+private:
+    using Alternative = typename KolmogorovSmirnov::Alternative;
+    Alternative alternative = Alternative::TwoSided;
+    String method = "auto";
+
+public:
+    explicit AggregateFunctionKolmogorovSmirnov(const DataTypes & arguments, const Array & params)
+        : IAggregateFunctionDataHelper<KolmogorovSmirnov, AggregateFunctionKolmogorovSmirnov> ({arguments}, {}, createResultType())
+    {
+        if (params.size() > 2)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} require two parameter or less", getName());
+
+        if (params.empty())
+            return;
+
+        if (params[0].getType() != Field::Types::String)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} require first parameter to be a String", getName());
+
+        const auto & param = params[0].get<String>();
+        if (param == "two-sided")
+            alternative = Alternative::TwoSided;
+        else if (param == "less")
+            alternative = Alternative::Less;
+        else if (param == "greater")
+            alternative = Alternative::Greater;
+        else
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown parameter in aggregate function {}. "
+                    "It must be one of: 'two-sided', 'less', 'greater'", getName());
+
+        if (params.size() != 2)
+            return;
+
+        if (params[1].getType() != Field::Types::String)
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} require second parameter to be a String", getName());
+
+        method = params[1].get<String>();
+        if (method != "auto" && method != "exact" && method != "asymp" && method != "asymptotic")
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown method in aggregate function {}. "
+                    "It must be one of: 'auto', 'exact', 'asymp' (or 'asymptotic')", getName());
+    }
+
+    String getName() const override
+    {
+        return "kolmogorovSmirnovTest";
+    }
+
+    bool allocatesMemoryInArena() const override { return true; }
+
+    static DataTypePtr createResultType()
+    {
+        DataTypes types
+        {
+            std::make_shared<DataTypeNumber<Float64>>(),
+            std::make_shared<DataTypeNumber<Float64>>(),
+        };
+
+        Strings names
+        {
+            "d_statistic",
+            "p_value"
+        };
+
+        return std::make_shared<DataTypeTuple>(
+            std::move(types),
+            std::move(names)
+        );
+    }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        Float64 value = columns[0]->getFloat64(row_num);
+        UInt8 is_second = columns[1]->getUInt(row_num);
+        if (is_second)
+            this->data(place).addY(value, arena);
+        else
+            this->data(place).addX(value, arena);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        this->data(place).merge(this->data(rhs), arena);
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        this->data(place).write(buf);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
+    {
+        this->data(place).read(buf, arena);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        if (!this->data(place).size_x || !this->data(place).size_y)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Aggregate function {} require both samples to be non empty", getName());
+
+        auto [d_statistic, p_value] = this->data(place).getResult(alternative, method);
+
+        /// Because p-value is a probability.
+        p_value = std::min(1.0, std::max(0.0, p_value));
+
+        auto & column_tuple = assert_cast<ColumnTuple &>(to);
+        auto & column_stat = assert_cast<ColumnVector<Float64> &>(column_tuple.getColumn(0));
+        auto & column_value = assert_cast<ColumnVector<Float64> &>(column_tuple.getColumn(1));
+
+        column_stat.getData().push_back(d_statistic);
+        column_value.getData().push_back(p_value);
+    }
+
+};
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionMannWhitney.h b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
index 86075440169..ac6ce0d0ca9 100644
--- a/src/AggregateFunctions/AggregateFunctionMannWhitney.h
+++ b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
@@ -6,7 +6,6 @@
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnTuple.h>
 #include <Common/assert_cast.h>
-#include <Common/ArenaAllocator.h>
 #include <Common/PODArray_fwd.h>
 #include <base/types.h>
 #include <DataTypes/DataTypeArray.h>
diff --git a/src/AggregateFunctions/AggregateFunctionMap.h b/src/AggregateFunctions/AggregateFunctionMap.h
index 91530698bf4..55f6611974e 100644
--- a/src/AggregateFunctions/AggregateFunctionMap.h
+++ b/src/AggregateFunctions/AggregateFunctionMap.h
@@ -61,15 +61,11 @@ struct AggregateFunctionMapCombinatorData<String>
 
     static void writeKey(String key, WriteBuffer & buf)
     {
-        writeVarUInt(key.size(), buf);
-        writeString(key, buf);
+        writeStringBinary(key, buf);
     }
     static void readKey(String & key, ReadBuffer & buf)
     {
-        UInt64 size;
-        readVarUInt(size, buf);
-        key.resize(size);
-        buf.readStrict(key.data(), size);
+        readStringBinary(key, buf);
     }
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionMaxIntersections.h b/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
index 563d56c6f40..5074e491f60 100644
--- a/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
+++ b/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 #include <base/sort.h>
 
 #include <DataTypes/DataTypesNumber.h>
@@ -140,7 +139,8 @@ public:
         readVarUInt(size, buf);
 
         if (unlikely(size > AGGREGATE_FUNCTION_MAX_INTERSECTIONS_MAX_ARRAY_SIZE))
-            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size");
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                            "Too large array size (maximum: {})", AGGREGATE_FUNCTION_MAX_INTERSECTIONS_MAX_ARRAY_SIZE);
 
         auto & value = this->data(place).value;
 
diff --git a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
index b984772c8ea..94c0d60be81 100644
--- a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
+++ b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
@@ -10,6 +10,7 @@
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <base/StringRef.h>
+#include <Common/Arena.h>
 #include <Common/assert_cast.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <AggregateFunctions/IAggregateFunction.h>
@@ -47,7 +48,7 @@ private:
     using ColVecType = ColumnVectorOrDecimal<T>;
 
     bool has_value = false; /// We need to remember if at least one value has been passed. This is necessary for AggregateFunctionIf.
-    T value;
+    T value = T{};
 
 public:
     static constexpr bool is_nullable = false;
@@ -554,7 +555,8 @@ public:
         if (capacity < size_to_reserve)
         {
             if (unlikely(MAX_STRING_SIZE < size_to_reserve))
-                throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "String size is too big ({})", size_to_reserve);
+                throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "String size is too big ({}), maximum: {}",
+                                size_to_reserve, MAX_STRING_SIZE);
 
             size_t rounded_capacity = roundUpToPowerOfTwoOrZero(size_to_reserve);
             chassert(rounded_capacity <= MAX_STRING_SIZE + 1);  /// rounded_capacity <= 2^31
@@ -624,7 +626,8 @@ public:
     void changeImpl(StringRef value, Arena * arena)
     {
         if (unlikely(MAX_STRING_SIZE < value.size))
-            throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "String size is too big ({})", value.size);
+            throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "String size is too big ({}), maximum: {}",
+                            value.size, MAX_STRING_SIZE);
 
         UInt32 value_size = static_cast<UInt32>(value.size);
 
@@ -766,19 +769,23 @@ static_assert(
 
 
 /// For any other value types.
+template <bool IS_NULLABLE = false>
 struct SingleValueDataGeneric
 {
 private:
     using Self = SingleValueDataGeneric;
 
     Field value;
+    bool has_value = false;
 
 public:
-    static constexpr bool is_nullable = false;
+    static constexpr bool is_nullable = IS_NULLABLE;
     static constexpr bool is_any = false;
 
     bool has() const
     {
+        if constexpr (is_nullable)
+            return has_value;
         return !value.isNull();
     }
 
@@ -813,11 +820,15 @@ public:
     void change(const IColumn & column, size_t row_num, Arena *)
     {
         column.get(row_num, value);
+        if constexpr (is_nullable)
+            has_value = true;
     }
 
     void change(const Self & to, Arena *)
     {
         value = to.value;
+        if constexpr (is_nullable)
+            has_value = true;
     }
 
     bool changeFirstTime(const IColumn & column, size_t row_num, Arena * arena)
@@ -833,7 +844,7 @@ public:
 
     bool changeFirstTime(const Self & to, Arena * arena)
     {
-        if (!has() && to.has())
+        if (!has() && (is_nullable || to.has()))
         {
             change(to, arena);
             return true;
@@ -868,27 +879,61 @@ public:
         }
         else
         {
-            Field new_value;
-            column.get(row_num, new_value);
-            if (new_value < value)
+            if constexpr (is_nullable)
             {
-                value = new_value;
-                return true;
+                Field new_value;
+                column.get(row_num, new_value);
+                if (!value.isNull() && (new_value.isNull() || new_value < value))
+                {
+                    value = new_value;
+                    return true;
+                }
+                else
+                    return false;
             }
             else
-                return false;
+            {
+                Field new_value;
+                column.get(row_num, new_value);
+                if (new_value < value)
+                {
+                    value = new_value;
+                    return true;
+                }
+                else
+                    return false;
+            }
         }
     }
 
     bool changeIfLess(const Self & to, Arena * arena)
     {
-        if (to.has() && (!has() || to.value < value))
+        if (!to.has())
+            return false;
+        if constexpr (is_nullable)
         {
-            change(to, arena);
-            return true;
+            if (!has())
+            {
+                change(to, arena);
+                return true;
+            }
+            if (to.value.isNull() || (!value.isNull() && to.value < value))
+            {
+                value = to.value;
+                return true;
+            }
+            return false;
         }
         else
-            return false;
+        {
+            if (!has() || to.value < value)
+            {
+                change(to, arena);
+                return true;
+            }
+            else
+                return false;
+        }
     }
 
     bool changeIfGreater(const IColumn & column, size_t row_num, Arena * arena)
@@ -900,27 +945,55 @@ public:
         }
         else
         {
-            Field new_value;
-            column.get(row_num, new_value);
-            if (new_value > value)
+            if constexpr (is_nullable)
             {
-                value = new_value;
-                return true;
+                Field new_value;
+                column.get(row_num, new_value);
+                if (!value.isNull() && (new_value.isNull() || value < new_value))
+                {
+                    value = new_value;
+                    return true;
+                }
+                return false;
             }
             else
-                return false;
+            {
+                Field new_value;
+                column.get(row_num, new_value);
+                if (new_value > value)
+                {
+                    value = new_value;
+                    return true;
+                }
+                else
+                    return false;
+            }
         }
     }
 
     bool changeIfGreater(const Self & to, Arena * arena)
     {
-        if (to.has() && (!has() || to.value > value))
+        if (!to.has())
+            return false;
+        if constexpr (is_nullable)
         {
-            change(to, arena);
-            return true;
+            if (!value.isNull() && (to.value.isNull() || value < to.value))
+            {
+                value = to.value;
+                return true;
+            }
+            return false;
         }
         else
-            return false;
+        {
+            if (!has() || to.value > value)
+            {
+                change(to, arena);
+                return true;
+            }
+            else
+                return false;
+        }
     }
 
     bool isEqualTo(const IColumn & column, size_t row_num) const
@@ -1357,6 +1430,17 @@ public:
         this->data(place).insertResultInto(to);
     }
 
+    AggregateFunctionPtr getOwnNullAdapter(
+        const AggregateFunctionPtr & nested_function,
+        const DataTypes & /*arguments*/,
+        const Array & /*params*/,
+        const AggregateFunctionProperties & /*properties*/) const override
+    {
+        if (Data::is_nullable)
+            return nested_function;
+        return nullptr;
+    }
+
 #if USE_EMBEDDED_COMPILER
 
     bool isCompilable() const override
diff --git a/src/AggregateFunctions/AggregateFunctionNothing.h b/src/AggregateFunctions/AggregateFunctionNothing.h
index 8491e8edfaa..8c1b95c26b0 100644
--- a/src/AggregateFunctions/AggregateFunctionNothing.h
+++ b/src/AggregateFunctions/AggregateFunctionNothing.h
@@ -13,6 +13,11 @@ namespace DB
 {
 struct Settings;
 
+namespace ErrorCodes
+{
+    extern const int INCORRECT_DATA;
+}
+
 
 /** Aggregate function that takes arbitrary number of arbitrary arguments and does nothing.
   */
@@ -69,7 +74,8 @@ public:
     {
         [[maybe_unused]] char symbol;
         readChar(symbol, buf);
-        assert(symbol == '\0');
+        if (symbol != '\0')
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect state of aggregate function 'nothing', it should contain exactly one zero byte, while it is {}.", static_cast<UInt32>(symbol));
     }
 
     void insertResultInto(AggregateDataPtr __restrict, IColumn & to, Arena *) const override
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.h b/src/AggregateFunctions/AggregateFunctionQuantile.h
index 49157acf690..13320ad90b6 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -26,9 +26,11 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
 }
 
 template <typename> class QuantileTiming;
+template <typename> class QuantileGK;
 
 
 /** Generic aggregate function for calculation of quantiles.
@@ -60,6 +62,7 @@ private:
     using ColVecType = ColumnVectorOrDecimal<Value>;
 
     static constexpr bool returns_float = !(std::is_same_v<FloatReturnType, void>);
+    static constexpr bool is_quantile_gk = std::is_same_v<Data, QuantileGK<Value>>;
     static_assert(!is_decimal<Value> || !returns_float);
 
     QuantileLevels<Float64> levels;
@@ -67,22 +70,57 @@ private:
     /// Used when there are single level to get.
     Float64 level = 0.5;
 
+    /// Used for the approximate version of the algorithm (Greenwald-Khanna)
+    ssize_t accuracy = 10000;
+
     DataTypePtr & argument_type;
 
 public:
     AggregateFunctionQuantile(const DataTypes & argument_types_, const Array & params)
         : IAggregateFunctionDataHelper<Data, AggregateFunctionQuantile<Value, Data, Name, has_second_arg, FloatReturnType, returns_many>>(
             argument_types_, params, createResultType(argument_types_))
-        , levels(params, returns_many)
+        , levels(is_quantile_gk && !params.empty() ? Array(params.begin() + 1, params.end()) : params, returns_many)
         , level(levels.levels[0])
         , argument_type(this->argument_types[0])
     {
         if (!returns_many && levels.size() > 1)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} require one parameter or less", getName());
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires one level parameter or less", getName());
+
+        if constexpr (is_quantile_gk)
+        {
+            if (params.empty())
+                throw Exception(
+                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one param", getName());
+
+            const auto & accuracy_field = params[0];
+            if (!isInt64OrUInt64FieldType(accuracy_field.getType()))
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} requires accuracy parameter with integer type", getName());
+
+            if (accuracy_field.getType() == Field::Types::Int64)
+                accuracy = accuracy_field.get<Int64>();
+            else
+                accuracy = accuracy_field.get<UInt64>();
+
+            if (accuracy <= 0)
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Aggregate function {} requires accuracy parameter with positive value but is {}",
+                    getName(),
+                    accuracy);
+        }
     }
 
     String getName() const override { return Name::name; }
 
+    void create(AggregateDataPtr __restrict place) const override /// NOLINT
+    {
+        if constexpr (is_quantile_gk)
+            new (place) Data(accuracy);
+        else
+            new (place) Data;
+    }
+
     static DataTypePtr createResultType(const DataTypes & argument_types_)
     {
         DataTypePtr res;
@@ -125,8 +163,11 @@ public:
         if constexpr (std::is_same_v<Data, QuantileTiming<Value>>)
         {
             /// QuantileTiming only supports unsigned integers. Too large values are also meaningless.
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wimplicit-const-int-float-conversion"
             if (isNaN(value) || value > std::numeric_limits<Int64>::max() || value < 0)
                 return;
+#   pragma clang diagnostic pop
         }
 
         if constexpr (has_second_arg)
@@ -250,4 +291,7 @@ struct NameQuantilesBFloat16 { static constexpr auto name = "quantilesBFloat16";
 struct NameQuantileBFloat16Weighted { static constexpr auto name = "quantileBFloat16Weighted"; };
 struct NameQuantilesBFloat16Weighted { static constexpr auto name = "quantilesBFloat16Weighted"; };
 
+struct NameQuantileGK { static constexpr auto name = "quantileGK"; };
+struct NameQuantilesGK { static constexpr auto name = "quantilesGK"; };
+
 }
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileApprox.cpp b/src/AggregateFunctions/AggregateFunctionQuantileApprox.cpp
new file mode 100644
index 00000000000..c190aaa30d5
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionQuantileApprox.cpp
@@ -0,0 +1,71 @@
+#include <AggregateFunctions/AggregateFunctionQuantile.h>
+#include <AggregateFunctions/QuantileApprox.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Core/Field.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+template <typename Value, bool _> using FuncQuantileGK = AggregateFunctionQuantile<Value, QuantileGK<Value>, NameQuantileGK, false, void, false>;
+template <typename Value, bool _> using FuncQuantilesGK = AggregateFunctionQuantile<Value, QuantileGK<Value>, NameQuantilesGK, false, void, true>;
+
+template <template <typename, bool> class Function>
+AggregateFunctionPtr createAggregateFunctionQuantile(
+    const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *)
+{
+    /// Second argument type check doesn't depend on the type of the first one.
+    Function<void, true>::assertSecondArg(argument_types);
+
+    const DataTypePtr & argument_type = argument_types[0];
+    WhichDataType which(argument_type);
+
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) \
+        return std::make_shared<Function<TYPE, true>>(argument_types, params);
+    FOR_BASIC_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+    if (which.idx == TypeIndex::Date) return std::make_shared<Function<DataTypeDate::FieldType, false>>(argument_types, params);
+    if (which.idx == TypeIndex::DateTime) return std::make_shared<Function<DataTypeDateTime::FieldType, false>>(argument_types, params);
+
+    if (which.idx == TypeIndex::Decimal32) return std::make_shared<Function<Decimal32, false>>(argument_types, params);
+    if (which.idx == TypeIndex::Decimal64) return std::make_shared<Function<Decimal64, false>>(argument_types, params);
+    if (which.idx == TypeIndex::Decimal128) return std::make_shared<Function<Decimal128, false>>(argument_types, params);
+    if (which.idx == TypeIndex::Decimal256) return std::make_shared<Function<Decimal256, false>>(argument_types, params);
+    if (which.idx == TypeIndex::DateTime64) return std::make_shared<Function<DateTime64, false>>(argument_types, params);
+
+    if (which.idx == TypeIndex::Int128) return std::make_shared<Function<Int128, true>>(argument_types, params);
+    if (which.idx == TypeIndex::UInt128) return std::make_shared<Function<UInt128, true>>(argument_types, params);
+    if (which.idx == TypeIndex::Int256) return std::make_shared<Function<Int256, true>>(argument_types, params);
+    if (which.idx == TypeIndex::UInt256) return std::make_shared<Function<UInt256, true>>(argument_types, params);
+
+    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument for aggregate function {}",
+                    argument_type->getName(), name);
+}
+
+}
+
+void registerAggregateFunctionsQuantileApprox(AggregateFunctionFactory & factory)
+{
+    /// For aggregate functions returning array we cannot return NULL on empty set.
+    AggregateFunctionProperties properties = { .returns_default_when_only_null = true };
+
+    factory.registerFunction(NameQuantileGK::name, createAggregateFunctionQuantile<FuncQuantileGK>);
+    factory.registerFunction(NameQuantilesGK::name, {createAggregateFunctionQuantile<FuncQuantilesGK>, properties});
+
+    /// 'median' is an alias for 'quantile'
+    factory.registerAlias("medianGK", NameQuantileGK::name);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
index 4f9ca55f9f5..4f7d04100cf 100644
--- a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
+++ b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
@@ -14,8 +14,6 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeArray.h>
 
-#include <Common/ArenaAllocator.h>
-
 namespace DB
 {
 struct Settings;
diff --git a/src/AggregateFunctions/AggregateFunctionRetention.h b/src/AggregateFunctions/AggregateFunctionRetention.h
index 7ecb9509dd5..63ff5921540 100644
--- a/src/AggregateFunctions/AggregateFunctionRetention.h
+++ b/src/AggregateFunctions/AggregateFunctionRetention.h
@@ -8,7 +8,6 @@
 #include <DataTypes/DataTypeArray.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <Common/ArenaAllocator.h>
 #include <base/range.h>
 #include <bitset>
 
diff --git a/src/AggregateFunctions/AggregateFunctionSecondMoment.cpp b/src/AggregateFunctions/AggregateFunctionSecondMoment.cpp
new file mode 100644
index 00000000000..123baac3e37
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSecondMoment.cpp
@@ -0,0 +1,24 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionStatisticsSimple.h>
+
+
+namespace DB
+{
+
+template <typename T> using AggregateFunctionSecondMoment = AggregateFunctionVarianceSimple<StatFuncOneArg<T, 2>>;
+
+void registerAggregateFunctionsStatisticsSecondMoment(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("varSamp", createAggregateFunctionStatisticsUnary<AggregateFunctionSecondMoment, StatisticsFunctionKind::varSamp>);
+    factory.registerFunction("varPop", createAggregateFunctionStatisticsUnary<AggregateFunctionSecondMoment, StatisticsFunctionKind::varPop>);
+    factory.registerFunction("stddevSamp", createAggregateFunctionStatisticsUnary<AggregateFunctionSecondMoment, StatisticsFunctionKind::stddevSamp>);
+    factory.registerFunction("stddevPop", createAggregateFunctionStatisticsUnary<AggregateFunctionSecondMoment, StatisticsFunctionKind::stddevPop>);
+
+    /// Synonyms for compatibility.
+    factory.registerAlias("VAR_SAMP", "varSamp", AggregateFunctionFactory::CaseInsensitive);
+    factory.registerAlias("VAR_POP", "varPop", AggregateFunctionFactory::CaseInsensitive);
+    factory.registerAlias("STDDEV_SAMP", "stddevSamp", AggregateFunctionFactory::CaseInsensitive);
+    factory.registerAlias("STDDEV_POP", "stddevPop", AggregateFunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
index 563d3d6aa8a..f2e17940d35 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
@@ -50,7 +50,7 @@ struct AggregateFunctionSequenceMatchData final
     bool sorted = true;
     PODArrayWithStackMemory<TimestampEvents, 64> events_list;
     /// sequenceMatch conditions met at least once in events_list
-    std::bitset<max_events> conditions_met;
+    Events conditions_met;
 
     void add(const Timestamp timestamp, const Events & events)
     {
@@ -101,6 +101,11 @@ struct AggregateFunctionSequenceMatchData final
         size_t size;
         readBinary(size, buf);
 
+        /// If we lose these flags, functionality is broken
+        /// If we serialize/deserialize these flags, we have compatibility issues
+        /// If we set these flags to 1, we have a minor performance penalty, which seems acceptable
+        conditions_met.set();
+
         events_list.clear();
         events_list.reserve(size);
 
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
index 76610772b22..77bd590ebbb 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
@@ -86,7 +86,7 @@ struct NodeBase
     {
         UInt64 size;
         readVarUInt(size, buf);
-        if unlikely (size > max_node_size_deserialize)
+        if (unlikely(size > max_node_size_deserialize))
             throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large node state size");
 
         Node * node = reinterpret_cast<Node *>(arena->alignedAlloc(sizeof(Node) + size, alignof(Node)));
@@ -323,6 +323,10 @@ public:
         if (unlikely(size == 0))
             return;
 
+        if (unlikely(size > max_node_size_deserialize))
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                            "Too large array size (maximum: {})", max_node_size_deserialize);
+
         auto & value = data(place).value;
 
         value.resize(size, arena);
diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
index 919b59448a1..30e107bc4db 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.h
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <base/arithmeticOverflow.h>
+
 #include <array>
 #include <string_view>
 #include <DataTypes/DataTypeString.h>
@@ -9,7 +11,6 @@
 #include <IO/WriteHelpers.h>
 #include <Columns/ColumnString.h>
 #include <Common/PODArray.h>
-#include <Common/logger_useful.h>
 #include <IO/ReadBufferFromString.h>
 #include <Common/HashTable/HashMap.h>
 #include <Columns/IColumn.h>
@@ -43,7 +44,19 @@ struct AggregateFunctionSparkbarData
 
         auto [it, inserted] = points.insert({x, y});
         if (!inserted)
-            it->getMapped() += y;
+        {
+            if constexpr (std::is_floating_point_v<Y>)
+            {
+                it->getMapped() += y;
+                return it->getMapped();
+            }
+            else
+            {
+                Y res;
+                bool has_overfllow = common::addOverflow(it->getMapped(), y, res);
+                it->getMapped() = has_overfllow ? std::numeric_limits<Y>::max() : res;
+            }
+        }
         return it->getMapped();
     }
 
@@ -117,6 +130,7 @@ class AggregateFunctionSparkbar final
 {
 
 private:
+    static constexpr size_t BAR_LEVELS = 8;
     const size_t width = 0;
 
     /// Range for x specified in parameters.
@@ -126,8 +140,8 @@ private:
 
     size_t updateFrame(ColumnString::Chars & frame, Y value) const
     {
-        static constexpr std::array<std::string_view, 9> bars{" ", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"};
-        const auto & bar = (isNaN(value) || value < 1 || 8 < value) ? bars[0] : bars[static_cast<UInt8>(value)];
+        static constexpr std::array<std::string_view, BAR_LEVELS + 1> bars{" ", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"};
+        const auto & bar = (isNaN(value) || value < 1 || static_cast<Y>(BAR_LEVELS) < value) ? bars[0] : bars[static_cast<UInt8>(value)];
         frame.insert(bar.begin(), bar.end());
         return bar.size();
     }
@@ -161,7 +175,7 @@ private:
         }
 
         PaddedPODArray<Y> histogram(width, 0);
-        PaddedPODArray<UInt64> fhistogram(width, 0);
+        PaddedPODArray<UInt64> count_histogram(width, 0); /// The number of points in each bucket
 
         for (const auto & point : data.points)
         {
@@ -176,22 +190,30 @@ private:
             Float64 w = histogram.size();
             size_t index = std::min<size_t>(static_cast<size_t>(w / delta * value), histogram.size() - 1);
 
-            if (std::numeric_limits<Y>::max() - histogram[index] > point.getMapped())
+            Y res;
+            bool has_overfllow = false;
+            if constexpr (std::is_floating_point_v<Y>)
+                res = histogram[index] + point.getMapped();
+            else
+                has_overfllow = common::addOverflow(histogram[index], point.getMapped(), res);
+
+            if (unlikely(has_overfllow))
             {
-                histogram[index] += point.getMapped();
-                fhistogram[index] += 1;
+                /// In case of overflow, just saturate
+                /// Do not count new values, because we do not know how many of them were added
+                histogram[index] = std::numeric_limits<Y>::max();
             }
             else
             {
-                /// In case of overflow, just saturate
-                histogram[index] = std::numeric_limits<Y>::max();
+                histogram[index] = res;
+                count_histogram[index] += 1;
             }
         }
 
         for (size_t i = 0; i < histogram.size(); ++i)
         {
-            if (fhistogram[i] > 0)
-                histogram[i] /= fhistogram[i];
+            if (count_histogram[i] > 0)
+                histogram[i] /= count_histogram[i];
         }
 
         Y y_max = 0;
@@ -209,12 +231,30 @@ private:
             return;
         }
 
+        /// Scale the histogram to the range [0, BAR_LEVELS]
         for (auto & y : histogram)
         {
             if (isNaN(y) || y <= 0)
+            {
                 y = 0;
+                continue;
+            }
+
+            constexpr auto levels_num = static_cast<Y>(BAR_LEVELS - 1);
+            if constexpr (std::is_floating_point_v<Y>)
+            {
+                y = y / (y_max / levels_num) + 1;
+            }
             else
-                y = y * 7 / y_max + 1;
+            {
+                Y scaled;
+                bool has_overfllow = common::mulOverflow<Y>(y, levels_num, scaled);
+
+                if (has_overfllow)
+                    y = y / (y_max / levels_num) + 1;
+                else
+                    y = scaled / y_max + 1;
+            }
         }
 
         size_t sz = 0;
diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.cpp b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.cpp
deleted file mode 100644
index d06c1619b9f..00000000000
--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/Helpers.h>
-#include <AggregateFunctions/FactoryHelpers.h>
-#include <AggregateFunctions/AggregateFunctionStatisticsSimple.h>
-
-
-namespace DB
-{
-struct Settings;
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-}
-
-namespace
-{
-
-template <template <typename> typename FunctionTemplate>
-AggregateFunctionPtr createAggregateFunctionStatisticsUnary(
-    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
-{
-    assertNoParameters(name, parameters);
-    assertUnary(name, argument_types);
-
-    AggregateFunctionPtr res;
-    const DataTypePtr & data_type = argument_types[0];
-    if (isDecimal(data_type))
-        res.reset(createWithDecimalType<FunctionTemplate>(*data_type, *data_type, argument_types));
-    else
-        res.reset(createWithNumericType<FunctionTemplate>(*data_type, argument_types));
-
-    if (!res)
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument for aggregate function {}",
-                        argument_types[0]->getName(), name);
-    return res;
-}
-
-template <template <typename, typename> typename FunctionTemplate>
-AggregateFunctionPtr createAggregateFunctionStatisticsBinary(
-    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
-{
-    assertNoParameters(name, parameters);
-    assertBinary(name, argument_types);
-
-    AggregateFunctionPtr res(createWithTwoBasicNumericTypes<FunctionTemplate>(*argument_types[0], *argument_types[1], argument_types));
-    if (!res)
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal types {} and {} of arguments for aggregate function {}",
-            argument_types[0]->getName(), argument_types[1]->getName(), name);
-
-    return res;
-}
-
-}
-
-void registerAggregateFunctionsStatisticsSimple(AggregateFunctionFactory & factory)
-{
-    factory.registerFunction("varSamp", createAggregateFunctionStatisticsUnary<AggregateFunctionVarSampSimple>);
-    factory.registerFunction("varPop", createAggregateFunctionStatisticsUnary<AggregateFunctionVarPopSimple>);
-    factory.registerFunction("stddevSamp", createAggregateFunctionStatisticsUnary<AggregateFunctionStddevSampSimple>);
-    factory.registerFunction("stddevPop", createAggregateFunctionStatisticsUnary<AggregateFunctionStddevPopSimple>);
-    factory.registerFunction("skewSamp", createAggregateFunctionStatisticsUnary<AggregateFunctionSkewSampSimple>);
-    factory.registerFunction("skewPop", createAggregateFunctionStatisticsUnary<AggregateFunctionSkewPopSimple>);
-    factory.registerFunction("kurtSamp", createAggregateFunctionStatisticsUnary<AggregateFunctionKurtSampSimple>);
-    factory.registerFunction("kurtPop", createAggregateFunctionStatisticsUnary<AggregateFunctionKurtPopSimple>);
-
-    factory.registerFunction("covarSamp", createAggregateFunctionStatisticsBinary<AggregateFunctionCovarSampSimple>);
-    factory.registerFunction("covarPop", createAggregateFunctionStatisticsBinary<AggregateFunctionCovarPopSimple>);
-    factory.registerFunction("corr", createAggregateFunctionStatisticsBinary<AggregateFunctionCorrSimple>, AggregateFunctionFactory::CaseInsensitive);
-
-    /// Synonims for compatibility.
-    factory.registerAlias("VAR_SAMP", "varSamp", AggregateFunctionFactory::CaseInsensitive);
-    factory.registerAlias("VAR_POP", "varPop", AggregateFunctionFactory::CaseInsensitive);
-    factory.registerAlias("STDDEV_SAMP", "stddevSamp", AggregateFunctionFactory::CaseInsensitive);
-    factory.registerAlias("STDDEV_POP", "stddevPop", AggregateFunctionFactory::CaseInsensitive);
-    factory.registerAlias("COVAR_SAMP", "covarSamp", AggregateFunctionFactory::CaseInsensitive);
-    factory.registerAlias("COVAR_POP", "covarPop", AggregateFunctionFactory::CaseInsensitive);
-}
-
-}
diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
index 9ef62363a75..f9a60c0c0b4 100644
--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
+++ b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
@@ -9,6 +9,8 @@
 
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/Moments.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/FactoryHelpers.h>
 
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -30,6 +32,7 @@
 
 namespace DB
 {
+
 struct Settings;
 
 enum class StatisticsFunctionKind
@@ -43,27 +46,25 @@ enum class StatisticsFunctionKind
 };
 
 
-template <typename T, StatisticsFunctionKind _kind, size_t _level>
+template <typename T, size_t _level>
 struct StatFuncOneArg
 {
     using Type1 = T;
     using Type2 = T;
     using ResultType = std::conditional_t<std::is_same_v<T, Float32>, Float32, Float64>;
-    using Data = std::conditional_t<is_decimal<T>, VarMomentsDecimal<Decimal128, _level>, VarMoments<ResultType, _level>>;
+    using Data = VarMoments<ResultType, _level>;
 
-    static constexpr StatisticsFunctionKind kind = _kind;
     static constexpr UInt32 num_args = 1;
 };
 
-template <typename T1, typename T2, StatisticsFunctionKind _kind>
+template <typename T1, typename T2, template <typename> typename Moments>
 struct StatFuncTwoArg
 {
     using Type1 = T1;
     using Type2 = T2;
     using ResultType = std::conditional_t<std::is_same_v<T1, T2> && std::is_same_v<T1, Float32>, Float32, Float64>;
-    using Data = std::conditional_t<_kind == StatisticsFunctionKind::corr, CorrMoments<ResultType>, CovarMoments<ResultType>>;
+    using Data = Moments<ResultType>;
 
-    static constexpr StatisticsFunctionKind kind = _kind;
     static constexpr UInt32 num_args = 2;
 };
 
@@ -80,41 +81,18 @@ public:
     using ResultType = typename StatFunc::ResultType;
     using ColVecResult = ColumnVector<ResultType>;
 
-    explicit AggregateFunctionVarianceSimple(const DataTypes & argument_types_)
+    explicit AggregateFunctionVarianceSimple(const DataTypes & argument_types_, StatisticsFunctionKind kind_)
         : IAggregateFunctionDataHelper<typename StatFunc::Data, AggregateFunctionVarianceSimple<StatFunc>>(argument_types_, {}, std::make_shared<DataTypeNumber<ResultType>>())
-        , src_scale(0)
-    {}
-
-    AggregateFunctionVarianceSimple(const IDataType & data_type, const DataTypes & argument_types_)
-        : IAggregateFunctionDataHelper<typename StatFunc::Data, AggregateFunctionVarianceSimple<StatFunc>>(argument_types_, {}, std::make_shared<DataTypeNumber<ResultType>>())
-        , src_scale(getDecimalScale(data_type))
-    {}
+        , src_scale(0), kind(kind_)
+    {
+        chassert(!argument_types_.empty());
+        if (isDecimal(argument_types_.front()))
+            src_scale = getDecimalScale(*argument_types_.front());
+    }
 
     String getName() const override
     {
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::varPop)
-            return "varPop";
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::varSamp)
-            return "varSamp";
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::stddevPop)
-            return "stddevPop";
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::stddevSamp)
-            return "stddevSamp";
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::skewPop)
-            return "skewPop";
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::skewSamp)
-            return "skewSamp";
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::kurtPop)
-            return "kurtPop";
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::kurtSamp)
-            return "kurtSamp";
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::covarPop)
-            return "covarPop";
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::covarSamp)
-            return "covarSamp";
-        if constexpr (StatFunc::kind == StatisticsFunctionKind::corr)
-            return "corr";
-        UNREACHABLE();
+        return String(magic_enum::enum_name(kind));
     }
 
     bool allocatesMemoryInArena() const override { return false; }
@@ -129,8 +107,9 @@ public:
         {
             if constexpr (is_decimal<T1>)
             {
-                this->data(place).add(static_cast<ResultType>(
-                    static_cast<const ColVecT1 &>(*columns[0]).getData()[row_num].value));
+                this->data(place).add(
+                    convertFromDecimal<DataTypeDecimal<T1>, DataTypeFloat64>(
+                        static_cast<const ColVecT1 &>(*columns[0]).getData()[row_num], src_scale));
             }
             else
                 this->data(place).add(
@@ -158,64 +137,29 @@ public:
         const auto & data = this->data(place);
         auto & dst = static_cast<ColVecResult &>(to).getData();
 
-        if constexpr (is_decimal<T1>)
+        switch (kind)
         {
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::varPop)
-                dst.push_back(data.getPopulation(src_scale * 2));
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::varSamp)
-                dst.push_back(data.getSample(src_scale * 2));
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::stddevPop)
-                dst.push_back(sqrt(data.getPopulation(src_scale * 2)));
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::stddevSamp)
-                dst.push_back(sqrt(data.getSample(src_scale * 2)));
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::skewPop)
+            case StatisticsFunctionKind::varPop:
             {
-                Float64 var_value = data.getPopulation(src_scale * 2);
-
-                if (var_value > 0)
-                    dst.push_back(data.getMoment3(src_scale * 3) / pow(var_value, 1.5));
-                else
-                    dst.push_back(std::numeric_limits<Float64>::quiet_NaN());
-            }
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::skewSamp)
-            {
-                Float64 var_value = data.getSample(src_scale * 2);
-
-                if (var_value > 0)
-                    dst.push_back(data.getMoment3(src_scale * 3) / pow(var_value, 1.5));
-                else
-                    dst.push_back(std::numeric_limits<Float64>::quiet_NaN());
-            }
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::kurtPop)
-            {
-                Float64 var_value = data.getPopulation(src_scale * 2);
-
-                if (var_value > 0)
-                    dst.push_back(data.getMoment4(src_scale * 4) / pow(var_value, 2));
-                else
-                    dst.push_back(std::numeric_limits<Float64>::quiet_NaN());
-            }
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::kurtSamp)
-            {
-                Float64 var_value = data.getSample(src_scale * 2);
-
-                if (var_value > 0)
-                    dst.push_back(data.getMoment4(src_scale * 4) / pow(var_value, 2));
-                else
-                    dst.push_back(std::numeric_limits<Float64>::quiet_NaN());
-            }
-        }
-        else
-        {
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::varPop)
                 dst.push_back(data.getPopulation());
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::varSamp)
+                break;
+            }
+            case StatisticsFunctionKind::varSamp:
+            {
                 dst.push_back(data.getSample());
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::stddevPop)
+                break;
+            }
+            case StatisticsFunctionKind::stddevPop:
+            {
                 dst.push_back(sqrt(data.getPopulation()));
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::stddevSamp)
+                break;
+            }
+            case StatisticsFunctionKind::stddevSamp:
+            {
                 dst.push_back(sqrt(data.getSample()));
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::skewPop)
+                break;
+            }
+            case StatisticsFunctionKind::skewPop:
             {
                 ResultType var_value = data.getPopulation();
 
@@ -223,8 +167,10 @@ public:
                     dst.push_back(static_cast<ResultType>(data.getMoment3() / pow(var_value, 1.5)));
                 else
                     dst.push_back(std::numeric_limits<ResultType>::quiet_NaN());
+
+                break;
             }
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::skewSamp)
+            case StatisticsFunctionKind::skewSamp:
             {
                 ResultType var_value = data.getSample();
 
@@ -232,8 +178,10 @@ public:
                     dst.push_back(static_cast<ResultType>(data.getMoment3() / pow(var_value, 1.5)));
                 else
                     dst.push_back(std::numeric_limits<ResultType>::quiet_NaN());
+
+                break;
             }
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::kurtPop)
+            case StatisticsFunctionKind::kurtPop:
             {
                 ResultType var_value = data.getPopulation();
 
@@ -241,8 +189,10 @@ public:
                     dst.push_back(static_cast<ResultType>(data.getMoment4() / pow(var_value, 2)));
                 else
                     dst.push_back(std::numeric_limits<ResultType>::quiet_NaN());
+
+                break;
             }
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::kurtSamp)
+            case StatisticsFunctionKind::kurtSamp:
             {
                 ResultType var_value = data.getSample();
 
@@ -250,31 +200,78 @@ public:
                     dst.push_back(static_cast<ResultType>(data.getMoment4() / pow(var_value, 2)));
                 else
                     dst.push_back(std::numeric_limits<ResultType>::quiet_NaN());
+
+                break;
             }
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::covarPop)
+            case StatisticsFunctionKind::covarPop:
+            {
                 dst.push_back(data.getPopulation());
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::covarSamp)
+                break;
+            }
+            case StatisticsFunctionKind::covarSamp:
+            {
                 dst.push_back(data.getSample());
-            if constexpr (StatFunc::kind == StatisticsFunctionKind::corr)
+                break;
+            }
+            case StatisticsFunctionKind::corr:
+            {
                 dst.push_back(data.get());
+                break;
+            }
         }
     }
 
 private:
     UInt32 src_scale;
+    StatisticsFunctionKind kind;
 };
 
 
-template <typename T> using AggregateFunctionVarPopSimple = AggregateFunctionVarianceSimple<StatFuncOneArg<T, StatisticsFunctionKind::varPop, 2>>;
-template <typename T> using AggregateFunctionVarSampSimple = AggregateFunctionVarianceSimple<StatFuncOneArg<T, StatisticsFunctionKind::varSamp, 2>>;
-template <typename T> using AggregateFunctionStddevPopSimple = AggregateFunctionVarianceSimple<StatFuncOneArg<T, StatisticsFunctionKind::stddevPop, 2>>;
-template <typename T> using AggregateFunctionStddevSampSimple = AggregateFunctionVarianceSimple<StatFuncOneArg<T, StatisticsFunctionKind::stddevSamp, 2>>;
-template <typename T> using AggregateFunctionSkewPopSimple = AggregateFunctionVarianceSimple<StatFuncOneArg<T, StatisticsFunctionKind::skewPop, 3>>;
-template <typename T> using AggregateFunctionSkewSampSimple = AggregateFunctionVarianceSimple<StatFuncOneArg<T, StatisticsFunctionKind::skewSamp, 3>>;
-template <typename T> using AggregateFunctionKurtPopSimple = AggregateFunctionVarianceSimple<StatFuncOneArg<T, StatisticsFunctionKind::kurtPop, 4>>;
-template <typename T> using AggregateFunctionKurtSampSimple = AggregateFunctionVarianceSimple<StatFuncOneArg<T, StatisticsFunctionKind::kurtSamp, 4>>;
-template <typename T1, typename T2> using AggregateFunctionCovarPopSimple = AggregateFunctionVarianceSimple<StatFuncTwoArg<T1, T2, StatisticsFunctionKind::covarPop>>;
-template <typename T1, typename T2> using AggregateFunctionCovarSampSimple = AggregateFunctionVarianceSimple<StatFuncTwoArg<T1, T2, StatisticsFunctionKind::covarSamp>>;
-template <typename T1, typename T2> using AggregateFunctionCorrSimple = AggregateFunctionVarianceSimple<StatFuncTwoArg<T1, T2, StatisticsFunctionKind::corr>>;
+struct Settings;
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+template <template <typename> typename FunctionTemplate, StatisticsFunctionKind kind>
+AggregateFunctionPtr createAggregateFunctionStatisticsUnary(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+{
+    assertNoParameters(name, parameters);
+    assertUnary(name, argument_types);
+
+    AggregateFunctionPtr res;
+    const DataTypePtr & data_type = argument_types[0];
+    if (isDecimal(data_type))
+        res.reset(createWithDecimalType<FunctionTemplate>(*data_type, argument_types, kind));
+    else
+        res.reset(createWithNumericType<FunctionTemplate>(*data_type, argument_types, kind));
+
+    if (!res)
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument for aggregate function {}",
+                        argument_types[0]->getName(), name);
+    return res;
+}
+
+template <template <typename, typename> typename FunctionTemplate, StatisticsFunctionKind kind>
+AggregateFunctionPtr createAggregateFunctionStatisticsBinary(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+{
+    assertNoParameters(name, parameters);
+    assertBinary(name, argument_types);
+
+    AggregateFunctionPtr res(createWithTwoBasicNumericTypes<FunctionTemplate>(*argument_types[0], *argument_types[1], argument_types, kind));
+    if (!res)
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal types {} and {} of arguments for aggregate function {}",
+            argument_types[0]->getName(), argument_types[1]->getName(), name);
+
+    return res;
+}
+
+}
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionSum.cpp b/src/AggregateFunctions/AggregateFunctionSum.cpp
index 4f2a935d9e5..e393cb6dd38 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSum.cpp
@@ -19,7 +19,7 @@ namespace
 template <typename T>
 struct SumSimple
 {
-    /// @note It uses slow Decimal128 (cause we need such a variant). sumWithOverflow is faster for Decimal32/64
+    /// @note It uses slow Decimal128/256 (cause we need such a variant). sumWithOverflow is faster for Decimal32/64
     using ResultType = std::conditional_t<is_decimal<T>,
                                         std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
                                         NearestFieldType<T>>;
diff --git a/src/AggregateFunctions/AggregateFunctionSumMap.h b/src/AggregateFunctions/AggregateFunctionSumMap.h
index f51ec423c69..b30f5ff5220 100644
--- a/src/AggregateFunctions/AggregateFunctionSumMap.h
+++ b/src/AggregateFunctions/AggregateFunctionSumMap.h
@@ -18,7 +18,6 @@
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/FactoryHelpers.h>
 #include <map>
-#include <Common/logger_useful.h>
 #include <Common/ClickHouseRevision.h>
 
 
diff --git a/src/AggregateFunctions/AggregateFunctionThirdMoment.cpp b/src/AggregateFunctions/AggregateFunctionThirdMoment.cpp
new file mode 100644
index 00000000000..78e4d6fe502
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionThirdMoment.cpp
@@ -0,0 +1,16 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionStatisticsSimple.h>
+
+
+namespace DB
+{
+
+template <typename T> using AggregateFunctionThirdMoment = AggregateFunctionVarianceSimple<StatFuncOneArg<T, 3>>;
+
+void registerAggregateFunctionsStatisticsThirdMoment(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("skewSamp", createAggregateFunctionStatisticsUnary<AggregateFunctionThirdMoment, StatisticsFunctionKind::skewSamp>);
+    factory.registerFunction("skewPop", createAggregateFunctionStatisticsUnary<AggregateFunctionThirdMoment, StatisticsFunctionKind::skewPop>);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionTopK.h b/src/AggregateFunctions/AggregateFunctionTopK.h
index f1e57608195..89985c0ea6b 100644
--- a/src/AggregateFunctions/AggregateFunctionTopK.h
+++ b/src/AggregateFunctions/AggregateFunctionTopK.h
@@ -2,6 +2,7 @@
 
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
+#include <IO/ReadHelpersArena.h>
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/AggregateFunctions/AggregateFunctionWindowFunnel.h b/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
index c4a9fa1b936..e83c5277d26 100644
--- a/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
+++ b/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
@@ -6,7 +6,6 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <Common/ArenaAllocator.h>
 #include <Common/assert_cast.h>
 
 #include <AggregateFunctions/AggregateFunctionNull.h>
diff --git a/src/AggregateFunctions/CMakeLists.txt b/src/AggregateFunctions/CMakeLists.txt
index 0cb38fc729a..a45adde1a36 100644
--- a/src/AggregateFunctions/CMakeLists.txt
+++ b/src/AggregateFunctions/CMakeLists.txt
@@ -28,3 +28,7 @@ target_link_libraries(clickhouse_aggregate_functions PRIVATE dbms PUBLIC ch_cont
 if(ENABLE_EXAMPLES)
     add_subdirectory(examples)
 endif()
+
+if (ENABLE_FUZZING)
+    add_subdirectory(fuzzers)
+endif()
diff --git a/src/AggregateFunctions/Helpers.h b/src/AggregateFunctions/Helpers.h
index c97733571a3..e5cfc3034b0 100644
--- a/src/AggregateFunctions/Helpers.h
+++ b/src/AggregateFunctions/Helpers.h
@@ -100,6 +100,28 @@ static IAggregateFunction * createWithUnsignedIntegerType(const IDataType & argu
     return nullptr;
 }
 
+template <template <typename, typename> class AggregateFunctionTemplate, template <typename> class Data, typename... TArgs>
+static IAggregateFunction * createWithSignedIntegerType(const IDataType & argument_type, TArgs && ... args)
+{
+    WhichDataType which(argument_type);
+    if (which.idx == TypeIndex::Int8) return new AggregateFunctionTemplate<Int8, Data<Int8>>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::Int16) return new AggregateFunctionTemplate<Int16, Data<Int16>>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::Int32) return new AggregateFunctionTemplate<Int32, Data<Int32>>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::Int64) return new AggregateFunctionTemplate<Int64, Data<Int64>>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::Int128) return new AggregateFunctionTemplate<Int128, Data<Int128>>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::Int256) return new AggregateFunctionTemplate<Int256, Data<Int256>>(std::forward<TArgs>(args)...);
+    return nullptr;
+}
+
+template <template <typename, typename> class AggregateFunctionTemplate, template <typename> class Data, typename... TArgs>
+static IAggregateFunction * createWithIntegerType(const IDataType & argument_type, TArgs && ... args)
+{
+    IAggregateFunction * f = createWithUnsignedIntegerType<AggregateFunctionTemplate, Data>(argument_type, std::forward<TArgs>(args)...);
+    if (f)
+        return f;
+    return createWithSignedIntegerType<AggregateFunctionTemplate, Data>(argument_type, std::forward<TArgs>(args)...);
+}
+
 template <template <typename, typename> class AggregateFunctionTemplate, template <typename> class Data, typename... TArgs>
 static IAggregateFunction * createWithBasicNumberOrDateOrDateTime(const IDataType & argument_type, TArgs &&... args)
 {
@@ -130,6 +152,8 @@ static IAggregateFunction * createWithNumericBasedType(const IDataType & argumen
     if (which.idx == TypeIndex::Date) return new AggregateFunctionTemplate<UInt16>(std::forward<TArgs>(args)...);
     if (which.idx == TypeIndex::DateTime) return new AggregateFunctionTemplate<UInt32>(std::forward<TArgs>(args)...);
     if (which.idx == TypeIndex::UUID) return new AggregateFunctionTemplate<UUID>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::IPv4) return new AggregateFunctionTemplate<IPv4>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::IPv6) return new AggregateFunctionTemplate<IPv6>(std::forward<TArgs>(args)...);
     return nullptr;
 }
 
diff --git a/src/AggregateFunctions/HelpersMinMaxAny.h b/src/AggregateFunctions/HelpersMinMaxAny.h
index 1af51c3f8e6..31ae5fdd59a 100644
--- a/src/AggregateFunctions/HelpersMinMaxAny.h
+++ b/src/AggregateFunctions/HelpersMinMaxAny.h
@@ -9,7 +9,6 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeString.h>
 
-
 namespace DB
 {
 struct Settings;
@@ -22,7 +21,6 @@ static IAggregateFunction * createAggregateFunctionSingleValue(const String & na
     assertUnary(name, argument_types);
 
     const DataTypePtr & argument_type = argument_types[0];
-
     WhichDataType which(argument_type);
 #define DISPATCH(TYPE) \
     if (which.idx == TypeIndex::TYPE) return new AggregateFunctionTemplate<Data<SingleValueDataFixed<TYPE>>>(argument_type); /// NOLINT
@@ -41,10 +39,33 @@ static IAggregateFunction * createAggregateFunctionSingleValue(const String & na
         return new AggregateFunctionTemplate<Data<SingleValueDataFixed<Decimal64>>>(argument_type);
     if (which.idx == TypeIndex::Decimal128)
         return new AggregateFunctionTemplate<Data<SingleValueDataFixed<Decimal128>>>(argument_type);
+    if (which.idx == TypeIndex::Decimal256)
+        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<Decimal256>>>(argument_type);
     if (which.idx == TypeIndex::String)
         return new AggregateFunctionTemplate<Data<SingleValueDataString>>(argument_type);
 
-    return new AggregateFunctionTemplate<Data<SingleValueDataGeneric>>(argument_type);
+    return new AggregateFunctionTemplate<Data<SingleValueDataGeneric<>>>(argument_type);
+}
+
+template <template <typename> class AggregateFunctionTemplate, template <typename> class Data, bool RespectNulls = false>
+static IAggregateFunction * createAggregateFunctionSingleNullableValue(const String & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
+{
+    assertNoParameters(name, parameters);
+    assertUnary(name, argument_types);
+
+    const DataTypePtr & argument_type = argument_types[0];
+    WhichDataType which(argument_type);
+    // If the result value could be null (excluding the case that no row is matched),
+    // use SingleValueDataGeneric.
+    if constexpr (!RespectNulls)
+    {
+        return createAggregateFunctionSingleValue<AggregateFunctionTemplate, Data>(name, argument_types, Array(), settings);
+    }
+    else
+    {
+        return new AggregateFunctionTemplate<Data<SingleValueDataGeneric<true>>>(argument_type);
+    }
+    UNREACHABLE();
 }
 
 
@@ -72,10 +93,12 @@ static IAggregateFunction * createAggregateFunctionArgMinMaxSecond(const DataTyp
         return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<Decimal64>>>>(res_type, val_type);
     if (which.idx == TypeIndex::Decimal128)
         return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<Decimal128>>>>(res_type, val_type);
+    if (which.idx == TypeIndex::Decimal256)
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<Decimal256>>>>(res_type, val_type);
     if (which.idx == TypeIndex::String)
         return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataString>>>(res_type, val_type);
 
-    return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataGeneric>>>(res_type, val_type);
+    return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataGeneric<>>>>(res_type, val_type);
 }
 
 template <template <typename> class MinMaxData>
@@ -106,10 +129,12 @@ static IAggregateFunction * createAggregateFunctionArgMinMax(const String & name
         return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<Decimal64>>(res_type, val_type);
     if (which.idx == TypeIndex::Decimal128)
         return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<Decimal128>>(res_type, val_type);
+    if (which.idx == TypeIndex::Decimal256)
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<Decimal256>>(res_type, val_type);
     if (which.idx == TypeIndex::String)
         return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataString>(res_type, val_type);
 
-    return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataGeneric>(res_type, val_type);
+    return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataGeneric<>>(res_type, val_type);
 }
 
 }
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index 4a050a58600..ddc0535d0e4 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -9,7 +9,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <base/types.h>
 #include <Common/Exception.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <Core/IResolvedFunction.h>
 
 #include "config.h"
diff --git a/src/AggregateFunctions/Moments.h b/src/AggregateFunctions/Moments.h
index 0466d01fe79..a34f960794c 100644
--- a/src/AggregateFunctions/Moments.h
+++ b/src/AggregateFunctions/Moments.h
@@ -11,12 +11,13 @@
 
 namespace DB
 {
+
 struct Settings;
 
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
-    extern const int DECIMAL_OVERFLOW;
+    extern const int LOGICAL_ERROR;
 }
 
 
@@ -64,6 +65,11 @@ struct VarMoments
         readPODBinary(*this, buf);
     }
 
+    T get() const
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Variation moments should be obtained by either 'getSample' or 'getPopulation' method");
+    }
+
     T getPopulation() const
     {
         if (m[0] == 0)
@@ -84,140 +90,51 @@ struct VarMoments
 
     T getMoment3() const
     {
-        if (m[0] == 0)
-            return std::numeric_limits<T>::quiet_NaN();
-        // to avoid accuracy problem
-        if (m[0] == 1)
-            return 0;
-        /// \[ \frac{1}{m_0} (m_3 - (3 * m_2 - \frac{2 * {m_1}^2}{m_0}) * \frac{m_1}{m_0});\]
-        return (m[3]
-            - (3 * m[2]
-                - 2 * m[1] * m[1] / m[0]
-            ) * m[1] / m[0]
-        ) / m[0];
+        if constexpr (_level < 3)
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Variation moments should be obtained by either 'getSample' or 'getPopulation' method");
+        }
+        else
+        {
+            if (m[0] == 0)
+                return std::numeric_limits<T>::quiet_NaN();
+            // to avoid accuracy problem
+            if (m[0] == 1)
+                return 0;
+            /// \[ \frac{1}{m_0} (m_3 - (3 * m_2 - \frac{2 * {m_1}^2}{m_0}) * \frac{m_1}{m_0});\]
+            return (m[3]
+                - (3 * m[2]
+                    - 2 * m[1] * m[1] / m[0]
+                ) * m[1] / m[0]
+            ) / m[0];
+        }
     }
 
     T getMoment4() const
     {
-        if (m[0] == 0)
-            return std::numeric_limits<T>::quiet_NaN();
-        // to avoid accuracy problem
-        if (m[0] == 1)
-            return 0;
-        /// \[ \frac{1}{m_0}(m_4 - (4 * m_3 - (6 * m_2 - \frac{3 * m_1^2}{m_0} ) \frac{m_1}{m_0})\frac{m_1}{m_0})\]
-        return (m[4]
-            - (4 * m[3]
-                - (6 * m[2]
-                    - 3 * m[1] * m[1] / m[0]
+        if constexpr (_level < 4)
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Variation moments should be obtained by either 'getSample' or 'getPopulation' method");
+        }
+        else
+        {
+            if (m[0] == 0)
+                return std::numeric_limits<T>::quiet_NaN();
+            // to avoid accuracy problem
+            if (m[0] == 1)
+                return 0;
+            /// \[ \frac{1}{m_0}(m_4 - (4 * m_3 - (6 * m_2 - \frac{3 * m_1^2}{m_0} ) \frac{m_1}{m_0})\frac{m_1}{m_0})\]
+            return (m[4]
+                - (4 * m[3]
+                    - (6 * m[2]
+                        - 3 * m[1] * m[1] / m[0]
+                    ) * m[1] / m[0]
                 ) * m[1] / m[0]
-            ) * m[1] / m[0]
-        ) / m[0];
+            ) / m[0];
+        }
     }
 };
 
-template <typename T, size_t _level>
-class VarMomentsDecimal
-{
-public:
-    using NativeType = typename T::NativeType;
-
-    void add(NativeType x)
-    {
-        ++m0;
-        getM(1) += x;
-
-        NativeType tmp;
-        bool overflow = common::mulOverflow(x, x, tmp) || common::addOverflow(getM(2), tmp, getM(2));
-        if constexpr (_level >= 3)
-            overflow = overflow || common::mulOverflow(tmp, x, tmp) || common::addOverflow(getM(3), tmp, getM(3));
-        if constexpr (_level >= 4)
-            overflow = overflow || common::mulOverflow(tmp, x, tmp) || common::addOverflow(getM(4), tmp, getM(4));
-
-        if (overflow)
-            throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Decimal math overflow");
-    }
-
-    void merge(const VarMomentsDecimal & rhs)
-    {
-        m0 += rhs.m0;
-        getM(1) += rhs.getM(1);
-
-        bool overflow = common::addOverflow(getM(2), rhs.getM(2), getM(2));
-        if constexpr (_level >= 3)
-            overflow = overflow || common::addOverflow(getM(3), rhs.getM(3), getM(3));
-        if constexpr (_level >= 4)
-            overflow = overflow || common::addOverflow(getM(4), rhs.getM(4), getM(4));
-
-        if (overflow)
-            throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Decimal math overflow");
-    }
-
-    void write(WriteBuffer & buf) const { writePODBinary(*this, buf); }
-    void read(ReadBuffer & buf) { readPODBinary(*this, buf); }
-
-    Float64 getPopulation(UInt32 scale) const
-    {
-        if (m0 == 0)
-            return std::numeric_limits<Float64>::infinity();
-
-        NativeType tmp;
-        if (common::mulOverflow(getM(1), getM(1), tmp) ||
-            common::subOverflow(getM(2), NativeType(tmp / m0), tmp))
-            throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Decimal math overflow");
-        return std::max(Float64{}, DecimalUtils::convertTo<Float64>(T(tmp / m0), scale));
-    }
-
-    Float64 getSample(UInt32 scale) const
-    {
-        if (m0 == 0)
-            return std::numeric_limits<Float64>::quiet_NaN();
-        if (m0 == 1)
-            return std::numeric_limits<Float64>::infinity();
-
-        NativeType tmp;
-        if (common::mulOverflow(getM(1), getM(1), tmp) ||
-            common::subOverflow(getM(2), NativeType(tmp / m0), tmp))
-            throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Decimal math overflow");
-        return std::max(Float64{}, DecimalUtils::convertTo<Float64>(T(tmp / (m0 - 1)), scale));
-    }
-
-    Float64 getMoment3(UInt32 scale) const
-    {
-        if (m0 == 0)
-            return std::numeric_limits<Float64>::infinity();
-
-        NativeType tmp;
-        if (common::mulOverflow(2 * getM(1), getM(1), tmp) ||
-            common::subOverflow(3 * getM(2), NativeType(tmp / m0), tmp) ||
-            common::mulOverflow(tmp, getM(1), tmp) ||
-            common::subOverflow(getM(3), NativeType(tmp / m0), tmp))
-            throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Decimal math overflow");
-        return DecimalUtils::convertTo<Float64>(T(tmp / m0), scale);
-    }
-
-    Float64 getMoment4(UInt32 scale) const
-    {
-        if (m0 == 0)
-            return std::numeric_limits<Float64>::infinity();
-
-        NativeType tmp;
-        if (common::mulOverflow(3 * getM(1), getM(1), tmp) ||
-            common::subOverflow(6 * getM(2), NativeType(tmp / m0), tmp) ||
-            common::mulOverflow(tmp, getM(1), tmp) ||
-            common::subOverflow(4 * getM(3), NativeType(tmp / m0), tmp) ||
-            common::mulOverflow(tmp, getM(1), tmp) ||
-            common::subOverflow(getM(4), NativeType(tmp / m0), tmp))
-            throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Decimal math overflow");
-        return DecimalUtils::convertTo<Float64>(T(tmp / m0), scale);
-    }
-
-private:
-    UInt64 m0{};
-    NativeType m[_level]{};
-
-    NativeType & getM(size_t i) { return m[i - 1]; }
-    const NativeType & getM(size_t i) const { return m[i - 1]; }
-};
 
 /**
     Calculating multivariate central moments
@@ -260,6 +177,21 @@ struct CovarMoments
         readPODBinary(*this, buf);
     }
 
+    T get() const
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Covariation moments should be obtained by either 'getSample' or 'getPopulation' method");
+    }
+
+    T getMoment3() const
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Covariation moments should be obtained by either 'getSample' or 'getPopulation' method");
+    }
+
+    T getMoment4() const
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Covariation moments should be obtained by either 'getSample' or 'getPopulation' method");
+    }
+
     T NO_SANITIZE_UNDEFINED getPopulation() const
     {
         return (xy - x1 * y1 / m0) / m0;
@@ -317,6 +249,26 @@ struct CorrMoments
     {
         return (m0 * xy - x1 * y1) / sqrt((m0 * x2 - x1 * x1) * (m0 * y2 - y1 * y1));
     }
+
+    T getSample() const
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Correlation moments should be obtained by the 'get' method");
+    }
+
+    T getPopulation() const
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Correlation moments should be obtained by the 'get' method");
+    }
+
+    T getMoment3() const
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Correlation moments should be obtained by either 'getSample' or 'getPopulation' method");
+    }
+
+    T getMoment4() const
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Correlation moments should be obtained by either 'getSample' or 'getPopulation' method");
+    }
 };
 
 /// Data for calculation of Student and Welch T-Tests.
diff --git a/src/AggregateFunctions/QuantileApprox.h b/src/AggregateFunctions/QuantileApprox.h
new file mode 100644
index 00000000000..f58f1396fb4
--- /dev/null
+++ b/src/AggregateFunctions/QuantileApprox.h
@@ -0,0 +1,477 @@
+#pragma once
+
+#include <cmath>
+#include <base/sort.h>
+#include <Common/RadixSort.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
+}
+
+template <typename T>
+class ApproxSampler
+{
+public:
+    struct Stats
+    {
+        T value;      // the sampled value
+        Int64 g;      // the minimum rank jump from the previous value's minimum rank
+        Int64 delta;  // the maximum span of the rank
+
+        Stats() = default;
+        Stats(T value_, Int64 g_, Int64 delta_) : value(value_), g(g_), delta(delta_) {}
+    };
+
+    struct QueryResult
+    {
+        size_t index;
+        Int64 rank;
+        T value;
+
+        QueryResult(size_t index_, Int64 rank_, T value_) : index(index_), rank(rank_), value(value_) { }
+    };
+
+    ApproxSampler() = default;
+
+    explicit ApproxSampler(
+        double relative_error_,
+        size_t compress_threshold_ = default_compress_threshold,
+        size_t count_ = 0,
+        bool compressed_ = false)
+        : relative_error(relative_error_)
+        , compress_threshold(compress_threshold_)
+        , count(count_)
+        , compressed(compressed_)
+    {
+        sampled.reserve(compress_threshold);
+        backup_sampled.reserve(compress_threshold);
+
+        head_sampled.reserve(default_head_size);
+    }
+
+    bool isCompressed() const { return compressed; }
+    void setCompressed() { compressed = true; }
+
+    void insert(T x)
+    {
+        head_sampled.push_back(x);
+        compressed = false;
+        if (head_sampled.size() >= default_head_size)
+        {
+            withHeadBufferInserted();
+            if (sampled.size() >= compress_threshold)
+                compress();
+        }
+    }
+
+    void query(const Float64 * percentiles, const size_t * indices, size_t size, T * result) const
+    {
+        if (!head_sampled.empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot operate on an uncompressed summary, call compress() first");
+
+        if (sampled.empty())
+        {
+            for (size_t i = 0; i < size; ++i)
+                result[i] = T();
+            return;
+        }
+
+        Int64 current_max = std::numeric_limits<Int64>::min();
+        for (const auto & stats : sampled)
+            current_max = std::max(stats.delta + stats.g, current_max);
+        Int64 target_error = current_max/2;
+
+        size_t index= 0;
+        auto min_rank = sampled[0].g;
+        for (size_t i = 0; i < size; ++i)
+        {
+            double percentile = percentiles[indices[i]];
+            if (percentile <= relative_error)
+            {
+                result[indices[i]] = sampled.front().value;
+            }
+            else if (percentile >= 1 - relative_error)
+            {
+                result[indices[i]] = sampled.back().value;
+            }
+            else
+            {
+                QueryResult res = findApproxQuantile(index, min_rank, target_error, percentile);
+                index = res.index;
+                min_rank = res.rank;
+                result[indices[i]] = res.value;
+            }
+        }
+
+    }
+
+    void compress()
+    {
+        if (compressed)
+            return;
+
+        withHeadBufferInserted();
+
+        doCompress(2 * relative_error * count);
+        compressed = true;
+    }
+
+
+    void merge(const ApproxSampler & other)
+    {
+        if (other.count == 0)
+            return;
+        else if (count == 0)
+        {
+            compress_threshold = other.compress_threshold;
+            relative_error = other.relative_error;
+            count = other.count;
+            compressed = other.compressed;
+
+            sampled.resize(other.sampled.size());
+            memcpy(sampled.data(), other.sampled.data(), sizeof(Stats) * other.sampled.size());
+            return;
+        }
+        else
+        {
+            // Merge the two buffers.
+            // The GK algorithm is a bit unclear about it, but we need to adjust the statistics during the
+            // merging. The main idea is that samples that come from one side will suffer from the lack of
+            // precision of the other.
+            // As a concrete example, take two QuantileSummaries whose samples (value, g, delta) are:
+            // `a = [(0, 1, 0), (20, 99, 0)]` and `b = [(10, 1, 0), (30, 49, 0)]`
+            // This means `a` has 100 values, whose minimum is 0 and maximum is 20,
+            // while `b` has 50 values, between 10 and 30.
+            // The resulting samples of the merge will be:
+            // a+b = [(0, 1, 0), (10, 1, ??), (20, 99, ??), (30, 49, 0)]
+            // The values of `g` do not change, as they represent the minimum number of values between two
+            // consecutive samples. The values of `delta` should be adjusted, however.
+            // Take the case of the sample `10` from `b`. In the original stream, it could have appeared
+            // right after `0` (as expressed by `g=1`) or right before `20`, so `delta=99+0-1=98`.
+            // In the GK algorithm's style of working in terms of maximum bounds, one can observe that the
+            // maximum additional uncertainty over samples coming from `b` is `max(g_a + delta_a) =
+            // floor(2 * eps_a * n_a)`. Likewise, additional uncertainty over samples from `a` is
+            // `floor(2 * eps_b * n_b)`.
+            // Only samples that interleave the other side are affected. That means that samples from
+            // one side that are lesser (or greater) than all samples from the other side are just copied
+            // unmodified.
+            // If the merging instances have different `relativeError`, the resulting instance will carry
+            // the largest one: `eps_ab = max(eps_a, eps_b)`.
+            // The main invariant of the GK algorithm is kept:
+            // `max(g_ab + delta_ab) <= floor(2 * eps_ab * (n_a + n_b))` since
+            // `max(g_ab + delta_ab) <= floor(2 * eps_a * n_a) + floor(2 * eps_b * n_b)`
+            // Finally, one can see how the `insert(x)` operation can be expressed as `merge([(x, 1, 0])`
+            compress();
+
+            backup_sampled.clear();
+            backup_sampled.reserve(sampled.size() + other.sampled.size());
+            double merged_relative_error = std::max(relative_error, other.relative_error);
+            size_t merged_count = count + other.count;
+            Int64 additional_self_delta = static_cast<Int64>(std::floor(2 * other.relative_error * other.count));
+            Int64 additional_other_delta = static_cast<Int64>(std::floor(2 * relative_error * count));
+
+            // Do a merge of two sorted lists until one of the lists is fully consumed
+            size_t self_idx = 0;
+            size_t other_idx = 0;
+            while (self_idx < sampled.size() && other_idx < other.sampled.size())
+            {
+                const Stats & self_sample = sampled[self_idx];
+                const Stats & other_sample = other.sampled[other_idx];
+
+                // Detect next sample
+                Stats next_sample;
+                Int64 additional_delta = 0;
+                if (self_sample.value < other_sample.value)
+                {
+                    ++self_idx;
+                    next_sample = self_sample;
+                    additional_delta = other_idx > 0 ? additional_self_delta : 0;
+                }
+                else
+                {
+                    ++other_idx;
+                    next_sample = other_sample;
+                    additional_delta = self_idx > 0 ? additional_other_delta : 0;
+                }
+
+                // Insert it
+                next_sample.delta += additional_delta;
+                backup_sampled.emplace_back(std::move(next_sample));
+            }
+
+            // Copy the remaining samples from the other list
+            // (by construction, at most one `while` loop will run)
+            while (self_idx < sampled.size())
+            {
+                backup_sampled.emplace_back(sampled[self_idx]);
+                ++self_idx;
+            }
+            while (other_idx < other.sampled.size())
+            {
+                backup_sampled.emplace_back(other.sampled[other_idx]);
+                ++other_idx;
+            }
+
+            std::swap(sampled, backup_sampled);
+            relative_error = merged_relative_error;
+            count = merged_count;
+            compress_threshold = other.compress_threshold;
+
+            doCompress(2 * merged_relative_error * merged_count);
+            compressed = true;
+        }
+    }
+
+    void write(WriteBuffer & buf) const
+    {
+        writeIntBinary<size_t>(compress_threshold, buf);
+        writeFloatBinary<double>(relative_error, buf);
+        writeIntBinary<size_t>(count, buf);
+        writeIntBinary<size_t>(sampled.size(), buf);
+
+        for (const auto & stats : sampled)
+        {
+            writeFloatBinary<T>(stats.value, buf);
+            writeIntBinary<Int64>(stats.g, buf);
+            writeIntBinary<Int64>(stats.delta, buf);
+        }
+    }
+
+    void read(ReadBuffer & buf)
+    {
+        readIntBinary<size_t>(compress_threshold, buf);
+        readFloatBinary<double>(relative_error, buf);
+        readIntBinary<size_t>(count, buf);
+
+        size_t sampled_len = 0;
+        readIntBinary<size_t>(sampled_len, buf);
+        sampled.resize(sampled_len);
+
+        for (size_t i = 0; i < sampled_len; ++i)
+        {
+            auto stats = sampled[i];
+            readFloatBinary<T>(stats.value, buf);
+            readIntBinary<Int64>(stats.g, buf);
+            readIntBinary<Int64>(stats.delta, buf);
+        }
+    }
+
+private:
+    QueryResult findApproxQuantile(size_t index, Int64 min_rank_at_index, double target_error, double percentile) const
+    {
+        Stats curr_sample = sampled[index];
+        Int64 rank = static_cast<Int64>(std::ceil(percentile * count));
+        size_t i = index;
+        Int64 min_rank = min_rank_at_index;
+        while (i < sampled.size() - 1)
+        {
+            Int64 max_rank = min_rank + curr_sample.delta;
+            if (max_rank - target_error <= rank && rank <= min_rank + target_error)
+                return {i, min_rank, curr_sample.value};
+            else
+            {
+                ++i;
+                curr_sample = sampled[i];
+                min_rank += curr_sample.g;
+            }
+        }
+        return {sampled.size()-1, 0, sampled.back().value};
+    }
+
+    void withHeadBufferInserted()
+    {
+        if (head_sampled.empty())
+            return;
+
+        bool use_radix_sort = head_sampled.size() >= 256 && (is_arithmetic_v<T> && !is_big_int_v<T>);
+        if (use_radix_sort)
+            RadixSort<RadixSortNumTraits<T>>::executeLSD(head_sampled.data(), head_sampled.size());
+        else
+            ::sort(head_sampled.begin(), head_sampled.end());
+
+        backup_sampled.clear();
+        backup_sampled.reserve(sampled.size() + head_sampled.size());
+
+        size_t sample_idx = 0;
+        size_t ops_idx = 0;
+        size_t current_count = count;
+        for (; ops_idx < head_sampled.size(); ++ops_idx)
+        {
+            T current_sample = head_sampled[ops_idx];
+
+            // Add all the samples before the next observation.
+            while (sample_idx < sampled.size() && sampled[sample_idx].value <= current_sample)
+            {
+                backup_sampled.emplace_back(sampled[sample_idx]);
+                ++sample_idx;
+            }
+
+            // If it is the first one to insert, of if it is the last one
+            ++current_count;
+            Int64 delta;
+            if (backup_sampled.empty() || (sample_idx == sampled.size() && ops_idx == (head_sampled.size() - 1)))
+                delta = 0;
+            else
+                delta = static_cast<Int64>(std::floor(2 * relative_error * current_count));
+
+            backup_sampled.emplace_back(current_sample, 1, delta);
+        }
+
+        // Add all the remaining existing samples
+        for (; sample_idx < sampled.size(); ++sample_idx)
+            backup_sampled.emplace_back(sampled[sample_idx]);
+
+        std::swap(sampled, backup_sampled);
+        head_sampled.clear();
+        count = current_count;
+    }
+
+
+    void doCompress(double merge_threshold)
+    {
+        if (sampled.empty())
+            return;
+
+        backup_sampled.clear();
+        // Start for the last element, which is always part of the set.
+        // The head contains the current new head, that may be merged with the current element.
+        Stats head = sampled.back();
+        ssize_t i = sampled.size() - 2;
+
+        // Do not compress the last element
+        while (i >= 1)
+        {
+            // The current sample:
+            const auto & sample1 = sampled[i];
+            // Do we need to compress?
+            if (sample1.g + head.g + head.delta < merge_threshold)
+            {
+                // Do not insert yet, just merge the current element into the head.
+                head.g += sample1.g;
+            }
+            else
+            {
+                // Prepend the current head, and keep the current sample as target for merging.
+                backup_sampled.push_back(head);
+                head = sample1;
+            }
+            --i;
+        }
+
+        backup_sampled.push_back(head);
+        // If necessary, add the minimum element:
+        auto curr_head = sampled.front();
+
+        // don't add the minimum element if `currentSamples` has only one element (both `currHead` and
+        // `head` point to the same element)
+        if (curr_head.value <= head.value && sampled.size() > 1)
+            backup_sampled.emplace_back(sampled.front());
+
+        std::reverse(backup_sampled.begin(), backup_sampled.end());
+        std::swap(sampled, backup_sampled);
+    }
+
+    double relative_error;
+    size_t compress_threshold;
+    size_t count = 0;
+    bool compressed;
+
+    PaddedPODArray<Stats> sampled;
+    PaddedPODArray<Stats> backup_sampled;
+
+    PaddedPODArray<T> head_sampled;
+
+    static constexpr size_t default_compress_threshold = 10000;
+    static constexpr size_t default_head_size = 50000;
+};
+
+template <typename Value>
+class QuantileGK
+{
+private:
+    using Data = ApproxSampler<Value>;
+    mutable Data data;
+
+public:
+    QuantileGK() = default;
+
+    explicit QuantileGK(size_t accuracy) : data(1.0 / static_cast<double>(accuracy)) { }
+
+    void add(const Value & x)
+    {
+        data.insert(x);
+    }
+
+    template <typename Weight>
+    void add(const Value &, const Weight &)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method add with weight is not implemented for GKSampler");
+    }
+
+    void merge(const QuantileGK & rhs)
+    {
+        if (!data.isCompressed())
+            data.compress();
+
+        data.merge(rhs.data);
+    }
+
+    void serialize(WriteBuffer & buf) const
+    {
+        /// Always compress before serialization
+        if (!data.isCompressed())
+            data.compress();
+
+        data.write(buf);
+    }
+
+    void deserialize(ReadBuffer & buf)
+    {
+        data.read(buf);
+
+        data.setCompressed();
+    }
+
+    /// Get the value of the `level` quantile. The level must be between 0 and 1.
+    Value get(Float64 level)
+    {
+        if (!data.isCompressed())
+            data.compress();
+
+        Value res;
+        size_t indice = 0;
+        data.query(&level, &indice, 1, &res);
+        return res;
+    }
+
+    /// Get the `size` values of `levels` quantiles. Write `size` results starting with `result` address.
+    /// indices - an array of index levels such that the corresponding elements will go in ascending order.
+    void getMany(const Float64 * levels, const size_t * indices, size_t size, Value * result)
+    {
+        if (!data.isCompressed())
+            data.compress();
+
+        data.query(levels, indices, size, result);
+    }
+
+    Float64 getFloat64(Float64 /*level*/)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getFloat64 is not implemented for GKSampler");
+    }
+
+    void getManyFloat(const Float64 * /*levels*/, const size_t * /*indices*/, size_t /*size*/, Float64 * /*result*/)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getManyFloat is not implemented for GKSampler");
+    }
+};
+
+}
diff --git a/src/AggregateFunctions/QuantileExact.h b/src/AggregateFunctions/QuantileExact.h
index b7af17b52bf..a92d1979bab 100644
--- a/src/AggregateFunctions/QuantileExact.h
+++ b/src/AggregateFunctions/QuantileExact.h
@@ -8,6 +8,8 @@
 #include <base/sort.h>
 #include <base/types.h>
 
+#define QUANTILE_EXACT_MAX_ARRAY_SIZE 1'000'000'000
+
 
 namespace DB
 {
@@ -17,6 +19,7 @@ namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
     extern const int BAD_ARGUMENTS;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 
 
@@ -54,6 +57,9 @@ struct QuantileExactBase
     {
         size_t size = 0;
         readVarUInt(size, buf);
+        if (unlikely(size > QUANTILE_EXACT_MAX_ARRAY_SIZE))
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                            "Too large array size (maximum: {})", QUANTILE_EXACT_MAX_ARRAY_SIZE);
         array.resize(size);
         buf.readStrict(reinterpret_cast<char *>(array.data()), size * sizeof(array[0]));
     }
diff --git a/src/AggregateFunctions/QuantileExactWeighted.h b/src/AggregateFunctions/QuantileExactWeighted.h
index 48ba253cb95..c6a779ede61 100644
--- a/src/AggregateFunctions/QuantileExactWeighted.h
+++ b/src/AggregateFunctions/QuantileExactWeighted.h
@@ -33,7 +33,7 @@ struct QuantileExactWeighted
 
     using Weight = UInt64;
     using UnderlyingType = NativeType<Value>;
-    using Hasher = std::conditional_t<std::is_same_v<Value, Decimal128>, Int128Hash, HashCRC32<UnderlyingType>>;
+    using Hasher = HashCRC32<UnderlyingType>;
 
     /// When creating, the hash table must be small.
     using Map = HashMapWithStackMemory<UnderlyingType, Weight, Hasher, 4>;
diff --git a/src/AggregateFunctions/QuantileInterpolatedWeighted.h b/src/AggregateFunctions/QuantileInterpolatedWeighted.h
index eef4f566889..5b1eb315af3 100644
--- a/src/AggregateFunctions/QuantileInterpolatedWeighted.h
+++ b/src/AggregateFunctions/QuantileInterpolatedWeighted.h
@@ -34,7 +34,7 @@ struct QuantileInterpolatedWeighted
 
     using Weight = UInt64;
     using UnderlyingType = NativeType<Value>;
-    using Hasher = std::conditional_t<std::is_same_v<Value, Decimal128>, Int128Hash, HashCRC32<UnderlyingType>>;
+    using Hasher = HashCRC32<UnderlyingType>;
 
     /// When creating, the hash table must be small.
     using Map = HashMapWithStackMemory<UnderlyingType, Weight, Hasher, 4>;
diff --git a/src/AggregateFunctions/QuantileTiming.h b/src/AggregateFunctions/QuantileTiming.h
index 2c2e881c78f..de6607b2527 100644
--- a/src/AggregateFunctions/QuantileTiming.h
+++ b/src/AggregateFunctions/QuantileTiming.h
@@ -16,6 +16,7 @@ struct Settings;
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int INCORRECT_DATA;
 }
 
 /** Calculates quantile for time in milliseconds, less than 30 seconds.
@@ -34,7 +35,7 @@ namespace ErrorCodes
   * -- for values from 0 to 1023 - in increments of 1;
   * -- for values from 1024 to 30,000 - in increments of 16;
   *
-  * NOTE: 64-bit integer weight can overflow, see also QantileExactWeighted.h::get()
+  * NOTE: 64-bit integer weight can overflow, see also QuantileExactWeighted.h::get()
   */
 
 #define TINY_MAX_ELEMS 31
@@ -83,8 +84,12 @@ namespace detail
 
         void deserialize(ReadBuffer & buf)
         {
-            readBinary(count, buf);
-            buf.readStrict(reinterpret_cast<char *>(elems), count * sizeof(elems[0]));
+            UInt16 new_count = 0;
+            readBinary(new_count, buf);
+            if (new_count > TINY_MAX_ELEMS)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "The number of elements {} for the 'tiny' kind of quantileTiming is exceeding the maximum of {}", new_count, TINY_MAX_ELEMS);
+            buf.readStrict(reinterpret_cast<char *>(elems), new_count * sizeof(elems[0]));
+            count = new_count;
         }
 
         /** This function must be called before get-functions. */
@@ -167,6 +172,9 @@ namespace detail
         {
             size_t size = 0;
             readBinary(size, buf);
+            if (size > 10'000)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "The number of elements {} for the 'medium' kind of quantileTiming is too large", size);
+
             elems.resize(size);
             buf.readStrict(reinterpret_cast<char *>(elems.data()), size * sizeof(elems[0]));
         }
@@ -714,6 +722,8 @@ public:
             tinyToLarge();
             large->deserialize(buf);
         }
+        else
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect kind of QuantileTiming");
     }
 
     /// Get the value of the `level` quantile. The level must be between 0 and 1.
diff --git a/src/AggregateFunctions/ReservoirSampler.h b/src/AggregateFunctions/ReservoirSampler.h
index b59f75b377e..3d723d5aace 100644
--- a/src/AggregateFunctions/ReservoirSampler.h
+++ b/src/AggregateFunctions/ReservoirSampler.h
@@ -24,6 +24,7 @@ struct Settings;
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 }
 
@@ -208,7 +209,14 @@ public:
     {
         DB::readIntBinary<size_t>(sample_count, buf);
         DB::readIntBinary<size_t>(total_values, buf);
-        samples.resize(std::min(total_values, sample_count));
+
+        size_t size = std::min(total_values, sample_count);
+        static constexpr size_t MAX_RESERVOIR_SIZE = 1_GiB;
+        if (unlikely(size > MAX_RESERVOIR_SIZE))
+            throw DB::Exception(DB::ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                                "Too large array size (maximum: {})", MAX_RESERVOIR_SIZE);
+
+        samples.resize(size);
 
         std::string rng_string;
         DB::readStringBinary(rng_string, buf);
diff --git a/src/AggregateFunctions/ReservoirSamplerDeterministic.h b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
index 17e4ce0e494..bde33260f5a 100644
--- a/src/AggregateFunctions/ReservoirSamplerDeterministic.h
+++ b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
@@ -22,6 +22,7 @@ struct Settings;
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 }
 
@@ -163,6 +164,11 @@ public:
         if (size > total_values)
             size = total_values;
 
+        static constexpr size_t MAX_RESERVOIR_SIZE = 1_GiB;
+        if (unlikely(size > MAX_RESERVOIR_SIZE))
+            throw DB::Exception(DB::ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                                "Too large array size (maximum: {})", MAX_RESERVOIR_SIZE);
+
         samples.resize(size);
         for (size_t i = 0; i < size; ++i)
             DB::readPODBinary(samples[i], buf);
diff --git a/src/AggregateFunctions/UniqExactSet.h b/src/AggregateFunctions/UniqExactSet.h
index 4a3ef576e4d..916dfe4a424 100644
--- a/src/AggregateFunctions/UniqExactSet.h
+++ b/src/AggregateFunctions/UniqExactSet.h
@@ -54,10 +54,10 @@ public:
                 {
                     SCOPE_EXIT_SAFE(
                         if (thread_group)
-                            CurrentThread::detachQueryIfNotDetached();
+                            CurrentThread::detachFromGroupIfNotDetached();
                     );
                     if (thread_group)
-                        CurrentThread::attachToIfDetached(thread_group);
+                        CurrentThread::attachToGroupIfDetached(thread_group);
                     setThreadName("UniqExactMerger");
 
                     while (true)
diff --git a/src/AggregateFunctions/UniquesHashSet.h b/src/AggregateFunctions/UniquesHashSet.h
index 075b0897c3a..ca6d31a716d 100644
--- a/src/AggregateFunctions/UniquesHashSet.h
+++ b/src/AggregateFunctions/UniquesHashSet.h
@@ -331,7 +331,11 @@ public:
 
     void ALWAYS_INLINE insert(Value x)
     {
-        HashValue hash_value = hash(x);
+        HashValue hash_value;
+        if constexpr (std::endian::native == std::endian::little)
+            hash_value = hash(x);
+        else
+            hash_value = std::byteswap(hash(x));
         if (!good(hash_value))
             return;
 
diff --git a/src/AggregateFunctions/fuzzers/CMakeLists.txt b/src/AggregateFunctions/fuzzers/CMakeLists.txt
new file mode 100644
index 00000000000..3876ffac7ab
--- /dev/null
+++ b/src/AggregateFunctions/fuzzers/CMakeLists.txt
@@ -0,0 +1,2 @@
+clickhouse_add_executable(aggregate_function_state_deserialization_fuzzer aggregate_function_state_deserialization_fuzzer.cpp ${SRCS})
+target_link_libraries(aggregate_function_state_deserialization_fuzzer PRIVATE dbms clickhouse_aggregate_functions ${LIB_FUZZING_ENGINE})
diff --git a/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp b/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
new file mode 100644
index 00000000000..2ea01e1d5bc
--- /dev/null
+++ b/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
@@ -0,0 +1,83 @@
+#include <base/types.h>
+
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
+
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+
+#include <Common/MemoryTracker.h>
+#include <Common/CurrentThread.h>
+
+#include <Interpreters/Context.h>
+
+#include <AggregateFunctions/registerAggregateFunctions.h>
+
+#include <base/scope_guard.h>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
+try
+{
+    using namespace DB;
+
+    static SharedContextHolder shared_context;
+    static ContextMutablePtr context;
+
+    auto initialize = [&]() mutable
+    {
+        shared_context = Context::createShared();
+        context = Context::createGlobal(shared_context.get());
+        context->makeGlobalContext();
+        context->setApplicationType(Context::ApplicationType::LOCAL);
+
+        MainThreadStatus::getInstance();
+
+        registerAggregateFunctions();
+        return true;
+    };
+
+    static bool initialized = initialize();
+    (void) initialized;
+
+    total_memory_tracker.resetCounters();
+    total_memory_tracker.setHardLimit(1_GiB);
+    CurrentThread::get().memory_tracker.resetCounters();
+    CurrentThread::get().memory_tracker.setHardLimit(1_GiB);
+
+    /// The input format is as follows:
+    /// - the aggregate function name on the first line, possible with parameters, then data types of the arguments,
+    ///   example: quantile(0.5), Float64
+    /// - the serialized aggregation state for the rest of the input.
+
+    /// Compile the code as follows:
+    ///   mkdir build_asan_fuzz
+    ///   cd build_asan_fuzz
+    ///   CC=clang CXX=clang++ cmake -D SANITIZE=address -D ENABLE_FUZZING=1 -D WITH_COVERAGE=1 ..
+    ///
+    /// The corpus is located here:
+    /// https://github.com/ClickHouse/fuzz-corpus/tree/main/aggregate_function_state_deserialization
+    ///
+    /// The fuzzer can be run as follows:
+    ///   ../../../build_asan_fuzz/src/DataTypes/fuzzers/aggregate_function_state_deserialization corpus -jobs=64 -rss_limit_mb=8192
+
+    DB::ReadBufferFromMemory in(data, size);
+
+    String args;
+    readStringUntilNewlineInto(args, in);
+    assertChar('\n', in);
+
+    DataTypePtr type = DataTypeFactory::instance().get(fmt::format("AggregateFunction({})", args));
+    AggregateFunctionPtr func = assert_cast<const DataTypeAggregateFunction &>(*type).getFunction();
+
+    Arena arena;
+    char * place = arena.alignedAlloc(func->sizeOfData(), func->alignOfData());
+    func->create(place);
+    SCOPE_EXIT(func->destroy(place));
+    func->deserialize(place, in, {}, &arena);
+
+    return 0;
+}
+catch (...)
+{
+    return 1;
+}
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index 598c2681ba2..91248a52ae9 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -32,6 +32,7 @@ void registerAggregateFunctionsQuantileTDigest(AggregateFunctionFactory &);
 void registerAggregateFunctionsQuantileTDigestWeighted(AggregateFunctionFactory &);
 void registerAggregateFunctionsQuantileBFloat16(AggregateFunctionFactory &);
 void registerAggregateFunctionsQuantileBFloat16Weighted(AggregateFunctionFactory &);
+void registerAggregateFunctionsQuantileApprox(AggregateFunctionFactory &);
 void registerAggregateFunctionsSequenceMatch(AggregateFunctionFactory &);
 void registerAggregateFunctionWindowFunnel(AggregateFunctionFactory &);
 void registerAggregateFunctionRate(AggregateFunctionFactory &);
@@ -39,7 +40,11 @@ void registerAggregateFunctionsMin(AggregateFunctionFactory &);
 void registerAggregateFunctionsMax(AggregateFunctionFactory &);
 void registerAggregateFunctionsAny(AggregateFunctionFactory &);
 void registerAggregateFunctionsStatisticsStable(AggregateFunctionFactory &);
-void registerAggregateFunctionsStatisticsSimple(AggregateFunctionFactory &);
+void registerAggregateFunctionsStatisticsSecondMoment(AggregateFunctionFactory &);
+void registerAggregateFunctionsStatisticsThirdMoment(AggregateFunctionFactory &);
+void registerAggregateFunctionsStatisticsFourthMoment(AggregateFunctionFactory &);
+void registerAggregateFunctionsStatisticsCovar(AggregateFunctionFactory &);
+void registerAggregateFunctionsStatisticsCorr(AggregateFunctionFactory &);
 void registerAggregateFunctionsVarianceMatrix(AggregateFunctionFactory &);
 void registerAggregateFunctionSum(AggregateFunctionFactory &);
 void registerAggregateFunctionSumCount(AggregateFunctionFactory &);
@@ -75,6 +80,7 @@ void registerAggregateFunctionExponentialMovingAverage(AggregateFunctionFactory
 void registerAggregateFunctionSparkbar(AggregateFunctionFactory &);
 void registerAggregateFunctionIntervalLengthSum(AggregateFunctionFactory &);
 void registerAggregateFunctionAnalysisOfVariance(AggregateFunctionFactory &);
+void registerAggregateFunctionKolmogorovSmirnovTest(AggregateFunctionFactory & factory);
 
 class AggregateFunctionCombinatorFactory;
 void registerAggregateFunctionCombinatorIf(AggregateFunctionCombinatorFactory &);
@@ -119,6 +125,7 @@ void registerAggregateFunctions()
         registerAggregateFunctionsQuantileTDigestWeighted(factory);
         registerAggregateFunctionsQuantileBFloat16(factory);
         registerAggregateFunctionsQuantileBFloat16Weighted(factory);
+        registerAggregateFunctionsQuantileApprox(factory);
         registerAggregateFunctionsSequenceMatch(factory);
         registerAggregateFunctionWindowFunnel(factory);
         registerAggregateFunctionRate(factory);
@@ -126,7 +133,11 @@ void registerAggregateFunctions()
         registerAggregateFunctionsMax(factory);
         registerAggregateFunctionsAny(factory);
         registerAggregateFunctionsStatisticsStable(factory);
-        registerAggregateFunctionsStatisticsSimple(factory);
+        registerAggregateFunctionsStatisticsSecondMoment(factory);
+        registerAggregateFunctionsStatisticsThirdMoment(factory);
+        registerAggregateFunctionsStatisticsFourthMoment(factory);
+        registerAggregateFunctionsStatisticsCovar(factory);
+        registerAggregateFunctionsStatisticsCorr(factory);
         registerAggregateFunctionsVarianceMatrix(factory);
         registerAggregateFunctionSum(factory);
         registerAggregateFunctionSumCount(factory);
@@ -162,6 +173,7 @@ void registerAggregateFunctions()
         registerAggregateFunctionExponentialMovingAverage(factory);
         registerAggregateFunctionSparkbar(factory);
         registerAggregateFunctionAnalysisOfVariance(factory);
+        registerAggregateFunctionKolmogorovSmirnovTest(factory);
 
         registerWindowFunctions(factory);
     }
diff --git a/src/Analyzer/ArrayJoinNode.cpp b/src/Analyzer/ArrayJoinNode.cpp
index 2157b5edf6f..ee6bd80150d 100644
--- a/src/Analyzer/ArrayJoinNode.cpp
+++ b/src/Analyzer/ArrayJoinNode.cpp
@@ -5,8 +5,10 @@
 #include <IO/Operators.h>
 
 #include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTExpressionList.h>
 
 #include <Analyzer/Utils.h>
+#include <Analyzer/ColumnNode.h>
 
 namespace DB
 {
@@ -47,17 +49,33 @@ QueryTreeNodePtr ArrayJoinNode::cloneImpl() const
     return std::make_shared<ArrayJoinNode>(getTableExpression(), getJoinExpressionsNode(), is_left);
 }
 
-ASTPtr ArrayJoinNode::toASTImpl() const
+ASTPtr ArrayJoinNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto array_join_ast = std::make_shared<ASTArrayJoin>();
     array_join_ast->kind = is_left ? ASTArrayJoin::Kind::Left : ASTArrayJoin::Kind::Inner;
 
-    const auto & join_expression_list_node = getJoinExpressionsNode();
-    array_join_ast->children.push_back(join_expression_list_node->toAST());
+    auto array_join_expressions_ast = std::make_shared<ASTExpressionList>();
+    const auto & array_join_expressions = getJoinExpressions().getNodes();
+
+    for (const auto & array_join_expression : array_join_expressions)
+    {
+        ASTPtr array_join_expression_ast;
+
+        auto * column_node = array_join_expression->as<ColumnNode>();
+        if (column_node && column_node->getExpression())
+            array_join_expression_ast = column_node->getExpression()->toAST(options);
+        else
+            array_join_expression_ast = array_join_expression->toAST(options);
+
+        array_join_expression_ast->setAlias(array_join_expression->getAlias());
+        array_join_expressions_ast->children.push_back(std::move(array_join_expression_ast));
+    }
+
+    array_join_ast->children.push_back(std::move(array_join_expressions_ast));
     array_join_ast->expression_list = array_join_ast->children.back();
 
     ASTPtr tables_in_select_query_ast = std::make_shared<ASTTablesInSelectQuery>();
-    addTableExpressionOrJoinIntoTablesInSelectQuery(tables_in_select_query_ast, children[table_expression_child_index]);
+    addTableExpressionOrJoinIntoTablesInSelectQuery(tables_in_select_query_ast, children[table_expression_child_index], options);
 
     auto array_join_query_element_ast = std::make_shared<ASTTablesInSelectQueryElement>();
     array_join_query_element_ast->children.push_back(std::move(array_join_ast));
diff --git a/src/Analyzer/ArrayJoinNode.h b/src/Analyzer/ArrayJoinNode.h
index 50d53df465a..89cb0b7b8c1 100644
--- a/src/Analyzer/ArrayJoinNode.h
+++ b/src/Analyzer/ArrayJoinNode.h
@@ -99,7 +99,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     bool is_left = false;
diff --git a/src/Analyzer/ColumnNode.cpp b/src/Analyzer/ColumnNode.cpp
index b9939df37bb..a9d47f8287d 100644
--- a/src/Analyzer/ColumnNode.cpp
+++ b/src/Analyzer/ColumnNode.cpp
@@ -91,12 +91,12 @@ QueryTreeNodePtr ColumnNode::cloneImpl() const
     return std::make_shared<ColumnNode>(column, getSourceWeakPointer());
 }
 
-ASTPtr ColumnNode::toASTImpl() const
+ASTPtr ColumnNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     std::vector<std::string> column_identifier_parts;
 
     auto column_source = getColumnSourceOrNull();
-    if (column_source)
+    if (column_source && options.fully_qualified_identifiers)
     {
         auto node_type = column_source->getNodeType();
         if (node_type == QueryTreeNodeType::TABLE ||
@@ -110,8 +110,15 @@ ASTPtr ColumnNode::toASTImpl() const
             }
             else if (auto * table_node = column_source->as<TableNode>())
             {
-                const auto & table_storage_id = table_node->getStorageID();
-                column_identifier_parts = {table_storage_id.getDatabaseName(), table_storage_id.getTableName()};
+                if (!table_node->getTemporaryTableName().empty())
+                {
+                    column_identifier_parts = { table_node->getTemporaryTableName() };
+                }
+                else
+                {
+                    const auto & table_storage_id = table_node->getStorageID();
+                    column_identifier_parts = { table_storage_id.getDatabaseName(), table_storage_id.getTableName() };
+                }
             }
         }
     }
diff --git a/src/Analyzer/ColumnNode.h b/src/Analyzer/ColumnNode.h
index e378bc5f3d0..b320df788c5 100644
--- a/src/Analyzer/ColumnNode.h
+++ b/src/Analyzer/ColumnNode.h
@@ -3,6 +3,7 @@
 #include <Core/NamesAndTypes.h>
 
 #include <Analyzer/IQueryTreeNode.h>
+#include <DataTypes/DataTypeNullable.h>
 
 namespace DB
 {
@@ -117,6 +118,11 @@ public:
         return column.type;
     }
 
+    void convertToNullable() override
+    {
+        column.type = makeNullableSafe(column.type);
+    }
+
     void dumpTreeImpl(WriteBuffer & buffer, FormatState & state, size_t indent) const override;
 
 protected:
@@ -126,7 +132,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     const QueryTreeNodeWeakPtr & getSourceWeakPointer() const
diff --git a/src/Analyzer/ColumnTransformers.cpp b/src/Analyzer/ColumnTransformers.cpp
index cc037fb2a99..40e1e019d50 100644
--- a/src/Analyzer/ColumnTransformers.cpp
+++ b/src/Analyzer/ColumnTransformers.cpp
@@ -91,7 +91,7 @@ QueryTreeNodePtr ApplyColumnTransformerNode::cloneImpl() const
     return std::make_shared<ApplyColumnTransformerNode>(getExpressionNode());
 }
 
-ASTPtr ApplyColumnTransformerNode::toASTImpl() const
+ASTPtr ApplyColumnTransformerNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto ast_apply_transformer = std::make_shared<ASTColumnsApplyTransformer>();
     const auto & expression_node = getExpressionNode();
@@ -100,14 +100,14 @@ ASTPtr ApplyColumnTransformerNode::toASTImpl() const
     {
         auto & function_expression = expression_node->as<FunctionNode &>();
         ast_apply_transformer->func_name = function_expression.getFunctionName();
-        ast_apply_transformer->parameters = function_expression.getParametersNode()->toAST();
+        ast_apply_transformer->parameters = function_expression.getParametersNode()->toAST(options);
     }
     else
     {
         auto & lambda_expression = expression_node->as<LambdaNode &>();
         if (!lambda_expression.getArgumentNames().empty())
             ast_apply_transformer->lambda_arg = lambda_expression.getArgumentNames()[0];
-        ast_apply_transformer->lambda = lambda_expression.toAST();
+        ast_apply_transformer->lambda = lambda_expression.toAST(options);
     }
 
     return ast_apply_transformer;
@@ -227,7 +227,7 @@ QueryTreeNodePtr ExceptColumnTransformerNode::cloneImpl() const
     return std::make_shared<ExceptColumnTransformerNode>(except_column_names, is_strict);
 }
 
-ASTPtr ExceptColumnTransformerNode::toASTImpl() const
+ASTPtr ExceptColumnTransformerNode::toASTImpl(const ConvertToASTOptions & /* options */) const
 {
     auto ast_except_transformer = std::make_shared<ASTColumnsExceptTransformer>();
 
@@ -334,7 +334,7 @@ QueryTreeNodePtr ReplaceColumnTransformerNode::cloneImpl() const
     return result_replace_transformer;
 }
 
-ASTPtr ReplaceColumnTransformerNode::toASTImpl() const
+ASTPtr ReplaceColumnTransformerNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto ast_replace_transformer = std::make_shared<ASTColumnsReplaceTransformer>();
 
@@ -347,8 +347,8 @@ ASTPtr ReplaceColumnTransformerNode::toASTImpl() const
     {
         auto replacement_ast = std::make_shared<ASTColumnsReplaceTransformer::Replacement>();
         replacement_ast->name = replacements_names[i];
-        replacement_ast->children.push_back(replacement_expressions_nodes[i]->toAST());
-        ast_replace_transformer->children.push_back(replacement_ast);
+        replacement_ast->children.push_back(replacement_expressions_nodes[i]->toAST(options));
+        ast_replace_transformer->children.push_back(std::move(replacement_ast));
     }
 
     return ast_replace_transformer;
diff --git a/src/Analyzer/ColumnTransformers.h b/src/Analyzer/ColumnTransformers.h
index e96e606d923..3ec6f506c3c 100644
--- a/src/Analyzer/ColumnTransformers.h
+++ b/src/Analyzer/ColumnTransformers.h
@@ -141,7 +141,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     ApplyColumnTransformerType apply_transformer_type = ApplyColumnTransformerType::LAMBDA;
@@ -220,7 +220,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     ExceptColumnTransformerType except_transformer_type;
@@ -298,7 +298,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     ListNode & getReplacements()
diff --git a/src/Analyzer/ConstantNode.cpp b/src/Analyzer/ConstantNode.cpp
index 79fc38cd617..cb05e6ed4e3 100644
--- a/src/Analyzer/ConstantNode.cpp
+++ b/src/Analyzer/ConstantNode.cpp
@@ -1,5 +1,6 @@
 #include <Analyzer/ConstantNode.h>
 
+#include <Common/assert_cast.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/SipHash.h>
 
@@ -75,11 +76,14 @@ QueryTreeNodePtr ConstantNode::cloneImpl() const
     return std::make_shared<ConstantNode>(constant_value, source_expression);
 }
 
-ASTPtr ConstantNode::toASTImpl() const
+ASTPtr ConstantNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     const auto & constant_value_literal = constant_value->getValue();
     auto constant_value_ast = std::make_shared<ASTLiteral>(constant_value_literal);
 
+    if (!options.add_cast_for_constants)
+        return constant_value_ast;
+
     bool need_to_add_cast_function = false;
     auto constant_value_literal_type = constant_value_literal.getType();
     WhichDataType constant_value_type(constant_value->getType());
diff --git a/src/Analyzer/ConstantNode.h b/src/Analyzer/ConstantNode.h
index 6b58533a701..51c98a4a3b3 100644
--- a/src/Analyzer/ConstantNode.h
+++ b/src/Analyzer/ConstantNode.h
@@ -3,6 +3,7 @@
 #include <Core/Field.h>
 
 #include <Analyzer/IQueryTreeNode.h>
+#include <Analyzer/ConstantValue.h>
 
 namespace DB
 {
@@ -83,7 +84,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     ConstantValuePtr constant_value;
diff --git a/src/Analyzer/FunctionNode.cpp b/src/Analyzer/FunctionNode.cpp
index 7961bfbae31..f5bcdc103d2 100644
--- a/src/Analyzer/FunctionNode.cpp
+++ b/src/Analyzer/FunctionNode.cpp
@@ -2,18 +2,21 @@
 
 #include <Common/SipHash.h>
 #include <Common/FieldVisitorToString.h>
-#include <DataTypes/IDataType.h>
-#include <Analyzer/ConstantNode.h>
 
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 
+#include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeSet.h>
+
 #include <Parsers/ASTFunction.h>
 
 #include <Functions/IFunction.h>
 
 #include <AggregateFunctions/IAggregateFunction.h>
 
+#include <Analyzer/Utils.h>
+#include <Analyzer/ConstantNode.h>
 #include <Analyzer/IdentifierNode.h>
 
 namespace DB
@@ -44,17 +47,29 @@ const DataTypes & FunctionNode::getArgumentTypes() const
 ColumnsWithTypeAndName FunctionNode::getArgumentColumns() const
 {
     const auto & arguments = getArguments().getNodes();
+    size_t arguments_size = arguments.size();
+
     ColumnsWithTypeAndName argument_columns;
     argument_columns.reserve(arguments.size());
 
-    for (const auto & arg : arguments)
+    for (size_t i = 0; i < arguments_size; ++i)
     {
-        ColumnWithTypeAndName argument;
-        argument.type = arg->getResultType();
-        if (auto * constant = arg->as<ConstantNode>())
-            argument.column = argument.type->createColumnConst(1, constant->getValue());
-        argument_columns.push_back(std::move(argument));
+        const auto & argument = arguments[i];
+
+        ColumnWithTypeAndName argument_column;
+
+        if (isNameOfInFunction(function_name) && i == 1)
+            argument_column.type = std::make_shared<DataTypeSet>();
+        else
+            argument_column.type = argument->getResultType();
+
+        auto * constant = argument->as<ConstantNode>();
+        if (constant && !isNotCreatable(argument_column.type))
+            argument_column.column = argument_column.type->createColumnConst(1, constant->getValue());
+
+        argument_columns.push_back(std::move(argument_column));
     }
+
     return argument_columns;
 }
 
@@ -99,7 +114,7 @@ void FunctionNode::dumpTreeImpl(WriteBuffer & buffer, FormatState & format_state
     buffer << ", function_type: " << function_type;
 
     if (function)
-        buffer << ", result_type: " + function->getResultType()->getName();
+        buffer << ", result_type: " + getResultType()->getName();
 
     const auto & parameters = getParameters();
     if (!parameters.getNodes().empty())
@@ -177,11 +192,12 @@ QueryTreeNodePtr FunctionNode::cloneImpl() const
       */
     result_function->function = function;
     result_function->kind = kind;
+    result_function->wrap_with_nullable = wrap_with_nullable;
 
     return result_function;
 }
 
-ASTPtr FunctionNode::toASTImpl() const
+ASTPtr FunctionNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto function_ast = std::make_shared<ASTFunction>();
 
@@ -193,15 +209,20 @@ ASTPtr FunctionNode::toASTImpl() const
         function_ast->kind = ASTFunction::Kind::WINDOW_FUNCTION;
     }
 
+    auto new_options = options;
+    /// To avoid surrounding constants with several internal casts.
+    if (function_name == "_CAST" && (*getArguments().begin())->getNodeType() == QueryTreeNodeType::CONSTANT)
+        new_options.add_cast_for_constants = false;
+
     const auto & parameters = getParameters();
     if (!parameters.getNodes().empty())
     {
-        function_ast->children.push_back(parameters.toAST());
+        function_ast->children.push_back(parameters.toAST(new_options));
         function_ast->parameters = function_ast->children.back();
     }
 
     const auto & arguments = getArguments();
-    function_ast->children.push_back(arguments.toAST());
+    function_ast->children.push_back(arguments.toAST(new_options));
     function_ast->arguments = function_ast->children.back();
 
     auto window_node = getWindowNode();
@@ -210,7 +231,7 @@ ASTPtr FunctionNode::toASTImpl() const
         if (auto * identifier_node = window_node->as<IdentifierNode>())
             function_ast->window_name = identifier_node->getIdentifier().getFullName();
         else
-            function_ast->window_definition = window_node->toAST();
+            function_ast->window_definition = window_node->toAST(new_options);
     }
 
     return function_ast;
diff --git a/src/Analyzer/FunctionNode.h b/src/Analyzer/FunctionNode.h
index 6819232b4be..742374e1f0a 100644
--- a/src/Analyzer/FunctionNode.h
+++ b/src/Analyzer/FunctionNode.h
@@ -8,6 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <Core/ColumnsWithTypeAndName.h>
 #include <Core/IResolvedFunction.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <Functions/IFunction.h>
 
 namespace DB
@@ -187,7 +188,16 @@ public:
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
                 "Function node with name '{}' is not resolved",
                 function_name);
-        return function->getResultType();
+        auto type = function->getResultType();
+        if (wrap_with_nullable)
+          return makeNullableSafe(type);
+        return type;
+    }
+
+    void convertToNullable() override
+    {
+        chassert(kind == FunctionKind::ORDINARY);
+        wrap_with_nullable = true;
     }
 
     void dumpTreeImpl(WriteBuffer & buffer, FormatState & format_state, size_t indent) const override;
@@ -199,12 +209,13 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     String function_name;
     FunctionKind kind = FunctionKind::UNKNOWN;
     IResolvedFunctionPtr function;
+    bool wrap_with_nullable = false;
 
     static constexpr size_t parameters_child_index = 0;
     static constexpr size_t arguments_child_index = 1;
diff --git a/src/Analyzer/IQueryTreeNode.cpp b/src/Analyzer/IQueryTreeNode.cpp
index 6b9b8b53d81..f1056975f7f 100644
--- a/src/Analyzer/IQueryTreeNode.cpp
+++ b/src/Analyzer/IQueryTreeNode.cpp
@@ -263,6 +263,13 @@ QueryTreeNodePtr IQueryTreeNode::cloneAndReplace(const ReplacementMap & replacem
         const auto [node_to_clone, place_for_cloned_node] = nodes_to_clone.back();
         nodes_to_clone.pop_back();
 
+        auto already_cloned_node_it = old_pointer_to_new_pointer.find(node_to_clone);
+        if (already_cloned_node_it != old_pointer_to_new_pointer.end())
+        {
+            *place_for_cloned_node = already_cloned_node_it->second;
+            continue;
+        }
+
         auto it = replacement_map.find(node_to_clone);
         auto node_clone = it != replacement_map.end() ? it->second : node_to_clone->cloneImpl();
         *place_for_cloned_node = node_clone;
@@ -324,9 +331,9 @@ QueryTreeNodePtr IQueryTreeNode::cloneAndReplace(const QueryTreeNodePtr & node_t
     return cloneAndReplace(replacement_map);
 }
 
-ASTPtr IQueryTreeNode::toAST() const
+ASTPtr IQueryTreeNode::toAST(const ConvertToASTOptions & options) const
 {
-    auto converted_node = toASTImpl();
+    auto converted_node = toASTImpl(options);
 
     if (auto * ast_with_alias = dynamic_cast<ASTWithAlias *>(converted_node.get()))
         converted_node->setAlias(alias);
diff --git a/src/Analyzer/IQueryTreeNode.h b/src/Analyzer/IQueryTreeNode.h
index 157bbd1b951..351d03bc8cb 100644
--- a/src/Analyzer/IQueryTreeNode.h
+++ b/src/Analyzer/IQueryTreeNode.h
@@ -11,7 +11,6 @@
 #include <Parsers/IAST_fwd.h>
 
 #include <Analyzer/Identifier.h>
-#include <Analyzer/ConstantValue.h>
 
 class SipHash;
 
@@ -90,6 +89,11 @@ public:
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Method getResultType is not supported for {} query node", getNodeTypeName());
     }
 
+    virtual void convertToNullable()
+    {
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Method convertToNullable is not supported for {} query node", getNodeTypeName());
+    }
+
     struct CompareOptions
     {
         bool compare_aliases = true;
@@ -176,8 +180,17 @@ public:
       */
     String formatOriginalASTForErrorMessage() const;
 
+    struct ConvertToASTOptions
+    {
+        /// Add _CAST if constant litral type is different from column type
+        bool add_cast_for_constants = true;
+
+        /// Identifiers are fully qualified (`database.table.column`), otherwise names are just column names (`column`)
+        bool fully_qualified_identifiers = true;
+    };
+
     /// Convert query tree to AST
-    ASTPtr toAST() const;
+    ASTPtr toAST(const ConvertToASTOptions & options = { .add_cast_for_constants = true, .fully_qualified_identifiers = true }) const;
 
     /// Convert query tree to AST and then format it for error message.
     String formatConvertedASTForErrorMessage() const;
@@ -253,7 +266,7 @@ protected:
     virtual QueryTreeNodePtr cloneImpl() const = 0;
 
     /// Subclass must convert its internal state and its children to AST
-    virtual ASTPtr toASTImpl() const = 0;
+    virtual ASTPtr toASTImpl(const ConvertToASTOptions & options) const = 0;
 
     QueryTreeNodes children;
     QueryTreeWeakNodes weak_pointers;
diff --git a/src/Analyzer/Identifier.h b/src/Analyzer/Identifier.h
index 71c5d784464..cf64bcf8bfb 100644
--- a/src/Analyzer/Identifier.h
+++ b/src/Analyzer/Identifier.h
@@ -400,7 +400,7 @@ struct fmt::formatter<DB::Identifier>
 
         /// Only support {}.
         if (it != end && *it != '}')
-            throw format_error("invalid format");
+            throw fmt::format_error("invalid format");
 
         return it;
     }
@@ -408,7 +408,7 @@ struct fmt::formatter<DB::Identifier>
     template <typename FormatContext>
     auto format(const DB::Identifier & identifier, FormatContext & ctx)
     {
-        return format_to(ctx.out(), "{}", identifier.getFullName());
+        return fmt::format_to(ctx.out(), "{}", identifier.getFullName());
     }
 };
 
@@ -422,7 +422,7 @@ struct fmt::formatter<DB::IdentifierView>
 
         /// Only support {}.
         if (it != end && *it != '}')
-            throw format_error("invalid format");
+            throw fmt::format_error("invalid format");
 
         return it;
     }
@@ -430,6 +430,6 @@ struct fmt::formatter<DB::IdentifierView>
     template <typename FormatContext>
     auto format(const DB::IdentifierView & identifier_view, FormatContext & ctx)
     {
-        return format_to(ctx.out(), "{}", identifier_view.getFullName());
+        return fmt::format_to(ctx.out(), "{}", identifier_view.getFullName());
     }
 };
diff --git a/src/Analyzer/IdentifierNode.cpp b/src/Analyzer/IdentifierNode.cpp
index 4efc7f515ea..88b3daacb12 100644
--- a/src/Analyzer/IdentifierNode.cpp
+++ b/src/Analyzer/IdentifierNode.cpp
@@ -1,5 +1,6 @@
 #include <Analyzer/IdentifierNode.h>
 
+#include <Common/assert_cast.h>
 #include <Common/SipHash.h>
 
 #include <IO/WriteBufferFromString.h>
@@ -40,15 +41,7 @@ void IdentifierNode::dumpTreeImpl(WriteBuffer & buffer, FormatState & format_sta
 bool IdentifierNode::isEqualImpl(const IQueryTreeNode & rhs) const
 {
     const auto & rhs_typed = assert_cast<const IdentifierNode &>(rhs);
-
-    if (table_expression_modifiers && rhs_typed.table_expression_modifiers && table_expression_modifiers != rhs_typed.table_expression_modifiers)
-        return false;
-    else if (table_expression_modifiers && !rhs_typed.table_expression_modifiers)
-        return false;
-    else if (!table_expression_modifiers && rhs_typed.table_expression_modifiers)
-        return false;
-
-    return identifier == rhs_typed.identifier;
+    return identifier == rhs_typed.identifier && table_expression_modifiers == rhs_typed.table_expression_modifiers;
 }
 
 void IdentifierNode::updateTreeHashImpl(HashState & state) const
@@ -66,7 +59,7 @@ QueryTreeNodePtr IdentifierNode::cloneImpl() const
     return std::make_shared<IdentifierNode>(identifier);
 }
 
-ASTPtr IdentifierNode::toASTImpl() const
+ASTPtr IdentifierNode::toASTImpl(const ConvertToASTOptions & /* options */) const
 {
     auto identifier_parts = identifier.getParts();
     return std::make_shared<ASTIdentifier>(std::move(identifier_parts));
diff --git a/src/Analyzer/IdentifierNode.h b/src/Analyzer/IdentifierNode.h
index 358511d1f90..872bb14d512 100644
--- a/src/Analyzer/IdentifierNode.h
+++ b/src/Analyzer/IdentifierNode.h
@@ -59,7 +59,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     Identifier identifier;
diff --git a/src/Analyzer/InDepthQueryTreeVisitor.h b/src/Analyzer/InDepthQueryTreeVisitor.h
index af69fc55589..1cc48fb1e53 100644
--- a/src/Analyzer/InDepthQueryTreeVisitor.h
+++ b/src/Analyzer/InDepthQueryTreeVisitor.h
@@ -99,8 +99,9 @@ class InDepthQueryTreeVisitorWithContext
 public:
     using VisitQueryTreeNodeType = std::conditional_t<const_visitor, const QueryTreeNodePtr, QueryTreeNodePtr>;
 
-    explicit InDepthQueryTreeVisitorWithContext(ContextPtr context)
+    explicit InDepthQueryTreeVisitorWithContext(ContextPtr context, size_t initial_subquery_depth = 0)
         : current_context(std::move(context))
+        , subquery_depth(initial_subquery_depth)
     {}
 
     /// Return true if visitor should traverse tree top to bottom, false otherwise
@@ -125,11 +126,17 @@ public:
         return current_context->getSettingsRef();
     }
 
+    size_t getSubqueryDepth() const
+    {
+        return subquery_depth;
+    }
+
     void visit(VisitQueryTreeNodeType & query_tree_node)
     {
         auto current_scope_context_ptr = current_context;
         SCOPE_EXIT(
             current_context = std::move(current_scope_context_ptr);
+            --subquery_depth;
         );
 
         if (auto * query_node = query_tree_node->template as<QueryNode>())
@@ -137,6 +144,8 @@ public:
         else if (auto * union_node = query_tree_node->template as<UnionNode>())
             current_context = union_node->getContext();
 
+        ++subquery_depth;
+
         bool traverse_top_to_bottom = getDerived().shouldTraverseTopToBottom();
         if (!traverse_top_to_bottom)
             visitChildren(query_tree_node);
@@ -145,7 +154,12 @@ public:
 
         if (traverse_top_to_bottom)
             visitChildren(query_tree_node);
+
+        getDerived().leaveImpl(query_tree_node);
     }
+
+    void leaveImpl(VisitQueryTreeNodeType & node [[maybe_unused]])
+    {}
 private:
     Derived & getDerived()
     {
@@ -172,6 +186,7 @@ private:
     }
 
     ContextPtr current_context;
+    size_t subquery_depth = 0;
 };
 
 template <typename Derived>
diff --git a/src/Analyzer/InterpolateNode.cpp b/src/Analyzer/InterpolateNode.cpp
index c8c61b05853..d78993c7b85 100644
--- a/src/Analyzer/InterpolateNode.cpp
+++ b/src/Analyzer/InterpolateNode.cpp
@@ -44,11 +44,11 @@ QueryTreeNodePtr InterpolateNode::cloneImpl() const
     return std::make_shared<InterpolateNode>(nullptr /*expression*/, nullptr /*interpolate_expression*/);
 }
 
-ASTPtr InterpolateNode::toASTImpl() const
+ASTPtr InterpolateNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto result = std::make_shared<ASTInterpolateElement>();
-    result->column = getExpression()->toAST()->getColumnName();
-    result->children.push_back(getInterpolateExpression()->toAST());
+    result->column = getExpression()->toAST(options)->getColumnName();
+    result->children.push_back(getInterpolateExpression()->toAST(options));
     result->expr = result->children.back();
 
     return result;
diff --git a/src/Analyzer/InterpolateNode.h b/src/Analyzer/InterpolateNode.h
index 5764ea561c0..c45800ebaaf 100644
--- a/src/Analyzer/InterpolateNode.h
+++ b/src/Analyzer/InterpolateNode.h
@@ -59,7 +59,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     static constexpr size_t expression_child_index = 0;
diff --git a/src/Analyzer/JoinNode.cpp b/src/Analyzer/JoinNode.cpp
index fe4dd2c5016..9b61c8b19d0 100644
--- a/src/Analyzer/JoinNode.cpp
+++ b/src/Analyzer/JoinNode.cpp
@@ -99,17 +99,17 @@ QueryTreeNodePtr JoinNode::cloneImpl() const
     return std::make_shared<JoinNode>(getLeftTableExpression(), getRightTableExpression(), getJoinExpression(), locality, strictness, kind);
 }
 
-ASTPtr JoinNode::toASTImpl() const
+ASTPtr JoinNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     ASTPtr tables_in_select_query_ast = std::make_shared<ASTTablesInSelectQuery>();
 
-    addTableExpressionOrJoinIntoTablesInSelectQuery(tables_in_select_query_ast, children[left_table_expression_child_index]);
+    addTableExpressionOrJoinIntoTablesInSelectQuery(tables_in_select_query_ast, children[left_table_expression_child_index], options);
 
     size_t join_table_index = tables_in_select_query_ast->children.size();
 
     auto join_ast = toASTTableJoin();
 
-    addTableExpressionOrJoinIntoTablesInSelectQuery(tables_in_select_query_ast, children[right_table_expression_child_index]);
+    addTableExpressionOrJoinIntoTablesInSelectQuery(tables_in_select_query_ast, children[right_table_expression_child_index], options);
 
     auto & table_element = tables_in_select_query_ast->children.at(join_table_index)->as<ASTTablesInSelectQueryElement &>();
     table_element.children.push_back(std::move(join_ast));
diff --git a/src/Analyzer/JoinNode.h b/src/Analyzer/JoinNode.h
index 0d856985794..4f071e03856 100644
--- a/src/Analyzer/JoinNode.h
+++ b/src/Analyzer/JoinNode.h
@@ -106,6 +106,12 @@ public:
         return locality;
     }
 
+    /// Set join locality
+    void setLocality(JoinLocality locality_value)
+    {
+        locality = locality_value;
+    }
+
     /// Get join strictness
     JoinStrictness getStrictness() const
     {
@@ -142,7 +148,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     JoinLocality locality = JoinLocality::Unspecified;
diff --git a/src/Analyzer/LambdaNode.cpp b/src/Analyzer/LambdaNode.cpp
index b60b40878ec..0d15c4d42e6 100644
--- a/src/Analyzer/LambdaNode.cpp
+++ b/src/Analyzer/LambdaNode.cpp
@@ -1,5 +1,6 @@
 #include <Analyzer/LambdaNode.h>
 
+#include <Common/assert_cast.h>
 #include <Common/SipHash.h>
 
 #include <IO/WriteBuffer.h>
@@ -65,17 +66,17 @@ QueryTreeNodePtr LambdaNode::cloneImpl() const
     return std::make_shared<LambdaNode>(argument_names, getExpression());
 }
 
-ASTPtr LambdaNode::toASTImpl() const
+ASTPtr LambdaNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto lambda_function_arguments_ast = std::make_shared<ASTExpressionList>();
 
     auto tuple_function = std::make_shared<ASTFunction>();
     tuple_function->name = "tuple";
-    tuple_function->children.push_back(children[arguments_child_index]->toAST());
+    tuple_function->children.push_back(children[arguments_child_index]->toAST(options));
     tuple_function->arguments = tuple_function->children.back();
 
     lambda_function_arguments_ast->children.push_back(std::move(tuple_function));
-    lambda_function_arguments_ast->children.push_back(children[expression_child_index]->toAST());
+    lambda_function_arguments_ast->children.push_back(children[expression_child_index]->toAST(options));
 
     auto lambda_function_ast = std::make_shared<ASTFunction>();
     lambda_function_ast->name = "lambda";
diff --git a/src/Analyzer/LambdaNode.h b/src/Analyzer/LambdaNode.h
index 65b0d3de84e..355ed77cc6a 100644
--- a/src/Analyzer/LambdaNode.h
+++ b/src/Analyzer/LambdaNode.h
@@ -86,7 +86,12 @@ public:
 
     DataTypePtr getResultType() const override
     {
-        return getExpression()->getResultType();
+        return result_type;
+    }
+
+    void resolve(DataTypePtr lambda_type)
+    {
+        result_type = std::move(lambda_type);
     }
 
     void dumpTreeImpl(WriteBuffer & buffer, FormatState & format_state, size_t indent) const override;
@@ -98,10 +103,11 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     Names argument_names;
+    DataTypePtr result_type;
 
     static constexpr size_t arguments_child_index = 0;
     static constexpr size_t expression_child_index = 1;
diff --git a/src/Analyzer/ListNode.cpp b/src/Analyzer/ListNode.cpp
index 7bbb884fa7f..799c471d685 100644
--- a/src/Analyzer/ListNode.cpp
+++ b/src/Analyzer/ListNode.cpp
@@ -54,7 +54,7 @@ QueryTreeNodePtr ListNode::cloneImpl() const
     return std::make_shared<ListNode>();
 }
 
-ASTPtr ListNode::toASTImpl() const
+ASTPtr ListNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto expression_list_ast = std::make_shared<ASTExpressionList>();
 
@@ -62,7 +62,7 @@ ASTPtr ListNode::toASTImpl() const
     expression_list_ast->children.resize(children_size);
 
     for (size_t i = 0; i < children_size; ++i)
-        expression_list_ast->children[i] = children[i]->toAST();
+        expression_list_ast->children[i] = children[i]->toAST(options);
 
     return expression_list_ast;
 }
diff --git a/src/Analyzer/ListNode.h b/src/Analyzer/ListNode.h
index 75013f7ee6a..5b1abc36ae9 100644
--- a/src/Analyzer/ListNode.h
+++ b/src/Analyzer/ListNode.h
@@ -57,7 +57,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 };
 
 }
diff --git a/src/Analyzer/MatcherNode.cpp b/src/Analyzer/MatcherNode.cpp
index 5c8738e0504..ae2b654ab13 100644
--- a/src/Analyzer/MatcherNode.cpp
+++ b/src/Analyzer/MatcherNode.cpp
@@ -1,5 +1,6 @@
 #include <Analyzer/MatcherNode.h>
 
+#include <Common/assert_cast.h>
 #include <Common/SipHash.h>
 
 #include <IO/WriteBuffer.h>
@@ -204,7 +205,7 @@ QueryTreeNodePtr MatcherNode::cloneImpl() const
     return matcher_node;
 }
 
-ASTPtr MatcherNode::toASTImpl() const
+ASTPtr MatcherNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     ASTPtr result;
     ASTPtr transformers;
@@ -216,7 +217,7 @@ ASTPtr MatcherNode::toASTImpl() const
         transformers = std::make_shared<ASTColumnsTransformerList>();
 
         for (const auto & column_transformer : column_transformers)
-            transformers->children.push_back(column_transformer->toAST());
+            transformers->children.push_back(column_transformer->toAST(options));
     }
 
     if (matcher_type == MatcherNodeType::ASTERISK)
diff --git a/src/Analyzer/MatcherNode.h b/src/Analyzer/MatcherNode.h
index e79c1cb4bf2..1d8f38c6f38 100644
--- a/src/Analyzer/MatcherNode.h
+++ b/src/Analyzer/MatcherNode.h
@@ -148,7 +148,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     explicit MatcherNode(MatcherNodeType matcher_type_,
diff --git a/src/Analyzer/Passes/ArrayExistsToHasPass.cpp b/src/Analyzer/Passes/ArrayExistsToHasPass.cpp
index b4b8b5b4579..c0f958588f1 100644
--- a/src/Analyzer/Passes/ArrayExistsToHasPass.cpp
+++ b/src/Analyzer/Passes/ArrayExistsToHasPass.cpp
@@ -1,3 +1,5 @@
+#include <Analyzer/Passes/ArrayExistsToHasPass.h>
+
 #include <Functions/FunctionFactory.h>
 
 #include <Interpreters/Context.h>
@@ -8,71 +10,85 @@
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/LambdaNode.h>
 
-#include "ArrayExistsToHasPass.h"
-
 namespace DB
 {
+
 namespace
 {
-    class RewriteArrayExistsToHasVisitor : public InDepthQueryTreeVisitorWithContext<RewriteArrayExistsToHasVisitor>
+
+class RewriteArrayExistsToHasVisitor : public InDepthQueryTreeVisitorWithContext<RewriteArrayExistsToHasVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<RewriteArrayExistsToHasVisitor>;
+    using Base::Base;
+
+    void visitImpl(QueryTreeNodePtr & node)
     {
-    public:
-        using Base = InDepthQueryTreeVisitorWithContext<RewriteArrayExistsToHasVisitor>;
-        using Base::Base;
+        if (!getSettings().optimize_rewrite_array_exists_to_has)
+            return;
 
-        void visitImpl(QueryTreeNodePtr & node)
+        auto * array_exists_function_node = node->as<FunctionNode>();
+        if (!array_exists_function_node || array_exists_function_node->getFunctionName() != "arrayExists")
+            return;
+
+        auto & array_exists_function_arguments_nodes = array_exists_function_node->getArguments().getNodes();
+        if (array_exists_function_arguments_nodes.size() != 2)
+            return;
+
+        /// lambda function must be like: x -> x = elem
+        auto * lambda_node = array_exists_function_arguments_nodes[0]->as<LambdaNode>();
+        if (!lambda_node)
+            return;
+
+        auto & lambda_arguments_nodes = lambda_node->getArguments().getNodes();
+        if (lambda_arguments_nodes.size() != 1)
+            return;
+
+        const auto & lambda_argument_column_node = lambda_arguments_nodes[0];
+        if (lambda_argument_column_node->getNodeType() != QueryTreeNodeType::COLUMN)
+            return;
+
+        auto * filter_node = lambda_node->getExpression()->as<FunctionNode>();
+        if (!filter_node || filter_node->getFunctionName() != "equals")
+            return;
+
+        const auto & filter_arguments_nodes = filter_node->getArguments().getNodes();
+        if (filter_arguments_nodes.size() != 2)
+            return;
+
+        const auto & filter_lhs_argument_node = filter_arguments_nodes[0];
+        auto filter_lhs_argument_node_type = filter_lhs_argument_node->getNodeType();
+
+        const auto & filter_rhs_argument_node = filter_arguments_nodes[1];
+        auto filter_rhs_argument_node_type = filter_rhs_argument_node->getNodeType();
+
+        QueryTreeNodePtr has_constant_element_argument;
+
+        if (filter_lhs_argument_node_type == QueryTreeNodeType::COLUMN &&
+            filter_rhs_argument_node_type == QueryTreeNodeType::CONSTANT &&
+            filter_lhs_argument_node->isEqual(*lambda_argument_column_node))
         {
-            if (!getSettings().optimize_rewrite_array_exists_to_has)
-                return;
-
-            auto * function_node = node->as<FunctionNode>();
-            if (!function_node || function_node->getFunctionName() != "arrayExists")
-                return;
-
-            auto & function_arguments_nodes = function_node->getArguments().getNodes();
-            if (function_arguments_nodes.size() != 2)
-                return;
-
-            /// lambda function must be like: x -> x = elem
-            auto * lambda_node = function_arguments_nodes[0]->as<LambdaNode>();
-            if (!lambda_node)
-                return;
-
-            auto & lambda_arguments_nodes = lambda_node->getArguments().getNodes();
-            if (lambda_arguments_nodes.size() != 1)
-                return;
-            auto * column_node = lambda_arguments_nodes[0]->as<ColumnNode>();
-
-            auto * filter_node = lambda_node->getExpression()->as<FunctionNode>();
-            if (!filter_node || filter_node->getFunctionName() != "equals")
-                return;
-
-            auto filter_arguments_nodes = filter_node->getArguments().getNodes();
-            if (filter_arguments_nodes.size() != 2)
-                return;
-
-            ColumnNode * filter_column_node = nullptr;
-            if (filter_arguments_nodes[1]->as<ConstantNode>() && (filter_column_node = filter_arguments_nodes[0]->as<ColumnNode>())
-                && filter_column_node->getColumnName() == column_node->getColumnName())
-            {
-                /// Rewrite arrayExists(x -> x = elem, arr) -> has(arr, elem)
-                function_arguments_nodes[0] = std::move(function_arguments_nodes[1]);
-                function_arguments_nodes[1] = std::move(filter_arguments_nodes[1]);
-                function_node->resolveAsFunction(
-                    FunctionFactory::instance().get("has", getContext())->build(function_node->getArgumentColumns()));
-            }
-            else if (
-                filter_arguments_nodes[0]->as<ConstantNode>() && (filter_column_node = filter_arguments_nodes[1]->as<ColumnNode>())
-                && filter_column_node->getColumnName() == column_node->getColumnName())
-            {
-                /// Rewrite arrayExists(x -> elem = x, arr) -> has(arr, elem)
-                function_arguments_nodes[0] = std::move(function_arguments_nodes[1]);
-                function_arguments_nodes[1] = std::move(filter_arguments_nodes[0]);
-                function_node->resolveAsFunction(
-                    FunctionFactory::instance().get("has", getContext())->build(function_node->getArgumentColumns()));
-            }
+            /// Rewrite arrayExists(x -> x = elem, arr) -> has(arr, elem)
+            has_constant_element_argument = filter_rhs_argument_node;
         }
-    };
+        else if (filter_lhs_argument_node_type == QueryTreeNodeType::CONSTANT &&
+            filter_rhs_argument_node_type == QueryTreeNodeType::COLUMN &&
+            filter_rhs_argument_node->isEqual(*lambda_argument_column_node))
+        {
+            /// Rewrite arrayExists(x -> elem = x, arr) -> has(arr, elem)
+            has_constant_element_argument = filter_lhs_argument_node;
+        }
+        else
+        {
+            return;
+        }
+
+        auto has_function = FunctionFactory::instance().get("has", getContext());
+        array_exists_function_arguments_nodes[0] = std::move(array_exists_function_arguments_nodes[1]);
+        array_exists_function_arguments_nodes[1] = std::move(has_constant_element_argument);
+        array_exists_function_node->resolveAsFunction(has_function->build(array_exists_function_node->getArgumentColumns()));
+    }
+};
 
 }
 
diff --git a/src/Analyzer/Passes/ArrayExistsToHasPass.h b/src/Analyzer/Passes/ArrayExistsToHasPass.h
index 7d9d1cf3d68..8f4623116e3 100644
--- a/src/Analyzer/Passes/ArrayExistsToHasPass.h
+++ b/src/Analyzer/Passes/ArrayExistsToHasPass.h
@@ -4,8 +4,15 @@
 
 namespace DB
 {
-/// Rewrite possible 'arrayExists(func, arr)' to 'has(arr, elem)' to improve performance
-/// arrayExists(x -> x = 1, arr) -> has(arr, 1)
+
+/** Rewrite possible 'arrayExists(func, arr)' to 'has(arr, elem)' to improve performance.
+  *
+  * Example: SELECT arrayExists(x -> x = 1, arr);
+  * Result: SELECT has(arr, 1);
+  *
+  * Example: SELECT arrayExists(x -> 1 = x, arr);
+  * Result: SELECT has(arr, 1);
+  */
 class RewriteArrayExistsToHasPass final : public IQueryTreePass
 {
 public:
@@ -15,4 +22,5 @@ public:
 
     void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
 };
+
 }
diff --git a/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp b/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp
index fdf818681d7..15326ca1dc8 100644
--- a/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp
+++ b/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp
@@ -22,8 +22,7 @@ public:
 
     void visitImpl(QueryTreeNodePtr & node)
     {
-        const auto & context = getContext();
-        if (!context->getSettingsRef().final)
+        if (!getSettings().final)
             return;
 
         const auto * query_node = node->as<QueryNode>();
@@ -43,7 +42,7 @@ private:
             return;
 
         const auto & storage = table_node ? table_node->getStorage() : table_function_node->getStorage();
-        bool is_final_supported = storage && storage->supportsFinal() && !storage->isRemote();
+        bool is_final_supported = storage && storage->supportsFinal();
         if (!is_final_supported)
             return;
 
diff --git a/src/Analyzer/Passes/CNF.cpp b/src/Analyzer/Passes/CNF.cpp
new file mode 100644
index 00000000000..91e973c7573
--- /dev/null
+++ b/src/Analyzer/Passes/CNF.cpp
@@ -0,0 +1,600 @@
+#include <Analyzer/Passes/CNF.h>
+
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/ConstantNode.h>
+
+#include <Interpreters/TreeCNFConverter.h>
+
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+
+#include <Functions/FunctionFactory.h>
+
+#include <Common/checkStackSize.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int TOO_MANY_TEMPORARY_COLUMNS;
+}
+
+namespace Analyzer
+{
+
+namespace
+{
+
+bool isLogicalFunction(const FunctionNode & function_node)
+{
+    const std::string_view name = function_node.getFunctionName();
+    return name == "and" || name == "or" || name == "not";
+}
+
+template <typename... Args>
+QueryTreeNodePtr createFunctionNode(const FunctionOverloadResolverPtr & function_resolver, Args &&... args)
+{
+    auto function_node = std::make_shared<FunctionNode>(function_resolver->getName());
+    auto & new_arguments = function_node->getArguments().getNodes();
+    new_arguments.reserve(sizeof...(args));
+    (new_arguments.push_back(std::forward<Args>(args)), ...);
+    function_node->resolveAsFunction(function_resolver);
+    return function_node;
+}
+
+size_t countAtoms(const QueryTreeNodePtr & node)
+{
+    checkStackSize();
+
+    const auto * function_node = node->as<FunctionNode>();
+    if (!function_node || !isLogicalFunction(*function_node))
+        return 1;
+
+    size_t atom_count = 0;
+    const auto & arguments = function_node->getArguments().getNodes();
+    for (const auto & argument : arguments)
+        atom_count += countAtoms(argument);
+
+    return atom_count;
+}
+
+class SplitMultiLogicVisitor
+{
+public:
+    explicit SplitMultiLogicVisitor(ContextPtr context)
+        : current_context(std::move(context))
+    {}
+
+    void visit(QueryTreeNodePtr & node)
+    {
+        checkStackSize();
+
+        auto * function_node = node->as<FunctionNode>();
+        if (!function_node || !isLogicalFunction(*function_node))
+            return;
+
+        const auto & name = function_node->getFunctionName();
+
+        if (name == "and" || name == "or")
+        {
+            auto function_resolver = FunctionFactory::instance().get(name, current_context);
+
+            const auto & arguments = function_node->getArguments().getNodes();
+            if (arguments.size() > 2)
+            {
+                QueryTreeNodePtr current = arguments[0];
+                for (size_t i = 1; i < arguments.size(); ++i)
+                    current = createFunctionNode(function_resolver, std::move(current), arguments[i]);
+
+                auto & new_function_node = current->as<FunctionNode &>();
+                function_node->getArguments().getNodes() = std::move(new_function_node.getArguments().getNodes());
+                function_node->resolveAsFunction(function_resolver);
+            }
+        }
+        else
+        {
+            assert(name == "not");
+        }
+
+        auto & arguments = function_node->getArguments().getNodes();
+        for (auto & argument : arguments)
+            visit(argument);
+    }
+
+private:
+    ContextPtr current_context;
+};
+
+class PushNotVisitor
+{
+public:
+    explicit PushNotVisitor(const ContextPtr & context)
+        : not_function_resolver(FunctionFactory::instance().get("not", context))
+        , or_function_resolver(FunctionFactory::instance().get("or", context))
+        , and_function_resolver(FunctionFactory::instance().get("and", context))
+    {}
+
+    void visit(QueryTreeNodePtr & node, bool add_negation)
+    {
+        checkStackSize();
+
+        auto * function_node = node->as<FunctionNode>();
+
+        if (!function_node || !isLogicalFunction(*function_node))
+        {
+            if (add_negation)
+                node = createFunctionNode(not_function_resolver, std::move(node));
+            return;
+        }
+
+        std::string_view function_name = function_node->getFunctionName();
+        if (function_name == "and" || function_name == "or")
+        {
+            if (add_negation)
+            {
+                if (function_name == "and")
+                    function_node->resolveAsFunction(or_function_resolver);
+                else
+                    function_node->resolveAsFunction(and_function_resolver);
+            }
+
+            auto & arguments = function_node->getArguments().getNodes();
+            for (auto & argument : arguments)
+                visit(argument, add_negation);
+            return;
+        }
+
+        assert(function_name == "not");
+        auto & arguments = function_node->getArguments().getNodes();
+        assert(arguments.size() == 1);
+        node = arguments[0];
+        visit(node, !add_negation);
+    }
+
+private:
+    const FunctionOverloadResolverPtr not_function_resolver;
+    const FunctionOverloadResolverPtr or_function_resolver;
+    const FunctionOverloadResolverPtr and_function_resolver;
+};
+
+class PushOrVisitor
+{
+public:
+    PushOrVisitor(ContextPtr context, size_t max_atoms_)
+        : max_atoms(max_atoms_)
+        , and_resolver(FunctionFactory::instance().get("and", context))
+        , or_resolver(FunctionFactory::instance().get("or", context))
+    {}
+
+    bool visit(QueryTreeNodePtr & node, size_t num_atoms)
+    {
+        if (max_atoms && num_atoms > max_atoms)
+            return false;
+
+        checkStackSize();
+
+        auto * function_node = node->as<FunctionNode>();
+
+        if (!function_node)
+            return true;
+
+        std::string_view name = function_node->getFunctionName();
+
+        if (name == "or" || name == "and")
+        {
+            auto & arguments = function_node->getArguments().getNodes();
+            for (auto & argument : arguments)
+            {
+                if (!visit(argument, num_atoms))
+                    return false;
+            }
+        }
+
+        if (name == "or")
+        {
+            auto & arguments = function_node->getArguments().getNodes();
+            assert(arguments.size() == 2);
+
+            size_t and_node_id = arguments.size();
+
+            for (size_t i = 0; i < arguments.size(); ++i)
+            {
+                auto & argument = arguments[i];
+                if (auto * argument_function_node = argument->as<FunctionNode>();
+                    argument_function_node && argument_function_node->getFunctionName() == "and")
+                    and_node_id = i;
+            }
+
+            if (and_node_id == arguments.size())
+                return true;
+
+            auto & other_node = arguments[1 - and_node_id];
+            auto & and_function_arguments = arguments[and_node_id]->as<FunctionNode &>().getArguments().getNodes();
+
+            auto lhs = createFunctionNode(or_resolver, other_node->clone(), std::move(and_function_arguments[0]));
+            num_atoms += countAtoms(other_node);
+
+            auto rhs = createFunctionNode(or_resolver, std::move(other_node), std::move(and_function_arguments[1]));
+            node = createFunctionNode(and_resolver, std::move(lhs), std::move(rhs));
+
+            return visit(node, num_atoms);
+        }
+
+        return true;
+    }
+
+private:
+    size_t max_atoms;
+
+    const FunctionOverloadResolverPtr and_resolver;
+    const FunctionOverloadResolverPtr or_resolver;
+};
+
+class CollectGroupsVisitor
+{
+public:
+    void visit(QueryTreeNodePtr & node)
+    {
+        CNF::OrGroup or_group;
+        visitImpl(node, or_group);
+        if (!or_group.empty())
+            and_group.insert(std::move(or_group));
+    }
+
+    CNF::AndGroup and_group;
+
+private:
+    void visitImpl(QueryTreeNodePtr & node, CNF::OrGroup & or_group)
+    {
+        checkStackSize();
+
+        auto * function_node = node->as<FunctionNode>();
+        if (!function_node || !isLogicalFunction(*function_node))
+        {
+            or_group.insert(CNF::AtomicFormula{false, std::move(node)});
+            return;
+        }
+
+        std::string_view name = function_node->getFunctionName();
+
+        if (name == "and")
+        {
+            auto & arguments = function_node->getArguments().getNodes();
+            for (auto & argument : arguments)
+            {
+                CNF::OrGroup argument_or_group;
+                visitImpl(argument, argument_or_group);
+                if (!argument_or_group.empty())
+                    and_group.insert(std::move(argument_or_group));
+            }
+        }
+        else if (name == "or")
+        {
+            auto & arguments = function_node->getArguments().getNodes();
+            for (auto & argument : arguments)
+                visitImpl(argument, or_group);
+        }
+        else
+        {
+            assert(name == "not");
+            auto & arguments = function_node->getArguments().getNodes();
+            or_group.insert(CNF::AtomicFormula{true, std::move(arguments[0])});
+        }
+    }
+};
+
+std::optional<CNF::AtomicFormula> tryInvertFunction(
+    const CNF::AtomicFormula & atom, const ContextPtr & context, const std::unordered_map<std::string, std::string> & inverse_relations)
+{
+    auto * function_node = atom.node_with_hash.node->as<FunctionNode>();
+    if (!function_node)
+        return std::nullopt;
+
+    if (auto it = inverse_relations.find(function_node->getFunctionName()); it != inverse_relations.end())
+    {
+        auto inverse_function_resolver = FunctionFactory::instance().get(it->second, context);
+        function_node->resolveAsFunction(inverse_function_resolver);
+        return CNF::AtomicFormula{!atom.negative, atom.node_with_hash.node};
+    }
+
+    return std::nullopt;
+}
+}
+
+bool CNF::AtomicFormula::operator==(const AtomicFormula & rhs) const
+{
+    return negative == rhs.negative && node_with_hash == rhs.node_with_hash;
+}
+
+bool CNF::AtomicFormula::operator<(const AtomicFormula & rhs) const
+{
+    if (node_with_hash.hash > rhs.node_with_hash.hash)
+        return false;
+
+    return node_with_hash.hash < rhs.node_with_hash.hash || negative < rhs.negative;
+}
+
+std::string CNF::dump() const
+{
+    WriteBufferFromOwnString res;
+    bool first = true;
+    for (const auto & group : statements)
+    {
+        if (!first)
+            res << " AND ";
+        first = false;
+        res << "(";
+        bool first_in_group = true;
+        for (const auto & atom : group)
+        {
+            if (!first_in_group)
+                res << " OR ";
+            first_in_group = false;
+            if (atom.negative)
+                res << " NOT ";
+            res << atom.node_with_hash.node->formatASTForErrorMessage();
+        }
+        res << ")";
+    }
+
+    return res.str();
+}
+
+CNF & CNF::transformGroups(std::function<OrGroup(const OrGroup &)> fn)
+{
+    AndGroup result;
+
+    for (const auto & group : statements)
+    {
+        auto new_group = fn(group);
+        if (!new_group.empty())
+            result.insert(std::move(new_group));
+    }
+
+    statements = std::move(result);
+    return *this;
+}
+
+CNF & CNF::transformAtoms(std::function<AtomicFormula(const AtomicFormula &)> fn)
+{
+    transformGroups([fn](const OrGroup & group)
+    {
+        OrGroup result;
+        for (const auto & atom : group)
+        {
+            auto new_atom = fn(atom);
+            if (new_atom.node_with_hash.node)
+                result.insert(std::move(new_atom));
+        }
+
+        return result;
+    });
+
+    return *this;
+}
+
+CNF & CNF::pushNotIntoFunctions(const ContextPtr & context)
+{
+    transformAtoms([&](const AtomicFormula & atom)
+    {
+        return pushNotIntoFunction(atom, context);
+    });
+
+    return *this;
+}
+
+CNF::AtomicFormula CNF::pushNotIntoFunction(const AtomicFormula & atom, const ContextPtr & context)
+{
+    if (!atom.negative)
+        return atom;
+
+    static const std::unordered_map<std::string, std::string> inverse_relations = {
+        {"equals", "notEquals"},
+        {"less", "greaterOrEquals"},
+        {"lessOrEquals", "greater"},
+        {"in", "notIn"},
+        {"like", "notLike"},
+        {"empty", "notEmpty"},
+        {"notEquals", "equals"},
+        {"greaterOrEquals", "less"},
+        {"greater", "lessOrEquals"},
+        {"notIn", "in"},
+        {"notLike", "like"},
+        {"notEmpty", "empty"},
+    };
+
+    if (auto inverted_atom = tryInvertFunction(atom, context, inverse_relations);
+        inverted_atom.has_value())
+        return std::move(*inverted_atom);
+
+    return atom;
+}
+
+CNF & CNF::pullNotOutFunctions(const ContextPtr & context)
+{
+    transformAtoms([&](const AtomicFormula & atom)
+    {
+        static const std::unordered_map<std::string, std::string> inverse_relations = {
+            {"notEquals", "equals"},
+            {"greaterOrEquals", "less"},
+            {"greater", "lessOrEquals"},
+            {"notIn", "in"},
+            {"notLike", "like"},
+            {"notEmpty", "empty"},
+        };
+
+        if (auto inverted_atom = tryInvertFunction(atom, context, inverse_relations);
+            inverted_atom.has_value())
+            return std::move(*inverted_atom);
+
+        return atom;
+    });
+
+    return *this;
+}
+
+CNF & CNF::filterAlwaysTrueGroups(std::function<bool(const OrGroup &)> predicate)
+{
+    AndGroup filtered;
+    for (const auto & or_group : statements)
+    {
+        if (predicate(or_group))
+            filtered.insert(or_group);
+    }
+
+    statements = std::move(filtered);
+    return *this;
+}
+
+CNF & CNF::filterAlwaysFalseAtoms(std::function<bool(const AtomicFormula &)> predicate)
+{
+    AndGroup filtered;
+    for (const auto & or_group : statements)
+    {
+        OrGroup filtered_group;
+        for (const auto & atom : or_group)
+        {
+            if (predicate(atom))
+                filtered_group.insert(atom);
+        }
+
+        if (!filtered_group.empty())
+            filtered.insert(std::move(filtered_group));
+        else
+        {
+            filtered.clear();
+            filtered_group.insert(AtomicFormula{false, QueryTreeNodePtrWithHash{std::make_shared<ConstantNode>(static_cast<UInt8>(0))}});
+            filtered.insert(std::move(filtered_group));
+            break;
+        }
+    }
+
+    statements = std::move(filtered);
+    return *this;
+}
+
+CNF & CNF::reduce()
+{
+    while (true)
+    {
+        AndGroup new_statements = reduceOnceCNFStatements(statements);
+        if (statements == new_statements)
+        {
+            statements = filterCNFSubsets(statements);
+            return *this;
+        }
+        else
+            statements = new_statements;
+    }
+}
+
+void CNF::appendGroup(const AndGroup & and_group)
+{
+    for (const auto & or_group : and_group)
+        statements.emplace(or_group);
+}
+
+CNF::CNF(AndGroup statements_)
+    : statements(std::move(statements_))
+{}
+
+std::optional<CNF> CNF::tryBuildCNF(const QueryTreeNodePtr & node, ContextPtr context, size_t max_growth_multiplier)
+{
+    auto node_cloned = node->clone();
+
+    size_t atom_count = countAtoms(node_cloned);
+    size_t max_atoms = max_growth_multiplier ? std::max(MAX_ATOMS_WITHOUT_CHECK, atom_count * max_growth_multiplier) : 0;
+
+    {
+        SplitMultiLogicVisitor visitor(context);
+        visitor.visit(node_cloned);
+    }
+
+    {
+        PushNotVisitor visitor(context);
+        visitor.visit(node_cloned, false);
+    }
+
+    if (PushOrVisitor visitor(context, max_atoms);
+        !visitor.visit(node_cloned, atom_count))
+            return std::nullopt;
+
+    CollectGroupsVisitor collect_visitor;
+    collect_visitor.visit(node_cloned);
+
+    if (collect_visitor.and_group.empty())
+        return std::nullopt;
+
+    return CNF{std::move(collect_visitor.and_group)};
+}
+
+CNF CNF::toCNF(const QueryTreeNodePtr & node, ContextPtr context, size_t max_growth_multiplier)
+{
+    auto cnf = tryBuildCNF(node, context, max_growth_multiplier);
+    if (!cnf)
+        throw Exception(ErrorCodes::TOO_MANY_TEMPORARY_COLUMNS,
+            "Cannot convert expression '{}' to CNF, because it produces to many clauses."
+            "Size of boolean formula in CNF can be exponential of size of source formula.");
+
+    return *cnf;
+}
+
+QueryTreeNodePtr CNF::toQueryTree(ContextPtr context) const
+{
+    if (statements.empty())
+        return nullptr;
+
+    QueryTreeNodes and_arguments;
+    and_arguments.reserve(statements.size());
+
+    auto not_resolver = FunctionFactory::instance().get("not", context);
+    auto or_resolver = FunctionFactory::instance().get("or", context);
+    auto and_resolver = FunctionFactory::instance().get("and", context);
+
+    const auto function_node_from_atom = [&](const auto & atom) -> QueryTreeNodePtr
+    {
+        auto cloned_node = atom.node_with_hash.node->clone();
+        if (atom.negative)
+            return createFunctionNode(not_resolver, std::move(cloned_node));
+
+        return std::move(cloned_node);
+    };
+
+    for (const auto & or_group : statements)
+    {
+        if (or_group.size() == 1)
+        {
+            const auto & atom = *or_group.begin();
+            and_arguments.push_back(function_node_from_atom(atom));
+        }
+        else
+        {
+            QueryTreeNodes or_arguments;
+            or_arguments.reserve(or_group.size());
+
+            for (const auto & atom : or_group)
+                or_arguments.push_back(function_node_from_atom(atom));
+
+            auto or_function = std::make_shared<FunctionNode>("or");
+            or_function->getArguments().getNodes() = std::move(or_arguments);
+            or_function->resolveAsFunction(or_resolver);
+
+            and_arguments.push_back(std::move(or_function));
+        }
+    }
+
+    if (and_arguments.size() == 1)
+        return std::move(and_arguments[0]);
+
+    auto and_function = std::make_shared<FunctionNode>("and");
+    and_function->getArguments().getNodes() = std::move(and_arguments);
+    and_function->resolveAsFunction(and_resolver);
+
+    return and_function;
+}
+
+}
+
+}
diff --git a/src/Analyzer/Passes/CNF.h b/src/Analyzer/Passes/CNF.h
new file mode 100644
index 00000000000..ec639cd6679
--- /dev/null
+++ b/src/Analyzer/Passes/CNF.h
@@ -0,0 +1,67 @@
+#pragma once
+
+#include <Analyzer/HashUtils.h>
+#include <Analyzer/IQueryTreeNode.h>
+
+#include <Common/SipHash.h>
+
+#include <Interpreters/Context_fwd.h>
+
+#include <unordered_set>
+
+namespace DB::Analyzer
+{
+
+class CNF
+{
+public:
+    struct AtomicFormula
+    {
+        bool negative = false;
+        QueryTreeNodePtrWithHash node_with_hash;
+
+        bool operator==(const AtomicFormula & rhs) const;
+        bool operator<(const AtomicFormula & rhs) const;
+    };
+
+    // Different hash is generated for different order, so we use std::set
+    using OrGroup = std::set<AtomicFormula>;
+    using AndGroup = std::set<OrGroup>;
+
+    std::string dump() const;
+
+    static constexpr size_t DEFAULT_MAX_GROWTH_MULTIPLIER = 20;
+    static constexpr size_t MAX_ATOMS_WITHOUT_CHECK = 200;
+
+    CNF & transformAtoms(std::function<AtomicFormula(const AtomicFormula &)> fn);
+    CNF & transformGroups(std::function<OrGroup(const OrGroup &)> fn);
+
+    CNF & filterAlwaysTrueGroups(std::function<bool(const OrGroup &)> predicate);
+    CNF & filterAlwaysFalseAtoms(std::function<bool(const AtomicFormula &)> predicate);
+
+    CNF & reduce();
+
+    void appendGroup(const AndGroup & and_group);
+
+    /// Convert "NOT fn" to a single node representing inverse of "fn"
+    CNF & pushNotIntoFunctions(const ContextPtr & context);
+    CNF & pullNotOutFunctions(const ContextPtr & context);
+
+    static AtomicFormula pushNotIntoFunction(const AtomicFormula & atom, const ContextPtr & context);
+
+    explicit CNF(AndGroup statements_);
+
+    static std::optional<CNF> tryBuildCNF(const QueryTreeNodePtr & node, ContextPtr context, size_t max_growth_multiplier = DEFAULT_MAX_GROWTH_MULTIPLIER);
+    static CNF toCNF(const QueryTreeNodePtr & node, ContextPtr context, size_t max_growth_multiplier = DEFAULT_MAX_GROWTH_MULTIPLIER);
+
+    QueryTreeNodePtr toQueryTree(ContextPtr context) const;
+
+    const auto & getStatements() const
+    {
+        return statements;
+    }
+private:
+    AndGroup statements;
+};
+
+}
diff --git a/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp b/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp
new file mode 100644
index 00000000000..4d32c96b845
--- /dev/null
+++ b/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp
@@ -0,0 +1,733 @@
+#include <Analyzer/Passes/ConvertQueryToCNFPass.h>
+
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/TableNode.h>
+#include <Analyzer/ColumnNode.h>
+#include <Analyzer/TableFunctionNode.h>
+#include <Analyzer/ConstantNode.h>
+#include <Analyzer/Passes/CNF.h>
+#include <Analyzer/Utils.h>
+
+#include <Storages/IStorage.h>
+
+#include <Functions/FunctionFactory.h>
+#include "Analyzer/HashUtils.h"
+#include "Analyzer/IQueryTreeNode.h"
+#include "Interpreters/ComparisonGraph.h"
+#include "base/types.h"
+
+namespace DB
+{
+
+namespace
+{
+
+std::optional<Analyzer::CNF> tryConvertQueryToCNF(const QueryTreeNodePtr & node, const ContextPtr & context)
+{
+    auto cnf_form = Analyzer::CNF::tryBuildCNF(node, context);
+    if (!cnf_form)
+        return std::nullopt;
+
+    cnf_form->pushNotIntoFunctions(context);
+    return cnf_form;
+}
+
+enum class MatchState : uint8_t
+{
+    FULL_MATCH, /// a = b
+    PARTIAL_MATCH, /// a = not b
+    NONE,
+};
+
+MatchState match(const Analyzer::CNF::AtomicFormula & a, const Analyzer::CNF::AtomicFormula & b)
+{
+    using enum MatchState;
+    if (a.node_with_hash != b.node_with_hash)
+        return NONE;
+
+    return a.negative == b.negative ? FULL_MATCH : PARTIAL_MATCH;
+}
+
+bool checkIfGroupAlwaysTrueFullMatch(const Analyzer::CNF::OrGroup & group, const ConstraintsDescription::QueryTreeData & query_tree_constraints)
+{
+    /// We have constraints in CNF.
+    /// CNF is always true => Each OR group in CNF is always true.
+    /// So, we try to check whether we have al least one OR group from CNF as subset in our group.
+    /// If we've found one then our group is always true too.
+
+    const auto & constraints_data = query_tree_constraints.getConstraintData();
+    std::vector<size_t> found(constraints_data.size());
+    for (size_t i = 0; i < constraints_data.size(); ++i)
+        found[i] = constraints_data[i].size();
+
+    for (const auto & atom : group)
+    {
+        const auto constraint_atom_ids = query_tree_constraints.getAtomIds(atom.node_with_hash);
+        if (constraint_atom_ids)
+        {
+            const auto constraint_atoms = query_tree_constraints.getAtomsById(*constraint_atom_ids);
+            for (size_t i = 0; i < constraint_atoms.size(); ++i)
+            {
+                if (match(constraint_atoms[i], atom) == MatchState::FULL_MATCH)
+                {
+                    if ((--found[(*constraint_atom_ids)[i].group_id]) == 0)
+                        return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
+bool checkIfGroupAlwaysTrueGraph(const Analyzer::CNF::OrGroup & group, const ComparisonGraph<QueryTreeNodePtr> & graph)
+{
+    /// We try to find at least one atom that is always true by using comparison graph.
+    for (const auto & atom : group)
+    {
+        const auto * function_node = atom.node_with_hash.node->as<FunctionNode>();
+        if (function_node)
+        {
+            const auto & arguments = function_node->getArguments().getNodes();
+            if (arguments.size() == 2)
+            {
+                const auto expected = ComparisonGraph<QueryTreeNodePtr>::atomToCompareResult(atom);
+                if (graph.isAlwaysCompare(expected, arguments[0], arguments[1]))
+                    return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+bool checkIfAtomAlwaysFalseFullMatch(const Analyzer::CNF::AtomicFormula & atom, const ConstraintsDescription::QueryTreeData & query_tree_constraints)
+{
+    const auto constraint_atom_ids = query_tree_constraints.getAtomIds(atom.node_with_hash);
+    if (constraint_atom_ids)
+    {
+        for (const auto & constraint_atom : query_tree_constraints.getAtomsById(*constraint_atom_ids))
+        {
+            const auto match_result = match(constraint_atom, atom);
+            if (match_result == MatchState::PARTIAL_MATCH)
+                return true;
+        }
+    }
+
+    return false;
+}
+
+bool checkIfAtomAlwaysFalseGraph(const Analyzer::CNF::AtomicFormula & atom, const ComparisonGraph<QueryTreeNodePtr> & graph)
+{
+    const auto * function_node = atom.node_with_hash.node->as<FunctionNode>();
+    if (!function_node)
+        return false;
+
+    const auto & arguments = function_node->getArguments().getNodes();
+    if (arguments.size() != 2)
+        return false;
+
+    /// TODO: special support for !=
+    const auto expected = ComparisonGraph<QueryTreeNodePtr>::atomToCompareResult(atom);
+    return !graph.isPossibleCompare(expected, arguments[0], arguments[1]);
+}
+
+void replaceToConstants(QueryTreeNodePtr & term, const ComparisonGraph<QueryTreeNodePtr> & graph)
+{
+    const auto equal_constant = graph.getEqualConst(term);
+    if (equal_constant)
+    {
+        term = (*equal_constant)->clone();
+        return;
+    }
+
+    for (auto & child : term->getChildren())
+    {
+        if (child)
+            replaceToConstants(child, graph);
+    }
+}
+
+Analyzer::CNF::AtomicFormula replaceTermsToConstants(const Analyzer::CNF::AtomicFormula & atom, const ComparisonGraph<QueryTreeNodePtr> & graph)
+{
+    auto node = atom.node_with_hash.node->clone();
+    replaceToConstants(node, graph);
+    return {atom.negative, std::move(node)};
+}
+
+StorageSnapshotPtr getStorageSnapshot(const QueryTreeNodePtr & node)
+{
+    StorageSnapshotPtr storage_snapshot{nullptr};
+    if (auto * table_node = node->as<TableNode>())
+        return table_node->getStorageSnapshot();
+    else if (auto * table_function_node = node->as<TableFunctionNode>())
+        return table_function_node->getStorageSnapshot();
+
+    return nullptr;
+}
+
+bool onlyIndexColumns(const QueryTreeNodePtr & node, const std::unordered_set<std::string_view> & primary_key_set)
+{
+    const auto * column_node = node->as<ColumnNode>();
+    /// TODO: verify that full name is correct here
+    if (column_node && !primary_key_set.contains(column_node->getColumnName()))
+        return false;
+
+    for (const auto & child : node->getChildren())
+    {
+        if (child && !onlyIndexColumns(child, primary_key_set))
+            return false;
+    }
+
+    return true;
+}
+
+bool onlyConstants(const QueryTreeNodePtr & node)
+{
+    /// if it's only constant it will be already calculated
+    return node->as<ConstantNode>() != nullptr;
+}
+
+const std::unordered_map<std::string_view, ComparisonGraphCompareResult> & getRelationMap()
+{
+    using enum ComparisonGraphCompareResult;
+    static const std::unordered_map<std::string_view, ComparisonGraphCompareResult> relations =
+    {
+        {"equals", EQUAL},
+        {"less", LESS},
+        {"lessOrEquals", LESS_OR_EQUAL},
+        {"greaterOrEquals", GREATER_OR_EQUAL},
+        {"greater", GREATER},
+    };
+    return relations;
+}
+
+const std::unordered_map<ComparisonGraphCompareResult, std::string> & getReverseRelationMap()
+{
+    using enum ComparisonGraphCompareResult;
+    static const std::unordered_map<ComparisonGraphCompareResult, std::string> relations =
+    {
+        {EQUAL, "equals"},
+        {LESS, "less"},
+        {LESS_OR_EQUAL, "lessOrEquals"},
+        {GREATER_OR_EQUAL, "greaterOrEquals"},
+        {GREATER, "greater"},
+    };
+    return relations;
+}
+
+bool canBeSequence(const ComparisonGraphCompareResult left, const ComparisonGraphCompareResult right)
+{
+    using enum ComparisonGraphCompareResult;
+    if (left == UNKNOWN || right == UNKNOWN || left == NOT_EQUAL || right == NOT_EQUAL)
+        return false;
+    if ((left == GREATER || left == GREATER_OR_EQUAL) && (right == LESS || right == LESS_OR_EQUAL))
+        return false;
+    if ((right == GREATER || right == GREATER_OR_EQUAL) && (left == LESS || left == LESS_OR_EQUAL))
+        return false;
+    return true;
+}
+
+ComparisonGraphCompareResult mostStrict(const ComparisonGraphCompareResult left, const ComparisonGraphCompareResult right)
+{
+    using enum ComparisonGraphCompareResult;
+    if (left == LESS || left == GREATER)
+        return left;
+    if (right == LESS || right == GREATER)
+        return right;
+    if (left == LESS_OR_EQUAL || left == GREATER_OR_EQUAL)
+        return left;
+    if (right == LESS_OR_EQUAL || right == GREATER_OR_EQUAL)
+        return right;
+    if (left == EQUAL)
+        return left;
+    if (right == EQUAL)
+        return right;
+    return UNKNOWN;
+}
+
+/// Create OR-group for 'indexHint'.
+/// Consider we have expression like A <op1> C, where C is constant.
+/// Consider we have a constraint I <op2> A, where I depends only on columns from primary key.
+/// Then if op1 and op2 forms a sequence of comparisons (e.g. A < C and I < A),
+/// we can add to expression 'indexHint(I < A)' condition.
+Analyzer::CNF::OrGroup createIndexHintGroup(
+    const Analyzer::CNF::OrGroup & group,
+    const ComparisonGraph<QueryTreeNodePtr> & graph,
+    const QueryTreeNodes & primary_key_only_nodes,
+    const ContextPtr & context)
+{
+    Analyzer::CNF::OrGroup result;
+    for (const auto & atom : group)
+    {
+        const auto * function_node = atom.node_with_hash.node->as<FunctionNode>();
+        if (!function_node || !getRelationMap().contains(function_node->getFunctionName()))
+            continue;
+
+        const auto & arguments = function_node->getArguments().getNodes();
+        if (arguments.size() != 2)
+            continue;
+
+        auto check_and_insert = [&](const size_t index, const ComparisonGraphCompareResult expected_result)
+        {
+            if (!onlyConstants(arguments[1 - index]))
+                return false;
+
+            for (const auto & primary_key_node : primary_key_only_nodes)
+            {
+                ComparisonGraphCompareResult actual_result;
+                if (index == 0)
+                    actual_result = graph.compare(primary_key_node, arguments[index]);
+                else
+                    actual_result = graph.compare(arguments[index], primary_key_node);
+
+                if (canBeSequence(expected_result, actual_result))
+                {
+                    auto helper_node = function_node->clone();
+                    auto & helper_function_node = helper_node->as<FunctionNode &>();
+                    helper_function_node.getArguments().getNodes()[index] = primary_key_node->clone();
+                    auto reverse_function_name = getReverseRelationMap().at(mostStrict(expected_result, actual_result));
+                    helper_function_node.resolveAsFunction(FunctionFactory::instance().get(reverse_function_name, context));
+                    result.insert(Analyzer::CNF::AtomicFormula{atom.negative, std::move(helper_node)});
+                    return true;
+                }
+            }
+
+            return false;
+        };
+
+        auto expected = getRelationMap().at(function_node->getFunctionName());
+        if (!check_and_insert(0, expected) && !check_and_insert(1, expected))
+            return {};
+    }
+
+    return result;
+}
+
+void addIndexConstraint(Analyzer::CNF & cnf, const QueryTreeNodes & table_expressions, const ContextPtr & context)
+{
+    for (const auto & table_expression : table_expressions)
+    {
+        auto snapshot = getStorageSnapshot(table_expression);
+        if (!snapshot || !snapshot->metadata)
+            continue;
+
+        const auto primary_key = snapshot->metadata->getColumnsRequiredForPrimaryKey();
+        const std::unordered_set<std::string_view> primary_key_set(primary_key.begin(), primary_key.end());
+
+        const auto & query_tree_constraint = snapshot->metadata->getConstraints().getQueryTreeData(context, table_expression);
+        const auto & graph = query_tree_constraint.getGraph();
+
+        QueryTreeNodes primary_key_only_nodes;
+        for (const auto & vertex : graph.getVertices())
+        {
+            for (const auto & node : vertex)
+            {
+                if (onlyIndexColumns(node, primary_key_set))
+                    primary_key_only_nodes.push_back(node);
+            }
+        }
+
+        Analyzer::CNF::AndGroup and_group;
+        const auto & statements = cnf.getStatements();
+        for (const auto & group : statements)
+        {
+            auto new_group = createIndexHintGroup(group, graph, primary_key_only_nodes, context);
+            if (!new_group.empty())
+                and_group.emplace(std::move(new_group));
+        }
+
+        if (!and_group.empty())
+        {
+            Analyzer::CNF::OrGroup new_group;
+            auto index_hint_node = std::make_shared<FunctionNode>("indexHint");
+            index_hint_node->getArguments().getNodes().push_back(Analyzer::CNF{std::move(and_group)}.toQueryTree(context));
+            index_hint_node->resolveAsFunction(FunctionFactory::instance().get("indexHint", context));
+            new_group.insert({false, QueryTreeNodePtrWithHash{std::move(index_hint_node)}});
+
+            cnf.appendGroup({new_group});
+        }
+    }
+}
+
+struct ColumnPrice
+{
+    Int64 compressed_size{0};
+    Int64 uncompressed_size{0};
+
+    ColumnPrice(const Int64 compressed_size_, const Int64 uncompressed_size_)
+        : compressed_size(compressed_size_)
+        , uncompressed_size(uncompressed_size_)
+    {
+    }
+
+    bool operator<(const ColumnPrice & that) const
+    {
+        return std::tie(compressed_size, uncompressed_size) < std::tie(that.compressed_size, that.uncompressed_size);
+    }
+
+    ColumnPrice & operator+=(const ColumnPrice & that)
+    {
+        compressed_size += that.compressed_size;
+        uncompressed_size += that.uncompressed_size;
+        return *this;
+    }
+
+    ColumnPrice & operator-=(const ColumnPrice & that)
+    {
+        compressed_size -= that.compressed_size;
+        uncompressed_size -= that.uncompressed_size;
+        return *this;
+    }
+};
+
+using ColumnPriceByName = std::unordered_map<String, ColumnPrice>;
+using ColumnPriceByQueryNode = QueryTreeNodePtrWithHashMap<ColumnPrice>;
+
+class ComponentCollectorVisitor : public ConstInDepthQueryTreeVisitor<ComponentCollectorVisitor>
+{
+public:
+    ComponentCollectorVisitor(
+        std::set<UInt64> & components_,
+        QueryTreeNodePtrWithHashMap<UInt64> & query_node_to_component_,
+        const ComparisonGraph<QueryTreeNodePtr> & graph_)
+        : components(components_), query_node_to_component(query_node_to_component_), graph(graph_)
+    {}
+
+    void visitImpl(const QueryTreeNodePtr & node)
+    {
+        if (auto id = graph.getComponentId(node))
+        {
+            query_node_to_component.emplace(node, *id);
+            components.insert(*id);
+        }
+    }
+
+private:
+    std::set<UInt64> & components;
+    QueryTreeNodePtrWithHashMap<UInt64> & query_node_to_component;
+
+    const ComparisonGraph<QueryTreeNodePtr> & graph;
+};
+
+class ColumnNameCollectorVisitor : public ConstInDepthQueryTreeVisitor<ColumnNameCollectorVisitor>
+{
+public:
+    ColumnNameCollectorVisitor(
+        std::unordered_set<std::string> & column_names_,
+        const QueryTreeNodePtrWithHashMap<UInt64> * query_node_to_component_)
+        : column_names(column_names_), query_node_to_component(query_node_to_component_)
+    {}
+
+    bool needChildVisit(const VisitQueryTreeNodeType & parent, const VisitQueryTreeNodeType &)
+    {
+        return !query_node_to_component || !query_node_to_component->contains(parent);
+    }
+
+    void visitImpl(const QueryTreeNodePtr & node)
+    {
+        if (query_node_to_component && query_node_to_component->contains(node))
+            return;
+
+        if (const auto * column_node = node->as<ColumnNode>())
+            column_names.insert(column_node->getColumnName());
+    }
+
+private:
+    std::unordered_set<std::string> & column_names;
+    const QueryTreeNodePtrWithHashMap<UInt64> * query_node_to_component;
+};
+
+class SubstituteColumnVisitor : public InDepthQueryTreeVisitor<SubstituteColumnVisitor>
+{
+public:
+    SubstituteColumnVisitor(
+        const QueryTreeNodePtrWithHashMap<UInt64> & query_node_to_component_,
+        const std::unordered_map<UInt64, QueryTreeNodePtr> & id_to_query_node_map_,
+        ContextPtr context_)
+        : query_node_to_component(query_node_to_component_), id_to_query_node_map(id_to_query_node_map_), context(std::move(context_))
+    {}
+
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        auto component_id_it = query_node_to_component.find(node);
+        if (component_id_it == query_node_to_component.end())
+            return;
+
+        const auto component_id = component_id_it->second;
+        auto new_node = id_to_query_node_map.at(component_id)->clone();
+
+        if (!node->getResultType()->equals(*new_node->getResultType()))
+        {
+            node = buildCastFunction(new_node, node->getResultType(), context);
+            return;
+        }
+
+        node = std::move(new_node);
+    }
+
+private:
+    const QueryTreeNodePtrWithHashMap<UInt64> & query_node_to_component;
+    const std::unordered_map<UInt64, QueryTreeNodePtr> & id_to_query_node_map;
+    ContextPtr context;
+};
+
+ColumnPrice calculatePrice(
+        const ColumnPriceByName & column_prices,
+        const std::unordered_set<std::string> & column_names)
+{
+    ColumnPrice result(0, 0);
+
+    for (const auto & column : column_names)
+    {
+        if (auto it = column_prices.find(column); it != column_prices.end())
+            result += it->second;
+    }
+
+    return result;
+}
+
+
+void bruteForce(
+        const ComparisonGraph<QueryTreeNodePtr> & graph,
+        const std::vector<UInt64> & components,
+        size_t current_component,
+        const ColumnPriceByName & column_prices,
+        ColumnPrice current_price,
+        std::vector<QueryTreeNodePtr> & expressions_stack,
+        ColumnPrice & min_price,
+        std::vector<QueryTreeNodePtr> & min_expressions)
+{
+    if (current_component == components.size())
+    {
+        if (current_price < min_price)
+        {
+            min_price = current_price;
+            min_expressions = expressions_stack;
+        }
+        return;
+    }
+
+    for (const auto & node : graph.getComponent(components[current_component]))
+    {
+        std::unordered_set<std::string> column_names;
+        ColumnNameCollectorVisitor column_name_collector{column_names, nullptr};
+        column_name_collector.visit(node);
+
+        ColumnPrice expression_price = calculatePrice(column_prices, column_names);
+
+        expressions_stack.push_back(node);
+        current_price += expression_price;
+
+        ColumnPriceByName new_prices(column_prices);
+        for (const auto & column : column_names)
+            new_prices.insert_or_assign(column, ColumnPrice(0, 0));
+
+        bruteForce(graph,
+                   components,
+                   current_component + 1,
+                   new_prices,
+                   current_price,
+                   expressions_stack,
+                   min_price,
+                   min_expressions);
+
+        current_price -= expression_price;
+        expressions_stack.pop_back();
+    }
+}
+
+void substituteColumns(QueryNode & query_node, const QueryTreeNodes & table_expressions, const ContextPtr & context)
+{
+    static constexpr UInt64 COLUMN_PENALTY = 10 * 1024 * 1024;
+    static constexpr Int64 INDEX_PRICE = -1'000'000'000'000'000'000;
+
+    for (const auto & table_expression : table_expressions)
+    {
+        auto snapshot = getStorageSnapshot(table_expression);
+        if (!snapshot || !snapshot->metadata)
+            continue;
+
+        const auto column_sizes = snapshot->storage.getColumnSizes();
+        if (column_sizes.empty())
+            return;
+
+        auto query_tree_constraint = snapshot->metadata->getConstraints().getQueryTreeData(context, table_expression);
+        const auto & graph = query_tree_constraint.getGraph();
+
+        auto run_for_all = [&](const auto function)
+        {
+            function(query_node.getProjectionNode());
+
+            if (query_node.hasWhere())
+                function(query_node.getWhere());
+
+            if (query_node.hasPrewhere())
+                function(query_node.getPrewhere());
+
+            if (query_node.hasHaving())
+                function(query_node.getHaving());
+        };
+
+        std::set<UInt64> components;
+        QueryTreeNodePtrWithHashMap<UInt64> query_node_to_component;
+        std::unordered_set<std::string> column_names;
+
+        run_for_all([&](QueryTreeNodePtr & node)
+        {
+            ComponentCollectorVisitor component_collector{components, query_node_to_component, graph};
+            component_collector.visit(node);
+            ColumnNameCollectorVisitor column_name_collector{column_names, &query_node_to_component};
+            column_name_collector.visit(node);
+        });
+
+        ColumnPriceByName column_prices;
+        const auto primary_key = snapshot->metadata->getColumnsRequiredForPrimaryKey();
+
+        for (const auto & [column_name, column_size] : column_sizes)
+            column_prices.insert_or_assign(column_name, ColumnPrice(column_size.data_compressed + COLUMN_PENALTY, column_size.data_uncompressed));
+
+        for (const auto & column_name : primary_key)
+            column_prices.insert_or_assign(column_name, ColumnPrice(INDEX_PRICE, INDEX_PRICE));
+
+        for (const auto & column_name : column_names)
+            column_prices.insert_or_assign(column_name, ColumnPrice(0, 0));
+
+        std::unordered_map<UInt64, QueryTreeNodePtr> id_to_query_node_map;
+        std::vector<UInt64> components_list;
+
+        for (const auto component_id : components)
+        {
+            auto component = graph.getComponent(component_id);
+            if (component.size() == 1)
+                id_to_query_node_map[component_id] = component.front();
+            else
+                components_list.push_back(component_id);
+        }
+
+        std::vector<QueryTreeNodePtr> expressions_stack;
+        ColumnPrice min_price(std::numeric_limits<Int64>::max(), std::numeric_limits<Int64>::max());
+        std::vector<QueryTreeNodePtr> min_expressions;
+
+        bruteForce(graph,
+                   components_list,
+                   0,
+                   column_prices,
+                   ColumnPrice(0, 0),
+                   expressions_stack,
+                   min_price,
+                   min_expressions);
+
+        for (size_t i = 0; i < components_list.size(); ++i)
+            id_to_query_node_map[components_list[i]] = min_expressions[i];
+
+        SubstituteColumnVisitor substitute_column{query_node_to_component, id_to_query_node_map, context};
+
+        run_for_all([&](QueryTreeNodePtr & node)
+        {
+            substitute_column.visit(node);
+        });
+    }
+}
+
+void optimizeWithConstraints(Analyzer::CNF & cnf, const QueryTreeNodes & table_expressions, const ContextPtr & context)
+{
+    cnf.pullNotOutFunctions(context);
+
+    for (const auto & table_expression : table_expressions)
+    {
+        auto snapshot = getStorageSnapshot(table_expression);
+        if (!snapshot || !snapshot->metadata)
+            continue;
+
+        const auto & constraints = snapshot->metadata->getConstraints();
+        const auto & query_tree_constraints = constraints.getQueryTreeData(context, table_expression);
+        const auto & compare_graph = query_tree_constraints.getGraph();
+        cnf.filterAlwaysTrueGroups([&](const auto & group)
+           {
+               /// remove always true groups from CNF
+               return !checkIfGroupAlwaysTrueFullMatch(group, query_tree_constraints) && !checkIfGroupAlwaysTrueGraph(group, compare_graph);
+           })
+           .filterAlwaysFalseAtoms([&](const Analyzer::CNF::AtomicFormula & atom)
+           {
+               /// remove always false atoms from CNF
+               return !checkIfAtomAlwaysFalseFullMatch(atom, query_tree_constraints) && !checkIfAtomAlwaysFalseGraph(atom, compare_graph);
+           })
+           .transformAtoms([&](const auto & atom)
+           {
+               return replaceTermsToConstants(atom, compare_graph);
+           })
+           .reduce();
+    }
+
+    cnf.pushNotIntoFunctions(context);
+
+    const auto & settings = context->getSettingsRef();
+    if (settings.optimize_append_index)
+        addIndexConstraint(cnf, table_expressions, context);
+}
+
+void optimizeNode(QueryTreeNodePtr & node, const QueryTreeNodes & table_expressions, const ContextPtr & context)
+{
+    const auto & settings = context->getSettingsRef();
+
+    auto cnf = tryConvertQueryToCNF(node, context);
+    if (!cnf)
+        return;
+
+    if (settings.optimize_using_constraints)
+        optimizeWithConstraints(*cnf, table_expressions, context);
+
+    auto new_node = cnf->toQueryTree(context);
+    node = std::move(new_node);
+}
+
+class ConvertQueryToCNFVisitor : public InDepthQueryTreeVisitorWithContext<ConvertQueryToCNFVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<ConvertQueryToCNFVisitor>;
+    using Base::Base;
+
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        auto * query_node = node->as<QueryNode>();
+        if (!query_node)
+            return;
+
+        auto table_expressions = extractTableExpressions(query_node->getJoinTree());
+
+        const auto & context = getContext();
+        const auto & settings = context->getSettingsRef();
+
+        bool has_filter = false;
+        const auto optimize_filter = [&](QueryTreeNodePtr & filter_node)
+        {
+            if (filter_node == nullptr)
+                return;
+
+            optimizeNode(filter_node, table_expressions, context);
+            has_filter = true;
+        };
+
+        optimize_filter(query_node->getWhere());
+        optimize_filter(query_node->getPrewhere());
+        optimize_filter(query_node->getHaving());
+
+        if (has_filter && settings.optimize_substitute_columns)
+            substituteColumns(*query_node, table_expressions, context);
+    }
+};
+
+}
+
+void ConvertLogicalExpressionToCNFPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+{
+    const auto & settings = context->getSettingsRef();
+    if (!settings.convert_query_to_cnf)
+        return;
+
+    ConvertQueryToCNFVisitor visitor(std::move(context));
+    visitor.visit(query_tree_node);
+}
+
+}
diff --git a/src/Analyzer/Passes/ConvertQueryToCNFPass.h b/src/Analyzer/Passes/ConvertQueryToCNFPass.h
new file mode 100644
index 00000000000..5ed874db006
--- /dev/null
+++ b/src/Analyzer/Passes/ConvertQueryToCNFPass.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <Analyzer/IQueryTreePass.h>
+
+namespace DB
+{
+
+class ConvertLogicalExpressionToCNFPass final : public IQueryTreePass
+{
+public:
+    String getName() override { return "ConvertLogicalExpressionToCNFPass"; }
+
+    String getDescription() override { return "Convert logical expression to CNF and apply optimizations using constraints"; }
+
+    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+};
+
+}
diff --git a/src/Analyzer/Passes/CrossToInnerJoinPass.cpp b/src/Analyzer/Passes/CrossToInnerJoinPass.cpp
index 4f62d6ef068..d4877d23f28 100644
--- a/src/Analyzer/Passes/CrossToInnerJoinPass.cpp
+++ b/src/Analyzer/Passes/CrossToInnerJoinPass.cpp
@@ -1,5 +1,7 @@
 #include <Analyzer/Passes/CrossToInnerJoinPass.h>
 
+#include <DataTypes/getLeastSupertype.h>
+
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 
 #include <Analyzer/JoinNode.h>
@@ -152,25 +154,34 @@ public:
         QueryTreeNodes other_conditions;
         exctractJoinConditions(where_condition, equi_conditions, other_conditions);
         bool can_convert_cross_to_inner = false;
-        for (auto & cond : equi_conditions)
+        for (auto & condition : equi_conditions)
         {
-            auto left_src = getExpressionSource(getEquiArgument(cond, 0));
-            auto right_src = getExpressionSource(getEquiArgument(cond, 1));
-            if (left_src.second && right_src.second && left_src.first && right_src.first)
-            {
-                bool can_join_on = (findInTableExpression(left_src.first, left_table) && findInTableExpression(right_src.first, right_table))
-                    || (findInTableExpression(left_src.first, right_table) && findInTableExpression(right_src.first, left_table));
+            const auto & lhs_equi_argument = getEquiArgument(condition, 0);
+            const auto & rhs_equi_argument = getEquiArgument(condition, 1);
 
-                if (can_join_on)
+            DataTypes key_types = {lhs_equi_argument->getResultType(), rhs_equi_argument->getResultType()};
+            DataTypePtr common_key_type = tryGetLeastSupertype(key_types);
+
+            /// If there is common key type, we can join on this condition
+            if (common_key_type)
+            {
+                auto left_src = getExpressionSource(lhs_equi_argument);
+                auto right_src = getExpressionSource(rhs_equi_argument);
+
+                if (left_src.second && right_src.second && left_src.first && right_src.first)
                 {
-                    can_convert_cross_to_inner = true;
-                    continue;
+                    if ((findInTableExpression(left_src.first, left_table) && findInTableExpression(right_src.first, right_table)) ||
+                        (findInTableExpression(left_src.first, right_table) && findInTableExpression(right_src.first, left_table)))
+                    {
+                        can_convert_cross_to_inner = true;
+                        continue;
+                    }
                 }
             }
 
             /// Can't join on this condition, move it to other conditions
-            other_conditions.push_back(cond);
-            cond = nullptr;
+            other_conditions.push_back(condition);
+            condition = nullptr;
         }
 
         if (!can_convert_cross_to_inner)
diff --git a/src/Analyzer/Passes/CustomizeFunctionsPass.cpp b/src/Analyzer/Passes/CustomizeFunctionsPass.cpp
deleted file mode 100644
index 3333008a0c0..00000000000
--- a/src/Analyzer/Passes/CustomizeFunctionsPass.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-#include <Analyzer/Passes/CustomizeFunctionsPass.h>
-
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/IAggregateFunction.h>
-
-#include <Functions/FunctionFactory.h>
-
-#include <Interpreters/Context.h>
-
-#include <Analyzer/InDepthQueryTreeVisitor.h>
-#include <Analyzer/FunctionNode.h>
-
-namespace DB
-{
-
-namespace
-{
-
-class CustomizeFunctionsVisitor : public InDepthQueryTreeVisitorWithContext<CustomizeFunctionsVisitor>
-{
-public:
-    using Base = InDepthQueryTreeVisitorWithContext<CustomizeFunctionsVisitor>;
-    using Base::Base;
-
-    void visitImpl(QueryTreeNodePtr & node) const
-    {
-        auto * function_node = node->as<FunctionNode>();
-        if (!function_node)
-            return;
-
-        const auto & settings = getSettings();
-
-        /// After successful function replacement function name and function name lowercase must be recalculated
-        auto function_name = function_node->getFunctionName();
-        auto function_name_lowercase = Poco::toLower(function_name);
-
-        if (function_node->isAggregateFunction() || function_node->isWindowFunction())
-        {
-            auto count_distinct_implementation_function_name = String(settings.count_distinct_implementation);
-
-            /// Replace aggregateFunctionIfDistinct into aggregateFunctionDistinctIf to make execution more optimal
-            if (function_name_lowercase.ends_with("ifdistinct"))
-            {
-                size_t prefix_length = function_name_lowercase.size() - strlen("ifdistinct");
-                auto updated_function_name = function_name_lowercase.substr(0, prefix_length) + "DistinctIf";
-                resolveAggregateOrWindowFunctionNode(*function_node, updated_function_name);
-                function_name = function_node->getFunctionName();
-                function_name_lowercase = Poco::toLower(function_name);
-            }
-
-            /** Move -OrNull suffix ahead, this should execute after add -OrNull suffix.
-              * Used to rewrite aggregate functions with -OrNull suffix in some cases.
-              * Example: sumIfOrNull.
-              * Result: sumOrNullIf.
-              */
-            if (function_name.ends_with("OrNull"))
-            {
-                auto function_properies = AggregateFunctionFactory::instance().tryGetProperties(function_name);
-                if (function_properies && !function_properies->returns_default_when_only_null)
-                {
-                    size_t function_name_size = function_name.size();
-
-                    static constexpr std::array<std::string_view, 4> suffixes_to_replace = {"MergeState", "Merge", "State", "If"};
-                    for (const auto & suffix : suffixes_to_replace)
-                    {
-                        auto suffix_string_value = String(suffix);
-                        auto suffix_to_check = suffix_string_value + "OrNull";
-
-                        if (!function_name.ends_with(suffix_to_check))
-                            continue;
-
-                        auto updated_function_name = function_name.substr(0, function_name_size - suffix_to_check.size()) + "OrNull" + suffix_string_value;
-                        resolveAggregateOrWindowFunctionNode(*function_node, updated_function_name);
-                        function_name = function_node->getFunctionName();
-                        function_name_lowercase = Poco::toLower(function_name);
-                        break;
-                    }
-                }
-            }
-
-            return;
-        }
-
-        if (settings.transform_null_in)
-        {
-            auto function_result_type = function_node->getResultType();
-
-            static constexpr std::array<std::pair<std::string_view, std::string_view>, 4> in_function_to_replace_null_in_function_map =
-            {{
-                {"in", "nullIn"},
-                {"notin", "notNullIn"},
-                {"globalin", "globalNullIn"},
-                {"globalnotin", "globalNotNullIn"},
-            }};
-
-            for (const auto & [in_function_name, in_function_name_to_replace] : in_function_to_replace_null_in_function_map)
-            {
-                if (function_name_lowercase == in_function_name)
-                {
-                    resolveOrdinaryFunctionNode(*function_node, String(in_function_name_to_replace));
-                    function_name = function_node->getFunctionName();
-                    function_name_lowercase = Poco::toLower(function_name);
-                    break;
-                }
-            }
-        }
-    }
-
-    static inline void resolveAggregateOrWindowFunctionNode(FunctionNode & function_node, const String & aggregate_function_name)
-    {
-        auto function_aggregate_function = function_node.getAggregateFunction();
-
-        AggregateFunctionProperties properties;
-        auto aggregate_function = AggregateFunctionFactory::instance().get(aggregate_function_name,
-            function_aggregate_function->getArgumentTypes(),
-            function_aggregate_function->getParameters(),
-            properties);
-
-        if (function_node.isAggregateFunction())
-            function_node.resolveAsAggregateFunction(std::move(aggregate_function));
-        else if (function_node.isWindowFunction())
-            function_node.resolveAsWindowFunction(std::move(aggregate_function));
-    }
-
-    inline void resolveOrdinaryFunctionNode(FunctionNode & function_node, const String & function_name) const
-    {
-        auto function = FunctionFactory::instance().get(function_name, getContext());
-        function_node.resolveAsFunction(function->build(function_node.getArgumentColumns()));
-    }
-};
-
-}
-
-void CustomizeFunctionsPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
-{
-    CustomizeFunctionsVisitor visitor(std::move(context));
-    visitor.visit(query_tree_node);
-}
-
-}
diff --git a/src/Analyzer/Passes/CustomizeFunctionsPass.h b/src/Analyzer/Passes/CustomizeFunctionsPass.h
deleted file mode 100644
index 7145099ca4c..00000000000
--- a/src/Analyzer/Passes/CustomizeFunctionsPass.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <Analyzer/IQueryTreePass.h>
-
-namespace DB
-{
-
-/** Customize aggregate functions and `in` functions implementations.
-  *
-  * Example: SELECT countDistinct();
-  * Result: SELECT countDistinctImplementation();
-  * Function countDistinctImplementation is taken from settings.count_distinct_implementation.
-  */
-class CustomizeFunctionsPass final : public IQueryTreePass
-{
-public:
-    String getName() override { return "CustomizeFunctions"; }
-
-    String getDescription() override { return "Customize implementation of aggregate functions, and in functions."; }
-
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
-
-};
-
-}
diff --git a/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp b/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp
index 20f1713f8c2..0cf5310a3ad 100644
--- a/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp
+++ b/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp
@@ -32,17 +32,17 @@ enum class GroupByKind
     GROUPING_SETS
 };
 
-class GroupingFunctionResolveVisitor : public InDepthQueryTreeVisitor<GroupingFunctionResolveVisitor>
+class GroupingFunctionResolveVisitor : public InDepthQueryTreeVisitorWithContext<GroupingFunctionResolveVisitor>
 {
 public:
     GroupingFunctionResolveVisitor(GroupByKind group_by_kind_,
         QueryTreeNodePtrWithHashMap<size_t> aggregation_key_to_index_,
         ColumnNumbersList grouping_sets_keys_indices_,
         ContextPtr context_)
-        : group_by_kind(group_by_kind_)
+        : InDepthQueryTreeVisitorWithContext(std::move(context_))
+        , group_by_kind(group_by_kind_)
         , aggregation_key_to_index(std::move(aggregation_key_to_index_))
         , grouping_sets_keys_indexes(std::move(grouping_sets_keys_indices_))
-        , context(std::move(context_))
     {
     }
 
@@ -71,7 +71,7 @@ public:
         FunctionOverloadResolverPtr grouping_function_resolver;
         bool add_grouping_set_column = false;
 
-        bool force_grouping_standard_compatibility = context->getSettingsRef().force_grouping_standard_compatibility;
+        bool force_grouping_standard_compatibility = getSettings().force_grouping_standard_compatibility;
         size_t aggregation_keys_size = aggregation_key_to_index.size();
 
         switch (group_by_kind)
@@ -132,7 +132,6 @@ private:
     GroupByKind group_by_kind;
     QueryTreeNodePtrWithHashMap<size_t> aggregation_key_to_index;
     ColumnNumbersList grouping_sets_keys_indexes;
-    ContextPtr context;
 };
 
 void resolveGroupingFunctions(QueryTreeNodePtr & query_node, ContextPtr context)
@@ -164,12 +163,17 @@ void resolveGroupingFunctions(QueryTreeNodePtr & query_node, ContextPtr context)
                 grouping_sets_used_aggregation_keys_list.emplace_back();
                 auto & grouping_sets_used_aggregation_keys = grouping_sets_used_aggregation_keys_list.back();
 
+                QueryTreeNodePtrWithHashSet used_keys_in_set;
+
                 for (auto & grouping_set_key_node : grouping_set_keys_list_node_typed.getNodes())
                 {
+                    if (used_keys_in_set.contains(grouping_set_key_node))
+                        continue;
+                    used_keys_in_set.insert(grouping_set_key_node);
+                    grouping_sets_used_aggregation_keys.push_back(grouping_set_key_node);
+
                     if (aggregation_key_to_index.contains(grouping_set_key_node))
                         continue;
-
-                    grouping_sets_used_aggregation_keys.push_back(grouping_set_key_node);
                     aggregation_key_to_index.emplace(grouping_set_key_node, aggregation_node_index);
                     ++aggregation_node_index;
                 }
diff --git a/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp b/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp
new file mode 100644
index 00000000000..13f8025f5ea
--- /dev/null
+++ b/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp
@@ -0,0 +1,242 @@
+#include <Analyzer/Passes/LogicalExpressionOptimizerPass.h>
+
+#include <Functions/FunctionFactory.h>
+
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/ConstantNode.h>
+#include <Analyzer/HashUtils.h>
+
+namespace DB
+{
+
+class LogicalExpressionOptimizerVisitor : public InDepthQueryTreeVisitorWithContext<LogicalExpressionOptimizerVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<LogicalExpressionOptimizerVisitor>;
+
+    explicit LogicalExpressionOptimizerVisitor(ContextPtr context)
+        : Base(std::move(context))
+    {}
+
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        auto * function_node = node->as<FunctionNode>();
+
+        if (!function_node)
+            return;
+
+        if (function_node->getFunctionName() == "or")
+        {
+            tryReplaceOrEqualsChainWithIn(node);
+            return;
+        }
+
+        if (function_node->getFunctionName() == "and")
+        {
+            tryReplaceAndEqualsChainsWithConstant(node);
+            return;
+        }
+    }
+private:
+    void tryReplaceAndEqualsChainsWithConstant(QueryTreeNodePtr & node)
+    {
+        auto & function_node = node->as<FunctionNode &>();
+        assert(function_node.getFunctionName() == "and");
+
+        if (function_node.getResultType()->isNullable())
+            return;
+
+        QueryTreeNodes and_operands;
+
+        QueryTreeNodePtrWithHashMap<const ConstantNode *> node_to_constants;
+
+        for (const auto & argument : function_node.getArguments())
+        {
+            auto * argument_function = argument->as<FunctionNode>();
+            if (!argument_function || argument_function->getFunctionName() != "equals")
+            {
+                and_operands.push_back(argument);
+                continue;
+            }
+
+            const auto & equals_arguments = argument_function->getArguments().getNodes();
+            const auto & lhs = equals_arguments[0];
+            const auto & rhs = equals_arguments[1];
+
+            const auto has_and_with_different_constant = [&](const QueryTreeNodePtr & expression, const ConstantNode * constant)
+            {
+                if (auto it = node_to_constants.find(expression); it != node_to_constants.end())
+                {
+                    if (!it->second->isEqual(*constant))
+                        return true;
+                }
+                else
+                {
+                    node_to_constants.emplace(expression, constant);
+                    and_operands.push_back(argument);
+                }
+
+                return false;
+            };
+
+            bool collapse_to_false = false;
+
+            if (const auto * lhs_literal = lhs->as<ConstantNode>())
+                collapse_to_false = has_and_with_different_constant(rhs, lhs_literal);
+            else if (const auto * rhs_literal = rhs->as<ConstantNode>())
+                collapse_to_false = has_and_with_different_constant(lhs, rhs_literal);
+            else
+                and_operands.push_back(argument);
+
+            if (collapse_to_false)
+            {
+                auto false_value = std::make_shared<ConstantValue>(0u, function_node.getResultType());
+                auto false_node = std::make_shared<ConstantNode>(std::move(false_value));
+                node = std::move(false_node);
+                return;
+            }
+        }
+
+        if (and_operands.size() == function_node.getArguments().getNodes().size())
+            return;
+
+        if (and_operands.size() == 1)
+        {
+            /// AND operator can have UInt8 or bool as its type.
+            /// bool is used if a bool constant is at least one operand.
+            /// Because we reduce the number of operands here by eliminating the same equality checks,
+            /// the only situation we can end up here is we had AND check where all the equality checks are the same so we know the type is UInt8.
+            /// Otherwise, we will have > 1 operands and we don't have to do anything.
+            assert(!function_node.getResultType()->isNullable() && and_operands[0]->getResultType()->equals(*function_node.getResultType()));
+            node = std::move(and_operands[0]);
+            return;
+        }
+
+        auto and_function_resolver = FunctionFactory::instance().get("and", getContext());
+        function_node.getArguments().getNodes() = std::move(and_operands);
+        function_node.resolveAsFunction(and_function_resolver);
+    }
+
+    void tryReplaceOrEqualsChainWithIn(QueryTreeNodePtr & node)
+    {
+        auto & function_node = node->as<FunctionNode &>();
+        assert(function_node.getFunctionName() == "or");
+
+        QueryTreeNodes or_operands;
+
+        QueryTreeNodePtrWithHashMap<QueryTreeNodes> node_to_equals_functions;
+        QueryTreeNodePtrWithHashMap<QueryTreeNodeConstRawPtrWithHashSet> node_to_constants;
+
+        for (const auto & argument : function_node.getArguments())
+        {
+            auto * argument_function = argument->as<FunctionNode>();
+            if (!argument_function || argument_function->getFunctionName() != "equals")
+            {
+                or_operands.push_back(argument);
+                continue;
+            }
+
+            /// collect all equality checks (x = value)
+
+            const auto & equals_arguments = argument_function->getArguments().getNodes();
+            const auto & lhs = equals_arguments[0];
+            const auto & rhs = equals_arguments[1];
+
+            const auto add_equals_function_if_not_present = [&](const auto & expression_node, const ConstantNode * constant)
+            {
+                auto & constant_set = node_to_constants[expression_node];
+                if (!constant_set.contains(constant))
+                {
+                    constant_set.insert(constant);
+                    node_to_equals_functions[expression_node].push_back(argument);
+                }
+            };
+
+            if (const auto * lhs_literal = lhs->as<ConstantNode>();
+                lhs_literal && !lhs_literal->getValue().isNull())
+                add_equals_function_if_not_present(rhs, lhs_literal);
+            else if (const auto * rhs_literal = rhs->as<ConstantNode>();
+                     rhs_literal && !rhs_literal->getValue().isNull())
+                add_equals_function_if_not_present(lhs, rhs_literal);
+            else
+                or_operands.push_back(argument);
+        }
+
+        auto in_function_resolver = FunctionFactory::instance().get("in", getContext());
+
+        for (auto & [expression, equals_functions] : node_to_equals_functions)
+        {
+            const auto & settings = getSettings();
+            if (equals_functions.size() < settings.optimize_min_equality_disjunction_chain_length && !expression.node->getResultType()->lowCardinality())
+            {
+                std::move(equals_functions.begin(), equals_functions.end(), std::back_inserter(or_operands));
+                continue;
+            }
+
+            Tuple args;
+            args.reserve(equals_functions.size());
+            /// first we create tuple from RHS of equals functions
+            for (const auto & equals : equals_functions)
+            {
+                const auto * equals_function = equals->as<FunctionNode>();
+                assert(equals_function && equals_function->getFunctionName() == "equals");
+
+                const auto & equals_arguments = equals_function->getArguments().getNodes();
+                if (const auto * rhs_literal = equals_arguments[1]->as<ConstantNode>())
+                {
+                    args.push_back(rhs_literal->getValue());
+                }
+                else
+                {
+                    const auto * lhs_literal = equals_arguments[0]->as<ConstantNode>();
+                    assert(lhs_literal);
+                    args.push_back(lhs_literal->getValue());
+                }
+            }
+
+            auto rhs_node = std::make_shared<ConstantNode>(std::move(args));
+
+            auto in_function = std::make_shared<FunctionNode>("in");
+
+            QueryTreeNodes in_arguments;
+            in_arguments.reserve(2);
+            in_arguments.push_back(expression.node);
+            in_arguments.push_back(std::move(rhs_node));
+
+            in_function->getArguments().getNodes() = std::move(in_arguments);
+            in_function->resolveAsFunction(in_function_resolver);
+
+            or_operands.push_back(std::move(in_function));
+        }
+
+        if (or_operands.size() == function_node.getArguments().getNodes().size())
+            return;
+
+        if (or_operands.size() == 1)
+        {
+            /// if the result type of operand is the same as the result type of OR
+            /// we can replace OR with the operand
+            if (or_operands[0]->getResultType()->equals(*function_node.getResultType()))
+            {
+                node = std::move(or_operands[0]);
+                return;
+            }
+
+            /// otherwise add a stub 0 to make OR correct
+            or_operands.push_back(std::make_shared<ConstantNode>(static_cast<UInt8>(0)));
+        }
+
+        auto or_function_resolver = FunctionFactory::instance().get("or", getContext());
+        function_node.getArguments().getNodes() = std::move(or_operands);
+        function_node.resolveAsFunction(or_function_resolver);
+    }
+};
+
+void LogicalExpressionOptimizerPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+{
+    LogicalExpressionOptimizerVisitor visitor(std::move(context));
+    visitor.visit(query_tree_node);
+}
+
+}
diff --git a/src/Analyzer/Passes/LogicalExpressionOptimizerPass.h b/src/Analyzer/Passes/LogicalExpressionOptimizerPass.h
new file mode 100644
index 00000000000..05c10ddc685
--- /dev/null
+++ b/src/Analyzer/Passes/LogicalExpressionOptimizerPass.h
@@ -0,0 +1,82 @@
+#pragma once
+
+#include <Analyzer/IQueryTreePass.h>
+
+namespace DB
+{
+
+/**
+ * This pass tries to do optimizations on logical expression:
+ *
+ * 1. Replaces chains of equality functions inside an OR with a single IN operator.
+ * The replacement is done if:
+ *  - one of the operands  of the equality function is a constant
+ *  - length of chain is at least 'optimize_min_equality_disjunction_chain_length' long OR the expression has type of LowCardinality
+ *
+ * E.g. (optimize_min_equality_disjunction_chain_length = 2)
+ * -------------------------------
+ * SELECT *
+ * FROM table
+ * WHERE a = 1 OR b = 'test' OR a = 2;
+ *
+ * will be transformed into
+ *
+ * SELECT *
+ * FROM TABLE
+ * WHERE b = 'test' OR a IN (1, 2);
+ * -------------------------------
+ *
+ * 2. Removes duplicate OR checks
+ * -------------------------------
+ * SELECT *
+ * FROM table
+ * WHERE a = 1 OR b = 'test' OR a = 1;
+ *
+ * will be transformed into
+ *
+ * SELECT *
+ * FROM TABLE
+ * WHERE a = 1 OR b = 'test';
+ * -------------------------------
+ *
+ * 3. Replaces AND chains with a single constant.
+ * The replacement is done if:
+ *  - one of the operands  of the equality function is a constant
+ *  - constants are different for same expression
+ * -------------------------------
+ * SELECT *
+ * FROM table
+ * WHERE a = 1 AND b = 'test' AND a = 2;
+ *
+ * will be transformed into
+ *
+ * SELECT *
+ * FROM TABLE
+ * WHERE 0;
+ * -------------------------------
+ *
+ * 4. Removes duplicate AND checks
+ * -------------------------------
+ * SELECT *
+ * FROM table
+ * WHERE a = 1 AND b = 'test' AND a = 1;
+ *
+ * will be transformed into
+ *
+ * SELECT *
+ * FROM TABLE
+ * WHERE a = 1 AND b = 'test';
+ * -------------------------------
+ */
+
+class LogicalExpressionOptimizerPass final : public IQueryTreePass
+{
+public:
+    String getName() override { return "LogicalExpressionOptimizer"; }
+
+    String getDescription() override { return "Transform equality chain to a single IN function or a constant if possible"; }
+
+    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+};
+
+}
diff --git a/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp b/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
index 705018d108f..d36be98751c 100644
--- a/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
+++ b/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
@@ -46,8 +46,7 @@ public:
         }
         else if (function_node->getFunctionName() == "sum" &&
             first_argument_constant_literal.getType() == Field::Types::UInt64 &&
-            first_argument_constant_literal.get<UInt64>() == 1 &&
-            !getSettings().aggregate_functions_null_for_empty)
+            first_argument_constant_literal.get<UInt64>() == 1)
         {
             resolveAsCountAggregateFunction(*function_node);
             function_node->getArguments().getNodes().clear();
diff --git a/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp b/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp
index f6c4d2bc15d..5ed52f1210b 100644
--- a/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp
+++ b/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp
@@ -38,6 +38,9 @@ public:
         if (!query->hasGroupBy())
             return;
 
+        if (query->isGroupByWithCube() || query->isGroupByWithRollup())
+            return;
+
         auto & group_by = query->getGroupBy().getNodes();
         if (query->isGroupByWithGroupingSets())
         {
@@ -69,8 +72,7 @@ private:
         for (auto it = function_arguments.rbegin(); it != function_arguments.rend(); ++it)
             candidates.push_back({ *it, is_deterministic });
 
-        // Using DFS we traverse function tree and try to find if it uses other keys as function arguments.
-        // TODO: Also process CONSTANT here. We can simplify GROUP BY x, x + 1 to GROUP BY x.
+        /// Using DFS we traverse function tree and try to find if it uses other keys as function arguments.
         while (!candidates.empty())
         {
             auto [candidate, parents_are_only_deterministic] = candidates.back();
@@ -108,6 +110,7 @@ private:
                     return false;
             }
         }
+
         return true;
     }
 
diff --git a/src/Analyzer/Passes/QueryAnalysisPass.cpp b/src/Analyzer/Passes/QueryAnalysisPass.cpp
index 45d8154f39b..aa915e48d35 100644
--- a/src/Analyzer/Passes/QueryAnalysisPass.cpp
+++ b/src/Analyzer/Passes/QueryAnalysisPass.cpp
@@ -32,19 +32,22 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 
 #include <TableFunctions/TableFunctionFactory.h>
+#include <Formats/FormatFactory.h>
 
 #include <Databases/IDatabase.h>
 
 #include <Storages/IStorage.h>
 #include <Storages/StorageSet.h>
+#include <Storages/StorageJoin.h>
 
+#include <Interpreters/misc.h>
 #include <Interpreters/convertFieldToType.h>
 #include <Interpreters/StorageID.h>
-#include <Interpreters/Context.h>
 #include <Interpreters/SelectQueryOptions.h>
-#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Interpreters/Set.h>
-#include <Interpreters/misc.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
 
@@ -73,6 +76,7 @@
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/QueryTreeBuilder.h>
 #include <Analyzer/IQueryTreeNode.h>
+#include <Analyzer/Identifier.h>
 
 namespace ProfileEvents
 {
@@ -92,6 +96,7 @@ namespace ErrorCodes
     extern const int CYCLIC_ALIASES;
     extern const int INCORRECT_RESULT_OF_SCALAR_SUBQUERY;
     extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int MULTIPLE_EXPRESSIONS_FOR_ALIAS;
     extern const int TYPE_MISMATCH;
     extern const int AMBIGUOUS_IDENTIFIER;
@@ -108,11 +113,13 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
     extern const int ALIAS_REQUIRED;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int ILLEGAL_PREWHERE;
     extern const int UNKNOWN_TABLE;
+    extern const int ILLEGAL_COLUMN;
+    extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
+    extern const int FUNCTION_CANNOT_HAVE_PARAMETERS;
 }
 
-/** Query analyzer implementation overview. Please check documentation in QueryAnalysisPass.h before.
+/** Query analyzer implementation overview. Please check documentation in QueryAnalysisPass.h first.
   * And additional documentation for each method, where special cases are described in detail.
   *
   * Each node in query must be resolved. For each query tree node resolved state is specific.
@@ -153,7 +160,7 @@ namespace ErrorCodes
   *
   * TODO: This does not supported properly before, because matchers could not be resolved from aliases.
   *
-  * Identifiers are resolved with following resules:
+  * Identifiers are resolved with following rules:
   * Resolution starts with current scope.
   * 1. Try to resolve identifier from expression scope arguments. Lambda expression arguments are greatest priority.
   * 2. Try to resolve identifier from aliases.
@@ -190,14 +197,9 @@ namespace ErrorCodes
   * lookup should not be continued, and exception must be thrown because if lookup continues identifier can be resolved from parent scope.
   *
   * TODO: Update exception messages
-  * TODO: JOIN TREE subquery constant columns
   * TODO: Table identifiers with optional UUID.
   * TODO: Lookup functions arrayReduce(sum, [1, 2, 3]);
-  * TODO: SELECT (compound_expression).*, (compound_expression).COLUMNS are not supported on parser level.
-  * TODO: SELECT a.b.c.*, a.b.c.COLUMNS. Qualified matcher where identifier size is greater than 2 are not supported on parser level.
   * TODO: Support function identifier resolve from parent query scope, if lambda in parent scope does not capture any columns.
-  * TODO: Support group_by_use_nulls.
-  * TODO: Scalar subqueries cache.
   */
 
 namespace
@@ -361,6 +363,12 @@ struct IdentifierResolveResult
     }
 };
 
+struct IdentifierResolveState
+{
+    IdentifierResolveResult resolve_result;
+    bool cyclic_identifier_resolve = false;
+};
+
 struct IdentifierResolveSettings
 {
     /// Allow to check join tree during identifier resolution
@@ -463,6 +471,12 @@ public:
             alias_name_to_expressions[node_alias].push_back(node);
         }
 
+        if (const auto * function = node->as<FunctionNode>())
+        {
+            if (AggregateFunctionFactory::instance().isAggregateFunctionName(function->getFunctionName()))
+                ++aggregate_functions_counter;
+        }
+
         expressions.emplace_back(node);
     }
 
@@ -481,6 +495,12 @@ public:
                 alias_name_to_expressions.erase(it);
         }
 
+        if (const auto * function = top_expression->as<FunctionNode>())
+        {
+            if (AggregateFunctionFactory::instance().isAggregateFunctionName(function->getFunctionName()))
+                --aggregate_functions_counter;
+        }
+
         expressions.pop_back();
     }
 
@@ -499,6 +519,11 @@ public:
         return alias_name_to_expressions.contains(alias);
     }
 
+    bool hasAggregateFunction() const
+    {
+        return aggregate_functions_counter > 0;
+    }
+
     QueryTreeNodePtr getExpressionWithAlias(const std::string & alias) const
     {
         auto expression_it = alias_name_to_expressions.find(alias);
@@ -545,6 +570,7 @@ public:
 
 private:
     QueryTreeNodes expressions;
+    size_t aggregate_functions_counter = 0;
     std::unordered_map<std::string, QueryTreeNodes> alias_name_to_expressions;
 };
 
@@ -675,9 +701,15 @@ struct IdentifierResolveScope
         }
 
         if (auto * union_node = scope_node->as<UnionNode>())
+        {
             context = union_node->getContext();
+        }
         else if (auto * query_node = scope_node->as<QueryNode>())
+        {
             context = query_node->getContext();
+            group_by_use_nulls = context->getSettingsRef().group_by_use_nulls &&
+                (query_node->isGroupByWithGroupingSets() || query_node->isGroupByWithRollup() || query_node->isGroupByWithCube());
+        }
     }
 
     QueryTreeNodePtr scope_node;
@@ -687,7 +719,7 @@ struct IdentifierResolveScope
     ContextPtr context;
 
     /// Identifier lookup to result
-    std::unordered_map<IdentifierLookup, IdentifierResolveResult, IdentifierLookupHash> identifier_lookup_to_result;
+    std::unordered_map<IdentifierLookup, IdentifierResolveState, IdentifierLookupHash> identifier_lookup_to_resolve_state;
 
     /// Lambda argument can be expression like constant, column, or it can be function
     std::unordered_map<std::string, QueryTreeNodePtr> expression_argument_name_to_node;
@@ -725,9 +757,14 @@ struct IdentifierResolveScope
     /// Table expression node to data
     std::unordered_map<QueryTreeNodePtr, TableExpressionData> table_expression_node_to_data;
 
+    QueryTreeNodePtrWithHashSet nullable_group_by_keys;
+
     /// Use identifier lookup to result cache
     bool use_identifier_lookup_to_result_cache = true;
 
+    /// Apply nullability to aggregation keys
+    bool group_by_use_nulls = false;
+
     /// JOINs count
     size_t joins_count = 0;
 
@@ -799,11 +836,11 @@ struct IdentifierResolveScope
     [[maybe_unused]] void dump(WriteBuffer & buffer) const
     {
         buffer << "Scope node " << scope_node->formatASTForErrorMessage() << '\n';
-        buffer << "Identifier lookup to result " << identifier_lookup_to_result.size() << '\n';
-        for (const auto & [identifier, result] : identifier_lookup_to_result)
+        buffer << "Identifier lookup to resolve state " << identifier_lookup_to_resolve_state.size() << '\n';
+        for (const auto & [identifier, state] : identifier_lookup_to_resolve_state)
         {
             buffer << "Identifier " << identifier.dump() << " resolve result ";
-            result.dump(buffer);
+            state.resolve_result.dump(buffer);
             buffer << '\n';
         }
 
@@ -1156,15 +1193,17 @@ private:
 
     static void replaceNodesWithPositionalArguments(QueryTreeNodePtr & node_list, const QueryTreeNodes & projection_nodes, IdentifierResolveScope & scope);
 
-    static void validateLimitOffsetExpression(QueryTreeNodePtr & expression_node, const String & expression_description, IdentifierResolveScope & scope);
+    static void convertLimitOffsetExpression(QueryTreeNodePtr & expression_node, const String & expression_description, IdentifierResolveScope & scope);
 
     static void validateTableExpressionModifiers(const QueryTreeNodePtr & table_expression_node, IdentifierResolveScope & scope);
 
     static void validateJoinTableExpressionWithoutAlias(const QueryTreeNodePtr & join_node, const QueryTreeNodePtr & table_expression_node, IdentifierResolveScope & scope);
 
+    static std::pair<bool, UInt64> recursivelyCollectMaxOrdinaryExpressions(QueryTreeNodePtr & node, QueryTreeNodes & into);
+
     static void expandGroupByAll(QueryNode & query_tree_node_typed);
 
-    static std::pair<bool, UInt64> recursivelyCollectMaxOrdinaryExpressions(QueryTreeNodePtr & node, QueryTreeNodes & into);
+    static std::string rewriteAggregateFunctionNameIfNeeded(const std::string & aggregate_function_name, const ContextPtr & context);
 
     /// Resolve identifier functions
 
@@ -1299,6 +1338,9 @@ private:
     /// Global resolve expression node to projection names map
     std::unordered_map<QueryTreeNodePtr, ProjectionNames> resolved_expressions;
 
+    /// Global resolve expression node to tree size
+    std::unordered_map<QueryTreeNodePtr, size_t> node_to_tree_size;
+
     /// Global scalar subquery to scalar value map
     std::unordered_map<QueryTreeNodePtrWithHash, Block> scalar_subquery_to_scalar_value;
 
@@ -1540,41 +1582,20 @@ void QueryAnalyzer::collectCompoundExpressionValidIdentifiersForTypoCorrection(
     const Identifier & valid_identifier_prefix,
     std::unordered_set<Identifier> & valid_identifiers_result)
 {
-    std::vector<std::pair<Identifier, const IDataType *>> identifiers_with_types_to_process;
-    identifiers_with_types_to_process.emplace_back(valid_identifier_prefix, compound_expression_type.get());
-
-    while (!identifiers_with_types_to_process.empty())
+    IDataType::forEachSubcolumn([&](const auto &, const auto & name, const auto &)
     {
-        auto [identifier, type] = identifiers_with_types_to_process.back();
-        identifiers_with_types_to_process.pop_back();
+        Identifier subcolumn_indentifier(name);
+        size_t new_identifier_size = valid_identifier_prefix.getPartsSize() + subcolumn_indentifier.getPartsSize();
 
-        if (identifier.getPartsSize() + 1 > unresolved_identifier.getPartsSize())
-            continue;
-
-        while (const DataTypeArray * array = checkAndGetDataType<DataTypeArray>(type))
-            type = array->getNestedType().get();
-
-        const DataTypeTuple * tuple = checkAndGetDataType<DataTypeTuple>(type);
-
-        if (!tuple)
-            continue;
-
-        const auto & tuple_element_names = tuple->getElementNames();
-        size_t tuple_element_names_size = tuple_element_names.size();
-
-        for (size_t i = 0; i < tuple_element_names_size; ++i)
+        if (new_identifier_size == unresolved_identifier.getPartsSize())
         {
-            const auto & element_name = tuple_element_names[i];
-            const auto & element_type = tuple->getElements()[i];
+            auto new_identifier = valid_identifier_prefix;
+            for (const auto & part : subcolumn_indentifier)
+                new_identifier.push_back(part);
 
-            identifier.push_back(element_name);
-
-            valid_identifiers_result.insert(identifier);
-            identifiers_with_types_to_process.emplace_back(identifier, element_type.get());
-
-            identifier.pop_back();
+            valid_identifiers_result.insert(std::move(new_identifier));
         }
-    }
+    }, ISerialization::SubstreamData(compound_expression_type->getDefaultSerialization()));
 }
 
 /// Get valid identifiers for typo correction from table expression
@@ -1827,7 +1848,10 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
 
     Block scalar_block;
 
-    QueryTreeNodePtrWithHash node_with_hash(node);
+    auto node_without_alias = node->clone();
+    node_without_alias->removeAlias();
+
+    QueryTreeNodePtrWithHash node_with_hash(node_without_alias);
     auto scalar_value_it = scalar_subquery_to_scalar_value.find(node_with_hash);
 
     if (scalar_value_it != scalar_subquery_to_scalar_value.end())
@@ -1917,21 +1941,7 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
                   *
                   * Example: SELECT (SELECT 2 AS x, x)
                   */
-                NameSet block_column_names;
-                size_t unique_column_name_counter = 1;
-
-                for (auto & column_with_type : block)
-                {
-                    if (!block_column_names.contains(column_with_type.name))
-                    {
-                        block_column_names.insert(column_with_type.name);
-                        continue;
-                    }
-
-                    column_with_type.name += '_';
-                    column_with_type.name += std::to_string(unique_column_name_counter);
-                    ++unique_column_name_counter;
-                }
+                makeUniqueColumnNamesInBlock(block);
 
                 scalar_block.insert({
                     ColumnTuple::create(block.getColumns()),
@@ -1963,26 +1973,10 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
         auto constant_node = std::make_shared<ConstantNode>(std::move(constant_value), node);
 
         if (constant_node->getValue().isNull())
-        {
-            std::string cast_type = constant_node->getResultType()->getName();
-            std::string cast_function_name = "_CAST";
-
-            auto cast_type_constant_value = std::make_shared<ConstantValue>(std::move(cast_type), std::make_shared<DataTypeString>());
-            auto cast_type_constant_node = std::make_shared<ConstantNode>(std::move(cast_type_constant_value));
-
-            auto cast_function_node = std::make_shared<FunctionNode>(cast_function_name);
-            cast_function_node->getArguments().getNodes().push_back(constant_node);
-            cast_function_node->getArguments().getNodes().push_back(std::move(cast_type_constant_node));
-
-            auto cast_function = FunctionFactory::instance().get(cast_function_name, context);
-            cast_function_node->resolveAsFunction(cast_function->build(cast_function_node->getArgumentColumns()));
-
-            node = std::move(cast_function_node);
-        }
+            node = buildCastFunction(constant_node, constant_node->getResultType(), context);
         else
-        {
             node = std::move(constant_node);
-        }
+
         return;
     }
 
@@ -2091,7 +2085,7 @@ void QueryAnalyzer::replaceNodesWithPositionalArguments(QueryTreeNodePtr & node_
     }
 }
 
-void QueryAnalyzer::validateLimitOffsetExpression(QueryTreeNodePtr & expression_node, const String & expression_description, IdentifierResolveScope & scope)
+void QueryAnalyzer::convertLimitOffsetExpression(QueryTreeNodePtr & expression_node, const String & expression_description, IdentifierResolveScope & scope)
 {
     const auto * limit_offset_constant_node = expression_node->as<ConstantNode>();
     if (!limit_offset_constant_node || !isNativeNumber(removeNullable(limit_offset_constant_node->getResultType())))
@@ -2101,11 +2095,17 @@ void QueryAnalyzer::validateLimitOffsetExpression(QueryTreeNodePtr & expression_
             expression_node->formatASTForErrorMessage(),
             scope.scope_node->formatASTForErrorMessage());
 
-    Field converted = convertFieldToType(limit_offset_constant_node->getValue(), DataTypeUInt64());
-    if (converted.isNull())
+    Field converted_value = convertFieldToType(limit_offset_constant_node->getValue(), DataTypeUInt64());
+    if (converted_value.isNull())
         throw Exception(ErrorCodes::INVALID_LIMIT_EXPRESSION,
             "{} numeric constant expression is not representable as UInt64",
             expression_description);
+
+    auto constant_value = std::make_shared<ConstantValue>(std::move(converted_value), std::make_shared<DataTypeUInt64>());
+    auto result_constant_node = std::make_shared<ConstantNode>(std::move(constant_value));
+    result_constant_node->getSourceExpression() = limit_offset_constant_node->getSourceExpression();
+
+    expression_node = std::move(result_constant_node);
 }
 
 void QueryAnalyzer::validateTableExpressionModifiers(const QueryTreeNodePtr & table_expression_node, IdentifierResolveScope & scope)
@@ -2226,9 +2226,72 @@ void QueryAnalyzer::expandGroupByAll(QueryNode & query_tree_node_typed)
 
     for (auto & node : projection_list.getNodes())
         recursivelyCollectMaxOrdinaryExpressions(node, group_by_nodes);
-
 }
 
+std::string QueryAnalyzer::rewriteAggregateFunctionNameIfNeeded(const std::string & aggregate_function_name, const ContextPtr & context)
+{
+    std::string result_aggregate_function_name = aggregate_function_name;
+    auto aggregate_function_name_lowercase = Poco::toLower(aggregate_function_name);
+
+    const auto & settings = context->getSettingsRef();
+
+    if (aggregate_function_name_lowercase == "countdistinct")
+    {
+        result_aggregate_function_name = settings.count_distinct_implementation;
+    }
+    else if (aggregate_function_name_lowercase == "countdistinctif" || aggregate_function_name_lowercase == "countifdistinct")
+    {
+        result_aggregate_function_name = settings.count_distinct_implementation;
+        result_aggregate_function_name += "If";
+    }
+
+    /// Replace aggregateFunctionIfDistinct into aggregateFunctionDistinctIf to make execution more optimal
+    if (result_aggregate_function_name.ends_with("ifdistinct"))
+    {
+        size_t prefix_length = result_aggregate_function_name.size() - strlen("ifdistinct");
+        result_aggregate_function_name = result_aggregate_function_name.substr(0, prefix_length) + "DistinctIf";
+   }
+
+    bool need_add_or_null = settings.aggregate_functions_null_for_empty && !result_aggregate_function_name.ends_with("OrNull");
+    if (need_add_or_null)
+    {
+        auto properties = AggregateFunctionFactory::instance().tryGetProperties(result_aggregate_function_name);
+        if (!properties->returns_default_when_only_null)
+            result_aggregate_function_name += "OrNull";
+    }
+
+    /** Move -OrNull suffix ahead, this should execute after add -OrNull suffix.
+      * Used to rewrite aggregate functions with -OrNull suffix in some cases.
+      * Example: sumIfOrNull.
+      * Result: sumOrNullIf.
+      */
+    if (result_aggregate_function_name.ends_with("OrNull"))
+    {
+        auto function_properies = AggregateFunctionFactory::instance().tryGetProperties(result_aggregate_function_name);
+        if (function_properies && !function_properies->returns_default_when_only_null)
+        {
+            size_t function_name_size = result_aggregate_function_name.size();
+
+            static constexpr std::array<std::string_view, 4> suffixes_to_replace = {"MergeState", "Merge", "State", "If"};
+            for (const auto & suffix : suffixes_to_replace)
+            {
+                auto suffix_string_value = String(suffix);
+                auto suffix_to_check = suffix_string_value + "OrNull";
+
+                if (!result_aggregate_function_name.ends_with(suffix_to_check))
+                    continue;
+
+                result_aggregate_function_name = result_aggregate_function_name.substr(0, function_name_size - suffix_to_check.size());
+                result_aggregate_function_name += "OrNull";
+                result_aggregate_function_name += suffix_string_value;
+
+                break;
+            }
+        }
+    }
+
+    return result_aggregate_function_name;
+}
 
 /// Resolve identifier functions implementation
 
@@ -2256,14 +2319,26 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveTableIdentifierFromDatabaseCatalog(con
 
     StorageID storage_id(database_name, table_name);
     storage_id = context->resolveStorageID(storage_id);
-    auto storage = DatabaseCatalog::instance().tryGetTable(storage_id, context);
+    bool is_temporary_table = storage_id.getDatabaseName() == DatabaseCatalog::TEMPORARY_DATABASE;
+
+    StoragePtr storage;
+
+    if (is_temporary_table)
+        storage = DatabaseCatalog::instance().getTable(storage_id, context);
+    else
+        storage = DatabaseCatalog::instance().tryGetTable(storage_id, context);
+
     if (!storage)
         return {};
 
     auto storage_lock = storage->lockForShare(context->getInitialQueryId(), context->getSettingsRef().lock_acquire_timeout);
     auto storage_snapshot = storage->getStorageSnapshot(storage->getInMemoryMetadataPtr(), context);
 
-    return std::make_shared<TableNode>(std::move(storage), std::move(storage_lock), std::move(storage_snapshot));
+    auto result = std::make_shared<TableNode>(std::move(storage), std::move(storage_lock), std::move(storage_snapshot));
+    if (is_temporary_table)
+        result->setTemporaryTableName(table_name);
+
+    return result;
 }
 
 /// Resolve identifier from compound expression
@@ -2282,7 +2357,7 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromCompoundExpression(const
 
     auto expression_type = compound_expression->getResultType();
 
-    if (!nestedIdentifierCanBeResolved(expression_type, nested_path))
+    if (!expression_type->hasSubcolumn(nested_path.getFullName()))
     {
         std::unordered_set<Identifier> valid_identifiers;
         collectCompoundExpressionValidIdentifiersForTypoCorrection(expression_identifier,
@@ -2309,10 +2384,15 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromCompoundExpression(const
             getHintsErrorMessageSuffix(hints));
     }
 
-    auto tuple_element_result = wrapExpressionNodeInTupleElement(compound_expression, nested_path);
-    resolveFunction(tuple_element_result, scope);
+    QueryTreeNodePtr get_subcolumn_function = std::make_shared<FunctionNode>("getSubcolumn");
+    auto & get_subcolumn_function_arguments_nodes = get_subcolumn_function->as<FunctionNode>()->getArguments().getNodes();
 
-    return tuple_element_result;
+    get_subcolumn_function_arguments_nodes.reserve(2);
+    get_subcolumn_function_arguments_nodes.push_back(compound_expression);
+    get_subcolumn_function_arguments_nodes.push_back(std::make_shared<ConstantNode>(nested_path.getFullName()));
+
+    resolveFunction(get_subcolumn_function, scope);
+    return get_subcolumn_function;
 }
 
 /** Resolve identifier from expression arguments.
@@ -2818,7 +2898,10 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromTableExpression(const Id
                 break;
 
             IdentifierLookup column_identifier_lookup = {qualified_identifier_with_removed_part, IdentifierLookupContext::EXPRESSION};
-            if (tryBindIdentifierToAliases(column_identifier_lookup, scope) ||
+            if (tryBindIdentifierToAliases(column_identifier_lookup, scope))
+                break;
+
+            if (table_expression_data.should_qualify_columns &&
                 tryBindIdentifierToTableExpressions(column_identifier_lookup, table_expression_node, scope))
                 break;
 
@@ -2922,11 +3005,39 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromJoin(const IdentifierLoo
 
             resolved_identifier = std::move(result_column_node);
         }
-        else if (scope.joins_count == 1 && scope.context->getSettingsRef().single_join_prefer_left_table)
+        else if (left_resolved_identifier->isEqual(*right_resolved_identifier, IQueryTreeNode::CompareOptions{.compare_aliases = false}))
         {
+            const auto & identifier_path_part = identifier_lookup.identifier.front();
+            auto * left_resolved_identifier_column = left_resolved_identifier->as<ColumnNode>();
+            auto * right_resolved_identifier_column = right_resolved_identifier->as<ColumnNode>();
+
+            if (left_resolved_identifier_column && right_resolved_identifier_column)
+            {
+                const auto & left_column_source_alias = left_resolved_identifier_column->getColumnSource()->getAlias();
+                const auto & right_column_source_alias = right_resolved_identifier_column->getColumnSource()->getAlias();
+
+                /** If column from right table was resolved using alias, we prefer column from right table.
+                  *
+                  * Example: SELECT dummy FROM system.one JOIN system.one AS A ON A.dummy = system.one.dummy;
+                  *
+                  * If alias is specified for left table, and alias is not specified for right table and identifier was resolved
+                  * without using left table alias, we prefer column from right table.
+                  *
+                  * Example: SELECT dummy FROM system.one AS A JOIN system.one ON A.dummy = system.one.dummy;
+                  *
+                  * Otherwise we prefer column from left table.
+                  */
+                if (identifier_path_part == right_column_source_alias)
+                    return right_resolved_identifier;
+                else if (!left_column_source_alias.empty() &&
+                    right_column_source_alias.empty() &&
+                    identifier_path_part != left_column_source_alias)
+                    return right_resolved_identifier;
+            }
+
             return left_resolved_identifier;
         }
-        else if (left_resolved_identifier->isEqual(*right_resolved_identifier, IQueryTreeNode::CompareOptions{.compare_aliases = false}))
+        else if (scope.joins_count == 1 && scope.context->getSettingsRef().single_join_prefer_left_table)
         {
             return left_resolved_identifier;
         }
@@ -2991,7 +3102,7 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromJoin(const IdentifierLoo
     {
         resolved_identifier = resolved_identifier->clone();
         auto & resolved_column = resolved_identifier->as<ColumnNode &>();
-        resolved_column.setColumnType(makeNullableSafe(resolved_column.getColumnType()));
+        resolved_column.setColumnType(makeNullableOrLowCardinalityNullable(resolved_column.getColumnType()));
     }
 
     return resolved_identifier;
@@ -3310,21 +3421,28 @@ IdentifierResolveResult QueryAnalyzer::tryResolveIdentifier(const IdentifierLook
     IdentifierResolveScope & scope,
     IdentifierResolveSettings identifier_resolve_settings)
 {
-    auto it = scope.identifier_lookup_to_result.find(identifier_lookup);
-    if (it != scope.identifier_lookup_to_result.end())
+    auto it = scope.identifier_lookup_to_resolve_state.find(identifier_lookup);
+    if (it != scope.identifier_lookup_to_resolve_state.end())
     {
-        if (!it->second.resolved_identifier)
+        if (it->second.cyclic_identifier_resolve)
             throw Exception(ErrorCodes::CYCLIC_ALIASES,
                 "Cyclic aliases for identifier '{}'. In scope {}",
                 identifier_lookup.identifier.getFullName(),
                 scope.scope_node->formatASTForErrorMessage());
 
-        if (scope.use_identifier_lookup_to_result_cache && !scope.non_cached_identifier_lookups_during_expression_resolve.contains(identifier_lookup))
-            return it->second;
-    }
+        if (!it->second.resolve_result.isResolved())
+            it->second.cyclic_identifier_resolve = true;
 
-    auto [insert_it, _] = scope.identifier_lookup_to_result.insert({identifier_lookup, IdentifierResolveResult()});
-    it = insert_it;
+        if (it->second.resolve_result.isResolved() &&
+            scope.use_identifier_lookup_to_result_cache &&
+            !scope.non_cached_identifier_lookups_during_expression_resolve.contains(identifier_lookup))
+            return it->second.resolve_result;
+    }
+    else
+    {
+        auto [insert_it, _] = scope.identifier_lookup_to_resolve_state.insert({identifier_lookup, IdentifierResolveState()});
+        it = insert_it;
+    }
 
     /// Resolve identifier from current scope
 
@@ -3403,15 +3521,18 @@ IdentifierResolveResult QueryAnalyzer::tryResolveIdentifier(const IdentifierLook
             resolve_result.resolve_place = IdentifierResolvePlace::DATABASE_CATALOG;
     }
 
-    it->second = resolve_result;
+    bool was_cyclic_identifier_resolve = it->second.cyclic_identifier_resolve;
+    if (!was_cyclic_identifier_resolve)
+        it->second.resolve_result = resolve_result;
+    it->second.cyclic_identifier_resolve = false;
 
     /** If identifier was not resolved, or during expression resolution identifier was explicitly added into non cached set,
       * or identifier caching was disabled in resolve scope we remove identifier lookup result from identifier lookup to result table.
       */
-    if (!resolve_result.resolved_identifier ||
+    if (!was_cyclic_identifier_resolve && (!resolve_result.resolved_identifier ||
         scope.non_cached_identifier_lookups_during_expression_resolve.contains(identifier_lookup) ||
-        !scope.use_identifier_lookup_to_result_cache)
-        scope.identifier_lookup_to_result.erase(it);
+        !scope.use_identifier_lookup_to_result_cache))
+        scope.identifier_lookup_to_resolve_state.erase(it);
 
     return resolve_result;
 }
@@ -3575,8 +3696,15 @@ QueryAnalyzer::QueryTreeNodesWithNames QueryAnalyzer::resolveQualifiedMatcher(Qu
     {
         auto result_type = expression_query_tree_node->getResultType();
 
-        while (const auto * array_type = typeid_cast<const DataTypeArray *>(result_type.get()))
-            result_type = array_type->getNestedType();
+        while (true)
+        {
+            if (const auto * array_type = typeid_cast<const DataTypeArray *>(result_type.get()))
+                result_type = array_type->getNestedType();
+            else if (const auto * map_type = typeid_cast<const DataTypeMap *>(result_type.get()))
+                result_type = map_type->getNestedType();
+            else
+                break;
+        }
 
         const auto * tuple_data_type = typeid_cast<const DataTypeTuple *>(result_type.get());
         if (!tuple_data_type)
@@ -3596,11 +3724,11 @@ QueryAnalyzer::QueryTreeNodesWithNames QueryAnalyzer::resolveQualifiedMatcher(Qu
             if (!matcher_node_typed.isMatchingColumn(element_name))
                 continue;
 
-            auto tuple_element_function = std::make_shared<FunctionNode>("tupleElement");
-            tuple_element_function->getArguments().getNodes().push_back(expression_query_tree_node);
-            tuple_element_function->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(element_name));
+            auto get_subcolumn_function = std::make_shared<FunctionNode>("getSubcolumn");
+            get_subcolumn_function->getArguments().getNodes().push_back(expression_query_tree_node);
+            get_subcolumn_function->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(element_name));
 
-            QueryTreeNodePtr function_query_node = tuple_element_function;
+            QueryTreeNodePtr function_query_node = get_subcolumn_function;
             resolveFunction(function_query_node, scope);
 
             qualified_matcher_element_identifier.push_back(element_name);
@@ -3625,7 +3753,7 @@ QueryAnalyzer::QueryTreeNodesWithNames QueryAnalyzer::resolveQualifiedMatcher(Qu
 
     if (!table_expression_node)
     {
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+        throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
             "Qualified matcher {} does not find table. In scope {}",
             matcher_node->formatASTForErrorMessage(),
             scope.scope_node->formatASTForErrorMessage());
@@ -3874,17 +4002,16 @@ ProjectionNames QueryAnalyzer::resolveMatcher(QueryTreeNodePtr & matcher_node, I
         matched_expression_nodes_with_names = resolveUnqualifiedMatcher(matcher_node, scope);
 
     std::unordered_map<const IColumnTransformerNode *, std::unordered_set<std::string>> strict_transformer_to_used_column_names;
-    auto add_strict_transformer_column_name = [&](const IColumnTransformerNode * transformer, const std::string & column_name)
+    for (const auto & transformer : matcher_node_typed.getColumnTransformers().getNodes())
     {
-        auto it = strict_transformer_to_used_column_names.find(transformer);
-        if (it == strict_transformer_to_used_column_names.end())
-        {
-            auto [inserted_it, _] = strict_transformer_to_used_column_names.emplace(transformer, std::unordered_set<std::string>());
-            it = inserted_it;
-        }
+        auto * except_transformer = transformer->as<ExceptColumnTransformerNode>();
+        auto * replace_transformer = transformer->as<ReplaceColumnTransformerNode>();
 
-        it->second.insert(column_name);
-    };
+        if (except_transformer && except_transformer->isStrict())
+            strict_transformer_to_used_column_names.emplace(except_transformer, std::unordered_set<std::string>());
+        else if (replace_transformer && replace_transformer->isStrict())
+            strict_transformer_to_used_column_names.emplace(replace_transformer, std::unordered_set<std::string>());
+    }
 
     ListNodePtr list = std::make_shared<ListNode>();
     ProjectionNames result_projection_names;
@@ -3939,12 +4066,12 @@ ProjectionNames QueryAnalyzer::resolveMatcher(QueryTreeNodePtr & matcher_node, I
             else if (auto * except_transformer = transformer->as<ExceptColumnTransformerNode>())
             {
                 if (apply_transformer_was_used || replace_transformer_was_used)
-                    break;
+                    continue;
 
                 if (except_transformer->isColumnMatching(column_name))
                 {
                     if (except_transformer->isStrict())
-                        add_strict_transformer_column_name(except_transformer, column_name);
+                        strict_transformer_to_used_column_names[except_transformer].insert(column_name);
 
                     node = {};
                     break;
@@ -3953,19 +4080,28 @@ ProjectionNames QueryAnalyzer::resolveMatcher(QueryTreeNodePtr & matcher_node, I
             else if (auto * replace_transformer = transformer->as<ReplaceColumnTransformerNode>())
             {
                 if (apply_transformer_was_used || replace_transformer_was_used)
-                    break;
-
-                replace_transformer_was_used = true;
+                    continue;
 
                 auto replace_expression = replace_transformer->findReplacementExpression(column_name);
                 if (!replace_expression)
                     continue;
 
+                replace_transformer_was_used = true;
+
                 if (replace_transformer->isStrict())
-                    add_strict_transformer_column_name(replace_transformer, column_name);
+                    strict_transformer_to_used_column_names[replace_transformer].insert(column_name);
 
                 node = replace_expression->clone();
                 node_projection_names = resolveExpressionNode(node, scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
+
+                /** If replace expression resolved as single node, we want to use replace column name as result projection name, instead
+                  * of using replace expression projection name.
+                  *
+                  * Example: SELECT * REPLACE id + 5 AS id FROM test_table;
+                  */
+                if (node_projection_names.size() == 1)
+                    node_projection_names[0] = column_name;
+
                 execute_replace_transformer = true;
             }
 
@@ -4050,22 +4186,12 @@ ProjectionNames QueryAnalyzer::resolveMatcher(QueryTreeNodePtr & matcher_node, I
                 non_matched_column_names.push_back(column_name);
         }
 
-        WriteBufferFromOwnString non_matched_column_names_buffer;
-        size_t non_matched_column_names_size = non_matched_column_names.size();
-        for (size_t i = 0; i < non_matched_column_names_size; ++i)
-        {
-            const auto & column_name = non_matched_column_names[i];
-
-            non_matched_column_names_buffer << column_name;
-            if (i + 1 != non_matched_column_names_size)
-                non_matched_column_names_buffer << ", ";
-        }
-
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "Strict {} column transformer {} expects following column(s) {}",
+            "Strict {} column transformer {} expects following column(s) : {}. In scope {}",
             toString(strict_transformer_type),
             strict_transformer->formatASTForErrorMessage(),
-            non_matched_column_names_buffer.str());
+            fmt::join(non_matched_column_names, ", "),
+            scope.scope_node->formatASTForErrorMessage());
     }
 
     matcher_node = std::move(list);
@@ -4359,17 +4485,28 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
     }
 
     bool is_special_function_in = false;
-    bool is_special_function_dict_get_or_join_get = false;
+    bool is_special_function_dict_get = false;
+    bool is_special_function_join_get = false;
     bool is_special_function_exists = false;
+    bool is_special_function_if = false;
 
     if (!lambda_expression_untyped)
     {
         is_special_function_in = isNameOfInFunction(function_name);
-        is_special_function_dict_get_or_join_get = functionIsJoinGet(function_name) || functionIsDictGet(function_name);
+        is_special_function_dict_get = functionIsDictGet(function_name);
+        is_special_function_join_get = functionIsJoinGet(function_name);
         is_special_function_exists = function_name == "exists";
+        is_special_function_if = function_name == "if";
 
-        /// Handle SELECT count(*) FROM test_table
-        if (Poco::toLower(function_name) == "count" && function_node_ptr->getArguments().getNodes().size() == 1)
+        auto function_name_lowercase = Poco::toLower(function_name);
+
+        /** Special handling for count and countState functions.
+          *
+          * Example: SELECT count(*) FROM test_table
+          * Example: SELECT countState(*) FROM test_table;
+          */
+        if (function_node_ptr->getArguments().getNodes().size() == 1 &&
+            (function_name_lowercase == "count" || function_name_lowercase == "countstate"))
         {
             auto * matcher_node = function_node_ptr->getArguments().getNodes().front()->as<MatcherNode>();
             if (matcher_node && matcher_node->isUnqualified())
@@ -4386,29 +4523,58 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
       * Otherwise replace identifier with identifier full name constant.
       * Validation that dictionary exists or table exists will be performed during function `getReturnType` method call.
       */
-    if (is_special_function_dict_get_or_join_get &&
+    if ((is_special_function_dict_get || is_special_function_join_get) &&
         !function_node_ptr->getArguments().getNodes().empty() &&
         function_node_ptr->getArguments().getNodes()[0]->getNodeType() == QueryTreeNodeType::IDENTIFIER)
     {
         auto & first_argument = function_node_ptr->getArguments().getNodes()[0];
-        auto & identifier_node = first_argument->as<IdentifierNode &>();
-        IdentifierLookup identifier_lookup{identifier_node.getIdentifier(), IdentifierLookupContext::EXPRESSION};
+        auto & first_argument_identifier = first_argument->as<IdentifierNode &>();
+        auto identifier = first_argument_identifier.getIdentifier();
+
+        IdentifierLookup identifier_lookup{identifier, IdentifierLookupContext::EXPRESSION};
         auto resolve_result = tryResolveIdentifier(identifier_lookup, scope);
 
         if (resolve_result.isResolved())
+        {
             first_argument = std::move(resolve_result.resolved_identifier);
+        }
         else
-            first_argument = std::make_shared<ConstantNode>(identifier_node.getIdentifier().getFullName());
+        {
+            size_t parts_size = identifier.getPartsSize();
+            if (parts_size < 1 || parts_size > 2)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Expected {} function first argument identifier to contain 1 or 2 parts. Actual '{}'. In scope {}",
+                    function_name,
+                    identifier.getFullName(),
+                    scope.scope_node->formatASTForErrorMessage());
+
+            if (is_special_function_dict_get)
+            {
+                scope.context->getExternalDictionariesLoader().assertDictionaryStructureExists(identifier.getFullName(), scope.context);
+            }
+            else
+            {
+                auto table_node = tryResolveTableIdentifierFromDatabaseCatalog(identifier, scope.context);
+                if (!table_node)
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Function {} first argument expected table identifier '{}'. In scope {}",
+                        function_name,
+                        identifier.getFullName(),
+                        scope.scope_node->formatASTForErrorMessage());
+
+                auto & table_node_typed = table_node->as<TableNode &>();
+                if (!std::dynamic_pointer_cast<StorageJoin>(table_node_typed.getStorage()))
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Function {} table '{}' should have engine StorageJoin. In scope {}",
+                        function_name,
+                        identifier.getFullName(),
+                        scope.scope_node->formatASTForErrorMessage());
+            }
+
+            first_argument = std::make_shared<ConstantNode>(identifier.getFullName());
+        }
     }
 
-    /// Resolve function arguments
-
-    bool allow_table_expressions = is_special_function_in || is_special_function_exists;
-    auto arguments_projection_names = resolveExpressionNodeList(function_node_ptr->getArgumentsNode(),
-        scope,
-        true /*allow_lambda_expression*/,
-        allow_table_expressions /*allow_table_expression*/);
-
     if (is_special_function_exists)
     {
         /// Rewrite EXISTS (subquery) into 1 IN (SELECT 1 FROM (subquery) LIMIT 1).
@@ -4417,25 +4583,105 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
         auto constant_data_type = std::make_shared<DataTypeUInt64>();
 
         auto in_subquery = std::make_shared<QueryNode>(Context::createCopy(scope.context));
+        in_subquery->setIsSubquery(true);
         in_subquery->getProjection().getNodes().push_back(std::make_shared<ConstantNode>(1UL, constant_data_type));
         in_subquery->getJoinTree() = exists_subquery_argument;
         in_subquery->getLimit() = std::make_shared<ConstantNode>(1UL, constant_data_type);
-        in_subquery->resolveProjectionColumns({NameAndTypePair("1", constant_data_type)});
-        in_subquery->setIsSubquery(true);
 
         function_node_ptr = std::make_shared<FunctionNode>("in");
         function_node_ptr->getArguments().getNodes() = {std::make_shared<ConstantNode>(1UL, constant_data_type), in_subquery};
         node = function_node_ptr;
         function_name = "in";
-
         is_special_function_in = true;
     }
 
+    if (is_special_function_if && !function_node_ptr->getArguments().getNodes().empty())
+    {
+        /** Handle special case with constant If function, even if some of the arguments are invalid.
+          *
+          * SELECT if(hasColumnInTable('system', 'numbers', 'not_existing_column'), not_existing_column, 5) FROM system.numbers;
+          */
+        auto & if_function_arguments = function_node_ptr->getArguments().getNodes();
+        auto if_function_condition = if_function_arguments[0];
+        resolveExpressionNode(if_function_condition, scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
+
+        auto constant_condition = tryExtractConstantFromConditionNode(if_function_condition);
+
+        if (constant_condition.has_value() && if_function_arguments.size() == 3)
+        {
+            QueryTreeNodePtr constant_if_result_node;
+            QueryTreeNodePtr possibly_invalid_argument_node;
+
+            if (*constant_condition)
+            {
+                possibly_invalid_argument_node = if_function_arguments[2];
+                constant_if_result_node = if_function_arguments[1];
+            }
+            else
+            {
+                possibly_invalid_argument_node = if_function_arguments[1];
+                constant_if_result_node = if_function_arguments[2];
+            }
+
+            bool apply_constant_if_optimization = false;
+
+            try
+            {
+                resolveExpressionNode(possibly_invalid_argument_node,
+                    scope,
+                    false /*allow_lambda_expression*/,
+                    false /*allow_table_expression*/);
+            }
+            catch (...)
+            {
+                apply_constant_if_optimization = true;
+            }
+
+            if (apply_constant_if_optimization)
+            {
+                auto result_projection_names = resolveExpressionNode(constant_if_result_node,
+                    scope,
+                    false /*allow_lambda_expression*/,
+                    false /*allow_table_expression*/);
+                node = std::move(constant_if_result_node);
+                return result_projection_names;
+            }
+        }
+    }
+
+    /// Resolve function arguments
+
+    bool allow_table_expressions = is_special_function_in;
+    auto arguments_projection_names = resolveExpressionNodeList(function_node_ptr->getArgumentsNode(),
+        scope,
+        true /*allow_lambda_expression*/,
+        allow_table_expressions /*allow_table_expression*/);
+
     auto & function_node = *function_node_ptr;
 
     /// Replace right IN function argument if it is table or table function with subquery that read ordinary columns
     if (is_special_function_in)
     {
+        if (scope.context->getSettingsRef().transform_null_in)
+        {
+            static constexpr std::array<std::pair<std::string_view, std::string_view>, 4> in_function_to_replace_null_in_function_map =
+            {{
+                {"in", "nullIn"},
+                {"notIn", "notNullIn"},
+                {"globalIn", "globalNullIn"},
+                {"globalNotIn", "globalNotNullIn"},
+            }};
+
+            for (const auto & [in_function_name, in_function_name_to_replace] : in_function_to_replace_null_in_function_map)
+            {
+                if (function_name == in_function_name)
+                {
+                    function_name = in_function_name_to_replace;
+                    break;
+                }
+            }
+        }
+
         auto & function_in_arguments_nodes = function_node.getArguments().getNodes();
         if (function_in_arguments_nodes.size() != 2)
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function '{}' expects 2 arguments", function_name);
@@ -4496,6 +4742,7 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
         auto & function_argument = function_arguments[function_argument_index];
 
         ColumnWithTypeAndName argument_column;
+        argument_column.name = arguments_projection_names[function_argument_index];
 
         /** If function argument is lambda, save lambda argument index and initialize argument type as DataTypeFunction
           * where function argument types are initialized with empty array of lambda arguments size.
@@ -4537,7 +4784,7 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
     }
 
     /// Calculate function projection name
-    ProjectionNames result_projection_names = {calculateFunctionProjectionName(node, parameters_projection_names, arguments_projection_names)};
+    ProjectionNames result_projection_names = { calculateFunctionProjectionName(node, parameters_projection_names, arguments_projection_names) };
 
     /** Try to resolve function as
       * 1. Lambda function in current scope. Example: WITH (x -> x + 1) AS lambda SELECT lambda(1);
@@ -4573,6 +4820,11 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
                     lambda_expression_untyped->formatASTForErrorMessage(),
                     scope.scope_node->formatASTForErrorMessage());
 
+            if (!parameters.empty())
+            {
+                throw Exception(ErrorCodes::FUNCTION_CANNOT_HAVE_PARAMETERS, "Function {} is not parametric", function_node.formatASTForErrorMessage());
+            }
+
             auto lambda_expression_clone = lambda_expression_untyped->clone();
 
             IdentifierResolveScope lambda_scope(lambda_expression_clone, &scope /*parent_scope*/);
@@ -4656,8 +4908,6 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
         }
     }
 
-    const auto & settings = scope.context->getSettingsRef();
-
     if (function_node.isWindowFunction())
     {
         if (!AggregateFunctionFactory::instance().isAggregateFunctionName(function_name))
@@ -4672,12 +4922,10 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
                 "Window function '{}' does not support lambda arguments",
                 function_name);
 
-        bool need_add_or_null = settings.aggregate_functions_null_for_empty && !function_name.ends_with("OrNull");
+        std::string aggregate_function_name = rewriteAggregateFunctionNameIfNeeded(function_name, scope.context);
 
         AggregateFunctionProperties properties;
-        auto aggregate_function = need_add_or_null
-            ? AggregateFunctionFactory::instance().get(function_name + "OrNull", argument_types, parameters, properties)
-            : AggregateFunctionFactory::instance().get(function_name, argument_types, parameters, properties);
+        auto aggregate_function = AggregateFunctionFactory::instance().get(aggregate_function_name, argument_types, parameters, properties);
 
         function_node.resolveAsWindowFunction(std::move(aggregate_function));
 
@@ -4693,9 +4941,12 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
     }
 
     FunctionOverloadResolverPtr function = UserDefinedExecutableFunctionFactory::instance().tryGet(function_name, scope.context, parameters);
+    bool is_executable_udf = false;
 
     if (!function)
         function = FunctionFactory::instance().tryGet(function_name, scope.context);
+    else
+        is_executable_udf = true;
 
     if (!function)
     {
@@ -4736,30 +4987,22 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
                 "Aggregate function '{}' does not support lambda arguments",
                 function_name);
 
-        auto function_name_lowercase = Poco::toLower(function_name);
-
-        if (function_name_lowercase == "countdistinct")
-        {
-            function_name = scope.context->getSettingsRef().count_distinct_implementation;
-        }
-        else if (function_name_lowercase == "countdistinctif" || function_name_lowercase == "countifdistinct")
-        {
-            function_name = scope.context->getSettingsRef().count_distinct_implementation;
-            function_name += "If";
-        }
-
-        bool need_add_or_null = settings.aggregate_functions_null_for_empty && !function_name.ends_with("OrNull");
-        if (need_add_or_null)
-            function_name += "OrNull";
+        std::string aggregate_function_name = rewriteAggregateFunctionNameIfNeeded(function_name, scope.context);
 
         AggregateFunctionProperties properties;
-        auto aggregate_function = AggregateFunctionFactory::instance().get(function_name, argument_types, parameters, properties);
+        auto aggregate_function = AggregateFunctionFactory::instance().get(aggregate_function_name, argument_types, parameters, properties);
 
         function_node.resolveAsAggregateFunction(std::move(aggregate_function));
 
         return result_projection_names;
     }
 
+    /// Executable UDFs may have parameters. They are checked in UserDefinedExecutableFunctionFactory.
+    if (!parameters.empty() && !is_executable_udf)
+    {
+        throw Exception(ErrorCodes::FUNCTION_CANNOT_HAVE_PARAMETERS, "Function {} is not parametric", function_name);
+    }
+
     /** For lambda arguments we need to initialize lambda argument types DataTypeFunction using `getLambdaArgumentTypes` function.
       * Then each lambda arguments are initialized with columns, where column source is lambda.
       * This information is important for later steps of query processing.
@@ -4861,13 +5104,16 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
                 arguments_projection_names[function_lambda_argument_index] = lambda_argument_projection_name_buffer.str();
             }
 
-            argument_types[function_lambda_argument_index] = std::make_shared<DataTypeFunction>(function_data_type_argument_types, lambda_to_resolve->getResultType());
-            argument_columns[function_lambda_argument_index].type = argument_types[function_lambda_argument_index];
+            auto lambda_resolved_type = std::make_shared<DataTypeFunction>(function_data_type_argument_types, lambda_to_resolve_typed.getExpression()->getResultType());
+            lambda_to_resolve_typed.resolve(lambda_resolved_type);
+
+            argument_types[function_lambda_argument_index] = lambda_resolved_type;
+            argument_columns[function_lambda_argument_index].type = lambda_resolved_type;
             function_arguments[function_lambda_argument_index] = std::move(lambda_to_resolve);
         }
 
         /// Recalculate function projection name after lambda resolution
-        result_projection_names = {calculateFunctionProjectionName(node, parameters_projection_names, arguments_projection_names)};
+        result_projection_names = { calculateFunctionProjectionName(node, parameters_projection_names, arguments_projection_names) };
     }
 
     /** Create SET column for special function IN to allow constant folding
@@ -4893,7 +5139,7 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
 
             /// Create constant set column for constant folding
 
-            auto column_set = ColumnSet::create(1, std::move(set));
+            auto column_set = ColumnSet::create(1, FutureSet(std::move(set)));
             argument_columns[1].column = ColumnConst::create(std::move(column_set), 1);
         }
 
@@ -4906,11 +5152,15 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
     {
         auto function_base = function->build(argument_columns);
 
+        /// Do not constant fold get scalar functions
+        bool disable_constant_folding = function_name == "__getScalar" || function_name == "shardNum" ||
+            function_name == "shardCount" || function_name == "hostName";
+
         /** If function is suitable for constant folding try to convert it to constant.
           * Example: SELECT plus(1, 1);
           * Result: SELECT 2;
           */
-        if (function_base->isSuitableForConstantFolding())
+        if (function_base->isSuitableForConstantFolding() && !disable_constant_folding)
         {
             auto result_type = function_base->getResultType();
             auto executable_function = function_base->prepare(argument_columns);
@@ -4930,7 +5180,8 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
             /** Do not perform constant folding if there are aggregate or arrayJoin functions inside function.
               * Example: SELECT toTypeName(sum(number)) FROM numbers(10);
               */
-            if (column && isColumnConst(*column) && (!hasAggregateFunctionNodes(node) && !hasFunctionNode(node, "arrayJoin")))
+            if (column && isColumnConst(*column) && !typeid_cast<const ColumnConst *>(column.get())->getDataColumn().isDummy() &&
+                (!hasAggregateFunctionNodes(node) && !hasFunctionNode(node, "arrayJoin")))
             {
                 /// Replace function node with result constant node
                 Field column_constant_value;
@@ -4981,6 +5232,8 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
   */
 ProjectionNames QueryAnalyzer::resolveExpressionNode(QueryTreeNodePtr & node, IdentifierResolveScope & scope, bool allow_lambda_expression, bool allow_table_expression)
 {
+    checkStackSize();
+
     auto resolved_expression_it = resolved_expressions.find(node);
     if (resolved_expression_it != resolved_expressions.end())
     {
@@ -5276,10 +5529,18 @@ ProjectionNames QueryAnalyzer::resolveExpressionNode(QueryTreeNodePtr & node, Id
         }
     }
 
+    validateTreeSize(node, scope.context->getSettingsRef().max_expanded_ast_elements, node_to_tree_size);
+
+    if (scope.nullable_group_by_keys.contains(node) && !scope.expressions_in_resolve_process_stack.hasAggregateFunction())
+    {
+        node = node->clone();
+        node->convertToNullable();
+    }
+
     /** Update aliases after expression node was resolved.
       * Do not update node in alias table if we resolve it for duplicate alias.
       */
-    if (!node_alias.empty() && use_alias_table)
+    if (!node_alias.empty() && use_alias_table && !scope.group_by_use_nulls)
     {
         auto it = scope.alias_name_to_expression_node.find(node_alias);
         if (it != scope.alias_name_to_expression_node.end())
@@ -5478,8 +5739,27 @@ void QueryAnalyzer::resolveInterpolateColumnsNodeList(QueryTreeNodePtr & interpo
     {
         auto & interpolate_node_typed = interpolate_node->as<InterpolateNode &>();
 
+        auto * column_to_interpolate = interpolate_node_typed.getExpression()->as<IdentifierNode>();
+        if (!column_to_interpolate)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "INTERPOLATE can work only for indentifiers, but {} is found",
+                interpolate_node_typed.getExpression()->formatASTForErrorMessage());
+        auto column_to_interpolate_name = column_to_interpolate->getIdentifier().getFullName();
+
         resolveExpressionNode(interpolate_node_typed.getExpression(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
-        resolveExpressionNode(interpolate_node_typed.getInterpolateExpression(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
+
+        bool is_column_constant = interpolate_node_typed.getExpression()->getNodeType() == QueryTreeNodeType::CONSTANT;
+
+        auto & interpolation_to_resolve = interpolate_node_typed.getInterpolateExpression();
+        IdentifierResolveScope interpolate_scope(interpolation_to_resolve, &scope /*parent_scope*/);
+
+        auto fake_column_node = std::make_shared<ColumnNode>(NameAndTypePair(column_to_interpolate_name, interpolate_node_typed.getExpression()->getResultType()), interpolate_node_typed.getExpression());
+        if (is_column_constant)
+            interpolate_scope.expression_argument_name_to_node.emplace(column_to_interpolate_name, fake_column_node);
+
+        resolveExpressionNode(interpolation_to_resolve, interpolate_scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
+
+        if (is_column_constant)
+            interpolation_to_resolve = interpolation_to_resolve->cloneAndReplace(fake_column_node, interpolate_node_typed.getExpression());
     }
 }
 
@@ -5687,10 +5967,19 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
 
     if (table_node)
     {
-        const auto & table_storage_id = table_node->getStorageID();
-        table_expression_data.database_name = table_storage_id.database_name;
-        table_expression_data.table_name = table_storage_id.table_name;
-        table_expression_data.table_expression_name = table_storage_id.getFullNameNotQuoted();
+        if (!table_node->getTemporaryTableName().empty())
+        {
+            table_expression_data.table_name = table_node->getTemporaryTableName();
+            table_expression_data.table_expression_name = table_node->getTemporaryTableName();
+        }
+        else
+        {
+            const auto & table_storage_id = table_node->getStorageID();
+            table_expression_data.database_name = table_storage_id.database_name;
+            table_expression_data.table_name = table_storage_id.table_name;
+            table_expression_data.table_expression_name = table_storage_id.getFullNameNotQuoted();
+        }
+
         table_expression_data.table_expression_description = "table";
     }
     else if (query_node || union_node)
@@ -5736,7 +6025,9 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
 
             if (column_default && column_default->kind == ColumnDefaultKind::Alias)
             {
-                auto column_node = std::make_shared<ColumnNode>(column_name_and_type, buildQueryTree(column_default->expression, scope.context), table_expression_node);
+                auto alias_expression = buildQueryTree(column_default->expression, scope.context);
+                alias_expression = buildCastFunction(alias_expression, column_name_and_type.type, scope.context, false /*resolve*/);
+                auto column_node = std::make_shared<ColumnNode>(column_name_and_type, std::move(alias_expression), table_expression_node);
                 column_name_to_column_node.emplace(column_name_and_type.name, column_node);
                 alias_columns_to_resolve.emplace_back(column_name_and_type.name, column_node);
             }
@@ -5807,6 +6098,18 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
     scope.table_expression_node_to_data.emplace(table_expression_node, std::move(table_expression_data));
 }
 
+bool findIdentifier(const FunctionNode & function)
+{
+    for (const auto & argument : function.getArguments())
+    {
+        if (argument->as<IdentifierNode>())
+            return true;
+        if (const auto * f = argument->as<FunctionNode>(); f && findIdentifier(*f))
+            return true;
+    }
+    return false;
+}
+
 /// Resolve table function node in scope
 void QueryAnalyzer::resolveTableFunction(QueryTreeNodePtr & table_function_node,
     IdentifierResolveScope & scope,
@@ -5818,12 +6121,11 @@ void QueryAnalyzer::resolveTableFunction(QueryTreeNodePtr & table_function_node,
     if (!nested_table_function)
         expressions_visitor.visit(table_function_node_typed.getArgumentsNode());
 
-    const auto & table_function_factory = TableFunctionFactory::instance();
     const auto & table_function_name = table_function_node_typed.getTableFunctionName();
 
     auto & scope_context = scope.context;
 
-    TableFunctionPtr table_function_ptr = table_function_factory.tryGet(table_function_name, scope_context);
+    TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().tryGet(table_function_name, scope_context);
     if (!table_function_ptr)
     {
         auto hints = TableFunctionFactory::instance().getHints(table_function_name);
@@ -5838,17 +6140,131 @@ void QueryAnalyzer::resolveTableFunction(QueryTreeNodePtr & table_function_node,
                 table_function_name);
     }
 
+    uint64_t use_structure_from_insertion_table_in_table_functions = scope_context->getSettingsRef().use_structure_from_insertion_table_in_table_functions;
     if (!nested_table_function &&
-        scope_context->getSettingsRef().use_structure_from_insertion_table_in_table_functions &&
+        use_structure_from_insertion_table_in_table_functions &&
         scope_context->hasInsertionTable() &&
         table_function_ptr->needStructureHint())
     {
         const auto & insertion_table = scope_context->getInsertionTable();
         if (!insertion_table.empty())
         {
-            auto insertion_table_storage = DatabaseCatalog::instance().getTable(insertion_table, scope_context);
-            const auto & structure_hint = insertion_table_storage->getInMemoryMetadataPtr()->columns;
-            table_function_ptr->setStructureHint(structure_hint);
+            const auto & insert_structure = DatabaseCatalog::instance().getTable(insertion_table, scope_context)->getInMemoryMetadataPtr()->getColumns();
+            DB::ColumnsDescription structure_hint;
+
+            bool use_columns_from_insert_query = true;
+
+            /// Insert table matches columns against SELECT expression by position, so we want to map
+            /// insert table columns to table function columns through names from SELECT expression.
+
+            auto insert_column = insert_structure.begin();
+            auto insert_structure_end = insert_structure.end();  /// end iterator of the range covered by possible asterisk
+            auto virtual_column_names = table_function_ptr->getVirtualsToCheckBeforeUsingStructureHint();
+            bool asterisk = false;
+            const auto & expression_list = scope.scope_node->as<QueryNode &>().getProjection();
+            auto expression = expression_list.begin();
+
+            /// We want to go through SELECT expression list and correspond each expression to column in insert table
+            /// which type will be used as a hint for the file structure inference.
+            for (; expression != expression_list.end() && insert_column != insert_structure_end; ++expression)
+            {
+                if (auto * identifier_node = (*expression)->as<IdentifierNode>())
+                {
+
+                    if (!virtual_column_names.contains(identifier_node->getIdentifier().getFullName()))
+                    {
+                        if (asterisk)
+                        {
+                            if (use_structure_from_insertion_table_in_table_functions == 1)
+                                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Asterisk cannot be mixed with column list in INSERT SELECT query.");
+
+                            use_columns_from_insert_query = false;
+                            break;
+                        }
+
+                        structure_hint.add({ identifier_node->getIdentifier().getFullName(), insert_column->type });
+                    }
+
+                    /// Once we hit asterisk we want to find end of the range covered by asterisk
+                    /// contributing every further SELECT expression to the tail of insert structure
+                    if (asterisk)
+                        --insert_structure_end;
+                    else
+                        ++insert_column;
+                }
+                else if (auto * matcher_node = (*expression)->as<MatcherNode>(); matcher_node && matcher_node->getMatcherType() == MatcherNodeType::ASTERISK)
+                {
+                    if (asterisk)
+                    {
+                        if (use_structure_from_insertion_table_in_table_functions == 1)
+                            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Only one asterisk can be used in INSERT SELECT query.");
+
+                        use_columns_from_insert_query = false;
+                        break;
+                    }
+                    if (!structure_hint.empty())
+                    {
+                        if (use_structure_from_insertion_table_in_table_functions == 1)
+                            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Asterisk cannot be mixed with column list in INSERT SELECT query.");
+
+                        use_columns_from_insert_query = false;
+                        break;
+                    }
+
+                    asterisk = true;
+                }
+                else if (auto * function = (*expression)->as<FunctionNode>())
+                {
+                    if (use_structure_from_insertion_table_in_table_functions == 2 && findIdentifier(*function))
+                    {
+                        use_columns_from_insert_query = false;
+                        break;
+                    }
+
+                    /// Once we hit asterisk we want to find end of the range covered by asterisk
+                    /// contributing every further SELECT expression to the tail of insert structure
+                    if (asterisk)
+                        --insert_structure_end;
+                    else
+                        ++insert_column;
+                }
+                else
+                {
+                    /// Once we hit asterisk we want to find end of the range covered by asterisk
+                    /// contributing every further SELECT expression to the tail of insert structure
+                    if (asterisk)
+                        --insert_structure_end;
+                    else
+                        ++insert_column;
+                }
+            }
+
+            if (use_structure_from_insertion_table_in_table_functions == 2 && !asterisk)
+            {
+                /// For input function we should check if input format supports reading subset of columns.
+                if (table_function_ptr->getName() == "input")
+                    use_columns_from_insert_query = FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(scope.context->getInsertFormat());
+                else
+                    use_columns_from_insert_query = table_function_ptr->supportsReadingSubsetOfColumns();
+            }
+
+            if (use_columns_from_insert_query)
+            {
+                if (expression == expression_list.end())
+                {
+                    /// Append tail of insert structure to the hint
+                    if (asterisk)
+                    {
+                        for (; insert_column != insert_structure_end; ++insert_column)
+                            structure_hint.add({ insert_column->name, insert_column->type });
+                    }
+
+                    if (!structure_hint.empty())
+                        table_function_ptr->setStructureHint(structure_hint);
+
+                } else if (use_structure_from_insertion_table_in_table_functions == 1)
+                    throw Exception(ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH, "Number of columns in insert table less than required by SELECT expression.");
+            }
         }
     }
 
@@ -5939,7 +6355,7 @@ void QueryAnalyzer::resolveTableFunction(QueryTreeNodePtr & table_function_node,
     auto table_function_ast = table_function_node_typed.toAST();
     table_function_ptr->parseArguments(table_function_ast, scope_context);
 
-    auto table_function_storage = table_function_ptr->execute(table_function_ast, scope_context, table_function_ptr->getName());
+    auto table_function_storage = scope_context->getQueryContext()->executeTableFunction(table_function_ast, table_function_ptr);
     table_function_node_typed.resolve(std::move(table_function_ptr), std::move(table_function_storage), scope_context);
 }
 
@@ -6103,13 +6519,6 @@ void QueryAnalyzer::resolveJoin(QueryTreeNodePtr & join_node, IdentifierResolveS
 
             IdentifierLookup identifier_lookup{identifier_node->getIdentifier(), IdentifierLookupContext::EXPRESSION};
             auto result_left_table_expression = tryResolveIdentifierFromJoinTreeNode(identifier_lookup, join_node_typed.getLeftTableExpression(), scope);
-            if (!result_left_table_expression && identifier_node->hasAlias())
-            {
-                std::vector<std::string> alias_identifier_parts = {identifier_node->getAlias()};
-                IdentifierLookup alias_identifier_lookup{Identifier(std::move(alias_identifier_parts)), IdentifierLookupContext::EXPRESSION};
-                result_left_table_expression = tryResolveIdentifierFromJoinTreeNode(alias_identifier_lookup, join_node_typed.getLeftTableExpression(), scope);
-            }
-
             if (!result_left_table_expression)
                 throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
                     "JOIN {} using identifier '{}' cannot be resolved from left table expression. In scope {}",
@@ -6125,13 +6534,6 @@ void QueryAnalyzer::resolveJoin(QueryTreeNodePtr & join_node, IdentifierResolveS
                     scope.scope_node->formatASTForErrorMessage());
 
             auto result_right_table_expression = tryResolveIdentifierFromJoinTreeNode(identifier_lookup, join_node_typed.getRightTableExpression(), scope);
-            if (!result_right_table_expression && identifier_node->hasAlias())
-            {
-                std::vector<std::string> alias_identifier_parts = {identifier_node->getAlias()};
-                IdentifierLookup alias_identifier_lookup{Identifier(std::move(alias_identifier_parts)), IdentifierLookupContext::EXPRESSION};
-                result_right_table_expression = tryResolveIdentifierFromJoinTreeNode(alias_identifier_lookup, join_node_typed.getRightTableExpression(), scope);
-            }
-
             if (!result_right_table_expression)
                 throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
                     "JOIN {} using identifier '{}' cannot be resolved from right table expression. In scope {}",
@@ -6223,6 +6625,21 @@ void QueryAnalyzer::resolveQueryJoinTreeNode(QueryTreeNodePtr & join_tree_node,
     {
         validateTableExpressionModifiers(join_tree_node, scope);
         initializeTableExpressionData(join_tree_node, scope);
+
+        auto & query_node = scope.scope_node->as<QueryNode &>();
+        auto & mutable_context = query_node.getMutableContext();
+
+        if (!mutable_context->isDistributed())
+        {
+            bool is_distributed = false;
+
+            if (auto * table_node = join_tree_node->as<TableNode>())
+                is_distributed = table_node->getStorage()->isRemote();
+            else if (auto * table_function_node = join_tree_node->as<TableFunctionNode>())
+                is_distributed = table_function_node->getStorage()->isRemote();
+
+            mutable_context->setDistributed(is_distributed);
+        }
     }
 
     auto add_table_expression_alias_into_scope = [&](const QueryTreeNodePtr & table_expression_node)
@@ -6275,12 +6692,11 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
     auto & query_node_typed = query_node->as<QueryNode &>();
     const auto & settings = scope.context->getSettingsRef();
 
-    if (settings.group_by_use_nulls)
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "GROUP BY use nulls is not supported");
-
     bool is_rollup_or_cube = query_node_typed.isGroupByWithRollup() || query_node_typed.isGroupByWithCube();
 
-    if (query_node_typed.isGroupByWithGroupingSets() && query_node_typed.isGroupByWithTotals())
+    if (query_node_typed.isGroupByWithGroupingSets()
+        && query_node_typed.isGroupByWithTotals()
+        && query_node_typed.getGroupBy().getNodes().size() != 1)
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "WITH TOTALS and GROUPING SETS are not supported together");
 
     if (query_node_typed.isGroupByWithGroupingSets() && is_rollup_or_cube)
@@ -6413,15 +6829,21 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
         resolveQueryJoinTreeNode(query_node_typed.getJoinTree(), scope, visitor);
     }
 
-    scope.use_identifier_lookup_to_result_cache = true;
+    if (!scope.group_by_use_nulls)
+        scope.use_identifier_lookup_to_result_cache = true;
 
     /// Resolve query node sections.
 
-    auto projection_columns = resolveProjectionExpressionNodeList(query_node_typed.getProjectionNode(), scope);
-    if (query_node_typed.getProjection().getNodes().empty())
-        throw Exception(ErrorCodes::EMPTY_LIST_OF_COLUMNS_QUERIED,
-            "Empty list of columns in projection. In scope {}",
-            scope.scope_node->formatASTForErrorMessage());
+    NamesAndTypes projection_columns;
+
+    if (!scope.group_by_use_nulls)
+    {
+        projection_columns = resolveProjectionExpressionNodeList(query_node_typed.getProjectionNode(), scope);
+        if (query_node_typed.getProjection().getNodes().empty())
+            throw Exception(ErrorCodes::EMPTY_LIST_OF_COLUMNS_QUERIED,
+                "Empty list of columns in projection. In scope {}",
+                scope.scope_node->formatASTForErrorMessage());
+    }
 
     if (query_node_typed.hasWith())
         resolveExpressionNodeList(query_node_typed.getWithNode(), scope, true /*allow_lambda_expression*/, false /*allow_table_expression*/);
@@ -6443,6 +6865,15 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
 
                 resolveExpressionNodeList(grouping_sets_keys_list_node, scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
             }
+
+            if (scope.group_by_use_nulls)
+            {
+                for (const auto & grouping_set : query_node_typed.getGroupBy().getNodes())
+                {
+                    for (const auto & group_by_elem : grouping_set->as<ListNode>()->getNodes())
+                        scope.nullable_group_by_keys.insert(group_by_elem);
+                }
+            }
         }
         else
         {
@@ -6450,6 +6881,12 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
                 replaceNodesWithPositionalArguments(query_node_typed.getGroupByNode(), query_node_typed.getProjection().getNodes(), scope);
 
             resolveExpressionNodeList(query_node_typed.getGroupByNode(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
+
+            if (scope.group_by_use_nulls)
+            {
+                for (const auto & group_by_elem : query_node_typed.getGroupBy().getNodes())
+                    scope.nullable_group_by_keys.insert(group_by_elem);
+            }
         }
     }
 
@@ -6473,13 +6910,13 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
     if (query_node_typed.hasLimitByLimit())
     {
         resolveExpressionNode(query_node_typed.getLimitByLimit(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
-        validateLimitOffsetExpression(query_node_typed.getLimitByLimit(), "LIMIT BY LIMIT", scope);
+        convertLimitOffsetExpression(query_node_typed.getLimitByLimit(), "LIMIT BY LIMIT", scope);
     }
 
     if (query_node_typed.hasLimitByOffset())
     {
         resolveExpressionNode(query_node_typed.getLimitByOffset(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
-        validateLimitOffsetExpression(query_node_typed.getLimitByOffset(), "LIMIT BY OFFSET", scope);
+        convertLimitOffsetExpression(query_node_typed.getLimitByOffset(), "LIMIT BY OFFSET", scope);
     }
 
     if (query_node_typed.hasLimitBy())
@@ -6493,13 +6930,22 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
     if (query_node_typed.hasLimit())
     {
         resolveExpressionNode(query_node_typed.getLimit(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
-        validateLimitOffsetExpression(query_node_typed.getLimit(), "LIMIT", scope);
+        convertLimitOffsetExpression(query_node_typed.getLimit(), "LIMIT", scope);
     }
 
     if (query_node_typed.hasOffset())
     {
         resolveExpressionNode(query_node_typed.getOffset(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
-        validateLimitOffsetExpression(query_node_typed.getOffset(), "OFFSET", scope);
+        convertLimitOffsetExpression(query_node_typed.getOffset(), "OFFSET", scope);
+    }
+
+    if (scope.group_by_use_nulls)
+    {
+        projection_columns = resolveProjectionExpressionNodeList(query_node_typed.getProjectionNode(), scope);
+        if (query_node_typed.getProjection().getNodes().empty())
+            throw Exception(ErrorCodes::EMPTY_LIST_OF_COLUMNS_QUERIED,
+                "Empty list of columns in projection. In scope {}",
+                scope.scope_node->formatASTForErrorMessage());
     }
 
     /** Resolve nodes with duplicate aliases.
@@ -6558,14 +7004,17 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
     if (query_node_typed.isGroupByAll())
         expandGroupByAll(query_node_typed);
 
-    if (query_node_typed.hasPrewhere())
-        assertNoFunctionNodes(query_node_typed.getPrewhere(),
-            "arrayJoin",
-            ErrorCodes::ILLEGAL_PREWHERE,
-            "ARRAY JOIN",
-            "in PREWHERE");
+    validateFilters(query_node);
+    validateAggregates(query_node, { .group_by_use_nulls = scope.group_by_use_nulls });
 
-    validateAggregates(query_node);
+    for (const auto & column : projection_columns)
+    {
+        if (isNotCreatable(column.type))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Invalid projection column with type {}. In scope {}",
+                column.type->getName(),
+                scope.scope_node->formatASTForErrorMessage());
+    }
 
     /** WITH section can be safely removed, because WITH section only can provide aliases to query expressions
       * and CTE for other sections to use.
diff --git a/src/Analyzer/Passes/QueryAnalysisPass.h b/src/Analyzer/Passes/QueryAnalysisPass.h
index 8b3a8a116e5..fa8778ebf76 100644
--- a/src/Analyzer/Passes/QueryAnalysisPass.h
+++ b/src/Analyzer/Passes/QueryAnalysisPass.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Parsers/IAST_fwd.h>
 #include <Interpreters/Context_fwd.h>
 #include <Analyzer/IQueryTreePass.h>
 
@@ -54,6 +53,7 @@ namespace DB
   * Replace `countDistinct` and `countIfDistinct` aggregate functions using setting count_distinct_implementation.
   * Add -OrNull suffix to aggregate functions if setting aggregate_functions_null_for_empty is true.
   * Function `exists` is converted into `in`.
+  * Functions `in`, `notIn`, `globalIn`, `globalNotIn` converted into `nullIn`, `notNullIn`, `globalNullIn`, `globalNotNullIn` if setting transform_null_in is true.
   *
   * For function `grouping` arguments are resolved, but it is planner responsibility to initialize it with concrete grouping function
   * based on group by kind and group by keys positions.
diff --git a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
index 4039e058b34..de264948d4c 100644
--- a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
+++ b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
@@ -17,7 +17,6 @@
 namespace DB
 {
 
-
 namespace
 {
 
@@ -90,9 +89,14 @@ private:
     static inline void resolveAsAggregateFunctionWithIf(FunctionNode & function_node, const DataTypes & argument_types)
     {
         auto result_type = function_node.getResultType();
+
+        std::string suffix = "If";
+        if (result_type->isNullable())
+            suffix = "OrNullIf";
+
         AggregateFunctionProperties properties;
         auto aggregate_function = AggregateFunctionFactory::instance().get(
-            function_node.getFunctionName() + (result_type->isNullable() ? "IfOrNull" : "If"),
+            function_node.getFunctionName() + suffix,
             argument_types,
             function_node.getAggregateFunction()->getParameters(),
             properties);
diff --git a/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp b/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp
new file mode 100644
index 00000000000..b28816e8ff3
--- /dev/null
+++ b/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp
@@ -0,0 +1,67 @@
+#include <Analyzer/Passes/ShardNumColumnToFunctionPass.h>
+
+#include <Storages/IStorage.h>
+
+#include <Functions/FunctionFactory.h>
+
+#include <Interpreters/Context.h>
+
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/ColumnNode.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/TableNode.h>
+#include <Analyzer/TableFunctionNode.h>
+
+namespace DB
+{
+
+namespace
+{
+
+class ShardNumColumnToFunctionVisitor : public InDepthQueryTreeVisitorWithContext<ShardNumColumnToFunctionVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<ShardNumColumnToFunctionVisitor>;
+    using Base::Base;
+
+    void visitImpl(QueryTreeNodePtr & node) const
+    {
+        auto * column_node = node->as<ColumnNode>();
+        if (!column_node)
+            return;
+
+        const auto & column = column_node->getColumn();
+        if (column.name != "_shard_num")
+            return;
+
+        auto column_source = column_node->getColumnSource();
+
+        auto * table_node = column_source->as<TableNode>();
+        auto * table_function_node = column_source->as<TableFunctionNode>();
+        if (!table_node && !table_function_node)
+            return;
+
+        const auto & storage = table_node ? table_node->getStorage() : table_function_node->getStorage();
+        if (!storage->isRemote())
+            return;
+
+        const auto & storage_snapshot = table_node ? table_node->getStorageSnapshot() : table_function_node->getStorageSnapshot();
+        if (!storage->isVirtualColumn(column.name, storage_snapshot->getMetadataForQuery()))
+            return;
+
+        auto function_node = std::make_shared<FunctionNode>("shardNum");
+        auto function = FunctionFactory::instance().get(function_node->getFunctionName(), getContext());
+        function_node->resolveAsFunction(function->build(function_node->getArgumentColumns()));
+        node = std::move(function_node);
+    }
+};
+
+}
+
+void ShardNumColumnToFunctionPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+{
+    ShardNumColumnToFunctionVisitor visitor(context);
+    visitor.visit(query_tree_node);
+}
+
+}
diff --git a/src/Analyzer/Passes/ShardNumColumnToFunctionPass.h b/src/Analyzer/Passes/ShardNumColumnToFunctionPass.h
new file mode 100644
index 00000000000..71a038bcf39
--- /dev/null
+++ b/src/Analyzer/Passes/ShardNumColumnToFunctionPass.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <Analyzer/IQueryTreePass.h>
+
+namespace DB
+{
+
+/** Rewrite _shard_num column into shardNum() function.
+  *
+  * Example: SELECT _shard_num FROM distributed_table;
+  * Result: SELECT shardNum() FROM distributed_table;
+  */
+class ShardNumColumnToFunctionPass final : public IQueryTreePass
+{
+public:
+    String getName() override { return "ShardNumColumnToFunctionPass"; }
+
+    String getDescription() override { return "Rewrite _shard_num column into shardNum() function"; }
+
+    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+
+};
+
+}
diff --git a/src/Analyzer/QueryNode.cpp b/src/Analyzer/QueryNode.cpp
index 774f3376f48..4c10d76690a 100644
--- a/src/Analyzer/QueryNode.cpp
+++ b/src/Analyzer/QueryNode.cpp
@@ -2,6 +2,7 @@
 
 #include <fmt/core.h>
 
+#include <Common/assert_cast.h>
 #include <Common/SipHash.h>
 #include <Common/FieldVisitorToString.h>
 
@@ -259,7 +260,7 @@ QueryTreeNodePtr QueryNode::cloneImpl() const
     return result_query_node;
 }
 
-ASTPtr QueryNode::toASTImpl() const
+ASTPtr QueryNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto select_query = std::make_shared<ASTSelectQuery>();
     select_query->distinct = is_distinct;
@@ -271,9 +272,9 @@ ASTPtr QueryNode::toASTImpl() const
     select_query->group_by_all = is_group_by_all;
 
     if (hasWith())
-        select_query->setExpression(ASTSelectQuery::Expression::WITH, getWith().toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::WITH, getWith().toAST(options));
 
-    auto projection_ast = getProjection().toAST();
+    auto projection_ast = getProjection().toAST(options);
     auto & projection_expression_list_ast = projection_ast->as<ASTExpressionList &>();
     size_t projection_expression_list_ast_children_size = projection_expression_list_ast.children.size();
     if (projection_expression_list_ast_children_size != getProjection().getNodes().size())
@@ -293,44 +294,44 @@ ASTPtr QueryNode::toASTImpl() const
     select_query->setExpression(ASTSelectQuery::Expression::SELECT, std::move(projection_ast));
 
     ASTPtr tables_in_select_query_ast = std::make_shared<ASTTablesInSelectQuery>();
-    addTableExpressionOrJoinIntoTablesInSelectQuery(tables_in_select_query_ast, getJoinTree());
+    addTableExpressionOrJoinIntoTablesInSelectQuery(tables_in_select_query_ast, getJoinTree(), options);
     select_query->setExpression(ASTSelectQuery::Expression::TABLES, std::move(tables_in_select_query_ast));
 
     if (getPrewhere())
-        select_query->setExpression(ASTSelectQuery::Expression::PREWHERE, getPrewhere()->toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::PREWHERE, getPrewhere()->toAST(options));
 
     if (getWhere())
-        select_query->setExpression(ASTSelectQuery::Expression::WHERE, getWhere()->toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::WHERE, getWhere()->toAST(options));
 
     if (!is_group_by_all && hasGroupBy())
-        select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, getGroupBy().toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, getGroupBy().toAST(options));
 
     if (hasHaving())
-        select_query->setExpression(ASTSelectQuery::Expression::HAVING, getHaving()->toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::HAVING, getHaving()->toAST(options));
 
     if (hasWindow())
-        select_query->setExpression(ASTSelectQuery::Expression::WINDOW, getWindow().toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::WINDOW, getWindow().toAST(options));
 
     if (hasOrderBy())
-        select_query->setExpression(ASTSelectQuery::Expression::ORDER_BY, getOrderBy().toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::ORDER_BY, getOrderBy().toAST(options));
 
     if (hasInterpolate())
-        select_query->setExpression(ASTSelectQuery::Expression::INTERPOLATE, getInterpolate()->toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::INTERPOLATE, getInterpolate()->toAST(options));
 
     if (hasLimitByLimit())
-        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_BY_LENGTH, getLimitByLimit()->toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_BY_LENGTH, getLimitByLimit()->toAST(options));
 
     if (hasLimitByOffset())
-        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_BY_OFFSET, getLimitByOffset()->toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_BY_OFFSET, getLimitByOffset()->toAST(options));
 
     if (hasLimitBy())
-        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_BY, getLimitBy().toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_BY, getLimitBy().toAST(options));
 
     if (hasLimit())
-        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_LENGTH, getLimit()->toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_LENGTH, getLimit()->toAST(options));
 
     if (hasOffset())
-        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_OFFSET, getOffset()->toAST());
+        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_OFFSET, getOffset()->toAST(options));
 
     if (hasSettingsChanges())
     {
diff --git a/src/Analyzer/QueryNode.h b/src/Analyzer/QueryNode.h
index 54154e1e353..277d6404965 100644
--- a/src/Analyzer/QueryNode.h
+++ b/src/Analyzer/QueryNode.h
@@ -575,7 +575,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     bool is_subquery = false;
diff --git a/src/Analyzer/QueryTreeBuilder.cpp b/src/Analyzer/QueryTreeBuilder.cpp
index c7b9f9aae08..4887cfcd6ea 100644
--- a/src/Analyzer/QueryTreeBuilder.cpp
+++ b/src/Analyzer/QueryTreeBuilder.cpp
@@ -355,21 +355,67 @@ QueryTreeNodePtr QueryTreeBuilder::buildSelectExpression(const ASTPtr & select_q
     if (select_limit_by)
         current_query_tree->getLimitByNode() = buildExpressionList(select_limit_by, current_context);
 
-    /// Combine limit expression with limit setting
+    /// Combine limit expression with limit and offset settings into final limit expression
+    /// The sequence of application is the following - offset expression, limit expression, offset setting, limit setting.
+    /// Since offset setting is applied after limit expression, but we want to transfer settings into expression
+    /// we must decrease limit expression by offset setting and then add offset setting to offset expression.
+    ///    select_limit - limit expression
+    ///    limit        - limit setting
+    ///    offset       - offset setting
+    ///
+    /// if select_limit
+    ///   -- if offset >= select_limit                (expr 0)
+    ///      then (0) (0 rows)
+    ///   -- else if limit > 0                        (expr 1)
+    ///      then min(select_limit - offset, limit)   (expr 2)
+    ///   -- else
+    ///      then (select_limit - offset)             (expr 3)
+    /// else if limit > 0
+    ///    then limit
+    ///
+    /// offset = offset + of_expr
     auto select_limit = select_query_typed.limitLength();
-    if (select_limit && limit)
+    if (select_limit)
     {
-        auto function_node = std::make_shared<FunctionNode>("least");
-        function_node->getArguments().getNodes().push_back(buildExpression(select_limit, current_context));
-        function_node->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(limit));
-        current_query_tree->getLimit() = std::move(function_node);
-    }
-    else if (limit)
-        current_query_tree->getLimit() = std::make_shared<ConstantNode>(limit);
-    else if (select_limit)
-        current_query_tree->getLimit() = buildExpression(select_limit, current_context);
+        /// Shortcut
+        if (offset == 0 && limit == 0)
+        {
+            current_query_tree->getLimit() = buildExpression(select_limit, current_context);
+        }
+        else
+        {
+            /// expr 3
+            auto expr_3 = std::make_shared<FunctionNode>("minus");
+            expr_3->getArguments().getNodes().push_back(buildExpression(select_limit, current_context));
+            expr_3->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(offset));
 
-    /// Combine offset expression with offset setting
+            /// expr 2
+            auto expr_2 = std::make_shared<FunctionNode>("least");
+            expr_2->getArguments().getNodes().push_back(expr_3->clone());
+            expr_2->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(limit));
+
+            /// expr 0
+            auto expr_0 = std::make_shared<FunctionNode>("greaterOrEquals");
+            expr_0->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(offset));
+            expr_0->getArguments().getNodes().push_back(buildExpression(select_limit, current_context));
+
+            /// expr 1
+            auto expr_1 = std::make_shared<ConstantNode>(limit > 0);
+
+            auto function_node = std::make_shared<FunctionNode>("multiIf");
+            function_node->getArguments().getNodes().push_back(expr_0);
+            function_node->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(0));
+            function_node->getArguments().getNodes().push_back(expr_1);
+            function_node->getArguments().getNodes().push_back(expr_2);
+            function_node->getArguments().getNodes().push_back(expr_3);
+
+            current_query_tree->getLimit() = std::move(function_node);
+        }
+    }
+    else if (limit > 0)
+        current_query_tree->getLimit() = std::make_shared<ConstantNode>(limit);
+
+    /// Combine offset expression with offset setting into final offset expression
     auto select_offset = select_query_typed.limitOffset();
     if (select_offset && offset)
     {
@@ -792,8 +838,14 @@ QueryTreeNodePtr QueryTreeBuilder::buildJoinTree(const ASTPtr & tables_in_select
                     const auto & function_arguments_list = table_function_expression.arguments->as<ASTExpressionList &>().children;
                     for (const auto & argument : function_arguments_list)
                     {
+                        if (!node->getSettingsChanges().empty())
+                            throw Exception(ErrorCodes::LOGICAL_ERROR, "Table function '{}' has arguments after SETTINGS",
+                                table_function_expression.formatForErrorMessage());
+
                         if (argument->as<ASTSelectQuery>() || argument->as<ASTSelectWithUnionQuery>() || argument->as<ASTSelectIntersectExceptQuery>())
                             node->getArguments().getNodes().push_back(buildSelectOrUnionExpression(argument, false /*is_subquery*/, {} /*cte_name*/, context));
+                        else if (const auto * ast_set = argument->as<ASTSetQuery>())
+                            node->setSettingsChanges(ast_set->changes);
                         else
                             node->getArguments().getNodes().push_back(buildExpression(argument, context));
                     }
diff --git a/src/Analyzer/QueryTreePassManager.cpp b/src/Analyzer/QueryTreePassManager.cpp
index 9ba18e27f73..a6da2a66615 100644
--- a/src/Analyzer/QueryTreePassManager.cpp
+++ b/src/Analyzer/QueryTreePassManager.cpp
@@ -26,7 +26,6 @@
 #include <Analyzer/Passes/IfChainToMultiIfPass.h>
 #include <Analyzer/Passes/OrderByTupleEliminationPass.h>
 #include <Analyzer/Passes/NormalizeCountVariantsPass.h>
-#include <Analyzer/Passes/CustomizeFunctionsPass.h>
 #include <Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.h>
 #include <Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.h>
 #include <Analyzer/Passes/OrderByLimitByDuplicateEliminationPass.h>
@@ -39,8 +38,10 @@
 #include <Analyzer/Passes/AutoFinalOnQueryPass.h>
 #include <Analyzer/Passes/ArrayExistsToHasPass.h>
 #include <Analyzer/Passes/ComparisonTupleEliminationPass.h>
+#include <Analyzer/Passes/LogicalExpressionOptimizerPass.h>
 #include <Analyzer/Passes/CrossToInnerJoinPass.h>
-
+#include <Analyzer/Passes/ShardNumColumnToFunctionPass.h>
+#include <Analyzer/Passes/ConvertQueryToCNFPass.h>
 
 namespace DB
 {
@@ -114,13 +115,23 @@ private:
 
         for (size_t i = 0; i < expected_argument_types_size; ++i)
         {
-            // Skip lambdas
-            if (WhichDataType(expected_argument_types[i]).isFunction())
-                continue;
-
             const auto & expected_argument_type = expected_argument_types[i];
             const auto & actual_argument_type = actual_argument_columns[i].type;
 
+            if (!expected_argument_type)
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "Function {} expected argument {} type is not set after running {} pass",
+                    function->toAST()->formatForErrorMessage(),
+                    i + 1,
+                    pass_name);
+
+            if (!actual_argument_type)
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "Function {} actual argument {} type is not set after running {} pass",
+                    function->toAST()->formatForErrorMessage(),
+                    i + 1,
+                    pass_name);
+
             if (!expected_argument_type->equals(*actual_argument_type))
             {
                 /// Aggregate functions remove low cardinality for their argument types
@@ -147,10 +158,6 @@ private:
 
 /** ClickHouse query tree pass manager.
   *
-  * TODO: Support _shard_num into shardNum() rewriting.
-  * TODO: Support logical expressions optimizer.
-  * TODO: Support setting convert_query_to_cnf.
-  * TODO: Support setting optimize_using_constraints.
   * TODO: Support setting optimize_substitute_columns.
   * TODO: Support GROUP BY injective function elimination.
   * TODO: Support setting optimize_move_functions_out_of_any.
@@ -236,14 +243,14 @@ void addQueryTreePasses(QueryTreePassManager & manager)
     manager.addPass(std::make_unique<QueryAnalysisPass>());
     manager.addPass(std::make_unique<FunctionToSubcolumnsPass>());
 
+    manager.addPass(std::make_unique<ConvertLogicalExpressionToCNFPass>());
+
     manager.addPass(std::make_unique<CountDistinctPass>());
     manager.addPass(std::make_unique<RewriteAggregateFunctionWithIfPass>());
     manager.addPass(std::make_unique<SumIfToCountIfPass>());
     manager.addPass(std::make_unique<RewriteArrayExistsToHasPass>());
     manager.addPass(std::make_unique<NormalizeCountVariantsPass>());
 
-    manager.addPass(std::make_unique<CustomizeFunctionsPass>());
-
     manager.addPass(std::make_unique<AggregateFunctionsArithmericOperationsPass>());
     manager.addPass(std::make_unique<UniqInjectiveFunctionsEliminationPass>());
     manager.addPass(std::make_unique<OptimizeGroupByFunctionKeysPass>());
@@ -265,11 +272,12 @@ void addQueryTreePasses(QueryTreePassManager & manager)
 
     manager.addPass(std::make_unique<ConvertOrLikeChainPass>());
 
+    manager.addPass(std::make_unique<LogicalExpressionOptimizerPass>());
+
     manager.addPass(std::make_unique<GroupingFunctionsResolvePass>());
-
     manager.addPass(std::make_unique<AutoFinalOnQueryPass>());
-
     manager.addPass(std::make_unique<CrossToInnerJoinPass>());
+    manager.addPass(std::make_unique<ShardNumColumnToFunctionPass>());
 }
 
 }
diff --git a/src/Analyzer/SortNode.cpp b/src/Analyzer/SortNode.cpp
index da1c52ff0ef..8e9913af442 100644
--- a/src/Analyzer/SortNode.cpp
+++ b/src/Analyzer/SortNode.cpp
@@ -1,5 +1,6 @@
 #include <Analyzer/SortNode.h>
 
+#include <Common/assert_cast.h>
 #include <Common/SipHash.h>
 
 #include <IO/WriteBufferFromString.h>
@@ -109,7 +110,7 @@ QueryTreeNodePtr SortNode::cloneImpl() const
     return std::make_shared<SortNode>(nullptr /*expression*/, sort_direction, nulls_sort_direction, collator, with_fill);
 }
 
-ASTPtr SortNode::toASTImpl() const
+ASTPtr SortNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto result = std::make_shared<ASTOrderByElement>();
     result->direction = sort_direction == SortDirection::ASCENDING ? 1 : -1;
@@ -120,10 +121,10 @@ ASTPtr SortNode::toASTImpl() const
     result->nulls_direction_was_explicitly_specified = nulls_sort_direction.has_value();
 
     result->with_fill = with_fill;
-    result->fill_from = hasFillFrom() ? getFillFrom()->toAST() : nullptr;
-    result->fill_to = hasFillTo() ? getFillTo()->toAST() : nullptr;
-    result->fill_step = hasFillStep() ? getFillStep()->toAST() : nullptr;
-    result->children.push_back(getExpression()->toAST());
+    result->fill_from = hasFillFrom() ? getFillFrom()->toAST(options) : nullptr;
+    result->fill_to = hasFillTo() ? getFillTo()->toAST(options) : nullptr;
+    result->fill_step = hasFillStep() ? getFillStep()->toAST(options) : nullptr;
+    result->children.push_back(getExpression()->toAST(options));
 
     if (collator)
     {
diff --git a/src/Analyzer/SortNode.h b/src/Analyzer/SortNode.h
index 04f9fe798e1..b860fd19a90 100644
--- a/src/Analyzer/SortNode.h
+++ b/src/Analyzer/SortNode.h
@@ -137,7 +137,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     static constexpr size_t sort_expression_child_index = 0;
diff --git a/src/Analyzer/TableFunctionNode.cpp b/src/Analyzer/TableFunctionNode.cpp
index c8cd05cf685..c130503d660 100644
--- a/src/Analyzer/TableFunctionNode.cpp
+++ b/src/Analyzer/TableFunctionNode.cpp
@@ -7,6 +7,7 @@
 #include <Storages/IStorage.h>
 
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSetQuery.h>
 
 #include <Interpreters/Context.h>
 
@@ -71,6 +72,13 @@ void TableFunctionNode::dumpTreeImpl(WriteBuffer & buffer, FormatState & format_
         buffer << '\n' << std::string(indent + 2, ' ') << "ARGUMENTS\n";
         arguments.dumpTreeImpl(buffer, format_state, indent + 4);
     }
+
+    if (!settings_changes.empty())
+    {
+        buffer << '\n' << std::string(indent + 2, ' ') << "SETTINGS";
+        for (const auto & change : settings_changes)
+            buffer << fmt::format(" {}={}", change.name, toString(change.value));
+    }
 }
 
 bool TableFunctionNode::isEqualImpl(const IQueryTreeNode & rhs) const
@@ -82,14 +90,10 @@ bool TableFunctionNode::isEqualImpl(const IQueryTreeNode & rhs) const
     if (storage && rhs_typed.storage)
         return storage_id == rhs_typed.storage_id;
 
-    if (table_expression_modifiers && rhs_typed.table_expression_modifiers && table_expression_modifiers != rhs_typed.table_expression_modifiers)
-        return false;
-    else if (table_expression_modifiers && !rhs_typed.table_expression_modifiers)
-        return false;
-    else if (!table_expression_modifiers && rhs_typed.table_expression_modifiers)
+    if (settings_changes != rhs_typed.settings_changes)
         return false;
 
-    return true;
+    return table_expression_modifiers == rhs_typed.table_expression_modifiers;
 }
 
 void TableFunctionNode::updateTreeHashImpl(HashState & state) const
@@ -106,6 +110,17 @@ void TableFunctionNode::updateTreeHashImpl(HashState & state) const
 
     if (table_expression_modifiers)
         table_expression_modifiers->updateTreeHash(state);
+
+    state.update(settings_changes.size());
+    for (const auto & change : settings_changes)
+    {
+        state.update(change.name.size());
+        state.update(change.name);
+
+        const auto & value_dump = change.value.dump();
+        state.update(value_dump.size());
+        state.update(value_dump);
+    }
 }
 
 QueryTreeNodePtr TableFunctionNode::cloneImpl() const
@@ -116,20 +131,29 @@ QueryTreeNodePtr TableFunctionNode::cloneImpl() const
     result->storage_id = storage_id;
     result->storage_snapshot = storage_snapshot;
     result->table_expression_modifiers = table_expression_modifiers;
+    result->settings_changes = settings_changes;
 
     return result;
 }
 
-ASTPtr TableFunctionNode::toASTImpl() const
+ASTPtr TableFunctionNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto table_function_ast = std::make_shared<ASTFunction>();
 
     table_function_ast->name = table_function_name;
 
     const auto & arguments = getArguments();
-    table_function_ast->children.push_back(arguments.toAST());
+    table_function_ast->children.push_back(arguments.toAST(options));
     table_function_ast->arguments = table_function_ast->children.back();
 
+    if (!settings_changes.empty())
+    {
+        auto settings_ast = std::make_shared<ASTSetQuery>();
+        settings_ast->changes = settings_changes;
+        settings_ast->is_standalone = false;
+        table_function_ast->arguments->children.push_back(std::move(settings_ast));
+    }
+
     return table_function_ast;
 }
 
diff --git a/src/Analyzer/TableFunctionNode.h b/src/Analyzer/TableFunctionNode.h
index a88630ffd00..7786ba62205 100644
--- a/src/Analyzer/TableFunctionNode.h
+++ b/src/Analyzer/TableFunctionNode.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <Common/SettingsChanges.h>
+
 #include <Storages/IStorage_fwd.h>
 #include <Storages/TableLockHolder.h>
 #include <Storages/StorageSnapshot.h>
@@ -122,6 +124,18 @@ public:
         return table_expression_modifiers;
     }
 
+    /// Get settings changes passed to table function
+    const SettingsChanges & getSettingsChanges() const
+    {
+        return settings_changes;
+    }
+
+    /// Set settings changes passed as last argument to table function
+    void setSettingsChanges(SettingsChanges settings_changes_)
+    {
+        settings_changes = std::move(settings_changes_);
+    }
+
     /// Set table expression modifiers
     void setTableExpressionModifiers(TableExpressionModifiers table_expression_modifiers_value)
     {
@@ -142,7 +156,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     String table_function_name;
@@ -151,6 +165,7 @@ private:
     StorageID storage_id;
     StorageSnapshotPtr storage_snapshot;
     std::optional<TableExpressionModifiers> table_expression_modifiers;
+    SettingsChanges settings_changes;
 
     static constexpr size_t arguments_child_index = 0;
     static constexpr size_t children_size = arguments_child_index + 1;
diff --git a/src/Analyzer/TableNode.cpp b/src/Analyzer/TableNode.cpp
index 1018570c3d4..c86cbcd5a80 100644
--- a/src/Analyzer/TableNode.cpp
+++ b/src/Analyzer/TableNode.cpp
@@ -42,6 +42,9 @@ void TableNode::dumpTreeImpl(WriteBuffer & buffer, FormatState & format_state, s
 
     buffer << ", table_name: " << storage_id.getFullNameNotQuoted();
 
+    if (!temporary_table_name.empty())
+        buffer << ", temporary_table_name: " << temporary_table_name;
+
     if (table_expression_modifiers)
     {
         buffer << ", ";
@@ -52,22 +55,23 @@ void TableNode::dumpTreeImpl(WriteBuffer & buffer, FormatState & format_state, s
 bool TableNode::isEqualImpl(const IQueryTreeNode & rhs) const
 {
     const auto & rhs_typed = assert_cast<const TableNode &>(rhs);
-
-    if (table_expression_modifiers && rhs_typed.table_expression_modifiers && table_expression_modifiers != rhs_typed.table_expression_modifiers)
-        return false;
-    else if (table_expression_modifiers && !rhs_typed.table_expression_modifiers)
-        return false;
-    else if (!table_expression_modifiers && rhs_typed.table_expression_modifiers)
-        return false;
-
-    return storage_id == rhs_typed.storage_id;
+    return storage_id == rhs_typed.storage_id && table_expression_modifiers == rhs_typed.table_expression_modifiers &&
+        temporary_table_name == rhs_typed.temporary_table_name;
 }
 
 void TableNode::updateTreeHashImpl(HashState & state) const
 {
-    auto full_name = storage_id.getFullNameNotQuoted();
-    state.update(full_name.size());
-    state.update(full_name);
+    if (!temporary_table_name.empty())
+    {
+        state.update(temporary_table_name.size());
+        state.update(temporary_table_name);
+    }
+    else
+    {
+        auto full_name = storage_id.getFullNameNotQuoted();
+        state.update(full_name.size());
+        state.update(full_name);
+    }
 
     if (table_expression_modifiers)
         table_expression_modifiers->updateTreeHash(state);
@@ -77,12 +81,16 @@ QueryTreeNodePtr TableNode::cloneImpl() const
 {
     auto result_table_node = std::make_shared<TableNode>(storage, storage_id, storage_lock, storage_snapshot);
     result_table_node->table_expression_modifiers = table_expression_modifiers;
+    result_table_node->temporary_table_name = temporary_table_name;
 
     return result_table_node;
 }
 
-ASTPtr TableNode::toASTImpl() const
+ASTPtr TableNode::toASTImpl(const ConvertToASTOptions & /* options */) const
 {
+    if (!temporary_table_name.empty())
+        return std::make_shared<ASTTableIdentifier>(temporary_table_name);
+
     return std::make_shared<ASTTableIdentifier>(storage_id.getDatabaseName(), storage_id.getTableName());
 }
 
diff --git a/src/Analyzer/TableNode.h b/src/Analyzer/TableNode.h
index 6d47f87c78b..b0bf91fa01b 100644
--- a/src/Analyzer/TableNode.h
+++ b/src/Analyzer/TableNode.h
@@ -56,6 +56,18 @@ public:
         return storage_lock;
     }
 
+    /// Get temporary table name
+    const std::string & getTemporaryTableName() const
+    {
+        return temporary_table_name;
+    }
+
+    /// Set temporary table name
+    void setTemporaryTableName(std::string temporary_table_name_value)
+    {
+        temporary_table_name = std::move(temporary_table_name_value);
+    }
+
     /// Return true if table node has table expression modifiers, false otherwise
     bool hasTableExpressionModifiers() const
     {
@@ -94,7 +106,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     StoragePtr storage;
@@ -102,6 +114,7 @@ private:
     TableLockHolder storage_lock;
     StorageSnapshotPtr storage_snapshot;
     std::optional<TableExpressionModifiers> table_expression_modifiers;
+    std::string temporary_table_name;
 
     static constexpr size_t children_size = 0;
 };
diff --git a/src/Analyzer/UnionNode.cpp b/src/Analyzer/UnionNode.cpp
index 998b869cb04..2bc3daeef36 100644
--- a/src/Analyzer/UnionNode.cpp
+++ b/src/Analyzer/UnionNode.cpp
@@ -140,12 +140,12 @@ QueryTreeNodePtr UnionNode::cloneImpl() const
     return result_union_node;
 }
 
-ASTPtr UnionNode::toASTImpl() const
+ASTPtr UnionNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
     select_with_union_query->union_mode = union_mode;
     select_with_union_query->is_normalized = true;
-    select_with_union_query->children.push_back(getQueriesNode()->toAST());
+    select_with_union_query->children.push_back(getQueriesNode()->toAST(options));
     select_with_union_query->list_of_selects = select_with_union_query->children.back();
 
     if (is_subquery)
diff --git a/src/Analyzer/UnionNode.h b/src/Analyzer/UnionNode.h
index 5e3861da814..0045b0c334f 100644
--- a/src/Analyzer/UnionNode.h
+++ b/src/Analyzer/UnionNode.h
@@ -143,7 +143,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     bool is_subquery = false;
diff --git a/src/Analyzer/Utils.cpp b/src/Analyzer/Utils.cpp
index e746a8ff570..6804e85c4cf 100644
--- a/src/Analyzer/Utils.cpp
+++ b/src/Analyzer/Utils.cpp
@@ -5,13 +5,19 @@
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTFunction.h>
 
+#include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Functions/FunctionHelpers.h>
+#include <Functions/FunctionFactory.h>
+
+#include <Interpreters/Context.h>
 
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/IdentifierNode.h>
+#include <Analyzer/ConstantNode.h>
 #include <Analyzer/ColumnNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/JoinNode.h>
@@ -27,6 +33,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
 }
 
 bool isNodePartOfTree(const IQueryTreeNode * node, const IQueryTreeNode * root)
@@ -74,6 +81,119 @@ bool isNameOfInFunction(const std::string & function_name)
     return is_special_function_in;
 }
 
+bool isNameOfLocalInFunction(const std::string & function_name)
+{
+    bool is_special_function_in = function_name == "in" ||
+        function_name == "notIn" ||
+        function_name == "nullIn" ||
+        function_name == "notNullIn" ||
+        function_name == "inIgnoreSet" ||
+        function_name == "notInIgnoreSet" ||
+        function_name == "nullInIgnoreSet" ||
+        function_name == "notNullInIgnoreSet";
+
+    return is_special_function_in;
+}
+
+bool isNameOfGlobalInFunction(const std::string & function_name)
+{
+    bool is_special_function_in = function_name == "globalIn" ||
+        function_name == "globalNotIn" ||
+        function_name == "globalNullIn" ||
+        function_name == "globalNotNullIn" ||
+        function_name == "globalInIgnoreSet" ||
+        function_name == "globalNotInIgnoreSet" ||
+        function_name == "globalNullInIgnoreSet" ||
+        function_name == "globalNotNullInIgnoreSet";
+
+    return is_special_function_in;
+}
+
+std::string getGlobalInFunctionNameForLocalInFunctionName(const std::string & function_name)
+{
+    if (function_name == "in")
+        return "globalIn";
+    else if (function_name == "notIn")
+        return "globalNotIn";
+    else if (function_name == "nullIn")
+        return "globalNullIn";
+    else if (function_name == "notNullIn")
+        return "globalNotNullIn";
+    else if (function_name == "inIgnoreSet")
+        return "globalInIgnoreSet";
+    else if (function_name == "notInIgnoreSet")
+        return "globalNotInIgnoreSet";
+    else if (function_name == "nullInIgnoreSet")
+        return "globalNullInIgnoreSet";
+    else if (function_name == "notNullInIgnoreSet")
+        return "globalNotNullInIgnoreSet";
+
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid local IN function name {}", function_name);
+}
+
+void makeUniqueColumnNamesInBlock(Block & block)
+{
+    NameSet block_column_names;
+    size_t unique_column_name_counter = 1;
+
+    for (auto & column_with_type : block)
+    {
+        if (!block_column_names.contains(column_with_type.name))
+        {
+            block_column_names.insert(column_with_type.name);
+            continue;
+        }
+
+        column_with_type.name += '_';
+        column_with_type.name += std::to_string(unique_column_name_counter);
+        ++unique_column_name_counter;
+    }
+}
+
+QueryTreeNodePtr buildCastFunction(const QueryTreeNodePtr & expression,
+    const DataTypePtr & type,
+    const ContextPtr & context,
+    bool resolve)
+{
+    std::string cast_type = type->getName();
+    auto cast_type_constant_value = std::make_shared<ConstantValue>(std::move(cast_type), std::make_shared<DataTypeString>());
+    auto cast_type_constant_node = std::make_shared<ConstantNode>(std::move(cast_type_constant_value));
+
+    std::string cast_function_name = "_CAST";
+    auto cast_function_node = std::make_shared<FunctionNode>(cast_function_name);
+    cast_function_node->getArguments().getNodes().push_back(expression);
+    cast_function_node->getArguments().getNodes().push_back(std::move(cast_type_constant_node));
+
+    if (resolve)
+    {
+        auto cast_function = FunctionFactory::instance().get(cast_function_name, context);
+        cast_function_node->resolveAsFunction(cast_function->build(cast_function_node->getArgumentColumns()));
+    }
+
+    return cast_function_node;
+}
+
+std::optional<bool> tryExtractConstantFromConditionNode(const QueryTreeNodePtr & condition_node)
+{
+    const auto * constant_node = condition_node->as<ConstantNode>();
+    if (!constant_node)
+        return {};
+
+    const auto & value = constant_node->getValue();
+    auto constant_type = constant_node->getResultType();
+    constant_type = removeNullable(removeLowCardinality(constant_type));
+
+    auto which_constant_type = WhichDataType(constant_type);
+    if (!which_constant_type.isUInt8() && !which_constant_type.isNothing())
+        return {};
+
+    if (value.isNull())
+        return false;
+
+    UInt8 predicate_value = value.safeGet<UInt8>();
+    return predicate_value > 0;
+}
+
 static ASTPtr convertIntoTableExpressionAST(const QueryTreeNodePtr & table_expression_node)
 {
     ASTPtr table_expression_node_ast;
@@ -148,7 +268,7 @@ static ASTPtr convertIntoTableExpressionAST(const QueryTreeNodePtr & table_expre
     return result_table_expression;
 }
 
-void addTableExpressionOrJoinIntoTablesInSelectQuery(ASTPtr & tables_in_select_query_ast, const QueryTreeNodePtr & table_expression)
+void addTableExpressionOrJoinIntoTablesInSelectQuery(ASTPtr & tables_in_select_query_ast, const QueryTreeNodePtr & table_expression, const IQueryTreeNode::ConvertToASTOptions & convert_to_ast_options)
 {
     auto table_expression_node_type = table_expression->getNodeType();
 
@@ -177,7 +297,7 @@ void addTableExpressionOrJoinIntoTablesInSelectQuery(ASTPtr & tables_in_select_q
             [[fallthrough]];
         case QueryTreeNodeType::JOIN:
         {
-            auto table_expression_tables_in_select_query_ast = table_expression->toAST();
+            auto table_expression_tables_in_select_query_ast = table_expression->toAST(convert_to_ast_options);
             tables_in_select_query_ast->children.reserve(table_expression_tables_in_select_query_ast->children.size());
             for (auto && table_element_ast : table_expression_tables_in_select_query_ast->children)
                 tables_in_select_query_ast->children.push_back(std::move(table_element_ast));
@@ -352,30 +472,6 @@ QueryTreeNodes buildTableExpressionsStack(const QueryTreeNodePtr & join_tree_nod
     return result;
 }
 
-bool nestedIdentifierCanBeResolved(const DataTypePtr & compound_type, IdentifierView nested_identifier)
-{
-    const IDataType * current_type = compound_type.get();
-
-    for (const auto & identifier_part : nested_identifier)
-    {
-        while (const DataTypeArray * array = checkAndGetDataType<DataTypeArray>(current_type))
-            current_type = array->getNestedType().get();
-
-        const DataTypeTuple * tuple = checkAndGetDataType<DataTypeTuple>(current_type);
-
-        if (!tuple)
-            return false;
-
-        auto position = tuple->tryGetPositionByName(identifier_part);
-        if (!position)
-            return false;
-
-        current_type = tuple->getElements()[*position].get();
-    }
-
-    return true;
-}
-
 namespace
 {
 
diff --git a/src/Analyzer/Utils.h b/src/Analyzer/Utils.h
index 0f54b5cadd5..ea36e17bf11 100644
--- a/src/Analyzer/Utils.h
+++ b/src/Analyzer/Utils.h
@@ -2,6 +2,8 @@
 
 #include <Analyzer/IQueryTreeNode.h>
 
+#include <Interpreters/Context_fwd.h>
+
 namespace DB
 {
 
@@ -11,10 +13,34 @@ bool isNodePartOfTree(const IQueryTreeNode * node, const IQueryTreeNode * root);
 /// Returns true if function name is name of IN function or its variations, false otherwise
 bool isNameOfInFunction(const std::string & function_name);
 
+/// Returns true if function name is name of local IN function or its variations, false otherwise
+bool isNameOfLocalInFunction(const std::string & function_name);
+
+/// Returns true if function name is name of global IN function or its variations, false otherwise
+bool isNameOfGlobalInFunction(const std::string & function_name);
+
+/// Returns global IN function name for local IN function name
+std::string getGlobalInFunctionNameForLocalInFunctionName(const std::string & function_name);
+
+/// Add unique suffix to names of duplicate columns in block
+void makeUniqueColumnNamesInBlock(Block & block);
+
+/** Build cast function that cast expression into type.
+  * If resolve = true, then result cast function is resolved during build, otherwise
+  * result cast function is not resolved during build.
+  */
+QueryTreeNodePtr buildCastFunction(const QueryTreeNodePtr & expression,
+    const DataTypePtr & type,
+    const ContextPtr & context,
+    bool resolve = true);
+
+/// Try extract boolean constant from condition node
+std::optional<bool> tryExtractConstantFromConditionNode(const QueryTreeNodePtr & condition_node);
+
 /** Add table expression in tables in select query children.
   * If table expression node is not of identifier node, table node, query node, table function node, join node or array join node type throws logical error exception.
   */
-void addTableExpressionOrJoinIntoTablesInSelectQuery(ASTPtr & tables_in_select_query_ast, const QueryTreeNodePtr & table_expression);
+void addTableExpressionOrJoinIntoTablesInSelectQuery(ASTPtr & tables_in_select_query_ast, const QueryTreeNodePtr & table_expression, const IQueryTreeNode::ConvertToASTOptions & convert_to_ast_options);
 
 /// Extract table, table function, query, union from join tree
 QueryTreeNodes extractTableExpressions(const QueryTreeNodePtr & join_tree_node);
@@ -34,14 +60,6 @@ QueryTreeNodePtr extractLeftTableExpression(const QueryTreeNodePtr & join_tree_n
   */
 QueryTreeNodes buildTableExpressionsStack(const QueryTreeNodePtr & join_tree_node);
 
-/** Returns true if nested identifier can be resolved from compound type.
-  * Compound type can be tuple or array of tuples.
-  *
-  * Example: Compound type: Tuple(nested_path Tuple(nested_path_2 UInt64)). Nested identifier: nested_path_1.nested_path_2.
-  * Result: true.
-  */
-bool nestedIdentifierCanBeResolved(const DataTypePtr & compound_type, IdentifierView nested_identifier);
-
 /** Assert that there are no function nodes with specified function name in node children.
   * Do not visit subqueries.
   */
diff --git a/src/Analyzer/ValidationUtils.cpp b/src/Analyzer/ValidationUtils.cpp
index feb2f8a890b..af35632ab81 100644
--- a/src/Analyzer/ValidationUtils.cpp
+++ b/src/Analyzer/ValidationUtils.cpp
@@ -16,8 +16,51 @@ namespace ErrorCodes
 {
     extern const int NOT_AN_AGGREGATE;
     extern const int NOT_IMPLEMENTED;
+    extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
+    extern const int ILLEGAL_PREWHERE;
 }
 
+namespace
+{
+
+void validateFilter(const QueryTreeNodePtr & filter_node, std::string_view exception_place_message, const QueryTreeNodePtr & query_node)
+{
+    auto filter_node_result_type = filter_node->getResultType();
+    if (!filter_node_result_type->canBeUsedInBooleanContext())
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER,
+            "Invalid type for filter in {}: {}. In query {}",
+            exception_place_message,
+            filter_node_result_type->getName(),
+            query_node->formatASTForErrorMessage());
+}
+
+}
+
+void validateFilters(const QueryTreeNodePtr & query_node)
+{
+    const auto & query_node_typed = query_node->as<QueryNode &>();
+    if (query_node_typed.hasPrewhere())
+    {
+        validateFilter(query_node_typed.getPrewhere(), "PREWHERE", query_node);
+
+        assertNoFunctionNodes(query_node_typed.getPrewhere(),
+            "arrayJoin",
+            ErrorCodes::ILLEGAL_PREWHERE,
+            "ARRAY JOIN",
+            "in PREWHERE");
+    }
+
+    if (query_node_typed.hasWhere())
+        validateFilter(query_node_typed.getWhere(), "WHERE", query_node);
+
+    if (query_node_typed.hasHaving())
+        validateFilter(query_node_typed.getHaving(), "HAVING", query_node);
+}
+
+namespace
+{
+
 class ValidateGroupByColumnsVisitor : public ConstInDepthQueryTreeVisitor<ValidateGroupByColumnsVisitor>
 {
 public:
@@ -55,7 +98,7 @@ public:
                 }
 
                 if (!found_argument_in_group_by_keys)
-                    throw Exception(ErrorCodes::NOT_AN_AGGREGATE,
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
                         "GROUPING function argument {} is not in GROUP BY keys. In query {}",
                         grouping_function_arguments_node->formatASTForErrorMessage(),
                         query_node->formatASTForErrorMessage());
@@ -105,7 +148,9 @@ private:
     const QueryTreeNodePtr & query_node;
 };
 
-void validateAggregates(const QueryTreeNodePtr & query_node)
+}
+
+void validateAggregates(const QueryTreeNodePtr & query_node, AggregatesValidationParams params)
 {
     const auto & query_node_typed = query_node->as<QueryNode &>();
     auto join_tree_node_type = query_node_typed.getJoinTree()->getNodeType();
@@ -182,7 +227,9 @@ void validateAggregates(const QueryTreeNodePtr & query_node)
                 if (grouping_set_key->as<ConstantNode>())
                     continue;
 
-                group_by_keys_nodes.push_back(grouping_set_key);
+                group_by_keys_nodes.push_back(grouping_set_key->clone());
+                if (params.group_by_use_nulls)
+                    group_by_keys_nodes.back()->convertToNullable();
             }
         }
         else
@@ -190,7 +237,9 @@ void validateAggregates(const QueryTreeNodePtr & query_node)
             if (node->as<ConstantNode>())
                 continue;
 
-            group_by_keys_nodes.push_back(node);
+            group_by_keys_nodes.push_back(node->clone());
+            if (params.group_by_use_nulls)
+                group_by_keys_nodes.back()->convertToNullable();
         }
     }
 
@@ -279,4 +328,52 @@ void assertNoFunctionNodes(const QueryTreeNodePtr & node,
     visitor.visit(node);
 }
 
+void validateTreeSize(const QueryTreeNodePtr & node,
+    size_t max_size,
+    std::unordered_map<QueryTreeNodePtr, size_t> & node_to_tree_size)
+{
+    size_t tree_size = 0;
+    std::vector<std::pair<QueryTreeNodePtr, bool>> nodes_to_process;
+    nodes_to_process.emplace_back(node, false);
+
+    while (!nodes_to_process.empty())
+    {
+        const auto [node_to_process, processed_children] = nodes_to_process.back();
+        nodes_to_process.pop_back();
+
+        if (processed_children)
+        {
+            ++tree_size;
+            node_to_tree_size.emplace(node_to_process, tree_size);
+            continue;
+        }
+
+        auto node_to_size_it = node_to_tree_size.find(node_to_process);
+        if (node_to_size_it != node_to_tree_size.end())
+        {
+            tree_size += node_to_size_it->second;
+            continue;
+        }
+
+        nodes_to_process.emplace_back(node_to_process, true);
+
+        for (const auto & node_to_process_child : node_to_process->getChildren())
+        {
+            if (!node_to_process_child)
+                continue;
+
+            nodes_to_process.emplace_back(node_to_process_child, false);
+        }
+
+        auto * constant_node = node_to_process->as<ConstantNode>();
+        if (constant_node && constant_node->hasSourceExpression())
+            nodes_to_process.emplace_back(constant_node->getSourceExpression(), false);
+    }
+
+    if (tree_size > max_size)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "Query tree is too big. Maximum: {}",
+            max_size);
+}
+
 }
diff --git a/src/Analyzer/ValidationUtils.h b/src/Analyzer/ValidationUtils.h
index b511dc9514b..3041447af17 100644
--- a/src/Analyzer/ValidationUtils.h
+++ b/src/Analyzer/ValidationUtils.h
@@ -5,6 +5,14 @@
 namespace DB
 {
 
+/// Validate PREWHERE, WHERE, HAVING in query node
+void validateFilters(const QueryTreeNodePtr & query_node);
+
+struct AggregatesValidationParams
+{
+    bool group_by_use_nulls = false;
+};
+
 /** Validate aggregates in query node.
   *
   * 1. Check that there are no aggregate functions and GROUPING function in JOIN TREE, WHERE, PREWHERE, in another aggregate functions.
@@ -15,7 +23,7 @@ namespace DB
   * PROJECTION.
   * 5. Throws exception if there is GROUPING SETS or ROLLUP or CUBE or WITH TOTALS without aggregation.
   */
-void validateAggregates(const QueryTreeNodePtr & query_node);
+void validateAggregates(const QueryTreeNodePtr & query_node, AggregatesValidationParams params);
 
 /** Assert that there are no function nodes with specified function name in node children.
   * Do not visit subqueries.
@@ -26,4 +34,11 @@ void assertNoFunctionNodes(const QueryTreeNodePtr & node,
     std::string_view exception_function_name,
     std::string_view exception_place_message);
 
+/** Validate tree size. If size of tree is greater than max size throws exception.
+  * Additionally for each node in tree, update node to tree size map.
+  */
+void validateTreeSize(const QueryTreeNodePtr & node,
+    size_t max_size,
+    std::unordered_map<QueryTreeNodePtr, size_t> & node_to_tree_size);
+
 }
diff --git a/src/Analyzer/WindowNode.cpp b/src/Analyzer/WindowNode.cpp
index 3e8537302e5..0fbe7c51bc7 100644
--- a/src/Analyzer/WindowNode.cpp
+++ b/src/Analyzer/WindowNode.cpp
@@ -107,17 +107,23 @@ QueryTreeNodePtr WindowNode::cloneImpl() const
     return window_node;
 }
 
-ASTPtr WindowNode::toASTImpl() const
+ASTPtr WindowNode::toASTImpl(const ConvertToASTOptions & options) const
 {
     auto window_definition = std::make_shared<ASTWindowDefinition>();
 
     window_definition->parent_window_name = parent_window_name;
 
-    window_definition->children.push_back(getPartitionByNode()->toAST());
-    window_definition->partition_by = window_definition->children.back();
+    if (hasPartitionBy())
+    {
+        window_definition->children.push_back(getPartitionByNode()->toAST(options));
+        window_definition->partition_by = window_definition->children.back();
+    }
 
-    window_definition->children.push_back(getOrderByNode()->toAST());
-    window_definition->order_by = window_definition->children.back();
+    if (hasOrderBy())
+    {
+        window_definition->children.push_back(getOrderByNode()->toAST(options));
+        window_definition->order_by = window_definition->children.back();
+    }
 
     window_definition->frame_is_default = window_frame.is_default;
     window_definition->frame_type = window_frame.type;
@@ -126,7 +132,7 @@ ASTPtr WindowNode::toASTImpl() const
 
     if (hasFrameBeginOffset())
     {
-        window_definition->children.push_back(getFrameBeginOffsetNode()->toAST());
+        window_definition->children.push_back(getFrameBeginOffsetNode()->toAST(options));
         window_definition->frame_begin_offset = window_definition->children.back();
     }
 
@@ -134,7 +140,7 @@ ASTPtr WindowNode::toASTImpl() const
     window_definition->frame_end_preceding = window_frame.end_preceding;
     if (hasFrameEndOffset())
     {
-        window_definition->children.push_back(getFrameEndOffsetNode()->toAST());
+        window_definition->children.push_back(getFrameEndOffsetNode()->toAST(options));
         window_definition->frame_end_offset = window_definition->children.back();
     }
 
diff --git a/src/Analyzer/WindowNode.h b/src/Analyzer/WindowNode.h
index 9dfb3e6ef2a..30e1128b93c 100644
--- a/src/Analyzer/WindowNode.h
+++ b/src/Analyzer/WindowNode.h
@@ -175,7 +175,7 @@ protected:
 
     QueryTreeNodePtr cloneImpl() const override;
 
-    ASTPtr toASTImpl() const override;
+    ASTPtr toASTImpl(const ConvertToASTOptions & options) const override;
 
 private:
     static constexpr size_t order_by_child_index = 0;
diff --git a/src/Analyzer/tests/gtest_query_tree_node.cpp b/src/Analyzer/tests/gtest_query_tree_node.cpp
index 079869b2a53..cf1ce78e423 100644
--- a/src/Analyzer/tests/gtest_query_tree_node.cpp
+++ b/src/Analyzer/tests/gtest_query_tree_node.cpp
@@ -36,7 +36,7 @@ public:
         return std::make_shared<SourceNode>();
     }
 
-    ASTPtr toASTImpl() const override
+    ASTPtr toASTImpl(const ConvertToASTOptions & /* options */) const override
     {
         return nullptr;
     }
diff --git a/src/Backups/BackupCoordinationFileInfos.cpp b/src/Backups/BackupCoordinationFileInfos.cpp
new file mode 100644
index 00000000000..eead742b510
--- /dev/null
+++ b/src/Backups/BackupCoordinationFileInfos.cpp
@@ -0,0 +1,147 @@
+#include <Backups/BackupCoordinationFileInfos.h>
+#include <Common/quoteString.h>
+#include <Common/Exception.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BACKUP_ENTRY_ALREADY_EXISTS;
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+}
+
+using SizeAndChecksum = std::pair<UInt64, UInt128>;
+
+
+void BackupCoordinationFileInfos::addFileInfos(BackupFileInfos && file_infos_, const String & host_id_)
+{
+    if (prepared)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "addFileInfos() must not be called after preparing");
+    file_infos.emplace(host_id_, std::move(file_infos_));
+}
+
+BackupFileInfos BackupCoordinationFileInfos::getFileInfos(const String & host_id_) const
+{
+    prepare();
+    auto it = file_infos.find(host_id_);
+    if (it == file_infos.end())
+        return {};
+    return it->second;
+}
+
+BackupFileInfos BackupCoordinationFileInfos::getFileInfosForAllHosts() const
+{
+    prepare();
+    BackupFileInfos res;
+    res.reserve(file_infos_for_all_hosts.size());
+    for (const auto * file_info : file_infos_for_all_hosts)
+        res.emplace_back(*file_info);
+    return res;
+}
+
+BackupFileInfo BackupCoordinationFileInfos::getFileInfoByDataFileIndex(size_t data_file_index) const
+{
+    prepare();
+    if (data_file_index >= file_infos_for_all_hosts.size())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid data file index: {}", data_file_index);
+    return *(file_infos_for_all_hosts[data_file_index]);
+}
+
+void BackupCoordinationFileInfos::prepare() const
+{
+    if (prepared)
+        return;
+
+    /// Make a list of all file infos from all hosts.
+    size_t total_num_infos = 0;
+    for (const auto & [_, infos] : file_infos)
+        total_num_infos += infos.size();
+
+    file_infos_for_all_hosts.reserve(total_num_infos);
+    for (auto & [_, infos] : file_infos)
+        for (auto & info : infos)
+            file_infos_for_all_hosts.emplace_back(&info);
+
+    /// Sort the list of all file infos by file name (file names must be unique).
+    std::sort(file_infos_for_all_hosts.begin(), file_infos_for_all_hosts.end(), BackupFileInfo::LessByFileName{});
+
+    auto adjacent_it = std::adjacent_find(file_infos_for_all_hosts.begin(), file_infos_for_all_hosts.end(), BackupFileInfo::EqualByFileName{});
+    if (adjacent_it != file_infos_for_all_hosts.end())
+    {
+        throw Exception(
+            ErrorCodes::BACKUP_ENTRY_ALREADY_EXISTS, "Entry {} added multiple times to backup", quoteString((*adjacent_it)->file_name));
+    }
+
+    num_files = 0;
+    total_size_of_files = 0;
+
+    if (plain_backup)
+    {
+        /// For plain backup all file infos are stored as is, without checking for duplicates or skipping empty files.
+        for (size_t i = 0; i != file_infos_for_all_hosts.size(); ++i)
+        {
+            auto & info = *(file_infos_for_all_hosts[i]);
+            info.data_file_name = info.file_name;
+            info.data_file_index = i;
+            info.base_size = 0; /// Base backup must not be used while creating a plain backup.
+            info.base_checksum = 0;
+            total_size_of_files += info.size;
+        }
+        num_files = file_infos_for_all_hosts.size();
+    }
+    else
+    {
+        /// For non-plain backups files with the same size and checksum are stored only once,
+        /// in order to find those files we'll use this map.
+        std::map<SizeAndChecksum, size_t> data_file_index_by_checksum;
+
+        for (size_t i = 0; i != file_infos_for_all_hosts.size(); ++i)
+        {
+            auto & info = *(file_infos_for_all_hosts[i]);
+            if (info.size == info.base_size)
+            {
+                /// A file is either empty or can be get from the base backup as a whole.
+                info.data_file_name.clear();
+                info.data_file_index = static_cast<size_t>(-1);
+            }
+            else
+            {
+                SizeAndChecksum size_and_checksum{info.size, info.checksum};
+                auto [it, inserted] = data_file_index_by_checksum.emplace(size_and_checksum, i);
+                if (inserted)
+                {
+                    /// Found a new file.
+                    info.data_file_name = info.file_name;
+                    info.data_file_index = i;
+                    ++num_files;
+                    total_size_of_files += info.size - info.base_size;
+                }
+                else
+                {
+                    /// Found a file with the same size and checksum as some file before, reuse old `data_file_index` and `data_file_name`.
+                    info.data_file_index = it->second;
+                    info.data_file_name = file_infos_for_all_hosts[it->second]->data_file_name;
+                }
+            }
+        }
+    }
+
+    prepared = true;
+}
+
+size_t BackupCoordinationFileInfos::getNumFiles() const
+{
+    prepare();
+    return num_files;
+}
+
+size_t BackupCoordinationFileInfos::getTotalSizeOfFiles() const
+{
+    prepare();
+    return total_size_of_files;
+}
+
+}
diff --git a/src/Backups/BackupCoordinationFileInfos.h b/src/Backups/BackupCoordinationFileInfos.h
new file mode 100644
index 00000000000..b0d302b1767
--- /dev/null
+++ b/src/Backups/BackupCoordinationFileInfos.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <map>
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+#include <Backups/BackupFileInfo.h>
+
+
+namespace DB
+{
+
+/// Hosts use this class to coordinate lists of files they are going to write to a backup.
+/// Because different hosts shouldn't write the same file twice and or even files with different names but with the same checksum.
+/// Also the initiator of the BACKUP query uses this class to get a whole list of files written by all hosts to write that list
+/// as a part of the contents of the .backup file (the backup metadata file).
+class BackupCoordinationFileInfos
+{
+public:
+    /// plain_backup sets that we're writing a plain backup, which means all duplicates are written as is, and empty files are written as is.
+    /// (For normal backups only the first file amongst duplicates is actually stored, and empty files are not stored).
+    BackupCoordinationFileInfos(bool plain_backup_) : plain_backup(plain_backup_) {}
+
+    /// Adds file infos for the specified host.
+    void addFileInfos(BackupFileInfos && file_infos, const String & host_id);
+
+    /// Returns file infos for the specified host after preparation.
+    BackupFileInfos getFileInfos(const String & host_id) const;
+
+    /// Returns file infos for all hosts after preparation.
+    BackupFileInfos getFileInfosForAllHosts() const;
+
+    /// Returns a file info by data file index (see BackupFileInfo::data_file_index).
+    BackupFileInfo getFileInfoByDataFileIndex(size_t data_file_index) const;
+
+    /// Returns the number of files after deduplication and excluding empty files.
+    size_t getNumFiles() const;
+
+    /// Returns the total size of files after deduplication and excluding empty files.
+    size_t getTotalSizeOfFiles() const;
+
+private:
+    void prepare() const;
+
+    /// before preparation
+    const bool plain_backup;
+    mutable std::unordered_map<String, BackupFileInfos> file_infos;
+
+    /// after preparation
+    mutable bool prepared = false;
+    mutable std::vector<BackupFileInfo *> file_infos_for_all_hosts;
+    mutable size_t num_files;
+    mutable size_t total_size_of_files;
+};
+
+}
diff --git a/src/Backups/BackupCoordinationLocal.cpp b/src/Backups/BackupCoordinationLocal.cpp
index 91da16097cc..27e0f173cf3 100644
--- a/src/Backups/BackupCoordinationLocal.cpp
+++ b/src/Backups/BackupCoordinationLocal.cpp
@@ -1,210 +1,137 @@
 #include <Backups/BackupCoordinationLocal.h>
 #include <Common/Exception.h>
 #include <Common/logger_useful.h>
+#include <Common/quoteString.h>
 #include <fmt/format.h>
 
 
 namespace DB
 {
 
-using SizeAndChecksum = IBackupCoordination::SizeAndChecksum;
-using FileInfo = IBackupCoordination::FileInfo;
+BackupCoordinationLocal::BackupCoordinationLocal(bool plain_backup_)
+    : log(&Poco::Logger::get("BackupCoordinationLocal")), file_infos(plain_backup_)
+{
+}
 
-BackupCoordinationLocal::BackupCoordinationLocal() = default;
 BackupCoordinationLocal::~BackupCoordinationLocal() = default;
 
-void BackupCoordinationLocal::setStage(const String &, const String &, const String &)
+void BackupCoordinationLocal::setStage(const String &, const String &)
 {
 }
 
-void BackupCoordinationLocal::setError(const String &, const Exception &)
+void BackupCoordinationLocal::setError(const Exception &)
 {
 }
 
-Strings BackupCoordinationLocal::waitForStage(const Strings &, const String &)
+Strings BackupCoordinationLocal::waitForStage(const String &)
 {
     return {};
 }
 
-Strings BackupCoordinationLocal::waitForStage(const Strings &, const String &, std::chrono::milliseconds)
+Strings BackupCoordinationLocal::waitForStage(const String &, std::chrono::milliseconds)
 {
     return {};
 }
 
 void BackupCoordinationLocal::addReplicatedPartNames(const String & table_shared_id, const String & table_name_for_logs, const String & replica_name, const std::vector<PartNameAndChecksum> & part_names_and_checksums)
 {
-    std::lock_guard lock{mutex};
-    replicated_tables.addPartNames(table_shared_id, table_name_for_logs, replica_name, part_names_and_checksums);
+    std::lock_guard lock{replicated_tables_mutex};
+    replicated_tables.addPartNames({table_shared_id, table_name_for_logs, replica_name, part_names_and_checksums});
 }
 
 Strings BackupCoordinationLocal::getReplicatedPartNames(const String & table_shared_id, const String & replica_name) const
 {
-    std::lock_guard lock{mutex};
+    std::lock_guard lock{replicated_tables_mutex};
     return replicated_tables.getPartNames(table_shared_id, replica_name);
 }
 
 
 void BackupCoordinationLocal::addReplicatedMutations(const String & table_shared_id, const String & table_name_for_logs, const String & replica_name, const std::vector<MutationInfo> & mutations)
 {
-    std::lock_guard lock{mutex};
-    replicated_tables.addMutations(table_shared_id, table_name_for_logs, replica_name, mutations);
+    std::lock_guard lock{replicated_tables_mutex};
+    replicated_tables.addMutations({table_shared_id, table_name_for_logs, replica_name, mutations});
 }
 
 std::vector<IBackupCoordination::MutationInfo> BackupCoordinationLocal::getReplicatedMutations(const String & table_shared_id, const String & replica_name) const
 {
-    std::lock_guard lock{mutex};
+    std::lock_guard lock{replicated_tables_mutex};
     return replicated_tables.getMutations(table_shared_id, replica_name);
 }
 
 
 void BackupCoordinationLocal::addReplicatedDataPath(const String & table_shared_id, const String & data_path)
 {
-    std::lock_guard lock{mutex};
-    replicated_tables.addDataPath(table_shared_id, data_path);
+    std::lock_guard lock{replicated_tables_mutex};
+    replicated_tables.addDataPath({table_shared_id, data_path});
 }
 
 Strings BackupCoordinationLocal::getReplicatedDataPaths(const String & table_shared_id) const
 {
-    std::lock_guard lock{mutex};
+    std::lock_guard lock{replicated_tables_mutex};
     return replicated_tables.getDataPaths(table_shared_id);
 }
 
 
-void BackupCoordinationLocal::addReplicatedAccessFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id, const String & file_path)
+void BackupCoordinationLocal::addReplicatedAccessFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & file_path)
 {
-    std::lock_guard lock{mutex};
-    replicated_access.addFilePath(access_zk_path, access_entity_type, host_id, file_path);
+    std::lock_guard lock{replicated_access_mutex};
+    replicated_access.addFilePath({access_zk_path, access_entity_type, "", file_path});
 }
 
-Strings BackupCoordinationLocal::getReplicatedAccessFilePaths(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id) const
+Strings BackupCoordinationLocal::getReplicatedAccessFilePaths(const String & access_zk_path, AccessEntityType access_entity_type) const
 {
-    std::lock_guard lock{mutex};
-    return replicated_access.getFilePaths(access_zk_path, access_entity_type, host_id);
+    std::lock_guard lock{replicated_access_mutex};
+    return replicated_access.getFilePaths(access_zk_path, access_entity_type, "");
 }
 
 
-void BackupCoordinationLocal::addFileInfo(const FileInfo & file_info, bool & is_data_file_required)
+void BackupCoordinationLocal::addReplicatedSQLObjectsDir(const String & loader_zk_path, UserDefinedSQLObjectType object_type, const String & dir_path)
 {
-    std::lock_guard lock{mutex};
-    file_names.emplace(file_info.file_name, std::pair{file_info.size, file_info.checksum});
-    if (!file_info.size)
-    {
-        is_data_file_required = false;
-        return;
-    }
-    bool inserted_file_info = file_infos.try_emplace(std::pair{file_info.size, file_info.checksum}, file_info).second;
-    is_data_file_required = inserted_file_info && (file_info.size > file_info.base_size);
+    std::lock_guard lock{replicated_sql_objects_mutex};
+    replicated_sql_objects.addDirectory({loader_zk_path, object_type, "", dir_path});
 }
 
-void BackupCoordinationLocal::updateFileInfo(const FileInfo & file_info)
+Strings BackupCoordinationLocal::getReplicatedSQLObjectsDirs(const String & loader_zk_path, UserDefinedSQLObjectType object_type) const
 {
-    if (!file_info.size)
-        return; /// we don't keep FileInfos for empty files, nothing to update
-
-    std::lock_guard lock{mutex};
-    auto & dest = file_infos.at(std::pair{file_info.size, file_info.checksum});
-    dest.archive_suffix = file_info.archive_suffix;
+    std::lock_guard lock{replicated_sql_objects_mutex};
+    return replicated_sql_objects.getDirectories(loader_zk_path, object_type, "");
 }
 
-std::vector<FileInfo> BackupCoordinationLocal::getAllFileInfos() const
+
+void BackupCoordinationLocal::addFileInfos(BackupFileInfos && file_infos_)
 {
-    std::lock_guard lock{mutex};
-    std::vector<FileInfo> res;
-    for (const auto & [file_name, size_and_checksum] : file_names)
-    {
-        FileInfo info;
-        UInt64 size = size_and_checksum.first;
-        if (size) /// we don't keep FileInfos for empty files
-            info = file_infos.at(size_and_checksum);
-        info.file_name = file_name;
-        res.push_back(std::move(info));
-    }
-    return res;
+    std::lock_guard lock{file_infos_mutex};
+    file_infos.addFileInfos(std::move(file_infos_), "");
 }
 
-Strings BackupCoordinationLocal::listFiles(const String & directory, bool recursive) const
+BackupFileInfos BackupCoordinationLocal::getFileInfos() const
 {
-    std::lock_guard lock{mutex};
-    String prefix = directory;
-    if (!prefix.empty() && !prefix.ends_with('/'))
-        prefix += '/';
-    String terminator = recursive ? "" : "/";
-
-    Strings elements;
-    for (auto it = file_names.lower_bound(prefix); it != file_names.end(); ++it)
-    {
-        const String & name = it->first;
-        if (!name.starts_with(prefix))
-            break;
-        size_t start_pos = prefix.length();
-        size_t end_pos = String::npos;
-        if (!terminator.empty())
-            end_pos = name.find(terminator, start_pos);
-        std::string_view new_element = std::string_view{name}.substr(start_pos, end_pos - start_pos);
-        if (!elements.empty() && (elements.back() == new_element))
-            continue;
-        elements.push_back(String{new_element});
-    }
-
-    return elements;
+    std::lock_guard lock{file_infos_mutex};
+    return file_infos.getFileInfos("");
 }
 
-bool BackupCoordinationLocal::hasFiles(const String & directory) const
+BackupFileInfos BackupCoordinationLocal::getFileInfosForAllHosts() const
 {
-    std::lock_guard lock{mutex};
-    String prefix = directory;
-    if (!prefix.empty() && !prefix.ends_with('/'))
-        prefix += '/';
-
-    auto it = file_names.lower_bound(prefix);
-    if (it == file_names.end())
-        return false;
-
-    const String & name = it->first;
-    return name.starts_with(prefix);
+    std::lock_guard lock{file_infos_mutex};
+    return file_infos.getFileInfosForAllHosts();
 }
 
-std::optional<FileInfo> BackupCoordinationLocal::getFileInfo(const String & file_name) const
+bool BackupCoordinationLocal::startWritingFile(size_t data_file_index)
 {
-    std::lock_guard lock{mutex};
-    auto it = file_names.find(file_name);
-    if (it == file_names.end())
-        return std::nullopt;
-    const auto & size_and_checksum = it->second;
-    UInt64 size = size_and_checksum.first;
-    FileInfo info;
-    if (size) /// we don't keep FileInfos for empty files
-        info = file_infos.at(size_and_checksum);
-    info.file_name = file_name;
-    return info;
+    std::lock_guard lock{writing_files_mutex};
+    /// Return false if this function was already called with this `data_file_index`.
+    return writing_files.emplace(data_file_index).second;
 }
 
-std::optional<FileInfo> BackupCoordinationLocal::getFileInfo(const SizeAndChecksum & size_and_checksum) const
-{
-    std::lock_guard lock{mutex};
-    auto it = file_infos.find(size_and_checksum);
-    if (it == file_infos.end())
-        return std::nullopt;
-    return it->second;
-}
-
-String BackupCoordinationLocal::getNextArchiveSuffix()
-{
-    std::lock_guard lock{mutex};
-    String new_archive_suffix = fmt::format("{:03}", ++current_archive_suffix); /// Outputs 001, 002, 003, ...
-    archive_suffixes.push_back(new_archive_suffix);
-    return new_archive_suffix;
-}
-
-Strings BackupCoordinationLocal::getAllArchiveSuffixes() const
-{
-    std::lock_guard lock{mutex};
-    return archive_suffixes;
-}
 
 bool BackupCoordinationLocal::hasConcurrentBackups(const std::atomic<size_t> & num_active_backups) const
 {
-    return (num_active_backups > 1);
+    if (num_active_backups > 1)
+    {
+        LOG_WARNING(log, "Found concurrent backups: num_active_backups={}", num_active_backups);
+        return true;
+    }
+    return false;
 }
 
 }
diff --git a/src/Backups/BackupCoordinationLocal.h b/src/Backups/BackupCoordinationLocal.h
index 8e54eb6fb27..60fcc014720 100644
--- a/src/Backups/BackupCoordinationLocal.h
+++ b/src/Backups/BackupCoordinationLocal.h
@@ -1,11 +1,13 @@
 #pragma once
 
 #include <Backups/IBackupCoordination.h>
+#include <Backups/BackupCoordinationFileInfos.h>
 #include <Backups/BackupCoordinationReplicatedAccess.h>
+#include <Backups/BackupCoordinationReplicatedSQLObjects.h>
 #include <Backups/BackupCoordinationReplicatedTables.h>
 #include <base/defines.h>
-#include <map>
 #include <mutex>
+#include <unordered_set>
 
 
 namespace Poco { class Logger; }
@@ -17,13 +19,13 @@ namespace DB
 class BackupCoordinationLocal : public IBackupCoordination
 {
 public:
-    BackupCoordinationLocal();
+    BackupCoordinationLocal(bool plain_backup_);
     ~BackupCoordinationLocal() override;
 
-    void setStage(const String & current_host, const String & new_stage, const String & message) override;
-    void setError(const String & current_host, const Exception & exception) override;
-    Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait) override;
-    Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait, std::chrono::milliseconds timeout) override;
+    void setStage(const String & new_stage, const String & message) override;
+    void setError(const Exception & exception) override;
+    Strings waitForStage(const String & stage_to_wait) override;
+    Strings waitForStage(const String & stage_to_wait, std::chrono::milliseconds timeout) override;
 
     void addReplicatedPartNames(const String & table_shared_id, const String & table_name_for_logs, const String & replica_name,
                                 const std::vector<PartNameAndChecksum> & part_names_and_checksums) override;
@@ -36,32 +38,33 @@ public:
     void addReplicatedDataPath(const String & table_shared_id, const String & data_path) override;
     Strings getReplicatedDataPaths(const String & table_shared_id) const override;
 
-    void addReplicatedAccessFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id, const String & file_path) override;
-    Strings getReplicatedAccessFilePaths(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id) const override;
+    void addReplicatedAccessFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & file_path) override;
+    Strings getReplicatedAccessFilePaths(const String & access_zk_path, AccessEntityType access_entity_type) const override;
 
-    void addFileInfo(const FileInfo & file_info, bool & is_data_file_required) override;
-    void updateFileInfo(const FileInfo & file_info) override;
+    void addReplicatedSQLObjectsDir(const String & loader_zk_path, UserDefinedSQLObjectType object_type, const String & dir_path) override;
+    Strings getReplicatedSQLObjectsDirs(const String & loader_zk_path, UserDefinedSQLObjectType object_type) const override;
 
-    std::vector<FileInfo> getAllFileInfos() const override;
-    Strings listFiles(const String & directory, bool recursive) const override;
-    bool hasFiles(const String & directory) const override;
-
-    std::optional<FileInfo> getFileInfo(const String & file_name) const override;
-    std::optional<FileInfo> getFileInfo(const SizeAndChecksum & size_and_checksum) const override;
-
-    String getNextArchiveSuffix() override;
-    Strings getAllArchiveSuffixes() const override;
+    void addFileInfos(BackupFileInfos && file_infos) override;
+    BackupFileInfos getFileInfos() const override;
+    BackupFileInfos getFileInfosForAllHosts() const override;
+    bool startWritingFile(size_t data_file_index) override;
 
     bool hasConcurrentBackups(const std::atomic<size_t> & num_active_backups) const override;
 
 private:
-    mutable std::mutex mutex;
-    BackupCoordinationReplicatedTables replicated_tables TSA_GUARDED_BY(mutex);
-    BackupCoordinationReplicatedAccess replicated_access TSA_GUARDED_BY(mutex);
-    std::map<String /* file_name */, SizeAndChecksum> file_names TSA_GUARDED_BY(mutex); /// Should be ordered alphabetically, see listFiles(). For empty files we assume checksum = 0.
-    std::map<SizeAndChecksum, FileInfo> file_infos TSA_GUARDED_BY(mutex); /// Information about files. Without empty files.
-    Strings archive_suffixes TSA_GUARDED_BY(mutex);
-    size_t current_archive_suffix TSA_GUARDED_BY(mutex) = 0;
+    Poco::Logger * const log;
+
+    BackupCoordinationReplicatedTables TSA_GUARDED_BY(replicated_tables_mutex) replicated_tables;
+    BackupCoordinationReplicatedAccess TSA_GUARDED_BY(replicated_access_mutex) replicated_access;
+    BackupCoordinationReplicatedSQLObjects TSA_GUARDED_BY(replicated_sql_objects_mutex) replicated_sql_objects;
+    BackupCoordinationFileInfos TSA_GUARDED_BY(file_infos_mutex) file_infos;
+    std::unordered_set<size_t> TSA_GUARDED_BY(writing_files_mutex) writing_files;
+
+    mutable std::mutex replicated_tables_mutex;
+    mutable std::mutex replicated_access_mutex;
+    mutable std::mutex replicated_sql_objects_mutex;
+    mutable std::mutex file_infos_mutex;
+    mutable std::mutex writing_files_mutex;
 };
 
 }
diff --git a/src/Backups/BackupCoordinationRemote.cpp b/src/Backups/BackupCoordinationRemote.cpp
index 8c696057755..4cd06061e1b 100644
--- a/src/Backups/BackupCoordinationRemote.cpp
+++ b/src/Backups/BackupCoordinationRemote.cpp
@@ -1,13 +1,18 @@
 #include <Backups/BackupCoordinationRemote.h>
+
+#include <base/hex.h>
+
 #include <Access/Common/AccessEntityType.h>
+#include <Backups/BackupCoordinationReplicatedAccess.h>
+#include <Backups/BackupCoordinationStage.h>
+#include <Common/ZooKeeper/Common.h>
+#include <Common/ZooKeeper/KeeperException.h>
+#include <Common/escapeForFileName.h>
+#include <Functions/UserDefined/UserDefinedSQLObjectType.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
-#include <Common/ZooKeeper/KeeperException.h>
-#include <Common/escapeForFileName.h>
-#include <Common/hex.h>
-#include <Backups/BackupCoordinationStage.h>
 
 
 namespace DB
@@ -15,21 +20,13 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int UNEXPECTED_NODE_IN_ZOOKEEPER;
     extern const int LOGICAL_ERROR;
 }
 
 namespace Stage = BackupCoordinationStage;
 
-/// zookeeper_path/file_names/file_name->checksum_and_size
-/// zookeeper_path/file_infos/checksum_and_size->info
-/// zookeeper_path/archive_suffixes
-/// zookeeper_path/current_archive_suffix
-
 namespace
 {
-    using SizeAndChecksum = IBackupCoordination::SizeAndChecksum;
-    using FileInfo = IBackupCoordination::FileInfo;
     using PartNameAndChecksum = IBackupCoordination::PartNameAndChecksum;
     using MutationInfo = IBackupCoordination::MutationInfo;
 
@@ -103,79 +100,103 @@ namespace
         }
     };
 
-    String serializeFileInfo(const FileInfo & info)
+    struct FileInfos
     {
-        WriteBufferFromOwnString out;
-        writeBinary(info.file_name, out);
-        writeBinary(info.size, out);
-        writeBinary(info.checksum, out);
-        writeBinary(info.base_size, out);
-        writeBinary(info.base_checksum, out);
-        writeBinary(info.data_file_name, out);
-        writeBinary(info.archive_suffix, out);
-        writeBinary(info.pos_in_archive, out);
-        return out.str();
-    }
+        BackupFileInfos file_infos;
 
-    FileInfo deserializeFileInfo(const String & str)
-    {
-        FileInfo info;
-        ReadBufferFromString in{str};
-        readBinary(info.file_name, in);
-        readBinary(info.size, in);
-        readBinary(info.checksum, in);
-        readBinary(info.base_size, in);
-        readBinary(info.base_checksum, in);
-        readBinary(info.data_file_name, in);
-        readBinary(info.archive_suffix, in);
-        readBinary(info.pos_in_archive, in);
-        return info;
-    }
+        static String serialize(const BackupFileInfos & file_infos_)
+        {
+            WriteBufferFromOwnString out;
+            writeBinary(file_infos_.size(), out);
+            for (const auto & info : file_infos_)
+            {
+                writeBinary(info.file_name, out);
+                writeBinary(info.size, out);
+                writeBinary(info.checksum, out);
+                writeBinary(info.base_size, out);
+                writeBinary(info.base_checksum, out);
+                writeBinary(info.encrypted_by_disk, out);
+                /// We don't store `info.data_file_name` and `info.data_file_index` because they're determined automalically
+                /// after reading file infos for all the hosts (see the class BackupCoordinationFileInfos).
+            }
+            return out.str();
+        }
 
-    String serializeSizeAndChecksum(const SizeAndChecksum & size_and_checksum)
-    {
-        return getHexUIntLowercase(size_and_checksum.second) + '_' + std::to_string(size_and_checksum.first);
-    }
+        static FileInfos deserialize(const String & str)
+        {
+            ReadBufferFromString in{str};
+            FileInfos res;
+            size_t num;
+            readBinary(num, in);
+            res.file_infos.resize(num);
+            for (size_t i = 0; i != num; ++i)
+            {
+                auto & info = res.file_infos[i];
+                readBinary(info.file_name, in);
+                readBinary(info.size, in);
+                readBinary(info.checksum, in);
+                readBinary(info.base_size, in);
+                readBinary(info.base_checksum, in);
+                readBinary(info.encrypted_by_disk, in);
+            }
+            return res;
+        }
+    };
+}
 
-    SizeAndChecksum deserializeSizeAndChecksum(const String & str)
-    {
-        constexpr size_t num_chars_in_checksum = sizeof(UInt128) * 2;
-        if (str.size() <= num_chars_in_checksum)
-            throw Exception(
-                ErrorCodes::UNEXPECTED_NODE_IN_ZOOKEEPER,
-                "Unexpected size of checksum: {}, must be {}",
-                str.size(),
-                num_chars_in_checksum);
-        UInt128 checksum = unhexUInt<UInt128>(str.data());
-        UInt64 size = parseFromString<UInt64>(str.substr(num_chars_in_checksum + 1));
-        return std::pair{size, checksum};
-    }
-
-    size_t extractCounterFromSequentialNodeName(const String & node_name)
-    {
-        size_t pos_before_counter = node_name.find_last_not_of("0123456789");
-        size_t counter_length = node_name.length() - 1 - pos_before_counter;
-        auto counter = std::string_view{node_name}.substr(node_name.length() - counter_length);
-        return parseFromString<UInt64>(counter);
-    }
-
-    String formatArchiveSuffix(size_t counter)
-    {
-        return fmt::format("{:03}", counter); /// Outputs 001, 002, 003, ...
-    }
+size_t BackupCoordinationRemote::findCurrentHostIndex(const Strings & all_hosts, const String & current_host)
+{
+    auto it = std::find(all_hosts.begin(), all_hosts.end(), current_host);
+    if (it == all_hosts.end())
+        return 0;
+    return it - all_hosts.begin();
 }
 
 BackupCoordinationRemote::BackupCoordinationRemote(
-    const String & root_zookeeper_path_, const String & backup_uuid_, zkutil::GetZooKeeper get_zookeeper_, bool is_internal_)
+    zkutil::GetZooKeeper get_zookeeper_,
+    const String & root_zookeeper_path_,
+    const BackupKeeperSettings & keeper_settings_,
+    const String & backup_uuid_,
+    const Strings & all_hosts_,
+    const String & current_host_,
+    bool plain_backup_,
+    bool is_internal_)
     : root_zookeeper_path(root_zookeeper_path_)
     , zookeeper_path(root_zookeeper_path_ + "/backup-" + backup_uuid_)
+    , keeper_settings(keeper_settings_)
     , backup_uuid(backup_uuid_)
-    , get_zookeeper(get_zookeeper_)
+    , all_hosts(all_hosts_)
+    , current_host(current_host_)
+    , current_host_index(findCurrentHostIndex(all_hosts, current_host))
+    , plain_backup(plain_backup_)
     , is_internal(is_internal_)
+    , log(&Poco::Logger::get("BackupCoordinationRemote"))
+    , with_retries(
+        log,
+        get_zookeeper_,
+        keeper_settings,
+        [my_zookeeper_path = zookeeper_path, my_current_host = current_host, my_is_internal = is_internal]
+        (WithRetries::FaultyKeeper & zk)
+        {
+            /// Recreate this ephemeral node to signal that we are alive.
+            if (my_is_internal)
+            {
+                String alive_node_path = my_zookeeper_path + "/stage/alive|" + my_current_host;
+                auto code = zk->tryCreate(alive_node_path, "", zkutil::CreateMode::Ephemeral);
+
+                if (code == Coordination::Error::ZNODEEXISTS)
+                    zk->handleEphemeralNodeExistenceNoFailureInjection(alive_node_path, "");
+                else if (code != Coordination::Error::ZOK)
+                    throw zkutil::KeeperException(code, alive_node_path);
+            }
+        })
 {
     createRootNodes();
+
     stage_sync.emplace(
-        zookeeper_path + "/stage", [this] { return getZooKeeper(); }, &Poco::Logger::get("BackupCoordination"));
+        zookeeper_path,
+        with_retries,
+        log);
 }
 
 BackupCoordinationRemote::~BackupCoordinationRemote()
@@ -191,73 +212,143 @@ BackupCoordinationRemote::~BackupCoordinationRemote()
     }
 }
 
-zkutil::ZooKeeperPtr BackupCoordinationRemote::getZooKeeper() const
-{
-    std::lock_guard lock{mutex};
-    return getZooKeeperNoLock();
-}
-
-zkutil::ZooKeeperPtr BackupCoordinationRemote::getZooKeeperNoLock() const
-{
-    if (!zookeeper || zookeeper->expired())
-    {
-        zookeeper = get_zookeeper();
-
-        /// It's possible that we connected to different [Zoo]Keeper instance
-        /// so we may read a bit stale state.
-        zookeeper->sync(zookeeper_path);
-    }
-    return zookeeper;
-}
-
 void BackupCoordinationRemote::createRootNodes()
 {
-    auto zk = getZooKeeper();
-    zk->createAncestors(zookeeper_path);
-    zk->createIfNotExists(zookeeper_path, "");
-    zk->createIfNotExists(zookeeper_path + "/repl_part_names", "");
-    zk->createIfNotExists(zookeeper_path + "/repl_mutations", "");
-    zk->createIfNotExists(zookeeper_path + "/repl_data_paths", "");
-    zk->createIfNotExists(zookeeper_path + "/repl_access", "");
-    zk->createIfNotExists(zookeeper_path + "/file_names", "");
-    zk->createIfNotExists(zookeeper_path + "/file_infos", "");
-    zk->createIfNotExists(zookeeper_path + "/archive_suffixes", "");
+    auto holder = with_retries.createRetriesControlHolder("createRootNodes");
+    holder.retries_ctl.retryLoop(
+    [&, &zk = holder.faulty_zookeeper]()
+    {
+        with_retries.renewZooKeeper(zk);
+
+        zk->createAncestors(zookeeper_path);
+
+        Coordination::Requests ops;
+        Coordination::Responses responses;
+        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path, "", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/repl_part_names", "", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/repl_mutations", "", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/repl_data_paths", "", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/repl_access", "", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/repl_sql_objects", "", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/file_infos", "", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/writing_files", "", zkutil::CreateMode::Persistent));
+        zk->tryMulti(ops, responses);
+    });
 }
 
 void BackupCoordinationRemote::removeAllNodes()
 {
-    /// Usually this function is called by the initiator when a backup is complete so we don't need the coordination anymore.
-    ///
-    /// However there can be a rare situation when this function is called after an error occurs on the initiator of a query
-    /// while some hosts are still making the backup. Removing all the nodes will remove the parent node of the backup coordination
-    /// at `zookeeper_path` which might cause such hosts to stop with exception "ZNONODE". Or such hosts might still do some useless part
-    /// of their backup work before that. Anyway in this case backup won't be finalized (because only an initiator can do that).
-    auto zk = getZooKeeper();
-    zk->removeRecursive(zookeeper_path);
+    auto holder = with_retries.createRetriesControlHolder("removeAllNodes");
+    holder.retries_ctl.retryLoop(
+    [&, &zk = holder.faulty_zookeeper]()
+    {
+        /// Usually this function is called by the initiator when a backup is complete so we don't need the coordination anymore.
+        ///
+        /// However there can be a rare situation when this function is called after an error occurs on the initiator of a query
+        /// while some hosts are still making the backup. Removing all the nodes will remove the parent node of the backup coordination
+        /// at `zookeeper_path` which might cause such hosts to stop with exception "ZNONODE". Or such hosts might still do some useless part
+        /// of their backup work before that. Anyway in this case backup won't be finalized (because only an initiator can do that).
+        with_retries.renewZooKeeper(zk);
+        zk->removeRecursive(zookeeper_path);
+    });
 }
 
 
-void BackupCoordinationRemote::setStage(const String & current_host, const String & new_stage, const String & message)
+void BackupCoordinationRemote::setStage(const String & new_stage, const String & message)
 {
-    stage_sync->set(current_host, new_stage, message);
+    if (is_internal)
+        stage_sync->set(current_host, new_stage, message);
+    else
+        stage_sync->set(current_host, new_stage, /* message */ "", /* all_hosts */ true);
 }
 
-void BackupCoordinationRemote::setError(const String & current_host, const Exception & exception)
+void BackupCoordinationRemote::setError(const Exception & exception)
 {
     stage_sync->setError(current_host, exception);
 }
 
-Strings BackupCoordinationRemote::waitForStage(const Strings & all_hosts, const String & stage_to_wait)
+Strings BackupCoordinationRemote::waitForStage(const String & stage_to_wait)
 {
     return stage_sync->wait(all_hosts, stage_to_wait);
 }
 
-Strings BackupCoordinationRemote::waitForStage(const Strings & all_hosts, const String & stage_to_wait, std::chrono::milliseconds timeout)
+Strings BackupCoordinationRemote::waitForStage(const String & stage_to_wait, std::chrono::milliseconds timeout)
 {
     return stage_sync->waitFor(all_hosts, stage_to_wait, timeout);
 }
 
 
+void BackupCoordinationRemote::serializeToMultipleZooKeeperNodes(const String & path, const String & value, const String & logging_name)
+{
+    {
+        auto holder = with_retries.createRetriesControlHolder(logging_name + "::create");
+        holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
+            zk->createIfNotExists(path, "");
+        });
+    }
+
+    if (value.empty())
+        return;
+
+    size_t max_part_size = keeper_settings.keeper_value_max_size;
+    if (!max_part_size)
+        max_part_size = value.size();
+
+    size_t num_parts = (value.size() + max_part_size - 1) / max_part_size; /// round up
+
+    for (size_t i = 0; i != num_parts; ++i)
+    {
+        size_t begin = i * max_part_size;
+        size_t end = std::min(begin + max_part_size, value.size());
+        String part = value.substr(begin, end - begin);
+        String part_path = fmt::format("{}/{:06}", path, i);
+
+        auto holder = with_retries.createRetriesControlHolder(logging_name + "::createPart");
+        holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
+            zk->createIfNotExists(part_path, part);
+        });
+    }
+}
+
+String BackupCoordinationRemote::deserializeFromMultipleZooKeeperNodes(const String & path, const String & logging_name) const
+{
+    Strings part_names;
+
+    {
+        auto holder = with_retries.createRetriesControlHolder(logging_name + "::getChildren");
+        holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
+            part_names = zk->getChildren(path);
+            std::sort(part_names.begin(), part_names.end());
+        });
+    }
+
+    String res;
+    for (const String & part_name : part_names)
+    {
+        String part;
+        String part_path = path + "/" + part_name;
+        auto holder = with_retries.createRetriesControlHolder(logging_name + "::get");
+        holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
+            part = zk->get(part_path);
+        });
+        res += part;
+    }
+    return res;
+}
+
+
 void BackupCoordinationRemote::addReplicatedPartNames(
     const String & table_shared_id,
     const String & table_name_for_logs,
@@ -265,21 +356,26 @@ void BackupCoordinationRemote::addReplicatedPartNames(
     const std::vector<PartNameAndChecksum> & part_names_and_checksums)
 {
     {
-        std::lock_guard lock{mutex};
+        std::lock_guard lock{replicated_tables_mutex};
         if (replicated_tables)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "addReplicatedPartNames() must not be called after preparing");
     }
 
-    auto zk = getZooKeeper();
-    String path = zookeeper_path + "/repl_part_names/" + escapeForFileName(table_shared_id);
-    zk->createIfNotExists(path, "");
-    path += "/" + escapeForFileName(replica_name);
-    zk->create(path, ReplicatedPartNames::serialize(part_names_and_checksums, table_name_for_logs), zkutil::CreateMode::Persistent);
+    auto holder = with_retries.createRetriesControlHolder("addReplicatedPartNames");
+    holder.retries_ctl.retryLoop(
+    [&, &zk = holder.faulty_zookeeper]()
+    {
+        with_retries.renewZooKeeper(zk);
+        String path = zookeeper_path + "/repl_part_names/" + escapeForFileName(table_shared_id);
+        zk->createIfNotExists(path, "");
+        path += "/" + escapeForFileName(replica_name);
+        zk->createIfNotExists(path, ReplicatedPartNames::serialize(part_names_and_checksums, table_name_for_logs));
+    });
 }
 
 Strings BackupCoordinationRemote::getReplicatedPartNames(const String & table_shared_id, const String & replica_name) const
 {
-    std::lock_guard lock{mutex};
+    std::lock_guard lock{replicated_tables_mutex};
     prepareReplicatedTables();
     return replicated_tables->getPartNames(table_shared_id, replica_name);
 }
@@ -291,21 +387,26 @@ void BackupCoordinationRemote::addReplicatedMutations(
     const std::vector<MutationInfo> & mutations)
 {
     {
-        std::lock_guard lock{mutex};
+        std::lock_guard lock{replicated_tables_mutex};
         if (replicated_tables)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "addReplicatedMutations() must not be called after preparing");
     }
 
-    auto zk = getZooKeeper();
-    String path = zookeeper_path + "/repl_mutations/" + escapeForFileName(table_shared_id);
-    zk->createIfNotExists(path, "");
-    path += "/" + escapeForFileName(replica_name);
-    zk->create(path, ReplicatedMutations::serialize(mutations, table_name_for_logs), zkutil::CreateMode::Persistent);
+    auto holder = with_retries.createRetriesControlHolder("addReplicatedMutations");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
+            String path = zookeeper_path + "/repl_mutations/" + escapeForFileName(table_shared_id);
+            zk->createIfNotExists(path, "");
+            path += "/" + escapeForFileName(replica_name);
+            zk->createIfNotExists(path, ReplicatedMutations::serialize(mutations, table_name_for_logs));
+        });
 }
 
 std::vector<IBackupCoordination::MutationInfo> BackupCoordinationRemote::getReplicatedMutations(const String & table_shared_id, const String & replica_name) const
 {
-    std::lock_guard lock{mutex};
+    std::lock_guard lock{replicated_tables_mutex};
     prepareReplicatedTables();
     return replicated_tables->getMutations(table_shared_id, replica_name);
 }
@@ -315,21 +416,26 @@ void BackupCoordinationRemote::addReplicatedDataPath(
     const String & table_shared_id, const String & data_path)
 {
     {
-        std::lock_guard lock{mutex};
+        std::lock_guard lock{replicated_tables_mutex};
         if (replicated_tables)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "addReplicatedDataPath() must not be called after preparing");
     }
 
-    auto zk = getZooKeeper();
-    String path = zookeeper_path + "/repl_data_paths/" + escapeForFileName(table_shared_id);
-    zk->createIfNotExists(path, "");
-    path += "/" + escapeForFileName(data_path);
-    zk->createIfNotExists(path, "");
+    auto holder = with_retries.createRetriesControlHolder("addReplicatedDataPath");
+    holder.retries_ctl.retryLoop(
+    [&, &zk = holder.faulty_zookeeper]()
+    {
+        with_retries.renewZooKeeper(zk);
+        String path = zookeeper_path + "/repl_data_paths/" + escapeForFileName(table_shared_id);
+        zk->createIfNotExists(path, "");
+        path += "/" + escapeForFileName(data_path);
+        zk->createIfNotExists(path, "");
+    });
 }
 
 Strings BackupCoordinationRemote::getReplicatedDataPaths(const String & table_shared_id) const
 {
-    std::lock_guard lock{mutex};
+    std::lock_guard lock{replicated_tables_mutex};
     prepareReplicatedTables();
     return replicated_tables->getDataPaths(table_shared_id);
 }
@@ -340,77 +446,115 @@ void BackupCoordinationRemote::prepareReplicatedTables() const
     if (replicated_tables)
         return;
 
+    std::vector<BackupCoordinationReplicatedTables::PartNamesForTableReplica> part_names_for_replicated_tables;
+    {
+        auto holder = with_retries.createRetriesControlHolder("prepareReplicatedTables::repl_part_names");
+        holder.retries_ctl.retryLoop(
+            [&, &zk = holder.faulty_zookeeper]()
+        {
+            part_names_for_replicated_tables.clear();
+            with_retries.renewZooKeeper(zk);
+
+            String path = zookeeper_path + "/repl_part_names";
+            for (const String & escaped_table_shared_id : zk->getChildren(path))
+            {
+                String table_shared_id = unescapeForFileName(escaped_table_shared_id);
+                String path2 = path + "/" + escaped_table_shared_id;
+                for (const String & escaped_replica_name : zk->getChildren(path2))
+                {
+                    String replica_name = unescapeForFileName(escaped_replica_name);
+                    auto part_names = ReplicatedPartNames::deserialize(zk->get(path2 + "/" + escaped_replica_name));
+                    part_names_for_replicated_tables.push_back(
+                        {table_shared_id, part_names.table_name_for_logs, replica_name, part_names.part_names_and_checksums});
+                }
+            }
+        });
+    }
+
+    std::vector<BackupCoordinationReplicatedTables::MutationsForTableReplica> mutations_for_replicated_tables;
+    {
+        auto holder = with_retries.createRetriesControlHolder("prepareReplicatedTables::repl_mutations");
+        holder.retries_ctl.retryLoop(
+            [&, &zk = holder.faulty_zookeeper]()
+        {
+            mutations_for_replicated_tables.clear();
+            with_retries.renewZooKeeper(zk);
+
+            String path = zookeeper_path + "/repl_mutations";
+            for (const String & escaped_table_shared_id : zk->getChildren(path))
+            {
+                String table_shared_id = unescapeForFileName(escaped_table_shared_id);
+                String path2 = path + "/" + escaped_table_shared_id;
+                for (const String & escaped_replica_name : zk->getChildren(path2))
+                {
+                    String replica_name = unescapeForFileName(escaped_replica_name);
+                    auto mutations = ReplicatedMutations::deserialize(zk->get(path2 + "/" + escaped_replica_name));
+                    mutations_for_replicated_tables.push_back(
+                        {table_shared_id, mutations.table_name_for_logs, replica_name, mutations.mutations});
+                }
+            }
+        });
+    }
+
+    std::vector<BackupCoordinationReplicatedTables::DataPathForTableReplica> data_paths_for_replicated_tables;
+    {
+        auto holder = with_retries.createRetriesControlHolder("prepareReplicatedTables::repl_data_paths");
+        holder.retries_ctl.retryLoop(
+            [&, &zk = holder.faulty_zookeeper]()
+        {
+            data_paths_for_replicated_tables.clear();
+            with_retries.renewZooKeeper(zk);
+
+            String path = zookeeper_path + "/repl_data_paths";
+            for (const String & escaped_table_shared_id : zk->getChildren(path))
+            {
+                String table_shared_id = unescapeForFileName(escaped_table_shared_id);
+                String path2 = path + "/" + escaped_table_shared_id;
+                for (const String & escaped_data_path : zk->getChildren(path2))
+                {
+                    String data_path = unescapeForFileName(escaped_data_path);
+                    data_paths_for_replicated_tables.push_back({table_shared_id, data_path});
+                }
+            }
+        });
+    }
+
     replicated_tables.emplace();
-    auto zk = getZooKeeperNoLock();
-
-    {
-        String path = zookeeper_path + "/repl_part_names";
-        for (const String & escaped_table_shared_id : zk->getChildren(path))
-        {
-            String table_shared_id = unescapeForFileName(escaped_table_shared_id);
-            String path2 = path + "/" + escaped_table_shared_id;
-            for (const String & escaped_replica_name : zk->getChildren(path2))
-            {
-                String replica_name = unescapeForFileName(escaped_replica_name);
-                auto part_names = ReplicatedPartNames::deserialize(zk->get(path2 + "/" + escaped_replica_name));
-                replicated_tables->addPartNames(table_shared_id, part_names.table_name_for_logs, replica_name, part_names.part_names_and_checksums);
-            }
-        }
-    }
-
-    {
-        String path = zookeeper_path + "/repl_mutations";
-        for (const String & escaped_table_shared_id : zk->getChildren(path))
-        {
-            String table_shared_id = unescapeForFileName(escaped_table_shared_id);
-            String path2 = path + "/" + escaped_table_shared_id;
-            for (const String & escaped_replica_name : zk->getChildren(path2))
-            {
-                String replica_name = unescapeForFileName(escaped_replica_name);
-                auto mutations = ReplicatedMutations::deserialize(zk->get(path2 + "/" + escaped_replica_name));
-                replicated_tables->addMutations(table_shared_id, mutations.table_name_for_logs, replica_name, mutations.mutations);
-            }
-        }
-    }
-
-    {
-        String path = zookeeper_path + "/repl_data_paths";
-        for (const String & escaped_table_shared_id : zk->getChildren(path))
-        {
-            String table_shared_id = unescapeForFileName(escaped_table_shared_id);
-            String path2 = path + "/" + escaped_table_shared_id;
-            for (const String & escaped_data_path : zk->getChildren(path2))
-            {
-                String data_path = unescapeForFileName(escaped_data_path);
-                replicated_tables->addDataPath(table_shared_id, data_path);
-            }
-        }
-    }
+    for (auto & part_names : part_names_for_replicated_tables)
+        replicated_tables->addPartNames(std::move(part_names));
+    for (auto & mutations : mutations_for_replicated_tables)
+        replicated_tables->addMutations(std::move(mutations));
+    for (auto & data_paths : data_paths_for_replicated_tables)
+        replicated_tables->addDataPath(std::move(data_paths));
 }
 
-
-void BackupCoordinationRemote::addReplicatedAccessFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id, const String & file_path)
+void BackupCoordinationRemote::addReplicatedAccessFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & file_path)
 {
     {
-        std::lock_guard lock{mutex};
+        std::lock_guard lock{replicated_access_mutex};
         if (replicated_access)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "addReplicatedAccessFilePath() must not be called after preparing");
     }
 
-    auto zk = getZooKeeper();
-    String path = zookeeper_path + "/repl_access/" + escapeForFileName(access_zk_path);
-    zk->createIfNotExists(path, "");
-    path += "/" + AccessEntityTypeInfo::get(access_entity_type).name;
-    zk->createIfNotExists(path, "");
-    path += "/" + host_id;
-    zk->createIfNotExists(path, file_path);
+    auto holder = with_retries.createRetriesControlHolder("addReplicatedAccessFilePath");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+    {
+        with_retries.renewZooKeeper(zk);
+        String path = zookeeper_path + "/repl_access/" + escapeForFileName(access_zk_path);
+        zk->createIfNotExists(path, "");
+        path += "/" + AccessEntityTypeInfo::get(access_entity_type).name;
+        zk->createIfNotExists(path, "");
+        path += "/" + current_host;
+        zk->createIfNotExists(path, file_path);
+    });
 }
 
-Strings BackupCoordinationRemote::getReplicatedAccessFilePaths(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id) const
+Strings BackupCoordinationRemote::getReplicatedAccessFilePaths(const String & access_zk_path, AccessEntityType access_entity_type) const
 {
-    std::lock_guard lock{mutex};
+    std::lock_guard lock{replicated_access_mutex};
     prepareReplicatedAccess();
-    return replicated_access->getFilePaths(access_zk_path, access_entity_type, host_id);
+    return replicated_access->getFilePaths(access_zk_path, access_entity_type, current_host);
 }
 
 void BackupCoordinationRemote::prepareReplicatedAccess() const
@@ -418,183 +562,185 @@ void BackupCoordinationRemote::prepareReplicatedAccess() const
     if (replicated_access)
         return;
 
-    replicated_access.emplace();
-    auto zk = getZooKeeperNoLock();
-
-    String path = zookeeper_path + "/repl_access";
-    for (const String & escaped_access_zk_path : zk->getChildren(path))
+    std::vector<BackupCoordinationReplicatedAccess::FilePathForAccessEntitry> file_path_for_access_entities;
+    auto holder = with_retries.createRetriesControlHolder("prepareReplicatedAccess");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
     {
-        String access_zk_path = unescapeForFileName(escaped_access_zk_path);
-        String path2 = path + "/" + escaped_access_zk_path;
-        for (const String & type_str : zk->getChildren(path2))
+        file_path_for_access_entities.clear();
+        with_retries.renewZooKeeper(zk);
+
+        String path = zookeeper_path + "/repl_access";
+        for (const String & escaped_access_zk_path : zk->getChildren(path))
         {
-            AccessEntityType type = AccessEntityTypeInfo::parseType(type_str);
-            String path3 = path2 + "/" + type_str;
-            for (const String & host_id : zk->getChildren(path3))
+            String access_zk_path = unescapeForFileName(escaped_access_zk_path);
+            String path2 = path + "/" + escaped_access_zk_path;
+            for (const String & type_str : zk->getChildren(path2))
             {
-                String file_path = zk->get(path3 + "/" + host_id);
-                replicated_access->addFilePath(access_zk_path, type, host_id, file_path);
+                AccessEntityType type = AccessEntityTypeInfo::parseType(type_str);
+                String path3 = path2 + "/" + type_str;
+                for (const String & host_id : zk->getChildren(path3))
+                {
+                    String file_path = zk->get(path3 + "/" + host_id);
+                    file_path_for_access_entities.push_back({access_zk_path, type, host_id, file_path});
+                }
             }
         }
-    }
+    });
+
+    replicated_access.emplace();
+    for (auto & file_path : file_path_for_access_entities)
+        replicated_access->addFilePath(std::move(file_path));
 }
 
-
-void BackupCoordinationRemote::addFileInfo(const FileInfo & file_info, bool & is_data_file_required)
+void BackupCoordinationRemote::addReplicatedSQLObjectsDir(const String & loader_zk_path, UserDefinedSQLObjectType object_type, const String & dir_path)
 {
-    auto zk = getZooKeeper();
-
-    String full_path = zookeeper_path + "/file_names/" + escapeForFileName(file_info.file_name);
-    String size_and_checksum = serializeSizeAndChecksum(std::pair{file_info.size, file_info.checksum});
-    zk->create(full_path, size_and_checksum, zkutil::CreateMode::Persistent);
-
-    if (!file_info.size)
     {
-        is_data_file_required = false;
+        std::lock_guard lock{replicated_sql_objects_mutex};
+        if (replicated_sql_objects)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "addReplicatedSQLObjectsDir() must not be called after preparing");
+    }
+
+    auto holder = with_retries.createRetriesControlHolder("addReplicatedSQLObjectsDir");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+    {
+        with_retries.renewZooKeeper(zk);
+        String path = zookeeper_path + "/repl_sql_objects/" + escapeForFileName(loader_zk_path);
+        zk->createIfNotExists(path, "");
+
+        path += "/";
+        switch (object_type)
+        {
+            case UserDefinedSQLObjectType::Function:
+                path += "functions";
+                break;
+        }
+
+        zk->createIfNotExists(path, "");
+        path += "/" + current_host;
+        zk->createIfNotExists(path, dir_path);
+    });
+}
+
+Strings BackupCoordinationRemote::getReplicatedSQLObjectsDirs(const String & loader_zk_path, UserDefinedSQLObjectType object_type) const
+{
+    std::lock_guard lock{replicated_sql_objects_mutex};
+    prepareReplicatedSQLObjects();
+    return replicated_sql_objects->getDirectories(loader_zk_path, object_type, current_host);
+}
+
+void BackupCoordinationRemote::prepareReplicatedSQLObjects() const
+{
+    if (replicated_sql_objects)
         return;
-    }
 
-    full_path = zookeeper_path + "/file_infos/" + size_and_checksum;
-    auto code = zk->tryCreate(full_path, serializeFileInfo(file_info), zkutil::CreateMode::Persistent);
-    if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNODEEXISTS))
-        throw zkutil::KeeperException(code, full_path);
+    std::vector<BackupCoordinationReplicatedSQLObjects::DirectoryPathForSQLObject> directories_for_sql_objects;
+    auto holder = with_retries.createRetriesControlHolder("prepareReplicatedSQLObjects");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+    {
+        directories_for_sql_objects.clear();
+        with_retries.renewZooKeeper(zk);
 
-    is_data_file_required = (code == Coordination::Error::ZOK) && (file_info.size > file_info.base_size);
+        String path = zookeeper_path + "/repl_sql_objects";
+        for (const String & escaped_loader_zk_path : zk->getChildren(path))
+        {
+            String loader_zk_path = unescapeForFileName(escaped_loader_zk_path);
+            String objects_path = path + "/" + escaped_loader_zk_path;
+
+            if (String functions_path = objects_path + "/functions"; zk->exists(functions_path))
+            {
+                UserDefinedSQLObjectType object_type = UserDefinedSQLObjectType::Function;
+                for (const String & host_id : zk->getChildren(functions_path))
+                {
+                    String dir = zk->get(functions_path + "/" + host_id);
+                    directories_for_sql_objects.push_back({loader_zk_path, object_type, host_id, dir});
+                }
+            }
+        }
+    });
+
+    replicated_sql_objects.emplace();
+    for (auto & directory : directories_for_sql_objects)
+        replicated_sql_objects->addDirectory(std::move(directory));
 }
 
-void BackupCoordinationRemote::updateFileInfo(const FileInfo & file_info)
+void BackupCoordinationRemote::addFileInfos(BackupFileInfos && file_infos_)
 {
-    if (!file_info.size)
-        return; /// we don't keep FileInfos for empty files, nothing to update
-
-    auto zk = getZooKeeper();
-    String size_and_checksum = serializeSizeAndChecksum(std::pair{file_info.size, file_info.checksum});
-    String full_path = zookeeper_path + "/file_infos/" + size_and_checksum;
-    for (size_t attempt = 0; attempt < MAX_ZOOKEEPER_ATTEMPTS; ++attempt)
     {
-        Coordination::Stat stat;
-        auto new_info = deserializeFileInfo(zk->get(full_path, &stat));
-        new_info.archive_suffix = file_info.archive_suffix;
-        auto code = zk->trySet(full_path, serializeFileInfo(new_info), stat.version);
+        std::lock_guard lock{file_infos_mutex};
+        if (file_infos)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "addFileInfos() must not be called after preparing");
+    }
+
+    /// Serialize `file_infos_` and write it to ZooKeeper's nodes.
+    String file_infos_str = FileInfos::serialize(file_infos_);
+    serializeToMultipleZooKeeperNodes(zookeeper_path + "/file_infos/" + current_host, file_infos_str, "addFileInfos");
+}
+
+BackupFileInfos BackupCoordinationRemote::getFileInfos() const
+{
+    std::lock_guard lock{file_infos_mutex};
+    prepareFileInfos();
+    return file_infos->getFileInfos(current_host);
+}
+
+BackupFileInfos BackupCoordinationRemote::getFileInfosForAllHosts() const
+{
+    std::lock_guard lock{file_infos_mutex};
+    prepareFileInfos();
+    return file_infos->getFileInfosForAllHosts();
+}
+
+void BackupCoordinationRemote::prepareFileInfos() const
+{
+    if (file_infos)
+        return;
+
+    file_infos.emplace(plain_backup);
+
+    Strings hosts_with_file_infos;
+    {
+        auto holder = with_retries.createRetriesControlHolder("prepareFileInfos::get_hosts");
+        holder.retries_ctl.retryLoop(
+            [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
+            hosts_with_file_infos = zk->getChildren(zookeeper_path + "/file_infos");
+        });
+    }
+
+    for (const String & host : hosts_with_file_infos)
+    {
+        String file_infos_str = deserializeFromMultipleZooKeeperNodes(zookeeper_path + "/file_infos/" + host, "prepareFileInfos");
+        auto deserialized_file_infos = FileInfos::deserialize(file_infos_str).file_infos;
+        file_infos->addFileInfos(std::move(deserialized_file_infos), host);
+    }
+}
+
+bool BackupCoordinationRemote::startWritingFile(size_t data_file_index)
+{
+    bool acquired_writing = false;
+    String full_path = zookeeper_path + "/writing_files/" + std::to_string(data_file_index);
+    String host_index_str = std::to_string(current_host_index);
+
+    auto holder = with_retries.createRetriesControlHolder("startWritingFile");
+    holder.retries_ctl.retryLoop(
+            [&, &zk = holder.faulty_zookeeper]()
+    {
+        with_retries.renewZooKeeper(zk);
+        auto code = zk->tryCreate(full_path, host_index_str, zkutil::CreateMode::Persistent);
+
         if (code == Coordination::Error::ZOK)
-            return;
-        bool is_last_attempt = (attempt == MAX_ZOOKEEPER_ATTEMPTS - 1);
-        if ((code != Coordination::Error::ZBADVERSION) || is_last_attempt)
+            acquired_writing = true; /// If we've just created this ZooKeeper's node, the writing is acquired, i.e. we should write this data file.
+        else if (code == Coordination::Error::ZNODEEXISTS)
+            acquired_writing = (zk->get(full_path) == host_index_str); /// The previous retry could write this ZooKeeper's node and then fail.
+        else
             throw zkutil::KeeperException(code, full_path);
-    }
-}
+    });
 
-std::vector<FileInfo> BackupCoordinationRemote::getAllFileInfos() const
-{
-    auto zk = getZooKeeper();
-    std::vector<FileInfo> file_infos;
-    Strings escaped_names = zk->getChildren(zookeeper_path + "/file_names");
-    for (const String & escaped_name : escaped_names)
-    {
-        String size_and_checksum = zk->get(zookeeper_path + "/file_names/" + escaped_name);
-        UInt64 size = deserializeSizeAndChecksum(size_and_checksum).first;
-        FileInfo file_info;
-        if (size) /// we don't keep FileInfos for empty files
-            file_info = deserializeFileInfo(zk->get(zookeeper_path + "/file_infos/" + size_and_checksum));
-        file_info.file_name = unescapeForFileName(escaped_name);
-        file_infos.emplace_back(std::move(file_info));
-    }
-    return file_infos;
-}
-
-Strings BackupCoordinationRemote::listFiles(const String & directory, bool recursive) const
-{
-    auto zk = getZooKeeper();
-    Strings escaped_names = zk->getChildren(zookeeper_path + "/file_names");
-
-    String prefix = directory;
-    if (!prefix.empty() && !prefix.ends_with('/'))
-        prefix += '/';
-    String terminator = recursive ? "" : "/";
-
-    Strings elements;
-    std::unordered_set<std::string_view> unique_elements;
-
-    for (const String & escaped_name : escaped_names)
-    {
-        String name = unescapeForFileName(escaped_name);
-        if (!name.starts_with(prefix))
-            continue;
-        size_t start_pos = prefix.length();
-        size_t end_pos = String::npos;
-        if (!terminator.empty())
-            end_pos = name.find(terminator, start_pos);
-        std::string_view new_element = std::string_view{name}.substr(start_pos, end_pos - start_pos);
-        if (unique_elements.contains(new_element))
-            continue;
-        elements.push_back(String{new_element});
-        unique_elements.emplace(new_element);
-    }
-
-    ::sort(elements.begin(), elements.end());
-    return elements;
-}
-
-bool BackupCoordinationRemote::hasFiles(const String & directory) const
-{
-    auto zk = getZooKeeper();
-    Strings escaped_names = zk->getChildren(zookeeper_path + "/file_names");
-
-    String prefix = directory;
-    if (!prefix.empty() && !prefix.ends_with('/'))
-        prefix += '/';
-
-    for (const String & escaped_name : escaped_names)
-    {
-        String name = unescapeForFileName(escaped_name);
-        if (name.starts_with(prefix))
-            return true;
-    }
-
-    return false;
-}
-
-std::optional<FileInfo> BackupCoordinationRemote::getFileInfo(const String & file_name) const
-{
-    auto zk = getZooKeeper();
-    String size_and_checksum;
-    if (!zk->tryGet(zookeeper_path + "/file_names/" + escapeForFileName(file_name), size_and_checksum))
-        return std::nullopt;
-    UInt64 size = deserializeSizeAndChecksum(size_and_checksum).first;
-    FileInfo file_info;
-    if (size) /// we don't keep FileInfos for empty files
-        file_info = deserializeFileInfo(zk->get(zookeeper_path + "/file_infos/" + size_and_checksum));
-    file_info.file_name = file_name;
-    return file_info;
-}
-
-std::optional<FileInfo> BackupCoordinationRemote::getFileInfo(const SizeAndChecksum & size_and_checksum) const
-{
-    auto zk = getZooKeeper();
-    String file_info_str;
-    if (!zk->tryGet(zookeeper_path + "/file_infos/" + serializeSizeAndChecksum(size_and_checksum), file_info_str))
-        return std::nullopt;
-    return deserializeFileInfo(file_info_str);
-}
-
-String BackupCoordinationRemote::getNextArchiveSuffix()
-{
-    auto zk = getZooKeeper();
-    String path = zookeeper_path + "/archive_suffixes/a";
-    String path_created;
-    auto code = zk->tryCreate(path, "", zkutil::CreateMode::PersistentSequential, path_created);
-    if (code != Coordination::Error::ZOK)
-        throw zkutil::KeeperException(code, path);
-    return formatArchiveSuffix(extractCounterFromSequentialNodeName(path_created));
-}
-
-Strings BackupCoordinationRemote::getAllArchiveSuffixes() const
-{
-    auto zk = getZooKeeper();
-    Strings node_names = zk->getChildren(zookeeper_path + "/archive_suffixes");
-    for (auto & node_name : node_names)
-        node_name = formatArchiveSuffix(extractCounterFromSequentialNodeName(node_name));
-    return node_names;
+    return acquired_writing;
 }
 
 bool BackupCoordinationRemote::hasConcurrentBackups(const std::atomic<size_t> &) const
@@ -603,45 +749,60 @@ bool BackupCoordinationRemote::hasConcurrentBackups(const std::atomic<size_t> &)
     if (is_internal)
         return false;
 
-    auto zk = getZooKeeper();
-    std::string backup_stage_path = zookeeper_path +"/stage";
+    std::string backup_stage_path = zookeeper_path + "/stage";
 
-    if (!zk->exists(root_zookeeper_path))
-        zk->createAncestors(root_zookeeper_path);
+    bool result = false;
 
-    for (size_t attempt = 0; attempt < MAX_ZOOKEEPER_ATTEMPTS; ++attempt)
+    auto holder = with_retries.createRetriesControlHolder("getAllArchiveSuffixes");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
     {
-        Coordination::Stat stat;
-        zk->get(root_zookeeper_path, &stat);
-        Strings existing_backup_paths = zk->getChildren(root_zookeeper_path);
+        with_retries.renewZooKeeper(zk);
 
-        for (const auto & existing_backup_path : existing_backup_paths)
+        if (!zk->exists(root_zookeeper_path))
+            zk->createAncestors(root_zookeeper_path);
+
+        for (size_t attempt = 0; attempt < MAX_ZOOKEEPER_ATTEMPTS; ++attempt)
         {
-            if (startsWith(existing_backup_path, "restore-"))
-                continue;
+            Coordination::Stat stat;
+            zk->get(root_zookeeper_path, &stat);
+            Strings existing_backup_paths = zk->getChildren(root_zookeeper_path);
 
-            String existing_backup_uuid = existing_backup_path;
-            existing_backup_uuid.erase(0, String("backup-").size());
+            for (const auto & existing_backup_path : existing_backup_paths)
+            {
+                if (startsWith(existing_backup_path, "restore-"))
+                    continue;
 
-            if (existing_backup_uuid == toString(backup_uuid))
-                continue;
+                String existing_backup_uuid = existing_backup_path;
+                existing_backup_uuid.erase(0, String("backup-").size());
 
-            const auto status = zk->get(root_zookeeper_path + "/" + existing_backup_path + "/stage");
-            if (status != Stage::COMPLETED)
-                return true;
+                if (existing_backup_uuid == toString(backup_uuid))
+                    continue;
+
+                String status;
+                if (zk->tryGet(root_zookeeper_path + "/" + existing_backup_path + "/stage", status))
+                {
+                    /// Check if some other backup is in progress
+                    if (status == Stage::SCHEDULED_TO_START)
+                    {
+                        LOG_WARNING(log, "Found a concurrent backup: {}, current backup: {}", existing_backup_uuid, toString(backup_uuid));
+                        result = true;
+                        return;
+                    }
+                }
+            }
+
+            zk->createIfNotExists(backup_stage_path, "");
+            auto code = zk->trySet(backup_stage_path, Stage::SCHEDULED_TO_START, stat.version);
+            if (code == Coordination::Error::ZOK)
+                break;
+            bool is_last_attempt = (attempt == MAX_ZOOKEEPER_ATTEMPTS - 1);
+            if ((code != Coordination::Error::ZBADVERSION) || is_last_attempt)
+                throw zkutil::KeeperException(code, backup_stage_path);
         }
+    });
 
-        zk->createIfNotExists(backup_stage_path, "");
-        auto code = zk->trySet(backup_stage_path, Stage::SCHEDULED_TO_START, stat.version);
-        if (code == Coordination::Error::ZOK)
-            break;
-        bool is_last_attempt = (attempt == MAX_ZOOKEEPER_ATTEMPTS - 1);
-        if ((code != Coordination::Error::ZBADVERSION) || is_last_attempt)
-            throw zkutil::KeeperException(code, backup_stage_path);
-    }
-
-    return false;
+    return result;
 }
 
-
 }
diff --git a/src/Backups/BackupCoordinationRemote.h b/src/Backups/BackupCoordinationRemote.h
index c7260bcd237..949dd9c9bf0 100644
--- a/src/Backups/BackupCoordinationRemote.h
+++ b/src/Backups/BackupCoordinationRemote.h
@@ -1,9 +1,12 @@
 #pragma once
 
 #include <Backups/IBackupCoordination.h>
+#include <Backups/BackupCoordinationFileInfos.h>
 #include <Backups/BackupCoordinationReplicatedAccess.h>
+#include <Backups/BackupCoordinationReplicatedSQLObjects.h>
 #include <Backups/BackupCoordinationReplicatedTables.h>
 #include <Backups/BackupCoordinationStageSync.h>
+#include <Backups/WithRetries.h>
 
 
 namespace DB
@@ -16,13 +19,24 @@ constexpr size_t MAX_ZOOKEEPER_ATTEMPTS = 10;
 class BackupCoordinationRemote : public IBackupCoordination
 {
 public:
-    BackupCoordinationRemote(const String & root_zookeeper_path_, const String & backup_uuid_, zkutil::GetZooKeeper get_zookeeper_, bool is_internal_);
+    using BackupKeeperSettings = WithRetries::KeeperSettings;
+
+    BackupCoordinationRemote(
+        zkutil::GetZooKeeper get_zookeeper_,
+        const String & root_zookeeper_path_,
+        const BackupKeeperSettings & keeper_settings_,
+        const String & backup_uuid_,
+        const Strings & all_hosts_,
+        const String & current_host_,
+        bool plain_backup_,
+        bool is_internal_);
+
     ~BackupCoordinationRemote() override;
 
-    void setStage(const String & current_host, const String & new_stage, const String & message) override;
-    void setError(const String & current_host, const Exception & exception) override;
-    Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait) override;
-    Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait, std::chrono::milliseconds timeout) override;
+    void setStage(const String & new_stage, const String & message) override;
+    void setError(const Exception & exception) override;
+    Strings waitForStage(const String & stage_to_wait) override;
+    Strings waitForStage(const String & stage_to_wait, std::chrono::milliseconds timeout) override;
 
     void addReplicatedPartNames(
         const String & table_shared_id,
@@ -43,43 +57,61 @@ public:
     void addReplicatedDataPath(const String & table_shared_id, const String & data_path) override;
     Strings getReplicatedDataPaths(const String & table_shared_id) const override;
 
-    void addReplicatedAccessFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id, const String & file_path) override;
-    Strings getReplicatedAccessFilePaths(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id) const override;
+    void addReplicatedAccessFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & file_path) override;
+    Strings getReplicatedAccessFilePaths(const String & access_zk_path, AccessEntityType access_entity_type) const override;
 
-    void addFileInfo(const FileInfo & file_info, bool & is_data_file_required) override;
-    void updateFileInfo(const FileInfo & file_info) override;
+    void addReplicatedSQLObjectsDir(const String & loader_zk_path, UserDefinedSQLObjectType object_type, const String & dir_path) override;
+    Strings getReplicatedSQLObjectsDirs(const String & loader_zk_path, UserDefinedSQLObjectType object_type) const override;
 
-    std::vector<FileInfo> getAllFileInfos() const override;
-    Strings listFiles(const String & directory, bool recursive) const override;
-    bool hasFiles(const String & directory) const override;
-    std::optional<FileInfo> getFileInfo(const String & file_name) const override;
-    std::optional<FileInfo> getFileInfo(const SizeAndChecksum & size_and_checksum) const override;
-
-    String getNextArchiveSuffix() override;
-    Strings getAllArchiveSuffixes() const override;
+    void addFileInfos(BackupFileInfos && file_infos) override;
+    BackupFileInfos getFileInfos() const override;
+    BackupFileInfos getFileInfosForAllHosts() const override;
+    bool startWritingFile(size_t data_file_index) override;
 
     bool hasConcurrentBackups(const std::atomic<size_t> & num_active_backups) const override;
 
+    static size_t findCurrentHostIndex(const Strings & all_hosts, const String & current_host);
+
 private:
-    zkutil::ZooKeeperPtr getZooKeeper() const;
-    zkutil::ZooKeeperPtr getZooKeeperNoLock() const;
     void createRootNodes();
     void removeAllNodes();
-    void prepareReplicatedTables() const;
-    void prepareReplicatedAccess() const;
+
+    void serializeToMultipleZooKeeperNodes(const String & path, const String & value, const String & logging_name);
+    String deserializeFromMultipleZooKeeperNodes(const String & path, const String & logging_name) const;
+
+    /// Reads data of all objects from ZooKeeper that replicas have added to backup and add it to the corresponding
+    /// BackupCoordinationReplicated* objects.
+    /// After that, calling addReplicated* functions is not allowed and throws an exception.
+    void prepareReplicatedTables() const TSA_REQUIRES(replicated_tables_mutex);
+    void prepareReplicatedAccess() const TSA_REQUIRES(replicated_access_mutex);
+    void prepareReplicatedSQLObjects() const TSA_REQUIRES(replicated_sql_objects_mutex);
+    void prepareFileInfos() const TSA_REQUIRES(file_infos_mutex);
 
     const String root_zookeeper_path;
     const String zookeeper_path;
+    const BackupKeeperSettings keeper_settings;
     const String backup_uuid;
-    const zkutil::GetZooKeeper get_zookeeper;
+    const Strings all_hosts;
+    const String current_host;
+    const size_t current_host_index;
+    const bool plain_backup;
     const bool is_internal;
+    Poco::Logger * const log;
 
+    /// The order of these two fields matters, because stage_sync holds a reference to with_retries object
+    mutable WithRetries with_retries;
     std::optional<BackupCoordinationStageSync> stage_sync;
 
-    mutable std::mutex mutex;
-    mutable zkutil::ZooKeeperPtr zookeeper;
-    mutable std::optional<BackupCoordinationReplicatedTables> replicated_tables;
-    mutable std::optional<BackupCoordinationReplicatedAccess> replicated_access;
+    mutable std::optional<BackupCoordinationReplicatedTables> TSA_GUARDED_BY(replicated_tables_mutex) replicated_tables;
+    mutable std::optional<BackupCoordinationReplicatedAccess> TSA_GUARDED_BY(replicated_access_mutex) replicated_access;
+    mutable std::optional<BackupCoordinationReplicatedSQLObjects> TSA_GUARDED_BY(replicated_sql_objects_mutex) replicated_sql_objects;
+    mutable std::optional<BackupCoordinationFileInfos> TSA_GUARDED_BY(file_infos_mutex) file_infos;
+
+    mutable std::mutex zookeeper_mutex;
+    mutable std::mutex replicated_tables_mutex;
+    mutable std::mutex replicated_access_mutex;
+    mutable std::mutex replicated_sql_objects_mutex;
+    mutable std::mutex file_infos_mutex;
 };
 
 }
diff --git a/src/Backups/BackupCoordinationReplicatedAccess.cpp b/src/Backups/BackupCoordinationReplicatedAccess.cpp
index 23d35d0ecc4..5a7d049920c 100644
--- a/src/Backups/BackupCoordinationReplicatedAccess.cpp
+++ b/src/Backups/BackupCoordinationReplicatedAccess.cpp
@@ -7,8 +7,13 @@ namespace DB
 BackupCoordinationReplicatedAccess::BackupCoordinationReplicatedAccess() = default;
 BackupCoordinationReplicatedAccess::~BackupCoordinationReplicatedAccess() = default;
 
-void BackupCoordinationReplicatedAccess::addFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id, const String & file_path)
+void BackupCoordinationReplicatedAccess::addFilePath(FilePathForAccessEntitry && file_path_for_access_entity)
 {
+    const auto & access_zk_path = file_path_for_access_entity.access_zk_path;
+    const auto & access_entity_type = file_path_for_access_entity.access_entity_type;
+    const auto & host_id = file_path_for_access_entity.host_id;
+    const auto & file_path = file_path_for_access_entity.file_path;
+
     auto & ref = file_paths_by_zk_path[std::make_pair(access_zk_path, access_entity_type)];
     ref.file_paths.emplace(file_path);
 
diff --git a/src/Backups/BackupCoordinationReplicatedAccess.h b/src/Backups/BackupCoordinationReplicatedAccess.h
index 93ae0203be9..9ed9e62c21a 100644
--- a/src/Backups/BackupCoordinationReplicatedAccess.h
+++ b/src/Backups/BackupCoordinationReplicatedAccess.h
@@ -28,8 +28,16 @@ public:
     BackupCoordinationReplicatedAccess();
     ~BackupCoordinationReplicatedAccess();
 
+    struct FilePathForAccessEntitry
+    {
+        String access_zk_path;
+        AccessEntityType access_entity_type;
+        String host_id;
+        String file_path;
+    };
+
     /// Adds a path to access*.txt file keeping access entities of a ReplicatedAccessStorage.
-    void addFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id, const String & file_path);
+    void addFilePath(FilePathForAccessEntitry && file_path_for_access_entity);
 
     /// Returns all paths added by addFilePath() if `host_id` is a host chosen to store access.
     Strings getFilePaths(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id) const;
diff --git a/src/Backups/BackupCoordinationReplicatedSQLObjects.cpp b/src/Backups/BackupCoordinationReplicatedSQLObjects.cpp
new file mode 100644
index 00000000000..cb326e17411
--- /dev/null
+++ b/src/Backups/BackupCoordinationReplicatedSQLObjects.cpp
@@ -0,0 +1,38 @@
+#include <Backups/BackupCoordinationReplicatedSQLObjects.h>
+
+
+namespace DB
+{
+
+BackupCoordinationReplicatedSQLObjects::BackupCoordinationReplicatedSQLObjects() = default;
+BackupCoordinationReplicatedSQLObjects::~BackupCoordinationReplicatedSQLObjects() = default;
+
+void BackupCoordinationReplicatedSQLObjects::addDirectory(DirectoryPathForSQLObject && directory_path_for_sql_object)
+{
+    const auto & loader_zk_path = directory_path_for_sql_object.loader_zk_path;
+    const auto & object_type = directory_path_for_sql_object.object_type;
+    const auto & host_id = directory_path_for_sql_object.host_id;
+    const auto & dir_path = directory_path_for_sql_object.dir_path;
+
+    auto & ref = dir_paths_by_zk_path[std::make_pair(loader_zk_path, object_type)];
+    ref.dir_paths.emplace(dir_path);
+
+    /// std::max() because the calculation must give the same result being repeated on a different replica.
+    ref.host_to_store = std::max(ref.host_to_store, host_id);
+}
+
+Strings BackupCoordinationReplicatedSQLObjects::getDirectories(const String & loader_zk_path, UserDefinedSQLObjectType object_type, const String & host_id) const
+{
+    auto it = dir_paths_by_zk_path.find(std::make_pair(loader_zk_path, object_type));
+    if (it == dir_paths_by_zk_path.end())
+        return {};
+
+    const auto & dir_paths = it->second;
+    if (dir_paths.host_to_store != host_id)
+        return {};
+
+    Strings res{dir_paths.dir_paths.begin(), dir_paths.dir_paths.end()};
+    return res;
+}
+
+}
diff --git a/src/Backups/BackupCoordinationReplicatedSQLObjects.h b/src/Backups/BackupCoordinationReplicatedSQLObjects.h
new file mode 100644
index 00000000000..27aa08ee755
--- /dev/null
+++ b/src/Backups/BackupCoordinationReplicatedSQLObjects.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <map>
+#include <unordered_set>
+
+
+namespace DB
+{
+enum class UserDefinedSQLObjectType;
+
+/// This class is used by hosts to coordinate the user-defined SQL objects they're going to write to a backup.
+/// It's designed to make all hosts save the same objects to the backup even in case some objects change while
+/// the backup is being produced. This is important to make RESTORE more predicitible.
+///
+/// For example, let's consider three replicas having access to the user-defined function `f1`.
+/// This class ensures that the following files in the backup will be the same:
+/// /shards/1/replicas/1/data/system/functions/f1.sql
+/// /shards/1/replicas/2/data/system/functions/f1.sql
+/// /shards/1/replicas/3/data/system/functions/f1.sql
+///
+/// To implement that this class chooses one host to write user-defined SQL objects for all the hosts so in fact all those files
+/// in the example above are written by single host.
+
+class BackupCoordinationReplicatedSQLObjects
+{
+public:
+    BackupCoordinationReplicatedSQLObjects();
+    ~BackupCoordinationReplicatedSQLObjects();
+
+    struct DirectoryPathForSQLObject
+    {
+        String loader_zk_path;
+        UserDefinedSQLObjectType object_type;
+        String host_id;
+        String dir_path;
+    };
+
+    /// Adds a path to directory keeping user defined SQL objects.
+    void addDirectory(DirectoryPathForSQLObject && directory_path_for_sql_object);
+
+    /// Returns all added paths to directories if `host_id` is a host chosen to store user-defined SQL objects.
+    Strings getDirectories(const String & loader_zk_path, UserDefinedSQLObjectType object_type, const String & host_id) const;
+
+private:
+    using ZkPathAndObjectType = std::pair<String, UserDefinedSQLObjectType>;
+
+    struct DirPathsAndHost
+    {
+        std::unordered_set<String> dir_paths;
+        String host_to_store;
+    };
+
+    std::map<ZkPathAndObjectType, DirPathsAndHost> dir_paths_by_zk_path;
+};
+
+}
diff --git a/src/Backups/BackupCoordinationReplicatedTables.cpp b/src/Backups/BackupCoordinationReplicatedTables.cpp
index 27977445641..87de1c7ec75 100644
--- a/src/Backups/BackupCoordinationReplicatedTables.cpp
+++ b/src/Backups/BackupCoordinationReplicatedTables.cpp
@@ -149,12 +149,13 @@ private:
 BackupCoordinationReplicatedTables::BackupCoordinationReplicatedTables() = default;
 BackupCoordinationReplicatedTables::~BackupCoordinationReplicatedTables() = default;
 
-void BackupCoordinationReplicatedTables::addPartNames(
-    const String & table_shared_id,
-    const String & table_name_for_logs,
-    const String & replica_name,
-    const std::vector<PartNameAndChecksum> & part_names_and_checksums)
+void BackupCoordinationReplicatedTables::addPartNames(PartNamesForTableReplica && part_names)
 {
+    const auto & table_shared_id = part_names.table_shared_id;
+    const auto & table_name_for_logs = part_names.table_name_for_logs;
+    const auto & replica_name = part_names.replica_name;
+    const auto & part_names_and_checksums = part_names.part_names_and_checksums;
+
     if (prepared)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "addPartNames() must not be called after preparing");
 
@@ -216,12 +217,13 @@ Strings BackupCoordinationReplicatedTables::getPartNames(const String & table_sh
     return it2->second;
 }
 
-void BackupCoordinationReplicatedTables::addMutations(
-    const String & table_shared_id,
-    const String & table_name_for_logs,
-    const String & replica_name,
-    const std::vector<MutationInfo> & mutations)
+void BackupCoordinationReplicatedTables::addMutations(MutationsForTableReplica && mutations_for_table_replica)
 {
+    const auto & table_shared_id = mutations_for_table_replica.table_shared_id;
+    const auto & table_name_for_logs = mutations_for_table_replica.table_name_for_logs;
+    const auto & replica_name = mutations_for_table_replica.replica_name;
+    const auto & mutations = mutations_for_table_replica.mutations;
+
     if (prepared)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "addMutations() must not be called after preparing");
 
@@ -254,8 +256,11 @@ BackupCoordinationReplicatedTables::getMutations(const String & table_shared_id,
     return res;
 }
 
-void BackupCoordinationReplicatedTables::addDataPath(const String & table_shared_id, const String & data_path)
+void BackupCoordinationReplicatedTables::addDataPath(DataPathForTableReplica && data_path_for_table_replica)
 {
+    const auto & table_shared_id = data_path_for_table_replica.table_shared_id;
+    const auto & data_path = data_path_for_table_replica.data_path;
+
     auto & table_info = table_infos[table_shared_id];
     table_info.data_paths.emplace(data_path);
 }
diff --git a/src/Backups/BackupCoordinationReplicatedTables.h b/src/Backups/BackupCoordinationReplicatedTables.h
index 7b9f608d28b..74f21eb9c7c 100644
--- a/src/Backups/BackupCoordinationReplicatedTables.h
+++ b/src/Backups/BackupCoordinationReplicatedTables.h
@@ -38,15 +38,19 @@ public:
 
     using PartNameAndChecksum = IBackupCoordination::PartNameAndChecksum;
 
+    struct PartNamesForTableReplica
+    {
+        String table_shared_id;
+        String table_name_for_logs;
+        String replica_name;
+        std::vector<PartNameAndChecksum> part_names_and_checksums;
+    };
+
     /// Adds part names which a specified replica of a replicated table is going to put to the backup.
     /// Multiple replicas of the replicated table call this function and then the added part names can be returned by call of the function
     /// getPartNames().
     /// Checksums are used only to control that parts under the same names on different replicas are the same.
-    void addPartNames(
-        const String & table_shared_id,
-        const String & table_name_for_logs,
-        const String & replica_name,
-        const std::vector<PartNameAndChecksum> & part_names_and_checksums);
+    void addPartNames(PartNamesForTableReplica && part_names);
 
     /// Returns the names of the parts which a specified replica of a replicated table should put to the backup.
     /// This is the same list as it was added by call of the function addPartNames() but without duplications and without
@@ -55,20 +59,30 @@ public:
 
     using MutationInfo = IBackupCoordination::MutationInfo;
 
+    struct MutationsForTableReplica
+    {
+        String table_shared_id;
+        String table_name_for_logs;
+        String replica_name;
+        std::vector<MutationInfo> mutations;
+    };
+
     /// Adds information about mutations of a replicated table.
-    void addMutations(
-        const String & table_shared_id,
-        const String & table_name_for_logs,
-        const String & replica_name,
-        const std::vector<MutationInfo> & mutations);
+    void addMutations(MutationsForTableReplica && mutations_for_table_replica);
 
     /// Returns all mutations of a replicated table which are not finished for some data parts added by addReplicatedPartNames().
     std::vector<MutationInfo> getMutations(const String & table_shared_id, const String & replica_name) const;
 
+    struct DataPathForTableReplica
+    {
+        String table_shared_id;
+        String data_path;
+    };
+
     /// Adds a data path in backup for a replicated table.
     /// Multiple replicas of the replicated table call this function and then all the added paths can be returned by call of the function
     /// getDataPaths().
-    void addDataPath(const String & table_shared_id, const String & data_path);
+    void addDataPath(DataPathForTableReplica && data_path_for_table_replica);
 
     /// Returns all the data paths in backup added for a replicated table (see also addReplicatedDataPath()).
     Strings getDataPaths(const String & table_shared_id) const;
diff --git a/src/Backups/BackupCoordinationStage.h b/src/Backups/BackupCoordinationStage.h
index 2c02b651851..41cd66346a2 100644
--- a/src/Backups/BackupCoordinationStage.h
+++ b/src/Backups/BackupCoordinationStage.h
@@ -23,6 +23,9 @@ namespace BackupCoordinationStage
     /// Running special tasks for replicated tables which can also prepare some backup entries.
     constexpr const char * RUNNING_POST_TASKS = "running post-tasks";
 
+    /// Building information about all files which will be written to a backup.
+    constexpr const char * BUILDING_FILE_INFOS = "building file infos";
+
     /// Writing backup entries to the backup and removing temporary hard links.
     constexpr const char * WRITING_BACKUP = "writing backup";
 
@@ -40,6 +43,10 @@ namespace BackupCoordinationStage
 
     /// Coordination stage meaning that a host finished its work.
     constexpr const char * COMPLETED = "completed";
+
+    /// Coordination stage meaning that backup/restore has failed due to an error
+    /// Check '/error' for the error message
+    constexpr const char * ERROR = "error";
 }
 
 }
diff --git a/src/Backups/BackupCoordinationStageSync.cpp b/src/Backups/BackupCoordinationStageSync.cpp
index e4773223075..3d8c283f084 100644
--- a/src/Backups/BackupCoordinationStageSync.cpp
+++ b/src/Backups/BackupCoordinationStageSync.cpp
@@ -1,25 +1,32 @@
 #include <Backups/BackupCoordinationStageSync.h>
+
+#include <base/chrono_io.h>
+#include <Common/ZooKeeper/Common.h>
 #include <Common/Exception.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
-#include <base/chrono_io.h>
-
+#include <Backups/BackupCoordinationStage.h>
 
 namespace DB
 {
 
+namespace Stage = BackupCoordinationStage;
+
 namespace ErrorCodes
 {
     extern const int FAILED_TO_SYNC_BACKUP_OR_RESTORE;
 }
 
 
-BackupCoordinationStageSync::BackupCoordinationStageSync(const String & zookeeper_path_, zkutil::GetZooKeeper get_zookeeper_, Poco::Logger * log_)
-    : zookeeper_path(zookeeper_path_)
-    , get_zookeeper(get_zookeeper_)
+BackupCoordinationStageSync::BackupCoordinationStageSync(
+    const String & root_zookeeper_path_,
+    WithRetries & with_retries_,
+    Poco::Logger * log_)
+    : zookeeper_path(root_zookeeper_path_ + "/stage")
+    , with_retries(with_retries_)
     , log(log_)
 {
     createRootNodes();
@@ -27,32 +34,61 @@ BackupCoordinationStageSync::BackupCoordinationStageSync(const String & zookeepe
 
 void BackupCoordinationStageSync::createRootNodes()
 {
-    auto zookeeper = get_zookeeper();
-    zookeeper->createAncestors(zookeeper_path);
-    zookeeper->createIfNotExists(zookeeper_path, "");
+    auto holder = with_retries.createRetriesControlHolder("createRootNodes");
+    holder.retries_ctl.retryLoop(
+        [&, &zookeeper = holder.faulty_zookeeper]()
+    {
+        with_retries.renewZooKeeper(zookeeper);
+        zookeeper->createAncestors(zookeeper_path);
+        zookeeper->createIfNotExists(zookeeper_path, "");
+    });
 }
 
-void BackupCoordinationStageSync::set(const String & current_host, const String & new_stage, const String & message)
+void BackupCoordinationStageSync::set(const String & current_host, const String & new_stage, const String & message, const bool & all_hosts)
 {
-    auto zookeeper = get_zookeeper();
+    auto holder = with_retries.createRetriesControlHolder("set");
+    holder.retries_ctl.retryLoop(
+        [&, &zookeeper = holder.faulty_zookeeper]()
+    {
+        with_retries.renewZooKeeper(zookeeper);
 
-    /// Make an ephemeral node so the initiator can track if the current host is still working.
-    String alive_node_path = zookeeper_path + "/alive|" + current_host;
-    auto code = zookeeper->tryCreate(alive_node_path, "", zkutil::CreateMode::Ephemeral);
-    if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNODEEXISTS)
-        throw zkutil::KeeperException(code, alive_node_path);
+        if (all_hosts)
+        {
+            auto code = zookeeper->trySet(zookeeper_path, new_stage);
+            if (code != Coordination::Error::ZOK)
+                throw zkutil::KeeperException(code, zookeeper_path);
+        }
+        else
+        {
+            /// Make an ephemeral node so the initiator can track if the current host is still working.
+            String alive_node_path = zookeeper_path + "/alive|" + current_host;
+            auto code = zookeeper->tryCreate(alive_node_path, "", zkutil::CreateMode::Ephemeral);
+            if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNODEEXISTS)
+                throw zkutil::KeeperException(code, alive_node_path);
 
-    zookeeper->createIfNotExists(zookeeper_path + "/started|" + current_host, "");
-    zookeeper->create(zookeeper_path + "/current|" + current_host + "|" + new_stage, message, zkutil::CreateMode::Persistent);
+            zookeeper->createIfNotExists(zookeeper_path + "/started|" + current_host, "");
+            zookeeper->createIfNotExists(zookeeper_path + "/current|" + current_host + "|" + new_stage, message);
+        }
+    });
 }
 
 void BackupCoordinationStageSync::setError(const String & current_host, const Exception & exception)
 {
-    auto zookeeper = get_zookeeper();
-    WriteBufferFromOwnString buf;
-    writeStringBinary(current_host, buf);
-    writeException(exception, buf, true);
-    zookeeper->createIfNotExists(zookeeper_path + "/error", buf.str());
+    auto holder = with_retries.createRetriesControlHolder("setError");
+    holder.retries_ctl.retryLoop(
+        [&, &zookeeper = holder.faulty_zookeeper]()
+    {
+        with_retries.renewZooKeeper(zookeeper);
+
+        WriteBufferFromOwnString buf;
+        writeStringBinary(current_host, buf);
+        writeException(exception, buf, true);
+        zookeeper->createIfNotExists(zookeeper_path + "/error", buf.str());
+
+        auto code = zookeeper->trySet(zookeeper_path, Stage::ERROR);
+        if (code != Coordination::Error::ZOK)
+            throw zkutil::KeeperException(code, zookeeper_path);
+    });
 }
 
 Strings BackupCoordinationStageSync::wait(const Strings & all_hosts, const String & stage_to_wait)
@@ -83,14 +119,24 @@ struct BackupCoordinationStageSync::State
 };
 
 BackupCoordinationStageSync::State BackupCoordinationStageSync::readCurrentState(
-    zkutil::ZooKeeperPtr zookeeper, const Strings & zk_nodes, const Strings & all_hosts, const String & stage_to_wait) const
+    const Strings & zk_nodes, const Strings & all_hosts, const String & stage_to_wait) const
 {
     std::unordered_set<std::string_view> zk_nodes_set{zk_nodes.begin(), zk_nodes.end()};
 
     State state;
     if (zk_nodes_set.contains("error"))
     {
-        ReadBufferFromOwnString buf{zookeeper->get(zookeeper_path + "/error")};
+        String errors;
+        {
+            auto holder = with_retries.createRetriesControlHolder("readCurrentState");
+            holder.retries_ctl.retryLoop(
+                [&, &zookeeper = holder.faulty_zookeeper]()
+                {
+                    with_retries.renewZooKeeper(zookeeper);
+                    errors = zookeeper->get(zookeeper_path + "/error");
+                });
+        }
+        ReadBufferFromOwnString buf{errors};
         String host;
         readStringBinary(host, buf);
         state.error = std::make_pair(host, readException(buf, fmt::format("Got error from {}", host)));
@@ -102,8 +148,38 @@ BackupCoordinationStageSync::State BackupCoordinationStageSync::readCurrentState
         if (!zk_nodes_set.contains("current|" + host + "|" + stage_to_wait))
         {
             UnreadyHostState unready_host_state;
-            unready_host_state.started = zk_nodes_set.contains("started|" + host);
-            unready_host_state.alive = zk_nodes_set.contains("alive|" + host);
+            const String started_node_name = "started|" + host;
+            const String alive_node_name = "alive|" + host;
+            const String alive_node_path = zookeeper_path + "/" + alive_node_name;
+            unready_host_state.started = zk_nodes_set.contains(started_node_name);
+
+            /// Because we do retries everywhere we can't fully rely on ephemeral nodes anymore.
+            /// Though we recreate "alive" node when reconnecting it might be not enough and race condition is possible.
+            /// And everything we can do here - just retry.
+            /// In worst case when we won't manage to see the alive node for a long time we will just abort the backup.
+            unready_host_state.alive = zk_nodes_set.contains(alive_node_name);
+            if (!unready_host_state.alive)
+            {
+                LOG_TRACE(log, "Seems like host ({}) is dead. Will retry the check to confirm", host);
+                auto holder = with_retries.createRetriesControlHolder("readCurrentState::checkAliveNode");
+                holder.retries_ctl.retryLoop(
+                    [&, &zookeeper = holder.faulty_zookeeper]()
+                {
+                    with_retries.renewZooKeeper(zookeeper);
+
+                    if (zookeeper->existsNoFailureInjection(alive_node_path))
+                    {
+                        unready_host_state.alive = true;
+                        return;
+                    }
+
+                    // Retry with backoff. We also check whether it is last retry or no, because we won't to rethrow an exception.
+                    if (!holder.retries_ctl.isLastRetry())
+                        holder.retries_ctl.setKeeperError(Coordination::Error::ZNONODE, "There is no alive node for host {}. Will retry", host);
+                });
+            }
+            LOG_TRACE(log, "Host ({}) appeared to be {}", host, unready_host_state.alive ? "alive" : "dead");
+
             state.unready_hosts.emplace(host, unready_host_state);
             if (!unready_host_state.alive && unready_host_state.started && !state.host_terminated)
                 state.host_terminated = host;
@@ -113,51 +189,62 @@ BackupCoordinationStageSync::State BackupCoordinationStageSync::readCurrentState
     if (state.host_terminated || !state.unready_hosts.empty())
         return state;
 
-    state.results.reserve(all_hosts.size());
-    for (const auto & host : all_hosts)
-        state.results.emplace_back(zookeeper->get(zookeeper_path + "/current|" + host + "|" + stage_to_wait));
+    auto holder = with_retries.createRetriesControlHolder("waitImpl::collectStagesToWait");
+    holder.retries_ctl.retryLoop(
+        [&, &zookeeper = holder.faulty_zookeeper]()
+    {
+        with_retries.renewZooKeeper(zookeeper);
+        Strings results;
+
+        for (const auto & host : all_hosts)
+            results.emplace_back(zookeeper->get(zookeeper_path + "/current|" + host + "|" + stage_to_wait));
+
+        state.results = std::move(results);
+    });
 
     return state;
 }
 
-Strings BackupCoordinationStageSync::waitImpl(const Strings & all_hosts, const String & stage_to_wait, std::optional<std::chrono::milliseconds> timeout) const
+Strings BackupCoordinationStageSync::waitImpl(
+    const Strings & all_hosts, const String & stage_to_wait, std::optional<std::chrono::milliseconds> timeout) const
 {
     if (all_hosts.empty())
         return {};
 
     /// Wait until all hosts are ready or an error happens or time is out.
 
-    auto zookeeper = get_zookeeper();
-
-    /// Set by ZooKepper when list of zk nodes have changed.
-    auto watch = std::make_shared<Poco::Event>();
-
     bool use_timeout = timeout.has_value();
     std::chrono::steady_clock::time_point end_of_timeout;
     if (use_timeout)
         end_of_timeout = std::chrono::steady_clock::now() + std::chrono::duration_cast<std::chrono::steady_clock::duration>(*timeout);
 
     State state;
-
-    String previous_unready_host; /// Used for logging: we don't want to log the same unready host again.
-
     for (;;)
     {
-        /// Get zk nodes and subscribe on their changes.
-        Strings zk_nodes = zookeeper->getChildren(zookeeper_path, nullptr, watch);
+        LOG_INFO(log, "Waiting for the stage {}", stage_to_wait);
+        /// Set by ZooKepper when list of zk nodes have changed.
+        auto watch = std::make_shared<Poco::Event>();
+        Strings zk_nodes;
+        {
+            auto holder = with_retries.createRetriesControlHolder("waitImpl::getChildren");
+            holder.retries_ctl.retryLoop(
+                [&, &zookeeper = holder.faulty_zookeeper]()
+            {
+                with_retries.renewZooKeeper(zookeeper);
+                watch->reset();
+                /// Get zk nodes and subscribe on their changes.
+                zk_nodes = zookeeper->getChildren(zookeeper_path, nullptr, watch);
+            });
+        }
 
         /// Read and analyze the current state of zk nodes.
-        state = readCurrentState(zookeeper, zk_nodes, all_hosts, stage_to_wait);
+        state = readCurrentState(zk_nodes, all_hosts, stage_to_wait);
         if (state.error || state.host_terminated || state.unready_hosts.empty())
             break; /// Error happened or everything is ready.
 
-        /// Log that we will wait for another host.
+        /// Log that we will wait
         const auto & unready_host = state.unready_hosts.begin()->first;
-        if (unready_host != previous_unready_host)
-        {
-            LOG_TRACE(log, "Waiting for host {}", unready_host);
-            previous_unready_host = unready_host;
-        }
+        LOG_INFO(log, "Waiting on ZooKeeper watch for any node to be changed (currently waiting for host {})", unready_host);
 
         /// Wait until `watch_callback` is called by ZooKeeper meaning that zk nodes have changed.
         {
@@ -195,6 +282,7 @@ Strings BackupCoordinationStageSync::waitImpl(const Strings & all_hosts, const S
             unready_host_state.started ? "" : ": Operation didn't start");
     }
 
+    LOG_TRACE(log, "Everything is Ok. All hosts achieved stage {}", stage_to_wait);
     return state.results;
 }
 
diff --git a/src/Backups/BackupCoordinationStageSync.h b/src/Backups/BackupCoordinationStageSync.h
index 623b58fd9fa..2efaec46b3a 100644
--- a/src/Backups/BackupCoordinationStageSync.h
+++ b/src/Backups/BackupCoordinationStageSync.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <Common/ZooKeeper/Common.h>
-
+#include <Backups/WithRetries.h>
 
 namespace DB
 {
@@ -10,10 +9,13 @@ namespace DB
 class BackupCoordinationStageSync
 {
 public:
-    BackupCoordinationStageSync(const String & zookeeper_path_, zkutil::GetZooKeeper get_zookeeper_, Poco::Logger * log_);
+    BackupCoordinationStageSync(
+        const String & root_zookeeper_path_,
+        WithRetries & with_retries_,
+        Poco::Logger * log_);
 
     /// Sets the stage of the current host and signal other hosts if there were other hosts waiting for that.
-    void set(const String & current_host, const String & new_stage, const String & message);
+    void set(const String & current_host, const String & new_stage, const String & message, const bool & all_hosts = false);
     void setError(const String & current_host, const Exception & exception);
 
     /// Sets the stage of the current host and waits until all hosts come to the same stage.
@@ -27,12 +29,13 @@ private:
     void createRootNodes();
 
     struct State;
-    State readCurrentState(zkutil::ZooKeeperPtr zookeeper, const Strings & zk_nodes, const Strings & all_hosts, const String & stage_to_wait) const;
+    State readCurrentState(const Strings & zk_nodes, const Strings & all_hosts, const String & stage_to_wait) const;
 
     Strings waitImpl(const Strings & all_hosts, const String & stage_to_wait, std::optional<std::chrono::milliseconds> timeout) const;
 
     String zookeeper_path;
-    zkutil::GetZooKeeper get_zookeeper;
+    /// A reference to the field of parent object - BackupCoordinationRemote or RestoreCoordinationRemote
+    WithRetries & with_retries;
     Poco::Logger * log;
 };
 
diff --git a/src/Backups/BackupEntriesCollector.cpp b/src/Backups/BackupEntriesCollector.cpp
index 92526f0094e..485d59eff38 100644
--- a/src/Backups/BackupEntriesCollector.cpp
+++ b/src/Backups/BackupEntriesCollector.cpp
@@ -15,6 +15,7 @@
 #include <base/sleep.h>
 #include <Common/escapeForFileName.h>
 #include <boost/range/algorithm/copy.hpp>
+#include <base/scope_guard.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
@@ -84,6 +85,12 @@ BackupEntriesCollector::BackupEntriesCollector(
     , on_cluster_first_sync_timeout(context->getConfigRef().getUInt64("backups.on_cluster_first_sync_timeout", 180000))
     , consistent_metadata_snapshot_timeout(context->getConfigRef().getUInt64("backups.consistent_metadata_snapshot_timeout", 600000))
     , log(&Poco::Logger::get("BackupEntriesCollector"))
+    , global_zookeeper_retries_info(
+        "BackupEntriesCollector",
+        log,
+        context->getSettingsRef().backup_restore_keeper_max_retries,
+        context->getSettingsRef().backup_restore_keeper_retry_initial_backoff_ms,
+        context->getSettingsRef().backup_restore_keeper_retry_max_backoff_ms)
 {
 }
 
@@ -123,7 +130,6 @@ BackupEntries BackupEntriesCollector::run()
     runPostTasks();
 
     /// No more backup entries or tasks are allowed after this point.
-    setStage(Stage::WRITING_BACKUP);
 
     return std::move(backup_entries);
 }
@@ -133,22 +139,22 @@ Strings BackupEntriesCollector::setStage(const String & new_stage, const String
     LOG_TRACE(log, fmt::runtime(toUpperFirst(new_stage)));
     current_stage = new_stage;
 
-    backup_coordination->setStage(backup_settings.host_id, new_stage, message);
+    backup_coordination->setStage(new_stage, message);
 
     if (new_stage == Stage::formatGatheringMetadata(1))
     {
-        return backup_coordination->waitForStage(all_hosts, new_stage, on_cluster_first_sync_timeout);
+        return backup_coordination->waitForStage(new_stage, on_cluster_first_sync_timeout);
     }
     else if (new_stage.starts_with(Stage::GATHERING_METADATA))
     {
         auto current_time = std::chrono::steady_clock::now();
         auto end_of_timeout = std::max(current_time, consistent_metadata_snapshot_end_time);
         return backup_coordination->waitForStage(
-            all_hosts, new_stage, std::chrono::duration_cast<std::chrono::milliseconds>(end_of_timeout - current_time));
+            new_stage, std::chrono::duration_cast<std::chrono::milliseconds>(end_of_timeout - current_time));
     }
     else
     {
-        return backup_coordination->waitForStage(all_hosts, new_stage);
+        return backup_coordination->waitForStage(new_stage);
     }
 }
 
@@ -464,17 +470,17 @@ std::vector<std::pair<ASTPtr, StoragePtr>> BackupEntriesCollector::findTablesInD
     const auto & database_info = database_infos.at(database_name);
     const auto & database = database_info.database;
 
-    auto filter_by_table_name = [database_info = &database_info](const String & table_name)
+    auto filter_by_table_name = [my_database_info = &database_info](const String & table_name)
     {
         /// We skip inner tables of materialized views.
         if (table_name.starts_with(".inner_id."))
             return false;
 
-        if (database_info->tables.contains(table_name))
+        if (my_database_info->tables.contains(table_name))
             return true;
 
-        if (database_info->all_tables)
-            return !database_info->except_table_names.contains(table_name);
+        if (my_database_info->all_tables)
+            return !my_database_info->except_table_names.contains(table_name);
 
         return false;
     };
@@ -483,7 +489,10 @@ std::vector<std::pair<ASTPtr, StoragePtr>> BackupEntriesCollector::findTablesInD
 
     try
     {
-        db_tables = database->getTablesForBackup(filter_by_table_name, context);
+        /// Database or table could be replicated - so may use ZooKeeper. We need to retry.
+        auto zookeeper_retries_info = global_zookeeper_retries_info;
+        ZooKeeperRetriesControl retries_ctl("getTablesForBackup", zookeeper_retries_info, nullptr);
+        retries_ctl.retryLoop([&](){ db_tables = database->getTablesForBackup(filter_by_table_name, context); });
     }
     catch (Exception & e)
     {
@@ -746,6 +755,7 @@ void BackupEntriesCollector::addPostTask(std::function<void()> task)
 /// Runs all the tasks added with addPostCollectingTask().
 void BackupEntriesCollector::runPostTasks()
 {
+    LOG_TRACE(log, "Will run {} post tasks", post_tasks.size());
     /// Post collecting tasks can add other post collecting tasks, our code is fine with that.
     while (!post_tasks.empty())
     {
@@ -753,6 +763,7 @@ void BackupEntriesCollector::runPostTasks()
         post_tasks.pop();
         std::move(task)();
     }
+    LOG_TRACE(log, "All post tasks successfully executed");
 }
 
 size_t BackupEntriesCollector::getAccessCounter(AccessEntityType type)
diff --git a/src/Backups/BackupEntriesCollector.h b/src/Backups/BackupEntriesCollector.h
index eca0dd8e078..be6ca8d1ebe 100644
--- a/src/Backups/BackupEntriesCollector.h
+++ b/src/Backups/BackupEntriesCollector.h
@@ -6,6 +6,7 @@
 #include <Parsers/ASTBackupQuery.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/TableLockHolder.h>
+#include <Storages/MergeTree/ZooKeeperRetries.h>
 #include <filesystem>
 #include <queue>
 
@@ -96,6 +97,9 @@ private:
     std::chrono::milliseconds on_cluster_first_sync_timeout;
     std::chrono::milliseconds consistent_metadata_snapshot_timeout;
     Poco::Logger * log;
+    /// Unfortunately we can use ZooKeeper for collecting information for backup
+    /// and we need to retry...
+    ZooKeeperRetriesInfo global_zookeeper_retries_info;
 
     Strings all_hosts;
     DDLRenamingMap renaming_map;
diff --git a/src/Backups/BackupEntryFromAppendOnlyFile.cpp b/src/Backups/BackupEntryFromAppendOnlyFile.cpp
index 9bab101bc35..5303d9abffd 100644
--- a/src/Backups/BackupEntryFromAppendOnlyFile.cpp
+++ b/src/Backups/BackupEntryFromAppendOnlyFile.cpp
@@ -1,25 +1,46 @@
 #include <Backups/BackupEntryFromAppendOnlyFile.h>
+#include <Disks/IDisk.h>
 #include <IO/LimitSeekableReadBuffer.h>
+#include <IO/ReadBufferFromFileBase.h>
 
 
 namespace DB
 {
 
+namespace
+{
+    /// For append-only files we must calculate its size on the construction of a backup entry.
+    UInt64 calculateSize(const DiskPtr & disk, const String & file_path, bool copy_encrypted, std::optional<UInt64> unencrypted_file_size)
+    {
+        if (!unencrypted_file_size)
+            return copy_encrypted ? disk->getEncryptedFileSize(file_path) : disk->getFileSize(file_path);
+        else if (copy_encrypted)
+            return disk->getEncryptedFileSize(*unencrypted_file_size);
+        else
+            return *unencrypted_file_size;
+    }
+}
+
 BackupEntryFromAppendOnlyFile::BackupEntryFromAppendOnlyFile(
-    const DiskPtr & disk_,
-    const String & file_path_,
-    const std::optional<UInt64> & file_size_,
-    const std::optional<UInt128> & checksum_,
-    const std::shared_ptr<TemporaryFileOnDisk> & temporary_file_)
-    : BackupEntryFromImmutableFile(disk_, file_path_, file_size_, checksum_, temporary_file_)
-    , limit(BackupEntryFromImmutableFile::getSize())
+    const DiskPtr & disk_, const String & file_path_, bool copy_encrypted_, const std::optional<UInt64> & file_size_)
+    : disk(disk_)
+    , file_path(file_path_)
+    , data_source_description(disk->getDataSourceDescription())
+    , copy_encrypted(copy_encrypted_ && data_source_description.is_encrypted)
+    , size(calculateSize(disk_, file_path_, copy_encrypted, file_size_))
 {
 }
 
-std::unique_ptr<SeekableReadBuffer> BackupEntryFromAppendOnlyFile::getReadBuffer() const
+BackupEntryFromAppendOnlyFile::~BackupEntryFromAppendOnlyFile() = default;
+
+std::unique_ptr<SeekableReadBuffer> BackupEntryFromAppendOnlyFile::getReadBuffer(const ReadSettings & read_settings) const
 {
-    auto buf = BackupEntryFromImmutableFile::getReadBuffer();
-    return std::make_unique<LimitSeekableReadBuffer>(std::move(buf), 0, limit);
+    std::unique_ptr<SeekableReadBuffer> buf;
+    if (copy_encrypted)
+        buf = disk->readEncryptedFile(file_path, read_settings.adjustBufferSize(size));
+    else
+        buf = disk->readFile(file_path, read_settings.adjustBufferSize(size));
+    return std::make_unique<LimitSeekableReadBuffer>(std::move(buf), 0, size);
 }
 
 }
diff --git a/src/Backups/BackupEntryFromAppendOnlyFile.h b/src/Backups/BackupEntryFromAppendOnlyFile.h
index c6055b86268..257c392f24c 100644
--- a/src/Backups/BackupEntryFromAppendOnlyFile.h
+++ b/src/Backups/BackupEntryFromAppendOnlyFile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Backups/BackupEntryFromImmutableFile.h>
+#include <Backups/BackupEntryWithChecksumCalculation.h>
 
 
 namespace DB
@@ -8,23 +8,34 @@ namespace DB
 
 /// Represents a file prepared to be included in a backup, assuming that until this backup entry is destroyed
 /// the file can be appended with new data, but the bytes which are already in the file won't be changed.
-class BackupEntryFromAppendOnlyFile : public BackupEntryFromImmutableFile
+class BackupEntryFromAppendOnlyFile : public BackupEntryWithChecksumCalculation<IBackupEntry>
 {
 public:
-
-    /// The constructor is allowed to not set `file_size_` or `checksum_`, in that case it will be calculated from the data.
+    /// The constructor is allowed to not set `file_size_`, in that case it will be calculated from the data.
     BackupEntryFromAppendOnlyFile(
         const DiskPtr & disk_,
         const String & file_path_,
-        const std::optional<UInt64> & file_size_ = {},
-        const std::optional<UInt128> & checksum_ = {},
-        const std::shared_ptr<TemporaryFileOnDisk> & temporary_file_ = {});
+        bool copy_encrypted_ = false,
+        const std::optional<UInt64> & file_size_ = {});
 
-    UInt64 getSize() const override { return limit; }
-    std::unique_ptr<SeekableReadBuffer> getReadBuffer() const override;
+    ~BackupEntryFromAppendOnlyFile() override;
+
+    std::unique_ptr<SeekableReadBuffer> getReadBuffer(const ReadSettings & read_settings) const override;
+    UInt64 getSize() const override { return size; }
+
+    DataSourceDescription getDataSourceDescription() const override { return data_source_description; }
+    bool isEncryptedByDisk() const override { return copy_encrypted; }
+
+    bool isFromFile() const override { return true; }
+    DiskPtr getDisk() const override { return disk; }
+    String getFilePath() const override { return file_path; }
 
 private:
-    const UInt64 limit;
+    const DiskPtr disk;
+    const String file_path;
+    const DataSourceDescription data_source_description;
+    const bool copy_encrypted;
+    const UInt64 size;
 };
 
 }
diff --git a/src/Backups/BackupEntryFromImmutableFile.cpp b/src/Backups/BackupEntryFromImmutableFile.cpp
index 86b9c13fb9a..93d555065ec 100644
--- a/src/Backups/BackupEntryFromImmutableFile.cpp
+++ b/src/Backups/BackupEntryFromImmutableFile.cpp
@@ -1,47 +1,101 @@
 #include <Backups/BackupEntryFromImmutableFile.h>
+#include <IO/ReadBufferFromFileBase.h>
 #include <Disks/IDisk.h>
-#include <Disks/IO/createReadBufferFromFileBase.h>
-#include <Poco/File.h>
-#include <Common/filesystemHelpers.h>
+#include <city.h>
 
 
 namespace DB
 {
 
+namespace
+{
+    /// We mix the checksum calculated for non-encrypted data with IV generated to encrypt the file
+    /// to generate kind of a checksum for encrypted data. Of course it differs from the CityHash properly calculated for encrypted data.
+    UInt128 combineChecksums(UInt128 checksum1, UInt128 checksum2)
+    {
+        chassert(std::size(checksum2.items) == 2);
+        return CityHash_v1_0_2::CityHash128WithSeed(reinterpret_cast<const char *>(&checksum1), sizeof(checksum1), {checksum2.items[0], checksum2.items[1]});
+    }
+}
+
 BackupEntryFromImmutableFile::BackupEntryFromImmutableFile(
     const DiskPtr & disk_,
     const String & file_path_,
+    bool copy_encrypted_,
     const std::optional<UInt64> & file_size_,
-    const std::optional<UInt128> & checksum_,
-    const std::shared_ptr<TemporaryFileOnDisk> & temporary_file_)
-    : disk(disk_), file_path(file_path_), file_size(file_size_), checksum(checksum_), temporary_file_on_disk(temporary_file_)
+    const std::optional<UInt128> & checksum_)
+    : disk(disk_)
+    , file_path(file_path_)
+    , data_source_description(disk->getDataSourceDescription())
+    , copy_encrypted(copy_encrypted_ && data_source_description.is_encrypted)
+    , file_size(file_size_)
+    , checksum(checksum_)
 {
 }
 
 BackupEntryFromImmutableFile::~BackupEntryFromImmutableFile() = default;
 
+std::unique_ptr<SeekableReadBuffer> BackupEntryFromImmutableFile::getReadBuffer(const ReadSettings & read_settings) const
+{
+    if (copy_encrypted)
+        return disk->readEncryptedFile(file_path, read_settings);
+    else
+        return disk->readFile(file_path, read_settings);
+}
+
 UInt64 BackupEntryFromImmutableFile::getSize() const
 {
-    std::lock_guard lock{get_file_size_mutex};
-    if (!file_size)
-        file_size = disk->getFileSize(file_path);
+    std::lock_guard lock{size_and_checksum_mutex};
+    if (!file_size_adjusted)
+    {
+        if (!file_size)
+            file_size = copy_encrypted ? disk->getEncryptedFileSize(file_path) : disk->getFileSize(file_path);
+        else if (copy_encrypted)
+            file_size = disk->getEncryptedFileSize(*file_size);
+        file_size_adjusted = true;
+    }
     return *file_size;
 }
 
-std::unique_ptr<SeekableReadBuffer> BackupEntryFromImmutableFile::getReadBuffer() const
+UInt128 BackupEntryFromImmutableFile::getChecksum() const
 {
-    return disk->readFile(file_path);
+    {
+        std::lock_guard lock{size_and_checksum_mutex};
+        if (checksum_adjusted)
+            return *checksum;
+
+        if (checksum)
+        {
+            if (copy_encrypted)
+                checksum = combineChecksums(*checksum, disk->getEncryptedFileIV(file_path));
+            checksum_adjusted = true;
+            return *checksum;
+        }
+    }
+
+    auto calculated_checksum = BackupEntryWithChecksumCalculation<IBackupEntry>::getChecksum();
+
+    {
+        std::lock_guard lock{size_and_checksum_mutex};
+        if (!checksum_adjusted)
+        {
+            checksum = calculated_checksum;
+            checksum_adjusted = true;
+        }
+        return *checksum;
+    }
 }
 
-
-DataSourceDescription BackupEntryFromImmutableFile::getDataSourceDescription() const
+std::optional<UInt128> BackupEntryFromImmutableFile::getPartialChecksum(size_t prefix_length) const
 {
-    return disk->getDataSourceDescription();
-}
+    if (prefix_length == 0)
+        return 0;
 
-String BackupEntryFromImmutableFile::getFilePath() const
-{
-    return file_path;
+    if (prefix_length >= getSize())
+        return getChecksum();
+
+    /// For immutable files we don't use partial checksums.
+    return std::nullopt;
 }
 
 }
diff --git a/src/Backups/BackupEntryFromImmutableFile.h b/src/Backups/BackupEntryFromImmutableFile.h
index 99241c691cb..37bc6b43cd3 100644
--- a/src/Backups/BackupEntryFromImmutableFile.h
+++ b/src/Backups/BackupEntryFromImmutableFile.h
@@ -1,46 +1,53 @@
 #pragma once
 
-#include <Backups/IBackupEntry.h>
+#include <Backups/BackupEntryWithChecksumCalculation.h>
 #include <base/defines.h>
 #include <mutex>
 
+
 namespace DB
 {
-class TemporaryFileOnDisk;
 class IDisk;
 using DiskPtr = std::shared_ptr<IDisk>;
 
 /// Represents a file prepared to be included in a backup, assuming that until this backup entry is destroyed the file won't be changed.
-class BackupEntryFromImmutableFile : public IBackupEntry
+class BackupEntryFromImmutableFile : public BackupEntryWithChecksumCalculation<IBackupEntry>
 {
 public:
-
     /// The constructor is allowed to not set `file_size_` or `checksum_`, in that case it will be calculated from the data.
     BackupEntryFromImmutableFile(
         const DiskPtr & disk_,
         const String & file_path_,
+        bool copy_encrypted_ = false,
         const std::optional<UInt64> & file_size_ = {},
-        const std::optional<UInt128> & checksum_ = {},
-        const std::shared_ptr<TemporaryFileOnDisk> & temporary_file_ = {});
+        const std::optional<UInt128> & checksum_ = {});
 
     ~BackupEntryFromImmutableFile() override;
 
+    std::unique_ptr<SeekableReadBuffer> getReadBuffer(const ReadSettings & read_settings) const override;
+
     UInt64 getSize() const override;
-    std::optional<UInt128> getChecksum() const override { return checksum; }
-    std::unique_ptr<SeekableReadBuffer> getReadBuffer() const override;
+    UInt128 getChecksum() const override;
+    std::optional<UInt128> getPartialChecksum(size_t prefix_length) const override;
 
-    String getFilePath() const override;
-    DataSourceDescription getDataSourceDescription() const override;
+    DataSourceDescription getDataSourceDescription() const override { return data_source_description; }
+    bool isEncryptedByDisk() const override { return copy_encrypted; }
 
-    DiskPtr tryGetDiskIfExists() const override { return disk; }
+    bool isFromFile() const override { return true; }
+    bool isFromImmutableFile() const override { return true; }
+    DiskPtr getDisk() const override { return disk; }
+    String getFilePath() const override { return file_path; }
 
 private:
     const DiskPtr disk;
     const String file_path;
-    mutable std::optional<UInt64> file_size TSA_GUARDED_BY(get_file_size_mutex);
-    mutable std::mutex get_file_size_mutex;
-    const std::optional<UInt128> checksum;
-    const std::shared_ptr<TemporaryFileOnDisk> temporary_file_on_disk;
+    const DataSourceDescription data_source_description;
+    const bool copy_encrypted;
+    mutable std::optional<UInt64> file_size;
+    mutable std::optional<UInt128> checksum;
+    mutable bool file_size_adjusted = false;
+    mutable bool checksum_adjusted = false;
+    mutable std::mutex size_and_checksum_mutex;
 };
 
 }
diff --git a/src/Backups/BackupEntryFromMemory.cpp b/src/Backups/BackupEntryFromMemory.cpp
index f59eadc2d7f..1dd911afbbb 100644
--- a/src/Backups/BackupEntryFromMemory.cpp
+++ b/src/Backups/BackupEntryFromMemory.cpp
@@ -5,17 +5,16 @@
 namespace DB
 {
 
-BackupEntryFromMemory::BackupEntryFromMemory(const void * data_, size_t size_, const std::optional<UInt128> & checksum_)
-    : BackupEntryFromMemory(String{reinterpret_cast<const char *>(data_), size_}, checksum_)
+BackupEntryFromMemory::BackupEntryFromMemory(const void * data_, size_t size_)
+    : BackupEntryFromMemory(String{reinterpret_cast<const char *>(data_), size_})
 {
 }
 
-BackupEntryFromMemory::BackupEntryFromMemory(String data_, const std::optional<UInt128> & checksum_)
-    : data(std::move(data_)), checksum(checksum_)
+BackupEntryFromMemory::BackupEntryFromMemory(String data_) : data(std::move(data_))
 {
 }
 
-std::unique_ptr<SeekableReadBuffer> BackupEntryFromMemory::getReadBuffer() const
+std::unique_ptr<SeekableReadBuffer> BackupEntryFromMemory::getReadBuffer(const ReadSettings &) const
 {
     return std::make_unique<ReadBufferFromString>(data);
 }
diff --git a/src/Backups/BackupEntryFromMemory.h b/src/Backups/BackupEntryFromMemory.h
index df3b9de40e3..d8bc0eb966d 100644
--- a/src/Backups/BackupEntryFromMemory.h
+++ b/src/Backups/BackupEntryFromMemory.h
@@ -1,39 +1,26 @@
 #pragma once
 
-#include <Backups/IBackupEntry.h>
-#include <IO/ReadBufferFromString.h>
+#include <Backups/BackupEntryWithChecksumCalculation.h>
 
 
 namespace DB
 {
 
 /// Represents small preloaded data to be included in a backup.
-class BackupEntryFromMemory : public IBackupEntry
+class BackupEntryFromMemory : public BackupEntryWithChecksumCalculation<IBackupEntry>
 {
 public:
     /// The constructor is allowed to not set `checksum_`, in that case it will be calculated from the data.
-    BackupEntryFromMemory(const void * data_, size_t size_, const std::optional<UInt128> & checksum_ = {});
-    explicit BackupEntryFromMemory(String data_, const std::optional<UInt128> & checksum_ = {});
+    BackupEntryFromMemory(const void * data_, size_t size_);
+    explicit BackupEntryFromMemory(String data_);
 
+    std::unique_ptr<SeekableReadBuffer> getReadBuffer(const ReadSettings &) const override;
     UInt64 getSize() const override { return data.size(); }
-    std::optional<UInt128> getChecksum() const override { return checksum; }
-    std::unique_ptr<SeekableReadBuffer> getReadBuffer() const override;
 
-    String getFilePath() const override
-    {
-        return "";
-    }
-
-    DataSourceDescription getDataSourceDescription() const override
-    {
-        return DataSourceDescription{DataSourceType::RAM, "", false, false};
-    }
-
-    DiskPtr tryGetDiskIfExists() const override { return nullptr; }
+    DataSourceDescription getDataSourceDescription() const override { return DataSourceDescription{DataSourceType::RAM, "", false, false}; }
 
 private:
     const String data;
-    const std::optional<UInt128> checksum;
 };
 
 }
diff --git a/src/Backups/BackupEntryFromSmallFile.cpp b/src/Backups/BackupEntryFromSmallFile.cpp
index d24b3a6498d..d0a99056b59 100644
--- a/src/Backups/BackupEntryFromSmallFile.cpp
+++ b/src/Backups/BackupEntryFromSmallFile.cpp
@@ -1,6 +1,9 @@
 #include <Backups/BackupEntryFromSmallFile.h>
+#include <Common/filesystemHelpers.h>
+#include <Disks/DiskLocal.h>
 #include <Disks/IDisk.h>
 #include <Disks/IO/createReadBufferFromFileBase.h>
+#include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 
 
@@ -16,9 +19,9 @@ namespace
         return s;
     }
 
-    String readFile(const DiskPtr & disk, const String & file_path)
+    String readFile(const DiskPtr & disk, const String & file_path, bool copy_encrypted)
     {
-        auto buf = disk->readFile(file_path);
+        auto buf = copy_encrypted ? disk->readEncryptedFile(file_path, {}) : disk->readFile(file_path);
         String s;
         readStringUntilEOF(s, *buf);
         return s;
@@ -26,15 +29,25 @@ namespace
 }
 
 
-BackupEntryFromSmallFile::BackupEntryFromSmallFile(const String & file_path_, const std::optional<UInt128> & checksum_)
-    : BackupEntryFromMemory(readFile(file_path_), checksum_), file_path(file_path_)
+BackupEntryFromSmallFile::BackupEntryFromSmallFile(const String & file_path_)
+    : file_path(file_path_)
+    , data_source_description(DiskLocal::getLocalDataSourceDescription(file_path_))
+    , data(readFile(file_path_))
 {
 }
 
-BackupEntryFromSmallFile::BackupEntryFromSmallFile(
-    const DiskPtr & disk_, const String & file_path_, const std::optional<UInt128> & checksum_)
-    : BackupEntryFromMemory(readFile(disk_, file_path_), checksum_), disk(disk_), file_path(file_path_)
+BackupEntryFromSmallFile::BackupEntryFromSmallFile(const DiskPtr & disk_, const String & file_path_, bool copy_encrypted_)
+    : disk(disk_)
+    , file_path(file_path_)
+    , data_source_description(disk_->getDataSourceDescription())
+    , copy_encrypted(copy_encrypted_ && data_source_description.is_encrypted)
+    , data(readFile(disk_, file_path, copy_encrypted))
 {
 }
 
+std::unique_ptr<SeekableReadBuffer> BackupEntryFromSmallFile::getReadBuffer(const ReadSettings &) const
+{
+    return std::make_unique<ReadBufferFromString>(data);
+}
+
 }
diff --git a/src/Backups/BackupEntryFromSmallFile.h b/src/Backups/BackupEntryFromSmallFile.h
index 99e319f07a0..d6651ab8cb5 100644
--- a/src/Backups/BackupEntryFromSmallFile.h
+++ b/src/Backups/BackupEntryFromSmallFile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Backups/BackupEntryFromMemory.h>
+#include <Backups/BackupEntryWithChecksumCalculation.h>
 
 
 namespace DB
@@ -10,25 +10,28 @@ using DiskPtr = std::shared_ptr<IDisk>;
 
 /// Represents a file prepared to be included in a backup,
 /// assuming that the file is small and can be easily loaded into memory.
-class BackupEntryFromSmallFile : public BackupEntryFromMemory
+class BackupEntryFromSmallFile : public BackupEntryWithChecksumCalculation<IBackupEntry>
 {
 public:
-    /// The constructor is allowed to not set `checksum_`, in that case it will be calculated from the data.
-    explicit BackupEntryFromSmallFile(
-        const String & file_path_,
-        const std::optional<UInt128> & checksum_ = {});
+    explicit BackupEntryFromSmallFile(const String & file_path_);
+    BackupEntryFromSmallFile(const DiskPtr & disk_, const String & file_path_, bool copy_encrypted_ = false);
 
-    BackupEntryFromSmallFile(
-        const DiskPtr & disk_,
-        const String & file_path_,
-        const std::optional<UInt128> & checksum_ = {});
+    std::unique_ptr<SeekableReadBuffer> getReadBuffer(const ReadSettings &) const override;
+    UInt64 getSize() const override { return data.size(); }
 
+    DataSourceDescription getDataSourceDescription() const override { return data_source_description; }
+    bool isEncryptedByDisk() const override { return copy_encrypted; }
+
+    bool isFromFile() const override { return true; }
+    DiskPtr getDisk() const override { return disk; }
     String getFilePath() const override { return file_path; }
 
-    DiskPtr tryGetDiskIfExists() const override { return disk; }
 private:
     const DiskPtr disk;
     const String file_path;
+    const DataSourceDescription data_source_description;
+    const bool copy_encrypted = false;
+    const String data;
 };
 
 }
diff --git a/src/Backups/BackupEntryWithChecksumCalculation.cpp b/src/Backups/BackupEntryWithChecksumCalculation.cpp
new file mode 100644
index 00000000000..610b46238ba
--- /dev/null
+++ b/src/Backups/BackupEntryWithChecksumCalculation.cpp
@@ -0,0 +1,71 @@
+#include <Backups/BackupEntryWithChecksumCalculation.h>
+#include <IO/HashingReadBuffer.h>
+
+
+namespace DB
+{
+
+template <typename Base>
+UInt128 BackupEntryWithChecksumCalculation<Base>::getChecksum() const
+{
+    {
+        std::lock_guard lock{checksum_calculation_mutex};
+        if (calculated_checksum)
+            return *calculated_checksum;
+    }
+
+    size_t size = this->getSize();
+
+    {
+        std::lock_guard lock{checksum_calculation_mutex};
+        if (!calculated_checksum)
+        {
+            if (size == 0)
+            {
+                calculated_checksum = 0;
+            }
+            else
+            {
+                auto read_buffer = this->getReadBuffer(ReadSettings{}.adjustBufferSize(size));
+                HashingReadBuffer hashing_read_buffer(*read_buffer);
+                hashing_read_buffer.ignoreAll();
+                calculated_checksum = hashing_read_buffer.getHash();
+            }
+        }
+        return *calculated_checksum;
+    }
+}
+
+template <typename Base>
+std::optional<UInt128> BackupEntryWithChecksumCalculation<Base>::getPartialChecksum(size_t prefix_length) const
+{
+    if (prefix_length == 0)
+        return 0;
+
+    size_t size = this->getSize();
+    if (prefix_length >= size)
+        return this->getChecksum();
+
+    std::lock_guard lock{checksum_calculation_mutex};
+
+    ReadSettings read_settings;
+    if (calculated_checksum)
+        read_settings.adjustBufferSize(calculated_checksum ? prefix_length : size);
+
+    auto read_buffer = this->getReadBuffer(read_settings);
+    HashingReadBuffer hashing_read_buffer(*read_buffer);
+    hashing_read_buffer.ignore(prefix_length);
+    auto partial_checksum = hashing_read_buffer.getHash();
+
+    if (!calculated_checksum)
+    {
+        hashing_read_buffer.ignoreAll();
+        calculated_checksum = hashing_read_buffer.getHash();
+    }
+
+    return partial_checksum;
+}
+
+template class BackupEntryWithChecksumCalculation<IBackupEntry>;
+
+}
diff --git a/src/Backups/BackupEntryWithChecksumCalculation.h b/src/Backups/BackupEntryWithChecksumCalculation.h
new file mode 100644
index 00000000000..32701ab9952
--- /dev/null
+++ b/src/Backups/BackupEntryWithChecksumCalculation.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <Backups/IBackupEntry.h>
+
+
+namespace DB
+{
+
+/// Calculates the checksum and the partial checksum for a backup entry based on ReadBuffer returned by getReadBuffer().
+template <typename Base>
+class BackupEntryWithChecksumCalculation : public Base
+{
+public:
+    UInt128 getChecksum() const override;
+    std::optional<UInt128> getPartialChecksum(size_t prefix_length) const override;
+
+private:
+    mutable std::optional<UInt128> calculated_checksum;
+    mutable std::mutex checksum_calculation_mutex;
+};
+
+}
diff --git a/src/Backups/BackupEntryWrappedWith.h b/src/Backups/BackupEntryWrappedWith.h
index 97244650b6b..f865d529206 100644
--- a/src/Backups/BackupEntryWrappedWith.h
+++ b/src/Backups/BackupEntryWrappedWith.h
@@ -15,23 +15,33 @@ public:
     BackupEntryWrappedWith(BackupEntryPtr entry_, T && custom_value_) : entry(entry_), custom_value(std::move(custom_value_)) { }
     ~BackupEntryWrappedWith() override = default;
 
+    std::unique_ptr<SeekableReadBuffer> getReadBuffer(const ReadSettings & read_settings) const override { return entry->getReadBuffer(read_settings); }
     UInt64 getSize() const override { return entry->getSize(); }
-    std::optional<UInt128> getChecksum() const override { return entry->getChecksum(); }
-    std::unique_ptr<SeekableReadBuffer> getReadBuffer() const override { return entry->getReadBuffer(); }
-    String getFilePath() const override { return entry->getFilePath(); }
-    DiskPtr tryGetDiskIfExists() const override { return entry->tryGetDiskIfExists(); }
+    UInt128 getChecksum() const override { return entry->getChecksum(); }
+    std::optional<UInt128> getPartialChecksum(size_t prefix_length) const override { return entry->getPartialChecksum(prefix_length); }
     DataSourceDescription getDataSourceDescription() const override { return entry->getDataSourceDescription(); }
+    bool isEncryptedByDisk() const override { return entry->isEncryptedByDisk(); }
+    bool isFromFile() const override { return entry->isFromFile(); }
+    bool isFromImmutableFile() const override { return entry->isFromImmutableFile(); }
+    String getFilePath() const override { return entry->getFilePath(); }
+    DiskPtr getDisk() const override { return entry->getDisk(); }
 
 private:
     BackupEntryPtr entry;
     T custom_value;
 };
 
+template <typename T>
+BackupEntryPtr wrapBackupEntryWith(BackupEntryPtr && backup_entry, const T & custom_value)
+{
+    return std::make_shared<BackupEntryWrappedWith<T>>(std::move(backup_entry), custom_value);
+}
+
 template <typename T>
 void wrapBackupEntriesWith(std::vector<std::pair<String, BackupEntryPtr>> & backup_entries, const T & custom_value)
 {
     for (auto & [_, backup_entry] : backup_entries)
-        backup_entry = std::make_shared<BackupEntryWrappedWith<T>>(std::move(backup_entry), custom_value);
+        backup_entry = wrapBackupEntryWith(std::move(backup_entry), custom_value);
 }
 
 }
diff --git a/src/Backups/BackupFactory.cpp b/src/Backups/BackupFactory.cpp
index 7c870737b1d..898ac7bc490 100644
--- a/src/Backups/BackupFactory.cpp
+++ b/src/Backups/BackupFactory.cpp
@@ -20,14 +20,14 @@ BackupMutablePtr BackupFactory::createBackup(const CreateParams & params) const
     const String & engine_name = params.backup_info.backup_engine_name;
     auto it = creators.find(engine_name);
     if (it == creators.end())
-        throw Exception(ErrorCodes::BACKUP_ENGINE_NOT_FOUND, "Not found backup engine {}", engine_name);
+        throw Exception(ErrorCodes::BACKUP_ENGINE_NOT_FOUND, "Not found backup engine '{}'", engine_name);
     return (it->second)(params);
 }
 
 void BackupFactory::registerBackupEngine(const String & engine_name, const CreatorFn & creator_fn)
 {
     if (creators.contains(engine_name))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup engine {} was registered twice", engine_name);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup engine '{}' was registered twice", engine_name);
     creators[engine_name] = creator_fn;
 }
 
diff --git a/src/Backups/BackupFileInfo.cpp b/src/Backups/BackupFileInfo.cpp
new file mode 100644
index 00000000000..d539ada55c4
--- /dev/null
+++ b/src/Backups/BackupFileInfo.cpp
@@ -0,0 +1,264 @@
+#include <Backups/BackupFileInfo.h>
+
+#include <Backups/IBackup.h>
+#include <Backups/IBackupEntry.h>
+#include <Common/CurrentThread.h>
+#include <Common/logger_useful.h>
+#include <Common/scope_guard_safe.h>
+#include <Common/setThreadName.h>
+#include <Common/ThreadPool.h>
+#include <base/hex.h>
+
+
+namespace DB
+{
+
+namespace
+{
+    using SizeAndChecksum = std::pair<UInt64, UInt128>;
+
+    std::optional<SizeAndChecksum> getInfoAboutFileFromBaseBackupIfExists(const BackupPtr & base_backup, const std::string & file_path)
+    {
+        if (base_backup && base_backup->fileExists(file_path))
+            return base_backup->getFileSizeAndChecksum(file_path);
+
+        return std::nullopt;
+    }
+
+    enum class CheckBackupResult
+    {
+        HasPrefix,
+        HasFull,
+        HasNothing,
+    };
+
+    CheckBackupResult checkBaseBackupForFile(const SizeAndChecksum & base_backup_info, const BackupFileInfo & new_entry_info)
+    {
+        /// We cannot reuse base backup because our file is smaller
+        /// than file stored in previous backup
+        if ((new_entry_info.size < base_backup_info.first) || !base_backup_info.first)
+            return CheckBackupResult::HasNothing;
+
+        if (base_backup_info.first == new_entry_info.size)
+            return CheckBackupResult::HasFull;
+
+        return CheckBackupResult::HasPrefix;
+
+    }
+
+    struct ChecksumsForNewEntry
+    {
+        /// 0 is the valid checksum of empty data.
+        UInt128 full_checksum = 0;
+
+        /// std::nullopt here means that it's too difficult to calculate a partial checksum so it shouldn't be used.
+        std::optional<UInt128> prefix_checksum;
+    };
+
+    /// Calculate checksum for backup entry if it's empty.
+    /// Also able to calculate additional checksum of some prefix.
+    ChecksumsForNewEntry calculateNewEntryChecksumsIfNeeded(const BackupEntryPtr & entry, size_t prefix_size)
+    {
+        ChecksumsForNewEntry res;
+        /// The partial checksum should be calculated before the full checksum to enable optimization in BackupEntryWithChecksumCalculation.
+        res.prefix_checksum = entry->getPartialChecksum(prefix_size);
+        res.full_checksum = entry->getChecksum();
+        return res;
+    }
+
+    /// We store entries' file names in the backup without leading slashes.
+    String removeLeadingSlash(const String & path)
+    {
+        if (path.starts_with('/'))
+            return path.substr(1);
+        return path;
+    }
+}
+
+
+/// Note: this format doesn't allow to parse data back
+/// It is useful only for debugging purposes
+String BackupFileInfo::describe() const
+{
+    String result;
+    result += fmt::format("file_name: {};\n", file_name);
+    result += fmt::format("size: {};\n", size);
+    result += fmt::format("checksum: {};\n", getHexUIntLowercase(checksum));
+    result += fmt::format("base_size: {};\n", base_size);
+    result += fmt::format("base_checksum: {};\n", getHexUIntLowercase(checksum));
+    result += fmt::format("data_file_name: {};\n", data_file_name);
+    result += fmt::format("data_file_index: {};\n", data_file_index);
+    result += fmt::format("encrypted_by_disk: {};\n", encrypted_by_disk);
+    return result;
+}
+
+
+BackupFileInfo buildFileInfoForBackupEntry(const String & file_name, const BackupEntryPtr & backup_entry, const BackupPtr & base_backup, Poco::Logger * log)
+{
+    auto adjusted_path = removeLeadingSlash(file_name);
+
+    BackupFileInfo info;
+    info.file_name = adjusted_path;
+    info.size = backup_entry->getSize();
+    info.encrypted_by_disk = backup_entry->isEncryptedByDisk();
+
+    /// We don't set `info.data_file_name` and `info.data_file_index` in this function because they're set during backup coordination
+    /// (see the class BackupCoordinationFileInfos).
+
+    if (!info.size)
+    {
+        /// Empty file.
+        return info;
+    }
+
+    if (!log)
+        log = &Poco::Logger::get("FileInfoFromBackupEntry");
+
+    std::optional<SizeAndChecksum> base_backup_file_info = getInfoAboutFileFromBaseBackupIfExists(base_backup, adjusted_path);
+
+    /// We have info about this file in base backup
+    /// If file has no checksum -- calculate and fill it.
+    if (base_backup_file_info)
+    {
+        LOG_TRACE(log, "File {} found in base backup, checking for equality", adjusted_path);
+        CheckBackupResult check_base = checkBaseBackupForFile(*base_backup_file_info, info);
+
+        /// File with the same name but smaller size exist in previous backup
+        if (check_base == CheckBackupResult::HasPrefix)
+        {
+            auto checksums = calculateNewEntryChecksumsIfNeeded(backup_entry, base_backup_file_info->first);
+            info.checksum = checksums.full_checksum;
+
+            /// We have prefix of this file in backup with the same checksum.
+            /// In ClickHouse this can happen for StorageLog for example.
+            if (checksums.prefix_checksum == base_backup_file_info->second)
+            {
+                LOG_TRACE(log, "Found prefix of file {} in the base backup, will write rest of the file to current backup", adjusted_path);
+                info.base_size = base_backup_file_info->first;
+                info.base_checksum = base_backup_file_info->second;
+            }
+            else
+            {
+                LOG_TRACE(log, "Prefix of file {} doesn't match the file in the base backup", adjusted_path);
+            }
+        }
+        else
+        {
+            /// We have full file or have nothing, first of all let's get checksum
+            /// of current file
+            auto checksums = calculateNewEntryChecksumsIfNeeded(backup_entry, 0);
+            info.checksum = checksums.full_checksum;
+
+            if (info.checksum == base_backup_file_info->second)
+            {
+                LOG_TRACE(log, "Found whole file {} in base backup", adjusted_path);
+                assert(check_base == CheckBackupResult::HasFull);
+                assert(info.size == base_backup_file_info->first);
+
+                info.base_size = base_backup_file_info->first;
+                info.base_checksum = base_backup_file_info->second;
+                /// Actually we can add this info to coordination and exist,
+                /// but we intentionally don't do it, otherwise control flow
+                /// of this function will be very complex.
+            }
+            else
+            {
+                LOG_TRACE(log, "Whole file {} in base backup doesn't match by checksum", adjusted_path);
+            }
+        }
+    }
+    else
+    {
+        auto checksums = calculateNewEntryChecksumsIfNeeded(backup_entry, 0);
+        info.checksum = checksums.full_checksum;
+    }
+
+    /// We don't have info about this file_name (sic!) in base backup,
+    /// however file could be renamed, so we will check one more time using size and checksum
+    if (base_backup && base_backup->fileExists(std::pair{info.size, info.checksum}))
+    {
+        LOG_TRACE(log, "Found a file in the base backup with the same size and checksum as {}", adjusted_path);
+        info.base_size = info.size;
+        info.base_checksum = info.checksum;
+    }
+
+    if (base_backup && !info.base_size)
+        LOG_TRACE(log, "Nothing found for file {} in base backup", adjusted_path);
+
+    return info;
+}
+
+BackupFileInfos buildFileInfosForBackupEntries(const BackupEntries & backup_entries, const BackupPtr & base_backup, ThreadPool & thread_pool)
+{
+    BackupFileInfos infos;
+    infos.resize(backup_entries.size());
+
+    size_t num_active_jobs = 0;
+    std::mutex mutex;
+    std::condition_variable event;
+    std::exception_ptr exception;
+
+    auto thread_group = CurrentThread::getGroup();
+    Poco::Logger * log = &Poco::Logger::get("FileInfosFromBackupEntries");
+
+    for (size_t i = 0; i != backup_entries.size(); ++i)
+    {
+        {
+            std::lock_guard lock{mutex};
+            if (exception)
+                break;
+            ++num_active_jobs;
+        }
+
+        auto job = [&mutex, &num_active_jobs, &event, &exception, &infos, &backup_entries, &base_backup, &thread_group, i, log](bool async)
+        {
+            SCOPE_EXIT_SAFE({
+                std::lock_guard lock{mutex};
+                if (!--num_active_jobs)
+                    event.notify_all();
+                if (async)
+                    CurrentThread::detachFromGroupIfNotDetached();
+            });
+
+            try
+            {
+                const auto & name = backup_entries[i].first;
+                const auto & entry = backup_entries[i].second;
+
+                if (async && thread_group)
+                    CurrentThread::attachToGroup(thread_group);
+
+                if (async)
+                    setThreadName("BackupWorker");
+
+                {
+                    std::lock_guard lock{mutex};
+                    if (exception)
+                        return;
+                }
+
+                infos[i] = buildFileInfoForBackupEntry(name, entry, base_backup, log);
+            }
+            catch (...)
+            {
+                std::lock_guard lock{mutex};
+                if (!exception)
+                    exception = std::current_exception();
+            }
+        };
+
+        if (!thread_pool.trySchedule([job] { job(true); }))
+            job(false);
+    }
+
+    {
+        std::unique_lock lock{mutex};
+        event.wait(lock, [&] { return !num_active_jobs; });
+        if (exception)
+            std::rethrow_exception(exception);
+    }
+
+    return infos;
+}
+
+}
diff --git a/src/Backups/BackupFileInfo.h b/src/Backups/BackupFileInfo.h
new file mode 100644
index 00000000000..a925a1e81ac
--- /dev/null
+++ b/src/Backups/BackupFileInfo.h
@@ -0,0 +1,74 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <Common/ThreadPool_fwd.h>
+
+namespace Poco { class Logger; }
+
+namespace DB
+{
+
+class IBackup;
+class IBackupEntry;
+using BackupPtr = std::shared_ptr<const IBackup>;
+using BackupEntryPtr = std::shared_ptr<const IBackupEntry>;
+using BackupEntries = std::vector<std::pair<String, BackupEntryPtr>>;
+
+
+/// Information about a file stored in a backup.
+struct BackupFileInfo
+{
+    String file_name;
+
+    UInt64 size = 0;
+    UInt128 checksum{0};
+
+    /// for incremental backups
+    UInt64 base_size = 0;
+    UInt128 base_checksum{0};
+
+    /// Name of the data file. An empty string means there is no data file (that can happen if the file is empty or was taken from the base backup as a whole).
+    /// This field is set during backup coordination (see the class BackupCoordinationFileInfos).
+    String data_file_name;
+
+    /// Index of the data file. -1 means there is no data file.
+    /// This field is set during backup coordination (see the class BackupCoordinationFileInfos).
+    size_t data_file_index = static_cast<size_t>(-1);
+
+    /// Whether this file is encrypted by an encrypted disk.
+    bool encrypted_by_disk = false;
+
+    struct LessByFileName
+    {
+        bool operator()(const BackupFileInfo & lhs, const BackupFileInfo & rhs) const { return (lhs.file_name < rhs.file_name); }
+        bool operator()(const BackupFileInfo * lhs, const BackupFileInfo * rhs) const { return (lhs->file_name < rhs->file_name); }
+    };
+
+    struct EqualByFileName
+    {
+        bool operator()(const BackupFileInfo & lhs, const BackupFileInfo & rhs) const { return (lhs.file_name == rhs.file_name); }
+        bool operator()(const BackupFileInfo * lhs, const BackupFileInfo * rhs) const { return (lhs->file_name == rhs->file_name); }
+    };
+
+    struct LessBySizeOrChecksum
+    {
+        bool operator()(const BackupFileInfo & lhs, const BackupFileInfo & rhs) const
+        {
+            return (lhs.size < rhs.size) || (lhs.size == rhs.size && lhs.checksum < rhs.checksum);
+        }
+    };
+
+    /// Note: this format doesn't allow to parse data back.
+    /// Must be used only for debugging purposes.
+    String describe() const;
+};
+
+using BackupFileInfos = std::vector<BackupFileInfo>;
+
+/// Builds a BackupFileInfo for a specified backup entry.
+BackupFileInfo buildFileInfoForBackupEntry(const String & file_name, const BackupEntryPtr & backup_entry, const BackupPtr & base_backup, Poco::Logger * log);
+
+/// Builds a vector of BackupFileInfos for specified backup entries.
+BackupFileInfos buildFileInfosForBackupEntries(const BackupEntries & backup_entries, const BackupPtr & base_backup, ThreadPool & thread_pool);
+
+}
diff --git a/src/Backups/BackupIO.cpp b/src/Backups/BackupIO.cpp
deleted file mode 100644
index 6ca0c8e7bee..00000000000
--- a/src/Backups/BackupIO.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <Backups/BackupIO.h>
-
-#include <IO/copyData.h>
-#include <IO/WriteBuffer.h>
-#include <IO/SeekableReadBuffer.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-void IBackupWriter::copyDataToFile(const CreateReadBufferFunction & create_read_buffer, UInt64 offset, UInt64 size, const String & dest_file_name)
-{
-    auto read_buffer = create_read_buffer();
-    if (offset)
-        read_buffer->seek(offset, SEEK_SET);
-    auto write_buffer = writeFile(dest_file_name);
-    copyData(*read_buffer, *write_buffer, size);
-    write_buffer->finalize();
-}
-
-void IBackupWriter::copyFileNative(
-    DiskPtr /* src_disk */, const String & /* src_file_name */, UInt64 /* src_offset */, UInt64 /* src_size */, const String & /* dest_file_name */)
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Native copy not implemented for backup writer");
-}
-}
diff --git a/src/Backups/BackupIO.h b/src/Backups/BackupIO.h
index fe2bed6aa1a..e4a82a604e8 100644
--- a/src/Backups/BackupIO.h
+++ b/src/Backups/BackupIO.h
@@ -1,42 +1,72 @@
 #pragma once
 
 #include <Core/Types.h>
-#include <Disks/DiskType.h>
-#include <Disks/IDisk.h>
+
 
 namespace DB
 {
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
 class SeekableReadBuffer;
 class WriteBuffer;
+enum class WriteMode;
+struct WriteSettings;
+struct ReadSettings;
 
 /// Represents operations of loading from disk or downloading for reading a backup.
-class IBackupReader /// BackupReaderFile, BackupReaderDisk
+/// See also implementations: BackupReaderFile, BackupReaderDisk.
+class IBackupReader
 {
 public:
     virtual ~IBackupReader() = default;
+
     virtual bool fileExists(const String & file_name) = 0;
     virtual UInt64 getFileSize(const String & file_name) = 0;
+
     virtual std::unique_ptr<SeekableReadBuffer> readFile(const String & file_name) = 0;
-    virtual DataSourceDescription getDataSourceDescription() const = 0;
+
+    /// The function copyFileToDisk() can be much faster than reading the file with readFile() and then writing it to some disk.
+    /// (especially for S3 where it can use CopyObject to copy objects inside S3 instead of downloading and uploading them).
+    /// Parameters:
+    /// `encrypted_in_backup` specify if this file is encrypted in the backup, so it shouldn't be encrypted again while restoring to an encrypted disk.
+    virtual void copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup,
+                                DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) = 0;
+
+    virtual const ReadSettings & getReadSettings() const = 0;
+    virtual const WriteSettings & getWriteSettings() const = 0;
+    virtual size_t getWriteBufferSize() const = 0;
 };
 
 /// Represents operations of storing to disk or uploading for writing a backup.
-class IBackupWriter /// BackupWriterFile, BackupWriterDisk
+/// See also implementations: BackupWriterFile, BackupWriterDisk
+class IBackupWriter
 {
 public:
-    using CreateReadBufferFunction = std::function<std::unique_ptr<SeekableReadBuffer>()>;
-
     virtual ~IBackupWriter() = default;
+
     virtual bool fileExists(const String & file_name) = 0;
     virtual UInt64 getFileSize(const String & file_name) = 0;
     virtual bool fileContentsEqual(const String & file_name, const String & expected_file_contents) = 0;
+
     virtual std::unique_ptr<WriteBuffer> writeFile(const String & file_name) = 0;
+
+    using CreateReadBufferFunction = std::function<std::unique_ptr<SeekableReadBuffer>()>;
+    virtual void copyDataToFile(const String & path_in_backup, const CreateReadBufferFunction & create_read_buffer, UInt64 start_pos, UInt64 length) = 0;
+
+    /// The function copyFileFromDisk() can be much faster than copyDataToFile()
+    /// (especially for S3 where it can use CopyObject to copy objects inside S3 instead of downloading and uploading them).
+    /// Parameters:
+    /// `start_pos` and `length` specify a part of the file on `src_disk` to copy to the backup.
+    /// `copy_encrypted` specify whether this function should copy encrypted data of the file `src_path` to the backup.
+    virtual void copyFileFromDisk(const String & path_in_backup, DiskPtr src_disk, const String & src_path,
+                                  bool copy_encrypted, UInt64 start_pos, UInt64 length) = 0;
+
     virtual void removeFile(const String & file_name) = 0;
     virtual void removeFiles(const Strings & file_names) = 0;
-    virtual DataSourceDescription getDataSourceDescription() const = 0;
-    virtual void copyDataToFile(const CreateReadBufferFunction & create_read_buffer, UInt64 offset, UInt64 size, const String & dest_file_name);
-    virtual bool supportNativeCopy(DataSourceDescription /* data_source_description */) const { return false; }
-    virtual void copyFileNative(DiskPtr src_disk, const String & src_file_name, UInt64 src_offset, UInt64 src_size, const String & dest_file_name);
+
+    virtual const ReadSettings & getReadSettings() const = 0;
+    virtual const WriteSettings & getWriteSettings() const = 0;
+    virtual size_t getWriteBufferSize() const = 0;
 };
 
 }
diff --git a/src/Backups/BackupIO_Default.cpp b/src/Backups/BackupIO_Default.cpp
new file mode 100644
index 00000000000..b36cb22498d
--- /dev/null
+++ b/src/Backups/BackupIO_Default.cpp
@@ -0,0 +1,95 @@
+#include <Backups/BackupIO_Default.h>
+
+#include <Disks/IDisk.h>
+#include <IO/copyData.h>
+#include <IO/WriteBufferFromFileBase.h>
+#include <IO/ReadBufferFromFileBase.h>
+#include <Interpreters/Context.h>
+#include <Common/logger_useful.h>
+
+
+namespace DB
+{
+
+BackupReaderDefault::BackupReaderDefault(Poco::Logger * log_, const ContextPtr & context_)
+    : log(log_)
+    , read_settings(context_->getBackupReadSettings())
+    , write_settings(context_->getWriteSettings())
+    , write_buffer_size(DBMS_DEFAULT_BUFFER_SIZE)
+{
+}
+
+void BackupReaderDefault::copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup,
+                                         DiskPtr destination_disk, const String & destination_path, WriteMode write_mode)
+{
+    LOG_TRACE(log, "Copying file {} to disk {} through buffers", path_in_backup, destination_disk->getName());
+
+    auto read_buffer = readFile(path_in_backup);
+
+    std::unique_ptr<WriteBuffer> write_buffer;
+    auto buf_size = std::min(file_size, write_buffer_size);
+    if (encrypted_in_backup)
+        write_buffer = destination_disk->writeEncryptedFile(destination_path, buf_size, write_mode, write_settings);
+    else
+        write_buffer = destination_disk->writeFile(destination_path, buf_size, write_mode, write_settings);
+
+    copyData(*read_buffer, *write_buffer, file_size);
+    write_buffer->finalize();
+}
+
+BackupWriterDefault::BackupWriterDefault(Poco::Logger * log_, const ContextPtr & context_)
+    : log(log_)
+    , read_settings(context_->getBackupReadSettings())
+    , write_settings(context_->getWriteSettings())
+    , write_buffer_size(DBMS_DEFAULT_BUFFER_SIZE)
+{
+}
+
+bool BackupWriterDefault::fileContentsEqual(const String & file_name, const String & expected_file_contents)
+{
+    if (!fileExists(file_name))
+        return false;
+
+    try
+    {
+        auto in = readFile(file_name, expected_file_contents.size());
+        String actual_file_contents(expected_file_contents.size(), ' ');
+        return (in->read(actual_file_contents.data(), actual_file_contents.size()) == actual_file_contents.size())
+            && (actual_file_contents == expected_file_contents) && in->eof();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        return false;
+    }
+}
+
+void BackupWriterDefault::copyDataToFile(const String & path_in_backup, const CreateReadBufferFunction & create_read_buffer, UInt64 start_pos, UInt64 length)
+{
+    auto read_buffer = create_read_buffer();
+
+    if (start_pos)
+        read_buffer->seek(start_pos, SEEK_SET);
+
+    auto write_buffer = writeFile(path_in_backup);
+
+    copyData(*read_buffer, *write_buffer, length);
+    write_buffer->finalize();
+}
+
+void BackupWriterDefault::copyFileFromDisk(const String & path_in_backup, DiskPtr src_disk, const String & src_path,
+                                           bool copy_encrypted, UInt64 start_pos, UInt64 length)
+{
+    LOG_TRACE(log, "Copying file {} from disk {} through buffers", src_path, src_disk->getName());
+
+    auto create_read_buffer = [src_disk, src_path, copy_encrypted, settings = read_settings.adjustBufferSize(start_pos + length)]
+    {
+        if (copy_encrypted)
+            return src_disk->readEncryptedFile(src_path, settings);
+        else
+            return src_disk->readFile(src_path, settings);
+    };
+
+    copyDataToFile(path_in_backup, create_read_buffer, start_pos, length);
+}
+}
diff --git a/src/Backups/BackupIO_Default.h b/src/Backups/BackupIO_Default.h
new file mode 100644
index 00000000000..ad7bdf15d9f
--- /dev/null
+++ b/src/Backups/BackupIO_Default.h
@@ -0,0 +1,73 @@
+#pragma once
+
+#include <Backups/BackupIO.h>
+#include <IO/ReadSettings.h>
+#include <IO/WriteSettings.h>
+#include <Interpreters/Context_fwd.h>
+
+
+namespace DB
+{
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+class ReadBuffer;
+class SeekableReadBuffer;
+class WriteBuffer;
+enum class WriteMode;
+
+/// Represents operations of loading from disk or downloading for reading a backup.
+class BackupReaderDefault : public IBackupReader
+{
+public:
+    BackupReaderDefault(Poco::Logger * log_, const ContextPtr & context_);
+    ~BackupReaderDefault() override = default;
+
+    /// The function copyFileToDisk() can be much faster than reading the file with readFile() and then writing it to some disk.
+    /// (especially for S3 where it can use CopyObject to copy objects inside S3 instead of downloading and uploading them).
+    /// Parameters:
+    /// `encrypted_in_backup` specify if this file is encrypted in the backup, so it shouldn't be encrypted again while restoring to an encrypted disk.
+    void copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup,
+                        DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) override;
+
+    const ReadSettings & getReadSettings() const override { return read_settings; }
+    const WriteSettings & getWriteSettings() const override { return write_settings; }
+    size_t getWriteBufferSize() const override { return write_buffer_size; }
+
+protected:
+    Poco::Logger * const log;
+    const ReadSettings read_settings;
+
+    /// The write settings are used to write to the source disk in copyFileToDisk().
+    const WriteSettings write_settings;
+    const size_t write_buffer_size;
+};
+
+/// Represents operations of storing to disk or uploading for writing a backup.
+class BackupWriterDefault : public IBackupWriter
+{
+public:
+    BackupWriterDefault(Poco::Logger * log_, const ContextPtr & context_);
+    ~BackupWriterDefault() override = default;
+
+    bool fileContentsEqual(const String & file_name, const String & expected_file_contents) override;
+    void copyDataToFile(const String & path_in_backup, const CreateReadBufferFunction & create_read_buffer, UInt64 start_pos, UInt64 length) override;
+    void copyFileFromDisk(const String & path_in_backup, DiskPtr src_disk, const String & src_path, bool copy_encrypted, UInt64 start_pos, UInt64 length) override;
+
+    const ReadSettings & getReadSettings() const override { return read_settings; }
+    const WriteSettings & getWriteSettings() const override { return write_settings; }
+    size_t getWriteBufferSize() const override { return write_buffer_size; }
+
+protected:
+    /// Here readFile() is used only to implement fileContentsEqual().
+    virtual std::unique_ptr<ReadBuffer> readFile(const String & file_name, size_t expected_file_size) = 0;
+
+    Poco::Logger * const log;
+
+    /// The read settings are used to read from the source disk in copyFileFromDisk().
+    const ReadSettings read_settings;
+
+    const WriteSettings write_settings;
+    const size_t write_buffer_size;
+};
+
+}
diff --git a/src/Backups/BackupIO_Disk.cpp b/src/Backups/BackupIO_Disk.cpp
index 1b7202a5c28..1514b4c24c7 100644
--- a/src/Backups/BackupIO_Disk.cpp
+++ b/src/Backups/BackupIO_Disk.cpp
@@ -1,4 +1,5 @@
 #include <Backups/BackupIO_Disk.h>
+#include <Common/logger_useful.h>
 #include <Disks/IDisk.h>
 #include <IO/ReadBufferFromFileBase.h>
 #include <IO/WriteBufferFromFileBase.h>
@@ -7,12 +8,11 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-BackupReaderDisk::BackupReaderDisk(const DiskPtr & disk_, const String & path_) : disk(disk_), path(path_)
+BackupReaderDisk::BackupReaderDisk(const DiskPtr & disk_, const String & root_path_, const ContextPtr & context_)
+    : BackupReaderDefault(&Poco::Logger::get("BackupReaderDisk"), context_)
+    , disk(disk_)
+    , root_path(root_path_)
+    , data_source_description(disk->getDataSourceDescription())
 {
 }
 
@@ -20,20 +20,47 @@ BackupReaderDisk::~BackupReaderDisk() = default;
 
 bool BackupReaderDisk::fileExists(const String & file_name)
 {
-    return disk->exists(path / file_name);
+    return disk->exists(root_path / file_name);
 }
 
 UInt64 BackupReaderDisk::getFileSize(const String & file_name)
 {
-    return disk->getFileSize(path / file_name);
+    return disk->getFileSize(root_path / file_name);
 }
 
 std::unique_ptr<SeekableReadBuffer> BackupReaderDisk::readFile(const String & file_name)
 {
-    return disk->readFile(path / file_name);
+    return disk->readFile(root_path / file_name, read_settings);
 }
 
-BackupWriterDisk::BackupWriterDisk(const DiskPtr & disk_, const String & path_) : disk(disk_), path(path_)
+void BackupReaderDisk::copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup,
+                                      DiskPtr destination_disk, const String & destination_path, WriteMode write_mode)
+{
+    /// Use IDisk::copyFile() as a more optimal way to copy a file if it's possible.
+    /// However IDisk::copyFile() can't use throttling for reading, and can't copy an encrypted file or do appending.
+    bool has_throttling = disk->isRemote() ? static_cast<bool>(read_settings.remote_throttler) : static_cast<bool>(read_settings.local_throttler);
+    if (!has_throttling && (write_mode == WriteMode::Rewrite) && !encrypted_in_backup)
+    {
+        auto destination_data_source_description = destination_disk->getDataSourceDescription();
+        if (destination_data_source_description.sameKind(data_source_description) && !data_source_description.is_encrypted)
+        {
+            /// Use more optimal way.
+            LOG_TRACE(log, "Copying file {} from disk {} to disk {}", path_in_backup, disk->getName(), destination_disk->getName());
+            disk->copyFile(root_path / path_in_backup, *destination_disk, destination_path, write_settings);
+            return; /// copied!
+        }
+    }
+
+    /// Fallback to copy through buffers.
+    BackupReaderDefault::copyFileToDisk(path_in_backup, file_size, encrypted_in_backup, destination_disk, destination_path, write_mode);
+}
+
+
+BackupWriterDisk::BackupWriterDisk(const DiskPtr & disk_, const String & root_path_, const ContextPtr & context_)
+    : BackupWriterDefault(&Poco::Logger::get("BackupWriterDisk"), context_)
+    , disk(disk_)
+    , root_path(root_path_)
+    , data_source_description(disk->getDataSourceDescription())
 {
 }
 
@@ -41,85 +68,64 @@ BackupWriterDisk::~BackupWriterDisk() = default;
 
 bool BackupWriterDisk::fileExists(const String & file_name)
 {
-    return disk->exists(path / file_name);
+    return disk->exists(root_path / file_name);
 }
 
 UInt64 BackupWriterDisk::getFileSize(const String & file_name)
 {
-    return disk->getFileSize(path / file_name);
+    return disk->getFileSize(root_path / file_name);
 }
 
-bool BackupWriterDisk::fileContentsEqual(const String & file_name, const String & expected_file_contents)
+std::unique_ptr<ReadBuffer> BackupWriterDisk::readFile(const String & file_name, size_t expected_file_size)
 {
-    if (!disk->exists(path / file_name))
-        return false;
-
-    try
-    {
-        auto in = disk->readFile(path / file_name);
-        String actual_file_contents(expected_file_contents.size(), ' ');
-        return (in->read(actual_file_contents.data(), actual_file_contents.size()) == actual_file_contents.size())
-            && (actual_file_contents == expected_file_contents) && in->eof();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-        return false;
-    }
+    return disk->readFile(root_path / file_name, read_settings.adjustBufferSize(expected_file_size));
 }
 
 std::unique_ptr<WriteBuffer> BackupWriterDisk::writeFile(const String & file_name)
 {
-    auto file_path = path / file_name;
+    auto file_path = root_path / file_name;
     disk->createDirectories(file_path.parent_path());
-    return disk->writeFile(file_path);
+    return disk->writeFile(file_path, write_buffer_size, WriteMode::Rewrite, write_settings);
 }
 
 void BackupWriterDisk::removeFile(const String & file_name)
 {
-    disk->removeFileIfExists(path / file_name);
-    if (disk->isDirectory(path) && disk->isDirectoryEmpty(path))
-        disk->removeDirectory(path);
+    disk->removeFileIfExists(root_path / file_name);
+    if (disk->isDirectory(root_path) && disk->isDirectoryEmpty(root_path))
+        disk->removeDirectory(root_path);
 }
 
 void BackupWriterDisk::removeFiles(const Strings & file_names)
 {
     for (const auto & file_name : file_names)
-        disk->removeFileIfExists(path / file_name);
-    if (disk->isDirectory(path) && disk->isDirectoryEmpty(path))
-        disk->removeDirectory(path);
+        disk->removeFileIfExists(root_path / file_name);
+    if (disk->isDirectory(root_path) && disk->isDirectoryEmpty(root_path))
+        disk->removeDirectory(root_path);
 }
 
-DataSourceDescription BackupWriterDisk::getDataSourceDescription() const
+void BackupWriterDisk::copyFileFromDisk(const String & path_in_backup, DiskPtr src_disk, const String & src_path,
+                                        bool copy_encrypted, UInt64 start_pos, UInt64 length)
 {
-    return disk->getDataSourceDescription();
-}
-
-DataSourceDescription BackupReaderDisk::getDataSourceDescription() const
-{
-    return disk->getDataSourceDescription();
-}
-
-bool BackupWriterDisk::supportNativeCopy(DataSourceDescription data_source_description) const
-{
-    return data_source_description == disk->getDataSourceDescription();
-}
-
-void BackupWriterDisk::copyFileNative(DiskPtr src_disk, const String & src_file_name, UInt64 src_offset, UInt64 src_size, const String & dest_file_name)
-{
-    if (!src_disk)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot natively copy data to disk without source disk");
-
-    if ((src_offset != 0) || (src_size != src_disk->getFileSize(src_file_name)))
+    /// Use IDisk::copyFile() as a more optimal way to copy a file if it's possible.
+    /// However IDisk::copyFile() can't use throttling for reading, and can't copy an encrypted file or copy a part of the file.
+    bool has_throttling = src_disk->isRemote() ? static_cast<bool>(read_settings.remote_throttler) : static_cast<bool>(read_settings.local_throttler);
+    if (!has_throttling && !start_pos && !copy_encrypted)
     {
-        auto create_read_buffer = [src_disk, src_file_name] { return src_disk->readFile(src_file_name); };
-        copyDataToFile(create_read_buffer, src_offset, src_size, dest_file_name);
-        return;
+        auto source_data_source_description = src_disk->getDataSourceDescription();
+        if (source_data_source_description.sameKind(data_source_description) && !source_data_source_description.is_encrypted
+            && (length == src_disk->getFileSize(src_path)))
+        {
+            /// Use more optimal way.
+            LOG_TRACE(log, "Copying file {} from disk {} to disk {}", src_path, src_disk->getName(), disk->getName());
+            auto dest_file_path = root_path / path_in_backup;
+            disk->createDirectories(dest_file_path.parent_path());
+            src_disk->copyFile(src_path, *disk, dest_file_path, write_settings);
+            return; /// copied!
+        }
     }
 
-    auto file_path = path / dest_file_name;
-    disk->createDirectories(file_path.parent_path());
-    src_disk->copyFile(src_file_name, *disk, file_path);
+    /// Fallback to copy through buffers.
+    BackupWriterDefault::copyFileFromDisk(path_in_backup, src_disk, src_path, copy_encrypted, start_pos, length);
 }
 
 }
diff --git a/src/Backups/BackupIO_Disk.h b/src/Backups/BackupIO_Disk.h
index 5e5c431da7d..faf4ef03447 100644
--- a/src/Backups/BackupIO_Disk.h
+++ b/src/Backups/BackupIO_Disk.h
@@ -1,49 +1,58 @@
 #pragma once
 
+#include <Backups/BackupIO_Default.h>
+#include <Disks/DiskType.h>
 #include <filesystem>
-#include <Backups/BackupIO.h>
+
 
 namespace DB
 {
 class IDisk;
 using DiskPtr = std::shared_ptr<IDisk>;
 
-class BackupReaderDisk : public IBackupReader
+class BackupReaderDisk : public BackupReaderDefault
 {
 public:
-    BackupReaderDisk(const DiskPtr & disk_, const String & path_);
+    BackupReaderDisk(const DiskPtr & disk_, const String & root_path_, const ContextPtr & context_);
     ~BackupReaderDisk() override;
 
     bool fileExists(const String & file_name) override;
     UInt64 getFileSize(const String & file_name) override;
+
     std::unique_ptr<SeekableReadBuffer> readFile(const String & file_name) override;
-    DataSourceDescription getDataSourceDescription() const override;
+
+    void copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup,
+                        DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) override;
 
 private:
-    DiskPtr disk;
-    std::filesystem::path path;
+    const DiskPtr disk;
+    const std::filesystem::path root_path;
+    const DataSourceDescription data_source_description;
 };
 
-class BackupWriterDisk : public IBackupWriter
+class BackupWriterDisk : public BackupWriterDefault
 {
 public:
-    BackupWriterDisk(const DiskPtr & disk_, const String & path_);
+    BackupWriterDisk(const DiskPtr & disk_, const String & root_path_, const ContextPtr & context_);
     ~BackupWriterDisk() override;
 
     bool fileExists(const String & file_name) override;
     UInt64 getFileSize(const String & file_name) override;
-    bool fileContentsEqual(const String & file_name, const String & expected_file_contents) override;
+
     std::unique_ptr<WriteBuffer> writeFile(const String & file_name) override;
+
+    void copyFileFromDisk(const String & path_in_backup, DiskPtr src_disk, const String & src_path,
+                          bool copy_encrypted, UInt64 start_pos, UInt64 length) override;
+
     void removeFile(const String & file_name) override;
     void removeFiles(const Strings & file_names) override;
-    DataSourceDescription getDataSourceDescription() const override;
-
-    bool supportNativeCopy(DataSourceDescription data_source_description) const override;
-    void copyFileNative(DiskPtr src_disk, const String & src_file_name, UInt64 src_offset, UInt64 src_size, const String & dest_file_name) override;
 
 private:
-    DiskPtr disk;
-    std::filesystem::path path;
+    std::unique_ptr<ReadBuffer> readFile(const String & file_name, size_t expected_file_size) override;
+
+    const DiskPtr disk;
+    const std::filesystem::path root_path;
+    const DataSourceDescription data_source_description;
 };
 
 }
diff --git a/src/Backups/BackupIO_File.cpp b/src/Backups/BackupIO_File.cpp
index c010cae15de..e1a3f336521 100644
--- a/src/Backups/BackupIO_File.cpp
+++ b/src/Backups/BackupIO_File.cpp
@@ -1,148 +1,155 @@
 #include <Backups/BackupIO_File.h>
+#include <Disks/DiskLocal.h>
 #include <Disks/IO/createReadBufferFromFileBase.h>
 #include <IO/WriteBufferFromFile.h>
-#include <IO/copyData.h>
-#include <Common/filesystemHelpers.h>
+#include <Common/logger_useful.h>
+
 
 namespace fs = std::filesystem;
 
 
 namespace DB
 {
-BackupReaderFile::BackupReaderFile(const String & path_) : path(path_)
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+BackupReaderFile::BackupReaderFile(const String & root_path_, const ContextPtr & context_)
+    : BackupReaderDefault(&Poco::Logger::get("BackupReaderFile"), context_)
+    , root_path(root_path_)
+    , data_source_description(DiskLocal::getLocalDataSourceDescription(root_path))
 {
 }
 
-BackupReaderFile::~BackupReaderFile() = default;
-
 bool BackupReaderFile::fileExists(const String & file_name)
 {
-    return fs::exists(path / file_name);
+    return fs::exists(root_path / file_name);
 }
 
 UInt64 BackupReaderFile::getFileSize(const String & file_name)
 {
-    return fs::file_size(path / file_name);
+    return fs::file_size(root_path / file_name);
 }
 
 std::unique_ptr<SeekableReadBuffer> BackupReaderFile::readFile(const String & file_name)
 {
-    return createReadBufferFromFileBase(path / file_name, {});
+    return createReadBufferFromFileBase(root_path / file_name, read_settings);
 }
 
-BackupWriterFile::BackupWriterFile(const String & path_) : path(path_)
+void BackupReaderFile::copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup,
+                                      DiskPtr destination_disk, const String & destination_path, WriteMode write_mode)
+{
+    /// std::filesystem::copy() can copy from the filesystem only, and can't do throttling or appending.
+    bool has_throttling = static_cast<bool>(read_settings.local_throttler);
+    if (!has_throttling && (write_mode == WriteMode::Rewrite))
+    {
+        auto destination_data_source_description = destination_disk->getDataSourceDescription();
+        if (destination_data_source_description.sameKind(data_source_description)
+            && (destination_data_source_description.is_encrypted == encrypted_in_backup))
+        {
+            /// Use more optimal way.
+            LOG_TRACE(log, "Copying file {} to disk {} locally", path_in_backup, destination_disk->getName());
+
+            auto write_blob_function = [abs_source_path = root_path / path_in_backup, file_size](
+                                           const Strings & blob_path, WriteMode mode, const std::optional<ObjectAttributes> &) -> size_t
+            {
+                /// For local disks the size of a blob path is expected to be 1.
+                if (blob_path.size() != 1 || mode != WriteMode::Rewrite)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                    "Blob writing function called with unexpected blob_path.size={} or mode={}",
+                                    blob_path.size(), mode);
+                fs::copy(abs_source_path, blob_path.at(0), fs::copy_options::overwrite_existing);
+                return file_size;
+            };
+
+            destination_disk->writeFileUsingBlobWritingFunction(destination_path, write_mode, write_blob_function);
+            return; /// copied!
+        }
+    }
+
+    /// Fallback to copy through buffers.
+    BackupReaderDefault::copyFileToDisk(path_in_backup, file_size, encrypted_in_backup, destination_disk, destination_path, write_mode);
+}
+
+
+BackupWriterFile::BackupWriterFile(const String & root_path_, const ContextPtr & context_)
+    : BackupWriterDefault(&Poco::Logger::get("BackupWriterFile"), context_)
+    , root_path(root_path_)
+    , data_source_description(DiskLocal::getLocalDataSourceDescription(root_path))
 {
 }
 
-BackupWriterFile::~BackupWriterFile() = default;
-
 bool BackupWriterFile::fileExists(const String & file_name)
 {
-    return fs::exists(path / file_name);
+    return fs::exists(root_path / file_name);
 }
 
 UInt64 BackupWriterFile::getFileSize(const String & file_name)
 {
-    return fs::file_size(path / file_name);
+    return fs::file_size(root_path / file_name);
 }
 
-bool BackupWriterFile::fileContentsEqual(const String & file_name, const String & expected_file_contents)
+std::unique_ptr<ReadBuffer> BackupWriterFile::readFile(const String & file_name, size_t expected_file_size)
 {
-    if (!fs::exists(path / file_name))
-        return false;
-
-    try
-    {
-        auto in = createReadBufferFromFileBase(path / file_name, {});
-        String actual_file_contents(expected_file_contents.size(), ' ');
-        return (in->read(actual_file_contents.data(), actual_file_contents.size()) == actual_file_contents.size())
-            && (actual_file_contents == expected_file_contents) && in->eof();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-        return false;
-    }
+    return createReadBufferFromFileBase(root_path / file_name, read_settings.adjustBufferSize(expected_file_size));
 }
 
 std::unique_ptr<WriteBuffer> BackupWriterFile::writeFile(const String & file_name)
 {
-    auto file_path = path / file_name;
+    auto file_path = root_path / file_name;
     fs::create_directories(file_path.parent_path());
-    return std::make_unique<WriteBufferFromFile>(file_path);
+    return std::make_unique<WriteBufferFromFile>(file_path, write_buffer_size, -1, write_settings.local_throttler);
 }
 
 void BackupWriterFile::removeFile(const String & file_name)
 {
-    fs::remove(path / file_name);
-    if (fs::is_directory(path) && fs::is_empty(path))
-        fs::remove(path);
+    fs::remove(root_path / file_name);
+    if (fs::is_directory(root_path) && fs::is_empty(root_path))
+        fs::remove(root_path);
 }
 
 void BackupWriterFile::removeFiles(const Strings & file_names)
 {
     for (const auto & file_name : file_names)
-        fs::remove(path / file_name);
-    if (fs::is_directory(path) && fs::is_empty(path))
-        fs::remove(path);
+        fs::remove(root_path / file_name);
+    if (fs::is_directory(root_path) && fs::is_empty(root_path))
+        fs::remove(root_path);
 }
 
-DataSourceDescription BackupWriterFile::getDataSourceDescription() const
+void BackupWriterFile::copyFileFromDisk(const String & path_in_backup, DiskPtr src_disk, const String & src_path,
+                                        bool copy_encrypted, UInt64 start_pos, UInt64 length)
 {
-    DataSourceDescription data_source_description;
-
-    data_source_description.type = DataSourceType::Local;
-
-    if (auto block_device_id = tryGetBlockDeviceId(path); block_device_id.has_value())
-        data_source_description.description = *block_device_id;
-    else
-        data_source_description.description = path;
-    data_source_description.is_encrypted = false;
-    data_source_description.is_cached = false;
-
-    return data_source_description;
-}
-
-DataSourceDescription BackupReaderFile::getDataSourceDescription() const
-{
-    DataSourceDescription data_source_description;
-
-    data_source_description.type = DataSourceType::Local;
-
-    if (auto block_device_id = tryGetBlockDeviceId(path); block_device_id.has_value())
-        data_source_description.description = *block_device_id;
-    else
-        data_source_description.description = path;
-    data_source_description.is_encrypted = false;
-    data_source_description.is_cached = false;
-
-    return data_source_description;
-}
-
-
-bool BackupWriterFile::supportNativeCopy(DataSourceDescription data_source_description) const
-{
-    return data_source_description == getDataSourceDescription();
-}
-
-void BackupWriterFile::copyFileNative(DiskPtr src_disk, const String & src_file_name, UInt64 src_offset, UInt64 src_size, const String & dest_file_name)
-{
-    std::string abs_source_path;
-    if (src_disk)
-        abs_source_path = fullPath(src_disk, src_file_name);
-    else
-        abs_source_path = fs::absolute(src_file_name);
-
-    if ((src_offset != 0) || (src_size != fs::file_size(abs_source_path)))
+    /// std::filesystem::copy() can copy from the filesystem only, and can't do throttling or copy a part of the file.
+    bool has_throttling = static_cast<bool>(read_settings.local_throttler);
+    if (!has_throttling)
     {
-        auto create_read_buffer = [abs_source_path] { return createReadBufferFromFileBase(abs_source_path, {}); };
-        copyDataToFile(create_read_buffer, src_offset, src_size, dest_file_name);
-        return;
+        auto source_data_source_description = src_disk->getDataSourceDescription();
+        if (source_data_source_description.sameKind(data_source_description)
+            && (source_data_source_description.is_encrypted == copy_encrypted))
+        {
+            /// std::filesystem::copy() can copy from a single file only.
+            if (auto blob_path = src_disk->getBlobPath(src_path); blob_path.size() == 1)
+            {
+                auto abs_source_path = blob_path[0];
+
+                /// std::filesystem::copy() can copy a file as a whole only.
+                if ((start_pos == 0) && (length == fs::file_size(abs_source_path)))
+                {
+                    /// Use more optimal way.
+                    LOG_TRACE(log, "Copying file {} from disk {} locally", src_path, src_disk->getName());
+                    auto abs_dest_path = root_path / path_in_backup;
+                    fs::create_directories(abs_dest_path.parent_path());
+                    fs::copy(abs_source_path, abs_dest_path, fs::copy_options::overwrite_existing);
+                    return; /// copied!
+                }
+            }
+        }
     }
 
-    auto file_path = path / dest_file_name;
-    fs::create_directories(file_path.parent_path());
-    fs::copy(abs_source_path, file_path, fs::copy_options::overwrite_existing);
+    /// Fallback to copy through buffers.
+    BackupWriterDefault::copyFileFromDisk(path_in_backup, src_disk, src_path, copy_encrypted, start_pos, length);
 }
 
 }
diff --git a/src/Backups/BackupIO_File.h b/src/Backups/BackupIO_File.h
index 1727323ba4e..fd2c0b07158 100644
--- a/src/Backups/BackupIO_File.h
+++ b/src/Backups/BackupIO_File.h
@@ -1,44 +1,51 @@
 #pragma once
 
+#include <Backups/BackupIO_Default.h>
+#include <Disks/DiskType.h>
 #include <filesystem>
-#include <Backups/BackupIO.h>
+
 
 namespace DB
 {
 
-class BackupReaderFile : public IBackupReader
+class BackupReaderFile : public BackupReaderDefault
 {
 public:
-    explicit BackupReaderFile(const String & path_);
-    ~BackupReaderFile() override;
+    explicit BackupReaderFile(const String & root_path_, const ContextPtr & context_);
 
     bool fileExists(const String & file_name) override;
     UInt64 getFileSize(const String & file_name) override;
+
     std::unique_ptr<SeekableReadBuffer> readFile(const String & file_name) override;
-    DataSourceDescription getDataSourceDescription() const override;
+
+    void copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup,
+                        DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) override;
 
 private:
-    std::filesystem::path path;
+    const std::filesystem::path root_path;
+    const DataSourceDescription data_source_description;
 };
 
-class BackupWriterFile : public IBackupWriter
+class BackupWriterFile : public BackupWriterDefault
 {
 public:
-    explicit BackupWriterFile(const String & path_);
-    ~BackupWriterFile() override;
+    BackupWriterFile(const String & root_path_, const ContextPtr & context_);
 
     bool fileExists(const String & file_name) override;
     UInt64 getFileSize(const String & file_name) override;
-    bool fileContentsEqual(const String & file_name, const String & expected_file_contents) override;
     std::unique_ptr<WriteBuffer> writeFile(const String & file_name) override;
+
+    void copyFileFromDisk(const String & path_in_backup, DiskPtr src_disk, const String & src_path,
+                          bool copy_encrypted, UInt64 start_pos, UInt64 length) override;
+
     void removeFile(const String & file_name) override;
     void removeFiles(const Strings & file_names) override;
-    DataSourceDescription getDataSourceDescription() const override;
-    bool supportNativeCopy(DataSourceDescription data_source_description) const override;
-    void copyFileNative(DiskPtr src_disk, const String & src_file_name, UInt64 src_offset, UInt64 src_size, const String & dest_file_name) override;
 
 private:
-    std::filesystem::path path;
+    std::unique_ptr<ReadBuffer> readFile(const String & file_name, size_t expected_file_size) override;
+
+    const std::filesystem::path root_path;
+    const DataSourceDescription data_source_description;
 };
 
 }
diff --git a/src/Backups/BackupIO_S3.cpp b/src/Backups/BackupIO_S3.cpp
index a303a0bc2d5..f1fd276e34b 100644
--- a/src/Backups/BackupIO_S3.cpp
+++ b/src/Backups/BackupIO_S3.cpp
@@ -4,12 +4,14 @@
 #include <Common/quoteString.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
 #include <Interpreters/Context.h>
-#include <IO/IOThreadPool.h>
+#include <IO/SharedThreadPools.h>
 #include <IO/ReadBufferFromS3.h>
 #include <IO/WriteBufferFromS3.h>
 #include <IO/HTTPHeaderEntries.h>
 #include <IO/S3/copyS3File.h>
 #include <IO/S3/Client.h>
+#include <IO/S3/Credentials.h>
+#include <Disks/IDisk.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
 
@@ -63,11 +65,19 @@ namespace
             credentials.GetAWSAccessKeyId(),
             credentials.GetAWSSecretKey(),
             settings.auth_settings.server_side_encryption_customer_key_base64,
+            settings.auth_settings.server_side_encryption_kms_config,
             std::move(headers),
-            settings.auth_settings.use_environment_credentials.value_or(
-                context->getConfigRef().getBool("s3.use_environment_credentials", false)),
-            settings.auth_settings.use_insecure_imds_request.value_or(
-                context->getConfigRef().getBool("s3.use_insecure_imds_request", false)));
+            S3::CredentialsConfiguration
+            {
+                settings.auth_settings.use_environment_credentials.value_or(
+                    context->getConfigRef().getBool("s3.use_environment_credentials", true)),
+                settings.auth_settings.use_insecure_imds_request.value_or(
+                    context->getConfigRef().getBool("s3.use_insecure_imds_request", false)),
+                settings.auth_settings.expiration_window_seconds.value_or(
+                    context->getConfigRef().getUInt64("s3.expiration_window_seconds", S3::DEFAULT_EXPIRATION_WINDOW_SECONDS)),
+                settings.auth_settings.no_sign_request.value_or(
+                    context->getConfigRef().getBool("s3.no_sign_request", false)),
+            });
     }
 
     Aws::Vector<Aws::S3::Model::Object> listObjects(S3::Client & client, const S3::URI & s3_uri, const String & file_name)
@@ -92,20 +102,15 @@ namespace
 
 BackupReaderS3::BackupReaderS3(
     const S3::URI & s3_uri_, const String & access_key_id_, const String & secret_access_key_, const ContextPtr & context_)
-    : s3_uri(s3_uri_)
+    : BackupReaderDefault(&Poco::Logger::get("BackupReaderS3"), context_)
+    , s3_uri(s3_uri_)
     , client(makeS3Client(s3_uri_, access_key_id_, secret_access_key_, context_))
-    , read_settings(context_->getReadSettings())
     , request_settings(context_->getStorageS3Settings().getSettings(s3_uri.uri.toString()).request_settings)
+    , data_source_description{DataSourceType::S3, s3_uri.endpoint, false, false}
 {
     request_settings.max_single_read_retries = context_->getSettingsRef().s3_max_single_read_retries; // FIXME: Avoid taking value for endpoint
 }
 
-DataSourceDescription BackupReaderS3::getDataSourceDescription() const
-{
-    return DataSourceDescription{DataSourceType::S3, s3_uri.endpoint, false, false};
-}
-
-
 BackupReaderS3::~BackupReaderS3() = default;
 
 bool BackupReaderS3::fileExists(const String & file_name)
@@ -127,55 +132,99 @@ std::unique_ptr<SeekableReadBuffer> BackupReaderS3::readFile(const String & file
         client, s3_uri.bucket, fs::path(s3_uri.key) / file_name, s3_uri.version_id, request_settings, read_settings);
 }
 
+void BackupReaderS3::copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup,
+                                    DiskPtr destination_disk, const String & destination_path, WriteMode write_mode)
+{
+    /// Use the native copy as a more optimal way to copy a file from S3 to S3 if it's possible.
+    /// We don't check for `has_throttling` here because the native copy almost doesn't use network.
+    auto destination_data_source_description = destination_disk->getDataSourceDescription();
+    if (destination_data_source_description.sameKind(data_source_description)
+        && (destination_data_source_description.is_encrypted == encrypted_in_backup))
+    {
+        /// Use native copy, the more optimal way.
+        LOG_TRACE(log, "Copying {} from S3 to disk {} using native copy", path_in_backup, destination_disk->getName());
+        auto write_blob_function = [&](const Strings & blob_path, WriteMode mode, const std::optional<ObjectAttributes> & object_attributes) -> size_t
+        {
+            /// Object storage always uses mode `Rewrite` because it simulates append using metadata and different files.
+            if (blob_path.size() != 2 || mode != WriteMode::Rewrite)
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Blob writing function called with unexpected blob_path.size={} or mode={}",
+                                blob_path.size(), mode);
+
+            copyS3File(
+                client,
+                s3_uri.bucket,
+                fs::path(s3_uri.key) / path_in_backup,
+                0,
+                file_size,
+                /* dest_bucket= */ blob_path[1],
+                /* dest_key= */ blob_path[0],
+                request_settings,
+                object_attributes,
+                threadPoolCallbackRunner<void>(BackupsIOThreadPool::get(), "BackupReaderS3"),
+                /* for_disk_s3= */ true);
+
+            return file_size;
+        };
+
+        destination_disk->writeFileUsingBlobWritingFunction(destination_path, write_mode, write_blob_function);
+        return; /// copied!
+    }
+
+    /// Fallback to copy through buffers.
+    BackupReaderDefault::copyFileToDisk(path_in_backup, file_size, encrypted_in_backup, destination_disk, destination_path, write_mode);
+}
+
 
 BackupWriterS3::BackupWriterS3(
     const S3::URI & s3_uri_, const String & access_key_id_, const String & secret_access_key_, const ContextPtr & context_)
-    : s3_uri(s3_uri_)
+    : BackupWriterDefault(&Poco::Logger::get("BackupWriterS3"), context_)
+    , s3_uri(s3_uri_)
     , client(makeS3Client(s3_uri_, access_key_id_, secret_access_key_, context_))
-    , read_settings(context_->getReadSettings())
     , request_settings(context_->getStorageS3Settings().getSettings(s3_uri.uri.toString()).request_settings)
-    , log(&Poco::Logger::get("BackupWriterS3"))
+    , data_source_description{DataSourceType::S3, s3_uri.endpoint, false, false}
 {
     request_settings.updateFromSettings(context_->getSettingsRef());
     request_settings.max_single_read_retries = context_->getSettingsRef().s3_max_single_read_retries; // FIXME: Avoid taking value for endpoint
 }
 
-DataSourceDescription BackupWriterS3::getDataSourceDescription() const
+void BackupWriterS3::copyFileFromDisk(const String & path_in_backup, DiskPtr src_disk, const String & src_path,
+                                      bool copy_encrypted, UInt64 start_pos, UInt64 length)
 {
-    return DataSourceDescription{DataSourceType::S3, s3_uri.endpoint, false, false};
-}
-
-bool BackupWriterS3::supportNativeCopy(DataSourceDescription data_source_description) const
-{
-    return getDataSourceDescription() == data_source_description;
-}
-
-void BackupWriterS3::copyFileNative(DiskPtr src_disk, const String & src_file_name, UInt64 src_offset, UInt64 src_size, const String & dest_file_name)
-{
-    if (!src_disk)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot natively copy data to disk without source disk");
-
-    auto objects = src_disk->getStorageObjects(src_file_name);
-    if (objects.size() > 1)
+    /// Use the native copy as a more optimal way to copy a file from S3 to S3 if it's possible.
+    /// We don't check for `has_throttling` here because the native copy almost doesn't use network.
+    auto source_data_source_description = src_disk->getDataSourceDescription();
+    if (source_data_source_description.sameKind(data_source_description) && (source_data_source_description.is_encrypted == copy_encrypted))
     {
-        auto create_read_buffer = [src_disk, src_file_name] { return src_disk->readFile(src_file_name); };
-        copyDataToFile(create_read_buffer, src_offset, src_size, dest_file_name);
-    }
-    else
-    {
-        auto object_storage = src_disk->getObjectStorage();
-        std::string src_bucket = object_storage->getObjectsNamespace();
-        auto file_path = fs::path(s3_uri.key) / dest_file_name;
-        copyS3File(client, src_bucket, objects[0].absolute_path, src_offset, src_size, s3_uri.bucket, file_path, request_settings, {},
-                   threadPoolCallbackRunner<void>(IOThreadPool::get(), "BackupWriterS3"));
+        /// getBlobPath() can return more than 3 elements if the file is stored as multiple objects in S3 bucket.
+        /// In this case we can't use the native copy.
+        if (auto blob_path = src_disk->getBlobPath(src_path); blob_path.size() == 2)
+        {
+            /// Use native copy, the more optimal way.
+            LOG_TRACE(log, "Copying file {} from disk {} to S3 using native copy", src_path, src_disk->getName());
+            copyS3File(
+                client,
+                /* src_bucket */ blob_path[1],
+                /* src_key= */ blob_path[0],
+                start_pos,
+                length,
+                s3_uri.bucket,
+                fs::path(s3_uri.key) / path_in_backup,
+                request_settings,
+                {},
+                threadPoolCallbackRunner<void>(BackupsIOThreadPool::get(), "BackupWriterS3"));
+            return; /// copied!
+        }
     }
+
+    /// Fallback to copy through buffers.
+    BackupWriterDefault::copyFileFromDisk(path_in_backup, src_disk, src_path, copy_encrypted, start_pos, length);
 }
 
-void BackupWriterS3::copyDataToFile(
-    const CreateReadBufferFunction & create_read_buffer, UInt64 offset, UInt64 size, const String & dest_file_name)
+void BackupWriterS3::copyDataToFile(const String & path_in_backup, const CreateReadBufferFunction & create_read_buffer, UInt64 start_pos, UInt64 length)
 {
-    copyDataToS3File(create_read_buffer, offset, size, client, s3_uri.bucket, fs::path(s3_uri.key) / dest_file_name, request_settings, {},
-                     threadPoolCallbackRunner<void>(IOThreadPool::get(), "BackupWriterS3"));
+    copyDataToS3File(create_read_buffer, start_pos, length, client, s3_uri.bucket, fs::path(s3_uri.key) / path_in_backup, request_settings, {},
+                     threadPoolCallbackRunner<void>(BackupsIOThreadPool::get(), "BackupWriterS3"));
 }
 
 BackupWriterS3::~BackupWriterS3() = default;
@@ -193,24 +242,11 @@ UInt64 BackupWriterS3::getFileSize(const String & file_name)
     return objects[0].GetSize();
 }
 
-bool BackupWriterS3::fileContentsEqual(const String & file_name, const String & expected_file_contents)
+std::unique_ptr<ReadBuffer> BackupWriterS3::readFile(const String & file_name, size_t expected_file_size)
 {
-    if (listObjects(*client, s3_uri, file_name).empty())
-        return false;
-
-    try
-    {
-        auto in = std::make_unique<ReadBufferFromS3>(
-            client, s3_uri.bucket, fs::path(s3_uri.key) / file_name, s3_uri.version_id, request_settings, read_settings);
-        String actual_file_contents(expected_file_contents.size(), ' ');
-        return (in->read(actual_file_contents.data(), actual_file_contents.size()) == actual_file_contents.size())
-            && (actual_file_contents == expected_file_contents) && in->eof();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-        return false;
-    }
+    return std::make_unique<ReadBufferFromS3>(
+            client, s3_uri.bucket, fs::path(s3_uri.key) / file_name, s3_uri.version_id, request_settings, read_settings,
+            false, 0, 0, false, expected_file_size);
 }
 
 std::unique_ptr<WriteBuffer> BackupWriterS3::writeFile(const String & file_name)
@@ -219,10 +255,11 @@ std::unique_ptr<WriteBuffer> BackupWriterS3::writeFile(const String & file_name)
         client,
         s3_uri.bucket,
         fs::path(s3_uri.key) / file_name,
+        DBMS_DEFAULT_BUFFER_SIZE,
         request_settings,
         std::nullopt,
-        DBMS_DEFAULT_BUFFER_SIZE,
-        threadPoolCallbackRunner<void>(IOThreadPool::get(), "BackupWriterS3"));
+        threadPoolCallbackRunner<void>(BackupsIOThreadPool::get(), "BackupWriterS3"),
+        write_settings);
 }
 
 void BackupWriterS3::removeFile(const String & file_name)
diff --git a/src/Backups/BackupIO_S3.h b/src/Backups/BackupIO_S3.h
index 9c3132c5689..cca56bae6bc 100644
--- a/src/Backups/BackupIO_S3.h
+++ b/src/Backups/BackupIO_S3.h
@@ -3,17 +3,18 @@
 #include "config.h"
 
 #if USE_AWS_S3
-#include <Backups/BackupIO.h>
-#include <IO/ReadSettings.h>
+#include <Backups/BackupIO_Default.h>
+#include <Disks/DiskType.h>
 #include <IO/S3Common.h>
 #include <Storages/StorageS3Settings.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
 {
 
 /// Represents a backup stored to AWS S3.
-class BackupReaderS3 : public IBackupReader
+class BackupReaderS3 : public BackupReaderDefault
 {
 public:
     BackupReaderS3(const S3::URI & s3_uri_, const String & access_key_id_, const String & secret_access_key_, const ContextPtr & context_);
@@ -22,17 +23,19 @@ public:
     bool fileExists(const String & file_name) override;
     UInt64 getFileSize(const String & file_name) override;
     std::unique_ptr<SeekableReadBuffer> readFile(const String & file_name) override;
-    DataSourceDescription getDataSourceDescription() const override;
+
+    void copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup,
+                        DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) override;
 
 private:
-    S3::URI s3_uri;
-    std::shared_ptr<S3::Client> client;
-    ReadSettings read_settings;
+    const S3::URI s3_uri;
+    const std::shared_ptr<S3::Client> client;
     S3Settings::RequestSettings request_settings;
+    const DataSourceDescription data_source_description;
 };
 
 
-class BackupWriterS3 : public IBackupWriter
+class BackupWriterS3 : public BackupWriterDefault
 {
 public:
     BackupWriterS3(const S3::URI & s3_uri_, const String & access_key_id_, const String & secret_access_key_, const ContextPtr & context_);
@@ -40,43 +43,24 @@ public:
 
     bool fileExists(const String & file_name) override;
     UInt64 getFileSize(const String & file_name) override;
-    bool fileContentsEqual(const String & file_name, const String & expected_file_contents) override;
     std::unique_ptr<WriteBuffer> writeFile(const String & file_name) override;
 
-    void copyDataToFile(const CreateReadBufferFunction & create_read_buffer, UInt64 offset, UInt64 size, const String & dest_file_name) override;
+    void copyDataToFile(const String & path_in_backup, const CreateReadBufferFunction & create_read_buffer, UInt64 start_pos, UInt64 length) override;
+    void copyFileFromDisk(const String & path_in_backup, DiskPtr src_disk, const String & src_path,
+                          bool copy_encrypted, UInt64 start_pos, UInt64 length) override;
 
     void removeFile(const String & file_name) override;
     void removeFiles(const Strings & file_names) override;
 
-    DataSourceDescription getDataSourceDescription() const override;
-    bool supportNativeCopy(DataSourceDescription data_source_description) const override;
-    void copyFileNative(DiskPtr src_disk, const String & src_file_name, UInt64 src_offset, UInt64 src_size, const String & dest_file_name) override;
-
 private:
-    void copyObjectImpl(
-        const String & src_bucket,
-        const String & src_key,
-        const String & dst_bucket,
-        const String & dst_key,
-        size_t size,
-        const std::optional<ObjectAttributes> & metadata = std::nullopt) const;
-
-    void copyObjectMultipartImpl(
-        const String & src_bucket,
-        const String & src_key,
-        const String & dst_bucket,
-        const String & dst_key,
-        size_t size,
-        const std::optional<ObjectAttributes> & metadata = std::nullopt) const;
-
+    std::unique_ptr<ReadBuffer> readFile(const String & file_name, size_t expected_file_size) override;
     void removeFilesBatch(const Strings & file_names);
 
-    S3::URI s3_uri;
-    std::shared_ptr<S3::Client> client;
-    ReadSettings read_settings;
+    const S3::URI s3_uri;
+    const std::shared_ptr<S3::Client> client;
     S3Settings::RequestSettings request_settings;
-    Poco::Logger * log;
     std::optional<bool> supports_batch_delete;
+    const DataSourceDescription data_source_description;
 };
 
 }
diff --git a/src/Backups/BackupImpl.cpp b/src/Backups/BackupImpl.cpp
index e4c85bec496..306236534b6 100644
--- a/src/Backups/BackupImpl.cpp
+++ b/src/Backups/BackupImpl.cpp
@@ -1,12 +1,11 @@
 #include <Backups/BackupImpl.h>
 #include <Backups/BackupFactory.h>
-#include <Backups/BackupEntryFromMemory.h>
+#include <Backups/BackupFileInfo.h>
 #include <Backups/BackupIO.h>
 #include <Backups/IBackupEntry.h>
-#include <Backups/BackupCoordinationLocal.h>
-#include <Backups/BackupCoordinationRemote.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <Common/hex.h>
+#include <base/hex.h>
+#include <Common/logger_useful.h>
 #include <Common/quoteString.h>
 #include <Common/XMLUtils.h>
 #include <Interpreters/Context.h>
@@ -15,12 +14,11 @@
 #include <IO/Archives/createArchiveReader.h>
 #include <IO/Archives/createArchiveWriter.h>
 #include <IO/ConcatSeekableReadBuffer.h>
-#include <IO/HashingReadBuffer.h>
-#include <IO/ReadBufferFromFileBase.h>
 #include <IO/ReadHelpers.h>
-#include <IO/SeekableReadBuffer.h>
+#include <IO/ReadBufferFromFileBase.h>
 #include <IO/WriteBufferFromFileBase.h>
 #include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
 #include <IO/copyData.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <Poco/DOM/DOMParser.h>
@@ -36,9 +34,9 @@ namespace ErrorCodes
     extern const int BACKUP_DAMAGED;
     extern const int NO_BASE_BACKUP;
     extern const int WRONG_BASE_BACKUP;
-    extern const int BACKUP_ENTRY_ALREADY_EXISTS;
     extern const int BACKUP_ENTRY_NOT_FOUND;
     extern const int BACKUP_IS_EMPTY;
+    extern const int CANNOT_RESTORE_TO_NONENCRYPTED_DISK;
     extern const int FAILED_TO_SYNC_BACKUP_OR_RESTORE;
     extern const int LOGICAL_ERROR;
 }
@@ -49,7 +47,6 @@ namespace
     const int CURRENT_BACKUP_VERSION = 1;
 
     using SizeAndChecksum = IBackup::SizeAndChecksum;
-    using FileInfo = IBackupCoordination::FileInfo;
 
     String hexChecksum(UInt128 checksum)
     {
@@ -79,66 +76,6 @@ namespace
 }
 
 
-class BackupImpl::BackupEntryFromBackupImpl : public IBackupEntry
-{
-public:
-    BackupEntryFromBackupImpl(
-        const std::shared_ptr<const BackupImpl> & backup_,
-        const String & archive_suffix_,
-        const String & data_file_name_,
-        UInt64 size_,
-        const UInt128 checksum_,
-        BackupEntryPtr base_backup_entry_ = {})
-        : backup(backup_), archive_suffix(archive_suffix_), data_file_name(data_file_name_), size(size_), checksum(checksum_),
-          base_backup_entry(std::move(base_backup_entry_))
-    {
-    }
-
-    std::unique_ptr<SeekableReadBuffer> getReadBuffer() const override
-    {
-        std::unique_ptr<SeekableReadBuffer> read_buffer;
-        if (backup->use_archives)
-            read_buffer = backup->getArchiveReader(archive_suffix)->readFile(data_file_name);
-        else
-            read_buffer = backup->reader->readFile(data_file_name);
-        if (base_backup_entry)
-        {
-            size_t base_size = base_backup_entry->getSize();
-            read_buffer = std::make_unique<ConcatSeekableReadBuffer>(
-                base_backup_entry->getReadBuffer(), base_size, std::move(read_buffer), size - base_size);
-        }
-        return read_buffer;
-    }
-
-    UInt64 getSize() const override { return size; }
-    std::optional<UInt128> getChecksum() const override { return checksum; }
-
-    String getFilePath() const override
-    {
-        return data_file_name;
-    }
-
-    DiskPtr tryGetDiskIfExists() const override
-    {
-        return nullptr;
-    }
-
-    DataSourceDescription getDataSourceDescription() const override
-    {
-        return backup->reader->getDataSourceDescription();
-    }
-
-
-private:
-    const std::shared_ptr<const BackupImpl> backup;
-    const String archive_suffix;
-    const String data_file_name;
-    const UInt64 size;
-    const UInt128 checksum;
-    BackupEntryPtr base_backup_entry;
-};
-
-
 BackupImpl::BackupImpl(
     const String & backup_name_for_logging_,
     const ArchiveParams & archive_params_,
@@ -146,12 +83,11 @@ BackupImpl::BackupImpl(
     std::shared_ptr<IBackupReader> reader_,
     const ContextPtr & context_)
     : backup_name_for_logging(backup_name_for_logging_)
+    , use_archive(!archive_params_.archive_name.empty())
     , archive_params(archive_params_)
-    , use_archives(!archive_params.archive_name.empty())
     , open_mode(OpenMode::READ)
     , reader(std::move(reader_))
     , is_internal_backup(false)
-    , coordination(std::make_shared<BackupCoordinationLocal>())
     , version(INITIAL_BACKUP_VERSION)
     , base_backup_info(base_backup_info_)
 {
@@ -170,8 +106,8 @@ BackupImpl::BackupImpl(
     const std::optional<UUID> & backup_uuid_,
     bool deduplicate_files_)
     : backup_name_for_logging(backup_name_for_logging_)
+    , use_archive(!archive_params_.archive_name.empty())
     , archive_params(archive_params_)
-    , use_archives(!archive_params.archive_name.empty())
     , open_mode(OpenMode::WRITE)
     , writer(std::move(writer_))
     , is_internal_backup(is_internal_backup_)
@@ -207,7 +143,7 @@ void BackupImpl::open(const ContextPtr & context)
         timestamp = std::time(nullptr);
         if (!uuid)
             uuid = UUIDHelpers::generateV4();
-        lock_file_name = use_archives ? (archive_params.archive_name + ".lock") : ".lock";
+        lock_file_name = use_archive ? (archive_params.archive_name + ".lock") : ".lock";
         writing_finalized = false;
 
         /// Check that we can write a backup there and create the lock file to own this destination.
@@ -217,6 +153,9 @@ void BackupImpl::open(const ContextPtr & context)
         checkLockFile(true);
     }
 
+    if (use_archive)
+        openArchive();
+
     if (open_mode == OpenMode::READ)
         readBackupMetadata();
 
@@ -248,7 +187,7 @@ void BackupImpl::open(const ContextPtr & context)
 void BackupImpl::close()
 {
     std::lock_guard lock{mutex};
-    closeArchives();
+    closeArchive();
 
     if (!is_internal_backup && writer && !writing_finalized)
         removeAllFilesAfterFailure();
@@ -258,11 +197,33 @@ void BackupImpl::close()
     coordination.reset();
 }
 
-void BackupImpl::closeArchives()
+void BackupImpl::openArchive()
 {
-    archive_readers.clear();
-    for (auto & archive_writer : archive_writers)
-        archive_writer = {"", nullptr};
+    if (!use_archive)
+        return;
+
+    const String & archive_name = archive_params.archive_name;
+
+    if (open_mode == OpenMode::READ)
+    {
+        if (!reader->fileExists(archive_name))
+            throw Exception(ErrorCodes::BACKUP_NOT_FOUND, "Backup {} not found", backup_name_for_logging);
+        size_t archive_size = reader->getFileSize(archive_name);
+        archive_reader = createArchiveReader(archive_name, [my_reader = reader, archive_name]{ return my_reader->readFile(archive_name); }, archive_size);
+        archive_reader->setPassword(archive_params.password);
+    }
+    else
+    {
+        archive_writer = createArchiveWriter(archive_name, writer->writeFile(archive_name));
+        archive_writer->setPassword(archive_params.password);
+        archive_writer->setCompression(archive_params.compression_method, archive_params.compression_level);
+    }
+}
+
+void BackupImpl::closeArchive()
+{
+    archive_reader.reset();
+    archive_writer.reset();
 }
 
 size_t BackupImpl::getNumFiles() const
@@ -317,13 +278,24 @@ void BackupImpl::writeBackupMetadata()
 {
     assert(!is_internal_backup);
 
-    Poco::AutoPtr<Poco::Util::XMLConfiguration> config{new Poco::Util::XMLConfiguration()};
-    config->setInt("version", CURRENT_BACKUP_VERSION);
-    config->setBool("deduplicate_files", deduplicate_files);
-    config->setString("timestamp", toString(LocalDateTime{timestamp}));
-    config->setString("uuid", toString(*uuid));
+    checkLockFile(true);
 
-    auto all_file_infos = coordination->getAllFileInfos();
+    std::unique_ptr<WriteBuffer> out;
+    if (use_archive)
+        out = archive_writer->writeFile(".backup");
+    else
+        out = writer->writeFile(".backup");
+
+    *out << "<config>";
+    *out << "<version>" << CURRENT_BACKUP_VERSION << "</version>";
+    *out << "<deduplicate_files>" << deduplicate_files << "</deduplicate_files>";
+    *out << "<timestamp>" << toString(LocalDateTime{timestamp}) << "</timestamp>";
+    *out << "<uuid>" << toString(*uuid) << "</uuid>";
+
+    auto all_file_infos = coordination->getFileInfosForAllHosts();
+
+    if (all_file_infos.empty())
+        throw Exception(ErrorCodes::BACKUP_IS_EMPTY, "Backup must not be empty");
 
     if (base_backup_info)
     {
@@ -336,8 +308,8 @@ void BackupImpl::writeBackupMetadata()
 
         if (base_backup_in_use)
         {
-            config->setString("base_backup", base_backup_info->toString());
-            config->setString("base_backup_uuid", toString(*base_backup_uuid));
+            *out << "<base_backup>" << xml << base_backup_info->toString() << "</base_backup>";
+            *out << "<base_backup_uuid>" << toString(*base_backup_uuid) << "</base_backup_uuid>";
         }
     }
 
@@ -346,31 +318,30 @@ void BackupImpl::writeBackupMetadata()
     num_entries = 0;
     size_of_entries = 0;
 
-    for (size_t i = 0; i != all_file_infos.size(); ++i)
+    *out << "<contents>";
+    for (const auto & info : all_file_infos)
     {
-        const auto & info = all_file_infos[i];
-        String prefix = i ? "contents.file[" + std::to_string(i) + "]." : "contents.file.";
-        config->setString(prefix + "name", info.file_name);
-        config->setUInt64(prefix + "size", info.size);
+        *out << "<file>";
+
+        *out << "<name>" << xml << info.file_name << "</name>";
+        *out << "<size>" << info.size << "</size>";
 
         if (info.size)
         {
-            config->setString(prefix + "checksum", hexChecksum(info.checksum));
+            *out << "<checksum>" << hexChecksum(info.checksum) << "</checksum>";
             if (info.base_size)
             {
-                config->setBool(prefix + "use_base", true);
+                *out << "<use_base>true</use_base>";
                 if (info.base_size != info.size)
                 {
-                    config->setUInt64(prefix + "base_size", info.base_size);
-                    config->setString(prefix + "base_checksum", hexChecksum(info.base_checksum));
+                    *out << "<base_size>" << info.base_size << "</base_size>";
+                    *out << "<base_checksum>" << hexChecksum(info.base_checksum) << "</base_checksum>";
                 }
             }
             if (!info.data_file_name.empty() && (info.data_file_name != info.file_name))
-                config->setString(prefix + "data_file", info.data_file_name);
-            if (!info.archive_suffix.empty())
-                config->setString(prefix + "archive_suffix", info.archive_suffix);
-            if (info.pos_in_archive != static_cast<size_t>(-1))
-                config->setUInt64(prefix + "pos_in_archive", info.pos_in_archive);
+                *out << "<data_file>" << xml << info.data_file_name << "</data_file>";
+            if (info.encrypted_by_disk)
+                *out << "<encrypted_by_disk>true</encrypted_by_disk>";
         }
 
         total_size += info.size;
@@ -380,23 +351,16 @@ void BackupImpl::writeBackupMetadata()
             ++num_entries;
             size_of_entries += info.size - info.base_size;
         }
+
+        *out << "</file>";
     }
+    *out << "</contents>";
 
-    std::ostringstream stream; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    config->save(stream);
-    String str = stream.str();
+    *out << "</config>";
 
-    checkLockFile(true);
-
-    std::unique_ptr<WriteBuffer> out;
-    if (use_archives)
-        out = getArchiveWriter("")->writeFile(".backup");
-    else
-        out = writer->writeFile(".backup");
-    out->write(str.data(), str.size());
     out->finalize();
 
-    uncompressed_size = size_of_entries + str.size();
+    uncompressed_size = size_of_entries + out->count();
 }
 
 
@@ -405,12 +369,12 @@ void BackupImpl::readBackupMetadata()
     using namespace XMLUtils;
 
     std::unique_ptr<ReadBuffer> in;
-    if (use_archives)
+    if (use_archive)
     {
-        if (!reader->fileExists(archive_params.archive_name))
-            throw Exception(ErrorCodes::BACKUP_NOT_FOUND, "Backup {} not found", backup_name_for_logging);
+        if (!archive_reader->fileExists(".backup"))
+            throw Exception(ErrorCodes::BACKUP_NOT_FOUND, "Archive {} is not a backup", backup_name_for_logging);
         setCompressedSize();
-        in = getArchiveReader("")->readFile(".backup");
+        in = archive_reader->readFile(".backup");
     }
     else
     {
@@ -450,7 +414,7 @@ void BackupImpl::readBackupMetadata()
         if (child->nodeName() == "file")
         {
             const Poco::XML::Node * file_config = child;
-            FileInfo info;
+            BackupFileInfo info;
             info.file_name = getString(file_config, "name");
             info.size = getUInt64(file_config, "size");
             if (info.size)
@@ -482,12 +446,13 @@ void BackupImpl::readBackupMetadata()
                 if (info.size > info.base_size)
                 {
                     info.data_file_name = getString(file_config, "data_file", info.file_name);
-                    info.archive_suffix = getString(file_config, "archive_suffix", "");
-                    info.pos_in_archive = getUInt64(file_config, "pos_in_archive", static_cast<UInt64>(-1));
                 }
+                info.encrypted_by_disk = getBool(file_config, "encrypted_by_disk", false);
             }
 
-            coordination->addFileInfo(info);
+            file_names.emplace(info.file_name, std::pair{info.size, info.checksum});
+            if (info.size)
+                file_infos.try_emplace(std::pair{info.size, info.checksum}, info);
 
             ++num_files;
             total_size += info.size;
@@ -502,14 +467,14 @@ void BackupImpl::readBackupMetadata()
 
     uncompressed_size = size_of_entries + str.size();
     compressed_size = uncompressed_size;
-    if (!use_archives)
+    if (!use_archive)
         setCompressedSize();
 }
 
 void BackupImpl::checkBackupDoesntExist() const
 {
     String file_name_to_check_existence;
-    if (use_archives)
+    if (use_archive)
         file_name_to_check_existence = archive_params.archive_name;
     else
         file_name_to_check_existence = ".backup";
@@ -570,69 +535,91 @@ void BackupImpl::removeLockFile()
 
 Strings BackupImpl::listFiles(const String & directory, bool recursive) const
 {
+    if (open_mode != OpenMode::READ)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is not opened for reading");
+
+    String prefix = removeLeadingSlash(directory);
+    if (!prefix.empty() && !prefix.ends_with('/'))
+        prefix += '/';
+    String terminator = recursive ? "" : "/";
+    Strings elements;
+
     std::lock_guard lock{mutex};
-    auto adjusted_dir = removeLeadingSlash(directory);
-    return coordination->listFiles(adjusted_dir, recursive);
+    for (auto it = file_names.lower_bound(prefix); it != file_names.end(); ++it)
+    {
+        const String & name = it->first;
+        if (!name.starts_with(prefix))
+            break;
+        size_t start_pos = prefix.length();
+        size_t end_pos = String::npos;
+        if (!terminator.empty())
+            end_pos = name.find(terminator, start_pos);
+        std::string_view new_element = std::string_view{name}.substr(start_pos, end_pos - start_pos);
+        if (!elements.empty() && (elements.back() == new_element))
+            continue;
+        elements.push_back(String{new_element});
+    }
+
+    return elements;
 }
 
 bool BackupImpl::hasFiles(const String & directory) const
 {
+    if (open_mode != OpenMode::READ)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is not opened for reading");
+
+    String prefix = removeLeadingSlash(directory);
+    if (!prefix.empty() && !prefix.ends_with('/'))
+        prefix += '/';
+
     std::lock_guard lock{mutex};
-    auto adjusted_dir = removeLeadingSlash(directory);
-    return coordination->hasFiles(adjusted_dir);
+    auto it = file_names.lower_bound(prefix);
+    if (it == file_names.end())
+        return false;
+
+    const String & name = it->first;
+    return name.starts_with(prefix);
 }
 
 bool BackupImpl::fileExists(const String & file_name) const
 {
-    std::lock_guard lock{mutex};
+    if (open_mode != OpenMode::READ)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is not opened for reading");
+
     auto adjusted_path = removeLeadingSlash(file_name);
-    return coordination->getFileInfo(adjusted_path).has_value();
+    std::lock_guard lock{mutex};
+    return file_names.contains(adjusted_path);
 }
 
 bool BackupImpl::fileExists(const SizeAndChecksum & size_and_checksum) const
 {
+    if (open_mode != OpenMode::READ)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is not opened for reading");
+
     std::lock_guard lock{mutex};
-    return coordination->getFileInfo(size_and_checksum).has_value();
+    return file_infos.contains(size_and_checksum);
 }
 
 UInt64 BackupImpl::getFileSize(const String & file_name) const
 {
-    std::lock_guard lock{mutex};
-    auto adjusted_path = removeLeadingSlash(file_name);
-    auto info = coordination->getFileInfo(adjusted_path);
-    if (!info)
-    {
-        throw Exception(
-            ErrorCodes::BACKUP_ENTRY_NOT_FOUND,
-            "Backup {}: Entry {} not found in the backup",
-            backup_name_for_logging,
-            quoteString(file_name));
-    }
-    return info->size;
+    return getFileSizeAndChecksum(file_name).first;
 }
 
 UInt128 BackupImpl::getFileChecksum(const String & file_name) const
 {
-    std::lock_guard lock{mutex};
-    auto adjusted_path = removeLeadingSlash(file_name);
-    auto info = coordination->getFileInfo(adjusted_path);
-    if (!info)
-    {
-        throw Exception(
-            ErrorCodes::BACKUP_ENTRY_NOT_FOUND,
-            "Backup {}: Entry {} not found in the backup",
-            backup_name_for_logging,
-            quoteString(file_name));
-    }
-    return info->checksum;
+    return getFileSizeAndChecksum(file_name).second;
 }
 
 SizeAndChecksum BackupImpl::getFileSizeAndChecksum(const String & file_name) const
 {
-    std::lock_guard lock{mutex};
+    if (open_mode != OpenMode::READ)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is not opened for reading");
+
     auto adjusted_path = removeLeadingSlash(file_name);
-    auto info = coordination->getFileInfo(adjusted_path);
-    if (!info)
+
+    std::lock_guard lock{mutex};
+    auto it = file_names.find(adjusted_path);
+    if (it == file_names.end())
     {
         throw Exception(
             ErrorCodes::BACKUP_ENTRY_NOT_FOUND,
@@ -640,158 +627,205 @@ SizeAndChecksum BackupImpl::getFileSizeAndChecksum(const String & file_name) con
             backup_name_for_logging,
             quoteString(file_name));
     }
-    return {info->size, info->checksum};
+
+    return it->second;
 }
 
-BackupEntryPtr BackupImpl::readFile(const String & file_name) const
+std::unique_ptr<SeekableReadBuffer> BackupImpl::readFile(const String & file_name) const
 {
     return readFile(getFileSizeAndChecksum(file_name));
 }
 
-BackupEntryPtr BackupImpl::readFile(const SizeAndChecksum & size_and_checksum) const
+std::unique_ptr<SeekableReadBuffer> BackupImpl::readFile(const SizeAndChecksum & size_and_checksum) const
+{
+    return readFileImpl(size_and_checksum, /* read_encrypted= */ false);
+}
+
+std::unique_ptr<SeekableReadBuffer> BackupImpl::readFileImpl(const SizeAndChecksum & size_and_checksum, bool read_encrypted) const
 {
-    std::lock_guard lock{mutex};
     if (open_mode != OpenMode::READ)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is not opened for reading");
 
-    ++num_read_files;
-    num_read_bytes += size_and_checksum.first;
-
-    if (!size_and_checksum.first)
+    if (size_and_checksum.first == 0)
     {
         /// Entry's data is empty.
-        return std::make_unique<BackupEntryFromMemory>(nullptr, 0, UInt128{0, 0});
+        std::lock_guard lock{mutex};
+        ++num_read_files;
+        return std::make_unique<ReadBufferFromMemory>(static_cast<char *>(nullptr), 0);
     }
 
-    auto info_opt = coordination->getFileInfo(size_and_checksum);
-    if (!info_opt)
+    BackupFileInfo info;
+    {
+        std::lock_guard lock{mutex};
+        auto it = file_infos.find(size_and_checksum);
+        if (it == file_infos.end())
+        {
+            throw Exception(
+                ErrorCodes::BACKUP_ENTRY_NOT_FOUND,
+                "Backup {}: Entry {} not found in the backup",
+                backup_name_for_logging,
+                formatSizeAndChecksum(size_and_checksum));
+        }
+        info = it->second;
+    }
+
+    if (info.encrypted_by_disk != read_encrypted)
     {
         throw Exception(
-            ErrorCodes::BACKUP_ENTRY_NOT_FOUND,
-            "Backup {}: Entry {} not found in the backup",
-            backup_name_for_logging,
-            formatSizeAndChecksum(size_and_checksum));
+            ErrorCodes::CANNOT_RESTORE_TO_NONENCRYPTED_DISK,
+            "File {} is encrypted in the backup, it can be restored only to an encrypted disk",
+            info.data_file_name);
     }
 
-    const auto & info = *info_opt;
+    std::unique_ptr<SeekableReadBuffer> read_buffer;
+    std::unique_ptr<SeekableReadBuffer> base_read_buffer;
+
+    if (info.size > info.base_size)
+    {
+        /// Make `read_buffer` if there is data for this backup entry in this backup.
+        if (use_archive)
+            read_buffer = archive_reader->readFile(info.data_file_name);
+        else
+            read_buffer = reader->readFile(info.data_file_name);
+    }
+
+    if (info.base_size)
+    {
+        /// Make `base_read_buffer` if there is data for this backup entry in the base backup.
+        if (!base_backup)
+        {
+            throw Exception(
+                ErrorCodes::NO_BASE_BACKUP,
+                "Backup {}: Entry {} is marked to be read from a base backup, but there is no base backup specified",
+                backup_name_for_logging, formatSizeAndChecksum(size_and_checksum));
+        }
+
+        if (!base_backup->fileExists(std::pair(info.base_size, info.base_checksum)))
+        {
+            throw Exception(
+                ErrorCodes::WRONG_BASE_BACKUP,
+                "Backup {}: Entry {} is marked to be read from a base backup, but doesn't exist there",
+                backup_name_for_logging, formatSizeAndChecksum(size_and_checksum));
+        }
+
+        base_read_buffer = base_backup->readFile(std::pair{info.base_size, info.base_checksum});
+    }
+
+    {
+        /// Update number of read files.
+        std::lock_guard lock{mutex};
+        ++num_read_files;
+        num_read_bytes += info.size;
+    }
 
     if (!info.base_size)
     {
-        /// Data goes completely from this backup, the base backup isn't used.
-        return std::make_unique<BackupEntryFromBackupImpl>(
-            std::static_pointer_cast<const BackupImpl>(shared_from_this()), info.archive_suffix, info.data_file_name, info.size, info.checksum);
+        /// Data comes completely from this backup, the base backup isn't used.
+        return read_buffer;
     }
-
-    if (!base_backup)
+    else if (info.size == info.base_size)
     {
-        throw Exception(
-            ErrorCodes::NO_BASE_BACKUP,
-            "Backup {}: Entry {} is marked to be read from a base backup, but there is no base backup specified",
-            backup_name_for_logging, formatSizeAndChecksum(size_and_checksum));
-    }
-
-    if (!base_backup->fileExists(std::pair(info.base_size, info.base_checksum)))
-    {
-        throw Exception(
-            ErrorCodes::WRONG_BASE_BACKUP,
-            "Backup {}: Entry {} is marked to be read from a base backup, but doesn't exist there",
-            backup_name_for_logging, formatSizeAndChecksum(size_and_checksum));
-    }
-
-    auto base_entry = base_backup->readFile(std::pair{info.base_size, info.base_checksum});
-
-    if (info.size == info.base_size)
-    {
-        /// Data goes completely from the base backup (nothing goes from this backup).
-        return base_entry;
-    }
-
-    {
-        /// The beginning of the data goes from the base backup,
-        /// and the ending goes from this backup.
-        return std::make_unique<BackupEntryFromBackupImpl>(
-            static_pointer_cast<const BackupImpl>(shared_from_this()), info.archive_suffix, info.data_file_name, info.size, info.checksum, std::move(base_entry));
-    }
-}
-
-namespace
-{
-
-std::optional<SizeAndChecksum> getInfoAboutFileFromBaseBackupIfExists(std::shared_ptr<const IBackup> base_backup, const std::string & file_path)
-{
-    if (base_backup && base_backup->fileExists(file_path))
-        return std::pair{base_backup->getFileSize(file_path), base_backup->getFileChecksum(file_path)};
-
-    return std::nullopt;
-}
-
-enum class CheckBackupResult
-{
-    HasPrefix,
-    HasFull,
-    HasNothing,
-};
-
-CheckBackupResult checkBaseBackupForFile(const SizeAndChecksum & base_backup_info, const FileInfo & new_entry_info)
-{
-    /// We cannot reuse base backup because our file is smaller
-    /// than file stored in previous backup
-    if (new_entry_info.size < base_backup_info.first)
-        return CheckBackupResult::HasNothing;
-
-    if (base_backup_info.first == new_entry_info.size)
-        return CheckBackupResult::HasFull;
-
-    return CheckBackupResult::HasPrefix;
-
-}
-
-struct ChecksumsForNewEntry
-{
-    UInt128 full_checksum;
-    UInt128 prefix_checksum;
-};
-
-/// Calculate checksum for backup entry if it's empty.
-/// Also able to calculate additional checksum of some prefix.
-ChecksumsForNewEntry calculateNewEntryChecksumsIfNeeded(BackupEntryPtr entry, size_t prefix_size)
-{
-    if (prefix_size > 0)
-    {
-        auto read_buffer = entry->getReadBuffer();
-        HashingReadBuffer hashing_read_buffer(*read_buffer);
-        hashing_read_buffer.ignore(prefix_size);
-        auto prefix_checksum = hashing_read_buffer.getHash();
-        if (entry->getChecksum() == std::nullopt)
-        {
-            hashing_read_buffer.ignoreAll();
-            auto full_checksum = hashing_read_buffer.getHash();
-            return ChecksumsForNewEntry{full_checksum, prefix_checksum};
-        }
-        else
-        {
-            return ChecksumsForNewEntry{*(entry->getChecksum()), prefix_checksum};
-        }
+        /// Data comes completely from the base backup (nothing comes from this backup).
+        return base_read_buffer;
     }
     else
     {
-        if (entry->getChecksum() == std::nullopt)
-        {
-            auto read_buffer = entry->getReadBuffer();
-            HashingReadBuffer hashing_read_buffer(*read_buffer);
-            hashing_read_buffer.ignoreAll();
-            return ChecksumsForNewEntry{hashing_read_buffer.getHash(), 0};
-        }
-        else
-        {
-            return ChecksumsForNewEntry{*(entry->getChecksum()), 0};
-        }
+        /// The beginning of the data comes from the base backup,
+        /// and the ending comes from this backup.
+        return std::make_unique<ConcatSeekableReadBuffer>(
+            std::move(base_read_buffer), info.base_size, std::move(read_buffer), info.size - info.base_size);
     }
 }
 
+size_t BackupImpl::copyFileToDisk(const String & file_name,
+                                  DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) const
+{
+    return copyFileToDisk(getFileSizeAndChecksum(file_name), destination_disk, destination_path, write_mode);
 }
 
-void BackupImpl::writeFile(const String & file_name, BackupEntryPtr entry)
+size_t BackupImpl::copyFileToDisk(const SizeAndChecksum & size_and_checksum,
+                                  DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) const
+{
+    if (open_mode != OpenMode::READ)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is not opened for reading");
+
+    if (size_and_checksum.first == 0)
+    {
+        /// Entry's data is empty.
+        if (write_mode == WriteMode::Rewrite)
+        {
+            /// Just create an empty file.
+            destination_disk->createFile(destination_path);
+        }
+        std::lock_guard lock{mutex};
+        ++num_read_files;
+        return 0;
+    }
+
+    BackupFileInfo info;
+    {
+        std::lock_guard lock{mutex};
+        auto it = file_infos.find(size_and_checksum);
+        if (it == file_infos.end())
+        {
+            throw Exception(
+                ErrorCodes::BACKUP_ENTRY_NOT_FOUND,
+                "Backup {}: Entry {} not found in the backup",
+                backup_name_for_logging,
+                formatSizeAndChecksum(size_and_checksum));
+        }
+        info = it->second;
+    }
+
+    if (info.encrypted_by_disk && !destination_disk->getDataSourceDescription().is_encrypted)
+    {
+        throw Exception(
+            ErrorCodes::CANNOT_RESTORE_TO_NONENCRYPTED_DISK,
+            "File {} is encrypted in the backup, it can be restored only to an encrypted disk",
+            info.data_file_name);
+    }
+
+    bool file_copied = false;
+
+    if (info.size && !info.base_size && !use_archive)
+    {
+        /// Data comes completely from this backup.
+        reader->copyFileToDisk(info.data_file_name, info.size, info.encrypted_by_disk, destination_disk, destination_path, write_mode);
+        file_copied = true;
+    }
+    else if (info.size && (info.size == info.base_size))
+    {
+        /// Data comes completely from the base backup (nothing comes from this backup).
+        base_backup->copyFileToDisk(std::pair{info.base_size, info.base_checksum}, destination_disk, destination_path, write_mode);
+        file_copied = true;
+    }
+
+    if (file_copied)
+    {
+        /// The file is already copied, but `num_read_files` is not updated yet.
+        std::lock_guard lock{mutex};
+        ++num_read_files;
+        num_read_bytes += info.size;
+    }
+    else
+    {
+        /// Use the generic way to copy data. `readFile()` will update `num_read_files`.
+        auto read_buffer = readFileImpl(size_and_checksum, /* read_encrypted= */ info.encrypted_by_disk);
+        std::unique_ptr<WriteBuffer> write_buffer;
+        size_t buf_size = std::min<size_t>(info.size, reader->getWriteBufferSize());
+        if (info.encrypted_by_disk)
+            write_buffer = destination_disk->writeEncryptedFile(destination_path, buf_size, write_mode, reader->getWriteSettings());
+        else
+            write_buffer = destination_disk->writeFile(destination_path, buf_size, write_mode, reader->getWriteSettings());
+        copyData(*read_buffer, *write_buffer, info.size);
+        write_buffer->finalize();
+    }
+
+    return info.size;
+}
+
+
+void BackupImpl::writeFile(const BackupFileInfo & info, BackupEntryPtr entry)
 {
     if (open_mode != OpenMode::WRITE)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is not opened for writing");
@@ -799,205 +833,57 @@ void BackupImpl::writeFile(const String & file_name, BackupEntryPtr entry)
     if (writing_finalized)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is already finalized");
 
-    std::string from_file_name = "memory buffer";
-    if (auto fname = entry->getFilePath(); !fname.empty())
-        from_file_name = "file " + fname;
-    LOG_TRACE(log, "Writing backup for file {} from {}", file_name, from_file_name);
-
-    auto adjusted_path = removeLeadingSlash(file_name);
-
-    if (coordination->getFileInfo(adjusted_path))
-    {
-        throw Exception(
-                        ErrorCodes::BACKUP_ENTRY_ALREADY_EXISTS, "Backup {}: Entry {} already exists",
-                        backup_name_for_logging, quoteString(file_name));
-    }
-
-    FileInfo info
-    {
-        .file_name = adjusted_path,
-        .size = entry->getSize(),
-        .base_size = 0,
-        .base_checksum = 0,
-    };
-
+    bool should_check_lock_file = false;
     {
         std::lock_guard lock{mutex};
         ++num_files;
         total_size += info.size;
+        if (!num_entries)
+            should_check_lock_file = true;
     }
 
-    /// Empty file, nothing to backup
-    if (info.size == 0 && deduplicate_files)
+    auto src_disk = entry->getDisk();
+    auto src_file_path = entry->getFilePath();
+    bool from_immutable_file = entry->isFromImmutableFile();
+    String src_file_desc = src_file_path.empty() ? "memory buffer" : ("file " + src_file_path);
+
+    if (info.data_file_name.empty())
     {
-        coordination->addFileInfo(info);
+        LOG_TRACE(log, "Writing backup for file {} from {}: skipped, {}", info.data_file_name, src_file_desc, !info.size ? "empty" : "base backup has it");
         return;
     }
 
-    std::optional<SizeAndChecksum> base_backup_file_info = getInfoAboutFileFromBaseBackupIfExists(base_backup, adjusted_path);
-
-    /// We have info about this file in base backup
-    /// If file has no checksum -- calculate and fill it.
-    if (base_backup_file_info.has_value())
+    if (!coordination->startWritingFile(info.data_file_index))
     {
-        LOG_TRACE(log, "File {} found in base backup, checking for equality", adjusted_path);
-        CheckBackupResult check_base = checkBaseBackupForFile(*base_backup_file_info, info);
-
-        /// File with the same name but smaller size exist in previous backup
-        if (check_base == CheckBackupResult::HasPrefix)
-        {
-            auto checksums = calculateNewEntryChecksumsIfNeeded(entry, base_backup_file_info->first);
-            info.checksum = checksums.full_checksum;
-
-            /// We have prefix of this file in backup with the same checksum.
-            /// In ClickHouse this can happen for StorageLog for example.
-            if (checksums.prefix_checksum == base_backup_file_info->second)
-            {
-                LOG_TRACE(log, "File prefix of {} in base backup, will write rest part of file to current backup", adjusted_path);
-                info.base_size = base_backup_file_info->first;
-                info.base_checksum = base_backup_file_info->second;
-            }
-            else
-            {
-                LOG_TRACE(log, "Prefix checksum of file {} doesn't match with checksum in base backup", adjusted_path);
-            }
-        }
-        else
-        {
-            /// We have full file or have nothing, first of all let's get checksum
-            /// of current file
-            auto checksums = calculateNewEntryChecksumsIfNeeded(entry, 0);
-            info.checksum = checksums.full_checksum;
-
-            if (info.checksum == base_backup_file_info->second)
-            {
-                LOG_TRACE(log, "Found whole file {} in base backup", adjusted_path);
-                assert(check_base == CheckBackupResult::HasFull);
-                assert(info.size == base_backup_file_info->first);
-
-                info.base_size = base_backup_file_info->first;
-                info.base_checksum = base_backup_file_info->second;
-                /// Actually we can add this info to coordination and exist,
-                /// but we intentionally don't do it, otherwise control flow
-                /// of this function will be very complex.
-            }
-            else
-            {
-                LOG_TRACE(log, "Whole file {} in base backup doesn't match by checksum", adjusted_path);
-            }
-        }
-    }
-    else /// We don't have info about this file_name (sic!) in base backup,
-         /// however file could be renamed, so we will check one more time using size and checksum
-    {
-
-        LOG_TRACE(log, "Nothing found for file {} in base backup", adjusted_path);
-        auto checksums = calculateNewEntryChecksumsIfNeeded(entry, 0);
-        info.checksum = checksums.full_checksum;
-    }
-
-    /// Maybe we have a copy of this file in the backup already.
-    if (coordination->getFileInfo(std::pair{info.size, info.checksum}) && deduplicate_files)
-    {
-        LOG_TRACE(log, "File {} already exist in current backup, adding reference", adjusted_path);
-        coordination->addFileInfo(info);
+        LOG_TRACE(log, "Writing backup for file {} from {}: skipped, data file #{} is already being written", info.data_file_name, src_file_desc, info.data_file_index);
         return;
     }
 
-    /// On the previous lines we checked that backup for file with adjusted_name exist in previous backup.
-    /// However file can be renamed, but has the same size and checksums, let's check for this case.
-    if (base_backup && base_backup->fileExists(std::pair{info.size, info.checksum}))
+    if (!should_check_lock_file)
+        checkLockFile(true);
+
+    /// NOTE: `mutex` must be unlocked during copying otherwise writing will be in one thread maximum and hence slow.
+
+    if (use_archive)
     {
-
-        LOG_TRACE(log, "File {} doesn't exist in current backup, but we have file with same size and checksum", adjusted_path);
-        info.base_size = info.size;
-        info.base_checksum = info.checksum;
-
-        coordination->addFileInfo(info);
-        return;
+        LOG_TRACE(log, "Writing backup for file {} from {}: data file #{}, adding to archive", info.data_file_name, src_file_desc, info.data_file_index);
+        auto out = archive_writer->writeFile(info.data_file_name);
+        auto read_buffer = entry->getReadBuffer(writer->getReadSettings());
+        if (info.base_size != 0)
+            read_buffer->seek(info.base_size, SEEK_SET);
+        copyData(*read_buffer, *out);
+        out->finalize();
     }
-
-    /// All "short paths" failed. We don't have this file in previous or existing backup
-    /// or have only prefix of it in previous backup. Let's go long path.
-
-    info.data_file_name = info.file_name;
-
-    if (use_archives)
+    else if (src_disk && from_immutable_file)
     {
-        std::lock_guard lock{mutex};
-        info.archive_suffix = current_archive_suffix;
-    }
-
-    bool is_data_file_required;
-    coordination->addFileInfo(info, is_data_file_required);
-    if (!is_data_file_required && deduplicate_files)
-    {
-        LOG_TRACE(log, "File {} doesn't exist in current backup, but we have file with same size and checksum", adjusted_path);
-        return; /// We copy data only if it's a new combination of size & checksum.
-    }
-    auto writer_description = writer->getDataSourceDescription();
-    auto reader_description = entry->getDataSourceDescription();
-
-    /// We need to copy whole file without archive, we can do it faster
-    /// if source and destination are compatible
-    if (!use_archives && writer->supportNativeCopy(reader_description))
-    {
-        /// Should be much faster than writing data through server.
-        LOG_TRACE(log, "Will copy file {} using native copy", adjusted_path);
-
-        /// NOTE: `mutex` must be unlocked here otherwise writing will be in one thread maximum and hence slow.
-
-        writer->copyFileNative(entry->tryGetDiskIfExists(), entry->getFilePath(), info.base_size, info.size - info.base_size, info.data_file_name);
+        LOG_TRACE(log, "Writing backup for file {} from {} (disk {}): data file #{}", info.data_file_name, src_file_desc, src_disk->getName(), info.data_file_index);
+        writer->copyFileFromDisk(info.data_file_name, src_disk, src_file_path, info.encrypted_by_disk, info.base_size, info.size - info.base_size);
     }
     else
     {
-        LOG_TRACE(log, "Will copy file {}", adjusted_path);
-
-        bool has_entries = false;
-        {
-            std::lock_guard lock{mutex};
-            has_entries = num_entries > 0;
-        }
-        if (!has_entries)
-            checkLockFile(true);
-
-        if (use_archives)
-        {
-            LOG_TRACE(log, "Adding file {} to archive", adjusted_path);
-
-            /// An archive must be written strictly in one thread, so it's correct to lock the mutex for all the time we're writing the file
-            /// to the archive.
-            std::lock_guard lock{mutex};
-
-            String archive_suffix = current_archive_suffix;
-            bool next_suffix = false;
-            if (current_archive_suffix.empty() && is_internal_backup)
-                next_suffix = true;
-            /*if (archive_params.max_volume_size && current_archive_writer
-                && (current_archive_writer->getTotalSize() + size - base_size > archive_params.max_volume_size))
-                next_suffix = true;*/
-            if (next_suffix)
-                current_archive_suffix = coordination->getNextArchiveSuffix();
-
-            if (info.archive_suffix != current_archive_suffix)
-            {
-                info.archive_suffix = current_archive_suffix;
-                coordination->updateFileInfo(info);
-            }
-            auto out = getArchiveWriter(current_archive_suffix)->writeFile(info.data_file_name);
-            auto read_buffer = entry->getReadBuffer();
-            if (info.base_size != 0)
-                read_buffer->seek(info.base_size, SEEK_SET);
-            copyData(*read_buffer, *out);
-            out->finalize();
-        }
-        else
-        {
-            auto create_read_buffer = [entry] { return entry->getReadBuffer(); };
-
-            /// NOTE: `mutex` must be unlocked here otherwise writing will be in one thread maximum and hence slow.
-            writer->copyDataToFile(create_read_buffer, info.base_size, info.size - info.base_size, info.data_file_name);
-        }
+        LOG_TRACE(log, "Writing backup for file {} from {}: data file #{}", info.data_file_name, src_file_desc, info.data_file_index);
+        auto create_read_buffer = [entry, read_settings = writer->getReadSettings()] { return entry->getReadBuffer(read_settings); };
+        writer->copyDataToFile(info.data_file_name, create_read_buffer, info.base_size, info.size - info.base_size);
     }
 
     {
@@ -1018,14 +904,11 @@ void BackupImpl::finalizeWriting()
     if (writing_finalized)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is already finalized");
 
-    if (!coordination->hasFiles(""))
-        throw Exception(ErrorCodes::BACKUP_IS_EMPTY, "Backup must not be empty");
-
     if (!is_internal_backup)
     {
         LOG_TRACE(log, "Finalizing backup {}", backup_name_for_logging);
         writeBackupMetadata();
-        closeArchives();
+        closeArchive();
         setCompressedSize();
         removeLockFile();
         LOG_TRACE(log, "Finalized backup {}", backup_name_for_logging);
@@ -1037,51 +920,13 @@ void BackupImpl::finalizeWriting()
 
 void BackupImpl::setCompressedSize()
 {
-    if (use_archives)
+    if (use_archive)
         compressed_size = writer ? writer->getFileSize(archive_params.archive_name) : reader->getFileSize(archive_params.archive_name);
     else
         compressed_size = uncompressed_size;
 }
 
 
-String BackupImpl::getArchiveNameWithSuffix(const String & suffix) const
-{
-    return archive_params.archive_name + (suffix.empty() ? "" : ".") + suffix;
-}
-
-std::shared_ptr<IArchiveReader> BackupImpl::getArchiveReader(const String & suffix) const
-{
-    auto it = archive_readers.find(suffix);
-    if (it != archive_readers.end())
-        return it->second;
-    String archive_name_with_suffix = getArchiveNameWithSuffix(suffix);
-    size_t archive_size = reader->getFileSize(archive_name_with_suffix);
-    auto new_archive_reader = createArchiveReader(archive_params.archive_name, [reader=reader, archive_name_with_suffix]{ return reader->readFile(archive_name_with_suffix); },
-        archive_size);
-    new_archive_reader->setPassword(archive_params.password);
-    archive_readers.emplace(suffix, new_archive_reader);
-    return new_archive_reader;
-}
-
-std::shared_ptr<IArchiveWriter> BackupImpl::getArchiveWriter(const String & suffix)
-{
-    for (const auto & archive_writer : archive_writers)
-    {
-        if ((suffix == archive_writer.first) && archive_writer.second)
-            return archive_writer.second;
-    }
-
-    String archive_name_with_suffix = getArchiveNameWithSuffix(suffix);
-    auto new_archive_writer = createArchiveWriter(archive_params.archive_name, writer->writeFile(archive_name_with_suffix));
-    new_archive_writer->setPassword(archive_params.password);
-    new_archive_writer->setCompression(archive_params.compression_method, archive_params.compression_level);
-    size_t pos = suffix.empty() ? 0 : 1;
-    archive_writers[pos] = {suffix, new_archive_writer};
-
-    return new_archive_writer;
-}
-
-
 void BackupImpl::removeAllFilesAfterFailure()
 {
     if (is_internal_backup)
@@ -1092,19 +937,14 @@ void BackupImpl::removeAllFilesAfterFailure()
         LOG_INFO(log, "Removing all files of backup {} after failure", backup_name_for_logging);
 
         Strings files_to_remove;
-        if (use_archives)
+        if (use_archive)
         {
             files_to_remove.push_back(archive_params.archive_name);
-            for (const auto & suffix : coordination->getAllArchiveSuffixes())
-            {
-                String archive_name_with_suffix = getArchiveNameWithSuffix(suffix);
-                files_to_remove.push_back(std::move(archive_name_with_suffix));
-            }
         }
         else
         {
             files_to_remove.push_back(".backup");
-            for (const auto & file_info : coordination->getAllFileInfos())
+            for (const auto & file_info : coordination->getFileInfosForAllHosts())
                 files_to_remove.push_back(file_info.data_file_name);
         }
 
diff --git a/src/Backups/BackupImpl.h b/src/Backups/BackupImpl.h
index 4aa300d5021..7e95d156162 100644
--- a/src/Backups/BackupImpl.h
+++ b/src/Backups/BackupImpl.h
@@ -3,8 +3,8 @@
 #include <Backups/IBackup.h>
 #include <Backups/IBackupCoordination.h>
 #include <Backups/BackupInfo.h>
+#include <map>
 #include <mutex>
-#include <unordered_map>
 
 
 namespace DB
@@ -58,6 +58,7 @@ public:
     OpenMode getOpenMode() const override { return open_mode; }
     time_t getTimestamp() const override { return timestamp; }
     UUID getUUID() const override { return *uuid; }
+    BackupPtr getBaseBackup() const override { return base_backup; }
     size_t getNumFiles() const override;
     UInt64 getTotalSize() const override;
     size_t getNumEntries() const override;
@@ -73,23 +74,24 @@ public:
     UInt64 getFileSize(const String & file_name) const override;
     UInt128 getFileChecksum(const String & file_name) const override;
     SizeAndChecksum getFileSizeAndChecksum(const String & file_name) const override;
-    BackupEntryPtr readFile(const String & file_name) const override;
-    BackupEntryPtr readFile(const SizeAndChecksum & size_and_checksum) const override;
-    void writeFile(const String & file_name, BackupEntryPtr entry) override;
+    std::unique_ptr<SeekableReadBuffer> readFile(const String & file_name) const override;
+    std::unique_ptr<SeekableReadBuffer> readFile(const SizeAndChecksum & size_and_checksum) const override;
+    size_t copyFileToDisk(const String & file_name, DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) const override;
+    size_t copyFileToDisk(const SizeAndChecksum & size_and_checksum, DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) const override;
+    void writeFile(const BackupFileInfo & info, BackupEntryPtr entry) override;
     void finalizeWriting() override;
-    bool supportsWritingInMultipleThreads() const override { return !use_archives; }
+    bool supportsWritingInMultipleThreads() const override { return !use_archive; }
 
 private:
-    using FileInfo = IBackupCoordination::FileInfo;
-    class BackupEntryFromBackupImpl;
-
     void open(const ContextPtr & context);
     void close();
-    void closeArchives();
+
+    void openArchive();
+    void closeArchive();
 
     /// Writes the file ".backup" containing backup's metadata.
-    void writeBackupMetadata();
-    void readBackupMetadata();
+    void writeBackupMetadata() TSA_REQUIRES(mutex);
+    void readBackupMetadata() TSA_REQUIRES(mutex);
 
     /// Checks that a new backup doesn't exist yet.
     void checkBackupDoesntExist() const;
@@ -102,16 +104,14 @@ private:
 
     void removeAllFilesAfterFailure();
 
-    String getArchiveNameWithSuffix(const String & suffix) const;
-    std::shared_ptr<IArchiveReader> getArchiveReader(const String & suffix) const;
-    std::shared_ptr<IArchiveWriter> getArchiveWriter(const String & suffix);
-
     /// Calculates and sets `compressed_size`.
     void setCompressedSize();
 
+    std::unique_ptr<SeekableReadBuffer> readFileImpl(const SizeAndChecksum & size_and_checksum, bool read_encrypted) const;
+
     const String backup_name_for_logging;
+    const bool use_archive;
     const ArchiveParams archive_params;
-    const bool use_archives;
     const OpenMode open_mode;
     std::shared_ptr<IBackupWriter> writer;
     std::shared_ptr<IBackupReader> reader;
@@ -119,6 +119,11 @@ private:
     std::shared_ptr<IBackupCoordination> coordination;
 
     mutable std::mutex mutex;
+
+    using SizeAndChecksum = std::pair<UInt64, UInt128>;
+    std::map<String /* file_name */, SizeAndChecksum> file_names TSA_GUARDED_BY(mutex); /// Should be ordered alphabetically, see listFiles(). For empty files we assume checksum = 0.
+    std::map<SizeAndChecksum, BackupFileInfo> file_infos TSA_GUARDED_BY(mutex); /// Information about files. Without empty files.
+
     std::optional<UUID> uuid;
     time_t timestamp = 0;
     size_t num_files = 0;
@@ -133,10 +138,10 @@ private:
     std::optional<BackupInfo> base_backup_info;
     std::shared_ptr<const IBackup> base_backup;
     std::optional<UUID> base_backup_uuid;
-    mutable std::unordered_map<String /* archive_suffix */, std::shared_ptr<IArchiveReader>> archive_readers;
-    std::pair<String, std::shared_ptr<IArchiveWriter>> archive_writers[2];
-    String current_archive_suffix;
+    std::shared_ptr<IArchiveReader> archive_reader;
+    std::shared_ptr<IArchiveWriter> archive_writer;
     String lock_file_name;
+
     bool writing_finalized = false;
     bool deduplicate_files = true;
     const Poco::Logger * log;
diff --git a/src/Backups/BackupSettings.cpp b/src/Backups/BackupSettings.cpp
index 57d85305e25..882342467fe 100644
--- a/src/Backups/BackupSettings.cpp
+++ b/src/Backups/BackupSettings.cpp
@@ -23,6 +23,7 @@ namespace ErrorCodes
     M(String, password) \
     M(Bool, structure_only) \
     M(Bool, async) \
+    M(Bool, decrypt_files_from_encrypted_disks) \
     M(Bool, deduplicate_files) \
     M(UInt64, shard_num) \
     M(UInt64, replica_num) \
diff --git a/src/Backups/BackupSettings.h b/src/Backups/BackupSettings.h
index 1b97256c75b..2c899687e6e 100644
--- a/src/Backups/BackupSettings.h
+++ b/src/Backups/BackupSettings.h
@@ -32,6 +32,9 @@ struct BackupSettings
     /// Whether the BACKUP command must return immediately without waiting until the backup has completed.
     bool async = false;
 
+    /// Whether the BACKUP command should decrypt files stored on encrypted disks.
+    bool decrypt_files_from_encrypted_disks = false;
+
     /// Whether the BACKUP will omit similar files (within one backup only).
     bool deduplicate_files = true;
 
diff --git a/src/Backups/BackupUtils.cpp b/src/Backups/BackupUtils.cpp
index 9ff91050177..89b75a103c2 100644
--- a/src/Backups/BackupUtils.cpp
+++ b/src/Backups/BackupUtils.cpp
@@ -1,10 +1,7 @@
 #include <Backups/BackupUtils.h>
-#include <Backups/IBackup.h>
-#include <Backups/RestoreSettings.h>
 #include <Access/Common/AccessRightsElement.h>
 #include <Databases/DDLRenamingVisitor.h>
 #include <Interpreters/DatabaseCatalog.h>
-#include <Common/scope_guard_safe.h>
 #include <Common/setThreadName.h>
 
 
@@ -60,140 +57,6 @@ DDLRenamingMap makeRenamingMapFromBackupQuery(const ASTBackupQuery::Elements & e
 }
 
 
-void writeBackupEntries(BackupMutablePtr backup, BackupEntries && backup_entries, ThreadPool & thread_pool)
-{
-    size_t num_active_jobs = 0;
-    std::mutex mutex;
-    std::condition_variable event;
-    std::exception_ptr exception;
-
-    bool always_single_threaded = !backup->supportsWritingInMultipleThreads();
-    auto thread_group = CurrentThread::getGroup();
-
-    for (auto & name_and_entry : backup_entries)
-    {
-        auto & name = name_and_entry.first;
-        auto & entry = name_and_entry.second;
-
-        {
-            std::unique_lock lock{mutex};
-            if (exception)
-                break;
-            ++num_active_jobs;
-        }
-
-        auto job = [&](bool async)
-        {
-            SCOPE_EXIT_SAFE(
-                std::lock_guard lock{mutex};
-                if (!--num_active_jobs)
-                    event.notify_all();
-                if (async)
-                    CurrentThread::detachQueryIfNotDetached();
-            );
-
-            try
-            {
-                if (async && thread_group)
-                    CurrentThread::attachTo(thread_group);
-
-                if (async)
-                    setThreadName("BackupWorker");
-
-                {
-                    std::lock_guard lock{mutex};
-                    if (exception)
-                        return;
-                }
-
-                backup->writeFile(name, std::move(entry));
-            }
-            catch (...)
-            {
-                std::lock_guard lock{mutex};
-                if (!exception)
-                    exception = std::current_exception();
-            }
-        };
-
-        if (always_single_threaded || !thread_pool.trySchedule([job] { job(true); }))
-            job(false);
-    }
-
-    {
-        std::unique_lock lock{mutex};
-        event.wait(lock, [&] { return !num_active_jobs; });
-        if (exception)
-            std::rethrow_exception(exception);
-    }
-}
-
-
-void restoreTablesData(DataRestoreTasks && tasks, ThreadPool & thread_pool)
-{
-    size_t num_active_jobs = 0;
-    std::mutex mutex;
-    std::condition_variable event;
-    std::exception_ptr exception;
-
-    auto thread_group = CurrentThread::getGroup();
-
-    for (auto & task : tasks)
-    {
-        {
-            std::unique_lock lock{mutex};
-            if (exception)
-                break;
-            ++num_active_jobs;
-        }
-
-        auto job = [&](bool async)
-        {
-            SCOPE_EXIT_SAFE(
-                std::lock_guard lock{mutex};
-                if (!--num_active_jobs)
-                    event.notify_all();
-                if (async)
-                    CurrentThread::detachQueryIfNotDetached();
-            );
-
-            try
-            {
-                if (async && thread_group)
-                    CurrentThread::attachTo(thread_group);
-
-                if (async)
-                    setThreadName("RestoreWorker");
-
-                {
-                    std::lock_guard lock{mutex};
-                    if (exception)
-                        return;
-                }
-
-                std::move(task)();
-            }
-            catch (...)
-            {
-                std::lock_guard lock{mutex};
-                if (!exception)
-                    exception = std::current_exception();
-            }
-        };
-
-        if (!thread_pool.trySchedule([job] { job(true); }))
-            job(false);
-    }
-
-    {
-        std::unique_lock lock{mutex};
-        event.wait(lock, [&] { return !num_active_jobs; });
-        if (exception)
-            std::rethrow_exception(exception);
-    }
-}
-
-
 /// Returns access required to execute BACKUP query.
 AccessRightsElements getRequiredAccessToBackup(const ASTBackupQuery::Elements & elements)
 {
diff --git a/src/Backups/BackupUtils.h b/src/Backups/BackupUtils.h
index cda9121b1fa..3dc0a58d304 100644
--- a/src/Backups/BackupUtils.h
+++ b/src/Backups/BackupUtils.h
@@ -1,27 +1,17 @@
 #pragma once
 
 #include <Parsers/ASTBackupQuery.h>
-#include <Common/ThreadPool.h>
 
 
 namespace DB
 {
 class IBackup;
-using BackupMutablePtr = std::shared_ptr<IBackup>;
-class IBackupEntry;
-using BackupEntries = std::vector<std::pair<String, std::shared_ptr<const IBackupEntry>>>;
-using DataRestoreTasks = std::vector<std::function<void()>>;
 class AccessRightsElements;
 class DDLRenamingMap;
 
 /// Initializes a DDLRenamingMap from a BACKUP or RESTORE query.
 DDLRenamingMap makeRenamingMapFromBackupQuery(const ASTBackupQuery::Elements & elements);
 
-/// Write backup entries to an opened backup.
-void writeBackupEntries(BackupMutablePtr backup, BackupEntries && backup_entries, ThreadPool & thread_pool);
-
-/// Run data restoring tasks which insert data to tables.
-void restoreTablesData(DataRestoreTasks && tasks, ThreadPool & thread_pool);
 
 /// Returns access required to execute BACKUP query.
 AccessRightsElements getRequiredAccessToBackup(const ASTBackupQuery::Elements & elements);
diff --git a/src/Backups/BackupsWorker.cpp b/src/Backups/BackupsWorker.cpp
index 865151cc9ec..0a6482fb7de 100644
--- a/src/Backups/BackupsWorker.cpp
+++ b/src/Backups/BackupsWorker.cpp
@@ -20,9 +20,20 @@
 #include <Common/Exception.h>
 #include <Common/Macros.h>
 #include <Common/logger_useful.h>
+#include <Common/CurrentMetrics.h>
 #include <Common/setThreadName.h>
+#include <Common/scope_guard_safe.h>
+#include <Common/ThreadPool.h>
 
 
+namespace CurrentMetrics
+{
+    extern const Metric BackupsThreads;
+    extern const Metric BackupsThreadsActive;
+    extern const Metric RestoreThreads;
+    extern const Metric RestoreThreadsActive;
+}
+
 namespace DB
 {
 
@@ -38,25 +49,74 @@ namespace Stage = BackupCoordinationStage;
 
 namespace
 {
-    std::shared_ptr<IBackupCoordination> makeBackupCoordination(const String & root_zk_path, const String & backup_uuid, const ContextPtr & context, bool is_internal_backup)
+    std::shared_ptr<IBackupCoordination> makeBackupCoordination(const ContextPtr & context, const BackupSettings & backup_settings, bool remote)
     {
-        if (!root_zk_path.empty())
+        if (remote)
         {
+            String root_zk_path = context->getConfigRef().getString("backups.zookeeper_path", "/clickhouse/backups");
+
             auto get_zookeeper = [global_context = context->getGlobalContext()] { return global_context->getZooKeeper(); };
-            return std::make_shared<BackupCoordinationRemote>(root_zk_path, backup_uuid, get_zookeeper, is_internal_backup);
+
+            BackupCoordinationRemote::BackupKeeperSettings keeper_settings
+            {
+                .keeper_max_retries = context->getSettingsRef().backup_restore_keeper_max_retries,
+                .keeper_retry_initial_backoff_ms = context->getSettingsRef().backup_restore_keeper_retry_initial_backoff_ms,
+                .keeper_retry_max_backoff_ms = context->getSettingsRef().backup_restore_keeper_retry_max_backoff_ms,
+                .batch_size_for_keeper_multiread = context->getSettingsRef().backup_restore_batch_size_for_keeper_multiread,
+                .keeper_fault_injection_probability = context->getSettingsRef().backup_restore_keeper_fault_injection_probability,
+                .keeper_fault_injection_seed = context->getSettingsRef().backup_restore_keeper_fault_injection_seed,
+                .keeper_value_max_size = context->getSettingsRef().backup_restore_keeper_value_max_size,
+            };
+
+            auto all_hosts = BackupSettings::Util::filterHostIDs(
+                backup_settings.cluster_host_ids, backup_settings.shard_num, backup_settings.replica_num);
+
+            return std::make_shared<BackupCoordinationRemote>(
+                get_zookeeper,
+                root_zk_path,
+                keeper_settings,
+                toString(*backup_settings.backup_uuid),
+                all_hosts,
+                backup_settings.host_id,
+                !backup_settings.deduplicate_files,
+                backup_settings.internal);
         }
         else
         {
-            return std::make_shared<BackupCoordinationLocal>();
+            return std::make_shared<BackupCoordinationLocal>(!backup_settings.deduplicate_files);
         }
     }
 
-    std::shared_ptr<IRestoreCoordination> makeRestoreCoordination(const String & root_zk_path, const String & restore_uuid, const ContextPtr & context, bool is_internal_backup)
+    std::shared_ptr<IRestoreCoordination>
+    makeRestoreCoordination(const ContextPtr & context, const RestoreSettings & restore_settings, bool remote)
     {
-        if (!root_zk_path.empty())
+        if (remote)
         {
+            String root_zk_path = context->getConfigRef().getString("backups.zookeeper_path", "/clickhouse/backups");
+
             auto get_zookeeper = [global_context = context->getGlobalContext()] { return global_context->getZooKeeper(); };
-            return std::make_shared<RestoreCoordinationRemote>(root_zk_path, restore_uuid, get_zookeeper, is_internal_backup);
+
+            RestoreCoordinationRemote::RestoreKeeperSettings keeper_settings
+            {
+                .keeper_max_retries = context->getSettingsRef().backup_restore_keeper_max_retries,
+                .keeper_retry_initial_backoff_ms = context->getSettingsRef().backup_restore_keeper_retry_initial_backoff_ms,
+                .keeper_retry_max_backoff_ms = context->getSettingsRef().backup_restore_keeper_retry_max_backoff_ms,
+                .batch_size_for_keeper_multiread = context->getSettingsRef().backup_restore_batch_size_for_keeper_multiread,
+                .keeper_fault_injection_probability = context->getSettingsRef().backup_restore_keeper_fault_injection_probability,
+                .keeper_fault_injection_seed = context->getSettingsRef().backup_restore_keeper_fault_injection_seed
+            };
+
+            auto all_hosts = BackupSettings::Util::filterHostIDs(
+                restore_settings.cluster_host_ids, restore_settings.shard_num, restore_settings.replica_num);
+
+            return std::make_shared<RestoreCoordinationRemote>(
+                get_zookeeper,
+                root_zk_path,
+                keeper_settings,
+                toString(*restore_settings.restore_uuid),
+                all_hosts,
+                restore_settings.host_id,
+                restore_settings.internal);
         }
         else
         {
@@ -66,12 +126,12 @@ namespace
 
     /// Sends information about an exception to IBackupCoordination or IRestoreCoordination.
     template <typename CoordinationType>
-    void sendExceptionToCoordination(std::shared_ptr<CoordinationType> coordination, const String & current_host, const Exception & exception)
+    void sendExceptionToCoordination(std::shared_ptr<CoordinationType> coordination, const Exception & exception)
     {
         try
         {
             if (coordination)
-                coordination->setError(current_host, exception);
+                coordination->setError(exception);
         }
         catch (...)
         {
@@ -80,7 +140,7 @@ namespace
 
     /// Sends information about the current exception to IBackupCoordination or IRestoreCoordination.
     template <typename CoordinationType>
-    void sendCurrentExceptionToCoordination(std::shared_ptr<CoordinationType> coordination, const String & current_host)
+    void sendCurrentExceptionToCoordination(std::shared_ptr<CoordinationType> coordination)
     {
         try
         {
@@ -88,12 +148,12 @@ namespace
         }
         catch (const Exception & e)
         {
-            sendExceptionToCoordination(coordination, current_host, e);
+            sendExceptionToCoordination(coordination, e);
         }
         catch (...)
         {
             if (coordination)
-                coordination->setError(current_host, Exception(getCurrentExceptionMessageAndPattern(true, true), getCurrentExceptionCode()));
+                coordination->setError(Exception(getCurrentExceptionMessageAndPattern(true, true), getCurrentExceptionCode()));
         }
     }
 
@@ -123,8 +183,8 @@ namespace
 
 
 BackupsWorker::BackupsWorker(size_t num_backup_threads, size_t num_restore_threads, bool allow_concurrent_backups_, bool allow_concurrent_restores_)
-    : backups_thread_pool(num_backup_threads, /* max_free_threads = */ 0, num_backup_threads)
-    , restores_thread_pool(num_restore_threads, /* max_free_threads = */ 0, num_restore_threads)
+    : backups_thread_pool(std::make_unique<ThreadPool>(CurrentMetrics::BackupsThreads, CurrentMetrics::BackupsThreadsActive, num_backup_threads, /* max_free_threads = */ 0, num_backup_threads))
+    , restores_thread_pool(std::make_unique<ThreadPool>(CurrentMetrics::RestoreThreads, CurrentMetrics::RestoreThreadsActive, num_restore_threads, /* max_free_threads = */ 0, num_restore_threads))
     , log(&Poco::Logger::get("BackupsWorker"))
     , allow_concurrent_backups(allow_concurrent_backups_)
     , allow_concurrent_restores(allow_concurrent_restores_)
@@ -160,16 +220,13 @@ OperationID BackupsWorker::startMakingBackup(const ASTPtr & query, const Context
     else
         backup_id = toString(*backup_settings.backup_uuid);
 
-    String root_zk_path;
-
     std::shared_ptr<IBackupCoordination> backup_coordination;
     if (backup_settings.internal)
     {
         /// The following call of makeBackupCoordination() is not essential because doBackup() will later create a backup coordination
         /// if it's not created here. However to handle errors better it's better to make a coordination here because this way
         /// if an exception will be thrown in startMakingBackup() other hosts will know about that.
-        root_zk_path = context->getConfigRef().getString("backups.zookeeper_path", "/clickhouse/backups");
-        backup_coordination = makeBackupCoordination(root_zk_path, toString(*backup_settings.backup_uuid), context, backup_settings.internal);
+        backup_coordination = makeBackupCoordination(context, backup_settings, /* remote= */ true);
     }
 
     auto backup_info = BackupInfo::fromAST(*backup_query->backup_name);
@@ -192,7 +249,7 @@ OperationID BackupsWorker::startMakingBackup(const ASTPtr & query, const Context
 
         if (backup_settings.async)
         {
-            backups_thread_pool.scheduleOrThrowOnError(
+            backups_thread_pool->scheduleOrThrowOnError(
                 [this, backup_query, backup_id, backup_name_for_logging, backup_info, backup_settings, backup_coordination, context_in_use, mutable_context]
                 {
                     doBackup(
@@ -228,7 +285,7 @@ OperationID BackupsWorker::startMakingBackup(const ASTPtr & query, const Context
         tryLogCurrentException(log, fmt::format("Failed to start {} {}", (backup_settings.internal ? "internal backup" : "backup"), backup_name_for_logging));
         /// Something bad happened, the backup has not built.
         setStatusSafe(backup_id, BackupStatus::BACKUP_FAILED);
-        sendCurrentExceptionToCoordination(backup_coordination, backup_settings.host_id);
+        sendCurrentExceptionToCoordination(backup_coordination);
         throw;
     }
 }
@@ -264,12 +321,9 @@ void BackupsWorker::doBackup(
         if (!on_cluster)
             context->checkAccess(required_access);
 
-        String root_zk_path;
-
         ClusterPtr cluster;
         if (on_cluster)
         {
-            root_zk_path = context->getConfigRef().getString("backups.zookeeper_path", "/clickhouse/backups");
             backup_query->cluster = context->getMacros()->expand(backup_query->cluster);
             cluster = context->getCluster(backup_query->cluster);
             backup_settings.cluster_host_ids = cluster->getHostIDs();
@@ -277,7 +331,7 @@ void BackupsWorker::doBackup(
 
         /// Make a backup coordination.
         if (!backup_coordination)
-            backup_coordination = makeBackupCoordination(root_zk_path, toString(*backup_settings.backup_uuid), context, backup_settings.internal);
+            backup_coordination = makeBackupCoordination(context, backup_settings, /* remote= */ on_cluster);
 
         if (!allow_concurrent_backups && backup_coordination->hasConcurrentBackups(std::ref(num_active_backups)))
             throw Exception(ErrorCodes::CONCURRENT_ACCESS_NOT_SUPPORTED, "Concurrent backups not supported, turn on setting 'allow_concurrent_backups'");
@@ -313,9 +367,8 @@ void BackupsWorker::doBackup(
             executeDDLQueryOnCluster(backup_query, mutable_context, params);
 
             /// Wait until all the hosts have written their backup entries.
-            auto all_hosts = BackupSettings::Util::filterHostIDs(
-                backup_settings.cluster_host_ids, backup_settings.shard_num, backup_settings.replica_num);
-            backup_coordination->waitForStage(all_hosts, Stage::COMPLETED);
+            backup_coordination->waitForStage(Stage::COMPLETED);
+            backup_coordination->setStage(Stage::COMPLETED,"");
         }
         else
         {
@@ -329,10 +382,11 @@ void BackupsWorker::doBackup(
             }
 
             /// Write the backup entries to the backup.
-            writeBackupEntries(backup, std::move(backup_entries), backups_thread_pool);
+            buildFileInfosForBackupEntries(backup, backup_entries, backup_coordination);
+            writeBackupEntries(backup, std::move(backup_entries), backup_id, backup_coordination, backup_settings.internal);
 
             /// We have written our backup entries, we need to tell other hosts (they could be waiting for it).
-            backup_coordination->setStage(backup_settings.host_id, Stage::COMPLETED, "");
+            backup_coordination->setStage(Stage::COMPLETED,"");
         }
 
         size_t num_files = 0;
@@ -357,6 +411,7 @@ void BackupsWorker::doBackup(
 
         LOG_INFO(log, "{} {} was created successfully", (backup_settings.internal ? "Internal backup" : "Backup"), backup_name_for_logging);
         setStatus(backup_id, BackupStatus::BACKUP_CREATED);
+        /// NOTE: we need to update metadata again after backup->finalizeWriting(), because backup metadata is written there.
         setNumFilesAndSize(backup_id, num_files, total_size, num_entries, uncompressed_size, compressed_size, 0, 0);
     }
     catch (...)
@@ -366,7 +421,7 @@ void BackupsWorker::doBackup(
         {
             tryLogCurrentException(log, fmt::format("Failed to make {} {}", (backup_settings.internal ? "internal backup" : "backup"), backup_name_for_logging));
             setStatusSafe(backup_id, BackupStatus::BACKUP_FAILED);
-            sendCurrentExceptionToCoordination(backup_coordination, backup_settings.host_id);
+            sendCurrentExceptionToCoordination(backup_coordination);
         }
         else
         {
@@ -377,6 +432,111 @@ void BackupsWorker::doBackup(
 }
 
 
+void BackupsWorker::buildFileInfosForBackupEntries(const BackupPtr & backup, const BackupEntries & backup_entries, std::shared_ptr<IBackupCoordination> backup_coordination)
+{
+    LOG_TRACE(log, "{}", Stage::BUILDING_FILE_INFOS);
+    backup_coordination->setStage(Stage::BUILDING_FILE_INFOS, "");
+    backup_coordination->waitForStage(Stage::BUILDING_FILE_INFOS);
+    backup_coordination->addFileInfos(::DB::buildFileInfosForBackupEntries(backup_entries, backup->getBaseBackup(), *backups_thread_pool));
+}
+
+
+void BackupsWorker::writeBackupEntries(BackupMutablePtr backup, BackupEntries && backup_entries, const OperationID & backup_id, std::shared_ptr<IBackupCoordination> backup_coordination, bool internal)
+{
+    LOG_TRACE(log, "{}, num backup entries={}", Stage::WRITING_BACKUP, backup_entries.size());
+    backup_coordination->setStage(Stage::WRITING_BACKUP, "");
+    backup_coordination->waitForStage(Stage::WRITING_BACKUP);
+
+    auto file_infos = backup_coordination->getFileInfos();
+    if (file_infos.size() != backup_entries.size())
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Number of file infos ({}) doesn't match the number of backup entries ({})",
+            file_infos.size(),
+            backup_entries.size());
+    }
+
+    size_t num_active_jobs = 0;
+    std::mutex mutex;
+    std::condition_variable event;
+    std::exception_ptr exception;
+
+    bool always_single_threaded = !backup->supportsWritingInMultipleThreads();
+    auto thread_group = CurrentThread::getGroup();
+
+    for (size_t i = 0; i != backup_entries.size(); ++i)
+    {
+        auto & entry = backup_entries[i].second;
+        const auto & file_info = file_infos[i];
+
+        {
+            std::unique_lock lock{mutex};
+            if (exception)
+                break;
+            ++num_active_jobs;
+        }
+
+        auto job = [&](bool async)
+        {
+            SCOPE_EXIT_SAFE(
+                std::lock_guard lock{mutex};
+                if (!--num_active_jobs)
+                    event.notify_all();
+                if (async)
+                    CurrentThread::detachFromGroupIfNotDetached();
+            );
+
+            try
+            {
+                if (async && thread_group)
+                    CurrentThread::attachToGroup(thread_group);
+
+                if (async)
+                    setThreadName("BackupWorker");
+
+                {
+                    std::lock_guard lock{mutex};
+                    if (exception)
+                        return;
+                }
+
+                backup->writeFile(file_info, std::move(entry));
+                // Update metadata
+                if (!internal)
+                {
+                    setNumFilesAndSize(
+                            backup_id,
+                            backup->getNumFiles(),
+                            backup->getTotalSize(),
+                            backup->getNumEntries(),
+                            backup->getUncompressedSize(),
+                            backup->getCompressedSize(),
+                            0, 0);
+                }
+
+            }
+            catch (...)
+            {
+                std::lock_guard lock{mutex};
+                if (!exception)
+                    exception = std::current_exception();
+            }
+        };
+
+        if (always_single_threaded || !backups_thread_pool->trySchedule([job] { job(true); }))
+            job(false);
+    }
+
+    {
+        std::unique_lock lock{mutex};
+        event.wait(lock, [&] { return !num_active_jobs; });
+        if (exception)
+            std::rethrow_exception(exception);
+    }
+}
+
+
 OperationID BackupsWorker::startRestoring(const ASTPtr & query, ContextMutablePtr context)
 {
     auto restore_query = std::static_pointer_cast<ASTBackupQuery>(query->clone());
@@ -400,8 +560,7 @@ OperationID BackupsWorker::startRestoring(const ASTPtr & query, ContextMutablePt
         /// The following call of makeRestoreCoordination() is not essential because doRestore() will later create a restore coordination
         /// if it's not created here. However to handle errors better it's better to make a coordination here because this way
         /// if an exception will be thrown in startRestoring() other hosts will know about that.
-        auto root_zk_path = context->getConfigRef().getString("backups.zookeeper_path", "/clickhouse/backups");
-        restore_coordination = makeRestoreCoordination(root_zk_path, toString(*restore_settings.restore_uuid), context, restore_settings.internal);
+        restore_coordination = makeRestoreCoordination(context, restore_settings, /* remote= */ true);
     }
 
     try
@@ -424,7 +583,7 @@ OperationID BackupsWorker::startRestoring(const ASTPtr & query, ContextMutablePt
 
         if (restore_settings.async)
         {
-            backups_thread_pool.scheduleOrThrowOnError(
+            restores_thread_pool->scheduleOrThrowOnError(
                 [this, restore_query, restore_id, backup_name_for_logging, backup_info, restore_settings, restore_coordination, context_in_use]
                 {
                     doRestore(
@@ -457,7 +616,7 @@ OperationID BackupsWorker::startRestoring(const ASTPtr & query, ContextMutablePt
     {
         /// Something bad happened, the backup has not built.
         setStatusSafe(restore_id, BackupStatus::RESTORE_FAILED);
-        sendCurrentExceptionToCoordination(restore_coordination, restore_settings.host_id);
+        sendCurrentExceptionToCoordination(restore_coordination);
         throw;
     }
 }
@@ -492,18 +651,30 @@ void BackupsWorker::doRestore(
         BackupPtr backup = BackupFactory::instance().createBackup(backup_open_params);
 
         String current_database = context->getCurrentDatabase();
-        String root_zk_path;
         /// Checks access rights if this is ON CLUSTER query.
         /// (If this isn't ON CLUSTER query RestorerFromBackup will check access rights later.)
         ClusterPtr cluster;
         bool on_cluster = !restore_query->cluster.empty();
+
         if (on_cluster)
         {
-            root_zk_path = context->getConfigRef().getString("backups.zookeeper_path", "/clickhouse/backups");
             restore_query->cluster = context->getMacros()->expand(restore_query->cluster);
             cluster = context->getCluster(restore_query->cluster);
             restore_settings.cluster_host_ids = cluster->getHostIDs();
+        }
 
+        /// Make a restore coordination.
+        if (!restore_coordination)
+            restore_coordination = makeRestoreCoordination(context, restore_settings, /* remote= */ on_cluster);
+
+        if (!allow_concurrent_restores && restore_coordination->hasConcurrentRestores(std::ref(num_active_restores)))
+            throw Exception(
+                ErrorCodes::CONCURRENT_ACCESS_NOT_SUPPORTED,
+                "Concurrent restores not supported, turn on setting 'allow_concurrent_restores'");
+
+
+        if (on_cluster)
+        {
             /// We cannot just use access checking provided by the function executeDDLQueryOnCluster(): it would be incorrect
             /// because different replicas can contain different set of tables and so the required access rights can differ too.
             /// So the right way is pass through the entire cluster and check access for each host.
@@ -520,13 +691,6 @@ void BackupsWorker::doRestore(
             }
         }
 
-        /// Make a restore coordination.
-        if (!restore_coordination)
-            restore_coordination = makeRestoreCoordination(root_zk_path, toString(*restore_settings.restore_uuid), context, restore_settings.internal);
-
-        if (!allow_concurrent_restores && restore_coordination->hasConcurrentRestores(std::ref(num_active_restores)))
-            throw Exception(ErrorCodes::CONCURRENT_ACCESS_NOT_SUPPORTED, "Concurrent restores not supported, turn on setting 'allow_concurrent_restores'");
-
         /// Do RESTORE.
         if (on_cluster)
         {
@@ -544,9 +708,8 @@ void BackupsWorker::doRestore(
             executeDDLQueryOnCluster(restore_query, context, params);
 
             /// Wait until all the hosts have written their backup entries.
-            auto all_hosts = BackupSettings::Util::filterHostIDs(
-                restore_settings.cluster_host_ids, restore_settings.shard_num, restore_settings.replica_num);
-            restore_coordination->waitForStage(all_hosts, Stage::COMPLETED);
+            restore_coordination->waitForStage(Stage::COMPLETED);
+            restore_coordination->setStage(Stage::COMPLETED,"");
         }
         else
         {
@@ -561,23 +724,14 @@ void BackupsWorker::doRestore(
             }
 
             /// Execute the data restoring tasks.
-            restoreTablesData(std::move(data_restore_tasks), restores_thread_pool);
+            restoreTablesData(restore_id, backup, std::move(data_restore_tasks), *restores_thread_pool);
 
             /// We have restored everything, we need to tell other hosts (they could be waiting for it).
-            restore_coordination->setStage(restore_settings.host_id, Stage::COMPLETED, "");
+            restore_coordination->setStage(Stage::COMPLETED, "");
         }
 
         LOG_INFO(log, "Restored from {} {} successfully", (restore_settings.internal ? "internal backup" : "backup"), backup_name_for_logging);
         setStatus(restore_id, BackupStatus::RESTORED);
-        setNumFilesAndSize(
-            restore_id,
-            backup->getNumFiles(),
-            backup->getTotalSize(),
-            backup->getNumEntries(),
-            backup->getUncompressedSize(),
-            backup->getCompressedSize(),
-            backup->getNumReadFiles(),
-            backup->getNumReadBytes());
     }
     catch (...)
     {
@@ -586,7 +740,7 @@ void BackupsWorker::doRestore(
         {
             tryLogCurrentException(log, fmt::format("Failed to restore from {} {}", (restore_settings.internal ? "internal backup" : "backup"), backup_name_for_logging));
             setStatusSafe(restore_id, BackupStatus::RESTORE_FAILED);
-            sendCurrentExceptionToCoordination(restore_coordination, restore_settings.host_id);
+            sendCurrentExceptionToCoordination(restore_coordination);
         }
         else
         {
@@ -597,6 +751,80 @@ void BackupsWorker::doRestore(
 }
 
 
+void BackupsWorker::restoreTablesData(const OperationID & restore_id, BackupPtr backup, DataRestoreTasks && tasks, ThreadPool & thread_pool)
+{
+    size_t num_active_jobs = 0;
+    std::mutex mutex;
+    std::condition_variable event;
+    std::exception_ptr exception;
+
+    auto thread_group = CurrentThread::getGroup();
+
+    for (auto & task : tasks)
+    {
+        {
+            std::unique_lock lock{mutex};
+            if (exception)
+                break;
+            ++num_active_jobs;
+        }
+
+        auto job = [&](bool async)
+        {
+            SCOPE_EXIT_SAFE(
+                std::lock_guard lock{mutex};
+                if (!--num_active_jobs)
+                    event.notify_all();
+                if (async)
+                    CurrentThread::detachFromGroupIfNotDetached();
+            );
+
+            try
+            {
+                if (async && thread_group)
+                    CurrentThread::attachToGroup(thread_group);
+
+                if (async)
+                    setThreadName("RestoreWorker");
+
+                {
+                    std::lock_guard lock{mutex};
+                    if (exception)
+                        return;
+                }
+
+                std::move(task)();
+                setNumFilesAndSize(
+                    restore_id,
+                    backup->getNumFiles(),
+                    backup->getTotalSize(),
+                    backup->getNumEntries(),
+                    backup->getUncompressedSize(),
+                    backup->getCompressedSize(),
+                    backup->getNumReadFiles(),
+                    backup->getNumReadBytes());
+            }
+            catch (...)
+            {
+                std::lock_guard lock{mutex};
+                if (!exception)
+                    exception = std::current_exception();
+            }
+        };
+
+        if (!thread_pool.trySchedule([job] { job(true); }))
+            job(false);
+    }
+
+    {
+        std::unique_lock lock{mutex};
+        event.wait(lock, [&] { return !num_active_jobs; });
+        if (exception)
+            std::rethrow_exception(exception);
+    }
+}
+
+
 void BackupsWorker::addInfo(const OperationID & id, const String & name, bool internal, BackupStatus status)
 {
     Info info;
@@ -721,8 +949,8 @@ void BackupsWorker::shutdown()
     if (has_active_backups_and_restores)
         LOG_INFO(log, "Waiting for {} backups and {} restores to be finished", num_active_backups, num_active_restores);
 
-    backups_thread_pool.wait();
-    restores_thread_pool.wait();
+    backups_thread_pool->wait();
+    restores_thread_pool->wait();
 
     if (has_active_backups_and_restores)
         LOG_INFO(log, "All backup and restore tasks have finished");
diff --git a/src/Backups/BackupsWorker.h b/src/Backups/BackupsWorker.h
index 0f5c16cd71f..cbfadc24b7b 100644
--- a/src/Backups/BackupsWorker.h
+++ b/src/Backups/BackupsWorker.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <Backups/BackupStatus.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
+#include <Interpreters/Context_fwd.h>
 #include <Core/UUID.h>
 #include <Parsers/IAST_fwd.h>
 #include <unordered_map>
@@ -17,6 +18,12 @@ struct RestoreSettings;
 struct BackupInfo;
 class IBackupCoordination;
 class IRestoreCoordination;
+class IBackup;
+using BackupMutablePtr = std::shared_ptr<IBackup>;
+using BackupPtr = std::shared_ptr<const IBackup>;
+class IBackupEntry;
+using BackupEntries = std::vector<std::pair<String, std::shared_ptr<const IBackupEntry>>>;
+using DataRestoreTasks = std::vector<std::function<void()>>;
 
 /// Manager of backups and restores: executes backups and restores' threads in the background.
 /// Keeps information about backups and restores started in this session.
@@ -99,6 +106,12 @@ private:
         ContextMutablePtr mutable_context,
         bool called_async);
 
+    /// Builds file infos for specified backup entries.
+    void buildFileInfosForBackupEntries(const BackupPtr & backup, const BackupEntries & backup_entries, std::shared_ptr<IBackupCoordination> backup_coordination);
+
+    /// Write backup entries to an opened backup.
+    void writeBackupEntries(BackupMutablePtr backup, BackupEntries && backup_entries, const OperationID & backup_id, std::shared_ptr<IBackupCoordination> backup_coordination, bool internal);
+
     OperationID startRestoring(const ASTPtr & query, ContextMutablePtr context);
 
     void doRestore(
@@ -111,14 +124,17 @@ private:
         ContextMutablePtr context,
         bool called_async);
 
+    /// Run data restoring tasks which insert data to tables.
+    void restoreTablesData(const OperationID & restore_id, BackupPtr backup, DataRestoreTasks && tasks, ThreadPool & thread_pool);
+
     void addInfo(const OperationID & id, const String & name, bool internal, BackupStatus status);
     void setStatus(const OperationID & id, BackupStatus status, bool throw_if_error = true);
     void setStatusSafe(const String & id, BackupStatus status) { setStatus(id, status, false); }
     void setNumFilesAndSize(const OperationID & id, size_t num_files, UInt64 total_size, size_t num_entries,
                             UInt64 uncompressed_size, UInt64 compressed_size, size_t num_read_files, UInt64 num_read_bytes);
 
-    ThreadPool backups_thread_pool;
-    ThreadPool restores_thread_pool;
+    std::unique_ptr<ThreadPool> backups_thread_pool;
+    std::unique_ptr<ThreadPool> restores_thread_pool;
 
     std::unordered_map<OperationID, Info> infos;
     std::condition_variable status_changed;
diff --git a/src/Backups/IBackup.h b/src/Backups/IBackup.h
index 208305e3f35..660f7d5da22 100644
--- a/src/Backups/IBackup.h
+++ b/src/Backups/IBackup.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <Core/Types.h>
+#include <Disks/WriteMode.h>
+#include <IO/WriteSettings.h>
 #include <memory>
 #include <optional>
 
@@ -9,6 +11,10 @@ namespace DB
 {
 class IBackupEntry;
 using BackupEntryPtr = std::shared_ptr<const IBackupEntry>;
+struct BackupFileInfo;
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+class SeekableReadBuffer;
 
 /// Represents a backup, i.e. a storage of BackupEntries which can be accessed by their names.
 /// A backup can be either incremental or non-incremental. An incremental backup doesn't store
@@ -37,6 +43,9 @@ public:
     /// Returns UUID of the backup.
     virtual UUID getUUID() const = 0;
 
+    /// Returns the base backup (can be null).
+    virtual std::shared_ptr<const IBackup> getBaseBackup() const = 0;
+
     /// Returns the number of files stored in the backup. Compare with getNumEntries().
     virtual size_t getNumFiles() const = 0;
 
@@ -95,11 +104,18 @@ public:
     virtual SizeAndChecksum getFileSizeAndChecksum(const String & file_name) const = 0;
 
     /// Reads an entry from the backup.
-    virtual BackupEntryPtr readFile(const String & file_name) const = 0;
-    virtual BackupEntryPtr readFile(const SizeAndChecksum & size_and_checksum) const = 0;
+    virtual std::unique_ptr<SeekableReadBuffer> readFile(const String & file_name) const = 0;
+    virtual std::unique_ptr<SeekableReadBuffer> readFile(const SizeAndChecksum & size_and_checksum) const = 0;
+
+    /// Copies a file from the backup to a specified destination disk. Returns the number of bytes written.
+    virtual size_t copyFileToDisk(const String & file_name, DiskPtr destination_disk, const String & destination_path,
+                                  WriteMode write_mode = WriteMode::Rewrite) const = 0;
+
+    virtual size_t copyFileToDisk(const SizeAndChecksum & size_and_checksum, DiskPtr destination_disk, const String & destination_path,
+                                  WriteMode write_mode = WriteMode::Rewrite) const = 0;
 
     /// Puts a new entry to the backup.
-    virtual void writeFile(const String & file_name, BackupEntryPtr entry) = 0;
+    virtual void writeFile(const BackupFileInfo & file_info, BackupEntryPtr entry) = 0;
 
     /// Finalizes writing the backup, should be called after all entries have been successfully written.
     virtual void finalizeWriting() = 0;
diff --git a/src/Backups/IBackupCoordination.h b/src/Backups/IBackupCoordination.h
index f5fa01a1530..75d9202374b 100644
--- a/src/Backups/IBackupCoordination.h
+++ b/src/Backups/IBackupCoordination.h
@@ -1,13 +1,15 @@
 #pragma once
 
 #include <Core/Types.h>
-#include <optional>
 
 
 namespace DB
 {
 class Exception;
+struct BackupFileInfo;
+using BackupFileInfos = std::vector<BackupFileInfo>;
 enum class AccessEntityType;
+enum class UserDefinedSQLObjectType;
 
 /// Replicas use this class to coordinate what they're writing to a backup while executing BACKUP ON CLUSTER.
 /// There are two implementation of this interface: BackupCoordinationLocal and BackupCoordinationRemote.
@@ -19,10 +21,10 @@ public:
     virtual ~IBackupCoordination() = default;
 
     /// Sets the current stage and waits for other hosts to come to this stage too.
-    virtual void setStage(const String & current_host, const String & new_stage, const String & message) = 0;
-    virtual void setError(const String & current_host, const Exception & exception) = 0;
-    virtual Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait) = 0;
-    virtual Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait, std::chrono::milliseconds timeout) = 0;
+    virtual void setStage(const String & new_stage, const String & message) = 0;
+    virtual void setError(const Exception & exception) = 0;
+    virtual Strings waitForStage(const String & stage_to_wait) = 0;
+    virtual Strings waitForStage(const String & stage_to_wait, std::chrono::milliseconds timeout) = 0;
 
     struct PartNameAndChecksum
     {
@@ -63,57 +65,21 @@ public:
     virtual Strings getReplicatedDataPaths(const String & table_shared_id) const = 0;
 
     /// Adds a path to access.txt file keeping access entities of a ReplicatedAccessStorage.
-    virtual void addReplicatedAccessFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id, const String & file_path) = 0;
-    virtual Strings getReplicatedAccessFilePaths(const String & access_zk_path, AccessEntityType access_entity_type, const String & host_id) const = 0;
+    virtual void addReplicatedAccessFilePath(const String & access_zk_path, AccessEntityType access_entity_type, const String & file_path) = 0;
+    virtual Strings getReplicatedAccessFilePaths(const String & access_zk_path, AccessEntityType access_entity_type) const = 0;
 
-    struct FileInfo
-    {
-        String file_name;
-
-        UInt64 size = 0;
-        UInt128 checksum{0};
-
-        /// for incremental backups
-        UInt64 base_size = 0;
-        UInt128 base_checksum{0};
-
-        /// Name of the data file.
-        String data_file_name;
-
-        /// Suffix of an archive if the backup is stored as a series of archives.
-        String archive_suffix;
-
-        /// Position in the archive.
-        UInt64 pos_in_archive = static_cast<UInt64>(-1);
-    };
+    /// Adds a path to a directory with user-defined SQL objects inside the backup.
+    virtual void addReplicatedSQLObjectsDir(const String & loader_zk_path, UserDefinedSQLObjectType object_type, const String & dir_path) = 0;
+    virtual Strings getReplicatedSQLObjectsDirs(const String & loader_zk_path, UserDefinedSQLObjectType object_type) const = 0;
 
     /// Adds file information.
     /// If specified checksum+size are new for this IBackupContentsInfo the function sets `is_data_file_required`.
-    virtual void addFileInfo(const FileInfo & file_info, bool & is_data_file_required) = 0;
+    virtual void addFileInfos(BackupFileInfos && file_infos) = 0;
+    virtual BackupFileInfos getFileInfos() const = 0;
+    virtual BackupFileInfos getFileInfosForAllHosts() const = 0;
 
-    void addFileInfo(const FileInfo & file_info)
-    {
-        bool is_data_file_required;
-        addFileInfo(file_info, is_data_file_required);
-    }
-
-    /// Updates some fields (currently only `archive_suffix`) of a stored file's information.
-    virtual void updateFileInfo(const FileInfo & file_info) = 0;
-
-    virtual std::vector<FileInfo> getAllFileInfos() const = 0;
-    virtual Strings listFiles(const String & directory, bool recursive) const = 0;
-    virtual bool hasFiles(const String & directory) const = 0;
-
-    using SizeAndChecksum = std::pair<UInt64, UInt128>;
-
-    virtual std::optional<FileInfo> getFileInfo(const String & file_name) const = 0;
-    virtual std::optional<FileInfo> getFileInfo(const SizeAndChecksum & size_and_checksum) const = 0;
-
-    /// Generates a new archive suffix, e.g. "001", "002", "003", ...
-    virtual String getNextArchiveSuffix() = 0;
-
-    /// Returns the list of all the archive suffixes which were generated.
-    virtual Strings getAllArchiveSuffixes() const = 0;
+    /// Starts writing a specified file, the function returns false if that file is already being written concurrently.
+    virtual bool startWritingFile(size_t data_file_index) = 0;
 
     /// This function is used to check if concurrent backups are running
     /// other than the backup passed to the function
diff --git a/src/Backups/IBackupEntriesLazyBatch.cpp b/src/Backups/IBackupEntriesLazyBatch.cpp
index 78086015e7b..7c6bb891981 100644
--- a/src/Backups/IBackupEntriesLazyBatch.cpp
+++ b/src/Backups/IBackupEntriesLazyBatch.cpp
@@ -17,23 +17,16 @@ class IBackupEntriesLazyBatch::BackupEntryFromBatch : public IBackupEntry
 public:
     BackupEntryFromBatch(const std::shared_ptr<IBackupEntriesLazyBatch> & batch_, size_t index_) : batch(batch_), index(index_) { }
 
+    std::unique_ptr<SeekableReadBuffer> getReadBuffer(const ReadSettings & read_settings) const override { return getInternalBackupEntry()->getReadBuffer(read_settings); }
     UInt64 getSize() const override { return getInternalBackupEntry()->getSize(); }
-    std::optional<UInt128> getChecksum() const override { return getInternalBackupEntry()->getChecksum(); }
-    std::unique_ptr<SeekableReadBuffer> getReadBuffer() const override { return getInternalBackupEntry()->getReadBuffer(); }
-    String getFilePath() const override
-    {
-        return getInternalBackupEntry()->getFilePath();
-    }
-
-    DiskPtr tryGetDiskIfExists() const override
-    {
-        return getInternalBackupEntry()->tryGetDiskIfExists();
-    }
-
-    DataSourceDescription getDataSourceDescription() const override
-    {
-        return getInternalBackupEntry()->getDataSourceDescription();
-    }
+    UInt128 getChecksum() const override { return getInternalBackupEntry()->getChecksum(); }
+    std::optional<UInt128> getPartialChecksum(size_t prefix_length) const override { return getInternalBackupEntry()->getPartialChecksum(prefix_length); }
+    DataSourceDescription getDataSourceDescription() const override { return getInternalBackupEntry()->getDataSourceDescription(); }
+    bool isEncryptedByDisk() const override { return getInternalBackupEntry()->isEncryptedByDisk(); }
+    bool isFromFile() const override { return getInternalBackupEntry()->isFromFile(); }
+    bool isFromImmutableFile() const override { return getInternalBackupEntry()->isFromImmutableFile(); }
+    String getFilePath() const override { return getInternalBackupEntry()->getFilePath(); }
+    DiskPtr getDisk() const override { return getInternalBackupEntry()->getDisk(); }
 
 private:
     BackupEntryPtr getInternalBackupEntry() const
diff --git a/src/Backups/IBackupEntry.h b/src/Backups/IBackupEntry.h
index 2a71a1e9756..7e952e9b568 100644
--- a/src/Backups/IBackupEntry.h
+++ b/src/Backups/IBackupEntry.h
@@ -20,16 +20,24 @@ public:
     /// Returns the size of the data.
     virtual UInt64 getSize() const = 0;
 
-    /// Returns the checksum of the data if it's precalculated.
-    /// Can return nullopt which means the checksum should be calculated from the read buffer.
-    virtual std::optional<UInt128> getChecksum() const { return {}; }
+    /// Returns the checksum of the data.
+    virtual UInt128 getChecksum() const = 0;
+
+    /// Returns a partial checksum, i.e. the checksum calculated for a prefix part of the data.
+    /// Can return nullopt if the partial checksum is too difficult to calculate.
+    virtual std::optional<UInt128> getPartialChecksum(size_t /* prefix_length */) const { return {}; }
 
     /// Returns a read buffer for reading the data.
-    virtual std::unique_ptr<SeekableReadBuffer> getReadBuffer() const = 0;
+    virtual std::unique_ptr<SeekableReadBuffer> getReadBuffer(const ReadSettings & read_settings) const = 0;
 
-    virtual String getFilePath() const = 0;
+    /// Returns true if the data returned by getReadBuffer() is encrypted by an encrypted disk.
+    virtual bool isEncryptedByDisk() const { return false; }
 
-    virtual DiskPtr tryGetDiskIfExists() const = 0;
+    /// Returns information about disk and file if this backup entry is generated from a file.
+    virtual bool isFromFile() const { return false; }
+    virtual bool isFromImmutableFile() const { return false; }
+    virtual String getFilePath() const { return ""; }
+    virtual DiskPtr getDisk() const { return nullptr; }
 
     virtual DataSourceDescription getDataSourceDescription() const = 0;
 };
diff --git a/src/Backups/IRestoreCoordination.h b/src/Backups/IRestoreCoordination.h
index 098d048f6a3..2f9e8d171f6 100644
--- a/src/Backups/IRestoreCoordination.h
+++ b/src/Backups/IRestoreCoordination.h
@@ -6,6 +6,7 @@
 namespace DB
 {
 class Exception;
+enum class UserDefinedSQLObjectType;
 
 /// Replicas use this class to coordinate what they're reading from a backup while executing RESTORE ON CLUSTER.
 /// There are two implementation of this interface: RestoreCoordinationLocal and RestoreCoordinationRemote.
@@ -17,10 +18,10 @@ public:
     virtual ~IRestoreCoordination() = default;
 
     /// Sets the current stage and waits for other hosts to come to this stage too.
-    virtual void setStage(const String & current_host, const String & new_stage, const String & message) = 0;
-    virtual void setError(const String & current_host, const Exception & exception) = 0;
-    virtual Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait) = 0;
-    virtual Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait, std::chrono::milliseconds timeout) = 0;
+    virtual void setStage(const String & new_stage, const String & message) = 0;
+    virtual void setError(const Exception & exception) = 0;
+    virtual Strings waitForStage(const String & stage_to_wait) = 0;
+    virtual Strings waitForStage(const String & stage_to_wait, std::chrono::milliseconds timeout) = 0;
 
     static constexpr const char * kErrorStatus = "error";
 
@@ -35,9 +36,14 @@ public:
     /// The function returns false if this access storage is being already restored by another replica.
     virtual bool acquireReplicatedAccessStorage(const String & access_storage_zk_path) = 0;
 
+    /// Sets that this replica is going to restore replicated user-defined functions.
+    /// The function returns false if user-defined function at a specified zk path are being already restored by another replica.
+    virtual bool acquireReplicatedSQLObjects(const String & loader_zk_path, UserDefinedSQLObjectType object_type) = 0;
+
     /// This function is used to check if concurrent restores are running
     /// other than the restore passed to the function
     virtual bool hasConcurrentRestores(const std::atomic<size_t> & num_active_restores) const = 0;
+
 };
 
 }
diff --git a/src/Backups/RestoreCoordinationLocal.cpp b/src/Backups/RestoreCoordinationLocal.cpp
index 4e908d5d67d..068c4fe7e52 100644
--- a/src/Backups/RestoreCoordinationLocal.cpp
+++ b/src/Backups/RestoreCoordinationLocal.cpp
@@ -1,26 +1,30 @@
 #include <Backups/RestoreCoordinationLocal.h>
+#include <Common/logger_useful.h>
 
 
 namespace DB
 {
 
-RestoreCoordinationLocal::RestoreCoordinationLocal() = default;
+RestoreCoordinationLocal::RestoreCoordinationLocal() : log(&Poco::Logger::get("RestoreCoordinationLocal"))
+{
+}
+
 RestoreCoordinationLocal::~RestoreCoordinationLocal() = default;
 
-void RestoreCoordinationLocal::setStage(const String &, const String &, const String &)
+void RestoreCoordinationLocal::setStage(const String &, const String &)
 {
 }
 
-void RestoreCoordinationLocal::setError(const String &, const Exception &)
+void RestoreCoordinationLocal::setError(const Exception &)
 {
 }
 
-Strings RestoreCoordinationLocal::waitForStage(const Strings &, const String &)
+Strings RestoreCoordinationLocal::waitForStage(const String &)
 {
     return {};
 }
 
-Strings RestoreCoordinationLocal::waitForStage(const Strings &, const String &, std::chrono::milliseconds)
+Strings RestoreCoordinationLocal::waitForStage(const String &, std::chrono::milliseconds)
 {
     return {};
 }
@@ -42,9 +46,19 @@ bool RestoreCoordinationLocal::acquireReplicatedAccessStorage(const String &)
     return true;
 }
 
+bool RestoreCoordinationLocal::acquireReplicatedSQLObjects(const String &, UserDefinedSQLObjectType)
+{
+    return true;
+}
+
 bool RestoreCoordinationLocal::hasConcurrentRestores(const std::atomic<size_t> & num_active_restores) const
 {
-    return (num_active_restores > 1);
+    if (num_active_restores > 1)
+    {
+        LOG_WARNING(log, "Found concurrent backups: num_active_restores={}", num_active_restores);
+        return true;
+    }
+    return false;
 }
 
 }
diff --git a/src/Backups/RestoreCoordinationLocal.h b/src/Backups/RestoreCoordinationLocal.h
index ab9d1ce0a59..e27f0d1ef88 100644
--- a/src/Backups/RestoreCoordinationLocal.h
+++ b/src/Backups/RestoreCoordinationLocal.h
@@ -19,10 +19,10 @@ public:
     ~RestoreCoordinationLocal() override;
 
     /// Sets the current stage and waits for other hosts to come to this stage too.
-    void setStage(const String & current_host, const String & new_stage, const String & message) override;
-    void setError(const String & current_host, const Exception & exception) override;
-    Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait) override;
-    Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait, std::chrono::milliseconds timeout) override;
+    void setStage(const String & new_stage, const String & message) override;
+    void setError(const Exception & exception) override;
+    Strings waitForStage(const String & stage_to_wait) override;
+    Strings waitForStage(const String & stage_to_wait, std::chrono::milliseconds timeout) override;
 
     /// Starts creating a table in a replicated database. Returns false if there is another host which is already creating this table.
     bool acquireCreatingTableInReplicatedDatabase(const String & database_zk_path, const String & table_name) override;
@@ -35,9 +35,15 @@ public:
     /// The function returns false if this access storage is being already restored by another replica.
     bool acquireReplicatedAccessStorage(const String & access_storage_zk_path) override;
 
+    /// Sets that this replica is going to restore replicated user-defined functions.
+    /// The function returns false if user-defined function at a specified zk path are being already restored by another replica.
+    bool acquireReplicatedSQLObjects(const String & loader_zk_path, UserDefinedSQLObjectType object_type) override;
+
     bool hasConcurrentRestores(const std::atomic<size_t> & num_active_restores) const override;
 
 private:
+    Poco::Logger * const log;
+
     std::set<std::pair<String /* database_zk_path */, String /* table_name */>> acquired_tables_in_replicated_databases;
     std::unordered_set<String /* table_zk_path */> acquired_data_in_replicated_tables;
     mutable std::mutex mutex;
diff --git a/src/Backups/RestoreCoordinationRemote.cpp b/src/Backups/RestoreCoordinationRemote.cpp
index f829cd20c0d..f95969b52a1 100644
--- a/src/Backups/RestoreCoordinationRemote.cpp
+++ b/src/Backups/RestoreCoordinationRemote.cpp
@@ -1,8 +1,11 @@
+#include <Backups/BackupCoordinationRemote.h>
+#include <Backups/BackupCoordinationStage.h>
 #include <Backups/RestoreCoordinationRemote.h>
+#include <Backups/BackupCoordinationStageSync.h>
+#include <Functions/UserDefined/UserDefinedSQLObjectType.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/escapeForFileName.h>
-#include <Backups/BackupCoordinationStage.h>
-#include <Backups/BackupCoordinationRemote.h>
+
 
 namespace DB
 {
@@ -10,17 +13,49 @@ namespace DB
 namespace Stage = BackupCoordinationStage;
 
 RestoreCoordinationRemote::RestoreCoordinationRemote(
-    const String & root_zookeeper_path_, const String & restore_uuid_, zkutil::GetZooKeeper get_zookeeper_, bool is_internal_)
-    : root_zookeeper_path(root_zookeeper_path_)
-    , zookeeper_path(root_zookeeper_path_ + "/restore-" + restore_uuid_)
+    zkutil::GetZooKeeper get_zookeeper_,
+    const String & root_zookeeper_path_,
+    const RestoreKeeperSettings & keeper_settings_,
+    const String & restore_uuid_,
+    const Strings & all_hosts_,
+    const String & current_host_,
+    bool is_internal_)
+    : get_zookeeper(get_zookeeper_)
+    , root_zookeeper_path(root_zookeeper_path_)
+    , keeper_settings(keeper_settings_)
     , restore_uuid(restore_uuid_)
-    , get_zookeeper(get_zookeeper_)
+    , zookeeper_path(root_zookeeper_path_ + "/restore-" + restore_uuid_)
+    , all_hosts(all_hosts_)
+    , current_host(current_host_)
+    , current_host_index(BackupCoordinationRemote::findCurrentHostIndex(all_hosts, current_host))
     , is_internal(is_internal_)
+    , log(&Poco::Logger::get("RestoreCoordinationRemote"))
+    , with_retries(
+        log,
+        get_zookeeper_,
+        keeper_settings,
+        [my_zookeeper_path = zookeeper_path, my_current_host = current_host, my_is_internal = is_internal]
+        (WithRetries::FaultyKeeper & zk)
+        {
+            /// Recreate this ephemeral node to signal that we are alive.
+            if (my_is_internal)
+            {
+                String alive_node_path = my_zookeeper_path + "/stage/alive|" + my_current_host;
+                auto code = zk->tryCreate(alive_node_path, "", zkutil::CreateMode::Ephemeral);
+
+                if (code == Coordination::Error::ZNODEEXISTS)
+                    zk->handleEphemeralNodeExistenceNoFailureInjection(alive_node_path, "");
+                else if (code != Coordination::Error::ZOK)
+                    throw zkutil::KeeperException(code, alive_node_path);
+            }
+        })
 {
     createRootNodes();
 
     stage_sync.emplace(
-        zookeeper_path + "/stage", [this] { return getZooKeeper(); }, &Poco::Logger::get("RestoreCoordination"));
+        zookeeper_path,
+        with_retries,
+        log);
 }
 
 RestoreCoordinationRemote::~RestoreCoordinationRemote()
@@ -36,89 +71,164 @@ RestoreCoordinationRemote::~RestoreCoordinationRemote()
     }
 }
 
-zkutil::ZooKeeperPtr RestoreCoordinationRemote::getZooKeeper() const
-{
-    std::lock_guard lock{mutex};
-    if (!zookeeper || zookeeper->expired())
-    {
-        zookeeper = get_zookeeper();
-
-        /// It's possible that we connected to different [Zoo]Keeper instance
-        /// so we may read a bit stale state.
-        zookeeper->sync(zookeeper_path);
-    }
-    return zookeeper;
-}
-
 void RestoreCoordinationRemote::createRootNodes()
 {
-    auto zk = getZooKeeper();
-    zk->createAncestors(zookeeper_path);
-    zk->createIfNotExists(zookeeper_path, "");
-    zk->createIfNotExists(zookeeper_path + "/repl_databases_tables_acquired", "");
-    zk->createIfNotExists(zookeeper_path + "/repl_tables_data_acquired", "");
-    zk->createIfNotExists(zookeeper_path + "/repl_access_storages_acquired", "");
+    auto holder = with_retries.createRetriesControlHolder("createRootNodes");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
+            zk->createAncestors(zookeeper_path);
+
+            Coordination::Requests ops;
+            Coordination::Responses responses;
+            ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path, "", zkutil::CreateMode::Persistent));
+            ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/repl_databases_tables_acquired", "", zkutil::CreateMode::Persistent));
+            ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/repl_tables_data_acquired", "", zkutil::CreateMode::Persistent));
+            ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/repl_access_storages_acquired", "", zkutil::CreateMode::Persistent));
+            ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/repl_sql_objects_acquired", "", zkutil::CreateMode::Persistent));
+            zk->tryMulti(ops, responses);
+        });
 }
 
-
-void RestoreCoordinationRemote::setStage(const String & current_host, const String & new_stage, const String & message)
+void RestoreCoordinationRemote::setStage(const String & new_stage, const String & message)
 {
-    stage_sync->set(current_host, new_stage, message);
+    if (is_internal)
+        stage_sync->set(current_host, new_stage, message);
+    else
+        stage_sync->set(current_host, new_stage, /* message */ "", /* all_hosts */ true);
 }
 
-void RestoreCoordinationRemote::setError(const String & current_host, const Exception & exception)
+void RestoreCoordinationRemote::setError(const Exception & exception)
 {
     stage_sync->setError(current_host, exception);
 }
 
-Strings RestoreCoordinationRemote::waitForStage(const Strings & all_hosts, const String & stage_to_wait)
+Strings RestoreCoordinationRemote::waitForStage(const String & stage_to_wait)
 {
     return stage_sync->wait(all_hosts, stage_to_wait);
 }
 
-Strings RestoreCoordinationRemote::waitForStage(const Strings & all_hosts, const String & stage_to_wait, std::chrono::milliseconds timeout)
+Strings RestoreCoordinationRemote::waitForStage(const String & stage_to_wait, std::chrono::milliseconds timeout)
 {
     return stage_sync->waitFor(all_hosts, stage_to_wait, timeout);
 }
 
-
 bool RestoreCoordinationRemote::acquireCreatingTableInReplicatedDatabase(const String & database_zk_path, const String & table_name)
 {
-    auto zk = getZooKeeper();
+    bool result = false;
+    auto holder = with_retries.createRetriesControlHolder("acquireCreatingTableInReplicatedDatabase");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
 
-    String path = zookeeper_path + "/repl_databases_tables_acquired/" + escapeForFileName(database_zk_path);
-    zk->createIfNotExists(path, "");
+            String path = zookeeper_path + "/repl_databases_tables_acquired/" + escapeForFileName(database_zk_path);
+            zk->createIfNotExists(path, "");
 
-    path += "/" + escapeForFileName(table_name);
-    auto code = zk->tryCreate(path, "", zkutil::CreateMode::Persistent);
-    if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNODEEXISTS))
-        throw zkutil::KeeperException(code, path);
+            path += "/" + escapeForFileName(table_name);
+            auto code = zk->tryCreate(path, toString(current_host_index), zkutil::CreateMode::Persistent);
+            if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNODEEXISTS))
+                throw zkutil::KeeperException(code, path);
 
-    return (code == Coordination::Error::ZOK);
+            if (code == Coordination::Error::ZOK)
+            {
+                result = true;
+                return;
+            }
+
+            /// We need to check who created that node
+            result = zk->get(path) == toString(current_host_index);
+        });
+    return result;
 }
 
 bool RestoreCoordinationRemote::acquireInsertingDataIntoReplicatedTable(const String & table_zk_path)
 {
-    auto zk = getZooKeeper();
+    bool result = false;
+    auto holder = with_retries.createRetriesControlHolder("acquireInsertingDataIntoReplicatedTable");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
 
-    String path = zookeeper_path + "/repl_tables_data_acquired/" + escapeForFileName(table_zk_path);
-    auto code = zk->tryCreate(path, "", zkutil::CreateMode::Persistent);
-    if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNODEEXISTS))
-        throw zkutil::KeeperException(code, path);
+            String path = zookeeper_path + "/repl_tables_data_acquired/" + escapeForFileName(table_zk_path);
+            auto code = zk->tryCreate(path, toString(current_host_index), zkutil::CreateMode::Persistent);
+            if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNODEEXISTS))
+                throw zkutil::KeeperException(code, path);
 
-    return (code == Coordination::Error::ZOK);
+            if (code == Coordination::Error::ZOK)
+            {
+                result = true;
+                return;
+            }
+
+            /// We need to check who created that node
+            result = zk->get(path) == toString(current_host_index);
+        });
+    return result;
 }
 
 bool RestoreCoordinationRemote::acquireReplicatedAccessStorage(const String & access_storage_zk_path)
 {
-    auto zk = getZooKeeper();
+    bool result = false;
+    auto holder = with_retries.createRetriesControlHolder("acquireReplicatedAccessStorage");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
 
-    String path = zookeeper_path + "/repl_access_storages_acquired/" + escapeForFileName(access_storage_zk_path);
-    auto code = zk->tryCreate(path, "", zkutil::CreateMode::Persistent);
-    if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNODEEXISTS))
-        throw zkutil::KeeperException(code, path);
+            String path = zookeeper_path + "/repl_access_storages_acquired/" + escapeForFileName(access_storage_zk_path);
+            auto code = zk->tryCreate(path, toString(current_host_index), zkutil::CreateMode::Persistent);
+            if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNODEEXISTS))
+                throw zkutil::KeeperException(code, path);
 
-    return (code == Coordination::Error::ZOK);
+            if (code == Coordination::Error::ZOK)
+            {
+                result = true;
+                return;
+            }
+
+            /// We need to check who created that node
+            result = zk->get(path) == toString(current_host_index);
+        });
+    return result;
+}
+
+bool RestoreCoordinationRemote::acquireReplicatedSQLObjects(const String & loader_zk_path, UserDefinedSQLObjectType object_type)
+{
+    bool result = false;
+    auto holder = with_retries.createRetriesControlHolder("acquireReplicatedSQLObjects");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
+
+            String path = zookeeper_path + "/repl_sql_objects_acquired/" + escapeForFileName(loader_zk_path);
+            zk->createIfNotExists(path, "");
+
+            path += "/";
+            switch (object_type)
+            {
+                case UserDefinedSQLObjectType::Function:
+                    path += "functions";
+                    break;
+            }
+
+            auto code = zk->tryCreate(path, "", zkutil::CreateMode::Persistent);
+            if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNODEEXISTS))
+                throw zkutil::KeeperException(code, path);
+
+            if (code == Coordination::Error::ZOK)
+            {
+                result = true;
+                return;
+            }
+
+            /// We need to check who created that node
+            result =  zk->get(path) == toString(current_host_index);
+        });
+    return result;
 }
 
 void RestoreCoordinationRemote::removeAllNodes()
@@ -130,8 +240,13 @@ void RestoreCoordinationRemote::removeAllNodes()
     /// at `zookeeper_path` which might cause such hosts to stop with exception "ZNONODE". Or such hosts might still do some part
     /// of their restore work before that.
 
-    auto zk = getZooKeeper();
-    zk->removeRecursive(zookeeper_path);
+    auto holder = with_retries.createRetriesControlHolder("removeAllNodes");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
+        {
+            with_retries.renewZooKeeper(zk);
+            zk->removeRecursive(zookeeper_path);
+        });
 }
 
 bool RestoreCoordinationRemote::hasConcurrentRestores(const std::atomic<size_t> &) const
@@ -140,43 +255,58 @@ bool RestoreCoordinationRemote::hasConcurrentRestores(const std::atomic<size_t>
     if (is_internal)
         return false;
 
-    auto zk = getZooKeeper();
+    bool result = false;
     std::string path = zookeeper_path +"/stage";
 
-    if (! zk->exists(root_zookeeper_path))
-        zk->createAncestors(root_zookeeper_path);
-
-    for (size_t attempt = 0; attempt < MAX_ZOOKEEPER_ATTEMPTS; ++attempt)
-    {
-        Coordination::Stat stat;
-        zk->get(root_zookeeper_path, &stat);
-        Strings existing_restore_paths = zk->getChildren(root_zookeeper_path);
-        for (const auto & existing_restore_path : existing_restore_paths)
+    auto holder = with_retries.createRetriesControlHolder("createRootNodes");
+    holder.retries_ctl.retryLoop(
+        [&, &zk = holder.faulty_zookeeper]()
         {
-            if (startsWith(existing_restore_path, "backup-"))
-                continue;
+            with_retries.renewZooKeeper(zk);
 
-            String existing_restore_uuid = existing_restore_path;
-            existing_restore_uuid.erase(0, String("restore-").size());
+            if (! zk->exists(root_zookeeper_path))
+                zk->createAncestors(root_zookeeper_path);
 
-            if (existing_restore_uuid == toString(restore_uuid))
-                continue;
+            for (size_t attempt = 0; attempt < MAX_ZOOKEEPER_ATTEMPTS; ++attempt)
+            {
+                Coordination::Stat stat;
+                zk->get(root_zookeeper_path, &stat);
+                Strings existing_restore_paths = zk->getChildren(root_zookeeper_path);
+                for (const auto & existing_restore_path : existing_restore_paths)
+                {
+                    if (startsWith(existing_restore_path, "backup-"))
+                        continue;
 
+                    String existing_restore_uuid = existing_restore_path;
+                    existing_restore_uuid.erase(0, String("restore-").size());
 
-            const auto status = zk->get(root_zookeeper_path + "/" + existing_restore_path + "/stage");
-            if (status != Stage::COMPLETED)
-                return true;
-        }
+                    if (existing_restore_uuid == toString(restore_uuid))
+                        continue;
 
-        zk->createIfNotExists(path, "");
-        auto code = zk->trySet(path, Stage::SCHEDULED_TO_START, stat.version);
-        if (code == Coordination::Error::ZOK)
-            break;
-        bool is_last_attempt = (attempt == MAX_ZOOKEEPER_ATTEMPTS - 1);
-        if ((code != Coordination::Error::ZBADVERSION) || is_last_attempt)
-            throw zkutil::KeeperException(code, path);
-    }
-    return false;
+                    String status;
+                    if (zk->tryGet(root_zookeeper_path + "/" + existing_restore_path + "/stage", status))
+                    {
+                        /// Check if some other restore is in progress
+                        if (status == Stage::SCHEDULED_TO_START)
+                        {
+                            LOG_WARNING(log, "Found a concurrent restore: {}, current restore: {}", existing_restore_uuid, toString(restore_uuid));
+                            result = true;
+                            return;
+                        }
+                    }
+                }
+
+                zk->createIfNotExists(path, "");
+                auto code = zk->trySet(path, Stage::SCHEDULED_TO_START, stat.version);
+                if (code == Coordination::Error::ZOK)
+                    break;
+                bool is_last_attempt = (attempt == MAX_ZOOKEEPER_ATTEMPTS - 1);
+                if ((code != Coordination::Error::ZBADVERSION) || is_last_attempt)
+                    throw zkutil::KeeperException(code, path);
+            }
+        });
+
+    return result;
 }
 
 }
diff --git a/src/Backups/RestoreCoordinationRemote.h b/src/Backups/RestoreCoordinationRemote.h
index d72781bac2f..eb0fcff9c2d 100644
--- a/src/Backups/RestoreCoordinationRemote.h
+++ b/src/Backups/RestoreCoordinationRemote.h
@@ -2,6 +2,7 @@
 
 #include <Backups/IRestoreCoordination.h>
 #include <Backups/BackupCoordinationStageSync.h>
+#include <Backups/WithRetries.h>
 
 
 namespace DB
@@ -11,14 +12,24 @@ namespace DB
 class RestoreCoordinationRemote : public IRestoreCoordination
 {
 public:
-    RestoreCoordinationRemote(const String & root_zookeeper_path_, const String & restore_uuid_, zkutil::GetZooKeeper get_zookeeper_, bool is_internal_);
+    using RestoreKeeperSettings = WithRetries::KeeperSettings;
+
+    RestoreCoordinationRemote(
+        zkutil::GetZooKeeper get_zookeeper_,
+        const String & root_zookeeper_path_,
+        const RestoreKeeperSettings & keeper_settings_,
+        const String & restore_uuid_,
+        const Strings & all_hosts_,
+        const String & current_host_,
+        bool is_internal_);
+
     ~RestoreCoordinationRemote() override;
 
     /// Sets the current stage and waits for other hosts to come to this stage too.
-    void setStage(const String & current_host, const String & new_stage, const String & message) override;
-    void setError(const String & current_host, const Exception & exception) override;
-    Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait) override;
-    Strings waitForStage(const Strings & all_hosts, const String & stage_to_wait, std::chrono::milliseconds timeout) override;
+    void setStage(const String & new_stage, const String & message) override;
+    void setError(const Exception & exception) override;
+    Strings waitForStage(const String & stage_to_wait) override;
+    Strings waitForStage(const String & stage_to_wait, std::chrono::milliseconds timeout) override;
 
     /// Starts creating a table in a replicated database. Returns false if there is another host which is already creating this table.
     bool acquireCreatingTableInReplicatedDatabase(const String & database_zk_path, const String & table_name) override;
@@ -31,25 +42,33 @@ public:
     /// The function returns false if this access storage is being already restored by another replica.
     bool acquireReplicatedAccessStorage(const String & access_storage_zk_path) override;
 
+    /// Sets that this replica is going to restore replicated user-defined functions.
+    /// The function returns false if user-defined function at a specified zk path are being already restored by another replica.
+    bool acquireReplicatedSQLObjects(const String & loader_zk_path, UserDefinedSQLObjectType object_type) override;
+
     bool hasConcurrentRestores(const std::atomic<size_t> & num_active_restores) const override;
 
 private:
-    zkutil::ZooKeeperPtr getZooKeeper() const;
     void createRootNodes();
     void removeAllNodes();
 
     class ReplicatedDatabasesMetadataSync;
 
-    const String root_zookeeper_path;
-    const String zookeeper_path;
-    const String restore_uuid;
+    /// get_zookeeper will provide a zookeeper client without any fault injection
     const zkutil::GetZooKeeper get_zookeeper;
+    const String root_zookeeper_path;
+    const RestoreKeeperSettings keeper_settings;
+    const String restore_uuid;
+    const String zookeeper_path;
+    const Strings all_hosts;
+    const String current_host;
+    const size_t current_host_index;
     const bool is_internal;
+    Poco::Logger * const log;
 
+    mutable WithRetries with_retries;
     std::optional<BackupCoordinationStageSync> stage_sync;
-
     mutable std::mutex mutex;
-    mutable zkutil::ZooKeeperPtr zookeeper;
 };
 
 }
diff --git a/src/Backups/RestorerFromBackup.cpp b/src/Backups/RestorerFromBackup.cpp
index b19cbaf975c..7981cc2f19f 100644
--- a/src/Backups/RestorerFromBackup.cpp
+++ b/src/Backups/RestorerFromBackup.cpp
@@ -19,8 +19,8 @@
 #include <Databases/IDatabase.h>
 #include <Databases/DDLDependencyVisitor.h>
 #include <Storages/IStorage.h>
-#include <Common/escapeForFileName.h>
 #include <Common/quoteString.h>
+#include <Common/escapeForFileName.h>
 #include <base/insertAtEnd.h>
 #include <boost/algorithm/string/join.hpp>
 #include <filesystem>
@@ -150,11 +150,11 @@ void RestorerFromBackup::setStage(const String & new_stage, const String & messa
 
     if (restore_coordination)
     {
-        restore_coordination->setStage(restore_settings.host_id, new_stage, message);
+        restore_coordination->setStage(new_stage, message);
         if (new_stage == Stage::FINDING_TABLES_IN_BACKUP)
-            restore_coordination->waitForStage(all_hosts, new_stage, on_cluster_first_sync_timeout);
+            restore_coordination->waitForStage(new_stage, on_cluster_first_sync_timeout);
         else
-            restore_coordination->waitForStage(all_hosts, new_stage);
+            restore_coordination->waitForStage(new_stage);
     }
 }
 
@@ -316,7 +316,7 @@ void RestorerFromBackup::findTableInBackup(const QualifiedTableName & table_name
             = *root_path_in_use / "data" / escapeForFileName(table_name_in_backup.database) / escapeForFileName(table_name_in_backup.table);
     }
 
-    auto read_buffer = backup->readFile(*metadata_path)->getReadBuffer();
+    auto read_buffer = backup->readFile(*metadata_path);
     String create_query_str;
     readStringUntilEOF(create_query_str, *read_buffer);
     read_buffer.reset();
@@ -410,7 +410,7 @@ void RestorerFromBackup::findDatabaseInBackup(const String & database_name_in_ba
 
     if (metadata_path)
     {
-        auto read_buffer = backup->readFile(*metadata_path)->getReadBuffer();
+        auto read_buffer = backup->readFile(*metadata_path);
         String create_query_str;
         readStringUntilEOF(create_query_str, *read_buffer);
         read_buffer.reset();
diff --git a/src/Backups/WithRetries.cpp b/src/Backups/WithRetries.cpp
new file mode 100644
index 00000000000..0893c65d8fd
--- /dev/null
+++ b/src/Backups/WithRetries.cpp
@@ -0,0 +1,61 @@
+#include <mutex>
+#include <Backups/WithRetries.h>
+
+namespace DB
+{
+
+
+WithRetries::WithRetries(Poco::Logger * log_, zkutil::GetZooKeeper get_zookeeper_, const KeeperSettings & settings_, RenewerCallback callback_)
+    : log(log_)
+    , get_zookeeper(get_zookeeper_)
+    , settings(settings_)
+    , callback(callback_)
+    , global_zookeeper_retries_info(
+        log->name(),
+        log,
+        settings.keeper_max_retries,
+        settings.keeper_retry_initial_backoff_ms,
+        settings.keeper_retry_max_backoff_ms)
+{}
+
+WithRetries::RetriesControlHolder::RetriesControlHolder(const WithRetries * parent, const String & name)
+    : info(parent->global_zookeeper_retries_info)
+    , retries_ctl(name, info, nullptr)
+    , faulty_zookeeper(parent->getFaultyZooKeeper())
+{}
+
+WithRetries::RetriesControlHolder WithRetries::createRetriesControlHolder(const String & name)
+{
+    return RetriesControlHolder(this, name);
+}
+
+void WithRetries::renewZooKeeper(FaultyKeeper my_faulty_zookeeper) const
+{
+    std::lock_guard lock(zookeeper_mutex);
+
+    if (!zookeeper || zookeeper->expired())
+    {
+        zookeeper = get_zookeeper();
+        my_faulty_zookeeper->setKeeper(zookeeper);
+
+        callback(my_faulty_zookeeper);
+    }
+}
+
+WithRetries::FaultyKeeper WithRetries::getFaultyZooKeeper() const
+{
+    /// We need to create new instance of ZooKeeperWithFaultInjection each time a copy a pointer to ZooKeeper client there
+    /// The reason is that ZooKeeperWithFaultInjection may reset the underlying pointer and there could be a race condition
+    /// when the same object is used from multiple threads.
+    auto faulty_zookeeper = ZooKeeperWithFaultInjection::createInstance(
+        settings.keeper_fault_injection_probability,
+        settings.keeper_fault_injection_seed,
+        zookeeper,
+        log->name(),
+        log);
+
+    return faulty_zookeeper;
+}
+
+
+}
diff --git a/src/Backups/WithRetries.h b/src/Backups/WithRetries.h
new file mode 100644
index 00000000000..3955682be94
--- /dev/null
+++ b/src/Backups/WithRetries.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include <Storages/MergeTree/ZooKeeperRetries.h>
+#include <Common/ZooKeeper/Common.h>
+#include <Common/ZooKeeper/ZooKeeperWithFaultInjection.h>
+
+namespace DB
+{
+
+/// In backups every request to [Zoo]Keeper should be retryable
+/// and this tiny class encapsulates all the machinery for make it possible -
+/// a [Zoo]Keeper client which injects faults with configurable probability
+/// and a retries controller which performs retries with growing backoff.
+class WithRetries
+{
+public:
+    using FaultyKeeper = Coordination::ZooKeeperWithFaultInjection::Ptr;
+    using RenewerCallback = std::function<void(FaultyKeeper &)>;
+
+    struct KeeperSettings
+    {
+        UInt64 keeper_max_retries{0};
+        UInt64 keeper_retry_initial_backoff_ms{0};
+        UInt64 keeper_retry_max_backoff_ms{0};
+        UInt64 batch_size_for_keeper_multiread{10000};
+        Float64 keeper_fault_injection_probability{0};
+        UInt64 keeper_fault_injection_seed{42};
+        UInt64 keeper_value_max_size{1048576};
+    };
+
+    /// For simplicity a separate ZooKeeperRetriesInfo and a faulty [Zoo]Keeper client
+    /// are stored in one place.
+    /// This helps to avoid writing too much boilerplate each time we need to
+    /// execute some operation (a set of requests) over [Zoo]Keeper with retries.
+    /// Why ZooKeeperRetriesInfo is separate for each operation?
+    /// The reason is that backup usually takes long time to finish and it makes no sense
+    /// to limit the overall number of retries (for example 1000) for the whole backup
+    /// and have a continuously growing backoff.
+    class RetriesControlHolder
+    {
+    public:
+        ZooKeeperRetriesInfo info;
+        ZooKeeperRetriesControl retries_ctl;
+        FaultyKeeper faulty_zookeeper;
+
+    private:
+        friend class WithRetries;
+        RetriesControlHolder(const WithRetries * parent, const String & name);
+    };
+
+    RetriesControlHolder createRetriesControlHolder(const String & name);
+    WithRetries(Poco::Logger * log, zkutil::GetZooKeeper get_zookeeper_, const KeeperSettings & settings, RenewerCallback callback);
+
+    /// Used to re-establish new connection inside a retry loop.
+    void renewZooKeeper(FaultyKeeper my_faulty_zookeeper) const;
+private:
+    /// This will provide a special wrapper which is useful for testing
+    FaultyKeeper getFaultyZooKeeper() const;
+
+    Poco::Logger * log;
+    zkutil::GetZooKeeper get_zookeeper;
+    KeeperSettings settings;
+    /// This callback is called each time when a new [Zoo]Keeper session is created.
+    /// In backups it is primarily used to re-create an ephemeral node to signal the coordinator
+    /// that the host is alive and able to continue writing the backup.
+    /// Coordinator (or an initiator) of the backup also retries when it doesn't find an ephemeral node
+    /// for a particular host.
+    /// Again, this schema is not ideal. False-positives are still possible, but in worst case scenario
+    /// it could lead just to a failed backup which could possibly be successful
+    /// if there were a little bit more retries.
+    RenewerCallback callback;
+    ZooKeeperRetriesInfo global_zookeeper_retries_info;
+
+    /// This is needed only to protect zookeeper object
+    mutable std::mutex zookeeper_mutex;
+    mutable zkutil::ZooKeeperPtr zookeeper;
+};
+
+}
diff --git a/src/Backups/registerBackupEnginesFileAndDisk.cpp b/src/Backups/registerBackupEnginesFileAndDisk.cpp
index 020da13d6e1..daae9627759 100644
--- a/src/Backups/registerBackupEnginesFileAndDisk.cpp
+++ b/src/Backups/registerBackupEnginesFileAndDisk.cpp
@@ -41,7 +41,7 @@ namespace
             key = "backups.allowed_disk[" + std::to_string(++counter) + "]";
             if (!config.has(key))
                 throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                "Disk {} is not allowed for backups, see the 'backups.allowed_disk' configuration parameter", quoteString(disk_name));
+                                "Disk '{}' is not allowed for backups, see the 'backups.allowed_disk' configuration parameter", quoteString(disk_name));
         }
     }
 
@@ -54,7 +54,7 @@ namespace
 
         bool path_ok = path.empty() || (path.is_relative() && (*path.begin() != ".."));
         if (!path_ok)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Path {} to backup must be inside the specified disk {}",
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Path '{}' to backup must be inside the specified disk '{}'",
                             quoteString(path.c_str()), quoteString(disk_name));
     }
 
@@ -169,18 +169,18 @@ void registerBackupEnginesFileAndDisk(BackupFactory & factory)
         {
             std::shared_ptr<IBackupReader> reader;
             if (engine_name == "File")
-                reader = std::make_shared<BackupReaderFile>(path);
+                reader = std::make_shared<BackupReaderFile>(path, params.context);
             else
-                reader = std::make_shared<BackupReaderDisk>(disk, path);
+                reader = std::make_shared<BackupReaderDisk>(disk, path, params.context);
             return std::make_unique<BackupImpl>(backup_name_for_logging, archive_params, params.base_backup_info, reader, params.context);
         }
         else
         {
             std::shared_ptr<IBackupWriter> writer;
             if (engine_name == "File")
-                writer = std::make_shared<BackupWriterFile>(path);
+                writer = std::make_shared<BackupWriterFile>(path, params.context);
             else
-                writer = std::make_shared<BackupWriterDisk>(disk, path);
+                writer = std::make_shared<BackupWriterDisk>(disk, path, params.context);
             return std::make_unique<BackupImpl>(
                 backup_name_for_logging,
                 archive_params,
diff --git a/src/Backups/tests/gtest_backup_entries.cpp b/src/Backups/tests/gtest_backup_entries.cpp
new file mode 100644
index 00000000000..3077bedad0e
--- /dev/null
+++ b/src/Backups/tests/gtest_backup_entries.cpp
@@ -0,0 +1,350 @@
+#include <gtest/gtest.h>
+
+#include <Backups/BackupEntryFromAppendOnlyFile.h>
+#include <Backups/BackupEntryFromImmutableFile.h>
+#include <Backups/BackupEntryFromSmallFile.h>
+
+#include <Disks/IDisk.h>
+#include <Disks/DiskLocal.h>
+#include <Disks/DiskEncrypted.h>
+#include <IO/FileEncryptionCommon.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+#include <Poco/TemporaryFile.h>
+
+using namespace DB;
+
+
+class BackupEntriesTest : public ::testing::Test
+{
+protected:
+    void SetUp() override
+    {
+        /// Make local disk.
+        temp_dir = std::make_unique<Poco::TemporaryFile>();
+        temp_dir->createDirectories();
+        local_disk = std::make_shared<DiskLocal>("local_disk", temp_dir->path() + "/", 0);
+
+        /// Make encrypted disk.
+        auto settings = std::make_unique<DiskEncryptedSettings>();
+        settings->wrapped_disk = local_disk;
+        settings->current_algorithm = FileEncryption::Algorithm::AES_128_CTR;
+        settings->keys[0] = "1234567890123456";
+        settings->current_key_id = 0;
+        settings->disk_path = "encrypted/";
+        encrypted_disk = std::make_shared<DiskEncrypted>("encrypted_disk", std::move(settings), true);
+    }
+
+    void TearDown() override
+    {
+        encrypted_disk.reset();
+        local_disk.reset();
+    }
+
+    static void writeFile(DiskPtr disk, const String & filepath)
+    {
+        auto buf = disk->writeFile(filepath, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite, {});
+        writeString(std::string_view{"Some text"}, *buf);
+        buf->finalize();
+    }
+
+    static void writeEmptyFile(DiskPtr disk, const String & filepath)
+    {
+        auto buf = disk->writeFile(filepath, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite, {});
+        buf->finalize();
+    }
+
+    static void appendFile(DiskPtr disk, const String & filepath)
+    {
+        auto buf = disk->writeFile(filepath, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append, {});
+        writeString(std::string_view{"Appended"}, *buf);
+        buf->finalize();
+    }
+
+    static String getChecksum(const BackupEntryPtr & backup_entry)
+    {
+        return getHexUIntUppercase(backup_entry->getChecksum());
+    }
+
+    static const constexpr std::string_view NO_CHECKSUM = "no checksum";
+
+    static String getPartialChecksum(const BackupEntryPtr & backup_entry, size_t prefix_length)
+    {
+        auto partial_checksum = backup_entry->getPartialChecksum(prefix_length);
+        if (!partial_checksum)
+            return String{NO_CHECKSUM};
+        return getHexUIntUppercase(*partial_checksum);
+    }
+
+    static String readAll(const BackupEntryPtr & backup_entry)
+    {
+        auto in = backup_entry->getReadBuffer({});
+        String str;
+        readStringUntilEOF(str, *in);
+        return str;
+    }
+
+    std::unique_ptr<Poco::TemporaryFile> temp_dir;
+    std::shared_ptr<DiskLocal> local_disk;
+    std::shared_ptr<DiskEncrypted> encrypted_disk;
+};
+
+
+static const constexpr std::string_view ZERO_CHECKSUM = "00000000000000000000000000000000";
+
+static const constexpr std::string_view SOME_TEXT_CHECKSUM = "28B5529750AC210952FFD366774363ED";
+static const constexpr std::string_view S_CHECKSUM = "C27395C39AFB5557BFE47661CC9EB86C";
+static const constexpr std::string_view SOME_TEX_CHECKSUM = "D00D9BE8D87919A165F14EDD31088A0E";
+static const constexpr std::string_view SOME_TEXT_APPENDED_CHECKSUM = "5A1F10F638DC7A226231F3FD927D1726";
+
+static const constexpr std::string_view PRECALCULATED_CHECKSUM = "1122334455667788AABBCCDDAABBCCDD";
+static const constexpr UInt128 PRECALCULATED_CHECKSUM_UINT128 = (UInt128(0x1122334455667788) << 64) | 0xAABBCCDDAABBCCDD;
+static const size_t PRECALCULATED_SIZE = 123;
+
+TEST_F(BackupEntriesTest, BackupEntryFromImmutableFile)
+{
+    writeFile(local_disk, "a.txt");
+
+    auto entry = std::make_shared<BackupEntryFromImmutableFile>(local_disk, "a.txt");
+    EXPECT_EQ(entry->getSize(), 9);
+    EXPECT_EQ(getChecksum(entry), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 0), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 1), NO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 8), NO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 9), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 1000), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(readAll(entry), "Some text");
+
+    writeEmptyFile(local_disk, "empty.txt");
+
+    auto empty_entry = std::make_shared<BackupEntryFromImmutableFile>(local_disk, "empty.txt");
+    EXPECT_EQ(empty_entry->getSize(), 0);
+    EXPECT_EQ(getChecksum(empty_entry), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(empty_entry, 0), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(empty_entry, 1), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(empty_entry, 1000), ZERO_CHECKSUM);
+    EXPECT_EQ(readAll(empty_entry), "");
+
+    auto precalculated_entry = std::make_shared<BackupEntryFromImmutableFile>(local_disk, "a.txt", false, PRECALCULATED_SIZE, PRECALCULATED_CHECKSUM_UINT128);
+    EXPECT_EQ(precalculated_entry->getSize(), PRECALCULATED_SIZE);
+
+    EXPECT_EQ(getChecksum(precalculated_entry), PRECALCULATED_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(precalculated_entry, 0), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(precalculated_entry, 1), NO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(precalculated_entry, PRECALCULATED_SIZE - 1), NO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(precalculated_entry, PRECALCULATED_SIZE), PRECALCULATED_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(precalculated_entry, 1000), PRECALCULATED_CHECKSUM);
+    EXPECT_EQ(readAll(precalculated_entry), "Some text");
+}
+
+TEST_F(BackupEntriesTest, BackupEntryFromAppendOnlyFile)
+{
+    writeFile(local_disk, "a.txt");
+
+    auto entry = std::make_shared<BackupEntryFromAppendOnlyFile>(local_disk, "a.txt");
+    EXPECT_EQ(entry->getSize(), 9);
+    EXPECT_EQ(getChecksum(entry), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 0), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 1), S_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 8), SOME_TEX_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 9), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 1000), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(readAll(entry), "Some text");
+
+    appendFile(local_disk, "a.txt");
+
+    EXPECT_EQ(entry->getSize(), 9);
+    EXPECT_EQ(getChecksum(entry), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 0), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 1), S_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 8), SOME_TEX_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 9), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 1000), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(readAll(entry), "Some text");
+
+    auto appended_entry = std::make_shared<BackupEntryFromAppendOnlyFile>(local_disk, "a.txt");
+    EXPECT_EQ(appended_entry->getSize(), 17);
+    EXPECT_EQ(getChecksum(appended_entry), SOME_TEXT_APPENDED_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(appended_entry, 0), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(appended_entry, 1), S_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(appended_entry, 8), SOME_TEX_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(appended_entry, 9), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(appended_entry, 22), SOME_TEXT_APPENDED_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(appended_entry, 1000), SOME_TEXT_APPENDED_CHECKSUM);
+    EXPECT_EQ(readAll(appended_entry), "Some textAppended");
+
+    writeEmptyFile(local_disk, "empty_appended.txt");
+
+    auto empty_entry = std::make_shared<BackupEntryFromAppendOnlyFile>(local_disk, "empty_appended.txt");
+    EXPECT_EQ(empty_entry->getSize(), 0);
+    EXPECT_EQ(getChecksum(empty_entry), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(empty_entry, 0), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(empty_entry, 1), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(empty_entry, 1000), ZERO_CHECKSUM);
+    EXPECT_EQ(readAll(empty_entry), "");
+
+    appendFile(local_disk, "empty_appended.txt");
+    EXPECT_EQ(empty_entry->getSize(), 0);
+    EXPECT_EQ(getChecksum(empty_entry), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(empty_entry, 0), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(empty_entry, 1), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(empty_entry, 1000), ZERO_CHECKSUM);
+    EXPECT_EQ(readAll(empty_entry), "");
+}
+
+TEST_F(BackupEntriesTest, PartialChecksumBeforeFullChecksum)
+{
+    writeFile(local_disk, "a.txt");
+
+    auto entry = std::make_shared<BackupEntryFromAppendOnlyFile>(local_disk, "a.txt");
+    EXPECT_EQ(entry->getSize(), 9);
+    EXPECT_EQ(getPartialChecksum(entry, 0), ZERO_CHECKSUM);
+    EXPECT_EQ(getChecksum(entry), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(readAll(entry), "Some text");
+
+    entry = std::make_shared<BackupEntryFromAppendOnlyFile>(local_disk, "a.txt");
+    EXPECT_EQ(entry->getSize(), 9);
+    EXPECT_EQ(getPartialChecksum(entry, 1), S_CHECKSUM);
+    EXPECT_EQ(getChecksum(entry), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(readAll(entry), "Some text");
+}
+
+TEST_F(BackupEntriesTest, BackupEntryFromSmallFile)
+{
+    writeFile(local_disk, "a.txt");
+    auto entry = std::make_shared<BackupEntryFromSmallFile>(local_disk, "a.txt");
+
+    local_disk->removeFile("a.txt");
+
+    EXPECT_EQ(entry->getSize(), 9);
+    EXPECT_EQ(getChecksum(entry), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 0), ZERO_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 1), S_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 8), SOME_TEX_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 9), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(getPartialChecksum(entry, 1000), SOME_TEXT_CHECKSUM);
+    EXPECT_EQ(readAll(entry), "Some text");
+}
+
+TEST_F(BackupEntriesTest, DecryptedEntriesFromEncryptedDisk)
+{
+    {
+        writeFile(encrypted_disk, "a.txt");
+        std::pair<BackupEntryPtr, bool /* partial_checksum_allowed */> test_cases[]
+            = {{std::make_shared<BackupEntryFromImmutableFile>(encrypted_disk, "a.txt"), false},
+               {std::make_shared<BackupEntryFromAppendOnlyFile>(encrypted_disk, "a.txt"), true},
+               {std::make_shared<BackupEntryFromSmallFile>(encrypted_disk, "a.txt"), true}};
+        for (const auto & [entry, partial_checksum_allowed] : test_cases)
+        {
+            EXPECT_EQ(entry->getSize(), 9);
+            EXPECT_EQ(getChecksum(entry), SOME_TEXT_CHECKSUM);
+            EXPECT_EQ(getPartialChecksum(entry, 0), ZERO_CHECKSUM);
+            EXPECT_EQ(getPartialChecksum(entry, 1), partial_checksum_allowed ? S_CHECKSUM : NO_CHECKSUM);
+            EXPECT_EQ(getPartialChecksum(entry, 8), partial_checksum_allowed ? SOME_TEX_CHECKSUM : NO_CHECKSUM);
+            EXPECT_EQ(getPartialChecksum(entry, 9), SOME_TEXT_CHECKSUM);
+            EXPECT_EQ(getPartialChecksum(entry, 1000), SOME_TEXT_CHECKSUM);
+            EXPECT_EQ(readAll(entry), "Some text");
+        }
+    }
+
+    {
+        writeEmptyFile(encrypted_disk, "empty.txt");
+        BackupEntryPtr entries[]
+            = {std::make_shared<BackupEntryFromImmutableFile>(encrypted_disk, "empty.txt"),
+               std::make_shared<BackupEntryFromAppendOnlyFile>(encrypted_disk, "empty.txt"),
+               std::make_shared<BackupEntryFromSmallFile>(encrypted_disk, "empty.txt")};
+        for (const auto & entry : entries)
+        {
+            EXPECT_EQ(entry->getSize(), 0);
+            EXPECT_EQ(getChecksum(entry), ZERO_CHECKSUM);
+            EXPECT_EQ(getPartialChecksum(entry, 0), ZERO_CHECKSUM);
+            EXPECT_EQ(getPartialChecksum(entry, 1), ZERO_CHECKSUM);
+            EXPECT_EQ(readAll(entry), "");
+        }
+    }
+
+    {
+        auto precalculated_entry = std::make_shared<BackupEntryFromImmutableFile>(encrypted_disk, "a.txt", false, PRECALCULATED_SIZE, PRECALCULATED_CHECKSUM_UINT128);
+        EXPECT_EQ(precalculated_entry->getSize(), PRECALCULATED_SIZE);
+        EXPECT_EQ(getChecksum(precalculated_entry), PRECALCULATED_CHECKSUM);
+        EXPECT_EQ(getPartialChecksum(precalculated_entry, 0), ZERO_CHECKSUM);
+        EXPECT_EQ(getPartialChecksum(precalculated_entry, 1), NO_CHECKSUM);
+        EXPECT_EQ(getPartialChecksum(precalculated_entry, PRECALCULATED_SIZE), PRECALCULATED_CHECKSUM);
+        EXPECT_EQ(getPartialChecksum(precalculated_entry, 1000), PRECALCULATED_CHECKSUM);
+        EXPECT_EQ(readAll(precalculated_entry), "Some text");
+    }
+}
+
+TEST_F(BackupEntriesTest, EncryptedEntriesFromEncryptedDisk)
+{
+    {
+        writeFile(encrypted_disk, "a.txt");
+        BackupEntryPtr entries[]
+            = {std::make_shared<BackupEntryFromImmutableFile>(encrypted_disk, "a.txt", /* copy_encrypted= */ true),
+               std::make_shared<BackupEntryFromAppendOnlyFile>(encrypted_disk, "a.txt", /* copy_encrypted= */ true),
+               std::make_shared<BackupEntryFromSmallFile>(encrypted_disk, "a.txt", /* copy_encrypted= */ true)};
+
+        auto encrypted_checksum = getChecksum(entries[0]);
+        EXPECT_NE(encrypted_checksum, NO_CHECKSUM);
+        EXPECT_NE(encrypted_checksum, ZERO_CHECKSUM);
+        EXPECT_NE(encrypted_checksum, SOME_TEXT_CHECKSUM);
+
+        auto partial_checksum = getPartialChecksum(entries[1], 9);
+        EXPECT_NE(partial_checksum, NO_CHECKSUM);
+        EXPECT_NE(partial_checksum, ZERO_CHECKSUM);
+        EXPECT_NE(partial_checksum, SOME_TEXT_CHECKSUM);
+        EXPECT_NE(partial_checksum, encrypted_checksum);
+
+        auto encrypted_data = readAll(entries[0]);
+        EXPECT_EQ(encrypted_data.size(), 9 + FileEncryption::Header::kSize);
+
+        for (const auto & entry : entries)
+        {
+            EXPECT_EQ(entry->getSize(), 9 + FileEncryption::Header::kSize);
+            EXPECT_EQ(getChecksum(entry), encrypted_checksum);
+            EXPECT_EQ(getPartialChecksum(entry, 0), ZERO_CHECKSUM);
+            auto encrypted_checksum_9 = getPartialChecksum(entry, 9);
+            EXPECT_TRUE(encrypted_checksum_9 == NO_CHECKSUM || encrypted_checksum_9 == partial_checksum);
+            EXPECT_EQ(getPartialChecksum(entry, 9 + FileEncryption::Header::kSize), encrypted_checksum);
+            EXPECT_EQ(getPartialChecksum(entry, 1000), encrypted_checksum);
+            EXPECT_EQ(readAll(entry), encrypted_data);
+        }
+    }
+
+    {
+        writeEmptyFile(encrypted_disk, "empty.txt");
+        BackupEntryPtr entries[]
+            = {std::make_shared<BackupEntryFromImmutableFile>(encrypted_disk, "empty.txt", /* copy_encrypted= */ true),
+               std::make_shared<BackupEntryFromAppendOnlyFile>(encrypted_disk, "empty.txt", /* copy_encrypted= */ true),
+               std::make_shared<BackupEntryFromSmallFile>(encrypted_disk, "empty.txt", /* copy_encrypted= */ true)};
+        for (const auto & entry : entries)
+        {
+            EXPECT_EQ(entry->getSize(), 0);
+            EXPECT_EQ(getChecksum(entry), ZERO_CHECKSUM);
+            EXPECT_EQ(getPartialChecksum(entry, 0), ZERO_CHECKSUM);
+            EXPECT_EQ(getPartialChecksum(entry, 1), ZERO_CHECKSUM);
+            EXPECT_EQ(readAll(entry), "");
+        }
+    }
+
+    {
+        auto precalculated_entry = std::make_shared<BackupEntryFromImmutableFile>(encrypted_disk, "a.txt", /* copy_encrypted= */ true, PRECALCULATED_SIZE, PRECALCULATED_CHECKSUM_UINT128);
+        EXPECT_EQ(precalculated_entry->getSize(), PRECALCULATED_SIZE + FileEncryption::Header::kSize);
+
+        auto encrypted_checksum = getChecksum(precalculated_entry);
+        EXPECT_NE(encrypted_checksum, NO_CHECKSUM);
+        EXPECT_NE(encrypted_checksum, ZERO_CHECKSUM);
+        EXPECT_NE(encrypted_checksum, SOME_TEXT_CHECKSUM);
+        EXPECT_NE(encrypted_checksum, PRECALCULATED_CHECKSUM);
+
+        EXPECT_EQ(getPartialChecksum(precalculated_entry, 0), ZERO_CHECKSUM);
+        EXPECT_EQ(getPartialChecksum(precalculated_entry, 1), NO_CHECKSUM);
+        EXPECT_EQ(getPartialChecksum(precalculated_entry, PRECALCULATED_SIZE), NO_CHECKSUM);
+        EXPECT_EQ(getPartialChecksum(precalculated_entry, PRECALCULATED_SIZE + FileEncryption::Header::kSize), encrypted_checksum);
+        EXPECT_EQ(getPartialChecksum(precalculated_entry, 1000), encrypted_checksum);
+
+        auto encrypted_data = readAll(precalculated_entry);
+        EXPECT_EQ(encrypted_data.size(), 9 + FileEncryption::Header::kSize);
+    }
+}
diff --git a/src/Bridge/CMakeLists.txt b/src/Bridge/CMakeLists.txt
index daf38bd6cbc..5f0e97fc630 100644
--- a/src/Bridge/CMakeLists.txt
+++ b/src/Bridge/CMakeLists.txt
@@ -2,4 +2,4 @@ add_library (bridge
     IBridge.cpp
 )
 
-target_link_libraries (bridge PRIVATE daemon dbms Poco::Data Poco::Data::ODBC)
+target_link_libraries (bridge PRIVATE daemon dbms)
diff --git a/src/Bridge/IBridge.cpp b/src/Bridge/IBridge.cpp
index daae05de892..3c84e22478a 100644
--- a/src/Bridge/IBridge.cpp
+++ b/src/Bridge/IBridge.cpp
@@ -4,25 +4,22 @@
 #include <Poco/Net/NetException.h>
 #include <Poco/Util/HelpFormatter.h>
 
-#include <base/range.h>
-
-#include <Common/StringUtils/StringUtils.h>
 #include <Common/SensitiveDataMasker.h>
-#include "config.h"
+#include <Common/StringUtils/StringUtils.h>
 #include <Common/logger_useful.h>
-#include <base/errnoToString.h>
-#include <IO/ReadHelpers.h>
 #include <Formats/registerFormats.h>
-#include <Server/HTTP/HTTPServer.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteHelpers.h>
+#include <Server/HTTP/HTTPServer.h>
+#include <base/errnoToString.h>
+#include <base/range.h>
+#include <base/scope_guard.h>
+
 #include <sys/time.h>
 #include <sys/resource.h>
 
-#if USE_ODBC
-#    include <Poco/Data/ODBC/Connector.h>
-#endif
-
+#include "config.h"
 
 namespace DB
 {
@@ -89,7 +86,7 @@ void IBridge::defineOptions(Poco::Util::OptionSet & options)
         Poco::Util::Option("listen-host", "", "hostname or address to listen, default 127.0.0.1").argument("listen-host").binding("listen-host"));
 
     options.addOption(
-        Poco::Util::Option("http-timeout", "", "http timeout for socket, default 1800").argument("http-timeout").binding("http-timeout"));
+        Poco::Util::Option("http-timeout", "", "http timeout for socket, default 180").argument("http-timeout").binding("http-timeout"));
 
     options.addOption(
         Poco::Util::Option("max-server-connections", "", "max connections to server, default 1024").argument("max-server-connections").binding("max-server-connections"));
@@ -97,6 +94,9 @@ void IBridge::defineOptions(Poco::Util::OptionSet & options)
     options.addOption(
         Poco::Util::Option("keep-alive-timeout", "", "keepalive timeout, default 10").argument("keep-alive-timeout").binding("keep-alive-timeout"));
 
+    options.addOption(
+        Poco::Util::Option("http-max-field-value-size", "", "max http field value size, default 1048576").argument("http-max-field-value-size").binding("http-max-field-value-size"));
+
     options.addOption(
         Poco::Util::Option("log-level", "", "sets log level, default info") .argument("log-level").binding("logger.level"));
 
@@ -165,6 +165,7 @@ void IBridge::initialize(Application & self)
     http_timeout = config().getUInt64("http-timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
     max_server_connections = config().getUInt("max-server-connections", 1024);
     keep_alive_timeout = config().getUInt64("keep-alive-timeout", 10);
+    http_max_field_value_size = config().getUInt64("http-max-field-value-size", 1048576);
 
     struct rlimit limit;
     const UInt64 gb = 1024 * 1024 * 1024;
@@ -213,19 +214,23 @@ int IBridge::main(const std::vector<std::string> & /*args*/)
 
     Poco::Net::ServerSocket socket;
     auto address = socketBindListen(socket, hostname, port, log);
-    socket.setReceiveTimeout(http_timeout);
-    socket.setSendTimeout(http_timeout);
+    socket.setReceiveTimeout(Poco::Timespan(http_timeout, 0));
+    socket.setSendTimeout(Poco::Timespan(http_timeout, 0));
 
     Poco::ThreadPool server_pool(3, max_server_connections);
 
     Poco::Net::HTTPServerParams::Ptr http_params = new Poco::Net::HTTPServerParams;
-    http_params->setTimeout(http_timeout);
-    http_params->setKeepAliveTimeout(keep_alive_timeout);
+    http_params->setTimeout(Poco::Timespan(http_timeout, 0));
+    http_params->setKeepAliveTimeout(Poco::Timespan(keep_alive_timeout, 0));
 
     auto shared_context = Context::createShared();
     auto context = Context::createGlobal(shared_context.get());
     context->makeGlobalContext();
 
+    auto settings = context->getSettings();
+    settings.set("http_max_field_value_size", http_max_field_value_size);
+    context->setSettings(settings);
+
     if (config().has("query_masking_rules"))
         SensitiveDataMasker::setInstance(std::make_unique<SensitiveDataMasker>(config(), "query_masking_rules"));
 
diff --git a/src/Bridge/IBridge.h b/src/Bridge/IBridge.h
index 68af8860cb3..e6855b69ddd 100644
--- a/src/Bridge/IBridge.h
+++ b/src/Bridge/IBridge.h
@@ -45,6 +45,7 @@ private:
     std::string log_level;
     unsigned max_server_connections;
     size_t http_timeout;
+    size_t http_max_field_value_size;
 
     Poco::Logger * log;
 };
diff --git a/src/BridgeHelper/IBridgeHelper.cpp b/src/BridgeHelper/IBridgeHelper.cpp
index 3a8a8b8fdd2..844e2505e9c 100644
--- a/src/BridgeHelper/IBridgeHelper.cpp
+++ b/src/BridgeHelper/IBridgeHelper.cpp
@@ -67,6 +67,8 @@ std::unique_ptr<ShellCommand> IBridgeHelper::startBridgeCommand()
     cmd_args.push_back(config.getString(configPrefix() + ".listen_host", DEFAULT_HOST));
     cmd_args.push_back("--http-timeout");
     cmd_args.push_back(std::to_string(getHTTPTimeout().totalMicroseconds()));
+    cmd_args.push_back("--http-max-field-value-size");
+    cmd_args.push_back("99999999999999999"); // something "big" to accept large datasets (issue 47616)
     if (config.has("logger." + configPrefix() + "_log"))
     {
         cmd_args.push_back("--log-path");
diff --git a/src/BridgeHelper/IBridgeHelper.h b/src/BridgeHelper/IBridgeHelper.h
index d4762087cc1..272d97c8a78 100644
--- a/src/BridgeHelper/IBridgeHelper.h
+++ b/src/BridgeHelper/IBridgeHelper.h
@@ -5,7 +5,6 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Common/ShellCommand.h>
-#include <Common/logger_useful.h>
 
 
 namespace DB
diff --git a/src/BridgeHelper/XDBCBridgeHelper.h b/src/BridgeHelper/XDBCBridgeHelper.h
index 00a661a1fc4..44104f26f63 100644
--- a/src/BridgeHelper/XDBCBridgeHelper.h
+++ b/src/BridgeHelper/XDBCBridgeHelper.h
@@ -11,7 +11,6 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/BridgeProtocolVersion.h>
 #include <Common/ShellCommand.h>
-#include <Common/logger_useful.h>
 #include <IO/ConnectionTimeouts.h>
 #include <base/range.h>
 #include <BridgeHelper/IBridgeHelper.h>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c5142813c5..622e18d4ff7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,6 +75,7 @@ add_subdirectory (Coordination)
 add_subdirectory (Bridge)
 add_subdirectory (Daemon)
 add_subdirectory (Loggers)
+add_subdirectory (Formats)
 
 
 set(dbms_headers)
@@ -102,6 +103,7 @@ if (TARGET ch_contrib::nats_io)
     add_headers_and_sources(dbms Storages/NATS)
 endif()
 
+add_headers_and_sources(dbms Storages/DataLakes)
 add_headers_and_sources(dbms Storages/MeiliSearch)
 add_headers_and_sources(dbms Common/NamedCollections)
 
@@ -134,6 +136,7 @@ if (TARGET ch_contrib::hdfs)
 endif()
 
 add_headers_and_sources(dbms Disks/ObjectStorages/Cached)
+add_headers_and_sources(dbms Disks/ObjectStorages/Local)
 add_headers_and_sources(dbms Disks/ObjectStorages/Web)
 
 add_headers_and_sources(dbms Storages/Cache)
@@ -199,19 +202,16 @@ add_library(clickhouse_common_io ${clickhouse_common_io_headers} ${clickhouse_co
 add_library (clickhouse_malloc OBJECT Common/malloc.cpp)
 set_source_files_properties(Common/malloc.cpp PROPERTIES COMPILE_FLAGS "-fno-builtin")
 
-if (((SANITIZE STREQUAL "thread") OR (SANITIZE STREQUAL "address")) AND COMPILER_GCC)
-    message(WARNING "Memory tracking is disabled, due to gcc sanitizers")
-else()
-    add_library (clickhouse_new_delete STATIC Common/new_delete.cpp)
-    target_link_libraries (clickhouse_new_delete PRIVATE clickhouse_common_io)
-    if (TARGET ch_contrib::jemalloc)
-        target_link_libraries (clickhouse_new_delete PRIVATE ch_contrib::jemalloc)
-    endif()
+add_library (clickhouse_new_delete STATIC Common/new_delete.cpp)
+target_link_libraries (clickhouse_new_delete PRIVATE clickhouse_common_io)
+if (TARGET ch_contrib::jemalloc)
+    target_link_libraries (clickhouse_new_delete PRIVATE ch_contrib::jemalloc)
 endif()
 
 if (TARGET ch_contrib::jemalloc)
     target_link_libraries (clickhouse_common_io PRIVATE ch_contrib::jemalloc)
 endif()
+target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::sparsehash)
 
 add_subdirectory(Access/Common)
 add_subdirectory(Common/ZooKeeper)
@@ -337,9 +337,9 @@ set_source_files_properties(
         PROPERTIES COMPILE_FLAGS "${X86_INTRINSICS_FLAGS}")
 
 if (ENABLE_QPL)
-set_source_files_properties(
-        Compression/CompressionCodecDeflateQpl.cpp
-        PROPERTIES COMPILE_FLAGS "-mwaitpkg")
+    set_source_files_properties(
+            Compression/CompressionCodecDeflateQpl.cpp
+            PROPERTIES COMPILE_FLAGS "-mwaitpkg")
 endif ()
 
 target_link_libraries(clickhouse_common_io
@@ -354,6 +354,10 @@ target_link_libraries(clickhouse_common_io
             Poco::Foundation
 )
 
+if (TARGET ch_contrib::fiu)
+    target_link_libraries(clickhouse_common_io PUBLIC ch_contrib::fiu)
+endif()
+
 if (TARGET ch_contrib::cpuid)
     target_link_libraries(clickhouse_common_io PRIVATE ch_contrib::cpuid)
 endif()
@@ -460,7 +464,7 @@ endif ()
 if (TARGET ch_contrib::ldap)
     dbms_target_link_libraries (PRIVATE ch_contrib::ldap ch_contrib::lber)
 endif ()
-dbms_target_link_libraries (PRIVATE ch_contrib::sparsehash)
+dbms_target_link_libraries (PUBLIC ch_contrib::sparsehash)
 
 if (TARGET ch_contrib::protobuf)
     dbms_target_link_libraries (PRIVATE ch_contrib::protobuf)
@@ -507,6 +511,10 @@ if (TARGET ch_contrib::sqlite)
     dbms_target_link_libraries(PUBLIC ch_contrib::sqlite)
 endif()
 
+if (TARGET ch_contrib::bcrypt)
+    target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::bcrypt)
+endif()
+
 if (TARGET ch_contrib::msgpack)
     target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::msgpack)
 endif()
@@ -520,7 +528,7 @@ target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::fast_float)
 
 if (USE_ORC)
     dbms_target_link_libraries(PUBLIC ${ORC_LIBRARIES})
-    dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${ORC_INCLUDE_DIR} "${CMAKE_BINARY_DIR}/contrib/orc/c++/include")
+    dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${ORC_INCLUDE_DIR} "${PROJECT_BINARY_DIR}/contrib/orc/c++/include")
 endif ()
 
 if (TARGET ch_contrib::rocksdb)
@@ -541,7 +549,12 @@ if (TARGET ch_contrib::qpl)
 dbms_target_link_libraries(PUBLIC ch_contrib::qpl)
 endif ()
 
-dbms_target_link_libraries(PRIVATE _boost_context)
+if (TARGET ch_contrib::accel-config)
+    dbms_target_link_libraries(PUBLIC ch_contrib::accel-config)
+endif ()
+
+target_link_libraries(clickhouse_common_io PUBLIC boost::context)
+dbms_target_link_libraries(PUBLIC boost::context)
 
 if (ENABLE_NLP)
     dbms_target_link_libraries (PUBLIC ch_contrib::stemmer)
@@ -600,6 +613,7 @@ if (ENABLE_TESTS)
 
     target_link_libraries(unit_tests_dbms PRIVATE
         ch_contrib::gtest_all
+        ch_contrib::gmock_all
         clickhouse_functions
         clickhouse_aggregate_functions
         clickhouse_parsers
@@ -607,7 +621,8 @@ if (ENABLE_TESTS)
         dbms
         clickhouse_common_config
         clickhouse_common_zookeeper
-        string_utils)
+        string_utils
+        hilite_comparator)
 
     if (TARGET ch_contrib::simdjson)
         target_link_libraries(unit_tests_dbms PRIVATE ch_contrib::simdjson)
@@ -621,6 +636,9 @@ if (ENABLE_TESTS)
         target_link_libraries(unit_tests_dbms PRIVATE ch_contrib::azure_sdk)
     endif()
 
+    if (TARGET ch_contrib::parquet)
+        target_link_libraries(unit_tests_dbms PRIVATE ch_contrib::parquet)
+    endif()
 
     add_check(unit_tests_dbms)
 endif ()
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 96aff9aa304..faddfe4e323 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -7,6 +7,7 @@
 
 #include <base/argsToConfig.h>
 #include <base/safeExit.h>
+#include <base/scope_guard.h>
 #include <Core/Block.h>
 #include <Core/Protocol.h>
 #include <Common/DateLUT.h>
@@ -33,7 +34,9 @@
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTCreateFunctionQuery.h>
 #include <Parsers/Access/ASTCreateUserQuery.h>
+#include <Parsers/Access/ASTAuthenticationData.h>
 #include <Parsers/ASTDropQuery.h>
+#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTUseQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
@@ -65,6 +68,7 @@
 #include <Storages/ColumnsDescription.h>
 
 #include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/replace.hpp>
 #include <iostream>
 #include <filesystem>
 #include <map>
@@ -117,6 +121,11 @@ namespace ProfileEvents
     extern const Event SystemTimeMicroseconds;
 }
 
+namespace
+{
+constexpr UInt64 THREAD_GROUP_ID = 0;
+}
+
 namespace DB
 {
 
@@ -195,8 +204,19 @@ static void incrementProfileEventsBlock(Block & dst, const Block & src)
         }
     };
     std::map<Id, UInt64> rows_by_name;
+
     for (size_t src_row = 0; src_row < src.rows(); ++src_row)
     {
+        /// Filter out threads stats, use stats from thread group
+        /// Exactly stats from thread group is stored to the table system.query_log
+        /// The stats from threads are less useful.
+        /// They take more records, they need to be combined,
+        /// there even could be several records from one thread.
+        /// Server doesn't send it any more to the clients, so this code left for compatible
+        auto thread_id = src_array_thread_id[src_row];
+        if (thread_id != THREAD_GROUP_ID)
+            continue;
+
         Id id{
             src_column_name.getDataAt(src_row),
             src_column_host_name.getDataAt(src_row),
@@ -204,16 +224,6 @@ static void incrementProfileEventsBlock(Block & dst, const Block & src)
         rows_by_name[id] = src_row;
     }
 
-    /// Filter out snapshots
-    std::set<size_t> thread_id_filter_mask;
-    for (size_t i = 0; i < src_array_thread_id.size(); ++i)
-    {
-        if (src_array_thread_id[i] != 0)
-        {
-            thread_id_filter_mask.emplace(i);
-        }
-    }
-
     /// Merge src into dst.
     for (size_t dst_row = 0; dst_row < dst_rows; ++dst_row)
     {
@@ -225,10 +235,6 @@ static void incrementProfileEventsBlock(Block & dst, const Block & src)
         if (auto it = rows_by_name.find(id); it != rows_by_name.end())
         {
             size_t src_row = it->second;
-            if (thread_id_filter_mask.contains(src_row))
-            {
-                continue;
-            }
 
             dst_array_current_time[dst_row] = src_array_current_time[src_row];
 
@@ -249,11 +255,6 @@ static void incrementProfileEventsBlock(Block & dst, const Block & src)
     /// Copy rows from src that dst does not contains.
     for (const auto & [id, pos] : rows_by_name)
     {
-        if (thread_id_filter_mask.contains(pos))
-        {
-            continue;
-        }
-
         for (size_t col = 0; col < src.columns(); ++col)
         {
             mutable_columns[col]->insert((*src.getByPosition(col).column)[pos]);
@@ -264,21 +265,31 @@ static void incrementProfileEventsBlock(Block & dst, const Block & src)
 }
 
 
-std::atomic_flag exit_on_signal;
+std::atomic<Int32> exit_after_signals = 0;
 
 class QueryInterruptHandler : private boost::noncopyable
 {
 public:
-    static void start() { exit_on_signal.clear(); }
+    /// Store how much interrupt signals can be before stopping the query
+    /// by default stop after the first interrupt signal.
+    static void start(Int32 signals_before_stop = 1) { exit_after_signals.store(signals_before_stop); }
+
+    /// Set value not greater then 0 to mark the query as stopped.
+    static void stop() { return exit_after_signals.store(0); }
+
     /// Return true if the query was stopped.
-    static bool stop() { return exit_on_signal.test_and_set(); }
-    static bool cancelled() { return exit_on_signal.test(); }
+    /// Query was stopped if it received at least "signals_before_stop" interrupt signals.
+    static bool try_stop() { return exit_after_signals.fetch_sub(1) <= 0; }
+    static bool cancelled() { return exit_after_signals.load() <= 0; }
+
+    /// Return how much interrupt signals remain before stop.
+    static Int32 cancelled_status() { return exit_after_signals.load(); }
 };
 
 /// This signal handler is set only for SIGINT.
 void interruptSignalHandler(int signum)
 {
-    if (QueryInterruptHandler::stop())
+    if (QueryInterruptHandler::try_stop())
         safeExit(128 + signum);
 }
 
@@ -562,6 +573,13 @@ try
                 CompressionMethod compression_method = chooseCompressionMethod(out_file, compression_method_string);
                 UInt64 compression_level = 3;
 
+                if (query_with_output->is_outfile_append && compression_method != CompressionMethod::None)
+                {
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Cannot append to compressed file. Please use uncompressed file or remove APPEND keyword.");
+                }
+
                 if (query_with_output->compression_level)
                 {
                     const auto & compression_level_node = query_with_output->compression_level->as<ASTLiteral &>();
@@ -576,8 +594,14 @@ try
                             range.second);
                 }
 
+                auto flags = O_WRONLY | O_EXCL;
+                if (query_with_output->is_outfile_append)
+                    flags |= O_APPEND;
+                else
+                    flags |= O_CREAT;
+
                 out_file_buf = wrapWriteBufferWithCompressionMethod(
-                    std::make_unique<WriteBufferFromFile>(out_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_EXCL | O_CREAT),
+                    std::make_unique<WriteBufferFromFile>(out_file, DBMS_DEFAULT_BUFFER_SIZE, flags),
                     compression_method,
                     static_cast<int>(compression_level)
                 );
@@ -853,12 +877,15 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
         }
     }
 
+    const auto & settings = global_context->getSettingsRef();
+    const Int32 signals_before_stop = settings.partial_result_on_first_cancel ? 2 : 1;
+
     int retries_left = 10;
     while (retries_left)
     {
         try
         {
-            QueryInterruptHandler::start();
+            QueryInterruptHandler::start(signals_before_stop);
             SCOPE_EXIT({ QueryInterruptHandler::stop(); });
 
             connection->sendQuery(
@@ -875,7 +902,7 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
             if (send_external_tables)
                 sendExternalTables(parsed_query);
 
-            receiveResult(parsed_query);
+            receiveResult(parsed_query, signals_before_stop, settings.partial_result_on_first_cancel);
 
             break;
         }
@@ -900,7 +927,7 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
 
 /// Receives and processes packets coming from server.
 /// Also checks if query execution should be cancelled.
-void ClientBase::receiveResult(ASTPtr parsed_query)
+void ClientBase::receiveResult(ASTPtr parsed_query, Int32 signals_before_stop, bool partial_result_on_first_cancel)
 {
     // TODO: get the poll_interval from commandline.
     const auto receive_timeout = connection_parameters.timeouts.receive_timeout;
@@ -924,7 +951,13 @@ void ClientBase::receiveResult(ASTPtr parsed_query)
             /// to avoid losing sync.
             if (!cancelled)
             {
-                if (QueryInterruptHandler::cancelled())
+                if (partial_result_on_first_cancel && QueryInterruptHandler::cancelled_status() == signals_before_stop - 1)
+                {
+                    connection->sendCancel();
+                    /// First cancel reading request was sent. Next requests will only be with a full cancel
+                    partial_result_on_first_cancel = false;
+                }
+                else if (QueryInterruptHandler::cancelled())
                 {
                     cancelQuery();
                 }
@@ -1080,13 +1113,18 @@ void ClientBase::onProfileEvents(Block & block)
         const auto * user_time_name = ProfileEvents::getName(ProfileEvents::UserTimeMicroseconds);
         const auto * system_time_name = ProfileEvents::getName(ProfileEvents::SystemTimeMicroseconds);
 
-        HostToThreadTimesMap thread_times;
+        HostToTimesMap thread_times;
         for (size_t i = 0; i < rows; ++i)
         {
             auto thread_id = array_thread_id[i];
             auto host_name = host_names.getDataAt(i).toString();
-            if (thread_id != 0)
-                progress_indication.addThreadIdToList(host_name, thread_id);
+
+            /// In ProfileEvents packets thread id 0 specifies common profiling information
+            /// for all threads executing current query on specific host. So instead of summing per thread
+            /// consumption it's enough to look for data with thread id 0.
+            if (thread_id != THREAD_GROUP_ID)
+                continue;
+
             auto event_name = names.getDataAt(i);
             auto value = array_values[i];
 
@@ -1095,11 +1133,11 @@ void ClientBase::onProfileEvents(Block & block)
                 continue;
 
             if (event_name == user_time_name)
-                thread_times[host_name][thread_id].user_ms = value;
+                thread_times[host_name].user_ms = value;
             else if (event_name == system_time_name)
-                thread_times[host_name][thread_id].system_ms = value;
+                thread_times[host_name].system_ms = value;
             else if (event_name == MemoryTracker::USAGE_EVENT_NAME)
-                thread_times[host_name][thread_id].memory_usage = value;
+                thread_times[host_name].memory_usage = value;
         }
         progress_indication.updateThreadEventData(thread_times);
 
@@ -1110,6 +1148,8 @@ void ClientBase::onProfileEvents(Block & block)
         {
             if (profile_events.watch.elapsedMilliseconds() >= profile_events.delay_ms)
             {
+                /// We need to restart the watch each time we flushed these events
+                profile_events.watch.restart();
                 initLogsOutputStream();
                 if (need_render_progress && tty_buf)
                     progress_indication.clearProgressOutput(*tty_buf);
@@ -1123,7 +1163,6 @@ void ClientBase::onProfileEvents(Block & block)
                 incrementProfileEventsBlock(profile_events.last_block, block);
             }
         }
-        profile_events.watch.restart();
     }
 }
 
@@ -1207,6 +1246,14 @@ void ClientBase::setInsertionTable(const ASTInsertQuery & insert_query)
 }
 
 
+void ClientBase::addMultiquery(std::string_view query, Arguments & common_arguments) const
+{
+    common_arguments.emplace_back("--multiquery");
+    common_arguments.emplace_back("-q");
+    common_arguments.emplace_back(query);
+}
+
+
 void ClientBase::processInsertQuery(const String & query_to_execute, ASTPtr parsed_query)
 {
     auto query = query_to_execute;
@@ -1360,7 +1407,7 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
             throw;
         }
 
-        if (have_data_in_stdin)
+        if (have_data_in_stdin && !cancelled)
             sendDataFromStdin(sample, columns_description_for_query, parsed_query);
     }
     else if (parsed_insert_query->data)
@@ -1370,7 +1417,7 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
         try
         {
             sendDataFrom(data_in, sample, columns_description_for_query, parsed_query, have_data_in_stdin);
-            if (have_data_in_stdin)
+            if (have_data_in_stdin && !cancelled)
                 sendDataFromStdin(sample, columns_description_for_query, parsed_query);
         }
         catch (Exception & e)
@@ -1587,10 +1634,15 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
 
     if (const auto * create_user_query = parsed_query->as<ASTCreateUserQuery>())
     {
-        if (!create_user_query->attach && create_user_query->temporary_password_for_checks)
+        if (!create_user_query->attach && create_user_query->auth_data)
         {
-            global_context->getAccessControl().checkPasswordComplexityRules(create_user_query->temporary_password_for_checks.value());
-            create_user_query->temporary_password_for_checks.reset();
+            if (const auto * auth_data = create_user_query->auth_data->as<ASTAuthenticationData>())
+            {
+                auto password = auth_data->getPassword();
+
+                if (password)
+                    global_context->getAccessControl().checkPasswordComplexityRules(*password);
+            }
         }
     }
 
@@ -1834,7 +1886,7 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
     {
         /// disable logs if expects errors
         TestHint test_hint(all_queries_text);
-        if (test_hint.clientError() || test_hint.serverError())
+        if (test_hint.hasClientErrors() || test_hint.hasServerErrors())
             processTextAsSingleQuery("SET send_logs_level = 'fatal'");
     }
 
@@ -1876,17 +1928,17 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
                 // the query ends because we failed to parse it, so we consume
                 // the entire line.
                 TestHint hint(String(this_query_begin, this_query_end - this_query_begin));
-                if (hint.serverError())
+                if (hint.hasServerErrors())
                 {
                     // Syntax errors are considered as client errors
-                    current_exception->addMessage("\nExpected server error '{}'.", hint.serverError());
+                    current_exception->addMessage("\nExpected server error: {}.", hint.serverErrors());
                     current_exception->rethrow();
                 }
 
-                if (hint.clientError() != current_exception->code())
+                if (!hint.hasExpectedClientError(current_exception->code()))
                 {
-                    if (hint.clientError())
-                        current_exception->addMessage("\nExpected client error: " + std::to_string(hint.clientError()));
+                    if (hint.hasClientErrors())
+                        current_exception->addMessage("\nExpected client error: {}.", hint.clientErrors());
 
                     current_exception->rethrow();
                 }
@@ -1935,37 +1987,37 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
                 bool error_matches_hint = true;
                 if (have_error)
                 {
-                    if (test_hint.serverError())
+                    if (test_hint.hasServerErrors())
                     {
                         if (!server_exception)
                         {
                             error_matches_hint = false;
                             fmt::print(stderr, "Expected server error code '{}' but got no server error (query: {}).\n",
-                                       test_hint.serverError(), full_query);
+                                       test_hint.serverErrors(), full_query);
                         }
-                        else if (server_exception->code() != test_hint.serverError())
+                        else if (!test_hint.hasExpectedServerError(server_exception->code()))
                         {
                             error_matches_hint = false;
                             fmt::print(stderr, "Expected server error code: {} but got: {} (query: {}).\n",
-                                       test_hint.serverError(), server_exception->code(), full_query);
+                                       test_hint.serverErrors(), server_exception->code(), full_query);
                         }
                     }
-                    if (test_hint.clientError())
+                    if (test_hint.hasClientErrors())
                     {
                         if (!client_exception)
                         {
                             error_matches_hint = false;
                             fmt::print(stderr, "Expected client error code '{}' but got no client error (query: {}).\n",
-                                       test_hint.clientError(), full_query);
+                                       test_hint.clientErrors(), full_query);
                         }
-                        else if (client_exception->code() != test_hint.clientError())
+                        else if (!test_hint.hasExpectedClientError(client_exception->code()))
                         {
                             error_matches_hint = false;
                             fmt::print(stderr, "Expected client error code '{}' but got '{}' (query: {}).\n",
-                                       test_hint.clientError(), client_exception->code(), full_query);
+                                       test_hint.clientErrors(), client_exception->code(), full_query);
                         }
                     }
-                    if (!test_hint.clientError() && !test_hint.serverError())
+                    if (!test_hint.hasClientErrors() && !test_hint.hasServerErrors())
                     {
                         // No error was expected but it still occurred. This is the
                         // default case without test hint, doesn't need additional
@@ -1975,19 +2027,19 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
                 }
                 else
                 {
-                    if (test_hint.clientError())
+                    if (test_hint.hasClientErrors())
                     {
                         error_matches_hint = false;
                         fmt::print(stderr,
                                    "The query succeeded but the client error '{}' was expected (query: {}).\n",
-                                   test_hint.clientError(), full_query);
+                                   test_hint.clientErrors(), full_query);
                     }
-                    if (test_hint.serverError())
+                    if (test_hint.hasServerErrors())
                     {
                         error_matches_hint = false;
                         fmt::print(stderr,
                                    "The query succeeded but the server error '{}' was expected (query: {}).\n",
-                                   test_hint.serverError(), full_query);
+                                   test_hint.serverErrors(), full_query);
                     }
                 }
 
@@ -2197,9 +2249,6 @@ void ClientBase::runInteractive()
     LineReader lr(history_file, config().has("multiline"), query_extenders, query_delimiters);
 #endif
 
-    /// Enable bracketed-paste-mode so that we are able to paste multiline queries as a whole.
-    lr.enableBracketedPaste();
-
     static const std::initializer_list<std::pair<String, String>> backslash_aliases =
         {
             { "\\l", "SHOW DATABASES" },
@@ -2217,7 +2266,18 @@ void ClientBase::runInteractive()
 
     do
     {
-        auto input = lr.readLine(prompt(), ":-] ");
+        String input;
+        {
+            /// Enable bracketed-paste-mode so that we are able to paste multiline queries as a whole.
+            /// But keep it disabled outside of query input, because it breaks password input
+            /// (e.g. if we need to reconnect and show a password prompt).
+            /// (Alternatively, we could make the password input ignore the control sequences.)
+            lr.enableBracketedPaste();
+            SCOPE_EXIT({ lr.disableBracketedPaste(); });
+
+            input = lr.readLine(prompt(), ":-] ");
+        }
+
         if (input.empty())
             break;
 
@@ -2373,6 +2433,54 @@ struct TransparentStringHash
     }
 };
 
+/*
+ * This functor is used to parse command line arguments and replace dashes with underscores,
+ * allowing options to be specified using either dashes or underscores.
+ */
+class OptionsAliasParser
+{
+public:
+    explicit OptionsAliasParser(const boost::program_options::options_description& options)
+    {
+        options_names.reserve(options.options().size());
+        for (const auto& option : options.options())
+            options_names.insert(option->long_name());
+    }
+
+    /*
+     * Parses arguments by replacing dashes with underscores, and matches the resulting name with known options
+     * Implements boost::program_options::ext_parser logic
+     */
+    std::pair<std::string, std::string> operator()(const std::string& token) const
+    {
+        if (token.find("--") != 0)
+            return {};
+        std::string arg = token.substr(2);
+
+        // divide token by '=' to separate key and value if options style=long_allow_adjacent
+        auto pos_eq = arg.find('=');
+        std::string key = arg.substr(0, pos_eq);
+
+        if (options_names.contains(key))
+            // option does not require any changes, because it is already correct
+            return {};
+
+        std::replace(key.begin(), key.end(), '-', '_');
+        if (!options_names.contains(key))
+            // after replacing '-' with '_' argument is still unknown
+            return {};
+
+        std::string value;
+        if (pos_eq != std::string::npos && pos_eq < arg.size())
+            value = arg.substr(pos_eq + 1);
+
+        return {key, value};
+    }
+
+private:
+    std::unordered_set<std::string> options_names;
+};
+
 }
 
 
@@ -2423,7 +2531,10 @@ void ClientBase::parseAndCheckOptions(OptionsDescription & options_description,
     }
 
     /// Parse main commandline options.
-    auto parser = po::command_line_parser(arguments).options(options_description.main_description.value()).allow_unregistered();
+    auto parser = po::command_line_parser(arguments)
+                      .options(options_description.main_description.value())
+                      .extra_parser(OptionsAliasParser(options_description.main_description.value()))
+                      .allow_unregistered();
     po::parsed_options parsed = parser.run();
 
     /// Check unrecognized options without positional options.
@@ -2465,6 +2576,19 @@ void ClientBase::init(int argc, char ** argv)
 
     readArguments(argc, argv, common_arguments, external_tables_arguments, hosts_and_ports_arguments);
 
+    /// Support for Unicode dashes
+    /// Interpret Unicode dashes as default double-hyphen
+    for (auto & arg : common_arguments)
+    {
+        // replace em-dash(U+2014)
+        boost::replace_all(arg, "—", "--");
+        // replace en-dash(U+2013)
+        boost::replace_all(arg, "–", "--");
+        // replace mathematical minus(U+2212)
+        boost::replace_all(arg, "−", "--");
+    }
+
+
     po::variables_map options;
     OptionsDescription options_description;
     options_description.main_description.emplace(createOptionsDescription("Main options", terminal_width));
@@ -2476,15 +2600,19 @@ void ClientBase::init(int argc, char ** argv)
         ("version-clean", "print version in machine-readable format and exit")
 
         ("config-file,C", po::value<std::string>(), "config-file path")
-        ("queries-file", po::value<std::vector<std::string>>()->multitoken(),
-            "file path with queries to execute; multiple files can be specified (--queries-file file1 file2...)")
-        ("database,d", po::value<std::string>(), "database")
-        ("history_file", po::value<std::string>(), "path to history file")
 
         ("query,q", po::value<std::string>(), "query")
-        ("stage", po::value<std::string>()->default_value("complete"), "Request query processing up to specified stage: complete,fetch_columns,with_mergeable_state,with_mergeable_state_after_aggregation,with_mergeable_state_after_aggregation_and_limit")
+        ("queries-file", po::value<std::vector<std::string>>()->multitoken(),
+            "file path with queries to execute; multiple files can be specified (--queries-file file1 file2...)")
+        ("multiquery,n", "If specified, multiple queries separated by semicolons can be listed after --query. For convenience, it is also possible to omit --query and pass the queries directly after --multiquery.")
+        ("multiline,m", "If specified, allow multiline queries (do not send the query on Enter)")
+        ("database,d", po::value<std::string>(), "database")
         ("query_kind", po::value<std::string>()->default_value("initial_query"), "One of initial_query/secondary_query/no_query")
         ("query_id", po::value<std::string>(), "query_id")
+
+        ("history_file", po::value<std::string>(), "path to history file")
+
+        ("stage", po::value<std::string>()->default_value("complete"), "Request query processing up to specified stage: complete,fetch_columns,with_mergeable_state,with_mergeable_state_after_aggregation,with_mergeable_state_after_aggregation_and_limit")
         ("progress", po::value<ProgressOption>()->implicit_value(ProgressOption::TTY, "tty")->default_value(ProgressOption::DEFAULT, "default"), "Print progress of queries execution - to TTY: tty|on|1|true|yes; to STDERR non-interactive mode: err; OFF: off|0|false|no; DEFAULT - interactive to TTY, non-interactive is off")
 
         ("disable_suggestion,A", "Disable loading suggestion data. Note that suggestion data is loaded asynchronously through a second connection to ClickHouse server. Also it is reasonable to disable suggestion if you want to paste a query with TAB characters. Shorthand option -A is for those who get used to mysql client.")
@@ -2496,9 +2624,6 @@ void ClientBase::init(int argc, char ** argv)
         ("log-level", po::value<std::string>(), "log level")
         ("server_logs_file", po::value<std::string>(), "put server logs into specified file")
 
-        ("multiline,m", "multiline")
-        ("multiquery,n", "multiquery")
-
         ("suggestion_limit", po::value<int>()->default_value(10000),
             "Suggestion limit for how many databases, tables and columns to fetch.")
 
@@ -2638,7 +2763,14 @@ void ClientBase::init(int argc, char ** argv)
     profile_events.delay_ms = options["profile-events-delay-ms"].as<UInt64>();
 
     processOptions(options_description, options, external_tables_arguments, hosts_and_ports_arguments);
-    argsToConfig(common_arguments, config(), 100);
+    {
+        std::unordered_set<std::string> alias_names;
+        alias_names.reserve(options_description.main_description->options().size());
+        for (const auto& option : options_description.main_description->options())
+            alias_names.insert(option->long_name());
+        argsToConfig(common_arguments, config(), 100, &alias_names);
+    }
+
     clearPasswordFromCommandLine(argc, argv);
 
     /// Limit on total memory usage
diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
index 52e15a1a075..8d56c7eb051 100644
--- a/src/Client/ClientBase.h
+++ b/src/Client/ClientBase.h
@@ -129,9 +129,10 @@ protected:
 
     void setInsertionTable(const ASTInsertQuery & insert_query);
 
+    void addMultiquery(std::string_view query, Arguments & common_arguments) const;
 
 private:
-    void receiveResult(ASTPtr parsed_query);
+    void receiveResult(ASTPtr parsed_query, Int32 signals_before_stop, bool partial_result_on_first_cancel);
     bool receiveAndProcessPacket(ASTPtr parsed_query, bool cancelled_);
     void receiveLogsAndProfileEvents(ASTPtr parsed_query);
     bool receiveSampleBlock(Block & out, ColumnsDescription & columns_description, ASTPtr parsed_query);
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index eea007a8608..d39148d3016 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -22,7 +22,8 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/OpenSSLHelpers.h>
 #include <Common/randomSeed.h>
-#include "Core/Block.h"
+#include <Common/logger_useful.h>
+#include <Core/Block.h>
 #include <Interpreters/ClientInfo.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
 #include <Compression/CompressionFactory.h>
@@ -127,7 +128,27 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
 
             try
             {
-                socket->connect(*it, connection_timeout);
+                if (async_callback)
+                {
+                    socket->connectNB(*it);
+                    while (!socket->poll(0, Poco::Net::Socket::SELECT_READ | Poco::Net::Socket::SELECT_WRITE | Poco::Net::Socket::SELECT_ERROR))
+                        async_callback(socket->impl()->sockfd(), connection_timeout, AsyncEventTimeoutType::CONNECT, description, AsyncTaskExecutor::READ | AsyncTaskExecutor::WRITE | AsyncTaskExecutor::ERROR);
+
+                    if (auto err = socket->impl()->socketError())
+                        socket->impl()->error(err); // Throws an exception
+
+                    socket->setBlocking(true);
+
+#if USE_SSL
+                    if (static_cast<bool>(secure))
+                        static_cast<Poco::Net::SecureStreamSocket *>(socket.get())->completeHandshake();
+#endif
+                }
+                else
+                {
+                    socket->connect(*it, connection_timeout);
+                }
+
                 current_resolved_address = *it;
                 break;
             }
@@ -162,10 +183,10 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
         }
 
         in = std::make_shared<ReadBufferFromPocoSocket>(*socket);
-        in->setAsyncCallback(std::move(async_callback));
+        in->setAsyncCallback(async_callback);
 
         out = std::make_shared<WriteBufferFromPocoSocket>(*socket);
-
+        out->setAsyncCallback(async_callback);
         connected = true;
 
         sendHello();
@@ -216,6 +237,7 @@ void Connection::disconnect()
         socket->close();
     socket = nullptr;
     connected = false;
+    nonce.reset();
 }
 
 
@@ -324,6 +346,14 @@ void Connection::receiveHello()
                 password_complexity_rules.push_back({std::move(original_pattern), std::move(exception_message)});
             }
         }
+        if (server_revision >= DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2)
+        {
+            chassert(!nonce.has_value());
+
+            UInt64 read_nonce;
+            readIntBinary(read_nonce, *in);
+            nonce.emplace(read_nonce);
+        }
     }
     else if (packet_type == Protocol::Server::Exception)
         receiveException()->rethrow();
@@ -506,7 +536,7 @@ void Connection::sendQuery(
     bool with_pending_data,
     std::function<void(const Progress &)>)
 {
-    OpenTelemetry::SpanHolder span("Connection::sendQuery()");
+    OpenTelemetry::SpanHolder span("Connection::sendQuery()", OpenTelemetry::CLIENT);
     span.addAttribute("clickhouse.query_id", query_id_);
     span.addAttribute("clickhouse.query", query);
     span.addAttribute("target", [this] () { return this->getHost() + ":" + std::to_string(this->getPort()); });
@@ -584,6 +614,9 @@ void Connection::sendQuery(
         {
 #if USE_SSL
             std::string data(salt);
+            // For backward compatibility
+            if (nonce.has_value())
+                data += std::to_string(nonce.value());
             data += cluster_secret;
             data += query;
             data += query_id;
@@ -593,8 +626,8 @@ void Connection::sendQuery(
             std::string hash = encodeSHA256(data);
             writeStringBinary(hash, *out);
 #else
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
-                        "Inter-server secret support is disabled, because ClickHouse was built without SSL library");
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+                            "Inter-server secret support is disabled, because ClickHouse was built without SSL library");
 #endif
         }
         else
diff --git a/src/Client/Connection.h b/src/Client/Connection.h
index d806c5e8b1f..77dbe5e3398 100644
--- a/src/Client/Connection.h
+++ b/src/Client/Connection.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 
 #include <Poco/Net/StreamSocket.h>
 
@@ -10,6 +9,7 @@
 
 
 #include <IO/ReadBufferFromPocoSocket.h>
+#include <IO/WriteBufferFromPocoSocket.h>
 
 #include <Interpreters/TablesStatus.h>
 #include <Interpreters/Context_fwd.h>
@@ -154,8 +154,11 @@ public:
     {
         async_callback = std::move(async_callback_);
         if (in)
-            in->setAsyncCallback(std::move(async_callback));
+            in->setAsyncCallback(async_callback);
+        if (out)
+            out->setAsyncCallback(async_callback);
     }
+
 private:
     String host;
     UInt16 port;
@@ -167,7 +170,10 @@ private:
     /// For inter-server authorization
     String cluster;
     String cluster_secret;
+    /// For DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET
     String salt;
+    /// For DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2
+    std::optional<UInt64> nonce;
 
     /// Address is resolved during the first connection (or the following reconnects)
     /// Use it only for logging purposes
@@ -194,7 +200,7 @@ private:
 
     std::unique_ptr<Poco::Net::StreamSocket> socket;
     std::shared_ptr<ReadBufferFromPocoSocket> in;
-    std::shared_ptr<WriteBuffer> out;
+    std::shared_ptr<WriteBufferFromPocoSocket> out;
     std::optional<UInt64> last_input_packet_type;
 
     String query_id;
@@ -277,10 +283,11 @@ private:
     [[noreturn]] void throwUnexpectedPacket(UInt64 packet_type, const char * expected) const;
 };
 
+template <typename Conn>
 class AsyncCallbackSetter
 {
 public:
-    AsyncCallbackSetter(Connection * connection_, AsyncCallback async_callback) : connection(connection_)
+    AsyncCallbackSetter(Conn * connection_, AsyncCallback async_callback) : connection(connection_)
     {
         connection->setAsyncCallback(std::move(async_callback));
     }
@@ -290,7 +297,7 @@ public:
         connection->setAsyncCallback({});
     }
 private:
-    Connection * connection;
+    Conn * connection;
 };
 
 }
diff --git a/src/Client/ConnectionEstablisher.cpp b/src/Client/ConnectionEstablisher.cpp
index 731ab7c1e91..98051a50eb3 100644
--- a/src/Client/ConnectionEstablisher.cpp
+++ b/src/Client/ConnectionEstablisher.cpp
@@ -4,6 +4,8 @@
 
 namespace ProfileEvents
 {
+    extern const Event DistributedConnectionTries;
+    extern const Event DistributedConnectionUsable;
     extern const Event DistributedConnectionMissingTable;
     extern const Event DistributedConnectionStaleReplica;
 }
@@ -35,6 +37,7 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::
     SCOPE_EXIT(is_finished = true);
     try
     {
+        ProfileEvents::increment(ProfileEvents::DistributedConnectionTries);
         result.entry = pool->get(*timeouts, settings, /* force_connected = */ false);
         AsyncCallbackSetter async_setter(&*result.entry, std::move(async_callback));
 
@@ -45,6 +48,7 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::
         if (!table_to_check || server_revision < DBMS_MIN_REVISION_WITH_TABLES_STATUS)
         {
             result.entry->forceConnected(*timeouts);
+            ProfileEvents::increment(ProfileEvents::DistributedConnectionUsable);
             result.is_usable = true;
             result.is_up_to_date = true;
             return;
@@ -65,6 +69,7 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::
             return;
         }
 
+        ProfileEvents::increment(ProfileEvents::DistributedConnectionUsable);
         result.is_usable = true;
 
         UInt64 max_allowed_delay = settings ? UInt64(settings->max_replica_delay_for_distributed_queries) : 0;
@@ -111,75 +116,57 @@ ConnectionEstablisherAsync::ConnectionEstablisherAsync(
     const Settings * settings_,
     Poco::Logger * log_,
     const QualifiedTableName * table_to_check_)
-    : connection_establisher(pool_, timeouts_, settings_, log_, table_to_check_)
+    : AsyncTaskExecutor(std::make_unique<Task>(*this)), connection_establisher(pool_, timeouts_, settings_, log_, table_to_check_)
 {
-    epoll.add(receive_timeout.getDescriptor());
+    epoll.add(timeout_descriptor.getDescriptor());
 }
 
-void ConnectionEstablisherAsync::Routine::ReadCallback::operator()(int fd, Poco::Timespan timeout, const std::string &)
+void ConnectionEstablisherAsync::Task::run(AsyncCallback async_callback, ResumeCallback)
 {
-    /// Check if it's the first time and we need to add socket fd to epoll.
-    if (connection_establisher_async.socket_fd == -1)
-    {
-        connection_establisher_async.epoll.add(fd);
-        connection_establisher_async.socket_fd = fd;
-    }
-
-    connection_establisher_async.receive_timeout.setRelative(timeout);
-    fiber = std::move(fiber).resume();
-    connection_establisher_async.receive_timeout.reset();
+    connection_establisher_async.reset();
+    connection_establisher_async.connection_establisher.setAsyncCallback(async_callback);
+    connection_establisher_async.connection_establisher.run(connection_establisher_async.result, connection_establisher_async.fail_message);
+    connection_establisher_async.is_finished = true;
 }
 
-Fiber ConnectionEstablisherAsync::Routine::operator()(Fiber && sink)
+void ConnectionEstablisherAsync::processAsyncEvent(int fd, Poco::Timespan socket_timeout, AsyncEventTimeoutType type, const std::string & description, uint32_t events)
 {
-    try
-    {
-        connection_establisher_async.connection_establisher.setAsyncCallback(ReadCallback{connection_establisher_async, sink});
-        connection_establisher_async.connection_establisher.run(connection_establisher_async.result, connection_establisher_async.fail_message);
-    }
-    catch (const boost::context::detail::forced_unwind &)
-    {
-        /// This exception is thrown by fiber implementation in case if fiber is being deleted but hasn't exited
-        /// It should not be caught or it will segfault.
-        /// Other exceptions must be caught
-        throw;
-    }
-    catch (...)
-    {
-        connection_establisher_async.exception = std::current_exception();
-    }
-
-    return std::move(sink);
+    socket_fd = fd;
+    socket_description = description;
+    epoll.add(fd, events);
+    timeout_descriptor.setRelative(socket_timeout);
+    timeout = socket_timeout;
+    timeout_type = type;
 }
 
-std::variant<int, ConnectionEstablisher::TryResult> ConnectionEstablisherAsync::resume()
+void ConnectionEstablisherAsync::clearAsyncEvent()
 {
-    if (!fiber_created)
+    timeout_descriptor.reset();
+    epoll.remove(socket_fd);
+}
+
+bool ConnectionEstablisherAsync::checkBeforeTaskResume()
+{
+    /// If we just restarted the task, no need to check timeout.
+    if (restarted)
     {
+        restarted = false;
+        return true;
+    }
+
+    return checkTimeout();
+}
+
+void ConnectionEstablisherAsync::cancelAfter()
+{
+    if (!is_finished)
         reset();
-        fiber = boost::context::fiber(std::allocator_arg_t(), fiber_stack, Routine{*this});
-        fiber_created = true;
-    } else if (!checkReceiveTimeout())
-        return result;
-
-    fiber = std::move(fiber).resume();
-
-    if (exception)
-        std::rethrow_exception(exception);
-
-    if (connection_establisher.isFinished())
-    {
-        destroyFiber();
-        return result;
-    }
-
-    return epoll.getFileDescriptor();
 }
 
-bool ConnectionEstablisherAsync::checkReceiveTimeout()
+bool ConnectionEstablisherAsync::checkTimeout()
 {
     bool is_socket_ready = false;
-    bool is_receive_timeout_alarmed = false;
+    bool is_timeout_alarmed = false;
 
     epoll_event events[2];
     events[0].data.fd = events[1].data.fd = -1;
@@ -188,31 +175,37 @@ bool ConnectionEstablisherAsync::checkReceiveTimeout()
     {
         if (events[i].data.fd == socket_fd)
             is_socket_ready = true;
-        if (events[i].data.fd == receive_timeout.getDescriptor())
-            is_receive_timeout_alarmed = true;
+        if (events[i].data.fd == timeout_descriptor.getDescriptor())
+            is_timeout_alarmed = true;
     }
 
-    if (is_receive_timeout_alarmed && !is_socket_ready)
+    if (is_timeout_alarmed && !is_socket_ready)
     {
-        destroyFiber();
-        /// In not async case this exception would be thrown and caught in ConnectionEstablisher::run,
+        /// In not async case timeout exception would be thrown and caught in ConnectionEstablisher::run,
         /// but in async case we process timeout outside and cannot throw exception. So, we just save fail message.
-        fail_message = fmt::format(
-            "Timeout exceeded while reading from socket ({}, receive timeout {} ms)",
-            result.entry->getDescription(),
-            result.entry->getSocket()->getReceiveTimeout().totalMilliseconds());
+        fail_message = getSocketTimeoutExceededMessageByTimeoutType(timeout_type, timeout, socket_description);
+
         epoll.remove(socket_fd);
+        /// Restart task, so the connection process will start from the beginning in the next resume().
+        restart();
+        /// The result should be Null in case of timeout.
         resetResult();
+        restarted = true;
+        /// Mark that current connection process is finished.
+        is_finished = true;
         return false;
     }
 
     return true;
 }
 
-void ConnectionEstablisherAsync::cancel()
+void ConnectionEstablisherAsync::afterTaskResume()
 {
-    destroyFiber();
-    reset();
+    if (is_finished)
+    {
+        restart();
+        restarted = true;
+    }
 }
 
 void ConnectionEstablisherAsync::reset()
@@ -220,6 +213,7 @@ void ConnectionEstablisherAsync::reset()
     resetResult();
     fail_message.clear();
     socket_fd = -1;
+    is_finished = false;
 }
 
 void ConnectionEstablisherAsync::resetResult()
@@ -231,12 +225,6 @@ void ConnectionEstablisherAsync::resetResult()
     }
 }
 
-void ConnectionEstablisherAsync::destroyFiber()
-{
-    Fiber to_destroy = std::move(fiber);
-    fiber_created = false;
-}
-
 #endif
 
 }
diff --git a/src/Client/ConnectionEstablisher.h b/src/Client/ConnectionEstablisher.h
index 495583ba7ec..5993c9e066f 100644
--- a/src/Client/ConnectionEstablisher.h
+++ b/src/Client/ConnectionEstablisher.h
@@ -2,6 +2,7 @@
 
 #include <variant>
 
+#include <Common/AsyncTaskExecutor.h>
 #include <Common/Epoll.h>
 #include <Common/Fiber.h>
 #include <Common/FiberStack.h>
@@ -53,66 +54,64 @@ private:
 /// When read callback is called, socket and receive timeout are added in epoll
 /// and execution returns to the main program.
 /// So, you can poll this epoll file descriptor to determine when to resume.
-class ConnectionEstablisherAsync
+class ConnectionEstablisherAsync : public AsyncTaskExecutor
 {
 public:
     using TryResult = PoolWithFailoverBase<IConnectionPool>::TryResult;
 
     ConnectionEstablisherAsync(IConnectionPool * pool_,
-                          const ConnectionTimeouts * timeouts_,
-                          const Settings * settings_,
-                          Poco::Logger * log_,
-                          const QualifiedTableName * table_to_check = nullptr);
+                               const ConnectionTimeouts * timeouts_,
+                               const Settings * settings_,
+                               Poco::Logger * log_,
+                               const QualifiedTableName * table_to_check_ = nullptr);
 
-    /// Resume establishing connection. If the process was not finished,
-    /// return file descriptor (you can add it in epoll and poll it,
-    /// when this fd become ready, call resume again),
-    /// if the process was failed or finished, return it's result,
-    std::variant<int, TryResult> resume();
-
-    /// Cancel establishing connections. Fiber will be destroyed,
-    /// class will be set in initial stage.
-    void cancel();
+    /// Get file descriptor that can be added in epoll and be polled,
+    /// when this fd becomes ready, you call resume establishing connection.
+    int getFileDescriptor() { return epoll.getFileDescriptor(); }
 
+    /// Check if the process of connection establishing was finished.
+    /// The process is considered finished if connection is ready,
+    /// some exception occurred or timeout exceeded.
+    bool isFinished() { return is_finished; }
     TryResult getResult() const { return result; }
 
     const std::string & getFailMessage() const { return fail_message; }
 
 private:
-    /// When epoll file descriptor is ready, check if it's an expired timeout.
-    /// Return false if receive timeout expired and socket is not ready, return true otherwise.
-    bool checkReceiveTimeout();
+    bool checkBeforeTaskResume() override;
 
-    struct Routine
+    void afterTaskResume() override;
+
+    void processAsyncEvent(int fd, Poco::Timespan socket_timeout, AsyncEventTimeoutType type, const std::string & description, uint32_t events) override;
+    void clearAsyncEvent() override;
+
+    struct Task : public AsyncTask
     {
+        Task(ConnectionEstablisherAsync & connection_establisher_async_) : connection_establisher_async(connection_establisher_async_) {}
+
         ConnectionEstablisherAsync & connection_establisher_async;
 
-        struct ReadCallback
-        {
-            ConnectionEstablisherAsync & connection_establisher_async;
-            Fiber & fiber;
-
-            void operator()(int fd, Poco::Timespan timeout, const std::string &);
-        };
-
-        Fiber operator()(Fiber && sink);
+        void run(AsyncCallback async_callback, ResumeCallback suspend_callback) override;
     };
 
+    void cancelAfter() override;
+
+    /// When epoll file descriptor is ready, check if it's an expired timeout.
+    /// Return false if receive timeout expired and socket is not ready, return true otherwise.
+    bool checkTimeout();
+
     void reset();
 
     void resetResult();
 
-    void destroyFiber();
-
     ConnectionEstablisher connection_establisher;
     TryResult result;
     std::string fail_message;
 
-    Fiber fiber;
-    FiberStack fiber_stack;
-
     /// We use timer descriptor for checking socket receive timeout.
-    TimerDescriptor receive_timeout;
+    TimerDescriptor timeout_descriptor;
+    Poco::Timespan timeout;
+    AsyncEventTimeoutType timeout_type;
 
     /// In read callback we add socket file descriptor and timer descriptor with receive timeout
     /// in epoll, so we can return epoll file descriptor outside for polling.
@@ -120,10 +119,8 @@ private:
     int socket_fd = -1;
     std::string socket_description;
 
-    /// If and exception occurred in fiber resume, we save it and rethrow.
-    std::exception_ptr exception;
-
-    bool fiber_created = false;
+    bool is_finished = false;
+    bool restarted = false;
 };
 
 #endif
diff --git a/src/Client/ConnectionPool.h b/src/Client/ConnectionPool.h
index c3d0955019e..aacd0a063c7 100644
--- a/src/Client/ConnectionPool.h
+++ b/src/Client/ConnectionPool.h
@@ -135,7 +135,6 @@ private:
     Protocol::Compression compression; /// Whether to compress data when interacting with the server.
     Protocol::Secure secure;           /// Whether to encrypt data when interacting with the server.
     Int64 priority;                    /// priority from <remote_servers>
-
 };
 
 /**
@@ -192,6 +191,7 @@ inline bool operator==(const ConnectionPoolFactory::Key & lhs, const ConnectionP
 {
     return lhs.max_connections == rhs.max_connections && lhs.host == rhs.host && lhs.port == rhs.port
         && lhs.default_database == rhs.default_database && lhs.user == rhs.user && lhs.password == rhs.password
+        && lhs.quota_key == rhs.quota_key
         && lhs.cluster == rhs.cluster && lhs.cluster_secret == rhs.cluster_secret && lhs.client_name == rhs.client_name
         && lhs.compression == rhs.compression && lhs.secure == rhs.secure && lhs.priority == rhs.priority;
 }
diff --git a/src/Client/ConnectionPoolWithFailover.cpp b/src/Client/ConnectionPoolWithFailover.cpp
index c72825a54fe..129bc10bc27 100644
--- a/src/Client/ConnectionPoolWithFailover.cpp
+++ b/src/Client/ConnectionPoolWithFailover.cpp
@@ -52,7 +52,7 @@ IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts
 
     TryGetEntryFunc try_get_entry = [&](NestedPool & pool, std::string & fail_message)
     {
-        return tryGetEntry(pool, timeouts, fail_message, settings);
+        return tryGetEntry(pool, timeouts, fail_message, settings, {});
     };
 
     size_t offset = 0;
@@ -73,9 +73,9 @@ IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts
 
 Int64 ConnectionPoolWithFailover::getPriority() const
 {
-    return (*std::max_element(nested_pools.begin(), nested_pools.end(), [](const auto &a, const auto &b)
+    return (*std::max_element(nested_pools.begin(), nested_pools.end(), [](const auto & a, const auto & b)
     {
-        return a->getPriority() - b->getPriority();
+        return a->getPriority() < b->getPriority();
     }))->getPriority();
 }
 
@@ -112,11 +112,12 @@ ConnectionPoolWithFailover::Status ConnectionPoolWithFailover::getStatus() const
 
 std::vector<IConnectionPool::Entry> ConnectionPoolWithFailover::getMany(const ConnectionTimeouts & timeouts,
                                                                         const Settings * settings,
-                                                                        PoolMode pool_mode)
+                                                                        PoolMode pool_mode,
+                                                                        AsyncCallback async_callback)
 {
     TryGetEntryFunc try_get_entry = [&](NestedPool & pool, std::string & fail_message)
     {
-        return tryGetEntry(pool, timeouts, fail_message, settings);
+        return tryGetEntry(pool, timeouts, fail_message, settings, nullptr, async_callback);
     };
 
     std::vector<TryResult> results = getManyImpl(settings, pool_mode, try_get_entry);
@@ -144,11 +145,12 @@ std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::g
 std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::getManyChecked(
     const ConnectionTimeouts & timeouts,
     const Settings * settings, PoolMode pool_mode,
-    const QualifiedTableName & table_to_check)
+    const QualifiedTableName & table_to_check,
+    AsyncCallback async_callback)
 {
     TryGetEntryFunc try_get_entry = [&](NestedPool & pool, std::string & fail_message)
     {
-        return tryGetEntry(pool, timeouts, fail_message, settings, &table_to_check);
+        return tryGetEntry(pool, timeouts, fail_message, settings, &table_to_check, async_callback);
     };
 
     return getManyImpl(settings, pool_mode, try_get_entry);
@@ -209,8 +211,32 @@ ConnectionPoolWithFailover::tryGetEntry(
         const ConnectionTimeouts & timeouts,
         std::string & fail_message,
         const Settings * settings,
-        const QualifiedTableName * table_to_check)
+        const QualifiedTableName * table_to_check,
+        [[maybe_unused]] AsyncCallback async_callback)
 {
+#if defined(OS_LINUX)
+    if (async_callback)
+    {
+        ConnectionEstablisherAsync connection_establisher_async(&pool, &timeouts, settings, log, table_to_check);
+        while (true)
+        {
+            connection_establisher_async.resume();
+            if (connection_establisher_async.isFinished())
+                break;
+
+            async_callback(
+                connection_establisher_async.getFileDescriptor(),
+                0,
+                AsyncEventTimeoutType::NONE,
+                "Connection establisher file descriptor",
+                AsyncTaskExecutor::Event::READ | AsyncTaskExecutor::Event::ERROR);
+        }
+
+        fail_message = connection_establisher_async.getFailMessage();
+        return connection_establisher_async.getResult();
+    }
+#endif
+
     ConnectionEstablisher connection_establisher(&pool, &timeouts, settings, log, table_to_check);
     TryResult result;
     connection_establisher.run(result, fail_message);
diff --git a/src/Client/ConnectionPoolWithFailover.h b/src/Client/ConnectionPoolWithFailover.h
index df7dd572ef3..0273ce41589 100644
--- a/src/Client/ConnectionPoolWithFailover.h
+++ b/src/Client/ConnectionPoolWithFailover.h
@@ -54,7 +54,8 @@ public:
       * Connections provide access to different replicas of one shard.
       */
     std::vector<Entry> getMany(const ConnectionTimeouts & timeouts,
-                               const Settings * settings, PoolMode pool_mode);
+                               const Settings * settings, PoolMode pool_mode,
+                               AsyncCallback async_callback = {});
 
     /// The same as getMany(), but return std::vector<TryResult>.
     std::vector<TryResult> getManyForTableFunction(const ConnectionTimeouts & timeouts,
@@ -69,7 +70,8 @@ public:
             const ConnectionTimeouts & timeouts,
             const Settings * settings,
             PoolMode pool_mode,
-            const QualifiedTableName & table_to_check);
+            const QualifiedTableName & table_to_check,
+            AsyncCallback async_callback = {});
 
     struct NestedPoolStatus
     {
@@ -106,7 +108,8 @@ private:
             const ConnectionTimeouts & timeouts,
             std::string & fail_message,
             const Settings * settings,
-            const QualifiedTableName * table_to_check = nullptr);
+            const QualifiedTableName * table_to_check = nullptr,
+            AsyncCallback async_callback = {});
 
     GetPriorityFunc makeGetPriorityFunc(const Settings * settings);
 
diff --git a/src/Client/HedgedConnections.cpp b/src/Client/HedgedConnections.cpp
index b97f9454fa5..f8966847e5a 100644
--- a/src/Client/HedgedConnections.cpp
+++ b/src/Client/HedgedConnections.cpp
@@ -27,15 +27,14 @@ HedgedConnections::HedgedConnections(
     const ConnectionTimeouts & timeouts_,
     const ThrottlerPtr & throttler_,
     PoolMode pool_mode,
-    std::shared_ptr<QualifiedTableName> table_to_check_)
+    std::shared_ptr<QualifiedTableName> table_to_check_,
+    AsyncCallback async_callback)
     : hedged_connections_factory(pool_, &context_->getSettingsRef(), timeouts_, table_to_check_)
     , context(std::move(context_))
     , settings(context->getSettingsRef())
-    , drain_timeout(settings.drain_timeout)
-    , allow_changing_replica_until_first_data_packet(settings.allow_changing_replica_until_first_data_packet)
     , throttler(throttler_)
 {
-    std::vector<Connection *> connections = hedged_connections_factory.getManyConnections(pool_mode);
+    std::vector<Connection *> connections = hedged_connections_factory.getManyConnections(pool_mode, std::move(async_callback));
 
     if (connections.empty())
         return;
@@ -175,7 +174,7 @@ void HedgedConnections::sendQuery(
             modified_settings.group_by_two_level_threshold_bytes = 0;
         }
 
-        const bool enable_sample_offset_parallel_processing = settings.max_parallel_replicas > 1 && !settings.allow_experimental_parallel_reading_from_replicas;
+        const bool enable_sample_offset_parallel_processing = settings.max_parallel_replicas > 1 && settings.allow_experimental_parallel_reading_from_replicas == 0;
 
         if (offset_states.size() > 1 && enable_sample_offset_parallel_processing)
         {
@@ -185,7 +184,7 @@ void HedgedConnections::sendQuery(
 
         replica.connection->sendQuery(timeouts, query, /* query_parameters */ {}, query_id, stage, &modified_settings, &client_info, with_pending_data, {});
         replica.change_replica_timeout.setRelative(timeouts.receive_data_timeout);
-        replica.packet_receiver->setReceiveTimeout(hedged_connections_factory.getConnectionTimeouts().receive_timeout);
+        replica.packet_receiver->setTimeout(hedged_connections_factory.getConnectionTimeouts().receive_timeout);
     };
 
     for (auto & offset_status : offset_states)
@@ -263,7 +262,7 @@ Packet HedgedConnections::drain()
 
     while (!epoll.empty())
     {
-        ReplicaLocation location = getReadyReplicaLocation(DrainCallback{drain_timeout});
+        ReplicaLocation location = getReadyReplicaLocation();
         Packet packet = receivePacketFromReplica(location);
         switch (packet.type)
         {
@@ -290,10 +289,10 @@ Packet HedgedConnections::drain()
 Packet HedgedConnections::receivePacket()
 {
     std::lock_guard lock(cancel_mutex);
-    return receivePacketUnlocked({}, false /* is_draining */);
+    return receivePacketUnlocked({});
 }
 
-Packet HedgedConnections::receivePacketUnlocked(AsyncCallback async_callback, bool /* is_draining */)
+Packet HedgedConnections::receivePacketUnlocked(AsyncCallback async_callback)
 {
     if (!sent_query)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot receive packets: no query sent.");
@@ -350,14 +349,14 @@ HedgedConnections::ReplicaLocation HedgedConnections::getReadyReplicaLocation(As
 bool HedgedConnections::resumePacketReceiver(const HedgedConnections::ReplicaLocation & location)
 {
     ReplicaState & replica_state = offset_states[location.offset].replicas[location.index];
-    auto res = replica_state.packet_receiver->resume();
+    replica_state.packet_receiver->resume();
 
-    if (std::holds_alternative<Packet>(res))
+    if (replica_state.packet_receiver->isPacketReady())
     {
-        last_received_packet = std::move(std::get<Packet>(res));
+        last_received_packet = replica_state.packet_receiver->getPacket();
         return true;
     }
-    else if (std::holds_alternative<Poco::Timespan>(res))
+    else if (replica_state.packet_receiver->isTimeoutExpired())
     {
         const String & description = replica_state.connection->getDescription();
         finishProcessReplica(replica_state, true);
@@ -368,12 +367,12 @@ bool HedgedConnections::resumePacketReceiver(const HedgedConnections::ReplicaLoc
                 ErrorCodes::SOCKET_TIMEOUT,
                 "Timeout exceeded while reading from socket ({}, receive timeout {} ms)",
                 description,
-                std::get<Poco::Timespan>(res).totalMilliseconds());
+                replica_state.packet_receiver->getTimeout().totalMilliseconds());
     }
-    else if (std::holds_alternative<std::exception_ptr>(res))
+    else if (replica_state.packet_receiver->hasException())
     {
         finishProcessReplica(replica_state, true);
-        std::rethrow_exception(std::get<std::exception_ptr>(res));
+        std::rethrow_exception(replica_state.packet_receiver->getException());
     }
 
     return false;
@@ -389,7 +388,7 @@ int HedgedConnections::getReadyFileDescriptor(AsyncCallback async_callback)
     {
         events_count = epoll.getManyReady(1, &event, blocking);
         if (!events_count && async_callback)
-            async_callback(epoll.getFileDescriptor(), 0, epoll.getDescription());
+            async_callback(epoll.getFileDescriptor(), 0, AsyncEventTimeoutType::NONE, epoll.getDescription(), AsyncTaskExecutor::Event::READ | AsyncTaskExecutor::Event::ERROR);
     }
     return event.data.fd;
 }
@@ -413,7 +412,7 @@ Packet HedgedConnections::receivePacketFromReplica(const ReplicaLocation & repli
             {
                 /// If we are allowed to change replica until the first data packet,
                 /// just restart timeout (if it hasn't expired yet). Otherwise disable changing replica with this offset.
-                if (allow_changing_replica_until_first_data_packet && !replica.is_change_replica_timeout_expired)
+                if (settings.allow_changing_replica_until_first_data_packet && !replica.is_change_replica_timeout_expired)
                     replica.change_replica_timeout.setRelative(hedged_connections_factory.getConnectionTimeouts().receive_data_timeout);
                 else
                     disableChangingReplica(replica_location);
@@ -573,5 +572,17 @@ void HedgedConnections::finishProcessReplica(ReplicaState & replica, bool discon
     replica.connection = nullptr;
 }
 
+void HedgedConnections::setAsyncCallback(AsyncCallback async_callback)
+{
+    for (auto & offset_status : offset_states)
+    {
+        for (auto & replica : offset_status.replicas)
+        {
+            if (replica.connection)
+                replica.connection->setAsyncCallback(async_callback);
+        }
+    }
+}
+
 }
 #endif
diff --git a/src/Client/HedgedConnections.h b/src/Client/HedgedConnections.h
index 40f031a16a6..ccdc59965e2 100644
--- a/src/Client/HedgedConnections.h
+++ b/src/Client/HedgedConnections.h
@@ -75,7 +75,8 @@ public:
                       const ConnectionTimeouts & timeouts_,
                       const ThrottlerPtr & throttler,
                       PoolMode pool_mode,
-                      std::shared_ptr<QualifiedTableName> table_to_check_ = nullptr);
+                      std::shared_ptr<QualifiedTableName> table_to_check_ = nullptr,
+                      AsyncCallback async_callback = {});
 
     void sendScalarsData(Scalars & data) override;
 
@@ -101,7 +102,7 @@ public:
 
     Packet receivePacket() override;
 
-    Packet receivePacketUnlocked(AsyncCallback async_callback, bool is_draining) override;
+    Packet receivePacketUnlocked(AsyncCallback async_callback) override;
 
     void disconnect() override;
 
@@ -119,6 +120,8 @@ public:
 
     void setReplicaInfo(ReplicaInfo value) override { replica_info = value; }
 
+    void setAsyncCallback(AsyncCallback async_callback) override;
+
 private:
     /// If we don't receive data from replica and there is no progress in query
     /// execution for receive_data_timeout, we are trying to get new
@@ -196,12 +199,6 @@ private:
     Epoll epoll;
     ContextPtr context;
     const Settings & settings;
-
-    /// The following two fields are from settings but can be referenced outside the lifetime of
-    /// settings when connection is drained asynchronously.
-    Poco::Timespan drain_timeout;
-    bool allow_changing_replica_until_first_data_packet;
-
     ThrottlerPtr throttler;
     bool sent_query = false;
     bool cancelled = false;
diff --git a/src/Client/HedgedConnectionsFactory.cpp b/src/Client/HedgedConnectionsFactory.cpp
index 1179aedc285..eb2a33b1ccc 100644
--- a/src/Client/HedgedConnectionsFactory.cpp
+++ b/src/Client/HedgedConnectionsFactory.cpp
@@ -30,7 +30,7 @@ HedgedConnectionsFactory::HedgedConnectionsFactory(
 {
     shuffled_pools = pool->getShuffledPools(settings);
     for (auto shuffled_pool : shuffled_pools)
-        replicas.emplace_back(ConnectionEstablisherAsync(shuffled_pool.pool, &timeouts, settings, log, table_to_check.get()));
+        replicas.emplace_back(std::make_unique<ConnectionEstablisherAsync>(shuffled_pool.pool, &timeouts, settings, log, table_to_check.get()));
 
     max_tries
         = (settings ? size_t{settings->connections_with_failover_max_tries} : size_t{DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES});
@@ -53,7 +53,7 @@ HedgedConnectionsFactory::~HedgedConnectionsFactory()
     pool->updateSharedError(shuffled_pools);
 }
 
-std::vector<Connection *> HedgedConnectionsFactory::getManyConnections(PoolMode pool_mode)
+std::vector<Connection *> HedgedConnectionsFactory::getManyConnections(PoolMode pool_mode, AsyncCallback async_callback)
 {
     size_t min_entries = (settings && settings->skip_unavailable_shards) ? 0 : 1;
 
@@ -100,7 +100,7 @@ std::vector<Connection *> HedgedConnectionsFactory::getManyConnections(PoolMode
     while (connections.size() < max_entries)
     {
         /// Set blocking = true to avoid busy-waiting here.
-        auto state = waitForReadyConnectionsImpl(/*blocking = */true, connection);
+        auto state = waitForReadyConnectionsImpl(/*blocking = */true, connection, async_callback);
         if (state == State::READY)
             connections.push_back(connection);
         else if (state == State::CANNOT_CHOOSE)
@@ -137,12 +137,13 @@ HedgedConnectionsFactory::State HedgedConnectionsFactory::startNewConnection(Con
 
 HedgedConnectionsFactory::State HedgedConnectionsFactory::waitForReadyConnections(Connection *& connection_out)
 {
-    return waitForReadyConnectionsImpl(false, connection_out);
+    AsyncCallback async_callback = {};
+    return waitForReadyConnectionsImpl(false, connection_out, async_callback);
 }
 
-HedgedConnectionsFactory::State HedgedConnectionsFactory::waitForReadyConnectionsImpl(bool blocking, Connection *& connection_out)
+HedgedConnectionsFactory::State HedgedConnectionsFactory::waitForReadyConnectionsImpl(bool blocking, Connection *& connection_out, AsyncCallback & async_callback)
 {
-    State state = processEpollEvents(blocking, connection_out);
+    State state = processEpollEvents(blocking, connection_out, async_callback);
     if (state != State::CANNOT_CHOOSE)
         return state;
 
@@ -176,7 +177,7 @@ int HedgedConnectionsFactory::getNextIndex()
         next_index = (next_index + 1) % shuffled_pools.size();
 
         /// Check if we can try this replica.
-        if (replicas[next_index].connection_establisher.getResult().entry.isNull()
+        if (replicas[next_index].connection_establisher->getResult().entry.isNull()
             && (max_tries == 0 || shuffled_pools[next_index].error_count < max_tries))
             finish = true;
 
@@ -206,12 +207,12 @@ HedgedConnectionsFactory::State HedgedConnectionsFactory::startNewConnectionImpl
     return state;
 }
 
-HedgedConnectionsFactory::State HedgedConnectionsFactory::processEpollEvents(bool blocking, Connection *& connection_out)
+HedgedConnectionsFactory::State HedgedConnectionsFactory::processEpollEvents(bool blocking, Connection *& connection_out, AsyncCallback & async_callback)
 {
     int event_fd;
     while (!epoll.empty())
     {
-        event_fd = getReadyFileDescriptor(blocking);
+        event_fd = getReadyFileDescriptor(blocking, async_callback);
 
         if (event_fd == -1)
             return State::NOT_READY;
@@ -250,22 +251,37 @@ HedgedConnectionsFactory::State HedgedConnectionsFactory::processEpollEvents(boo
     return State::CANNOT_CHOOSE;
 }
 
-int HedgedConnectionsFactory::getReadyFileDescriptor(bool blocking)
+int HedgedConnectionsFactory::getReadyFileDescriptor(bool blocking, AsyncCallback & async_callback)
 {
     epoll_event event;
     event.data.fd = -1;
-    epoll.getManyReady(1, &event, blocking);
+    if (!blocking)
+    {
+        epoll.getManyReady(1, &event, false);
+        return event.data.fd;
+    }
+
+    size_t events_count = 0;
+    while (events_count == 0)
+    {
+        events_count = epoll.getManyReady(1, &event, !static_cast<bool>(async_callback));
+        if (!events_count && async_callback)
+            async_callback(epoll.getFileDescriptor(), 0, AsyncEventTimeoutType::NONE, epoll.getDescription(), AsyncTaskExecutor::Event::READ | AsyncTaskExecutor::Event::ERROR);
+    }
     return event.data.fd;
 }
 
 HedgedConnectionsFactory::State HedgedConnectionsFactory::resumeConnectionEstablisher(int index, Connection *& connection_out)
 {
-    auto res = replicas[index].connection_establisher.resume();
+    replicas[index].connection_establisher->resume();
 
-    if (std::holds_alternative<TryResult>(res))
-        return processFinishedConnection(index, std::get<TryResult>(res), connection_out);
+    if (replicas[index].connection_establisher->isCancelled())
+        return State::CANNOT_CHOOSE;
 
-    int fd = std::get<int>(res);
+    if (replicas[index].connection_establisher->isFinished())
+        return processFinishedConnection(index, replicas[index].connection_establisher->getResult(), connection_out);
+
+    int fd = replicas[index].connection_establisher->getFileDescriptor();
     if (!fd_to_replica_index.contains(fd))
         addNewReplicaToEpoll(index, fd);
 
@@ -274,7 +290,7 @@ HedgedConnectionsFactory::State HedgedConnectionsFactory::resumeConnectionEstabl
 
 HedgedConnectionsFactory::State HedgedConnectionsFactory::processFinishedConnection(int index, TryResult result, Connection *& connection_out)
 {
-    const std::string & fail_message = replicas[index].connection_establisher.getFailMessage();
+    const std::string & fail_message = replicas[index].connection_establisher->getFailMessage();
     if (!fail_message.empty())
         fail_messages += fail_message + "\n";
 
@@ -324,7 +340,7 @@ void HedgedConnectionsFactory::stopChoosingReplicas()
     {
         --replicas_in_process_count;
         epoll.remove(fd);
-        replicas[index].connection_establisher.cancel();
+        replicas[index].connection_establisher->cancel();
     }
 
     for (auto & [timeout_fd, index] : timeout_fd_to_replica_index)
@@ -374,7 +390,7 @@ HedgedConnectionsFactory::State HedgedConnectionsFactory::setBestUsableReplica(C
     for (size_t i = 0; i != replicas.size(); ++i)
     {
         /// Don't add unusable, failed replicas and replicas that are ready or in process.
-        TryResult result = replicas[i].connection_establisher.getResult();
+        TryResult result = replicas[i].connection_establisher->getResult();
         if (!result.entry.isNull()
             && result.is_usable
             && !replicas[i].is_ready
@@ -391,11 +407,11 @@ HedgedConnectionsFactory::State HedgedConnectionsFactory::setBestUsableReplica(C
         indexes.end(),
         [&](size_t lhs, size_t rhs)
         {
-            return replicas[lhs].connection_establisher.getResult().staleness < replicas[rhs].connection_establisher.getResult().staleness;
+            return replicas[lhs].connection_establisher->getResult().staleness < replicas[rhs].connection_establisher->getResult().staleness;
         });
 
     replicas[indexes[0]].is_ready = true;
-    TryResult result = replicas[indexes[0]].connection_establisher.getResult();
+    TryResult result = replicas[indexes[0]].connection_establisher->getResult();
     connection_out = &*result.entry;
     return State::READY;
 }
diff --git a/src/Client/HedgedConnectionsFactory.h b/src/Client/HedgedConnectionsFactory.h
index 194e962d549..009e7e868ab 100644
--- a/src/Client/HedgedConnectionsFactory.h
+++ b/src/Client/HedgedConnectionsFactory.h
@@ -36,11 +36,11 @@ public:
 
     struct ReplicaStatus
     {
-        explicit ReplicaStatus(ConnectionEstablisherAsync connection_stablisher_) : connection_establisher(std::move(connection_stablisher_))
+        explicit ReplicaStatus(std::unique_ptr<ConnectionEstablisherAsync> connection_stablisher_) : connection_establisher(std::move(connection_stablisher_))
         {
         }
 
-        ConnectionEstablisherAsync connection_establisher;
+        std::unique_ptr<ConnectionEstablisherAsync> connection_establisher;
         TimerDescriptor change_replica_timeout;
         bool is_ready = false;
     };
@@ -51,7 +51,7 @@ public:
                         std::shared_ptr<QualifiedTableName> table_to_check_ = nullptr);
 
     /// Create and return active connections according to pool_mode.
-    std::vector<Connection *> getManyConnections(PoolMode pool_mode);
+    std::vector<Connection *> getManyConnections(PoolMode pool_mode, AsyncCallback async_callback = {});
 
     /// Try to get connection to the new replica without blocking. Process all current events in epoll (connections, timeouts),
     /// Returned state might be READY (connection established successfully),
@@ -78,7 +78,7 @@ public:
     ~HedgedConnectionsFactory();
 
 private:
-    State waitForReadyConnectionsImpl(bool blocking, Connection *& connection_out);
+    State waitForReadyConnectionsImpl(bool blocking, Connection *& connection_out, AsyncCallback & async_callback);
 
     /// Try to start establishing connection to the new replica. Return
     /// the index of the new replica or -1 if cannot start new connection.
@@ -88,7 +88,7 @@ private:
     /// Return -1 if there is no free replica.
     int getNextIndex();
 
-    int getReadyFileDescriptor(bool blocking);
+    int getReadyFileDescriptor(bool blocking, AsyncCallback & async_callback);
 
     void processFailedConnection(int index, const std::string & fail_message);
 
@@ -102,7 +102,7 @@ private:
 
     /// Return NOT_READY state if there is no ready events, READY if replica is ready
     /// and CANNOT_CHOOSE if there is no more events in epoll.
-    State processEpollEvents(bool blocking, Connection *& connection_out);
+    State processEpollEvents(bool blocking, Connection *& connection_out, AsyncCallback & async_callback);
 
     State setBestUsableReplica(Connection *& connection_out);
 
diff --git a/src/Client/IConnections.cpp b/src/Client/IConnections.cpp
deleted file mode 100644
index 9cc5a62ce12..00000000000
--- a/src/Client/IConnections.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <Client/IConnections.h>
-#include <Poco/Net/SocketImpl.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int SOCKET_TIMEOUT;
-}
-
-/// This wrapper struct allows us to use Poco's socket polling code with a raw fd.
-/// The only difference from Poco::Net::SocketImpl is that we don't close the fd in the destructor.
-struct PocoSocketWrapper : public Poco::Net::SocketImpl
-{
-    explicit PocoSocketWrapper(int fd)
-    {
-        reset(fd);
-    }
-
-    // Do not close fd.
-    ~PocoSocketWrapper() override { reset(-1); }
-};
-
-void IConnections::DrainCallback::operator()(int fd, Poco::Timespan, const std::string & fd_description) const
-{
-    if (!PocoSocketWrapper(fd).poll(drain_timeout, Poco::Net::Socket::SELECT_READ))
-    {
-        throw Exception(ErrorCodes::SOCKET_TIMEOUT,
-            "Read timeout ({} ms) while draining from {}",
-            drain_timeout.totalMilliseconds(),
-            fd_description);
-    }
-}
-
-}
diff --git a/src/Client/IConnections.h b/src/Client/IConnections.h
index 0040eeb31ed..ee17d198fc3 100644
--- a/src/Client/IConnections.h
+++ b/src/Client/IConnections.h
@@ -13,12 +13,6 @@ namespace DB
 class IConnections : boost::noncopyable
 {
 public:
-    struct DrainCallback
-    {
-        Poco::Timespan drain_timeout;
-        void operator()(int fd, Poco::Timespan, const std::string & fd_description = "") const;
-    };
-
     /// Send all scalars to replicas.
     virtual void sendScalarsData(Scalars & data) = 0;
     /// Send all content of external tables to replicas.
@@ -40,7 +34,7 @@ public:
     virtual Packet receivePacket() = 0;
 
     /// Version of `receivePacket` function without locking.
-    virtual Packet receivePacketUnlocked(AsyncCallback async_callback, bool is_draining) = 0;
+    virtual Packet receivePacketUnlocked(AsyncCallback async_callback) = 0;
 
     /// Break all active connections.
     virtual void disconnect() = 0;
@@ -78,6 +72,8 @@ public:
     virtual bool hasActiveConnections() const = 0;
 
     virtual ~IConnections() = default;
+
+    virtual void setAsyncCallback(AsyncCallback) {}
 };
 
 }
diff --git a/src/Client/LineReader.cpp b/src/Client/LineReader.cpp
index f49e48be617..04b387c9f7d 100644
--- a/src/Client/LineReader.cpp
+++ b/src/Client/LineReader.cpp
@@ -12,9 +12,7 @@
 #include <sys/types.h>
 
 
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 namespace
 {
diff --git a/src/Client/LineReader.h b/src/Client/LineReader.h
index 321cf41b77e..df64a3a85a9 100644
--- a/src/Client/LineReader.h
+++ b/src/Client/LineReader.h
@@ -46,7 +46,10 @@ public:
     /// clickhouse-client so that without -m flag, one can still paste multiline queries, and
     /// possibly get better pasting performance. See https://cirw.in/blog/bracketed-paste for
     /// more details.
+    /// These methods (if implemented) emit the control characters immediately, without waiting
+    /// for the next readLine() call.
     virtual void enableBracketedPaste() {}
+    virtual void disableBracketedPaste() {}
 
 protected:
     enum InputStatus
diff --git a/src/Client/LocalConnection.cpp b/src/Client/LocalConnection.cpp
index 712ff5f5a31..6bb792ac51e 100644
--- a/src/Client/LocalConnection.cpp
+++ b/src/Client/LocalConnection.cpp
@@ -6,6 +6,7 @@
 #include <Processors/Executors/PushingAsyncPipelineExecutor.h>
 #include <Storages/IStorage.h>
 #include <Common/ConcurrentBoundedQueue.h>
+#include <Common/CurrentThread.h>
 #include <Core/Protocol.h>
 
 
@@ -72,9 +73,6 @@ void LocalConnection::sendQuery(
     bool,
     std::function<void(const Progress &)> process_progress_callback)
 {
-    if (!query_parameters.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "clickhouse local does not support query parameters");
-
     /// Suggestion comes without client_info.
     if (client_info)
         query_context = session.makeQueryContext(*client_info);
@@ -89,6 +87,7 @@ void LocalConnection::sendQuery(
     if (!current_database.empty())
         query_context->setCurrentDatabase(current_database);
 
+    query_context->addQueryParameters(query_parameters);
 
     state.reset();
     state.emplace();
@@ -483,7 +482,7 @@ void LocalConnection::setDefaultDatabase(const String & database)
 
 UInt64 LocalConnection::getServerRevision(const ConnectionTimeouts &)
 {
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented");
+    return DBMS_TCP_PROTOCOL_VERSION;
 }
 
 const String & LocalConnection::getServerTimezone(const ConnectionTimeouts &)
diff --git a/src/Client/LocalConnection.h b/src/Client/LocalConnection.h
index 3e6fc007fb9..fb8f9003364 100644
--- a/src/Client/LocalConnection.h
+++ b/src/Client/LocalConnection.h
@@ -7,6 +7,7 @@
 #include <Interpreters/Session.h>
 #include <Interpreters/ProfileEventsExt.h>
 #include <Storages/ColumnsDescription.h>
+#include <Common/CurrentThread.h>
 
 
 namespace DB
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index cc260353339..71f536b9687 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -20,7 +20,7 @@ namespace ErrorCodes
 
 
 MultiplexedConnections::MultiplexedConnections(Connection & connection, const Settings & settings_, const ThrottlerPtr & throttler)
-    : settings(settings_), drain_timeout(settings.drain_timeout), receive_timeout(settings.receive_timeout)
+    : settings(settings_)
 {
     connection.setThrottler(throttler);
 
@@ -33,7 +33,7 @@ MultiplexedConnections::MultiplexedConnections(Connection & connection, const Se
 
 
 MultiplexedConnections::MultiplexedConnections(std::shared_ptr<Connection> connection_ptr_, const Settings & settings_, const ThrottlerPtr & throttler)
-    : settings(settings_), drain_timeout(settings.drain_timeout), receive_timeout(settings.receive_timeout)
+    : settings(settings_)
     , connection_ptr(connection_ptr_)
 {
     connection_ptr->setThrottler(throttler);
@@ -46,8 +46,9 @@ MultiplexedConnections::MultiplexedConnections(std::shared_ptr<Connection> conne
 }
 
 MultiplexedConnections::MultiplexedConnections(
-    std::vector<IConnectionPool::Entry> && connections, const Settings & settings_, const ThrottlerPtr & throttler)
-    : settings(settings_), drain_timeout(settings.drain_timeout), receive_timeout(settings.receive_timeout)
+        std::vector<IConnectionPool::Entry> && connections,
+        const Settings & settings_, const ThrottlerPtr & throttler)
+    : settings(settings_)
 {
     /// If we didn't get any connections from pool and getMany() did not throw exceptions, this means that
     /// `skip_unavailable_shards` was set. Then just return.
@@ -141,7 +142,7 @@ void MultiplexedConnections::sendQuery(
         }
     }
 
-    const bool enable_sample_offset_parallel_processing = settings.max_parallel_replicas > 1 && !settings.allow_experimental_parallel_reading_from_replicas;
+    const bool enable_sample_offset_parallel_processing = settings.max_parallel_replicas > 1 && settings.allow_experimental_parallel_reading_from_replicas == 0;
 
     size_t num_replicas = replica_states.size();
     if (num_replicas > 1)
@@ -206,7 +207,7 @@ void MultiplexedConnections::sendMergeTreeReadTaskResponse(const ParallelReadRes
 Packet MultiplexedConnections::receivePacket()
 {
     std::lock_guard lock(cancel_mutex);
-    Packet packet = receivePacketUnlocked({}, false /* is_draining */);
+    Packet packet = receivePacketUnlocked({});
     return packet;
 }
 
@@ -254,7 +255,7 @@ Packet MultiplexedConnections::drain()
 
     while (hasActiveConnections())
     {
-        Packet packet = receivePacketUnlocked(DrainCallback{drain_timeout}, true /* is_draining */);
+        Packet packet = receivePacketUnlocked({});
 
         switch (packet.type)
         {
@@ -304,14 +305,14 @@ std::string MultiplexedConnections::dumpAddressesUnlocked() const
     return buf.str();
 }
 
-Packet MultiplexedConnections::receivePacketUnlocked(AsyncCallback async_callback, bool is_draining)
+Packet MultiplexedConnections::receivePacketUnlocked(AsyncCallback async_callback)
 {
     if (!sent_query)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot receive packets: no query sent.");
     if (!hasActiveConnections())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "No more packets are available.");
 
-    ReplicaState & state = getReplicaForReading(is_draining);
+    ReplicaState & state = getReplicaForReading();
     current_connection = state.connection;
     if (current_connection == nullptr)
         throw Exception(ErrorCodes::NO_AVAILABLE_REPLICA, "Logical error: no available replica");
@@ -366,10 +367,9 @@ Packet MultiplexedConnections::receivePacketUnlocked(AsyncCallback async_callbac
     return packet;
 }
 
-MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForReading(bool is_draining)
+MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForReading()
 {
-    /// Fast path when we only focus on one replica and are not draining the connection.
-    if (replica_states.size() == 1 && !is_draining)
+    if (replica_states.size() == 1)
         return replica_states[0];
 
     Poco::Net::Socket::SocketList read_list;
@@ -390,7 +390,7 @@ MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForRead
         Poco::Net::Socket::SocketList write_list;
         Poco::Net::Socket::SocketList except_list;
 
-        auto timeout = is_draining ? drain_timeout : receive_timeout;
+        auto timeout = settings.receive_timeout;
         int n = 0;
 
         /// EINTR loop
@@ -417,9 +417,7 @@ MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForRead
             break;
         }
 
-        /// We treat any error as timeout for simplicity.
-        /// And we also check if read_list is still empty just in case.
-        if (n <= 0 || read_list.empty())
+        if (n == 0)
         {
             const auto & addresses = dumpAddressesUnlocked();
             for (ReplicaState & state : replica_states)
@@ -438,7 +436,9 @@ MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForRead
         }
     }
 
-    /// TODO Motivation of rand is unclear.
+    /// TODO Absolutely wrong code: read_list could be empty; motivation of rand is unclear.
+    /// This code path is disabled by default.
+
     auto & socket = read_list[thread_local_rng() % read_list.size()];
     if (fd_to_replica_state_idx.empty())
     {
@@ -460,4 +460,13 @@ void MultiplexedConnections::invalidateReplica(ReplicaState & state)
     --active_connection_count;
 }
 
+void MultiplexedConnections::setAsyncCallback(AsyncCallback async_callback)
+{
+    for (ReplicaState & state : replica_states)
+    {
+        if (state.connection)
+            state.connection->setAsyncCallback(async_callback);
+    }
+}
+
 }
diff --git a/src/Client/MultiplexedConnections.h b/src/Client/MultiplexedConnections.h
index dd228067ed2..371639d14c4 100644
--- a/src/Client/MultiplexedConnections.h
+++ b/src/Client/MultiplexedConnections.h
@@ -64,8 +64,11 @@ public:
     bool hasActiveConnections() const override { return active_connection_count > 0; }
 
     void setReplicaInfo(ReplicaInfo value) override { replica_info = value; }
+
+    void setAsyncCallback(AsyncCallback async_callback) override;
+
 private:
-    Packet receivePacketUnlocked(AsyncCallback async_callback, bool is_draining) override;
+    Packet receivePacketUnlocked(AsyncCallback async_callback) override;
 
     /// Internal version of `dumpAddresses` function without locking.
     std::string dumpAddressesUnlocked() const;
@@ -78,18 +81,13 @@ private:
     };
 
     /// Get a replica where you can read the data.
-    ReplicaState & getReplicaForReading(bool is_draining);
+    ReplicaState & getReplicaForReading();
 
     /// Mark the replica as invalid.
     void invalidateReplica(ReplicaState & replica_state);
 
     const Settings & settings;
 
-    /// The following two fields are from settings but can be referenced outside the lifetime of
-    /// settings when connection is drained asynchronously.
-    Poco::Timespan drain_timeout;
-    Poco::Timespan receive_timeout;
-
     /// The current number of valid connections to the replicas of this shard.
     size_t active_connection_count = 0;
 
diff --git a/src/Client/PacketReceiver.cpp b/src/Client/PacketReceiver.cpp
new file mode 100644
index 00000000000..7c6dbb19212
--- /dev/null
+++ b/src/Client/PacketReceiver.cpp
@@ -0,0 +1,74 @@
+#include <Client/PacketReceiver.h>
+
+#if defined(OS_LINUX)
+
+namespace DB
+{
+
+PacketReceiver::PacketReceiver(Connection * connection_) : AsyncTaskExecutor(std::make_unique<Task>(*this)), connection(connection_)
+{
+    epoll.add(timeout_descriptor.getDescriptor());
+    socket_fd = connection->getSocket()->impl()->sockfd();
+    epoll.add(socket_fd);
+}
+
+bool PacketReceiver::checkBeforeTaskResume()
+{
+    /// If there is no pending data, check timeout.
+    return connection->hasReadPendingData() || checkTimeout();
+}
+
+void PacketReceiver::processAsyncEvent(int fd [[maybe_unused]], Poco::Timespan socket_timeout, AsyncEventTimeoutType, const std::string &, uint32_t)
+{
+    assert(fd == socket_fd);
+    timeout_descriptor.setRelative(socket_timeout);
+    timeout = socket_timeout;
+    is_read_in_process = true;
+}
+
+void PacketReceiver::clearAsyncEvent()
+{
+    is_read_in_process = false;
+    timeout_descriptor.reset();
+}
+
+bool PacketReceiver::checkTimeout()
+{
+    bool is_socket_ready = false;
+
+    epoll_event events[2];
+    events[0].data.fd = events[1].data.fd = -1;
+    size_t ready_count = epoll.getManyReady(2, events, true);
+
+    for (size_t i = 0; i != ready_count; ++i)
+    {
+        if (events[i].data.fd == socket_fd)
+            is_socket_ready = true;
+        if (events[i].data.fd == timeout_descriptor.getDescriptor())
+            is_timeout_expired = true;
+    }
+
+    if (is_timeout_expired && !is_socket_ready)
+    {
+        timeout_descriptor.reset();
+        return false;
+    }
+
+    return true;
+}
+
+void PacketReceiver::Task::run(AsyncCallback async_callback, ResumeCallback suspend_callback)
+{
+    while (true)
+    {
+        {
+            AsyncCallbackSetter async_setter(receiver.connection, async_callback);
+            receiver.packet = receiver.connection->receivePacket();
+        }
+        suspend_callback();
+    }
+}
+
+}
+
+#endif
diff --git a/src/Client/PacketReceiver.h b/src/Client/PacketReceiver.h
index c9c61f523f7..99e5f7c2f10 100644
--- a/src/Client/PacketReceiver.h
+++ b/src/Client/PacketReceiver.h
@@ -9,6 +9,7 @@
 #include <Common/Fiber.h>
 #include <Common/Epoll.h>
 #include <Common/TimerDescriptor.h>
+#include <Common/AsyncTaskExecutor.h>
 
 namespace DB
 {
@@ -19,138 +20,58 @@ namespace DB
 /// socket and receive timeout are added in epoll and execution returns to the main program.
 /// So, you can poll this epoll file descriptor to determine when to resume
 /// packet receiving.
-class PacketReceiver
+class PacketReceiver : public AsyncTaskExecutor
 {
 public:
-    explicit PacketReceiver(Connection * connection_) : connection(connection_)
+    explicit PacketReceiver(Connection * connection_);
+
+    bool isPacketReady() const { return !is_read_in_process && !is_timeout_expired && !exception; }
+    Packet getPacket() { return std::move(packet); }
+
+    bool hasException() const { return exception.operator bool(); }
+    std::exception_ptr getException() const { return exception; }
+
+    bool isTimeoutExpired() const { return is_timeout_expired; }
+    Poco::Timespan getTimeout() const { return timeout; }
+
+    void setTimeout(const Poco::Timespan & timeout_)
     {
-        epoll.add(receive_timeout.getDescriptor());
-        epoll.add(connection->getSocket()->impl()->sockfd());
-
-        fiber = boost::context::fiber(std::allocator_arg_t(), fiber_stack, Routine{*this});
-    }
-
-    /// Resume packet receiving.
-    std::variant<int, Packet, Poco::Timespan, std::exception_ptr> resume()
-    {
-        /// If there is no pending data, check receive timeout.
-        if (!connection->hasReadPendingData() && !checkReceiveTimeout())
-        {
-            /// Receive timeout expired.
-            return connection->getSocket()->getReceiveTimeout();
-        }
-
-        /// Resume fiber.
-        fiber = std::move(fiber).resume();
-        if (exception)
-            return std::move(exception);
-
-        if (is_read_in_process)
-            return epoll.getFileDescriptor();
-
-        /// Receiving packet was finished.
-        return std::move(packet);
-    }
-
-    void cancel()
-    {
-        Fiber to_destroy = std::move(fiber);
-        connection = nullptr;
+        timeout_descriptor.setRelative(timeout_);
+        timeout = timeout_;
     }
 
     int getFileDescriptor() const { return epoll.getFileDescriptor(); }
 
-    void setReceiveTimeout(const Poco::Timespan & timeout)
-    {
-        receive_timeout.setRelative(timeout);
-    }
-
 private:
-    /// When epoll file descriptor is ready, check if it's an expired timeout.
-    /// Return false if receive timeout expired and socket is not ready, return true otherwise.
-    bool checkReceiveTimeout()
+    bool checkBeforeTaskResume() override;
+    void afterTaskResume() override {}
+
+    void processAsyncEvent(int fd, Poco::Timespan socket_timeout, AsyncEventTimeoutType, const std::string &, uint32_t) override;
+    void clearAsyncEvent() override;
+
+    void processException(std::exception_ptr e) override { exception = e; }
+
+    struct Task : public AsyncTask
     {
-        bool is_socket_ready = false;
-        bool is_receive_timeout_expired = false;
+        Task(PacketReceiver & receiver_) : receiver(receiver_) {}
 
-        epoll_event events[2];
-        events[0].data.fd = events[1].data.fd = -1;
-        size_t ready_count = epoll.getManyReady(2, events, true);
-
-        for (size_t i = 0; i != ready_count; ++i)
-        {
-            if (events[i].data.fd == connection->getSocket()->impl()->sockfd())
-                is_socket_ready = true;
-            if (events[i].data.fd == receive_timeout.getDescriptor())
-                is_receive_timeout_expired = true;
-        }
-
-        if (is_receive_timeout_expired && !is_socket_ready)
-        {
-            receive_timeout.reset();
-            return false;
-        }
-
-        return true;
-    }
-
-    struct Routine
-    {
         PacketReceiver & receiver;
 
-        struct ReadCallback
-        {
-            PacketReceiver & receiver;
-            Fiber & sink;
-
-            void operator()(int, Poco::Timespan timeout, const std::string &)
-            {
-                receiver.receive_timeout.setRelative(timeout);
-                receiver.is_read_in_process = true;
-                sink = std::move(sink).resume();
-                receiver.is_read_in_process = false;
-                receiver.receive_timeout.reset();
-            }
-        };
-
-        Fiber operator()(Fiber && sink)
-        {
-            try
-            {
-                while (true)
-                {
-                    {
-                        AsyncCallbackSetter async_setter(receiver.connection, ReadCallback{receiver, sink});
-                        receiver.packet = receiver.connection->receivePacket();
-                    }
-                    sink = std::move(sink).resume();
-                }
-
-            }
-            catch (const boost::context::detail::forced_unwind &)
-            {
-                /// This exception is thrown by fiber implementation in case if fiber is being deleted but hasn't exited
-                /// It should not be caught or it will segfault.
-                /// Other exceptions must be caught
-                throw;
-            }
-            catch (...)
-            {
-                receiver.exception = std::current_exception();
-            }
-
-            return std::move(sink);
-        }
+        void run(AsyncCallback async_callback, ResumeCallback suspend_callback) override;
     };
 
+    /// When epoll file descriptor is ready, check if it's an expired timeout.
+    /// Return false if receive timeout expired and socket is not ready, return true otherwise.
+    bool checkTimeout();
+
     Connection * connection;
+    int socket_fd = -1;
     Packet packet;
 
-    Fiber fiber;
-    FiberStack fiber_stack;
-
-    /// We use timer descriptor for checking socket receive timeout.
-    TimerDescriptor receive_timeout;
+    /// We use timer descriptor for checking socket timeouts.
+    TimerDescriptor timeout_descriptor;
+    Poco::Timespan timeout;
+    bool is_timeout_expired = false;
 
     /// In read callback we add socket file descriptor and timer descriptor with receive timeout
     /// in epoll, so we can return epoll file descriptor outside for polling.
diff --git a/src/Client/QueryFuzzer.cpp b/src/Client/QueryFuzzer.cpp
index e150717db95..bfcfe659982 100644
--- a/src/Client/QueryFuzzer.cpp
+++ b/src/Client/QueryFuzzer.cpp
@@ -20,9 +20,6 @@
 
 #include <unordered_set>
 
-#include <pcg_random.hpp>
-#include <Common/assert_cast.h>
-#include <Common/typeid_cast.h>
 #include <Core/Types.h>
 #include <IO/Operators.h>
 #include <IO/UseSSL.h>
@@ -34,17 +31,20 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTOrderByElement.h>
 #include <Parsers/ASTQueryWithOutput.h>
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTSelectIntersectExceptQuery.h>
 #include <Parsers/ASTUseQuery.h>
 #include <Parsers/ASTWindowDefinition.h>
 #include <Parsers/ParserQuery.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
+#include <pcg_random.hpp>
+#include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
@@ -107,8 +107,9 @@ Field QueryFuzzer::fuzzField(Field field)
         type_index = 1;
     }
     else if (type == Field::Types::Decimal32
-             || type == Field::Types::Decimal64
-             || type == Field::Types::Decimal128)
+        || type == Field::Types::Decimal64
+        || type == Field::Types::Decimal128
+        || type == Field::Types::Decimal256)
     {
         type_index = 2;
     }
@@ -681,6 +682,104 @@ void QueryFuzzer::fuzzTableName(ASTTableExpression & table)
     }
 }
 
+void QueryFuzzer::fuzzExplainQuery(ASTExplainQuery & explain)
+{
+    explain.setExplainKind(fuzzExplainKind(explain.getKind()));
+
+    bool settings_have_fuzzed = false;
+    for (auto & child : explain.children)
+    {
+        if (auto * settings_ast = typeid_cast<ASTSetQuery *>(child.get()))
+        {
+            fuzzExplainSettings(*settings_ast, explain.getKind());
+            settings_have_fuzzed = true;
+        }
+        /// Fuzzing other child like Explain Query
+        else
+        {
+            fuzz(child);
+        }
+    }
+
+    if (!settings_have_fuzzed)
+    {
+        auto settings_ast = std::make_shared<ASTSetQuery>();
+        settings_ast->is_standalone = false;
+        fuzzExplainSettings(*settings_ast, explain.getKind());
+        explain.setSettings(settings_ast);
+    }
+}
+
+ASTExplainQuery::ExplainKind QueryFuzzer::fuzzExplainKind(ASTExplainQuery::ExplainKind kind)
+{
+    if (fuzz_rand() % 20 == 0)
+    {
+        return kind;
+    }
+    else if (fuzz_rand() % 11 == 0)
+    {
+        return ASTExplainQuery::ExplainKind::ParsedAST;
+    }
+    else if (fuzz_rand() % 11 == 0)
+    {
+        return ASTExplainQuery::ExplainKind::AnalyzedSyntax;
+    }
+    else if (fuzz_rand() % 11 == 0)
+    {
+        return ASTExplainQuery::ExplainKind::QueryTree;
+    }
+    else if (fuzz_rand() % 11 == 0)
+    {
+        return ASTExplainQuery::ExplainKind::QueryPlan;
+    }
+    else if (fuzz_rand() % 11 == 0)
+    {
+        return ASTExplainQuery::ExplainKind::QueryPipeline;
+    }
+    else if (fuzz_rand() % 11 == 0)
+    {
+        return ASTExplainQuery::ExplainKind::QueryEstimates;
+    }
+    else if (fuzz_rand() % 11 == 0)
+    {
+        return ASTExplainQuery::ExplainKind::TableOverride;
+    }
+    else if (fuzz_rand() % 11 == 0)
+    {
+        return ASTExplainQuery::ExplainKind::CurrentTransaction;
+    }
+    return kind;
+}
+
+void QueryFuzzer::fuzzExplainSettings(ASTSetQuery & settings_ast, ASTExplainQuery::ExplainKind kind)
+{
+    auto & changes = settings_ast.changes;
+
+    static const std::unordered_map<ASTExplainQuery::ExplainKind, std::vector<String>> settings_by_kind
+        = {{ASTExplainQuery::ExplainKind::ParsedAST, {"graph", "optimize"}},
+           {ASTExplainQuery::ExplainKind::AnalyzedSyntax, {}},
+           {ASTExplainQuery::QueryTree, {"run_passes", "dump_passes", "dump_ast", "passes"}},
+           {ASTExplainQuery::ExplainKind::QueryPlan, {"header, description", "actions", "indexes", "optimize", "json", "sorting"}},
+           {ASTExplainQuery::ExplainKind::QueryPipeline, {"header", "graph=1", "compact"}},
+           {ASTExplainQuery::ExplainKind::QueryEstimates, {}},
+           {ASTExplainQuery::ExplainKind::TableOverride, {}},
+           {ASTExplainQuery::ExplainKind::CurrentTransaction, {}}};
+
+    const auto & settings = settings_by_kind.at(kind);
+    if (fuzz_rand() % 50 == 0 && !changes.empty())
+    {
+        changes.erase(changes.begin() + fuzz_rand() % changes.size());
+    }
+
+    for (const auto & setting : settings)
+    {
+        if (fuzz_rand() % 5 == 0)
+        {
+            changes.emplace_back(setting, true);
+        }
+    }
+}
+
 static ASTPtr tryParseInsertQuery(const String & full_query)
 {
     const char * pos = full_query.data();
@@ -817,6 +916,20 @@ void QueryFuzzer::fuzz(ASTPtr & ast)
     if (auto * with_union = typeid_cast<ASTSelectWithUnionQuery *>(ast.get()))
     {
         fuzz(with_union->list_of_selects);
+        /// Fuzzing SELECT query to EXPLAIN query randomly.
+        /// And we only fuzzing the root query into an EXPLAIN query, not fuzzing subquery
+        if (fuzz_rand() % 20 == 0 && current_ast_depth <= 1)
+        {
+            auto explain = std::make_shared<ASTExplainQuery>(fuzzExplainKind());
+
+            auto settings_ast = std::make_shared<ASTSetQuery>();
+            settings_ast->is_standalone = false;
+            fuzzExplainSettings(*settings_ast, explain->getKind());
+            explain->setSettings(settings_ast);
+
+            explain->setExplainedQuery(ast);
+            ast = explain;
+        }
     }
     else if (auto * with_intersect_except = typeid_cast<ASTSelectIntersectExceptQuery *>(ast.get()))
     {
@@ -991,6 +1104,20 @@ void QueryFuzzer::fuzz(ASTPtr & ast)
     {
         fuzzCreateQuery(*create_query);
     }
+    else if (auto * explain_query = typeid_cast<ASTExplainQuery *>(ast.get()))
+    {
+        /// Fuzzing EXPLAIN query to SELECT query randomly
+        if (fuzz_rand() % 20 == 0 && explain_query->getExplainedQuery()->getQueryKind() == IAST::QueryKind::Select)
+        {
+            auto select_query = explain_query->getExplainedQuery()->clone();
+            fuzz(select_query);
+            ast = select_query;
+        }
+        else
+        {
+            fuzzExplainQuery(*explain_query);
+        }
+    }
     else
     {
         fuzz(ast->children);
diff --git a/src/Client/QueryFuzzer.h b/src/Client/QueryFuzzer.h
index bdfdeb67663..739c38dc380 100644
--- a/src/Client/QueryFuzzer.h
+++ b/src/Client/QueryFuzzer.h
@@ -7,10 +7,11 @@
 
 #include <pcg-random/pcg_random.hpp>
 
+#include <Core/Field.h>
+#include <Parsers/ASTExplainQuery.h>
+#include <Parsers/IAST.h>
 #include <Common/randomSeed.h>
 #include "Parsers/IAST_fwd.h"
-#include <Core/Field.h>
-#include <Parsers/IAST.h>
 
 
 namespace DB
@@ -22,6 +23,7 @@ class ASTCreateQuery;
 class ASTInsertQuery;
 class ASTColumnDeclaration;
 class ASTDropQuery;
+class ASTSetQuery;
 struct ASTTableExpression;
 struct ASTWindowDefinition;
 
@@ -86,6 +88,9 @@ struct QueryFuzzer
     void fuzzColumnLikeExpressionList(IAST * ast);
     void fuzzWindowFrame(ASTWindowDefinition & def);
     void fuzzCreateQuery(ASTCreateQuery & create);
+    void fuzzExplainQuery(ASTExplainQuery & explain);
+    ASTExplainQuery::ExplainKind fuzzExplainKind(ASTExplainQuery::ExplainKind kind = ASTExplainQuery::ExplainKind::QueryPipeline);
+    void fuzzExplainSettings(ASTSetQuery & settings_ast, ASTExplainQuery::ExplainKind kind);
     void fuzzColumnDeclaration(ASTColumnDeclaration & column);
     void fuzzTableName(ASTTableExpression & table);
     void fuzz(ASTs & asts);
diff --git a/src/Client/ReplxxLineReader.cpp b/src/Client/ReplxxLineReader.cpp
index fa5ba8b8ba9..e691105ecba 100644
--- a/src/Client/ReplxxLineReader.cpp
+++ b/src/Client/ReplxxLineReader.cpp
@@ -5,6 +5,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/copyData.h>
 
+#include <algorithm>
 #include <stdexcept>
 #include <chrono>
 #include <cerrno>
@@ -334,6 +335,7 @@ ReplxxLineReader::ReplxxLineReader(
     rx.set_complete_on_empty(false);
     rx.set_word_break_characters(word_break_characters);
     rx.set_ignore_case(true);
+    rx.set_indent_multiline(false);
 
     if (highlighter)
         rx.set_highlighter_callback(highlighter);
@@ -518,4 +520,10 @@ void ReplxxLineReader::enableBracketedPaste()
     rx.enable_bracketed_paste();
 }
 
+void ReplxxLineReader::disableBracketedPaste()
+{
+    bracketed_paste_enabled = false;
+    rx.disable_bracketed_paste();
+}
+
 }
diff --git a/src/Client/ReplxxLineReader.h b/src/Client/ReplxxLineReader.h
index d36a1d0f42c..5cb8e48eb86 100644
--- a/src/Client/ReplxxLineReader.h
+++ b/src/Client/ReplxxLineReader.h
@@ -19,6 +19,7 @@ public:
     ~ReplxxLineReader() override;
 
     void enableBracketedPaste() override;
+    void disableBracketedPaste() override;
 
     /// If highlight is on, we will set a flag to denote whether the last token is a delimiter.
     /// This is useful to determine the behavior of <ENTER> key when multiline is enabled.
diff --git a/src/Client/Suggest.cpp b/src/Client/Suggest.cpp
index 7027f35d21a..4ffa828dd40 100644
--- a/src/Client/Suggest.cpp
+++ b/src/Client/Suggest.cpp
@@ -108,14 +108,14 @@ static String getLoadSuggestionQuery(Int32 suggestion_limit, bool basic_suggesti
 template <typename ConnectionType>
 void Suggest::load(ContextPtr context, const ConnectionParameters & connection_parameters, Int32 suggestion_limit)
 {
-    loading_thread = std::thread([context=Context::createCopy(context), connection_parameters, suggestion_limit, this]
+    loading_thread = std::thread([my_context = Context::createCopy(context), connection_parameters, suggestion_limit, this]
     {
         ThreadStatus thread_status;
         for (size_t retry = 0; retry < 10; ++retry)
         {
             try
             {
-                auto connection = ConnectionType::createConnection(connection_parameters, context);
+                auto connection = ConnectionType::createConnection(connection_parameters, my_context);
                 fetch(*connection, connection_parameters.timeouts, getLoadSuggestionQuery(suggestion_limit, std::is_same_v<ConnectionType, LocalConnection>));
             }
             catch (const Exception & e)
diff --git a/src/Client/TestHint.cpp b/src/Client/TestHint.cpp
index f6d1e5d73c3..b64882577ee 100644
--- a/src/Client/TestHint.cpp
+++ b/src/Client/TestHint.cpp
@@ -1,32 +1,15 @@
-#include "TestHint.h"
+#include <charconv>
+#include <string_view>
+
+#include <Client/TestHint.h>
 
-#include <Common/Exception.h>
-#include <Common/ErrorCodes.h>
-#include <IO/ReadBufferFromString.h>
-#include <IO/ReadHelpers.h>
 #include <Parsers/Lexer.h>
+#include <Common/ErrorCodes.h>
+#include <Common/Exception.h>
 
-namespace
+namespace DB::ErrorCodes
 {
-
-/// Parse error as number or as a string (name of the error code const)
-int parseErrorCode(DB::ReadBufferFromString & in)
-{
-    int code = -1;
-    String code_name;
-
-    auto * pos = in.position();
-    tryReadText(code, in);
-    if (pos != in.position())
-    {
-        return code;
-    }
-
-    /// Try parse as string
-    readStringUntilWhitespace(code_name, in);
-    return DB::ErrorCodes::getErrorCodeByName(code_name);
-}
-
+    extern const int CANNOT_PARSE_TEXT;
 }
 
 namespace DB
@@ -60,8 +43,8 @@ TestHint::TestHint(const String & query_)
                     size_t pos_end = comment.find('}', pos_start);
                     if (pos_end != String::npos)
                     {
-                        String hint(comment.begin() + pos_start + 1, comment.begin() + pos_end);
-                        parse(hint, is_leading_hint);
+                        Lexer comment_lexer(comment.c_str() + pos_start + 1, comment.c_str() + pos_end, 0);
+                        parse(comment_lexer, is_leading_hint);
                     }
                 }
             }
@@ -69,33 +52,86 @@ TestHint::TestHint(const String & query_)
     }
 }
 
-void TestHint::parse(const String & hint, bool is_leading_hint)
+bool TestHint::hasExpectedClientError(int error)
 {
-    ReadBufferFromString in(hint);
-    String item;
+    return std::find(client_errors.begin(), client_errors.end(), error) != client_errors.end();
+}
 
-    while (!in.eof())
+bool TestHint::hasExpectedServerError(int error)
+{
+    return std::find(server_errors.begin(), server_errors.end(), error) != server_errors.end();
+}
+
+void TestHint::parse(Lexer & comment_lexer, bool is_leading_hint)
+{
+    std::unordered_set<std::string_view> commands{"echo", "echoOn", "echoOff"};
+
+    std::unordered_set<std::string_view> command_errors{
+        "serverError",
+        "clientError",
+    };
+
+    for (Token token = comment_lexer.nextToken(); !token.isEnd(); token = comment_lexer.nextToken())
     {
-        readStringUntilWhitespace(item, in);
-        if (in.eof())
-            break;
-
-        skipWhitespaceIfAny(in);
-
-        if (!is_leading_hint)
+        String item = String(token.begin, token.end);
+        if (token.type == TokenType::BareWord && commands.contains(item))
         {
-            if (item == "serverError")
-                server_error = parseErrorCode(in);
-            else if (item == "clientError")
-                client_error = parseErrorCode(in);
+            if (item == "echo")
+                echo.emplace(true);
+            if (item == "echoOn")
+                echo.emplace(true);
+            if (item == "echoOff")
+                echo.emplace(false);
         }
+        else if (!is_leading_hint && token.type == TokenType::BareWord && command_errors.contains(item))
+        {
+            /// Everything after this must be a list of errors separated by comma
+            ErrorVector error_codes;
+            while (!token.isEnd())
+            {
+                token = comment_lexer.nextToken();
+                if (token.type == TokenType::Whitespace)
+                    continue;
+                if (token.type == TokenType::Number)
+                {
+                    int code;
+                    auto [p, ec] = std::from_chars(token.begin, token.end, code);
+                    if (p == token.begin)
+                        throw DB::Exception(
+                            DB::ErrorCodes::CANNOT_PARSE_TEXT,
+                            "Could not parse integer number for errorcode: {}",
+                            std::string_view(token.begin, token.end));
+                    error_codes.push_back(code);
+                }
+                else if (token.type == TokenType::BareWord)
+                {
+                    int code = DB::ErrorCodes::getErrorCodeByName(std::string_view(token.begin, token.end));
+                    error_codes.push_back(code);
+                }
+                else
+                    throw DB::Exception(
+                        DB::ErrorCodes::CANNOT_PARSE_TEXT,
+                        "Could not parse error code in {}: {}",
+                        getTokenName(token.type),
+                        std::string_view(token.begin, token.end));
+                do
+                {
+                    token = comment_lexer.nextToken();
+                } while (!token.isEnd() && token.type == TokenType::Whitespace);
 
-        if (item == "echo")
-            echo.emplace(true);
-        if (item == "echoOn")
-            echo.emplace(true);
-        if (item == "echoOff")
-            echo.emplace(false);
+                if (!token.isEnd() && token.type != TokenType::Comma)
+                    throw DB::Exception(
+                        DB::ErrorCodes::CANNOT_PARSE_TEXT,
+                        "Could not parse error code. Expected ','. Got '{}'",
+                        std::string_view(token.begin, token.end));
+            }
+
+            if (item == "serverError")
+                server_errors = error_codes;
+            else
+                client_errors = error_codes;
+            break;
+        }
     }
 }
 
diff --git a/src/Client/TestHint.h b/src/Client/TestHint.h
index 7fa4e86c025..982cd10dce0 100644
--- a/src/Client/TestHint.h
+++ b/src/Client/TestHint.h
@@ -1,21 +1,30 @@
 #pragma once
 
 #include <optional>
+#include <vector>
+
+#include <fmt/format.h>
+
 #include <Core/Types.h>
 
 
 namespace DB
 {
 
+class Lexer;
+
 /// Checks expected server and client error codes.
 ///
 /// The following comment hints are supported:
 ///
 /// - "-- { serverError 60 }" -- in case of you are expecting server error.
+/// - "-- { serverError 16, 36 }" -- in case of you are expecting one of the 2 errors.
 ///
 /// - "-- { clientError 20 }" -- in case of you are expecting client error.
+/// - "-- { clientError 20, 60, 92 }" -- It's expected that the client will return one of the 3 errors.
 ///
 /// - "-- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }" -- by error name.
+/// - "-- { serverError NO_SUCH_COLUMN_IN_TABLE, BAD_ARGUMENTS }" -- by error name.
 ///
 /// - "-- { clientError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }" -- by error name.
 ///
@@ -43,29 +52,73 @@ namespace DB
 class TestHint
 {
 public:
+    using ErrorVector = std::vector<int>;
     TestHint(const String & query_);
 
-    int serverError() const { return server_error; }
-    int clientError() const { return client_error; }
+    const auto & serverErrors() const { return server_errors; }
+    const auto & clientErrors() const { return client_errors; }
     std::optional<bool> echoQueries() const { return echo; }
 
+    bool hasClientErrors() { return !client_errors.empty(); }
+    bool hasServerErrors() { return !server_errors.empty(); }
+
+    bool hasExpectedClientError(int error);
+    bool hasExpectedServerError(int error);
+
 private:
     const String & query;
-    int server_error = 0;
-    int client_error = 0;
+    ErrorVector server_errors{};
+    ErrorVector client_errors{};
     std::optional<bool> echo;
 
-    void parse(const String & hint, bool is_leading_hint);
+    void parse(Lexer & comment_lexer, bool is_leading_hint);
 
     bool allErrorsExpected(int actual_server_error, int actual_client_error) const
     {
-        return (server_error || client_error) && (server_error == actual_server_error) && (client_error == actual_client_error);
+        if (actual_server_error && std::find(server_errors.begin(), server_errors.end(), actual_server_error) == server_errors.end())
+            return false;
+        if (!actual_server_error && server_errors.size())
+            return false;
+
+        if (actual_client_error && std::find(client_errors.begin(), client_errors.end(), actual_client_error) == client_errors.end())
+            return false;
+        if (!actual_client_error && client_errors.size())
+            return false;
+
+        return true;
     }
 
     bool lostExpectedError(int actual_server_error, int actual_client_error) const
     {
-        return (server_error && !actual_server_error) || (client_error && !actual_client_error);
+        return (server_errors.size() && !actual_server_error) || (client_errors.size() && !actual_client_error);
     }
 };
 
 }
+
+template <>
+struct fmt::formatter<DB::TestHint::ErrorVector>
+{
+    static constexpr auto parse(format_parse_context & ctx)
+    {
+        const auto * it = ctx.begin();
+        const auto * end = ctx.end();
+
+        /// Only support {}.
+        if (it != end && *it != '}')
+            throw fmt::format_error("Invalid format");
+
+        return it;
+    }
+
+    template <typename FormatContext>
+    auto format(const DB::TestHint::ErrorVector & ErrorVector, FormatContext & ctx)
+    {
+        if (ErrorVector.empty())
+            return fmt::format_to(ctx.out(), "{}", 0);
+        else if (ErrorVector.size() == 1)
+            return fmt::format_to(ctx.out(), "{}", ErrorVector[0]);
+        else
+            return fmt::format_to(ctx.out(), "[{}]", fmt::join(ErrorVector, ", "));
+    }
+};
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index fd46b38ada8..e521262acd2 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -385,8 +385,7 @@ void ColumnAggregateFunction::updateHashFast(SipHash & hash) const
 /// threads, so we can't know the size of these data.
 size_t ColumnAggregateFunction::byteSize() const
 {
-    return data.size() * sizeof(data[0])
-            + (my_arena ? my_arena->size() : 0);
+    return data.size() * sizeof(data[0]) + (my_arena ? my_arena->usedBytes() : 0);
 }
 
 size_t ColumnAggregateFunction::byteSizeAt(size_t) const
@@ -395,11 +394,11 @@ size_t ColumnAggregateFunction::byteSizeAt(size_t) const
     return sizeof(data[0]) + func->sizeOfData();
 }
 
-/// Like in byteSize(), the size is underestimated.
+/// Similar to byteSize() the size is underestimated.
+/// In this case it's also overestimated at the same time as it counts all the bytes allocated by the arena, used or not
 size_t ColumnAggregateFunction::allocatedBytes() const
 {
-    return data.allocated_bytes()
-            + (my_arena ? my_arena->size() : 0);
+    return data.allocated_bytes() + (my_arena ? my_arena->allocatedBytes() : 0);
 }
 
 void ColumnAggregateFunction::protect()
diff --git a/src/Columns/ColumnAggregateFunction.h b/src/Columns/ColumnAggregateFunction.h
index 38040d65d3b..f9ce45708c9 100644
--- a/src/Columns/ColumnAggregateFunction.h
+++ b/src/Columns/ColumnAggregateFunction.h
@@ -220,7 +220,12 @@ public:
 
     double getRatioOfDefaultRows(double) const override
     {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getRatioOfDefaultRows is not supported for ColumnAggregateFunction");
+        return 0.0;
+    }
+
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        return 0;
     }
 
     void getIndicesOfNonDefaultRows(Offsets &, size_t, size_t) const override
diff --git a/src/Columns/ColumnArray.cpp b/src/Columns/ColumnArray.cpp
index 0d085a3275a..74512d1669b 100644
--- a/src/Columns/ColumnArray.cpp
+++ b/src/Columns/ColumnArray.cpp
@@ -942,9 +942,9 @@ ColumnPtr ColumnArray::compress() const
     size_t byte_size = data_compressed->byteSize() + offsets_compressed->byteSize();
 
     return ColumnCompressed::create(size(), byte_size,
-        [data_compressed = std::move(data_compressed), offsets_compressed = std::move(offsets_compressed)]
+        [my_data_compressed = std::move(data_compressed), my_offsets_compressed = std::move(offsets_compressed)]
         {
-            return ColumnArray::create(data_compressed->decompress(), offsets_compressed->decompress());
+            return ColumnArray::create(my_data_compressed->decompress(), my_offsets_compressed->decompress());
         });
 }
 
@@ -953,6 +953,11 @@ double ColumnArray::getRatioOfDefaultRows(double sample_ratio) const
     return getRatioOfDefaultRowsImpl<ColumnArray>(sample_ratio);
 }
 
+UInt64 ColumnArray::getNumberOfDefaultRows() const
+{
+    return getNumberOfDefaultRowsImpl<ColumnArray>();
+}
+
 void ColumnArray::getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const
 {
     return getIndicesOfNonDefaultRowsImpl<ColumnArray>(indices, from, limit);
diff --git a/src/Columns/ColumnArray.h b/src/Columns/ColumnArray.h
index 44652fd0c4b..e60c388831d 100644
--- a/src/Columns/ColumnArray.h
+++ b/src/Columns/ColumnArray.h
@@ -173,6 +173,7 @@ public:
     }
 
     double getRatioOfDefaultRows(double sample_ratio) const override;
+    UInt64 getNumberOfDefaultRows() const override;
 
     void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const override;
 
diff --git a/src/Columns/ColumnCompressed.cpp b/src/Columns/ColumnCompressed.cpp
index cdf604d89f7..9fb7b108501 100644
--- a/src/Columns/ColumnCompressed.cpp
+++ b/src/Columns/ColumnCompressed.cpp
@@ -1,6 +1,6 @@
 #include <Columns/ColumnCompressed.h>
 
-#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wold-style-cast"
 
 #include <lz4.h>
 
@@ -24,7 +24,7 @@ std::shared_ptr<Memory<>> ColumnCompressed::compressBuffer(const void * data, si
 
     Memory<> compressed(max_dest_size);
 
-    auto compressed_size = LZ4_compress_default(
+    int compressed_size = LZ4_compress_default(
         reinterpret_cast<const char *>(data),
         compressed.data(),
         static_cast<int>(data_size),
diff --git a/src/Columns/ColumnCompressed.h b/src/Columns/ColumnCompressed.h
index b258dbac878..bfe7cdb4924 100644
--- a/src/Columns/ColumnCompressed.h
+++ b/src/Columns/ColumnCompressed.h
@@ -64,7 +64,7 @@ public:
         return ColumnCompressed::create(
             size,
             bytes,
-            [column = std::move(column)]{ return column; });
+            [my_column = std::move(column)]{ return my_column; });
     }
 
     /// Helper methods for compression.
@@ -117,6 +117,7 @@ public:
     void getExtremes(Field &, Field &) const override { throwMustBeDecompressed(); }
     size_t byteSizeAt(size_t) const override { throwMustBeDecompressed(); }
     double getRatioOfDefaultRows(double) const override { throwMustBeDecompressed(); }
+    UInt64 getNumberOfDefaultRows() const override { throwMustBeDecompressed(); }
     void getIndicesOfNonDefaultRows(Offsets &, size_t, size_t) const override { throwMustBeDecompressed(); }
 
 protected:
diff --git a/src/Columns/ColumnConst.h b/src/Columns/ColumnConst.h
index b86ed393e44..fcdcd2ce224 100644
--- a/src/Columns/ColumnConst.h
+++ b/src/Columns/ColumnConst.h
@@ -253,6 +253,11 @@ public:
         return data->isDefaultAt(0) ? 1.0 : 0.0;
     }
 
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        return data->isDefaultAt(0) ? s : 0;
+    }
+
     void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const override
     {
         if (!data->isDefaultAt(0))
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index d9fed8c87e5..8e5792934cf 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -386,11 +386,11 @@ ColumnPtr ColumnDecimal<T>::compress() const
 
     const size_t compressed_size = compressed->size();
     return ColumnCompressed::create(data_size, compressed_size,
-        [compressed = std::move(compressed), column_size = data_size, scale = this->scale]
+        [my_compressed = std::move(compressed), column_size = data_size, my_scale = this->scale]
         {
-            auto res = ColumnDecimal<T>::create(column_size, scale);
+            auto res = ColumnDecimal<T>::create(column_size, my_scale);
             ColumnCompressed::decompressBuffer(
-                compressed->data(), res->getData().data(), compressed->size(), column_size * sizeof(T));
+                my_compressed->data(), res->getData().data(), my_compressed->size(), column_size * sizeof(T));
             return res;
         });
 }
diff --git a/src/Columns/ColumnDecimal.h b/src/Columns/ColumnDecimal.h
index d47164a178d..03e0b9be558 100644
--- a/src/Columns/ColumnDecimal.h
+++ b/src/Columns/ColumnDecimal.h
@@ -136,6 +136,11 @@ public:
         return this->template getRatioOfDefaultRowsImpl<Self>(sample_ratio);
     }
 
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        return this->template getNumberOfDefaultRowsImpl<Self>();
+    }
+
     void getIndicesOfNonDefaultRows(IColumn::Offsets & indices, size_t from, size_t limit) const override
     {
         return this->template getIndicesOfNonDefaultRowsImpl<Self>(indices, from, limit);
diff --git a/src/Columns/ColumnFixedString.cpp b/src/Columns/ColumnFixedString.cpp
index 1b7355d91f5..24b5c435ecd 100644
--- a/src/Columns/ColumnFixedString.cpp
+++ b/src/Columns/ColumnFixedString.cpp
@@ -60,13 +60,7 @@ bool ColumnFixedString::isDefaultAt(size_t index) const
 void ColumnFixedString::insert(const Field & x)
 {
     const String & s = x.get<const String &>();
-
-    if (s.size() > n)
-        throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too large string '{}' for FixedString column", s);
-
-    size_t old_size = chars.size();
-    chars.resize_fill(old_size + n);
-    memcpy(chars.data() + old_size, s.data(), s.size());
+    insertData(s.data(), s.size());
 }
 
 void ColumnFixedString::insertFrom(const IColumn & src_, size_t index)
@@ -87,8 +81,9 @@ void ColumnFixedString::insertData(const char * pos, size_t length)
         throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too large string for FixedString column");
 
     size_t old_size = chars.size();
-    chars.resize_fill(old_size + n);
+    chars.resize(old_size + n);
     memcpy(chars.data() + old_size, pos, length);
+    memset(chars.data() + old_size + length, 0, n - length);
 }
 
 StringRef ColumnFixedString::serializeValueIntoArena(size_t index, Arena & arena, char const *& begin) const
@@ -278,7 +273,7 @@ void ColumnFixedString::expand(const IColumn::Filter & mask, bool inverted)
 
     ssize_t index = mask.size() - 1;
     ssize_t from = size() - 1;
-    chars.resize_fill(mask.size() * n, 0);
+    chars.resize_fill(mask.size() * n);
     while (index >= 0)
     {
         if (!!mask[index] ^ inverted)
@@ -398,13 +393,13 @@ ColumnPtr ColumnFixedString::compress() const
     const size_t column_size = size();
     const size_t compressed_size = compressed->size();
     return ColumnCompressed::create(column_size, compressed_size,
-        [compressed = std::move(compressed), column_size, n = n]
+        [my_compressed = std::move(compressed), column_size, my_n = n]
         {
-            size_t chars_size = n * column_size;
-            auto res = ColumnFixedString::create(n);
+            size_t chars_size = my_n * column_size;
+            auto res = ColumnFixedString::create(my_n);
             res->getChars().resize(chars_size);
             ColumnCompressed::decompressBuffer(
-                compressed->data(), res->getChars().data(), compressed->size(), chars_size);
+                my_compressed->data(), res->getChars().data(), my_compressed->size(), chars_size);
             return res;
         });
 }
diff --git a/src/Columns/ColumnFixedString.h b/src/Columns/ColumnFixedString.h
index 7c2d9b1a155..39497e3403e 100644
--- a/src/Columns/ColumnFixedString.h
+++ b/src/Columns/ColumnFixedString.h
@@ -200,6 +200,11 @@ public:
         return getRatioOfDefaultRowsImpl<ColumnFixedString>(sample_ratio);
     }
 
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        return getNumberOfDefaultRowsImpl<ColumnFixedString>();
+    }
+
     void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const override
     {
         return getIndicesOfNonDefaultRowsImpl<ColumnFixedString>(indices, from, limit);
diff --git a/src/Columns/ColumnFunction.cpp b/src/Columns/ColumnFunction.cpp
index 59ee93410c8..7c7b87bf4a6 100644
--- a/src/Columns/ColumnFunction.cpp
+++ b/src/Columns/ColumnFunction.cpp
@@ -258,14 +258,15 @@ void ColumnFunction::appendArguments(const ColumnsWithTypeAndName & columns)
 
 void ColumnFunction::appendArgument(const ColumnWithTypeAndName & column)
 {
-    const auto & argumnet_types = function->getArgumentTypes();
-
+    const auto & argument_types = function->getArgumentTypes();
     auto index = captured_columns.size();
-    if (!is_short_circuit_argument && !column.type->equals(*argumnet_types[index]))
+    if (!is_short_circuit_argument && !column.type->equals(*argument_types[index]))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot capture column {} because it has incompatible type: "
-                        "got {}, but {} is expected.", argumnet_types.size(), column.type->getName(), argumnet_types[index]->getName());
+                        "got {}, but {} is expected.", argument_types.size(), column.type->getName(), argument_types[index]->getName());
 
-    captured_columns.push_back(column);
+    auto captured_column = column;
+    captured_column.column = captured_column.column->convertToFullColumnIfSparse();
+    captured_columns.push_back(std::move(captured_column));
 }
 
 DataTypePtr ColumnFunction::getResultType() const
diff --git a/src/Columns/ColumnFunction.h b/src/Columns/ColumnFunction.h
index 7b7ceb29a10..a1f6245c2bd 100644
--- a/src/Columns/ColumnFunction.h
+++ b/src/Columns/ColumnFunction.h
@@ -168,6 +168,11 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getRatioOfDefaultRows is not supported for {}", getName());
     }
 
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getNumberOfDefaultRows is not supported for {}", getName());
+    }
+
     void getIndicesOfNonDefaultRows(Offsets &, size_t, size_t) const override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getIndicesOfNonDefaultRows is not supported for {}", getName());
diff --git a/src/Columns/ColumnLowCardinality.cpp b/src/Columns/ColumnLowCardinality.cpp
index 11d02b023d6..4f9ab8215be 100644
--- a/src/Columns/ColumnLowCardinality.cpp
+++ b/src/Columns/ColumnLowCardinality.cpp
@@ -485,13 +485,8 @@ void ColumnLowCardinality::setSharedDictionary(const ColumnPtr & column_unique)
 ColumnLowCardinality::MutablePtr ColumnLowCardinality::cutAndCompact(size_t start, size_t length) const
 {
     auto sub_positions = IColumn::mutate(idx.getPositions()->cut(start, length));
-    /// Create column with new indexes and old dictionary.
-    /// Dictionary is shared, but will be recreated after compactInplace call.
-    auto column = ColumnLowCardinality::create(getDictionary().assumeMutable(), std::move(sub_positions));
-    /// Will create new dictionary.
-    column->compactInplace();
-
-    return column;
+    auto new_column_unique = Dictionary::compact(dictionary.getColumnUnique(), sub_positions);
+    return ColumnLowCardinality::create(std::move(new_column_unique), std::move(sub_positions));
 }
 
 void ColumnLowCardinality::compactInplace()
@@ -589,7 +584,7 @@ size_t ColumnLowCardinality::Index::getSizeOfIndexType(const IColumn & column, s
                     column.getName());
 }
 
-void ColumnLowCardinality::Index::attachPositions(ColumnPtr positions_)
+void ColumnLowCardinality::Index::attachPositions(MutableColumnPtr positions_)
 {
     positions = std::move(positions_);
     updateSizeOfType();
@@ -820,21 +815,23 @@ void ColumnLowCardinality::Dictionary::setShared(const ColumnPtr & column_unique
     shared = true;
 }
 
-void ColumnLowCardinality::Dictionary::compact(ColumnPtr & positions)
+void ColumnLowCardinality::Dictionary::compact(MutableColumnPtr & positions)
 {
-    auto new_column_unique = column_unique->cloneEmpty();
+    column_unique = compact(getColumnUnique(), positions);
+    shared = false;
+}
 
-    auto & unique = getColumnUnique();
+MutableColumnPtr ColumnLowCardinality::Dictionary::compact(const IColumnUnique & unique, MutableColumnPtr & positions)
+{
+    auto new_column_unique = unique.cloneEmpty();
     auto & new_unique = static_cast<IColumnUnique &>(*new_column_unique);
 
-    auto indexes = mapUniqueIndex(positions->assumeMutableRef());
+    auto indexes = mapUniqueIndex(*positions);
     auto sub_keys = unique.getNestedColumn()->index(*indexes, 0);
     auto new_indexes = new_unique.uniqueInsertRangeFrom(*sub_keys, 0, sub_keys->size());
 
     positions = IColumn::mutate(new_indexes->index(*positions, 0));
-    column_unique = std::move(new_column_unique);
-
-    shared = false;
+    return new_column_unique;
 }
 
 ColumnPtr ColumnLowCardinality::cloneWithDefaultOnNull() const
diff --git a/src/Columns/ColumnLowCardinality.h b/src/Columns/ColumnLowCardinality.h
index eb7fd958a69..a5c056153bb 100644
--- a/src/Columns/ColumnLowCardinality.h
+++ b/src/Columns/ColumnLowCardinality.h
@@ -160,7 +160,9 @@ public:
 
     void reserve(size_t n) override { idx.reserve(n); }
 
-    size_t byteSize() const override { return idx.getPositions()->byteSize() + getDictionary().byteSize(); }
+    /// Don't count the dictionary size as it can be shared between different blocks.
+    size_t byteSize() const override { return idx.getPositions()->byteSize(); }
+
     size_t byteSizeAt(size_t n) const override { return getDictionary().byteSizeAt(getIndexes().getUInt(n)); }
     size_t allocatedBytes() const override { return idx.getPositions()->allocatedBytes() + getDictionary().allocatedBytes(); }
 
@@ -199,6 +201,11 @@ public:
         return getIndexes().getRatioOfDefaultRows(sample_ratio);
     }
 
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        return getIndexes().getNumberOfDefaultRows();
+    }
+
     void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const override
     {
         return getIndexes().getIndicesOfNonDefaultRows(indices, from, limit);
@@ -296,8 +303,8 @@ public:
 
         void checkSizeOfType();
 
-        ColumnPtr detachPositions() { return std::move(positions); }
-        void attachPositions(ColumnPtr positions_);
+        MutableColumnPtr detachPositions() { return IColumn::mutate(std::move(positions)); }
+        void attachPositions(MutableColumnPtr positions_);
 
         void countKeys(ColumnUInt64::Container & counts) const;
 
@@ -345,7 +352,9 @@ private:
         bool isShared() const { return shared; }
 
         /// Create new dictionary with only keys that are mentioned in positions.
-        void compact(ColumnPtr & positions);
+        void compact(MutableColumnPtr & positions);
+
+        static MutableColumnPtr compact(const IColumnUnique & column_unique, MutableColumnPtr & positions);
 
     private:
         WrappedPtr column_unique;
diff --git a/src/Columns/ColumnMap.cpp b/src/Columns/ColumnMap.cpp
index 2b5f5f94ee8..7f5693bf470 100644
--- a/src/Columns/ColumnMap.cpp
+++ b/src/Columns/ColumnMap.cpp
@@ -296,6 +296,11 @@ double ColumnMap::getRatioOfDefaultRows(double sample_ratio) const
     return getRatioOfDefaultRowsImpl<ColumnMap>(sample_ratio);
 }
 
+UInt64 ColumnMap::getNumberOfDefaultRows() const
+{
+    return getNumberOfDefaultRowsImpl<ColumnMap>();
+}
+
 void ColumnMap::getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const
 {
     return getIndicesOfNonDefaultRowsImpl<ColumnMap>(indices, from, limit);
@@ -307,9 +312,9 @@ ColumnPtr ColumnMap::compress() const
     const auto byte_size = compressed->byteSize();
     /// The order of evaluation of function arguments is unspecified
     /// and could cause interacting with object in moved-from state
-    return ColumnCompressed::create(size(), byte_size, [compressed = std::move(compressed)]
+    return ColumnCompressed::create(size(), byte_size, [my_compressed = std::move(compressed)]
     {
-        return ColumnMap::create(compressed->decompress());
+        return ColumnMap::create(my_compressed->decompress());
     });
 }
 
diff --git a/src/Columns/ColumnMap.h b/src/Columns/ColumnMap.h
index db918c3db50..a11905fcaa0 100644
--- a/src/Columns/ColumnMap.h
+++ b/src/Columns/ColumnMap.h
@@ -92,6 +92,7 @@ public:
     void forEachSubcolumnRecursively(RecursiveColumnCallback callback) const override;
     bool structureEquals(const IColumn & rhs) const override;
     double getRatioOfDefaultRows(double sample_ratio) const override;
+    UInt64 getNumberOfDefaultRows() const override;
     void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const override;
     void finalize() override { nested->finalize(); }
     bool isFinalized() const override { return nested->isFinalized(); }
diff --git a/src/Columns/ColumnNullable.cpp b/src/Columns/ColumnNullable.cpp
index f70dac20a2a..aa04fc910a5 100644
--- a/src/Columns/ColumnNullable.cpp
+++ b/src/Columns/ColumnNullable.cpp
@@ -214,7 +214,7 @@ void ColumnNullable::insertFromNotNullable(const IColumn & src, size_t n)
 void ColumnNullable::insertRangeFromNotNullable(const IColumn & src, size_t start, size_t length)
 {
     getNestedColumn().insertRangeFrom(src, start, length);
-    getNullMapData().resize_fill(getNullMapData().size() + length, 0);
+    getNullMapData().resize_fill(getNullMapData().size() + length);
 }
 
 void ColumnNullable::insertManyFromNotNullable(const IColumn & src, size_t position, size_t length)
@@ -644,9 +644,9 @@ ColumnPtr ColumnNullable::compress() const
     size_t byte_size = nested_column->byteSize() + null_map->byteSize();
 
     return ColumnCompressed::create(size(), byte_size,
-        [nested_column = std::move(nested_compressed), null_map = std::move(null_map_compressed)]
+        [my_nested_column = std::move(nested_compressed), my_null_map = std::move(null_map_compressed)]
         {
-            return ColumnNullable::create(nested_column->decompress(), null_map->decompress());
+            return ColumnNullable::create(my_nested_column->decompress(), my_null_map->decompress());
         });
 }
 
diff --git a/src/Columns/ColumnNullable.h b/src/Columns/ColumnNullable.h
index 9ea0ceb1c5a..47afd982b1e 100644
--- a/src/Columns/ColumnNullable.h
+++ b/src/Columns/ColumnNullable.h
@@ -156,6 +156,11 @@ public:
         return getRatioOfDefaultRowsImpl<ColumnNullable>(sample_ratio);
     }
 
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        return getNumberOfDefaultRowsImpl<ColumnNullable>();
+    }
+
     void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const override
     {
         getIndicesOfNonDefaultRowsImpl<ColumnNullable>(indices, from, limit);
diff --git a/src/Columns/ColumnObject.h b/src/Columns/ColumnObject.h
index d09974fcc46..91920908542 100644
--- a/src/Columns/ColumnObject.h
+++ b/src/Columns/ColumnObject.h
@@ -254,6 +254,7 @@ public:
     bool hasEqualValues() const override { throwMustBeConcrete(); }
     size_t byteSizeAt(size_t) const override { throwMustBeConcrete(); }
     double getRatioOfDefaultRows(double) const override { throwMustBeConcrete(); }
+    UInt64 getNumberOfDefaultRows() const override { throwMustBeConcrete(); }
     void getIndicesOfNonDefaultRows(Offsets &, size_t, size_t) const override { throwMustBeConcrete(); }
 
 private:
diff --git a/src/Columns/ColumnSet.h b/src/Columns/ColumnSet.h
index 316f8196e5a..3f5cf4ad280 100644
--- a/src/Columns/ColumnSet.h
+++ b/src/Columns/ColumnSet.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Interpreters/PreparedSets.h>
 #include <Columns/IColumnDummy.h>
 #include <Core/Field.h>
 
@@ -20,7 +21,7 @@ class ColumnSet final : public COWHelper<IColumnDummy, ColumnSet>
 private:
     friend class COWHelper<IColumnDummy, ColumnSet>;
 
-    ColumnSet(size_t s_, const ConstSetPtr & data_) : data(data_) { s = s_; }
+    ColumnSet(size_t s_, FutureSet data_) : data(std::move(data_)) { s = s_; }
     ColumnSet(const ColumnSet &) = default;
 
 public:
@@ -28,13 +29,13 @@ public:
     TypeIndex getDataType() const override { return TypeIndex::Set; }
     MutableColumnPtr cloneDummy(size_t s_) const override { return ColumnSet::create(s_, data); }
 
-    ConstSetPtr getData() const { return data; }
+    ConstSetPtr getData() const { if (!data.isReady()) return nullptr; return data.get(); }
 
     // Used only for debugging, making it DUMPABLE
     Field operator[](size_t) const override { return {}; }
 
 private:
-    ConstSetPtr data;
+    FutureSet data;
 };
 
 }
diff --git a/src/Columns/ColumnSparse.cpp b/src/Columns/ColumnSparse.cpp
index 43802b6bbc8..9e4609ab4b5 100644
--- a/src/Columns/ColumnSparse.cpp
+++ b/src/Columns/ColumnSparse.cpp
@@ -450,11 +450,14 @@ void ColumnSparse::compareColumn(const IColumn & rhs, size_t rhs_row_num,
     {
         const auto & rhs_sparse = assert_cast<const ColumnSparse &>(rhs);
         PaddedPODArray<Int8> nested_result;
-        values->compareColumn(rhs_sparse.getValuesColumn(), rhs_sparse.getValueIndex(rhs_row_num),
+        values->compareColumn(
+            rhs_sparse.getValuesColumn(),
+            rhs_sparse.getValueIndex(rhs_row_num),
             nullptr, nested_result, direction, nan_direction_hint);
 
         const auto & offsets_data = getOffsetsData();
-        compare_results.resize_fill(_size, nested_result[0]);
+        compare_results.resize(size());
+        std::fill(compare_results.begin(), compare_results.end(), nested_result[0]);
         for (size_t i = 0; i < offsets_data.size(); ++i)
             compare_results[offsets_data[i]] = nested_result[i + 1];
     }
@@ -470,7 +473,7 @@ int ColumnSparse::compareAtWithCollation(size_t n, size_t m, const IColumn & rhs
 
 bool ColumnSparse::hasEqualValues() const
 {
-    size_t num_defaults = getNumberOfDefaults();
+    size_t num_defaults = getNumberOfDefaultRows();
     if (num_defaults == _size)
         return true;
 
@@ -512,7 +515,7 @@ void ColumnSparse::getPermutationImpl(IColumn::PermutationSortDirection directio
     else
         values->getPermutation(direction, stability, limit + 1, null_direction_hint, perm);
 
-    size_t num_of_defaults = getNumberOfDefaults();
+    size_t num_of_defaults = getNumberOfDefaultRows();
     size_t row = 0;
 
     const auto & offsets_data = getOffsetsData();
@@ -677,7 +680,7 @@ void ColumnSparse::getExtremes(Field & min, Field & max) const
         return;
     }
 
-    if (getNumberOfDefaults() == 0)
+    if (getNumberOfDefaultRows() == 0)
     {
         size_t min_idx = 1;
         size_t max_idx = 1;
@@ -709,7 +712,12 @@ void ColumnSparse::getIndicesOfNonDefaultRows(IColumn::Offsets & indices, size_t
 
 double ColumnSparse::getRatioOfDefaultRows(double) const
 {
-    return static_cast<double>(getNumberOfDefaults()) / _size;
+    return static_cast<double>(getNumberOfDefaultRows()) / _size;
+}
+
+UInt64 ColumnSparse::getNumberOfDefaultRows() const
+{
+    return _size - offsets->size();
 }
 
 MutableColumns ColumnSparse::scatter(ColumnIndex num_columns, const Selector & selector) const
@@ -730,9 +738,9 @@ ColumnPtr ColumnSparse::compress() const
     size_t byte_size = values_compressed->byteSize() + offsets_compressed->byteSize();
 
     return ColumnCompressed::create(size(), byte_size,
-        [values_compressed = std::move(values_compressed), offsets_compressed = std::move(offsets_compressed), size = size()]
+        [my_values_compressed = std::move(values_compressed), my_offsets_compressed = std::move(offsets_compressed), size = size()]
         {
-            return ColumnSparse::create(values_compressed->decompress(), offsets_compressed->decompress(), size);
+            return ColumnSparse::create(my_values_compressed->decompress(), my_offsets_compressed->decompress(), size);
         });
 }
 
diff --git a/src/Columns/ColumnSparse.h b/src/Columns/ColumnSparse.h
index ffe392a83c1..d4eb13bf208 100644
--- a/src/Columns/ColumnSparse.h
+++ b/src/Columns/ColumnSparse.h
@@ -132,6 +132,7 @@ public:
 
     void getIndicesOfNonDefaultRows(IColumn::Offsets & indices, size_t from, size_t limit) const override;
     double getRatioOfDefaultRows(double sample_ratio) const override;
+    UInt64 getNumberOfDefaultRows() const override;
 
     MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override;
 
@@ -150,7 +151,6 @@ public:
     size_t sizeOfValueIfFixed() const override { return values->sizeOfValueIfFixed() + values->sizeOfValueIfFixed(); }
     bool isCollationSupported() const override { return values->isCollationSupported(); }
 
-    size_t getNumberOfDefaults() const { return _size - offsets->size(); }
     size_t getNumberOfTrailingDefaults() const
     {
         return offsets->empty() ? _size : _size - getOffsetsData().back() - 1;
diff --git a/src/Columns/ColumnString.cpp b/src/Columns/ColumnString.cpp
index b00600e1748..de96c57700b 100644
--- a/src/Columns/ColumnString.cpp
+++ b/src/Columns/ColumnString.cpp
@@ -176,7 +176,7 @@ void ColumnString::expand(const IColumn::Filter & mask, bool inverted)
     /// (if not, one of exceptions below will throw) and we can calculate the resulting chars size.
     UInt64 last_offset = offsets_data[from] + (mask.size() - offsets_data.size());
     offsets_data.resize(mask.size());
-    chars_data.resize_fill(last_offset, 0);
+    chars_data.resize_fill(last_offset);
     while (index >= 0)
     {
         offsets_data[index] = last_offset;
@@ -532,8 +532,8 @@ ColumnPtr ColumnString::compress() const
     const size_t offsets_compressed_size = offsets_compressed->size();
     return ColumnCompressed::create(source_offsets_elements, chars_compressed_size + offsets_compressed_size,
         [
-            chars_compressed = std::move(chars_compressed),
-            offsets_compressed = std::move(offsets_compressed),
+            my_chars_compressed = std::move(chars_compressed),
+            my_offsets_compressed = std::move(offsets_compressed),
             source_chars_size,
             source_offsets_elements
         ]
@@ -544,10 +544,10 @@ ColumnPtr ColumnString::compress() const
             res->getOffsets().resize(source_offsets_elements);
 
             ColumnCompressed::decompressBuffer(
-                chars_compressed->data(), res->getChars().data(), chars_compressed->size(), source_chars_size);
+                my_chars_compressed->data(), res->getChars().data(), my_chars_compressed->size(), source_chars_size);
 
             ColumnCompressed::decompressBuffer(
-                offsets_compressed->data(), res->getOffsets().data(), offsets_compressed->size(), source_offsets_elements * sizeof(Offset));
+                my_offsets_compressed->data(), res->getOffsets().data(), my_offsets_compressed->size(), source_offsets_elements * sizeof(Offset));
 
             return res;
         });
diff --git a/src/Columns/ColumnString.h b/src/Columns/ColumnString.h
index aa251b1fda0..08c876a803d 100644
--- a/src/Columns/ColumnString.h
+++ b/src/Columns/ColumnString.h
@@ -187,8 +187,8 @@ public:
 
     void updateHashFast(SipHash & hash) const override
     {
-        hash.update(reinterpret_cast<const char *>(offsets.data()), size() * sizeof(offsets[0]));
-        hash.update(reinterpret_cast<const char *>(chars.data()), size() * sizeof(chars[0]));
+        hash.update(reinterpret_cast<const char *>(offsets.data()), offsets.size() * sizeof(offsets[0]));
+        hash.update(reinterpret_cast<const char *>(chars.data()), chars.size() * sizeof(chars[0]));
     }
 
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
@@ -273,6 +273,11 @@ public:
         return getRatioOfDefaultRowsImpl<ColumnString>(sample_ratio);
     }
 
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        return getNumberOfDefaultRowsImpl<ColumnString>();
+    }
+
     void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const override
     {
         return getIndicesOfNonDefaultRowsImpl<ColumnString>(indices, from, limit);
diff --git a/src/Columns/ColumnTuple.cpp b/src/Columns/ColumnTuple.cpp
index 903540c1859..9f659aa7a7c 100644
--- a/src/Columns/ColumnTuple.cpp
+++ b/src/Columns/ColumnTuple.cpp
@@ -552,11 +552,11 @@ ColumnPtr ColumnTuple::compress() const
     }
 
     return ColumnCompressed::create(size(), byte_size,
-        [compressed = std::move(compressed)]() mutable
+        [my_compressed = std::move(compressed)]() mutable
         {
-            for (auto & column : compressed)
+            for (auto & column : my_compressed)
                 column = column->decompress();
-            return ColumnTuple::create(compressed);
+            return ColumnTuple::create(my_compressed);
         });
 }
 
@@ -565,6 +565,11 @@ double ColumnTuple::getRatioOfDefaultRows(double sample_ratio) const
     return getRatioOfDefaultRowsImpl<ColumnTuple>(sample_ratio);
 }
 
+UInt64 ColumnTuple::getNumberOfDefaultRows() const
+{
+    return getNumberOfDefaultRowsImpl<ColumnTuple>();
+}
+
 void ColumnTuple::getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const
 {
     return getIndicesOfNonDefaultRowsImpl<ColumnTuple>(indices, from, limit);
diff --git a/src/Columns/ColumnTuple.h b/src/Columns/ColumnTuple.h
index 25f6328b3fc..281fd94d893 100644
--- a/src/Columns/ColumnTuple.h
+++ b/src/Columns/ColumnTuple.h
@@ -102,6 +102,7 @@ public:
     bool isCollationSupported() const override;
     ColumnPtr compress() const override;
     double getRatioOfDefaultRows(double sample_ratio) const override;
+    UInt64 getNumberOfDefaultRows() const override;
     void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const override;
     void finalize() override;
     bool isFinalized() const override;
diff --git a/src/Columns/ColumnUnique.h b/src/Columns/ColumnUnique.h
index 8a95726d2be..377255d80c7 100644
--- a/src/Columns/ColumnUnique.h
+++ b/src/Columns/ColumnUnique.h
@@ -146,6 +146,11 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method 'getRatioOfDefaultRows' not implemented for ColumnUnique");
     }
 
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method 'getNumberOfDefaultRows' not implemented for ColumnUnique");
+    }
+
     void getIndicesOfNonDefaultRows(IColumn::Offsets &, size_t, size_t) const override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method 'getIndicesOfNonDefaultRows' not implemented for ColumnUnique");
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index 3ed3ed73328..f2fe343a371 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -910,9 +910,6 @@ void ColumnVector<T>::getExtremes(Field & min, Field & max) const
     max = NearestFieldType<T>(cur_max);
 }
 
-
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-
 template <typename T>
 ColumnPtr ColumnVector<T>::compress() const
 {
@@ -930,11 +927,11 @@ ColumnPtr ColumnVector<T>::compress() const
 
     const size_t compressed_size = compressed->size();
     return ColumnCompressed::create(data_size, compressed_size,
-        [compressed = std::move(compressed), column_size = data_size]
+        [my_compressed = std::move(compressed), column_size = data_size]
         {
             auto res = ColumnVector<T>::create(column_size);
             ColumnCompressed::decompressBuffer(
-                compressed->data(), res->getData().data(), compressed->size(), column_size * sizeof(T));
+                my_compressed->data(), res->getData().data(), my_compressed->size(), column_size * sizeof(T));
             return res;
         });
 }
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index ded66430160..bf790423d1d 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -358,6 +358,11 @@ public:
         return this->template getRatioOfDefaultRowsImpl<Self>(sample_ratio);
     }
 
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        return this->template getNumberOfDefaultRowsImpl<Self>();
+    }
+
     void getIndicesOfNonDefaultRows(IColumn::Offsets & indices, size_t from, size_t limit) const override
     {
         return this->template getIndicesOfNonDefaultRowsImpl<Self>(indices, from, limit);
diff --git a/src/Columns/IColumn.h b/src/Columns/IColumn.h
index 53619c73e5b..633bb384fb8 100644
--- a/src/Columns/IColumn.h
+++ b/src/Columns/IColumn.h
@@ -5,7 +5,7 @@
 #include <Common/Exception.h>
 #include <Common/typeid_cast.h>
 #include <base/StringRef.h>
-#include <Core/Types.h>
+#include <Core/TypeId.h>
 
 #include "config.h"
 
@@ -441,10 +441,13 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method structureEquals is not supported for {}", getName());
     }
 
-    /// Returns ration of values in column, that equal to default value of column.
+    /// Returns ratio of values in column, that are equal to default value of column.
     /// Checks only @sample_ratio ratio of rows.
     [[nodiscard]] virtual double getRatioOfDefaultRows(double sample_ratio = 1.0) const = 0; /// NOLINT
 
+    /// Returns number of values in column, that are equal to default value of column.
+    [[nodiscard]] virtual UInt64 getNumberOfDefaultRows() const = 0;
+
     /// Returns indices of values in column, that not equal to default value of column.
     virtual void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const = 0;
 
@@ -584,6 +587,9 @@ protected:
     template <typename Derived>
     double getRatioOfDefaultRowsImpl(double sample_ratio) const;
 
+    template <typename Derived>
+    UInt64 getNumberOfDefaultRowsImpl() const;
+
     template <typename Derived>
     void getIndicesOfNonDefaultRowsImpl(Offsets & indices, size_t from, size_t limit) const;
 
diff --git a/src/Columns/IColumnDummy.h b/src/Columns/IColumnDummy.h
index 0b00ebbdd1f..82d4c857b29 100644
--- a/src/Columns/IColumnDummy.h
+++ b/src/Columns/IColumnDummy.h
@@ -168,6 +168,11 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getRatioOfDefaultRows is not supported for {}", getName());
     }
 
+    UInt64 getNumberOfDefaultRows() const override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getNumberOfDefaultRows is not supported for {}", getName());
+    }
+
     void getIndicesOfNonDefaultRows(Offsets &, size_t, size_t) const override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getIndicesOfNonDefaultRows is not supported for {}", getName());
diff --git a/src/Columns/IColumnImpl.h b/src/Columns/IColumnImpl.h
index 8537a4c097c..0eab9452813 100644
--- a/src/Columns/IColumnImpl.h
+++ b/src/Columns/IColumnImpl.h
@@ -164,16 +164,14 @@ double IColumn::getRatioOfDefaultRowsImpl(double sample_ratio) const
         throw Exception(ErrorCodes::LOGICAL_ERROR,
             "Value of 'sample_ratio' must be in interval (0.0; 1.0], but got: {}", sample_ratio);
 
-    /// Randomize a little to avoid boundary effects.
-    std::uniform_int_distribution<size_t> dist(1, static_cast<size_t>(1.0 / sample_ratio));
+    static constexpr auto max_number_of_rows_for_full_search = 1000;
 
     size_t num_rows = size();
-    size_t num_sampled_rows = static_cast<size_t>(num_rows * sample_ratio);
-    size_t num_checked_rows = dist(thread_local_rng);
-    num_sampled_rows = std::min(num_sampled_rows + dist(thread_local_rng), num_rows);
+    size_t num_sampled_rows = std::min(static_cast<size_t>(num_rows * sample_ratio), num_rows);
+    size_t num_checked_rows = 0;
     size_t res = 0;
 
-    if (num_sampled_rows == num_rows)
+    if (num_sampled_rows == num_rows || num_rows <= max_number_of_rows_for_full_search)
     {
         for (size_t i = 0; i < num_rows; ++i)
             res += static_cast<const Derived &>(*this).isDefaultAt(i);
@@ -181,7 +179,7 @@ double IColumn::getRatioOfDefaultRowsImpl(double sample_ratio) const
     }
     else if (num_sampled_rows != 0)
     {
-        for (size_t i = num_checked_rows; i < num_rows; ++i)
+        for (size_t i = 0; i < num_rows; ++i)
         {
             if (num_checked_rows * num_rows <= i * num_sampled_rows)
             {
@@ -191,9 +189,22 @@ double IColumn::getRatioOfDefaultRowsImpl(double sample_ratio) const
         }
     }
 
+    if (num_checked_rows == 0)
+        return 0.0;
+
     return static_cast<double>(res) / num_checked_rows;
 }
 
+template <typename Derived>
+UInt64 IColumn::getNumberOfDefaultRowsImpl() const
+{
+    UInt64 res = 0;
+    size_t num_rows = size();
+    for (size_t i = 0; i < num_rows; ++i)
+        res += static_cast<const Derived &>(*this).isDefaultAt(i);
+    return res;
+}
+
 template <typename Derived>
 void IColumn::getIndicesOfNonDefaultRowsImpl(Offsets & indices, size_t from, size_t limit) const
 {
diff --git a/src/Columns/tests/gtest_column_object.cpp b/src/Columns/tests/gtest_column_object.cpp
index f9b6ff16b71..bef16e4fb56 100644
--- a/src/Columns/tests/gtest_column_object.cpp
+++ b/src/Columns/tests/gtest_column_object.cpp
@@ -8,6 +8,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Common/FieldVisitorToString.h>
 
+#include <Common/assert_cast.h>
 #include <Common/randomSeed.h>
 #include <fmt/core.h>
 #include <pcg_random.hpp>
diff --git a/src/Columns/tests/gtest_column_sparse.cpp b/src/Columns/tests/gtest_column_sparse.cpp
index b5b226c6862..6062ea51941 100644
--- a/src/Columns/tests/gtest_column_sparse.cpp
+++ b/src/Columns/tests/gtest_column_sparse.cpp
@@ -327,4 +327,3 @@ TEST(ColumnSparse, GetPermutation)
 }
 
 #undef DUMP_COLUMN
-#undef DUMP_NON_DEFAULTS
diff --git a/src/Columns/tests/gtest_weak_hash_32.cpp b/src/Columns/tests/gtest_weak_hash_32.cpp
index 5755cc3af72..44337e5d3f0 100644
--- a/src/Columns/tests/gtest_weak_hash_32.cpp
+++ b/src/Columns/tests/gtest_weak_hash_32.cpp
@@ -14,7 +14,7 @@
 #include <DataTypes/DataTypesNumber.h>
 
 #include <Common/WeakHash.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 #include <unordered_map>
 #include <iostream>
@@ -26,9 +26,7 @@ using namespace DB;
 template <typename T>
 void checkColumn(
     const WeakHash32::Container & hash,
-    const PaddedPODArray<T> & eq_class,
-    size_t allowed_collisions = 0,
-    size_t max_collisions_to_print = 10)
+    const PaddedPODArray<T> & eq_class)
 {
     ASSERT_EQ(hash.size(), eq_class.size());
 
@@ -52,41 +50,6 @@ void checkColumn(
             }
         }
     }
-
-    /// Check have not many collisions.
-    {
-        std::unordered_map<UInt32, T> map;
-        size_t num_collisions = 0;
-
-        std::stringstream collisions_str;       // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-        collisions_str.exceptions(std::ios::failbit);
-
-        for (size_t i = 0; i < eq_class.size(); ++i)
-        {
-            auto & val = eq_class[i];
-            auto it = map.find(hash[i]);
-
-            if (it == map.end())
-                map[hash[i]] = val;
-            else if (it->second != val)
-            {
-                ++num_collisions;
-
-                if (num_collisions <= max_collisions_to_print)
-                {
-                    collisions_str << "Collision:\n";
-                }
-
-                if (num_collisions > allowed_collisions)
-                {
-                    std::cerr << collisions_str.rdbuf();
-                    break;
-                }
-            }
-        }
-
-        ASSERT_LE(num_collisions, allowed_collisions);
-    }
 }
 
 TEST(WeakHash32, ColumnVectorU8)
@@ -374,10 +337,7 @@ TEST(WeakHash32, ColumnString2)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    /// Now there is single collision between 'k' * 544 and 'q' * 2512 (which is calculated twice)
-    size_t allowed_collisions = 4;
-
-    checkColumn(hash.getData(), data, allowed_collisions);
+    checkColumn(hash.getData(), data);
 }
 
 TEST(WeakHash32, ColumnString3)
@@ -717,8 +677,7 @@ TEST(WeakHash32, ColumnTupleUInt64String)
     WeakHash32 hash(col_tuple->size());
     col_tuple->updateWeakHash32(hash);
 
-    size_t allowed_collisions = 8;
-    checkColumn(hash.getData(), eq, allowed_collisions);
+    checkColumn(hash.getData(), eq);
 }
 
 TEST(WeakHash32, ColumnTupleUInt64FixedString)
@@ -803,10 +762,5 @@ TEST(WeakHash32, ColumnTupleUInt64Array)
     WeakHash32 hash(col_tuple->size());
     col_tuple->updateWeakHash32(hash);
 
-    /// There are 2 collisions right now (repeated 2 times each):
-    /// (0, [array of size 1212 with values 7]) vs (0, [array of size 2265 with values 17])
-    /// (0, [array of size 558 with values 5]) vs (1, [array of size 879 with values 21])
-
-    size_t allowed_collisions = 8;
-    checkColumn(hash.getData(), eq_data, allowed_collisions);
+    checkColumn(hash.getData(), eq_data);
 }
diff --git a/src/Common/Arena.h b/src/Common/Arena.h
index 5772dff6bca..0cf343809e8 100644
--- a/src/Common/Arena.h
+++ b/src/Common/Arena.h
@@ -80,7 +80,8 @@ private:
 
     /// Last contiguous MemoryChunk of memory.
     MemoryChunk * head;
-    size_t size_in_bytes;
+    size_t allocated_bytes;
+    size_t used_bytes;
     size_t page_size;
 
     static size_t roundUpToPageSize(size_t s, size_t page_size)
@@ -119,7 +120,7 @@ private:
     void NO_INLINE addMemoryChunk(size_t min_size)
     {
         head = new MemoryChunk(nextSize(min_size + pad_right), head);
-        size_in_bytes += head->size();
+        allocated_bytes += head->size();
     }
 
     friend class ArenaAllocator;
@@ -127,9 +128,12 @@ private:
 
 public:
     explicit Arena(size_t initial_size_ = 4096, size_t growth_factor_ = 2, size_t linear_growth_threshold_ = 128 * 1024 * 1024)
-        : growth_factor(growth_factor_), linear_growth_threshold(linear_growth_threshold_),
-        head(new MemoryChunk(initial_size_, nullptr)), size_in_bytes(head->size()),
-        page_size(static_cast<size_t>(::getPageSize()))
+        : growth_factor(growth_factor_)
+        , linear_growth_threshold(linear_growth_threshold_)
+        , head(new MemoryChunk(initial_size_, nullptr))
+        , allocated_bytes(head->size())
+        , used_bytes(0)
+        , page_size(static_cast<size_t>(::getPageSize()))
     {
     }
 
@@ -141,6 +145,7 @@ public:
     /// Get piece of memory, without alignment.
     char * alloc(size_t size)
     {
+        used_bytes += size;
         if (unlikely(static_cast<std::ptrdiff_t>(size) > head->end - head->pos))
             addMemoryChunk(size);
 
@@ -153,6 +158,7 @@ public:
     /// Get piece of memory with alignment
     char * alignedAlloc(size_t size, size_t alignment)
     {
+        used_bytes += size;
         do
         {
             void * head_pos = head->pos;
@@ -184,6 +190,7 @@ public:
       */
     void * rollback(size_t size)
     {
+        used_bytes -= size;
         head->pos -= size;
         ASAN_POISON_MEMORY_REGION(head->pos, size + pad_right);
         return head->pos;
@@ -299,11 +306,11 @@ public:
         return res;
     }
 
-    /// Size of MemoryChunks in bytes.
-    size_t size() const
-    {
-        return size_in_bytes;
-    }
+    /// Size of all MemoryChunks in bytes.
+    size_t allocatedBytes() const { return allocated_bytes; }
+
+    /// Total space actually used (not counting padding or space unused by caller allocations) in all MemoryChunks in bytes.
+    size_t usedBytes() const { return used_bytes; }
 
     /// Bad method, don't use it -- the MemoryChunks are not your business, the entire
     /// purpose of the arena code is to manage them for you, so if you find
diff --git a/src/Common/ArenaWithFreeLists.h b/src/Common/ArenaWithFreeLists.h
index 53a59c98299..76760a20320 100644
--- a/src/Common/ArenaWithFreeLists.h
+++ b/src/Common/ArenaWithFreeLists.h
@@ -107,10 +107,7 @@ public:
     }
 
     /// Size of the allocated pool in bytes
-    size_t size() const
-    {
-        return pool.size();
-    }
+    size_t allocatedBytes() const { return pool.allocatedBytes(); }
 };
 
 class SynchronizedArenaWithFreeLists : private ArenaWithFreeLists
@@ -135,10 +132,10 @@ public:
     }
 
     /// Size of the allocated pool in bytes
-    size_t size() const
+    size_t allocatedBytes() const
     {
         std::lock_guard lock{mutex};
-        return ArenaWithFreeLists::size();
+        return ArenaWithFreeLists::allocatedBytes();
     }
 private:
     mutable std::mutex mutex;
diff --git a/src/Common/AsyncLoader.cpp b/src/Common/AsyncLoader.cpp
new file mode 100644
index 00000000000..86edcdc8f3d
--- /dev/null
+++ b/src/Common/AsyncLoader.cpp
@@ -0,0 +1,722 @@
+#include <Common/AsyncLoader.h>
+
+#include <base/defines.h>
+#include <Common/ErrorCodes.h>
+#include <Common/Exception.h>
+#include <Common/noexcept_scope.h>
+#include <Common/setThreadName.h>
+#include <Common/logger_useful.h>
+#include <Common/ThreadPool.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ASYNC_LOAD_CYCLE;
+    extern const int ASYNC_LOAD_FAILED;
+    extern const int ASYNC_LOAD_CANCELED;
+}
+
+static constexpr size_t PRINT_MESSAGE_EACH_N_OBJECTS = 256;
+static constexpr size_t PRINT_MESSAGE_EACH_N_SECONDS = 5;
+
+void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, AtomicStopwatch & watch)
+{
+    if (processed % PRINT_MESSAGE_EACH_N_OBJECTS == 0 || watch.compareAndRestart(PRINT_MESSAGE_EACH_N_SECONDS))
+    {
+        LOG_INFO(log, "Processed: {}%", processed * 100.0 / total);
+        watch.restart();
+    }
+}
+
+LoadStatus LoadJob::status() const
+{
+    std::unique_lock lock{mutex};
+    return load_status;
+}
+
+std::exception_ptr LoadJob::exception() const
+{
+    std::unique_lock lock{mutex};
+    return load_exception;
+}
+
+size_t LoadJob::executionPool() const
+{
+    return execution_pool_id;
+}
+
+size_t LoadJob::pool() const
+{
+    return pool_id;
+}
+
+void LoadJob::wait() const
+{
+    std::unique_lock lock{mutex};
+    waiters++;
+    finished.wait(lock, [this] { return load_status != LoadStatus::PENDING; });
+    waiters--;
+    if (load_exception)
+        std::rethrow_exception(load_exception);
+}
+
+void LoadJob::waitNoThrow() const noexcept
+{
+    std::unique_lock lock{mutex};
+    waiters++;
+    finished.wait(lock, [this] { return load_status != LoadStatus::PENDING; });
+    waiters--;
+}
+
+size_t LoadJob::waitersCount() const
+{
+    std::unique_lock lock{mutex};
+    return waiters;
+}
+
+void LoadJob::ok()
+{
+    std::unique_lock lock{mutex};
+    load_status = LoadStatus::OK;
+    finish();
+}
+
+void LoadJob::failed(const std::exception_ptr & ptr)
+{
+    std::unique_lock lock{mutex};
+    load_status = LoadStatus::FAILED;
+    load_exception = ptr;
+    finish();
+}
+
+void LoadJob::canceled(const std::exception_ptr & ptr)
+{
+    std::unique_lock lock{mutex};
+    load_status = LoadStatus::CANCELED;
+    load_exception = ptr;
+    finish();
+}
+
+void LoadJob::finish()
+{
+    func = {}; // To ensure job function is destructed before `AsyncLoader::wait()` and `LoadJob::wait()` return
+    finish_time = std::chrono::system_clock::now();
+    if (waiters > 0)
+        finished.notify_all();
+}
+
+void LoadJob::scheduled()
+{
+    schedule_time = std::chrono::system_clock::now();
+}
+
+void LoadJob::enqueued()
+{
+    if (enqueue_time.load() == TimePoint{}) // Do not rewrite in case of requeue
+        enqueue_time = std::chrono::system_clock::now();
+}
+
+void LoadJob::execute(size_t pool, const LoadJobPtr & self)
+{
+    execution_pool_id = pool;
+    start_time = std::chrono::system_clock::now();
+    func(self);
+}
+
+
+LoadTask::LoadTask(AsyncLoader & loader_, LoadJobSet && jobs_, LoadJobSet && goal_jobs_)
+    : loader(loader_)
+    , jobs(std::move(jobs_))
+    , goal_jobs(std::move(goal_jobs_))
+{}
+
+LoadTask::~LoadTask()
+{
+    remove();
+}
+
+void LoadTask::merge(const LoadTaskPtr & task)
+{
+    chassert(&loader == &task->loader);
+    jobs.merge(task->jobs);
+    goal_jobs.merge(task->goal_jobs);
+}
+
+void LoadTask::schedule()
+{
+    loader.schedule(*this);
+}
+
+void LoadTask::remove()
+{
+    if (!jobs.empty())
+    {
+        loader.remove(jobs);
+        jobs.clear();
+        goal_jobs.clear();
+    }
+}
+
+void LoadTask::detach()
+{
+    jobs.clear();
+    goal_jobs.clear();
+}
+
+
+AsyncLoader::AsyncLoader(std::vector<PoolInitializer> pool_initializers, bool log_failures_, bool log_progress_)
+    : log_failures(log_failures_)
+    , log_progress(log_progress_)
+    , log(&Poco::Logger::get("AsyncLoader"))
+{
+    pools.reserve(pool_initializers.size());
+    for (auto && init : pool_initializers)
+        pools.push_back({
+            .name = init.name,
+            .priority = init.priority,
+            .thread_pool = std::make_unique<ThreadPool>(
+                init.metric_threads,
+                init.metric_active_threads,
+                init.max_threads,
+                /* max_free_threads = */ 0,
+                init.max_threads),
+            .max_threads = init.max_threads
+        });
+}
+
+AsyncLoader::~AsyncLoader()
+{
+    stop();
+}
+
+void AsyncLoader::start()
+{
+    std::unique_lock lock{mutex};
+    is_running = true;
+    updateCurrentPriorityAndSpawn(lock);
+}
+
+void AsyncLoader::wait()
+{
+    // Because job can create new jobs in other pools we have to recheck in cycle
+    std::unique_lock lock{mutex};
+    while (!scheduled_jobs.empty())
+    {
+        lock.unlock();
+        for (auto & p : pools)
+            p.thread_pool->wait();
+        lock.lock();
+    }
+}
+
+void AsyncLoader::stop()
+{
+    {
+        std::unique_lock lock{mutex};
+        is_running = false;
+        // NOTE: there is no need to notify because workers never wait
+    }
+    wait();
+}
+
+void AsyncLoader::schedule(LoadTask & task)
+{
+    chassert(this == &task.loader);
+    scheduleImpl(task.jobs);
+}
+
+void AsyncLoader::schedule(const LoadTaskPtr & task)
+{
+    chassert(this == &task->loader);
+    scheduleImpl(task->jobs);
+}
+
+void AsyncLoader::schedule(const std::vector<LoadTaskPtr> & tasks)
+{
+    LoadJobSet all_jobs;
+    for (const auto & task : tasks)
+    {
+        chassert(this == &task->loader);
+        all_jobs.insert(task->jobs.begin(), task->jobs.end());
+    }
+    scheduleImpl(all_jobs);
+}
+
+void AsyncLoader::scheduleImpl(const LoadJobSet & input_jobs)
+{
+    std::unique_lock lock{mutex};
+
+    // Restart watches after idle period
+    if (scheduled_jobs.empty())
+    {
+        busy_period_start_time = std::chrono::system_clock::now();
+        stopwatch.restart();
+        old_jobs = finished_jobs.size();
+    }
+
+    // Pass 1. Make set of jobs to schedule:
+    // 1) exclude already scheduled or finished jobs
+    // 2) include assigned job dependencies (that are not yet scheduled)
+    LoadJobSet jobs;
+    for (const auto & job : input_jobs)
+        gatherNotScheduled(job, jobs, lock);
+
+    // Ensure scheduled_jobs graph will have no cycles. The only way to get a cycle is to add a cycle, assuming old jobs cannot reference new ones.
+    checkCycle(jobs, lock);
+
+    // We do not want any exception to be throws after this point, because the following code is not exception-safe
+    DENY_ALLOCATIONS_IN_SCOPE;
+
+    // Pass 2. Schedule all incoming jobs
+    for (const auto & job : jobs)
+    {
+        chassert(job->pool() < pools.size());
+        NOEXCEPT_SCOPE({
+            ALLOW_ALLOCATIONS_IN_SCOPE;
+            scheduled_jobs.try_emplace(job);
+            job->scheduled();
+        });
+    }
+
+    // Pass 3. Process dependencies on scheduled jobs, priority inheritance
+    for (const auto & job : jobs)
+    {
+        Info & info = scheduled_jobs.find(job)->second;
+        for (const auto & dep : job->dependencies)
+        {
+            // Register every dependency on scheduled job with back-link to dependent job
+            if (auto dep_info = scheduled_jobs.find(dep); dep_info != scheduled_jobs.end())
+            {
+                NOEXCEPT_SCOPE({
+                    ALLOW_ALLOCATIONS_IN_SCOPE;
+                    dep_info->second.dependent_jobs.insert(job);
+                });
+                info.dependencies_left++;
+
+                // Priority inheritance: prioritize deps to have at least given `pool.priority` to avoid priority inversion
+                prioritize(dep, job->pool_id, lock);
+            }
+        }
+
+        // Enqueue non-blocked jobs (w/o dependencies) to ready queue
+        if (!info.isBlocked())
+            enqueue(info, job, lock);
+    }
+
+    // Pass 4: Process dependencies on other jobs.
+    // It is done in a separate pass to facilitate cancelling due to already failed dependencies.
+    for (const auto & job : jobs)
+    {
+        if (auto info = scheduled_jobs.find(job); info != scheduled_jobs.end())
+        {
+            for (const auto & dep : job->dependencies)
+            {
+                if (scheduled_jobs.contains(dep))
+                    continue; // Skip dependencies on scheduled jobs (already processed in pass 3)
+                LoadStatus dep_status = dep->status();
+                if (dep_status == LoadStatus::OK)
+                    continue; // Dependency on already successfully finished job -- it's okay.
+
+                // Dependency on assigned job -- it's bad.
+                // Probably, there is an error in `jobs` set, `gatherNotScheduled()` should have fixed it.
+                chassert(dep_status != LoadStatus::PENDING);
+
+                if (dep_status == LoadStatus::FAILED || dep_status == LoadStatus::CANCELED)
+                {
+                    // Dependency on already failed or canceled job -- it's okay. Cancel all dependent jobs.
+                    std::exception_ptr e;
+                    NOEXCEPT_SCOPE({
+                        ALLOW_ALLOCATIONS_IN_SCOPE;
+                        e = std::make_exception_ptr(Exception(ErrorCodes::ASYNC_LOAD_CANCELED,
+                            "Load job '{}' -> {}",
+                            job->name,
+                            getExceptionMessage(dep->exception(), /* with_stacktrace = */ false)));
+                    });
+                    finish(job, LoadStatus::CANCELED, e, lock);
+                    break; // This job is now finished, stop its dependencies processing
+                }
+            }
+        }
+        else
+        {
+            // Job was already canceled on previous iteration of this cycle -- skip
+        }
+    }
+}
+
+void AsyncLoader::gatherNotScheduled(const LoadJobPtr & job, LoadJobSet & jobs, std::unique_lock<std::mutex> & lock)
+{
+    if (job->status() == LoadStatus::PENDING && !scheduled_jobs.contains(job) && !jobs.contains(job))
+    {
+        jobs.insert(job);
+        for (const auto & dep : job->dependencies)
+            gatherNotScheduled(dep, jobs, lock);
+    }
+}
+
+void AsyncLoader::prioritize(const LoadJobPtr & job, size_t new_pool)
+{
+    if (!job)
+        return;
+    chassert(new_pool < pools.size());
+    DENY_ALLOCATIONS_IN_SCOPE;
+    std::unique_lock lock{mutex};
+    prioritize(job, new_pool, lock);
+}
+
+void AsyncLoader::remove(const LoadJobSet & jobs)
+{
+    DENY_ALLOCATIONS_IN_SCOPE;
+    std::unique_lock lock{mutex};
+    // On the first pass:
+    // - cancel all not executing jobs to avoid races
+    // - do not wait executing jobs (otherwise, on unlock a worker could start executing a dependent job, that should be canceled)
+    for (const auto & job : jobs)
+    {
+        if (auto info = scheduled_jobs.find(job); info != scheduled_jobs.end())
+        {
+            if (info->second.isExecuting())
+                continue; // Skip executing jobs on the first pass
+            std::exception_ptr e;
+            NOEXCEPT_SCOPE({
+                ALLOW_ALLOCATIONS_IN_SCOPE;
+                e = std::make_exception_ptr(Exception(ErrorCodes::ASYNC_LOAD_CANCELED, "Load job '{}' canceled", job->name));
+            });
+            finish(job, LoadStatus::CANCELED, e, lock);
+        }
+    }
+    // On the second pass wait for executing jobs to finish
+    for (const auto & job : jobs)
+    {
+        if (auto info = scheduled_jobs.find(job); info != scheduled_jobs.end())
+        {
+            // Job is currently executing
+            chassert(info->second.isExecuting());
+            lock.unlock();
+            job->waitNoThrow(); // Wait for job to finish
+            lock.lock();
+        }
+    }
+    // On the third pass all jobs are finished - remove them all
+    // It is better to do it under one lock to avoid exposing intermediate states
+    for (const auto & job : jobs)
+    {
+        size_t erased = finished_jobs.erase(job);
+        if (old_jobs >= erased && job->finishTime() != LoadJob::TimePoint{} && job->finishTime() < busy_period_start_time)
+            old_jobs -= erased;
+    }
+}
+
+void AsyncLoader::setMaxThreads(size_t pool, size_t value)
+{
+    std::unique_lock lock{mutex};
+    auto & p = pools[pool];
+    p.thread_pool->setMaxThreads(value);
+    p.thread_pool->setQueueSize(value); // Keep queue size equal max threads count to avoid blocking during spawning
+    p.max_threads = value;
+    if (!is_running)
+        return;
+    for (size_t i = 0; canSpawnWorker(p, lock) && i < p.ready_queue.size(); i++)
+        spawn(p, lock);
+}
+
+size_t AsyncLoader::getMaxThreads(size_t pool) const
+{
+    std::unique_lock lock{mutex};
+    return pools[pool].max_threads;
+}
+
+const String & AsyncLoader::getPoolName(size_t pool) const
+{
+    return pools[pool].name; // NOTE: lock is not needed because `name` is const and `pools` are immutable
+}
+
+Priority AsyncLoader::getPoolPriority(size_t pool) const
+{
+    return pools[pool].priority; // NOTE: lock is not needed because `priority` is const and `pools` are immutable
+}
+
+
+size_t AsyncLoader::getScheduledJobCount() const
+{
+    std::unique_lock lock{mutex};
+    return scheduled_jobs.size();
+}
+
+std::vector<AsyncLoader::JobState> AsyncLoader::getJobStates() const
+{
+    std::unique_lock lock{mutex};
+    std::multimap<String, JobState> states;
+    for (const auto & [job, info] : scheduled_jobs)
+        states.emplace(job->name, JobState{
+            .job = job,
+            .dependencies_left = info.dependencies_left,
+            .ready_seqno = info.ready_seqno,
+            .is_blocked = info.isBlocked(),
+            .is_ready = info.isReady(),
+            .is_executing = info.isExecuting()
+        });
+    for (const auto & job : finished_jobs)
+        states.emplace(job->name, JobState{.job = job});
+    lock.unlock();
+    std::vector<JobState> result;
+    for (auto && [_, state] : states)
+        result.emplace_back(std::move(state));
+    return result;
+}
+
+void AsyncLoader::checkCycle(const LoadJobSet & jobs, std::unique_lock<std::mutex> & lock)
+{
+    LoadJobSet left = jobs;
+    LoadJobSet visited;
+    visited.reserve(left.size());
+    while (!left.empty())
+    {
+        LoadJobPtr job = *left.begin();
+        checkCycleImpl(job, left, visited, lock);
+    }
+}
+
+String AsyncLoader::checkCycleImpl(const LoadJobPtr & job, LoadJobSet & left, LoadJobSet & visited, std::unique_lock<std::mutex> & lock)
+{
+    if (!left.contains(job))
+        return {}; // Do not consider external dependencies and already processed jobs
+    if (auto [_, inserted] = visited.insert(job); !inserted)
+    {
+        visited.erase(job); // Mark where cycle ends
+        return job->name;
+    }
+    for (const auto & dep : job->dependencies)
+    {
+        if (auto chain = checkCycleImpl(dep, left, visited, lock); !chain.empty())
+        {
+            if (!visited.contains(job)) // Check for cycle end
+                throw Exception(ErrorCodes::ASYNC_LOAD_CYCLE, "Load job dependency cycle detected: {} -> {}", job->name, chain);
+            else
+                return fmt::format("{} -> {}", job->name, chain); // chain is not a cycle yet -- continue building
+        }
+    }
+    left.erase(job);
+    return {};
+}
+
+void AsyncLoader::finish(const LoadJobPtr & job, LoadStatus status, std::exception_ptr exception_from_job, std::unique_lock<std::mutex> & lock)
+{
+    chassert(scheduled_jobs.contains(job)); // Job was pending
+    if (status == LoadStatus::OK)
+    {
+        // Notify waiters
+        job->ok();
+
+        // Update dependent jobs and enqueue if ready
+        for (const auto & dep : scheduled_jobs[job].dependent_jobs)
+        {
+            chassert(scheduled_jobs.contains(dep)); // All depended jobs must be pending
+            Info & dep_info = scheduled_jobs[dep];
+            dep_info.dependencies_left--;
+            if (!dep_info.isBlocked())
+                enqueue(dep_info, dep, lock);
+        }
+    }
+    else
+    {
+        // Notify waiters
+        if (status == LoadStatus::FAILED)
+            job->failed(exception_from_job);
+        else if (status == LoadStatus::CANCELED)
+            job->canceled(exception_from_job);
+
+        Info & info = scheduled_jobs[job];
+        if (info.isReady())
+        {
+            pools[job->pool_id].ready_queue.erase(info.ready_seqno);
+            info.ready_seqno = 0;
+        }
+
+        // Recurse into all dependent jobs
+        LoadJobSet dependent;
+        dependent.swap(info.dependent_jobs); // To avoid container modification during recursion
+        for (const auto & dep : dependent)
+        {
+            if (!scheduled_jobs.contains(dep))
+                continue; // Job has already been canceled
+            std::exception_ptr e;
+            NOEXCEPT_SCOPE({
+                ALLOW_ALLOCATIONS_IN_SCOPE;
+                e = std::make_exception_ptr(
+                    Exception(ErrorCodes::ASYNC_LOAD_CANCELED,
+                        "Load job '{}' -> {}",
+                        dep->name,
+                        getExceptionMessage(exception_from_job, /* with_stacktrace = */ false)));
+            });
+            finish(dep, LoadStatus::CANCELED, e, lock);
+        }
+
+        // Clean dependency graph edges pointing to canceled jobs
+        for (const auto & dep : job->dependencies)
+            if (auto dep_info = scheduled_jobs.find(dep); dep_info != scheduled_jobs.end())
+                dep_info->second.dependent_jobs.erase(job);
+    }
+
+    // Job became finished
+    scheduled_jobs.erase(job);
+    NOEXCEPT_SCOPE({
+        ALLOW_ALLOCATIONS_IN_SCOPE;
+        finished_jobs.insert(job);
+        if (log_progress)
+            logAboutProgress(log, finished_jobs.size() - old_jobs, finished_jobs.size() + scheduled_jobs.size() - old_jobs, stopwatch);
+    });
+}
+
+void AsyncLoader::prioritize(const LoadJobPtr & job, size_t new_pool_id, std::unique_lock<std::mutex> & lock)
+{
+    if (auto info = scheduled_jobs.find(job); info != scheduled_jobs.end())
+    {
+        Pool & old_pool = pools[job->pool_id];
+        Pool & new_pool = pools[new_pool_id];
+        if (old_pool.priority <= new_pool.priority)
+            return; // Never lower priority or change pool leaving the same priority
+
+        // Update priority and push job forward through ready queue if needed
+        UInt64 ready_seqno = info->second.ready_seqno;
+
+        // Requeue job into the new pool queue without allocations
+        if (ready_seqno)
+        {
+            new_pool.ready_queue.insert(old_pool.ready_queue.extract(ready_seqno));
+            if (canSpawnWorker(new_pool, lock))
+                spawn(new_pool, lock);
+        }
+
+        // Set user-facing pool (may affect executing jobs)
+        job->pool_id.store(new_pool_id);
+
+        // Recurse into dependencies
+        for (const auto & dep : job->dependencies)
+            prioritize(dep, new_pool_id, lock);
+    }
+}
+
+void AsyncLoader::enqueue(Info & info, const LoadJobPtr & job, std::unique_lock<std::mutex> & lock)
+{
+    chassert(!info.isBlocked());
+    chassert(info.ready_seqno == 0);
+    info.ready_seqno = ++last_ready_seqno;
+    Pool & pool = pools[job->pool_id];
+    NOEXCEPT_SCOPE({
+        ALLOW_ALLOCATIONS_IN_SCOPE;
+        pool.ready_queue.emplace(info.ready_seqno, job);
+    });
+
+    job->enqueued();
+
+    if (canSpawnWorker(pool, lock))
+        spawn(pool, lock);
+}
+
+bool AsyncLoader::canSpawnWorker(Pool & pool, std::unique_lock<std::mutex> &)
+{
+    return is_running
+        && !pool.ready_queue.empty()
+        && pool.workers < pool.max_threads
+        && (!current_priority || *current_priority >= pool.priority);
+}
+
+bool AsyncLoader::canWorkerLive(Pool & pool, std::unique_lock<std::mutex> &)
+{
+    return is_running
+        && !pool.ready_queue.empty()
+        && pool.workers <= pool.max_threads
+        && (!current_priority || *current_priority >= pool.priority);
+}
+
+void AsyncLoader::updateCurrentPriorityAndSpawn(std::unique_lock<std::mutex> & lock)
+{
+    // Find current priority.
+    // NOTE: We assume low number of pools, so O(N) scans are fine.
+    std::optional<Priority> priority;
+    for (Pool & pool : pools)
+    {
+        if (pool.isActive() && (!priority || *priority > pool.priority))
+            priority = pool.priority;
+    }
+    current_priority = priority;
+
+    // Spawn workers in all pools with current priority
+    for (Pool & pool : pools)
+    {
+        for (size_t i = 0; canSpawnWorker(pool, lock) && i < pool.ready_queue.size(); i++)
+            spawn(pool, lock);
+    }
+}
+
+void AsyncLoader::spawn(Pool & pool, std::unique_lock<std::mutex> &)
+{
+    pool.workers++;
+    current_priority = pool.priority; // canSpawnWorker() ensures this would not decrease current_priority
+    NOEXCEPT_SCOPE({
+        ALLOW_ALLOCATIONS_IN_SCOPE;
+        pool.thread_pool->scheduleOrThrowOnError([this, &pool] { worker(pool); });
+    });
+}
+
+void AsyncLoader::worker(Pool & pool)
+{
+    DENY_ALLOCATIONS_IN_SCOPE;
+
+    size_t pool_id = &pool - &*pools.begin();
+    LoadJobPtr job;
+    std::exception_ptr exception_from_job;
+    while (true)
+    {
+        // This is inside the loop to also reset previous thread names set inside the jobs
+        setThreadName(pool.name.c_str());
+
+        {
+            std::unique_lock lock{mutex};
+
+            // Handle just executed job
+            if (exception_from_job)
+                finish(job, LoadStatus::FAILED, exception_from_job, lock);
+            else if (job)
+                finish(job, LoadStatus::OK, {}, lock);
+
+            if (!canWorkerLive(pool, lock))
+            {
+                if (--pool.workers == 0)
+                    updateCurrentPriorityAndSpawn(lock); // It will spawn lower priority workers if needed
+                return;
+            }
+
+            // Take next job to be executed from the ready queue
+            auto it = pool.ready_queue.begin();
+            job = it->second;
+            pool.ready_queue.erase(it);
+            scheduled_jobs.find(job)->second.ready_seqno = 0; // This job is no longer in the ready queue
+        }
+
+        ALLOW_ALLOCATIONS_IN_SCOPE;
+
+        try
+        {
+            job->execute(pool_id, job);
+            exception_from_job = {};
+        }
+        catch (...)
+        {
+            NOEXCEPT_SCOPE({
+                if (log_failures)
+                    tryLogCurrentException(__PRETTY_FUNCTION__);
+                exception_from_job = std::make_exception_ptr(
+                    Exception(ErrorCodes::ASYNC_LOAD_FAILED,
+                        "Load job '{}' failed: {}",
+                        job->name,
+                        getCurrentExceptionMessage(/* with_stacktrace = */ true)));
+            });
+        }
+    }
+}
+
+}
diff --git a/src/Common/AsyncLoader.h b/src/Common/AsyncLoader.h
new file mode 100644
index 00000000000..322a4482e4e
--- /dev/null
+++ b/src/Common/AsyncLoader.h
@@ -0,0 +1,466 @@
+#pragma once
+
+#include <condition_variable>
+#include <exception>
+#include <memory>
+#include <map>
+#include <mutex>
+#include <vector>
+#include <unordered_set>
+#include <unordered_map>
+#include <boost/noncopyable.hpp>
+#include <base/types.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/Priority.h>
+#include <Common/Stopwatch.h>
+#include <Common/ThreadPool_fwd.h>
+
+
+namespace Poco { class Logger; }
+
+namespace DB
+{
+
+class LoadJob;
+using LoadJobPtr = std::shared_ptr<LoadJob>;
+using LoadJobSet = std::unordered_set<LoadJobPtr>;
+class LoadTask;
+using LoadTaskPtr = std::shared_ptr<LoadTask>;
+using LoadTaskPtrs = std::vector<LoadTaskPtr>;
+class AsyncLoader;
+
+void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, AtomicStopwatch & watch);
+
+// Execution status of a load job.
+enum class LoadStatus
+{
+    PENDING,  // Load job is not started yet.
+    OK,       // Load job executed and was successful.
+    FAILED,   // Load job executed and failed.
+    CANCELED  // Load job is not going to be executed due to removal or dependency failure.
+};
+
+// Smallest indivisible part of a loading process. Load job can have multiple dependencies, thus jobs constitute a direct acyclic graph (DAG).
+// Job encapsulates a function to be executed by `AsyncLoader` as soon as job functions of all dependencies are successfully executed.
+// Job can be waited for by an arbitrary number of threads. See `AsyncLoader` class description for more details.
+class LoadJob : private boost::noncopyable
+{
+public:
+    template <class Func, class LoadJobSetType>
+    LoadJob(LoadJobSetType && dependencies_, String name_, size_t pool_id_, Func && func_)
+        : dependencies(std::forward<LoadJobSetType>(dependencies_))
+        , name(std::move(name_))
+        , pool_id(pool_id_)
+        , func(std::forward<Func>(func_))
+    {}
+
+    // Current job status.
+    LoadStatus status() const;
+    std::exception_ptr exception() const;
+
+    // Returns pool in which the job is executing (was executed). May differ from initial pool and from current pool.
+    // Value is only valid (and constant) after execution started.
+    size_t executionPool() const;
+
+    // Returns current pool of the job. May differ from initial and execution pool.
+    // This value is intended for creating new jobs during this job execution.
+    // Value may change during job execution by `prioritize()`.
+    size_t pool() const;
+
+    // Sync wait for a pending job to be finished: OK, FAILED or CANCELED status.
+    // Throws if job is FAILED or CANCELED. Returns or throws immediately if called on non-pending job.
+    void wait() const;
+
+    // Wait for a job to reach any non PENDING status.
+    void waitNoThrow() const noexcept;
+
+    // Returns number of threads blocked by `wait()` or `waitNoThrow()` calls.
+    size_t waitersCount() const;
+
+    // Introspection
+    using TimePoint = std::chrono::system_clock::time_point;
+    TimePoint scheduleTime() const { return schedule_time; }
+    TimePoint enqueueTime() const { return enqueue_time; }
+    TimePoint startTime() const { return start_time; }
+    TimePoint finishTime() const { return finish_time; }
+
+    const LoadJobSet dependencies; // Jobs to be done before this one (with ownership), it is `const` to make creation of cycles hard
+    const String name;
+
+private:
+    friend class AsyncLoader;
+
+    void ok();
+    void failed(const std::exception_ptr & ptr);
+    void canceled(const std::exception_ptr & ptr);
+    void finish();
+
+    void scheduled();
+    void enqueued();
+    void execute(size_t pool, const LoadJobPtr & self);
+
+    std::atomic<size_t> execution_pool_id;
+    std::atomic<size_t> pool_id;
+    std::function<void(const LoadJobPtr & self)> func;
+
+    mutable std::mutex mutex;
+    mutable std::condition_variable finished;
+    mutable size_t waiters = 0;
+    LoadStatus load_status{LoadStatus::PENDING};
+    std::exception_ptr load_exception;
+
+    std::atomic<TimePoint> schedule_time{TimePoint{}};
+    std::atomic<TimePoint> enqueue_time{TimePoint{}};
+    std::atomic<TimePoint> start_time{TimePoint{}};
+    std::atomic<TimePoint> finish_time{TimePoint{}};
+};
+
+struct EmptyJobFunc
+{
+    void operator()(const LoadJobPtr &) {}
+};
+
+template <class Func = EmptyJobFunc>
+LoadJobPtr makeLoadJob(LoadJobSet && dependencies, String name, Func && func = EmptyJobFunc())
+{
+    return std::make_shared<LoadJob>(std::move(dependencies), std::move(name), 0, std::forward<Func>(func));
+}
+
+template <class Func = EmptyJobFunc>
+LoadJobPtr makeLoadJob(const LoadJobSet & dependencies, String name, Func && func = EmptyJobFunc())
+{
+    return std::make_shared<LoadJob>(dependencies, std::move(name), 0, std::forward<Func>(func));
+}
+
+template <class Func = EmptyJobFunc>
+LoadJobPtr makeLoadJob(LoadJobSet && dependencies, size_t pool_id, String name, Func && func = EmptyJobFunc())
+{
+    return std::make_shared<LoadJob>(std::move(dependencies), std::move(name), pool_id, std::forward<Func>(func));
+}
+
+template <class Func = EmptyJobFunc>
+LoadJobPtr makeLoadJob(const LoadJobSet & dependencies, size_t pool_id, String name, Func && func = EmptyJobFunc())
+{
+    return std::make_shared<LoadJob>(dependencies, std::move(name), pool_id, std::forward<Func>(func));
+}
+
+// Represents a logically connected set of LoadJobs required to achieve some goals (final LoadJob in the set).
+class LoadTask : private boost::noncopyable
+{
+public:
+    LoadTask(AsyncLoader & loader_, LoadJobSet && jobs_, LoadJobSet && goal_jobs_ = {});
+    ~LoadTask();
+
+    // Merge all jobs from other task into this task.
+    void merge(const LoadTaskPtr & task);
+
+    // Schedule all jobs with AsyncLoader.
+    void schedule();
+
+    // Remove all jobs of this task from AsyncLoader.
+    void remove();
+
+    // Do not track jobs in this task.
+    // WARNING: Jobs will never be removed() and are going to be stored as finished jobs until ~AsyncLoader().
+    void detach();
+
+    // Return the final jobs in this tasks. This job subset should be used as `dependencies` for dependent jobs or tasks:
+    //   auto load_task = loadSomethingAsync(async_loader, load_after_task.goals(), something);
+    const LoadJobSet & goals() const { return goal_jobs.empty() ? jobs : goal_jobs; }
+
+private:
+    friend class AsyncLoader;
+
+    AsyncLoader & loader;
+    LoadJobSet jobs;
+    LoadJobSet goal_jobs;
+};
+
+inline LoadTaskPtr makeLoadTask(AsyncLoader & loader, LoadJobSet && jobs, LoadJobSet && goals = {})
+{
+    return std::make_shared<LoadTask>(loader, std::move(jobs), std::move(goals));
+}
+
+inline void scheduleLoad(const LoadTaskPtr & task)
+{
+    task->schedule();
+}
+
+inline void scheduleLoad(const LoadTaskPtrs & tasks)
+{
+    for (const auto & task : tasks)
+        task->schedule();
+}
+
+template <class... Args>
+inline void scheduleLoadAll(Args && ... args)
+{
+    (scheduleLoad(std::forward<Args>(args)), ...);
+}
+
+inline void waitLoad(const LoadJobSet & jobs)
+{
+    for (const auto & job : jobs)
+        job->wait();
+}
+
+inline void waitLoad(const LoadTaskPtr & task)
+{
+    waitLoad(task->goals());
+}
+
+inline void waitLoad(const LoadTaskPtrs & tasks)
+{
+    for (const auto & task : tasks)
+        waitLoad(task->goals());
+}
+
+template <class... Args>
+inline void waitLoadAll(Args && ... args)
+{
+    (waitLoad(std::forward<Args>(args)), ...);
+}
+
+template <class... Args>
+inline void scheduleAndWaitLoadAll(Args && ... args)
+{
+    scheduleLoadAll(std::forward<Args>(args)...);
+    waitLoadAll(std::forward<Args>(args)...);
+}
+
+inline LoadJobSet getGoals(const LoadTaskPtrs & tasks)
+{
+    LoadJobSet result;
+    for (const auto & task : tasks)
+        result.insert(task->goals().begin(), task->goals().end());
+    return result;
+}
+
+inline LoadJobSet getGoalsOr(const LoadTaskPtrs & tasks, const LoadJobSet & alternative)
+{
+    LoadJobSet result;
+    for (const auto & task : tasks)
+        result.insert(task->goals().begin(), task->goals().end());
+    return result.empty() ? alternative : result;
+}
+
+inline LoadJobSet joinJobs(const LoadJobSet & jobs1, const LoadJobSet & jobs2)
+{
+    LoadJobSet result;
+    if (!jobs1.empty())
+        result.insert(jobs1.begin(), jobs1.end());
+    if (!jobs2.empty())
+        result.insert(jobs2.begin(), jobs2.end());
+    return result;
+}
+
+inline LoadTaskPtrs joinTasks(const LoadTaskPtrs & tasks1, const LoadTaskPtrs & tasks2)
+{
+    if (tasks1.empty())
+        return tasks2;
+    if (tasks2.empty())
+        return tasks1;
+    LoadTaskPtrs result;
+    result.reserve(tasks1.size() + tasks2.size());
+    result.insert(result.end(), tasks1.begin(), tasks1.end());
+    result.insert(result.end(), tasks2.begin(), tasks2.end());
+    return result;
+}
+
+// `AsyncLoader` is a scheduler for DAG of `LoadJob`s. It tracks job dependencies and priorities.
+// Basic usage example:
+//     // Start async_loader with two thread pools (0=fg, 1=bg):
+//     AsyncLoader async_loader({
+//         {"FgPool", CurrentMetrics::AsyncLoaderThreads, CurrentMetrics::AsyncLoaderThreadsActive, .max_threads = 2, .priority{0}}
+//         {"BgPool", CurrentMetrics::AsyncLoaderThreads, CurrentMetrics::AsyncLoaderThreadsActive, .max_threads = 1, .priority{1}}
+//     });
+//
+//     // Create and schedule a task consisting of three jobs. Job1 has no dependencies and is run first.
+//     // Job2 and job3 depend on job1 and are run only after job1 completion.
+//     auto job_func = [&] (const LoadJobPtr & self) {
+//         LOG_TRACE(log, "Executing load job '{}' in pool '{}'", self->name, async_loader->getPoolName(self->pool()));
+//     };
+//     auto job1 = makeLoadJob({}, "job1", /* pool_id = */ 1, job_func);
+//     auto job2 = makeLoadJob({ job1 }, "job2", /* pool_id = */ 1, job_func);
+//     auto job3 = makeLoadJob({ job1 }, "job3", /* pool_id = */ 1, job_func);
+//     auto task = makeLoadTask(async_loader, { job1, job2, job3 });
+//     task.schedule();
+//
+//     // Another thread may prioritize a job by changing its pool and wait for it:
+//     async_loader->prioritize(job3, /* pool_id = */ 0); // Increase priority: 1 -> 0 (lower is better)
+//     job3->wait(); // Blocks until job completion or cancellation and rethrow an exception (if any)
+//
+// Every job has a pool associated with it. AsyncLoader starts every job in its thread pool.
+// Each pool has a constant priority and a mutable maximum number of threads.
+// Higher priority (lower `pool.priority` value) jobs are run first.
+// No job with lower priority is started while there is at least one higher priority job ready or running.
+//
+// Job priority can be elevated (but cannot be lowered)
+// (a) if either it has a dependent job with higher priority:
+//     in this case the priority and the pool of a dependent job is inherited during `schedule()` call;
+// (b) or job was explicitly prioritized by `prioritize(job, higher_priority_pool)` call:
+//     this also leads to a priority inheritance for all the dependencies.
+// Value stored in load job `pool_id` field is atomic and can be changed even during job execution.
+// Job is, of course, not moved from its initial thread pool, but it should use `self->pool()` for
+// all new jobs it create to avoid priority inversion. To obtain pool in which job is being executed
+// call `self->execution_pool()` instead.
+//
+// === IMPLEMENTATION DETAILS ===
+// All possible states and statuses of a job:
+//                       .---------- scheduled ----------.
+//  ctor --> assigned --> blocked --> ready --> executing --> finished ------> removed --> dtor
+//  STATUS: '------------------ PENDING -----------------'   '-- OK|FAILED|CANCELED --'
+//
+// AsyncLoader tracks state of all scheduled and finished jobs. Job lifecycle is the following:
+// 1)  A job is constructed with PENDING status and assigned to a pool. The job is placed into a task.
+// 2)  The task is scheduled with all its jobs and their dependencies. A scheduled job may be ready, blocked (and later executing).
+// 3a) When all dependencies are successfully finished, the job became ready. A ready job is enqueued into the ready queue of its pool.
+// 3b) If at least one of the job dependencies is failed or canceled, then this job is canceled (with all it's dependent jobs as well).
+//     On cancellation an ASYNC_LOAD_CANCELED exception is generated and saved inside LoadJob object. The job status is changed to CANCELED.
+//     Exception is rethrown by any existing or new `wait()` call. The job is moved to the set of the finished jobs.
+// 4)  The ready job starts execution by a worker. The job is dequeued. Callback `job_func` is called.
+//     Status of an executing job is PENDING. Note that `job_func` of a CANCELED job is never executed.
+// 5a) On successful execution the job status is changed to OK and all existing and new `wait()` calls finish w/o exceptions.
+// 5b) Any exception thrown out of `job_func` is wrapped into an ASYNC_LOAD_FAILED exception and saved inside LoadJob.
+//     The job status is changed to FAILED. All the dependent jobs are canceled. The exception is rethrown from all existing and new `wait()` calls.
+// 6)  The job is no longer considered as scheduled and is instead moved to the finished jobs set. This is just for introspection of the finished jobs.
+// 7)  The task containing this job is destructed or `remove()` is explicitly called. The job is removed from the finished job set.
+// 8)  The job is destructed.
+class AsyncLoader : private boost::noncopyable
+{
+private:
+    // Thread pool for job execution.
+    // Pools control the following aspects of job execution:
+    // 1) Concurrency: Amount of concurrently executing jobs in a pool is `max_threads`.
+    // 2) Priority: As long as there is executing worker with higher priority, workers with lower priorities are not started
+    //    (although, they can finish last job started before higher priority jobs appeared)
+    struct Pool
+    {
+        const String name;
+        const Priority priority;
+        std::unique_ptr<ThreadPool> thread_pool; // NOTE: we avoid using a `ThreadPool` queue to be able to move jobs between pools.
+        std::map<UInt64, LoadJobPtr> ready_queue; // FIFO queue of jobs to be executed in this pool. Map is used for faster erasing. Key is `ready_seqno`
+        size_t max_threads; // Max number of workers to be spawn
+        size_t workers = 0; // Number of currently execution workers
+
+        bool isActive() const { return workers > 0 || !ready_queue.empty(); }
+    };
+
+    // Scheduling information for a pending job.
+    struct Info
+    {
+        size_t dependencies_left = 0; // Current number of dependencies on pending jobs.
+        UInt64 ready_seqno = 0; // Zero means that job is not in ready queue.
+        LoadJobSet dependent_jobs; // Set of jobs dependent on this job.
+
+        // Three independent states of a scheduled job.
+        bool isBlocked() const { return dependencies_left > 0; }
+        bool isReady() const { return dependencies_left == 0 && ready_seqno > 0; }
+        bool isExecuting() const { return dependencies_left == 0 && ready_seqno == 0; }
+    };
+
+public:
+    using Metric = CurrentMetrics::Metric;
+
+    // Helper struct for AsyncLoader construction
+    struct PoolInitializer
+    {
+        String name;
+        Metric metric_threads;
+        Metric metric_active_threads;
+        size_t max_threads;
+        Priority priority;
+    };
+
+    AsyncLoader(std::vector<PoolInitializer> pool_initializers, bool log_failures_, bool log_progress_);
+
+    // Stops AsyncLoader before destruction
+    // WARNING: all tasks instances should be destructed before associated AsyncLoader.
+    ~AsyncLoader();
+
+    // Start workers to execute scheduled load jobs. Note that AsyncLoader is constructed as already started.
+    void start();
+
+    // Wait for all load jobs to finish, including all new jobs. So at first take care to stop adding new jobs.
+    void wait();
+
+    // Wait for currently executing jobs to finish, but do not run any other pending jobs.
+    // Not finished jobs are left in pending state:
+    //  - they can be executed by calling start() again;
+    //  - or canceled using ~Task() or remove() later.
+    void stop();
+
+    // Schedule all jobs of given `task` and their dependencies (even if they are not in task).
+    // All dependencies of a scheduled job inherit its pool if it has higher priority. This way higher priority job
+    // never waits for (blocked by) lower priority jobs. No priority inversion is possible.
+    // Idempotent: multiple schedule() calls for the same job are no-op.
+    // Note that `task` destructor ensures that all its jobs are finished (OK, FAILED or CANCELED)
+    // and are removed from AsyncLoader, so it is thread-safe to destroy them.
+    void schedule(LoadTask & task);
+    void schedule(const LoadTaskPtr & task);
+
+    // Schedule all tasks atomically. To ensure only highest priority jobs among all tasks are run first.
+    void schedule(const LoadTaskPtrs & tasks);
+
+    // Increase priority of a job and all its dependencies recursively.
+    // Jobs from higher (than `new_pool`) priority pools are not changed.
+    void prioritize(const LoadJobPtr & job, size_t new_pool);
+
+    // Remove finished jobs, cancel scheduled jobs, wait for executing jobs to finish and remove them.
+    void remove(const LoadJobSet & jobs);
+
+    // Increase or decrease maximum number of simultaneously executing jobs in `pool`.
+    void setMaxThreads(size_t pool, size_t value);
+
+    size_t getMaxThreads(size_t pool) const;
+    const String & getPoolName(size_t pool) const;
+    Priority getPoolPriority(size_t pool) const;
+
+    size_t getScheduledJobCount() const;
+
+    // Helper class for introspection
+    struct JobState
+    {
+        LoadJobPtr job;
+        size_t dependencies_left = 0;
+        UInt64 ready_seqno = 0;
+        bool is_blocked = false;
+        bool is_ready = false;
+        bool is_executing = false;
+    };
+
+    // For introspection and debug only, see `system.async_loader` table
+    std::vector<JobState> getJobStates() const;
+
+private:
+    void checkCycle(const LoadJobSet & jobs, std::unique_lock<std::mutex> & lock);
+    String checkCycleImpl(const LoadJobPtr & job, LoadJobSet & left, LoadJobSet & visited, std::unique_lock<std::mutex> & lock);
+    void finish(const LoadJobPtr & job, LoadStatus status, std::exception_ptr exception_from_job, std::unique_lock<std::mutex> & lock);
+    void scheduleImpl(const LoadJobSet & input_jobs);
+    void gatherNotScheduled(const LoadJobPtr & job, LoadJobSet & jobs, std::unique_lock<std::mutex> & lock);
+    void prioritize(const LoadJobPtr & job, size_t new_pool_id, std::unique_lock<std::mutex> & lock);
+    void enqueue(Info & info, const LoadJobPtr & job, std::unique_lock<std::mutex> & lock);
+    bool canSpawnWorker(Pool & pool, std::unique_lock<std::mutex> &);
+    bool canWorkerLive(Pool & pool, std::unique_lock<std::mutex> &);
+    void updateCurrentPriorityAndSpawn(std::unique_lock<std::mutex> &);
+    void spawn(Pool & pool, std::unique_lock<std::mutex> &);
+    void worker(Pool & pool);
+
+    // Logging
+    const bool log_failures; // Worker should log all exceptions caught from job functions.
+    const bool log_progress; // Periodically log total progress
+    Poco::Logger * log;
+
+    mutable std::mutex mutex; // Guards all the fields below.
+    bool is_running = true;
+    std::optional<Priority> current_priority; // highest priority among active pools
+    UInt64 last_ready_seqno = 0; // Increasing counter for ready queue keys.
+    std::unordered_map<LoadJobPtr, Info> scheduled_jobs; // Full set of scheduled pending jobs along with scheduling info.
+    std::vector<Pool> pools; // Thread pools for job execution and ready queues
+    LoadJobSet finished_jobs; // Set of finished jobs (for introspection only, until jobs are removed).
+    AtomicStopwatch stopwatch; // For progress indication
+    size_t old_jobs = 0; // Number of jobs that were finished in previous busy period (for correct progress indication)
+    std::chrono::system_clock::time_point busy_period_start_time;
+};
+
+}
diff --git a/src/Common/AsyncTaskExecutor.cpp b/src/Common/AsyncTaskExecutor.cpp
new file mode 100644
index 00000000000..68af535b22a
--- /dev/null
+++ b/src/Common/AsyncTaskExecutor.cpp
@@ -0,0 +1,143 @@
+#include <Common/AsyncTaskExecutor.h>
+
+namespace DB
+{
+
+thread_local FiberInfo current_fiber_info;
+
+AsyncTaskExecutor::AsyncTaskExecutor(std::unique_ptr<AsyncTask> task_) : task(std::move(task_))
+{
+    createFiber();
+}
+
+FiberInfo AsyncTaskExecutor::getCurrentFiberInfo()
+{
+    return current_fiber_info;
+}
+
+void AsyncTaskExecutor::resume()
+{
+    if (routine_is_finished)
+        return;
+
+    if (!checkBeforeTaskResume())
+        return;
+
+    {
+        std::lock_guard guard(fiber_lock);
+        if (is_cancelled)
+            return;
+
+        resumeUnlocked();
+        if (exception)
+            processException(exception);
+    }
+
+    afterTaskResume();
+}
+
+void AsyncTaskExecutor::resumeUnlocked()
+{
+    auto parent_fiber_info = current_fiber_info;
+    current_fiber_info = FiberInfo{&fiber, &parent_fiber_info};
+    fiber = std::move(fiber).resume();
+    current_fiber_info = parent_fiber_info;
+}
+
+void AsyncTaskExecutor::cancel()
+{
+    std::lock_guard guard(fiber_lock);
+    is_cancelled = true;
+    cancelBefore();
+    destroyFiber();
+    cancelAfter();
+}
+
+void AsyncTaskExecutor::restart()
+{
+    std::lock_guard guard(fiber_lock);
+    if (fiber)
+        destroyFiber();
+    createFiber();
+    routine_is_finished = false;
+}
+
+struct AsyncTaskExecutor::Routine
+{
+    AsyncTaskExecutor & executor;
+
+    struct AsyncCallback
+    {
+        AsyncTaskExecutor & executor;
+        Fiber & fiber;
+
+        void operator()(int fd, Poco::Timespan timeout, AsyncEventTimeoutType type, const std::string & desc, uint32_t events)
+        {
+            executor.processAsyncEvent(fd, timeout, type, desc, events);
+            fiber = std::move(fiber).resume();
+            executor.clearAsyncEvent();
+        }
+    };
+
+    struct ResumeCallback
+    {
+        Fiber & fiber;
+
+        void operator()()
+        {
+            fiber = std::move(fiber).resume();
+        }
+    };
+
+    Fiber operator()(Fiber && sink)
+    {
+        auto async_callback = AsyncCallback{executor, sink};
+        auto suspend_callback = ResumeCallback{sink};
+        try
+        {
+            executor.task->run(async_callback, suspend_callback);
+        }
+        catch (const boost::context::detail::forced_unwind &)
+        {
+            /// This exception is thrown by fiber implementation in case if fiber is being deleted but hasn't exited
+            /// It should not be caught or it will segfault.
+            /// Other exceptions must be caught
+            throw;
+        }
+        catch (...)
+        {
+            executor.exception = std::current_exception();
+        }
+
+        executor.routine_is_finished = true;
+        return std::move(sink);
+    }
+};
+
+void AsyncTaskExecutor::createFiber()
+{
+    fiber = boost::context::fiber(std::allocator_arg_t(), fiber_stack, Routine{*this});
+}
+
+void AsyncTaskExecutor::destroyFiber()
+{
+    boost::context::fiber to_destroy = std::move(fiber);
+}
+
+String getSocketTimeoutExceededMessageByTimeoutType(AsyncEventTimeoutType type, Poco::Timespan timeout, const String & socket_description)
+{
+    switch (type)
+    {
+        case AsyncEventTimeoutType::CONNECT:
+            return fmt::format("Timeout exceeded while connecting to socket ({}, connection timeout {} ms)", socket_description, timeout.totalMilliseconds());
+        case AsyncEventTimeoutType::RECEIVE:
+            return fmt::format("Timeout exceeded while reading from socket ({}, receive timeout {} ms)", socket_description, timeout.totalMilliseconds());
+        case AsyncEventTimeoutType::SEND:
+            return fmt::format("Timeout exceeded while writing to socket ({}, send timeout {} ms)", socket_description, timeout.totalMilliseconds());
+        default:
+            return fmt::format("Timeout exceeded while working with socket ({}, {} ms)", socket_description, timeout.totalMilliseconds());
+    }
+}
+
+}
+
diff --git a/src/Common/AsyncTaskExecutor.h b/src/Common/AsyncTaskExecutor.h
new file mode 100644
index 00000000000..10a9556a88b
--- /dev/null
+++ b/src/Common/AsyncTaskExecutor.h
@@ -0,0 +1,171 @@
+#pragma once
+
+#include <Common/Epoll.h>
+#include <Common/Fiber.h>
+#include <Common/FiberStack.h>
+#include <Poco/Timespan.h>
+
+#if defined(OS_LINUX)
+#include <sys/epoll.h>
+#endif
+
+
+namespace DB
+{
+
+enum class AsyncEventTimeoutType
+{
+    CONNECT,
+    RECEIVE,
+    SEND,
+    NONE,
+};
+
+using AsyncCallback = std::function<void(int, Poco::Timespan, AsyncEventTimeoutType, const std::string &, uint32_t)>;
+using ResumeCallback = std::function<void()>;
+
+struct FiberInfo
+{
+    const Fiber * fiber = nullptr;
+    const FiberInfo * parent_fiber_info = nullptr;
+};
+
+/// Base class for a task that will be executed in a fiber.
+/// It has only one method - run, that takes 2 callbacks:
+/// 1) async_callback - callback that should be called when this task tries to perform
+///    some operation on a file descriptor (e.g. reading from socket) that can block this task execution.
+/// 2) suspend_callback - callback that can be called to suspend current fiber execution explicitly.
+struct AsyncTask
+{
+public:
+    virtual void run(AsyncCallback async_callback, ResumeCallback suspend_callback) = 0;
+    virtual ~AsyncTask() = default;
+};
+
+/// Base class for executing tasks inside a fiber.
+class AsyncTaskExecutor
+{
+public:
+    AsyncTaskExecutor(std::unique_ptr<AsyncTask> task_);
+
+    /// Resume task execution. This method returns when task is completed or suspended.
+    void resume();
+
+    /// Cancel task execution. Fiber will be destroyed even if task wasn't finished.
+    void cancel();
+
+    /// Restart task execution. Current fiber will be destroyed
+    /// and the new one will be created with the same task.
+    /// The next resume() call will start the new task from the beginning
+    void restart();
+
+    bool isCancelled() const { return is_cancelled; }
+
+    virtual ~AsyncTaskExecutor() = default;
+
+
+#if defined(OS_LINUX)
+    enum Event
+    {
+        READ = EPOLLIN,
+        WRITE = EPOLLOUT,
+        ERROR = EPOLLERR,
+    };
+#else
+    enum Event
+    {
+        READ = 1,
+        WRITE = 2,
+        ERROR = 4,
+    };
+#endif
+
+    static FiberInfo getCurrentFiberInfo();
+protected:
+    /// Method that is called in resume() before actual fiber resuming.
+    /// If it returns false, resume() will return immediately without actual fiber resuming.
+    virtual bool checkBeforeTaskResume() = 0;
+
+    /// Method that is called in resume() after fiber resuming (when it was finished or suspended).
+    virtual void afterTaskResume() = 0;
+
+    /// Method that is called on async event (when async callback is called) before fiber is suspended.
+    virtual void processAsyncEvent(int fd, Poco::Timespan timeout, AsyncEventTimeoutType timeout_type, const std::string & fd_description, uint32_t async_events) = 0;
+
+    /// Method that is called when task is resumed after it was suspended on async event.
+    virtual void clearAsyncEvent() = 0;
+
+    /// Process exception caught while task execution. It's called after fiber resume if exception happened.
+    virtual void processException(std::exception_ptr e) { std::rethrow_exception(e); }
+
+    /// Method that is called in cancel() before fiber destruction.
+    virtual void cancelBefore() { }
+    /// Method that is called in cancel() after fiber destruction.
+    virtual void cancelAfter() { }
+
+    /// Resume fiber explicitly without mutex locking.
+    /// Can be called in cancelBefore().
+    void resumeUnlocked();
+
+private:
+    struct Routine;
+
+    void createFiber();
+    void destroyFiber();
+
+    FiberStack fiber_stack;
+    Fiber fiber;
+    std::mutex fiber_lock;
+    std::exception_ptr exception;
+
+    std::atomic_bool routine_is_finished = false;
+    std::atomic_bool is_cancelled = false;
+
+    std::unique_ptr<AsyncTask> task;
+};
+
+/// Simple implementation for fiber local variable.
+template <typename T>
+struct FiberLocal
+{
+public:
+    FiberLocal()
+    {
+        /// Initialize main instance for this thread. Instances for fibers will inherit it,
+        /// (it's needed because main instance could be changed before creating fibers
+        /// and changes should be visible in fibers).
+        data[nullptr] = T();
+    }
+
+    T & operator*()
+    {
+        return get();
+    }
+
+    T * operator->()
+    {
+        return &get();
+    }
+
+private:
+    T & get()
+    {
+        return getInstanceForFiber(AsyncTaskExecutor::getCurrentFiberInfo());
+    }
+
+    T & getInstanceForFiber(FiberInfo info)
+    {
+        auto it = data.find(info.fiber);
+        /// If it's the first request, we need to initialize instance for the fiber
+        /// using instance from parent fiber or main thread that created fiber.
+        if (it == data.end())
+            it = data.insert({info.fiber, getInstanceForFiber(*info.parent_fiber_info)}).first;
+        return it->second;
+    }
+
+    std::unordered_map<const Fiber *, T> data;
+};
+
+String getSocketTimeoutExceededMessageByTimeoutType(AsyncEventTimeoutType type, Poco::Timespan timeout, const String & socket_description);
+
+}
diff --git a/src/Common/AsynchronousMetrics.cpp b/src/Common/AsynchronousMetrics.cpp
index 99073d79bcd..3753aaca405 100644
--- a/src/Common/AsynchronousMetrics.cpp
+++ b/src/Common/AsynchronousMetrics.cpp
@@ -3,6 +3,7 @@
 #include <Common/setThreadName.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/filesystemHelpers.h>
+#include <Common/logger_useful.h>
 #include <IO/UncompressedCache.h>
 #include <IO/MMappedFileCache.h>
 #include <IO/ReadHelpers.h>
@@ -66,8 +67,15 @@ AsynchronousMetrics::AsynchronousMetrics(
     openFileIfExists("/proc/uptime", uptime);
     openFileIfExists("/proc/net/dev", net_dev);
 
-    openFileIfExists("/sys/fs/cgroup/memory/memory.limit_in_bytes", cgroupmem_limit_in_bytes);
-    openFileIfExists("/sys/fs/cgroup/memory/memory.usage_in_bytes", cgroupmem_usage_in_bytes);
+    /// CGroups v2
+    openFileIfExists("/sys/fs/cgroup/memory.max", cgroupmem_limit_in_bytes);
+    openFileIfExists("/sys/fs/cgroup/memory.current", cgroupmem_usage_in_bytes);
+
+    /// CGroups v1
+    if (!cgroupmem_limit_in_bytes)
+        openFileIfExists("/sys/fs/cgroup/memory/memory.limit_in_bytes", cgroupmem_limit_in_bytes);
+    if (!cgroupmem_usage_in_bytes)
+        openFileIfExists("/sys/fs/cgroup/memory/memory.usage_in_bytes", cgroupmem_usage_in_bytes);
 
     openSensors();
     openBlockDevices();
@@ -682,6 +690,12 @@ void AsynchronousMetrics::update(TimePoint update_time)
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
+
+            /// A slight improvement for the rare case when ClickHouse is run inside LXC and LXCFS is used.
+            /// The LXCFS has an issue: sometimes it returns an error "Transport endpoint is not connected" on reading from the file inside `/proc`.
+            /// This error was correctly logged into ClickHouse's server log, but it was a source of annoyance to some users.
+            /// We additionally workaround this issue by reopening a file.
+            openFileIfExists("/proc/loadavg", loadavg);
         }
     }
 
@@ -699,6 +713,7 @@ void AsynchronousMetrics::update(TimePoint update_time)
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
+            openFileIfExists("/proc/uptime", uptime);
         }
     }
 
@@ -886,38 +901,31 @@ void AsynchronousMetrics::update(TimePoint update_time)
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
+            openFileIfExists("/proc/stat", proc_stat);
         }
     }
 
     if (cgroupmem_limit_in_bytes && cgroupmem_usage_in_bytes)
     {
-        try {
+        try
+        {
             cgroupmem_limit_in_bytes->rewind();
             cgroupmem_usage_in_bytes->rewind();
 
-            uint64_t cgroup_mem_limit_in_bytes = 0;
-            uint64_t cgroup_mem_usage_in_bytes = 0;
+            uint64_t limit = 0;
+            uint64_t usage = 0;
 
-            readText(cgroup_mem_limit_in_bytes, *cgroupmem_limit_in_bytes);
-            readText(cgroup_mem_usage_in_bytes, *cgroupmem_usage_in_bytes);
+            tryReadText(limit, *cgroupmem_limit_in_bytes);
+            tryReadText(usage, *cgroupmem_usage_in_bytes);
 
-            if (cgroup_mem_limit_in_bytes && cgroup_mem_usage_in_bytes)
-            {
-                new_values["CgroupMemoryTotal"] = { cgroup_mem_limit_in_bytes, "The total amount of memory in cgroup, in bytes." };
-                new_values["CgroupMemoryUsed"] = { cgroup_mem_usage_in_bytes, "The amount of memory used in cgroup, in bytes." };
-            }
-            else
-            {
-                LOG_DEBUG(log, "Cannot read statistics about the cgroup memory total and used. Total got '{}', Used got '{}'.",
-                    cgroup_mem_limit_in_bytes, cgroup_mem_usage_in_bytes);
-            }
+            new_values["CGroupMemoryTotal"] = { limit, "The total amount of memory in cgroup, in bytes. If stated zero, the limit is the same as OSMemoryTotal." };
+            new_values["CGroupMemoryUsed"] = { usage, "The amount of memory used in cgroup, in bytes." };
         }
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
         }
     }
-
     if (meminfo)
     {
         try
@@ -1006,6 +1014,7 @@ void AsynchronousMetrics::update(TimePoint update_time)
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
+            openFileIfExists("/proc/meminfo", meminfo);
         }
     }
 
@@ -1032,18 +1041,16 @@ void AsynchronousMetrics::update(TimePoint update_time)
                 // It doesn't read the EOL itself.
                 ++cpuinfo->position();
 
-                if (s.rfind("processor", 0) == 0)
+                static constexpr std::string_view PROCESSOR = "processor";
+                if (s.starts_with(PROCESSOR))
                 {
                     /// s390x example: processor 0: version = FF, identification = 039C88, machine = 3906
                     /// non s390x example: processor : 0
-                    if (auto colon = s.find_first_of(':'))
-                    {
-#ifdef __s390x__
-                        core_id = std::stoi(s.substr(10)); /// 10: length of "processor" plus 1
-#else
-                        core_id = std::stoi(s.substr(colon + 2));
-#endif
-                    }
+                    auto core_id_start = std::ssize(PROCESSOR);
+                    while (core_id_start < std::ssize(s) && !std::isdigit(s[core_id_start]))
+                        ++core_id_start;
+
+                    core_id = std::stoi(s.substr(core_id_start));
                 }
                 else if (s.rfind("cpu MHz", 0) == 0)
                 {
@@ -1058,6 +1065,7 @@ void AsynchronousMetrics::update(TimePoint update_time)
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
+            openFileIfExists("/proc/cpuinfo", cpuinfo);
         }
     }
 
@@ -1075,6 +1083,7 @@ void AsynchronousMetrics::update(TimePoint update_time)
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
+            openFileIfExists("/proc/sys/fs/file-nr", file_nr);
         }
     }
 
@@ -1307,6 +1316,7 @@ void AsynchronousMetrics::update(TimePoint update_time)
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
+            openFileIfExists("/proc/net/dev", net_dev);
         }
     }
 
diff --git a/src/Common/BinStringDecodeHelper.h b/src/Common/BinStringDecodeHelper.h
index 513a4196b6f..df3e014cfad 100644
--- a/src/Common/BinStringDecodeHelper.h
+++ b/src/Common/BinStringDecodeHelper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/hex.h>
+#include <base/hex.h>
 
 namespace DB
 {
diff --git a/src/Common/BitHelpers.h b/src/Common/BitHelpers.h
index 6356d5b81d5..79c612d47e4 100644
--- a/src/Common/BitHelpers.h
+++ b/src/Common/BitHelpers.h
@@ -101,22 +101,24 @@ inline size_t getTrailingZeroBits(T x)
 
 /** Returns a mask that has '1' for `bits` LSB set:
   * maskLowBits<UInt8>(3) => 00000111
+  * maskLowBits<Int8>(3) => 00000111
   */
 template <typename T>
 inline T maskLowBits(unsigned char bits)
 {
+    using UnsignedT = std::make_unsigned_t<T>;
     if (bits == 0)
     {
         return 0;
     }
 
-    T result = static_cast<T>(~T{0});
+    UnsignedT result = static_cast<UnsignedT>(~UnsignedT{0});
     if (bits < sizeof(T) * 8)
     {
-        result = static_cast<T>(result >> (sizeof(T) * 8 - bits));
+        result = static_cast<UnsignedT>(result >> (sizeof(UnsignedT) * 8 - bits));
     }
 
-    return result;
+    return static_cast<T>(result);
 }
 
 template <std::integral T>
diff --git a/src/Common/CacheBase.h b/src/Common/CacheBase.h
index 8145bdf95b5..84cbd5b5c6f 100644
--- a/src/Common/CacheBase.h
+++ b/src/Common/CacheBase.h
@@ -12,7 +12,6 @@
 #include <mutex>
 #include <unordered_map>
 
-#include <Common/logger_useful.h>
 #include <base/defines.h>
 
 
@@ -27,39 +26,55 @@ namespace ErrorCodes
 /// (default policy evicts entries which are not used for a long time).
 /// WeightFunction is a functor that takes Mapped as a parameter and returns "weight" (approximate size)
 /// of that value.
-/// Cache starts to evict entries when their total weight exceeds max_size.
+/// Cache starts to evict entries when their total weight exceeds max_size_in_bytes.
 /// Value weight should not change after insertion.
-template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
+template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = EqualWeightFunction<TMapped>>
 class CacheBase
 {
-public:
-    using Key = TKey;
-    using Mapped = TMapped;
-    using MappedPtr = std::shared_ptr<Mapped>;
+private:
+    using CachePolicy = ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
 
-    explicit CacheBase(size_t max_size, size_t max_elements_size = 0, String cache_policy_name = "", double size_ratio = 0.5)
+public:
+    using Key = typename CachePolicy::Key;
+    using Mapped = typename CachePolicy::Mapped;
+    using MappedPtr = typename CachePolicy::MappedPtr;
+    using KeyMapped = typename CachePolicy::KeyMapped;
+
+    /// Use this ctor if you don't care about the internal cache policy.
+    explicit CacheBase(size_t max_size_in_bytes, size_t max_count = 0, double size_ratio = 0.5)
+        : CacheBase("SLRU", max_size_in_bytes, max_count, size_ratio)
+    {
+    }
+
+    /// Use this ctor if you want the user to configure the cache policy via some setting. Supports only general-purpose policies LRU and SLRU.
+    explicit CacheBase(std::string_view cache_policy_name, size_t max_size_in_bytes, size_t max_count = 0, double size_ratio = 0.5)
     {
         auto on_weight_loss_function = [&](size_t weight_loss) { onRemoveOverflowWeightLoss(weight_loss); };
 
+        static constexpr std::string_view default_cache_policy = "SLRU";
+
         if (cache_policy_name.empty())
-            cache_policy_name = default_cache_policy_name;
+            cache_policy_name = default_cache_policy;
 
         if (cache_policy_name == "LRU")
         {
             using LRUPolicy = LRUCachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
-            cache_policy = std::make_unique<LRUPolicy>(max_size, max_elements_size, on_weight_loss_function);
+            cache_policy = std::make_unique<LRUPolicy>(max_size_in_bytes, max_count, on_weight_loss_function);
         }
         else if (cache_policy_name == "SLRU")
         {
             using SLRUPolicy = SLRUCachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
-            cache_policy = std::make_unique<SLRUPolicy>(max_size, max_elements_size, size_ratio, on_weight_loss_function);
+            cache_policy = std::make_unique<SLRUPolicy>(max_size_in_bytes, max_count, size_ratio, on_weight_loss_function);
         }
         else
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Undeclared cache policy name: {}", cache_policy_name);
-        }
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown cache policy name: {}", cache_policy_name);
     }
 
+    /// Use this ctor to provide an arbitrary cache policy.
+    explicit CacheBase(std::unique_ptr<ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>> cache_policy_)
+        : cache_policy(std::move(cache_policy_))
+    {}
+
     MappedPtr get(const Key & key)
     {
         std::lock_guard lock(mutex);
@@ -68,7 +83,17 @@ public:
             ++hits;
         else
             ++misses;
+        return res;
+    }
 
+    std::optional<KeyMapped> getWithKey(const Key & key)
+    {
+        std::lock_guard lock(mutex);
+        auto res = cache_policy->getWithKey(key, lock);
+        if (res.has_value())
+            ++hits;
+        else
+            ++misses;
         return res;
     }
 
@@ -147,6 +172,12 @@ public:
         out_misses = misses;
     }
 
+    std::vector<KeyMapped> dump() const
+    {
+        std::lock_guard lock(mutex);
+        return cache_policy->dump();
+    }
+
     void reset()
     {
         std::lock_guard lock(mutex);
@@ -175,9 +206,27 @@ public:
     }
 
     size_t maxSize() const
-        TSA_NO_THREAD_SAFETY_ANALYSIS // disabled because max_size of cache_policy is a constant parameter
     {
-        return cache_policy->maxSize();
+        std::lock_guard lock(mutex);
+        return cache_policy->maxSize(lock);
+    }
+
+    void setMaxCount(size_t max_count)
+    {
+        std::lock_guard lock(mutex);
+        cache_policy->setMaxCount(max_count, lock);
+    }
+
+    void setMaxSize(size_t max_size_in_bytes)
+    {
+        std::lock_guard lock(mutex);
+        cache_policy->setMaxSize(max_size_in_bytes, lock);
+    }
+
+    void setQuotaForUser(const String & user_name, size_t max_size_in_bytes, size_t max_entries)
+    {
+        std::lock_guard lock(mutex);
+        cache_policy->setQuotaForUser(user_name, max_size_in_bytes, max_entries, lock);
     }
 
     virtual ~CacheBase() = default;
@@ -186,12 +235,8 @@ protected:
     mutable std::mutex mutex;
 
 private:
-    using CachePolicy = ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
-
     std::unique_ptr<CachePolicy> cache_policy TSA_GUARDED_BY(mutex);
 
-    inline static const String default_cache_policy_name = "SLRU";
-
     std::atomic<size_t> hits{0};
     std::atomic<size_t> misses{0};
 
diff --git a/src/Common/ColumnsHashing.h b/src/Common/ColumnsHashing.h
index 50db3977519..5ac6ca15812 100644
--- a/src/Common/ColumnsHashing.h
+++ b/src/Common/ColumnsHashing.h
@@ -16,7 +16,6 @@
 #include <memory>
 #include <cassert>
 
-
 namespace DB
 {
 namespace ErrorCodes
@@ -29,26 +28,42 @@ namespace ColumnsHashing
 
 /// For the case when there is one numeric key.
 /// UInt8/16/32/64 for any type with corresponding bit width.
-template <typename Value, typename Mapped, typename FieldType, bool use_cache = true, bool need_offset = false>
+template <typename Value, typename Mapped, typename FieldType, bool use_cache = true, bool need_offset = false, bool nullable = false>
 struct HashMethodOneNumber
-    : public columns_hashing_impl::HashMethodBase<HashMethodOneNumber<Value, Mapped, FieldType, use_cache, need_offset>, Value, Mapped, use_cache, need_offset>
+    : public columns_hashing_impl::HashMethodBase<HashMethodOneNumber<Value, Mapped, FieldType, use_cache, need_offset, nullable>, Value, Mapped, use_cache, need_offset, nullable>
 {
-    using Self = HashMethodOneNumber<Value, Mapped, FieldType, use_cache, need_offset>;
-    using Base = columns_hashing_impl::HashMethodBase<Self, Value, Mapped, use_cache, need_offset>;
+    using Self = HashMethodOneNumber<Value, Mapped, FieldType, use_cache, need_offset, nullable>;
+    using Base = columns_hashing_impl::HashMethodBase<Self, Value, Mapped, use_cache, need_offset, nullable>;
 
     static constexpr bool has_cheap_key_calculation = true;
 
     const char * vec;
 
     /// If the keys of a fixed length then key_sizes contains their lengths, empty otherwise.
-    HashMethodOneNumber(const ColumnRawPtrs & key_columns, const Sizes & /*key_sizes*/, const HashMethodContextPtr &)
+    HashMethodOneNumber(const ColumnRawPtrs & key_columns, const Sizes & /*key_sizes*/, const HashMethodContextPtr &) : Base(key_columns[0])
     {
-        vec = key_columns[0]->getRawData().data();
+        if constexpr (nullable)
+        {
+            const auto * null_column = checkAndGetColumn<ColumnNullable>(key_columns[0]);
+            vec = null_column->getNestedColumnPtr()->getRawData().data();
+        }
+        else
+        {
+            vec = key_columns[0]->getRawData().data();
+        }
     }
 
-    explicit HashMethodOneNumber(const IColumn * column)
+    explicit HashMethodOneNumber(const IColumn * column) : Base(column)
     {
-        vec = column->getRawData().data();
+        if constexpr (nullable)
+        {
+            const auto * null_column = checkAndGetColumn<ColumnNullable>(column);
+            vec = null_column->getNestedColumnPtr()->getRawData().data();
+        }
+        else
+        {
+            vec = column->getRawData().data();
+        }
     }
 
     /// Creates context. Method is called once and result context is used in all threads.
@@ -73,22 +88,30 @@ struct HashMethodOneNumber
 
 
 /// For the case when there is one string key.
-template <typename Value, typename Mapped, bool place_string_to_arena = true, bool use_cache = true, bool need_offset = false>
+template <typename Value, typename Mapped, bool place_string_to_arena = true, bool use_cache = true, bool need_offset = false, bool nullable = false>
 struct HashMethodString
-    : public columns_hashing_impl::HashMethodBase<HashMethodString<Value, Mapped, place_string_to_arena, use_cache, need_offset>, Value, Mapped, use_cache, need_offset>
+    : public columns_hashing_impl::HashMethodBase<HashMethodString<Value, Mapped, place_string_to_arena, use_cache, need_offset, nullable>, Value, Mapped, use_cache, need_offset, nullable>
 {
-    using Self = HashMethodString<Value, Mapped, place_string_to_arena, use_cache, need_offset>;
-    using Base = columns_hashing_impl::HashMethodBase<Self, Value, Mapped, use_cache, need_offset>;
+    using Self = HashMethodString<Value, Mapped, place_string_to_arena, use_cache, need_offset, nullable>;
+    using Base = columns_hashing_impl::HashMethodBase<Self, Value, Mapped, use_cache, need_offset, nullable>;
 
     static constexpr bool has_cheap_key_calculation = false;
 
     const IColumn::Offset * offsets;
     const UInt8 * chars;
 
-    HashMethodString(const ColumnRawPtrs & key_columns, const Sizes & /*key_sizes*/, const HashMethodContextPtr &)
+    HashMethodString(const ColumnRawPtrs & key_columns, const Sizes & /*key_sizes*/, const HashMethodContextPtr &) : Base(key_columns[0])
     {
-        const IColumn & column = *key_columns[0];
-        const ColumnString & column_string = assert_cast<const ColumnString &>(column);
+        const IColumn * column;
+        if constexpr (nullable)
+        {
+            column = checkAndGetColumn<ColumnNullable>(key_columns[0])->getNestedColumnPtr().get();
+        }
+        else
+        {
+            column = key_columns[0];
+        }
+        const ColumnString & column_string = assert_cast<const ColumnString &>(*column);
         offsets = column_string.getOffsets().data();
         chars = column_string.getChars().data();
     }
@@ -108,28 +131,35 @@ struct HashMethodString
     }
 
 protected:
-    friend class columns_hashing_impl::HashMethodBase<Self, Value, Mapped, use_cache>;
+    friend class columns_hashing_impl::HashMethodBase<Self, Value, Mapped, use_cache, need_offset, nullable>;
 };
 
 
 /// For the case when there is one fixed-length string key.
-template <typename Value, typename Mapped, bool place_string_to_arena = true, bool use_cache = true, bool need_offset = false>
+template <typename Value, typename Mapped, bool place_string_to_arena = true, bool use_cache = true, bool need_offset = false, bool nullable = false>
 struct HashMethodFixedString
-    : public columns_hashing_impl::
-          HashMethodBase<HashMethodFixedString<Value, Mapped, place_string_to_arena, use_cache, need_offset>, Value, Mapped, use_cache, need_offset>
+    : public columns_hashing_impl::HashMethodBase<HashMethodFixedString<Value, Mapped, place_string_to_arena, use_cache, need_offset, nullable>, Value, Mapped, use_cache, need_offset, nullable>
 {
-    using Self = HashMethodFixedString<Value, Mapped, place_string_to_arena, use_cache, need_offset>;
-    using Base = columns_hashing_impl::HashMethodBase<Self, Value, Mapped, use_cache, need_offset>;
+    using Self = HashMethodFixedString<Value, Mapped, place_string_to_arena, use_cache, need_offset, nullable>;
+    using Base = columns_hashing_impl::HashMethodBase<Self, Value, Mapped, use_cache, need_offset, nullable>;
 
     static constexpr bool has_cheap_key_calculation = false;
 
     size_t n;
     const ColumnFixedString::Chars * chars;
 
-    HashMethodFixedString(const ColumnRawPtrs & key_columns, const Sizes & /*key_sizes*/, const HashMethodContextPtr &)
+    HashMethodFixedString(const ColumnRawPtrs & key_columns, const Sizes & /*key_sizes*/, const HashMethodContextPtr &) : Base(key_columns[0])
     {
-        const IColumn & column = *key_columns[0];
-        const ColumnFixedString & column_string = assert_cast<const ColumnFixedString &>(column);
+        const IColumn * column;
+        if constexpr (nullable)
+        {
+            column = checkAndGetColumn<ColumnNullable>(key_columns[0])->getNestedColumnPtr().get();
+        }
+        else
+        {
+            column = key_columns[0];
+        }
+        const ColumnFixedString & column_string = assert_cast<const ColumnFixedString &>(*column);
         n = column_string.getN();
         chars = &column_string.getChars();
     }
@@ -149,7 +179,7 @@ struct HashMethodFixedString
     }
 
 protected:
-    friend class columns_hashing_impl::HashMethodBase<Self, Value, Mapped, use_cache>;
+    friend class columns_hashing_impl::HashMethodBase<Self, Value, Mapped, use_cache, need_offset, nullable>;
 };
 
 
diff --git a/src/Common/ColumnsHashingImpl.h b/src/Common/ColumnsHashingImpl.h
index 03e7b0436e9..3240510ea9b 100644
--- a/src/Common/ColumnsHashingImpl.h
+++ b/src/Common/ColumnsHashingImpl.h
@@ -6,7 +6,6 @@
 #include <Common/HashTable/HashTableKeyHolder.h>
 #include <Interpreters/AggregationCommon.h>
 
-
 namespace DB
 {
 namespace ErrorCodes
@@ -140,7 +139,7 @@ public:
     FindResultImpl(bool found_, size_t off) : FindResultImplBase(found_), FindResultImplOffsetBase<need_offset>(off) {}
 };
 
-template <typename Derived, typename Value, typename Mapped, bool consecutive_keys_optimization, bool need_offset = false>
+template <typename Derived, typename Value, typename Mapped, bool consecutive_keys_optimization, bool need_offset = false, bool nullable = false>
 class HashMethodBase
 {
 public:
@@ -154,6 +153,19 @@ public:
     template <typename Data>
     ALWAYS_INLINE EmplaceResult emplaceKey(Data & data, size_t row, Arena & pool)
     {
+        if constexpr (nullable)
+        {
+            if (isNullAt(row))
+            {
+                bool has_null_key = data.hasNullKeyData();
+                data.hasNullKeyData() = true;
+
+                if constexpr (has_mapped)
+                    return EmplaceResult(data.getNullKeyData(), data.getNullKeyData(), !has_null_key);
+                else
+                    return EmplaceResult(!has_null_key);
+            }
+        }
         auto key_holder = static_cast<Derived &>(*this).getKeyHolder(row, pool);
         return emplaceImpl(key_holder, data);
     }
@@ -161,6 +173,16 @@ public:
     template <typename Data>
     ALWAYS_INLINE FindResult findKey(Data & data, size_t row, Arena & pool)
     {
+        if constexpr (nullable)
+        {
+            if (isNullAt(row))
+            {
+                if constexpr (has_mapped)
+                    return FindResult(&data.getNullKeyData(), data.hasNullKeyData(), 0);
+                else
+                    return FindResult(data.hasNullKeyData(), 0);
+            }
+        }
         auto key_holder = static_cast<Derived &>(*this).getKeyHolder(row, pool);
         return findKeyImpl(keyHolderGetKey(key_holder), data);
     }
@@ -172,10 +194,25 @@ public:
         return data.hash(keyHolderGetKey(key_holder));
     }
 
+    ALWAYS_INLINE bool isNullAt(size_t row) const
+    {
+        if constexpr (nullable)
+        {
+            return null_map->getBool(row);
+        }
+        else
+        {
+            return false;
+        }
+    }
+
 protected:
     Cache cache;
+    const IColumn * null_map = nullptr;
+    bool has_null_data = false;
 
-    HashMethodBase()
+    /// column argument only for nullable column
+    explicit HashMethodBase(const IColumn * column = nullptr)
     {
         if constexpr (consecutive_keys_optimization)
         {
@@ -188,6 +225,11 @@ protected:
             else
                 cache.value = Value();
         }
+        if constexpr (nullable)
+        {
+
+            null_map = &checkAndGetColumn<ColumnNullable>(column)->getNullMapColumn();
+        }
     }
 
     template <typename Data, typename KeyHolder>
@@ -293,7 +335,6 @@ protected:
     }
 };
 
-
 template <typename T>
 struct MappedCache : public PaddedPODArray<T> {};
 
diff --git a/src/Common/Concepts.h b/src/Common/Concepts.h
index b1bf591024d..927f42aa4be 100644
--- a/src/Common/Concepts.h
+++ b/src/Common/Concepts.h
@@ -5,6 +5,10 @@
 namespace DB
 {
 
+template<typename T, typename ... U>
+concept is_any_of = (std::same_as<T, U> || ...);
+
+
 template <typename... T>
 concept OptionalArgument = requires(T &&...)
 {
diff --git a/src/Common/ConcurrencyControl.cpp b/src/Common/ConcurrencyControl.cpp
new file mode 100644
index 00000000000..de46f0e90ca
--- /dev/null
+++ b/src/Common/ConcurrencyControl.cpp
@@ -0,0 +1,173 @@
+#include <Common/ConcurrencyControl.h>
+#include <Common/Exception.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+ConcurrencyControl::Slot::~Slot()
+{
+    allocation->release();
+}
+
+ConcurrencyControl::Slot::Slot(AllocationPtr && allocation_)
+    : allocation(std::move(allocation_))
+{
+}
+
+ConcurrencyControl::Allocation::~Allocation()
+{
+    // We have to lock parent's mutex to avoid race with grant()
+    // NOTE: shortcut can be added, but it requires Allocation::mutex lock even to check if shortcut is possible
+    parent.free(this);
+}
+
+[[nodiscard]] ConcurrencyControl::SlotPtr ConcurrencyControl::Allocation::tryAcquire()
+{
+    SlotCount value = granted.load();
+    while (value)
+    {
+        if (granted.compare_exchange_strong(value, value - 1))
+        {
+            std::unique_lock lock{mutex};
+            return SlotPtr(new Slot(shared_from_this())); // can't use std::make_shared due to private ctor
+        }
+    }
+    return {}; // avoid unnecessary locking
+}
+
+ConcurrencyControl::SlotCount ConcurrencyControl::Allocation::grantedCount() const
+{
+    return granted;
+}
+
+ConcurrencyControl::Allocation::Allocation(ConcurrencyControl & parent_, SlotCount limit_, SlotCount granted_, Waiters::iterator waiter_)
+    : parent(parent_)
+    , limit(limit_)
+    , allocated(granted_)
+    , granted(granted_)
+    , waiter(waiter_)
+{
+    if (allocated < limit)
+        *waiter = this;
+}
+
+// Grant single slot to allocation, returns true iff more slot(s) are required
+bool ConcurrencyControl::Allocation::grant()
+{
+    std::unique_lock lock{mutex};
+    granted++;
+    allocated++;
+    return allocated < limit;
+}
+
+// Release one slot and grant it to other allocation if required
+void ConcurrencyControl::Allocation::release()
+{
+    parent.release(1);
+    std::unique_lock lock{mutex};
+    released++;
+    if (released > allocated)
+        abort();
+}
+
+ConcurrencyControl::ConcurrencyControl()
+    : cur_waiter(waiters.end())
+{
+}
+
+ConcurrencyControl::~ConcurrencyControl()
+{
+    if (!waiters.empty())
+        abort();
+}
+
+[[nodiscard]] ConcurrencyControl::AllocationPtr ConcurrencyControl::allocate(SlotCount min, SlotCount max)
+{
+    if (min > max)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "ConcurrencyControl: invalid allocation requirements");
+
+    std::unique_lock lock{mutex};
+
+    // Acquire as many slots as we can, but not lower than `min`
+    SlotCount granted = std::max(min, std::min(max, available(lock)));
+    cur_concurrency += granted;
+
+    // Create allocation and start waiting if more slots are required
+    if (granted < max)
+        return AllocationPtr(new Allocation(*this, max, granted,
+            waiters.insert(cur_waiter, nullptr /* pointer is set by Allocation ctor */)));
+    else
+        return AllocationPtr(new Allocation(*this, max, granted));
+}
+
+void ConcurrencyControl::setMaxConcurrency(ConcurrencyControl::SlotCount value)
+{
+    std::unique_lock lock{mutex};
+    max_concurrency = std::max<SlotCount>(1, value); // never allow max_concurrency to be zero
+    schedule(lock);
+}
+
+ConcurrencyControl & ConcurrencyControl::instance()
+{
+    static ConcurrencyControl result;
+    return result;
+}
+
+void ConcurrencyControl::free(Allocation * allocation)
+{
+    // Allocation is allowed to be canceled even if there are:
+    //  - `amount`: granted slots (acquired slots are not possible, because Slot holds AllocationPtr)
+    //  - `waiter`: active waiting for more slots to be allocated
+    // Thus Allocation destruction may require the following lock, to avoid race conditions
+    std::unique_lock lock{mutex};
+    auto [amount, waiter] = allocation->cancel();
+
+    cur_concurrency -= amount;
+    if (waiter)
+    {
+        if (cur_waiter == *waiter)
+            cur_waiter = waiters.erase(*waiter);
+        else
+            waiters.erase(*waiter);
+    }
+    schedule(lock);
+}
+
+void ConcurrencyControl::release(SlotCount amount)
+{
+    std::unique_lock lock{mutex};
+    cur_concurrency -= amount;
+    schedule(lock);
+}
+
+// Round-robin scheduling of available slots among waiting allocations
+void ConcurrencyControl::schedule(std::unique_lock<std::mutex> &)
+{
+    while (cur_concurrency < max_concurrency && !waiters.empty())
+    {
+        cur_concurrency++;
+        if (cur_waiter == waiters.end())
+            cur_waiter = waiters.begin();
+        Allocation * allocation = *cur_waiter;
+        if (allocation->grant())
+            ++cur_waiter;
+        else
+            cur_waiter = waiters.erase(cur_waiter); // last required slot has just been granted -- stop waiting
+    }
+}
+
+ConcurrencyControl::SlotCount ConcurrencyControl::available(std::unique_lock<std::mutex> &) const
+{
+    if (cur_concurrency < max_concurrency)
+        return max_concurrency - cur_concurrency;
+    else
+        return 0;
+}
+
+}
diff --git a/src/Common/ConcurrencyControl.h b/src/Common/ConcurrencyControl.h
index 14e54363e04..ba87e3b3a0c 100644
--- a/src/Common/ConcurrencyControl.h
+++ b/src/Common/ConcurrencyControl.h
@@ -5,17 +5,10 @@
 #include <mutex>
 #include <memory>
 #include <list>
-#include <condition_variable>
 
-#include <Common/Exception.h>
 
 namespace DB
 {
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-}
 
 /*
  * Controls how many threads can be allocated for a query (or another activity).
@@ -53,17 +46,12 @@ public:
     // Scoped guard for acquired slot, see Allocation::tryAcquire()
     struct Slot : boost::noncopyable
     {
-        ~Slot()
-        {
-            allocation->release();
-        }
+        ~Slot();
 
     private:
         friend struct Allocation; // for ctor
 
-        explicit Slot(AllocationPtr && allocation_)
-            : allocation(std::move(allocation_))
-        {}
+        explicit Slot(AllocationPtr && allocation_);
 
         AllocationPtr allocation;
     };
@@ -74,47 +62,18 @@ public:
     // Manages group of slots for a single query, see ConcurrencyControl::allocate(min, max)
     struct Allocation : std::enable_shared_from_this<Allocation>, boost::noncopyable
     {
-        ~Allocation()
-        {
-            // We have to lock parent's mutex to avoid race with grant()
-            // NOTE: shortcut can be added, but it requires Allocation::mutex lock even to check if shortcut is possible
-            parent.free(this);
-        }
+        ~Allocation();
 
         // Take one already granted slot if available. Lock-free iff there is no granted slot.
-        [[nodiscard]] SlotPtr tryAcquire()
-        {
-            SlotCount value = granted.load();
-            while (value)
-            {
-                if (granted.compare_exchange_strong(value, value - 1))
-                {
-                    std::unique_lock lock{mutex};
-                    return SlotPtr(new Slot(shared_from_this())); // can't use std::make_shared due to private ctor
-                }
-            }
-            return {}; // avoid unnecessary locking
-        }
+        [[nodiscard]] SlotPtr tryAcquire();
 
-        SlotCount grantedCount() const
-        {
-            return granted;
-        }
+        SlotCount grantedCount() const;
 
     private:
         friend struct Slot; // for release()
         friend class ConcurrencyControl; // for grant(), free() and ctor
 
-        Allocation(ConcurrencyControl & parent_, SlotCount limit_, SlotCount granted_, Waiters::iterator waiter_ = {})
-            : parent(parent_)
-            , limit(limit_)
-            , allocated(granted_)
-            , granted(granted_)
-            , waiter(waiter_)
-        {
-            if (allocated < limit)
-                *waiter = this;
-        }
+        Allocation(ConcurrencyControl & parent_, SlotCount limit_, SlotCount granted_, Waiters::iterator waiter_ = {});
 
         auto cancel()
         {
@@ -126,23 +85,10 @@ public:
         }
 
         // Grant single slot to allocation, returns true iff more slot(s) are required
-        bool grant()
-        {
-            std::unique_lock lock{mutex};
-            granted++;
-            allocated++;
-            return allocated < limit;
-        }
+        bool grant();
 
         // Release one slot and grant it to other allocation if required
-        void release()
-        {
-            parent.release(1);
-            std::unique_lock lock{mutex};
-            released++;
-            if (released > allocated)
-                abort();
-        }
+        void release();
 
         ConcurrencyControl & parent;
         const SlotCount limit;
@@ -157,106 +103,32 @@ public:
     };
 
 public:
-    ConcurrencyControl()
-        : cur_waiter(waiters.end())
-    {}
+    ConcurrencyControl();
 
     // WARNING: all Allocation objects MUST be destructed before ConcurrencyControl
     // NOTE: Recommended way to achieve this is to use `instance()` and do graceful shutdown of queries
-    ~ConcurrencyControl()
-    {
-        if (!waiters.empty())
-            abort();
-    }
+    ~ConcurrencyControl();
 
     // Allocate at least `min` and at most `max` slots.
     // If not all `max` slots were successfully allocated, a subscription for later allocation is created
     // Use `Allocation::tryAcquire()` to acquire allocated slot, before running a thread.
-    [[nodiscard]] AllocationPtr allocate(SlotCount min, SlotCount max)
-    {
-        if (min > max)
-            throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "ConcurrencyControl: invalid allocation requirements");
+    [[nodiscard]] AllocationPtr allocate(SlotCount min, SlotCount max);
 
-        std::unique_lock lock{mutex};
+    void setMaxConcurrency(SlotCount value);
 
-        // Acquire as much slots as we can, but not lower than `min`
-        SlotCount granted = std::max(min, std::min(max, available(lock)));
-        cur_concurrency += granted;
-
-        // Create allocation and start waiting if more slots are required
-        if (granted < max)
-            return AllocationPtr(new Allocation(*this, max, granted,
-                waiters.insert(cur_waiter, nullptr /* pointer is set by Allocation ctor */)));
-        else
-            return AllocationPtr(new Allocation(*this, max, granted));
-    }
-
-    void setMaxConcurrency(SlotCount value)
-    {
-        std::unique_lock lock{mutex};
-        max_concurrency = std::max<SlotCount>(1, value); // never allow max_concurrency to be zero
-        schedule(lock);
-    }
-
-    static ConcurrencyControl & instance()
-    {
-        static ConcurrencyControl result;
-        return result;
-    }
+    static ConcurrencyControl & instance();
 
 private:
     friend struct Allocation; // for free() and release()
 
-    void free(Allocation * allocation)
-    {
-        // Allocation is allowed to be canceled even if there are:
-        //  - `amount`: granted slots (acquired slots are not possible, because Slot holds AllocationPtr)
-        //  - `waiter`: active waiting for more slots to be allocated
-        // Thus Allocation destruction may require the following lock, to avoid race conditions
-        std::unique_lock lock{mutex};
-        auto [amount, waiter] = allocation->cancel();
+    void free(Allocation * allocation);
 
-        cur_concurrency -= amount;
-        if (waiter)
-        {
-            if (cur_waiter == *waiter)
-                cur_waiter = waiters.erase(*waiter);
-            else
-                waiters.erase(*waiter);
-        }
-        schedule(lock);
-    }
-
-    void release(SlotCount amount)
-    {
-        std::unique_lock lock{mutex};
-        cur_concurrency -= amount;
-        schedule(lock);
-    }
+    void release(SlotCount amount);
 
     // Round-robin scheduling of available slots among waiting allocations
-    void schedule(std::unique_lock<std::mutex> &)
-    {
-        while (cur_concurrency < max_concurrency && !waiters.empty())
-        {
-            cur_concurrency++;
-            if (cur_waiter == waiters.end())
-                cur_waiter = waiters.begin();
-            Allocation * allocation = *cur_waiter;
-            if (allocation->grant())
-                ++cur_waiter;
-            else
-                cur_waiter = waiters.erase(cur_waiter); // last required slot has just been granted -- stop waiting
-        }
-    }
+    void schedule(std::unique_lock<std::mutex> &);
 
-    SlotCount available(std::unique_lock<std::mutex> &) const
-    {
-        if (cur_concurrency < max_concurrency)
-            return max_concurrency - cur_concurrency;
-        else
-            return 0;
-    }
+    SlotCount available(std::unique_lock<std::mutex> &) const;
 
     std::mutex mutex;
     Waiters waiters;
@@ -264,3 +136,5 @@ private:
     SlotCount max_concurrency = Unlimited;
     SlotCount cur_concurrency = 0;
 };
+
+}
diff --git a/src/Common/ConcurrentBoundedQueue.h b/src/Common/ConcurrentBoundedQueue.h
index d3abf86c817..01910c4caff 100644
--- a/src/Common/ConcurrentBoundedQueue.h
+++ b/src/Common/ConcurrentBoundedQueue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <queue>
+#include <deque>
 #include <type_traits>
 #include <atomic>
 #include <condition_variable>
@@ -18,7 +18,8 @@ template <typename T>
 class ConcurrentBoundedQueue
 {
 private:
-    std::queue<T> queue;
+    using Container = std::deque<T>;
+    Container queue;
 
     mutable std::mutex queue_mutex;
     std::condition_variable push_condition;
@@ -28,7 +29,7 @@ private:
 
     size_t max_fill = 0;
 
-    template <typename ... Args>
+    template <bool back, typename ... Args>
     bool emplaceImpl(std::optional<UInt64> timeout_milliseconds, Args &&...args)
     {
         {
@@ -51,13 +52,17 @@ private:
             if (is_finished)
                 return false;
 
-            queue.emplace(std::forward<Args>(args)...);
+            if constexpr (back)
+                queue.emplace_back(std::forward<Args>(args)...);
+            else
+                queue.emplace_front(std::forward<Args>(args)...);
         }
 
         pop_condition.notify_one();
         return true;
     }
 
+    template <bool front>
     bool popImpl(T & x, std::optional<UInt64> timeout_milliseconds)
     {
         {
@@ -80,8 +85,16 @@ private:
             if (is_finished && queue.empty())
                 return false;
 
-            detail::moveOrCopyIfThrow(std::move(queue.front()), x);
-            queue.pop();
+            if constexpr (front)
+            {
+                detail::moveOrCopyIfThrow(std::move(queue.front()), x);
+                queue.pop_front();
+            }
+            else
+            {
+                detail::moveOrCopyIfThrow(std::move(queue.back()), x);
+                queue.pop_back();
+            }
         }
 
         push_condition.notify_one();
@@ -94,6 +107,12 @@ public:
         : max_fill(max_fill_)
     {}
 
+    /// Returns false if queue is finished
+    [[nodiscard]] bool pushFront(const T & x)
+    {
+        return emplaceImpl</* back= */ false>(/* timeout_milliseconds= */ std::nullopt , x);
+    }
+
     /// Returns false if queue is finished
     [[nodiscard]] bool push(const T & x)
     {
@@ -109,37 +128,37 @@ public:
     template <typename... Args>
     [[nodiscard]] bool emplace(Args &&... args)
     {
-        return emplaceImpl(std::nullopt /* timeout in milliseconds */, std::forward<Args...>(args...));
-    }
-
-    /// Returns false if queue is finished and empty
-    [[nodiscard]] bool pop(T & x)
-    {
-        return popImpl(x, std::nullopt /*timeout in milliseconds*/);
+        return emplaceImpl</* back= */ true>(std::nullopt /* timeout in milliseconds */, std::forward<Args>(args)...);
     }
 
     /// Returns false if queue is finished or object was not pushed during timeout
     [[nodiscard]] bool tryPush(const T & x, UInt64 milliseconds = 0)
     {
-        return emplaceImpl(milliseconds, x);
+        return emplaceImpl</* back= */ true>(milliseconds, x);
     }
 
     [[nodiscard]] bool tryPush(T && x, UInt64 milliseconds = 0)
     {
-        return emplaceImpl(milliseconds, std::move(x));
+        return emplaceImpl</* back= */ true>(milliseconds, std::move(x));
     }
 
     /// Returns false if queue is finished or object was not emplaced during timeout
     template <typename... Args>
     [[nodiscard]] bool tryEmplace(UInt64 milliseconds, Args &&... args)
     {
-        return emplaceImpl(milliseconds, std::forward<Args...>(args...));
+        return emplaceImpl</* back= */ true>(milliseconds, std::forward<Args>(args)...);
+    }
+
+    /// Returns false if queue is finished and empty
+    [[nodiscard]] bool pop(T & x)
+    {
+        return popImpl</* front= */ true>(x, std::nullopt /*timeout in milliseconds*/);
     }
 
     /// Returns false if queue is (finished and empty) or (object was not popped during timeout)
     [[nodiscard]] bool tryPop(T & x, UInt64 milliseconds)
     {
-        return popImpl(x, milliseconds);
+        return popImpl</* front= */ true>(x, milliseconds);
     }
 
     /// Returns false if queue is empty.
@@ -153,7 +172,7 @@ public:
                 return false;
 
             detail::moveOrCopyIfThrow(std::move(queue.front()), x);
-            queue.pop();
+            queue.pop_front();
         }
 
         push_condition.notify_one();
@@ -222,7 +241,7 @@ public:
             if (is_finished)
                 return;
 
-            std::queue<T> empty_queue;
+            Container empty_queue;
             queue.swap(empty_queue);
         }
 
@@ -235,7 +254,7 @@ public:
         {
             std::lock_guard lock(queue_mutex);
 
-            std::queue<T> empty_queue;
+            Container empty_queue;
             queue.swap(empty_queue);
             is_finished = true;
         }
diff --git a/src/Common/Config/ConfigProcessor.cpp b/src/Common/Config/ConfigProcessor.cpp
index b632ea95928..5bbc8eae0de 100644
--- a/src/Common/Config/ConfigProcessor.cpp
+++ b/src/Common/Config/ConfigProcessor.cpp
@@ -21,6 +21,7 @@
 #include <Common/Exception.h>
 #include <Common/getResource.h>
 #include <Common/XMLUtils.h>
+#include <Common/logger_useful.h>
 #include <base/errnoToString.h>
 #include <base/sort.h>
 #include <IO/WriteBufferFromString.h>
diff --git a/src/Common/Config/ConfigProcessor.h b/src/Common/Config/ConfigProcessor.h
index aa8ac71446f..0ca3e46db88 100644
--- a/src/Common/Config/ConfigProcessor.h
+++ b/src/Common/Config/ConfigProcessor.h
@@ -16,9 +16,10 @@
 #include <Poco/DirectoryIterator.h>
 #include <Poco/ConsoleChannel.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Common/logger_useful.h>
 
 
+namespace Poco { class Logger; }
+
 namespace zkutil
 {
     class ZooKeeperNodeCache;
diff --git a/src/Common/Config/YAMLParser.h b/src/Common/Config/YAMLParser.h
index b986fc2d895..a00972b813c 100644
--- a/src/Common/Config/YAMLParser.h
+++ b/src/Common/Config/YAMLParser.h
@@ -2,11 +2,11 @@
 
 #include "config.h"
 
-#include <string>
-
+#include <Common/ErrorCodes.h>
+#include <Common/Exception.h>
+#include <base/types.h>
 #include <Poco/DOM/Document.h>
-#include "Poco/DOM/AutoPtr.h"
-#include <Common/logger_useful.h>
+#include <Poco/DOM/AutoPtr.h>
 
 #if USE_YAML_CPP
 
diff --git a/src/Common/Config/configReadClient.cpp b/src/Common/Config/configReadClient.cpp
index e5308bc3bc7..44d338c07af 100644
--- a/src/Common/Config/configReadClient.cpp
+++ b/src/Common/Config/configReadClient.cpp
@@ -4,6 +4,7 @@
 #include "ConfigProcessor.h"
 #include <filesystem>
 #include <iostream>
+#include <base/types.h>
 
 namespace fs = std::filesystem;
 
diff --git a/src/Common/CurrentMemoryTracker.cpp b/src/Common/CurrentMemoryTracker.cpp
index 720df07efb9..78a6c65f43c 100644
--- a/src/Common/CurrentMemoryTracker.cpp
+++ b/src/Common/CurrentMemoryTracker.cpp
@@ -118,3 +118,9 @@ void CurrentMemoryTracker::free(Int64 size)
     }
 }
 
+void CurrentMemoryTracker::injectFault()
+{
+    if (auto * memory_tracker = getMemoryTracker())
+        memory_tracker->injectFault();
+}
+
diff --git a/src/Common/CurrentMemoryTracker.h b/src/Common/CurrentMemoryTracker.h
index e125e4cbe4a..2721d89d564 100644
--- a/src/Common/CurrentMemoryTracker.h
+++ b/src/Common/CurrentMemoryTracker.h
@@ -14,6 +14,9 @@ struct CurrentMemoryTracker
     static void free(Int64 size);
     static void check();
 
+    /// Throws MEMORY_LIMIT_EXCEEDED (if it's allowed to throw exceptions)
+    static void injectFault();
+
 private:
     static void allocImpl(Int64 size, bool throw_if_memory_exceeded);
 };
diff --git a/src/Common/CurrentMetrics.cpp b/src/Common/CurrentMetrics.cpp
index 0395f2470af..82d68ca8185 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -11,13 +11,21 @@
     M(ReplicatedSend, "Number of data parts being sent to replicas") \
     M(ReplicatedChecks, "Number of data parts checking for consistency") \
     M(BackgroundMergesAndMutationsPoolTask, "Number of active merges and mutations in an associated background pool") \
+    M(BackgroundMergesAndMutationsPoolSize, "Limit on number of active merges and mutations in an associated background pool") \
     M(BackgroundFetchesPoolTask, "Number of active fetches in an associated background pool") \
+    M(BackgroundFetchesPoolSize, "Limit on number of simultaneous fetches in an associated background pool") \
     M(BackgroundCommonPoolTask, "Number of active tasks in an associated background pool") \
+    M(BackgroundCommonPoolSize, "Limit on number of tasks in an associated background pool") \
     M(BackgroundMovePoolTask, "Number of active tasks in BackgroundProcessingPool for moves") \
+    M(BackgroundMovePoolSize, "Limit on number of tasks in BackgroundProcessingPool for moves") \
     M(BackgroundSchedulePoolTask, "Number of active tasks in BackgroundSchedulePool. This pool is used for periodic ReplicatedMergeTree tasks, like cleaning old data parts, altering data parts, replica re-initialization, etc.") \
+    M(BackgroundSchedulePoolSize, "Limit on number of tasks in BackgroundSchedulePool. This pool is used for periodic ReplicatedMergeTree tasks, like cleaning old data parts, altering data parts, replica re-initialization, etc.") \
     M(BackgroundBufferFlushSchedulePoolTask, "Number of active tasks in BackgroundBufferFlushSchedulePool. This pool is used for periodic Buffer flushes") \
+    M(BackgroundBufferFlushSchedulePoolSize, "Limit on number of tasks in BackgroundBufferFlushSchedulePool") \
     M(BackgroundDistributedSchedulePoolTask, "Number of active tasks in BackgroundDistributedSchedulePool. This pool is used for distributed sends that is done in background.") \
+    M(BackgroundDistributedSchedulePoolSize, "Limit on number of tasks in BackgroundDistributedSchedulePool") \
     M(BackgroundMessageBrokerSchedulePoolTask, "Number of active tasks in BackgroundProcessingPool for message streaming") \
+    M(BackgroundMessageBrokerSchedulePoolSize, "Limit on number of tasks in BackgroundProcessingPool for message streaming") \
     M(CacheDictionaryUpdateQueueBatches, "Number of 'batches' (a set of keys) in update queue in CacheDictionaries.") \
     M(CacheDictionaryUpdateQueueKeys, "Exact number of keys in update queue in CacheDictionaries.") \
     M(DiskSpaceReservedForMerge, "Disk space reserved for currently running background merges. It is slightly more than the total size of currently merging parts.") \
@@ -45,6 +53,7 @@
     M(QueryThread, "Number of query processing threads") \
     M(ReadonlyReplica, "Number of Replicated tables that are currently in readonly state due to re-initialization after ZooKeeper session loss or due to startup without ZooKeeper configured.") \
     M(MemoryTracking, "Total amount of memory (bytes) allocated by the server.") \
+    M(MergesMutationsMemoryTracking, "Total amount of memory (bytes) allocated by background tasks (merges and mutations).") \
     M(EphemeralNode, "Number of ephemeral nodes hold in ZooKeeper.") \
     M(ZooKeeperSession, "Number of sessions (connections) to ZooKeeper. Should be no more than one, because using more than one connection to ZooKeeper may lead to bugs due to lack of linearizability (stale reads) that ZooKeeper consistency model allows.") \
     M(ZooKeeperWatch, "Number of watches (event subscriptions) in ZooKeeper.") \
@@ -64,6 +73,78 @@
     M(GlobalThreadActive, "Number of threads in global thread pool running a task.") \
     M(LocalThread, "Number of threads in local thread pools. The threads in local thread pools are taken from the global thread pool.") \
     M(LocalThreadActive, "Number of threads in local thread pools running a task.") \
+    M(MergeTreeDataSelectExecutorThreads, "Number of threads in the MergeTreeDataSelectExecutor thread pool.") \
+    M(MergeTreeDataSelectExecutorThreadsActive, "Number of threads in the MergeTreeDataSelectExecutor thread pool running a task.") \
+    M(BackupsThreads, "Number of threads in the thread pool for BACKUP.") \
+    M(BackupsThreadsActive, "Number of threads in thread pool for BACKUP running a task.") \
+    M(RestoreThreads, "Number of threads in the thread pool for RESTORE.") \
+    M(RestoreThreadsActive, "Number of threads in the thread pool for RESTORE running a task.") \
+    M(MarksLoaderThreads, "Number of threads in thread pool for loading marks.") \
+    M(MarksLoaderThreadsActive, "Number of threads in the thread pool for loading marks running a task.") \
+    M(IOPrefetchThreads, "Number of threads in the IO prefertch thread pool.") \
+    M(IOPrefetchThreadsActive, "Number of threads in the IO prefetch thread pool running a task.") \
+    M(IOWriterThreads, "Number of threads in the IO writer thread pool.") \
+    M(IOWriterThreadsActive, "Number of threads in the IO writer thread pool running a task.") \
+    M(IOThreads, "Number of threads in the IO thread pool.") \
+    M(IOThreadsActive, "Number of threads in the IO thread pool running a task.") \
+    M(ThreadPoolRemoteFSReaderThreads, "Number of threads in the thread pool for remote_filesystem_read_method=threadpool.") \
+    M(ThreadPoolRemoteFSReaderThreadsActive, "Number of threads in the thread pool for remote_filesystem_read_method=threadpool running a task.") \
+    M(ThreadPoolFSReaderThreads, "Number of threads in the thread pool for local_filesystem_read_method=threadpool.") \
+    M(ThreadPoolFSReaderThreadsActive, "Number of threads in the thread pool for local_filesystem_read_method=threadpool running a task.") \
+    M(BackupsIOThreads, "Number of threads in the BackupsIO thread pool.") \
+    M(BackupsIOThreadsActive, "Number of threads in the BackupsIO thread pool running a task.") \
+    M(DiskObjectStorageAsyncThreads, "Number of threads in the async thread pool for DiskObjectStorage.") \
+    M(DiskObjectStorageAsyncThreadsActive, "Number of threads in the async thread pool for DiskObjectStorage running a task.") \
+    M(StorageHiveThreads, "Number of threads in the StorageHive thread pool.") \
+    M(StorageHiveThreadsActive, "Number of threads in the StorageHive thread pool running a task.") \
+    M(TablesLoaderThreads, "Number of threads in the tables loader thread pool.") \
+    M(TablesLoaderThreadsActive, "Number of threads in the tables loader thread pool running a task.") \
+    M(DatabaseOrdinaryThreads, "Number of threads in the Ordinary database thread pool.") \
+    M(DatabaseOrdinaryThreadsActive, "Number of threads in the Ordinary database thread pool running a task.") \
+    M(DatabaseOnDiskThreads, "Number of threads in the DatabaseOnDisk thread pool.") \
+    M(DatabaseOnDiskThreadsActive, "Number of threads in the DatabaseOnDisk thread pool running a task.") \
+    M(DatabaseCatalogThreads, "Number of threads in the DatabaseCatalog thread pool.") \
+    M(DatabaseCatalogThreadsActive, "Number of threads in the DatabaseCatalog thread pool running a task.") \
+    M(DestroyAggregatesThreads, "Number of threads in the thread pool for destroy aggregate states.") \
+    M(DestroyAggregatesThreadsActive, "Number of threads in the thread pool for destroy aggregate states running a task.") \
+    M(HashedDictionaryThreads, "Number of threads in the HashedDictionary thread pool.") \
+    M(HashedDictionaryThreadsActive, "Number of threads in the HashedDictionary thread pool running a task.") \
+    M(CacheDictionaryThreads, "Number of threads in the CacheDictionary thread pool.") \
+    M(CacheDictionaryThreadsActive, "Number of threads in the CacheDictionary thread pool running a task.") \
+    M(ParallelFormattingOutputFormatThreads, "Number of threads in the ParallelFormattingOutputFormatThreads thread pool.") \
+    M(ParallelFormattingOutputFormatThreadsActive, "Number of threads in the ParallelFormattingOutputFormatThreads thread pool running a task.") \
+    M(ParallelParsingInputFormatThreads, "Number of threads in the ParallelParsingInputFormat thread pool.") \
+    M(ParallelParsingInputFormatThreadsActive, "Number of threads in the ParallelParsingInputFormat thread pool running a task.") \
+    M(MergeTreeBackgroundExecutorThreads, "Number of threads in the MergeTreeBackgroundExecutor thread pool.") \
+    M(MergeTreeBackgroundExecutorThreadsActive, "Number of threads in the MergeTreeBackgroundExecutor thread pool running a task.") \
+    M(AsynchronousInsertThreads, "Number of threads in the AsynchronousInsert thread pool.") \
+    M(AsynchronousInsertThreadsActive, "Number of threads in the AsynchronousInsert thread pool running a task.") \
+    M(StartupSystemTablesThreads, "Number of threads in the StartupSystemTables thread pool.") \
+    M(StartupSystemTablesThreadsActive, "Number of threads in the StartupSystemTables thread pool running a task.") \
+    M(AggregatorThreads, "Number of threads in the Aggregator thread pool.") \
+    M(AggregatorThreadsActive, "Number of threads in the Aggregator thread pool running a task.") \
+    M(DDLWorkerThreads, "Number of threads in the DDLWorker thread pool for ON CLUSTER queries.") \
+    M(DDLWorkerThreadsActive, "Number of threads in the DDLWORKER thread pool for ON CLUSTER queries running a task.") \
+    M(StorageDistributedThreads, "Number of threads in the StorageDistributed thread pool.") \
+    M(StorageDistributedThreadsActive, "Number of threads in the StorageDistributed thread pool running a task.") \
+    M(DistributedInsertThreads, "Number of threads used for INSERT into Distributed.") \
+    M(DistributedInsertThreadsActive, "Number of threads used for INSERT into Distributed running a task.") \
+    M(StorageS3Threads, "Number of threads in the StorageS3 thread pool.") \
+    M(StorageS3ThreadsActive, "Number of threads in the StorageS3 thread pool running a task.") \
+    M(MergeTreePartsLoaderThreads, "Number of threads in the MergeTree parts loader thread pool.") \
+    M(MergeTreePartsLoaderThreadsActive, "Number of threads in the MergeTree parts loader thread pool running a task.") \
+    M(MergeTreePartsCleanerThreads, "Number of threads in the MergeTree parts cleaner thread pool.") \
+    M(MergeTreePartsCleanerThreadsActive, "Number of threads in the MergeTree parts cleaner thread pool running a task.") \
+    M(SystemReplicasThreads, "Number of threads in the system.replicas thread pool.") \
+    M(SystemReplicasThreadsActive, "Number of threads in the system.replicas thread pool running a task.") \
+    M(RestartReplicaThreads, "Number of threads in the RESTART REPLICA thread pool.") \
+    M(RestartReplicaThreadsActive, "Number of threads in the RESTART REPLICA thread pool running a task.") \
+    M(QueryPipelineExecutorThreads, "Number of threads in the PipelineExecutor thread pool.") \
+    M(QueryPipelineExecutorThreadsActive, "Number of threads in the PipelineExecutor thread pool running a task.") \
+    M(ParquetDecoderThreads, "Number of threads in the ParquetBlockInputFormat thread pool running a task.") \
+    M(ParquetDecoderThreadsActive, "Number of threads in the ParquetBlockInputFormat thread pool.") \
+    M(OutdatedPartsLoadingThreads, "Number of threads in the threadpool for loading Outdated data parts.") \
+    M(OutdatedPartsLoadingThreadsActive, "Number of active threads in the threadpool for loading Outdated data parts.") \
     M(DistributedFilesToInsert, "Number of pending files to process for asynchronous insertion into Distributed tables. Number of files for every shard is summed.") \
     M(BrokenDistributedFilesToInsert, "Number of files for asynchronous insertion into Distributed tables that has been marked as broken. This metric will starts from 0 on start. Number of files for every shard is summed.") \
     M(TablesToDropQueueSize, "Number of dropped tables, that are waiting for background data removal.") \
@@ -84,10 +165,6 @@
     M(MMappedFileBytes, "Sum size of mmapped file regions.") \
     M(MMappedAllocs, "Total number of mmapped allocations") \
     M(MMappedAllocBytes, "Sum bytes of mmapped allocations") \
-    M(AsyncDrainedConnections, "Number of connections drained asynchronously.") \
-    M(ActiveAsyncDrainedConnections, "Number of active connections drained asynchronously.") \
-    M(SyncDrainedConnections, "Number of connections drained synchronously.") \
-    M(ActiveSyncDrainedConnections, "Number of active connections drained synchronously.") \
     M(AsynchronousReadWait, "Number of threads waiting for asynchronous read.") \
     M(PendingAsyncInsert, "Number of asynchronous inserts that are waiting for flush.") \
     M(KafkaConsumers, "Number of active Kafka consumers") \
@@ -114,12 +191,13 @@
     M(MergeTreeReadTaskRequestsSent, "The current number of callback requests in flight from the remote server back to the initiator server to choose the read task (for MergeTree tables). Measured on the remote server side.") \
     M(MergeTreeAllRangesAnnouncementsSent, "The current number of announcement being sent in flight from the remote server to the initiator server about the set of data parts (for MergeTree tables). Measured on the remote server side.")
 
+
 namespace CurrentMetrics
 {
-    #define M(NAME, DOCUMENTATION) extern const Metric NAME = __COUNTER__;
+    #define M(NAME, DOCUMENTATION) extern const Metric NAME = Metric(__COUNTER__);
         APPLY_FOR_METRICS(M)
     #undef M
-    constexpr Metric END = __COUNTER__;
+    constexpr Metric END = Metric(__COUNTER__);
 
     std::atomic<Value> values[END] {};    /// Global variable, initialized by zeros.
 
diff --git a/src/Common/CurrentMetrics.h b/src/Common/CurrentMetrics.h
index c184ee1e7f2..a1ef254485d 100644
--- a/src/Common/CurrentMetrics.h
+++ b/src/Common/CurrentMetrics.h
@@ -4,7 +4,9 @@
 #include <cstdint>
 #include <utility>
 #include <atomic>
+#include <cassert>
 #include <base/types.h>
+#include <base/strong_typedef.h>
 
 /** Allows to count number of simultaneously happening processes or current value of some metric.
   *  - for high-level profiling.
@@ -21,7 +23,7 @@
 namespace CurrentMetrics
 {
     /// Metric identifier (index in array).
-    using Metric = size_t;
+    using Metric = StrongTypedef<size_t, struct MetricTag>;
     using Value = DB::Int64;
 
     /// Get name of metric by identifier. Returns statically allocated string.
@@ -73,7 +75,10 @@ namespace CurrentMetrics
 
     public:
         explicit Increment(Metric metric, Value amount_ = 1)
-            : Increment(&values[metric], amount_) {}
+            : Increment(&values[metric], amount_)
+        {
+            assert(metric < CurrentMetrics::end());
+        }
 
         ~Increment()
         {
diff --git a/src/Common/CurrentThread.cpp b/src/Common/CurrentThread.cpp
index 526e28c043d..057b1eeda12 100644
--- a/src/Common/CurrentThread.cpp
+++ b/src/Common/CurrentThread.cpp
@@ -25,6 +25,13 @@ void CurrentThread::updatePerformanceCounters()
     current_thread->updatePerformanceCounters();
 }
 
+void CurrentThread::updatePerformanceCountersIfNeeded()
+{
+    if (unlikely(!current_thread))
+        return;
+    current_thread->updatePerformanceCountersIfNeeded();
+}
+
 bool CurrentThread::isInitialized()
 {
     return current_thread;
@@ -57,6 +64,23 @@ void CurrentThread::updateProgressOut(const Progress & value)
     current_thread->progress_out.incrementPiecewiseAtomically(value);
 }
 
+std::shared_ptr<InternalTextLogsQueue> CurrentThread::getInternalTextLogsQueue()
+{
+    /// NOTE: this method could be called at early server startup stage
+    if (unlikely(!current_thread))
+        return nullptr;
+
+    return current_thread->getInternalTextLogsQueue();
+}
+
+InternalProfileEventsQueuePtr CurrentThread::getInternalProfileEventsQueue()
+{
+    if (unlikely(!current_thread))
+        return nullptr;
+
+    return current_thread->getInternalProfileEventsQueue();
+}
+
 void CurrentThread::attachInternalTextLogsQueue(const std::shared_ptr<InternalTextLogsQueue> & logs_queue,
                                                 LogsLevel client_logs_level)
 {
@@ -65,44 +89,8 @@ void CurrentThread::attachInternalTextLogsQueue(const std::shared_ptr<InternalTe
     current_thread->attachInternalTextLogsQueue(logs_queue, client_logs_level);
 }
 
-void CurrentThread::setFatalErrorCallback(std::function<void()> callback)
-{
-    if (unlikely(!current_thread))
-        return;
-    current_thread->setFatalErrorCallback(callback);
-}
 
-std::shared_ptr<InternalTextLogsQueue> CurrentThread::getInternalTextLogsQueue()
-{
-    /// NOTE: this method could be called at early server startup stage
-    if (unlikely(!current_thread))
-        return nullptr;
-
-    if (current_thread->getCurrentState() == ThreadStatus::ThreadState::Died)
-        return nullptr;
-
-    return current_thread->getInternalTextLogsQueue();
-}
-
-void CurrentThread::attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & queue)
-{
-    if (unlikely(!current_thread))
-        return;
-    current_thread->attachInternalProfileEventsQueue(queue);
-}
-
-InternalProfileEventsQueuePtr CurrentThread::getInternalProfileEventsQueue()
-{
-    if (unlikely(!current_thread))
-        return nullptr;
-
-    if (current_thread->getCurrentState() == ThreadStatus::ThreadState::Died)
-        return nullptr;
-
-    return current_thread->getInternalProfileEventsQueue();
-}
-
-ThreadGroupStatusPtr CurrentThread::getGroup()
+ThreadGroupPtr CurrentThread::getGroup()
 {
     if (unlikely(!current_thread))
         return nullptr;
@@ -110,6 +98,14 @@ ThreadGroupStatusPtr CurrentThread::getGroup()
     return current_thread->getThreadGroup();
 }
 
+std::string_view CurrentThread::getQueryId()
+{
+    if (unlikely(!current_thread))
+        return {};
+
+    return current_thread->getQueryId();
+}
+
 MemoryTracker * CurrentThread::getUserMemoryTracker()
 {
     if (unlikely(!current_thread))
@@ -126,11 +122,7 @@ void CurrentThread::flushUntrackedMemory()
 {
     if (unlikely(!current_thread))
         return;
-    if (current_thread->untracked_memory == 0)
-        return;
-
-    current_thread->memory_tracker.adjustWithUntrackedMemory(current_thread->untracked_memory);
-    current_thread->untracked_memory = 0;
+    current_thread->flushUntrackedMemory();
 }
 
 }
diff --git a/src/Common/CurrentThread.h b/src/Common/CurrentThread.h
index f36b92e319d..13e4953ce9d 100644
--- a/src/Common/CurrentThread.h
+++ b/src/Common/CurrentThread.h
@@ -5,6 +5,7 @@
 
 #include <memory>
 #include <string>
+#include <string_view>
 
 
 namespace ProfileEvents
@@ -38,7 +39,7 @@ public:
     static ThreadStatus & get();
 
     /// Group to which belongs current thread
-    static ThreadGroupStatusPtr getGroup();
+    static ThreadGroupPtr getGroup();
 
     /// MemoryTracker for user that owns current thread if any
     static MemoryTracker * getUserMemoryTracker();
@@ -54,10 +55,11 @@ public:
     static void attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & queue);
     static InternalProfileEventsQueuePtr getInternalProfileEventsQueue();
 
-    static void setFatalErrorCallback(std::function<void()> callback);
+    static void attachQueryForLog(const String & query_);
 
     /// Makes system calls to update ProfileEvents that contain info from rusage and taskstats
     static void updatePerformanceCounters();
+    static void updatePerformanceCountersIfNeeded();
 
     static ProfileEvents::Counters & getProfileEvents();
     inline ALWAYS_INLINE static MemoryTracker * getMemoryTracker()
@@ -71,49 +73,31 @@ public:
     static void updateProgressIn(const Progress & value);
     static void updateProgressOut(const Progress & value);
 
-    /// Query management:
-
-    /// Call from master thread as soon as possible (e.g. when thread accepted connection)
-    static void initializeQuery();
-
     /// You must call one of these methods when create a query child thread:
     /// Add current thread to a group associated with the thread group
-    static void attachTo(const ThreadGroupStatusPtr & thread_group);
+    static void attachToGroup(const ThreadGroupPtr & thread_group);
     /// Is useful for a ThreadPool tasks
-    static void attachToIfDetached(const ThreadGroupStatusPtr & thread_group);
+    static void attachToGroupIfDetached(const ThreadGroupPtr & thread_group);
+
+    /// Non-master threads call this method in destructor automatically
+    static void detachFromGroupIfNotDetached();
 
     /// Update ProfileEvents and dumps info to system.query_thread_log
     static void finalizePerformanceCounters();
 
     /// Returns a non-empty string if the thread is attached to a query
-    static std::string_view getQueryId()
-    {
-        if (unlikely(!current_thread))
-            return {};
-        return current_thread->getQueryId();
-    }
-
-    /// Non-master threads call this method in destructor automatically
-    static void detachQuery();
-    static void detachQueryIfNotDetached();
+    static std::string_view getQueryId();
 
     /// Initializes query with current thread as master thread in constructor, and detaches it in destructor
     struct QueryScope : private boost::noncopyable
     {
-        explicit QueryScope(ContextMutablePtr query_context);
-        explicit QueryScope(ContextPtr query_context);
+        explicit QueryScope(ContextMutablePtr query_context, std::function<void()> fatal_error_callback = {});
+        explicit QueryScope(ContextPtr query_context, std::function<void()> fatal_error_callback = {});
         ~QueryScope();
 
         void logPeakMemoryUsage();
         bool log_peak_memory_usage_in_destructor = true;
     };
-
-private:
-    static void defaultThreadDeleter();
-
-    /// Sets query_context for current thread group
-    /// Can by used only through QueryScope
-    static void attachQueryContext(ContextPtr query_context);
 };
 
 }
diff --git a/src/Common/DNSResolver.cpp b/src/Common/DNSResolver.cpp
index 81e2624d6db..b6a68bdfb45 100644
--- a/src/Common/DNSResolver.cpp
+++ b/src/Common/DNSResolver.cpp
@@ -3,6 +3,7 @@
 #include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
 #include <Common/thread_local_rng.h>
+#include <Common/logger_useful.h>
 #include <Core/Names.h>
 #include <base/types.h>
 #include <Poco/Net/IPAddress.h>
diff --git a/src/Common/DNSResolver.h b/src/Common/DNSResolver.h
index a05456d3de8..84715b392a8 100644
--- a/src/Common/DNSResolver.h
+++ b/src/Common/DNSResolver.h
@@ -5,9 +5,10 @@
 #include <base/types.h>
 #include <Core/Names.h>
 #include <boost/noncopyable.hpp>
-#include <Common/logger_useful.h>
 
 
+namespace Poco { class Logger; }
+
 namespace DB
 {
 
diff --git a/src/Common/DateLUTImpl.h b/src/Common/DateLUTImpl.h
index b40b4d7c65b..551375d1f5c 100644
--- a/src/Common/DateLUTImpl.h
+++ b/src/Common/DateLUTImpl.h
@@ -10,6 +10,8 @@
 #include <type_traits>
 
 
+#define DATE_SECONDS_PER_DAY 86400 /// Number of seconds in a day, 60 * 60 * 24
+
 #define DATE_LUT_MIN_YEAR 1900 /// 1900 since majority of financial organizations consider 1900 as an initial year.
 #define DATE_LUT_MAX_YEAR 2299 /// Last supported year (complete)
 #define DATE_LUT_YEARS (1 + DATE_LUT_MAX_YEAR - DATE_LUT_MIN_YEAR) /// Number of years in lookup table
diff --git a/src/Common/Epoll.cpp b/src/Common/Epoll.cpp
index e1fdc803ada..182981aca27 100644
--- a/src/Common/Epoll.cpp
+++ b/src/Common/Epoll.cpp
@@ -34,10 +34,10 @@ Epoll & Epoll::operator=(Epoll && other) noexcept
     return *this;
 }
 
-void Epoll::add(int fd, void * ptr)
+void Epoll::add(int fd, void * ptr, uint32_t events)
 {
     epoll_event event;
-    event.events = EPOLLIN | EPOLLPRI;
+    event.events = events | EPOLLPRI;
     if (ptr)
         event.data.ptr = ptr;
     else
diff --git a/src/Common/Epoll.h b/src/Common/Epoll.h
index 9c75974791f..ac42a8fc56d 100644
--- a/src/Common/Epoll.h
+++ b/src/Common/Epoll.h
@@ -3,14 +3,13 @@
 
 #include <sys/epoll.h>
 #include <vector>
+#include <functional>
 #include <boost/noncopyable.hpp>
 #include <Poco/Logger.h>
 
 namespace DB
 {
 
-using AsyncCallback = std::function<void(int, Poco::Timespan, const std::string &)>;
-
 class Epoll
 {
 public:
@@ -24,7 +23,9 @@ public:
 
     /// Add new file descriptor to epoll. If ptr set to nullptr, epoll_event.data.fd = fd,
     /// otherwise epoll_event.data.ptr = ptr.
-    void add(int fd, void * ptr = nullptr);
+    /// Default events are for reading from fd and for errors.
+    void add(int fd, void * ptr = nullptr, uint32_t events = EPOLLIN | EPOLLERR);
+    void add(int fd, uint32_t events) { add(fd, nullptr, events); }
 
     /// Remove file descriptor to epoll.
     void remove(int fd);
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index c00129249e2..83a7314ac7a 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -29,21 +29,14 @@
     M(13, SIZES_OF_COLUMNS_IN_TUPLE_DOESNT_MATCH) \
     M(15, DUPLICATE_COLUMN) \
     M(16, NO_SUCH_COLUMN_IN_TABLE) \
-    M(17, DELIMITER_IN_STRING_LITERAL_DOESNT_MATCH) \
-    M(18, CANNOT_INSERT_ELEMENT_INTO_CONSTANT_COLUMN) \
     M(19, SIZE_OF_FIXED_STRING_DOESNT_MATCH) \
     M(20, NUMBER_OF_COLUMNS_DOESNT_MATCH) \
-    M(21, CANNOT_READ_ALL_DATA_FROM_TAB_SEPARATED_INPUT) \
-    M(22, CANNOT_PARSE_ALL_VALUE_FROM_TAB_SEPARATED_INPUT) \
     M(23, CANNOT_READ_FROM_ISTREAM) \
     M(24, CANNOT_WRITE_TO_OSTREAM) \
     M(25, CANNOT_PARSE_ESCAPE_SEQUENCE) \
     M(26, CANNOT_PARSE_QUOTED_STRING) \
     M(27, CANNOT_PARSE_INPUT_ASSERTION_FAILED) \
     M(28, CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER) \
-    M(29, CANNOT_PRINT_INTEGER) \
-    M(30, CANNOT_READ_SIZE_OF_COMPRESSED_CHUNK) \
-    M(31, CANNOT_READ_COMPRESSED_CHUNK) \
     M(32, ATTEMPT_TO_READ_AFTER_EOF) \
     M(33, CANNOT_READ_ALL_DATA) \
     M(34, TOO_MANY_ARGUMENTS_FOR_FUNCTION) \
@@ -57,7 +50,6 @@
     M(42, NUMBER_OF_ARGUMENTS_DOESNT_MATCH) \
     M(43, ILLEGAL_TYPE_OF_ARGUMENT) \
     M(44, ILLEGAL_COLUMN) \
-    M(45, ILLEGAL_NUMBER_OF_RESULT_COLUMNS) \
     M(46, UNKNOWN_FUNCTION) \
     M(47, UNKNOWN_IDENTIFIER) \
     M(48, NOT_IMPLEMENTED) \
@@ -66,20 +58,14 @@
     M(51, EMPTY_LIST_OF_COLUMNS_QUERIED) \
     M(52, COLUMN_QUERIED_MORE_THAN_ONCE) \
     M(53, TYPE_MISMATCH) \
-    M(54, STORAGE_DOESNT_ALLOW_PARAMETERS) \
     M(55, STORAGE_REQUIRES_PARAMETER) \
     M(56, UNKNOWN_STORAGE) \
     M(57, TABLE_ALREADY_EXISTS) \
     M(58, TABLE_METADATA_ALREADY_EXISTS) \
     M(59, ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER) \
     M(60, UNKNOWN_TABLE) \
-    M(61, ONLY_FILTER_COLUMN_IN_BLOCK) \
     M(62, SYNTAX_ERROR) \
     M(63, UNKNOWN_AGGREGATE_FUNCTION) \
-    M(64, CANNOT_READ_AGGREGATE_FUNCTION_FROM_TEXT) \
-    M(65, CANNOT_WRITE_AGGREGATE_FUNCTION_AS_TEXT) \
-    M(66, NOT_A_COLUMN) \
-    M(67, ILLEGAL_KEY_OF_AGGREGATION) \
     M(68, CANNOT_GET_SIZE_OF_FIELD) \
     M(69, ARGUMENT_OUT_OF_BOUND) \
     M(70, CANNOT_CONVERT_TYPE) \
@@ -109,16 +95,11 @@
     M(94, CANNOT_MERGE_DIFFERENT_AGGREGATED_DATA_VARIANTS) \
     M(95, CANNOT_READ_FROM_SOCKET) \
     M(96, CANNOT_WRITE_TO_SOCKET) \
-    M(97, CANNOT_READ_ALL_DATA_FROM_CHUNKED_INPUT) \
-    M(98, CANNOT_WRITE_TO_EMPTY_BLOCK_OUTPUT_STREAM) \
     M(99, UNKNOWN_PACKET_FROM_CLIENT) \
     M(100, UNKNOWN_PACKET_FROM_SERVER) \
     M(101, UNEXPECTED_PACKET_FROM_CLIENT) \
     M(102, UNEXPECTED_PACKET_FROM_SERVER) \
-    M(103, RECEIVED_DATA_FOR_WRONG_QUERY_ID) \
     M(104, TOO_SMALL_BUFFER_SIZE) \
-    M(105, CANNOT_READ_HISTORY) \
-    M(106, CANNOT_APPEND_HISTORY) \
     M(107, FILE_DOESNT_EXIST) \
     M(108, NO_DATA_TO_INSERT) \
     M(109, CANNOT_BLOCK_SIGNAL) \
@@ -137,7 +118,6 @@
     M(123, UNKNOWN_TYPE_OF_AST_NODE) \
     M(124, INCORRECT_ELEMENT_OF_SET) \
     M(125, INCORRECT_RESULT_OF_SCALAR_SUBQUERY) \
-    M(126, CANNOT_GET_RETURN_TYPE) \
     M(127, ILLEGAL_INDEX) \
     M(128, TOO_LARGE_ARRAY_SIZE) \
     M(129, FUNCTION_IS_SPECIAL) \
@@ -149,30 +129,17 @@
     M(137, UNKNOWN_ELEMENT_IN_CONFIG) \
     M(138, EXCESSIVE_ELEMENT_IN_CONFIG) \
     M(139, NO_ELEMENTS_IN_CONFIG) \
-    M(140, ALL_REQUESTED_COLUMNS_ARE_MISSING) \
     M(141, SAMPLING_NOT_SUPPORTED) \
     M(142, NOT_FOUND_NODE) \
-    M(143, FOUND_MORE_THAN_ONE_NODE) \
-    M(144, FIRST_DATE_IS_BIGGER_THAN_LAST_DATE) \
     M(145, UNKNOWN_OVERFLOW_MODE) \
-    M(146, QUERY_SECTION_DOESNT_MAKE_SENSE) \
-    M(147, NOT_FOUND_FUNCTION_ELEMENT_FOR_AGGREGATE) \
-    M(148, NOT_FOUND_RELATION_ELEMENT_FOR_CONDITION) \
-    M(149, NOT_FOUND_RHS_ELEMENT_FOR_CONDITION) \
-    M(150, EMPTY_LIST_OF_ATTRIBUTES_PASSED) \
-    M(151, INDEX_OF_COLUMN_IN_SORT_CLAUSE_IS_OUT_OF_RANGE) \
     M(152, UNKNOWN_DIRECTION_OF_SORTING) \
     M(153, ILLEGAL_DIVISION) \
-    M(154, AGGREGATE_FUNCTION_NOT_APPLICABLE) \
-    M(155, UNKNOWN_RELATION) \
     M(156, DICTIONARIES_WAS_NOT_LOADED) \
-    M(157, ILLEGAL_OVERFLOW_MODE) \
     M(158, TOO_MANY_ROWS) \
     M(159, TIMEOUT_EXCEEDED) \
     M(160, TOO_SLOW) \
     M(161, TOO_MANY_COLUMNS) \
     M(162, TOO_DEEP_SUBQUERIES) \
-    M(163, TOO_DEEP_PIPELINE) \
     M(164, READONLY) \
     M(165, TOO_MANY_TEMPORARY_COLUMNS) \
     M(166, TOO_MANY_TEMPORARY_NON_CONST_COLUMNS) \
@@ -183,20 +150,14 @@
     M(172, CANNOT_CREATE_DIRECTORY) \
     M(173, CANNOT_ALLOCATE_MEMORY) \
     M(174, CYCLIC_ALIASES) \
-    M(176, CHUNK_NOT_FOUND) \
-    M(177, DUPLICATE_CHUNK_NAME) \
-    M(178, MULTIPLE_ALIASES_FOR_EXPRESSION) \
     M(179, MULTIPLE_EXPRESSIONS_FOR_ALIAS) \
     M(180, THERE_IS_NO_PROFILE) \
     M(181, ILLEGAL_FINAL) \
     M(182, ILLEGAL_PREWHERE) \
     M(183, UNEXPECTED_EXPRESSION) \
     M(184, ILLEGAL_AGGREGATION) \
-    M(185, UNSUPPORTED_MYISAM_BLOCK_TYPE) \
     M(186, UNSUPPORTED_COLLATION_LOCALE) \
     M(187, COLLATION_COMPARISON_FAILED) \
-    M(188, UNKNOWN_ACTION) \
-    M(189, TABLE_MUST_NOT_BE_CREATED_MANUALLY) \
     M(190, SIZES_OF_ARRAYS_DONT_MATCH) \
     M(191, SET_SIZE_LIMIT_EXCEEDED) \
     M(192, UNKNOWN_USER) \
@@ -204,15 +165,12 @@
     M(194, REQUIRED_PASSWORD) \
     M(195, IP_ADDRESS_NOT_ALLOWED) \
     M(196, UNKNOWN_ADDRESS_PATTERN_TYPE) \
-    M(197, SERVER_REVISION_IS_TOO_OLD) \
     M(198, DNS_ERROR) \
     M(199, UNKNOWN_QUOTA) \
-    M(200, QUOTA_DOESNT_ALLOW_KEYS) \
     M(201, QUOTA_EXCEEDED) \
     M(202, TOO_MANY_SIMULTANEOUS_QUERIES) \
     M(203, NO_FREE_CONNECTION) \
     M(204, CANNOT_FSYNC) \
-    M(205, NESTED_TYPE_TOO_DEEP) \
     M(206, ALIAS_REQUIRED) \
     M(207, AMBIGUOUS_IDENTIFIER) \
     M(208, EMPTY_NESTED_TABLE) \
@@ -229,7 +187,6 @@
     M(219, DATABASE_NOT_EMPTY) \
     M(220, DUPLICATE_INTERSERVER_IO_ENDPOINT) \
     M(221, NO_SUCH_INTERSERVER_IO_ENDPOINT) \
-    M(222, ADDING_REPLICA_TO_NON_EMPTY_TABLE) \
     M(223, UNEXPECTED_AST_STRUCTURE) \
     M(224, REPLICA_IS_ALREADY_ACTIVE) \
     M(225, NO_ZOOKEEPER) \
@@ -253,9 +210,7 @@
     M(243, NOT_ENOUGH_SPACE) \
     M(244, UNEXPECTED_ZOOKEEPER_ERROR) \
     M(246, CORRUPTED_DATA) \
-    M(247, INCORRECT_MARK) \
     M(248, INVALID_PARTITION_VALUE) \
-    M(250, NOT_ENOUGH_BLOCK_NUMBERS) \
     M(251, NO_SUCH_REPLICA) \
     M(252, TOO_MANY_PARTS) \
     M(253, REPLICA_ALREADY_EXISTS) \
@@ -271,8 +226,6 @@
     M(264, INCOMPATIBLE_TYPE_OF_JOIN) \
     M(265, NO_AVAILABLE_REPLICA) \
     M(266, MISMATCH_REPLICAS_DATA_SOURCES) \
-    M(267, STORAGE_DOESNT_SUPPORT_PARALLEL_REPLICAS) \
-    M(268, CPUID_ERROR) \
     M(269, INFINITE_LOOP) \
     M(270, CANNOT_COMPRESS) \
     M(271, CANNOT_DECOMPRESS) \
@@ -295,9 +248,7 @@
     M(290, LIMIT_EXCEEDED) \
     M(291, DATABASE_ACCESS_DENIED) \
     M(293, MONGODB_CANNOT_AUTHENTICATE) \
-    M(294, INVALID_BLOCK_EXTRA_INFO) \
     M(295, RECEIVED_EMPTY_DATA) \
-    M(296, NO_REMOTE_SHARD_FOUND) \
     M(297, SHARD_HAS_NO_CONNECTIONS) \
     M(298, CANNOT_PIPE) \
     M(299, CANNOT_FORK) \
@@ -311,13 +262,10 @@
     M(307, TOO_MANY_BYTES) \
     M(308, UNEXPECTED_NODE_IN_ZOOKEEPER) \
     M(309, FUNCTION_CANNOT_HAVE_PARAMETERS) \
-    M(317, INVALID_SHARD_WEIGHT) \
     M(318, INVALID_CONFIG_PARAMETER) \
     M(319, UNKNOWN_STATUS_OF_INSERT) \
     M(321, VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE) \
-    M(335, BARRIER_TIMEOUT) \
     M(336, UNKNOWN_DATABASE_ENGINE) \
-    M(337, DDL_GUARD_IS_ACTIVE) \
     M(341, UNFINISHED) \
     M(342, METADATA_MISMATCH) \
     M(344, SUPPORT_IS_DISABLED) \
@@ -325,14 +273,10 @@
     M(346, CANNOT_CONVERT_CHARSET) \
     M(347, CANNOT_LOAD_CONFIG) \
     M(349, CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN) \
-    M(350, INCOMPATIBLE_SOURCE_TABLES) \
-    M(351, AMBIGUOUS_TABLE_NAME) \
     M(352, AMBIGUOUS_COLUMN_NAME) \
     M(353, INDEX_OF_POSITIONAL_ARGUMENT_IS_OUT_OF_RANGE) \
     M(354, ZLIB_INFLATE_FAILED) \
     M(355, ZLIB_DEFLATE_FAILED) \
-    M(356, BAD_LAMBDA) \
-    M(357, RESERVED_IDENTIFIER_NAME) \
     M(358, INTO_OUTFILE_NOT_ALLOWED) \
     M(359, TABLE_SIZE_EXCEEDS_MAX_DROP_SIZE_LIMIT) \
     M(360, CANNOT_CREATE_CHARSET_CONVERTER) \
@@ -341,7 +285,6 @@
     M(363, CANNOT_CREATE_IO_BUFFER) \
     M(364, RECEIVED_ERROR_TOO_MANY_REQUESTS) \
     M(366, SIZES_OF_NESTED_COLUMNS_ARE_INCONSISTENT) \
-    M(367, TOO_MANY_FETCHES) \
     M(369, ALL_REPLICAS_ARE_STALE) \
     M(370, DATA_TYPE_CANNOT_BE_USED_IN_TABLES) \
     M(371, INCONSISTENT_CLUSTER_DEFINITION) \
@@ -352,7 +295,6 @@
     M(376, CANNOT_PARSE_UUID) \
     M(377, ILLEGAL_SYNTAX_FOR_DATA_TYPE) \
     M(378, DATA_TYPE_CANNOT_HAVE_ARGUMENTS) \
-    M(379, UNKNOWN_STATUS_OF_DISTRIBUTED_DDL_TASK) \
     M(380, CANNOT_KILL) \
     M(381, HTTP_LENGTH_REQUIRED) \
     M(382, CANNOT_LOAD_CATBOOST_MODEL) \
@@ -378,11 +320,9 @@
     M(402, CANNOT_IOSETUP) \
     M(403, INVALID_JOIN_ON_EXPRESSION) \
     M(404, BAD_ODBC_CONNECTION_STRING) \
-    M(405, PARTITION_SIZE_EXCEEDS_MAX_DROP_SIZE_LIMIT) \
     M(406, TOP_AND_LIMIT_TOGETHER) \
     M(407, DECIMAL_OVERFLOW) \
     M(408, BAD_REQUEST_PARAMETER) \
-    M(409, EXTERNAL_EXECUTABLE_NOT_FOUND) \
     M(410, EXTERNAL_SERVER_IS_NOT_RESPONDING) \
     M(411, PTHREAD_ERROR) \
     M(412, NETLINK_ERROR) \
@@ -399,7 +339,6 @@
     M(424, CANNOT_LINK) \
     M(425, SYSTEM_ERROR) \
     M(427, CANNOT_COMPILE_REGEXP) \
-    M(428, UNKNOWN_LOG_LEVEL) \
     M(429, FAILED_TO_GETPWUID) \
     M(430, MISMATCHING_USERS_FOR_PROCESS_AND_DATA) \
     M(431, ILLEGAL_SYNTAX_FOR_CODEC_TYPE) \
@@ -433,7 +372,6 @@
     M(459, CANNOT_SET_THREAD_PRIORITY) \
     M(460, CANNOT_CREATE_TIMER) \
     M(461, CANNOT_SET_TIMER_PERIOD) \
-    M(462, CANNOT_DELETE_TIMER) \
     M(463, CANNOT_FCNTL) \
     M(464, CANNOT_PARSE_ELF) \
     M(465, CANNOT_PARSE_DWARF) \
@@ -456,15 +394,12 @@
     M(482, DICTIONARY_ACCESS_DENIED) \
     M(483, TOO_MANY_REDIRECTS) \
     M(484, INTERNAL_REDIS_ERROR) \
-    M(485, SCALAR_ALREADY_EXISTS) \
     M(487, CANNOT_GET_CREATE_DICTIONARY_QUERY) \
-    M(488, UNKNOWN_DICTIONARY) \
     M(489, INCORRECT_DICTIONARY_DEFINITION) \
     M(490, CANNOT_FORMAT_DATETIME) \
     M(491, UNACCEPTABLE_URL) \
     M(492, ACCESS_ENTITY_NOT_FOUND) \
     M(493, ACCESS_ENTITY_ALREADY_EXISTS) \
-    M(494, ACCESS_ENTITY_FOUND_DUPLICATES) \
     M(495, ACCESS_STORAGE_READONLY) \
     M(496, QUOTA_REQUIRES_CLIENT_KEY) \
     M(497, ACCESS_DENIED) \
@@ -475,8 +410,6 @@
     M(502, CANNOT_SIGQUEUE) \
     M(503, AGGREGATE_FUNCTION_THROW) \
     M(504, FILE_ALREADY_EXISTS) \
-    M(505, CANNOT_DELETE_DIRECTORY) \
-    M(506, UNEXPECTED_ERROR_CODE) \
     M(507, UNABLE_TO_SKIP_UNUSED_SHARDS) \
     M(508, UNKNOWN_ACCESS_TYPE) \
     M(509, INVALID_GRANT) \
@@ -501,8 +434,6 @@
     M(530, CANNOT_CONNECT_RABBITMQ) \
     M(531, CANNOT_FSTAT) \
     M(532, LDAP_ERROR) \
-    M(533, INCONSISTENT_RESERVATIONS) \
-    M(534, NO_RESERVATIONS_PROVIDED) \
     M(535, UNKNOWN_RAID_TYPE) \
     M(536, CANNOT_RESTORE_FROM_FIELD_DUMP) \
     M(537, ILLEGAL_MYSQL_VARIABLE) \
@@ -518,8 +449,6 @@
     M(547, INVALID_RAID_TYPE) \
     M(548, UNKNOWN_VOLUME) \
     M(549, DATA_TYPE_CANNOT_BE_USED_IN_KEY) \
-    M(550, CONDITIONAL_TREE_PARENT_NOT_FOUND) \
-    M(551, ILLEGAL_PROJECTION_MANIPULATOR) \
     M(552, UNRECOGNIZED_ARGUMENTS) \
     M(553, LZMA_STREAM_ENCODER_FAILED) \
     M(554, LZMA_STREAM_DECODER_FAILED) \
@@ -580,8 +509,6 @@
     M(609, FUNCTION_ALREADY_EXISTS) \
     M(610, CANNOT_DROP_FUNCTION) \
     M(611, CANNOT_CREATE_RECURSIVE_FUNCTION) \
-    M(612, OBJECT_ALREADY_STORED_ON_DISK) \
-    M(613, OBJECT_WAS_NOT_STORED_ON_DISK) \
     M(614, POSTGRESQL_CONNECTION_FAILURE) \
     M(615, CANNOT_ADVISE) \
     M(616, UNKNOWN_READ_METHOD) \
@@ -612,9 +539,7 @@
     M(641, CANNOT_APPEND_TO_FILE) \
     M(642, CANNOT_PACK_ARCHIVE) \
     M(643, CANNOT_UNPACK_ARCHIVE) \
-    M(644, REMOTE_FS_OBJECT_CACHE_ERROR) \
     M(645, NUMBER_OF_DIMENSIONS_MISMATCHED) \
-    M(646, CANNOT_BACKUP_DATABASE) \
     M(647, CANNOT_BACKUP_TABLE) \
     M(648, WRONG_DDL_RENAMING_SETTINGS) \
     M(649, INVALID_TRANSACTION) \
@@ -634,7 +559,6 @@
     M(663, INCONSISTENT_METADATA_FOR_BACKUP) \
     M(664, ACCESS_STORAGE_DOESNT_ALLOW_BACKUP) \
     M(665, CANNOT_CONNECT_NATS) \
-    M(666, CANNOT_USE_CACHE) \
     M(667, NOT_INITIALIZED) \
     M(668, INVALID_STATE) \
     M(669, NAMED_COLLECTION_DOESNT_EXIST) \
@@ -648,6 +572,14 @@
     M(677, THREAD_WAS_CANCELED) \
     M(678, IO_URING_INIT_FAILED) \
     M(679, IO_URING_SUBMIT_ERROR) \
+    M(690, MIXED_ACCESS_PARAMETER_TYPES) \
+    M(691, UNKNOWN_ELEMENT_OF_ENUM) \
+    M(692, TOO_MANY_MUTATIONS) \
+    M(693, AWS_ERROR) \
+    M(694, ASYNC_LOAD_CYCLE) \
+    M(695, ASYNC_LOAD_FAILED) \
+    M(696, ASYNC_LOAD_CANCELED) \
+    M(697, CANNOT_RESTORE_TO_NONENCRYPTED_DISK) \
     \
     M(999, KEEPER_EXCEPTION) \
     M(1000, POCO_EXCEPTION) \
diff --git a/src/Common/ErrorHandlers.h b/src/Common/ErrorHandlers.h
index f55b6c83a69..301377bff83 100644
--- a/src/Common/ErrorHandlers.h
+++ b/src/Common/ErrorHandlers.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Poco/ErrorHandler.h>
-#include <Common/logger_useful.h>
 #include <Common/Exception.h>
 
 
diff --git a/src/Common/Exception.cpp b/src/Common/Exception.cpp
index 7e7ccfa4877..20206b76225 100644
--- a/src/Common/Exception.cpp
+++ b/src/Common/Exception.cpp
@@ -15,6 +15,7 @@
 #include <Common/formatReadable.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/ErrorCodes.h>
+#include <Common/MemorySanitizer.h>
 #include <Common/SensitiveDataMasker.h>
 #include <Common/LockMemoryExceptionInThread.h>
 #include <filesystem>
@@ -96,7 +97,10 @@ Exception::Exception(CreateFromPocoTag, const Poco::Exception & exc)
     : Poco::Exception(exc.displayText(), ErrorCodes::POCO_EXCEPTION)
 {
 #ifdef STD_EXCEPTION_HAS_STACK_TRACE
-    set_stack_trace(exc.get_stack_trace_frames(), exc.get_stack_trace_size());
+    auto * stack_trace_frames = exc.get_stack_trace_frames();
+    auto stack_trace_size = exc.get_stack_trace_size();
+    __msan_unpoison(stack_trace_frames, stack_trace_size * sizeof(stack_trace_frames[0]));
+    set_stack_trace(stack_trace_frames, stack_trace_size);
 #endif
 }
 
@@ -104,7 +108,10 @@ Exception::Exception(CreateFromSTDTag, const std::exception & exc)
     : Poco::Exception(demangle(typeid(exc).name()) + ": " + String(exc.what()), ErrorCodes::STD_EXCEPTION)
 {
 #ifdef STD_EXCEPTION_HAS_STACK_TRACE
-    set_stack_trace(exc.get_stack_trace_frames(), exc.get_stack_trace_size());
+    auto * stack_trace_frames = exc.get_stack_trace_frames();
+    auto stack_trace_size = exc.get_stack_trace_size();
+    __msan_unpoison(stack_trace_frames, stack_trace_size * sizeof(stack_trace_frames[0]));
+    set_stack_trace(stack_trace_frames, stack_trace_size);
 #endif
 }
 
@@ -112,7 +119,10 @@ Exception::Exception(CreateFromSTDTag, const std::exception & exc)
 std::string getExceptionStackTraceString(const std::exception & e)
 {
 #ifdef STD_EXCEPTION_HAS_STACK_TRACE
-    return StackTrace::toString(e.get_stack_trace_frames(), 0, e.get_stack_trace_size());
+    auto * stack_trace_frames = e.get_stack_trace_frames();
+    auto stack_trace_size = e.get_stack_trace_size();
+    __msan_unpoison(stack_trace_frames, stack_trace_size * sizeof(stack_trace_frames[0]));
+    return StackTrace::toString(stack_trace_frames, 0, stack_trace_size);
 #else
     if (const auto * db_exception = dynamic_cast<const Exception *>(&e))
         return db_exception->getStackTraceString();
@@ -140,7 +150,10 @@ std::string getExceptionStackTraceString(std::exception_ptr e)
 std::string Exception::getStackTraceString() const
 {
 #ifdef STD_EXCEPTION_HAS_STACK_TRACE
-    return StackTrace::toString(get_stack_trace_frames(), 0, get_stack_trace_size());
+    auto * stack_trace_frames = get_stack_trace_frames();
+    auto stack_trace_size = get_stack_trace_size();
+    __msan_unpoison(stack_trace_frames, stack_trace_size * sizeof(stack_trace_frames[0]));
+    return StackTrace::toString(stack_trace_frames, 0, stack_trace_size);
 #else
     return trace.toString();
 #endif
@@ -156,6 +169,7 @@ Exception::FramePointers Exception::getStackFramePointers() const
         {
             frame_pointers[i] = get_stack_trace_frames()[i];
         }
+        __msan_unpoison(frame_pointers.data(), frame_pointers.size() * sizeof(frame_pointers[0]));
     }
 #else
     {
diff --git a/src/Common/Exception.h b/src/Common/Exception.h
index 8e50c1114f4..170e0d32b3c 100644
--- a/src/Common/Exception.h
+++ b/src/Common/Exception.h
@@ -4,7 +4,6 @@
 #include <vector>
 #include <memory>
 
-#include <Poco/Version.h>
 #include <Poco/Exception.h>
 
 #include <base/defines.h>
diff --git a/src/Common/FailPoint.cpp b/src/Common/FailPoint.cpp
new file mode 100644
index 00000000000..4f57e04ffea
--- /dev/null
+++ b/src/Common/FailPoint.cpp
@@ -0,0 +1,166 @@
+#include <Common/Exception.h>
+#include <Common/FailPoint.h>
+
+#include <boost/core/noncopyable.hpp>
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+#include <optional>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int LOGICAL_ERROR;
+};
+
+#if FIU_ENABLE
+static struct InitFiu
+{
+    InitFiu()
+    {
+        fiu_init(0);
+    }
+} init_fiu;
+#endif
+
+/// We should define different types of failpoints here. There are four types of them:
+/// - ONCE: the failpoint will only be triggered once.
+/// - REGULAR: the failpoint will always be triggered util disableFailPoint is called.
+/// - PAUSAEBLE_ONCE: the failpoint will be blocked one time when pauseFailPoint is called, util disableFailPoint is called.
+/// - PAUSAEBLE: the failpoint will be blocked every time when pauseFailPoint is called, util disableFailPoint is called.
+
+#define APPLY_FOR_FAILPOINTS(ONCE, REGULAR, PAUSEABLE_ONCE, PAUSEABLE) \
+    ONCE(replicated_merge_tree_commit_zk_fail_after_op) \
+    REGULAR(dummy_failpoint) \
+    PAUSEABLE_ONCE(dummy_pausable_failpoint_once) \
+    PAUSEABLE(dummy_pausable_failpoint)
+
+namespace FailPoints
+{
+#define M(NAME) extern const char(NAME)[] = #NAME "";
+APPLY_FOR_FAILPOINTS(M, M, M, M)
+#undef M
+}
+
+std::unordered_map<String, std::shared_ptr<FailPointChannel>> FailPointInjection::fail_point_wait_channels;
+std::mutex FailPointInjection::mu;
+class FailPointChannel : private boost::noncopyable
+{
+public:
+    explicit FailPointChannel(UInt64 timeout_)
+        : timeout_ms(timeout_)
+    {}
+    FailPointChannel()
+        : timeout_ms(0)
+    {}
+
+    void wait()
+    {
+        std::unique_lock lock(m);
+        if (timeout_ms == 0)
+            cv.wait(lock);
+        else
+            cv.wait_for(lock, std::chrono::milliseconds(timeout_ms));
+    }
+
+    void notifyAll()
+    {
+        std::unique_lock lock(m);
+        cv.notify_all();
+    }
+
+private:
+    UInt64 timeout_ms;
+    std::mutex m;
+    std::condition_variable cv;
+};
+
+void FailPointInjection::enablePauseFailPoint(const String & fail_point_name, UInt64 time_ms)
+{
+#define SUB_M(NAME, flags)                                                                                  \
+    if (fail_point_name == FailPoints::NAME)                                                                \
+    {                                                                                                       \
+        /* FIU_ONETIME -- Only fail once; the point of failure will be automatically disabled afterwards.*/ \
+        fiu_enable(FailPoints::NAME, 1, nullptr, flags);                                                    \
+        std::lock_guard lock(mu);                                                                           \
+        fail_point_wait_channels.try_emplace(FailPoints::NAME, std::make_shared<FailPointChannel>(time_ms));   \
+        return;                                                                                             \
+    }
+#define ONCE(NAME)
+#define REGULAR(NAME)
+#define PAUSEABLE_ONCE(NAME) SUB_M(NAME, FIU_ONETIME)
+#define PAUSEABLE(NAME) SUB_M(NAME, 0)
+    APPLY_FOR_FAILPOINTS(ONCE, REGULAR, PAUSEABLE_ONCE, PAUSEABLE)
+#undef SUB_M
+#undef ONCE
+#undef REGULAR
+#undef PAUSEABLE_ONCE
+#undef PAUSEABLE
+
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot find fail point {}", fail_point_name);
+}
+
+void FailPointInjection::pauseFailPoint(const String & fail_point_name)
+{
+    fiu_do_on(fail_point_name.c_str(), FailPointInjection::wait(fail_point_name););
+}
+
+void FailPointInjection::enableFailPoint(const String & fail_point_name)
+{
+#if FIU_ENABLE
+#define SUB_M(NAME, flags, pause)                                                                               \
+    if (fail_point_name == FailPoints::NAME)                                                                    \
+    {                                                                                                           \
+        /* FIU_ONETIME -- Only fail once; the point of failure will be automatically disabled afterwards.*/     \
+        fiu_enable(FailPoints::NAME, 1, nullptr, flags);                                                        \
+        if (pause)                                                                                               \
+        {                                                                                                       \
+            std::lock_guard lock(mu);                                                                           \
+            fail_point_wait_channels.try_emplace(FailPoints::NAME, std::make_shared<FailPointChannel>());       \
+        }                                                                                                       \
+        return;                                                                                                 \
+    }
+#define ONCE(NAME) SUB_M(NAME, FIU_ONETIME, 0)
+#define REGULAR(NAME) SUB_M(NAME, 0, 0)
+#define PAUSEABLE_ONCE(NAME) SUB_M(NAME, FIU_ONETIME, 1)
+#define PAUSEABLE(NAME) SUB_M(NAME, 0, 1)
+    APPLY_FOR_FAILPOINTS(ONCE, REGULAR, PAUSEABLE_ONCE, PAUSEABLE)
+#undef SUB_M
+#undef ONCE
+#undef REGULAR
+#undef PAUSEABLE_ONCE
+#undef PAUSEABLE
+
+#endif
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot find fail point {}", fail_point_name);
+}
+
+void FailPointInjection::disableFailPoint(const String & fail_point_name)
+{
+    std::lock_guard lock(mu);
+    if (auto iter = fail_point_wait_channels.find(fail_point_name); iter != fail_point_wait_channels.end())
+    {
+        /// can not rely on deconstruction to do the notify_all things, because
+        /// if someone wait on this, the deconstruct will never be called.
+        iter->second->notifyAll();
+        fail_point_wait_channels.erase(iter);
+    }
+    fiu_disable(fail_point_name.c_str());
+}
+
+void FailPointInjection::wait(const String & fail_point_name)
+{
+    std::unique_lock lock(mu);
+    if (auto iter = fail_point_wait_channels.find(fail_point_name); iter == fail_point_wait_channels.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can not find channel for fail point {}", fail_point_name);
+    else
+    {
+        lock.unlock();
+        auto ptr = iter->second;
+        ptr->wait();
+    }
+};
+
+}
diff --git a/src/Common/FailPoint.h b/src/Common/FailPoint.h
new file mode 100644
index 00000000000..f61863b8a1c
--- /dev/null
+++ b/src/Common/FailPoint.h
@@ -0,0 +1,53 @@
+#pragma once
+#include "config.h"
+
+#include <Common/Exception.h>
+#include <Core/Types.h>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+#pragma clang diagnostic ignored "-Wreserved-macro-identifier"
+#endif
+
+#include <fiu.h>
+#include <fiu-control.h>
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#include <any>
+#include <unordered_map>
+
+namespace DB
+{
+
+/// This is a simple named failpoint library inspired by https://github.com/pingcap/tiflash
+/// The usage is simple:
+/// 1. define failpoint with a 'failpoint_name' in FailPoint.cpp
+/// 2. inject failpoint in normal code
+///   2.1 use fiu_do_on which can inject any code blocks, when it is a regular-triggered / once-triggered failpoint
+///   2.2 use pauseFailPoint when it is a pausable failpoint
+/// 3. in test file, we can use system failpoint enable/disable 'failpoint_name'
+
+class FailPointChannel;
+class FailPointInjection
+{
+public:
+
+    static void pauseFailPoint(const String & fail_point_name);
+
+    static void enableFailPoint(const String & fail_point_name);
+
+    static void enablePauseFailPoint(const String & fail_point_name, UInt64 time);
+
+    static void disableFailPoint(const String & fail_point_name);
+
+    static void wait(const String & fail_point_name);
+
+private:
+    static std::mutex mu;
+    static std::unordered_map<String, std::shared_ptr<FailPointChannel>> fail_point_wait_channels;
+};
+}
diff --git a/src/Common/FileChecker.cpp b/src/Common/FileChecker.cpp
index aa6b9c90a4c..a6e37654ff1 100644
--- a/src/Common/FileChecker.cpp
+++ b/src/Common/FileChecker.cpp
@@ -1,5 +1,7 @@
 #include <Common/FileChecker.h>
 #include <Common/escapeForFileName.h>
+#include <Common/logger_useful.h>
+#include <Common/ErrorCodes.h>
 #include <Disks/IDisk.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>
@@ -25,7 +27,9 @@ FileChecker::FileChecker(const String & file_info_path_) : FileChecker(nullptr,
 {
 }
 
-FileChecker::FileChecker(DiskPtr disk_, const String & file_info_path_) : disk(std::move(disk_))
+FileChecker::FileChecker(DiskPtr disk_, const String & file_info_path_)
+    : disk(std::move(disk_))
+    , log(&Poco::Logger::get("FileChecker"))
 {
     setPath(file_info_path_);
     try
diff --git a/src/Common/FileChecker.h b/src/Common/FileChecker.h
index 1beab31ec8f..bb0383e4b56 100644
--- a/src/Common/FileChecker.h
+++ b/src/Common/FileChecker.h
@@ -1,8 +1,10 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 #include <Storages/CheckResults.h>
+#include <map>
+#include <base/types.h>
 
+namespace Poco { class Logger; }
 
 namespace DB
 {
@@ -46,7 +48,7 @@ private:
     size_t getRealFileSize(const String & path_) const;
 
     const DiskPtr disk;
-    const Poco::Logger * log = &Poco::Logger::get("FileChecker");
+    const Poco::Logger * log;
 
     String files_info_path;
     std::map<String, size_t> map;
diff --git a/src/Common/FunctionDocumentation.cpp b/src/Common/FunctionDocumentation.cpp
new file mode 100644
index 00000000000..2aad23b90b7
--- /dev/null
+++ b/src/Common/FunctionDocumentation.cpp
@@ -0,0 +1,44 @@
+#include <Common/FunctionDocumentation.h>
+
+namespace DB
+{
+
+std::string FunctionDocumentation::argumentsAsString() const
+{
+    std::string res;
+    for (const auto & [name, desc] : arguments)
+    {
+        res += "- " + name + ":" + desc + "\n";
+    }
+    return res;
+}
+
+std::string FunctionDocumentation::examplesAsString() const
+{
+    std::string res;
+    for (const auto & [name, query, result] : examples)
+    {
+        res += name + ":\n\n";
+        res += "``` sql\n";
+        res += query + "\n";
+        res += "```\n\n";
+        res += "``` text\n";
+        res += result + "\n";
+        res += "```\n";
+    }
+    return res;
+}
+
+std::string FunctionDocumentation::categoriesAsString() const
+{
+    if (categories.empty())
+        return "";
+
+    auto it = categories.begin();
+    std::string res = *it;
+    for (; it != categories.end(); ++it)
+        res += ", " + *it;
+    return res;
+}
+
+}
diff --git a/src/Common/Documentation.h b/src/Common/FunctionDocumentation.h
similarity index 59%
rename from src/Common/Documentation.h
rename to src/Common/FunctionDocumentation.h
index 0b0eacbeccd..52b8aed2639 100644
--- a/src/Common/Documentation.h
+++ b/src/Common/FunctionDocumentation.h
@@ -1,15 +1,14 @@
 #pragma once
 
+#include <set>
 #include <string>
 #include <vector>
-#include <map>
 
 
 namespace DB
 {
 
-/** Embedded reference documentation for high-level server components,
-  * such as SQL functions, table functions, data types, table engines, etc.
+/** Embedded reference documentation for functions.
   *
   * The advantages of embedded documentation are:
   * - it is easy to write and update with code;
@@ -34,8 +33,6 @@ namespace DB
   * - examples (queries that can be referenced from the text by names);
   * - categories - one or a few text strings like {"Mathematical", "Array Processing"};
   *
-  * Only the description is mandatory.
-  *
   * The description should be represented in Markdown (or just plaintext).
   * Some extensions for Markdown are added:
   * - [example:name] will reference to an example with the corresponding name.
@@ -43,26 +40,44 @@ namespace DB
   * Documentation does not support multiple languages.
   * The only available language is English.
   */
-struct Documentation
+struct FunctionDocumentation
 {
     using Description = std::string;
-    using ExampleName = std::string;
-    using ExampleQuery = std::string;
-    using Examples = std::map<ExampleName, ExampleQuery>;
+
+    using Syntax = std::string;
+
+    struct Argument
+    {
+        std::string name;
+        std::string description;
+    };
+    using Arguments = std::vector<Argument>;
+
+    using ReturnedValue = std::string;
+
+    struct Example
+    {
+        std::string name;
+        std::string query;
+        std::string result;
+    };
+    using Examples = std::vector<Example>;
+
     using Category = std::string;
-    using Categories = std::vector<Category>;
+    using Categories = std::set<Category>;
 
-    Description description;
-    Examples examples;
-    Categories categories;
+    using Related = std::string;
 
-    Documentation(Description description_) : description(std::move(description_)) {}
-    Documentation(Description description_, Examples examples_) : description(std::move(description_)), examples(std::move(examples_)) {}
-    Documentation(Description description_, Examples examples_, Categories categories_)
-        : description(std::move(description_)), examples(std::move(examples_)), categories(std::move(categories_)) {}
+    Description description;        /// E.g. "Returns the position (in bytes, starting at 1) of a substring needle in a string haystack."
+    Syntax syntax;                  /// E.g. "position(haystack, needle)"
+    Arguments arguments;            /// E.g. ["haystack — String in which the search is performed. String.", "needle — Substring to be searched. String."]
+    ReturnedValue returned_value;   /// E.g. "Starting position in bytes and counting from 1, if the substring was found."
+    Examples examples;              ///
+    Categories categories;          /// E.g. {"String Search"}
 
-    /// TODO: Please remove this constructor. Documentation should always be non-empty.
-    Documentation() {}
+    std::string argumentsAsString() const;
+    std::string examplesAsString() const;
+    std::string categoriesAsString() const;
 };
 
 }
diff --git a/src/Common/HashTable/ClearableHashSet.h b/src/Common/HashTable/ClearableHashSet.h
index 4cbce1a5213..657d388cbfb 100644
--- a/src/Common/HashTable/ClearableHashSet.h
+++ b/src/Common/HashTable/ClearableHashSet.h
@@ -10,6 +10,10 @@
   * Instead of this class, you could just use the pair (version, key) in the HashSet as the key
   * but then the table would accumulate all the keys that it ever stored, and it was unreasonably growing.
   * This class goes a step further and considers the keys with the old version empty in the hash table.
+  *
+  * Zero values note:
+  * A cell in ClearableHashSet can store a zero values as normal value
+  * If its version is equal to the version of the set itself, then it's not considered as empty even key's value is zero value of the corresponding type
   */
 
 
@@ -48,30 +52,6 @@ struct ClearableHashTableCell : public BaseCell
     ClearableHashTableCell(const Key & key_, const State & state) : BaseCell(key_, state), version(state.version) {}
 };
 
-using StringRefBaseCell = HashSetCellWithSavedHash<StringRef, DefaultHash<StringRef>, ClearableHashSetState>;
-
-/// specialization for StringRef to allow zero size key (empty string)
-template <>
-struct ClearableHashTableCell<StringRef, StringRefBaseCell> : public StringRefBaseCell
-{
-    using State = ClearableHashSetState;
-    using value_type = typename StringRefBaseCell::value_type;
-
-    UInt32 version;
-
-    bool isZero(const State & state) const { return version != state.version; }
-    static bool isZero(const StringRef & key_, const State & state_) { return StringRefBaseCell::isZero(key_, state_); }
-
-    /// Set the key value to zero.
-    void setZero() { version = 0; }
-
-    /// Do I need to store the zero key separately (that is, can a zero key be inserted into the hash table).
-    static constexpr bool need_zero_value_storage = true;
-
-    ClearableHashTableCell() { } /// NOLINT
-    ClearableHashTableCell(const StringRef & key_, const State & state) : StringRefBaseCell(key_, state), version(state.version) { }
-};
-
 template <
     typename Key,
     typename Hash = DefaultHash<Key>,
@@ -80,6 +60,8 @@ template <
 class ClearableHashSet
     : public HashTable<Key, ClearableHashTableCell<Key, HashTableCell<Key, Hash, ClearableHashSetState>>, Hash, Grower, Allocator>
 {
+    using Cell = ClearableHashTableCell<Key, HashTableCell<Key, Hash, ClearableHashSetState>>;
+
 public:
     using Base = HashTable<Key, ClearableHashTableCell<Key, HashTableCell<Key, Hash, ClearableHashSetState>>, Hash, Grower, Allocator>;
     using typename Base::LookupResult;
@@ -103,6 +85,8 @@ class ClearableHashSetWithSavedHash : public HashTable<
                                           Grower,
                                           Allocator>
 {
+    using Cell = ClearableHashTableCell<Key, HashSetCellWithSavedHash<Key, Hash, ClearableHashSetState>>;
+
 public:
     void clear()
     {
diff --git a/src/Common/HashTable/FixedHashTable.h b/src/Common/HashTable/FixedHashTable.h
index 7df90fd98b9..49675aaafbc 100644
--- a/src/Common/HashTable/FixedHashTable.h
+++ b/src/Common/HashTable/FixedHashTable.h
@@ -358,7 +358,7 @@ public:
         std::pair<LookupResult, bool> res;
         emplace(Cell::getKey(x), res.first, res.second);
         if (res.second)
-            insertSetMapped(res.first->getMapped(), x);
+            res.first->setMapped(x);
 
         return res;
     }
diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h
index efdc43917da..189603fcbf5 100644
--- a/src/Common/HashTable/Hash.h
+++ b/src/Common/HashTable/Hash.h
@@ -221,7 +221,7 @@ inline UInt32 updateWeakHash32(const DB::UInt8 * pos, size_t size, DB::UInt32 up
     const auto * end = pos + size;
     while (pos + 8 <= end)
     {
-        auto word = unalignedLoadLE<UInt64>(pos);
+        auto word = unalignedLoadLittleEndian<UInt64>(pos);
         updated_value = static_cast<UInt32>(intHashCRC32(word, updated_value));
 
         pos += 8;
@@ -233,7 +233,7 @@ inline UInt32 updateWeakHash32(const DB::UInt8 * pos, size_t size, DB::UInt32 up
         /// Lets' assume the string was 'abcdefghXYZ', so it's tail is 'XYZ'.
         DB::UInt8 tail_size = end - pos;
         /// Load tailing 8 bytes. Word is 'defghXYZ'.
-        auto word = unalignedLoadLE<UInt64>(end - 8);
+        auto word = unalignedLoadLittleEndian<UInt64>(end - 8);
         /// Prepare mask which will set other 5 bytes to 0. It is 0xFFFFFFFFFFFFFFFF << 5 = 0xFFFFFF0000000000.
         /// word & mask = '\0\0\0\0\0XYZ' (bytes are reversed because of little ending)
         word &= (~UInt64(0)) << DB::UInt8(8 * (8 - tail_size));
@@ -251,7 +251,10 @@ requires (sizeof(T) <= sizeof(UInt64))
 inline size_t DefaultHash64(T key)
 {
     DB::UInt64 out {0};
-    std::memcpy(&out, &key, sizeof(T));
+    if constexpr (std::endian::native == std::endian::little)
+        std::memcpy(&out, &key, sizeof(T));
+    else
+        std::memcpy(reinterpret_cast<char*>(&out) + sizeof(DB::UInt64) - sizeof(T), &key, sizeof(T));
     return intHash64(out);
 }
 
@@ -344,6 +347,8 @@ DEFINE_HASH(DB::Int256)
 DEFINE_HASH(DB::Float32)
 DEFINE_HASH(DB::Float64)
 DEFINE_HASH(DB::UUID)
+DEFINE_HASH(DB::IPv4)
+DEFINE_HASH(DB::IPv6)
 
 #undef DEFINE_HASH
 
diff --git a/src/Common/HashTable/HashMap.h b/src/Common/HashTable/HashMap.h
index f0045306fe8..5f4cb396822 100644
--- a/src/Common/HashTable/HashMap.h
+++ b/src/Common/HashTable/HashMap.h
@@ -9,6 +9,8 @@
 /** NOTE HashMap could only be used for memmoveable (position independent) types.
   * Example: std::string is not position independent in libstdc++ with C++11 ABI or in libc++.
   * Also, key in hash table must be of type, that zero bytes is compared equals to zero key.
+  *
+  * Please keep in sync with PackedHashMap.h
   */
 
 namespace DB
@@ -53,13 +55,13 @@ PairNoInit<std::decay_t<First>, std::decay_t<Second>> makePairNoInit(First && fi
 }
 
 
-template <typename Key, typename TMapped, typename Hash, typename TState = HashTableNoState>
+template <typename Key, typename TMapped, typename Hash, typename TState = HashTableNoState, typename Pair = PairNoInit<Key, TMapped>>
 struct HashMapCell
 {
     using Mapped = TMapped;
     using State = TState;
 
-    using value_type = PairNoInit<Key, Mapped>;
+    using value_type = Pair;
     using mapped_type = Mapped;
     using key_type = Key;
 
@@ -151,14 +153,14 @@ struct HashMapCell
 namespace std
 {
 
-    template <typename Key, typename TMapped, typename Hash, typename TState>
-    struct tuple_size<HashMapCell<Key, TMapped, Hash, TState>> : std::integral_constant<size_t, 2> { };
+    template <typename Key, typename TMapped, typename Hash, typename TState, typename Pair>
+    struct tuple_size<HashMapCell<Key, TMapped, Hash, TState, Pair>> : std::integral_constant<size_t, 2> { };
 
-    template <typename Key, typename TMapped, typename Hash, typename TState>
-    struct tuple_element<0, HashMapCell<Key, TMapped, Hash, TState>> { using type = Key; };
+    template <typename Key, typename TMapped, typename Hash, typename TState, typename Pair>
+    struct tuple_element<0, HashMapCell<Key, TMapped, Hash, TState, Pair>> { using type = Key; };
 
-    template <typename Key, typename TMapped, typename Hash, typename TState>
-    struct tuple_element<1, HashMapCell<Key, TMapped, Hash, TState>> { using type = TMapped; };
+    template <typename Key, typename TMapped, typename Hash, typename TState, typename Pair>
+    struct tuple_element<1, HashMapCell<Key, TMapped, Hash, TState, Pair>> { using type = TMapped; };
 }
 
 template <typename Key, typename TMapped, typename Hash, typename TState = HashTableNoState>
diff --git a/src/Common/HashTable/HashSet.h b/src/Common/HashTable/HashSet.h
index bac858b16a5..c25bfb14d9c 100644
--- a/src/Common/HashTable/HashSet.h
+++ b/src/Common/HashTable/HashSet.h
@@ -16,6 +16,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 }
 
@@ -40,6 +41,8 @@ public:
     using Base = HashTable<Key, TCell, Hash, Grower, Allocator>;
     using typename Base::LookupResult;
 
+    using Base::Base;
+
     void merge(const Self & rhs)
     {
         if (!this->hasZero() && rhs.hasZero())
@@ -60,6 +63,8 @@ public:
 
         size_t new_size = 0;
         DB::readVarUInt(new_size, rb);
+        if (new_size > 100'000'000'000)
+            throw DB::Exception(DB::ErrorCodes::TOO_LARGE_ARRAY_SIZE, "The size of serialized hash table is suspiciously large: {}", new_size);
 
         this->resize(new_size);
 
diff --git a/src/Common/HashTable/HashTable.h b/src/Common/HashTable/HashTable.h
index 5c348f936d2..ca3e88c93a2 100644
--- a/src/Common/HashTable/HashTable.h
+++ b/src/Common/HashTable/HashTable.h
@@ -42,6 +42,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int NO_AVAILABLE_DATA;
     extern const int CANNOT_ALLOCATE_MEMORY;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 }
 
@@ -74,7 +75,7 @@ template <typename T>
 bool check(const T x) { return x == T{}; }
 
 template <typename T>
-void set(T & x) { x = {}; }
+void set(T & x) { x = T{}; }
 
 }
 
@@ -116,7 +117,7 @@ inline bool bitEquals(T && a, T && b)
   * 3) Hash tables that store the key and do not have a "mapped" value, e.g. the normal HashTable.
   *    GetKey returns the key, and GetMapped returns a zero void pointer. This simplifies generic
   *    code that works with mapped values: it can overload on the return type of GetMapped(), and
-  *    doesn't need other parameters. One example is insertSetMapped() function.
+  *    doesn't need other parameters. One example is Cell::setMapped() function.
   *
   * 4) Hash tables that store both the key and the "mapped" value, e.g. HashMap. Both GetKey and
   *    GetMapped are supported.
@@ -215,17 +216,6 @@ struct HashTableCell
 
 };
 
-/**
-  * A helper function for HashTable::insert() to set the "mapped" value.
-  * Overloaded on the mapped type, does nothing if it's VoidMapped.
-  */
-template <typename ValueType>
-void insertSetMapped(VoidMapped /* dest */, const ValueType & /* src */) {}
-
-template <typename MappedType, typename ValueType>
-void insertSetMapped(MappedType & dest, const ValueType & src) { dest = src.second; }
-
-
 /** Determines the size of the hash table, and when and how much it should be resized.
   * Has very small state (one UInt8) and useful for Set-s allocated in automatic memory (see uniqExact as an example).
   */
@@ -240,6 +230,8 @@ struct HashTableGrower
     /// If collision resolution chains are contiguous, we can implement erase operation by moving the elements.
     static constexpr auto performs_linear_probing_with_single_step = true;
 
+    static constexpr size_t max_size_degree = 23;
+
     /// The size of the hash table in the cells.
     size_t bufSize() const               { return 1ULL << size_degree; }
 
@@ -258,17 +250,18 @@ struct HashTableGrower
     /// Increase the size of the hash table.
     void increaseSize()
     {
-        size_degree += size_degree >= 23 ? 1 : 2;
+        size_degree += size_degree >= max_size_degree ? 1 : 2;
     }
 
     /// Set the buffer size by the number of elements in the hash table. Used when deserializing a hash table.
     void set(size_t num_elems)
     {
-        size_degree = num_elems <= 1
-             ? initial_size_degree
-             : ((initial_size_degree > static_cast<size_t>(log2(num_elems - 1)) + 2)
-                 ? initial_size_degree
-                 : (static_cast<size_t>(log2(num_elems - 1)) + 2));
+        if (num_elems <= 1)
+            size_degree = initial_size_degree;
+        else if (initial_size_degree > static_cast<size_t>(log2(num_elems - 1)) + 2)
+            size_degree = initial_size_degree;
+        else
+            size_degree = static_cast<size_t>(log2(num_elems - 1)) + 2;
     }
 
     void setBufSize(size_t buf_size_)
@@ -280,6 +273,7 @@ struct HashTableGrower
 /** Determines the size of the hash table, and when and how much it should be resized.
   * This structure is aligned to cache line boundary and also occupies it all.
   * Precalculates some values to speed up lookups and insertion into the HashTable (and thus has bigger memory footprint than HashTableGrower).
+  * This grower assume 0.5 load factor
   */
 template <size_t initial_size_degree = 8>
 class alignas(64) HashTableGrowerWithPrecalculation
@@ -289,6 +283,7 @@ class alignas(64) HashTableGrowerWithPrecalculation
     UInt8 size_degree = initial_size_degree;
     size_t precalculated_mask = (1ULL << initial_size_degree) - 1;
     size_t precalculated_max_fill = 1ULL << (initial_size_degree - 1);
+    static constexpr size_t max_size_degree = 23;
 
 public:
     UInt8 sizeDegree() const { return size_degree; }
@@ -318,16 +313,17 @@ public:
     bool overflow(size_t elems) const { return elems > precalculated_max_fill; }
 
     /// Increase the size of the hash table.
-    void increaseSize() { increaseSizeDegree(size_degree >= 23 ? 1 : 2); }
+    void increaseSize() { increaseSizeDegree(size_degree >= max_size_degree ? 1 : 2); }
 
     /// Set the buffer size by the number of elements in the hash table. Used when deserializing a hash table.
     void set(size_t num_elems)
     {
-        size_degree = num_elems <= 1
-             ? initial_size_degree
-             : ((initial_size_degree > static_cast<size_t>(log2(num_elems - 1)) + 2)
-                 ? initial_size_degree
-                 : (static_cast<size_t>(log2(num_elems - 1)) + 2));
+        if (num_elems <= 1)
+            size_degree = initial_size_degree;
+        else if (initial_size_degree > static_cast<size_t>(log2(num_elems - 1)) + 2)
+            size_degree = initial_size_degree;
+        else
+            size_degree = static_cast<size_t>(log2(num_elems - 1)) + 2;
         increaseSizeDegree(0);
     }
 
@@ -752,6 +748,7 @@ protected:
 
 public:
     using key_type = Key;
+    using grower_type = Grower;
     using mapped_type = typename Cell::mapped_type;
     using value_type = typename Cell::value_type;
     using cell_type = Cell;
@@ -769,6 +766,14 @@ public:
         alloc(grower);
     }
 
+    explicit HashTable(const Grower & grower_)
+        : grower(grower_)
+    {
+        if (Cell::need_zero_value_storage)
+            this->zeroValue()->setZero();
+        alloc(grower);
+    }
+
     HashTable(size_t reserve_for_num_elements) /// NOLINT
     {
         if (Cell::need_zero_value_storage)
@@ -1036,7 +1041,7 @@ public:
         }
 
         if (res.second)
-            insertSetMapped(res.first->getMapped(), x);
+            res.first->setMapped(x);
 
         return res;
     }
@@ -1318,6 +1323,8 @@ public:
 
         size_t new_size = 0;
         DB::readVarUInt(new_size, rb);
+        if (new_size > 100'000'000'000)
+            throw DB::Exception(DB::ErrorCodes::TOO_LARGE_ARRAY_SIZE, "The size of serialized hash table is suspiciously large: {}", new_size);
 
         free();
         Grower new_grower = grower;
diff --git a/src/Common/HashTable/HashTableKeyHolder.h b/src/Common/HashTable/HashTableKeyHolder.h
index d10ad093af6..e2f9d80db53 100644
--- a/src/Common/HashTable/HashTableKeyHolder.h
+++ b/src/Common/HashTable/HashTableKeyHolder.h
@@ -88,8 +88,12 @@ inline StringRef & ALWAYS_INLINE keyHolderGetKey(DB::ArenaKeyHolder & holder)
 
 inline void ALWAYS_INLINE keyHolderPersistKey(DB::ArenaKeyHolder & holder)
 {
-    // Hash table shouldn't ask us to persist a zero key
-    assert(holder.key.size > 0);
+    // Normally, our hash table shouldn't ask to persist a zero key,
+    // but it can happened in the case of clearable hash table (ClearableHashSet, for example).
+    // The clearable hash table doesn't use zero storage and
+    // distinguishes empty keys by using cell version, not the value itself.
+    // So, when an empty StringRef is inserted in ClearableHashSet we'll get here key of zero size.
+    // assert(holder.key.size > 0);
     holder.key.data = holder.pool.insert(holder.key.data, holder.key.size);
 }
 
diff --git a/src/Common/HashTable/PackedHashMap.h b/src/Common/HashTable/PackedHashMap.h
new file mode 100644
index 00000000000..0d25addb58e
--- /dev/null
+++ b/src/Common/HashTable/PackedHashMap.h
@@ -0,0 +1,107 @@
+#pragma once
+
+/// Packed versions HashMap, please keep in sync with HashMap.h
+
+#include <Common/HashTable/HashMap.h>
+
+/// A pair that does not initialize the elements, if not needed.
+///
+/// NOTE: makePairNoInit() is omitted for PackedPairNoInit since it is not
+/// required for PackedHashMap (see mergeBlockWithPipe() for details)
+template <typename First, typename Second>
+struct __attribute__((packed)) PackedPairNoInit
+{
+    First first;
+    Second second;
+
+    PackedPairNoInit() {} /// NOLINT
+
+    template <typename FirstValue>
+    PackedPairNoInit(FirstValue && first_, NoInitTag)
+        : first(std::forward<FirstValue>(first_))
+    {
+    }
+
+    template <typename FirstValue, typename SecondValue>
+    PackedPairNoInit(FirstValue && first_, SecondValue && second_)
+        : first(std::forward<FirstValue>(first_))
+        , second(std::forward<SecondValue>(second_))
+    {
+    }
+};
+
+/// The difference with ZeroTraits is that PackedZeroTraits accepts PackedPairNoInit instead of Key.
+namespace PackedZeroTraits
+{
+    template <typename First, typename Second, template <typename, typename> class PackedPairNoInit>
+    bool check(const PackedPairNoInit<First, Second> p) { return p.first == First{}; }
+
+    template <typename First, typename Second, template <typename, typename> class PackedPairNoInit>
+    void set(PackedPairNoInit<First, Second> & p) { p.first = First{}; }
+}
+
+/// setZero() should be overwritten to pass the pair instead of key, to avoid
+/// "reference binding to misaligned address" errors from UBsan.
+template <typename Key, typename TMapped, typename Hash, typename TState = HashTableNoState>
+struct PackedHashMapCell : public HashMapCell<Key, TMapped, Hash, TState, PackedPairNoInit<Key, TMapped>>
+{
+    using Base = HashMapCell<Key, TMapped, Hash, TState, PackedPairNoInit<Key, TMapped>>;
+    using State = typename Base::State;
+    using value_type = typename Base::value_type;
+    using key_type = typename Base::key_type;
+    using Mapped = typename Base::Mapped;
+
+    using Base::Base;
+
+    void setZero() { PackedZeroTraits::set(this->value); }
+
+    Key getKey() const { return this->value.first; }
+    static Key getKey(const value_type & value_) { return value_.first; }
+
+    Mapped & getMapped() { return this->value.second; }
+    Mapped getMapped() const { return this->value.second; }
+    value_type getValue() const { return this->value; }
+
+    bool keyEquals(const Key key_) const { return bitEqualsByValue(this->value.first, key_); }
+    bool keyEquals(const Key key_, size_t /*hash_*/) const { return bitEqualsByValue(this->value.first, key_); }
+    bool keyEquals(const Key key_, size_t /*hash_*/, const State & /*state*/) const { return bitEqualsByValue(this->value.first, key_); }
+
+    bool isZero(const State & state) const { return isZero(this->value.first, state); }
+    static bool isZero(const Key key, const State & /*state*/) { return ZeroTraits::check(key); }
+
+    static inline bool bitEqualsByValue(key_type a, key_type b) { return a == b; }
+
+    template <size_t I>
+    auto get() const
+    {
+        if constexpr (I == 0) return this->value.first;
+        else if constexpr (I == 1) return this->value.second;
+    }
+};
+
+namespace std
+{
+    template <typename Key, typename TMapped, typename Hash, typename TState>
+    struct tuple_size<PackedHashMapCell<Key, TMapped, Hash, TState>> : std::integral_constant<size_t, 2> { };
+
+    template <typename Key, typename TMapped, typename Hash, typename TState>
+    struct tuple_element<0, PackedHashMapCell<Key, TMapped, Hash, TState>> { using type = Key; };
+
+    template <typename Key, typename TMapped, typename Hash, typename TState>
+    struct tuple_element<1, PackedHashMapCell<Key, TMapped, Hash, TState>> { using type = TMapped; };
+}
+
+/// Packed HashMap - HashMap with structure without padding
+///
+/// Sometimes padding in structure can be crucial, consider the following
+/// example <UInt64, UInt16> as <Key, Value> in this case the padding overhead
+/// is 0.375, and this can be major in case of lots of keys.
+///
+/// Note, there is no need to provide PackedHashSet, since it cannot have padding.
+template <
+    typename Key,
+    typename Mapped,
+    typename Hash = DefaultHash<Key>,
+    typename Grower = HashTableGrower<>,
+    typename Allocator = HashTableAllocator>
+using PackedHashMap = HashMapTable<Key, PackedHashMapCell<Key, Mapped, Hash, HashTableNoState>, Hash, Grower, Allocator>;
diff --git a/src/Common/HashTable/SmallTable.h b/src/Common/HashTable/SmallTable.h
index f6253c3f0b9..3229e4748ea 100644
--- a/src/Common/HashTable/SmallTable.h
+++ b/src/Common/HashTable/SmallTable.h
@@ -9,6 +9,7 @@ namespace DB
     {
         extern const int NO_AVAILABLE_DATA;
         extern const int INCORRECT_DATA;
+        extern const int TOO_LARGE_ARRAY_SIZE;
     }
 }
 
@@ -279,6 +280,8 @@ public:
 
         size_t new_size = 0;
         DB::readVarUInt(new_size, rb);
+        if (new_size > 1000'000)
+            throw DB::Exception(DB::ErrorCodes::TOO_LARGE_ARRAY_SIZE, "The size of serialized small table is suspiciously large: {}", new_size);
 
         if (new_size > capacity)
             throw DB::Exception(DB::ErrorCodes::INCORRECT_DATA, "Illegal size");
@@ -346,4 +349,3 @@ template
     size_t capacity
 >
 using SmallSet = SmallTable<Key, HashTableCell<Key, HashUnused>, capacity>;
-
diff --git a/src/Common/HashTable/TwoLevelHashTable.h b/src/Common/HashTable/TwoLevelHashTable.h
index bd4c4c366f2..a60655e4072 100644
--- a/src/Common/HashTable/TwoLevelHashTable.h
+++ b/src/Common/HashTable/TwoLevelHashTable.h
@@ -224,7 +224,7 @@ public:
         emplace(Cell::getKey(x), res.first, res.second, hash_value);
 
         if (res.second)
-            insertSetMapped(res.first->getMapped(), x);
+            res.first->setMapped(x);
 
         return res;
     }
diff --git a/src/Common/HashTable/TwoLevelStringHashMap.h b/src/Common/HashTable/TwoLevelStringHashMap.h
index 6bd8f74dbd6..31b98a952c8 100644
--- a/src/Common/HashTable/TwoLevelStringHashMap.h
+++ b/src/Common/HashTable/TwoLevelStringHashMap.h
@@ -9,7 +9,7 @@ class TwoLevelStringHashMap : public TwoLevelStringHashTable<StringHashMapSubMap
 public:
     using Key = StringRef;
     using Self = TwoLevelStringHashMap;
-    using Base = TwoLevelStringHashTable<StringHashMapSubMaps<TMapped, Allocator>, StringHashMap<TMapped, Allocator>>;
+    using Base = TwoLevelStringHashTable<StringHashMapSubMaps<TMapped, Allocator>, ImplTable<TMapped, Allocator>>;
     using LookupResult = typename Base::LookupResult;
 
     using Base::Base;
diff --git a/src/Common/ICachePolicy.h b/src/Common/ICachePolicy.h
index 4e5916f125e..9edbc77b8af 100644
--- a/src/Common/ICachePolicy.h
+++ b/src/Common/ICachePolicy.h
@@ -1,13 +1,22 @@
 #pragma once
 
+#include <Common/Exception.h>
+#include <Common/ICachePolicyUserQuota.h>
+
 #include <functional>
 #include <memory>
 #include <mutex>
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
 template <typename T>
-struct TrivialWeightFunction
+struct EqualWeightFunction
 {
     size_t operator()(const T &) const
     {
@@ -15,7 +24,7 @@ struct TrivialWeightFunction
     }
 };
 
-template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
+template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = EqualWeightFunction<TMapped>>
 class ICachePolicy
 {
 public:
@@ -24,19 +33,38 @@ public:
     using MappedPtr = std::shared_ptr<Mapped>;
     using OnWeightLossFunction = std::function<void(size_t)>;
 
-    virtual size_t weight(std::lock_guard<std::mutex> & /* cache_lock */) const = 0;
-    virtual size_t count(std::lock_guard<std::mutex> & /* cache_lock */) const = 0;
-    virtual size_t maxSize() const = 0;
-
-    virtual void reset(std::lock_guard<std::mutex> & /* cache_lock */) = 0;
-    virtual void remove(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) = 0;
-    virtual MappedPtr get(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) = 0;
-    virtual void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /* cache_lock */) = 0;
+    struct KeyMapped
+    {
+        Key key;
+        MappedPtr mapped;
+    };
 
+    explicit ICachePolicy(CachePolicyUserQuotaPtr user_quotas_) : user_quotas(std::move(user_quotas_)) {}
     virtual ~ICachePolicy() = default;
 
+    virtual size_t weight(std::lock_guard<std::mutex> & /*cache_lock*/) const = 0;
+    virtual size_t count(std::lock_guard<std::mutex> & /*cache_lock*/) const = 0;
+    virtual size_t maxSize(std::lock_guard<std::mutex>& /*cache_lock*/) const = 0;
+
+    virtual void setMaxCount(size_t /*max_count*/, std::lock_guard<std::mutex> & /* cache_lock */) { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for cache policy"); }
+    virtual void setMaxSize(size_t /*max_size_in_bytes*/, std::lock_guard<std::mutex> & /* cache_lock */) { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for cache policy"); }
+    virtual void setQuotaForUser(const String & user_name, size_t max_size_in_bytes, size_t max_entries, std::lock_guard<std::mutex> & /*cache_lock*/) { user_quotas->setQuotaForUser(user_name, max_size_in_bytes, max_entries); }
+
+    /// HashFunction usually hashes the entire key and the found key will be equal the provided key. In such cases, use get(). It is also
+    /// possible to store other, non-hashed data in the key. In that case, the found key is potentially different from the provided key.
+    /// Then use getWithKey() to also return the found key including it's non-hashed data.
+    virtual MappedPtr get(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) = 0;
+    virtual std::optional<KeyMapped> getWithKey(const Key &, std::lock_guard<std::mutex> & /*cache_lock*/) = 0;
+
+    virtual void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /*cache_lock*/) = 0;
+
+    virtual void remove(const Key & key, std::lock_guard<std::mutex> & /*cache_lock*/) = 0;
+
+    virtual void reset(std::lock_guard<std::mutex> & /*cache_lock*/) = 0;
+    virtual std::vector<KeyMapped> dump() const = 0;
+
 protected:
-    OnWeightLossFunction on_weight_loss_function = [](size_t) {};
+    CachePolicyUserQuotaPtr user_quotas;
 };
 
 }
diff --git a/src/Common/ICachePolicyUserQuota.h b/src/Common/ICachePolicyUserQuota.h
new file mode 100644
index 00000000000..717cb916f85
--- /dev/null
+++ b/src/Common/ICachePolicyUserQuota.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <base/types.h>
+
+namespace DB
+{
+
+/// Per-user quotas for usage of shared caches, used by ICachePolicy.
+/// Currently allows to limit
+/// - the maximum amount of cache memory a user may consume
+/// - the maximum number of items a user can store in the cache
+/// Note that caches usually also have global limits which restrict these values at cache level. Per-user quotas have no effect if they
+/// exceed the global thresholds.
+class ICachePolicyUserQuota
+{
+public:
+    /// Register or update the user's quota for the given resource.
+    virtual void setQuotaForUser(const String & user_name, size_t max_size_in_bytes, size_t max_entries) = 0;
+
+    /// Update the actual resource usage for the given user.
+    virtual void increaseActual(const String & user_name, size_t entry_size_in_bytes) = 0;
+    virtual void decreaseActual(const String & user_name, size_t entry_size_in_bytes) = 0;
+
+    /// Is the user allowed to write a new entry into the cache?
+    virtual bool approveWrite(const String & user_name, size_t entry_size_in_bytes) const = 0;
+
+    virtual ~ICachePolicyUserQuota() = default;
+};
+
+using CachePolicyUserQuotaPtr = std::unique_ptr<ICachePolicyUserQuota>;
+
+
+class NoCachePolicyUserQuota : public ICachePolicyUserQuota
+{
+public:
+    void setQuotaForUser(const String & /*user_name*/, size_t /*max_size_in_bytes*/, size_t /*max_entries*/) override {}
+    void increaseActual(const String & /*user_name*/, size_t /*entry_size_in_bytes*/) override {}
+    void decreaseActual(const String & /*user_name*/, size_t /*entry_size_in_bytes*/) override {}
+    bool approveWrite(const String & /*user_name*/, size_t /*entry_size_in_bytes*/) const override { return true; }
+};
+
+
+}
diff --git a/src/Common/LRUCachePolicy.h b/src/Common/LRUCachePolicy.h
index 3c069eb276b..25ad15db582 100644
--- a/src/Common/LRUCachePolicy.h
+++ b/src/Common/LRUCachePolicy.h
@@ -5,40 +5,38 @@
 #include <list>
 #include <unordered_map>
 
-#include <Common/logger_useful.h>
-
 namespace DB
 {
 /// Cache policy LRU evicts entries which are not used for a long time.
 /// WeightFunction is a functor that takes Mapped as a parameter and returns "weight" (approximate size)
 /// of that value.
-/// Cache starts to evict entries when their total weight exceeds max_size.
+/// Cache starts to evict entries when their total weight exceeds max_size_in_bytes.
 /// Value weight should not change after insertion.
 /// To work with the thread-safe implementation of this class use a class "CacheBase" with first parameter "LRU"
 /// and next parameters in the same order as in the constructor of the current class.
-template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
-class LRUCachePolicy : public ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>
+template <typename Key, typename Mapped, typename HashFunction = std::hash<Key>, typename WeightFunction = EqualWeightFunction<Mapped>>
+class LRUCachePolicy : public ICachePolicy<Key, Mapped, HashFunction, WeightFunction>
 {
 public:
-    using Key = TKey;
-    using Mapped = TMapped;
-    using MappedPtr = std::shared_ptr<Mapped>;
-
-    using Base = ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+    using Base = ICachePolicy<Key, Mapped, HashFunction, WeightFunction>;
+    using typename Base::MappedPtr;
+    using typename Base::KeyMapped;
     using typename Base::OnWeightLossFunction;
 
-    /** Initialize LRUCachePolicy with max_size and max_elements_size.
-      * max_elements_size == 0 means no elements size restrictions.
+    /** Initialize LRUCachePolicy with max_size_in_bytes and max_count.
+      * max_count == 0 means no elements size restrictions.
       */
-    explicit LRUCachePolicy(size_t max_size_, size_t max_elements_size_ = 0, OnWeightLossFunction on_weight_loss_function_ = {})
-        : max_size(std::max(static_cast<size_t>(1), max_size_)), max_elements_size(max_elements_size_)
+    LRUCachePolicy(size_t max_size_in_bytes_, size_t max_count_, OnWeightLossFunction on_weight_loss_function_)
+        : Base(std::make_unique<NoCachePolicyUserQuota>())
+        , max_size_in_bytes(std::max(1uz, max_size_in_bytes_))
+        , max_count(max_count_)
+        , on_weight_loss_function(on_weight_loss_function_)
     {
-        Base::on_weight_loss_function = on_weight_loss_function_;
     }
 
     size_t weight(std::lock_guard<std::mutex> & /* cache_lock */) const override
     {
-        return current_size;
+        return current_size_in_bytes;
     }
 
     size_t count(std::lock_guard<std::mutex> & /* cache_lock */) const override
@@ -46,16 +44,16 @@ public:
         return cells.size();
     }
 
-    size_t maxSize() const override
+    size_t maxSize(std::lock_guard<std::mutex> & /* cache_lock */) const override
     {
-        return max_size;
+        return max_size_in_bytes;
     }
 
     void reset(std::lock_guard<std::mutex> & /* cache_lock */) override
     {
         queue.clear();
         cells.clear();
-        current_size = 0;
+        current_size_in_bytes = 0;
     }
 
     void remove(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
@@ -64,7 +62,7 @@ public:
         if (it == cells.end())
             return;
         auto & cell = it->second;
-        current_size -= cell.size;
+        current_size_in_bytes -= cell.size;
         queue.erase(cell.queue_iterator);
         cells.erase(it);
     }
@@ -73,9 +71,7 @@ public:
     {
         auto it = cells.find(key);
         if (it == cells.end())
-        {
-            return MappedPtr();
-        }
+            return {};
 
         Cell & cell = it->second;
 
@@ -85,6 +81,20 @@ public:
         return cell.value;
     }
 
+    std::optional<KeyMapped> getWithKey(const Key & key, std::lock_guard<std::mutex> & /*cache_lock*/) override
+    {
+        auto it = cells.find(key);
+        if (it == cells.end())
+            return std::nullopt;
+
+        Cell & cell = it->second;
+
+        /// Move the key to the end of the queue. The iterator remains valid.
+        queue.splice(queue.end(), queue, cell.queue_iterator);
+
+        return std::make_optional<KeyMapped>({it->first, cell.value});
+    }
+
     void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /* cache_lock */) override
     {
         auto [it, inserted] = cells.emplace(std::piecewise_construct,
@@ -107,18 +117,26 @@ public:
         }
         else
         {
-            current_size -= cell.size;
+            current_size_in_bytes -= cell.size;
             queue.splice(queue.end(), queue, cell.queue_iterator);
         }
 
         cell.value = mapped;
         cell.size = cell.value ? weight_function(*cell.value) : 0;
-        current_size += cell.size;
+        current_size_in_bytes += cell.size;
 
         removeOverflow();
     }
 
-protected:
+    std::vector<KeyMapped> dump() const override
+    {
+        std::vector<KeyMapped> res;
+        for (const auto & [key, cell] : cells)
+            res.push_back({key, cell.value});
+        return res;
+    }
+
+private:
     using LRUQueue = std::list<Key>;
     using LRUQueueIterator = typename LRUQueue::iterator;
 
@@ -136,31 +154,32 @@ protected:
     Cells cells;
 
     /// Total weight of values.
-    size_t current_size = 0;
-    const size_t max_size;
-    const size_t max_elements_size;
+    size_t current_size_in_bytes = 0;
+    const size_t max_size_in_bytes;
+    const size_t max_count;
 
     WeightFunction weight_function;
+    OnWeightLossFunction on_weight_loss_function;
 
     void removeOverflow()
     {
         size_t current_weight_lost = 0;
         size_t queue_size = cells.size();
 
-        while ((current_size > max_size || (max_elements_size != 0 && queue_size > max_elements_size)) && (queue_size > 0))
+        while ((current_size_in_bytes > max_size_in_bytes || (max_count != 0 && queue_size > max_count)) && (queue_size > 0))
         {
             const Key & key = queue.front();
 
             auto it = cells.find(key);
             if (it == cells.end())
             {
-                LOG_ERROR(&Poco::Logger::get("LRUCache"), "LRUCache became inconsistent. There must be a bug in it.");
+                // Queue became inconsistent
                 abort();
             }
 
             const auto & cell = it->second;
 
-            current_size -= cell.size;
+            current_size_in_bytes -= cell.size;
             current_weight_lost += cell.size;
 
             cells.erase(it);
@@ -168,11 +187,11 @@ protected:
             --queue_size;
         }
 
-        Base::on_weight_loss_function(current_weight_lost);
+        on_weight_loss_function(current_weight_lost);
 
-        if (current_size > (1ull << 63))
+        if (current_size_in_bytes > (1ull << 63))
         {
-            LOG_ERROR(&Poco::Logger::get("LRUCache"), "LRUCache became inconsistent. There must be a bug in it.");
+            // Queue became inconsistent
             abort();
         }
     }
diff --git a/src/Common/LoggingFormatStringHelpers.cpp b/src/Common/LoggingFormatStringHelpers.cpp
index 6b2f32c06e3..85659e45791 100644
--- a/src/Common/LoggingFormatStringHelpers.cpp
+++ b/src/Common/LoggingFormatStringHelpers.cpp
@@ -1,7 +1,76 @@
 #include <Common/LoggingFormatStringHelpers.h>
+#include <Common/SipHash.h>
+#include <Common/thread_local_rng.h>
 
 [[noreturn]] void functionThatFailsCompilationOfConstevalFunctions(const char * error)
 {
     throw std::runtime_error(error);
 }
 
+std::unordered_map<UInt64, std::pair<time_t, size_t>> LogFrequencyLimiterIml::logged_messages;
+time_t LogFrequencyLimiterIml::last_cleanup = 0;
+std::mutex LogFrequencyLimiterIml::mutex;
+
+void LogFrequencyLimiterIml::log(Poco::Message & message)
+{
+    std::string_view pattern = message.getFormatString();
+    if (pattern.empty())
+    {
+        /// Do not filter messages without a format string
+        if (auto * channel = logger->getChannel())
+            channel->log(message);
+        return;
+    }
+
+    SipHash hash;
+    hash.update(logger->name());
+    /// Format strings are compile-time constants, so they are uniquely identified by pointer and size
+    hash.update(pattern.data());
+    hash.update(pattern.size());
+
+    time_t now = time(nullptr);
+    size_t skipped_similar_messages = 0;
+    bool need_cleanup;
+    bool need_log;
+
+    {
+        std::lock_guard lock(mutex);
+        need_cleanup = last_cleanup + 300 <= now;
+        auto & info = logged_messages[hash.get64()];
+        need_log = info.first + min_interval_s <= now;
+        if (need_log)
+        {
+            skipped_similar_messages = info.second;
+            info.first = now;
+            info.second = 0;
+        }
+        else
+        {
+            ++info.second;
+        }
+    }
+
+    /// We don't need all threads to do cleanup, just randomize
+    if (need_cleanup && thread_local_rng() % 100 == 0)
+        cleanup();
+
+    /// The message it too frequent, skip it for now
+    /// NOTE It's not optimal because we format the message first and only then check if we need to actually write it, see LOG_IMPL macro
+    if (!need_log)
+        return;
+
+    if (skipped_similar_messages)
+        message.appendText(fmt::format(" (skipped {} similar messages)", skipped_similar_messages));
+
+    if (auto * channel = logger->getChannel())
+        channel->log(message);
+}
+
+void LogFrequencyLimiterIml::cleanup(time_t too_old_threshold_s)
+{
+    time_t now = time(nullptr);
+    time_t old = now - too_old_threshold_s;
+    std::lock_guard lock(mutex);
+    std::erase_if(logged_messages, [old](const auto & elem) { return elem.second.first < old; });
+    last_cleanup = now;
+}
diff --git a/src/Common/LoggingFormatStringHelpers.h b/src/Common/LoggingFormatStringHelpers.h
index 2aed614bd8b..b29510a2c93 100644
--- a/src/Common/LoggingFormatStringHelpers.h
+++ b/src/Common/LoggingFormatStringHelpers.h
@@ -1,6 +1,11 @@
 #pragma once
 #include <base/defines.h>
+#include <base/types.h>
 #include <fmt/format.h>
+#include <mutex>
+#include <unordered_map>
+#include <Poco/Logger.h>
+#include <Poco/Message.h>
 
 struct PreformattedMessage;
 consteval void formatStringCheckArgsNumImpl(std::string_view str, size_t nargs);
@@ -156,3 +161,59 @@ struct CheckArgsNumHelperImpl
 
 template <typename... Args> using CheckArgsNumHelper = CheckArgsNumHelperImpl<std::type_identity_t<Args>...>;
 template <typename... Args> void formatStringCheckArgsNum(CheckArgsNumHelper<Args...>, Args &&...) {}
+
+
+/// This wrapper helps to avoid too frequent and noisy log messages.
+/// For each pair (logger_name, format_string) it remembers when such a message was logged the last time.
+/// The message will not be logged again if less than min_interval_s seconds passed since the previously logged message.
+class LogFrequencyLimiterIml
+{
+    /// Hash(logger_name, format_string) -> (last_logged_time_s, skipped_messages_count)
+    static std::unordered_map<UInt64, std::pair<time_t, size_t>> logged_messages;
+    static time_t last_cleanup;
+    static std::mutex mutex;
+
+    Poco::Logger * logger;
+    time_t min_interval_s;
+public:
+    LogFrequencyLimiterIml(Poco::Logger * logger_, time_t min_interval_s_) : logger(logger_), min_interval_s(min_interval_s_) {}
+
+    LogFrequencyLimiterIml & operator -> () { return *this; }
+    bool is(Poco::Message::Priority priority) { return logger->is(priority); }
+    LogFrequencyLimiterIml * getChannel() {return this; }
+    const String & name() const { return logger->name(); }
+
+    void log(Poco::Message & message);
+
+    /// Clears messages that were logged last time more than too_old_threshold_s seconds ago
+    static void cleanup(time_t too_old_threshold_s = 600);
+
+    Poco::Logger * getLogger() { return logger; }
+};
+
+/// This wrapper is useful to save formatted message into a String before sending it to a logger
+class LogToStrImpl
+{
+    String & out_str;
+    Poco::Logger * logger;
+    std::unique_ptr<LogFrequencyLimiterIml> maybe_nested;
+    bool propagate_to_actual_log = true;
+public:
+    LogToStrImpl(String & out_str_, Poco::Logger * logger_) : out_str(out_str_), logger(logger_) {}
+    LogToStrImpl(String & out_str_, std::unique_ptr<LogFrequencyLimiterIml> && maybe_nested_)
+        : out_str(out_str_), logger(maybe_nested_->getLogger()), maybe_nested(std::move(maybe_nested_)) {}
+    LogToStrImpl & operator -> () { return *this; }
+    bool is(Poco::Message::Priority priority) { propagate_to_actual_log &= logger->is(priority); return true; }
+    LogToStrImpl * getChannel() {return this; }
+    const String & name() const { return logger->name(); }
+    void log(Poco::Message & message)
+    {
+        out_str = message.getText();
+        if (!propagate_to_actual_log)
+            return;
+        if (maybe_nested)
+            maybe_nested->log(message);
+        else if (auto * channel = logger->getChannel())
+            channel->log(message);
+    }
+};
diff --git a/src/Common/Macros.cpp b/src/Common/Macros.cpp
index e5d4be446c1..f43fed6c499 100644
--- a/src/Common/Macros.cpp
+++ b/src/Common/Macros.cpp
@@ -1,8 +1,9 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Macros.h>
 #include <Common/Exception.h>
-#include <IO/WriteHelpers.h>
 #include <Common/logger_useful.h>
+#include <Core/ServerUUID.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
@@ -11,6 +12,8 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int SYNTAX_ERROR;
+    extern const int BAD_ARGUMENTS;
+    extern const int NO_ELEMENTS_IN_CONFIG;
 }
 
 Macros::Macros(const Poco::Util::AbstractConfiguration & config, const String & root_key, Poco::Logger * log)
@@ -95,7 +98,7 @@ String Macros::expand(const String & s,
         else if (macro_name == "uuid" && !info.expand_special_macros_only)
         {
             if (info.table_id.uuid == UUIDHelpers::Nil)
-                throw Exception(ErrorCodes::SYNTAX_ERROR, "Macro 'uuid' and empty arguments of ReplicatedMergeTree "
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Macro 'uuid' and empty arguments of ReplicatedMergeTree "
                                 "are supported only for ON CLUSTER queries with Atomic database engine");
             /// For ON CLUSTER queries we don't want to require all macros definitions in initiator's config.
             /// However, initiator must check that for cross-replication cluster zookeeper_path does not contain {uuid} macro.
@@ -105,6 +108,15 @@ String Macros::expand(const String & s,
             res += toString(info.table_id.uuid);
             info.expanded_uuid = true;
         }
+        else if (macro_name == "server_uuid")
+        {
+            auto uuid = ServerUUID::get();
+            if (UUIDHelpers::Nil == uuid)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Macro {server_uuid} expanded to zero, which means the UUID is not initialized (most likely it's not a server application)");
+            res += toString(uuid);
+            info.expanded_other = true;
+        }
         else if (info.shard && macro_name == "shard")
         {
             res += *info.shard;
@@ -125,7 +137,7 @@ String Macros::expand(const String & s,
             info.has_unknown = true;
         }
         else
-            throw Exception(ErrorCodes::SYNTAX_ERROR, "No macro '{}' in config while processing substitutions in "
+            throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "No macro '{}' in config while processing substitutions in "
                             "'{}' at '{}' or macro is not supported here", macro_name, s, toString(begin));
 
         pos = end + 1;
@@ -142,7 +154,7 @@ String Macros::getValue(const String & key) const
 {
     if (auto it = macros.find(key); it != macros.end())
         return it->second;
-    throw Exception(ErrorCodes::SYNTAX_ERROR, "No macro {} in config", key);
+    throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "No macro {} in config", key);
 }
 
 
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index 6c6aa7c6faf..81cac2617c5 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -96,12 +96,17 @@ using namespace std::chrono_literals;
 static constexpr size_t log_peak_memory_usage_every = 1ULL << 30;
 
 MemoryTracker total_memory_tracker(nullptr, VariableContext::Global);
+MemoryTracker background_memory_tracker(&total_memory_tracker, VariableContext::User, false);
 
 std::atomic<Int64> MemoryTracker::free_memory_in_allocator_arenas;
 
 MemoryTracker::MemoryTracker(VariableContext level_) : parent(&total_memory_tracker), level(level_) {}
 MemoryTracker::MemoryTracker(MemoryTracker * parent_, VariableContext level_) : parent(parent_), level(level_) {}
-
+MemoryTracker::MemoryTracker(MemoryTracker * parent_, VariableContext level_, bool log_peak_memory_usage_in_destructor_)
+    : parent(parent_)
+    , log_peak_memory_usage_in_destructor(log_peak_memory_usage_in_destructor_)
+    , level(level_)
+{}
 
 MemoryTracker::~MemoryTracker()
 {
@@ -118,7 +123,6 @@ MemoryTracker::~MemoryTracker()
     }
 }
 
-
 void MemoryTracker::logPeakMemoryUsage()
 {
     log_peak_memory_usage_in_destructor = false;
@@ -134,6 +138,47 @@ void MemoryTracker::logMemoryUsage(Int64 current) const
         "Current memory usage{}: {}.", (description ? " " + std::string(description) : ""), ReadableSize(current));
 }
 
+void MemoryTracker::injectFault() const
+{
+    if (!memoryTrackerCanThrow(level, true))
+    {
+        LOG_WARNING(&Poco::Logger::get("MemoryTracker"),
+                    "Cannot inject fault at specific point. Uncaught exceptions: {}, stack trace:\n{}",
+                    std::uncaught_exceptions(), StackTrace().toString());
+        return;
+    }
+
+    /// Prevent recursion. Exception::ctor -> std::string -> new[] -> MemoryTracker::alloc
+    MemoryTrackerBlockerInThread untrack_lock(VariableContext::Global);
+
+    ProfileEvents::increment(ProfileEvents::QueryMemoryLimitExceeded);
+    const auto * description = description_ptr.load(std::memory_order_relaxed);
+    throw DB::Exception(
+        DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED,
+        "Memory tracker{}{}: fault injected (at specific point)",
+        description ? " " : "",
+        description ? description : "");
+}
+
+void MemoryTracker::debugLogBigAllocationWithoutCheck(Int64 size [[maybe_unused]])
+{
+    /// Big allocations through allocNoThrow (without checking memory limits) may easily lead to OOM (and it's hard to debug).
+    /// Let's find them.
+#ifdef ABORT_ON_LOGICAL_ERROR
+    if (size < 0)
+        return;
+
+    constexpr Int64 threshold = 16 * 1024 * 1024;   /// The choice is arbitrary (maybe we should decrease it)
+    if (size < threshold)
+        return;
+
+    MemoryTrackerBlockerInThread blocker(VariableContext::Global);
+    LOG_TEST(&Poco::Logger::get("MemoryTracker"), "Too big allocation ({} bytes) without checking memory limits, "
+                                                   "it may lead to OOM. Stack trace: {}", size, StackTrace().toString());
+#else
+    return;     /// Avoid trash logging in release builds
+#endif
+}
 
 void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded, MemoryTracker * query_tracker)
 {
@@ -214,7 +259,10 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded, MemoryT
                 formatReadableSizeWithBinarySuffix(current_hard_limit));
         }
         else
+        {
             memory_limit_exceeded_ignored = true;
+            debugLogBigAllocationWithoutCheck(size);
+        }
     }
 
     Int64 limit_to_check = current_hard_limit;
@@ -282,7 +330,10 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded, MemoryT
             }
         }
         else
+        {
             memory_limit_exceeded_ignored = true;
+            debugLogBigAllocationWithoutCheck(size);
+        }
     }
 
     bool peak_updated = false;
@@ -302,6 +353,7 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded, MemoryT
         {
             bool log_memory_usage = false;
             peak_updated = updatePeak(will_be, log_memory_usage);
+            debugLogBigAllocationWithoutCheck(size);
         }
     }
 
@@ -481,3 +533,10 @@ void MemoryTracker::setOrRaiseProfilerLimit(Int64 value)
     while ((value == 0 || old_value < value) && !profiler_limit.compare_exchange_weak(old_value, value))
         ;
 }
+
+bool canEnqueueBackgroundTask()
+{
+    auto limit = background_memory_tracker.getSoftLimit();
+    auto amount = background_memory_tracker.get();
+    return limit == 0 || amount < limit;
+}
diff --git a/src/Common/MemoryTracker.h b/src/Common/MemoryTracker.h
index f6113d31423..4e29d40c953 100644
--- a/src/Common/MemoryTracker.h
+++ b/src/Common/MemoryTracker.h
@@ -98,6 +98,7 @@ public:
 
     explicit MemoryTracker(VariableContext level_ = VariableContext::Thread);
     explicit MemoryTracker(MemoryTracker * parent_, VariableContext level_ = VariableContext::Thread);
+    MemoryTracker(MemoryTracker * parent_, VariableContext level_, bool log_peak_memory_usage_in_destructor_);
 
     ~MemoryTracker();
 
@@ -110,6 +111,22 @@ public:
         return amount.load(std::memory_order_relaxed);
     }
 
+    // Merges and mutations may pass memory ownership to other threads thus in the end of execution
+    // MemoryTracker for background task may have a non-zero counter.
+    // This method is intended to fix the counter inside of background_memory_tracker.
+    // NOTE: We can't use alloc/free methods to do it, because they also will change the value inside
+    // of total_memory_tracker.
+    void adjustOnBackgroundTaskEnd(const MemoryTracker * child)
+    {
+        auto background_memory_consumption = child->amount.load(std::memory_order_relaxed);
+        amount.fetch_sub(background_memory_consumption, std::memory_order_relaxed);
+
+        // Also fix CurrentMetrics::MergesMutationsMemoryTracking
+        auto metric_loaded = metric.load(std::memory_order_relaxed);
+        if (metric_loaded != CurrentMetrics::end())
+            CurrentMetrics::sub(metric_loaded, background_memory_consumption);
+    }
+
     Int64 getPeak() const
     {
         return peak.load(std::memory_order_relaxed);
@@ -141,6 +158,8 @@ public:
         fault_probability = value;
     }
 
+    void injectFault() const;
+
     void setSampleProbability(double value)
     {
         sample_probability = value;
@@ -213,6 +232,11 @@ public:
 
     /// Prints info about peak memory consumption into log.
     void logPeakMemoryUsage();
+
+    void debugLogBigAllocationWithoutCheck(Int64 size [[maybe_unused]]);
 };
 
 extern MemoryTracker total_memory_tracker;
+extern MemoryTracker background_memory_tracker;
+
+bool canEnqueueBackgroundTask();
diff --git a/src/Common/NamedCollections/NamedCollections.cpp b/src/Common/NamedCollections/NamedCollections.cpp
index 5db46826b19..0a0f29a8a82 100644
--- a/src/Common/NamedCollections/NamedCollections.cpp
+++ b/src/Common/NamedCollections/NamedCollections.cpp
@@ -17,6 +17,7 @@ namespace ErrorCodes
     extern const int NAMED_COLLECTION_DOESNT_EXIST;
     extern const int NAMED_COLLECTION_ALREADY_EXISTS;
     extern const int NAMED_COLLECTION_IS_IMMUTABLE;
+    extern const int BAD_ARGUMENTS;
 }
 
 namespace Configuration = NamedCollectionConfiguration;
@@ -200,6 +201,11 @@ public:
         return std::unique_ptr<Impl>(new Impl(collection_config, keys));
     }
 
+    bool has(const Key & key) const
+    {
+        return Configuration::hasConfigValue(*config, key);
+    }
+
     template <typename T> T get(const Key & key) const
     {
         return Configuration::getConfigValue<T>(*config, key);
@@ -341,6 +347,21 @@ MutableNamedCollectionPtr NamedCollection::create(
         new NamedCollection(std::move(impl), collection_name, source_id, is_mutable));
 }
 
+bool NamedCollection::has(const Key & key) const
+{
+    std::lock_guard lock(mutex);
+    return pimpl->has(key);
+}
+
+bool NamedCollection::hasAny(const std::initializer_list<Key> & keys) const
+{
+    std::lock_guard lock(mutex);
+    for (const auto & key : keys)
+        if (pimpl->has(key))
+            return true;
+    return false;
+}
+
 template <typename T> T NamedCollection::get(const Key & key) const
 {
     std::lock_guard lock(mutex);
@@ -353,6 +374,28 @@ template <typename T> T NamedCollection::getOrDefault(const Key & key, const T &
     return pimpl->getOrDefault<T>(key, default_value);
 }
 
+template <typename T> T NamedCollection::getAny(const std::initializer_list<Key> & keys) const
+{
+    std::lock_guard lock(mutex);
+    for (const auto & key : keys)
+    {
+        if (pimpl->has(key))
+            return pimpl->get<T>(key);
+    }
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "No such keys: {}", fmt::join(keys, ", "));
+}
+
+template <typename T> T NamedCollection::getAnyOrDefault(const std::initializer_list<Key> & keys, const T & default_value) const
+{
+    std::lock_guard lock(mutex);
+    for (const auto & key : keys)
+    {
+        if (pimpl->has(key))
+            return pimpl->get<T>(key);
+    }
+    return default_value;
+}
+
 template <typename T, bool Locked> void NamedCollection::set(const Key & key, const T & value)
 {
     assertMutable();
@@ -444,6 +487,18 @@ template Int64 NamedCollection::getOrDefault<Int64>(const NamedCollection::Key &
 template Float64 NamedCollection::getOrDefault<Float64>(const NamedCollection::Key & key, const Float64 & default_value) const;
 template bool NamedCollection::getOrDefault<bool>(const NamedCollection::Key & key, const bool & default_value) const;
 
+template String NamedCollection::getAny<String>(const std::initializer_list<NamedCollection::Key> & key) const;
+template UInt64 NamedCollection::getAny<UInt64>(const std::initializer_list<NamedCollection::Key> & key) const;
+template Int64 NamedCollection::getAny<Int64>(const std::initializer_list<NamedCollection::Key> & key) const;
+template Float64 NamedCollection::getAny<Float64>(const std::initializer_list<NamedCollection::Key> & key) const;
+template bool NamedCollection::getAny<bool>(const std::initializer_list<NamedCollection::Key> & key) const;
+
+template String NamedCollection::getAnyOrDefault<String>(const std::initializer_list<NamedCollection::Key> & key, const String & default_value) const;
+template UInt64 NamedCollection::getAnyOrDefault<UInt64>(const std::initializer_list<NamedCollection::Key> & key, const UInt64 & default_value) const;
+template Int64 NamedCollection::getAnyOrDefault<Int64>(const std::initializer_list<NamedCollection::Key> & key, const Int64 & default_value) const;
+template Float64 NamedCollection::getAnyOrDefault<Float64>(const std::initializer_list<NamedCollection::Key> & key, const Float64 & default_value) const;
+template bool NamedCollection::getAnyOrDefault<bool>(const std::initializer_list<NamedCollection::Key> & key, const bool & default_value) const;
+
 template void NamedCollection::set<String, true>(const NamedCollection::Key & key, const String & value);
 template void NamedCollection::set<String, false>(const NamedCollection::Key & key, const String & value);
 template void NamedCollection::set<UInt64, true>(const NamedCollection::Key & key, const UInt64 & value);
diff --git a/src/Common/NamedCollections/NamedCollections.h b/src/Common/NamedCollections/NamedCollections.h
index 5ff9404ed69..4a0f020db21 100644
--- a/src/Common/NamedCollections/NamedCollections.h
+++ b/src/Common/NamedCollections/NamedCollections.h
@@ -33,10 +33,18 @@ public:
         SourceId source_id_,
         bool is_mutable_);
 
+    bool has(const Key & key) const;
+
+    bool hasAny(const std::initializer_list<Key> & keys) const;
+
     template <typename T> T get(const Key & key) const;
 
     template <typename T> T getOrDefault(const Key & key, const T & default_value) const;
 
+    template <typename T> T getAny(const std::initializer_list<Key> & keys) const;
+
+    template <typename T> T getAnyOrDefault(const std::initializer_list<Key> & keys, const T & default_value) const;
+
     std::unique_lock<std::mutex> lock();
 
     template <typename T, bool locked = false> void set(const Key & key, const T & value);
diff --git a/src/Common/OpenSSLHelpers.cpp b/src/Common/OpenSSLHelpers.cpp
index b72261090a5..37e049ebec5 100644
--- a/src/Common/OpenSSLHelpers.cpp
+++ b/src/Common/OpenSSLHelpers.cpp
@@ -8,7 +8,6 @@
 
 namespace DB
 {
-#pragma GCC diagnostic warning "-Wold-style-cast"
 
 std::string encodeSHA256(std::string_view text)
 {
diff --git a/src/Common/OpenTelemetryTraceContext.cpp b/src/Common/OpenTelemetryTraceContext.cpp
index b62822ceda2..9edbc462ceb 100644
--- a/src/Common/OpenTelemetryTraceContext.cpp
+++ b/src/Common/OpenTelemetryTraceContext.cpp
@@ -3,16 +3,21 @@
 #include <random>
 #include <base/getThreadId.h>
 #include <Common/Exception.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Core/Settings.h>
-#include <IO/Operators.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+#include <Common/AsyncTaskExecutor.h>
 
 namespace DB
 {
 namespace OpenTelemetry
 {
 
-thread_local TracingContextOnThread current_thread_trace_context;
+///// This code can be executed inside several fibers in one thread,
+///// we should use fiber local tracing context.
+thread_local FiberLocal<TracingContextOnThread> current_fiber_trace_context;
 
 bool Span::addAttribute(std::string_view name, UInt64 value) noexcept
 {
@@ -68,7 +73,8 @@ bool Span::addAttribute(const Exception & e) noexcept
     if (!this->isTraceEnabled())
         return false;
 
-    return addAttributeImpl("clickhouse.exception", getExceptionMessage(e, false));
+    return addAttributeImpl("clickhouse.exception", getExceptionMessage(e, false))
+        && addAttributeImpl("clickhouse.exception_code", toString(e.code()));
 }
 
 bool Span::addAttribute(std::exception_ptr e) noexcept
@@ -79,6 +85,15 @@ bool Span::addAttribute(std::exception_ptr e) noexcept
     return addAttributeImpl("clickhouse.exception", getExceptionMessage(e, false));
 }
 
+bool Span::addAttribute(const ExecutionStatus & e) noexcept
+{
+    if (!this->isTraceEnabled())
+        return false;
+
+    return addAttributeImpl("clickhouse.exception", e.message)
+        && addAttributeImpl("clickhouse.exception_code", toString(e.code));
+}
+
 bool Span::addAttributeImpl(std::string_view name, std::string_view value) noexcept
 {
     try
@@ -92,9 +107,9 @@ bool Span::addAttributeImpl(std::string_view name, std::string_view value) noexc
     return true;
 }
 
-SpanHolder::SpanHolder(std::string_view _operation_name)
+SpanHolder::SpanHolder(std::string_view _operation_name, SpanKind _kind)
 {
-    if (!current_thread_trace_context.isTraceEnabled())
+    if (!current_fiber_trace_context->isTraceEnabled())
     {
         return;
     }
@@ -102,10 +117,11 @@ SpanHolder::SpanHolder(std::string_view _operation_name)
     /// Use try-catch to make sure the ctor is exception safe.
     try
     {
-        this->trace_id = current_thread_trace_context.trace_id;
-        this->parent_span_id = current_thread_trace_context.span_id;
+        this->trace_id = current_fiber_trace_context->trace_id;
+        this->parent_span_id = current_fiber_trace_context->span_id;
         this->span_id = thread_local_rng(); // create a new id for this span
         this->operation_name = _operation_name;
+        this->kind = _kind;
         this->start_time_us
             = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
 
@@ -121,7 +137,7 @@ SpanHolder::SpanHolder(std::string_view _operation_name)
     }
 
     /// Set current span as parent of other spans created later on this thread.
-    current_thread_trace_context.span_id = this->span_id;
+    current_fiber_trace_context->span_id = this->span_id;
 }
 
 void SpanHolder::finish() noexcept
@@ -130,12 +146,12 @@ void SpanHolder::finish() noexcept
         return;
 
     // First of all, restore old value of current span.
-    assert(current_thread_trace_context.span_id == span_id);
-    current_thread_trace_context.span_id = parent_span_id;
+    assert(current_fiber_trace_context->span_id == span_id);
+    current_fiber_trace_context->span_id = parent_span_id;
 
     try
     {
-        auto log = current_thread_trace_context.span_log.lock();
+        auto log = current_fiber_trace_context->span_log.lock();
 
         /// The log might be disabled, check it before use
         if (log)
@@ -234,31 +250,31 @@ String TracingContext::composeTraceparentHeader() const
 
 void TracingContext::deserialize(ReadBuffer & buf)
 {
-    buf >> this->trace_id
-        >> "\n"
-        >> this->span_id
-        >> "\n"
-        >> this->tracestate
-        >> "\n"
-        >> this->trace_flags
-        >> "\n";
+    readUUIDText(trace_id, buf);
+    assertChar('\n', buf);
+    readIntText(span_id, buf);
+    assertChar('\n', buf);
+    readEscapedString(tracestate, buf);
+    assertChar('\n', buf);
+    readIntText(trace_flags, buf);
+    assertChar('\n', buf);
 }
 
 void TracingContext::serialize(WriteBuffer & buf) const
 {
-    buf << this->trace_id
-        << "\n"
-        << this->span_id
-        << "\n"
-        << this->tracestate
-        << "\n"
-        << this->trace_flags
-        << "\n";
+    writeUUIDText(trace_id, buf);
+    writeChar('\n', buf);
+    writeIntText(span_id, buf);
+    writeChar('\n', buf);
+    writeEscapedString(tracestate, buf);
+    writeChar('\n', buf);
+    writeIntText(trace_flags, buf);
+    writeChar('\n', buf);
 }
 
 const TracingContextOnThread & CurrentContext()
 {
-    return current_thread_trace_context;
+    return *current_fiber_trace_context;
 }
 
 void TracingContextOnThread::reset() noexcept
@@ -280,7 +296,7 @@ TracingContextHolder::TracingContextHolder(
     /// If any exception is raised during the construction, the tracing is not enabled on current thread.
     try
     {
-        if (current_thread_trace_context.isTraceEnabled())
+        if (current_fiber_trace_context->isTraceEnabled())
         {
             ///
             /// This is not the normal case,
@@ -293,15 +309,15 @@ TracingContextHolder::TracingContextHolder(
             /// So this branch ensures this class can be instantiated multiple times on one same thread safely.
             ///
             this->is_context_owner = false;
-            this->root_span.trace_id = current_thread_trace_context.trace_id;
-            this->root_span.parent_span_id = current_thread_trace_context.span_id;
+            this->root_span.trace_id = current_fiber_trace_context->trace_id;
+            this->root_span.parent_span_id = current_fiber_trace_context->span_id;
             this->root_span.span_id = thread_local_rng();
             this->root_span.operation_name = _operation_name;
             this->root_span.start_time_us
                 = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
 
             /// Set the root span as parent of other spans created on current thread
-            current_thread_trace_context.span_id = this->root_span.span_id;
+            current_fiber_trace_context->span_id = this->root_span.span_id;
             return;
         }
 
@@ -345,10 +361,10 @@ TracingContextHolder::TracingContextHolder(
     }
 
     /// Set up trace context on current thread only when the root span is successfully initialized.
-    current_thread_trace_context = _parent_trace_context;
-    current_thread_trace_context.span_id = this->root_span.span_id;
-    current_thread_trace_context.trace_flags = TRACE_FLAG_SAMPLED;
-    current_thread_trace_context.span_log = _span_log;
+    *current_fiber_trace_context = _parent_trace_context;
+    current_fiber_trace_context->span_id = this->root_span.span_id;
+    current_fiber_trace_context->trace_flags = TRACE_FLAG_SAMPLED;
+    current_fiber_trace_context->span_log = _span_log;
 }
 
 TracingContextHolder::~TracingContextHolder()
@@ -360,7 +376,7 @@ TracingContextHolder::~TracingContextHolder()
 
     try
     {
-        auto shared_span_log = current_thread_trace_context.span_log.lock();
+        auto shared_span_log = current_fiber_trace_context->span_log.lock();
         if (shared_span_log)
         {
             try
@@ -391,11 +407,11 @@ TracingContextHolder::~TracingContextHolder()
     if (this->is_context_owner)
     {
         /// Clear the context on current thread
-        current_thread_trace_context.reset();
+        current_fiber_trace_context->reset();
     }
     else
     {
-        current_thread_trace_context.span_id = this->root_span.parent_span_id;
+        current_fiber_trace_context->span_id = this->root_span.parent_span_id;
     }
 }
 
diff --git a/src/Common/OpenTelemetryTraceContext.h b/src/Common/OpenTelemetryTraceContext.h
index 64bce9e98db..ab30e3ff07d 100644
--- a/src/Common/OpenTelemetryTraceContext.h
+++ b/src/Common/OpenTelemetryTraceContext.h
@@ -9,10 +9,34 @@ struct Settings;
 class OpenTelemetrySpanLog;
 class WriteBuffer;
 class ReadBuffer;
+struct ExecutionStatus;
 
 namespace OpenTelemetry
 {
 
+/// See https://opentelemetry.io/docs/reference/specification/trace/api/#spankind
+enum SpanKind
+{
+    /// Default value. Indicates that the span represents an internal operation within an application,
+    /// as opposed to an operations with remote parents or children.
+    INTERNAL = 0,
+
+    /// Indicates that the span covers server-side handling of a synchronous RPC or other remote request.
+    /// This span is often the child of a remote CLIENT span that was expected to wait for a response.
+    SERVER   = 1,
+
+    /// Indicates that the span describes a request to some remote service.
+    /// This span is usually the parent of a remote SERVER span and does not end until the response is received.
+    CLIENT   = 2,
+
+    /// Indicates that the span describes the initiators of an asynchronous request. This parent span will often end before the corresponding child CONSUMER span, possibly even before the child span starts.
+    /// In messaging scenarios with batching, tracing individual messages requires a new PRODUCER span per message to be created.
+    PRODUCER = 3,
+
+    /// Indicates that the span describes a child of an asynchronous PRODUCER request
+    CONSUMER = 4
+};
+
 struct Span
 {
     UUID trace_id{};
@@ -21,6 +45,7 @@ struct Span
     String operation_name;
     UInt64 start_time_us = 0;
     UInt64 finish_time_us = 0;
+    SpanKind kind = INTERNAL;
     Map attributes;
 
     /// Following methods are declared as noexcept to make sure they're exception safe.
@@ -33,6 +58,7 @@ struct Span
     bool addAttribute(std::string_view name, std::function<String()> value_supplier) noexcept;
     bool addAttribute(const Exception & e) noexcept;
     bool addAttribute(std::exception_ptr e) noexcept;
+    bool addAttribute(const ExecutionStatus & e) noexcept;
 
     bool isTraceEnabled() const
     {
@@ -155,7 +181,7 @@ using TracingContextHolderPtr = std::unique_ptr<TracingContextHolder>;
 /// Once it's created or destructed, it automatically maitains the tracing context on the thread that it lives.
 struct SpanHolder : public Span
 {
-    SpanHolder(std::string_view);
+    SpanHolder(std::string_view, SpanKind _kind = INTERNAL);
     ~SpanHolder();
 
     /// Finish a span explicitly if needed.
diff --git a/src/Common/OptimizedRegularExpression.cpp b/src/Common/OptimizedRegularExpression.cpp
index 7d96feba1f3..f2fe922ef19 100644
--- a/src/Common/OptimizedRegularExpression.cpp
+++ b/src/Common/OptimizedRegularExpression.cpp
@@ -1,3 +1,4 @@
+#include <limits>
 #include <Common/Exception.h>
 #include <Common/PODArray.h>
 #include <Common/OptimizedRegularExpression.h>
@@ -14,13 +15,40 @@ namespace DB
     }
 }
 
+namespace
+{
 
-template <bool thread_safe>
-void OptimizedRegularExpressionImpl<thread_safe>::analyze(
+struct Literal
+{
+    std::string literal;
+    bool prefix; /// this literal string is the prefix of the whole string.
+    bool suffix; /// this literal string is the suffix of the whole string.
+    void clear()
+    {
+        literal.clear();
+        prefix = false;
+        suffix = false;
+    }
+};
+
+using Literals = std::vector<Literal>;
+
+size_t shortest_literal_length(const Literals & literals)
+{
+    if (literals.empty()) return 0;
+    size_t shortest = std::numeric_limits<size_t>::max();
+    for (const auto & lit : literals)
+        if (shortest > lit.literal.size())
+            shortest = lit.literal.size();
+    return shortest;
+}
+
+const char * analyzeImpl(
     std::string_view regexp,
-    std::string & required_substring,
+    const char * pos,
+    Literal & required_substring,
     bool & is_trivial,
-    bool & required_substring_is_prefix)
+    Literals & global_alternatives)
 {
     /** The expression is trivial if all the metacharacters in it are escaped.
       * The non-alternative string is
@@ -30,23 +58,109 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
       *  and also avoid substrings of the form `http://` or `www` and some other
       *   (this is the hack for typical use case in web analytics applications).
       */
-    const char * begin = regexp.data();
-    const char * pos = begin;
+    const char * begin = pos;
     const char * end = regexp.data() + regexp.size();
+    bool is_first_call = begin == regexp.data();
     int depth = 0;
     is_trivial = true;
-    required_substring_is_prefix = false;
+    bool is_prefix = true;
     required_substring.clear();
     bool has_alternative_on_depth_0 = false;
     bool has_case_insensitive_flag = false;
 
-    /// Substring with a position.
-    using Substring = std::pair<std::string, size_t>;
+    /// Substring with is_prefix.
+    using Substring = std::pair<std::string, bool>;
     using Substrings = std::vector<Substring>;
 
     Substrings trivial_substrings(1);
     Substring * last_substring = &trivial_substrings.back();
 
+    Literals cur_alternatives;
+
+    auto finish_cur_alternatives = [&]()
+    {
+        if (cur_alternatives.empty())
+            return;
+
+        if (global_alternatives.empty())
+        {
+            global_alternatives = cur_alternatives;
+            cur_alternatives.clear();
+            return;
+        }
+        /// that means current alternatives have better quality.
+        if (shortest_literal_length(global_alternatives) < shortest_literal_length(cur_alternatives))
+        {
+            global_alternatives.clear();
+            global_alternatives = cur_alternatives;
+        }
+        cur_alternatives.clear();
+    };
+
+    auto finish_non_trivial_char = [&](bool create_new_substr = true)
+    {
+        is_trivial = false;
+        if (create_new_substr)
+            is_prefix = false;
+        if (depth != 0)
+            return;
+
+        for (auto & alter : cur_alternatives)
+        {
+            if (alter.suffix)
+            {
+                alter.literal += last_substring->first;
+                alter.suffix = false;
+            }
+        }
+
+        finish_cur_alternatives();
+
+        if (!last_substring->first.empty() && create_new_substr)
+        {
+            trivial_substrings.resize(trivial_substrings.size() + 1);
+            last_substring = &trivial_substrings.back();
+        }
+    };
+
+    /// Resolve the string or alters in a group (xxxxx)
+    auto finish_group = [&](Literal & group_required_string, Literals & group_alternatives)
+    {
+        for (auto & alter : group_alternatives)
+        {
+            if (alter.prefix)
+            {
+                alter.literal = last_substring->first + alter.literal;
+                alter.prefix = is_prefix;
+            }
+        }
+
+        if (group_required_string.prefix)
+        {
+            last_substring->first += group_required_string.literal;
+            last_substring->second = is_prefix;
+        }
+        else
+        {
+            finish_non_trivial_char();
+            last_substring->first = group_required_string.literal;
+            last_substring->second = false;
+        }
+
+        is_prefix = is_prefix && group_required_string.prefix && group_required_string.suffix;
+
+        /// if we can still append, no need to finish it. e.g. abc(de)fg should capture abcdefg
+        if (!last_substring->first.empty() && !group_required_string.suffix)
+        {
+            trivial_substrings.resize(trivial_substrings.size() + 1);
+            last_substring = &trivial_substrings.back();
+        }
+
+        /// assign group alters to current alters.
+        finish_cur_alternatives();
+        cur_alternatives = std::move(group_alternatives);
+    };
+
     bool in_curly_braces = false;
     bool in_square_braces = false;
 
@@ -73,25 +187,18 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
                     case '$':
                     case '.':
                     case '[':
+                    case ']':
                     case '?':
                     case '*':
                     case '+':
+                    case '-':
                     case '{':
-                        if (depth == 0 && !in_curly_braces && !in_square_braces)
-                        {
-                            if (last_substring->first.empty())
-                                last_substring->second = pos - begin;
-                            last_substring->first.push_back(*pos);
-                        }
-                        break;
+                    case '}':
+                    case '/':
+                        goto ordinary;
                     default:
                         /// all other escape sequences are not supported
-                        is_trivial = false;
-                        if (!last_substring->first.empty())
-                        {
-                            trivial_substrings.resize(trivial_substrings.size() + 1);
-                            last_substring = &trivial_substrings.back();
-                        }
+                        finish_non_trivial_char();
                         break;
                 }
 
@@ -100,28 +207,21 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
             }
 
             case '|':
-                if (depth == 0)
-                    has_alternative_on_depth_0 = true;
                 is_trivial = false;
-                if (!in_square_braces && !last_substring->first.empty())
-                {
-                    trivial_substrings.resize(trivial_substrings.size() + 1);
-                    last_substring = &trivial_substrings.back();
-                }
+                is_prefix = false;
                 ++pos;
+                if (depth == 0)
+                {
+                    has_alternative_on_depth_0 = true;
+                    goto finish;
+                }
                 break;
 
             case '(':
+                /// bracket does not break is_prefix. for example abc(d) has a prefix 'abcd'
+                is_trivial = false;
                 if (!in_square_braces)
                 {
-                    ++depth;
-                    is_trivial = false;
-                    if (!last_substring->first.empty())
-                    {
-                        trivial_substrings.resize(trivial_substrings.size() + 1);
-                        last_substring = &trivial_substrings.back();
-                    }
-
                     /// Check for case-insensitive flag.
                     if (pos + 1 < end && pos[1] == '?')
                     {
@@ -143,6 +243,28 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
                                 break;
                         }
                     }
+                    if (pos + 2 < end && pos[1] == '?' && pos[2] == ':')
+                    {
+                        pos += 2;
+                    }
+                    Literal group_required_substr;
+                    bool group_is_trival = true;
+                    Literals group_alters;
+                    pos = analyzeImpl(regexp, pos + 1, group_required_substr, group_is_trival, group_alters);
+                    /// pos should be ')', if not, then it is not a valid regular expression
+                    if (pos == end)
+                        return pos;
+
+                    /// For ()? or ()* or (){0,1}, we can just ignore the whole group.
+                    if ((pos + 1 < end && (pos[1] == '?' || pos[1] == '*')) ||
+                        (pos + 2 < end && pos[1] == '{' && pos[2] == '0'))
+                    {
+                        finish_non_trivial_char();
+                    }
+                    else
+                    {
+                        finish_group(group_required_substr, group_alters);
+                    }
                 }
                 ++pos;
                 break;
@@ -150,12 +272,7 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
             case '[':
                 in_square_braces = true;
                 ++depth;
-                is_trivial = false;
-                if (!last_substring->first.empty())
-                {
-                    trivial_substrings.resize(trivial_substrings.size() + 1);
-                    last_substring = &trivial_substrings.back();
-                }
+                finish_non_trivial_char();
                 ++pos;
                 break;
 
@@ -163,38 +280,23 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
                 if (!in_square_braces)
                     goto ordinary;
 
-                in_square_braces = false;
                 --depth;
-                is_trivial = false;
-                if (!last_substring->first.empty())
-                {
-                    trivial_substrings.resize(trivial_substrings.size() + 1);
-                    last_substring = &trivial_substrings.back();
-                }
+                if (depth == 0)
+                    in_square_braces = false;
+                finish_non_trivial_char();
                 ++pos;
                 break;
 
             case ')':
                 if (!in_square_braces)
                 {
-                    --depth;
-                    is_trivial = false;
-                    if (!last_substring->first.empty())
-                    {
-                        trivial_substrings.resize(trivial_substrings.size() + 1);
-                        last_substring = &trivial_substrings.back();
-                    }
+                    goto finish;
                 }
                 ++pos;
                 break;
 
             case '^': case '$': case '.': case '+':
-                is_trivial = false;
-                if (!last_substring->first.empty() && !in_square_braces)
-                {
-                    trivial_substrings.resize(trivial_substrings.size() + 1);
-                    last_substring = &trivial_substrings.back();
-                }
+                finish_non_trivial_char();
                 ++pos;
                 break;
 
@@ -205,13 +307,11 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
             case '?':
                 [[fallthrough]];
             case '*':
-                is_trivial = false;
-                if (!last_substring->first.empty() && !in_square_braces)
+                if (depth == 0 && !last_substring->first.empty() && !in_square_braces)
                 {
                     last_substring->first.resize(last_substring->first.size() - 1);
-                    trivial_substrings.resize(trivial_substrings.size() + 1);
-                    last_substring = &trivial_substrings.back();
                 }
+                finish_non_trivial_char();
                 ++pos;
                 break;
 
@@ -228,21 +328,23 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
             default:
                 if (depth == 0 && !in_curly_braces && !in_square_braces)
                 {
+                    /// record the first position of last string.
                     if (last_substring->first.empty())
-                        last_substring->second = pos - begin;
+                        last_substring->second = is_prefix;
                     last_substring->first.push_back(*pos);
                 }
                 ++pos;
                 break;
         }
     }
-
-    if (last_substring && last_substring->first.empty())
-        trivial_substrings.pop_back();
+finish:
 
     if (!is_trivial)
     {
-        if (!has_alternative_on_depth_0 && !has_case_insensitive_flag)
+        finish_non_trivial_char(false);
+        /// we calculate required substring even though has_alternative_on_depth_0.
+        /// we will clear the required substring after putting it to alternatives.
+        if (!has_case_insensitive_flag)
         {
             /// We choose the non-alternative substring of the maximum length for first search.
 
@@ -262,19 +364,46 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
                 }
             }
 
-            if (max_length >= MIN_LENGTH_FOR_STRSTR)
+            if (max_length >= MIN_LENGTH_FOR_STRSTR || (!is_first_call && max_length > 0))
             {
-                required_substring = candidate_it->first;
-                required_substring_is_prefix = candidate_it->second == 0;
+                required_substring.literal = candidate_it->first;
+                required_substring.prefix = candidate_it->second;
+                required_substring.suffix = candidate_it + 1 == trivial_substrings.end();
             }
         }
     }
     else if (!trivial_substrings.empty())
     {
-        required_substring = trivial_substrings.front().first;
-        required_substring_is_prefix = trivial_substrings.front().second == 0;
+        required_substring.literal = trivial_substrings.front().first;
+        /// trivial string means the whole regex is a simple string literal, so the prefix and suffix should be true.
+        required_substring.prefix = true;
+        required_substring.suffix = true;
     }
 
+    /// if it is xxx|xxx|xxx, we should call the next xxx|xxx recursively and collect the result.
+    if (has_alternative_on_depth_0)
+    {
+        /// compare the quality of required substring and alternatives and choose the better one.
+        if (shortest_literal_length(global_alternatives) < required_substring.literal.size())
+            global_alternatives = {required_substring};
+        Literals next_alternatives;
+        /// this two vals are useless, xxx|xxx cannot be trivial nor prefix.
+        bool next_is_trivial = true;
+        pos = analyzeImpl(regexp, pos, required_substring, next_is_trivial, next_alternatives);
+        /// For xxx|xxx|xxx, we only conbine the alternatives and return a empty required_substring.
+        if (next_alternatives.empty() || shortest_literal_length(next_alternatives) < required_substring.literal.size())
+        {
+            global_alternatives.push_back(required_substring);
+        }
+        else
+        {
+            global_alternatives.insert(global_alternatives.end(), next_alternatives.begin(), next_alternatives.end());
+        }
+        required_substring.clear();
+    }
+
+    return pos;
+
 /*    std::cerr
         << "regexp: " << regexp
         << ", is_trivial: " << is_trivial
@@ -282,12 +411,31 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
         << ", required_substring_is_prefix: " << required_substring_is_prefix
         << std::endl;*/
 }
+}
 
+template <bool thread_safe>
+void OptimizedRegularExpressionImpl<thread_safe>::analyze(
+        std::string_view regexp_,
+        std::string & required_substring,
+        bool & is_trivial,
+        bool & required_substring_is_prefix,
+        std::vector<std::string> & alternatives)
+{
+    Literals alternative_literals;
+    Literal required_literal;
+    analyzeImpl(regexp_, regexp_.data(), required_literal, is_trivial, alternative_literals);
+    required_substring = std::move(required_literal.literal);
+    required_substring_is_prefix = required_literal.prefix;
+    for (auto & lit : alternative_literals)
+        alternatives.push_back(std::move(lit.literal));
+}
 
 template <bool thread_safe>
 OptimizedRegularExpressionImpl<thread_safe>::OptimizedRegularExpressionImpl(const std::string & regexp_, int options)
 {
-    analyze(regexp_, required_substring, is_trivial, required_substring_is_prefix);
+    std::vector<std::string> alternativesDummy; /// this vector extracts patterns a,b,c from pattern (a|b|c). for now it's not used.
+    analyze(regexp_, required_substring, is_trivial, required_substring_is_prefix, alternativesDummy);
+
 
     /// Just three following options are supported
     if (options & (~(RE_CASELESS | RE_NO_CAPTURE | RE_DOT_NL)))
diff --git a/src/Common/OptimizedRegularExpression.h b/src/Common/OptimizedRegularExpression.h
index d8ed1e205c8..f6b59f0a465 100644
--- a/src/Common/OptimizedRegularExpression.h
+++ b/src/Common/OptimizedRegularExpression.h
@@ -95,6 +95,15 @@ public:
         out_required_substring_is_prefix = required_substring_is_prefix;
     }
 
+    /// analyze function will extract the longest string literal or multiple alternative string literals from regexp for pre-checking if
+    /// a string contains the string literal(s). If not, we can tell this string can never match the regexp.
+    static void analyze(
+        std::string_view regexp_,
+        std::string & required_substring,
+        bool & is_trivial,
+        bool & required_substring_is_prefix,
+        std::vector<std::string> & alternatives);
+
 private:
     bool is_trivial;
     bool required_substring_is_prefix;
@@ -104,8 +113,6 @@ private:
     std::optional<DB::ASCIICaseInsensitiveStringSearcher> case_insensitive_substring_searcher;
     std::unique_ptr<RegexType> re2;
     unsigned number_of_subpatterns;
-
-    static void analyze(std::string_view regexp_, std::string & required_substring, bool & is_trivial, bool & required_substring_is_prefix);
 };
 
 using OptimizedRegularExpression = OptimizedRegularExpressionImpl<true>;
diff --git a/src/Common/OvercommitTracker.h b/src/Common/OvercommitTracker.h
index 598b877ef3c..f40a70fe7cd 100644
--- a/src/Common/OvercommitTracker.h
+++ b/src/Common/OvercommitTracker.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 #include <base/types.h>
+#include <Core/Types.h>
 #include <boost/core/noncopyable.hpp>
 #include <Poco/Logger.h>
 #include <cassert>
diff --git a/src/Common/PODArray.h b/src/Common/PODArray.h
index 6aad242649f..b126afd2a37 100644
--- a/src/Common/PODArray.h
+++ b/src/Common/PODArray.h
@@ -80,9 +80,6 @@ extern const char empty_pod_array[empty_pod_array_size];
 /** Base class that depend only on size of element, not on element itself.
   * You can static_cast to this class if you want to insert some data regardless to the actual type T.
   */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnull-dereference"
-
 template <size_t ELEMENT_SIZE, size_t initial_bytes, typename TAllocator, size_t pad_right_, size_t pad_left_>
 class PODArrayBase : private boost::noncopyable, private TAllocator    /// empty base optimization
 {
@@ -774,7 +771,6 @@ void swap(PODArray<T, initial_bytes, TAllocator, pad_right_, pad_left_> & lhs, P
 {
     lhs.swap(rhs);
 }
-#pragma GCC diagnostic pop
 
 /// Prevent implicit template instantiation of PODArray for common numeric types
 
diff --git a/src/Common/PoolBase.h b/src/Common/PoolBase.h
index 96a18ee6591..8cabb472d8f 100644
--- a/src/Common/PoolBase.h
+++ b/src/Common/PoolBase.h
@@ -7,7 +7,13 @@
 
 #include <Common/logger_useful.h>
 #include <Common/Exception.h>
+#include <Common/ProfileEvents.h>
+#include <Common/Stopwatch.h>
 
+namespace ProfileEvents
+{
+    extern const Event ConnectionPoolIsFullMicroseconds;
+}
 
 namespace DB
 {
@@ -144,12 +150,19 @@ public:
                 return Entry(*items.back());
             }
 
-            LOG_INFO(log, "No free connections in pool. Waiting.");
-
+            Stopwatch blocked;
             if (timeout < 0)
+            {
+                LOG_INFO(log, "No free connections in pool. Waiting indefinitely.");
                 available.wait(lock);
+            }
             else
-                available.wait_for(lock, std::chrono::microseconds(timeout));
+            {
+                auto timeout_ms = std::chrono::milliseconds(timeout);
+                LOG_INFO(log, "No free connections in pool. Waiting {} ms.", timeout_ms.count());
+                available.wait_for(lock, timeout_ms);
+            }
+            ProfileEvents::increment(ProfileEvents::ConnectionPoolIsFullMicroseconds, blocked.elapsedMicroseconds());
         }
     }
 
diff --git a/src/Common/PoolWithFailoverBase.h b/src/Common/PoolWithFailoverBase.h
index 0e8fbb4e6d1..646e10d6443 100644
--- a/src/Common/PoolWithFailoverBase.h
+++ b/src/Common/PoolWithFailoverBase.h
@@ -101,7 +101,7 @@ public:
     struct ShuffledPool
     {
         NestedPool * pool{};
-        const PoolState * state{};
+        const PoolState * state{}; // WARNING: valid only during initial ordering, dangling
         size_t index = 0;
         size_t error_count = 0;
         size_t slowdown_count = 0;
@@ -115,7 +115,6 @@ public:
     /// this functor. The pools with lower result value will be tried first.
     using GetPriorityFunc = std::function<size_t(size_t index)>;
 
-
     /// Returns at least min_entries and at most max_entries connections (at most one connection per nested pool).
     /// The method will throw if it is unable to get min_entries alive connections or
     /// if fallback_to_stale_replicas is false and it is unable to get min_entries connections to up-to-date replicas.
@@ -175,10 +174,11 @@ PoolWithFailoverBase<TNestedPool>::getShuffledPools(
     }
 
     /// Sort the pools into order in which they will be tried (based on respective PoolStates).
+    /// Note that `error_count` and `slowdown_count` are used for ordering, but set to zero in the resulting ShuffledPool
     std::vector<ShuffledPool> shuffled_pools;
     shuffled_pools.reserve(nested_pools.size());
     for (size_t i = 0; i < nested_pools.size(); ++i)
-        shuffled_pools.push_back(ShuffledPool{nested_pools[i].get(), &pool_states[i], i, 0});
+        shuffled_pools.push_back(ShuffledPool{nested_pools[i].get(), &pool_states[i], i, /* error_count = */ 0, /* slowdown_count = */ 0});
     ::sort(
         shuffled_pools.begin(), shuffled_pools.end(),
         [](const ShuffledPool & lhs, const ShuffledPool & rhs)
@@ -227,6 +227,10 @@ PoolWithFailoverBase<TNestedPool>::getMany(
 {
     std::vector<ShuffledPool> shuffled_pools = getShuffledPools(max_ignored_errors, get_priority);
 
+    /// Limit `max_tries` value by `max_error_cap` to avoid unlimited number of retries
+    if (max_tries > max_error_cap)
+        max_tries = max_error_cap;
+
     /// We will try to get a connection from each pool until a connection is produced or max_tries is reached.
     std::vector<TryResult> try_results(shuffled_pools.size());
     size_t entries_count = 0;
@@ -371,7 +375,7 @@ PoolWithFailoverBase<TNestedPool>::updatePoolStates(size_t max_ignored_errors)
 
     /// distributed_replica_max_ignored_errors
     for (auto & state : result)
-        state.error_count = std::max<UInt64>(0, state.error_count - max_ignored_errors);
+        state.error_count = state.error_count > max_ignored_errors ? state.error_count - max_ignored_errors : 0;
 
     return result;
 }
diff --git a/src/Common/Priority.h b/src/Common/Priority.h
new file mode 100644
index 00000000000..8952fe4dd5a
--- /dev/null
+++ b/src/Common/Priority.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <base/types.h>
+
+/// Common type for priority values.
+/// Separate type (rather than `Int64` is used just to avoid implicit conversion errors and to default-initialize
+struct Priority
+{
+    Int64 value = 0; /// Note that lower value means higher priority.
+    constexpr operator Int64() const { return value; } /// NOLINT
+};
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index 1b3ce409a00..9f4fc2d135b 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -8,8 +8,12 @@
     M(Query, "Number of queries to be interpreted and potentially executed. Does not include queries that failed to parse or were rejected due to AST size limits, quota limits or limits on the number of simultaneously running queries. May include internal queries initiated by ClickHouse itself. Does not count subqueries.") \
     M(SelectQuery, "Same as Query, but only for SELECT queries.") \
     M(InsertQuery, "Same as Query, but only for INSERT queries.") \
+    M(QueriesWithSubqueries, "Count queries with all subqueries") \
+    M(SelectQueriesWithSubqueries, "Count SELECT queries with all subqueries") \
+    M(InsertQueriesWithSubqueries, "Count INSERT queries with all subqueries") \
     M(AsyncInsertQuery, "Same as InsertQuery, but only for asynchronous INSERT queries.") \
     M(AsyncInsertBytes, "Data size in bytes of asynchronous INSERT queries.") \
+    M(AsyncInsertRows, "Number of rows inserted by asynchronous INSERT queries.") \
     M(AsyncInsertCacheHits, "Number of times a duplicate hash id has been found in asynchronous INSERT hash id cache.") \
     M(FailedQuery, "Number of failed queries.") \
     M(FailedSelectQuery, "Same as FailedQuery, but only for SELECT queries.") \
@@ -63,7 +67,7 @@
     M(DiskReadElapsedMicroseconds, "Total time spent waiting for read syscall. This include reads from page cache.") \
     M(DiskWriteElapsedMicroseconds, "Total time spent waiting for write syscall. This include writes to page cache.") \
     M(NetworkReceiveElapsedMicroseconds, "Total time spent waiting for data to receive or receiving data from network. Only ClickHouse-related network interaction is included, not by 3rd party libraries.") \
-    M(NetworkSendElapsedMicroseconds, "Total time spent waiting for data to send to network or sending data to network. Only ClickHouse-related network interaction is included, not by 3rd party libraries..") \
+    M(NetworkSendElapsedMicroseconds, "Total time spent waiting for data to send to network or sending data to network. Only ClickHouse-related network interaction is included, not by 3rd party libraries.") \
     M(NetworkReceiveBytes, "Total number of bytes received from network. Only ClickHouse-related network interaction is included, not by 3rd party libraries.") \
     M(NetworkSendBytes, "Total number of bytes send to network. Only ClickHouse-related network interaction is included, not by 3rd party libraries.") \
     \
@@ -75,10 +79,14 @@
     M(S3GetRequestThrottlerSleepMicroseconds, "Total time a query was sleeping to conform S3 GET and SELECT request throttling.") \
     M(S3PutRequestThrottlerCount, "Number of S3 PUT, COPY, POST and LIST requests passed through throttler.") \
     M(S3PutRequestThrottlerSleepMicroseconds, "Total time a query was sleeping to conform S3 PUT, COPY, POST and LIST request throttling.") \
-    M(RemoteReadThrottlerBytes, "Bytes passed through 'max_remote_read_network_bandwidth_for_server' throttler.") \
-    M(RemoteReadThrottlerSleepMicroseconds, "Total time a query was sleeping to conform 'max_remote_read_network_bandwidth_for_server' throttling.") \
-    M(RemoteWriteThrottlerBytes, "Bytes passed through 'max_remote_write_network_bandwidth_for_server' throttler.") \
-    M(RemoteWriteThrottlerSleepMicroseconds, "Total time a query was sleeping to conform 'max_remote_write_network_bandwidth_for_server' throttling.") \
+    M(RemoteReadThrottlerBytes, "Bytes passed through 'max_remote_read_network_bandwidth_for_server'/'max_remote_read_network_bandwidth' throttler.") \
+    M(RemoteReadThrottlerSleepMicroseconds, "Total time a query was sleeping to conform 'max_remote_read_network_bandwidth_for_server'/'max_remote_read_network_bandwidth' throttling.") \
+    M(RemoteWriteThrottlerBytes, "Bytes passed through 'max_remote_write_network_bandwidth_for_server'/'max_remote_write_network_bandwidth' throttler.") \
+    M(RemoteWriteThrottlerSleepMicroseconds, "Total time a query was sleeping to conform 'max_remote_write_network_bandwidth_for_server'/'max_remote_write_network_bandwidth' throttling.") \
+    M(LocalReadThrottlerBytes, "Bytes passed through 'max_local_read_bandwidth_for_server'/'max_local_read_bandwidth' throttler.") \
+    M(LocalReadThrottlerSleepMicroseconds, "Total time a query was sleeping to conform 'max_local_read_bandwidth_for_server'/'max_local_read_bandwidth' throttling.") \
+    M(LocalWriteThrottlerBytes, "Bytes passed through 'max_local_write_bandwidth_for_server'/'max_local_write_bandwidth' throttler.") \
+    M(LocalWriteThrottlerSleepMicroseconds, "Total time a query was sleeping to conform 'max_local_write_bandwidth_for_server'/'max_local_write_bandwidth' throttling.") \
     M(ThrottlerSleepMicroseconds, "Total time a query was sleeping to conform all throttling settings.") \
     \
     M(QueryMaskingRulesMatch, "Number of times query masking rules was successfully matched.") \
@@ -98,6 +106,9 @@
     M(DelayedInserts, "Number of times the INSERT of a block to a MergeTree table was throttled due to high number of active data parts for partition.") \
     M(RejectedInserts, "Number of times the INSERT of a block to a MergeTree table was rejected with 'Too many parts' exception due to high number of active data parts for partition.") \
     M(DelayedInsertsMilliseconds, "Total number of milliseconds spent while the INSERT of a block to a MergeTree table was throttled due to high number of active data parts for partition.") \
+    M(DelayedMutations, "Number of times the mutation of a MergeTree table was throttled due to high number of unfinished mutations for table.") \
+    M(RejectedMutations, "Number of times the mutation of a MergeTree table was rejected with 'Too many mutations' exception due to high number of unfinished mutations for table.") \
+    M(DelayedMutationsMilliseconds, "Total number of milliseconds spent while the mutation of a MergeTree table was throttled due to high number of unfinished mutations for table.") \
     M(DistributedDelayedInserts, "Number of times the INSERT of a block to a Distributed table was throttled due to high number of pending bytes.") \
     M(DistributedRejectedInserts, "Number of times the INSERT of a block to a Distributed table was rejected with 'Too many bytes' exception due to high number of pending bytes.") \
     M(DistributedDelayedInsertsMilliseconds, "Total number of milliseconds spent while the INSERT of a block to a Distributed table was throttled due to high number of pending bytes.") \
@@ -123,12 +134,15 @@
     M(ZooKeeperBytesSent, "Number of bytes send over network while communicating with ZooKeeper.") \
     M(ZooKeeperBytesReceived, "Number of bytes received over network while communicating with ZooKeeper.") \
     \
+    M(DistributedConnectionTries, "Total count of distributed connection attempts.") \
+    M(DistributedConnectionUsable, "Total count of successful distributed connections to a usable server (with required table, but maybe stale).") \
     M(DistributedConnectionFailTry, "Total count when distributed connection fails with retry.") \
     M(DistributedConnectionMissingTable, "Number of times we rejected a replica from a distributed query, because it did not contain a table needed for the query.") \
     M(DistributedConnectionStaleReplica, "Number of times we rejected a replica from a distributed query, because some table needed for a query had replication lag higher than the configured threshold.") \
     M(DistributedConnectionFailAtAll, "Total count when distributed connection fails after all retries finished.") \
     \
     M(HedgedRequestsChangeReplica, "Total count when timeout for changing replica expired in hedged requests.") \
+    M(SuspendSendingQueryToShard, "Total count when sending query to shard was suspended when async_query_sending_for_remote is enabled.") \
     \
     M(CompileFunction, "Number of times a compilation of generated LLVM code (to create fused function for complex expressions) was initiated.") \
     M(CompiledFunctionExecute, "Number of times a compiled function was executed.") \
@@ -166,6 +180,8 @@
     \
     M(WaitMarksLoadMicroseconds, "Time spent loading marks") \
     M(BackgroundLoadingMarksTasks, "Number of background tasks for loading marks") \
+    M(LoadedMarksCount, "Number of marks loaded (total across columns).") \
+    M(LoadedMarksMemoryBytes, "Size of in-memory representations of loaded marks.") \
     \
     M(Merge, "Number of launched background merges.") \
     M(MergedRows, "Rows read for background merges. This is the number of rows before merge.") \
@@ -180,10 +196,8 @@
     \
     M(InsertedWideParts, "Number of parts inserted in Wide format.") \
     M(InsertedCompactParts, "Number of parts inserted in Compact format.") \
-    M(InsertedInMemoryParts, "Number of parts inserted in InMemory format.") \
     M(MergedIntoWideParts, "Number of parts merged into Wide format.") \
     M(MergedIntoCompactParts, "Number of parts merged into Compact format.") \
-    M(MergedIntoInMemoryParts, "Number of parts in merged into InMemory format.") \
     \
     M(MergeTreeDataProjectionWriterRows, "Number of rows INSERTed to MergeTree tables projection.") \
     M(MergeTreeDataProjectionWriterUncompressedBytes, "Uncompressed bytes (for columns as they stored in memory) INSERTed to MergeTree tables projection.") \
@@ -243,9 +257,9 @@ The server successfully detected this situation and will download merged part fr
     M(RWLockWritersWaitMilliseconds, "Total time spent waiting for a write lock to be acquired (in a heavy RWLock).") \
     M(DNSError, "Total count of errors in DNS resolution") \
     \
-    M(RealTimeMicroseconds, "Total (wall clock) time spent in processing (queries and other tasks) threads (not that this is a sum).") \
-    M(UserTimeMicroseconds, "Total time spent in processing (queries and other tasks) threads executing CPU instructions in user space. This include time CPU pipeline was stalled due to cache misses, branch mispredictions, hyper-threading, etc.") \
-    M(SystemTimeMicroseconds, "Total time spent in processing (queries and other tasks) threads executing CPU instructions in OS kernel space. This include time CPU pipeline was stalled due to cache misses, branch mispredictions, hyper-threading, etc.") \
+    M(RealTimeMicroseconds, "Total (wall clock) time spent in processing (queries and other tasks) threads (note that this is a sum).") \
+    M(UserTimeMicroseconds, "Total time spent in processing (queries and other tasks) threads executing CPU instructions in user mode. This include time CPU pipeline was stalled due to main memory access, cache misses, branch mispredictions, hyper-threading, etc.") \
+    M(SystemTimeMicroseconds, "Total time spent in processing (queries and other tasks) threads executing CPU instructions in OS kernel mode. This is time spent in syscalls, excluding waiting time during blocking syscalls.") \
     M(MemoryOvercommitWaitTimeMicroseconds, "Total time spent in waiting for memory to be freed in OvercommitTracker.") \
     M(MemoryAllocatorPurge, "Total number of times memory allocator purge was requested") \
     M(MemoryAllocatorPurgeTimeMicroseconds, "Total number of times memory allocator purge was requested") \
@@ -347,13 +361,15 @@ The server successfully detected this situation and will download merged part fr
     M(DiskS3PutObject, "Number of DiskS3 API PutObject calls.") \
     M(DiskS3GetObject, "Number of DiskS3 API GetObject calls.") \
     \
-    M(ReadBufferFromS3Microseconds, "Time spend in reading from S3.") \
-    M(ReadBufferFromS3InitMicroseconds, "Time spend initializing connection to S3.") \
+    M(ReadBufferFromS3Microseconds, "Time spent on reading from S3.") \
+    M(ReadBufferFromS3InitMicroseconds, "Time spent initializing connection to S3.") \
     M(ReadBufferFromS3Bytes, "Bytes read from S3.") \
     M(ReadBufferFromS3RequestsErrors, "Number of exceptions while reading from S3.") \
     \
+    M(WriteBufferFromS3Microseconds, "Time spent on writing to S3.") \
     M(WriteBufferFromS3Bytes, "Bytes written to S3.") \
-    \
+    M(WriteBufferFromS3RequestsErrors, "Number of exceptions while writing to S3.") \
+    M(WriteBufferFromS3WaitInflightLimitMicroseconds, "Time spent on waiting while some of the current requests are done when its number reached the limit defined by s3_max_inflight_parts_for_one_file.") \
     M(QueryMemoryLimitExceeded, "Number of times when memory limit exceeded for query.") \
     \
     M(CachedReadBufferReadFromSourceMicroseconds, "Time reading from filesystem cache source (from remote filesystem, etc)") \
@@ -488,15 +504,26 @@ The server successfully detected this situation and will download merged part fr
     M(MergeTreeAllRangesAnnouncementsSent, "The number of announcement sent from the remote server to the initiator server about the set of data parts (for MergeTree tables). Measured on the remote server side.") \
     M(ReadTaskRequestsSentElapsedMicroseconds, "Time spent in callbacks requested from the remote server back to the initiator server to choose the read task (for s3Cluster table function and similar). Measured on the remote server side.") \
     M(MergeTreeReadTaskRequestsSentElapsedMicroseconds, "Time spent in callbacks requested from the remote server back to the initiator server to choose the read task (for MergeTree tables). Measured on the remote server side.") \
-    M(MergeTreeAllRangesAnnouncementsSentElapsedMicroseconds, "Time spent in sending the announcement from the remote server to the initiator server about the set of data parts (for MergeTree tables). Measured on the remote server side.")
+    M(MergeTreeAllRangesAnnouncementsSentElapsedMicroseconds, "Time spent in sending the announcement from the remote server to the initiator server about the set of data parts (for MergeTree tables). Measured on the remote server side.") \
+    \
+    M(ConnectionPoolIsFullMicroseconds, "Total time spent waiting for a slot in connection pool.") \
+    \
+    M(LogTest, "Number of log messages with level Test") \
+    M(LogTrace, "Number of log messages with level Trace") \
+    M(LogDebug, "Number of log messages with level Debug") \
+    M(LogInfo, "Number of log messages with level Info") \
+    M(LogWarning, "Number of log messages with level Warning") \
+    M(LogError, "Number of log messages with level Error") \
+    M(LogFatal, "Number of log messages with level Fatal") \
+
 
 namespace ProfileEvents
 {
 
-#define M(NAME, DOCUMENTATION) extern const Event NAME = __COUNTER__;
+#define M(NAME, DOCUMENTATION) extern const Event NAME = Event(__COUNTER__);
     APPLY_FOR_EVENTS(M)
 #undef M
-constexpr Event END = __COUNTER__;
+constexpr Event END = Event(__COUNTER__);
 
 /// Global variable, initialized by zeros.
 Counter global_counters_array[END] {};
@@ -518,7 +545,7 @@ void Counters::resetCounters()
 {
     if (counters)
     {
-        for (Event i = 0; i < num_counters; ++i)
+        for (Event i = Event(0); i < num_counters; ++i)
             counters[i].store(0, std::memory_order_relaxed);
     }
 }
@@ -536,7 +563,7 @@ Counters::Snapshot::Snapshot()
 Counters::Snapshot Counters::getPartiallyAtomicSnapshot() const
 {
     Snapshot res;
-    for (Event i = 0; i < num_counters; ++i)
+    for (Event i = Event(0); i < num_counters; ++i)
         res.counters_holder[i] = counters[i].load(std::memory_order_relaxed);
     return res;
 }
@@ -603,6 +630,21 @@ void Counters::incrementNoTrace(Event event, Count amount)
     } while (current != nullptr);
 }
 
+void incrementForLogMessage(Poco::Message::Priority priority)
+{
+    switch (priority)
+    {
+        case Poco::Message::PRIO_TEST: increment(LogTest); break;
+        case Poco::Message::PRIO_TRACE: increment(LogTrace); break;
+        case Poco::Message::PRIO_DEBUG: increment(LogDebug); break;
+        case Poco::Message::PRIO_INFORMATION: increment(LogInfo); break;
+        case Poco::Message::PRIO_WARNING: increment(LogWarning); break;
+        case Poco::Message::PRIO_ERROR: increment(LogError); break;
+        case Poco::Message::PRIO_FATAL: increment(LogFatal); break;
+        default: break;
+    }
+}
+
 CountersIncrement::CountersIncrement(Counters::Snapshot const & snapshot)
 {
     init();
@@ -612,7 +654,7 @@ CountersIncrement::CountersIncrement(Counters::Snapshot const & snapshot)
 CountersIncrement::CountersIncrement(Counters::Snapshot const & after, Counters::Snapshot const & before)
 {
     init();
-    for (Event i = 0; i < Counters::num_counters; ++i)
+    for (Event i = Event(0); i < Counters::num_counters; ++i)
         increment_holder[i] = static_cast<Increment>(after[i]) - static_cast<Increment>(before[i]);
 }
 
diff --git a/src/Common/ProfileEvents.h b/src/Common/ProfileEvents.h
index 867b5b551c6..39052618d22 100644
--- a/src/Common/ProfileEvents.h
+++ b/src/Common/ProfileEvents.h
@@ -1,11 +1,14 @@
 #pragma once
 
 #include <Common/VariableContext.h>
-#include "base/types.h"
+#include <base/types.h>
+#include <base/strong_typedef.h>
+#include <Poco/Message.h>
 #include <atomic>
 #include <memory>
 #include <cstddef>
 
+
 /** Implements global counters for various events happening in the application
   *  - for high level profiling.
   * See .cpp for list of events.
@@ -14,7 +17,7 @@
 namespace ProfileEvents
 {
     /// Event identifier (index in array).
-    using Event = size_t;
+    using Event = StrongTypedef<size_t, struct EventTag>;
     using Count = size_t;
     using Increment = Int64;
     using Counter = std::atomic<Count>;
@@ -110,6 +113,9 @@ namespace ProfileEvents
     /// and never sends profile event to trace log.
     void incrementNoTrace(Event event, Count amount = 1);
 
+    /// Increment a counter for log messages.
+    void incrementForLogMessage(Poco::Message::Priority priority);
+
     /// Get name of event by identifier. Returns statically allocated string.
     const char * getName(Event event);
 
diff --git a/src/Common/ProgressIndication.cpp b/src/Common/ProgressIndication.cpp
index b049edcdcf7..df8778eb0d1 100644
--- a/src/Common/ProgressIndication.cpp
+++ b/src/Common/ProgressIndication.cpp
@@ -15,24 +15,6 @@
 /// http://en.wikipedia.org/wiki/ANSI_escape_code
 #define CLEAR_TO_END_OF_LINE "\033[K"
 
-
-namespace
-{
-    constexpr UInt64 ALL_THREADS = 0;
-
-    UInt64 aggregateCPUUsageNs(DB::ThreadIdToTimeMap times)
-    {
-        constexpr UInt64 us_to_ns = 1000;
-        return us_to_ns * std::accumulate(times.begin(), times.end(), 0ull,
-        [](UInt64 acc, const auto & elem)
-        {
-            if (elem.first == ALL_THREADS)
-                return acc;
-            return acc + elem.second.time();
-        });
-    }
-}
-
 namespace DB
 {
 
@@ -58,7 +40,7 @@ void ProgressIndication::resetProgress()
     {
         std::lock_guard lock(profile_events_mutex);
         cpu_usage_meter.reset(getElapsedNanoseconds());
-        thread_data.clear();
+        hosts_data.clear();
     }
 }
 
@@ -71,25 +53,17 @@ void ProgressIndication::setFileProgressCallback(ContextMutablePtr context, Writ
     });
 }
 
-void ProgressIndication::addThreadIdToList(String const & host, UInt64 thread_id)
+void ProgressIndication::updateThreadEventData(HostToTimesMap & new_hosts_data)
 {
     std::lock_guard lock(profile_events_mutex);
 
-    auto & thread_to_times = thread_data[host];
-    if (thread_to_times.contains(thread_id))
-        return;
-    thread_to_times[thread_id] = {};
-}
-
-void ProgressIndication::updateThreadEventData(HostToThreadTimesMap & new_thread_data)
-{
-    std::lock_guard lock(profile_events_mutex);
+    constexpr UInt64 us_to_ns = 1000;
 
     UInt64 total_cpu_ns = 0;
-    for (auto & new_host_map : new_thread_data)
+    for (auto & new_host : new_hosts_data)
     {
-        total_cpu_ns += aggregateCPUUsageNs(new_host_map.second);
-        thread_data[new_host_map.first] = std::move(new_host_map.second);
+        total_cpu_ns += us_to_ns * new_host.second.time();
+        hosts_data[new_host.first] = new_host.second;
     }
     cpu_usage_meter.add(getElapsedNanoseconds(), total_cpu_ns);
 }
@@ -104,16 +78,10 @@ ProgressIndication::MemoryUsage ProgressIndication::getMemoryUsage() const
 {
     std::lock_guard lock(profile_events_mutex);
 
-    return std::accumulate(thread_data.cbegin(), thread_data.cend(), MemoryUsage{},
+    return std::accumulate(hosts_data.cbegin(), hosts_data.cend(), MemoryUsage{},
         [](MemoryUsage const & acc, auto const & host_data)
         {
-            UInt64 host_usage = 0;
-            // In ProfileEvents packets thread id 0 specifies common profiling information
-            // for all threads executing current query on specific host. So instead of summing per thread
-            // memory consumption it's enough to look for data with thread id 0.
-            if (auto it = host_data.second.find(ALL_THREADS); it != host_data.second.end())
-                host_usage = it->second.memory_usage;
-
+            UInt64 host_usage = host_data.second.memory_usage;
             return MemoryUsage{.total = acc.total + host_usage, .max = std::max(acc.max, host_usage)};
         });
 }
diff --git a/src/Common/ProgressIndication.h b/src/Common/ProgressIndication.h
index 717de5debb9..af5d69c0255 100644
--- a/src/Common/ProgressIndication.h
+++ b/src/Common/ProgressIndication.h
@@ -24,8 +24,7 @@ struct ThreadEventData
     UInt64 memory_usage = 0;
 };
 
-using ThreadIdToTimeMap = std::unordered_map<UInt64, ThreadEventData>;
-using HostToThreadTimesMap = std::unordered_map<String, ThreadIdToTimeMap>;
+using HostToTimesMap = std::unordered_map<String, ThreadEventData>;
 
 class ProgressIndication
 {
@@ -56,9 +55,7 @@ public:
     /// How much seconds passed since query execution start.
     double elapsedSeconds() const { return getElapsedNanoseconds() / 1e9; }
 
-    void addThreadIdToList(String const & host, UInt64 thread_id);
-
-    void updateThreadEventData(HostToThreadTimesMap & new_thread_data);
+    void updateThreadEventData(HostToTimesMap & new_hosts_data);
 
 private:
     double getCPUUsage();
@@ -91,7 +88,7 @@ private:
     bool write_progress_on_update = false;
 
     EventRateMeter cpu_usage_meter{static_cast<double>(clock_gettime_ns()), 2'000'000'000 /*ns*/}; // average cpu utilization last 2 second
-    HostToThreadTimesMap thread_data;
+    HostToTimesMap hosts_data;
     /// In case of all of the above:
     /// - clickhouse-local
     /// - input_format_parallel_parsing=true
@@ -99,7 +96,7 @@ private:
     ///
     /// It is possible concurrent access to the following:
     /// - writeProgress() (class properties) (guarded with progress_mutex)
-    /// - thread_data/cpu_usage_meter (guarded with profile_events_mutex)
+    /// - hosts_data/cpu_usage_meter (guarded with profile_events_mutex)
     mutable std::mutex profile_events_mutex;
     mutable std::mutex progress_mutex;
 };
diff --git a/src/Common/RWLock.cpp b/src/Common/RWLock.cpp
index c2419d0c1b7..2d0fcfa3e74 100644
--- a/src/Common/RWLock.cpp
+++ b/src/Common/RWLock.cpp
@@ -97,7 +97,7 @@ private:
   * Note: "SM" in the commentaries below stands for STATE MODIFICATION
   */
 RWLockImpl::LockHolder
-RWLockImpl::getLock(RWLockImpl::Type type, const String & query_id, const std::chrono::milliseconds & lock_timeout_ms)
+RWLockImpl::getLock(RWLockImpl::Type type, const String & query_id, const std::chrono::milliseconds & lock_timeout_ms, bool throw_in_fast_path)
 {
     const auto lock_deadline_tp =
         (lock_timeout_ms == std::chrono::milliseconds(0))
@@ -130,11 +130,19 @@ RWLockImpl::getLock(RWLockImpl::Type type, const String & query_id, const std::c
         if (owner_query_it != owner_queries.end())
         {
             if (wrlock_owner != writers_queue.end())
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "RWLockImpl::getLock(): RWLock is already locked in exclusive mode");
+            {
+                if (throw_in_fast_path)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "RWLockImpl::getLock(): RWLock is already locked in exclusive mode");
+                return nullptr;
+            }
 
             /// Lock upgrading is not supported
             if (type == Write)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "RWLockImpl::getLock(): Cannot acquire exclusive lock while RWLock is already locked");
+            {
+                if (throw_in_fast_path)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "RWLockImpl::getLock(): Cannot acquire exclusive lock while RWLock is already locked");
+                return nullptr;
+            }
 
             /// N.B. Type is Read here, query_id is not empty and it_query is a valid iterator
             ++owner_query_it->second;                                  /// SM1: nothrow
diff --git a/src/Common/RWLock.h b/src/Common/RWLock.h
index cb4cf7f9200..156e4297d81 100644
--- a/src/Common/RWLock.h
+++ b/src/Common/RWLock.h
@@ -37,7 +37,7 @@ using RWLock = std::shared_ptr<RWLockImpl>;
 ///
 /// NOTE: it is dangerous to acquire lock with NO_QUERY, because FastPath doesn't
 /// exist for this case and deadlock, described in previous note,
-/// may accur in case of recursive locking.
+/// may occur in case of recursive locking.
 class RWLockImpl : public std::enable_shared_from_this<RWLockImpl>
 {
 public:
@@ -56,7 +56,7 @@ public:
 
     /// Empty query_id means the lock is acquired from outside of query context (e.g. in a background thread).
     LockHolder getLock(Type type, const String & query_id,
-                       const std::chrono::milliseconds & lock_timeout_ms = std::chrono::milliseconds(0));
+                       const std::chrono::milliseconds & lock_timeout_ms = std::chrono::milliseconds(0), bool throw_in_fast_path = true);
 
     /// Use as query_id to acquire a lock outside the query context.
     inline static const String NO_QUERY = String();
diff --git a/src/Common/RangeGenerator.h b/src/Common/RangeGenerator.h
deleted file mode 100644
index bb68cf78e1c..00000000000
--- a/src/Common/RangeGenerator.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <optional>
-#include <cmath>
-
-namespace DB
-{
-
-class RangeGenerator
-{
-public:
-    explicit RangeGenerator(size_t total_size_, size_t range_step_, size_t range_start = 0)
-        : from(range_start), range_step(range_step_), total_size(total_size_)
-    {
-    }
-
-    size_t totalRanges() const { return static_cast<size_t>(ceil(static_cast<float>(total_size - from) / range_step)); }
-
-    using Range = std::pair<size_t, size_t>;
-
-    // return upper exclusive range of values, i.e. [from_range, to_range>
-    std::optional<Range> nextRange()
-    {
-        if (from >= total_size)
-        {
-            return std::nullopt;
-        }
-
-        auto to = from + range_step;
-        if (to >= total_size)
-        {
-            to = total_size;
-        }
-
-        Range range{from, to};
-        from = to;
-        return range;
-    }
-
-private:
-    size_t from;
-    size_t range_step;
-    size_t total_size;
-};
-
-}
diff --git a/src/Common/SLRUCachePolicy.h b/src/Common/SLRUCachePolicy.h
index e1d72aa630a..62ceda82ceb 100644
--- a/src/Common/SLRUCachePolicy.h
+++ b/src/Common/SLRUCachePolicy.h
@@ -5,8 +5,6 @@
 #include <list>
 #include <unordered_map>
 
-#include <Common/logger_useful.h>
-
 namespace DB
 {
 
@@ -14,37 +12,36 @@ namespace DB
 /// this policy protects entries which were used more then once from a sequential scan.
 /// WeightFunction is a functor that takes Mapped as a parameter and returns "weight" (approximate size)
 /// of that value.
-/// Cache starts to evict entries when their total weight exceeds max_size.
+/// Cache starts to evict entries when their total weight exceeds max_size_in_bytes.
 /// Value weight should not change after insertion.
 /// To work with the thread-safe implementation of this class use a class "CacheBase" with first parameter "SLRU"
 /// and next parameters in the same order as in the constructor of the current class.
-template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
-class SLRUCachePolicy : public ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>
+template <typename Key, typename Mapped, typename HashFunction = std::hash<Key>, typename WeightFunction = EqualWeightFunction<Mapped>>
+class SLRUCachePolicy : public ICachePolicy<Key, Mapped, HashFunction, WeightFunction>
 {
 public:
-    using Key = TKey;
-    using Mapped = TMapped;
-    using MappedPtr = std::shared_ptr<Mapped>;
-
-    using Base = ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+    using Base = ICachePolicy<Key, Mapped, HashFunction, WeightFunction>;
+    using typename Base::MappedPtr;
+    using typename Base::KeyMapped;
     using typename Base::OnWeightLossFunction;
 
-    /** Initialize SLRUCachePolicy with max_size and max_protected_size.
+    /** Initialize SLRUCachePolicy with max_size_in_bytes and max_protected_size.
       * max_protected_size shows how many of the most frequently used entries will not be evicted after a sequential scan.
       * max_protected_size == 0 means that the default protected size is equal to half of the total max size.
       */
     /// TODO: construct from special struct with cache policy parameters (also with max_protected_size).
-    SLRUCachePolicy(size_t max_size_, size_t max_elements_size_ = 0, double size_ratio = 0.5, OnWeightLossFunction on_weight_loss_function_ = {})
-        : max_protected_size(static_cast<size_t>(max_size_ * std::min(1.0, size_ratio)))
-        , max_size(max_size_)
-        , max_elements_size(max_elements_size_)
-        {
-            Base::on_weight_loss_function = on_weight_loss_function_;
-        }
+    SLRUCachePolicy(size_t max_size_in_bytes_, size_t max_count_, double size_ratio, OnWeightLossFunction on_weight_loss_function_)
+        : Base(std::make_unique<NoCachePolicyUserQuota>())
+        , max_protected_size(static_cast<size_t>(max_size_in_bytes_ * std::min(1.0, size_ratio)))
+        , max_size_in_bytes(max_size_in_bytes_)
+        , max_count(max_count_)
+        , on_weight_loss_function(on_weight_loss_function_)
+    {
+    }
 
     size_t weight(std::lock_guard<std::mutex> & /* cache_lock */) const override
     {
-        return current_size;
+        return current_size_in_bytes;
     }
 
     size_t count(std::lock_guard<std::mutex> & /* cache_lock */) const override
@@ -52,9 +49,9 @@ public:
         return cells.size();
     }
 
-    size_t maxSize() const override
+    size_t maxSize(std::lock_guard<std::mutex> & /* cache_lock */) const override
     {
-        return max_size;
+        return max_size_in_bytes;
     }
 
     void reset(std::lock_guard<std::mutex> & /* cache_lock */) override
@@ -62,7 +59,7 @@ public:
         cells.clear();
         probationary_queue.clear();
         protected_queue.clear();
-        current_size = 0;
+        current_size_in_bytes = 0;
         current_protected_size = 0;
     }
 
@@ -72,7 +69,7 @@ public:
         if (it == cells.end())
             return;
         auto & cell = it->second;
-        current_size -= cell.size;
+        current_size_in_bytes -= cell.size;
         if (cell.is_protected)
         {
             current_protected_size -= cell.size;
@@ -86,16 +83,12 @@ public:
     {
         auto it = cells.find(key);
         if (it == cells.end())
-        {
-            return MappedPtr();
-        }
+            return {};
 
         Cell & cell = it->second;
 
         if (cell.is_protected)
-        {
             protected_queue.splice(protected_queue.end(), protected_queue, cell.queue_iterator);
-        }
         else
         {
             cell.is_protected = true;
@@ -107,6 +100,27 @@ public:
         return cell.value;
     }
 
+    std::optional<KeyMapped> getWithKey(const Key & key, std::lock_guard<std::mutex> & /*cache_lock*/) override
+    {
+        auto it = cells.find(key);
+        if (it == cells.end())
+            return std::nullopt;
+
+        Cell & cell = it->second;
+
+        if (cell.is_protected)
+            protected_queue.splice(protected_queue.end(), protected_queue, cell.queue_iterator);
+        else
+        {
+            cell.is_protected = true;
+            current_protected_size += cell.size;
+            protected_queue.splice(protected_queue.end(), probationary_queue, cell.queue_iterator);
+            removeOverflow(protected_queue, max_protected_size, current_protected_size, /*is_protected=*/true);
+        }
+
+        return std::make_optional<KeyMapped>({it->first, cell.value});
+    }
+
     void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /* cache_lock */) override
     {
         auto [it, inserted] = cells.emplace(std::piecewise_construct,
@@ -129,7 +143,7 @@ public:
         }
         else
         {
-            current_size -= cell.size;
+            current_size_in_bytes -= cell.size;
             if (cell.is_protected)
             {
                 current_protected_size -= cell.size;
@@ -144,14 +158,22 @@ public:
 
         cell.value = mapped;
         cell.size = cell.value ? weight_function(*cell.value) : 0;
-        current_size += cell.size;
+        current_size_in_bytes += cell.size;
         current_protected_size += cell.is_protected ? cell.size : 0;
 
         removeOverflow(protected_queue, max_protected_size, current_protected_size, /*is_protected=*/true);
-        removeOverflow(probationary_queue, max_size, current_size, /*is_protected=*/false);
+        removeOverflow(probationary_queue, max_size_in_bytes, current_size_in_bytes, /*is_protected=*/false);
     }
 
-protected:
+    std::vector<KeyMapped> dump() const override
+    {
+        std::vector<KeyMapped> res;
+        for (const auto & [key, cell] : cells)
+            res.push_back({key, cell.value});
+        return res;
+    }
+
+private:
     using SLRUQueue = std::list<Key>;
     using SLRUQueueIterator = typename SLRUQueue::iterator;
 
@@ -171,12 +193,13 @@ protected:
     Cells cells;
 
     size_t current_protected_size = 0;
-    size_t current_size = 0;
+    size_t current_size_in_bytes = 0;
     const size_t max_protected_size;
-    const size_t max_size;
-    const size_t max_elements_size;
+    const size_t max_size_in_bytes;
+    const size_t max_count;
 
     WeightFunction weight_function;
+    OnWeightLossFunction on_weight_loss_function;
 
     void removeOverflow(SLRUQueue & queue, const size_t max_weight_size, size_t & current_weight_size, bool is_protected)
     {
@@ -188,11 +211,11 @@ protected:
         {
             /// Check if after remove all elements from probationary part there will be no more than max elements
             /// in protected queue and weight of all protected elements will be less then max protected weight.
-            /// It's not possible to check only cells.size() > max_elements_size
+            /// It's not possible to check only cells.size() > max_count
             /// because protected elements move to probationary part and still remain in cache.
             need_remove = [&]()
             {
-                return ((max_elements_size != 0 && cells.size() - probationary_queue.size() > max_elements_size)
+                return ((max_count != 0 && cells.size() - probationary_queue.size() > max_count)
                 || (current_weight_size > max_weight_size)) && (queue_size > 0);
             };
         }
@@ -200,7 +223,7 @@ protected:
         {
             need_remove = [&]()
             {
-                return ((max_elements_size != 0 && cells.size() > max_elements_size)
+                return ((max_count != 0 && cells.size() > max_count)
                 || (current_weight_size > max_weight_size)) && (queue_size > 0);
             };
         }
@@ -212,7 +235,7 @@ protected:
             auto it = cells.find(key);
             if (it == cells.end())
             {
-                LOG_ERROR(&Poco::Logger::get("SLRUCache"), "SLRUCache became inconsistent. There must be a bug in it.");
+                // Queue became inconsistent
                 abort();
             }
 
@@ -236,13 +259,11 @@ protected:
         }
 
         if (!is_protected)
-        {
-            Base::on_weight_loss_function(current_weight_lost);
-        }
+            on_weight_loss_function(current_weight_lost);
 
-        if (current_size > (1ull << 63))
+        if (current_size_in_bytes > (1ull << 63))
         {
-            LOG_ERROR(&Poco::Logger::get("SLRUCache"), "SLRUCache became inconsistent. There must be a bug in it.");
+            // Queue became inconsistent
             abort();
         }
     }
diff --git a/src/Common/SensitiveDataMasker.cpp b/src/Common/SensitiveDataMasker.cpp
index 5336b48524f..34db78d00fb 100644
--- a/src/Common/SensitiveDataMasker.cpp
+++ b/src/Common/SensitiveDataMasker.cpp
@@ -202,8 +202,16 @@ std::string wipeSensitiveDataAndCutToLength(const std::string & str, size_t max_
     if (auto * masker = SensitiveDataMasker::getInstance())
         masker->wipeSensitiveData(res);
 
-    if (max_length && (res.length() > max_length))
+    size_t length = res.length();
+    if (max_length && (length > max_length))
+    {
+        constexpr size_t max_extra_msg_len = sizeof("... (truncated 18446744073709551615 characters)");
+        if (max_length < max_extra_msg_len)
+            return "(removed " + std::to_string(length) + " characters)";
+        max_length -= max_extra_msg_len;
         res.resize(max_length);
+        res.append("... (truncated " + std::to_string(length - max_length) +  " characters)");
+    }
 
     return res;
 }
diff --git a/src/Common/SipHash.h b/src/Common/SipHash.h
index 404f4390aec..9e6479d81c1 100644
--- a/src/Common/SipHash.h
+++ b/src/Common/SipHash.h
@@ -13,6 +13,7 @@
   * (~ 700 MB/sec, 15 million strings per second)
   */
 
+#include <bit>
 #include <string>
 #include <type_traits>
 #include <Core/Defines.h>
@@ -21,6 +22,7 @@
 #include <base/unaligned.h>
 #include <Common/Exception.h>
 
+
 namespace DB
 {
 namespace ErrorCodes
@@ -29,15 +31,13 @@ namespace ErrorCodes
 }
 }
 
-#define ROTL(x, b) static_cast<UInt64>(((x) << (b)) | ((x) >> (64 - (b))))
-
 #define SIPROUND                                                  \
     do                                                            \
     {                                                             \
-        v0 += v1; v1 = ROTL(v1, 13); v1 ^= v0; v0 = ROTL(v0, 32); \
-        v2 += v3; v3 = ROTL(v3, 16); v3 ^= v2;                    \
-        v0 += v3; v3 = ROTL(v3, 21); v3 ^= v0;                    \
-        v2 += v1; v1 = ROTL(v1, 17); v1 ^= v2; v2 = ROTL(v2, 32); \
+        v0 += v1; v1 = std::rotl(v1, 13); v1 ^= v0; v0 = std::rotl(v0, 32); \
+        v2 += v3; v3 = std::rotl(v3, 16); v3 ^= v2;                    \
+        v0 += v3; v3 = std::rotl(v3, 21); v3 ^= v0;                    \
+        v2 += v1; v1 = std::rotl(v1, 17); v1 ^= v2; v2 = std::rotl(v2, 32); \
     } while(0)
 
 /// Define macro CURRENT_BYTES_IDX for building index used in current_bytes array
@@ -136,7 +136,7 @@ public:
 
         while (data + 8 <= end)
         {
-            current_word = unalignedLoadLE<UInt64>(data);
+            current_word = unalignedLoadLittleEndian<UInt64>(data);
 
             v3 ^= current_word;
             SIPROUND;
@@ -164,7 +164,16 @@ public:
     template <typename T>
     ALWAYS_INLINE void update(const T & x)
     {
-        update(reinterpret_cast<const char *>(&x), sizeof(x)); /// NOLINT
+        if constexpr (std::endian::native == std::endian::big)
+        {
+            T rev_x = x;
+            char *start = reinterpret_cast<char *>(&rev_x);
+            char *end = start + sizeof(T);
+            std::reverse(start, end);
+            update(reinterpret_cast<const char *>(&rev_x), sizeof(rev_x)); /// NOLINT
+        }
+        else
+            update(reinterpret_cast<const char *>(&x), sizeof(x)); /// NOLINT
     }
 
     ALWAYS_INLINE void update(const std::string & x)
@@ -233,14 +242,16 @@ public:
         SIPROUND;
         SIPROUND;
         auto hi = v0 ^ v1 ^ v2 ^ v3;
+
         if constexpr (std::endian::native == std::endian::big)
         {
-            lo = __builtin_bswap64(lo);
-            hi = __builtin_bswap64(hi);
+            lo = std::byteswap(lo);
+            hi = std::byteswap(hi);
             auto tmp = hi;
             hi = lo;
             lo = tmp;
         }
+
         UInt128 res = hi;
         res <<= 64;
         res |= lo;
diff --git a/src/Common/SpaceSaving.h b/src/Common/SpaceSaving.h
index 84494e25ca5..3452402ba82 100644
--- a/src/Common/SpaceSaving.h
+++ b/src/Common/SpaceSaving.h
@@ -51,6 +51,9 @@ struct SpaceSavingArena<StringRef>
 {
     StringRef emplace(StringRef key)
     {
+        if (!key.data)
+            return key;
+
         return copyStringInArena(arena, key);
     }
 
@@ -160,12 +163,11 @@ public:
         // Key doesn't exist, but can fit in the top K
         if (unlikely(size() < capacity()))
         {
-            auto * c = new Counter(arena.emplace(key), increment, error, hash);
-            push(c);
+            push(std::make_unique<Counter>(arena.emplace(key), increment, error, hash));
             return;
         }
 
-        auto * min = counter_list.back();
+        auto & min = counter_list.back();
         // The key doesn't exist and cannot fit in the current top K, but
         // the new key has a bigger weight and is virtually more present
         // compared to the element who is less present on the set. This part
@@ -173,7 +175,7 @@ public:
         if (increment > min->count)
         {
             destroyLastElement();
-            push(new Counter(arena.emplace(key), increment, error, hash));
+            push(std::make_unique<Counter>(arena.emplace(key), increment, error, hash));
             return;
         }
 
@@ -189,7 +191,7 @@ public:
         alpha_map[min->hash & alpha_mask] = min->count;
         destroyLastElement();
 
-        push(new Counter(arena.emplace(key), alpha + increment, alpha + error, hash));
+        push(std::make_unique<Counter>(arena.emplace(key), alpha + increment, alpha + error, hash));
     }
 
     /*
@@ -219,7 +221,7 @@ public:
          */
         if (m2 > 0)
         {
-            for (auto * counter : counter_list)
+            for (auto & counter : counter_list)
             {
                 counter->count += m2;
                 counter->error += m2;
@@ -227,7 +229,7 @@ public:
         }
 
         // The list is sorted in descending order, we have to scan in reverse
-        for (auto * counter : boost::adaptors::reverse(rhs.counter_list))
+        for (auto & counter : boost::adaptors::reverse(rhs.counter_list))
         {
             size_t hash = counter_map.hash(counter->key);
             if (auto * current = findCounter(counter->key, hash))
@@ -239,19 +241,16 @@ public:
             else
             {
                 // Counters not monitored in S1
-                counter_list.push_back(new Counter(arena.emplace(counter->key), counter->count + m1, counter->error + m1, hash));
+                counter_list.push_back(std::make_unique<Counter>(arena.emplace(counter->key), counter->count + m1, counter->error + m1, hash));
             }
         }
 
-        ::sort(counter_list.begin(), counter_list.end(), [](Counter * l, Counter * r) { return *l > *r; });
+        ::sort(counter_list.begin(), counter_list.end(), [](const auto & l, const auto & r) { return *l > *r; });
 
         if (counter_list.size() > m_capacity)
         {
             for (size_t i = m_capacity; i < counter_list.size(); ++i)
-            {
                 arena.free(counter_list[i]->key);
-                delete counter_list[i];
-            }
             counter_list.resize(m_capacity);
         }
 
@@ -263,7 +262,7 @@ public:
     std::vector<Counter> topK(size_t k) const
     {
         std::vector<Counter> res;
-        for (auto * counter : counter_list)
+        for (auto & counter : counter_list)
         {
             res.push_back(*counter);
             if (res.size() == k)
@@ -275,7 +274,7 @@ public:
     void write(WriteBuffer & wb) const
     {
         writeVarUInt(size(), wb);
-        for (auto * counter : counter_list)
+        for (auto & counter : counter_list)
             counter->write(wb);
 
         writeVarUInt(alpha_map.size(), wb);
@@ -291,10 +290,10 @@ public:
 
         for (size_t i = 0; i < count; ++i)
         {
-            auto * counter = new Counter();
+            std::unique_ptr counter = std::make_unique<Counter>();
             counter->read(rb);
             counter->hash = counter_map.hash(counter->key);
-            push(counter);
+            push(std::move(counter));
         }
 
         readAlphaMap(rb);
@@ -313,12 +312,13 @@ public:
     }
 
 protected:
-    void push(Counter * counter)
+    void push(std::unique_ptr<Counter> counter)
     {
         counter->slot = counter_list.size();
-        counter_list.push_back(counter);
-        counter_map[counter->key] = counter;
-        percolate(counter);
+        auto * ptr = counter.get();
+        counter_list.push_back(std::move(counter));
+        counter_map[ptr->key] = ptr;
+        percolate(ptr);
     }
 
     // This is equivallent to one step of bubble sort
@@ -326,7 +326,7 @@ protected:
     {
         while (counter->slot > 0)
         {
-            auto * next = counter_list[counter->slot - 1];
+            auto & next = counter_list[counter->slot - 1];
             if (*counter > *next)
             {
                 std::swap(next->slot, counter->slot);
@@ -340,11 +340,8 @@ protected:
 private:
     void destroyElements()
     {
-        for (auto * counter : counter_list)
-        {
+        for (auto & counter : counter_list)
             arena.free(counter->key);
-            delete counter;
-        }
 
         counter_map.clear();
         counter_list.clear();
@@ -353,10 +350,9 @@ private:
 
     void destroyLastElement()
     {
-        auto last_element = counter_list.back();
+        auto & last_element = counter_list.back();
         counter_map.erase(last_element->key);
         arena.free(last_element->key);
-        delete last_element;
         counter_list.pop_back();
 
         ++removed_keys;
@@ -377,14 +373,14 @@ private:
     {
         removed_keys = 0;
         counter_map.clear();
-        for (auto * counter : counter_list)
-            counter_map[counter->key] = counter;
+        for (auto & counter : counter_list)
+            counter_map[counter->key] = counter.get();
     }
 
     using CounterMap = HashMapWithStackMemory<TKey, Counter *, Hash, 4>;
 
     CounterMap counter_map;
-    std::vector<Counter *, AllocatorWithMemoryTracking<Counter *>> counter_list;
+    std::vector<std::unique_ptr<Counter>, AllocatorWithMemoryTracking<std::unique_ptr<Counter>>> counter_list;
     std::vector<UInt64, AllocatorWithMemoryTracking<UInt64>> alpha_map;
     SpaceSavingArena<TKey> arena;
     size_t m_capacity;
diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index 0d47d3dcb92..e6b7839c4e2 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -1,18 +1,25 @@
-#include <Common/StackTrace.h>
+#include "StackTrace.h"
+
+#include <base/FnTraits.h>
+#include <base/constexpr_helpers.h>
+#include <base/demangle.h>
 
 #include <Common/Dwarf.h>
 #include <Common/Elf.h>
-#include <Common/SymbolIndex.h>
 #include <Common/MemorySanitizer.h>
-#include <base/demangle.h>
+#include <Common/SymbolIndex.h>
+
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
 
 #include <atomic>
-#include <cstring>
 #include <filesystem>
+#include <map>
 #include <mutex>
 #include <sstream>
 #include <unordered_map>
-#include <map>
+#include <fmt/format.h>
 
 #include "config.h"
 
@@ -20,24 +27,23 @@
 #    include <libunwind.h>
 #endif
 
-
 namespace
 {
-    /// Currently this variable is set up once on server startup.
-    /// But we use atomic just in case, so it is possible to be modified at runtime.
-    std::atomic<bool> show_addresses = true;
+/// Currently this variable is set up once on server startup.
+/// But we use atomic just in case, so it is possible to be modified at runtime.
+std::atomic<bool> show_addresses = true;
 
-    bool shouldShowAddress(const void * addr)
-    {
-        /// If the address is less than 4096, most likely it is a nullptr dereference with offset,
-        /// and showing this offset is secure nevertheless.
-        /// NOTE: 4096 is the page size on x86 and it can be different on other systems,
-        /// but for the purpose of this branch, it does not matter.
-        if (reinterpret_cast<uintptr_t>(addr) < 4096)
-            return true;
+bool shouldShowAddress(const void * addr)
+{
+    /// If the address is less than 4096, most likely it is a nullptr dereference with offset,
+    /// and showing this offset is secure nevertheless.
+    /// NOTE: 4096 is the page size on x86 and it can be different on other systems,
+    /// but for the purpose of this branch, it does not matter.
+    if (reinterpret_cast<uintptr_t>(addr) < 4096)
+        return true;
 
-        return show_addresses.load(std::memory_order_relaxed);
-    }
+    return show_addresses.load(std::memory_order_relaxed);
+}
 }
 
 void StackTrace::setShowAddresses(bool show)
@@ -45,155 +51,129 @@ void StackTrace::setShowAddresses(bool show)
     show_addresses.store(show, std::memory_order_relaxed);
 }
 
+std::string SigsegvErrorString(const siginfo_t & info, [[maybe_unused]] const ucontext_t & context)
+{
+    using namespace std::string_literals;
+    std::string address
+        = info.si_addr == nullptr ? "NULL pointer"s : (shouldShowAddress(info.si_addr) ? fmt::format("{}", info.si_addr) : ""s);
+
+    const std::string_view access =
+#if defined(__x86_64__) && !defined(OS_FREEBSD) && !defined(OS_DARWIN) && !defined(__arm__) && !defined(__powerpc__)
+        (context.uc_mcontext.gregs[REG_ERR] & 0x02) ? "write" : "read";
+#else
+        "";
+#endif
+
+    std::string_view message;
+
+    switch (info.si_code)
+    {
+        case SEGV_ACCERR:
+            message = "Attempted access has violated the permissions assigned to the memory area";
+            break;
+        case SEGV_MAPERR:
+            message = "Address not mapped to object";
+            break;
+        default:
+            message = "Unknown si_code";
+            break;
+    }
+
+    return fmt::format("Address: {}. Access: {}. {}.", std::move(address), access, message);
+}
+
+constexpr std::string_view SigbusErrorString(int si_code)
+{
+    switch (si_code)
+    {
+        case BUS_ADRALN:
+            return "Invalid address alignment.";
+        case BUS_ADRERR:
+            return "Non-existent physical address.";
+        case BUS_OBJERR:
+            return "Object specific hardware error.";
+
+            // Linux specific
+#if defined(BUS_MCEERR_AR)
+        case BUS_MCEERR_AR:
+            return "Hardware memory error: action required.";
+#endif
+#if defined(BUS_MCEERR_AO)
+        case BUS_MCEERR_AO:
+            return "Hardware memory error: action optional.";
+#endif
+        default:
+            return "Unknown si_code.";
+    }
+}
+
+constexpr std::string_view SigfpeErrorString(int si_code)
+{
+    switch (si_code)
+    {
+        case FPE_INTDIV:
+            return "Integer divide by zero.";
+        case FPE_INTOVF:
+            return "Integer overflow.";
+        case FPE_FLTDIV:
+            return "Floating point divide by zero.";
+        case FPE_FLTOVF:
+            return "Floating point overflow.";
+        case FPE_FLTUND:
+            return "Floating point underflow.";
+        case FPE_FLTRES:
+            return "Floating point inexact result.";
+        case FPE_FLTINV:
+            return "Floating point invalid operation.";
+        case FPE_FLTSUB:
+            return "Subscript out of range.";
+        default:
+            return "Unknown si_code.";
+    }
+}
+
+constexpr std::string_view SigillErrorString(int si_code)
+{
+    switch (si_code)
+    {
+        case ILL_ILLOPC:
+            return "Illegal opcode.";
+        case ILL_ILLOPN:
+            return "Illegal operand.";
+        case ILL_ILLADR:
+            return "Illegal addressing mode.";
+        case ILL_ILLTRP:
+            return "Illegal trap.";
+        case ILL_PRVOPC:
+            return "Privileged opcode.";
+        case ILL_PRVREG:
+            return "Privileged register.";
+        case ILL_COPROC:
+            return "Coprocessor error.";
+        case ILL_BADSTK:
+            return "Internal stack error.";
+        default:
+            return "Unknown si_code.";
+    }
+}
 
 std::string signalToErrorMessage(int sig, const siginfo_t & info, [[maybe_unused]] const ucontext_t & context)
 {
-    std::stringstream error;        // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    error.exceptions(std::ios::failbit);
     switch (sig)
     {
         case SIGSEGV:
-        {
-            /// Print info about address and reason.
-            if (nullptr == info.si_addr)
-                error << "Address: NULL pointer.";
-            else if (shouldShowAddress(info.si_addr))
-                error << "Address: " << info.si_addr;
-
-#if defined(__x86_64__) && !defined(OS_FREEBSD) && !defined(OS_DARWIN) && !defined(__arm__) && !defined(__powerpc__)
-            auto err_mask = context.uc_mcontext.gregs[REG_ERR];
-            if ((err_mask & 0x02))
-                error << " Access: write.";
-            else
-                error << " Access: read.";
-#endif
-
-            switch (info.si_code)
-            {
-                case SEGV_ACCERR:
-                    error << " Attempted access has violated the permissions assigned to the memory area.";
-                    break;
-                case SEGV_MAPERR:
-                    error << " Address not mapped to object.";
-                    break;
-                default:
-                    error << " Unknown si_code.";
-                    break;
-            }
-            break;
-        }
-
+            return SigsegvErrorString(info, context);
         case SIGBUS:
-        {
-            switch (info.si_code)
-            {
-                case BUS_ADRALN:
-                    error << "Invalid address alignment.";
-                    break;
-                case BUS_ADRERR:
-                    error << "Non-existent physical address.";
-                    break;
-                case BUS_OBJERR:
-                    error << "Object specific hardware error.";
-                    break;
-
-                    // Linux specific
-#if defined(BUS_MCEERR_AR)
-                case BUS_MCEERR_AR:
-                    error << "Hardware memory error: action required.";
-                    break;
-#endif
-#if defined(BUS_MCEERR_AO)
-                case BUS_MCEERR_AO:
-                    error << "Hardware memory error: action optional.";
-                    break;
-#endif
-
-                default:
-                    error << "Unknown si_code.";
-                    break;
-            }
-            break;
-        }
-
+            return std::string{SigbusErrorString(info.si_code)};
         case SIGILL:
-        {
-            switch (info.si_code)
-            {
-                case ILL_ILLOPC:
-                    error << "Illegal opcode.";
-                    break;
-                case ILL_ILLOPN:
-                    error << "Illegal operand.";
-                    break;
-                case ILL_ILLADR:
-                    error << "Illegal addressing mode.";
-                    break;
-                case ILL_ILLTRP:
-                    error << "Illegal trap.";
-                    break;
-                case ILL_PRVOPC:
-                    error << "Privileged opcode.";
-                    break;
-                case ILL_PRVREG:
-                    error << "Privileged register.";
-                    break;
-                case ILL_COPROC:
-                    error << "Coprocessor error.";
-                    break;
-                case ILL_BADSTK:
-                    error << "Internal stack error.";
-                    break;
-                default:
-                    error << "Unknown si_code.";
-                    break;
-            }
-            break;
-        }
-
+            return std::string{SigillErrorString(info.si_code)};
         case SIGFPE:
-        {
-            switch (info.si_code)
-            {
-                case FPE_INTDIV:
-                    error << "Integer divide by zero.";
-                    break;
-                case FPE_INTOVF:
-                    error << "Integer overflow.";
-                    break;
-                case FPE_FLTDIV:
-                    error << "Floating point divide by zero.";
-                    break;
-                case FPE_FLTOVF:
-                    error << "Floating point overflow.";
-                    break;
-                case FPE_FLTUND:
-                    error << "Floating point underflow.";
-                    break;
-                case FPE_FLTRES:
-                    error << "Floating point inexact result.";
-                    break;
-                case FPE_FLTINV:
-                    error << "Floating point invalid operation.";
-                    break;
-                case FPE_FLTSUB:
-                    error << "Subscript out of range.";
-                    break;
-                default:
-                    error << "Unknown si_code.";
-                    break;
-            }
-            break;
-        }
-
+            return std::string{SigfpeErrorString(info.si_code)};
         case SIGTSTP:
-        {
-            error << "This is a signal used for debugging purposes by the user.";
-            break;
-        }
+            return "This is a signal used for debugging purposes by the user.";
+        default:
+            return "";
     }
-
-    return error.str();
 }
 
 static void * getCallerAddress(const ucontext_t & context)
@@ -207,10 +187,8 @@ static void * getCallerAddress(const ucontext_t & context)
 #    else
     return reinterpret_cast<void *>(context.uc_mcontext.gregs[REG_RIP]);
 #    endif
-
 #elif defined(OS_DARWIN) && defined(__aarch64__)
     return reinterpret_cast<void *>(context.uc_mcontext->__ss.__pc);
-
 #elif defined(OS_FREEBSD) && defined(__aarch64__)
     return reinterpret_cast<void *>(context.uc_mcontext.mc_gpregs.gp_elr);
 #elif defined(__aarch64__)
@@ -228,20 +206,17 @@ static void * getCallerAddress(const ucontext_t & context)
 #endif
 }
 
+// FIXME: looks like this is used only for Sentry but duplicates the whole algo, maybe replace?
 void StackTrace::symbolize(
-    const StackTrace::FramePointers & frame_pointers, [[maybe_unused]] size_t offset,
-    size_t size, StackTrace::Frames & frames)
+    const StackTrace::FramePointers & frame_pointers, [[maybe_unused]] size_t offset, size_t size, StackTrace::Frames & frames)
 {
 #if defined(__ELF__) && !defined(OS_FREEBSD)
-
     auto symbol_index_ptr = DB::SymbolIndex::instance();
     const DB::SymbolIndex & symbol_index = *symbol_index_ptr;
     std::unordered_map<std::string, DB::Dwarf> dwarfs;
 
     for (size_t i = 0; i < offset; ++i)
-    {
         frames[i].virtual_addr = frame_pointers[i];
-    }
 
     for (size_t i = offset; i < size; ++i)
     {
@@ -254,7 +229,7 @@ void StackTrace::symbolize(
         if (object)
         {
             current_frame.object = object->name;
-            if (std::filesystem::exists(current_frame.object.value()))
+            if (std::error_code ec; std::filesystem::exists(current_frame.object.value(), ec) && !ec)
             {
                 auto dwarf_it = dwarfs.try_emplace(object->name, object->elf).first;
 
@@ -269,34 +244,19 @@ void StackTrace::symbolize(
             }
         }
         else
-        {
             current_frame.object = "?";
-        }
 
-        const auto * symbol = symbol_index.findSymbol(current_frame.virtual_addr);
-        if (symbol)
-        {
-            int status = 0;
-            current_frame.symbol = demangle(symbol->name, status);
-        }
+        if (const auto * symbol = symbol_index.findSymbol(current_frame.virtual_addr))
+            current_frame.symbol = demangle(symbol->name);
         else
-        {
             current_frame.symbol = "?";
-        }
     }
 #else
     for (size_t i = 0; i < size; ++i)
-    {
         frames[i].virtual_addr = frame_pointers[i];
-    }
 #endif
 }
 
-StackTrace::StackTrace()
-{
-    tryCapture();
-}
-
 StackTrace::StackTrace(const ucontext_t & signal_context)
 {
     tryCapture();
@@ -325,150 +285,134 @@ StackTrace::StackTrace(const ucontext_t & signal_context)
     }
 }
 
-StackTrace::StackTrace(NoCapture)
-{
-}
-
 void StackTrace::tryCapture()
 {
-    size = 0;
 #if USE_UNWIND
     size = unw_backtrace(frame_pointers.data(), capacity);
     __msan_unpoison(frame_pointers.data(), size * sizeof(frame_pointers[0]));
+#else
+    size = 0;
 #endif
 }
 
-size_t StackTrace::getSize() const
+/// ClickHouse uses bundled libc++ so type names will be the same on every system thus it's safe to hardcode them
+constexpr std::pair<std::string_view, std::string_view> replacements[]
+    = {{"::__1", ""}, {"std::basic_string<char, std::char_traits<char>, std::allocator<char>>", "String"}};
+
+String collapseNames(String && haystack)
 {
-    return size;
+    // TODO: surely there is a written version already for better in place search&replace
+    for (auto [needle, to] : replacements)
+    {
+        size_t pos = 0;
+        while ((pos = haystack.find(needle, pos)) != std::string::npos)
+        {
+            haystack.replace(pos, needle.length(), to);
+            pos += to.length();
+        }
+    }
+
+    return haystack;
 }
 
-size_t StackTrace::getOffset() const
+struct StackTraceRefTriple
 {
-    return offset;
+    const StackTrace::FramePointers & pointers;
+    size_t offset;
+    size_t size;
+};
+
+struct StackTraceTriple
+{
+    StackTrace::FramePointers pointers;
+    size_t offset;
+    size_t size;
+};
+
+template <class T>
+concept MaybeRef = std::is_same_v<T, StackTraceTriple> || std::is_same_v<T, StackTraceRefTriple>;
+
+constexpr bool operator<(const MaybeRef auto & left, const MaybeRef auto & right)
+{
+    return std::tuple{left.pointers, left.size, left.offset} < std::tuple{right.pointers, right.size, right.offset};
 }
 
-const StackTrace::FramePointers & StackTrace::getFramePointers() const
+static void
+toStringEveryLineImpl([[maybe_unused]] bool fatal, const StackTraceRefTriple & stack_trace, Fn<void(std::string_view)> auto && callback)
 {
-    return frame_pointers;
-}
-
-static void toStringEveryLineImpl(
-    [[maybe_unused]] bool fatal,
-    const StackTrace::FramePointers & frame_pointers,
-    size_t offset,
-    size_t size,
-    std::function<void(const std::string &)> callback)
-{
-    if (size == 0)
+    if (stack_trace.size == 0)
         return callback("<Empty trace>");
 
 #if defined(__ELF__) && !defined(OS_FREEBSD)
+
+    using enum DB::Dwarf::LocationInfoMode;
+    const auto mode = fatal ? FULL_WITH_INLINE : FAST;
+
     auto symbol_index_ptr = DB::SymbolIndex::instance();
     const DB::SymbolIndex & symbol_index = *symbol_index_ptr;
-    std::unordered_map<std::string, DB::Dwarf> dwarfs;
+    std::unordered_map<String, DB::Dwarf> dwarfs;
 
-    std::stringstream out;  // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    out.exceptions(std::ios::failbit);
-
-    for (size_t i = offset; i < size; ++i)
+    for (size_t i = stack_trace.offset; i < stack_trace.size; ++i)
     {
         std::vector<DB::Dwarf::SymbolizedFrame> inline_frames;
-        const void * virtual_addr = frame_pointers[i];
+        const void * virtual_addr = stack_trace.pointers[i];
         const auto * object = symbol_index.findObject(virtual_addr);
         uintptr_t virtual_offset = object ? uintptr_t(object->address_begin) : 0;
         const void * physical_addr = reinterpret_cast<const void *>(uintptr_t(virtual_addr) - virtual_offset);
 
+        DB::WriteBufferFromOwnString out;
         out << i << ". ";
 
-        if (object)
+        if (std::error_code ec; object && std::filesystem::exists(object->name, ec) && !ec)
         {
-            if (std::filesystem::exists(object->name))
-            {
-                auto dwarf_it = dwarfs.try_emplace(object->name, object->elf).first;
+            auto dwarf_it = dwarfs.try_emplace(object->name, object->elf).first;
 
-                DB::Dwarf::LocationInfo location;
-                auto mode = fatal ? DB::Dwarf::LocationInfoMode::FULL_WITH_INLINE : DB::Dwarf::LocationInfoMode::FAST;
-                if (dwarf_it->second.findAddress(uintptr_t(physical_addr), location, mode, inline_frames))
-                    out << location.file.toString() << ":" << location.line << ": ";
-            }
+            DB::Dwarf::LocationInfo location;
+
+            if (dwarf_it->second.findAddress(uintptr_t(physical_addr), location, mode, inline_frames))
+                out << location.file.toString() << ":" << location.line << ": ";
         }
 
-        const auto * symbol = symbol_index.findSymbol(virtual_addr);
-        if (symbol)
-        {
-            int status = 0;
-            out << demangle(symbol->name, status);
-        }
+        if (const auto * const symbol = symbol_index.findSymbol(virtual_addr))
+            out << collapseNames(demangle(symbol->name));
         else
             out << "?";
 
         if (shouldShowAddress(physical_addr))
-            out << " @ " << physical_addr;
+        {
+            out << " @ ";
+            DB::writePointerHex(physical_addr, out);
+        }
 
         out << " in " << (object ? object->name : "?");
 
         for (size_t j = 0; j < inline_frames.size(); ++j)
         {
             const auto & frame = inline_frames[j];
-            int status = 0;
-            callback(fmt::format("{}.{}. inlined from {}:{}: {}",
-                     i, j+1, frame.location.file.toString(), frame.location.line, demangle(frame.name, status)));
+            callback(fmt::format(
+                "{}.{}. inlined from {}:{}: {}",
+                i,
+                j + 1,
+                frame.location.file.toString(),
+                frame.location.line,
+                collapseNames(demangle(frame.name))));
         }
 
         callback(out.str());
-        out.str({});
     }
 #else
-    std::stringstream out;  // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    out.exceptions(std::ios::failbit);
-
-    for (size_t i = offset; i < size; ++i)
-    {
-        const void * addr = frame_pointers[i];
-        if (shouldShowAddress(addr))
-        {
-            out << i << ". " << addr;
-
-            callback(out.str());
-            out.str({});
-        }
-    }
+    for (size_t i = stack_trace.offset; i < stack_trace.size; ++i)
+        if (const void * const addr = stack_trace.pointers[i]; shouldShowAddress(addr))
+            callback(fmt::format("{}. {}", i, addr));
 #endif
 }
 
-static std::string toStringImpl(const StackTrace::FramePointers & frame_pointers, size_t offset, size_t size)
+void StackTrace::toStringEveryLine(std::function<void(std::string_view)> callback) const
 {
-    std::stringstream out;      // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    out.exceptions(std::ios::failbit);
-    toStringEveryLineImpl(false, frame_pointers, offset, size, [&](const std::string & str) { out << str << '\n'; });
-    return out.str();
+    toStringEveryLineImpl(true, {frame_pointers, offset, size}, std::move(callback));
 }
 
-void StackTrace::toStringEveryLine(std::function<void(const std::string &)> callback) const
-{
-    toStringEveryLineImpl(true, frame_pointers, offset, size, std::move(callback));
-}
-
-
-std::string StackTrace::toString() const
-{
-    return toStringStatic(frame_pointers, offset, size);
-}
-
-std::string StackTrace::toString(void ** frame_pointers_, size_t offset, size_t size)
-{
-    __msan_unpoison(frame_pointers_, size * sizeof(*frame_pointers_));
-
-    StackTrace::FramePointers frame_pointers_copy{};
-    for (size_t i = 0; i < size; ++i)
-        frame_pointers_copy[i] = frame_pointers_[i];
-
-    return toStringStatic(frame_pointers_copy, offset, size);
-}
-
-using StackTraceRepresentation = std::tuple<StackTrace::FramePointers, size_t, size_t>;
-using StackTraceCache = std::map<StackTraceRepresentation, std::string>;
+using StackTraceCache = std::map<StackTraceTriple, String, std::less<>>;
 
 static StackTraceCache & cacheInstance()
 {
@@ -478,21 +422,40 @@ static StackTraceCache & cacheInstance()
 
 static std::mutex stacktrace_cache_mutex;
 
-std::string StackTrace::toStringStatic(const StackTrace::FramePointers & frame_pointers, size_t offset, size_t size)
+String toStringCached(const StackTrace::FramePointers & pointers, size_t offset, size_t size)
 {
     /// Calculation of stack trace text is extremely slow.
     /// We use simple cache because otherwise the server could be overloaded by trash queries.
     /// Note that this cache can grow unconditionally, but practically it should be small.
     std::lock_guard lock{stacktrace_cache_mutex};
 
-    StackTraceRepresentation key{frame_pointers, offset, size};
-    auto & cache = cacheInstance();
-    if (cache.contains(key))
-        return cache[key];
+    StackTraceCache & cache = cacheInstance();
+    const StackTraceRefTriple key{pointers, offset, size};
 
-    auto result = toStringImpl(frame_pointers, offset, size);
-    cache[key] = result;
-    return result;
+    if (auto it = cache.find(key); it != cache.end())
+        return it->second;
+    else
+    {
+        DB::WriteBufferFromOwnString out;
+        toStringEveryLineImpl(false, key, [&](std::string_view str) { out << str << '\n'; });
+
+        return cache.emplace(StackTraceTriple{pointers, offset, size}, out.str()).first->second;
+    }
+}
+
+std::string StackTrace::toString() const
+{
+    return toStringCached(frame_pointers, offset, size);
+}
+
+std::string StackTrace::toString(void ** frame_pointers_raw, size_t offset, size_t size)
+{
+    __msan_unpoison(frame_pointers_raw, size * sizeof(*frame_pointers_raw));
+
+    StackTrace::FramePointers frame_pointers{};
+    std::copy_n(frame_pointers_raw, size, frame_pointers.begin());
+
+    return toStringCached(frame_pointers, offset, size);
 }
 
 void StackTrace::dropCache()
diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h
index f07c05107ee..3940c880c5b 100644
--- a/src/Common/StackTrace.h
+++ b/src/Common/StackTrace.h
@@ -46,26 +46,25 @@ public:
     using Frames = std::array<Frame, capacity>;
 
     /// Tries to capture stack trace
-    StackTrace();
+    inline StackTrace() { tryCapture(); }
 
     /// Tries to capture stack trace. Fallbacks on parsing caller address from
     /// signal context if no stack trace could be captured
     explicit StackTrace(const ucontext_t & signal_context);
 
     /// Creates empty object for deferred initialization
-    explicit StackTrace(NoCapture);
+    explicit inline StackTrace(NoCapture) {}
 
-    size_t getSize() const;
-    size_t getOffset() const;
-    const FramePointers & getFramePointers() const;
+    constexpr size_t getSize() const { return size; }
+    constexpr size_t getOffset() const { return offset; }
+    const FramePointers & getFramePointers() const { return frame_pointers; }
     std::string toString() const;
 
     static std::string toString(void ** frame_pointers, size_t offset, size_t size);
-    static std::string toStringStatic(const FramePointers & frame_pointers, size_t offset, size_t size);
     static void dropCache();
     static void symbolize(const FramePointers & frame_pointers, size_t offset, size_t size, StackTrace::Frames & frames);
 
-    void toStringEveryLine(std::function<void(const std::string &)> callback) const;
+    void toStringEveryLine(std::function<void(std::string_view)> callback) const;
 
     /// Displaying the addresses can be disabled for security reasons.
     /// If you turn off addresses, it will be more secure, but we will be unable to help you with debugging.
diff --git a/src/Common/StatusFile.cpp b/src/Common/StatusFile.cpp
index d90d50ff96d..a9ffce7ddf8 100644
--- a/src/Common/StatusFile.cpp
+++ b/src/Common/StatusFile.cpp
@@ -51,7 +51,7 @@ StatusFile::StatusFile(std::string path_, FillFunction fill_)
         std::string contents;
         {
             ReadBufferFromFile in(path, 1024);
-            LimitReadBuffer limit_in(in, 1024, false);
+            LimitReadBuffer limit_in(in, 1024, /* trow_exception */ false, /* exact_limit */ {});
             readStringUntilEOF(contents, limit_in);
         }
 
diff --git a/src/Common/StatusInfo.cpp b/src/Common/StatusInfo.cpp
index 32afc833001..1f9ddfaf4b9 100644
--- a/src/Common/StatusInfo.cpp
+++ b/src/Common/StatusInfo.cpp
@@ -8,10 +8,10 @@
 
 namespace CurrentStatusInfo
 {
-    #define M(NAME, DOCUMENTATION, ENUM) extern const Status NAME = __COUNTER__;
+    #define M(NAME, DOCUMENTATION, ENUM) extern const Status NAME = Status(__COUNTER__);
         APPLY_FOR_STATUS(M)
     #undef M
-    constexpr Status END = __COUNTER__;
+    constexpr Status END = Status(__COUNTER__);
 
     std::mutex locks[END] {};
     std::unordered_map<String, Int8> values[END] {};
diff --git a/src/Common/StatusInfo.h b/src/Common/StatusInfo.h
index 9aa185cd0c3..91e6d4d3b85 100644
--- a/src/Common/StatusInfo.h
+++ b/src/Common/StatusInfo.h
@@ -6,13 +6,14 @@
 #include <atomic>
 #include <vector>
 #include <base/types.h>
+#include <base/strong_typedef.h>
 #include <mutex>
 #include <unordered_map>
 
 
 namespace CurrentStatusInfo
 {
-    using Status = size_t;
+    using Status = StrongTypedef<size_t, struct StatusTag>;
     using Key = std::string;
 
     const char * getName(Status event);
diff --git a/src/Common/Stopwatch.h b/src/Common/Stopwatch.h
index 6b59340f05d..d6864a476e1 100644
--- a/src/Common/Stopwatch.h
+++ b/src/Common/Stopwatch.h
@@ -8,19 +8,34 @@
 #include <atomic>
 #include <memory>
 
+/// From clock_getres(2):
+///
+///    Similar to CLOCK_MONOTONIC, but provides access to a raw hardware-based
+///    time that is not subject to NTP adjustments or the incremental
+///    adjustments performed by adjtime(3).
+#ifdef CLOCK_MONOTONIC_RAW
+static constexpr clockid_t STOPWATCH_DEFAULT_CLOCK = CLOCK_MONOTONIC_RAW;
+#else
+static constexpr clockid_t STOPWATCH_DEFAULT_CLOCK = CLOCK_MONOTONIC;
+#endif
 
-inline UInt64 clock_gettime_ns(clockid_t clock_type = CLOCK_MONOTONIC)
+inline UInt64 clock_gettime_ns(clockid_t clock_type = STOPWATCH_DEFAULT_CLOCK)
 {
     struct timespec ts;
     clock_gettime(clock_type, &ts);
     return UInt64(ts.tv_sec * 1000000000LL + ts.tv_nsec);
 }
 
-/// Sometimes monotonic clock may not be monotonic (due to bug in kernel?).
-/// It may cause some operations to fail with "Timeout exceeded: elapsed 18446744073.709553 seconds".
 /// Takes previously returned value and returns it again if time stepped back for some reason.
-inline UInt64 clock_gettime_ns_adjusted(UInt64 prev_time, clockid_t clock_type = CLOCK_MONOTONIC)
+///
+/// You should use this if OS does not support CLOCK_MONOTONIC_RAW
+inline UInt64 clock_gettime_ns_adjusted(UInt64 prev_time, clockid_t clock_type = STOPWATCH_DEFAULT_CLOCK)
 {
+#ifdef CLOCK_MONOTONIC_RAW
+    if (likely(clock_type == CLOCK_MONOTONIC_RAW))
+        return clock_gettime_ns(clock_type);
+#endif
+
     UInt64 current_time = clock_gettime_ns(clock_type);
     if (likely(prev_time <= current_time))
         return current_time;
@@ -36,10 +51,10 @@ inline UInt64 clock_gettime_ns_adjusted(UInt64 prev_time, clockid_t clock_type =
 class Stopwatch
 {
 public:
-    /** CLOCK_MONOTONIC works relatively efficient (~15 million calls/sec) and doesn't lead to syscall.
+    /** CLOCK_MONOTONIC/CLOCK_MONOTONIC_RAW works relatively efficient (~40-50 million calls/sec) and doesn't lead to syscall.
       * Pass CLOCK_MONOTONIC_COARSE, if you need better performance with acceptable cost of several milliseconds of inaccuracy.
       */
-    explicit Stopwatch(clockid_t clock_type_ = CLOCK_MONOTONIC) : clock_type(clock_type_) { start(); }
+    explicit Stopwatch(clockid_t clock_type_ = STOPWATCH_DEFAULT_CLOCK) : clock_type(clock_type_) { start(); }
     explicit Stopwatch(clockid_t clock_type_, UInt64 start_nanoseconds, bool is_running_)
         : start_ns(start_nanoseconds), clock_type(clock_type_), is_running(is_running_)
     {
@@ -75,7 +90,7 @@ using StopwatchUniquePtr = std::unique_ptr<Stopwatch>;
 class AtomicStopwatch
 {
 public:
-    explicit AtomicStopwatch(clockid_t clock_type_ = CLOCK_MONOTONIC) : clock_type(clock_type_) { restart(); }
+    explicit AtomicStopwatch(clockid_t clock_type_ = STOPWATCH_DEFAULT_CLOCK) : clock_type(clock_type_) { restart(); }
 
     void restart()                     { start_ns = nanoseconds(0); }
     UInt64 elapsed() const
diff --git a/src/Common/StringUtils/StringUtils.h b/src/Common/StringUtils/StringUtils.h
index 72f172a1e45..8e8df19adee 100644
--- a/src/Common/StringUtils/StringUtils.h
+++ b/src/Common/StringUtils/StringUtils.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <string>
 #include <cstring>
 #include <cstddef>
diff --git a/src/Common/StudentTTest.cpp b/src/Common/StudentTTest.cpp
index 63f48f319d2..59842488fd0 100644
--- a/src/Common/StudentTTest.cpp
+++ b/src/Common/StudentTTest.cpp
@@ -6,6 +6,9 @@
 #include <sstream>
 #include <stdexcept>
 
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+
 
 namespace
 {
@@ -153,19 +156,17 @@ std::pair<bool, std::string> StudentTTest::compareAndReport(size_t confidence_le
 
     double mean_confidence_interval = table_value * t_statistic;
 
-    std::stringstream ss;       // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    ss.exceptions(std::ios::failbit);
+    DB::WriteBufferFromOwnString out;
 
     if (mean_difference > mean_confidence_interval && (mean_difference - mean_confidence_interval > 0.0001)) /// difference must be more than 0.0001, to take into account connection latency.
     {
-        ss << "Difference at " << confidence_level[confidence_level_index] <<  "% confidence: ";
-        ss << std::fixed << std::setprecision(8) << "mean difference is " << mean_difference << ", but confidence interval is " << mean_confidence_interval;
-        return {false, ss.str()};
+        out << "Difference at " << confidence_level[confidence_level_index] <<  "% confidence: ";
+        out << "mean difference is " << mean_difference << ", but confidence interval is " << mean_confidence_interval;
+        return {false, out.str()};
     }
     else
     {
-        ss << "No difference proven at " << confidence_level[confidence_level_index] <<  "% confidence";
-        return {true, ss.str()};
+        out << "No difference proven at " << confidence_level[confidence_level_index] <<  "% confidence";
+        return {true, out.str()};
     }
 }
-
diff --git a/src/Common/SymbolIndex.cpp b/src/Common/SymbolIndex.cpp
index 6f31009b1d2..f1cace5017c 100644
--- a/src/Common/SymbolIndex.cpp
+++ b/src/Common/SymbolIndex.cpp
@@ -1,7 +1,7 @@
 #if defined(__ELF__) && !defined(OS_FREEBSD)
 
 #include <Common/SymbolIndex.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 #include <algorithm>
 #include <optional>
diff --git a/src/Common/SystemLogBase.cpp b/src/Common/SystemLogBase.cpp
index 13150194df2..86adcbbd31b 100644
--- a/src/Common/SystemLogBase.cpp
+++ b/src/Common/SystemLogBase.cpp
@@ -18,6 +18,7 @@
 
 #include <Common/MemoryTrackerBlockerInThread.h>
 #include <Common/SystemLogBase.h>
+#include <Common/ThreadPool.h>
 
 #include <Common/logger_useful.h>
 #include <base/scope_guard.h>
@@ -35,20 +36,18 @@ namespace
     constexpr size_t DBMS_SYSTEM_LOG_QUEUE_SIZE = 1048576;
 }
 
+ISystemLog::~ISystemLog() = default;
+
 void ISystemLog::stopFlushThread()
 {
     {
         std::lock_guard lock(mutex);
 
-        if (!saving_thread.joinable())
-        {
+        if (!saving_thread || !saving_thread->joinable())
             return;
-        }
 
         if (is_shutdown)
-        {
             return;
-        }
 
         is_shutdown = true;
 
@@ -56,13 +55,13 @@ void ISystemLog::stopFlushThread()
         flush_event.notify_all();
     }
 
-    saving_thread.join();
+    saving_thread->join();
 }
 
 void ISystemLog::startup()
 {
     std::lock_guard lock(mutex);
-    saving_thread = ThreadFromGlobalPool([this] { savingThreadFunction(); });
+    saving_thread = std::make_unique<ThreadFromGlobalPool>([this] { savingThreadFunction(); });
 }
 
 static thread_local bool recursive_add_call = false;
diff --git a/src/Common/SystemLogBase.h b/src/Common/SystemLogBase.h
index c2cedb2ae39..f8febd8b159 100644
--- a/src/Common/SystemLogBase.h
+++ b/src/Common/SystemLogBase.h
@@ -10,7 +10,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 
 #define SYSTEM_LOG_ELEMENTS(M) \
     M(AsynchronousMetricLogElement) \
@@ -60,12 +60,12 @@ public:
     /// Stop the background flush thread before destructor. No more data will be written.
     virtual void shutdown() = 0;
 
-    virtual ~ISystemLog() = default;
+    virtual ~ISystemLog();
 
     virtual void savingThreadFunction() = 0;
 
 protected:
-    ThreadFromGlobalPool saving_thread;
+    std::unique_ptr<ThreadFromGlobalPool> saving_thread;
 
     /// Data shared between callers of add()/flush()/shutdown(), and the saving thread
     std::mutex mutex;
@@ -92,7 +92,7 @@ public:
 
     String getName() const override { return LogElement::name(); }
 
-    static const char * getDefaultOrderBy() { return "(event_date, event_time)"; }
+    static const char * getDefaultOrderBy() { return "event_date, event_time"; }
 
 protected:
     Poco::Logger * log;
diff --git a/src/Common/TLDListsHolder.h b/src/Common/TLDListsHolder.h
index 5ea8c5afe9f..be399843c08 100644
--- a/src/Common/TLDListsHolder.h
+++ b/src/Common/TLDListsHolder.h
@@ -3,7 +3,6 @@
 #include <base/defines.h>
 #include <base/StringRef.h>
 #include <Common/HashTable/StringHashMap.h>
-#include <Common/Arena.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <mutex>
 #include <string>
@@ -11,6 +10,7 @@
 
 namespace DB
 {
+class Arena;
 
 enum TLDType
 {
diff --git a/src/Common/TTLCachePolicy.h b/src/Common/TTLCachePolicy.h
new file mode 100644
index 00000000000..93bbec0d76b
--- /dev/null
+++ b/src/Common/TTLCachePolicy.h
@@ -0,0 +1,232 @@
+#pragma once
+
+#include <Common/ICachePolicy.h>
+
+#include <limits>
+#include <unordered_map>
+
+namespace DB
+{
+
+class PerUserTTLCachePolicyUserQuota : public ICachePolicyUserQuota
+{
+public:
+    void setQuotaForUser(const String & user_name, size_t max_size_in_bytes, size_t max_entries) override
+    {
+        quotas[user_name] = {max_size_in_bytes, max_entries};
+    }
+
+    void increaseActual(const String & user_name, size_t entry_size_in_bytes) override
+    {
+        auto & actual_for_user = actual[user_name];
+        actual_for_user.size_in_bytes += entry_size_in_bytes;
+        actual_for_user.num_items += 1;
+    }
+
+    void decreaseActual(const String & user_name, size_t entry_size_in_bytes) override
+    {
+        chassert(actual.contains(user_name));
+
+        chassert(actual[user_name].size_in_bytes >= entry_size_in_bytes);
+        actual[user_name].size_in_bytes -= entry_size_in_bytes;
+
+        chassert(actual[user_name].num_items >= 1);
+        actual[user_name].num_items -= 1;
+    }
+
+    bool approveWrite(const String & user_name, size_t entry_size_in_bytes) const override
+    {
+        auto it_actual = actual.find(user_name);
+        Resources actual_for_user{.size_in_bytes = 0, .num_items = 0}; /// assume zero actual resource consumption is user isn't found
+        if (it_actual != actual.end())
+            actual_for_user = it_actual->second;
+
+        auto it_quota = quotas.find(user_name);
+        Resources quota_for_user{.size_in_bytes = std::numeric_limits<size_t>::max(), .num_items = std::numeric_limits<size_t>::max()}; /// assume no threshold if no quota is found
+        if (it_quota != quotas.end())
+            quota_for_user = it_quota->second;
+
+        /// Special case: A quota configured as 0 means no threshold
+        if (quota_for_user.size_in_bytes == 0)
+            quota_for_user.size_in_bytes = std::numeric_limits<UInt64>::max();
+        if (quota_for_user.num_items == 0)
+            quota_for_user.num_items = std::numeric_limits<UInt64>::max();
+
+        /// Check size quota
+        if (actual_for_user.size_in_bytes + entry_size_in_bytes >= quota_for_user.size_in_bytes)
+            return false;
+
+        /// Check items quota
+        if (quota_for_user.num_items + 1 >= quota_for_user.num_items)
+            return false;
+
+        return true;
+    }
+
+    struct Resources
+    {
+        size_t size_in_bytes = 0;
+        size_t num_items = 0;
+    };
+
+    /// user name --> cache size quota (in bytes) / number of items quota
+    std::map<String, Resources> quotas;
+    /// user name --> actual cache usage (in bytes) / number of items
+    std::map<String, Resources> actual;
+};
+
+
+/// TTLCachePolicy evicts entries for which IsStaleFunction returns true.
+/// The cache size (in bytes and number of entries) can be changed at runtime. It is expected to set both sizes explicitly after construction.
+template <typename Key, typename Mapped, typename HashFunction, typename WeightFunction, typename IsStaleFunction>
+class TTLCachePolicy : public ICachePolicy<Key, Mapped, HashFunction, WeightFunction>
+{
+public:
+    using Base = ICachePolicy<Key, Mapped, HashFunction, WeightFunction>;
+    using typename Base::MappedPtr;
+    using typename Base::KeyMapped;
+    using typename Base::OnWeightLossFunction;
+
+    explicit TTLCachePolicy(CachePolicyUserQuotaPtr quotas_)
+        : Base(std::move(quotas_))
+        , max_size_in_bytes(0)
+        , max_count(0)
+    {
+    }
+
+    size_t weight(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return size_in_bytes;
+    }
+
+    size_t count(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return cache.size();
+    }
+
+    size_t maxSize(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return max_size_in_bytes;
+    }
+
+    void setMaxCount(size_t max_count_, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        /// lazy behavior: the cache only shrinks upon the next insert
+        max_count = max_count_;
+    }
+
+    void setMaxSize(size_t max_size_in_bytes_, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        /// lazy behavior: the cache only shrinks upon the next insert
+        max_size_in_bytes = max_size_in_bytes_;
+    }
+
+    void reset(std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        cache.clear();
+    }
+
+    void remove(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cache.find(key);
+        if (it == cache.end())
+            return;
+        size_t sz = weight_function(*it->second);
+        Base::user_quotas->decreaseActual(it->first.user_name, sz);
+        cache.erase(it);
+        size_in_bytes -= sz;
+    }
+
+    MappedPtr get(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cache.find(key);
+        if (it == cache.end())
+            return {};
+        return it->second;
+    }
+
+    std::optional<KeyMapped> getWithKey(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cache.find(key);
+        if (it == cache.end())
+            return std::nullopt;
+        return std::make_optional<KeyMapped>({it->first, it->second});
+    }
+
+    /// Evicts on a best-effort basis. If there are too many non-stale entries, the new entry may not be cached at all!
+    void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        chassert(mapped.get());
+
+        const size_t entry_size_in_bytes = weight_function(*mapped);
+
+        /// Checks against per-cache limits
+        auto sufficient_space_in_cache = [&]()
+        {
+            return (size_in_bytes + entry_size_in_bytes <= max_size_in_bytes) && (cache.size() + 1 <= max_count);
+        };
+
+        /// Checks against per-user limits
+        auto sufficient_space_in_cache_for_user = [&]()
+        {
+            return Base::user_quotas->approveWrite(key.user_name, entry_size_in_bytes);
+        };
+
+        if (!sufficient_space_in_cache() || !sufficient_space_in_cache_for_user())
+        {
+            /// Remove stale entries
+            for (auto it = cache.begin(); it != cache.end();)
+                if (is_stale_function(it->first))
+                {
+                    size_t sz = weight_function(*it->second);
+                    Base::user_quotas->decreaseActual(it->first.user_name, sz);
+                    it = cache.erase(it);
+                    size_in_bytes -= sz;
+                }
+                else
+                    ++it;
+        }
+
+        if (sufficient_space_in_cache() && sufficient_space_in_cache_for_user())
+        {
+            /// Insert or replace key
+            if (auto it = cache.find(key); it != cache.end())
+            {
+                size_t sz = weight_function(*it->second);
+                Base::user_quotas->decreaseActual(it->first.user_name, sz);
+                cache.erase(it); // stupid bug: (*) doesn't replace existing entries (likely due to custom hash function), need to erase explicitly
+                size_in_bytes -= sz;
+            }
+
+            cache[key] = std::move(mapped); // (*)
+            size_in_bytes += entry_size_in_bytes;
+            Base::user_quotas->increaseActual(key.user_name, entry_size_in_bytes);
+        }
+    }
+
+    std::vector<KeyMapped> dump() const override
+    {
+        std::vector<KeyMapped> res;
+        for (const auto & [key, mapped] : cache)
+            res.push_back({key, mapped});
+        return res;
+    }
+
+private:
+    using Cache = std::unordered_map<Key, MappedPtr, HashFunction>;
+    Cache cache;
+
+    /// TODO To speed up removal of stale entries, we could also add another container sorted on expiry times which maps keys to iterators
+    /// into the cache. To insert an entry, add it to the cache + add the iterator to the sorted container. To remove stale entries, do a
+    /// binary search on the sorted container and erase all left of the found key.
+
+    size_t size_in_bytes = 0;
+    size_t max_size_in_bytes;
+    size_t max_count;
+
+    WeightFunction weight_function;
+    IsStaleFunction is_stale_function;
+    /// TODO support OnWeightLossFunction callback
+};
+
+}
diff --git a/src/Common/ThreadFuzzer.cpp b/src/Common/ThreadFuzzer.cpp
index df6f860e588..433b8a76dba 100644
--- a/src/Common/ThreadFuzzer.cpp
+++ b/src/Common/ThreadFuzzer.cpp
@@ -34,9 +34,7 @@
         M(int, pthread_mutex_unlock, pthread_mutex_t * arg)
 #endif
 
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 namespace DB
 {
@@ -109,6 +107,8 @@ void ThreadFuzzer::initConfiguration()
     initFromEnv(migrate_probability, "THREAD_FUZZER_MIGRATE_PROBABILITY");
     initFromEnv(sleep_probability, "THREAD_FUZZER_SLEEP_PROBABILITY");
     initFromEnv(sleep_time_us, "THREAD_FUZZER_SLEEP_TIME_US");
+    initFromEnv(explicit_sleep_probability, "THREAD_FUZZER_EXPLICIT_SLEEP_PROBABILITY");
+    initFromEnv(explicit_memory_exception_probability, "THREAD_FUZZER_EXPLICIT_MEMORY_EXCEPTION_PROBABILITY");
 
 #if THREAD_FUZZER_WRAP_PTHREAD
 #    define INIT_WRAPPER_PARAMS(RET, NAME, ...) \
@@ -225,14 +225,28 @@ static void injection(
 void ThreadFuzzer::maybeInjectSleep()
 {
     auto & fuzzer = ThreadFuzzer::instance();
-    injection(fuzzer.yield_probability, fuzzer.migrate_probability, fuzzer.sleep_probability, fuzzer.sleep_time_us);
+    injection(fuzzer.yield_probability, fuzzer.migrate_probability, fuzzer.explicit_sleep_probability, fuzzer.sleep_time_us);
+}
+
+/// Sometimes maybeInjectSleep() is not enough and we need to inject an exception.
+/// The most suitable exception for this purpose is MEMORY_LIMIT_EXCEEDED: it can be thrown almost from everywhere.
+/// NOTE We also have a query setting fault_probability, but it does not work for background operations (maybe we should fix it).
+void ThreadFuzzer::maybeInjectMemoryLimitException()
+{
+    auto & fuzzer = ThreadFuzzer::instance();
+    if (fuzzer.explicit_memory_exception_probability <= 0.0)
+        return;
+    std::bernoulli_distribution fault(fuzzer.explicit_memory_exception_probability);
+    if (fault(thread_local_rng))
+        CurrentMemoryTracker::injectFault();
 }
 
 void ThreadFuzzer::signalHandler(int)
 {
     DENY_ALLOCATIONS_IN_SCOPE;
     auto saved_errno = errno;
-    maybeInjectSleep();
+    auto & fuzzer = ThreadFuzzer::instance();
+    injection(fuzzer.yield_probability, fuzzer.migrate_probability, fuzzer.sleep_probability, fuzzer.sleep_time_us);
     errno = saved_errno;
 }
 
diff --git a/src/Common/ThreadFuzzer.h b/src/Common/ThreadFuzzer.h
index ff391dfcd8f..9dd55fe7995 100644
--- a/src/Common/ThreadFuzzer.h
+++ b/src/Common/ThreadFuzzer.h
@@ -59,12 +59,16 @@ public:
     static bool isStarted();
 
     static void maybeInjectSleep();
+    static void maybeInjectMemoryLimitException();
+
 private:
     uint64_t cpu_time_period_us = 0;
     double yield_probability = 0;
     double migrate_probability = 0;
     double sleep_probability = 0;
     double sleep_time_us = 0;
+    double explicit_sleep_probability = 0;
+    double explicit_memory_exception_probability = 0;
 
     inline static std::atomic<bool> started{true};
 
diff --git a/src/Common/ThreadPool.cpp b/src/Common/ThreadPool.cpp
index 2843c4b1ad9..f91849ead66 100644
--- a/src/Common/ThreadPool.cpp
+++ b/src/Common/ThreadPool.cpp
@@ -11,6 +11,7 @@
 
 #include <Poco/Util/Application.h>
 #include <Poco/Util/LayeredConfiguration.h>
+#include <base/demangle.h>
 
 namespace DB
 {
@@ -25,29 +26,39 @@ namespace CurrentMetrics
 {
     extern const Metric GlobalThread;
     extern const Metric GlobalThreadActive;
-    extern const Metric LocalThread;
-    extern const Metric LocalThreadActive;
 }
 
+static constexpr auto DEFAULT_THREAD_NAME = "ThreadPool";
 
 template <typename Thread>
-ThreadPoolImpl<Thread>::ThreadPoolImpl()
-    : ThreadPoolImpl(getNumberOfPhysicalCPUCores())
+ThreadPoolImpl<Thread>::ThreadPoolImpl(Metric metric_threads_, Metric metric_active_threads_)
+    : ThreadPoolImpl(metric_threads_, metric_active_threads_, getNumberOfPhysicalCPUCores())
 {
 }
 
 
 template <typename Thread>
-ThreadPoolImpl<Thread>::ThreadPoolImpl(size_t max_threads_)
-    : ThreadPoolImpl(max_threads_, max_threads_, max_threads_)
+ThreadPoolImpl<Thread>::ThreadPoolImpl(
+    Metric metric_threads_,
+    Metric metric_active_threads_,
+    size_t max_threads_)
+    : ThreadPoolImpl(metric_threads_, metric_active_threads_, max_threads_, max_threads_, max_threads_)
 {
 }
 
 template <typename Thread>
-ThreadPoolImpl<Thread>::ThreadPoolImpl(size_t max_threads_, size_t max_free_threads_, size_t queue_size_, bool shutdown_on_exception_)
-    : max_threads(max_threads_)
-    , max_free_threads(max_free_threads_)
-    , queue_size(queue_size_)
+ThreadPoolImpl<Thread>::ThreadPoolImpl(
+    Metric metric_threads_,
+    Metric metric_active_threads_,
+    size_t max_threads_,
+    size_t max_free_threads_,
+    size_t queue_size_,
+    bool shutdown_on_exception_)
+    : metric_threads(metric_threads_)
+    , metric_active_threads(metric_active_threads_)
+    , max_threads(max_threads_)
+    , max_free_threads(std::min(max_free_threads_, max_threads))
+    , queue_size(queue_size_ ? std::max(queue_size_, max_threads) : 0 /* zero means the queue is unlimited */)
     , shutdown_on_exception(shutdown_on_exception_)
 {
 }
@@ -56,10 +67,26 @@ template <typename Thread>
 void ThreadPoolImpl<Thread>::setMaxThreads(size_t value)
 {
     std::lock_guard lock(mutex);
+    bool need_start_threads = (value > max_threads);
+    bool need_finish_free_threads = (value < max_free_threads);
+
     max_threads = value;
+    max_free_threads = std::min(max_free_threads, max_threads);
+
     /// We have to also adjust queue size, because it limits the number of scheduled and already running jobs in total.
-    queue_size = std::max(queue_size, max_threads);
+    queue_size = queue_size ? std::max(queue_size, max_threads) : 0;
     jobs.reserve(queue_size);
+
+    if (need_start_threads)
+    {
+        /// Start new threads while there are more scheduled jobs in the queue and the limit `max_threads` is not reached.
+        startNewThreadsNoLock();
+    }
+    else if (need_finish_free_threads)
+    {
+        /// Wake up free threads so they can finish themselves.
+        new_job_or_shutdown.notify_all();
+    }
 }
 
 template <typename Thread>
@@ -73,14 +100,22 @@ template <typename Thread>
 void ThreadPoolImpl<Thread>::setMaxFreeThreads(size_t value)
 {
     std::lock_guard lock(mutex);
-    max_free_threads = value;
+    bool need_finish_free_threads = (value < max_free_threads);
+
+    max_free_threads = std::min(value, max_threads);
+
+    if (need_finish_free_threads)
+    {
+        /// Wake up free threads so they can finish themselves.
+        new_job_or_shutdown.notify_all();
+    }
 }
 
 template <typename Thread>
 void ThreadPoolImpl<Thread>::setQueueSize(size_t value)
 {
     std::lock_guard lock(mutex);
-    queue_size = value;
+    queue_size = value ? std::max(value, max_threads) : 0;
     /// Reserve memory to get rid of allocations
     jobs.reserve(queue_size);
 }
@@ -88,7 +123,7 @@ void ThreadPoolImpl<Thread>::setQueueSize(size_t value)
 
 template <typename Thread>
 template <typename ReturnType>
-ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, ssize_t priority, std::optional<uint64_t> wait_microseconds, bool propagate_opentelemetry_tracing_context)
+ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, Priority priority, std::optional<uint64_t> wait_microseconds, bool propagate_opentelemetry_tracing_context)
 {
     auto on_error = [&](const std::string & reason)
     {
@@ -159,25 +194,56 @@ ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, ssize_t priority, std::
         ++scheduled_jobs;
     }
 
+    /// Wake up a free thread to run the new job.
     new_job_or_shutdown.notify_one();
 
     return static_cast<ReturnType>(true);
 }
 
 template <typename Thread>
-void ThreadPoolImpl<Thread>::scheduleOrThrowOnError(Job job, ssize_t priority)
+void ThreadPoolImpl<Thread>::startNewThreadsNoLock()
+{
+    if (shutdown)
+        return;
+
+    /// Start new threads while there are more scheduled jobs in the queue and the limit `max_threads` is not reached.
+    while (threads.size() < std::min(scheduled_jobs, max_threads))
+    {
+        try
+        {
+            threads.emplace_front();
+        }
+        catch (...)
+        {
+            break; /// failed to start more threads
+        }
+
+        try
+        {
+            threads.front() = Thread([this, it = threads.begin()] { worker(it); });
+        }
+        catch (...)
+        {
+            threads.pop_front();
+            break; /// failed to start more threads
+        }
+    }
+}
+
+template <typename Thread>
+void ThreadPoolImpl<Thread>::scheduleOrThrowOnError(Job job, Priority priority)
 {
     scheduleImpl<void>(std::move(job), priority, std::nullopt);
 }
 
 template <typename Thread>
-bool ThreadPoolImpl<Thread>::trySchedule(Job job, ssize_t priority, uint64_t wait_microseconds) noexcept
+bool ThreadPoolImpl<Thread>::trySchedule(Job job, Priority priority, uint64_t wait_microseconds) noexcept
 {
     return scheduleImpl<bool>(std::move(job), priority, wait_microseconds);
 }
 
 template <typename Thread>
-void ThreadPoolImpl<Thread>::scheduleOrThrow(Job job, ssize_t priority, uint64_t wait_microseconds, bool propagate_opentelemetry_tracing_context)
+void ThreadPoolImpl<Thread>::scheduleOrThrow(Job job, Priority priority, uint64_t wait_microseconds, bool propagate_opentelemetry_tracing_context)
 {
     scheduleImpl<void>(std::move(job), priority, wait_microseconds, propagate_opentelemetry_tracing_context);
 }
@@ -185,20 +251,18 @@ void ThreadPoolImpl<Thread>::scheduleOrThrow(Job job, ssize_t priority, uint64_t
 template <typename Thread>
 void ThreadPoolImpl<Thread>::wait()
 {
-    {
-        std::unique_lock lock(mutex);
-        /// Signal here just in case.
-        /// If threads are waiting on condition variables, but there are some jobs in the queue
-        /// then it will prevent us from deadlock.
-        new_job_or_shutdown.notify_all();
-        job_finished.wait(lock, [this] { return scheduled_jobs == 0; });
+    std::unique_lock lock(mutex);
+    /// Signal here just in case.
+    /// If threads are waiting on condition variables, but there are some jobs in the queue
+    /// then it will prevent us from deadlock.
+    new_job_or_shutdown.notify_all();
+    job_finished.wait(lock, [this] { return scheduled_jobs == 0; });
 
-        if (first_exception)
-        {
-            std::exception_ptr exception;
-            std::swap(exception, first_exception);
-            std::rethrow_exception(exception);
-        }
+    if (first_exception)
+    {
+        std::exception_ptr exception;
+        std::swap(exception, first_exception);
+        std::rethrow_exception(exception);
     }
 }
 
@@ -219,10 +283,14 @@ void ThreadPoolImpl<Thread>::finalize()
     {
         std::lock_guard lock(mutex);
         shutdown = true;
+        /// We don't want threads to remove themselves from `threads` anymore, otherwise `thread.join()` will go wrong below in this function.
+        threads_remove_themselves = false;
     }
 
+    /// Wake up threads so they can finish themselves.
     new_job_or_shutdown.notify_all();
 
+    /// Wait for all currently running jobs to finish (we don't wait for all scheduled jobs here like the function wait() does).
     for (auto & thread : threads)
         thread.join();
 
@@ -265,107 +333,119 @@ template <typename Thread>
 void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_it)
 {
     DENY_ALLOCATIONS_IN_SCOPE;
-    CurrentMetrics::Increment metric_all_threads(
-        std::is_same_v<Thread, std::thread> ? CurrentMetrics::GlobalThread : CurrentMetrics::LocalThread);
+    CurrentMetrics::Increment metric_pool_threads(metric_threads);
 
+    bool job_is_done = false;
+    std::exception_ptr exception_from_job;
+
+    /// We'll run jobs in this worker while there are scheduled jobs and until some special event occurs (e.g. shutdown, or decreasing the number of max_threads).
+    /// And if `max_free_threads > 0` we keep this number of threads even when there are no jobs for them currently.
     while (true)
     {
         /// This is inside the loop to also reset previous thread names set inside the jobs.
-        setThreadName("ThreadPool");
-
-        Job job;
-        bool need_shutdown = false;
+        setThreadName(DEFAULT_THREAD_NAME);
 
         /// A copy of parent trace context
-        DB::OpenTelemetry::TracingContextOnThread parent_thead_trace_context;
+        DB::OpenTelemetry::TracingContextOnThread parent_thread_trace_context;
+
+        /// Get a job from the queue.
+        Job job;
 
         {
             std::unique_lock lock(mutex);
-            new_job_or_shutdown.wait(lock, [this] { return shutdown || !jobs.empty(); });
-            need_shutdown = shutdown;
 
-            if (!jobs.empty())
+            // Finish with previous job if any
+            if (job_is_done)
             {
-                /// boost::priority_queue does not provide interface for getting non-const reference to an element
-                /// to prevent us from modifying its priority. We have to use const_cast to force move semantics on JobWithPriority::job.
-                job = std::move(const_cast<Job &>(jobs.top().job));
-                parent_thead_trace_context = std::move(const_cast<DB::OpenTelemetry::TracingContextOnThread &>(jobs.top().thread_trace_context));
-                jobs.pop();
-            }
-            else
-            {
-                /// shutdown is true, simply finish the thread.
-                return;
-            }
-
-        }
-
-        if (!need_shutdown)
-        {
-            ALLOW_ALLOCATIONS_IN_SCOPE;
-
-            /// Set up tracing context for this thread by its parent context
-            DB::OpenTelemetry::TracingContextHolder thread_trace_context("ThreadPool::worker()", parent_thead_trace_context);
-
-            try
-            {
-                CurrentMetrics::Increment metric_active_threads(
-                    std::is_same_v<Thread, std::thread> ? CurrentMetrics::GlobalThreadActive : CurrentMetrics::LocalThreadActive);
-
-                job();
-
-                if (thread_trace_context.root_span.isTraceEnabled())
+                job_is_done = false;
+                if (exception_from_job)
                 {
-                    /// Use the thread name as operation name so that the tracing log will be more clear.
-                    /// The thread name is usually set in the jobs, we can only get the name after the job finishes
-                    std::string thread_name = getThreadName();
-                    if (!thread_name.empty())
-                        thread_trace_context.root_span.operation_name = thread_name;
-                }
-
-                /// job should be reset before decrementing scheduled_jobs to
-                /// ensure that the Job destroyed before wait() returns.
-                job = {};
-                parent_thead_trace_context.reset();
-            }
-            catch (...)
-            {
-                thread_trace_context.root_span.addAttribute(std::current_exception());
-
-                /// job should be reset before decrementing scheduled_jobs to
-                /// ensure that the Job destroyed before wait() returns.
-                job = {};
-                parent_thead_trace_context.reset();
-
-                {
-                    std::lock_guard lock(mutex);
                     if (!first_exception)
-                        first_exception = std::current_exception(); // NOLINT
+                        first_exception = exception_from_job;
                     if (shutdown_on_exception)
                         shutdown = true;
-                    --scheduled_jobs;
+                    exception_from_job = {};
                 }
 
+                --scheduled_jobs;
+
                 job_finished.notify_all();
-                new_job_or_shutdown.notify_all();
-                return;
+                if (shutdown)
+                    new_job_or_shutdown.notify_all(); /// `shutdown` was set, wake up other threads so they can finish themselves.
             }
-        }
 
-        {
-            std::lock_guard lock(mutex);
-            --scheduled_jobs;
+            new_job_or_shutdown.wait(lock, [&] { return !jobs.empty() || shutdown || threads.size() > std::min(max_threads, scheduled_jobs + max_free_threads); });
 
-            if (threads.size() > scheduled_jobs + max_free_threads)
+            if (jobs.empty() || threads.size() > std::min(max_threads, scheduled_jobs + max_free_threads))
             {
-                thread_it->detach();
-                threads.erase(thread_it);
-                job_finished.notify_all();
+                // We enter here if:
+                //  - either this thread is not needed anymore due to max_free_threads excess;
+                //  - or shutdown happened AND all jobs are already handled.
+                if (threads_remove_themselves)
+                {
+                    thread_it->detach();
+                    threads.erase(thread_it);
+                }
                 return;
             }
+
+            /// boost::priority_queue does not provide interface for getting non-const reference to an element
+            /// to prevent us from modifying its priority. We have to use const_cast to force move semantics on JobWithPriority::job.
+            job = std::move(const_cast<Job &>(jobs.top().job));
+            parent_thread_trace_context = std::move(const_cast<DB::OpenTelemetry::TracingContextOnThread &>(jobs.top().thread_trace_context));
+            jobs.pop();
+
+            /// We don't run jobs after `shutdown` is set, but we have to properly dequeue all jobs and finish them.
+            if (shutdown)
+            {
+                job_is_done = true;
+                continue;
+            }
         }
 
-        job_finished.notify_all();
+        ALLOW_ALLOCATIONS_IN_SCOPE;
+
+        /// Set up tracing context for this thread by its parent context.
+        DB::OpenTelemetry::TracingContextHolder thread_trace_context("ThreadPool::worker()", parent_thread_trace_context);
+
+        /// Run the job.
+        try
+        {
+            CurrentMetrics::Increment metric_active_pool_threads(metric_active_threads);
+
+            job();
+
+            if (thread_trace_context.root_span.isTraceEnabled())
+            {
+                /// Use the thread name as operation name so that the tracing log will be more clear.
+                /// The thread name is usually set in jobs, we can only get the name after the job finishes
+                std::string thread_name = getThreadName();
+                if (!thread_name.empty() && thread_name != DEFAULT_THREAD_NAME)
+                {
+                    thread_trace_context.root_span.operation_name = thread_name;
+                }
+                else
+                {
+                    /// If the thread name is not set, use the type name of the job instead
+                    thread_trace_context.root_span.operation_name = demangle(job.target_type().name());
+                }
+            }
+
+            /// job should be reset before decrementing scheduled_jobs to
+            /// ensure that the Job destroyed before wait() returns.
+            job = {};
+        }
+        catch (...)
+        {
+            exception_from_job = std::current_exception();
+            thread_trace_context.root_span.addAttribute(exception_from_job);
+
+            /// job should be reset before decrementing scheduled_jobs to
+            /// ensure that the Job destroyed before wait() returns.
+            job = {};
+        }
+
+        job_is_done = true;
     }
 }
 
@@ -376,6 +456,22 @@ template class ThreadFromGlobalPoolImpl<true>;
 
 std::unique_ptr<GlobalThreadPool> GlobalThreadPool::the_instance;
 
+
+GlobalThreadPool::GlobalThreadPool(
+    size_t max_threads_,
+    size_t max_free_threads_,
+    size_t queue_size_,
+    const bool shutdown_on_exception_)
+    : FreeThreadPool(
+        CurrentMetrics::GlobalThread,
+        CurrentMetrics::GlobalThreadActive,
+        max_threads_,
+        max_free_threads_,
+        queue_size_,
+        shutdown_on_exception_)
+{
+}
+
 void GlobalThreadPool::initialize(size_t max_threads, size_t max_free_threads, size_t queue_size)
 {
     if (the_instance)
diff --git a/src/Common/ThreadPool.h b/src/Common/ThreadPool.h
index 18be05f6c71..70053ff7558 100644
--- a/src/Common/ThreadPool.h
+++ b/src/Common/ThreadPool.h
@@ -16,6 +16,9 @@
 #include <Poco/Event.h>
 #include <Common/ThreadStatus.h>
 #include <Common/OpenTelemetryTraceContext.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/ThreadPool_fwd.h>
+#include <Common/Priority.h>
 #include <base/scope_guard.h>
 
 /** Very simple thread pool similar to boost::threadpool.
@@ -33,31 +36,41 @@ class ThreadPoolImpl
 {
 public:
     using Job = std::function<void()>;
+    using Metric = CurrentMetrics::Metric;
 
     /// Maximum number of threads is based on the number of physical cores.
-    ThreadPoolImpl();
+    ThreadPoolImpl(Metric metric_threads_, Metric metric_active_threads_);
 
     /// Size is constant. Up to num_threads are created on demand and then run until shutdown.
-    explicit ThreadPoolImpl(size_t max_threads_);
+    explicit ThreadPoolImpl(
+        Metric metric_threads_,
+        Metric metric_active_threads_,
+        size_t max_threads_);
 
     /// queue_size - maximum number of running plus scheduled jobs. It can be greater than max_threads. Zero means unlimited.
-    ThreadPoolImpl(size_t max_threads_, size_t max_free_threads_, size_t queue_size_, bool shutdown_on_exception_ = true);
+    ThreadPoolImpl(
+        Metric metric_threads_,
+        Metric metric_active_threads_,
+        size_t max_threads_,
+        size_t max_free_threads_,
+        size_t queue_size_,
+        bool shutdown_on_exception_ = true);
 
     /// Add new job. Locks until number of scheduled jobs is less than maximum or exception in one of threads was thrown.
     /// If any thread was throw an exception, first exception will be rethrown from this method,
     ///  and exception will be cleared.
     /// Also throws an exception if cannot create thread.
-    /// Priority: greater is higher.
+    /// Priority: lower is higher.
     /// NOTE: Probably you should call wait() if exception was thrown. If some previously scheduled jobs are using some objects,
     /// located on stack of current thread, the stack must not be unwinded until all jobs finished. However,
     /// if ThreadPool is a local object, it will wait for all scheduled jobs in own destructor.
-    void scheduleOrThrowOnError(Job job, ssize_t priority = 0);
+    void scheduleOrThrowOnError(Job job, Priority priority = {});
 
     /// Similar to scheduleOrThrowOnError(...). Wait for specified amount of time and schedule a job or return false.
-    bool trySchedule(Job job, ssize_t priority = 0, uint64_t wait_microseconds = 0) noexcept;
+    bool trySchedule(Job job, Priority priority = {}, uint64_t wait_microseconds = 0) noexcept;
 
     /// Similar to scheduleOrThrowOnError(...). Wait for specified amount of time and schedule a job or throw an exception.
-    void scheduleOrThrow(Job job, ssize_t priority = 0, uint64_t wait_microseconds = 0, bool propagate_opentelemetry_tracing_context = true);
+    void scheduleOrThrow(Job job, Priority priority = {}, uint64_t wait_microseconds = 0, bool propagate_opentelemetry_tracing_context = true);
 
     /// Wait for all currently active jobs to be done.
     /// You may call schedule and wait many times in arbitrary order.
@@ -96,26 +109,30 @@ private:
     std::condition_variable job_finished;
     std::condition_variable new_job_or_shutdown;
 
+    Metric metric_threads;
+    Metric metric_active_threads;
+
     size_t max_threads;
     size_t max_free_threads;
     size_t queue_size;
 
     size_t scheduled_jobs = 0;
     bool shutdown = false;
+    bool threads_remove_themselves = true;
     const bool shutdown_on_exception = true;
 
     struct JobWithPriority
     {
         Job job;
-        ssize_t priority;
+        Priority priority;
         DB::OpenTelemetry::TracingContextOnThread thread_trace_context;
 
-        JobWithPriority(Job job_, ssize_t priority_, const DB::OpenTelemetry::TracingContextOnThread& thread_trace_context_)
+        JobWithPriority(Job job_, Priority priority_, const DB::OpenTelemetry::TracingContextOnThread & thread_trace_context_)
             : job(job_), priority(priority_), thread_trace_context(thread_trace_context_) {}
 
-        bool operator< (const JobWithPriority & rhs) const
+        bool operator<(const JobWithPriority & rhs) const
         {
-            return priority < rhs.priority;
+            return priority > rhs.priority; // Reversed for `priority_queue` max-heap to yield minimum value (i.e. highest priority) first
         }
     };
 
@@ -125,10 +142,13 @@ private:
     std::stack<OnDestroyCallback> on_destroy_callbacks;
 
     template <typename ReturnType>
-    ReturnType scheduleImpl(Job job, ssize_t priority, std::optional<uint64_t> wait_microseconds, bool propagate_opentelemetry_tracing_context = true);
+    ReturnType scheduleImpl(Job job, Priority priority, std::optional<uint64_t> wait_microseconds, bool propagate_opentelemetry_tracing_context = true);
 
     void worker(typename std::list<Thread>::iterator thread_it);
 
+    /// Tries to start new threads if there are scheduled jobs and the limit `max_threads` is not reached. Must be called with `mutex` locked.
+    void startNewThreadsNoLock();
+
     void finalize();
     void onDestroy();
 };
@@ -155,12 +175,11 @@ class GlobalThreadPool : public FreeThreadPool, private boost::noncopyable
 {
     static std::unique_ptr<GlobalThreadPool> the_instance;
 
-    GlobalThreadPool(size_t max_threads_, size_t max_free_threads_,
-            size_t queue_size_, const bool shutdown_on_exception_)
-        : FreeThreadPool(max_threads_, max_free_threads_, queue_size_,
-            shutdown_on_exception_)
-    {
-    }
+    GlobalThreadPool(
+        size_t max_threads_,
+        size_t max_free_threads_,
+        size_t queue_size_,
+        bool shutdown_on_exception_);
 
 public:
     static void initialize(size_t max_threads = 10000, size_t max_free_threads = 1000, size_t queue_size = 10000);
@@ -188,28 +207,28 @@ public:
         /// - If this will throw an exception, the destructor won't be called
         /// - this pointer cannot be passed in the lambda, since after detach() it will not be valid
         GlobalThreadPool::instance().scheduleOrThrow([
-            state = state,
-            func = std::forward<Function>(func),
-            args = std::make_tuple(std::forward<Args>(args)...)]() mutable /// mutable is needed to destroy capture
+            my_state = state,
+            my_func = std::forward<Function>(func),
+            my_args = std::make_tuple(std::forward<Args>(args)...)]() mutable /// mutable is needed to destroy capture
         {
             SCOPE_EXIT(
-                state->thread_id = std::thread::id();
-                state->event.set();
+                my_state->thread_id = std::thread::id();
+                my_state->event.set();
             );
 
-            state->thread_id = std::this_thread::get_id();
+            my_state->thread_id = std::this_thread::get_id();
 
             /// This moves are needed to destroy function and arguments before exit.
             /// It will guarantee that after ThreadFromGlobalPool::join all captured params are destroyed.
-            auto function = std::move(func);
-            auto arguments = std::move(args);
+            auto function = std::move(my_func);
+            auto arguments = std::move(my_args);
 
             /// Thread status holds raw pointer on query context, thus it always must be destroyed
             /// before sending signal that permits to join this thread.
             DB::ThreadStatus thread_status;
             std::apply(function, arguments);
         },
-        0, // default priority
+        {}, // default priority
         0, // default wait_microseconds
         propagate_opentelemetry_context
         );
@@ -260,6 +279,11 @@ public:
         return true;
     }
 
+    std::thread::id get_id() const
+    {
+        return state ? state->thread_id.load() : std::thread::id{};
+    }
+
 protected:
     struct State
     {
@@ -300,7 +324,7 @@ using ThreadFromGlobalPool = ThreadFromGlobalPoolImpl<true>;
 /// one is at GlobalThreadPool level, the other is at ThreadPool level, so tracing context will be initialized on the same thread twice.
 ///
 /// Once the worker on ThreadPool gains the control of execution, it won't return until it's shutdown,
-/// which means the tracing context initialized at underlying worker level won't be delete for a very long time.
+/// which means the tracing context initialized at underlying worker level won't be deleted for a very long time.
 /// This would cause wrong context for further jobs scheduled in ThreadPool.
 ///
 /// To make sure the tracing context is correctly propagated, we explicitly disable context propagation(including initialization and de-initialization) at underlying worker level.
diff --git a/src/Common/ThreadPool_fwd.h b/src/Common/ThreadPool_fwd.h
new file mode 100644
index 00000000000..2782acc9c51
--- /dev/null
+++ b/src/Common/ThreadPool_fwd.h
@@ -0,0 +1,13 @@
+#pragma once
+
+template <typename Thread>
+class ThreadPoolImpl;
+
+template <bool propagate_opentelemetry_context>
+class ThreadFromGlobalPoolImpl;
+
+using ThreadFromGlobalPoolNoTracingContextPropagation = ThreadFromGlobalPoolImpl<false>;
+
+using ThreadFromGlobalPool = ThreadFromGlobalPoolImpl<true>;
+
+using ThreadPool = ThreadPoolImpl<ThreadFromGlobalPoolNoTracingContextPropagation>;
diff --git a/src/Common/ThreadProfileEvents.cpp b/src/Common/ThreadProfileEvents.cpp
index 76a4d8b1adf..a94fd81559a 100644
--- a/src/Common/ThreadProfileEvents.cpp
+++ b/src/Common/ThreadProfileEvents.cpp
@@ -23,6 +23,7 @@
 #include <boost/algorithm/string/split.hpp>
 
 #include <base/errnoToString.h>
+#include <Common/logger_useful.h>
 
 
 namespace ProfileEvents
diff --git a/src/Common/ThreadProfileEvents.h b/src/Common/ThreadProfileEvents.h
index 5a03a9e8555..c4703a69998 100644
--- a/src/Common/ThreadProfileEvents.h
+++ b/src/Common/ThreadProfileEvents.h
@@ -2,11 +2,13 @@
 
 #include <base/types.h>
 #include <base/getThreadId.h>
+#include <base/defines.h>
+#include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <pthread.h>
-#include <Common/logger_useful.h>
+#include <boost/noncopyable.hpp>
 
 
 #if defined(OS_LINUX)
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index 46c171b5cb6..9b0743d89c3 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -1,29 +1,21 @@
 #include <Common/Exception.h>
 #include <Common/ThreadProfileEvents.h>
-#include <Common/ConcurrentBoundedQueue.h>
 #include <Common/QueryProfiler.h>
 #include <Common/ThreadStatus.h>
+#include <Common/CurrentThread.h>
+#include <Common/logger_useful.h>
 #include <base/errnoToString.h>
 #include <Interpreters/Context.h>
 
 #include <Poco/Logger.h>
-#include <base/getThreadId.h>
-#include <base/getPageSize.h>
 
 #include <csignal>
-#include <mutex>
 #include <sys/mman.h>
 
 
 namespace DB
 {
 
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 thread_local ThreadStatus constinit * current_thread = nullptr;
 
 #if !defined(SANITIZER)
@@ -71,24 +63,9 @@ static thread_local ThreadStack alt_stack;
 static thread_local bool has_alt_stack = false;
 #endif
 
-
-std::vector<ThreadGroupStatus::ProfileEventsCountersAndMemory> ThreadGroupStatus::getProfileEventsCountersAndMemoryForThreads()
-{
-    std::lock_guard guard(mutex);
-
-    /// It is OK to move it, since it is enough to report statistics for the thread at least once.
-    auto stats = std::move(finished_threads_counters_memory);
-    for (auto * thread : threads)
-    {
-        stats.emplace_back(ProfileEventsCountersAndMemory{
-            thread->performance_counters.getPartiallyAtomicSnapshot(),
-            thread->memory_tracker.get(),
-            thread->thread_id,
-        });
-    }
-
-    return stats;
-}
+ThreadGroup::ThreadGroup()
+    : master_thread_id(CurrentThread::get().thread_id)
+{}
 
 ThreadStatus::ThreadStatus()
     : thread_id{getThreadId()}
@@ -144,28 +121,81 @@ ThreadStatus::ThreadStatus()
 #endif
 }
 
-ThreadStatus::~ThreadStatus()
+ThreadGroupPtr ThreadStatus::getThreadGroup() const
 {
-    memory_tracker.adjustWithUntrackedMemory(untracked_memory);
+    return thread_group;
+}
+
+const String & ThreadStatus::getQueryId() const
+{
+    return query_id_from_query_context;
+}
+
+ContextPtr ThreadStatus::getQueryContext() const
+{
+    return query_context.lock();
+}
+
+ContextPtr ThreadStatus::getGlobalContext() const
+{
+    return global_context.lock();
+}
+
+void ThreadGroup::attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue, LogsLevel logs_level)
+{
+    std::lock_guard lock(mutex);
+    shared_data.logs_queue_ptr = logs_queue;
+    shared_data.client_logs_level = logs_level;
+}
+
+void ThreadStatus::attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue,
+                                               LogsLevel logs_level)
+{
+    local_data.logs_queue_ptr = logs_queue;
+    local_data.client_logs_level = logs_level;
 
     if (thread_group)
-    {
-        ThreadGroupStatus::ProfileEventsCountersAndMemory counters
-        {
-            performance_counters.getPartiallyAtomicSnapshot(),
-            memory_tracker.get(),
-            thread_id
-        };
+        thread_group->attachInternalTextLogsQueue(logs_queue, logs_level);
+}
 
-        std::lock_guard guard(thread_group->mutex);
-        thread_group->finished_threads_counters_memory.emplace_back(std::move(counters));
-        thread_group->threads.erase(this);
-    }
+InternalTextLogsQueuePtr ThreadStatus::getInternalTextLogsQueue() const
+{
+    return local_data.logs_queue_ptr.lock();
+}
+
+InternalProfileEventsQueuePtr ThreadStatus::getInternalProfileEventsQueue() const
+{
+    return local_data.profile_queue_ptr.lock();
+}
+
+const String & ThreadStatus::getQueryForLog() const
+{
+    return local_data.query_for_logs;
+}
+
+LogsLevel ThreadStatus::getClientLogsLevel() const
+{
+    return local_data.client_logs_level;
+}
+
+void ThreadStatus::flushUntrackedMemory()
+{
+    if (untracked_memory == 0)
+        return;
+
+    memory_tracker.adjustWithUntrackedMemory(untracked_memory);
+    untracked_memory = 0;
+}
+
+ThreadStatus::~ThreadStatus()
+{
+    flushUntrackedMemory();
 
     /// It may cause segfault if query_context was destroyed, but was not detached
     auto query_context_ptr = query_context.lock();
-    assert((!query_context_ptr && query_id.empty()) || (query_context_ptr && query_id == query_context_ptr->getCurrentQueryId()));
+    assert((!query_context_ptr && getQueryId().empty()) || (query_context_ptr && getQueryId() == query_context_ptr->getCurrentQueryId()));
 
+    /// detachGroup if it was attached
     if (deleter)
         deleter();
 
@@ -189,69 +219,39 @@ void ThreadStatus::updatePerformanceCounters()
     }
 }
 
-void ThreadStatus::assertState(ThreadState permitted_state, const char * description) const
+void ThreadStatus::updatePerformanceCountersIfNeeded()
 {
-    if (getCurrentState() == permitted_state)
-        return;
+    if (last_rusage->thread_id == 0)
+        return; // Performance counters are not initialized, so there is no need to update them
 
-    if (description)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected thread state {}: {}", getCurrentState(), description);
-    else
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected thread state {}", getCurrentState());
-}
-
-void ThreadStatus::attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue,
-                                               LogsLevel client_logs_level)
-{
-    logs_queue_ptr = logs_queue;
-
-    if (!thread_group)
-        return;
-
-    std::lock_guard lock(thread_group->mutex);
-    thread_group->logs_queue_ptr = logs_queue;
-    thread_group->client_logs_level = client_logs_level;
-}
-
-void ThreadStatus::attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & profile_queue)
-{
-    profile_queue_ptr = profile_queue;
-
-    if (!thread_group)
-        return;
-
-    std::lock_guard lock(thread_group->mutex);
-    thread_group->profile_queue_ptr = profile_queue;
-}
-
-void ThreadStatus::setFatalErrorCallback(std::function<void()> callback)
-{
-    fatal_error_callback = std::move(callback);
-
-    if (!thread_group)
-        return;
-
-    std::lock_guard lock(thread_group->mutex);
-    thread_group->fatal_error_callback = fatal_error_callback;
+    constexpr UInt64 performance_counters_update_period_microseconds = 10 * 1000; // 10 milliseconds
+    UInt64 total_elapsed_microseconds = stopwatch.elapsedMicroseconds();
+    if (last_performance_counters_update_time + performance_counters_update_period_microseconds < total_elapsed_microseconds)
+    {
+        updatePerformanceCounters();
+        last_performance_counters_update_time = total_elapsed_microseconds;
+    }
 }
 
 void ThreadStatus::onFatalError()
 {
-    std::lock_guard lock(thread_group->mutex);
     if (fatal_error_callback)
         fatal_error_callback();
 }
 
 ThreadStatus * MainThreadStatus::main_thread = nullptr;
+
 MainThreadStatus & MainThreadStatus::getInstance()
 {
     static MainThreadStatus thread_status;
     return thread_status;
 }
+
 MainThreadStatus::MainThreadStatus()
 {
     main_thread = current_thread;
 }
+
 MainThreadStatus::~MainThreadStatus()
 {
     main_thread = nullptr;
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index 20550a63312..600dfc56d2b 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -5,6 +5,7 @@
 #include <IO/Progress.h>
 #include <Common/MemoryTracker.h>
 #include <Common/ProfileEvents.h>
+#include <Common/Stopwatch.h>
 #include <base/StringRef.h>
 
 #include <boost/noncopyable.hpp>
@@ -40,7 +41,6 @@ class TaskStatsInfoGetter;
 class InternalTextLogsQueue;
 struct ViewRuntimeData;
 class QueryViewsLog;
-class MemoryTrackerThreadSwitcher;
 using InternalTextLogsQueuePtr = std::shared_ptr<InternalTextLogsQueue>;
 using InternalTextLogsQueueWeakPtr = std::weak_ptr<InternalTextLogsQueue>;
 
@@ -57,45 +57,82 @@ using ThreadStatusPtr = ThreadStatus *;
   * Create via CurrentThread::initializeQuery (for queries) or directly (for various background tasks).
   * Use via CurrentThread::getGroup.
   */
-class ThreadGroupStatus
+class ThreadGroup;
+using ThreadGroupPtr = std::shared_ptr<ThreadGroup>;
+
+class ThreadGroup
 {
 public:
-    struct ProfileEventsCountersAndMemory
-    {
-        ProfileEvents::Counters::Snapshot counters;
-        Int64 memory_usage;
-        UInt64 thread_id;
-    };
+    ThreadGroup();
+    using FatalErrorCallback = std::function<void()>;
+    ThreadGroup(ContextPtr query_context_, FatalErrorCallback fatal_error_callback_ = {});
 
-    mutable std::mutex mutex;
+    /// The first thread created this thread group
+    const UInt64 master_thread_id;
+
+    /// Set up at creation, no race when reading
+    const ContextWeakPtr query_context;
+    const ContextWeakPtr global_context;
+
+    const FatalErrorCallback fatal_error_callback;
 
     ProfileEvents::Counters performance_counters{VariableContext::Process};
     MemoryTracker memory_tracker{VariableContext::Process};
 
-    ContextWeakPtr query_context;
-    ContextWeakPtr global_context;
+    struct SharedData
+    {
+        InternalProfileEventsQueueWeakPtr profile_queue_ptr;
 
-    InternalTextLogsQueueWeakPtr logs_queue_ptr;
-    InternalProfileEventsQueueWeakPtr profile_queue_ptr;
-    std::function<void()> fatal_error_callback;
+        InternalTextLogsQueueWeakPtr logs_queue_ptr;
+        LogsLevel client_logs_level = LogsLevel::none;
 
+        String query_for_logs;
+        UInt64 normalized_query_hash = 0;
+    };
+
+    SharedData getSharedData()
+    {
+        /// Critical section for making the copy of shared_data
+        std::lock_guard lock(mutex);
+        return shared_data;
+    }
+
+    /// Mutation shared data
+    void attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue, LogsLevel logs_level);
+    void attachQueryForLog(const String & query_, UInt64 normalized_hash = 0);
+    void attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & profile_queue);
+
+    /// When new query starts, new thread group is created for it, current thread becomes master thread of the query
+    static ThreadGroupPtr createForQuery(ContextPtr query_context_, FatalErrorCallback fatal_error_callback_ = {});
+
+    static ThreadGroupPtr createForBackgroundProcess(ContextPtr storage_context);
+
+    std::vector<UInt64> getInvolvedThreadIds() const;
+    void linkThread(UInt64 thread_it);
+
+private:
+    mutable std::mutex mutex;
+
+    /// Set up at creation, no race when reading
+    SharedData shared_data;
+    /// Set of all thread ids which has been attached to the group
     std::unordered_set<UInt64> thread_ids;
-    std::unordered_set<ThreadStatusPtr> threads;
-
-    /// The first thread created this thread group
-    UInt64 master_thread_id = 0;
-
-    LogsLevel client_logs_level = LogsLevel::none;
-
-    String query;
-    UInt64 normalized_query_hash = 0;
-
-    std::vector<ProfileEventsCountersAndMemory> finished_threads_counters_memory;
-
-    std::vector<ProfileEventsCountersAndMemory> getProfileEventsCountersAndMemoryForThreads();
 };
 
-using ThreadGroupStatusPtr = std::shared_ptr<ThreadGroupStatus>;
+/**
+ * Since merge is executed with multiple threads, this class
+ * switches the parent MemoryTracker as part of the thread group to account all the memory used.
+ */
+class ThreadGroupSwitcher : private boost::noncopyable
+{
+public:
+    explicit ThreadGroupSwitcher(ThreadGroupPtr thread_group);
+    ~ThreadGroupSwitcher();
+
+private:
+    ThreadGroupPtr prev_thread_group;
+};
+
 
 /**
  * We use **constinit** here to tell the compiler the current_thread variable is initialized.
@@ -124,12 +161,11 @@ public:
 
     /// TODO: merge them into common entity
     ProfileEvents::Counters performance_counters{VariableContext::Thread};
-
     /// Points to performance_counters by default.
     /// Could be changed to point to another object to calculate performance counters for some narrow scope.
     ProfileEvents::Counters * current_performance_counters{&performance_counters};
-    MemoryTracker memory_tracker{VariableContext::Thread};
 
+    MemoryTracker memory_tracker{VariableContext::Thread};
     /// Small amount of untracked memory (per thread atomic-less counter)
     Int64 untracked_memory = 0;
     /// Each thread could new/delete memory in range of (-untracked_memory_limit, untracked_memory_limit) without access to common counters.
@@ -139,93 +175,66 @@ public:
     Progress progress_in;
     Progress progress_out;
 
-    using Deleter = std::function<void()>;
-    Deleter deleter;
-
-protected:
+private:
     /// Group of threads, to which this thread attached
-    ThreadGroupStatusPtr thread_group;
-
-    std::atomic<int> thread_state{ThreadState::DetachedFromQuery};
+    ThreadGroupPtr thread_group;
 
     /// Is set once
     ContextWeakPtr global_context;
     /// Use it only from current thread
     ContextWeakPtr query_context;
 
-    String query_id;
+    /// Is used to send logs from logs_queue to client in case of fatal errors.
+    using FatalErrorCallback = std::function<void()>;
+    FatalErrorCallback fatal_error_callback;
 
-    /// A logs queue used by TCPHandler to pass logs to a client
-    InternalTextLogsQueueWeakPtr logs_queue_ptr;
-
-    InternalProfileEventsQueueWeakPtr profile_queue_ptr;
+    ThreadGroup::SharedData local_data;
 
     bool performance_counters_finalized = false;
-    UInt64 query_start_time_nanoseconds = 0;
-    UInt64 query_start_time_microseconds = 0;
-    time_t query_start_time = 0;
-    size_t queries_started = 0;
+
+    String query_id_from_query_context;
+
+    struct TimePoint
+    {
+        void setUp();
+        UInt64 nanoseconds() const;
+        UInt64 microseconds() const;
+        UInt64 seconds() const;
+
+        std::chrono::time_point<std::chrono::system_clock> point;
+    };
+
+    TimePoint query_start_time{};
 
     // CPU and Real time query profilers
     std::unique_ptr<QueryProfilerReal> query_profiler_real;
     std::unique_ptr<QueryProfilerCPU> query_profiler_cpu;
 
-    Poco::Logger * log = nullptr;
-
-    friend class CurrentThread;
-
     /// Use ptr not to add extra dependencies in the header
     std::unique_ptr<RUsageCounters> last_rusage;
     std::unique_ptr<TasksStatsCounters> taskstats;
-
-    /// Is used to send logs from logs_queue to client in case of fatal errors.
-    std::function<void()> fatal_error_callback;
+    Stopwatch stopwatch{CLOCK_MONOTONIC_COARSE};
+    UInt64 last_performance_counters_update_time = 0;
 
     /// See setInternalThread()
     bool internal_thread = false;
 
-    /// Requires access to query_id.
-    friend class MemoryTrackerThreadSwitcher;
-    void setQueryId(const String & query_id_)
-    {
-        query_id = query_id_;
-    }
+    /// This is helpful for cut linking dependencies for clickhouse_common_io
+    using Deleter = std::function<void()>;
+    Deleter deleter;
+
+    Poco::Logger * log = nullptr;
 
 public:
     ThreadStatus();
     ~ThreadStatus();
 
-    ThreadGroupStatusPtr getThreadGroup() const
-    {
-        return thread_group;
-    }
+    ThreadGroupPtr getThreadGroup() const;
 
-    enum ThreadState
-    {
-        DetachedFromQuery = 0,  /// We just created thread or it is a background thread
-        AttachedToQuery,        /// Thread executes enqueued query
-        Died,                   /// Thread does not exist
-    };
+    const String & getQueryId() const;
 
-    int getCurrentState() const
-    {
-        return thread_state.load(std::memory_order_relaxed);
-    }
-
-    std::string_view getQueryId() const
-    {
-        return query_id;
-    }
-
-    auto getQueryContext() const
-    {
-        return query_context.lock();
-    }
-
-    auto getGlobalContext() const
-    {
-        return global_context.lock();
-    }
+    ContextPtr getQueryContext() const;
+    ContextPtr getGlobalContext() const;
 
     /// "Internal" ThreadStatus is used for materialized views for separate
     /// tracking into system.query_views_log
@@ -243,41 +252,33 @@ public:
     ///   query.
     void setInternalThread();
 
-    /// Starts new query and create new thread group for it, current thread becomes master thread of the query
-    void initializeQuery();
-
     /// Attaches slave thread to existing thread group
-    void attachQuery(const ThreadGroupStatusPtr & thread_group_, bool check_detached = true);
+    void attachToGroup(const ThreadGroupPtr & thread_group_, bool check_detached = true);
+
+    /// Detaches thread from the thread group and the query, dumps performance counters if they have not been dumped
+    void detachFromGroup();
 
     /// Returns pointer to the current profile counters to restore them back.
     /// Note: consequent call with new scope will detach previous scope.
     ProfileEvents::Counters * attachProfileCountersScope(ProfileEvents::Counters * performance_counters_scope);
 
-    InternalTextLogsQueuePtr getInternalTextLogsQueue() const
-    {
-        return thread_state == Died ? nullptr : logs_queue_ptr.lock();
-    }
-
     void attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue,
                                      LogsLevel client_logs_level);
-
-    InternalProfileEventsQueuePtr getInternalProfileEventsQueue() const
-    {
-        return thread_state == Died ? nullptr : profile_queue_ptr.lock();
-    }
+    InternalTextLogsQueuePtr getInternalTextLogsQueue() const;
+    LogsLevel getClientLogsLevel() const;
 
     void attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & profile_queue);
+    InternalProfileEventsQueuePtr getInternalProfileEventsQueue() const;
 
-    /// Callback that is used to trigger sending fatal error messages to client.
-    void setFatalErrorCallback(std::function<void()> callback);
+    void attachQueryForLog(const String & query_);
+    const String & getQueryForLog() const;
+
+    /// Proper cal for fatal_error_callback
     void onFatalError();
 
-    /// Sets query context for current master thread and its thread group
-    /// NOTE: query_context have to be alive until detachQuery() is called
-    void attachQueryContext(ContextPtr query_context);
-
     /// Update several ProfileEvents counters
     void updatePerformanceCounters();
+    void updatePerformanceCountersIfNeeded();
 
     /// Update ProfileEvents and dumps info to system.query_thread_log
     void finalizePerformanceCounters();
@@ -285,12 +286,11 @@ public:
     /// Set the counters last usage to now
     void resetPerformanceCountersLastUsage();
 
-    /// Detaches thread from the thread group and the query, dumps performance counters if they have not been dumped
-    void detachQuery(bool exit_if_already_detached = false, bool thread_exits = false);
-
     void logToQueryViewsLog(const ViewRuntimeData & vinfo);
 
-protected:
+    void flushUntrackedMemory();
+
+private:
     void applyQuerySettings();
 
     void initPerformanceCounters();
@@ -299,14 +299,9 @@ protected:
 
     void finalizeQueryProfiler();
 
-    void logToQueryThreadLog(QueryThreadLog & thread_log, const String & current_database, std::chrono::time_point<std::chrono::system_clock> now);
+    void logToQueryThreadLog(QueryThreadLog & thread_log, const String & current_database);
 
-
-    void assertState(ThreadState permitted_state, const char * description = nullptr) const;
-
-
-private:
-    void setupState(const ThreadGroupStatusPtr & thread_group_);
+    void attachToGroupImpl(const ThreadGroupPtr & thread_group_);
 };
 
 /**
diff --git a/src/Common/Throttler.cpp b/src/Common/Throttler.cpp
index 4f99c24cc8d..4c1320db27a 100644
--- a/src/Common/Throttler.cpp
+++ b/src/Common/Throttler.cpp
@@ -61,20 +61,20 @@ UInt64 Throttler::add(size_t amount)
         throw Exception::createDeprecated(limit_exceeded_exception_message + std::string(" Maximum: ") + toString(limit), ErrorCodes::LIMIT_EXCEEDED);
 
     /// Wait unless there is positive amount of tokens - throttling
-    Int64 sleep_time = 0;
+    Int64 sleep_time_ns = 0;
     if (max_speed && tokens_value < 0)
     {
-        sleep_time = static_cast<Int64>(-tokens_value / max_speed * NS);
-        accumulated_sleep += sleep_time;
-        sleepForNanoseconds(sleep_time);
-        accumulated_sleep -= sleep_time;
-        ProfileEvents::increment(ProfileEvents::ThrottlerSleepMicroseconds, sleep_time / 1000UL);
+        sleep_time_ns = static_cast<Int64>(-tokens_value / max_speed * NS);
+        accumulated_sleep += sleep_time_ns;
+        sleepForNanoseconds(sleep_time_ns);
+        accumulated_sleep -= sleep_time_ns;
+        ProfileEvents::increment(ProfileEvents::ThrottlerSleepMicroseconds, sleep_time_ns / 1000UL);
     }
 
     if (parent)
-        sleep_time += parent->add(amount);
+        sleep_time_ns += parent->add(amount);
 
-    return static_cast<UInt64>(sleep_time);
+    return static_cast<UInt64>(sleep_time_ns);
 }
 
 void Throttler::reset()
diff --git a/src/Common/Throttler.h b/src/Common/Throttler.h
index 4b117ae7637..7508065096b 100644
--- a/src/Common/Throttler.h
+++ b/src/Common/Throttler.h
@@ -34,15 +34,15 @@ public:
               const std::shared_ptr<Throttler> & parent_ = nullptr);
 
     /// Use `amount` tokens, sleeps if required or throws exception on limit overflow.
-    /// Returns duration of sleep in microseconds (to distinguish sleeping on different kinds of throttlers for metrics)
+    /// Returns duration of sleep in nanoseconds (to distinguish sleeping on different kinds of throttlers for metrics)
     UInt64 add(size_t amount);
 
     UInt64 add(size_t amount, ProfileEvents::Event event_amount, ProfileEvents::Event event_sleep_us)
     {
-        UInt64 sleep_us = add(amount);
+        UInt64 sleep_ns = add(amount);
         ProfileEvents::increment(event_amount, amount);
-        ProfileEvents::increment(event_sleep_us, sleep_us);
-        return sleep_us;
+        ProfileEvents::increment(event_sleep_us, sleep_ns / 1000UL);
+        return sleep_ns;
     }
 
     /// Not thread safe
diff --git a/src/Common/TimerDescriptor.cpp b/src/Common/TimerDescriptor.cpp
index e0327bc1fc6..1f07f548d85 100644
--- a/src/Common/TimerDescriptor.cpp
+++ b/src/Common/TimerDescriptor.cpp
@@ -1,7 +1,6 @@
 #if defined(OS_LINUX)
 #include <Common/TimerDescriptor.h>
 #include <Common/Exception.h>
-#include <base/defines.h>
 
 #include <sys/timerfd.h>
 #include <fcntl.h>
diff --git a/src/Common/UTF8Helpers.h b/src/Common/UTF8Helpers.h
index 623a62a6f79..1dac8f60c5e 100644
--- a/src/Common/UTF8Helpers.h
+++ b/src/Common/UTF8Helpers.h
@@ -11,9 +11,7 @@
 
 #if defined(__aarch64__) && defined(__ARM_NEON)
 #    include <arm_neon.h>
-#    ifdef HAS_RESERVED_IDENTIFIER
-#        pragma clang diagnostic ignored "-Wreserved-identifier"
-#    endif
+#      pragma clang diagnostic ignored "-Wreserved-identifier"
 #endif
 
 
diff --git a/src/Common/Volnitsky.h b/src/Common/Volnitsky.h
index a0fce5531cd..64c5bf4c0d3 100644
--- a/src/Common/Volnitsky.h
+++ b/src/Common/Volnitsky.h
@@ -386,8 +386,6 @@ protected:
     FallbackSearcher fallback_searcher;
 
 public:
-    using Searcher = FallbackSearcher;
-
     /** haystack_size_hint - the expected total size of the haystack for `search` calls. Optional (zero means unspecified).
       * If you specify it small enough, the fallback algorithm will be used,
       *  since it is considered that it's useless to waste time initializing the hash table.
@@ -729,7 +727,7 @@ public:
 
 
 using Volnitsky = VolnitskyBase<true, true, ASCIICaseSensitiveStringSearcher>;
-using VolnitskyUTF8 = VolnitskyBase<true, false, ASCIICaseSensitiveStringSearcher>; /// exactly same as Volnitsky
+using VolnitskyUTF8 = VolnitskyBase<true, false, UTF8CaseSensitiveStringSearcher>;
 using VolnitskyCaseInsensitive = VolnitskyBase<false, true, ASCIICaseInsensitiveStringSearcher>; /// ignores non-ASCII bytes
 using VolnitskyCaseInsensitiveUTF8 = VolnitskyBase<false, false, UTF8CaseInsensitiveStringSearcher>;
 
@@ -737,7 +735,7 @@ using VolnitskyCaseSensitiveToken = VolnitskyBase<true, true, ASCIICaseSensitive
 using VolnitskyCaseInsensitiveToken = VolnitskyBase<false, true, ASCIICaseInsensitiveTokenSearcher>;
 
 using MultiVolnitsky = MultiVolnitskyBase<true, true, ASCIICaseSensitiveStringSearcher>;
-using MultiVolnitskyUTF8 = MultiVolnitskyBase<true, false, ASCIICaseSensitiveStringSearcher>;
+using MultiVolnitskyUTF8 = MultiVolnitskyBase<true, false, UTF8CaseSensitiveStringSearcher>;
 using MultiVolnitskyCaseInsensitive = MultiVolnitskyBase<false, true, ASCIICaseInsensitiveStringSearcher>;
 using MultiVolnitskyCaseInsensitiveUTF8 = MultiVolnitskyBase<false, false, UTF8CaseInsensitiveStringSearcher>;
 
diff --git a/src/Common/ZooKeeper/Common.h b/src/Common/ZooKeeper/Common.h
index e81b2770cf9..1a1328588e3 100644
--- a/src/Common/ZooKeeper/Common.h
+++ b/src/Common/ZooKeeper/Common.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include "ZooKeeper.h"
 #include <functional>
 
+#include <Common/ZooKeeper/ZooKeeper.h>
+
 namespace zkutil
 {
 
diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h
index a94e367cd70..3eb5819df90 100644
--- a/src/Common/ZooKeeper/IKeeper.h
+++ b/src/Common/ZooKeeper/IKeeper.h
@@ -3,6 +3,7 @@
 #include <base/types.h>
 #include <Common/Exception.h>
 #include <Coordination/KeeperConstants.h>
+#include <Poco/Net/SocketAddress.h>
 
 #include <vector>
 #include <memory>
@@ -273,7 +274,7 @@ struct SetRequest : virtual Request
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
 
-    size_t bytesSize() const override { return data.size() + data.size() + sizeof(version); }
+    size_t bytesSize() const override { return path.size() + data.size() + sizeof(version); }
 };
 
 struct SetResponse : virtual Response
@@ -319,6 +320,9 @@ struct CheckRequest : virtual Request
     String path;
     int32_t version = -1;
 
+    /// should it check if a node DOES NOT exist
+    bool not_exists = false;
+
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
 
@@ -463,6 +467,8 @@ public:
     /// Useful to check owner of ephemeral node.
     virtual int64_t getSessionID() const = 0;
 
+    virtual Poco::Net::SocketAddress getConnectedAddress() const = 0;
+
     /// If the method will throw an exception, callbacks won't be called.
     ///
     /// After the method is executed successfully, you must wait for callbacks
@@ -524,7 +530,7 @@ public:
         const Requests & requests,
         MultiCallback callback) = 0;
 
-    virtual DB::KeeperApiVersion getApiVersion() = 0;
+    virtual DB::KeeperApiVersion getApiVersion() const = 0;
 
     /// Expire session and finish all pending requests
     virtual void finalize(const String & reason) = 0;
diff --git a/src/Common/ZooKeeper/TestKeeper.h b/src/Common/ZooKeeper/TestKeeper.h
index 62615afb4f7..4bffa4e1d4f 100644
--- a/src/Common/ZooKeeper/TestKeeper.h
+++ b/src/Common/ZooKeeper/TestKeeper.h
@@ -39,6 +39,7 @@ public:
 
     bool isExpired() const override { return expired; }
     int64_t getSessionID() const override { return 0; }
+    Poco::Net::SocketAddress getConnectedAddress() const override { return connected_zk_address; }
 
 
     void create(
@@ -91,7 +92,7 @@ public:
 
     void finalize(const String & reason) override;
 
-    DB::KeeperApiVersion getApiVersion() override
+    DB::KeeperApiVersion getApiVersion() const override
     {
         return KeeperApiVersion::ZOOKEEPER_COMPATIBLE;
     }
@@ -126,6 +127,8 @@ private:
 
     zkutil::ZooKeeperArgs args;
 
+    Poco::Net::SocketAddress connected_zk_address;
+
     std::mutex push_request_mutex;
     std::atomic<bool> expired{false};
 
@@ -146,4 +149,3 @@ private:
 };
 
 }
-
diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp
index aa6ed5b2090..a587ad6caf4 100644
--- a/src/Common/ZooKeeper/ZooKeeper.cpp
+++ b/src/Common/ZooKeeper/ZooKeeper.cpp
@@ -15,6 +15,7 @@
 #include "Common/ZooKeeper/IKeeper.h"
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/Exception.h>
+#include <Common/logger_useful.h>
 
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/DNS.h>
@@ -29,6 +30,8 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
     extern const int BAD_ARGUMENTS;
+    extern const int NO_ELEMENTS_IN_CONFIG;
+    extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
 }
 }
 
@@ -108,6 +111,25 @@ void ZooKeeper::init(ZooKeeperArgs args_)
             LOG_TRACE(log, "Initialized, hosts: {}", fmt::join(args.hosts, ","));
         else
             LOG_TRACE(log, "Initialized, hosts: {}, chroot: {}", fmt::join(args.hosts, ","), args.chroot);
+
+        Poco::Net::SocketAddress address = impl->getConnectedAddress();
+
+        connected_zk_host = address.host().toString();
+        connected_zk_port = address.port();
+
+        connected_zk_index = 0;
+
+        if (args.hosts.size() > 1)
+        {
+            for (size_t i = 0; i < args.hosts.size(); i++)
+            {
+                if (args.hosts[i] == address.toString())
+                {
+                    connected_zk_index = i;
+                    break;
+                }
+            }
+        }
     }
     else if (args.implementation == "testkeeper")
     {
@@ -339,6 +361,31 @@ void ZooKeeper::createAncestors(const std::string & path)
     }
 }
 
+void ZooKeeper::checkExistsAndGetCreateAncestorsOps(const std::string & path, Coordination::Requests & requests)
+{
+    std::vector<std::string> paths_to_check;
+    size_t pos = 1;
+    while (true)
+    {
+        pos = path.find('/', pos);
+        if (pos == std::string::npos)
+            break;
+        paths_to_check.emplace_back(path.substr(0, pos));
+        ++pos;
+    }
+
+    MultiExistsResponse response = exists(paths_to_check);
+
+    for (size_t i = 0; i < paths_to_check.size(); ++i)
+    {
+        if (response[i].error != Coordination::Error::ZOK)
+        {
+            /// Ephemeral nodes cannot have children
+            requests.emplace_back(makeCreateRequest(paths_to_check[i], "", CreateMode::Persistent));
+        }
+    }
+}
+
 Coordination::Error ZooKeeper::removeImpl(const std::string & path, int32_t version)
 {
     auto future_result = asyncTryRemoveNoThrow(path, version);
@@ -818,7 +865,7 @@ bool ZooKeeper::expired()
     return impl->isExpired();
 }
 
-DB::KeeperApiVersion ZooKeeper::getApiVersion()
+DB::KeeperApiVersion ZooKeeper::getApiVersion() const
 {
     return impl->getApiVersion();
 }
@@ -1163,6 +1210,12 @@ void ZooKeeper::setZooKeeperLog(std::shared_ptr<DB::ZooKeeperLog> zk_log_)
         zk->setZooKeeperLog(zk_log);
 }
 
+void ZooKeeper::setServerCompletelyStarted()
+{
+    if (auto * zk = dynamic_cast<Coordination::ZooKeeper *>(impl.get()))
+        zk->setServerCompletelyStarted();
+}
+
 
 size_t getFailedOpIndex(Coordination::Error exception_code, const Coordination::Responses & responses)
 {
@@ -1273,7 +1326,6 @@ Coordination::RequestPtr makeExistsRequest(const std::string & path)
     return request;
 }
 
-
 std::string normalizeZooKeeperPath(std::string zookeeper_path, bool check_starts_with_slash, Poco::Logger * log)
 {
     if (!zookeeper_path.empty() && zookeeper_path.back() == '/')
@@ -1334,4 +1386,29 @@ String getSequentialNodeName(const String & prefix, UInt64 number)
     return name;
 }
 
+void validateZooKeeperConfig(const Poco::Util::AbstractConfiguration & config)
+{
+    if (config.has("zookeeper") && config.has("keeper"))
+        throw DB::Exception(DB::ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG, "Both ZooKeeper and Keeper are specified");
+}
+
+bool hasZooKeeperConfig(const Poco::Util::AbstractConfiguration & config)
+{
+    return config.has("zookeeper") || config.has("keeper") || (config.has("keeper_server") && config.getBool("keeper_server.use_cluster", true));
+}
+
+String getZooKeeperConfigName(const Poco::Util::AbstractConfiguration & config)
+{
+    if (config.has("zookeeper"))
+        return "zookeeper";
+
+    if (config.has("keeper"))
+        return "keeper";
+
+    if (config.has("keeper_server") && config.getBool("keeper_server.use_cluster", true))
+        return "keeper_server";
+
+    throw DB::Exception(DB::ErrorCodes::NO_ELEMENTS_IN_CONFIG, "There is no Zookeeper configuration in server config");
+}
+
 }
diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index 9de8241cfbe..96f9914b597 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -7,7 +7,6 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <Common/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Stopwatch.h>
@@ -33,6 +32,12 @@ namespace CurrentMetrics
 namespace DB
 {
     class ZooKeeperLog;
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 }
 
 namespace zkutil
@@ -79,13 +84,23 @@ concept ZooKeeperResponse = std::derived_from<T, Coordination::Response>;
 template <ZooKeeperResponse ResponseType, bool try_multi>
 struct MultiReadResponses
 {
+    MultiReadResponses() = default;
+
     template <typename TResponses>
     explicit MultiReadResponses(TResponses responses_) : responses(std::move(responses_))
     {}
 
     size_t size() const
     {
-        return std::visit([](auto && resp) { return resp.size(); }, responses);
+        return std::visit(
+            [&]<typename TResponses>(const TResponses & resp) -> size_t
+            {
+                if constexpr (std::same_as<TResponses, std::monostate>)
+                    throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "No responses set for MultiRead");
+                else
+                    return resp.size();
+            },
+            responses);
     }
 
     ResponseType & operator[](size_t index)
@@ -94,8 +109,10 @@ struct MultiReadResponses
             [&]<typename TResponses>(TResponses & resp) -> ResponseType &
             {
                 if constexpr (std::same_as<TResponses, RegularResponses>)
+                {
                     return dynamic_cast<ResponseType &>(*resp[index]);
-                else
+                }
+                else if constexpr (std::same_as<TResponses, ResponsesWithFutures>)
                 {
                     if constexpr (try_multi)
                     {
@@ -107,6 +124,10 @@ struct MultiReadResponses
                     }
                     return resp[index];
                 }
+                else
+                {
+                    throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "No responses set for MultiRead");
+                }
             },
             responses);
     }
@@ -137,7 +158,7 @@ private:
         size_t size() const { return future_responses.size(); }
     };
 
-    std::variant<RegularResponses, ResponsesWithFutures> responses;
+    std::variant<std::monostate, RegularResponses, ResponsesWithFutures> responses;
 };
 
 /// ZooKeeper session. The interface is substantially different from the usual libzookeeper API.
@@ -194,7 +215,7 @@ public:
     /// Returns true, if the session has expired.
     bool expired();
 
-    DB::KeeperApiVersion getApiVersion();
+    DB::KeeperApiVersion getApiVersion() const;
 
     /// Create a znode.
     /// Throw an exception if something went wrong.
@@ -216,6 +237,8 @@ public:
     /// Does not create the node itself.
     void createAncestors(const std::string & path);
 
+    void checkExistsAndGetCreateAncestorsOps(const std::string & path, Coordination::Requests & requests);
+
     /// Remove the node if the version matches. (if version == -1, remove any version).
     void remove(const std::string & path, int32_t version = -1);
 
@@ -498,9 +521,13 @@ public:
 
     UInt32 getSessionUptime() const { return static_cast<UInt32>(session_uptime.elapsedSeconds()); }
 
-private:
-    friend class EphemeralNodeHolder;
+    void setServerCompletelyStarted();
 
+    String getConnectedZooKeeperHost() const { return connected_zk_host; }
+    UInt16 getConnectedZooKeeperPort() const { return connected_zk_port; }
+    size_t getConnectedZooKeeperIndex() const { return connected_zk_index; }
+
+private:
     void init(ZooKeeperArgs args_);
 
     /// The following methods don't any throw exceptions but return error codes.
@@ -563,6 +590,10 @@ private:
 
     ZooKeeperArgs args;
 
+    String connected_zk_host;
+    UInt16 connected_zk_port;
+    size_t connected_zk_index;
+
     std::mutex mutex;
 
     Poco::Logger * log = nullptr;
@@ -645,4 +676,26 @@ String extractZooKeeperPath(const String & path, bool check_starts_with_slash, P
 
 String getSequentialNodeName(const String & prefix, UInt64 number);
 
+void validateZooKeeperConfig(const Poco::Util::AbstractConfiguration & config);
+
+bool hasZooKeeperConfig(const Poco::Util::AbstractConfiguration & config);
+
+String getZooKeeperConfigName(const Poco::Util::AbstractConfiguration & config);
+
+template <typename Client>
+void addCheckNotExistsRequest(Coordination::Requests & requests, const Client & client, const std::string & path)
+{
+    if (client.getApiVersion() >= DB::KeeperApiVersion::WITH_CHECK_NOT_EXISTS)
+    {
+        auto request = std::make_shared<Coordination::CheckRequest>();
+        request->path = path;
+        request->not_exists = true;
+        requests.push_back(std::move(request));
+        return;
+    }
+
+    requests.push_back(makeCreateRequest(path, "", zkutil::CreateMode::Persistent));
+    requests.push_back(makeRemoveRequest(path, -1));
+}
+
 }
diff --git a/src/Common/ZooKeeper/ZooKeeperArgs.cpp b/src/Common/ZooKeeper/ZooKeeperArgs.cpp
index fe2f6957490..0ebc7f667cb 100644
--- a/src/Common/ZooKeeper/ZooKeeperArgs.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperArgs.cpp
@@ -19,63 +19,10 @@ namespace zkutil
 
 ZooKeeperArgs::ZooKeeperArgs(const Poco::Util::AbstractConfiguration & config, const String & config_name)
 {
-    Poco::Util::AbstractConfiguration::Keys keys;
-    config.keys(config_name, keys);
-
-    for (const auto & key : keys)
-    {
-        if (key.starts_with("node"))
-        {
-            hosts.push_back(
-                (config.getBool(config_name + "." + key + ".secure", false) ? "secure://" : "")
-                + config.getString(config_name + "." + key + ".host") + ":" + config.getString(config_name + "." + key + ".port", "2181"));
-        }
-        else if (key == "session_timeout_ms")
-        {
-            session_timeout_ms = config.getInt(config_name + "." + key);
-        }
-        else if (key == "operation_timeout_ms")
-        {
-            operation_timeout_ms = config.getInt(config_name + "." + key);
-        }
-        else if (key == "connection_timeout_ms")
-        {
-            connection_timeout_ms = config.getInt(config_name + "." + key);
-        }
-        else if (key == "send_fault_probability")
-        {
-            send_fault_probability = config.getDouble(config_name + "." + key);
-        }
-        else if (key == "recv_fault_probability")
-        {
-            recv_fault_probability = config.getDouble(config_name + "." + key);
-        }
-        else if (key == "identity")
-        {
-            identity = config.getString(config_name + "." + key);
-            if (!identity.empty())
-                auth_scheme = "digest";
-        }
-        else if (key == "root")
-        {
-            chroot = config.getString(config_name + "." + key);
-        }
-        else if (key == "implementation")
-        {
-            implementation = config.getString(config_name + "." + key);
-        }
-        else if (key == "zookeeper_load_balancing")
-        {
-            String load_balancing_str = config.getString(config_name + "." + key);
-            /// Use magic_enum to avoid dependency from dbms (`SettingFieldLoadBalancingTraits::fromString(...)`)
-            auto load_balancing = magic_enum::enum_cast<DB::LoadBalancing>(Poco::toUpper(load_balancing_str));
-            if (!load_balancing)
-                throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Unknown load balancing: {}", load_balancing_str);
-            get_priority_load_balancing.load_balancing = *load_balancing;
-        }
-        else
-            throw KeeperException(std::string("Unknown key ") + key + " in config file", Coordination::Error::ZBADARGUMENTS);
-    }
+    if (config_name == "keeper_server")
+        initFromKeeperServerSection(config);
+    else
+        initFromKeeperSection(config, config_name);
 
     if (!chroot.empty())
     {
@@ -105,4 +52,160 @@ ZooKeeperArgs::ZooKeeperArgs(const String & hosts_string)
     splitInto<','>(hosts, hosts_string);
 }
 
+void ZooKeeperArgs::initFromKeeperServerSection(const Poco::Util::AbstractConfiguration & config)
+{
+    static constexpr std::string_view config_name = "keeper_server";
+
+    if (auto key = std::string{config_name} + ".tcp_port_secure";
+        config.has(key))
+    {
+        auto tcp_port_secure = config.getString(key);
+
+        if (tcp_port_secure.empty())
+            throw KeeperException("Empty tcp_port_secure in config file", Coordination::Error::ZBADARGUMENTS);
+    }
+
+    bool secure{false};
+    std::string tcp_port;
+    if (auto tcp_port_secure_key = std::string{config_name} + ".tcp_port_secure";
+        config.has(tcp_port_secure_key))
+    {
+        secure = true;
+        tcp_port = config.getString(tcp_port_secure_key);
+    }
+    else if (auto tcp_port_key = std::string{config_name} + ".tcp_port";
+        config.has(tcp_port_key))
+    {
+        tcp_port = config.getString(tcp_port_key);
+    }
+
+    if (tcp_port.empty())
+        throw KeeperException("No tcp_port or tcp_port_secure in config file", Coordination::Error::ZBADARGUMENTS);
+
+    if (auto coordination_key = std::string{config_name} + ".coordination_settings";
+        config.has(coordination_key))
+    {
+        if (auto operation_timeout_key = coordination_key + ".operation_timeout_ms";
+            config.has(operation_timeout_key))
+            operation_timeout_ms = config.getInt(operation_timeout_key);
+
+        if (auto session_timeout_key = coordination_key + ".session_timeout_ms";
+            config.has(session_timeout_key))
+            session_timeout_ms = config.getInt(session_timeout_key);
+    }
+
+    Poco::Util::AbstractConfiguration::Keys keys;
+    std::string raft_configuration_key = std::string{config_name} + ".raft_configuration";
+    config.keys(raft_configuration_key, keys);
+    for (const auto & key : keys)
+    {
+        if (startsWith(key, "server"))
+            hosts.push_back(
+                (secure ? "secure://" : "") + config.getString(raft_configuration_key + "." + key + ".hostname") + ":" + tcp_port);
+    }
+
+    static constexpr std::array load_balancing_keys
+    {
+        ".zookeeper_load_balancing",
+        ".keeper_load_balancing"
+    };
+
+    for (const auto * load_balancing_key : load_balancing_keys)
+    {
+        if (auto load_balancing_config = std::string{config_name} + load_balancing_key;
+            config.has(load_balancing_config))
+        {
+            String load_balancing_str = config.getString(load_balancing_config);
+            /// Use magic_enum to avoid dependency from dbms (`SettingFieldLoadBalancingTraits::fromString(...)`)
+            auto load_balancing = magic_enum::enum_cast<DB::LoadBalancing>(Poco::toUpper(load_balancing_str));
+            if (!load_balancing)
+                throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Unknown load balancing: {}", load_balancing_str);
+            get_priority_load_balancing.load_balancing = *load_balancing;
+            break;
+        }
+    }
+
+}
+
+void ZooKeeperArgs::initFromKeeperSection(const Poco::Util::AbstractConfiguration & config, const std::string & config_name)
+{
+    Poco::Util::AbstractConfiguration::Keys keys;
+    config.keys(config_name, keys);
+
+    for (const auto & key : keys)
+    {
+        if (key.starts_with("node"))
+        {
+            hosts.push_back(
+                (config.getBool(config_name + "." + key + ".secure", false) ? "secure://" : "")
+                + config.getString(config_name + "." + key + ".host") + ":" + config.getString(config_name + "." + key + ".port", "2181"));
+        }
+        else if (key == "session_timeout_ms")
+        {
+            session_timeout_ms = config.getInt(config_name + "." + key);
+        }
+        else if (key == "operation_timeout_ms")
+        {
+            operation_timeout_ms = config.getInt(config_name + "." + key);
+        }
+        else if (key == "connection_timeout_ms")
+        {
+            connection_timeout_ms = config.getInt(config_name + "." + key);
+        }
+        else if (key == "enable_fault_injections_during_startup")
+        {
+            enable_fault_injections_during_startup = config.getBool(config_name + "." + key);
+        }
+        else if (key == "send_fault_probability")
+        {
+            send_fault_probability = config.getDouble(config_name + "." + key);
+        }
+        else if (key == "recv_fault_probability")
+        {
+            recv_fault_probability = config.getDouble(config_name + "." + key);
+        }
+        else if (key == "send_sleep_probability")
+        {
+            send_sleep_probability = config.getDouble(config_name + "." + key);
+        }
+        else if (key == "recv_sleep_probability")
+        {
+            recv_sleep_probability = config.getDouble(config_name + "." + key);
+        }
+        else if (key == "send_sleep_ms")
+        {
+            send_sleep_ms = config.getUInt64(config_name + "." + key);
+        }
+        else if (key == "recv_sleep_ms")
+        {
+            recv_sleep_ms = config.getUInt64(config_name + "." + key);
+        }
+        else if (key == "identity")
+        {
+            identity = config.getString(config_name + "." + key);
+            if (!identity.empty())
+                auth_scheme = "digest";
+        }
+        else if (key == "root")
+        {
+            chroot = config.getString(config_name + "." + key);
+        }
+        else if (key == "implementation")
+        {
+            implementation = config.getString(config_name + "." + key);
+        }
+        else if (key == "zookeeper_load_balancing" || key == "keeper_load_balancing")
+        {
+            String load_balancing_str = config.getString(config_name + "." + key);
+            /// Use magic_enum to avoid dependency from dbms (`SettingFieldLoadBalancingTraits::fromString(...)`)
+            auto load_balancing = magic_enum::enum_cast<DB::LoadBalancing>(Poco::toUpper(load_balancing_str));
+            if (!load_balancing)
+                throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Unknown load balancing: {}", load_balancing_str);
+            get_priority_load_balancing.load_balancing = *load_balancing;
+        }
+        else
+            throw KeeperException(std::string("Unknown key ") + key + " in config file", Coordination::Error::ZBADARGUMENTS);
+    }
+}
+
 }
diff --git a/src/Common/ZooKeeper/ZooKeeperArgs.h b/src/Common/ZooKeeper/ZooKeeperArgs.h
index 48c8e4386f8..b8375a5ecb5 100644
--- a/src/Common/ZooKeeper/ZooKeeperArgs.h
+++ b/src/Common/ZooKeeper/ZooKeeperArgs.h
@@ -28,10 +28,19 @@ struct ZooKeeperArgs
     int32_t connection_timeout_ms = Coordination::DEFAULT_CONNECTION_TIMEOUT_MS;
     int32_t session_timeout_ms = Coordination::DEFAULT_SESSION_TIMEOUT_MS;
     int32_t operation_timeout_ms = Coordination::DEFAULT_OPERATION_TIMEOUT_MS;
+    bool enable_fault_injections_during_startup = false;
     double send_fault_probability = 0.0;
     double recv_fault_probability = 0.0;
+    double send_sleep_probability = 0.0;
+    double recv_sleep_probability = 0.0;
+    UInt64 send_sleep_ms = 0;
+    UInt64 recv_sleep_ms = 0;
 
     DB::GetPriorityForLoadBalancing get_priority_load_balancing;
+
+private:
+    void initFromKeeperServerSection(const Poco::Util::AbstractConfiguration & config);
+    void initFromKeeperSection(const Poco::Util::AbstractConfiguration & config, const std::string & config_name);
 };
 
 }
diff --git a/src/Common/ZooKeeper/ZooKeeperCachingGetter.cpp b/src/Common/ZooKeeper/ZooKeeperCachingGetter.cpp
new file mode 100644
index 00000000000..6577cc4ac95
--- /dev/null
+++ b/src/Common/ZooKeeper/ZooKeeperCachingGetter.cpp
@@ -0,0 +1,49 @@
+#include <Common/ZooKeeper/ZooKeeperCachingGetter.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NO_ZOOKEEPER;
+}
+
+}
+
+namespace zkutil
+{
+
+ZooKeeperCachingGetter::ZooKeeperCachingGetter(zkutil::GetZooKeeper get_zookeeper_) : get_zookeeper{get_zookeeper_}
+{
+}
+
+
+void ZooKeeperCachingGetter::resetCache()
+{
+    std::lock_guard lock{cached_zookeeper_ptr_mutex};
+    cached_zookeeper_ptr = nullptr;
+}
+
+
+std::pair<zkutil::ZooKeeperPtr, ZooKeeperCachingGetter::SessionStatus> ZooKeeperCachingGetter::getZooKeeper()
+{
+    std::lock_guard lock{cached_zookeeper_ptr_mutex};
+    return getZooKeeperNoLock();
+}
+
+
+std::pair<zkutil::ZooKeeperPtr, ZooKeeperCachingGetter::SessionStatus> ZooKeeperCachingGetter::getZooKeeperNoLock()
+{
+    if (!cached_zookeeper_ptr || cached_zookeeper_ptr->expired())
+    {
+        auto zookeeper = get_zookeeper();
+        if (!zookeeper)
+            throw DB::Exception(DB::ErrorCodes::NO_ZOOKEEPER, "Can't get ZooKeeper session");
+
+        cached_zookeeper_ptr = zookeeper;
+        return {zookeeper, ZooKeeperCachingGetter::SessionStatus::New};
+    }
+    return {cached_zookeeper_ptr, ZooKeeperCachingGetter::SessionStatus::Cached};
+}
+
+}
diff --git a/src/Common/ZooKeeper/ZooKeeperCachingGetter.h b/src/Common/ZooKeeper/ZooKeeperCachingGetter.h
new file mode 100644
index 00000000000..936ee660d8d
--- /dev/null
+++ b/src/Common/ZooKeeper/ZooKeeperCachingGetter.h
@@ -0,0 +1,36 @@
+#pragma once
+#include <Common/ZooKeeper/Common.h>
+
+
+namespace zkutil
+{
+
+class ZooKeeperCachingGetter : boost::noncopyable
+{
+public:
+    enum class SessionStatus
+    {
+        New,
+        Cached
+    };
+
+    explicit ZooKeeperCachingGetter(zkutil::GetZooKeeper get_zookeeper_);
+
+    ZooKeeperCachingGetter(const ZooKeeperCachingGetter &) = delete;
+    ZooKeeperCachingGetter & operator=(const ZooKeeperCachingGetter &) = delete;
+
+    /// Returns the ZooKeeper session and the status whether it was taken from the cache or opened new,
+    /// because the session has expired or the cache was empty
+    std::pair<zkutil::ZooKeeperPtr, SessionStatus> getZooKeeper();
+    void resetCache();
+
+private:
+    std::pair<zkutil::ZooKeeperPtr, SessionStatus> getZooKeeperNoLock() TSA_REQUIRES(cached_zookeeper_ptr_mutex);
+
+    std::mutex cached_zookeeper_ptr_mutex;
+    zkutil::ZooKeeperPtr cached_zookeeper_ptr TSA_GUARDED_BY(cached_zookeeper_ptr_mutex);
+
+    zkutil::GetZooKeeper get_zookeeper;
+};
+
+}
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.cpp b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
index 4cc1c24ef8b..5031af38812 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
@@ -563,7 +563,7 @@ std::string ZooKeeperMultiRequest::toStringImpl() const
     for (const auto & request : requests)
     {
         const auto & zk_request = dynamic_cast<const ZooKeeperRequest &>(*request);
-        format_to(std::back_inserter(out), "SubRequest\n{}\n", zk_request.toString());
+        fmt::format_to(std::back_inserter(out), "SubRequest\n{}\n", zk_request.toString());
     }
     return {out.data(), out.size()};
 }
@@ -666,7 +666,15 @@ ZooKeeperResponsePtr ZooKeeperGetRequest::makeResponse() const { return setTime(
 ZooKeeperResponsePtr ZooKeeperSetRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperSetResponse>()); }
 ZooKeeperResponsePtr ZooKeeperListRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperListResponse>()); }
 ZooKeeperResponsePtr ZooKeeperSimpleListRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperSimpleListResponse>()); }
-ZooKeeperResponsePtr ZooKeeperCheckRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperCheckResponse>()); }
+
+ZooKeeperResponsePtr ZooKeeperCheckRequest::makeResponse() const
+{
+    if (not_exists)
+        return setTime(std::make_shared<ZooKeeperCheckNotExistsResponse>());
+
+    return setTime(std::make_shared<ZooKeeperCheckResponse>());
+}
+
 ZooKeeperResponsePtr ZooKeeperMultiRequest::makeResponse() const
 {
     std::shared_ptr<ZooKeeperMultiResponse> response;
@@ -931,6 +939,8 @@ void registerZooKeeperRequest(ZooKeeperRequestFactory & factory)
             res->operation_type = ZooKeeperMultiRequest::OperationType::Read;
         else if constexpr (num == OpNum::Multi)
             res->operation_type = ZooKeeperMultiRequest::OperationType::Write;
+        else if constexpr (num == OpNum::CheckNotExists)
+            res->not_exists = true;
 
         return res;
     });
@@ -956,6 +966,7 @@ ZooKeeperRequestFactory::ZooKeeperRequestFactory()
     registerZooKeeperRequest<OpNum::GetACL, ZooKeeperGetACLRequest>(*this);
     registerZooKeeperRequest<OpNum::SetACL, ZooKeeperSetACLRequest>(*this);
     registerZooKeeperRequest<OpNum::FilteredList, ZooKeeperFilteredListRequest>(*this);
+    registerZooKeeperRequest<OpNum::CheckNotExists, ZooKeeperCheckRequest>(*this);
 }
 
 PathMatchResult matchPath(std::string_view path, std::string_view match_to)
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.h b/src/Common/ZooKeeper/ZooKeeperCommon.h
index 1755ebd8ccc..5f00698423e 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.h
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.h
@@ -390,12 +390,12 @@ struct ZooKeeperSimpleListResponse final : ZooKeeperListResponse
     size_t bytesSize() const override { return ZooKeeperListResponse::bytesSize() - sizeof(stat); }
 };
 
-struct ZooKeeperCheckRequest final : CheckRequest, ZooKeeperRequest
+struct ZooKeeperCheckRequest : CheckRequest, ZooKeeperRequest
 {
     ZooKeeperCheckRequest() = default;
     explicit ZooKeeperCheckRequest(const CheckRequest & base) : CheckRequest(base) {}
 
-    OpNum getOpNum() const override { return OpNum::Check; }
+    OpNum getOpNum() const override { return not_exists ? OpNum::CheckNotExists : OpNum::Check; }
     void writeImpl(WriteBuffer & out) const override;
     void readImpl(ReadBuffer & in) override;
     std::string toStringImpl() const override;
@@ -408,7 +408,7 @@ struct ZooKeeperCheckRequest final : CheckRequest, ZooKeeperRequest
     void createLogElements(LogElements & elems) const override;
 };
 
-struct ZooKeeperCheckResponse final : CheckResponse, ZooKeeperResponse
+struct ZooKeeperCheckResponse : CheckResponse, ZooKeeperResponse
 {
     void readImpl(ReadBuffer &) override {}
     void writeImpl(WriteBuffer &) const override {}
@@ -417,6 +417,12 @@ struct ZooKeeperCheckResponse final : CheckResponse, ZooKeeperResponse
     size_t bytesSize() const override { return CheckResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
+struct ZooKeeperCheckNotExistsResponse : public ZooKeeperCheckResponse
+{
+    OpNum getOpNum() const override { return OpNum::CheckNotExists; }
+    using ZooKeeperCheckResponse::ZooKeeperCheckResponse;
+};
+
 /// This response may be received only as an element of responses in MultiResponse.
 struct ZooKeeperErrorResponse final : ErrorResponse, ZooKeeperResponse
 {
diff --git a/src/Common/ZooKeeper/ZooKeeperConstants.cpp b/src/Common/ZooKeeper/ZooKeeperConstants.cpp
index c2e4c0f5cbd..86f70ea547a 100644
--- a/src/Common/ZooKeeper/ZooKeeperConstants.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperConstants.cpp
@@ -26,6 +26,7 @@ static const std::unordered_set<int32_t> VALID_OPERATIONS =
     static_cast<int32_t>(OpNum::SetACL),
     static_cast<int32_t>(OpNum::GetACL),
     static_cast<int32_t>(OpNum::FilteredList),
+    static_cast<int32_t>(OpNum::CheckNotExists),
 };
 
 std::string toString(OpNum op_num)
@@ -70,6 +71,8 @@ std::string toString(OpNum op_num)
             return "GetACL";
         case OpNum::FilteredList:
             return "FilteredList";
+        case OpNum::CheckNotExists:
+            return "CheckNotExists";
     }
     int32_t raw_op = static_cast<int32_t>(op_num);
     throw Exception("Operation " + std::to_string(raw_op) + " is unknown", Error::ZUNIMPLEMENTED);
diff --git a/src/Common/ZooKeeper/ZooKeeperConstants.h b/src/Common/ZooKeeper/ZooKeeperConstants.h
index 912e253718b..6b50c5c5d09 100644
--- a/src/Common/ZooKeeper/ZooKeeperConstants.h
+++ b/src/Common/ZooKeeper/ZooKeeperConstants.h
@@ -36,6 +36,7 @@ enum class OpNum : int32_t
 
     // CH Keeper specific operations
     FilteredList = 500,
+    CheckNotExists = 501,
 
     SessionID = 997, /// Special internal request
 };
diff --git a/src/Common/ZooKeeper/ZooKeeperIO.cpp b/src/Common/ZooKeeper/ZooKeeperIO.cpp
index 3bfa5585d87..2911d511254 100644
--- a/src/Common/ZooKeeper/ZooKeeperIO.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperIO.cpp
@@ -1,48 +1,14 @@
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 
+
 namespace Coordination
 {
 
-void write(size_t x, WriteBuffer & out)
-{
-    x = __builtin_bswap64(x);
-    writeBinary(x, out);
-}
-
-#ifdef OS_DARWIN
-void write(uint64_t x, WriteBuffer & out)
-{
-    x = __builtin_bswap64(x);
-    writeBinary(x, out);
-}
-#endif
-
-void write(int64_t x, WriteBuffer & out)
-{
-    x = __builtin_bswap64(x);
-    writeBinary(x, out);
-}
-void write(int32_t x, WriteBuffer & out)
-{
-    x = __builtin_bswap32(x);
-    writeBinary(x, out);
-}
-
-void write(uint8_t x, WriteBuffer & out)
-{
-    writeBinary(x, out);
-}
-
 void write(OpNum x, WriteBuffer & out)
 {
     write(static_cast<int32_t>(x), out);
 }
 
-void write(bool x, WriteBuffer & out)
-{
-    writeBinary(x, out);
-}
-
 void write(const std::string & s, WriteBuffer & out)
 {
     write(static_cast<int32_t>(s.size()), out);
@@ -76,37 +42,6 @@ void write(const Error & x, WriteBuffer & out)
     write(static_cast<int32_t>(x), out);
 }
 
-#ifdef OS_DARWIN
-void read(uint64_t & x, ReadBuffer & in)
-{
-    readBinary(x, in);
-    x = __builtin_bswap64(x);
-}
-#endif
-
-void read(size_t & x, ReadBuffer & in)
-{
-    readBinary(x, in);
-    x = __builtin_bswap64(x);
-}
-
-void read(int64_t & x, ReadBuffer & in)
-{
-    readBinary(x, in);
-    x = __builtin_bswap64(x);
-}
-
-void read(uint8_t & x, ReadBuffer & in)
-{
-    readBinary(x, in);
-}
-
-void read(int32_t & x, ReadBuffer & in)
-{
-    readBinary(x, in);
-    x = __builtin_bswap32(x);
-}
-
 void read(OpNum & x, ReadBuffer & in)
 {
     int32_t raw_op_num;
@@ -114,16 +49,6 @@ void read(OpNum & x, ReadBuffer & in)
     x = getOpNum(raw_op_num);
 }
 
-void read(bool & x, ReadBuffer & in)
-{
-    readBinary(x, in);
-}
-
-void read(int8_t & x, ReadBuffer & in)
-{
-    readBinary(x, in);
-}
-
 void read(std::string & s, ReadBuffer & in)
 {
     int32_t size = 0;
diff --git a/src/Common/ZooKeeper/ZooKeeperIO.h b/src/Common/ZooKeeper/ZooKeeperIO.h
index 2c5fdd5d8a3..81b56a02e27 100644
--- a/src/Common/ZooKeeper/ZooKeeperIO.h
+++ b/src/Common/ZooKeeper/ZooKeeperIO.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
@@ -8,23 +9,20 @@
 #include <vector>
 #include <array>
 
+
 namespace Coordination
 {
 
 using namespace DB;
 
-void write(size_t x, WriteBuffer & out);
+template <typename T>
+requires is_arithmetic_v<T>
+void write(T x, WriteBuffer & out)
+{
+    writeBinaryBigEndian(x, out);
+}
 
-/// uint64_t != size_t on darwin
-#ifdef OS_DARWIN
-void write(uint64_t x, WriteBuffer & out);
-#endif
-
-void write(int64_t x, WriteBuffer & out);
-void write(int32_t x, WriteBuffer & out);
-void write(uint8_t x, WriteBuffer & out);
 void write(OpNum x, WriteBuffer & out);
-void write(bool x, WriteBuffer & out);
 void write(const std::string & s, WriteBuffer & out);
 void write(const ACL & acl, WriteBuffer & out);
 void write(const Stat & stat, WriteBuffer & out);
@@ -45,16 +43,14 @@ void write(const std::vector<T> & arr, WriteBuffer & out)
         write(elem, out);
 }
 
-void read(size_t & x, ReadBuffer & in);
-#ifdef OS_DARWIN
-void read(uint64_t & x, ReadBuffer & in);
-#endif
-void read(int64_t & x, ReadBuffer & in);
-void read(int32_t & x, ReadBuffer & in);
-void read(uint8_t & x, ReadBuffer & in);
+template <typename T>
+requires is_arithmetic_v<T>
+void read(T & x, ReadBuffer & in)
+{
+    readBinaryBigEndian(x, in);
+}
+
 void read(OpNum & x, ReadBuffer & in);
-void read(bool & x, ReadBuffer & in);
-void read(int8_t & x, ReadBuffer & in);
 void read(std::string & s, ReadBuffer & in);
 void read(ACL & acl, ReadBuffer & in);
 void read(Stat & stat, ReadBuffer & in);
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.cpp b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
index 1fbdd857379..7f23ac00efe 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
@@ -1,19 +1,21 @@
 #include <Common/ZooKeeper/ZooKeeperImpl.h>
 
+#include <IO/Operators.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/Context.h>
+#include <base/getThreadId.h>
+#include <base/sleep.h>
+#include <Common/EventNotifier.h>
+#include <Common/Exception.h>
+#include <Common/ProfileEvents.h>
 #include <Common/ZooKeeper/IKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
-#include <Common/Exception.h>
-#include <Common/EventNotifier.h>
 #include <Common/logger_useful.h>
-#include <Common/ProfileEvents.h>
 #include <Common/setThreadName.h>
-#include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
-#include <IO/ReadBufferFromString.h>
-#include <IO/Operators.h>
-#include <IO/WriteBufferFromString.h>
-#include <base/getThreadId.h>
 
 #include "Coordination/KeeperConstants.h"
 #include "config.h"
@@ -297,11 +299,8 @@ ZooKeeper::~ZooKeeper()
     {
         finalize(false, false, "Destructor called");
 
-        if (send_thread.joinable())
-            send_thread.join();
-
-        if (receive_thread.joinable())
-            receive_thread.join();
+        send_thread.join();
+        receive_thread.join();
     }
     catch (...)
     {
@@ -342,28 +341,32 @@ ZooKeeper::ZooKeeper(
         default_acls.emplace_back(std::move(acl));
     }
 
-    /// It makes sense (especially, for async requests) to inject a fault in two places:
-    /// pushRequest (before request is sent) and receiveEvent (after request was executed).
-    if (0 < args.send_fault_probability && args.send_fault_probability <= 1)
-    {
-        send_inject_fault.emplace(args.send_fault_probability);
-    }
-    if (0 < args.recv_fault_probability && args.recv_fault_probability <= 1)
-    {
-        recv_inject_fault.emplace(args.recv_fault_probability);
-    }
+    if (args.enable_fault_injections_during_startup)
+        setupFaultDistributions();
 
     connect(nodes, args.connection_timeout_ms * 1000);
 
     if (!args.auth_scheme.empty())
         sendAuth(args.auth_scheme, args.identity);
 
-    send_thread = ThreadFromGlobalPool([this] { sendThread(); });
-    receive_thread = ThreadFromGlobalPool([this] { receiveThread(); });
+    try
+    {
+        send_thread = ThreadFromGlobalPool([this] { sendThread(); });
+        receive_thread = ThreadFromGlobalPool([this] { receiveThread(); });
 
-    initApiVersion();
+        initApiVersion();
 
-    ProfileEvents::increment(ProfileEvents::ZooKeeperInit);
+        ProfileEvents::increment(ProfileEvents::ZooKeeperInit);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, "Failed to connect to ZooKeeper");
+
+        send_thread.join();
+        receive_thread.join();
+
+        throw;
+    }
 }
 
 
@@ -430,6 +433,8 @@ void ZooKeeper::connect(
                 }
 
                 connected = true;
+                connected_zk_address = node.address;
+
                 break;
             }
             catch (...)
@@ -445,6 +450,8 @@ void ZooKeeper::connect(
     if (!connected)
     {
         WriteBufferFromOwnString message;
+        connected_zk_address = Poco::Net::SocketAddress();
+
         message << "All connection tries failed while connecting to ZooKeeper. nodes: ";
         bool first = true;
         for (const auto & node : nodes)
@@ -556,7 +563,6 @@ void ZooKeeper::sendAuth(const String & scheme, const String & data)
                         static_cast<int32_t>(err), errorMessage(err));
 }
 
-
 void ZooKeeper::sendThread()
 {
     setThreadName("ZooKeeperSend");
@@ -572,6 +578,8 @@ void ZooKeeper::sendThread()
             auto now = clock::now();
             auto next_heartbeat_time = prev_heartbeat_time + std::chrono::milliseconds(args.session_timeout_ms / 3);
 
+            maybeInjectSendSleep();
+
             if (next_heartbeat_time > now)
             {
                 /// Wait for the next request in queue. No more than operation timeout. No more than until next heartbeat time.
@@ -644,6 +652,7 @@ void ZooKeeper::receiveThread()
         Int64 waited_us = 0;
         while (!requests_queue.isFinished())
         {
+            maybeInjectRecvSleep();
             auto prev_bytes_received = in->count();
 
             clock::time_point now = clock::now();
@@ -658,8 +667,8 @@ void ZooKeeper::receiveThread()
                     earliest_operation = operations.begin()->second;
                     auto earliest_operation_deadline = earliest_operation->time + std::chrono::microseconds(args.operation_timeout_ms * 1000);
                     if (now > earliest_operation_deadline)
-                        throw Exception(Error::ZOPERATIONTIMEOUT, "Operation timeout (deadline already expired) for path: {}",
-                                        earliest_operation->request->getPath());
+                        throw Exception(Error::ZOPERATIONTIMEOUT, "Operation timeout (deadline of {} ms already expired) for path: {}",
+                                        args.operation_timeout_ms, earliest_operation->request->getPath());
                     max_wait_us = std::chrono::duration_cast<std::chrono::microseconds>(earliest_operation_deadline - now).count();
                 }
             }
@@ -676,12 +685,12 @@ void ZooKeeper::receiveThread()
             {
                 if (earliest_operation)
                 {
-                    throw Exception(Error::ZOPERATIONTIMEOUT, "Operation timeout (no response) for request {} for path: {}",
-                        toString(earliest_operation->request->getOpNum()), earliest_operation->request->getPath());
+                    throw Exception(Error::ZOPERATIONTIMEOUT, "Operation timeout (no response in {} ms) for request {} for path: {}",
+                        args.operation_timeout_ms, toString(earliest_operation->request->getOpNum()), earliest_operation->request->getPath());
                 }
                 waited_us += max_wait_us;
                 if (waited_us >= args.session_timeout_ms * 1000)
-                    throw Exception(Error::ZOPERATIONTIMEOUT, "Nothing is received in session timeout");
+                    throw Exception(Error::ZOPERATIONTIMEOUT, "Nothing is received in session timeout of {} ms", args.session_timeout_ms);
 
             }
 
@@ -713,8 +722,7 @@ void ZooKeeper::receiveEvent()
     ZooKeeperResponsePtr response;
     UInt64 elapsed_ms = 0;
 
-    if (unlikely(recv_inject_fault) && recv_inject_fault.value()(thread_local_rng))
-        throw Exception(Error::ZSESSIONEXPIRED, "Session expired (fault injected on recv)");
+    maybeInjectRecvFault();
 
     if (xid == PING_XID)
     {
@@ -904,8 +912,7 @@ void ZooKeeper::finalize(bool error_send, bool error_receive, const String & rea
             }
 
             /// Send thread will exit after sending close request or on expired flag
-            if (send_thread.joinable())
-                send_thread.join();
+            send_thread.join();
         }
 
         /// Set expired flag after we sent close event
@@ -922,7 +929,7 @@ void ZooKeeper::finalize(bool error_send, bool error_receive, const String & rea
             tryLogCurrentException(log);
         }
 
-        if (!error_receive && receive_thread.joinable())
+        if (!error_receive)
             receive_thread.join();
 
         {
@@ -1063,15 +1070,14 @@ void ZooKeeper::pushRequest(RequestInfo && info)
             }
         }
 
-        if (unlikely(send_inject_fault) && send_inject_fault.value()(thread_local_rng))
-            throw Exception(Error::ZSESSIONEXPIRED, "Session expired (fault injected on send)");
+        maybeInjectSendFault();
 
         if (!requests_queue.tryPush(std::move(info), args.operation_timeout_ms))
         {
             if (requests_queue.isFinished())
                 throw Exception(Error::ZSESSIONEXPIRED, "Session expired");
 
-            throw Exception(Error::ZOPERATIONTIMEOUT, "Cannot push request to queue within operation timeout");
+            throw Exception(Error::ZOPERATIONTIMEOUT, "Cannot push request to queue within operation timeout of {} ms", args.operation_timeout_ms);
         }
     }
     catch (...)
@@ -1083,7 +1089,7 @@ void ZooKeeper::pushRequest(RequestInfo && info)
     ProfileEvents::increment(ProfileEvents::ZooKeeperTransactions);
 }
 
-KeeperApiVersion ZooKeeper::getApiVersion()
+KeeperApiVersion ZooKeeper::getApiVersion() const
 {
     return keeper_api_version;
 }
@@ -1323,7 +1329,7 @@ void ZooKeeper::close()
     request_info.request = std::make_shared<ZooKeeperCloseRequest>(std::move(request));
 
     if (!requests_queue.tryPush(std::move(request_info), args.operation_timeout_ms))
-        throw Exception(Error::ZOPERATIONTIMEOUT, "Cannot push close request to queue within operation timeout");
+        throw Exception(Error::ZOPERATIONTIMEOUT, "Cannot push close request to queue within operation timeout of {} ms", args.operation_timeout_ms);
 
     ProfileEvents::increment(ProfileEvents::ZooKeeperClose);
 }
@@ -1388,4 +1394,61 @@ void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr &, const ZooKeepe
 {}
 #endif
 
+
+void ZooKeeper::setServerCompletelyStarted()
+{
+    if (!args.enable_fault_injections_during_startup)
+        setupFaultDistributions();
+}
+
+void ZooKeeper::setupFaultDistributions()
+{
+    /// It makes sense (especially, for async requests) to inject a fault in two places:
+    /// pushRequest (before request is sent) and receiveEvent (after request was executed).
+    if (0 < args.send_fault_probability && args.send_fault_probability <= 1)
+    {
+        LOG_INFO(log, "ZK send fault: {}%", args.send_fault_probability * 100);
+        send_inject_fault.emplace(args.send_fault_probability);
+    }
+    if (0 < args.recv_fault_probability && args.recv_fault_probability <= 1)
+    {
+        LOG_INFO(log, "ZK recv fault: {}%", args.recv_fault_probability * 100);
+        recv_inject_fault.emplace(args.recv_fault_probability);
+    }
+    if (0 < args.send_sleep_probability && args.send_sleep_probability <= 1)
+    {
+        LOG_INFO(log, "ZK send sleep: {}% -> {}ms", args.send_sleep_probability * 100, args.send_sleep_ms);
+        send_inject_sleep.emplace(args.send_sleep_probability);
+    }
+    if (0 < args.recv_sleep_probability && args.recv_sleep_probability <= 1)
+    {
+        LOG_INFO(log, "ZK recv sleep: {}% -> {}ms", args.recv_sleep_probability * 100, args.recv_sleep_ms);
+        recv_inject_sleep.emplace(args.recv_sleep_probability);
+    }
+    inject_setup.test_and_set();
+}
+
+void ZooKeeper::maybeInjectSendFault()
+{
+    if (unlikely(inject_setup.test() && send_inject_fault && send_inject_fault.value()(thread_local_rng)))
+        throw Exception(Error::ZSESSIONEXPIRED, "Session expired (fault injected on recv)");
+}
+
+void ZooKeeper::maybeInjectRecvFault()
+{
+    if (unlikely(inject_setup.test() && recv_inject_fault && recv_inject_fault.value()(thread_local_rng)))
+        throw Exception(Error::ZSESSIONEXPIRED, "Session expired (fault injected on recv)");
+}
+
+void ZooKeeper::maybeInjectSendSleep()
+{
+    if (unlikely(inject_setup.test() && send_inject_sleep && send_inject_sleep.value()(thread_local_rng)))
+        sleepForMilliseconds(args.send_sleep_ms);
+}
+
+void ZooKeeper::maybeInjectRecvSleep()
+{
+    if (unlikely(inject_setup.test() && recv_inject_sleep && recv_inject_sleep.value()(thread_local_rng)))
+        sleepForMilliseconds(args.recv_sleep_ms);
+}
 }
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.h b/src/Common/ZooKeeper/ZooKeeperImpl.h
index 6b70f8bc753..944c5032fac 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.h
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.h
@@ -125,6 +125,8 @@ public:
     /// Useful to check owner of ephemeral node.
     int64_t getSessionID() const override { return session_id; }
 
+    Poco::Net::SocketAddress getConnectedAddress() const override { return connected_zk_address; }
+
     void executeGenericRequest(
         const ZooKeeperRequestPtr & request,
         ResponseCallback callback);
@@ -179,7 +181,7 @@ public:
         const Requests & requests,
         MultiCallback callback) override;
 
-    DB::KeeperApiVersion getApiVersion() override;
+    DB::KeeperApiVersion getApiVersion() const override;
 
     /// Without forcefully invalidating (finalizing) ZooKeeper session before
     /// establishing a new one, there was a possibility that server is using
@@ -197,13 +199,25 @@ public:
 
     void setZooKeeperLog(std::shared_ptr<DB::ZooKeeperLog> zk_log_);
 
+    void setServerCompletelyStarted();
+
 private:
     ACLs default_acls;
+    Poco::Net::SocketAddress connected_zk_address;
 
     zkutil::ZooKeeperArgs args;
 
+    /// Fault injection
+    void maybeInjectSendFault();
+    void maybeInjectRecvFault();
+    void maybeInjectSendSleep();
+    void maybeInjectRecvSleep();
+    void setupFaultDistributions();
+    std::atomic_flag inject_setup = ATOMIC_FLAG_INIT;
     std::optional<std::bernoulli_distribution> send_inject_fault;
     std::optional<std::bernoulli_distribution> recv_inject_fault;
+    std::optional<std::bernoulli_distribution> send_inject_sleep;
+    std::optional<std::bernoulli_distribution> recv_inject_sleep;
 
     Poco::Net::StreamSocket socket;
     /// To avoid excessive getpeername(2) calls.
@@ -244,8 +258,30 @@ private:
     Watches watches TSA_GUARDED_BY(watches_mutex);
     std::mutex watches_mutex;
 
-    ThreadFromGlobalPool send_thread;
-    ThreadFromGlobalPool receive_thread;
+    /// A wrapper around ThreadFromGlobalPool that allows to call join() on it from multiple threads.
+    class ThreadReference
+    {
+    public:
+        const ThreadReference & operator = (ThreadFromGlobalPool && thread_)
+        {
+            std::lock_guard<std::mutex> l(lock);
+            thread = std::move(thread_);
+            return *this;
+        }
+
+        void join()
+        {
+            std::lock_guard<std::mutex> l(lock);
+            if (thread.joinable())
+                thread.join();
+        }
+    private:
+        std::mutex lock;
+        ThreadFromGlobalPool thread;
+    };
+
+    ThreadReference send_thread;
+    ThreadReference receive_thread;
 
     Poco::Logger * log;
 
diff --git a/src/Common/ZooKeeper/ZooKeeperLock.cpp b/src/Common/ZooKeeper/ZooKeeperLock.cpp
index 1200dcdb533..6ee1c380efb 100644
--- a/src/Common/ZooKeeper/ZooKeeperLock.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperLock.cpp
@@ -1,4 +1,6 @@
 #include <Common/ZooKeeper/ZooKeeperLock.h>
+#include <Common/logger_useful.h>
+#include <Common/ErrorCodes.h>
 #include <filesystem>
 
 namespace DB
@@ -41,6 +43,16 @@ ZooKeeperLock::~ZooKeeperLock()
     }
 }
 
+bool ZooKeeperLock::isLocked() const
+{
+    return locked;
+}
+
+const std::string & ZooKeeperLock::getLockPath() const
+{
+    return lock_path;
+}
+
 void ZooKeeperLock::unlock()
 {
     if (!locked)
diff --git a/src/Common/ZooKeeper/ZooKeeperLock.h b/src/Common/ZooKeeper/ZooKeeperLock.h
index f249e69dcc3..146527c6c94 100644
--- a/src/Common/ZooKeeper/ZooKeeperLock.h
+++ b/src/Common/ZooKeeper/ZooKeeperLock.h
@@ -3,7 +3,8 @@
 #include <Common/ZooKeeper/KeeperException.h>
 #include <memory>
 #include <string>
-#include <Common/logger_useful.h>
+
+namespace Poco { class Logger; }
 
 namespace zkutil
 {
@@ -37,6 +38,8 @@ public:
 
     void unlock();
     bool tryLock();
+    bool isLocked() const;
+    const std::string & getLockPath() const;
 
 private:
     zkutil::ZooKeeperPtr zookeeper;
diff --git a/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.h b/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.h
index 491f97b52bd..bf99cb76798 100644
--- a/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.h
+++ b/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.h
@@ -4,7 +4,9 @@
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
+#include <Common/logger_useful.h>
 #include <Common/randomSeed.h>
+#include "Coordination/KeeperConstants.h"
 
 namespace DB
 {
@@ -17,17 +19,26 @@ namespace ErrorCodes
 class RandomFaultInjection
 {
 public:
+    bool must_fail_after_op = false;
+    bool must_fail_before_op = false;
+
     RandomFaultInjection(double probability, UInt64 seed_) : rndgen(seed_), distribution(probability) { }
 
     void beforeOperation()
     {
-        if (distribution(rndgen))
+        if (distribution(rndgen) || must_fail_before_op)
+        {
+            must_fail_before_op = false;
             throw zkutil::KeeperException("Fault injection before operation", Coordination::Error::ZSESSIONEXPIRED);
+        }
     }
     void afterOperation()
     {
-        if (distribution(rndgen))
+        if (distribution(rndgen) || must_fail_after_op)
+        {
+            must_fail_after_op = false;
             throw zkutil::KeeperException("Fault injection after operation", Coordination::Error::ZOPERATIONTIMEOUT);
+        }
     }
 
 private:
@@ -40,6 +51,9 @@ private:
 ///
 class ZooKeeperWithFaultInjection
 {
+    template<bool async_insert>
+    friend class ReplicatedMergeTreeSinkImpl;
+
     using zk = zkutil::ZooKeeper;
 
     zk::Ptr keeper;
@@ -114,6 +128,7 @@ public:
 
     void setKeeper(zk::Ptr const & keeper_) { keeper = keeper_; }
     bool isNull() const { return keeper.get() == nullptr; }
+    bool expired() { return keeper->expired(); }
 
     ///
     /// mirror ZooKeeper interface
@@ -232,6 +247,11 @@ public:
         return access("exists", path, [&]() { return keeper->exists(path, stat, watch); });
     }
 
+    bool existsNoFailureInjection(const std::string & path, Coordination::Stat * stat = nullptr, const zkutil::EventPtr & watch = nullptr)
+    {
+        return access<false, false, false>("exists", path, [&]() { return keeper->exists(path, stat, watch); });
+    }
+
     zkutil::ZooKeeper::MultiExistsResponse exists(const std::vector<std::string> & paths)
     {
         return access("exists", !paths.empty() ? paths.front() : "", [&]() { return keeper->exists(paths); });
@@ -239,19 +259,33 @@ public:
 
     std::string create(const std::string & path, const std::string & data, int32_t mode)
     {
-        auto path_created = access(
-            "create",
+        std::string path_created;
+        auto code = tryCreate(path, data, mode, path_created);
+
+        if (code != Coordination::Error::ZOK)
+            throw zkutil::KeeperException(code, path);
+
+        return path_created;
+    }
+
+    Coordination::Error tryCreate(const std::string & path, const std::string & data, int32_t mode, std::string & path_created)
+    {
+        path_created.clear();
+
+        auto error = access(
+            "tryCreate",
             path,
-            [&]() { return keeper->create(path, data, mode); },
-            [&](std::string const & result_path)
+            [&]() { return keeper->tryCreate(path, data, mode, path_created); },
+            [&](Coordination::Error & code)
             {
                 try
                 {
-                    if (mode == zkutil::CreateMode::EphemeralSequential || mode == zkutil::CreateMode::Ephemeral)
+                    if (!path_created.empty() && (mode == zkutil::CreateMode::EphemeralSequential || mode == zkutil::CreateMode::Ephemeral))
                     {
-                        keeper->remove(result_path);
+                        keeper->remove(path_created);
                         if (unlikely(logger))
-                            LOG_TRACE(logger, "ZooKeeperWithFaultInjection cleanup: seed={} func={} path={}", seed, "create", result_path);
+                            LOG_TRACE(logger, "ZooKeeperWithFaultInjection cleanup: seed={} func={} path={} path_created={} code={}",
+                                seed, "tryCreate", path, path_created, code);
                     }
                 }
                 catch (const zkutil::KeeperException & e)
@@ -259,10 +293,11 @@ public:
                     if (unlikely(logger))
                         LOG_TRACE(
                             logger,
-                            "ZooKeeperWithFaultInjection cleanup FAILED: seed={} func={} path={} code={} message={} ",
+                            "ZooKeeperWithFaultInjection cleanup FAILED: seed={} func={} path={} path_created={} code={} message={} ",
                             seed,
-                            "create",
-                            result_path,
+                            "tryCreate",
+                            path,
+                            path_created,
                             e.code,
                             e.message());
                 }
@@ -271,11 +306,28 @@ public:
         /// collect ephemeral nodes when no fault was injected (to clean up later)
         if (unlikely(fault_policy))
         {
-            if (mode == zkutil::CreateMode::EphemeralSequential || mode == zkutil::CreateMode::Ephemeral)
+            if (!path_created.empty() && (mode == zkutil::CreateMode::EphemeralSequential || mode == zkutil::CreateMode::Ephemeral))
                 ephemeral_nodes.push_back(path_created);
         }
 
-        return path_created;
+        return error;
+    }
+
+    Coordination::Error tryCreate(const std::string & path, const std::string & data, int32_t mode)
+    {
+        String path_created;
+        return tryCreate(path, data, mode, path_created);
+    }
+
+    void createIfNotExists(const std::string & path, const std::string & data)
+    {
+        std::string path_created;
+        auto code = tryCreate(path, data, zkutil::CreateMode::Persistent, path_created);
+
+        if (code == Coordination::Error::ZOK || code == Coordination::Error::ZNODEEXISTS)
+            return;
+
+        throw zkutil::KeeperException(code, path);
     }
 
     Coordination::Responses multi(const Coordination::Requests & requests)
@@ -306,6 +358,31 @@ public:
         return access("tryRemove", path, [&]() { return keeper->tryRemove(path, version); });
     }
 
+    void removeRecursive(const std::string & path)
+    {
+        return access("removeRecursive", path, [&]() { return keeper->removeRecursive(path); });
+    }
+
+    std::string sync(const std::string & path)
+    {
+        return access("sync", path, [&]() { return keeper->sync(path); });
+    }
+
+    Coordination::Error trySet(const std::string & path, const std::string & data, int32_t version = -1, Coordination::Stat * stat = nullptr)
+    {
+        return access("trySet", path, [&]() { return keeper->trySet(path, data, version, stat); });
+    }
+
+    void checkExistsAndGetCreateAncestorsOps(const std::string & path, Coordination::Requests & requests)
+    {
+        return access("checkExistsAndGetCreateAncestorsOps", path, [&]() { return keeper->checkExistsAndGetCreateAncestorsOps(path, requests); });
+    }
+
+    void handleEphemeralNodeExistenceNoFailureInjection(const std::string & path, const std::string & fast_delete_if_equal_value)
+    {
+        return access<false, false, false>("handleEphemeralNodeExistence", path, [&]() { return keeper->handleEphemeralNodeExistence(path, fast_delete_if_equal_value); });
+    }
+
     void cleanupEphemeralNodes()
     {
         for (const auto & path : ephemeral_nodes)
@@ -325,6 +402,11 @@ public:
         ephemeral_nodes.clear();
     }
 
+    KeeperApiVersion getApiVersion() const
+    {
+        return keeper->getApiVersion();
+    }
+
 private:
     void faultInjectionBefore(std::function<void()> fault_cleanup)
     {
diff --git a/src/Common/assertProcessUserMatchesDataOwner.cpp b/src/Common/assertProcessUserMatchesDataOwner.cpp
new file mode 100644
index 00000000000..f2557a4aaaf
--- /dev/null
+++ b/src/Common/assertProcessUserMatchesDataOwner.cpp
@@ -0,0 +1,66 @@
+#include <Common/assertProcessUserMatchesDataOwner.h>
+#include <Common/logger_useful.h>
+#include <Common/Exception.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <pwd.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int FAILED_TO_GETPWUID;
+    extern const int MISMATCHING_USERS_FOR_PROCESS_AND_DATA;
+}
+
+namespace
+{
+    std::string getUserName(uid_t user_id)
+    {
+        /// Try to convert user id into user name.
+        auto buffer_size = sysconf(_SC_GETPW_R_SIZE_MAX);
+        if (buffer_size <= 0)
+            buffer_size = 1024;
+        std::string buffer;
+        buffer.reserve(buffer_size);
+
+        struct passwd passwd_entry;
+        struct passwd * result = nullptr;
+        const auto error = getpwuid_r(user_id, &passwd_entry, buffer.data(), buffer_size, &result);
+
+        if (error)
+            throwFromErrno("Failed to find user name for " + std::to_string(user_id), ErrorCodes::FAILED_TO_GETPWUID, error);
+        else if (result)
+            return result->pw_name;
+        return std::to_string(user_id);
+    }
+}
+
+void assertProcessUserMatchesDataOwner(const std::string & path, std::function<void(const std::string &)> on_warning)
+{
+    /// Check that the process user id matches the owner of the data.
+    const auto effective_user_id = geteuid();
+    struct stat statbuf;
+    if (stat(path.c_str(), &statbuf) == 0 && effective_user_id != statbuf.st_uid)
+    {
+        const auto effective_user = getUserName(effective_user_id);
+        const auto data_owner = getUserName(statbuf.st_uid);
+        std::string message = fmt::format(
+            "Effective user of the process ({}) does not match the owner of the data ({}).",
+            effective_user, data_owner);
+
+        if (effective_user_id == 0)
+        {
+            message += fmt::format(" Run under 'sudo -u {}'.", data_owner);
+            throw Exception(ErrorCodes::MISMATCHING_USERS_FOR_PROCESS_AND_DATA, "{}", message);
+        }
+        else
+        {
+            on_warning(message);
+        }
+    }
+}
+
+}
diff --git a/src/Common/assertProcessUserMatchesDataOwner.h b/src/Common/assertProcessUserMatchesDataOwner.h
new file mode 100644
index 00000000000..b31d795da71
--- /dev/null
+++ b/src/Common/assertProcessUserMatchesDataOwner.h
@@ -0,0 +1,10 @@
+#pragma once
+#include <string>
+
+namespace DB
+{
+
+void assertProcessUserMatchesDataOwner(
+    const std::string & path, std::function<void(const std::string &)> on_warning);
+
+}
diff --git a/src/Common/atomicRename.cpp b/src/Common/atomicRename.cpp
index 23d308b0d56..69e077e38f5 100644
--- a/src/Common/atomicRename.cpp
+++ b/src/Common/atomicRename.cpp
@@ -42,7 +42,7 @@ namespace ErrorCodes
         #define __NR_renameat2 316
     #elif defined(__aarch64__)
         #define __NR_renameat2 276
-    #elif defined(__ppc64__)
+    #elif defined(__powerpc64__)
         #define __NR_renameat2 357
     #elif defined(__riscv)
         #define __NR_renameat2 276
@@ -195,13 +195,13 @@ static void renameNoReplaceFallback(const std::string & old_path, const std::str
 }
 
 /// Do not use [[noreturn]] to avoid warnings like "code will never be executed" in other places
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmissing-noreturn"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-noreturn"
 static void renameExchangeFallback(const std::string &, const std::string &)
 {
     throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "System call renameat2() is not supported");
 }
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
 void renameNoReplace(const std::string & old_path, const std::string & new_path)
 {
diff --git a/src/Common/config.h.in b/src/Common/config.h.in
index d5080ba447e..71b4e098c8f 100644
--- a/src/Common/config.h.in
+++ b/src/Common/config.h.in
@@ -57,3 +57,5 @@
 #cmakedefine01 USE_SKIM
 #cmakedefine01 USE_OPENSSL_INTREE
 #cmakedefine01 USE_ULID
+#cmakedefine01 FIU_ENABLE
+#cmakedefine01 USE_BCRYPT
diff --git a/src/Common/escapeForFileName.cpp b/src/Common/escapeForFileName.cpp
index bcca04706dc..a1f9bff28d0 100644
--- a/src/Common/escapeForFileName.cpp
+++ b/src/Common/escapeForFileName.cpp
@@ -1,4 +1,4 @@
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/escapeForFileName.h>
 
diff --git a/src/Common/examples/arena_with_free_lists.cpp b/src/Common/examples/arena_with_free_lists.cpp
index 4f209ccb5b2..3f1b3e88328 100644
--- a/src/Common/examples/arena_with_free_lists.cpp
+++ b/src/Common/examples/arena_with_free_lists.cpp
@@ -270,7 +270,7 @@ int main(int argc, char ** argv)
 
         watch.stop();
         std::cerr
-            << "Insert info arena. Bytes: " << arena.size()
+            << "Insert info arena. Bytes: " << arena.allocatedBytes()
             << ", elapsed: " << watch.elapsedSeconds()
             << " (" << data.size() / watch.elapsedSeconds() << " elem/sec.,"
             << " " << sum_strings_size / 1048576.0 / watch.elapsedSeconds() << " MiB/sec.)"
@@ -298,7 +298,7 @@ int main(int argc, char ** argv)
 
         watch.stop();
         std::cerr
-            << "Randomly remove and insert elements. Bytes: " << arena.size()
+            << "Randomly remove and insert elements. Bytes: " << arena.allocatedBytes()
             << ", elapsed: " << watch.elapsedSeconds()
             << " (" << data.size() / watch.elapsedSeconds() << " elem/sec.,"
             << " " << bytes / 1048576.0 / watch.elapsedSeconds() << " MiB/sec.)"
@@ -331,7 +331,7 @@ int main(int argc, char ** argv)
 
         watch.stop();
         std::cerr
-            << "Filling cache. Bytes: " << arena.size()
+            << "Filling cache. Bytes: " << arena.allocatedBytes()
             << ", elapsed: " << watch.elapsedSeconds()
             << " (" << data.size() / watch.elapsedSeconds() << " elem/sec.,"
             << " " << bytes / 1048576.0 / watch.elapsedSeconds() << " MiB/sec.)"
diff --git a/src/Common/examples/average.cpp b/src/Common/examples/average.cpp
index 749bad848cc..f281abdced2 100644
--- a/src/Common/examples/average.cpp
+++ b/src/Common/examples/average.cpp
@@ -10,9 +10,6 @@
 #include <Common/Arena.h>
 #include <Common/Stopwatch.h>
 
-#pragma GCC diagnostic ignored "-Wframe-larger-than="
-
-
 /** This test program evaluates different solutions for a simple degenerate task:
   * Aggregate data by UInt8 key, calculate "avg" function on Float values.
   *
@@ -476,7 +473,8 @@ Float NO_INLINE buffered(const PODArray<UInt8> & keys, const PODArray<Float> & v
     return map[0].result();
 }
 
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wframe-larger-than"
 template <size_t UNROLL_COUNT>
 Float NO_INLINE really_unrolled(const PODArray<UInt8> & keys, const PODArray<Float> & values)
 {
@@ -499,6 +497,7 @@ Float NO_INLINE really_unrolled(const PODArray<UInt8> & keys, const PODArray<Flo
 
     return map[0].result();
 }
+#pragma clang diagnostic pop
 
 
 struct State4
diff --git a/src/Common/examples/int_hashes_perf.cpp b/src/Common/examples/int_hashes_perf.cpp
index fecfa0adba8..2b260dca809 100644
--- a/src/Common/examples/int_hashes_perf.cpp
+++ b/src/Common/examples/int_hashes_perf.cpp
@@ -1,6 +1,4 @@
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 #if defined (OS_LINUX)
 #   include <sched.h>
diff --git a/src/Common/examples/parallel_aggregation.cpp b/src/Common/examples/parallel_aggregation.cpp
index bd252b330f3..cf7a3197fef 100644
--- a/src/Common/examples/parallel_aggregation.cpp
+++ b/src/Common/examples/parallel_aggregation.cpp
@@ -17,6 +17,7 @@
 
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
+#include <Common/CurrentMetrics.h>
 
 
 using Key = UInt64;
@@ -28,6 +29,12 @@ using Map = HashMap<Key, Value>;
 using MapTwoLevel = TwoLevelHashMap<Key, Value>;
 
 
+namespace CurrentMetrics
+{
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
+
 struct SmallLock
 {
     std::atomic<int> locked {false};
@@ -247,7 +254,7 @@ int main(int argc, char ** argv)
 
     std::cerr << std::fixed << std::setprecision(2);
 
-    ThreadPool pool(num_threads);
+    ThreadPool pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, num_threads);
 
     Source data(n);
 
diff --git a/src/Common/examples/parallel_aggregation2.cpp b/src/Common/examples/parallel_aggregation2.cpp
index 6c20f46ab0e..1b0ad760490 100644
--- a/src/Common/examples/parallel_aggregation2.cpp
+++ b/src/Common/examples/parallel_aggregation2.cpp
@@ -17,6 +17,7 @@
 
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
+#include <Common/CurrentMetrics.h>
 
 
 using Key = UInt64;
@@ -24,6 +25,12 @@ using Value = UInt64;
 using Source = std::vector<Key>;
 
 
+namespace CurrentMetrics
+{
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
+
 template <typename Map>
 struct AggregateIndependent
 {
@@ -274,7 +281,7 @@ int main(int argc, char ** argv)
 
     std::cerr << std::fixed << std::setprecision(2);
 
-    ThreadPool pool(num_threads);
+    ThreadPool pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, num_threads);
 
     Source data(n);
 
diff --git a/src/Common/examples/symbol_index.cpp b/src/Common/examples/symbol_index.cpp
index 2fcb7498d88..13a49fd65ad 100644
--- a/src/Common/examples/symbol_index.cpp
+++ b/src/Common/examples/symbol_index.cpp
@@ -6,13 +6,10 @@
 #include <iostream>
 #include <dlfcn.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-static NO_INLINE const void * getAddress()
+[[maybe_unused]] static NO_INLINE const void * getAddress()
 {
     return __builtin_return_address(0);
 }
-#pragma GCC diagnostic pop
 
 int main(int argc, char ** argv)
 {
diff --git a/src/Common/examples/thread_creation_latency.cpp b/src/Common/examples/thread_creation_latency.cpp
index 351f709013a..2434759c968 100644
--- a/src/Common/examples/thread_creation_latency.cpp
+++ b/src/Common/examples/thread_creation_latency.cpp
@@ -6,6 +6,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/Exception.h>
 #include <Common/ThreadPool.h>
+#include <Common/CurrentMetrics.h>
 
 
 int value = 0;
@@ -14,6 +15,12 @@ static void f() { ++value; }
 static void * g(void *) { f(); return {}; }
 
 
+namespace CurrentMetrics
+{
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
+
 namespace DB
 {
     namespace ErrorCodes
@@ -65,7 +72,7 @@ int main(int argc, char ** argv)
 
     test(n, "Create and destroy ThreadPool each iteration", []
     {
-        ThreadPool tp(1);
+        ThreadPool tp(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, 1);
         tp.scheduleOrThrowOnError(f);
         tp.wait();
     });
@@ -86,7 +93,7 @@ int main(int argc, char ** argv)
     });
 
     {
-        ThreadPool tp(1);
+        ThreadPool tp(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, 1);
 
         test(n, "Schedule job for Threadpool each iteration", [&tp]
         {
@@ -96,7 +103,7 @@ int main(int argc, char ** argv)
     }
 
     {
-        ThreadPool tp(128);
+        ThreadPool tp(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, 128);
 
         test(n, "Schedule job for Threadpool with 128 threads each iteration", [&tp]
         {
diff --git a/src/Common/filesystemHelpers.cpp b/src/Common/filesystemHelpers.cpp
index 6e1b5573bef..eabc7bdafbb 100644
--- a/src/Common/filesystemHelpers.cpp
+++ b/src/Common/filesystemHelpers.cpp
@@ -383,6 +383,14 @@ bool isSymlink(const fs::path & path)
     return fs::is_symlink(path);        /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
 }
 
+bool isSymlinkNoThrow(const fs::path & path)
+{
+    std::error_code dummy;
+    if (path.filename().empty())
+        return fs::is_symlink(path.parent_path(), dummy);      /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
+    return fs::is_symlink(path, dummy);        /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
+}
+
 fs::path readSymlink(const fs::path & path)
 {
     /// See the comment for isSymlink
diff --git a/src/Common/filesystemHelpers.h b/src/Common/filesystemHelpers.h
index 14ee5f54322..8591cd6cf92 100644
--- a/src/Common/filesystemHelpers.h
+++ b/src/Common/filesystemHelpers.h
@@ -95,6 +95,7 @@ void setModificationTime(const std::string & path, time_t time);
 time_t getChangeTime(const std::string & path);
 
 bool isSymlink(const fs::path & path);
+bool isSymlinkNoThrow(const fs::path & path);
 fs::path readSymlink(const fs::path & path);
 
 }
diff --git a/src/Common/format.h b/src/Common/format.h
index 1a02a064c09..b72c4f15125 100644
--- a/src/Common/format.h
+++ b/src/Common/format.h
@@ -17,18 +17,18 @@ namespace Format
 {
     using IndexPositions = PODArrayWithStackMemory<UInt64, 64>;
 
-    static inline void parseNumber(const String & description, UInt64 l, UInt64 r, UInt64 & res, UInt64 argument_number)
+    static inline UInt64 parseNumber(const String & description, UInt64 l, UInt64 r, UInt64 argument_number)
     {
-        res = 0;
+        UInt64 res = 0;
         for (UInt64 pos = l; pos < r; ++pos)
         {
             if (!isNumericASCII(description[pos]))
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Not a number in curly braces at position {}", std::to_string(pos));
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Not a number in curly braces at position {}", pos);
             res = res * 10 + description[pos] - '0';
             if (res >= argument_number)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Too big number for arguments, must be at most {}",
-                    argument_number - 1);
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Too big number for arguments, must be at most {}", argument_number - 1);
         }
+        return res;
     }
 
     static inline void init(
@@ -132,8 +132,7 @@ namespace Format
                         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot switch from automatic field numbering to manual field specification");
                     is_plain_numbering = false;
 
-                    UInt64 arg;
-                    parseNumber(pattern, last_open, i, arg, argument_number);
+                    UInt64 arg = parseNumber(pattern, last_open, i, argument_number);
 
                     if (arg >= argument_number)
                         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument is too big for formatting. Note that indexing starts from zero");
diff --git a/src/Common/formatIPv6.cpp b/src/Common/formatIPv6.cpp
index 7c027a23b4d..86e33beb7c3 100644
--- a/src/Common/formatIPv6.cpp
+++ b/src/Common/formatIPv6.cpp
@@ -1,5 +1,5 @@
 #include <Common/formatIPv6.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Common/StringUtils/StringUtils.h>
 
 #include <base/range.h>
diff --git a/src/Common/formatIPv6.h b/src/Common/formatIPv6.h
index bc8f70f047c..be4dfc7391e 100644
--- a/src/Common/formatIPv6.h
+++ b/src/Common/formatIPv6.h
@@ -7,7 +7,7 @@
 #include <utility>
 #include <base/range.h>
 #include <base/unaligned.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Common/StringUtils/StringUtils.h>
 
 constexpr size_t IPV4_BINARY_LENGTH = 4;
@@ -82,11 +82,7 @@ inline bool parseIPv4(T * &src, EOFfunction eof, unsigned char * dst, int32_t fi
             break;
     }
 
-    if constexpr (std::endian::native == std::endian::little)
-        memcpy(dst, &result, sizeof(result));
-    else
-        reverseMemcpy(dst, &result, sizeof(result));
-
+    memcpy(dst, &result, sizeof(result));
     return true;
 }
 
diff --git a/src/Common/formatReadable.h b/src/Common/formatReadable.h
index 6cdc36b4ed2..a05a2a7f9e2 100644
--- a/src/Common/formatReadable.h
+++ b/src/Common/formatReadable.h
@@ -43,7 +43,7 @@ struct fmt::formatter<ReadableSize>
 
         /// Only support {}.
         if (it != end && *it != '}')
-            throw format_error("invalid format");
+            throw fmt::format_error("invalid format");
 
         return it;
     }
@@ -51,6 +51,6 @@ struct fmt::formatter<ReadableSize>
     template <typename FormatContext>
     auto format(const ReadableSize & size, FormatContext & ctx)
     {
-        return format_to(ctx.out(), "{}", formatReadableSizeWithBinarySuffix(size.value));
+        return fmt::format_to(ctx.out(), "{}", formatReadableSizeWithBinarySuffix(size.value));
     }
 };
diff --git a/src/Common/getHashOfLoadedBinary.cpp b/src/Common/getHashOfLoadedBinary.cpp
index da053750036..cc0ad0d2143 100644
--- a/src/Common/getHashOfLoadedBinary.cpp
+++ b/src/Common/getHashOfLoadedBinary.cpp
@@ -4,7 +4,7 @@
 
 #include <link.h>
 #include <array>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 
 static int callback(dl_phdr_info * info, size_t, void * data)
diff --git a/src/Common/getMappedArea.cpp b/src/Common/getMappedArea.cpp
index 573d3194f3d..4f40c604c6a 100644
--- a/src/Common/getMappedArea.cpp
+++ b/src/Common/getMappedArea.cpp
@@ -4,7 +4,7 @@
 #if defined(OS_LINUX)
 
 #include <Common/StringUtils/StringUtils.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 
diff --git a/src/Common/hex.cpp b/src/Common/hex.cpp
deleted file mode 100644
index e8f9b981062..00000000000
--- a/src/Common/hex.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <Common/hex.h>
-
-const char * const hex_digit_to_char_uppercase_table = "0123456789ABCDEF";
-const char * const hex_digit_to_char_lowercase_table = "0123456789abcdef";
-
-const char * const hex_byte_to_char_uppercase_table =
-    "000102030405060708090A0B0C0D0E0F"
-    "101112131415161718191A1B1C1D1E1F"
-    "202122232425262728292A2B2C2D2E2F"
-    "303132333435363738393A3B3C3D3E3F"
-    "404142434445464748494A4B4C4D4E4F"
-    "505152535455565758595A5B5C5D5E5F"
-    "606162636465666768696A6B6C6D6E6F"
-    "707172737475767778797A7B7C7D7E7F"
-    "808182838485868788898A8B8C8D8E8F"
-    "909192939495969798999A9B9C9D9E9F"
-    "A0A1A2A3A4A5A6A7A8A9AAABACADAEAF"
-    "B0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF"
-    "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECF"
-    "D0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF"
-    "E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF"
-    "F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF";
-
-const char * const hex_byte_to_char_lowercase_table =
-    "000102030405060708090a0b0c0d0e0f"
-    "101112131415161718191a1b1c1d1e1f"
-    "202122232425262728292a2b2c2d2e2f"
-    "303132333435363738393a3b3c3d3e3f"
-    "404142434445464748494a4b4c4d4e4f"
-    "505152535455565758595a5b5c5d5e5f"
-    "606162636465666768696a6b6c6d6e6f"
-    "707172737475767778797a7b7c7d7e7f"
-    "808182838485868788898a8b8c8d8e8f"
-    "909192939495969798999a9b9c9d9e9f"
-    "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
-    "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
-    "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
-    "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
-    "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
-    "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff";
-
-const char * const hex_char_to_digit_table =
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\xff\xff\xff\xff\xff\xff" //0-9
-    "\xff\x0a\x0b\x0c\x0d\x0e\x0f\xff\xff\xff\xff\xff\xff\xff\xff\xff" //A-Z
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\x0a\x0b\x0c\x0d\x0e\x0f\xff\xff\xff\xff\xff\xff\xff\xff\xff" //a-z
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-    "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff";
-
-const char * const bin_byte_to_char_table =
-    "0000000000000001000000100000001100000100000001010000011000000111"
-    "0000100000001001000010100000101100001100000011010000111000001111"
-    "0001000000010001000100100001001100010100000101010001011000010111"
-    "0001100000011001000110100001101100011100000111010001111000011111"
-    "0010000000100001001000100010001100100100001001010010011000100111"
-    "0010100000101001001010100010101100101100001011010010111000101111"
-    "0011000000110001001100100011001100110100001101010011011000110111"
-    "0011100000111001001110100011101100111100001111010011111000111111"
-    "0100000001000001010000100100001101000100010001010100011001000111"
-    "0100100001001001010010100100101101001100010011010100111001001111"
-    "0101000001010001010100100101001101010100010101010101011001010111"
-    "0101100001011001010110100101101101011100010111010101111001011111"
-    "0110000001100001011000100110001101100100011001010110011001100111"
-    "0110100001101001011010100110101101101100011011010110111001101111"
-    "0111000001110001011100100111001101110100011101010111011001110111"
-    "0111100001111001011110100111101101111100011111010111111001111111"
-    "1000000010000001100000101000001110000100100001011000011010000111"
-    "1000100010001001100010101000101110001100100011011000111010001111"
-    "1001000010010001100100101001001110010100100101011001011010010111"
-    "1001100010011001100110101001101110011100100111011001111010011111"
-    "1010000010100001101000101010001110100100101001011010011010100111"
-    "1010100010101001101010101010101110101100101011011010111010101111"
-    "1011000010110001101100101011001110110100101101011011011010110111"
-    "1011100010111001101110101011101110111100101111011011111010111111"
-    "1100000011000001110000101100001111000100110001011100011011000111"
-    "1100100011001001110010101100101111001100110011011100111011001111"
-    "1101000011010001110100101101001111010100110101011101011011010111"
-    "1101100011011001110110101101101111011100110111011101111011011111"
-    "1110000011100001111000101110001111100100111001011110011011100111"
-    "1110100011101001111010101110101111101100111011011110111011101111"
-    "1111000011110001111100101111001111110100111101011111011011110111"
-    "1111100011111001111110101111101111111100111111011111111011111111";
diff --git a/src/Common/hex.h b/src/Common/hex.h
deleted file mode 100644
index 062a6c27f76..00000000000
--- a/src/Common/hex.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#pragma once
-#include <string>
-
-
-/// Maps 0..15 to 0..9A..F or 0..9a..f correspondingly.
-
-extern const char * const hex_digit_to_char_uppercase_table;
-extern const char * const hex_digit_to_char_lowercase_table;
-
-inline char hexDigitUppercase(unsigned char c)
-{
-    return hex_digit_to_char_uppercase_table[c];
-}
-
-inline char hexDigitLowercase(unsigned char c)
-{
-    return hex_digit_to_char_lowercase_table[c];
-}
-
-
-#include <cstring>
-#include <cstddef>
-
-#include <base/types.h>
-
-
-/// Maps 0..255 to 00..FF or 00..ff correspondingly
-
-extern const char * const hex_byte_to_char_uppercase_table;
-extern const char * const hex_byte_to_char_lowercase_table;
-
-inline void writeHexByteUppercase(UInt8 byte, void * out)
-{
-    memcpy(out, &hex_byte_to_char_uppercase_table[static_cast<size_t>(byte) * 2], 2);
-}
-
-inline void writeHexByteLowercase(UInt8 byte, void * out)
-{
-    memcpy(out, &hex_byte_to_char_lowercase_table[static_cast<size_t>(byte) * 2], 2);
-}
-
-extern const char * const bin_byte_to_char_table;
-
-inline void writeBinByte(UInt8 byte, void * out)
-{
-    memcpy(out, &bin_byte_to_char_table[static_cast<size_t>(byte) * 8], 8);
-}
-
-/// Produces hex representation of an unsigned int with leading zeros (for checksums)
-template <typename TUInt>
-inline void writeHexUIntImpl(TUInt uint_, char * out, const char * const table)
-{
-    union
-    {
-        TUInt value;
-        UInt8 uint8[sizeof(TUInt)];
-    };
-
-    value = uint_;
-
-    for (size_t i = 0; i < sizeof(TUInt); ++i)
-    {
-        if constexpr (std::endian::native == std::endian::little)
-            memcpy(out + i * 2, &table[static_cast<size_t>(uint8[sizeof(TUInt) - 1 - i]) * 2], 2);
-        else
-            memcpy(out + i * 2, &table[static_cast<size_t>(uint8[i]) * 2], 2);
-    }
-}
-
-template <typename TUInt>
-inline void writeHexUIntUppercase(TUInt uint_, char * out)
-{
-    writeHexUIntImpl(uint_, out, hex_byte_to_char_uppercase_table);
-}
-
-template <typename TUInt>
-inline void writeHexUIntLowercase(TUInt uint_, char * out)
-{
-    writeHexUIntImpl(uint_, out, hex_byte_to_char_lowercase_table);
-}
-
-template <typename TUInt>
-std::string getHexUIntUppercase(TUInt uint_)
-{
-    std::string res(sizeof(TUInt) * 2, '\0');
-    writeHexUIntUppercase(uint_, res.data());
-    return res;
-}
-
-template <typename TUInt>
-std::string getHexUIntLowercase(TUInt uint_)
-{
-    std::string res(sizeof(TUInt) * 2, '\0');
-    writeHexUIntLowercase(uint_, res.data());
-    return res;
-}
-
-
-/// Maps 0..9, A..F, a..f to 0..15. Other chars are mapped to implementation specific value.
-
-extern const char * const hex_char_to_digit_table;
-
-inline UInt8 unhex(char c)
-{
-    return hex_char_to_digit_table[static_cast<UInt8>(c)];
-}
-
-inline UInt8 unhex2(const char * data)
-{
-    return
-          static_cast<UInt8>(unhex(data[0])) * 0x10
-        + static_cast<UInt8>(unhex(data[1]));
-}
-
-inline UInt16 unhex4(const char * data)
-{
-    return
-          static_cast<UInt16>(unhex(data[0])) * 0x1000
-        + static_cast<UInt16>(unhex(data[1])) * 0x100
-        + static_cast<UInt16>(unhex(data[2])) * 0x10
-        + static_cast<UInt16>(unhex(data[3]));
-}
-
-template <typename TUInt>
-TUInt unhexUInt(const char * data)
-{
-    TUInt res = 0;
-    if constexpr ((sizeof(TUInt) <= 8) || ((sizeof(TUInt) % 8) != 0))
-    {
-        for (size_t i = 0; i < sizeof(TUInt) * 2; ++i, ++data)
-        {
-            res <<= 4;
-            res += unhex(*data);
-        }
-    }
-    else
-    {
-        for (size_t i = 0; i < sizeof(TUInt) / 8; ++i, data += 16)
-        {
-            res <<= 64;
-            res += unhexUInt<UInt64>(data);
-        }
-    }
-    return res;
-}
diff --git a/src/Common/interpolate.h b/src/Common/interpolate.h
deleted file mode 100644
index 05900563b80..00000000000
--- a/src/Common/interpolate.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include <cmath>
-
-
-inline double interpolateLinear(double min, double max, double ratio)
-{
-    return min + (max - min) * ratio;
-}
-
-
-/** It is linear interpolation in logarithmic coordinates.
-  * Exponential interpolation is related to linear interpolation
-  *  exactly in same way as geometric mean is related to arithmetic mean.
-  * 'min' must be greater than zero, 'ratio' must be from 0 to 1.
-  */
-inline double interpolateExponential(double min, double max, double ratio)
-{
-    return min * std::pow(max / min, ratio);
-}
diff --git a/src/Common/isLocalAddress.cpp b/src/Common/isLocalAddress.cpp
index 596fd4caad7..7569c6fc14e 100644
--- a/src/Common/isLocalAddress.cpp
+++ b/src/Common/isLocalAddress.cpp
@@ -44,7 +44,7 @@ struct NetworkInterfaces
             std::optional<Poco::Net::IPAddress> interface_address;
             switch (family)
             {
-                /// We interested only in IP-adresses
+                /// We interested only in IP-addresses
                 case AF_INET:
                 {
                     interface_address.emplace(*(iface->ifa_addr));
diff --git a/src/Common/logger_useful.h b/src/Common/logger_useful.h
index 170ca1c3b10..3ac950cbdfb 100644
--- a/src/Common/logger_useful.h
+++ b/src/Common/logger_useful.h
@@ -6,54 +6,36 @@
 #include <Poco/Logger.h>
 #include <Poco/Message.h>
 #include <Common/CurrentThread.h>
+#include <Common/ProfileEvents.h>
 #include <Common/LoggingFormatStringHelpers.h>
 
 namespace Poco { class Logger; }
 
-/// This wrapper is useful to save formatted message into a String before sending it to a logger
-class LogToStrImpl
-{
-    String & out_str;
-    Poco::Logger * logger;
-    bool propagate_to_actual_log = true;
-public:
-    LogToStrImpl(String & out_str_, Poco::Logger * logger_) : out_str(out_str_) , logger(logger_) {}
-    LogToStrImpl & operator -> () { return *this; }
-    bool is(Poco::Message::Priority priority) { propagate_to_actual_log &= logger->is(priority); return true; }
-    LogToStrImpl * getChannel() {return this; }
-    const String & name() const { return logger->name(); }
-    void log(const Poco::Message & message)
-    {
-        out_str = message.getText();
-        if (!propagate_to_actual_log)
-            return;
-        if (auto * channel = logger->getChannel())
-            channel->log(message);
-    }
-};
 
 #define LogToStr(x, y) std::make_unique<LogToStrImpl>(x, y)
+#define LogFrequencyLimiter(x, y) std::make_unique<LogFrequencyLimiterIml>(x, y)
 
 namespace
 {
-    [[maybe_unused]] const ::Poco::Logger * getLogger(const ::Poco::Logger * logger) { return logger; };
-    [[maybe_unused]] const ::Poco::Logger * getLogger(const std::atomic<::Poco::Logger *> & logger) { return logger.load(); };
-    [[maybe_unused]] std::unique_ptr<LogToStrImpl> getLogger(std::unique_ptr<LogToStrImpl> && logger) { return logger; };
+    [[maybe_unused]] const ::Poco::Logger * getLogger(const ::Poco::Logger * logger) { return logger; }
+    [[maybe_unused]] const ::Poco::Logger * getLogger(const std::atomic<::Poco::Logger *> & logger) { return logger.load(); }
+    [[maybe_unused]] std::unique_ptr<LogToStrImpl> getLogger(std::unique_ptr<LogToStrImpl> && logger) { return logger; }
+    [[maybe_unused]] std::unique_ptr<LogFrequencyLimiterIml> getLogger(std::unique_ptr<LogFrequencyLimiterIml> && logger) { return logger; }
 }
 
 #define LOG_IMPL_FIRST_ARG(X, ...) X
 
 /// Logs a message to a specified logger with that level.
 /// If more than one argument is provided,
-///  the first argument is interpreted as template with {}-substitutions
-///  and the latter arguments treat as values to substitute.
-/// If only one argument is provided, it is threat as message without substitutions.
+///  the first argument is interpreted as a template with {}-substitutions
+///  and the latter arguments are treated as values to substitute.
+/// If only one argument is provided, it is treated as a message without substitutions.
 
 #define LOG_IMPL(logger, priority, PRIORITY, ...) do                              \
 {                                                                                 \
     auto _logger = ::getLogger(logger);                                           \
     const bool _is_clients_log = (DB::CurrentThread::getGroup() != nullptr) &&    \
-        (DB::CurrentThread::getGroup()->client_logs_level >= (priority));         \
+        (DB::CurrentThread::get().getClientLogsLevel() >= (priority));            \
     if (_is_clients_log || _logger->is((PRIORITY)))                               \
     {                                                                             \
         std::string formatted_message = numArgs(__VA_ARGS__) > 1 ? fmt::format(__VA_ARGS__) : firstArg(__VA_ARGS__); \
@@ -65,9 +47,10 @@ namespace
             file_function += "; ";                                                \
             file_function += __PRETTY_FUNCTION__;                                 \
             Poco::Message poco_message(_logger->name(), formatted_message,        \
-                (PRIORITY), file_function.c_str(), __LINE__, tryGetStaticFormatString(LOG_IMPL_FIRST_ARG(__VA_ARGS__)));    \
+                (PRIORITY), file_function.c_str(), __LINE__, tryGetStaticFormatString(LOG_IMPL_FIRST_ARG(__VA_ARGS__))); \
             _channel->log(poco_message);                                          \
         }                                                                         \
+        ProfileEvents::incrementForLogMessage(PRIORITY);                          \
     }                                                                             \
 } while (false)
 
diff --git a/src/Common/makeSocketAddress.cpp b/src/Common/makeSocketAddress.cpp
new file mode 100644
index 00000000000..b5df6a4ef03
--- /dev/null
+++ b/src/Common/makeSocketAddress.cpp
@@ -0,0 +1,36 @@
+#include <Common/makeSocketAddress.h>
+#include <Common/logger_useful.h>
+#include <Poco/Net/NetException.h>
+
+namespace DB
+{
+
+Poco::Net::SocketAddress makeSocketAddress(const std::string & host, uint16_t port, Poco::Logger * log)
+{
+    Poco::Net::SocketAddress socket_address;
+    try
+    {
+        socket_address = Poco::Net::SocketAddress(host, port);
+    }
+    catch (const Poco::Net::DNSException & e)
+    {
+        const auto code = e.code();
+        if (code == EAI_FAMILY
+#if defined(EAI_ADDRFAMILY)
+                    || code == EAI_ADDRFAMILY
+#endif
+        )
+        {
+            LOG_ERROR(log, "Cannot resolve listen_host ({}), error {}: {}. "
+                "If it is an IPv6 address and your host has disabled IPv6, then consider to "
+                "specify IPv4 address to listen in <listen_host> element of configuration "
+                "file. Example: <listen_host>0.0.0.0</listen_host>",
+                host, e.code(), e.message());
+        }
+
+        throw;
+    }
+    return socket_address;
+}
+
+}
diff --git a/src/Common/makeSocketAddress.h b/src/Common/makeSocketAddress.h
new file mode 100644
index 00000000000..9c7d10a0471
--- /dev/null
+++ b/src/Common/makeSocketAddress.h
@@ -0,0 +1,11 @@
+#pragma once
+#include <Poco/Net/SocketAddress.h>
+
+namespace Poco { class Logger; }
+
+namespace DB
+{
+
+Poco::Net::SocketAddress makeSocketAddress(const std::string & host, uint16_t port, Poco::Logger * log);
+
+}
diff --git a/src/Common/malloc.cpp b/src/Common/malloc.cpp
index ff6f2b80686..dd1bde87d46 100644
--- a/src/Common/malloc.cpp
+++ b/src/Common/malloc.cpp
@@ -5,8 +5,6 @@
 /// dedicated object (namely clickhouse_malloc.o), and it will show earlier in the link command
 /// than malloc libs like libjemalloc.a. As a result, these symbols get picked in time right after.
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wredundant-decls"
 extern "C"
 {
     void *malloc(size_t size);
@@ -21,7 +19,6 @@ extern "C"
     void *pvalloc(size_t size);
 #endif
 }
-#pragma GCC diagnostic pop
 
 template<typename T>
 inline void ignore(T x __attribute__((unused)))
diff --git a/src/Common/memcmpSmall.h b/src/Common/memcmpSmall.h
index e95a21b836d..e0b232a3485 100644
--- a/src/Common/memcmpSmall.h
+++ b/src/Common/memcmpSmall.h
@@ -502,9 +502,7 @@ inline bool memoryIsZeroSmallAllowOverflow15(const void * data, size_t size)
 #elif defined(__aarch64__) && defined(__ARM_NEON)
 
 #    include <arm_neon.h>
-#    ifdef HAS_RESERVED_IDENTIFIER
-#        pragma clang diagnostic ignored "-Wreserved-identifier"
-#    endif
+#      pragma clang diagnostic ignored "-Wreserved-identifier"
 
 inline uint64_t getNibbleMask(uint8x16_t res)
 {
diff --git a/src/Common/memcpySmall.h b/src/Common/memcpySmall.h
index 4f38095c7f1..5eaa1203f05 100644
--- a/src/Common/memcpySmall.h
+++ b/src/Common/memcpySmall.h
@@ -8,9 +8,7 @@
 
 #if defined(__aarch64__) && defined(__ARM_NEON)
 #    include <arm_neon.h>
-#    ifdef HAS_RESERVED_IDENTIFIER
-#        pragma clang diagnostic ignored "-Wreserved-identifier"
-#    endif
+#      pragma clang diagnostic ignored "-Wreserved-identifier"
 #endif
 
 /** memcpy function could work suboptimal if all the following conditions are met:
diff --git a/src/Common/memory.h b/src/Common/memory.h
index f5d665c4dc2..e1f2d25d162 100644
--- a/src/Common/memory.h
+++ b/src/Common/memory.h
@@ -1,6 +1,4 @@
 #pragma once
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
 
 #include <new>
 #include <base/defines.h>
@@ -219,5 +217,3 @@ inline ALWAYS_INLINE void untrackMemory(void * ptr [[maybe_unused]], std::size_t
 }
 
 }
-
-#pragma GCC diagnostic pop
diff --git a/src/Common/mysqlxx/Exception.cpp b/src/Common/mysqlxx/Exception.cpp
index 0f5320da754..ed1e2278a35 100644
--- a/src/Common/mysqlxx/Exception.cpp
+++ b/src/Common/mysqlxx/Exception.cpp
@@ -10,9 +10,11 @@
 namespace mysqlxx
 {
 
-std::string errorMessage(MYSQL * driver)
+std::string errorMessage(MYSQL * driver, const std::string & query)
 {
-    return fmt::format("{} ({}:{})", mysql_error(driver), driver->host ? driver->host : "(nullptr)", driver->port);
+    return fmt::format("{}{} ({}:{})", mysql_error(driver),
+        query.empty() ? "" : " while executing query: '" + query + "'",
+        driver->host ? driver->host : "(nullptr)", driver->port);
 }
 
 void checkError(MYSQL * driver)
diff --git a/src/Common/mysqlxx/Pool.cpp b/src/Common/mysqlxx/Pool.cpp
index ba74700d4bc..6438d76cc3a 100644
--- a/src/Common/mysqlxx/Pool.cpp
+++ b/src/Common/mysqlxx/Pool.cpp
@@ -10,22 +10,10 @@
 #include <base/sleep.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Common/logger_useful.h>
+#include <Common/Stopwatch.h>
 #include <ctime>
 
 
-namespace
-{
-
-inline uint64_t clock_gettime_ns(clockid_t clock_type = CLOCK_MONOTONIC)
-{
-    struct timespec ts;
-    clock_gettime(clock_type, &ts);
-    return uint64_t(ts.tv_sec * 1000000000LL + ts.tv_nsec);
-}
-
-}
-
-
 namespace mysqlxx
 {
 
@@ -33,9 +21,12 @@ void Pool::Entry::incrementRefCount()
 {
     if (!data)
         return;
+
     /// First reference, initialize thread
     if (data->ref_count.fetch_add(1) == 0)
         mysql_thread_init();
+
+    chassert(!data->removed_from_pool);
 }
 
 
@@ -44,9 +35,20 @@ void Pool::Entry::decrementRefCount()
     if (!data)
         return;
 
-    /// We were the last user of this thread, deinitialize it
-    if (data->ref_count.fetch_sub(1) == 1)
+    const auto ref_count = data->ref_count.fetch_sub(1);
+    if (ref_count == 1)
+    {
+        /// We were the last user of this thread, deinitialize it
         mysql_thread_end();
+    }
+    else if (data->removed_from_pool)
+    {
+        /// data->ref_count == 0 in case we removed connection from pool (see Pool::removeConnection).
+        chassert(ref_count == 0);
+        /// In Pool::Entry::disconnect() we remove connection from the list of pool's connections.
+        /// So now we must deallocate the memory.
+        ::delete data;
+    }
 }
 
 
@@ -238,6 +240,7 @@ void Pool::removeConnection(Connection* connection)
             connection->ref_count = 0;
         }
         connections.remove(connection);
+        connection->removed_from_pool = true;
     }
 }
 
diff --git a/src/Common/mysqlxx/PoolFactory.cpp b/src/Common/mysqlxx/PoolFactory.cpp
index 5fae934a400..9479273e36e 100644
--- a/src/Common/mysqlxx/PoolFactory.cpp
+++ b/src/Common/mysqlxx/PoolFactory.cpp
@@ -23,12 +23,6 @@ PoolWithFailover PoolFactory::get(const std::string & config_name, unsigned defa
     return get(Poco::Util::Application::instance().config(), config_name, default_connections, max_connections, max_tries);
 }
 
-/// Duplicate of code from StringUtils.h. Copied here for less dependencies.
-static bool startsWith(const std::string & s, const char * prefix)
-{
-    return s.size() >= strlen(prefix) && 0 == memcmp(s.data(), prefix, strlen(prefix));
-}
-
 static std::string getPoolEntryName(const Poco::Util::AbstractConfiguration & config,
         const std::string & config_name)
 {
@@ -55,7 +49,7 @@ static std::string getPoolEntryName(const Poco::Util::AbstractConfiguration & co
         for (const auto & replica_config_key : replica_keys)
         {
             /// There could be another elements in the same level in configuration file, like "user", "port"...
-            if (startsWith(replica_config_key, "replica"))
+            if (replica_config_key.starts_with("replica"))
             {
                 std::string replica_name = config_name + "." + replica_config_key;
                 std::string tmp_host = config.getString(replica_name + ".host", host);
diff --git a/src/Common/mysqlxx/Query.cpp b/src/Common/mysqlxx/Query.cpp
index 97b29fa21df..42c35d26ecf 100644
--- a/src/Common/mysqlxx/Query.cpp
+++ b/src/Common/mysqlxx/Query.cpp
@@ -64,7 +64,7 @@ void Query::executeImpl()
         case CR_SERVER_LOST:
             throw ConnectionLost(errorMessage(mysql_driver), err_no);
         default:
-            throw BadQuery(errorMessage(mysql_driver), err_no);
+            throw BadQuery(errorMessage(mysql_driver, query), err_no);
         }
     }
 }
diff --git a/src/Common/mysqlxx/Value.cpp b/src/Common/mysqlxx/Value.cpp
index 6954080f864..41d717669b9 100644
--- a/src/Common/mysqlxx/Value.cpp
+++ b/src/Common/mysqlxx/Value.cpp
@@ -160,14 +160,16 @@ void Value::throwException(const char * text) const
 
     if (!isNull())
     {
-        info.append(": ");
+        info.append(": '");
         info.append(m_data, m_length);
+        info.append("'");
     }
 
     if (res && res->getQuery())
     {
-        info.append(", query: ");
+        info.append(", query: '");
         info.append(res->getQuery()->str().substr(0, preview_length));
+        info.append("'");
     }
 
     throw CannotParseValue(info);
diff --git a/src/Common/mysqlxx/mysqlxx/Exception.h b/src/Common/mysqlxx/mysqlxx/Exception.h
index 7886368e747..54153a7f150 100644
--- a/src/Common/mysqlxx/mysqlxx/Exception.h
+++ b/src/Common/mysqlxx/mysqlxx/Exception.h
@@ -53,7 +53,7 @@ struct CannotParseValue : public Exception
 };
 
 
-std::string errorMessage(MYSQL * driver);
+std::string errorMessage(MYSQL * driver, const std::string & query = "");
 
 /// For internal need of library.
 void checkError(MYSQL * driver);
diff --git a/src/Common/mysqlxx/mysqlxx/Pool.h b/src/Common/mysqlxx/mysqlxx/Pool.h
index 1fa8eaeb997..c2190fba684 100644
--- a/src/Common/mysqlxx/mysqlxx/Pool.h
+++ b/src/Common/mysqlxx/mysqlxx/Pool.h
@@ -41,6 +41,7 @@ protected:
         /// Ref count modified in constructor/descructor of Entry
         /// but also read in pool code.
         std::atomic<int> ref_count = 0;
+        std::atomic<bool> removed_from_pool = false;
     };
 
 public:
diff --git a/src/Common/parseRemoteDescription.cpp b/src/Common/parseRemoteDescription.cpp
index aa7122ffb4c..0bcd62d30c7 100644
--- a/src/Common/parseRemoteDescription.cpp
+++ b/src/Common/parseRemoteDescription.cpp
@@ -64,7 +64,8 @@ static bool parseNumber(const String & description, size_t l, size_t r, size_t &
  * abc{1..9}de{f,g,h}   - is a direct product, 27 shards.
  * abc{1..9}de{0|1}     - is a direct product, 9 shards, in each 2 replicas.
  */
-std::vector<String> parseRemoteDescription(const String & description, size_t l, size_t r, char separator, size_t max_addresses)
+std::vector<String>
+parseRemoteDescription(const String & description, size_t l, size_t r, char separator, size_t max_addresses, const String & func_name)
 {
     std::vector<String> res;
     std::vector<String> cur;
@@ -97,28 +98,41 @@ std::vector<String> parseRemoteDescription(const String & description, size_t l,
                 if (cnt == 0) break;
             }
             if (cnt != 0)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function 'remote': incorrect brace sequence in first argument");
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function '{}': incorrect brace sequence in first argument", func_name);
             /// The presence of a dot - numeric interval
             if (last_dot != -1)
             {
                 size_t left, right;
                 if (description[last_dot - 1] != '.')
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function 'remote': incorrect argument in braces (only one dot): {}",
-                                    description.substr(i, m - i + 1));
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Table function '{}': incorrect argument in braces (only one dot): {}",
+                        func_name,
+                        description.substr(i, m - i + 1));
                 if (!parseNumber(description, i + 1, last_dot - 1, left))
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function 'remote': "
-                                    "incorrect argument in braces (Incorrect left number): {}",
-                                    description.substr(i, m - i + 1));
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Table function '{}': "
+                        "incorrect argument in braces (Incorrect left number): {}",
+                        func_name,
+                        description.substr(i, m - i + 1));
                 if (!parseNumber(description, last_dot + 1, m, right))
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function 'remote': "
-                                    "incorrect argument in braces (Incorrect right number): {}",
-                                    description.substr(i, m - i + 1));
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Table function '{}': "
+                        "incorrect argument in braces (Incorrect right number): {}",
+                        func_name,
+                        description.substr(i, m - i + 1));
                 if (left > right)
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function 'remote': "
-                                    "incorrect argument in braces (left number is greater then right): {}",
-                                    description.substr(i, m - i + 1));
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Table function '{}': "
+                        "incorrect argument in braces (left number is greater then right): {}",
+                        func_name,
+                        description.substr(i, m - i + 1));
                 if (right - left + 1 >  max_addresses)
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function 'remote': first argument generates too many result addresses");
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS, "Table function '{}': first argument generates too many result addresses", func_name);
                 bool add_leading_zeroes = false;
                 size_t len = last_dot - 1 - (i + 1);
                 /// If the left and right borders have equal numbers, then you must add leading zeros.
@@ -161,7 +175,7 @@ std::vector<String> parseRemoteDescription(const String & description, size_t l,
 
     res.insert(res.end(), cur.begin(), cur.end());
     if (res.size() > max_addresses)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function 'remote': first argument generates too many result addresses");
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function '{}': first argument generates too many result addresses", func_name);
 
     return res;
 }
diff --git a/src/Common/parseRemoteDescription.h b/src/Common/parseRemoteDescription.h
index eef8fbfefe4..e3e4a3f523c 100644
--- a/src/Common/parseRemoteDescription.h
+++ b/src/Common/parseRemoteDescription.h
@@ -15,7 +15,8 @@ namespace DB
  * abc{1..9}de{f,g,h}   - is a direct product, 27 shards.
  * abc{1..9}de{0|1}     - is a direct product, 9 shards, in each 2 replicas.
  */
-std::vector<String> parseRemoteDescription(const String & description, size_t l, size_t r, char separator, size_t max_addresses);
+std::vector<String> parseRemoteDescription(
+    const String & description, size_t l, size_t r, char separator, size_t max_addresses, const String & func_name = "remote");
 
 /// Parse remote description for external database (MySQL or PostgreSQL).
 std::vector<std::pair<String, uint16_t>> parseRemoteDescriptionForExternalDatabase(const String & description, size_t max_addresses, UInt16 default_port);
diff --git a/src/Common/scope_guard_safe.h b/src/Common/scope_guard_safe.h
index f098fd95f00..2befb58870a 100644
--- a/src/Common/scope_guard_safe.h
+++ b/src/Common/scope_guard_safe.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <base/scope_guard.h>
-#include <Common/logger_useful.h>
 #include <Common/LockMemoryExceptionInThread.h>
 
 /// Same as SCOPE_EXIT() but block the MEMORY_LIMIT_EXCEEDED errors.
diff --git a/src/Common/setThreadName.cpp b/src/Common/setThreadName.cpp
index 5dc7d3ad1b2..65c4b5c6523 100644
--- a/src/Common/setThreadName.cpp
+++ b/src/Common/setThreadName.cpp
@@ -30,10 +30,8 @@ static thread_local char thread_name[THREAD_NAME_SIZE]{};
 
 void setThreadName(const char * name)
 {
-#ifndef NDEBUG
     if (strlen(name) > THREAD_NAME_SIZE - 1)
         throw DB::Exception(DB::ErrorCodes::PTHREAD_ERROR, "Thread name cannot be longer than 15 bytes");
-#endif
 
 #if defined(OS_FREEBSD)
     pthread_set_name_np(pthread_self(), name);
@@ -45,9 +43,10 @@ void setThreadName(const char * name)
 #else
     if (0 != prctl(PR_SET_NAME, name, 0, 0, 0))
 #endif
-        DB::throwFromErrno("Cannot set thread name with prctl(PR_SET_NAME, ...)", DB::ErrorCodes::PTHREAD_ERROR);
+        if (errno != ENOSYS)    /// It's ok if the syscall is unsupported in some environments.
+            DB::throwFromErrno("Cannot set thread name with prctl(PR_SET_NAME, ...)", DB::ErrorCodes::PTHREAD_ERROR);
 
-    memcpy(thread_name, name, 1 + strlen(name));
+    memcpy(thread_name, name, std::min<size_t>(1 + strlen(name), THREAD_NAME_SIZE - 1));
 }
 
 const char * getThreadName()
@@ -64,7 +63,8 @@ const char * getThreadName()
 //        throw DB::Exception(DB::ErrorCodes::PTHREAD_ERROR, "Cannot get thread name with pthread_get_name_np()");
 #else
     if (0 != prctl(PR_GET_NAME, thread_name, 0, 0, 0))
-        DB::throwFromErrno("Cannot get thread name with prctl(PR_GET_NAME)", DB::ErrorCodes::PTHREAD_ERROR);
+        if (errno != ENOSYS)    /// It's ok if the syscall is unsupported in some environments.
+            DB::throwFromErrno("Cannot get thread name with prctl(PR_GET_NAME)", DB::ErrorCodes::PTHREAD_ERROR);
 #endif
 
     return thread_name;
diff --git a/src/Common/tests/gtest_async_loader.cpp b/src/Common/tests/gtest_async_loader.cpp
new file mode 100644
index 00000000000..6504f1c97a9
--- /dev/null
+++ b/src/Common/tests/gtest_async_loader.cpp
@@ -0,0 +1,952 @@
+#include <gtest/gtest.h>
+
+#include <barrier>
+#include <chrono>
+#include <mutex>
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <thread>
+#include <pcg_random.hpp>
+
+#include <base/types.h>
+#include <base/sleep.h>
+#include <Common/Exception.h>
+#include <Common/AsyncLoader.h>
+#include <Common/randomSeed.h>
+
+using namespace DB;
+
+namespace CurrentMetrics
+{
+    extern const Metric TablesLoaderThreads;
+    extern const Metric TablesLoaderThreadsActive;
+}
+
+namespace DB::ErrorCodes
+{
+    extern const int ASYNC_LOAD_CYCLE;
+    extern const int ASYNC_LOAD_FAILED;
+    extern const int ASYNC_LOAD_CANCELED;
+}
+
+struct Initializer {
+    size_t max_threads = 1;
+    Priority priority;
+};
+
+struct AsyncLoaderTest
+{
+    AsyncLoader loader;
+
+    std::mutex rng_mutex;
+    pcg64 rng{randomSeed()};
+
+    explicit AsyncLoaderTest(std::vector<Initializer> initializers)
+        : loader(getPoolInitializers(initializers), /* log_failures = */ false, /* log_progress = */ false)
+    {
+        loader.stop(); // All tests call `start()` manually to better control ordering
+    }
+
+    explicit AsyncLoaderTest(size_t max_threads = 1)
+        : AsyncLoaderTest({{.max_threads = max_threads}})
+    {}
+
+    std::vector<AsyncLoader::PoolInitializer> getPoolInitializers(std::vector<Initializer> initializers)
+    {
+        std::vector<AsyncLoader::PoolInitializer> result;
+        size_t pool_id = 0;
+        for (auto & desc : initializers)
+        {
+            result.push_back({
+                .name = fmt::format("Pool{}", pool_id),
+                .metric_threads = CurrentMetrics::TablesLoaderThreads,
+                .metric_active_threads = CurrentMetrics::TablesLoaderThreadsActive,
+                .max_threads = desc.max_threads,
+                .priority = desc.priority
+            });
+            pool_id++;
+        }
+        return result;
+    }
+
+    template <typename T>
+    T randomInt(T from, T to)
+    {
+        std::uniform_int_distribution<T> distribution(from, to);
+        std::scoped_lock lock(rng_mutex);
+        return distribution(rng);
+    }
+
+    void randomSleepUs(UInt64 min_us, UInt64 max_us, int probability_percent)
+    {
+        if (randomInt(0, 99) < probability_percent)
+            std::this_thread::sleep_for(std::chrono::microseconds(randomInt(min_us, max_us)));
+    }
+
+    template <typename JobFunc>
+    LoadJobSet randomJobSet(int job_count, int dep_probability_percent, JobFunc job_func, std::string_view name_prefix = "job")
+    {
+        std::vector<LoadJobPtr> jobs;
+        jobs.reserve(job_count);
+        for (int j = 0; j < job_count; j++)
+        {
+            LoadJobSet deps;
+            for (int d = 0; d < j; d++)
+            {
+                if (randomInt(0, 99) < dep_probability_percent)
+                    deps.insert(jobs[d]);
+            }
+            jobs.push_back(makeLoadJob(std::move(deps), fmt::format("{}{}", name_prefix, j), job_func));
+        }
+        return {jobs.begin(), jobs.end()};
+    }
+
+    template <typename JobFunc>
+    LoadJobSet randomJobSet(int job_count, int dep_probability_percent, const std::vector<LoadJobPtr> & external_deps, JobFunc job_func, std::string_view name_prefix = "job")
+    {
+        std::vector<LoadJobPtr> jobs;
+        jobs.reserve(job_count);
+        for (int j = 0; j < job_count; j++)
+        {
+            LoadJobSet deps;
+            for (int d = 0; d < j; d++)
+            {
+                if (randomInt(0, 99) < dep_probability_percent)
+                    deps.insert(jobs[d]);
+            }
+            if (!external_deps.empty() && randomInt(0, 99) < dep_probability_percent)
+                deps.insert(external_deps[randomInt<size_t>(0, external_deps.size() - 1)]);
+            jobs.push_back(makeLoadJob(std::move(deps), fmt::format("{}{}", name_prefix, j), job_func));
+        }
+        return {jobs.begin(), jobs.end()};
+    }
+
+    template <typename JobFunc>
+    LoadJobSet chainJobSet(int job_count, JobFunc job_func, std::string_view name_prefix = "job")
+    {
+        std::vector<LoadJobPtr> jobs;
+        jobs.reserve(job_count);
+        jobs.push_back(makeLoadJob({}, fmt::format("{}{}", name_prefix, 0), job_func));
+        for (int j = 1; j < job_count; j++)
+            jobs.push_back(makeLoadJob({ jobs[j - 1] }, fmt::format("{}{}", name_prefix, j), job_func));
+        return {jobs.begin(), jobs.end()};
+    }
+
+    LoadTaskPtr schedule(LoadJobSet && jobs)
+    {
+        LoadTaskPtr task = makeLoadTask(loader, std::move(jobs));
+        task->schedule();
+        return task;
+    }
+};
+
+TEST(AsyncLoader, Smoke)
+{
+    AsyncLoaderTest t({
+        {.max_threads = 2, .priority = Priority{0}},
+        {.max_threads = 2, .priority = Priority{1}},
+    });
+
+    static constexpr size_t low_priority_pool = 1;
+
+    std::atomic<size_t> jobs_done{0};
+    std::atomic<size_t> low_priority_jobs_done{0};
+
+    auto job_func = [&] (const LoadJobPtr & self) {
+        jobs_done++;
+        if (self->pool() == low_priority_pool)
+            low_priority_jobs_done++;
+    };
+
+    {
+        auto job1 = makeLoadJob({}, "job1", job_func);
+        auto job2 = makeLoadJob({ job1 }, "job2", job_func);
+        auto task1 = t.schedule({ job1, job2 });
+
+        auto job3 = makeLoadJob({ job2 }, "job3", job_func);
+        auto job4 = makeLoadJob({ job2 }, "job4", job_func);
+        auto task2 = t.schedule({ job3, job4 });
+        auto job5 = makeLoadJob({ job3, job4 }, low_priority_pool, "job5", job_func);
+        task2->merge(t.schedule({ job5 }));
+
+        std::thread waiter_thread([=] { job5->wait(); });
+
+        t.loader.start();
+
+        job3->wait();
+        t.loader.wait();
+        job4->wait();
+
+        waiter_thread.join();
+
+        ASSERT_EQ(job1->status(), LoadStatus::OK);
+        ASSERT_EQ(job2->status(), LoadStatus::OK);
+    }
+
+    ASSERT_EQ(jobs_done, 5);
+    ASSERT_EQ(low_priority_jobs_done, 1);
+
+    t.loader.stop();
+}
+
+TEST(AsyncLoader, CycleDetection)
+{
+    AsyncLoaderTest t;
+
+    auto job_func = [&] (const LoadJobPtr &) {};
+
+    LoadJobPtr cycle_breaker; // To avoid memleak we introduce with a cycle
+
+    try
+    {
+        std::vector<LoadJobPtr> jobs;
+        jobs.reserve(16);
+        jobs.push_back(makeLoadJob({}, "job0", job_func));
+        jobs.push_back(makeLoadJob({ jobs[0] }, "job1", job_func));
+        jobs.push_back(makeLoadJob({ jobs[0], jobs[1] }, "job2", job_func));
+        jobs.push_back(makeLoadJob({ jobs[0], jobs[2] }, "job3", job_func));
+
+        // Actually it is hard to construct a cycle, but suppose someone was able to succeed violating constness
+        const_cast<LoadJobSet &>(jobs[1]->dependencies).insert(jobs[3]);
+        cycle_breaker = jobs[1];
+
+        // Add couple unrelated jobs
+        jobs.push_back(makeLoadJob({ jobs[1] }, "job4", job_func));
+        jobs.push_back(makeLoadJob({ jobs[4] }, "job5", job_func));
+        jobs.push_back(makeLoadJob({ jobs[3] }, "job6", job_func));
+        jobs.push_back(makeLoadJob({ jobs[1], jobs[2], jobs[3], jobs[4], jobs[5], jobs[6] }, "job7", job_func));
+
+        // Also add another not connected jobs
+        jobs.push_back(makeLoadJob({}, "job8", job_func));
+        jobs.push_back(makeLoadJob({}, "job9", job_func));
+        jobs.push_back(makeLoadJob({ jobs[9] }, "job10", job_func));
+
+        auto task1 = t.schedule({ jobs.begin(), jobs.end()});
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        int present[] = { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
+        for (int i = 0; i < std::size(present); i++)
+            ASSERT_EQ(e.message().find(fmt::format("job{}", i)) != String::npos, present[i]);
+    }
+
+    const_cast<LoadJobSet &>(cycle_breaker->dependencies).clear();
+}
+
+TEST(AsyncLoader, CancelPendingJob)
+{
+    AsyncLoaderTest t;
+
+    auto job_func = [&] (const LoadJobPtr &) {};
+
+    auto job = makeLoadJob({}, "job", job_func);
+    auto task = t.schedule({ job });
+
+    task->remove(); // this cancels pending the job (async loader was not started to execute it)
+
+    ASSERT_EQ(job->status(), LoadStatus::CANCELED);
+    try
+    {
+        job->wait();
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        ASSERT_EQ(e.code(), ErrorCodes::ASYNC_LOAD_CANCELED);
+    }
+}
+
+TEST(AsyncLoader, CancelPendingTask)
+{
+    AsyncLoaderTest t;
+
+    auto job_func = [&] (const LoadJobPtr &) {};
+
+    auto job1 = makeLoadJob({}, "job1", job_func);
+    auto job2 = makeLoadJob({ job1 }, "job2", job_func);
+    auto task = t.schedule({ job1, job2 });
+
+    task->remove(); // this cancels both jobs (async loader was not started to execute it)
+
+    ASSERT_EQ(job1->status(), LoadStatus::CANCELED);
+    ASSERT_EQ(job2->status(), LoadStatus::CANCELED);
+
+    try
+    {
+        job1->wait();
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        ASSERT_TRUE(e.code() == ErrorCodes::ASYNC_LOAD_CANCELED);
+    }
+
+    try
+    {
+        job2->wait();
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        ASSERT_TRUE(e.code() == ErrorCodes::ASYNC_LOAD_CANCELED);
+    }
+}
+
+TEST(AsyncLoader, CancelPendingDependency)
+{
+    AsyncLoaderTest t;
+
+    auto job_func = [&] (const LoadJobPtr &) {};
+
+    auto job1 = makeLoadJob({}, "job1", job_func);
+    auto job2 = makeLoadJob({ job1 }, "job2", job_func);
+    auto task1 = t.schedule({ job1 });
+    auto task2 = t.schedule({ job2 });
+
+    task1->remove(); // this cancels both jobs, due to dependency (async loader was not started to execute it)
+
+    ASSERT_EQ(job1->status(), LoadStatus::CANCELED);
+    ASSERT_EQ(job2->status(), LoadStatus::CANCELED);
+
+    try
+    {
+        job1->wait();
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        ASSERT_TRUE(e.code() == ErrorCodes::ASYNC_LOAD_CANCELED);
+    }
+
+    try
+    {
+        job2->wait();
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        ASSERT_TRUE(e.code() == ErrorCodes::ASYNC_LOAD_CANCELED);
+    }
+}
+
+TEST(AsyncLoader, CancelExecutingJob)
+{
+    AsyncLoaderTest t;
+    t.loader.start();
+
+    std::barrier sync(2);
+
+    auto job_func = [&] (const LoadJobPtr &)
+    {
+        sync.arrive_and_wait(); // (A) sync with main thread
+        sync.arrive_and_wait(); // (B) wait for waiter
+        // signals (C)
+    };
+
+    auto job = makeLoadJob({}, "job", job_func);
+    auto task = t.schedule({ job });
+
+    sync.arrive_and_wait(); // (A) wait for job to start executing
+    std::thread canceler([&]
+    {
+        task->remove(); // waits for (C)
+    });
+    while (job->waitersCount() == 0)
+        std::this_thread::yield();
+    ASSERT_EQ(job->status(), LoadStatus::PENDING);
+    sync.arrive_and_wait(); // (B) sync with job
+    canceler.join();
+
+    ASSERT_EQ(job->status(), LoadStatus::OK);
+    job->wait();
+}
+
+TEST(AsyncLoader, CancelExecutingTask)
+{
+    AsyncLoaderTest t(16);
+    t.loader.start();
+    std::barrier sync(2);
+
+    auto blocker_job_func = [&] (const LoadJobPtr &)
+    {
+        sync.arrive_and_wait(); // (A) sync with main thread
+        sync.arrive_and_wait(); // (B) wait for waiter
+        // signals (C)
+    };
+
+    auto job_to_cancel_func = [&] (const LoadJobPtr &)
+    {
+        FAIL(); // this job should be canceled
+    };
+
+    auto job_to_succeed_func = [&] (const LoadJobPtr &)
+    {
+    };
+
+    // Make several iterations to catch the race (if any)
+    for (int iteration = 0; iteration < 10; iteration++) {
+        std::vector<LoadJobPtr> task1_jobs;
+        task1_jobs.reserve(256);
+        auto blocker_job = makeLoadJob({}, "blocker_job", blocker_job_func);
+        task1_jobs.push_back(blocker_job);
+        for (int i = 0; i < 100; i++)
+            task1_jobs.push_back(makeLoadJob({ blocker_job }, "job_to_cancel", job_to_cancel_func));
+        auto task1 = t.schedule({ task1_jobs.begin(), task1_jobs.end() });
+        auto job_to_succeed = makeLoadJob({ blocker_job }, "job_to_succeed", job_to_succeed_func);
+        auto task2 = t.schedule({ job_to_succeed });
+
+        sync.arrive_and_wait(); // (A) wait for job to start executing
+        std::thread canceler([&]
+        {
+            task1->remove(); // waits for (C)
+        });
+        while (blocker_job->waitersCount() == 0)
+            std::this_thread::yield();
+        ASSERT_EQ(blocker_job->status(), LoadStatus::PENDING);
+        sync.arrive_and_wait(); // (B) sync with job
+        canceler.join();
+        t.loader.wait();
+
+        ASSERT_EQ(blocker_job->status(), LoadStatus::OK);
+        ASSERT_EQ(job_to_succeed->status(), LoadStatus::OK);
+        for (const auto & job : task1_jobs)
+        {
+            if (job != blocker_job)
+                ASSERT_EQ(job->status(), LoadStatus::CANCELED);
+        }
+    }
+}
+
+// This test is disabled due to `MemorySanitizer: use-of-uninitialized-value` issue in `collectSymbolsFromProgramHeaders` function
+// More details: https://github.com/ClickHouse/ClickHouse/pull/48923#issuecomment-1545415482
+TEST(AsyncLoader, DISABLED_JobFailure)
+{
+    AsyncLoaderTest t;
+    t.loader.start();
+
+    std::string error_message = "test job failure";
+
+    auto job_func = [&] (const LoadJobPtr &) {
+        throw std::runtime_error(error_message);
+    };
+
+    auto job = makeLoadJob({}, "job", job_func);
+    auto task = t.schedule({ job });
+
+    t.loader.wait();
+
+    ASSERT_EQ(job->status(), LoadStatus::FAILED);
+    try
+    {
+        job->wait();
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        ASSERT_EQ(e.code(), ErrorCodes::ASYNC_LOAD_FAILED);
+        ASSERT_TRUE(e.message().find(error_message) != String::npos);
+    }
+}
+
+TEST(AsyncLoader, ScheduleJobWithFailedDependencies)
+{
+    AsyncLoaderTest t;
+    t.loader.start();
+
+    std::string_view error_message = "test job failure";
+
+    auto failed_job_func = [&] (const LoadJobPtr &) {
+        throw Exception(ErrorCodes::ASYNC_LOAD_FAILED, "{}", error_message);
+    };
+
+    auto failed_job = makeLoadJob({}, "failed_job", failed_job_func);
+    auto failed_task = t.schedule({ failed_job });
+
+    t.loader.wait();
+
+    auto job_func = [&] (const LoadJobPtr &) {};
+
+    auto job1 = makeLoadJob({ failed_job }, "job1", job_func);
+    auto job2 = makeLoadJob({ job1 }, "job2", job_func);
+    auto task = t.schedule({ job1, job2 });
+
+    t.loader.wait();
+
+    ASSERT_EQ(job1->status(), LoadStatus::CANCELED);
+    ASSERT_EQ(job2->status(), LoadStatus::CANCELED);
+    try
+    {
+        job1->wait();
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        ASSERT_EQ(e.code(), ErrorCodes::ASYNC_LOAD_CANCELED);
+        ASSERT_TRUE(e.message().find(error_message) != String::npos);
+    }
+    try
+    {
+        job2->wait();
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        ASSERT_EQ(e.code(), ErrorCodes::ASYNC_LOAD_CANCELED);
+        ASSERT_TRUE(e.message().find(error_message) != String::npos);
+    }
+}
+
+TEST(AsyncLoader, ScheduleJobWithCanceledDependencies)
+{
+    AsyncLoaderTest t;
+
+    auto canceled_job_func = [&] (const LoadJobPtr &) {};
+    auto canceled_job = makeLoadJob({}, "canceled_job", canceled_job_func);
+    auto canceled_task = t.schedule({ canceled_job });
+    canceled_task->remove();
+
+    t.loader.start();
+
+    auto job_func = [&] (const LoadJobPtr &) {};
+    auto job1 = makeLoadJob({ canceled_job }, "job1", job_func);
+    auto job2 = makeLoadJob({ job1 }, "job2", job_func);
+    auto task = t.schedule({ job1, job2 });
+
+    t.loader.wait();
+
+    ASSERT_EQ(job1->status(), LoadStatus::CANCELED);
+    ASSERT_EQ(job2->status(), LoadStatus::CANCELED);
+    try
+    {
+        job1->wait();
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        ASSERT_EQ(e.code(), ErrorCodes::ASYNC_LOAD_CANCELED);
+    }
+    try
+    {
+        job2->wait();
+        FAIL();
+    }
+    catch (Exception & e)
+    {
+        ASSERT_EQ(e.code(), ErrorCodes::ASYNC_LOAD_CANCELED);
+    }
+}
+
+TEST(AsyncLoader, TestConcurrency)
+{
+    AsyncLoaderTest t(10);
+    t.loader.start();
+
+    for (int concurrency = 1; concurrency <= 10; concurrency++)
+    {
+        std::barrier sync(concurrency);
+
+        std::atomic<int> executing{0};
+        auto job_func = [&] (const LoadJobPtr &)
+        {
+            executing++;
+            ASSERT_LE(executing, concurrency);
+            sync.arrive_and_wait();
+            executing--;
+        };
+
+        std::vector<LoadTaskPtr> tasks;
+        tasks.reserve(concurrency);
+        for (int i = 0; i < concurrency; i++)
+            tasks.push_back(t.schedule(t.chainJobSet(5, job_func)));
+        t.loader.wait();
+        ASSERT_EQ(executing, 0);
+    }
+}
+
+TEST(AsyncLoader, TestOverload)
+{
+    AsyncLoaderTest t(3);
+    t.loader.start();
+
+    size_t max_threads = t.loader.getMaxThreads(/* pool = */ 0);
+    std::atomic<int> executing{0};
+
+    for (int concurrency = 4; concurrency <= 8; concurrency++)
+    {
+        auto job_func = [&] (const LoadJobPtr &)
+        {
+            executing++;
+            t.randomSleepUs(100, 200, 100);
+            ASSERT_LE(executing, max_threads);
+            executing--;
+        };
+
+        t.loader.stop();
+        std::vector<LoadTaskPtr> tasks;
+        tasks.reserve(concurrency);
+        for (int i = 0; i < concurrency; i++)
+            tasks.push_back(t.schedule(t.chainJobSet(5, job_func)));
+        t.loader.start();
+        t.loader.wait();
+        ASSERT_EQ(executing, 0);
+    }
+}
+
+TEST(AsyncLoader, StaticPriorities)
+{
+    AsyncLoaderTest t({
+        {.max_threads = 1, .priority{0}},
+        {.max_threads = 1, .priority{-1}},
+        {.max_threads = 1, .priority{-2}},
+        {.max_threads = 1, .priority{-3}},
+        {.max_threads = 1, .priority{-4}},
+        {.max_threads = 1, .priority{-5}},
+        {.max_threads = 1, .priority{-6}},
+        {.max_threads = 1, .priority{-7}},
+        {.max_threads = 1, .priority{-8}},
+        {.max_threads = 1, .priority{-9}},
+    });
+
+    std::string schedule;
+
+    auto job_func = [&] (const LoadJobPtr & self)
+    {
+        schedule += fmt::format("{}{}", self->name, self->pool());
+    };
+
+    // Job DAG with priorities. After priority inheritance from H9, jobs D9 and E9 can be
+    // executed in undefined order (Tested further in DynamicPriorities)
+    // A0(9) -+-> B3
+    //        |
+    //        `-> C4
+    //        |
+    //        `-> D1(9) -.
+    //        |          +-> F0(9) --> G0(9) --> H9
+    //        `-> E2(9) -'
+    std::vector<LoadJobPtr> jobs;
+    jobs.push_back(makeLoadJob({}, 0, "A", job_func)); // 0
+    jobs.push_back(makeLoadJob({ jobs[0] }, 3, "B", job_func)); // 1
+    jobs.push_back(makeLoadJob({ jobs[0] }, 4, "C", job_func)); // 2
+    jobs.push_back(makeLoadJob({ jobs[0] }, 1, "D", job_func)); // 3
+    jobs.push_back(makeLoadJob({ jobs[0] }, 2, "E", job_func)); // 4
+    jobs.push_back(makeLoadJob({ jobs[3], jobs[4] }, 0, "F", job_func)); // 5
+    jobs.push_back(makeLoadJob({ jobs[5] }, 0, "G", job_func)); // 6
+    jobs.push_back(makeLoadJob({ jobs[6] }, 9, "H", job_func)); // 7
+    auto task = t.schedule({ jobs.begin(), jobs.end() });
+
+    t.loader.start();
+    t.loader.wait();
+    ASSERT_TRUE(schedule == "A9E9D9F9G9H9C4B3" || schedule == "A9D9E9F9G9H9C4B3");
+}
+
+TEST(AsyncLoader, SimplePrioritization)
+{
+    AsyncLoaderTest t({
+        {.max_threads = 1, .priority{0}},
+        {.max_threads = 1, .priority{-1}},
+        {.max_threads = 1, .priority{-2}},
+    });
+
+    t.loader.start();
+
+    std::atomic<int> executed{0}; // Number of previously executed jobs (to test execution order)
+    LoadJobPtr job_to_prioritize;
+
+    auto job_func_A_booster = [&] (const LoadJobPtr &)
+    {
+        ASSERT_EQ(executed++, 0);
+        t.loader.prioritize(job_to_prioritize, 2);
+    };
+
+    auto job_func_B_tester = [&] (const LoadJobPtr &)
+    {
+        ASSERT_EQ(executed++, 2);
+    };
+
+    auto job_func_C_boosted = [&] (const LoadJobPtr &)
+    {
+        ASSERT_EQ(executed++, 1);
+    };
+
+    std::vector<LoadJobPtr> jobs;
+    jobs.push_back(makeLoadJob({}, 1, "A", job_func_A_booster)); // 0
+    jobs.push_back(makeLoadJob({jobs[0]}, 1, "B", job_func_B_tester)); // 1
+    jobs.push_back(makeLoadJob({}, 0, "C", job_func_C_boosted)); // 2
+    auto task = makeLoadTask(t.loader, { jobs.begin(), jobs.end() });
+
+    job_to_prioritize = jobs[2]; // C
+
+    scheduleAndWaitLoadAll(task);
+}
+
+TEST(AsyncLoader, DynamicPriorities)
+{
+    AsyncLoaderTest t({
+        {.max_threads = 1, .priority{0}},
+        {.max_threads = 1, .priority{-1}},
+        {.max_threads = 1, .priority{-2}},
+        {.max_threads = 1, .priority{-3}},
+        {.max_threads = 1, .priority{-4}},
+        {.max_threads = 1, .priority{-5}},
+        {.max_threads = 1, .priority{-6}},
+        {.max_threads = 1, .priority{-7}},
+        {.max_threads = 1, .priority{-8}},
+        {.max_threads = 1, .priority{-9}},
+    });
+
+    for (bool prioritize : {false, true})
+    {
+        // Although all pools have max_threads=1, workers from different pools can run simultaneously just after `prioritize()` call
+        std::barrier sync(2);
+        bool wait_sync = prioritize;
+        std::mutex schedule_mutex;
+        std::string schedule;
+
+        LoadJobPtr job_to_prioritize;
+
+        // Order of execution of jobs D and E after prioritization is undefined, because it depend on `ready_seqno`
+        // (Which depends on initial `schedule()` order, which in turn depend on `std::unordered_map` order)
+        // So we have to obtain `ready_seqno` to be sure.
+        UInt64 ready_seqno_D = 0;
+        UInt64 ready_seqno_E = 0;
+
+        auto job_func = [&] (const LoadJobPtr & self)
+        {
+            {
+                std::unique_lock lock{schedule_mutex};
+                schedule += fmt::format("{}{}", self->name, self->executionPool());
+            }
+
+            if (prioritize && self->name == "C")
+            {
+                for (const auto & state : t.loader.getJobStates())
+                {
+                    if (state.job->name == "D")
+                        ready_seqno_D = state.ready_seqno;
+                    if (state.job->name == "E")
+                        ready_seqno_E = state.ready_seqno;
+                }
+
+                // Jobs D and E should be enqueued at the moment
+                ASSERT_LT(0, ready_seqno_D);
+                ASSERT_LT(0, ready_seqno_E);
+
+                // Dynamic prioritization G0 -> G9
+                // Note that it will spawn concurrent worker in higher priority pool
+                t.loader.prioritize(job_to_prioritize, 9);
+
+                sync.arrive_and_wait(); // (A) wait for higher priority worker (B) to test they can be concurrent
+            }
+
+            if (wait_sync && (self->name == "D" || self->name == "E"))
+            {
+                wait_sync = false;
+                sync.arrive_and_wait(); // (B)
+            }
+        };
+
+        // Job DAG with initial priorities. During execution of C4, job G0 priority is increased to G9, postponing B3 job executing.
+        // A0 -+-> B3
+        //     |
+        //     `-> C4
+        //     |
+        //     `-> D1 -.
+        //     |       +-> F0 --> G0 --> H0
+        //     `-> E2 -'
+        std::vector<LoadJobPtr> jobs;
+        jobs.push_back(makeLoadJob({}, 0, "A", job_func)); // 0
+        jobs.push_back(makeLoadJob({ jobs[0] }, 3, "B", job_func)); // 1
+        jobs.push_back(makeLoadJob({ jobs[0] }, 4, "C", job_func)); // 2
+        jobs.push_back(makeLoadJob({ jobs[0] }, 1, "D", job_func)); // 3
+        jobs.push_back(makeLoadJob({ jobs[0] }, 2, "E", job_func)); // 4
+        jobs.push_back(makeLoadJob({ jobs[3], jobs[4] }, 0, "F", job_func)); // 5
+        jobs.push_back(makeLoadJob({ jobs[5] }, 0, "G", job_func)); // 6
+        jobs.push_back(makeLoadJob({ jobs[6] }, 0, "H", job_func)); // 7
+        auto task = t.schedule({ jobs.begin(), jobs.end() });
+
+        job_to_prioritize = jobs[6]; // G
+
+        t.loader.start();
+        t.loader.wait();
+        t.loader.stop();
+
+        if (prioritize)
+        {
+            if (ready_seqno_D < ready_seqno_E)
+                ASSERT_EQ(schedule, "A4C4D9E9F9G9B3H0");
+            else
+                ASSERT_EQ(schedule, "A4C4E9D9F9G9B3H0");
+        }
+        else
+            ASSERT_EQ(schedule, "A4C4B3E2D1F0G0H0");
+    }
+}
+
+TEST(AsyncLoader, RandomIndependentTasks)
+{
+    AsyncLoaderTest t(16);
+    t.loader.start();
+
+    auto job_func = [&] (const LoadJobPtr & self)
+    {
+        for (const auto & dep : self->dependencies)
+            ASSERT_EQ(dep->status(), LoadStatus::OK);
+        t.randomSleepUs(100, 500, 5);
+    };
+
+    std::vector<LoadTaskPtr> tasks;
+    tasks.reserve(512);
+    for (int i = 0; i < 512; i++)
+    {
+        int job_count = t.randomInt(1, 32);
+        tasks.push_back(t.schedule(t.randomJobSet(job_count, 5, job_func)));
+        t.randomSleepUs(100, 900, 20); // avg=100us
+    }
+}
+
+TEST(AsyncLoader, RandomDependentTasks)
+{
+    AsyncLoaderTest t(16);
+    t.loader.start();
+
+    std::mutex mutex;
+    std::condition_variable cv;
+    std::vector<LoadTaskPtr> tasks;
+    std::vector<LoadJobPtr> all_jobs;
+
+    auto job_func = [&] (const LoadJobPtr & self)
+    {
+        for (const auto & dep : self->dependencies)
+            ASSERT_EQ(dep->status(), LoadStatus::OK);
+        cv.notify_one();
+    };
+
+    std::unique_lock lock{mutex};
+
+    int tasks_left = 1000;
+    tasks.reserve(tasks_left);
+    while (tasks_left-- > 0)
+    {
+        cv.wait(lock, [&] { return t.loader.getScheduledJobCount() < 100; });
+
+        // Add one new task
+        int job_count = t.randomInt(1, 32);
+        LoadJobSet jobs = t.randomJobSet(job_count, 5, all_jobs, job_func);
+        all_jobs.insert(all_jobs.end(), jobs.begin(), jobs.end());
+        tasks.push_back(t.schedule(std::move(jobs)));
+
+        // Cancel random old task
+        if (tasks.size() > 100)
+            tasks.erase(tasks.begin() + t.randomInt<size_t>(0, tasks.size() - 1));
+    }
+
+    t.loader.wait();
+}
+
+TEST(AsyncLoader, SetMaxThreads)
+{
+    AsyncLoaderTest t(1);
+
+    std::atomic<int> sync_index{0};
+    std::atomic<int> executing{0};
+    int max_threads_values[] = {1, 2, 3, 4, 5, 4, 3, 2, 1, 5, 10, 5, 1, 20, 1};
+    std::vector<std::unique_ptr<std::barrier<>>> syncs;
+    syncs.reserve(std::size(max_threads_values));
+    for (int max_threads : max_threads_values)
+        syncs.push_back(std::make_unique<std::barrier<>>(max_threads + 1));
+
+
+    auto job_func = [&] (const LoadJobPtr &)
+    {
+        int idx = sync_index;
+        if (idx < syncs.size())
+        {
+            executing++;
+            syncs[idx]->arrive_and_wait(); // (A)
+            executing--;
+            syncs[idx]->arrive_and_wait(); // (B)
+        }
+    };
+
+    // Generate enough independent jobs
+    for (int i = 0; i < 1000; i++)
+        t.schedule({makeLoadJob({}, "job", job_func)})->detach();
+
+    t.loader.start();
+    while (sync_index < syncs.size())
+    {
+        // Wait for `max_threads` jobs to start executing
+        int idx = sync_index;
+        while (executing.load() != max_threads_values[idx])
+        {
+            ASSERT_LE(executing, max_threads_values[idx]);
+            std::this_thread::yield();
+        }
+
+        // Allow all jobs to finish
+        syncs[idx]->arrive_and_wait(); // (A)
+        sync_index++;
+        if (sync_index < syncs.size())
+            t.loader.setMaxThreads(/* pool = */ 0, max_threads_values[sync_index]);
+        syncs[idx]->arrive_and_wait(); // (B) this sync point is required to allow `executing` value to go back down to zero after we change number of workers
+    }
+    t.loader.wait();
+}
+
+TEST(AsyncLoader, DynamicPools)
+{
+    const size_t max_threads[] { 2, 10 };
+    const int jobs_in_chain = 16;
+    AsyncLoaderTest t({
+        {.max_threads = max_threads[0], .priority{0}},
+        {.max_threads = max_threads[1], .priority{-1}},
+    });
+
+    t.loader.start();
+
+    std::atomic<size_t> executing[2] { 0, 0 }; // Number of currently executing jobs per pool
+
+    for (int concurrency = 1; concurrency <= 12; concurrency++)
+    {
+        std::atomic<bool> boosted{false}; // Visible concurrency was increased
+        std::atomic<int> left{concurrency * jobs_in_chain / 2}; // Number of jobs to start before `prioritize()` call
+
+        LoadJobSet jobs_to_prioritize;
+
+        auto job_func = [&] (const LoadJobPtr & self)
+        {
+            auto pool_id = self->executionPool();
+            executing[pool_id]++;
+            if (executing[pool_id] > max_threads[0])
+                boosted = true;
+            ASSERT_LE(executing[pool_id], max_threads[pool_id]);
+
+            // Dynamic prioritization
+            if (--left == 0)
+            {
+                for (const auto & job : jobs_to_prioritize)
+                    t.loader.prioritize(job, 1);
+            }
+
+            t.randomSleepUs(100, 200, 100);
+
+            ASSERT_LE(executing[pool_id], max_threads[pool_id]);
+            executing[pool_id]--;
+        };
+
+        std::vector<LoadTaskPtr> tasks;
+        tasks.reserve(concurrency);
+        for (int i = 0; i < concurrency; i++)
+            tasks.push_back(makeLoadTask(t.loader, t.chainJobSet(jobs_in_chain, job_func)));
+        jobs_to_prioritize = getGoals(tasks); // All jobs
+        scheduleAndWaitLoadAll(tasks);
+
+        ASSERT_EQ(executing[0], 0);
+        ASSERT_EQ(executing[1], 0);
+        ASSERT_EQ(boosted, concurrency > 2);
+        boosted = false;
+    }
+
+}
diff --git a/src/Common/tests/gtest_base_json.cpp b/src/Common/tests/gtest_base_json.cpp
new file mode 100644
index 00000000000..60c469f1542
--- /dev/null
+++ b/src/Common/tests/gtest_base_json.cpp
@@ -0,0 +1,14 @@
+#include <gtest/gtest.h>
+
+#include <base/JSON.h>
+
+TEST(JSON, searchField)
+{
+    const JSON json = JSON(std::string_view(R"({"k1":1,"k2":{"k3":2,"k4":3,"k":4},"k":5})"));
+    ASSERT_EQ(json["k1"].getUInt(), 1);
+    ASSERT_EQ(json["k2"].toString(), R"({"k3":2,"k4":3,"k":4})");
+    ASSERT_EQ(json["k2"]["k3"].getUInt(), 2);
+    ASSERT_EQ(json["k2"]["k4"].getUInt(), 3);
+    ASSERT_EQ(json["k2"]["k"].getUInt(), 4);
+    ASSERT_EQ(json["k"].getUInt(), 5);
+}
diff --git a/src/Common/tests/gtest_concurrency_control.cpp b/src/Common/tests/gtest_concurrency_control.cpp
index 2ffb16511f3..8e5b89a72a0 100644
--- a/src/Common/tests/gtest_concurrency_control.cpp
+++ b/src/Common/tests/gtest_concurrency_control.cpp
@@ -9,6 +9,8 @@
 #include <Common/ConcurrencyControl.h>
 #include <Common/randomSeed.h>
 
+using namespace DB;
+
 struct ConcurrencyControlTest
 {
     ConcurrencyControl cc;
@@ -232,12 +234,12 @@ TEST(ConcurrencyControl, MultipleThreads)
             while (auto slot = slots->tryAcquire())
             {
                 std::unique_lock lock{threads_mutex};
-                threads.emplace_back([&, slot = std::move(slot)]
+                threads.emplace_back([&, my_slot = std::move(slot)]
                 {
                     pcg64 rng(randomSeed());
                     std::uniform_int_distribution<size_t> distribution(1, cfg_work_us);
                     size_t steps = distribution(rng);
-                    for (size_t step = 0; step < steps; step++)
+                    for (size_t step = 0; step < steps; ++step)
                     {
                         sleepForMicroseconds(distribution(rng)); // emulate work
                         spawn_threads(); // upscale
@@ -276,9 +278,9 @@ TEST(ConcurrencyControl, MultipleThreads)
             queries.emplace_back([&, max_threads = max_threads_distribution(rng)]
             {
                 run_query(max_threads);
-                finished++;
+                ++finished;
             });
-            started++;
+            ++started;
         }
         sleepForMicroseconds(5); // wait some queries to finish
         t.cc.setMaxConcurrency(cfg_max_concurrency - started % 3); // emulate configuration updates
diff --git a/src/Common/tests/gtest_find_symbols.cpp b/src/Common/tests/gtest_find_symbols.cpp
index 1daab982d01..d9d3ba7660a 100644
--- a/src/Common/tests/gtest_find_symbols.cpp
+++ b/src/Common/tests/gtest_find_symbols.cpp
@@ -4,9 +4,26 @@
 #include <gtest/gtest.h>
 
 
+template <char ... symbols>
+void test_find_first_not(const std::string & haystack, std::size_t expected_pos)
+{
+    const char * begin = haystack.data();
+    const char * end = haystack.data() + haystack.size();
+
+    ASSERT_EQ(begin + expected_pos, find_first_not_symbols<symbols...>(begin, end));
+}
+
+void test_find_first_not(const std::string & haystack, const std::string & symbols, const std::size_t expected_pos)
+{
+    const char * begin = haystack.data();
+
+    ASSERT_EQ(begin + expected_pos, find_first_not_symbols(haystack, SearchSymbols(symbols)));
+}
+
+
 TEST(FindSymbols, SimpleTest)
 {
-    std::string s = "Hello, world! Goodbye...";
+    const std::string s = "Hello, world! Goodbye...";
     const char * begin = s.data();
     const char * end = s.data() + s.size();
 
@@ -17,6 +34,9 @@ TEST(FindSymbols, SimpleTest)
     ASSERT_EQ(find_first_symbols<'H'>(begin, end), begin);
     ASSERT_EQ((find_first_symbols<'a', 'e'>(begin, end)), begin + 1);
 
+    ASSERT_EQ((find_first_symbols<'a', 'e', 'w', 'x', 'z'>(begin, end)), begin + 1);
+    ASSERT_EQ((find_first_symbols<'p', 'q', 's', 'x', 'z'>(begin, end)), end);
+
     ASSERT_EQ(find_last_symbols_or_null<'a'>(begin, end), nullptr);
     ASSERT_EQ(find_last_symbols_or_null<'e'>(begin, end), end - 4);
     ASSERT_EQ(find_last_symbols_or_null<'.'>(begin, end), end - 1);
@@ -36,3 +56,153 @@ TEST(FindSymbols, SimpleTest)
         ASSERT_EQ(vals, (std::vector<std::string>{"s", "String"}));
     }
 }
+
+TEST(FindSymbols, RunTimeNeedle)
+{
+    auto test_haystack = [](const auto & haystack, const auto & unfindable_needle) {
+#define TEST_HAYSTACK_AND_NEEDLE(haystack_, needle_) \
+        do { \
+            const auto & h = haystack_; \
+            const auto & n = needle_; \
+            EXPECT_EQ( \
+                    std::find_first_of(h.data(), h.data() + h.size(), n.data(), n.data() + n.size()), \
+                    find_first_symbols(h, SearchSymbols(n)) \
+            ) << "haystack: \"" << h << "\" (" << static_cast<const void*>(h.data()) << ")" \
+              << ", needle: \"" << n << "\""; \
+        } \
+        while (false)
+
+        // can't find needle
+        TEST_HAYSTACK_AND_NEEDLE(haystack, unfindable_needle);
+
+#define TEST_WITH_MODIFIED_NEEDLE(haystack, in_needle, needle_update_statement) \
+        do \
+        { \
+            std::string needle = (in_needle); \
+            (needle_update_statement); \
+            TEST_HAYSTACK_AND_NEEDLE(haystack, needle); \
+        } \
+        while (false)
+
+        // findable symbol is at beginning of the needle
+        // Can find at first pos of haystack
+        TEST_WITH_MODIFIED_NEEDLE(haystack, unfindable_needle, needle.front() = haystack.front());
+        // Can find at first pos of haystack
+        TEST_WITH_MODIFIED_NEEDLE(haystack, unfindable_needle, needle.front() = haystack.back());
+        // Can find in the middle of haystack
+        TEST_WITH_MODIFIED_NEEDLE(haystack, unfindable_needle, needle.front() = haystack[haystack.size() / 2]);
+
+        // findable symbol is at end of the needle
+        // Can find at first pos of haystack
+        TEST_WITH_MODIFIED_NEEDLE(haystack, unfindable_needle, needle.back() = haystack.front());
+        // Can find at first pos of haystack
+        TEST_WITH_MODIFIED_NEEDLE(haystack, unfindable_needle, needle.back() = haystack.back());
+        // Can find in the middle of haystack
+        TEST_WITH_MODIFIED_NEEDLE(haystack, unfindable_needle, needle.back() = haystack[haystack.size() / 2]);
+
+        // findable symbol is in the middle of the needle
+        // Can find at first pos of haystack
+        TEST_WITH_MODIFIED_NEEDLE(haystack, unfindable_needle, needle[needle.size() / 2] = haystack.front());
+        // Can find at first pos of haystack
+        TEST_WITH_MODIFIED_NEEDLE(haystack, unfindable_needle, needle[needle.size() / 2] = haystack.back());
+        // Can find in the middle of haystack
+        TEST_WITH_MODIFIED_NEEDLE(haystack, unfindable_needle, needle[needle.size() / 2] = haystack[haystack.size() / 2]);
+
+#undef TEST_WITH_MODIFIED_NEEDLE
+#undef TEST_HAYSTACK_AND_NEEDLE
+    };
+
+    // there are 4 major groups of cases:
+    // haystack < 16 bytes, haystack > 16 bytes
+    // needle < 5 bytes,    needle >= 5 bytes
+
+    // First and last symbols of haystack should be unique
+    const std::string long_haystack = "Hello, world! Goodbye...?";
+    const std::string short_haystack = "Hello, world!";
+
+    // In sync with find_first_symbols_dispatch code: long needles receive special treatment.
+    // as of now "long" means >= 5
+    const std::string unfindable_long_needle = "0123456789ABCDEF";
+    const std::string unfindable_short_needle = "0123";
+
+    {
+        SCOPED_TRACE("Long haystack");
+        test_haystack(long_haystack, unfindable_long_needle);
+        test_haystack(long_haystack, unfindable_short_needle);
+    }
+
+    {
+        SCOPED_TRACE("Short haystack");
+        test_haystack(short_haystack, unfindable_long_needle);
+        test_haystack(short_haystack, unfindable_short_needle);
+    }
+
+    // Assert big haystack is not accepted and exception is thrown
+    ASSERT_ANY_THROW(find_first_symbols(long_haystack, SearchSymbols("ABCDEFIJKLMNOPQRSTUVWXYZacfghijkmnpqstuvxz")));
+}
+
+TEST(FindNotSymbols, AllSymbolsPresent)
+{
+    std::string str_with_17_bytes = "hello world hello";
+    std::string str_with_16_bytes = {str_with_17_bytes.begin(), str_with_17_bytes.end() - 1u};
+    std::string str_with_15_bytes = {str_with_16_bytes.begin(), str_with_16_bytes.end() - 1u};
+
+    /*
+     * The below variations will choose different implementation strategies:
+     * 1. Loop method only because it does not contain enough bytes for SSE 4.2
+     * 2. SSE4.2 only since string contains exactly 16 bytes
+     * 3. SSE4.2 + Loop method will take place because only first 16 bytes are treated by SSE 4.2 and remaining bytes is treated by loop
+     *
+     * Below code asserts that all calls return the ::end of the input string. This was not true prior to this fix as mentioned in PR #47304
+     * */
+
+    test_find_first_not<'h', 'e', 'l', 'o', 'w', 'r', 'd', ' '>(str_with_15_bytes, str_with_15_bytes.size());
+    test_find_first_not<'h', 'e', 'l', 'o', 'w', 'r', 'd', ' '>(str_with_16_bytes, str_with_16_bytes.size());
+    test_find_first_not<'h', 'e', 'l', 'o', 'w', 'r', 'd', ' '>(str_with_17_bytes, str_with_17_bytes.size());
+
+    const auto * symbols = "helowrd ";
+
+    test_find_first_not(str_with_15_bytes, symbols, str_with_15_bytes.size());
+    test_find_first_not(str_with_16_bytes, symbols, str_with_16_bytes.size());
+    test_find_first_not(str_with_17_bytes, symbols, str_with_17_bytes.size());
+}
+
+TEST(FindNotSymbols, NoSymbolsMatch)
+{
+    std::string s = "abcdefg";
+
+    // begin should be returned since the first character of the string does not match any of the below symbols
+    test_find_first_not<'h', 'i', 'j'>(s, 0u);
+    test_find_first_not(s, "hij", 0u);
+}
+
+TEST(FindNotSymbols, ExtraSymbols)
+{
+    std::string s = "hello_world_hello";
+    test_find_first_not<'h', 'e', 'l', 'o', ' '>(s, 5u);
+    test_find_first_not(s, "helo ", 5u);
+}
+
+TEST(FindNotSymbols, EmptyString)
+{
+    std::string s;
+    test_find_first_not<'h', 'e', 'l', 'o', 'w', 'r', 'd', ' '>(s, s.size());
+    test_find_first_not(s, "helowrd ", s.size());
+}
+
+TEST(FindNotSymbols, SingleChar)
+{
+    std::string s = "a";
+    test_find_first_not<'a'>(s, s.size());
+    test_find_first_not(s, "a", s.size());
+}
+
+TEST(FindNotSymbols, NullCharacter)
+{
+    // special test to ensure only the passed template arguments are used as needles
+    // since current find_first_symbols implementation takes in 16 characters and defaults
+    // to \0.
+    std::string s("abcdefg\0x", 9u);
+    test_find_first_not<'a', 'b', 'c', 'd', 'e', 'f', 'g'>(s, 7u);
+    test_find_first_not(s, "abcdefg", 7u);
+}
diff --git a/src/Common/tests/gtest_global_register.h b/src/Common/tests/gtest_global_register.h
index c4bde825109..3a7fa77c893 100644
--- a/src/Common/tests/gtest_global_register.h
+++ b/src/Common/tests/gtest_global_register.h
@@ -1,8 +1,13 @@
 #pragma once
 
 #include <Functions/registerFunctions.h>
+#include <AggregateFunctions/registerAggregateFunctions.h>
 #include <Formats/registerFormats.h>
 
+inline void tryRegisterAggregateFunctions()
+{
+    static struct Register { Register() { DB::registerAggregateFunctions(); } } registered;
+}
 
 inline void tryRegisterFunctions()
 {
diff --git a/src/Common/tests/gtest_lru_cache.cpp b/src/Common/tests/gtest_lru_cache.cpp
index f74d1eb9464..1185dd58e5e 100644
--- a/src/Common/tests/gtest_lru_cache.cpp
+++ b/src/Common/tests/gtest_lru_cache.cpp
@@ -6,7 +6,7 @@
 TEST(LRUCache, set)
 {
     using SimpleCacheBase = DB::CacheBase<int, int>;
-    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
+    auto lru_cache = SimpleCacheBase("LRU", /*max_size_in_bytes*/ 10, /*max_count*/ 10);
     lru_cache.set(1, std::make_shared<int>(2));
     lru_cache.set(2, std::make_shared<int>(3));
 
@@ -19,7 +19,7 @@ TEST(LRUCache, set)
 TEST(LRUCache, update)
 {
     using SimpleCacheBase = DB::CacheBase<int, int>;
-    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
+    auto lru_cache = SimpleCacheBase("LRU", /*max_size_in_bytes*/ 10, /*max_count*/ 10);
     lru_cache.set(1, std::make_shared<int>(2));
     lru_cache.set(1, std::make_shared<int>(3));
     auto val = lru_cache.get(1);
@@ -30,7 +30,7 @@ TEST(LRUCache, update)
 TEST(LRUCache, get)
 {
     using SimpleCacheBase = DB::CacheBase<int, int>;
-    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
+    auto lru_cache = SimpleCacheBase("LRU", /*max_size_in_bytes*/ 10, /*max_count*/ 10);
     lru_cache.set(1, std::make_shared<int>(2));
     lru_cache.set(2, std::make_shared<int>(3));
     SimpleCacheBase::MappedPtr value = lru_cache.get(1);
@@ -50,7 +50,7 @@ struct ValueWeight
 TEST(LRUCache, evictOnSize)
 {
     using SimpleCacheBase = DB::CacheBase<int, size_t>;
-    auto lru_cache = SimpleCacheBase(/*max_size*/ 20, /*max_elements_size*/ 3, "LRU");
+    auto lru_cache = SimpleCacheBase("LRU", /*max_size_in_bytes*/ 20, /*max_count*/ 3);
     lru_cache.set(1, std::make_shared<size_t>(2));
     lru_cache.set(2, std::make_shared<size_t>(3));
     lru_cache.set(3, std::make_shared<size_t>(4));
@@ -66,7 +66,7 @@ TEST(LRUCache, evictOnSize)
 TEST(LRUCache, evictOnWeight)
 {
     using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
-    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
+    auto lru_cache = SimpleCacheBase("LRU", /*max_size_in_bytes*/ 10, /*max_count*/ 10);
     lru_cache.set(1, std::make_shared<size_t>(2));
     lru_cache.set(2, std::make_shared<size_t>(3));
     lru_cache.set(3, std::make_shared<size_t>(4));
@@ -87,7 +87,7 @@ TEST(LRUCache, evictOnWeight)
 TEST(LRUCache, getOrSet)
 {
     using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
-    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
+    auto lru_cache = SimpleCacheBase("LRU", /*max_size_in_bytes*/ 10, /*max_count*/ 10);
     size_t x = 10;
     auto load_func = [&] { return std::make_shared<size_t>(x); };
     auto [value, loaded] = lru_cache.getOrSet(1, load_func);
diff --git a/src/Common/tests/gtest_optimize_re.cpp b/src/Common/tests/gtest_optimize_re.cpp
new file mode 100644
index 00000000000..3710666d336
--- /dev/null
+++ b/src/Common/tests/gtest_optimize_re.cpp
@@ -0,0 +1,50 @@
+#include <gtest/gtest.h>
+
+#include <Common/OptimizedRegularExpression.h>
+
+TEST(OptimizeRE, analyze)
+{
+    auto test_f = [](const std::string & regexp, const std::string & required, std::vector<std::string> expect_alternatives = {}, bool trival_expected = false, bool prefix_expected = false)
+    {
+        std::string answer;
+        bool is_trivial;
+        bool is_prefix;
+        std::vector<std::string> alternatives;
+        OptimizedRegularExpression::analyze(regexp, answer, is_trivial, is_prefix, alternatives);
+        std::cerr << regexp << std::endl;
+        EXPECT_EQ(required, answer);
+        EXPECT_EQ(alternatives, expect_alternatives);
+        EXPECT_EQ(is_trivial, trival_expected);
+        EXPECT_EQ(is_prefix, prefix_expected);
+    };
+    test_f("abc", "abc", {}, true, true);
+    test_f("c([^k]*)de", "");
+    test_f("abc(de)fg", "abcdefg", {}, false, true);
+    test_f("abc(de|xyz)fg", "abc", {"abcdefg", "abcxyzfg"}, false, true);
+    test_f("abc(de?f|xyz)fg", "abc", {"abcd", "abcxyzfg"}, false, true);
+    test_f("abc|fgk|xyz", "", {"abc","fgk", "xyz"});
+    test_f("(abc)", "abc", {}, false, true);
+    test_f("(abc|fgk)", "", {"abc","fgk"});
+    test_f("(abc|fgk)(e|f|zkh|)", "", {"abc","fgk"});
+    test_f("abc(abc|fg)xyzz", "xyzz", {"abcabcxyzz","abcfgxyzz"});
+    test_f("((abc|fg)kkk*)xyzz", "xyzz", {"abckk", "fgkk"});
+    test_f("abc(*(abc|fg)*)xyzz", "xyzz");
+    test_f("abc[k]xyzz", "xyzz");
+    test_f("(abc[k]xyzz)", "xyzz");
+    test_f("abc((de)fg(hi))jk", "abcdefghijk", {}, false, true);
+    test_f("abc((?:de)fg(?:hi))jk", "abcdefghijk", {}, false, true);
+    test_f("abc((de)fghi+zzz)jk", "abcdefghi", {}, false, true);
+    test_f("abc((de)fg(hi))?jk", "abc", {}, false, true);
+    test_f("abc((de)fghi?zzz)jk", "abcdefgh", {}, false, true);
+    test_f("abc(*cd)jk", "cdjk");
+    test_f(R"(abc(de|xyz|(\{xx\}))fg)", "abc", {"abcdefg", "abcxyzfg", "abc{xx}fg"}, false, true);
+    test_f("abc(abc|fg)?xyzz", "xyzz");
+    test_f("abc(abc|fg){0,1}xyzz", "xyzz");
+    test_f("abc(abc|fg)xyzz|bcdd?k|bc(f|g|h?)z", "", {"abcabcxyzz", "abcfgxyzz", "bcd", "bc"});
+    test_f("abc(abc|fg)xyzz|bc(dd?x|kk?y|(f))k|bc(f|g|h?)z", "", {"abcabcxyzz", "abcfgxyzz", "bcd", "bck", "bcfk", "bc"});
+    test_f("((?:abc|efg|xyz)/[a-zA-Z0-9]{1-50})(/?[^ ]*|)", "", {"abc/", "efg/", "xyz/"});
+    test_f(R"([Bb]ai[Dd]u[Ss]pider(?:-[A-Za-z]{1,30})(?:-[A-Za-z]{1,30}|)|bingbot|\bYeti(?:-[a-z]{1,30}|)|Catchpoint(?: bot|)|[Cc]harlotte|Daumoa(?:-feedfetcher|)|(?:[a-zA-Z]{1,30}-|)Googlebot(?:-[a-zA-Z]{1,30}|))", "", {"pider-", "bingbot", "Yeti-", "Yeti", "Catchpoint bot", "Catchpoint", "harlotte", "Daumoa-feedfetcher", "Daumoa", "-Googlebot", "Googlebot"});
+    test_f("abc|(:?xx|yy|zz|x?)def", "", {"abc", "def"});
+    test_f("abc|(:?xx|yy|zz|x?){1,2}def", "", {"abc", "def"});
+    test_f(R"(\\A(?:(?:[-0-9_a-z]+(?:\\.[-0-9_a-z]+)*)/k8s1)\\z)", "/k8s1");
+}
diff --git a/src/Common/tests/gtest_range_generator.cpp b/src/Common/tests/gtest_range_generator.cpp
deleted file mode 100644
index 1f25164dfda..00000000000
--- a/src/Common/tests/gtest_range_generator.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Common/RangeGenerator.h>
-#include <gtest/gtest.h>
-
-using namespace DB;
-
-
-TEST(RangeGenerator, Common)
-{
-    RangeGenerator g{25, 10};
-    EXPECT_EQ(g.totalRanges(), 3);
-
-    std::vector<RangeGenerator::Range> ranges{{0, 10}, {10, 20}, {20, 25}};
-    for (size_t i = 0; i < 3; ++i)
-    {
-        auto r = g.nextRange();
-        EXPECT_TRUE(r);
-        EXPECT_EQ(r, ranges[i]);
-    }
-
-    auto r = g.nextRange();
-    EXPECT_TRUE(!r);
-}
diff --git a/src/Common/tests/gtest_sensitive_data_masker.cpp b/src/Common/tests/gtest_sensitive_data_masker.cpp
index 1b13f475363..92c4edbac2a 100644
--- a/src/Common/tests/gtest_sensitive_data_masker.cpp
+++ b/src/Common/tests/gtest_sensitive_data_masker.cpp
@@ -4,11 +4,9 @@
 #include <Poco/Util/XMLConfiguration.h>
 #include <Poco/XML/XMLException.h>
 
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#ifdef __clang__
-#    pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#    pragma clang diagnostic ignored "-Wundef"
-#endif
+#pragma clang diagnostic ignored "-Wsign-compare"
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#pragma clang diagnostic ignored "-Wundef"
 
 #include <gtest/gtest.h>
 #include <chrono>
diff --git a/src/Common/tests/gtest_slru_cahce.cpp b/src/Common/tests/gtest_slru_cache.cpp
similarity index 81%
rename from src/Common/tests/gtest_slru_cahce.cpp
rename to src/Common/tests/gtest_slru_cache.cpp
index 66df0dbec77..52549592f0e 100644
--- a/src/Common/tests/gtest_slru_cahce.cpp
+++ b/src/Common/tests/gtest_slru_cache.cpp
@@ -6,7 +6,7 @@
 TEST(SLRUCache, set)
 {
     using SimpleCacheBase = DB::CacheBase<int, int>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase("SLRU", /*max_size_in_bytes=*/10, /*max_count=*/0, /*size_ratio*/0.5);
     slru_cache.set(1, std::make_shared<int>(2));
     slru_cache.set(2, std::make_shared<int>(3));
 
@@ -19,7 +19,7 @@ TEST(SLRUCache, set)
 TEST(SLRUCache, update)
 {
     using SimpleCacheBase = DB::CacheBase<int, int>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase("SLRU", /*max_size_in_bytes=*/10, /*max_count=*/0, /*size_ratio*/0.5);
     slru_cache.set(1, std::make_shared<int>(2));
     slru_cache.set(1, std::make_shared<int>(3));
 
@@ -31,7 +31,7 @@ TEST(SLRUCache, update)
 TEST(SLRUCache, get)
 {
     using SimpleCacheBase = DB::CacheBase<int, int>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase("SLRU", /*max_size_in_bytes=*/10, /*max_count=*/0, /*size_ratio*/0.5);
     slru_cache.set(1, std::make_shared<int>(2));
     slru_cache.set(2, std::make_shared<int>(3));
 
@@ -47,7 +47,7 @@ TEST(SLRUCache, get)
 TEST(SLRUCache, remove)
 {
     using SimpleCacheBase = DB::CacheBase<int, int>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase("SLRU", /*max_size_in_bytes=*/10, /*max_count=*/0, /*size_ratio*/0.5);
     slru_cache.set(1, std::make_shared<int>(2));
     slru_cache.set(2, std::make_shared<int>(3));
 
@@ -63,7 +63,7 @@ TEST(SLRUCache, remove)
 TEST(SLRUCache, removeFromProtected)
 {
     using SimpleCacheBase = DB::CacheBase<int, int>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/2, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase("SLRU", /*max_size_in_bytes=*/2, /*max_count=*/0, /*size_ratio*/0.5);
     slru_cache.set(1, std::make_shared<int>(2));
     slru_cache.set(1, std::make_shared<int>(3));
 
@@ -96,7 +96,7 @@ TEST(SLRUCache, removeFromProtected)
 TEST(SLRUCache, reset)
 {
     using SimpleCacheBase = DB::CacheBase<int, int>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase("SLRU", /*max_size_in_bytes=*/10, /*max_count=*/0, /*size_ratio*/0.5);
     slru_cache.set(1, std::make_shared<int>(2));
     slru_cache.set(2, std::make_shared<int>(3));
 
@@ -119,7 +119,7 @@ struct ValueWeight
 TEST(SLRUCache, evictOnElements)
 {
     using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/1, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase(/*max_size_in_bytes=*/10, /*max_count=*/1, /*size_ratio*/0.5);
     slru_cache.set(1, std::make_shared<size_t>(2));
     slru_cache.set(2, std::make_shared<size_t>(3));
 
@@ -140,7 +140,7 @@ TEST(SLRUCache, evictOnElements)
 TEST(SLRUCache, evictOnWeight)
 {
     using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase(/*max_size_in_bytes=*/10, /*max_count=*/0, /*size_ratio*/0.5);
     slru_cache.set(1, std::make_shared<size_t>(2));
     slru_cache.set(2, std::make_shared<size_t>(3));
     slru_cache.set(3, std::make_shared<size_t>(4));
@@ -161,7 +161,7 @@ TEST(SLRUCache, evictOnWeight)
 TEST(SLRUCache, evictFromProtectedPart)
 {
     using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase("SLRU", /*max_size_in_bytes=*/10, /*max_count=*/0, /*size_ratio*/0.5);
     slru_cache.set(1, std::make_shared<size_t>(2));
     slru_cache.set(1, std::make_shared<size_t>(2));
 
@@ -177,7 +177,7 @@ TEST(SLRUCache, evictFromProtectedPart)
 TEST(SLRUCache, evictStreamProtected)
 {
     using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase("SLRU", /*max_size_in_bytes=*/10, /*max_count=*/0, /*size_ratio*/0.5);
     slru_cache.set(1, std::make_shared<size_t>(2));
     slru_cache.set(1, std::make_shared<size_t>(2));
 
@@ -201,7 +201,7 @@ TEST(SLRUCache, evictStreamProtected)
 TEST(SLRUCache, getOrSet)
 {
     using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
-    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    auto slru_cache = SimpleCacheBase("SLRU", /*max_size_in_bytes=*/10, /*max_count=*/0, /*size_ratio*/0.5);
     size_t x = 5;
     auto load_func = [&] { return std::make_shared<size_t>(x); };
     auto [value, loaded] = slru_cache.getOrSet(1, load_func);
diff --git a/src/Common/tests/gtest_thread_pool_concurrent_wait.cpp b/src/Common/tests/gtest_thread_pool_concurrent_wait.cpp
index f5f14739e39..f93017129dd 100644
--- a/src/Common/tests/gtest_thread_pool_concurrent_wait.cpp
+++ b/src/Common/tests/gtest_thread_pool_concurrent_wait.cpp
@@ -1,4 +1,5 @@
 #include <Common/ThreadPool.h>
+#include <Common/CurrentMetrics.h>
 
 #include <gtest/gtest.h>
 
@@ -7,6 +8,12 @@
   */
 
 
+namespace CurrentMetrics
+{
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
+
 TEST(ThreadPool, ConcurrentWait)
 {
     auto worker = []
@@ -18,14 +25,14 @@ TEST(ThreadPool, ConcurrentWait)
     constexpr size_t num_threads = 4;
     constexpr size_t num_jobs = 4;
 
-    ThreadPool pool(num_threads);
+    ThreadPool pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, num_threads);
 
     for (size_t i = 0; i < num_jobs; ++i)
         pool.scheduleOrThrowOnError(worker);
 
     constexpr size_t num_waiting_threads = 4;
 
-    ThreadPool waiting_pool(num_waiting_threads);
+    ThreadPool waiting_pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, num_waiting_threads);
 
     for (size_t i = 0; i < num_waiting_threads; ++i)
         waiting_pool.scheduleOrThrowOnError([&pool] { pool.wait(); });
diff --git a/src/Common/tests/gtest_thread_pool_global_full.cpp b/src/Common/tests/gtest_thread_pool_global_full.cpp
index 583d43be1bb..1b2ded9c7e1 100644
--- a/src/Common/tests/gtest_thread_pool_global_full.cpp
+++ b/src/Common/tests/gtest_thread_pool_global_full.cpp
@@ -2,10 +2,17 @@
 
 #include <Common/Exception.h>
 #include <Common/ThreadPool.h>
+#include <Common/CurrentMetrics.h>
 
 #include <gtest/gtest.h>
 
 
+namespace CurrentMetrics
+{
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
+
 /// Test what happens if local ThreadPool cannot create a ThreadFromGlobalPool.
 /// There was a bug: if local ThreadPool cannot allocate even a single thread,
 ///  the job will be scheduled but never get executed.
@@ -27,7 +34,7 @@ TEST(ThreadPool, GlobalFull1)
 
     auto func = [&] { ++counter; while (counter != num_jobs) {} };
 
-    ThreadPool pool(num_jobs);
+    ThreadPool pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, num_jobs);
 
     for (size_t i = 0; i < capacity; ++i)
         pool.scheduleOrThrowOnError(func);
@@ -65,11 +72,11 @@ TEST(ThreadPool, GlobalFull2)
     std::atomic<size_t> counter = 0;
     auto func = [&] { ++counter; while (counter != capacity + 1) {} };
 
-    ThreadPool pool(capacity, 0, capacity);
+    ThreadPool pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, capacity, 0, capacity);
     for (size_t i = 0; i < capacity; ++i)
         pool.scheduleOrThrowOnError(func);
 
-    ThreadPool another_pool(1);
+    ThreadPool another_pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, 1);
     EXPECT_THROW(another_pool.scheduleOrThrowOnError(func), DB::Exception);
 
     ++counter;
diff --git a/src/Common/tests/gtest_thread_pool_limit.cpp b/src/Common/tests/gtest_thread_pool_limit.cpp
index bc67ffd0bc1..17f79d17894 100644
--- a/src/Common/tests/gtest_thread_pool_limit.cpp
+++ b/src/Common/tests/gtest_thread_pool_limit.cpp
@@ -1,16 +1,23 @@
 #include <atomic>
 #include <iostream>
 #include <Common/ThreadPool.h>
+#include <Common/CurrentMetrics.h>
 
 #include <gtest/gtest.h>
 
+namespace CurrentMetrics
+{
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
+
 /// Test for thread self-removal when number of free threads in pool is too large.
 /// Just checks that nothing weird happens.
 
 template <typename Pool>
 int test()
 {
-    Pool pool(10, 2, 10);
+    Pool pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, 10, 2, 10);
 
     std::atomic<int> counter{0};
     for (size_t i = 0; i < 10; ++i)
diff --git a/src/Common/tests/gtest_thread_pool_loop.cpp b/src/Common/tests/gtest_thread_pool_loop.cpp
index 15915044652..556c39df949 100644
--- a/src/Common/tests/gtest_thread_pool_loop.cpp
+++ b/src/Common/tests/gtest_thread_pool_loop.cpp
@@ -1,10 +1,17 @@
 #include <atomic>
 #include <iostream>
 #include <Common/ThreadPool.h>
+#include <Common/CurrentMetrics.h>
 
 #include <gtest/gtest.h>
 
 
+namespace CurrentMetrics
+{
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
+
 TEST(ThreadPool, Loop)
 {
     std::atomic<int> res{0};
@@ -12,7 +19,7 @@ TEST(ThreadPool, Loop)
     for (size_t i = 0; i < 1000; ++i)
     {
         size_t threads = 16;
-        ThreadPool pool(threads);
+        ThreadPool pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, threads);
         for (size_t j = 0; j < threads; ++j)
             pool.scheduleOrThrowOnError([&] { ++res; });
         pool.wait();
diff --git a/src/Common/tests/gtest_thread_pool_schedule_exception.cpp b/src/Common/tests/gtest_thread_pool_schedule_exception.cpp
index 69362c34cd2..5dbad00848d 100644
--- a/src/Common/tests/gtest_thread_pool_schedule_exception.cpp
+++ b/src/Common/tests/gtest_thread_pool_schedule_exception.cpp
@@ -1,13 +1,20 @@
 #include <iostream>
 #include <stdexcept>
 #include <Common/ThreadPool.h>
+#include <Common/CurrentMetrics.h>
 
 #include <gtest/gtest.h>
 
 
+namespace CurrentMetrics
+{
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
+
 static bool check()
 {
-    ThreadPool pool(10);
+    ThreadPool pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, 10);
 
     /// The throwing thread.
     pool.scheduleOrThrowOnError([] { throw std::runtime_error("Hello, world!"); });
@@ -44,3 +51,37 @@ TEST(ThreadPool, ExceptionFromSchedule)
 {
     EXPECT_TRUE(check());
 }
+
+static bool check2()
+{
+    ThreadPool pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, 2);
+
+    try
+    {
+        pool.scheduleOrThrowOnError([&]{ throw std::runtime_error("Hello, world!"); });
+        pool.scheduleOrThrowOnError([]{});
+    }
+    catch (const std::runtime_error &)
+    {
+        /// Sometimes exception may be thrown from schedule.
+        /// Just retry test in that case.
+        return true;
+    }
+
+    try
+    {
+        pool.wait();
+    }
+    catch (const std::runtime_error &)
+    {
+        return true;
+    }
+
+    return false;
+}
+
+TEST(ThreadPool, ExceptionFromWait)
+{
+    for (size_t i = 0; i < 1000; ++i)
+        EXPECT_TRUE(check2());
+}
diff --git a/src/Common/typeid_cast.h b/src/Common/typeid_cast.h
index 1568d380938..baee3aaf632 100644
--- a/src/Common/typeid_cast.h
+++ b/src/Common/typeid_cast.h
@@ -18,9 +18,6 @@ namespace DB
     }
 }
 
-template<typename T, typename ... U>
-concept is_any_of = (std::same_as<T, U> || ...);
-
 
 /** Checks type by comparing typeid.
   * The exact match of the type is checked. That is, cast to the ancestor will be unsuccessful.
diff --git a/src/Common/waitForPid.cpp b/src/Common/waitForPid.cpp
index 05e90f9162a..0ec10811354 100644
--- a/src/Common/waitForPid.cpp
+++ b/src/Common/waitForPid.cpp
@@ -10,8 +10,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wgnu-statement-expression"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu-statement-expression"
 #define HANDLE_EINTR(x) ({ \
     decltype(x) eintr_wrapper_result; \
     do { \
@@ -41,7 +41,7 @@ enum PollPidResult
         #define SYS_pidfd_open 434
     #elif defined(__aarch64__)
         #define SYS_pidfd_open 434
-    #elif defined(__ppc64__)
+    #elif defined(__powerpc64__)
         #define SYS_pidfd_open 434
     #elif defined(__riscv)
         #define SYS_pidfd_open 434
@@ -202,4 +202,4 @@ bool waitForPid(pid_t pid, size_t timeout_in_seconds)
 }
 
 }
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
diff --git a/src/Compression/CachedCompressedReadBuffer.cpp b/src/Compression/CachedCompressedReadBuffer.cpp
index fdb2132d134..0febfca75cc 100644
--- a/src/Compression/CachedCompressedReadBuffer.cpp
+++ b/src/Compression/CachedCompressedReadBuffer.cpp
@@ -28,7 +28,7 @@ void CachedCompressedReadBuffer::initInput()
 }
 
 
-void CachedCompressedReadBuffer::prefetch(int64_t priority)
+void CachedCompressedReadBuffer::prefetch(Priority priority)
 {
     initInput();
     file_in->prefetch(priority);
diff --git a/src/Compression/CachedCompressedReadBuffer.h b/src/Compression/CachedCompressedReadBuffer.h
index ee2728752e9..cce9a8e671c 100644
--- a/src/Compression/CachedCompressedReadBuffer.h
+++ b/src/Compression/CachedCompressedReadBuffer.h
@@ -36,7 +36,7 @@ private:
 
     bool nextImpl() override;
 
-    void prefetch(int64_t priority) override;
+    void prefetch(Priority priority) override;
 
     /// Passed into file_in.
     ReadBufferFromFileBase::ProfileCallback profile_callback;
diff --git a/src/Compression/CompressedReadBufferBase.cpp b/src/Compression/CompressedReadBufferBase.cpp
index ab856cc9801..278210d770a 100644
--- a/src/Compression/CompressedReadBufferBase.cpp
+++ b/src/Compression/CompressedReadBufferBase.cpp
@@ -6,10 +6,11 @@
 #include <city.h>
 #include <Common/ProfileEvents.h>
 #include <Common/Exception.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionFactory.h>
 #include <IO/ReadBuffer.h>
+#include <IO/ReadBufferFromMemory.h>
 #include <IO/BufferWithOwnMemory.h>
 #include <Compression/CompressionInfo.h>
 #include <IO/WriteHelpers.h>
@@ -191,7 +192,11 @@ size_t CompressedReadBufferBase::readCompressedData(size_t & size_decompressed,
 
     if (!disable_checksum)
     {
-        Checksum & checksum = *reinterpret_cast<Checksum *>(own_compressed_buffer.data());
+        Checksum checksum;
+        ReadBufferFromMemory checksum_in(own_compressed_buffer.data(), sizeof(checksum));
+        readBinaryLittleEndian(checksum.first, checksum_in);
+        readBinaryLittleEndian(checksum.second, checksum_in);
+
         validateChecksum(compressed_buffer, size_compressed_without_checksum, checksum);
     }
 
@@ -231,7 +236,11 @@ size_t CompressedReadBufferBase::readCompressedDataBlockForAsynchronous(size_t &
 
         if (!disable_checksum)
         {
-            Checksum & checksum = *reinterpret_cast<Checksum *>(own_compressed_buffer.data());
+            Checksum checksum;
+            ReadBufferFromMemory checksum_in(own_compressed_buffer.data(), sizeof(checksum));
+            readBinaryLittleEndian(checksum.first, checksum_in);
+            readBinaryLittleEndian(checksum.second, checksum_in);
+
             validateChecksum(compressed_buffer, size_compressed_without_checksum, checksum);
         }
 
@@ -319,5 +328,4 @@ CompressedReadBufferBase::CompressedReadBufferBase(ReadBuffer * in, bool allow_d
 
 CompressedReadBufferBase::~CompressedReadBufferBase() = default; /// Proper destruction of unique_ptr of forward-declared type.
 
-
 }
diff --git a/src/Compression/CompressedReadBufferFromFile.cpp b/src/Compression/CompressedReadBufferFromFile.cpp
index ca697e2f51e..9dc40b8217c 100644
--- a/src/Compression/CompressedReadBufferFromFile.cpp
+++ b/src/Compression/CompressedReadBufferFromFile.cpp
@@ -51,7 +51,7 @@ CompressedReadBufferFromFile::CompressedReadBufferFromFile(std::unique_ptr<ReadB
 }
 
 
-void CompressedReadBufferFromFile::prefetch(int64_t priority)
+void CompressedReadBufferFromFile::prefetch(Priority priority)
 {
     file_in.prefetch(priority);
 }
diff --git a/src/Compression/CompressedReadBufferFromFile.h b/src/Compression/CompressedReadBufferFromFile.h
index cb5c8fa1e4b..10b5827f4c8 100644
--- a/src/Compression/CompressedReadBufferFromFile.h
+++ b/src/Compression/CompressedReadBufferFromFile.h
@@ -43,7 +43,7 @@ private:
 
     bool nextImpl() override;
 
-    void prefetch(int64_t priority) override;
+    void prefetch(Priority priority) override;
 
 public:
     explicit CompressedReadBufferFromFile(std::unique_ptr<ReadBufferFromFileBase> buf, bool allow_different_codecs_ = false);
diff --git a/src/Compression/CompressedWriteBuffer.cpp b/src/Compression/CompressedWriteBuffer.cpp
index 82beeea37cd..cb2ee1140d0 100644
--- a/src/Compression/CompressedWriteBuffer.cpp
+++ b/src/Compression/CompressedWriteBuffer.cpp
@@ -5,19 +5,15 @@
 #include <base/unaligned.h>
 #include <base/defines.h>
 
+#include <IO/WriteHelpers.h>
+
 #include <Compression/CompressionFactory.h>
-#include "CompressedWriteBuffer.h"
+#include <Compression/CompressedWriteBuffer.h>
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-}
-
-static constexpr auto CHECKSUM_SIZE{sizeof(CityHash_v1_0_2::uint128)};
-
 void CompressedWriteBuffer::nextImpl()
 {
     if (!offset())
@@ -29,21 +25,23 @@ void CompressedWriteBuffer::nextImpl()
 
     /** During compression we need buffer with capacity >= compressed_reserve_size + CHECKSUM_SIZE.
       *
-      * If output buffer has necessary capacity, we can compress data directly in output buffer.
+      * If output buffer has necessary capacity, we can compress data directly into the output buffer.
       * Then we can write checksum at the output buffer begin.
       *
-      * If output buffer does not have necessary capacity. Compress data in temporary buffer.
-      * Then we can write checksum and temporary buffer in output buffer.
+      * If output buffer does not have necessary capacity. Compress data into a temporary buffer.
+      * Then we can write checksum and copy the temporary buffer into the output buffer.
       */
-    if (out.available() >= compressed_reserve_size + CHECKSUM_SIZE)
+    if (out.available() >= compressed_reserve_size + sizeof(CityHash_v1_0_2::uint128))
     {
-        char * out_checksum_ptr = out.position();
-        char * out_compressed_ptr = out.position() + CHECKSUM_SIZE;
+        char * out_compressed_ptr = out.position() + sizeof(CityHash_v1_0_2::uint128);
         UInt32 compressed_size = codec->compress(working_buffer.begin(), decompressed_size, out_compressed_ptr);
 
         CityHash_v1_0_2::uint128 checksum = CityHash_v1_0_2::CityHash128(out_compressed_ptr, compressed_size);
-        memcpy(out_checksum_ptr, reinterpret_cast<const char *>(&checksum), CHECKSUM_SIZE);
-        out.position() += CHECKSUM_SIZE + compressed_size;
+
+        writeBinaryLittleEndian(checksum.first, out);
+        writeBinaryLittleEndian(checksum.second, out);
+
+        out.position() += compressed_size;
     }
     else
     {
@@ -51,7 +49,10 @@ void CompressedWriteBuffer::nextImpl()
         UInt32 compressed_size = codec->compress(working_buffer.begin(), decompressed_size, compressed_buffer.data());
 
         CityHash_v1_0_2::uint128 checksum = CityHash_v1_0_2::CityHash128(compressed_buffer.data(), compressed_size);
-        out.write(reinterpret_cast<const char *>(&checksum), CHECKSUM_SIZE);
+
+        writeBinaryLittleEndian(checksum.first, out);
+        writeBinaryLittleEndian(checksum.second, out);
+
         out.write(compressed_buffer.data(), compressed_size);
     }
 }
diff --git a/src/Compression/CompressionCodecDeflateQpl.cpp b/src/Compression/CompressionCodecDeflateQpl.cpp
index 29d90b7dbd6..60efbd96f8f 100644
--- a/src/Compression/CompressionCodecDeflateQpl.cpp
+++ b/src/Compression/CompressionCodecDeflateQpl.cpp
@@ -7,6 +7,7 @@
 #include <Parsers/ASTIdentifier.h>
 #include <Poco/Logger.h>
 #include <Common/logger_useful.h>
+#include "libaccel_config.h"
 
 namespace DB
 {
@@ -16,11 +17,6 @@ namespace ErrorCodes
     extern const int CANNOT_DECOMPRESS;
 }
 
-std::array<qpl_job *, DeflateQplJobHWPool::MAX_HW_JOB_NUMBER> DeflateQplJobHWPool::hw_job_ptr_pool;
-std::array<std::atomic_bool, DeflateQplJobHWPool::MAX_HW_JOB_NUMBER> DeflateQplJobHWPool::hw_job_ptr_locks;
-bool DeflateQplJobHWPool::job_pool_ready = false;
-std::unique_ptr<uint8_t[]> DeflateQplJobHWPool::hw_jobs_buffer;
-
 DeflateQplJobHWPool & DeflateQplJobHWPool::instance()
 {
     static DeflateQplJobHWPool pool;
@@ -28,47 +24,69 @@ DeflateQplJobHWPool & DeflateQplJobHWPool::instance()
 }
 
 DeflateQplJobHWPool::DeflateQplJobHWPool()
-    : random_engine(std::random_device()())
-    , distribution(0, MAX_HW_JOB_NUMBER - 1)
+    : max_hw_jobs(0)
+    , random_engine(std::random_device()())
 {
     Poco::Logger * log = &Poco::Logger::get("DeflateQplJobHWPool");
-    UInt32 job_size = 0;
     const char * qpl_version = qpl_get_library_version();
 
-    /// Get size required for saving a single qpl job object
-    qpl_get_job_size(qpl_path_hardware, &job_size);
-    /// Allocate entire buffer for storing all job objects
-    hw_jobs_buffer = std::make_unique<uint8_t[]>(job_size * MAX_HW_JOB_NUMBER);
-    /// Initialize pool for storing all job object pointers
-    /// Reallocate buffer by shifting address offset for each job object.
-    for (UInt32 index = 0; index < MAX_HW_JOB_NUMBER; ++index)
+    // loop all configured workqueue size to get maximum job number.
+    accfg_ctx * ctx_ptr = nullptr;
+    auto ctx_status = accfg_new(&ctx_ptr);
+    if (ctx_status == 0)
     {
-        qpl_job * qpl_job_ptr = reinterpret_cast<qpl_job *>(hw_jobs_buffer.get() + index * job_size);
-        if (auto status = qpl_init_job(qpl_path_hardware, qpl_job_ptr); status != QPL_STS_OK)
+        auto * dev_ptr = accfg_device_get_first(ctx_ptr);
+        while (dev_ptr != nullptr)
+        {
+            for (auto * wq_ptr = accfg_wq_get_first(dev_ptr); wq_ptr != nullptr; wq_ptr = accfg_wq_get_next(wq_ptr))
+                max_hw_jobs += accfg_wq_get_size(wq_ptr);
+            dev_ptr = accfg_device_get_next(dev_ptr);
+        }
+    }
+    else
+    {
+        job_pool_ready = false;
+        LOG_WARNING(log, "Initialization of hardware-assisted DeflateQpl codec failed, falling back to software DeflateQpl codec. Failed to create new libaccel_config context -> status: {}, QPL Version: {}.", ctx_status, qpl_version);
+        return;
+    }
+
+    if (max_hw_jobs == 0)
+    {
+        job_pool_ready = false;
+        LOG_WARNING(log, "Initialization of hardware-assisted DeflateQpl codec failed, falling back to software DeflateQpl codec. Failed to get available workqueue size -> total_wq_size: {}, QPL Version: {}.", max_hw_jobs, qpl_version);
+        return;
+    }
+    distribution = std::uniform_int_distribution<int>(0, max_hw_jobs - 1);
+    /// Get size required for saving a single qpl job object
+    qpl_get_job_size(qpl_path_hardware, &per_job_size);
+    /// Allocate job buffer pool for storing all job objects
+    hw_jobs_buffer = std::make_unique<uint8_t[]>(per_job_size * max_hw_jobs);
+    hw_job_ptr_locks = std::make_unique<std::atomic_bool[]>(max_hw_jobs);
+    /// Initialize all job objects in job buffer pool
+    for (UInt32 index = 0; index < max_hw_jobs; ++index)
+    {
+        qpl_job * job_ptr = reinterpret_cast<qpl_job *>(hw_jobs_buffer.get() + index * per_job_size);
+        if (auto status = qpl_init_job(qpl_path_hardware, job_ptr); status != QPL_STS_OK)
         {
             job_pool_ready = false;
-            LOG_WARNING(log, "Initialization of hardware-assisted DeflateQpl codec failed: {} , falling back to software DeflateQpl codec. Please check if Intel In-Memory Analytics Accelerator (IAA) is properly set up. QPL Version: {}.", static_cast<UInt32>(status), qpl_version);
+            LOG_WARNING(log, "Initialization of hardware-assisted DeflateQpl codec failed, falling back to software DeflateQpl codec. Failed to Initialize qpl job -> status: {}, QPL Version: {}.", static_cast<UInt32>(status), qpl_version);
             return;
         }
-        hw_job_ptr_pool[index] = qpl_job_ptr;
         unLockJob(index);
     }
 
     job_pool_ready = true;
-    LOG_DEBUG(log, "Hardware-assisted DeflateQpl codec is ready! QPL Version: {}",qpl_version);
+    LOG_DEBUG(log, "Hardware-assisted DeflateQpl codec is ready! QPL Version: {}, max_hw_jobs: {}",qpl_version, max_hw_jobs);
 }
 
 DeflateQplJobHWPool::~DeflateQplJobHWPool()
 {
-    for (UInt32 i = 0; i < MAX_HW_JOB_NUMBER; ++i)
+    for (UInt32 i = 0; i < max_hw_jobs; ++i)
     {
-        if (hw_job_ptr_pool[i])
-        {
-            while (!tryLockJob(i));
-            qpl_fini_job(hw_job_ptr_pool[i]);
-            unLockJob(i);
-            hw_job_ptr_pool[i] = nullptr;
-        }
+        qpl_job * job_ptr = reinterpret_cast<qpl_job *>(hw_jobs_buffer.get() + i * per_job_size);
+        while (!tryLockJob(i));
+        qpl_fini_job(job_ptr);
+        unLockJob(i);
     }
     job_pool_ready = false;
 }
@@ -78,19 +96,19 @@ qpl_job * DeflateQplJobHWPool::acquireJob(UInt32 & job_id)
     if (isJobPoolReady())
     {
         UInt32 retry = 0;
-        auto index = distribution(random_engine);
+        UInt32 index = distribution(random_engine);
         while (!tryLockJob(index))
         {
             index = distribution(random_engine);
             retry++;
-            if (retry > MAX_HW_JOB_NUMBER)
+            if (retry > max_hw_jobs)
             {
                 return nullptr;
             }
         }
-        job_id = MAX_HW_JOB_NUMBER - index;
-        assert(index < MAX_HW_JOB_NUMBER);
-        return hw_job_ptr_pool[index];
+        job_id = max_hw_jobs - index;
+        assert(index < max_hw_jobs);
+        return reinterpret_cast<qpl_job *>(hw_jobs_buffer.get() + index * per_job_size);
     }
     else
         return nullptr;
@@ -99,19 +117,19 @@ qpl_job * DeflateQplJobHWPool::acquireJob(UInt32 & job_id)
 void DeflateQplJobHWPool::releaseJob(UInt32 job_id)
 {
     if (isJobPoolReady())
-        unLockJob(MAX_HW_JOB_NUMBER - job_id);
+        unLockJob(max_hw_jobs - job_id);
 }
 
 bool DeflateQplJobHWPool::tryLockJob(UInt32 index)
 {
     bool expected = false;
-    assert(index < MAX_HW_JOB_NUMBER);
+    assert(index < max_hw_jobs);
     return hw_job_ptr_locks[index].compare_exchange_strong(expected, true);
 }
 
 void DeflateQplJobHWPool::unLockJob(UInt32 index)
 {
-    assert(index < MAX_HW_JOB_NUMBER);
+    assert(index < max_hw_jobs);
     hw_job_ptr_locks[index].store(false);
 }
 
diff --git a/src/Compression/CompressionCodecDeflateQpl.h b/src/Compression/CompressionCodecDeflateQpl.h
index 3171a898311..7a1a764295d 100644
--- a/src/Compression/CompressionCodecDeflateQpl.h
+++ b/src/Compression/CompressionCodecDeflateQpl.h
@@ -24,22 +24,23 @@ public:
     static DeflateQplJobHWPool & instance();
 
     qpl_job * acquireJob(UInt32 & job_id);
-    static void releaseJob(UInt32 job_id);
-    static const bool & isJobPoolReady() { return job_pool_ready; }
+    void releaseJob(UInt32 job_id);
+    const bool & isJobPoolReady() { return job_pool_ready; }
 
 private:
-    static bool tryLockJob(UInt32 index);
-    static void unLockJob(UInt32 index);
+    bool tryLockJob(UInt32 index);
+    void unLockJob(UInt32 index);
 
+    /// size of each job objects
+    UInt32 per_job_size;
     /// Maximum jobs running in parallel supported by IAA hardware
-    static constexpr auto MAX_HW_JOB_NUMBER = 1024;
+    UInt32 max_hw_jobs;
     /// Entire buffer for storing all job objects
-    static std::unique_ptr<uint8_t[]> hw_jobs_buffer;
-    /// Job pool for storing all job object pointers
-    static std::array<qpl_job *, MAX_HW_JOB_NUMBER> hw_job_ptr_pool;
+    std::unique_ptr<uint8_t[]> hw_jobs_buffer;
     /// Locks for accessing each job object pointers
-    static std::array<std::atomic_bool, MAX_HW_JOB_NUMBER> hw_job_ptr_locks;
-    static bool job_pool_ready;
+    std::unique_ptr<std::atomic_bool[]> hw_job_ptr_locks;
+
+    bool job_pool_ready;
     std::mt19937 random_engine;
     std::uniform_int_distribution<int> distribution;
 };
diff --git a/src/Compression/CompressionCodecDelta.cpp b/src/Compression/CompressionCodecDelta.cpp
index 6d6078b9ee1..37f9230da14 100644
--- a/src/Compression/CompressionCodecDelta.cpp
+++ b/src/Compression/CompressionCodecDelta.cpp
@@ -193,7 +193,8 @@ void registerCodecDelta(CompressionCodecFactory & factory)
     UInt8 method_code = static_cast<UInt8>(CompressionMethodByte::Delta);
     auto codec_builder = [&](const ASTPtr & arguments, const IDataType * column_type) -> CompressionCodecPtr
     {
-        UInt8 delta_bytes_size = 0;
+        /// Default bytes size is 1.
+        UInt8 delta_bytes_size = 1;
 
         if (arguments && !arguments->children.empty())
         {
@@ -202,8 +203,8 @@ void registerCodecDelta(CompressionCodecFactory & factory)
 
             const auto children = arguments->children;
             const auto * literal = children[0]->as<ASTLiteral>();
-            if (!literal)
-                throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "Delta codec argument must be integer");
+            if (!literal || literal->value.getType() != Field::Types::Which::UInt64)
+                throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "Delta codec argument must be unsigned integer");
 
             size_t user_bytes_size = literal->value.safeGet<UInt64>();
             if (user_bytes_size != 1 && user_bytes_size != 2 && user_bytes_size != 4 && user_bytes_size != 8)
diff --git a/src/Compression/CompressionCodecDoubleDelta.cpp b/src/Compression/CompressionCodecDoubleDelta.cpp
index 782675dfd32..8e9a90cf416 100644
--- a/src/Compression/CompressionCodecDoubleDelta.cpp
+++ b/src/Compression/CompressionCodecDoubleDelta.cpp
@@ -1,13 +1,11 @@
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
 #include <base/unaligned.h>
 #include <Parsers/IAST_fwd.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
 
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/BitHelpers.h>
@@ -31,7 +29,7 @@ namespace DB
 /** DoubleDelta column codec implementation.
  *
  * Based on Gorilla paper: http://www.vldb.org/pvldb/vol8/p1816-teller.pdf, which was extended
- * to support 64bit types. The drawback is 1 extra bit for 32-byte wide deltas: 5-bit prefix
+ * to support 64bit types. The drawback is 1 extra bit for 32-bit wide deltas: 5-bit prefix
  * instead of 4-bit prefix.
  *
  * This codec is best used against monotonic integer sequences with constant (or almost constant)
@@ -145,6 +143,8 @@ namespace ErrorCodes
     extern const int CANNOT_COMPRESS;
     extern const int CANNOT_DECOMPRESS;
     extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
+    extern const int ILLEGAL_CODEC_PARAMETER;
 }
 
 namespace
@@ -293,7 +293,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
     const char * dest_start = dest;
 
     const UInt32 items_count = source_size / sizeof(ValueType);
-    unalignedStoreLE<UInt32>(dest, items_count);
+    unalignedStoreLittleEndian<UInt32>(dest, items_count);
     dest += sizeof(items_count);
 
     ValueType prev_value{};
@@ -301,8 +301,8 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
 
     if (source < source_end)
     {
-        prev_value = unalignedLoadLE<ValueType>(source);
-        unalignedStoreLE<ValueType>(dest, prev_value);
+        prev_value = unalignedLoadLittleEndian<ValueType>(source);
+        unalignedStoreLittleEndian<ValueType>(dest, prev_value);
 
         source += sizeof(prev_value);
         dest += sizeof(prev_value);
@@ -310,10 +310,10 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
 
     if (source < source_end)
     {
-        const ValueType curr_value = unalignedLoadLE<ValueType>(source);
+        const ValueType curr_value = unalignedLoadLittleEndian<ValueType>(source);
 
         prev_delta = curr_value - prev_value;
-        unalignedStoreLE<UnsignedDeltaType>(dest, prev_delta);
+        unalignedStoreLittleEndian<UnsignedDeltaType>(dest, prev_delta);
 
         source += sizeof(curr_value);
         dest += sizeof(prev_delta);
@@ -325,7 +325,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
     int item = 2;
     for (; source < source_end; source += sizeof(ValueType), ++item)
     {
-        const ValueType curr_value = unalignedLoadLE<ValueType>(source);
+        const ValueType curr_value = unalignedLoadLittleEndian<ValueType>(source);
 
         const UnsignedDeltaType delta = curr_value - prev_value;
         const UnsignedDeltaType double_delta = delta - prev_delta;
@@ -369,7 +369,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
     if (source + sizeof(UInt32) > source_end)
         return;
 
-    const UInt32 items_count = unalignedLoadLE<UInt32>(source);
+    const UInt32 items_count = unalignedLoadLittleEndian<UInt32>(source);
     source += sizeof(items_count);
 
     ValueType prev_value{};
@@ -379,10 +379,10 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
     if (source + sizeof(ValueType) > source_end || items_count < 1)
         return;
 
-    prev_value = unalignedLoadLE<ValueType>(source);
+    prev_value = unalignedLoadLittleEndian<ValueType>(source);
     if (dest + sizeof(prev_value) > output_end)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
-    unalignedStoreLE<ValueType>(dest, prev_value);
+    unalignedStoreLittleEndian<ValueType>(dest, prev_value);
 
     source += sizeof(prev_value);
     dest += sizeof(prev_value);
@@ -391,11 +391,11 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
     if (source + sizeof(UnsignedDeltaType) > source_end || items_count < 2)
         return;
 
-    prev_delta = unalignedLoadLE<UnsignedDeltaType>(source);
+    prev_delta = unalignedLoadLittleEndian<UnsignedDeltaType>(source);
     prev_value = prev_value + static_cast<ValueType>(prev_delta);
     if (dest + sizeof(prev_value) > output_end)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
-    unalignedStoreLE<ValueType>(dest, prev_value);
+    unalignedStoreLittleEndian<ValueType>(dest, prev_value);
 
     source += sizeof(prev_delta);
     dest += sizeof(prev_value);
@@ -428,7 +428,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
         const ValueType curr_value = prev_value + delta;
         if (dest + sizeof(curr_value) > output_end)
             throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
-        unalignedStoreLE<ValueType>(dest, curr_value);
+        unalignedStoreLittleEndian<ValueType>(dest, curr_value);
         dest += sizeof(curr_value);
 
         prev_delta = curr_value - prev_value;
@@ -549,10 +549,28 @@ void registerCodecDoubleDelta(CompressionCodecFactory & factory)
     factory.registerCompressionCodecWithType("DoubleDelta", method_code,
         [&](const ASTPtr & arguments, const IDataType * column_type) -> CompressionCodecPtr
     {
-        if (arguments)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Codec DoubleDelta does not accept any arguments");
+        /// Default bytes size is 1.
+        UInt8 data_bytes_size = 1;
+        if (arguments && !arguments->children.empty())
+        {
+            if (arguments->children.size() > 1)
+                throw Exception(ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE, "DoubleDelta codec must have 1 parameter, given {}", arguments->children.size());
+
+            const auto children = arguments->children;
+            const auto * literal = children[0]->as<ASTLiteral>();
+            if (!literal || literal->value.getType() != Field::Types::Which::UInt64)
+                throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "DoubleDelta codec argument must be unsigned integer");
+
+            size_t user_bytes_size = literal->value.safeGet<UInt64>();
+            if (user_bytes_size != 1 && user_bytes_size != 2 && user_bytes_size != 4 && user_bytes_size != 8)
+                throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "Argument value for DoubleDelta codec can be 1, 2, 4 or 8, given {}", user_bytes_size);
+            data_bytes_size = static_cast<UInt8>(user_bytes_size);
+        }
+        else if (column_type)
+        {
+            data_bytes_size = getDataBytesSize(column_type);
+        }
 
-        UInt8 data_bytes_size = column_type ? getDataBytesSize(column_type) : 0;
         return std::make_shared<CompressionCodecDoubleDelta>(data_bytes_size);
     });
 }
diff --git a/src/Compression/CompressionCodecFPC.cpp b/src/Compression/CompressionCodecFPC.cpp
index 31b12b762c8..8c3e518ed62 100644
--- a/src/Compression/CompressionCodecFPC.cpp
+++ b/src/Compression/CompressionCodecFPC.cpp
@@ -109,28 +109,42 @@ void registerCodecFPC(CompressionCodecFactory & factory)
     auto method_code = static_cast<UInt8>(CompressionMethodByte::FPC);
     auto codec_builder = [&](const ASTPtr & arguments, const IDataType * column_type) -> CompressionCodecPtr
     {
-        UInt8 float_width = 0;
+        /// Set default float width to 4.
+        UInt8 float_width = 4;
         if (column_type != nullptr)
             float_width = getFloatBytesSize(*column_type);
 
         UInt8 level = CompressionCodecFPC::DEFAULT_COMPRESSION_LEVEL;
         if (arguments && !arguments->children.empty())
         {
-            if (arguments->children.size() > 1)
+            if (arguments->children.size() > 2)
             {
                 throw Exception(ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE,
-                                "FPC codec must have 1 parameter, given {}", arguments->children.size());
+                                "FPC codec must have from 0 to 2 parameters, given {}", arguments->children.size());
             }
 
             const auto * literal = arguments->children.front()->as<ASTLiteral>();
-            if (!literal)
-                throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "FPC codec argument must be integer");
+            if (!literal || literal->value.getType() != Field::Types::Which::UInt64)
+                throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "FPC codec argument must be unsigned integer");
 
             level = literal->value.safeGet<UInt8>();
             if (level < 1 || level > CompressionCodecFPC::MAX_COMPRESSION_LEVEL)
                 throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "FPC codec level must be between {} and {}",
                                 1, static_cast<int>(CompressionCodecFPC::MAX_COMPRESSION_LEVEL));
+
+            if (arguments->children.size() == 2)
+            {
+                literal = arguments->children[1]->as<ASTLiteral>();
+                if (!literal || !isInt64OrUInt64FieldType(literal->value.getType()))
+                    throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "FPC codec argument must be unsigned integer");
+
+                size_t user_float_width = literal->value.safeGet<UInt64>();
+                if (user_float_width != 4 && user_float_width != 8)
+                    throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "Float size for FPC codec can be 4 or 8, given {}", user_float_width);
+                float_width = static_cast<UInt8>(user_float_width);
+            }
         }
+
         return std::make_shared<CompressionCodecFPC>(float_width, level);
     };
     factory.registerCompressionCodecWithType("FPC", method_code, codec_builder);
diff --git a/src/Compression/CompressionCodecGorilla.cpp b/src/Compression/CompressionCodecGorilla.cpp
index d68648bd83c..aca68fab9ac 100644
--- a/src/Compression/CompressionCodecGorilla.cpp
+++ b/src/Compression/CompressionCodecGorilla.cpp
@@ -1,12 +1,11 @@
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
 #include <base/unaligned.h>
 #include <Parsers/IAST_fwd.h>
+#include <Parsers/ASTLiteral.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/BitHelpers.h>
@@ -134,6 +133,8 @@ namespace ErrorCodes
     extern const int CANNOT_COMPRESS;
     extern const int CANNOT_DECOMPRESS;
     extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
+    extern const int ILLEGAL_CODEC_PARAMETER;
 }
 
 namespace
@@ -204,7 +205,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 
     const UInt32 items_count = source_size / sizeof(T);
 
-    unalignedStoreLE<UInt32>(dest, items_count);
+    unalignedStoreLittleEndian<UInt32>(dest, items_count);
     dest += sizeof(items_count);
 
     T prev_value = 0;
@@ -213,8 +214,8 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 
     if (source < source_end)
     {
-        prev_value = unalignedLoadLE<T>(source);
-        unalignedStoreLE<T>(dest, prev_value);
+        prev_value = unalignedLoadLittleEndian<T>(source);
+        unalignedStoreLittleEndian<T>(dest, prev_value);
 
         source += sizeof(prev_value);
         dest += sizeof(prev_value);
@@ -228,7 +229,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 
     while (source < source_end)
     {
-        const T curr_value = unalignedLoadLE<T>(source);
+        const T curr_value = unalignedLoadLittleEndian<T>(source);
         source += sizeof(curr_value);
 
         const auto xored_data = curr_value ^ prev_value;
@@ -270,7 +271,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
     if (source + sizeof(UInt32) > source_end)
         return;
 
-    const UInt32 items_count = unalignedLoadLE<UInt32>(source);
+    const UInt32 items_count = unalignedLoadLittleEndian<UInt32>(source);
     source += sizeof(items_count);
 
     T prev_value = 0;
@@ -279,8 +280,8 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
     if (source + sizeof(T) > source_end || items_count < 1)
         return;
 
-    prev_value = unalignedLoadLE<T>(source);
-    unalignedStoreLE<T>(dest, prev_value);
+    prev_value = unalignedLoadLittleEndian<T>(source);
+    unalignedStoreLittleEndian<T>(dest, prev_value);
 
     source += sizeof(prev_value);
     dest += sizeof(prev_value);
@@ -325,7 +326,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
         }
         // else: 0b0 prefix - use prev_value
 
-        unalignedStoreLE<T>(dest, curr_value);
+        unalignedStoreLittleEndian<T>(dest, curr_value);
         dest += sizeof(curr_value);
 
         prev_xored_info = curr_xored_info;
@@ -445,10 +446,28 @@ void registerCodecGorilla(CompressionCodecFactory & factory)
     UInt8 method_code = static_cast<UInt8>(CompressionMethodByte::Gorilla);
     auto codec_builder = [&](const ASTPtr & arguments, const IDataType * column_type) -> CompressionCodecPtr
     {
-        if (arguments)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Codec Gorilla does not accept any arguments");
+        /// Default bytes size is 1
+        UInt8 data_bytes_size = 1;
+        if (arguments && !arguments->children.empty())
+        {
+            if (arguments->children.size() > 1)
+                throw Exception(ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE, "Gorilla codec must have 1 parameter, given {}", arguments->children.size());
+
+            const auto children = arguments->children;
+            const auto * literal = children[0]->as<ASTLiteral>();
+            if (!literal || literal->value.getType() != Field::Types::Which::UInt64)
+                throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "Gorilla codec argument must be unsigned integer");
+
+            size_t user_bytes_size = literal->value.safeGet<UInt64>();
+            if (user_bytes_size != 1 && user_bytes_size != 2 && user_bytes_size != 4 && user_bytes_size != 8)
+                throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "Argument value for Gorilla codec can be 1, 2, 4 or 8, given {}", user_bytes_size);
+            data_bytes_size = static_cast<UInt8>(user_bytes_size);
+        }
+        else if (column_type)
+        {
+            data_bytes_size = getDataBytesSize(column_type);
+        }
 
-        UInt8 data_bytes_size = column_type ? getDataBytesSize(column_type) : 0;
         return std::make_shared<CompressionCodecGorilla>(data_bytes_size);
     };
     factory.registerCompressionCodecWithType("Gorilla", method_code, codec_builder);
diff --git a/src/Compression/CompressionCodecLZ4.cpp b/src/Compression/CompressionCodecLZ4.cpp
index 2066ec0d678..a39052f80b7 100644
--- a/src/Compression/CompressionCodecLZ4.cpp
+++ b/src/Compression/CompressionCodecLZ4.cpp
@@ -13,7 +13,7 @@
 #include <IO/WriteHelpers.h>
 #include <IO/BufferWithOwnMemory.h>
 
-#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wold-style-cast"
 
 
 namespace DB
diff --git a/src/Compression/CompressionCodecMultiple.cpp b/src/Compression/CompressionCodecMultiple.cpp
index 5203e349317..dba67749e4d 100644
--- a/src/Compression/CompressionCodecMultiple.cpp
+++ b/src/Compression/CompressionCodecMultiple.cpp
@@ -8,7 +8,7 @@
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 
 namespace DB
diff --git a/src/Compression/CompressionCodecT64.cpp b/src/Compression/CompressionCodecT64.cpp
index e7f1615128a..3506c087b54 100644
--- a/src/Compression/CompressionCodecT64.cpp
+++ b/src/Compression/CompressionCodecT64.cpp
@@ -33,7 +33,8 @@ public:
         Bit
     };
 
-    CompressionCodecT64(TypeIndex type_idx_, Variant variant_);
+    // type_idx_ is required for compression, but not for decompression.
+    CompressionCodecT64(std::optional<TypeIndex> type_idx_, Variant variant_);
 
     uint8_t getMethodByte() const override;
 
@@ -53,7 +54,7 @@ protected:
     bool isGenericCompression() const override { return false; }
 
 private:
-    TypeIndex type_idx;
+    std::optional<TypeIndex> type_idx;
     Variant variant;
 };
 
@@ -91,9 +92,12 @@ enum class MagicNumber : uint8_t
     IPv4        = 21,
 };
 
-MagicNumber serializeTypeId(TypeIndex type_id)
+MagicNumber serializeTypeId(std::optional<TypeIndex> type_id)
 {
-    switch (type_id)
+    if (!type_id)
+        throw Exception(ErrorCodes::CANNOT_COMPRESS, "T64 codec doesn't support compression without information about column type");
+
+    switch (*type_id)
     {
         case TypeIndex::UInt8:      return MagicNumber::UInt8;
         case TypeIndex::UInt16:     return MagicNumber::UInt16;
@@ -115,7 +119,7 @@ MagicNumber serializeTypeId(TypeIndex type_id)
             break;
     }
 
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Type is not supported by T64 codec: {}", static_cast<UInt32>(type_id));
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Type is not supported by T64 codec: {}", static_cast<UInt32>(*type_id));
 }
 
 TypeIndex deserializeTypeId(uint8_t serialized_type_id)
@@ -322,7 +326,7 @@ void load(const char * src, T * buf, UInt32 tail = 64)
         /// as little-endian types on big-endian machine (s390x, etc).
         for (UInt32 i = 0; i < tail; ++i)
         {
-            buf[i] = unalignedLoadLE<T>(src + i * sizeof(T));
+            buf[i] = unalignedLoadLittleEndian<T>(src + i * sizeof(T));
         }
     }
 }
@@ -374,6 +378,13 @@ void transpose(const T * src, char * dst, UInt32 num_bits, UInt32 tail = 64)
 
 /// UInt64[N] transposed matrix -> UIntX[64]
 template <typename T, bool full = false>
+#if defined(__s390x__)
+
+/* Compiler Bug for S390x :- https://github.com/llvm/llvm-project/issues/62572
+ * Please remove this after the fix is backported
+ */
+        __attribute__((noinline))
+#endif
 void reverseTranspose(const char * src, T * buf, UInt32 num_bits, UInt32 tail = 64)
 {
     UInt64 matrix[64] = {};
@@ -632,7 +643,7 @@ UInt32 CompressionCodecT64::doCompressData(const char * src, UInt32 src_size, ch
     memcpy(dst, &cookie, 1);
     dst += 1;
 
-    switch (baseType(type_idx))
+    switch (baseType(*type_idx))
     {
         case TypeIndex::Int8:
             return 1 + compressData<Int8>(src, src_size, dst, variant);
@@ -699,7 +710,7 @@ uint8_t CompressionCodecT64::getMethodByte() const
     return codecId();
 }
 
-CompressionCodecT64::CompressionCodecT64(TypeIndex type_idx_, Variant variant_)
+CompressionCodecT64::CompressionCodecT64(std::optional<TypeIndex> type_idx_, Variant variant_)
     : type_idx(type_idx_)
     , variant(variant_)
 {
@@ -712,7 +723,7 @@ CompressionCodecT64::CompressionCodecT64(TypeIndex type_idx_, Variant variant_)
 void CompressionCodecT64::updateHash(SipHash & hash) const
 {
     getCodecDesc()->updateTreeHash(hash);
-    hash.update(type_idx);
+    hash.update(type_idx.value_or(TypeIndex::Nothing));
     hash.update(variant);
 }
 
@@ -742,9 +753,14 @@ void registerCodecT64(CompressionCodecFactory & factory)
                 throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER, "Wrong modification for T64: {}", name);
         }
 
-        auto type_idx = typeIdx(type);
-        if (type && type_idx == TypeIndex::Nothing)
-            throw Exception(ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE, "T64 codec is not supported for specified type {}", type->getName());
+        std::optional<TypeIndex> type_idx;
+        if (type)
+        {
+            type_idx = typeIdx(type);
+            if (type_idx == TypeIndex::Nothing)
+                throw Exception(
+                    ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE, "T64 codec is not supported for specified type {}", type->getName());
+        }
         return std::make_shared<CompressionCodecT64>(type_idx, variant);
     };
 
diff --git a/src/Compression/CompressionFactory.cpp b/src/Compression/CompressionFactory.cpp
index 514ae4eee3c..61f4e3a988c 100644
--- a/src/Compression/CompressionFactory.cpp
+++ b/src/Compression/CompressionFactory.cpp
@@ -172,7 +172,7 @@ void registerCodecDeflateQpl(CompressionCodecFactory & factory);
 
 /// Keeper use only general-purpose codecs, so we don't need these special codecs
 /// in standalone build
-#ifndef KEEPER_STANDALONE_BUILD
+#ifndef CLICKHOUSE_PROGRAM_STANDALONE_BUILD
 void registerCodecDelta(CompressionCodecFactory & factory);
 void registerCodecT64(CompressionCodecFactory & factory);
 void registerCodecDoubleDelta(CompressionCodecFactory & factory);
@@ -188,7 +188,7 @@ CompressionCodecFactory::CompressionCodecFactory()
     registerCodecZSTD(*this);
     registerCodecLZ4HC(*this);
     registerCodecMultiple(*this);
-#ifndef KEEPER_STANDALONE_BUILD
+#ifndef CLICKHOUSE_PROGRAM_STANDALONE_BUILD
     registerCodecDelta(*this);
     registerCodecT64(*this);
     registerCodecDoubleDelta(*this);
diff --git a/src/Compression/ICompressionCodec.cpp b/src/Compression/ICompressionCodec.cpp
index d6beaba7e0a..a8257c4331f 100644
--- a/src/Compression/ICompressionCodec.cpp
+++ b/src/Compression/ICompressionCodec.cpp
@@ -86,8 +86,8 @@ UInt32 ICompressionCodec::compress(const char * source, UInt32 source_size, char
     UInt8 header_size = getHeaderSize();
     /// Write data from header_size
     UInt32 compressed_bytes_written = doCompressData(source, source_size, &dest[header_size]);
-    unalignedStoreLE<UInt32>(&dest[1], compressed_bytes_written + header_size);
-    unalignedStoreLE<UInt32>(&dest[5], source_size);
+    unalignedStoreLittleEndian<UInt32>(&dest[1], compressed_bytes_written + header_size);
+    unalignedStoreLittleEndian<UInt32>(&dest[5], source_size);
     return header_size + compressed_bytes_written;
 }
 
@@ -114,7 +114,7 @@ UInt32 ICompressionCodec::decompress(const char * source, UInt32 source_size, ch
 
 UInt32 ICompressionCodec::readCompressedBlockSize(const char * source)
 {
-    UInt32 compressed_block_size = unalignedLoadLE<UInt32>(&source[1]);
+    UInt32 compressed_block_size = unalignedLoadLittleEndian<UInt32>(&source[1]);
     if (compressed_block_size == 0)
         throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: header is corrupt with compressed block size 0");
     return compressed_block_size;
@@ -123,7 +123,7 @@ UInt32 ICompressionCodec::readCompressedBlockSize(const char * source)
 
 UInt32 ICompressionCodec::readDecompressedBlockSize(const char * source)
 {
-    UInt32 decompressed_block_size = unalignedLoadLE<UInt32>(&source[5]);
+    UInt32 decompressed_block_size = unalignedLoadLittleEndian<UInt32>(&source[5]);
     if (decompressed_block_size == 0)
         throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: header is corrupt with decompressed block size 0");
     return decompressed_block_size;
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index 340b3b6b8f8..fa89e2da645 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -28,12 +28,6 @@
 #include <cstring>
 
 /// For the expansion of gtest macros.
-#if defined(__clang__)
-    #pragma clang diagnostic ignored "-Wdeprecated"
-#elif defined (__GNUC__) && __GNUC__ >= 9
-    #pragma GCC diagnostic ignored "-Wdeprecated-copy"
-#endif
-
 #include <gtest/gtest.h>
 
 using namespace DB;
@@ -178,7 +172,7 @@ private:
             throw std::runtime_error("No more data to read");
         }
 
-        current_value = unalignedLoadLE<T>(data);
+        current_value = unalignedLoadLittleEndian<T>(data);
         data = reinterpret_cast<const char *>(data) + sizeof(T);
     }
 };
@@ -374,7 +368,7 @@ CodecTestSequence makeSeq(Args && ... args)
     char * write_pos = data.data();
     for (const auto & v : vals)
     {
-        unalignedStoreLE<T>(write_pos, v);
+        unalignedStoreLittleEndian<T>(write_pos, v);
         write_pos += sizeof(v);
     }
 
@@ -396,7 +390,7 @@ CodecTestSequence generateSeq(Generator gen, const char* gen_name, B Begin = 0,
     {
         const T v = static_cast<T>(gen(i));
 
-        unalignedStoreLE<T>(write_pos, v);
+        unalignedStoreLittleEndian<T>(write_pos, v);
         write_pos += sizeof(v);
     }
 
@@ -1303,9 +1297,9 @@ TEST(LZ4Test, DecompressMalformedInput)
 
     DB::Memory<> memory;
     memory.resize(ICompressionCodec::getHeaderSize() + uncompressed_size + LZ4::ADDITIONAL_BYTES_AT_END_OF_BUFFER);
-    unalignedStoreLE<uint8_t>(memory.data(), static_cast<uint8_t>(CompressionMethodByte::LZ4));
-    unalignedStoreLE<uint32_t>(&memory[1], source_size);
-    unalignedStoreLE<uint32_t>(&memory[5], uncompressed_size);
+    unalignedStoreLittleEndian<uint8_t>(memory.data(), static_cast<uint8_t>(CompressionMethodByte::LZ4));
+    unalignedStoreLittleEndian<uint32_t>(&memory[1], source_size);
+    unalignedStoreLittleEndian<uint32_t>(&memory[5], uncompressed_size);
 
     auto codec = CompressionCodecFactory::instance().get("LZ4", {});
     ASSERT_THROW(codec->decompress(source, source_size, memory.data()), Exception);
diff --git a/src/Coordination/Changelog.cpp b/src/Coordination/Changelog.cpp
index 899310dc591..894fd93cfa7 100644
--- a/src/Coordination/Changelog.cpp
+++ b/src/Coordination/Changelog.cpp
@@ -211,9 +211,14 @@ public:
     void flush()
     {
         auto * file_buffer = tryGetFileBuffer();
-        /// Fsync file system if needed
-        if (file_buffer && log_file_settings.force_sync)
-            file_buffer->sync();
+        if (file_buffer)
+        {
+            /// Fsync file system if needed
+            if (log_file_settings.force_sync)
+                file_buffer->sync();
+            else
+                file_buffer->next();
+        }
     }
 
     uint64_t getStartIndex() const
@@ -274,7 +279,17 @@ private:
         flush();
 
         if (log_file_settings.max_size != 0)
-            ftruncate(file_buffer->getFD(), initial_file_size + file_buffer->count());
+        {
+            int res = -1;
+            do
+            {
+                res = ftruncate(file_buffer->getFD(), initial_file_size + file_buffer->count());
+            }
+            while (res < 0 && errno == EINTR);
+
+            if (res != 0)
+                LOG_WARNING(log, "Could not ftruncate file. Error: {}, errno: {}", errnoToString(), errno);
+        }
 
         if (log_file_settings.compress_logs)
             compressed_buffer.reset();
diff --git a/src/Coordination/Changelog.h b/src/Coordination/Changelog.h
index 288f71bb915..56b0475ba8b 100644
--- a/src/Coordination/Changelog.h
+++ b/src/Coordination/Changelog.h
@@ -10,6 +10,7 @@
 #include <libnuraft/nuraft.hxx>
 #include <libnuraft/raft_server.hxx>
 #include <Common/ConcurrentBoundedQueue.h>
+#include <Common/ThreadPool.h>
 
 namespace DB
 {
diff --git a/src/Coordination/CoordinationSettings.cpp b/src/Coordination/CoordinationSettings.cpp
index e665ccb89c7..7a66134f43f 100644
--- a/src/Coordination/CoordinationSettings.cpp
+++ b/src/Coordination/CoordinationSettings.cpp
@@ -36,7 +36,7 @@ void CoordinationSettings::loadFromConfig(const String & config_elem, const Poco
 }
 
 
-const String KeeperConfigurationAndSettings::DEFAULT_FOUR_LETTER_WORD_CMD = "conf,cons,crst,envi,ruok,srst,srvr,stat,wchs,dirs,mntr,isro,rcvr,apiv,csnp,lgif,rqld";
+const String KeeperConfigurationAndSettings::DEFAULT_FOUR_LETTER_WORD_CMD = "conf,cons,crst,envi,ruok,srst,srvr,stat,wchs,dirs,mntr,isro,rcvr,apiv,csnp,lgif,rqld,rclc,clrs";
 
 KeeperConfigurationAndSettings::KeeperConfigurationAndSettings()
     : server_id(NOT_EXIST)
@@ -140,6 +140,8 @@ void KeeperConfigurationAndSettings::dump(WriteBufferFromOwnString & buf) const
 
     writeText("max_requests_batch_size=", buf);
     write_int(coordination_settings->max_requests_batch_size);
+    writeText("max_requests_batch_bytes_size=", buf);
+    write_int(coordination_settings->max_requests_batch_bytes_size);
     writeText("max_request_queue_size=", buf);
     write_int(coordination_settings->max_request_queue_size);
     writeText("max_requests_quick_batch_size=", buf);
diff --git a/src/Coordination/CoordinationSettings.h b/src/Coordination/CoordinationSettings.h
index a16f5be1b01..81be3c3eaa4 100644
--- a/src/Coordination/CoordinationSettings.h
+++ b/src/Coordination/CoordinationSettings.h
@@ -39,14 +39,16 @@ struct Settings;
     M(UInt64, fresh_log_gap, 200, "When node became fresh", 0) \
     M(UInt64, max_request_queue_size, 100000, "Maximum number of request that can be in queue for processing", 0) \
     M(UInt64, max_requests_batch_size, 100, "Max size of batch of requests that can be sent to RAFT", 0) \
-    M(UInt64, max_requests_quick_batch_size, 10, "Max size of batch of requests to try to get before proceeding with RAFT. Keeper will not wait for requests but take only requests that are already in queue" , 0) \
+    M(UInt64, max_requests_batch_bytes_size, 100*1024, "Max size in bytes of batch of requests that can be sent to RAFT", 0) \
+    M(UInt64, max_requests_quick_batch_size, 100, "Max size of batch of requests to try to get before proceeding with RAFT. Keeper will not wait for requests but take only requests that are already in queue" , 0) \
     M(Bool, quorum_reads, false, "Execute read requests as writes through whole RAFT consesus with similar speed", 0) \
     M(Bool, force_sync, true, "Call fsync on each change in RAFT changelog", 0) \
     M(Bool, compress_logs, true, "Write compressed coordination logs in ZSTD format", 0) \
     M(Bool, compress_snapshots_with_zstd_format, true, "Write compressed snapshots in ZSTD format (instead of custom LZ4)", 0) \
     M(UInt64, configuration_change_tries_count, 20, "How many times we will try to apply configuration change (add/remove server) to the cluster", 0) \
     M(UInt64, max_log_file_size, 50 * 1024 * 1024, "Max size of the Raft log file. If possible, each created log file will preallocate this amount of bytes on disk. Set to 0 to disable the limit", 0) \
-    M(UInt64, log_file_overallocate_size, 50 * 1024 * 1024, "If max_log_file_size is not set to 0, this value will be added to it for preallocating bytes on disk. If a log record is larger than this value, it could lead to uncaught out-of-space issues so a larger value is preferred", 0)
+    M(UInt64, log_file_overallocate_size, 50 * 1024 * 1024, "If max_log_file_size is not set to 0, this value will be added to it for preallocating bytes on disk. If a log record is larger than this value, it could lead to uncaught out-of-space issues so a larger value is preferred", 0) \
+    M(UInt64, min_request_size_for_cache, 50 * 1024, "Minimal size of the request to cache the deserialization result. Caching can have negative effect on latency for smaller requests, set to 0 to disable", 0)
 
 DECLARE_SETTINGS_TRAITS(CoordinationSettingsTraits, LIST_OF_COORDINATION_SETTINGS)
 
diff --git a/src/Coordination/FourLetterCommand.cpp b/src/Coordination/FourLetterCommand.cpp
index 3e0e5acee0c..7077e792fd8 100644
--- a/src/Coordination/FourLetterCommand.cpp
+++ b/src/Coordination/FourLetterCommand.cpp
@@ -14,6 +14,8 @@
 #include <IO/Operators.h>
 
 #include <unistd.h>
+#include <bit>
+
 
 namespace DB
 {
@@ -34,7 +36,7 @@ int32_t IFourLetterCommand::code()
 
 String IFourLetterCommand::toName(int32_t code)
 {
-    int reverted_code = __builtin_bswap32(code);
+    int reverted_code = std::byteswap(code);
     return String(reinterpret_cast<char *>(&reverted_code), 4);
 }
 
@@ -42,7 +44,7 @@ int32_t IFourLetterCommand::toCode(const String & name)
 {
     int32_t res = *reinterpret_cast<const int32_t *>(name.data());
     /// keep consistent with Coordination::read method by changing big endian to little endian.
-    return __builtin_bswap32(res);
+    return std::byteswap(res);
 }
 
 IFourLetterCommand::~IFourLetterCommand() = default;
@@ -145,6 +147,12 @@ void FourLetterCommandFactory::registerCommands(KeeperDispatcher & keeper_dispat
         FourLetterCommandPtr request_leader_command = std::make_shared<RequestLeaderCommand>(keeper_dispatcher);
         factory.registerCommand(request_leader_command);
 
+        FourLetterCommandPtr recalculate_command = std::make_shared<RecalculateCommand>(keeper_dispatcher);
+        factory.registerCommand(recalculate_command);
+
+        FourLetterCommandPtr clean_resources_command = std::make_shared<CleanResourcesCommand>(keeper_dispatcher);
+        factory.registerCommand(clean_resources_command);
+
         factory.initializeAllowList(keeper_dispatcher);
         factory.setInitialize(true);
     }
@@ -515,4 +523,16 @@ String RequestLeaderCommand::run()
     return keeper_dispatcher.requestLeader() ? "Sent leadership request to leader." : "Failed to send leadership request to leader.";
 }
 
+String RecalculateCommand::run()
+{
+    keeper_dispatcher.recalculateStorageStats();
+    return "ok";
+}
+
+String CleanResourcesCommand::run()
+{
+    keeper_dispatcher.cleanResources();
+    return "ok";
+}
+
 }
diff --git a/src/Coordination/FourLetterCommand.h b/src/Coordination/FourLetterCommand.h
index 8a8aacf7a3a..c1a91303c05 100644
--- a/src/Coordination/FourLetterCommand.h
+++ b/src/Coordination/FourLetterCommand.h
@@ -377,4 +377,28 @@ struct RequestLeaderCommand : public IFourLetterCommand
     ~RequestLeaderCommand() override = default;
 };
 
+struct RecalculateCommand : public IFourLetterCommand
+{
+    explicit RecalculateCommand(KeeperDispatcher & keeper_dispatcher_)
+        : IFourLetterCommand(keeper_dispatcher_)
+    {
+    }
+
+    String name() override { return "rclc"; }
+    String run() override;
+    ~RecalculateCommand() override = default;
+};
+
+struct CleanResourcesCommand : public IFourLetterCommand
+{
+    explicit CleanResourcesCommand(KeeperDispatcher & keeper_dispatcher_)
+        : IFourLetterCommand(keeper_dispatcher_)
+    {
+    }
+
+    String name() override { return "clrs"; }
+    String run() override;
+    ~CleanResourcesCommand() override = default;
+};
+
 }
diff --git a/src/Coordination/KeeperConstants.h b/src/Coordination/KeeperConstants.h
index 952689af01f..4b5a5b54be0 100644
--- a/src/Coordination/KeeperConstants.h
+++ b/src/Coordination/KeeperConstants.h
@@ -9,10 +9,11 @@ enum class KeeperApiVersion : uint8_t
 {
     ZOOKEEPER_COMPATIBLE = 0,
     WITH_FILTERED_LIST,
-    WITH_MULTI_READ
+    WITH_MULTI_READ,
+    WITH_CHECK_NOT_EXISTS,
 };
 
-inline constexpr auto current_keeper_api_version = KeeperApiVersion::WITH_MULTI_READ;
+inline constexpr auto current_keeper_api_version = KeeperApiVersion::WITH_CHECK_NOT_EXISTS;
 
 const std::string keeper_system_path = "/keeper";
 const std::string keeper_api_version_path = keeper_system_path + "/api_version";
diff --git a/src/Coordination/KeeperDispatcher.cpp b/src/Coordination/KeeperDispatcher.cpp
index 06c693e45be..d64134f3024 100644
--- a/src/Coordination/KeeperDispatcher.cpp
+++ b/src/Coordination/KeeperDispatcher.cpp
@@ -4,12 +4,13 @@
 #include <Poco/Path.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Common/setThreadName.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/checkStackSize.h>
 #include <Common/CurrentMetrics.h>
-
+#include <Common/ProfileEvents.h>
+#include <Common/logger_useful.h>
 
 #include <future>
 #include <chrono>
@@ -17,12 +18,26 @@
 #include <iterator>
 #include <limits>
 
+#if USE_JEMALLOC
+#    include <jemalloc/jemalloc.h>
+
+#define STRINGIFY_HELPER(x) #x
+#define STRINGIFY(x) STRINGIFY_HELPER(x)
+
+#endif
+
 namespace CurrentMetrics
 {
     extern const Metric KeeperAliveConnections;
     extern const Metric KeeperOutstandingRequets;
 }
 
+namespace ProfileEvents
+{
+    extern const Event MemoryAllocatorPurge;
+    extern const Event MemoryAllocatorPurgeTimeMicroseconds;
+}
+
 namespace fs = std::filesystem;
 
 namespace DB
@@ -59,6 +74,7 @@ void KeeperDispatcher::requestThread()
         auto coordination_settings = configuration_and_settings->coordination_settings;
         uint64_t max_wait = coordination_settings->operation_timeout_ms.totalMilliseconds();
         uint64_t max_batch_size = coordination_settings->max_requests_batch_size;
+        uint64_t max_batch_bytes_size = coordination_settings->max_requests_batch_bytes_size;
 
         /// The code below do a very simple thing: batch all write (quorum) requests into vector until
         /// previous write batch is not finished or max_batch size achieved. The main complexity goes from
@@ -75,6 +91,7 @@ void KeeperDispatcher::requestThread()
                     break;
 
                 KeeperStorage::RequestsForSessions current_batch;
+                size_t current_batch_bytes_size = 0;
 
                 bool has_read_request = false;
 
@@ -82,6 +99,7 @@ void KeeperDispatcher::requestThread()
                 /// Otherwise we will process it locally.
                 if (coordination_settings->quorum_reads || !request.request->isReadRequest())
                 {
+                    current_batch_bytes_size += request.request->bytesSize();
                     current_batch.emplace_back(request);
 
                     const auto try_get_request = [&]
@@ -92,9 +110,16 @@ void KeeperDispatcher::requestThread()
                             CurrentMetrics::sub(CurrentMetrics::KeeperOutstandingRequets);
                             /// Don't append read request into batch, we have to process them separately
                             if (!coordination_settings->quorum_reads && request.request->isReadRequest())
-                                has_read_request = true;
+                            {
+                                const auto & last_request = current_batch.back();
+                                std::lock_guard lock(read_request_queue_mutex);
+                                read_request_queue[last_request.session_id][last_request.request->xid].push_back(request);
+                            }
                             else
+                            {
+                                current_batch_bytes_size += request.request->bytesSize();
                                 current_batch.emplace_back(request);
+                            }
 
                             return true;
                         }
@@ -102,9 +127,11 @@ void KeeperDispatcher::requestThread()
                         return false;
                     };
 
-                    /// If we have enough requests in queue, we will try to batch at least max_quick_batch_size of them.
+                    /// TODO: Deprecate max_requests_quick_batch_size and use only max_requests_batch_size and max_requests_batch_bytes_size
                     size_t max_quick_batch_size = coordination_settings->max_requests_quick_batch_size;
-                    while (!shutdown_called && !has_read_request && current_batch.size() < max_quick_batch_size && try_get_request())
+                    while (!shutdown_called && !has_read_request &&
+                        current_batch.size() < max_quick_batch_size && current_batch_bytes_size < max_batch_bytes_size &&
+                        try_get_request())
                         ;
 
                     const auto prev_result_done = [&]
@@ -115,7 +142,8 @@ void KeeperDispatcher::requestThread()
                     };
 
                     /// Waiting until previous append will be successful, or batch is big enough
-                    while (!shutdown_called && !has_read_request && !prev_result_done() && current_batch.size() <= max_batch_size)
+                    while (!shutdown_called && !has_read_request && !prev_result_done() &&
+                        current_batch.size() <= max_batch_size && current_batch_bytes_size < max_batch_bytes_size)
                     {
                         try_get_request();
                     }
@@ -133,6 +161,8 @@ void KeeperDispatcher::requestThread()
                 /// Process collected write requests batch
                 if (!current_batch.empty())
                 {
+                    LOG_TRACE(log, "Processing requests batch, size: {}, bytes: {}", current_batch.size(), current_batch_bytes_size);
+
                     auto result = server->putRequestBatch(current_batch);
 
                     if (result)
@@ -144,6 +174,7 @@ void KeeperDispatcher::requestThread()
                     {
                         addErrorResponses(current_batch, Coordination::Error::ZCONNECTIONLOSS);
                         current_batch.clear();
+                        current_batch_bytes_size = 0;
                     }
 
                     prev_batch = std::move(current_batch);
@@ -305,7 +336,28 @@ void KeeperDispatcher::initialize(const Poco::Util::AbstractConfiguration & conf
 
     snapshot_s3.startup(config, macros);
 
-    server = std::make_unique<KeeperServer>(configuration_and_settings, config, responses_queue, snapshots_queue, snapshot_s3);
+    server = std::make_unique<KeeperServer>(configuration_and_settings, config, responses_queue, snapshots_queue, snapshot_s3, [this](const KeeperStorage::RequestForSession & request_for_session)
+    {
+        /// check if we have queue of read requests depending on this request to be committed
+        std::lock_guard lock(read_request_queue_mutex);
+        if (auto it = read_request_queue.find(request_for_session.session_id); it != read_request_queue.end())
+        {
+            auto & xid_to_request_queue = it->second;
+
+            if (auto request_queue_it = xid_to_request_queue.find(request_for_session.request->xid); request_queue_it != xid_to_request_queue.end())
+            {
+                for (const auto & read_request : request_queue_it->second)
+                {
+                    if (server->isLeaderAlive())
+                        server->putLocalReadRequest(read_request);
+                    else
+                        addErrorResponses({read_request}, Coordination::Error::ZCONNECTIONLOSS);
+                }
+
+                xid_to_request_queue.erase(request_queue_it);
+            }
+        }
+    });
 
     try
     {
@@ -419,9 +471,9 @@ void KeeperDispatcher::shutdown()
             const auto raft_result = server->putRequestBatch(close_requests);
             auto sessions_closing_done_promise = std::make_shared<std::promise<void>>();
             auto sessions_closing_done = sessions_closing_done_promise->get_future();
-            raft_result->when_ready([sessions_closing_done_promise = std::move(sessions_closing_done_promise)](
+            raft_result->when_ready([my_sessions_closing_done_promise = std::move(sessions_closing_done_promise)](
                                         nuraft::cmd_result<nuraft::ptr<nuraft::buffer>> & /*result*/,
-                                        nuraft::ptr<std::exception> & /*exception*/) { sessions_closing_done_promise->set_value(); });
+                                        nuraft::ptr<std::exception> & /*exception*/) { my_sessions_closing_done_promise->set_value(); });
 
             auto session_shutdown_timeout = configuration_and_settings->coordination_settings->session_shutdown_timeout.totalMilliseconds();
             if (sessions_closing_done.wait_for(std::chrono::milliseconds(session_shutdown_timeout)) != std::future_status::ready)
@@ -518,12 +570,18 @@ void KeeperDispatcher::sessionCleanerTask()
 
 void KeeperDispatcher::finishSession(int64_t session_id)
 {
-    std::lock_guard lock(session_to_response_callback_mutex);
-    auto session_it = session_to_response_callback.find(session_id);
-    if (session_it != session_to_response_callback.end())
     {
-        session_to_response_callback.erase(session_it);
-        CurrentMetrics::sub(CurrentMetrics::KeeperAliveConnections);
+        std::lock_guard lock(session_to_response_callback_mutex);
+        auto session_it = session_to_response_callback.find(session_id);
+        if (session_it != session_to_response_callback.end())
+        {
+            session_to_response_callback.erase(session_it);
+            CurrentMetrics::sub(CurrentMetrics::KeeperAliveConnections);
+        }
+    }
+    {
+        std::lock_guard lock(read_request_queue_mutex);
+        read_request_queue.erase(session_id);
     }
 }
 
@@ -753,4 +811,15 @@ Keeper4LWInfo KeeperDispatcher::getKeeper4LWInfo() const
     return result;
 }
 
+void KeeperDispatcher::cleanResources()
+{
+#if USE_JEMALLOC
+    LOG_TRACE(&Poco::Logger::get("KeeperDispatcher"), "Purging unused memory");
+    Stopwatch watch;
+    mallctl("arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".purge", nullptr, nullptr, nullptr, 0);
+    ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurge);
+    ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurgeTimeMicroseconds, watch.elapsedMicroseconds());
+#endif
+}
+
 }
diff --git a/src/Coordination/KeeperDispatcher.h b/src/Coordination/KeeperDispatcher.h
index ff902d8e036..4b8b134cf8f 100644
--- a/src/Coordination/KeeperDispatcher.h
+++ b/src/Coordination/KeeperDispatcher.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Common/ZooKeeper/ZooKeeperCommon.h"
 #include "config.h"
 
 #if USE_NURAFT
@@ -8,7 +9,6 @@
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
-#include <Common/logger_useful.h>
 #include <functional>
 #include <Coordination/KeeperServer.h>
 #include <Coordination/CoordinationSettings.h>
@@ -103,6 +103,11 @@ private:
     void forceWaitAndProcessResult(RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions);
 
 public:
+    std::mutex read_request_queue_mutex;
+
+    /// queue of read requests that can be processed after a request with specific session ID and XID is committed
+    std::unordered_map<int64_t, std::unordered_map<Coordination::XID, KeeperStorage::RequestsForSessions>> read_request_queue;
+
     /// Just allocate some objects, real initialization is done by `intialize method`
     KeeperDispatcher();
 
@@ -225,6 +230,13 @@ public:
     {
         return server->requestLeader();
     }
+
+    void recalculateStorageStats()
+    {
+        return server->recalculateStorageStats();
+    }
+
+    static void cleanResources();
 };
 
 }
diff --git a/src/Coordination/KeeperLogStore.cpp b/src/Coordination/KeeperLogStore.cpp
index d1bd2f9db18..10619a44517 100644
--- a/src/Coordination/KeeperLogStore.cpp
+++ b/src/Coordination/KeeperLogStore.cpp
@@ -1,5 +1,6 @@
 #include <Coordination/KeeperLogStore.h>
 #include <IO/CompressionMethod.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/KeeperLogStore.h b/src/Coordination/KeeperLogStore.h
index 108241e024e..e48e3a32463 100644
--- a/src/Coordination/KeeperLogStore.h
+++ b/src/Coordination/KeeperLogStore.h
@@ -4,7 +4,6 @@
 #include <mutex>
 #include <Core/Types.h>
 #include <Coordination/Changelog.h>
-#include <Common/logger_useful.h>
 #include <base/defines.h>
 
 namespace DB
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
index 0f131750109..45db9e85fa5 100644
--- a/src/Coordination/KeeperServer.cpp
+++ b/src/Coordination/KeeperServer.cpp
@@ -107,7 +107,8 @@ KeeperServer::KeeperServer(
     const Poco::Util::AbstractConfiguration & config,
     ResponsesQueue & responses_queue_,
     SnapshotsQueue & snapshots_queue_,
-    KeeperSnapshotManagerS3 & snapshot_manager_s3)
+    KeeperSnapshotManagerS3 & snapshot_manager_s3,
+    KeeperStateMachine::CommitCallback commit_callback)
     : server_id(configuration_and_settings_->server_id)
     , coordination_settings(configuration_and_settings_->coordination_settings)
     , log(&Poco::Logger::get("KeeperServer"))
@@ -128,6 +129,7 @@ KeeperServer::KeeperServer(
         coordination_settings,
         keeper_context,
         config.getBool("keeper_server.upload_snapshot_on_exit", true) ? &snapshot_manager_s3 : nullptr,
+        commit_callback,
         checkAndGetSuperdigest(configuration_and_settings_->super_digest));
 
     state_manager = nuraft::cs_new<KeeperStateManager>(
@@ -469,17 +471,6 @@ void KeeperServer::shutdown()
 namespace
 {
 
-// Serialize the request with all the necessary information for the leader
-// we don't know ZXID and digest yet so we don't serialize it
-nuraft::ptr<nuraft::buffer> getZooKeeperRequestMessage(const KeeperStorage::RequestForSession & request_for_session)
-{
-    DB::WriteBufferFromNuraftBuffer write_buf;
-    DB::writeIntBinary(request_for_session.session_id, write_buf);
-    request_for_session.request->write(write_buf);
-    DB::writeIntBinary(request_for_session.time, write_buf);
-    return write_buf.getBuffer();
-}
-
 // Serialize the request for the log entry
 nuraft::ptr<nuraft::buffer> getZooKeeperLogEntry(const KeeperStorage::RequestForSession & request_for_session)
 {
@@ -487,12 +478,11 @@ nuraft::ptr<nuraft::buffer> getZooKeeperLogEntry(const KeeperStorage::RequestFor
     DB::writeIntBinary(request_for_session.session_id, write_buf);
     request_for_session.request->write(write_buf);
     DB::writeIntBinary(request_for_session.time, write_buf);
-    DB::writeIntBinary(request_for_session.zxid, write_buf);
-    assert(request_for_session.digest);
-    DB::writeIntBinary(request_for_session.digest->version, write_buf);
-    if (request_for_session.digest->version != KeeperStorage::DigestVersion::NO_DIGEST)
-        DB::writeIntBinary(request_for_session.digest->value, write_buf);
-
+    /// we fill with dummy values to eliminate unnecessary copy later on when we will write correct values
+    DB::writeIntBinary(static_cast<int64_t>(0), write_buf); /// zxid
+    DB::writeIntBinary(KeeperStorage::DigestVersion::NO_DIGEST, write_buf); /// digest version or NO_DIGEST flag
+    DB::writeIntBinary(static_cast<uint64_t>(0), write_buf); /// digest value
+    /// if new fields are added, update KeeperStateMachine::ZooKeeperLogSerializationVersion along with parseRequest function and PreAppendLog callback handler
     return write_buf.getBuffer();
 }
 
@@ -510,9 +500,7 @@ RaftAppendResult KeeperServer::putRequestBatch(const KeeperStorage::RequestsForS
 {
     std::vector<nuraft::ptr<nuraft::buffer>> entries;
     for (const auto & request_for_session : requests_for_sessions)
-    {
-        entries.push_back(getZooKeeperRequestMessage(request_for_session));
-    }
+        entries.push_back(getZooKeeperLogEntry(request_for_session));
 
     std::lock_guard lock{server_write_mutex};
     if (is_recovering)
@@ -633,14 +621,50 @@ nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type typ
                 assert(entry->get_val_type() == nuraft::app_log);
                 auto next_zxid = state_machine->getNextZxid();
 
-                auto & entry_buf = entry->get_buf();
-                auto request_for_session = state_machine->parseRequest(entry_buf);
-                request_for_session.zxid = next_zxid;
-                if (!state_machine->preprocess(request_for_session))
+                auto entry_buf = entry->get_buf_ptr();
+
+                KeeperStateMachine::ZooKeeperLogSerializationVersion serialization_version;
+                auto request_for_session = state_machine->parseRequest(*entry_buf, /*final=*/false, &serialization_version);
+                request_for_session->zxid = next_zxid;
+                if (!state_machine->preprocess(*request_for_session))
                     return nuraft::cb_func::ReturnCode::ReturnNull;
 
-                request_for_session.digest = state_machine->getNodesDigest();
-                entry = nuraft::cs_new<nuraft::log_entry>(entry->get_term(), getZooKeeperLogEntry(request_for_session), entry->get_val_type());
+                request_for_session->digest = state_machine->getNodesDigest();
+
+                /// older versions of Keeper can send logs that are missing some fields
+                size_t bytes_missing = 0;
+                if (serialization_version < KeeperStateMachine::ZooKeeperLogSerializationVersion::WITH_TIME)
+                    bytes_missing += sizeof(request_for_session->time);
+
+                if (serialization_version < KeeperStateMachine::ZooKeeperLogSerializationVersion::WITH_ZXID_DIGEST)
+                    bytes_missing += sizeof(request_for_session->zxid) + sizeof(request_for_session->digest->version) + sizeof(request_for_session->digest->value);
+
+                if (bytes_missing != 0)
+                {
+                    auto new_buffer = nuraft::buffer::alloc(entry_buf->size() + bytes_missing);
+                    memcpy(new_buffer->data_begin(), entry_buf->data_begin(), entry_buf->size());
+                    entry_buf = std::move(new_buffer);
+                    entry = nuraft::cs_new<nuraft::log_entry>(entry->get_term(), entry_buf, entry->get_val_type());
+                }
+
+                size_t write_buffer_header_size
+                    = sizeof(request_for_session->zxid) + sizeof(request_for_session->digest->version) + sizeof(request_for_session->digest->value);
+
+                if (serialization_version < KeeperStateMachine::ZooKeeperLogSerializationVersion::WITH_TIME)
+                    write_buffer_header_size += sizeof(request_for_session->time);
+
+                auto * buffer_start = reinterpret_cast<BufferBase::Position>(entry_buf->data_begin() + entry_buf->size() - write_buffer_header_size);
+
+                WriteBuffer write_buf(buffer_start, write_buffer_header_size);
+
+                if (serialization_version < KeeperStateMachine::ZooKeeperLogSerializationVersion::WITH_TIME)
+                    writeIntBinary(request_for_session->time, write_buf);
+
+                writeIntBinary(request_for_session->zxid, write_buf);
+                writeIntBinary(request_for_session->digest->version, write_buf);
+                if (request_for_session->digest->version != KeeperStorage::NO_DIGEST)
+                    writeIntBinary(request_for_session->digest->value, write_buf);
+
                 break;
             }
             case nuraft::cb_func::AppendLogFailed:
@@ -652,8 +676,8 @@ nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type typ
                 assert(entry->get_val_type() == nuraft::app_log);
 
                 auto & entry_buf = entry->get_buf();
-                auto request_for_session = state_machine->parseRequest(entry_buf);
-                state_machine->rollbackRequest(request_for_session, true);
+                auto request_for_session = state_machine->parseRequest(entry_buf, true);
+                state_machine->rollbackRequest(*request_for_session, true);
                 break;
             }
             default:
@@ -960,4 +984,9 @@ bool KeeperServer::requestLeader()
     return isLeader() || raft_instance->request_leadership();
 }
 
+void KeeperServer::recalculateStorageStats()
+{
+    state_machine->recalculateStorageStats();
+}
+
 }
diff --git a/src/Coordination/KeeperServer.h b/src/Coordination/KeeperServer.h
index feadf3bb7ce..db4e9c1962e 100644
--- a/src/Coordination/KeeperServer.h
+++ b/src/Coordination/KeeperServer.h
@@ -72,7 +72,8 @@ public:
         const Poco::Util::AbstractConfiguration & config_,
         ResponsesQueue & responses_queue_,
         SnapshotsQueue & snapshots_queue_,
-        KeeperSnapshotManagerS3 & snapshot_manager_s3);
+        KeeperSnapshotManagerS3 & snapshot_manager_s3,
+        KeeperStateMachine::CommitCallback commit_callback);
 
     /// Load state machine from the latest snapshot and load log storage. Start NuRaft with required settings.
     void startup(const Poco::Util::AbstractConfiguration & config, bool enable_ipv6 = true);
@@ -137,6 +138,8 @@ public:
     KeeperLogInfo getKeeperLogInfo();
 
     bool requestLeader();
+
+    void recalculateStorageStats();
 };
 
 }
diff --git a/src/Coordination/KeeperSnapshotManager.cpp b/src/Coordination/KeeperSnapshotManager.cpp
index a3f7dbc2c6a..8b80db3e520 100644
--- a/src/Coordination/KeeperSnapshotManager.cpp
+++ b/src/Coordination/KeeperSnapshotManager.cpp
@@ -361,19 +361,25 @@ void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserial
                     "If you still want to ignore it, you can set 'keeper_server.ignore_system_path_on_startup' to true",
                     error_msg);
         }
-        else if (match_result == EXACT && !is_node_empty(node))
+        else if (match_result == EXACT)
         {
-            if (keeper_context->ignore_system_path_on_startup || keeper_context->server_state != KeeperContext::Phase::INIT)
+            if (!is_node_empty(node))
             {
-                LOG_ERROR(&Poco::Logger::get("KeeperSnapshotManager"), "{}. Ignoring it", error_msg);
-                node = KeeperStorage::Node{};
+                if (keeper_context->ignore_system_path_on_startup || keeper_context->server_state != KeeperContext::Phase::INIT)
+                {
+                    LOG_ERROR(&Poco::Logger::get("KeeperSnapshotManager"), "{}. Ignoring it", error_msg);
+                    node = KeeperStorage::Node{};
+                }
+                else
+                    throw Exception(
+                        ErrorCodes::LOGICAL_ERROR,
+                        "{}. Ignoring it can lead to data loss. "
+                        "If you still want to ignore it, you can set 'keeper_server.ignore_system_path_on_startup' to true",
+                        error_msg);
             }
-            else
-                throw Exception(
-                    ErrorCodes::LOGICAL_ERROR,
-                    "{}. Ignoring it can lead to data loss. "
-                    "If you still want to ignore it, you can set 'keeper_server.ignore_system_path_on_startup' to true",
-                    error_msg);
+
+            // we always ignore the written size for this node
+            node.recalculateSize();
         }
 
         storage.container.insertOrReplace(path, node);
@@ -390,7 +396,7 @@ void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserial
         {
             auto parent_path = parentPath(itr.key);
             storage.container.updateValue(
-                parent_path, [path = itr.key](KeeperStorage::Node & value) { value.addChild(getBaseName(path)); });
+                parent_path, [version, path = itr.key](KeeperStorage::Node & value) { value.addChild(getBaseName(path), /*update_size*/ version < SnapshotVersion::V4); });
         }
     }
 
diff --git a/src/Coordination/KeeperSnapshotManagerS3.cpp b/src/Coordination/KeeperSnapshotManagerS3.cpp
index 7b47324a890..1afe0b352c5 100644
--- a/src/Coordination/KeeperSnapshotManagerS3.cpp
+++ b/src/Coordination/KeeperSnapshotManagerS3.cpp
@@ -7,6 +7,7 @@
 #include <Common/setThreadName.h>
 
 #include <IO/S3/getObjectInfo.h>
+#include <IO/S3/Credentials.h>
 #include <IO/WriteBufferFromS3.h>
 #include <IO/ReadBufferFromS3.h>
 #include <IO/ReadBufferFromFile.h>
@@ -101,9 +102,15 @@ void KeeperSnapshotManagerS3::updateS3Configuration(const Poco::Util::AbstractCo
             credentials.GetAWSAccessKeyId(),
             credentials.GetAWSSecretKey(),
             auth_settings.server_side_encryption_customer_key_base64,
+            auth_settings.server_side_encryption_kms_config,
             std::move(headers),
-            auth_settings.use_environment_credentials.value_or(false),
-            auth_settings.use_insecure_imds_request.value_or(false));
+            S3::CredentialsConfiguration
+            {
+                auth_settings.use_environment_credentials.value_or(true),
+                auth_settings.use_insecure_imds_request.value_or(false),
+                auth_settings.expiration_window_seconds.value_or(S3::DEFAULT_EXPIRATION_WINDOW_SECONDS),
+                auth_settings.no_sign_request.value_or(false),
+            });
 
         auto new_client = std::make_shared<KeeperSnapshotManagerS3::S3Configuration>(std::move(new_uri), std::move(auth_settings), std::move(client));
 
@@ -142,6 +149,7 @@ void KeeperSnapshotManagerS3::uploadSnapshotImpl(const std::string & snapshot_pa
                 s3_client->client,
                 s3_client->uri.bucket,
                 key,
+                DBMS_DEFAULT_BUFFER_SIZE,
                 request_settings_1
             };
         };
diff --git a/src/Coordination/KeeperSnapshotManagerS3.h b/src/Coordination/KeeperSnapshotManagerS3.h
index 197f528b192..eff7868bba9 100644
--- a/src/Coordination/KeeperSnapshotManagerS3.h
+++ b/src/Coordination/KeeperSnapshotManagerS3.h
@@ -9,7 +9,6 @@
 #if USE_AWS_S3
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/ThreadPool.h>
-#include <Common/logger_useful.h>
 
 #include <string>
 #endif
diff --git a/src/Coordination/KeeperStateMachine.cpp b/src/Coordination/KeeperStateMachine.cpp
index ccee058ba5c..6635c74149a 100644
--- a/src/Coordination/KeeperStateMachine.cpp
+++ b/src/Coordination/KeeperStateMachine.cpp
@@ -1,16 +1,17 @@
 #include <cerrno>
-#include <base/errnoToString.h>
-#include <base/defines.h>
 #include <future>
 #include <Coordination/KeeperSnapshotManager.h>
 #include <Coordination/KeeperStateMachine.h>
 #include <Coordination/ReadBufferFromNuraftBuffer.h>
 #include <Coordination/WriteBufferFromNuraftBuffer.h>
 #include <IO/ReadHelpers.h>
+#include <base/defines.h>
+#include <base/errnoToString.h>
 #include <sys/mman.h>
-#include "Common/ZooKeeper/ZooKeeperCommon.h"
-#include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <Common/ProfileEvents.h>
+#include <Common/ZooKeeper/ZooKeeperCommon.h>
+#include <Common/ZooKeeper/ZooKeeperIO.h>
+#include <Common/logger_useful.h>
 #include "Coordination/KeeperStorage.h"
 
 
@@ -46,8 +47,10 @@ KeeperStateMachine::KeeperStateMachine(
     const CoordinationSettingsPtr & coordination_settings_,
     const KeeperContextPtr & keeper_context_,
     KeeperSnapshotManagerS3 * snapshot_manager_s3_,
+    CommitCallback commit_callback_,
     const std::string & superdigest_)
-    : coordination_settings(coordination_settings_)
+    : commit_callback(commit_callback_)
+    , coordination_settings(coordination_settings_)
     , snapshot_manager(
           snapshots_path_,
           coordination_settings->snapshots_to_keep,
@@ -57,6 +60,7 @@ KeeperStateMachine::KeeperStateMachine(
           coordination_settings->dead_session_check_period_ms.totalMilliseconds())
     , responses_queue(responses_queue_)
     , snapshots_queue(snapshots_queue_)
+    , min_request_size_to_cache(coordination_settings_->min_request_size_for_cache)
     , last_committed_idx(0)
     , log(&Poco::Logger::get("KeeperStateMachine"))
     , superdigest(superdigest_)
@@ -146,19 +150,19 @@ void assertDigest(
 
 nuraft::ptr<nuraft::buffer> KeeperStateMachine::pre_commit(uint64_t log_idx, nuraft::buffer & data)
 {
-    auto request_for_session = parseRequest(data);
-    if (!request_for_session.zxid)
-        request_for_session.zxid = log_idx;
+    auto request_for_session = parseRequest(data, /*final=*/false);
+    if (!request_for_session->zxid)
+        request_for_session->zxid = log_idx;
 
-    preprocess(request_for_session);
+    preprocess(*request_for_session);
     return nullptr;
 }
 
-KeeperStorage::RequestForSession KeeperStateMachine::parseRequest(nuraft::buffer & data)
+std::shared_ptr<KeeperStorage::RequestForSession> KeeperStateMachine::parseRequest(nuraft::buffer & data, bool final, ZooKeeperLogSerializationVersion * serialization_version)
 {
     ReadBufferFromNuraftBuffer buffer(data);
-    KeeperStorage::RequestForSession request_for_session;
-    readIntBinary(request_for_session.session_id, buffer);
+    auto request_for_session = std::make_shared<KeeperStorage::RequestForSession>();
+    readIntBinary(request_for_session->session_id, buffer);
 
     int32_t length;
     Coordination::read(length, buffer);
@@ -166,29 +170,81 @@ KeeperStorage::RequestForSession KeeperStateMachine::parseRequest(nuraft::buffer
     int32_t xid;
     Coordination::read(xid, buffer);
 
+    static constexpr std::array non_cacheable_xids{
+        Coordination::WATCH_XID,
+        Coordination::PING_XID,
+        Coordination::AUTH_XID,
+        Coordination::CLOSE_XID,
+    };
+
+    const bool should_cache
+        = min_request_size_to_cache != 0 && request_for_session->session_id != -1 && data.size() >= min_request_size_to_cache
+        && std::all_of(
+              non_cacheable_xids.begin(), non_cacheable_xids.end(), [&](const auto non_cacheable_xid) { return xid != non_cacheable_xid; });
+
+    if (should_cache)
+    {
+        std::lock_guard lock(request_cache_mutex);
+        if (auto xid_to_request_it = parsed_request_cache.find(request_for_session->session_id);
+            xid_to_request_it != parsed_request_cache.end())
+        {
+            auto & xid_to_request = xid_to_request_it->second;
+            if (auto request_it = xid_to_request.find(xid); request_it != xid_to_request.end())
+            {
+                if (final)
+                {
+                    auto request = std::move(request_it->second);
+                    xid_to_request.erase(request_it);
+                    return request;
+                }
+                else
+                    return request_it->second;
+            }
+        }
+    }
+
+
     Coordination::OpNum opnum;
 
     Coordination::read(opnum, buffer);
 
-    request_for_session.request = Coordination::ZooKeeperRequestFactory::instance().get(opnum);
-    request_for_session.request->xid = xid;
-    request_for_session.request->readImpl(buffer);
+    request_for_session->request = Coordination::ZooKeeperRequestFactory::instance().get(opnum);
+    request_for_session->request->xid = xid;
+    request_for_session->request->readImpl(buffer);
 
-    if (!buffer.eof())
-        readIntBinary(request_for_session.time, buffer);
-    else /// backward compatibility
-        request_for_session.time
-            = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
-
-    if (!buffer.eof())
-        readIntBinary(request_for_session.zxid, buffer);
+    using enum ZooKeeperLogSerializationVersion;
+    ZooKeeperLogSerializationVersion version = INITIAL;
 
     if (!buffer.eof())
     {
-        request_for_session.digest.emplace();
-        readIntBinary(request_for_session.digest->version, buffer);
-        if (request_for_session.digest->version != KeeperStorage::DigestVersion::NO_DIGEST)
-            readIntBinary(request_for_session.digest->value, buffer);
+        version = WITH_TIME;
+        readIntBinary(request_for_session->time, buffer);
+    }
+    else
+        request_for_session->time
+            = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+
+    if (!buffer.eof())
+    {
+        version = WITH_ZXID_DIGEST;
+
+        readIntBinary(request_for_session->zxid, buffer);
+
+        chassert(!buffer.eof());
+
+        request_for_session->digest.emplace();
+        readIntBinary(request_for_session->digest->version, buffer);
+        if (request_for_session->digest->version != KeeperStorage::DigestVersion::NO_DIGEST || !buffer.eof())
+            readIntBinary(request_for_session->digest->value, buffer);
+    }
+
+    if (serialization_version)
+        *serialization_version = version;
+
+    if (should_cache && !final)
+    {
+        std::lock_guard lock(request_cache_mutex);
+        parsed_request_cache[request_for_session->session_id].emplace(xid, request_for_session);
     }
 
     return request_for_session;
@@ -228,15 +284,15 @@ bool KeeperStateMachine::preprocess(const KeeperStorage::RequestForSession & req
 
 nuraft::ptr<nuraft::buffer> KeeperStateMachine::commit(const uint64_t log_idx, nuraft::buffer & data)
 {
-    auto request_for_session = parseRequest(data);
-    if (!request_for_session.zxid)
-        request_for_session.zxid = log_idx;
+    auto request_for_session = parseRequest(data, true);
+    if (!request_for_session->zxid)
+        request_for_session->zxid = log_idx;
 
     /// Special processing of session_id request
-    if (request_for_session.request->getOpNum() == Coordination::OpNum::SessionID)
+    if (request_for_session->request->getOpNum() == Coordination::OpNum::SessionID)
     {
         const Coordination::ZooKeeperSessionIDRequest & session_id_request
-            = dynamic_cast<const Coordination::ZooKeeperSessionIDRequest &>(*request_for_session.request);
+            = dynamic_cast<const Coordination::ZooKeeperSessionIDRequest &>(*request_for_session->request);
         int64_t session_id;
         std::shared_ptr<Coordination::ZooKeeperSessionIDResponse> response = std::make_shared<Coordination::ZooKeeperSessionIDResponse>();
         response->internal_id = session_id_request.internal_id;
@@ -258,22 +314,34 @@ nuraft::ptr<nuraft::buffer> KeeperStateMachine::commit(const uint64_t log_idx, n
     }
     else
     {
+        if (request_for_session->request->getOpNum() == Coordination::OpNum::Close)
+        {
+            std::lock_guard lock(request_cache_mutex);
+            parsed_request_cache.erase(request_for_session->session_id);
+        }
+
         std::lock_guard lock(storage_and_responses_lock);
-        KeeperStorage::ResponsesForSessions responses_for_sessions = storage->processRequest(
-            request_for_session.request, request_for_session.session_id, request_for_session.zxid);
+        KeeperStorage::ResponsesForSessions responses_for_sessions
+            = storage->processRequest(request_for_session->request, request_for_session->session_id, request_for_session->zxid);
         for (auto & response_for_session : responses_for_sessions)
             if (!responses_queue.push(response_for_session))
             {
                 ProfileEvents::increment(ProfileEvents::KeeperCommitsFailed);
-                LOG_WARNING(log, "Failed to push response with session id {} to the queue, probably because of shutdown", response_for_session.session_id);
+                LOG_WARNING(
+                    log,
+                    "Failed to push response with session id {} to the queue, probably because of shutdown",
+                    response_for_session.session_id);
             }
 
-        if (keeper_context->digest_enabled && request_for_session.digest)
-            assertDigest(*request_for_session.digest, storage->getNodesDigest(true), *request_for_session.request, true);
+        if (keeper_context->digest_enabled && request_for_session->digest)
+            assertDigest(*request_for_session->digest, storage->getNodesDigest(true), *request_for_session->request, true);
     }
 
     ProfileEvents::increment(ProfileEvents::KeeperCommits);
     last_committed_idx = log_idx;
+
+    if (commit_callback)
+        commit_callback(*request_for_session);
     return nullptr;
 }
 
@@ -283,15 +351,20 @@ bool KeeperStateMachine::apply_snapshot(nuraft::snapshot & s)
     nuraft::ptr<nuraft::buffer> latest_snapshot_ptr;
     { /// save snapshot into memory
         std::lock_guard lock(snapshots_lock);
-        if (s.get_last_log_idx() != latest_snapshot_meta->get_last_log_idx())
+        if (s.get_last_log_idx() > latest_snapshot_meta->get_last_log_idx())
         {
             ProfileEvents::increment(ProfileEvents::KeeperSnapshotApplysFailed);
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
-                "Required to apply snapshot with last log index {}, but our last log index is {}",
+                "Required to apply snapshot with last log index {}, but last created snapshot was for smaller log index {}",
                 s.get_last_log_idx(),
                 latest_snapshot_meta->get_last_log_idx());
         }
+        else if (s.get_last_log_idx() < latest_snapshot_meta->get_last_log_idx())
+        {
+            LOG_INFO(log, "A snapshot with a larger last log index ({}) was created, skipping applying this snapshot", latest_snapshot_meta->get_last_log_idx());
+        }
+
         latest_snapshot_ptr = latest_snapshot_buf;
     }
 
@@ -319,14 +392,14 @@ void KeeperStateMachine::commit_config(const uint64_t /* log_idx */, nuraft::ptr
 
 void KeeperStateMachine::rollback(uint64_t log_idx, nuraft::buffer & data)
 {
-    auto request_for_session = parseRequest(data);
+    auto request_for_session = parseRequest(data, true);
     // If we received a log from an older node, use the log_idx as the zxid
     // log_idx will always be larger or equal to the zxid so we can safely do this
     // (log_idx is increased for all logs, while zxid is only increased for requests)
-    if (!request_for_session.zxid)
-        request_for_session.zxid = log_idx;
+    if (!request_for_session->zxid)
+        request_for_session->zxid = log_idx;
 
-    rollbackRequest(request_for_session, false);
+    rollbackRequest(*request_for_session, false);
 }
 
 void KeeperStateMachine::rollbackRequest(const KeeperStorage::RequestForSession & request_for_session, bool allow_missing)
@@ -366,19 +439,32 @@ void KeeperStateMachine::create_snapshot(nuraft::snapshot & s, nuraft::async_res
         {
             { /// Read storage data without locks and create snapshot
                 std::lock_guard lock(snapshots_lock);
-                auto [path, error_code] = snapshot_manager.serializeSnapshotToDisk(*snapshot);
-                if (error_code)
+
+                if (latest_snapshot_meta && snapshot->snapshot_meta->get_last_log_idx() <= latest_snapshot_meta->get_last_log_idx())
                 {
-                    throw Exception(
-                        ErrorCodes::SYSTEM_ERROR,
-                        "Snapshot {} was created failed, error: {}",
+                    LOG_INFO(
+                        log,
+                        "Will not create a snapshot with last log idx {} because a snapshot with bigger last log idx ({}) is already "
+                        "created",
                         snapshot->snapshot_meta->get_last_log_idx(),
-                        error_code.message());
+                        latest_snapshot_meta->get_last_log_idx());
+                }
+                else
+                {
+                    auto [path, error_code] = snapshot_manager.serializeSnapshotToDisk(*snapshot);
+                    if (error_code)
+                    {
+                        throw Exception(
+                            ErrorCodes::SYSTEM_ERROR,
+                            "Snapshot {} was created failed, error: {}",
+                            snapshot->snapshot_meta->get_last_log_idx(),
+                            error_code.message());
+                    }
+                    latest_snapshot_path = path;
+                    latest_snapshot_meta = snapshot->snapshot_meta;
+                    ProfileEvents::increment(ProfileEvents::KeeperSnapshotCreations);
+                    LOG_DEBUG(log, "Created persistent snapshot {} with path {}", latest_snapshot_meta->get_last_log_idx(), path);
                 }
-                latest_snapshot_path = path;
-                latest_snapshot_meta = snapshot->snapshot_meta;
-                ProfileEvents::increment(ProfileEvents::KeeperSnapshotCreations);
-                LOG_DEBUG(log, "Created persistent snapshot {} with path {}", latest_snapshot_meta->get_last_log_idx(), path);
             }
 
             {
@@ -517,11 +603,7 @@ void KeeperStateMachine::processReadRequest(const KeeperStorage::RequestForSessi
     /// Pure local request, just process it with storage
     std::lock_guard lock(storage_and_responses_lock);
     auto responses = storage->processRequest(
-        request_for_session.request,
-        request_for_session.session_id,
-        std::nullopt,
-        true /*check_acl*/,
-        true /*is_local*/);
+        request_for_session.request, request_for_session.session_id, std::nullopt, true /*check_acl*/, true /*is_local*/);
     for (const auto & response : responses)
         if (!responses_queue.push(response))
             LOG_WARNING(log, "Failed to push response with session id {} to the queue, probably because of shutdown", response.session_id);
@@ -643,4 +725,12 @@ ClusterConfigPtr KeeperStateMachine::getClusterConfig() const
     return nullptr;
 }
 
+void KeeperStateMachine::recalculateStorageStats()
+{
+    std::lock_guard lock(storage_and_responses_lock);
+    LOG_INFO(log, "Recalculating storage stats");
+    storage->recalculateStats();
+    LOG_INFO(log, "Done recalculating storage stats");
+}
+
 }
diff --git a/src/Coordination/KeeperStateMachine.h b/src/Coordination/KeeperStateMachine.h
index ffc7fce1cfe..fbd97fd8631 100644
--- a/src/Coordination/KeeperStateMachine.h
+++ b/src/Coordination/KeeperStateMachine.h
@@ -8,7 +8,6 @@
 
 #include <libnuraft/nuraft.hxx>
 #include <Common/ConcurrentBoundedQueue.h>
-#include <Common/logger_useful.h>
 
 
 namespace DB
@@ -22,6 +21,8 @@ using SnapshotsQueue = ConcurrentBoundedQueue<CreateSnapshotTask>;
 class KeeperStateMachine : public nuraft::state_machine
 {
 public:
+    using CommitCallback = std::function<void(const KeeperStorage::RequestForSession &)>;
+
     KeeperStateMachine(
         ResponsesQueue & responses_queue_,
         SnapshotsQueue & snapshots_queue_,
@@ -29,12 +30,28 @@ public:
         const CoordinationSettingsPtr & coordination_settings_,
         const KeeperContextPtr & keeper_context_,
         KeeperSnapshotManagerS3 * snapshot_manager_s3_,
+        CommitCallback commit_callback_ = {},
         const std::string & superdigest_ = "");
 
     /// Read state from the latest snapshot
     void init();
 
-    static KeeperStorage::RequestForSession parseRequest(nuraft::buffer & data);
+    enum ZooKeeperLogSerializationVersion
+    {
+        INITIAL = 0,
+        WITH_TIME = 1,
+        WITH_ZXID_DIGEST = 2,
+    };
+
+    /// lifetime of a parsed request is:
+    /// [preprocess/PreAppendLog -> commit]
+    /// [preprocess/PreAppendLog -> rollback]
+    /// on events like commit and rollback we can remove the parsed request to keep the memory usage at minimum
+    /// request cache is also cleaned on session close in case something strange happened
+    ///
+    /// final - whether it's the final time we will fetch the request so we can safely remove it from cache
+    /// serialization_version - information about which fields were parsed from the buffer so we can modify the buffer accordingly
+    std::shared_ptr<KeeperStorage::RequestForSession> parseRequest(nuraft::buffer & data, bool final, ZooKeeperLogSerializationVersion * serialization_version = nullptr);
 
     bool preprocess(const KeeperStorage::RequestForSession & request_for_session);
 
@@ -103,7 +120,9 @@ public:
     uint64_t getKeyArenaSize() const;
     uint64_t getLatestSnapshotBufSize() const;
 
+    void recalculateStorageStats();
 private:
+    CommitCallback commit_callback;
     /// In our state machine we always have a single snapshot which is stored
     /// in memory in compressed (serialized) format.
     SnapshotMetadataPtr latest_snapshot_meta = nullptr;
@@ -134,6 +153,13 @@ private:
     /// for request.
     mutable std::mutex storage_and_responses_lock;
 
+    std::unordered_map<int64_t, std::unordered_map<Coordination::XID, std::shared_ptr<KeeperStorage::RequestForSession>>> parsed_request_cache;
+    uint64_t min_request_size_to_cache{0};
+    /// we only need to protect the access to the map itself
+    /// requests can be modified from anywhere without lock because a single request
+    /// can be processed only in 1 thread at any point
+    std::mutex request_cache_mutex;
+
     /// Last committed Raft log number.
     std::atomic<uint64_t> last_committed_idx;
 
diff --git a/src/Coordination/KeeperStateManager.cpp b/src/Coordination/KeeperStateManager.cpp
index cfb3519e597..8736fb7d4e3 100644
--- a/src/Coordination/KeeperStateManager.cpp
+++ b/src/Coordination/KeeperStateManager.cpp
@@ -6,7 +6,9 @@
 #include <Common/Exception.h>
 #include <Common/isLocalAddress.h>
 #include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromFile.h>
 #include <Common/getMultipleKeysFromConfig.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index 0e4d631938c..7a1a5e42632 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -11,7 +11,8 @@
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/ZooKeeper/IKeeper.h>
-#include <Common/hex.h>
+#include <base/hex.h>
+#include <base/scope_guard.h>
 #include <Common/logger_useful.h>
 #include <Common/setThreadName.h>
 #include <Common/LockMemoryExceptionInThread.h>
@@ -61,16 +62,10 @@ String getSHA1(const String & userdata)
     return String{digest_id.begin(), digest_id.end()};
 }
 
-String generateDigest(const String & userdata)
-{
-    std::vector<String> user_password;
-    boost::split(user_password, userdata, [](char character) { return character == ':'; });
-    return user_password[0] + ":" + base64Encode(getSHA1(userdata));
-}
-
 bool fixupACL(
     const std::vector<Coordination::ACL> & request_acls,
-    const std::vector<KeeperStorage::AuthID> & current_ids,
+    int64_t session_id,
+    const KeeperStorage::UncommittedState & uncommitted_state,
     std::vector<Coordination::ACL> & result_acls)
 {
     if (request_acls.empty())
@@ -81,14 +76,18 @@ bool fixupACL(
     {
         if (request_acl.scheme == "auth")
         {
-            for (const auto & current_id : current_ids)
-            {
-                valid_found = true;
-                Coordination::ACL new_acl = request_acl;
-                new_acl.scheme = current_id.scheme;
-                new_acl.id = current_id.id;
-                result_acls.push_back(new_acl);
-            }
+            uncommitted_state.forEachAuthInSession(
+                session_id,
+                [&](const KeeperStorage::AuthID & auth_id)
+                {
+                    valid_found = true;
+                    Coordination::ACL new_acl = request_acl;
+
+                    new_acl.scheme = auth_id.scheme;
+                    new_acl.id = auth_id.id;
+
+                    result_acls.push_back(new_acl);
+                });
         }
         else if (request_acl.scheme == "world" && request_acl.id == "anyone")
         {
@@ -201,9 +200,10 @@ void KeeperStorage::Node::setData(String new_data)
     data = std::move(new_data);
 }
 
-void KeeperStorage::Node::addChild(StringRef child_path)
+void KeeperStorage::Node::addChild(StringRef child_path, bool update_size)
 {
-    size_bytes += sizeof child_path;
+    if (update_size) [[likely]]
+        size_bytes += sizeof child_path;
     children.insert(child_path);
 }
 
@@ -234,6 +234,13 @@ void KeeperStorage::Node::shallowCopy(const KeeperStorage::Node & other)
     cached_digest = other.cached_digest;
 }
 
+void KeeperStorage::Node::recalculateSize()
+{
+    size_bytes = sizeof(Node);
+    size_bytes += children.size() * sizeof(decltype(children)::value_type);
+    size_bytes += data.size();
+}
+
 KeeperStorage::KeeperStorage(
     int64_t tick_time_ms, const String & superdigest_, const KeeperContextPtr & keeper_context_, const bool initialize_system_nodes)
     : session_expiry_queue(tick_time_ms), keeper_context(keeper_context_), superdigest(superdigest_)
@@ -332,11 +339,11 @@ void KeeperStorage::UncommittedState::applyDelta(const Delta & delta)
             nodes.emplace(delta.path, UncommittedNode{.node = nullptr});
     }
 
-    auto & [node, acls, last_applied_zxid] = nodes.at(delta.path);
-
     std::visit(
-        [&, &node = node, &acls = acls, &last_applied_zxid = last_applied_zxid]<typename DeltaType>(const DeltaType & operation)
+        [&]<typename DeltaType>(const DeltaType & operation)
         {
+            auto & [node, acls, last_applied_zxid] = nodes.at(delta.path);
+
             if constexpr (std::same_as<DeltaType, CreateNodeDelta>)
             {
                 assert(!node);
@@ -556,6 +563,32 @@ Coordination::ACLs KeeperStorage::UncommittedState::getACLs(StringRef path) cons
     return storage.acl_map.convertNumber(node_it->value.acl_id);
 }
 
+void KeeperStorage::UncommittedState::forEachAuthInSession(int64_t session_id, std::function<void(const AuthID &)> func) const
+{
+    const auto call_for_each_auth = [&func](const auto & auth_ids)
+    {
+        for (const auto & auth : auth_ids)
+        {
+            using TAuth = std::remove_reference_t<decltype(auth)>;
+
+            const AuthID * auth_ptr = nullptr;
+            if constexpr (std::is_pointer_v<TAuth>)
+                auth_ptr = auth;
+            else
+                auth_ptr = &auth;
+
+            func(*auth_ptr);
+        }
+    };
+
+    // for committed
+    if (storage.session_and_auth.contains(session_id))
+        call_for_each_auth(storage.session_and_auth.at(session_id));
+    // for uncommitted
+    if (session_and_auth.contains(session_id))
+        call_for_each_auth(session_and_auth.at(session_id));
+}
+
 namespace
 {
 
@@ -919,7 +952,7 @@ struct KeeperStorageCreateRequestProcessor final : public KeeperStorageRequestPr
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADARGUMENTS}};
 
         Coordination::ACLs node_acls;
-        if (!fixupACL(request.acls, storage.session_and_auth[session_id], node_acls))
+        if (!fixupACL(request.acls, session_id, storage.uncommitted_state, node_acls))
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZINVALIDACL}};
 
         if (request.is_ephemeral)
@@ -1416,24 +1449,39 @@ struct KeeperStorageListRequestProcessor final : public KeeperStorageRequestProc
 
 struct KeeperStorageCheckRequestProcessor final : public KeeperStorageRequestProcessor
 {
-    bool checkAuth(KeeperStorage & storage, int64_t session_id, bool is_local) const override
+    explicit KeeperStorageCheckRequestProcessor(const Coordination::ZooKeeperRequestPtr & zk_request_)
+        : KeeperStorageRequestProcessor(zk_request_)
     {
-        return storage.checkACL(zk_request->getPath(), Coordination::ACL::Read, session_id, is_local);
+        check_not_exists = zk_request->getOpNum() == Coordination::OpNum::CheckNotExists;
+    }
+
+    bool checkAuth(KeeperStorage & storage, int64_t session_id, bool is_local) const override
+    {
+        auto path = zk_request->getPath();
+        return storage.checkACL(check_not_exists ? parentPath(path) : path, Coordination::ACL::Read, session_id, is_local);
     }
 
-    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::vector<KeeperStorage::Delta>
     preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/, const KeeperContext & /*keeper_context*/) const override
     {
         ProfileEvents::increment(ProfileEvents::KeeperCheckRequest);
+
         Coordination::ZooKeeperCheckRequest & request = dynamic_cast<Coordination::ZooKeeperCheckRequest &>(*zk_request);
 
-        if (!storage.uncommitted_state.getNode(request.path))
-            return {KeeperStorage::Delta{zxid, Coordination::Error::ZNONODE}};
-
         auto node = storage.uncommitted_state.getNode(request.path);
-        if (request.version != -1 && request.version != node->stat.version)
-            return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADVERSION}};
+        if (check_not_exists)
+        {
+            if (node && (request.version == -1 || request.version == node->stat.version))
+                return {KeeperStorage::Delta{zxid, Coordination::Error::ZNODEEXISTS}};
+        }
+        else
+        {
+            if (!node)
+                return {KeeperStorage::Delta{zxid, Coordination::Error::ZNONODE}};
+
+            if (request.version != -1 && request.version != node->stat.version)
+                return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADVERSION}};
+        }
 
         return {};
     }
@@ -1464,17 +1512,22 @@ struct KeeperStorageCheckRequestProcessor final : public KeeperStorageRequestPro
 
         auto & container = storage.container;
         auto node_it = container.find(request.path);
-        if (node_it == container.end())
+
+        if (check_not_exists)
         {
-            on_error(Coordination::Error::ZNONODE);
-        }
-        else if (request.version != -1 && request.version != node_it->value.stat.version)
-        {
-            on_error(Coordination::Error::ZBADVERSION);
+            if (node_it != container.end() && (request.version == -1 || request.version == node_it->value.stat.version))
+                on_error(Coordination::Error::ZNODEEXISTS);
+            else
+                response.error = Coordination::Error::ZOK;
         }
         else
         {
-            response.error = Coordination::Error::ZOK;
+            if (node_it == container.end())
+                on_error(Coordination::Error::ZNONODE);
+            else if (request.version != -1 && request.version != node_it->value.stat.version)
+                on_error(Coordination::Error::ZBADVERSION);
+            else
+                response.error = Coordination::Error::ZOK;
         }
 
         return response_ptr;
@@ -1490,6 +1543,9 @@ struct KeeperStorageCheckRequestProcessor final : public KeeperStorageRequestPro
         ProfileEvents::increment(ProfileEvents::KeeperCheckRequest);
         return processImpl<true>(storage, zxid);
     }
+
+private:
+    bool check_not_exists;
 };
 
 
@@ -1525,10 +1581,8 @@ struct KeeperStorageSetACLRequestProcessor final : public KeeperStorageRequestPr
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADVERSION}};
 
 
-        auto & session_auth_ids = storage.session_and_auth[session_id];
         Coordination::ACLs node_acls;
-
-        if (!fixupACL(request.acls, session_auth_ids, node_acls))
+        if (!fixupACL(request.acls, session_id, uncommitted_state, node_acls))
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZINVALIDACL}};
 
         std::vector<KeeperStorage::Delta> new_deltas
@@ -1685,6 +1739,7 @@ struct KeeperStorageMultiRequestProcessor final : public KeeperStorageRequestPro
                     concrete_requests.push_back(std::make_shared<KeeperStorageSetRequestProcessor>(sub_zk_request));
                     break;
                 case Coordination::OpNum::Check:
+                case Coordination::OpNum::CheckNotExists:
                     check_operation_type(OperationType::Write);
                     concrete_requests.push_back(std::make_shared<KeeperStorageCheckRequestProcessor>(sub_zk_request));
                     break;
@@ -1832,7 +1887,7 @@ struct KeeperStorageAuthRequestProcessor final : public KeeperStorageRequestProc
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZAUTHFAILED}};
 
         std::vector<KeeperStorage::Delta> new_deltas;
-        auto auth_digest = generateDigest(auth_request.data);
+        auto auth_digest = KeeperStorage::generateDigest(auth_request.data);
         if (auth_digest == storage.superdigest)
         {
             KeeperStorage::AuthID auth{"super", ""};
@@ -1940,6 +1995,7 @@ KeeperStorageRequestProcessorsFactory::KeeperStorageRequestProcessorsFactory()
     registerKeeperRequestProcessor<Coordination::OpNum::MultiRead, KeeperStorageMultiRequestProcessor>(*this);
     registerKeeperRequestProcessor<Coordination::OpNum::SetACL, KeeperStorageSetACLRequestProcessor>(*this);
     registerKeeperRequestProcessor<Coordination::OpNum::GetACL, KeeperStorageGetACLRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::CheckNotExists, KeeperStorageCheckRequestProcessor>(*this);
 }
 
 
@@ -2407,5 +2463,17 @@ uint64_t KeeperStorage::getTotalEphemeralNodesCount() const
     return ret;
 }
 
+void KeeperStorage::recalculateStats()
+{
+    container.recalculateDataSize();
+}
+
+String KeeperStorage::generateDigest(const String & userdata)
+{
+    std::vector<String> user_password;
+    boost::split(user_password, userdata, [](char character) { return character == ':'; });
+    return user_password[0] + ":" + base64Encode(getSHA1(userdata));
+}
+
 
 }
diff --git a/src/Coordination/KeeperStorage.h b/src/Coordination/KeeperStorage.h
index a40cca8e778..7eb10be3847 100644
--- a/src/Coordination/KeeperStorage.h
+++ b/src/Coordination/KeeperStorage.h
@@ -47,7 +47,7 @@ public:
 
         const auto & getData() const noexcept { return data; }
 
-        void addChild(StringRef child_path);
+        void addChild(StringRef child_path, bool update_size = true);
 
         void removeChild(StringRef child_path);
 
@@ -64,6 +64,8 @@ public:
         // (e.g. we don't need to copy list of children)
         void shallowCopy(const Node & other);
 
+        void recalculateSize();
+
     private:
         String data;
         ChildrenSet children{};
@@ -103,10 +105,12 @@ public:
         return first.value == second.value;
     }
 
+    static String generateDigest(const String & userdata);
+
     struct RequestForSession
     {
         int64_t session_id;
-        int64_t time;
+        int64_t time{0};
         Coordination::ZooKeeperRequestPtr request;
         int64_t zxid{0};
         std::optional<Digest> digest;
@@ -261,6 +265,8 @@ public:
             return check_auth(auth_it->second);
         }
 
+        void forEachAuthInSession(int64_t session_id, std::function<void(const AuthID &)> func) const;
+
         std::shared_ptr<Node> tryGetNodeFromStorage(StringRef path) const;
 
         std::unordered_map<int64_t, std::list<const AuthID *>> session_and_auth;
@@ -466,6 +472,7 @@ public:
     void dumpWatchesByPath(WriteBufferFromOwnString & buf) const;
     void dumpSessionsAndEphemerals(WriteBufferFromOwnString & buf) const;
 
+    void recalculateStats();
 private:
     void removeDigest(const Node & node, std::string_view path);
     void addDigest(const Node & node, std::string_view path);
diff --git a/src/Coordination/SnapshotableHashTable.h b/src/Coordination/SnapshotableHashTable.h
index 27572ab86c7..7db546bd4c8 100644
--- a/src/Coordination/SnapshotableHashTable.h
+++ b/src/Coordination/SnapshotableHashTable.h
@@ -64,7 +64,7 @@ private:
     ///    value_size: size of value to add
     ///    old_value_size: size of value to minus
     /// old_value_size=0 means there is no old value with the same key.
-    void updateDataSize(OperationType op_type, uint64_t key_size, uint64_t value_size, uint64_t old_value_size)
+    void updateDataSize(OperationType op_type, uint64_t key_size, uint64_t value_size, uint64_t old_value_size, bool remove_old = true)
     {
         switch (op_type)
         {
@@ -94,14 +94,14 @@ private:
             case UPDATE_VALUE:
                 approximate_data_size += key_size;
                 approximate_data_size += value_size;
-                if (!snapshot_mode)
+                if (remove_old)
                 {
                     approximate_data_size -= key_size;
                     approximate_data_size -= old_value_size;
                 }
                 break;
             case ERASE:
-                if (!snapshot_mode)
+                if (remove_old)
                 {
                     approximate_data_size -= key_size;
                     approximate_data_size -= old_value_size;
@@ -177,7 +177,7 @@ public:
                 list_itr->value = value;
             }
         }
-        updateDataSize(INSERT_OR_REPLACE, key.size(), value.sizeInBytes(), old_value_size);
+        updateDataSize(INSERT_OR_REPLACE, key.size(), value.sizeInBytes(), old_value_size, !snapshot_mode);
     }
 
     bool erase(const std::string & key)
@@ -202,7 +202,7 @@ public:
             list.erase(list_itr);
         }
 
-        updateDataSize(ERASE, key.size(), 0, old_data_size);
+        updateDataSize(ERASE, key.size(), 0, old_data_size, !snapshot_mode);
         return true;
     }
 
@@ -222,6 +222,7 @@ public:
 
         const_iterator ret;
 
+        bool remove_old_size = true;
         if (snapshot_mode)
         {
             /// We in snapshot mode but updating some node which is already more
@@ -237,6 +238,8 @@ public:
                 auto itr = list.insert(list.end(), std::move(elem_copy));
                 it->getMapped() = itr;
                 ret = itr;
+
+                remove_old_size = false;
             }
             else
             {
@@ -250,7 +253,7 @@ public:
             ret = list_itr;
         }
 
-        updateDataSize(UPDATE_VALUE, key.size, ret->value.sizeInBytes(), old_value_size);
+        updateDataSize(UPDATE_VALUE, key.size, ret->value.sizeInBytes(), old_value_size, remove_old_size);
         return ret;
     }
 
@@ -319,11 +322,19 @@ public:
         return approximate_data_size;
     }
 
-    uint64_t keyArenaSize() const
+    void recalculateDataSize()
     {
-        return arena.size();
+        approximate_data_size = 0;
+        for (auto & node : list)
+        {
+            node.value.recalculateSize();
+            approximate_data_size += node.key.size;
+            approximate_data_size += node.value.sizeInBytes();
+        }
     }
 
+    uint64_t keyArenaSize() const { return arena.allocatedBytes(); }
+
     iterator begin() { return list.begin(); }
     const_iterator begin() const { return list.cbegin(); }
     iterator end() { return list.end(); }
diff --git a/src/Coordination/WriteBufferFromNuraftBuffer.cpp b/src/Coordination/WriteBufferFromNuraftBuffer.cpp
index 77ad52c867d..c955d3fdbbe 100644
--- a/src/Coordination/WriteBufferFromNuraftBuffer.cpp
+++ b/src/Coordination/WriteBufferFromNuraftBuffer.cpp
@@ -1,5 +1,4 @@
 #include <Coordination/WriteBufferFromNuraftBuffer.h>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/ZooKeeperDataReader.cpp b/src/Coordination/ZooKeeperDataReader.cpp
index 5fa67a60b4b..bdc462f3ea0 100644
--- a/src/Coordination/ZooKeeperDataReader.cpp
+++ b/src/Coordination/ZooKeeperDataReader.cpp
@@ -6,6 +6,7 @@
 
 #include <IO/ReadHelpers.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
+#include <Common/logger_useful.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Coordination/pathUtils.h>
 
@@ -139,7 +140,7 @@ int64_t deserializeStorageData(KeeperStorage & storage, ReadBuffer & in, Poco::L
         if (itr.key != "/")
         {
             auto parent_path = parentPath(itr.key);
-            storage.container.updateValue(parent_path, [path = itr.key] (KeeperStorage::Node & value) { value.addChild(getBaseName(path)); value.stat.numChildren++; });
+            storage.container.updateValue(parent_path, [my_path = itr.key] (KeeperStorage::Node & value) { value.addChild(getBaseName(my_path)); ++value.stat.numChildren; });
         }
     }
 
diff --git a/src/Coordination/ZooKeeperDataReader.h b/src/Coordination/ZooKeeperDataReader.h
index 6da6fd498af..8fd86ba99e2 100644
--- a/src/Coordination/ZooKeeperDataReader.h
+++ b/src/Coordination/ZooKeeperDataReader.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <string>
 #include <Coordination/KeeperStorage.h>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/tests/gtest_coordination.cpp b/src/Coordination/tests/gtest_coordination.cpp
index 895d563327e..62217fb2dd3 100644
--- a/src/Coordination/tests/gtest_coordination.cpp
+++ b/src/Coordination/tests/gtest_coordination.cpp
@@ -1579,6 +1579,113 @@ TEST_P(CoordinationTest, TestEphemeralNodeRemove)
 }
 
 
+TEST_P(CoordinationTest, TestCreateNodeWithAuthSchemeForAclWhenAuthIsPrecommitted)
+{
+    using namespace Coordination;
+    using namespace DB;
+
+    ChangelogDirTest snapshots("./snapshots");
+    CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+    ResponsesQueue queue(std::numeric_limits<size_t>::max());
+    SnapshotsQueue snapshots_queue{1};
+
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings, keeper_context, nullptr);
+    state_machine->init();
+
+    String user_auth_data = "test_user:test_password";
+    String digest = KeeperStorage::generateDigest(user_auth_data);
+
+    std::shared_ptr<ZooKeeperAuthRequest> auth_req = std::make_shared<ZooKeeperAuthRequest>();
+    auth_req->scheme = "digest";
+    auth_req->data = user_auth_data;
+
+    // Add auth data to the session
+    auto auth_entry = getLogEntryFromZKRequest(0, 1, state_machine->getNextZxid(), auth_req);
+    state_machine->pre_commit(1, auth_entry->get_buf());
+
+    // Create a node with 'auth' scheme for ACL
+    String node_path = "/hello";
+    std::shared_ptr<ZooKeeperCreateRequest> create_req = std::make_shared<ZooKeeperCreateRequest>();
+    create_req->path = node_path;
+    // When 'auth' scheme is used the creator must have been authenticated by the server (for example, using 'digest' scheme) before it can
+    // create nodes with this ACL.
+    create_req->acls = {{.permissions = 31, .scheme = "auth", .id = ""}};
+    auto create_entry = getLogEntryFromZKRequest(0, 1, state_machine->getNextZxid(), create_req);
+    state_machine->pre_commit(2, create_entry->get_buf());
+
+    const auto & uncommitted_state = state_machine->getStorage().uncommitted_state;
+    ASSERT_TRUE(uncommitted_state.nodes.contains(node_path));
+
+    // commit log entries
+    state_machine->commit(1, auth_entry->get_buf());
+    state_machine->commit(2, create_entry->get_buf());
+
+    auto node = uncommitted_state.getNode(node_path);
+    ASSERT_NE(node, nullptr);
+    auto acls = uncommitted_state.getACLs(node_path);
+    ASSERT_EQ(acls.size(), 1);
+    EXPECT_EQ(acls[0].scheme, "digest");
+    EXPECT_EQ(acls[0].id, digest);
+    EXPECT_EQ(acls[0].permissions, 31);
+}
+
+TEST_P(CoordinationTest, TestSetACLWithAuthSchemeForAclWhenAuthIsPrecommitted)
+{
+    using namespace Coordination;
+    using namespace DB;
+
+    ChangelogDirTest snapshots("./snapshots");
+    CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+    ResponsesQueue queue(std::numeric_limits<size_t>::max());
+    SnapshotsQueue snapshots_queue{1};
+
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings, keeper_context, nullptr);
+    state_machine->init();
+
+    String user_auth_data = "test_user:test_password";
+    String digest = KeeperStorage::generateDigest(user_auth_data);
+
+    std::shared_ptr<ZooKeeperAuthRequest> auth_req = std::make_shared<ZooKeeperAuthRequest>();
+    auth_req->scheme = "digest";
+    auth_req->data = user_auth_data;
+
+    // Add auth data to the session
+    auto auth_entry = getLogEntryFromZKRequest(0, 1, state_machine->getNextZxid(), auth_req);
+    state_machine->pre_commit(1, auth_entry->get_buf());
+
+    // Create a node
+    String node_path = "/hello";
+    std::shared_ptr<ZooKeeperCreateRequest> create_req = std::make_shared<ZooKeeperCreateRequest>();
+    create_req->path = node_path;
+    auto create_entry = getLogEntryFromZKRequest(0, 1, state_machine->getNextZxid(), create_req);
+    state_machine->pre_commit(2, create_entry->get_buf());
+
+    // Set ACL with 'auth' scheme for ACL
+    std::shared_ptr<ZooKeeperSetACLRequest> set_acl_req = std::make_shared<ZooKeeperSetACLRequest>();
+    set_acl_req->path = node_path;
+    // When 'auth' scheme is used the creator must have been authenticated by the server (for example, using 'digest' scheme) before it can
+    // set this ACL.
+    set_acl_req->acls = {{.permissions = 31, .scheme = "auth", .id = ""}};
+    auto set_acl_entry = getLogEntryFromZKRequest(0, 1, state_machine->getNextZxid(), set_acl_req);
+    state_machine->pre_commit(3, set_acl_entry->get_buf());
+
+    // commit all entries
+    state_machine->commit(1, auth_entry->get_buf());
+    state_machine->commit(2, create_entry->get_buf());
+    state_machine->commit(3, set_acl_entry->get_buf());
+
+    const auto & uncommitted_state = state_machine->getStorage().uncommitted_state;
+    auto node = uncommitted_state.getNode(node_path);
+
+    ASSERT_NE(node, nullptr);
+    auto acls = uncommitted_state.getACLs(node_path);
+    ASSERT_EQ(acls.size(), 1);
+    EXPECT_EQ(acls[0].scheme, "digest");
+    EXPECT_EQ(acls[0].id, digest);
+    EXPECT_EQ(acls[0].permissions, 31);
+}
+
+
 TEST_P(CoordinationTest, TestRotateIntervalChanges)
 {
     using namespace Coordination;
@@ -2344,6 +2451,78 @@ TEST_P(CoordinationTest, ChangelogTestMaxLogSize)
 
 }
 
+TEST_P(CoordinationTest, TestCheckNotExistsRequest)
+{
+    using namespace DB;
+    using namespace Coordination;
+
+    KeeperStorage storage{500, "", keeper_context};
+
+    int32_t zxid = 0;
+
+    const auto create_path = [&](const auto & path)
+    {
+        const auto create_request = std::make_shared<ZooKeeperCreateRequest>();
+        int new_zxid = ++zxid;
+        create_request->path = path;
+        storage.preprocessRequest(create_request, 1, 0, new_zxid);
+        auto responses = storage.processRequest(create_request, 1, new_zxid);
+
+        EXPECT_GE(responses.size(), 1);
+        EXPECT_EQ(responses[0].response->error, Coordination::Error::ZOK) << "Failed to create " << path;
+    };
+
+    const auto check_request = std::make_shared<ZooKeeperCheckRequest>();
+    check_request->path = "/test_node";
+    check_request->not_exists = true;
+
+    {
+        SCOPED_TRACE("CheckNotExists returns ZOK");
+        int new_zxid = ++zxid;
+        storage.preprocessRequest(check_request, 1, 0, new_zxid);
+        auto responses = storage.processRequest(check_request, 1, new_zxid);
+        EXPECT_GE(responses.size(), 1);
+        auto error = responses[0].response->error;
+        EXPECT_EQ(error, Coordination::Error::ZOK) << "CheckNotExists returned invalid result: " << errorMessage(error);
+    }
+
+    create_path("/test_node");
+    auto node_it = storage.container.find("/test_node");
+    ASSERT_NE(node_it, storage.container.end());
+    auto node_version = node_it->value.stat.version;
+
+    {
+        SCOPED_TRACE("CheckNotExists returns ZNODEEXISTS");
+        int new_zxid = ++zxid;
+        storage.preprocessRequest(check_request, 1, 0, new_zxid);
+        auto responses = storage.processRequest(check_request, 1, new_zxid);
+        EXPECT_GE(responses.size(), 1);
+        auto error = responses[0].response->error;
+        EXPECT_EQ(error, Coordination::Error::ZNODEEXISTS) << "CheckNotExists returned invalid result: " << errorMessage(error);
+    }
+
+    {
+        SCOPED_TRACE("CheckNotExists returns ZNODEEXISTS for same version");
+        int new_zxid = ++zxid;
+        check_request->version = node_version;
+        storage.preprocessRequest(check_request, 1, 0, new_zxid);
+        auto responses = storage.processRequest(check_request, 1, new_zxid);
+        EXPECT_GE(responses.size(), 1);
+        auto error = responses[0].response->error;
+        EXPECT_EQ(error, Coordination::Error::ZNODEEXISTS) << "CheckNotExists returned invalid result: " << errorMessage(error);
+    }
+
+    {
+        SCOPED_TRACE("CheckNotExists returns ZOK for different version");
+        int new_zxid = ++zxid;
+        check_request->version = node_version + 1;
+        storage.preprocessRequest(check_request, 1, 0, new_zxid);
+        auto responses = storage.processRequest(check_request, 1, new_zxid);
+        EXPECT_GE(responses.size(), 1);
+        auto error = responses[0].response->error;
+        EXPECT_EQ(error, Coordination::Error::ZOK) << "CheckNotExists returned invalid result: " << errorMessage(error);
+    }
+}
 
 INSTANTIATE_TEST_SUITE_P(CoordinationTestSuite,
     CoordinationTest,
diff --git a/src/Core/BackgroundSchedulePool.cpp b/src/Core/BackgroundSchedulePool.cpp
index 993cfb6ef04..ec1ae047d05 100644
--- a/src/Core/BackgroundSchedulePool.cpp
+++ b/src/Core/BackgroundSchedulePool.cpp
@@ -4,12 +4,16 @@
 #include <Common/Stopwatch.h>
 #include <Common/CurrentThread.h>
 #include <Common/logger_useful.h>
+#include <Common/ThreadPool.h>
 #include <chrono>
 
 
 namespace DB
 {
 
+namespace ErrorCodes { extern const int CANNOT_SCHEDULE_TASK; }
+
+
 BackgroundSchedulePoolTaskInfo::BackgroundSchedulePoolTaskInfo(
     BackgroundSchedulePool & pool_, const std::string & log_name_, const BackgroundSchedulePool::TaskFunc & function_)
     : pool(pool_), log_name(log_name_), function(function_)
@@ -149,17 +153,34 @@ Coordination::WatchCallback BackgroundSchedulePoolTaskInfo::getWatchCallback()
 }
 
 
-BackgroundSchedulePool::BackgroundSchedulePool(size_t size_, CurrentMetrics::Metric tasks_metric_, const char *thread_name_)
+BackgroundSchedulePool::BackgroundSchedulePool(size_t size_, CurrentMetrics::Metric tasks_metric_, CurrentMetrics::Metric size_metric_, const char *thread_name_)
     : tasks_metric(tasks_metric_)
+    , size_metric(size_metric_, size_)
     , thread_name(thread_name_)
 {
     LOG_INFO(&Poco::Logger::get("BackgroundSchedulePool/" + thread_name), "Create BackgroundSchedulePool with {} threads", size_);
 
     threads.resize(size_);
-    for (auto & thread : threads)
-        thread = ThreadFromGlobalPoolNoTracingContextPropagation([this] { threadFunction(); });
 
-    delayed_thread = ThreadFromGlobalPoolNoTracingContextPropagation([this] { delayExecutionThreadFunction(); });
+    try
+    {
+        for (auto & thread : threads)
+            thread = ThreadFromGlobalPoolNoTracingContextPropagation([this] { threadFunction(); });
+
+        delayed_thread = std::make_unique<ThreadFromGlobalPoolNoTracingContextPropagation>([this] { delayExecutionThreadFunction(); });
+    }
+    catch (...)
+    {
+        LOG_FATAL(
+            &Poco::Logger::get("BackgroundSchedulePool/" + thread_name),
+            "Couldn't get {} threads from global thread pool: {}",
+            size_,
+            getCurrentExceptionCode() == DB::ErrorCodes::CANNOT_SCHEDULE_TASK
+                ? "Not enough threads. Please make sure max_thread_pool_size is considerably "
+                  "bigger than background_schedule_pool_size."
+                : getCurrentExceptionMessage(/* with_stacktrace */ true));
+        abort();
+    }
 }
 
 
@@ -177,6 +198,8 @@ void BackgroundSchedulePool::increaseThreadsCount(size_t new_threads_count)
     threads.resize(new_threads_count);
     for (size_t i = old_threads_count; i < new_threads_count; ++i)
         threads[i] = ThreadFromGlobalPoolNoTracingContextPropagation([this] { threadFunction(); });
+
+    size_metric.changeTo(new_threads_count);
 }
 
 
@@ -195,7 +218,7 @@ BackgroundSchedulePool::~BackgroundSchedulePool()
         delayed_tasks_cond_var.notify_all();
 
         LOG_TRACE(&Poco::Logger::get("BackgroundSchedulePool/" + thread_name), "Waiting for threads to finish.");
-        delayed_thread.join();
+        delayed_thread->join();
 
         for (auto & thread : threads)
             thread.join();
diff --git a/src/Core/BackgroundSchedulePool.h b/src/Core/BackgroundSchedulePool.h
index 0fb70b1f715..e97b02e976f 100644
--- a/src/Core/BackgroundSchedulePool.h
+++ b/src/Core/BackgroundSchedulePool.h
@@ -14,7 +14,7 @@
 #include <Common/ZooKeeper/Types.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/CurrentThread.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <base/scope_guard.h>
 
 
@@ -54,7 +54,7 @@ public:
     void increaseThreadsCount(size_t new_threads_count);
 
     /// thread_name_ cannot be longer then 13 bytes (2 bytes is reserved for "/D" suffix for delayExecutionThreadFunction())
-    BackgroundSchedulePool(size_t size_, CurrentMetrics::Metric tasks_metric_, const char *thread_name_);
+    BackgroundSchedulePool(size_t size_, CurrentMetrics::Metric tasks_metric_, CurrentMetrics::Metric size_metric_, const char *thread_name_);
     ~BackgroundSchedulePool();
 
 private:
@@ -86,11 +86,12 @@ private:
     std::condition_variable delayed_tasks_cond_var;
     std::mutex delayed_tasks_mutex;
     /// Thread waiting for next delayed task.
-    ThreadFromGlobalPoolNoTracingContextPropagation delayed_thread;
+    std::unique_ptr<ThreadFromGlobalPoolNoTracingContextPropagation> delayed_thread;
     /// Tasks ordered by scheduled time.
     DelayedTasks delayed_tasks;
 
     CurrentMetrics::Metric tasks_metric;
+    CurrentMetrics::Increment size_metric;
     std::string thread_name;
 };
 
diff --git a/src/Core/BaseSettings.h b/src/Core/BaseSettings.h
index 521422b780e..a14cec9cc7d 100644
--- a/src/Core/BaseSettings.h
+++ b/src/Core/BaseSettings.h
@@ -501,9 +501,11 @@ void BaseSettings<TTraits>::read(ReadBuffer & in, SettingsWriteFormat format)
     const auto & accessor = Traits::Accessor::instance();
     while (true)
     {
-        String name = BaseSettingsHelpers::readString(in);
-        if (name.empty() /* empty string is a marker of the end of settings */)
+        String read_name = BaseSettingsHelpers::readString(in);
+        if (read_name.empty() /* empty string is a marker of the end of settings */)
             break;
+
+        std::string_view name = TTraits::resolveName(read_name);
         size_t index = accessor.find(name);
 
         using Flags = BaseSettingsHelpers::Flags;
diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index 456f1d5d95e..a3bd29faab1 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -663,12 +663,10 @@ Names Block::getDataTypeNames() const
 
 Block::NameMap Block::getNamesToIndexesMap() const
 {
-    NameMap res;
-    res.reserve(index_by_name.size());
-
+    NameMap res(index_by_name.size());
+    res.set_empty_key(StringRef{});
     for (const auto & [name, index] : index_by_name)
         res[name] = index;
-
     return res;
 }
 
diff --git a/src/Core/Block.h b/src/Core/Block.h
index eb9d57ea6f8..7eed48d3d9f 100644
--- a/src/Core/Block.h
+++ b/src/Core/Block.h
@@ -5,13 +5,11 @@
 #include <Core/ColumnsWithTypeAndName.h>
 #include <Core/NamesAndTypes.h>
 
-#include <Common/HashTable/HashMap.h>
-
 #include <initializer_list>
 #include <list>
-#include <map>
 #include <set>
 #include <vector>
+#include <sparsehash/dense_hash_map>
 
 
 namespace DB
@@ -97,7 +95,7 @@ public:
     Names getDataTypeNames() const;
 
     /// Hash table match `column name -> position in the block`.
-    using NameMap = HashMap<StringRef, size_t, StringRefHash>;
+    using NameMap = ::google::dense_hash_map<StringRef, size_t, StringRefHash>;
     NameMap getNamesToIndexesMap() const;
 
     Serializations getSerializations() const;
diff --git a/src/Core/ColumnWithTypeAndName.h b/src/Core/ColumnWithTypeAndName.h
index 592ad39d55a..15807066e62 100644
--- a/src/Core/ColumnWithTypeAndName.h
+++ b/src/Core/ColumnWithTypeAndName.h
@@ -14,8 +14,6 @@ class WriteBuffer;
   * Column data could be nullptr - to represent just 'header' of column.
   * Name could be either name from a table or some temporary generated name during expression evaluation.
   */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnull-dereference"
 struct ColumnWithTypeAndName
 {
     ColumnPtr column;
@@ -37,6 +35,5 @@ struct ColumnWithTypeAndName
     void dumpStructure(WriteBuffer & out) const;
     String dumpStructure() const;
 };
-#pragma GCC diagnostic pop
 
 }
diff --git a/src/Core/Defines.h b/src/Core/Defines.h
index 3fae123fb6b..e9b84b71cae 100644
--- a/src/Core/Defines.h
+++ b/src/Core/Defines.h
@@ -29,11 +29,6 @@
 #define DEFAULT_INSERT_BLOCK_SIZE \
     1048449 /// 1048576 - PADDING_FOR_SIMD - (PADDING_FOR_SIMD - 1) bytes padding that we usually have in arrays
 
-/** The same, but for merge operations. Less DEFAULT_BLOCK_SIZE for saving RAM (since all the columns are read).
-  * Significantly less, since there are 10-way mergers.
-  */
-#define DEFAULT_MERGE_BLOCK_SIZE 8192
-
 #define DEFAULT_PERIODIC_LIVE_VIEW_REFRESH_SEC 60
 #define SHOW_CHARS_ON_SYNTAX_ERROR ptrdiff_t(160)
 #define DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES 3
@@ -83,4 +78,3 @@
 #else
 #define QUERY_PROFILER_DEFAULT_SAMPLE_RATE_NS 0
 #endif
-
diff --git a/src/Core/ExternalTable.cpp b/src/Core/ExternalTable.cpp
index 217f8808185..0f880ed967f 100644
--- a/src/Core/ExternalTable.cpp
+++ b/src/Core/ExternalTable.cpp
@@ -19,6 +19,7 @@
 #include <Core/ExternalTable.h>
 #include <Poco/Net/MessageHeader.h>
 #include <base/find_symbols.h>
+#include <base/scope_guard.h>
 
 
 namespace DB
@@ -34,7 +35,7 @@ ExternalTableDataPtr BaseExternalTable::getData(ContextPtr context)
 {
     initReadBuffer();
     initSampleBlock();
-    auto input = context->getInputFormat(format, *read_buffer, sample_block, DEFAULT_BLOCK_SIZE);
+    auto input = context->getInputFormat(format, *read_buffer, sample_block, context->getSettingsRef().get("max_block_size").get<UInt64>());
 
     auto data = std::make_unique<ExternalTableData>();
     data->pipe = std::make_unique<QueryPipelineBuilder>();
@@ -135,7 +136,9 @@ void ExternalTablesHandler::handlePart(const Poco::Net::MessageHeader & header,
     if (settings.http_max_multipart_form_data_size)
         read_buffer = std::make_unique<LimitReadBuffer>(
             stream, settings.http_max_multipart_form_data_size,
-            true, "the maximum size of multipart/form-data. This limit can be tuned by 'http_max_multipart_form_data_size' setting");
+            /* trow_exception */ true, /* exact_limit */ std::optional<size_t>(),
+            "the maximum size of multipart/form-data. "
+            "This limit can be tuned by 'http_max_multipart_form_data_size' setting");
     else
         read_buffer = wrapReadBufferReference(stream);
 
diff --git a/src/Core/Field.h b/src/Core/Field.h
index 2e772a64afc..ef1bd9a895d 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -1019,7 +1019,7 @@ struct fmt::formatter<DB::Field>
 
         /// Only support {}.
         if (it != end && *it != '}')
-            throw format_error("Invalid format");
+            throw fmt::format_error("Invalid format");
 
         return it;
     }
@@ -1027,6 +1027,6 @@ struct fmt::formatter<DB::Field>
     template <typename FormatContext>
     auto format(const DB::Field & x, FormatContext & ctx)
     {
-        return format_to(ctx.out(), "{}", toString(x));
+        return fmt::format_to(ctx.out(), "{}", toString(x));
     }
 };
diff --git a/src/Core/MySQL/Authentication.cpp b/src/Core/MySQL/Authentication.cpp
index d43568178b0..2c10bd88722 100644
--- a/src/Core/MySQL/Authentication.cpp
+++ b/src/Core/MySQL/Authentication.cpp
@@ -31,7 +31,7 @@ namespace Authentication
 static const size_t SCRAMBLE_LENGTH = 20;
 
 /** Generate a random string using ASCII characters but avoid separator character,
-  * produce pseudo random numbers between with about 7 bit worth of entropty between 1-127.
+  * produce pseudo random numbers between with about 7 bit worth of entropy between 1-127.
   * https://github.com/mysql/mysql-server/blob/8.0/mysys/crypt_genhash_impl.cc#L427
   */
 static String generateScramble()
@@ -147,10 +147,7 @@ void Sha256Password::authenticate(
             throw Exception(ErrorCodes::OPENSSL_ERROR, "Failed to write public key to memory. Error: {}", getOpenSSLErrors());
         }
         char * pem_buf = nullptr;
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wold-style-cast"
         int64_t pem_size = BIO_get_mem_data(mem, &pem_buf);
-#    pragma GCC diagnostic pop
         String pem(pem_buf, pem_size);
 
         LOG_TRACE(log, "Key: {}", pem);
diff --git a/src/Core/MySQL/IMySQLReadPacket.cpp b/src/Core/MySQL/IMySQLReadPacket.cpp
index 74f309d0294..39b2e5bbfb5 100644
--- a/src/Core/MySQL/IMySQLReadPacket.cpp
+++ b/src/Core/MySQL/IMySQLReadPacket.cpp
@@ -33,13 +33,13 @@ void IMySQLReadPacket::readPayloadWithUnpacked(ReadBuffer & in)
 
 void LimitedReadPacket::readPayload(ReadBuffer &in, uint8_t &sequence_id)
 {
-    LimitReadBuffer limited(in, 10000, true, "too long MySQL packet.");
+    LimitReadBuffer limited(in, 10000, /* trow_exception */ true, /* exact_limit */ {}, "too long MySQL packet.");
     IMySQLReadPacket::readPayload(limited, sequence_id);
 }
 
 void LimitedReadPacket::readPayloadWithUnpacked(ReadBuffer & in)
 {
-    LimitReadBuffer limited(in, 10000, true, "too long MySQL packet.");
+    LimitReadBuffer limited(in, 10000, /* trow_exception */ true, /* exact_limit */ {}, "too long MySQL packet.");
     IMySQLReadPacket::readPayloadWithUnpacked(limited);
 }
 
diff --git a/src/Core/NamesAndTypes.cpp b/src/Core/NamesAndTypes.cpp
index 72768ce23fb..b8e9525c3b5 100644
--- a/src/Core/NamesAndTypes.cpp
+++ b/src/Core/NamesAndTypes.cpp
@@ -159,6 +159,18 @@ DataTypes NamesAndTypesList::getTypes() const
     return res;
 }
 
+void NamesAndTypesList::filterColumns(const NameSet & names)
+{
+    for (auto it = begin(); it != end();)
+    {
+        const auto & column = *it;
+        if (names.contains(column.name))
+            ++it;
+        else
+            it = erase(it);
+    }
+}
+
 NamesAndTypesList NamesAndTypesList::filter(const NameSet & names) const
 {
     NamesAndTypesList res;
diff --git a/src/Core/NamesAndTypes.h b/src/Core/NamesAndTypes.h
index 78535a751c3..466f5f37122 100644
--- a/src/Core/NamesAndTypes.h
+++ b/src/Core/NamesAndTypes.h
@@ -83,7 +83,6 @@ public:
     template <typename Iterator>
     NamesAndTypesList(Iterator begin, Iterator end) : std::list<NameAndTypePair>(begin, end) {}
 
-
     void readText(ReadBuffer & buf);
     void writeText(WriteBuffer & buf) const;
 
@@ -103,6 +102,9 @@ public:
     Names getNames() const;
     DataTypes getTypes() const;
 
+    /// Remove columns which names are not in the `names`.
+    void filterColumns(const NameSet & names);
+
     /// Leave only the columns whose names are in the `names`. In `names` there can be superfluous columns.
     NamesAndTypesList filter(const NameSet & names) const;
 
diff --git a/src/Core/PostgreSQL/PoolWithFailover.cpp b/src/Core/PostgreSQL/PoolWithFailover.cpp
index 22cd88c0764..3655681c515 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.cpp
+++ b/src/Core/PostgreSQL/PoolWithFailover.cpp
@@ -6,6 +6,7 @@
 #include <Common/parseRemoteDescription.h>
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
+#include <Common/logger_useful.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 
diff --git a/src/Core/PostgreSQL/PoolWithFailover.h b/src/Core/PostgreSQL/PoolWithFailover.h
index afef2933d29..bf9c34e6723 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.h
+++ b/src/Core/PostgreSQL/PoolWithFailover.h
@@ -8,7 +8,6 @@
 #include "ConnectionHolder.h"
 #include <mutex>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Common/logger_useful.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/StoragePostgreSQL.h>
 
diff --git a/src/Core/PostgreSQLProtocol.cpp b/src/Core/PostgreSQLProtocol.cpp
index 553d195605a..5a96ed7a500 100644
--- a/src/Core/PostgreSQLProtocol.cpp
+++ b/src/Core/PostgreSQLProtocol.cpp
@@ -37,6 +37,7 @@ ColumnTypeSpec convertTypeIndexToPostgresColumnTypeSpec(TypeIndex type_index)
         case TypeIndex::Decimal32:
         case TypeIndex::Decimal64:
         case TypeIndex::Decimal128:
+        case TypeIndex::Decimal256:
             return {ColumnType::NUMERIC, -1};
 
         case TypeIndex::UUID:
diff --git a/src/Core/ProtocolDefines.h b/src/Core/ProtocolDefines.h
index 3bbfb95f020..ff9b1fae442 100644
--- a/src/Core/ProtocolDefines.h
+++ b/src/Core/ProtocolDefines.h
@@ -30,12 +30,11 @@
 
 #define DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION 1
 
-#define DBMS_PARALLEL_REPLICAS_PROTOCOL_VERSION 1
+#define DBMS_PARALLEL_REPLICAS_PROTOCOL_VERSION 2
 #define DBMS_MIN_REVISION_WITH_PARALLEL_REPLICAS 54453
 
 #define DBMS_MERGE_TREE_PART_INFO_VERSION 1
 
-/// Minimum revision supporting interserver secret.
 #define DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET 54441
 
 #define DBMS_MIN_REVISION_WITH_X_FORWARDED_FOR_IN_CLIENT_INFO 54443
@@ -54,7 +53,7 @@
 /// NOTE: DBMS_TCP_PROTOCOL_VERSION has nothing common with VERSION_REVISION,
 /// later is just a number for server version (one number instead of commit SHA)
 /// for simplicity (sometimes it may be more convenient in some use cases).
-#define DBMS_TCP_PROTOCOL_VERSION 54461
+#define DBMS_TCP_PROTOCOL_VERSION 54462
 
 #define DBMS_MIN_PROTOCOL_VERSION_WITH_INITIAL_QUERY_START_TIME 54449
 
@@ -72,3 +71,5 @@
 #define DBMS_MIN_PROTOCOL_VERSION_WITH_SERVER_QUERY_TIME_IN_PROGRESS 54460
 
 #define DBMS_MIN_PROTOCOL_VERSION_WITH_PASSWORD_COMPLEXITY_RULES 54461
+
+#define DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2 54462
diff --git a/src/Core/ServerSettings.cpp b/src/Core/ServerSettings.cpp
index c50a67b04c9..2b4ee6485bc 100644
--- a/src/Core/ServerSettings.cpp
+++ b/src/Core/ServerSettings.cpp
@@ -8,11 +8,30 @@ IMPLEMENT_SETTINGS_TRAITS(ServerSettingsTraits, SERVER_SETTINGS)
 
 void ServerSettings::loadSettingsFromConfig(const Poco::Util::AbstractConfiguration & config)
 {
+    // settings which can be loaded from the the default profile, see also MAKE_DEPRECATED_BY_SERVER_CONFIG in src/Core/Settings.h
+    std::unordered_set<std::string> settings_from_profile_allowlist = {
+        "background_pool_size",
+        "background_merges_mutations_concurrency_ratio",
+        "background_merges_mutations_scheduling_policy",
+        "background_move_pool_size",
+        "background_fetches_pool_size",
+        "background_common_pool_size",
+        "background_buffer_flush_schedule_pool_size",
+        "background_schedule_pool_size",
+        "background_message_broker_schedule_pool_size",
+        "background_distributed_schedule_pool_size",
+
+        "max_remote_read_network_bandwidth_for_server",
+        "max_remote_write_network_bandwidth_for_server",
+    };
+
     for (auto setting : all())
     {
         const auto & name = setting.getName();
         if (config.has(name))
             set(name, config.getString(name));
+        else if (settings_from_profile_allowlist.contains(name) && config.has("profiles.default." + name))
+            set(name, config.getString("profiles.default." + name));
     }
 }
 
diff --git a/src/Core/ServerSettings.h b/src/Core/ServerSettings.h
index 1e884266c17..511b8d68f6d 100644
--- a/src/Core/ServerSettings.h
+++ b/src/Core/ServerSettings.h
@@ -21,16 +21,31 @@ namespace DB
     M(UInt64, max_io_thread_pool_size, 100, "The maximum number of threads that would be used for IO operations", 0) \
     M(UInt64, max_io_thread_pool_free_size, 0, "Max free size for IO thread pool.", 0) \
     M(UInt64, io_thread_pool_queue_size, 10000, "Queue size for IO thread pool.", 0) \
+    M(UInt64, max_outdated_parts_loading_thread_pool_size, 32, "The maximum number of threads that would be used for loading outdated data parts on startup", 0) \
+    M(UInt64, outdated_part_loading_thread_pool_queue_size, 10000, "Queue size for parts loading thread pool.", 0) \
+    M(UInt64, max_replicated_fetches_network_bandwidth_for_server, 0, "The maximum speed of data exchange over the network in bytes per second for replicated fetches. Zero means unlimited.", 0) \
+    M(UInt64, max_replicated_sends_network_bandwidth_for_server, 0, "The maximum speed of data exchange over the network in bytes per second for replicated sends. Zero means unlimited.", 0) \
+    M(UInt64, max_remote_read_network_bandwidth_for_server, 0, "The maximum speed of data exchange over the network in bytes per second for read. Zero means unlimited.", 0) \
+    M(UInt64, max_remote_write_network_bandwidth_for_server, 0, "The maximum speed of data exchange over the network in bytes per second for write. Zero means unlimited.", 0) \
+    M(UInt64, max_local_read_bandwidth_for_server, 0, "The maximum speed of local reads in bytes per second. Zero means unlimited.", 0) \
+    M(UInt64, max_local_write_bandwidth_for_server, 0, "The maximum speed of local writes in bytes per second. Zero means unlimited.", 0) \
+    M(UInt64, max_backups_io_thread_pool_size, 1000, "The maximum number of threads that would be used for IO operations for BACKUP queries", 0) \
+    M(UInt64, max_backups_io_thread_pool_free_size, 0, "Max free size for backups IO thread pool.", 0) \
+    M(UInt64, backups_io_thread_pool_queue_size, 0, "Queue size for backups IO thread pool.", 0) \
+    M(UInt64, backup_threads, 16, "The maximum number of threads to execute BACKUP requests.", 0) \
+    M(UInt64, max_backup_bandwidth_for_server, 0, "The maximum read speed in bytes per second for all backups on server. Zero means unlimited.", 0) \
+    M(UInt64, restore_threads, 16, "The maximum number of threads to execute RESTORE requests.", 0) \
     M(Int32, max_connections, 1024, "Max server connections.", 0) \
     M(UInt32, asynchronous_metrics_update_period_s, 1, "Period in seconds for updating asynchronous metrics.", 0) \
     M(UInt32, asynchronous_heavy_metrics_update_period_s, 120, "Period in seconds for updating asynchronous metrics.", 0) \
-    M(UInt32, max_threads_for_connection_collector, 10, "The maximum number of threads that will be used for draining connections asynchronously in a background upon finishing executing distributed queries.", 0) \
     M(String, default_database, "default", "Default database name.", 0) \
     M(String, tmp_policy, "", "Policy for storage with temporary data.", 0) \
     M(UInt64, max_temporary_data_on_disk_size, 0, "The maximum amount of storage that could be used for external aggregation, joins or sorting., ", 0) \
     M(String, temporary_data_in_cache, "", "Cache disk name for temporary data.", 0) \
     M(UInt64, max_server_memory_usage, 0, "Limit on total memory usage. Zero means Unlimited.", 0) \
     M(Double, max_server_memory_usage_to_ram_ratio, 0.9, "Same as max_server_memory_usage but in to ram ratio. Allows to lower max memory on low-memory systems.", 0) \
+    M(UInt64, merges_mutations_memory_usage_soft_limit, 0, "Limit on total memory usage for merges and mutations. Zero means Unlimited.", 0) \
+    M(Double, merges_mutations_memory_usage_to_ram_ratio, 0.5, "Same as merges_mutations_memory_usage_soft_limit but in to ram ratio. Allows to lower memory limit on low-memory systems.", 0) \
     M(Bool, allow_use_jemalloc_memory, true, "Allows to use jemalloc memory.", 0) \
     \
     M(UInt64, max_concurrent_queries, 0, "Limit on total number of concurrently executed queries. Zero means Unlimited.", 0) \
@@ -48,7 +63,7 @@ namespace DB
     \
     M(Bool, disable_internal_dns_cache, false, "Disable internal DNS caching at all.", 0) \
     M(Int32, dns_cache_update_period, 15, "Internal DNS cache update period in seconds.", 0) \
-    M(UInt32, dns_max_consecutive_failures, 1024, "Max server connections.", 0) \
+    M(UInt32, dns_max_consecutive_failures, 1024, "Max DNS resolve failures of a hostname before dropping the hostname from ClickHouse DNS cache.", 0) \
     \
     M(UInt64, max_table_size_to_drop, 50000000000lu, "If size of a table is greater than this value (in bytes) than table could not be dropped with any DROP query.", 0) \
     M(UInt64, max_partition_size_to_drop, 50000000000lu, "Same as max_table_size_to_drop, but for the partitions.", 0) \
@@ -56,15 +71,16 @@ namespace DB
     M(UInt64, concurrent_threads_soft_limit_ratio_to_cores, 0, "Same as concurrent_threads_soft_limit_num, but with ratio to cores.", 0) \
     \
     M(UInt64, background_pool_size, 16, "The maximum number of threads what will be used for merging or mutating data parts for *MergeTree-engine tables in a background.", 0) \
-    M(UInt64, background_merges_mutations_concurrency_ratio, 2, "The multiplier which shows the relation between the number of tasks that could be executed concurrently and the number of threads being used.", 0) \
+    M(Float, background_merges_mutations_concurrency_ratio, 2, "The number of part mutation tasks that can be executed concurrently by each thread in background pool.", 0) \
     M(String, background_merges_mutations_scheduling_policy, "round_robin", "The policy on how to perform a scheduling for background merges and mutations. Possible values are: `round_robin` and `shortest_task_first`. ", 0) \
     M(UInt64, background_move_pool_size, 8, "The maximum number of threads that will be used for moving data parts to another disk or volume for *MergeTree-engine tables in a background.", 0) \
     M(UInt64, background_fetches_pool_size, 8, "The maximum number of threads that will be used for fetching data parts from another replica for *MergeTree-engine tables in a background.", 0) \
     M(UInt64, background_common_pool_size, 8, "The maximum number of threads that will be used for performing a variety of operations (mostly garbage collection) for *MergeTree-engine tables in a background.", 0) \
     M(UInt64, background_buffer_flush_schedule_pool_size, 16, "The maximum number of threads that will be used for performing flush operations for Buffer-engine tables in a background.", 0) \
-    M(UInt64, background_schedule_pool_size, 16, "The maximum number of threads that will be used for constantly executing some lightweight periodic operations.", 0) \
+    M(UInt64, background_schedule_pool_size, 128, "The maximum number of threads that will be used for constantly executing some lightweight periodic operations.", 0) \
     M(UInt64, background_message_broker_schedule_pool_size, 16, "The maximum number of threads that will be used for executing background operations for message streaming.", 0) \
     M(UInt64, background_distributed_schedule_pool_size, 16, "The maximum number of threads that will be used for executing distributed sends.", 0) \
+    M(Bool, display_secrets_in_show_and_select, false, "Allow showing secrets in SHOW and SELECT queries via a format setting and a grant", 0)
 
 
 DECLARE_SETTINGS_TRAITS(ServerSettingsTraits, SERVER_SETTINGS)
@@ -75,4 +91,3 @@ struct ServerSettings : public BaseSettings<ServerSettingsTraits>
 };
 
 }
-
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index a65f2ccb60f..607be1522db 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -19,7 +19,7 @@ class IColumn;
 
 /** List of settings: type, name, default value, description, flags
   *
-  * This looks rather unconvenient. It is done that way to avoid repeating settings in different places.
+  * This looks rather inconvenient. It is done that way to avoid repeating settings in different places.
   * Note: as an alternative, we could implement settings to be completely dynamic in form of map: String -> Field,
   *  but we are not going to do it, because settings is used everywhere as static struct fields.
   *
@@ -44,22 +44,23 @@ class IColumn;
     M(UInt64, max_joined_block_size_rows, DEFAULT_BLOCK_SIZE, "Maximum block size for JOIN result (if join algorithm supports it). 0 means unlimited.", 0) \
     M(UInt64, max_insert_threads, 0, "The maximum number of threads to execute the INSERT SELECT query. Values 0 or 1 means that INSERT SELECT is not run in parallel. Higher values will lead to higher memory usage. Parallel INSERT SELECT has effect only if the SELECT part is run on parallel, see 'max_threads' setting.", 0) \
     M(UInt64, max_insert_delayed_streams_for_parallel_write, 0, "The maximum number of streams (columns) to delay final part flush. Default - auto (1000 in case of underlying storage supports parallel write, for example S3 and disabled otherwise)", 0) \
-    M(UInt64, max_final_threads, 16, "The maximum number of threads to read from table with FINAL.", 0) \
+    M(MaxThreads, max_final_threads, 0, "The maximum number of threads to read from table with FINAL.", 0) \
     M(MaxThreads, max_threads, 0, "The maximum number of threads to execute the request. By default, it is determined automatically.", 0) \
     M(MaxThreads, max_download_threads, 4, "The maximum number of threads to download data (e.g. for URL engine).", 0) \
     M(UInt64, max_download_buffer_size, 10*1024*1024, "The maximal size of buffer for parallel downloading (e.g. for URL engine) per each thread.", 0) \
     M(UInt64, max_read_buffer_size, DBMS_DEFAULT_BUFFER_SIZE, "The maximum size of the buffer to read from the filesystem.", 0) \
+    M(UInt64, max_read_buffer_size_local_fs, 128*1024, "The maximum size of the buffer to read from local filesystem. If set to 0 then max_read_buffer_size will be used.", 0) \
+    M(UInt64, max_read_buffer_size_remote_fs, 0, "The maximum size of the buffer to read from remote filesystem. If set to 0 then max_read_buffer_size will be used.", 0) \
     M(UInt64, max_distributed_connections, 1024, "The maximum number of connections for distributed processing of one query (should be greater than max_threads).", 0) \
-    M(UInt64, max_query_size, DBMS_DEFAULT_MAX_QUERY_SIZE, "Which part of the query can be read into RAM for parsing (the remaining data for INSERT, if any, is read later)", 0) \
+    M(UInt64, max_query_size, DBMS_DEFAULT_MAX_QUERY_SIZE, "The maximum number of bytes of a query string parsed by the SQL parser. Data in the VALUES clause of INSERT queries is processed by a separate stream parser (that consumes O(1) RAM) and not affected by this restriction.", 0) \
     M(UInt64, interactive_delay, 100000, "The interval in microseconds to check if the request is cancelled, and to send progress info.", 0) \
     M(Seconds, connect_timeout, DBMS_DEFAULT_CONNECT_TIMEOUT_SEC, "Connection timeout if there are no replicas.", 0) \
-    M(Milliseconds, connect_timeout_with_failover_ms, 50, "Connection timeout for selecting first healthy replica.", 0) \
-    M(Milliseconds, connect_timeout_with_failover_secure_ms, 100, "Connection timeout for selecting first healthy replica (for secure connections).", 0) \
+    M(Milliseconds, connect_timeout_with_failover_ms, 1000, "Connection timeout for selecting first healthy replica.", 0) \
+    M(Milliseconds, connect_timeout_with_failover_secure_ms, 1000, "Connection timeout for selecting first healthy replica (for secure connections).", 0) \
     M(Seconds, receive_timeout, DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC, "Timeout for receiving data from network, in seconds. If no bytes were received in this interval, exception is thrown. If you set this setting on client, the 'send_timeout' for the socket will be also set on the corresponding connection end on the server.", 0) \
     M(Seconds, send_timeout, DBMS_DEFAULT_SEND_TIMEOUT_SEC, "Timeout for sending data to network, in seconds. If client needs to sent some data, but it did not able to send any bytes in this interval, exception is thrown. If you set this setting on client, the 'receive_timeout' for the socket will be also set on the corresponding connection end on the server.", 0) \
-    M(Seconds, drain_timeout, 3, "Timeout for draining remote connections, -1 means synchronous drain without ignoring errors", 0) \
     M(Seconds, tcp_keep_alive_timeout, 290 /* less than DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC */, "The time in seconds the connection needs to remain idle before TCP starts sending keepalive probes", 0) \
-    M(Milliseconds, hedged_connection_timeout_ms, 100, "Connection timeout for establishing connection with replica for Hedged requests", 0) \
+    M(Milliseconds, hedged_connection_timeout_ms, 50, "Connection timeout for establishing connection with replica for Hedged requests", 0) \
     M(Milliseconds, receive_data_timeout_ms, 2000, "Connection timeout for receiving first packet of data or packet with positive progress from replica", 0) \
     M(Bool, use_hedged_requests, true, "Use hedged requests for distributed queries", 0) \
     M(Bool, allow_changing_replica_until_first_data_packet, false, "Allow HedgedConnections to change replica until receiving first data packet", 0) \
@@ -72,10 +73,12 @@ class IColumn;
     M(UInt64, idle_connection_timeout, 3600, "Close idle TCP connections after specified number of seconds.", 0) \
     M(UInt64, distributed_connections_pool_size, 1024, "Maximum number of connections with one remote server in the pool.", 0) \
     M(UInt64, connections_with_failover_max_tries, DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES, "The maximum number of attempts to connect to replicas.", 0) \
+    M(UInt64, s3_strict_upload_part_size, 0, "The exact size of part to upload during multipart upload to S3 (some implementations does not supports variable size parts).", 0) \
     M(UInt64, s3_min_upload_part_size, 16*1024*1024, "The minimum size of part to upload during multipart upload to S3.", 0) \
     M(UInt64, s3_max_upload_part_size, 5ull*1024*1024*1024, "The maximum size of part to upload during multipart upload to S3.", 0) \
     M(UInt64, s3_upload_part_size_multiply_factor, 2, "Multiply s3_min_upload_part_size by this factor each time s3_multiply_parts_count_threshold parts were uploaded from a single write to S3.", 0) \
     M(UInt64, s3_upload_part_size_multiply_parts_count_threshold, 500, "Each time this number of parts was uploaded to S3 s3_min_upload_part_size multiplied by s3_upload_part_size_multiply_factor.", 0) \
+    M(UInt64, s3_max_inflight_parts_for_one_file, 20, "The maximum number of a concurrent loaded parts in multipart upload request. 0 means unlimited. You ", 0) \
     M(UInt64, s3_max_single_part_upload_size, 32*1024*1024, "The maximum size of object to upload using singlepart upload to S3.", 0) \
     M(UInt64, s3_max_single_read_retries, 4, "The maximum number of retries during single S3 read.", 0) \
     M(UInt64, s3_max_unexpected_write_error_retries, 4, "The maximum number of retries in case of unexpected errors during S3 write.", 0) \
@@ -91,6 +94,7 @@ class IColumn;
     M(Bool, s3_check_objects_after_upload, false, "Check each uploaded object to s3 with head request to be sure that upload was successful", 0) \
     M(Bool, s3_allow_parallel_part_upload, true, "Use multiple threads for s3 multipart upload. It may lead to slightly higher memory usage", 0) \
     M(Bool, s3_throw_on_zero_files_match, false, "Throw an error, when ListObjects request cannot match any files", 0) \
+    M(UInt64, s3_retry_attempts, 10, "Setting for Aws::Client::RetryStrategy, Aws::Client does retries itself, 0 means no retries", 0) \
     M(Bool, enable_s3_requests_logging, false, "Enable very explicit logging of S3 requests. Makes sense for debug only.", 0) \
     M(UInt64, hdfs_replication, 0, "The actual number of replications can be specified when the hdfs file is created.", 0) \
     M(Bool, hdfs_truncate_on_insert, false, "Enables or disables truncate before insert in s3 engine tables", 0) \
@@ -99,10 +103,10 @@ class IColumn;
     M(Bool, extremes, false, "Calculate minimums and maximums of the result columns. They can be output in JSON-formats.", IMPORTANT) \
     M(Bool, use_uncompressed_cache, false, "Whether to use the cache of uncompressed blocks.", 0) \
     M(Bool, replace_running_query, false, "Whether the running request should be canceled with the same id as the new one.", 0) \
-    M(UInt64, max_replicated_fetches_network_bandwidth_for_server, 0, "The maximum speed of data exchange over the network in bytes per second for replicated fetches. Zero means unlimited. Only has meaning at server startup.", 0) \
-    M(UInt64, max_replicated_sends_network_bandwidth_for_server, 0, "The maximum speed of data exchange over the network in bytes per second for replicated sends. Zero means unlimited. Only has meaning at server startup.", 0) \
-    M(UInt64, max_remote_read_network_bandwidth_for_server, 0, "The maximum speed of data exchange over the network in bytes per second for read. Zero means unlimited. Only has meaning at server startup.", 0) \
-    M(UInt64, max_remote_write_network_bandwidth_for_server, 0, "The maximum speed of data exchange over the network in bytes per second for write. Zero means unlimited. Only has meaning at server startup.", 0) \
+    M(UInt64, max_remote_read_network_bandwidth, 0, "The maximum speed of data exchange over the network in bytes per second for read.", 0) \
+    M(UInt64, max_remote_write_network_bandwidth, 0, "The maximum speed of data exchange over the network in bytes per second for write.", 0) \
+    M(UInt64, max_local_read_bandwidth, 0, "The maximum speed of local reads in bytes per second.", 0) \
+    M(UInt64, max_local_write_bandwidth, 0, "The maximum speed of local writes in bytes per second.", 0) \
     M(Bool, stream_like_engine_allow_direct_select, false, "Allow direct SELECT query for Kafka, RabbitMQ, FileLog, Redis Streams and NATS engines. In case there are attached materialized views, SELECT query is not allowed even if this setting is enabled.", 0) \
     M(String, stream_like_engine_insert_queue, "", "When stream like engine reads from multiple queues, user will need to select one queue to insert into when writing. Used by Redis Streams and NATS.", 0) \
     \
@@ -128,9 +132,10 @@ class IColumn;
     \
     M(Bool, allow_suspicious_low_cardinality_types, false, "In CREATE TABLE statement allows specifying LowCardinality modifier for types of small fixed size (8 or less). Enabling this may increase merge times and memory consumption.", 0) \
     M(Bool, allow_suspicious_fixed_string_types, false, "In CREATE TABLE statement allows creating columns of type FixedString(n) with n > 256. FixedString with length >= 256 is suspicious and most likely indicates misusage", 0) \
+    M(Bool, allow_suspicious_indices, false, "Reject primary/secondary indexes and sorting keys with identical expressions", 0) \
     M(Bool, compile_expressions, true, "Compile some scalar functions and operators to native code.", 0) \
     M(UInt64, min_count_to_compile_expression, 3, "The number of identical expressions before they are JIT-compiled", 0) \
-    M(Bool, compile_aggregate_expressions, true, "Compile aggregate functions to native code.", 0) \
+    M(Bool, compile_aggregate_expressions, false, "Compile aggregate functions to native code. This feature has a bug and should not be used.", 0) \
     M(UInt64, min_count_to_compile_aggregate_expression, 3, "The number of identical aggregate expressions before they are JIT-compiled", 0) \
     M(Bool, compile_sort_description, true, "Compile sort description to native code.", 0) \
     M(UInt64, min_count_to_compile_sort_description, 3, "The number of identical sort descriptions before they are JIT-compiled", 0) \
@@ -147,10 +152,13 @@ class IColumn;
     M(UInt64, max_parallel_replicas, 1, "The maximum number of replicas of each shard used when the query is executed. For consistency (to get different parts of the same partition), this option only works for the specified sampling key. The lag of the replicas is not controlled.", 0) \
     M(UInt64, parallel_replicas_count, 0, "This is internal setting that should not be used directly and represents an implementation detail of the 'parallel replicas' mode. This setting will be automatically set up by the initiator server for distributed queries to the number of parallel replicas participating in query processing.", 0) \
     M(UInt64, parallel_replica_offset, 0, "This is internal setting that should not be used directly and represents an implementation detail of the 'parallel replicas' mode. This setting will be automatically set up by the initiator server for distributed queries to the index of the replica participating in query processing among parallel replicas.", 0) \
+    M(String, parallel_replicas_custom_key, "", "Custom key assigning work to replicas when parallel replicas are used.", 0) \
+    M(ParallelReplicasCustomKeyFilterType, parallel_replicas_custom_key_filter_type, ParallelReplicasCustomKeyFilterType::DEFAULT, "Type of filter to use with custom key for parallel replicas. default - use modulo operation on the custom key, range - use range filter on custom key using all possible values for the value type of custom key.", 0) \
     \
     M(String, cluster_for_parallel_replicas, "default", "Cluster for a shard in which current server is located", 0) \
-    M(Bool, allow_experimental_parallel_reading_from_replicas, false, "If true, ClickHouse will send a SELECT query to all replicas of a table. It will work for any kind on MergeTree table.", 0) \
+    M(UInt64, allow_experimental_parallel_reading_from_replicas, 0, "Use all the replicas from a shard for SELECT query execution. Reading is parallelized and coordinated dynamically. 0 - disabled, 1 - enabled, silently disable them in case of failure, 2 - enabled, throw an exception in case of failure", 0) \
     M(Float, parallel_replicas_single_task_marks_count_multiplier, 2, "A multiplier which will be added during calculation for minimal number of marks to retrieve from coordinator. This will be applied only for remote replicas.", 0) \
+    M(Bool, parallel_replicas_for_non_replicated_merge_tree, false, "If true, ClickHouse will use parallel replicas algorithm also for non-replicated MergeTree tables", 0) \
     \
     M(Bool, skip_unavailable_shards, false, "If true, ClickHouse silently skips unavailable shards and nodes unresolvable through DNS. Shard is marked as unavailable when none of the replicas can be reached.", 0) \
     \
@@ -252,6 +260,8 @@ class IColumn;
     M(Bool, send_progress_in_http_headers, false, "Send progress notifications using X-ClickHouse-Progress headers. Some clients do not support high amount of HTTP headers (Python requests in particular), so it is disabled by default.", 0) \
     \
     M(UInt64, http_headers_progress_interval_ms, 100, "Do not send HTTP headers X-ClickHouse-Progress more frequently than at each specified interval.", 0) \
+    M(Bool, http_wait_end_of_query, false, "Enable HTTP response buffering on the server-side.", 0) \
+    M(UInt64, http_response_buffer_size, false, "The number of bytes to buffer in the server memory before sending a HTTP response to the client or flushing to disk (when http_wait_end_of_query is enabled).", 0) \
     \
     M(Bool, fsync_metadata, true, "Do fsync after changing metadata for tables and databases (.sql files). Could be disabled in case of poor latency on server with high load of DDL queries and high load of disk subsystem.", 0) \
     \
@@ -269,6 +279,8 @@ class IColumn;
     \
     M(UInt64, parts_to_delay_insert, 0, "If the destination table contains at least that many active parts in a single partition, artificially slow down insert into table.", 0) \
     M(UInt64, parts_to_throw_insert, 0, "If more than this number active parts in a single partition of the destination table, throw 'Too many parts ...' exception.", 0) \
+    M(UInt64, number_of_mutations_to_delay, 0, "If the mutated table contains at least that many unfinished mutations, artificially slow down mutations of table. 0 - disabled", 0) \
+    M(UInt64, number_of_mutations_to_throw, 0, "If the mutated table contains at least that many unfinished mutations, throw 'Too many mutations ...' exception. 0 - disabled", 0) \
     M(Bool, insert_distributed_sync, false, "If setting is enabled, insert query into distributed waits until data will be sent to all nodes in cluster.", 0) \
     M(UInt64, insert_distributed_timeout, 0, "Timeout for insert query into distributed. Setting is used only with insert_distributed_sync enabled. Zero value means no timeout.", 0) \
     M(Int64, distributed_ddl_task_timeout, 180, "Timeout for DDL query responses from all hosts in cluster. If a ddl request has not been performed on all hosts, a response will contain a timeout error and a request will be executed in an async mode. Negative value means infinite. Zero means async mode.", 0) \
@@ -277,13 +289,12 @@ class IColumn;
     \
     M(Bool, final, false, "Query with the FINAL modifier by default. If the engine does not support final, it does not have any effect. On queries with multiple tables final is applied only on those that support it. It also works on distributed tables", 0) \
     \
+    M(Bool, partial_result_on_first_cancel, false, "Allows query to return a partial result after cancel.", 0) \
     /** Settings for testing hedged requests */ \
     M(Milliseconds, sleep_in_send_tables_status_ms, 0, "Time to sleep in sending tables status response in TCPHandler", 0) \
     M(Milliseconds, sleep_in_send_data_ms, 0, "Time to sleep in sending data in TCPHandler", 0) \
     M(Milliseconds, sleep_after_receiving_query_ms, 0, "Time to sleep after receiving query in TCPHandler", 0) \
     M(UInt64, unknown_packet_in_send_data, 0, "Send unknown packet instead of data Nth data packet", 0) \
-    /** Settings for testing connection collector */ \
-    M(Milliseconds, sleep_in_receive_cancel_ms, 0, "Time to sleep in receiving cancel in TCPHandler", 0) \
     \
     M(Bool, insert_allow_materialized_columns, false, "If setting is enabled, Allow materialized columns in INSERT.", 0) \
     M(Seconds, http_connection_timeout, DEFAULT_HTTP_READ_BUFFER_CONNECTION_TIMEOUT, "HTTP connection timeout.", 0) \
@@ -297,6 +308,7 @@ class IColumn;
     M(Bool, http_skip_not_found_url_for_globs, true, "Skip url's for globs with HTTP_NOT_FOUND error", 0) \
     M(Bool, optimize_throw_if_noop, false, "If setting is enabled and OPTIMIZE query didn't actually assign a merge then an explanatory exception is thrown", 0) \
     M(Bool, use_index_for_in_with_subqueries, true, "Try using an index if there is a subquery or a table expression on the right side of the IN operator.", 0) \
+    M(UInt64, use_index_for_in_with_subqueries_max_values, 0, "The maximum size of set in the right hand side of the IN operator to use table index for filtering. It allows to avoid performance degradation and higher memory usage due to preparation of additional data structures for large queries. Zero means no limit.", 0) \
     M(Bool, joined_subquery_requires_alias, true, "Force joined subqueries and table functions to have aliases for correct name qualification.", 0) \
     M(Bool, empty_result_for_aggregation_by_empty_set, false, "Return empty result when aggregating without keys on empty set.", 0) \
     M(Bool, empty_result_for_aggregation_by_constant_keys_on_empty_set, true, "Return empty result when aggregating by constant keys on empty set.", 0) \
@@ -412,8 +424,14 @@ class IColumn;
     M(UInt64, max_temporary_data_on_disk_size_for_user, 0, "The maximum amount of data consumed by temporary files on disk in bytes for all concurrently running user queries. Zero means unlimited.", 0)\
     M(UInt64, max_temporary_data_on_disk_size_for_query, 0, "The maximum amount of data consumed by temporary files on disk in bytes for all concurrently running queries. Zero means unlimited.", 0)\
     \
-    M(UInt64, backup_threads, 16, "The maximum number of threads to execute BACKUP requests.", 0) \
-    M(UInt64, restore_threads, 16, "The maximum number of threads to execute RESTORE requests.", 0) \
+    M(UInt64, backup_restore_keeper_max_retries, 20, "Max retries for keeper operations during backup or restore", 0) \
+    M(UInt64, backup_restore_keeper_retry_initial_backoff_ms, 100, "Initial backoff timeout for [Zoo]Keeper operations during backup or restore", 0) \
+    M(UInt64, backup_restore_keeper_retry_max_backoff_ms, 5000, "Max backoff timeout for [Zoo]Keeper operations during backup or restore", 0) \
+    M(Float,  backup_restore_keeper_fault_injection_probability, 0.0f, "Approximate probability of failure for a keeper request during backup or restore. Valid value is in interval [0.0f, 1.0f]", 0) \
+    M(UInt64, backup_restore_keeper_fault_injection_seed, 0, "0 - random seed, otherwise the setting value", 0) \
+    M(UInt64, backup_restore_keeper_value_max_size, 1048576, "Maximum size of data of a [Zoo]Keeper's node during backup", 0) \
+    M(UInt64, backup_restore_batch_size_for_keeper_multiread, 10000, "Maximum size of batch for multiread request to [Zoo]Keeper during backup or restore", 0) \
+    M(UInt64, max_backup_bandwidth, 0, "The maximum read speed in bytes per second for particular backup on server. Zero means unlimited.", 0) \
     \
     M(Bool, log_profile_events, true, "Log query performance statistics into the query_log, query_thread_log and query_views_log.", 0) \
     M(Bool, log_query_settings, true, "Log query settings into the query_log.", 0) \
@@ -456,6 +474,8 @@ class IColumn;
     M(Bool, allow_introspection_functions, false, "Allow functions for introspection of ELF and DWARF for query profiling. These functions are slow and may impose security considerations.", 0) \
     \
     M(Bool, allow_execute_multiif_columnar, true, "Allow execute multiIf function columnar", 0) \
+    M(Bool, formatdatetime_f_prints_single_zero, false, "Formatter '%f' in function 'formatDateTime()' produces a single zero instead of six zeros if the formatted value has no fractional seconds.", 0) \
+    M(Bool, formatdatetime_parsedatetime_m_is_month_name, true, "Formatter '%M' in functions 'formatDateTime()' and 'parseDateTime()' produces the month name instead of minutes.", 0) \
     \
     M(UInt64, max_partitions_per_insert_block, 100, "Limit maximum number of partitions in single INSERTed block. Zero means unlimited. Throw exception if the block contains too many partitions. This setting is a safety threshold, because using large number of partitions is a common misconception.", 0) \
     M(Int64, max_partitions_to_read, -1, "Limit the max number of partitions that can be accessed in one query. <= 0 means unlimited.", 0) \
@@ -510,6 +530,7 @@ class IColumn;
     M(Bool, allow_experimental_alter_materialized_view_structure, false, "Allow atomic alter on Materialized views. Work in progress.", 0) \
     M(Bool, enable_early_constant_folding, true, "Enable query optimization where we analyze function and subqueries results and rewrite query if there're constants there", 0) \
     M(Bool, deduplicate_blocks_in_dependent_materialized_views, false, "Should deduplicate blocks for materialized views if the block is not a duplicate for the table. Use true to always deduplicate in dependent tables.", 0) \
+    M(Bool, materialized_views_ignore_errors, false, "Allows to ignore errors for MATERIALIZED VIEW, and deliver original block to the table regardless of MVs", 0) \
     M(Bool, use_compact_format_in_distributed_parts_names, true, "Changes format of directories names for distributed table insert parts.", 0) \
     M(Bool, validate_polygons, true, "Throw exception if polygon is invalid in function pointInPolygon (e.g. self-tangent, self-intersecting). If the setting is false, the function will accept invalid polygons but may silently return wrong result.", 0) \
     M(UInt64, max_parser_depth, DBMS_DEFAULT_MAX_PARSER_DEPTH, "Maximum parser depth (recursion depth of recursive descend parser).", 0) \
@@ -520,7 +541,6 @@ class IColumn;
     M(Seconds, lock_acquire_timeout, DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC, "How long locking request should wait before failing", 0) \
     M(Bool, materialize_ttl_after_modify, true, "Apply TTL for old data, after ALTER MODIFY TTL query", 0) \
     M(String, function_implementation, "", "Choose function implementation for specific target or variant (experimental). If empty enable all of them.", 0) \
-    M(Bool, allow_experimental_geo_types, true, "Allow geo data types such as Point, Ring, Polygon, MultiPolygon", 0) \
     M(Bool, data_type_default_nullable, false, "Data types without NULL or NOT NULL will make Nullable", 0) \
     M(Bool, cast_keep_nullable, false, "CAST operator keep Nullable for result data type", 0) \
     M(Bool, cast_ipv4_ipv6_default_on_conversion_error, false, "CAST operator into IPv4, CAST operator into IPV6 type, toIPv4, toIPv6 functions will return default value instead of throwing exception on conversion error.", 0) \
@@ -539,8 +559,10 @@ class IColumn;
     M(Bool, asterisk_include_alias_columns, false, "Include ALIAS columns for wildcard query", 0) \
     M(Bool, optimize_skip_merged_partitions, false, "Skip partitions with one part with level > 0 in optimize final", 0) \
     M(Bool, optimize_on_insert, true, "Do the same transformation for inserted block of data as if merge was done on this block.", 0) \
+    M(Bool, optimize_use_projections, true, "Automatically choose projections to perform SELECT query", 0) \
     M(Bool, force_optimize_projection, false, "If projection optimization is enabled, SELECT queries need to use projection", 0) \
     M(Bool, async_socket_for_remote, true, "Asynchronously read from socket executing remote query", 0) \
+    M(Bool, async_query_sending_for_remote, true, "Asynchronously create connections and send query to shards in remote query", 0) \
     M(Bool, insert_null_as_default, true, "Insert DEFAULT values instead of NULL in INSERT SELECT (UNION ALL)", 0) \
     M(Bool, describe_extend_object_types, false, "Deduce concrete type of columns of type Object in DESCRIBE query", 0) \
     M(Bool, describe_include_subcolumns, false, "If true, subcolumns of all table columns will be included into result of DESCRIBE query", 0) \
@@ -549,10 +571,15 @@ class IColumn;
     M(Bool, enable_writes_to_query_cache, true, "Enable storing results of SELECT queries in the query cache", 0) \
     M(Bool, enable_reads_from_query_cache, true, "Enable reading results of SELECT queries from the query cache", 0) \
     M(Bool, query_cache_store_results_of_queries_with_nondeterministic_functions, false, "Store results of queries with non-deterministic functions (e.g. rand(), now()) in the query cache", 0) \
+    M(UInt64, query_cache_max_size_in_bytes, 0, "The maximum amount of memory (in bytes) the current user may allocate in the query cache. 0 means unlimited. ", 0) \
+    M(UInt64, query_cache_max_entries, 0, "The maximum number of query results the current user may store in the query cache. 0 means unlimited.", 0) \
     M(UInt64, query_cache_min_query_runs, 0, "Minimum number a SELECT query must run before its result is stored in the query cache", 0) \
     M(Milliseconds, query_cache_min_query_duration, 0, "Minimum time in milliseconds for a query to run for its result to be stored in the query cache.", 0) \
+    M(Bool, query_cache_compress_entries, true, "Compress cache entries.", 0) \
+    M(Bool, query_cache_squash_partial_results, true, "Squash partial result blocks to blocks of size 'max_block_size'. Reduces performance of inserts into the query cache but improves the compressability of cache entries.", 0) \
     M(Seconds, query_cache_ttl, 60, "After this time in seconds entries in the query cache become stale", 0) \
     M(Bool, query_cache_share_between_users, false, "Allow other users to read entry in the query cache", 0) \
+    M(Bool, enable_sharing_sets_for_mutations, true, "Allow sharing set objects build for IN subqueries between different tasks of the same mutation. This reduces memory usage and CPU consumption", 0) \
     \
     M(Bool, optimize_rewrite_sum_if_to_count_if, false, "Rewrite sumIf() and sum(if()) function countIf() function when logically equivalent", 0) \
     M(Bool, optimize_rewrite_aggregate_function_with_if, true, "Rewrite aggregate functions with if expression as argument when logically equivalent. For example, avg(if(cond, col, null)) can be rewritten to avgIf(cond, col)", 0) \
@@ -605,6 +632,7 @@ class IColumn;
     M(Bool, query_plan_aggregation_in_order, true, "Use query plan for aggregation-in-order optimisation", 0) \
     M(Bool, query_plan_remove_redundant_sorting, true, "Remove redundant sorting in query plan. For example, sorting steps related to ORDER BY clauses in subqueries", 0) \
     M(Bool, query_plan_remove_redundant_distinct, true, "Remove redundant Distinct step in query plan", 0) \
+    M(Bool, query_plan_optimize_projection, true, "Use query plan for aggregation-in-order optimisation", 0) \
     M(UInt64, regexp_max_matches_per_row, 1000, "Max matches of any single regexp per row, used to safeguard 'extractAllGroupsHorizontal' against consuming too much memory with greedy RE.", 0) \
     \
     M(UInt64, limit, 0, "Limit on read rows from the most 'end' result for select query, default 0 means no limit length", 0) \
@@ -613,18 +641,18 @@ class IColumn;
     M(UInt64, function_range_max_elements_in_block, 500000000, "Maximum number of values generated by function 'range' per block of data (sum of array sizes for every row in a block, see also 'max_block_size' and 'min_insert_block_size_rows'). It is a safety threshold.", 0) \
     M(ShortCircuitFunctionEvaluation, short_circuit_function_evaluation, ShortCircuitFunctionEvaluation::ENABLE, "Setting for short-circuit function evaluation configuration. Possible values: 'enable' - use short-circuit function evaluation for functions that are suitable for it, 'disable' - disable short-circuit function evaluation, 'force_enable' - use short-circuit function evaluation for all functions.", 0) \
     \
-    M(LocalFSReadMethod, storage_file_read_method, LocalFSReadMethod::mmap, "Method of reading data from storage file, one of: read, pread, mmap.", 0) \
+    M(LocalFSReadMethod, storage_file_read_method, LocalFSReadMethod::mmap, "Method of reading data from storage file, one of: read, pread, mmap. The mmap method does not apply to clickhouse-server (it's intended for clickhouse-local).", 0) \
     M(String, local_filesystem_read_method, "pread_threadpool", "Method of reading data from local filesystem, one of: read, pread, mmap, io_uring, pread_threadpool. The 'io_uring' method is experimental and does not work for Log, TinyLog, StripeLog, File, Set and Join, and other tables with append-able files in presence of concurrent reads and writes.", 0) \
     M(String, remote_filesystem_read_method, "threadpool", "Method of reading data from remote filesystem, one of: read, threadpool.", 0) \
     M(Bool, local_filesystem_read_prefetch, false, "Should use prefetching when reading data from local filesystem.", 0) \
     M(Bool, remote_filesystem_read_prefetch, true, "Should use prefetching when reading data from remote filesystem.", 0) \
-    M(Int64, read_priority, 0, "Priority to read data from local filesystem. Only supported for 'pread_threadpool' method.", 0) \
+    M(Int64, read_priority, 0, "Priority to read data from local filesystem or remote filesystem. Only supported for 'pread_threadpool' method for local filesystem and for `threadpool` method for remote filesystem.", 0) \
     M(UInt64, merge_tree_min_rows_for_concurrent_read_for_remote_filesystem, (20 * 8192), "If at least as many lines are read from one file, the reading can be parallelized, when reading from remote filesystem.", 0) \
     M(UInt64, merge_tree_min_bytes_for_concurrent_read_for_remote_filesystem, (24 * 10 * 1024 * 1024), "If at least as many bytes are read from one file, the reading can be parallelized, when reading from remote filesystem.", 0) \
-    M(UInt64, remote_read_min_bytes_for_seek, 4 * DBMS_DEFAULT_BUFFER_SIZE, "Min bytes required for remote read (url, s3) to do seek, instead for read with ignore.", 0) \
+    M(UInt64, remote_read_min_bytes_for_seek, 4 * DBMS_DEFAULT_BUFFER_SIZE, "Min bytes required for remote read (url, s3) to do seek, instead of read with ignore.", 0) \
     \
     M(UInt64, async_insert_threads, 16, "Maximum number of threads to actually parse and insert data in background. Zero means asynchronous mode is disabled", 0) \
-    M(Bool, async_insert, false, "If true, data from INSERT query is stored in queue and later flushed to table in background. Makes sense only for inserts via HTTP protocol. If wait_for_async_insert is false, INSERT query is processed almost instantly, otherwise client will wait until data will be flushed to table", 0) \
+    M(Bool, async_insert, false, "If true, data from INSERT query is stored in queue and later flushed to table in background. If wait_for_async_insert is false, INSERT query is processed almost instantly, otherwise client will wait until data will be flushed to table", 0) \
     M(Bool, wait_for_async_insert, true, "If true wait for processing of asynchronous insertion", 0) \
     M(Seconds, wait_for_async_insert_timeout, DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC, "Timeout for waiting for processing asynchronous insertion", 0) \
     M(UInt64, async_insert_max_data_size, 1000000, "Maximum size in bytes of unparsed data collected per query before being inserted", 0) \
@@ -637,7 +665,6 @@ class IColumn;
     M(Bool, enable_filesystem_cache_on_write_operations, false, "Write into cache on write operations. To actually work this setting requires be added to disk config too", 0) \
     M(Bool, enable_filesystem_cache_log, false, "Allows to record the filesystem caching log for each query", 0) \
     M(Bool, read_from_filesystem_cache_if_exists_otherwise_bypass_cache, false, "Allow to use the filesystem cache in passive mode - benefit from the existing cache entries, but don't put more entries into the cache. If you set this setting for heavy ad-hoc queries and leave it disabled for short real-time queries, this will allows to avoid cache threshing by too heavy queries and to improve the overall system efficiency.", 0) \
-    M(Bool, enable_filesystem_cache_on_lower_level, true, "If read buffer supports caching inside threadpool, allow it to do it, otherwise cache outside ot threadpool. Do not use this setting, it is needed for testing", 0) \
     M(Bool, skip_download_if_exceeds_query_cache, true, "Skip download from remote filesystem if exceeds query cache size", 0) \
     M(UInt64, filesystem_cache_max_download_size, (128UL * 1024 * 1024 * 1024), "Max remote filesystem cache size that can be downloaded by a single query", 0) \
     M(Bool, throw_on_error_from_cache_on_write_operations, false, "Ignore error from cache when caching on write operations (INSERT, merges)", 0) \
@@ -647,6 +674,7 @@ class IColumn;
     M(Bool, allow_prefetched_read_pool_for_remote_filesystem, false, "Prefer prefethed threadpool if all parts are on remote filesystem", 0) \
     M(Bool, allow_prefetched_read_pool_for_local_filesystem, false, "Prefer prefethed threadpool if all parts are on remote filesystem", 0) \
     \
+    M(UInt64, prefetch_buffer_size, DBMS_DEFAULT_BUFFER_SIZE, "The maximum size of the prefetch buffer to read from the filesystem.", 0) \
     M(UInt64, filesystem_prefetch_step_bytes, 0, "Prefetch step in bytes. Zero means `auto` - approximately the best prefetch step will be auto deduced, but might not be 100% the best. The actual value might be different because of setting filesystem_prefetch_min_bytes_for_single_read_task", 0) \
     M(UInt64, filesystem_prefetch_step_marks, 0, "Prefetch step in marks. Zero means `auto` - approximately the best prefetch step will be auto deduced, but might not be 100% the best. The actual value might be different because of setting filesystem_prefetch_min_bytes_for_single_read_task", 0) \
     M(UInt64, filesystem_prefetch_min_bytes_for_single_read_task, "8Mi", "Do not parallelize within one file read less than this amount of bytes. E.g. one reader will not receive a read task of size less than this amount. This setting is recommended to avoid spikes of time for aws getObject requests to aws", 0) \
@@ -684,27 +712,15 @@ class IColumn;
     M(String, additional_result_filter, "", "Additional filter expression which would be applied to query result", 0) \
     \
     M(String, workload, "default", "Name of workload to be used to access resources", 0) \
+    M(Milliseconds, storage_system_stack_trace_pipe_read_timeout_ms, 100, "Maximum time to read from a pipe for receiving information from the threads when querying the `system.stack_trace` table. This setting is used for testing purposes and not meant to be changed by users.", 0) \
     \
-    /** Experimental functions */ \
-    M(Bool, allow_experimental_funnel_functions, false, "Enable experimental functions for funnel analysis.", 0) \
-    M(Bool, allow_experimental_nlp_functions, false, "Enable experimental functions for natural language processing.", 0) \
-    M(Bool, allow_experimental_hash_functions, false, "Enable experimental hash functions (hashid, etc)", 0) \
-    M(Bool, allow_experimental_object_type, false, "Allow Object and JSON data types", 0) \
-    M(Bool, allow_experimental_query_cache, false, "Enable experimental query cache", 0) \
+    M(Bool, parallelize_output_from_storages, true, "Parallelize output for reading step from storage. It allows parallelizing query processing right after reading from storage if possible", 0) \
     M(String, insert_deduplication_token, "", "If not empty, used for duplicate detection instead of data digest", 0) \
     M(String, ann_index_select_query_params, "", "Parameters passed to ANN indexes in SELECT queries, the format is 'param1=x, param2=y, ...'", 0) \
-    M(UInt64, max_limit_for_ann_queries, 1000000, "Maximum limit value for using ANN indexes is used to prevent memory overflow in search queries for indexes", 0) \
-    M(Bool, allow_experimental_annoy_index, false, "Allows to use Annoy index. Disabled by default because this feature is experimental", 0) \
     M(Bool, count_distinct_optimization, false, "Rewrite count distinct to subquery of group by", 0) \
-    M(Bool, throw_on_unsupported_query_inside_transaction, true, "Throw exception if unsupported query is used inside transaction", 0) \
-    M(TransactionsWaitCSNMode, wait_changes_become_visible_after_commit_mode, TransactionsWaitCSNMode::WAIT_UNKNOWN, "Wait for committed changes to become actually visible in the latest snapshot", 0) \
-    M(Bool, implicit_transaction, false, "If enabled and not already inside a transaction, wraps the query inside a full transaction (begin + commit or rollback)", 0) \
     M(Bool, throw_if_no_data_to_insert, true, "Enables or disables empty INSERTs, enabled by default", 0) \
     M(Bool, compatibility_ignore_auto_increment_in_create_table, false, "Ignore AUTO_INCREMENT keyword in column declaration if true, otherwise return error. It simplifies migration from MySQL", 0) \
     M(Bool, multiple_joins_try_to_keep_original_names, false, "Do not add aliases to top level expression list on multiple joins rewrite", 0) \
-    M(UInt64, grace_hash_join_initial_buckets, 1, "Initial number of grace hash join buckets", 0) \
-    M(UInt64, grace_hash_join_max_buckets, 1024, "Limit on the number of grace hash join buckets", 0) \
-    M(Bool, optimize_distinct_in_order, true, "Enable DISTINCT optimization if some columns in DISTINCT form a prefix of sorting. For example, prefix of sorting key in merge tree or ORDER BY statement", 0) \
     M(Bool, optimize_sorting_by_input_stream_properties, true, "Optimize sorting by sorting properties of input stream", 0) \
     M(UInt64, insert_keeper_max_retries, 20, "Max retries for keeper operations during insert", 0) \
     M(UInt64, insert_keeper_retry_initial_backoff_ms, 100, "Initial backoff timeout for keeper operations during insert", 0) \
@@ -712,12 +728,37 @@ class IColumn;
     M(Float, insert_keeper_fault_injection_probability, 0.0f, "Approximate probability of failure for a keeper request during insert. Valid value is in interval [0.0f, 1.0f]", 0) \
     M(UInt64, insert_keeper_fault_injection_seed, 0, "0 - random seed, otherwise the setting value", 0) \
     M(Bool, force_aggregation_in_order, false, "Force use of aggregation in order on remote nodes during distributed aggregation. PLEASE, NEVER CHANGE THIS SETTING VALUE MANUALLY!", IMPORTANT) \
+    M(UInt64, http_max_request_param_data_size, 10_MiB, "Limit on size of request data used as a query parameter in predefined HTTP requests.", 0) \
+    M(Bool, function_json_value_return_type_allow_nullable, false, "Allow function JSON_VALUE to return nullable type.", 0) \
+    M(Bool, function_json_value_return_type_allow_complex, false, "Allow function JSON_VALUE to return complex type, such as: struct, array, map.", 0) \
+    M(Bool, use_with_fill_by_sorting_prefix, true, "Columns preceding WITH FILL columns in ORDER BY clause form sorting prefix. Rows with different values in sorting prefix are filled independently", 0) \
+    \
+    /** Experimental functions */ \
+    M(Bool, allow_experimental_funnel_functions, false, "Enable experimental functions for funnel analysis.", 0) \
+    M(Bool, allow_experimental_nlp_functions, false, "Enable experimental functions for natural language processing.", 0) \
+    M(Bool, allow_experimental_hash_functions, false, "Enable experimental hash functions (hashid, etc)", 0) \
+    M(Bool, allow_experimental_object_type, false, "Allow Object and JSON data types", 0) \
+    M(Bool, allow_experimental_annoy_index, false, "Allows to use Annoy index. Disabled by default because this feature is experimental", 0) \
+    M(UInt64, max_limit_for_ann_queries, 1000000, "Maximum limit value for using ANN indexes is used to prevent memory overflow in search queries for indexes", 0) \
+    M(Bool, throw_on_unsupported_query_inside_transaction, true, "Throw exception if unsupported query is used inside transaction", 0) \
+    M(TransactionsWaitCSNMode, wait_changes_become_visible_after_commit_mode, TransactionsWaitCSNMode::WAIT_UNKNOWN, "Wait for committed changes to become actually visible in the latest snapshot", 0) \
+    M(Bool, implicit_transaction, false, "If enabled and not already inside a transaction, wraps the query inside a full transaction (begin + commit or rollback)", 0) \
+    M(UInt64, grace_hash_join_initial_buckets, 1, "Initial number of grace hash join buckets", 0) \
+    M(UInt64, grace_hash_join_max_buckets, 1024, "Limit on the number of grace hash join buckets", 0) \
+    M(Bool, optimize_distinct_in_order, true, "Enable DISTINCT optimization if some columns in DISTINCT form a prefix of sorting. For example, prefix of sorting key in merge tree or ORDER BY statement", 0) \
+    M(Bool, allow_experimental_undrop_table_query, false, "Allow to use undrop query to restore dropped table in a limited time", 0) \
+    M(Bool, keeper_map_strict_mode, false, "Enforce additional checks during operations on KeeperMap. E.g. throw an exception on an insert for already existing key", 0) \
+    M(UInt64, extract_kvp_max_pairs_per_row, 1000, "Max number pairs that can be produced by extractKeyValuePairs function. Used to safeguard against consuming too much memory.", 0) \
     // End of COMMON_SETTINGS
     // Please add settings related to formats into the FORMAT_FACTORY_SETTINGS and move obsolete settings to OBSOLETE_SETTINGS.
 
 #define MAKE_OBSOLETE(M, TYPE, NAME, DEFAULT) \
     M(TYPE, NAME, DEFAULT, "Obsolete setting, does nothing.", BaseSettingsHelpers::Flags::OBSOLETE)
 
+/// NOTE: ServerSettings::loadSettingsFromConfig() should be updated to include this settings
+#define MAKE_DEPRECATED_BY_SERVER_CONFIG(M, TYPE, NAME, DEFAULT) \
+    M(TYPE, NAME, DEFAULT, "User-level setting is deprecated, and it must be defined in the server configuration instead.", BaseSettingsHelpers::Flags::OBSOLETE)
+
 #define OBSOLETE_SETTINGS(M, ALIAS) \
     /** Obsolete settings that do nothing but left for compatibility reasons. Remove each one after half a year of obsolescence. */ \
     MAKE_OBSOLETE(M, UInt64, max_memory_usage_for_all_queries, 0) \
@@ -727,6 +768,8 @@ class IColumn;
     MAKE_OBSOLETE(M, Bool, allow_experimental_bigint_types, true) \
     MAKE_OBSOLETE(M, Bool, allow_experimental_window_functions, true) \
     MAKE_OBSOLETE(M, Bool, allow_experimental_lightweight_delete, true) \
+    MAKE_OBSOLETE(M, Bool, allow_experimental_geo_types, true) \
+    \
     MAKE_OBSOLETE(M, Milliseconds, async_insert_stale_timeout_ms, 0) \
     MAKE_OBSOLETE(M, HandleKafkaErrorMode, handle_kafka_error_mode, HandleKafkaErrorMode::DEFAULT) \
     MAKE_OBSOLETE(M, Bool, database_replicated_ddl_output, true) \
@@ -738,21 +781,30 @@ class IColumn;
     MAKE_OBSOLETE(M, UInt64, partial_merge_join_optimizations, 0) \
     MAKE_OBSOLETE(M, MaxThreads, max_alter_threads, 0) \
     MAKE_OBSOLETE(M, Bool, allow_experimental_projection_optimization, true) \
-    MAKE_OBSOLETE(M, UInt64, background_buffer_flush_schedule_pool_size, 16) \
-    MAKE_OBSOLETE(M, UInt64, background_pool_size, 16) \
-    MAKE_OBSOLETE(M, Float, background_merges_mutations_concurrency_ratio, 2) \
-    MAKE_OBSOLETE(M, UInt64, background_move_pool_size, 8) \
-    MAKE_OBSOLETE(M, UInt64, background_fetches_pool_size, 8) \
-    MAKE_OBSOLETE(M, UInt64, background_common_pool_size, 8) \
-    MAKE_OBSOLETE(M, UInt64, background_schedule_pool_size, 128) \
-    MAKE_OBSOLETE(M, UInt64, background_message_broker_schedule_pool_size, 16) \
-    MAKE_OBSOLETE(M, UInt64, background_distributed_schedule_pool_size, 16) \
+    MAKE_OBSOLETE(M, Bool, allow_experimental_query_cache, true) \
+    /* moved to config.xml: see also src/Core/ServerSettings.h */ \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, background_buffer_flush_schedule_pool_size, 16) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, background_pool_size, 16) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, Float, background_merges_mutations_concurrency_ratio, 2) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, background_move_pool_size, 8) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, background_fetches_pool_size, 8) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, background_common_pool_size, 8) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, background_schedule_pool_size, 128) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, background_message_broker_schedule_pool_size, 16) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, background_distributed_schedule_pool_size, 16) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, max_remote_read_network_bandwidth_for_server, 0) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, max_remote_write_network_bandwidth_for_server, 0) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, max_replicated_fetches_network_bandwidth_for_server, 0) \
+    MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, max_replicated_sends_network_bandwidth_for_server, 0) \
+    /* ---- */ \
     MAKE_OBSOLETE(M, DefaultDatabaseEngine, default_database_engine, DefaultDatabaseEngine::Atomic) \
     MAKE_OBSOLETE(M, UInt64, max_pipeline_depth, 0)                                                                                 \
     MAKE_OBSOLETE(M, Seconds, temporary_live_view_timeout, 1) \
     MAKE_OBSOLETE(M, Milliseconds, async_insert_cleanup_timeout_ms, 1000) \
     MAKE_OBSOLETE(M, Bool, optimize_fuse_sum_count_avg, 0) \
-
+    MAKE_OBSOLETE(M, Seconds, drain_timeout, 3) \
+    MAKE_OBSOLETE(M, UInt64, backup_threads, 16) \
+    MAKE_OBSOLETE(M, UInt64, restore_threads, 16) \
 
     /** The section above is for obsolete settings. Do not add anything there. */
 
@@ -780,6 +832,8 @@ class IColumn;
     M(Bool, input_format_orc_case_insensitive_column_matching, false, "Ignore case when matching ORC columns with CH columns.", 0) \
     M(Bool, input_format_parquet_import_nested, false, "Allow to insert array of structs into Nested table in Parquet input format.", 0) \
     M(Bool, input_format_parquet_case_insensitive_column_matching, false, "Ignore case when matching Parquet columns with CH columns.", 0) \
+    /* TODO: Consider unifying this with https://github.com/ClickHouse/ClickHouse/issues/38755 */ \
+    M(Bool, input_format_parquet_preserve_order, false, "Avoid reordering rows when reading from Parquet files. Usually makes it much slower.", 0) \
     M(Bool, input_format_allow_seeks, true, "Allow seeks while reading in ORC/Parquet/Arrow input formats", 0) \
     M(Bool, input_format_orc_allow_missing_columns, false, "Allow missing columns while reading ORC input formats", 0) \
     M(Bool, input_format_parquet_allow_missing_columns, false, "Allow missing columns while reading Parquet input formats", 0) \
@@ -820,6 +874,8 @@ class IColumn;
     M(UInt64, input_format_csv_skip_first_lines, 0, "Skip specified number of lines at the beginning of data in CSV format", 0) \
     M(UInt64, input_format_tsv_skip_first_lines, 0, "Skip specified number of lines at the beginning of data in TSV format", 0) \
     \
+    M(Bool, input_format_native_allow_types_conversion, true, "Allow data types conversion in Native input format", 0) \
+    \
     M(DateTimeInputFormat, date_time_input_format, FormatSettings::DateTimeInputFormat::Basic, "Method to read DateTime from text input formats. Possible values: 'basic', 'best_effort' and 'best_effort_us'.", 0) \
     M(DateTimeOutputFormat, date_time_output_format, FormatSettings::DateTimeOutputFormat::Simple, "Method to write DateTime to text output. Possible values: 'simple', 'iso', 'unix_timestamp'.", 0) \
     \
@@ -835,6 +891,7 @@ class IColumn;
     /** This setting is obsolete and do nothing, left for compatibility reasons. */ \
     M(Bool, input_format_avro_null_as_default, false, "For Avro/AvroConfluent format: insert default in case of null and non Nullable column", 0) \
     M(UInt64, format_binary_max_string_size, 1_GiB, "The maximum allowed size for String in RowBinary format. It prevents allocating large amount of memory in case of corrupted data. 0 means there is no limit", 0) \
+    M(UInt64, format_binary_max_array_size, 1_GiB, "The maximum allowed size for Array in RowBinary format. It prevents allocating large amount of memory in case of corrupted data. 0 means there is no limit", 0) \
     M(URI, format_avro_schema_registry_url, "", "For AvroConfluent format: Confluent Schema Registry URL.", 0) \
     \
     M(Bool, output_format_json_quote_64bit_integers, true, "Controls quoting of 64-bit integers in JSON output format.", 0) \
@@ -854,10 +911,13 @@ class IColumn;
     M(UInt64, output_format_pretty_max_value_width, 10000, "Maximum width of value to display in Pretty formats. If greater - it will be cut.", 0) \
     M(Bool, output_format_pretty_color, true, "Use ANSI escape sequences to paint colors in Pretty formats", 0) \
     M(String, output_format_pretty_grid_charset, "UTF-8", "Charset for printing grid borders. Available charsets: ASCII, UTF-8 (default one).", 0) \
-    M(UInt64, output_format_parquet_row_group_size, 1000000, "Row group size in rows.", 0) \
+    M(UInt64, output_format_parquet_row_group_size, 1000000, "Target row group size in rows.", 0) \
+    M(UInt64, output_format_parquet_row_group_size_bytes, 512 * 1024 * 1024, "Target row group size in bytes, before compression.", 0) \
     M(Bool, output_format_parquet_string_as_string, false, "Use Parquet String type instead of Binary for String columns.", 0) \
     M(Bool, output_format_parquet_fixed_string_as_fixed_byte_array, true, "Use Parquet FIXED_LENGTH_BYTE_ARRAY type instead of Binary for FixedString columns.", 0) \
     M(ParquetVersion, output_format_parquet_version, "2.latest", "Parquet format version for output format. Supported versions: 1.0, 2.4, 2.6 and 2.latest (default)", 0) \
+    M(ParquetCompression, output_format_parquet_compression_method, "lz4", "Compression method for Parquet output format. Supported codecs: snappy, lz4, brotli, zstd, gzip, none (uncompressed)", 0) \
+    M(Bool, output_format_parquet_compliant_nested_types, true, "In parquet file schema, use name 'element' instead of 'item' for list elements. This is a historical artifact of Arrow library implementation. Generally increases compatibility, except perhaps with some old versions of Arrow.", 0) \
     M(String, output_format_avro_codec, "", "Compression codec used for output. Possible values: 'null', 'deflate', 'snappy'.", 0) \
     M(UInt64, output_format_avro_sync_interval, 16 * 1024, "Sync interval in bytes.", 0) \
     M(String, output_format_avro_string_column_pattern, "", "For Avro format: regexp of String columns to select as AVRO string.", 0) \
@@ -900,8 +960,10 @@ class IColumn;
     M(Bool, output_format_arrow_low_cardinality_as_dictionary, false, "Enable output LowCardinality type as Dictionary Arrow type", 0) \
     M(Bool, output_format_arrow_string_as_string, false, "Use Arrow String type instead of Binary for String columns", 0) \
     M(Bool, output_format_arrow_fixed_string_as_fixed_byte_array, true, "Use Arrow FIXED_SIZE_BINARY type instead of Binary for FixedString columns.", 0) \
+    M(ArrowCompression, output_format_arrow_compression_method, "lz4_frame", "Compression method for Arrow output format. Supported codecs: lz4_frame, zstd, none (uncompressed)", 0) \
     \
     M(Bool, output_format_orc_string_as_string, false, "Use ORC String type instead of Binary for String columns", 0) \
+    M(ORCCompression, output_format_orc_compression_method, "lz4", "Compression method for ORC output format. Supported codecs: lz4, snappy, zlib, zstd, none (uncompressed)", 0) \
     \
     M(EnumComparingMode, format_capn_proto_enum_comparising_mode, FormatSettings::EnumComparingMode::BY_VALUES, "How to map ClickHouse Enum and CapnProto Enum", 0) \
     \
@@ -917,8 +979,10 @@ class IColumn;
     M(Bool, output_format_bson_string_as_string, false, "Use BSON String type instead of Binary for String columns.", 0) \
     M(Bool, input_format_bson_skip_fields_with_unsupported_types_in_schema_inference, false, "Skip fields with unsupported types while schema inference for format BSON.", 0) \
     \
-    M(Bool, regexp_dict_allow_other_sources, false, "Allow regexp_tree dictionary to use sources other than yaml source.", 0) \
-    M(Bool, regexp_dict_allow_hyperscan, false, "Allow regexp_tree dictionary using Hyperscan library.", 0) \
+    M(Bool, format_display_secrets_in_show_and_select, false, "Do not hide secrets in SHOW and SELECT queries.", IMPORTANT) \
+    M(Bool, regexp_dict_allow_hyperscan, true, "Allow regexp_tree dictionary using Hyperscan library.", 0) \
+    \
+    M(Bool, dictionary_use_async_executor, false, "Execute a pipeline for reading from a dictionary with several threads. It's supported only by DIRECT dictionary with CLICKHOUSE source.", 0) \
 
 // End of FORMAT_FACTORY_SETTINGS
 // Please add settings non-related to formats into the COMMON_SETTINGS above.
diff --git a/src/Core/SettingsChangesHistory.h b/src/Core/SettingsChangesHistory.h
index 04f328bb665..c0f10b13282 100644
--- a/src/Core/SettingsChangesHistory.h
+++ b/src/Core/SettingsChangesHistory.h
@@ -80,8 +80,21 @@ namespace SettingsChangesHistory
 /// It's used to implement `compatibility` setting (see https://github.com/ClickHouse/ClickHouse/issues/35972)
 static std::map<ClickHouseVersion, SettingsChangesHistory::SettingsChanges> settings_changes_history =
 {
+    {"23.5", {{"input_format_parquet_preserve_order", true, false, "Allow Parquet reader to reorder rows for better parallelism."},
+              {"parallelize_output_from_storages", false, true, "Allow parallelism when executing queries that read from file/url/s3/etc. This may reorder rows."},
+              {"use_with_fill_by_sorting_prefix", false, true, "Columns preceding WITH FILL columns in ORDER BY clause form sorting prefix. Rows with different values in sorting prefix are filled independently"},
+              {"output_format_parquet_compliant_nested_types", false, true, "Change an internal field name in output Parquet file schema."}}},
+    {"23.4", {{"allow_suspicious_indices", true, false, "If true, index can defined with identical expressions"},
+              {"connect_timeout_with_failover_ms", 50, 1000, "Increase default connect timeout because of async connect"},
+              {"connect_timeout_with_failover_secure_ms", 100, 1000, "Increase default secure connect timeout because of async connect"},
+              {"hedged_connection_timeout_ms", 100, 50, "Start new connection in hedged requests after 50 ms instead of 100 to correspond with previous connect timeout"}}},
     {"23.3", {{"output_format_parquet_version", "1.0", "2.latest", "Use latest Parquet format version for output format"},
-              {"input_format_json_ignore_unknown_keys_in_named_tuple", false, true, "Improve parsing JSON objects as named tuples"}}},
+              {"input_format_json_ignore_unknown_keys_in_named_tuple", false, true, "Improve parsing JSON objects as named tuples"},
+              {"input_format_native_allow_types_conversion", false, true, "Allow types conversion in Native input forma"},
+              {"output_format_arrow_compression_method", "none", "lz4_frame", "Use lz4 compression in Arrow output format by default"},
+              {"output_format_parquet_compression_method", "snappy", "lz4", "Use lz4 compression in Parquet output format by default"},
+              {"output_format_orc_compression_method", "none", "lz4_frame", "Use lz4 compression in ORC output format by default"},
+              {"async_query_sending_for_remote", false, true, "Create connections and send query async across shards"}}},
     {"23.2", {{"output_format_parquet_fixed_string_as_fixed_byte_array", false, true, "Use Parquet FIXED_LENGTH_BYTE_ARRAY type for FixedString by default"},
               {"output_format_arrow_fixed_string_as_fixed_byte_array", false, true, "Use Arrow FIXED_SIZE_BINARY type for FixedString by default"},
               {"query_plan_remove_redundant_distinct", false, true, "Remove redundant Distinct step in query plan"},
@@ -97,6 +110,8 @@ static std::map<ClickHouseVersion, SettingsChangesHistory::SettingsChanges> sett
                {"query_plan_aggregation_in_order", 0, 1, "Enable some refactoring around query plan"},
                {"format_binary_max_string_size", 0, 1_GiB, "Prevent allocating large amount of memory"}}},
     {"22.11", {{"use_structure_from_insertion_table_in_table_functions", 0, 2, "Improve using structure from insertion table in table functions"}}},
+    {"23.4", {{"formatdatetime_f_prints_single_zero", true, false, "Improved compatibility with MySQL DATE_FORMAT()/STR_TO_DATE()"}}},
+    {"23.4", {{"formatdatetime_parsedatetime_m_is_month_name", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}}},
     {"22.9", {{"force_grouping_standard_compatibility", false, true, "Make GROUPING function output the same as in SQL standard and other DBMS"}}},
     {"22.7", {{"cross_to_inner_join_rewrite", 1, 2, "Force rewrite comma join to inner"},
               {"enable_positional_arguments", false, true, "Enable positional arguments feature by default"},
diff --git a/src/Core/SettingsEnums.cpp b/src/Core/SettingsEnums.cpp
index 9e1ab585bb0..e0f16ea00db 100644
--- a/src/Core/SettingsEnums.cpp
+++ b/src/Core/SettingsEnums.cpp
@@ -158,7 +158,7 @@ IMPLEMENT_SETTING_ENUM(EscapingRule, ErrorCodes::BAD_ARGUMENTS,
      {"XML", FormatSettings::EscapingRule::XML},
      {"Raw", FormatSettings::EscapingRule::Raw}})
 
-IMPLEMENT_SETTING_ENUM(MsgPackUUIDRepresentation , ErrorCodes::BAD_ARGUMENTS,
+IMPLEMENT_SETTING_ENUM(MsgPackUUIDRepresentation, ErrorCodes::BAD_ARGUMENTS,
                        {{"bin", FormatSettings::MsgPackUUIDRepresentation::BIN},
                         {"str", FormatSettings::MsgPackUUIDRepresentation::STR},
                         {"ext", FormatSettings::MsgPackUUIDRepresentation::EXT}})
@@ -167,16 +167,39 @@ IMPLEMENT_SETTING_ENUM(Dialect, ErrorCodes::BAD_ARGUMENTS,
     {{"clickhouse", Dialect::clickhouse},
      {"kusto", Dialect::kusto}})
 
+IMPLEMENT_SETTING_ENUM(ParallelReplicasCustomKeyFilterType, ErrorCodes::BAD_ARGUMENTS,
+    {{"default", ParallelReplicasCustomKeyFilterType::DEFAULT},
+     {"range", ParallelReplicasCustomKeyFilterType::RANGE}})
+
 IMPLEMENT_SETTING_ENUM(LocalFSReadMethod, ErrorCodes::BAD_ARGUMENTS,
     {{"mmap", LocalFSReadMethod::mmap},
      {"pread", LocalFSReadMethod::pread},
      {"read", LocalFSReadMethod::read}})
 
-
 IMPLEMENT_SETTING_ENUM_WITH_RENAME(ParquetVersion, ErrorCodes::BAD_ARGUMENTS,
     {{"1.0",       FormatSettings::ParquetVersion::V1_0},
      {"2.4", FormatSettings::ParquetVersion::V2_4},
      {"2.6", FormatSettings::ParquetVersion::V2_6},
      {"2.latest", FormatSettings::ParquetVersion::V2_LATEST}})
 
+IMPLEMENT_SETTING_ENUM(ParquetCompression, ErrorCodes::BAD_ARGUMENTS,
+    {{"none", FormatSettings::ParquetCompression::NONE},
+     {"snappy", FormatSettings::ParquetCompression::SNAPPY},
+     {"zstd", FormatSettings::ParquetCompression::ZSTD},
+     {"gzip", FormatSettings::ParquetCompression::GZIP},
+     {"lz4", FormatSettings::ParquetCompression::LZ4},
+     {"brotli", FormatSettings::ParquetCompression::BROTLI}})
+
+IMPLEMENT_SETTING_ENUM(ArrowCompression, ErrorCodes::BAD_ARGUMENTS,
+    {{"none", FormatSettings::ArrowCompression::NONE},
+     {"lz4_frame", FormatSettings::ArrowCompression::LZ4_FRAME},
+     {"zstd", FormatSettings::ArrowCompression::ZSTD}})
+
+IMPLEMENT_SETTING_ENUM(ORCCompression, ErrorCodes::BAD_ARGUMENTS,
+    {{"none", FormatSettings::ORCCompression::NONE},
+     {"snappy", FormatSettings::ORCCompression::SNAPPY},
+     {"zstd", FormatSettings::ORCCompression::ZSTD},
+     {"zlib", FormatSettings::ORCCompression::ZLIB},
+     {"lz4", FormatSettings::ORCCompression::LZ4}})
+
 }
diff --git a/src/Core/SettingsEnums.h b/src/Core/SettingsEnums.h
index 139a04f3a5a..3ae7bfaa673 100644
--- a/src/Core/SettingsEnums.h
+++ b/src/Core/SettingsEnums.h
@@ -194,6 +194,12 @@ DECLARE_SETTING_ENUM_WITH_RENAME(EscapingRule, FormatSettings::EscapingRule)
 
 DECLARE_SETTING_ENUM_WITH_RENAME(MsgPackUUIDRepresentation, FormatSettings::MsgPackUUIDRepresentation)
 
+DECLARE_SETTING_ENUM_WITH_RENAME(ParquetCompression, FormatSettings::ParquetCompression)
+
+DECLARE_SETTING_ENUM_WITH_RENAME(ArrowCompression, FormatSettings::ArrowCompression)
+
+DECLARE_SETTING_ENUM_WITH_RENAME(ORCCompression, FormatSettings::ORCCompression)
+
 enum class Dialect
 {
     clickhouse,
@@ -203,5 +209,13 @@ enum class Dialect
 
 DECLARE_SETTING_ENUM(Dialect)
 
+enum class ParallelReplicasCustomKeyFilterType : uint8_t
+{
+    DEFAULT,
+    RANGE,
+};
+
+DECLARE_SETTING_ENUM(ParallelReplicasCustomKeyFilterType)
+
 DECLARE_SETTING_ENUM(LocalFSReadMethod)
 }
diff --git a/src/Core/SettingsFields.cpp b/src/Core/SettingsFields.cpp
index 06cd53013ec..8cd4efb68c6 100644
--- a/src/Core/SettingsFields.cpp
+++ b/src/Core/SettingsFields.cpp
@@ -338,7 +338,7 @@ void SettingFieldString::readBinary(ReadBuffer & in)
 /// that. The linker does not complain only because clickhouse-keeper does not call any of below
 /// functions. A cleaner alternative would be more modular libraries, e.g. one for data types, which
 /// could then be linked by the server and the linker.
-#ifndef KEEPER_STANDALONE_BUILD
+#ifndef CLICKHOUSE_PROGRAM_STANDALONE_BUILD
 
 SettingFieldMap::SettingFieldMap(const Field & f) : value(fieldToMap(f)) {}
 
diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
index 3994e402c9a..2cd55e6b4c5 100644
--- a/src/Core/SettingsFields.h
+++ b/src/Core/SettingsFields.h
@@ -453,8 +453,8 @@ struct SettingFieldMultiEnum
     explicit operator StorageType() const { return value.getValue(); }
     explicit operator Field() const { return toString(); }
 
-    SettingFieldMultiEnum & operator= (StorageType x) { changed = x != value.getValue(); value.setValue(x); return *this; }
-    SettingFieldMultiEnum & operator= (ValueType x) { changed = !(x == value); value = x; return *this; }
+    SettingFieldMultiEnum & operator= (StorageType x) { changed = true; value.setValue(x); return *this; }
+    SettingFieldMultiEnum & operator= (ValueType x) { changed = true; value = x; return *this; }
     SettingFieldMultiEnum & operator= (const Field & x) { parseFromString(x.safeGet<const String &>()); return *this; }
 
     String toString() const
diff --git a/src/Core/SettingsQuirks.cpp b/src/Core/SettingsQuirks.cpp
index c2314f484c0..3326f42adf5 100644
--- a/src/Core/SettingsQuirks.cpp
+++ b/src/Core/SettingsQuirks.cpp
@@ -57,6 +57,12 @@ void applySettingsQuirks(Settings & settings, Poco::Logger * log)
             if (log)
                 LOG_WARNING(log, "async_socket_for_remote has been disabled (you can explicitly enable it still)");
         }
+        if (!settings.async_query_sending_for_remote.changed && settings.async_query_sending_for_remote)
+        {
+            settings.async_query_sending_for_remote = false;
+            if (log)
+                LOG_WARNING(log, "async_query_sending_for_remote has been disabled (you can explicitly enable it still)");
+        }
         if (!settings.use_hedged_requests.changed && settings.use_hedged_requests)
         {
             settings.use_hedged_requests = false;
diff --git a/src/Core/SortDescription.cpp b/src/Core/SortDescription.cpp
index 66ca1539b71..ae6aedf202d 100644
--- a/src/Core/SortDescription.cpp
+++ b/src/Core/SortDescription.cpp
@@ -4,6 +4,7 @@
 #include <Common/JSONBuilder.h>
 #include <Common/SipHash.h>
 #include <Common/typeid_cast.h>
+#include <Common/logger_useful.h>
 
 #if USE_EMBEDDED_COMPILER
 #include <DataTypes/Native.h>
diff --git a/src/Core/TypeId.h b/src/Core/TypeId.h
index d2ae56b4280..f191525f30f 100644
--- a/src/Core/TypeId.h
+++ b/src/Core/TypeId.h
@@ -1,9 +1,55 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <Core/Types_fwd.h>
 
 namespace DB
 {
+
+/// @note Except explicitly described you should not assume on TypeIndex numbers and/or their orders in this enum.
+enum class TypeIndex
+{
+    Nothing = 0,
+    UInt8,
+    UInt16,
+    UInt32,
+    UInt64,
+    UInt128,
+    UInt256,
+    Int8,
+    Int16,
+    Int32,
+    Int64,
+    Int128,
+    Int256,
+    Float32,
+    Float64,
+    Date,
+    Date32,
+    DateTime,
+    DateTime64,
+    String,
+    FixedString,
+    Enum8,
+    Enum16,
+    Decimal32,
+    Decimal64,
+    Decimal128,
+    Decimal256,
+    UUID,
+    Array,
+    Tuple,
+    Set,
+    Interval,
+    Nullable,
+    Function,
+    AggregateFunction,
+    LowCardinality,
+    Map,
+    Object,
+    IPv4,
+    IPv6,
+};
+
 /**
  * Obtain TypeIndex value from real type if possible.
  *
diff --git a/src/Core/Types.h b/src/Core/Types.h
index cd559661a96..74e18e9494d 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Core/TypeId.h>
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -44,52 +45,6 @@ struct Null
     }
 };
 
-/// @note Except explicitly described you should not assume on TypeIndex numbers and/or their orders in this enum.
-enum class TypeIndex
-{
-    Nothing = 0,
-    UInt8,
-    UInt16,
-    UInt32,
-    UInt64,
-    UInt128,
-    UInt256,
-    Int8,
-    Int16,
-    Int32,
-    Int64,
-    Int128,
-    Int256,
-    Float32,
-    Float64,
-    Date,
-    Date32,
-    DateTime,
-    DateTime64,
-    String,
-    FixedString,
-    Enum8,
-    Enum16,
-    Decimal32,
-    Decimal64,
-    Decimal128,
-    Decimal256,
-    UUID,
-    Array,
-    Tuple,
-    Set,
-    Interval,
-    Nullable,
-    Function,
-    AggregateFunction,
-    LowCardinality,
-    Map,
-    Object,
-    IPv4,
-    IPv6,
-};
-
-
 using UInt128 = ::UInt128;
 using UInt256 = ::UInt256;
 using Int128 = ::Int128;
diff --git a/src/Core/Types_fwd.h b/src/Core/Types_fwd.h
new file mode 100644
index 00000000000..3db1127fe5a
--- /dev/null
+++ b/src/Core/Types_fwd.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+#include <vector>
+#include <unordered_set>
+#include <base/strong_typedef.h>
+#include <base/defines.h>
+#include <base/types.h>
+#include <base/Decimal_fwd.h>
+
+namespace wide
+{
+
+template <size_t Bits, typename Signed>
+class integer;
+
+}
+
+using Int128 = wide::integer<128, signed>;
+using UInt128 = wide::integer<128, unsigned>;
+using Int256 = wide::integer<256, signed>;
+using UInt256 = wide::integer<256, unsigned>;
+
+namespace DB
+{
+
+using UUID = StrongTypedef<UInt128, struct UUIDTag>;
+
+using IPv4 = StrongTypedef<UInt32, struct IPv4Tag>;
+
+struct IPv6;
+
+struct Null;
+
+using UInt128 = ::UInt128;
+using UInt256 = ::UInt256;
+using Int128 = ::Int128;
+using Int256 = ::Int256;
+
+enum class TypeIndex;
+
+/// Not a data type in database, defined just for convenience.
+using Strings = std::vector<String>;
+using TypeIndexesSet = std::unordered_set<TypeIndex>;
+
+}
diff --git a/src/Core/tests/gtest_DecimalFunctions.cpp b/src/Core/tests/gtest_DecimalFunctions.cpp
index 08f25ddd97c..59ec07e4efc 100644
--- a/src/Core/tests/gtest_DecimalFunctions.cpp
+++ b/src/Core/tests/gtest_DecimalFunctions.cpp
@@ -1,4 +1,3 @@
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <gtest/gtest.h>
 
 #include <Core/DecimalFunctions.h>
diff --git a/src/Core/tests/gtest_settings.cpp b/src/Core/tests/gtest_settings.cpp
index 46d8f9665dc..cbeb84ef2e7 100644
--- a/src/Core/tests/gtest_settings.cpp
+++ b/src/Core/tests/gtest_settings.cpp
@@ -122,7 +122,7 @@ GTEST_TEST(SettingMySQLDataTypesSupport, SetString)
 
     // comma with spaces
     setting = " datetime64 ,    decimal ";
-    ASSERT_FALSE(setting.changed); // false since value is the same as previous one.
+    ASSERT_TRUE(setting.changed);
     ASSERT_TRUE(setting.value.isSet(MySQLDataTypesSupport::DECIMAL));
     ASSERT_TRUE(setting.value.isSet(MySQLDataTypesSupport::DATETIME64));
     ASSERT_EQ("decimal,datetime64", setting.toString());
@@ -136,7 +136,7 @@ GTEST_TEST(SettingMySQLDataTypesSupport, SetString)
     ASSERT_EQ(Field("decimal"), setting);
 
     setting = String(",decimal,decimal,decimal,decimal,decimal,decimal,decimal,decimal,decimal,");
-    ASSERT_FALSE(setting.changed); //since previous value was DECIMAL
+    ASSERT_TRUE(setting.changed); //since previous value was DECIMAL
     ASSERT_TRUE(setting.value.isSet(MySQLDataTypesSupport::DECIMAL));
     ASSERT_FALSE(setting.value.isSet(MySQLDataTypesSupport::DATETIME64));
     ASSERT_EQ("decimal", setting.toString());
@@ -163,7 +163,7 @@ GTEST_TEST(SettingMySQLDataTypesSupport, SetInvalidString)
     ASSERT_EQ(0, setting.value.getValue());
 
     EXPECT_NO_THROW(setting = String(", "));
-    ASSERT_FALSE(setting.changed);
+    ASSERT_TRUE(setting.changed);
     ASSERT_EQ(0, setting.value.getValue());
 }
 
diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index 60179fd5317..4780dfed4b2 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -1,10 +1,7 @@
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 #include <Daemon/BaseDaemon.h>
 #include <Daemon/SentryWriter.h>
-#include <Parsers/toOneLineQuery.h>
 #include <base/errnoToString.h>
 #include <base/defines.h>
 
@@ -65,7 +62,7 @@
 #include "config_version.h"
 
 #if defined(OS_DARWIN)
-#   pragma GCC diagnostic ignored "-Wunused-macros"
+#   pragma clang diagnostic ignored "-Wunused-macros"
 // NOLINTNEXTLINE(bugprone-reserved-identifier)
 #   define _XOPEN_SOURCE 700  // ucontext is not available without _XOPEN_SOURCE
 #endif
@@ -134,7 +131,7 @@ static void terminateRequestedSignalHandler(int sig, siginfo_t *, void *)
 }
 
 
-static std::atomic<bool> fatal_error_printed{false};
+static std::atomic_flag fatal_error_printed;
 
 /** Handler for "fault" or diagnostic signals. Send data about fault to separate thread to write into log.
   */
@@ -165,7 +162,7 @@ static void signalHandler(int sig, siginfo_t * info, void * context)
         for (size_t i = 0; i < 300; ++i)
         {
             /// We will synchronize with the thread printing the messages with an atomic variable to finish earlier.
-            if (fatal_error_printed)
+            if (fatal_error_printed.test())
                 break;
 
             /// This coarse method of synchronization is perfectly ok for fatal signals.
@@ -312,12 +309,8 @@ private:
         /// It will allow client to see failure messages directly.
         if (thread_ptr)
         {
-            query_id = std::string(thread_ptr->getQueryId());
-
-            if (auto thread_group = thread_ptr->getThreadGroup())
-            {
-                query = DB::toOneLineQuery(thread_group->query);
-            }
+            query_id = thread_ptr->getQueryId();
+            query = thread_ptr->getQueryForLog();
 
             if (auto logs_queue = thread_ptr->getInternalTextLogsQueue())
             {
@@ -365,16 +358,19 @@ private:
             /// NOTE: This still require memory allocations and mutex lock inside logger.
             ///       BTW we can also print it to stderr using write syscalls.
 
-            std::stringstream bare_stacktrace; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-            bare_stacktrace << "Stack trace:";
+            DB::WriteBufferFromOwnString bare_stacktrace;
+            DB::writeString("Stack trace:", bare_stacktrace);
             for (size_t i = stack_trace.getOffset(); i < stack_trace.getSize(); ++i)
-                bare_stacktrace << ' ' << stack_trace.getFramePointers()[i];
+            {
+                DB::writeChar(' ', bare_stacktrace);
+                DB::writePointerHex(stack_trace.getFramePointers()[i], bare_stacktrace);
+            }
 
             LOG_FATAL(log, fmt::runtime(bare_stacktrace.str()));
         }
 
         /// Write symbolized stack trace line by line for better grep-ability.
-        stack_trace.toStringEveryLine([&](const std::string & s) { LOG_FATAL(log, fmt::runtime(s)); });
+        stack_trace.toStringEveryLine([&](std::string_view s) { LOG_FATAL(log, fmt::runtime(s)); });
 
 #if defined(OS_LINUX)
         /// Write information about binary checksum. It can be difficult to calculate, so do it only after printing stack trace.
@@ -421,7 +417,7 @@ private:
         if (thread_ptr)
             thread_ptr->onFatalError();
 
-        fatal_error_printed = true;
+        fatal_error_printed.test_and_set();
     }
 };
 
@@ -1131,16 +1127,21 @@ void BaseDaemon::setupWatchdog()
             logger().information("Child process no longer exists.");
             _exit(WEXITSTATUS(status));
         }
-        else if (WIFEXITED(status))
+
+        if (WIFEXITED(status))
         {
             logger().information(fmt::format("Child process exited normally with code {}.", WEXITSTATUS(status)));
             _exit(WEXITSTATUS(status));
         }
 
+        int exit_code;
+
         if (WIFSIGNALED(status))
         {
             int sig = WTERMSIG(status);
 
+            exit_code = 128 + sig;
+
             if (sig == SIGKILL)
             {
                 logger().fatal(fmt::format("Child process was terminated by signal {} (KILL)."
@@ -1152,12 +1153,14 @@ void BaseDaemon::setupWatchdog()
                 logger().fatal(fmt::format("Child process was terminated by signal {}.", sig));
 
                 if (sig == SIGINT || sig == SIGTERM || sig == SIGQUIT)
-                    _exit(128 + sig);
+                    _exit(exit_code);
             }
         }
         else
         {
+            // According to POSIX, this should never happen.
             logger().fatal("Child process was not exited normally by unknown reason.");
+            exit_code = 42;
         }
 
         if (restart)
@@ -1167,7 +1170,7 @@ void BaseDaemon::setupWatchdog()
                 memcpy(argv0, original_process_name.c_str(), original_process_name.size());
         }
         else
-            _exit(WEXITSTATUS(status));
+            _exit(exit_code);
     }
 }
 
diff --git a/src/Daemon/BaseDaemon.h b/src/Daemon/BaseDaemon.h
index d28f9403c16..7aa1e8ad1a0 100644
--- a/src/Daemon/BaseDaemon.h
+++ b/src/Daemon/BaseDaemon.h
@@ -15,9 +15,7 @@
 #include <Poco/Util/Application.h>
 #include <Poco/Util/ServerApplication.h>
 #include <Poco/Net/SocketAddress.h>
-#include <Poco/Version.h>
 #include <base/types.h>
-#include <Common/logger_useful.h>
 #include <base/getThreadId.h>
 #include <Daemon/GraphiteWriter.h>
 #include <Common/Config/ConfigProcessor.h>
diff --git a/src/Daemon/SentryWriter.cpp b/src/Daemon/SentryWriter.cpp
index 9f4f18e64d1..041d3292841 100644
--- a/src/Daemon/SentryWriter.cpp
+++ b/src/Daemon/SentryWriter.cpp
@@ -13,12 +13,12 @@
 #include <Common/StackTrace.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Core/ServerUUID.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 #include "config.h"
 #include "config_version.h"
 
-#if USE_SENTRY && !defined(KEEPER_STANDALONE_BUILD)
+#if USE_SENTRY && !defined(CLICKHOUSE_PROGRAM_STANDALONE_BUILD)
 
 #    include <sentry.h>
 #    include <cstdio>
diff --git a/src/DataTypes/CMakeLists.txt b/src/DataTypes/CMakeLists.txt
index 4a60d6c54cf..2902ef0a955 100644
--- a/src/DataTypes/CMakeLists.txt
+++ b/src/DataTypes/CMakeLists.txt
@@ -3,3 +3,7 @@ add_subdirectory (Serializations)
 if (ENABLE_EXAMPLES)
     add_subdirectory (examples)
 endif ()
+
+if (ENABLE_FUZZING)
+    add_subdirectory(fuzzers)
+endif()
diff --git a/src/DataTypes/DataTypeCustom.h b/src/DataTypes/DataTypeCustom.h
index e8e4160af07..cf1e943d8e9 100644
--- a/src/DataTypes/DataTypeCustom.h
+++ b/src/DataTypes/DataTypeCustom.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 #include <cstddef>
-#include <Core/Types.h>
+#include <Core/Types_fwd.h>
 #include <DataTypes/Serializations/ISerialization.h>
 
 namespace DB
diff --git a/src/DataTypes/DataTypeDate32.h b/src/DataTypes/DataTypeDate32.h
index f0f78849e06..9160b62dc15 100644
--- a/src/DataTypes/DataTypeDate32.h
+++ b/src/DataTypes/DataTypeDate32.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <DataTypes/DataTypeNumberBase.h>
+#include <Core/Field.h>
 #include <Common/DateLUT.h>
+#include <DataTypes/DataTypeNumberBase.h>
 
 namespace DB
 {
diff --git a/src/DataTypes/DataTypeDateTime64.cpp b/src/DataTypes/DataTypeDateTime64.cpp
index 8ba8ad1cfec..124fea1f458 100644
--- a/src/DataTypes/DataTypeDateTime64.cpp
+++ b/src/DataTypes/DataTypeDateTime64.cpp
@@ -12,6 +12,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ARGUMENT_OUT_OF_BOUND;
+    extern const int LOGICAL_ERROR;
 }
 
 static constexpr UInt32 max_scale = 9;
@@ -56,4 +57,14 @@ SerializationPtr DataTypeDateTime64::doGetDefaultSerialization() const
     return std::make_shared<SerializationDateTime64>(scale, *this);
 }
 
+std::string getDateTimeTimezone(const IDataType & data_type)
+{
+    if (const auto * type = typeid_cast<const DataTypeDateTime *>(&data_type))
+        return type->hasExplicitTimeZone() ? type->getTimeZone().getTimeZone() : std::string();
+    if (const auto * type = typeid_cast<const DataTypeDateTime64 *>(&data_type))
+        return type->hasExplicitTimeZone() ? type->getTimeZone().getTimeZone() : std::string();
+
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot get time zone from type {}", data_type.getName());
+}
+
 }
diff --git a/src/DataTypes/DataTypeDateTime64.h b/src/DataTypes/DataTypeDateTime64.h
index ac0f49613a2..aaa99485040 100644
--- a/src/DataTypes/DataTypeDateTime64.h
+++ b/src/DataTypes/DataTypeDateTime64.h
@@ -41,5 +41,7 @@ protected:
     SerializationPtr doGetDefaultSerialization() const override;
 };
 
+std::string getDateTimeTimezone(const IDataType & data_type);
+
 }
 
diff --git a/src/DataTypes/DataTypeDecimalBase.h b/src/DataTypes/DataTypeDecimalBase.h
index 0be345ba879..adbe9c95b14 100644
--- a/src/DataTypes/DataTypeDecimalBase.h
+++ b/src/DataTypes/DataTypeDecimalBase.h
@@ -71,9 +71,12 @@ public:
         scale(scale_)
     {
         if (unlikely(precision < 1 || precision > maxPrecision()))
-            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Precision {} is out of bounds", std::to_string(precision));
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+                            "Precision {} is out of bounds (precision range: [1, {}])",
+                            std::to_string(precision), maxPrecision());
         if (unlikely(scale > maxPrecision()))
-            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Scale {} is out of bounds", std::to_string(scale));
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Scale {} is out of bounds (max scale: {})",
+                            std::to_string(scale), maxPrecision());
     }
 
     TypeIndex getTypeId() const override { return TypeToTypeIndex<T>; }
diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index 93db1654188..415f24d8151 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -217,10 +217,12 @@ void DataTypeFactory::registerDataTypeCustom(const String & family_name, Creator
     }, case_sensitiveness);
 }
 
-void DataTypeFactory::registerSimpleDataTypeCustom(const String &name, SimpleCreatorWithCustom creator, CaseSensitiveness case_sensitiveness)
+void DataTypeFactory::registerSimpleDataTypeCustom(const String & name, SimpleCreatorWithCustom creator, CaseSensitiveness case_sensitiveness)
 {
-    registerDataTypeCustom(name, [creator](const ASTPtr & /*ast*/)
+    registerDataTypeCustom(name, [name, creator](const ASTPtr & ast)
     {
+        if (ast)
+            throw Exception(ErrorCodes::DATA_TYPE_CANNOT_HAVE_ARGUMENTS, "Data type {} cannot have arguments", name);
         return creator();
     }, case_sensitiveness);
 }
diff --git a/src/DataTypes/DataTypeIPv4andIPv6.h b/src/DataTypes/DataTypeIPv4andIPv6.h
index 0a0c61d0ad8..ad70bdae933 100644
--- a/src/DataTypes/DataTypeIPv4andIPv6.h
+++ b/src/DataTypes/DataTypeIPv4andIPv6.h
@@ -37,6 +37,7 @@ public:
     bool textCanContainOnlyValidUTF8() const override { return true; }
     bool isComparable() const override { return true; }
     bool isValueRepresentedByNumber() const override { return true; }
+    bool isValueRepresentedByInteger() const override { return true; }
     bool isValueRepresentedByUnsignedInteger() const override { return true; }
     bool isValueUnambiguouslyRepresentedInContiguousMemoryRegion() const override { return true; }
     bool isValueUnambiguouslyRepresentedInFixedSizeContiguousMemoryRegion() const override { return true; }
diff --git a/src/DataTypes/DataTypeInterval.h b/src/DataTypes/DataTypeInterval.h
index 83d89a73460..05abe1d9b24 100644
--- a/src/DataTypes/DataTypeInterval.h
+++ b/src/DataTypes/DataTypeInterval.h
@@ -11,9 +11,6 @@ namespace DB
   *
   * Mostly the same as Int64.
   * But also tagged with interval kind.
-  *
-  * Intended usage is for temporary elements in expressions,
-  *  not for storing values in tables.
   */
 class DataTypeInterval final : public DataTypeNumberBase<Int64>
 {
@@ -34,7 +31,6 @@ public:
     bool equals(const IDataType & rhs) const override;
 
     bool isParametric() const override { return true; }
-    bool cannotBeStoredInTables() const override { return true; }
     bool isCategorial() const override { return false; }
     bool canBeInsideNullable() const override { return true; }
 };
diff --git a/src/DataTypes/DataTypeLowCardinality.cpp b/src/DataTypes/DataTypeLowCardinality.cpp
index 5e3a1cd3a0e..8293455cabc 100644
--- a/src/DataTypes/DataTypeLowCardinality.cpp
+++ b/src/DataTypes/DataTypeLowCardinality.cpp
@@ -55,7 +55,7 @@ namespace
         }
 
         template <typename T>
-        void operator()(Id<T>)
+        void operator()(TypeList<T>)
         {
             if (typeid_cast<const DataTypeNumber<T> *>(&keys_type))
                 column = creator(static_cast<ColumnVector<T> *>(nullptr));
diff --git a/src/DataTypes/DataTypeLowCardinality.h b/src/DataTypes/DataTypeLowCardinality.h
index 57f67ddad7a..d301a0f5443 100644
--- a/src/DataTypes/DataTypeLowCardinality.h
+++ b/src/DataTypes/DataTypeLowCardinality.h
@@ -86,6 +86,6 @@ DataTypePtr recursiveRemoveLowCardinality(const DataTypePtr & type);
 ColumnPtr recursiveRemoveLowCardinality(const ColumnPtr & column);
 
 /// Convert column of type from_type to type to_type by converting nested LowCardinality columns.
-ColumnPtr recursiveTypeConversion(const ColumnPtr & column, const DataTypePtr & from_type, const DataTypePtr & to_type);
+ColumnPtr recursiveLowCardinalityTypeConversion(const ColumnPtr & column, const DataTypePtr & from_type, const DataTypePtr & to_type);
 
 }
diff --git a/src/DataTypes/DataTypeLowCardinalityHelpers.cpp b/src/DataTypes/DataTypeLowCardinalityHelpers.cpp
index 8a61afee420..98eb76267a4 100644
--- a/src/DataTypes/DataTypeLowCardinalityHelpers.cpp
+++ b/src/DataTypes/DataTypeLowCardinalityHelpers.cpp
@@ -113,7 +113,7 @@ ColumnPtr recursiveRemoveLowCardinality(const ColumnPtr & column)
     return column;
 }
 
-ColumnPtr recursiveTypeConversion(const ColumnPtr & column, const DataTypePtr & from_type, const DataTypePtr & to_type)
+ColumnPtr recursiveLowCardinalityTypeConversion(const ColumnPtr & column, const DataTypePtr & from_type, const DataTypePtr & to_type)
 {
     if (!column)
         return column;
@@ -128,7 +128,7 @@ ColumnPtr recursiveTypeConversion(const ColumnPtr & column, const DataTypePtr &
     if (const auto * column_const = typeid_cast<const ColumnConst *>(column.get()))
     {
         const auto & nested = column_const->getDataColumnPtr();
-        auto nested_no_lc = recursiveTypeConversion(nested, from_type, to_type);
+        auto nested_no_lc = recursiveLowCardinalityTypeConversion(nested, from_type, to_type);
         if (nested.get() == nested_no_lc.get())
             return column;
 
@@ -164,7 +164,7 @@ ColumnPtr recursiveTypeConversion(const ColumnPtr & column, const DataTypePtr &
             const auto & nested_to = to_array_type->getNestedType();
 
             return ColumnArray::create(
-                    recursiveTypeConversion(column_array->getDataPtr(), nested_from, nested_to),
+                    recursiveLowCardinalityTypeConversion(column_array->getDataPtr(), nested_from, nested_to),
                     column_array->getOffsetsPtr());
         }
     }
@@ -187,7 +187,7 @@ ColumnPtr recursiveTypeConversion(const ColumnPtr & column, const DataTypePtr &
             for (size_t i = 0; i < columns.size(); ++i)
             {
                 auto & element = columns[i];
-                auto element_no_lc = recursiveTypeConversion(element, from_elements.at(i), to_elements.at(i));
+                auto element_no_lc = recursiveLowCardinalityTypeConversion(element, from_elements.at(i), to_elements.at(i));
                 if (element.get() != element_no_lc.get())
                 {
                     element = element_no_lc;
diff --git a/src/DataTypes/DataTypeMap.cpp b/src/DataTypes/DataTypeMap.cpp
index 879e40eb098..0f5d97e6761 100644
--- a/src/DataTypes/DataTypeMap.cpp
+++ b/src/DataTypes/DataTypeMap.cpp
@@ -128,6 +128,13 @@ bool DataTypeMap::checkKeyType(DataTypePtr key_type)
     return true;
 }
 
+DataTypePtr DataTypeMap::getNestedTypeWithUnnamedTuple() const
+{
+    const auto & from_array = assert_cast<const DataTypeArray &>(*nested);
+    const auto & from_tuple = assert_cast<const DataTypeTuple &>(*from_array.getNestedType());
+    return std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(from_tuple.getElements()));
+}
+
 static DataTypePtr create(const ASTPtr & arguments)
 {
     if (!arguments || arguments->children.size() != 2)
diff --git a/src/DataTypes/DataTypeMap.h b/src/DataTypes/DataTypeMap.h
index 2ab5c602a25..4712f6bbdef 100644
--- a/src/DataTypes/DataTypeMap.h
+++ b/src/DataTypes/DataTypeMap.h
@@ -47,6 +47,7 @@ public:
     const DataTypePtr & getValueType() const { return value_type; }
     DataTypes getKeyValueTypes() const { return {key_type, value_type}; }
     const DataTypePtr & getNestedType() const { return nested; }
+    DataTypePtr getNestedTypeWithUnnamedTuple() const;
 
     SerializationPtr doGetDefaultSerialization() const override;
 
diff --git a/src/DataTypes/DataTypeNumberBase.h b/src/DataTypes/DataTypeNumberBase.h
index 01c298a4a33..3a5b11c5124 100644
--- a/src/DataTypes/DataTypeNumberBase.h
+++ b/src/DataTypes/DataTypeNumberBase.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <base/TypeName.h>
 #include <Core/TypeId.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/Serializations/SerializationNumber.h>
@@ -8,9 +9,6 @@
 namespace DB
 {
 
-template <typename T>
-class ColumnVector;
-
 /** Implements part of the IDataType interface, common to all numbers and for Date and DateTime.
   */
 template <typename T>
diff --git a/src/DataTypes/DataTypeSet.h b/src/DataTypes/DataTypeSet.h
index 7ef0d931279..7ddfeb9fe30 100644
--- a/src/DataTypes/DataTypeSet.h
+++ b/src/DataTypes/DataTypeSet.h
@@ -20,7 +20,7 @@ public:
     bool isParametric() const override { return true; }
 
     // Used for expressions analysis.
-    MutableColumnPtr createColumn() const override { return ColumnSet::create(0, nullptr); }
+    MutableColumnPtr createColumn() const override { return ColumnSet::create(0, FutureSet{}); }
 
     // Used only for debugging, making it DUMPABLE
     Field getDefault() const override { return Tuple(); }
diff --git a/src/DataTypes/DataTypesDecimal.cpp b/src/DataTypes/DataTypesDecimal.cpp
index 1ae0d8a6db1..1c2a63371ee 100644
--- a/src/DataTypes/DataTypesDecimal.cpp
+++ b/src/DataTypes/DataTypesDecimal.cpp
@@ -40,8 +40,10 @@ bool DataTypeDecimal<T>::equals(const IDataType & rhs) const
 template <is_decimal T>
 DataTypePtr DataTypeDecimal<T>::promoteNumericType() const
 {
-    using PromotedType = DataTypeDecimal<Decimal128>;
-    return std::make_shared<PromotedType>(PromotedType::maxPrecision(), this->scale);
+    if (sizeof(T) <= sizeof(Decimal128))
+        return std::make_shared<DataTypeDecimal<Decimal128>>(DataTypeDecimal<Decimal128>::maxPrecision(), this->scale);
+    else
+        return std::make_shared<DataTypeDecimal<Decimal256>>(DataTypeDecimal<Decimal256>::maxPrecision(), this->scale);
 }
 
 template <is_decimal T>
@@ -89,12 +91,12 @@ static DataTypePtr createExact(const ASTPtr & arguments)
 {
     if (!arguments || arguments->children.size() != 1)
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                        "Decimal data type family must have exactly two arguments: precision and scale");
-
+        "Decimal32 | Decimal64 | Decimal128 | Decimal256 data type family must have exactly one arguments: scale");
     const auto * scale_arg = arguments->children[0]->as<ASTLiteral>();
 
     if (!scale_arg || !(scale_arg->value.getType() == Field::Types::Int64 || scale_arg->value.getType() == Field::Types::UInt64))
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Decimal data type family must have a two numbers as its arguments");
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+        "Decimal32 | Decimal64 | Decimal128 | Decimal256 data type family must have a one number as its argument");
 
     UInt64 precision = DecimalUtils::max_precision<T>;
     UInt64 scale = scale_arg->value.get<UInt64>();
diff --git a/src/DataTypes/DataTypesDecimal.h b/src/DataTypes/DataTypesDecimal.h
index 7a49238b5be..583f7ea804a 100644
--- a/src/DataTypes/DataTypesDecimal.h
+++ b/src/DataTypes/DataTypesDecimal.h
@@ -116,7 +116,8 @@ inline ReturnType convertDecimalsImpl(const typename FromDataType::FieldType & v
         if (common::mulOverflow(static_cast<MaxNativeType>(value.value), converted_value, converted_value))
         {
             if constexpr (throw_exception)
-                throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "{} convert overflow", std::string(ToDataType::family_name));
+                throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "{} convert overflow while multiplying {} by scale {}",
+                                std::string(ToDataType::family_name), toString(value.value), toString(converted_value));
             else
                 return ReturnType(false);
         }
@@ -136,7 +137,10 @@ inline ReturnType convertDecimalsImpl(const typename FromDataType::FieldType & v
             converted_value > std::numeric_limits<typename ToFieldType::NativeType>::max())
         {
             if constexpr (throw_exception)
-                throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "{} convert overflow", std::string(ToDataType::family_name));
+                throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "{} convert overflow: {} is not in range ({}, {})",
+                                std::string(ToDataType::family_name), toString(converted_value),
+                                toString(std::numeric_limits<typename ToFieldType::NativeType>::min()),
+                                toString(std::numeric_limits<typename ToFieldType::NativeType>::max()));
             else
                 return ReturnType(false);
         }
diff --git a/src/DataTypes/EnumValues.cpp b/src/DataTypes/EnumValues.cpp
index e82a8e96047..9df49e765a7 100644
--- a/src/DataTypes/EnumValues.cpp
+++ b/src/DataTypes/EnumValues.cpp
@@ -10,7 +10,7 @@ namespace ErrorCodes
 {
     extern const int SYNTAX_ERROR;
     extern const int EMPTY_DATA_PASSED;
-    extern const int BAD_ARGUMENTS;
+    extern const int UNKNOWN_ELEMENT_OF_ENUM;
 }
 
 template <typename T>
@@ -69,7 +69,7 @@ T EnumValues<T>::getValue(StringRef field_name, bool try_treat_as_id) const
         }
         auto hints = this->getHints(field_name.toString());
         auto hints_string = !hints.empty() ? ", maybe you meant: " + toString(hints) : "";
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown element '{}' for enum {}", field_name.toString(), hints_string);
+        throw Exception(ErrorCodes::UNKNOWN_ELEMENT_OF_ENUM, "Unknown element '{}' for enum{}", field_name.toString(), hints_string);
     }
     return it->getMapped();
 }
diff --git a/src/DataTypes/IDataType.cpp b/src/DataTypes/IDataType.cpp
index e0612fbbf36..4ffe82039b2 100644
--- a/src/DataTypes/IDataType.cpp
+++ b/src/DataTypes/IDataType.cpp
@@ -102,7 +102,7 @@ void IDataType::forEachSubcolumn(
 
 template <typename Ptr>
 Ptr IDataType::getForSubcolumn(
-    const String & subcolumn_name,
+    std::string_view subcolumn_name,
     const SubstreamData & data,
     Ptr SubstreamData::*member,
     bool throw_if_null) const
@@ -120,36 +120,36 @@ Ptr IDataType::getForSubcolumn(
     return res;
 }
 
-bool IDataType::hasSubcolumn(const String & subcolumn_name) const
+bool IDataType::hasSubcolumn(std::string_view subcolumn_name) const
 {
     return tryGetSubcolumnType(subcolumn_name) != nullptr;
 }
 
-DataTypePtr IDataType::tryGetSubcolumnType(const String & subcolumn_name) const
+DataTypePtr IDataType::tryGetSubcolumnType(std::string_view subcolumn_name) const
 {
     auto data = SubstreamData(getDefaultSerialization()).withType(getPtr());
     return getForSubcolumn<DataTypePtr>(subcolumn_name, data, &SubstreamData::type, false);
 }
 
-DataTypePtr IDataType::getSubcolumnType(const String & subcolumn_name) const
+DataTypePtr IDataType::getSubcolumnType(std::string_view subcolumn_name) const
 {
     auto data = SubstreamData(getDefaultSerialization()).withType(getPtr());
     return getForSubcolumn<DataTypePtr>(subcolumn_name, data, &SubstreamData::type, true);
 }
 
-ColumnPtr IDataType::tryGetSubcolumn(const String & subcolumn_name, const ColumnPtr & column) const
+ColumnPtr IDataType::tryGetSubcolumn(std::string_view subcolumn_name, const ColumnPtr & column) const
 {
     auto data = SubstreamData(getDefaultSerialization()).withColumn(column);
     return getForSubcolumn<ColumnPtr>(subcolumn_name, data, &SubstreamData::column, false);
 }
 
-ColumnPtr IDataType::getSubcolumn(const String & subcolumn_name, const ColumnPtr & column) const
+ColumnPtr IDataType::getSubcolumn(std::string_view subcolumn_name, const ColumnPtr & column) const
 {
     auto data = SubstreamData(getDefaultSerialization()).withColumn(column);
     return getForSubcolumn<ColumnPtr>(subcolumn_name, data, &SubstreamData::column, true);
 }
 
-SerializationPtr IDataType::getSubcolumnSerialization(const String & subcolumn_name, const SerializationPtr & serialization) const
+SerializationPtr IDataType::getSubcolumnSerialization(std::string_view subcolumn_name, const SerializationPtr & serialization) const
 {
     auto data = SubstreamData(serialization);
     return getForSubcolumn<SerializationPtr>(subcolumn_name, data, &SubstreamData::serialization, true);
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index e5bdbeca69e..7cc18fea00c 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -79,15 +79,15 @@ public:
     /// Data type id. It's used for runtime type checks.
     virtual TypeIndex getTypeId() const = 0;
 
-    bool hasSubcolumn(const String & subcolumn_name) const;
+    bool hasSubcolumn(std::string_view subcolumn_name) const;
 
-    DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const;
-    DataTypePtr getSubcolumnType(const String & subcolumn_name) const;
+    DataTypePtr tryGetSubcolumnType(std::string_view subcolumn_name) const;
+    DataTypePtr getSubcolumnType(std::string_view subcolumn_name) const;
 
-    ColumnPtr tryGetSubcolumn(const String & subcolumn_name, const ColumnPtr & column) const;
-    ColumnPtr getSubcolumn(const String & subcolumn_name, const ColumnPtr & column) const;
+    ColumnPtr tryGetSubcolumn(std::string_view subcolumn_name, const ColumnPtr & column) const;
+    ColumnPtr getSubcolumn(std::string_view subcolumn_name, const ColumnPtr & column) const;
 
-    SerializationPtr getSubcolumnSerialization(const String & subcolumn_name, const SerializationPtr & serialization) const;
+    SerializationPtr getSubcolumnSerialization(std::string_view subcolumn_name, const SerializationPtr & serialization) const;
 
     using SubstreamData = ISerialization::SubstreamData;
     using SubstreamPath = ISerialization::SubstreamPath;
@@ -315,7 +315,7 @@ public:
 private:
     template <typename Ptr>
     Ptr getForSubcolumn(
-        const String & subcolumn_name,
+        std::string_view subcolumn_name,
         const SubstreamData & data,
         Ptr SubstreamData::*member,
         bool throw_if_null) const;
@@ -340,8 +340,8 @@ struct WhichDataType
     constexpr bool isUInt64() const { return idx == TypeIndex::UInt64; }
     constexpr bool isUInt128() const { return idx == TypeIndex::UInt128; }
     constexpr bool isUInt256() const { return idx == TypeIndex::UInt256; }
-    constexpr bool isUInt() const { return isUInt8() || isUInt16() || isUInt32() || isUInt64() || isUInt128() || isUInt256(); }
     constexpr bool isNativeUInt() const { return isUInt8() || isUInt16() || isUInt32() || isUInt64(); }
+    constexpr bool isUInt() const { return isNativeUInt() || isUInt128() || isUInt256(); }
 
     constexpr bool isInt8() const { return idx == TypeIndex::Int8; }
     constexpr bool isInt16() const { return idx == TypeIndex::Int16; }
@@ -349,8 +349,8 @@ struct WhichDataType
     constexpr bool isInt64() const { return idx == TypeIndex::Int64; }
     constexpr bool isInt128() const { return idx == TypeIndex::Int128; }
     constexpr bool isInt256() const { return idx == TypeIndex::Int256; }
-    constexpr bool isInt() const { return isInt8() || isInt16() || isInt32() || isInt64() || isInt128() || isInt256(); }
     constexpr bool isNativeInt() const { return isInt8() || isInt16() || isInt32() || isInt64(); }
+    constexpr bool isInt() const { return isNativeInt() || isInt128() || isInt256(); }
 
     constexpr bool isDecimal32() const { return idx == TypeIndex::Decimal32; }
     constexpr bool isDecimal64() const { return idx == TypeIndex::Decimal64; }
@@ -556,6 +556,7 @@ inline bool isNullableOrLowCardinalityNullable(const DataTypePtr & data_type)
 template <typename DataType> constexpr bool IsDataTypeDecimal = false;
 template <typename DataType> constexpr bool IsDataTypeNumber = false;
 template <typename DataType> constexpr bool IsDataTypeDateOrDateTime = false;
+template <typename DataType> constexpr bool IsDataTypeDate = false;
 template <typename DataType> constexpr bool IsDataTypeEnum = false;
 
 template <typename DataType> constexpr bool IsDataTypeDecimalOrNumber = IsDataTypeDecimal<DataType> || IsDataTypeNumber<DataType>;
@@ -576,6 +577,9 @@ template <> inline constexpr bool IsDataTypeDecimal<DataTypeDateTime64> = true;
 
 template <typename T> constexpr bool IsDataTypeNumber<DataTypeNumber<T>> = true;
 
+template <> inline constexpr bool IsDataTypeDate<DataTypeDate> = true;
+template <> inline constexpr bool IsDataTypeDate<DataTypeDate32> = true;
+
 template <> inline constexpr bool IsDataTypeDateOrDateTime<DataTypeDate> = true;
 template <> inline constexpr bool IsDataTypeDateOrDateTime<DataTypeDate32> = true;
 template <> inline constexpr bool IsDataTypeDateOrDateTime<DataTypeDateTime> = true;
@@ -626,7 +630,7 @@ struct fmt::formatter<DB::DataTypePtr>
 
         /// Only support {}.
         if (it != end && *it != '}')
-            throw format_error("invalid format");
+            throw fmt::format_error("invalid format");
 
         return it;
     }
@@ -634,6 +638,6 @@ struct fmt::formatter<DB::DataTypePtr>
     template <typename FormatContext>
     auto format(const DB::DataTypePtr & type, FormatContext & ctx)
     {
-        return format_to(ctx.out(), "{}", type->getName());
+        return fmt::format_to(ctx.out(), "{}", type->getName());
     }
 };
diff --git a/src/DataTypes/Native.h b/src/DataTypes/Native.h
index 8f4a2abcff7..a3c8486fa60 100644
--- a/src/DataTypes/Native.h
+++ b/src/DataTypes/Native.h
@@ -9,13 +9,8 @@
 #    include <DataTypes/DataTypeNullable.h>
 #    include <Columns/ColumnConst.h>
 #    include <Columns/ColumnNullable.h>
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wunused-parameter"
-
 #    include <llvm/IR/IRBuilder.h>
 
-#    pragma GCC diagnostic pop
-
 
 namespace DB
 {
diff --git a/src/DataTypes/ObjectUtils.cpp b/src/DataTypes/ObjectUtils.cpp
index edda0235bcc..28f000b6f0d 100644
--- a/src/DataTypes/ObjectUtils.cpp
+++ b/src/DataTypes/ObjectUtils.cpp
@@ -30,6 +30,7 @@ namespace ErrorCodes
     extern const int TYPE_MISMATCH;
     extern const int LOGICAL_ERROR;
     extern const int INCOMPATIBLE_COLUMNS;
+    extern const int NOT_IMPLEMENTED;
 }
 
 size_t getNumberOfDimensions(const IDataType & type)
@@ -121,7 +122,7 @@ DataTypePtr getDataTypeByColumn(const IColumn & column)
         return makeNullable(getDataTypeByColumn(column_nullable->getNestedColumn()));
 
     /// TODO: add more types.
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot get data type of column {}", column.getFamilyName());
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot get data type of column {}", column.getFamilyName());
 }
 
 template <size_t I, typename Tuple>
diff --git a/src/DataTypes/Serializations/ISerialization.h b/src/DataTypes/Serializations/ISerialization.h
index ea86a91ac88..17e6dfb85bc 100644
--- a/src/DataTypes/Serializations/ISerialization.h
+++ b/src/DataTypes/Serializations/ISerialization.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/COW.h>
-#include <Core/Types.h>
+#include <Core/Types_fwd.h>
 #include <base/demangle.h>
 #include <Common/typeid_cast.h>
 #include <Columns/IColumn.h>
@@ -345,6 +345,11 @@ public:
       */
     virtual void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
     virtual void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
+    virtual void serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t /*indent*/) const
+    {
+        serializeTextJSON(column, row_num, ostr, settings);
+    }
+
 
     /** Text serialization for putting into the XML format.
       */
diff --git a/src/DataTypes/Serializations/SerializationAggregateFunction.cpp b/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
index 7e192595114..c482c9623e9 100644
--- a/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
+++ b/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
@@ -7,6 +7,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/AlignedBuffer.h>
+#include <Common/Arena.h>
 
 #include <Formats/FormatSettings.h>
 #include <Formats/ProtobufReader.h>
diff --git a/src/DataTypes/Serializations/SerializationArray.cpp b/src/DataTypes/Serializations/SerializationArray.cpp
index 73b232690c7..cedcca870dd 100644
--- a/src/DataTypes/Serializations/SerializationArray.cpp
+++ b/src/DataTypes/Serializations/SerializationArray.cpp
@@ -32,9 +32,9 @@ void SerializationArray::serializeBinary(const Field & field, WriteBuffer & ostr
 {
     const Array & a = field.get<const Array &>();
     writeVarUInt(a.size(), ostr);
-    for (size_t i = 0; i < a.size(); ++i)
+    for (const auto & i : a)
     {
-        nested->serializeBinary(a[i], ostr, settings);
+        nested->serializeBinary(i, ostr, settings);
     }
 }
 
@@ -43,6 +43,14 @@ void SerializationArray::deserializeBinary(Field & field, ReadBuffer & istr, con
 {
     size_t size;
     readVarUInt(size, istr);
+    if (settings.max_binary_array_size && size > settings.max_binary_array_size)
+        throw Exception(
+            ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+            "Too large array size: {}. The maximum is: {}. To increase the maximum, use setting "
+            "format_binary_max_array_size",
+            size,
+            settings.max_binary_array_size);
+
     field = Array();
     Array & arr = field.get<Array &>();
     arr.reserve(size);
@@ -75,6 +83,13 @@ void SerializationArray::deserializeBinary(IColumn & column, ReadBuffer & istr,
 
     size_t size;
     readVarUInt(size, istr);
+    if (settings.max_binary_array_size && size > settings.max_binary_array_size)
+        throw Exception(
+            ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+            "Too large array size: {}. The maximum is: {}. To increase the maximum, use setting "
+            "format_binary_max_array_size",
+            size,
+            settings.max_binary_array_size);
 
     IColumn & nested_column = column_array.getData();
 
@@ -505,6 +520,35 @@ void SerializationArray::serializeTextJSON(const IColumn & column, size_t row_nu
     writeChar(']', ostr);
 }
 
+void SerializationArray::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
+{
+    const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
+    const ColumnArray::Offsets & offsets = column_array.getOffsets();
+
+    size_t offset = offsets[row_num - 1];
+    size_t next_offset = offsets[row_num];
+
+    const IColumn & nested_column = column_array.getData();
+
+    if (offset == next_offset)
+    {
+        writeCString("[]", ostr);
+        return;
+    }
+
+    writeCString("[\n", ostr);
+    for (size_t i = offset; i < next_offset; ++i)
+    {
+        if (i != offset)
+            writeCString(",\n", ostr);
+        writeChar(' ', (indent + 1) * 4, ostr);
+        nested->serializeTextJSONPretty(nested_column, i, ostr, settings, indent + 1);
+    }
+    writeChar('\n', ostr);
+    writeChar(' ', indent * 4, ostr);
+    writeChar(']', ostr);
+}
+
 
 void SerializationArray::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
diff --git a/src/DataTypes/Serializations/SerializationArray.h b/src/DataTypes/Serializations/SerializationArray.h
index a5e10cd22fb..de331169db5 100644
--- a/src/DataTypes/Serializations/SerializationArray.h
+++ b/src/DataTypes/Serializations/SerializationArray.h
@@ -23,6 +23,7 @@ public:
 
     void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const override;
 
     void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
 
diff --git a/src/DataTypes/Serializations/SerializationBool.cpp b/src/DataTypes/Serializations/SerializationBool.cpp
index 81ad0ec46b1..41b5bf806e5 100644
--- a/src/DataTypes/Serializations/SerializationBool.cpp
+++ b/src/DataTypes/Serializations/SerializationBool.cpp
@@ -238,12 +238,15 @@ void SerializationBool::deserializeTextJSON(IColumn &column, ReadBuffer &istr, c
     ColumnUInt8 * col = checkAndGetDeserializeColumnType(column);
     bool value = false;
 
-    if (*istr.position() == 't' || *istr.position() == 'f')
+    char first_char = *istr.position();
+    if (first_char == 't' || first_char == 'f')
         readBoolTextWord(value, istr);
-    else if (*istr.position() == '1' || *istr.position() == '0')
+    else if (first_char == '1' || first_char == '0')
         readBoolText(value, istr);
     else
-        throw Exception(ErrorCodes::CANNOT_PARSE_BOOL, "Invalid boolean value, should be true/false, 1/0.");
+        throw Exception(ErrorCodes::CANNOT_PARSE_BOOL,
+            "Invalid boolean value, should be true/false, 1/0, but it starts with the '{}' character.", first_char);
+
     col->insert(value);
 }
 
diff --git a/src/DataTypes/Serializations/SerializationEnum.cpp b/src/DataTypes/Serializations/SerializationEnum.cpp
index afa67ba800a..a1bd63d4327 100644
--- a/src/DataTypes/Serializations/SerializationEnum.cpp
+++ b/src/DataTypes/Serializations/SerializationEnum.cpp
@@ -1,10 +1,11 @@
 #include <DataTypes/Serializations/SerializationEnum.h>
 
+#include <Columns/ColumnVector.h>
+#include <Common/assert_cast.h>
 #include <IO/WriteBufferFromString.h>
 #include <Formats/FormatSettings.h>
 #include <Formats/ProtobufReader.h>
 #include <Formats/ProtobufWriter.h>
-#include <Common/assert_cast.h>
 
 namespace DB
 {
diff --git a/src/DataTypes/Serializations/SerializationIPv4andIPv6.h b/src/DataTypes/Serializations/SerializationIPv4andIPv6.h
index 488650c7100..61464962f1c 100644
--- a/src/DataTypes/Serializations/SerializationIPv4andIPv6.h
+++ b/src/DataTypes/Serializations/SerializationIPv4andIPv6.h
@@ -1,9 +1,10 @@
 #pragma once
 
+#include <base/TypeName.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Columns/ColumnsNumber.h>
-#include <base/TypeName.h>
+#include <DataTypes/Serializations/SimpleTextSerialization.h>
 
 namespace DB
 {
diff --git a/src/DataTypes/Serializations/SerializationInfo.cpp b/src/DataTypes/Serializations/SerializationInfo.cpp
index 313fa1fa235..4e9b9905454 100644
--- a/src/DataTypes/Serializations/SerializationInfo.cpp
+++ b/src/DataTypes/Serializations/SerializationInfo.cpp
@@ -97,6 +97,41 @@ MutableSerializationInfoPtr SerializationInfo::clone() const
     return std::make_shared<SerializationInfo>(kind, settings, data);
 }
 
+/// Returns true if all rows with default values of type 'lhs'
+/// are mapped to default values of type 'rhs' after conversion.
+static bool preserveDefaultsAfterConversion(const IDataType & lhs, const IDataType & rhs)
+{
+    if (lhs.equals(rhs))
+        return true;
+
+    bool lhs_is_columned_as_numeric = isColumnedAsNumber(lhs) || isColumnedAsDecimal(lhs);
+    bool rhs_is_columned_as_numeric = isColumnedAsNumber(rhs) || isColumnedAsDecimal(rhs);
+
+    if (lhs_is_columned_as_numeric && rhs_is_columned_as_numeric)
+        return true;
+
+    if (isStringOrFixedString(lhs) && isStringOrFixedString(rhs))
+        return true;
+
+    return false;
+}
+
+std::shared_ptr<SerializationInfo> SerializationInfo::createWithType(
+    const IDataType & old_type,
+    const IDataType & new_type,
+    const Settings & new_settings) const
+{
+    auto new_kind = kind;
+    if (new_kind == ISerialization::Kind::SPARSE)
+    {
+        if (!new_type.supportsSparseSerialization()
+            || !preserveDefaultsAfterConversion(old_type, new_type))
+            new_kind = ISerialization::Kind::DEFAULT;
+    }
+
+    return std::make_shared<SerializationInfo>(new_kind, new_settings);
+}
+
 void SerializationInfo::serialializeKindBinary(WriteBuffer & out) const
 {
     writeBinary(static_cast<UInt8>(kind), out);
@@ -211,7 +246,8 @@ void SerializationInfoByName::writeJSON(WriteBuffer & out) const
     return writeString(oss.str(), out);
 }
 
-void SerializationInfoByName::readJSON(ReadBuffer & in)
+SerializationInfoByName SerializationInfoByName::readJSON(
+    const NamesAndTypesList & columns, const Settings & settings, ReadBuffer & in)
 {
     String json_str;
     readString(json_str, in);
@@ -227,8 +263,13 @@ void SerializationInfoByName::readJSON(ReadBuffer & in)
             "Unknown version of serialization infos ({}). Should be less or equal than {}",
             object->getValue<size_t>(KEY_VERSION), SERIALIZATION_INFO_VERSION);
 
+    SerializationInfoByName infos;
     if (object->has(KEY_COLUMNS))
     {
+        std::unordered_map<std::string_view, const IDataType *> column_type_by_name;
+        for (const auto & [name, type] : columns)
+            column_type_by_name.emplace(name, type.get());
+
         auto array = object->getArray(KEY_COLUMNS);
         for (const auto & elem : *array)
         {
@@ -236,13 +277,22 @@ void SerializationInfoByName::readJSON(ReadBuffer & in)
 
             if (!elem_object->has(KEY_NAME))
                 throw Exception(ErrorCodes::CORRUPTED_DATA,
-                    "Missed field '{}' in SerializationInfo of columns", KEY_NAME);
+                    "Missed field '{}' in serialization infos", KEY_NAME);
 
             auto name = elem_object->getValue<String>(KEY_NAME);
-            if (auto it = find(name); it != end())
-                it->second->fromJSON(*elem_object);
+            auto it = column_type_by_name.find(name);
+
+            if (it == column_type_by_name.end())
+                throw Exception(ErrorCodes::CORRUPTED_DATA,
+                    "Found unexpected column '{}' in serialization infos", name);
+
+            auto info = it->second->createSerializationInfo(settings);
+            info->fromJSON(*elem_object);
+            infos.emplace(name, std::move(info));
         }
     }
+
+    return infos;
 }
 
 }
diff --git a/src/DataTypes/Serializations/SerializationInfo.h b/src/DataTypes/Serializations/SerializationInfo.h
index a4a5685253f..3d8f4f1d00c 100644
--- a/src/DataTypes/Serializations/SerializationInfo.h
+++ b/src/DataTypes/Serializations/SerializationInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <Core/Types_fwd.h>
 #include <DataTypes/Serializations/ISerialization.h>
 #include <Poco/JSON/Object.h>
 
@@ -8,6 +8,7 @@
 namespace DB
 {
 
+class ReadBuffer;
 class ReadBuffer;
 class WriteBuffer;
 class NamesAndTypesList;
@@ -51,6 +52,7 @@ public:
     virtual ~SerializationInfo() = default;
 
     virtual bool hasCustomSerialization() const { return kind != ISerialization::Kind::DEFAULT; }
+    virtual bool structureEquals(const SerializationInfo & rhs) const { return typeid(SerializationInfo) == typeid(rhs); }
 
     virtual void add(const IColumn & column);
     virtual void add(const SerializationInfo & other);
@@ -59,6 +61,11 @@ public:
 
     virtual std::shared_ptr<SerializationInfo> clone() const;
 
+    virtual std::shared_ptr<SerializationInfo> createWithType(
+        const IDataType & old_type,
+        const IDataType & new_type,
+        const Settings & new_settings) const;
+
     virtual void serialializeKindBinary(WriteBuffer & out) const;
     virtual void deserializeFromKindsBinary(ReadBuffer & in);
 
@@ -85,11 +92,14 @@ using MutableSerializationInfoPtr = std::shared_ptr<SerializationInfo>;
 using SerializationInfos = std::vector<SerializationInfoPtr>;
 using MutableSerializationInfos = std::vector<MutableSerializationInfoPtr>;
 
-class SerializationInfoByName : public std::unordered_map<String, MutableSerializationInfoPtr>
+/// The order is important because info is serialized to part metadata.
+class SerializationInfoByName : public std::map<String, MutableSerializationInfoPtr>
 {
 public:
+    using Settings = SerializationInfo::Settings;
+
     SerializationInfoByName() = default;
-    SerializationInfoByName(const NamesAndTypesList & columns, const SerializationInfo::Settings & settings);
+    SerializationInfoByName(const NamesAndTypesList & columns, const Settings & settings);
 
     void add(const Block & block);
     void add(const SerializationInfoByName & other);
@@ -100,7 +110,9 @@ public:
     void replaceData(const SerializationInfoByName & other);
 
     void writeJSON(WriteBuffer & out) const;
-    void readJSON(ReadBuffer & in);
+
+    static SerializationInfoByName readJSON(
+        const NamesAndTypesList & columns, const Settings & settings, ReadBuffer & in);
 };
 
 }
diff --git a/src/DataTypes/Serializations/SerializationInfoTuple.cpp b/src/DataTypes/Serializations/SerializationInfoTuple.cpp
index 6c326743e8a..d36668f03b6 100644
--- a/src/DataTypes/Serializations/SerializationInfoTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationInfoTuple.cpp
@@ -28,6 +28,19 @@ bool SerializationInfoTuple::hasCustomSerialization() const
     return std::any_of(elems.begin(), elems.end(), [](const auto & elem) { return elem->hasCustomSerialization(); });
 }
 
+bool SerializationInfoTuple::structureEquals(const SerializationInfo & rhs) const
+{
+    const auto * rhs_tuple = typeid_cast<const SerializationInfoTuple *>(&rhs);
+    if (!rhs_tuple || elems.size() != rhs_tuple->elems.size())
+        return false;
+
+    for (size_t i = 0; i < elems.size(); ++i)
+        if (!elems[i]->structureEquals(*rhs_tuple->elems[i]))
+            return false;
+
+    return true;
+}
+
 void SerializationInfoTuple::add(const IColumn & column)
 {
     SerializationInfo::add(column);
@@ -84,6 +97,28 @@ MutableSerializationInfoPtr SerializationInfoTuple::clone() const
     return std::make_shared<SerializationInfoTuple>(std::move(elems_cloned), names, settings);
 }
 
+MutableSerializationInfoPtr SerializationInfoTuple::createWithType(
+    const IDataType & old_type,
+    const IDataType & new_type,
+    const Settings & new_settings) const
+{
+    const auto & old_tuple = assert_cast<const DataTypeTuple &>(old_type);
+    const auto & new_tuple = assert_cast<const DataTypeTuple &>(new_type);
+
+    const auto & old_elements = old_tuple.getElements();
+    const auto & new_elements = new_tuple.getElements();
+
+    assert(elems.size() == old_elements.size());
+    assert(elems.size() == new_elements.size());
+
+    MutableSerializationInfos infos;
+    infos.reserve(elems.size());
+    for (size_t i = 0; i < elems.size(); ++i)
+        infos.push_back(elems[i]->createWithType(*old_elements[i], *new_elements[i], new_settings));
+
+    return std::make_shared<SerializationInfoTuple>(std::move(infos), names, new_settings);
+}
+
 void SerializationInfoTuple::serialializeKindBinary(WriteBuffer & out) const
 {
     SerializationInfo::serialializeKindBinary(out);
diff --git a/src/DataTypes/Serializations/SerializationInfoTuple.h b/src/DataTypes/Serializations/SerializationInfoTuple.h
index b01c629d2ff..a9f3bdb6c6e 100644
--- a/src/DataTypes/Serializations/SerializationInfoTuple.h
+++ b/src/DataTypes/Serializations/SerializationInfoTuple.h
@@ -11,6 +11,7 @@ public:
     SerializationInfoTuple(MutableSerializationInfos elems_, Names names_, const Settings & settings_);
 
     bool hasCustomSerialization() const override;
+    bool structureEquals(const SerializationInfo & rhs) const override;
 
     void add(const IColumn & column) override;
     void add(const SerializationInfo & other) override;
@@ -19,6 +20,11 @@ public:
 
     MutableSerializationInfoPtr clone() const override;
 
+    MutableSerializationInfoPtr createWithType(
+        const IDataType & old_type,
+        const IDataType & new_type,
+        const Settings & new_settings) const override;
+
     void serialializeKindBinary(WriteBuffer & out) const override;
     void deserializeFromKindsBinary(ReadBuffer & in) override;
 
diff --git a/src/DataTypes/Serializations/SerializationMap.cpp b/src/DataTypes/Serializations/SerializationMap.cpp
index 34da0f11cae..af1d96c4ca7 100644
--- a/src/DataTypes/Serializations/SerializationMap.cpp
+++ b/src/DataTypes/Serializations/SerializationMap.cpp
@@ -20,6 +20,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int CANNOT_READ_MAP_FROM_TEXT;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 
 SerializationMap::SerializationMap(const SerializationPtr & key_, const SerializationPtr & value_, const SerializationPtr & nested_)
@@ -54,6 +55,13 @@ void SerializationMap::deserializeBinary(Field & field, ReadBuffer & istr, const
 {
     size_t size;
     readVarUInt(size, istr);
+    if (settings.max_binary_array_size && size > settings.max_binary_array_size)
+        throw Exception(
+            ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+            "Too large map size: {}. The maximum is: {}. To increase the maximum, use setting "
+            "format_binary_max_array_size",
+            size,
+            settings.max_binary_array_size);
     field = Map();
     Map & map = field.get<Map &>();
     map.reserve(size);
@@ -207,6 +215,43 @@ void SerializationMap::serializeTextJSON(const IColumn & column, size_t row_num,
         });
 }
 
+void SerializationMap::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
+{
+    const auto & column_map = assert_cast<const ColumnMap &>(column);
+
+    const auto & nested_array = column_map.getNestedColumn();
+    const auto & nested_tuple = column_map.getNestedData();
+    const auto & offsets = nested_array.getOffsets();
+
+    size_t offset = offsets[row_num - 1];
+    size_t next_offset = offsets[row_num];
+
+    if (offset == next_offset)
+    {
+        writeCString("{}", ostr);
+        return;
+    }
+
+    writeCString("{\n", ostr);
+    for (size_t i = offset; i < next_offset; ++i)
+    {
+        if (i != offset)
+            writeCString(",\n", ostr);
+
+        WriteBufferFromOwnString str_buf;
+        key->serializeText(nested_tuple.getColumn(0), i, str_buf, settings);
+
+        writeChar(' ', (indent + 1) * 4, ostr);
+        writeJSONString(str_buf.str(), ostr, settings);
+        writeCString(": ", ostr);
+        value->serializeTextJSONPretty(nested_tuple.getColumn(1), i, ostr, settings, indent + 1);
+    }
+    writeChar('\n', ostr);
+    writeChar(' ', indent * 4, ostr);
+    writeChar('}', ostr);
+}
+
+
 void SerializationMap::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     deserializeTextImpl(column, istr,
diff --git a/src/DataTypes/Serializations/SerializationMap.h b/src/DataTypes/Serializations/SerializationMap.h
index 556a50fbbc1..f32c656757d 100644
--- a/src/DataTypes/Serializations/SerializationMap.h
+++ b/src/DataTypes/Serializations/SerializationMap.h
@@ -26,6 +26,7 @@ public:
     void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const override;
     void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const override;
     void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
 
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
diff --git a/src/DataTypes/Serializations/SerializationNullable.cpp b/src/DataTypes/Serializations/SerializationNullable.cpp
index 20188f7cec5..6e4402740d9 100644
--- a/src/DataTypes/Serializations/SerializationNullable.cpp
+++ b/src/DataTypes/Serializations/SerializationNullable.cpp
@@ -355,6 +355,9 @@ ReturnType SerializationNullable::deserializeTextEscapedAndRawImpl(IColumn & col
         /// It can happen only if there is a string instead of a number
         /// or if someone uses tab or LF in TSV null_representation.
         /// In the first case we cannot continue reading anyway. The second case seems to be unlikely.
+        /// We also should delete incorrectly deserialized value from nested column.
+        nested_column.popBack(1);
+
         if (null_representation.find('\t') != std::string::npos || null_representation.find('\n') != std::string::npos)
             throw DB::ParsingException(ErrorCodes::CANNOT_READ_ALL_DATA, "TSV custom null representation "
                                        "containing '\\t' or '\\n' may not work correctly for large input.");
@@ -447,6 +450,8 @@ ReturnType SerializationNullable::deserializeTextQuotedImpl(IColumn & column, Re
 
         /// We have some unread data in PeekableReadBuffer own memory.
         /// It can happen only if there is an unquoted string instead of a number.
+        /// We also should delete incorrectly deserialized value from nested column.
+        nested_column.popBack(1);
         throw DB::ParsingException(
             ErrorCodes::CANNOT_READ_ALL_DATA,
             "Error while parsing Nullable: got an unquoted string {} instead of a number",
@@ -579,6 +584,9 @@ ReturnType SerializationNullable::deserializeTextCSVImpl(IColumn & column, ReadB
         /// It can happen only if there is an unquoted string instead of a number
         /// or if someone uses csv delimiter, LF or CR in CSV null representation.
         /// In the first case we cannot continue reading anyway. The second case seems to be unlikely.
+        /// We also should delete incorrectly deserialized value from nested column.
+        nested_column.popBack(1);
+
         if (null_representation.find(settings.csv.delimiter) != std::string::npos || null_representation.find('\r') != std::string::npos
             || null_representation.find('\n') != std::string::npos)
             throw DB::ParsingException(ErrorCodes::CANNOT_READ_ALL_DATA, "CSV custom null representation containing "
diff --git a/src/DataTypes/Serializations/SerializationNumber.h b/src/DataTypes/Serializations/SerializationNumber.h
index 67ed91848d4..972c6c9a30f 100644
--- a/src/DataTypes/Serializations/SerializationNumber.h
+++ b/src/DataTypes/Serializations/SerializationNumber.h
@@ -1,11 +1,14 @@
 #pragma once
 
+#include <Core/Types.h>
 #include <DataTypes/Serializations/SimpleTextSerialization.h>
-#include <Columns/ColumnVector.h>
 
 namespace DB
 {
 
+template <typename T>
+class ColumnVector;
+
 template <typename T>
 class SerializationNumber : public SimpleTextSerialization
 {
diff --git a/src/DataTypes/Serializations/SerializationObject.cpp b/src/DataTypes/Serializations/SerializationObject.cpp
index 3c718ded6dc..df9489213c8 100644
--- a/src/DataTypes/Serializations/SerializationObject.cpp
+++ b/src/DataTypes/Serializations/SerializationObject.cpp
@@ -422,8 +422,9 @@ void SerializationObject<Parser>::serializeTextImpl(const IColumn & column, size
 }
 
 template <typename Parser>
+template <bool pretty_json>
 void SerializationObject<Parser>::serializeTextFromSubcolumn(
-    const ColumnObject::Subcolumn & subcolumn, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+    const ColumnObject::Subcolumn & subcolumn, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
 {
     const auto & least_common_type = subcolumn.getLeastCommonType();
 
@@ -432,7 +433,10 @@ void SerializationObject<Parser>::serializeTextFromSubcolumn(
         const auto & finalized_column = subcolumn.getFinalizedColumn();
         auto info = least_common_type->getSerializationInfo(finalized_column);
         auto serialization = least_common_type->getSerialization(*info);
-        serialization->serializeTextJSON(finalized_column, row_num, ostr, settings);
+        if constexpr (pretty_json)
+            serialization->serializeTextJSONPretty(finalized_column, row_num, ostr, settings, indent);
+        else
+            serialization->serializeTextJSON(finalized_column, row_num, ostr, settings);
         return;
     }
 
@@ -445,7 +449,10 @@ void SerializationObject<Parser>::serializeTextFromSubcolumn(
 
         auto info = least_common_type->getSerializationInfo(*tmp_column);
         auto serialization = least_common_type->getSerialization(*info);
-        serialization->serializeTextJSON(*tmp_column, 0, ostr, settings);
+        if constexpr (pretty_json)
+            serialization->serializeTextJSONPretty(*tmp_column, 0, ostr, settings, indent);
+        else
+            serialization->serializeTextJSON(*tmp_column, 0, ostr, settings);
         return;
     }
 
@@ -457,7 +464,10 @@ void SerializationObject<Parser>::serializeTextFromSubcolumn(
             auto part_type = getDataTypeByColumn(*part);
             auto info = part_type->getSerializationInfo(*part);
             auto serialization = part_type->getSerialization(*info);
-            serialization->serializeTextJSON(*part, ind, ostr, settings);
+            if constexpr (pretty_json)
+                serialization->serializeTextJSONPretty(*part, ind, ostr, settings, indent);
+            else
+                serialization->serializeTextJSON(*part, ind, ostr, settings);
             return;
         }
 
@@ -503,6 +513,30 @@ void SerializationObject<Parser>::serializeTextCSV(const IColumn & column, size_
     writeCSVString(ostr_str.str(), ostr);
 }
 
+template <typename Parser>
+void SerializationObject<Parser>::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
+{
+    const auto & column_object = assert_cast<const ColumnObject &>(column);
+    const auto & subcolumns = column_object.getSubcolumns();
+
+    writeCString("{\n", ostr);
+    for (auto it = subcolumns.begin(); it != subcolumns.end(); ++it)
+    {
+        const auto & entry = *it;
+        if (it != subcolumns.begin())
+            writeCString(",\n", ostr);
+
+        writeChar(' ', (indent + 1) * 4, ostr);
+        writeDoubleQuoted(entry->path.getPath(), ostr);
+        writeCString(": ", ostr);
+        serializeTextFromSubcolumn<true>(entry->data, row_num, ostr, settings, indent + 1);
+    }
+    writeChar('\n', ostr);
+    writeChar(' ', indent * 4, ostr);
+    writeChar('}', ostr);
+}
+
+
 SerializationPtr getObjectSerialization(const String & schema_format)
 {
     if (schema_format == "json")
diff --git a/src/DataTypes/Serializations/SerializationObject.h b/src/DataTypes/Serializations/SerializationObject.h
index 9cf56fcab96..de54f5739f5 100644
--- a/src/DataTypes/Serializations/SerializationObject.h
+++ b/src/DataTypes/Serializations/SerializationObject.h
@@ -66,6 +66,7 @@ public:
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
     void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const override;
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
 
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
@@ -105,7 +106,9 @@ private:
     void deserializeTextImpl(IColumn & column, Reader && reader) const;
 
     void serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const;
-    void serializeTextFromSubcolumn(const ColumnObject::Subcolumn & subcolumn, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const;
+
+    template <bool pretty_json = false>
+    void serializeTextFromSubcolumn(const ColumnObject::Subcolumn & subcolumn, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent = 0) const;
 
     /// Pool of parser objects to make SerializationObject thread safe.
     mutable SimpleObjectPool<Parser> parsers_pool;
diff --git a/src/DataTypes/Serializations/SerializationString.cpp b/src/DataTypes/Serializations/SerializationString.cpp
index 96608fbbc04..46fd9d5272d 100644
--- a/src/DataTypes/Serializations/SerializationString.cpp
+++ b/src/DataTypes/Serializations/SerializationString.cpp
@@ -14,6 +14,8 @@
 #include <IO/VarInt.h>
 #include <IO/ReadBufferFromString.h>
 
+#include <base/unit.h>
+
 #ifdef __SSE2__
     #include <emmintrin.h>
 #endif
@@ -158,6 +160,14 @@ static NO_INLINE void deserializeBinarySSE2(ColumnString::Chars & data, ColumnSt
         UInt64 size;
         readVarUInt(size, istr);
 
+        static constexpr size_t max_string_size = 16_GiB;   /// Arbitrary value to prevent logical errors and overflows, but large enough.
+        if (size > max_string_size)
+            throw Exception(
+                ErrorCodes::TOO_LARGE_STRING_SIZE,
+                "Too large string size: {}. The maximum is: {}.",
+                size,
+                max_string_size);
+
         offset += size + 1;
         offsets.push_back(offset);
 
diff --git a/src/DataTypes/Serializations/SerializationTuple.cpp b/src/DataTypes/Serializations/SerializationTuple.cpp
index b963d35d785..7f3e7619b0d 100644
--- a/src/DataTypes/Serializations/SerializationTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationTuple.cpp
@@ -185,6 +185,41 @@ void SerializationTuple::serializeTextJSON(const IColumn & column, size_t row_nu
     }
 }
 
+void SerializationTuple::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
+{
+    if (settings.json.write_named_tuples_as_objects
+        && have_explicit_names)
+    {
+        writeCString("{\n", ostr);
+        for (size_t i = 0; i < elems.size(); ++i)
+        {
+            if (i != 0)
+                writeCString(",\n", ostr);
+            writeChar(' ', (indent + 1) * 4, ostr);
+            writeJSONString(elems[i]->getElementName(), ostr, settings);
+            writeCString(": ", ostr);
+            elems[i]->serializeTextJSONPretty(extractElementColumn(column, i), row_num, ostr, settings, indent + 1);
+        }
+        writeChar('\n', ostr);
+        writeChar(' ', indent * 4, ostr);
+        writeChar('}', ostr);
+    }
+    else
+    {
+        writeCString("[\n", ostr);
+        for (size_t i = 0; i < elems.size(); ++i)
+        {
+            if (i != 0)
+                writeCString(",\n", ostr);
+            writeChar(' ', (indent + 1) * 4, ostr);
+            elems[i]->serializeTextJSONPretty(extractElementColumn(column, i), row_num, ostr, settings, indent + 1);
+        }
+        writeChar('\n', ostr);
+        writeChar(' ', indent * 4, ostr);
+        writeChar(']', ostr);
+    }
+}
+
 void SerializationTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     if (settings.json.read_named_tuples_as_objects
diff --git a/src/DataTypes/Serializations/SerializationTuple.h b/src/DataTypes/Serializations/SerializationTuple.h
index 5c177e3f0e8..7325259f440 100644
--- a/src/DataTypes/Serializations/SerializationTuple.h
+++ b/src/DataTypes/Serializations/SerializationTuple.h
@@ -25,6 +25,7 @@ public:
     void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const override;
     void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const override;
     void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
 
     /// Tuples in CSV format will be serialized as separate columns (that is, losing their nesting in the tuple).
diff --git a/src/DataTypes/Serializations/SerializationWrapper.cpp b/src/DataTypes/Serializations/SerializationWrapper.cpp
index ce598142ab2..18e4891ee65 100644
--- a/src/DataTypes/Serializations/SerializationWrapper.cpp
+++ b/src/DataTypes/Serializations/SerializationWrapper.cpp
@@ -136,6 +136,11 @@ void SerializationWrapper::deserializeTextJSON(IColumn & column, ReadBuffer & is
     nested_serialization->deserializeTextJSON(column, istr, settings);
 }
 
+void SerializationWrapper::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
+{
+    nested_serialization->serializeTextJSONPretty(column, row_num, ostr, settings, indent);
+}
+
 void SerializationWrapper::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     nested_serialization->serializeTextXML(column, row_num, ostr, settings);
diff --git a/src/DataTypes/Serializations/SerializationWrapper.h b/src/DataTypes/Serializations/SerializationWrapper.h
index c141ff5e38d..bf922888af9 100644
--- a/src/DataTypes/Serializations/SerializationWrapper.h
+++ b/src/DataTypes/Serializations/SerializationWrapper.h
@@ -75,6 +75,8 @@ public:
 
     void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const override;
+
 
     void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
 };
diff --git a/src/DataTypes/convertMySQLDataType.cpp b/src/DataTypes/convertMySQLDataType.cpp
index db064a7f06f..bb848bf1526 100644
--- a/src/DataTypes/convertMySQLDataType.cpp
+++ b/src/DataTypes/convertMySQLDataType.cpp
@@ -115,6 +115,8 @@ DataTypePtr convertMySQLDataType(MultiEnum<MySQLDataTypesSupport> type_support,
             res = std::make_shared<DataTypeDecimal<Decimal64>>(precision, scale);
         else if (precision <= DecimalUtils::max_precision<Decimal128>)
             res = std::make_shared<DataTypeDecimal<Decimal128>>(precision, scale);
+        else if (precision <= DecimalUtils::max_precision<Decimal256>)
+            res = std::make_shared<DataTypeDecimal<Decimal256>>(precision, scale);
     }
 
     /// Also String is fallback for all unknown types.
diff --git a/src/DataTypes/fuzzers/CMakeLists.txt b/src/DataTypes/fuzzers/CMakeLists.txt
new file mode 100644
index 00000000000..d9c19cb7d01
--- /dev/null
+++ b/src/DataTypes/fuzzers/CMakeLists.txt
@@ -0,0 +1,2 @@
+clickhouse_add_executable(data_type_deserialization_fuzzer data_type_deserialization_fuzzer.cpp ${SRCS})
+target_link_libraries(data_type_deserialization_fuzzer PRIVATE dbms clickhouse_aggregate_functions ${LIB_FUZZING_ENGINE})
diff --git a/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp b/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
new file mode 100644
index 00000000000..31e4c470ee7
--- /dev/null
+++ b/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
@@ -0,0 +1,82 @@
+#include <base/types.h>
+
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
+
+#include <DataTypes/DataTypeFactory.h>
+
+#include <Common/MemoryTracker.h>
+#include <Common/CurrentThread.h>
+
+#include <Interpreters/Context.h>
+
+#include <AggregateFunctions/registerAggregateFunctions.h>
+
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
+try
+{
+    using namespace DB;
+
+    static SharedContextHolder shared_context;
+    static ContextMutablePtr context;
+
+    auto initialize = [&]() mutable
+    {
+        shared_context = Context::createShared();
+        context = Context::createGlobal(shared_context.get());
+        context->makeGlobalContext();
+        context->setApplicationType(Context::ApplicationType::LOCAL);
+
+        MainThreadStatus::getInstance();
+
+        registerAggregateFunctions();
+        return true;
+    };
+
+    static bool initialized = initialize();
+    (void) initialized;
+
+    total_memory_tracker.resetCounters();
+    total_memory_tracker.setHardLimit(1_GiB);
+    CurrentThread::get().memory_tracker.resetCounters();
+    CurrentThread::get().memory_tracker.setHardLimit(1_GiB);
+
+    /// The input format is as follows:
+    /// - data type name on the first line,
+    /// - the data for the rest of the input.
+
+    /// Compile the code as follows:
+    ///   mkdir build_asan_fuzz
+    ///   cd build_asan_fuzz
+    ///   CC=clang CXX=clang++ cmake -D SANITIZE=address -D ENABLE_FUZZING=1 -D WITH_COVERAGE=1 ..
+    ///
+    /// The corpus is located here:
+    /// https://github.com/ClickHouse/fuzz-corpus/tree/main/data_type_deserialization
+    ///
+    /// The fuzzer can be run as follows:
+    ///   ../../../build_asan_fuzz/src/DataTypes/fuzzers/data_type_deserialization_fuzzer corpus -jobs=64 -rss_limit_mb=8192
+
+    /// clickhouse-local --query "SELECT toJSONString(*) FROM (SELECT name FROM system.functions UNION ALL SELECT name FROM system.data_type_families)" > dictionary
+
+    DB::ReadBufferFromMemory in(data, size);
+
+    String data_type;
+    readStringUntilNewlineInto(data_type, in);
+    assertChar('\n', in);
+
+    DataTypePtr type = DataTypeFactory::instance().get(data_type);
+
+    FormatSettings settings;
+    settings.max_binary_string_size = 100;
+    settings.max_binary_array_size = 100;
+
+    Field field;
+    type->getDefaultSerialization()->deserializeBinary(field, in, settings);
+
+    return 0;
+}
+catch (...)
+{
+    return 1;
+}
diff --git a/src/DataTypes/getLeastSupertype.cpp b/src/DataTypes/getLeastSupertype.cpp
index b50aeb76e67..9d42d82ce91 100644
--- a/src/DataTypes/getLeastSupertype.cpp
+++ b/src/DataTypes/getLeastSupertype.cpp
@@ -15,11 +15,9 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
-#include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeFactory.h>
-#include <base/EnumReflection.h>
 
 
 namespace DB
@@ -90,7 +88,7 @@ DataTypePtr getNumericType(const TypeIndexSet & types)
             maximize(max_bits_of_unsigned_integer, 8);
         else if (type == TypeIndex::UInt16)
             maximize(max_bits_of_unsigned_integer, 16);
-        else if (type == TypeIndex::UInt32)
+        else if (type == TypeIndex::UInt32 || type == TypeIndex::IPv4)
             maximize(max_bits_of_unsigned_integer, 32);
         else if (type == TypeIndex::UInt64)
             maximize(max_bits_of_unsigned_integer, 64);
@@ -528,13 +526,14 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
         size_t have_decimal32 = type_ids.count(TypeIndex::Decimal32);
         size_t have_decimal64 = type_ids.count(TypeIndex::Decimal64);
         size_t have_decimal128 = type_ids.count(TypeIndex::Decimal128);
+        size_t have_decimal256 = type_ids.count(TypeIndex::Decimal256);
 
-        if (have_decimal32 || have_decimal64 || have_decimal128)
+        if (have_decimal32 || have_decimal64 || have_decimal128 || have_decimal256)
         {
-            size_t num_supported = have_decimal32 + have_decimal64 + have_decimal128;
+            size_t num_supported = have_decimal32 + have_decimal64 + have_decimal128 + have_decimal256;
 
-            std::vector<TypeIndex> int_ids = {TypeIndex::Int8, TypeIndex::UInt8, TypeIndex::Int16, TypeIndex::UInt16,
-                                              TypeIndex::Int32, TypeIndex::UInt32, TypeIndex::Int64, TypeIndex::UInt64};
+            std::array<TypeIndex, 8> int_ids = {TypeIndex::Int8, TypeIndex::UInt8, TypeIndex::Int16, TypeIndex::UInt16,
+                                                TypeIndex::Int32, TypeIndex::UInt32, TypeIndex::Int64, TypeIndex::UInt64};
 
             TypeIndex max_int = TypeIndex::Nothing;
             for (auto int_id : int_ids)
@@ -552,8 +551,13 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
             for (const auto & type : types)
             {
                 auto type_id = type->getTypeId();
-                if (type_id != TypeIndex::Decimal32 && type_id != TypeIndex::Decimal64 && type_id != TypeIndex::Decimal128)
+                if (type_id != TypeIndex::Decimal32
+                    && type_id != TypeIndex::Decimal64
+                    && type_id != TypeIndex::Decimal128
+                    && type_id != TypeIndex::Decimal256)
+                {
                     continue;
+                }
 
                 UInt32 scale = getDecimalScale(*type);
                 if (scale > max_scale)
@@ -571,11 +575,13 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
                     min_precision = DataTypeDecimal<Decimal64>::maxPrecision();
             }
 
-            if (min_precision > DataTypeDecimal<Decimal128>::maxPrecision())
+            if (min_precision > DataTypeDecimal<Decimal256>::maxPrecision())
                 return throwOrReturn<on_error>(types, "because the least supertype is Decimal("
                                 + toString(min_precision) + ',' + toString(max_scale) + ')',
                                 ErrorCodes::NO_COMMON_TYPE);
 
+            if (have_decimal256 || min_precision > DataTypeDecimal<Decimal128>::maxPrecision())
+                return std::make_shared<DataTypeDecimal<Decimal256>>(DataTypeDecimal<Decimal256>::maxPrecision(), max_scale);
             if (have_decimal128 || min_precision > DataTypeDecimal<Decimal64>::maxPrecision())
                 return std::make_shared<DataTypeDecimal<Decimal128>>(DataTypeDecimal<Decimal128>::maxPrecision(), max_scale);
             if (have_decimal64 || min_precision > DataTypeDecimal<Decimal32>::maxPrecision())
diff --git a/src/DataTypes/getMostSubtype.cpp b/src/DataTypes/getMostSubtype.cpp
index e5d529205d2..33b5735456e 100644
--- a/src/DataTypes/getMostSubtype.cpp
+++ b/src/DataTypes/getMostSubtype.cpp
@@ -11,6 +11,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypesDecimal.h>
 
 
 namespace DB
@@ -280,6 +281,10 @@ DataTypePtr getMostSubtype(const DataTypes & types, bool throw_if_result_is_noth
                 minimize(min_bits_of_unsigned_integer, 32);
             else if (typeid_cast<const DataTypeUInt64 *>(type.get()))
                 minimize(min_bits_of_unsigned_integer, 64);
+            else if (typeid_cast<const DataTypeUInt128 *>(type.get()))
+                minimize(min_bits_of_unsigned_integer, 128);
+            else if (typeid_cast<const DataTypeUInt256 *>(type.get()))
+                minimize(min_bits_of_unsigned_integer, 256);
             else if (typeid_cast<const DataTypeInt8 *>(type.get()))
                 minimize(min_bits_of_signed_integer, 8);
             else if (typeid_cast<const DataTypeInt16 *>(type.get()))
@@ -288,6 +293,10 @@ DataTypePtr getMostSubtype(const DataTypes & types, bool throw_if_result_is_noth
                 minimize(min_bits_of_signed_integer, 32);
             else if (typeid_cast<const DataTypeInt64 *>(type.get()))
                 minimize(min_bits_of_signed_integer, 64);
+            else if (typeid_cast<const DataTypeInt128 *>(type.get()))
+                minimize(min_bits_of_signed_integer, 128);
+            else if (typeid_cast<const DataTypeInt256 *>(type.get()))
+                minimize(min_bits_of_signed_integer, 256);
             else if (typeid_cast<const DataTypeFloat32 *>(type.get()))
                 minimize(min_mantissa_bits_of_floating, 24);
             else if (typeid_cast<const DataTypeFloat64 *>(type.get()))
@@ -326,6 +335,10 @@ DataTypePtr getMostSubtype(const DataTypes & types, bool throw_if_result_is_noth
                     return std::make_shared<DataTypeUInt32>();
                 else if (min_bits_of_unsigned_integer <= 64)
                     return std::make_shared<DataTypeUInt64>();
+                else if (min_bits_of_unsigned_integer <= 128)
+                    return std::make_shared<DataTypeUInt128>();
+                else if (min_bits_of_unsigned_integer <= 256)
+                    return std::make_shared<DataTypeUInt256>();
                 else
                     throw Exception(ErrorCodes::NO_COMMON_TYPE,
                                     "Logical error: {} but as all data types are integers, "
@@ -343,6 +356,10 @@ DataTypePtr getMostSubtype(const DataTypes & types, bool throw_if_result_is_noth
                     return std::make_shared<DataTypeInt32>();
                 else if (min_bits_of_signed_integer <= 64)
                     return std::make_shared<DataTypeInt64>();
+                else if (min_bits_of_signed_integer <= 128)
+                    return std::make_shared<DataTypeInt128>();
+                else if (min_bits_of_signed_integer <= 256)
+                    return std::make_shared<DataTypeInt256>();
                 else
                     throw Exception(ErrorCodes::NO_COMMON_TYPE,
                                     "Logical error: {} but as all data types are integers, "
@@ -351,6 +368,29 @@ DataTypePtr getMostSubtype(const DataTypes & types, bool throw_if_result_is_noth
         }
     }
 
+    /// Decimals
+    {
+        bool all_decimals = true;
+        UInt32 min_scale = std::numeric_limits<UInt32>::max();
+        UInt32 min_precision = std::numeric_limits<UInt32>::max();
+        for (const auto & type : types)
+        {
+            if (isDecimal(type))
+            {
+                min_scale = std::min(min_scale, getDecimalScale(*type));
+                min_precision = std::min(min_precision, getDecimalPrecision(*type));
+            }
+            else
+            {
+                all_decimals = false;
+                break;
+            }
+        }
+
+        if (all_decimals)
+            return createDecimal<DataTypeDecimal>(min_precision, min_scale);
+    }
+
     /// All other data types (UUID, AggregateFunction, Enum...) are compatible only if they are the same (checked in trivial cases).
     return get_nothing_or_throw("");
 }
diff --git a/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp b/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
index 675ecfbe6e7..2c0feab6d86 100644
--- a/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
+++ b/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
@@ -7,7 +7,6 @@
 #include <Formats/FormatSettings.h>
 #include <IO/ReadBuffer.h>
 
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <gtest/gtest.h>
 
 #include <string>
diff --git a/src/DataTypes/tests/gtest_data_type_get_common_type.cpp b/src/DataTypes/tests/gtest_data_type_get_common_type.cpp
index a85606618a3..0383192bf90 100644
--- a/src/DataTypes/tests/gtest_data_type_get_common_type.cpp
+++ b/src/DataTypes/tests/gtest_data_type_get_common_type.cpp
@@ -3,7 +3,6 @@
 #include <DataTypes/getMostSubtype.h>
 
 #include <sstream>
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <gtest/gtest.h>
 
 namespace DB
diff --git a/src/Databases/DDLDependencyVisitor.cpp b/src/Databases/DDLDependencyVisitor.cpp
index 26f912f6482..cb85119e3b0 100644
--- a/src/Databases/DDLDependencyVisitor.cpp
+++ b/src/Databases/DDLDependencyVisitor.cpp
@@ -1,5 +1,6 @@
 #include <Databases/DDLDependencyVisitor.h>
 #include <Dictionaries/getDictionaryConfigurationFromAST.h>
+#include <Databases/removeWhereConditionPlaceholder.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/misc.h>
@@ -12,6 +13,8 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ParserSelectWithUnionQuery.h>
+#include <Parsers/parseQuery.h>
 #include <Common/KnownObjectNames.h>
 #include <Poco/String.h>
 
@@ -25,6 +28,7 @@ namespace
     /// Used to visits ASTCreateQuery and extracts the names of all tables explicitly referenced in the create query.
     class DDLDependencyVisitorData
     {
+        friend void tryVisitNestedSelect(const String & query, DDLDependencyVisitorData & data);
     public:
         DDLDependencyVisitorData(const ContextPtr & context_, const QualifiedTableName & table_name_, const ASTPtr & ast_)
             : create_query(ast_), table_name(table_name_), current_database(context_->getCurrentDatabase()), context(context_)
@@ -106,9 +110,17 @@ namespace
             if (!info || !info->is_local)
                 return;
 
-            if (info->table_name.database.empty())
-                info->table_name.database = current_database;
-            dependencies.emplace(std::move(info->table_name));
+            if (!info->table_name.table.empty())
+            {
+                if (info->table_name.database.empty())
+                    info->table_name.database = current_database;
+                dependencies.emplace(std::move(info->table_name));
+            }
+            else
+            {
+                /// We don't have a table name, we have a select query instead
+                tryVisitNestedSelect(info->query, *this);
+            }
         }
 
         /// ASTTableExpression represents a reference to a table in SELECT query.
@@ -424,6 +436,25 @@ namespace
         static bool needChildVisit(const ASTPtr &, const ASTPtr & child, const Data & data) { return data.needChildVisit(child); }
         static void visit(const ASTPtr & ast, Data & data) { data.visit(ast); }
     };
+
+    void tryVisitNestedSelect(const String & query, DDLDependencyVisitorData & data)
+    {
+        try
+        {
+            ParserSelectWithUnionQuery parser;
+            String description = fmt::format("Query for ClickHouse dictionary {}", data.table_name);
+            String fixed_query = removeWhereConditionPlaceholder(query);
+            ASTPtr select = parseQuery(parser, fixed_query, description,
+                                       data.context->getSettingsRef().max_query_size, data.context->getSettingsRef().max_parser_depth);
+
+            DDLDependencyVisitor::Visitor visitor{data};
+            visitor.visit(select);
+        }
+        catch (...)
+        {
+            tryLogCurrentException("DDLDependencyVisitor");
+        }
+    }
 }
 
 
diff --git a/src/Databases/DDLLoadingDependencyVisitor.cpp b/src/Databases/DDLLoadingDependencyVisitor.cpp
index 3a61f821629..99538fd801e 100644
--- a/src/Databases/DDLLoadingDependencyVisitor.cpp
+++ b/src/Databases/DDLLoadingDependencyVisitor.cpp
@@ -103,7 +103,7 @@ void DDLLoadingDependencyVisitor::visit(const ASTFunctionWithKeyValueArguments &
     auto config = getDictionaryConfigurationFromAST(data.create_query->as<ASTCreateQuery &>(), data.global_context);
     auto info = getInfoIfClickHouseDictionarySource(config, data.global_context);
 
-    if (!info || !info->is_local)
+    if (!info || !info->is_local || info->table_name.table.empty())
         return;
 
     if (info->table_name.database.empty())
@@ -115,10 +115,13 @@ void DDLLoadingDependencyVisitor::visit(const ASTStorage & storage, Data & data)
 {
     if (!storage.engine)
         return;
-    if (storage.engine->name != "Dictionary")
-        return;
 
-    extractTableNameFromArgument(*storage.engine, data, 0);
+    if (storage.engine->name == "Distributed")
+        /// Checks that dict* expression was used as sharding_key and builds dependency between the dictionary and current table.
+        /// Distributed(logs, default, hits[, sharding_key[, policy_name]])
+        extractTableNameFromArgument(*storage.engine, data, 3);
+    else if (storage.engine->name == "Dictionary")
+        extractTableNameFromArgument(*storage.engine, data, 0);
 }
 
 
@@ -131,7 +134,29 @@ void DDLLoadingDependencyVisitor::extractTableNameFromArgument(const ASTFunction
     QualifiedTableName qualified_name;
 
     const auto * arg = function.arguments->as<ASTExpressionList>()->children[arg_idx].get();
-    if (const auto * literal = arg->as<ASTLiteral>())
+
+    if (const auto * dict_function = arg->as<ASTFunction>())
+    {
+        if (!functionIsDictGet(dict_function->name))
+            return;
+
+        /// Get the dictionary name from `dict*` function.
+        const auto * literal_arg = dict_function->arguments->as<ASTExpressionList>()->children[0].get();
+        const auto * dictionary_name = literal_arg->as<ASTLiteral>();
+
+        if (!dictionary_name)
+            return;
+
+        if (dictionary_name->value.getType() != Field::Types::String)
+            return;
+
+        auto maybe_qualified_name = QualifiedTableName::tryParseFromString(dictionary_name->value.get<String>());
+        if (!maybe_qualified_name)
+            return;
+
+        qualified_name = std::move(*maybe_qualified_name);
+    }
+    else if (const auto * literal = arg->as<ASTLiteral>())
     {
         if (literal->value.getType() != Field::Types::String)
             return;
@@ -167,5 +192,4 @@ void DDLLoadingDependencyVisitor::extractTableNameFromArgument(const ASTFunction
     }
     data.dependencies.emplace(std::move(qualified_name));
 }
-
 }
diff --git a/src/Databases/DDLRenamingVisitor.cpp b/src/Databases/DDLRenamingVisitor.cpp
index 9651861fd4f..6cd414635a0 100644
--- a/src/Databases/DDLRenamingVisitor.cpp
+++ b/src/Databases/DDLRenamingVisitor.cpp
@@ -137,7 +137,7 @@ namespace
 
         auto config = getDictionaryConfigurationFromAST(data.create_query->as<ASTCreateQuery &>(), data.global_context);
         auto info = getInfoIfClickHouseDictionarySource(config, data.global_context);
-        if (!info || !info->is_local)
+        if (!info || !info->is_local || info->table_name.table.empty())
             return;
 
         auto * source_list = dictionary.source->elements->as<ASTExpressionList>();
diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index 34c4fd3d5d8..7e20b6f6535 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -273,7 +273,7 @@ void DatabaseAtomic::renameTable(ContextPtr local_context, const String & table_
     else
         renameNoReplace(old_metadata_path, new_metadata_path);
 
-    /// After metadata was successfully moved, the following methods should not throw (if them do, it's a logical error)
+    /// After metadata was successfully moved, the following methods should not throw (if they do, it's a logical error)
     table_data_path = detach(*this, table_name, table->storesDataOnDisk());
     if (exchange)
         other_table_data_path = detach(other_db, to_table_name, other_table->storesDataOnDisk());
@@ -509,6 +509,9 @@ void DatabaseAtomic::tryCreateMetadataSymlink()
     {
         try
         {
+            /// fs::exists could return false for broken symlink
+            if (FS::isSymlinkNoThrow(metadata_symlink))
+                fs::remove(metadata_symlink);
             fs::create_directory_symlink(metadata_path, path_to_metadata_symlink);
         }
         catch (...)
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index 51378b66b08..f346205ea79 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -13,7 +13,6 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/queryToString.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/NamedCollectionsHelpers.h>
 #include <Common/NamedCollections/NamedCollections.h>
 #include <Common/logger_useful.h>
@@ -24,11 +23,11 @@
 
 #if USE_MYSQL
 #    include <Core/MySQL/MySQLClient.h>
-#    include <Databases/MySQL/ConnectionMySQLSettings.h>
 #    include <Databases/MySQL/DatabaseMySQL.h>
 #    include <Databases/MySQL/MaterializedMySQLSettings.h>
 #    include <Storages/MySQL/MySQLHelpers.h>
 #    include <Storages/MySQL/MySQLSettings.h>
+#    include <Storages/StorageMySQL.h>
 #    include <Databases/MySQL/DatabaseMaterializedMySQL.h>
 #    include <mysqlxx/Pool.h>
 #endif
@@ -183,21 +182,13 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         if (!engine->arguments)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `{}` must have arguments", engine_name);
 
-        StorageMySQLConfiguration configuration;
+        StorageMySQL::Configuration configuration;
         ASTs & arguments = engine->arguments->children;
-        auto mysql_settings = std::make_unique<ConnectionMySQLSettings>();
+        auto mysql_settings = std::make_unique<MySQLSettings>();
 
-        if (auto named_collection = getExternalDataSourceConfiguration(arguments, context, true, true, *mysql_settings))
+        if (auto named_collection = tryGetNamedCollectionWithOverrides(arguments, context))
         {
-            auto [common_configuration, storage_specific_args, settings_changes] = named_collection.value();
-
-            configuration.set(common_configuration);
-            configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
-            mysql_settings->applyChanges(settings_changes);
-
-            if (!storage_specific_args.empty())
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "MySQL database require mysql_hostname, mysql_database_name, mysql_username, mysql_password arguments.");
+            configuration = StorageMySQL::processNamedCollectionResult(*named_collection, *mysql_settings, context, false);
         }
         else
         {
@@ -230,8 +221,9 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         {
             if (engine_name == "MySQL")
             {
-                mysql_settings->loadFromQueryContext(context);
-                mysql_settings->loadFromQuery(*engine_define); /// higher priority
+                mysql_settings->loadFromQueryContext(context, *engine_define);
+                if (engine_define->settings)
+                    mysql_settings->loadFromQuery(*engine_define);
 
                 auto mysql_pool = createMySQLPoolWithFailover(configuration, *mysql_settings);
 
@@ -324,22 +316,10 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         auto use_table_cache = false;
         StoragePostgreSQL::Configuration configuration;
 
-        if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args))
+        if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args, context))
         {
-            validateNamedCollection(
-                *named_collection,
-                {"host", "port", "user", "password", "database"},
-                {"schema", "on_conflict", "use_table_cache"});
-
-            configuration.host = named_collection->get<String>("host");
-            configuration.port = static_cast<UInt16>(named_collection->get<UInt64>("port"));
-            configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
-            configuration.username = named_collection->get<String>("user");
-            configuration.password = named_collection->get<String>("password");
-            configuration.database = named_collection->get<String>("database");
-            configuration.schema = named_collection->getOrDefault<String>("schema", "");
-            configuration.on_conflict = named_collection->getOrDefault<String>("on_conflict", "");
-            use_table_cache = named_collection->getOrDefault<UInt64>("use_tables_cache", 0);
+            configuration = StoragePostgreSQL::processNamedCollectionResult(*named_collection, false);
+            use_table_cache = named_collection->getOrDefault<UInt64>("use_table_cache", 0);
         }
         else
         {
@@ -399,20 +379,9 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         ASTs & engine_args = engine->arguments->children;
         StoragePostgreSQL::Configuration configuration;
 
-        if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args))
+        if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args, context))
         {
-            validateNamedCollection(
-                *named_collection,
-                {"host", "port", "user", "password", "database"},
-                {"schema"});
-
-            configuration.host = named_collection->get<String>("host");
-            configuration.port = static_cast<UInt16>(named_collection->get<UInt64>("port"));
-            configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
-            configuration.username = named_collection->get<String>("user");
-            configuration.password = named_collection->get<String>("password");
-            configuration.database = named_collection->get<String>("database");
-            configuration.schema = named_collection->getOrDefault<String>("schema", "");
+            configuration = StoragePostgreSQL::processNamedCollectionResult(*named_collection, false);
         }
         else
         {
diff --git a/src/Databases/DatabaseFactory.h b/src/Databases/DatabaseFactory.h
index 8992ea27093..cb631cd76d0 100644
--- a/src/Databases/DatabaseFactory.h
+++ b/src/Databases/DatabaseFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/ThreadPool.h>
+#include <Interpreters/Context_fwd.h>
 #include <Databases/IDatabase.h>
 
 namespace DB
diff --git a/src/Databases/DatabaseMemory.cpp b/src/Databases/DatabaseMemory.cpp
index fda0bbe8032..3ede69d5362 100644
--- a/src/Databases/DatabaseMemory.cpp
+++ b/src/Databases/DatabaseMemory.cpp
@@ -26,7 +26,12 @@ namespace ErrorCodes
 DatabaseMemory::DatabaseMemory(const String & name_, ContextPtr context_)
     : DatabaseWithOwnTablesBase(name_, "DatabaseMemory(" + name_ + ")", context_)
     , data_path("data/" + escapeForFileName(database_name) + "/")
-{}
+{
+    /// Temporary database should not have any data on the moment of its creation
+    /// In case of sudden server shutdown remove database folder of temporary database
+    if (name_ == DatabaseCatalog::TEMPORARY_DATABASE)
+        removeDataPath(context_);
+}
 
 void DatabaseMemory::createTable(
     ContextPtr /*context*/,
@@ -71,8 +76,7 @@ void DatabaseMemory::dropTable(
 
         if (table->storesDataOnDisk())
         {
-            assert(getDatabaseName() != DatabaseCatalog::TEMPORARY_DATABASE);
-            fs::path table_data_dir{getTableDataPath(table_name)};
+            fs::path table_data_dir{fs::path{getContext()->getPath()} / getTableDataPath(table_name)};
             if (fs::exists(table_data_dir))
                 fs::remove_all(table_data_dir);
         }
@@ -80,7 +84,6 @@ void DatabaseMemory::dropTable(
     catch (...)
     {
         std::lock_guard lock{mutex};
-        assert(database_name != DatabaseCatalog::TEMPORARY_DATABASE);
         attachTableUnlocked(table_name, table);
         throw;
     }
@@ -129,10 +132,15 @@ UUID DatabaseMemory::tryGetTableUUID(const String & table_name) const
     return UUIDHelpers::Nil;
 }
 
+void DatabaseMemory::removeDataPath(ContextPtr local_context)
+{
+    std::filesystem::remove_all(local_context->getPath() + data_path);
+}
+
 void DatabaseMemory::drop(ContextPtr local_context)
 {
     /// Remove data on explicit DROP DATABASE
-    std::filesystem::remove_all(local_context->getPath() + data_path);
+    removeDataPath(local_context);
 }
 
 void DatabaseMemory::alterTable(ContextPtr local_context, const StorageID & table_id, const StorageInMemoryMetadata & metadata)
diff --git a/src/Databases/DatabaseMemory.h b/src/Databases/DatabaseMemory.h
index 6262543b0c1..0f703a0b46e 100644
--- a/src/Databases/DatabaseMemory.h
+++ b/src/Databases/DatabaseMemory.h
@@ -53,6 +53,8 @@ public:
     std::vector<std::pair<ASTPtr, StoragePtr>> getTablesForBackup(const FilterByNameFunction & filter, const ContextPtr & local_context) const override;
 
 private:
+    void removeDataPath(ContextPtr local_context);
+
     const String data_path;
     using NameToASTCreate = std::unordered_map<String, ASTPtr>;
     NameToASTCreate create_queries TSA_GUARDED_BY(mutex);
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index 4d9e22bd15d..01afbdcaa57 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -17,14 +17,21 @@
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Common/escapeForFileName.h>
 #include <Common/logger_useful.h>
+#include <Common/filesystemHelpers.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/assert_cast.h>
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/DatabaseAtomic.h>
-#include <Common/assert_cast.h>
 #include <filesystem>
-#include <Common/filesystemHelpers.h>
 
 namespace fs = std::filesystem;
 
+namespace CurrentMetrics
+{
+    extern const Metric DatabaseOnDiskThreads;
+    extern const Metric DatabaseOnDiskThreadsActive;
+}
+
 namespace DB
 {
 
@@ -620,7 +627,7 @@ void DatabaseOnDisk::iterateMetadataFiles(ContextPtr local_context, const Iterat
     }
 
     /// Read and parse metadata in parallel
-    ThreadPool pool;
+    ThreadPool pool(CurrentMetrics::DatabaseOnDiskThreads, CurrentMetrics::DatabaseOnDiskThreadsActive);
     for (const auto & file : metadata_files)
     {
         pool.scheduleOrThrowOnError([&]()
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index 49250602132..0db16f80656 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -25,9 +25,16 @@
 #include <Common/quoteString.h>
 #include <Common/typeid_cast.h>
 #include <Common/logger_useful.h>
+#include <Common/CurrentMetrics.h>
 
 namespace fs = std::filesystem;
 
+namespace CurrentMetrics
+{
+    extern const Metric DatabaseOrdinaryThreads;
+    extern const Metric DatabaseOrdinaryThreadsActive;
+}
+
 namespace DB
 {
 
@@ -99,7 +106,7 @@ void DatabaseOrdinary::loadStoredObjects(
     std::atomic<size_t> dictionaries_processed{0};
     std::atomic<size_t> tables_processed{0};
 
-    ThreadPool pool;
+    ThreadPool pool(CurrentMetrics::DatabaseOrdinaryThreads, CurrentMetrics::DatabaseOrdinaryThreadsActive);
 
     /// We must attach dictionaries before attaching tables
     /// because while we're attaching tables we may need to have some dictionaries attached
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index 0d26fba4614..9bbf5b9565d 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -30,10 +30,12 @@
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTDeleteQuery.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/queryToString.h>
+#include <Storages/StorageKeeperMap.h>
 
 namespace DB
 {
@@ -115,9 +117,14 @@ DatabaseReplicated::DatabaseReplicated(
         fillClusterAuthInfo(db_settings.collection_name.value, context_->getConfigRef());
 }
 
+String DatabaseReplicated::getFullReplicaName(const String & shard, const String & replica)
+{
+    return shard + '|' + replica;
+}
+
 String DatabaseReplicated::getFullReplicaName() const
 {
-    return shard_name + '|' + replica_name;
+    return getFullReplicaName(shard_name, replica_name);
 }
 
 std::pair<String, String> DatabaseReplicated::parseFullReplicaName(const String & name)
@@ -214,7 +221,7 @@ ClusterPtr DatabaseReplicated::getClusterImpl() const
     assert(!hosts.empty());
     assert(hosts.size() == host_ids.size());
     String current_shard = parseFullReplicaName(hosts.front()).first;
-    std::vector<Strings> shards;
+    std::vector<std::vector<DatabaseReplicaInfo>> shards;
     shards.emplace_back();
     for (size_t i = 0; i < hosts.size(); ++i)
     {
@@ -230,25 +237,61 @@ ClusterPtr DatabaseReplicated::getClusterImpl() const
             if (!shards.back().empty())
                 shards.emplace_back();
         }
-        shards.back().emplace_back(unescapeForFileName(host_port));
+        String hostname = unescapeForFileName(host_port);
+        shards.back().push_back(DatabaseReplicaInfo{std::move(hostname), std::move(shard), std::move(replica)});
     }
 
     UInt16 default_port = getContext()->getTCPPort();
 
     bool treat_local_as_remote = false;
     bool treat_local_port_as_remote = getContext()->getApplicationType() == Context::ApplicationType::LOCAL;
-    return std::make_shared<Cluster>(
-        getContext()->getSettingsRef(),
-        shards,
+    ClusterConnectionParameters params{
         cluster_auth_info.cluster_username,
         cluster_auth_info.cluster_password,
         default_port,
         treat_local_as_remote,
         treat_local_port_as_remote,
         cluster_auth_info.cluster_secure_connection,
-        /*priority=*/1,
+        /*priority=*/ 1,
         TSA_SUPPRESS_WARNING_FOR_READ(database_name),     /// FIXME
-        cluster_auth_info.cluster_secret);
+        cluster_auth_info.cluster_secret};
+
+    return std::make_shared<Cluster>(getContext()->getSettingsRef(), shards, params);
+}
+
+std::vector<UInt8> DatabaseReplicated::tryGetAreReplicasActive(const ClusterPtr & cluster_) const
+{
+    Strings paths;
+    const auto & addresses_with_failover = cluster->getShardsAddresses();
+    const auto & shards_info = cluster_->getShardsInfo();
+    for (size_t shard_index = 0; shard_index < shards_info.size(); ++shard_index)
+    {
+        for (const auto & replica : addresses_with_failover[shard_index])
+        {
+            String full_name = getFullReplicaName(replica.database_shard_name, replica.database_replica_name);
+            paths.emplace_back(fs::path(zookeeper_path) / "replicas" / full_name / "active");
+        }
+    }
+
+    try
+    {
+        auto current_zookeeper = getZooKeeper();
+        auto res = current_zookeeper->exists(paths);
+
+        std::vector<UInt8> statuses;
+        statuses.resize(paths.size());
+
+        for (size_t i = 0; i < res.size(); ++i)
+            if (res[i].error == Coordination::Error::ZOK)
+                statuses[i] = 1;
+
+        return statuses;
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+        return {};
+    }
 }
 
 
@@ -661,7 +704,7 @@ BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, Contex
     String node_path = ddl_worker->tryEnqueueAndExecuteEntry(entry, query_context);
 
     Strings hosts_to_wait = getZooKeeper()->getChildren(zookeeper_path + "/replicas");
-    return getDistributedDDLStatus(node_path, entry, query_context, hosts_to_wait);
+    return getDistributedDDLStatus(node_path, entry, query_context, &hosts_to_wait);
 }
 
 static UUID getTableUUIDIfReplicated(const String & metadata, ContextPtr context)
@@ -683,7 +726,7 @@ static UUID getTableUUIDIfReplicated(const String & metadata, ContextPtr context
     return create.uuid;
 }
 
-void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeeper, UInt32 our_log_ptr, UInt32 max_log_ptr)
+void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeeper, UInt32 our_log_ptr, UInt32 & max_log_ptr)
 {
     is_recovering = true;
     SCOPE_EXIT({ is_recovering = false; });
@@ -928,7 +971,16 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     for (const auto & table_id : tables_to_create)
     {
         auto table_name = table_id.getTableName();
-        auto create_query_string = table_name_to_metadata[table_name];
+        auto metadata_it = table_name_to_metadata.find(table_name);
+        if (metadata_it == table_name_to_metadata.end())
+        {
+            /// getTablesSortedByDependency() may return some not existing tables or tables from other databases
+            LOG_WARNING(log, "Got table name {} when resolving table dependencies, "
+                        "but database {} does not have metadata for that table. Ignoring it", table_id.getNameForLogs(), getDatabaseName());
+            continue;
+        }
+
+        const auto & create_query_string = metadata_it->second;
         if (isTableExist(table_name, getContext()))
         {
             assert(create_query_string == readMetadataFile(table_name));
@@ -1032,12 +1084,14 @@ ASTPtr DatabaseReplicated::parseQueryFromMetadataInZooKeeper(const String & node
 }
 
 void DatabaseReplicated::dropReplica(
-    DatabaseReplicated * database, const String & database_zookeeper_path, const String & full_replica_name)
+    DatabaseReplicated * database, const String & database_zookeeper_path, const String & shard, const String & replica)
 {
     assert(!database || database_zookeeper_path == database->zookeeper_path);
 
+    String full_replica_name = shard.empty() ? replica : getFullReplicaName(shard, replica);
+
     if (full_replica_name.find('/') != std::string::npos)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid replica name: {}", full_replica_name);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid replica name, '/' is not allowed: {}", full_replica_name);
 
     auto zookeeper = Context::getGlobalContextInstance()->getZooKeeper();
 
@@ -1378,16 +1432,38 @@ bool DatabaseReplicated::shouldReplicateQuery(const ContextPtr & query_context,
     if (query_context->getClientInfo().is_replicated_database_internal)
         return false;
 
+    /// we never replicate KeeperMap operations for some types of queries because it doesn't make sense
+    const auto is_keeper_map_table = [&](const ASTPtr & ast)
+    {
+        auto table_id = query_context->resolveStorageID(ast, Context::ResolveOrdinary);
+        StoragePtr table = DatabaseCatalog::instance().getTable(table_id, query_context);
+
+        return table->as<StorageKeeperMap>() != nullptr;
+    };
+
     /// Some ALTERs are not replicated on database level
     if (const auto * alter = query_ptr->as<const ASTAlterQuery>())
-    {
-        return !alter->isAttachAlter() && !alter->isFetchAlter() && !alter->isDropPartitionAlter();
-    }
+        return !alter->isAttachAlter() && !alter->isFetchAlter() && !alter->isDropPartitionAlter() && !is_keeper_map_table(query_ptr);
 
     /// DROP DATABASE is not replicated
     if (const auto * drop = query_ptr->as<const ASTDropQuery>())
     {
-        return drop->table.get();
+        if (drop->table.get())
+            return drop->kind != ASTDropQuery::Truncate || !is_keeper_map_table(query_ptr);
+
+        return false;
+    }
+
+    if (query_ptr->as<const ASTDeleteQuery>() != nullptr)
+    {
+        if (is_keeper_map_table(query_ptr))
+            return false;
+
+        /// If there is only 1 shard then there is no need to replicate DELETE query.
+        auto current_cluster = tryGetCluster();
+        return
+            !current_cluster || /// Couldn't get the cluster, so we don't know how many shards there are.
+            current_cluster->getShardsInfo().size() > 1;
     }
 
     return true;
diff --git a/src/Databases/DatabaseReplicated.h b/src/Databases/DatabaseReplicated.h
index 6a897f7322a..1da181de030 100644
--- a/src/Databases/DatabaseReplicated.h
+++ b/src/Databases/DatabaseReplicated.h
@@ -55,6 +55,7 @@ public:
     String getShardName() const { return shard_name; }
     String getReplicaName() const { return replica_name; }
     String getFullReplicaName() const;
+    static String getFullReplicaName(const String & shard, const String & replica);
     static std::pair<String, String> parseFullReplicaName(const String & name);
 
     const String & getZooKeeperPath() const { return zookeeper_path; }
@@ -77,7 +78,9 @@ public:
 
     bool shouldReplicateQuery(const ContextPtr & query_context, const ASTPtr & query_ptr) const override;
 
-    static void dropReplica(DatabaseReplicated * database, const String & database_zookeeper_path, const String & full_replica_name);
+    static void dropReplica(DatabaseReplicated * database, const String & database_zookeeper_path, const String & shard, const String & replica);
+
+    std::vector<UInt8> tryGetAreReplicasActive(const ClusterPtr & cluster_) const;
 
     friend struct DatabaseReplicatedTask;
     friend class DatabaseReplicatedDDLWorker;
@@ -99,7 +102,7 @@ private:
 
     void checkQueryValid(const ASTPtr & query, ContextPtr query_context) const;
 
-    void recoverLostReplica(const ZooKeeperPtr & current_zookeeper, UInt32 our_log_ptr, UInt32 max_log_ptr);
+    void recoverLostReplica(const ZooKeeperPtr & current_zookeeper, UInt32 our_log_ptr, UInt32 & max_log_ptr);
     std::map<String, String> tryGetConsistentMetadataSnapshot(const ZooKeeperPtr & zookeeper, UInt32 & max_log_ptr);
 
     ASTPtr parseQueryFromMetadataInZooKeeper(const String & node_name, const String & query);
diff --git a/src/Databases/DatabaseReplicatedSettings.h b/src/Databases/DatabaseReplicatedSettings.h
index 9d52a82faf4..66c1a860b73 100644
--- a/src/Databases/DatabaseReplicatedSettings.h
+++ b/src/Databases/DatabaseReplicatedSettings.h
@@ -8,8 +8,8 @@ namespace DB
 class ASTStorage;
 
 #define LIST_OF_DATABASE_REPLICATED_SETTINGS(M, ALIAS) \
-    M(Float,  max_broken_tables_ratio, 0.5, "Do not recover replica automatically if the ratio of staled tables to all tables is greater", 0) \
-    M(UInt64, max_replication_lag_to_enqueue, 10, "Replica will throw exception on attempt to execute query if its replication lag greater", 0) \
+    M(Float,  max_broken_tables_ratio, 1, "Do not recover replica automatically if the ratio of staled tables to all tables is greater", 0) \
+    M(UInt64, max_replication_lag_to_enqueue, 50, "Replica will throw exception on attempt to execute query if its replication lag greater", 0) \
     M(UInt64, wait_entry_commited_timeout_sec, 3600, "Replicas will try to cancel query if timeout exceed, but initiator host has not executed it yet", 0) \
     M(String, collection_name, "", "A name of a collection defined in server's config where all info for cluster authentication is defined", 0) \
     M(Bool, check_consistency, true, "Check consistency of local metadata and metadata in Keeper, do replica recovery on inconsistency", 0) \
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index b8880c4c4cc..53a2f372814 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -7,7 +7,7 @@
 #include <Storages/IStorage_fwd.h>
 #include <base/types.h>
 #include <Common/Exception.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <QueryPipeline/BlockIO.h>
 
 #include <ctime>
diff --git a/src/Databases/MySQL/ConnectionMySQLSettings.cpp b/src/Databases/MySQL/ConnectionMySQLSettings.cpp
deleted file mode 100644
index 50c4c7e0613..00000000000
--- a/src/Databases/MySQL/ConnectionMySQLSettings.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <Databases/MySQL/ConnectionMySQLSettings.h>
-
-#include <Core/SettingsFields.h>
-#include <Interpreters/Context.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTCreateQuery.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_SETTING;
-    extern const int BAD_ARGUMENTS;
-}
-
-IMPLEMENT_SETTINGS_TRAITS(ConnectionMySQLSettingsTraits, LIST_OF_MYSQL_DATABASE_SETTINGS)
-
-void ConnectionMySQLSettings::loadFromQuery(ASTStorage & storage_def)
-{
-    if (storage_def.settings)
-    {
-        try
-        {
-            applyChanges(storage_def.settings->changes);
-        }
-        catch (Exception & e)
-        {
-            if (e.code() == ErrorCodes::UNKNOWN_SETTING)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "{} for database {}", e.message(), storage_def.engine->name);
-            else
-                e.rethrow();
-        }
-    }
-    else
-    {
-        auto settings_ast = std::make_shared<ASTSetQuery>();
-        settings_ast->is_standalone = false;
-        storage_def.set(storage_def.settings, settings_ast);
-    }
-
-    SettingsChanges & changes = storage_def.settings->changes;
-#define ADD_IF_ABSENT(NAME)                                                                                   \
-    if (std::find_if(changes.begin(), changes.end(),                                                          \
-                  [](const SettingChange & c) { return c.name == #NAME; })                                    \
-            == changes.end())                                                                                 \
-        changes.push_back(SettingChange{#NAME, static_cast<Field>(NAME)});
-
-    APPLY_FOR_IMMUTABLE_CONNECTION_MYSQL_SETTINGS(ADD_IF_ABSENT)
-#undef ADD_IF_ABSENT
-}
-
-void ConnectionMySQLSettings::loadFromQueryContext(ContextPtr context)
-{
-    if (!context->hasQueryContext())
-        return;
-
-    const Settings & settings = context->getQueryContext()->getSettingsRef();
-
-    if (settings.mysql_datatypes_support_level.value != mysql_datatypes_support_level.value)
-        set("mysql_datatypes_support_level", settings.mysql_datatypes_support_level.toString());
-}
-
-
-}
diff --git a/src/Databases/MySQL/ConnectionMySQLSettings.h b/src/Databases/MySQL/ConnectionMySQLSettings.h
deleted file mode 100644
index 34902cbe9be..00000000000
--- a/src/Databases/MySQL/ConnectionMySQLSettings.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include <Core/BaseSettings.h>
-#include <Core/Defines.h>
-#include <Core/SettingsEnums.h>
-#include <Interpreters/Context_fwd.h>
-#include <Storages/MySQL/MySQLSettings.h>
-
-namespace DB
-{
-
-class ASTStorage;
-
-#define LIST_OF_CONNECTION_MYSQL_SETTINGS(M, ALIAS) \
-    M(MySQLDataTypesSupport, mysql_datatypes_support_level, 0, "Which MySQL types should be converted to corresponding ClickHouse types (rather than being represented as String). Can be empty or any combination of 'decimal' or 'datetime64'. When empty MySQL's DECIMAL and DATETIME/TIMESTAMP with non-zero precision are seen as String on ClickHouse's side.", 0) \
-
-/// Settings that should not change after the creation of a database.
-#define APPLY_FOR_IMMUTABLE_CONNECTION_MYSQL_SETTINGS(M) \
-    M(mysql_datatypes_support_level)
-
-#define LIST_OF_MYSQL_DATABASE_SETTINGS(M, ALIAS) \
-    LIST_OF_CONNECTION_MYSQL_SETTINGS(M, ALIAS) \
-    LIST_OF_MYSQL_SETTINGS(M, ALIAS)
-
-DECLARE_SETTINGS_TRAITS(ConnectionMySQLSettingsTraits, LIST_OF_MYSQL_DATABASE_SETTINGS)
-
-
-/** Settings for the MySQL database engine.
-  * Could be loaded from a CREATE DATABASE query (SETTINGS clause) and Query settings.
-  */
-struct ConnectionMySQLSettings : public BaseSettings<ConnectionMySQLSettingsTraits>
-{
-    void loadFromQuery(ASTStorage & storage_def);
-
-    void loadFromQueryContext(ContextPtr context);
-};
-
-}
diff --git a/src/Databases/MySQL/DatabaseMySQL.cpp b/src/Databases/MySQL/DatabaseMySQL.cpp
index cfb64ba6959..70bd32efed9 100644
--- a/src/Databases/MySQL/DatabaseMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMySQL.cpp
@@ -53,7 +53,7 @@ DatabaseMySQL::DatabaseMySQL(
     const String & metadata_path_,
     const ASTStorage * database_engine_define_,
     const String & database_name_in_mysql_,
-    std::unique_ptr<ConnectionMySQLSettings> settings_,
+    std::unique_ptr<MySQLSettings> settings_,
     mysqlxx::PoolWithFailover && pool,
     bool attach)
     : IDatabase(database_name_)
@@ -61,13 +61,13 @@ DatabaseMySQL::DatabaseMySQL(
     , metadata_path(metadata_path_)
     , database_engine_define(database_engine_define_->clone())
     , database_name_in_mysql(database_name_in_mysql_)
-    , database_settings(std::move(settings_))
+    , mysql_settings(std::move(settings_))
     , mysql_pool(std::move(pool)) /// NOLINT
 {
     try
     {
         /// Test that the database is working fine; it will also fetch tables.
-        empty();
+        empty(); // NOLINT(bugprone-standalone-empty)
     }
     catch (...)
     {
@@ -309,7 +309,7 @@ DatabaseMySQL::fetchTablesColumnsList(const std::vector<String> & tables_name, C
             database_name_in_mysql,
             tables_name,
             settings,
-            database_settings->mysql_datatypes_support_level);
+            mysql_settings->mysql_datatypes_support_level);
 }
 
 void DatabaseMySQL::shutdown()
diff --git a/src/Databases/MySQL/DatabaseMySQL.h b/src/Databases/MySQL/DatabaseMySQL.h
index a9c06074237..f34a2fff4f7 100644
--- a/src/Databases/MySQL/DatabaseMySQL.h
+++ b/src/Databases/MySQL/DatabaseMySQL.h
@@ -9,8 +9,8 @@
 #include <Core/NamesAndTypes.h>
 #include <Common/ThreadPool.h>
 #include <Storages/ColumnsDescription.h>
+#include <Storages/MySQL/MySQLSettings.h>
 #include <Databases/DatabasesCommon.h>
-#include <Databases/MySQL/ConnectionMySQLSettings.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <mysqlxx/PoolWithFailover.h>
 
@@ -44,7 +44,7 @@ public:
         const String & metadata_path,
         const ASTStorage * database_engine_define,
         const String & database_name_in_mysql,
-        std::unique_ptr<ConnectionMySQLSettings> settings_,
+        std::unique_ptr<MySQLSettings> settings_,
         mysqlxx::PoolWithFailover && pool,
         bool attach);
 
@@ -93,7 +93,7 @@ private:
     String metadata_path;
     ASTPtr database_engine_define;
     String database_name_in_mysql;
-    std::unique_ptr<ConnectionMySQLSettings> database_settings;
+    std::unique_ptr<MySQLSettings> mysql_settings;
 
     std::atomic<bool> quit{false};
     std::condition_variable cond;
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index 8c267ea929b..f4d750f85d4 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -17,6 +17,7 @@
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 #include <Common/quoteString.h>
 #include <Common/filesystemHelpers.h>
+#include <Common/logger_useful.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
@@ -51,6 +52,7 @@ DatabasePostgreSQL::DatabasePostgreSQL(
     , configuration(configuration_)
     , pool(std::move(pool_))
     , cache_tables(cache_tables_)
+    , log(&Poco::Logger::get("DatabasePostgreSQL(" + dbname_ + ")"))
 {
     cleaner_task = getContext()->getSchedulePool().createTask("PostgreSQLCleanerTask", [this]{ removeOutdatedTables(); });
     cleaner_task->deactivate();
@@ -174,7 +176,7 @@ StoragePtr DatabasePostgreSQL::tryGetTable(const String & table_name, ContextPtr
 }
 
 
-StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, ContextPtr, bool table_checked) const
+StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, ContextPtr context_, bool table_checked) const
 {
     if (!cache_tables || !cached_tables.contains(table_name))
     {
@@ -189,10 +191,14 @@ StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, ContextPtr,
 
         auto storage = std::make_shared<StoragePostgreSQL>(
                 StorageID(database_name, table_name), pool, table_name,
-                ColumnsDescription{columns_info->columns}, ConstraintsDescription{}, String{}, configuration.schema, configuration.on_conflict);
+                ColumnsDescription{columns_info->columns}, ConstraintsDescription{}, String{},
+                context_, configuration.schema, configuration.on_conflict);
 
         if (cache_tables)
+        {
+            LOG_TEST(log, "Cached table `{}`", table_name);
             cached_tables[table_name] = storage;
+        }
 
         return storage;
     }
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.h b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
index 074a8728d0a..31fa036c0ee 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
@@ -8,7 +8,6 @@
 #include <Core/BackgroundSchedulePool.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 
 namespace DB
 {
@@ -74,6 +73,7 @@ private:
     mutable Tables cached_tables;
     std::unordered_set<std::string> detached_or_dropped;
     BackgroundSchedulePool::TaskHolder cleaner_task;
+    Poco::Logger * log;
 
     String getTableNameForLogs(const String & table_name) const;
 
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
index 4d8de325902..2c97c92ba99 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
@@ -302,11 +302,12 @@ PostgreSQLTableStructure fetchPostgreSQLTableStructure(
             "and a.attnum = ANY(ix.indkey) "
             "and t.relkind in ('r', 'p') " /// simple tables
             "and t.relname = {} " /// Connection is already done to a needed database, only table name is needed.
-            "{}"
+            "and t.relnamespace = (select oid from pg_namespace where nspname = {}) "
             "and ix.indisreplident = 't' " /// index is is replica identity index
             "ORDER BY a.attname", /// column name
-            (postgres_schema.empty() ? "" : "and t.relnamespace = " + quoteString(postgres_schema)) + " ",
-            quoteString(postgres_table));
+            quoteString(postgres_table),
+            (postgres_schema.empty() ? quoteString("public") : quoteString(postgres_schema))
+        );
 
         table.replica_identity_columns = readNamesAndTypesList(tx, postgres_table_with_schema, query, use_nulls, true);
     }
diff --git a/src/Databases/SQLite/SQLiteUtils.cpp b/src/Databases/SQLite/SQLiteUtils.cpp
index 132ea49ff25..152370050f1 100644
--- a/src/Databases/SQLite/SQLiteUtils.cpp
+++ b/src/Databases/SQLite/SQLiteUtils.cpp
@@ -24,7 +24,7 @@ void processSQLiteError(const String & message, bool throw_on_error)
         LOG_ERROR(&Poco::Logger::get("SQLiteEngine"), fmt::runtime(message));
 }
 
-String validateSQLiteDatabasePath(const String & path, const String & user_files_path, bool throw_on_error)
+String validateSQLiteDatabasePath(const String & path, const String & user_files_path, bool need_check, bool throw_on_error)
 {
     if (fs::path(path).is_relative())
         return fs::absolute(fs::path(user_files_path) / path).lexically_normal();
@@ -32,7 +32,7 @@ String validateSQLiteDatabasePath(const String & path, const String & user_files
     String absolute_path = fs::absolute(path).lexically_normal();
     String absolute_user_files_path = fs::absolute(user_files_path).lexically_normal();
 
-    if (!absolute_path.starts_with(absolute_user_files_path))
+    if (need_check && !absolute_path.starts_with(absolute_user_files_path))
     {
         processSQLiteError(fmt::format("SQLite database file path '{}' must be inside 'user_files' directory", path), throw_on_error);
         return "";
@@ -42,8 +42,11 @@ String validateSQLiteDatabasePath(const String & path, const String & user_files
 
 SQLitePtr openSQLiteDB(const String & path, ContextPtr context, bool throw_on_error)
 {
+    // If run in Local mode, no need for path checking.
+    bool need_check = context->getApplicationType() != Context::ApplicationType::LOCAL;
+
     auto user_files_path = context->getUserFilesPath();
-    auto database_path = validateSQLiteDatabasePath(path, user_files_path, throw_on_error);
+    auto database_path = validateSQLiteDatabasePath(path, user_files_path, need_check, throw_on_error);
 
     /// For attach database there is no throw mode.
     if (database_path.empty())
diff --git a/src/Databases/TablesLoader.cpp b/src/Databases/TablesLoader.cpp
index 5d66f49554d..ea0f2072430 100644
--- a/src/Databases/TablesLoader.cpp
+++ b/src/Databases/TablesLoader.cpp
@@ -8,8 +8,15 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/logger_useful.h>
 #include <Common/ThreadPool.h>
+#include <Common/CurrentMetrics.h>
 #include <numeric>
 
+namespace CurrentMetrics
+{
+    extern const Metric TablesLoaderThreads;
+    extern const Metric TablesLoaderThreadsActive;
+}
+
 namespace DB
 {
 
@@ -18,25 +25,14 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-static constexpr size_t PRINT_MESSAGE_EACH_N_OBJECTS = 256;
-static constexpr size_t PRINT_MESSAGE_EACH_N_SECONDS = 5;
-
-void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, AtomicStopwatch & watch)
-{
-    if (processed % PRINT_MESSAGE_EACH_N_OBJECTS == 0 || watch.compareAndRestart(PRINT_MESSAGE_EACH_N_SECONDS))
-    {
-        LOG_INFO(log, "{}%", processed * 100.0 / total);
-        watch.restart();
-    }
-}
-
 TablesLoader::TablesLoader(ContextMutablePtr global_context_, Databases databases_, LoadingStrictnessLevel strictness_mode_)
-: global_context(global_context_)
-, databases(std::move(databases_))
-, strictness_mode(strictness_mode_)
-, referential_dependencies("ReferentialDeps")
-, loading_dependencies("LoadingDeps")
-, all_loading_dependencies("LoadingDeps")
+    : global_context(global_context_)
+    , databases(std::move(databases_))
+    , strictness_mode(strictness_mode_)
+    , referential_dependencies("ReferentialDeps")
+    , loading_dependencies("LoadingDeps")
+    , all_loading_dependencies("LoadingDeps")
+    , pool(CurrentMetrics::TablesLoaderThreads, CurrentMetrics::TablesLoaderThreadsActive)
 {
     metadata.default_database = global_context->getCurrentDatabase();
     log = &Poco::Logger::get("TablesLoader");
@@ -169,7 +165,7 @@ void TablesLoader::removeUnresolvableDependencies()
 }
 
 
-void TablesLoader::loadTablesInTopologicalOrder(ThreadPool & pool)
+void TablesLoader::loadTablesInTopologicalOrder(ThreadPool & pool_)
 {
     /// Compatibility setting which should be enabled by default on attach
     /// Otherwise server will be unable to start for some old-format of IPv6/IPv4 types of columns
@@ -181,12 +177,12 @@ void TablesLoader::loadTablesInTopologicalOrder(ThreadPool & pool)
 
     for (size_t level = 0; level != tables_to_load.size(); ++level)
     {
-        startLoadingTables(pool, load_context, tables_to_load[level], level);
-        pool.wait();
+        startLoadingTables(pool_, load_context, tables_to_load[level], level);
+        pool_.wait();
     }
 }
 
-void TablesLoader::startLoadingTables(ThreadPool & pool, ContextMutablePtr load_context, const std::vector<StorageID> & tables_to_load, size_t level)
+void TablesLoader::startLoadingTables(ThreadPool & pool_, ContextMutablePtr load_context, const std::vector<StorageID> & tables_to_load, size_t level)
 {
     size_t total_tables = metadata.parsed_tables.size();
 
@@ -194,7 +190,7 @@ void TablesLoader::startLoadingTables(ThreadPool & pool, ContextMutablePtr load_
 
     for (const auto & table_id : tables_to_load)
     {
-        pool.scheduleOrThrowOnError([this, load_context, total_tables, table_name = table_id.getQualifiedName()]()
+        pool_.scheduleOrThrowOnError([this, load_context, total_tables, table_name = table_id.getQualifiedName()]()
         {
             const auto & path_and_query = metadata.parsed_tables[table_name];
             databases[table_name.database]->loadTableFromMetadata(load_context, path_and_query.path, table_name, path_and_query.ast, strictness_mode);
diff --git a/src/Databases/removeWhereConditionPlaceholder.cpp b/src/Databases/removeWhereConditionPlaceholder.cpp
new file mode 100644
index 00000000000..fb147be26d0
--- /dev/null
+++ b/src/Databases/removeWhereConditionPlaceholder.cpp
@@ -0,0 +1,20 @@
+#include <Databases/removeWhereConditionPlaceholder.h>
+
+namespace DB
+{
+
+std::string removeWhereConditionPlaceholder(const std::string & query)
+{
+    static constexpr auto true_condition = "(1 = 1)";
+    auto condition_position = query.find(CONDITION_PLACEHOLDER_TO_REPLACE_VALUE);
+    if (condition_position != std::string::npos)
+    {
+        auto query_copy = query;
+        query_copy.replace(condition_position, CONDITION_PLACEHOLDER_TO_REPLACE_VALUE.size(), true_condition);
+        return query_copy;
+    }
+
+    return query;
+}
+
+}
diff --git a/src/Databases/removeWhereConditionPlaceholder.h b/src/Databases/removeWhereConditionPlaceholder.h
new file mode 100644
index 00000000000..7f0e23d42cf
--- /dev/null
+++ b/src/Databases/removeWhereConditionPlaceholder.h
@@ -0,0 +1,15 @@
+#pragma once
+#include <string>
+
+namespace DB
+{
+
+static constexpr std::string_view CONDITION_PLACEHOLDER_TO_REPLACE_VALUE = "{condition}";
+
+/** In case UPDATE_FIELD is specified in {condition} for dictionary that must load all data.
+  * Replace {condition} with true_condition for initial dictionary load.
+  * For next dictionary loads {condition} will be updated with UPDATE_FIELD.
+  */
+std::string removeWhereConditionPlaceholder(const std::string & query);
+
+}
diff --git a/src/Dictionaries/CMakeLists.txt b/src/Dictionaries/CMakeLists.txt
index 0260804ab5b..c9dd554a6f1 100644
--- a/src/Dictionaries/CMakeLists.txt
+++ b/src/Dictionaries/CMakeLists.txt
@@ -26,7 +26,6 @@ target_link_libraries(clickhouse_dictionaries
         clickhouse_common_io
         dbms
         Poco::Data
-        Poco::Data::ODBC
         Poco::MongoDB
         Poco::Redis
         string_utils
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index e19c4a66b1f..5203415005f 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -9,7 +9,6 @@
 
 #include <pcg_random.hpp>
 
-#include <Common/logger_useful.h>
 
 #include <Common/randomSeed.h>
 #include <Common/ThreadPool.h>
diff --git a/src/Dictionaries/CacheDictionaryStorage.h b/src/Dictionaries/CacheDictionaryStorage.h
index 5b52fbde00d..ba17cebebba 100644
--- a/src/Dictionaries/CacheDictionaryStorage.h
+++ b/src/Dictionaries/CacheDictionaryStorage.h
@@ -157,7 +157,7 @@ public:
             });
         }
 
-        return arena.size() + sizeof(Cell) * configuration.max_size_in_cells + attributes_size_in_bytes;
+        return arena.allocatedBytes() + sizeof(Cell) * configuration.max_size_in_cells + attributes_size_in_bytes;
     }
 
 private:
diff --git a/src/Dictionaries/CacheDictionaryUpdateQueue.cpp b/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
index 1fdaf10c57c..09d5bed18b8 100644
--- a/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
+++ b/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
@@ -2,8 +2,15 @@
 
 #include <Dictionaries/CacheDictionaryUpdateQueue.h>
 
+#include <Common/CurrentMetrics.h>
 #include <Common/setThreadName.h>
 
+namespace CurrentMetrics
+{
+    extern const Metric CacheDictionaryThreads;
+    extern const Metric CacheDictionaryThreadsActive;
+}
+
 namespace DB
 {
 
@@ -26,7 +33,7 @@ CacheDictionaryUpdateQueue<dictionary_key_type>::CacheDictionaryUpdateQueue(
     , configuration(configuration_)
     , update_func(std::move(update_func_))
     , update_queue(configuration.max_update_queue_size)
-    , update_pool(configuration.max_threads_for_updates)
+    , update_pool(CurrentMetrics::CacheDictionaryThreads, CurrentMetrics::CacheDictionaryThreadsActive, configuration.max_threads_for_updates)
 {
     for (size_t i = 0; i < configuration.max_threads_for_updates; ++i)
         update_pool.scheduleOrThrowOnError([this] { updateThreadFunction(); });
diff --git a/src/Dictionaries/ClickHouseDictionarySource.cpp b/src/Dictionaries/ClickHouseDictionarySource.cpp
index b962a6ab529..65147ee664e 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.cpp
+++ b/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -7,10 +7,11 @@
 #include <Interpreters/ExpressionActions.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
+#include <Storages/checkAndGetLiteralArgument.h>
 #include <IO/ConnectionTimeouts.h>
 #include <Interpreters/Session.h>
 #include <Interpreters/executeQuery.h>
+#include <Storages/NamedCollectionsHelpers.h>
 #include <Common/isLocalAddress.h>
 #include <Common/logger_useful.h>
 #include "DictionarySourceFactory.h"
@@ -28,10 +29,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-static const std::unordered_set<std::string_view> dictionary_allowed_keys = {
-    "host", "port", "user", "password", "quota_key", "db", "database", "table",
-    "update_field", "update_lag", "invalidate_query", "query", "where", "name", "secure"};
-
 namespace
 {
     constexpr size_t MAX_CONNECTIONS = 16;
@@ -74,11 +71,11 @@ ClickHouseDictionarySource::ClickHouseDictionarySource(
     : update_time{std::chrono::system_clock::from_time_t(0)}
     , dict_struct{dict_struct_}
     , configuration{configuration_}
-    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.query, configuration.where, IdentifierQuotingStyle::Backticks}
+    , query_builder(std::make_shared<ExternalQueryBuilder>(dict_struct, configuration.db, "", configuration.table, configuration.query, configuration.where, IdentifierQuotingStyle::Backticks))
     , sample_block{sample_block_}
     , context(context_)
     , pool{createPool(configuration)}
-    , load_all_query{query_builder.composeLoadAllQuery()}
+    , load_all_query{query_builder->composeLoadAllQuery()}
 {
 }
 
@@ -87,7 +84,7 @@ ClickHouseDictionarySource::ClickHouseDictionarySource(const ClickHouseDictionar
     , dict_struct{other.dict_struct}
     , configuration{other.configuration}
     , invalidate_query_response{other.invalidate_query_response}
-    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.query, configuration.where, IdentifierQuotingStyle::Backticks}
+    , query_builder(std::make_shared<ExternalQueryBuilder>(dict_struct, configuration.db, "", configuration.table, configuration.query, configuration.where, IdentifierQuotingStyle::Backticks))
     , sample_block{other.sample_block}
     , context(Context::createCopy(other.context))
     , pool{createPool(configuration)}
@@ -102,12 +99,12 @@ std::string ClickHouseDictionarySource::getUpdateFieldAndDate()
         time_t hr_time = std::chrono::system_clock::to_time_t(update_time) - configuration.update_lag;
         std::string str_time = DateLUT::instance().timeToString(hr_time);
         update_time = std::chrono::system_clock::now();
-        return query_builder.composeUpdateQuery(configuration.update_field, str_time);
+        return query_builder->composeUpdateQuery(configuration.update_field, str_time);
     }
     else
     {
         update_time = std::chrono::system_clock::now();
-        return query_builder.composeLoadAllQuery();
+        return query_builder->composeLoadAllQuery();
     }
 }
 
@@ -124,13 +121,13 @@ QueryPipeline ClickHouseDictionarySource::loadUpdatedAll()
 
 QueryPipeline ClickHouseDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
-    return createStreamForQuery(query_builder.composeLoadIdsQuery(ids));
+    return createStreamForQuery(query_builder->composeLoadIdsQuery(ids));
 }
 
 
 QueryPipeline ClickHouseDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
-    String query = query_builder.composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::IN_WITH_TUPLES);
+    String query = query_builder->composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::IN_WITH_TUPLES);
     return createStreamForQuery(query);
 }
 
@@ -178,7 +175,7 @@ QueryPipeline ClickHouseDictionarySource::createStreamForQuery(const String & qu
     else
     {
         pipeline = QueryPipeline(std::make_shared<RemoteSource>(
-            std::make_shared<RemoteQueryExecutor>(pool, query, empty_sample_block, context_copy), false, false));
+            std::make_shared<RemoteQueryExecutor>(pool, query, empty_sample_block, context_copy), false, false, false));
     }
 
     return pipeline;
@@ -201,7 +198,7 @@ std::string ClickHouseDictionarySource::doInvalidateQuery(const std::string & re
         /// We pass empty block to RemoteQueryExecutor, because we don't know the structure of the result.
         Block invalidate_sample_block;
         QueryPipeline pipeline(std::make_shared<RemoteSource>(
-            std::make_shared<RemoteQueryExecutor>(pool, request, invalidate_sample_block, context_copy), false, false));
+            std::make_shared<RemoteQueryExecutor>(pool, request, invalidate_sample_block, context_copy), false, false, false));
         return readInvalidateQuery(std::move(pipeline));
     }
 }
@@ -213,63 +210,75 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
                                  const std::string & config_prefix,
                                  Block & sample_block,
                                  ContextPtr global_context,
-                                 const std::string & default_database [[maybe_unused]],
+                                 const std::string & default_database,
                                  bool created_from_ddl) -> DictionarySourcePtr
     {
-        bool secure = config.getBool(config_prefix + ".secure", false);
-
-        UInt16 default_port = getPortFromContext(global_context, secure);
+        using Configuration = ClickHouseDictionarySource::Configuration;
+        std::optional<Configuration> configuration;
 
         std::string settings_config_prefix = config_prefix + ".clickhouse";
-
-        std::string host = config.getString(settings_config_prefix + ".host", "localhost");
-        std::string user = config.getString(settings_config_prefix + ".user", "default");
-        std::string password =  config.getString(settings_config_prefix + ".password", "");
-        std::string quota_key =  config.getString(settings_config_prefix + ".quota_key", "");
-        std::string db = config.getString(settings_config_prefix + ".db", default_database);
-        std::string table = config.getString(settings_config_prefix + ".table", "");
-        UInt16 port = static_cast<UInt16>(config.getUInt(settings_config_prefix + ".port", default_port));
-        auto has_config_key = [](const String & key) { return dictionary_allowed_keys.contains(key); };
-
-        auto named_collection = created_from_ddl
-            ? getExternalDataSourceConfiguration(config, settings_config_prefix, global_context, has_config_key)
-            : std::nullopt;
+        auto named_collection = created_from_ddl ? tryGetNamedCollectionWithOverrides(config, settings_config_prefix) : nullptr;
 
         if (named_collection)
         {
-            const auto & configuration = named_collection->configuration;
-            host = configuration.host;
-            user = configuration.username;
-            password = configuration.password;
-            quota_key = configuration.quota_key;
-            db = configuration.database;
-            table = configuration.table;
-            port = configuration.port;
+            validateNamedCollection(
+                *named_collection, {}, ValidateKeysMultiset<ExternalDatabaseEqualKeysSet>{
+                    "secure", "host", "hostnmae", "port", "user", "username", "password", "quota_key", "name",
+                    "db", "database", "table","query", "where", "invalidate_query", "update_field", "update_lag"});
+
+            const auto secure = named_collection->getOrDefault("secure", false);
+            const auto default_port = getPortFromContext(global_context, secure);
+            const auto host = named_collection->getAnyOrDefault<String>({"host", "hostname"}, "localhost");
+            const auto port = static_cast<UInt16>(named_collection->getOrDefault<UInt64>("port", default_port));
+
+            configuration.emplace(Configuration{
+                .host = host,
+                .user = named_collection->getAnyOrDefault<String>({"user", "username"}, "default"),
+                .password = named_collection->getOrDefault<String>("password", ""),
+                .quota_key = named_collection->getOrDefault<String>("quota_key", ""),
+                .db = named_collection->getAnyOrDefault<String>({"db", "database"}, default_database),
+                .table = named_collection->getOrDefault<String>("table", ""),
+                .query = named_collection->getOrDefault<String>("query", ""),
+                .where = named_collection->getOrDefault<String>("where", ""),
+                .invalidate_query = named_collection->getOrDefault<String>("invalidate_query", ""),
+                .update_field = named_collection->getOrDefault<String>("update_field", ""),
+                .update_lag = named_collection->getOrDefault<UInt64>("update_lag", 1),
+                .port = port,
+                .is_local = isLocalAddress({host, port}, default_port),
+                .secure = secure,
+            });
+        }
+        else
+        {
+            const auto secure = config.getBool(settings_config_prefix + ".secure", false);
+            const auto default_port = getPortFromContext(global_context, secure);
+            const auto host = config.getString(settings_config_prefix + ".host", "localhost");
+            const auto port = static_cast<UInt16>(config.getUInt(settings_config_prefix + ".port", default_port));
+
+            configuration.emplace(Configuration{
+                .host = host,
+                .user = config.getString(settings_config_prefix + ".user", "default"),
+                .password = config.getString(settings_config_prefix + ".password", ""),
+                .quota_key = config.getString(settings_config_prefix + ".quota_key", ""),
+                .db = config.getString(settings_config_prefix + ".db", default_database),
+                .table = config.getString(settings_config_prefix + ".table", ""),
+                .query = config.getString(settings_config_prefix + ".query", ""),
+                .where = config.getString(settings_config_prefix + ".where", ""),
+                .invalidate_query = config.getString(settings_config_prefix + ".invalidate_query", ""),
+                .update_field = config.getString(settings_config_prefix + ".update_field", ""),
+                .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
+                .port = port,
+                .is_local = isLocalAddress({host, port}, default_port),
+                .secure = secure,
+            });
         }
 
-        ClickHouseDictionarySource::Configuration configuration{
-            .host = host,
-            .user = user,
-            .password = password,
-            .quota_key = quota_key,
-            .db = db,
-            .table = table,
-            .query = config.getString(settings_config_prefix + ".query", ""),
-            .where = config.getString(settings_config_prefix + ".where", ""),
-            .invalidate_query = config.getString(settings_config_prefix + ".invalidate_query", ""),
-            .update_field = config.getString(settings_config_prefix + ".update_field", ""),
-            .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
-            .port = port,
-            .is_local = isLocalAddress({host, port}, default_port),
-            .secure = config.getBool(settings_config_prefix + ".secure", false)};
-
-
         ContextMutablePtr context;
-        if (configuration.is_local)
+        if (configuration->is_local)
         {
             /// We should set user info even for the case when the dictionary is loaded in-process (without TCP communication).
             Session session(global_context, ClientInfo::Interface::LOCAL);
-            session.authenticate(configuration.user, configuration.password, Poco::Net::SocketAddress{});
+            session.authenticate(configuration->user, configuration->password, Poco::Net::SocketAddress{});
             context = session.makeQueryContext();
         }
         else
@@ -277,7 +286,7 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
             context = Context::createCopy(global_context);
 
             if (created_from_ddl)
-                context->getRemoteHostFilter().checkHostAndPort(configuration.host, toString(configuration.port));
+                context->getRemoteHostFilter().checkHostAndPort(configuration->host, toString(configuration->port));
         }
 
         context->applySettingsChanges(readSettingsFromDictionaryConfig(config, config_prefix));
@@ -285,10 +294,10 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
         String dictionary_name = config.getString(".dictionary.name", "");
         String dictionary_database = config.getString(".dictionary.database", "");
 
-        if (dictionary_name == configuration.table && dictionary_database == configuration.db)
+        if (dictionary_name == configuration->table && dictionary_database == configuration->db)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "ClickHouseDictionarySource table cannot be dictionary table");
 
-        return std::make_unique<ClickHouseDictionarySource>(dict_struct, configuration, sample_block, context);
+        return std::make_unique<ClickHouseDictionarySource>(dict_struct, *configuration, sample_block, context);
     };
 
     factory.registerSource("clickhouse", create_table_source);
diff --git a/src/Dictionaries/ClickHouseDictionarySource.h b/src/Dictionaries/ClickHouseDictionarySource.h
index f37fae389ac..124d4c8db3f 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.h
+++ b/src/Dictionaries/ClickHouseDictionarySource.h
@@ -78,11 +78,11 @@ private:
     const DictionaryStructure dict_struct;
     const Configuration configuration;
     mutable std::string invalidate_query_response;
-    ExternalQueryBuilder query_builder;
+    ExternalQueryBuilderPtr query_builder;
     Block sample_block;
     ContextMutablePtr context;
     ConnectionPoolWithFailoverPtr pool;
-    const std::string load_all_query;
+    std::string load_all_query;
     Poco::Logger * log = &Poco::Logger::get("ClickHouseDictionarySource");
 
     /// RegExpTreeDictionary is the only dictionary whose structure of attributions differ from the input block.
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 4fc080f2960..1de7be0bf4f 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/Arena.h>
 #include <Common/HashTable/HashMap.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnDecimal.h>
@@ -29,6 +28,8 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
+class Arena;
+
 /** Simple helper for getting default.
   * Initialized with default value and default values column.
   * If default values column is not null default value is taken from column.
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 327606e97f7..f726a8a2a46 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -16,11 +16,6 @@
 #include <Interpreters/IExternalLoadable.h>
 
 
-#if defined(__GNUC__)
-    /// GCC mistakenly warns about the names in enum class.
-    #pragma GCC diagnostic ignored "-Wshadow"
-#endif
-
 namespace DB
 {
 using TypeIndexUnderlying = magic_enum::underlying_type_t<TypeIndex>;
@@ -85,10 +80,10 @@ struct DictionaryAttributeType
 template <typename F>
 constexpr void callOnDictionaryAttributeType(AttributeUnderlyingType type, F && func)
 {
-    static_for<AttributeUnderlyingType>([type, func = std::forward<F>(func)](auto other)
+    static_for<AttributeUnderlyingType>([type, my_func = std::forward<F>(func)](auto other)
     {
         if (type == other)
-            func(DictionaryAttributeType<other>{});
+            my_func(DictionaryAttributeType<other>{});
     });
 }
 
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 189ea2a7bca..d84967fbae6 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -4,16 +4,22 @@
 #include <Common/HashTable/HashMap.h>
 #include <Functions/FunctionHelpers.h>
 
+#include <Dictionaries/ClickHouseDictionarySource.h>
 #include <Dictionaries/DictionaryFactory.h>
+#include <Dictionaries/DictionarySourceHelpers.h>
 #include <Dictionaries/HierarchyDictionariesUtils.h>
 
-#include <QueryPipeline/QueryPipelineBuilder.h>
-#include <QueryPipeline/QueryPipeline.h>
-#include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Processors/ISource.h>
+#include <Processors/Executors/PullingAsyncPipelineExecutor.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+
+#include <QueryPipeline/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int UNSUPPORTED_METHOD;
@@ -73,9 +79,17 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
 
     PullingPipelineExecutor executor(pipeline);
 
+    Stopwatch watch;
     Block block;
+    size_t block_num = 0;
+    size_t rows_num = 0;
     while (executor.pull(block))
     {
+        if (!block)
+            continue;
+
+        ++block_num;
+        rows_num += block.rows();
         convertToFullIfSparse(block);
 
         /// Split into keys columns and attribute columns
@@ -104,6 +118,9 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
         block_key_columns.clear();
     }
 
+    LOG_DEBUG(&Poco::Logger::get("DirectDictionary"), "read {} blocks with {} rows from pipeline in {} ms",
+        block_num, rows_num, watch.elapsedMilliseconds());
+
     Field value_to_insert;
 
     size_t requested_keys_size = requested_keys.size();
@@ -263,6 +280,7 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::isInHierarchy(
         return nullptr;
 }
 
+template <typename TExecutor = PullingPipelineExecutor>
 class SourceFromQueryPipeline : public ISource
 {
 public:
@@ -272,7 +290,10 @@ public:
         , executor(pipeline)
     {}
 
-    std::string getName() const override { return "SourceFromQueryPipeline"; }
+    std::string getName() const override
+    {
+        return std::is_same_v<PullingAsyncPipelineExecutor, TExecutor> ? "SourceFromQueryPipelineAsync" : "SourceFromQueryPipeline";
+    }
 
     Chunk generate() override
     {
@@ -286,10 +307,9 @@ public:
         return {};
     }
 
-
 private:
     QueryPipeline pipeline;
-    PullingPipelineExecutor executor;
+    TExecutor executor;
 };
 
 template <DictionaryKeyType dictionary_key_type>
@@ -297,6 +317,8 @@ Pipe DirectDictionary<dictionary_key_type>::getSourcePipe(
     const Columns & key_columns [[maybe_unused]],
     const PaddedPODArray<KeyType> & requested_keys [[maybe_unused]]) const
 {
+    Stopwatch watch;
+
     size_t requested_keys_size = requested_keys.size();
 
     Pipe pipe;
@@ -309,7 +331,12 @@ Pipe DirectDictionary<dictionary_key_type>::getSourcePipe(
         for (auto key : requested_keys)
             ids.emplace_back(key);
 
-        pipe = Pipe(std::make_shared<SourceFromQueryPipeline>(source_ptr->loadIds(ids)));
+        auto pipeline = source_ptr->loadIds(ids);
+
+        if (use_async_executor)
+            pipe = Pipe(std::make_shared<SourceFromQueryPipeline<PullingAsyncPipelineExecutor>>(std::move(pipeline)));
+        else
+            pipe = Pipe(std::make_shared<SourceFromQueryPipeline<PullingPipelineExecutor>>(std::move(pipeline)));
     }
     else
     {
@@ -318,16 +345,31 @@ Pipe DirectDictionary<dictionary_key_type>::getSourcePipe(
         for (size_t i = 0; i < requested_keys_size; ++i)
             requested_rows.emplace_back(i);
 
-        pipe = Pipe(std::make_shared<SourceFromQueryPipeline>(source_ptr->loadKeys(key_columns, requested_rows)));
+        auto pipeline = source_ptr->loadKeys(key_columns, requested_rows);
+        if (use_async_executor)
+            pipe = Pipe(std::make_shared<SourceFromQueryPipeline<PullingAsyncPipelineExecutor>>(std::move(pipeline)));
+        else
+            pipe = Pipe(std::make_shared<SourceFromQueryPipeline<PullingPipelineExecutor>>(std::move(pipeline)));
     }
 
+    LOG_DEBUG(&Poco::Logger::get("DirectDictionary"), "building pipeline for loading keys done in {} ms", watch.elapsedMilliseconds());
     return pipe;
 }
 
 template <DictionaryKeyType dictionary_key_type>
 Pipe DirectDictionary<dictionary_key_type>::read(const Names & /* column_names */, size_t /* max_block_size */, size_t /* num_streams */) const
 {
-    return Pipe(std::make_shared<SourceFromQueryPipeline>(source_ptr->loadAll()));
+    return Pipe(std::make_shared<SourceFromQueryPipeline<>>(source_ptr->loadAll()));
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void DirectDictionary<dictionary_key_type>::applySettings(const Settings & settings)
+{
+    if (dynamic_cast<const ClickHouseDictionarySource *>(source_ptr.get()))
+    {
+        /// Only applicable for CLICKHOUSE dictionary source.
+        use_async_executor = settings.dictionary_use_async_executor;
+    }
 }
 
 namespace
@@ -339,7 +381,7 @@ namespace
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         DictionarySourcePtr source_ptr,
-        ContextPtr /* global_context */,
+        ContextPtr global_context,
         bool /* created_from_ddl */)
     {
         const auto * layout_name = dictionary_key_type == DictionaryKeyType::Simple ? "direct" : "complex_key_direct";
@@ -372,7 +414,12 @@ namespace
                 "'lifetime' parameter is redundant for the dictionary' of layout '{}'",
                 layout_name);
 
-        return std::make_unique<DirectDictionary<dictionary_key_type>>(dict_id, dict_struct, std::move(source_ptr));
+        auto dictionary = std::make_unique<DirectDictionary<dictionary_key_type>>(dict_id, dict_struct, std::move(source_ptr));
+
+        auto context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
+        dictionary->applySettings(context->getSettingsRef());
+
+        return dictionary;
     }
 }
 
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index 2b5662b8c1a..214c8ef8a13 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -95,6 +95,8 @@ public:
 
     Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
+    void applySettings(const Settings & settings);
+
 private:
     Pipe getSourcePipe(const Columns & key_columns, const PaddedPODArray<KeyType> & requested_keys) const;
 
@@ -102,6 +104,8 @@ private:
     const DictionarySourcePtr source_ptr;
     const DictionaryLifetime dict_lifetime;
 
+    bool use_async_executor = false;
+
     mutable std::atomic<size_t> query_count{0};
     mutable std::atomic<size_t> found_count{0};
 };
diff --git a/src/Dictionaries/ExecutableDictionarySource.h b/src/Dictionaries/ExecutableDictionarySource.h
index 0456d3cafef..c7067a62893 100644
--- a/src/Dictionaries/ExecutableDictionarySource.h
+++ b/src/Dictionaries/ExecutableDictionarySource.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 
 #include <Core/Block.h>
 #include <Interpreters/Context.h>
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.h b/src/Dictionaries/ExecutablePoolDictionarySource.h
index 1fc10d18b76..e8cc6e83406 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.h
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 
 #include <Core/Block.h>
 #include <Interpreters/Context.h>
diff --git a/src/Dictionaries/ExternalQueryBuilder.cpp b/src/Dictionaries/ExternalQueryBuilder.cpp
index 19dabe92d64..e21b0842e11 100644
--- a/src/Dictionaries/ExternalQueryBuilder.cpp
+++ b/src/Dictionaries/ExternalQueryBuilder.cpp
@@ -6,7 +6,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
 #include <Dictionaries/DictionaryStructure.h>
-
+#include <Databases/removeWhereConditionPlaceholder.h>
 
 namespace DB
 {
@@ -24,7 +24,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-static constexpr std::string_view CONDITION_PLACEHOLDER_TO_REPLACE_VALUE = "{condition}";
 
 ExternalQueryBuilder::ExternalQueryBuilder(
     const DictionaryStructure & dict_struct_,
@@ -82,23 +81,8 @@ std::string ExternalQueryBuilder::composeLoadAllQuery() const
         writeChar(';', out);
         return out.str();
     }
-    else
-    {
-        /** In case UPDATE_FIELD is specified in {condition} for dictionary that must load all data.
-          * Replace {condition} with true_condition for initial dictionary load.
-          * For next dictionary loads {condition} will be updated with UPDATE_FIELD.
-          */
-        static constexpr auto true_condition = "(1 = 1)";
-        auto condition_position = query.find(CONDITION_PLACEHOLDER_TO_REPLACE_VALUE);
-        if (condition_position != std::string::npos)
-        {
-            auto query_copy = query;
-            query_copy.replace(condition_position, CONDITION_PLACEHOLDER_TO_REPLACE_VALUE.size(), true_condition);
-            return query_copy;
-        }
 
-        return query;
-    }
+    return removeWhereConditionPlaceholder(query);
 }
 
 void ExternalQueryBuilder::composeLoadAllQuery(WriteBuffer & out) const
diff --git a/src/Dictionaries/ExternalQueryBuilder.h b/src/Dictionaries/ExternalQueryBuilder.h
index 353367b12b6..05979d1fb86 100644
--- a/src/Dictionaries/ExternalQueryBuilder.h
+++ b/src/Dictionaries/ExternalQueryBuilder.h
@@ -36,6 +36,10 @@ struct ExternalQueryBuilder
         const std::string & where_,
         IdentifierQuotingStyle quoting_style_);
 
+    ExternalQueryBuilder(const ExternalQueryBuilder &) = default;
+
+    virtual ~ExternalQueryBuilder() = default;
+
     /** Generate a query to load all data. */
     std::string composeLoadAllQuery() const;
 
@@ -61,10 +65,10 @@ struct ExternalQueryBuilder
     std::string composeLoadKeysQuery(const Columns & key_columns, const std::vector<size_t> & requested_rows, LoadKeysMethod method, size_t partition_key_prefix = 0) const;
 
 
-private:
+protected:
     const FormatSettings format_settings = {};
 
-    void composeLoadAllQuery(WriteBuffer & out) const;
+    virtual void composeLoadAllQuery(WriteBuffer & out) const;
 
     /// In the following methods `beg` and `end` specifies which columns to write in expression
 
@@ -93,4 +97,6 @@ private:
     void writeQuoted(const std::string & s, WriteBuffer & out) const;
 };
 
+using ExternalQueryBuilderPtr = std::shared_ptr<ExternalQueryBuilder>;
+
 }
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index cc345b97abe..d3699a150c4 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -505,7 +505,7 @@ void FlatDictionary::calculateBytesAllocated()
         bytes_allocated += hierarchical_index_bytes_allocated;
     }
 
-    bytes_allocated += string_arena.size();
+    bytes_allocated += string_arena.allocatedBytes();
 }
 
 FlatDictionary::Attribute FlatDictionary::createAttribute(const DictionaryAttribute & dictionary_attribute)
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
index d2d3b344df5..757a3b1819b 100644
--- a/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -99,7 +99,6 @@ QueryPipeline HTTPDictionarySource::loadAll()
         DBMS_DEFAULT_BUFFER_SIZE,
         context->getReadSettings(),
         configuration.header_entries,
-        ReadWriteBufferFromHTTP::Range{},
         nullptr, false);
 
     return createWrappedBuffer(std::move(in_ptr));
@@ -120,7 +119,6 @@ QueryPipeline HTTPDictionarySource::loadUpdatedAll()
         DBMS_DEFAULT_BUFFER_SIZE,
         context->getReadSettings(),
         configuration.header_entries,
-        ReadWriteBufferFromHTTP::Range{},
         nullptr, false);
 
     return createWrappedBuffer(std::move(in_ptr));
@@ -150,7 +148,6 @@ QueryPipeline HTTPDictionarySource::loadIds(const std::vector<UInt64> & ids)
         DBMS_DEFAULT_BUFFER_SIZE,
         context->getReadSettings(),
         configuration.header_entries,
-        ReadWriteBufferFromHTTP::Range{},
         nullptr, false);
 
     return createWrappedBuffer(std::move(in_ptr));
@@ -180,7 +177,6 @@ QueryPipeline HTTPDictionarySource::loadKeys(const Columns & key_columns, const
         DBMS_DEFAULT_BUFFER_SIZE,
         context->getReadSettings(),
         configuration.header_entries,
-        ReadWriteBufferFromHTTP::Range{},
         nullptr, false);
 
     return createWrappedBuffer(std::move(in_ptr));
diff --git a/src/Dictionaries/HashedArrayDictionary.cpp b/src/Dictionaries/HashedArrayDictionary.cpp
index 9e6ce0597cb..880f68cea95 100644
--- a/src/Dictionaries/HashedArrayDictionary.cpp
+++ b/src/Dictionaries/HashedArrayDictionary.cpp
@@ -797,7 +797,7 @@ void HashedArrayDictionary<dictionary_key_type>::calculateBytesAllocated()
         bytes_allocated += hierarchical_index_bytes_allocated;
     }
 
-    bytes_allocated += string_arena.size();
+    bytes_allocated += string_arena.allocatedBytes();
 }
 
 template <DictionaryKeyType dictionary_key_type>
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 309a3dda2e4..eb1d98a8f39 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -8,6 +8,8 @@
 #include <Common/setThreadName.h>
 #include <Common/logger_useful.h>
 #include <Common/ConcurrentBoundedQueue.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/MemoryTrackerBlockerInThread.h>
 
 #include <Core/Defines.h>
 
@@ -20,26 +22,19 @@
 #include <Dictionaries/DictionarySource.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Dictionaries/HierarchyDictionariesUtils.h>
+#include <Dictionaries/HashedDictionaryCollectionTraits.h>
 
-
-namespace
+namespace CurrentMetrics
 {
-
-/// NOTE: Trailing return type is explicitly specified for SFINAE.
-
-/// google::sparse_hash_map
-template <typename T> auto getKeyFromCell(const T & value) -> decltype(value->first) { return value->first; } // NOLINT
-template <typename T> auto getValueFromCell(const T & value) -> decltype(value->second) { return value->second; } // NOLINT
-
-/// HashMap
-template <typename T> auto getKeyFromCell(const T & value) -> decltype(value->getKey()) { return value->getKey(); } // NOLINT
-template <typename T> auto getValueFromCell(const T & value) -> decltype(value->getMapped()) { return value->getMapped(); } // NOLINT
-
+    extern const Metric HashedDictionaryThreads;
+    extern const Metric HashedDictionaryThreadsActive;
 }
 
 namespace DB
 {
 
+using namespace HashedDictionaryImpl;
+
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
@@ -60,7 +55,7 @@ public:
     explicit ParallelDictionaryLoader(HashedDictionary & dictionary_)
         : dictionary(dictionary_)
         , shards(dictionary.configuration.shards)
-        , pool(shards)
+        , pool(CurrentMetrics::HashedDictionaryThreads, CurrentMetrics::HashedDictionaryThreadsActive, shards)
         , shards_queues(shards)
     {
         UInt64 backlog = dictionary.configuration.shard_load_queue_backlog;
@@ -74,8 +69,11 @@ public:
             shards_queues[shard].emplace(backlog);
             pool.scheduleOrThrowOnError([this, shard, thread_group = CurrentThread::getGroup()]
             {
+                /// Do not account memory that was occupied by the dictionaries for the query/user context.
+                MemoryTrackerBlockerInThread memory_blocker;
+
                 if (thread_group)
-                    CurrentThread::attachToIfDetached(thread_group);
+                    CurrentThread::attachToGroupIfDetached(thread_group);
                 setThreadName("HashedDictLoad");
 
                 threadWorker(shard);
@@ -108,9 +106,18 @@ public:
 
     ~ParallelDictionaryLoader()
     {
-        for (auto & queue : shards_queues)
-            queue->clearAndFinish();
-        pool.wait();
+        try
+        {
+            for (auto & queue : shards_queues)
+                queue->clearAndFinish();
+
+            /// NOTE: It is OK to not pass the exception next, since on success finish() should be called which will call wait()
+            pool.wait();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(dictionary.log, "Exception had been thrown during parallel load of the dictionary");
+        }
     }
 
 private:
@@ -124,13 +131,13 @@ private:
     void threadWorker(size_t shard)
     {
         Block block;
-        DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+        DictionaryKeysArenaHolder<dictionary_key_type> arena_holder_;
         auto & shard_queue = *shards_queues[shard];
 
         while (shard_queue.pop(block))
         {
             Stopwatch watch;
-            dictionary.blockToAttributes(block, arena_holder, shard);
+            dictionary.blockToAttributes(block, arena_holder_, shard);
             UInt64 elapsed_ms = watch.elapsedMilliseconds();
             if (elapsed_ms > 1'000)
                 LOG_TRACE(dictionary.log, "Block processing for shard #{} is slow {}ms (rows {}).", shard, elapsed_ms, block.rows());
@@ -213,7 +220,7 @@ HashedDictionary<dictionary_key_type, sparse, sharded>::~HashedDictionary()
         return;
 
     size_t shards = std::max<size_t>(configuration.shards, 1);
-    ThreadPool pool(shards);
+    ThreadPool pool(CurrentMetrics::HashedDictionaryThreads, CurrentMetrics::HashedDictionaryThreadsActive, shards);
 
     size_t hash_tables_count = 0;
     auto schedule_destroy = [&hash_tables_count, &pool](auto & container)
@@ -223,14 +230,14 @@ HashedDictionary<dictionary_key_type, sparse, sharded>::~HashedDictionary()
 
         pool.trySchedule([&container, thread_group = CurrentThread::getGroup()]
         {
+            /// Do not account memory that was occupied by the dictionaries for the query/user context.
+            MemoryTrackerBlockerInThread memory_blocker;
+
             if (thread_group)
-                CurrentThread::attachToIfDetached(thread_group);
+                CurrentThread::attachToGroupIfDetached(thread_group);
             setThreadName("HashedDictDtor");
 
-            if constexpr (sparse)
-                container.clear();
-            else
-                container.clearAndShrink();
+            clearContainer(container);
         });
 
         ++hash_tables_count;
@@ -632,6 +639,8 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::createAttributes()
     const auto size = dict_struct.attributes.size();
     attributes.reserve(size);
 
+    HashTableGrowerWithPrecalculationAndMaxLoadFactor grower(configuration.max_load_factor);
+
     for (const auto & dictionary_attribute : dict_struct.attributes)
     {
         auto type_call = [&, this](const auto & dictionary_attribute_type)
@@ -641,8 +650,28 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::createAttributes()
             using ValueType = DictionaryValueType<AttributeType>;
 
             auto is_nullable_sets = dictionary_attribute.is_nullable ? std::make_optional<NullableSets>(configuration.shards) : std::optional<NullableSets>{};
-            Attribute attribute{dictionary_attribute.underlying_type, std::move(is_nullable_sets), CollectionsHolder<ValueType>(configuration.shards)};
-            attributes.emplace_back(std::move(attribute));
+            if constexpr (IsBuiltinHashTable<typename CollectionsHolder<ValueType>::value_type>)
+            {
+                CollectionsHolder<ValueType> collections;
+                collections.reserve(configuration.shards);
+                for (size_t i = 0; i < configuration.shards; ++i)
+                    collections.emplace_back(grower);
+
+                Attribute attribute{dictionary_attribute.underlying_type, std::move(is_nullable_sets), std::move(collections)};
+                attributes.emplace_back(std::move(attribute));
+            }
+            else
+            {
+                Attribute attribute{dictionary_attribute.underlying_type, std::move(is_nullable_sets), CollectionsHolder<ValueType>(configuration.shards)};
+                for (auto & container : std::get<CollectionsHolder<ValueType>>(attribute.containers))
+                    container.max_load_factor(configuration.max_load_factor);
+                attributes.emplace_back(std::move(attribute));
+            }
+
+            if constexpr (IsBuiltinHashTable<typename CollectionsHolder<ValueType>::value_type>)
+                LOG_TRACE(log, "Using builtin hash table for {} attribute", dictionary_attribute.name);
+            else
+                LOG_TRACE(log, "Using sparsehash for {} attribute", dictionary_attribute.name);
         };
 
         callOnDictionaryAttributeType(dictionary_attribute.underlying_type, type_call);
@@ -650,7 +679,9 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::createAttributes()
 
     if (unlikely(attributes.size()) == 0)
     {
-        no_attributes_containers.resize(configuration.shards);
+        no_attributes_containers.reserve(configuration.shards);
+        for (size_t i = 0; i < configuration.shards; ++i)
+            no_attributes_containers.emplace_back(grower);
     }
 
     string_arenas.resize(configuration.shards);
@@ -746,6 +777,9 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::blockToAttributes(c
         auto & attribute = attributes[attribute_index];
         bool attribute_is_nullable = attribute.is_nullable_sets.has_value();
 
+        /// Number of elements should not take into account multiple attributes.
+        new_element_count = 0;
+
         getAttributeContainers(attribute_index, [&](auto & containers)
         {
             using ContainerType = std::decay_t<decltype(containers.front())>;
@@ -816,12 +850,7 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::resize(size_t added
     if (unlikely(attributes_size == 0))
     {
         size_t reserve_size = added_rows + no_attributes_containers.front().size();
-
-        if constexpr (sparse)
-            no_attributes_containers.front().resize(reserve_size);
-        else
-            no_attributes_containers.front().reserve(reserve_size);
-
+        resizeContainer(no_attributes_containers.front(), reserve_size);
         return;
     }
 
@@ -831,11 +860,7 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::resize(size_t added
         {
             auto & container = containers.front();
             size_t reserve_size = added_rows + container.size();
-
-            if constexpr (sparse)
-                container.resize(reserve_size);
-            else
-                container.reserve(reserve_size);
+            resizeContainer(container, reserve_size);
         });
     }
 }
@@ -942,29 +967,22 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::calculateBytesAlloc
 
     for (size_t attribute_index = 0; attribute_index < attributes_size; ++attribute_index)
     {
+        /// bucket_count should be a sum over all shards (CollectionsHolder),
+        /// but it should not be a sum over all attributes, since it is used to
+        /// calculate load_factor like this:
+        ///
+        ///    element_count / bucket_count
+        ///
+        /// While element_count is a sum over all shards, not over all attributes.
+        bucket_count = 0;
+
         getAttributeContainers(attribute_index, [&](const auto & containers)
         {
             for (const auto & container : containers)
             {
-                using ContainerType = std::decay_t<decltype(container)>;
-                using AttributeValueType = typename ContainerType::mapped_type;
-
                 bytes_allocated += sizeof(container);
-
-                if constexpr (sparse || std::is_same_v<AttributeValueType, Field>)
-                {
-                    /// bucket_count() - Returns table size, that includes empty and deleted
-                    /// size()         - Returns table size, without empty and deleted
-                    /// and since this is sparsehash, empty cells should not be significant,
-                    /// and since items cannot be removed from the dictionary, deleted is also not important.
-                    bytes_allocated += container.size() * (sizeof(KeyType) + sizeof(AttributeValueType));
-                    bucket_count = container.bucket_count();
-                }
-                else
-                {
-                    bytes_allocated += container.getBufferSizeInBytes();
-                    bucket_count = container.getBufferSizeInCells();
-                }
+                bytes_allocated += getBufferSizeInBytes(container);
+                bucket_count += getBufferSizeInCells(container);
             }
         });
 
@@ -983,17 +1001,8 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::calculateBytesAlloc
         for (const auto & container : no_attributes_containers)
         {
             bytes_allocated += sizeof(container);
-
-            if constexpr (sparse)
-            {
-                bytes_allocated += container.size() * (sizeof(KeyType));
-                bucket_count = container.bucket_count();
-            }
-            else
-            {
-                bytes_allocated += container.getBufferSizeInBytes();
-                bucket_count = container.getBufferSizeInCells();
-            }
+            bytes_allocated += getBufferSizeInBytes(container);
+            bucket_count += getBufferSizeInCells(container);
         }
     }
 
@@ -1007,7 +1016,7 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::calculateBytesAlloc
     }
 
     for (const auto & arena : string_arenas)
-        bytes_allocated += arena->size();
+        bytes_allocated += arena->allocatedBytes();
 }
 
 template <DictionaryKeyType dictionary_key_type, bool sparse, bool sharded>
@@ -1051,12 +1060,7 @@ Pipe HashedDictionary<dictionary_key_type, sparse, sharded>::read(const Names &
             keys.reserve(keys.size() + container.size());
 
             for (const auto & key : container)
-            {
-                if constexpr (sparse)
-                    keys.emplace_back(key);
-                else
-                    keys.emplace_back(key.getKey());
-            }
+                keys.emplace_back(getSetKeyFromCell(key));
         }
     }
 
@@ -1165,9 +1169,14 @@ void registerDictionaryHashed(DictionaryFactory & factory)
         if (shard_load_queue_backlog <= 0)
             throw Exception(ErrorCodes::BAD_ARGUMENTS,"{}: SHARD_LOAD_QUEUE_BACKLOG parameter should be greater then zero", full_name);
 
+        float max_load_factor = static_cast<float>(config.getDouble(config_prefix + dictionary_layout_prefix + ".max_load_factor", 0.5));
+        if (max_load_factor < 0.5f || max_load_factor > 0.99f)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}: max_load_factor parameter should be within [0.5, 0.99], got {}", full_name, max_load_factor);
+
         HashedDictionaryConfiguration configuration{
             static_cast<UInt64>(shards),
             static_cast<UInt64>(shard_load_queue_backlog),
+            max_load_factor,
             require_nonempty,
             dict_lifetime,
         };
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index 67683679647..30eecb9ab09 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -4,17 +4,14 @@
 #include <memory>
 #include <variant>
 #include <optional>
-#include <sparsehash/sparse_hash_map>
-#include <sparsehash/sparse_hash_set>
 
-#include <Common/HashTable/HashMap.h>
-#include <Common/HashTable/HashSet.h>
 #include <Core/Block.h>
 
 #include <Dictionaries/DictionaryStructure.h>
 #include <Dictionaries/IDictionary.h>
 #include <Dictionaries/IDictionarySource.h>
 #include <Dictionaries/DictionaryHelpers.h>
+#include <Dictionaries/HashedDictionaryCollectionType.h>
 
 /** This dictionary stores all content in a hash table in memory
   * (a separate Key -> Value map for each attribute)
@@ -28,6 +25,7 @@ struct HashedDictionaryConfiguration
 {
     const UInt64 shards;
     const UInt64 shard_load_queue_backlog;
+    const float max_load_factor;
     const bool require_nonempty;
     const DictionaryLifetime lifetime;
 };
@@ -136,42 +134,7 @@ public:
 
 private:
     template <typename Value>
-    using CollectionTypeNonSparse = std::conditional_t<
-        dictionary_key_type == DictionaryKeyType::Simple,
-        HashMap<UInt64, Value, DefaultHash<UInt64>>,
-        HashMapWithSavedHash<StringRef, Value, DefaultHash<StringRef>>>;
-
-    using NoAttributesCollectionTypeNonSparse = std::conditional_t<
-        dictionary_key_type == DictionaryKeyType::Simple,
-        HashSet<UInt64, DefaultHash<UInt64>>,
-        HashSetWithSavedHash<StringRef, DefaultHash<StringRef>>>;
-
-    /// Here we use sparse_hash_map with DefaultHash<> for the following reasons:
-    ///
-    /// - DefaultHash<> is used for HashMap
-    /// - DefaultHash<> (from HashTable/Hash.h> works better then std::hash<>
-    ///   in case of sequential set of keys, but with random access to this set, i.e.
-    ///
-    ///       SELECT number FROM numbers(3000000) ORDER BY rand()
-    ///
-    ///   And even though std::hash<> works better in some other cases,
-    ///   DefaultHash<> is preferred since the difference for this particular
-    ///   case is significant, i.e. it can be 10x+.
-    template <typename Value>
-    using CollectionTypeSparse = std::conditional_t<
-        dictionary_key_type == DictionaryKeyType::Simple,
-        google::sparse_hash_map<UInt64, Value, DefaultHash<KeyType>>,
-        google::sparse_hash_map<StringRef, Value, DefaultHash<KeyType>>>;
-
-    using NoAttributesCollectionTypeSparse = google::sparse_hash_set<KeyType, DefaultHash<KeyType>>;
-
-    template <typename Value>
-    using CollectionType = std::conditional_t<sparse, CollectionTypeSparse<Value>, CollectionTypeNonSparse<Value>>;
-
-    template <typename Value>
-    using CollectionsHolder = std::vector<CollectionType<Value>>;
-
-    using NoAttributesCollectionType = std::conditional_t<sparse, NoAttributesCollectionTypeSparse, NoAttributesCollectionTypeNonSparse>;
+    using CollectionsHolder = std::vector<typename HashedDictionaryImpl::HashedDictionaryMapType<dictionary_key_type, sparse, KeyType, Value>::Type>;
 
     using NullableSet = HashSet<KeyType, DefaultHash<KeyType>>;
     using NullableSets = std::vector<NullableSet>;
@@ -269,7 +232,7 @@ private:
 
     BlockPtr update_field_loaded_block;
     std::vector<std::unique_ptr<Arena>> string_arenas;
-    std::vector<NoAttributesCollectionType> no_attributes_containers;
+    std::vector<typename HashedDictionaryImpl::HashedDictionarySetType<dictionary_key_type, sparse, KeyType>::Type> no_attributes_containers;
     DictionaryHierarchicalParentToChildIndexPtr hierarchical_index;
 };
 
diff --git a/src/Dictionaries/HashedDictionaryCollectionTraits.h b/src/Dictionaries/HashedDictionaryCollectionTraits.h
new file mode 100644
index 00000000000..4989664890a
--- /dev/null
+++ b/src/Dictionaries/HashedDictionaryCollectionTraits.h
@@ -0,0 +1,107 @@
+#pragma once
+
+#include <type_traits>
+#include <sparsehash/sparse_hash_map>
+#include <Common/HashTable/Hash.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashSet.h>
+#include <Common/HashTable/PackedHashMap.h>
+
+namespace DB
+{
+
+namespace HashedDictionaryImpl
+{
+
+/// sparse_hash_map/sparse_hash_set
+template <typename C>
+concept IsGoogleSparseHashTable = std::is_same_v<C, google::sparse_hash_map<
+    typename C::key_type,
+    typename C::mapped_type,
+    /// HashFcn is not exported in sparse_hash_map is public type
+    DefaultHash<typename C::key_type>>>;
+
+template <typename V>
+concept IsStdMapCell = requires (V v)
+{
+    v->first;
+    v->second;
+};
+
+/// HashMap/HashMapWithSavedHash/HashSet/HashMapWithSavedHash/PackedHashMap and their Cells
+template <typename C>
+concept IsBuiltinHashTable = (
+    std::is_same_v<C, HashMapWithSavedHash<
+        typename C::key_type,
+        typename C::mapped_type,
+        DefaultHash<typename C::key_type>,
+        typename C::grower_type>> ||
+    std::is_same_v<C, HashMap<
+        typename C::key_type,
+        typename C::mapped_type,
+        DefaultHash<typename C::key_type>,
+        typename C::grower_type>> ||
+    std::is_same_v<C, PackedHashMap<
+        typename C::key_type,
+        typename C::mapped_type,
+        DefaultHash<typename C::key_type>,
+        typename C::grower_type>> ||
+    std::is_same_v<C, HashSetWithSavedHash<
+        typename C::key_type,
+        DefaultHash<typename C::key_type>,
+        typename C::grower_type>> ||
+    std::is_same_v<C, HashSet<
+        typename C::key_type,
+        DefaultHash<typename C::key_type>,
+        typename C::grower_type>>
+);
+
+template <typename V>
+concept IsBuiltinSetCell = requires (V v)
+{
+    v.getKey();
+};
+
+template <typename V>
+concept IsBuiltinMapCell = requires (V v)
+{
+    v->getKey();
+    v->getMapped();
+};
+
+// NOLINTBEGIN(*)
+
+/// google::sparse_hash_map
+template <typename T> auto getSetKeyFromCell(const T & value) { return value; }
+template <typename T> auto getKeyFromCell(const T & value) requires (IsStdMapCell<T>) { return value->first; }
+template <typename T> auto getValueFromCell(const T & value) requires (IsStdMapCell<T>) { return value->second; }
+
+/// size() - returns table size, without empty and deleted
+/// and since this is sparsehash, empty cells should not be significant,
+/// and since items cannot be removed from the dictionary, deleted is also not important.
+///
+/// NOTE: for google::sparse_hash_set value_type is Key, for sparse_hash_map
+/// value_type is std::pair<Key, Value>, and now we correctly takes into
+/// account padding in structures, if any.
+template <typename C> auto getBufferSizeInBytes(const C & c) requires (IsGoogleSparseHashTable<C>) { return c.size() * sizeof(typename C::value_type); }
+/// bucket_count() - Returns table size, that includes empty and deleted
+template <typename C> auto getBufferSizeInCells(const C & c) requires (IsGoogleSparseHashTable<C>) { return c.bucket_count(); }
+
+template <typename C> auto resizeContainer(C & c, size_t size) requires (IsGoogleSparseHashTable<C>) { return c.resize(size); }
+template <typename C> auto clearContainer(C & c) requires (IsGoogleSparseHashTable<C>) { return c.clear(); }
+
+/// HashMap
+template <typename T> auto getSetKeyFromCell(const T & value) requires (IsBuiltinSetCell<T>) { return value.getKey(); }
+template <typename T> auto getKeyFromCell(const T & value) requires (IsBuiltinMapCell<T>) { return value->getKey(); }
+template <typename T> auto getValueFromCell(const T & value) requires (IsBuiltinMapCell<T>) { return value->getMapped(); }
+
+template <typename C> auto getBufferSizeInBytes(const C & c) requires (IsBuiltinHashTable<C>) { return c.getBufferSizeInBytes(); }
+template <typename C> auto getBufferSizeInCells(const C & c) requires (IsBuiltinHashTable<C>) { return c.getBufferSizeInCells(); }
+template <typename C> auto resizeContainer(C & c, size_t size) requires (IsBuiltinHashTable<C>) { return c.reserve(size); }
+template <typename C> void clearContainer(C & c) requires (IsBuiltinHashTable<C>) { return c.clearAndShrink(); }
+
+// NOLINTEND(*)
+
+}
+
+}
diff --git a/src/Dictionaries/HashedDictionaryCollectionType.h b/src/Dictionaries/HashedDictionaryCollectionType.h
new file mode 100644
index 00000000000..0746d42bd1f
--- /dev/null
+++ b/src/Dictionaries/HashedDictionaryCollectionType.h
@@ -0,0 +1,262 @@
+#pragma once
+
+#include <Dictionaries/IDictionary.h>
+#include <Common/HashTable/PackedHashMap.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashSet.h>
+#include <Core/Types_fwd.h>
+#include <sparsehash/sparse_hash_map>
+#include <sparsehash/sparse_hash_set>
+#include <type_traits>
+
+namespace DB
+{
+
+namespace HashedDictionaryImpl
+{
+
+/// Return true if the type is POD [1] for the purpose of layout (this is not
+/// the same as STL traits has).
+///
+///   [1]: https://stackoverflow.com/questions/4178175/what-are-aggregates-and-pods-and-how-why-are-they-special/4178176#4178176
+///
+/// The behaviour had been change in clang-16, see this for more details:
+/// - https://github.com/llvm/llvm-project/commit/a8b0c6fa28acced71db33e80bd0b51d00422035b
+/// - https://github.com/llvm/llvm-project/commit/277123376ce08c98b07c154bf83e4092a5d4d3c6
+/// - https://github.com/llvm/llvm-project/issues/62422
+/// - https://github.com/llvm/llvm-project/issues/62353
+/// - https://github.com/llvm/llvm-project/issues/62358
+template <typename V>
+constexpr bool isPodLayout()
+{
+    if constexpr (std::is_same_v<V, UUID>)
+        return false;
+    if constexpr (std::is_same_v<V, DateTime64>)
+        return false;
+    if constexpr (std::is_same_v<V, Decimal32> || std::is_same_v<V, Decimal64> || std::is_same_v<V, Decimal128> || std::is_same_v<V, Decimal256>)
+        return false;
+    if constexpr (std::is_same_v<V, StringRef>)
+        return false;
+    if constexpr (std::is_same_v<V, IPv6> || std::is_same_v<V, IPv4>)
+        return false;
+    return true;
+}
+
+/// HashMap with packed structure is better than google::sparse_hash_map if the
+/// <K, V> pair is small, for the sizeof(std::pair<K, V>) == 16, RSS for hash
+/// table with 1e9 elements will be:
+///
+/// - google::sparse_hash_map             : 26GiB
+/// - HashMap                             : 35GiB
+/// - PackedHashMap                       : 22GiB
+/// - google::sparse_hash_map<packed_pair>: 17GiB
+///
+/// Also note here sizeof(std::pair<>) was used since google::sparse_hash_map
+/// uses it to store <K, V>, yes we can modify google::sparse_hash_map to work
+/// with packed analog of std::pair, but the allocator overhead is still
+/// significant, because of tons of reallocations (and those cannot be solved
+/// with reserve() due to some internals of google::sparse_hash_map) and poor
+/// jemalloc support of such pattern, which results in 33% fragmentation (in
+/// comparison with glibc).
+///
+/// Plus since google::sparse_hash_map cannot use packed structure, it will
+/// have the same memory footprint for everything from UInt8 to UInt64 values
+/// and so on.
+///
+/// Returns true hen google::sparse_hash_map should be used, otherwise
+/// PackedHashMap should be used instead.
+template <typename K, typename V>
+constexpr bool useSparseHashForHashedDictionary()
+{
+    if constexpr (!isPodLayout<K>())
+        return true;
+    if constexpr (!isPodLayout<V>())
+        return true;
+    /// NOTE: One should not use PackedPairNoInit<K, V> here since this will
+    /// create instantion of this type, and it could be illformed.
+    return sizeof(V) > 8;
+}
+
+/// Grower with custom fill limit/load factor (instead of default 50%).
+///
+/// Based on HashTableGrowerWithPrecalculation
+template <size_t initial_size_degree = 8>
+class alignas(64) HashTableGrowerWithPrecalculationAndMaxLoadFactor
+{
+    UInt8 size_degree = initial_size_degree;
+    size_t precalculated_mask = (1ULL << initial_size_degree) - 1;
+    size_t precalculated_max_fill = 1ULL << (initial_size_degree - 1);
+    float max_load_factor = 0.5;
+    /// HashTableGrowerWithPrecalculation has 23, but to decrease memory usage
+    /// at least slightly 19 is used here. Also note, that for dictionaries it
+    /// is not that important since they are not that frequently loaded.
+    static constexpr size_t max_size_degree_quadratic = 19;
+
+public:
+    static constexpr auto initial_count = 1ULL << initial_size_degree;
+
+    /// If collision resolution chains are contiguous, we can implement erase operation by moving the elements.
+    static constexpr auto performs_linear_probing_with_single_step = true;
+
+    HashTableGrowerWithPrecalculationAndMaxLoadFactor() = default;
+    explicit HashTableGrowerWithPrecalculationAndMaxLoadFactor(float max_load_factor_)
+        : max_load_factor(max_load_factor_)
+    {
+        increaseSizeDegree(0);
+    }
+
+    UInt8 sizeDegree() const { return size_degree; }
+
+    void increaseSizeDegree(UInt8 delta)
+    {
+        size_degree += delta;
+        precalculated_mask = (1ULL << size_degree) - 1;
+        precalculated_max_fill = static_cast<size_t>((1ULL << size_degree) * max_load_factor);
+    }
+
+    /// The size of the hash table in the cells.
+    size_t bufSize() const { return 1ULL << size_degree; }
+
+    /// From the hash value, get the cell number in the hash table.
+    size_t place(size_t x) const { return x & precalculated_mask; }
+
+    /// The next cell in the collision resolution chain.
+    size_t next(size_t pos) const { return (pos + 1) & precalculated_mask; }
+
+    /// Whether the hash table is sufficiently full. You need to increase the size of the hash table, or remove something unnecessary from it.
+    bool overflow(size_t elems) const { return elems > precalculated_max_fill; }
+
+    /// Increase the size of the hash table.
+    void increaseSize() { increaseSizeDegree(size_degree >= max_size_degree_quadratic ? 1 : 2); }
+
+    /// Set the buffer size by the number of elements in the hash table. Used when deserializing a hash table.
+    void set(size_t num_elems)
+    {
+        if (num_elems <= 1)
+            size_degree = initial_size_degree;
+        else if (initial_size_degree > static_cast<size_t>(log2(num_elems - 1)) + 2)
+            size_degree = initial_size_degree;
+        else
+        {
+            /// Slightly more optimal than HashTableGrowerWithPrecalculation
+            /// and takes into account max_load_factor.
+            size_degree = static_cast<size_t>(log2(num_elems - 1)) + 1;
+            if ((1ULL << size_degree) * max_load_factor < num_elems)
+                ++size_degree;
+        }
+        increaseSizeDegree(0);
+    }
+
+    void setBufSize(size_t buf_size_)
+    {
+        size_degree = static_cast<size_t>(log2(buf_size_ - 1) + 1);
+        increaseSizeDegree(0);
+    }
+};
+static_assert(sizeof(HashTableGrowerWithPrecalculationAndMaxLoadFactor<>) == 64);
+
+/// Above goes various specialisations for the hash table that will be used for
+/// HASHED/SPARSE_HASHED dictionary, it could use one of the following depends
+/// on the layout of the dictionary and types of key/value (for more info see
+/// comments in this file):
+/// - HashMap
+/// - HashSet
+/// - HashMapWithSavedHash
+/// - HashSetWithSavedHash
+/// - PackedHashMap
+/// - google::sparse_hash_map
+
+///
+/// Map (dictionary with attributes)
+///
+
+/// Type of the hash table for the dictionary.
+template <DictionaryKeyType dictionary_key_type, bool sparse, typename Key, typename Value>
+struct HashedDictionaryMapType;
+
+/// Default implementation using builtin HashMap (for HASHED layout).
+template <DictionaryKeyType dictionary_key_type, typename Key, typename Value>
+struct HashedDictionaryMapType<dictionary_key_type, /* sparse= */ false, Key, Value>
+{
+    using Type = std::conditional_t<
+        dictionary_key_type == DictionaryKeyType::Simple,
+        HashMap<UInt64, Value, DefaultHash<UInt64>, HashTableGrowerWithPrecalculationAndMaxLoadFactor<>>,
+        HashMapWithSavedHash<StringRef, Value, DefaultHash<StringRef>, HashTableGrowerWithPrecalculationAndMaxLoadFactor<>>>;
+};
+
+/// Implementations for SPARSE_HASHED layout.
+template <DictionaryKeyType dictionary_key_type, typename Key, typename Value, bool use_sparse_hash>
+struct HashedDictionarySparseMapType;
+
+/// Implementation based on google::sparse_hash_map for SPARSE_HASHED.
+template <DictionaryKeyType dictionary_key_type, typename Key, typename Value>
+struct HashedDictionarySparseMapType<dictionary_key_type, Key, Value, /* use_sparse_hash= */ true>
+{
+    /// Here we use sparse_hash_map with DefaultHash<> for the following reasons:
+    ///
+    /// - DefaultHash<> is used for HashMap
+    /// - DefaultHash<> (from HashTable/Hash.h> works better then std::hash<>
+    ///   in case of sequential set of keys, but with random access to this set, i.e.
+    ///
+    ///       SELECT number FROM numbers(3000000) ORDER BY rand()
+    ///
+    ///   And even though std::hash<> works better in some other cases,
+    ///   DefaultHash<> is preferred since the difference for this particular
+    ///   case is significant, i.e. it can be 10x+.
+    using Type = std::conditional_t<
+        dictionary_key_type == DictionaryKeyType::Simple,
+        google::sparse_hash_map<UInt64, Value, DefaultHash<Key>>,
+        google::sparse_hash_map<StringRef, Value, DefaultHash<Key>>>;
+};
+
+/// Implementation based on PackedHashMap for SPARSE_HASHED.
+template <DictionaryKeyType dictionary_key_type, typename Key, typename Value>
+struct HashedDictionarySparseMapType<dictionary_key_type, Key, Value, /* use_sparse_hash= */ false>
+{
+    using Type = std::conditional_t<
+        dictionary_key_type == DictionaryKeyType::Simple,
+        PackedHashMap<UInt64, Value, DefaultHash<UInt64>, HashTableGrowerWithPrecalculationAndMaxLoadFactor<>>,
+        PackedHashMap<StringRef, Value, DefaultHash<StringRef>, HashTableGrowerWithPrecalculationAndMaxLoadFactor<>>>;
+};
+template <DictionaryKeyType dictionary_key_type, typename Key, typename Value>
+struct HashedDictionaryMapType<dictionary_key_type, /* sparse= */ true, Key, Value>
+    : public HashedDictionarySparseMapType<
+        dictionary_key_type, Key, Value,
+        /* use_sparse_hash= */ useSparseHashForHashedDictionary<Key, Value>()>
+{};
+
+///
+/// Set (dictionary with attributes)
+///
+
+/// Type of the hash table for the dictionary.
+template <DictionaryKeyType dictionary_key_type, bool sparse, typename Key>
+struct HashedDictionarySetType;
+
+/// Default implementation using builtin HashMap (for HASHED layout).
+template <DictionaryKeyType dictionary_key_type, typename Key>
+struct HashedDictionarySetType<dictionary_key_type, /* sparse= */ false, Key>
+{
+    using Type = std::conditional_t<
+        dictionary_key_type == DictionaryKeyType::Simple,
+        HashSet<UInt64, DefaultHash<UInt64>, HashTableGrowerWithPrecalculationAndMaxLoadFactor<>>,
+        HashSetWithSavedHash<StringRef, DefaultHash<StringRef>, HashTableGrowerWithPrecalculationAndMaxLoadFactor<>>>;
+};
+
+/// Implementation for SPARSE_HASHED.
+///
+/// NOTE: There is no implementation based on google::sparse_hash_set since
+/// PackedHashMap is more optimal anyway (see comments for
+/// useSparseHashForHashedDictionary()).
+template <DictionaryKeyType dictionary_key_type, typename Key>
+struct HashedDictionarySetType<dictionary_key_type, /* sparse= */ true, Key>
+{
+    using Type = std::conditional_t<
+        dictionary_key_type == DictionaryKeyType::Simple,
+        HashSet<UInt64, DefaultHash<UInt64>, HashTableGrowerWithPrecalculationAndMaxLoadFactor<>>,
+        HashSet<StringRef, DefaultHash<StringRef>, HashTableGrowerWithPrecalculationAndMaxLoadFactor<>>>;
+};
+
+}
+
+}
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 803f607a3a7..6bb06de7506 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -5,6 +5,7 @@
 #include <Common/IPv6ToBinary.h>
 #include <Common/memcmpSmall.h>
 #include <Common/typeid_cast.h>
+#include <Common/logger_useful.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -540,7 +541,7 @@ template <>
 void IPAddressDictionary::addAttributeSize<String>(const Attribute & attribute)
 {
     addAttributeSize<StringRef>(attribute);
-    bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
+    bytes_allocated += sizeof(Arena) + attribute.string_arena->allocatedBytes();
 }
 
 void IPAddressDictionary::calculateBytesAllocated()
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index e1fabb89a7e..40dc5dd6782 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -5,13 +5,11 @@
 #include <variant>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnString.h>
-#include <Common/Arena.h>
 #include <Common/HashTable/HashMap.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnVector.h>
 #include <Poco/Net/IPAddress.h>
 #include <base/StringRef.h>
-#include <Common/logger_useful.h>
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
@@ -19,6 +17,8 @@
 
 namespace DB
 {
+class Arena;
+
 class IPAddressDictionary final : public IDictionary
 {
 public:
diff --git a/src/Dictionaries/MongoDBDictionarySource.cpp b/src/Dictionaries/MongoDBDictionarySource.cpp
index bec566c29a6..b7e342f3c80 100644
--- a/src/Dictionaries/MongoDBDictionarySource.cpp
+++ b/src/Dictionaries/MongoDBDictionarySource.cpp
@@ -3,13 +3,13 @@
 #include "DictionaryStructure.h"
 #include "registerDictionaries.h"
 #include <Storages/ExternalDataSourceConfiguration.h>
-
+#include <Storages/StorageMongoDBSocketFactory.h>
 
 namespace DB
 {
 
 static const std::unordered_set<std::string_view> dictionary_allowed_keys = {
-    "host", "port", "user", "password", "db", "database", "uri", "collection", "name", "method"};
+    "host", "port", "user", "password", "db", "database", "uri", "collection", "name", "method", "options"};
 
 void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
 {
@@ -51,6 +51,7 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
             config.getString(config_prefix + ".method", ""),
             configuration.database,
             config.getString(config_prefix + ".collection"),
+            config.getString(config_prefix + ".options", ""),
             sample_block);
     };
 
@@ -67,7 +68,6 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
 #include <Poco/MongoDB/ObjectId.h>
 #include <Poco/URI.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Poco/Version.h>
 
 // only after poco
 // naming conflict:
@@ -99,6 +99,7 @@ MongoDBDictionarySource::MongoDBDictionarySource(
     const std::string & method_,
     const std::string & db_,
     const std::string & collection_,
+    const std::string & options_,
     const Block & sample_block_)
     : dict_struct{dict_struct_}
     , uri{uri_}
@@ -109,12 +110,18 @@ MongoDBDictionarySource::MongoDBDictionarySource(
     , method{method_}
     , db{db_}
     , collection{collection_}
+    , options(options_)
     , sample_block{sample_block_}
     , connection{std::make_shared<Poco::MongoDB::Connection>()}
 {
+
+    StorageMongoDBSocketFactory socket_factory;
     if (!uri.empty())
     {
-        Poco::URI poco_uri(uri);
+        // Connect with URI.
+        connection->connect(uri, socket_factory);
+
+        Poco::URI poco_uri(connection->uri());
 
         // Parse database from URI. This is required for correctness -- the
         // cursor is created using database name and collection name, so we have
@@ -134,15 +141,13 @@ MongoDBDictionarySource::MongoDBDictionarySource(
         {
             user.resize(separator);
         }
-
-        // Connect with URI.
-        Poco::MongoDB::Connection::SocketFactory socket_factory;
-        connection->connect(uri, socket_factory);
     }
     else
     {
-        // Connect with host/port/user/etc.
-        connection->connect(host, port);
+        // Connect with host/port/user/etc through constructing the uri
+        std::string uri_constructed("mongodb://" + host + ":" + std::to_string(port) + "/" + db + (options.empty() ? "" : "?" + options));
+        connection->connect(uri_constructed, socket_factory);
+
         if (!user.empty())
         {
             Poco::MongoDB::Database poco_db(db);
@@ -155,7 +160,9 @@ MongoDBDictionarySource::MongoDBDictionarySource(
 
 MongoDBDictionarySource::MongoDBDictionarySource(const MongoDBDictionarySource & other)
     : MongoDBDictionarySource{
-        other.dict_struct, other.uri, other.host, other.port, other.user, other.password, other.method, other.db, other.collection, other.sample_block}
+        other.dict_struct, other.uri, other.host, other.port, other.user, other.password, other.method, other.db,
+        other.collection, other.options, other.sample_block
+    }
 {
 }
 
diff --git a/src/Dictionaries/MongoDBDictionarySource.h b/src/Dictionaries/MongoDBDictionarySource.h
index 4c7ae649f09..fefcb1bff9f 100644
--- a/src/Dictionaries/MongoDBDictionarySource.h
+++ b/src/Dictionaries/MongoDBDictionarySource.h
@@ -41,6 +41,7 @@ public:
         const std::string & method_,
         const std::string & db_,
         const std::string & collection_,
+        const std::string & options,
         const Block & sample_block_);
 
     MongoDBDictionarySource(const MongoDBDictionarySource & other);
@@ -80,6 +81,7 @@ private:
     const std::string method;
     std::string db;
     const std::string collection;
+    const std::string options;
     Block sample_block;
 
     std::shared_ptr<Poco::MongoDB::Connection> connection;
diff --git a/src/Dictionaries/MySQLDictionarySource.cpp b/src/Dictionaries/MySQLDictionarySource.cpp
index c8491d99255..730217f96b7 100644
--- a/src/Dictionaries/MySQLDictionarySource.cpp
+++ b/src/Dictionaries/MySQLDictionarySource.cpp
@@ -13,14 +13,15 @@
 #include <Interpreters/Context.h>
 #include <QueryPipeline/Pipe.h>
 #include <QueryPipeline/QueryPipeline.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/MySQL/MySQLHelpers.h>
 #include <Storages/MySQL/MySQLSettings.h>
+#include <Storages/NamedCollectionsHelpers.h>
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypeString.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
 #include <Common/LocalDateTime.h>
+#include <Common/parseRemoteDescription.h>
 #include <Common/logger_useful.h>
 #include "readInvalidateQuery.h"
 
@@ -37,7 +38,7 @@ namespace ErrorCodes
     extern const int UNSUPPORTED_METHOD;
 }
 
-static const std::unordered_set<std::string_view> dictionary_allowed_keys = {
+static const ValidateKeysMultiset<ExternalDatabaseEqualKeysSet> dictionary_allowed_keys = {
     "host", "port", "user", "password",
     "db", "database", "table", "schema",
     "update_field", "invalidate_query", "priority",
@@ -68,59 +69,86 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
         auto settings_config_prefix = config_prefix + ".mysql";
         std::shared_ptr<mysqlxx::PoolWithFailover> pool;
         MySQLSettings mysql_settings;
-        auto has_config_key = [&](const String & key)
-        {
-            return dictionary_allowed_keys.contains(key) || key.starts_with("replica") || mysql_settings.has(key);
-        };
-        StorageMySQLConfiguration configuration;
-        auto named_collection = created_from_ddl
-                              ? getExternalDataSourceConfiguration(config, settings_config_prefix, global_context, has_config_key, mysql_settings)
-                              : std::nullopt;
+
+        std::optional<MySQLDictionarySource::Configuration> dictionary_configuration;
+        auto named_collection = created_from_ddl ? tryGetNamedCollectionWithOverrides(config, settings_config_prefix) : nullptr;
         if (named_collection)
         {
-            if (created_from_ddl)
-                global_context->getRemoteHostFilter().checkHostAndPort(configuration.host, toString(configuration.port));
+            auto allowed_arguments{dictionary_allowed_keys};
+            for (const auto & setting : mysql_settings.all())
+                allowed_arguments.insert(setting.getName());
+            validateNamedCollection<ValidateKeysMultiset<ExternalDatabaseEqualKeysSet>>(*named_collection, {}, allowed_arguments);
+
+            StorageMySQL::Configuration::Addresses addresses;
+            const auto addresses_expr = named_collection->getOrDefault<String>("addresses_expr", "");
+            if (addresses_expr.empty())
+            {
+                const auto host = named_collection->getAnyOrDefault<String>({"host", "hostname"}, "");
+                const auto port = static_cast<UInt16>(named_collection->get<UInt64>("port"));
+                addresses = {std::make_pair(host, port)};
+            }
+            else
+            {
+                size_t max_addresses = global_context->getSettingsRef().glob_expansion_max_elements;
+                addresses = parseRemoteDescriptionForExternalDatabase(addresses_expr, max_addresses, 3306);
+            }
+
+            for (auto & address : addresses)
+                global_context->getRemoteHostFilter().checkHostAndPort(address.first, toString(address.second));
+
+            dictionary_configuration.emplace(MySQLDictionarySource::Configuration{
+                .db = named_collection->getAnyOrDefault<String>({"database", "db"}, ""),
+                .table = named_collection->getOrDefault<String>("table", ""),
+                .query = named_collection->getOrDefault<String>("query", ""),
+                .where = named_collection->getOrDefault<String>("where", ""),
+                .invalidate_query = named_collection->getOrDefault<String>("invalidate_query", ""),
+                .update_field = named_collection->getOrDefault<String>("update_field", ""),
+                .update_lag = named_collection->getOrDefault<UInt64>("update_lag", 1),
+                .dont_check_update_time = named_collection->getOrDefault<bool>("dont_check_update_time", false),
+            });
 
-            mysql_settings.applyChanges(named_collection->settings_changes);
-            configuration.set(named_collection->configuration);
-            configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
             const auto & settings = global_context->getSettingsRef();
             if (!mysql_settings.isChanged("connect_timeout"))
                 mysql_settings.connect_timeout = settings.external_storage_connect_timeout_sec;
             if (!mysql_settings.isChanged("read_write_timeout"))
                 mysql_settings.read_write_timeout = settings.external_storage_rw_timeout_sec;
-            pool = std::make_shared<mysqlxx::PoolWithFailover>(createMySQLPoolWithFailover(configuration, mysql_settings));
+
+            for (const auto & setting : mysql_settings.all())
+            {
+                const auto & setting_name = setting.getName();
+                if (named_collection->has(setting_name))
+                    mysql_settings.set(setting_name, named_collection->get<String>(setting_name));
+            }
+
+            pool = std::make_shared<mysqlxx::PoolWithFailover>(
+                createMySQLPoolWithFailover(
+                    dictionary_configuration->db,
+                    addresses,
+                    named_collection->getAnyOrDefault<String>({"user", "username"}, ""),
+                    named_collection->getOrDefault<String>("password", ""),
+                    mysql_settings));
         }
         else
         {
-            if (created_from_ddl)
-            {
-                for (auto & address : configuration.addresses)
-                    global_context->getRemoteHostFilter().checkHostAndPort(address.first, toString(address.second));
-            }
+            dictionary_configuration.emplace(MySQLDictionarySource::Configuration{
+                .db = config.getString(settings_config_prefix + ".db", ""),
+                .table = config.getString(settings_config_prefix + ".table", ""),
+                .query = config.getString(settings_config_prefix + ".query", ""),
+                .where = config.getString(settings_config_prefix + ".where", ""),
+                .invalidate_query = config.getString(settings_config_prefix + ".invalidate_query", ""),
+                .update_field = config.getString(settings_config_prefix + ".update_field", ""),
+                .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
+                .dont_check_update_time = config.getBool(settings_config_prefix + ".dont_check_update_time", false)
+            });
 
-            configuration.database = config.getString(settings_config_prefix + ".db", "");
-            configuration.table = config.getString(settings_config_prefix + ".table", "");
-            pool = std::make_shared<mysqlxx::PoolWithFailover>(mysqlxx::PoolFactory::instance().get(config, settings_config_prefix));
+            pool = std::make_shared<mysqlxx::PoolWithFailover>(
+                mysqlxx::PoolFactory::instance().get(config, settings_config_prefix));
         }
 
-        auto query = config.getString(settings_config_prefix + ".query", "");
-        if (query.empty() && configuration.table.empty())
+        if (dictionary_configuration->query.empty() && dictionary_configuration->table.empty())
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "MySQL dictionary source configuration must contain table or query field");
 
-        MySQLDictionarySource::Configuration dictionary_configuration
-        {
-            .db = configuration.database,
-            .table = configuration.table,
-            .query = query,
-            .where = config.getString(settings_config_prefix + ".where", ""),
-            .invalidate_query = config.getString(settings_config_prefix + ".invalidate_query", ""),
-            .update_field = config.getString(settings_config_prefix + ".update_field", ""),
-            .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
-            .dont_check_update_time = config.getBool(settings_config_prefix + ".dont_check_update_time", false)
-        };
-
-        return std::make_unique<MySQLDictionarySource>(dict_struct, dictionary_configuration, std::move(pool), sample_block, mysql_input_stream_settings);
+        return std::make_unique<MySQLDictionarySource>(dict_struct, *dictionary_configuration, std::move(pool), sample_block, mysql_input_stream_settings);
 #else
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
             "Dictionary source of type `mysql` is disabled because ClickHouse was built without mysql support.");
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.cpp b/src/Dictionaries/PostgreSQLDictionarySource.cpp
index 9f254da0b11..8ec78308392 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.cpp
+++ b/src/Dictionaries/PostgreSQLDictionarySource.cpp
@@ -13,6 +13,7 @@
 #include <Interpreters/Context.h>
 #include <QueryPipeline/QueryPipeline.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
+#include <Common/logger_useful.h>
 #endif
 
 
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.h b/src/Dictionaries/PostgreSQLDictionarySource.h
index 8ecf56a9430..1305333458b 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.h
+++ b/src/Dictionaries/PostgreSQLDictionarySource.h
@@ -8,7 +8,6 @@
 #include "ExternalQueryBuilder.h"
 #include <Core/Block.h>
 #include <Common/LocalDateTime.h>
-#include <Common/logger_useful.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
 
 
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index d6bb510542e..e1c2168cea3 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -726,7 +726,7 @@ void RangeHashedDictionary<dictionary_key_type>::calculateBytesAllocated()
     if (update_field_loaded_block)
         bytes_allocated += update_field_loaded_block->allocatedBytes();
 
-    bytes_allocated += string_arena.size();
+    bytes_allocated += string_arena.allocatedBytes();
 }
 
 template <DictionaryKeyType dictionary_key_type>
@@ -1227,7 +1227,7 @@ Pipe RangeHashedDictionary<dictionary_key_type>::read(const Names & column_names
     DictionarySourceCoordinator::ReadColumnsFunc read_keys_func = [dictionary_copy = dictionary](
         const Strings & attribute_names,
         const DataTypes & result_types,
-        const Columns & key_columns,
+        const Columns & key_columns_,
         const DataTypes,
         const Columns &)
     {
@@ -1238,15 +1238,15 @@ Pipe RangeHashedDictionary<dictionary_key_type>::read(const Names & column_names
         Columns result;
         result.reserve(attribute_names_size);
 
-        const ColumnPtr & key_column = key_columns.back();
+        const ColumnPtr & key_column = key_columns_.back();
 
-        const auto * key_to_index_column = typeid_cast<const ColumnUInt64 *>(key_column.get());
-        if (!key_to_index_column)
+        const auto * key_to_index_column_ = typeid_cast<const ColumnUInt64 *>(key_column.get());
+        if (!key_to_index_column_)
             throw Exception(ErrorCodes::LOGICAL_ERROR,
                 "Dictionary {} read expect indexes column with type UInt64",
                 range_dictionary_ptr->getFullName());
 
-        const auto & data = key_to_index_column->getData();
+        const auto & data = key_to_index_column_->getData();
 
         for (size_t i = 0; i < attribute_names_size; ++i)
         {
diff --git a/src/Dictionaries/RedisDictionarySource.cpp b/src/Dictionaries/RedisDictionarySource.cpp
index bde4d596352..6e4c5d1d5d9 100644
--- a/src/Dictionaries/RedisDictionarySource.cpp
+++ b/src/Dictionaries/RedisDictionarySource.cpp
@@ -68,6 +68,16 @@ namespace DB
         factory.registerSource("redis", create_table_source);
     }
 
+    RedisDictionarySource::Connection::Connection(PoolPtr pool_, ClientPtr client_)
+        : pool(std::move(pool_)), client(std::move(client_))
+    {
+    }
+
+    RedisDictionarySource::Connection::~Connection()
+    {
+        pool->returnObject(std::move(client));
+    }
+
     static constexpr size_t REDIS_MAX_BLOCK_SIZE = DEFAULT_BLOCK_SIZE;
     static constexpr size_t REDIS_LOCK_ACQUIRE_TIMEOUT_MS = 5000;
 
diff --git a/src/Dictionaries/RedisDictionarySource.h b/src/Dictionaries/RedisDictionarySource.h
index 26f5ab2a613..8fb6f93193b 100644
--- a/src/Dictionaries/RedisDictionarySource.h
+++ b/src/Dictionaries/RedisDictionarySource.h
@@ -52,15 +52,8 @@ namespace DB
 
         struct Connection
         {
-            Connection(PoolPtr pool_, ClientPtr client_)
-                : pool(std::move(pool_)), client(std::move(client_))
-            {
-            }
-
-            ~Connection()
-            {
-                pool->returnObject(std::move(client));
-            }
+            Connection(PoolPtr pool_, ClientPtr client_);
+            ~Connection();
 
             PoolPtr pool;
             ClientPtr client;
diff --git a/src/Dictionaries/RegExpTreeDictionary.cpp b/src/Dictionaries/RegExpTreeDictionary.cpp
index caba2a52a51..9841cadcdca 100644
--- a/src/Dictionaries/RegExpTreeDictionary.cpp
+++ b/src/Dictionaries/RegExpTreeDictionary.cpp
@@ -9,9 +9,10 @@
 #include <Poco/Logger.h>
 #include <Poco/RegularExpression.h>
 
-#include "Common/Exception.h"
 #include <Common/ArenaUtils.h>
+#include <Common/Exception.h>
 #include <Common/logger_useful.h>
+#include <Common/OptimizedRegularExpression.h>
 #include <Core/ColumnsWithTypeAndName.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -19,6 +20,7 @@
 #include <Functions/Regexps.h>
 #include <Functions/checkHyperscanRegexp.h>
 #include <QueryPipeline/QueryPipeline.h>
+#include <Processors/Sources/BlocksListSource.h>
 
 #include <Dictionaries/ClickHouseDictionarySource.h>
 #include <Dictionaries/DictionaryFactory.h>
@@ -34,6 +36,7 @@
 
 #if USE_VECTORSCAN
 #    include <hs.h>
+#    include <hs_compile.h>
 #endif
 
 namespace DB
@@ -46,6 +49,7 @@ namespace ErrorCodes
     extern const int HYPERSCAN_CANNOT_SCAN_TEXT;
     extern const int UNSUPPORTED_METHOD;
     extern const int INCORRECT_DICTIONARY_DEFINITION;
+    extern const int LOGICAL_ERROR;
 }
 
 const std::string kRegExp = "regexp";
@@ -83,6 +87,32 @@ namespace
     }
 }
 
+struct ExternalRegexpQueryBuilder final : public ExternalQueryBuilder
+{
+    explicit ExternalRegexpQueryBuilder(const ExternalQueryBuilder & builder) : ExternalQueryBuilder(builder) {}
+
+    void composeLoadAllQuery(WriteBuffer & out) const override
+    {
+        writeString("SELECT id, parent_id, regexp, keys, values FROM ", out);
+        if (!db.empty())
+        {
+            writeQuoted(db, out);
+            writeChar('.', out);
+        }
+        if (!schema.empty())
+        {
+            writeQuoted(schema, out);
+            writeChar('.', out);
+        }
+        writeQuoted(table, out);
+        if (!where.empty())
+        {
+            writeString(" WHERE ", out);
+            writeString(where, out);
+        }
+    }
+};
+
 struct RegExpTreeDictionary::RegexTreeNode
 {
     std::vector<UInt64> children;
@@ -114,6 +144,7 @@ struct RegExpTreeDictionary::RegexTreeNode
     {
         Field field;
         std::vector<StringPiece> pieces;
+        String original_value;
 
         constexpr bool containsBackRefs() const { return !pieces.empty(); }
     };
@@ -172,10 +203,6 @@ void RegExpTreeDictionary::initRegexNodes(Block & block)
     auto keys_column = block.getByName(kKeys).column;
     auto values_column = block.getByName(kValues).column;
 
-#ifdef USE_VECTORSCAN
-    SlowWithHyperscanChecker checker;
-#endif
-
     size_t size = block.rows();
     for (size_t i = 0; i < size; i++)
     {
@@ -199,32 +226,56 @@ void RegExpTreeDictionary::initRegexNodes(Block & block)
         Array keys = (*keys_column)[i].safeGet<Array>();
         Array values = (*values_column)[i].safeGet<Array>();
         size_t keys_size = keys.size();
-        for (size_t i = 0; i < keys_size; i++)
+        for (size_t j = 0; j < keys_size; j++)
         {
-            const String & name = keys[i].safeGet<String>();
-            const String & value = values[i].safeGet<String>();
-            if (structure.hasAttribute(name))
+            const String & name_ = keys[j].safeGet<String>();
+            const String & value = values[j].safeGet<String>();
+            if (structure.hasAttribute(name_))
             {
-                const auto & attr = structure.getAttribute(name);
+                const auto & attr = structure.getAttribute(name_);
                 auto string_pieces = createStringPieces(value, num_captures, regex, logger);
                 if (!string_pieces.empty())
                 {
-                    node->attributes[name] = RegexTreeNode::AttributeValue{.field = values[i], .pieces = std::move(string_pieces)};
+                    node->attributes[name_] = RegexTreeNode::AttributeValue{.field = values[j], .pieces = std::move(string_pieces), .original_value = value};
                 }
                 else
                 {
-                    Field field = parseStringToField(values[i].safeGet<String>(), attr.type);
-                    node->attributes[name] = RegexTreeNode::AttributeValue{.field = std::move(field)};
+                    Field field = parseStringToField(value, attr.type);
+                    node->attributes[name_] = RegexTreeNode::AttributeValue{.field = std::move(field), .original_value = value};
                 }
             }
         }
         regex_nodes.emplace(id, node);
+
 #if USE_VECTORSCAN
-        if (use_vectorscan && !checker.isSlow(regex))
+        String required_substring;
+        bool is_trivial, required_substring_is_prefix;
+        std::vector<std::string> alternatives;
+
+        if (use_vectorscan)
+            OptimizedRegularExpression::analyze(regex, required_substring, is_trivial, required_substring_is_prefix, alternatives);
+
+        for (auto & alter : alternatives)
         {
-            simple_regexps.push_back(regex);
+            if (alter.size() < 3)
+            {
+                alternatives.clear();
+                break;
+            }
+        }
+        if (!required_substring.empty())
+        {
+            simple_regexps.push_back(required_substring);
             regexp_ids.push_back(id);
         }
+        else if (!alternatives.empty())
+        {
+            for (auto & alternative : alternatives)
+            {
+                simple_regexps.push_back(alternative);
+                regexp_ids.push_back(id);
+            }
+        }
         else
 #endif
             complex_regexp_nodes.push_back(node);
@@ -241,23 +292,25 @@ void RegExpTreeDictionary::initGraph()
         if (regex_nodes.contains(pid))
             regex_nodes[pid]->children.push_back(id);
         else
-            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Unknown parent id {}", pid);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Unknown parent id {} in regexp tree dictionary", pid);
     }
     std::set<UInt64> visited;
     UInt64 topology_id = 0;
     for (const auto & [id, value]: regex_nodes)
         if (value->parent_id == 0) // this is root node.
             initTopologyOrder(id, visited, topology_id);
+    /// If there is a cycle and all nodes have a parent, this condition will be met.
     if (topology_order.size() != regex_nodes.size())
-        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Invalid Regex tree");
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "The regexp tree is cyclical. Please check your config.");
 }
 
 void RegExpTreeDictionary::initTopologyOrder(UInt64 node_idx, std::set<UInt64> & visited, UInt64 & topology_id)
 {
     visited.insert(node_idx);
     for (UInt64 child_idx : regex_nodes[node_idx]->children)
+        /// there is a cycle when dfs the graph.
         if (visited.contains(child_idx))
-            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Invalid Regex tree. The input tree is cyclical");
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "The regexp tree is cyclical. Please check your config.");
         else
             initTopologyOrder(child_idx, visited, topology_id);
     topology_order[node_idx] = topology_id++;
@@ -284,20 +337,50 @@ void RegExpTreeDictionary::loadData()
             use_vectorscan = false;
         if (!use_vectorscan)
             return;
-        #if USE_VECTORSCAN
-        try
+
+#if USE_VECTORSCAN
+        std::vector<const char *> patterns;
+        std::vector<unsigned int> flags;
+        std::vector<size_t> lengths;
+
+        for (const std::string & simple_regexp : simple_regexps)
         {
-            std::vector<std::string_view> regexps_views(simple_regexps.begin(), simple_regexps.end());
-            hyperscan_regex = MultiRegexps::getOrSet<true, false>(regexps_views, std::nullopt);
-            hyperscan_regex->get();
+            patterns.push_back(simple_regexp.data());
+            lengths.push_back(simple_regexp.size());
+            flags.push_back(HS_FLAG_SINGLEMATCH);
         }
-        catch (Exception & e)
+
+        hs_database_t * db = nullptr;
+        hs_compile_error_t * compile_error;
+
+        std::unique_ptr<unsigned int[]> ids;
+        ids.reset(new unsigned int[patterns.size()]);
+        for (size_t i = 0; i < patterns.size(); i++)
+            ids[i] = static_cast<unsigned>(i+1);
+
+        hs_error_t err = hs_compile_lit_multi(patterns.data(), flags.data(), ids.get(), lengths.data(), static_cast<unsigned>(patterns.size()), HS_MODE_BLOCK, nullptr, &db, &compile_error);
+        origin_db = (db);
+        if (err != HS_SUCCESS)
         {
-            /// Some compile errors will be thrown as LOGICAL ERROR and cause crash, e.g. empty expression or expressions are too large.
-            /// We catch the error here and rethrow again.
-            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Error occurs when compiling regular expressions, reason: {}", e.message());
+            /// CompilerError is a unique_ptr, so correct memory free after the exception is thrown.
+            MultiRegexps::CompilerErrorPtr error(compile_error);
+
+            if (error->expression < 0)
+                throw Exception::createRuntime(ErrorCodes::LOGICAL_ERROR, String(error->message));
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Pattern '{}' failed with error '{}'", patterns[error->expression], String(error->message));
         }
-        #endif
+
+        /// We allocate the scratch space only once, then copy it across multiple threads with hs_clone_scratch
+        /// function which is faster than allocating scratch space each time in each thread.
+        hs_scratch_t * scratch = nullptr;
+        err = hs_alloc_scratch(db, &scratch);
+        origin_scratch.reset(scratch);
+        /// If not HS_SUCCESS, it is guaranteed that the memory would not be allocated for scratch.
+        if (err != HS_SUCCESS)
+            throw Exception(ErrorCodes::CANNOT_ALLOCATE_MEMORY, "Could not allocate scratch space for vectorscan");
+#endif
+
     }
     else
     {
@@ -328,6 +411,8 @@ RegExpTreeDictionary::RegExpTreeDictionary(
         sample_block.insert(ColumnWithTypeAndName(std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), kKeys));
         sample_block.insert(ColumnWithTypeAndName(std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), kValues));
         ch_source->sample_block = std::move(sample_block);
+        ch_source->query_builder = std::make_shared<ExternalRegexpQueryBuilder>(*ch_source->query_builder);
+        ch_source->load_all_query = ch_source->query_builder->composeLoadAllQuery();
     }
 
     loadData();
@@ -369,23 +454,23 @@ bool RegExpTreeDictionary::setAttributes(
         return attributes_to_set.size() == attributes.size();
     visited_nodes.emplace(id);
     const auto & node_attributes = regex_nodes.at(id)->attributes;
-    for (const auto & [name, value] : node_attributes)
+    for (const auto & [name_, value] : node_attributes)
     {
-        if (!attributes.contains(name) || attributes_to_set.contains(name))
+        if (!attributes.contains(name_) || attributes_to_set.contains(name_))
             continue;
         if (value.containsBackRefs())
         {
             auto [updated_str, use_default] = processBackRefs(data, regex_nodes.at(id)->searcher, value.pieces);
             if (use_default)
             {
-                DefaultValueProvider default_value(attributes.at(name).null_value, defaults.at(name));
-                attributes_to_set[name] = default_value.getDefaultValue(key_index);
+                DefaultValueProvider default_value(attributes.at(name_).null_value, defaults.at(name_));
+                attributes_to_set[name_] = default_value.getDefaultValue(key_index);
             }
             else
-                attributes_to_set[name] = parseStringToField(updated_str, attributes.at(name).type);
+                attributes_to_set[name_] = parseStringToField(updated_str, attributes.at(name_).type);
         }
         else
-            attributes_to_set[name] = value.field;
+            attributes_to_set[name_] = value.field;
     }
 
     auto parent_id = regex_nodes.at(id)->parent_id;
@@ -396,47 +481,70 @@ bool RegExpTreeDictionary::setAttributes(
     return attributes_to_set.size() == attributes.size();
 }
 
-namespace
+/// a temp struct to store all the matched result.
+struct MatchContext
 {
-    struct MatchContext
+    std::set<UInt64> matched_idx_set;
+    std::vector<std::pair<UInt64, UInt64>> matched_idx_sorted_list;
+
+    const std::vector<UInt64> & regexp_ids ;
+    const std::unordered_map<UInt64, UInt64> & topology_order;
+    const char * data;
+    size_t length;
+    const std::map<UInt64, RegExpTreeDictionary::RegexTreeNodePtr> & regex_nodes;
+
+    size_t pre_match_counter = 0;
+    size_t match_counter = 0;
+
+    MatchContext(
+        const std::vector<UInt64> & regexp_ids_,
+        const std::unordered_map<UInt64, UInt64> & topology_order_,
+        const char * data_, size_t length_,
+        const std::map<UInt64, RegExpTreeDictionary::RegexTreeNodePtr> & regex_nodes_
+    )
+    : regexp_ids(regexp_ids_),
+        topology_order(topology_order_),
+        data(data_),
+        length(length_),
+        regex_nodes(regex_nodes_)
+    {}
+
+    [[maybe_unused]]
+    void insertIdx(unsigned int idx)
     {
-        std::set<UInt64> matched_idx_set;
-        std::vector<std::pair<UInt64, UInt64>> matched_idx_sorted_list;
-
-        const std::vector<UInt64> & regexp_ids ;
-        const std::unordered_map<UInt64, UInt64> & topology_order;
-
-        MatchContext(const std::vector<UInt64> & regexp_ids_, const std::unordered_map<UInt64, UInt64> & topology_order_)
-            : regexp_ids(regexp_ids_), topology_order(topology_order_) {}
-
-        [[maybe_unused]]
-        void insertIdx(unsigned int idx)
+        UInt64 node_id = regexp_ids[idx-1];
+        pre_match_counter++;
+        if (!regex_nodes.at(node_id)->match(data, length))
         {
-            UInt64 node_id = regexp_ids[idx-1];
-            UInt64 topological_order = topology_order.at(node_id);
-            matched_idx_set.emplace(node_id);
-            matched_idx_sorted_list.push_back(std::make_pair(topological_order, node_id));
+            return;
         }
+        match_counter++;
+        matched_idx_set.emplace(node_id);
 
-        void insertNodeID(UInt64 id)
-        {
-            UInt64 topological_order = topology_order.at(id);
-            matched_idx_set.emplace(id);
-            matched_idx_sorted_list.push_back(std::make_pair(topological_order, id));
-        }
+        UInt64 topological_order = topology_order.at(node_id);
+        matched_idx_sorted_list.push_back(std::make_pair(topological_order, node_id));
+    }
 
-        /// Sort by topological order, which indicates the matching priorities.
-        void sort()
-        {
-            std::sort(matched_idx_sorted_list.begin(), matched_idx_sorted_list.end());
-        }
+    [[maybe_unused]]
+    void insertNodeID(UInt64 id)
+    {
+        matched_idx_set.emplace(id);
 
-        bool contains(UInt64 idx) const
-        {
-            return matched_idx_set.contains(idx);
-        }
-    };
-}
+        UInt64 topological_order = topology_order.at(id);
+        matched_idx_sorted_list.push_back(std::make_pair(topological_order, id));
+    }
+
+    /// Sort by topological order, which indicates the matching priorities.
+    void sort()
+    {
+        std::sort(matched_idx_sorted_list.begin(), matched_idx_sorted_list.end());
+    }
+
+    bool contains(UInt64 idx) const
+    {
+        return matched_idx_set.contains(idx);
+    }
+};
 
 std::unordered_map<String, ColumnPtr> RegExpTreeDictionary::match(
     const ColumnString::Chars & keys_data,
@@ -449,7 +557,7 @@ std::unordered_map<String, ColumnPtr> RegExpTreeDictionary::match(
     hs_scratch_t * scratch = nullptr;
     if (use_vectorscan)
     {
-        hs_error_t err = hs_clone_scratch(hyperscan_regex->get()->getScratch(), &scratch);
+        hs_error_t err = hs_clone_scratch(origin_scratch.get(), &scratch);
 
         if (err != HS_SUCCESS)
         {
@@ -463,11 +571,11 @@ std::unordered_map<String, ColumnPtr> RegExpTreeDictionary::match(
     std::unordered_map<String, MutableColumnPtr> columns;
 
     /// initialize columns
-    for (const auto & [name, attr] : attributes)
+    for (const auto & [name_, attr] : attributes)
     {
         auto col_ptr = attr.type->createColumn();
         col_ptr->reserve(keys_offsets.size());
-        columns[name] = std::move(col_ptr);
+        columns[name_] = std::move(col_ptr);
     }
 
     UInt64 offset = 0;
@@ -476,11 +584,14 @@ std::unordered_map<String, ColumnPtr> RegExpTreeDictionary::match(
         auto key_offset = keys_offsets[key_idx];
         UInt64 length = key_offset - offset - 1;
 
-        MatchContext match_result(regexp_ids, topology_order);
+        const char * begin = reinterpret_cast<const char *>(keys_data.data()) + offset;
+
+        MatchContext match_result(regexp_ids, topology_order, begin, length, regex_nodes);
 
 #if USE_VECTORSCAN
         if (use_vectorscan)
         {
+            /// pre-select all the possible matches
             auto on_match = [](unsigned int id,
                             unsigned long long /* from */, // NOLINT
                             unsigned long long /* to */, // NOLINT
@@ -490,8 +601,9 @@ std::unordered_map<String, ColumnPtr> RegExpTreeDictionary::match(
                 static_cast<MatchContext *>(context)->insertIdx(id);
                 return 0;
             };
+
             hs_error_t err = hs_scan(
-                hyperscan_regex->get()->getDB(),
+                origin_db,
                 reinterpret_cast<const char *>(keys_data.data()) + offset,
                 static_cast<unsigned>(length),
                 0,
@@ -501,6 +613,7 @@ std::unordered_map<String, ColumnPtr> RegExpTreeDictionary::match(
 
             if (err != HS_SUCCESS)
                 throw Exception(ErrorCodes::HYPERSCAN_CANNOT_SCAN_TEXT, "Failed to scan data with vectorscan");
+
         }
 #endif
 
@@ -545,29 +658,75 @@ std::unordered_map<String, ColumnPtr> RegExpTreeDictionary::match(
                 break;
         }
 
-        for (const auto & [name, attr] : attributes)
+        for (const auto & [name_, attr] : attributes)
         {
-            if (attributes_to_set.contains(name))
+            if (attributes_to_set.contains(name_))
                 continue;
 
-            DefaultValueProvider default_value(attr.null_value, defaults.at(name));
-            columns[name]->insert(default_value.getDefaultValue(key_idx));
+            DefaultValueProvider default_value(attr.null_value, defaults.at(name_));
+            columns[name_]->insert(default_value.getDefaultValue(key_idx));
         }
 
         /// insert to columns
-        for (const auto & [name, value] : attributes_to_set)
-            columns[name]->insert(value);
+        for (const auto & [name_, value] : attributes_to_set)
+            columns[name_]->insert(value);
 
         offset = key_offset;
     }
 
     std::unordered_map<String, ColumnPtr> result;
-    for (auto & [name, mutable_ptr] : columns)
-        result.emplace(name, std::move(mutable_ptr));
+    for (auto & [name_, mutable_ptr] : columns)
+        result.emplace(name_, std::move(mutable_ptr));
 
     return result;
 }
 
+Pipe RegExpTreeDictionary::read(const Names & , size_t max_block_size, size_t) const
+{
+
+    auto it = regex_nodes.begin();
+    size_t block_size = 0;
+    BlocksList result;
+
+    for (;;)
+    {
+        Block block;
+        auto col_id = std::make_shared<DataTypeUInt64>()->createColumn();
+        auto col_pid = std::make_shared<DataTypeUInt64>()->createColumn();
+        auto col_regex = std::make_shared<DataTypeString>()->createColumn();
+        auto col_keys = std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())->createColumn();
+        auto col_values = std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())->createColumn();
+
+        for (;it != regex_nodes.end() && block_size < max_block_size; it++, block_size++)
+        {
+            col_id->insert(it->first);
+            const auto & node = it->second;
+            col_pid->insert(node->parent_id);
+            col_regex->insert(node->regex);
+            std::vector<Field> keys, values;
+            for (const auto & [key, attr] : node->attributes)
+            {
+                keys.push_back(key);
+                values.push_back(attr.original_value);
+            }
+            col_keys->insert(Array(keys.begin(), keys.end()));
+            col_values->insert(Array(values.begin(), values.end()));
+        }
+
+        block.insert(ColumnWithTypeAndName(std::move(col_id),std::make_shared<DataTypeUInt64>(),kId));
+        block.insert(ColumnWithTypeAndName(std::move(col_pid),std::make_shared<DataTypeUInt64>(),kParentId));
+        block.insert(ColumnWithTypeAndName(std::move(col_regex),std::make_shared<DataTypeString>(),kRegExp));
+        block.insert(ColumnWithTypeAndName(std::move(col_keys),std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()),kKeys));
+        block.insert(ColumnWithTypeAndName(std::move(col_values),std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()),kValues));
+        result.push_back(std::move(block));
+        if (it == regex_nodes.end())
+            break;
+        block_size = 0;
+    }
+
+    return Pipe(std::make_shared<BlocksListSource>(std::move(result)));
+}
+
 Columns RegExpTreeDictionary::getColumns(
     const Strings & attribute_names,
     const DataTypes & result_types,
@@ -601,8 +760,8 @@ Columns RegExpTreeDictionary::getColumns(
         defaults);
 
     Columns result;
-    for (const String & name : attribute_names)
-        result.push_back(columns_map.at(name));
+    for (const String & name_ : attribute_names)
+        result.push_back(columns_map.at(name_));
 
     return result;
 }
@@ -634,10 +793,6 @@ void registerDictionaryRegExpTree(DictionaryFactory & factory)
         const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
 
         auto context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
-        if (!context->getSettings().regexp_dict_allow_other_sources && typeid_cast<YAMLRegExpTreeDictionarySource *>(source_ptr.get()) == nullptr)
-            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
-                            "regexp_tree dictionary doesn't accept sources other than yaml source. "
-                            "To active it, please set regexp_dict_allow_other_sources=true");
 
         return std::make_unique<RegExpTreeDictionary>(dict_id, dict_struct, std::move(source_ptr), configuration, context->getSettings().regexp_dict_allow_hyperscan);
     };
diff --git a/src/Dictionaries/RegExpTreeDictionary.h b/src/Dictionaries/RegExpTreeDictionary.h
index 32206f25429..683588e688f 100644
--- a/src/Dictionaries/RegExpTreeDictionary.h
+++ b/src/Dictionaries/RegExpTreeDictionary.h
@@ -10,7 +10,6 @@
 
 #include <Columns/IColumn.h>
 #include <Columns/ColumnString.h>
-#include <Common/Arena.h>
 #include <Common/Exception.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/HashTable/HashSet.h>
@@ -23,6 +22,8 @@
 #include <Dictionaries/DictionaryStructure.h>
 #include <Dictionaries/IDictionary.h>
 
+#include <Storages/ColumnsDescription.h>
+
 namespace DB
 {
 
@@ -33,6 +34,7 @@ namespace ErrorCodes
 
 class RegExpTreeDictionary : public IDictionary
 {
+    friend struct MatchContext;
 public:
     struct Configuration
     {
@@ -91,10 +93,7 @@ public:
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Dictionary {} does not support method `hasKeys`", name);
     }
 
-    Pipe read(const Names &, size_t, size_t) const override
-    {
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Dictionary {} does not support method `read`", name);
-    }
+    Pipe read(const Names & columns, size_t max_block_size, size_t num_streams) const override;
 
     ColumnPtr getColumn(
         const std::string & attribute_name,
@@ -162,6 +161,8 @@ private:
     std::unordered_map<UInt64, UInt64> topology_order;
     #if USE_VECTORSCAN
     MultiRegexps::DeferredConstructedRegexpsPtr hyperscan_regex;
+    MultiRegexps::ScratchPtr origin_scratch;
+    hs_database_t* origin_db;
     #endif
 
     Poco::Logger * logger;
diff --git a/src/Dictionaries/YAMLRegExpTreeDictionarySource.cpp b/src/Dictionaries/YAMLRegExpTreeDictionarySource.cpp
index b9e8fd859ed..118d0f6a0f3 100644
--- a/src/Dictionaries/YAMLRegExpTreeDictionarySource.cpp
+++ b/src/Dictionaries/YAMLRegExpTreeDictionarySource.cpp
@@ -229,23 +229,23 @@ void parseMatchNode(UInt64 parent_id, UInt64 & id, const YAML::Node & node, Resu
     {
         throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Yaml match rule must contain key {}", key_name);
     }
-    for (const auto & [key, node] : match)
+    for (const auto & [key, node_] : match)
     {
         if (key == key_name)
         {
-            if (!node.IsScalar())
+            if (!node_.IsScalar())
                 throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "`{}` should be a String", key_name);
 
-            attributes_to_insert.reg_exp = node.as<String>();
+            attributes_to_insert.reg_exp = node_.as<String>();
         }
         else if (structure.hasAttribute(key))
         {
             attributes_to_insert.keys.push_back(key);
-            attributes_to_insert.values.push_back(node.as<String>());
+            attributes_to_insert.values.push_back(node_.as<String>());
         }
-        else if (node.IsSequence())
+        else if (node_.IsSequence())
         {
-            parseMatchList(attributes_to_insert.id, id, node, result, key_name, structure);
+            parseMatchList(attributes_to_insert.id, id, node_, result, key_name, structure);
         }
         /// unknown attributes.
     }
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index 0de8b843604..0b7352e9cbb 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -156,11 +156,11 @@ void buildLayoutConfiguration(
 
         const auto value_field = value_literal->value;
 
-        if (value_field.getType() != Field::Types::UInt64 && value_field.getType() != Field::Types::String)
+        if (value_field.getType() != Field::Types::UInt64 && value_field.getType() != Field::Types::Float64 && value_field.getType() != Field::Types::String)
         {
             throw DB::Exception(
                 ErrorCodes::BAD_ARGUMENTS,
-                "Dictionary layout parameter value must be an UInt64 or String, got '{}' instead",
+                "Dictionary layout parameter value must be an UInt64, Float64 or String, got '{}' instead",
                 value_field.getTypeName());
         }
 
@@ -649,10 +649,12 @@ getInfoIfClickHouseDictionarySource(DictionaryConfigurationPtr & config, Context
     String database = config->getString("dictionary.source.clickhouse.db", "");
     String table = config->getString("dictionary.source.clickhouse.table", "");
 
-    if (table.empty())
-        return {};
+    info.query = config->getString("dictionary.source.clickhouse.query", "");
 
-    info.table_name = {database, table};
+    if (!table.empty())
+        info.table_name = {database, table};
+    else if (info.query.empty())
+        return {};
 
     try
     {
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.h b/src/Dictionaries/getDictionaryConfigurationFromAST.h
index ec44b9815ff..aa42835d33d 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.h
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.h
@@ -18,6 +18,7 @@ getDictionaryConfigurationFromAST(const ASTCreateQuery & query, ContextPtr conte
 struct ClickHouseDictionarySourceInfo
 {
     QualifiedTableName table_name;
+    String query;
     bool is_local = false;
 };
 
diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
index 6e97910c6e1..989ce5c8f18 100644
--- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
+++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
@@ -15,9 +15,9 @@
 using namespace DB;
 
 static bool registered = false;
+
 /// For debug
-#pragma GCC diagnostic ignored "-Wunused-function"
-static std::string configurationToString(const DictionaryConfigurationPtr & config)
+[[maybe_unused]] static std::string configurationToString(const DictionaryConfigurationPtr & config)
 {
     const Poco::Util::XMLConfiguration & xml_config = dynamic_cast<const Poco::Util::XMLConfiguration &>(*config);
     std::ostringstream oss;     // STYLE_CHECK_ALLOW_STD_STRING_STREAM
diff --git a/src/Disks/DiskEncrypted.cpp b/src/Disks/DiskEncrypted.cpp
index 70624c1de84..2415b432e01 100644
--- a/src/Disks/DiskEncrypted.cpp
+++ b/src/Disks/DiskEncrypted.cpp
@@ -138,19 +138,6 @@ namespace
         }
     }
 
-    String getCurrentKey(const String & path, const DiskEncryptedSettings & settings)
-    {
-        auto it = settings.keys.find(settings.current_key_id);
-        if (it == settings.keys.end())
-            throw Exception(
-                ErrorCodes::DATA_ENCRYPTION_ERROR,
-                "Not found a key with the current ID {} required to cipher file {}",
-                settings.current_key_id,
-                quoteString(path));
-
-        return it->second;
-    }
-
     String getKey(const String & path, const FileEncryption::Header & header, const DiskEncryptedSettings & settings)
     {
         auto it = settings.keys.find(header.key_id);
@@ -203,18 +190,19 @@ private:
 };
 
 DiskEncrypted::DiskEncrypted(
-    const String & name_, const Poco::Util::AbstractConfiguration & config_, const String & config_prefix_, const DisksMap & map_)
-    : DiskEncrypted(name_, parseDiskEncryptedSettings(name_, config_, config_prefix_, map_))
+    const String & name_, const Poco::Util::AbstractConfiguration & config_, const String & config_prefix_, const DisksMap & map_, bool use_fake_transaction_)
+    : DiskEncrypted(name_, parseDiskEncryptedSettings(name_, config_, config_prefix_, map_), use_fake_transaction_)
 {
 }
 
-DiskEncrypted::DiskEncrypted(const String & name_, std::unique_ptr<const DiskEncryptedSettings> settings_)
+DiskEncrypted::DiskEncrypted(const String & name_, std::unique_ptr<const DiskEncryptedSettings> settings_, bool use_fake_transaction_)
     : IDisk(name_)
     , delegate(settings_->wrapped_disk)
     , encrypted_name(name_)
     , disk_path(settings_->disk_path)
     , disk_absolute_path(settings_->wrapped_disk->getPath() + settings_->disk_path)
     , current_settings(std::move(settings_))
+    , use_fake_transaction(use_fake_transaction_)
 {
     delegate->createDirectories(disk_path);
 }
@@ -309,38 +297,6 @@ std::unique_ptr<ReadBufferFromFileBase> DiskEncrypted::readFile(
     return std::make_unique<ReadBufferFromEncryptedFile>(settings.local_fs_buffer_size, std::move(buffer), key, header);
 }
 
-std::unique_ptr<WriteBufferFromFileBase> DiskEncrypted::writeFile(const String & path, size_t buf_size, WriteMode mode, const WriteSettings &)
-{
-    auto wrapped_path = wrappedPath(path);
-    FileEncryption::Header header;
-    String key;
-    UInt64 old_file_size = 0;
-    auto settings = current_settings.get();
-    if (mode == WriteMode::Append && exists(path))
-    {
-        old_file_size = getFileSize(path);
-        if (old_file_size)
-        {
-            /// Append mode: we continue to use the same header.
-            auto read_buffer = delegate->readFile(wrapped_path, ReadSettings().adjustBufferSize(FileEncryption::Header::kSize));
-            header = readHeader(*read_buffer);
-            key = getKey(path, header, *settings);
-        }
-    }
-    if (!old_file_size)
-    {
-        /// Rewrite mode: we generate a new header.
-        key = getCurrentKey(path, *settings);
-        header.algorithm = settings->current_algorithm;
-        header.key_id = settings->current_key_id;
-        header.key_hash = calculateKeyHash(key);
-        header.init_vector = InitVector::random();
-    }
-    auto buffer = delegate->writeFile(wrapped_path, buf_size, mode);
-    return std::make_unique<WriteBufferFromEncryptedFile>(buf_size, std::move(buffer), key, header, old_file_size);
-}
-
-
 size_t DiskEncrypted::getFileSize(const String & path) const
 {
     auto wrapped_path = wrappedPath(path);
@@ -348,6 +304,23 @@ size_t DiskEncrypted::getFileSize(const String & path) const
     return size > FileEncryption::Header::kSize ? (size - FileEncryption::Header::kSize) : 0;
 }
 
+UInt128 DiskEncrypted::getEncryptedFileIV(const String & path) const
+{
+    auto wrapped_path = wrappedPath(path);
+    auto read_buffer = delegate->readFile(wrapped_path, ReadSettings().adjustBufferSize(FileEncryption::Header::kSize));
+    if (read_buffer->eof())
+        return 0;
+    auto header = readHeader(*read_buffer);
+    return header.init_vector.get();
+}
+
+size_t DiskEncrypted::getEncryptedFileSize(size_t unencrypted_size) const
+{
+    if (unencrypted_size)
+        return unencrypted_size + FileEncryption::Header::kSize;
+    return 0;
+}
+
 void DiskEncrypted::truncateFile(const String & path, size_t size)
 {
     auto wrapped_path = wrappedPath(path);
@@ -360,6 +333,19 @@ SyncGuardPtr DiskEncrypted::getDirectorySyncGuard(const String & path) const
     return delegate->getDirectorySyncGuard(wrapped_path);
 }
 
+std::unordered_map<String, String> DiskEncrypted::getSerializedMetadata(const std::vector<String> & paths) const
+{
+    std::vector<String> wrapped_paths;
+    wrapped_paths.reserve(paths.size());
+    for (const auto & path : paths)
+        wrapped_paths.emplace_back(wrappedPath(path));
+    auto metadata = delegate->getSerializedMetadata(wrapped_paths);
+    std::unordered_map<String, String> res;
+    for (size_t i = 0; i != paths.size(); ++i)
+        res.emplace(paths[i], metadata.at(wrapped_paths.at(i)));
+    return res;
+}
+
 void DiskEncrypted::applyNewSettings(
     const Poco::Util::AbstractConfiguration & config,
     ContextPtr /*context*/,
@@ -386,7 +372,7 @@ void registerDiskEncrypted(DiskFactory & factory, bool global_skip_access_check)
         const DisksMap & map) -> DiskPtr
     {
         bool skip_access_check = global_skip_access_check || config.getBool(config_prefix + ".skip_access_check", false);
-        DiskPtr disk = std::make_shared<DiskEncrypted>(name, config, config_prefix, map);
+        DiskPtr disk = std::make_shared<DiskEncrypted>(name, config, config_prefix, map, config.getBool(config_prefix + ".use_fake_transaction", true));
         disk->startup(context, skip_access_check);
         return disk;
     };
diff --git a/src/Disks/DiskEncrypted.h b/src/Disks/DiskEncrypted.h
index d38c916ee6e..69d051a9537 100644
--- a/src/Disks/DiskEncrypted.h
+++ b/src/Disks/DiskEncrypted.h
@@ -6,22 +6,14 @@
 #include <Disks/IDisk.h>
 #include <Common/MultiVersion.h>
 #include <Disks/FakeDiskTransaction.h>
+#include <Disks/DiskEncryptedTransaction.h>
 
 
 namespace DB
 {
+
 class ReadBufferFromFileBase;
 class WriteBufferFromFileBase;
-namespace FileEncryption { enum class Algorithm; }
-
-struct DiskEncryptedSettings
-{
-    DiskPtr wrapped_disk;
-    String disk_path;
-    std::unordered_map<UInt64, String> keys;
-    UInt64 current_key_id;
-    FileEncryption::Algorithm current_algorithm;
-};
 
 /// Encrypted disk ciphers all written files on the fly and writes the encrypted files to an underlying (normal) disk.
 /// And when we read files from an encrypted disk it deciphers them automatically,
@@ -29,8 +21,8 @@ struct DiskEncryptedSettings
 class DiskEncrypted : public IDisk
 {
 public:
-    DiskEncrypted(const String & name_, const Poco::Util::AbstractConfiguration & config_, const String & config_prefix_, const DisksMap & map_);
-    DiskEncrypted(const String & name_, std::unique_ptr<const DiskEncryptedSettings> settings_);
+    DiskEncrypted(const String & name_, const Poco::Util::AbstractConfiguration & config_, const String & config_prefix_, const DisksMap & map_, bool use_fake_transaction_);
+    DiskEncrypted(const String & name_, std::unique_ptr<const DiskEncryptedSettings> settings_, bool use_fake_transaction_);
 
     const String & getName() const override { return encrypted_name; }
     const String & getPath() const override { return disk_absolute_path; }
@@ -59,28 +51,30 @@ public:
 
     void createDirectory(const String & path) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->createDirectory(wrapped_path);
+        auto tx = createEncryptedTransaction();
+        tx->createDirectory(path);
+        tx->commit();
     }
 
     void createDirectories(const String & path) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->createDirectories(wrapped_path);
+        auto tx = createEncryptedTransaction();
+        tx->createDirectories(path);
+        tx->commit();
     }
 
-
     void clearDirectory(const String & path) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->clearDirectory(wrapped_path);
+        auto tx = createEncryptedTransaction();
+        tx->clearDirectory(path);
+        tx->commit();
     }
 
     void moveDirectory(const String & from_path, const String & to_path) override
     {
-        auto wrapped_from_path = wrappedPath(from_path);
-        auto wrapped_to_path = wrappedPath(to_path);
-        delegate->moveDirectory(wrapped_from_path, wrapped_to_path);
+        auto tx = createEncryptedTransaction();
+        tx->moveDirectory(from_path, to_path);
+        tx->commit();
     }
 
     DirectoryIteratorPtr iterateDirectory(const String & path) const override
@@ -91,22 +85,23 @@ public:
 
     void createFile(const String & path) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->createFile(wrapped_path);
+        auto tx = createEncryptedTransaction();
+        tx->createFile(path);
+        tx->commit();
     }
 
     void moveFile(const String & from_path, const String & to_path) override
     {
-        auto wrapped_from_path = wrappedPath(from_path);
-        auto wrapped_to_path = wrappedPath(to_path);
-        delegate->moveFile(wrapped_from_path, wrapped_to_path);
+        auto tx = createEncryptedTransaction();
+        tx->moveFile(from_path, to_path);
+        tx->commit();
     }
 
     void replaceFile(const String & from_path, const String & to_path) override
     {
-        auto wrapped_from_path = wrappedPath(from_path);
-        auto wrapped_to_path = wrappedPath(to_path);
-        delegate->replaceFile(wrapped_from_path, wrapped_to_path);
+        auto tx = createEncryptedTransaction();
+        tx->replaceFile(from_path, to_path);
+        tx->commit();
     }
 
     void listFiles(const String & path, std::vector<String> & file_names) const override
@@ -129,67 +124,116 @@ public:
         const String & path,
         size_t buf_size,
         WriteMode mode,
-        const WriteSettings & settings) override;
+        const WriteSettings & settings) override
+    {
+        auto tx = createEncryptedTransaction();
+        auto result = tx->writeFile(path, buf_size, mode, settings);
+        return result;
+    }
 
     void removeFile(const String & path) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->removeFile(wrapped_path);
+        auto tx = createEncryptedTransaction();
+        tx->removeFile(path);
+        tx->commit();
     }
 
     void removeFileIfExists(const String & path) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->removeFileIfExists(wrapped_path);
+        auto tx = createEncryptedTransaction();
+        tx->removeFileIfExists(path);
+        tx->commit();
     }
 
     void removeDirectory(const String & path) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->removeDirectory(wrapped_path);
+        auto tx = createEncryptedTransaction();
+        tx->removeDirectory(path);
+        tx->commit();
     }
 
     void removeRecursive(const String & path) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->removeRecursive(wrapped_path);
+        auto tx = createEncryptedTransaction();
+        tx->removeRecursive(path);
+        tx->commit();
     }
 
     void removeSharedFile(const String & path, bool flag) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->removeSharedFile(wrapped_path, flag);
+        auto tx = createEncryptedTransaction();
+        tx->removeSharedFile(path, flag);
+        tx->commit();
     }
 
     void removeSharedRecursive(const String & path, bool keep_all_batch_data, const NameSet & file_names_remove_metadata_only) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->removeSharedRecursive(wrapped_path, keep_all_batch_data, file_names_remove_metadata_only);
+        auto tx = createEncryptedTransaction();
+        tx->removeSharedRecursive(path, keep_all_batch_data, file_names_remove_metadata_only);
+        tx->commit();
     }
 
     void removeSharedFiles(const RemoveBatchRequest & files, bool keep_all_batch_data, const NameSet & file_names_remove_metadata_only) override
     {
-        for (const auto & file : files)
-        {
-            auto wrapped_path = wrappedPath(file.path);
-            bool keep = keep_all_batch_data || file_names_remove_metadata_only.contains(fs::path(file.path).filename());
-            if (file.if_exists)
-                delegate->removeSharedFileIfExists(wrapped_path, keep);
-            else
-                delegate->removeSharedFile(wrapped_path, keep);
-        }
+        auto tx = createEncryptedTransaction();
+        tx->removeSharedFiles(files, keep_all_batch_data, file_names_remove_metadata_only);
+        tx->commit();
     }
 
     void removeSharedFileIfExists(const String & path, bool flag) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->removeSharedFileIfExists(wrapped_path, flag);
+        auto tx = createEncryptedTransaction();
+        tx->removeSharedFileIfExists(path, flag);
+        tx->commit();
     }
 
+    Strings getBlobPath(const String & path) const override
+    {
+        auto wrapped_path = wrappedPath(path);
+        return delegate->getBlobPath(wrapped_path);
+    }
+
+    void writeFileUsingBlobWritingFunction(const String & path, WriteMode mode, WriteBlobFunction && write_blob_function) override
+    {
+        auto tx = createEncryptedTransaction();
+        tx->writeFileUsingBlobWritingFunction(path, mode, std::move(write_blob_function));
+        tx->commit();
+    }
+
+    std::unique_ptr<ReadBufferFromFileBase> readEncryptedFile(const String & path, const ReadSettings & settings) const override
+    {
+        auto wrapped_path = wrappedPath(path);
+        return delegate->readFile(wrapped_path, settings);
+    }
+
+    std::unique_ptr<WriteBufferFromFileBase> writeEncryptedFile(
+        const String & path,
+        size_t buf_size,
+        WriteMode mode,
+        const WriteSettings & settings) const override
+    {
+        auto tx = createEncryptedTransaction();
+        auto buf = tx->writeEncryptedFile(path, buf_size, mode, settings);
+        return buf;
+    }
+
+    size_t getEncryptedFileSize(const String & path) const override
+    {
+        auto wrapped_path = wrappedPath(path);
+        return delegate->getFileSize(wrapped_path);
+    }
+
+    size_t getEncryptedFileSize(size_t unencrypted_size) const override;
+
+    UInt128 getEncryptedFileIV(const String & path) const override;
+
+    static size_t convertFileSizeToEncryptedFileSize(size_t file_size);
+
     void setLastModified(const String & path, const Poco::Timestamp & timestamp) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->setLastModified(wrapped_path, timestamp);
+        auto tx = createEncryptedTransaction();
+        tx->setLastModified(path, timestamp);
+        tx->commit();
     }
 
     Poco::Timestamp getLastModified(const String & path) const override
@@ -206,15 +250,16 @@ public:
 
     void setReadOnly(const String & path) override
     {
-        auto wrapped_path = wrappedPath(path);
-        delegate->setReadOnly(wrapped_path);
+        auto tx = createEncryptedTransaction();
+        tx->setReadOnly(path);
+        tx->commit();
     }
 
     void createHardLink(const String & src_path, const String & dst_path) override
     {
-        auto wrapped_src_path = wrappedPath(src_path);
-        auto wrapped_dst_path = wrappedPath(dst_path);
-        delegate->createHardLink(wrapped_src_path, wrapped_dst_path);
+        auto tx = createEncryptedTransaction();
+        tx->createHardLink(src_path, dst_path);
+        tx->commit();
     }
 
     void truncateFile(const String & path, size_t size) override;
@@ -225,6 +270,11 @@ public:
         return delegate->getUniqueId(wrapped_path);
     }
 
+    bool checkUniqueId(const String & id) const override
+    {
+        return delegate->checkUniqueId(id);
+    }
+
     void onFreeze(const String & path) override
     {
         auto wrapped_path = wrappedPath(path);
@@ -244,11 +294,22 @@ public:
 
     SyncGuardPtr getDirectorySyncGuard(const String & path) const override;
 
+    std::shared_ptr<DiskEncryptedTransaction> createEncryptedTransaction() const
+    {
+        auto delegate_transaction = delegate->createTransaction();
+        return std::make_shared<DiskEncryptedTransaction>(delegate_transaction, disk_path, *current_settings.get(), delegate.get());
+    }
+
     DiskTransactionPtr createTransaction() override
     {
-        /// Need to overwrite explicetly because this disk change
-        /// a lot of "delegate" methods.
-        return std::make_shared<FakeDiskTransaction>(*this);
+        if (use_fake_transaction)
+        {
+            return std::make_shared<FakeDiskTransaction>(*this);
+        }
+        else
+        {
+            return createEncryptedTransaction();
+        }
     }
 
     UInt64 getTotalSpace() const override
@@ -276,14 +337,17 @@ public:
         return delegate->getMetadataStorage();
     }
 
+    std::unordered_map<String, String> getSerializedMetadata(const std::vector<String> & paths) const override;
+
+    DiskPtr getDelegateDiskIfExists() const override
+    {
+        return delegate;
+    }
 
 private:
     String wrappedPath(const String & path) const
     {
-        // if path starts_with disk_path -> got already wrapped path
-        if (!disk_path.empty() && path.starts_with(disk_path))
-            return path;
-        return disk_path + path;
+        return DiskEncryptedTransaction::wrappedPath(disk_path, path);
     }
 
     DiskPtr delegate;
@@ -291,6 +355,7 @@ private:
     const String disk_path;
     const String disk_absolute_path;
     MultiVersion<DiskEncryptedSettings> current_settings;
+    bool use_fake_transaction;
 };
 
 }
diff --git a/src/Disks/DiskEncryptedTransaction.cpp b/src/Disks/DiskEncryptedTransaction.cpp
new file mode 100644
index 00000000000..4a613374ccf
--- /dev/null
+++ b/src/Disks/DiskEncryptedTransaction.cpp
@@ -0,0 +1,120 @@
+#include <Disks/DiskEncryptedTransaction.h>
+
+
+#if USE_SSL
+#include <IO/FileEncryptionCommon.h>
+#include <Common/Exception.h>
+#include <boost/algorithm/hex.hpp>
+#include <IO/ReadBufferFromEncryptedFile.h>
+#include <IO/ReadBufferFromFileDecorator.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromEncryptedFile.h>
+#include <Common/quoteString.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int DATA_ENCRYPTION_ERROR;
+}
+
+
+namespace
+{
+
+FileEncryption::Header readHeader(ReadBufferFromFileBase & read_buffer)
+{
+    try
+    {
+        FileEncryption::Header header;
+        header.read(read_buffer);
+        return header;
+    }
+    catch (Exception & e)
+    {
+        e.addMessage("While reading the header of encrypted file " + quoteString(read_buffer.getFileName()));
+        throw;
+    }
+}
+
+String getCurrentKey(const String & path, const DiskEncryptedSettings & settings)
+{
+    auto it = settings.keys.find(settings.current_key_id);
+    if (it == settings.keys.end())
+        throw Exception(
+            ErrorCodes::DATA_ENCRYPTION_ERROR,
+            "Not found a key with the current ID {} required to cipher file {}",
+            settings.current_key_id,
+            quoteString(path));
+
+    return it->second;
+}
+
+String getKey(const String & path, const FileEncryption::Header & header, const DiskEncryptedSettings & settings)
+{
+    auto it = settings.keys.find(header.key_id);
+    if (it == settings.keys.end())
+        throw Exception(
+            ErrorCodes::DATA_ENCRYPTION_ERROR,
+            "Not found a key with ID {} required to decipher file {}",
+            header.key_id,
+            quoteString(path));
+
+    String key = it->second;
+    if (FileEncryption::calculateKeyHash(key) != header.key_hash)
+        throw Exception(
+            ErrorCodes::DATA_ENCRYPTION_ERROR, "Wrong key with ID {}, could not decipher file {}", header.key_id, quoteString(path));
+
+    return key;
+}
+
+}
+
+void DiskEncryptedTransaction::copyFile(const std::string & from_file_path, const std::string & to_file_path)
+{
+    auto wrapped_from_path = wrappedPath(from_file_path);
+    auto wrapped_to_path = wrappedPath(to_file_path);
+    delegate_transaction->copyFile(wrapped_from_path, wrapped_to_path);
+}
+
+std::unique_ptr<WriteBufferFromFileBase> DiskEncryptedTransaction::writeFile( // NOLINT
+    const std::string & path,
+    size_t buf_size,
+    WriteMode mode,
+    const WriteSettings & settings,
+    bool autocommit)
+{
+    auto wrapped_path = wrappedPath(path);
+    FileEncryption::Header header;
+    String key;
+    UInt64 old_file_size = 0;
+    if (mode == WriteMode::Append && delegate_disk->exists(wrapped_path))
+    {
+        size_t size = delegate_disk->getFileSize(wrapped_path);
+        old_file_size = size > FileEncryption::Header::kSize ? (size - FileEncryption::Header::kSize) : 0;
+        if (old_file_size)
+        {
+            /// Append mode: we continue to use the same header.
+            auto read_buffer = delegate_disk->readFile(wrapped_path, ReadSettings().adjustBufferSize(FileEncryption::Header::kSize));
+            header = readHeader(*read_buffer);
+            key = getKey(path, header, current_settings);
+        }
+    }
+    if (!old_file_size)
+    {
+        /// Rewrite mode: we generate a new header.
+        key = getCurrentKey(path, current_settings);
+        header.algorithm = current_settings.current_algorithm;
+        header.key_id = current_settings.current_key_id;
+        header.key_hash = FileEncryption::calculateKeyHash(key);
+        header.init_vector = FileEncryption::InitVector::random();
+    }
+    auto buffer = delegate_transaction->writeFile(wrapped_path, buf_size, mode, settings, autocommit);
+    return std::make_unique<WriteBufferFromEncryptedFile>(buf_size, std::move(buffer), key, header, old_file_size);
+
+}
+
+}
+
+#endif
diff --git a/src/Disks/DiskEncryptedTransaction.h b/src/Disks/DiskEncryptedTransaction.h
new file mode 100644
index 00000000000..bae3f2c728c
--- /dev/null
+++ b/src/Disks/DiskEncryptedTransaction.h
@@ -0,0 +1,259 @@
+#pragma once
+
+#include "config.h"
+
+#if USE_SSL
+
+#include <Disks/IDiskTransaction.h>
+#include <Disks/IDisk.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromFile.h>
+
+namespace DB
+{
+
+namespace FileEncryption { enum class Algorithm; }
+
+struct DiskEncryptedSettings
+{
+    DiskPtr wrapped_disk;
+    String disk_path;
+    std::unordered_map<UInt64, String> keys;
+    UInt64 current_key_id;
+    FileEncryption::Algorithm current_algorithm;
+};
+
+
+class DiskEncryptedTransaction : public IDiskTransaction
+{
+public:
+    static String wrappedPath(const String disk_path, const String & path)
+    {
+        // if path starts_with disk_path -> got already wrapped path
+        if (!disk_path.empty() && path.starts_with(disk_path))
+            return path;
+        return disk_path + path;
+    }
+
+    DiskEncryptedTransaction(DiskTransactionPtr delegate_transaction_, const std::string & disk_path_, DiskEncryptedSettings current_settings_, IDisk * delegate_disk_)
+        : delegate_transaction(delegate_transaction_)
+        , disk_path(disk_path_)
+        , current_settings(current_settings_)
+        , delegate_disk(delegate_disk_)
+    {}
+
+    /// Tries to commit all accumulated operations simultaneously.
+    /// If something fails rollback and throw exception.
+    void commit() override // NOLINT
+    {
+        delegate_transaction->commit();
+    }
+
+    void undo() override
+    {
+        delegate_transaction->undo();
+    }
+
+    ~DiskEncryptedTransaction() override = default;
+
+    /// Create directory.
+    void createDirectory(const std::string & path) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->createDirectory(wrapped_path);
+    }
+
+    /// Create directory and all parent directories if necessary.
+    void createDirectories(const std::string & path) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->createDirectories(wrapped_path);
+    }
+
+    /// Remove all files from the directory. Directories are not removed.
+    void clearDirectory(const std::string & path) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->clearDirectory(wrapped_path);
+    }
+
+    /// Move directory from `from_path` to `to_path`.
+    void moveDirectory(const std::string & from_path, const std::string & to_path) override
+    {
+        auto wrapped_from_path = wrappedPath(from_path);
+        auto wrapped_to_path = wrappedPath(to_path);
+        delegate_transaction->moveDirectory(wrapped_from_path, wrapped_to_path);
+    }
+
+    void moveFile(const std::string & from_path, const std::string & to_path) override
+    {
+        auto wrapped_from_path = wrappedPath(from_path);
+        auto wrapped_to_path = wrappedPath(to_path);
+        delegate_transaction->moveFile(wrapped_from_path, wrapped_to_path);
+
+    }
+
+    void createFile(const std::string & path) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->createFile(wrapped_path);
+    }
+
+    /// Move the file from `from_path` to `to_path`.
+    /// If a file with `to_path` path already exists, it will be replaced.
+    void replaceFile(const std::string & from_path, const std::string & to_path) override
+    {
+        auto wrapped_from_path = wrappedPath(from_path);
+        auto wrapped_to_path = wrappedPath(to_path);
+        delegate_transaction->replaceFile(wrapped_from_path, wrapped_to_path);
+    }
+
+    /// Only copy of several files supported now. Disk interface support copy to another disk
+    /// but it's impossible to implement correctly in transactions because other disk can
+    /// use different metadata storage.
+    /// TODO: maybe remove it at all, we don't want copies
+    void copyFile(const std::string & from_file_path, const std::string & to_file_path) override;
+
+    /// Open the file for write and return WriteBufferFromFileBase object.
+    std::unique_ptr<WriteBufferFromFileBase> writeFile( /// NOLINT
+        const std::string & path,
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        WriteMode mode = WriteMode::Rewrite,
+        const WriteSettings & settings = {},
+        bool autocommit = true) override;
+
+    /// Remove file. Throws exception if file doesn't exists or it's a directory.
+    void removeFile(const std::string & path) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->removeFile(wrapped_path);
+    }
+
+    /// Remove file if it exists.
+    void removeFileIfExists(const std::string & path) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->removeFileIfExists(wrapped_path);
+    }
+
+    /// Remove directory. Throws exception if it's not a directory or if directory is not empty.
+    void removeDirectory(const std::string & path) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->removeDirectory(wrapped_path);
+    }
+
+    /// Remove file or directory with all children. Use with extra caution. Throws exception if file doesn't exists.
+    void removeRecursive(const std::string & path) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->removeRecursive(wrapped_path);
+    }
+
+    /// Remove file. Throws exception if file doesn't exists or if directory is not empty.
+    /// Differs from removeFile for S3/HDFS disks
+    /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
+    void removeSharedFile(const std::string & path, bool keep_shared_data) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->removeSharedFile(wrapped_path, keep_shared_data);
+    }
+
+    /// Remove file or directory with all children. Use with extra caution. Throws exception if file doesn't exists.
+    /// Differs from removeRecursive for S3/HDFS disks
+    /// Second bool param is a flag to remove (false) or keep (true) shared data on S3.
+    /// Third param determines which files cannot be removed even if second is true.
+    void removeSharedRecursive(const std::string & path, bool keep_all_shared_data, const NameSet & file_names_remove_metadata_only) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->removeSharedRecursive(wrapped_path, keep_all_shared_data, file_names_remove_metadata_only);
+    }
+
+    /// Remove file or directory if it exists.
+    /// Differs from removeFileIfExists for S3/HDFS disks
+    /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
+    void removeSharedFileIfExists(const std::string & path, bool keep_shared_data) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->removeSharedFileIfExists(wrapped_path, keep_shared_data);
+    }
+
+    /// Batch request to remove multiple files.
+    /// May be much faster for blob storage.
+    /// Second bool param is a flag to remove (true) or keep (false) shared data on S3.
+    /// Third param determines which files cannot be removed even if second is true.
+    void removeSharedFiles(const RemoveBatchRequest & files, bool keep_all_batch_data, const NameSet & file_names_remove_metadata_only) override
+    {
+        for (const auto & file : files)
+        {
+            auto wrapped_path = wrappedPath(file.path);
+            bool keep = keep_all_batch_data || file_names_remove_metadata_only.contains(fs::path(file.path).filename());
+            if (file.if_exists)
+                delegate_transaction->removeSharedFileIfExists(wrapped_path, keep);
+            else
+                delegate_transaction->removeSharedFile(wrapped_path, keep);
+        }
+    }
+
+    /// Set last modified time to file or directory at `path`.
+    void setLastModified(const std::string & path, const Poco::Timestamp & timestamp) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->setLastModified(wrapped_path, timestamp);
+    }
+
+    /// Just chmod.
+    void chmod(const String & path, mode_t mode) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->chmod(wrapped_path, mode);
+    }
+
+    /// Set file at `path` as read-only.
+    void setReadOnly(const std::string & path) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->setReadOnly(wrapped_path);
+    }
+
+    /// Create hardlink from `src_path` to `dst_path`.
+    void createHardLink(const std::string & src_path, const std::string & dst_path) override
+    {
+        auto wrapped_src_path = wrappedPath(src_path);
+        auto wrapped_dst_path = wrappedPath(dst_path);
+        delegate_transaction->createHardLink(wrapped_src_path, wrapped_dst_path);
+    }
+
+    void writeFileUsingBlobWritingFunction(const String & path, WriteMode mode, WriteBlobFunction && write_blob_function) override
+    {
+        auto wrapped_path = wrappedPath(path);
+        delegate_transaction->writeFileUsingBlobWritingFunction(wrapped_path, mode, std::move(write_blob_function));
+    }
+
+    std::unique_ptr<WriteBufferFromFileBase> writeEncryptedFile(
+        const String & path,
+        size_t buf_size,
+        WriteMode mode,
+        const WriteSettings & settings) const
+    {
+        auto wrapped_path = wrappedPath(path);
+        return delegate_transaction->writeFile(wrapped_path, buf_size, mode, settings);
+    }
+
+
+private:
+
+    String wrappedPath(const String & path) const
+    {
+        return wrappedPath(disk_path, path);
+    }
+
+    DiskTransactionPtr delegate_transaction;
+    std::string disk_path;
+    DiskEncryptedSettings current_settings;
+    IDisk * delegate_disk;
+};
+
+}
+
+#endif
diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index a3b7e413014..c76ea289101 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -1,4 +1,5 @@
 #include "DiskLocal.h"
+#include <Common/Throttler_fwd.h>
 #include <Common/createHardLink.h>
 #include "DiskFactory.h"
 
@@ -8,9 +9,8 @@
 #include <Common/quoteString.h>
 #include <Common/atomicRename.h>
 #include <Disks/IO/createReadBufferFromFileBase.h>
-#include <Disks/ObjectStorages/LocalObjectStorage.h>
-#include <Disks/ObjectStorages/DiskObjectStorage.h>
-#include <Disks/ObjectStorages/FakeMetadataStorageFromDisk.h>
+#include <Disks/loadLocalDiskConfig.h>
+#include <Disks/TemporaryFileOnDisk.h>
 
 #include <fstream>
 #include <unistd.h>
@@ -18,12 +18,14 @@
 #include <sys/stat.h>
 
 #include <Disks/DiskFactory.h>
+#include <Disks/IO/WriteBufferFromTemporaryFile.h>
+
 #include <Common/randomSeed.h>
 #include <IO/ReadHelpers.h>
-#include <IO/WriteBufferFromTemporaryFile.h>
 #include <IO/WriteHelpers.h>
 #include <Common/logger_useful.h>
 
+
 namespace CurrentMetrics
 {
     extern const Metric DiskSpaceReservedForMerge;
@@ -35,7 +37,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int UNKNOWN_ELEMENT_IN_CONFIG;
-    extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
     extern const int PATH_ACCESS_DENIED;
     extern const int LOGICAL_ERROR;
     extern const int CANNOT_TRUNCATE_FILE;
@@ -50,53 +51,6 @@ std::mutex DiskLocal::reservation_mutex;
 
 using DiskLocalPtr = std::shared_ptr<DiskLocal>;
 
-static void loadDiskLocalConfig(const String & name,
-                      const Poco::Util::AbstractConfiguration & config,
-                      const String & config_prefix,
-                      ContextPtr context,
-                      String & path,
-                      UInt64 & keep_free_space_bytes)
-{
-    path = config.getString(config_prefix + ".path", "");
-    if (name == "default")
-    {
-        if (!path.empty())
-            throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
-                "\"default\" disk path should be provided in <path> not it <storage_configuration>");
-        path = context->getPath();
-    }
-    else
-    {
-        if (path.empty())
-            throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Disk path can not be empty. Disk {}", name);
-        if (path.back() != '/')
-            throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Disk path must end with /. Disk {}", name);
-        if (path == context->getPath())
-            throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Disk path ('{}') cannot be equal to <path>. Use <default> disk instead.", path);
-    }
-
-    bool has_space_ratio = config.has(config_prefix + ".keep_free_space_ratio");
-
-    if (config.has(config_prefix + ".keep_free_space_bytes") && has_space_ratio)
-        throw Exception(ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG,
-                        "Only one of 'keep_free_space_bytes' and 'keep_free_space_ratio' can be specified");
-
-    keep_free_space_bytes = config.getUInt64(config_prefix + ".keep_free_space_bytes", 0);
-
-    if (has_space_ratio)
-    {
-        auto ratio = config.getDouble(config_prefix + ".keep_free_space_ratio");
-        if (ratio < 0 || ratio > 1)
-            throw Exception(ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG, "'keep_free_space_ratio' have to be between 0 and 1");
-        String tmp_path = path;
-        if (tmp_path.empty())
-            tmp_path = context->getPath();
-
-        // Create tmp disk for getting total disk space.
-        keep_free_space_bytes = static_cast<UInt64>(DiskLocal("tmp", tmp_path, 0).getTotalSpace() * ratio);
-    }
-}
-
 std::optional<size_t> fileSizeSafe(const fs::path & path)
 {
     std::error_code ec;
@@ -367,10 +321,23 @@ std::unique_ptr<ReadBufferFromFileBase> DiskLocal::readFile(const String & path,
 }
 
 std::unique_ptr<WriteBufferFromFileBase>
-DiskLocal::writeFile(const String & path, size_t buf_size, WriteMode mode, const WriteSettings &)
+DiskLocal::writeFile(const String & path, size_t buf_size, WriteMode mode, const WriteSettings & settings)
 {
     int flags = (mode == WriteMode::Append) ? (O_APPEND | O_CREAT | O_WRONLY) : -1;
-    return std::make_unique<WriteBufferFromFile>(fs::path(disk_path) / path, buf_size, flags);
+    return std::make_unique<WriteBufferFromFile>(
+        fs::path(disk_path) / path, buf_size, flags, settings.local_throttler);
+}
+
+std::vector<String> DiskLocal::getBlobPath(const String & path) const
+{
+    auto fs_path = fs::path(disk_path) / path;
+    return {fs_path};
+}
+
+void DiskLocal::writeFileUsingBlobWritingFunction(const String & path, WriteMode mode, WriteBlobFunction && write_blob_function)
+{
+    auto fs_path = fs::path(disk_path) / path;
+    std::move(write_blob_function)({fs_path}, mode, {});
 }
 
 void DiskLocal::removeFile(const String & path)
@@ -500,15 +467,8 @@ DiskLocal::DiskLocal(const String & name_, const String & path_, UInt64 keep_fre
     , disk_path(path_)
     , keep_free_space_bytes(keep_free_space_bytes_)
     , logger(&Poco::Logger::get("DiskLocal"))
+    , data_source_description(getLocalDataSourceDescription(disk_path))
 {
-    data_source_description.type = DataSourceType::Local;
-
-    if (auto block_device_id = tryGetBlockDeviceId(disk_path); block_device_id.has_value())
-        data_source_description.description = *block_device_id;
-    else
-        data_source_description.description = disk_path;
-    data_source_description.is_encrypted = false;
-    data_source_description.is_cached = false;
 }
 
 DiskLocal::DiskLocal(
@@ -524,6 +484,20 @@ DataSourceDescription DiskLocal::getDataSourceDescription() const
     return data_source_description;
 }
 
+DataSourceDescription DiskLocal::getLocalDataSourceDescription(const String & path)
+{
+    DataSourceDescription res;
+    res.type = DataSourceType::Local;
+
+    if (auto block_device_id = tryGetBlockDeviceId(path); block_device_id.has_value())
+        res.description = *block_device_id;
+    else
+        res.description = path;
+    res.is_encrypted = false;
+    res.is_cached = false;
+    return res;
+}
+
 void DiskLocal::shutdown()
 {
     if (disk_checker)
@@ -580,14 +554,16 @@ struct DiskWriteCheckData
     }
 };
 
-bool DiskLocal::canWrite() const noexcept
+bool DiskLocal::canWrite() noexcept
 try
 {
     static DiskWriteCheckData data;
-    String tmp_template = fs::path(disk_path) / "";
     {
-        auto buf = WriteBufferFromTemporaryFile::create(tmp_template);
+        auto disk_ptr = std::static_pointer_cast<DiskLocal>(shared_from_this());
+        auto tmp_file = std::make_unique<TemporaryFileOnDisk>(disk_ptr);
+        auto buf = std::make_unique<WriteBufferFromTemporaryFile>(std::move(tmp_file));
         buf->write(data.data, data.PAGE_SIZE_IN_BYTES);
+        buf->finalize();
         buf->sync();
     }
     return true;
@@ -598,25 +574,6 @@ catch (...)
     return false;
 }
 
-DiskObjectStoragePtr DiskLocal::createDiskObjectStorage()
-{
-    auto object_storage = std::make_shared<LocalObjectStorage>();
-    auto metadata_storage = std::make_shared<FakeMetadataStorageFromDisk>(
-        /* metadata_storage */std::static_pointer_cast<DiskLocal>(shared_from_this()),
-        object_storage,
-        /* object_storage_root_path */getPath());
-
-    return std::make_shared<DiskObjectStorage>(
-        getName(),
-        disk_path,
-        "Local",
-        metadata_storage,
-        object_storage,
-        false,
-        /* threadpool_size */16
-    );
-}
-
 void DiskLocal::checkAccessImpl(const String & path)
 {
     try
@@ -744,13 +701,6 @@ void DiskLocal::chmod(const String & path, mode_t mode)
     DB::throwFromErrnoWithPath("Cannot chmod file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
 }
 
-MetadataStoragePtr DiskLocal::getMetadataStorage()
-{
-    auto object_storage = std::make_shared<LocalObjectStorage>();
-    return std::make_shared<FakeMetadataStorageFromDisk>(
-        std::static_pointer_cast<IDisk>(shared_from_this()), object_storage, getPath());
-}
-
 void registerDiskLocal(DiskFactory & factory, bool global_skip_access_check)
 {
     auto creator = [global_skip_access_check](
diff --git a/src/Disks/DiskLocal.h b/src/Disks/DiskLocal.h
index 14e29904422..3d340ae40b7 100644
--- a/src/Disks/DiskLocal.h
+++ b/src/Disks/DiskLocal.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 #include <Disks/DiskLocalCheckThread.h>
 #include <Disks/IDisk.h>
 #include <IO/ReadBufferFromFile.h>
@@ -82,6 +81,9 @@ public:
         WriteMode mode,
         const WriteSettings & settings) override;
 
+    Strings getBlobPath(const String & path) const override;
+    void writeFileUsingBlobWritingFunction(const String & path, WriteMode mode, WriteBlobFunction && write_blob_function) override;
+
     void removeFile(const String & path) override;
     void removeFileIfExists(const String & path) override;
     void removeDirectory(const String & path) override;
@@ -100,6 +102,7 @@ public:
     void truncateFile(const String & path, size_t size) override;
 
     DataSourceDescription getDataSourceDescription() const override;
+    static DataSourceDescription getLocalDataSourceDescription(const String & path);
 
     bool isRemote() const override { return false; }
 
@@ -120,9 +123,7 @@ public:
     /// rudimentary. The more advanced choice would be using
     /// https://github.com/smartmontools/smartmontools. However, it's good enough for now.
     bool canRead() const noexcept;
-    bool canWrite() const noexcept;
-
-    DiskObjectStoragePtr createDiskObjectStorage() override;
+    bool canWrite() noexcept;
 
     bool supportsStat() const override { return true; }
     struct stat stat(const String & path) const override;
@@ -130,8 +131,6 @@ public:
     bool supportsChmod() const override { return true; }
     void chmod(const String & path, mode_t mode) override;
 
-    MetadataStoragePtr getMetadataStorage() override;
-
 protected:
     void checkAccessImpl(const String & path) override;
 
diff --git a/src/Disks/DiskType.cpp b/src/Disks/DiskType.cpp
index 92979ab505c..aa18cc6e0cb 100644
--- a/src/Disks/DiskType.cpp
+++ b/src/Disks/DiskType.cpp
@@ -8,4 +8,9 @@ bool DataSourceDescription::operator==(const DataSourceDescription & other) cons
     return std::tie(type, description, is_encrypted) == std::tie(other.type, other.description, other.is_encrypted);
 }
 
+bool DataSourceDescription::sameKind(const DataSourceDescription & other) const
+{
+    return std::tie(type, description) == std::tie(other.type, other.description);
+}
+
 }
diff --git a/src/Disks/DiskType.h b/src/Disks/DiskType.h
index 4d099e33a7a..7d47fa8da78 100644
--- a/src/Disks/DiskType.h
+++ b/src/Disks/DiskType.h
@@ -15,6 +15,7 @@ enum class DataSourceType
     HDFS,
     WebServer,
     AzureBlobStorage,
+    LocalBlobStorage,
 };
 
 inline String toString(DataSourceType data_source_type)
@@ -35,6 +36,8 @@ inline String toString(DataSourceType data_source_type)
             return "web";
         case DataSourceType::AzureBlobStorage:
             return "azure_blob_storage";
+        case DataSourceType::LocalBlobStorage:
+            return "local_blob_storage";
     }
     UNREACHABLE();
 }
@@ -48,6 +51,7 @@ struct DataSourceDescription
     bool is_cached = false;
 
     bool operator==(const DataSourceDescription & other) const;
+    bool sameKind(const DataSourceDescription & other) const;
 };
 
 }
diff --git a/src/Disks/FakeDiskTransaction.h b/src/Disks/FakeDiskTransaction.h
index 46be885739e..2cf540444be 100644
--- a/src/Disks/FakeDiskTransaction.h
+++ b/src/Disks/FakeDiskTransaction.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Disks/IDiskTransaction.h>
+#include <IO/WriteBufferFromFileBase.h>
 
 namespace DB
 {
@@ -68,6 +69,11 @@ public:
         return disk.writeFile(path, buf_size, mode, settings);
     }
 
+    void writeFileUsingBlobWritingFunction(const String & path, WriteMode mode, WriteBlobFunction && write_blob_function) override
+    {
+        disk.writeFileUsingBlobWritingFunction(path, mode, std::move(write_blob_function));
+    }
+
     void removeFile(const std::string & path) override
     {
         disk.removeFile(path);
diff --git a/src/Disks/IDisk.cpp b/src/Disks/IDisk.cpp
index 2a60f32929c..bca867fec76 100644
--- a/src/Disks/IDisk.cpp
+++ b/src/Disks/IDisk.cpp
@@ -7,9 +7,6 @@
 #include <Common/logger_useful.h>
 #include <Common/setThreadName.h>
 #include <Core/ServerUUID.h>
-#include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
-#include <Disks/ObjectStorages/FakeMetadataStorageFromDisk.h>
-#include <Disks/ObjectStorages/LocalObjectStorage.h>
 #include <Disks/FakeDiskTransaction.h>
 
 namespace DB
@@ -38,7 +35,6 @@ void IDisk::copyFile(const String & from_file_path, IDisk & to_disk, const Strin
     out->finalize();
 }
 
-
 DiskTransactionPtr IDisk::createTransaction()
 {
     return std::make_shared<FakeDiskTransaction>(*this);
@@ -56,6 +52,31 @@ void IDisk::removeSharedFiles(const RemoveBatchRequest & files, bool keep_all_ba
     }
 }
 
+std::unique_ptr<ReadBufferFromFileBase> IDisk::readEncryptedFile(const String &, const ReadSettings &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "File encryption is not implemented for disk of type {}", getDataSourceDescription().type);
+}
+
+std::unique_ptr<WriteBufferFromFileBase> IDisk::writeEncryptedFile(const String &, size_t, WriteMode, const WriteSettings &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "File encryption is not implemented for disk of type {}", getDataSourceDescription().type);
+}
+
+size_t IDisk::getEncryptedFileSize(const String &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "File encryption is not implemented for disk of type {}", getDataSourceDescription().type);
+}
+
+size_t IDisk::getEncryptedFileSize(size_t) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "File encryption is not implemented for disk of type {}", getDataSourceDescription().type);
+}
+
+UInt128 IDisk::getEncryptedFileIV(const String &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "File encryption is not implemented for disk of type {}", getDataSourceDescription().type);
+}
+
 
 using ResultsCollector = std::vector<std::future<void>>;
 
@@ -167,12 +188,12 @@ try
         try
         {
             file->write(payload.data(), payload.size());
+            file->finalize();
         }
         catch (...)
         {
             /// Log current exception, because finalize() can throw a different exception.
             tryLogCurrentException(__PRETTY_FUNCTION__);
-            file->finalize();
             throw;
         }
     }
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 79b2fefe964..5d75f3b70e5 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -2,6 +2,7 @@
 
 #include <Interpreters/Context_fwd.h>
 #include <Core/Defines.h>
+#include <Core/Names.h>
 #include <base/types.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
@@ -20,6 +21,7 @@
 #include <boost/noncopyable.hpp>
 #include <Poco/Timestamp.h>
 #include <filesystem>
+#include <sys/stat.h>
 
 
 namespace fs = std::filesystem;
@@ -238,15 +240,43 @@ public:
     /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
     virtual void removeSharedFileIfExists(const String & path, bool /* keep_shared_data */) { removeFileIfExists(path); }
 
-    virtual const String & getCacheBasePath() const { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "There is no cache path"); }
+    /// Returns the path to a blob representing a specified file.
+    /// The meaning of the returned path depends on disk's type.
+    /// E.g. for DiskLocal it's the absolute path to the file and for DiskObjectStorage it's
+    /// StoredObject::remote_path for each stored object combined with the name of the objects' namespace.
+    virtual Strings getBlobPath(const String & path) const = 0;
+
+    using WriteBlobFunction = std::function<size_t(const Strings & blob_path, WriteMode mode, const std::optional<ObjectAttributes> & object_attributes)>;
+
+    /// Write a file using a custom function to write a blob representing the file.
+    /// This method is alternative to writeFile(), the difference is that for example for DiskObjectStorage
+    /// writeFile() calls IObjectStorage::writeObject() to write an object to the object storage while
+    /// this method allows to specify a callback for that.
+    virtual void writeFileUsingBlobWritingFunction(const String & path, WriteMode mode, WriteBlobFunction && write_blob_function) = 0;
+
+    /// Reads a file from an encrypted disk without decrypting it (only for encrypted disks).
+    virtual std::unique_ptr<ReadBufferFromFileBase> readEncryptedFile(const String & path, const ReadSettings & settings) const;
+
+    /// Writes an already encrypted file to the disk (only for encrypted disks).
+    virtual std::unique_ptr<WriteBufferFromFileBase> writeEncryptedFile(
+        const String & path, size_t buf_size, WriteMode mode, const WriteSettings & settings) const;
+
+    /// Returns the size of an encrypted file (only for encrypted disks).
+    virtual size_t getEncryptedFileSize(const String & path) const;
+    virtual size_t getEncryptedFileSize(size_t unencrypted_size) const;
+
+    /// Returns IV of an encrypted file (only for encrypted disks).
+    virtual UInt128 getEncryptedFileIV(const String & path) const;
+
+    virtual const String & getCacheName() const { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "There is no cache"); }
 
     virtual bool supportsCache() const { return false; }
 
     virtual NameSet getCacheLayersNames() const
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                        "Method `getCacheLayersNames()` is not implemented for disk: {}",
-                        getDataSourceDescription().type);
+            "Method `getCacheLayersNames()` is not implemented for disk: {}",
+            toString(getDataSourceDescription().type));
     }
 
     /// Returns a list of storage objects (contains path, size, ...).
@@ -254,7 +284,9 @@ public:
     /// be multiple files in remote fs for single clickhouse file.
     virtual StoredObjects getStorageObjects(const String &) const
     {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method `getStorageObjects() not implemented for disk: {}`", getDataSourceDescription().type);
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+            "Method `getStorageObjects()` not implemented for disk: {}",
+            toString(getDataSourceDescription().type));
     }
 
     /// For one local path there might be multiple remote paths in case of Log family engines.
@@ -272,8 +304,8 @@ public:
     virtual void getRemotePathsRecursive(const String &, std::vector<LocalPathWithObjectStoragePaths> &)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                        "Method `getRemotePathsRecursive() not implemented for disk: {}`",
-                        getDataSourceDescription().type);
+            "Method `getRemotePathsRecursive() not implemented for disk: {}`",
+            toString(getDataSourceDescription().type));
     }
 
     /// Batch request to remove multiple files.
@@ -356,7 +388,13 @@ public:
     /// Actually it's a part of IDiskRemote implementation but we have so
     /// complex hierarchy of disks (with decorators), so we cannot even
     /// dynamic_cast some pointer to IDisk to pointer to IDiskRemote.
-    virtual MetadataStoragePtr getMetadataStorage() = 0;
+    virtual MetadataStoragePtr getMetadataStorage()
+    {
+        throw Exception(
+            ErrorCodes::NOT_IMPLEMENTED,
+            "Method getMetadataStorage() is not implemented for disk type: {}",
+            toString(getDataSourceDescription().type));
+    }
 
     /// Very similar case as for getMetadataDiskIfExistsOrSelf(). If disk has "metadata"
     /// it will return mapping for each required path: path -> metadata as string.
@@ -389,7 +427,7 @@ public:
         throw Exception(
             ErrorCodes::NOT_IMPLEMENTED,
             "Method getObjectStorage() is not implemented for disk type: {}",
-            getDataSourceDescription().type);
+            toString(getDataSourceDescription().type));
     }
 
     /// Create disk object storage according to disk type.
@@ -400,7 +438,7 @@ public:
         throw Exception(
             ErrorCodes::NOT_IMPLEMENTED,
             "Method createDiskObjectStorage() is not implemented for disk type: {}",
-            getDataSourceDescription().type);
+            toString(getDataSourceDescription().type));
     }
 
     virtual bool supportsStat() const { return false; }
@@ -414,6 +452,8 @@ public:
 
     void markDiskAsCustom() { is_custom_disk = true; }
 
+    virtual DiskPtr getDelegateDiskIfExists() const { return nullptr; }
+
 protected:
     friend class DiskDecorator;
 
diff --git a/src/Disks/IDiskTransaction.h b/src/Disks/IDiskTransaction.h
index 02c8731428d..935cd6b2c65 100644
--- a/src/Disks/IDiskTransaction.h
+++ b/src/Disks/IDiskTransaction.h
@@ -4,6 +4,7 @@
 #include <vector>
 #include <boost/noncopyable.hpp>
 #include <Disks/IDisk.h>
+#include <sys/types.h>
 
 namespace DB
 {
@@ -68,6 +69,11 @@ public:
         const WriteSettings & settings = {},
         bool autocommit = true) = 0;
 
+    using WriteBlobFunction = std::function<size_t(const Strings & blob_path, WriteMode mode, const std::optional<ObjectAttributes> & object_attributes)>;
+
+    /// Write a file using a custom function to write an object to the disk's object storage.
+    virtual void writeFileUsingBlobWritingFunction(const String & path, WriteMode mode, WriteBlobFunction && write_blob_function) = 0;
+
     /// Remove file. Throws exception if file doesn't exists or it's a directory.
     virtual void removeFile(const std::string & path) = 0;
 
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/AsynchronousBoundedReadBuffer.cpp
similarity index 64%
rename from src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
rename to src/Disks/IO/AsynchronousBoundedReadBuffer.cpp
index 697b1b87359..aed4c2f82f2 100644
--- a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/AsynchronousBoundedReadBuffer.cpp
@@ -1,4 +1,4 @@
-#include "AsynchronousReadIndirectBufferFromRemoteFS.h"
+#include "AsynchronousBoundedReadBuffer.h"
 
 #include <Common/Stopwatch.h>
 #include <Common/logger_useful.h>
@@ -43,115 +43,79 @@ namespace ErrorCodes
 }
 
 
-AsynchronousReadIndirectBufferFromRemoteFS::AsynchronousReadIndirectBufferFromRemoteFS(
+AsynchronousBoundedReadBuffer::AsynchronousBoundedReadBuffer(
+        ImplPtr impl_,
         IAsynchronousReader & reader_,
         const ReadSettings & settings_,
-        std::shared_ptr<ReadBufferFromRemoteFSGather> impl_,
-        size_t min_bytes_for_seek_)
+        AsyncReadCountersPtr async_read_counters_,
+        FilesystemReadPrefetchesLogPtr prefetches_log_)
     : ReadBufferFromFileBase(settings_.remote_fs_buffer_size, nullptr, 0)
+    , impl(std::move(impl_))
     , read_settings(settings_)
     , reader(reader_)
-    , base_priority(settings_.priority)
-    , impl(impl_)
-    , prefetch_buffer(settings_.remote_fs_buffer_size)
-    , min_bytes_for_seek(min_bytes_for_seek_)
-    , query_id(CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() != nullptr
-               ? CurrentThread::getQueryId() : "")
+    , prefetch_buffer(settings_.prefetch_buffer_size)
+    , query_id(CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() != nullptr ? CurrentThread::getQueryId() : "")
     , current_reader_id(getRandomASCIIString(8))
-#ifndef NDEBUG
-    , log(&Poco::Logger::get("AsynchronousBufferFromRemoteFS"))
-#else
-    , log(&Poco::Logger::get("AsyncBuffer(" + impl->getFileName() + ")"))
-#endif
+    , log(&Poco::Logger::get("AsynchronousBoundedReadBuffer"))
+    , async_read_counters(async_read_counters_)
+    , prefetches_log(prefetches_log_)
 {
     ProfileEvents::increment(ProfileEvents::RemoteFSBuffers);
 }
 
-String AsynchronousReadIndirectBufferFromRemoteFS::getFileName() const
+bool AsynchronousBoundedReadBuffer::hasPendingDataToRead()
 {
-    return impl->getFileName();
-}
-
-
-String AsynchronousReadIndirectBufferFromRemoteFS::getInfoForLog()
-{
-    return impl->getInfoForLog();
-}
-
-size_t AsynchronousReadIndirectBufferFromRemoteFS::getFileSize()
-{
-    return impl->getFileSize();
-}
-
-bool AsynchronousReadIndirectBufferFromRemoteFS::hasPendingDataToRead()
-{
-    /**
-     * Note: read_until_position here can be std::nullopt only for non-MergeTree tables.
-     * For mergeTree tables it must be guaranteed that setReadUntilPosition() or
-     * setReadUntilEnd() is called before any read or prefetch.
-     * setReadUntilEnd() always sets read_until_position to file size.
-     * setReadUntilPosition(pos) always has pos > 0, because if
-     * right_offset_in_compressed_file is 0, then setReadUntilEnd() is used.
-     */
     if (read_until_position)
     {
-        /// Everything is already read.
-        if (file_offset_of_buffer_end == *read_until_position)
+        if (file_offset_of_buffer_end == *read_until_position) /// Everything is already read.
             return false;
 
         if (file_offset_of_buffer_end > *read_until_position)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Read beyond last offset ({} > {}, info: {})",
-                            file_offset_of_buffer_end, *read_until_position, impl->getInfoForLog());
+        {
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Read beyond last offset ({} > {}, info: {})",
+                file_offset_of_buffer_end, *read_until_position, impl->getInfoForLog());
+        }
     }
 
     return true;
 }
 
-
-std::future<IAsynchronousReader::Result> AsynchronousReadIndirectBufferFromRemoteFS::asyncReadInto(char * data, size_t size, int64_t priority)
+std::future<IAsynchronousReader::Result>
+AsynchronousBoundedReadBuffer::asyncReadInto(char * data, size_t size, Priority priority)
 {
     IAsynchronousReader::Request request;
-    request.descriptor = std::make_shared<RemoteFSFileDescriptor>(*impl);
+    request.descriptor = std::make_shared<RemoteFSFileDescriptor>(*impl, async_read_counters);
     request.buf = data;
     request.size = size;
     request.offset = file_offset_of_buffer_end;
-    request.priority = base_priority + priority;
-
-    if (bytes_to_ignore)
-    {
-        request.ignore = bytes_to_ignore;
-        bytes_to_ignore = 0;
-    }
+    request.priority = Priority{read_settings.priority.value + priority.value};
+    request.ignore = bytes_to_ignore;
     return reader.submit(request);
 }
 
-
-void AsynchronousReadIndirectBufferFromRemoteFS::prefetch(int64_t priority)
+void AsynchronousBoundedReadBuffer::prefetch(Priority priority)
 {
     if (prefetch_future.valid())
         return;
 
-    /// Check boundary, which was set in readUntilPosition().
     if (!hasPendingDataToRead())
         return;
 
-    last_prefetch_info.submit_time = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+    last_prefetch_info.submit_time = std::chrono::duration_cast<std::chrono::milliseconds>(
+        std::chrono::system_clock::now().time_since_epoch()).count();
     last_prefetch_info.priority = priority;
 
-    /// Prefetch even in case hasPendingData() == true.
-    chassert(prefetch_buffer.size() == read_settings.remote_fs_buffer_size);
+    chassert(prefetch_buffer.size() == read_settings.prefetch_buffer_size
+             || prefetch_buffer.size() == read_settings.remote_fs_buffer_size);
     prefetch_future = asyncReadInto(prefetch_buffer.data(), prefetch_buffer.size(), priority);
     ProfileEvents::increment(ProfileEvents::RemoteFSPrefetches);
 }
 
-void AsynchronousReadIndirectBufferFromRemoteFS::setReadUntilPosition(size_t position)
+void AsynchronousBoundedReadBuffer::setReadUntilPosition(size_t position)
 {
-    /// Do not reinitialize internal state in case the new end of range is already included.
-    /// Actually it is likely that we will anyway reinitialize it as seek method is called after
-    /// changing end position, but seek avoiding feature might help to avoid reinitialization,
-    /// so this check is useful to save the prefetch for the time when we try to avoid seek by
-    /// reading and ignoring some data.
-    if (!read_until_position || position > *read_until_position)
+    if (!read_until_position || position != *read_until_position)
     {
         read_until_position = position;
 
@@ -165,22 +129,16 @@ void AsynchronousReadIndirectBufferFromRemoteFS::setReadUntilPosition(size_t pos
     }
 }
 
-
-void AsynchronousReadIndirectBufferFromRemoteFS::setReadUntilEnd()
+void AsynchronousBoundedReadBuffer::appendToPrefetchLog(
+    FilesystemPrefetchState state,
+    int64_t size,
+    const std::unique_ptr<Stopwatch> & execution_watch)
 {
-    read_until_position = impl->getFileSize();
-    impl->setReadUntilPosition(*read_until_position);
-}
-
-
-void AsynchronousReadIndirectBufferFromRemoteFS::appendToPrefetchLog(FilesystemPrefetchState state, int64_t size, const std::unique_ptr<Stopwatch> & execution_watch)
-{
-    const auto & object = impl->getCurrentObject();
     FilesystemReadPrefetchesLogElement elem
     {
         .event_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()),
         .query_id = query_id,
-        .path = object.getMappedPath(),
+        .path = impl->getFileName(),
         .offset = file_offset_of_buffer_end,
         .size = size,
         .prefetch_submit_time = last_prefetch_info.submit_time,
@@ -191,12 +149,12 @@ void AsynchronousReadIndirectBufferFromRemoteFS::appendToPrefetchLog(FilesystemP
         .reader_id = current_reader_id,
     };
 
-    if (auto prefetch_log = Context::getGlobalContextInstance()->getFilesystemReadPrefetchesLog())
-        prefetch_log->add(elem);
+    if (prefetches_log)
+        prefetches_log->add(elem);
 }
 
 
-bool AsynchronousReadIndirectBufferFromRemoteFS::nextImpl()
+bool AsynchronousBoundedReadBuffer::nextImpl()
 {
     if (!hasPendingDataToRead())
         return false;
@@ -229,14 +187,15 @@ bool AsynchronousReadIndirectBufferFromRemoteFS::nextImpl()
     {
         ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::SynchronousRemoteReadWaitMicroseconds);
 
-        chassert(memory.size() == read_settings.remote_fs_buffer_size);
+        chassert(memory.size() == read_settings.prefetch_buffer_size || memory.size() == read_settings.remote_fs_buffer_size);
         std::tie(size, offset) = impl->readInto(memory.data(), memory.size(), file_offset_of_buffer_end, bytes_to_ignore);
-        bytes_to_ignore = 0;
 
         ProfileEvents::increment(ProfileEvents::RemoteFSUnprefetchedReads);
         ProfileEvents::increment(ProfileEvents::RemoteFSUnprefetchedBytes, size);
     }
 
+    bytes_to_ignore = 0;
+
     chassert(size >= offset);
 
     size_t bytes_read = size - offset;
@@ -253,14 +212,14 @@ bool AsynchronousReadIndirectBufferFromRemoteFS::nextImpl()
     /// In case of multiple files for the same file in clickhouse (i.e. log family)
     /// file_offset_of_buffer_end will not match getImplementationBufferOffset()
     /// so we use [impl->getImplementationBufferOffset(), impl->getFileSize()]
-    chassert(file_offset_of_buffer_end >= impl->getImplementationBufferOffset());
+    chassert(file_offset_of_buffer_end >= impl->getFileOffsetOfBufferEnd());
     chassert(file_offset_of_buffer_end <= impl->getFileSize());
 
     return bytes_read;
 }
 
 
-off_t AsynchronousReadIndirectBufferFromRemoteFS::seek(off_t offset, int whence)
+off_t AsynchronousBoundedReadBuffer::seek(off_t offset, int whence)
 {
     ProfileEvents::increment(ProfileEvents::RemoteFSSeeks);
 
@@ -272,21 +231,23 @@ off_t AsynchronousReadIndirectBufferFromRemoteFS::seek(off_t offset, int whence)
     }
     else if (whence == SEEK_CUR)
     {
-        new_pos = file_offset_of_buffer_end - (working_buffer.end() - pos) + offset;
+        new_pos = static_cast<size_t>(getPosition()) + offset;
     }
     else
     {
-        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "ReadBufferFromFileDescriptor::seek expects SEEK_SET or SEEK_CUR as whence");
+        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Expected SEEK_SET or SEEK_CUR as whence");
     }
 
     /// Position is unchanged.
-    if (new_pos + (working_buffer.end() - pos) == file_offset_of_buffer_end)
+    if (new_pos == static_cast<size_t>(getPosition()))
         return new_pos;
 
     bool read_from_prefetch = false;
     while (true)
     {
-        if (file_offset_of_buffer_end - working_buffer.size() <= new_pos && new_pos <= file_offset_of_buffer_end)
+        /// The first condition implies bytes_to_ignore = 0.
+        if (!working_buffer.empty() && file_offset_of_buffer_end - working_buffer.size() <= new_pos &&
+            new_pos <= file_offset_of_buffer_end)
         {
             /// Position is still inside the buffer.
             /// Probably it is at the end of the buffer - then we will load data on the following 'next' call.
@@ -323,13 +284,13 @@ off_t AsynchronousReadIndirectBufferFromRemoteFS::seek(off_t offset, int whence)
 
     /// First reset the buffer so the next read will fetch new data to the buffer.
     resetWorkingBuffer();
+    bytes_to_ignore = 0;
 
     if (read_until_position && new_pos > *read_until_position)
     {
         ProfileEvents::increment(ProfileEvents::RemoteFSSeeksWithReset);
-        impl->reset();
-
         file_offset_of_buffer_end = new_pos = *read_until_position; /// read_until_position is a non-included boundary.
+        impl->seek(file_offset_of_buffer_end, SEEK_SET);
         return new_pos;
     }
 
@@ -337,35 +298,30 @@ off_t AsynchronousReadIndirectBufferFromRemoteFS::seek(off_t offset, int whence)
     * Lazy ignore. Save number of bytes to ignore and ignore it either for prefetch buffer or current buffer.
     * Note: we read in range [file_offset_of_buffer_end, read_until_position).
     */
-    if (impl->initialized()
-        && read_until_position && new_pos < *read_until_position
+    if (read_until_position && new_pos < *read_until_position
         && new_pos > file_offset_of_buffer_end
-        && new_pos < file_offset_of_buffer_end + min_bytes_for_seek)
+        && new_pos < file_offset_of_buffer_end + read_settings.remote_read_min_bytes_for_seek)
     {
         ProfileEvents::increment(ProfileEvents::RemoteFSLazySeeks);
         bytes_to_ignore = new_pos - file_offset_of_buffer_end;
     }
     else
     {
-        if (impl->initialized())
-        {
-            ProfileEvents::increment(ProfileEvents::RemoteFSSeeksWithReset);
-            impl->reset();
-        }
+        ProfileEvents::increment(ProfileEvents::RemoteFSSeeksWithReset);
         file_offset_of_buffer_end = new_pos;
+        impl->seek(file_offset_of_buffer_end, SEEK_SET);
     }
 
     return new_pos;
 }
 
 
-void AsynchronousReadIndirectBufferFromRemoteFS::finalize()
+void AsynchronousBoundedReadBuffer::finalize()
 {
     resetPrefetch(FilesystemPrefetchState::UNNEEDED);
 }
 
-
-AsynchronousReadIndirectBufferFromRemoteFS::~AsynchronousReadIndirectBufferFromRemoteFS()
+AsynchronousBoundedReadBuffer::~AsynchronousBoundedReadBuffer()
 {
     try
     {
@@ -377,7 +333,7 @@ AsynchronousReadIndirectBufferFromRemoteFS::~AsynchronousReadIndirectBufferFromR
     }
 }
 
-void AsynchronousReadIndirectBufferFromRemoteFS::resetPrefetch(FilesystemPrefetchState state)
+void AsynchronousBoundedReadBuffer::resetPrefetch(FilesystemPrefetchState state)
 {
     if (!prefetch_future.valid())
         return;
diff --git a/src/Disks/IO/AsynchronousBoundedReadBuffer.h b/src/Disks/IO/AsynchronousBoundedReadBuffer.h
new file mode 100644
index 00000000000..cafc5b6d691
--- /dev/null
+++ b/src/Disks/IO/AsynchronousBoundedReadBuffer.h
@@ -0,0 +1,96 @@
+#pragma once
+
+#include "config.h"
+#include <IO/ReadBufferFromFile.h>
+#include <IO/AsynchronousReader.h>
+#include <IO/ReadSettings.h>
+#include <Interpreters/FilesystemReadPrefetchesLog.h>
+#include <utility>
+
+namespace Poco { class Logger; }
+
+namespace DB
+{
+
+struct AsyncReadCounters;
+using AsyncReadCountersPtr = std::shared_ptr<AsyncReadCounters>;
+class ReadBufferFromRemoteFSGather;
+
+class AsynchronousBoundedReadBuffer : public ReadBufferFromFileBase
+{
+public:
+    using Impl = ReadBufferFromFileBase;
+    using ImplPtr = std::unique_ptr<Impl>;
+
+    explicit AsynchronousBoundedReadBuffer(
+        ImplPtr impl_,
+        IAsynchronousReader & reader_,
+        const ReadSettings & settings_,
+        AsyncReadCountersPtr async_read_counters_ = nullptr,
+        FilesystemReadPrefetchesLogPtr prefetches_log_ = nullptr);
+
+    ~AsynchronousBoundedReadBuffer() override;
+
+    String getFileName() const override { return impl->getFileName(); }
+
+    size_t getFileSize() override { return impl->getFileSize(); }
+
+    String getInfoForLog() override { return impl->getInfoForLog(); }
+
+    off_t seek(off_t offset_, int whence) override;
+
+    void prefetch(Priority priority) override;
+
+    void setReadUntilPosition(size_t position) override; /// [..., position).
+
+    void setReadUntilEnd() override { return setReadUntilPosition(getFileSize()); }
+
+    off_t getPosition() override { return file_offset_of_buffer_end - available() + bytes_to_ignore; }
+
+private:
+    const ImplPtr impl;
+    const ReadSettings read_settings;
+    IAsynchronousReader & reader;
+
+    size_t file_offset_of_buffer_end = 0;
+    std::optional<size_t> read_until_position;
+    /// If nonzero then working_buffer is empty.
+    /// If a prefetch is in flight, the prefetch task has been instructed to ignore this many bytes.
+    size_t bytes_to_ignore = 0;
+
+    Memory<> prefetch_buffer;
+    std::future<IAsynchronousReader::Result> prefetch_future;
+
+    const std::string query_id;
+    const std::string current_reader_id;
+
+    Poco::Logger * log;
+
+    AsyncReadCountersPtr async_read_counters;
+    FilesystemReadPrefetchesLogPtr prefetches_log;
+
+    struct LastPrefetchInfo
+    {
+        UInt64 submit_time = 0;
+        Priority priority;
+    };
+    LastPrefetchInfo last_prefetch_info;
+
+    bool nextImpl() override;
+
+    void finalize();
+
+    bool hasPendingDataToRead();
+
+    void appendToPrefetchLog(
+        FilesystemPrefetchState state,
+        int64_t size,
+        const std::unique_ptr<Stopwatch> & execution_watch);
+
+    std::future<IAsynchronousReader::Result> asyncReadInto(char * data, size_t size, Priority priority);
+
+    void resetPrefetch(FilesystemPrefetchState state);
+
+};
+
+}
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
deleted file mode 100644
index 8cb0e2826b4..00000000000
--- a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#pragma once
-
-#include "config.h"
-#include <IO/ReadBufferFromFile.h>
-#include <IO/AsynchronousReader.h>
-#include <IO/ReadSettings.h>
-#include <Interpreters/FilesystemReadPrefetchesLog.h>
-#include <utility>
-
-namespace Poco { class Logger; }
-
-namespace DB
-{
-
-class ReadBufferFromRemoteFSGather;
-
-/**
- * Reads data from S3/HDFS/Web using stored paths in metadata.
-* This class is an asynchronous version of ReadIndirectBufferFromRemoteFS.
-*
-* Buffers chain for diskS3:
-* AsynchronousIndirectReadBufferFromRemoteFS -> ReadBufferFromRemoteFS ->
-* -> ReadBufferFromS3 -> ReadBufferFromIStream.
-*
-* Buffers chain for diskWeb:
-* AsynchronousIndirectReadBufferFromRemoteFS -> ReadBufferFromRemoteFS ->
-* -> ReadIndirectBufferFromWebServer -> ReadBufferFromHTTP -> ReadBufferFromIStream.
-*
-* We pass either `memory` or `prefetch_buffer` through all this chain and return it back.
-*/
-class AsynchronousReadIndirectBufferFromRemoteFS : public ReadBufferFromFileBase
-{
-public:
-    explicit AsynchronousReadIndirectBufferFromRemoteFS(
-        IAsynchronousReader & reader_, const ReadSettings & settings_,
-        std::shared_ptr<ReadBufferFromRemoteFSGather> impl_,
-        size_t min_bytes_for_seek = DBMS_DEFAULT_BUFFER_SIZE);
-
-    ~AsynchronousReadIndirectBufferFromRemoteFS() override;
-
-    off_t seek(off_t offset_, int whence) override;
-
-    off_t getPosition() override { return file_offset_of_buffer_end - available(); }
-
-    String getFileName() const override;
-
-    void prefetch(int64_t priority) override;
-
-    void setReadUntilPosition(size_t position) override; /// [..., position).
-
-    void setReadUntilEnd() override;
-
-    String getInfoForLog() override;
-
-    size_t getFileSize() override;
-
-    bool isIntegratedWithFilesystemCache() const override { return true; }
-
-private:
-    bool nextImpl() override;
-
-    void finalize();
-
-    bool hasPendingDataToRead();
-
-    void appendToPrefetchLog(FilesystemPrefetchState state, int64_t size, const std::unique_ptr<Stopwatch> & execution_watch);
-
-    std::future<IAsynchronousReader::Result> asyncReadInto(char * data, size_t size, int64_t priority);
-
-    void resetPrefetch(FilesystemPrefetchState state);
-
-    ReadSettings read_settings;
-
-    IAsynchronousReader & reader;
-
-    int64_t base_priority;
-
-    std::shared_ptr<ReadBufferFromRemoteFSGather> impl;
-
-    std::future<IAsynchronousReader::Result> prefetch_future;
-
-    size_t file_offset_of_buffer_end = 0;
-
-    Memory<> prefetch_buffer;
-
-    size_t min_bytes_for_seek;
-
-    std::string query_id;
-
-    std::string current_reader_id;
-
-    size_t bytes_to_ignore = 0;
-
-    std::optional<size_t> read_until_position;
-
-    Poco::Logger * log;
-
-    struct LastPrefetchInfo
-    {
-        UInt64 submit_time = 0;
-        size_t priority = 0;
-    };
-    LastPrefetchInfo last_prefetch_info;
-};
-
-}
diff --git a/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp b/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
index 44a719c82bb..ae23405877d 100644
--- a/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
+++ b/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
@@ -1,11 +1,14 @@
 #include "CachedOnDiskReadBufferFromFile.h"
 
 #include <Disks/IO/createReadBufferFromFileBase.h>
+#include <Disks/ObjectStorages/Cached/CachedObjectStorage.h>
 #include <IO/ReadBufferFromFile.h>
 #include <base/scope_guard.h>
 #include <Common/assert_cast.h>
-#include <Common/hex.h>
+#include <IO/BoundedReadBuffer.h>
 #include <Common/getRandomASCIIString.h>
+#include <Common/logger_useful.h>
+#include <base/hex.h>
 #include <Interpreters/Context.h>
 
 
@@ -31,7 +34,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int CANNOT_SEEK_THROUGH_FILE;
-    extern const int CANNOT_USE_CACHE;
     extern const int LOGICAL_ERROR;
     extern const int ARGUMENT_OUT_OF_BOUND;
 }
@@ -46,8 +48,9 @@ CachedOnDiskReadBufferFromFile::CachedOnDiskReadBufferFromFile(
     size_t file_size_,
     bool allow_seeks_after_first_read_,
     bool use_external_buffer_,
-    std::optional<size_t> read_until_position_)
-    : ReadBufferFromFileBase(settings_.remote_fs_buffer_size, nullptr, 0, file_size_)
+    std::optional<size_t> read_until_position_,
+    std::shared_ptr<FilesystemCacheLog> cache_log_)
+    : ReadBufferFromFileBase(use_external_buffer_ ? 0 : settings_.remote_fs_buffer_size, nullptr, 0, file_size_)
 #ifndef NDEBUG
     , log(&Poco::Logger::get("CachedOnDiskReadBufferFromFile(" + source_file_path_ + ")"))
 #else
@@ -60,12 +63,12 @@ CachedOnDiskReadBufferFromFile::CachedOnDiskReadBufferFromFile(
     , read_until_position(read_until_position_ ? *read_until_position_ : file_size_)
     , implementation_buffer_creator(implementation_buffer_creator_)
     , query_id(query_id_)
-    , enable_logging(!query_id.empty() && settings_.enable_filesystem_cache_log)
     , current_buffer_id(getRandomASCIIString(8))
     , allow_seeks_after_first_read(allow_seeks_after_first_read_)
     , use_external_buffer(use_external_buffer_)
     , query_context_holder(cache_->getQueryContextHolder(query_id, settings_))
     , is_persistent(settings_.is_file_cache_persistent)
+    , cache_log(cache_log_)
 {
 }
 
@@ -101,7 +104,7 @@ void CachedOnDiskReadBufferFromFile::appendFilesystemCacheLog(
             break;
     }
 
-    if (auto cache_log = Context::getGlobalContextInstance()->getFilesystemCacheLog())
+    if (cache_log)
         cache_log->add(elem);
 }
 
@@ -114,27 +117,25 @@ void CachedOnDiskReadBufferFromFile::initialize(size_t offset, size_t size)
 
     if (settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache)
     {
-        file_segments_holder.emplace(cache->get(cache_key, offset, size));
+        file_segments = cache->get(cache_key, offset, size);
     }
     else
     {
         CreateFileSegmentSettings create_settings(is_persistent ? FileSegmentKind::Persistent : FileSegmentKind::Regular);
-        file_segments_holder.emplace(cache->getOrSet(cache_key, offset, size, create_settings));
+        file_segments = cache->getOrSet(cache_key, offset, size, create_settings);
     }
 
     /**
      * Segments in returned list are ordered in ascending order and represent a full contiguous
      * interval (no holes). Each segment in returned list has state: DOWNLOADED, DOWNLOADING or EMPTY.
      */
-    if (file_segments_holder->file_segments.empty())
+    if (file_segments->empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "List of file segments cannot be empty");
 
     LOG_TEST(
         log,
         "Having {} file segments to read: {}, current offset: {}",
-        file_segments_holder->file_segments.size(), file_segments_holder->toString(), file_offset_of_buffer_end);
-
-    current_file_segment_it = file_segments_holder->file_segments.begin();
+        file_segments->size(), file_segments->toString(), file_offset_of_buffer_end);
 
     initialized = true;
 }
@@ -150,6 +151,9 @@ CachedOnDiskReadBufferFromFile::getCacheReadBuffer(const FileSegment & file_segm
     /// Do not allow to use asynchronous version of LocalFSReadMethod.
     local_read_settings.local_fs_method = LocalFSReadMethod::pread;
 
+    if (use_external_buffer)
+        local_read_settings.local_fs_buffer_size = 0;
+
     auto buf = createReadBufferFromFileBase(path, local_read_settings);
 
     if (getFileSizeFromReadBuffer(*buf) == 0)
@@ -159,7 +163,7 @@ CachedOnDiskReadBufferFromFile::getCacheReadBuffer(const FileSegment & file_segm
 }
 
 CachedOnDiskReadBufferFromFile::ImplementationBufferPtr
-CachedOnDiskReadBufferFromFile::getRemoteFSReadBuffer(FileSegment & file_segment, ReadType read_type_)
+CachedOnDiskReadBufferFromFile::getRemoteReadBuffer(FileSegment & file_segment, ReadType read_type_)
 {
     switch (read_type_)
     {
@@ -175,7 +179,7 @@ CachedOnDiskReadBufferFromFile::getRemoteFSReadBuffer(FileSegment & file_segment
             *     [___________]         -- read_range_1 for query1
             *        [_______________]  -- read_range_2 for query2
             *     ^___________^______^
-            *     | segment1 | segment2
+            *     | segment1  | segment2
             *
             * So query2 can reuse implementation buffer, which downloaded segment1.
             * Implementation buffer from segment1 is passed to segment2 once segment1 is loaded.
@@ -185,15 +189,18 @@ CachedOnDiskReadBufferFromFile::getRemoteFSReadBuffer(FileSegment & file_segment
 
             if (!remote_fs_segment_reader)
             {
-                remote_fs_segment_reader = implementation_buffer_creator();
-
-                if (!remote_fs_segment_reader->supportsRightBoundedReads())
-                    throw Exception(
-                        ErrorCodes::CANNOT_USE_CACHE,
-                        "Cache cannot be used with a ReadBuffer which does not support right bounded reads");
+                auto impl = implementation_buffer_creator();
+                if (impl->supportsRightBoundedReads())
+                    remote_fs_segment_reader = std::move(impl);
+                else
+                    remote_fs_segment_reader = std::make_unique<BoundedReadBuffer>(std::move(impl));
 
                 file_segment.setRemoteFileReader(remote_fs_segment_reader);
             }
+            else
+            {
+                chassert(remote_fs_segment_reader->getFileOffsetOfBufferEnd() == file_segment.getCurrentWriteOffset(false));
+            }
 
             return remote_fs_segment_reader;
         }
@@ -229,27 +236,27 @@ bool CachedOnDiskReadBufferFromFile::canStartFromCache(size_t current_offset, co
     /// requested_range:    [__________]
     ///                     ^
     ///                     current_offset
-    size_t first_non_downloaded_offset = file_segment.getFirstNonDownloadedOffset();
+    size_t first_non_downloaded_offset = file_segment.getFirstNonDownloadedOffset(true);
     return first_non_downloaded_offset > current_offset;
 }
 
 CachedOnDiskReadBufferFromFile::ImplementationBufferPtr
-CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegmentPtr & file_segment)
+CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegment & file_segment)
 {
-    auto download_state = file_segment->state();
+    auto download_state = file_segment.state();
 
     if (settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache)
     {
         if (download_state == FileSegment::State::DOWNLOADED)
         {
             read_type = ReadType::CACHED;
-            return getCacheReadBuffer(*file_segment);
+            return getCacheReadBuffer(file_segment);
         }
         else
         {
             LOG_TEST(log, "Bypassing cache because `read_from_filesystem_cache_if_exists_otherwise_bypass_cache` option is used");
             read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
-            return getRemoteFSReadBuffer(*file_segment, read_type);
+            return getRemoteReadBuffer(file_segment, read_type);
         }
     }
 
@@ -257,15 +264,15 @@ CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegmentPtr & fil
     {
         switch (download_state)
         {
-            case FileSegment::State::SKIP_CACHE:
+            case FileSegment::State::DETACHED:
             {
-                LOG_TRACE(log, "Bypassing cache because file segment state is `SKIP_CACHE`");
+                LOG_TRACE(log, "Bypassing cache because file segment state is `DETACHED`");
                 read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
-                return getRemoteFSReadBuffer(*file_segment, read_type);
+                return getRemoteReadBuffer(file_segment, read_type);
             }
             case FileSegment::State::DOWNLOADING:
             {
-                if (canStartFromCache(file_offset_of_buffer_end, *file_segment))
+                if (canStartFromCache(file_offset_of_buffer_end, file_segment))
                 {
                     ///                      segment{k} state: DOWNLOADING
                     /// cache:           [______|___________
@@ -276,21 +283,21 @@ CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegmentPtr & fil
                     ///                     file_offset_of_buffer_end
 
                     read_type = ReadType::CACHED;
-                    return getCacheReadBuffer(*file_segment);
+                    return getCacheReadBuffer(file_segment);
                 }
 
-                download_state = file_segment->wait();
+                download_state = file_segment.wait(file_offset_of_buffer_end);
                 continue;
             }
             case FileSegment::State::DOWNLOADED:
             {
                 read_type = ReadType::CACHED;
-                return getCacheReadBuffer(*file_segment);
+                return getCacheReadBuffer(file_segment);
             }
             case FileSegment::State::EMPTY:
             case FileSegment::State::PARTIALLY_DOWNLOADED:
             {
-                if (canStartFromCache(file_offset_of_buffer_end, *file_segment))
+                if (canStartFromCache(file_offset_of_buffer_end, file_segment))
                 {
                     ///                      segment{k} state: PARTIALLY_DOWNLOADED
                     /// cache:           [______|___________
@@ -301,13 +308,13 @@ CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegmentPtr & fil
                     ///                     file_offset_of_buffer_end
 
                     read_type = ReadType::CACHED;
-                    return getCacheReadBuffer(*file_segment);
+                    return getCacheReadBuffer(file_segment);
                 }
 
-                auto downloader_id = file_segment->getOrSetDownloader();
-                if (downloader_id == file_segment->getCallerId())
+                auto downloader_id = file_segment.getOrSetDownloader();
+                if (downloader_id == file_segment.getCallerId())
                 {
-                    if (canStartFromCache(file_offset_of_buffer_end, *file_segment))
+                    if (canStartFromCache(file_offset_of_buffer_end, file_segment))
                     {
                         ///                      segment{k}
                         /// cache:           [______|___________
@@ -318,11 +325,12 @@ CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegmentPtr & fil
                         ///                     file_offset_of_buffer_end
 
                         read_type = ReadType::CACHED;
-                        file_segment->resetDownloader();
-                        return getCacheReadBuffer(*file_segment);
+                        file_segment.resetDownloader();
+                        return getCacheReadBuffer(file_segment);
                     }
 
-                    if (file_segment->getCurrentWriteOffset() < file_offset_of_buffer_end)
+                    auto current_write_offset = file_segment.getCurrentWriteOffset(false);
+                    if (current_write_offset < file_offset_of_buffer_end)
                     {
                         ///                   segment{1}
                         /// cache:         [_____|___________
@@ -332,25 +340,25 @@ CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegmentPtr & fil
                         ///                           ^
                         ///                           file_offset_of_buffer_end
 
-                        LOG_TEST(log, "Predownload. File segment info: {}", file_segment->getInfoForLog());
-                        chassert(file_offset_of_buffer_end > file_segment->getCurrentWriteOffset());
-                        bytes_to_predownload = file_offset_of_buffer_end - file_segment->getCurrentWriteOffset();
-                        chassert(bytes_to_predownload < file_segment->range().size());
+                        LOG_TEST(log, "Predownload. File segment info: {}", file_segment.getInfoForLog());
+                        chassert(file_offset_of_buffer_end > current_write_offset);
+                        bytes_to_predownload = file_offset_of_buffer_end - current_write_offset;
+                        chassert(bytes_to_predownload < file_segment.range().size());
                     }
 
                     read_type = ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE;
-                    return getRemoteFSReadBuffer(*file_segment, read_type);
+                    return getRemoteReadBuffer(file_segment, read_type);
                 }
 
-                download_state = file_segment->state();
+                download_state = file_segment.state();
                 continue;
             }
             case FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION:
             {
-                if (canStartFromCache(file_offset_of_buffer_end, *file_segment))
+                if (canStartFromCache(file_offset_of_buffer_end, file_segment))
                 {
                     read_type = ReadType::CACHED;
-                    return getCacheReadBuffer(*file_segment);
+                    return getCacheReadBuffer(file_segment);
                 }
                 else
                 {
@@ -358,7 +366,7 @@ CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegmentPtr & fil
                         log,
                         "Bypassing cache because file segment state is `PARTIALLY_DOWNLOADED_NO_CONTINUATION` and downloaded part already used");
                     read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
-                    return getRemoteFSReadBuffer(*file_segment, read_type);
+                    return getRemoteReadBuffer(file_segment, read_type);
                 }
             }
         }
@@ -366,12 +374,12 @@ CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegmentPtr & fil
 }
 
 CachedOnDiskReadBufferFromFile::ImplementationBufferPtr
-CachedOnDiskReadBufferFromFile::getImplementationBuffer(FileSegmentPtr & file_segment)
+CachedOnDiskReadBufferFromFile::getImplementationBuffer(FileSegment & file_segment)
 {
-    chassert(!file_segment->isDownloader());
-    chassert(file_offset_of_buffer_end >= file_segment->range().left);
+    chassert(!file_segment.isDownloader());
+    chassert(file_offset_of_buffer_end >= file_segment.range().left);
 
-    auto range = file_segment->range();
+    auto range = file_segment.range();
     bytes_to_predownload = 0;
 
     Stopwatch watch(CLOCK_MONOTONIC);
@@ -379,22 +387,24 @@ CachedOnDiskReadBufferFromFile::getImplementationBuffer(FileSegmentPtr & file_se
     auto read_buffer_for_file_segment = getReadBufferForFileSegment(file_segment);
 
     watch.stop();
+
+    LOG_TEST(
+        log,
+        "Current read type: {}, read offset: {}, impl read range: {}, file segment: {}",
+        toString(read_type),
+        file_offset_of_buffer_end,
+        read_buffer_for_file_segment->getFileOffsetOfBufferEnd(),
+        file_segment.getInfoForLog());
+
     current_file_segment_counters.increment(
         ProfileEvents::FileSegmentWaitReadBufferMicroseconds, watch.elapsedMicroseconds());
 
     [[maybe_unused]] auto download_current_segment = read_type == ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE;
-    chassert(download_current_segment == file_segment->isDownloader());
+    chassert(download_current_segment == file_segment.isDownloader());
 
-    chassert(file_segment->range() == range);
+    chassert(file_segment.range() == range);
     chassert(file_offset_of_buffer_end >= range.left && file_offset_of_buffer_end <= range.right);
 
-    LOG_TEST(
-        log,
-        "Current file segment: {}, read type: {}, current file offset: {}",
-        range.toString(),
-        toString(read_type),
-        file_offset_of_buffer_end);
-
     read_buffer_for_file_segment->setReadUntilPosition(range.right + 1); /// [..., range.right]
 
     switch (read_type)
@@ -435,87 +445,80 @@ CachedOnDiskReadBufferFromFile::getImplementationBuffer(FileSegmentPtr & file_se
         }
         case ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE:
         {
-            chassert(file_segment->isDownloader());
+            chassert(file_segment.isDownloader());
 
             if (bytes_to_predownload)
             {
-                size_t current_write_offset = file_segment->getCurrentWriteOffset();
+                const size_t current_write_offset = file_segment.getCurrentWriteOffset(false);
                 read_buffer_for_file_segment->seek(current_write_offset, SEEK_SET);
             }
             else
             {
                 read_buffer_for_file_segment->seek(file_offset_of_buffer_end, SEEK_SET);
 
-                assert(static_cast<size_t>(read_buffer_for_file_segment->getPosition()) == file_offset_of_buffer_end);
-                assert(static_cast<size_t>(read_buffer_for_file_segment->getFileOffsetOfBufferEnd()) == file_offset_of_buffer_end);
+                assert(read_buffer_for_file_segment->getFileOffsetOfBufferEnd() == file_offset_of_buffer_end);
             }
 
-            auto current_write_offset = file_segment->getCurrentWriteOffset();
+            const auto current_write_offset = file_segment.getCurrentWriteOffset(false);
             if (current_write_offset != static_cast<size_t>(read_buffer_for_file_segment->getPosition()))
             {
                 throw Exception(
                     ErrorCodes::LOGICAL_ERROR,
-                    "Buffer's offsets mismatch. Cached buffer offset: {}, current_write_offset: {} implementation buffer offset: {}, "
-                    "implementation buffer remaining range: {}, file segment info: {}",
-                    file_offset_of_buffer_end, current_write_offset, read_buffer_for_file_segment->getPosition(),
-                    read_buffer_for_file_segment->getRemainingReadRange().toString(), file_segment->getInfoForLog());
+                    "Buffer's offsets mismatch. Cached buffer offset: {}, current_write_offset: {}, implementation buffer position: {}, "
+                    "implementation buffer end position: {}, file segment info: {}",
+                    file_offset_of_buffer_end,
+                    current_write_offset,
+                    read_buffer_for_file_segment->getPosition(),
+                    read_buffer_for_file_segment->getFileOffsetOfBufferEnd(),
+                    file_segment.getInfoForLog());
             }
 
             break;
         }
     }
 
+    chassert(!read_buffer_for_file_segment->hasPendingData());
+
     return read_buffer_for_file_segment;
 }
 
 bool CachedOnDiskReadBufferFromFile::completeFileSegmentAndGetNext()
 {
-    LOG_TEST(log, "Completed segment: {}", (*current_file_segment_it)->range().toString());
+    auto * current_file_segment = &file_segments->front();
+    auto completed_range = current_file_segment->range();
 
-    if (enable_logging)
-        appendFilesystemCacheLog((*current_file_segment_it)->range(), read_type);
+    if (cache_log)
+        appendFilesystemCacheLog(completed_range, read_type);
 
-    auto file_segment_it = current_file_segment_it++;
-    auto & file_segment = *file_segment_it;
+    chassert(file_offset_of_buffer_end > completed_range.right);
 
-    [[maybe_unused]] const auto & range = file_segment->range();
-    chassert(file_offset_of_buffer_end > range.right);
-
-    LOG_TEST(
-        log,
-        "Removing file segment: {}, downloader: {}, state: {}",
-        file_segment->range().toString(),
-        file_segment->getDownloader(),
-        file_segment->state());
-
-    /// Do not hold pointer to file segment if it is not needed anymore
-    /// so can become releasable and can be evicted from cache.
-    file_segment->completeWithoutState();
-    file_segments_holder->file_segments.erase(file_segment_it);
-
-    if (current_file_segment_it == file_segments_holder->file_segments.end())
+    file_segments->popFront();
+    if (file_segments->empty())
         return false;
 
-    implementation_buffer = getImplementationBuffer(*current_file_segment_it);
+    current_file_segment = &file_segments->front();
+    current_file_segment->use();
+    implementation_buffer = getImplementationBuffer(*current_file_segment);
 
     if (read_type == ReadType::CACHED)
-        (*current_file_segment_it)->incrementHitsCount();
+        current_file_segment->incrementHitsCount();
+
+    LOG_TEST(
+        log, "New segment range: {}, old range: {}",
+        current_file_segment->range().toString(), completed_range.toString());
 
-    LOG_TEST(log, "New segment: {}", (*current_file_segment_it)->range().toString());
     return true;
 }
 
 CachedOnDiskReadBufferFromFile::~CachedOnDiskReadBufferFromFile()
 {
-    if (enable_logging
-        && file_segments_holder
-        && current_file_segment_it != file_segments_holder->file_segments.end())
+    if (cache_log && file_segments && !file_segments->empty())
     {
-        appendFilesystemCacheLog((*current_file_segment_it)->range(), read_type);
+        appendFilesystemCacheLog(file_segments->front().range(), read_type);
     }
 }
 
-void CachedOnDiskReadBufferFromFile::predownload(FileSegmentPtr & file_segment)
+void CachedOnDiskReadBufferFromFile::predownload(FileSegment & file_segment)
 {
     Stopwatch predownload_watch(CLOCK_MONOTONIC);
     SCOPE_EXIT({
@@ -534,9 +537,10 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegmentPtr & file_segment)
         /// download from offset a'' < a', but return buffer from offset a'.
         LOG_TEST(log, "Bytes to predownload: {}, caller_id: {}", bytes_to_predownload, FileSegment::getCallerId());
 
-        chassert(implementation_buffer->getFileOffsetOfBufferEnd() == file_segment->getCurrentWriteOffset());
-        size_t current_offset = file_segment->getCurrentWriteOffset();
-        const auto & current_range = file_segment->range();
+        /// chassert(implementation_buffer->getFileOffsetOfBufferEnd() == file_segment.getCurrentWriteOffset(false));
+        chassert(static_cast<size_t>(implementation_buffer->getPosition()) == file_segment.getCurrentWriteOffset(false));
+        size_t current_offset = file_segment.getCurrentWriteOffset(false);
+        const auto & current_range = file_segment.range();
 
         while (true)
         {
@@ -561,7 +565,7 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegmentPtr & file_segment)
                         "current download offset: {}, expected: {}, eof: {}",
                         bytes_to_predownload,
                         current_range.toString(),
-                        file_segment->getCurrentWriteOffset(),
+                        file_segment.getCurrentWriteOffset(false),
                         file_offset_of_buffer_end,
                         implementation_buffer->eof());
 
@@ -571,7 +575,7 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegmentPtr & file_segment)
                 {
                     nextimpl_working_buffer_offset = implementation_buffer->offset();
 
-                    auto current_write_offset = file_segment->getCurrentWriteOffset();
+                    auto current_write_offset = file_segment.getCurrentWriteOffset(false);
                     if (current_write_offset != static_cast<size_t>(implementation_buffer->getPosition())
                         || current_write_offset != file_offset_of_buffer_end)
                     {
@@ -583,7 +587,7 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegmentPtr & file_segment)
                             current_write_offset,
                             file_offset_of_buffer_end,
                             implementation_buffer->getPosition(),
-                            file_segment->getInfoForLog());
+                            file_segment.getInfoForLog());
                     }
                 }
 
@@ -595,15 +599,15 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegmentPtr & file_segment)
 
             ProfileEvents::increment(ProfileEvents::CachedReadBufferReadFromSourceBytes, current_impl_buffer_size);
 
-            bool continue_predownload = file_segment->reserve(current_predownload_size);
+            bool continue_predownload = file_segment.reserve(current_predownload_size);
             if (continue_predownload)
             {
                 LOG_TEST(log, "Left to predownload: {}, buffer size: {}", bytes_to_predownload, current_impl_buffer_size);
 
-                chassert(file_segment->getCurrentWriteOffset() == static_cast<size_t>(implementation_buffer->getPosition()));
+                chassert(file_segment.getCurrentWriteOffset(false) == static_cast<size_t>(implementation_buffer->getPosition()));
 
-                bool success = writeCache(implementation_buffer->buffer().begin(), current_predownload_size, current_offset, *file_segment);
-                if (success)
+                continue_predownload = writeCache(implementation_buffer->buffer().begin(), current_predownload_size, current_offset, file_segment);
+                if (continue_predownload)
                 {
                     current_offset += current_predownload_size;
 
@@ -613,7 +617,6 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegmentPtr & file_segment)
                 else
                 {
                     LOG_TEST(log, "Bypassing cache because writeCache (in predownload) method failed");
-                    continue_predownload = false;
                 }
             }
 
@@ -635,20 +638,21 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegmentPtr & file_segment)
                 /// TODO: allow seek more than once with seek avoiding.
 
                 bytes_to_predownload = 0;
-                file_segment->completeWithState(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
+                file_segment.completePartAndResetDownloader();
+                chassert(file_segment.state() == FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
 
-                LOG_TEST(log, "Bypassing cache because for {}", file_segment->getInfoForLog());
+                LOG_TEST(log, "Bypassing cache because for {}", file_segment.getInfoForLog());
 
                 read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
 
                 swap(*implementation_buffer);
                 resetWorkingBuffer();
 
-                implementation_buffer = getRemoteFSReadBuffer(*file_segment, read_type);
+                implementation_buffer = getRemoteReadBuffer(file_segment, read_type);
 
                 swap(*implementation_buffer);
 
-                implementation_buffer->setReadUntilPosition(file_segment->range().right + 1); /// [..., range.right]
+                implementation_buffer->setReadUntilPosition(file_segment.range().right + 1); /// [..., range.right]
                 implementation_buffer->seek(file_offset_of_buffer_end, SEEK_SET);
 
                 LOG_TRACE(
@@ -665,12 +669,12 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegmentPtr & file_segment)
 
 bool CachedOnDiskReadBufferFromFile::updateImplementationBufferIfNeeded()
 {
-    auto & file_segment = *current_file_segment_it;
-    auto current_read_range = file_segment->range();
-    auto current_state = file_segment->state();
+    auto & file_segment = file_segments->front();
+    const auto & current_read_range = file_segment.range();
+    auto current_state = file_segment.state();
 
     chassert(current_read_range.left <= file_offset_of_buffer_end);
-    chassert(!file_segment->isDownloader());
+    chassert(!file_segment.isDownloader());
 
     if (file_offset_of_buffer_end > current_read_range.right)
     {
@@ -689,7 +693,7 @@ bool CachedOnDiskReadBufferFromFile::updateImplementationBufferIfNeeded()
         ///                     ^
         ///                     file_offset_of_buffer_end
 
-        auto current_write_offset = file_segment->getCurrentWriteOffset();
+        auto current_write_offset = file_segment.getCurrentWriteOffset(true);
         bool cached_part_is_finished = current_write_offset == file_offset_of_buffer_end;
 
         LOG_TEST(log, "Current write offset: {}, file offset of buffer end: {}", current_write_offset, file_offset_of_buffer_end);
@@ -697,7 +701,7 @@ bool CachedOnDiskReadBufferFromFile::updateImplementationBufferIfNeeded()
         if (cached_part_is_finished)
         {
             /// TODO: makes sense to reuse local file reader if we return here with CACHED read type again?
-            implementation_buffer = getImplementationBuffer(*current_file_segment_it);
+            implementation_buffer = getImplementationBuffer(file_segment);
 
             return true;
         }
@@ -725,7 +729,7 @@ bool CachedOnDiskReadBufferFromFile::updateImplementationBufferIfNeeded()
         * to read by marks range given to him. Therefore, each nextImpl() call, in case of
         * READ_AND_PUT_IN_CACHE, starts with getOrSetDownloader().
         */
-        implementation_buffer = getImplementationBuffer(*current_file_segment_it);
+        implementation_buffer = getImplementationBuffer(file_segment);
     }
 
     return true;
@@ -776,37 +780,41 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
 {
     last_caller_id = FileSegment::getCallerId();
 
-    assertCorrectness();
-
     if (file_offset_of_buffer_end == read_until_position)
         return false;
 
     if (!initialized)
         initialize(file_offset_of_buffer_end, getTotalSizeToRead());
 
-    if (current_file_segment_it == file_segments_holder->file_segments.end())
+    if (file_segments->empty())
         return false;
 
+    bool implementation_buffer_can_be_reused = false;
     SCOPE_EXIT({
         try
         {
             /// Save state of current file segment before it is completed.
             nextimpl_step_log_info = getInfoForLog();
 
-            if (current_file_segment_it == file_segments_holder->file_segments.end())
+            if (file_segments->empty())
                 return;
 
-            auto & file_segment = *current_file_segment_it;
+            auto & file_segment = file_segments->front();
 
             bool download_current_segment = read_type == ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE;
             if (download_current_segment)
             {
-                bool need_complete_file_segment = file_segment->isDownloader();
+                bool need_complete_file_segment = file_segment.isDownloader();
                 if (need_complete_file_segment)
-                    file_segment->completePartAndResetDownloader();
+                {
+                    if (!implementation_buffer_can_be_reused)
+                        file_segment.resetRemoteFileReader();
+
+                    file_segment.completePartAndResetDownloader();
+                }
             }
 
-            chassert(!file_segment->isDownloader());
+            chassert(!file_segment.isDownloader());
         }
         catch (...)
         {
@@ -824,26 +832,30 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
     }
     else
     {
-        implementation_buffer = getImplementationBuffer(*current_file_segment_it);
+        implementation_buffer = getImplementationBuffer(file_segments->front());
 
         if (read_type == ReadType::CACHED)
-            (*current_file_segment_it)->incrementHitsCount();
+            file_segments->front().incrementHitsCount();
     }
 
     chassert(!internal_buffer.empty());
 
+    // Pass a valid external buffer for implementation_buffer to read into.
+    // We then take it back with another swap() after reading is done.
+    // (If we get an exception in between, we'll be left with an invalid internal_buffer. That's ok, as long as
+    // the caller doesn't try to use this CachedOnDiskReadBufferFromFile after it threw an exception.)
     swap(*implementation_buffer);
 
-    auto & file_segment = *current_file_segment_it;
-    auto current_read_range = file_segment->range();
+    auto & file_segment = file_segments->front();
+    const auto & current_read_range = file_segment.range();
 
     LOG_TEST(
         log,
-        "Current count: {}, position: {}, read range: {}, file segment: {}",
-        implementation_buffer->count(),
-        implementation_buffer->getPosition(),
-        implementation_buffer->getRemainingReadRange().toString(),
-        file_segment->getInfoForLog());
+        "Current read type: {}, read offset: {}, impl offset: {}, file segment: {}",
+        toString(read_type),
+        file_offset_of_buffer_end,
+        implementation_buffer->getFileOffsetOfBufferEnd(),
+        file_segment.getInfoForLog());
 
     chassert(current_read_range.left <= file_offset_of_buffer_end);
     chassert(current_read_range.right >= file_offset_of_buffer_end);
@@ -861,12 +873,12 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
     }
 
     auto download_current_segment = read_type == ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE;
-    if (download_current_segment != file_segment->isDownloader())
+    if (download_current_segment != file_segment.isDownloader())
     {
         throw Exception(
             ErrorCodes::LOGICAL_ERROR,
             "Incorrect segment state. Having read type: {}, file segment info: {}",
-            toString(read_type), file_segment->getInfoForLog());
+            toString(read_type), file_segment.getInfoForLog());
     }
 
     if (!result)
@@ -899,13 +911,16 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
         auto elapsed = watch.elapsedMicroseconds();
         current_file_segment_counters.increment(ProfileEvents::FileSegmentReadMicroseconds, elapsed);
 
+        // We don't support implementation_buffer implementations that use nextimpl_working_buffer_offset.
+        chassert(implementation_buffer->position() == implementation_buffer->buffer().begin());
+
         size = implementation_buffer->buffer().size();
 
         LOG_TEST(
             log,
-            "Read {} bytes, read type {}, position: {}, offset: {}, remaining read range: {}",
+            "Read {} bytes, read type {}, position: {}, offset: {}, segment end: {}",
             size, toString(read_type), implementation_buffer->getPosition(),
-            implementation_buffer->getFileOffsetOfBufferEnd(), implementation_buffer->getRemainingReadRange().toString());
+            implementation_buffer->getFileOffsetOfBufferEnd(), file_segment.range().right);
 
         if (read_type == ReadType::CACHED)
         {
@@ -921,41 +936,43 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
 
     if (result)
     {
+        bool download_current_segment_succeeded = false;
         if (download_current_segment)
         {
-            chassert(file_offset_of_buffer_end + size - 1 <= file_segment->range().right);
+            chassert(file_offset_of_buffer_end + size - 1 <= file_segment.range().right);
 
-            bool success = file_segment->reserve(size);
+            bool success = file_segment.reserve(size);
             if (success)
             {
-                chassert(file_segment->getCurrentWriteOffset() == static_cast<size_t>(implementation_buffer->getPosition()));
+                chassert(file_segment.getCurrentWriteOffset(false) == static_cast<size_t>(implementation_buffer->getPosition()));
 
-                success = writeCache(implementation_buffer->position(), size, file_offset_of_buffer_end, *file_segment);
+                success = writeCache(implementation_buffer->position(), size, file_offset_of_buffer_end, file_segment);
                 if (success)
                 {
-                    chassert(file_segment->getCurrentWriteOffset() <= file_segment->range().right + 1);
+                    chassert(file_segment.getCurrentWriteOffset(false) <= file_segment.range().right + 1);
                     chassert(
-                        std::next(current_file_segment_it) == file_segments_holder->file_segments.end()
-                        || file_segment->getCurrentWriteOffset() == implementation_buffer->getFileOffsetOfBufferEnd());
+                        /* last_file_segment */file_segments->size() == 1
+                        || file_segment.getCurrentWriteOffset(false) == implementation_buffer->getFileOffsetOfBufferEnd());
 
                     LOG_TEST(log, "Successfully written {} bytes", size);
+                    download_current_segment_succeeded = true;
+
+                    // The implementation_buffer is valid and positioned correctly (at file_segment->getCurrentWriteOffset()).
+                    // Later reads for this file segment can reuse it.
+                    // (It's reusable even if we don't reach the swap(*implementation_buffer) below,
+                    // because the reuser must assign implementation_buffer's buffer anyway.)
+                    implementation_buffer_can_be_reused = true;
                 }
                 else
-                {
-                    chassert(file_segment->state() == FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
                     LOG_TRACE(log, "Bypassing cache because writeCache method failed");
-                }
             }
             else
-            {
                 LOG_TRACE(log, "No space left in cache to reserve {} bytes, will continue without cache download", size);
-                file_segment->completeWithState(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
-            }
 
             if (!success)
             {
                 read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
-                download_current_segment = false;
+                chassert(file_segment.state() == FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
             }
         }
 
@@ -965,7 +982,7 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
         /// Therefore need to resize to a smaller size. And resize must be done after write into cache.
         /// - If last file segment was read from local fs, then we could read more than
         /// file_segemnt->range().right, so resize is also needed.
-        if (std::next(current_file_segment_it) == file_segments_holder->file_segments.end())
+        if (file_segments->size() == 1)
         {
             size_t remaining_size_to_read
                 = std::min(current_read_range.right, read_until_position - 1) - file_offset_of_buffer_end + 1;
@@ -975,24 +992,29 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
         }
 
         file_offset_of_buffer_end += size;
+
+        if (download_current_segment && download_current_segment_succeeded)
+            chassert(file_segment.getCurrentWriteOffset(false) >= file_offset_of_buffer_end);
+        chassert(file_offset_of_buffer_end <= read_until_position);
     }
 
     swap(*implementation_buffer);
 
     current_file_segment_counters.increment(ProfileEvents::FileSegmentUsedBytes, available());
 
+    // No necessary because of the SCOPE_EXIT above, but useful for logging below.
     if (download_current_segment)
-        file_segment->completePartAndResetDownloader();
+        file_segment.completePartAndResetDownloader();
 
-    chassert(!file_segment->isDownloader());
+    chassert(!file_segment.isDownloader());
 
     LOG_TEST(
         log,
         "Key: {}. Returning with {} bytes, buffer position: {} (offset: {}, predownloaded: {}), "
-        "buffer available: {}, current range: {}, current offset: {}, file segment state: {}, "
+        "buffer available: {}, current range: {}, file offset of buffer end: {}, impl offset: {}, file segment state: {}, "
         "current write offset: {}, read_type: {}, reading until position: {}, started with offset: {}, "
         "remaining ranges: {}",
-        getHexUIntLowercase(cache_key),
+        cache_key.toString(),
         working_buffer.size(),
         getPosition(),
         offset(),
@@ -1000,12 +1022,13 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
         available(),
         current_read_range.toString(),
         file_offset_of_buffer_end,
-        FileSegment::stateToString(file_segment->state()),
-        file_segment->getCurrentWriteOffset(),
+        implementation_buffer->getFileOffsetOfBufferEnd(),
+        FileSegment::stateToString(file_segment.state()),
+        file_segment.getCurrentWriteOffset(false),
         toString(read_type),
         read_until_position,
         first_offset,
-        file_segments_holder->toString());
+        file_segments->toString());
 
     if (size == 0 && file_offset_of_buffer_end < read_until_position)
     {
@@ -1024,7 +1047,7 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
             cache_file_size ? std::to_string(cache_file_size) : "None",
             cache_file_path,
             implementation_buffer->getFileOffsetOfBufferEnd(),
-            file_segment->getInfoForLog());
+            file_segment.getInfoForLog());
     }
 
     return result;
@@ -1072,13 +1095,13 @@ off_t CachedOnDiskReadBufferFromFile::seek(off_t offset, int whence)
     first_offset = file_offset_of_buffer_end = new_pos;
     resetWorkingBuffer();
 
-    // if (file_segments_holder && current_file_segment_it != file_segments_holder->file_segments.end())
+    // if (file_segments && current_file_segment_it != file_segments->file_segments.end())
     // {
-    //      auto & file_segments = file_segments_holder->file_segments;
+    //      auto & file_segments = file_segments->file_segments;
     //      LOG_TRACE(
     //          log,
     //          "Having {} file segments to read: {}, current offset: {}",
-    //          file_segments_holder->file_segments.size(), file_segments_holder->toString(), file_offset_of_buffer_end);
+    //          file_segments->file_segments.size(), file_segments->toString(), file_offset_of_buffer_end);
 
     //      auto it = std::upper_bound(
     //          file_segments.begin(),
@@ -1109,10 +1132,12 @@ off_t CachedOnDiskReadBufferFromFile::seek(off_t offset, int whence)
     //      }
     // }
 
-    file_segments_holder.reset();
+    file_segments.reset();
     implementation_buffer.reset();
     initialized = false;
 
+    LOG_TEST(log, "Reset state for seek to position {}", new_pos);
+
     return new_pos;
 }
 
@@ -1137,9 +1162,18 @@ void CachedOnDiskReadBufferFromFile::setReadUntilPosition(size_t position)
     if (!allow_seeks_after_first_read)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Method `setReadUntilPosition()` not allowed");
 
-    read_until_position = position;
-    initialized = false;
+    if (read_until_position == position)
+        return;
+
+    file_offset_of_buffer_end = getPosition();
+    resetWorkingBuffer();
+    file_segments.reset();
     implementation_buffer.reset();
+    initialized = false;
+
+    read_until_position = position;
+
+    LOG_TEST(log, "Set read_until_position to {}", read_until_position);
 }
 
 void CachedOnDiskReadBufferFromFile::setReadUntilEnd()
@@ -1152,51 +1186,29 @@ off_t CachedOnDiskReadBufferFromFile::getPosition()
     return file_offset_of_buffer_end - available();
 }
 
-std::optional<size_t> CachedOnDiskReadBufferFromFile::getLastNonDownloadedOffset() const
-{
-    if (!file_segments_holder)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "File segments holder not initialized");
-
-    const auto & file_segments = file_segments_holder->file_segments;
-    for (auto it = file_segments.rbegin(); it != file_segments.rend(); ++it)
-    {
-        const auto & file_segment = *it;
-        if (file_segment->state() != FileSegment::State::DOWNLOADED)
-            return file_segment->range().right;
-    }
-
-    return std::nullopt;
-}
-
 void CachedOnDiskReadBufferFromFile::assertCorrectness() const
 {
-    if (FileCache::isReadOnly()
+    if (!CachedObjectStorage::canUseReadThroughCache()
         && !settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache usage is not allowed (query_id: {})", query_id);
 }
 
 String CachedOnDiskReadBufferFromFile::getInfoForLog()
 {
-    String implementation_buffer_read_range_str;
-    if (implementation_buffer)
-        implementation_buffer_read_range_str = implementation_buffer->getRemainingReadRange().toString();
-    else
-        implementation_buffer_read_range_str = "None";
-
     String current_file_segment_info;
-    if (current_file_segment_it == file_segments_holder->file_segments.end())
-        current_file_segment_info = (*current_file_segment_it)->getInfoForLog();
-    else
+    if (file_segments->empty())
         current_file_segment_info = "None";
+    else
+        current_file_segment_info = file_segments->front().getInfoForLog();
 
     return fmt::format(
-        "Buffer path: {}, hash key: {}, file_offset_of_buffer_end: {}, "
-        "internal buffer remaining read range: {}, "
-        "read_type: {}, last caller: {}, file segment info: {}",
+        "Buffer path: {}, hash key: {}, file_offset_of_buffer_end: {}, read_until_position: {}, "
+        "internal buffer end: {}, read_type: {}, last caller: {}, file segment info: {}",
         source_file_path,
-        getHexUIntLowercase(cache_key),
+        cache_key.toString(),
         file_offset_of_buffer_end,
-        implementation_buffer_read_range_str,
+        read_until_position,
+        implementation_buffer ? std::to_string(implementation_buffer->getFileOffsetOfBufferEnd()) : "None",
         toString(read_type),
         last_caller_id,
         current_file_segment_info);
diff --git a/src/Disks/IO/CachedOnDiskReadBufferFromFile.h b/src/Disks/IO/CachedOnDiskReadBufferFromFile.h
index 14e8ea6c7e7..8faf23ad343 100644
--- a/src/Disks/IO/CachedOnDiskReadBufferFromFile.h
+++ b/src/Disks/IO/CachedOnDiskReadBufferFromFile.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Interpreters/Cache/FileCache.h>
-#include <Common/logger_useful.h>
 #include <IO/SeekableReadBuffer.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadSettings.h>
@@ -21,8 +20,7 @@ namespace DB
 class CachedOnDiskReadBufferFromFile : public ReadBufferFromFileBase
 {
 public:
-    using ImplementationBufferPtr = std::shared_ptr<ReadBufferFromFileBase>;
-    using ImplementationBufferCreator = std::function<ImplementationBufferPtr()>;
+    using ImplementationBufferCreator = std::function<std::unique_ptr<ReadBufferFromFileBase>()>;
 
     CachedOnDiskReadBufferFromFile(
         const String & source_file_path_,
@@ -34,7 +32,8 @@ public:
         size_t file_size_,
         bool allow_seeks_after_first_read_,
         bool use_external_buffer_,
-        std::optional<size_t> read_until_position_ = std::nullopt);
+        std::optional<size_t> read_until_position_,
+        std::shared_ptr<FilesystemCacheLog> cache_log_);
 
     ~CachedOnDiskReadBufferFromFile() override;
 
@@ -62,26 +61,31 @@ public:
     };
 
 private:
+    using ImplementationBufferPtr = std::shared_ptr<ReadBufferFromFileBase>;
+
     void initialize(size_t offset, size_t size);
+    void assertCorrectness() const;
 
-    ImplementationBufferPtr getImplementationBuffer(FileSegmentPtr & file_segment);
+    /**
+     * Return a list of file segments ordered in ascending order. This list represents
+     * a full contiguous interval (without holes).
+     */
+    FileSegmentsHolderPtr getFileSegments(size_t offset, size_t size) const;
 
-    ImplementationBufferPtr getReadBufferForFileSegment(FileSegmentPtr & file_segment);
+    ImplementationBufferPtr getImplementationBuffer(FileSegment & file_segment);
+
+    ImplementationBufferPtr getReadBufferForFileSegment(FileSegment & file_segment);
 
     ImplementationBufferPtr getCacheReadBuffer(const FileSegment & file_segment) const;
 
-    std::optional<size_t> getLastNonDownloadedOffset() const;
+    ImplementationBufferPtr getRemoteReadBuffer(FileSegment & file_segment, ReadType read_type_);
 
     bool updateImplementationBufferIfNeeded();
 
-    void predownload(FileSegmentPtr & file_segment);
+    void predownload(FileSegment & file_segment);
 
     bool nextImplStep();
 
-    void assertCorrectness() const;
-
-    std::shared_ptr<ReadBufferFromFileBase> getRemoteFSReadBuffer(FileSegment & file_segment, ReadType read_type_);
-
     size_t getTotalSizeToRead();
 
     bool completeFileSegmentAndGetNext();
@@ -108,8 +112,7 @@ private:
     /// Remote read buffer, which can only be owned by current buffer.
     FileSegment::RemoteFileReaderPtr remote_file_reader;
 
-    std::optional<FileSegmentsHolder> file_segments_holder;
-    FileSegments::iterator current_file_segment_it;
+    FileSegmentsHolderPtr file_segments;
 
     ImplementationBufferPtr implementation_buffer;
     bool initialized = false;
@@ -135,7 +138,6 @@ private:
     String last_caller_id;
 
     String query_id;
-    bool enable_logging = false;
     String current_buffer_id;
 
     bool allow_seeks_after_first_read;
@@ -143,9 +145,11 @@ private:
     CurrentMetrics::Increment metric_increment{CurrentMetrics::FilesystemCacheReadBuffers};
     ProfileEvents::Counters current_file_segment_counters;
 
-    FileCache::QueryContextHolder query_context_holder;
+    FileCache::QueryContextHolderPtr query_context_holder;
 
     bool is_persistent;
+
+    std::shared_ptr<FilesystemCacheLog> cache_log;
 };
 
 }
diff --git a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
index 169bbfac886..9153af90312 100644
--- a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
+++ b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
@@ -50,27 +50,29 @@ bool FileSegmentRangeWriter::write(const char * data, size_t size, size_t offset
             offset, expected_write_offset);
     }
 
-    auto & file_segments = file_segments_holder.file_segments;
+    FileSegment * file_segment;
 
-    if (file_segments.empty() || file_segments.back()->isDownloaded())
+    if (file_segments.empty() || file_segments.back().isDownloaded())
     {
-        allocateFileSegment(expected_write_offset, segment_kind);
+        file_segment = &allocateFileSegment(expected_write_offset, segment_kind);
+    }
+    else
+    {
+        file_segment = &file_segments.back();
     }
 
-    auto & file_segment = file_segments.back();
-
     SCOPE_EXIT({
-        if (file_segments.back()->isDownloader())
-            file_segments.back()->completePartAndResetDownloader();
+        if (file_segments.back().isDownloader())
+            file_segments.back().completePartAndResetDownloader();
     });
 
     while (size > 0)
     {
-        size_t available_size = file_segment->range().size() - file_segment->getDownloadedSize();
+        size_t available_size = file_segment->range().size() - file_segment->getDownloadedSize(false);
         if (available_size == 0)
         {
             completeFileSegment(*file_segment);
-            file_segment = allocateFileSegment(expected_write_offset, segment_kind);
+            file_segment = &allocateFileSegment(expected_write_offset, segment_kind);
             continue;
         }
 
@@ -86,7 +88,6 @@ bool FileSegmentRangeWriter::write(const char * data, size_t size, size_t offset
         bool reserved = file_segment->reserve(size_to_write);
         if (!reserved)
         {
-            file_segment->completeWithState(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
             appendFilesystemCacheLog(*file_segment);
 
             LOG_DEBUG(
@@ -113,11 +114,10 @@ void FileSegmentRangeWriter::finalize()
     if (finalized)
         return;
 
-    auto & file_segments = file_segments_holder.file_segments;
     if (file_segments.empty())
         return;
 
-    completeFileSegment(*file_segments.back());
+    completeFileSegment(file_segments.back());
     finalized = true;
 }
 
@@ -134,49 +134,46 @@ FileSegmentRangeWriter::~FileSegmentRangeWriter()
     }
 }
 
-FileSegmentPtr & FileSegmentRangeWriter::allocateFileSegment(size_t offset, FileSegmentKind segment_kind)
+FileSegment & FileSegmentRangeWriter::allocateFileSegment(size_t offset, FileSegmentKind segment_kind)
 {
     /**
     * Allocate a new file segment starting `offset`.
     * File segment capacity will equal `max_file_segment_size`, but actual size is 0.
     */
 
-    std::lock_guard cache_lock(cache->mutex);
-
-    CreateFileSegmentSettings create_settings(segment_kind);
+    CreateFileSegmentSettings create_settings(segment_kind, false);
 
     /// We set max_file_segment_size to be downloaded,
     /// if we have less size to write, file segment will be resized in complete() method.
-    auto file_segment = cache->createFileSegmentForDownload(
-        key, offset, cache->max_file_segment_size, create_settings, cache_lock);
-
-    auto & file_segments = file_segments_holder.file_segments;
-    return *file_segments.insert(file_segments.end(), file_segment);
+    auto holder = cache->set(key, offset, cache->getMaxFileSegmentSize(), create_settings);
+    chassert(holder->size() == 1);
+    holder->moveTo(file_segments);
+    return file_segments.back();
 }
 
 void FileSegmentRangeWriter::appendFilesystemCacheLog(const FileSegment & file_segment)
 {
-    if (cache_log)
+    if (!cache_log)
+        return;
+
+    auto file_segment_range = file_segment.range();
+    size_t file_segment_right_bound = file_segment_range.left + file_segment.getDownloadedSize(false) - 1;
+
+    FilesystemCacheLogElement elem
     {
-        auto file_segment_range = file_segment.range();
-        size_t file_segment_right_bound = file_segment_range.left + file_segment.getDownloadedSize() - 1;
+        .event_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()),
+        .query_id = query_id,
+        .source_file_path = source_path,
+        .file_segment_range = { file_segment_range.left, file_segment_right_bound },
+        .requested_range = {},
+        .cache_type = FilesystemCacheLogElement::CacheType::WRITE_THROUGH_CACHE,
+        .file_segment_size = file_segment_range.size(),
+        .read_from_cache_attempted = false,
+        .read_buffer_id = {},
+        .profile_counters = nullptr,
+    };
 
-        FilesystemCacheLogElement elem
-        {
-            .event_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()),
-            .query_id = query_id,
-            .source_file_path = source_path,
-            .file_segment_range = { file_segment_range.left, file_segment_right_bound },
-            .requested_range = {},
-            .cache_type = FilesystemCacheLogElement::CacheType::WRITE_THROUGH_CACHE,
-            .file_segment_size = file_segment_range.size(),
-            .read_from_cache_attempted = false,
-            .read_buffer_id = {},
-            .profile_counters = nullptr,
-        };
-
-        cache_log->add(elem);
-    }
+    cache_log->add(elem);
 }
 
 void FileSegmentRangeWriter::completeFileSegment(FileSegment & file_segment)
@@ -185,7 +182,7 @@ void FileSegmentRangeWriter::completeFileSegment(FileSegment & file_segment)
     if (file_segment.isDetached() || file_segment.isCompleted())
         return;
 
-    file_segment.completeWithoutState();
+    file_segment.complete();
     appendFilesystemCacheLog(file_segment);
 }
 
@@ -214,24 +211,26 @@ void CachedOnDiskWriteBufferFromFile::nextImpl()
 {
     size_t size = offset();
 
+    /// Write data to cache.
+    cacheData(working_buffer.begin(), size, throw_on_error_from_cache);
+    current_download_offset += size;
+
     try
     {
         SwapHelper swap(*this, *impl);
         /// Write data to the underlying buffer.
+        /// Actually here WriteBufferFromFileDecorator::nextImpl has to be called, but it is pivate method.
+        /// In particular WriteBufferFromFileDecorator introduces logic with swaps in order to achieve delegation.
         impl->next();
     }
     catch (...)
     {
         /// If something was already written to cache, remove it.
         cache_writer.reset();
-        cache->removeIfExists(key);
+        cache->removeKeyIfExists(key);
 
         throw;
     }
-
-    /// Write data to cache.
-    cacheData(working_buffer.begin(), size, throw_on_error_from_cache);
-    current_download_offset += size;
 }
 
 void CachedOnDiskWriteBufferFromFile::cacheData(char * data, size_t size, bool throw_on_error)
@@ -295,8 +294,7 @@ void CachedOnDiskWriteBufferFromFile::finalizeImpl()
 {
     try
     {
-        SwapHelper swap(*this, *impl);
-        impl->finalize();
+        WriteBufferFromFileDecorator::finalizeImpl();
     }
     catch (...)
     {
diff --git a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h
index 834e584c8db..194afe88d88 100644
--- a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h
+++ b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h
@@ -39,7 +39,7 @@ public:
     ~FileSegmentRangeWriter();
 
 private:
-    FileSegmentPtr & allocateFileSegment(size_t offset, FileSegmentKind segment_kind);
+    FileSegment & allocateFileSegment(size_t offset, FileSegmentKind segment_kind);
 
     void appendFilesystemCacheLog(const FileSegment & file_segment);
 
@@ -53,7 +53,7 @@ private:
     String query_id;
     String source_path;
 
-    FileSegmentsHolder file_segments_holder{};
+    FileSegmentsHolder file_segments{};
 
     size_t expected_write_offset = 0;
 
diff --git a/src/Disks/IO/IOUringReader.cpp b/src/Disks/IO/IOUringReader.cpp
index 7bf1982d515..7b68e0ee2de 100644
--- a/src/Disks/IO/IOUringReader.cpp
+++ b/src/Disks/IO/IOUringReader.cpp
@@ -1,15 +1,16 @@
 #include "IOUringReader.h"
+#include <memory>
 
 #if USE_LIBURING
 
 #include <base/errnoToString.h>
 #include <Common/assert_cast.h>
-#include <Common/Exception.h>
 #include <Common/MemorySanitizer.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Stopwatch.h>
 #include <Common/setThreadName.h>
+#include <Common/ThreadPool.h>
 #include <Common/logger_useful.h>
 #include <future>
 
@@ -44,7 +45,7 @@ namespace ErrorCodes
 }
 
 IOUringReader::IOUringReader(uint32_t entries_)
- : log(&Poco::Logger::get("IOUringReader"))
+    : log(&Poco::Logger::get("IOUringReader"))
 {
     struct io_uring_probe * probe = io_uring_get_probe();
     if (!probe)
@@ -70,7 +71,7 @@ IOUringReader::IOUringReader(uint32_t entries_)
         throwFromErrno("Failed initializing io_uring", ErrorCodes::IO_URING_INIT_FAILED, -ret);
 
     cq_entries = params.cq_entries;
-    ring_completion_monitor = ThreadFromGlobalPool([this] { monitorRing(); });
+    ring_completion_monitor = std::make_unique<ThreadFromGlobalPool>([this] { monitorRing(); });
 }
 
 std::future<IAsynchronousReader::Result> IOUringReader::submit(Request request)
@@ -333,7 +334,7 @@ IOUringReader::~IOUringReader()
         io_uring_submit(&ring);
     }
 
-    ring_completion_monitor.join();
+    ring_completion_monitor->join();
 
     io_uring_queue_exit(&ring);
 }
diff --git a/src/Disks/IO/IOUringReader.h b/src/Disks/IO/IOUringReader.h
index e3fcf116448..9b80ac6e5e0 100644
--- a/src/Disks/IO/IOUringReader.h
+++ b/src/Disks/IO/IOUringReader.h
@@ -4,15 +4,20 @@
 
 #if USE_LIBURING
 
-#include <Common/ThreadPool.h>
+#include <Common/Exception.h>
+#include <Common/ThreadPool_fwd.h>
 #include <IO/AsynchronousReader.h>
 #include <deque>
 #include <unordered_map>
 #include <liburing.h>
 
+namespace Poco { class Logger; }
+
 namespace DB
 {
 
+class Exception;
+
 /** Perform reads using the io_uring Linux subsystem.
   *
   * The class sets up a single io_uring that clients submit read requests to, they are
@@ -30,7 +35,7 @@ private:
     uint32_t cq_entries;
 
     std::atomic<bool> cancelled{false};
-    ThreadFromGlobalPool ring_completion_monitor;
+    std::unique_ptr<ThreadFromGlobalPool> ring_completion_monitor;
 
     struct EnqueuedRequest
     {
@@ -74,7 +79,7 @@ public:
 
     void wait() override {}
 
-    virtual ~IOUringReader() override;
+    ~IOUringReader() override;
 };
 
 }
diff --git a/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp b/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
index 47d9cd83fd9..0f197c2ff06 100644
--- a/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
+++ b/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
@@ -54,14 +54,6 @@ ReadBufferFromAzureBlobStorage::ReadBufferFromAzureBlobStorage(
     }
 }
 
-SeekableReadBuffer::Range ReadBufferFromAzureBlobStorage::getRemainingReadRange() const
-{
-    return Range{
-        .left = static_cast<size_t>(offset),
-        .right = read_until_position ? std::optional{read_until_position - 1} : std::nullopt
-    };
-}
-
 void ReadBufferFromAzureBlobStorage::setReadUntilPosition(size_t position)
 {
     read_until_position = position;
diff --git a/src/Disks/IO/ReadBufferFromAzureBlobStorage.h b/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
index 711b4ce23f7..6164a005773 100644
--- a/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
+++ b/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
@@ -38,8 +38,6 @@ public:
 
     void setReadUntilPosition(size_t position) override;
 
-    Range getRemainingReadRange() const override;
-
     bool supportsRightBoundedReads() const override { return true; }
 
 private:
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
index 43b6544acb0..12fbbbcf747 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
@@ -3,37 +3,36 @@
 #include <IO/SeekableReadBuffer.h>
 
 #include <Disks/IO/CachedOnDiskReadBufferFromFile.h>
+#include <Disks/ObjectStorages/Cached/CachedObjectStorage.h>
 #include <Common/logger_useful.h>
+#include <IO/SwapHelper.h>
 #include <iostream>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Interpreters/FilesystemCacheLog.h>
-#include <Interpreters/Context.h>
 
 
 namespace DB
 {
-
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
+    extern const int CANNOT_SEEK_THROUGH_FILE;
 }
 
 ReadBufferFromRemoteFSGather::ReadBufferFromRemoteFSGather(
     ReadBufferCreator && read_buffer_creator_,
     const StoredObjects & blobs_to_read_,
-    const ReadSettings & settings_)
-    : ReadBuffer(nullptr, 0)
-    , read_buffer_creator(std::move(read_buffer_creator_))
-    , blobs_to_read(blobs_to_read_)
+    const ReadSettings & settings_,
+    std::shared_ptr<FilesystemCacheLog> cache_log_)
+    : ReadBufferFromFileBase(0, nullptr, 0)
     , settings(settings_)
+    , blobs_to_read(blobs_to_read_)
+    , read_buffer_creator(std::move(read_buffer_creator_))
+    , cache_log(settings.enable_filesystem_cache_log ? cache_log_ : nullptr)
     , query_id(CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() != nullptr ? CurrentThread::getQueryId() : "")
     , log(&Poco::Logger::get("ReadBufferFromRemoteFSGather"))
-    , enable_cache_log(!query_id.empty() && settings.enable_filesystem_cache_log)
 {
-    if (blobs_to_read.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read zero number of objects");
-
-    current_object = blobs_to_read.front();
+    if (!blobs_to_read.empty())
+        current_object = blobs_to_read.front();
 
     with_cache = settings.remote_fs_cache
         && settings.enable_filesystem_cache
@@ -42,21 +41,20 @@ ReadBufferFromRemoteFSGather::ReadBufferFromRemoteFSGather(
 
 SeekableReadBufferPtr ReadBufferFromRemoteFSGather::createImplementationBuffer(const StoredObject & object)
 {
-    if (current_buf != nullptr && !with_cache && enable_cache_log)
+    if (current_buf && !with_cache)
     {
-        appendFilesystemCacheLog();
+        appendUncachedReadInfo();
     }
 
     current_object = object;
-    total_bytes_read_from_current_file = 0;
-    const auto & object_path = object.absolute_path;
+    const auto & object_path = object.remote_path;
 
     size_t current_read_until_position = read_until_position ? read_until_position : object.bytes_size;
     auto current_read_buffer_creator = [=, this]() { return read_buffer_creator(object_path, current_read_until_position); };
 
     if (with_cache)
     {
-        auto cache_key = settings.remote_fs_cache->hash(object_path);
+        auto cache_key = settings.remote_fs_cache->createKeyForPath(object_path);
         return std::make_shared<CachedOnDiskReadBufferFromFile>(
             object_path,
             cache_key,
@@ -67,28 +65,29 @@ SeekableReadBufferPtr ReadBufferFromRemoteFSGather::createImplementationBuffer(c
             object.bytes_size,
             /* allow_seeks */false,
             /* use_external_buffer */true,
-            read_until_position ? std::optional<size_t>(read_until_position) : std::nullopt);
+            read_until_position ? std::optional<size_t>(read_until_position) : std::nullopt,
+            cache_log);
     }
 
     return current_read_buffer_creator();
 }
 
-void ReadBufferFromRemoteFSGather::appendFilesystemCacheLog()
+void ReadBufferFromRemoteFSGather::appendUncachedReadInfo()
 {
-    chassert(!current_object.absolute_path.empty());
+    if (!cache_log || current_object.remote_path.empty())
+        return;
+
     FilesystemCacheLogElement elem
     {
         .event_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()),
         .query_id = query_id,
-        .source_file_path = current_object.absolute_path,
+        .source_file_path = current_object.remote_path,
         .file_segment_range = { 0, current_object.bytes_size },
         .cache_type = FilesystemCacheLogElement::CacheType::READ_FROM_FS_BYPASSING_CACHE,
-        .file_segment_size = total_bytes_read_from_current_file,
+        .file_segment_size = current_object.bytes_size,
         .read_from_cache_attempted = false,
     };
-
-    if (auto cache_log = Context::getGlobalContextInstance()->getFilesystemCacheLog())
-        cache_log->add(elem);
+    cache_log->add(elem);
 }
 
 IAsynchronousReader::Result ReadBufferFromRemoteFSGather::readInto(char * data, size_t size, size_t offset, size_t ignore)
@@ -102,9 +101,7 @@ IAsynchronousReader::Result ReadBufferFromRemoteFSGather::readInto(char * data,
     file_offset_of_buffer_end = offset;
     bytes_to_ignore = ignore;
 
-    assert(!bytes_to_ignore || initialized());
-
-    auto result = nextImpl();
+    const auto result = nextImpl();
 
     if (result)
         return { working_buffer.size(), BufferBase::offset(), nullptr };
@@ -114,6 +111,9 @@ IAsynchronousReader::Result ReadBufferFromRemoteFSGather::readInto(char * data,
 
 void ReadBufferFromRemoteFSGather::initialize()
 {
+    if (blobs_to_read.empty())
+        return;
+
     /// One clickhouse file can be split into multiple files in remote fs.
     auto current_buf_offset = file_offset_of_buffer_end;
     for (size_t i = 0; i < blobs_to_read.size(); ++i)
@@ -122,6 +122,8 @@ void ReadBufferFromRemoteFSGather::initialize()
 
         if (object.bytes_size > current_buf_offset)
         {
+            LOG_TEST(log, "Reading from file: {} ({})", object.remote_path, object.local_path);
+
             /// Do not create a new buffer if we already have what we need.
             if (!current_buf || current_buf_idx != i)
             {
@@ -145,21 +147,14 @@ bool ReadBufferFromRemoteFSGather::nextImpl()
     if (!current_buf)
         initialize();
 
-    /// If current buffer has remaining data - use it.
-    if (current_buf)
-    {
-        if (readImpl())
-            return true;
-    }
-    else
-    {
+    if (!current_buf)
         return false;
-    }
+
+    if (readImpl())
+        return true;
 
     if (!moveToNextBuffer())
-    {
         return false;
-    }
 
     return readImpl();
 }
@@ -173,6 +168,7 @@ bool ReadBufferFromRemoteFSGather::moveToNextBuffer()
     ++current_buf_idx;
 
     const auto & object = blobs_to_read[current_buf_idx];
+    LOG_TEST(log, "Reading from next file: {} ({})", object.remote_path, object.local_path);
     current_buf = createImplementationBuffer(object);
 
     return true;
@@ -180,7 +176,7 @@ bool ReadBufferFromRemoteFSGather::moveToNextBuffer()
 
 bool ReadBufferFromRemoteFSGather::readImpl()
 {
-    swap(*current_buf);
+    SwapHelper swap(*this, *current_buf);
 
     bool result = false;
 
@@ -191,7 +187,6 @@ bool ReadBufferFromRemoteFSGather::readImpl()
      */
     if (bytes_to_ignore)
     {
-        total_bytes_read_from_current_file += bytes_to_ignore;
         current_buf->ignore(bytes_to_ignore);
         result = current_buf->hasPendingData();
         file_offset_of_buffer_end += bytes_to_ignore;
@@ -211,57 +206,41 @@ bool ReadBufferFromRemoteFSGather::readImpl()
         file_offset_of_buffer_end += current_buf->available();
     }
 
-    swap(*current_buf);
-
     /// Required for non-async reads.
     if (result)
     {
-        assert(available());
-        nextimpl_working_buffer_offset = offset();
-        total_bytes_read_from_current_file += available();
+        assert(current_buf->available());
+        nextimpl_working_buffer_offset = current_buf->offset();
     }
 
     return result;
 }
 
-size_t ReadBufferFromRemoteFSGather::getFileOffsetOfBufferEnd() const
-{
-    return file_offset_of_buffer_end;
-}
-
 void ReadBufferFromRemoteFSGather::setReadUntilPosition(size_t position)
 {
-    if (position != read_until_position)
-    {
-        read_until_position = position;
-        reset();
-    }
+    if (position == read_until_position)
+        return;
+
+    reset();
+    read_until_position = position;
 }
 
 void ReadBufferFromRemoteFSGather::reset()
 {
+    current_object = {};
+    current_buf_idx = {};
     current_buf.reset();
+    bytes_to_ignore = 0;
 }
 
-String ReadBufferFromRemoteFSGather::getFileName() const
+off_t ReadBufferFromRemoteFSGather::seek(off_t offset, int whence)
 {
-    return current_object.absolute_path;
-}
+    if (whence != SEEK_SET)
+        throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Only seeking with SEEK_SET is allowed");
 
-size_t ReadBufferFromRemoteFSGather::getFileSize() const
-{
-    size_t size = 0;
-    for (const auto & object : blobs_to_read)
-        size += object.bytes_size;
-    return size;
-}
-
-String ReadBufferFromRemoteFSGather::getInfoForLog()
-{
-    if (!current_buf)
-        return "";
-
-    return current_buf->getInfoForLog();
+    reset();
+    file_offset_of_buffer_end = offset;
+    return file_offset_of_buffer_end;
 }
 
 size_t ReadBufferFromRemoteFSGather::getImplementationBufferOffset() const
@@ -274,10 +253,8 @@ size_t ReadBufferFromRemoteFSGather::getImplementationBufferOffset() const
 
 ReadBufferFromRemoteFSGather::~ReadBufferFromRemoteFSGather()
 {
-    if (!with_cache && enable_cache_log)
-    {
-        appendFilesystemCacheLog();
-    }
+    if (!with_cache)
+        appendUncachedReadInfo();
 }
 
 }
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.h b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
index abe57647a48..39b81d6f9ac 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.h
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
@@ -10,44 +10,46 @@ namespace Poco { class Logger; }
 
 namespace DB
 {
+class FilesystemCacheLog;
 
 /**
  * Remote disk might need to split one clickhouse file into multiple files in remote fs.
  * This class works like a proxy to allow transition from one file into multiple.
  */
-class ReadBufferFromRemoteFSGather final : public ReadBuffer
+class ReadBufferFromRemoteFSGather final : public ReadBufferFromFileBase
 {
 friend class ReadIndirectBufferFromRemoteFS;
 
 public:
-    using ReadBufferCreator = std::function<std::shared_ptr<ReadBufferFromFileBase>(const std::string & path, size_t read_until_position)>;
+    using ReadBufferCreator = std::function<std::unique_ptr<ReadBufferFromFileBase>(const std::string & path, size_t read_until_position)>;
 
     ReadBufferFromRemoteFSGather(
         ReadBufferCreator && read_buffer_creator_,
         const StoredObjects & blobs_to_read_,
-        const ReadSettings & settings_);
+        const ReadSettings & settings_,
+        std::shared_ptr<FilesystemCacheLog> cache_log_);
 
     ~ReadBufferFromRemoteFSGather() override;
 
-    String getFileName() const;
+    String getFileName() const override { return current_object.remote_path; }
 
-    void reset();
+    String getInfoForLog() override { return current_buf ? current_buf->getInfoForLog() : ""; }
 
     void setReadUntilPosition(size_t position) override;
 
     IAsynchronousReader::Result readInto(char * data, size_t size, size_t offset, size_t ignore) override;
 
-    size_t getFileSize() const;
+    size_t getFileSize() override { return getTotalSize(blobs_to_read); }
 
-    size_t getFileOffsetOfBufferEnd() const;
+    size_t getFileOffsetOfBufferEnd() const override { return file_offset_of_buffer_end; }
 
     bool initialized() const { return current_buf != nullptr; }
 
-    String getInfoForLog();
-
     size_t getImplementationBufferOffset() const;
 
-    const StoredObject & getCurrentObject() const { return current_object; }
+    off_t seek(off_t offset, int whence) override;
+
+    off_t getPosition() override { return file_offset_of_buffer_end - available() + bytes_to_ignore; }
 
 private:
     SeekableReadBufferPtr createImplementationBuffer(const StoredObject & object);
@@ -60,40 +62,26 @@ private:
 
     bool moveToNextBuffer();
 
-    void appendFilesystemCacheLog();
+    void appendUncachedReadInfo();
 
-    ReadBufferCreator read_buffer_creator;
-
-    StoredObjects blobs_to_read;
-
-    ReadSettings settings;
-
-    size_t read_until_position = 0;
-
-    StoredObject current_object;
+    void reset();
 
+    const ReadSettings settings;
+    const StoredObjects blobs_to_read;
+    const ReadBufferCreator read_buffer_creator;
+    const std::shared_ptr<FilesystemCacheLog> cache_log;
+    const String query_id;
     bool with_cache;
 
-    String query_id;
-
-    Poco::Logger * log;
-
-    SeekableReadBufferPtr current_buf;
-
-    size_t current_buf_idx = 0;
-
+    size_t read_until_position = 0;
     size_t file_offset_of_buffer_end = 0;
-
-    /**
-     * File:                        |___________________|
-     * Buffer:                            |~~~~~~~|
-     * file_offset_of_buffer_end:                 ^
-     */
     size_t bytes_to_ignore = 0;
 
-    size_t total_bytes_read_from_current_file = 0;
+    StoredObject current_object;
+    size_t current_buf_idx = 0;
+    SeekableReadBufferPtr current_buf;
 
-    bool enable_cache_log = false;
+    Poco::Logger * log;
 };
 
 }
diff --git a/src/Disks/IO/ReadBufferFromWebServer.cpp b/src/Disks/IO/ReadBufferFromWebServer.cpp
index 04f9ce7d53e..1f4818c8cb9 100644
--- a/src/Disks/IO/ReadBufferFromWebServer.cpp
+++ b/src/Disks/IO/ReadBufferFromWebServer.cpp
@@ -41,18 +41,15 @@ ReadBufferFromWebServer::ReadBufferFromWebServer(
 std::unique_ptr<ReadBuffer> ReadBufferFromWebServer::initialize()
 {
     Poco::URI uri(url);
-    ReadWriteBufferFromHTTP::Range range;
     if (read_until_position)
     {
         if (read_until_position < offset)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read beyond right offset ({} > {})", offset, read_until_position - 1);
 
-        range = { .begin = static_cast<size_t>(offset), .end = read_until_position - 1 };
         LOG_DEBUG(log, "Reading with range: {}-{}", offset, read_until_position);
     }
     else
     {
-        range = { .begin = static_cast<size_t>(offset), .end = std::nullopt };
         LOG_DEBUG(log, "Reading from offset: {}", offset);
     }
 
@@ -60,7 +57,7 @@ std::unique_ptr<ReadBuffer> ReadBufferFromWebServer::initialize()
     const auto & config = context->getConfigRef();
     Poco::Timespan http_keep_alive_timeout{config.getUInt("keep_alive_timeout", 20), 0};
 
-    return std::make_unique<ReadWriteBufferFromHTTP>(
+    auto res = std::make_unique<ReadWriteBufferFromHTTP>(
         uri,
         Poco::Net::HTTPRequest::HTTP_GET,
         ReadWriteBufferFromHTTP::OutStreamCallback(),
@@ -74,10 +71,16 @@ std::unique_ptr<ReadBuffer> ReadBufferFromWebServer::initialize()
         buf_size,
         read_settings,
         HTTPHeaderEntries{},
-        range,
         &context->getRemoteHostFilter(),
         /* delay_initialization */true,
         use_external_buffer);
+
+    if (read_until_position)
+        res->setReadUntilPosition(read_until_position);
+    if (offset)
+        res->seek(offset, SEEK_SET);
+
+    return res;
 }
 
 
@@ -88,15 +91,6 @@ void ReadBufferFromWebServer::setReadUntilPosition(size_t position)
 }
 
 
-SeekableReadBuffer::Range ReadBufferFromWebServer::getRemainingReadRange() const
-{
-    return Range{
-        .left = static_cast<size_t>(offset),
-        .right = read_until_position ? std::optional{read_until_position - 1} : std::nullopt
-    };
-}
-
-
 bool ReadBufferFromWebServer::nextImpl()
 {
     if (read_until_position)
diff --git a/src/Disks/IO/ReadBufferFromWebServer.h b/src/Disks/IO/ReadBufferFromWebServer.h
index 03cd107bf9a..dd9cf63224f 100644
--- a/src/Disks/IO/ReadBufferFromWebServer.h
+++ b/src/Disks/IO/ReadBufferFromWebServer.h
@@ -37,8 +37,6 @@ public:
 
     size_t getFileOffsetOfBufferEnd() const override { return offset; }
 
-    Range getRemainingReadRange() const override;
-
     bool supportsRightBoundedReads() const override { return true; }
 
 private:
diff --git a/src/Disks/IO/ReadIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.cpp
index 8a33a6ce9a1..a559b47f2cc 100644
--- a/src/Disks/IO/ReadIndirectBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.cpp
@@ -82,7 +82,7 @@ off_t ReadIndirectBufferFromRemoteFS::seek(off_t offset_, int whence)
     else
         throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Only SEEK_SET or SEEK_CUR modes are allowed.");
 
-    impl->reset();
+    impl->seek(impl->file_offset_of_buffer_end, SEEK_SET);
     resetWorkingBuffer();
 
     file_offset_of_buffer_end = impl->file_offset_of_buffer_end;
diff --git a/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
index 0424c2e56d3..19647b1fa39 100644
--- a/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
+++ b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
@@ -31,8 +31,6 @@ public:
 
     void setReadUntilEnd() override;
 
-    bool isIntegratedWithFilesystemCache() const override { return true; }
-
     size_t getFileSize() override;
 
 private:
diff --git a/src/Disks/IO/ThreadPoolReader.cpp b/src/Disks/IO/ThreadPoolReader.cpp
index 18b283b0ff3..effa19bc1af 100644
--- a/src/Disks/IO/ThreadPoolReader.cpp
+++ b/src/Disks/IO/ThreadPoolReader.cpp
@@ -8,6 +8,7 @@
 #include <Common/setThreadName.h>
 #include <Common/MemorySanitizer.h>
 #include <Common/CurrentThread.h>
+#include <Common/ThreadPool.h>
 #include <Poco/Environment.h>
 #include <base/errnoToString.h>
 #include <Poco/Event.h>
@@ -31,7 +32,7 @@
         #define SYS_preadv2 327
     #elif defined(__aarch64__)
         #define SYS_preadv2 286
-    #elif defined(__ppc64__)
+    #elif defined(__powerpc64__)
         #define SYS_preadv2 380
     #elif defined(__riscv)
         #define SYS_preadv2 286
@@ -61,6 +62,8 @@ namespace ProfileEvents
 namespace CurrentMetrics
 {
     extern const Metric Read;
+    extern const Metric ThreadPoolFSReaderThreads;
+    extern const Metric ThreadPoolFSReaderThreadsActive;
 }
 
 
@@ -85,7 +88,7 @@ static bool hasBugInPreadV2()
 #endif
 
 ThreadPoolReader::ThreadPoolReader(size_t pool_size, size_t queue_size_)
-    : pool(pool_size, pool_size, queue_size_)
+    : pool(std::make_unique<ThreadPool>(CurrentMetrics::ThreadPoolFSReaderThreads, CurrentMetrics::ThreadPoolFSReaderThreadsActive, pool_size, pool_size, queue_size_))
 {
 }
 
@@ -198,7 +201,7 @@ std::future<IAsynchronousReader::Result> ThreadPoolReader::submit(Request reques
 
     ProfileEvents::increment(ProfileEvents::ThreadPoolReaderPageCacheMiss);
 
-    auto schedule = threadPoolCallbackRunner<Result>(pool, "ThreadPoolRead");
+    auto schedule = threadPoolCallbackRunner<Result>(*pool, "ThreadPoolRead");
 
     return schedule([request, fd]() -> Result
     {
@@ -242,4 +245,9 @@ std::future<IAsynchronousReader::Result> ThreadPoolReader::submit(Request reques
     }, request.priority);
 }
 
+void ThreadPoolReader::wait()
+{
+    pool->wait();
+}
+
 }
diff --git a/src/Disks/IO/ThreadPoolReader.h b/src/Disks/IO/ThreadPoolReader.h
index dc754e0a81c..4c55be29bf9 100644
--- a/src/Disks/IO/ThreadPoolReader.h
+++ b/src/Disks/IO/ThreadPoolReader.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include <memory>
 #include <IO/AsynchronousReader.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
 
 
@@ -28,14 +29,14 @@ namespace DB
 class ThreadPoolReader final : public IAsynchronousReader
 {
 private:
-    ThreadPool pool;
+    std::unique_ptr<ThreadPool> pool;
 
 public:
     ThreadPoolReader(size_t pool_size, size_t queue_size_);
 
     std::future<Result> submit(Request request) override;
 
-    void wait() override { pool.wait(); }
+    void wait() override;
 
     /// pool automatically waits for all tasks in destructor.
 };
diff --git a/src/Disks/IO/ThreadPoolRemoteFSReader.cpp b/src/Disks/IO/ThreadPoolRemoteFSReader.cpp
index c2d3ee8b53d..b7e598e2a87 100644
--- a/src/Disks/IO/ThreadPoolRemoteFSReader.cpp
+++ b/src/Disks/IO/ThreadPoolRemoteFSReader.cpp
@@ -1,6 +1,7 @@
 #include "ThreadPoolRemoteFSReader.h"
 
 #include "config.h"
+#include <Common/ThreadPool_fwd.h>
 #include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
@@ -10,10 +11,10 @@
 #include <Common/ElapsedTimeProfileEventIncrement.h>
 #include <IO/SeekableReadBuffer.h>
 #include <IO/AsyncReadCounters.h>
-#include <Interpreters/Context.h>
 #include <base/getThreadId.h>
 
 #include <future>
+#include <memory>
 
 
 namespace ProfileEvents
@@ -26,6 +27,8 @@ namespace ProfileEvents
 namespace CurrentMetrics
 {
     extern const Metric RemoteRead;
+    extern const Metric ThreadPoolRemoteFSReaderThreads;
+    extern const Metric ThreadPoolRemoteFSReaderThreadsActive;
 }
 
 namespace DB
@@ -60,7 +63,7 @@ IAsynchronousReader::Result RemoteFSFileDescriptor::readInto(char * data, size_t
 
 
 ThreadPoolRemoteFSReader::ThreadPoolRemoteFSReader(size_t pool_size, size_t queue_size_)
-    : pool(pool_size, pool_size, queue_size_)
+    : pool(std::make_unique<ThreadPool>(CurrentMetrics::ThreadPoolRemoteFSReaderThreads, CurrentMetrics::ThreadPoolRemoteFSReaderThreadsActive, pool_size, pool_size, queue_size_))
 {
 }
 
@@ -71,17 +74,11 @@ std::future<IAsynchronousReader::Result> ThreadPoolRemoteFSReader::submit(Reques
     return scheduleFromThreadPool<Result>([request]() -> Result
     {
         CurrentMetrics::Increment metric_increment{CurrentMetrics::RemoteRead};
-
-        std::optional<AsyncReadIncrement> increment;
-        if (CurrentThread::isInitialized())
-        {
-            auto query_context = CurrentThread::get().getQueryContext();
-            if (query_context)
-                increment.emplace(query_context->getAsyncReadCounters());
-        }
-
         auto * remote_fs_fd = assert_cast<RemoteFSFileDescriptor *>(request.descriptor.get());
 
+        auto async_read_counters = remote_fs_fd->getReadCounters();
+        std::optional<AsyncReadIncrement> increment = async_read_counters ? std::optional<AsyncReadIncrement>(async_read_counters) : std::nullopt;
+
         auto watch = std::make_unique<Stopwatch>(CLOCK_MONOTONIC);
         Result result = remote_fs_fd->readInto(request.buf, request.size, request.offset, request.ignore);
         watch->stop();
@@ -90,7 +87,12 @@ std::future<IAsynchronousReader::Result> ThreadPoolRemoteFSReader::submit(Reques
         ProfileEvents::increment(ProfileEvents::ThreadpoolReaderReadBytes, result.size);
 
         return Result{ .size = result.size, .offset = result.offset, .execution_watch = std::move(watch) };
-    }, pool, "VFSRead", request.priority);
+    }, *pool, "VFSRead", request.priority);
+}
+
+void ThreadPoolRemoteFSReader::wait()
+{
+    pool->wait();
 }
 
 }
diff --git a/src/Disks/IO/ThreadPoolRemoteFSReader.h b/src/Disks/IO/ThreadPoolRemoteFSReader.h
index cd289150ba1..506d77a64ef 100644
--- a/src/Disks/IO/ThreadPoolRemoteFSReader.h
+++ b/src/Disks/IO/ThreadPoolRemoteFSReader.h
@@ -2,12 +2,14 @@
 
 #include <IO/AsynchronousReader.h>
 #include <IO/ReadBuffer.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
 
 namespace DB
 {
 
+struct AsyncReadCounters;
+
 class ThreadPoolRemoteFSReader : public IAsynchronousReader
 {
 public:
@@ -15,21 +17,28 @@ public:
 
     std::future<IAsynchronousReader::Result> submit(Request request) override;
 
-    void wait() override { pool.wait(); }
+    void wait() override;
 
 private:
-    ThreadPool pool;
+    std::unique_ptr<ThreadPool> pool;
 };
 
 class RemoteFSFileDescriptor : public IAsynchronousReader::IFileDescriptor
 {
 public:
-    explicit RemoteFSFileDescriptor(ReadBuffer & reader_) : reader(reader_) { }
+    explicit RemoteFSFileDescriptor(
+        ReadBuffer & reader_,
+        std::shared_ptr<AsyncReadCounters> async_read_counters_)
+        : reader(reader_)
+        , async_read_counters(async_read_counters_) {}
 
     IAsynchronousReader::Result readInto(char * data, size_t size, size_t offset, size_t ignore = 0);
 
+    std::shared_ptr<AsyncReadCounters> getReadCounters() const { return async_read_counters; }
+
 private:
     ReadBuffer & reader;
+    std::shared_ptr<AsyncReadCounters> async_read_counters;
 };
 
 }
diff --git a/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp b/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
index f8ca6b9ab07..b5d296bd865 100644
--- a/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
+++ b/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
@@ -26,7 +26,7 @@ WriteBufferFromAzureBlobStorage::WriteBufferFromAzureBlobStorage(
     size_t max_single_part_upload_size_,
     size_t buf_size_,
     const WriteSettings & write_settings_)
-    : BufferWithOwnMemory<WriteBuffer>(buf_size_, nullptr, 0)
+    : WriteBufferFromFileBase(buf_size_, nullptr, 0)
     , log(&Poco::Logger::get("WriteBufferFromAzureBlobStorage"))
     , max_single_part_upload_size(max_single_part_upload_size_)
     , blob_path(blob_path_)
@@ -51,7 +51,7 @@ void WriteBufferFromAzureBlobStorage::execWithRetry(std::function<void()> func,
         if (i == num_tries - 1)
             throw;
 
-        LOG_DEBUG(log, "Write at attempt {} for blob `{}` failed: {}", i + 1, blob_path, e.Message);
+        LOG_DEBUG(log, "Write at attempt {} for blob `{}` failed: {} {}", i + 1, blob_path, e.what(), e.Message);
     };
 
     for (size_t i = 0; i < num_tries; ++i)
diff --git a/src/Disks/IO/WriteBufferFromAzureBlobStorage.h b/src/Disks/IO/WriteBufferFromAzureBlobStorage.h
index 27492809384..f1be81922e1 100644
--- a/src/Disks/IO/WriteBufferFromAzureBlobStorage.h
+++ b/src/Disks/IO/WriteBufferFromAzureBlobStorage.h
@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include <IO/BufferWithOwnMemory.h>
+#include <IO/WriteBufferFromFileBase.h>
 #include <IO/WriteBuffer.h>
 #include <IO/WriteSettings.h>
 #include <azure/storage/blobs.hpp>
@@ -21,7 +21,7 @@ class Logger;
 namespace DB
 {
 
-class WriteBufferFromAzureBlobStorage : public BufferWithOwnMemory<WriteBuffer>
+class WriteBufferFromAzureBlobStorage : public WriteBufferFromFileBase
 {
 public:
     using AzureClientPtr = std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient>;
@@ -37,6 +37,9 @@ public:
 
     void nextImpl() override;
 
+    std::string getFileName() const override { return blob_path; }
+    void sync() override { next(); }
+
 private:
     void finalizeImpl() override;
     void execWithRetry(std::function<void()> func, size_t num_tries, size_t cost = 0);
diff --git a/src/IO/WriteBufferFromTemporaryFile.cpp b/src/Disks/IO/WriteBufferFromTemporaryFile.cpp
similarity index 68%
rename from src/IO/WriteBufferFromTemporaryFile.cpp
rename to src/Disks/IO/WriteBufferFromTemporaryFile.cpp
index 4467a3d3d62..5818c405e93 100644
--- a/src/IO/WriteBufferFromTemporaryFile.cpp
+++ b/src/Disks/IO/WriteBufferFromTemporaryFile.cpp
@@ -1,5 +1,6 @@
-#include <IO/WriteBufferFromTemporaryFile.h>
+#include <Disks/IO/WriteBufferFromTemporaryFile.h>
 #include <IO/ReadBufferFromFile.h>
+#include <Disks/TemporaryFileOnDisk.h>
 
 #include <fcntl.h>
 
@@ -12,18 +13,12 @@ namespace ErrorCodes
     extern const int CANNOT_SEEK_THROUGH_FILE;
 }
 
-
-WriteBufferFromTemporaryFile::WriteBufferFromTemporaryFile(std::unique_ptr<PocoTemporaryFile> && tmp_file_)
-    : WriteBufferFromFile(tmp_file_->path(), DBMS_DEFAULT_BUFFER_SIZE, O_RDWR | O_TRUNC | O_CREAT, 0600), tmp_file(std::move(tmp_file_))
-{}
-
-
-WriteBufferFromTemporaryFile::Ptr WriteBufferFromTemporaryFile::create(const std::string & tmp_dir)
+WriteBufferFromTemporaryFile::WriteBufferFromTemporaryFile(TemporaryFileOnDiskHolder && tmp_file_)
+    : WriteBufferFromFile(tmp_file_->getPath(), DBMS_DEFAULT_BUFFER_SIZE, O_RDWR | O_TRUNC | O_CREAT, /* throttler= */ {}, 0600)
+    , tmp_file(std::move(tmp_file_))
 {
-    return Ptr{new WriteBufferFromTemporaryFile(createTemporaryFile(tmp_dir))};
 }
 
-
 class ReadBufferFromTemporaryWriteBuffer : public ReadBufferFromFile
 {
 public:
@@ -40,11 +35,11 @@ public:
         return std::make_shared<ReadBufferFromTemporaryWriteBuffer>(fd, file_name, std::move(origin->tmp_file));
     }
 
-    ReadBufferFromTemporaryWriteBuffer(int fd_, const std::string & file_name_, std::unique_ptr<PocoTemporaryFile> && tmp_file_)
+    ReadBufferFromTemporaryWriteBuffer(int fd_, const std::string & file_name_, TemporaryFileOnDiskHolder && tmp_file_)
         : ReadBufferFromFile(fd_, file_name_), tmp_file(std::move(tmp_file_))
     {}
 
-    std::unique_ptr<PocoTemporaryFile> tmp_file;
+    TemporaryFileOnDiskHolder tmp_file;
 };
 
 
diff --git a/src/IO/WriteBufferFromTemporaryFile.h b/src/Disks/IO/WriteBufferFromTemporaryFile.h
similarity index 69%
rename from src/IO/WriteBufferFromTemporaryFile.h
rename to src/Disks/IO/WriteBufferFromTemporaryFile.h
index a4e83b95ac6..3e909dbcaaa 100644
--- a/src/IO/WriteBufferFromTemporaryFile.h
+++ b/src/Disks/IO/WriteBufferFromTemporaryFile.h
@@ -8,23 +8,22 @@
 namespace DB
 {
 
+class TemporaryFileOnDisk;
+using TemporaryFileOnDiskHolder = std::unique_ptr<TemporaryFileOnDisk>;
+
 /// Rereadable WriteBuffer, could be used as disk buffer
 /// Creates unique temporary in directory (and directory itself)
 class WriteBufferFromTemporaryFile : public WriteBufferFromFile, public IReadableWriteBuffer
 {
 public:
-    using Ptr = std::shared_ptr<WriteBufferFromTemporaryFile>;
-
-    static Ptr create(const std::string & tmp_dir);
+    explicit WriteBufferFromTemporaryFile(TemporaryFileOnDiskHolder && tmp_file_);
 
     ~WriteBufferFromTemporaryFile() override;
 
 private:
-    explicit WriteBufferFromTemporaryFile(std::unique_ptr<PocoTemporaryFile> && tmp_file);
-
     std::shared_ptr<ReadBuffer> getReadBufferImpl() override;
 
-    std::unique_ptr<PocoTemporaryFile> tmp_file;
+    TemporaryFileOnDiskHolder tmp_file;
 
     friend class ReadBufferFromTemporaryWriteBuffer;
 };
diff --git a/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/WriteBufferWithFinalizeCallback.cpp
similarity index 64%
rename from src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
rename to src/Disks/IO/WriteBufferWithFinalizeCallback.cpp
index a909e8f109c..49e230b9dc3 100644
--- a/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/WriteBufferWithFinalizeCallback.cpp
@@ -1,11 +1,11 @@
-#include "WriteIndirectBufferFromRemoteFS.h"
+#include "WriteBufferWithFinalizeCallback.h"
 
 namespace DB
 {
 
-WriteIndirectBufferFromRemoteFS::WriteIndirectBufferFromRemoteFS(
+WriteBufferWithFinalizeCallback::WriteBufferWithFinalizeCallback(
     std::unique_ptr<WriteBuffer> impl_,
-    CreateMetadataCallback && create_callback_,
+    FinalizeCallback && create_callback_,
     const String & remote_path_)
     : WriteBufferFromFileDecorator(std::move(impl_))
     , create_metadata_callback(std::move(create_callback_))
@@ -14,7 +14,7 @@ WriteIndirectBufferFromRemoteFS::WriteIndirectBufferFromRemoteFS(
 }
 
 
-WriteIndirectBufferFromRemoteFS::~WriteIndirectBufferFromRemoteFS()
+WriteBufferWithFinalizeCallback::~WriteBufferWithFinalizeCallback()
 {
     try
     {
@@ -26,7 +26,7 @@ WriteIndirectBufferFromRemoteFS::~WriteIndirectBufferFromRemoteFS()
     }
 }
 
-void WriteIndirectBufferFromRemoteFS::finalizeImpl()
+void WriteBufferWithFinalizeCallback::finalizeImpl()
 {
     WriteBufferFromFileDecorator::finalizeImpl();
     if (create_metadata_callback)
diff --git a/src/Disks/IO/WriteIndirectBufferFromRemoteFS.h b/src/Disks/IO/WriteBufferWithFinalizeCallback.h
similarity index 59%
rename from src/Disks/IO/WriteIndirectBufferFromRemoteFS.h
rename to src/Disks/IO/WriteBufferWithFinalizeCallback.h
index f06ebe89589..73c1b8d25d4 100644
--- a/src/Disks/IO/WriteIndirectBufferFromRemoteFS.h
+++ b/src/Disks/IO/WriteBufferWithFinalizeCallback.h
@@ -8,25 +8,25 @@
 namespace DB
 {
 
-using CreateMetadataCallback = std::function<void(size_t bytes_count)>;
+using FinalizeCallback = std::function<void(size_t bytes_count)>;
 
 /// Stores data in S3/HDFS and adds the object path and object size to metadata file on local FS.
-class WriteIndirectBufferFromRemoteFS final : public WriteBufferFromFileDecorator
+class WriteBufferWithFinalizeCallback final : public WriteBufferFromFileDecorator
 {
 public:
-    WriteIndirectBufferFromRemoteFS(
+    WriteBufferWithFinalizeCallback(
         std::unique_ptr<WriteBuffer> impl_,
-        CreateMetadataCallback && create_callback_,
+        FinalizeCallback && create_callback_,
         const String & remote_path_);
 
-    ~WriteIndirectBufferFromRemoteFS() override;
+    ~WriteBufferWithFinalizeCallback() override;
 
     String getFileName() const override { return remote_path; }
 
 private:
     void finalizeImpl() override;
 
-    CreateMetadataCallback create_metadata_callback;
+    FinalizeCallback create_metadata_callback;
     String remote_path;
 };
 
diff --git a/src/Disks/IO/createReadBufferFromFileBase.cpp b/src/Disks/IO/createReadBufferFromFileBase.cpp
index 04496e36826..7de26b6c333 100644
--- a/src/Disks/IO/createReadBufferFromFileBase.cpp
+++ b/src/Disks/IO/createReadBufferFromFileBase.cpp
@@ -5,7 +5,9 @@
 #include <IO/AsynchronousReadBufferFromFile.h>
 #include <Disks/IO/IOUringReader.h>
 #include <Disks/IO/ThreadPoolReader.h>
+#include <Disks/IO/getThreadPoolReader.h>
 #include <IO/SynchronousReader.h>
+#include <IO/AsynchronousReader.h>
 #include <Common/ProfileEvents.h>
 #include "config.h"
 
@@ -27,7 +29,6 @@ namespace ErrorCodes
     extern const int UNSUPPORTED_METHOD;
 }
 
-
 std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
     const std::string & filename,
     const ReadSettings & settings,
@@ -76,11 +77,25 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
 
         if (settings.local_fs_method == LocalFSReadMethod::read)
         {
-            res = std::make_unique<ReadBufferFromFile>(filename, buffer_size, actual_flags, existing_memory, buffer_alignment, file_size);
+            res = std::make_unique<ReadBufferFromFile>(
+                filename,
+                buffer_size,
+                actual_flags,
+                existing_memory,
+                buffer_alignment,
+                file_size,
+                settings.local_throttler);
         }
         else if (settings.local_fs_method == LocalFSReadMethod::pread || settings.local_fs_method == LocalFSReadMethod::mmap)
         {
-            res = std::make_unique<ReadBufferFromFilePReadWithDescriptorsCache>(filename, buffer_size, actual_flags, existing_memory, buffer_alignment, file_size);
+            res = std::make_unique<ReadBufferFromFilePReadWithDescriptorsCache>(
+                filename,
+                buffer_size,
+                actual_flags,
+                existing_memory,
+                buffer_alignment,
+                file_size,
+                settings.local_throttler);
         }
         else if (settings.local_fs_method == LocalFSReadMethod::io_uring)
         {
@@ -90,30 +105,46 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
                 throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "io_uring is not supported by this system");
 
             res = std::make_unique<AsynchronousReadBufferFromFileWithDescriptorsCache>(
-                *reader, settings.priority, filename, buffer_size, actual_flags, existing_memory, buffer_alignment, file_size);
+                *reader,
+                settings.priority,
+                filename,
+                buffer_size,
+                actual_flags,
+                existing_memory,
+                buffer_alignment,
+                file_size,
+                settings.local_throttler);
 #else
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Read method io_uring is only supported in Linux");
 #endif
         }
         else if (settings.local_fs_method == LocalFSReadMethod::pread_fake_async)
         {
-            auto context = Context::getGlobalContextInstance();
-            if (!context)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context not initialized");
-
-            auto & reader = context->getThreadPoolReader(Context::FilesystemReaderType::SYNCHRONOUS_LOCAL_FS_READER);
+            auto & reader = getThreadPoolReader(FilesystemReaderType::SYNCHRONOUS_LOCAL_FS_READER);
             res = std::make_unique<AsynchronousReadBufferFromFileWithDescriptorsCache>(
-                reader, settings.priority, filename, buffer_size, actual_flags, existing_memory, buffer_alignment, file_size);
+                reader,
+                settings.priority,
+                filename,
+                buffer_size,
+                actual_flags,
+                existing_memory,
+                buffer_alignment,
+                file_size,
+                settings.local_throttler);
         }
         else if (settings.local_fs_method == LocalFSReadMethod::pread_threadpool)
         {
-            auto context = Context::getGlobalContextInstance();
-            if (!context)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context not initialized");
-
-            auto & reader = context->getThreadPoolReader(Context::FilesystemReaderType::ASYNCHRONOUS_LOCAL_FS_READER);
+            auto & reader = getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_LOCAL_FS_READER);
             res = std::make_unique<AsynchronousReadBufferFromFileWithDescriptorsCache>(
-                reader, settings.priority, filename, buffer_size, actual_flags, existing_memory, buffer_alignment, file_size);
+                reader,
+                settings.priority,
+                filename,
+                buffer_size,
+                actual_flags,
+                existing_memory,
+                buffer_alignment,
+                file_size,
+                settings.local_throttler);
         }
         else
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown read method");
diff --git a/src/Disks/IO/getThreadPoolReader.cpp b/src/Disks/IO/getThreadPoolReader.cpp
new file mode 100644
index 00000000000..deb8f66106c
--- /dev/null
+++ b/src/Disks/IO/getThreadPoolReader.cpp
@@ -0,0 +1,76 @@
+#include <Common/ErrorCodes.h>
+#include <Disks/IO/getThreadPoolReader.h>
+#include <IO/AsynchronousReader.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Poco/Util/Application.h>
+#include <IO/SynchronousReader.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
+#include <Disks/IO/ThreadPoolReader.h>
+
+#ifndef CLICKHOUSE_PROGRAM_STANDALONE_BUILD
+#include <Interpreters/Context.h>
+#endif
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+IAsynchronousReader & getThreadPoolReader(FilesystemReaderType type)
+{
+#ifdef CLICKHOUSE_PROGRAM_STANDALONE_BUILD
+    const auto & config = Poco::Util::Application::instance().config();
+    switch (type)
+    {
+        case FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER:
+        {
+            static auto asynchronous_remote_fs_reader = createThreadPoolReader(type, config);
+            return *asynchronous_remote_fs_reader;
+        }
+        case FilesystemReaderType::ASYNCHRONOUS_LOCAL_FS_READER:
+        {
+            static auto asynchronous_local_fs_reader = createThreadPoolReader(type, config);
+            return *asynchronous_local_fs_reader;
+        }
+        case FilesystemReaderType::SYNCHRONOUS_LOCAL_FS_READER:
+        {
+            static auto synchronous_local_fs_reader = createThreadPoolReader(type, config);
+            return *synchronous_local_fs_reader;
+        }
+    }
+#else
+    auto context = Context::getGlobalContextInstance();
+    if (!context)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context not initialized");
+    return context->getThreadPoolReader(type);
+#endif
+}
+
+std::unique_ptr<IAsynchronousReader> createThreadPoolReader(
+    FilesystemReaderType type, const Poco::Util::AbstractConfiguration & config)
+{
+    switch (type)
+    {
+        case FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER:
+        {
+            auto pool_size = config.getUInt(".threadpool_remote_fs_reader_pool_size", 250);
+            auto queue_size = config.getUInt(".threadpool_remote_fs_reader_queue_size", 1000000);
+            return std::make_unique<ThreadPoolRemoteFSReader>(pool_size, queue_size);
+        }
+        case FilesystemReaderType::ASYNCHRONOUS_LOCAL_FS_READER:
+        {
+            auto pool_size = config.getUInt(".threadpool_local_fs_reader_pool_size", 100);
+            auto queue_size = config.getUInt(".threadpool_local_fs_reader_queue_size", 1000000);
+            return std::make_unique<ThreadPoolReader>(pool_size, queue_size);
+        }
+        case FilesystemReaderType::SYNCHRONOUS_LOCAL_FS_READER:
+        {
+            return std::make_unique<SynchronousReader>();
+        }
+    }
+}
+
+}
diff --git a/src/Disks/IO/getThreadPoolReader.h b/src/Disks/IO/getThreadPoolReader.h
new file mode 100644
index 00000000000..243e0e5478f
--- /dev/null
+++ b/src/Disks/IO/getThreadPoolReader.h
@@ -0,0 +1,23 @@
+#pragma once
+
+namespace Poco::Util { class AbstractConfiguration; }
+
+namespace DB
+{
+
+class IAsynchronousReader;
+
+enum class FilesystemReaderType
+{
+    SYNCHRONOUS_LOCAL_FS_READER,
+    ASYNCHRONOUS_LOCAL_FS_READER,
+    ASYNCHRONOUS_REMOTE_FS_READER,
+};
+
+IAsynchronousReader & getThreadPoolReader(FilesystemReaderType type);
+
+std::unique_ptr<IAsynchronousReader> createThreadPoolReader(
+    FilesystemReaderType type,
+    const Poco::Util::AbstractConfiguration & config);
+
+}
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
index ad938e345bb..c4dd0161c70 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
@@ -8,8 +8,10 @@
 #include <Disks/IO/WriteBufferFromAzureBlobStorage.h>
 #include <IO/SeekAvoidingReadBuffer.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <Disks/IO/AsynchronousBoundedReadBuffer.h>
 
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h>
+#include <Interpreters/Context.h>
 #include <Common/logger_useful.h>
 
 
@@ -50,7 +52,7 @@ bool AzureObjectStorage::exists(const StoredObject & object) const
 
     /// What a shame, no Exists method...
     Azure::Storage::Blobs::ListBlobsOptions options;
-    options.Prefix = object.absolute_path;
+    options.Prefix = object.remote_path;
     options.PageSizeHint = 1;
 
     auto blobs_list_response = client_ptr->ListBlobs(options);
@@ -58,7 +60,7 @@ bool AzureObjectStorage::exists(const StoredObject & object) const
 
     for (const auto & blob : blobs_list)
     {
-        if (object.absolute_path == blob.Name)
+        if (object.remote_path == blob.Name)
             return true;
     }
 
@@ -74,7 +76,7 @@ std::unique_ptr<ReadBufferFromFileBase> AzureObjectStorage::readObject( /// NOLI
     auto settings_ptr = settings.get();
 
     return std::make_unique<ReadBufferFromAzureBlobStorage>(
-        client.get(), object.absolute_path, patchSettings(read_settings), settings_ptr->max_single_read_retries,
+        client.get(), object.remote_path, patchSettings(read_settings), settings_ptr->max_single_read_retries,
         settings_ptr->max_single_download_retries);
 }
 
@@ -86,10 +88,11 @@ std::unique_ptr<ReadBufferFromFileBase> AzureObjectStorage::readObjects( /// NOL
 {
     ReadSettings disk_read_settings = patchSettings(read_settings);
     auto settings_ptr = settings.get();
+    auto global_context = Context::getGlobalContextInstance();
 
     auto read_buffer_creator =
         [this, settings_ptr, disk_read_settings]
-        (const std::string & path, size_t read_until_position) -> std::shared_ptr<ReadBufferFromFileBase>
+        (const std::string & path, size_t read_until_position) -> std::unique_ptr<ReadBufferFromFileBase>
     {
         return std::make_unique<ReadBufferFromAzureBlobStorage>(
             client.get(),
@@ -104,12 +107,16 @@ std::unique_ptr<ReadBufferFromFileBase> AzureObjectStorage::readObjects( /// NOL
     auto reader_impl = std::make_unique<ReadBufferFromRemoteFSGather>(
         std::move(read_buffer_creator),
         objects,
-        disk_read_settings);
+        disk_read_settings,
+        global_context->getFilesystemCacheLog());
 
     if (disk_read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
     {
-        auto & reader = getThreadPoolReader();
-        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, disk_read_settings, std::move(reader_impl));
+        auto & reader = global_context->getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
+        return std::make_unique<AsynchronousBoundedReadBuffer>(
+            std::move(reader_impl), reader, disk_read_settings,
+            global_context->getAsyncReadCounters(),
+            global_context->getFilesystemReadPrefetchesLog());
     }
     else
     {
@@ -123,23 +130,20 @@ std::unique_ptr<WriteBufferFromFileBase> AzureObjectStorage::writeObject( /// NO
     const StoredObject & object,
     WriteMode mode,
     std::optional<ObjectAttributes>,
-    FinalizeCallback && finalize_callback,
     size_t buf_size,
     const WriteSettings & write_settings)
 {
     if (mode != WriteMode::Rewrite)
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Azure storage doesn't support append");
 
-    LOG_TEST(log, "Writing file: {}", object.absolute_path);
+    LOG_TEST(log, "Writing file: {}", object.remote_path);
 
-    auto buffer = std::make_unique<WriteBufferFromAzureBlobStorage>(
+    return std::make_unique<WriteBufferFromAzureBlobStorage>(
         client.get(),
-        object.absolute_path,
+        object.remote_path,
         settings.get()->max_single_part_upload_size,
         buf_size,
         patchSettings(write_settings));
-
-    return std::make_unique<WriteIndirectBufferFromRemoteFS>(std::move(buffer), std::move(finalize_callback), object.absolute_path);
 }
 
 void AzureObjectStorage::findAllFiles(const std::string & path, RelativePathsWithSize & children, int max_keys) const
@@ -172,7 +176,7 @@ void AzureObjectStorage::findAllFiles(const std::string & path, RelativePathsWit
 /// Remove file. Throws exception if file doesn't exists or it's a directory.
 void AzureObjectStorage::removeObject(const StoredObject & object)
 {
-    const auto & path = object.absolute_path;
+    const auto & path = object.remote_path;
     LOG_TEST(log, "Removing single object: {}", path);
     auto client_ptr = client.get();
     auto delete_info = client_ptr->DeleteBlob(path);
@@ -187,12 +191,12 @@ void AzureObjectStorage::removeObjects(const StoredObjects & objects)
     auto client_ptr = client.get();
     for (const auto & object : objects)
     {
-        LOG_TEST(log, "Removing object: {} (total: {})", object.absolute_path, objects.size());
-        auto delete_info = client_ptr->DeleteBlob(object.absolute_path);
+        LOG_TEST(log, "Removing object: {} (total: {})", object.remote_path, objects.size());
+        auto delete_info = client_ptr->DeleteBlob(object.remote_path);
         if (!delete_info.Value.Deleted)
             throw Exception(
                 ErrorCodes::AZURE_BLOB_STORAGE_ERROR, "Failed to delete file (path: {}) in AzureBlob Storage, reason: {}",
-                object.absolute_path, delete_info.RawResponse ? delete_info.RawResponse->GetReasonPhrase() : "Unknown");
+                object.remote_path, delete_info.RawResponse ? delete_info.RawResponse->GetReasonPhrase() : "Unknown");
     }
 }
 
@@ -201,8 +205,8 @@ void AzureObjectStorage::removeObjectIfExists(const StoredObject & object)
     auto client_ptr = client.get();
     try
     {
-        LOG_TEST(log, "Removing single object: {}", object.absolute_path);
-        auto delete_info = client_ptr->DeleteBlob(object.absolute_path);
+        LOG_TEST(log, "Removing single object: {}", object.remote_path);
+        auto delete_info = client_ptr->DeleteBlob(object.remote_path);
     }
     catch (const Azure::Storage::StorageException & e)
     {
@@ -221,7 +225,7 @@ void AzureObjectStorage::removeObjectsIfExist(const StoredObjects & objects)
     {
         try
         {
-            auto delete_info = client_ptr->DeleteBlob(object.absolute_path);
+            auto delete_info = client_ptr->DeleteBlob(object.remote_path);
         }
         catch (const Azure::Storage::StorageException & e)
         {
@@ -259,8 +263,8 @@ void AzureObjectStorage::copyObject( /// NOLINT
     std::optional<ObjectAttributes> object_to_attributes)
 {
     auto client_ptr = client.get();
-    auto dest_blob_client = client_ptr->GetBlobClient(object_to.absolute_path);
-    auto source_blob_client = client_ptr->GetBlobClient(object_from.absolute_path);
+    auto dest_blob_client = client_ptr->GetBlobClient(object_to.remote_path);
+    auto source_blob_client = client_ptr->GetBlobClient(object_from.remote_path);
 
     Azure::Storage::Blobs::CopyBlobFromUriOptions copy_options;
     if (object_to_attributes.has_value())
@@ -276,7 +280,6 @@ void AzureObjectStorage::applyNewSettings(const Poco::Util::AbstractConfiguratio
 {
     auto new_settings = getAzureBlobStorageSettings(config, config_prefix, context);
     settings.set(std::move(new_settings));
-    applyRemoteThrottlingSettings(context);
     /// We don't update client
 }
 
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
index 648016fb732..0c2aecd5c62 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
@@ -5,9 +5,7 @@
 
 #include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
-#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
 #include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
 #include <Disks/ObjectStorages/IObjectStorage.h>
 #include <Common/MultiVersion.h>
 
@@ -83,7 +81,6 @@ public:
         const StoredObject & object,
         WriteMode mode,
         std::optional<ObjectAttributes> attributes = {},
-        FinalizeCallback && finalize_callback = {},
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         const WriteSettings & write_settings = {}) override;
 
diff --git a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
index 505b26ebb3a..acf9430e85c 100644
--- a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
@@ -4,6 +4,7 @@
 #include <IO/BoundedReadBuffer.h>
 #include <Disks/IO/CachedOnDiskWriteBufferFromFile.h>
 #include <Disks/IO/CachedOnDiskReadBufferFromFile.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Cache/FileCacheFactory.h>
 #include <Common/CurrentThread.h>
@@ -43,13 +44,7 @@ DataSourceDescription CachedObjectStorage::getDataSourceDescription() const
 
 FileCache::Key CachedObjectStorage::getCacheKey(const std::string & path) const
 {
-    return cache->hash(path);
-}
-
-String CachedObjectStorage::getCachePath(const std::string & path) const
-{
-    FileCache::Key cache_key = getCacheKey(path);
-    return cache->getPathInLocalCache(cache_key);
+    return cache->createKeyForPath(path);
 }
 
 std::string CachedObjectStorage::generateBlobNameForPath(const std::string & path)
@@ -62,10 +57,10 @@ ReadSettings CachedObjectStorage::patchSettings(const ReadSettings & read_settin
     ReadSettings modified_settings{read_settings};
     modified_settings.remote_fs_cache = cache;
 
-    if (FileCache::isReadOnly())
+    if (!canUseReadThroughCache())
         modified_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = true;
 
-    return IObjectStorage::patchSettings(modified_settings);
+    return object_storage->patchSettings(modified_settings);
 }
 
 void CachedObjectStorage::startup()
@@ -86,45 +81,7 @@ std::unique_ptr<ReadBufferFromFileBase> CachedObjectStorage::readObjects( /// NO
 {
     if (objects.empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Received empty list of objects to read");
-
-    assert(!objects[0].getPathKeyForCache().empty());
-
-    /// Add cache relating settings to ReadSettings.
-    auto modified_read_settings = patchSettings(read_settings);
-    auto implementation_buffer = object_storage->readObjects(objects, modified_read_settings, read_hint, file_size);
-
-    /// If underlying read buffer does caching on its own, do not wrap it in caching buffer.
-    if (implementation_buffer->isIntegratedWithFilesystemCache()
-        && modified_read_settings.enable_filesystem_cache_on_lower_level)
-    {
-        return implementation_buffer;
-    }
-    else
-    {
-        if (!file_size)
-            file_size = implementation_buffer->getFileSize();
-
-        auto implementation_buffer_creator = [objects, modified_read_settings, read_hint, file_size, this]()
-        {
-            return std::make_unique<BoundedReadBuffer>(
-                object_storage->readObjects(objects, modified_read_settings, read_hint, file_size));
-        };
-
-        /// TODO: A test is needed for the case of non-s3 storage and *Log family engines.
-        std::string path = objects[0].absolute_path;
-        FileCache::Key key = getCacheKey(objects[0].getPathKeyForCache());
-
-        return std::make_unique<CachedOnDiskReadBufferFromFile>(
-            path,
-            key,
-            cache,
-            implementation_buffer_creator,
-            modified_read_settings,
-            CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() ? std::string(CurrentThread::getQueryId()) : "",
-            file_size.value(),
-            /* allow_seeks */true,
-            /* use_external_buffer */false);
-    }
+    return object_storage->readObjects(objects, patchSettings(read_settings), read_hint, file_size);
 }
 
 std::unique_ptr<ReadBufferFromFileBase> CachedObjectStorage::readObject( /// NOLINT
@@ -133,67 +90,30 @@ std::unique_ptr<ReadBufferFromFileBase> CachedObjectStorage::readObject( /// NOL
     std::optional<size_t> read_hint,
     std::optional<size_t> file_size) const
 {
-    /// Add cache relating settings to ReadSettings.
-    auto modified_read_settings = patchSettings(read_settings);
-    auto implementation_buffer = object_storage->readObject(object, read_settings, read_hint, file_size);
-
-    /// If underlying read buffer does caching on its own, do not wrap it in caching buffer.
-    if (implementation_buffer->isIntegratedWithFilesystemCache()
-        && modified_read_settings.enable_filesystem_cache_on_lower_level)
-    {
-        return implementation_buffer;
-    }
-    else
-    {
-        if (!file_size)
-            file_size = implementation_buffer->getFileSize();
-
-        auto implementation_buffer_creator = [object, read_settings, read_hint, file_size, this]()
-        {
-            return std::make_unique<BoundedReadBuffer>(object_storage->readObject(object, read_settings, read_hint, file_size));
-        };
-
-        FileCache::Key key = getCacheKey(object.getPathKeyForCache());
-        LOG_TEST(log, "Reading from file `{}` with cache key `{}`", object.absolute_path, key.toString());
-        return std::make_unique<CachedOnDiskReadBufferFromFile>(
-            object.absolute_path,
-            key,
-            cache,
-            implementation_buffer_creator,
-            read_settings,
-            CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() ? std::string(CurrentThread::getQueryId()) : "",
-            file_size.value(),
-            /* allow_seeks */true,
-            /* use_external_buffer */false);
-    }
+    return object_storage->readObject(object, patchSettings(read_settings), read_hint, file_size);
 }
 
-
 std::unique_ptr<WriteBufferFromFileBase> CachedObjectStorage::writeObject( /// NOLINT
     const StoredObject & object,
     WriteMode mode, // Cached doesn't support append, only rewrite
     std::optional<ObjectAttributes> attributes,
-    FinalizeCallback && finalize_callback,
     size_t buf_size,
     const WriteSettings & write_settings)
 {
     /// Add cache relating settings to WriteSettings.
     auto modified_write_settings = IObjectStorage::patchSettings(write_settings);
-    auto implementation_buffer = object_storage->writeObject(object, mode, attributes, std::move(finalize_callback), buf_size, modified_write_settings);
+    auto implementation_buffer = object_storage->writeObject(object, mode, attributes, buf_size, modified_write_settings);
 
     bool cache_on_write = modified_write_settings.enable_filesystem_cache_on_write_operations
-        && FileCacheFactory::instance().getSettings(cache->getBasePath()).cache_on_write_operations
-        && fs::path(object.absolute_path).extension() != ".tmp";
+        && FileCacheFactory::instance().getByName(cache_config_name).settings.cache_on_write_operations
+        && fs::path(object.remote_path).extension() != ".tmp";
 
-    auto path_key_for_cache = object.getPathKeyForCache();
     /// Need to remove even if cache_on_write == false.
-    removeCacheIfExists(path_key_for_cache);
+    removeCacheIfExists(object.remote_path);
 
     if (cache_on_write)
     {
-        auto key = getCacheKey(path_key_for_cache);
-        LOG_TEST(log, "Caching file `{}` to `{}` with key {}", object.absolute_path, getCachePath(path_key_for_cache), key.toString());
-
+        auto key = getCacheKey(object.remote_path);
         return std::make_unique<CachedOnDiskWriteBufferFromFile>(
             std::move(implementation_buffer),
             cache,
@@ -213,33 +133,32 @@ void CachedObjectStorage::removeCacheIfExists(const std::string & path_key_for_c
         return;
 
     /// Add try catch?
-    cache->removeIfExists(getCacheKey(path_key_for_cache));
+    cache->removeKeyIfExists(getCacheKey(path_key_for_cache));
 }
 
 void CachedObjectStorage::removeObject(const StoredObject & object)
 {
-    removeCacheIfExists(object.getPathKeyForCache());
     object_storage->removeObject(object);
 }
 
 void CachedObjectStorage::removeObjects(const StoredObjects & objects)
 {
     for (const auto & object : objects)
-        removeCacheIfExists(object.getPathKeyForCache());
+        removeCacheIfExists(object.remote_path);
 
     object_storage->removeObjects(objects);
 }
 
 void CachedObjectStorage::removeObjectIfExists(const StoredObject & object)
 {
-    removeCacheIfExists(object.getPathKeyForCache());
+    removeCacheIfExists(object.remote_path);
     object_storage->removeObjectIfExists(object);
 }
 
 void CachedObjectStorage::removeObjectsIfExist(const StoredObjects & objects)
 {
     for (const auto & object : objects)
-        removeCacheIfExists(object.getPathKeyForCache());
+        removeCacheIfExists(object.remote_path);
 
     object_storage->removeObjectsIfExist(objects);
 }
@@ -308,4 +227,11 @@ String CachedObjectStorage::getObjectsNamespace() const
     return object_storage->getObjectsNamespace();
 }
 
+bool CachedObjectStorage::canUseReadThroughCache()
+{
+    return CurrentThread::isInitialized()
+        && CurrentThread::get().getQueryContext()
+        && !CurrentThread::getQueryId().empty();
+}
+
 }
diff --git a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
index 119dc25c66b..f8e346e1aed 100644
--- a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
@@ -43,7 +43,6 @@ public:
         const StoredObject & object,
         WriteMode mode,
         std::optional<ObjectAttributes> attributes = {},
-        FinalizeCallback && finalize_callback = {},
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         const WriteSettings & write_settings = {}) override;
 
@@ -87,7 +86,7 @@ public:
 
     String getObjectsNamespace() const override;
 
-    const String & getCacheBasePath() const override { return cache->getBasePath(); }
+    const std::string & getCacheName() const override { return cache_config_name; }
 
     std::string generateBlobNameForPath(const std::string & path) override;
 
@@ -113,13 +112,11 @@ public:
 
     WriteSettings getAdjustedSettingsFromMetadataFile(const WriteSettings & settings, const std::string & path) const override;
 
-    FileCachePtr getCache() const { return cache; }
+    static bool canUseReadThroughCache();
 
 private:
     FileCache::Key getCacheKey(const std::string & path) const;
 
-    String getCachePath(const std::string & path) const;
-
     ReadSettings patchSettings(const ReadSettings & read_settings) const override;
 
     ObjectStoragePtr object_storage;
diff --git a/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp b/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp
index d8c4a9d42fd..779ec6120f8 100644
--- a/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp
+++ b/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp
@@ -40,13 +40,16 @@ void registerDiskCache(DiskFactory & factory, bool /* global_skip_access_check *
         FileCacheSettings file_cache_settings;
         file_cache_settings.loadFromConfig(config, config_prefix);
 
-        auto cache_base_path = config.getString(config_prefix + ".path", fs::path(context->getPath()) / "disks" / name / "cache/");
-        if (!fs::exists(cache_base_path))
-            fs::create_directories(cache_base_path);
+        if (file_cache_settings.base_path.empty())
+            file_cache_settings.base_path = fs::path(context->getPath()) / "disks" / name / "cache/";
+        else if (fs::path(file_cache_settings.base_path).is_relative())
+            file_cache_settings.base_path = fs::path(context->getPath()) / "caches" / file_cache_settings.base_path;
 
+        auto cache = FileCacheFactory::instance().getOrCreate(name, file_cache_settings);
         auto disk = disk_it->second;
+        if (!dynamic_cast<const DiskObjectStorage *>(disk.get()))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cached disk is allowed only on top of object storage");
 
-        auto cache = FileCacheFactory::instance().getOrCreate(cache_base_path, file_cache_settings, name);
         auto disk_object_storage = disk->createDiskObjectStorage();
 
         disk_object_storage->wrapWithCache(cache, file_cache_settings, name);
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.cpp b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
index d55b1c91c07..129f1ab1ef7 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
@@ -10,13 +10,22 @@
 #include <Common/quoteString.h>
 #include <Common/logger_useful.h>
 #include <Common/filesystemHelpers.h>
+#include <Common/CurrentMetrics.h>
 #include <Disks/ObjectStorages/Cached/CachedObjectStorage.h>
 #include <Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.h>
 #include <Disks/ObjectStorages/DiskObjectStorageTransaction.h>
 #include <Disks/FakeDiskTransaction.h>
+#include <Common/ThreadPool.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Interpreters/Context.h>
 
+namespace CurrentMetrics
+{
+    extern const Metric DiskObjectStorageAsyncThreads;
+    extern const Metric DiskObjectStorageAsyncThreadsActive;
+}
+
+
 namespace DB
 {
 
@@ -38,7 +47,8 @@ class AsyncThreadPoolExecutor : public Executor
 public:
     AsyncThreadPoolExecutor(const String & name_, int thread_pool_size)
         : name(name_)
-        , pool(ThreadPool(thread_pool_size)) {}
+        , pool(CurrentMetrics::DiskObjectStorageAsyncThreads, CurrentMetrics::DiskObjectStorageAsyncThreadsActive, thread_pool_size)
+    {}
 
     std::future<void> execute(std::function<void()> task) override
     {
@@ -287,7 +297,7 @@ String DiskObjectStorage::getUniqueId(const String & path) const
     String id;
     auto blobs_paths = metadata_storage->getStorageObjects(path);
     if (!blobs_paths.empty())
-        id = blobs_paths[0].absolute_path;
+        id = blobs_paths[0].remote_path;
     return id;
 }
 
@@ -299,7 +309,7 @@ bool DiskObjectStorage::checkUniqueId(const String & id) const
         return false;
     }
 
-    auto object = StoredObject::create(*object_storage, id, {}, {}, true);
+    auto object = StoredObject(id);
     return object_storage->exists(object);
 }
 
@@ -525,14 +535,6 @@ void DiskObjectStorage::wrapWithCache(FileCachePtr cache, const FileCacheSetting
     object_storage = std::make_shared<CachedObjectStorage>(object_storage, cache, cache_settings, layer_name);
 }
 
-FileCachePtr DiskObjectStorage::getCache() const
-{
-    const auto * cached_object_storage = typeid_cast<CachedObjectStorage *>(object_storage.get());
-    if (!cached_object_storage)
-        return nullptr;
-    return cached_object_storage->getCache();
-}
-
 NameSet DiskObjectStorage::getCacheLayersNames() const
 {
     NameSet cache_layers;
@@ -577,6 +579,26 @@ std::unique_ptr<WriteBufferFromFileBase> DiskObjectStorage::writeFile(
     return result;
 }
 
+Strings DiskObjectStorage::getBlobPath(const String & path) const
+{
+    auto objects = getStorageObjects(path);
+    Strings res;
+    res.reserve(objects.size() + 1);
+    for (const auto & object : objects)
+        res.emplace_back(object.remote_path);
+    String objects_namespace = object_storage->getObjectsNamespace();
+    if (!objects_namespace.empty())
+        res.emplace_back(objects_namespace);
+    return res;
+}
+
+void DiskObjectStorage::writeFileUsingBlobWritingFunction(const String & path, WriteMode mode, WriteBlobFunction && write_blob_function)
+{
+    LOG_TEST(log, "Write file: {}", path);
+    auto transaction = createObjectStorageTransaction();
+    return transaction->writeFileUsingBlobWritingFunction(path, mode, std::move(write_blob_function));
+}
+
 void DiskObjectStorage::applyNewSettings(
     const Poco::Util::AbstractConfiguration & config, ContextPtr context_, const String &, const DisksMap &)
 {
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.h b/src/Disks/ObjectStorages/DiskObjectStorage.h
index a24acc270c0..b7dfaf67cf2 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.h
@@ -51,10 +51,7 @@ public:
 
     void getRemotePathsRecursive(const String & local_path, std::vector<LocalPathWithObjectStoragePaths> & paths_map) override;
 
-    const std::string & getCacheBasePath() const override
-    {
-        return object_storage->getCacheBasePath();
-    }
+    const std::string & getCacheName() const override { return object_storage->getCacheName(); }
 
     UInt64 getTotalSpace() const override { return std::numeric_limits<UInt64>::max(); }
 
@@ -152,6 +149,9 @@ public:
         WriteMode mode,
         const WriteSettings & settings) override;
 
+    Strings getBlobPath(const String & path) const override;
+    void writeFileUsingBlobWritingFunction(const String & path, WriteMode mode, WriteBlobFunction && write_blob_function) override;
+
     void copy(const String & from_path, const std::shared_ptr<IDisk> & to_disk, const String & to_path) override;
 
     void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context_, const String &, const DisksMap &) override;
@@ -186,7 +186,6 @@ public:
     /// There can be any number of cache layers:
     /// DiskObjectStorage(CachedObjectStorage(...CacheObjectStorage(S3ObjectStorage)...))
     void wrapWithCache(FileCachePtr cache, const FileCacheSettings & cache_settings, const String & layer_name);
-    FileCachePtr getCache() const;
 
     /// Get structure of object storage this disk works with. Examples:
     /// DiskObjectStorage(S3ObjectStorage)
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp b/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp
index 5c897ae3300..4cca89b9a4f 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp
@@ -98,7 +98,7 @@ void DiskObjectStorageRemoteMetadataRestoreHelper::migrateFileToRestorableSchema
         ObjectAttributes metadata {
             {"path", path}
         };
-        updateObjectMetadata(object.absolute_path, metadata);
+        updateObjectMetadata(object.remote_path, metadata);
     }
 }
 void DiskObjectStorageRemoteMetadataRestoreHelper::migrateToRestorableSchemaRecursive(const String & path, Futures & results)
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.h b/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.h
index 19011a04722..cb8d9b8a5af 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.h
@@ -2,6 +2,7 @@
 
 #include <Disks/ObjectStorages/IObjectStorage.h>
 #include <base/getFQDNOrHostName.h>
+#include <future>
 
 namespace DB
 {
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
index a9d82a3e0b1..257a6fdf2ea 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
@@ -1,5 +1,6 @@
 #include <Disks/ObjectStorages/DiskObjectStorageTransaction.h>
 #include <Disks/ObjectStorages/DiskObjectStorage.h>
+#include <Disks/IO/WriteBufferWithFinalizeCallback.h>
 #include <Common/checkStackSize.h>
 #include <ranges>
 #include <Common/logger_useful.h>
@@ -109,7 +110,7 @@ struct RemoveObjectStorageOperation final : public IDiskObjectStorageOperation
 
             if (hardlink_count == 0)
             {
-                objects_to_remove = objects;
+                objects_to_remove = std::move(objects);
             }
         }
         catch (const Exception & e)
@@ -194,7 +195,7 @@ struct RemoveManyObjectStorageOperation final : public IDiskObjectStorageOperati
 
                 /// File is really redundant
                 if (hardlink_count == 0 && !keep_all_batch_data && !file_names_remove_metadata_only.contains(fs::path(path).filename()))
-                    objects_to_remove.insert(objects_to_remove.end(), objects.begin(), objects.end());
+                    std::move(objects.begin(), objects.end(), std::back_inserter(objects_to_remove));
             }
             catch (const Exception & e)
             {
@@ -267,7 +268,7 @@ struct RemoveRecursiveObjectStorageOperation final : public IDiskObjectStorageOp
 
                 if (hardlink_count == 0)
                 {
-                    objects_to_remove[path_to_remove] = objects_paths;
+                    objects_to_remove[path_to_remove] = std::move(objects_paths);
                 }
             }
             catch (const Exception & e)
@@ -321,7 +322,7 @@ struct RemoveRecursiveObjectStorageOperation final : public IDiskObjectStorageOp
             {
                 if (!file_names_remove_metadata_only.contains(fs::path(local_path).filename()))
                 {
-                    remove_from_remote.insert(remove_from_remote.end(), remote_paths.begin(), remote_paths.end());
+                    std::move(remote_paths.begin(), remote_paths.end(), std::back_inserter(remove_from_remote));
                 }
             }
             /// Read comment inside RemoveObjectStorageOperation class
@@ -450,8 +451,7 @@ struct CopyFileObjectStorageOperation final : public IDiskObjectStorageOperation
         for (const auto & object_from : source_blobs)
         {
             std::string blob_name = object_storage.generateBlobNameForPath(to_path);
-            auto object_to = StoredObject::create(
-                object_storage, fs::path(metadata_storage.getObjectStorageRootPath()) / blob_name);
+            auto object_to = StoredObject(fs::path(metadata_storage.getObjectStorageRootPath()) / blob_name);
 
             object_storage.copyObject(object_from, object_to);
 
@@ -616,7 +616,7 @@ std::unique_ptr<WriteBufferFromFileBase> DiskObjectStorageTransaction::writeFile
         blob_name = "r" + revisionToString(revision) + "-file-" + blob_name;
     }
 
-    auto object = StoredObject::create(object_storage, fs::path(metadata_storage.getObjectStorageRootPath()) / blob_name);
+    auto object = StoredObject(fs::path(metadata_storage.getObjectStorageRootPath()) / blob_name);
     auto write_operation = std::make_unique<WriteFileObjectStorageOperation>(object_storage, metadata_storage, object);
     std::function<void(size_t count)> create_metadata_callback;
 
@@ -659,14 +659,59 @@ std::unique_ptr<WriteBufferFromFileBase> DiskObjectStorageTransaction::writeFile
 
     operations_to_execute.emplace_back(std::move(write_operation));
 
-    /// We always use mode Rewrite because we simulate append using metadata and different files
-    return object_storage.writeObject(
+    auto impl = object_storage.writeObject(
         object,
+        /// We always use mode Rewrite because we simulate append using metadata and different files
         WriteMode::Rewrite,
         object_attributes,
-        std::move(create_metadata_callback),
         buf_size,
         settings);
+
+    return std::make_unique<WriteBufferWithFinalizeCallback>(
+        std::move(impl), std::move(create_metadata_callback), object.remote_path);
+}
+
+
+void DiskObjectStorageTransaction::writeFileUsingBlobWritingFunction(
+    const String & path, WriteMode mode, WriteBlobFunction && write_blob_function)
+{
+    /// This function is a simplified and adapted version of DiskObjectStorageTransaction::writeFile().
+    auto blob_name = object_storage.generateBlobNameForPath(path);
+    std::optional<ObjectAttributes> object_attributes;
+
+    if (metadata_helper)
+    {
+        auto revision = metadata_helper->revision_counter + 1;
+        metadata_helper->revision_counter++;
+        object_attributes = {
+            {"path", path}
+        };
+        blob_name = "r" + revisionToString(revision) + "-file-" + blob_name;
+    }
+
+    auto object = StoredObject(fs::path(metadata_storage.getObjectStorageRootPath()) / blob_name);
+    auto write_operation = std::make_unique<WriteFileObjectStorageOperation>(object_storage, metadata_storage, object);
+
+    operations_to_execute.emplace_back(std::move(write_operation));
+
+    /// See DiskObjectStorage::getBlobPath().
+    Strings blob_path;
+    blob_path.reserve(2);
+    blob_path.emplace_back(object.remote_path);
+    String objects_namespace = object_storage.getObjectsNamespace();
+    if (!objects_namespace.empty())
+        blob_path.emplace_back(objects_namespace);
+
+    /// We always use mode Rewrite because we simulate append using metadata and different files
+    size_t object_size = std::move(write_blob_function)(blob_path, WriteMode::Rewrite, object_attributes);
+
+    /// Create metadata (see create_metadata_callback in DiskObjectStorageTransaction::writeFile()).
+    if (mode == WriteMode::Rewrite)
+        metadata_transaction->createMetadataFile(path, blob_name, object_size);
+    else
+        metadata_transaction->addBlobToMetadata(path, blob_name, object_size);
+
+    metadata_transaction->commit();
 }
 
 
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h
index 9e6bd5b6307..a4cb0ed3739 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h
@@ -99,6 +99,9 @@ public:
         const WriteSettings & settings = {},
         bool autocommit = true) override;
 
+    /// Write a file using a custom function to write an object to the disk's object storage.
+    void writeFileUsingBlobWritingFunction(const String & path, WriteMode mode, WriteBlobFunction && write_blob_function) override;
+
     void removeFile(const std::string & path) override;
     void removeFileIfExists(const std::string & path) override;
     void removeDirectory(const std::string & path) override;
diff --git a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.cpp b/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.cpp
deleted file mode 100644
index b9658821893..00000000000
--- a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-#include "FakeMetadataStorageFromDisk.h"
-#include <Disks/IDisk.h>
-#include <Common/filesystemHelpers.h>
-#include <Common/logger_useful.h>
-#include <IO/WriteHelpers.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-FakeMetadataStorageFromDisk::FakeMetadataStorageFromDisk(
-    DiskPtr disk_,
-    ObjectStoragePtr object_storage_,
-    const std::string & object_storage_root_path_)
-    : disk(disk_)
-    , object_storage(object_storage_)
-    , object_storage_root_path(object_storage_root_path_)
-{
-}
-
-MetadataTransactionPtr FakeMetadataStorageFromDisk::createTransaction()
-{
-    return std::make_shared<FakeMetadataStorageFromDiskTransaction>(*this, disk);
-}
-
-const std::string & FakeMetadataStorageFromDisk::getPath() const
-{
-    return disk->getPath();
-}
-
-bool FakeMetadataStorageFromDisk::exists(const std::string & path) const
-{
-    return disk->exists(path);
-}
-
-bool FakeMetadataStorageFromDisk::isFile(const std::string & path) const
-{
-    return disk->isFile(path);
-}
-
-bool FakeMetadataStorageFromDisk::isDirectory(const std::string & path) const
-{
-    return disk->isDirectory(path);
-}
-
-Poco::Timestamp FakeMetadataStorageFromDisk::getLastModified(const std::string & path) const
-{
-    return disk->getLastModified(path);
-}
-
-time_t FakeMetadataStorageFromDisk::getLastChanged(const std::string & path) const
-{
-    return disk->getLastChanged(path);
-}
-
-uint64_t FakeMetadataStorageFromDisk::getFileSize(const String & path) const
-{
-    return disk->getFileSize(path);
-}
-
-std::vector<std::string> FakeMetadataStorageFromDisk::listDirectory(const std::string & path) const
-{
-    std::vector<std::string> result;
-    disk->listFiles(path, result);
-    return result;
-}
-
-DirectoryIteratorPtr FakeMetadataStorageFromDisk::iterateDirectory(const std::string & path) const
-{
-    return disk->iterateDirectory(path);
-}
-
-std::string FakeMetadataStorageFromDisk::readFileToString(const std::string &) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "readFileToString is not implemented for FakeMetadataStorageFromDisk");
-}
-
-std::string FakeMetadataStorageFromDisk::readInlineDataToString(const std::string & path) const
-{
-    auto rb = disk->readFile(path);
-    std::string result;
-    std::array<char, 1000> buf;
-    while (!rb->eof())
-    {
-        auto sz = rb->read(buf.data(), buf.size());
-        result.append(buf.data(), buf.data() + sz);
-    }
-    return result;
-}
-
-std::unordered_map<String, String> FakeMetadataStorageFromDisk::getSerializedMetadata(const std::vector<String> &) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "getSerializedMetadata is not implemented for FakeMetadataStorageFromDisk");
-}
-
-StoredObjects FakeMetadataStorageFromDisk::getStorageObjects(const std::string & path) const
-{
-    std::string blob_name = object_storage->generateBlobNameForPath(path);
-
-    std::string object_path = fs::path(object_storage_root_path) / blob_name;
-    size_t object_size = getFileSize(path);
-
-    auto object = StoredObject::create(*object_storage, object_path, object_size, path, /* exists */true);
-    return {std::move(object)};
-}
-
-uint32_t FakeMetadataStorageFromDisk::getHardlinkCount(const std::string & path) const
-{
-    return disk->getRefCount(path);
-}
-
-const IMetadataStorage & FakeMetadataStorageFromDiskTransaction::getStorageForNonTransactionalReads() const
-{
-    return metadata_storage;
-}
-
-void FakeMetadataStorageFromDiskTransaction::writeStringToFile(const std::string & path, const std::string & data)
-{
-    auto wb = disk->writeFile(path);
-    wb->write(data.data(), data.size());
-    wb->finalize();
-}
-
-void FakeMetadataStorageFromDiskTransaction::writeInlineDataToFile(const std::string & path, const std::string & data)
-{
-    auto wb = disk->writeFile(path);
-    wb->write(data.data(), data.size());
-    wb->finalize();
-}
-
-void FakeMetadataStorageFromDiskTransaction::setLastModified(const std::string & path, const Poco::Timestamp & timestamp)
-{
-    disk->setLastModified(path, timestamp);
-}
-
-void FakeMetadataStorageFromDiskTransaction::unlinkFile(const std::string & path)
-{
-    disk->removeFile(path);
-}
-
-void FakeMetadataStorageFromDiskTransaction::removeRecursive(const std::string & path)
-{
-    disk->removeRecursive(path);
-}
-
-void FakeMetadataStorageFromDiskTransaction::createDirectory(const std::string & path)
-{
-    disk->createDirectory(path);
-}
-
-void FakeMetadataStorageFromDiskTransaction::createDirectoryRecursive(const std::string & path)
-{
-    disk->createDirectories(path);
-}
-
-void FakeMetadataStorageFromDiskTransaction::removeDirectory(const std::string & path)
-{
-    disk->removeDirectory(path);
-}
-
-void FakeMetadataStorageFromDiskTransaction::moveFile(const std::string & path_from, const std::string & path_to)
-{
-    disk->moveFile(path_from, path_to);
-}
-
-void FakeMetadataStorageFromDiskTransaction::moveDirectory(const std::string & path_from, const std::string & path_to)
-{
-    disk->moveDirectory(path_from, path_to);
-}
-
-void FakeMetadataStorageFromDiskTransaction::replaceFile(const std::string & path_from, const std::string & path_to)
-{
-    disk->replaceFile(path_from, path_to);
-}
-
-void FakeMetadataStorageFromDiskTransaction::setReadOnly(const std::string & path)
-{
-    disk->setReadOnly(path);
-}
-
-void FakeMetadataStorageFromDiskTransaction::createHardLink(const std::string & path_from, const std::string & path_to)
-{
-    disk->createHardLink(path_from, path_to);
-}
-
-void FakeMetadataStorageFromDiskTransaction::createEmptyMetadataFile(const std::string & /* path */)
-{
-    /// Noop.
-}
-
-void FakeMetadataStorageFromDiskTransaction::createMetadataFile(
-    const std::string & /* path */, const std::string & /* blob_name */, uint64_t /* size_in_bytes */)
-{
-    /// Noop.
-}
-
-void FakeMetadataStorageFromDiskTransaction::addBlobToMetadata(
-    const std::string & /* path */, const std::string & /* blob_name */, uint64_t /* size_in_bytes */)
-{
-    /// Noop, local metadata files is only one file, it is the metadata file itself.
-}
-
-void FakeMetadataStorageFromDiskTransaction::unlinkMetadata(const std::string & path)
-{
-    disk->removeFile(path);
-}
-
-}
diff --git a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h b/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
deleted file mode 100644
index 246d2aebfaa..00000000000
--- a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
+++ /dev/null
@@ -1,131 +0,0 @@
-#pragma once
-
-#include <Common/SharedMutex.h>
-#include <Disks/IDisk.h>
-#include <Disks/ObjectStorages/IMetadataStorage.h>
-#include <Disks/ObjectStorages/MetadataFromDiskTransactionState.h>
-#include <Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.h>
-
-
-namespace DB
-{
-
-/// Store metadata in the disk itself.
-class FakeMetadataStorageFromDisk final : public IMetadataStorage
-{
-private:
-    friend class FakeMetadataStorageFromDiskTransaction;
-
-    mutable SharedMutex metadata_mutex;
-
-    DiskPtr disk;
-    ObjectStoragePtr object_storage;
-    std::string object_storage_root_path;
-
-public:
-    FakeMetadataStorageFromDisk(
-        DiskPtr disk_,
-        ObjectStoragePtr object_storage_,
-        const std::string & object_storage_root_path_);
-
-    MetadataTransactionPtr createTransaction() override;
-
-    const std::string & getPath() const override;
-
-    bool exists(const std::string & path) const override;
-
-    bool isFile(const std::string & path) const override;
-
-    bool isDirectory(const std::string & path) const override;
-
-    uint64_t getFileSize(const String & path) const override;
-
-    Poco::Timestamp getLastModified(const std::string & path) const override;
-
-    time_t getLastChanged(const std::string & path) const override;
-
-    bool supportsChmod() const override { return disk->supportsChmod(); }
-
-    bool supportsStat() const override { return disk->supportsStat(); }
-
-    struct stat stat(const String & path) const override { return disk->stat(path); }
-
-    std::vector<std::string> listDirectory(const std::string & path) const override;
-
-    DirectoryIteratorPtr iterateDirectory(const std::string & path) const override;
-
-    std::string readFileToString(const std::string & path) const override;
-
-    std::string readInlineDataToString(const std::string & path) const override;
-
-    std::unordered_map<String, String> getSerializedMetadata(const std::vector<String> & file_paths) const override;
-
-    uint32_t getHardlinkCount(const std::string & path) const override;
-
-    DiskPtr getDisk() const { return disk; }
-
-    StoredObjects getStorageObjects(const std::string & path) const override;
-
-    std::string getObjectStorageRootPath() const override { return object_storage_root_path; }
-};
-
-class FakeMetadataStorageFromDiskTransaction final : public IMetadataTransaction
-{
-private:
-    DiskPtr disk;
-    const FakeMetadataStorageFromDisk & metadata_storage;
-
-    std::vector<MetadataOperationPtr> operations;
-public:
-    FakeMetadataStorageFromDiskTransaction(
-        const FakeMetadataStorageFromDisk & metadata_storage_, DiskPtr disk_)
-        : disk(disk_)
-        , metadata_storage(metadata_storage_)
-    {}
-
-    ~FakeMetadataStorageFromDiskTransaction() override = default;
-
-    const IMetadataStorage & getStorageForNonTransactionalReads() const final;
-
-    void commit() final {}
-
-    void writeStringToFile(const std::string & path, const std::string & data) override;
-
-    void writeInlineDataToFile(const std::string & path, const std::string & data) override;
-
-    void createEmptyMetadataFile(const std::string & path) override;
-
-    void createMetadataFile(const std::string & path, const std::string & blob_name, uint64_t size_in_bytes) override;
-
-    void addBlobToMetadata(const std::string & path, const std::string & blob_name, uint64_t size_in_bytes) override;
-
-    void setLastModified(const std::string & path, const Poco::Timestamp & timestamp) override;
-
-    bool supportsChmod() const override { return disk->supportsChmod(); }
-
-    void chmod(const String & path, mode_t mode) override { disk->chmod(path, mode); }
-
-    void setReadOnly(const std::string & path) override;
-
-    void unlinkFile(const std::string & path) override;
-
-    void createDirectory(const std::string & path) override;
-
-    void createDirectoryRecursive(const std::string & path) override;
-
-    void removeDirectory(const std::string & path) override;
-
-    void removeRecursive(const std::string & path) override;
-
-    void createHardLink(const std::string & path_from, const std::string & path_to) override;
-
-    void moveFile(const std::string & path_from, const std::string & path_to) override;
-
-    void moveDirectory(const std::string & path_from, const std::string & path_to) override;
-
-    void replaceFile(const std::string & path_from, const std::string & path_to) override;
-
-    void unlinkMetadata(const std::string & path) override;
-};
-
-}
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
index 1d6c6f92280..a3092bc6f12 100644
--- a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
@@ -7,9 +7,7 @@
 #include <Storages/HDFS/HDFSCommon.h>
 
 #include <Storages/HDFS/ReadBufferFromHDFS.h>
-#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
 #include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 #include <Common/getRandomASCIIString.h>
 
@@ -40,7 +38,7 @@ std::string HDFSObjectStorage::generateBlobNameForPath(const std::string & /* pa
 
 bool HDFSObjectStorage::exists(const StoredObject & object) const
 {
-    const auto & path = object.absolute_path;
+    const auto & path = object.remote_path;
     const size_t begin_of_path = path.find('/', path.find("//") + 2);
     const String remote_fs_object_path = path.substr(begin_of_path);
     return (0 == hdfsExists(hdfs_fs.get(), remote_fs_object_path.c_str()));
@@ -52,7 +50,7 @@ std::unique_ptr<ReadBufferFromFileBase> HDFSObjectStorage::readObject( /// NOLIN
     std::optional<size_t>,
     std::optional<size_t>) const
 {
-    return std::make_unique<ReadBufferFromHDFS>(object.absolute_path, object.absolute_path, config, patchSettings(read_settings));
+    return std::make_unique<ReadBufferFromHDFS>(object.remote_path, object.remote_path, config, patchSettings(read_settings));
 }
 
 std::unique_ptr<ReadBufferFromFileBase> HDFSObjectStorage::readObjects( /// NOLINT
@@ -64,7 +62,7 @@ std::unique_ptr<ReadBufferFromFileBase> HDFSObjectStorage::readObjects( /// NOLI
     auto disk_read_settings = patchSettings(read_settings);
     auto read_buffer_creator =
         [this, disk_read_settings]
-        (const std::string & path, size_t /* read_until_position */) -> std::shared_ptr<ReadBufferFromFileBase>
+        (const std::string & path, size_t /* read_until_position */) -> std::unique_ptr<ReadBufferFromFileBase>
     {
         size_t begin_of_path = path.find('/', path.find("//") + 2);
         auto hdfs_path = path.substr(begin_of_path);
@@ -74,7 +72,7 @@ std::unique_ptr<ReadBufferFromFileBase> HDFSObjectStorage::readObjects( /// NOLI
             hdfs_uri, hdfs_path, config, disk_read_settings, /* read_until_position */0, /* use_external_buffer */true);
     };
 
-    auto hdfs_impl = std::make_unique<ReadBufferFromRemoteFSGather>(std::move(read_buffer_creator), objects, disk_read_settings);
+    auto hdfs_impl = std::make_unique<ReadBufferFromRemoteFSGather>(std::move(read_buffer_creator), objects, disk_read_settings, nullptr);
     auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(hdfs_impl), read_settings);
     return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), settings->min_bytes_for_seek);
 }
@@ -83,7 +81,6 @@ std::unique_ptr<WriteBufferFromFileBase> HDFSObjectStorage::writeObject( /// NOL
     const StoredObject & object,
     WriteMode mode,
     std::optional<ObjectAttributes> attributes,
-    FinalizeCallback && finalize_callback,
     size_t buf_size,
     const WriteSettings & write_settings)
 {
@@ -93,18 +90,16 @@ std::unique_ptr<WriteBufferFromFileBase> HDFSObjectStorage::writeObject( /// NOL
             "HDFS API doesn't support custom attributes/metadata for stored objects");
 
     /// Single O_WRONLY in libhdfs adds O_TRUNC
-    auto hdfs_buffer = std::make_unique<WriteBufferFromHDFS>(
-        object.absolute_path, config, settings->replication, patchSettings(write_settings), buf_size,
+    return std::make_unique<WriteBufferFromHDFS>(
+        object.remote_path, config, settings->replication, patchSettings(write_settings), buf_size,
         mode == WriteMode::Rewrite ? O_WRONLY : O_WRONLY | O_APPEND);
-
-    return std::make_unique<WriteIndirectBufferFromRemoteFS>(std::move(hdfs_buffer), std::move(finalize_callback), object.absolute_path);
 }
 
 
 /// Remove file. Throws exception if file doesn't exists or it's a directory.
 void HDFSObjectStorage::removeObject(const StoredObject & object)
 {
-    const auto & path = object.absolute_path;
+    const auto & path = object.remote_path;
     const size_t begin_of_path = path.find('/', path.find("//") + 2);
 
     /// Add path from root to file name
@@ -156,11 +151,6 @@ void HDFSObjectStorage::copyObject( /// NOLINT
 }
 
 
-void HDFSObjectStorage::applyNewSettings(const Poco::Util::AbstractConfiguration &, const std::string &, ContextPtr context)
-{
-    applyRemoteThrottlingSettings(context);
-}
-
 std::unique_ptr<IObjectStorage> HDFSObjectStorage::cloneObjectStorage(const std::string &, const Poco::Util::AbstractConfiguration &, const std::string &, ContextPtr)
 {
     throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "HDFS object storage doesn't support cloning");
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
index 4064a5c5b7f..a691b089b43 100644
--- a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
@@ -81,7 +81,6 @@ public:
         const StoredObject & object,
         WriteMode mode,
         std::optional<ObjectAttributes> attributes = {},
-        FinalizeCallback && finalize_callback = {},
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         const WriteSettings & write_settings = {}) override;
 
@@ -105,11 +104,6 @@ public:
 
     void startup() override;
 
-    void applyNewSettings(
-        const Poco::Util::AbstractConfiguration & config,
-        const std::string & config_prefix,
-        ContextPtr context) override;
-
     String getObjectsNamespace() const override { return ""; }
 
     std::unique_ptr<IObjectStorage> cloneObjectStorage(
diff --git a/src/Disks/ObjectStorages/IObjectStorage.cpp b/src/Disks/ObjectStorages/IObjectStorage.cpp
index 45ecad35747..a810db0cdf8 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/IObjectStorage.cpp
@@ -1,7 +1,9 @@
 #include <Disks/ObjectStorages/IObjectStorage.h>
 #include <Disks/IO/ThreadPoolRemoteFSReader.h>
+#include <Common/getRandomASCIIString.h>
 #include <IO/WriteBufferFromFileBase.h>
 #include <IO/copyData.h>
+#include <IO/ReadBufferFromFileBase.h>
 #include <Interpreters/Context.h>
 
 
@@ -25,15 +27,6 @@ void IObjectStorage::getDirectoryContents(const std::string &,
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "getDirectoryContents() is not supported");
 }
 
-IAsynchronousReader & IObjectStorage::getThreadPoolReader()
-{
-    auto context = Context::getGlobalContextInstance();
-    if (!context)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context not initialized");
-
-    return context->getThreadPoolReader(Context::FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
-}
-
 ThreadPool & IObjectStorage::getThreadPoolWriter()
 {
     auto context = Context::getGlobalContextInstance();
@@ -58,34 +51,40 @@ void IObjectStorage::copyObjectToAnotherObjectStorage( // NOLINT
     out->finalize();
 }
 
-const std::string & IObjectStorage::getCacheBasePath() const
+const std::string & IObjectStorage::getCacheName() const
 {
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "getCacheBasePath() is not implemented for object storage");
-}
-
-void IObjectStorage::applyRemoteThrottlingSettings(ContextPtr context)
-{
-    std::unique_lock lock{throttlers_mutex};
-    remote_read_throttler = context->getRemoteReadThrottler();
-    remote_write_throttler = context->getRemoteWriteThrottler();
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "getCacheName() is not implemented for object storage");
 }
 
 ReadSettings IObjectStorage::patchSettings(const ReadSettings & read_settings) const
 {
-    std::unique_lock lock{throttlers_mutex};
     ReadSettings settings{read_settings};
-    settings.remote_throttler = remote_read_throttler;
     settings.for_object_storage = true;
     return settings;
 }
 
 WriteSettings IObjectStorage::patchSettings(const WriteSettings & write_settings) const
 {
-    std::unique_lock lock{throttlers_mutex};
     WriteSettings settings{write_settings};
-    settings.remote_throttler = remote_write_throttler;
     settings.for_object_storage = true;
     return settings;
 }
 
+std::string IObjectStorage::generateBlobNameForPath(const std::string & /* path */)
+{
+    /// Path to store the new S3 object.
+
+    /// Total length is 32 a-z characters for enough randomness.
+    /// First 3 characters are used as a prefix for
+    /// https://aws.amazon.com/premiumsupport/knowledge-center/s3-object-key-naming-pattern/
+
+    constexpr size_t key_name_total_size = 32;
+    constexpr size_t key_name_prefix_size = 3;
+
+    /// Path to store new S3 object.
+    return fmt::format("{}/{}",
+        getRandomASCIIString(key_name_prefix_size),
+        getRandomASCIIString(key_name_total_size - key_name_prefix_size));
+}
+
 }
diff --git a/src/Disks/ObjectStorages/IObjectStorage.h b/src/Disks/ObjectStorages/IObjectStorage.h
index 2cfb4d43a43..8babb2fbf1a 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.h
+++ b/src/Disks/ObjectStorages/IObjectStorage.h
@@ -12,12 +12,14 @@
 #include <Common/Exception.h>
 #include <IO/ReadSettings.h>
 #include <IO/WriteSettings.h>
+#include <IO/copyData.h>
 
-#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
 #include <Disks/ObjectStorages/StoredObject.h>
 #include <Disks/DiskType.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <Disks/WriteMode.h>
+#include <Interpreters/Context_fwd.h>
+#include <Core/Types.h>
 
 
 namespace DB
@@ -48,8 +50,6 @@ struct ObjectMetadata
     std::optional<ObjectAttributes> attributes;
 };
 
-using FinalizeCallback = std::function<void(size_t bytes_count)>;
-
 /// Base class for all object storages which implement some subset of ordinary filesystem operations.
 ///
 /// Examples of object storages are S3, Azure Blob Storage, HDFS.
@@ -119,7 +119,6 @@ public:
         const StoredObject & object,
         WriteMode mode,
         std::optional<ObjectAttributes> attributes = {},
-        FinalizeCallback && finalize_callback = {},
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         const WriteSettings & write_settings = {}) = 0;
 
@@ -155,10 +154,7 @@ public:
 
     virtual ~IObjectStorage() = default;
 
-    /// Path to directory with objects cache
-    virtual const std::string & getCacheBasePath() const;
-
-    static IAsynchronousReader & getThreadPoolReader();
+    virtual const std::string & getCacheName() const;
 
     static ThreadPool & getThreadPoolWriter();
 
@@ -168,9 +164,10 @@ public:
 
     /// Apply new settings, in most cases reiniatilize client and some other staff
     virtual void applyNewSettings(
-        const Poco::Util::AbstractConfiguration & config,
-        const std::string & config_prefix,
-        ContextPtr context) = 0;
+        const Poco::Util::AbstractConfiguration &,
+        const std::string & /*config_prefix*/,
+        ContextPtr)
+    {}
 
     /// Sometimes object storages have something similar to chroot or namespace, for example
     /// buckets in S3. If object storage doesn't have any namepaces return empty string.
@@ -185,15 +182,12 @@ public:
 
     /// Generate blob name for passed absolute local path.
     /// Path can be generated either independently or based on `path`.
-    virtual std::string generateBlobNameForPath(const std::string & path) = 0;
+    virtual std::string generateBlobNameForPath(const std::string & path);
 
     /// Get unique id for passed absolute path in object storage.
     virtual std::string getUniqueId(const std::string & path) const { return path; }
 
-    virtual bool supportsAppend() const { return false; }
-
-    /// Remove filesystem cache. `path` is a result of object.getPathKeyForCache() method,
-    /// which is used to define a cache key for the source object path.
+    /// Remove filesystem cache.
     virtual void removeCacheIfExists(const std::string & /* path */) {}
 
     virtual bool supportsCache() const { return false; }
@@ -207,12 +201,8 @@ public:
 
     virtual WriteSettings getAdjustedSettingsFromMetadataFile(const WriteSettings & settings, const std::string & /* path */) const { return settings; }
 
-protected:
-    /// Should be called from implementation of applyNewSettings()
-    void applyRemoteThrottlingSettings(ContextPtr context);
-
-    /// Should be used by implementation of read* and write* methods
     virtual ReadSettings patchSettings(const ReadSettings & read_settings) const;
+
     virtual WriteSettings patchSettings(const WriteSettings & write_settings) const;
 
 private:
diff --git a/src/Disks/ObjectStorages/LocalObjectStorage.cpp b/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
similarity index 56%
rename from src/Disks/ObjectStorages/LocalObjectStorage.cpp
rename to src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
index 67e2cc2d74b..05c0c8f3961 100644
--- a/src/Disks/ObjectStorages/LocalObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
@@ -1,10 +1,17 @@
-#include <Disks/ObjectStorages/LocalObjectStorage.h>
+#include <Disks/ObjectStorages/Local/LocalObjectStorage.h>
 
 #include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
+#include <Interpreters/Context.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/logger_useful.h>
+#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 #include <Disks/IO/createReadBufferFromFileBase.h>
+#include <Disks/IO/AsynchronousBoundedReadBuffer.h>
+#include <IO/SeekAvoidingReadBuffer.h>
 #include <IO/WriteBufferFromFile.h>
+#include <IO/copyData.h>
+#include <Common/getRandomASCIIString.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
@@ -14,12 +21,8 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
-}
-
-namespace ErrorCodes
-{
+    extern const int BAD_ARGUMENTS;
     extern const int CANNOT_UNLINK;
 }
 
@@ -38,7 +41,7 @@ LocalObjectStorage::LocalObjectStorage()
 
 bool LocalObjectStorage::exists(const StoredObject & object) const
 {
-    return fs::exists(object.absolute_path);
+    return fs::exists(object.remote_path);
 }
 
 std::unique_ptr<ReadBufferFromFileBase> LocalObjectStorage::readObjects( /// NOLINT
@@ -47,30 +50,44 @@ std::unique_ptr<ReadBufferFromFileBase> LocalObjectStorage::readObjects( /// NOL
     std::optional<size_t> read_hint,
     std::optional<size_t> file_size) const
 {
-    if (objects.size() != 1)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "LocalObjectStorage support read only from single object");
+    auto modified_settings = patchSettings(read_settings);
+    auto global_context = Context::getGlobalContextInstance();
+    auto read_buffer_creator =
+        [=] (const std::string & file_path, size_t /* read_until_position */)
+        -> std::unique_ptr<ReadBufferFromFileBase>
+    {
+        return createReadBufferFromFileBase(file_path, modified_settings, read_hint, file_size);
+    };
 
-    return readObject(objects[0], read_settings, read_hint, file_size);
+    auto impl = std::make_unique<ReadBufferFromRemoteFSGather>(
+        std::move(read_buffer_creator), objects, modified_settings,
+        global_context->getFilesystemCacheLog());
+
+    /// We use `remove_fs_method` (not `local_fs_method`) because we are about to use
+    /// AsynchronousBoundedReadBuffer which works by the remote_fs_* settings.
+    if (modified_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
+    {
+        auto & reader = global_context->getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
+        return std::make_unique<AsynchronousBoundedReadBuffer>(
+            std::move(impl), reader, modified_settings,
+            global_context->getAsyncReadCounters(),
+            global_context->getFilesystemReadPrefetchesLog());
+    }
+    else
+    {
+        auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(impl), modified_settings);
+        return std::make_unique<SeekAvoidingReadBuffer>(
+            std::move(buf), modified_settings.remote_read_min_bytes_for_seek);
+    }
 }
 
-std::string LocalObjectStorage::getUniqueId(const std::string & path) const
+ReadSettings LocalObjectStorage::patchSettings(const ReadSettings & read_settings) const
 {
-    return toString(getINodeNumberFromPath(path));
-}
-
-std::unique_ptr<ReadBufferFromFileBase> LocalObjectStorage::readObject( /// NOLINT
-    const StoredObject & object,
-    const ReadSettings & read_settings,
-    std::optional<size_t> read_hint,
-    std::optional<size_t> file_size) const
-{
-    const auto & path = object.absolute_path;
-
-    if (!file_size)
-        file_size = tryGetSizeFromFilePath(path);
+    if (!read_settings.enable_filesystem_cache)
+        return IObjectStorage::patchSettings(read_settings);
 
+    auto modified_settings{read_settings};
     /// For now we cannot allow asynchronous reader from local filesystem when CachedObjectStorage is used.
-    ReadSettings modified_settings{read_settings};
     switch (modified_settings.local_fs_method)
     {
         case LocalFSReadMethod::pread_threadpool:
@@ -85,23 +102,36 @@ std::unique_ptr<ReadBufferFromFileBase> LocalObjectStorage::readObject( /// NOLI
             break;
         }
     }
+    return IObjectStorage::patchSettings(modified_settings);
+}
+
+std::unique_ptr<ReadBufferFromFileBase> LocalObjectStorage::readObject( /// NOLINT
+    const StoredObject & object,
+    const ReadSettings & read_settings,
+    std::optional<size_t> read_hint,
+    std::optional<size_t> file_size) const
+{
+    const auto & path = object.remote_path;
+
+    if (!file_size)
+        file_size = tryGetSizeFromFilePath(path);
 
     LOG_TEST(log, "Read object: {}", path);
-    return createReadBufferFromFileBase(path, modified_settings, read_hint, file_size);
+    return createReadBufferFromFileBase(path, patchSettings(read_settings), read_hint, file_size);
 }
 
 std::unique_ptr<WriteBufferFromFileBase> LocalObjectStorage::writeObject( /// NOLINT
     const StoredObject & object,
     WriteMode mode,
     std::optional<ObjectAttributes> /* attributes */,
-    FinalizeCallback && /* finalize_callback */,
     size_t buf_size,
     const WriteSettings & /* write_settings */)
 {
-    const auto & path = object.absolute_path;
-    int flags = (mode == WriteMode::Append) ? (O_APPEND | O_CREAT | O_WRONLY) : -1;
-    LOG_TEST(log, "Write object: {}", path);
-    return std::make_unique<WriteBufferFromFile>(path, buf_size, flags);
+    if (mode != WriteMode::Rewrite)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "LocalObjectStorage doesn't support append to files");
+
+    LOG_TEST(log, "Write object: {}", object.remote_path);
+    return std::make_unique<WriteBufferFromFile>(object.remote_path, buf_size);
 }
 
 void LocalObjectStorage::removeObject(const StoredObject & object)
@@ -110,8 +140,8 @@ void LocalObjectStorage::removeObject(const StoredObject & object)
     if (!exists(object))
         return;
 
-    if (0 != unlink(object.absolute_path.data()))
-        throwFromErrnoWithPath("Cannot unlink file " + object.absolute_path, object.absolute_path, ErrorCodes::CANNOT_UNLINK);
+    if (0 != unlink(object.remote_path.data()))
+        throwFromErrnoWithPath("Cannot unlink file " + object.remote_path, object.remote_path, ErrorCodes::CANNOT_UNLINK);
 }
 
 void LocalObjectStorage::removeObjects(const StoredObjects & objects)
@@ -140,16 +170,10 @@ ObjectMetadata LocalObjectStorage::getObjectMetadata(const std::string & /* path
 void LocalObjectStorage::copyObject( // NOLINT
     const StoredObject & object_from, const StoredObject & object_to, std::optional<ObjectAttributes> /* object_to_attributes */)
 {
-    fs::path to = object_to.absolute_path;
-    fs::path from = object_from.absolute_path;
-
-    /// Same logic as in DiskLocal.
-    if (object_from.absolute_path.ends_with('/'))
-        from = from.parent_path();
-    if (fs::is_directory(from))
-        to /= from.filename();
-
-    fs::copy(from, to, fs::copy_options::recursive | fs::copy_options::overwrite_existing);
+    auto in = readObject(object_from);
+    auto out = writeObject(object_to, WriteMode::Rewrite);
+    copyData(*in, *out);
+    out->finalize();
 }
 
 void LocalObjectStorage::shutdown()
@@ -173,4 +197,10 @@ void LocalObjectStorage::applyNewSettings(
 {
 }
 
+std::string LocalObjectStorage::generateBlobNameForPath(const std::string & /* path */)
+{
+    constexpr size_t key_name_total_size = 32;
+    return getRandomASCIIString(key_name_total_size);
+}
+
 }
diff --git a/src/Disks/ObjectStorages/LocalObjectStorage.h b/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
similarity index 92%
rename from src/Disks/ObjectStorages/LocalObjectStorage.h
rename to src/Disks/ObjectStorages/Local/LocalObjectStorage.h
index b04e3fa6285..630320ab7f9 100644
--- a/src/Disks/ObjectStorages/LocalObjectStorage.h
+++ b/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
@@ -41,7 +41,6 @@ public:
         const StoredObject & object,
         WriteMode mode,
         std::optional<ObjectAttributes> attributes = {},
-        FinalizeCallback && finalize_callback = {},
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         const WriteSettings & write_settings = {}) override;
 
@@ -77,14 +76,12 @@ public:
         const std::string & config_prefix,
         ContextPtr context) override;
 
-    bool supportsAppend() const override { return true; }
-
-    std::string generateBlobNameForPath(const std::string & path) override { return path; }
-
-    std::string getUniqueId(const std::string & path) const override;
+    std::string generateBlobNameForPath(const std::string & path) override;
 
     bool isRemote() const override { return false; }
 
+    ReadSettings patchSettings(const ReadSettings & read_settings) const override;
+
 private:
     Poco::Logger * log;
     DataSourceDescription data_source_description;
diff --git a/src/Disks/ObjectStorages/Local/registerLocalObjectStorage.cpp b/src/Disks/ObjectStorages/Local/registerLocalObjectStorage.cpp
new file mode 100644
index 00000000000..251fc77d1f8
--- /dev/null
+++ b/src/Disks/ObjectStorages/Local/registerLocalObjectStorage.cpp
@@ -0,0 +1,44 @@
+#include <Disks/DiskFactory.h>
+#include <Disks/loadLocalDiskConfig.h>
+#include <Disks/ObjectStorages/Local/LocalObjectStorage.h>
+#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
+#include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+void registerDiskLocalObjectStorage(DiskFactory & factory, bool global_skip_access_check)
+{
+    auto creator = [global_skip_access_check](
+        const String & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const String & config_prefix,
+        ContextPtr context,
+        const DisksMap & /*map*/) -> DiskPtr
+    {
+        String path;
+        UInt64 keep_free_space_bytes;
+        loadDiskLocalConfig(name, config, config_prefix, context, path, keep_free_space_bytes);
+        fs::create_directories(path);
+
+        String type = config.getString(config_prefix + ".type");
+        chassert(type == "local_blob_storage");
+
+        std::shared_ptr<LocalObjectStorage> local_storage = std::make_shared<LocalObjectStorage>();
+        MetadataStoragePtr metadata_storage;
+        auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
+        metadata_storage = std::make_shared<MetadataStorageFromDisk>(metadata_disk, path);
+
+        auto disk = std::make_shared<DiskObjectStorage>(
+            name, path, "Local", metadata_storage, local_storage, false, /* threadpool_size */16);
+        disk->startup(context, global_skip_access_check);
+        return disk;
+    };
+    factory.registerDiskType("local_blob_storage", creator);
+}
+
+}
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp b/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp
index 96c8b3daf04..6adf24b5bda 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp
@@ -145,7 +145,7 @@ StoredObjects MetadataStorageFromDisk::getStorageObjects(const std::string & pat
     for (auto & [object_relative_path, size] : object_storage_relative_paths)
     {
         auto object_path = fs::path(metadata->getBlobsCommonPrefix()) / object_relative_path;
-        StoredObject object{ object_path, size, path, [](const String & path_){ return path_; }};
+        StoredObject object{ object_path, size, path };
         object_storage_paths.push_back(object);
     }
 
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
index 214252530a5..a680a344746 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
@@ -108,7 +108,7 @@ StoredObjects MetadataStorageFromPlainObjectStorage::getStorageObjects(const std
 {
     std::string blob_name = object_storage->generateBlobNameForPath(path);
     size_t object_size = getFileSize(blob_name);
-    auto object = StoredObject::create(*object_storage, getAbsolutePath(blob_name), object_size, path, /* exists */true);
+    auto object = StoredObject(getAbsolutePath(blob_name), object_size, path);
     return {std::move(object)};
 }
 
@@ -119,7 +119,7 @@ const IMetadataStorage & MetadataStorageFromPlainObjectStorageTransaction::getSt
 
 void MetadataStorageFromPlainObjectStorageTransaction::unlinkFile(const std::string & path)
 {
-    auto object = StoredObject::create(*metadata_storage.object_storage, metadata_storage.getAbsolutePath(path));
+    auto object = StoredObject(metadata_storage.getAbsolutePath(path));
     metadata_storage.object_storage->removeObject(object);
 }
 
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
index cbba5ed64f9..79e9e1141bb 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -1,7 +1,4 @@
 #include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
-#include <Common/ProfileEvents.h>
-#include <Interpreters/Context.h>
-
 
 #if USE_AWS_S3
 
@@ -9,19 +6,19 @@
 
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 #include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
-#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/AsynchronousBoundedReadBuffer.h>
 #include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
 #include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <IO/WriteBufferFromS3.h>
 #include <IO/ReadBufferFromS3.h>
 #include <IO/SeekAvoidingReadBuffer.h>
 #include <IO/S3/getObjectInfo.h>
 #include <IO/S3/copyS3File.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
 #include <Disks/ObjectStorages/S3/diskSettings.h>
 
-#include <Common/getRandomASCIIString.h>
+#include <Common/ProfileEvents.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/logger_useful.h>
 #include <Common/MultiVersion.h>
@@ -87,27 +84,10 @@ void logIfError(const Aws::Utils::Outcome<Result, Error> & response, std::functi
 
 }
 
-std::string S3ObjectStorage::generateBlobNameForPath(const std::string & /* path */)
-{
-    /// Path to store the new S3 object.
-
-    /// Total length is 32 a-z characters for enough randomness.
-    /// First 3 characters are used as a prefix for
-    /// https://aws.amazon.com/premiumsupport/knowledge-center/s3-object-key-naming-pattern/
-
-    constexpr size_t key_name_total_size = 32;
-    constexpr size_t key_name_prefix_size = 3;
-
-    /// Path to store new S3 object.
-    return fmt::format("{}/{}",
-        getRandomASCIIString(key_name_prefix_size),
-        getRandomASCIIString(key_name_total_size - key_name_prefix_size));
-}
-
 bool S3ObjectStorage::exists(const StoredObject & object) const
 {
     auto settings_ptr = s3_settings.get();
-    return S3::objectExists(*client.get(), bucket, object.absolute_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
+    return S3::objectExists(*client.get(), bucket, object.remote_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
 }
 
 std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObjects( /// NOLINT
@@ -116,17 +96,16 @@ std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObjects( /// NOLINT
     std::optional<size_t>,
     std::optional<size_t>) const
 {
-    assert(!objects[0].getPathKeyForCache().empty());
-
     ReadSettings disk_read_settings = patchSettings(read_settings);
+    auto global_context = Context::getGlobalContextInstance();
 
     auto settings_ptr = s3_settings.get();
 
     auto read_buffer_creator =
         [this, settings_ptr, disk_read_settings]
-        (const std::string & path, size_t read_until_position) -> std::shared_ptr<ReadBufferFromFileBase>
+        (const std::string & path, size_t read_until_position) -> std::unique_ptr<ReadBufferFromFileBase>
     {
-        return std::make_shared<ReadBufferFromS3>(
+        return std::make_unique<ReadBufferFromS3>(
             client.get(),
             bucket,
             path,
@@ -142,12 +121,16 @@ std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObjects( /// NOLINT
     auto s3_impl = std::make_unique<ReadBufferFromRemoteFSGather>(
         std::move(read_buffer_creator),
         objects,
-        disk_read_settings);
+        disk_read_settings,
+        global_context->getFilesystemCacheLog());
 
     if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
     {
-        auto & reader = getThreadPoolReader();
-        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, disk_read_settings, std::move(s3_impl));
+        auto & reader = global_context->getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
+        return std::make_unique<AsynchronousBoundedReadBuffer>(
+            std::move(s3_impl), reader, disk_read_settings,
+            global_context->getAsyncReadCounters(),
+            global_context->getFilesystemReadPrefetchesLog());
     }
     else
     {
@@ -166,7 +149,7 @@ std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObject( /// NOLINT
     return std::make_unique<ReadBufferFromS3>(
         client.get(),
         bucket,
-        object.absolute_path,
+        object.remote_path,
         version_id,
         settings_ptr->request_settings,
         patchSettings(read_settings));
@@ -176,7 +159,6 @@ std::unique_ptr<WriteBufferFromFileBase> S3ObjectStorage::writeObject( /// NOLIN
     const StoredObject & object,
     WriteMode mode, // S3 doesn't support append, only rewrite
     std::optional<ObjectAttributes> attributes,
-    FinalizeCallback && finalize_callback,
     size_t buf_size,
     const WriteSettings & write_settings)
 {
@@ -190,18 +172,15 @@ std::unique_ptr<WriteBufferFromFileBase> S3ObjectStorage::writeObject( /// NOLIN
     if (write_settings.s3_allow_parallel_part_upload)
         scheduler = threadPoolCallbackRunner<void>(getThreadPoolWriter(), "VFSWrite");
 
-    auto s3_buffer = std::make_unique<WriteBufferFromS3>(
+    return std::make_unique<WriteBufferFromS3>(
         client.get(),
         bucket,
-        object.absolute_path,
+        object.remote_path,
+        buf_size,
         settings_ptr->request_settings,
         attributes,
-        buf_size,
         std::move(scheduler),
         disk_write_settings);
-
-    return std::make_unique<WriteIndirectBufferFromRemoteFS>(
-        std::move(s3_buffer), std::move(finalize_callback), object.absolute_path);
 }
 
 void S3ObjectStorage::findAllFiles(const std::string & path, RelativePathsWithSize & children, int max_keys) const
@@ -302,12 +281,12 @@ void S3ObjectStorage::removeObjectImpl(const StoredObject & object, bool if_exis
     ProfileEvents::increment(ProfileEvents::DiskS3DeleteObjects);
     S3::DeleteObjectRequest request;
     request.SetBucket(bucket);
-    request.SetKey(object.absolute_path);
+    request.SetKey(object.remote_path);
     auto outcome = client_ptr->DeleteObject(request);
 
     throwIfUnexpectedError(outcome, if_exists);
 
-    LOG_TRACE(log, "Object with path {} was removed from S3", object.absolute_path);
+    LOG_TRACE(log, "Object with path {} was removed from S3", object.remote_path);
 }
 
 void S3ObjectStorage::removeObjectsImpl(const StoredObjects & objects, bool if_exists)
@@ -335,12 +314,12 @@ void S3ObjectStorage::removeObjectsImpl(const StoredObjects & objects, bool if_e
             for (; current_position < objects.size() && current_chunk.size() < chunk_size_limit; ++current_position)
             {
                 Aws::S3::Model::ObjectIdentifier obj;
-                obj.SetKey(objects[current_position].absolute_path);
+                obj.SetKey(objects[current_position].remote_path);
                 current_chunk.push_back(obj);
 
                 if (!keys.empty())
                     keys += ", ";
-                keys += objects[current_position].absolute_path;
+                keys += objects[current_position].remote_path;
             }
 
             Aws::S3::Model::Delete delkeys;
@@ -404,9 +383,9 @@ void S3ObjectStorage::copyObjectToAnotherObjectStorage( // NOLINT
     {
         auto client_ptr = client.get();
         auto settings_ptr = s3_settings.get();
-        auto size = S3::getObjectSize(*client_ptr, bucket, object_from.absolute_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
+        auto size = S3::getObjectSize(*client_ptr, bucket, object_from.remote_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
         auto scheduler = threadPoolCallbackRunner<void>(getThreadPoolWriter(), "S3ObjStor_copy");
-        copyS3File(client_ptr, bucket, object_from.absolute_path, 0, size, dest_s3->bucket, object_to.absolute_path,
+        copyS3File(client_ptr, bucket, object_from.remote_path, 0, size, dest_s3->bucket, object_to.remote_path,
                    settings_ptr->request_settings, object_to_attributes, scheduler, /* for_disk_s3= */ true);
     }
     else
@@ -420,9 +399,9 @@ void S3ObjectStorage::copyObject( // NOLINT
 {
     auto client_ptr = client.get();
     auto settings_ptr = s3_settings.get();
-    auto size = S3::getObjectSize(*client_ptr, bucket, object_from.absolute_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
+    auto size = S3::getObjectSize(*client_ptr, bucket, object_from.remote_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
     auto scheduler = threadPoolCallbackRunner<void>(getThreadPoolWriter(), "S3ObjStor_copy");
-    copyS3File(client_ptr, bucket, object_from.absolute_path, 0, size, bucket, object_to.absolute_path,
+    copyS3File(client_ptr, bucket, object_from.remote_path, 0, size, bucket, object_to.remote_path,
                settings_ptr->request_settings, object_to_attributes, scheduler, /* for_disk_s3= */ true);
 }
 
@@ -460,7 +439,6 @@ void S3ObjectStorage::applyNewSettings(const Poco::Util::AbstractConfiguration &
     auto new_client = getClient(config, config_prefix, context, *new_s3_settings);
     s3_settings.set(std::move(new_s3_settings));
     client.set(std::move(new_client));
-    applyRemoteThrottlingSettings(context);
 }
 
 std::unique_ptr<IObjectStorage> S3ObjectStorage::cloneObjectStorage(
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
index bcdc97983be..70ed899586e 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
@@ -9,7 +9,6 @@
 #include <memory>
 #include <Storages/StorageS3Settings.h>
 #include <Common/MultiVersion.h>
-#include <Common/logger_useful.h>
 
 
 namespace DB
@@ -98,7 +97,6 @@ public:
         const StoredObject & object,
         WriteMode mode,
         std::optional<ObjectAttributes> attributes = {},
-        FinalizeCallback && finalize_callback = {},
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         const WriteSettings & write_settings = {}) override;
 
@@ -145,8 +143,6 @@ public:
 
     std::string getObjectsNamespace() const override { return bucket; }
 
-    std::string generateBlobNameForPath(const std::string & path) override;
-
     bool isRemote() const override { return true; }
 
     void setCapabilitiesSupportBatchDelete(bool value) { s3_capabilities.support_batch_delete = value; }
diff --git a/src/Disks/ObjectStorages/S3/diskSettings.cpp b/src/Disks/ObjectStorages/S3/diskSettings.cpp
index e0e4735f519..409eb2a3dc3 100644
--- a/src/Disks/ObjectStorages/S3/diskSettings.cpp
+++ b/src/Disks/ObjectStorages/S3/diskSettings.cpp
@@ -13,6 +13,7 @@
 #include <aws/core/client/DefaultRetryStrategy.h>
 #include <base/getFQDNOrHostName.h>
 #include <IO/S3Common.h>
+#include <IO/S3/Credentials.h>
 
 #include <Storages/StorageS3Settings.h>
 #include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
@@ -127,7 +128,7 @@ std::unique_ptr<S3::Client> getClient(
     if (uri.key.back() != '/')
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "S3 path must ends with '/', but '{}' doesn't.", uri.key);
 
-    client_configuration.connectTimeoutMs = config.getUInt(config_prefix + ".connect_timeout_ms", 10000);
+    client_configuration.connectTimeoutMs = config.getUInt(config_prefix + ".connect_timeout_ms", 1000);
     client_configuration.requestTimeoutMs = config.getUInt(config_prefix + ".request_timeout_ms", 30000);
     client_configuration.maxConnections = config.getUInt(config_prefix + ".max_connections", 100);
     client_configuration.endpointOverride = uri.endpoint;
@@ -141,8 +142,12 @@ std::unique_ptr<S3::Client> getClient(
             = [proxy_config](const auto & request_config) { proxy_config->errorReport(request_config); };
     }
 
+    HTTPHeaderEntries headers = S3::getHTTPHeaders(config_prefix, config);
+    S3::ServerSideEncryptionKMSConfig sse_kms_config = S3::getSSEKMSConfig(config_prefix, config);
+
     client_configuration.retryStrategy
-        = std::make_shared<Aws::Client::DefaultRetryStrategy>(config.getUInt(config_prefix + ".retry_attempts", 10));
+        = std::make_shared<Aws::Client::DefaultRetryStrategy>(
+            config.getUInt64(config_prefix + ".retry_attempts", settings.request_settings.retry_attempts));
 
     return S3::ClientFactory::instance().create(
         client_configuration,
@@ -150,9 +155,15 @@ std::unique_ptr<S3::Client> getClient(
         config.getString(config_prefix + ".access_key_id", ""),
         config.getString(config_prefix + ".secret_access_key", ""),
         config.getString(config_prefix + ".server_side_encryption_customer_key_base64", ""),
-        {},
-        config.getBool(config_prefix + ".use_environment_credentials", config.getBool("s3.use_environment_credentials", false)),
-        config.getBool(config_prefix + ".use_insecure_imds_request", config.getBool("s3.use_insecure_imds_request", false)));
+        std::move(sse_kms_config),
+        std::move(headers),
+        S3::CredentialsConfiguration
+        {
+            config.getBool(config_prefix + ".use_environment_credentials", config.getBool("s3.use_environment_credentials", true)),
+            config.getBool(config_prefix + ".use_insecure_imds_request", config.getBool("s3.use_insecure_imds_request", false)),
+            config.getUInt64(config_prefix + ".expiration_window_seconds", config.getUInt64("s3.expiration_window_seconds", S3::DEFAULT_EXPIRATION_WINDOW_SECONDS)),
+            config.getBool(config_prefix + ".no_sign_request", config.getBool("s3.no_sign_request", false))
+        });
 }
 
 }
diff --git a/src/Disks/ObjectStorages/S3/registerDiskS3.cpp b/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
index 1c192a0d89c..f3a57069a30 100644
--- a/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
+++ b/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
@@ -8,7 +8,6 @@
 
 #if USE_AWS_S3
 
-#include <aws/core/client/DefaultRetryStrategy.h>
 #include <base/getFQDNOrHostName.h>
 
 #include <Disks/DiskLocal.h>
@@ -19,9 +18,7 @@
 #include <Disks/ObjectStorages/S3/diskSettings.h>
 #include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
 #include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h>
-#include <IO/S3Common.h>
 
-#include <Storages/StorageS3Settings.h>
 #include <Core/ServerUUID.h>
 #include <Common/Macros.h>
 
@@ -87,10 +84,10 @@ public:
 private:
     static String getServerUUID()
     {
-        DB::UUID server_uuid = DB::ServerUUID::get();
-        if (server_uuid == DB::UUIDHelpers::Nil)
+        UUID server_uuid = ServerUUID::get();
+        if (server_uuid == UUIDHelpers::Nil)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Server UUID is not initialized");
-        return DB::toString(server_uuid);
+        return toString(server_uuid);
     }
 };
 
@@ -177,6 +174,6 @@ void registerDiskS3(DiskFactory & factory, bool global_skip_access_check)
 
 #else
 
-void registerDiskS3(DiskFactory &, bool /* global_skip_access_check */) {}
+void registerDiskS3(DB::DiskFactory &, bool /* global_skip_access_check */) {}
 
 #endif
diff --git a/src/Disks/ObjectStorages/StoredObject.cpp b/src/Disks/ObjectStorages/StoredObject.cpp
index 20f50d7676d..6a363c64107 100644
--- a/src/Disks/ObjectStorages/StoredObject.cpp
+++ b/src/Disks/ObjectStorages/StoredObject.cpp
@@ -1,72 +1,14 @@
 #include <Disks/ObjectStorages/StoredObject.h>
 
-#include <Disks/ObjectStorages/IMetadataStorage.h>
-#include <Disks/ObjectStorages/IObjectStorage.h>
-#include <Common/logger_useful.h>
-
-
 namespace DB
 {
 
-StoredObject::StoredObject(
-    const std::string & absolute_path_,
-    uint64_t bytes_size_,
-    const std::string & mapped_path_,
-    PathKeyForCacheCreator && path_key_for_cache_creator_)
-    : absolute_path(absolute_path_)
-    , mapped_path(mapped_path_)
-    , bytes_size(bytes_size_)
-    , path_key_for_cache_creator(std::move(path_key_for_cache_creator_))
+size_t getTotalSize(const StoredObjects & objects)
 {
-}
-
-std::string StoredObject::getPathKeyForCache() const
-{
-    if (!path_key_for_cache_creator)
-        return ""; /// This empty result need to be used with care.
-
-    return path_key_for_cache_creator(absolute_path);
-}
-
-const std::string & StoredObject::getMappedPath() const
-{
-    return mapped_path;
-}
-
-StoredObject StoredObject::create(
-    const IObjectStorage & object_storage,
-    const std::string & object_path,
-    size_t object_size,
-    const std::string & mapped_path,
-    bool exists,
-    bool object_bypasses_cache)
-{
-    if (object_bypasses_cache)
-        return StoredObject(object_path, object_size, mapped_path, {});
-
-    PathKeyForCacheCreator path_key_for_cache_creator = [&object_storage](const std::string & path) -> std::string
-    {
-        try
-        {
-            return object_storage.getUniqueId(path);
-        }
-        catch (...)
-        {
-            LOG_DEBUG(
-               &Poco::Logger::get("StoredObject"),
-                "Object does not exist while getting cache path hint (object path: {})",
-                path);
-
-            return "";
-        }
-    };
-
-    if (exists)
-    {
-        path_key_for_cache_creator = [path = path_key_for_cache_creator(object_path)](const std::string &) { return path; };
-    }
-
-    return StoredObject(object_path, object_size, mapped_path, std::move(path_key_for_cache_creator));
+    size_t size = 0;
+    for (const auto & object : objects)
+        size += object.bytes_size;
+    return size;
 }
 
 }
diff --git a/src/Disks/ObjectStorages/StoredObject.h b/src/Disks/ObjectStorages/StoredObject.h
index 04bd0b26495..8afbb116a83 100644
--- a/src/Disks/ObjectStorages/StoredObject.h
+++ b/src/Disks/ObjectStorages/StoredObject.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <functional>
 #include <string>
 #include <Disks/ObjectStorages/IObjectStorage_fwd.h>
 
@@ -10,40 +11,24 @@ namespace DB
 /// Object metadata: path, size, path_key_for_cache.
 struct StoredObject
 {
-    /// Absolute path of the blob in object storage.
-    std::string absolute_path;
-    /// A map which is mapped to current blob (for example, a corresponding local path as clickhouse sees it).
-    std::string mapped_path;
+    std::string remote_path;
+    std::string local_path; /// or equivalent "metadata_path"
 
     uint64_t bytes_size = 0;
 
-    std::string getPathKeyForCache() const;
-
-    const std::string & getMappedPath() const;
-
-    /// Create `StoredObject` based on metadata storage and blob name of the object.
-    static StoredObject create(
-        const IObjectStorage & object_storage,
-        const std::string & object_path,
-        size_t object_size = 0,
-        const std::string & mapped_path = "",
-        bool exists = false,
-        bool object_bypasses_cache = false);
-
-    /// Optional hint for cache. Use delayed initialization
-    /// because somecache hint implementation requires it.
-    using PathKeyForCacheCreator = std::function<std::string(const std::string &)>;
-    PathKeyForCacheCreator path_key_for_cache_creator;
-
     StoredObject() = default;
 
     explicit StoredObject(
-        const std::string & absolute_path_,
+        const std::string & remote_path_,
         uint64_t bytes_size_ = 0,
-        const std::string & mapped_path_ = "",
-        PathKeyForCacheCreator && path_key_for_cache_creator_ = {});
+        const std::string & local_path_ = "")
+    : remote_path(remote_path_)
+    , local_path(local_path_)
+    , bytes_size(bytes_size_) {}
 };
 
 using StoredObjects = std::vector<StoredObject>;
 
+size_t getTotalSize(const StoredObjects & objects);
+
 }
diff --git a/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
index 69536354aa9..59e66969ec0 100644
--- a/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
+++ b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
@@ -108,7 +108,7 @@ StoredObjects MetadataStorageFromStaticFilesWebServer::getStorageObjects(const s
     auto fs_path = fs::path(object_storage.url) / path;
     std::string remote_path = fs_path.parent_path() / (escapeForFileName(fs_path.stem()) + fs_path.extension().string());
     remote_path = remote_path.substr(object_storage.url.size());
-    return {StoredObject::create(object_storage, remote_path, object_storage.files.at(path).size, path, true)};
+    return {StoredObject(remote_path, object_storage.files.at(path).size, path)};
 }
 
 std::vector<std::string> MetadataStorageFromStaticFilesWebServer::listDirectory(const std::string & path) const
diff --git a/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp b/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
index 4365156d93d..4f34f3eed9c 100644
--- a/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
@@ -9,10 +9,11 @@
 #include <IO/WriteHelpers.h>
 
 #include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/AsynchronousBoundedReadBuffer.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 #include <Disks/IO/ReadBufferFromWebServer.h>
 #include <Disks/IO/ThreadPoolRemoteFSReader.h>
+#include <Disks/IO/getThreadPoolReader.h>
 
 #include <Storages/MergeTree/MergeTreeData.h>
 
@@ -119,7 +120,7 @@ WebObjectStorage::WebObjectStorage(
 
 bool WebObjectStorage::exists(const StoredObject & object) const
 {
-    const auto & path = object.absolute_path;
+    const auto & path = object.remote_path;
 
     LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Checking existence of path: {}", path);
 
@@ -169,9 +170,9 @@ std::unique_ptr<ReadBufferFromFileBase> WebObjectStorage::readObject( /// NOLINT
 {
     auto read_buffer_creator =
          [this, read_settings]
-         (const std::string & path_, size_t read_until_position) -> std::shared_ptr<ReadBufferFromFileBase>
+         (const std::string & path_, size_t read_until_position) -> std::unique_ptr<ReadBufferFromFileBase>
      {
-         return std::make_shared<ReadBufferFromWebServer>(
+         return std::make_unique<ReadBufferFromWebServer>(
              fs::path(url) / path_,
              getContext(),
              read_settings,
@@ -179,12 +180,20 @@ std::unique_ptr<ReadBufferFromFileBase> WebObjectStorage::readObject( /// NOLINT
              read_until_position);
      };
 
-    auto web_impl = std::make_unique<ReadBufferFromRemoteFSGather>(std::move(read_buffer_creator), StoredObjects{object}, read_settings);
+    auto global_context = Context::getGlobalContextInstance();
+    auto web_impl = std::make_unique<ReadBufferFromRemoteFSGather>(
+        std::move(read_buffer_creator),
+        StoredObjects{object},
+        read_settings,
+        global_context->getFilesystemCacheLog());
 
     if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
     {
-        auto & reader = IObjectStorage::getThreadPoolReader();
-        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, read_settings, std::move(web_impl), min_bytes_for_seek);
+        auto & reader = global_context->getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
+        return std::make_unique<AsynchronousBoundedReadBuffer>(
+            std::move(web_impl), reader, read_settings,
+            global_context->getAsyncReadCounters(),
+            global_context->getFilesystemReadPrefetchesLog());
     }
     else
     {
@@ -202,7 +211,6 @@ std::unique_ptr<WriteBufferFromFileBase> WebObjectStorage::writeObject( /// NOLI
     const StoredObject & /* object */,
     WriteMode /* mode */,
     std::optional<ObjectAttributes> /* attributes */,
-    FinalizeCallback && /* finalize_callback */,
     size_t /* buf_size */,
     const WriteSettings & /* write_settings */)
 {
diff --git a/src/Disks/ObjectStorages/Web/WebObjectStorage.h b/src/Disks/ObjectStorages/Web/WebObjectStorage.h
index 2dab8fdb62d..e85b7224892 100644
--- a/src/Disks/ObjectStorages/Web/WebObjectStorage.h
+++ b/src/Disks/ObjectStorages/Web/WebObjectStorage.h
@@ -51,7 +51,6 @@ public:
         const StoredObject & object,
         WriteMode mode,
         std::optional<ObjectAttributes> attributes = {},
-        FinalizeCallback && finalize_callback = {},
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         const WriteSettings & write_settings = {}) override;
 
@@ -87,8 +86,6 @@ public:
         const std::string & config_prefix,
         ContextPtr context) override;
 
-    bool supportsAppend() const override { return false; }
-
     std::string generateBlobNameForPath(const std::string & path) override { return path; }
 
     bool isRemote() const override { return true; }
diff --git a/src/Disks/StoragePolicy.cpp b/src/Disks/StoragePolicy.cpp
index ec0f201b801..f4be8b8fe86 100644
--- a/src/Disks/StoragePolicy.cpp
+++ b/src/Disks/StoragePolicy.cpp
@@ -7,6 +7,7 @@
 #include <Common/escapeForFileName.h>
 #include <Common/formatReadable.h>
 #include <Common/quoteString.h>
+#include <Common/logger_useful.h>
 
 #include <set>
 
diff --git a/src/Disks/StoragePolicy.h b/src/Disks/StoragePolicy.h
index 7e6aff7bbda..69cfb830818 100644
--- a/src/Disks/StoragePolicy.h
+++ b/src/Disks/StoragePolicy.h
@@ -10,7 +10,6 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
-#include <Common/logger_useful.h>
 
 #include <memory>
 #include <mutex>
diff --git a/src/Disks/TemporaryFileOnDisk.cpp b/src/Disks/TemporaryFileOnDisk.cpp
index d31b09b2185..6fe6fd5a1c9 100644
--- a/src/Disks/TemporaryFileOnDisk.cpp
+++ b/src/Disks/TemporaryFileOnDisk.cpp
@@ -27,7 +27,7 @@ TemporaryFileOnDisk::TemporaryFileOnDisk(const DiskPtr & disk_)
     : TemporaryFileOnDisk(disk_, "")
 {}
 
-TemporaryFileOnDisk::TemporaryFileOnDisk(const DiskPtr & disk_, CurrentMetrics::Value metric_scope)
+TemporaryFileOnDisk::TemporaryFileOnDisk(const DiskPtr & disk_, CurrentMetrics::Metric metric_scope)
     : TemporaryFileOnDisk(disk_)
 {
     sub_metric_increment.emplace(metric_scope);
diff --git a/src/Disks/TemporaryFileOnDisk.h b/src/Disks/TemporaryFileOnDisk.h
index 9ba59c3eaf0..4c376383087 100644
--- a/src/Disks/TemporaryFileOnDisk.h
+++ b/src/Disks/TemporaryFileOnDisk.h
@@ -17,7 +17,7 @@ class TemporaryFileOnDisk
 {
 public:
     explicit TemporaryFileOnDisk(const DiskPtr & disk_);
-    explicit TemporaryFileOnDisk(const DiskPtr & disk_, CurrentMetrics::Value metric_scope);
+    explicit TemporaryFileOnDisk(const DiskPtr & disk_, CurrentMetrics::Metric metric_scope);
     explicit TemporaryFileOnDisk(const DiskPtr & disk_, const String & prefix);
 
     ~TemporaryFileOnDisk();
diff --git a/src/Disks/VolumeJBOD.h b/src/Disks/VolumeJBOD.h
index 81da64c488d..ef6f215bf18 100644
--- a/src/Disks/VolumeJBOD.h
+++ b/src/Disks/VolumeJBOD.h
@@ -2,6 +2,7 @@
 
 #include <memory>
 #include <optional>
+#include <queue>
 
 #include <Disks/IVolume.h>
 
diff --git a/src/Disks/getDiskConfigurationFromAST.cpp b/src/Disks/getDiskConfigurationFromAST.cpp
index e6b08046036..4b1323b4db8 100644
--- a/src/Disks/getDiskConfigurationFromAST.cpp
+++ b/src/Disks/getDiskConfigurationFromAST.cpp
@@ -83,4 +83,24 @@ DiskConfigurationPtr getDiskConfigurationFromAST(const std::string & root_name,
     return conf;
 }
 
+
+ASTs convertDiskConfigurationToAST(const Poco::Util::AbstractConfiguration & configuration, const std::string & config_path)
+{
+    ASTs result;
+
+    Poco::Util::AbstractConfiguration::Keys keys;
+    configuration.keys(config_path, keys);
+
+    for (const auto & key : keys)
+    {
+        result.push_back(
+            makeASTFunction(
+                "equals",
+                std::make_shared<ASTIdentifier>(key),
+                std::make_shared<ASTLiteral>(configuration.getString(config_path + "." + key))));
+    }
+
+    return result;
+}
+
 }
diff --git a/src/Disks/getDiskConfigurationFromAST.h b/src/Disks/getDiskConfigurationFromAST.h
index 1f9d7c1bfe6..5697955e914 100644
--- a/src/Disks/getDiskConfigurationFromAST.h
+++ b/src/Disks/getDiskConfigurationFromAST.h
@@ -25,4 +25,12 @@ using DiskConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfiguration>;
  */
 DiskConfigurationPtr getDiskConfigurationFromAST(const std::string & root_name, const ASTs & disk_args, ContextPtr context);
 
+/// The same as above function, but return XML::Document for easier modification of result configuration.
+[[ maybe_unused ]] Poco::AutoPtr<Poco::XML::Document> getDiskConfigurationFromASTImpl(const std::string & root_name, const ASTs & disk_args, ContextPtr context);
+
+/*
+ * A reverse function.
+ */
+[[ maybe_unused ]] ASTs convertDiskConfigurationToAST(const Poco::Util::AbstractConfiguration & configuration, const std::string & config_path);
+
 }
diff --git a/src/Disks/getOrCreateDiskFromAST.cpp b/src/Disks/getOrCreateDiskFromAST.cpp
index 5deb9ab11b5..637acff7b95 100644
--- a/src/Disks/getOrCreateDiskFromAST.cpp
+++ b/src/Disks/getOrCreateDiskFromAST.cpp
@@ -6,9 +6,13 @@
 #include <Disks/DiskSelector.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/isDiskFunction.h>
 #include <Interpreters/Context.h>
+#include <Parsers/IAST.h>
+#include <Interpreters/InDepthNodeVisitor.h>
 
 namespace DB
 {
@@ -18,43 +22,85 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-std::string getOrCreateDiskFromDiskAST(const ASTFunction & function, ContextPtr context)
+namespace
 {
-    /// We need a unique name for a created custom disk, but it needs to be the same
-    /// after table is reattached or server is restarted, so take a hash of the disk
-    /// configuration serialized ast as a disk name suffix.
-    auto disk_setting_string = serializeAST(function, true);
-    auto disk_name = DiskSelector::TMP_INTERNAL_DISK_PREFIX
-        + toString(sipHash128(disk_setting_string.data(), disk_setting_string.size()));
-
-    auto result_disk = context->getOrCreateDisk(disk_name, [&](const DisksMap & disks_map) -> DiskPtr {
-        const auto * function_args_expr = assert_cast<const ASTExpressionList *>(function.arguments.get());
-        const auto & function_args = function_args_expr->children;
-        auto config = getDiskConfigurationFromAST(disk_name, function_args, context);
-        auto disk = DiskFactory::instance().create(disk_name, *config, disk_name, context, disks_map);
-        /// Mark that disk can be used without storage policy.
-        disk->markDiskAsCustom();
-        return disk;
-    });
-
-    if (!result_disk->isRemote())
+    std::string getOrCreateDiskFromDiskAST(const ASTFunction & function, ContextPtr context)
     {
-        static constexpr auto custom_disks_base_dir_in_config = "custom_local_disks_base_directory";
-        auto disk_path_expected_prefix = context->getConfigRef().getString(custom_disks_base_dir_in_config, "");
+        /// We need a unique name for a created custom disk, but it needs to be the same
+        /// after table is reattached or server is restarted, so take a hash of the disk
+        /// configuration serialized ast as a disk name suffix.
+        auto disk_setting_string = serializeAST(function, true);
+        auto disk_name = DiskSelector::TMP_INTERNAL_DISK_PREFIX
+            + toString(sipHash128(disk_setting_string.data(), disk_setting_string.size()));
 
-        if (disk_path_expected_prefix.empty())
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS,
-                "Base path for custom local disks must be defined in config file by `{}`",
-                custom_disks_base_dir_in_config);
+        auto result_disk = context->getOrCreateDisk(disk_name, [&](const DisksMap & disks_map) -> DiskPtr {
+            const auto * function_args_expr = assert_cast<const ASTExpressionList *>(function.arguments.get());
+            const auto & function_args = function_args_expr->children;
+            auto config = getDiskConfigurationFromAST(disk_name, function_args, context);
+            auto disk = DiskFactory::instance().create(disk_name, *config, disk_name, context, disks_map);
+            /// Mark that disk can be used without storage policy.
+            disk->markDiskAsCustom();
+            return disk;
+        });
 
-        if (!pathStartsWith(result_disk->getPath(), disk_path_expected_prefix))
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS,
-                "Path of the custom local disk must be inside `{}` directory",
-                disk_path_expected_prefix);
+        if (!result_disk->isRemote())
+        {
+            static constexpr auto custom_disks_base_dir_in_config = "custom_local_disks_base_directory";
+            auto disk_path_expected_prefix = context->getConfigRef().getString(custom_disks_base_dir_in_config, "");
+
+            if (disk_path_expected_prefix.empty())
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Base path for custom local disks must be defined in config file by `{}`",
+                    custom_disks_base_dir_in_config);
+
+            if (!pathStartsWith(result_disk->getPath(), disk_path_expected_prefix))
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Path of the custom local disk must be inside `{}` directory",
+                    disk_path_expected_prefix);
+        }
+
+        return disk_name;
     }
 
+    class DiskConfigurationFlattener
+    {
+    public:
+        struct Data
+        {
+            ContextPtr context;
+        };
+
+        static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+
+        static void visit(ASTPtr & ast, Data & data)
+        {
+            if (isDiskFunction(ast))
+            {
+                auto disk_name = getOrCreateDiskFromDiskAST(*ast->as<ASTFunction>(), data.context);
+                ast = std::make_shared<ASTLiteral>(disk_name);
+            }
+        }
+    };
+
+    /// Visits children first.
+    using FlattenDiskConfigurationVisitor = InDepthNodeVisitor<DiskConfigurationFlattener, false>;
+}
+
+
+std::string getOrCreateDiskFromDiskAST(const ASTPtr & disk_function, ContextPtr context)
+{
+    if (!isDiskFunction(disk_function))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected a disk function");
+
+    auto ast = disk_function->clone();
+
+    FlattenDiskConfigurationVisitor::Data data{context};
+    FlattenDiskConfigurationVisitor{data}.visit(ast);
+
+    auto disk_name = assert_cast<const ASTLiteral &>(*ast).value.get<String>();
+    LOG_TRACE(&Poco::Logger::get("getOrCreateDiskFromDiskAST"), "Result disk name: {}", disk_name);
     return disk_name;
 }
 
diff --git a/src/Disks/getOrCreateDiskFromAST.h b/src/Disks/getOrCreateDiskFromAST.h
index 7c64707b0bd..0195f575278 100644
--- a/src/Disks/getOrCreateDiskFromAST.h
+++ b/src/Disks/getOrCreateDiskFromAST.h
@@ -13,6 +13,6 @@ class ASTFunction;
  * add it to DiskSelector by a unique (but always the same for given configuration) disk name
  * and return this name.
  */
-std::string getOrCreateDiskFromDiskAST(const ASTFunction & function, ContextPtr context);
+std::string getOrCreateDiskFromDiskAST(const ASTPtr & disk_function, ContextPtr context);
 
 }
diff --git a/src/Disks/loadLocalDiskConfig.cpp b/src/Disks/loadLocalDiskConfig.cpp
new file mode 100644
index 00000000000..0e5eca17ca7
--- /dev/null
+++ b/src/Disks/loadLocalDiskConfig.cpp
@@ -0,0 +1,63 @@
+#include <Disks/loadLocalDiskConfig.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Interpreters/Context.h>
+#include <Disks/DiskLocal.h>
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_ELEMENT_IN_CONFIG;
+    extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
+}
+
+void loadDiskLocalConfig(const String & name,
+                      const Poco::Util::AbstractConfiguration & config,
+                      const String & config_prefix,
+                      ContextPtr context,
+                      String & path,
+                      UInt64 & keep_free_space_bytes)
+{
+    path = config.getString(config_prefix + ".path", "");
+    if (name == "default")
+    {
+        if (!path.empty())
+            throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+                "\"default\" disk path should be provided in <path> not it <storage_configuration>");
+        path = context->getPath();
+    }
+    else
+    {
+        if (path.empty())
+            throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Disk path can not be empty. Disk {}", name);
+        if (path.back() != '/')
+            throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Disk path must end with /. Disk {}", name);
+        if (path == context->getPath())
+            throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Disk path ('{}') cannot be equal to <path>. Use <default> disk instead.", path);
+    }
+
+    bool has_space_ratio = config.has(config_prefix + ".keep_free_space_ratio");
+
+    if (config.has(config_prefix + ".keep_free_space_bytes") && has_space_ratio)
+        throw Exception(ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG,
+                        "Only one of 'keep_free_space_bytes' and 'keep_free_space_ratio' can be specified");
+
+    keep_free_space_bytes = config.getUInt64(config_prefix + ".keep_free_space_bytes", 0);
+
+    if (has_space_ratio)
+    {
+        auto ratio = config.getDouble(config_prefix + ".keep_free_space_ratio");
+        if (ratio < 0 || ratio > 1)
+            throw Exception(ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG, "'keep_free_space_ratio' have to be between 0 and 1");
+        String tmp_path = path;
+        if (tmp_path.empty())
+            tmp_path = context->getPath();
+
+        // Create tmp disk for getting total disk space.
+        keep_free_space_bytes = static_cast<UInt64>(DiskLocal("tmp", tmp_path, 0).getTotalSpace() * ratio);
+    }
+}
+
+}
diff --git a/src/Disks/loadLocalDiskConfig.h b/src/Disks/loadLocalDiskConfig.h
new file mode 100644
index 00000000000..ba1ac5378a4
--- /dev/null
+++ b/src/Disks/loadLocalDiskConfig.h
@@ -0,0 +1,16 @@
+#pragma once
+#include <Core/Types.h>
+#include <Interpreters/Context_fwd.h>
+
+namespace Poco::Util { class AbstractConfiguration; }
+
+namespace DB
+{
+void loadDiskLocalConfig(
+    const String & name,
+    const Poco::Util::AbstractConfiguration & config,
+    const String & config_prefix,
+    ContextPtr context,
+    String & path,
+    UInt64 & keep_free_space_bytes);
+}
diff --git a/src/Disks/registerDisks.cpp b/src/Disks/registerDisks.cpp
index cae83203553..48d5a19fb61 100644
--- a/src/Disks/registerDisks.cpp
+++ b/src/Disks/registerDisks.cpp
@@ -29,6 +29,9 @@ void registerDiskWebServer(DiskFactory & factory, bool global_skip_access_check)
 
 void registerDiskCache(DiskFactory & factory, bool global_skip_access_check);
 
+void registerDiskLocalObjectStorage(DiskFactory & factory, bool global_skip_access_check);
+
+
 void registerDisks(bool global_skip_access_check)
 {
     auto & factory = DiskFactory::instance();
@@ -54,6 +57,8 @@ void registerDisks(bool global_skip_access_check)
     registerDiskWebServer(factory, global_skip_access_check);
 
     registerDiskCache(factory, global_skip_access_check);
+
+    registerDiskLocalObjectStorage(factory, global_skip_access_check);
 }
 
 }
diff --git a/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp b/src/Disks/tests/gtest_cascade_and_memory_write_buffer.cpp
similarity index 84%
rename from src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
rename to src/Disks/tests/gtest_cascade_and_memory_write_buffer.cpp
index 36b4ec10de0..a24056a141f 100644
--- a/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
+++ b/src/Disks/tests/gtest_cascade_and_memory_write_buffer.cpp
@@ -3,11 +3,14 @@
 #include <stdexcept>
 #include <IO/CascadeWriteBuffer.h>
 #include <IO/MemoryReadWriteBuffer.h>
-#include <IO/WriteBufferFromTemporaryFile.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/ConcatReadBuffer.h>
 #include <IO/copyData.h>
 #include <Common/typeid_cast.h>
+#include <Disks/DiskLocal.h>
+#include <Disks/IO/WriteBufferFromTemporaryFile.h>
+#include <Disks/TemporaryFileOnDisk.h>
+
 #include <filesystem>
 
 namespace fs = std::filesystem;
@@ -22,6 +25,26 @@ static std::string makeTestArray(size_t size)
     return res;
 }
 
+class TestCascadeWriteBufferWithDisk : public testing::Test
+{
+public:
+    constexpr static auto tmp_root = "tmp/RereadWithTemporaryFileWriteBuffer/";
+
+    void SetUp() override
+    {
+        fs::create_directories(tmp_root);
+        disk = std::make_shared<DB::DiskLocal>("local_disk", tmp_root, 0);
+    }
+
+    void TearDown() override
+    {
+        disk.reset();
+        fs::remove_all(tmp_root);
+    }
+
+    DB::DiskPtr disk;
+};
+
 static void testCascadeBufferRedability(
     std::string data,
     CascadeWriteBuffer::WriteBufferPtrs && arg1,
@@ -198,7 +221,7 @@ TEST(MemoryWriteBuffer, WriteAndReread)
         if (s > 1)
         {
             MemoryWriteBuffer buf(s - 1);
-            EXPECT_THROW(buf.write(data.data(), data.size()), DB::Exception);
+            EXPECT_THROW(buf.write(data.data(), data.size()), MemoryWriteBuffer::CurrentBufferExhausted);
         }
     }
 
@@ -206,17 +229,18 @@ TEST(MemoryWriteBuffer, WriteAndReread)
 }
 
 
-TEST(TemporaryFileWriteBuffer, WriteAndReread)
+TEST_F(TestCascadeWriteBufferWithDisk, WriteAndReread)
 try
 {
     for (size_t s = 0; s < 2500000; s += 500000)
     {
-        std::string tmp_template = "tmp/TemporaryFileWriteBuffer/";
         std::string data = makeTestArray(s);
 
-        auto buf = WriteBufferFromTemporaryFile::create(tmp_template);
+        auto tmp_file = std::make_unique<TemporaryFileOnDisk>(disk);
+        auto buf = std::make_shared<WriteBufferFromTemporaryFile>(std::move(tmp_file));
         buf->write(data.data(), data.size());
 
+        std::string tmp_template = TestCascadeWriteBufferWithDisk::tmp_root;
         std::string tmp_filename = buf->getFileName();
         ASSERT_EQ(tmp_template, tmp_filename.substr(0, tmp_template.size()));
 
@@ -243,17 +267,15 @@ catch (...)
 }
 
 
-TEST(CascadeWriteBuffer, RereadWithTemporaryFileWriteBuffer)
+TEST_F(TestCascadeWriteBufferWithDisk, RereadWithTemporaryFileWriteBuffer)
 try
 {
-    const std::string tmp_template = "tmp/RereadWithTemporaryFileWriteBuffer/";
-
     for (size_t s = 0; s < 4000000; s += 1000000)
     {
         testCascadeBufferRedability(makeTestArray(s),
             {},
             {
-                [=] (auto) { return WriteBufferFromTemporaryFile::create(tmp_template); }
+                [=, this] (auto) { return std::make_shared<WriteBufferFromTemporaryFile>(std::make_unique<TemporaryFileOnDisk>(disk)); }
             });
 
         testCascadeBufferRedability(makeTestArray(s),
@@ -261,7 +283,7 @@ try
                 std::make_shared<MemoryWriteBuffer>(std::max(1ul, s/3ul), 2, 1.5),
             },
             {
-                [=] (auto) { return WriteBufferFromTemporaryFile::create(tmp_template); }
+                [=, this] (auto) { return std::make_shared<WriteBufferFromTemporaryFile>(std::make_unique<TemporaryFileOnDisk>(disk)); }
             });
     }
 }
diff --git a/src/Disks/tests/gtest_disk_encrypted.cpp b/src/Disks/tests/gtest_disk_encrypted.cpp
index 32db5f5c1d9..80a10e8680b 100644
--- a/src/Disks/tests/gtest_disk_encrypted.cpp
+++ b/src/Disks/tests/gtest_disk_encrypted.cpp
@@ -40,7 +40,7 @@ protected:
         settings->keys[0] = key;
         settings->current_key_id = 0;
         settings->disk_path = path;
-        encrypted_disk = std::make_shared<DiskEncrypted>("encrypted_disk", std::move(settings));
+        encrypted_disk = std::make_shared<DiskEncrypted>("encrypted_disk", std::move(settings), true);
     }
 
     String getFileNames()
diff --git a/src/Formats/BSONTypes.cpp b/src/Formats/BSONTypes.cpp
index 813c155325a..88396fd2aba 100644
--- a/src/Formats/BSONTypes.cpp
+++ b/src/Formats/BSONTypes.cpp
@@ -1,6 +1,6 @@
 #include <Formats/BSONTypes.h>
 #include <Common/Exception.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 namespace DB
 {
diff --git a/src/Formats/CMakeLists.txt b/src/Formats/CMakeLists.txt
new file mode 100644
index 00000000000..316043093c0
--- /dev/null
+++ b/src/Formats/CMakeLists.txt
@@ -0,0 +1,3 @@
+if (ENABLE_FUZZING)
+    add_subdirectory(fuzzers)
+endif()
diff --git a/src/Formats/CapnProtoUtils.cpp b/src/Formats/CapnProtoUtils.cpp
index e5f619faff5..d6c032408bb 100644
--- a/src/Formats/CapnProtoUtils.cpp
+++ b/src/Formats/CapnProtoUtils.cpp
@@ -9,6 +9,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeMap.h>
 #include <DataTypes/IDataType.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/join.hpp>
@@ -264,23 +265,25 @@ static bool checkTupleType(const capnp::Type & capnp_type, const DataTypePtr & d
         return false;
     }
 
-    if (!tuple_data_type->haveExplicitNames())
+    bool have_explicit_names = tuple_data_type->haveExplicitNames();
+    const auto & nested_names = tuple_data_type->getElementNames();
+    for (uint32_t i = 0; i != nested_names.size(); ++i)
     {
-        error_message += "Only named Tuple can be converted to CapnProto Struct";
-        return false;
-    }
-    for (const auto & name : tuple_data_type->getElementNames())
-    {
-        KJ_IF_MAYBE(field, struct_schema.findFieldByName(name))
+        if (have_explicit_names)
         {
-            if (!checkCapnProtoType(field->getType(), nested_types[tuple_data_type->getPositionByName(name)], mode, error_message, name))
+            KJ_IF_MAYBE (field, struct_schema.findFieldByName(nested_names[i]))
+            {
+                if (!checkCapnProtoType(field->getType(), nested_types[tuple_data_type->getPositionByName(nested_names[i])], mode, error_message, nested_names[i]))
+                    return false;
+            }
+            else
+            {
+                error_message += "CapnProto struct doesn't contain a field with name " + nested_names[i];
                 return false;
+            }
         }
-        else
-        {
-            error_message += "CapnProto struct doesn't contain a field with name " + name;
+        else if (!checkCapnProtoType(struct_schema.getFields()[i].getType(), nested_types[tuple_data_type->getPositionByName(nested_names[i])], mode, error_message, nested_names[i]))
             return false;
-        }
     }
 
     return true;
@@ -307,40 +310,129 @@ static bool checkArrayType(const capnp::Type & capnp_type, const DataTypePtr & d
     return checkCapnProtoType(list_schema.getElementType(), nested_type, mode, error_message, column_name);
 }
 
+static bool checkMapType(const capnp::Type & capnp_type, const DataTypePtr & data_type, FormatSettings::EnumComparingMode mode, String & error_message)
+{
+    /// We output/input Map type as follow CapnProto schema
+    ///
+    /// struct Map {
+    ///     struct Entry {
+    ///         key @0: Key;
+    ///         value @1: Value;
+    ///     }
+    ///     entries @0 :List(Entry);
+    /// }
+
+    if (!capnp_type.isStruct())
+        return false;
+    auto struct_schema = capnp_type.asStruct();
+
+    if (checkIfStructContainsUnnamedUnion(struct_schema))
+    {
+        error_message += "CapnProto struct contains unnamed union";
+        return false;
+    }
+
+    if (struct_schema.getFields().size() != 1)
+    {
+        error_message += "CapnProto struct that represents Map type can contain only one field";
+        return false;
+    }
+
+    const auto & field_type = struct_schema.getFields()[0].getType();
+    if (!field_type.isList())
+    {
+        error_message += "Field of CapnProto struct that represents Map is not a list";
+        return false;
+    }
+
+    auto list_element_type = field_type.asList().getElementType();
+    if (!list_element_type.isStruct())
+    {
+        error_message += "Field of CapnProto struct that represents Map is not a list of structs";
+        return false;
+    }
+
+    auto key_value_struct = list_element_type.asStruct();
+    if (checkIfStructContainsUnnamedUnion(key_value_struct))
+    {
+        error_message += "CapnProto struct contains unnamed union";
+        return false;
+    }
+
+    if (key_value_struct.getFields().size() != 2)
+    {
+        error_message += "Key-value structure for Map struct should have exactly 2 fields";
+        return false;
+    }
+
+    const auto & map_type = assert_cast<const DataTypeMap &>(*data_type);
+    DataTypes types = {map_type.getKeyType(), map_type.getValueType()};
+    Names names = {"key", "value"};
+
+    for (size_t i = 0; i != types.size(); ++i)
+    {
+        KJ_IF_MAYBE(field, key_value_struct.findFieldByName(names[i]))
+        {
+            if (!checkCapnProtoType(field->getType(), types[i], mode, error_message, names[i]))
+                return false;
+        }
+        else
+        {
+            error_message += R"(Key-value structure for Map struct should have exactly 2 fields with names "key" and "value")";
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static bool isCapnInteger(const capnp::Type & capnp_type)
+{
+    return capnp_type.isInt8() || capnp_type.isUInt8() || capnp_type.isInt16() || capnp_type.isUInt16() || capnp_type.isInt32()
+        || capnp_type.isUInt32() || capnp_type.isInt64() || capnp_type.isUInt64();
+}
+
 static bool checkCapnProtoType(const capnp::Type & capnp_type, const DataTypePtr & data_type, FormatSettings::EnumComparingMode mode, String & error_message, const String & column_name)
 {
     switch (data_type->getTypeId())
     {
         case TypeIndex::UInt8:
-            return capnp_type.isBool() || capnp_type.isUInt8();
-        case TypeIndex::Date: [[fallthrough]];
-        case TypeIndex::UInt16:
+            return capnp_type.isBool() || isCapnInteger(capnp_type);
+        case TypeIndex::Int8: [[fallthrough]];
+        case TypeIndex::Int16: [[fallthrough]];
+        case TypeIndex::UInt16: [[fallthrough]];
+        case TypeIndex::Int32: [[fallthrough]];
+        case TypeIndex::UInt32: [[fallthrough]];
+        case TypeIndex::Int64: [[fallthrough]];
+        case TypeIndex::UInt64:
+            /// Allow integer conversions durin input/output.
+            return isCapnInteger(capnp_type);
+        case TypeIndex::Date:
             return capnp_type.isUInt16();
         case TypeIndex::DateTime: [[fallthrough]];
-        case TypeIndex::UInt32:
+        case TypeIndex::IPv4:
             return capnp_type.isUInt32();
-        case TypeIndex::UInt64:
-            return capnp_type.isUInt64();
-        case TypeIndex::Int8:
-            return capnp_type.isInt8();
-        case TypeIndex::Int16:
-            return capnp_type.isInt16();
         case TypeIndex::Date32: [[fallthrough]];
-        case TypeIndex::Decimal32: [[fallthrough]];
-        case TypeIndex::Int32:
-            return capnp_type.isInt32();
+        case TypeIndex::Decimal32:
+            return capnp_type.isInt32() || capnp_type.isUInt32();
         case TypeIndex::DateTime64: [[fallthrough]];
-        case TypeIndex::Decimal64: [[fallthrough]];
-        case TypeIndex::Int64:
-            return capnp_type.isInt64();
-        case TypeIndex::Float32:
-            return capnp_type.isFloat32();
+        case TypeIndex::Decimal64:
+            return capnp_type.isInt64() || capnp_type.isUInt64();
+        case TypeIndex::Float32:[[fallthrough]];
         case TypeIndex::Float64:
-            return capnp_type.isFloat64();
+            /// Allow converting between Float32 and isFloat64
+            return capnp_type.isFloat32() || capnp_type.isFloat64();
         case TypeIndex::Enum8:
             return checkEnums<Int8>(capnp_type, data_type, mode, INT8_MAX, error_message);
         case TypeIndex::Enum16:
             return checkEnums<Int16>(capnp_type, data_type, mode, INT16_MAX, error_message);
+        case TypeIndex::Int128: [[fallthrough]];
+        case TypeIndex::UInt128: [[fallthrough]];
+        case TypeIndex::Int256: [[fallthrough]];
+        case TypeIndex::UInt256: [[fallthrough]];
+        case TypeIndex::Decimal128: [[fallthrough]];
+        case TypeIndex::Decimal256:
+            return capnp_type.isData();
         case TypeIndex::Tuple:
             return checkTupleType(capnp_type, data_type, mode, error_message);
         case TypeIndex::Nullable:
@@ -355,8 +447,11 @@ static bool checkCapnProtoType(const capnp::Type & capnp_type, const DataTypePtr
         case TypeIndex::LowCardinality:
             return checkCapnProtoType(capnp_type, assert_cast<const DataTypeLowCardinality *>(data_type.get())->getDictionaryType(), mode, error_message, column_name);
         case TypeIndex::FixedString: [[fallthrough]];
+        case TypeIndex::IPv6: [[fallthrough]];
         case TypeIndex::String:
             return capnp_type.isText() || capnp_type.isData();
+        case TypeIndex::Map:
+            return checkMapType(capnp_type, data_type, mode, error_message);
         default:
             return false;
     }
diff --git a/src/Formats/ColumnMapping.cpp b/src/Formats/ColumnMapping.cpp
index 2fab5766591..e33dfc878f4 100644
--- a/src/Formats/ColumnMapping.cpp
+++ b/src/Formats/ColumnMapping.cpp
@@ -26,8 +26,8 @@ void ColumnMapping::addColumns(
     {
         names_of_columns.push_back(name);
 
-        const auto * column_it = column_indexes_by_names.find(name);
-        if (!column_it)
+        const auto column_it = column_indexes_by_names.find(name);
+        if (column_it == column_indexes_by_names.end())
         {
             if (settings.skip_unknown_fields)
             {
@@ -43,7 +43,7 @@ void ColumnMapping::addColumns(
                             name, column_indexes_for_input_fields.size());
         }
 
-        const auto column_index = column_it->getMapped();
+        const auto column_index = column_it->second;
 
         if (read_columns[column_index])
             throw Exception(ErrorCodes::INCORRECT_DATA, "Duplicate field found while parsing format header: {}", name);
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index aca3166a8c4..dd6252b96f1 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -5,6 +5,7 @@
 #include <Formats/FormatSettings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ProcessList.h>
+#include <IO/SharedThreadPools.h>
 #include <Processors/Formats/IRowInputFormat.h>
 #include <Processors/Formats/IRowOutputFormat.h>
 #include <Processors/Formats/Impl/MySQLOutputFormat.h>
@@ -109,15 +110,19 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.json.allow_object_type = context->getSettingsRef().allow_experimental_object_type;
     format_settings.null_as_default = settings.input_format_null_as_default;
     format_settings.decimal_trailing_zeros = settings.output_format_decimal_trailing_zeros;
-    format_settings.parquet.row_group_size = settings.output_format_parquet_row_group_size;
+    format_settings.parquet.row_group_rows = settings.output_format_parquet_row_group_size;
+    format_settings.parquet.row_group_bytes = settings.output_format_parquet_row_group_size_bytes;
     format_settings.parquet.output_version = settings.output_format_parquet_version;
     format_settings.parquet.import_nested = settings.input_format_parquet_import_nested;
     format_settings.parquet.case_insensitive_column_matching = settings.input_format_parquet_case_insensitive_column_matching;
+    format_settings.parquet.preserve_order = settings.input_format_parquet_preserve_order;
     format_settings.parquet.allow_missing_columns = settings.input_format_parquet_allow_missing_columns;
     format_settings.parquet.skip_columns_with_unsupported_types_in_schema_inference = settings.input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference;
     format_settings.parquet.output_string_as_string = settings.output_format_parquet_string_as_string;
     format_settings.parquet.output_fixed_string_as_fixed_byte_array = settings.output_format_parquet_fixed_string_as_fixed_byte_array;
     format_settings.parquet.max_block_size = settings.input_format_parquet_max_block_size;
+    format_settings.parquet.output_compression_method = settings.output_format_parquet_compression_method;
+    format_settings.parquet.output_compliant_nested_types = settings.output_format_parquet_compliant_nested_types;
     format_settings.pretty.charset = settings.output_format_pretty_grid_charset.toString() == "ASCII" ? FormatSettings::Pretty::Charset::ASCII : FormatSettings::Pretty::Charset::UTF8;
     format_settings.pretty.color = settings.output_format_pretty_color;
     format_settings.pretty.max_column_pad_width = settings.output_format_pretty_max_column_pad_width;
@@ -158,6 +163,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.arrow.case_insensitive_column_matching = settings.input_format_arrow_case_insensitive_column_matching;
     format_settings.arrow.output_string_as_string = settings.output_format_arrow_string_as_string;
     format_settings.arrow.output_fixed_string_as_fixed_byte_array = settings.output_format_arrow_fixed_string_as_fixed_byte_array;
+    format_settings.arrow.output_compression_method = settings.output_format_arrow_compression_method;
     format_settings.orc.import_nested = settings.input_format_orc_import_nested;
     format_settings.orc.allow_missing_columns = settings.input_format_orc_allow_missing_columns;
     format_settings.orc.row_batch_size = settings.input_format_orc_row_batch_size;
@@ -168,6 +174,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.orc.skip_columns_with_unsupported_types_in_schema_inference = settings.input_format_orc_skip_columns_with_unsupported_types_in_schema_inference;
     format_settings.orc.case_insensitive_column_matching = settings.input_format_orc_case_insensitive_column_matching;
     format_settings.orc.output_string_as_string = settings.output_format_orc_string_as_string;
+    format_settings.orc.output_compression_method = settings.output_format_orc_compression_method;
     format_settings.defaults_for_omitted_fields = settings.input_format_defaults_for_omitted_fields;
     format_settings.capn_proto.enum_comparing_mode = settings.format_capn_proto_enum_comparising_mode;
     format_settings.capn_proto.skip_fields_with_unsupported_types_in_schema_inference = settings.input_format_capn_proto_skip_fields_with_unsupported_types_in_schema_inference;
@@ -191,6 +198,8 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.bson.output_string_as_string = settings.output_format_bson_string_as_string;
     format_settings.bson.skip_fields_with_unsupported_types_in_schema_inference = settings.input_format_bson_skip_fields_with_unsupported_types_in_schema_inference;
     format_settings.max_binary_string_size = settings.format_binary_max_string_size;
+    format_settings.max_binary_array_size = settings.format_binary_max_array_size;
+    format_settings.native.allow_types_conversion = settings.input_format_native_allow_types_conversion;
     format_settings.max_parser_depth = context->getSettingsRef().max_parser_depth;
     format_settings.client_protocol_version = context->getClientProtocolVersion();
 
@@ -216,47 +225,114 @@ InputFormatPtr FormatFactory::getInput(
     const Block & sample,
     ContextPtr context,
     UInt64 max_block_size,
-    const std::optional<FormatSettings> & _format_settings) const
+    const std::optional<FormatSettings> & format_settings,
+    std::optional<size_t> max_parsing_threads) const
 {
-    auto format_settings = _format_settings
-        ? *_format_settings : getFormatSettings(context);
+    return getInputImpl(
+        name,
+        nullptr,
+        &buf,
+        sample,
+        context,
+        max_block_size,
+        /* is_remote_fs */ false,
+        CompressionMethod::None,
+        format_settings,
+        /* max_download_threads */ 1,
+        max_parsing_threads);
+}
 
-    if (!getCreators(name).input_creator)
-    {
+InputFormatPtr FormatFactory::getInputRandomAccess(
+    const String & name,
+    SeekableReadBufferFactoryPtr buf_factory,
+    const Block & sample,
+    ContextPtr context,
+    UInt64 max_block_size,
+    bool is_remote_fs,
+    CompressionMethod compression,
+    const std::optional<FormatSettings> & format_settings,
+    std::optional<size_t> max_download_threads,
+    std::optional<size_t> max_parsing_threads) const
+{
+    return getInputImpl(
+        name,
+        std::move(buf_factory),
+        nullptr,
+        sample,
+        context,
+        max_block_size,
+        is_remote_fs,
+        compression,
+        format_settings,
+        max_download_threads,
+        max_parsing_threads);
+}
+
+InputFormatPtr FormatFactory::getInputImpl(
+    const String & name,
+    // exactly one of the following two is nullptr
+    SeekableReadBufferFactoryPtr buf_factory,
+    ReadBuffer * _buf,
+    const Block & sample,
+    ContextPtr context,
+    UInt64 max_block_size,
+    bool is_remote_fs,
+    CompressionMethod compression,
+    const std::optional<FormatSettings> & _format_settings,
+    std::optional<size_t> _max_download_threads,
+    std::optional<size_t> _max_parsing_threads) const
+{
+    chassert((!_buf) != (!buf_factory));
+    const auto& creators = getCreators(name);
+    if (!creators.input_creator && !creators.random_access_input_creator)
         throw Exception(ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_INPUT, "Format {} is not suitable for input", name);
-    }
 
+    auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
     const Settings & settings = context->getSettingsRef();
-    const auto & file_segmentation_engine = getCreators(name).file_segmentation_engine;
+    size_t max_parsing_threads = _max_parsing_threads.value_or(settings.max_threads);
+    size_t max_download_threads = _max_download_threads.value_or(settings.max_download_threads);
 
-    // Doesn't make sense to use parallel parsing with less than four threads
-    // (segmentator + two parsers + reader).
-    bool parallel_parsing = settings.input_format_parallel_parsing && file_segmentation_engine && settings.max_threads >= 4;
+    RowInputFormatParams row_input_format_params;
+    row_input_format_params.max_block_size = max_block_size;
+    row_input_format_params.allow_errors_num = format_settings.input_allow_errors_num;
+    row_input_format_params.allow_errors_ratio = format_settings.input_allow_errors_ratio;
+    row_input_format_params.max_execution_time = settings.max_execution_time;
+    row_input_format_params.timeout_overflow_mode = settings.timeout_overflow_mode;
 
-    if (settings.max_memory_usage && settings.min_chunk_bytes_for_parallel_parsing * settings.max_threads * 2 > settings.max_memory_usage)
+    if (context->hasQueryContext() && settings.log_queries)
+        context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
+
+    // Prepare a read buffer.
+
+    std::unique_ptr<ReadBuffer> owned_buf;
+    if (buf_factory)
+        owned_buf = prepareReadBuffer(buf_factory, compression, creators, format_settings, settings, max_download_threads);
+    auto * buf = owned_buf ? owned_buf.get() : _buf;
+
+    // Decide whether to use parallel ParallelParsingInputFormat.
+
+    bool parallel_parsing = max_parsing_threads > 1 && settings.input_format_parallel_parsing && creators.file_segmentation_engine && !creators.random_access_input_creator;
+
+    if (settings.max_memory_usage && settings.min_chunk_bytes_for_parallel_parsing * max_parsing_threads * 2 > settings.max_memory_usage)
         parallel_parsing = false;
-
-    if (settings.max_memory_usage_for_user && settings.min_chunk_bytes_for_parallel_parsing * settings.max_threads * 2 > settings.max_memory_usage_for_user)
+    if (settings.max_memory_usage_for_user && settings.min_chunk_bytes_for_parallel_parsing * max_parsing_threads * 2 > settings.max_memory_usage_for_user)
         parallel_parsing = false;
 
     if (parallel_parsing)
     {
-        const auto & non_trivial_prefix_and_suffix_checker = getCreators(name).non_trivial_prefix_and_suffix_checker;
+        const auto & non_trivial_prefix_and_suffix_checker = creators.non_trivial_prefix_and_suffix_checker;
         /// Disable parallel parsing for input formats with non-trivial readPrefix() and readSuffix().
-        if (non_trivial_prefix_and_suffix_checker && non_trivial_prefix_and_suffix_checker(buf))
+        if (non_trivial_prefix_and_suffix_checker && non_trivial_prefix_and_suffix_checker(*buf))
             parallel_parsing = false;
     }
 
+    // Create the InputFormat in one of 3 ways.
+
+    InputFormatPtr format;
+
     if (parallel_parsing)
     {
-        const auto & input_getter = getCreators(name).input_creator;
-
-        RowInputFormatParams row_input_format_params;
-        row_input_format_params.max_block_size = max_block_size;
-        row_input_format_params.allow_errors_num = format_settings.input_allow_errors_num;
-        row_input_format_params.allow_errors_ratio = format_settings.input_allow_errors_ratio;
-        row_input_format_params.max_execution_time = settings.max_execution_time;
-        row_input_format_params.timeout_overflow_mode = settings.timeout_overflow_mode;
+        const auto & input_getter = creators.input_creator;
 
         /// Const reference is copied to lambda.
         auto parser_creator = [input_getter, sample, row_input_format_params, format_settings]
@@ -264,59 +340,101 @@ InputFormatPtr FormatFactory::getInput(
             { return input_getter(input, sample, row_input_format_params, format_settings); };
 
         ParallelParsingInputFormat::Params params{
-            buf, sample, parser_creator, file_segmentation_engine, name, settings.max_threads,
+            *buf, sample, parser_creator, creators.file_segmentation_engine, name, max_parsing_threads,
             settings.min_chunk_bytes_for_parallel_parsing, max_block_size, context->getApplicationType() == Context::ApplicationType::SERVER};
-        auto format = std::make_shared<ParallelParsingInputFormat>(params);
-        if (!settings.input_format_record_errors_file_path.toString().empty())
-        {
-            format->setErrorsLogger(std::make_shared<ParallelInputFormatErrorsLogger>(context));
-        }
-        return format;
+
+        format = std::make_shared<ParallelParsingInputFormat>(params);
     }
-
-
-    auto format = getInputFormat(name, buf, sample, context, max_block_size, format_settings);
-    if (!settings.input_format_record_errors_file_path.toString().empty())
+    else if (creators.random_access_input_creator)
     {
-        format->setErrorsLogger(std::make_shared<InputFormatErrorsLogger>(context));
+        format = creators.random_access_input_creator(
+            buf,
+            std::move(buf_factory),
+            sample,
+            format_settings,
+            context->getReadSettings(),
+            is_remote_fs,
+            max_download_threads,
+            max_parsing_threads);
+    }
+    else
+    {
+        format = creators.input_creator(*buf, sample, row_input_format_params, format_settings);
     }
-    return format;
-}
 
-InputFormatPtr FormatFactory::getInputFormat(
-    const String & name,
-    ReadBuffer & buf,
-    const Block & sample,
-    ContextPtr context,
-    UInt64 max_block_size,
-    const std::optional<FormatSettings> & _format_settings) const
-{
-    const auto & input_getter = getCreators(name).input_creator;
-    if (!input_getter)
-        throw Exception(ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_INPUT, "Format {} is not suitable for input", name);
-
-    const Settings & settings = context->getSettingsRef();
-
-    if (context->hasQueryContext() && settings.log_queries)
-        context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
-
-    auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
-
-    RowInputFormatParams params;
-    params.max_block_size = max_block_size;
-    params.allow_errors_num = format_settings.input_allow_errors_num;
-    params.allow_errors_ratio = format_settings.input_allow_errors_ratio;
-    params.max_execution_time = settings.max_execution_time;
-    params.timeout_overflow_mode = settings.timeout_overflow_mode;
-    auto format = input_getter(buf, sample, params, format_settings);
+    if (owned_buf)
+        format->addBuffer(std::move(owned_buf));
+    if (!settings.input_format_record_errors_file_path.toString().empty())
+        format->setErrorsLogger(std::make_shared<ParallelInputFormatErrorsLogger>(context));
 
     /// It's a kludge. Because I cannot remove context from values format.
+    /// (Not needed in the parallel_parsing case above because VALUES format doesn't support it.)
     if (auto * values = typeid_cast<ValuesBlockInputFormat *>(format.get()))
         values->setContext(context);
 
     return format;
 }
 
+std::unique_ptr<ReadBuffer> FormatFactory::prepareReadBuffer(
+    SeekableReadBufferFactoryPtr & buf_factory,
+    CompressionMethod compression,
+    const Creators & creators,
+    const FormatSettings & format_settings,
+    const Settings & settings,
+    size_t max_download_threads) const
+{
+    std::unique_ptr<ReadBuffer> res;
+
+    bool parallel_read = max_download_threads > 1 && buf_factory && format_settings.seekable_read;
+    if (creators.random_access_input_creator)
+        parallel_read &= compression != CompressionMethod::None;
+
+    if (parallel_read)
+    {
+        try
+        {
+            parallel_read = buf_factory->checkIfActuallySeekable()
+                         && buf_factory->getFileSize() >= 2 * settings.max_download_buffer_size;
+        }
+        catch (const Poco::Exception & e)
+        {
+            parallel_read = false;
+            LOG_TRACE(
+                &Poco::Logger::get("FormatFactory"),
+                "Failed to setup ParallelReadBuffer because of an exception:\n{}.\n"
+                "Falling back to the single-threaded buffer",
+                e.displayText());
+        }
+    }
+
+    if (parallel_read)
+    {
+        LOG_TRACE(
+            &Poco::Logger::get("FormatFactory"),
+            "Using ParallelReadBuffer with {} workers with chunks of {} bytes",
+            max_download_threads,
+            settings.max_download_buffer_size);
+
+        res = std::make_unique<ParallelReadBuffer>(
+            std::move(buf_factory),
+            threadPoolCallbackRunner<void>(IOThreadPool::get(), "ParallelRead"),
+            max_download_threads,
+            settings.max_download_buffer_size);
+    }
+
+    if (compression != CompressionMethod::None)
+    {
+        if (!res)
+            res = buf_factory->getReader(); // NOLINT
+        res = wrapReadBufferWithCompressionMethod(std::move(res), compression, static_cast<int>(settings.zstd_window_log_max));
+    }
+
+    if (!creators.random_access_input_creator && !res)
+        res = buf_factory->getReader();
+
+    return res;
+}
+
 static void addExistingProgressToOutputFormat(OutputFormatPtr format, ContextPtr context)
 {
     auto element_id = context->getProcessListElement();
@@ -453,10 +571,22 @@ ExternalSchemaReaderPtr FormatFactory::getExternalSchemaReader(
 
 void FormatFactory::registerInputFormat(const String & name, InputCreator input_creator)
 {
-    auto & target = dict[name].input_creator;
-    if (target)
+    chassert(input_creator);
+    auto & creators = dict[name];
+    if (creators.input_creator || creators.random_access_input_creator)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Input format {} is already registered", name);
-    target = std::move(input_creator);
+    creators.input_creator = std::move(input_creator);
+    registerFileExtension(name, name);
+    KnownFormatNames::instance().add(name);
+}
+
+void FormatFactory::registerRandomAccessInputFormat(const String & name, RandomAccessInputCreator input_creator)
+{
+    chassert(input_creator);
+    auto & creators = dict[name];
+    if (creators.input_creator || creators.random_access_input_creator)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Input format {} is already registered", name);
+    creators.random_access_input_creator = std::move(input_creator);
     registerFileExtension(name, name);
     KnownFormatNames::instance().add(name);
 }
@@ -606,6 +736,14 @@ void FormatFactory::markFormatSupportsSubcolumns(const String & name)
     target = true;
 }
 
+void FormatFactory::markOutputFormatPrefersLargeBlocks(const String & name)
+{
+    auto & target = dict[name].prefers_large_blocks;
+    if (target)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Format {} is already marked as preferring large blocks", name);
+    target = true;
+}
+
 bool FormatFactory::checkIfFormatSupportsSubcolumns(const String & name) const
 {
     const auto & target = getCreators(name);
@@ -640,7 +778,7 @@ String FormatFactory::getAdditionalInfoForSchemaCache(const String & name, Conte
 bool FormatFactory::isInputFormat(const String & name) const
 {
     auto it = dict.find(name);
-    return it != dict.end() && it->second.input_creator;
+    return it != dict.end() && (it->second.input_creator || it->second.random_access_input_creator);
 }
 
 bool FormatFactory::isOutputFormat(const String & name) const
@@ -666,6 +804,20 @@ bool FormatFactory::checkIfFormatHasAnySchemaReader(const String & name) const
     return checkIfFormatHasSchemaReader(name) || checkIfFormatHasExternalSchemaReader(name);
 }
 
+bool FormatFactory::checkIfOutputFormatPrefersLargeBlocks(const String & name) const
+{
+    const auto & target = getCreators(name);
+    return target.prefers_large_blocks;
+}
+
+bool FormatFactory::checkParallelizeOutputAfterReading(const String & name, ContextPtr context) const
+{
+    if (name == "Parquet" && context->getSettingsRef().input_format_parquet_preserve_order)
+        return false;
+
+    return true;
+}
+
 void FormatFactory::checkFormatName(const String & name) const
 {
     auto it = dict.find(name);
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index 398548e4b22..677e34845d8 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -6,6 +6,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/CompressionMethod.h>
+#include <IO/ParallelReadBuffer.h>
 #include <base/types.h>
 #include <Core/NamesAndTypes.h>
 
@@ -15,6 +16,7 @@
 #include <memory>
 #include <unordered_map>
 
+
 namespace DB
 {
 
@@ -70,12 +72,40 @@ public:
         size_t max_rows)>;
 
 private:
+    // On the input side, there are two kinds of formats:
+    //  * InputCreator - formats parsed sequentially, e.g. CSV. Almost all formats are like this.
+    //    FormatFactory uses ParallelReadBuffer to read in parallel, and ParallelParsingInputFormat
+    //    to parse in parallel; the formats mostly don't need to worry about it.
+    //  * RandomAccessInputCreator - column-oriented formats that require seeking back and forth in
+    //    the file when reading. E.g. Parquet has metadata at the end of the file (needs to be read
+    //    before we can parse any data), can skip columns by seeking in the file, and often reads
+    //    many short byte ranges from the file. ParallelReadBuffer and ParallelParsingInputFormat
+    //    are a poor fit. Instead, the format implementation is in charge of parallelizing both
+    //    reading and parsing.
+
     using InputCreator = std::function<InputFormatPtr(
             ReadBuffer & buf,
             const Block & header,
             const RowInputFormatParams & params,
             const FormatSettings & settings)>;
 
+    // Incompatible with FileSegmentationEngine.
+    // When created using SeekableReadBufferFactoryPtr, the IInputFormat doesn't support
+    // resetParser() and setReadBuffer().
+    //
+    // In future we may also want to pass some information about WHERE conditions (SelectQueryInfo?)
+    // and get some information about projections (min/max/count per column per row group).
+    using RandomAccessInputCreator = std::function<InputFormatPtr(
+            // exactly one of these two is nullptr
+            ReadBuffer * buf,
+            SeekableReadBufferFactoryPtr buf_factory,
+            const Block & header,
+            const FormatSettings & settings,
+            const ReadSettings& read_settings,
+            bool is_remote_fs,
+            size_t max_download_threads,
+            size_t max_parsing_threads)>;
+
     using OutputCreator = std::function<OutputFormatPtr(
             WriteBuffer & buf,
             const Block & sample,
@@ -103,6 +133,7 @@ private:
     struct Creators
     {
         InputCreator input_creator;
+        RandomAccessInputCreator random_access_input_creator;
         OutputCreator output_creator;
         FileSegmentationEngine file_segmentation_engine;
         SchemaReaderCreator schema_reader_creator;
@@ -110,6 +141,7 @@ private:
         bool supports_parallel_formatting{false};
         bool supports_subcolumns{false};
         bool supports_subset_of_columns{false};
+        bool prefers_large_blocks{false};
         NonTrivialPrefixAndSuffixChecker non_trivial_prefix_and_suffix_checker;
         AppendSupportChecker append_support_checker;
         AdditionalInfoForSchemaCacheGetter additional_info_for_schema_cache_getter;
@@ -121,21 +153,32 @@ private:
 public:
     static FormatFactory & instance();
 
+    // Format parser from a single ReadBuffer.
+    // Parallelizes parsing (when possible) but not reading.
     InputFormatPtr getInput(
         const String & name,
         ReadBuffer & buf,
         const Block & sample,
         ContextPtr context,
         UInt64 max_block_size,
-        const std::optional<FormatSettings> & format_settings = std::nullopt) const;
+        const std::optional<FormatSettings> & format_settings = std::nullopt,
+        std::optional<size_t> max_parsing_threads = std::nullopt) const;
 
-    InputFormatPtr getInputFormat(
+    // Format parser from a random-access source (factory of seekable read buffers).
+    // Parallelizes both parsing and reading when possible.
+    // Prefer this over getInput() when reading from random-access source like file or HTTP.
+    InputFormatPtr getInputRandomAccess(
         const String & name,
-        ReadBuffer & buf,
+        SeekableReadBufferFactoryPtr buf_factory,
         const Block & sample,
         ContextPtr context,
         UInt64 max_block_size,
-        const std::optional<FormatSettings> & format_settings = std::nullopt) const;
+        bool is_remote_fs,
+        CompressionMethod compression,
+        // if nullopt, getFormatSettings(context) is used
+        const std::optional<FormatSettings> & format_settings = std::nullopt,
+        std::optional<size_t> max_download_threads = std::nullopt,
+        std::optional<size_t> max_parsing_threads = std::nullopt) const;
 
     /// Checks all preconditions. Returns ordinary format if parallel formatting cannot be done.
     OutputFormatPtr getOutputFormatParallelIfPossible(
@@ -182,6 +225,7 @@ public:
 
     /// Register format by its name.
     void registerInputFormat(const String & name, InputCreator input_creator);
+    void registerRandomAccessInputFormat(const String & name, RandomAccessInputCreator input_creator);
     void registerOutputFormat(const String & name, OutputCreator output_creator);
 
     /// Register file extension for format
@@ -194,6 +238,7 @@ public:
     void registerExternalSchemaReader(const String & name, ExternalSchemaReaderCreator external_schema_reader_creator);
 
     void markOutputFormatSupportsParallelFormatting(const String & name);
+    void markOutputFormatPrefersLargeBlocks(const String & name);
     void markFormatSupportsSubcolumns(const String & name);
     void markFormatSupportsSubsetOfColumns(const String & name);
 
@@ -203,6 +248,9 @@ public:
     bool checkIfFormatHasSchemaReader(const String & name) const;
     bool checkIfFormatHasExternalSchemaReader(const String & name) const;
     bool checkIfFormatHasAnySchemaReader(const String & name) const;
+    bool checkIfOutputFormatPrefersLargeBlocks(const String & name) const;
+
+    bool checkParallelizeOutputAfterReading(const String & name, ContextPtr context) const;
 
     void registerAdditionalInfoForSchemaCacheGetter(const String & name, AdditionalInfoForSchemaCacheGetter additional_info_for_schema_cache_getter);
     String getAdditionalInfoForSchemaCache(const String & name, ContextPtr context, const std::optional<FormatSettings> & format_settings_ = std::nullopt);
@@ -224,6 +272,29 @@ private:
 
     const Creators & getCreators(const String & name) const;
 
+    InputFormatPtr getInputImpl(
+        const String & name,
+        // exactly one of the following two is nullptr
+        SeekableReadBufferFactoryPtr buf_factory,
+        ReadBuffer * buf,
+        const Block & sample,
+        ContextPtr context,
+        UInt64 max_block_size,
+        bool is_remote_fs,
+        CompressionMethod compression,
+        const std::optional<FormatSettings> & format_settings,
+        std::optional<size_t> max_download_threads,
+        std::optional<size_t> max_parsing_threads) const;
+
+    // Creates a ReadBuffer to give to an input format.
+    // Returns nullptr if we should give it the whole factory.
+    std::unique_ptr<ReadBuffer> prepareReadBuffer(
+        SeekableReadBufferFactoryPtr & buf_factory,
+        CompressionMethod compression,
+        const Creators & creators,
+        const FormatSettings & format_settings,
+        const Settings & settings,
+        size_t max_download_threads) const;
 };
 
 }
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index d1755a35c5f..c88af650671 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -3,6 +3,7 @@
 #include <Core/Names.h>
 #include <Core/Defines.h>
 #include <base/types.h>
+#include <base/unit.h>
 
 
 namespace DB
@@ -81,11 +82,19 @@ struct FormatSettings
     UInt64 input_allow_errors_num = 0;
     Float32 input_allow_errors_ratio = 0;
 
-    UInt64 max_binary_string_size = 0;
+    UInt64 max_binary_string_size = 1_GiB;
+    UInt64 max_binary_array_size = 1_GiB;
     UInt64 client_protocol_version = 0;
 
     UInt64 max_parser_depth = DBMS_DEFAULT_MAX_PARSER_DEPTH;
 
+    enum class ArrowCompression
+    {
+        NONE,
+        LZ4_FRAME,
+        ZSTD
+    };
+
     struct
     {
         UInt64 row_group_size = 1000000;
@@ -96,6 +105,7 @@ struct FormatSettings
         bool case_insensitive_column_matching = false;
         bool output_string_as_string = false;
         bool output_fixed_string_as_fixed_byte_array = true;
+        ArrowCompression output_compression_method = ArrowCompression::NONE;
     } arrow;
 
     struct
@@ -183,9 +193,20 @@ struct FormatSettings
         V2_LATEST,
     };
 
+    enum class ParquetCompression
+    {
+        NONE,
+        SNAPPY,
+        ZSTD,
+        LZ4,
+        GZIP,
+        BROTLI,
+    };
+
     struct
     {
-        UInt64 row_group_size = 1000000;
+        UInt64 row_group_rows = 1000000;
+        UInt64 row_group_bytes = 512 * 1024 * 1024;
         bool import_nested = false;
         bool allow_missing_columns = false;
         bool skip_columns_with_unsupported_types_in_schema_inference = false;
@@ -193,8 +214,13 @@ struct FormatSettings
         std::unordered_set<int> skip_row_groups = {};
         bool output_string_as_string = false;
         bool output_fixed_string_as_fixed_byte_array = true;
+        // TODO: This should probably be shared among all formats and with
+        //       https://github.com/ClickHouse/ClickHouse/issues/38755
+        bool preserve_order = false;
         UInt64 max_block_size = 8192;
         ParquetVersion output_version;
+        ParquetCompression output_compression_method = ParquetCompression::SNAPPY;
+        bool output_compliant_nested_types = true;
     } parquet;
 
     struct Pretty
@@ -276,6 +302,15 @@ struct FormatSettings
         bool accurate_types_of_literals = true;
     } values;
 
+    enum class ORCCompression
+    {
+        NONE,
+        LZ4,
+        SNAPPY,
+        ZSTD,
+        ZLIB,
+    };
+
     struct
     {
         bool import_nested = false;
@@ -285,6 +320,7 @@ struct FormatSettings
         bool case_insensitive_column_matching = false;
         std::unordered_set<int> skip_stripes = {};
         bool output_string_as_string = false;
+        ORCCompression output_compression_method = ORCCompression::NONE;
     } orc;
 
     /// For capnProto format we should determine how to
@@ -335,6 +371,11 @@ struct FormatSettings
         bool output_string_as_string;
         bool skip_fields_with_unsupported_types_in_schema_inference;
     } bson;
+
+    struct
+    {
+        bool allow_types_conversion = true;
+    } native;
 };
 
 }
diff --git a/src/Formats/JSONUtils.cpp b/src/Formats/JSONUtils.cpp
index 6580d98fe98..284cffdb9d7 100644
--- a/src/Formats/JSONUtils.cpp
+++ b/src/Formats/JSONUtils.cpp
@@ -244,6 +244,15 @@ namespace JSONUtils
         writeCString(after_delimiter, out);
     }
 
+    void writeTitlePretty(const char * title, WriteBuffer & out, size_t indent, const char * after_delimiter)
+    {
+        writeChar(' ', indent * 4, out);
+        writeChar('"', out);
+        writeCString(title, out);
+        writeCString("\": ", out);
+        writeCString(after_delimiter, out);
+    }
+
     void writeObjectStart(WriteBuffer & out, size_t indent, const char * title)
     {
         if (title)
@@ -306,10 +315,20 @@ namespace JSONUtils
         WriteBuffer & out,
         const std::optional<String> & name,
         size_t indent,
-        const char * title_after_delimiter)
+        const char * title_after_delimiter,
+        bool pretty_json)
     {
         if (name.has_value())
-            writeTitle(name->data(), out, indent, title_after_delimiter);
+        {
+            if (pretty_json)
+            {
+                writeTitlePretty(name->data(), out, indent, title_after_delimiter);
+            }
+            else
+            {
+                writeTitle(name->data(), out, indent, title_after_delimiter);
+            }
+        }
 
         if (yield_strings)
         {
@@ -319,7 +338,16 @@ namespace JSONUtils
             writeJSONString(buf.str(), out, settings);
         }
         else
-            serialization.serializeTextJSON(column, row_num, out, settings);
+        {
+            if (pretty_json)
+            {
+                serialization.serializeTextJSONPretty(column, row_num, out, settings, indent);
+            }
+            else
+            {
+                serialization.serializeTextJSON(column, row_num, out, settings);
+            }
+        }
     }
 
     void writeColumns(
diff --git a/src/Formats/JSONUtils.h b/src/Formats/JSONUtils.h
index 5835e364c2b..fd1ba7db980 100644
--- a/src/Formats/JSONUtils.h
+++ b/src/Formats/JSONUtils.h
@@ -73,7 +73,8 @@ namespace JSONUtils
         WriteBuffer & out,
         const std::optional<String> & name = std::nullopt,
         size_t indent = 0,
-        const char * title_after_delimiter = " ");
+        const char * title_after_delimiter = " ",
+        bool pretty_json = false);
 
     void writeColumns(
         const Columns & columns,
diff --git a/src/Formats/MarkInCompressedFile.cpp b/src/Formats/MarkInCompressedFile.cpp
new file mode 100644
index 00000000000..41f6152dc13
--- /dev/null
+++ b/src/Formats/MarkInCompressedFile.cpp
@@ -0,0 +1,103 @@
+#include <Formats/MarkInCompressedFile.h>
+
+#include <Common/BitHelpers.h>
+
+namespace DB
+{
+
+// Write a range of bits in a bit-packed array.
+// The array must be overallocated by one element.
+// The bit range must be pre-filled with zeros.
+void writeBits(UInt64 * dest, size_t bit_offset, UInt64 value)
+{
+    size_t mod = bit_offset % 64;
+    dest[bit_offset / 64] |= value << mod;
+    if (mod)
+        dest[bit_offset / 64 + 1] |= value >> (64 - mod);
+}
+
+// The array must be overallocated by one element.
+UInt64 readBits(const UInt64 * src, size_t bit_offset, size_t num_bits)
+{
+    size_t mod = bit_offset % 64;
+    UInt64 value = src[bit_offset / 64] >> mod;
+    if (mod)
+        value |= src[bit_offset / 64 + 1] << (64 - mod);
+    return value & maskLowBits<UInt64>(num_bits);
+}
+
+MarksInCompressedFile::MarksInCompressedFile(const PlainArray & marks)
+    : num_marks(marks.size()), blocks((marks.size() + MARKS_PER_BLOCK - 1) / MARKS_PER_BLOCK, BlockInfo{})
+{
+    if (num_marks == 0)
+    {
+        return;
+    }
+
+    // First pass: calculate layout of all blocks and total memory required.
+    size_t packed_bits = 0;
+    for (size_t block_idx = 0; block_idx < blocks.size(); ++block_idx)
+    {
+        BlockInfo & block = blocks[block_idx];
+        block.bit_offset_in_packed_array = packed_bits;
+
+        size_t max_x = 0;
+        size_t max_y = 0;
+        size_t num_marks_in_this_block = std::min(MARKS_PER_BLOCK, num_marks - block_idx * MARKS_PER_BLOCK);
+        for (size_t i = 0; i < num_marks_in_this_block; ++i)
+        {
+            const auto & mark = marks[block_idx * MARKS_PER_BLOCK + i];
+            block.min_x = std::min(block.min_x, mark.offset_in_compressed_file);
+            max_x = std::max(max_x, mark.offset_in_compressed_file);
+            block.min_y = std::min(block.min_y, mark.offset_in_decompressed_block);
+            max_y = std::max(max_y, mark.offset_in_decompressed_block);
+
+            block.trailing_zero_bits_in_y
+                = std::min(block.trailing_zero_bits_in_y, static_cast<UInt8>(getTrailingZeroBits(mark.offset_in_decompressed_block)));
+        }
+
+        block.bits_for_x = sizeof(size_t) * 8 - getLeadingZeroBits(max_x - block.min_x);
+        block.bits_for_y = sizeof(size_t) * 8 - getLeadingZeroBits((max_y - block.min_y) >> block.trailing_zero_bits_in_y);
+        packed_bits += num_marks_in_this_block * (block.bits_for_x + block.bits_for_y);
+    }
+
+    // Overallocate by +1 element to let the bit packing/unpacking do less bounds checking.
+    size_t packed_length = (packed_bits + 63) / 64 + 1;
+    packed.reserve_exact(packed_length);
+    packed.resize_fill(packed_length);
+
+    // Second pass: write out the packed marks.
+    for (size_t idx = 0; idx < num_marks; ++idx)
+    {
+        const auto & mark = marks[idx];
+        auto [block, offset] = lookUpMark(idx);
+        writeBits(packed.data(), offset, mark.offset_in_compressed_file - block->min_x);
+        writeBits(
+            packed.data(),
+            offset + block->bits_for_x,
+            (mark.offset_in_decompressed_block - block->min_y) >> block->trailing_zero_bits_in_y);
+    }
+}
+
+MarkInCompressedFile MarksInCompressedFile::get(size_t idx) const
+{
+    auto [block, offset] = lookUpMark(idx);
+    size_t x = block->min_x + readBits(packed.data(), offset, block->bits_for_x);
+    size_t y = block->min_y + (readBits(packed.data(), offset + block->bits_for_x, block->bits_for_y) << block->trailing_zero_bits_in_y);
+    return MarkInCompressedFile{.offset_in_compressed_file = x, .offset_in_decompressed_block = y};
+}
+
+std::tuple<const MarksInCompressedFile::BlockInfo *, size_t> MarksInCompressedFile::lookUpMark(size_t idx) const
+{
+    size_t block_idx = idx / MARKS_PER_BLOCK;
+    const BlockInfo & block = blocks[block_idx];
+    size_t offset = block.bit_offset_in_packed_array + (idx - block_idx * MARKS_PER_BLOCK) * (block.bits_for_x + block.bits_for_y);
+    return {&block, offset};
+}
+
+size_t MarksInCompressedFile::approximateMemoryUsage() const
+{
+    return sizeof(*this) + blocks.size() * sizeof(blocks[0]) + packed.size() * sizeof(packed[0]);
+}
+
+}
diff --git a/src/Formats/MarkInCompressedFile.h b/src/Formats/MarkInCompressedFile.h
index 287d3f7909d..08e4f182c45 100644
--- a/src/Formats/MarkInCompressedFile.h
+++ b/src/Formats/MarkInCompressedFile.h
@@ -2,8 +2,8 @@
 
 #include <tuple>
 
-#include <base/types.h>
 #include <IO/WriteHelpers.h>
+#include <base/types.h>
 #include <Common/PODArray.h>
 
 
@@ -23,15 +23,9 @@ struct MarkInCompressedFile
         return std::tie(offset_in_compressed_file, offset_in_decompressed_block)
             == std::tie(rhs.offset_in_compressed_file, rhs.offset_in_decompressed_block);
     }
-    bool operator!=(const MarkInCompressedFile & rhs) const
-    {
-        return !(*this == rhs);
-    }
+    bool operator!=(const MarkInCompressedFile & rhs) const { return !(*this == rhs); }
 
-    auto asTuple() const
-    {
-        return std::make_tuple(offset_in_compressed_file, offset_in_decompressed_block);
-    }
+    auto asTuple() const { return std::make_tuple(offset_in_compressed_file, offset_in_decompressed_block); }
 
     String toString() const
     {
@@ -40,20 +34,87 @@ struct MarkInCompressedFile
 
     String toStringWithRows(size_t rows_num) const
     {
-        return "(" + DB::toString(offset_in_compressed_file) + "," + DB::toString(offset_in_decompressed_block) + "," + DB::toString(rows_num) + ")";
+        return "(" + DB::toString(offset_in_compressed_file) + "," + DB::toString(offset_in_decompressed_block) + ","
+            + DB::toString(rows_num) + ")";
     }
-
 };
 
-class MarksInCompressedFile : public PODArray<MarkInCompressedFile>
+/**
+ * In-memory representation of an array of marks.
+ *
+ * Uses an ad-hoc compression scheme that decreases memory usage while allowing
+ * random access in O(1) time.
+ * This is independent from the marks *file* format, which may be uncompressed
+ * or use a different compression method.
+ *
+ * Typical memory usage:
+ *  * ~3 bytes/mark for integer columns
+ *  * ~5 bytes/mark for string columns
+ *  * ~0.3 bytes/mark for trivial marks in auxiliary dict files of LowCardinality columns
+ */
+class MarksInCompressedFile
 {
 public:
-    explicit MarksInCompressedFile(size_t n) : PODArray(n) {}
+    using PlainArray = PODArray<MarkInCompressedFile>;
 
-    void read(ReadBuffer & buffer, size_t from, size_t count)
+    MarksInCompressedFile(const PlainArray & marks);
+
+    MarkInCompressedFile get(size_t idx) const;
+
+    size_t approximateMemoryUsage() const;
+
+private:
+    /** Throughout this class:
+     *   * "x" stands for offset_in_compressed_file,
+     *   * "y" stands for offset_in_decompressed_block.
+     */
+
+    /** We need to store a sequence of marks, each consisting of two 64-bit integers:
+     * offset_in_compressed_file and offset_in_decompressed_block. We'll call them x and y for
+     * convenience, since compression doesn't care what they mean. The compression exploits the
+     * following regularities:
+     *  * y is usually zero.
+     *  * x usually increases steadily.
+     *  * Differences between x values in nearby marks usually fit in much fewer than 64 bits.
+     *
+     * We split the sequence of marks into blocks, each containing MARKS_PER_BLOCK marks.
+     * (Not to be confused with data blocks.)
+     * For each mark, we store the difference [value] - [min value in the block], for each of the
+     * two values in the mark. Each block specifies the number of bits to use for these differences
+     * for all marks in this block.
+     * The smaller the blocks the fewer bits are required, but the bigger the relative overhead of
+     * block headers.
+     *
+     * Packed marks and block headers all live in one contiguous array.
+     */
+
+    struct BlockInfo
     {
-        buffer.readStrict(reinterpret_cast<char *>(data() + from), count * sizeof(MarkInCompressedFile));
-    }
+        // Min offset_in_compressed_file and offset_in_decompressed_block, correspondingly.
+        size_t min_x = UINT64_MAX;
+        size_t min_y = UINT64_MAX;
+
+        // Place in `packed` where this block start.
+        size_t bit_offset_in_packed_array;
+
+        // How many bits each mark takes. These numbers are bit-packed in the `packed` array.
+        // Can be zero. (Especially for y, which is typically all zeroes.)
+        UInt8 bits_for_x;
+        UInt8 bits_for_y;
+        // The `y` values should be <<'ed by this amount.
+        // Useful for integer columns when marks granularity is a power of 2; in this case all
+        // offset_in_decompressed_block values are divisible by 2^15 or so.
+        UInt8 trailing_zero_bits_in_y = 63;
+    };
+
+    static constexpr size_t MARKS_PER_BLOCK = 256;
+
+    size_t num_marks;
+    PODArray<BlockInfo> blocks;
+    PODArray<UInt64> packed;
+
+    // Mark idx -> {block info, bit offset in `packed`}.
+    std::tuple<const BlockInfo *, size_t> lookUpMark(size_t idx) const;
 };
 
 }
diff --git a/src/Formats/NativeReader.cpp b/src/Formats/NativeReader.cpp
index 9f8d4ba1930..ff75ffb3c02 100644
--- a/src/Formats/NativeReader.cpp
+++ b/src/Formats/NativeReader.cpp
@@ -15,6 +15,8 @@
 #include <DataTypes/Serializations/SerializationInfo.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 
+#include <Interpreters/castColumn.h>
+
 
 namespace DB
 {
@@ -25,6 +27,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int CANNOT_READ_ALL_DATA;
     extern const int INCORRECT_DATA;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 
 
@@ -39,12 +42,14 @@ NativeReader::NativeReader(
     UInt64 server_revision_,
     bool skip_unknown_columns_,
     bool null_as_default_,
+    bool allow_types_conversion_,
     BlockMissingValues * block_missing_values_)
     : istr(istr_)
     , header(header_)
     , server_revision(server_revision_)
     , skip_unknown_columns(skip_unknown_columns_)
     , null_as_default(null_as_default_)
+    , allow_types_conversion(allow_types_conversion_)
     , block_missing_values(block_missing_values_)
 {
 }
@@ -132,6 +137,11 @@ Block NativeReader::read()
     {
         readVarUInt(columns, istr);
         readVarUInt(rows, istr);
+
+        if (columns > 1'000'000uz)
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Suspiciously many columns in Native format: {}", columns);
+        if (rows > 1'000'000'000'000uz)
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Suspiciously many rows in Native format: {}", rows);
     }
     else
     {
@@ -204,11 +214,31 @@ Block NativeReader::read()
                 if (null_as_default)
                     insertNullAsDefaultIfNeeded(column, header_column, header.getPositionByName(column.name), block_missing_values);
 
-                /// Support insert from old clients without low cardinality type.
                 if (!header_column.type->equals(*column.type))
                 {
-                    column.column = recursiveTypeConversion(column.column, column.type, header.safeGetByPosition(i).type);
-                    column.type = header.safeGetByPosition(i).type;
+                    if (allow_types_conversion)
+                    {
+                        try
+                        {
+                            column.column = castColumn(column, header_column.type);
+                        }
+                        catch (Exception & e)
+                        {
+                            e.addMessage(fmt::format(
+                                "while converting column \"{}\" from type {} to type {}",
+                                column.name,
+                                column.type->getName(),
+                                header_column.type->getName()));
+                            throw;
+                        }
+                    }
+                    else
+                    {
+                        /// Support insert from old clients without low cardinality type.
+                        column.column = recursiveLowCardinalityTypeConversion(column.column, column.type, header_column.type);
+                    }
+
+                    column.type = header_column.type;
                 }
             }
             else
diff --git a/src/Formats/NativeReader.h b/src/Formats/NativeReader.h
index 2d8b16e06eb..3cec4afd997 100644
--- a/src/Formats/NativeReader.h
+++ b/src/Formats/NativeReader.h
@@ -30,6 +30,7 @@ public:
         UInt64 server_revision_,
         bool skip_unknown_columns_ = false,
         bool null_as_default_ = false,
+        bool allow_types_conversion_ = false,
         BlockMissingValues * block_missing_values_ = nullptr);
 
     /// For cases when we have an index. It allows to skip columns. Only columns specified in the index will be read.
@@ -51,6 +52,7 @@ private:
     UInt64 server_revision;
     bool skip_unknown_columns = false;
     bool null_as_default = false;
+    bool allow_types_conversion = false;
     BlockMissingValues * block_missing_values = nullptr;
 
     bool use_index = false;
diff --git a/src/Formats/ProtobufSchemas.cpp b/src/Formats/ProtobufSchemas.cpp
index efc0a4e694f..86c81e1a3c3 100644
--- a/src/Formats/ProtobufSchemas.cpp
+++ b/src/Formats/ProtobufSchemas.cpp
@@ -41,8 +41,19 @@ public:
             return descriptor;
 
         const auto * file_descriptor = importer.Import(schema_path);
-        // If there are parsing errors, AddError() throws an exception and in this case the following line
-        // isn't executed.
+        if (error)
+        {
+            auto info = error.value();
+            error.reset();
+            throw Exception(
+                ErrorCodes::CANNOT_PARSE_PROTOBUF_SCHEMA,
+                "Cannot parse '{}' file, found an error at line {}, column {}, {}",
+                info.filename,
+                std::to_string(info.line),
+                std::to_string(info.column),
+                info.message);
+        }
+
         assert(file_descriptor);
 
         if (with_envelope == WithEnvelope::No)
@@ -74,14 +85,24 @@ private:
     // Overrides google::protobuf::compiler::MultiFileErrorCollector:
     void AddError(const String & filename, int line, int column, const String & message) override
     {
-        throw Exception(ErrorCodes::CANNOT_PARSE_PROTOBUF_SCHEMA,
-                        "Cannot parse '{}' file, found an error at line {}, column {}, {}",
-                        filename, std::to_string(line), std::to_string(column), message);
+        /// Protobuf library code is not exception safe, we should
+        /// remember the error and throw it later from our side.
+        error = ErrorInfo{filename, line, column, message};
     }
 
     google::protobuf::compiler::DiskSourceTree disk_source_tree;
     google::protobuf::compiler::Importer importer;
     const WithEnvelope with_envelope;
+
+    struct ErrorInfo
+    {
+        String filename;
+        int line;
+        int column;
+        String message;
+    };
+
+    std::optional<ErrorInfo> error;
 };
 
 
diff --git a/src/Formats/ProtobufSerializer.cpp b/src/Formats/ProtobufSerializer.cpp
index 36cd2534fe8..f690800d145 100644
--- a/src/Formats/ProtobufSerializer.cpp
+++ b/src/Formats/ProtobufSerializer.cpp
@@ -59,6 +59,7 @@ namespace ErrorCodes
     extern const int PROTOBUF_BAD_CAST;
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_COLUMN;
 }
 
 namespace
@@ -298,7 +299,10 @@ namespace
             try
             {
                 /// TODO: use accurate::convertNumeric() maybe?
-                result = boost::numeric_cast<DestType>(value);
+                if constexpr (std::is_same_v<SrcType, IPv4>)
+                    result = boost::numeric_cast<DestType>(value.toUnderType());
+                else
+                    result = boost::numeric_cast<DestType>(value);
             }
             catch (boost::numeric::bad_numeric_cast &)
             {
@@ -504,7 +508,7 @@ namespace
                     {
                         UInt64 u64 = readUInt();
                         if (u64 < 2)
-                            return static_cast<NumberType>(u64);
+                            return castNumber<NumberType>(u64);
                         else
                             cannotConvertValue(toString(u64), field_descriptor.type_name(), TypeName<NumberType>);
                     };
@@ -1482,6 +1486,157 @@ namespace
         }
     };
 
+    class ProtobufSerializerDate32 : public ProtobufSerializerNumber<Int32>
+    {
+    public:
+        ProtobufSerializerDate32(
+            std::string_view column_name_,
+            const FieldDescriptor & field_descriptor_,
+            const ProtobufReaderOrWriter & reader_or_writer_)
+            : ProtobufSerializerNumber<Int32>(column_name_, field_descriptor_, reader_or_writer_)
+        {
+            setFunctions();
+        }
+
+        void describeTree(WriteBuffer & out, size_t indent) const override
+        {
+            writeIndent(out, indent) << "ProtobufSerializerDate32: column " << quoteString(column_name) << " -> field "
+                                     << quoteString(field_descriptor.full_name()) << " (" << field_descriptor.type_name() << ")\n";
+        }
+
+    private:
+        void setFunctions()
+        {
+            switch (field_typeid)
+            {
+                case FieldTypeId::TYPE_INT32:
+                case FieldTypeId::TYPE_SINT32:
+                case FieldTypeId::TYPE_UINT32:
+                case FieldTypeId::TYPE_INT64:
+                case FieldTypeId::TYPE_SINT64:
+                case FieldTypeId::TYPE_UINT64:
+                case FieldTypeId::TYPE_FIXED32:
+                case FieldTypeId::TYPE_SFIXED32:
+                case FieldTypeId::TYPE_FIXED64:
+                case FieldTypeId::TYPE_SFIXED64:
+                case FieldTypeId::TYPE_FLOAT:
+                case FieldTypeId::TYPE_DOUBLE:
+                    break; /// already set in ProtobufSerializerNumber<Int32>::setFunctions().
+
+                case FieldTypeId::TYPE_STRING:
+                case FieldTypeId::TYPE_BYTES:
+                {
+                    write_function = [this](Int32 value)
+                    {
+                        dateToString(static_cast<ExtendedDayNum>(value), text_buffer);
+                        writeStr(text_buffer);
+                    };
+
+                    read_function = [this]() -> Int32
+                    {
+                        readStr(text_buffer);
+                        return stringToDate(text_buffer);
+                    };
+
+                    default_function = [this]() -> Int32 { return stringToDate(field_descriptor.default_value_string()); };
+                    break;
+                }
+
+                default:
+                    incompatibleColumnType("Date32");
+            }
+        }
+
+        static void dateToString(ExtendedDayNum date, String & str)
+        {
+            WriteBufferFromString buf{str};
+            writeDateText(date, buf);
+        }
+
+        static ExtendedDayNum stringToDate(const String & str)
+        {
+            ExtendedDayNum date;
+            ReadBufferFromString buf{str};
+            readDateText(date, buf);
+            return date;
+        }
+    };
+
+    class ProtobufSerializerIPv4 : public ProtobufSerializerNumber<IPv4>
+    {
+    public:
+        ProtobufSerializerIPv4(
+            std::string_view column_name_,
+            const FieldDescriptor & field_descriptor_,
+            const ProtobufReaderOrWriter & reader_or_writer_)
+            : ProtobufSerializerNumber<IPv4>(column_name_, field_descriptor_, reader_or_writer_)
+        {
+            setFunctions();
+        }
+
+        void describeTree(WriteBuffer & out, size_t indent) const override
+        {
+            writeIndent(out, indent) << "ProtobufSerializerDate: column " << quoteString(column_name) << " -> field "
+                                     << quoteString(field_descriptor.full_name()) << " (" << field_descriptor.type_name() << ")\n";
+        }
+
+    private:
+        void setFunctions()
+        {
+            switch (field_typeid)
+            {
+                case FieldTypeId::TYPE_INT32:
+                case FieldTypeId::TYPE_SINT32:
+                case FieldTypeId::TYPE_UINT32:
+                case FieldTypeId::TYPE_INT64:
+                case FieldTypeId::TYPE_SINT64:
+                case FieldTypeId::TYPE_UINT64:
+                case FieldTypeId::TYPE_FIXED32:
+                case FieldTypeId::TYPE_SFIXED32:
+                case FieldTypeId::TYPE_FIXED64:
+                case FieldTypeId::TYPE_SFIXED64:
+                case FieldTypeId::TYPE_FLOAT:
+                case FieldTypeId::TYPE_DOUBLE:
+                    break; /// already set in ProtobufSerializerNumber<IPv4>::setFunctions().
+
+                case FieldTypeId::TYPE_STRING:
+                case FieldTypeId::TYPE_BYTES:
+                {
+                    write_function = [this](IPv4 value)
+                    {
+                        ipv4ToString(value, text_buffer);
+                        writeStr(text_buffer);
+                    };
+
+                    read_function = [this]() -> IPv4
+                    {
+                        readStr(text_buffer);
+                        return stringToIPv4(text_buffer);
+                    };
+
+                    default_function = [this]() -> IPv4 { return stringToIPv4(field_descriptor.default_value_string()); };
+                    break;
+                }
+
+                default:
+                    incompatibleColumnType("IPv4");
+            }
+        }
+
+        static void ipv4ToString(IPv4 value, String & str)
+        {
+            WriteBufferFromString buf{str};
+            writeIPv4Text(value, buf);
+        }
+
+        static IPv4 stringToIPv4(const String & str)
+        {
+            IPv4 value;
+            ReadBufferFromString buf{str};
+            readIPv4Text(value, buf);
+            return value;
+        }
+    };
 
     /// Serializes a ColumnVector<UInt32> containing datetimes to a field of any type except TYPE_MESSAGE, TYPE_GROUP, TYPE_BOOL, TYPE_ENUM.
     class ProtobufSerializerDateTime : public ProtobufSerializerNumber<UInt32>
@@ -1697,33 +1852,32 @@ namespace
 
             write_function = [this](IPv6 value)
             {
-                ipToString(value, text_buffer);
+                text_buffer = String(IPV6_BINARY_LENGTH, '\0');
+                memcpy(text_buffer.data(), &value.toUnderType(), IPV6_BINARY_LENGTH);
                 writeStr(text_buffer);
             };
 
             read_function = [this]() -> IPv6
             {
                 readStr(text_buffer);
-                return parse<IPv6>(text_buffer);
+                if (text_buffer.size() != IPV6_BINARY_LENGTH)
+                    throw Exception(ErrorCodes::PROTOBUF_BAD_CAST,
+                                    "Could not convert bytes field {} to IPv6 for inserting into column {} - field size {} is not equal to IPv6 size {}",
+                                    field_descriptor.full_name(), column_name, text_buffer.size(), IPV6_BINARY_LENGTH);
+                IPv6 value;
+                memcpy(&value.toUnderType(), text_buffer.data(), IPV6_BINARY_LENGTH);
+                return value;
             };
 
             default_function = [this]() -> IPv6 { return parse<IPv6>(field_descriptor.default_value_string()); };
         }
 
-        static void ipToString(const IPv6 & ip, String & str)
-        {
-            WriteBufferFromString buf{str};
-            writeText(ip, buf);
-        }
-
         std::function<void(IPv6)> write_function;
         std::function<IPv6()> read_function;
         std::function<IPv6()> default_function;
         String text_buffer;
     };
 
-    using ProtobufSerializerIPv4 = ProtobufSerializerNumber<UInt32>;
-
     using ProtobufSerializerInterval = ProtobufSerializerNumber<Int64>;
 
 
@@ -2852,10 +3006,10 @@ namespace
             bool google_wrappers_special_treatment)
         {
             root_serializer_ptr = std::make_shared<ProtobufSerializer *>();
-            get_root_desc_function = [root_serializer_ptr = root_serializer_ptr](size_t indent) -> String
+            get_root_desc_function = [my_root_serializer_ptr = root_serializer_ptr](size_t indent) -> String
             {
                 WriteBufferFromOwnString buf;
-                (*root_serializer_ptr)->describeTree(buf, indent);
+                (*my_root_serializer_ptr)->describeTree(buf, indent);
                 return buf.str();
             };
 
@@ -3341,6 +3495,7 @@ namespace
                 case TypeIndex::UInt256: return std::make_unique<ProtobufSerializerNumber<UInt256>>(column_name, field_descriptor, reader_or_writer);
                 case TypeIndex::Int8: return std::make_unique<ProtobufSerializerNumber<Int8>>(column_name, field_descriptor, reader_or_writer);
                 case TypeIndex::Int16: return std::make_unique<ProtobufSerializerNumber<Int16>>(column_name, field_descriptor, reader_or_writer);
+                case TypeIndex::Date32: return std::make_unique<ProtobufSerializerDate32>(column_name, field_descriptor, reader_or_writer);
                 case TypeIndex::Int32: return std::make_unique<ProtobufSerializerNumber<Int32>>(column_name, field_descriptor, reader_or_writer);
                 case TypeIndex::Int64: return std::make_unique<ProtobufSerializerNumber<Int64>>(column_name, field_descriptor, reader_or_writer);
                 case TypeIndex::Int128: return std::make_unique<ProtobufSerializerNumber<Int128>>(column_name, field_descriptor, reader_or_writer);
@@ -3401,7 +3556,41 @@ namespace
                     const auto & array_data_type = assert_cast<const DataTypeArray &>(*data_type);
 
                     if (!allow_repeat)
+                    {
+                        /// Case of nested Arrays. Nested Array can be a message with one repeated field.
+                        /// For example we have an column `arr Array(Array(UInt32))` and the next proto schema:
+                        /// message Message {
+                        ///     message NestedArray {
+                        ///         repeated uint32 nested = 2;
+                        ///     }
+                        ///     repeated NestedArray arr = 1;
+                        /// }
+                        if (field_descriptor.message_type() && field_descriptor.message_type()->field_count() == 1)
+                        {
+                            Names column_names = {field_descriptor.message_type()->field(0)->name()};
+                            DataTypes data_types = {data_type};
+                            /// Try to serialize as a nested message.
+                            std::vector<size_t> used_column_indices;
+                            auto message_serializer = buildMessageSerializerImpl(
+                                1,
+                                column_names.data(),
+                                data_types.data(),
+                                *field_descriptor.message_type(),
+                                /* with_length_delimiter = */ false,
+                                google_wrappers_special_treatment,
+                                &field_descriptor,
+                                used_column_indices,
+                                /* columns_are_reordered_outside = */ false,
+                                /* check_nested_while_filling_missing_columns = */ false);
+
+                            if (!message_serializer)
+                                return nullptr;
+
+                            return message_serializer;
+                        }
+
                         throwFieldNotRepeated(field_descriptor, column_name);
+                    }
 
                     auto nested_serializer = buildFieldSerializer(column_name, array_data_type.getNestedType(), field_descriptor,
                                                                   /* allow_repeat = */ false, // We do our repeating now, so for nested type we forget about the repeating.
@@ -3419,15 +3608,35 @@ namespace
                     const auto & tuple_data_type = assert_cast<const DataTypeTuple &>(*data_type);
                     size_t size_of_tuple = tuple_data_type.getElements().size();
 
-                    if (tuple_data_type.haveExplicitNames() && field_descriptor.message_type())
+                    if (const auto * message_type = field_descriptor.message_type())
                     {
+                        bool have_explicit_names = tuple_data_type.haveExplicitNames();
+                        Names element_names;
+                        if (have_explicit_names)
+                        {
+                            element_names = tuple_data_type.getElementNames();
+                        }
+                        else
+                        {
+                            /// Match unnamed Tuple elements and Message fields by position.
+                            size_t field_count = message_type->field_count();
+                            if (field_count != size_of_tuple)
+                                throw Exception(
+                                    ErrorCodes::NO_COLUMNS_SERIALIZED_TO_PROTOBUF_FIELDS,
+                                    "The number of fields in Protobuf message ({}) is not equal to the number of elements in unnamed Tuple ({})",
+                                    field_count,
+                                    size_of_tuple);
+                            for (size_t i = 0; i != field_count; ++i)
+                                element_names.push_back(message_type->field(static_cast<int>(i))->name());
+                        }
+
                         /// Try to serialize as a nested message.
                         std::vector<size_t> used_column_indices;
                         auto message_serializer = buildMessageSerializerImpl(
                             size_of_tuple,
-                            tuple_data_type.getElementNames().data(),
+                            element_names.data(),
                             tuple_data_type.getElements().data(),
-                            *field_descriptor.message_type(),
+                            *message_type,
                             /* with_length_delimiter = */ false,
                             google_wrappers_special_treatment,
                             &field_descriptor,
@@ -3474,7 +3683,7 @@ namespace
                 }
 
                 default:
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown data type: {}", data_type->getName());
+                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Type {} is not supported in Protobuf format", data_type->getName());
             }
         }
 
diff --git a/src/Formats/SchemaInferenceUtils.cpp b/src/Formats/SchemaInferenceUtils.cpp
index 7a242a9f81c..011860948c3 100644
--- a/src/Formats/SchemaInferenceUtils.cpp
+++ b/src/Formats/SchemaInferenceUtils.cpp
@@ -131,6 +131,7 @@ namespace
 
             type_indexes.erase(TypeIndex::Date);
             type_indexes.erase(TypeIndex::DateTime);
+            type_indexes.insert(TypeIndex::String);
             return;
         }
 
@@ -983,13 +984,16 @@ DataTypePtr tryInferNumberFromString(std::string_view field, const FormatSetting
         if (tryReadIntText(tmp_int, buf) && buf.eof())
             return std::make_shared<DataTypeInt64>();
 
+        /// We can safely get back to the start of buffer, because we read from a string and we didn't reach eof.
+        buf.position() = buf.buffer().begin();
+
         /// In case of Int64 overflow, try to infer UInt64
         UInt64 tmp_uint;
         if (tryReadIntText(tmp_uint, buf) && buf.eof())
             return std::make_shared<DataTypeUInt64>();
     }
 
-    /// We cam safely get back to the start of buffer, because we read from a string and we didn't reach eof.
+    /// We can safely get back to the start of buffer, because we read from a string and we didn't reach eof.
     buf.position() = buf.buffer().begin();
 
     Float64 tmp;
diff --git a/src/Formats/fuzzers/CMakeLists.txt b/src/Formats/fuzzers/CMakeLists.txt
new file mode 100644
index 00000000000..984823f3360
--- /dev/null
+++ b/src/Formats/fuzzers/CMakeLists.txt
@@ -0,0 +1,2 @@
+clickhouse_add_executable(format_fuzzer format_fuzzer.cpp ${SRCS})
+target_link_libraries(format_fuzzer PRIVATE dbms clickhouse_aggregate_functions ${LIB_FUZZING_ENGINE})
diff --git a/src/Formats/fuzzers/format_fuzzer.cpp b/src/Formats/fuzzers/format_fuzzer.cpp
new file mode 100644
index 00000000000..e84d0913d0d
--- /dev/null
+++ b/src/Formats/fuzzers/format_fuzzer.cpp
@@ -0,0 +1,133 @@
+#include <base/types.h>
+
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
+
+#include <Formats/FormatFactory.h>
+#include <Formats/registerFormats.h>
+
+#include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/QueryPipeline.h>
+
+#include <Processors/Formats/IInputFormat.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+
+#include <Common/MemoryTracker.h>
+#include <Common/CurrentThread.h>
+
+#include <Interpreters/Context.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
+
+#include <AggregateFunctions/registerAggregateFunctions.h>
+
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
+try
+{
+    using namespace DB;
+
+    static SharedContextHolder shared_context;
+    static ContextMutablePtr context;
+
+    auto initialize = [&]() mutable
+    {
+        shared_context = Context::createShared();
+        context = Context::createGlobal(shared_context.get());
+        context->makeGlobalContext();
+        context->setApplicationType(Context::ApplicationType::LOCAL);
+
+        MainThreadStatus::getInstance();
+
+        registerAggregateFunctions();
+        registerFormats();
+
+        return true;
+    };
+
+    static bool initialized = initialize();
+    (void) initialized;
+
+    total_memory_tracker.resetCounters();
+    total_memory_tracker.setHardLimit(1_GiB);
+    CurrentThread::get().memory_tracker.resetCounters();
+    CurrentThread::get().memory_tracker.setHardLimit(1_GiB);
+
+    /// The input format is as follows:
+    /// - format name on the first line,
+    /// - table structure on the second line,
+    /// - the data for the rest of the input.
+
+    /** The corpus was generated as follows:
+
+    i=0; find ../../../../tests/queries -name '*.sql' |
+        xargs -I{} bash -c "tr '\n' ' ' <{}; echo" |
+        rg -o -i 'CREATE TABLE\s+\w+\s+\(.+?\) ENGINE' |
+        sed -r -e 's/CREATE TABLE\s+\w+\s+\((.+?)\) ENGINE/\1/i' | sort | uniq |
+        while read line; do
+            i=$((i+1));
+            clickhouse-local --query "SELECT name FROM system.formats ORDER BY rand() LIMIT 1" >> $i;
+            echo "$line" >> $i;
+            echo $RANDOM >> $i;
+            echo $i;
+        done
+    */
+
+    /** And:
+
+    for format in $(clickhouse-client --query "SELECT name FROM system.formats WHERE is_output"); do
+        echo $format;
+        echo $format >> $format;
+        echo "WatchID Int64, JavaEnable Int16, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID Int32, ClientIP Int32, RegionID Int32, UserID Int64, CounterClass Int16, OS Int16, UserAgent Int16, URL String, Referer String, IsRefresh Int16, RefererCategoryID Int16, RefererRegionID Int32, URLCategoryID Int16, URLRegionID Int32, ResolutionWidth Int16, ResolutionHeight Int16, ResolutionDepth Int16, FlashMajor Int16, FlashMinor Int16, FlashMinor2 String, NetMajor Int16, NetMinor Int16, UserAgentMajor Int16, UserAgentMinor String, CookieEnable Int16, JavascriptEnable Int16, IsMobile Int16, MobilePhone Int16, MobilePhoneModel String, Params String, IPNetworkID Int32, TraficSourceID Int16, SearchEngineID Int16, SearchPhrase String, AdvEngineID Int16, IsArtifical Int16, WindowClientWidth Int16, WindowClientHeight Int16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 Int16, SilverlightVersion2 Int16, SilverlightVersion3 Int32, SilverlightVersion4 Int16, PageCharset String, CodeVersion Int32, IsLink Int16, IsDownload Int16, IsNotBounce Int16, FUniqID Int64, OriginalURL String, HID Int32, IsOldCounter Int16, IsEvent Int16, IsParameter Int16, DontCountHits Int16, WithHash Int16, HitColor String, LocalEventTime DateTime, Age Int16, Sex Int16, Income Int16, Interests Int16, Robotness Int16, RemoteIP Int32, WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage String, BrowserCountry String, SocialNetwork String, SocialAction String, HTTPError Int16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, SocialSourceNetworkID Int16, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency String, ParamCurrencyID Int16, OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID Int16, RefererHash Int64, URLHash Int64, CLID Int32" >> $format;
+        clickhouse-client --query "SELECT * FROM hits LIMIT 10 FORMAT $format" >> $format || rm $format;
+    done
+
+    */
+
+    /// Compile the code as follows:
+    ///   mkdir build_asan_fuzz
+    ///   cd build_asan_fuzz
+    ///   CC=clang CXX=clang++ cmake -D SANITIZE=address -D ENABLE_FUZZING=1 -D WITH_COVERAGE=1 ..
+    ///
+    /// The corpus is located here:
+    /// https://github.com/ClickHouse/fuzz-corpus/tree/main/format_fuzzer
+    ///
+    /// The fuzzer can be run as follows:
+    ///   ../../../build_asan_fuzz/src/Formats/fuzzers/format_fuzzer corpus -jobs=64 -rss_limit_mb=8192
+
+    DB::ReadBufferFromMemory in(data, size);
+
+    String format;
+    readStringUntilNewlineInto(format, in);
+    assertChar('\n', in);
+
+    String structure;
+    readStringUntilNewlineInto(structure, in);
+    assertChar('\n', in);
+
+    ColumnsDescription description = parseColumnsListFromString(structure, context);
+    auto columns_info = description.getOrdinary();
+
+    Block header;
+    for (const auto & info : columns_info)
+    {
+        ColumnWithTypeAndName column;
+        column.name = info.name;
+        column.type = info.type;
+        column.column = column.type->createColumn();
+        header.insert(std::move(column));
+    }
+
+    InputFormatPtr input_format = context->getInputFormat(format, in, header, 13 /* small block size */);
+
+    QueryPipeline pipeline(Pipe(std::move(input_format)));
+    PullingPipelineExecutor executor(pipeline);
+    Block res;
+    while (executor.pull(res))
+        ;
+
+    return 0;
+}
+catch (...)
+{
+    return 1;
+}
diff --git a/src/Formats/newLineSegmentationEngine.cpp b/src/Formats/newLineSegmentationEngine.cpp
deleted file mode 100644
index 5135ca1e13e..00000000000
--- a/src/Formats/newLineSegmentationEngine.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <Formats/newLineSegmentationEngine.h>
-#include <IO/ReadHelpers.h>
-#include <base/find_symbols.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-std::pair<bool, size_t> newLineFileSegmentationEngine(ReadBuffer & in, DB::Memory<> & memory, size_t min_bytes, size_t max_rows)
-{
-    char * pos = in.position();
-    bool need_more_data = true;
-    size_t number_of_rows = 0;
-
-    while (loadAtPosition(in, memory, pos) && need_more_data)
-    {
-        pos = find_first_symbols<'\r', '\n'>(pos, in.buffer().end());
-        if (pos > in.buffer().end())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Position in buffer is out of bounds. There must be a bug.");
-        else if (pos == in.buffer().end())
-            continue;
-
-        ++number_of_rows;
-        if ((memory.size() + static_cast<size_t>(pos - in.position()) >= min_bytes) || (number_of_rows == max_rows))
-            need_more_data = false;
-
-        if (*pos == '\n')
-        {
-            ++pos;
-            if (loadAtPosition(in, memory, pos) && *pos == '\r')
-                ++pos;
-        }
-        else if (*pos == '\r')
-        {
-            ++pos;
-            if (loadAtPosition(in, memory, pos) && *pos == '\n')
-                ++pos;
-        }
-    }
-
-    saveUpToPosition(in, memory, pos);
-
-    return {loadAtPosition(in, memory, pos), number_of_rows};
-}
-
-}
diff --git a/src/Formats/newLineSegmentationEngine.h b/src/Formats/newLineSegmentationEngine.h
deleted file mode 100644
index 598f808b798..00000000000
--- a/src/Formats/newLineSegmentationEngine.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include <IO/ReadBuffer.h>
-#include <IO/BufferWithOwnMemory.h>
-
-namespace DB
-{
-    std::pair<bool, size_t> newLineFileSegmentationEngine(ReadBuffer & in, DB::Memory<> & memory, size_t min_bytes, size_t max_rows);
-}
diff --git a/src/Formats/registerFormats.cpp b/src/Formats/registerFormats.cpp
index 285e234167b..29ef46f330f 100644
--- a/src/Formats/registerFormats.cpp
+++ b/src/Formats/registerFormats.cpp
@@ -100,6 +100,7 @@ void registerInputFormatJSONAsString(FormatFactory & factory);
 void registerInputFormatJSONAsObject(FormatFactory & factory);
 void registerInputFormatLineAsString(FormatFactory & factory);
 void registerInputFormatMySQLDump(FormatFactory & factory);
+void registerInputFormatParquetMetadata(FormatFactory & factory);
 
 #if USE_HIVE
 void registerInputFormatHiveText(FormatFactory & factory);
@@ -140,6 +141,7 @@ void registerValuesSchemaReader(FormatFactory & factory);
 void registerTemplateSchemaReader(FormatFactory & factory);
 void registerMySQLSchemaReader(FormatFactory & factory);
 void registerBSONEachRowSchemaReader(FormatFactory & factory);
+void registerParquetMetadataSchemaReader(FormatFactory & factory);
 
 void registerFileExtensions(FormatFactory & factory);
 
@@ -240,6 +242,8 @@ void registerFormats()
     registerInputFormatCapnProto(factory);
     registerInputFormatMySQLDump(factory);
 
+    registerInputFormatParquetMetadata(factory);
+
     registerNonTrivialPrefixAndSuffixCheckerJSONEachRow(factory);
     registerNonTrivialPrefixAndSuffixCheckerJSONAsString(factory);
     registerNonTrivialPrefixAndSuffixCheckerJSONAsObject(factory);
@@ -274,6 +278,7 @@ void registerFormats()
     registerTemplateSchemaReader(factory);
     registerMySQLSchemaReader(factory);
     registerBSONEachRowSchemaReader(factory);
+    registerParquetMetadataSchemaReader(factory);
 }
 
 }
diff --git a/src/Formats/tests/gtest_marks.cpp b/src/Formats/tests/gtest_marks.cpp
new file mode 100644
index 00000000000..334e99d2ec6
--- /dev/null
+++ b/src/Formats/tests/gtest_marks.cpp
@@ -0,0 +1,52 @@
+#include <random>
+#include <gtest/gtest.h>
+
+#include <Formats/MarkInCompressedFile.h>
+
+using namespace DB;
+
+TEST(Marks, Compression)
+{
+    std::random_device dev;
+    std::mt19937 rng(dev());
+
+    auto gen = [&](size_t count, size_t max_x_increment, size_t max_y_increment)
+    {
+        size_t x = 0, y = 0;
+        PODArray<MarkInCompressedFile> plain(count);
+        for (int i = 0; i < count; ++i)
+        {
+            x += rng() % (max_x_increment + 1);
+            y += rng() % (max_y_increment + 1);
+            plain[i] = MarkInCompressedFile{.offset_in_compressed_file = x, .offset_in_decompressed_block = y};
+        }
+        return plain;
+    };
+
+    auto test = [](const PODArray<MarkInCompressedFile> & plain, size_t max_bits_per_mark)
+    {
+        PODArray<MarkInCompressedFile> copy;
+        copy.assign(plain); // paranoid in case next line mutates it
+
+        MarksInCompressedFile marks(copy);
+        for (size_t i = 0; i < plain.size(); ++i)
+            ASSERT_EQ(marks.get(i), plain[i]);
+
+        EXPECT_LE((marks.approximateMemoryUsage() - sizeof(MarksInCompressedFile)) * 8, plain.size() * max_bits_per_mark);
+    };
+
+    // Typical.
+    test(gen(10000, 1'000'000, 0), 30);
+
+    // Completely random 64-bit values.
+    test(gen(10000, UINT64_MAX - 1, UINT64_MAX - 1), 130);
+
+    // All zeros.
+    test(gen(10000, 0, 0), 2);
+
+    // Short.
+    test(gen(10, 1000, 1000), 65);
+
+    // Empty.
+    test(gen(0, 0, 0), 0);
+}
diff --git a/src/Formats/verbosePrintString.cpp b/src/Formats/verbosePrintString.cpp
index 2f3e09ed75f..5c6111c2929 100644
--- a/src/Formats/verbosePrintString.cpp
+++ b/src/Formats/verbosePrintString.cpp
@@ -1,5 +1,5 @@
 #include <Formats/verbosePrintString.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <IO/Operators.h>
 
 
diff --git a/src/Functions/CMakeLists.txt b/src/Functions/CMakeLists.txt
index ec4dc7a1292..2f5c8a212f2 100644
--- a/src/Functions/CMakeLists.txt
+++ b/src/Functions/CMakeLists.txt
@@ -103,6 +103,9 @@ endif()
 add_subdirectory(JSONPath)
 list (APPEND PRIVATE_LIBS clickhouse_functions_jsonpath)
 
+add_subdirectory(keyvaluepair)
+list (APPEND OBJECT_LIBS $<TARGET_OBJECTS:clickhouse_functions_extractkeyvaluepairs>)
+
 # Signed integer overflow on user-provided data inside boost::geometry - ignore.
 set_source_files_properties("pointInPolygon.cpp" PROPERTIES COMPILE_FLAGS -fno-sanitize=signed-integer-overflow)
 
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index b1d2c1e2ecf..f179d9fbe60 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -53,6 +53,10 @@ struct ToDateImpl
 {
     static constexpr auto name = "toDate";
 
+    static inline UInt16 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
+    {
+        return static_cast<UInt16>(time_zone.toDayNum(t.whole));
+    }
     static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
         return UInt16(time_zone.toDayNum(t));
@@ -69,6 +73,10 @@ struct ToDateImpl
     {
         return d;
     }
+    static inline DecimalUtils::DecimalComponents<DateTime64> executeExtendedResult(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
+    {
+        return {time_zone.toDayNum(t.whole), 0};
+    }
 
     using FactorTransform = ZeroTransform;
 };
diff --git a/src/Functions/DivisionUtils.h b/src/Functions/DivisionUtils.h
index b12ab08bbfd..ff07309e248 100644
--- a/src/Functions/DivisionUtils.h
+++ b/src/Functions/DivisionUtils.h
@@ -17,9 +17,6 @@ namespace ErrorCodes
     extern const int ILLEGAL_DIVISION;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-compare"
-
 template <typename A, typename B>
 inline void throwIfDivisionLeadsToFPE(A a, B b)
 {
@@ -63,8 +60,6 @@ inline auto checkedDivision(A a, B b)
 }
 
 
-#pragma GCC diagnostic pop
-
 template <typename A, typename B>
 struct DivideIntegralImpl
 {
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index b951fe89c5f..ec608883111 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -41,14 +41,12 @@
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
+#include <Common/Arena.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Interpreters/Context.h>
 
 #if USE_EMBEDDED_COMPILER
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wunused-parameter"
 #    include <llvm/IR/IRBuilder.h>
-#    pragma GCC diagnostic pop
 #endif
 
 #include <cassert>
@@ -119,6 +117,12 @@ template <> inline constexpr bool UseLeftDecimal<DataTypeDecimal<Decimal128>, Da
 template <> inline constexpr bool UseLeftDecimal<DataTypeDecimal<Decimal128>, DataTypeDecimal<Decimal64>> = true;
 template <> inline constexpr bool UseLeftDecimal<DataTypeDecimal<Decimal64>, DataTypeDecimal<Decimal32>> = true;
 
+template <typename DataType> constexpr bool IsFixedString = false;
+template <> inline constexpr bool IsFixedString<DataTypeFixedString> = true;
+
+template <typename DataType> constexpr bool IsString = false;
+template <> inline constexpr bool IsString<DataTypeString> = true;
+
 template <template <typename, typename> class Operation, typename LeftDataType, typename RightDataType>
 struct BinaryOperationTraits
 {
@@ -147,6 +151,8 @@ public:
         Case<IsOperation<Operation>::allow_decimal && IsDataTypeDecimal<RightDataType> && IsFloatingPoint<LeftDataType>, DataTypeFloat64>,
 
         Case<IsOperation<Operation>::bit_hamming_distance && IsIntegral<LeftDataType> && IsIntegral<RightDataType>, DataTypeUInt8>,
+        Case<IsOperation<Operation>::bit_hamming_distance && IsFixedString<LeftDataType> && IsFixedString<RightDataType>, DataTypeUInt16>,
+        Case<IsOperation<Operation>::bit_hamming_distance && IsString<LeftDataType> && IsString<RightDataType>, DataTypeUInt64>,
 
         /// Decimal <op> Real is not supported (traditional DBs convert Decimal <op> Real to Real)
         Case<IsDataTypeDecimal<LeftDataType> && !IsIntegralOrExtendedOrDecimal<RightDataType>, InvalidType>,
@@ -249,9 +255,6 @@ private:
 template <typename B, typename Op>
 struct StringIntegerOperationImpl
 {
-    static const constexpr bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = true;
-
     template <OpCase op_case>
     static void NO_INLINE processFixedString(const UInt8 * __restrict in_vec, const UInt64 n, const B * __restrict b, ColumnFixedString::Chars & out_vec, size_t size)
     {
@@ -384,6 +387,105 @@ private:
     }
 };
 
+template <typename Op>
+struct FixedStringReduceOperationImpl
+{
+    template <OpCase op_case>
+    static void inline process(const UInt8 * __restrict a, const UInt8 * __restrict b, UInt16 * __restrict result, size_t size, size_t N)
+    {
+        if constexpr (op_case == OpCase::Vector)
+            vectorVector(a, b, result, size, N);
+        else if constexpr (op_case == OpCase::LeftConstant)
+            vectorConstant(b, a, result, size, N);
+        else
+            vectorConstant(a, b, result, size, N);
+    }
+
+private:
+    static void vectorVector(const UInt8 * __restrict a, const UInt8 * __restrict b, UInt16 * __restrict result, size_t size, size_t N)
+    {
+        for (size_t i = 0; i < size; ++i)
+        {
+            size_t offset = i * N;
+            for (size_t j = 0; j < N; ++j)
+            {
+                result[i] += Op::template apply<UInt8>(a[offset + j], b[offset + j]);
+            }
+        }
+    }
+
+    static void vectorConstant(const UInt8 * __restrict a, const UInt8 * __restrict b, UInt16 * __restrict result, size_t size, size_t N)
+    {
+        for (size_t i = 0; i < size; ++i)
+        {
+            size_t offset = i * N;
+            for (size_t j = 0; j < N; ++j)
+            {
+                result[i] += Op::template apply<UInt8>(a[offset + j], b[j]);
+            }
+        }
+    }
+};
+
+template <typename Op>
+struct StringReduceOperationImpl
+{
+    static void vectorVector(
+        const ColumnString::Chars & a,
+        const ColumnString::Offsets & offsets_a,
+        const ColumnString::Chars & b,
+        const ColumnString::Offsets & offsets_b,
+        PaddedPODArray<UInt64> & res)
+    {
+        size_t size = res.size();
+        for (size_t i = 0; i < size; ++i)
+        {
+            res[i] = process(
+                a.data() + offsets_a[i - 1],
+                a.data() + offsets_a[i] - 1,
+                b.data() + offsets_b[i - 1],
+                b.data() + offsets_b[i] - 1);
+        }
+    }
+
+    static void
+    vectorConstant(const ColumnString::Chars & a, const ColumnString::Offsets & offsets_a, std::string_view b, PaddedPODArray<UInt64> & res)
+    {
+        size_t size = res.size();
+        for (size_t i = 0; i < size; ++i)
+        {
+            res[i] = process(
+                a.data() + offsets_a[i - 1],
+                a.data() + offsets_a[i] - 1,
+                reinterpret_cast<const UInt8 *>(b.data()),
+                reinterpret_cast<const UInt8 *>(b.data()) + b.size());
+        }
+    }
+
+    static inline UInt64 constConst(std::string_view a, std::string_view b)
+    {
+        return process(
+            reinterpret_cast<const UInt8 *>(a.data()),
+            reinterpret_cast<const UInt8 *>(a.data()) + a.size(),
+            reinterpret_cast<const UInt8 *>(b.data()),
+            reinterpret_cast<const UInt8 *>(b.data()) + b.size());
+    }
+
+private:
+    static UInt64 process(const UInt8 * __restrict start_a, const UInt8 * __restrict end_a, const UInt8 * start_b, const UInt8 * end_b)
+    {
+        UInt64 res = 0;
+        while (start_a < end_a && start_b < end_b)
+            res += Op::template apply<UInt8>(*start_a++, *start_b++);
+
+        while (start_a < end_a)
+            res += Op::template apply<UInt8>(*start_a++, 0);
+        while (start_b < end_b)
+            res += Op::template apply<UInt8>(0, *start_b++);
+        return res;
+    }
+};
+
 template <typename A, typename B, typename Op, typename ResultType = typename Op::ResultType>
 struct BinaryOperationImpl : BinaryOperation<A, B, Op, ResultType> { };
 
@@ -635,10 +737,11 @@ using namespace impl_;
 template <template <typename, typename> class Op, typename Name, bool valid_on_default_arguments = true, bool valid_on_float_arguments = true, bool division_by_nullable = false>
 class FunctionBinaryArithmetic : public IFunction
 {
-    static constexpr const bool is_plus = IsOperation<Op>::plus;
-    static constexpr const bool is_minus = IsOperation<Op>::minus;
-    static constexpr const bool is_multiply = IsOperation<Op>::multiply;
-    static constexpr const bool is_division = IsOperation<Op>::division;
+    static constexpr bool is_plus = IsOperation<Op>::plus;
+    static constexpr bool is_minus = IsOperation<Op>::minus;
+    static constexpr bool is_multiply = IsOperation<Op>::multiply;
+    static constexpr bool is_division = IsOperation<Op>::division;
+    static constexpr bool is_bit_hamming_distance = IsOperation<Op>::bit_hamming_distance;
 
     ContextPtr context;
     bool check_decimal_overflow = true;
@@ -783,8 +886,8 @@ class FunctionBinaryArithmetic : public IFunction
 
         if (tuple_data_type_0)
         {
-            auto & tuple_types = tuple_data_type_0->getElements();
-            for (auto & type : tuple_types)
+            const auto & tuple_types = tuple_data_type_0->getElements();
+            for (const auto & type : tuple_types)
                 if (!isInterval(type))
                     return {};
         }
@@ -1017,11 +1120,9 @@ class FunctionBinaryArithmetic : public IFunction
     ColumnPtr executeIntervalTupleOfIntervalsPlusMinus(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
                                                size_t input_rows_count, const FunctionOverloadResolverPtr & function_builder) const
     {
-        ColumnsWithTypeAndName new_arguments = arguments;
+        auto function = function_builder->build(arguments);
 
-        auto function = function_builder->build(new_arguments);
-
-        return function->execute(new_arguments, result_type, input_rows_count);
+        return function->execute(arguments, result_type, input_rows_count);
     }
 
     ColumnPtr executeTupleNumberOperator(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
@@ -1319,13 +1420,20 @@ public:
                     {
                         if (left.getN() == right.getN())
                         {
-                            type_res = std::make_shared<LeftDataType>(left.getN());
+                            if constexpr (is_bit_hamming_distance)
+                                type_res = std::make_shared<DataTypeUInt16>();
+                            else
+                                type_res = std::make_shared<LeftDataType>(left.getN());
                             return true;
                         }
                     }
                 }
 
-                if constexpr (!Op<LeftDataType, RightDataType>::allow_string_integer)
+                if constexpr (
+                    is_bit_hamming_distance
+                    && std::is_same_v<DataTypeString, LeftDataType> && std::is_same_v<DataTypeString, RightDataType>)
+                    type_res = std::make_shared<DataTypeUInt64>();
+                else if constexpr (!Op<LeftDataType, RightDataType>::allow_string_integer)
                     return false;
                 else if constexpr (!IsIntegral<RightDataType>)
                     return false;
@@ -1414,6 +1522,7 @@ public:
     ColumnPtr executeFixedString(const ColumnsWithTypeAndName & arguments) const
     {
         using OpImpl = FixedStringOperationImpl<Op<UInt8, UInt8>>;
+        using OpReduceImpl = FixedStringReduceOperationImpl<Op<UInt8, UInt8>>;
 
         const auto * const col_left_raw = arguments[0].column.get();
         const auto * const col_right_raw = arguments[1].column.get();
@@ -1428,18 +1537,30 @@ public:
                 if (col_left->getN() != col_right->getN())
                     return nullptr;
 
-                auto col_res = ColumnFixedString::create(col_left->getN());
-                auto & out_chars = col_res->getChars();
+                if constexpr (is_bit_hamming_distance)
+                {
+                    auto col_res = ColumnUInt16::create();
+                    auto & data = col_res->getData();
+                    data.resize_fill(col_left->size());
 
-                out_chars.resize(col_left->getN());
+                    OpReduceImpl::template process<OpCase::Vector>(
+                        col_left->getChars().data(), col_right->getChars().data(), data.data(), data.size(), col_left->getN());
 
-                OpImpl::template process<OpCase::Vector>(
-                    col_left->getChars().data(),
-                    col_right->getChars().data(),
-                    out_chars.data(),
-                    out_chars.size(), {});
+                    return ColumnConst::create(std::move(col_res), col_left_raw->size());
+                }
+                else
+                {
+                    auto col_res = ColumnFixedString::create(col_left->getN());
+                    auto & out_chars = col_res->getChars();
+
+                    out_chars.resize(col_left->getN());
+
+                    OpImpl::template process<OpCase::Vector>(
+                        col_left->getChars().data(), col_right->getChars().data(), out_chars.data(), out_chars.size(), {});
+
+                    return ColumnConst::create(std::move(col_res), col_left_raw->size());
+                }
 
-                return ColumnConst::create(std::move(col_res), col_left_raw->size());
             }
         }
 
@@ -1460,35 +1581,112 @@ public:
             if (col_left->getN() != col_right->getN())
                 return nullptr;
 
-            auto col_res = ColumnFixedString::create(col_left->getN());
-            auto & out_chars = col_res->getChars();
-            out_chars.resize((is_right_column_const ? col_left->size() : col_right->size()) * col_left->getN());
+            if constexpr (is_bit_hamming_distance)
+            {
+                auto col_res = ColumnUInt16::create();
+                auto & data = col_res->getData();
+                data.resize_fill(is_right_column_const ? col_left->size() : col_right->size());
 
-            if (!is_left_column_const && !is_right_column_const)
-            {
-                OpImpl::template process<OpCase::Vector>(
-                    col_left->getChars().data(),
-                    col_right->getChars().data(),
-                    out_chars.data(),
-                    out_chars.size(), {});
-            }
-            else if (is_left_column_const)
-            {
-                OpImpl::template process<OpCase::LeftConstant>(
-                    col_left->getChars().data(),
-                    col_right->getChars().data(),
-                    out_chars.data(),
-                    out_chars.size(),
-                    col_left->getN());
+                if (!is_left_column_const && !is_right_column_const)
+                {
+                    OpReduceImpl::template process<OpCase::Vector>(
+                        col_left->getChars().data(), col_right->getChars().data(), data.data(), data.size(), col_left->getN());
+                }
+                else if (is_left_column_const)
+                {
+                    OpReduceImpl::template process<OpCase::LeftConstant>(
+                        col_left->getChars().data(), col_right->getChars().data(), data.data(), data.size(), col_left->getN());
+                }
+                else
+                {
+                    OpReduceImpl::template process<OpCase::RightConstant>(
+                        col_left->getChars().data(), col_right->getChars().data(), data.data(), data.size(), col_left->getN());
+                }
+
+                return col_res;
             }
             else
             {
-                OpImpl::template process<OpCase::RightConstant>(
-                    col_left->getChars().data(),
-                    col_right->getChars().data(),
-                    out_chars.data(),
-                    out_chars.size(),
-                    col_left->getN());
+                auto col_res = ColumnFixedString::create(col_left->getN());
+                auto & out_chars = col_res->getChars();
+                out_chars.resize((is_right_column_const ? col_left->size() : col_right->size()) * col_left->getN());
+
+                if (!is_left_column_const && !is_right_column_const)
+                {
+                    OpImpl::template process<OpCase::Vector>(
+                        col_left->getChars().data(), col_right->getChars().data(), out_chars.data(), out_chars.size(), {});
+                }
+                else if (is_left_column_const)
+                {
+                    OpImpl::template process<OpCase::LeftConstant>(
+                        col_left->getChars().data(), col_right->getChars().data(), out_chars.data(), out_chars.size(), col_left->getN());
+                }
+                else
+                {
+                    OpImpl::template process<OpCase::RightConstant>(
+                        col_left->getChars().data(), col_right->getChars().data(), out_chars.data(), out_chars.size(), col_left->getN());
+                }
+
+                return col_res;
+            }
+        }
+        return nullptr;
+    }
+
+    /// Only used for bitHammingDistance
+    ColumnPtr executeString(const ColumnsWithTypeAndName & arguments) const
+    {
+        using OpImpl = StringReduceOperationImpl<Op<UInt8, UInt8>>;
+
+        const auto * const col_left_raw = arguments[0].column.get();
+        const auto * const col_right_raw = arguments[1].column.get();
+
+        if (const auto * col_left_const = checkAndGetColumnConst<ColumnString>(col_left_raw))
+        {
+            if (const auto * col_right_const = checkAndGetColumnConst<ColumnString>(col_right_raw))
+            {
+                const auto * col_left = checkAndGetColumn<ColumnString>(col_left_const->getDataColumn());
+                const auto * col_right = checkAndGetColumn<ColumnString>(col_right_const->getDataColumn());
+
+                std::string_view a = col_left->getDataAt(0).toView();
+                std::string_view b = col_right->getDataAt(0).toView();
+
+                auto res = OpImpl::constConst(a, b);
+
+                return DataTypeUInt64{}.createColumnConst(1, res);
+            }
+        }
+
+        const bool is_left_column_const = checkAndGetColumnConst<ColumnString>(col_left_raw) != nullptr;
+        const bool is_right_column_const = checkAndGetColumnConst<ColumnString>(col_right_raw) != nullptr;
+
+        const auto * col_left = is_left_column_const
+            ? checkAndGetColumn<ColumnString>(checkAndGetColumnConst<ColumnString>(col_left_raw)->getDataColumn())
+            : checkAndGetColumn<ColumnString>(col_left_raw);
+        const auto * col_right = is_right_column_const
+            ? checkAndGetColumn<ColumnString>(checkAndGetColumnConst<ColumnString>(col_right_raw)->getDataColumn())
+            : checkAndGetColumn<ColumnString>(col_right_raw);
+
+        if (col_left && col_right)
+        {
+            auto col_res = ColumnUInt64::create();
+            auto & data = col_res->getData();
+            data.resize(is_right_column_const ? col_left->size() : col_right->size());
+
+            if (!is_left_column_const && !is_right_column_const)
+            {
+                OpImpl::vectorVector(
+                    col_left->getChars(), col_left->getOffsets(), col_right->getChars(), col_right->getOffsets(), data);
+            }
+            else if (is_left_column_const)
+            {
+                std::string_view str_view = col_left->getDataAt(0).toView();
+                OpImpl::vectorConstant(col_right->getChars(), col_right->getOffsets(), str_view, data);
+            }
+            else
+            {
+                std::string_view str_view = col_right->getDataAt(0).toView();
+                OpImpl::vectorConstant(col_left->getChars(), col_left->getOffsets(), str_view, data);
             }
 
             return col_res;
@@ -1496,9 +1694,8 @@ public:
         return nullptr;
     }
 
-
-    template <typename LeftColumnType, typename A, typename B>
-    ColumnPtr executeStringInteger(const ColumnsWithTypeAndName & arguments, const A & left, const B & right) const
+template <typename LeftColumnType, typename A, typename B>
+ColumnPtr executeStringInteger(const ColumnsWithTypeAndName & arguments, const A & left, const B & right) const
     {
         using LeftDataType = std::decay_t<decltype(left)>;
         using RightDataType = std::decay_t<decltype(right)>;
@@ -1815,7 +2012,11 @@ public:
                         return (res = executeFixedString(arguments)) != nullptr;
                 }
 
-                if constexpr (!Op<LeftDataType, RightDataType>::allow_string_integer)
+                if constexpr (
+                    is_bit_hamming_distance
+                    && std::is_same_v<DataTypeString, LeftDataType> && std::is_same_v<DataTypeString, RightDataType>)
+                    return (res = executeString(arguments)) != nullptr;
+                else if constexpr (!Op<LeftDataType, RightDataType>::allow_string_integer)
                     return false;
                 else if constexpr (!IsIntegral<RightDataType>)
                     return false;
diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index 361ac6be496..6a7274376b9 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -29,7 +29,7 @@ const String & getFunctionCanonicalNameIfAny(const String & name)
 void FunctionFactory::registerFunction(
     const std::string & name,
     FunctionCreator creator,
-    Documentation doc,
+    FunctionDocumentation doc,
     CaseSensitiveness case_sensitiveness)
 {
     if (!functions.emplace(name, FunctionFactoryData{creator, doc}).second)
@@ -141,7 +141,7 @@ FunctionFactory & FunctionFactory::instance()
     return ret;
 }
 
-Documentation FunctionFactory::getDocumentation(const std::string & name) const
+FunctionDocumentation FunctionFactory::getDocumentation(const std::string & name) const
 {
     auto it = functions.find(name);
     if (it == functions.end())
diff --git a/src/Functions/FunctionFactory.h b/src/Functions/FunctionFactory.h
index 1a909ea0598..deea41e6677 100644
--- a/src/Functions/FunctionFactory.h
+++ b/src/Functions/FunctionFactory.h
@@ -3,7 +3,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <Common/register_objects.h>
 #include <Common/IFactoryWithAliases.h>
-#include <Common/Documentation.h>
+#include <Common/FunctionDocumentation.h>
 #include <Functions/IFunction.h>
 #include <Functions/IFunctionAdaptors.h>
 
@@ -17,7 +17,7 @@ namespace DB
 {
 
 using FunctionCreator = std::function<FunctionOverloadResolverPtr(ContextPtr)>;
-using FunctionFactoryData = std::pair<FunctionCreator, Documentation>;
+using FunctionFactoryData = std::pair<FunctionCreator, FunctionDocumentation>;
 
 /** Creates function by name.
   * Function could use for initialization (take ownership of shared_ptr, for example)
@@ -29,15 +29,14 @@ public:
     static FunctionFactory & instance();
 
     template <typename Function>
-    void registerFunction(Documentation doc = {}, CaseSensitiveness case_sensitiveness = CaseSensitive)
+    void registerFunction(FunctionDocumentation doc = {}, CaseSensitiveness case_sensitiveness = CaseSensitive)
     {
         registerFunction<Function>(Function::name, std::move(doc), case_sensitiveness);
     }
 
     template <typename Function>
-    void registerFunction(const std::string & name, Documentation doc = {}, CaseSensitiveness case_sensitiveness = CaseSensitive)
+    void registerFunction(const std::string & name, FunctionDocumentation doc = {}, CaseSensitiveness case_sensitiveness = CaseSensitive)
     {
-
         if constexpr (std::is_base_of_v<IFunction, Function>)
             registerFunction(name, &adaptFunctionToOverloadResolver<Function>, std::move(doc), case_sensitiveness);
         else
@@ -64,10 +63,10 @@ public:
     void registerFunction(
         const std::string & name,
         FunctionCreator creator,
-        Documentation doc = {},
+        FunctionDocumentation doc = {},
         CaseSensitiveness case_sensitiveness = CaseSensitive);
 
-    Documentation getDocumentation(const std::string & name) const;
+    FunctionDocumentation getDocumentation(const std::string & name) const;
 
 private:
     using Functions = std::unordered_map<std::string, Value>;
diff --git a/src/Functions/FunctionFile.cpp b/src/Functions/FunctionFile.cpp
index 240732965f4..fa7dda82e1c 100644
--- a/src/Functions/FunctionFile.cpp
+++ b/src/Functions/FunctionFile.cpp
@@ -38,6 +38,8 @@ public:
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 0; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+    bool isDeterministic() const override { return false; }
+    bool isDeterministicInScopeOfQuery() const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/FunctionHelpers.h b/src/Functions/FunctionHelpers.h
index 18a4e584080..77affe8488d 100644
--- a/src/Functions/FunctionHelpers.h
+++ b/src/Functions/FunctionHelpers.h
@@ -7,8 +7,8 @@
 #include <Columns/IColumn.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
-#include <Core/Block.h>
 #include <Core/ColumnNumbers.h>
+#include <Core/ColumnsWithTypeAndName.h>
 #include <Core/callOnTypeIndex.h>
 
 
diff --git a/src/Functions/FunctionJoinGet.h b/src/Functions/FunctionJoinGet.h
index 2dd0cb9fdea..998a892f3df 100644
--- a/src/Functions/FunctionJoinGet.h
+++ b/src/Functions/FunctionJoinGet.h
@@ -88,6 +88,7 @@ public:
 
     explicit JoinGetOverloadResolver(ContextPtr context_) : WithContext(context_) {}
 
+    bool isDeterministic() const override { return false; }
     String getName() const override { return name; }
 
     FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const override;
diff --git a/src/Functions/FunctionSQLJSON.h b/src/Functions/FunctionSQLJSON.h
index d649752768c..9565ca5b242 100644
--- a/src/Functions/FunctionSQLJSON.h
+++ b/src/Functions/FunctionSQLJSON.h
@@ -3,9 +3,11 @@
 #include <sstream>
 #include <type_traits>
 #include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <Core/Settings.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Common/JSONParsers/DummyJSONParser.h>
@@ -40,7 +42,7 @@ public:
     class Executor
     {
     public:
-        static ColumnPtr run(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, uint32_t parse_depth)
+        static ColumnPtr run(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, uint32_t parse_depth, const ContextPtr & context)
         {
             MutableColumnPtr to{result_type->createColumn()};
             to->reserve(input_rows_count);
@@ -115,7 +117,6 @@ public:
 
             /// Parse JSON for every row
             Impl<JSONParser> impl;
-
             for (const auto i : collections::range(0, input_rows_count))
             {
                 std::string_view json{
@@ -125,7 +126,7 @@ public:
                 bool added_to_column = false;
                 if (document_ok)
                 {
-                    added_to_column = impl.insertResultToColumn(*to, document, res);
+                    added_to_column = impl.insertResultToColumn(*to, document, res, context);
                 }
                 if (!added_to_column)
                 {
@@ -154,7 +155,7 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        return Impl<DummyJSONParser>::getReturnType(Name::name, arguments);
+        return Impl<DummyJSONParser>::getReturnType(Name::name, arguments, getContext());
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
@@ -167,9 +168,9 @@ public:
         unsigned parse_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
 #if USE_SIMDJSON
         if (getContext()->getSettingsRef().allow_simdjson)
-            return FunctionSQLJSONHelpers::Executor<Name, Impl, SimdJSONParser>::run(arguments, result_type, input_rows_count, parse_depth);
+            return FunctionSQLJSONHelpers::Executor<Name, Impl, SimdJSONParser>::run(arguments, result_type, input_rows_count, parse_depth, getContext());
 #endif
-        return FunctionSQLJSONHelpers::Executor<Name, Impl, DummyJSONParser>::run(arguments, result_type, input_rows_count, parse_depth);
+        return FunctionSQLJSONHelpers::Executor<Name, Impl, DummyJSONParser>::run(arguments, result_type, input_rows_count, parse_depth, getContext());
     }
 };
 
@@ -194,11 +195,11 @@ class JSONExistsImpl
 public:
     using Element = typename JSONParser::Element;
 
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &) { return std::make_shared<DataTypeUInt8>(); }
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &, const ContextPtr &) { return std::make_shared<DataTypeUInt8>(); }
 
     static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
 
-    static bool insertResultToColumn(IColumn & dest, const Element & root, ASTPtr & query_ptr)
+    static bool insertResultToColumn(IColumn & dest, const Element & root, ASTPtr & query_ptr, const ContextPtr &)
     {
         GeneratorJSONPath<JSONParser> generator_json_path(query_ptr);
         Element current_element = root;
@@ -233,11 +234,22 @@ class JSONValueImpl
 public:
     using Element = typename JSONParser::Element;
 
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &) { return std::make_shared<DataTypeString>(); }
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &, const ContextPtr & context)
+    {
+        if (context->getSettingsRef().function_json_value_return_type_allow_nullable)
+        {
+            DataTypePtr string_type = std::make_shared<DataTypeString>();
+            return std::make_shared<DataTypeNullable>(string_type);
+        }
+        else
+        {
+            return std::make_shared<DataTypeString>();
+        }
+    }
 
     static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
 
-    static bool insertResultToColumn(IColumn & dest, const Element & root, ASTPtr & query_ptr)
+    static bool insertResultToColumn(IColumn & dest, const Element & root, ASTPtr & query_ptr, const ContextPtr & context)
     {
         GeneratorJSONPath<JSONParser> generator_json_path(query_ptr);
         Element current_element = root;
@@ -247,7 +259,11 @@ public:
         {
             if (status == VisitorStatus::Ok)
             {
-                if (!(current_element.isArray() || current_element.isObject()))
+                if (context->getSettingsRef().function_json_value_return_type_allow_complex)
+                {
+                    break;
+                }
+                else if (!(current_element.isArray() || current_element.isObject()))
                 {
                     break;
                 }
@@ -267,9 +283,19 @@ public:
         std::stringstream out; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
         out << current_element.getElement();
         auto output_str = out.str();
-        ColumnString & col_str = assert_cast<ColumnString &>(dest);
-        ColumnString::Chars & data = col_str.getChars();
-        ColumnString::Offsets & offsets = col_str.getOffsets();
+        ColumnString * col_str;
+        if (isColumnNullable(dest))
+        {
+            ColumnNullable & col_null = assert_cast<ColumnNullable &>(dest);
+            col_null.getNullMapData().push_back(0);
+            col_str = assert_cast<ColumnString *>(&col_null.getNestedColumn());
+        }
+        else
+        {
+            col_str = assert_cast<ColumnString *>(&dest);
+        }
+        ColumnString::Chars & data = col_str->getChars();
+        ColumnString::Offsets & offsets = col_str->getOffsets();
 
         if (current_element.isString())
         {
@@ -280,7 +306,7 @@ public:
         }
         else
         {
-            col_str.insertData(output_str.data(), output_str.size());
+            col_str->insertData(output_str.data(), output_str.size());
         }
         return true;
     }
@@ -296,11 +322,11 @@ class JSONQueryImpl
 public:
     using Element = typename JSONParser::Element;
 
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &) { return std::make_shared<DataTypeString>(); }
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &, const ContextPtr &) { return std::make_shared<DataTypeString>(); }
 
     static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
 
-    static bool insertResultToColumn(IColumn & dest, const Element & root, ASTPtr & query_ptr)
+    static bool insertResultToColumn(IColumn & dest, const Element & root, ASTPtr & query_ptr, const ContextPtr &)
     {
         GeneratorJSONPath<JSONParser> generator_json_path(query_ptr);
         Element current_element = root;
diff --git a/src/Functions/FunctionShowCertificate.h b/src/Functions/FunctionShowCertificate.h
index 3c30d8138e5..5061a198614 100644
--- a/src/Functions/FunctionShowCertificate.h
+++ b/src/Functions/FunctionShowCertificate.h
@@ -15,6 +15,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/Context.h>
+#include <base/scope_guard.h>
 
 #if USE_SSL
     #include <openssl/x509v3.h>
diff --git a/src/Functions/FunctionStringReplace.h b/src/Functions/FunctionStringReplace.h
index f90eac2e7f3..4d723a5632c 100644
--- a/src/Functions/FunctionStringReplace.h
+++ b/src/Functions/FunctionStringReplace.h
@@ -5,6 +5,7 @@
 #include <Columns/ColumnConst.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
 
 
 namespace DB
@@ -13,16 +14,14 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
-    extern const int ARGUMENT_OUT_OF_BOUND;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
-
 template <typename Impl, typename Name>
 class FunctionStringReplace : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
+
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionStringReplace>(); }
 
     String getName() const override { return name; }
@@ -32,65 +31,82 @@ public:
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        if (!isStringOrFixedString(arguments[0]))
-            throw Exception(
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type {} of first argument of function {}",
-                arguments[0]->getName(), getName());
+        FunctionArgumentDescriptors args{
+            {"haystack", &isStringOrFixedString<IDataType>, nullptr, "String or FixedString"},
+            {"pattern", &isString<IDataType>, nullptr, "String"},
+            {"replacement", &isString<IDataType>, nullptr, "String"}
+        };
 
-        if (!isStringOrFixedString(arguments[1]))
-            throw Exception(
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type {} of second argument of function {}",
-                arguments[1]->getName(), getName());
-
-        if (!isStringOrFixedString(arguments[2]))
-            throw Exception(
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type {} of third argument of function {}",
-                arguments[2]->getName(), getName());
+        validateFunctionArgumentTypes(*this, arguments, args);
 
         return std::make_shared<DataTypeString>();
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
-        const ColumnPtr column_src = arguments[0].column;
+        ColumnPtr column_haystack = arguments[0].column;
+        column_haystack = column_haystack->convertToFullColumnIfConst();
+
         const ColumnPtr column_needle = arguments[1].column;
         const ColumnPtr column_replacement = arguments[2].column;
 
-        if (!isColumnConst(*column_needle) || !isColumnConst(*column_replacement))
-            throw Exception(
-                ErrorCodes::ILLEGAL_COLUMN,
-                "2nd and 3rd arguments of function {} must be constants.",
-                getName());
+        const ColumnString * col_haystack = checkAndGetColumn<ColumnString>(column_haystack.get());
+        const ColumnFixedString * col_haystack_fixed = checkAndGetColumn<ColumnFixedString>(column_haystack.get());
 
-        const IColumn * c1 = arguments[1].column.get();
-        const IColumn * c2 = arguments[2].column.get();
-        const ColumnConst * c1_const = typeid_cast<const ColumnConst *>(c1);
-        const ColumnConst * c2_const = typeid_cast<const ColumnConst *>(c2);
-        String needle = c1_const->getValue<String>();
-        String replacement = c2_const->getValue<String>();
+        const ColumnString * col_needle_vector = checkAndGetColumn<ColumnString>(column_needle.get());
+        const ColumnConst * col_needle_const = checkAndGetColumn<ColumnConst>(column_needle.get());
 
-        if (needle.empty())
-            throw Exception(
-                ErrorCodes::ARGUMENT_OUT_OF_BOUND,
-                "Length of the second argument of function replace must be greater than 0.");
+        const ColumnString * col_replacement_vector = checkAndGetColumn<ColumnString>(column_replacement.get());
+        const ColumnConst * col_replacement_const = checkAndGetColumn<ColumnConst>(column_replacement.get());
 
-        if (const ColumnString * col = checkAndGetColumn<ColumnString>(column_src.get()))
+        auto col_res = ColumnString::create();
+
+        if (col_haystack && col_needle_const && col_replacement_const)
         {
-            auto col_res = ColumnString::create();
-            Impl::vector(col->getChars(), col->getOffsets(), needle, replacement, col_res->getChars(), col_res->getOffsets());
+            Impl::vectorConstantConstant(
+                col_haystack->getChars(), col_haystack->getOffsets(),
+                col_needle_const->getValue<String>(),
+                col_replacement_const->getValue<String>(),
+                col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
-        else if (const ColumnFixedString * col_fixed = checkAndGetColumn<ColumnFixedString>(column_src.get()))
+        else if (col_haystack && col_needle_vector && col_replacement_const)
         {
-            auto col_res = ColumnString::create();
-            Impl::vectorFixed(col_fixed->getChars(), col_fixed->getN(), needle, replacement, col_res->getChars(), col_res->getOffsets());
+            Impl::vectorVectorConstant(
+                col_haystack->getChars(), col_haystack->getOffsets(),
+                col_needle_vector->getChars(), col_needle_vector->getOffsets(),
+                col_replacement_const->getValue<String>(),
+                col_res->getChars(), col_res->getOffsets());
+            return col_res;
+        }
+        else if (col_haystack && col_needle_const && col_replacement_vector)
+        {
+            Impl::vectorConstantVector(
+                col_haystack->getChars(), col_haystack->getOffsets(),
+                col_needle_const->getValue<String>(),
+                col_replacement_vector->getChars(), col_replacement_vector->getOffsets(),
+                col_res->getChars(), col_res->getOffsets());
+            return col_res;
+        }
+        else if (col_haystack && col_needle_vector && col_replacement_vector)
+        {
+            Impl::vectorVectorVector(
+                col_haystack->getChars(), col_haystack->getOffsets(),
+                col_needle_vector->getChars(), col_needle_vector->getOffsets(),
+                col_replacement_vector->getChars(), col_replacement_vector->getOffsets(),
+                col_res->getChars(), col_res->getOffsets());
+            return col_res;
+        }
+        else if (col_haystack_fixed && col_needle_const && col_replacement_const)
+        {
+            Impl::vectorFixedConstantConstant(
+                col_haystack_fixed->getChars(), col_haystack_fixed->getN(),
+                col_needle_const->getValue<String>(),
+                col_replacement_const->getValue<String>(),
+                col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
         else
diff --git a/src/Functions/FunctionToDecimalString.cpp b/src/Functions/FunctionToDecimalString.cpp
new file mode 100644
index 00000000000..fe417b19137
--- /dev/null
+++ b/src/Functions/FunctionToDecimalString.cpp
@@ -0,0 +1,22 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionToDecimalString.h>
+#include <Functions/IFunction.h>
+
+namespace DB
+{
+
+REGISTER_FUNCTION(ToDecimalString)
+{
+    factory.registerFunction<FunctionToDecimalString>(
+        FunctionDocumentation{
+            .description=R"(
+Returns string representation of a number. First argument is the number of any numeric type,
+second argument is the desired number of digits in fractional part. Returns String.
+
+        )",
+            .examples{{"toDecimalString", "SELECT toDecimalString(2.1456,2)", ""}},
+            .categories{"String"}
+        }, FunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/Functions/FunctionToDecimalString.h b/src/Functions/FunctionToDecimalString.h
new file mode 100644
index 00000000000..6ae007e6b66
--- /dev/null
+++ b/src/Functions/FunctionToDecimalString.h
@@ -0,0 +1,312 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <Core/DecimalFunctions.h>
+#include <Functions/IFunction.h>
+#include <Functions/FunctionHelpers.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnDecimal.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <IO/WriteBufferFromVector.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/Context_fwd.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+    extern const int CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER;
+}
+
+class FunctionToDecimalString : public IFunction
+{
+public:
+    static constexpr auto name = "toDecimalString";
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionToDecimalString>(); }
+
+    String getName() const override { return name; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    size_t getNumberOfArguments() const override { return 2; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        if (!isNumber(*arguments[0]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Illegal first argument for formatDecimal function: got {}, expected numeric type",
+                            arguments[0]->getName());
+
+        if (!isUInt8(*arguments[1]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Illegal second argument for formatDecimal function: got {}, expected UInt8",
+                            arguments[1]->getName());
+
+        return std::make_shared<DataTypeString>();
+    }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+private:
+    /// For operations with Integer/Float
+    template <typename FromVectorType>
+    void vectorConstant(const FromVectorType & vec_from, UInt8 precision,
+                        ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets) const
+    {
+        size_t input_rows_count = vec_from.size();
+        result_offsets.resize(input_rows_count);
+
+        /// Buffer is used here and in functions below because resulting size cannot be precisely anticipated,
+        /// and buffer resizes on-the-go. Also, .count() provided by buffer is convenient in this case.
+        WriteBufferFromVector<ColumnString::Chars> buf_to(vec_to);
+
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            format(vec_from[i], buf_to, precision);
+            result_offsets[i] = buf_to.count();
+        }
+
+        buf_to.finalize();
+    }
+
+    template <typename FirstArgVectorType>
+    void vectorVector(const FirstArgVectorType & vec_from, const ColumnVector<UInt8>::Container & vec_precision,
+                      ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets) const
+    {
+        size_t input_rows_count = vec_from.size();
+        result_offsets.resize(input_rows_count);
+
+        WriteBufferFromVector<ColumnString::Chars> buf_to(vec_to);
+
+        constexpr size_t max_digits = std::numeric_limits<UInt256>::digits10;
+
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            if (vec_precision[i] > max_digits)
+                throw DB::Exception(DB::ErrorCodes::CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER,
+                                    "Too many fractional digits requested, shall not be more than {}", max_digits);
+            format(vec_from[i], buf_to, vec_precision[i]);
+            result_offsets[i] = buf_to.count();
+        }
+
+        buf_to.finalize();
+    }
+
+    template <typename FirstArgType>
+    void constantVector(const FirstArgType & value_from, const ColumnVector<UInt8>::Container & vec_precision,
+                        ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets) const
+    {
+        size_t input_rows_count = vec_precision.size();
+        result_offsets.resize(input_rows_count);
+
+        WriteBufferFromVector<ColumnString::Chars> buf_to(vec_to);
+
+        constexpr size_t max_digits = std::numeric_limits<UInt256>::digits10;
+
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            if (vec_precision[i] > max_digits)
+                throw DB::Exception(DB::ErrorCodes::CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER,
+                                    "Too many fractional digits requested, shall not be more than {}", max_digits);
+            format(value_from, buf_to, vec_precision[i]);
+            result_offsets[i] = buf_to.count();
+        }
+
+        buf_to.finalize();
+    }
+
+    /// For operations with Decimal
+    template <typename FirstArgVectorType>
+    void vectorConstant(const FirstArgVectorType & vec_from, UInt8 precision,
+                        ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets, UInt8 from_scale) const
+    {
+        /// There are no more than 77 meaning digits (as it is the max length of UInt256). So we can limit it with 77.
+        constexpr size_t max_digits = std::numeric_limits<UInt256>::digits10;
+        if (precision > max_digits)
+            throw DB::Exception(DB::ErrorCodes::CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER,
+                                "Too many fractional digits requested for Decimal, must not be more than {}", max_digits);
+
+        WriteBufferFromVector<ColumnString::Chars> buf_to(vec_to);
+        size_t input_rows_count = vec_from.size();
+        result_offsets.resize(input_rows_count);
+
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            writeText(vec_from[i], from_scale, buf_to, true, true, precision);
+            writeChar(0, buf_to);
+            result_offsets[i] = buf_to.count();
+        }
+        buf_to.finalize();
+    }
+
+    template <typename FirstArgVectorType>
+    void vectorVector(const FirstArgVectorType & vec_from, const ColumnVector<UInt8>::Container & vec_precision,
+                      ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets, UInt8 from_scale) const
+    {
+        size_t input_rows_count = vec_from.size();
+        result_offsets.resize(input_rows_count);
+
+        WriteBufferFromVector<ColumnString::Chars> buf_to(vec_to);
+
+        constexpr size_t max_digits = std::numeric_limits<UInt256>::digits10;
+
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            if (vec_precision[i] > max_digits)
+                throw DB::Exception(DB::ErrorCodes::CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER,
+                                    "Too many fractional digits requested for Decimal, must not be more than {}", max_digits);
+            writeText(vec_from[i], from_scale, buf_to, true, true, vec_precision[i]);
+            writeChar(0, buf_to);
+            result_offsets[i] = buf_to.count();
+        }
+        buf_to.finalize();
+    }
+
+    template <typename FirstArgType>
+    void constantVector(const FirstArgType & value_from, const ColumnVector<UInt8>::Container & vec_precision,
+                        ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets, UInt8 from_scale) const
+    {
+        size_t input_rows_count = vec_precision.size();
+        result_offsets.resize(input_rows_count);
+
+        WriteBufferFromVector<ColumnString::Chars> buf_to(vec_to);
+
+        constexpr size_t max_digits = std::numeric_limits<UInt256>::digits10;
+
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            if (vec_precision[i] > max_digits)
+                throw DB::Exception(DB::ErrorCodes::CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER,
+                                    "Too many fractional digits requested for Decimal, must not be more than {}", max_digits);
+            writeText(value_from, from_scale, buf_to, true, true, vec_precision[i]);
+            writeChar(0, buf_to);
+            result_offsets[i] = buf_to.count();
+        }
+        buf_to.finalize();
+    }
+
+    template <is_floating_point T>
+    static void format(T value, DB::WriteBuffer & out, UInt8 precision)
+    {
+        /// Maximum of 60 is hard-coded in 'double-conversion/double-conversion.h' for floating point values,
+        /// Catch this here to give user a more reasonable error.
+        if (precision > 60)
+            throw DB::Exception(DB::ErrorCodes::CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER,
+                                "Too high precision requested for Float, must not be more than 60, got {}", Int8(precision));
+
+        DB::DoubleConverter<false>::BufferType buffer;
+        double_conversion::StringBuilder builder{buffer, sizeof(buffer)};
+
+        const auto result = DB::DoubleConverter<false>::instance().ToFixed(value, precision, &builder);
+
+        if (!result)
+            throw DB::Exception(DB::ErrorCodes::CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER, "Error processing number: {}", value);
+
+        out.write(buffer, builder.position());
+        writeChar(0, out);
+    }
+
+    template <is_integer T>
+    static void format(T value, DB::WriteBuffer & out, UInt8 precision)
+    {
+        /// Fractional part for Integer is just trailing zeros. Let's limit it with 77 (like with Decimals).
+        constexpr size_t max_digits = std::numeric_limits<UInt256>::digits10;
+        if (precision > max_digits)
+            throw DB::Exception(DB::ErrorCodes::CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER,
+                                "Too many fractional digits requested, shall not be more than {}", max_digits);
+        writeText(value, out);
+        if (precision > 0) [[likely]]
+        {
+            writeChar('.', out);
+            for (int i = 0; i < precision; ++i)
+                writeChar('0', out);
+            writeChar(0, out);
+        }
+    }
+
+public:
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    {
+        switch (arguments[0].type->getTypeId())
+        {
+            case TypeIndex::UInt8:      return executeType<UInt8>(arguments);
+            case TypeIndex::UInt16:     return executeType<UInt16>(arguments);
+            case TypeIndex::UInt32:     return executeType<UInt32>(arguments);
+            case TypeIndex::UInt64:     return executeType<UInt64>(arguments);
+            case TypeIndex::UInt128:    return executeType<UInt128>(arguments);
+            case TypeIndex::UInt256:    return executeType<UInt256>(arguments);
+            case TypeIndex::Int8:       return executeType<Int8>(arguments);
+            case TypeIndex::Int16:      return executeType<Int16>(arguments);
+            case TypeIndex::Int32:      return executeType<Int32>(arguments);
+            case TypeIndex::Int64:      return executeType<Int64>(arguments);
+            case TypeIndex::Int128:     return executeType<Int128>(arguments);
+            case TypeIndex::Int256:     return executeType<Int256>(arguments);
+            case TypeIndex::Float32:    return executeType<Float32>(arguments);
+            case TypeIndex::Float64:    return executeType<Float64>(arguments);
+            case TypeIndex::Decimal32:  return executeType<Decimal32>(arguments);
+            case TypeIndex::Decimal64:  return executeType<Decimal64>(arguments);
+            case TypeIndex::Decimal128: return executeType<Decimal128>(arguments);
+            case TypeIndex::Decimal256: return executeType<Decimal256>(arguments);
+            default:
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}",
+                                arguments[0].column->getName(), getName());
+        }
+    }
+
+private:
+    template <typename T>
+    ColumnPtr executeType(const ColumnsWithTypeAndName & arguments) const
+    {
+        const auto * from_col_const = typeid_cast<const ColumnConst *>(arguments[0].column.get());
+        const auto * precision_col = checkAndGetColumn<ColumnVector<UInt8>>(arguments[1].column.get());
+        const auto * precision_col_const = typeid_cast<const ColumnConst *>(arguments[1].column.get());
+
+        auto result_col = ColumnString::create();
+        auto * result_col_string = assert_cast<ColumnString *>(result_col.get());
+        ColumnString::Chars & result_chars = result_col_string->getChars();
+        ColumnString::Offsets & result_offsets = result_col_string->getOffsets();
+
+        if constexpr (is_decimal<T>)
+        {
+            const auto * from_col = checkAndGetColumn<ColumnDecimal<T>>(arguments[0].column.get());
+            UInt8 from_scale = from_col->getScale();
+
+            if (from_col)
+            {
+                if (precision_col_const)
+                    vectorConstant(from_col->getData(), precision_col_const->template getValue<UInt8>(), result_chars, result_offsets, from_scale);
+                else
+                    vectorVector(from_col->getData(), precision_col->getData(), result_chars, result_offsets, from_scale);
+            }
+            else if (from_col_const)
+                constantVector(from_col_const->template getValue<T>(), precision_col->getData(), result_chars, result_offsets, from_scale);
+            else
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function formatDecimal", arguments[0].column->getName());
+        }
+        else
+        {
+            const auto * from_col = checkAndGetColumn<ColumnVector<T>>(arguments[0].column.get());
+            if (from_col)
+            {
+                if (precision_col_const)
+                    vectorConstant(from_col->getData(), precision_col_const->template getValue<UInt8>(), result_chars, result_offsets);
+                else
+                    vectorVector(from_col->getData(), precision_col->getData(), result_chars, result_offsets);
+            }
+            else if (from_col_const)
+                constantVector(from_col_const->template getValue<T>(), precision_col->getData(), result_chars, result_offsets);
+            else
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function formatDecimal", arguments[0].column->getName());
+        }
+
+        return result_col;
+    }
+};
+
+}
diff --git a/src/Functions/FunctionUnaryArithmetic.h b/src/Functions/FunctionUnaryArithmetic.h
index cf2f6efc343..4098d58299c 100644
--- a/src/Functions/FunctionUnaryArithmetic.h
+++ b/src/Functions/FunctionUnaryArithmetic.h
@@ -1,15 +1,18 @@
 #pragma once
 
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypesDecimal.h>
-#include <DataTypes/DataTypeFixedString.h>
-#include <DataTypes/DataTypeInterval.h>
-#include <DataTypes/Native.h>
-#include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnFixedString.h>
-#include <Functions/IFunction.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeInterval.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/Native.h>
 #include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
 #include <Functions/IsOperation.h>
 #include <Functions/castTypeToEither.h>
 
@@ -17,10 +20,7 @@
 #include <Common/TargetSpecific.h>
 
 #if USE_EMBEDDED_COMPILER
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wunused-parameter"
 #    include <llvm/IR/IRBuilder.h>
-#    pragma GCC diagnostic pop
 #endif
 
 
@@ -33,7 +33,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-
 template <typename A, typename Op>
 struct UnaryOperationImpl
 {
@@ -133,6 +132,47 @@ struct FixedStringUnaryOperationImpl
     }
 };
 
+template <typename Op>
+struct StringUnaryOperationReduceImpl
+{
+    MULTITARGET_FUNCTION_AVX512BW_AVX512F_AVX2_SSE42(
+        MULTITARGET_FUNCTION_HEADER(static UInt64 NO_INLINE),
+        vectorImpl,
+        MULTITARGET_FUNCTION_BODY((const UInt8 * start, const UInt8 * end) /// NOLINT
+        {
+            UInt64 res = 0;
+            while (start < end)
+                res += Op::apply(*start++);
+            return res;
+        }))
+
+    static UInt64 NO_INLINE vector(const UInt8 * start, const UInt8 * end)
+    {
+#if USE_MULTITARGET_CODE
+        if (isArchSupported(TargetArch::AVX512BW))
+        {
+            return vectorImplAVX512BW(start, end);
+        }
+
+        if (isArchSupported(TargetArch::AVX512F))
+        {
+            return vectorImplAVX512F(start, end);
+        }
+
+        if (isArchSupported(TargetArch::AVX2))
+        {
+            return vectorImplAVX2(start, end);
+        }
+
+        if (isArchSupported(TargetArch::SSE42))
+        {
+            return vectorImplSSE42(start, end);
+        }
+#endif
+
+        return vectorImpl(start, end);
+    }
+};
 
 template <typename FunctionName>
 struct FunctionUnaryArithmeticMonotonicity;
@@ -145,7 +185,8 @@ template <template <typename> class Op, typename Name, bool is_injective>
 class FunctionUnaryArithmetic : public IFunction
 {
     static constexpr bool allow_decimal = IsUnaryOperation<Op>::negate || IsUnaryOperation<Op>::abs || IsUnaryOperation<Op>::sign;
-    static constexpr bool allow_fixed_string = Op<UInt8>::allow_fixed_string;
+    static constexpr bool allow_string_or_fixed_string = Op<UInt8>::allow_string_or_fixed_string;
+    static constexpr bool is_bit_count = IsUnaryOperation<Op>::bit_count;
     static constexpr bool is_sign_function = IsUnaryOperation<Op>::sign;
 
     ContextPtr context;
@@ -173,8 +214,8 @@ class FunctionUnaryArithmetic : public IFunction
             DataTypeDecimal<Decimal128>,
             DataTypeDecimal<Decimal256>,
             DataTypeFixedString,
-            DataTypeInterval
-        >(type, std::forward<F>(f));
+            DataTypeString,
+            DataTypeInterval>(type, std::forward<F>(f));
     }
 
     static FunctionOverloadResolverPtr
@@ -207,7 +248,10 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return is_injective; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return false;
+    }
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
@@ -235,9 +279,33 @@ public:
             using DataType = std::decay_t<decltype(type)>;
             if constexpr (std::is_same_v<DataTypeFixedString, DataType>)
             {
-                if constexpr (!Op<DataTypeFixedString>::allow_fixed_string)
+                if constexpr (!allow_string_or_fixed_string)
                     return false;
-                result = std::make_shared<DataType>(type.getN());
+                /// For `bitCount`, when argument is FixedString, it's return type
+                /// should be integer instead of FixedString, the return value is
+                /// the sum of `bitCount` apply to each chars.
+                else
+                {
+                    /// UInt16 can save bitCount of FixedString less than 8192,
+                    /// it's should enough for almost all cases, and the setting
+                    /// `allow_suspicious_fixed_string_types` is disabled by default.
+                    if constexpr (is_bit_count)
+                        result = std::make_shared<DataTypeUInt16>();
+                    else
+                        result = std::make_shared<DataType>(type.getN());
+                }
+            }
+            else if constexpr (std::is_same_v<DataTypeString, DataType>)
+            {
+                if constexpr (!allow_string_or_fixed_string)
+                    return false;
+                else
+                {
+                    if constexpr (is_bit_count)
+                        result = std::make_shared<DataTypeUInt64>();
+                    else
+                        result = std::make_shared<DataType>();
+                }
             }
             else if constexpr (std::is_same_v<DataTypeInterval, DataType>)
             {
@@ -281,16 +349,80 @@ public:
 
             if constexpr (std::is_same_v<DataTypeFixedString, DataType>)
             {
-                if constexpr (allow_fixed_string)
+                if constexpr (allow_string_or_fixed_string)
                 {
                     if (const auto * col = checkAndGetColumn<ColumnFixedString>(arguments[0].column.get()))
                     {
-                        auto col_res = ColumnFixedString::create(col->getN());
-                        auto & vec_res = col_res->getChars();
-                        vec_res.resize(col->size() * col->getN());
-                        FixedStringUnaryOperationImpl<Op<UInt8>>::vector(col->getChars(), vec_res);
-                        result_column = std::move(col_res);
-                        return true;
+                        if constexpr (is_bit_count)
+                        {
+                            auto size = col->size();
+
+                            auto col_res = ColumnUInt16::create(size);
+                            auto & vec_res = col_res->getData();
+                            vec_res.resize(col->size());
+
+                            const auto & chars = col->getChars();
+                            auto n = col->getN();
+                            for (size_t i = 0; i < size; ++i)
+                            {
+                                vec_res[i] = StringUnaryOperationReduceImpl<Op<UInt8>>::vector(
+                                    chars.data() + n * i, chars.data() + n * (i + 1));
+                            }
+                            result_column = std::move(col_res);
+                            return true;
+                        }
+                        else
+                        {
+                            auto col_res = ColumnFixedString::create(col->getN());
+                            auto & vec_res = col_res->getChars();
+                            vec_res.resize(col->size() * col->getN());
+                            FixedStringUnaryOperationImpl<Op<UInt8>>::vector(col->getChars(), vec_res);
+                            result_column = std::move(col_res);
+                            return true;
+                        }
+                    }
+                }
+            }
+            else if constexpr (std::is_same_v<DataTypeString, DataType>)
+            {
+                if constexpr (allow_string_or_fixed_string)
+                {
+                    if (const auto * col = checkAndGetColumn<ColumnString>(arguments[0].column.get()))
+                    {
+                        if constexpr (is_bit_count)
+                        {
+                            auto size = col->size();
+
+                            auto col_res = ColumnUInt64::create(size);
+                            auto & vec_res = col_res->getData();
+
+                            const auto & chars = col->getChars();
+                            const auto & offsets = col->getOffsets();
+                            for (size_t i = 0; i < size; ++i)
+                            {
+                                vec_res[i] = StringUnaryOperationReduceImpl<Op<UInt8>>::vector(
+                                    chars.data() + offsets[i - 1], chars.data() + offsets[i] - 1);
+                            }
+                            result_column = std::move(col_res);
+                            return true;
+                        }
+                        else
+                        {
+                            auto col_res = ColumnString::create();
+                            auto & vec_res = col_res->getChars();
+                            auto & offset_res = col_res->getOffsets();
+
+                            const auto & vec_col = col->getChars();
+                            const auto & offset_col = col->getOffsets();
+
+                            vec_res.resize(vec_col.size());
+                            offset_res.resize(offset_col.size());
+                            memcpy(offset_res.data(), offset_col.data(), offset_res.size() * sizeof(UInt64));
+
+                            FixedStringUnaryOperationImpl<Op<UInt8>>::vector(vec_col, vec_res);
+                            result_column = std::move(col_res);
+                            return true;
+                        }
                     }
                 }
             }
@@ -353,7 +485,7 @@ public:
         return castType(arguments[0].get(), [&](const auto & type)
         {
             using DataType = std::decay_t<decltype(type)>;
-            if constexpr (std::is_same_v<DataTypeFixedString, DataType>)
+            if constexpr (std::is_same_v<DataTypeFixedString, DataType> || std::is_same_v<DataTypeString, DataType>)
                 return false;
             else
                 return !IsDataTypeDecimal<DataType> && Op<typename DataType::FieldType>::compilable;
@@ -368,7 +500,7 @@ public:
         castType(types[0].get(), [&](const auto & type)
         {
             using DataType = std::decay_t<decltype(type)>;
-            if constexpr (std::is_same_v<DataTypeFixedString, DataType>)
+            if constexpr (std::is_same_v<DataTypeFixedString, DataType> || std::is_same_v<DataTypeString, DataType>)
                 return false;
             else
             {
diff --git a/src/Functions/FunctionsBinaryRepresentation.cpp b/src/Functions/FunctionsBinaryRepresentation.cpp
index d44323f8bf3..c3a8f51ee4b 100644
--- a/src/Functions/FunctionsBinaryRepresentation.cpp
+++ b/src/Functions/FunctionsBinaryRepresentation.cpp
@@ -299,6 +299,7 @@ public:
             tryExecuteDecimal<Decimal32>(column, res_column) ||
             tryExecuteDecimal<Decimal64>(column, res_column) ||
             tryExecuteDecimal<Decimal128>(column, res_column) ||
+            tryExecuteDecimal<Decimal256>(column, res_column) ||
             tryExecuteUUID(column, res_column) ||
             tryExecuteIPv4(column, res_column) ||
             tryExecuteIPv6(column, res_column))
diff --git a/src/Functions/FunctionsBitmap.h b/src/Functions/FunctionsBitmap.h
index bb83c58699a..2292b896952 100644
--- a/src/Functions/FunctionsBitmap.h
+++ b/src/Functions/FunctionsBitmap.h
@@ -211,7 +211,7 @@ private:
                 = *reinterpret_cast<AggregateFunctionGroupBitmapData<T> *>(col_to->getData()[i]);
             for (; pos < offsets[i]; ++pos)
             {
-                bitmap_data.rbs.add(input_data[pos]);
+                bitmap_data.roaring_bitmap_with_small_set.add(input_data[pos]);
             }
         }
         return col_to;
@@ -303,7 +303,7 @@ private:
         {
             const AggregateFunctionGroupBitmapData<T> & bitmap_data_1
                 = *reinterpret_cast<const AggregateFunctionGroupBitmapData<T> *>(column->getData()[i]);
-            UInt64 count = bitmap_data_1.rbs.rb_to_array(res_data);
+            UInt64 count = bitmap_data_1.roaring_bitmap_with_small_set.rb_to_array(res_data);
             res_offset += count;
             res_offsets.emplace_back(res_offset);
         }
@@ -404,19 +404,19 @@ private:
         }
 
         if (is_column_const[0])
-            col_agg_func = typeid_cast<const ColumnAggregateFunction*>(typeid_cast<const ColumnConst*>(column_ptrs[0])->getDataColumnPtr().get());
+            col_agg_func = &typeid_cast<const ColumnAggregateFunction &>(*typeid_cast<const ColumnConst &>(*column_ptrs[0]).getDataColumnPtr());
         else
-            col_agg_func = typeid_cast<const ColumnAggregateFunction*>(column_ptrs[0]);
+            col_agg_func = &typeid_cast<const ColumnAggregateFunction &>(*column_ptrs[0]);
 
         container0 = &col_agg_func->getData();
         if (is_column_const[1])
-            container1 = &typeid_cast<const ColumnUInt64*>(typeid_cast<const ColumnConst*>(column_ptrs[1])->getDataColumnPtr().get())->getData();
+            container1 = &typeid_cast<const ColumnUInt64 &>(typeid_cast<const ColumnConst &>(*column_ptrs[1]).getDataColumn()).getData();
         else
-            container1 = &typeid_cast<const ColumnUInt64*>(column_ptrs[1])->getData();
+            container1 = &typeid_cast<const ColumnUInt64 &>(*column_ptrs[1]).getData();
         if (is_column_const[2])
-            container2 = &typeid_cast<const ColumnUInt64*>(typeid_cast<const ColumnConst*>(column_ptrs[2])->getDataColumnPtr().get())->getData();
+            container2 = &typeid_cast<const ColumnUInt64 &>(typeid_cast<const ColumnConst &>(*column_ptrs[2]).getDataColumn()).getData();
         else
-            container2 = &typeid_cast<const ColumnUInt64*>(column_ptrs[2])->getData();
+            container2 = &typeid_cast<const ColumnUInt64 &>(*column_ptrs[2]).getData();
 
         auto col_to = ColumnAggregateFunction::create(col_agg_func->getAggregateFunction());
         col_to->reserve(input_rows_count);
@@ -449,7 +449,7 @@ public:
         UInt64 range_end,
         AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
-        bitmap_data_0.rbs.rb_range(range_start, range_end, bitmap_data_2.rbs);
+        bitmap_data_0.roaring_bitmap_with_small_set.rb_range(range_start, range_end, bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -464,7 +464,7 @@ public:
         UInt64 range_end,
         AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
-        bitmap_data_0.rbs.rb_limit(range_start, range_end, bitmap_data_2.rbs);
+        bitmap_data_0.roaring_bitmap_with_small_set.rb_limit(range_start, range_end, bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -479,7 +479,7 @@ public:
         UInt64 range_end,
         AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
         {
-        bitmap_data_0.rbs.rb_offset_limit(range_start, range_end, bitmap_data_2.rbs);
+        bitmap_data_0.roaring_bitmap_with_small_set.rb_offset_limit(range_start, range_end, bitmap_data_2.roaring_bitmap_with_small_set);
         }
 };
 
@@ -587,29 +587,29 @@ private:
 
         if (is_column_const[0])
         {
-            col_agg_func = typeid_cast<const ColumnAggregateFunction*>(typeid_cast<const ColumnConst*>(column_ptrs[0])->getDataColumnPtr().get());
+            col_agg_func = &typeid_cast<const ColumnAggregateFunction &>(*typeid_cast<const ColumnConst &>(*column_ptrs[0]).getDataColumnPtr());
         }
         else
         {
-            col_agg_func = typeid_cast<const ColumnAggregateFunction*>(column_ptrs[0]);
+            col_agg_func = &typeid_cast<const ColumnAggregateFunction &>(*column_ptrs[0]);
         }
         container0 = &col_agg_func->getData();
 
         if (is_column_const[1])
-            array1 = typeid_cast<const ColumnArray*>(typeid_cast<const ColumnConst*>(column_ptrs[1])->getDataColumnPtr().get());
+            array1 = &typeid_cast<const ColumnArray &>(*typeid_cast<const ColumnConst &>(*column_ptrs[1]).getDataColumnPtr());
         else
-            array1 = typeid_cast<const ColumnArray *>(column_ptrs[1]);
+            array1 = &typeid_cast<const ColumnArray &>(*column_ptrs[1]);
 
         const ColumnArray::Offsets & from_offsets = array1->getOffsets();
-        const ColumnVector<UInt64>::Container & from_container = typeid_cast<const ColumnVector<UInt64> *>(&array1->getData())->getData();
+        const ColumnVector<UInt64>::Container & from_container = typeid_cast<const ColumnVector<UInt64> &>(array1->getData()).getData();
 
         if (is_column_const[2])
-            array2 = typeid_cast<const ColumnArray*>(typeid_cast<const ColumnConst*>(column_ptrs[2])->getDataColumnPtr().get());
+            array2 = &typeid_cast<const ColumnArray &>(*typeid_cast<const ColumnConst &>(*column_ptrs[2]).getDataColumnPtr());
         else
-            array2 = typeid_cast<const ColumnArray *>(column_ptrs[2]);
+            array2 = &typeid_cast<const ColumnArray &>(*column_ptrs[2]);
 
         const ColumnArray::Offsets & to_offsets = array2->getOffsets();
-        const ColumnVector<UInt64>::Container & to_container = typeid_cast<const ColumnVector<UInt64> *>(&array2->getData())->getData();
+        const ColumnVector<UInt64>::Container & to_container = typeid_cast<const ColumnVector<UInt64> &>(array2->getData()).getData();
         auto col_to = ColumnAggregateFunction::create(col_agg_func->getAggregateFunction());
         col_to->reserve(input_rows_count);
 
@@ -649,8 +649,8 @@ private:
             col_to->insertDefault();
             AggregateFunctionGroupBitmapData<T> & bitmap_data_2
                 = *reinterpret_cast<AggregateFunctionGroupBitmapData<T> *>(col_to->getData()[i]);
-            bitmap_data_2.rbs.merge(bitmap_data_0.rbs);
-            bitmap_data_2.rbs.rb_replace(&from_container[from_start], &to_container[to_start], from_end - from_start);
+            bitmap_data_2.roaring_bitmap_with_small_set.merge(bitmap_data_0.roaring_bitmap_with_small_set);
+            bitmap_data_2.roaring_bitmap_with_small_set.rb_replace(&from_container[from_start], &to_container[to_start], from_end - from_start);
         }
         return col_to;
     }
@@ -740,7 +740,7 @@ public:
     template <typename T>
     static UInt64 apply(const AggregateFunctionGroupBitmapData<T> & bitmap_data)
     {
-        return bitmap_data.rbs.size();
+        return bitmap_data.roaring_bitmap_with_small_set.size();
     }
 };
 
@@ -751,7 +751,7 @@ public:
     template <typename T>
     static UInt64 apply(const AggregateFunctionGroupBitmapData<T> & bitmap_data)
     {
-        return bitmap_data.rbs.rb_min();
+        return bitmap_data.roaring_bitmap_with_small_set.rb_min();
     }
 };
 
@@ -762,7 +762,7 @@ public:
     template <typename T>
     static UInt64 apply(const AggregateFunctionGroupBitmapData<T> & bitmap_data)
     {
-        return bitmap_data.rbs.rb_max();
+        return bitmap_data.roaring_bitmap_with_small_set.rb_max();
     }
 };
 
@@ -773,7 +773,7 @@ struct BitmapAndCardinalityImpl
     static UInt64 apply(const AggregateFunctionGroupBitmapData<T> & bitmap_data_1, const AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
         // roaring_bitmap_and_cardinality( rb1, rb2 );
-        return bitmap_data_1.rbs.rb_and_cardinality(bitmap_data_2.rbs);
+        return bitmap_data_1.roaring_bitmap_with_small_set.rb_and_cardinality(bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -785,7 +785,7 @@ struct BitmapOrCardinalityImpl
     static UInt64 apply(const AggregateFunctionGroupBitmapData<T> & bitmap_data_1, const AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
         // return roaring_bitmap_or_cardinality( rb1, rb2 );
-        return bitmap_data_1.rbs.rb_or_cardinality(bitmap_data_2.rbs);
+        return bitmap_data_1.roaring_bitmap_with_small_set.rb_or_cardinality(bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -796,7 +796,7 @@ struct BitmapXorCardinalityImpl
     static UInt64 apply(const AggregateFunctionGroupBitmapData<T> & bitmap_data_1, const AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
         // return roaring_bitmap_xor_cardinality( rb1, rb2 );
-        return bitmap_data_1.rbs.rb_xor_cardinality(bitmap_data_2.rbs);
+        return bitmap_data_1.roaring_bitmap_with_small_set.rb_xor_cardinality(bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -807,7 +807,7 @@ struct BitmapAndnotCardinalityImpl
     static UInt64 apply(const AggregateFunctionGroupBitmapData<T> & bitmap_data_1, const AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
         // roaring_bitmap_andnot_cardinality( rb1, rb2 );
-        return bitmap_data_1.rbs.rb_andnot_cardinality(bitmap_data_2.rbs);
+        return bitmap_data_1.roaring_bitmap_with_small_set.rb_andnot_cardinality(bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -817,7 +817,7 @@ struct BitmapHasAllImpl
     using ReturnType = UInt8;
     static UInt8 apply(const AggregateFunctionGroupBitmapData<T> & bitmap_data_1, const AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
-        return bitmap_data_1.rbs.rb_is_subset(bitmap_data_2.rbs);
+        return bitmap_data_1.roaring_bitmap_with_small_set.rb_is_subset(bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -827,7 +827,7 @@ struct BitmapHasAnyImpl
     using ReturnType = UInt8;
     static UInt8 apply(const AggregateFunctionGroupBitmapData<T> & bitmap_data_1, const AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
-        return bitmap_data_1.rbs.rb_intersect(bitmap_data_2.rbs);
+        return bitmap_data_1.roaring_bitmap_with_small_set.rb_intersect(bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -911,9 +911,9 @@ private:
         is_column_const[0] = isColumnConst(*column_ptrs[0]);
 
         if (is_column_const[0])
-            container0 = &typeid_cast<const ColumnAggregateFunction*>(typeid_cast<const ColumnConst*>(column_ptrs[0])->getDataColumnPtr().get())->getData();
+            container0 = &typeid_cast<const ColumnAggregateFunction &>(typeid_cast<const ColumnConst &>(*column_ptrs[0]).getDataColumn()).getData();
         else
-            container0 = &typeid_cast<const ColumnAggregateFunction*>(column_ptrs[0])->getData();
+            container0 = &typeid_cast<const ColumnAggregateFunction &>(*column_ptrs[0]).getData();
 
         // we can always cast the second column to ColumnUInt64
         auto uint64_column = castColumn(arguments[1], std::make_shared<DataTypeUInt64>());
@@ -921,9 +921,9 @@ private:
         is_column_const[1] = isColumnConst(*column_ptrs[1]);
 
         if (is_column_const[1])
-            container1 = &typeid_cast<const ColumnUInt64*>(typeid_cast<const ColumnConst*>(column_ptrs[1])->getDataColumnPtr().get())->getData();
+            container1 = &typeid_cast<const ColumnUInt64 &>(typeid_cast<const ColumnConst &>(*column_ptrs[1]).getDataColumn()).getData();
         else
-            container1 = &typeid_cast<const ColumnUInt64*>(column_ptrs[1])->getData();
+            container1 = &typeid_cast<const ColumnUInt64 &>(*column_ptrs[1]).getData();
 
         for (size_t i = 0; i < input_rows_count; ++i)
         {
@@ -931,7 +931,7 @@ private:
             const UInt64 data1 = is_column_const[1] ? (*container1)[0] : (*container1)[i];
             const AggregateFunctionGroupBitmapData<T> & bitmap_data_0
                 = *reinterpret_cast<const AggregateFunctionGroupBitmapData<T> *>(data_ptr_0);
-            vec_to[i] = bitmap_data_0.rbs.rb_contains(data1);
+            vec_to[i] = bitmap_data_0.roaring_bitmap_with_small_set.rb_contains(data1);
         }
     }
 };
@@ -1050,7 +1050,7 @@ struct BitmapAndImpl
 {
     static void apply(AggregateFunctionGroupBitmapData<T> & bitmap_data_1, const AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
-        bitmap_data_1.rbs.rb_and(bitmap_data_2.rbs);
+        bitmap_data_1.roaring_bitmap_with_small_set.rb_and(bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -1059,7 +1059,7 @@ struct BitmapOrImpl
 {
     static void apply(AggregateFunctionGroupBitmapData<T> & bitmap_data_1, const AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
-        bitmap_data_1.rbs.rb_or(bitmap_data_2.rbs);
+        bitmap_data_1.roaring_bitmap_with_small_set.rb_or(bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -1068,7 +1068,7 @@ struct BitmapXorImpl
 {
     static void apply(AggregateFunctionGroupBitmapData<T> & bitmap_data_1, const AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
-        bitmap_data_1.rbs.rb_xor(bitmap_data_2.rbs);
+        bitmap_data_1.roaring_bitmap_with_small_set.rb_xor(bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -1077,7 +1077,7 @@ struct BitmapAndnotImpl
 {
     static void apply(AggregateFunctionGroupBitmapData<T> & bitmap_data_1, const AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
     {
-        bitmap_data_1.rbs.rb_andnot(bitmap_data_2.rbs);
+        bitmap_data_1.roaring_bitmap_with_small_set.rb_andnot(bitmap_data_2.roaring_bitmap_with_small_set);
     }
 };
 
@@ -1190,7 +1190,7 @@ private:
             auto * bm_2 = reinterpret_cast<AggregateFunctionGroupBitmapData<T> *>(data_ptr_1);
 
             // check the name of operation (bitmapAnd) and check if it is the situation mentioned above
-            auto need_exchange = (name == NameBitmapAnd::name) && bm_1->rbs.isLarge() && bm_2->rbs.isSmall();
+            auto need_exchange = (name == NameBitmapAnd::name) && bm_1->roaring_bitmap_with_small_set.isLarge() && bm_2->roaring_bitmap_with_small_set.isSmall();
             col_to->insertFrom(need_exchange ? data_ptr_1 : data_ptr_0);
             AggregateFunctionGroupBitmapData<T> & bitmap_data_1 = *reinterpret_cast<AggregateFunctionGroupBitmapData<T> *>(col_to->getData()[i]);
             const AggregateFunctionGroupBitmapData<T> & bitmap_data_2
diff --git a/src/Functions/FunctionsCodingIP.cpp b/src/Functions/FunctionsCodingIP.cpp
index a941092b7d6..2671418fc7b 100644
--- a/src/Functions/FunctionsCodingIP.cpp
+++ b/src/Functions/FunctionsCodingIP.cpp
@@ -1,7 +1,5 @@
 #include <functional>
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 #include <Functions/FunctionsCodingIP.h>
 
@@ -26,7 +24,7 @@
 #include <IO/WriteHelpers.h>
 #include <Common/IPv6ToBinary.h>
 #include <Common/formatIPv6.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Common/typeid_cast.h>
 
 #include <arpa/inet.h>
@@ -247,8 +245,8 @@ public:
 private:
     static bool isIPv4Mapped(const UInt8 * address)
     {
-        return (unalignedLoadLE<UInt64>(address) == 0) &&
-               ((unalignedLoadLE<UInt64>(address + 8) & 0x00000000FFFFFFFFull) == 0x00000000FFFF0000ull);
+        return (unalignedLoadLittleEndian<UInt64>(address) == 0) &&
+               ((unalignedLoadLittleEndian<UInt64>(address + 8) & 0x00000000FFFFFFFFull) == 0x00000000FFFF0000ull);
     }
 
     static void cutAddress(const unsigned char * address, char *& dst, UInt8 zeroed_tail_bytes_count)
@@ -578,10 +576,11 @@ private:
     static void mapIPv4ToIPv6(UInt32 in, UInt8 * buf)
     {
         unalignedStore<UInt64>(buf, 0);
+
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-            unalignedStoreLE<UInt64>(buf + 8, 0x00000000FFFF0000ull | (static_cast<UInt64>(ntohl(in)) << 32));
+            unalignedStoreLittleEndian<UInt64>(buf + 8, 0x00000000FFFF0000ull | (static_cast<UInt64>(ntohl(in)) << 32));
 #else
-            unalignedStoreLE<UInt64>(buf + 8, 0x00000000FFFF0000ull | (static_cast<UInt64>(__builtin_bswap32(ntohl(in))) << 32));
+            unalignedStoreLittleEndian<UInt64>(buf + 8, 0x00000000FFFF0000ull | (static_cast<UInt64>(__builtin_bswap32(in))) << 32));
 #endif
     }
 };
@@ -1131,7 +1130,9 @@ public:
 
         for (size_t i = 0; i < vec_res.size(); ++i)
         {
-            vec_res[i] = DB::parseIPv6whole(reinterpret_cast<const char *>(&vec_src[prev_offset]), reinterpret_cast<unsigned char *>(buffer));
+            vec_res[i] = DB::parseIPv6whole(reinterpret_cast<const char *>(&vec_src[prev_offset]),
+                                            reinterpret_cast<const char *>(&vec_src[offsets_src[i] - 1]),
+                                            reinterpret_cast<unsigned char *>(buffer));
             prev_offset = offsets_src[i];
         }
 
diff --git a/src/Functions/FunctionsCodingULID.cpp b/src/Functions/FunctionsCodingULID.cpp
new file mode 100644
index 00000000000..1d426ee464a
--- /dev/null
+++ b/src/Functions/FunctionsCodingULID.cpp
@@ -0,0 +1,189 @@
+#include "config.h"
+
+#if USE_ULID
+
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsDateTime.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeString.h>
+#include <Functions/extractTimeZoneFromFunctionArguments.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
+#include <Interpreters/Context.h>
+
+#include <ulid.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+}
+
+class FunctionULIDStringToDateTime : public IFunction
+{
+public:
+    static constexpr size_t ULID_LENGTH = 26;
+    static constexpr UInt32 DATETIME_SCALE = 3;
+
+    static constexpr auto name = "ULIDStringToDateTime";
+
+    static FunctionPtr create(ContextPtr /*context*/)
+    {
+        return std::make_shared<FunctionULIDStringToDateTime>();
+    }
+
+    String getName() const override { return name; }
+
+    bool isVariadic() const override { return true; }
+    size_t getNumberOfArguments() const override { return 0; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (arguments.empty() || arguments.size() > 2)
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Wrong number of arguments for function {}: should be 1 or 2",
+                getName());
+
+        const auto * arg_fixed_string = checkAndGetDataType<DataTypeFixedString>(arguments[0].type.get());
+        const auto * arg_string = checkAndGetDataType<DataTypeString>(arguments[0].type.get());
+
+        if (!arg_string && !(arg_fixed_string && arg_fixed_string->getN() == ULID_LENGTH))
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument of function {}. Must be String or FixedString(26).",
+                arguments[0].type->getName(),
+                getName());
+
+        String timezone;
+        if (arguments.size() == 2)
+        {
+            timezone = extractTimeZoneNameFromColumn(arguments[1].column.get(), arguments[1].name);
+
+            if (timezone.empty())
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Function {} supports a 2nd argument (optional) that must be a valid time zone",
+                    getName());
+        }
+
+        return std::make_shared<DataTypeDateTime64>(DATETIME_SCALE, timezone);
+    }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        auto col_res = ColumnDateTime64::create(input_rows_count, DATETIME_SCALE);
+        auto & vec_res = col_res->getData();
+
+        const ColumnPtr column = arguments[0].column;
+
+        const auto * column_fixed_string = checkAndGetColumn<ColumnFixedString>(column.get());
+        const auto * column_string = checkAndGetColumn<ColumnString>(column.get());
+
+        if (column_fixed_string)
+        {
+            if (column_fixed_string->getN() != ULID_LENGTH)
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "Illegal column {} of argument of function {}, expected String or FixedString({})",
+                    arguments[0].name, getName(), ULID_LENGTH
+                );
+
+            const auto & vec_src = column_fixed_string->getChars();
+
+            for (size_t i = 0; i < input_rows_count; ++i)
+            {
+                DateTime64 time = decode(vec_src.data() + i * ULID_LENGTH);
+                vec_res[i] = time;
+            }
+        }
+        else if (column_string)
+        {
+            const auto & vec_src = column_string->getChars();
+            const auto & offsets_src = column_string->getOffsets();
+
+            size_t src_offset = 0;
+
+            for (size_t i = 0; i < input_rows_count; ++i)
+            {
+                DateTime64 time = 0;
+
+                size_t string_size = offsets_src[i] - src_offset;
+                if (string_size != ULID_LENGTH + 1)
+                    throw Exception(
+                        ErrorCodes::ILLEGAL_COLUMN,
+                        "Illegal column {} of argument of function {}, ULID must be {} characters long",
+                        arguments[0].name, getName(), ULID_LENGTH
+                    );
+
+                time = decode(vec_src.data() + src_offset);
+
+                src_offset += string_size;
+                vec_res[i] = time;
+            }
+        }
+        else
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal column {} of argument of function {}, expected String or FixedString({})",
+                arguments[0].name, getName(), ULID_LENGTH
+            );
+
+        return col_res;
+    }
+
+    static DateTime64 decode(const UInt8 * data)
+    {
+        unsigned char buffer[16];
+        int ret = ulid_decode(buffer, reinterpret_cast<const char *>(data));
+        if (ret != 0)
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Cannot parse ULID {}",
+                std::string_view(reinterpret_cast<const char *>(data), ULID_LENGTH)
+            );
+
+        /// Timestamp in milliseconds is the first 48 bits of the decoded ULID
+        Int64 ms = 0;
+        memcpy(reinterpret_cast<UInt8 *>(&ms) + 2, buffer, 6);
+
+#    if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+        ms = std::byteswap(ms);
+#    endif
+
+        return DecimalUtils::decimalFromComponents<DateTime64>(ms / intExp10(DATETIME_SCALE), ms % intExp10(DATETIME_SCALE), DATETIME_SCALE);
+    }
+};
+
+
+REGISTER_FUNCTION(ULIDStringToDateTime)
+{
+    factory.registerFunction<FunctionULIDStringToDateTime>(FunctionDocumentation
+        {
+            .description=R"(
+This function extracts the timestamp from a ULID and returns it as a DateTime64(3) typed value.
+The function expects the ULID to be provided as the first argument, which can be either a String or a FixedString(26) data type.
+An optional second argument can be passed to specify a timezone for the timestamp.
+)",
+            .examples{
+                {"ulid", "SELECT ULIDStringToDateTime(generateULID())", ""},
+                {"timezone", "SELECT ULIDStringToDateTime(generateULID(), 'Asia/Istanbul')", ""}},
+            .categories{"ULID"}
+        },
+        FunctionFactory::CaseSensitive);
+}
+
+}
+
+#endif
diff --git a/src/Functions/FunctionsCodingUUID.cpp b/src/Functions/FunctionsCodingUUID.cpp
index dade406c801..dd9170e44ad 100644
--- a/src/Functions/FunctionsCodingUUID.cpp
+++ b/src/Functions/FunctionsCodingUUID.cpp
@@ -3,7 +3,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnVector.h>
 #include <Common/BitHelpers.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <Functions/FunctionFactory.h>
diff --git a/src/Functions/FunctionsComparison.h b/src/Functions/FunctionsComparison.h
index e3be433833c..08bc350c1d4 100644
--- a/src/Functions/FunctionsComparison.h
+++ b/src/Functions/FunctionsComparison.h
@@ -42,12 +42,8 @@
 #include <type_traits>
 
 #if USE_EMBEDDED_COMPILER
-#include <DataTypes/Native.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <llvm/IR/IRBuilder.h>
-#pragma GCC diagnostic pop
+#    include <DataTypes/Native.h>
+#    include <llvm/IR/IRBuilder.h>
 #endif
 
 
@@ -595,7 +591,7 @@ template <> struct CompileOp<NotEqualsOp>
 {
     static llvm::Value * compile(llvm::IRBuilder<> & b, llvm::Value * x, llvm::Value * y, bool /*is_signed*/)
     {
-        return x->getType()->isIntegerTy() ? b.CreateICmpNE(x, y) : b.CreateFCmpONE(x, y);
+        return x->getType()->isIntegerTy() ? b.CreateICmpNE(x, y) : b.CreateFCmpUNE(x, y);
     }
 };
 
@@ -1234,8 +1230,11 @@ public:
         /// The case when arguments are the same (tautological comparison). Return constant.
         /// NOTE: Nullable types are special case.
         /// (BTW, this function use default implementation for Nullable, so Nullable types cannot be here. Check just in case.)
-        /// NOTE: We consider NaN comparison to be implementation specific (and in our implementation NaNs are sometimes equal sometimes not).
-        if (left_type->equals(*right_type) && !left_type->isNullable() && !isTuple(left_type) && col_left_untyped == col_right_untyped)
+        if (left_type->equals(*right_type) &&
+            !left_type->isNullable() &&
+            !isTuple(left_type) &&
+            !WhichDataType(left_type).isFloat() &&
+            col_left_untyped == col_right_untyped)
         {
             ColumnPtr result_column;
 
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 55003044ff5..940585d6d57 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -41,6 +41,7 @@
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnStringHelpers.h>
 #include <Common/assert_cast.h>
+#include <Common/Concepts.h>
 #include <Common/quoteString.h>
 #include <Common/Exception.h>
 #include <Core/AccurateComparison.h>
@@ -144,13 +145,6 @@ struct ConvertImpl
         using ColVecFrom = typename FromDataType::ColumnType;
         using ColVecTo = typename ToDataType::ColumnType;
 
-        if (std::is_same_v<Name, NameToUnixTimestamp>)
-        {
-            if (isDateOrDate32(named_from.type))
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal type {} of first argument of function {}",
-                    named_from.type->getName(), Name::name);
-        }
-
         if constexpr ((IsDataTypeDecimal<FromDataType> || IsDataTypeDecimal<ToDataType>)
             && !(std::is_same_v<DataTypeDateTime64, FromDataType> || std::is_same_v<DataTypeDateTime64, ToDataType>))
         {
@@ -305,6 +299,8 @@ struct ConvertImpl
                         {
                             if constexpr (std::is_same_v<ToDataType, DataTypeIPv4> && std::is_same_v<FromDataType, DataTypeUInt64>)
                                 vec_to[i] = static_cast<ToFieldType>(static_cast<IPv4::UnderlyingType>(vec_from[i]));
+                            else if constexpr (std::is_same_v<Name, NameToUnixTimestamp> && (std::is_same_v<FromDataType, DataTypeDate> || std::is_same_v<FromDataType, DataTypeDate32>))
+                                vec_to[i] = static_cast<ToFieldType>(vec_from[i] * DATE_SECONDS_PER_DAY);
                             else
                                 vec_to[i] = static_cast<ToFieldType>(vec_from[i]);
                         }
@@ -803,7 +799,7 @@ struct ConvertImpl<DataTypeEnum<FieldType>, DataTypeNumber<FieldType>, Name, Con
     }
 };
 
-static ColumnUInt8::MutablePtr copyNullMap(ColumnPtr col)
+static inline ColumnUInt8::MutablePtr copyNullMap(ColumnPtr col)
 {
     ColumnUInt8::MutablePtr null_map = nullptr;
     if (const auto * col_null = checkAndGetColumn<ColumnNullable>(col.get()))
@@ -3097,12 +3093,18 @@ private:
             return &ConvertImplGenericFromString<ColumnString>::execute;
         }
 
+        DataTypePtr from_type_holder;
         const auto * from_type = checkAndGetDataType<DataTypeArray>(from_type_untyped.get());
         const auto * from_type_map = checkAndGetDataType<DataTypeMap>(from_type_untyped.get());
 
         /// Convert from Map
         if (from_type_map)
-            from_type = checkAndGetDataType<DataTypeArray>(from_type_map->getNestedType().get());
+        {
+            /// Recreate array of unnamed tuples because otherwise it may work
+            /// unexpectedly while converting to array of named tuples.
+            from_type_holder = from_type_map->getNestedTypeWithUnnamedTuple();
+            from_type = assert_cast<const DataTypeArray *>(from_type_holder.get());
+        }
 
         if (!from_type)
         {
@@ -3294,7 +3296,7 @@ private:
         };
     }
 
-    WrapperType createMapToMapWrrapper(const DataTypes & from_kv_types, const DataTypes & to_kv_types) const
+    WrapperType createMapToMapWrapper(const DataTypes & from_kv_types, const DataTypes & to_kv_types) const
     {
         return [element_wrappers = getElementWrappers(from_kv_types, to_kv_types), from_kv_types, to_kv_types]
             (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t /*input_rows_count*/) -> ColumnPtr
@@ -3315,7 +3317,7 @@ private:
     }
 
     /// The case of: [(key1, value1), (key2, value2), ...]
-    WrapperType createArrayToMapWrrapper(const DataTypes & from_kv_types, const DataTypes & to_kv_types) const
+    WrapperType createArrayToMapWrapper(const DataTypes & from_kv_types, const DataTypes & to_kv_types) const
     {
         return [element_wrappers = getElementWrappers(from_kv_types, to_kv_types), from_kv_types, to_kv_types]
             (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t /*input_rows_count*/) -> ColumnPtr
@@ -3341,8 +3343,12 @@ private:
         if (const auto * from_tuple = checkAndGetDataType<DataTypeTuple>(from_type_untyped.get()))
         {
             if (from_tuple->getElements().size() != 2)
-                throw Exception(ErrorCodes::TYPE_MISMATCH, "CAST AS Map from tuple requeires 2 elements. "
-                    "Left type: {}, right type: {}", from_tuple->getName(), to_type->getName());
+                throw Exception(
+                    ErrorCodes::TYPE_MISMATCH,
+                    "CAST AS Map from tuple requires 2 elements. "
+                    "Left type: {}, right type: {}",
+                    from_tuple->getName(),
+                    to_type->getName());
 
             DataTypes from_kv_types;
             const auto & to_kv_types = to_type->getKeyValueTypes();
@@ -3363,14 +3369,18 @@ private:
         {
             const auto * nested_tuple = typeid_cast<const DataTypeTuple *>(from_array->getNestedType().get());
             if (!nested_tuple || nested_tuple->getElements().size() != 2)
-                throw Exception(ErrorCodes::TYPE_MISMATCH, "CAST AS Map from array requeires nested tuple of 2 elements. "
-                    "Left type: {}, right type: {}", from_array->getName(), to_type->getName());
+                throw Exception(
+                    ErrorCodes::TYPE_MISMATCH,
+                    "CAST AS Map from array requires nested tuple of 2 elements. "
+                    "Left type: {}, right type: {}",
+                    from_array->getName(),
+                    to_type->getName());
 
-            return createArrayToMapWrrapper(nested_tuple->getElements(), to_type->getKeyValueTypes());
+            return createArrayToMapWrapper(nested_tuple->getElements(), to_type->getKeyValueTypes());
         }
         else if (const auto * from_type = checkAndGetDataType<DataTypeMap>(from_type_untyped.get()))
         {
-            return createMapToMapWrrapper(from_type->getKeyValueTypes(), to_type->getKeyValueTypes());
+            return createMapToMapWrapper(from_type->getKeyValueTypes(), to_type->getKeyValueTypes());
         }
         else
         {
diff --git a/src/Functions/FunctionsDecimalArithmetics.h b/src/Functions/FunctionsDecimalArithmetics.h
index aa4afc68707..79e10d215a9 100644
--- a/src/Functions/FunctionsDecimalArithmetics.h
+++ b/src/Functions/FunctionsDecimalArithmetics.h
@@ -10,7 +10,6 @@
 #include <Functions/castTypeToEither.h>
 #include <IO/WriteHelpers.h>
 
-#include <Common/logger_useful.h>
 #include <Poco/Logger.h>
 #include <Loggers/Loggers.h>
 
diff --git a/src/Functions/FunctionsEmbeddedDictionaries.h b/src/Functions/FunctionsEmbeddedDictionaries.h
index e54ab0277d5..af040c6ab93 100644
--- a/src/Functions/FunctionsEmbeddedDictionaries.h
+++ b/src/Functions/FunctionsEmbeddedDictionaries.h
@@ -166,12 +166,12 @@ public:
 
         if (arguments[0]->getName() != TypeName<T>)
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {} (must be {})",
-                arguments[0]->getName(), getName(), String(TypeName<T>));
+                arguments[0]->getName(), getName(), TypeName<T>);
 
-        if (arguments.size() == 2 && arguments[1]->getName() != TypeName<String>)
+        if (arguments.size() == 2 && arguments[1]->getName() != "String")
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "Illegal type {} of the second ('point of view') argument of function {} (must be {})",
-                            arguments[1]->getName(), getName(), String(TypeName<T>));
+                            "Illegal type {} of the second ('point of view') argument of function {} (must be String)",
+                            arguments[1]->getName(), getName());
 
         return arguments[0];
     }
@@ -257,16 +257,16 @@ public:
 
         if (arguments[0]->getName() != TypeName<T>)
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of first argument of function {} (must be {})",
-                arguments[0]->getName(), getName(), String(TypeName<T>));
+                arguments[0]->getName(), getName(), TypeName<T>);
 
         if (arguments[1]->getName() != TypeName<T>)
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of second argument of function {} (must be {})",
-                arguments[1]->getName(), getName(), String(TypeName<T>));
+                arguments[1]->getName(), getName(), TypeName<T>);
 
-        if (arguments.size() == 3 && arguments[2]->getName() != TypeName<String>)
+        if (arguments.size() == 3 && arguments[2]->getName() != "String")
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "Illegal type {} of the third ('point of view') argument of function {} (must be {})",
-                            arguments[2]->getName(), getName(), String(TypeName<String>));
+                            "Illegal type {} of the third ('point of view') argument of function {} (must be String)",
+                            arguments[2]->getName(), getName());
 
         return std::make_shared<DataTypeUInt8>();
     }
@@ -390,12 +390,12 @@ public:
 
         if (arguments[0]->getName() != TypeName<T>)
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {} (must be {})",
-            arguments[0]->getName(), getName(), String(TypeName<T>));
+            arguments[0]->getName(), getName(), TypeName<T>);
 
-        if (arguments.size() == 2 && arguments[1]->getName() != TypeName<String>)
+        if (arguments.size() == 2 && arguments[1]->getName() != "String")
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "Illegal type {} of the second ('point of view') argument of function {} (must be {})",
-                            arguments[1]->getName(), getName(), String(TypeName<String>));
+                            "Illegal type {} of the second ('point of view') argument of function {} (must be String)",
+                            arguments[1]->getName(), getName());
 
         return std::make_shared<DataTypeArray>(arguments[0]);
     }
@@ -591,15 +591,15 @@ public:
                 "Number of arguments for function {} doesn't match: passed {}, should be 1 or 2.",
                 getName(), arguments.size());
 
-        if (arguments[0]->getName() != TypeName<UInt32>)
+        if (arguments[0]->getName() != "UInt32")
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "Illegal type {} of the first argument of function {} (must be {})",
-                            arguments[0]->getName(), getName(), String(TypeName<UInt32>));
+                            "Illegal type {} of the first argument of function {} (must be UInt32)",
+                            arguments[0]->getName(), getName());
 
-        if (arguments.size() == 2 && arguments[1]->getName() != TypeName<String>)
+        if (arguments.size() == 2 && arguments[1]->getName() != "String")
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "Illegal type {} of the second argument of function {} (must be {})",
-                            arguments[0]->getName(), getName(), String(TypeName<String>));
+                            "Illegal type {} of the second argument of function {} (must be String)",
+                            arguments[0]->getName(), getName());
 
         return std::make_shared<DataTypeString>();
     }
diff --git a/src/Functions/FunctionsExternalDictionaries.cpp b/src/Functions/FunctionsExternalDictionaries.cpp
index babc133603f..70b1e3cc861 100644
--- a/src/Functions/FunctionsExternalDictionaries.cpp
+++ b/src/Functions/FunctionsExternalDictionaries.cpp
@@ -47,69 +47,69 @@ Returned value: value of the dictionary attribute parsed in the attribute’s da
 Throws an exception if cannot parse the value of the attribute or the value does not match the attribute data type.
 )" };
 
-    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::get>>(Documentation{ fmt::format(dict_get_description, "attribute’s data type") });
-    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::getOrDefault>>(Documentation{ fmt::format(dict_get_or_default_description, "attribute’s data type") });
-    factory.registerFunction<FunctionDictGetOrNull>(Documentation{ dict_get_or_null_description });
+    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::get>>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "attribute’s data type") });
+    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::getOrDefault>>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "attribute’s data type") });
+    factory.registerFunction<FunctionDictGetOrNull>(FunctionDocumentation{ .description=dict_get_or_null_description });
 
-    factory.registerFunction<FunctionDictGetUInt8>(Documentation{ fmt::format(dict_get_description, "UInt8") });
-    factory.registerFunction<FunctionDictGetUInt16>(Documentation{ fmt::format(dict_get_description, "UInt16") });
-    factory.registerFunction<FunctionDictGetUInt32>(Documentation{ fmt::format(dict_get_description, "UInt32") });
-    factory.registerFunction<FunctionDictGetUInt64>(Documentation{ fmt::format(dict_get_description, "UInt64") });
-    factory.registerFunction<FunctionDictGetInt8>(Documentation{ fmt::format(dict_get_description, "Int8") });
-    factory.registerFunction<FunctionDictGetInt16>(Documentation{ fmt::format(dict_get_description, "Int16") });
-    factory.registerFunction<FunctionDictGetInt32>(Documentation{ fmt::format(dict_get_description, "Int32") });
-    factory.registerFunction<FunctionDictGetInt64>(Documentation{ fmt::format(dict_get_description, "Int64") });
-    factory.registerFunction<FunctionDictGetFloat32>(Documentation{ fmt::format(dict_get_description, "Float32") });
-    factory.registerFunction<FunctionDictGetFloat64>(Documentation{ fmt::format(dict_get_description, "Float64") });
-    factory.registerFunction<FunctionDictGetDate>(Documentation{ fmt::format(dict_get_description, "Date") });
-    factory.registerFunction<FunctionDictGetDateTime>(Documentation{ fmt::format(dict_get_description, "DateTime") });
-    factory.registerFunction<FunctionDictGetUUID>(Documentation{ fmt::format(dict_get_description, "UUID") });
-    factory.registerFunction<FunctionDictGetIPv4>(Documentation{ fmt::format(dict_get_description, "IPv4") });
-    factory.registerFunction<FunctionDictGetIPv6>(Documentation{ fmt::format(dict_get_description, "IPv6") });
-    factory.registerFunction<FunctionDictGetString>(Documentation{ fmt::format(dict_get_description, "String") });
+    factory.registerFunction<FunctionDictGetUInt8>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "UInt8") });
+    factory.registerFunction<FunctionDictGetUInt16>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "UInt16") });
+    factory.registerFunction<FunctionDictGetUInt32>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "UInt32") });
+    factory.registerFunction<FunctionDictGetUInt64>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "UInt64") });
+    factory.registerFunction<FunctionDictGetInt8>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "Int8") });
+    factory.registerFunction<FunctionDictGetInt16>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "Int16") });
+    factory.registerFunction<FunctionDictGetInt32>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "Int32") });
+    factory.registerFunction<FunctionDictGetInt64>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "Int64") });
+    factory.registerFunction<FunctionDictGetFloat32>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "Float32") });
+    factory.registerFunction<FunctionDictGetFloat64>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "Float64") });
+    factory.registerFunction<FunctionDictGetDate>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "Date") });
+    factory.registerFunction<FunctionDictGetDateTime>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "DateTime") });
+    factory.registerFunction<FunctionDictGetUUID>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "UUID") });
+    factory.registerFunction<FunctionDictGetIPv4>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "IPv4") });
+    factory.registerFunction<FunctionDictGetIPv6>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "IPv6") });
+    factory.registerFunction<FunctionDictGetString>(FunctionDocumentation{ .description=fmt::format(dict_get_description, "String") });
 
-    factory.registerFunction<FunctionDictGetUInt8OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "UInt8") });
-    factory.registerFunction<FunctionDictGetUInt16OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "UInt16") });
-    factory.registerFunction<FunctionDictGetUInt32OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "UInt32") });
-    factory.registerFunction<FunctionDictGetUInt64OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "UInt64") });
-    factory.registerFunction<FunctionDictGetInt8OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "Int8") });
-    factory.registerFunction<FunctionDictGetInt16OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "Int16") });
-    factory.registerFunction<FunctionDictGetInt32OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "Int32") });
-    factory.registerFunction<FunctionDictGetInt64OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "Int64") });
-    factory.registerFunction<FunctionDictGetFloat32OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "Float32") });
-    factory.registerFunction<FunctionDictGetFloat64OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "Float64") });
-    factory.registerFunction<FunctionDictGetDateOrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "Date") });
-    factory.registerFunction<FunctionDictGetDateTimeOrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "DateTime") });
-    factory.registerFunction<FunctionDictGetUUIDOrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "UUID") });
-    factory.registerFunction<FunctionDictGetIPv4OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "IPv4") });
-    factory.registerFunction<FunctionDictGetIPv6OrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "IPv6") });
-    factory.registerFunction<FunctionDictGetStringOrDefault>(Documentation{ fmt::format(dict_get_or_default_description, "String") });
+    factory.registerFunction<FunctionDictGetUInt8OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "UInt8") });
+    factory.registerFunction<FunctionDictGetUInt16OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "UInt16") });
+    factory.registerFunction<FunctionDictGetUInt32OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "UInt32") });
+    factory.registerFunction<FunctionDictGetUInt64OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "UInt64") });
+    factory.registerFunction<FunctionDictGetInt8OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "Int8") });
+    factory.registerFunction<FunctionDictGetInt16OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "Int16") });
+    factory.registerFunction<FunctionDictGetInt32OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "Int32") });
+    factory.registerFunction<FunctionDictGetInt64OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "Int64") });
+    factory.registerFunction<FunctionDictGetFloat32OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "Float32") });
+    factory.registerFunction<FunctionDictGetFloat64OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "Float64") });
+    factory.registerFunction<FunctionDictGetDateOrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "Date") });
+    factory.registerFunction<FunctionDictGetDateTimeOrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "DateTime") });
+    factory.registerFunction<FunctionDictGetUUIDOrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "UUID") });
+    factory.registerFunction<FunctionDictGetIPv4OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "IPv4") });
+    factory.registerFunction<FunctionDictGetIPv6OrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "IPv6") });
+    factory.registerFunction<FunctionDictGetStringOrDefault>(FunctionDocumentation{ .description=fmt::format(dict_get_or_default_description, "String") });
 
-    factory.registerFunction<FunctionDictHas>(Documentation{ R"(
+    factory.registerFunction<FunctionDictHas>(FunctionDocumentation{ .description=R"(
 Checks whether a key is present in a dictionary.
 Accepts 2 parameters: name of the dictionary, key value - expression returning dictionary key-type value or tuple-type value - depending on the dictionary configuration.
 Returned value: 0 if there is no key, 1 if there is a key, type of UInt8
 )"});
 
-    factory.registerFunction<FunctionDictGetHierarchy>(Documentation{ R"(
+    factory.registerFunction<FunctionDictGetHierarchy>(FunctionDocumentation{ .description=R"(
 Creates an array, containing all the parents of a key in the hierarchical dictionary.
 Accepts 2 parameters: name of the dictionary, key value - expression returning a UInt64-type value.
 Returned value: parents for the key, type of Array(UInt64)
 )"});
 
-    factory.registerFunction<FunctionDictIsIn>(Documentation{ R"(
+    factory.registerFunction<FunctionDictIsIn>(FunctionDocumentation{ .description=R"(
 Checks the ancestor of a key through the whole hierarchical chain in the dictionary.
 Accepts 3 parameters: name of the dictionary, key to be checked - expression returning a UInt64-type value, alleged ancestor of the key - expression returning a UInt64-type.
 Returned value: 0 if key is not a child of the ancestor, 1 if key is a child of the ancestor or if key is the ancestor, type of UInt8
 )"});
 
-    factory.registerFunction<FunctionDictGetChildrenOverloadResolver>(Documentation{ R"(
+    factory.registerFunction<FunctionDictGetChildrenOverloadResolver>(FunctionDocumentation{ .description=R"(
 Returns first-level children as an array of indexes. It is the inverse transformation for dictGetHierarchy.
 Accepts 2 parameters: name of the dictionary, key value - expression returning a UInt64-type value.
 Returned value: first-level descendants for the key, type of Array(UInt64)
 )"});
 
-    factory.registerFunction<FunctionDictGetDescendantsOverloadResolver>(Documentation{ R"(
+    factory.registerFunction<FunctionDictGetDescendantsOverloadResolver>(FunctionDocumentation{ .description=R"(
 Returns all descendants as if dictGetChildren function was applied level times recursively.
 Accepts 3 parameters: name of the dictionary, key value - expression returning a UInt64-type value, level — hierarchy level - If level = 0 returns all descendants to the end - UInt8
 Returned value: descendants for the key, type of Array(UInt64)
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 48ecc13da39..97d85f384bc 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -692,8 +692,10 @@ private:
         auto return_type = impl.getReturnTypeImpl(arguments);
 
         if (!return_type->equals(*result_type))
-            throw Exception(ErrorCodes::TYPE_MISMATCH, "Dictionary attribute has different type {} expected {}",
-                    return_type->getName(), result_type->getName());
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "Function {} dictionary attribute has different type {} expected {}",
+                    getName(),
+                    return_type->getName(),
+                    result_type->getName());
 
         return impl.executeImpl(arguments, return_type, input_rows_count);
     }
@@ -719,9 +721,6 @@ struct NameDictGetDateTime { static constexpr auto name = "dictGetDateTime"; };
 struct NameDictGetUUID { static constexpr auto name = "dictGetUUID"; };
 struct NameDictGetIPv4 { static constexpr auto name = "dictGetIPv4"; };
 struct NameDictGetIPv6 { static constexpr auto name = "dictGetIPv6"; };
-struct NameDictGetDecimal32 { static constexpr auto name = "dictGetDecimal32"; };
-struct NameDictGetDecimal64 { static constexpr auto name = "dictGetDecimal64"; };
-struct NameDictGetDecimal128 { static constexpr auto name = "dictGetDecimal128"; };
 struct NameDictGetString { static constexpr auto name = "dictGetString"; };
 
 using FunctionDictGetUInt8 = FunctionDictGet<DataTypeUInt8, NameDictGetUInt8>;
@@ -739,9 +738,6 @@ using FunctionDictGetDateTime = FunctionDictGet<DataTypeDateTime, NameDictGetDat
 using FunctionDictGetUUID = FunctionDictGet<DataTypeUUID, NameDictGetUUID>;
 using FunctionDictGetIPv4 = FunctionDictGet<DataTypeIPv4, NameDictGetIPv4>;
 using FunctionDictGetIPv6 = FunctionDictGet<DataTypeIPv6, NameDictGetIPv6>;
-using FunctionDictGetDecimal32 = FunctionDictGet<DataTypeDecimal<Decimal32>, NameDictGetDecimal32>;
-using FunctionDictGetDecimal64 = FunctionDictGet<DataTypeDecimal<Decimal64>, NameDictGetDecimal64>;
-using FunctionDictGetDecimal128 = FunctionDictGet<DataTypeDecimal<Decimal128>, NameDictGetDecimal128>;
 using FunctionDictGetString = FunctionDictGet<DataTypeString, NameDictGetString>;
 
 template<typename DataType, typename Name>
@@ -762,9 +758,6 @@ struct NameDictGetDateTimeOrDefault { static constexpr auto name = "dictGetDateT
 struct NameDictGetUUIDOrDefault { static constexpr auto name = "dictGetUUIDOrDefault"; };
 struct NameDictGetIPv4OrDefault { static constexpr auto name = "dictGetIPv4OrDefault"; };
 struct NameDictGetIPv6OrDefault { static constexpr auto name = "dictGetIPv6OrDefault"; };
-struct NameDictGetDecimal32OrDefault { static constexpr auto name = "dictGetDecimal32OrDefault"; };
-struct NameDictGetDecimal64OrDefault { static constexpr auto name = "dictGetDecimal64OrDefault"; };
-struct NameDictGetDecimal128OrDefault { static constexpr auto name = "dictGetDecimal128OrDefault"; };
 struct NameDictGetStringOrDefault { static constexpr auto name = "dictGetStringOrDefault"; };
 
 using FunctionDictGetUInt8OrDefault = FunctionDictGetOrDefault<DataTypeUInt8, NameDictGetUInt8OrDefault>;
@@ -782,9 +775,6 @@ using FunctionDictGetDateTimeOrDefault = FunctionDictGetOrDefault<DataTypeDateTi
 using FunctionDictGetUUIDOrDefault = FunctionDictGetOrDefault<DataTypeUUID, NameDictGetUUIDOrDefault>;
 using FunctionDictGetIPv4OrDefault = FunctionDictGetOrDefault<DataTypeIPv4, NameDictGetIPv4OrDefault>;
 using FunctionDictGetIPv6OrDefault = FunctionDictGetOrDefault<DataTypeIPv6, NameDictGetIPv6OrDefault>;
-using FunctionDictGetDecimal32OrDefault = FunctionDictGetOrDefault<DataTypeDecimal<Decimal32>, NameDictGetDecimal32OrDefault>;
-using FunctionDictGetDecimal64OrDefault = FunctionDictGetOrDefault<DataTypeDecimal<Decimal64>, NameDictGetDecimal64OrDefault>;
-using FunctionDictGetDecimal128OrDefault = FunctionDictGetOrDefault<DataTypeDecimal<Decimal128>, NameDictGetDecimal128OrDefault>;
 using FunctionDictGetStringOrDefault = FunctionDictGetOrDefault<DataTypeString, NameDictGetStringOrDefault>;
 
 class FunctionDictGetOrNull final : public IFunction
@@ -1078,11 +1068,11 @@ public:
     FunctionDictGetDescendantsExecutable(
         String name_,
         size_t level_,
-        DictionaryHierarchicalParentToChildIndexPtr hierarchical_parent_to_child_index,
+        DictionaryHierarchicalParentToChildIndexPtr hierarchical_parent_to_child_index_,
         std::shared_ptr<FunctionDictHelper> dictionary_helper_)
         : name(std::move(name_))
         , level(level_)
-        , hierarchical_parent_to_child_index(std::move(hierarchical_parent_to_child_index))
+        , hierarchical_parent_to_child_index(std::move(hierarchical_parent_to_child_index_))
         , dictionary_helper(std::move(dictionary_helper_))
     {}
 
@@ -1120,13 +1110,13 @@ public:
         const DataTypes & argument_types_,
         const DataTypePtr & result_type_,
         size_t level_,
-        DictionaryHierarchicalParentToChildIndexPtr hierarchical_parent_to_child_index,
+        DictionaryHierarchicalParentToChildIndexPtr hierarchical_parent_to_child_index_,
         std::shared_ptr<FunctionDictHelper> helper_)
         : name(std::move(name_))
         , argument_types(argument_types_)
         , result_type(result_type_)
         , level(level_)
-        , hierarchical_parent_to_child_index(std::move(hierarchical_parent_to_child_index))
+        , hierarchical_parent_to_child_index(std::move(hierarchical_parent_to_child_index_))
         , helper(std::move(helper_))
     {}
 
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index 7b6f4213cd3..3de757bfa3f 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -30,7 +30,7 @@
 #    include <openssl/sha.h>
 #endif
 
-#include <Poco/ByteOrder.h>
+#include <bit>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeString.h>
@@ -150,6 +150,13 @@ struct IntHash64Impl
 template<typename T, typename HashFunction>
 T combineHashesFunc(T t1, T t2)
 {
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+        T tmp;
+        reverseMemcpy(&tmp, &t1, sizeof(T));
+        t1 = tmp;
+        reverseMemcpy(&tmp, &t2, sizeof(T));
+        t2 = tmp;
+#endif
     T hashes[] = {t1, t2};
     return HashFunction::apply(reinterpret_cast<const char *>(hashes), 2 * sizeof(T));
 }
@@ -177,12 +184,16 @@ struct HalfMD5Impl
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
         return buf.uint64_data;        /// No need to flip bytes on big endian machines
 #else
-        return Poco::ByteOrder::flipBytes(static_cast<Poco::UInt64>(buf.uint64_data));        /// Compatibility with existing code. Cast need for old poco AND macos where UInt64 != uint64_t
+        return std::byteswap(buf.uint64_data);    /// Compatibility with existing code. Cast need for old poco AND macos where UInt64 != uint64_t
 #endif
     }
 
     static UInt64 combineHashes(UInt64 h1, UInt64 h2)
     {
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+        h1 = std::byteswap(h1);
+        h2 = std::byteswap(h2);
+#endif
         UInt64 hashes[] = {h1, h2};
         return apply(reinterpret_cast<const char *>(hashes), 16);
     }
@@ -322,6 +333,10 @@ struct SipHash64KeyedImpl
 
     static UInt64 combineHashesKeyed(const Key & key, UInt64 h1, UInt64 h2)
     {
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+        h1 = std::byteswap(h1);
+        h2 = std::byteswap(h2);
+#endif
         UInt64 hashes[] = {h1, h2};
         return applyKeyed(key, reinterpret_cast<const char *>(hashes), 2 * sizeof(UInt64));
     }
@@ -360,6 +375,13 @@ struct SipHash128KeyedImpl
 
     static UInt128 combineHashesKeyed(const Key & key, UInt128 h1, UInt128 h2)
     {
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+        UInt128 tmp;
+        reverseMemcpy(&tmp, &h1, sizeof(UInt128));
+        h1 = tmp;
+        reverseMemcpy(&tmp, &h2, sizeof(UInt128));
+        h2 = tmp;
+#endif
         UInt128 hashes[] = {h1, h2};
         return applyKeyed(key, reinterpret_cast<const char *>(hashes), 2 * sizeof(UInt128));
     }
@@ -395,6 +417,13 @@ struct SipHash128ReferenceKeyedImpl
 
     static UInt128 combineHashesKeyed(const Key & key, UInt128 h1, UInt128 h2)
     {
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+        UInt128 tmp;
+        reverseMemcpy(&tmp, &h1, sizeof(UInt128));
+        h1 = tmp;
+        reverseMemcpy(&tmp, &h2, sizeof(UInt128));
+        h2 = tmp;
+#endif
         UInt128 hashes[] = {h1, h2};
         return applyKeyed(key, reinterpret_cast<const char *>(hashes), 2 * sizeof(UInt128));
     }
@@ -465,6 +494,28 @@ struct GccMurmurHashImpl
     static constexpr bool use_int_hash_for_pods = false;
 };
 
+/// To be compatible with Default Partitioner in Kafka:
+///     murmur2: https://github.com/apache/kafka/blob/461c5cfe056db0951d9b74f5adc45973670404d7/clients/src/main/java/org/apache/kafka/common/utils/Utils.java#L480
+///     Default Partitioner: https://github.com/apache/kafka/blob/139f7709bd3f5926901a21e55043388728ccca78/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java#L328
+struct KafkaMurmurHashImpl
+{
+    static constexpr auto name = "kafkaMurmurHash";
+
+    using ReturnType = UInt32;
+
+    static UInt32 apply(const char * data, const size_t size)
+    {
+        return MurmurHash2(data, size, 0x9747b28cU) & 0x7fffffff;
+    }
+
+    static UInt32 combineHashes(UInt32 h1, UInt32 h2)
+    {
+        return IntHash32Impl::apply(h1) ^ h2;
+    }
+
+    static constexpr bool use_int_hash_for_pods = false;
+};
+
 struct MurmurHash3Impl32
 {
     static constexpr auto name = "murmurHash3_32";
@@ -757,23 +808,20 @@ struct ImplBLAKE3
     static constexpr auto name = "BLAKE3";
     enum { length = 32 };
 
-    #if !USE_BLAKE3
-    [[noreturn]] static void apply(const char * begin, const size_t size, unsigned char* out_char_data)
+#if !USE_BLAKE3
+    [[noreturn]] static void apply(const char * /*begin*/, const size_t /*size*/, unsigned char * /*out_char_data*/)
     {
-        UNUSED(begin);
-        UNUSED(size);
-        UNUSED(out_char_data);
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "BLAKE3 is not available. Rust code or BLAKE3 itself may be disabled.");
     }
-    #else
+#else
     static void apply(const char * begin, const size_t size, unsigned char* out_char_data)
     {
-        #if defined(MEMORY_SANITIZER)
+#    if defined(MEMORY_SANITIZER)
             auto err_msg = blake3_apply_shim_msan_compat(begin, safe_cast<uint32_t>(size), out_char_data);
             __msan_unpoison(out_char_data, length);
-        #else
+#    else
             auto err_msg = blake3_apply_shim(begin, safe_cast<uint32_t>(size), out_char_data);
-        #endif
+#    endif
         if (err_msg != nullptr)
         {
             auto err_st = std::string(err_msg);
@@ -781,7 +829,7 @@ struct ImplBLAKE3
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function returned error message: {}", err_st);
         }
     }
-    #endif
+#endif
 };
 
 template <typename Impl>
@@ -1216,7 +1264,7 @@ private:
     template <bool first>
     void executeArray(const KeyType & key, const IDataType * type, const IColumn * column, typename ColumnVector<ToType>::Container & vec_to) const
     {
-        const IDataType * nested_type = typeid_cast<const DataTypeArray *>(type)->getNestedType().get();
+        const IDataType * nested_type = typeid_cast<const DataTypeArray &>(*type).getNestedType().get();
 
         if (const ColumnArray * col_from = checkAndGetColumn<ColumnArray>(column))
         {
@@ -1698,6 +1746,7 @@ using FunctionMetroHash64 = FunctionAnyHash<ImplMetroHash64>;
 using FunctionMurmurHash2_32 = FunctionAnyHash<MurmurHash2Impl32>;
 using FunctionMurmurHash2_64 = FunctionAnyHash<MurmurHash2Impl64>;
 using FunctionGccMurmurHash = FunctionAnyHash<GccMurmurHashImpl>;
+using FunctionKafkaMurmurHash = FunctionAnyHash<KafkaMurmurHashImpl>;
 using FunctionMurmurHash3_32 = FunctionAnyHash<MurmurHash3Impl32>;
 using FunctionMurmurHash3_64 = FunctionAnyHash<MurmurHash3Impl64>;
 using FunctionMurmurHash3_128 = FunctionAnyHash<MurmurHash3Impl128>;
diff --git a/src/Functions/FunctionsHashingMisc.cpp b/src/Functions/FunctionsHashingMisc.cpp
index c1c3df1d53e..127c87ba940 100644
--- a/src/Functions/FunctionsHashingMisc.cpp
+++ b/src/Functions/FunctionsHashingMisc.cpp
@@ -15,15 +15,15 @@ REGISTER_FUNCTION(Hashing)
     factory.registerFunction<FunctionSipHash64Keyed>();
     factory.registerFunction<FunctionSipHash128>();
     factory.registerFunction<FunctionSipHash128Keyed>();
-    factory.registerFunction<FunctionSipHash128Reference>({
-        "Like [sipHash128](#hash_functions-siphash128) but implements the 128-bit algorithm from the original authors of SipHash.",
-        Documentation::Examples{{"hash", "SELECT hex(sipHash128Reference('foo', '\\x01', 3))"}},
-        Documentation::Categories{"Hash"}
+    factory.registerFunction<FunctionSipHash128Reference>(FunctionDocumentation{
+        .description="Like [sipHash128](#hash_functions-siphash128) but implements the 128-bit algorithm from the original authors of SipHash.",
+        .examples{{"hash", "SELECT hex(sipHash128Reference('foo', '\\x01', 3))", ""}},
+        .categories{"Hash"}
     });
-    factory.registerFunction<FunctionSipHash128ReferenceKeyed>({
-        "Same as [sipHash128Reference](#hash_functions-siphash128reference) but additionally takes an explicit key argument instead of using a fixed key.",
-        Documentation::Examples{{"hash", "SELECT hex(sipHash128ReferenceKeyed((506097522914230528, 1084818905618843912),'foo', '\\x01', 3));"}},
-        Documentation::Categories{"Hash"}
+    factory.registerFunction<FunctionSipHash128ReferenceKeyed>(FunctionDocumentation{
+        .description="Same as [sipHash128Reference](#hash_functions-siphash128reference) but additionally takes an explicit key argument instead of using a fixed key.",
+        .examples{{"hash", "SELECT hex(sipHash128ReferenceKeyed((506097522914230528, 1084818905618843912),'foo', '\\x01', 3));", ""}},
+        .categories{"Hash"}
     });
     factory.registerFunction<FunctionCityHash64>();
     factory.registerFunction<FunctionFarmFingerprint64>();
@@ -37,10 +37,10 @@ REGISTER_FUNCTION(Hashing)
     factory.registerFunction<FunctionXxHash32>();
     factory.registerFunction<FunctionXxHash64>();
     factory.registerFunction<FunctionXXH3>(
-        {
-            "Calculates value of XXH3 64-bit hash function. Refer to https://github.com/Cyan4973/xxHash for detailed documentation.",
-            Documentation::Examples{{"hash", "SELECT xxh3('ClickHouse')"}},
-            Documentation::Categories{"Hash"}
+        FunctionDocumentation{
+            .description="Calculates value of XXH3 64-bit hash function. Refer to https://github.com/Cyan4973/xxHash for detailed documentation.",
+            .examples{{"hash", "SELECT xxh3('ClickHouse')", ""}},
+            .categories{"Hash"}
         },
         FunctionFactory::CaseSensitive);
 
@@ -48,16 +48,16 @@ REGISTER_FUNCTION(Hashing)
 
 
     factory.registerFunction<FunctionBLAKE3>(
-    {
-        R"(
+    FunctionDocumentation{
+        .description=R"(
 Calculates BLAKE3 hash string and returns the resulting set of bytes as FixedString.
 This cryptographic hash-function is integrated into ClickHouse with BLAKE3 Rust library.
 The function is rather fast and shows approximately two times faster performance compared to SHA-2, while generating hashes of the same length as SHA-256.
 It returns a BLAKE3 hash as a byte array with type FixedString(32).
 )",
-        Documentation::Examples{
-            {"hash", "SELECT hex(BLAKE3('ABC'))"}},
-        Documentation::Categories{"Hash"}
+        .examples{
+            {"hash", "SELECT hex(BLAKE3('ABC'))", ""}},
+        .categories{"Hash"}
     },
     FunctionFactory::CaseSensitive);
 }
diff --git a/src/Functions/FunctionsHashingMurmur.cpp b/src/Functions/FunctionsHashingMurmur.cpp
index 9648c21dbf0..df1a945b967 100644
--- a/src/Functions/FunctionsHashingMurmur.cpp
+++ b/src/Functions/FunctionsHashingMurmur.cpp
@@ -17,5 +17,6 @@ REGISTER_FUNCTION(HashingMurmur)
     factory.registerFunction<FunctionMurmurHash3_64>();
     factory.registerFunction<FunctionMurmurHash3_128>();
     factory.registerFunction<FunctionGccMurmurHash>();
+    factory.registerFunction<FunctionKafkaMurmurHash>();
 }
 }
diff --git a/src/Functions/FunctionsJSON.cpp b/src/Functions/FunctionsJSON.cpp
index 5df0d1831af..fbd987577e9 100644
--- a/src/Functions/FunctionsJSON.cpp
+++ b/src/Functions/FunctionsJSON.cpp
@@ -1,1654 +1,10 @@
-#include <type_traits>
-#include <boost/tti/has_member_function.hpp>
-
-#include <base/range.h>
-
-#include <Common/CpuId.h>
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
-
-#include <Core/AccurateComparison.h>
-#include <Core/Settings.h>
-
-#include <Columns/ColumnConst.h>
-#include <Columns/ColumnLowCardinality.h>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnVector.h>
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnNullable.h>
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnTuple.h>
-
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeEnum.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeFixedString.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeNothing.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <DataTypes/DataTypeUUID.h>
-#include <DataTypes/DataTypesDecimal.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/Serializations/SerializationDecimal.h>
-
+#include <Functions/FunctionsJSON.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunction.h>
-#include <Common/JSONParsers/DummyJSONParser.h>
-#include <Common/JSONParsers/SimdJSONParser.h>
-#include <Common/JSONParsers/RapidJSONParser.h>
-#include <Functions/FunctionHelpers.h>
-
-#include <IO/readDecimalText.h>
-#include <Interpreters/Context.h>
-
-
-#include "config.h"
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int ILLEGAL_COLUMN;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
-
-template <typename T>
-concept HasIndexOperator = requires (T t)
-{
-    t[0];
-};
-
-/// Functions to parse JSONs and extract values from it.
-/// The first argument of all these functions gets a JSON,
-/// after that there are any number of arguments specifying path to a desired part from the JSON's root.
-/// For example,
-/// select JSONExtractInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1) = -100
-
-class FunctionJSONHelpers
-{
-public:
-    template <typename Name, template<typename> typename Impl, class JSONParser>
-    class Executor
-    {
-    public:
-        static ColumnPtr run(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
-        {
-            MutableColumnPtr to{result_type->createColumn()};
-            to->reserve(input_rows_count);
-
-            if (arguments.empty())
-                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least one argument", String(Name::name));
-
-            const auto & first_column = arguments[0];
-            if (!isString(first_column.type))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                                "The first argument of function {} should be a string containing JSON, illegal type: "
-                                "{}", String(Name::name), first_column.type->getName());
-
-            const ColumnPtr & arg_json = first_column.column;
-            const auto * col_json_const = typeid_cast<const ColumnConst *>(arg_json.get());
-            const auto * col_json_string
-                = typeid_cast<const ColumnString *>(col_json_const ? col_json_const->getDataColumnPtr().get() : arg_json.get());
-
-            if (!col_json_string)
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {}", arg_json->getName());
-
-            const ColumnString::Chars & chars = col_json_string->getChars();
-            const ColumnString::Offsets & offsets = col_json_string->getOffsets();
-
-            size_t num_index_arguments = Impl<JSONParser>::getNumberOfIndexArguments(arguments);
-            std::vector<Move> moves = prepareMoves(Name::name, arguments, 1, num_index_arguments);
-
-            /// Preallocate memory in parser if necessary.
-            JSONParser parser;
-            if constexpr (has_member_function_reserve<void (JSONParser::*)(size_t)>::value)
-            {
-                size_t max_size = calculateMaxSize(offsets);
-                if (max_size)
-                    parser.reserve(max_size);
-            }
-
-            Impl<JSONParser> impl;
-
-            /// prepare() does Impl-specific preparation before handling each row.
-            if constexpr (has_member_function_prepare<void (Impl<JSONParser>::*)(const char *, const ColumnsWithTypeAndName &, const DataTypePtr &)>::value)
-                impl.prepare(Name::name, arguments, result_type);
-
-            using Element = typename JSONParser::Element;
-
-            Element document;
-            bool document_ok = false;
-            if (col_json_const)
-            {
-                std::string_view json{reinterpret_cast<const char *>(chars.data()), offsets[0] - 1};
-                document_ok = parser.parse(json, document);
-            }
-
-            for (const auto i : collections::range(0, input_rows_count))
-            {
-                if (!col_json_const)
-                {
-                    std::string_view json{reinterpret_cast<const char *>(&chars[offsets[i - 1]]), offsets[i] - offsets[i - 1] - 1};
-                    document_ok = parser.parse(json, document);
-                }
-
-                bool added_to_column = false;
-                if (document_ok)
-                {
-                    /// Perform moves.
-                    Element element;
-                    std::string_view last_key;
-                    bool moves_ok = performMoves<JSONParser>(arguments, i, document, moves, element, last_key);
-
-                    if (moves_ok)
-                        added_to_column = impl.insertResultToColumn(*to, element, last_key);
-                }
-
-                /// We add default value (=null or zero) if something goes wrong, we don't throw exceptions in these JSON functions.
-                if (!added_to_column)
-                    to->insertDefault();
-            }
-            return to;
-        }
-    };
-
-private:
-    BOOST_TTI_HAS_MEMBER_FUNCTION(reserve)
-    BOOST_TTI_HAS_MEMBER_FUNCTION(prepare)
-
-    /// Represents a move of a JSON iterator described by a single argument passed to a JSON function.
-    /// For example, the call JSONExtractInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1)
-    /// contains two moves: {MoveType::ConstKey, "b"} and {MoveType::ConstIndex, 1}.
-    /// Keys and indices can be nonconst, in this case they are calculated for each row.
-    enum class MoveType
-    {
-        Key,
-        Index,
-        ConstKey,
-        ConstIndex,
-    };
-
-    struct Move
-    {
-        explicit Move(MoveType type_, size_t index_ = 0) : type(type_), index(index_) {}
-        Move(MoveType type_, const String & key_) : type(type_), key(key_) {}
-        MoveType type;
-        size_t index = 0;
-        String key;
-    };
-
-    static std::vector<FunctionJSONHelpers::Move> prepareMoves(
-        const char * function_name,
-        const ColumnsWithTypeAndName & columns,
-        size_t first_index_argument,
-        size_t num_index_arguments)
-    {
-        std::vector<Move> moves;
-        moves.reserve(num_index_arguments);
-        for (const auto i : collections::range(first_index_argument, first_index_argument + num_index_arguments))
-        {
-            const auto & column = columns[i];
-            if (!isString(column.type) && !isNativeInteger(column.type))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                                "The argument {} of function {} should be a string specifying key "
-                                "or an integer specifying index, illegal type: {}",
-                                std::to_string(i + 1), String(function_name), column.type->getName());
-
-            if (column.column && isColumnConst(*column.column))
-            {
-                const auto & column_const = assert_cast<const ColumnConst &>(*column.column);
-                if (isString(column.type))
-                    moves.emplace_back(MoveType::ConstKey, column_const.getValue<String>());
-                else
-                    moves.emplace_back(MoveType::ConstIndex, column_const.getInt(0));
-            }
-            else
-            {
-                if (isString(column.type))
-                    moves.emplace_back(MoveType::Key, "");
-                else
-                    moves.emplace_back(MoveType::Index, 0);
-            }
-        }
-        return moves;
-    }
-
-
-    /// Performs moves of types MoveType::Index and MoveType::ConstIndex.
-    template <typename JSONParser>
-    static bool performMoves(const ColumnsWithTypeAndName & arguments, size_t row,
-                             const typename JSONParser::Element & document, const std::vector<Move> & moves,
-                             typename JSONParser::Element & element, std::string_view & last_key)
-    {
-        typename JSONParser::Element res_element = document;
-        std::string_view key;
-
-        for (size_t j = 0; j != moves.size(); ++j)
-        {
-            switch (moves[j].type)
-            {
-                case MoveType::ConstIndex:
-                {
-                    if (!moveToElementByIndex<JSONParser>(res_element, static_cast<int>(moves[j].index), key))
-                        return false;
-                    break;
-                }
-                case MoveType::ConstKey:
-                {
-                    key = moves[j].key;
-                    if (!moveToElementByKey<JSONParser>(res_element, key))
-                        return false;
-                    break;
-                }
-                case MoveType::Index:
-                {
-                    Int64 index = (*arguments[j + 1].column)[row].get<Int64>();
-                    if (!moveToElementByIndex<JSONParser>(res_element, static_cast<int>(index), key))
-                        return false;
-                    break;
-                }
-                case MoveType::Key:
-                {
-                    key = (*arguments[j + 1].column).getDataAt(row).toView();
-                    if (!moveToElementByKey<JSONParser>(res_element, key))
-                        return false;
-                    break;
-                }
-            }
-        }
-
-        element = res_element;
-        last_key = key;
-        return true;
-    }
-
-    template <typename JSONParser>
-    static bool moveToElementByIndex(typename JSONParser::Element & element, int index, std::string_view & out_key)
-    {
-        if (element.isArray())
-        {
-            auto array = element.getArray();
-            if (index >= 0)
-                --index;
-            else
-                index += array.size();
-
-            if (static_cast<size_t>(index) >= array.size())
-                return false;
-            element = array[index];
-            out_key = {};
-            return true;
-        }
-
-        if constexpr (HasIndexOperator<typename JSONParser::Object>)
-        {
-            if (element.isObject())
-            {
-                auto object = element.getObject();
-                if (index >= 0)
-                    --index;
-                else
-                    index += object.size();
-
-                if (static_cast<size_t>(index) >= object.size())
-                    return false;
-                std::tie(out_key, element) = object[index];
-                return true;
-            }
-        }
-
-        return {};
-    }
-
-    /// Performs moves of types MoveType::Key and MoveType::ConstKey.
-    template <typename JSONParser>
-    static bool moveToElementByKey(typename JSONParser::Element & element, std::string_view key)
-    {
-        if (!element.isObject())
-            return false;
-        auto object = element.getObject();
-        return object.find(key, element);
-    }
-
-    static size_t calculateMaxSize(const ColumnString::Offsets & offsets)
-    {
-        size_t max_size = 0;
-        for (const auto i : collections::range(0, offsets.size()))
-        {
-            size_t size = offsets[i] - offsets[i - 1];
-            if (max_size < size)
-                max_size = size;
-        }
-        if (max_size)
-            --max_size;
-        return max_size;
-    }
-
-};
-
-
-template <typename Name, template<typename> typename Impl>
-class ExecutableFunctionJSON : public IExecutableFunction, WithContext
-{
-
-public:
-    explicit ExecutableFunctionJSON(const NullPresence & null_presence_, bool allow_simdjson_, const DataTypePtr & json_return_type_)
-        : null_presence(null_presence_), allow_simdjson(allow_simdjson_), json_return_type(json_return_type_)
-    {
-    }
-
-    String getName() const override { return Name::name; }
-    bool useDefaultImplementationForNulls() const override { return false; }
-    bool useDefaultImplementationForConstants() const override { return true; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        if (null_presence.has_null_constant)
-            return result_type->createColumnConstWithDefaultValue(input_rows_count);
-
-        ColumnsWithTypeAndName temporary_columns = null_presence.has_nullable ? createBlockWithNestedColumns(arguments) : arguments;
-        ColumnPtr temporary_result = chooseAndRunJSONParser(temporary_columns, json_return_type, input_rows_count);
-        if (null_presence.has_nullable)
-            return wrapInNullable(temporary_result, arguments, result_type, input_rows_count);
-        return temporary_result;
-    }
-
-private:
-
-    ColumnPtr
-    chooseAndRunJSONParser(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
-    {
-#if USE_SIMDJSON
-        if (allow_simdjson)
-            return FunctionJSONHelpers::Executor<Name, Impl, SimdJSONParser>::run(arguments, result_type, input_rows_count);
-#endif
-
-#if USE_RAPIDJSON
-        return FunctionJSONHelpers::Executor<Name, Impl, RapidJSONParser>::run(arguments, result_type, input_rows_count);
-#else
-        return FunctionJSONHelpers::Executor<Name, Impl, DummyJSONParser>::run(arguments, result_type, input_rows_count);
-#endif
-    }
-
-    NullPresence null_presence;
-    bool allow_simdjson;
-    DataTypePtr json_return_type;
-};
-
-
-template <typename Name, template<typename> typename Impl>
-class FunctionBaseFunctionJSON : public IFunctionBase
-{
-public:
-    explicit FunctionBaseFunctionJSON(
-        const NullPresence & null_presence_,
-        bool allow_simdjson_,
-        DataTypes argument_types_,
-        DataTypePtr return_type_,
-        DataTypePtr json_return_type_)
-        : null_presence(null_presence_)
-        , allow_simdjson(allow_simdjson_)
-        , argument_types(std::move(argument_types_))
-        , return_type(std::move(return_type_))
-        , json_return_type(std::move(json_return_type_))
-    {
-    }
-
-    String getName() const override { return Name::name; }
-
-    const DataTypes & getArgumentTypes() const override
-    {
-        return argument_types;
-    }
-
-    const DataTypePtr & getResultType() const override
-    {
-        return return_type;
-    }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-
-    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
-    {
-        return std::make_unique<ExecutableFunctionJSON<Name, Impl>>(null_presence, allow_simdjson, json_return_type);
-    }
-
-private:
-    NullPresence null_presence;
-    bool allow_simdjson;
-    DataTypes argument_types;
-    DataTypePtr return_type;
-    DataTypePtr json_return_type;
-};
-
-
-/// We use IFunctionOverloadResolver instead of IFunction to handle non-default NULL processing.
-/// Both NULL and JSON NULL should generate NULL value. If any argument is NULL, return NULL.
-template <typename Name, template<typename> typename Impl>
-class JSONOverloadResolver : public IFunctionOverloadResolver, WithContext
-{
-public:
-    static constexpr auto name = Name::name;
-
-    String getName() const override { return name; }
-
-    static FunctionOverloadResolverPtr create(ContextPtr context_)
-    {
-        return std::make_unique<JSONOverloadResolver>(context_);
-    }
-
-    explicit JSONOverloadResolver(ContextPtr context_) : WithContext(context_) {}
-
-    bool isVariadic() const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
-    bool useDefaultImplementationForNulls() const override { return false; }
-
-    FunctionBasePtr build(const ColumnsWithTypeAndName & arguments) const override
-    {
-        bool has_nothing_argument = false;
-        for (const auto & arg : arguments)
-            has_nothing_argument |= isNothing(arg.type);
-
-        DataTypePtr json_return_type = Impl<DummyJSONParser>::getReturnType(Name::name, createBlockWithNestedColumns(arguments));
-        NullPresence null_presence = getNullPresense(arguments);
-        DataTypePtr return_type;
-        if (has_nothing_argument)
-            return_type = std::make_shared<DataTypeNothing>();
-        else if (null_presence.has_null_constant)
-            return_type = makeNullable(std::make_shared<DataTypeNothing>());
-        else if (null_presence.has_nullable)
-            return_type = makeNullable(json_return_type);
-        else
-            return_type = json_return_type;
-
-        /// Top-level LowCardinality columns are processed outside JSON parser.
-        json_return_type = removeLowCardinality(json_return_type);
-
-        DataTypes argument_types;
-        argument_types.reserve(arguments.size());
-        for (const auto & argument : arguments)
-            argument_types.emplace_back(argument.type);
-        return std::make_unique<FunctionBaseFunctionJSON<Name, Impl>>(
-                null_presence, getContext()->getSettingsRef().allow_simdjson, argument_types, return_type, json_return_type);
-    }
-};
-
-
-struct NameJSONHas { static constexpr auto name{"JSONHas"}; };
-struct NameIsValidJSON { static constexpr auto name{"isValidJSON"}; };
-struct NameJSONLength { static constexpr auto name{"JSONLength"}; };
-struct NameJSONKey { static constexpr auto name{"JSONKey"}; };
-struct NameJSONType { static constexpr auto name{"JSONType"}; };
-struct NameJSONExtractInt { static constexpr auto name{"JSONExtractInt"}; };
-struct NameJSONExtractUInt { static constexpr auto name{"JSONExtractUInt"}; };
-struct NameJSONExtractFloat { static constexpr auto name{"JSONExtractFloat"}; };
-struct NameJSONExtractBool { static constexpr auto name{"JSONExtractBool"}; };
-struct NameJSONExtractString { static constexpr auto name{"JSONExtractString"}; };
-struct NameJSONExtract { static constexpr auto name{"JSONExtract"}; };
-struct NameJSONExtractKeysAndValues { static constexpr auto name{"JSONExtractKeysAndValues"}; };
-struct NameJSONExtractRaw { static constexpr auto name{"JSONExtractRaw"}; };
-struct NameJSONExtractArrayRaw { static constexpr auto name{"JSONExtractArrayRaw"}; };
-struct NameJSONExtractKeysAndValuesRaw { static constexpr auto name{"JSONExtractKeysAndValuesRaw"}; };
-struct NameJSONExtractKeys { static constexpr auto name{"JSONExtractKeys"}; };
-
-
-template <typename JSONParser>
-class JSONHasImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &) { return std::make_shared<DataTypeUInt8>(); }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element &, std::string_view)
-    {
-        ColumnVector<UInt8> & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
-        col_vec.insertValue(1);
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class IsValidJSONImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
-    {
-        if (arguments.size() != 1)
-        {
-            /// IsValidJSON() shouldn't get parameters other than JSON.
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} needs exactly one argument",
-                            String(function_name));
-        }
-        return std::make_shared<DataTypeUInt8>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName &) { return 0; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element &, std::string_view)
-    {
-        /// This function is called only if JSON is valid.
-        /// If JSON isn't valid then `FunctionJSON::Executor::run()` adds default value (=zero) to `dest` without calling this function.
-        ColumnVector<UInt8> & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
-        col_vec.insertValue(1);
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONLengthImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeUInt64>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        size_t size;
-        if (element.isArray())
-            size = element.getArray().size();
-        else if (element.isObject())
-            size = element.getObject().size();
-        else
-            return false;
-
-        ColumnVector<UInt64> & col_vec = assert_cast<ColumnVector<UInt64> &>(dest);
-        col_vec.insertValue(size);
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONKeyImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element &, std::string_view last_key)
-    {
-        if (last_key.empty())
-            return false;
-        ColumnString & col_str = assert_cast<ColumnString &>(dest);
-        col_str.insertData(last_key.data(), last_key.size());
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONTypeImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        static const std::vector<std::pair<String, Int8>> values = {
-            {"Array", '['},
-            {"Object", '{'},
-            {"String", '"'},
-            {"Int64", 'i'},
-            {"UInt64", 'u'},
-            {"Double", 'd'},
-            {"Bool", 'b'},
-            {"Null", 0}, /// the default value for the column.
-        };
-        return std::make_shared<DataTypeEnum<Int8>>(values);
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        UInt8 type;
-        switch (element.type())
-        {
-            case ElementType::INT64:
-                type = 'i';
-                break;
-            case ElementType::UINT64:
-                type = 'u';
-                break;
-            case ElementType::DOUBLE:
-                type = 'd';
-                break;
-            case ElementType::STRING:
-                type = '"';
-                break;
-            case ElementType::ARRAY:
-                type = '[';
-                break;
-            case ElementType::OBJECT:
-                type = '{';
-                break;
-            case ElementType::BOOL:
-                type = 'b';
-                break;
-            case ElementType::NULL_VALUE:
-                type = 0;
-                break;
-        }
-
-        ColumnVector<Int8> & col_vec = assert_cast<ColumnVector<Int8> &>(dest);
-        col_vec.insertValue(type);
-        return true;
-    }
-};
-
-
-template <typename JSONParser, typename NumberType, bool convert_bool_to_integer = false>
-class JSONExtractNumericImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeNumber<NumberType>>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        NumberType value;
-
-        switch (element.type())
-        {
-            case ElementType::DOUBLE:
-                if constexpr (std::is_floating_point_v<NumberType>)
-                {
-                    /// We permit inaccurate conversion of double to float.
-                    /// Example: double 0.1 from JSON is not representable in float.
-                    /// But it will be more convenient for user to perform conversion.
-                    value = static_cast<NumberType>(element.getDouble());
-                }
-                else if (!accurate::convertNumeric<Float64, NumberType, false>(element.getDouble(), value))
-                    return false;
-                break;
-            case ElementType::UINT64:
-                if (!accurate::convertNumeric<UInt64, NumberType, false>(element.getUInt64(), value))
-                    return false;
-                break;
-            case ElementType::INT64:
-                if (!accurate::convertNumeric<Int64, NumberType, false>(element.getInt64(), value))
-                    return false;
-                break;
-            case ElementType::BOOL:
-                if constexpr (is_integer<NumberType> && convert_bool_to_integer)
-                {
-                    value = static_cast<NumberType>(element.getBool());
-                    break;
-                }
-                return false;
-            case ElementType::STRING:
-            {
-                auto rb = ReadBufferFromMemory{element.getString()};
-                if constexpr (std::is_floating_point_v<NumberType>)
-                {
-                    if (!tryReadFloatText(value, rb) || !rb.eof())
-                        return false;
-                }
-                else
-                {
-                    if (tryReadIntText(value, rb) && rb.eof())
-                        break;
-
-                    /// Try to parse float and convert it to integer.
-                    Float64 tmp_float;
-                    rb.position() = rb.buffer().begin();
-                    if (!tryReadFloatText(tmp_float, rb) || !rb.eof())
-                        return false;
-
-                    if (!accurate::convertNumeric<Float64, NumberType, false>(tmp_float, value))
-                        return false;
-                }
-                break;
-            }
-            default:
-                return false;
-        }
-
-        if (dest.getDataType() == TypeIndex::LowCardinality)
-        {
-            ColumnLowCardinality & col_low = assert_cast<ColumnLowCardinality &>(dest);
-            col_low.insertData(reinterpret_cast<const char *>(&value), sizeof(value));
-        }
-        else
-        {
-            auto & col_vec = assert_cast<ColumnVector<NumberType> &>(dest);
-            col_vec.insertValue(value);
-        }
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-using JSONExtractInt8Impl = JSONExtractNumericImpl<JSONParser, Int8>;
-template <typename JSONParser>
-using JSONExtractUInt8Impl = JSONExtractNumericImpl<JSONParser, UInt8>;
-template <typename JSONParser>
-using JSONExtractInt16Impl = JSONExtractNumericImpl<JSONParser, Int16>;
-template <typename JSONParser>
-using JSONExtractUInt16Impl = JSONExtractNumericImpl<JSONParser, UInt16>;
-template <typename JSONParser>
-using JSONExtractInt32Impl = JSONExtractNumericImpl<JSONParser, Int32>;
-template <typename JSONParser>
-using JSONExtractUInt32Impl = JSONExtractNumericImpl<JSONParser, UInt32>;
-template <typename JSONParser>
-using JSONExtractInt64Impl = JSONExtractNumericImpl<JSONParser, Int64>;
-template <typename JSONParser>
-using JSONExtractUInt64Impl = JSONExtractNumericImpl<JSONParser, UInt64>;
-template <typename JSONParser>
-using JSONExtractInt128Impl = JSONExtractNumericImpl<JSONParser, Int128>;
-template <typename JSONParser>
-using JSONExtractUInt128Impl = JSONExtractNumericImpl<JSONParser, UInt128>;
-template <typename JSONParser>
-using JSONExtractInt256Impl = JSONExtractNumericImpl<JSONParser, Int256>;
-template <typename JSONParser>
-using JSONExtractUInt256Impl = JSONExtractNumericImpl<JSONParser, UInt256>;
-template <typename JSONParser>
-using JSONExtractFloat32Impl = JSONExtractNumericImpl<JSONParser, Float32>;
-template <typename JSONParser>
-using JSONExtractFloat64Impl = JSONExtractNumericImpl<JSONParser, Float64>;
-template <typename JSONParser>
-using JSONExtractDecimal32Impl = JSONExtractNumericImpl<JSONParser, Decimal32>;
-template <typename JSONParser>
-using JSONExtractDecimal64Impl = JSONExtractNumericImpl<JSONParser, Decimal64>;
-template <typename JSONParser>
-using JSONExtractDecimal128Impl = JSONExtractNumericImpl<JSONParser, Decimal128>;
-template <typename JSONParser>
-using JSONExtractDecimal256Impl = JSONExtractNumericImpl<JSONParser, Decimal256>;
-
-
-template <typename JSONParser>
-class JSONExtractBoolImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeUInt8>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        bool value;
-        switch (element.type())
-        {
-            case ElementType::BOOL:
-                value = element.getBool();
-                break;
-            case ElementType::INT64:
-                value = element.getInt64() != 0;
-                break;
-            case ElementType::UINT64:
-                value = element.getUInt64() != 0;
-                break;
-            default:
-                return false;
-        }
-
-        auto & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
-        col_vec.insertValue(static_cast<UInt8>(value));
-        return true;
-    }
-};
-
-template <typename JSONParser>
-class JSONExtractRawImpl;
-
-template <typename JSONParser>
-class JSONExtractStringImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        if (element.isNull())
-            return false;
-
-        if (!element.isString())
-            return JSONExtractRawImpl<JSONParser>::insertResultToColumn(dest, element, {});
-
-        auto str = element.getString();
-
-        if (dest.getDataType() == TypeIndex::LowCardinality)
-        {
-            ColumnLowCardinality & col_low = assert_cast<ColumnLowCardinality &>(dest);
-            col_low.insertData(str.data(), str.size());
-        }
-        else
-        {
-            ColumnString & col_str = assert_cast<ColumnString &>(dest);
-            col_str.insertData(str.data(), str.size());
-        }
-        return true;
-    }
-};
-
-/// Nodes of the extract tree. We need the extract tree to extract from JSON complex values containing array, tuples or nullables.
-template <typename JSONParser>
-struct JSONExtractTree
-{
-    using Element = typename JSONParser::Element;
-
-    class Node
-    {
-    public:
-        Node() = default;
-        virtual ~Node() = default;
-        virtual bool insertResultToColumn(IColumn &, const Element &) = 0;
-    };
-
-    template <typename NumberType>
-    class NumericNode : public Node
-    {
-    public:
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            return JSONExtractNumericImpl<JSONParser, NumberType, true>::insertResultToColumn(dest, element, {});
-        }
-    };
-
-    class LowCardinalityFixedStringNode : public Node
-    {
-    public:
-        explicit LowCardinalityFixedStringNode(const size_t fixed_length_) : fixed_length(fixed_length_) { }
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            // If element is an object we delegate the insertion to JSONExtractRawImpl
-            if (element.isObject())
-                return JSONExtractRawImpl<JSONParser>::insertResultToLowCardinalityFixedStringColumn(dest, element, fixed_length);
-            else if (!element.isString())
-                return false;
-
-            auto str = element.getString();
-            if (str.size() > fixed_length)
-                return false;
-
-            // For the non low cardinality case of FixedString, the padding is done in the FixedString Column implementation.
-            // In order to avoid having to pass the data to a FixedString Column and read it back (which would slow down the execution)
-            // the data is padded here and written directly to the Low Cardinality Column
-            if (str.size() == fixed_length)
-            {
-                assert_cast<ColumnLowCardinality &>(dest).insertData(str.data(), str.size());
-            }
-            else
-            {
-                String padded_str(str);
-                padded_str.resize(fixed_length, '\0');
-
-                assert_cast<ColumnLowCardinality &>(dest).insertData(padded_str.data(), padded_str.size());
-            }
-            return true;
-        }
-
-    private:
-        const size_t fixed_length;
-    };
-
-    class UUIDNode : public Node
-    {
-    public:
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            if (!element.isString())
-                return false;
-
-            auto uuid = parseFromString<UUID>(element.getString());
-            if (dest.getDataType() == TypeIndex::LowCardinality)
-            {
-                ColumnLowCardinality & col_low = assert_cast<ColumnLowCardinality &>(dest);
-                col_low.insertData(reinterpret_cast<const char *>(&uuid), sizeof(uuid));
-            }
-            else
-            {
-                assert_cast<ColumnUUID &>(dest).insert(uuid);
-            }
-            return true;
-        }
-    };
-
-    template <typename DecimalType>
-    class DecimalNode : public Node
-    {
-    public:
-        explicit DecimalNode(DataTypePtr data_type_) : data_type(data_type_) {}
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            const auto * type = assert_cast<const DataTypeDecimal<DecimalType> *>(data_type.get());
-
-            DecimalType value{};
-
-            switch (element.type())
-            {
-                case ElementType::DOUBLE:
-                    value = convertToDecimal<DataTypeNumber<Float64>, DataTypeDecimal<DecimalType>>(
-                        element.getDouble(), type->getScale());
-                    break;
-                case ElementType::UINT64:
-                    value = convertToDecimal<DataTypeNumber<UInt64>, DataTypeDecimal<DecimalType>>(
-                        element.getUInt64(), type->getScale());
-                    break;
-                case ElementType::INT64:
-                    value = convertToDecimal<DataTypeNumber<Int64>, DataTypeDecimal<DecimalType>>(
-                        element.getInt64(), type->getScale());
-                    break;
-                case ElementType::STRING: {
-                    auto rb = ReadBufferFromMemory{element.getString()};
-                    if (!SerializationDecimal<DecimalType>::tryReadText(value, rb, DecimalUtils::max_precision<DecimalType>, type->getScale()))
-                        return false;
-                    break;
-                }
-                default:
-                    return false;
-            }
-
-            assert_cast<ColumnDecimal<DecimalType> &>(dest).insertValue(value);
-            return true;
-        }
-
-    private:
-        DataTypePtr data_type;
-    };
-
-    class StringNode : public Node
-    {
-    public:
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            return JSONExtractStringImpl<JSONParser>::insertResultToColumn(dest, element, {});
-        }
-    };
-
-    class FixedStringNode : public Node
-    {
-    public:
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            if (element.isNull())
-                return false;
-
-            if (!element.isString())
-                return JSONExtractRawImpl<JSONParser>::insertResultToFixedStringColumn(dest, element, {});
-
-            auto str = element.getString();
-            auto & col_str = assert_cast<ColumnFixedString &>(dest);
-            if (str.size() > col_str.getN())
-                return false;
-            col_str.insertData(str.data(), str.size());
-
-            return true;
-        }
-    };
-
-    template <typename Type>
-    class EnumNode : public Node
-    {
-    public:
-        explicit EnumNode(const std::vector<std::pair<String, Type>> & name_value_pairs_) : name_value_pairs(name_value_pairs_)
-        {
-            for (const auto & name_value_pair : name_value_pairs)
-            {
-                name_to_value_map.emplace(name_value_pair.first, name_value_pair.second);
-                only_values.emplace(name_value_pair.second);
-            }
-        }
-
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            auto & col_vec = assert_cast<ColumnVector<Type> &>(dest);
-
-            if (element.isInt64())
-            {
-                Type value;
-                if (!accurate::convertNumeric(element.getInt64(), value) || !only_values.contains(value))
-                    return false;
-                col_vec.insertValue(value);
-                return true;
-            }
-
-            if (element.isUInt64())
-            {
-                Type value;
-                if (!accurate::convertNumeric(element.getUInt64(), value) || !only_values.contains(value))
-                    return false;
-                col_vec.insertValue(value);
-                return true;
-            }
-
-            if (element.isString())
-            {
-                auto value = name_to_value_map.find(element.getString());
-                if (value == name_to_value_map.end())
-                    return false;
-                col_vec.insertValue(value->second);
-                return true;
-            }
-
-            return false;
-        }
-
-    private:
-        std::vector<std::pair<String, Type>> name_value_pairs;
-        std::unordered_map<std::string_view, Type> name_to_value_map;
-        std::unordered_set<Type> only_values;
-    };
-
-    class NullableNode : public Node
-    {
-    public:
-        explicit NullableNode(std::unique_ptr<Node> nested_) : nested(std::move(nested_)) {}
-
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            ColumnNullable & col_null = assert_cast<ColumnNullable &>(dest);
-            if (!nested->insertResultToColumn(col_null.getNestedColumn(), element))
-                return false;
-            col_null.getNullMapColumn().insertValue(0);
-            return true;
-        }
-
-    private:
-        std::unique_ptr<Node> nested;
-    };
-
-    class ArrayNode : public Node
-    {
-    public:
-        explicit ArrayNode(std::unique_ptr<Node> nested_) : nested(std::move(nested_)) {}
-
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            if (!element.isArray())
-                return false;
-
-            auto array = element.getArray();
-
-            ColumnArray & col_arr = assert_cast<ColumnArray &>(dest);
-            auto & data = col_arr.getData();
-            size_t old_size = data.size();
-            bool were_valid_elements = false;
-
-            for (auto value : array)
-            {
-                if (nested->insertResultToColumn(data, value))
-                    were_valid_elements = true;
-                else
-                    data.insertDefault();
-            }
-
-            if (!were_valid_elements)
-            {
-                data.popBack(data.size() - old_size);
-                return false;
-            }
-
-            col_arr.getOffsets().push_back(data.size());
-            return true;
-        }
-
-    private:
-        std::unique_ptr<Node> nested;
-    };
-
-    class TupleNode : public Node
-    {
-    public:
-        TupleNode(std::vector<std::unique_ptr<Node>> nested_, const std::vector<String> & explicit_names_) : nested(std::move(nested_)), explicit_names(explicit_names_)
-        {
-            for (size_t i = 0; i != explicit_names.size(); ++i)
-                name_to_index_map.emplace(explicit_names[i], i);
-        }
-
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            ColumnTuple & tuple = assert_cast<ColumnTuple &>(dest);
-            size_t old_size = dest.size();
-            bool were_valid_elements = false;
-
-            auto set_size = [&](size_t size)
-            {
-                for (size_t i = 0; i != tuple.tupleSize(); ++i)
-                {
-                    auto & col = tuple.getColumn(i);
-                    if (col.size() != size)
-                    {
-                        if (col.size() > size)
-                            col.popBack(col.size() - size);
-                        else
-                            while (col.size() < size)
-                                col.insertDefault();
-                    }
-                }
-            };
-
-            if (element.isArray())
-            {
-                auto array = element.getArray();
-                auto it = array.begin();
-
-                for (size_t index = 0; (index != nested.size()) && (it != array.end()); ++index)
-                {
-                    if (nested[index]->insertResultToColumn(tuple.getColumn(index), *it++))
-                        were_valid_elements = true;
-                    else
-                        tuple.getColumn(index).insertDefault();
-                }
-
-                set_size(old_size + static_cast<size_t>(were_valid_elements));
-                return were_valid_elements;
-            }
-
-            if (element.isObject())
-            {
-                auto object = element.getObject();
-                if (name_to_index_map.empty())
-                {
-                    auto it = object.begin();
-                    for (size_t index = 0; (index != nested.size()) && (it != object.end()); ++index)
-                    {
-                        if (nested[index]->insertResultToColumn(tuple.getColumn(index), (*it++).second))
-                            were_valid_elements = true;
-                        else
-                            tuple.getColumn(index).insertDefault();
-                    }
-                }
-                else
-                {
-                    for (const auto & [key, value] : object)
-                    {
-                        auto index = name_to_index_map.find(key);
-                        if (index != name_to_index_map.end())
-                        {
-                            if (nested[index->second]->insertResultToColumn(tuple.getColumn(index->second), value))
-                                were_valid_elements = true;
-                        }
-                    }
-                }
-
-                set_size(old_size + static_cast<size_t>(were_valid_elements));
-                return were_valid_elements;
-            }
-
-            return false;
-        }
-
-    private:
-        std::vector<std::unique_ptr<Node>> nested;
-        std::vector<String> explicit_names;
-        std::unordered_map<std::string_view, size_t> name_to_index_map;
-    };
-
-    static std::unique_ptr<Node> build(const char * function_name, const DataTypePtr & type)
-    {
-        switch (type->getTypeId())
-        {
-            case TypeIndex::UInt8: return std::make_unique<NumericNode<UInt8>>();
-            case TypeIndex::UInt16: return std::make_unique<NumericNode<UInt16>>();
-            case TypeIndex::UInt32: return std::make_unique<NumericNode<UInt32>>();
-            case TypeIndex::UInt64: return std::make_unique<NumericNode<UInt64>>();
-            case TypeIndex::UInt128: return std::make_unique<NumericNode<UInt128>>();
-            case TypeIndex::UInt256: return std::make_unique<NumericNode<UInt256>>();
-            case TypeIndex::Int8: return std::make_unique<NumericNode<Int8>>();
-            case TypeIndex::Int16: return std::make_unique<NumericNode<Int16>>();
-            case TypeIndex::Int32: return std::make_unique<NumericNode<Int32>>();
-            case TypeIndex::Int64: return std::make_unique<NumericNode<Int64>>();
-            case TypeIndex::Int128: return std::make_unique<NumericNode<Int128>>();
-            case TypeIndex::Int256: return std::make_unique<NumericNode<Int256>>();
-            case TypeIndex::Float32: return std::make_unique<NumericNode<Float32>>();
-            case TypeIndex::Float64: return std::make_unique<NumericNode<Float64>>();
-            case TypeIndex::String: return std::make_unique<StringNode>();
-            case TypeIndex::FixedString: return std::make_unique<FixedStringNode>();
-            case TypeIndex::UUID: return std::make_unique<UUIDNode>();
-            case TypeIndex::LowCardinality:
-            {
-                // The low cardinality case is treated in two different ways:
-                // For FixedString type, an especial class is implemented for inserting the data in the destination column,
-                // as the string length must be passed in order to check and pad the incoming data.
-                // For the rest of low cardinality types, the insertion is done in their corresponding class, adapting the data
-                // as needed for the insertData function of the ColumnLowCardinality.
-                auto dictionary_type = typeid_cast<const DataTypeLowCardinality *>(type.get())->getDictionaryType();
-                if ((*dictionary_type).getTypeId() == TypeIndex::FixedString)
-                {
-                    auto fixed_length = typeid_cast<const DataTypeFixedString *>(dictionary_type.get())->getN();
-                    return std::make_unique<LowCardinalityFixedStringNode>(fixed_length);
-                }
-                return build(function_name, dictionary_type);
-            }
-            case TypeIndex::Decimal256: return std::make_unique<DecimalNode<Decimal256>>(type);
-            case TypeIndex::Decimal128: return std::make_unique<DecimalNode<Decimal128>>(type);
-            case TypeIndex::Decimal64: return std::make_unique<DecimalNode<Decimal64>>(type);
-            case TypeIndex::Decimal32: return std::make_unique<DecimalNode<Decimal32>>(type);
-            case TypeIndex::Enum8:
-                return std::make_unique<EnumNode<Int8>>(static_cast<const DataTypeEnum8 &>(*type).getValues());
-            case TypeIndex::Enum16:
-                return std::make_unique<EnumNode<Int16>>(static_cast<const DataTypeEnum16 &>(*type).getValues());
-            case TypeIndex::Nullable:
-            {
-                return std::make_unique<NullableNode>(build(function_name, static_cast<const DataTypeNullable &>(*type).getNestedType()));
-            }
-            case TypeIndex::Array:
-            {
-                return std::make_unique<ArrayNode>(build(function_name, static_cast<const DataTypeArray &>(*type).getNestedType()));
-            }
-            case TypeIndex::Tuple:
-            {
-                const auto & tuple = static_cast<const DataTypeTuple &>(*type);
-                const auto & tuple_elements = tuple.getElements();
-                std::vector<std::unique_ptr<Node>> elements;
-                elements.reserve(tuple_elements.size());
-                for (const auto & tuple_element : tuple_elements)
-                    elements.emplace_back(build(function_name, tuple_element));
-                return std::make_unique<TupleNode>(std::move(elements), tuple.haveExplicitNames() ? tuple.getElementNames() : Strings{});
-            }
-            default:
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                                "Function {} doesn't support the return type schema: {}",
-                                String(function_name), type->getName());
-        }
-    }
-};
-
-
-template <typename JSONParser>
-class JSONExtractImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
-    {
-        if (arguments.size() < 2)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least two arguments", String(function_name));
-
-        const auto & col = arguments.back();
-        const auto * col_type_const = typeid_cast<const ColumnConst *>(col.column.get());
-        if (!col_type_const || !isString(col.type))
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                            "The last argument of function {} should "
-                            "be a constant string specifying the return data type, illegal value: {}",
-                            String(function_name), col.name);
-
-        return DataTypeFactory::instance().get(col_type_const->getValue<String>());
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 2; }
-
-    void prepare(const char * function_name, const ColumnsWithTypeAndName &, const DataTypePtr & result_type)
-    {
-        extract_tree = JSONExtractTree<JSONParser>::build(function_name, result_type);
-    }
-
-    bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        return extract_tree->insertResultToColumn(dest, element);
-    }
-
-protected:
-    std::unique_ptr<typename JSONExtractTree<JSONParser>::Node> extract_tree;
-};
-
-
-template <typename JSONParser>
-class JSONExtractKeysAndValuesImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
-    {
-        if (arguments.size() < 2)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least two arguments", String(function_name));
-
-        const auto & col = arguments.back();
-        const auto * col_type_const = typeid_cast<const ColumnConst *>(col.column.get());
-        if (!col_type_const || !isString(col.type))
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                            "The last argument of function {} should "
-                            "be a constant string specifying the values' data type, illegal value: {}",
-                            String(function_name), col.name);
-
-        DataTypePtr key_type = std::make_unique<DataTypeString>();
-        DataTypePtr value_type = DataTypeFactory::instance().get(col_type_const->getValue<String>());
-        DataTypePtr tuple_type = std::make_unique<DataTypeTuple>(DataTypes{key_type, value_type});
-        return std::make_unique<DataTypeArray>(tuple_type);
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 2; }
-
-    void prepare(const char * function_name, const ColumnsWithTypeAndName &, const DataTypePtr & result_type)
-    {
-        const auto tuple_type = typeid_cast<const DataTypeArray *>(result_type.get())->getNestedType();
-        const auto value_type = typeid_cast<const DataTypeTuple *>(tuple_type.get())->getElements()[1];
-        extract_tree = JSONExtractTree<JSONParser>::build(function_name, value_type);
-    }
-
-    bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        if (!element.isObject())
-            return false;
-
-        auto object = element.getObject();
-
-        auto & col_arr = assert_cast<ColumnArray &>(dest);
-        auto & col_tuple = assert_cast<ColumnTuple &>(col_arr.getData());
-        size_t old_size = col_tuple.size();
-        auto & col_key = assert_cast<ColumnString &>(col_tuple.getColumn(0));
-        auto & col_value = col_tuple.getColumn(1);
-
-        for (const auto & [key, value] : object)
-        {
-            if (extract_tree->insertResultToColumn(col_value, value))
-                col_key.insertData(key.data(), key.size());
-        }
-
-        if (col_tuple.size() == old_size)
-            return false;
-
-        col_arr.getOffsets().push_back(col_tuple.size());
-        return true;
-    }
-
-private:
-    std::unique_ptr<typename JSONExtractTree<JSONParser>::Node> extract_tree;
-};
-
-
-template <typename JSONParser>
-class JSONExtractRawImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        if (dest.getDataType() == TypeIndex::LowCardinality)
-        {
-            ColumnString::Chars chars;
-            WriteBufferFromVector<ColumnString::Chars> buf(chars, AppendModeTag());
-            traverse(element, buf);
-            buf.finalize();
-            assert_cast<ColumnLowCardinality &>(dest).insertData(reinterpret_cast<const char *>(chars.data()), chars.size());
-        }
-        else
-        {
-            ColumnString & col_str = assert_cast<ColumnString &>(dest);
-            auto & chars = col_str.getChars();
-            WriteBufferFromVector<ColumnString::Chars> buf(chars, AppendModeTag());
-            traverse(element, buf);
-            buf.finalize();
-            chars.push_back(0);
-            col_str.getOffsets().push_back(chars.size());
-        }
-        return true;
-    }
-
-    // We use insertResultToFixedStringColumn in case we are inserting raw data in a FixedString column
-    static bool insertResultToFixedStringColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        ColumnFixedString::Chars chars;
-        WriteBufferFromVector<ColumnFixedString::Chars> buf(chars, AppendModeTag());
-        traverse(element, buf);
-        buf.finalize();
-
-        auto & col_str = assert_cast<ColumnFixedString &>(dest);
-
-        if (chars.size() > col_str.getN())
-            return false;
-
-        chars.resize_fill(col_str.getN());
-        col_str.insertData(reinterpret_cast<const char *>(chars.data()), chars.size());
-
-
-        return true;
-    }
-
-    // We use insertResultToLowCardinalityFixedStringColumn in case we are inserting raw data in a Low Cardinality FixedString column
-    static bool insertResultToLowCardinalityFixedStringColumn(IColumn & dest, const Element & element, size_t fixed_length)
-    {
-        if (element.getObject().size() > fixed_length)
-            return false;
-
-        ColumnFixedString::Chars chars;
-        WriteBufferFromVector<ColumnFixedString::Chars> buf(chars, AppendModeTag());
-        traverse(element, buf);
-        buf.finalize();
-
-        if (chars.size() > fixed_length)
-            return false;
-        chars.resize_fill(fixed_length);
-        assert_cast<ColumnLowCardinality &>(dest).insertData(reinterpret_cast<const char *>(chars.data()), chars.size());
-
-        return true;
-    }
-
-private:
-    static void traverse(const Element & element, WriteBuffer & buf)
-    {
-        if (element.isInt64())
-        {
-            writeIntText(element.getInt64(), buf);
-            return;
-        }
-        if (element.isUInt64())
-        {
-            writeIntText(element.getUInt64(), buf);
-            return;
-        }
-        if (element.isDouble())
-        {
-            writeFloatText(element.getDouble(), buf);
-            return;
-        }
-        if (element.isBool())
-        {
-            if (element.getBool())
-                writeCString("true", buf);
-            else
-                writeCString("false", buf);
-            return;
-        }
-        if (element.isString())
-        {
-            writeJSONString(element.getString(), buf, formatSettings());
-            return;
-        }
-        if (element.isArray())
-        {
-            writeChar('[', buf);
-            bool need_comma = false;
-            for (auto value : element.getArray())
-            {
-                if (std::exchange(need_comma, true))
-                    writeChar(',', buf);
-                traverse(value, buf);
-            }
-            writeChar(']', buf);
-            return;
-        }
-        if (element.isObject())
-        {
-            writeChar('{', buf);
-            bool need_comma = false;
-            for (auto [key, value] : element.getObject())
-            {
-                if (std::exchange(need_comma, true))
-                    writeChar(',', buf);
-                writeJSONString(key, buf, formatSettings());
-                writeChar(':', buf);
-                traverse(value, buf);
-            }
-            writeChar('}', buf);
-            return;
-        }
-        if (element.isNull())
-        {
-            writeCString("null", buf);
-            return;
-        }
-    }
-
-    static const FormatSettings & formatSettings()
-    {
-        static const FormatSettings the_instance = []
-        {
-            FormatSettings settings;
-            settings.json.escape_forward_slashes = false;
-            return settings;
-        }();
-        return the_instance;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONExtractArrayRawImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        if (!element.isArray())
-            return false;
-
-        auto array = element.getArray();
-        ColumnArray & col_res = assert_cast<ColumnArray &>(dest);
-
-        for (auto value : array)
-            JSONExtractRawImpl<JSONParser>::insertResultToColumn(col_res.getData(), value, {});
-
-        col_res.getOffsets().push_back(col_res.getOffsets().back() + array.size());
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONExtractKeysAndValuesRawImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        DataTypePtr string_type = std::make_unique<DataTypeString>();
-        DataTypePtr tuple_type = std::make_unique<DataTypeTuple>(DataTypes{string_type, string_type});
-        return std::make_unique<DataTypeArray>(tuple_type);
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        if (!element.isObject())
-            return false;
-
-        auto object = element.getObject();
-
-        auto & col_arr = assert_cast<ColumnArray &>(dest);
-        auto & col_tuple = assert_cast<ColumnTuple &>(col_arr.getData());
-        auto & col_key = assert_cast<ColumnString &>(col_tuple.getColumn(0));
-        auto & col_value = assert_cast<ColumnString &>(col_tuple.getColumn(1));
-
-        for (const auto & [key, value] : object)
-        {
-            col_key.insertData(key.data(), key.size());
-            JSONExtractRawImpl<JSONParser>::insertResultToColumn(col_value, value, {});
-        }
-
-        col_arr.getOffsets().push_back(col_arr.getOffsets().back() + object.size());
-        return true;
-    }
-};
-
-template <typename JSONParser>
-class JSONExtractKeysImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_unique<DataTypeArray>(std::make_shared<DataTypeString>());
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
-    {
-        if (!element.isObject())
-            return false;
-
-        auto object = element.getObject();
-
-        ColumnArray & col_res = assert_cast<ColumnArray &>(dest);
-        auto & col_key = assert_cast<ColumnString &>(col_res.getData());
-
-        for (const auto & [key, value] : object)
-        {
-            col_key.insertData(key.data(), key.size());
-        }
-
-        col_res.getOffsets().push_back(col_res.getOffsets().back() + object.size());
-        return true;
-    }
-};
-
 REGISTER_FUNCTION(JSON)
 {
     factory.registerFunction<JSONOverloadResolver<NameJSONHas, JSONHasImpl>>();
diff --git a/src/Functions/FunctionsJSON.h b/src/Functions/FunctionsJSON.h
new file mode 100644
index 00000000000..ca797eed856
--- /dev/null
+++ b/src/Functions/FunctionsJSON.h
@@ -0,0 +1,1678 @@
+#pragma once
+
+#include <type_traits>
+#include <boost/tti/has_member_function.hpp>
+
+#include <base/range.h>
+
+#include <Common/CpuId.h>
+#include <Common/typeid_cast.h>
+#include <Common/assert_cast.h>
+
+#include <Core/AccurateComparison.h>
+#include <Core/Settings.h>
+
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNothing.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/Serializations/SerializationDecimal.h>
+
+#include <Functions/IFunction.h>
+#include <Common/JSONParsers/DummyJSONParser.h>
+#include <Common/JSONParsers/SimdJSONParser.h>
+#include <Common/JSONParsers/RapidJSONParser.h>
+#include <Functions/FunctionHelpers.h>
+
+#include <IO/readDecimalText.h>
+#include <Interpreters/Context.h>
+
+
+#include "config.h"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+template <typename T>
+concept HasIndexOperator = requires (T t)
+{
+    t[0];
+};
+
+/// Functions to parse JSONs and extract values from it.
+/// The first argument of all these functions gets a JSON,
+/// after that there are any number of arguments specifying path to a desired part from the JSON's root.
+/// For example,
+/// select JSONExtractInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1) = -100
+
+class FunctionJSONHelpers
+{
+public:
+    template <typename Name, template<typename> typename Impl, class JSONParser>
+    class Executor
+    {
+    public:
+        static ColumnPtr run(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
+        {
+            MutableColumnPtr to{result_type->createColumn()};
+            to->reserve(input_rows_count);
+
+            if (arguments.empty())
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least one argument", String(Name::name));
+
+            const auto & first_column = arguments[0];
+            if (!isString(first_column.type))
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                                "The first argument of function {} should be a string containing JSON, illegal type: "
+                                "{}", String(Name::name), first_column.type->getName());
+
+            const ColumnPtr & arg_json = first_column.column;
+            const auto * col_json_const = typeid_cast<const ColumnConst *>(arg_json.get());
+            const auto * col_json_string
+                = typeid_cast<const ColumnString *>(col_json_const ? col_json_const->getDataColumnPtr().get() : arg_json.get());
+
+            if (!col_json_string)
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {}", arg_json->getName());
+
+            const ColumnString::Chars & chars = col_json_string->getChars();
+            const ColumnString::Offsets & offsets = col_json_string->getOffsets();
+
+            size_t num_index_arguments = Impl<JSONParser>::getNumberOfIndexArguments(arguments);
+            std::vector<Move> moves = prepareMoves(Name::name, arguments, 1, num_index_arguments);
+
+            /// Preallocate memory in parser if necessary.
+            JSONParser parser;
+            if constexpr (has_member_function_reserve<void (JSONParser::*)(size_t)>::value)
+            {
+                size_t max_size = calculateMaxSize(offsets);
+                if (max_size)
+                    parser.reserve(max_size);
+            }
+
+            Impl<JSONParser> impl;
+
+            /// prepare() does Impl-specific preparation before handling each row.
+            if constexpr (has_member_function_prepare<void (Impl<JSONParser>::*)(const char *, const ColumnsWithTypeAndName &, const DataTypePtr &)>::value)
+                impl.prepare(Name::name, arguments, result_type);
+
+            using Element = typename JSONParser::Element;
+
+            Element document;
+            bool document_ok = false;
+            if (col_json_const)
+            {
+                std::string_view json{reinterpret_cast<const char *>(chars.data()), offsets[0] - 1};
+                document_ok = parser.parse(json, document);
+            }
+
+            for (const auto i : collections::range(0, input_rows_count))
+            {
+                if (!col_json_const)
+                {
+                    std::string_view json{reinterpret_cast<const char *>(&chars[offsets[i - 1]]), offsets[i] - offsets[i - 1] - 1};
+                    document_ok = parser.parse(json, document);
+                }
+
+                bool added_to_column = false;
+                if (document_ok)
+                {
+                    /// Perform moves.
+                    Element element;
+                    std::string_view last_key;
+                    bool moves_ok = performMoves<JSONParser>(arguments, i, document, moves, element, last_key);
+
+                    if (moves_ok)
+                        added_to_column = impl.insertResultToColumn(*to, element, last_key);
+                }
+
+                /// We add default value (=null or zero) if something goes wrong, we don't throw exceptions in these JSON functions.
+                if (!added_to_column)
+                    to->insertDefault();
+            }
+            return to;
+        }
+    };
+
+private:
+    BOOST_TTI_HAS_MEMBER_FUNCTION(reserve)
+    BOOST_TTI_HAS_MEMBER_FUNCTION(prepare)
+
+    /// Represents a move of a JSON iterator described by a single argument passed to a JSON function.
+    /// For example, the call JSONExtractInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1)
+    /// contains two moves: {MoveType::ConstKey, "b"} and {MoveType::ConstIndex, 1}.
+    /// Keys and indices can be nonconst, in this case they are calculated for each row.
+    enum class MoveType
+    {
+        Key,
+        Index,
+        ConstKey,
+        ConstIndex,
+    };
+
+    struct Move
+    {
+        explicit Move(MoveType type_, size_t index_ = 0) : type(type_), index(index_) {}
+        Move(MoveType type_, const String & key_) : type(type_), key(key_) {}
+        MoveType type;
+        size_t index = 0;
+        String key;
+    };
+
+    static std::vector<FunctionJSONHelpers::Move> prepareMoves(
+        const char * function_name,
+        const ColumnsWithTypeAndName & columns,
+        size_t first_index_argument,
+        size_t num_index_arguments)
+    {
+        std::vector<Move> moves;
+        moves.reserve(num_index_arguments);
+        for (const auto i : collections::range(first_index_argument, first_index_argument + num_index_arguments))
+        {
+            const auto & column = columns[i];
+            if (!isString(column.type) && !isNativeInteger(column.type))
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                                "The argument {} of function {} should be a string specifying key "
+                                "or an integer specifying index, illegal type: {}",
+                                std::to_string(i + 1), String(function_name), column.type->getName());
+
+            if (column.column && isColumnConst(*column.column))
+            {
+                const auto & column_const = assert_cast<const ColumnConst &>(*column.column);
+                if (isString(column.type))
+                    moves.emplace_back(MoveType::ConstKey, column_const.getValue<String>());
+                else
+                    moves.emplace_back(MoveType::ConstIndex, column_const.getInt(0));
+            }
+            else
+            {
+                if (isString(column.type))
+                    moves.emplace_back(MoveType::Key, "");
+                else
+                    moves.emplace_back(MoveType::Index, 0);
+            }
+        }
+        return moves;
+    }
+
+
+    /// Performs moves of types MoveType::Index and MoveType::ConstIndex.
+    template <typename JSONParser>
+    static bool performMoves(const ColumnsWithTypeAndName & arguments, size_t row,
+                             const typename JSONParser::Element & document, const std::vector<Move> & moves,
+                             typename JSONParser::Element & element, std::string_view & last_key)
+    {
+        typename JSONParser::Element res_element = document;
+        std::string_view key;
+
+        for (size_t j = 0; j != moves.size(); ++j)
+        {
+            switch (moves[j].type)
+            {
+                case MoveType::ConstIndex:
+                {
+                    if (!moveToElementByIndex<JSONParser>(res_element, static_cast<int>(moves[j].index), key))
+                        return false;
+                    break;
+                }
+                case MoveType::ConstKey:
+                {
+                    key = moves[j].key;
+                    if (!moveToElementByKey<JSONParser>(res_element, key))
+                        return false;
+                    break;
+                }
+                case MoveType::Index:
+                {
+                    Int64 index = (*arguments[j + 1].column)[row].get<Int64>();
+                    if (!moveToElementByIndex<JSONParser>(res_element, static_cast<int>(index), key))
+                        return false;
+                    break;
+                }
+                case MoveType::Key:
+                {
+                    key = (*arguments[j + 1].column).getDataAt(row).toView();
+                    if (!moveToElementByKey<JSONParser>(res_element, key))
+                        return false;
+                    break;
+                }
+            }
+        }
+
+        element = res_element;
+        last_key = key;
+        return true;
+    }
+
+    template <typename JSONParser>
+    static bool moveToElementByIndex(typename JSONParser::Element & element, int index, std::string_view & out_key)
+    {
+        if (element.isArray())
+        {
+            auto array = element.getArray();
+            if (index >= 0)
+                --index;
+            else
+                index += array.size();
+
+            if (static_cast<size_t>(index) >= array.size())
+                return false;
+            element = array[index];
+            out_key = {};
+            return true;
+        }
+
+        if constexpr (HasIndexOperator<typename JSONParser::Object>)
+        {
+            if (element.isObject())
+            {
+                auto object = element.getObject();
+                if (index >= 0)
+                    --index;
+                else
+                    index += object.size();
+
+                if (static_cast<size_t>(index) >= object.size())
+                    return false;
+                std::tie(out_key, element) = object[index];
+                return true;
+            }
+        }
+
+        return {};
+    }
+
+    /// Performs moves of types MoveType::Key and MoveType::ConstKey.
+    template <typename JSONParser>
+    static bool moveToElementByKey(typename JSONParser::Element & element, std::string_view key)
+    {
+        if (!element.isObject())
+            return false;
+        auto object = element.getObject();
+        return object.find(key, element);
+    }
+
+    static size_t calculateMaxSize(const ColumnString::Offsets & offsets)
+    {
+        size_t max_size = 0;
+        for (const auto i : collections::range(0, offsets.size()))
+        {
+            size_t size = offsets[i] - offsets[i - 1];
+            if (max_size < size)
+                max_size = size;
+        }
+        if (max_size)
+            --max_size;
+        return max_size;
+    }
+
+};
+
+
+template <typename Name, template<typename> typename Impl>
+class ExecutableFunctionJSON : public IExecutableFunction, WithContext
+{
+
+public:
+    explicit ExecutableFunctionJSON(const NullPresence & null_presence_, bool allow_simdjson_, const DataTypePtr & json_return_type_)
+        : null_presence(null_presence_), allow_simdjson(allow_simdjson_), json_return_type(json_return_type_)
+    {
+    }
+
+    String getName() const override { return Name::name; }
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        if (null_presence.has_null_constant)
+            return result_type->createColumnConstWithDefaultValue(input_rows_count);
+
+        ColumnsWithTypeAndName temporary_columns = null_presence.has_nullable ? createBlockWithNestedColumns(arguments) : arguments;
+        ColumnPtr temporary_result = chooseAndRunJSONParser(temporary_columns, json_return_type, input_rows_count);
+        if (null_presence.has_nullable)
+            return wrapInNullable(temporary_result, arguments, result_type, input_rows_count);
+        return temporary_result;
+    }
+
+private:
+
+    ColumnPtr
+    chooseAndRunJSONParser(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    {
+#if USE_SIMDJSON
+        if (allow_simdjson)
+            return FunctionJSONHelpers::Executor<Name, Impl, SimdJSONParser>::run(arguments, result_type, input_rows_count);
+#endif
+
+#if USE_RAPIDJSON
+        return FunctionJSONHelpers::Executor<Name, Impl, RapidJSONParser>::run(arguments, result_type, input_rows_count);
+#else
+        return FunctionJSONHelpers::Executor<Name, Impl, DummyJSONParser>::run(arguments, result_type, input_rows_count);
+#endif
+    }
+
+    NullPresence null_presence;
+    bool allow_simdjson;
+    DataTypePtr json_return_type;
+};
+
+
+template <typename Name, template<typename> typename Impl>
+class FunctionBaseFunctionJSON : public IFunctionBase
+{
+public:
+    explicit FunctionBaseFunctionJSON(
+        const NullPresence & null_presence_,
+        bool allow_simdjson_,
+        DataTypes argument_types_,
+        DataTypePtr return_type_,
+        DataTypePtr json_return_type_)
+        : null_presence(null_presence_)
+        , allow_simdjson(allow_simdjson_)
+        , argument_types(std::move(argument_types_))
+        , return_type(std::move(return_type_))
+        , json_return_type(std::move(json_return_type_))
+    {
+    }
+
+    String getName() const override { return Name::name; }
+
+    const DataTypes & getArgumentTypes() const override
+    {
+        return argument_types;
+    }
+
+    const DataTypePtr & getResultType() const override
+    {
+        return return_type;
+    }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
+    {
+        return std::make_unique<ExecutableFunctionJSON<Name, Impl>>(null_presence, allow_simdjson, json_return_type);
+    }
+
+private:
+    NullPresence null_presence;
+    bool allow_simdjson;
+    DataTypes argument_types;
+    DataTypePtr return_type;
+    DataTypePtr json_return_type;
+};
+
+
+/// We use IFunctionOverloadResolver instead of IFunction to handle non-default NULL processing.
+/// Both NULL and JSON NULL should generate NULL value. If any argument is NULL, return NULL.
+template <typename Name, template<typename> typename Impl>
+class JSONOverloadResolver : public IFunctionOverloadResolver, WithContext
+{
+public:
+    static constexpr auto name = Name::name;
+
+    String getName() const override { return name; }
+
+    static FunctionOverloadResolverPtr create(ContextPtr context_)
+    {
+        return std::make_unique<JSONOverloadResolver>(context_);
+    }
+
+    explicit JSONOverloadResolver(ContextPtr context_) : WithContext(context_) {}
+
+    bool isVariadic() const override { return true; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool useDefaultImplementationForNulls() const override { return false; }
+
+    FunctionBasePtr build(const ColumnsWithTypeAndName & arguments) const override
+    {
+        bool has_nothing_argument = false;
+        for (const auto & arg : arguments)
+            has_nothing_argument |= isNothing(arg.type);
+
+        DataTypePtr json_return_type = Impl<DummyJSONParser>::getReturnType(Name::name, createBlockWithNestedColumns(arguments));
+        NullPresence null_presence = getNullPresense(arguments);
+        DataTypePtr return_type;
+        if (has_nothing_argument)
+            return_type = std::make_shared<DataTypeNothing>();
+        else if (null_presence.has_null_constant)
+            return_type = makeNullable(std::make_shared<DataTypeNothing>());
+        else if (null_presence.has_nullable)
+            return_type = makeNullable(json_return_type);
+        else
+            return_type = json_return_type;
+
+        /// Top-level LowCardinality columns are processed outside JSON parser.
+        json_return_type = removeLowCardinality(json_return_type);
+
+        DataTypes argument_types;
+        argument_types.reserve(arguments.size());
+        for (const auto & argument : arguments)
+            argument_types.emplace_back(argument.type);
+        return std::make_unique<FunctionBaseFunctionJSON<Name, Impl>>(
+                null_presence, getContext()->getSettingsRef().allow_simdjson, argument_types, return_type, json_return_type);
+    }
+};
+
+
+struct NameJSONHas { static constexpr auto name{"JSONHas"}; };
+struct NameIsValidJSON { static constexpr auto name{"isValidJSON"}; };
+struct NameJSONLength { static constexpr auto name{"JSONLength"}; };
+struct NameJSONKey { static constexpr auto name{"JSONKey"}; };
+struct NameJSONType { static constexpr auto name{"JSONType"}; };
+struct NameJSONExtractInt { static constexpr auto name{"JSONExtractInt"}; };
+struct NameJSONExtractUInt { static constexpr auto name{"JSONExtractUInt"}; };
+struct NameJSONExtractFloat { static constexpr auto name{"JSONExtractFloat"}; };
+struct NameJSONExtractBool { static constexpr auto name{"JSONExtractBool"}; };
+struct NameJSONExtractString { static constexpr auto name{"JSONExtractString"}; };
+struct NameJSONExtract { static constexpr auto name{"JSONExtract"}; };
+struct NameJSONExtractKeysAndValues { static constexpr auto name{"JSONExtractKeysAndValues"}; };
+struct NameJSONExtractRaw { static constexpr auto name{"JSONExtractRaw"}; };
+struct NameJSONExtractArrayRaw { static constexpr auto name{"JSONExtractArrayRaw"}; };
+struct NameJSONExtractKeysAndValuesRaw { static constexpr auto name{"JSONExtractKeysAndValuesRaw"}; };
+struct NameJSONExtractKeys { static constexpr auto name{"JSONExtractKeys"}; };
+
+
+template <typename JSONParser>
+class JSONHasImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &) { return std::make_shared<DataTypeUInt8>(); }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element &, std::string_view)
+    {
+        ColumnVector<UInt8> & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
+        col_vec.insertValue(1);
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+class IsValidJSONImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
+    {
+        if (arguments.size() != 1)
+        {
+            /// IsValidJSON() shouldn't get parameters other than JSON.
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} needs exactly one argument",
+                            String(function_name));
+        }
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName &) { return 0; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element &, std::string_view)
+    {
+        /// This function is called only if JSON is valid.
+        /// If JSON isn't valid then `FunctionJSON::Executor::run()` adds default value (=zero) to `dest` without calling this function.
+        ColumnVector<UInt8> & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
+        col_vec.insertValue(1);
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+class JSONLengthImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeUInt64>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        size_t size;
+        if (element.isArray())
+            size = element.getArray().size();
+        else if (element.isObject())
+            size = element.getObject().size();
+        else
+            return false;
+
+        ColumnVector<UInt64> & col_vec = assert_cast<ColumnVector<UInt64> &>(dest);
+        col_vec.insertValue(size);
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+class JSONKeyImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element &, std::string_view last_key)
+    {
+        if (last_key.empty())
+            return false;
+        ColumnString & col_str = assert_cast<ColumnString &>(dest);
+        col_str.insertData(last_key.data(), last_key.size());
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+class JSONTypeImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        static const std::vector<std::pair<String, Int8>> values = {
+            {"Array", '['},
+            {"Object", '{'},
+            {"String", '"'},
+            {"Int64", 'i'},
+            {"UInt64", 'u'},
+            {"Double", 'd'},
+            {"Bool", 'b'},
+            {"Null", 0}, /// the default value for the column.
+        };
+        return std::make_shared<DataTypeEnum<Int8>>(values);
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        UInt8 type;
+        switch (element.type())
+        {
+            case ElementType::INT64:
+                type = 'i';
+                break;
+            case ElementType::UINT64:
+                type = 'u';
+                break;
+            case ElementType::DOUBLE:
+                type = 'd';
+                break;
+            case ElementType::STRING:
+                type = '"';
+                break;
+            case ElementType::ARRAY:
+                type = '[';
+                break;
+            case ElementType::OBJECT:
+                type = '{';
+                break;
+            case ElementType::BOOL:
+                type = 'b';
+                break;
+            case ElementType::NULL_VALUE:
+                type = 0;
+                break;
+        }
+
+        ColumnVector<Int8> & col_vec = assert_cast<ColumnVector<Int8> &>(dest);
+        col_vec.insertValue(type);
+        return true;
+    }
+};
+
+
+template <typename JSONParser, typename NumberType, bool convert_bool_to_integer = false>
+class JSONExtractNumericImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeNumber<NumberType>>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        NumberType value;
+
+        switch (element.type())
+        {
+            case ElementType::DOUBLE:
+                if constexpr (std::is_floating_point_v<NumberType>)
+                {
+                    /// We permit inaccurate conversion of double to float.
+                    /// Example: double 0.1 from JSON is not representable in float.
+                    /// But it will be more convenient for user to perform conversion.
+                    value = static_cast<NumberType>(element.getDouble());
+                }
+                else if (!accurate::convertNumeric<Float64, NumberType, false>(element.getDouble(), value))
+                    return false;
+                break;
+            case ElementType::UINT64:
+                if (!accurate::convertNumeric<UInt64, NumberType, false>(element.getUInt64(), value))
+                    return false;
+                break;
+            case ElementType::INT64:
+                if (!accurate::convertNumeric<Int64, NumberType, false>(element.getInt64(), value))
+                    return false;
+                break;
+            case ElementType::BOOL:
+                if constexpr (is_integer<NumberType> && convert_bool_to_integer)
+                {
+                    value = static_cast<NumberType>(element.getBool());
+                    break;
+                }
+                return false;
+            case ElementType::STRING:
+            {
+                auto rb = ReadBufferFromMemory{element.getString()};
+                if constexpr (std::is_floating_point_v<NumberType>)
+                {
+                    if (!tryReadFloatText(value, rb) || !rb.eof())
+                        return false;
+                }
+                else
+                {
+                    if (tryReadIntText(value, rb) && rb.eof())
+                        break;
+
+                    /// Try to parse float and convert it to integer.
+                    Float64 tmp_float;
+                    rb.position() = rb.buffer().begin();
+                    if (!tryReadFloatText(tmp_float, rb) || !rb.eof())
+                        return false;
+
+                    if (!accurate::convertNumeric<Float64, NumberType, false>(tmp_float, value))
+                        return false;
+                }
+                break;
+            }
+            default:
+                return false;
+        }
+
+        if (dest.getDataType() == TypeIndex::LowCardinality)
+        {
+            ColumnLowCardinality & col_low = assert_cast<ColumnLowCardinality &>(dest);
+            col_low.insertData(reinterpret_cast<const char *>(&value), sizeof(value));
+        }
+        else
+        {
+            auto & col_vec = assert_cast<ColumnVector<NumberType> &>(dest);
+            col_vec.insertValue(value);
+        }
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+using JSONExtractInt64Impl = JSONExtractNumericImpl<JSONParser, Int64>;
+template <typename JSONParser>
+using JSONExtractUInt64Impl = JSONExtractNumericImpl<JSONParser, UInt64>;
+template <typename JSONParser>
+using JSONExtractFloat64Impl = JSONExtractNumericImpl<JSONParser, Float64>;
+
+
+template <typename JSONParser>
+class JSONExtractBoolImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        bool value;
+        switch (element.type())
+        {
+            case ElementType::BOOL:
+                value = element.getBool();
+                break;
+            case ElementType::INT64:
+                value = element.getInt64() != 0;
+                break;
+            case ElementType::UINT64:
+                value = element.getUInt64() != 0;
+                break;
+            default:
+                return false;
+        }
+
+        auto & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
+        col_vec.insertValue(static_cast<UInt8>(value));
+        return true;
+    }
+};
+
+template <typename JSONParser>
+class JSONExtractRawImpl;
+
+template <typename JSONParser>
+class JSONExtractStringImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        if (element.isNull())
+            return false;
+
+        if (!element.isString())
+            return JSONExtractRawImpl<JSONParser>::insertResultToColumn(dest, element, {});
+
+        auto str = element.getString();
+
+        if (dest.getDataType() == TypeIndex::LowCardinality)
+        {
+            ColumnLowCardinality & col_low = assert_cast<ColumnLowCardinality &>(dest);
+            col_low.insertData(str.data(), str.size());
+        }
+        else
+        {
+            ColumnString & col_str = assert_cast<ColumnString &>(dest);
+            col_str.insertData(str.data(), str.size());
+        }
+        return true;
+    }
+};
+
+/// Nodes of the extract tree. We need the extract tree to extract from JSON complex values containing array, tuples or nullables.
+template <typename JSONParser>
+struct JSONExtractTree
+{
+    using Element = typename JSONParser::Element;
+
+    class Node
+    {
+    public:
+        Node() = default;
+        virtual ~Node() = default;
+        virtual bool insertResultToColumn(IColumn &, const Element &) = 0;
+    };
+
+    template <typename NumberType>
+    class NumericNode : public Node
+    {
+    public:
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            return JSONExtractNumericImpl<JSONParser, NumberType, true>::insertResultToColumn(dest, element, {});
+        }
+    };
+
+    class LowCardinalityFixedStringNode : public Node
+    {
+    public:
+        explicit LowCardinalityFixedStringNode(const size_t fixed_length_) : fixed_length(fixed_length_) { }
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            // If element is an object we delegate the insertion to JSONExtractRawImpl
+            if (element.isObject())
+                return JSONExtractRawImpl<JSONParser>::insertResultToLowCardinalityFixedStringColumn(dest, element, fixed_length);
+            else if (!element.isString())
+                return false;
+
+            auto str = element.getString();
+            if (str.size() > fixed_length)
+                return false;
+
+            // For the non low cardinality case of FixedString, the padding is done in the FixedString Column implementation.
+            // In order to avoid having to pass the data to a FixedString Column and read it back (which would slow down the execution)
+            // the data is padded here and written directly to the Low Cardinality Column
+            if (str.size() == fixed_length)
+            {
+                assert_cast<ColumnLowCardinality &>(dest).insertData(str.data(), str.size());
+            }
+            else
+            {
+                String padded_str(str);
+                padded_str.resize(fixed_length, '\0');
+
+                assert_cast<ColumnLowCardinality &>(dest).insertData(padded_str.data(), padded_str.size());
+            }
+            return true;
+        }
+
+    private:
+        const size_t fixed_length;
+    };
+
+    class UUIDNode : public Node
+    {
+    public:
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            if (!element.isString())
+                return false;
+
+            auto uuid = parseFromString<UUID>(element.getString());
+            if (dest.getDataType() == TypeIndex::LowCardinality)
+            {
+                ColumnLowCardinality & col_low = assert_cast<ColumnLowCardinality &>(dest);
+                col_low.insertData(reinterpret_cast<const char *>(&uuid), sizeof(uuid));
+            }
+            else
+            {
+                assert_cast<ColumnUUID &>(dest).insert(uuid);
+            }
+            return true;
+        }
+    };
+
+    template <typename DecimalType>
+    class DecimalNode : public Node
+    {
+    public:
+        explicit DecimalNode(DataTypePtr data_type_) : data_type(data_type_) {}
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            const auto * type = assert_cast<const DataTypeDecimal<DecimalType> *>(data_type.get());
+
+            DecimalType value{};
+
+            switch (element.type())
+            {
+                case ElementType::DOUBLE:
+                    value = convertToDecimal<DataTypeNumber<Float64>, DataTypeDecimal<DecimalType>>(
+                        element.getDouble(), type->getScale());
+                    break;
+                case ElementType::UINT64:
+                    value = convertToDecimal<DataTypeNumber<UInt64>, DataTypeDecimal<DecimalType>>(
+                        element.getUInt64(), type->getScale());
+                    break;
+                case ElementType::INT64:
+                    value = convertToDecimal<DataTypeNumber<Int64>, DataTypeDecimal<DecimalType>>(
+                        element.getInt64(), type->getScale());
+                    break;
+                case ElementType::STRING: {
+                    auto rb = ReadBufferFromMemory{element.getString()};
+                    if (!SerializationDecimal<DecimalType>::tryReadText(value, rb, DecimalUtils::max_precision<DecimalType>, type->getScale()))
+                        return false;
+                    break;
+                }
+                default:
+                    return false;
+            }
+
+            assert_cast<ColumnDecimal<DecimalType> &>(dest).insertValue(value);
+            return true;
+        }
+
+    private:
+        DataTypePtr data_type;
+    };
+
+    class StringNode : public Node
+    {
+    public:
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            return JSONExtractStringImpl<JSONParser>::insertResultToColumn(dest, element, {});
+        }
+    };
+
+    class FixedStringNode : public Node
+    {
+    public:
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            if (element.isNull())
+                return false;
+
+            if (!element.isString())
+                return JSONExtractRawImpl<JSONParser>::insertResultToFixedStringColumn(dest, element, {});
+
+            auto str = element.getString();
+            auto & col_str = assert_cast<ColumnFixedString &>(dest);
+            if (str.size() > col_str.getN())
+                return false;
+            col_str.insertData(str.data(), str.size());
+
+            return true;
+        }
+    };
+
+    template <typename Type>
+    class EnumNode : public Node
+    {
+    public:
+        explicit EnumNode(const std::vector<std::pair<String, Type>> & name_value_pairs_) : name_value_pairs(name_value_pairs_)
+        {
+            for (const auto & name_value_pair : name_value_pairs)
+            {
+                name_to_value_map.emplace(name_value_pair.first, name_value_pair.second);
+                only_values.emplace(name_value_pair.second);
+            }
+        }
+
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            auto & col_vec = assert_cast<ColumnVector<Type> &>(dest);
+
+            if (element.isInt64())
+            {
+                Type value;
+                if (!accurate::convertNumeric(element.getInt64(), value) || !only_values.contains(value))
+                    return false;
+                col_vec.insertValue(value);
+                return true;
+            }
+
+            if (element.isUInt64())
+            {
+                Type value;
+                if (!accurate::convertNumeric(element.getUInt64(), value) || !only_values.contains(value))
+                    return false;
+                col_vec.insertValue(value);
+                return true;
+            }
+
+            if (element.isString())
+            {
+                auto value = name_to_value_map.find(element.getString());
+                if (value == name_to_value_map.end())
+                    return false;
+                col_vec.insertValue(value->second);
+                return true;
+            }
+
+            return false;
+        }
+
+    private:
+        std::vector<std::pair<String, Type>> name_value_pairs;
+        std::unordered_map<std::string_view, Type> name_to_value_map;
+        std::unordered_set<Type> only_values;
+    };
+
+    class NullableNode : public Node
+    {
+    public:
+        explicit NullableNode(std::unique_ptr<Node> nested_) : nested(std::move(nested_)) {}
+
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            ColumnNullable & col_null = assert_cast<ColumnNullable &>(dest);
+            if (!nested->insertResultToColumn(col_null.getNestedColumn(), element))
+                return false;
+            col_null.getNullMapColumn().insertValue(0);
+            return true;
+        }
+
+    private:
+        std::unique_ptr<Node> nested;
+    };
+
+    class ArrayNode : public Node
+    {
+    public:
+        explicit ArrayNode(std::unique_ptr<Node> nested_) : nested(std::move(nested_)) {}
+
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            if (!element.isArray())
+                return false;
+
+            auto array = element.getArray();
+
+            ColumnArray & col_arr = assert_cast<ColumnArray &>(dest);
+            auto & data = col_arr.getData();
+            size_t old_size = data.size();
+            bool were_valid_elements = false;
+
+            for (auto value : array)
+            {
+                if (nested->insertResultToColumn(data, value))
+                    were_valid_elements = true;
+                else
+                    data.insertDefault();
+            }
+
+            if (!were_valid_elements)
+            {
+                data.popBack(data.size() - old_size);
+                return false;
+            }
+
+            col_arr.getOffsets().push_back(data.size());
+            return true;
+        }
+
+    private:
+        std::unique_ptr<Node> nested;
+    };
+
+    class TupleNode : public Node
+    {
+    public:
+        TupleNode(std::vector<std::unique_ptr<Node>> nested_, const std::vector<String> & explicit_names_) : nested(std::move(nested_)), explicit_names(explicit_names_)
+        {
+            for (size_t i = 0; i != explicit_names.size(); ++i)
+                name_to_index_map.emplace(explicit_names[i], i);
+        }
+
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            ColumnTuple & tuple = assert_cast<ColumnTuple &>(dest);
+            size_t old_size = dest.size();
+            bool were_valid_elements = false;
+
+            auto set_size = [&](size_t size)
+            {
+                for (size_t i = 0; i != tuple.tupleSize(); ++i)
+                {
+                    auto & col = tuple.getColumn(i);
+                    if (col.size() != size)
+                    {
+                        if (col.size() > size)
+                            col.popBack(col.size() - size);
+                        else
+                            while (col.size() < size)
+                                col.insertDefault();
+                    }
+                }
+            };
+
+            if (element.isArray())
+            {
+                auto array = element.getArray();
+                auto it = array.begin();
+
+                for (size_t index = 0; (index != nested.size()) && (it != array.end()); ++index)
+                {
+                    if (nested[index]->insertResultToColumn(tuple.getColumn(index), *it++))
+                        were_valid_elements = true;
+                    else
+                        tuple.getColumn(index).insertDefault();
+                }
+
+                set_size(old_size + static_cast<size_t>(were_valid_elements));
+                return were_valid_elements;
+            }
+
+            if (element.isObject())
+            {
+                auto object = element.getObject();
+                if (name_to_index_map.empty())
+                {
+                    auto it = object.begin();
+                    for (size_t index = 0; (index != nested.size()) && (it != object.end()); ++index)
+                    {
+                        if (nested[index]->insertResultToColumn(tuple.getColumn(index), (*it++).second))
+                            were_valid_elements = true;
+                        else
+                            tuple.getColumn(index).insertDefault();
+                    }
+                }
+                else
+                {
+                    for (const auto & [key, value] : object)
+                    {
+                        auto index = name_to_index_map.find(key);
+                        if (index != name_to_index_map.end())
+                        {
+                            if (nested[index->second]->insertResultToColumn(tuple.getColumn(index->second), value))
+                                were_valid_elements = true;
+                        }
+                    }
+                }
+
+                set_size(old_size + static_cast<size_t>(were_valid_elements));
+                return were_valid_elements;
+            }
+
+            return false;
+        }
+
+    private:
+        std::vector<std::unique_ptr<Node>> nested;
+        std::vector<String> explicit_names;
+        std::unordered_map<std::string_view, size_t> name_to_index_map;
+    };
+
+    class MapNode : public Node
+    {
+    public:
+        MapNode(std::unique_ptr<Node> key_, std::unique_ptr<Node> value_) : key(std::move(key_)), value(std::move(value_)) { }
+
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            if (!element.isObject())
+                return false;
+
+            ColumnMap & map_col = assert_cast<ColumnMap &>(dest);
+            auto & offsets = map_col.getNestedColumn().getOffsets();
+            auto & tuple_col = map_col.getNestedData();
+            auto & key_col = tuple_col.getColumn(0);
+            auto & value_col = tuple_col.getColumn(1);
+            size_t old_size = tuple_col.size();
+
+            auto object = element.getObject();
+            auto it = object.begin();
+            for (; it != object.end(); ++it)
+            {
+                auto pair = *it;
+
+                /// Insert key
+                key_col.insertData(pair.first.data(), pair.first.size());
+
+                /// Insert value
+                if (!value->insertResultToColumn(value_col, pair.second))
+                    value_col.insertDefault();
+            }
+
+            offsets.push_back(old_size + object.size());
+            return true;
+        }
+
+    private:
+        std::unique_ptr<Node> key;
+        std::unique_ptr<Node> value;
+    };
+
+    static std::unique_ptr<Node> build(const char * function_name, const DataTypePtr & type)
+    {
+        switch (type->getTypeId())
+        {
+            case TypeIndex::UInt8: return std::make_unique<NumericNode<UInt8>>();
+            case TypeIndex::UInt16: return std::make_unique<NumericNode<UInt16>>();
+            case TypeIndex::UInt32: return std::make_unique<NumericNode<UInt32>>();
+            case TypeIndex::UInt64: return std::make_unique<NumericNode<UInt64>>();
+            case TypeIndex::UInt128: return std::make_unique<NumericNode<UInt128>>();
+            case TypeIndex::UInt256: return std::make_unique<NumericNode<UInt256>>();
+            case TypeIndex::Int8: return std::make_unique<NumericNode<Int8>>();
+            case TypeIndex::Int16: return std::make_unique<NumericNode<Int16>>();
+            case TypeIndex::Int32: return std::make_unique<NumericNode<Int32>>();
+            case TypeIndex::Int64: return std::make_unique<NumericNode<Int64>>();
+            case TypeIndex::Int128: return std::make_unique<NumericNode<Int128>>();
+            case TypeIndex::Int256: return std::make_unique<NumericNode<Int256>>();
+            case TypeIndex::Float32: return std::make_unique<NumericNode<Float32>>();
+            case TypeIndex::Float64: return std::make_unique<NumericNode<Float64>>();
+            case TypeIndex::String: return std::make_unique<StringNode>();
+            case TypeIndex::FixedString: return std::make_unique<FixedStringNode>();
+            case TypeIndex::UUID: return std::make_unique<UUIDNode>();
+            case TypeIndex::LowCardinality:
+            {
+                // The low cardinality case is treated in two different ways:
+                // For FixedString type, an especial class is implemented for inserting the data in the destination column,
+                // as the string length must be passed in order to check and pad the incoming data.
+                // For the rest of low cardinality types, the insertion is done in their corresponding class, adapting the data
+                // as needed for the insertData function of the ColumnLowCardinality.
+                auto dictionary_type = typeid_cast<const DataTypeLowCardinality *>(type.get())->getDictionaryType();
+                if ((*dictionary_type).getTypeId() == TypeIndex::FixedString)
+                {
+                    auto fixed_length = typeid_cast<const DataTypeFixedString *>(dictionary_type.get())->getN();
+                    return std::make_unique<LowCardinalityFixedStringNode>(fixed_length);
+                }
+                return build(function_name, dictionary_type);
+            }
+            case TypeIndex::Decimal256: return std::make_unique<DecimalNode<Decimal256>>(type);
+            case TypeIndex::Decimal128: return std::make_unique<DecimalNode<Decimal128>>(type);
+            case TypeIndex::Decimal64: return std::make_unique<DecimalNode<Decimal64>>(type);
+            case TypeIndex::Decimal32: return std::make_unique<DecimalNode<Decimal32>>(type);
+            case TypeIndex::Enum8:
+                return std::make_unique<EnumNode<Int8>>(static_cast<const DataTypeEnum8 &>(*type).getValues());
+            case TypeIndex::Enum16:
+                return std::make_unique<EnumNode<Int16>>(static_cast<const DataTypeEnum16 &>(*type).getValues());
+            case TypeIndex::Nullable:
+            {
+                return std::make_unique<NullableNode>(build(function_name, static_cast<const DataTypeNullable &>(*type).getNestedType()));
+            }
+            case TypeIndex::Array:
+            {
+                return std::make_unique<ArrayNode>(build(function_name, static_cast<const DataTypeArray &>(*type).getNestedType()));
+            }
+            case TypeIndex::Tuple:
+            {
+                const auto & tuple = static_cast<const DataTypeTuple &>(*type);
+                const auto & tuple_elements = tuple.getElements();
+                std::vector<std::unique_ptr<Node>> elements;
+                elements.reserve(tuple_elements.size());
+                for (const auto & tuple_element : tuple_elements)
+                    elements.emplace_back(build(function_name, tuple_element));
+                return std::make_unique<TupleNode>(std::move(elements), tuple.haveExplicitNames() ? tuple.getElementNames() : Strings{});
+            }
+            case TypeIndex::Map:
+            {
+                const auto & map_type = static_cast<const DataTypeMap &>(*type);
+                const auto & key_type = map_type.getKeyType();
+                if (!isString(removeLowCardinality(key_type)))
+                    throw Exception(
+                        ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Function {} doesn't support the return type schema: {} with key type not String",
+                        String(function_name),
+                        type->getName());
+
+                const auto & value_type = map_type.getValueType();
+                return std::make_unique<MapNode>(build(function_name, key_type), build(function_name, value_type));
+            }
+            default:
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                                "Function {} doesn't support the return type schema: {}",
+                                String(function_name), type->getName());
+        }
+    }
+};
+
+
+template <typename JSONParser>
+class JSONExtractImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
+    {
+        if (arguments.size() < 2)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least two arguments", String(function_name));
+
+        const auto & col = arguments.back();
+        const auto * col_type_const = typeid_cast<const ColumnConst *>(col.column.get());
+        if (!col_type_const || !isString(col.type))
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                            "The last argument of function {} should "
+                            "be a constant string specifying the return data type, illegal value: {}",
+                            String(function_name), col.name);
+
+        return DataTypeFactory::instance().get(col_type_const->getValue<String>());
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 2; }
+
+    void prepare(const char * function_name, const ColumnsWithTypeAndName &, const DataTypePtr & result_type)
+    {
+        extract_tree = JSONExtractTree<JSONParser>::build(function_name, result_type);
+    }
+
+    bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        return extract_tree->insertResultToColumn(dest, element);
+    }
+
+protected:
+    std::unique_ptr<typename JSONExtractTree<JSONParser>::Node> extract_tree;
+};
+
+
+template <typename JSONParser>
+class JSONExtractKeysAndValuesImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
+    {
+        if (arguments.size() < 2)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least two arguments", String(function_name));
+
+        const auto & col = arguments.back();
+        const auto * col_type_const = typeid_cast<const ColumnConst *>(col.column.get());
+        if (!col_type_const || !isString(col.type))
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                            "The last argument of function {} should "
+                            "be a constant string specifying the values' data type, illegal value: {}",
+                            String(function_name), col.name);
+
+        DataTypePtr key_type = std::make_unique<DataTypeString>();
+        DataTypePtr value_type = DataTypeFactory::instance().get(col_type_const->getValue<String>());
+        DataTypePtr tuple_type = std::make_unique<DataTypeTuple>(DataTypes{key_type, value_type});
+        return std::make_unique<DataTypeArray>(tuple_type);
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 2; }
+
+    void prepare(const char * function_name, const ColumnsWithTypeAndName &, const DataTypePtr & result_type)
+    {
+        const auto tuple_type = typeid_cast<const DataTypeArray *>(result_type.get())->getNestedType();
+        const auto value_type = typeid_cast<const DataTypeTuple *>(tuple_type.get())->getElements()[1];
+        extract_tree = JSONExtractTree<JSONParser>::build(function_name, value_type);
+    }
+
+    bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        if (!element.isObject())
+            return false;
+
+        auto object = element.getObject();
+
+        auto & col_arr = assert_cast<ColumnArray &>(dest);
+        auto & col_tuple = assert_cast<ColumnTuple &>(col_arr.getData());
+        size_t old_size = col_tuple.size();
+        auto & col_key = assert_cast<ColumnString &>(col_tuple.getColumn(0));
+        auto & col_value = col_tuple.getColumn(1);
+
+        for (const auto & [key, value] : object)
+        {
+            if (extract_tree->insertResultToColumn(col_value, value))
+                col_key.insertData(key.data(), key.size());
+        }
+
+        if (col_tuple.size() == old_size)
+            return false;
+
+        col_arr.getOffsets().push_back(col_tuple.size());
+        return true;
+    }
+
+private:
+    std::unique_ptr<typename JSONExtractTree<JSONParser>::Node> extract_tree;
+};
+
+
+template <typename JSONParser>
+class JSONExtractRawImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        if (dest.getDataType() == TypeIndex::LowCardinality)
+        {
+            ColumnString::Chars chars;
+            WriteBufferFromVector<ColumnString::Chars> buf(chars, AppendModeTag());
+            traverse(element, buf);
+            buf.finalize();
+            assert_cast<ColumnLowCardinality &>(dest).insertData(reinterpret_cast<const char *>(chars.data()), chars.size());
+        }
+        else
+        {
+            ColumnString & col_str = assert_cast<ColumnString &>(dest);
+            auto & chars = col_str.getChars();
+            WriteBufferFromVector<ColumnString::Chars> buf(chars, AppendModeTag());
+            traverse(element, buf);
+            buf.finalize();
+            chars.push_back(0);
+            col_str.getOffsets().push_back(chars.size());
+        }
+        return true;
+    }
+
+    // We use insertResultToFixedStringColumn in case we are inserting raw data in a FixedString column
+    static bool insertResultToFixedStringColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        ColumnFixedString::Chars chars;
+        WriteBufferFromVector<ColumnFixedString::Chars> buf(chars, AppendModeTag());
+        traverse(element, buf);
+        buf.finalize();
+
+        auto & col_str = assert_cast<ColumnFixedString &>(dest);
+
+        if (chars.size() > col_str.getN())
+            return false;
+
+        chars.resize_fill(col_str.getN());
+        col_str.insertData(reinterpret_cast<const char *>(chars.data()), chars.size());
+
+
+        return true;
+    }
+
+    // We use insertResultToLowCardinalityFixedStringColumn in case we are inserting raw data in a Low Cardinality FixedString column
+    static bool insertResultToLowCardinalityFixedStringColumn(IColumn & dest, const Element & element, size_t fixed_length)
+    {
+        if (element.getObject().size() > fixed_length)
+            return false;
+
+        ColumnFixedString::Chars chars;
+        WriteBufferFromVector<ColumnFixedString::Chars> buf(chars, AppendModeTag());
+        traverse(element, buf);
+        buf.finalize();
+
+        if (chars.size() > fixed_length)
+            return false;
+        chars.resize_fill(fixed_length);
+        assert_cast<ColumnLowCardinality &>(dest).insertData(reinterpret_cast<const char *>(chars.data()), chars.size());
+
+        return true;
+    }
+
+private:
+    static void traverse(const Element & element, WriteBuffer & buf)
+    {
+        if (element.isInt64())
+        {
+            writeIntText(element.getInt64(), buf);
+            return;
+        }
+        if (element.isUInt64())
+        {
+            writeIntText(element.getUInt64(), buf);
+            return;
+        }
+        if (element.isDouble())
+        {
+            writeFloatText(element.getDouble(), buf);
+            return;
+        }
+        if (element.isBool())
+        {
+            if (element.getBool())
+                writeCString("true", buf);
+            else
+                writeCString("false", buf);
+            return;
+        }
+        if (element.isString())
+        {
+            writeJSONString(element.getString(), buf, formatSettings());
+            return;
+        }
+        if (element.isArray())
+        {
+            writeChar('[', buf);
+            bool need_comma = false;
+            for (auto value : element.getArray())
+            {
+                if (std::exchange(need_comma, true))
+                    writeChar(',', buf);
+                traverse(value, buf);
+            }
+            writeChar(']', buf);
+            return;
+        }
+        if (element.isObject())
+        {
+            writeChar('{', buf);
+            bool need_comma = false;
+            for (auto [key, value] : element.getObject())
+            {
+                if (std::exchange(need_comma, true))
+                    writeChar(',', buf);
+                writeJSONString(key, buf, formatSettings());
+                writeChar(':', buf);
+                traverse(value, buf);
+            }
+            writeChar('}', buf);
+            return;
+        }
+        if (element.isNull())
+        {
+            writeCString("null", buf);
+            return;
+        }
+    }
+
+    static const FormatSettings & formatSettings()
+    {
+        static const FormatSettings the_instance = []
+        {
+            FormatSettings settings;
+            settings.json.escape_forward_slashes = false;
+            return settings;
+        }();
+        return the_instance;
+    }
+};
+
+
+template <typename JSONParser>
+class JSONExtractArrayRawImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        if (!element.isArray())
+            return false;
+
+        auto array = element.getArray();
+        ColumnArray & col_res = assert_cast<ColumnArray &>(dest);
+
+        for (auto value : array)
+            JSONExtractRawImpl<JSONParser>::insertResultToColumn(col_res.getData(), value, {});
+
+        col_res.getOffsets().push_back(col_res.getOffsets().back() + array.size());
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+class JSONExtractKeysAndValuesRawImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        DataTypePtr string_type = std::make_unique<DataTypeString>();
+        DataTypePtr tuple_type = std::make_unique<DataTypeTuple>(DataTypes{string_type, string_type});
+        return std::make_unique<DataTypeArray>(tuple_type);
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        if (!element.isObject())
+            return false;
+
+        auto object = element.getObject();
+
+        auto & col_arr = assert_cast<ColumnArray &>(dest);
+        auto & col_tuple = assert_cast<ColumnTuple &>(col_arr.getData());
+        auto & col_key = assert_cast<ColumnString &>(col_tuple.getColumn(0));
+        auto & col_value = assert_cast<ColumnString &>(col_tuple.getColumn(1));
+
+        for (const auto & [key, value] : object)
+        {
+            col_key.insertData(key.data(), key.size());
+            JSONExtractRawImpl<JSONParser>::insertResultToColumn(col_value, value, {});
+        }
+
+        col_arr.getOffsets().push_back(col_arr.getOffsets().back() + object.size());
+        return true;
+    }
+};
+
+template <typename JSONParser>
+class JSONExtractKeysImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_unique<DataTypeArray>(std::make_shared<DataTypeString>());
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    bool insertResultToColumn(IColumn & dest, const Element & element, std::string_view)
+    {
+        if (!element.isObject())
+            return false;
+
+        auto object = element.getObject();
+
+        ColumnArray & col_res = assert_cast<ColumnArray &>(dest);
+        auto & col_key = assert_cast<ColumnString &>(col_res.getData());
+
+        for (const auto & [key, value] : object)
+        {
+            col_key.insertData(key.data(), key.size());
+        }
+
+        col_res.getOffsets().push_back(col_res.getOffsets().back() + object.size());
+        return true;
+    }
+};
+
+}
diff --git a/src/Functions/FunctionsLogical.h b/src/Functions/FunctionsLogical.h
index 833191866e5..b2a59c51123 100644
--- a/src/Functions/FunctionsLogical.h
+++ b/src/Functions/FunctionsLogical.h
@@ -11,12 +11,8 @@
 
 
 #if USE_EMBEDDED_COMPILER
-#include <DataTypes/Native.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <llvm/IR/IRBuilder.h>
-#pragma GCC diagnostic pop
+#    include <DataTypes/Native.h>
+#    include <llvm/IR/IRBuilder.h>
 #endif
 
 
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index 2f2a0c3a1a9..3d1028c6d35 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -703,7 +703,8 @@ public:
             && !executeNum<Float64>(in, out, boundaries)
             && !executeDecimal<Decimal32>(in, out, boundaries)
             && !executeDecimal<Decimal64>(in, out, boundaries)
-            && !executeDecimal<Decimal128>(in, out, boundaries))
+            && !executeDecimal<Decimal128>(in, out, boundaries)
+            && !executeDecimal<Decimal256>(in, out, boundaries))
         {
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}", in->getName(), getName());
         }
diff --git a/src/Functions/FunctionsStringSimilarity.cpp b/src/Functions/FunctionsStringSimilarity.cpp
index 0cc0248baf4..7c0db701302 100644
--- a/src/Functions/FunctionsStringSimilarity.cpp
+++ b/src/Functions/FunctionsStringSimilarity.cpp
@@ -108,6 +108,10 @@ struct NgramDistanceImpl
 
         if constexpr (case_insensitive)
         {
+#if defined(MEMORY_SANITIZER)
+            /// Due to PODArray padding accessing more elements should be OK
+            __msan_unpoison(code_points + (N - 1), padding_offset * sizeof(CodePoint));
+#endif
             /// We really need template lambdas with C++20 to do it inline
             unrollLowering<N - 1>(code_points, std::make_index_sequence<padding_offset>());
         }
@@ -285,9 +289,9 @@ struct NgramDistanceImpl
             size_t first_size = dispatchSearcher(calculateHaystackStatsAndMetric<false>, data.data(), data_size, common_stats.get(), distance, nullptr);
             /// For !symmetric version we should not use first_size.
             if constexpr (symmetric)
-                res = distance * 1.f / std::max(first_size + second_size, static_cast<size_t>(1));
+                res = distance * 1.f / std::max(first_size + second_size, 1uz);
             else
-                res = 1.f - distance * 1.f / std::max(second_size, static_cast<size_t>(1));
+                res = 1.f - distance * 1.f / std::max(second_size, 1uz);
         }
         else
         {
@@ -353,9 +357,9 @@ struct NgramDistanceImpl
 
                 /// For !symmetric version we should not use haystack_stats_size.
                 if constexpr (symmetric)
-                    res[i] = distance * 1.f / std::max(haystack_stats_size + needle_stats_size, static_cast<size_t>(1));
+                    res[i] = distance * 1.f / std::max(haystack_stats_size + needle_stats_size, 1uz);
                 else
-                    res[i] = 1.f - distance * 1.f / std::max(needle_stats_size, static_cast<size_t>(1));
+                    res[i] = 1.f - distance * 1.f / std::max(needle_stats_size, 1uz);
             }
             else
             {
@@ -424,7 +428,7 @@ struct NgramDistanceImpl
                     for (size_t j = 0; j < needle_stats_size; ++j)
                         --common_stats[needle_ngram_storage[j]];
 
-                    res[i] = 1.f - distance * 1.f / std::max(needle_stats_size, static_cast<size_t>(1));
+                    res[i] = 1.f - distance * 1.f / std::max(needle_stats_size, 1uz);
                 }
                 else
                 {
@@ -471,9 +475,9 @@ struct NgramDistanceImpl
                     ngram_storage.get());
                 /// For !symmetric version we should not use haystack_stats_size.
                 if constexpr (symmetric)
-                    res[i] = distance * 1.f / std::max(haystack_stats_size + needle_stats_size, static_cast<size_t>(1));
+                    res[i] = distance * 1.f / std::max(haystack_stats_size + needle_stats_size, 1uz);
                 else
-                    res[i] = 1.f - distance * 1.f / std::max(needle_stats_size, static_cast<size_t>(1));
+                    res[i] = 1.f - distance * 1.f / std::max(needle_stats_size, 1uz);
             }
             else
             {
diff --git a/src/Functions/GatherUtils/ArraySinkVisitor.h b/src/Functions/GatherUtils/ArraySinkVisitor.h
index 46c8a38ec8d..e4ec5233c80 100644
--- a/src/Functions/GatherUtils/ArraySinkVisitor.h
+++ b/src/Functions/GatherUtils/ArraySinkVisitor.h
@@ -4,7 +4,6 @@
 
 namespace DB::GatherUtils
 {
-#pragma GCC visibility push(hidden)
 
 template <typename T>
 struct NumericArraySink;
@@ -32,5 +31,4 @@ protected:
     ~ArraySinkVisitorImpl() = default;
 };
 
-#pragma GCC visibility pop
 }
diff --git a/src/Functions/GatherUtils/ArraySourceVisitor.h b/src/Functions/GatherUtils/ArraySourceVisitor.h
index f2e40aac262..024c0edc847 100644
--- a/src/Functions/GatherUtils/ArraySourceVisitor.h
+++ b/src/Functions/GatherUtils/ArraySourceVisitor.h
@@ -4,7 +4,6 @@
 
 namespace DB::GatherUtils
 {
-#pragma GCC visibility push(hidden)
 
 template <typename T>
 struct NumericArraySource;
@@ -33,5 +32,4 @@ protected:
     ~ArraySourceVisitorImpl() = default;
 };
 
-#pragma GCC visibility pop
 }
diff --git a/src/Functions/GatherUtils/CMakeLists.txt b/src/Functions/GatherUtils/CMakeLists.txt
index fe600f86d07..376ca6613d8 100644
--- a/src/Functions/GatherUtils/CMakeLists.txt
+++ b/src/Functions/GatherUtils/CMakeLists.txt
@@ -4,14 +4,6 @@ add_headers_and_sources(clickhouse_functions_gatherutils .)
 add_library(clickhouse_functions_gatherutils ${clickhouse_functions_gatherutils_sources} ${clickhouse_functions_gatherutils_headers})
 target_link_libraries(clickhouse_functions_gatherutils PRIVATE dbms)
 
-if (HAS_SUGGEST_OVERRIDE)
-    target_compile_definitions(clickhouse_functions_gatherutils PUBLIC HAS_SUGGEST_OVERRIDE)
-endif()
-
-if (HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
-    target_compile_definitions(clickhouse_functions_gatherutils PUBLIC HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
-endif()
-
 if (OMIT_HEAVY_DEBUG_SYMBOLS)
     target_compile_options(clickhouse_functions_gatherutils PRIVATE "-g0")
 endif()
diff --git a/src/Functions/GatherUtils/IArraySink.h b/src/Functions/GatherUtils/IArraySink.h
index 146cb456df7..81ced193e97 100644
--- a/src/Functions/GatherUtils/IArraySink.h
+++ b/src/Functions/GatherUtils/IArraySink.h
@@ -24,12 +24,9 @@ struct IArraySink
     }
 };
 
-#pragma GCC visibility push(hidden)
-
 template <typename Derived>
 class ArraySinkImpl : public Visitable<Derived, IArraySink, ArraySinkVisitor> {};
 
-#pragma GCC visibility pop
 }
 
 }
diff --git a/src/Functions/GatherUtils/IArraySource.h b/src/Functions/GatherUtils/IArraySource.h
index e225c378bcd..fc5653ddeac 100644
--- a/src/Functions/GatherUtils/IArraySource.h
+++ b/src/Functions/GatherUtils/IArraySource.h
@@ -30,12 +30,9 @@ struct IArraySource
     }
 };
 
-#pragma GCC visibility push(hidden)
-
 template <typename Derived>
 class ArraySourceImpl : public Visitable<Derived, IArraySource, ArraySourceVisitor> {};
 
-#pragma GCC visibility pop
 }
 
 }
diff --git a/src/Functions/GatherUtils/IValueSource.h b/src/Functions/GatherUtils/IValueSource.h
index d2ca13790f4..8278b7ea19b 100644
--- a/src/Functions/GatherUtils/IValueSource.h
+++ b/src/Functions/GatherUtils/IValueSource.h
@@ -26,12 +26,9 @@ struct IValueSource
     virtual bool isConst() const { return false; }
 };
 
-#pragma GCC visibility push(hidden)
-
 template <typename Derived>
 class ValueSourceImpl : public Visitable<Derived, IValueSource, ValueSourceVisitor> {};
 
-#pragma GCC visibility pop
 }
 
 }
diff --git a/src/Functions/GatherUtils/Selectors.h b/src/Functions/GatherUtils/Selectors.h
index 6b7454c4964..00367727a39 100644
--- a/src/Functions/GatherUtils/Selectors.h
+++ b/src/Functions/GatherUtils/Selectors.h
@@ -17,7 +17,6 @@ namespace ErrorCodes
 
 namespace GatherUtils
 {
-#pragma GCC visibility push(hidden)
 
 /// Base classes which selects template function implementation with concrete ArraySource or ArraySink
 /// Derived classes should implement selectImpl for ArraySourceSelector and ArraySinkSelector,
@@ -165,7 +164,6 @@ struct ArrayAndValueSourceSelectorBySink : public ArraySinkSelector<ArrayAndValu
     }
 };
 
-#pragma GCC visibility pop
 }
 
 }
diff --git a/src/Functions/GatherUtils/Sinks.h b/src/Functions/GatherUtils/Sinks.h
index e801ba9990c..a8054da1159 100644
--- a/src/Functions/GatherUtils/Sinks.h
+++ b/src/Functions/GatherUtils/Sinks.h
@@ -15,7 +15,6 @@
 
 namespace DB::GatherUtils
 {
-#pragma GCC visibility push(hidden)
 
 template <typename T>
 struct NumericArraySource;
@@ -215,5 +214,4 @@ struct NullableArraySink : public ArraySink
     }
 };
 
-#pragma GCC visibility pop
 }
diff --git a/src/Functions/GatherUtils/Slices.h b/src/Functions/GatherUtils/Slices.h
index 22f475adf59..186692ebcb2 100644
--- a/src/Functions/GatherUtils/Slices.h
+++ b/src/Functions/GatherUtils/Slices.h
@@ -4,7 +4,6 @@
 
 namespace DB::GatherUtils
 {
-#pragma GCC visibility push(hidden)
 
 template <typename T>
 struct NumericArraySlice
@@ -43,6 +42,5 @@ struct GenericValueSlice
     static constexpr size_t size = 1;
 };
 
-#pragma GCC visibility pop
 }
 
diff --git a/src/Functions/GatherUtils/Sources.h b/src/Functions/GatherUtils/Sources.h
index af6fc84beba..fad2be1f622 100644
--- a/src/Functions/GatherUtils/Sources.h
+++ b/src/Functions/GatherUtils/Sources.h
@@ -28,8 +28,6 @@ namespace ErrorCodes
 
 namespace GatherUtils
 {
-#pragma GCC visibility push(hidden)
-
 template <typename T> struct NumericArraySink;
 struct StringSink;
 struct FixedStringSink;
@@ -141,12 +139,8 @@ struct NumericArraySource : public ArraySourceImpl<NumericArraySource<T>>
 
 /// The methods can be virtual or not depending on the template parameter. See IStringSource.
 #pragma GCC diagnostic push
-#ifdef HAS_SUGGEST_OVERRIDE
-#   pragma GCC diagnostic ignored "-Wsuggest-override"
-#endif
-#ifdef HAS_SUGGEST_DESTRUCTOR_OVERRIDE
-#   pragma GCC diagnostic ignored "-Wsuggest-destructor-override"
-#endif
+#pragma GCC diagnostic ignored "-Wsuggest-override"
+#pragma GCC diagnostic ignored "-Wsuggest-destructor-override"
 
 template <typename Base>
 struct ConstSource : public Base
@@ -832,6 +826,4 @@ struct NullableValueSource : public ValueSource
 };
 
 }
-
-#pragma GCC visibility pop
 }
diff --git a/src/Functions/GatherUtils/ValueSourceVisitor.h b/src/Functions/GatherUtils/ValueSourceVisitor.h
index 5fd4ba1a57e..2178b93a5b8 100644
--- a/src/Functions/GatherUtils/ValueSourceVisitor.h
+++ b/src/Functions/GatherUtils/ValueSourceVisitor.h
@@ -4,7 +4,6 @@
 
 namespace DB::GatherUtils
 {
-#pragma GCC visibility push(hidden)
 
 template <typename T>
 struct NumericValueSource;
@@ -37,5 +36,4 @@ protected:
     ~ValueSourceVisitorImpl() = default;
 };
 
-#pragma GCC visibility pop
 }
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index 1f25794536b..7563135f21f 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -3,6 +3,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/SipHash.h>
+#include <Core/Block.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnTuple.h>
@@ -20,10 +21,7 @@
 #include "config.h"
 
 #if USE_EMBEDDED_COMPILER
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wunused-parameter"
 #    include <llvm/IR/IRBuilder.h>
-#    pragma GCC diagnostic pop
 #endif
 
 
@@ -323,7 +321,7 @@ ColumnPtr IExecutableFunction::execute(const ColumnsWithTypeAndName & arguments,
             const auto * column_sparse = checkAndGetColumn<ColumnSparse>(arguments[i].column.get());
             /// In rare case, when sparse column doesn't have default values,
             /// it's more convenient to convert it to full before execution of function.
-            if (column_sparse && column_sparse->getNumberOfDefaults())
+            if (column_sparse && column_sparse->getNumberOfDefaultRows())
             {
                 sparse_column_position = i;
                 ++num_sparse_columns;
@@ -361,7 +359,9 @@ ColumnPtr IExecutableFunction::execute(const ColumnsWithTypeAndName & arguments,
                 return res->cloneResized(input_rows_count);
 
             /// If default of sparse column is changed after execution of function, convert to full column.
-            if (!result_type->supportsSparseSerialization() || !res->isDefaultAt(0))
+            /// If there are any default in non-zero position after execution of function, convert to full column.
+            /// Currently there is no easy way to rebuild sparse column with new offsets.
+            if (!result_type->supportsSparseSerialization() || !res->isDefaultAt(0) || res->getNumberOfDefaultRows() != 1)
             {
                 const auto & offsets_data = assert_cast<const ColumnVector<UInt64> &>(*sparse_offsets).getData();
                 return res->createWithOffsets(offsets_data, (*res)[0], input_rows_count, /*shift=*/ 1);
diff --git a/src/Functions/IFunctionDateOrDateTime.h b/src/Functions/IFunctionDateOrDateTime.h
index 343511f0f91..c22754eecd7 100644
--- a/src/Functions/IFunctionDateOrDateTime.h
+++ b/src/Functions/IFunctionDateOrDateTime.h
@@ -2,8 +2,10 @@
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
-#include <Functions/IFunction.h>
 #include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+
+#include <Functions/IFunction.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <Functions/DateTimeTransforms.h>
 #include <Functions/TransformDateTime64.h>
@@ -46,36 +48,60 @@ public:
     {
         if constexpr (std::is_same_v<typename Transform::FactorTransform, ZeroTransform>)
             return { .is_monotonic = true, .is_always_monotonic = true };
-
-        const IFunction::Monotonicity is_monotonic = { .is_monotonic = true };
-        const IFunction::Monotonicity is_not_monotonic;
-
-        const DateLUTImpl * date_lut = &DateLUT::instance();
-        if (const auto * timezone = dynamic_cast<const TimezoneMixin *>(&type))
-            date_lut = &timezone->getTimeZone();
-
-        if (left.isNull() || right.isNull())
-            return is_not_monotonic;
-
-        /// The function is monotonous on the [left, right] segment, if the factor transformation returns the same values for them.
-
-        if (checkAndGetDataType<DataTypeDate>(&type))
-        {
-            return Transform::FactorTransform::execute(UInt16(left.get<UInt64>()), *date_lut)
-                == Transform::FactorTransform::execute(UInt16(right.get<UInt64>()), *date_lut)
-                ? is_monotonic : is_not_monotonic;
-        }
-        else if (checkAndGetDataType<DataTypeDate32>(&type))
-        {
-            return Transform::FactorTransform::execute(Int32(left.get<UInt64>()), *date_lut)
-                   == Transform::FactorTransform::execute(Int32(right.get<UInt64>()), *date_lut)
-                   ? is_monotonic : is_not_monotonic;
-        }
         else
         {
-            return Transform::FactorTransform::execute(UInt32(left.get<UInt64>()), *date_lut)
-                == Transform::FactorTransform::execute(UInt32(right.get<UInt64>()), *date_lut)
-                ? is_monotonic : is_not_monotonic;
+            const IFunction::Monotonicity is_monotonic = { .is_monotonic = true };
+            const IFunction::Monotonicity is_not_monotonic;
+
+            const DateLUTImpl * date_lut = &DateLUT::instance();
+            if (const auto * timezone = dynamic_cast<const TimezoneMixin *>(&type))
+                date_lut = &timezone->getTimeZone();
+
+            if (left.isNull() || right.isNull())
+                return is_not_monotonic;
+
+            const auto * type_ptr = &type;
+
+            if (const auto * lc_type = checkAndGetDataType<DataTypeLowCardinality>(type_ptr))
+                type_ptr = lc_type->getDictionaryType().get();
+
+            if (const auto * nullable_type = checkAndGetDataType<DataTypeNullable>(type_ptr))
+                type_ptr = nullable_type->getNestedType().get();
+
+            /// The function is monotonous on the [left, right] segment, if the factor transformation returns the same values for them.
+
+            if (checkAndGetDataType<DataTypeDate>(type_ptr))
+            {
+                return Transform::FactorTransform::execute(UInt16(left.get<UInt64>()), *date_lut)
+                    == Transform::FactorTransform::execute(UInt16(right.get<UInt64>()), *date_lut)
+                    ? is_monotonic : is_not_monotonic;
+            }
+            else if (checkAndGetDataType<DataTypeDate32>(type_ptr))
+            {
+                return Transform::FactorTransform::execute(Int32(left.get<UInt64>()), *date_lut)
+                       == Transform::FactorTransform::execute(Int32(right.get<UInt64>()), *date_lut)
+                       ? is_monotonic : is_not_monotonic;
+            }
+            else if (checkAndGetDataType<DataTypeDateTime>(type_ptr))
+            {
+                return Transform::FactorTransform::execute(UInt32(left.get<UInt64>()), *date_lut)
+                    == Transform::FactorTransform::execute(UInt32(right.get<UInt64>()), *date_lut)
+                    ? is_monotonic : is_not_monotonic;
+            }
+            else
+            {
+                assert(checkAndGetDataType<DataTypeDateTime64>(type_ptr));
+
+                const auto & left_date_time = left.get<DateTime64>();
+                TransformDateTime64<typename Transform::FactorTransform> transformer_left(left_date_time.getScale());
+
+                const auto & right_date_time = right.get<DateTime64>();
+                TransformDateTime64<typename Transform::FactorTransform> transformer_right(right_date_time.getScale());
+
+                return transformer_left.execute(left_date_time.getValue(), *date_lut)
+                    == transformer_right.execute(right_date_time.getValue(), *date_lut)
+                    ? is_monotonic : is_not_monotonic;
+            }
         }
     }
 
diff --git a/src/Functions/IsOperation.h b/src/Functions/IsOperation.h
index 39f9114f5e0..0c54901579e 100644
--- a/src/Functions/IsOperation.h
+++ b/src/Functions/IsOperation.h
@@ -5,7 +5,9 @@ namespace DB
 
 /// These classes should be present in DB namespace (cannot place them into namelesspace)
 template <typename> struct AbsImpl;
+template <typename> struct BitCountImpl;
 template <typename> struct NegateImpl;
+template <typename> struct SignImpl;
 template <typename, typename> struct PlusImpl;
 template <typename, typename> struct MinusImpl;
 template <typename, typename> struct MultiplyImpl;
@@ -22,9 +24,6 @@ template <typename, typename> struct LessOrEqualsOp;
 template <typename, typename> struct GreaterOrEqualsOp;
 template <typename, typename> struct BitHammingDistanceImpl;
 
-template <typename>
-struct SignImpl;
-
 template <template <typename, typename> typename Op1, template <typename, typename> typename Op2>
 struct IsSameOperation
 {
@@ -37,6 +36,7 @@ struct IsUnaryOperation
     static constexpr bool abs = std::is_same_v<Op<Int8>, AbsImpl<Int8>>;
     static constexpr bool negate = std::is_same_v<Op<Int8>, NegateImpl<Int8>>;
     static constexpr bool sign = std::is_same_v<Op<Int8>, SignImpl<Int8>>;
+    static constexpr bool bit_count = std::is_same_v<Op<Int8>, BitCountImpl<Int8>>;
 };
 
 template <template <typename, typename> typename Op>
diff --git a/src/Functions/JSONArrayLength.cpp b/src/Functions/JSONArrayLength.cpp
index 4f784ce140d..a82c50360f9 100644
--- a/src/Functions/JSONArrayLength.cpp
+++ b/src/Functions/JSONArrayLength.cpp
@@ -100,8 +100,8 @@ namespace
 
 REGISTER_FUNCTION(JSONArrayLength)
 {
-    factory.registerFunction<FunctionJSONArrayLength>(Documentation{
-        "Returns the number of elements in the outermost JSON array. The function returns NULL if input JSON string is invalid."});
+    factory.registerFunction<FunctionJSONArrayLength>(FunctionDocumentation{
+        .description="Returns the number of elements in the outermost JSON array. The function returns NULL if input JSON string is invalid."});
 
     /// For Spark compatibility.
     factory.registerAlias("JSON_ARRAY_LENGTH", "JSONArrayLength", FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.cpp b/src/Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.cpp
index f0ed178e1c2..709ef89dd3c 100644
--- a/src/Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.cpp
+++ b/src/Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.cpp
@@ -1,9 +1,11 @@
 #include <Functions/JSONPath/ASTs/ASTJSONPathMemberAccess.h>
 #include <Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.h>
 
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/Lexer.h>
+#include <Common/StringUtils/StringUtils.h>
 
 namespace DB
 {
@@ -16,18 +18,60 @@ namespace DB
  */
 bool ParserJSONPathMemberAccess::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (pos->type != TokenType::Dot)
+    // There's a special case, that a path member can begin with number
+    // some invalid cases as following
+    //   - ".123" is parsed as a number, not a dot and a number
+    //   - ".123abc" is parsed as two parts, a number ".123" and a token "abc"
+    //   - ".abc" is parsed as two parts. a dot and a token "abc"
+    // "$..123abc" is parsed into three parts, ".", ".123" and "abc"
+    if (pos->type != TokenType::Dot && pos->type != TokenType::Number)
         return false;
+    if (pos->type != TokenType::Number)
+    {
+        ++pos;
+        // Check the case "$..123abc"
+        if (pos->type == TokenType::Number)
+        {
+            return false;
+        }
+    }
 
-    ++pos;
-
-    if (pos->type != TokenType::BareWord && pos->type !=TokenType::QuotedIdentifier)
-        return false;
-
-    ParserIdentifier name_p;
     ASTPtr member_name;
-    if (!name_p.parse(pos, member_name, expected))
-        return false;
+
+    if (pos->type == TokenType::Number)[[unlikely]]
+    {
+        for (const auto * c = pos->begin; c != pos->end; ++c)
+        {
+            if (*c == '.' && c == pos->begin)
+                continue;
+            if (!isNumericASCII(*c))
+            {
+                return false;
+            }
+        }
+        const auto * last_begin = *pos->begin == '.' ? pos->begin + 1 : pos->begin;
+        const auto * last_end = pos->end;
+        ++pos;
+
+        if (pos.isValid() && pos->type == TokenType::BareWord && pos->begin == last_end)
+        {
+            member_name = std::make_shared<ASTIdentifier>(String(last_begin, pos->end));
+            ++pos;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    else
+    {
+        if (pos->type != TokenType::BareWord && pos->type != TokenType::QuotedIdentifier)
+            return false;
+
+        ParserIdentifier name_p;
+        if (!name_p.parse(pos, member_name, expected))
+            return false;
+    }
 
     auto member_access = std::make_shared<ASTJSONPathMemberAccess>();
     node = member_access;
diff --git a/src/Functions/JSONPath/Parsers/ParserJSONPathMemberSquareBracketAccess.cpp b/src/Functions/JSONPath/Parsers/ParserJSONPathMemberSquareBracketAccess.cpp
new file mode 100644
index 00000000000..93e0639ccfe
--- /dev/null
+++ b/src/Functions/JSONPath/Parsers/ParserJSONPathMemberSquareBracketAccess.cpp
@@ -0,0 +1,44 @@
+#include "ParserJSONPathMemberSquareBracketAccess.h"
+#include <memory>
+#include <Functions/JSONPath/ASTs/ASTJSONPathMemberAccess.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ExpressionElementParsers.h>
+
+namespace DB
+{
+bool ParserJSONPathMemberSquareBracketAccess::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    if (pos->type != TokenType::OpeningSquareBracket)
+        return false;
+    ++pos;
+    ASTPtr member_name;
+    if (pos->type == TokenType::BareWord || pos->type == TokenType::QuotedIdentifier)
+    {
+        ParserIdentifier name_p;
+        if (!name_p.parse(pos, member_name, expected))
+            return false;
+    }
+    else if (pos->type == TokenType::StringLiteral)
+    {
+        ReadBufferFromMemory in(pos->begin, pos->size());
+        String name;
+        readQuotedStringWithSQLStyle(name, in);
+        member_name = std::make_shared<ASTIdentifier>(name);
+        ++pos;
+    }
+    else
+    {
+        return false;
+    }
+    if (pos->type != TokenType::ClosingSquareBracket)
+    {
+        return false;
+    }
+    ++pos;
+    auto member_access = std::make_shared<ASTJSONPathMemberAccess>();
+    node = member_access;
+    return tryGetIdentifierNameInto(member_name, member_access->member_name);
+}
+}
diff --git a/src/Functions/JSONPath/Parsers/ParserJSONPathMemberSquareBracketAccess.h b/src/Functions/JSONPath/Parsers/ParserJSONPathMemberSquareBracketAccess.h
new file mode 100644
index 00000000000..b682ec5bb96
--- /dev/null
+++ b/src/Functions/JSONPath/Parsers/ParserJSONPathMemberSquareBracketAccess.h
@@ -0,0 +1,17 @@
+#pragma once
+#include <Parsers/IParserBase.h>
+// cases
+// - [ident]
+// - ['ident']
+// - ["ident"]
+namespace DB
+{
+class ParserJSONPathMemberSquareBracketAccess : public IParserBase
+{
+private:
+    const char * getName() const override { return "ParserJSONPathMemberSquareBracketAccess"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+public:
+    explicit ParserJSONPathMemberSquareBracketAccess() = default;
+};
+}
diff --git a/src/Functions/JSONPath/Parsers/ParserJSONPathQuery.cpp b/src/Functions/JSONPath/Parsers/ParserJSONPathQuery.cpp
index c18b2ad9b31..d8d633a1ec9 100644
--- a/src/Functions/JSONPath/Parsers/ParserJSONPathQuery.cpp
+++ b/src/Functions/JSONPath/Parsers/ParserJSONPathQuery.cpp
@@ -2,6 +2,7 @@
 #include <Functions/JSONPath/Parsers/ParserJSONPathQuery.h>
 #include <Functions/JSONPath/Parsers/ParserJSONPathRoot.h>
 #include <Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.h>
+#include <Functions/JSONPath/Parsers/ParserJSONPathMemberSquareBracketAccess.h>
 #include <Functions/JSONPath/Parsers/ParserJSONPathRange.h>
 #include <Functions/JSONPath/Parsers/ParserJSONPathStar.h>
 
@@ -19,6 +20,7 @@ bool ParserJSONPathQuery::parseImpl(Pos & pos, ASTPtr & query, Expected & expect
 {
     query = std::make_shared<ASTJSONPathQuery>();
     ParserJSONPathMemberAccess parser_jsonpath_member_access;
+    ParserJSONPathMemberSquareBracketAccess parser_jsonpath_member_square_bracket_access;
     ParserJSONPathRange parser_jsonpath_range;
     ParserJSONPathStar parser_jsonpath_star;
     ParserJSONPathRoot parser_jsonpath_root;
@@ -32,6 +34,7 @@ bool ParserJSONPathQuery::parseImpl(Pos & pos, ASTPtr & query, Expected & expect
 
     ASTPtr accessor;
     while (parser_jsonpath_member_access.parse(pos, accessor, expected)
+           || parser_jsonpath_member_square_bracket_access.parse(pos, accessor, expected)
            || parser_jsonpath_range.parse(pos, accessor, expected)
            || parser_jsonpath_star.parse(pos, accessor, expected))
     {
diff --git a/src/Functions/PolygonUtils.h b/src/Functions/PolygonUtils.h
index d1504ad2c2e..9aae42cce41 100644
--- a/src/Functions/PolygonUtils.h
+++ b/src/Functions/PolygonUtils.h
@@ -11,12 +11,10 @@
 #include <base/range.h>
 
 /// Warning in boost::geometry during template strategy substitution.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
 #include <boost/geometry.hpp>
-
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
diff --git a/src/Functions/ReplaceRegexpImpl.h b/src/Functions/ReplaceRegexpImpl.h
index 88d7a40d2dd..7e3af1e62d9 100644
--- a/src/Functions/ReplaceRegexpImpl.h
+++ b/src/Functions/ReplaceRegexpImpl.h
@@ -13,6 +13,7 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int BAD_ARGUMENTS;
 }
 
@@ -28,9 +29,11 @@ struct ReplaceRegexpTraits
 /** Replace all matches of regexp 'needle' to string 'replacement'. 'needle' and 'replacement' are constants.
   * 'replacement' can contain substitutions, for example: '\2-\3-\1'
   */
-template <ReplaceRegexpTraits::Replace replace>
+template <typename Name, ReplaceRegexpTraits::Replace replace>
 struct ReplaceRegexpImpl
 {
+    static constexpr auto name = Name::name;
+
     struct Instruction
     {
         /// If not negative, perform substitution of n-th subpattern from the regexp match.
@@ -162,18 +165,21 @@ struct ReplaceRegexpImpl
         ++res_offset;
     }
 
-    static void vector(
-        const ColumnString::Chars & data,
-        const ColumnString::Offsets & offsets,
+    static void vectorConstantConstant(
+        const ColumnString::Chars & haystack_data,
+        const ColumnString::Offsets & haystack_offsets,
         const String & needle,
         const String & replacement,
         ColumnString::Chars & res_data,
         ColumnString::Offsets & res_offsets)
     {
+        if (needle.empty())
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
+
         ColumnString::Offset res_offset = 0;
-        res_data.reserve(data.size());
-        size_t size = offsets.size();
-        res_offsets.resize(size);
+        res_data.reserve(haystack_data.size());
+        size_t haystack_size = haystack_offsets.size();
+        res_offsets.resize(haystack_size);
 
         re2_st::RE2::Options regexp_options;
         /// Don't write error messages to stderr.
@@ -182,39 +188,89 @@ struct ReplaceRegexpImpl
         re2_st::RE2 searcher(needle, regexp_options);
 
         if (!searcher.ok())
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS,
-                "The pattern argument is not a valid re2 pattern: {}",
-                searcher.error());
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "The pattern argument is not a valid re2 pattern: {}", searcher.error());
 
         int num_captures = std::min(searcher.NumberOfCapturingGroups() + 1, max_captures);
 
         Instructions instructions = createInstructions(replacement, num_captures);
 
         /// Cannot perform search for whole columns. Will process each string separately.
-        for (size_t i = 0; i < size; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
-            size_t from = i > 0 ? offsets[i - 1] : 0;
-            const char * haystack_data = reinterpret_cast<const char *>(data.data() + from);
-            const size_t haystack_length = static_cast<unsigned>(offsets[i] - from - 1);
+            size_t from = i > 0 ? haystack_offsets[i - 1] : 0;
 
-            processString(haystack_data, haystack_length, res_data, res_offset, searcher, num_captures, instructions);
+            const char * hs_data = reinterpret_cast<const char *>(haystack_data.data() + from);
+            const size_t hs_length = static_cast<unsigned>(haystack_offsets[i] - from - 1);
+
+            processString(hs_data, hs_length, res_data, res_offset, searcher, num_captures, instructions);
             res_offsets[i] = res_offset;
         }
     }
 
-    static void vectorFixed(
-        const ColumnString::Chars & data,
-        size_t n,
-        const String & needle,
+    static void vectorVectorConstant(
+        const ColumnString::Chars & haystack_data,
+        const ColumnString::Offsets & haystack_offsets,
+        const ColumnString::Chars & needle_data,
+        const ColumnString::Offsets & needle_offsets,
         const String & replacement,
         ColumnString::Chars & res_data,
         ColumnString::Offsets & res_offsets)
     {
+        assert(haystack_offsets.size() == needle_offsets.size());
+
         ColumnString::Offset res_offset = 0;
-        size_t size = data.size() / n;
-        res_data.reserve(data.size());
-        res_offsets.resize(size);
+        res_data.reserve(haystack_data.size());
+        size_t haystack_size = haystack_offsets.size();
+        res_offsets.resize(haystack_size);
+
+        re2_st::RE2::Options regexp_options;
+        /// Don't write error messages to stderr.
+        regexp_options.set_log_errors(false);
+
+        /// Cannot perform search for whole columns. Will process each string separately.
+        for (size_t i = 0; i < haystack_size; ++i)
+        {
+            size_t hs_from = i > 0 ? haystack_offsets[i - 1] : 0;
+            const char * hs_data = reinterpret_cast<const char *>(haystack_data.data() + hs_from);
+            const size_t hs_length = static_cast<unsigned>(haystack_offsets[i] - hs_from - 1);
+
+            size_t ndl_from = i > 0 ? needle_offsets[i - 1] : 0;
+            const char * ndl_data = reinterpret_cast<const char *>(needle_data.data() + ndl_from);
+            const size_t ndl_length = static_cast<unsigned>(needle_offsets[i] - ndl_from - 1);
+            std::string_view needle(ndl_data, ndl_length);
+
+            if (needle.empty())
+                throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
+
+            re2_st::RE2 searcher(needle, regexp_options);
+            if (!searcher.ok())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "The pattern argument is not a valid re2 pattern: {}", searcher.error());
+            int num_captures = std::min(searcher.NumberOfCapturingGroups() + 1, max_captures);
+            Instructions instructions = createInstructions(replacement, num_captures);
+
+            processString(hs_data, hs_length, res_data, res_offset, searcher, num_captures, instructions);
+            res_offsets[i] = res_offset;
+        }
+    }
+
+    static void vectorConstantVector(
+        const ColumnString::Chars & haystack_data,
+        const ColumnString::Offsets & haystack_offsets,
+        const String & needle,
+        const ColumnString::Chars & replacement_data,
+        const ColumnString::Offsets & replacement_offsets,
+        ColumnString::Chars & res_data,
+        ColumnString::Offsets & res_offsets)
+    {
+        assert(haystack_offsets.size() == replacement_offsets.size());
+
+        if (needle.empty())
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
+
+        ColumnString::Offset res_offset = 0;
+        res_data.reserve(haystack_data.size());
+        size_t haystack_size = haystack_offsets.size();
+        res_offsets.resize(haystack_size);
 
         re2_st::RE2::Options regexp_options;
         /// Don't write error messages to stderr.
@@ -223,22 +279,116 @@ struct ReplaceRegexpImpl
         re2_st::RE2 searcher(needle, regexp_options);
 
         if (!searcher.ok())
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS,
-                "The pattern argument is not a valid re2 pattern: {}",
-                searcher.error());
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "The pattern argument is not a valid re2 pattern: {}", searcher.error());
+
+        int num_captures = std::min(searcher.NumberOfCapturingGroups() + 1, max_captures);
+
+        /// Cannot perform search for whole columns. Will process each string separately.
+        for (size_t i = 0; i < haystack_size; ++i)
+        {
+            size_t hs_from = i > 0 ? haystack_offsets[i - 1] : 0;
+            const char * hs_data = reinterpret_cast<const char *>(haystack_data.data() + hs_from);
+            const size_t hs_length = static_cast<unsigned>(haystack_offsets[i] - hs_from - 1);
+
+            size_t repl_from = i > 0 ? replacement_offsets[i - 1] : 0;
+            const char * repl_data = reinterpret_cast<const char *>(replacement_data.data() + repl_from);
+            const size_t repl_length = static_cast<unsigned>(replacement_offsets[i] - repl_from - 1);
+
+            Instructions instructions = createInstructions(std::string_view(repl_data, repl_length), num_captures);
+
+            processString(hs_data, hs_length, res_data, res_offset, searcher, num_captures, instructions);
+            res_offsets[i] = res_offset;
+        }
+    }
+
+    static void vectorVectorVector(
+        const ColumnString::Chars & haystack_data,
+        const ColumnString::Offsets & haystack_offsets,
+        const ColumnString::Chars & needle_data,
+        const ColumnString::Offsets & needle_offsets,
+        const ColumnString::Chars & replacement_data,
+        const ColumnString::Offsets & replacement_offsets,
+        ColumnString::Chars & res_data,
+        ColumnString::Offsets & res_offsets)
+    {
+        assert(haystack_offsets.size() == needle_offsets.size());
+        assert(needle_offsets.size() == replacement_offsets.size());
+
+        ColumnString::Offset res_offset = 0;
+        res_data.reserve(haystack_data.size());
+        size_t haystack_size = haystack_offsets.size();
+        res_offsets.resize(haystack_size);
+
+        re2_st::RE2::Options regexp_options;
+        /// Don't write error messages to stderr.
+        regexp_options.set_log_errors(false);
+
+        /// Cannot perform search for whole columns. Will process each string separately.
+        for (size_t i = 0; i < haystack_size; ++i)
+        {
+            size_t hs_from = i > 0 ? haystack_offsets[i - 1] : 0;
+            const char * hs_data = reinterpret_cast<const char *>(haystack_data.data() + hs_from);
+            const size_t hs_length = static_cast<unsigned>(haystack_offsets[i] - hs_from - 1);
+
+            size_t ndl_from = i > 0 ? needle_offsets[i - 1] : 0;
+            const char * ndl_data = reinterpret_cast<const char *>(needle_data.data() + ndl_from);
+            const size_t ndl_length = static_cast<unsigned>(needle_offsets[i] - ndl_from - 1);
+            std::string_view needle(ndl_data, ndl_length);
+
+            if (needle.empty())
+                throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
+
+            size_t repl_from = i > 0 ? replacement_offsets[i - 1] : 0;
+            const char * repl_data = reinterpret_cast<const char *>(replacement_data.data() + repl_from);
+            const size_t repl_length = static_cast<unsigned>(replacement_offsets[i] - repl_from - 1);
+
+            re2_st::RE2 searcher(needle, regexp_options);
+            if (!searcher.ok())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "The pattern argument is not a valid re2 pattern: {}", searcher.error());
+            int num_captures = std::min(searcher.NumberOfCapturingGroups() + 1, max_captures);
+            Instructions instructions = createInstructions(std::string_view(repl_data, repl_length), num_captures);
+
+            processString(hs_data, hs_length, res_data, res_offset, searcher, num_captures, instructions);
+            res_offsets[i] = res_offset;
+        }
+    }
+
+    static void vectorFixedConstantConstant(
+        const ColumnString::Chars & haystack_data,
+        size_t n,
+        const String & needle,
+        const String & replacement,
+        ColumnString::Chars & res_data,
+        ColumnString::Offsets & res_offsets)
+    {
+        if (needle.empty())
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
+
+        ColumnString::Offset res_offset = 0;
+        size_t haystack_size = haystack_data.size() / n;
+        res_data.reserve(haystack_data.size());
+        res_offsets.resize(haystack_size);
+
+        re2_st::RE2::Options regexp_options;
+        /// Don't write error messages to stderr.
+        regexp_options.set_log_errors(false);
+
+        re2_st::RE2 searcher(needle, regexp_options);
+
+        if (!searcher.ok())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "The pattern argument is not a valid re2 pattern: {}", searcher.error());
 
         int num_captures = std::min(searcher.NumberOfCapturingGroups() + 1, max_captures);
 
         Instructions instructions = createInstructions(replacement, num_captures);
 
-        for (size_t i = 0; i < size; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             size_t from = i * n;
-            const char * haystack_data = reinterpret_cast<const char *>(data.data() + from);
-            const size_t haystack_length = n;
+            const char * hs_data = reinterpret_cast<const char *>(haystack_data.data() + from);
+            const size_t hs_length = n;
 
-            processString(haystack_data, haystack_length, res_data, res_offset, searcher, num_captures, instructions);
+            processString(hs_data, hs_length, res_data, res_offset, searcher, num_captures, instructions);
             res_offsets[i] = res_offset;
         }
     }
diff --git a/src/Functions/ReplaceStringImpl.h b/src/Functions/ReplaceStringImpl.h
index 1a9ec49c58c..cd2dc1d3636 100644
--- a/src/Functions/ReplaceStringImpl.h
+++ b/src/Functions/ReplaceStringImpl.h
@@ -8,6 +8,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int ARGUMENT_OUT_OF_BOUND;
+}
+
 struct ReplaceStringTraits
 {
     enum class Replace
@@ -16,27 +21,33 @@ struct ReplaceStringTraits
         All
     };
 };
-/** Replace one or all occurencies of substring 'needle' to 'replacement'. 'needle' and 'replacement' are constants.
+
+/** Replace one or all occurencies of substring 'needle' to 'replacement'.
   */
-template <ReplaceStringTraits::Replace replace>
+template <typename Name, ReplaceStringTraits::Replace replace>
 struct ReplaceStringImpl
 {
-    static void vector(
-        const ColumnString::Chars & data,
-        const ColumnString::Offsets & offsets,
-        const std::string & needle,
-        const std::string & replacement,
+    static constexpr auto name = Name::name;
+
+    static void vectorConstantConstant(
+        const ColumnString::Chars & haystack_data,
+        const ColumnString::Offsets & haystack_offsets,
+        const String & needle,
+        const String & replacement,
         ColumnString::Chars & res_data,
         ColumnString::Offsets & res_offsets)
     {
-        const UInt8 * begin = data.data();
+        if (needle.empty())
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
+
+        const UInt8 * const begin = haystack_data.data();
+        const UInt8 * const end = haystack_data.data() + haystack_data.size();
         const UInt8 * pos = begin;
-        const UInt8 * end = pos + data.size();
 
         ColumnString::Offset res_offset = 0;
-        res_data.reserve(data.size());
-        size_t size = offsets.size();
-        res_offsets.resize(size);
+        res_data.reserve(haystack_data.size());
+        const size_t haystack_size = haystack_offsets.size();
+        res_offsets.resize(haystack_size);
 
         /// The current index in the array of strings.
         size_t i = 0;
@@ -53,22 +64,22 @@ struct ReplaceStringImpl
             memcpy(&res_data[res_offset], pos, match - pos);
 
             /// Determine which index it belongs to.
-            while (i < offsets.size() && begin + offsets[i] <= match)
+            while (i < haystack_offsets.size() && begin + haystack_offsets[i] <= match)
             {
-                res_offsets[i] = res_offset + ((begin + offsets[i]) - pos);
+                res_offsets[i] = res_offset + ((begin + haystack_offsets[i]) - pos);
                 ++i;
             }
             res_offset += (match - pos);
 
             /// If you have reached the end, it's time to stop
-            if (i == offsets.size())
+            if (i == haystack_offsets.size())
                 break;
 
             /// Is it true that this string no longer needs to perform transformations.
             bool can_finish_current_string = false;
 
             /// We check that the entry does not go through the boundaries of strings.
-            if (match + needle.size() < begin + offsets[i])
+            if (match + needle.size() < begin + haystack_offsets[i])
             {
                 res_data.resize(res_data.size() + replacement.size());
                 memcpy(&res_data[res_offset], replacement.data(), replacement.size());
@@ -85,34 +96,268 @@ struct ReplaceStringImpl
 
             if (can_finish_current_string)
             {
-                res_data.resize(res_data.size() + (begin + offsets[i] - pos));
-                memcpy(&res_data[res_offset], pos, (begin + offsets[i] - pos));
-                res_offset += (begin + offsets[i] - pos);
+                res_data.resize(res_data.size() + (begin + haystack_offsets[i] - pos));
+                memcpy(&res_data[res_offset], pos, (begin + haystack_offsets[i] - pos));
+                res_offset += (begin + haystack_offsets[i] - pos);
                 res_offsets[i] = res_offset;
-                pos = begin + offsets[i];
+                pos = begin + haystack_offsets[i];
                 ++i;
             }
         }
     }
 
-    /// Note: this function converts fixed-length strings to variable-length strings
-    ///       and each variable-length string should ends with zero byte.
-    static void vectorFixed(
-        const ColumnString::Chars & data,
-        size_t n,
-        const std::string & needle,
-        const std::string & replacement,
+    template <typename CharT>
+    requires (sizeof(CharT) == 1)
+    static void copyToOutput(
+        const CharT * what_start, size_t what_size,
+        ColumnString::Chars & output, ColumnString::Offset & output_offset)
+    {
+        output.resize(output.size() + what_size);
+        memcpy(&output[output_offset], what_start, what_size);
+        output_offset += what_size;
+    }
+
+    static void vectorVectorConstant(
+        const ColumnString::Chars & haystack_data,
+        const ColumnString::Offsets & haystack_offsets,
+        const ColumnString::Chars & needle_data,
+        const ColumnString::Offsets & needle_offsets,
+        const String & replacement,
         ColumnString::Chars & res_data,
         ColumnString::Offsets & res_offsets)
     {
-        const UInt8 * begin = data.data();
-        const UInt8 * pos = begin;
-        const UInt8 * end = pos + data.size();
+        chassert(haystack_offsets.size() == needle_offsets.size());
+
+        const size_t haystack_size = haystack_offsets.size();
+
+        res_data.reserve(haystack_data.size());
+        res_offsets.resize(haystack_size);
 
         ColumnString::Offset res_offset = 0;
-        size_t count = data.size() / n;
-        res_data.reserve(data.size());
-        res_offsets.resize(count);
+
+        size_t prev_haystack_offset = 0;
+        size_t prev_needle_offset = 0;
+
+        for (size_t i = 0; i < haystack_size; ++i)
+        {
+            const auto * const cur_haystack_data = &haystack_data[prev_haystack_offset];
+            const size_t cur_haystack_length = haystack_offsets[i] - prev_haystack_offset - 1;
+
+            const auto * const cur_needle_data = &needle_data[prev_needle_offset];
+            const size_t cur_needle_length = needle_offsets[i] - prev_needle_offset - 1;
+
+            if (cur_needle_length == 0)
+                throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
+
+            /// Using "slow" "stdlib searcher instead of Volnitsky because there is a different pattern in each row
+            StdLibASCIIStringSearcher</*CaseInsensitive*/ false> searcher(cur_needle_data, cur_needle_length);
+
+            const auto * last_match = static_cast<UInt8 *>(nullptr);
+            const auto * start_pos = cur_haystack_data;
+            const auto * const cur_haystack_end = cur_haystack_data + cur_haystack_length;
+
+            while (start_pos < cur_haystack_end)
+            {
+                if (const auto * const match = searcher.search(start_pos, cur_haystack_end); match != cur_haystack_end)
+                {
+                    /// Copy prefix before match
+                    copyToOutput(start_pos, match - start_pos, res_data, res_offset);
+
+                    /// Insert replacement for match
+                    copyToOutput(replacement.data(), replacement.size(), res_data, res_offset);
+
+                    last_match = match;
+                    start_pos = match + cur_needle_length;
+
+                    if constexpr (replace == ReplaceStringTraits::Replace::First)
+                        break;
+                }
+                else
+                    break;
+            }
+
+            /// Copy suffix after last match
+            size_t bytes = (last_match == nullptr) ? (cur_haystack_end - cur_haystack_data + 1)
+                                                   : (cur_haystack_end - last_match - cur_needle_length + 1);
+            copyToOutput(start_pos, bytes, res_data, res_offset);
+
+            res_offsets[i] = res_offset;
+
+            prev_haystack_offset = haystack_offsets[i];
+            prev_needle_offset = needle_offsets[i];
+        }
+    }
+
+    static void vectorConstantVector(
+        const ColumnString::Chars & haystack_data,
+        const ColumnString::Offsets & haystack_offsets,
+        const String & needle,
+        const ColumnString::Chars & replacement_data,
+        const ColumnString::Offsets & replacement_offsets,
+        ColumnString::Chars & res_data,
+        ColumnString::Offsets & res_offsets)
+    {
+        chassert(haystack_offsets.size() == replacement_offsets.size());
+
+        if (needle.empty())
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
+
+        const size_t haystack_size = haystack_offsets.size();
+
+        res_data.reserve(haystack_data.size());
+        res_offsets.resize(haystack_size);
+
+        ColumnString::Offset res_offset = 0;
+
+        size_t prev_haystack_offset = 0;
+        size_t prev_replacement_offset = 0;
+
+        for (size_t i = 0; i < haystack_size; ++i)
+        {
+            const auto * const cur_haystack_data = &haystack_data[prev_haystack_offset];
+            const size_t cur_haystack_length = haystack_offsets[i] - prev_haystack_offset - 1;
+
+            const auto * const cur_replacement_data = &replacement_data[prev_replacement_offset];
+            const size_t cur_replacement_length = replacement_offsets[i] - prev_replacement_offset - 1;
+
+            /// Using "slow" "stdlib searcher instead of Volnitsky just to keep things simple
+            StdLibASCIIStringSearcher</*CaseInsensitive*/ false> searcher(needle.data(), needle.size());
+
+            const auto * last_match = static_cast<UInt8 *>(nullptr);
+            const auto * start_pos = cur_haystack_data;
+            const auto * const cur_haystack_end = cur_haystack_data + cur_haystack_length;
+
+            while (start_pos < cur_haystack_end)
+            {
+                if (const auto * const match = searcher.search(start_pos, cur_haystack_end); match != cur_haystack_end)
+                {
+                    /// Copy prefix before match
+                    copyToOutput(start_pos, match - start_pos, res_data, res_offset);
+
+                    /// Insert replacement for match
+                    copyToOutput(cur_replacement_data, cur_replacement_length, res_data, res_offset);
+
+                    last_match = match;
+                    start_pos = match + needle.size();
+
+                    if constexpr (replace == ReplaceStringTraits::Replace::First)
+                        break;
+                }
+                else
+                    break;
+            }
+
+            /// Copy suffix after last match
+            size_t bytes = (last_match == nullptr) ? (cur_haystack_end - cur_haystack_data + 1)
+                                                   : (cur_haystack_end - last_match - needle.size() + 1);
+            copyToOutput(start_pos, bytes, res_data, res_offset);
+
+            res_offsets[i] = res_offset;
+
+            prev_haystack_offset = haystack_offsets[i];
+            prev_replacement_offset = replacement_offsets[i];
+        }
+    }
+
+    static void vectorVectorVector(
+        const ColumnString::Chars & haystack_data,
+        const ColumnString::Offsets & haystack_offsets,
+        const ColumnString::Chars & needle_data,
+        const ColumnString::Offsets & needle_offsets,
+        const ColumnString::Chars & replacement_data,
+        const ColumnString::Offsets & replacement_offsets,
+        ColumnString::Chars & res_data,
+        ColumnString::Offsets & res_offsets)
+    {
+        chassert(haystack_offsets.size() == needle_offsets.size());
+        chassert(needle_offsets.size() == replacement_offsets.size());
+
+        const size_t haystack_size = haystack_offsets.size();
+
+        res_data.reserve(haystack_data.size());
+        res_offsets.resize(haystack_size);
+
+        ColumnString::Offset res_offset = 0;
+
+        size_t prev_haystack_offset = 0;
+        size_t prev_needle_offset = 0;
+        size_t prev_replacement_offset = 0;
+
+        for (size_t i = 0; i < haystack_size; ++i)
+        {
+            const auto * const cur_haystack_data = &haystack_data[prev_haystack_offset];
+            const size_t cur_haystack_length = haystack_offsets[i] - prev_haystack_offset - 1;
+
+            const auto * const cur_needle_data = &needle_data[prev_needle_offset];
+            const size_t cur_needle_length = needle_offsets[i] - prev_needle_offset - 1;
+
+            const auto * const cur_replacement_data = &replacement_data[prev_replacement_offset];
+            const size_t cur_replacement_length = replacement_offsets[i] - prev_replacement_offset - 1;
+
+            if (cur_needle_length == 0)
+                throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
+
+            /// Using "slow" "stdlib searcher instead of Volnitsky because there is a different pattern in each row
+            StdLibASCIIStringSearcher</*CaseInsensitive*/ false> searcher(cur_needle_data, cur_needle_length);
+
+            const auto * last_match = static_cast<UInt8 *>(nullptr);
+            const auto * start_pos = cur_haystack_data;
+            const auto * const cur_haystack_end = cur_haystack_data + cur_haystack_length;
+
+            while (start_pos < cur_haystack_end)
+            {
+                if (const auto * const match = searcher.search(start_pos, cur_haystack_end); match != cur_haystack_end)
+                {
+                    /// Copy prefix before match
+                    copyToOutput(start_pos, match - start_pos, res_data, res_offset);
+
+                    /// Insert replacement for match
+                    copyToOutput(cur_replacement_data, cur_replacement_length, res_data, res_offset);
+
+                    last_match = match;
+                    start_pos = match + cur_needle_length;
+
+                    if constexpr (replace == ReplaceStringTraits::Replace::First)
+                        break;
+                }
+                else
+                    break;
+            }
+
+            /// Copy suffix after last match
+            size_t bytes = (last_match == nullptr) ? (cur_haystack_end - cur_haystack_data + 1)
+                                                   : (cur_haystack_end - last_match - cur_needle_length + 1);
+            copyToOutput(start_pos, bytes, res_data, res_offset);
+
+            res_offsets[i] = res_offset;
+
+            prev_haystack_offset = haystack_offsets[i];
+            prev_needle_offset = needle_offsets[i];
+            prev_replacement_offset = replacement_offsets[i];
+        }
+    }
+
+    /// Note: this function converts fixed-length strings to variable-length strings
+    ///       and each variable-length string should ends with zero byte.
+    static void vectorFixedConstantConstant(
+        const ColumnString::Chars & haystack_data,
+        size_t n,
+        const String & needle,
+        const String & replacement,
+        ColumnString::Chars & res_data,
+        ColumnString::Offsets & res_offsets)
+    {
+        if (needle.empty())
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
+
+        const UInt8 * const begin = haystack_data.data();
+        const UInt8 * const end = haystack_data.data() + haystack_data.size();
+        const UInt8 * pos = begin;
+
+        ColumnString::Offset res_offset = 0;
+        size_t haystack_size = haystack_data.size() / n;
+        res_data.reserve(haystack_data.size());
+        res_offsets.resize(haystack_size);
 
         /// The current index in the string array.
         size_t i = 0;
@@ -139,13 +384,13 @@ struct ReplaceStringImpl
 
             /// Copy skipped strings without any changes but
             /// add zero byte to the end of each string.
-            while (i < count && begin + n * (i + 1) <= match)
+            while (i < haystack_size && begin + n * (i + 1) <= match)
             {
                 COPY_REST_OF_CURRENT_STRING();
             }
 
             /// If you have reached the end, it's time to stop
-            if (i == count)
+            if (i == haystack_size)
                 break;
 
             /// Copy unchanged part of current string.
diff --git a/src/Functions/URL/cutToFirstSignificantSubdomain.cpp b/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
index 7bf09d1eb00..6e64b0b6ab8 100644
--- a/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
+++ b/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
@@ -44,32 +44,32 @@ using FunctionCutToFirstSignificantSubdomainWithWWWRFC = FunctionStringToString<
 REGISTER_FUNCTION(CutToFirstSignificantSubdomain)
 {
     factory.registerFunction<FunctionCutToFirstSignificantSubdomain>(
-        {
-        R"(Returns the part of the domain that includes top-level subdomains up to the "first significant subdomain" (see documentation of the `firstSignificantSubdomain`).)",
-        Documentation::Examples{
-            {"cutToFirstSignificantSubdomain1", "SELECT cutToFirstSignificantSubdomain('https://news.clickhouse.com.tr/')"},
-            {"cutToFirstSignificantSubdomain2", "SELECT cutToFirstSignificantSubdomain('www.tr')"},
-            {"cutToFirstSignificantSubdomain3", "SELECT cutToFirstSignificantSubdomain('tr')"},
+        FunctionDocumentation{
+        .description=R"(Returns the part of the domain that includes top-level subdomains up to the "first significant subdomain" (see documentation of the `firstSignificantSubdomain`).)",
+        .examples{
+            {"cutToFirstSignificantSubdomain1", "SELECT cutToFirstSignificantSubdomain('https://news.clickhouse.com.tr/')", ""},
+            {"cutToFirstSignificantSubdomain2", "SELECT cutToFirstSignificantSubdomain('www.tr')", ""},
+            {"cutToFirstSignificantSubdomain3", "SELECT cutToFirstSignificantSubdomain('tr')", ""},
         },
-        Documentation::Categories{"URL"}
+        .categories{"URL"}
         });
     factory.registerFunction<FunctionCutToFirstSignificantSubdomainWithWWW>(
-        {
-            R"(Returns the part of the domain that includes top-level subdomains up to the "first significant subdomain", without stripping "www".)",
-            Documentation::Examples{},
-            Documentation::Categories{"URL"}
+        FunctionDocumentation{
+            .description=R"(Returns the part of the domain that includes top-level subdomains up to the "first significant subdomain", without stripping "www".)",
+            .examples{},
+            .categories{"URL"}
         });
     factory.registerFunction<FunctionCutToFirstSignificantSubdomainRFC>(
-        {
-            R"(Similar to `cutToFirstSignificantSubdomain` but follows stricter rules to be compatible with RFC 3986 and less performant.)",
-            Documentation::Examples{},
-            Documentation::Categories{"URL"}
+        FunctionDocumentation{
+            .description=R"(Similar to `cutToFirstSignificantSubdomain` but follows stricter rules to be compatible with RFC 3986 and less performant.)",
+            .examples{},
+            .categories{"URL"}
         });
     factory.registerFunction<FunctionCutToFirstSignificantSubdomainWithWWWRFC>(
-        {
-            R"(Similar to `cutToFirstSignificantSubdomainWithWWW` but follows stricter rules to be compatible with RFC 3986 and less performant.)",
-            Documentation::Examples{},
-            Documentation::Categories{"URL"}
+        FunctionDocumentation{
+            .description=R"(Similar to `cutToFirstSignificantSubdomainWithWWW` but follows stricter rules to be compatible with RFC 3986 and less performant.)",
+            .examples{},
+            .categories{"URL"}
         });
 }
 
diff --git a/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp b/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
index e81921d69ff..77f40e465a6 100644
--- a/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
+++ b/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
@@ -43,39 +43,39 @@ using FunctionCutToFirstSignificantSubdomainCustomWithWWWRFC = FunctionCutToFirs
 REGISTER_FUNCTION(CutToFirstSignificantSubdomainCustom)
 {
     factory.registerFunction<FunctionCutToFirstSignificantSubdomainCustom>(
-        {
-        R"(
+        FunctionDocumentation{
+        .description=R"(
 Returns the part of the domain that includes top-level subdomains up to the first significant subdomain. Accepts custom TLD list name.
 
 Can be useful if you need fresh TLD list or you have custom.
         )",
-        Documentation::Examples{
-            {"cutToFirstSignificantSubdomainCustom", "SELECT cutToFirstSignificantSubdomainCustom('bar.foo.there-is-no-such-domain', 'public_suffix_list');"},
+        .examples{
+            {"cutToFirstSignificantSubdomainCustom", "SELECT cutToFirstSignificantSubdomainCustom('bar.foo.there-is-no-such-domain', 'public_suffix_list');", ""},
         },
-        Documentation::Categories{"URL"}
+        .categories{"URL"}
         });
     factory.registerFunction<FunctionCutToFirstSignificantSubdomainCustomWithWWW>(
-        {
-        R"(
+        FunctionDocumentation{
+        .description=R"(
 Returns the part of the domain that includes top-level subdomains up to the first significant subdomain without stripping `www`.
 Accepts custom TLD list name from config.
 
 Can be useful if you need fresh TLD list or you have custom.
         )",
-        Documentation::Examples{{"cutToFirstSignificantSubdomainCustomWithWWW", "SELECT cutToFirstSignificantSubdomainCustomWithWWW('www.foo', 'public_suffix_list')"}},
-        Documentation::Categories{"URL"}
+        .examples{{"cutToFirstSignificantSubdomainCustomWithWWW", "SELECT cutToFirstSignificantSubdomainCustomWithWWW('www.foo', 'public_suffix_list')", ""}},
+        .categories{"URL"}
         });
     factory.registerFunction<FunctionCutToFirstSignificantSubdomainCustomRFC>(
-        {
-        R"(Similar to `cutToFirstSignificantSubdomainCustom` but follows stricter rules according to RFC 3986.)",
-        Documentation::Examples{},
-        Documentation::Categories{"URL"}
+        FunctionDocumentation{
+        .description=R"(Similar to `cutToFirstSignificantSubdomainCustom` but follows stricter rules according to RFC 3986.)",
+        .examples{},
+        .categories{"URL"}
         });
     factory.registerFunction<FunctionCutToFirstSignificantSubdomainCustomWithWWWRFC>(
-        {
-        R"(Similar to `cutToFirstSignificantSubdomainCustomWithWWW` but follows stricter rules according to RFC 3986.)",
-        Documentation::Examples{},
-        Documentation::Categories{"URL"}
+        FunctionDocumentation{
+        .description=R"(Similar to `cutToFirstSignificantSubdomainCustomWithWWW` but follows stricter rules according to RFC 3986.)",
+        .examples{},
+        .categories{"URL"}
         });
 }
 
diff --git a/src/Functions/URL/decodeURLComponent.cpp b/src/Functions/URL/decodeURLComponent.cpp
index 9e516e73e3c..05e3fbea3fd 100644
--- a/src/Functions/URL/decodeURLComponent.cpp
+++ b/src/Functions/URL/decodeURLComponent.cpp
@@ -1,4 +1,4 @@
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 #include <base/find_symbols.h>
@@ -14,28 +14,33 @@ namespace ErrorCodes
 static size_t encodeURL(const char * __restrict src, size_t src_size, char * __restrict dst, bool space_as_plus)
 {
     char * dst_pos = dst;
-    for (size_t i = 0; i < src_size; i++)
+    for (size_t i = 0; i < src_size; ++i)
     {
         if ((src[i] >= '0' && src[i] <= '9') || (src[i] >= 'a' && src[i] <= 'z') || (src[i] >= 'A' && src[i] <= 'Z')
             || src[i] == '-' || src[i] == '_' || src[i] == '.' || src[i] == '~')
         {
-            *dst_pos++ = src[i];
+            *dst_pos = src[i];
+            ++dst_pos;
         }
         else if (src[i] == ' ' && space_as_plus)
         {
-            *dst_pos++ = '+';
+            *dst_pos = '+';
+            ++dst_pos;
         }
         else
         {
-            *dst_pos++ = '%';
-            *dst_pos++ = hexDigitUppercase(src[i] >> 4);
-            *dst_pos++ = hexDigitUppercase(src[i] & 0xf);
+            dst_pos[0] = '%';
+            ++dst_pos;
+            writeHexByteUppercase(src[i], dst_pos);
+            dst_pos += 2;
         }
     }
-    *dst_pos++ = src[src_size];
+    *dst_pos = 0;
+    ++dst_pos;
     return dst_pos - dst;
 }
 
+
 /// We assume that size of the dst buf isn't less than src_size.
 static size_t decodeURL(const char * __restrict src, size_t src_size, char * __restrict dst, bool plus_as_space)
 {
@@ -120,10 +125,14 @@ struct CodeURLComponentImpl
         ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
     {
         if (code_strategy == encode)
-            //the destination(res_data) string is at most three times the length of the source string
+        {
+            /// the destination(res_data) string is at most three times the length of the source string
             res_data.resize(data.size() * 3);
+        }
         else
+        {
             res_data.resize(data.size());
+        }
 
         size_t size = offsets.size();
         res_offsets.resize(size);
diff --git a/src/Functions/URL/domain.cpp b/src/Functions/URL/domain.cpp
index fce7cea4693..443a3323075 100644
--- a/src/Functions/URL/domain.cpp
+++ b/src/Functions/URL/domain.cpp
@@ -14,23 +14,23 @@ using FunctionDomainRFC = FunctionStringToString<ExtractSubstringImpl<ExtractDom
 
 REGISTER_FUNCTION(Domain)
 {
-    factory.registerFunction<FunctionDomain>(
+    factory.registerFunction<FunctionDomain>(FunctionDocumentation
         {
-        R"(
+        .description=R"(
 Extracts the hostname from a URL.
 
 The URL can be specified with or without a scheme.
 If the argument can't be parsed as URL, the function returns an empty string.
         )",
-        Documentation::Examples{{"domain", "SELECT domain('svn+ssh://some.svn-hosting.com:80/repo/trunk')"}},
-        Documentation::Categories{"URL"}
+        .examples{{"domain", "SELECT domain('svn+ssh://some.svn-hosting.com:80/repo/trunk')", ""}},
+        .categories{"URL"}
         });
 
-    factory.registerFunction<FunctionDomainRFC>(
+    factory.registerFunction<FunctionDomainRFC>(FunctionDocumentation
         {
-        R"(Similar to `domain` but follows stricter rules to be compatible with RFC 3986 and less performant.)",
-        Documentation::Examples{},
-        Documentation::Categories{"URL"}
+        .description=R"(Similar to `domain` but follows stricter rules to be compatible with RFC 3986 and less performant.)",
+        .examples{},
+        .categories{"URL"}
         });
 }
 
diff --git a/src/Functions/URL/domainWithoutWWW.cpp b/src/Functions/URL/domainWithoutWWW.cpp
index 48401e5e6e5..f6c8b5c84fc 100644
--- a/src/Functions/URL/domainWithoutWWW.cpp
+++ b/src/Functions/URL/domainWithoutWWW.cpp
@@ -15,21 +15,21 @@ using FunctionDomainWithoutWWWRFC = FunctionStringToString<ExtractSubstringImpl<
 REGISTER_FUNCTION(DomainWithoutWWW)
 {
     factory.registerFunction<FunctionDomainWithoutWWW>(
-    {
-        R"(
+    FunctionDocumentation{
+        .description=R"(
 Extracts the hostname from a URL, removing the leading "www." if present.
 
 The URL can be specified with or without a scheme.
 If the argument can't be parsed as URL, the function returns an empty string.
         )",
-        Documentation::Examples{{"domainWithoutWWW", "SELECT domainWithoutWWW('https://www.clickhouse.com')"}},
-        Documentation::Categories{"URL"}
+        .examples{{"domainWithoutWWW", "SELECT domainWithoutWWW('https://www.clickhouse.com')", ""}},
+        .categories{"URL"}
     });
     factory.registerFunction<FunctionDomainWithoutWWWRFC>(
-    {
-        R"(Similar to `domainWithoutWWW` but follows stricter rules to be compatible with RFC 3986 and less performant.)",
-        Documentation::Examples{},
-        Documentation::Categories{"URL"}
+    FunctionDocumentation{
+        .description=R"(Similar to `domainWithoutWWW` but follows stricter rules to be compatible with RFC 3986 and less performant.)",
+        .examples{},
+        .categories{"URL"}
     });
 }
 
diff --git a/src/Functions/URL/firstSignificantSubdomain.cpp b/src/Functions/URL/firstSignificantSubdomain.cpp
index 62307ef816c..b04f6d882ef 100644
--- a/src/Functions/URL/firstSignificantSubdomain.cpp
+++ b/src/Functions/URL/firstSignificantSubdomain.cpp
@@ -15,8 +15,8 @@ using FunctionFirstSignificantSubdomainRFC = FunctionStringToString<ExtractSubst
 REGISTER_FUNCTION(FirstSignificantSubdomain)
 {
     factory.registerFunction<FunctionFirstSignificantSubdomain>(
-        {
-        R"(
+        FunctionDocumentation{
+        .description=R"(
 Returns the "first significant subdomain".
 
 The first significant subdomain is a second-level domain if it is 'com', 'net', 'org', or 'co'.
@@ -26,15 +26,15 @@ For example, firstSignificantSubdomain('https://news.clickhouse.com/') = 'clickh
 
 The list of "insignificant" second-level domains and other implementation details may change in the future.
         )",
-        Documentation::Examples{{"firstSignificantSubdomain", "SELECT firstSignificantSubdomain('https://news.clickhouse.com/')"}},
-        Documentation::Categories{"URL"}
+        .examples{{"firstSignificantSubdomain", "SELECT firstSignificantSubdomain('https://news.clickhouse.com/')", ""}},
+        .categories{"URL"}
         });
 
     factory.registerFunction<FunctionFirstSignificantSubdomainRFC>(
-        {
-        R"(Returns the "first significant subdomain" according to RFC 1034.)",
-        Documentation::Examples{},
-        Documentation::Categories{"URL"}
+        FunctionDocumentation{
+        .description=R"(Returns the "first significant subdomain" according to RFC 1034.)",
+        .examples{},
+        .categories{"URL"}
         });
 }
 
diff --git a/src/Functions/URL/port.cpp b/src/Functions/URL/port.cpp
index 65cebae15f1..942f6b702fd 100644
--- a/src/Functions/URL/port.cpp
+++ b/src/Functions/URL/port.cpp
@@ -138,17 +138,15 @@ struct FunctionPortRFC : public FunctionPortImpl<true>
 
 REGISTER_FUNCTION(Port)
 {
-    factory.registerFunction<FunctionPort>(
+    factory.registerFunction<FunctionPort>(FunctionDocumentation
     {
-        R"(Returns the port or `default_port` if there is no port in the URL (or in case of validation error).)",
-        Documentation::Examples{},
-        Documentation::Categories{"URL"}
+        .description=R"(Returns the port or `default_port` if there is no port in the URL (or in case of validation error).)",
+        .categories{"URL"}
     });
-    factory.registerFunction<FunctionPortRFC>(
+    factory.registerFunction<FunctionPortRFC>(FunctionDocumentation
     {
-        R"(Similar to `port`, but conforms to RFC 3986.)",
-        Documentation::Examples{},
-        Documentation::Categories{"URL"}
+        .description=R"(Similar to `port`, but conforms to RFC 3986.)",
+        .categories{"URL"}
     });
 }
 
diff --git a/src/Functions/URL/topLevelDomain.cpp b/src/Functions/URL/topLevelDomain.cpp
index ed9b40d4b73..25e9f383f60 100644
--- a/src/Functions/URL/topLevelDomain.cpp
+++ b/src/Functions/URL/topLevelDomain.cpp
@@ -53,22 +53,22 @@ using FunctionTopLevelDomainRFC = FunctionStringToString<ExtractSubstringImpl<Ex
 
 REGISTER_FUNCTION(TopLevelDomain)
 {
-    factory.registerFunction<FunctionTopLevelDomain>(
+    factory.registerFunction<FunctionTopLevelDomain>(FunctionDocumentation
     {
-        R"(
+        .description=R"(
 Extracts the the top-level domain from a URL.
 
 Returns an empty string if the argument cannot be parsed as a URL or does not contain a top-level domain.
         )",
-        Documentation::Examples{{"topLevelDomain", "SELECT topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk')"}},
-        Documentation::Categories{"URL"}
+        .examples{{"topLevelDomain", "SELECT topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk')", ""}},
+        .categories{"URL"}
     });
 
-    factory.registerFunction<FunctionTopLevelDomainRFC>(
+    factory.registerFunction<FunctionTopLevelDomainRFC>(FunctionDocumentation
     {
-        R"(Similar to topLevelDomain, but conforms to RFC 3986.)",
-        Documentation::Examples{},
-        Documentation::Categories{"URL"}
+        .description=R"(Similar to topLevelDomain, but conforms to RFC 3986.)",
+        .examples{},
+        .categories{"URL"}
     });
 }
 
diff --git a/src/Functions/UTCTimestamp.cpp b/src/Functions/UTCTimestamp.cpp
index 258a5fa5d94..acc34b0a974 100644
--- a/src/Functions/UTCTimestamp.cpp
+++ b/src/Functions/UTCTimestamp.cpp
@@ -107,17 +107,17 @@ public:
 /// UTC_timestamp for MySQL interface support
 REGISTER_FUNCTION(UTCTimestamp)
 {
-    factory.registerFunction<UTCTimestampOverloadResolver>({
-        R"(
+    factory.registerFunction<UTCTimestampOverloadResolver>(FunctionDocumentation{
+        .description=R"(
 Returns the current date and time at the moment of query analysis. The function is a constant expression.
 Same as `now('UTC')`. Was added only for MySQL support. `now` is preferred.
 
 Example:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT UTCTimestamp();"}},
-    Documentation::Categories{"Dates and Times"}}, FunctionFactory::CaseInsensitive);
+    .examples{
+        {"typical", "SELECT UTCTimestamp();", ""}},
+    .categories{"Dates and Times"}}, FunctionFactory::CaseInsensitive);
     factory.registerAlias("UTC_timestamp", UTCTimestampOverloadResolver::name, FunctionFactory::CaseInsensitive);
 }
 
diff --git a/src/Functions/UniqTheta/FunctionsUniqTheta.cpp b/src/Functions/UniqTheta/FunctionsUniqTheta.cpp
index aa280c0818e..f371f4b33e8 100644
--- a/src/Functions/UniqTheta/FunctionsUniqTheta.cpp
+++ b/src/Functions/UniqTheta/FunctionsUniqTheta.cpp
@@ -10,8 +10,7 @@ namespace DB
 REGISTER_FUNCTION(UniqTheta)
 {
     factory.registerFunction<FunctionUniqThetaIntersect>(
-            {
-              R"(
+            FunctionDocumentation{.description = R"(
 Two uniqThetaSketch objects to do intersect calculation(set operation ∩), the result is a new uniqThetaSketch.
 
 A uniqThetaSketch object is to be constructed by aggregation function uniqTheta with -State.
@@ -22,14 +21,13 @@ For more information on RoaringBitmap, see: [Theta Sketch Framework](https://dat
 Typical usage:
 [example:typical]
 )",
-                    Documentation::Examples{
-                            {"typical", "select finalizeAggregation(uniqThetaIntersect(arrayReduce('uniqThetaState',[1,2]), arrayReduce('uniqThetaState',[2,3,4])));"}},
-                    Documentation::Categories{"uniqTheta"}
+                    .examples{
+                            {"typical", "select finalizeAggregation(uniqThetaIntersect(arrayReduce('uniqThetaState',[1,2]), arrayReduce('uniqThetaState',[2,3,4])));", ""}},
+                    .categories{"uniqTheta"}
             });
 
     factory.registerFunction<FunctionUniqThetaUnion>(
-            {
-              R"(
+            FunctionDocumentation{.description = R"(
 Two uniqThetaSketch objects to do union calculation(set operation ∪), the result is a new uniqThetaSketch.
 
 A uniqThetaSketch object is to be constructed by aggregation function uniqTheta with -State.
@@ -40,13 +38,12 @@ For more information on RoaringBitmap, see: [Theta Sketch Framework](https://dat
 Typical usage:
 [example:typical]
 )",
-                    Documentation::Examples{
-                            {"typical", "select finalizeAggregation(uniqThetaUnion(arrayReduce('uniqThetaState',[1,2]), arrayReduce('uniqThetaState',[2,3,4])));"}},
-                    Documentation::Categories{"uniqTheta"}
+                    .examples{
+                            {"typical", "select finalizeAggregation(uniqThetaUnion(arrayReduce('uniqThetaState',[1,2]), arrayReduce('uniqThetaState',[2,3,4])));", ""}},
+                    .categories{"uniqTheta"}
             });
     factory.registerFunction<FunctionUniqThetaNot>(
-            {
-              R"(
+            FunctionDocumentation{.description = R"(
 Two uniqThetaSketch objects to do a_not_b calculation(set operation ×), the result is a new uniqThetaSketch.
 
 A uniqThetaSketch object is to be constructed by aggregation function uniqTheta with -State.
@@ -57,9 +54,9 @@ For more information on RoaringBitmap, see: [Theta Sketch Framework](https://dat
 Typical usage:
 [example:typical]
 )",
-                    Documentation::Examples{
-                            {"typical", "select finalizeAggregation(uniqThetaNot(arrayReduce('uniqThetaState',[1,2]), arrayReduce('uniqThetaState',[2,3,4])));"}},
-                    Documentation::Categories{"uniqTheta"}
+                    .examples{
+                            {"typical", "select finalizeAggregation(uniqThetaNot(arrayReduce('uniqThetaState',[1,2]), arrayReduce('uniqThetaState',[2,3,4])));", ""}},
+                    .categories{"uniqTheta"}
             });
 }
 
diff --git a/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp b/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp
index d78a8623a18..57cc45cc75d 100644
--- a/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp
@@ -20,6 +20,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int UNSUPPORTED_METHOD;
+    extern const int FUNCTION_CANNOT_HAVE_PARAMETERS;
 }
 
 void UserDefinedSQLFunctionVisitor::visit(ASTPtr & ast)
@@ -132,6 +133,12 @@ ASTPtr UserDefinedSQLFunctionVisitor::tryToReplaceFunction(const ASTFunction & f
     if (!user_defined_function)
         return nullptr;
 
+    /// All UDFs are not parametric for now.
+    if (function.parameters)
+    {
+        throw Exception(ErrorCodes::FUNCTION_CANNOT_HAVE_PARAMETERS, "Function {} is not parametric", function.name);
+    }
+
     const auto & function_arguments_list = function.children.at(0)->as<ASTExpressionList>();
     auto & function_arguments = function_arguments_list->children;
 
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp
index 6962c21280d..6920e8ce2c2 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp
@@ -23,21 +23,56 @@ namespace ErrorCodes
     extern const int CANNOT_RESTORE_TABLE;
 }
 
+
 void backupUserDefinedSQLObjects(
     BackupEntriesCollector & backup_entries_collector,
     const String & data_path_in_backup,
-    UserDefinedSQLObjectType /* object_type */,
+    UserDefinedSQLObjectType object_type,
     const std::vector<std::pair<String, ASTPtr>> & objects)
 {
     std::vector<std::pair<String, BackupEntryPtr>> backup_entries;
     backup_entries.reserve(objects.size());
-    for (const auto & [function_name, create_function_query] : objects)
+    for (const auto & [object_name, create_object_query] : objects)
         backup_entries.emplace_back(
-            escapeForFileName(function_name) + ".sql", std::make_shared<BackupEntryFromMemory>(queryToString(create_function_query)));
+            escapeForFileName(object_name) + ".sql", std::make_shared<BackupEntryFromMemory>(queryToString(create_object_query)));
 
-    fs::path data_path_in_backup_fs{data_path_in_backup};
-    for (const auto & entry : backup_entries)
-        backup_entries_collector.addBackupEntry(data_path_in_backup_fs / entry.first, entry.second);
+    auto context = backup_entries_collector.getContext();
+    const auto & loader = context->getUserDefinedSQLObjectsLoader();
+
+    if (!loader.isReplicated())
+    {
+        fs::path data_path_in_backup_fs{data_path_in_backup};
+        for (const auto & [file_name, entry] : backup_entries)
+            backup_entries_collector.addBackupEntry(data_path_in_backup_fs / file_name, entry);
+        return;
+    }
+
+    String replication_id = loader.getReplicationID();
+
+    auto backup_coordination = backup_entries_collector.getBackupCoordination();
+    backup_coordination->addReplicatedSQLObjectsDir(replication_id, object_type, data_path_in_backup);
+
+    // On the stage of running post tasks, all directories will already be added to the backup coordination object.
+    // They will only be returned for one of the hosts below, for the rest an empty list.
+    // See also BackupCoordinationReplicatedSQLObjects class.
+    backup_entries_collector.addPostTask(
+        [my_backup_entries = std::move(backup_entries),
+         my_replication_id = std::move(replication_id),
+         object_type,
+         &backup_entries_collector,
+         backup_coordination]
+        {
+            auto dirs = backup_coordination->getReplicatedSQLObjectsDirs(my_replication_id, object_type);
+
+            for (const auto & dir : dirs)
+            {
+                fs::path dir_fs{dir};
+                for (const auto & [file_name, entry] : my_backup_entries)
+                {
+                    backup_entries_collector.addBackupEntry(dir_fs / file_name, entry);
+                }
+            }
+        });
 }
 
 
@@ -45,6 +80,11 @@ std::vector<std::pair<String, ASTPtr>>
 restoreUserDefinedSQLObjects(RestorerFromBackup & restorer, const String & data_path_in_backup, UserDefinedSQLObjectType object_type)
 {
     auto context = restorer.getContext();
+    const auto & loader = context->getUserDefinedSQLObjectsLoader();
+
+    if (loader.isReplicated() && !restorer.getRestoreCoordination()->acquireReplicatedSQLObjects(loader.getReplicationID(), object_type))
+        return {}; /// Other replica is already restoring user-defined SQL objects.
+
     auto backup = restorer.getBackup();
     fs::path data_path_in_backup_fs{data_path_in_backup};
 
@@ -67,12 +107,11 @@ restoreUserDefinedSQLObjects(RestorerFromBackup & restorer, const String & data_
 
     for (const auto & filename : filenames)
     {
-        String escaped_function_name = filename.substr(0, filename.length() - strlen(".sql"));
-        String function_name = unescapeForFileName(escaped_function_name);
+        String escaped_object_name = filename.substr(0, filename.length() - strlen(".sql"));
+        String object_name = unescapeForFileName(escaped_object_name);
 
         String filepath = data_path_in_backup_fs / filename;
-        auto backup_entry = backup->readFile(filepath);
-        auto in = backup_entry->getReadBuffer();
+        auto in = backup->readFile(filepath);
         String statement_def;
         readStringUntilEOF(statement_def, *in);
 
@@ -94,7 +133,7 @@ restoreUserDefinedSQLObjects(RestorerFromBackup & restorer, const String & data_
             }
         }
 
-        res.emplace_back(std::move(function_name), ast);
+        res.emplace_back(std::move(object_name), ast);
     }
 
     return res;
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsLoaderFromZooKeeper.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsLoaderFromZooKeeper.cpp
new file mode 100644
index 00000000000..76ebcf769d5
--- /dev/null
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsLoaderFromZooKeeper.cpp
@@ -0,0 +1,433 @@
+#include <Functions/UserDefined/UserDefinedSQLObjectsLoaderFromZooKeeper.h>
+
+#include <Functions/UserDefined/UserDefinedSQLFunctionFactory.h>
+#include <Functions/UserDefined/UserDefinedSQLObjectType.h>
+#include <Interpreters/Context.h>
+#include <Parsers/ParserCreateFunctionQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
+#include <base/sleep.h>
+#include <Common/Exception.h>
+#include <Common/ZooKeeper/KeeperException.h>
+#include <Common/escapeForFileName.h>
+#include <Common/logger_useful.h>
+#include <Common/quoteString.h>
+#include <Common/scope_guard_safe.h>
+#include <Common/setThreadName.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int FUNCTION_ALREADY_EXISTS;
+    extern const int UNKNOWN_FUNCTION;
+    extern const int BAD_ARGUMENTS;
+}
+
+namespace
+{
+    std::string_view getNodePrefix(UserDefinedSQLObjectType object_type)
+    {
+        switch (object_type)
+        {
+            case UserDefinedSQLObjectType::Function:
+                return "function_";
+        }
+        UNREACHABLE();
+    }
+
+    constexpr std::string_view sql_extension = ".sql";
+
+    String getNodePath(const String & root_path, UserDefinedSQLObjectType object_type, const String & object_name)
+    {
+        return root_path + "/" + String{getNodePrefix(object_type)} + escapeForFileName(object_name) + String{sql_extension};
+    }
+}
+
+
+UserDefinedSQLObjectsLoaderFromZooKeeper::UserDefinedSQLObjectsLoaderFromZooKeeper(
+    const ContextPtr & global_context_, const String & zookeeper_path_)
+    : global_context{global_context_}
+    , zookeeper_getter{[global_context_]() { return global_context_->getZooKeeper(); }}
+    , zookeeper_path{zookeeper_path_}
+    , watch_queue{std::make_shared<ConcurrentBoundedQueue<std::pair<UserDefinedSQLObjectType, String>>>(std::numeric_limits<size_t>::max())}
+    , log{&Poco::Logger::get("UserDefinedSQLObjectsLoaderFromZooKeeper")}
+{
+    if (zookeeper_path.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "ZooKeeper path must be non-empty");
+
+    if (zookeeper_path.back() == '/')
+        zookeeper_path.resize(zookeeper_path.size() - 1);
+
+    /// If zookeeper chroot prefix is used, path should start with '/', because chroot concatenates without it.
+    if (zookeeper_path.front() != '/')
+        zookeeper_path = "/" + zookeeper_path;
+}
+
+UserDefinedSQLObjectsLoaderFromZooKeeper::~UserDefinedSQLObjectsLoaderFromZooKeeper()
+{
+    SCOPE_EXIT_SAFE(stopWatchingThread());
+}
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::startWatchingThread()
+{
+    if (!watching_flag.exchange(true))
+    {
+        watching_thread = ThreadFromGlobalPool(&UserDefinedSQLObjectsLoaderFromZooKeeper::processWatchQueue, this);
+    }
+}
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::stopWatchingThread()
+{
+    if (watching_flag.exchange(false))
+    {
+        watch_queue->finish();
+        if (watching_thread.joinable())
+            watching_thread.join();
+    }
+}
+
+zkutil::ZooKeeperPtr UserDefinedSQLObjectsLoaderFromZooKeeper::getZooKeeper()
+{
+    auto [zookeeper, session_status] = zookeeper_getter.getZooKeeper();
+
+    if (session_status == zkutil::ZooKeeperCachingGetter::SessionStatus::New)
+    {
+        /// It's possible that we connected to different [Zoo]Keeper instance
+        /// so we may read a bit stale state.
+        zookeeper->sync(zookeeper_path);
+
+        createRootNodes(zookeeper);
+        refreshAllObjects(zookeeper);
+    }
+
+    return zookeeper;
+}
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::initZooKeeperIfNeeded()
+{
+    getZooKeeper();
+}
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::resetAfterError()
+{
+    zookeeper_getter.resetCache();
+}
+
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::loadObjects()
+{
+    /// loadObjects() is called at start from Server::main(), so it's better not to stop here on no connection to ZooKeeper or any other error.
+    /// However the watching thread must be started anyway in case the connection will be established later.
+    if (!objects_loaded)
+    {
+        try
+        {
+            reloadObjects();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Failed to load user-defined objects");
+        }
+    }
+    startWatchingThread();
+}
+
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::processWatchQueue()
+{
+    LOG_DEBUG(log, "Started watching thread");
+    setThreadName("UserDefObjWatch");
+
+    while (watching_flag)
+    {
+        try
+        {
+            UserDefinedSQLObjectTypeAndName watched_object;
+
+            /// Re-initialize ZooKeeper session if expired and refresh objects
+            initZooKeeperIfNeeded();
+
+            if (!watch_queue->tryPop(watched_object, /* timeout_ms: */ 10000))
+                continue;
+
+            auto zookeeper = getZooKeeper();
+            const auto & [object_type, object_name] = watched_object;
+
+            if (object_name.empty())
+                syncObjects(zookeeper, object_type);
+            else
+                refreshObject(zookeeper, object_type, object_name);
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Will try to restart watching thread after error");
+            resetAfterError();
+            sleepForSeconds(5);
+        }
+    }
+
+    LOG_DEBUG(log, "Stopped watching thread");
+}
+
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::stopWatching()
+{
+    stopWatchingThread();
+}
+
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::reloadObjects()
+{
+    auto zookeeper = getZooKeeper();
+    refreshAllObjects(zookeeper);
+    startWatchingThread();
+}
+
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::reloadObject(UserDefinedSQLObjectType object_type, const String & object_name)
+{
+    auto zookeeper = getZooKeeper();
+    refreshObject(zookeeper, object_type, object_name);
+}
+
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::createRootNodes(const zkutil::ZooKeeperPtr & zookeeper)
+{
+    zookeeper->createAncestors(zookeeper_path);
+    zookeeper->createIfNotExists(zookeeper_path, "");
+}
+
+bool UserDefinedSQLObjectsLoaderFromZooKeeper::storeObject(
+    UserDefinedSQLObjectType object_type,
+    const String & object_name,
+    const IAST & create_object_query,
+    bool throw_if_exists,
+    bool replace_if_exists,
+    const Settings &)
+{
+    String path = getNodePath(zookeeper_path, object_type, object_name);
+    LOG_DEBUG(log, "Storing user-defined object {} at zk path {}", backQuote(object_name), path);
+
+    WriteBufferFromOwnString create_statement_buf;
+    formatAST(create_object_query, create_statement_buf, false);
+    writeChar('\n', create_statement_buf);
+    String create_statement = create_statement_buf.str();
+
+    auto zookeeper = getZooKeeper();
+
+    size_t num_attempts = 10;
+    while (true)
+    {
+        auto code = zookeeper->tryCreate(path, create_statement, zkutil::CreateMode::Persistent);
+        if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNODEEXISTS))
+            throw zkutil::KeeperException(code, path);
+
+        if (code == Coordination::Error::ZNODEEXISTS)
+        {
+            if (throw_if_exists)
+                throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS, "User-defined function '{}' already exists", object_name);
+            else if (!replace_if_exists)
+                return false;
+
+            code = zookeeper->trySet(path, create_statement);
+            if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNONODE))
+                throw zkutil::KeeperException(code, path);
+        }
+
+        if (code == Coordination::Error::ZOK)
+            break;
+
+        if (!--num_attempts)
+            throw zkutil::KeeperException(code, path);
+    }
+    LOG_DEBUG(log, "Object {} stored", backQuote(object_name));
+
+    /// Refresh object and set watch for it. Because it can be replaced by another node after creation.
+    refreshObject(zookeeper, object_type, object_name);
+
+    return true;
+}
+
+
+bool UserDefinedSQLObjectsLoaderFromZooKeeper::removeObject(
+    UserDefinedSQLObjectType object_type, const String & object_name, bool throw_if_not_exists)
+{
+    String path = getNodePath(zookeeper_path, object_type, object_name);
+    LOG_DEBUG(log, "Removing user-defined object {} at zk path {}", backQuote(object_name), path);
+
+    auto zookeeper = getZooKeeper();
+
+    auto code = zookeeper->tryRemove(path);
+    if ((code != Coordination::Error::ZOK) && (code != Coordination::Error::ZNONODE))
+        throw zkutil::KeeperException(code, path);
+
+    if (code == Coordination::Error::ZNONODE)
+    {
+        if (throw_if_not_exists)
+            throw Exception(ErrorCodes::UNKNOWN_FUNCTION, "User-defined object '{}' doesn't exist", object_name);
+        else
+            return false;
+    }
+
+    LOG_DEBUG(log, "Object {} removed", backQuote(object_name));
+    return true;
+}
+
+bool UserDefinedSQLObjectsLoaderFromZooKeeper::getObjectDataAndSetWatch(
+    const zkutil::ZooKeeperPtr & zookeeper,
+    String & data,
+    const String & path,
+    UserDefinedSQLObjectType object_type,
+    const String & object_name)
+{
+    const auto object_watcher = [my_watch_queue = watch_queue, object_type, object_name](const Coordination::WatchResponse & response)
+    {
+        if (response.type == Coordination::Event::CHANGED)
+        {
+            [[maybe_unused]] bool inserted = my_watch_queue->emplace(object_type, object_name);
+            /// `inserted` can be false if `watch_queue` was already finalized (which happens when stopWatching() is called).
+        }
+        /// Event::DELETED is processed as child event by getChildren watch
+    };
+
+    Coordination::Stat entity_stat;
+    String object_create_query;
+    return zookeeper->tryGetWatch(path, data, &entity_stat, object_watcher);
+}
+
+ASTPtr UserDefinedSQLObjectsLoaderFromZooKeeper::parseObjectData(const String & object_data, UserDefinedSQLObjectType object_type)
+{
+    switch (object_type)
+    {
+        case UserDefinedSQLObjectType::Function: {
+            ParserCreateFunctionQuery parser;
+            ASTPtr ast = parseQuery(
+                parser,
+                object_data.data(),
+                object_data.data() + object_data.size(),
+                "",
+                0,
+                global_context->getSettingsRef().max_parser_depth);
+            return ast;
+        }
+    }
+    UNREACHABLE();
+}
+
+ASTPtr UserDefinedSQLObjectsLoaderFromZooKeeper::tryLoadObject(
+    const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type, const String & object_name)
+{
+    String path = getNodePath(zookeeper_path, object_type, object_name);
+    LOG_DEBUG(log, "Loading user defined object {} from zk path {}", backQuote(object_name), path);
+
+    try
+    {
+        String object_data;
+        bool exists = getObjectDataAndSetWatch(zookeeper, object_data, path, object_type, object_name);
+
+        if (!exists)
+        {
+            LOG_INFO(log, "User-defined object '{}' can't be loaded from path {}, because it doesn't exist", backQuote(object_name), path);
+            return nullptr;
+        }
+
+        return parseObjectData(object_data, object_type);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, fmt::format("while loading user defined SQL object {}", backQuote(object_name)));
+        return nullptr; /// Failed to load this sql object, will ignore it
+    }
+}
+
+Strings UserDefinedSQLObjectsLoaderFromZooKeeper::getObjectNamesAndSetWatch(
+    const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type)
+{
+    auto object_list_watcher = [my_watch_queue = watch_queue, object_type](const Coordination::WatchResponse &)
+    {
+        [[maybe_unused]] bool inserted = my_watch_queue->emplace(object_type, "");
+        /// `inserted` can be false if `watch_queue` was already finalized (which happens when stopWatching() is called).
+    };
+
+    Coordination::Stat stat;
+    const auto node_names = zookeeper->getChildrenWatch(zookeeper_path, &stat, object_list_watcher);
+    const auto prefix = getNodePrefix(object_type);
+
+    Strings object_names;
+    object_names.reserve(node_names.size());
+    for (const auto & node_name : node_names)
+    {
+        if (node_name.starts_with(prefix) && node_name.ends_with(sql_extension))
+        {
+            String object_name = unescapeForFileName(node_name.substr(prefix.length(), node_name.length() - prefix.length() - sql_extension.length()));
+            if (!object_name.empty())
+                object_names.push_back(std::move(object_name));
+        }
+    }
+
+    return object_names;
+}
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::refreshAllObjects(const zkutil::ZooKeeperPtr & zookeeper)
+{
+    /// It doesn't make sense to keep the old watch events because we will reread everything in this function.
+    watch_queue->clear();
+
+    refreshObjects(zookeeper, UserDefinedSQLObjectType::Function);
+    objects_loaded = true;
+}
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::refreshObjects(const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type)
+{
+    LOG_DEBUG(log, "Refreshing all user-defined {} objects", object_type);
+    Strings object_names = getObjectNamesAndSetWatch(zookeeper, object_type);
+
+    /// Read & parse all SQL objects from ZooKeeper
+    std::vector<std::pair<String, ASTPtr>> function_names_and_asts;
+    for (const auto & function_name : object_names)
+    {
+        if (auto ast = tryLoadObject(zookeeper, UserDefinedSQLObjectType::Function, function_name))
+            function_names_and_asts.emplace_back(function_name, ast);
+    }
+
+    UserDefinedSQLFunctionFactory::instance().setAllFunctions(function_names_and_asts);
+
+    LOG_DEBUG(log, "All user-defined {} objects refreshed", object_type);
+}
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::syncObjects(const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type)
+{
+    LOG_DEBUG(log, "Syncing user-defined {} objects", object_type);
+    Strings object_names = getObjectNamesAndSetWatch(zookeeper, object_type);
+
+    auto & factory = UserDefinedSQLFunctionFactory::instance();
+    auto lock = factory.getLock();
+
+    /// Remove stale objects
+    factory.removeAllFunctionsExcept(object_names);
+    /// Read & parse only new SQL objects from ZooKeeper
+    for (const auto & function_name : object_names)
+    {
+        if (!UserDefinedSQLFunctionFactory::instance().has(function_name))
+            refreshObject(zookeeper, UserDefinedSQLObjectType::Function, function_name);
+    }
+
+    LOG_DEBUG(log, "User-defined {} objects synced", object_type);
+}
+
+void UserDefinedSQLObjectsLoaderFromZooKeeper::refreshObject(
+    const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type, const String & object_name)
+{
+    auto ast = tryLoadObject(zookeeper, object_type, object_name);
+    auto & factory = UserDefinedSQLFunctionFactory::instance();
+
+    if (ast)
+        factory.setFunction(object_name, *ast);
+    else
+        factory.removeFunction(object_name);
+}
+
+}
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsLoaderFromZooKeeper.h b/src/Functions/UserDefined/UserDefinedSQLObjectsLoaderFromZooKeeper.h
new file mode 100644
index 00000000000..38e061fd4d9
--- /dev/null
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsLoaderFromZooKeeper.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include <Functions/UserDefined/IUserDefinedSQLObjectsLoader.h>
+#include <Interpreters/Context_fwd.h>
+#include <Parsers/IAST_fwd.h>
+#include <Common/ConcurrentBoundedQueue.h>
+#include <Common/ThreadPool.h>
+#include <Common/ZooKeeper/ZooKeeperCachingGetter.h>
+
+
+namespace DB
+{
+
+/// Loads user-defined sql objects from ZooKeeper.
+class UserDefinedSQLObjectsLoaderFromZooKeeper : public IUserDefinedSQLObjectsLoader
+{
+public:
+    UserDefinedSQLObjectsLoaderFromZooKeeper(const ContextPtr & global_context_, const String & zookeeper_path_);
+    ~UserDefinedSQLObjectsLoaderFromZooKeeper() override;
+
+    bool isReplicated() const override { return true; }
+    String getReplicationID() const override { return zookeeper_path; }
+
+    void loadObjects() override;
+    void stopWatching() override;
+    void reloadObjects() override;
+    void reloadObject(UserDefinedSQLObjectType object_type, const String & object_name) override;
+
+    bool storeObject(
+        UserDefinedSQLObjectType object_type,
+        const String & object_name,
+        const IAST & create_object_query,
+        bool throw_if_exists,
+        bool replace_if_exists,
+        const Settings & settings) override;
+    bool removeObject(UserDefinedSQLObjectType object_type, const String & object_name, bool throw_if_not_exists) override;
+
+private:
+    void processWatchQueue();
+
+    zkutil::ZooKeeperPtr getZooKeeper();
+    void initZooKeeperIfNeeded();
+    void resetAfterError();
+
+    void startWatchingThread();
+    void stopWatchingThread();
+
+    void createRootNodes(const zkutil::ZooKeeperPtr & zookeeper);
+
+    ASTPtr tryLoadObject(const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type, const String & object_name);
+    void refreshObject(const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type, const String & object_name);
+
+    bool getObjectDataAndSetWatch(
+        const zkutil::ZooKeeperPtr & zookeeper,
+        String & data,
+        const String & path,
+        UserDefinedSQLObjectType object_type,
+        const String & object_name);
+    Strings getObjectNamesAndSetWatch(const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type);
+    ASTPtr parseObjectData(const String & object_data, UserDefinedSQLObjectType object_type);
+
+    void refreshAllObjects(const zkutil::ZooKeeperPtr & zookeeper);
+    void refreshObjects(const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type);
+    void syncObjects(const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type);
+
+    ContextPtr global_context;
+
+    zkutil::ZooKeeperCachingGetter zookeeper_getter;
+    String zookeeper_path;
+    std::atomic<bool> objects_loaded = false;
+
+    ThreadFromGlobalPool watching_thread;
+    std::atomic<bool> watching_flag = false;
+
+    using UserDefinedSQLObjectTypeAndName = std::pair<UserDefinedSQLObjectType, String>;
+    std::shared_ptr<ConcurrentBoundedQueue<UserDefinedSQLObjectTypeAndName>> watch_queue;
+
+    Poco::Logger * log;
+};
+
+}
diff --git a/src/Functions/UserDefined/createUserDefinedSQLObjectsLoader.cpp b/src/Functions/UserDefined/createUserDefinedSQLObjectsLoader.cpp
index 9d0137328d1..b7ebc7abf14 100644
--- a/src/Functions/UserDefined/createUserDefinedSQLObjectsLoader.cpp
+++ b/src/Functions/UserDefined/createUserDefinedSQLObjectsLoader.cpp
@@ -1,5 +1,6 @@
 #include <Functions/UserDefined/createUserDefinedSQLObjectsLoader.h>
 #include <Functions/UserDefined/UserDefinedSQLObjectsLoaderFromDisk.h>
+#include <Functions/UserDefined/UserDefinedSQLObjectsLoaderFromZooKeeper.h>
 #include <Interpreters/Context.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <filesystem>
@@ -10,11 +11,33 @@ namespace fs = std::filesystem;
 namespace DB
 {
 
+
+namespace ErrorCodes
+{
+    extern const int INVALID_CONFIG_PARAMETER;
+}
+
 std::unique_ptr<IUserDefinedSQLObjectsLoader> createUserDefinedSQLObjectsLoader(const ContextMutablePtr & global_context)
 {
+    const String zookeeper_path_key = "user_defined_zookeeper_path";
+    const String disk_path_key = "user_defined_path";
+
     const auto & config = global_context->getConfigRef();
+    if (config.has(zookeeper_path_key))
+    {
+        if (config.has(disk_path_key))
+        {
+            throw Exception(
+                ErrorCodes::INVALID_CONFIG_PARAMETER,
+                "'{}' and '{}' must not be both specified in the config",
+                zookeeper_path_key,
+                disk_path_key);
+        }
+        return std::make_unique<UserDefinedSQLObjectsLoaderFromZooKeeper>(global_context, config.getString(zookeeper_path_key));
+    }
+
     String default_path = fs::path{global_context->getPath()} / "user_defined/";
-    String path = config.getString("user_defined_path", default_path);
+    String path = config.getString(disk_path_key, default_path);
     return std::make_unique<UserDefinedSQLObjectsLoaderFromDisk>(global_context, path);
 }
 
diff --git a/src/Functions/abs.cpp b/src/Functions/abs.cpp
index a7afdbacad6..25ff6cc93d0 100644
--- a/src/Functions/abs.cpp
+++ b/src/Functions/abs.cpp
@@ -10,8 +10,7 @@ template <typename A>
 struct AbsImpl
 {
     using ResultType = std::conditional_t<is_decimal<A>, A, typename NumberTraits::ResultOfAbs<A>::Type>;
-    static const constexpr bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr bool allow_string_or_fixed_string = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
diff --git a/src/Functions/array/CMakeLists.txt b/src/Functions/array/CMakeLists.txt
index 98335dbb8e7..2800b5b4e28 100644
--- a/src/Functions/array/CMakeLists.txt
+++ b/src/Functions/array/CMakeLists.txt
@@ -3,6 +3,10 @@ add_headers_and_sources(clickhouse_functions_array .)
 add_library(clickhouse_functions_array OBJECT ${clickhouse_functions_array_sources} ${clickhouse_functions_array_headers})
 target_link_libraries(clickhouse_functions_array PRIVATE dbms clickhouse_functions_gatherutils)
 
+if (TARGET ch_contrib::vectorscan)
+    target_link_libraries(clickhouse_functions_array PRIVATE ch_contrib::vectorscan)
+endif()
+
 if (OMIT_HEAVY_DEBUG_SYMBOLS)
     target_compile_options(clickhouse_functions_array PRIVATE "-g0")
 endif()
diff --git a/src/Functions/array/FunctionArrayMapped.h b/src/Functions/array/FunctionArrayMapped.h
index 61abc607349..a7ab80f697a 100644
--- a/src/Functions/array/FunctionArrayMapped.h
+++ b/src/Functions/array/FunctionArrayMapped.h
@@ -19,6 +19,7 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeTuple.h>
 
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
@@ -41,33 +42,6 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-
-template <typename T>
-ColumnPtr getOffsetsPtr(const T & column)
-{
-    if constexpr (std::is_same_v<T, ColumnArray>)
-    {
-        return column.getOffsetsPtr();
-    }
-    else // ColumnMap
-    {
-        return column.getNestedColumn().getOffsetsPtr();
-    }
-}
-
-template <typename T>
-const IColumn::Offsets & getOffsets(const T & column)
-{
-    if constexpr (std::is_same_v<T, ColumnArray>)
-    {
-        return column.getOffsets();
-    }
-    else // ColumnMap
-    {
-        return column.getNestedColumn().getOffsets();
-    }
-}
-
 /** Higher-order functions for arrays.
   * These functions optionally apply a map (transform) to array (or multiple arrays of identical size) by lambda function,
   *  and return some result based on that transformation.
@@ -90,10 +64,6 @@ class FunctionArrayMapped : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static constexpr bool is_argument_type_map = std::is_same_v<typename Impl::data_type, DataTypeMap>;
-    static constexpr bool is_argument_type_array = std::is_same_v<typename Impl::data_type, DataTypeArray>;
-    static constexpr auto argument_type_name = is_argument_type_map ? "Map" : "Array";
-
     static constexpr size_t num_fixed_params = []{ if constexpr (requires { Impl::num_fixed_params; }) return Impl::num_fixed_params; else return 0; }();
 
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayMapped>(); }
@@ -131,32 +101,56 @@ public:
                 num_fixed_params + 1,
                 (num_fixed_params + 1 == 1) ? "" : "s");
 
-        size_t nested_types_count = (arguments.size() - num_fixed_params - 1) * (is_argument_type_map ? 2 : 1);
-        DataTypes nested_types(nested_types_count);
-        for (size_t i = 0; i < arguments.size() - 1 - num_fixed_params; ++i)
+        bool is_single_array_argument = arguments.size() == num_fixed_params + 2;
+        size_t tuple_argument_size = 0;
+
+        size_t num_nested_types = arguments.size() - num_fixed_params - 1;
+        DataTypes nested_types(num_nested_types);
+
+        for (size_t i = 0; i < num_nested_types; ++i)
         {
-            const auto * array_type = checkAndGetDataType<typename Impl::data_type>(&*arguments[i + 1 + num_fixed_params]);
+            const auto * array_type = checkAndGetDataType<DataTypeArray>(&*arguments[i + 1 + num_fixed_params]);
             if (!array_type)
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Argument {} of function {} must be {}. Found {} instead",
+                    "Argument {} of function {} must be Array. Found {} instead",
                     i + 2 + num_fixed_params,
                     getName(),
-                    argument_type_name,
                     arguments[i + 1 + num_fixed_params]->getName());
-            if constexpr (is_argument_type_map)
-            {
-                nested_types[2 * i] = recursiveRemoveLowCardinality(array_type->getKeyType());
-                nested_types[2 * i + 1] = recursiveRemoveLowCardinality(array_type->getValueType());
-            }
-            else if constexpr (is_argument_type_array)
-            {
-                nested_types[i] = recursiveRemoveLowCardinality(array_type->getNestedType());
-            }
+
+            if (const auto * tuple_type = checkAndGetDataType<DataTypeTuple>(array_type->getNestedType().get()))
+                tuple_argument_size = tuple_type->getElements().size();
+
+            nested_types[i] = recursiveRemoveLowCardinality(array_type->getNestedType());
         }
 
-        const DataTypeFunction * function_type = checkAndGetDataType<DataTypeFunction>(arguments[0].get());
-        if (!function_type || function_type->getArgumentTypes().size() != nested_types.size())
+        const auto * function_type = checkAndGetDataType<DataTypeFunction>(arguments[0].get());
+        if (!function_type)
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "First argument for this overload of {} must be a function with {} arguments, found {} instead",
+                getName(),
+                nested_types.size(),
+                arguments[0]->getName());
+
+        size_t num_function_arguments = function_type->getArgumentTypes().size();
+        if (is_single_array_argument
+            && tuple_argument_size > 1
+            && tuple_argument_size == num_function_arguments)
+        {
+            assert(nested_types.size() == 1);
+
+            auto argument_type = nested_types[0];
+            const auto & tuple_type = assert_cast<const DataTypeTuple &>(*argument_type);
+
+            nested_types.clear();
+            nested_types.reserve(tuple_argument_size);
+
+            for (const auto & element : tuple_type.getElements())
+                nested_types.push_back(element);
+        }
+
+        if (num_function_arguments != nested_types.size())
             throw Exception(
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                 "First argument for this overload of {} must be a function with {} arguments, found {} instead",
@@ -179,11 +173,11 @@ public:
                 (min_args > 1 ? "s" : ""),
                 arguments.size());
 
-        if ((arguments.size() == 1 + num_fixed_params) && is_argument_type_array)
+        if (arguments.size() == 1 + num_fixed_params)
         {
-            const auto * data_type = checkAndGetDataType<typename Impl::data_type>(arguments[num_fixed_params].type.get());
+            const auto * array_type = checkAndGetDataType<DataTypeArray>(arguments[num_fixed_params].type.get());
 
-            if (!data_type)
+            if (!array_type)
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "The {}{}{} argument for function {} must be array. Found {} instead",
@@ -196,7 +190,7 @@ public:
             if constexpr (num_fixed_params)
                 Impl::checkArguments(getName(), arguments.data());
 
-            DataTypePtr nested_type = data_type->getNestedType();
+            DataTypePtr nested_type = array_type->getNestedType();
 
             if (Impl::needBoolean() && !isUInt8(nested_type))
                 throw Exception(
@@ -208,10 +202,7 @@ public:
                     getName(),
                     arguments[num_fixed_params].type->getName());
 
-            if constexpr (is_argument_type_array)
-                return Impl::getReturnType(nested_type, nested_type);
-            else
-                throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Unreachable code reached");
+            return Impl::getReturnType(nested_type, nested_type);
         }
         else
         {
@@ -246,26 +237,15 @@ public:
                     getName(),
                     return_type->getName());
 
-            static_assert(is_argument_type_map || is_argument_type_array, "unsupported type");
-
             if (arguments.size() < 2 + num_fixed_params)
-            {
                 throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Incorrect number of arguments: {}", arguments.size());
-            }
-
-            const auto * first_array_type = checkAndGetDataType<typename Impl::data_type>(arguments[1 + num_fixed_params].type.get());
 
+            const auto * first_array_type = checkAndGetDataType<DataTypeArray>(arguments[1 + num_fixed_params].type.get());
             if (!first_array_type)
                 throw DB::Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Unsupported type {}", arguments[1 + num_fixed_params].type->getName());
 
-            if constexpr (is_argument_type_array)
-                return Impl::getReturnType(return_type, first_array_type->getNestedType());
-
-            if constexpr (is_argument_type_map)
-                return Impl::getReturnType(return_type, first_array_type->getKeyValueTypes());
-
-            throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Unreachable code reached");
+            return Impl::getReturnType(return_type, first_array_type->getNestedType());
         }
     }
 
@@ -274,38 +254,26 @@ public:
         if (arguments.size() == 1 + num_fixed_params)
         {
             ColumnPtr column_array_ptr = arguments[num_fixed_params].column;
-            const auto * column_array = checkAndGetColumn<typename Impl::column_type>(column_array_ptr.get());
+            const auto * column_array = checkAndGetColumn<ColumnArray>(column_array_ptr.get());
 
             if (!column_array)
             {
-                const ColumnConst * column_const_array = checkAndGetColumnConst<typename Impl::column_type>(column_array_ptr.get());
+                const auto * column_const_array = checkAndGetColumnConst<ColumnArray>(column_array_ptr.get());
                 if (!column_const_array)
                     throw Exception(
-                        ErrorCodes::ILLEGAL_COLUMN, "Expected {} column, found {}", argument_type_name, column_array_ptr->getName());
+                        ErrorCodes::ILLEGAL_COLUMN, "Expected Array column, found {}", column_array_ptr->getName());
+
                 column_array_ptr = column_const_array->convertToFullColumn();
-                column_array = assert_cast<const typename Impl::column_type *>(column_array_ptr.get());
+                column_array = assert_cast<const ColumnArray *>(column_array_ptr.get());
             }
 
-            if constexpr (std::is_same_v<typename Impl::column_type, ColumnMap>)
-            {
-                if constexpr (num_fixed_params)
-                    return Impl::execute(
-                        *column_array,
-                        column_array->getNestedColumn().getDataPtr(),
-                        arguments.data());
-                else
-                    return Impl::execute(*column_array, column_array->getNestedColumn().getDataPtr());
-            }
+            if constexpr (num_fixed_params)
+                return Impl::execute(
+                    *column_array,
+                    column_array->getDataPtr(),
+                    arguments.data());
             else
-            {
-                if constexpr (num_fixed_params)
-                    return Impl::execute(
-                        *column_array,
-                        column_array->getDataPtr(),
-                        arguments.data());
-                else
-                    return Impl::execute(*column_array, column_array->getDataPtr());
-            }
+                return Impl::execute(*column_array, column_array->getDataPtr());
         }
         else
         {
@@ -315,56 +283,82 @@ public:
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be a function.", getName());
 
             const auto * column_function = typeid_cast<const ColumnFunction *>(column_with_type_and_name.column.get());
-
             if (!column_function)
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be a function.", getName());
 
-            ColumnPtr offsets_column;
+            const auto & type_function = assert_cast<const DataTypeFunction &>(*arguments[0].type);
+            size_t num_function_arguments = type_function.getArgumentTypes().size();
 
+            ColumnPtr offsets_column;
             ColumnPtr column_first_array_ptr;
-            const typename Impl::column_type * column_first_array = nullptr;
+            const ColumnArray * column_first_array = nullptr;
 
             ColumnsWithTypeAndName arrays;
-            arrays.reserve(arguments.size() - 1);
+            arrays.reserve(arguments.size() - 1 - num_fixed_params);
 
+            bool is_single_array_argument = arguments.size() == num_fixed_params + 2;
             for (size_t i = 1 + num_fixed_params; i < arguments.size(); ++i)
             {
                 const auto & array_with_type_and_name = arguments[i];
 
-                ColumnPtr column_array_ptr = array_with_type_and_name.column;
-                const auto * column_array = checkAndGetColumn<typename Impl::column_type>(column_array_ptr.get());
+                auto column_array_ptr = array_with_type_and_name.column;
+                const auto * column_array = checkAndGetColumn<ColumnArray>(column_array_ptr.get());
 
-                const DataTypePtr & array_type_ptr = array_with_type_and_name.type;
-                const auto * array_type = checkAndGetDataType<typename Impl::data_type>(array_type_ptr.get());
+                const auto & array_type_ptr = array_with_type_and_name.type;
+                const auto * array_type = checkAndGetDataType<DataTypeArray>(array_type_ptr.get());
 
                 if (!column_array)
                 {
-                    const ColumnConst * column_const_array = checkAndGetColumnConst<typename Impl::column_type>(column_array_ptr.get());
+                    const auto * column_const_array = checkAndGetColumnConst<ColumnArray>(column_array_ptr.get());
                     if (!column_const_array)
                         throw Exception(
-                            ErrorCodes::ILLEGAL_COLUMN, "Expected {} column, found {}", argument_type_name, column_array_ptr->getName());
+                            ErrorCodes::ILLEGAL_COLUMN, "Expected Array column, found {}", column_array_ptr->getName());
+
                     column_array_ptr = recursiveRemoveLowCardinality(column_const_array->convertToFullColumn());
-                    column_array = checkAndGetColumn<typename Impl::column_type>(column_array_ptr.get());
+                    column_array = checkAndGetColumn<ColumnArray>(column_array_ptr.get());
                 }
 
                 if (!array_type)
                     throw Exception(
-                        ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Expected {} type, found {}", argument_type_name, array_type_ptr->getName());
+                        ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Expected Array type, found {}", array_type_ptr->getName());
 
                 if (!offsets_column)
                 {
-                    offsets_column = getOffsetsPtr(*column_array);
+                    offsets_column = column_array->getOffsetsPtr();
                 }
                 else
                 {
                     /// The first condition is optimization: do not compare data if the pointers are equal.
-                    if (getOffsetsPtr(*column_array) != offsets_column
-                        && getOffsets(*column_array) != typeid_cast<const ColumnArray::ColumnOffsets &>(*offsets_column).getData())
+                    if (column_array->getOffsetsPtr() != offsets_column
+                        && column_array->getOffsets() != typeid_cast<const ColumnArray::ColumnOffsets &>(*offsets_column).getData())
                         throw Exception(
                             ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
-                            "{}s passed to {} must have equal size",
-                            argument_type_name,
-                            getName());
+                                "Arrays passed to {} must have equal size", getName());
+                }
+
+                const auto * column_tuple = checkAndGetColumn<ColumnTuple>(&column_array->getData());
+                size_t tuple_size = column_tuple ? column_tuple->getColumns().size() : 0;
+
+                if (is_single_array_argument && tuple_size > 1 && tuple_size == num_function_arguments)
+                {
+                    const auto & type_tuple = assert_cast<const DataTypeTuple &>(*array_type->getNestedType());
+                    const auto & tuple_names = type_tuple.getElementNames();
+
+                    arrays.reserve(column_tuple->getColumns().size());
+                    for (size_t j = 0; j < tuple_size; ++j)
+                    {
+                        arrays.emplace_back(
+                            column_tuple->getColumnPtr(j),
+                            recursiveRemoveLowCardinality(type_tuple.getElement(j)),
+                            array_with_type_and_name.name + "." + tuple_names[j]);
+                    }
+                }
+                else
+                {
+                    arrays.emplace_back(
+                        column_array->getDataPtr(),
+                        recursiveRemoveLowCardinality(array_type->getNestedType()),
+                        array_with_type_and_name.name);
                 }
 
                 if (i == 1 + num_fixed_params)
@@ -372,24 +366,10 @@ public:
                     column_first_array_ptr = column_array_ptr;
                     column_first_array = column_array;
                 }
-
-                if constexpr (is_argument_type_map)
-                {
-                    arrays.emplace_back(ColumnWithTypeAndName(
-                        column_array->getNestedData().getColumnPtr(0), recursiveRemoveLowCardinality(array_type->getKeyType()), array_with_type_and_name.name+".key"));
-                    arrays.emplace_back(ColumnWithTypeAndName(
-                        column_array->getNestedData().getColumnPtr(1), recursiveRemoveLowCardinality(array_type->getValueType()), array_with_type_and_name.name+".value"));
-                }
-                else
-                {
-                    arrays.emplace_back(ColumnWithTypeAndName(column_array->getDataPtr(),
-                                                            recursiveRemoveLowCardinality(array_type->getNestedType()),
-                                                            array_with_type_and_name.name));
-                }
             }
 
             /// Put all the necessary columns multiplied by the sizes of arrays into the columns.
-            auto replicated_column_function_ptr = IColumn::mutate(column_function->replicate(getOffsets(*column_first_array)));
+            auto replicated_column_function_ptr = IColumn::mutate(column_function->replicate(column_first_array->getOffsets()));
             auto * replicated_column_function = typeid_cast<ColumnFunction *>(replicated_column_function_ptr.get());
             replicated_column_function->appendArguments(arrays);
 
diff --git a/src/Functions/array/FunctionsMapMiscellaneous.cpp b/src/Functions/array/FunctionsMapMiscellaneous.cpp
new file mode 100644
index 00000000000..157f2fa8a26
--- /dev/null
+++ b/src/Functions/array/FunctionsMapMiscellaneous.cpp
@@ -0,0 +1,464 @@
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnFunction.h>
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnConst.h>
+
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeFunction.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeTuple.h>
+
+#include <Functions/FunctionHelpers.h>
+#include <Functions/like.h>
+#include <Functions/array/arrayConcat.h>
+#include <Functions/array/arrayFilter.h>
+#include <Functions/array/arrayMap.h>
+#include <Functions/array/arraySort.h>
+#include <Functions/array/arrayIndex.h>
+#include <Functions/array/arrayExists.h>
+#include <Functions/array/arrayAll.h>
+#include <Functions/identity.h>
+#include <Functions/FunctionFactory.h>
+
+#include <base/map.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+/** An adapter that allows to execute array* functions over Map types arguments.
+  * E.g. transform mapConcat to arrayConcat.
+  *
+  * Impl - the implementation of function that is applied
+  * to internal column of Map arguments (e.g. 'arrayConcat').
+  *
+  * Adapter - a struct that determines the way how to extract the internal array columns
+  * from Map arguments and possibly modify other columns.
+*/
+template <typename Impl, typename Adapter, typename Name>
+class FunctionMapToArrayAdapter : public IFunction
+{
+public:
+    static constexpr auto name = Name::name;
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapToArrayAdapter>(); }
+    String getName() const override { return name; }
+
+    bool isVariadic() const override { return impl.isVariadic(); }
+    size_t getNumberOfArguments() const override { return impl.getNumberOfArguments(); }
+    bool useDefaultImplementationForConstants() const override { return impl.useDefaultImplementationForConstants(); }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo &) const override  { return false; }
+
+    void getLambdaArgumentTypes(DataTypes & arguments) const override
+    {
+        Adapter::extractNestedTypes(arguments);
+        impl.getLambdaArgumentTypes(arguments);
+    }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (arguments.empty())
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Function {} requires at least one argument, passed {}", getName(), arguments.size());
+
+        auto nested_arguments = arguments;
+        Adapter::extractNestedTypesAndColumns(nested_arguments);
+
+        constexpr bool impl_has_get_return_type = requires
+        {
+            impl.getReturnTypeImpl(nested_arguments);
+        };
+
+        /// If method is not overloaded in the implementation call default implementation
+        /// from IFunction. Here inheritance cannot be used for template parameterized field.
+        if constexpr (impl_has_get_return_type)
+            return Adapter::wrapType(impl.getReturnTypeImpl(nested_arguments));
+        else
+            return Adapter::wrapType(dynamic_cast<const IFunction &>(impl).getReturnTypeImpl(nested_arguments));
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        auto nested_arguments = arguments;
+        Adapter::extractNestedTypesAndColumns(nested_arguments);
+        return Adapter::wrapColumn(impl.executeImpl(nested_arguments, Adapter::extractResultType(result_type), input_rows_count));
+    }
+
+private:
+    Impl impl;
+};
+
+
+template <typename Derived, typename Name>
+struct MapAdapterBase
+{
+    static void extractNestedTypes(DataTypes & types)
+    {
+        bool has_map_column = false;
+        for (auto & type : types)
+        {
+            if (const auto * type_map = typeid_cast<const DataTypeMap *>(type.get()))
+            {
+                has_map_column = true;
+                type = Derived::extractNestedType(*type_map);
+            }
+        }
+
+        if (!has_map_column)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Function {} requires at least one argument of type Map", Name::name);
+    }
+
+    static void extractNestedTypesAndColumns(ColumnsWithTypeAndName & arguments)
+    {
+        bool has_map_column = false;
+        for (auto & argument : arguments)
+        {
+            if (const auto * type_map = typeid_cast<const DataTypeMap *>(argument.type.get()))
+            {
+                has_map_column = true;
+                argument.type = Derived::extractNestedType(*type_map);
+
+                if (argument.column)
+                {
+                    if (const auto * const_map = checkAndGetColumnConstData<ColumnMap>(argument.column.get()))
+                        argument.column = ColumnConst::create(Derived::extractNestedColumn(*const_map), argument.column->size());
+                    else
+                        argument.column = Derived::extractNestedColumn(assert_cast<const ColumnMap &>(*argument.column));
+                }
+            }
+        }
+
+        if (!has_map_column)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Function {} requires at least one argument of type Map", Name::name);
+    }
+};
+
+/// Adapter that extracts nested Array(Tuple(key, value)) from Map columns.
+template <typename Name, bool returns_map = true>
+struct MapToNestedAdapter : public MapAdapterBase<MapToNestedAdapter<Name, returns_map>, Name>
+{
+    using MapAdapterBase<MapToNestedAdapter, Name>::extractNestedTypes;
+    using MapAdapterBase<MapToNestedAdapter, Name>::extractNestedTypesAndColumns;
+
+    static DataTypePtr extractNestedType(const DataTypeMap & type_map)
+    {
+        return type_map.getNestedTypeWithUnnamedTuple();
+    }
+
+    static ColumnPtr extractNestedColumn(const ColumnMap & column_map)
+    {
+        return column_map.getNestedColumnPtr();
+    }
+
+    static DataTypePtr extractResultType(const DataTypePtr & result_type)
+    {
+        if constexpr (returns_map)
+            return assert_cast<const DataTypeMap &>(*result_type).getNestedType();
+        return result_type;
+    }
+
+    static DataTypePtr wrapType(DataTypePtr type)
+    {
+        if constexpr (returns_map)
+            return std::make_shared<DataTypeMap>(std::move(type));
+        return type;
+    }
+
+    static ColumnPtr wrapColumn(ColumnPtr column)
+    {
+        if constexpr (returns_map)
+            return ColumnMap::create(std::move(column));
+        return column;
+    }
+};
+
+/// Adapter that extracts array with keys or values from Map columns.
+template <typename Name, size_t position>
+struct MapToSubcolumnAdapter : public MapAdapterBase<MapToSubcolumnAdapter<Name, position>, Name>
+{
+    static_assert(position <= 1);
+    using MapAdapterBase<MapToSubcolumnAdapter, Name>::extractNestedTypes;
+    using MapAdapterBase<MapToSubcolumnAdapter, Name>::extractNestedTypesAndColumns;
+
+    static DataTypePtr extractNestedType(const DataTypeMap & type_map)
+    {
+        const auto & array_type = assert_cast<const DataTypeArray &>(*type_map.getNestedType());
+        const auto & tuple_type = assert_cast<const DataTypeTuple &>(*array_type.getNestedType());
+        return std::make_shared<DataTypeArray>(tuple_type.getElement(position));
+    }
+
+    static ColumnPtr extractNestedColumn(const ColumnMap & column_map)
+    {
+        const auto & array_column = column_map.getNestedColumn();
+        const auto & tuple_column = column_map.getNestedData();
+        return ColumnArray::create(tuple_column.getColumnPtr(position), array_column.getOffsetsPtr());
+    }
+
+    static DataTypePtr extractResultType(const DataTypePtr & result_type) { return result_type; }
+    static DataTypePtr wrapType(DataTypePtr type) { return type; }
+    static ColumnPtr wrapColumn(ColumnPtr column) { return column; }
+};
+
+/// A special function that works like the following:
+/// mapKeyLike(pattern, key, value) <=> key LIKE pattern
+/// It is used to mimic lambda: (key, value) -> key LIKE pattern.
+class FunctionMapKeyLike : public IFunction
+{
+public:
+    String getName() const override { return "mapKeyLike"; }
+    size_t getNumberOfArguments() const override { return 3; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+    bool useDefaultImplementationForNulls() const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        DataTypes new_arguments{arguments[1], arguments[0]};
+        return impl.getReturnTypeImpl(new_arguments);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        ColumnsWithTypeAndName new_arguments{arguments[1], arguments[0]};
+        return impl.executeImpl(new_arguments, result_type, input_rows_count);
+    }
+
+private:
+    FunctionLike impl;
+};
+
+/// Adapter for map*KeyLike functions.
+/// It extracts nested Array(Tuple(key, value)) from Map columns
+/// and prepares ColumnFunction as first argument which works
+/// like lambda (k, v) -> k LIKE pattern to pass it to the nested
+/// function derived from FunctionArrayMapped.
+template <typename Name, bool returns_map>
+struct MapKeyLikeAdapter
+{
+    static void checkTypes(const DataTypes & types)
+    {
+        if (types.size() != 2)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Number of arguments for function {} doesn't match: passed {}, should be 2",
+                Name::name, types.size());
+
+        const auto * map_type = checkAndGetDataType<DataTypeMap>(types[0].get());
+        if (!map_type)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be a Map", Name::name);
+
+        if (!isStringOrFixedString(types[1]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Second argument for function {} must be String or FixedString", Name::name);
+
+        if (!isStringOrFixedString(map_type->getKeyType()))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Key type of map for function {} must be String or FixedString", Name::name);
+    }
+
+    static void extractNestedTypes(DataTypes & types)
+    {
+        checkTypes(types);
+        const auto & map_type = assert_cast<const DataTypeMap &>(*types[0]);
+
+        DataTypes lambda_argument_types{types[1], map_type.getKeyType(), map_type.getValueType()};
+        auto result_type = FunctionMapKeyLike().getReturnTypeImpl(lambda_argument_types);
+
+        DataTypes argument_types{map_type.getKeyType(), map_type.getValueType()};
+        auto function_type = std::make_shared<DataTypeFunction>(argument_types, result_type);
+
+        types = {function_type, types[0]};
+        MapToNestedAdapter<Name, returns_map>::extractNestedTypes(types);
+    }
+
+    static void extractNestedTypesAndColumns(ColumnsWithTypeAndName & arguments)
+    {
+        checkTypes(collections::map<DataTypes>(arguments, [](const auto & elem) { return elem.type; }));
+
+        const auto & map_type = assert_cast<const DataTypeMap &>(*arguments[0].type);
+        const auto & pattern_arg = arguments[1];
+
+        ColumnPtr function_column;
+        auto function = std::make_shared<FunctionMapKeyLike>();
+
+        DataTypes lambda_argument_types{pattern_arg.type, map_type.getKeyType(), map_type.getValueType()};
+        auto result_type = function->getReturnTypeImpl(lambda_argument_types);
+
+        DataTypes argument_types{map_type.getKeyType(), map_type.getValueType()};
+        auto function_type = std::make_shared<DataTypeFunction>(argument_types, result_type);
+
+        if (pattern_arg.column)
+        {
+            /// Here we create ColumnFunction with already captured pattern column.
+            /// Nested function will append keys and values column and it will work as desired lambda.
+            auto function_base = std::make_shared<FunctionToFunctionBaseAdaptor>(function, lambda_argument_types, result_type);
+            function_column = ColumnFunction::create(pattern_arg.column->size(), std::move(function_base), ColumnsWithTypeAndName{pattern_arg});
+        }
+
+        ColumnWithTypeAndName function_arg{function_column, function_type, "__function_map_key_like"};
+        arguments = {function_arg, arguments[0]};
+        MapToNestedAdapter<Name, returns_map>::extractNestedTypesAndColumns(arguments);
+    }
+
+    static DataTypePtr extractResultType(const DataTypePtr & result_type)
+    {
+        return MapToNestedAdapter<Name, returns_map>::extractResultType(result_type);
+    }
+
+    static DataTypePtr wrapType(DataTypePtr type)
+    {
+        return MapToNestedAdapter<Name, returns_map>::wrapType(std::move(type));
+    }
+
+    static ColumnPtr wrapColumn(ColumnPtr column)
+    {
+        return MapToNestedAdapter<Name, returns_map>::wrapColumn(std::move(column));
+    }
+};
+
+struct NameMapConcat { static constexpr auto name = "mapConcat"; };
+using FunctionMapConcat = FunctionMapToArrayAdapter<FunctionArrayConcat, MapToNestedAdapter<NameMapConcat>, NameMapConcat>;
+
+struct NameMapKeys { static constexpr auto name = "mapKeys"; };
+using FunctionMapKeys = FunctionMapToArrayAdapter<FunctionIdentity, MapToSubcolumnAdapter<NameMapKeys, 0>, NameMapKeys>;
+
+struct NameMapValues { static constexpr auto name = "mapValues"; };
+using FunctionMapValues = FunctionMapToArrayAdapter<FunctionIdentity, MapToSubcolumnAdapter<NameMapValues, 1>, NameMapValues>;
+
+struct NameMapContains { static constexpr auto name = "mapContains"; };
+using FunctionMapContains = FunctionMapToArrayAdapter<FunctionArrayIndex<HasAction, NameMapContains>, MapToSubcolumnAdapter<NameMapKeys, 0>, NameMapContains>;
+
+struct NameMapFilter { static constexpr auto name = "mapFilter"; };
+using FunctionMapFilter = FunctionMapToArrayAdapter<FunctionArrayFilter, MapToNestedAdapter<NameMapFilter>, NameMapFilter>;
+
+struct NameMapApply { static constexpr auto name = "mapApply"; };
+using FunctionMapApply = FunctionMapToArrayAdapter<FunctionArrayMap, MapToNestedAdapter<NameMapApply>, NameMapApply>;
+
+struct NameMapExists { static constexpr auto name = "mapExists"; };
+using FunctionMapExists = FunctionMapToArrayAdapter<FunctionArrayExists, MapToNestedAdapter<NameMapExists, false>, NameMapExists>;
+
+struct NameMapAll { static constexpr auto name = "mapAll"; };
+using FunctionMapAll = FunctionMapToArrayAdapter<FunctionArrayAll, MapToNestedAdapter<NameMapAll, false>, NameMapAll>;
+
+struct NameMapContainsKeyLike { static constexpr auto name = "mapContainsKeyLike"; };
+using FunctionMapContainsKeyLike = FunctionMapToArrayAdapter<FunctionArrayExists, MapKeyLikeAdapter<NameMapContainsKeyLike, false>, NameMapContainsKeyLike>;
+
+struct NameMapExtractKeyLike { static constexpr auto name = "mapExtractKeyLike"; };
+using FunctionMapExtractKeyLike = FunctionMapToArrayAdapter<FunctionArrayFilter, MapKeyLikeAdapter<NameMapExtractKeyLike, true>, NameMapExtractKeyLike>;
+
+struct NameMapSort { static constexpr auto name = "mapSort"; };
+struct NameMapReverseSort { static constexpr auto name = "mapReverseSort"; };
+struct NameMapPartialSort { static constexpr auto name = "mapPartialSort"; };
+struct NameMapPartialReverseSort { static constexpr auto name = "mapPartialReverseSort"; };
+
+using FunctionMapSort = FunctionMapToArrayAdapter<FunctionArraySort, MapToNestedAdapter<NameMapSort>, NameMapSort>;
+using FunctionMapReverseSort = FunctionMapToArrayAdapter<FunctionArrayReverseSort, MapToNestedAdapter<NameMapReverseSort>, NameMapReverseSort>;
+using FunctionMapPartialSort = FunctionMapToArrayAdapter<FunctionArrayPartialSort, MapToNestedAdapter<NameMapPartialSort>, NameMapPartialSort>;
+using FunctionMapPartialReverseSort = FunctionMapToArrayAdapter<FunctionArrayPartialReverseSort, MapToNestedAdapter<NameMapPartialReverseSort>, NameMapPartialReverseSort>;
+
+REGISTER_FUNCTION(MapMiscellaneous)
+{
+    factory.registerFunction<FunctionMapConcat>(
+    FunctionDocumentation{
+        .description="The same as arrayConcat.",
+        .examples{{"mapConcat", "SELECT mapConcat(map('k1', 'v1'), map('k2', 'v2'))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapKeys>(
+    FunctionDocumentation{
+        .description="Returns an array with the keys of map.",
+        .examples{{"mapKeys", "SELECT mapKeys(map('k1', 'v1', 'k2', 'v2'))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapValues>(
+    FunctionDocumentation{
+        .description="Returns an array with the values of map.",
+        .examples{{"mapValues", "SELECT mapValues(map('k1', 'v1', 'k2', 'v2'))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapContains>(
+    FunctionDocumentation{
+        .description="Checks whether the map has the specified key.",
+        .examples{{"mapContains", "SELECT mapContains(map('k1', 'v1', 'k2', 'v2'), 'k1')", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapFilter>(
+    FunctionDocumentation{
+        .description="The same as arrayFilter.",
+        .examples{{"mapFilter", "SELECT mapFilter((k, v) -> v > 1, map('k1', 1, 'k2', 2))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapApply>(
+    FunctionDocumentation{
+        .description="The same as arrayMap.",
+        .examples{{"mapApply", "SELECT mapApply((k, v) -> (k, v * 2), map('k1', 1, 'k2', 2))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapExists>(
+    FunctionDocumentation{
+        .description="The same as arrayExists.",
+        .examples{{"mapExists", "SELECT mapExists((k, v) -> v = 1, map('k1', 1, 'k2', 2))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapAll>(
+    FunctionDocumentation{
+        .description="The same as arrayAll.",
+        .examples{{"mapAll", "SELECT mapAll((k, v) -> v = 1, map('k1', 1, 'k2', 2))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapSort>(
+    FunctionDocumentation{
+        .description="The same as arraySort.",
+        .examples{{"mapSort", "SELECT mapSort((k, v) -> v, map('k1', 3, 'k2', 1, 'k3', 2))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapReverseSort>(
+    FunctionDocumentation{
+        .description="The same as arrayReverseSort.",
+        .examples{{"mapReverseSort", "SELECT mapReverseSort((k, v) -> v, map('k1', 3, 'k2', 1, 'k3', 2))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapPartialSort>(
+    FunctionDocumentation{
+        .description="The same as arrayReverseSort.",
+        .examples{{"mapPartialSort", "SELECT mapPartialSort((k, v) -> v, 2, map('k1', 3, 'k2', 1, 'k3', 2))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapPartialReverseSort>(
+    FunctionDocumentation{
+        .description="The same as arrayPartialReverseSort.",
+        .examples{{"mapPartialReverseSort", "SELECT mapPartialReverseSort((k, v) -> v, 2, map('k1', 3, 'k2', 1, 'k3', 2))", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapContainsKeyLike>(
+    FunctionDocumentation{
+        .description="Checks whether map contains key LIKE specified pattern.",
+        .examples{{"mapContainsKeyLike", "SELECT mapContainsKeyLike(map('k1-1', 1, 'k2-1', 2), 'k1%')", ""}},
+        .categories{"Map"},
+    });
+
+    factory.registerFunction<FunctionMapExtractKeyLike>(
+    FunctionDocumentation{
+        .description="Returns a map with elements which key matches the specified pattern.",
+        .examples{{"mapExtractKeyLike", "SELECT mapExtractKeyLike(map('k1-1', 1, 'k2-1', 2), 'k1%')", ""}},
+        .categories{"Map"},
+    });
+}
+
+}
diff --git a/src/Functions/array/arrayAUC.cpp b/src/Functions/array/arrayAUC.cpp
index 2890ae55886..4d2b8175f5b 100644
--- a/src/Functions/array/arrayAUC.cpp
+++ b/src/Functions/array/arrayAUC.cpp
@@ -1,5 +1,4 @@
 #include <algorithm>
-#include <vector>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include "arrayScalarProduct.h"
@@ -91,7 +90,7 @@ public:
         return std::make_shared<DataTypeNumber<ResultType>>();
     }
 
-    template <typename T, typename U>
+    template <typename ResultType, typename T, typename U>
     static ResultType apply(
         const T * scores,
         const U * labels,
diff --git a/src/Functions/array/arrayAggregation.cpp b/src/Functions/array/arrayAggregation.cpp
index 75ea3a81a7d..6a0010e4124 100644
--- a/src/Functions/array/arrayAggregation.cpp
+++ b/src/Functions/array/arrayAggregation.cpp
@@ -5,6 +5,9 @@
 #include <Columns/ColumnsNumber.h>
 
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDate32.h>
+#include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -38,7 +41,7 @@ enum class AggregateOperation
  * During array aggregation we derive result type from operation.
  * For array min or array max we use array element as result type.
  * For array average we use Float64.
- * For array sum for for big integers, we use same type representation, decimal numbers we use Decimal128,
+ * For array sum for big integers, we use same type representation, decimal numbers up to 128-bit will use Decimal128, then Decimal256.
  * for floating point numbers Float64, for numeric unsigned Int64, and for numeric signed UInt64.
  */
 
@@ -77,10 +80,14 @@ struct ArrayAggregateResultImpl<ArrayElement, AggregateOperation::sum>
         std::conditional_t<std::is_same_v<ArrayElement, UInt128>, UInt128,
         std::conditional_t<std::is_same_v<ArrayElement, Int256>, Int256,
         std::conditional_t<std::is_same_v<ArrayElement, UInt256>, UInt256,
-        std::conditional_t<is_decimal<ArrayElement>, Decimal128,
+        std::conditional_t<std::is_same_v<ArrayElement, Decimal32>, Decimal128,
+        std::conditional_t<std::is_same_v<ArrayElement, Decimal64>, Decimal128,
+        std::conditional_t<std::is_same_v<ArrayElement, Decimal128>, Decimal128,
+        std::conditional_t<std::is_same_v<ArrayElement, Decimal256>, Decimal256,
+        std::conditional_t<std::is_same_v<ArrayElement, DateTime64>, Decimal128,
         std::conditional_t<std::is_floating_point_v<ArrayElement>, Float64,
         std::conditional_t<std::is_signed_v<ArrayElement>, Int64,
-            UInt64>>>>>>>;
+            UInt64>>>>>>>>>>>;
 };
 
 template <typename ArrayElement, AggregateOperation operation>
@@ -89,9 +96,6 @@ using ArrayAggregateResult = typename ArrayAggregateResultImpl<ArrayElement, ope
 template<AggregateOperation aggregate_operation>
 struct ArrayAggregateImpl
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -105,26 +109,53 @@ struct ArrayAggregateImpl
             using Types = std::decay_t<decltype(types)>;
             using DataType = typename Types::LeftType;
 
-            if constexpr (aggregate_operation == AggregateOperation::average || aggregate_operation == AggregateOperation::product)
+            if constexpr (!IsDataTypeDateOrDateTime<DataType>)
             {
-                result = std::make_shared<DataTypeFloat64>();
+                if constexpr (aggregate_operation == AggregateOperation::average || aggregate_operation == AggregateOperation::product)
+                {
+                    result = std::make_shared<DataTypeFloat64>();
 
-                return true;
+                    return true;
+                }
+                else if constexpr (IsDataTypeNumber<DataType>)
+                {
+                    using NumberReturnType = ArrayAggregateResult<typename DataType::FieldType, aggregate_operation>;
+                    result = std::make_shared<DataTypeNumber<NumberReturnType>>();
+
+                    return true;
+                }
+                else if constexpr (IsDataTypeDecimal<DataType>)
+                {
+                    using DecimalReturnType = ArrayAggregateResult<typename DataType::FieldType, aggregate_operation>;
+                    UInt32 scale = getDecimalScale(*expression_return);
+                    result = std::make_shared<DataTypeDecimal<DecimalReturnType>>(DecimalUtils::max_precision<DecimalReturnType>, scale);
+
+                    return true;
+                }
             }
-            else if constexpr (IsDataTypeNumber<DataType>)
+            else if constexpr (aggregate_operation == AggregateOperation::max || aggregate_operation == AggregateOperation::min)
             {
-                using NumberReturnType = ArrayAggregateResult<typename DataType::FieldType, aggregate_operation>;
-                result = std::make_shared<DataTypeNumber<NumberReturnType>>();
+                if constexpr (IsDataTypeDate<DataType>)
+                {
+                    result = std::make_shared<DataType>();
 
-                return true;
-            }
-            else if constexpr (IsDataTypeDecimal<DataType> && !IsDataTypeDateOrDateTime<DataType>)
-            {
-                using DecimalReturnType = ArrayAggregateResult<typename DataType::FieldType, aggregate_operation>;
-                UInt32 scale = getDecimalScale(*expression_return);
-                result = std::make_shared<DataTypeDecimal<DecimalReturnType>>(DecimalUtils::max_precision<DecimalReturnType>, scale);
+                    return true;
+                }
+                else if constexpr (!IsDataTypeDecimal<DataType>)
+                {
+                    std::string timezone = getDateTimeTimezone(*expression_return);
+                    result = std::make_shared<DataTypeDateTime>(timezone);
 
-                return true;
+                    return true;
+                }
+                else
+                {
+                    std::string timezone = getDateTimeTimezone(*expression_return);
+                    UInt32 scale = getDecimalScale(*expression_return);
+                    result = std::make_shared<DataTypeDateTime64>(scale, timezone);
+
+                    return true;
+                }
             }
 
             return false;
@@ -220,7 +251,8 @@ struct ArrayAggregateImpl
 
                         auto result_scale = column_typed->getScale() * array_size;
                         if (unlikely(result_scale > DecimalUtils::max_precision<AggregationType>))
-                            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Scale {} is out of bounds", result_scale);
+                            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Scale {} is out of bounds (max scale: {})",
+                                            result_scale, DecimalUtils::max_precision<AggregationType>);
 
                         res[i] = DecimalUtils::convertTo<ResultType>(product, static_cast<UInt32>(result_scale));
                     }
@@ -329,7 +361,8 @@ struct ArrayAggregateImpl
                 auto result_scale = column->getScale() * count;
 
                 if (unlikely(result_scale > DecimalUtils::max_precision<AggregationType>))
-                    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Scale {} is out of bounds", result_scale);
+                    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Scale {} is out of bounds (max scale: {})",
+                                    result_scale, DecimalUtils::max_precision<AggregationType>);
 
                 res[i] = DecimalUtils::convertTo<ResultType>(aggregate_value, static_cast<UInt32>(result_scale));
             }
@@ -364,8 +397,12 @@ struct ArrayAggregateImpl
             executeType<Float64>(mapped, offsets, res) ||
             executeType<Decimal32>(mapped, offsets, res) ||
             executeType<Decimal64>(mapped, offsets, res) ||
-            executeType<Decimal128>(mapped, offsets, res))
+            executeType<Decimal128>(mapped, offsets, res) ||
+            executeType<Decimal256>(mapped, offsets, res) ||
+            executeType<DateTime64>(mapped, offsets, res))
+        {
             return res;
+        }
         else
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected column for arraySum: {}", mapped->getName());
     }
@@ -396,4 +433,3 @@ REGISTER_FUNCTION(ArrayAggregation)
 }
 
 }
-
diff --git a/src/Functions/array/arrayAll.cpp b/src/Functions/array/arrayAll.cpp
index 1d02342b704..b3b0413f3be 100644
--- a/src/Functions/array/arrayAll.cpp
+++ b/src/Functions/array/arrayAll.cpp
@@ -1,90 +1,67 @@
-#include <Columns/ColumnsNumber.h>
-#include <DataTypes/DataTypesNumber.h>
+#include <Functions/array/arrayAll.h>
 #include <Functions/FunctionFactory.h>
 
-#include "FunctionArrayMapped.h"
-
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
 }
 
-/** arrayAll(x1,...,xn -> expression, array1,...,arrayn) - is the expression true for all elements of the array.
-  * An overload of the form f(array) is available, which works in the same way as f(x -> x, array).
-  */
-struct ArrayAllImpl
+ColumnPtr ArrayAllImpl::execute(const ColumnArray & array, ColumnPtr mapped)
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
+    const ColumnUInt8 * column_filter = typeid_cast<const ColumnUInt8 *>(&*mapped);
 
-    static bool needBoolean() { return true; }
-    static bool needExpression() { return false; }
-    static bool needOneArray() { return false; }
-
-    static DataTypePtr getReturnType(const DataTypePtr & /*expression_return*/, const DataTypePtr & /*array_element*/)
+    if (!column_filter)
     {
-        return std::make_shared<DataTypeUInt8>();
+        const auto * column_filter_const = checkAndGetColumnConst<ColumnUInt8>(&*mapped);
+
+        if (!column_filter_const)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected type of filter column");
+
+        if (column_filter_const->getValue<UInt8>())
+            return DataTypeUInt8().createColumnConst(array.size(), 1u);
+        else
+        {
+            const IColumn::Offsets & offsets = array.getOffsets();
+            auto out_column = ColumnUInt8::create(offsets.size());
+            ColumnUInt8::Container & out_all = out_column->getData();
+
+            size_t pos = 0;
+            for (size_t i = 0; i < offsets.size(); ++i)
+            {
+                out_all[i] = offsets[i] == pos;
+                pos = offsets[i];
+            }
+
+            return out_column;
+        }
     }
 
-    static ColumnPtr execute(const ColumnArray & array, ColumnPtr mapped)
+    const IColumn::Filter & filter = column_filter->getData();
+    const IColumn::Offsets & offsets = array.getOffsets();
+    auto out_column = ColumnUInt8::create(offsets.size());
+    ColumnUInt8::Container & out_all = out_column->getData();
+
+    size_t pos = 0;
+    for (size_t i = 0; i < offsets.size(); ++i)
     {
-        const ColumnUInt8 * column_filter = typeid_cast<const ColumnUInt8 *>(&*mapped);
-
-        if (!column_filter)
+        UInt8 all = 1;
+        for (; pos < offsets[i]; ++pos)
         {
-            const auto * column_filter_const = checkAndGetColumnConst<ColumnUInt8>(&*mapped);
-
-            if (!column_filter_const)
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected type of filter column");
-
-            if (column_filter_const->getValue<UInt8>())
-                return DataTypeUInt8().createColumnConst(array.size(), 1u);
-            else
+            if (!filter[pos])
             {
-                const IColumn::Offsets & offsets = array.getOffsets();
-                auto out_column = ColumnUInt8::create(offsets.size());
-                ColumnUInt8::Container & out_all = out_column->getData();
-
-                size_t pos = 0;
-                for (size_t i = 0; i < offsets.size(); ++i)
-                {
-                    out_all[i] = offsets[i] == pos;
-                    pos = offsets[i];
-                }
-
-                return out_column;
+                all = 0;
+                pos = offsets[i];
+                break;
             }
         }
-
-        const IColumn::Filter & filter = column_filter->getData();
-        const IColumn::Offsets & offsets = array.getOffsets();
-        auto out_column = ColumnUInt8::create(offsets.size());
-        ColumnUInt8::Container & out_all = out_column->getData();
-
-        size_t pos = 0;
-        for (size_t i = 0; i < offsets.size(); ++i)
-        {
-            UInt8 all = 1;
-            for (; pos < offsets[i]; ++pos)
-            {
-                if (!filter[pos])
-                {
-                    all = 0;
-                    pos = offsets[i];
-                    break;
-                }
-            }
-            out_all[i] = all;
-        }
-
-        return out_column;
+        out_all[i] = all;
     }
-};
 
-struct NameArrayAll { static constexpr auto name = "arrayAll"; };
-using FunctionArrayAll = FunctionArrayMapped<ArrayAllImpl, NameArrayAll>;
+    return out_column;
+}
 
 REGISTER_FUNCTION(ArrayAll)
 {
@@ -92,5 +69,3 @@ REGISTER_FUNCTION(ArrayAll)
 }
 
 }
-
-
diff --git a/src/Functions/array/arrayAll.h b/src/Functions/array/arrayAll.h
new file mode 100644
index 00000000000..3d8d3357676
--- /dev/null
+++ b/src/Functions/array/arrayAll.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include "FunctionArrayMapped.h"
+
+namespace DB
+{
+
+/** arrayAll(x1,...,xn -> expression, array1,...,arrayn) - is the expression true for all elements of the array.
+  * An overload of the form f(array) is available, which works in the same way as f(x -> x, array).
+  */
+struct ArrayAllImpl
+{
+    static bool needBoolean() { return true; }
+    static bool needExpression() { return false; }
+    static bool needOneArray() { return false; }
+
+    static DataTypePtr getReturnType(const DataTypePtr & /*expression_return*/, const DataTypePtr & /*array_element*/)
+    {
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    static ColumnPtr execute(const ColumnArray & array, ColumnPtr mapped);
+};
+
+struct NameArrayAll { static constexpr auto name = "arrayAll"; };
+using FunctionArrayAll = FunctionArrayMapped<ArrayAllImpl, NameArrayAll>;
+
+}
diff --git a/src/Functions/array/arrayCompact.cpp b/src/Functions/array/arrayCompact.cpp
index 5c899d4d97e..7d09d1078d5 100644
--- a/src/Functions/array/arrayCompact.cpp
+++ b/src/Functions/array/arrayCompact.cpp
@@ -19,9 +19,6 @@ namespace ErrorCodes
 
 struct ArrayCompactImpl
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -151,7 +148,8 @@ struct ArrayCompactImpl
             executeType<Float64>(mapped, array, res)) ||
             executeType<Decimal32>(mapped, array, res) ||
             executeType<Decimal64>(mapped, array, res) ||
-            executeType<Decimal128>(mapped, array, res))
+            executeType<Decimal128>(mapped, array, res) ||
+            executeType<Decimal256>(mapped, array, res))
         {
             executeGeneric(mapped, array, res);
         }
@@ -168,4 +166,3 @@ REGISTER_FUNCTION(ArrayCompact)
 }
 
 }
-
diff --git a/src/Functions/array/arrayConcat.cpp b/src/Functions/array/arrayConcat.cpp
index c49565d7b23..cdb361b73b9 100644
--- a/src/Functions/array/arrayConcat.cpp
+++ b/src/Functions/array/arrayConcat.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunction.h>
+#include <Functions/array/arrayConcat.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/GatherUtils/GatherUtils.h>
 #include <DataTypes/DataTypeArray.h>
@@ -6,10 +6,8 @@
 #include <Interpreters/castColumn.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
-#include <Common/typeid_cast.h>
 #include <base/range.h>
 
-
 namespace DB
 {
 
@@ -20,84 +18,66 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
-
-/// arrayConcat(arr1, ...) - concatenate arrays.
-class FunctionArrayConcat : public IFunction
+DataTypePtr FunctionArrayConcat::getReturnTypeImpl(const DataTypes & arguments) const
 {
-public:
-    static constexpr auto name = "arrayConcat";
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayConcat>(); }
+    if (arguments.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least one argument.", getName());
 
-    String getName() const override { return name; }
-
-    bool isVariadic() const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    for (auto i : collections::range(0, arguments.size()))
     {
-        if (arguments.empty())
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least one argument.", getName());
-
-        for (auto i : collections::range(0, arguments.size()))
-        {
-            const auto * array_type = typeid_cast<const DataTypeArray *>(arguments[i].get());
-            if (!array_type)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                                "Argument {} for function {} must be an array but it has type {}.",
-                                i, getName(), arguments[i]->getName());
-        }
-
-        return getLeastSupertype(arguments);
+        const auto * array_type = typeid_cast<const DataTypeArray *>(arguments[i].get());
+        if (!array_type)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Argument {} for function {} must be an array but it has type {}.",
+                            i, getName(), arguments[i]->getName());
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    return getLeastSupertype(arguments);
+}
+
+ColumnPtr FunctionArrayConcat::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+{
+    if (result_type->onlyNull())
+        return result_type->createColumnConstWithDefaultValue(input_rows_count);
+
+    size_t rows = input_rows_count;
+    size_t num_args = arguments.size();
+
+    Columns preprocessed_columns(num_args);
+
+    for (size_t i = 0; i < num_args; ++i)
     {
-        if (result_type->onlyNull())
-            return result_type->createColumnConstWithDefaultValue(input_rows_count);
+        const ColumnWithTypeAndName & arg = arguments[i];
+        ColumnPtr preprocessed_column = arg.column;
 
-        size_t rows = input_rows_count;
-        size_t num_args = arguments.size();
+        if (!arg.type->equals(*result_type))
+            preprocessed_column = castColumn(arg, result_type);
 
-        Columns preprocessed_columns(num_args);
-
-        for (size_t i = 0; i < num_args; ++i)
-        {
-            const ColumnWithTypeAndName & arg = arguments[i];
-            ColumnPtr preprocessed_column = arg.column;
-
-            if (!arg.type->equals(*result_type))
-                preprocessed_column = castColumn(arg, result_type);
-
-            preprocessed_columns[i] = std::move(preprocessed_column);
-        }
-
-        std::vector<std::unique_ptr<GatherUtils::IArraySource>> sources;
-
-        for (auto & argument_column : preprocessed_columns)
-        {
-            bool is_const = false;
-
-            if (const auto * argument_column_const = typeid_cast<const ColumnConst *>(argument_column.get()))
-            {
-                is_const = true;
-                argument_column = argument_column_const->getDataColumnPtr();
-            }
-
-            if (const auto * argument_column_array = typeid_cast<const ColumnArray *>(argument_column.get()))
-                sources.emplace_back(GatherUtils::createArraySource(*argument_column_array, is_const, rows));
-            else
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Arguments for function {} must be arrays.", getName());
-        }
-
-        auto sink = GatherUtils::concat(sources);
-
-        return sink;
+        preprocessed_columns[i] = std::move(preprocessed_column);
     }
 
-    bool useDefaultImplementationForConstants() const override { return true; }
-};
+    std::vector<std::unique_ptr<GatherUtils::IArraySource>> sources;
 
+    for (auto & argument_column : preprocessed_columns)
+    {
+        bool is_const = false;
+
+        if (const auto * argument_column_const = typeid_cast<const ColumnConst *>(argument_column.get()))
+        {
+            is_const = true;
+            argument_column = argument_column_const->getDataColumnPtr();
+        }
+
+        if (const auto * argument_column_array = typeid_cast<const ColumnArray *>(argument_column.get()))
+            sources.emplace_back(GatherUtils::createArraySource(*argument_column_array, is_const, rows));
+        else
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Arguments for function {} must be arrays.", getName());
+    }
+
+    auto sink = GatherUtils::concat(sources);
+
+    return sink;
+}
 
 REGISTER_FUNCTION(ArrayConcat)
 {
diff --git a/src/Functions/array/arrayConcat.h b/src/Functions/array/arrayConcat.h
new file mode 100644
index 00000000000..130d58b35f9
--- /dev/null
+++ b/src/Functions/array/arrayConcat.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <Functions/IFunction.h>
+#include <Interpreters/Context_fwd.h>
+
+namespace DB
+{
+
+/// arrayConcat(arr1, ...) - concatenate arrays.
+class FunctionArrayConcat : public IFunction
+{
+public:
+    static constexpr auto name = "arrayConcat";
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayConcat>(); }
+
+    String getName() const override { return name; }
+
+    bool isVariadic() const override { return true; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+};
+
+}
diff --git a/src/Functions/array/arrayCount.cpp b/src/Functions/array/arrayCount.cpp
index 9aeefbab4fe..019f07e8e6a 100644
--- a/src/Functions/array/arrayCount.cpp
+++ b/src/Functions/array/arrayCount.cpp
@@ -17,9 +17,6 @@ namespace ErrorCodes
   */
 struct ArrayCountImpl
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
     static bool needBoolean() { return true; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
diff --git a/src/Functions/array/arrayCumSum.cpp b/src/Functions/array/arrayCumSum.cpp
index 489014ebe55..7ad7b90cf0a 100644
--- a/src/Functions/array/arrayCumSum.cpp
+++ b/src/Functions/array/arrayCumSum.cpp
@@ -18,9 +18,6 @@ namespace ErrorCodes
 
 struct ArrayCumSumImpl
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -29,19 +26,38 @@ struct ArrayCumSumImpl
     {
         WhichDataType which(expression_return);
 
-        if (which.isNativeUInt())
-            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
+        if (which.isUInt())
+        {
+            if (which.isNativeUInt())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
+            if (which.isUInt128())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt128>());
+            if (which.isUInt256())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt256>());
+            UNREACHABLE();
+        }
 
-        if (which.isNativeInt())
-            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt64>());
+        if (which.isInt())
+        {
+            if (which.isNativeInt())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt64>());
+            if (which.isInt128())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt128>());
+            if (which.isInt256())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt256>());
+            UNREACHABLE();
+        }
 
         if (which.isFloat())
             return std::make_shared<DataTypeArray>(std::make_shared<DataTypeFloat64>());
-
         if (which.isDecimal())
         {
             UInt32 scale = getDecimalScale(*expression_return);
-            DataTypePtr nested = std::make_shared<DataTypeDecimal<Decimal128>>(DecimalUtils::max_precision<Decimal128>, scale);
+            DataTypePtr nested;
+            if (which.isDecimal256())
+                nested = std::make_shared<DataTypeDecimal<Decimal256>>(DecimalUtils::max_precision<Decimal256>, scale);
+            else
+                nested = std::make_shared<DataTypeDecimal<Decimal128>>(DecimalUtils::max_precision<Decimal128>, scale);
             return std::make_shared<DataTypeArray>(nested);
         }
 
@@ -132,34 +148,31 @@ struct ArrayCumSumImpl
         implVector(offsets.size(), offsets.data(), res_values.data(), data.data());
         res_ptr = ColumnArray::create(std::move(res_nested), array.getOffsetsPtr());
         return true;
-
     }
 
     static ColumnPtr execute(const ColumnArray & array, ColumnPtr mapped)
     {
         ColumnPtr res;
 
-        if (executeType< UInt8 , UInt64>(mapped, array, res) ||
-            executeType< UInt16, UInt64>(mapped, array, res) ||
-            executeType< UInt32, UInt64>(mapped, array, res) ||
-            executeType< UInt64, UInt64>(mapped, array, res) ||
-            executeType<  Int8 ,  Int64>(mapped, array, res) ||
-            executeType<  Int16,  Int64>(mapped, array, res) ||
-            executeType<  Int32,  Int64>(mapped, array, res) ||
-            executeType<  Int64,  Int64>(mapped, array, res) ||
-            executeType<Float32,Float64>(mapped, array, res) ||
-            executeType<Float64,Float64>(mapped, array, res) ||
-            executeType<Decimal32, Decimal128>(mapped, array, res) ||
-            executeType<Decimal64, Decimal128>(mapped, array, res) ||
-            executeType<Decimal128, Decimal128>(mapped, array, res))
+        if (executeType<UInt8, UInt64>(mapped, array, res) || executeType<UInt16, UInt64>(mapped, array, res)
+            || executeType<UInt32, UInt64>(mapped, array, res) || executeType<UInt64, UInt64>(mapped, array, res)
+            || executeType<UInt128, UInt128>(mapped, array, res) || executeType<UInt256, UInt256>(mapped, array, res)
+            || executeType<Int8, Int64>(mapped, array, res) || executeType<Int16, Int64>(mapped, array, res)
+            || executeType<Int32, Int64>(mapped, array, res) || executeType<Int64, Int64>(mapped, array, res)
+            || executeType<Int128, Int128>(mapped, array, res) || executeType<Int256, Int256>(mapped, array, res)
+            || executeType<Float32, Float64>(mapped, array, res) || executeType<Float64, Float64>(mapped, array, res)
+            || executeType<Decimal32, Decimal128>(mapped, array, res) || executeType<Decimal64, Decimal128>(mapped, array, res)
+            || executeType<Decimal128, Decimal128>(mapped, array, res) || executeType<Decimal256, Decimal256>(mapped, array, res))
             return res;
         else
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected column for arrayCumSum: {}", mapped->getName());
     }
-
 };
 
-struct NameArrayCumSum { static constexpr auto name = "arrayCumSum"; };
+struct NameArrayCumSum
+{
+    static constexpr auto name = "arrayCumSum";
+};
 using FunctionArrayCumSum = FunctionArrayMapped<ArrayCumSumImpl, NameArrayCumSum>;
 
 REGISTER_FUNCTION(ArrayCumSum)
@@ -168,4 +181,3 @@ REGISTER_FUNCTION(ArrayCumSum)
 }
 
 }
-
diff --git a/src/Functions/array/arrayCumSumNonNegative.cpp b/src/Functions/array/arrayCumSumNonNegative.cpp
index c0062fd8230..cb21a853ea0 100644
--- a/src/Functions/array/arrayCumSumNonNegative.cpp
+++ b/src/Functions/array/arrayCumSumNonNegative.cpp
@@ -19,9 +19,6 @@ namespace ErrorCodes
   */
 struct ArrayCumSumNonNegativeImpl
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -30,11 +27,27 @@ struct ArrayCumSumNonNegativeImpl
     {
         WhichDataType which(expression_return);
 
-        if (which.isNativeUInt())
-            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
+        if (which.isUInt())
+        {
+            if (which.isNativeUInt())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
+            if (which.isUInt128())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt128>());
+            if (which.isUInt256())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt256>());
+            UNREACHABLE();
+        }
 
-        if (which.isNativeInt())
-            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt64>());
+        if (which.isInt())
+        {
+            if (which.isNativeInt())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt64>());
+            if (which.isInt128())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt128>());
+            if (which.isInt256())
+                return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt256>());
+            UNREACHABLE();
+        }
 
         if (which.isFloat())
             return std::make_shared<DataTypeArray>(std::make_shared<DataTypeFloat64>());
@@ -42,12 +55,15 @@ struct ArrayCumSumNonNegativeImpl
         if (which.isDecimal())
         {
             UInt32 scale = getDecimalScale(*expression_return);
-            DataTypePtr nested = std::make_shared<DataTypeDecimal<Decimal128>>(DecimalUtils::max_precision<Decimal128>, scale);
+            DataTypePtr nested;
+            if (which.isDecimal256())
+                nested = std::make_shared<DataTypeDecimal<Decimal256>>(DecimalUtils::max_precision<Decimal256>, scale);
+            else
+                nested = std::make_shared<DataTypeDecimal<Decimal128>>(DecimalUtils::max_precision<Decimal128>, scale);
             return std::make_shared<DataTypeArray>(nested);
         }
 
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                        "arrayCumSumNonNegativeImpl cannot add values of type {}", expression_return->getName());
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "arrayCumSumNonNegativeImpl cannot add values of type {}", expression_return->getName());
     }
 
 
@@ -96,7 +112,6 @@ struct ArrayCumSumNonNegativeImpl
         implVector(offsets.size(), offsets.data(), res_values.data(), data.data());
         res_ptr = ColumnArray::create(std::move(res_nested), array.getOffsetsPtr());
         return true;
-
     }
 
     static ColumnPtr execute(const ColumnArray & array, ColumnPtr mapped)
@@ -104,27 +119,25 @@ struct ArrayCumSumNonNegativeImpl
         ColumnPtr res;
 
         mapped = mapped->convertToFullColumnIfConst();
-        if (executeType< UInt8 , UInt64>(mapped, array, res) ||
-            executeType< UInt16, UInt64>(mapped, array, res) ||
-            executeType< UInt32, UInt64>(mapped, array, res) ||
-            executeType< UInt64, UInt64>(mapped, array, res) ||
-            executeType<  Int8 ,  Int64>(mapped, array, res) ||
-            executeType<  Int16,  Int64>(mapped, array, res) ||
-            executeType<  Int32,  Int64>(mapped, array, res) ||
-            executeType<  Int64,  Int64>(mapped, array, res) ||
-            executeType<Float32,Float64>(mapped, array, res) ||
-            executeType<Float64,Float64>(mapped, array, res) ||
-            executeType<Decimal32, Decimal128>(mapped, array, res) ||
-            executeType<Decimal64, Decimal128>(mapped, array, res) ||
-            executeType<Decimal128, Decimal128>(mapped, array, res))
+        if (executeType<UInt8, UInt64>(mapped, array, res) || executeType<UInt16, UInt64>(mapped, array, res)
+            || executeType<UInt32, UInt64>(mapped, array, res) || executeType<UInt64, UInt64>(mapped, array, res)
+            || executeType<UInt128, UInt128>(mapped, array, res) || executeType<UInt256, UInt256>(mapped, array, res)
+            || executeType<Int8, Int64>(mapped, array, res) || executeType<Int16, Int64>(mapped, array, res)
+            || executeType<Int32, Int64>(mapped, array, res) || executeType<Int64, Int64>(mapped, array, res)
+            || executeType<Int128, Int128>(mapped, array, res) || executeType<Int256, Int256>(mapped, array, res)
+            || executeType<Float32, Float64>(mapped, array, res) || executeType<Float64, Float64>(mapped, array, res)
+            || executeType<Decimal32, Decimal128>(mapped, array, res) || executeType<Decimal64, Decimal128>(mapped, array, res)
+            || executeType<Decimal128, Decimal128>(mapped, array, res) || executeType<Decimal256, Decimal256>(mapped, array, res))
             return res;
         else
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected column for arrayCumSumNonNegativeImpl: {}", mapped->getName());
     }
-
 };
 
-struct NameArrayCumSumNonNegative { static constexpr auto name = "arrayCumSumNonNegative"; };
+struct NameArrayCumSumNonNegative
+{
+    static constexpr auto name = "arrayCumSumNonNegative";
+};
 using FunctionArrayCumSumNonNegative = FunctionArrayMapped<ArrayCumSumNonNegativeImpl, NameArrayCumSumNonNegative>;
 
 REGISTER_FUNCTION(ArrayCumSumNonNegative)
@@ -133,4 +146,3 @@ REGISTER_FUNCTION(ArrayCumSumNonNegative)
 }
 
 }
-
diff --git a/src/Functions/array/arrayDifference.cpp b/src/Functions/array/arrayDifference.cpp
index ab7b94f98f1..857a88b82a2 100644
--- a/src/Functions/array/arrayDifference.cpp
+++ b/src/Functions/array/arrayDifference.cpp
@@ -21,9 +21,6 @@ namespace ErrorCodes
   */
 struct ArrayDifferenceImpl
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -35,19 +32,34 @@ struct ArrayDifferenceImpl
         if (which.isUInt8() || which.isInt8())
             return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt16>());
 
-        if (which.isUInt16() || which.isInt16())
+        if (which.isUInt16() || which.isInt16() || which.isDate())
             return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt32>());
 
-        if (which.isUInt32() || which.isUInt64() || which.isInt32() || which.isInt64())
+        if (which.isUInt32() || which.isUInt64() || which.isInt32() || which.isInt64() || which.isDate32() || which.isDateTime())
             return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt64>());
 
+        if (which.isUInt128() || which.isInt128())
+            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt128>());
+
+        if (which.isUInt256() || which.isInt256())
+            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeInt256>());
+
         if (which.isFloat32() || which.isFloat64())
             return std::make_shared<DataTypeArray>(std::make_shared<DataTypeFloat64>());
 
         if (which.isDecimal())
             return std::make_shared<DataTypeArray>(expression_return);
 
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "arrayDifference cannot process values of type {}", expression_return->getName());
+        if (which.isDateTime64())
+        {
+            UInt32 scale = getDecimalScale(*expression_return);
+            UInt32 precision = getDecimalPrecision(*expression_return);
+
+            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeDecimal<Decimal64>>(precision, scale));
+        }
+
+        throw Exception(
+            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "arrayDifference cannot process values of type {}", expression_return->getName());
     }
 
 
@@ -74,9 +86,7 @@ struct ArrayDifferenceImpl
 
                     ResultNativeType result_value;
                     bool overflow = common::subOverflow(
-                        static_cast<ResultNativeType>(curr.value),
-                        static_cast<ResultNativeType>(prev.value),
-                        result_value);
+                        static_cast<ResultNativeType>(curr.value), static_cast<ResultNativeType>(prev.value), result_value);
                     if (overflow)
                         throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Decimal math overflow");
 
@@ -133,26 +143,26 @@ struct ArrayDifferenceImpl
         ColumnPtr res;
 
         mapped = mapped->convertToFullColumnIfConst();
-        if (executeType< UInt8 ,  Int16>(mapped, array, res) ||
-            executeType< UInt16,  Int32>(mapped, array, res) ||
-            executeType< UInt32,  Int64>(mapped, array, res) ||
-            executeType< UInt64,  Int64>(mapped, array, res) ||
-            executeType<  Int8 ,  Int16>(mapped, array, res) ||
-            executeType<  Int16,  Int32>(mapped, array, res) ||
-            executeType<  Int32,  Int64>(mapped, array, res) ||
-            executeType<  Int64,  Int64>(mapped, array, res) ||
-            executeType<Float32,Float64>(mapped, array, res) ||
-            executeType<Float64,Float64>(mapped, array, res) ||
-            executeType<Decimal32, Decimal32>(mapped, array, res) ||
-            executeType<Decimal64, Decimal64>(mapped, array, res) ||
-            executeType<Decimal128, Decimal128>(mapped, array, res))
+        if (executeType<UInt8, Int16>(mapped, array, res) || executeType<UInt16, Int32>(mapped, array, res)
+            || executeType<UInt32, Int64>(mapped, array, res) || executeType<UInt64, Int64>(mapped, array, res)
+            || executeType<Int8, Int16>(mapped, array, res) || executeType<Int16, Int32>(mapped, array, res)
+            || executeType<Int32, Int64>(mapped, array, res) || executeType<Int64, Int64>(mapped, array, res)
+            || executeType<UInt128, Int128>(mapped, array, res) || executeType<Int128, Int128>(mapped, array, res)
+            || executeType<UInt256, Int256>(mapped, array, res) || executeType<Int256, Int256>(mapped, array, res)
+            || executeType<Float32, Float64>(mapped, array, res) || executeType<Float64, Float64>(mapped, array, res)
+            || executeType<Decimal32, Decimal32>(mapped, array, res) || executeType<Decimal64, Decimal64>(mapped, array, res)
+            || executeType<Decimal128, Decimal128>(mapped, array, res) || executeType<Decimal256, Decimal256>(mapped, array, res)
+            || executeType<DateTime64, Decimal64>(mapped, array, res))
             return res;
         else
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected column for arrayDifference: {}", mapped->getName());
     }
 };
 
-struct NameArrayDifference { static constexpr auto name = "arrayDifference"; };
+struct NameArrayDifference
+{
+    static constexpr auto name = "arrayDifference";
+};
 using FunctionArrayDifference = FunctionArrayMapped<ArrayDifferenceImpl, NameArrayDifference>;
 
 REGISTER_FUNCTION(ArrayDifference)
@@ -161,4 +171,3 @@ REGISTER_FUNCTION(ArrayDifference)
 }
 
 }
-
diff --git a/src/Functions/array/arrayDotProduct.cpp b/src/Functions/array/arrayDotProduct.cpp
new file mode 100644
index 00000000000..d17c223cc2f
--- /dev/null
+++ b/src/Functions/array/arrayDotProduct.cpp
@@ -0,0 +1,81 @@
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <DataTypes/getLeastSupertype.h>
+#include <Core/Types_fwd.h>
+#include <DataTypes/Serializations/ISerialization.h>
+#include <Functions/castTypeToEither.h>
+#include <Functions/array/arrayScalarProduct.h>
+#include <base/types.h>
+#include <Functions/FunctionBinaryArithmetic.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+struct NameArrayDotProduct
+{
+    static constexpr auto name = "arrayDotProduct";
+};
+
+class ArrayDotProductImpl
+{
+public:
+    static DataTypePtr getReturnType(const DataTypePtr & left, const DataTypePtr & right)
+    {
+        using Types = TypeList<DataTypeFloat32, DataTypeFloat64,
+                               DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64,
+                               DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64>;
+
+        DataTypePtr result_type;
+        bool valid = castTypeToEither(Types{}, left.get(), [&](const auto & left_)
+        {
+            return castTypeToEither(Types{}, right.get(), [&](const auto & right_)
+            {
+                using LeftDataType = typename std::decay_t<decltype(left_)>::FieldType;
+                using RightDataType = typename std::decay_t<decltype(right_)>::FieldType;
+                using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<LeftDataType, RightDataType>::Type;
+                if (std::is_same_v<LeftDataType, Float32> && std::is_same_v<RightDataType, Float32>)
+                    result_type = std::make_shared<DataTypeFloat32>();
+                else
+                    result_type = std::make_shared<DataTypeFromFieldType<ResultType>>();
+                return true;
+            });
+        });
+
+        if (!valid)
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Arguments of function {} "
+                "only support: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.",
+                std::string(NameArrayDotProduct::name));
+        return result_type;
+    }
+
+    template <typename ResultType, typename T, typename U>
+    static inline NO_SANITIZE_UNDEFINED ResultType apply(
+        const T * left,
+        const U * right,
+        size_t size)
+    {
+        ResultType result = 0;
+        for (size_t i = 0; i < size; ++i)
+            result += static_cast<ResultType>(left[i]) * static_cast<ResultType>(right[i]);
+        return result;
+    }
+};
+
+using FunctionArrayDotProduct = FunctionArrayScalarProduct<ArrayDotProductImpl, NameArrayDotProduct>;
+
+REGISTER_FUNCTION(ArrayDotProduct)
+{
+    factory.registerFunction<FunctionArrayDotProduct>();
+}
+
+// These functions are used by TupleOrArrayFunction in Function/vectorFunctions.cpp
+FunctionPtr createFunctionArrayDotProduct(ContextPtr context_) { return FunctionArrayDotProduct::create(context_); }
+}
diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index 299f25b8292..e972a6846da 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -1065,7 +1065,7 @@ DataTypePtr FunctionArrayElement::getReturnTypeImpl(const DataTypes & arguments)
             getName(), arguments[0]->getName());
     }
 
-    if (!isInteger(arguments[1]))
+    if (!isNativeInteger(arguments[1]))
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
             "Second argument for function '{}' must be integer, got '{}' instead",
@@ -1179,12 +1179,15 @@ ColumnPtr FunctionArrayElement::perform(const ColumnsWithTypeAndName & arguments
             || (res = executeArgument<Int16>(arguments, result_type, builder, input_rows_count))
             || (res = executeArgument<Int32>(arguments, result_type, builder, input_rows_count))
             || (res = executeArgument<Int64>(arguments, result_type, builder, input_rows_count))))
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Second argument for function {} must have UInt or Int type.", getName());
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Second argument for function {} must have UInt or Int type", getName());
     }
     else
     {
         Field index = (*arguments[1].column)[0];
 
+        if (index.getType() != Field::Types::UInt64 && index.getType() != Field::Types::Int64)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Second argument for function {} must have UInt or Int type", getName());
+
         if (builder)
             builder.initSink(input_rows_count);
 
diff --git a/src/Functions/array/arrayEnumerateExtended.h b/src/Functions/array/arrayEnumerateExtended.h
index 3f145c05b54..cf38afcfa5a 100644
--- a/src/Functions/array/arrayEnumerateExtended.h
+++ b/src/Functions/array/arrayEnumerateExtended.h
@@ -8,6 +8,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnString.h>
 #include <Interpreters/AggregationCommon.h>
+#include <Interpreters/Context_fwd.h>
 #include <Common/HashTable/ClearableHashMap.h>
 #include <Common/ColumnsHashing.h>
 
diff --git a/src/Functions/array/arrayEnumerateRanked.h b/src/Functions/array/arrayEnumerateRanked.h
index 8a348c07421..0733f1e2d43 100644
--- a/src/Functions/array/arrayEnumerateRanked.h
+++ b/src/Functions/array/arrayEnumerateRanked.h
@@ -9,6 +9,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/AggregationCommon.h>
+#include <Interpreters/Context_fwd.h>
 #include <Common/ColumnsHashing.h>
 #include <Common/HashTable/ClearableHashMap.h>
 
diff --git a/src/Functions/array/arrayExists.cpp b/src/Functions/array/arrayExists.cpp
index d80556b1475..d59425338a5 100644
--- a/src/Functions/array/arrayExists.cpp
+++ b/src/Functions/array/arrayExists.cpp
@@ -1,91 +1,67 @@
-#include <Columns/ColumnsNumber.h>
-#include <DataTypes/DataTypesNumber.h>
+#include <Functions/array/arrayExists.h>
 #include <Functions/FunctionFactory.h>
 
-#include "FunctionArrayMapped.h"
-
-
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
 }
 
-/** arrayExists(x1,...,xn -> expression, array1,...,arrayn) - is the expression true for at least one array element.
-  * An overload of the form f(array) is available, which works in the same way as f(x -> x, array).
-  */
-struct ArrayExistsImpl
+ColumnPtr ArrayExistsImpl::execute(const ColumnArray & array, ColumnPtr mapped)
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
+    const ColumnUInt8 * column_filter = typeid_cast<const ColumnUInt8 *>(&*mapped);
 
-    static bool needBoolean() { return true; }
-    static bool needExpression() { return false; }
-    static bool needOneArray() { return false; }
-
-    static DataTypePtr getReturnType(const DataTypePtr & /*expression_return*/, const DataTypePtr & /*array_element*/)
+    if (!column_filter)
     {
-        return std::make_shared<DataTypeUInt8>();
+        const auto * column_filter_const = checkAndGetColumnConst<ColumnUInt8>(&*mapped);
+
+        if (!column_filter_const)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected type of filter column");
+
+        if (column_filter_const->getValue<UInt8>())
+        {
+            const IColumn::Offsets & offsets = array.getOffsets();
+            auto out_column = ColumnUInt8::create(offsets.size());
+            ColumnUInt8::Container & out_exists = out_column->getData();
+
+            size_t pos = 0;
+            for (size_t i = 0; i < offsets.size(); ++i)
+            {
+                out_exists[i] = offsets[i] - pos > 0;
+                pos = offsets[i];
+            }
+
+            return out_column;
+        }
+        else
+            return DataTypeUInt8().createColumnConst(array.size(), 0u);
     }
 
-    static ColumnPtr execute(const ColumnArray & array, ColumnPtr mapped)
+    const IColumn::Filter & filter = column_filter->getData();
+    const IColumn::Offsets & offsets = array.getOffsets();
+    auto out_column = ColumnUInt8::create(offsets.size());
+    ColumnUInt8::Container & out_exists = out_column->getData();
+
+    size_t pos = 0;
+    for (size_t i = 0; i < offsets.size(); ++i)
     {
-        const ColumnUInt8 * column_filter = typeid_cast<const ColumnUInt8 *>(&*mapped);
-
-        if (!column_filter)
+        UInt8 exists = 0;
+        for (; pos < offsets[i]; ++pos)
         {
-            const auto * column_filter_const = checkAndGetColumnConst<ColumnUInt8>(&*mapped);
-
-            if (!column_filter_const)
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected type of filter column");
-
-            if (column_filter_const->getValue<UInt8>())
+            if (filter[pos])
             {
-                const IColumn::Offsets & offsets = array.getOffsets();
-                auto out_column = ColumnUInt8::create(offsets.size());
-                ColumnUInt8::Container & out_exists = out_column->getData();
-
-                size_t pos = 0;
-                for (size_t i = 0; i < offsets.size(); ++i)
-                {
-                    out_exists[i] = offsets[i] - pos > 0;
-                    pos = offsets[i];
-                }
-
-                return out_column;
+                exists = 1;
+                pos = offsets[i];
+                break;
             }
-            else
-                return DataTypeUInt8().createColumnConst(array.size(), 0u);
         }
-
-        const IColumn::Filter & filter = column_filter->getData();
-        const IColumn::Offsets & offsets = array.getOffsets();
-        auto out_column = ColumnUInt8::create(offsets.size());
-        ColumnUInt8::Container & out_exists = out_column->getData();
-
-        size_t pos = 0;
-        for (size_t i = 0; i < offsets.size(); ++i)
-        {
-            UInt8 exists = 0;
-            for (; pos < offsets[i]; ++pos)
-            {
-                if (filter[pos])
-                {
-                    exists = 1;
-                    pos = offsets[i];
-                    break;
-                }
-            }
-            out_exists[i] = exists;
-        }
-
-        return out_column;
+        out_exists[i] = exists;
     }
-};
 
-struct NameArrayExists { static constexpr auto name = "arrayExists"; };
-using FunctionArrayExists = FunctionArrayMapped<ArrayExistsImpl, NameArrayExists>;
+    return out_column;
+}
 
 REGISTER_FUNCTION(ArrayExists)
 {
@@ -93,5 +69,3 @@ REGISTER_FUNCTION(ArrayExists)
 }
 
 }
-
-
diff --git a/src/Functions/array/arrayExists.h b/src/Functions/array/arrayExists.h
new file mode 100644
index 00000000000..5b302ccb150
--- /dev/null
+++ b/src/Functions/array/arrayExists.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include "FunctionArrayMapped.h"
+
+
+namespace DB
+{
+
+/** arrayExists(x1,...,xn -> expression, array1,...,arrayn) - is the expression true for at least one array element.
+  * An overload of the form f(array) is available, which works in the same way as f(x -> x, array).
+  */
+struct ArrayExistsImpl
+{
+    static bool needBoolean() { return true; }
+    static bool needExpression() { return false; }
+    static bool needOneArray() { return false; }
+
+    static DataTypePtr getReturnType(const DataTypePtr & /*expression_return*/, const DataTypePtr & /*array_element*/)
+    {
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    static ColumnPtr execute(const ColumnArray & array, ColumnPtr mapped);
+};
+
+struct NameArrayExists { static constexpr auto name = "arrayExists"; };
+using FunctionArrayExists = FunctionArrayMapped<ArrayExistsImpl, NameArrayExists>;
+
+}
diff --git a/src/Functions/array/arrayFill.cpp b/src/Functions/array/arrayFill.cpp
index b395584b8e2..89b5dce2331 100644
--- a/src/Functions/array/arrayFill.cpp
+++ b/src/Functions/array/arrayFill.cpp
@@ -20,9 +20,6 @@ namespace ErrorCodes
 template <bool reverse>
 struct ArrayFillImpl
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
     static bool needBoolean() { return true; }
     static bool needExpression() { return true; }
     static bool needOneArray() { return false; }
diff --git a/src/Functions/array/arrayFilter.cpp b/src/Functions/array/arrayFilter.cpp
index 528fb7bc5c7..618abd93845 100644
--- a/src/Functions/array/arrayFilter.cpp
+++ b/src/Functions/array/arrayFilter.cpp
@@ -1,78 +1,54 @@
-#include <Columns/ColumnsNumber.h>
-#include <DataTypes/DataTypesNumber.h>
+#include <Functions/array/arrayFilter.h>
 #include <Functions/FunctionFactory.h>
 
-#include "FunctionArrayMapped.h"
-
-
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
 }
 
-/** arrayFilter(x -> predicate, array) - leave in the array only the elements for which the expression is true.
-  */
-struct ArrayFilterImpl
+ColumnPtr ArrayFilterImpl::execute(const ColumnArray & array, ColumnPtr mapped)
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
+    const ColumnUInt8 * column_filter = typeid_cast<const ColumnUInt8 *>(&*mapped);
 
-    static bool needBoolean() { return true; }
-    static bool needExpression() { return true; }
-    static bool needOneArray() { return false; }
-
-    static DataTypePtr getReturnType(const DataTypePtr & /*expression_return*/, const DataTypePtr & array_element)
+    if (!column_filter)
     {
-        return std::make_shared<DataTypeArray>(array_element);
+        const auto * column_filter_const = checkAndGetColumnConst<ColumnUInt8>(&*mapped);
+
+        if (!column_filter_const)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected type of filter column");
+
+        if (column_filter_const->getValue<UInt8>())
+            return array.clone();
+        else
+            return ColumnArray::create(
+                array.getDataPtr()->cloneEmpty(),
+                ColumnArray::ColumnOffsets::create(array.size(), 0));
     }
 
-    /// If there are several arrays, the first one is passed here.
-    static ColumnPtr execute(const ColumnArray & array, ColumnPtr mapped)
+    const IColumn::Filter & filter = column_filter->getData();
+    ColumnPtr filtered = array.getData().filter(filter, -1);
+
+    const IColumn::Offsets & in_offsets = array.getOffsets();
+    auto column_offsets = ColumnArray::ColumnOffsets::create(in_offsets.size());
+    IColumn::Offsets & out_offsets = column_offsets->getData();
+
+    size_t in_pos = 0;
+    size_t out_pos = 0;
+    for (size_t i = 0; i < in_offsets.size(); ++i)
     {
-        const ColumnUInt8 * column_filter = typeid_cast<const ColumnUInt8 *>(&*mapped);
-
-        if (!column_filter)
+        for (; in_pos < in_offsets[i]; ++in_pos)
         {
-            const auto * column_filter_const = checkAndGetColumnConst<ColumnUInt8>(&*mapped);
-
-            if (!column_filter_const)
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected type of filter column");
-
-            if (column_filter_const->getValue<UInt8>())
-                return array.clone();
-            else
-                return ColumnArray::create(
-                    array.getDataPtr()->cloneEmpty(),
-                    ColumnArray::ColumnOffsets::create(array.size(), 0));
+            if (filter[in_pos])
+                ++out_pos;
         }
-
-        const IColumn::Filter & filter = column_filter->getData();
-        ColumnPtr filtered = array.getData().filter(filter, -1);
-
-        const IColumn::Offsets & in_offsets = array.getOffsets();
-        auto column_offsets = ColumnArray::ColumnOffsets::create(in_offsets.size());
-        IColumn::Offsets & out_offsets = column_offsets->getData();
-
-        size_t in_pos = 0;
-        size_t out_pos = 0;
-        for (size_t i = 0; i < in_offsets.size(); ++i)
-        {
-            for (; in_pos < in_offsets[i]; ++in_pos)
-            {
-                if (filter[in_pos])
-                    ++out_pos;
-            }
-            out_offsets[i] = out_pos;
-        }
-
-        return ColumnArray::create(filtered, std::move(column_offsets));
+        out_offsets[i] = out_pos;
     }
-};
 
-struct NameArrayFilter { static constexpr auto name = "arrayFilter"; };
-using FunctionArrayFilter = FunctionArrayMapped<ArrayFilterImpl, NameArrayFilter>;
+    return ColumnArray::create(filtered, std::move(column_offsets));
+}
 
 REGISTER_FUNCTION(ArrayFilter)
 {
@@ -80,5 +56,3 @@ REGISTER_FUNCTION(ArrayFilter)
 }
 
 }
-
-
diff --git a/src/Functions/array/arrayFilter.h b/src/Functions/array/arrayFilter.h
new file mode 100644
index 00000000000..f3a5a29e1d1
--- /dev/null
+++ b/src/Functions/array/arrayFilter.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include "FunctionArrayMapped.h"
+
+
+namespace DB
+{
+
+/** arrayFilter(x -> predicate, array) - leave in the array only the elements for which the expression is true.
+  */
+struct ArrayFilterImpl
+{
+    static bool needBoolean() { return true; }
+    static bool needExpression() { return true; }
+    static bool needOneArray() { return false; }
+
+    static DataTypePtr getReturnType(const DataTypePtr & /*expression_return*/, const DataTypePtr & array_element)
+    {
+        return std::make_shared<DataTypeArray>(array_element);
+    }
+
+    /// If there are several arrays, the first one is passed here.
+    static ColumnPtr execute(const ColumnArray & array, ColumnPtr mapped);
+};
+
+struct NameArrayFilter { static constexpr auto name = "arrayFilter"; };
+using FunctionArrayFilter = FunctionArrayMapped<ArrayFilterImpl, NameArrayFilter>;
+
+}
diff --git a/src/Functions/array/arrayFirstLast.cpp b/src/Functions/array/arrayFirstLast.cpp
index 6a270081169..055c2a0f79a 100644
--- a/src/Functions/array/arrayFirstLast.cpp
+++ b/src/Functions/array/arrayFirstLast.cpp
@@ -28,9 +28,6 @@ enum class ArrayFirstLastElementNotExistsStrategy : uint8_t
 template <ArrayFirstLastStrategy strategy, ArrayFirstLastElementNotExistsStrategy element_not_exists_strategy>
 struct ArrayFirstLastImpl
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
     static bool needBoolean() { return false; }
     static bool needExpression() { return true; }
     static bool needOneArray() { return false; }
diff --git a/src/Functions/array/arrayFirstLastIndex.cpp b/src/Functions/array/arrayFirstLastIndex.cpp
index f985075b1d8..045558609a4 100644
--- a/src/Functions/array/arrayFirstLastIndex.cpp
+++ b/src/Functions/array/arrayFirstLastIndex.cpp
@@ -21,9 +21,6 @@ enum class ArrayFirstLastIndexStrategy
 template <ArrayFirstLastIndexStrategy strategy>
 struct ArrayFirstLastIndexImpl
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
     static bool needBoolean() { return false; }
     static bool needExpression() { return true; }
     static bool needOneArray() { return false; }
diff --git a/src/Functions/array/arrayIndex.h b/src/Functions/array/arrayIndex.h
index 7ecba12cf0d..3b19f0b486a 100644
--- a/src/Functions/array/arrayIndex.h
+++ b/src/Functions/array/arrayIndex.h
@@ -76,8 +76,8 @@ private:
     using ArrOffset = ColumnArray::Offset;
     using ArrOffsets = ColumnArray::Offsets;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wsign-compare"
 
     static constexpr bool compare(const Initial & left, const PaddedPODArray<Result> & right, size_t, size_t i) noexcept
     {
@@ -107,7 +107,7 @@ private:
         return 0 == left.compareAt(i, RightArgIsConstant ? 0 : j, right, 1);
     }
 
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
     static constexpr bool hasNull(const NullMap * const null_map, size_t i) noexcept { return (*null_map)[i]; }
 
diff --git a/src/Functions/array/arrayIntersect.cpp b/src/Functions/array/arrayIntersect.cpp
index 1a718595a3b..d1bbd169513 100644
--- a/src/Functions/array/arrayIntersect.cpp
+++ b/src/Functions/array/arrayIntersect.cpp
@@ -22,7 +22,6 @@
 #include <Common/assert_cast.h>
 #include <base/TypeLists.h>
 #include <Interpreters/castColumn.h>
-#include <base/range.h>
 
 
 namespace DB
@@ -107,7 +106,7 @@ private:
             : arrays(arrays_), data_type(data_type_), result(result_) {}
 
         template <class T>
-        void operator()(Id<T>);
+        void operator()(TypeList<T>);
     };
 
     struct DecimalExecutor
@@ -120,7 +119,7 @@ private:
             : arrays(arrays_), data_type(data_type_), result(result_) {}
 
         template <class T>
-        void operator()(Id<T>);
+        void operator()(TypeList<T>);
     };
 };
 
@@ -219,11 +218,12 @@ FunctionArrayIntersect::CastArgumentsResult FunctionArrayIntersect::castColumns(
     const auto & type_nested = type_array->getNestedType();
     auto type_not_nullable_nested = removeNullable(type_nested);
 
-    const bool is_numeric_or_string = isNativeNumber(type_not_nullable_nested)
-                                      || isDate(type_not_nullable_nested)
-                                      || isDateTime(type_not_nullable_nested)
-                                      || isDateTime64(type_not_nullable_nested)
-                                      || isStringOrFixedString(type_not_nullable_nested);
+    const bool is_numeric_or_string =
+        isNumber(type_not_nullable_nested)
+        || isDate(type_not_nullable_nested)
+        || isDateTime(type_not_nullable_nested)
+        || isDateTime64(type_not_nullable_nested)
+        || isStringOrFixedString(type_not_nullable_nested);
 
     DataTypePtr nullable_return_type;
 
@@ -303,7 +303,7 @@ FunctionArrayIntersect::UnpackedArrays FunctionArrayIntersect::prepareArrays(
 
     bool all_const = true;
 
-    for (auto i : collections::range(0, columns_number))
+    for (size_t i = 0; i < columns_number; ++i)
     {
         auto & arg = arrays.args[i];
         const auto * argument_column = columns[i].column.get();
@@ -313,7 +313,7 @@ FunctionArrayIntersect::UnpackedArrays FunctionArrayIntersect::prepareArrays(
         {
             arg.is_const = true;
             argument_column = argument_column_const->getDataColumnPtr().get();
-            initial_column = typeid_cast<const ColumnConst *>(initial_column)->getDataColumnPtr().get();
+            initial_column = typeid_cast<const ColumnConst &>(*initial_column).getDataColumnPtr().get();
         }
 
         if (const auto * argument_column_array = typeid_cast<const ColumnArray *>(argument_column))
@@ -324,22 +324,27 @@ FunctionArrayIntersect::UnpackedArrays FunctionArrayIntersect::prepareArrays(
             arg.offsets = &argument_column_array->getOffsets();
             arg.nested_column = &argument_column_array->getData();
 
-            initial_column = &typeid_cast<const ColumnArray *>(initial_column)->getData();
+            initial_column = &typeid_cast<const ColumnArray &>(*initial_column).getData();
 
             if (const auto * column_nullable = typeid_cast<const ColumnNullable *>(arg.nested_column))
             {
                 arg.null_map = &column_nullable->getNullMapData();
                 arg.nested_column = &column_nullable->getNestedColumn();
-                initial_column = &typeid_cast<const ColumnNullable *>(initial_column)->getNestedColumn();
+
+                if (initial_column->isNullable())
+                    initial_column = &typeid_cast<const ColumnNullable &>(*initial_column).getNestedColumn();
             }
 
-            /// In case column was casted need to create overflow mask for integer types.
+            /// In case the column was casted, we need to create an overflow mask for integer types.
             if (arg.nested_column != initial_column)
             {
-                const auto & nested_init_type = typeid_cast<const DataTypeArray *>(removeNullable(initial_columns[i].type).get())->getNestedType();
-                const auto & nested_cast_type = typeid_cast<const DataTypeArray *>(removeNullable(columns[i].type).get())->getNestedType();
+                const auto & nested_init_type = typeid_cast<const DataTypeArray &>(*removeNullable(initial_columns[i].type)).getNestedType();
+                const auto & nested_cast_type = typeid_cast<const DataTypeArray &>(*removeNullable(columns[i].type)).getNestedType();
 
-                if (isInteger(nested_init_type) || isDate(nested_init_type) || isDateTime(nested_init_type) || isDateTime64(nested_init_type))
+                if (isInteger(nested_init_type)
+                    || isDate(nested_init_type)
+                    || isDateTime(nested_init_type)
+                    || isDateTime64(nested_init_type))
                 {
                     /// Compare original and casted columns. It seem to be the easiest way.
                     auto overflow_mask = callFunctionNotEquals(
@@ -347,7 +352,7 @@ FunctionArrayIntersect::UnpackedArrays FunctionArrayIntersect::prepareArrays(
                             {initial_column->getPtr(), nested_cast_type, ""},
                             context);
 
-                    arg.overflow_mask = &typeid_cast<const ColumnUInt8 *>(overflow_mask.get())->getData();
+                    arg.overflow_mask = &typeid_cast<const ColumnUInt8 &>(*overflow_mask).getData();
                     arrays.column_holders.emplace_back(std::move(overflow_mask));
                 }
             }
@@ -362,7 +367,7 @@ FunctionArrayIntersect::UnpackedArrays FunctionArrayIntersect::prepareArrays(
     }
     else
     {
-        for (auto i : collections::range(0, columns_number))
+        for (size_t i = 0; i < columns_number; ++i)
         {
             if (arrays.args[i].is_const)
                 continue;
@@ -371,7 +376,7 @@ FunctionArrayIntersect::UnpackedArrays FunctionArrayIntersect::prepareArrays(
             if (arrays.base_rows == 0 && rows > 0)
                 arrays.base_rows = rows;
             else if (arrays.base_rows != rows)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Non-const array columns in function {}should have same rows", getName());
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Non-const array columns in function {} should have the same number of rows", getName());
         }
     }
 
@@ -397,7 +402,6 @@ ColumnPtr FunctionArrayIntersect::executeImpl(const ColumnsWithTypeAndName & arg
         data_types.push_back(arguments[i].type);
 
     auto return_type_with_nulls = getMostSubtype(data_types, true, true);
-
     auto casted_columns = castColumns(arguments, result_type, return_type_with_nulls);
 
     UnpackedArrays arrays = prepareArrays(casted_columns.casted, casted_columns.initial);
@@ -446,7 +450,7 @@ ColumnPtr FunctionArrayIntersect::executeImpl(const ColumnsWithTypeAndName & arg
 }
 
 template <class T>
-void FunctionArrayIntersect::NumberExecutor::operator()(Id<T>)
+void FunctionArrayIntersect::NumberExecutor::operator()(TypeList<T>)
 {
     using Container = ClearableHashMapWithStackMemory<T, size_t, DefaultHash<T>,
         INITIAL_SIZE_DEGREE>;
@@ -456,7 +460,7 @@ void FunctionArrayIntersect::NumberExecutor::operator()(Id<T>)
 }
 
 template <class T>
-void FunctionArrayIntersect::DecimalExecutor::operator()(Id<T>)
+void FunctionArrayIntersect::DecimalExecutor::operator()(TypeList<T>)
 {
     using Container = ClearableHashMapWithStackMemory<T, size_t, DefaultHash<T>,
         INITIAL_SIZE_DEGREE>;
@@ -501,13 +505,13 @@ ColumnPtr FunctionArrayIntersect::execute(const UnpackedArrays & arrays, Mutable
     Map map;
     std::vector<size_t> prev_off(args, 0);
     size_t result_offset = 0;
-    for (auto row : collections::range(0, rows))
+    for (size_t row = 0; row < rows; ++row)
     {
         map.clear();
 
         bool all_has_nullable = all_nullable;
 
-        for (auto arg_num : collections::range(0, args))
+        for (size_t arg_num = 0; arg_num < args; ++arg_num)
         {
             const auto & arg = arrays.args[arg_num];
             bool current_has_nullable = false;
diff --git a/src/Functions/array/arrayMap.cpp b/src/Functions/array/arrayMap.cpp
index 216d488a360..10a7ca45cfa 100644
--- a/src/Functions/array/arrayMap.cpp
+++ b/src/Functions/array/arrayMap.cpp
@@ -1,44 +1,12 @@
+#include <Functions/array/arrayMap.h>
 #include <Functions/FunctionFactory.h>
 
-#include "FunctionArrayMapped.h"
-
-
 namespace DB
 {
 
-/** arrayMap(x1, ..., xn -> expression, array1, ..., arrayn) - apply the expression to each element of the array (or set of parallel arrays).
-  */
-struct ArrayMapImpl
-{
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
-    /// true if the expression (for an overload of f(expression, arrays)) or an array (for f(array)) should be boolean.
-    static bool needBoolean() { return false; }
-    /// true if the f(array) overload is unavailable.
-    static bool needExpression() { return true; }
-    /// true if the array must be exactly one.
-    static bool needOneArray() { return false; }
-
-    static DataTypePtr getReturnType(const DataTypePtr & expression_return, const DataTypePtr & /*array_element*/)
-    {
-        return std::make_shared<DataTypeArray>(expression_return);
-    }
-
-    static ColumnPtr execute(const ColumnArray & array, ColumnPtr mapped)
-    {
-        return ColumnArray::create(mapped->convertToFullColumnIfConst(), array.getOffsetsPtr());
-    }
-};
-
-struct NameArrayMap { static constexpr auto name = "arrayMap"; };
-using FunctionArrayMap = FunctionArrayMapped<ArrayMapImpl, NameArrayMap>;
-
 REGISTER_FUNCTION(ArrayMap)
 {
     factory.registerFunction<FunctionArrayMap>();
 }
 
 }
-
-
diff --git a/src/Functions/array/arrayMap.h b/src/Functions/array/arrayMap.h
new file mode 100644
index 00000000000..106b62a9c9f
--- /dev/null
+++ b/src/Functions/array/arrayMap.h
@@ -0,0 +1,33 @@
+#pragma once
+#include "FunctionArrayMapped.h"
+
+
+namespace DB
+{
+
+/** arrayMap(x1, ..., xn -> expression, array1, ..., arrayn) - apply the expression to each element of the array (or set of parallel arrays).
+  */
+struct ArrayMapImpl
+{
+    /// true if the expression (for an overload of f(expression, arrays)) or an array (for f(array)) should be boolean.
+    static bool needBoolean() { return false; }
+    /// true if the f(array) overload is unavailable.
+    static bool needExpression() { return true; }
+    /// true if the array must be exactly one.
+    static bool needOneArray() { return false; }
+
+    static DataTypePtr getReturnType(const DataTypePtr & expression_return, const DataTypePtr & /*array_element*/)
+    {
+        return std::make_shared<DataTypeArray>(expression_return);
+    }
+
+    static ColumnPtr execute(const ColumnArray & array, ColumnPtr mapped)
+    {
+        return ColumnArray::create(mapped->convertToFullColumnIfConst(), array.getOffsetsPtr());
+    }
+};
+
+struct NameArrayMap { static constexpr auto name = "arrayMap"; };
+using FunctionArrayMap = FunctionArrayMapped<ArrayMapImpl, NameArrayMap>;
+
+}
diff --git a/src/Functions/array/arrayReverse.cpp b/src/Functions/array/arrayReverse.cpp
index 912adbadc7c..654a6c4cebf 100644
--- a/src/Functions/array/arrayReverse.cpp
+++ b/src/Functions/array/arrayReverse.cpp
@@ -91,6 +91,8 @@ ColumnPtr FunctionArrayReverse::executeImpl(const ColumnsWithTypeAndName & argum
         || executeFixedString(*src_inner_col, offsets, *res_inner_col)
         || executeGeneric(*src_inner_col, offsets, *res_inner_col);
 
+    chassert(bool(src_nullable_col) == bool(res_nullable_col));
+
     if (src_nullable_col)
         if (!executeNumber<UInt8>(src_nullable_col->getNullMapColumn(), offsets, res_nullable_col->getNullMapColumn()))
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of null map of the first argument of function {}",
diff --git a/src/Functions/array/arrayScalarProduct.h b/src/Functions/array/arrayScalarProduct.h
index 94ce1bc533c..374a2d8a194 100644
--- a/src/Functions/array/arrayScalarProduct.h
+++ b/src/Functions/array/arrayScalarProduct.h
@@ -6,6 +6,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/Context_fwd.h>
+#include <Core/TypeId.h>
 
 
 namespace DB
@@ -18,6 +19,7 @@ namespace ErrorCodes
     extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
 }
 
 
@@ -29,29 +31,28 @@ public:
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayScalarProduct>(); }
 
 private:
-    using ResultColumnType = ColumnVector<typename Method::ResultType>;
 
-    template <typename T>
+    template <typename ResultType, typename T>
     ColumnPtr executeNumber(const ColumnsWithTypeAndName & arguments) const
     {
         ColumnPtr res;
-        if (   (res = executeNumberNumber<T, UInt8>(arguments))
-            || (res = executeNumberNumber<T, UInt16>(arguments))
-            || (res = executeNumberNumber<T, UInt32>(arguments))
-            || (res = executeNumberNumber<T, UInt64>(arguments))
-            || (res = executeNumberNumber<T, Int8>(arguments))
-            || (res = executeNumberNumber<T, Int16>(arguments))
-            || (res = executeNumberNumber<T, Int32>(arguments))
-            || (res = executeNumberNumber<T, Int64>(arguments))
-            || (res = executeNumberNumber<T, Float32>(arguments))
-            || (res = executeNumberNumber<T, Float64>(arguments)))
+        if (   (res = executeNumberNumber<ResultType, T, UInt8>(arguments))
+            || (res = executeNumberNumber<ResultType, T, UInt16>(arguments))
+            || (res = executeNumberNumber<ResultType, T, UInt32>(arguments))
+            || (res = executeNumberNumber<ResultType, T, UInt64>(arguments))
+            || (res = executeNumberNumber<ResultType, T, Int8>(arguments))
+            || (res = executeNumberNumber<ResultType, T, Int16>(arguments))
+            || (res = executeNumberNumber<ResultType, T, Int32>(arguments))
+            || (res = executeNumberNumber<ResultType, T, Int64>(arguments))
+            || (res = executeNumberNumber<ResultType, T, Float32>(arguments))
+            || (res = executeNumberNumber<ResultType, T, Float64>(arguments)))
             return res;
 
        return nullptr;
     }
 
 
-    template <typename T, typename U>
+    template <typename ResultType, typename T, typename U>
     ColumnPtr executeNumberNumber(const ColumnsWithTypeAndName & arguments) const
     {
         ColumnPtr col1 = arguments[0].column->convertToFullColumnIfConst();
@@ -72,7 +73,7 @@ private:
         if (!col_nested1 || !col_nested2)
             return nullptr;
 
-        auto col_res = ResultColumnType::create();
+        auto col_res = ColumnVector<ResultType>::create();
 
         vector(
             col_nested1->getData(),
@@ -83,12 +84,12 @@ private:
         return col_res;
     }
 
-    template <typename T, typename U>
+    template <typename ResultType, typename T, typename U>
     static NO_INLINE void vector(
         const PaddedPODArray<T> & data1,
         const PaddedPODArray<U> & data2,
         const ColumnArray::Offsets & offsets,
-        PaddedPODArray<typename Method::ResultType> & result)
+        PaddedPODArray<ResultType> & result)
     {
         size_t size = offsets.size();
         result.resize(size);
@@ -97,7 +98,7 @@ private:
         for (size_t i = 0; i < size; ++i)
         {
             size_t array_size = offsets[i] - current_offset;
-            result[i] = Method::apply(&data1[current_offset], &data2[current_offset], array_size);
+            result[i] = Method::template apply<ResultType, T, U>(&data1[current_offset], &data2[current_offset], array_size);
             current_offset = offsets[i];
         }
     }
@@ -130,24 +131,51 @@ public:
         return Method::getReturnType(nested_types[0], nested_types[1]);
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /* input_rows_count */) const override
+    template <typename ResultType>
+    ColumnPtr executeWithResultType(const ColumnsWithTypeAndName & arguments) const
     {
         ColumnPtr res;
-        if (!((res = executeNumber<UInt8>(arguments))
-            || (res = executeNumber<UInt16>(arguments))
-            || (res = executeNumber<UInt32>(arguments))
-            || (res = executeNumber<UInt64>(arguments))
-            || (res = executeNumber<Int8>(arguments))
-            || (res = executeNumber<Int16>(arguments))
-            || (res = executeNumber<Int32>(arguments))
-            || (res = executeNumber<Int64>(arguments))
-            || (res = executeNumber<Float32>(arguments))
-            || (res = executeNumber<Float64>(arguments))))
+        if (!((res = executeNumber<ResultType, UInt8>(arguments))
+            || (res = executeNumber<ResultType, UInt16>(arguments))
+            || (res = executeNumber<ResultType, UInt32>(arguments))
+            || (res = executeNumber<ResultType, UInt64>(arguments))
+            || (res = executeNumber<ResultType, Int8>(arguments))
+            || (res = executeNumber<ResultType, Int16>(arguments))
+            || (res = executeNumber<ResultType, Int32>(arguments))
+            || (res = executeNumber<ResultType, Int64>(arguments))
+            || (res = executeNumber<ResultType, Float32>(arguments))
+            || (res = executeNumber<ResultType, Float64>(arguments))))
             throw Exception(ErrorCodes::ILLEGAL_COLUMN,
                 "Illegal column {} of first argument of function {}", arguments[0].column->getName(), getName());
 
         return res;
     }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /* input_rows_count */) const override
+    {
+        switch (result_type->getTypeId())
+        {
+        #define SUPPORTED_TYPE(type) \
+            case TypeIndex::type: \
+                return executeWithResultType<type>(arguments); \
+                break;
+
+            SUPPORTED_TYPE(UInt8)
+            SUPPORTED_TYPE(UInt16)
+            SUPPORTED_TYPE(UInt32)
+            SUPPORTED_TYPE(UInt64)
+            SUPPORTED_TYPE(Int8)
+            SUPPORTED_TYPE(Int16)
+            SUPPORTED_TYPE(Int32)
+            SUPPORTED_TYPE(Int64)
+            SUPPORTED_TYPE(Float32)
+            SUPPORTED_TYPE(Float64)
+        #undef SUPPORTED_TYPE
+
+            default:
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected result type {}", result_type->getName());
+        }
+    }
 };
 
 }
diff --git a/src/Functions/array/arrayShuffle.cpp b/src/Functions/array/arrayShuffle.cpp
index 9cf3ac8f3fe..7c20e195098 100644
--- a/src/Functions/array/arrayShuffle.cpp
+++ b/src/Functions/array/arrayShuffle.cpp
@@ -175,8 +175,8 @@ ColumnPtr FunctionArrayShuffleImpl<Traits>::executeGeneric(const ColumnArray & a
 REGISTER_FUNCTION(ArrayShuffle)
 {
     factory.registerFunction<FunctionArrayShuffleImpl<FunctionArrayShuffleTraits>>(
-        {
-            R"(
+        FunctionDocumentation{
+            .description=R"(
 Returns an array of the same size as the original array containing the elements in shuffled order.
 Elements are being reordered in such a way that each possible permutation of those elements has equal probability of appearance.
 
@@ -189,15 +189,16 @@ If no seed is provided a random one will be used:
 It is possible to override the seed to produce stable results:
 [example:explicit_seed]
 )",
-            Documentation::Examples{
-                {"random_seed", "SELECT arrayShuffle([1, 2, 3, 4])"},
-                {"explicit_seed", "SELECT arrayShuffle([1, 2, 3, 4], 41)"},
-                {"materialize", "SELECT arrayShuffle(materialize([1, 2, 3]), 42), arrayShuffle([1, 2, 3], 42) FROM numbers(10)"}},
-            Documentation::Categories{"Array"}},
+            .examples{
+                {"random_seed", "SELECT arrayShuffle([1, 2, 3, 4])", ""},
+                {"explicit_seed", "SELECT arrayShuffle([1, 2, 3, 4], 41)", ""},
+                {"materialize", "SELECT arrayShuffle(materialize([1, 2, 3]), 42), arrayShuffle([1, 2, 3], 42) FROM numbers(10)", ""}},
+            .categories{"Array"}},
         FunctionFactory::CaseInsensitive);
+
     factory.registerFunction<FunctionArrayShuffleImpl<FunctionArrayPartialShuffleTraits>>(
-        {
-            R"(
+        FunctionDocumentation{
+            .description=R"(
 Returns an array of the same size as the original array where elements in range [1..limit] are a random
 subset of the original array. Remaining (limit..n] shall contain the elements not in [1..limit] range in undefined order.
 Value of limit shall be in range [1..n]. Values outside of that range are equivalent to performing full arrayShuffle:
@@ -213,14 +214,14 @@ If no seed is provided a random one will be used:
 It is possible to override the seed to produce stable results:
 [example:explicit_seed]
 )",
-            Documentation::Examples{
-                {"no_limit1", "SELECT arrayPartialShuffle([1, 2, 3, 4], 0)"},
-                {"no_limit2", "SELECT arrayPartialShuffle([1, 2, 3, 4])"},
-                {"random_seed", "SELECT arrayPartialShuffle([1, 2, 3, 4], 2)"},
-                {"explicit_seed", "SELECT arrayPartialShuffle([1, 2, 3, 4], 2, 41)"},
+            .examples{
+                {"no_limit1", "SELECT arrayPartialShuffle([1, 2, 3, 4], 0)", ""},
+                {"no_limit2", "SELECT arrayPartialShuffle([1, 2, 3, 4])", ""},
+                {"random_seed", "SELECT arrayPartialShuffle([1, 2, 3, 4], 2)", ""},
+                {"explicit_seed", "SELECT arrayPartialShuffle([1, 2, 3, 4], 2, 41)", ""},
                 {"materialize",
-                 "SELECT arrayPartialShuffle(materialize([1, 2, 3, 4]), 2, 42), arrayPartialShuffle([1, 2, 3], 2, 42) FROM numbers(10)"}},
-            Documentation::Categories{"Array"}},
+                 "SELECT arrayPartialShuffle(materialize([1, 2, 3, 4]), 2, 42), arrayPartialShuffle([1, 2, 3], 2, 42) FROM numbers(10)", ""}},
+            .categories{"Array"}},
         FunctionFactory::CaseInsensitive);
 }
 
diff --git a/src/Functions/array/arraySort.cpp b/src/Functions/array/arraySort.cpp
index 0188324bc19..a853289e8cc 100644
--- a/src/Functions/array/arraySort.cpp
+++ b/src/Functions/array/arraySort.cpp
@@ -1,148 +1,93 @@
-#include "FunctionArrayMapped.h"
-
+#include <Functions/array/arraySort.h>
 #include <Functions/FunctionFactory.h>
-#include <base/sort.h>
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int LOGICAL_ERROR;
 }
 
-/** Sort arrays, by values of its elements, or by values of corresponding elements of calculated expression (known as "schwartzsort").
-  */
+namespace
+{
+
+template <bool positive>
+struct Less
+{
+    const IColumn & column;
+
+    explicit Less(const IColumn & column_) : column(column_) { }
+
+    bool operator()(size_t lhs, size_t rhs) const
+    {
+        if constexpr (positive)
+            return column.compareAt(lhs, rhs, column, 1) < 0;
+        else
+            return column.compareAt(lhs, rhs, column, -1) > 0;
+    }
+};
+
+}
+
 template <bool positive, bool is_partial>
-struct ArraySortImpl
+ColumnPtr ArraySortImpl<positive, is_partial>::execute(
+    const ColumnArray & array,
+    ColumnPtr mapped,
+    const ColumnWithTypeAndName * fixed_arguments)
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
-    static constexpr auto num_fixed_params = is_partial;
-
-    static bool needBoolean() { return false; }
-    static bool needExpression() { return false; }
-    static bool needOneArray() { return false; }
-
-    static DataTypePtr getReturnType(const DataTypePtr & /*expression_return*/, const DataTypePtr & array_element)
+    [[maybe_unused]] const auto limit = [&]() -> size_t
     {
-        return std::make_shared<DataTypeArray>(array_element);
-    }
-
-    struct Less
-    {
-        const IColumn & column;
-
-        explicit Less(const IColumn & column_) : column(column_) { }
-
-        bool operator()(size_t lhs, size_t rhs) const
+        if constexpr (is_partial)
         {
-            if (positive)
-                return column.compareAt(lhs, rhs, column, 1) < 0;
-            else
-                return column.compareAt(lhs, rhs, column, -1) > 0;
+            if (!fixed_arguments)
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Expected fixed arguments to get the limit for partial array sort"
+                );
+            return fixed_arguments[0].column.get()->getUInt(0);
         }
-    };
+        return 0;
+    }();
 
-    static void checkArguments(const String & name, const ColumnWithTypeAndName * fixed_arguments)
-        requires(num_fixed_params)
+    const ColumnArray::Offsets & offsets = array.getOffsets();
+
+    size_t size = offsets.size();
+    size_t nested_size = array.getData().size();
+    IColumn::Permutation permutation(nested_size);
+
+    for (size_t i = 0; i < nested_size; ++i)
+        permutation[i] = i;
+
+    ColumnArray::Offset current_offset = 0;
+    for (size_t i = 0; i < size; ++i)
     {
-        if (!fixed_arguments)
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Expected fixed arguments to get the limit for partial array sort"
-            );
-        WhichDataType which(fixed_arguments[0].type.get());
-        if (!which.isUInt() && !which.isInt())
-            throw Exception(
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type {} of limit argument of function {} (must be UInt or Int)",
-                fixed_arguments[0].type->getName(),
-                name);
-    }
-
-    static ColumnPtr execute(
-        const ColumnArray & array,
-        ColumnPtr mapped,
-        const ColumnWithTypeAndName * fixed_arguments [[maybe_unused]] = nullptr)
-    {
-        [[maybe_unused]] const auto limit = [&]() -> size_t
+        auto next_offset = offsets[i];
+        if constexpr (is_partial)
         {
-            if constexpr (is_partial)
+            if (limit)
             {
-                if (!fixed_arguments)
-                    throw Exception(
-                        ErrorCodes::LOGICAL_ERROR,
-                        "Expected fixed arguments to get the limit for partial array sort"
-                    );
-                return fixed_arguments[0].column.get()->getUInt(0);
-            }
-            return 0;
-        }();
-
-        const ColumnArray::Offsets & offsets = array.getOffsets();
-
-        size_t size = offsets.size();
-        size_t nested_size = array.getData().size();
-        IColumn::Permutation permutation(nested_size);
-
-        for (size_t i = 0; i < nested_size; ++i)
-            permutation[i] = i;
-
-        ColumnArray::Offset current_offset = 0;
-        for (size_t i = 0; i < size; ++i)
-        {
-            auto next_offset = offsets[i];
-            if constexpr (is_partial)
-            {
-                if (limit)
-                {
-                    const auto effective_limit = std::min<size_t>(limit, next_offset - current_offset);
-                    ::partial_sort(&permutation[current_offset], &permutation[current_offset + effective_limit], &permutation[next_offset], Less(*mapped));
-                }
-                else
-                    ::sort(&permutation[current_offset], &permutation[next_offset], Less(*mapped));
+                const auto effective_limit = std::min<size_t>(limit, next_offset - current_offset);
+                ::partial_sort(&permutation[current_offset], &permutation[current_offset + effective_limit], &permutation[next_offset], Less<positive>(*mapped));
             }
             else
-                ::sort(&permutation[current_offset], &permutation[next_offset], Less(*mapped));
-            current_offset = next_offset;
+                ::sort(&permutation[current_offset], &permutation[next_offset], Less<positive>(*mapped));
         }
-
-        return ColumnArray::create(array.getData().permute(permutation, 0), array.getOffsetsPtr());
+        else
+            ::sort(&permutation[current_offset], &permutation[next_offset], Less<positive>(*mapped));
+        current_offset = next_offset;
     }
-};
 
-struct NameArraySort
-{
-    static constexpr auto name = "arraySort";
-};
-struct NameArrayReverseSort
-{
-    static constexpr auto name = "arrayReverseSort";
-};
-struct NameArrayPartialSort
-{
-    static constexpr auto name = "arrayPartialSort";
-};
-struct NameArrayPartialReverseSort
-{
-    static constexpr auto name = "arrayPartialReverseSort";
-};
-
-using FunctionArraySort = FunctionArrayMapped<ArraySortImpl<true, false>, NameArraySort>;
-using FunctionArrayReverseSort = FunctionArrayMapped<ArraySortImpl<false, false>, NameArrayReverseSort>;
-using FunctionArrayPartialSort = FunctionArrayMapped<ArraySortImpl<true, true>, NameArrayPartialSort>;
-using FunctionArrayPartialReverseSort = FunctionArrayMapped<ArraySortImpl<false, true>, NameArrayPartialReverseSort>;
+    return ColumnArray::create(array.getData().permute(permutation, 0), array.getOffsetsPtr());
+}
 
 REGISTER_FUNCTION(ArraySort)
 {
     factory.registerFunction<FunctionArraySort>();
     factory.registerFunction<FunctionArrayReverseSort>();
 
-    factory.registerFunction<FunctionArrayPartialSort>({
-        R"(
+    factory.registerFunction<FunctionArrayPartialSort>(FunctionDocumentation{
+        .description=R"(
 Returns an array of the same size as the original array where elements in range `[1..limit]`
 are sorted in ascending order. Remaining elements `(limit..N]` shall contain elements in unspecified order.
 [example:simple_int]
@@ -161,15 +106,16 @@ that the arguments of `func` will correspond to.
 
 For more details see documentation of `arraySort`.
 )",
-        Documentation::Examples{
-            {"simple_int", "SELECT arrayPartialSort(2, [5, 9, 1, 3])"},
-            {"simple_string", "SELECT arrayPartialSort(2, ['expenses','lasso','embolism','gladly'])"},
-            {"retain_sorted", "SELECT arrayResize(arrayPartialSort(2, [5, 9, 1, 3]), 2)"},
-            {"lambda_simple", "SELECT arrayPartialSort((x) -> -x, 2, [5, 9, 1, 3])"},
-            {"lambda_complex", "SELECT arrayPartialSort((x, y) -> -y, 1, [0, 1, 2], [1, 2, 3]) as res"}},
-        Documentation::Categories{"Array"}});
-    factory.registerFunction<FunctionArrayPartialReverseSort>({
-        R"(
+        .examples{
+            {"simple_int", "SELECT arrayPartialSort(2, [5, 9, 1, 3])", ""},
+            {"simple_string", "SELECT arrayPartialSort(2, ['expenses','lasso','embolism','gladly'])", ""},
+            {"retain_sorted", "SELECT arrayResize(arrayPartialSort(2, [5, 9, 1, 3]), 2)", ""},
+            {"lambda_simple", "SELECT arrayPartialSort((x) -> -x, 2, [5, 9, 1, 3])", ""},
+            {"lambda_complex", "SELECT arrayPartialSort((x, y) -> -y, 1, [0, 1, 2], [1, 2, 3]) as res", ""}},
+        .categories{"Array"}});
+
+    factory.registerFunction<FunctionArrayPartialReverseSort>(FunctionDocumentation{
+        .description=R"(
 Returns an array of the same size as the original array where elements in range `[1..limit]`
 are sorted in descending order. Remaining elements `(limit..N]` shall contain elements in unspecified order.
 [example:simple_int]
@@ -188,13 +134,13 @@ that the arguments of `func` will correspond to.
 
 For more details see documentation of `arraySort`.
 )",
-        Documentation::Examples{
-            {"simple_int", "SELECT arrayPartialReverseSort(2, [5, 9, 1, 3])"},
-            {"simple_string", "SELECT arrayPartialReverseSort(2, ['expenses','lasso','embolism','gladly'])"},
-            {"retain_sorted", "SELECT arrayResize(arrayPartialReverseSort(2, [5, 9, 1, 3]), 2)"},
-            {"lambda_simple", "SELECT arrayPartialReverseSort((x) -> -x, 2, [5, 9, 1, 3])"},
-            {"lambda_complex", "SELECT arrayPartialReverseSort((x, y) -> -y, 1, [0, 1, 2], [1, 2, 3]) as res"}},
-        Documentation::Categories{"Array"}});
+        .examples{
+            {"simple_int", "SELECT arrayPartialReverseSort(2, [5, 9, 1, 3])", ""},
+            {"simple_string", "SELECT arrayPartialReverseSort(2, ['expenses','lasso','embolism','gladly'])", ""},
+            {"retain_sorted", "SELECT arrayResize(arrayPartialReverseSort(2, [5, 9, 1, 3]), 2)", ""},
+            {"lambda_simple", "SELECT arrayPartialReverseSort((x) -> -x, 2, [5, 9, 1, 3])", ""},
+            {"lambda_complex", "SELECT arrayPartialReverseSort((x, y) -> -y, 1, [0, 1, 2], [1, 2, 3]) as res", ""}},
+        .categories{"Array"}});
 }
 
 }
diff --git a/src/Functions/array/arraySort.h b/src/Functions/array/arraySort.h
new file mode 100644
index 00000000000..a1ab376957d
--- /dev/null
+++ b/src/Functions/array/arraySort.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include "FunctionArrayMapped.h"
+#include <base/sort.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int LOGICAL_ERROR;
+}
+
+
+/** Sort arrays, by values of its elements, or by values of corresponding elements of calculated expression (known as "schwartzsort").
+  */
+template <bool positive, bool is_partial>
+struct ArraySortImpl
+{
+    static constexpr auto num_fixed_params = is_partial;
+
+    static bool needBoolean() { return false; }
+    static bool needExpression() { return false; }
+    static bool needOneArray() { return false; }
+
+    static DataTypePtr getReturnType(const DataTypePtr & /*expression_return*/, const DataTypePtr & array_element)
+    {
+        return std::make_shared<DataTypeArray>(array_element);
+    }
+
+    static void checkArguments(
+        const String & name,
+        const ColumnWithTypeAndName * fixed_arguments)
+        requires(num_fixed_params)
+    {
+        if (!fixed_arguments)
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Expected fixed arguments to get the limit for partial array sort");
+
+        WhichDataType which(fixed_arguments[0].type.get());
+        if (!which.isUInt() && !which.isInt())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of limit argument of function {} (must be UInt or Int)",
+                fixed_arguments[0].type->getName(),
+                name);
+    }
+
+    static ColumnPtr execute(
+        const ColumnArray & array,
+        ColumnPtr mapped,
+        const ColumnWithTypeAndName * fixed_arguments [[maybe_unused]] = nullptr);
+};
+
+struct NameArraySort
+{
+    static constexpr auto name = "arraySort";
+};
+struct NameArrayReverseSort
+{
+    static constexpr auto name = "arrayReverseSort";
+};
+struct NameArrayPartialSort
+{
+    static constexpr auto name = "arrayPartialSort";
+};
+struct NameArrayPartialReverseSort
+{
+    static constexpr auto name = "arrayPartialReverseSort";
+};
+
+using FunctionArraySort = FunctionArrayMapped<ArraySortImpl<true, false>, NameArraySort>;
+using FunctionArrayReverseSort = FunctionArrayMapped<ArraySortImpl<false, false>, NameArrayReverseSort>;
+using FunctionArrayPartialSort = FunctionArrayMapped<ArraySortImpl<true, true>, NameArrayPartialSort>;
+using FunctionArrayPartialReverseSort = FunctionArrayMapped<ArraySortImpl<false, true>, NameArrayPartialReverseSort>;
+
+}
diff --git a/src/Functions/array/arraySplit.cpp b/src/Functions/array/arraySplit.cpp
index dd1cfc64c1b..e68d779f67e 100644
--- a/src/Functions/array/arraySplit.cpp
+++ b/src/Functions/array/arraySplit.cpp
@@ -15,9 +15,6 @@ namespace ErrorCodes
 template <bool reverse>
 struct ArraySplitImpl
 {
-    using column_type = ColumnArray;
-    using data_type = DataTypeArray;
-
     static bool needBoolean() { return true; }
     static bool needExpression() { return true; }
     static bool needOneArray() { return false; }
diff --git a/src/Functions/array/length.cpp b/src/Functions/array/length.cpp
index 65555a501e8..f09ad17892b 100644
--- a/src/Functions/array/length.cpp
+++ b/src/Functions/array/length.cpp
@@ -66,8 +66,8 @@ using FunctionLength = FunctionStringOrArrayToT<LengthImpl, NameLength, UInt64,
 REGISTER_FUNCTION(Length)
 {
     factory.registerFunction<FunctionLength>(
-        {
-            R"(
+        FunctionDocumentation{
+            .description=R"(
 Calculates the length of the string or array.
 
 For String or FixedString argument: calculates the number of bytes in string.
@@ -87,18 +87,18 @@ and it is not the same as the visible string width.
 It is ok to have ASCII NUL bytes in strings, and they will be counted as well.
 [example:nul]
 )",
-            Documentation::Examples{
-                {"string1", "SELECT length('Hello, world!')"},
-                {"arr1", "SELECT length(['Hello'], ['world'])"},
+            .examples{
+                {"string1", "SELECT length('Hello, world!')", ""},
+                {"arr1", "SELECT length(['Hello'], ['world'])", ""},
                 {"constexpr", "WITH 'hello' || toString(number) AS str\n"
                               "SELECT str, \n"
                               "       isConstant(length(str)) AS str_length_is_constant, \n"
                               "       isConstant(length(str::FixedString(6))) AS fixed_str_length_is_constant\n"
-                              "FROM numbers(3)"},
-                {"unicode", "SELECT 'ёлка' AS str1, length(str1), lengthUTF8(str1), normalizeUTF8NFKD(str1) AS str2, length(str2), lengthUTF8(str2)"},
-                {"nul", R"(SELECT 'abc\0\0\0' AS str, length(str))"},
+                              "FROM numbers(3)", ""},
+                {"unicode", "SELECT 'ёлка' AS str1, length(str1), lengthUTF8(str1), normalizeUTF8NFKD(str1) AS str2, length(str2), lengthUTF8(str2)", ""},
+                {"nul", R"(SELECT 'abc\0\0\0' AS str, length(str))", ""},
                 },
-            Documentation::Categories{"String", "Array"}
+            .categories{"String", "Array"}
         },
         FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index 2e13d35488f..613fd934c41 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -10,7 +10,6 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <base/arithmeticOverflow.h>
 #include "Columns/ColumnMap.h"
 #include "DataTypes/DataTypeMap.h"
 
@@ -294,6 +293,10 @@ private:
                 return execute2<KeyType, UInt256>(row_count, args, res_type);
             case TypeIndex::Float64:
                 return execute2<KeyType, Float64>(row_count, args, res_type);
+            case TypeIndex::Decimal128:
+                return execute2<KeyType, Decimal128>(row_count, args, res_type);
+            case TypeIndex::Decimal256:
+                return execute2<KeyType, Decimal256>(row_count, args, res_type);
             default:
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal column type {} for values in arguments of function {}",
                     res_value_type->getName(), getName());
diff --git a/src/Functions/ascii.cpp b/src/Functions/ascii.cpp
index 5632f0d15df..b43c3221391 100644
--- a/src/Functions/ascii.cpp
+++ b/src/Functions/ascii.cpp
@@ -82,14 +82,14 @@ using FunctionAscii = FunctionStringOrArrayToT<AsciiImpl, AsciiName, AsciiImpl::
 REGISTER_FUNCTION(Ascii)
 {
     factory.registerFunction<FunctionAscii>(
-        {
-        R"(
+        FunctionDocumentation{
+        .description=R"(
 Returns the ASCII code point of the first character of str.  The result type is Int32.
 
 If s is empty, the result is 0. If the first character is not an ASCII character or not part of the Latin-1 Supplement range of UTF-16, the result is undefined)
         )",
-        Documentation::Examples{{"ascii", "SELECT ascii('234')"}},
-        Documentation::Categories{"String"}
+        .examples{{"ascii", "SELECT ascii('234')", ""}},
+        .categories{"String"}
         }, FunctionFactory::CaseInsensitive);
 }
 
diff --git a/src/Functions/asin.cpp b/src/Functions/asin.cpp
index 264d2389974..3049b025d5e 100644
--- a/src/Functions/asin.cpp
+++ b/src/Functions/asin.cpp
@@ -14,9 +14,9 @@ using FunctionAsin = FunctionMathUnary<UnaryFunctionVectorized<AsinName, asin>>;
 
 REGISTER_FUNCTION(Asin)
 {
-    factory.registerFunction<FunctionAsin>(
+    factory.registerFunction<FunctionAsin>(FunctionDocumentation
         {
-            R"(
+            .description=R"(
 Calculates the arcsine of the argument.
 
 Takes arbitrary numeric type, which includes floating point and integer numbers, as well as big integers and decimals and returns Float64.
@@ -35,11 +35,11 @@ For arguments outside of this range, it returns nan:
 Every self-respectful data scientist knows how to apply arcsine to improve ads click-through rate with ClickHouse.
 For more details, see [https://en.wikipedia.org/wiki/Inverse_trigonometric_functions].
 )",
-            Documentation::Examples{
-                {"inverse", "SELECT asin(1.0) = pi() / 2, sin(asin(1)), asin(sin(1))"},
-                {"float32", "SELECT toTypeName(asin(1.0::Float32))"},
-                {"nan", "SELECT asin(1.1), asin(-2), asin(inf), asin(nan)"}},
-            Documentation::Categories{"Mathematical", "Trigonometric"}
+            .examples{
+                {"inverse", "SELECT asin(1.0) = pi() / 2, sin(asin(1)), asin(sin(1))", ""},
+                {"float32", "SELECT toTypeName(asin(1.0::Float32))", ""},
+                {"nan", "SELECT asin(1.1), asin(-2), asin(inf), asin(nan)", ""}},
+            .categories{"Mathematical", "Trigonometric"}
         },
         FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/bitAnd.cpp b/src/Functions/bitAnd.cpp
index 28f61ec66e1..8efc5181919 100644
--- a/src/Functions/bitAnd.cpp
+++ b/src/Functions/bitAnd.cpp
@@ -16,8 +16,8 @@ template <typename A, typename B>
 struct BitAndImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
-    static constexpr const bool allow_fixed_string = true;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr bool allow_fixed_string = true;
+    static constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/bitCount.cpp b/src/Functions/bitCount.cpp
index d425dd1dca2..566a11481be 100644
--- a/src/Functions/bitCount.cpp
+++ b/src/Functions/bitCount.cpp
@@ -6,21 +6,24 @@
 namespace DB
 {
 
-namespace
-{
-
 template <typename A>
 struct BitCountImpl
 {
-    using ResultType = UInt8;
-    static constexpr bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    using ResultType = std::conditional_t<(sizeof(A) * 8 >= 256), UInt16, UInt8>;
+    static constexpr bool allow_string_or_fixed_string = true;
 
     static inline ResultType apply(A a)
     {
         /// We count bits in the value representation in memory. For example, we support floats.
         /// We need to avoid sign-extension when converting signed numbers to larger type. So, uint8_t(-1) has 8 bits.
 
+        if constexpr (is_big_int_v<A>)
+        {
+            ResultType res = 0;
+            for (auto item : a.items)
+                res += __builtin_popcountll(item);
+            return res;
+        }
         if constexpr (std::is_same_v<A, UInt64> || std::is_same_v<A, Int64>)
             return __builtin_popcountll(a);
         if constexpr (std::is_same_v<A, UInt32> || std::is_same_v<A, Int32> || std::is_unsigned_v<A>)
@@ -41,8 +44,6 @@ struct BitCountImpl
 struct NameBitCount { static constexpr auto name = "bitCount"; };
 using FunctionBitCount = FunctionUnaryArithmetic<BitCountImpl, NameBitCount, false /* is injective */>;
 
-}
-
 /// The function has no ranges of monotonicity.
 template <> struct FunctionUnaryArithmeticMonotonicity<NameBitCount>
 {
diff --git a/src/Functions/bitHammingDistance.cpp b/src/Functions/bitHammingDistance.cpp
index 75928c2a8af..2eaa397dd04 100644
--- a/src/Functions/bitHammingDistance.cpp
+++ b/src/Functions/bitHammingDistance.cpp
@@ -8,8 +8,8 @@ template <typename A, typename B>
 struct BitHammingDistanceImpl
 {
     using ResultType = UInt8;
-    static const constexpr bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr bool allow_fixed_string = true;
+    static constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a, B b)
diff --git a/src/Functions/bitNot.cpp b/src/Functions/bitNot.cpp
index f8bfad64494..62ebdc7c52a 100644
--- a/src/Functions/bitNot.cpp
+++ b/src/Functions/bitNot.cpp
@@ -17,10 +17,9 @@ template <typename A>
 struct BitNotImpl
 {
     using ResultType = typename NumberTraits::ResultOfBitNot<A>::Type;
-    static const constexpr bool allow_fixed_string = true;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr bool allow_string_or_fixed_string = true;
 
-    static inline ResultType apply(A a)
+    static inline ResultType NO_SANITIZE_UNDEFINED apply(A a)
     {
         return ~static_cast<ResultType>(a);
     }
diff --git a/src/Functions/bitOr.cpp b/src/Functions/bitOr.cpp
index acdad33f38c..9e19fc55219 100644
--- a/src/Functions/bitOr.cpp
+++ b/src/Functions/bitOr.cpp
@@ -15,8 +15,8 @@ template <typename A, typename B>
 struct BitOrImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
-    static constexpr const bool allow_fixed_string = true;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr bool allow_fixed_string = true;
+    static constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/bitShiftRight.cpp b/src/Functions/bitShiftRight.cpp
index 108847f13ed..21a0f7584aa 100644
--- a/src/Functions/bitShiftRight.cpp
+++ b/src/Functions/bitShiftRight.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 namespace DB
 {
diff --git a/src/Functions/bitSlice.cpp b/src/Functions/bitSlice.cpp
index 9b0ee4d5f1e..e2b455846d8 100644
--- a/src/Functions/bitSlice.cpp
+++ b/src/Functions/bitSlice.cpp
@@ -291,7 +291,7 @@ public:
             ssize_t remain_byte = src.getElementSize() - offset_byte;
             if (length < 0)
             {
-                length_byte = std::max(remain_byte + (length / word_size), static_cast<ssize_t>(0));
+                length_byte = std::max(remain_byte + (length / word_size), 0z);
                 over_bit = word_size + (length % word_size);
                 if (length_byte == 1 && over_bit <= offset_bit) // begin and end are in same byte AND there are no gaps
                     length_byte = 0;
@@ -330,7 +330,7 @@ public:
             size_t size = src.getElementSize();
             if (length < 0)
             {
-                length_byte = std::max(static_cast<ssize_t>(offset_byte) + (length / word_size), static_cast<ssize_t>(0));
+                length_byte = std::max(static_cast<ssize_t>(offset_byte) + (length / word_size), 0z);
                 over_bit = word_size + (length % word_size);
                 if (length_byte == 1 && over_bit <= offset_bit) // begin and end are in same byte AND there are no gaps
                     length_byte = 0;
@@ -395,7 +395,7 @@ public:
                 }
                 else
                 {
-                    length_byte = std::max(remain_byte + (static_cast<ssize_t>(length) / word_size), static_cast<ssize_t>(0));
+                    length_byte = std::max(remain_byte + (static_cast<ssize_t>(length) / word_size), 0z);
                     over_bit = word_size + (length % word_size);
                     if (length_byte == 1 && over_bit <= offset_bit) // begin and end are in same byte AND there are no gaps
                         length_byte = 0;
diff --git a/src/Functions/bitSwapLastTwo.cpp b/src/Functions/bitSwapLastTwo.cpp
index 4ca57f9b103..d8957598c62 100644
--- a/src/Functions/bitSwapLastTwo.cpp
+++ b/src/Functions/bitSwapLastTwo.cpp
@@ -19,8 +19,7 @@ template <typename A>
 struct BitSwapLastTwoImpl
 {
     using ResultType = UInt8;
-    static constexpr const bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr const bool allow_string_or_fixed_string = false;
 
     static inline ResultType NO_SANITIZE_UNDEFINED apply([[maybe_unused]] A a)
     {
diff --git a/src/Functions/bitWrapperFunc.cpp b/src/Functions/bitWrapperFunc.cpp
index f0851176513..99c06172c30 100644
--- a/src/Functions/bitWrapperFunc.cpp
+++ b/src/Functions/bitWrapperFunc.cpp
@@ -19,8 +19,7 @@ template <typename A>
 struct BitWrapperFuncImpl
 {
     using ResultType = UInt8;
-    static constexpr const bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr const bool allow_string_or_fixed_string = false;
 
     static inline ResultType NO_SANITIZE_UNDEFINED apply(A a [[maybe_unused]])
     {
diff --git a/src/Functions/canonicalRand.cpp b/src/Functions/canonicalRand.cpp
index 0f168142177..8eb064f4a32 100644
--- a/src/Functions/canonicalRand.cpp
+++ b/src/Functions/canonicalRand.cpp
@@ -47,13 +47,13 @@ public:
 
 REGISTER_FUNCTION(CanonicalRand)
 {
-    factory.registerFunction<FunctionCanonicalRand>({
-        R"(
+    factory.registerFunction<FunctionCanonicalRand>(FunctionDocumentation{
+        .description=R"(
 The function generates pseudo random results with independent and identically distributed uniformly distributed values in [0, 1).
 Non-deterministic. Return type is Float64.
         )",
-        Documentation::Examples{{"randCanonical", "SELECT randCanonical()"}},
-        Documentation::Categories{"Mathematical"}});
+        .examples{{"randCanonical", "SELECT randCanonical()", ""}},
+        .categories{"Mathematical"}});
 }
 
 }
diff --git a/src/Functions/caseWithExpression.cpp b/src/Functions/caseWithExpression.cpp
index c8b8dbd76cf..9547cd200b2 100644
--- a/src/Functions/caseWithExpression.cpp
+++ b/src/Functions/caseWithExpression.cpp
@@ -24,6 +24,9 @@ public:
 
     explicit FunctionCaseWithExpression(ContextPtr context_) : context(context_) {}
     bool isVariadic() const override { return true; }
+    bool useDefaultImplementationForConstants() const override { return false; }
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForNothing() const override { return false; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
     String getName() const override { return name; }
diff --git a/src/Functions/castOrDefault.cpp b/src/Functions/castOrDefault.cpp
index f71675dcbad..3ae4674b168 100644
--- a/src/Functions/castOrDefault.cpp
+++ b/src/Functions/castOrDefault.cpp
@@ -245,7 +245,8 @@ private:
         {
             if (additional_argument_index < arguments.size())
             {
-                time_zone = extractTimeZoneNameFromColumn(*arguments[additional_argument_index].column);
+                time_zone = extractTimeZoneNameFromColumn(arguments[additional_argument_index].column.get(),
+                                                          arguments[additional_argument_index].name);
                 ++additional_argument_index;
             }
         }
diff --git a/src/Functions/concat.cpp b/src/Functions/concat.cpp
index 1bdd155aaa1..8fefc2d5b8a 100644
--- a/src/Functions/concat.cpp
+++ b/src/Functions/concat.cpp
@@ -205,6 +205,10 @@ public:
         {
             return FunctionFactory::instance().getImpl("arrayConcat", context)->build(arguments);
         }
+        else if (isMap(arguments.at(0).type))
+        {
+            return FunctionFactory::instance().getImpl("mapConcat", context)->build(arguments);
+        }
         else
             return std::make_unique<FunctionToFunctionBaseAdaptor>(
                 FunctionConcat::create(context), collections::map<DataTypes>(arguments, [](const auto & elem) { return elem.type; }), return_type);
diff --git a/src/Functions/concatWithSeparator.cpp b/src/Functions/concatWithSeparator.cpp
index 90f635ca97e..bfd1bc392db 100644
--- a/src/Functions/concatWithSeparator.cpp
+++ b/src/Functions/concatWithSeparator.cpp
@@ -155,21 +155,21 @@ using FunctionConcatWithSeparatorAssumeInjective = ConcatWithSeparatorImpl<NameC
 
 REGISTER_FUNCTION(ConcatWithSeparator)
 {
-    factory.registerFunction<FunctionConcatWithSeparator>({
-        R"(
+    factory.registerFunction<FunctionConcatWithSeparator>(FunctionDocumentation{
+        .description=R"(
 Returns the concatenation strings separated by string separator. Syntax: concatWithSeparator(sep, expr1, expr2, expr3...)
         )",
-        Documentation::Examples{{"concatWithSeparator", "SELECT concatWithSeparator('a', '1', '2', '3')"}},
-        Documentation::Categories{"String"}});
+        .examples{{"concatWithSeparator", "SELECT concatWithSeparator('a', '1', '2', '3')", ""}},
+        .categories{"String"}});
 
-    factory.registerFunction<FunctionConcatWithSeparatorAssumeInjective>({
-        R"(
+    factory.registerFunction<FunctionConcatWithSeparatorAssumeInjective>(FunctionDocumentation{
+        .description=R"(
 Same as concatWithSeparator, the difference is that you need to ensure that concatWithSeparator(sep, expr1, expr2, expr3...) → result is injective, it will be used for optimization of GROUP BY.
 
 The function is named “injective” if it always returns different result for different values of arguments. In other words: different arguments never yield identical result.
         )",
-        Documentation::Examples{{"concatWithSeparatorAssumeInjective", "SELECT concatWithSeparatorAssumeInjective('a', '1', '2', '3')"}},
-        Documentation::Categories{"String"}});
+        .examples{{"concatWithSeparatorAssumeInjective", "SELECT concatWithSeparatorAssumeInjective('a', '1', '2', '3')", ""}},
+        .categories{"String"}});
 
     /// Compatibility with Spark:
     factory.registerAlias("concat_ws", "concatWithSeparator", FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index 457b77b9843..8361e9db166 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -448,20 +448,25 @@ private:
 REGISTER_FUNCTION(DateDiff)
 {
     factory.registerFunction<FunctionDateDiff<true>>({}, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("date_diff", FunctionDateDiff<true>::name);
+    factory.registerAlias("DATE_DIFF", FunctionDateDiff<true>::name);
+    factory.registerAlias("timestampDiff", FunctionDateDiff<true>::name);
+    factory.registerAlias("timestamp_diff", FunctionDateDiff<true>::name);
+    factory.registerAlias("TIMESTAMP_DIFF", FunctionDateDiff<true>::name);
 }
 
 REGISTER_FUNCTION(TimeDiff)
 {
-    factory.registerFunction<FunctionTimeDiff>({R"(
+    factory.registerFunction<FunctionTimeDiff>(FunctionDocumentation{.description=R"(
 Returns the difference between two dates or dates with time values. The difference is calculated in seconds units (see toRelativeSecondNum).
 It is same as `dateDiff` and was added only for MySQL support. `dateDiff` is preferred.
 
 Example:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT timeDiff(UTCTimestamp(), now());"}},
-    Documentation::Categories{"Dates and Times"}}, FunctionFactory::CaseInsensitive);
+    .examples{
+        {"typical", "SELECT timeDiff(UTCTimestamp(), now());", ""}},
+    .categories{"Dates and Times"}}, FunctionFactory::CaseInsensitive);
 }
 
 REGISTER_FUNCTION(Age)
diff --git a/src/Functions/date_trunc.cpp b/src/Functions/date_trunc.cpp
index 016b8f4da5e..87fff0b7f3c 100644
--- a/src/Functions/date_trunc.cpp
+++ b/src/Functions/date_trunc.cpp
@@ -1,6 +1,6 @@
 #include <Columns/ColumnConst.h>
-#include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeInterval.h>
@@ -25,7 +25,7 @@ class FunctionDateTrunc : public IFunction
 public:
     static constexpr auto name = "dateTrunc";
 
-    explicit FunctionDateTrunc(ContextPtr context_) : context(context_) {}
+    explicit FunctionDateTrunc(ContextPtr context_) : context(context_) { }
 
     static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionDateTrunc>(context); }
 
@@ -39,51 +39,58 @@ public:
     {
         /// The first argument is a constant string with the name of datepart.
 
-        auto result_type_is_date = false;
+        intermediate_type_is_date = false;
         String datepart_param;
-        auto check_first_argument = [&] {
+        auto check_first_argument = [&]
+        {
             const ColumnConst * datepart_column = checkAndGetColumnConst<ColumnString>(arguments[0].column.get());
             if (!datepart_column)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be constant string: "
-                    "name of datepart", getName());
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "First argument for function {} must be constant string: "
+                    "name of datepart",
+                    getName());
 
             datepart_param = datepart_column->getValue<String>();
             if (datepart_param.empty())
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "First argument (name of datepart) for function {} cannot be empty",
-                    getName());
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS, "First argument (name of datepart) for function {} cannot be empty", getName());
 
             if (!IntervalKind::tryParseString(datepart_param, datepart_kind))
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "{} doesn't look like datepart name in {}", datepart_param, getName());
 
-            result_type_is_date = (datepart_kind == IntervalKind::Year)
-                || (datepart_kind == IntervalKind::Quarter) || (datepart_kind == IntervalKind::Month)
-                || (datepart_kind == IntervalKind::Week);
+            intermediate_type_is_date = (datepart_kind == IntervalKind::Year) || (datepart_kind == IntervalKind::Quarter)
+                || (datepart_kind == IntervalKind::Month) || (datepart_kind == IntervalKind::Week);
         };
 
         bool second_argument_is_date = false;
-        auto check_second_argument = [&] {
+        auto check_second_argument = [&]
+        {
             if (!isDate(arguments[1].type) && !isDateTime(arguments[1].type) && !isDateTime64(arguments[1].type))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of 2nd argument of function {}. "
-                    "Should be a date or a date with time", arguments[1].type->getName(), getName());
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Illegal type {} of 2nd argument of function {}. "
+                    "Should be a date or a date with time",
+                    arguments[1].type->getName(),
+                    getName());
 
             second_argument_is_date = isDate(arguments[1].type);
 
-            if (second_argument_is_date && ((datepart_kind == IntervalKind::Hour)
-                || (datepart_kind == IntervalKind::Minute) || (datepart_kind == IntervalKind::Second)))
+            if (second_argument_is_date
+                && ((datepart_kind == IntervalKind::Hour) || (datepart_kind == IntervalKind::Minute)
+                    || (datepart_kind == IntervalKind::Second)))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type Date of argument for function {}", getName());
         };
 
-        auto check_timezone_argument = [&] {
+        auto check_timezone_argument = [&]
+        {
             if (!WhichDataType(arguments[2].type).isString())
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}. "
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Illegal type {} of argument of function {}. "
                     "This argument is optional and must be a constant string with timezone name",
-                    arguments[2].type->getName(), getName());
-
-            if (second_argument_is_date && result_type_is_date)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                                "The timezone argument of function {} with datepart '{}' "
-                                "is allowed only when the 2nd argument has the type DateTime",
-                                getName(), datepart_param);
+                    arguments[2].type->getName(),
+                    getName());
         };
 
         if (arguments.size() == 2)
@@ -99,15 +106,14 @@ public:
         }
         else
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
                 "Number of arguments for function {} doesn't match: passed {}, should be 2 or 3",
-                getName(), arguments.size());
+                getName(),
+                arguments.size());
         }
 
-        if (result_type_is_date)
-            return std::make_shared<DataTypeDate>();
-        else
-            return std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 2, 1));
+        return std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 2, 1));
     }
 
     bool useDefaultImplementationForConstants() const override { return true; }
@@ -124,26 +130,40 @@ public:
 
         auto to_start_of_interval = FunctionFactory::instance().get("toStartOfInterval", context);
 
+        ColumnPtr truncated_column;
+        auto date_type = std::make_shared<DataTypeDate>();
+
         if (arguments.size() == 2)
-            return to_start_of_interval->build(temp_columns)->execute(temp_columns, result_type, input_rows_count);
+            truncated_column = to_start_of_interval->build(temp_columns)
+                                    ->execute(temp_columns, intermediate_type_is_date ? date_type : result_type, input_rows_count);
+        else
+        {
+            temp_columns[2] = arguments[2];
+            truncated_column = to_start_of_interval->build(temp_columns)
+                                    ->execute(temp_columns, intermediate_type_is_date ? date_type : result_type, input_rows_count);
+        }
 
-        temp_columns[2] = arguments[2];
-        return to_start_of_interval->build(temp_columns)->execute(temp_columns, result_type, input_rows_count);
+        if (!intermediate_type_is_date)
+            return truncated_column;
+
+        ColumnsWithTypeAndName temp_truncated_column(1);
+        temp_truncated_column[0] = {truncated_column, date_type, ""};
+
+        auto to_date_time_or_default = FunctionFactory::instance().get("toDateTime", context);
+        return to_date_time_or_default->build(temp_truncated_column)->execute(temp_truncated_column, result_type, input_rows_count);
     }
 
-    bool hasInformationAboutMonotonicity() const override
-    {
-        return true;
-    }
+    bool hasInformationAboutMonotonicity() const override { return true; }
 
     Monotonicity getMonotonicityForRange(const IDataType &, const Field &, const Field &) const override
     {
-        return { .is_monotonic = true, .is_always_monotonic = true };
+        return {.is_monotonic = true, .is_always_monotonic = true};
     }
 
 private:
     ContextPtr context;
     mutable IntervalKind::Kind datepart_kind = IntervalKind::Kind::Second;
+    mutable bool intermediate_type_is_date = false;
 };
 
 }
diff --git a/src/Functions/decodeXMLComponent.cpp b/src/Functions/decodeXMLComponent.cpp
index 8b84bb1194e..a25e67e0e37 100644
--- a/src/Functions/decodeXMLComponent.cpp
+++ b/src/Functions/decodeXMLComponent.cpp
@@ -2,7 +2,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <base/find_symbols.h>
 
 
diff --git a/src/Functions/demange.cpp b/src/Functions/demangle.cpp
similarity index 100%
rename from src/Functions/demange.cpp
rename to src/Functions/demangle.cpp
diff --git a/src/Functions/divideDecimal.cpp b/src/Functions/divideDecimal.cpp
index b1e1296e790..1d0db232062 100644
--- a/src/Functions/divideDecimal.cpp
+++ b/src/Functions/divideDecimal.cpp
@@ -58,69 +58,54 @@ struct DivideDecimalsImpl
 
 REGISTER_FUNCTION(DivideDecimals)
 {
-    factory.registerFunction<FunctionsDecimalArithmetics<DivideDecimalsImpl>>(Documentation(
-        R"(
+    factory.registerFunction<FunctionsDecimalArithmetics<DivideDecimalsImpl>>(FunctionDocumentation{
+            .description = R"(
 Performs division on two decimals. Result value will be of type [Decimal256](../../sql-reference/data-types/decimal.md).
 Result scale can be explicitly specified by `result_scale` argument (const Integer in range `[0, 76]`). If not specified, the result scale is the max scale of given arguments.
 
 :::note
 These function work significantly slower than usual `divide`.
 In case you don't really need controlled precision and/or need fast computation, consider using [divide](#divide).
-:::
-
-**Syntax**
-
-```sql
-divideDecimal(a, b[, result_scale])
-```
-
-**Arguments**
-
--   `a` — First value: [Decimal](../../sql-reference/data-types/decimal.md).
--   `b` — Second value: [Decimal](../../sql-reference/data-types/decimal.md).
--   `result_scale` — Scale of result: [Int/UInt](../../sql-reference/data-types/int-uint.md).
-
-**Returned value**
-
--   The result of division with given scale.
-
-Type: [Decimal256](../../sql-reference/data-types/decimal.md).
-
-**Example**
-
-```text
+:::)",
+            .syntax = "divideDecimal(a, b[, result_scale])",
+            .arguments = {
+                {"a", "First value: [Decimal](../../sql-reference/data-types/decimal.md)"},
+                {"b", "Second value: [Decimal](../../sql-reference/data-types/decimal.md)."}
+            },
+            .returned_value = "The result of division with given scale. Type: [Decimal256](../../sql-reference/data-types/decimal.md).",
+            .examples = {
+                {"", "divideDecimal(toDecimal256(-12, 0), toDecimal32(2.1, 1), 10)",
+R"(
 ┌─divideDecimal(toDecimal256(-12, 0), toDecimal32(2.1, 1), 10)─┐
 │                                                -5.7142857142 │
 └──────────────────────────────────────────────────────────────┘
-```
+)"}, {"Difference to regular division",
 
-**Difference from regular division:**
-```sql
+R"(
 SELECT toDecimal64(-12, 1) / toDecimal32(2.1, 1);
 SELECT toDecimal64(-12, 1) as a, toDecimal32(2.1, 1) as b, divideDecimal(a, b, 1), divideDecimal(a, b, 5);
-```
-
-```text
+)",
+R"(
 ┌─divide(toDecimal64(-12, 1), toDecimal32(2.1, 1))─┐
 │                                             -5.7 │
 └──────────────────────────────────────────────────┘
 ┌───a─┬───b─┬─divideDecimal(toDecimal64(-12, 1), toDecimal32(2.1, 1), 1)─┬─divideDecimal(toDecimal64(-12, 1), toDecimal32(2.1, 1), 5)─┐
 │ -12 │ 2.1 │                                                       -5.7 │                                                   -5.71428 │
 └─────┴─────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┘
-```
-
-```sql
+)"
+},
+                {"",
+R"(
 SELECT toDecimal64(-12, 0) / toDecimal32(2.1, 1);
 SELECT toDecimal64(-12, 0) as a, toDecimal32(2.1, 1) as b, divideDecimal(a, b, 1), divideDecimal(a, b, 5);
-```
-
-```text
+)",
+R"(
 DB::Exception: Decimal result's scale is less than argument's one: While processing toDecimal64(-12, 0) / toDecimal32(2.1, 1). (ARGUMENT_OUT_OF_BOUND)
 ┌───a─┬───b─┬─divideDecimal(toDecimal64(-12, 0), toDecimal32(2.1, 1), 1)─┬─divideDecimal(toDecimal64(-12, 0), toDecimal32(2.1, 1), 5)─┐
 │ -12 │ 2.1 │                                                       -5.7 │                                                   -5.71428 │
 └─────┴─────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┘
-```
-)"));
+)"}
+    }});
 }
 
 }
diff --git a/src/Functions/extractTextFromHTML.cpp b/src/Functions/extractTextFromHTML.cpp
index a15611579bb..4eefeaa9f86 100644
--- a/src/Functions/extractTextFromHTML.cpp
+++ b/src/Functions/extractTextFromHTML.cpp
@@ -70,16 +70,16 @@ namespace ErrorCodes
 namespace
 {
 
-inline bool startsWith(const char * s, const char * end, const char * prefix)
+inline bool startsWith(const char * s, const char * end, const std::string_view prefix)
 {
-    return s + strlen(prefix) < end && 0 == memcmp(s, prefix, strlen(prefix));
+    return s + prefix.length() < end && 0 == memcmp(s, prefix.data(), prefix.length());
 }
 
-inline bool checkAndSkip(const char * __restrict & s, const char * end, const char * prefix)
+inline bool checkAndSkip(const char * __restrict & s, const char * end, const std::string_view prefix)
 {
     if (startsWith(s, end, prefix))
     {
-        s += strlen(prefix);
+        s += prefix.length();
         return true;
     }
     return false;
@@ -138,7 +138,7 @@ bool processCDATA(const char * __restrict & src, const char * end, char * __rest
     return true;
 }
 
-bool processElementAndSkipContent(const char * __restrict & src, const char * end, const char * tag_name)
+bool processElementAndSkipContent(const char * __restrict & src, const char * end, const std::string_view tag_name)
 {
     const auto * old_src = src;
 
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.cpp b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
index 5a20ca7e962..7ed240fdbcf 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.cpp
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
@@ -17,14 +17,14 @@ namespace ErrorCodes
 }
 
 
-std::string extractTimeZoneNameFromColumn(const IColumn & column)
+std::string extractTimeZoneNameFromColumn(const IColumn * column, const String & column_name)
 {
-    const ColumnConst * time_zone_column = checkAndGetColumnConst<ColumnString>(&column);
+    const ColumnConst * time_zone_column = checkAndGetColumnConst<ColumnString>(column);
 
     if (!time_zone_column)
         throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                        "Illegal column {} of time zone argument of function, must be constant string",
-                        column.getName());
+                        "Illegal column {} of time zone argument of function, must be a constant string",
+                        column_name);
 
     return time_zone_column->getValue<String>();
 }
@@ -33,9 +33,9 @@ std::string extractTimeZoneNameFromColumn(const IColumn & column)
 std::string extractTimeZoneNameFromFunctionArguments(const ColumnsWithTypeAndName & arguments, size_t time_zone_arg_num, size_t datetime_arg_num)
 {
     /// Explicit time zone may be passed in last argument.
-    if (arguments.size() == time_zone_arg_num + 1 && arguments[time_zone_arg_num].column)
+    if (arguments.size() == time_zone_arg_num + 1)
     {
-        return extractTimeZoneNameFromColumn(*arguments[time_zone_arg_num].column);
+        return extractTimeZoneNameFromColumn(arguments[time_zone_arg_num].column.get(), arguments[time_zone_arg_num].name);
     }
     else
     {
@@ -57,7 +57,7 @@ const DateLUTImpl & extractTimeZoneFromFunctionArguments(const ColumnsWithTypeAn
 {
     if (arguments.size() == time_zone_arg_num + 1)
     {
-        std::string time_zone = extractTimeZoneNameFromColumn(*arguments[time_zone_arg_num].column);
+        std::string time_zone = extractTimeZoneNameFromColumn(arguments[time_zone_arg_num].column.get(), arguments[time_zone_arg_num].name);
         if (time_zone.empty())
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Provided time zone must be non-empty and be a valid time zone");
         return DateLUT::instance(time_zone);
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.h b/src/Functions/extractTimeZoneFromFunctionArguments.h
index 751d7a463f1..858be40def7 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.h
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.h
@@ -12,7 +12,7 @@ namespace DB
 
 class Block;
 
-std::string extractTimeZoneNameFromColumn(const IColumn & column);
+std::string extractTimeZoneNameFromColumn(const IColumn * column, const String & column_name);
 
 /// Determine working timezone either from optional argument with time zone name or from time zone in DateTime type of argument.
 /// Returns empty string if default time zone should be used.
diff --git a/src/Functions/factorial.cpp b/src/Functions/factorial.cpp
index 4e96391bccd..b814e8198e6 100644
--- a/src/Functions/factorial.cpp
+++ b/src/Functions/factorial.cpp
@@ -17,8 +17,7 @@ struct FactorialImpl
 {
     using ResultType = UInt64;
     static const constexpr bool allow_decimal = false;
-    static const constexpr bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static const constexpr bool allow_string_or_fixed_string = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
@@ -98,15 +97,15 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameFactorial>
 
 REGISTER_FUNCTION(Factorial)
 {
-    factory.registerFunction<FunctionFactorial>(
+    factory.registerFunction<FunctionFactorial>(FunctionDocumentation
         {
-            R"(
+            .description=R"(
 Computes the factorial of an integer value. It works with any native integer type including UInt(8|16|32|64) and Int(8|16|32|64). The return type is UInt64.
 
 The factorial of 0 is 1. Likewise, the factorial() function returns 1 for any negative value. The maximum positive value for the input argument is 20, a value of 21 or greater will cause exception throw.
 )",
-            Documentation::Examples{{"factorial", "SELECT factorial(10)"}},
-            Documentation::Categories{"Mathematical"}},
+            .examples{{"factorial", "SELECT factorial(10)", ""}},
+            .categories{"Mathematical"}},
         FunctionFactory::CaseInsensitive);
 }
 
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index 2172aa4c4fe..aac7ed1ad4d 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -13,9 +13,11 @@
 #include <Functions/IFunction.h>
 #include <Functions/castTypeToEither.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
+#include <Functions/numLiteralChars.h>
 
 #include <IO/WriteHelpers.h>
 
+#include <Common/Concepts.h>
 #include <Common/DateLUTImpl.h>
 #include <base/find_symbols.h>
 #include <Core/DecimalFunctions.h>
@@ -37,72 +39,33 @@ namespace ErrorCodes
 
 namespace
 {
+using Pos = const char *;
 
-struct FormatDateTimeTraits
+enum class SupportInteger
 {
-    enum class SupportInteger
-    {
-        Yes,
-        No
-    };
-
-    enum class FormatSyntax
-    {
-        MySQL,
-        Joda
-    };
+    Yes,
+    No
 };
 
-
-template <typename DataType> struct ActionValueTypeMap {};
-template <> struct ActionValueTypeMap<DataTypeInt8>       { using ActionValueType = UInt32; };
-template <> struct ActionValueTypeMap<DataTypeUInt8>      { using ActionValueType = UInt32; };
-template <> struct ActionValueTypeMap<DataTypeInt16>      { using ActionValueType = UInt32; };
-template <> struct ActionValueTypeMap<DataTypeUInt16>     { using ActionValueType = UInt32; };
-template <> struct ActionValueTypeMap<DataTypeInt32>      { using ActionValueType = UInt32; };
-template <> struct ActionValueTypeMap<DataTypeUInt32>     { using ActionValueType = UInt32; };
-template <> struct ActionValueTypeMap<DataTypeInt64>      { using ActionValueType = UInt32; };
-template <> struct ActionValueTypeMap<DataTypeUInt64>     { using ActionValueType = UInt32; };
-template <> struct ActionValueTypeMap<DataTypeDate>       { using ActionValueType = UInt16; };
-template <> struct ActionValueTypeMap<DataTypeDate32>     { using ActionValueType = Int32; };
-template <> struct ActionValueTypeMap<DataTypeDateTime>   { using ActionValueType = UInt32; };
-template <> struct ActionValueTypeMap<DataTypeDateTime64> { using ActionValueType = Int64; };
-
-/// Counts the number of literal characters in Joda format string until the next closing literal
-/// sequence single quote. Returns -1 if no literal single quote was found.
-/// In Joda format string(https://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html)
-/// literal content must be quoted with single quote. and two single quote means literal with one single quote.
-/// For example:
-/// Format string: "'aaaa'", unescaped literal: "aaaa";
-/// Format string: "'aa''aa'", unescaped literal: "aa'aa";
-/// Format string: "'aaa''aa" is not valid because of missing of end single quote.
-Int64 numLiteralChars(const char * cur, const char * end)
+enum class FormatSyntax
 {
-    bool found = false;
-    Int64 count = 0;
-    while (cur < end)
-    {
-        if (*cur == '\'')
-        {
-            if (cur + 1 < end && *(cur + 1) == '\'')
-            {
-                count += 2;
-                cur += 2;
-            }
-            else
-            {
-                found = true;
-                break;
-            }
-        }
-        else
-        {
-            ++count;
-            ++cur;
-        }
-    }
-    return found ? count : -1;
-}
+    MySQL,
+    Joda
+};
+
+template <typename DataType> struct InstructionValueTypeMap {};
+template <> struct InstructionValueTypeMap<DataTypeInt8>       { using InstructionValueType = UInt32; };
+template <> struct InstructionValueTypeMap<DataTypeUInt8>      { using InstructionValueType = UInt32; };
+template <> struct InstructionValueTypeMap<DataTypeInt16>      { using InstructionValueType = UInt32; };
+template <> struct InstructionValueTypeMap<DataTypeUInt16>     { using InstructionValueType = UInt32; };
+template <> struct InstructionValueTypeMap<DataTypeInt32>      { using InstructionValueType = UInt32; };
+template <> struct InstructionValueTypeMap<DataTypeUInt32>     { using InstructionValueType = UInt32; };
+template <> struct InstructionValueTypeMap<DataTypeInt64>      { using InstructionValueType = UInt32; };
+template <> struct InstructionValueTypeMap<DataTypeUInt64>     { using InstructionValueType = UInt32; };
+template <> struct InstructionValueTypeMap<DataTypeDate>       { using InstructionValueType = UInt16; };
+template <> struct InstructionValueTypeMap<DataTypeDate32>     { using InstructionValueType = Int32; };
+template <> struct InstructionValueTypeMap<DataTypeDateTime>   { using InstructionValueType = UInt32; };
+template <> struct InstructionValueTypeMap<DataTypeDateTime64> { using InstructionValueType = Int64; };
 
 /// Cast value from integer to string, making sure digits number in result string is no less than total_digits by padding leading '0'.
 String padValue(UInt32 val, size_t min_digits)
@@ -120,11 +83,9 @@ constexpr std::string_view weekdaysFull[] = {"Sunday", "Monday", "Tuesday", "Wed
 
 constexpr std::string_view weekdaysShort[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
 
-constexpr std::string_view monthsFull[]
-    = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
+constexpr std::string_view monthsFull[] = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
 
-constexpr std::string_view monthsShort[]
-    = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+constexpr std::string_view monthsShort[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
 
 /** formatDateTime(time, 'format')
   * Performs formatting of time, according to provided format.
@@ -150,13 +111,13 @@ constexpr std::string_view monthsShort[]
   *
   * Performance on Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz:
   *
-  * WITH formatDateTime(now() + number, '%H:%M:%S') AS x SELECT count() FROM system.numbers WHERE NOT ignore(x);
+  * WITH formatDateTime(now() + number, '%H:%i:%S') AS x SELECT count() FROM system.numbers WHERE NOT ignore(x);
   * - 97 million rows per second per core;
   *
   * WITH formatDateTime(toDateTime('2018-01-01 00:00:00') + number, '%F %T') AS x SELECT count() FROM system.numbers WHERE NOT ignore(x)
   * - 71 million rows per second per core;
   *
-  * select count() from (select formatDateTime(t, '%m/%d/%Y %H:%M:%S') from (select toDateTime('2018-01-01 00:00:00')+number as t from numbers(100000000)));
+  * select count() from (select formatDateTime(t, '%m/%d/%Y %H:%i:%S') from (select toDateTime('2018-01-01 00:00:00')+number as t from numbers(100000000)));
   * - 53 million rows per second per core;
   *
   * select count() from (select formatDateTime(t, 'Hello %Y World') from (select toDateTime('2018-01-01 00:00:00')+number as t from numbers(100000000)));
@@ -164,7 +125,7 @@ constexpr std::string_view monthsShort[]
   *
   * PS. We can make this function to return FixedString. Currently it returns String.
   */
-template <typename Name, FormatDateTimeTraits::SupportInteger support_integer, FormatDateTimeTraits::FormatSyntax format_syntax>
+template <typename Name, SupportInteger support_integer, FormatSyntax format_syntax>
 class FunctionFormatDateTimeImpl : public IFunction
 {
 private:
@@ -184,29 +145,37 @@ private:
     }
 
     template <typename Time>
-    class Action
+    class Instruction
     {
     public:
-        /// Using std::function will cause performance degradation in MySQL format by 0.45x.
-        /// But std::function is required for Joda format to capture extra variables.
-        /// This is the reason why we use raw function pointer in MySQL format and std::function
-        /// in Joda format.
-        using Func = std::conditional_t<
-            format_syntax == FormatDateTimeTraits::FormatSyntax::MySQL,
-            size_t (*)(char *, Time, UInt64, UInt32, const DateLUTImpl &),
-            std::function<size_t(char *, Time, UInt64, UInt32, const DateLUTImpl &)>>;
+        /// Joda format generally requires capturing extra variables (i.e. holding state) which is more convenient with
+        /// std::function and std::bind. Unfortunately, std::function causes a performance degradation by 0.45x compared to raw function
+        /// pointers. For MySQL format, we generally prefer raw function pointers. Because of the special case that not all formatters are
+        /// fixed-width formatters (see mysqlLiteral instruction), we still need to be able to store state. For that reason, we use member
+        /// function pointers instead of static function pointers.
+        using FuncMysql = size_t (Instruction<Time>::*)(char *, Time, UInt64, UInt32, const DateLUTImpl &);
+        FuncMysql func_mysql = nullptr;
 
-        Func func;
+        using FuncJoda = std::function<size_t(char *, Time, UInt64, UInt32, const DateLUTImpl &)>;
+        FuncJoda func_joda = nullptr;
 
         /// extra_shift is only used in MySQL format syntax. It is always 0 in Joda format syntax.
         size_t extra_shift = 0;
 
-        /// Action for appending date/time related number in specified format.
-        explicit Action(Func && func_) : func(std::move(func_)) {}
+        // Holds literal characters that will be copied into the output. Used by the mysqlLiteral instruction.
+        String literal;
+
+        Instruction() = default;
+
+        void setMysqlFunc(FuncMysql && func) { func_mysql = std::move(func); }
+        void setJodaFunc(FuncJoda && func) { func_joda = std::move(func); }
+        void setLiteral(std::string_view literal_) { literal = literal_; }
 
         void perform(char *& dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
         {
-            auto shift = func(dest, source, fractional_second, scale, timezone);
+            size_t shift = func_mysql
+                           ? std::invoke(func_mysql, this, dest, source, fractional_second, scale, timezone)
+                           : std::invoke(func_joda, dest, source, fractional_second, scale, timezone);
             dest += shift + extra_shift;
         }
 
@@ -292,21 +261,30 @@ private:
             return pos;
         }
     public:
-        static size_t mysqlNoop(char *, Time, UInt64, UInt32, const DateLUTImpl &) { return 0; }
+        size_t mysqlNoop(char *, Time, UInt64, UInt32, const DateLUTImpl &)
+        {
+            return 0;
+        }
 
-        static size_t mysqlCentury(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlLiteral(char * dest, Time, UInt64, UInt32, const DateLUTImpl &)
+        {
+            memcpy(dest, literal.data(), literal.size());
+            return literal.size();
+        }
+
+        size_t mysqlCentury(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             auto year = ToYearImpl::execute(source, timezone);
             auto century = year / 100;
             return writeNumber2(dest, century);
         }
 
-        static size_t mysqlDayOfMonth(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlDayOfMonth(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber2(dest, ToDayOfMonthImpl::execute(source, timezone));
         }
 
-        static size_t mysqlAmericanDate(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlAmericanDate(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             writeNumber2(dest, ToMonthImpl::execute(source, timezone));
             writeNumber2(dest + 3, ToDayOfMonthImpl::execute(source, timezone));
@@ -314,7 +292,7 @@ private:
             return 8;
         }
 
-        static size_t mysqlDayOfMonthSpacePadded(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlDayOfMonthSpacePadded(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             auto day = ToDayOfMonthImpl::execute(source, timezone);
             if (day < 10)
@@ -324,7 +302,7 @@ private:
             return 2;
         }
 
-        static size_t mysqlISO8601Date(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone) // NOLINT
+        size_t mysqlISO8601Date(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             writeNumber4(dest, ToYearImpl::execute(source, timezone));
             writeNumber2(dest + 5, ToMonthImpl::execute(source, timezone));
@@ -332,12 +310,12 @@ private:
             return 10;
         }
 
-        static size_t mysqlDayOfYear(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlDayOfYear(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber3(dest, ToDayOfYearImpl::execute(source, timezone));
         }
 
-        static size_t mysqlMonth(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlMonth(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber2(dest, ToMonthImpl::execute(source, timezone));
         }
@@ -350,17 +328,17 @@ private:
             return str_view.size();
         }
 
-        static size_t mysqlMonthOfYearTextShort(char * dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
+        size_t mysqlMonthOfYearTextShort(char * dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
         {
             return monthOfYearText(dest, source, true, fractional_second, scale, timezone);
         }
 
-        static size_t mysqlMonthOfYearTextLong(char * dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
+        size_t mysqlMonthOfYearTextLong(char * dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
         {
             return monthOfYearText(dest, source, false, fractional_second, scale, timezone);
         }
 
-        static size_t mysqlDayOfWeek(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlDayOfWeek(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             *dest = '0' + ToDayOfWeekImpl::execute(source, 0, timezone);
             return 1;
@@ -377,65 +355,65 @@ private:
             return str_view.size();
         }
 
-        static size_t mysqlDayOfWeekTextShort(char * dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
+        size_t mysqlDayOfWeekTextShort(char * dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
         {
             return dayOfWeekText(dest, source, true, fractional_second, scale, timezone);
         }
 
-        static size_t mysqlDayOfWeekTextLong(char * dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
+        size_t mysqlDayOfWeekTextLong(char * dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
         {
             return dayOfWeekText(dest, source, false, fractional_second, scale, timezone);
         }
 
-        static size_t mysqlDayOfWeek0To6(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlDayOfWeek0To6(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             auto day = ToDayOfWeekImpl::execute(source, 0, timezone);
             *dest = '0' + (day == 7 ? 0 : day);
             return 1;
         }
 
-        static size_t mysqlISO8601Week(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone) // NOLINT
+        size_t mysqlISO8601Week(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber2(dest, ToISOWeekImpl::execute(source, timezone));
         }
 
-        static size_t mysqlISO8601Year2(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone) // NOLINT
+        size_t mysqlISO8601Year2(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber2(dest, ToISOYearImpl::execute(source, timezone) % 100);
         }
 
-        static size_t mysqlISO8601Year4(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone) // NOLINT
+        size_t mysqlISO8601Year4(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber4(dest, ToISOYearImpl::execute(source, timezone));
         }
 
-        static size_t mysqlYear2(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlYear2(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber2(dest, ToYearImpl::execute(source, timezone) % 100);
         }
 
-        static size_t mysqlYear4(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlYear4(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber4(dest, ToYearImpl::execute(source, timezone));
         }
 
-        static size_t mysqlHour24(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlHour24(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber2(dest, ToHourImpl::execute(source, timezone));
         }
 
-        static size_t mysqlHour12(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlHour12(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             auto x = ToHourImpl::execute(source, timezone);
             return writeNumber2(dest, x == 0 ? 12 : (x > 12 ? x - 12 : x));
         }
 
-        static size_t mysqlMinute(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlMinute(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber2(dest, ToMinuteImpl::execute(source, timezone));
         }
 
-        static size_t mysqlAMPM(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone) // NOLINT
+        static size_t AMPM(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone) // NOLINT
         {
             auto hour = ToHourImpl::execute(source, timezone);
             dest[0] = hour >= 12 ? 'P' : 'A';
@@ -443,14 +421,19 @@ private:
             return 2;
         }
 
-        static size_t mysqlHHMM24(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlAMPM(char * dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
+        {
+            return AMPM(dest, source, fractional_second, scale, timezone);
+        }
+
+        size_t mysqlHHMM24(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             writeNumber2(dest, ToHourImpl::execute(source, timezone));
             writeNumber2(dest + 3, ToMinuteImpl::execute(source, timezone));
             return 5;
         }
 
-        static size_t mysqlHHMM12(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlHHMM12(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             auto hour = ToHourImpl::execute(source, timezone);
             writeNumber2(dest, hour == 0 ? 12 : (hour > 12 ? hour - 12 : hour));
@@ -460,13 +443,26 @@ private:
             return 8;
         }
 
-        static size_t mysqlSecond(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlSecond(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             return writeNumber2(dest, ToSecondImpl::execute(source, timezone));
         }
 
-        static size_t
-        mysqlFractionalSecond(char * dest, Time /*source*/, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & /*timezone*/)
+        size_t mysqlFractionalSecond(char * dest, Time /*source*/, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & /*timezone*/)
+        {
+            if (scale == 0)
+                scale = 6;
+
+            for (Int64 i = scale, value = fractional_second; i > 0; --i)
+            {
+                dest[i - 1] += value % 10;
+                value /= 10;
+            }
+            return scale;
+        }
+
+        /// Same as mysqlFractionalSecond but prints a single zero if the value has no fractional seconds
+        size_t mysqlFractionalSecondSingleZero(char * dest, Time /*source*/, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & /*timezone*/)
         {
             if (scale == 0)
                 scale = 1;
@@ -479,7 +475,7 @@ private:
             return scale;
         }
 
-        static size_t mysqlISO8601Time(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone) // NOLINT
+        size_t mysqlISO8601Time(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone) // NOLINT
         {
             writeNumber2(dest, ToHourImpl::execute(source, timezone));
             writeNumber2(dest + 3, ToMinuteImpl::execute(source, timezone));
@@ -487,7 +483,7 @@ private:
             return 8;
         }
 
-        static size_t mysqlTimezoneOffset(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlTimezoneOffset(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             auto offset = TimezoneOffsetImpl::execute(source, timezone);
             if (offset < 0)
@@ -501,7 +497,7 @@ private:
             return 5;
         }
 
-        static size_t mysqlQuarter(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
+        size_t mysqlQuarter(char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
         {
             *dest = '0' + ToQuarterImpl::execute(source, timezone);
             return 1;
@@ -610,7 +606,7 @@ private:
         static size_t jodaHalfDayOfDay(
             size_t /*min_represent_digits*/, char * dest, Time source, UInt64 fractional_second, UInt32 scale, const DateLUTImpl & timezone)
         {
-            return mysqlAMPM(dest, source, fractional_second, scale, timezone);
+            return AMPM(dest, source, fractional_second, scale, timezone);
         }
 
         static size_t jodaHourOfHalfDay(size_t min_represent_digits, char * dest, Time source, UInt64, UInt32, const DateLUTImpl & timezone)
@@ -686,10 +682,60 @@ private:
         }
     };
 
+    [[noreturn]] static void throwLastCharacterIsPercentException()
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "'%' must not be the last character in the format string, use '%%' instead");
+    }
+
+    static bool containsOnlyFixedWidthMySQLFormatters(std::string_view format, bool mysql_M_is_month_name)
+    {
+        static constexpr std::array variable_width_formatter = {'W'};
+        static constexpr std::array variable_width_formatter_M_is_month_name = {'W', 'M'};
+
+        for (size_t i = 0; i < format.size(); ++i)
+        {
+            switch (format[i])
+            {
+                case '%':
+                    if (i + 1 >= format.size())
+                        throwLastCharacterIsPercentException();
+                    if (mysql_M_is_month_name)
+                    {
+                        if (std::any_of(
+                                variable_width_formatter_M_is_month_name.begin(), variable_width_formatter_M_is_month_name.end(),
+                                [&](char c){ return c == format[i + 1]; }))
+                            return false;
+                    }
+                    else
+                    {
+                        if (std::any_of(
+                                variable_width_formatter.begin(), variable_width_formatter.end(),
+                                [&](char c){ return c == format[i + 1]; }))
+                            return false;
+                    }
+                    i += 1;
+                    continue;
+                default:
+                    break;
+            }
+        }
+
+        return true;
+    }
+
+    const bool mysql_M_is_month_name;
+    const bool mysql_f_prints_single_zero;
+
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionFormatDateTimeImpl>(); }
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionFormatDateTimeImpl>(context); }
+
+    explicit FunctionFormatDateTimeImpl(ContextPtr context)
+        : mysql_M_is_month_name(context->getSettings().formatdatetime_parsedatetime_m_is_month_name)
+        , mysql_f_prints_single_zero(context->getSettings().formatdatetime_f_prints_single_zero)
+    {
+    }
 
     String getName() const override
     {
@@ -707,7 +753,7 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        if constexpr (support_integer == FormatDateTimeTraits::SupportInteger::Yes)
+        if constexpr (support_integer == SupportInteger::Yes)
         {
             if (arguments.size() != 1 && arguments.size() != 2 && arguments.size() != 3)
                 throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
@@ -753,7 +799,7 @@ public:
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, [[maybe_unused]] size_t input_rows_count) const override
     {
         ColumnPtr res;
-        if constexpr (support_integer == FormatDateTimeTraits::SupportInteger::Yes)
+        if constexpr (support_integer == SupportInteger::Yes)
         {
             if (arguments.size() == 1)
             {
@@ -825,10 +871,27 @@ public:
         if constexpr (std::is_same_v<DataType, DataTypeDateTime64>)
             scale = times->getScale();
 
-        using T = typename ActionValueTypeMap<DataType>::ActionValueType;
-        std::vector<Action<T>> instructions;
+        /// For MySQL, we support two modes of execution:
+        ///
+        /// - All formatters in the format string are fixed-width. As a result, all output rows will have the same width and structure. We
+        ///   take advantage of this and
+        ///     1. create a "template" with placeholders from the format string,
+        ///     2. allocate a result column large enough to store the template on each row,
+        ///     3. copy the template into each result row,
+        ///     4. run instructions which replace the formatter placeholders. All other parts of the template (e.g. whitespaces) are already
+        ///        as desired and instructions skip over them (see 'extra_shift' in the formatters).
+        ///
+        /// - The format string contains at least one variable-width formatter. Output rows will potentially be of different size.
+        ///   Steps 1. and 2. are performed as above (the result column is allocated based on a worst-case size estimation). The result
+        ///   column rows are NOT populated with the template and left uninitialized. We run the normal instructions for formatters AND
+        ///   instructions that copy literal characters before/between/after formatters. As a result, each byte of each result row is
+        ///   written which is obviously slow.
+        bool mysql_with_only_fixed_length_formatters = (format_syntax == FormatSyntax::MySQL) ? containsOnlyFixedWidthMySQLFormatters(format, mysql_M_is_month_name) : false;
+
+        using T = typename InstructionValueTypeMap<DataType>::InstructionValueType;
+        std::vector<Instruction<T>> instructions;
         String out_template;
-        auto result_size = parseFormat(format, instructions, scale, out_template);
+        size_t out_template_size = parseFormat(format, instructions, scale, mysql_with_only_fixed_length_formatters, out_template);
 
         const DateLUTImpl * time_zone_tmp = nullptr;
         if (castType(arguments[0].type.get(), [&]([[maybe_unused]] const auto & type) { return true; }))
@@ -842,36 +905,39 @@ public:
         const auto & vec = times->getData();
 
         auto col_res = ColumnString::create();
-        auto & dst_data = col_res->getChars();
-        auto & dst_offsets = col_res->getOffsets();
-        dst_data.resize(vec.size() * (result_size + 1));
-        dst_offsets.resize(vec.size());
+        auto & res_data = col_res->getChars();
+        auto & res_offsets = col_res->getOffsets();
+        res_data.resize(vec.size() * (out_template_size + 1));
+        res_offsets.resize(vec.size());
 
-        if constexpr (format_syntax == FormatDateTimeTraits::FormatSyntax::MySQL)
+        if constexpr (format_syntax == FormatSyntax::MySQL)
         {
-            /// Fill result with literals.
+            if (mysql_with_only_fixed_length_formatters)
             {
-                UInt8 * begin = dst_data.data();
-                UInt8 * end = begin + dst_data.size();
-                UInt8 * pos = begin;
-
-                if (pos < end)
+                /// Fill result with template.
                 {
-                    memcpy(pos, out_template.data(), result_size + 1); /// With zero terminator.
-                    pos += result_size + 1;
-                }
+                    const UInt8 * const begin = res_data.data();
+                    const UInt8 * const end = res_data.data() + res_data.size();
+                    UInt8 * pos = res_data.data();
 
-                /// Fill by copying exponential growing ranges.
-                while (pos < end)
-                {
-                    size_t bytes_to_copy = std::min(pos - begin, end - pos);
-                    memcpy(pos, begin, bytes_to_copy);
-                    pos += bytes_to_copy;
+                    if (pos < end)
+                    {
+                        memcpy(pos, out_template.data(), out_template_size + 1); /// With zero terminator. mystring[mystring.size()] = '\0' is guaranteed since C++11.
+                        pos += out_template_size + 1;
+                    }
+
+                    /// Copy exponentially growing ranges.
+                    while (pos < end)
+                    {
+                        size_t bytes_to_copy = std::min(pos - begin, end - pos);
+                        memcpy(pos, begin, bytes_to_copy);
+                        pos += bytes_to_copy;
+                    }
                 }
             }
         }
 
-        auto * begin = reinterpret_cast<char *>(dst_data.data());
+        auto * begin = reinterpret_cast<char *>(res_data.data());
         auto * pos = begin;
         for (size_t i = 0; i < vec.size(); ++i)
         {
@@ -879,9 +945,7 @@ public:
             {
                 const auto c = DecimalUtils::split(vec[i], scale);
                 for (auto & instruction : instructions)
-                {
                     instruction.perform(pos, static_cast<Int64>(c.whole), c.fractional, scale, time_zone);
-                }
             }
             else
             {
@@ -890,291 +954,466 @@ public:
             }
             *pos++ = '\0';
 
-            dst_offsets[i] = pos - begin;
+            res_offsets[i] = pos - begin;
         }
 
-        dst_data.resize(pos - begin);
+        res_data.resize(pos - begin);
         return col_res;
     }
 
     template <typename T>
-    size_t parseFormat(const String & format, std::vector<Action<T>> & instructions, UInt32 scale, String & out_template) const
+    size_t parseFormat(const String & format, std::vector<Instruction<T>> & instructions, UInt32 scale, bool mysql_with_only_fixed_length_formatters, String & out_template) const
     {
-        if constexpr (format_syntax == FormatDateTimeTraits::FormatSyntax::MySQL)
-            return parseMySQLFormat(format, instructions, scale, out_template);
-        else if constexpr (format_syntax == FormatDateTimeTraits::FormatSyntax::Joda)
-            return parseJodaFormat(format, instructions, scale, out_template);
+        static_assert(format_syntax == FormatSyntax::MySQL || format_syntax == FormatSyntax::Joda);
+
+        if constexpr (format_syntax == FormatSyntax::MySQL)
+            return parseMySQLFormat(format, instructions, scale, mysql_with_only_fixed_length_formatters, out_template);
         else
-            throw Exception(
-                ErrorCodes::NOT_IMPLEMENTED,
-                "Unknown datetime format style {} in function {}",
-                magic_enum::enum_name(format_syntax),
-                getName());
+            return parseJodaFormat(format, instructions, scale, mysql_with_only_fixed_length_formatters, out_template);
     }
 
     template <typename T>
-    size_t parseMySQLFormat(const String & format, std::vector<Action<T>> & instructions, UInt32 scale, String & out_template) const
+    size_t parseMySQLFormat(const String & format, std::vector<Instruction<T>> & instructions, UInt32 scale, bool mysql_with_only_fixed_length_formatters, String & out_template) const
     {
         auto add_extra_shift = [&](size_t amount)
         {
             if (instructions.empty())
-                instructions.emplace_back(&Action<T>::mysqlNoop);
+            {
+                Instruction<T> instruction;
+                instruction.setMysqlFunc(&Instruction<T>::mysqlNoop);
+                instructions.push_back(std::move(instruction));
+            }
             instructions.back().extra_shift += amount;
         };
 
-        auto add_instruction_or_extra_shift = [&](auto * func [[maybe_unused]], size_t amount [[maybe_unused]])
+        auto add_literal_instruction = [&](std::string_view literal)
         {
-            if constexpr (std::is_same_v<T, UInt32> || std::is_same_v<T, Int64>)
-                instructions.emplace_back(std::move(func));
-            else
-                add_extra_shift(amount);
+            Instruction<T> instruction;
+            instruction.setMysqlFunc(&Instruction<T>::mysqlLiteral);
+            instruction.setLiteral(literal);
+            instructions.push_back(std::move(instruction));
         };
 
-        const char * pos = format.data();
-        const char * const end = pos + format.size();
+        auto add_extra_shift_or_literal_instruction = [&](std::string_view literal)
+        {
+            if (mysql_with_only_fixed_length_formatters)
+                add_extra_shift(literal.size());
+            else
+                add_literal_instruction(literal);
+        };
+
+        auto add_time_instruction = [&]([[maybe_unused]] typename Instruction<T>::FuncMysql && func, [[maybe_unused]] std::string_view literal)
+        {
+            /// DateTime/DateTime64 --> insert instruction
+            /// Other types cannot provide the requested data --> write out template
+            if constexpr (is_any_of<T, UInt32, Int64>)
+            {
+                Instruction<T> instruction;
+                instruction.setMysqlFunc(std::move(func));
+                instructions.push_back(std::move(instruction));
+            }
+            else
+                add_extra_shift_or_literal_instruction(literal);
+        };
+
+        Pos pos = format.data();
+        Pos const end = format.data() + format.size();
 
         while (true)
         {
-            const char * percent_pos = find_first_symbols<'%'>(pos, end);
+            Pos const percent_pos = find_first_symbols<'%'>(pos, end);
 
             if (percent_pos < end)
             {
                 if (pos < percent_pos)
                 {
-                    add_extra_shift(percent_pos - pos);
+                    /// Handle characters before next %
+                    add_extra_shift_or_literal_instruction(std::string_view(pos, percent_pos - pos));
                     out_template += String(pos, percent_pos - pos);
                 }
 
                 pos = percent_pos + 1;
                 if (pos >= end)
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Sign '%' is the last in format, if you need it, use '%%'");
+                    throwLastCharacterIsPercentException();
 
                 switch (*pos)
                 {
-                    // Abbreviated weekday [Mon...Sun]
+                    // Abbreviated weekday [Mon-Sun]
                     case 'a':
-                        instructions.emplace_back(&Action<T>::mysqlDayOfWeekTextShort);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlDayOfWeekTextShort);
+                        instructions.push_back(std::move(instruction));
                         out_template += "Mon";
                         break;
+                    }
 
-                    // Abbreviated month [Jan...Dec]
+                    // Abbreviated month [Jan-Dec]
                     case 'b':
-                        instructions.emplace_back(&Action<T>::mysqlMonthOfYearTextShort);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlMonthOfYearTextShort);
+                        instructions.push_back(std::move(instruction));
                         out_template += "Jan";
                         break;
+                    }
 
-                    // Month as a decimal number (01-12)
+                    // Month as a integer number (01-12)
                     case 'c':
-                        instructions.emplace_back(&Action<T>::mysqlMonth);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlMonth);
+                        instructions.push_back(std::move(instruction));
                         out_template += "00";
                         break;
+                    }
 
                     // Year, divided by 100, zero-padded
                     case 'C':
-                        instructions.emplace_back(&Action<T>::mysqlCentury);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlCentury);
+                        instructions.push_back(std::move(instruction));
                         out_template += "00";
                         break;
+                    }
 
                     // Day of month, zero-padded (01-31)
                     case 'd':
-                        instructions.emplace_back(&Action<T>::mysqlDayOfMonth);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlDayOfMonth);
+                        instructions.push_back(std::move(instruction));
                         out_template += "00";
                         break;
+                    }
 
                     // Short MM/DD/YY date, equivalent to %m/%d/%y
                     case 'D':
-                        instructions.emplace_back(&Action<T>::mysqlAmericanDate);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlAmericanDate);
+                        instructions.push_back(std::move(instruction));
                         out_template += "00/00/00";
                         break;
+                    }
 
                     // Day of month, space-padded ( 1-31)  23
                     case 'e':
-                        instructions.emplace_back(&Action<T>::mysqlDayOfMonthSpacePadded);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlDayOfMonthSpacePadded);
+                        instructions.push_back(std::move(std::move(instruction)));
                         out_template += " 0";
                         break;
+                    }
+
+                    // Depending on a setting
+                    // - Full month [January-December] OR
+                    // - Minute of hour range [0, 59]
+                    case 'M':
+                    {
+                        Instruction<T> instruction;
+                        if (mysql_M_is_month_name)
+                        {
+                            instruction.setMysqlFunc(&Instruction<T>::mysqlMonthOfYearTextLong);
+                            instructions.push_back(std::move(instruction));
+                            out_template += "September"; /// longest possible month name
+                        }
+                        else
+                        {
+                            static constexpr std::string_view val = "00";
+                            add_time_instruction(&Instruction<T>::mysqlMinute, val);
+                            out_template += val;
+                        }
+                        break;
+                    }
 
                     // Fractional seconds
                     case 'f':
                     {
-                        /// If the time data type has no fractional part, then we print '0' as the fractional part.
-                        instructions.emplace_back(&Action<T>::mysqlFractionalSecond);
-                        out_template += String(std::max<UInt32>(1, scale), '0');
+                        /// If the time data type has no fractional part, we print (default) '000000' or (deprecated) '0' as fractional part.
+                        if (mysql_f_prints_single_zero)
+                        {
+                            Instruction<T> instruction;
+                            instruction.setMysqlFunc(&Instruction<T>::mysqlFractionalSecondSingleZero);
+                            instructions.push_back(std::move(instruction));
+                            out_template += String(scale == 0 ? 1 : scale, '0');
+                        }
+                        else
+                        {
+                            Instruction<T> instruction;
+                            instruction.setMysqlFunc(&Instruction<T>::mysqlFractionalSecond);
+                            instructions.push_back(std::move(instruction));
+                            out_template += String(scale == 0 ? 6 : scale, '0');
+                        }
                         break;
                     }
 
                     // Short YYYY-MM-DD date, equivalent to %Y-%m-%d   2001-08-23
                     case 'F':
-                        instructions.emplace_back(&Action<T>::mysqlISO8601Date);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlISO8601Date);
+                        instructions.push_back(std::move(instruction));
                         out_template += "0000-00-00";
                         break;
+                    }
 
                     // Last two digits of year of ISO 8601 week number (see %G)
                     case 'g':
-                        instructions.emplace_back(&Action<T>::mysqlISO8601Year2);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlISO8601Year2);
+                        instructions.push_back(std::move(instruction));
                         out_template += "00";
                         break;
+                    }
 
                     // Year of ISO 8601 week number (see %V)
                     case 'G':
-                        instructions.emplace_back(&Action<T>::mysqlISO8601Year4);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlISO8601Year4);
+                        instructions.push_back(std::move(instruction));
                         out_template += "0000";
                         break;
+                    }
 
                     // Day of the year (001-366)   235
                     case 'j':
-                        instructions.emplace_back(&Action<T>::mysqlDayOfYear);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlDayOfYear);
+                        instructions.push_back(std::move(instruction));
                         out_template += "000";
                         break;
+                    }
 
-                    // Month as a decimal number (01-12)
+                    // Month as a integer number (01-12)
                     case 'm':
-                        instructions.emplace_back(&Action<T>::mysqlMonth);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlMonth);
+                        instructions.push_back(std::move(instruction));
                         out_template += "00";
                         break;
+                    }
 
                     // ISO 8601 weekday as number with Monday as 1 (1-7)
                     case 'u':
-                        instructions.emplace_back(&Action<T>::mysqlDayOfWeek);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlDayOfWeek);
+                        instructions.push_back(std::move(instruction));
                         out_template += "0";
                         break;
+                    }
 
                     // ISO 8601 week number (01-53)
                     case 'V':
-                        instructions.emplace_back(&Action<T>::mysqlISO8601Week);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlISO8601Week);
+                        instructions.push_back(std::move(instruction));
                         out_template += "00";
                         break;
+                    }
 
                     // Weekday as a decimal number with Sunday as 0 (0-6)  4
                     case 'w':
-                        instructions.emplace_back(&Action<T>::mysqlDayOfWeek0To6);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlDayOfWeek0To6);
+                        instructions.push_back(std::move(instruction));
                         out_template += "0";
                         break;
+                    }
 
-                    // Full weekday [Monday...Sunday]
+                    // Full weekday [Monday-Sunday]
                     case 'W':
-                        instructions.emplace_back(&Action<T>::mysqlDayOfWeekTextLong);
-                        out_template += "Monday";
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlDayOfWeekTextLong);
+                        instructions.push_back(std::move(instruction));
+                        out_template += "Wednesday"; /// longest possible weekday name
                         break;
+                    }
 
                     // Two digits year
                     case 'y':
-                        instructions.emplace_back(&Action<T>::mysqlYear2);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlYear2);
+                        instructions.push_back(std::move(instruction));
                         out_template += "00";
                         break;
+                    }
 
                     // Four digits year
                     case 'Y':
-                        instructions.emplace_back(&Action<T>::mysqlYear4);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlYear4);
+                        instructions.push_back(std::move(instruction));
                         out_template += "0000";
                         break;
+                    }
 
                     // Quarter (1-4)
                     case 'Q':
-                        instructions.template emplace_back(&Action<T>::mysqlQuarter);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlQuarter);
+                        instructions.push_back(std::move(instruction));
                         out_template += "0";
                         break;
+                    }
 
                     // Offset from UTC timezone as +hhmm or -hhmm
                     case 'z':
-                        instructions.emplace_back(&Action<T>::mysqlTimezoneOffset);
+                    {
+                        Instruction<T> instruction;
+                        instruction.setMysqlFunc(&Instruction<T>::mysqlTimezoneOffset);
+                        instructions.push_back(std::move(instruction));
                         out_template += "+0000";
                         break;
+                    }
 
                     /// Time components. If the argument is Date, not a DateTime, then this components will have default value.
 
-                    // Minute (00-59)
-                    case 'M':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlMinute, 2);
-                        out_template += "00";
-                        break;
-
                     // AM or PM
                     case 'p':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlAMPM, 2);
-                        out_template += "AM";
+                    {
+                        static constexpr std::string_view val = "AM";
+                        add_time_instruction(&Instruction<T>::mysqlAMPM, val);
+                        out_template += val;
                         break;
+                    }
 
                     // 12-hour HH:MM time, equivalent to %h:%i %p 2:55 PM
                     case 'r':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlHHMM12, 8);
-                        out_template += "12:00 AM";
+                    {
+                        static constexpr std::string_view val = "12:00 AM";
+                        add_time_instruction(&Instruction<T>::mysqlHHMM12, val);
+                        out_template += val;
                         break;
+                    }
 
                     // 24-hour HH:MM time, equivalent to %H:%i 14:55
                     case 'R':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlHHMM24, 5);
-                        out_template += "00:00";
+                    {
+                        static constexpr std::string_view val = "00:00";
+                        add_time_instruction(&Instruction<T>::mysqlHHMM24, val);
+                        out_template += val;
                         break;
+                    }
 
                     // Seconds
                     case 's':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlSecond, 2);
-                        out_template += "00";
+                    {
+                        static constexpr std::string_view val = "00";
+                        add_time_instruction(&Instruction<T>::mysqlSecond, val);
+                        out_template += val;
                         break;
+                    }
 
                     // Seconds
                     case 'S':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlSecond, 2);
-                        out_template += "00";
+                    {
+                        static constexpr std::string_view val = "00";
+                        add_time_instruction(&Instruction<T>::mysqlSecond, val);
+                        out_template += val;
                         break;
+                    }
 
                     // ISO 8601 time format (HH:MM:SS), equivalent to %H:%i:%S 14:55:02
                     case 'T':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlISO8601Time, 8);
-                        out_template += "00:00:00";
+                    {
+                        static constexpr std::string_view val = "00:00:00";
+                        add_time_instruction(&Instruction<T>::mysqlISO8601Time, val);
+                        out_template += val;
                         break;
+                    }
 
                     // Hour in 12h format (01-12)
                     case 'h':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlHour12, 2);
-                        out_template += "12";
+                    {
+                        static constexpr std::string_view val = "12";
+                        add_time_instruction(&Instruction<T>::mysqlHour12, val);
+                        out_template += val;
                         break;
+                    }
 
                     // Hour in 24h format (00-23)
                     case 'H':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlHour24, 2);
-                        out_template += "00";
+                    {
+                        static constexpr std::string_view val = "00";
+                        add_time_instruction(&Instruction<T>::mysqlHour24, val);
+                        out_template += val;
                         break;
+                    }
 
                     // Minute of hour range [0, 59]
                     case 'i':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlMinute, 2);
-                        out_template += "00";
+                    {
+                        static constexpr std::string_view val = "00";
+                        add_time_instruction(&Instruction<T>::mysqlMinute, val);
+                        out_template += val;
                         break;
+                    }
 
                     // Hour in 12h format (01-12)
                     case 'I':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlHour12, 2);
-                        out_template += "12";
+                    {
+                        static constexpr std::string_view val = "12";
+                        add_time_instruction(&Instruction<T>::mysqlHour12, val);
+                        out_template += val;
                         break;
+                    }
 
                     // Hour in 24h format (00-23)
                     case 'k':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlHour24, 2);
-                        out_template += "00";
+                    {
+                        static constexpr std::string_view val = "00";
+                        add_time_instruction(&Instruction<T>::mysqlHour24, val);
+                        out_template += val;
                         break;
+                    }
 
                     // Hour in 12h format (01-12)
                     case 'l':
-                        add_instruction_or_extra_shift(&Action<T>::mysqlHour12, 2);
-                        out_template += "12";
+                    {
+                        static constexpr std::string_view val = "12";
+                        add_time_instruction(&Instruction<T>::mysqlHour12, val);
+                        out_template += val;
                         break;
+                    }
 
                     case 't':
-                        add_extra_shift(1);
-                        out_template += "\t";
+                    {
+                        static constexpr std::string_view val = "\t";
+                        add_extra_shift_or_literal_instruction(val);
+                        out_template += val;
                         break;
+                    }
 
                     case 'n':
-                        add_extra_shift(1);
-                        out_template += "\n";
+                    {
+                        static constexpr std::string_view val = "\n";
+                        add_extra_shift_or_literal_instruction(val);
+                        out_template += val;
                         break;
+                    }
 
                     // Escaped literal characters.
                     case '%':
-                        add_extra_shift(1);
-                        out_template += "%";
+                    {
+                        static constexpr std::string_view val = "%";
+                        add_extra_shift_or_literal_instruction(val);
+                        out_template += val;
                         break;
+                    }
 
                     // Unimplemented
                     case 'U':
@@ -1185,7 +1424,6 @@ public:
                         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for YEAR for week (Mon-Sun)");
                     case 'X':
                         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for YEAR for week (Sun-Sat)");
-
                     default:
                         throw Exception(
                             ErrorCodes::BAD_ARGUMENTS,
@@ -1194,12 +1432,12 @@ public:
                             *pos,
                             getName());
                 }
-
                 ++pos;
             }
             else
             {
-                add_extra_shift(end - pos);
+                /// Handle characters after last %
+                add_extra_shift_or_literal_instruction(std::string_view(pos, end - pos));
                 out_template += String(pos, end - pos);
                 break;
             }
@@ -1209,33 +1447,41 @@ public:
     }
 
     template <typename T>
-    size_t parseJodaFormat(const String & format, std::vector<Action<T>> & instructions, UInt32, String &) const
+    size_t parseJodaFormat(const String & format, std::vector<Instruction<T>> & instructions, UInt32, bool, String &) const
     {
         /// If the argument was DateTime, add instruction for printing. If it was date, just append default literal
-        auto add_instruction = [&](auto && func [[maybe_unused]], const String & default_literal [[maybe_unused]])
+        auto add_instruction = [&]([[maybe_unused]] typename Instruction<T>::FuncJoda && func, [[maybe_unused]] const String & default_literal)
         {
-            if constexpr (std::is_same_v<T, UInt32> || std::is_same_v<T, Int64>)
-                instructions.emplace_back(func);
+            if constexpr (is_any_of<T, UInt32, Int64>)
+            {
+                Instruction<T> instruction;
+                instruction.setJodaFunc(std::move(func));
+                instructions.push_back(std::move(instruction));
+            }
             else
-                instructions.emplace_back(std::bind_front(&Action<T>::template jodaLiteral<String>, default_literal));
+            {
+                Instruction<T> instruction;
+                instruction.setJodaFunc(std::bind_front(&Instruction<T>::template jodaLiteral<String>, default_literal));
+                instructions.push_back(std::move(instruction));
+            }
         };
 
         size_t reserve_size = 0;
-        const char * pos = format.data();
-        const char * end = pos + format.size();
-
+        Pos pos = format.data();
+        Pos end = format.data() + format.size();
         while (pos < end)
         {
-            const char * cur_token = pos;
-
+            Pos cur_token = pos;
             // Literal case
             if (*cur_token == '\'')
             {
                 // Case 1: 2 consecutive single quote
                 if (pos + 1 < end && *(pos + 1) == '\'')
                 {
+                    Instruction<T> instruction;
                     std::string_view literal(cur_token, 1);
-                    instructions.emplace_back(std::bind_front(&Action<T>::template jodaLiteral<decltype(literal)>, literal));
+                    instruction.setJodaFunc(std::bind_front(&Instruction<T>::template jodaLiteral<decltype(literal)>, literal));
+                    instructions.push_back(std::move(instruction));
                     ++reserve_size;
                     pos += 2;
                 }
@@ -1249,9 +1495,10 @@ public:
                     {
                         for (Int64 i = 1; i <= count; i++)
                         {
+                            Instruction<T> instruction;
                             std::string_view literal(cur_token + i, 1);
-                            instructions.emplace_back(
-                                std::bind_front(&Action<T>::template jodaLiteral<decltype(literal)>, literal));
+                            instruction.setJodaFunc(std::bind_front(&Instruction<T>::template jodaLiteral<decltype(literal)>, literal));
+                            instructions.push_back(std::move(instruction));
                             ++reserve_size;
                             if (*(cur_token + i) == '\'')
                                 i += 1;
@@ -1272,136 +1519,194 @@ public:
                 switch (*cur_token)
                 {
                     case 'G':
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaEra, repetitions));
+                    {
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaEra, repetitions));
+                        instructions.push_back(std::move(instruction));
                         reserve_size += repetitions <= 3 ? 2 : 13;
                         break;
+                    }
                     case 'C':
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaCenturyOfEra, repetitions));
+                    {
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaCenturyOfEra, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// Year range [1900, 2299]
                         reserve_size += std::max(repetitions, 2);
                         break;
+                    }
                     case 'Y':
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaYearOfEra, repetitions));
+                    {
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaYearOfEra, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// Year range [1900, 2299]
                         reserve_size += repetitions == 2 ? 2 : std::max(repetitions, 4);
                         break;
+                    }
                     case 'x':
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaWeekYear, repetitions));
+                    {
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaWeekYear, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// weekyear range [1900, 2299]
                         reserve_size += std::max(repetitions, 4);
                         break;
+                    }
                     case 'w':
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaWeekOfWeekYear, repetitions));
+                    {
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaWeekOfWeekYear, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// Week of weekyear range [1, 52]
                         reserve_size += std::max(repetitions, 2);
                         break;
+                    }
                     case 'e':
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaDayOfWeek1Based, repetitions));
+                    {
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaDayOfWeek1Based, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// Day of week range [1, 7]
                         reserve_size += std::max(repetitions, 1);
                         break;
+                    }
                     case 'E':
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaDayOfWeekText, repetitions));
+                    {
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaDayOfWeekText, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// Maximum length of short name is 3, maximum length of full name is 9.
                         reserve_size += repetitions <= 3 ? 3 : 9;
                         break;
+                    }
                     case 'y':
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaYear, repetitions));
+                    {
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaYear, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// Year range [1900, 2299]
                         reserve_size += repetitions == 2 ? 2 : std::max(repetitions, 4);
                         break;
+                    }
                     case 'D':
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaDayOfYear, repetitions));
+                    {
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaDayOfYear, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// Day of year range [1, 366]
                         reserve_size += std::max(repetitions, 3);
                         break;
+                    }
                     case 'M':
+                    {
                         if (repetitions <= 2)
                         {
-                            instructions.emplace_back(std::bind_front(&Action<T>::jodaMonthOfYear, repetitions));
+                            Instruction<T> instruction;
+                            instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaMonthOfYear, repetitions));
+                            instructions.push_back(std::move(instruction));
                             /// Month of year range [1, 12]
                             reserve_size += 2;
                         }
                         else
                         {
-                            instructions.emplace_back(std::bind_front(&Action<T>::jodaMonthOfYearText, repetitions));
+                            Instruction<T> instruction;
+                            instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaMonthOfYearText, repetitions));
+                            instructions.push_back(std::move(instruction));
                             /// Maximum length of short name is 3, maximum length of full name is 9.
                             reserve_size += repetitions <= 3 ? 3 : 9;
                         }
                         break;
+                    }
                     case 'd':
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaDayOfMonth, repetitions));
+                    {
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaDayOfMonth, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// Day of month range [1, 3]
                         reserve_size += std::max(repetitions, 3);
                         break;
+                    }
                     case 'a':
                         /// Default half day of day is "AM"
-                        add_instruction(std::bind_front(&Action<T>::jodaHalfDayOfDay, repetitions), "AM");
+                        add_instruction(std::bind_front(&Instruction<T>::jodaHalfDayOfDay, repetitions), "AM");
                         reserve_size += 2;
                         break;
                     case 'K':
                         /// Default hour of half day is 0
                         add_instruction(
-                            std::bind_front(&Action<T>::jodaHourOfHalfDay, repetitions), padValue(0, repetitions));
+                            std::bind_front(&Instruction<T>::jodaHourOfHalfDay, repetitions), padValue(0, repetitions));
                         /// Hour of half day range [0, 11]
                         reserve_size += std::max(repetitions, 2);
                         break;
                     case 'h':
                         /// Default clock hour of half day is 12
                         add_instruction(
-                            std::bind_front(&Action<T>::jodaClockHourOfHalfDay, repetitions),
+                            std::bind_front(&Instruction<T>::jodaClockHourOfHalfDay, repetitions),
                             padValue(12, repetitions));
                         /// Clock hour of half day range [1, 12]
                         reserve_size += std::max(repetitions, 2);
                         break;
                     case 'H':
                         /// Default hour of day is 0
-                        add_instruction(std::bind_front(&Action<T>::jodaHourOfDay, repetitions), padValue(0, repetitions));
+                        add_instruction(std::bind_front(&Instruction<T>::jodaHourOfDay, repetitions), padValue(0, repetitions));
                         /// Hour of day range [0, 23]
                         reserve_size += std::max(repetitions, 2);
                         break;
                     case 'k':
                         /// Default clock hour of day is 24
-                        add_instruction(std::bind_front(&Action<T>::jodaClockHourOfDay, repetitions), padValue(24, repetitions));
+                        add_instruction(std::bind_front(&Instruction<T>::jodaClockHourOfDay, repetitions), padValue(24, repetitions));
                         /// Clock hour of day range [1, 24]
                         reserve_size += std::max(repetitions, 2);
                         break;
                     case 'm':
                         /// Default minute of hour is 0
-                        add_instruction(std::bind_front(&Action<T>::jodaMinuteOfHour, repetitions), padValue(0, repetitions));
+                        add_instruction(std::bind_front(&Instruction<T>::jodaMinuteOfHour, repetitions), padValue(0, repetitions));
                         /// Minute of hour range [0, 59]
                         reserve_size += std::max(repetitions, 2);
                         break;
                     case 's':
                         /// Default second of minute is 0
-                        add_instruction(std::bind_front(&Action<T>::jodaSecondOfMinute, repetitions), padValue(0, repetitions));
+                        add_instruction(std::bind_front(&Instruction<T>::jodaSecondOfMinute, repetitions), padValue(0, repetitions));
                         /// Second of minute range [0, 59]
                         reserve_size += std::max(repetitions, 2);
                         break;
                     case 'S':
+                    {
                         /// Default fraction of second is 0
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaFractionOfSecond, repetitions));
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaFractionOfSecond, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// 'S' repetitions range [0, 9]
                         reserve_size += repetitions <= 9 ? repetitions : 9;
                         break;
+                    }
                     case 'z':
+                    {
                         if (repetitions <= 3)
                             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Short name time zone is not yet supported");
 
-                        instructions.emplace_back(std::bind_front(&Action<T>::jodaTimezone, repetitions));
+                        Instruction<T> instruction;
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::jodaTimezone, repetitions));
+                        instructions.push_back(std::move(instruction));
                         /// Longest length of full name of time zone is 32.
                         reserve_size += 32;
                         break;
+                    }
                     case 'Z':
                         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for TIMEZONE_OFFSET_ID");
                     default:
+                    {
                         if (isalpha(*cur_token))
                             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for {}", String(cur_token, repetitions));
 
+                        Instruction<T> instruction;
                         std::string_view literal(cur_token, pos - cur_token);
-                        instructions.emplace_back(std::bind_front(&Action<T>::template jodaLiteral<decltype(literal)>, literal));
+                        instruction.setJodaFunc(std::bind_front(&Instruction<T>::template jodaLiteral<decltype(literal)>, literal));
+                        instructions.push_back(std::move(instruction));
                         reserve_size += pos - cur_token;
                         break;
+                    }
                 }
             }
         }
@@ -1430,10 +1735,10 @@ struct NameFromUnixTimeInJodaSyntax
 };
 
 
-using FunctionFormatDateTime = FunctionFormatDateTimeImpl<NameFormatDateTime, FormatDateTimeTraits::SupportInteger::No, FormatDateTimeTraits::FormatSyntax::MySQL>;
-using FunctionFromUnixTimestamp = FunctionFormatDateTimeImpl<NameFromUnixTime, FormatDateTimeTraits::SupportInteger::Yes, FormatDateTimeTraits::FormatSyntax::MySQL>;
-using FunctionFormatDateTimeInJodaSyntax = FunctionFormatDateTimeImpl<NameFormatDateTimeInJodaSyntax, FormatDateTimeTraits::SupportInteger::No, FormatDateTimeTraits::FormatSyntax::Joda>;
-using FunctionFromUnixTimestampInJodaSyntax = FunctionFormatDateTimeImpl<NameFromUnixTimeInJodaSyntax, FormatDateTimeTraits::SupportInteger::Yes, FormatDateTimeTraits::FormatSyntax::Joda>;
+using FunctionFormatDateTime = FunctionFormatDateTimeImpl<NameFormatDateTime, SupportInteger::No, FormatSyntax::MySQL>;
+using FunctionFromUnixTimestamp = FunctionFormatDateTimeImpl<NameFromUnixTime, SupportInteger::Yes, FormatSyntax::MySQL>;
+using FunctionFormatDateTimeInJodaSyntax = FunctionFormatDateTimeImpl<NameFormatDateTimeInJodaSyntax, SupportInteger::No, FormatSyntax::Joda>;
+using FunctionFromUnixTimestampInJodaSyntax = FunctionFormatDateTimeImpl<NameFromUnixTimeInJodaSyntax, SupportInteger::Yes, FormatSyntax::Joda>;
 
 }
 
@@ -1443,7 +1748,7 @@ REGISTER_FUNCTION(FormatDateTime)
     factory.registerAlias("DATE_FORMAT", FunctionFormatDateTime::name);
 
     factory.registerFunction<FunctionFromUnixTimestamp>();
-    factory.registerAlias("FROM_UNIXTIME", "fromUnixTimestamp");
+    factory.registerAlias("FROM_UNIXTIME", FunctionFromUnixTimestamp::name);
 
     factory.registerFunction<FunctionFormatDateTimeInJodaSyntax>();
     factory.registerFunction<FunctionFromUnixTimestampInJodaSyntax>();
diff --git a/src/Functions/formatReadableDecimalSize.cpp b/src/Functions/formatReadableDecimalSize.cpp
index 184b574abdf..b6fd0de8f7b 100644
--- a/src/Functions/formatReadableDecimalSize.cpp
+++ b/src/Functions/formatReadableDecimalSize.cpp
@@ -21,13 +21,13 @@ namespace
 REGISTER_FUNCTION(FormatReadableDecimalSize)
 {
     factory.registerFunction<FunctionFormatReadable<Impl>>(
-    {
-        R"(
+    FunctionDocumentation{
+        .description=R"(
 Accepts the size (number of bytes). Returns a rounded size with a suffix (KB, MB, etc.) as a string.
 )",
-        Documentation::Examples{
-            {"formatReadableDecimalSize", "SELECT formatReadableDecimalSize(1000)"}},
-        Documentation::Categories{"OtherFunctions"}
+        .examples{
+            {"formatReadableDecimalSize", "SELECT formatReadableDecimalSize(1000)", ""}},
+        .categories{"OtherFunctions"}
     },
     FunctionFactory::CaseSensitive);
 }
diff --git a/src/Functions/formatRow.cpp b/src/Functions/formatRow.cpp
index 53fb5d61472..12a5fc2cc27 100644
--- a/src/Functions/formatRow.cpp
+++ b/src/Functions/formatRow.cpp
@@ -35,7 +35,10 @@ class FunctionFormatRow : public IFunction
 public:
     static constexpr auto name = no_newline ? "formatRowNoNewline" : "formatRow";
 
-    FunctionFormatRow(const String & format_name_, ContextPtr context_) : format_name(format_name_), context(context_)
+    FunctionFormatRow(String format_name_, Names arguments_column_names_, ContextPtr context_)
+        : format_name(std::move(format_name_))
+        , arguments_column_names(std::move(arguments_column_names_))
+        , context(std::move(context_))
     {
         if (!FormatFactory::instance().getAllFormats().contains(format_name))
             throw Exception(ErrorCodes::UNKNOWN_FORMAT, "Unknown format {}", format_name);
@@ -55,9 +58,17 @@ public:
         WriteBufferFromVector buffer(vec);
         ColumnString::Offsets & offsets = col_str->getOffsets();
         offsets.resize(input_rows_count);
+
         Block arg_columns;
-        for (auto i = 1u; i < arguments.size(); ++i)
-            arg_columns.insert(arguments[i]);
+
+        size_t arguments_size = arguments.size();
+        for (size_t i = 1; i < arguments_size; ++i)
+        {
+            auto argument_column = arguments[i];
+            argument_column.name = arguments_column_names[i];
+            arg_columns.insert(std::move(argument_column));
+        }
+
         materializeBlockInplace(arg_columns);
         auto format_settings = getFormatSettings(context);
         auto out = FormatFactory::instance().getOutputFormat(format_name, buffer, arg_columns, context, format_settings);
@@ -93,6 +104,7 @@ public:
 
 private:
     String format_name;
+    Names arguments_column_names;
     ContextPtr context;
 };
 
@@ -115,9 +127,14 @@ public:
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
                 "Function {} requires at least two arguments: the format name and its output expression(s)", getName());
 
+        Names arguments_column_names;
+        arguments_column_names.reserve(arguments.size());
+        for (const auto & argument : arguments)
+            arguments_column_names.push_back(argument.name);
+
         if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments.at(0).column.get()))
             return std::make_unique<FunctionToFunctionBaseAdaptor>(
-                std::make_shared<FunctionFormatRow<no_newline>>(name_col->getValue<String>(), context),
+                std::make_shared<FunctionFormatRow<no_newline>>(name_col->getValue<String>(), std::move(arguments_column_names), context),
                 collections::map<DataTypes>(arguments, [](const auto & elem) { return elem.type; }),
                 return_type);
         else
diff --git a/src/Functions/generateULID.cpp b/src/Functions/generateULID.cpp
index a8a2a2174cb..9c5c9403185 100644
--- a/src/Functions/generateULID.cpp
+++ b/src/Functions/generateULID.cpp
@@ -74,17 +74,17 @@ public:
 
 REGISTER_FUNCTION(GenerateULID)
 {
-    factory.registerFunction<FunctionGenerateULID>(
+    factory.registerFunction<FunctionGenerateULID>(FunctionDocumentation
     {
-        R"(
+        .description=R"(
 Generates a Universally Unique Lexicographically Sortable Identifier (ULID).
 This function takes an optional argument, the value of which is discarded to generate different values in case the function is called multiple times.
 The function returns a value of type FixedString(26).
 )",
-        Documentation::Examples{
-            {"ulid", "SELECT generateULID()"},
-            {"multiple", "SELECT generateULID(1), generateULID(2)"}},
-        Documentation::Categories{"ULID"}
+        .examples{
+            {"ulid", "SELECT generateULID()", ""},
+            {"multiple", "SELECT generateULID(1), generateULID(2)", ""}},
+        .categories{"ULID"}
     },
     FunctionFactory::CaseSensitive);
 }
diff --git a/src/Functions/geometryConverters.h b/src/Functions/geometryConverters.h
index 3dbf3763fdc..97162fa9dd0 100644
--- a/src/Functions/geometryConverters.h
+++ b/src/Functions/geometryConverters.h
@@ -18,7 +18,6 @@
 #include <Interpreters/castColumn.h>
 
 #include <cmath>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -86,7 +85,9 @@ struct ColumnToPointsConverter
     }
 };
 
-
+/**
+ * Class which converts Column with type Array(Tuple(Float64, Float64)) to a vector of boost ring type.
+*/
 template <typename Point>
 struct ColumnToRingsConverter
 {
@@ -106,7 +107,9 @@ struct ColumnToRingsConverter
     }
 };
 
-
+/**
+ * Class which converts Column with type Array(Array(Tuple(Float64, Float64))) to a vector of boost polygon type.
+*/
 template <typename Point>
 struct ColumnToPolygonsConverter
 {
@@ -120,6 +123,12 @@ struct ColumnToPolygonsConverter
         for (size_t iter = 0; iter < offsets.size(); ++iter)
         {
             const auto current_array_size = offsets[iter] - prev_offset;
+            if (current_array_size == 0)
+            {
+                answer.emplace_back();
+                continue;
+            }
+
             answer[iter].outer() = std::move(all_rings[prev_offset]);
             answer[iter].inners().reserve(current_array_size);
             for (size_t inner_holes = prev_offset + 1; inner_holes < offsets[iter]; ++inner_holes)
@@ -131,7 +140,9 @@ struct ColumnToPolygonsConverter
     }
 };
 
-
+/**
+ * Class which converts Column with type Array(Array(Array(Tuple(Float64, Float64)))) to a vector of boost multi_polygon type.
+*/
 template <typename Point>
 struct ColumnToMultiPolygonsConverter
 {
@@ -143,7 +154,7 @@ struct ColumnToMultiPolygonsConverter
 
         auto all_polygons = ColumnToPolygonsConverter<Point>::convert(typeid_cast<const ColumnArray &>(*col).getDataPtr());
 
-        for (size_t iter = 0; iter < offsets.size(); ++iter)
+        for (size_t iter = 0; iter < offsets.size() && iter < all_polygons.size(); ++iter)
         {
             for (size_t polygon_iter = prev_offset; polygon_iter < offsets[iter]; ++polygon_iter)
                 answer[iter].emplace_back(std::move(all_polygons[polygon_iter]));
diff --git a/src/Functions/getScalar.cpp b/src/Functions/getScalar.cpp
index 1a26ac5f4da..d72c84b8528 100644
--- a/src/Functions/getScalar.cpp
+++ b/src/Functions/getScalar.cpp
@@ -121,7 +121,12 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
-        return ColumnConst::create(scalar.column, input_rows_count);
+        auto result = ColumnConst::create(scalar.column, input_rows_count);
+
+        if (!isSuitableForConstantFolding())
+            return result->convertToFullColumnIfConst();
+
+        return result;
     }
 
 private:
diff --git a/src/Functions/getSubcolumn.cpp b/src/Functions/getSubcolumn.cpp
new file mode 100644
index 00000000000..f041165385e
--- /dev/null
+++ b/src/Functions/getSubcolumn.cpp
@@ -0,0 +1,67 @@
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_COLUMN;
+}
+
+namespace
+{
+
+class FunctionGetSubcolumn : public IFunction
+{
+public:
+    static constexpr auto name = "getSubcolumn";
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionGetSubcolumn>(); }
+
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 2; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo &) const override { return true; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        auto subcolumn_name = getSubcolumnName(arguments);
+        return arguments[0].type->getSubcolumnType(subcolumn_name);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    {
+        auto subcolumn_name = getSubcolumnName(arguments);
+        return arguments[0].type->getSubcolumn(subcolumn_name, arguments[0].column);
+    }
+
+private:
+    static std::string_view getSubcolumnName(const ColumnsWithTypeAndName & arguments)
+    {
+        const auto * column = arguments[1].column.get();
+        if (!isString(arguments[1].type) || !column || !checkAndGetColumnConstStringOrFixedString(column))
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                "The second argument of function {} should be a constant string with the name of a subcolumn", name);
+
+        return column->getDataAt(0).toView();
+    }
+};
+
+}
+
+REGISTER_FUNCTION(GetSubcolumn)
+{
+    factory.registerFunction<FunctionGetSubcolumn>(FunctionDocumentation{
+        .description=R"(
+Receives the expression or identifier and constant string with the name of subcolumn.
+
+Returns requested subcolumn extracted from the expression.
+)",
+        .examples{{"getSubcolumn", "SELECT getSubcolumn(array_col, 'size0'), getSubcolumn(tuple_col, 'elem_name')", ""}},
+        .categories{"OtherFunctions"}
+    });
+}
+
+}
diff --git a/src/Functions/hasColumnInTable.cpp b/src/Functions/hasColumnInTable.cpp
index 824056a452b..4676b4083b7 100644
--- a/src/Functions/hasColumnInTable.cpp
+++ b/src/Functions/hasColumnInTable.cpp
@@ -130,14 +130,18 @@ ColumnPtr FunctionHasColumnInTable::executeImpl(const ColumnsWithTypeAndName & a
 
         bool treat_local_as_remote = false;
         bool treat_local_port_as_remote = getContext()->getApplicationType() == Context::ApplicationType::LOCAL;
-        auto cluster = std::make_shared<Cluster>(
-            getContext()->getSettings(),
-            host_names,
+        ClusterConnectionParameters params{
             !user_name.empty() ? user_name : "default",
             password,
             getContext()->getTCPPort(),
             treat_local_as_remote,
-            treat_local_port_as_remote);
+            treat_local_port_as_remote,
+            /* secure= */ false,
+            /* priority= */ 1,
+            /* cluster_name= */ "",
+            /* password= */ ""
+        };
+        auto cluster = std::make_shared<Cluster>(getContext()->getSettings(), host_names, params);
 
         // FIXME this (probably) needs a non-constant access to query context,
         // because it might initialized a storage. Ideally, the tables required
diff --git a/src/Functions/hasToken.cpp b/src/Functions/hasToken.cpp
index ba1ff9b3ab5..de67e80e752 100644
--- a/src/Functions/hasToken.cpp
+++ b/src/Functions/hasToken.cpp
@@ -1,10 +1,10 @@
-#include "FunctionFactory.h"
-#include "FunctionsStringSearch.h"
-#include "HasTokenImpl.h"
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsStringSearch.h>
+#include <Functions/HasTokenImpl.h>
 
 #include <Common/Volnitsky.h>
 
-namespace
+namespace DB
 {
 struct NameHasToken
 {
@@ -19,14 +19,15 @@ struct NameHasTokenOrNull
 using FunctionHasToken = DB::FunctionsStringSearch<DB::HasTokenImpl<NameHasToken, DB::VolnitskyCaseSensitiveToken, false>>;
 using FunctionHasTokenOrNull = DB::
     FunctionsStringSearch<DB::HasTokenImpl<NameHasTokenOrNull, DB::VolnitskyCaseSensitiveToken, false>, DB::ExecutionErrorPolicy::Null>;
-}
 
 REGISTER_FUNCTION(HasToken)
 {
-    factory.registerFunction<FunctionHasToken>(
-        {"Performs lookup of needle in haystack using tokenbf_v1 index."}, DB::FunctionFactory::CaseSensitive);
+    factory.registerFunction<FunctionHasToken>(FunctionDocumentation
+        {.description="Performs lookup of needle in haystack using tokenbf_v1 index."}, DB::FunctionFactory::CaseSensitive);
 
-    factory.registerFunction<FunctionHasTokenOrNull>(
-        {"Performs lookup of needle in haystack using tokenbf_v1 index. Returns null if needle is ill-formed."},
+    factory.registerFunction<FunctionHasTokenOrNull>(FunctionDocumentation
+        {.description="Performs lookup of needle in haystack using tokenbf_v1 index. Returns null if needle is ill-formed."},
         DB::FunctionFactory::CaseSensitive);
 }
+
+}
diff --git a/src/Functions/hasTokenCaseInsensitive.cpp b/src/Functions/hasTokenCaseInsensitive.cpp
index 4fc19ca0784..a6e8ecf3e9d 100644
--- a/src/Functions/hasTokenCaseInsensitive.cpp
+++ b/src/Functions/hasTokenCaseInsensitive.cpp
@@ -1,10 +1,10 @@
-#include "FunctionFactory.h"
-#include "FunctionsStringSearch.h"
-#include "HasTokenImpl.h"
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsStringSearch.h>
+#include <Functions/HasTokenImpl.h>
 
 #include <Common/Volnitsky.h>
 
-namespace
+namespace DB
 {
 struct NameHasTokenCaseInsensitive
 {
@@ -21,14 +21,16 @@ using FunctionHasTokenCaseInsensitive
 using FunctionHasTokenCaseInsensitiveOrNull = DB::FunctionsStringSearch<
     DB::HasTokenImpl<NameHasTokenCaseInsensitiveOrNull, DB::VolnitskyCaseInsensitiveToken, false>,
     DB::ExecutionErrorPolicy::Null>;
-}
 
 REGISTER_FUNCTION(HasTokenCaseInsensitive)
 {
     factory.registerFunction<FunctionHasTokenCaseInsensitive>(
-        {"Performs case insensitive lookup of needle in haystack using tokenbf_v1 index."}, DB::FunctionFactory::CaseInsensitive);
+        FunctionDocumentation{.description="Performs case insensitive lookup of needle in haystack using tokenbf_v1 index."},
+        DB::FunctionFactory::CaseInsensitive);
 
     factory.registerFunction<FunctionHasTokenCaseInsensitiveOrNull>(
-        {"Performs case insensitive lookup of needle in haystack using tokenbf_v1 index. Returns null if needle is ill-formed."},
+        FunctionDocumentation{.description="Performs case insensitive lookup of needle in haystack using tokenbf_v1 index. Returns null if needle is ill-formed."},
         DB::FunctionFactory::CaseInsensitive);
 }
+
+}
diff --git a/src/Functions/identity.cpp b/src/Functions/identity.cpp
index 8a29eafca52..7174f1fd318 100644
--- a/src/Functions/identity.cpp
+++ b/src/Functions/identity.cpp
@@ -1,38 +1,8 @@
-#include <Functions/IFunction.h>
+#include <Functions/identity.h>
 #include <Functions/FunctionFactory.h>
 
-
 namespace DB
 {
-namespace
-{
-
-class FunctionIdentity : public IFunction
-{
-public:
-    static constexpr auto name = "identity";
-    static FunctionPtr create(ContextPtr)
-    {
-        return std::make_shared<FunctionIdentity>();
-    }
-
-    String getName() const override { return name; }
-    size_t getNumberOfArguments() const override { return 1; }
-    bool isSuitableForConstantFolding() const override { return false; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
-    {
-        return arguments.front();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
-    {
-        return arguments.front().column;
-    }
-};
-
-}
 
 REGISTER_FUNCTION(Identity)
 {
diff --git a/src/Functions/identity.h b/src/Functions/identity.h
new file mode 100644
index 00000000000..efee95841f5
--- /dev/null
+++ b/src/Functions/identity.h
@@ -0,0 +1,31 @@
+#pragma once
+#include <Functions/IFunction.h>
+#include <Interpreters/Context_fwd.h>
+
+
+namespace DB
+{
+
+class FunctionIdentity : public IFunction
+{
+public:
+    static constexpr auto name = "identity";
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIdentity>(); }
+
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 1; }
+    bool isSuitableForConstantFolding() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        return arguments.front();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    {
+        return arguments.front().column;
+    }
+};
+
+}
diff --git a/src/Functions/in.cpp b/src/Functions/in.cpp
index 53dc25b55af..7a41ae2e3ea 100644
--- a/src/Functions/in.cpp
+++ b/src/Functions/in.cpp
@@ -123,6 +123,9 @@ public:
         }
 
         auto set = column_set->getData();
+        if (!set)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Not-ready Set passed as the second argument for function '{}'", getName());
+
         auto set_types = set->getDataTypes();
 
         if (tuple && set_types.size() != 1 && set_types.size() == tuple->tupleSize())
diff --git a/src/Functions/intDiv.cpp b/src/Functions/intDiv.cpp
index 1c69ec50a7a..38939556fa5 100644
--- a/src/Functions/intDiv.cpp
+++ b/src/Functions/intDiv.cpp
@@ -55,9 +55,6 @@ struct DivideIntegralByConstantImpl
 
     static void NO_INLINE NO_SANITIZE_UNDEFINED vectorConstant(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
     {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-compare"
-
         /// Division by -1. By the way, we avoid FPE by division of the largest negative number by -1.
         if (unlikely(is_signed_v<B> && b == -1))
         {
@@ -75,8 +72,6 @@ struct DivideIntegralByConstantImpl
             return;
         }
 
-#pragma GCC diagnostic pop
-
         if (unlikely(static_cast<A>(b) == 0))
             throw Exception(ErrorCodes::ILLEGAL_DIVISION, "Division by zero");
 
diff --git a/src/Functions/intExp10.cpp b/src/Functions/intExp10.cpp
index 909afc4df17..6944c4701bc 100644
--- a/src/Functions/intExp10.cpp
+++ b/src/Functions/intExp10.cpp
@@ -17,8 +17,7 @@ template <typename A>
 struct IntExp10Impl
 {
     using ResultType = UInt64;
-    static constexpr const bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr const bool allow_string_or_fixed_string = false;
 
     static inline ResultType apply([[maybe_unused]] A a)
     {
diff --git a/src/Functions/intExp2.cpp b/src/Functions/intExp2.cpp
index 7d04f329e3f..4e5cc60a731 100644
--- a/src/Functions/intExp2.cpp
+++ b/src/Functions/intExp2.cpp
@@ -18,8 +18,7 @@ template <typename A>
 struct IntExp2Impl
 {
     using ResultType = UInt64;
-    static constexpr const bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr bool allow_string_or_fixed_string = false;
 
     static inline ResultType apply([[maybe_unused]] A a)
     {
diff --git a/src/Functions/keyvaluepair/ArgumentExtractor.cpp b/src/Functions/keyvaluepair/ArgumentExtractor.cpp
new file mode 100644
index 00000000000..39af80cb561
--- /dev/null
+++ b/src/Functions/keyvaluepair/ArgumentExtractor.cpp
@@ -0,0 +1,130 @@
+#include <Functions/keyvaluepair/ArgumentExtractor.h>
+
+#include <Functions/FunctionHelpers.h>
+
+#include <DataTypes/DataTypeString.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+    auto popFrontAndGet(auto & container)
+    {
+        auto element = container.front();
+        container.pop_front();
+        return element;
+    }
+}
+
+ArgumentExtractor::ParsedArguments ArgumentExtractor::extract(const ColumnsWithTypeAndName & arguments)
+{
+    return extract(ColumnsWithTypeAndNameList{arguments.begin(), arguments.end()});
+}
+
+ArgumentExtractor::ParsedArguments ArgumentExtractor::extract(ColumnsWithTypeAndNameList arguments)
+{
+    static constexpr auto MAX_NUMBER_OF_ARGUMENTS = 4u;
+
+    if (arguments.empty() || arguments.size() > MAX_NUMBER_OF_ARGUMENTS)
+    {
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                        "Function extractKeyValuePairs requires at least 1 argument and at most {}. {} was provided",
+                        MAX_NUMBER_OF_ARGUMENTS, arguments.size());
+    }
+
+    auto data_column = extractStringColumn(popFrontAndGet(arguments), "data_column");
+
+    if (arguments.empty())
+    {
+        return ParsedArguments{data_column};
+    }
+
+    auto key_value_delimiter = extractSingleCharacter(popFrontAndGet(arguments), "key_value_delimiter");
+
+    if (arguments.empty())
+    {
+        return ParsedArguments {data_column, key_value_delimiter};
+    }
+
+    auto pair_delimiters = extractVector(popFrontAndGet(arguments), "pair_delimiters");
+
+    if (arguments.empty())
+    {
+        return ParsedArguments {
+            data_column, key_value_delimiter, pair_delimiters
+        };
+    }
+
+    auto quoting_character = extractSingleCharacter(popFrontAndGet(arguments), "quoting_character");
+
+    return ParsedArguments {
+        data_column,
+        key_value_delimiter,
+        pair_delimiters,
+        quoting_character,
+    };
+}
+
+ArgumentExtractor::CharArgument ArgumentExtractor::extractSingleCharacter(const ColumnWithTypeAndName & argument, const std::string & parameter_name)
+{
+    const auto type = argument.type;
+    const auto column = argument.column;
+
+    validateColumnType(type, parameter_name);
+
+    auto view = column->getDataAt(0).toView();
+
+    if (view.empty())
+    {
+        return {};
+    }
+    else if (view.size() == 1u)
+    {
+        return view.front();
+    }
+
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Control character argument must either be empty or contain exactly 1 character");
+}
+
+ColumnPtr ArgumentExtractor::extractStringColumn(const ColumnWithTypeAndName & argument, const std::string & parameter_name)
+{
+    auto type = argument.type;
+    auto column = argument.column;
+
+    validateColumnType(type, parameter_name);
+
+    return column;
+}
+
+ArgumentExtractor::VectorArgument ArgumentExtractor::extractVector(const ColumnWithTypeAndName & argument, const std::string & parameter_name)
+{
+    const auto type = argument.type;
+    const auto column = argument.column;
+
+    validateColumnType(type, parameter_name);
+
+    auto view = column->getDataAt(0).toView();
+
+    return {view.begin(), view.end()};
+}
+
+void ArgumentExtractor::validateColumnType(DataTypePtr type, const std::string & parameter_name)
+{
+    if (!isStringOrFixedString(type))
+    {
+        throw Exception(
+            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+            "Illegal type {} of argument {}. Must be String.",
+            type, parameter_name);
+    }
+}
+
+}
diff --git a/src/Functions/keyvaluepair/ArgumentExtractor.h b/src/Functions/keyvaluepair/ArgumentExtractor.h
new file mode 100644
index 00000000000..e6538584d01
--- /dev/null
+++ b/src/Functions/keyvaluepair/ArgumentExtractor.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <Columns/IColumn.h>
+#include <Columns/ColumnsNumber.h>
+#include <Core/ColumnsWithTypeAndName.h>
+
+#include <optional>
+
+namespace DB
+{
+
+/*
+ * Validate (API level validation, no business logic validation) and extracts input arguments from
+ * `ColumnsWithTypeAndName` into ArgumentExtractor::ParsedArguments.
+ * */
+class ArgumentExtractor
+{
+public:
+    using CharArgument = std::optional<char>;
+    using VectorArgument = std::vector<char>;
+    using ColumnsWithTypeAndNameList = std::list<ColumnWithTypeAndName>;
+
+    struct ParsedArguments
+    {
+        ColumnPtr data_column;
+
+        CharArgument key_value_delimiter = {};
+        VectorArgument pair_delimiters = {};
+        CharArgument quoting_character = {};
+    };
+
+
+    static ParsedArguments extract(const ColumnsWithTypeAndName & arguments);
+    static ParsedArguments extract(ColumnsWithTypeAndNameList arguments);
+
+private:
+    static CharArgument extractSingleCharacter(const ColumnWithTypeAndName & arguments, const std::string & parameter_name);
+    static ColumnPtr extractStringColumn(const ColumnWithTypeAndName & arguments, const std::string & parameter_name);
+    static VectorArgument extractVector(const ColumnWithTypeAndName & arguments, const std::string & parameter_name);
+
+    static void validateColumnType(DataTypePtr type, const std::string & parameter_name);
+};
+
+}
diff --git a/src/Functions/keyvaluepair/CMakeLists.txt b/src/Functions/keyvaluepair/CMakeLists.txt
new file mode 100644
index 00000000000..eeac4ce11d4
--- /dev/null
+++ b/src/Functions/keyvaluepair/CMakeLists.txt
@@ -0,0 +1,7 @@
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
+add_headers_and_sources(clickhouse_functions_extractkeyvaluepairs .)
+add_headers_and_sources(clickhouse_functions_extractkeyvaluepairs impl)
+
+add_library(clickhouse_functions_extractkeyvaluepairs ${clickhouse_functions_extractkeyvaluepairs_sources} ${clickhouse_functions_extractkeyvaluepairs_headers})
+
+target_link_libraries(clickhouse_functions_extractkeyvaluepairs PRIVATE dbms)
diff --git a/src/Functions/keyvaluepair/extractKeyValuePairs.cpp b/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
new file mode 100644
index 00000000000..34081cddb92
--- /dev/null
+++ b/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
@@ -0,0 +1,247 @@
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnMap.h>
+
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeString.h>
+
+#include <Interpreters/Context.h>
+
+#include <Functions/keyvaluepair/impl/KeyValuePairExtractor.h>
+#include <Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h>
+#include <Functions/keyvaluepair/ArgumentExtractor.h>
+
+namespace DB
+{
+
+template <typename Name, bool WITH_ESCAPING>
+class ExtractKeyValuePairs : public IFunction
+{
+    auto getExtractor(const ArgumentExtractor::ParsedArguments & parsed_arguments) const
+    {
+        auto builder = KeyValuePairExtractorBuilder();
+
+        if constexpr (WITH_ESCAPING)
+        {
+            builder.withEscaping();
+        }
+
+        if (parsed_arguments.key_value_delimiter)
+        {
+            builder.withKeyValueDelimiter(parsed_arguments.key_value_delimiter.value());
+        }
+
+        if (!parsed_arguments.pair_delimiters.empty())
+        {
+            builder.withItemDelimiters(parsed_arguments.pair_delimiters);
+        }
+
+        if (parsed_arguments.quoting_character)
+        {
+            builder.withQuotingCharacter(parsed_arguments.quoting_character.value());
+        }
+
+        bool is_number_of_pairs_unlimited = context->getSettingsRef().extract_kvp_max_pairs_per_row == 0;
+
+        if (!is_number_of_pairs_unlimited)
+        {
+            builder.withMaxNumberOfPairs(context->getSettingsRef().extract_kvp_max_pairs_per_row);
+        }
+
+        return builder.build();
+    }
+
+    ColumnPtr extract(ColumnPtr data_column, std::shared_ptr<KeyValuePairExtractor> extractor) const
+    {
+        auto offsets = ColumnUInt64::create();
+
+        auto keys = ColumnString::create();
+        auto values = ColumnString::create();
+
+        uint64_t offset = 0u;
+
+        for (auto i = 0u; i < data_column->size(); i++)
+        {
+            auto row = data_column->getDataAt(i).toView();
+
+            auto pairs_count = extractor->extract(row, keys, values);
+
+            offset += pairs_count;
+
+            offsets->insert(offset);
+        }
+
+        keys->validate();
+        values->validate();
+
+        ColumnPtr keys_ptr = std::move(keys);
+
+        return ColumnMap::create(keys_ptr, std::move(values), std::move(offsets));
+    }
+
+public:
+    explicit ExtractKeyValuePairs(ContextPtr context_) : context(context_) {}
+
+    static constexpr auto name = Name::name;
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    static FunctionPtr create(ContextPtr context)
+    {
+        return std::make_shared<ExtractKeyValuePairs>(context);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    {
+        auto parsed_arguments = ArgumentExtractor::extract(arguments);
+
+        auto extractor = getExtractor(parsed_arguments);
+
+        return extract(parsed_arguments.data_column, extractor);
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        return std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeString>());
+    }
+
+    bool isVariadic() const override
+    {
+        return true;
+    }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo &) const override
+    {
+        return false;
+    }
+
+    std::size_t getNumberOfArguments() const override
+    {
+        return 0u;
+    }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override
+    {
+        return {1, 2, 3, 4};
+    }
+
+private:
+    ContextPtr context;
+};
+
+struct NameExtractKeyValuePairs
+{
+    static constexpr auto name = "extractKeyValuePairs";
+};
+
+struct NameExtractKeyValuePairsWithEscaping
+{
+    static constexpr auto name = "extractKeyValuePairsWithEscaping";
+};
+
+REGISTER_FUNCTION(ExtractKeyValuePairs)
+{
+    factory.registerFunction<ExtractKeyValuePairs<NameExtractKeyValuePairs, false>>(
+        FunctionDocumentation{
+            .description=R"(Extracts key-value pairs from any string. The string does not need to be 100% structured in a key value pair format;
+
+            It can contain noise (e.g. log files). The key-value pair format to be interpreted should be specified via function arguments.
+
+            A key-value pair consists of a key followed by a `key_value_delimiter` and a value. Quoted keys and values are also supported. Key value pairs must be separated by pair delimiters.
+
+            **Syntax**
+            ``` sql
+            extractKeyValuePairs(data, [key_value_delimiter], [pair_delimiter], [quoting_character])
+            ```
+
+            **Arguments**
+            - `data` - String to extract key-value pairs from. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+            - `key_value_delimiter` - Character to be used as delimiter between the key and the value. Defaults to `:`. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+            - `pair_delimiters` - Set of character to be used as delimiters between pairs. Defaults to `\space`, `,` and `;`. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+            - `quoting_character` - Character to be used as quoting character. Defaults to `"`. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+
+            **Returned values**
+            - The extracted key-value pairs in a Map(String, String).
+
+            **Examples**
+
+            Query:
+
+            **Simple case**
+            ``` sql
+            arthur :) select extractKeyValuePairs('name:neymar, age:31 team:psg,nationality:brazil') as kv
+
+            SELECT extractKeyValuePairs('name:neymar, age:31 team:psg,nationality:brazil') as kv
+
+            Query id: f9e0ca6f-3178-4ee2-aa2c-a5517abb9cee
+
+            ┌─kv──────────────────────────────────────────────────────────────────────┐
+            │ {'name':'neymar','age':'31','team':'psg','nationality':'brazil'}        │
+            └─────────────────────────────────────────────────────────────────────────┘
+            ```
+
+            **Single quote as quoting character**
+            ``` sql
+            arthur :) select extractKeyValuePairs('name:\'neymar\';\'age\':31;team:psg;nationality:brazil,last_key:last_value', ':', ';,', '\'') as kv
+
+            SELECT extractKeyValuePairs('name:\'neymar\';\'age\':31;team:psg;nationality:brazil,last_key:last_value', ':', ';,', '\'') as kv
+
+            Query id: 0e22bf6b-9844-414a-99dc-32bf647abd5e
+
+            ┌─kv───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+            │ {'name':'neymar','age':'31','team':'psg','nationality':'brazil','last_key':'last_value'}                                 │
+            └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+            ```
+
+            **Escape sequences without escape sequences support**
+            ``` sql
+            arthur :) select extractKeyValuePairs('age:a\\x0A\\n\\0') as kv
+
+            SELECT extractKeyValuePairs('age:a\\x0A\\n\\0') AS kv
+
+            Query id: e9fd26ee-b41f-4a11-b17f-25af6fd5d356
+
+            ┌─kv────────────────────┐
+            │ {'age':'a\\x0A\\n\\0'} │
+            └───────────────────────┘
+            ```)"}
+    );
+
+    factory.registerFunction<ExtractKeyValuePairs<NameExtractKeyValuePairsWithEscaping, true>>(
+        FunctionDocumentation{
+            .description=R"(Same as `extractKeyValuePairs` but with escaping support.
+
+            Escape sequences supported: `\x`, `\N`, `\a`, `\b`, `\e`, `\f`, `\n`, `\r`, `\t`, `\v` and `\0`.
+            Non standard escape sequences are returned as it is (including the backslash) unless they are one of the following:
+            `\\`, `'`, `"`, `backtick`, `/`, `=` or ASCII control characters (c <= 31).
+
+            This function will satisfy the use case where pre-escaping and post-escaping are not suitable. For instance, consider the following
+            input string: `a: "aaaa\"bbb"`. The expected output is: `a: aaaa\"bbbb`.
+            - Pre-escaping: Pre-escaping it will output: `a: "aaaa"bbb"` and `extractKeyValuePairs` will then output: `a: aaaa`
+            - Post-escaping: `extractKeyValuePairs` will output `a: aaaa\` and post-escaping will keep it as it is.
+
+            Leading escape sequences will be skipped in keys and will be considered invalid for values.
+
+            **Escape sequences with escape sequence support turned on**
+            ``` sql
+            arthur :) select extractKeyValuePairsWithEscaping('age:a\\x0A\\n\\0') as kv
+
+            SELECT extractKeyValuePairsWithEscaping('age:a\\x0A\\n\\0') AS kv
+
+            Query id: 44c114f0-5658-4c75-ab87-4574de3a1645
+
+            ┌─kv───────────────┐
+            │ {'age':'a\n\n\0'} │
+            └──────────────────┘
+            ```)"}
+    );
+    factory.registerAlias("str_to_map", NameExtractKeyValuePairs::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("mapFromString", NameExtractKeyValuePairs::name);
+}
+
+}
diff --git a/src/Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h b/src/Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h
new file mode 100644
index 00000000000..3895cf3e77d
--- /dev/null
+++ b/src/Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h
@@ -0,0 +1,140 @@
+#pragma once
+
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+
+#include <Functions/keyvaluepair/impl/StateHandler.h>
+#include <Functions/keyvaluepair/impl/KeyValuePairExtractor.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int LIMIT_EXCEEDED;
+}
+
+/*
+ * Handle state transitions and a few states like `FLUSH_PAIR` and `END`.
+ * */
+template <typename StateHandler>
+class CHKeyValuePairExtractor : public KeyValuePairExtractor
+{
+    using State = typename DB::extractKV::StateHandler::State;
+    using NextState = DB::extractKV::StateHandler::NextState;
+
+public:
+    explicit CHKeyValuePairExtractor(StateHandler state_handler_, uint64_t max_number_of_pairs_)
+        : state_handler(std::move(state_handler_)), max_number_of_pairs(max_number_of_pairs_)
+    {}
+
+    uint64_t extract(const std::string & data, ColumnString::MutablePtr & keys, ColumnString::MutablePtr & values) override
+    {
+        return extract(std::string_view {data}, keys, values);
+    }
+
+    uint64_t extract(std::string_view data, ColumnString::MutablePtr & keys, ColumnString::MutablePtr & values) override
+    {
+        auto state =  State::WAITING_KEY;
+
+        auto key = typename StateHandler::StringWriter(*keys);
+        auto value = typename StateHandler::StringWriter(*values);
+
+        uint64_t row_offset = 0;
+
+        while (state != State::END)
+        {
+            auto next_state = processState(data, state, key, value, row_offset);
+
+            if (next_state.position_in_string > data.size() && next_state.state != State::END)
+            {
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Attempt to move read pointer past end of available data, from state {} to new state: {}, new position: {}, available data: {}",
+                        magic_enum::enum_name(state), magic_enum::enum_name(next_state.state),
+                        next_state.position_in_string, data.size());
+            }
+
+            data.remove_prefix(next_state.position_in_string);
+            state = next_state.state;
+        }
+
+        // below reset discards invalid keys and values
+        reset(key, value);
+
+        return row_offset;
+    }
+
+private:
+
+    NextState processState(std::string_view file, State state, auto & key, auto & value, uint64_t & row_offset)
+    {
+        switch (state)
+        {
+            case State::WAITING_KEY:
+            {
+                return state_handler.waitKey(file);
+            }
+            case State::READING_KEY:
+            {
+                return state_handler.readKey(file, key);
+            }
+            case State::READING_QUOTED_KEY:
+            {
+                return state_handler.readQuotedKey(file, key);
+            }
+            case State::READING_KV_DELIMITER:
+            {
+                return state_handler.readKeyValueDelimiter(file);
+            }
+            case State::WAITING_VALUE:
+            {
+                return state_handler.waitValue(file);
+            }
+            case State::READING_VALUE:
+            {
+                return state_handler.readValue(file, value);
+            }
+            case State::READING_QUOTED_VALUE:
+            {
+                return state_handler.readQuotedValue(file, value);
+            }
+            case State::FLUSH_PAIR:
+            {
+                return flushPair(file, key, value, row_offset);
+            }
+            case State::END:
+            {
+                return {0, state};
+            }
+        }
+    }
+
+    NextState flushPair(const std::string_view & file, auto & key,
+                        auto & value, uint64_t & row_offset)
+    {
+        row_offset++;
+
+        if (row_offset > max_number_of_pairs)
+        {
+            throw Exception(ErrorCodes::LIMIT_EXCEEDED, "Number of pairs produced exceeded the limit of {}", max_number_of_pairs);
+        }
+
+        key.commit();
+        value.commit();
+
+        return {0, file.empty() ? State::END : State::WAITING_KEY};
+    }
+
+    void reset(auto & key, auto & value)
+    {
+        key.reset();
+        value.reset();
+    }
+
+    StateHandler state_handler;
+    uint64_t max_number_of_pairs;
+};
+
+}
diff --git a/src/Functions/keyvaluepair/impl/CMakeLists.txt b/src/Functions/keyvaluepair/impl/CMakeLists.txt
new file mode 100644
index 00000000000..c61fb520fcd
--- /dev/null
+++ b/src/Functions/keyvaluepair/impl/CMakeLists.txt
@@ -0,0 +1,7 @@
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
+add_headers_and_sources(clickhouse_functions_extractkeyvaluepairs_core .)
+add_headers_and_sources(clickhouse_functions_extractkeyvaluepairs_core impl)
+
+add_library(clickhouse_functions_extractkeyvaluepairs_core ${clickhouse_functions_extractkeyvaluepairs_core_sources} ${clickhouse_functions_extractkeyvaluepairs_core_headers})
+
+target_link_libraries(clickhouse_functions_extractkeyvaluepairs_core PRIVATE dbms)
diff --git a/src/Functions/keyvaluepair/impl/Configuration.cpp b/src/Functions/keyvaluepair/impl/Configuration.cpp
new file mode 100644
index 00000000000..1b7f4774158
--- /dev/null
+++ b/src/Functions/keyvaluepair/impl/Configuration.cpp
@@ -0,0 +1,83 @@
+#include <Functions/keyvaluepair/impl/Configuration.h>
+
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+namespace extractKV
+{
+
+Configuration::Configuration(char key_value_delimiter_, char quoting_character_, std::vector<char> pair_delimiters_)
+    : key_value_delimiter(key_value_delimiter_), quoting_character(quoting_character_), pair_delimiters(std::move(pair_delimiters_))
+{
+}
+
+Configuration ConfigurationFactory::createWithoutEscaping(char key_value_delimiter, char quoting_character, std::vector<char> pair_delimiters)
+{
+    validate(key_value_delimiter, quoting_character, pair_delimiters);
+
+    return Configuration(key_value_delimiter, quoting_character, pair_delimiters);
+}
+
+Configuration ConfigurationFactory::createWithEscaping(char key_value_delimiter, char quoting_character, std::vector<char> pair_delimiters)
+{
+    static constexpr char ESCAPE_CHARACTER = '\\';
+
+    if (key_value_delimiter == ESCAPE_CHARACTER
+        || quoting_character == ESCAPE_CHARACTER
+        || std::find(pair_delimiters.begin(), pair_delimiters.end(), ESCAPE_CHARACTER) != pair_delimiters.end())
+    {
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "Invalid arguments, {} is reserved for the escaping character",
+            ESCAPE_CHARACTER);
+    }
+
+    return createWithoutEscaping(key_value_delimiter, quoting_character, pair_delimiters);
+}
+
+void ConfigurationFactory::validate(char key_value_delimiter, char quoting_character, std::vector<char> pair_delimiters)
+{
+    if (key_value_delimiter == quoting_character)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid arguments, key_value_delimiter and quoting_character can not be the same");
+    }
+
+    if (pair_delimiters.size() > MAX_NUMBER_OF_PAIR_DELIMITERS)
+    {
+        // SSE optimizations require needles to contain up to 16 characters. Needles can be a concatenation of multiple parameters, including
+        // quoting_character, key_value_delimiter and pair delimiters. Limiting to 8 to be on the safe side.
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid arguments, pair delimiters can contain at most {} characters", MAX_NUMBER_OF_PAIR_DELIMITERS);
+    }
+
+    if (pair_delimiters.empty())
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid arguments, pair delimiters list is empty");
+    }
+
+    bool is_key_value_delimiter_in_pair_delimiters
+        = std::find(pair_delimiters.begin(), pair_delimiters.end(), key_value_delimiter) != pair_delimiters.end();
+
+    if (is_key_value_delimiter_in_pair_delimiters)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid arguments, key_value_delimiter conflicts with pair delimiters");
+    }
+
+    bool is_quoting_character_in_pair_delimiters
+        = std::find(pair_delimiters.begin(), pair_delimiters.end(), quoting_character) != pair_delimiters.end();
+
+    if (is_quoting_character_in_pair_delimiters)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid arguments, quoting_character conflicts with pair delimiters");
+    }
+}
+
+}
+
+}
diff --git a/src/Functions/keyvaluepair/impl/Configuration.h b/src/Functions/keyvaluepair/impl/Configuration.h
new file mode 100644
index 00000000000..322aa575052
--- /dev/null
+++ b/src/Functions/keyvaluepair/impl/Configuration.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <vector>
+
+namespace DB
+{
+namespace extractKV
+{
+struct ConfigurationFactory;
+
+class Configuration
+{
+    friend struct ConfigurationFactory;
+
+    Configuration(
+        char key_value_delimiter_,
+        char quoting_character_,
+        std::vector<char> pair_delimiters_
+    );
+
+public:
+    const char key_value_delimiter;
+    const char quoting_character;
+    const std::vector<char> pair_delimiters;
+};
+
+/*
+ * Validates (business logic) and creates Configurations for key-value-pair extraction.
+ * */
+struct ConfigurationFactory
+{
+public:
+    static Configuration createWithoutEscaping(char key_value_delimiter, char quoting_character, std::vector<char> pair_delimiters);
+
+    static Configuration createWithEscaping(char key_value_delimiter, char quoting_character, std::vector<char> pair_delimiters);
+
+private:
+    static void validate(char key_value_delimiter, char quoting_character, std::vector<char> pair_delimiters);
+
+    static constexpr auto MAX_NUMBER_OF_PAIR_DELIMITERS = 8u;
+};
+}
+
+}
diff --git a/src/Functions/keyvaluepair/impl/KeyValuePairExtractor.h b/src/Functions/keyvaluepair/impl/KeyValuePairExtractor.h
new file mode 100644
index 00000000000..5fd77ce9a99
--- /dev/null
+++ b/src/Functions/keyvaluepair/impl/KeyValuePairExtractor.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <Columns/ColumnString.h>
+
+#include <string>
+#include <string_view>
+
+namespace DB
+{
+
+struct KeyValuePairExtractor
+{
+    virtual ~KeyValuePairExtractor() = default;
+
+    virtual uint64_t extract(const std::string & data, ColumnString::MutablePtr & keys, ColumnString::MutablePtr & values) = 0;
+
+    virtual uint64_t extract(std::string_view data, ColumnString::MutablePtr & keys, ColumnString::MutablePtr & values) = 0;
+};
+
+}
diff --git a/src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.cpp b/src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.cpp
new file mode 100644
index 00000000000..7f2a6449ab0
--- /dev/null
+++ b/src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.cpp
@@ -0,0 +1,76 @@
+#include <Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h>
+
+#include <Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h>
+#include <Functions/keyvaluepair/impl/Configuration.h>
+#include <Functions/keyvaluepair/impl/StateHandlerImpl.h>
+
+namespace DB
+{
+
+KeyValuePairExtractorBuilder & KeyValuePairExtractorBuilder::withKeyValueDelimiter(char key_value_delimiter_)
+{
+    key_value_delimiter = key_value_delimiter_;
+    return *this;
+}
+
+KeyValuePairExtractorBuilder & KeyValuePairExtractorBuilder::withItemDelimiters(std::vector<char> item_delimiters_)
+{
+    item_delimiters = std::move(item_delimiters_);
+    return *this;
+}
+
+KeyValuePairExtractorBuilder & KeyValuePairExtractorBuilder::withQuotingCharacter(char quoting_character_)
+{
+    quoting_character = quoting_character_;
+    return *this;
+}
+
+KeyValuePairExtractorBuilder & KeyValuePairExtractorBuilder::withEscaping()
+{
+    with_escaping = true;
+    return *this;
+}
+
+KeyValuePairExtractorBuilder & KeyValuePairExtractorBuilder::withMaxNumberOfPairs(uint64_t max_number_of_pairs_)
+{
+    max_number_of_pairs = max_number_of_pairs_;
+    return *this;
+}
+
+std::shared_ptr<KeyValuePairExtractor> KeyValuePairExtractorBuilder::build() const
+{
+    if (with_escaping)
+    {
+        return buildWithEscaping();
+    }
+
+    return buildWithoutEscaping();
+}
+
+namespace
+{
+using namespace extractKV;
+
+template <typename T>
+auto makeStateHandler(const T && handler, uint64_t max_number_of_pairs)
+{
+    return std::make_shared<CHKeyValuePairExtractor<T>>(handler, max_number_of_pairs);
+}
+
+}
+
+std::shared_ptr<KeyValuePairExtractor> KeyValuePairExtractorBuilder::buildWithoutEscaping() const
+{
+    auto configuration = ConfigurationFactory::createWithoutEscaping(key_value_delimiter, quoting_character, item_delimiters);
+
+    return makeStateHandler(NoEscapingStateHandler(configuration), max_number_of_pairs);
+}
+
+std::shared_ptr<KeyValuePairExtractor> KeyValuePairExtractorBuilder::buildWithEscaping() const
+{
+    auto configuration = ConfigurationFactory::createWithEscaping(key_value_delimiter, quoting_character, item_delimiters);
+
+    return makeStateHandler(InlineEscapingStateHandler(configuration), max_number_of_pairs);
+}
+
+}
diff --git a/src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h b/src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h
new file mode 100644
index 00000000000..0c673f12ccf
--- /dev/null
+++ b/src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <memory>
+#include <vector>
+
+namespace DB
+{
+
+struct KeyValuePairExtractor;
+
+class KeyValuePairExtractorBuilder
+{
+public:
+
+    KeyValuePairExtractorBuilder & withKeyValueDelimiter(char key_value_delimiter_);
+
+    KeyValuePairExtractorBuilder & withItemDelimiters(std::vector<char> item_delimiters_);
+
+    KeyValuePairExtractorBuilder & withQuotingCharacter(char quoting_character_);
+
+    KeyValuePairExtractorBuilder & withEscaping();
+
+    KeyValuePairExtractorBuilder & withMaxNumberOfPairs(uint64_t max_number_of_pairs_);
+
+    std::shared_ptr<KeyValuePairExtractor> build() const;
+
+private:
+    bool with_escaping = false;
+    char key_value_delimiter = ':';
+    char quoting_character = '"';
+    std::vector<char> item_delimiters = {' ', ',', ';'};
+    uint64_t max_number_of_pairs = std::numeric_limits<uint64_t>::max();
+
+    std::shared_ptr<KeyValuePairExtractor> buildWithEscaping() const;
+
+    std::shared_ptr<KeyValuePairExtractor> buildWithoutEscaping() const;
+};
+
+}
diff --git a/src/Functions/keyvaluepair/impl/NeedleFactory.h b/src/Functions/keyvaluepair/impl/NeedleFactory.h
new file mode 100644
index 00000000000..b5f0645abcc
--- /dev/null
+++ b/src/Functions/keyvaluepair/impl/NeedleFactory.h
@@ -0,0 +1,99 @@
+#pragma once
+
+#include <Functions/keyvaluepair/impl/Configuration.h>
+#include <base/find_symbols.h>
+
+#include <vector>
+
+namespace DB
+{
+
+namespace extractKV
+{
+
+/*
+ * `StateHandlerImpl` makes use of string search algorithms to find delimiters. This class creates the needles for each state
+ *  based on the contents of `Configuration`.
+ * */
+template <bool WITH_ESCAPING>
+class NeedleFactory
+{
+public:
+    SearchSymbols getWaitNeedles(const Configuration & extractor_configuration)
+    {
+        const auto & [key_value_delimiter, quoting_character, pair_delimiters]
+            = extractor_configuration;
+
+        std::vector<char> needles;
+
+        needles.push_back(key_value_delimiter);
+
+        std::copy(pair_delimiters.begin(), pair_delimiters.end(), std::back_inserter(needles));
+
+        if constexpr (WITH_ESCAPING)
+        {
+            needles.push_back('\\');
+        }
+
+        return SearchSymbols {std::string{needles.data(), needles.size()}};
+    }
+
+    SearchSymbols getReadKeyNeedles(const Configuration & extractor_configuration)
+    {
+        const auto & [key_value_delimiter, quoting_character, pair_delimiters]
+            = extractor_configuration;
+
+        std::vector<char> needles;
+
+        needles.push_back(key_value_delimiter);
+        needles.push_back(quoting_character);
+
+        std::copy(pair_delimiters.begin(), pair_delimiters.end(), std::back_inserter(needles));
+
+        if constexpr (WITH_ESCAPING)
+        {
+            needles.push_back('\\');
+        }
+
+        return SearchSymbols {std::string{needles.data(), needles.size()}};
+    }
+
+    SearchSymbols getReadValueNeedles(const Configuration & extractor_configuration)
+    {
+        const auto & [key_value_delimiter, quoting_character, pair_delimiters]
+            = extractor_configuration;
+
+        std::vector<char> needles;
+
+        needles.push_back(quoting_character);
+
+        std::copy(pair_delimiters.begin(), pair_delimiters.end(), std::back_inserter(needles));
+
+        if constexpr (WITH_ESCAPING)
+        {
+            needles.push_back('\\');
+        }
+
+        return SearchSymbols {std::string{needles.data(), needles.size()}};
+    }
+
+    SearchSymbols getReadQuotedNeedles(const Configuration & extractor_configuration)
+    {
+        const auto quoting_character = extractor_configuration.quoting_character;
+
+        std::vector<char> needles;
+
+        needles.push_back(quoting_character);
+
+        if constexpr (WITH_ESCAPING)
+        {
+            needles.push_back('\\');
+        }
+
+        return SearchSymbols {std::string{needles.data(), needles.size()}};
+    }
+};
+
+}
+
+}
diff --git a/src/Functions/keyvaluepair/impl/StateHandler.h b/src/Functions/keyvaluepair/impl/StateHandler.h
new file mode 100644
index 00000000000..27c1a0b44be
--- /dev/null
+++ b/src/Functions/keyvaluepair/impl/StateHandler.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <string_view>
+
+#include <iostream>
+
+namespace DB
+{
+
+namespace extractKV
+{
+
+class StateHandler
+{
+public:
+    enum State
+    {
+        // Skip characters until it finds a valid first key character. Might jump to READING_KEY, READING_QUOTED_KEY or END.
+        WAITING_KEY,
+        // Tries to read a key. Might jump to WAITING_KEY, WAITING_VALUE or END.
+        READING_KEY,
+        // Tries to read a quoted key. Might jump to WAITING_KEY, READING_KV_DELIMITER or END.
+        READING_QUOTED_KEY,
+        // Tries to read the key value pair delimiter. Might jump to WAITING_KEY, WAITING_VALUE or END.
+        READING_KV_DELIMITER,
+        // Skip characters until it finds a valid first value character. Might jump to READING_QUOTED_VALUE or READING_VALUE.
+        WAITING_VALUE,
+        // Tries to read a value. Jumps to FLUSH_PAIR.
+        READING_VALUE,
+        // Tries to read a quoted value. Might jump to FLUSH_PAIR or END.
+        READING_QUOTED_VALUE,
+        // In this state, both key and value have already been collected and should be flushed. Might jump to WAITING_KEY or END.
+        FLUSH_PAIR,
+        END
+    };
+
+    struct NextState
+    {
+        std::size_t position_in_string;
+        State state;
+    };
+
+    StateHandler() = default;
+    StateHandler(const StateHandler &) = default;
+
+    virtual ~StateHandler() = default;
+};
+
+}
+
+}
diff --git a/src/Functions/keyvaluepair/impl/StateHandlerImpl.h b/src/Functions/keyvaluepair/impl/StateHandlerImpl.h
new file mode 100644
index 00000000000..7fc3ba54833
--- /dev/null
+++ b/src/Functions/keyvaluepair/impl/StateHandlerImpl.h
@@ -0,0 +1,470 @@
+#pragma once
+
+#include <Functions/keyvaluepair/impl/Configuration.h>
+#include <Functions/keyvaluepair/impl/StateHandler.h>
+#include <Functions/keyvaluepair/impl/NeedleFactory.h>
+
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
+#include <Columns/ColumnString.h>
+#include <base/find_symbols.h>
+
+#include <string_view>
+#include <string>
+#include <vector>
+
+namespace DB
+{
+
+namespace extractKV
+{
+
+
+/*
+ * Handles (almost) all states present in `StateHandler::State`. The description of each state responsibility can be found in
+ * `StateHandler::State`. Advanced & optimized string search algorithms are used to search for control characters and form key value pairs.
+ * Each method returns a `StateHandler::NextState` object which contains the next state itself and the number of characters consumed by the previous state.
+ *
+ * The class is templated with a boolean that controls escaping support. As of now, there are two specializations:
+ * `NoEscapingStateHandler` and `InlineEscapingStateHandler`.
+ * */
+template <bool WITH_ESCAPING>
+class StateHandlerImpl : public StateHandler
+{
+public:
+    explicit StateHandlerImpl(Configuration configuration_)
+        : configuration(std::move(configuration_))
+    {
+        /* SearchNeedles do not change throughout the algorithm. Therefore, they are created only once in the constructor
+         * to avoid unnecessary copies.
+         * */
+        NeedleFactory<WITH_ESCAPING> needle_factory;
+
+        wait_needles = needle_factory.getWaitNeedles(configuration);
+        read_key_needles = needle_factory.getReadKeyNeedles(configuration);
+        read_value_needles = needle_factory.getReadValueNeedles(configuration);
+        read_quoted_needles = needle_factory.getReadQuotedNeedles(configuration);
+    }
+
+    /*
+     * Find first character that is considered a valid key character and proceeds to READING_KEY like states.
+     * */
+    [[nodiscard]] NextState waitKey(std::string_view file) const
+    {
+        if (const auto * p = find_first_not_symbols_or_null(file, wait_needles))
+        {
+            const size_t character_position = p - file.begin();
+            if (isQuotingCharacter(*p))
+            {
+                // +1 to skip quoting character
+                return {character_position + 1u, State::READING_QUOTED_KEY};
+            }
+            else
+            {
+                return {character_position, State::READING_KEY};
+            }
+        }
+
+        return {file.size(), State::END};
+    }
+
+    /*
+     * Find first delimiter of interest (`read_needles`). Valid symbols are either `key_value_delimiter` and `escape_character` if escaping
+     * support is on. If it finds a pair delimiter, it discards the key.
+     * */
+    [[nodiscard]] NextState readKey(std::string_view file, auto & key) const
+    {
+        key.reset();
+
+        size_t pos = 0;
+
+        while (const auto * p = find_first_symbols_or_null({file.begin() + pos, file.end()}, read_key_needles))
+        {
+            auto character_position = p - file.begin();
+            size_t next_pos = character_position + 1u;
+
+            if (WITH_ESCAPING && isEscapeCharacter(*p))
+            {
+                if constexpr (WITH_ESCAPING)
+                {
+                    auto [parsed_successfully, escape_sequence_length] = consumeWithEscapeSequence(file, pos, character_position, key);
+                    next_pos = character_position + escape_sequence_length;
+
+                    if (!parsed_successfully)
+                    {
+                        return {next_pos, State::WAITING_KEY};
+                    }
+                }
+            }
+            else if (isKeyValueDelimiter(*p))
+            {
+                key.append(file.begin() + pos, file.begin() + character_position);
+
+                return {next_pos, State::WAITING_VALUE};
+            }
+            else if (isPairDelimiter(*p))
+            {
+                return {next_pos, State::WAITING_KEY};
+            }
+
+            pos = next_pos;
+        }
+
+        return {file.size(), State::END};
+    }
+
+    /*
+     * Search for closing quoting character and process escape sequences along the way (if escaping support is turned on).
+     * */
+    [[nodiscard]] NextState readQuotedKey(std::string_view file, auto & key) const
+    {
+        key.reset();
+
+        size_t pos = 0;
+
+        while (const auto * p = find_first_symbols_or_null({file.begin() + pos, file.end()}, read_quoted_needles))
+        {
+            size_t character_position = p - file.begin();
+            size_t next_pos = character_position + 1u;
+
+            if (WITH_ESCAPING && isEscapeCharacter(*p))
+            {
+                if constexpr (WITH_ESCAPING)
+                {
+                    auto [parsed_successfully, escape_sequence_length] = consumeWithEscapeSequence(file, pos, character_position, key);
+                    next_pos = character_position + escape_sequence_length;
+
+                    if (!parsed_successfully)
+                    {
+                        return {next_pos, State::WAITING_KEY};
+                    }
+                }
+            }
+            else if (isQuotingCharacter(*p))
+            {
+                key.append(file.begin() + pos, file.begin() + character_position);
+
+                if (key.isEmpty())
+                {
+                    return {next_pos, State::WAITING_KEY};
+                }
+
+                return {next_pos, State::READING_KV_DELIMITER};
+            }
+
+            pos = next_pos;
+        }
+
+        return {file.size(), State::END};
+    }
+
+    /*
+     * Validate expected key-value-delimiter is in place.
+     * */
+    [[nodiscard]] NextState readKeyValueDelimiter(std::string_view file) const
+    {
+        if (!file.empty())
+        {
+            const auto current_character = file[0];
+
+            if (isKeyValueDelimiter(current_character))
+            {
+                return {1, WAITING_VALUE};
+            }
+        }
+
+        return {0, State::WAITING_KEY};
+    }
+
+    /*
+     * Check if next character is a valid value character and jumps to read-like states. Caveat here is that a pair delimiter must also lead to
+     * read-like states because it indicates empty values.
+     * */
+    [[nodiscard]] NextState waitValue(std::string_view file) const
+    {
+        size_t pos = 0;
+
+        if (!file.empty())
+        {
+            const auto current_character = file[pos];
+
+            if (isQuotingCharacter(current_character))
+            {
+                return {pos + 1u, State::READING_QUOTED_VALUE};
+            }
+
+            if constexpr (WITH_ESCAPING)
+            {
+                if (isEscapeCharacter(current_character))
+                {
+                    return {pos, State::WAITING_KEY};
+                }
+            }
+        }
+
+        return {pos, State::READING_VALUE};
+    }
+
+    /*
+     * Finds next delimiter of interest (`read_needles`). Valid symbols are either `pair_delimiter` and `escape_character` if escaping
+     * support is on. If it finds a `key_value_delimiter`, it discards the value.
+     * */
+    [[nodiscard]] NextState readValue(std::string_view file, auto & value) const
+    {
+        value.reset();
+
+        size_t pos = 0;
+
+        while (const auto * p = find_first_symbols_or_null({file.begin() + pos, file.end()}, read_value_needles))
+        {
+            const size_t character_position = p - file.begin();
+            size_t next_pos = character_position + 1u;
+
+            if (WITH_ESCAPING && isEscapeCharacter(*p))
+            {
+                if constexpr (WITH_ESCAPING)
+                {
+                    auto [parsed_successfully, escape_sequence_length] = consumeWithEscapeSequence(file, pos, character_position, value);
+                    next_pos = character_position + escape_sequence_length;
+
+                    if (!parsed_successfully)
+                    {
+                        // Perform best-effort parsing and ignore invalid escape sequences at the end
+                        return {next_pos, State::FLUSH_PAIR};
+                    }
+                }
+            }
+            else if (isPairDelimiter(*p))
+            {
+                value.append(file.begin() + pos, file.begin() + character_position);
+
+                return {next_pos, State::FLUSH_PAIR};
+            }
+
+            pos = next_pos;
+        }
+
+        // Reached end of input, consume rest of the file as value and make sure KV pair is produced.
+        value.append(file.begin() + pos, file.end());
+        return {file.size(), State::FLUSH_PAIR};
+    }
+
+    /*
+     * Search for closing quoting character and process escape sequences along the way (if escaping support is turned on).
+     * */
+    [[nodiscard]] NextState readQuotedValue(std::string_view file, auto & value) const
+    {
+        size_t pos = 0;
+
+        value.reset();
+
+        while (const auto * p = find_first_symbols_or_null({file.begin() + pos, file.end()}, read_quoted_needles))
+        {
+            const size_t character_position = p - file.begin();
+            size_t next_pos = character_position + 1u;
+
+            if (WITH_ESCAPING && isEscapeCharacter(*p))
+            {
+                if constexpr (WITH_ESCAPING)
+                {
+                    auto [parsed_successfully, escape_sequence_length] = consumeWithEscapeSequence(file, pos, character_position, value);
+                    next_pos = character_position + escape_sequence_length;
+
+                    if (!parsed_successfully)
+                    {
+                        return {next_pos, State::WAITING_KEY};
+                    }
+                }
+            }
+            else if (isQuotingCharacter(*p))
+            {
+                value.append(file.begin() + pos, file.begin() + character_position);
+
+                return {next_pos, State::FLUSH_PAIR};
+            }
+
+            pos = next_pos;
+        }
+
+        return {file.size(), State::END};
+    }
+
+    const Configuration configuration;
+
+private:
+    SearchSymbols wait_needles;
+    SearchSymbols read_key_needles;
+    SearchSymbols read_value_needles;
+    SearchSymbols read_quoted_needles;
+
+    /*
+     * Helper method to copy bytes until `character_pos` and process possible escape sequence. Returns a pair containing a boolean
+     * that indicates success and a std::size_t that contains the number of bytes read/ consumed.
+     * */
+    std::pair<bool, std::size_t> consumeWithEscapeSequence(std::string_view file, size_t start_pos, size_t character_pos, auto & output) const
+    {
+        std::string escaped_sequence;
+        DB::ReadBufferFromMemory buf(file.begin() + character_pos, file.size() - character_pos);
+
+        output.append(file.begin() + start_pos, file.begin() + character_pos);
+
+        if (DB::parseComplexEscapeSequence(escaped_sequence, buf))
+        {
+            output.append(escaped_sequence);
+
+            return {true, buf.getPosition()};
+        }
+
+        return {false, buf.getPosition()};
+    }
+
+    bool isKeyValueDelimiter(char character) const
+    {
+        return configuration.key_value_delimiter == character;
+    }
+
+    bool isPairDelimiter(char character) const
+    {
+        const auto & pair_delimiters = configuration.pair_delimiters;
+        return std::find(pair_delimiters.begin(), pair_delimiters.end(), character) != pair_delimiters.end();
+    }
+
+    bool isQuotingCharacter(char character) const
+    {
+        return configuration.quoting_character == character;
+    }
+
+    bool isEscapeCharacter(char character) const
+    {
+        return character == '\\';
+    }
+};
+
+struct NoEscapingStateHandler : public StateHandlerImpl<false>
+{
+    /*
+     * View based StringWriter, no temporary copies are used.
+     * */
+    class StringWriter
+    {
+        ColumnString & col;
+
+        std::string_view element;
+
+    public:
+        explicit StringWriter(ColumnString & col_)
+            : col(col_)
+        {}
+
+        ~StringWriter()
+        {
+            // Make sure that ColumnString invariants are not broken.
+            if (!isEmpty())
+            {
+                reset();
+            }
+        }
+
+        void append(std::string_view new_data)
+        {
+            element = new_data;
+        }
+
+        template <typename T>
+        void append(const T * begin, const T * end)
+        {
+            append({begin, end});
+        }
+
+        void reset()
+        {
+            element = {};
+        }
+
+        bool isEmpty() const
+        {
+            return element.empty();
+        }
+
+        void commit()
+        {
+            col.insertData(element.begin(), element.size());
+            reset();
+        }
+
+        std::string_view uncommittedChunk() const
+        {
+            return element;
+        }
+    };
+
+    template <typename ... Args>
+    NoEscapingStateHandler(Args && ... args)
+    : StateHandlerImpl<false>(std::forward<Args>(args)...) {}
+};
+
+struct InlineEscapingStateHandler : public StateHandlerImpl<true>
+{
+    class StringWriter
+    {
+        ColumnString & col;
+        ColumnString::Chars & chars;
+        UInt64 prev_commit_pos;
+
+    public:
+        explicit StringWriter(ColumnString & col_)
+            : col(col_),
+            chars(col.getChars()),
+            prev_commit_pos(chars.size())
+        {}
+
+        ~StringWriter()
+        {
+            // Make sure that ColumnString invariants are not broken.
+            if (!isEmpty())
+            {
+                reset();
+            }
+        }
+
+        void append(std::string_view new_data)
+        {
+            chars.insert(new_data.begin(), new_data.end());
+        }
+
+        template <typename T>
+        void append(const T * begin, const T * end)
+        {
+            chars.insert(begin, end);
+        }
+
+        void reset()
+        {
+            chars.resize_assume_reserved(prev_commit_pos);
+        }
+
+        bool isEmpty() const
+        {
+            return chars.size() == prev_commit_pos;
+        }
+
+        void commit()
+        {
+            col.insertData(nullptr, 0);
+            prev_commit_pos = chars.size();
+        }
+
+        std::string_view uncommittedChunk() const
+        {
+            return std::string_view(chars.raw_data() + prev_commit_pos, chars.raw_data() + chars.size());
+        }
+    };
+
+    template <typename ... Args>
+    InlineEscapingStateHandler(Args && ... args)
+        : StateHandlerImpl<true>(std::forward<Args>(args)...) {}
+};
+
+}
+
+}
diff --git a/src/Functions/keyvaluepair/tests/gtest_escaping_key_value_pair_extractor.cpp b/src/Functions/keyvaluepair/tests/gtest_escaping_key_value_pair_extractor.cpp
new file mode 100644
index 00000000000..3dd914eb5a0
--- /dev/null
+++ b/src/Functions/keyvaluepair/tests/gtest_escaping_key_value_pair_extractor.cpp
@@ -0,0 +1,40 @@
+#include <Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h>
+#include <Functions/keyvaluepair/impl/KeyValuePairExtractor.h>
+
+#include <Columns/ColumnString.h>
+
+#include <gtest/gtest.h>
+#include <string_view>
+
+namespace DB
+{
+
+void assert_byte_equality(StringRef lhs, const std::vector<uint8_t> & rhs)
+{
+    std::vector<uint8_t> lhs_vector {lhs.data, lhs.data + lhs.size};
+    ASSERT_EQ(lhs_vector, rhs);
+}
+
+TEST(extractKVPairEscapingKeyValuePairExtractor, EscapeSequences)
+{
+    using namespace std::literals;
+
+    auto extractor = KeyValuePairExtractorBuilder().withEscaping().build();
+
+    auto keys = ColumnString::create();
+    auto values = ColumnString::create();
+
+    auto pairs_count = extractor->extract(R"(key1:a\xFF key2:a\n\t\r)"sv, keys, values);
+
+    ASSERT_EQ(pairs_count, 2u);
+    ASSERT_EQ(keys->size(), pairs_count);
+    ASSERT_EQ(keys->size(), values->size());
+
+    ASSERT_EQ(keys->getDataAt(0).toView(), "key1");
+    ASSERT_EQ(keys->getDataAt(1).toView(), "key2");
+
+    assert_byte_equality(values->getDataAt(0), {'a', 0xFF});
+    assert_byte_equality(values->getDataAt(1), {'a', 0xA, 0x9, 0xD});
+}
+
+}
diff --git a/src/Functions/keyvaluepair/tests/gtest_extractKeyValuePairs.cpp b/src/Functions/keyvaluepair/tests/gtest_extractKeyValuePairs.cpp
new file mode 100644
index 00000000000..507d9c0e5c7
--- /dev/null
+++ b/src/Functions/keyvaluepair/tests/gtest_extractKeyValuePairs.cpp
@@ -0,0 +1,178 @@
+#include <Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h>
+#include <Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h>
+
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnMap.h>
+#include <DataTypes/DataTypeFactory.h>
+
+#include <Formats/FormatSettings.h>
+#include <IO/WriteBufferFromString.h>
+
+#include <ostream>
+#include <gtest/gtest.h>
+#include <initializer_list>
+#include <Core/iostream_debug_helpers.h>
+
+namespace
+{
+using namespace DB;
+using namespace std::literals;
+
+// Print as a map with a single row
+auto ToColumnMap(const auto & keys, const auto & values, const ColumnPtr offsets = nullptr)
+{
+    return ColumnMap::create(
+        std::move(keys->clone()),
+        std::move(values->clone()),
+        offsets ? offsets : ColumnUInt64::create(1, keys->size())
+    );
+}
+
+// Print as a map with a single row
+std::string PrintMap(const auto & keys, const auto & values)
+{
+    auto map_column = ToColumnMap(keys, values);
+    auto serialization = DataTypeFactory::instance().get("Map(String, String)")->getSerialization(ISerialization::Kind::DEFAULT);
+
+    WriteBufferFromOwnString buff;
+    serialization->serializeTextJSON(*map_column, 0, buff, FormatSettings{});
+
+    return std::move(buff.str());
+}
+
+template <typename T>
+struct Dump
+{
+    const T & value;
+
+    friend std::ostream & operator<<(std::ostream & ostr, const Dump & d)
+    {
+        return dumpValue(ostr, d.value);
+    }
+};
+
+template <typename T>
+auto print_with_dump(const T & value)
+{
+    return Dump<T>{value};
+}
+
+}
+
+struct KeyValuePairExtractorTestParam
+{
+    KeyValuePairExtractorBuilder builder;
+    std::string input;
+    std::vector<std::pair<std::string, std::string>> expected;
+};
+
+struct extractKVPairKeyValuePairExtractorTest : public ::testing::TestWithParam<KeyValuePairExtractorTestParam>
+{};
+
+TEST_P(extractKVPairKeyValuePairExtractorTest, Match)
+{
+    const auto & [builder, input, expected] = GetParam();
+    SCOPED_TRACE(input);
+
+    auto kv_parser = builder.build();
+    SCOPED_TRACE(typeid(kv_parser).name());
+
+    auto keys = ColumnString::create();
+    auto values = ColumnString::create();
+
+    auto pairs_found = kv_parser->extract(input, keys, values);
+    ASSERT_EQ(expected.size(), pairs_found)
+            << "\texpected: " << print_with_dump(expected) << "\n"
+            << "\tactual  : " << print_with_dump(*ToColumnMap(keys, values));
+
+    size_t i = 0;
+    for (const auto & expected_kv : expected)
+    {
+        EXPECT_EQ(expected_kv.first, keys->getDataAt(i));
+
+        EXPECT_EQ(expected_kv.second, values->getDataAt(i));
+
+        ++i;
+    }
+}
+
+using ExpectedValues = std::vector<std::pair<std::string, std::string>>;
+const ExpectedValues neymar_expected{
+    {"name","neymar"},
+    {"age","31"},
+    {"team","psg"},
+    {"nationality","brazil"},
+    {"last_key","last_value"}
+};
+
+INSTANTIATE_TEST_SUITE_P(Simple, extractKVPairKeyValuePairExtractorTest,
+        ::testing::ValuesIn(std::initializer_list<KeyValuePairExtractorTestParam>
+        {
+            {
+                KeyValuePairExtractorBuilder().withQuotingCharacter('\''),
+                R"in(name:'neymar';'age':31;team:psg;nationality:brazil,last_key:last_value)in",
+                neymar_expected
+            },
+            {
+                // Different escaping char
+                KeyValuePairExtractorBuilder().withQuotingCharacter('"'),
+                R"in(name:"neymar";"age":31;team:psg;nationality:brazil,last_key:last_value)in",
+                neymar_expected
+            },
+            {
+                // same as case 1, but with another handler
+                KeyValuePairExtractorBuilder().withQuotingCharacter('\'').withEscaping(),
+                R"in(name:'neymar';'age':31;team:psg;nationality:brazil,last_key:last_value)in",
+                neymar_expected
+            }
+        }
+    )
+);
+
+// Perform best-effort parsing for invalid escape sequences
+INSTANTIATE_TEST_SUITE_P(InvalidEscapeSeqInValue, extractKVPairKeyValuePairExtractorTest,
+        ::testing::ValuesIn(std::initializer_list<KeyValuePairExtractorTestParam>
+        {
+            {
+                // Special case when invalid seq is the last symbol
+                KeyValuePairExtractorBuilder().withEscaping(),
+                R"in(valid_key:valid_value key:invalid_val\)in",
+                ExpectedValues{
+                    {"valid_key", "valid_value"},
+                    {"key", "invalid_val"}
+                }
+            },
+            // Not handling escape sequences == do not care of broken one, `invalid_val\` must be present
+            {
+                KeyValuePairExtractorBuilder(),
+                R"in(valid_key:valid_value key:invalid_val\ third_key:third_value)in",
+                ExpectedValues{
+                    {"valid_key", "valid_value"},
+                    {"key", "invalid_val\\"},
+                    {"third_key", "third_value"}
+                }
+            },
+            {
+                // Special case when invalid seq is the last symbol
+                KeyValuePairExtractorBuilder(),
+                R"in(valid_key:valid_value key:invalid_val\)in",
+                ExpectedValues{
+                    {"valid_key", "valid_value"},
+                    {"key", "invalid_val\\"}
+                }
+            },
+            {
+                KeyValuePairExtractorBuilder().withQuotingCharacter('"'),
+                R"in(valid_key:valid_value key:"invalid val\ " "third key":"third value")in",
+                ExpectedValues{
+                    {"valid_key", "valid_value"},
+                    {"key", "invalid val\\ "},
+                    {"third key", "third value"},
+                }
+            },
+        }
+    )
+);
+
+
diff --git a/src/Functions/keyvaluepair/tests/gtest_inline_escaping_key_state_handler.cpp b/src/Functions/keyvaluepair/tests/gtest_inline_escaping_key_state_handler.cpp
new file mode 100644
index 00000000000..afffb9f6108
--- /dev/null
+++ b/src/Functions/keyvaluepair/tests/gtest_inline_escaping_key_state_handler.cpp
@@ -0,0 +1,121 @@
+#include <Columns/ColumnString.h>
+#include <Functions/keyvaluepair/impl/StateHandlerImpl.h>
+
+
+#include <Functions/keyvaluepair/impl/StateHandler.h>
+#include <gtest/gtest.h>
+
+namespace
+{
+
+using namespace DB;
+using namespace DB::extractKV;
+
+using State = extractKV::StateHandler::State;
+using NextState = extractKV::StateHandler::NextState;
+
+void test_wait(const auto & handler, std::string_view input, std::size_t expected_pos, State expected_state)
+{
+    auto next_state = handler.waitKey(input);
+
+    ASSERT_EQ(next_state.position_in_string, expected_pos);
+    ASSERT_EQ(next_state.state, expected_state);
+}
+
+template <bool quoted>
+void test_read(const auto & handler, std::string_view input, std::string_view expected_element,
+               std::size_t expected_pos, State expected_state)
+{
+    auto str = ColumnString::create();
+    NextState next_state;
+    InlineEscapingStateHandler::StringWriter element(*str);
+
+    if constexpr (quoted)
+    {
+        next_state = handler.readQuotedKey(input, element);
+    }
+    else
+    {
+        next_state = handler.readKey(input, element);
+    }
+
+    ASSERT_EQ(next_state.position_in_string, expected_pos);
+    ASSERT_EQ(next_state.state, expected_state);
+    ASSERT_EQ(element.uncommittedChunk(), expected_element);
+}
+
+void test_read(const auto & handler, std::string_view input, std::string_view expected_element,
+               std::size_t expected_pos, State expected_state)
+{
+    test_read<false>(handler, input, expected_element, expected_pos, expected_state);
+}
+
+void test_read_quoted(const auto & handler, std::string_view input, std::string_view expected_element,
+               std::size_t expected_pos, State expected_state)
+{
+    test_read<true>(handler, input, expected_element, expected_pos, expected_state);
+}
+
+}
+
+TEST(extractKVPairInlineEscapingKeyStateHandler, Wait)
+{
+    auto pair_delimiters = std::vector<char>{',', ' '};
+
+    auto configuration = ConfigurationFactory::createWithEscaping(':', '"', pair_delimiters);
+
+    StateHandlerImpl<true> handler(configuration);
+
+    test_wait(handler, "name", 0u, State::READING_KEY);
+    test_wait(handler, "\\:name", 2u, State::READING_KEY);
+    test_wait(handler, R"(\\"name)", 3u, State::READING_QUOTED_KEY);
+
+    test_wait(handler, "", 0u, State::END);
+    test_wait(handler, "\\\\", 2u, State::END);
+}
+
+TEST(extractKVPairInlineEscapingKeyStateHandler, Read)
+{
+    auto pair_delimiters = std::vector<char>{',', ' '};
+
+    auto configuration = ConfigurationFactory::createWithEscaping(':', '"', pair_delimiters);
+
+    StateHandlerImpl<true> handler(configuration);
+
+    std::string key_str = "name";
+    std::string key_with_delimiter_str = key_str + ':';
+    std::string key_with_delimiter_and_left_spacing = "  " + key_with_delimiter_str;
+    std::string key_with_delimiter_and_random_characters_str = key_str + ':' + "a$a\\:''\"";
+
+    // no delimiter, should discard
+    test_read(handler, key_str, "", key_str.size(), State::END);
+
+    // valid
+    test_read(handler, key_with_delimiter_str, key_str, key_with_delimiter_str.size(), State::WAITING_VALUE);
+
+    // valid as well
+    test_read(handler, key_with_delimiter_and_random_characters_str, key_str, key_with_delimiter_str.size(), State::WAITING_VALUE);
+
+    test_read(handler, "", "", 0u, State::END);
+}
+
+TEST(extractKVPairInlineEscapingKeyStateHandler, ReadEnclosed)
+{
+    auto pair_delimiters = std::vector<char>{',', ' '};
+
+    auto configuration = ConfigurationFactory::createWithEscaping(':', '"', pair_delimiters);
+
+    StateHandlerImpl<true> handler(configuration);
+
+    std::string regular_key = "name";
+    std::string regular_key_with_end_quote = regular_key + "\"";
+    std::string key_with_special_characters = "name $!@#¨%&*%&%.569-519";
+    std::string key_with_special_characters_with_end_quote = "name $!@#¨%&*%&%.569-519\"";
+
+    std::string key_with_escape_character = regular_key + R"(\n\x4E")";
+
+    test_read_quoted(handler, regular_key, "", regular_key.size(), State::END);
+    test_read_quoted(handler, regular_key_with_end_quote, regular_key, regular_key_with_end_quote.size(), State::READING_KV_DELIMITER);
+    test_read_quoted(handler, key_with_special_characters_with_end_quote, key_with_special_characters, key_with_special_characters_with_end_quote.size(), State::READING_KV_DELIMITER);
+    test_read_quoted(handler, key_with_escape_character, regular_key + "\nN", key_with_escape_character.size(), State::READING_KV_DELIMITER);
+}
diff --git a/src/Functions/keyvaluepair/tests/gtest_inline_escaping_value_state_handler.cpp b/src/Functions/keyvaluepair/tests/gtest_inline_escaping_value_state_handler.cpp
new file mode 100644
index 00000000000..c350f0f1291
--- /dev/null
+++ b/src/Functions/keyvaluepair/tests/gtest_inline_escaping_value_state_handler.cpp
@@ -0,0 +1,34 @@
+#include <Functions/keyvaluepair/impl/StateHandlerImpl.h>
+
+#include <Functions/keyvaluepair/impl/StateHandler.h>
+#include <gtest/gtest.h>
+
+namespace
+{
+
+using namespace DB;
+using namespace DB::extractKV;
+
+using State = extractKV::StateHandler::State;
+using NextState = extractKV::StateHandler::NextState;
+
+
+void test_wait(const auto & handler, std::string_view input, std::size_t expected_pos, State expected_state)
+{
+    auto next_state = handler.waitValue(input);
+
+    ASSERT_EQ(next_state.position_in_string, expected_pos);
+    ASSERT_EQ(next_state.state, expected_state);
+}
+
+}
+
+TEST(extractKVPairInlineEscapingValueStateHandler, Wait)
+{
+    auto pair_delimiters = std::vector<char> {','};
+
+    auto configuration = ConfigurationFactory::createWithEscaping(':', '"', pair_delimiters);
+    StateHandlerImpl<true> handler(configuration);
+
+    test_wait(handler, " los$ yours3lf", 0u, State::READING_VALUE);
+}
diff --git a/src/Functions/keyvaluepair/tests/gtest_no_escaping_key_state_handler.cpp b/src/Functions/keyvaluepair/tests/gtest_no_escaping_key_state_handler.cpp
new file mode 100644
index 00000000000..c849fa56d9f
--- /dev/null
+++ b/src/Functions/keyvaluepair/tests/gtest_no_escaping_key_state_handler.cpp
@@ -0,0 +1,104 @@
+#include <Functions/keyvaluepair/impl/StateHandlerImpl.h>
+#include <Functions/keyvaluepair/impl/Configuration.h>
+
+#include <Columns/ColumnString.h>
+
+#include <gtest/gtest.h>
+
+namespace
+{
+using namespace DB;
+using namespace DB::extractKV;
+
+using State = extractKV::StateHandler::State;
+using NextState = extractKV::StateHandler::NextState;
+
+void test_wait(const auto & handler, std::string_view input, std::size_t expected_pos, State expected_state)
+{
+    auto next_state = handler.waitKey(input);
+
+    ASSERT_EQ(next_state.position_in_string, expected_pos);
+    ASSERT_EQ(next_state.state, expected_state);
+}
+
+template <bool quoted>
+void test_read(const auto & handler, std::string_view input, std::string_view expected_element,
+               std::size_t expected_pos, State expected_state)
+{
+    NextState next_state;
+
+    auto col = ColumnString::create();
+    NoEscapingStateHandler::StringWriter element(*col);
+
+    if constexpr (quoted)
+    {
+        next_state = handler.readQuotedKey(input, element);
+    }
+    else
+    {
+        next_state = handler.readKey(input, element);
+    }
+
+    ASSERT_EQ(next_state.position_in_string, expected_pos);
+    ASSERT_EQ(next_state.state, expected_state);
+    ASSERT_EQ(element.uncommittedChunk(), expected_element);
+}
+
+void test_read(const auto & handler, std::string_view input, std::string_view expected_element,
+               std::size_t expected_pos, State expected_state)
+{
+    test_read<false>(handler, input, expected_element, expected_pos, expected_state);
+}
+
+void test_read_quoted(const auto & handler, std::string_view input, std::string_view expected_element,
+                        std::size_t expected_pos, State expected_state)
+{
+    test_read<true>(handler, input, expected_element, expected_pos, expected_state);
+}
+
+}
+
+TEST(extractKVPairNoEscapingKeyStateHandler, Wait)
+{
+    auto pair_delimiters = std::vector<char>{',', ' ', '$'};
+
+    auto configuration = ConfigurationFactory::createWithEscaping(':', '"', pair_delimiters);
+
+    NoEscapingStateHandler handler(configuration);
+
+    test_wait(handler, "name", 0u, State::READING_KEY);
+    test_wait(handler, "\\:name", 0u, State::READING_KEY);
+    // quoted expected pos is + 1 because as of now it is skipped, maybe I should change it
+    test_wait(handler, "\"name", 1u, State::READING_QUOTED_KEY);
+
+    test_wait(handler, ", $name", 3u, State::READING_KEY);
+    test_wait(handler, ", $\"name", 4u, State::READING_QUOTED_KEY);
+
+    test_wait(handler, "", 0u, State::END);
+}
+
+TEST(extractKVPairNoEscapingKeyStateHandler, Read)
+{
+    auto pair_delimiters = std::vector<char>{',', ' '};
+
+    auto configuration = ConfigurationFactory::createWithEscaping(':', '"', pair_delimiters);
+
+    NoEscapingStateHandler handler(configuration);
+
+    std::string key_str = "name";
+    std::string key_with_delimiter_str = key_str + ':';
+    std::string key_with_delimiter_and_left_spacing = "  " + key_with_delimiter_str;
+    std::string key_with_delimiter_and_random_characters_str = key_str + ':' + "a$a\\:''\"";
+
+    // no delimiter, should discard
+    test_read(handler, key_str, "", key_str.size(), State::END);
+
+    // valid
+    test_read(handler, key_with_delimiter_str, key_str, key_with_delimiter_str.size(), State::WAITING_VALUE);
+
+    // valid as well
+    test_read(handler, key_with_delimiter_and_random_characters_str, key_str, key_with_delimiter_str.size(), State::WAITING_VALUE);
+
+    test_read(handler, "", "", 0u, State::END);
+}
+
diff --git a/src/Functions/makeDate.cpp b/src/Functions/makeDate.cpp
index 7ebca71af13..1e4f3604c94 100644
--- a/src/Functions/makeDate.cpp
+++ b/src/Functions/makeDate.cpp
@@ -1,5 +1,6 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
@@ -20,7 +21,6 @@ namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ARGUMENT_OUT_OF_BOUND;
 }
@@ -28,13 +28,7 @@ namespace ErrorCodes
 namespace
 {
 
-/// A helper function to simplify comparisons of valid YYYY-MM-DD values for <,>,=
-inline constexpr Int64 YearMonthDayToSingleInt(Int64 year, Int64 month, Int64 day)
-{
-    return year * 512 + month * 32 + day;
-}
-
-/// Common logic to handle numeric arguments like year, month, day, hour, minute, second
+/// Functions common to makeDate, makeDate32, makeDateTime, makeDateTime64
 class FunctionWithNumericParamsBase : public IFunction
 {
 public:
@@ -49,36 +43,23 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isVariadic() const override { return true; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+
 protected:
-    template <class AgrumentNames>
-    void checkRequiredArguments(const ColumnsWithTypeAndName & arguments, const AgrumentNames & argument_names, const size_t optional_argument_count) const
-    {
-        if (arguments.size() < argument_names.size() || arguments.size() > argument_names.size() + optional_argument_count)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                "Function {} requires {} to {} arguments, but {} given",
-                getName(), argument_names.size(), argument_names.size() + optional_argument_count, arguments.size());
-
-        for (size_t i = 0; i < argument_names.size(); ++i)
-        {
-            DataTypePtr argument_type = arguments[i].type;
-            if (!isNumber(argument_type))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Argument '{}' for function {} must be a number", std::string(argument_names[i]), getName());
-        }
-    }
-
-    template <class AgrumentNames>
-    void convertRequiredArguments(const ColumnsWithTypeAndName & arguments, const AgrumentNames & argument_names, Columns & converted_arguments) const
+    template <class ArgumentNames>
+    Columns convertMandatoryArguments(const ColumnsWithTypeAndName & arguments, const ArgumentNames & argument_names) const
     {
+        Columns converted_arguments;
         const DataTypePtr converted_argument_type = std::make_shared<DataTypeFloat32>();
-        converted_arguments.clear();
-        converted_arguments.reserve(arguments.size());
         for (size_t i = 0; i < argument_names.size(); ++i)
         {
             ColumnPtr argument_column = castColumn(arguments[i], converted_argument_type);
             argument_column = argument_column->convertToFullColumnIfConst();
             converted_arguments.push_back(argument_column);
         }
+        return converted_arguments;
     }
 };
 
@@ -87,7 +68,8 @@ template <typename Traits>
 class FunctionMakeDate : public FunctionWithNumericParamsBase
 {
 private:
-    static constexpr std::array<const char*, 3> argument_names = {"year", "month", "day"};
+    static constexpr std::array mandatory_argument_names_year_month_day = {"year", "month", "day"};
+    static constexpr std::array mandatory_argument_names_year_dayofyear = {"year", "dayofyear"};
 
 public:
     static constexpr auto name = Traits::name;
@@ -96,114 +78,142 @@ public:
 
     String getName() const override { return name; }
 
-    bool isVariadic() const override { return false; }
-
-    size_t getNumberOfArguments() const override { return argument_names.size(); }
-
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        checkRequiredArguments(arguments, argument_names, 0);
+        const bool isYearMonthDayVariant = (arguments.size() == 3);
+
+        if (isYearMonthDayVariant)
+        {
+            FunctionArgumentDescriptors args{
+                {mandatory_argument_names_year_month_day[0], &isNumber<IDataType>, nullptr, "Number"},
+                {mandatory_argument_names_year_month_day[1], &isNumber<IDataType>, nullptr, "Number"},
+                {mandatory_argument_names_year_month_day[2], &isNumber<IDataType>, nullptr, "Number"}
+            };
+            validateFunctionArgumentTypes(*this, arguments, args);
+        }
+        else
+        {
+            FunctionArgumentDescriptors args{
+                {mandatory_argument_names_year_dayofyear[0], &isNumber<IDataType>, nullptr, "Number"},
+                {mandatory_argument_names_year_dayofyear[1], &isNumber<IDataType>, nullptr, "Number"}
+            };
+            validateFunctionArgumentTypes(*this, arguments, args);
+        }
 
         return std::make_shared<typename Traits::ReturnDataType>();
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
-        Columns converted_arguments;
-        convertRequiredArguments(arguments, argument_names, converted_arguments);
+        const bool isYearMonthDayVariant = (arguments.size() == 3);
 
-        auto res_column = Traits::ReturnColumnType::create(input_rows_count);
+        Columns converted_arguments;
+        if (isYearMonthDayVariant)
+            converted_arguments = convertMandatoryArguments(arguments, mandatory_argument_names_year_month_day);
+        else
+            converted_arguments = convertMandatoryArguments(arguments, mandatory_argument_names_year_dayofyear);
+
+        auto res_column = Traits::ReturnDataType::ColumnType::create(input_rows_count);
         auto & result_data = res_column->getData();
 
-        const auto & year_data = typeid_cast<const ColumnFloat32 &>(*converted_arguments[0]).getData();
-        const auto & month_data = typeid_cast<const ColumnFloat32 &>(*converted_arguments[1]).getData();
-        const auto & day_data = typeid_cast<const ColumnFloat32 &>(*converted_arguments[2]).getData();
-
         const auto & date_lut = DateLUT::instance();
+        const Int32 max_days_since_epoch = date_lut.makeDayNum(Traits::MAX_DATE[0], Traits::MAX_DATE[1], Traits::MAX_DATE[2]);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        if (isYearMonthDayVariant)
         {
-            const auto year = year_data[i];
-            const auto month = month_data[i];
-            const auto day = day_data[i];
+            const auto & year_data = typeid_cast<const ColumnFloat32 &>(*converted_arguments[0]).getData();
+            const auto & month_data = typeid_cast<const ColumnFloat32 &>(*converted_arguments[1]).getData();
+            const auto & day_data = typeid_cast<const ColumnFloat32 &>(*converted_arguments[2]).getData();
 
-            Int32 day_num = 0;
-
-            if (year >= Traits::MIN_YEAR &&
-                year <= Traits::MAX_YEAR &&
-                month >= 1 && month <= 12 &&
-                day >= 1 && day <= 31 &&
-                YearMonthDayToSingleInt(static_cast<Int64>(year), static_cast<Int64>(month), static_cast<Int64>(day)) <= Traits::MAX_DATE)
+            for (size_t i = 0; i < input_rows_count; ++i)
             {
-                day_num = date_lut.makeDayNum(static_cast<Int16>(year), static_cast<UInt8>(month), static_cast<UInt8>(day));
-            }
+                const auto year = year_data[i];
+                const auto month = month_data[i];
+                const auto day = day_data[i];
 
-            result_data[i] = day_num;
+                Int32 day_num = 0;
+
+                if (year >= Traits::MIN_YEAR &&
+                    year <= Traits::MAX_YEAR &&
+                    month >= 1 && month <= 12 &&
+                    day >= 1 && day <= 31)
+                {
+                    Int32 days_since_epoch = date_lut.makeDayNum(static_cast<Int16>(year), static_cast<UInt8>(month), static_cast<UInt8>(day));
+                    if (days_since_epoch <= max_days_since_epoch)
+                        day_num = days_since_epoch;
+                }
+
+                result_data[i] = day_num;
+            }
+        }
+        else
+        {
+            const auto & year_data = typeid_cast<const ColumnFloat32 &>(*converted_arguments[0]).getData();
+            const auto & dayofyear_data = typeid_cast<const ColumnFloat32 &>(*converted_arguments[1]).getData();
+
+            for (size_t i = 0; i < input_rows_count; ++i)
+            {
+                const auto year = year_data[i];
+                const auto dayofyear = dayofyear_data[i];
+
+                Int32 day_num = 0;
+
+                if (year >= Traits::MIN_YEAR &&
+                    year <= Traits::MAX_YEAR &&
+                    dayofyear >= 1 && dayofyear <= 365)
+                {
+                    Int32 days_since_epoch = date_lut.makeDayNum(static_cast<Int16>(year), 1, 1) + static_cast<Int32>(dayofyear) - 1;
+                    if (days_since_epoch <= max_days_since_epoch)
+                        day_num = days_since_epoch;
+                }
+
+                result_data[i] = day_num;
+            }
         }
 
         return res_column;
     }
 };
 
-/// makeDate(year, month, day)
 struct MakeDateTraits
 {
     static constexpr auto name = "makeDate";
     using ReturnDataType = DataTypeDate;
-    using ReturnColumnType = ColumnDate;
 
     static constexpr auto MIN_YEAR = 1970;
     static constexpr auto MAX_YEAR = 2149;
     /// This date has the maximum day number that fits in 16-bit uint
-    static constexpr auto MAX_DATE = YearMonthDayToSingleInt(MAX_YEAR, 6, 6);
+    static constexpr std::array MAX_DATE = {MAX_YEAR, 6, 6};
 };
 
-/// makeDate32(year, month, day)
 struct MakeDate32Traits
 {
     static constexpr auto name = "makeDate32";
     using ReturnDataType = DataTypeDate32;
-    using ReturnColumnType = ColumnDate32;
 
     static constexpr auto MIN_YEAR = 1900;
     static constexpr auto MAX_YEAR = 2299;
-    static constexpr auto MAX_DATE = YearMonthDayToSingleInt(MAX_YEAR, 12, 31);
+    static constexpr std::array MAX_DATE = {MAX_YEAR, 12, 31};
 };
 
 /// Common implementation for makeDateTime, makeDateTime64
 class FunctionMakeDateTimeBase : public FunctionWithNumericParamsBase
 {
 protected:
-    static constexpr std::array<const char*, 6> argument_names = {"year", "month", "day", "hour", "minute", "second"};
-
-public:
-    bool isVariadic() const override { return true; }
-
-    size_t getNumberOfArguments() const override { return 0; }
-
-protected:
-    void checkRequiredArguments(const ColumnsWithTypeAndName & arguments, const size_t optional_argument_count) const
-    {
-        FunctionWithNumericParamsBase::checkRequiredArguments(arguments, argument_names, optional_argument_count);
-    }
-
-    void convertRequiredArguments(const ColumnsWithTypeAndName & arguments, Columns & converted_arguments) const
-    {
-        FunctionWithNumericParamsBase::convertRequiredArguments(arguments, argument_names, converted_arguments);
-    }
+    static constexpr std::array mandatory_argument_names = {"year", "month", "day", "hour", "minute", "second"};
 
     template <typename T>
     static Int64 dateTime(T year, T month, T day_of_month, T hour, T minute, T second, const DateLUTImpl & lut)
     {
         ///  Note that hour, minute and second are checked against 99 to behave consistently with parsing DateTime from String
         ///  E.g. "select cast('1984-01-01 99:99:99' as DateTime);" returns "1984-01-05 04:40:39"
-        if (unlikely(std::isnan(year) || std::isnan(month) || std::isnan(day_of_month) ||
+        if (std::isnan(year) || std::isnan(month) || std::isnan(day_of_month) ||
             std::isnan(hour) || std::isnan(minute) || std::isnan(second) ||
             year < DATE_LUT_MIN_YEAR || month < 1 || month > 12 || day_of_month < 1 || day_of_month > 31 ||
-            hour < 0 || hour > 99 || minute < 0 || minute > 99 || second < 0 || second > 99))
+            hour < 0 || hour > 99 || minute < 0 || minute > 99 || second < 0 || second > 99) [[unlikely]]
             return minDateTime(lut);
 
-        if (unlikely(year > DATE_LUT_MAX_YEAR))
+        if (year > DATE_LUT_MAX_YEAR) [[unlikely]]
             return maxDateTime(lut);
 
         return lut.makeDateTime(
@@ -237,7 +247,7 @@ protected:
 class FunctionMakeDateTime : public FunctionMakeDateTimeBase
 {
 private:
-    static constexpr std::array<const char*, 1> optional_argument_names = {"timezone"};
+    static constexpr std::array optional_argument_names = {"timezone"};
 
 public:
     static constexpr auto name = "makeDateTime";
@@ -248,11 +258,24 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        checkRequiredArguments(arguments, optional_argument_names.size());
+        FunctionArgumentDescriptors mandatory_args{
+            {mandatory_argument_names[0], &isNumber<IDataType>, nullptr, "Number"},
+            {mandatory_argument_names[1], &isNumber<IDataType>, nullptr, "Number"},
+            {mandatory_argument_names[2], &isNumber<IDataType>, nullptr, "Number"},
+            {mandatory_argument_names[3], &isNumber<IDataType>, nullptr, "Number"},
+            {mandatory_argument_names[4], &isNumber<IDataType>, nullptr, "Number"},
+            {mandatory_argument_names[5], &isNumber<IDataType>, nullptr, "Number"}
+        };
+
+        FunctionArgumentDescriptors optional_args{
+            {optional_argument_names[0], &isString<IDataType>, nullptr, "String"}
+        };
+
+        validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
 
         /// Optional timezone argument
         std::string timezone;
-        if (arguments.size() == argument_names.size() + 1)
+        if (arguments.size() == mandatory_argument_names.size() + 1)
             timezone = extractTimezone(arguments.back());
 
         return std::make_shared<DataTypeDateTime>(timezone);
@@ -262,11 +285,10 @@ public:
     {
         /// Optional timezone argument
         std::string timezone;
-        if (arguments.size() == argument_names.size() + 1)
+        if (arguments.size() == mandatory_argument_names.size() + 1)
             timezone = extractTimezone(arguments.back());
 
-        Columns converted_arguments;
-        convertRequiredArguments(arguments, converted_arguments);
+        Columns converted_arguments = convertMandatoryArguments(arguments, mandatory_argument_names);
 
         auto res_column = ColumnDateTime::create(input_rows_count);
         auto & result_data = res_column->getData();
@@ -290,9 +312,9 @@ public:
             const auto second = second_data[i];
 
             auto date_time = dateTime(year, month, day, hour, minute, second, date_lut);
-            if (unlikely(date_time < 0))
+            if (date_time < 0) [[unlikely]]
                 date_time = 0;
-            else if (unlikely(date_time > 0x0ffffffffll))
+            else if (date_time > 0x0ffffffffll) [[unlikely]]
                 date_time = 0x0ffffffffll;
 
             result_data[i] = static_cast<UInt32>(date_time);
@@ -302,11 +324,11 @@ public:
     }
 };
 
-/// makeDateTime64(year, month, day, hour, minute, second, [fraction], [precision], [timezone])
+/// makeDateTime64(year, month, day, hour, minute, second[, fraction[, precision[, timezone]]])
 class FunctionMakeDateTime64 : public FunctionMakeDateTimeBase
 {
 private:
-    static constexpr std::array<const char*, 3> optional_argument_names = {"fraction", "precision", "timezone"};
+    static constexpr std::array optional_argument_names = {"fraction", "precision", "timezone"};
     static constexpr UInt8 DEFAULT_PRECISION = 3;
 
 public:
@@ -318,11 +340,26 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        checkRequiredArguments(arguments, optional_argument_names.size());
+        FunctionArgumentDescriptors mandatory_args{
+            {mandatory_argument_names[0], &isNumber<IDataType>, nullptr, "Number"},
+            {mandatory_argument_names[1], &isNumber<IDataType>, nullptr, "Number"},
+            {mandatory_argument_names[2], &isNumber<IDataType>, nullptr, "Number"},
+            {mandatory_argument_names[3], &isNumber<IDataType>, nullptr, "Number"},
+            {mandatory_argument_names[4], &isNumber<IDataType>, nullptr, "Number"},
+            {mandatory_argument_names[5], &isNumber<IDataType>, nullptr, "Number"}
+        };
 
-        if (arguments.size() >= argument_names.size() + 1)
+        FunctionArgumentDescriptors optional_args{
+            {optional_argument_names[0], &isNumber<IDataType>, nullptr, "Number"},
+            {optional_argument_names[1], &isNumber<IDataType>, nullptr, "Number"},
+            {optional_argument_names[2], &isString<IDataType>, nullptr, "String"}
+        };
+
+        validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
+
+        if (arguments.size() >= mandatory_argument_names.size() + 1)
         {
-            const auto& fraction_argument = arguments[argument_names.size()];
+            const auto& fraction_argument = arguments[mandatory_argument_names.size()];
             if (!isNumber(fraction_argument.type))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Argument 'fraction' for function {} must be a number", getName());
@@ -330,12 +367,12 @@ public:
 
         /// Optional precision argument
         Int64 precision = DEFAULT_PRECISION;
-        if (arguments.size() >= argument_names.size() + 2)
-            precision = extractPrecision(arguments[argument_names.size() + 1]);
+        if (arguments.size() >= mandatory_argument_names.size() + 2)
+            precision = extractPrecision(arguments[mandatory_argument_names.size() + 1]);
 
         /// Optional timezone argument
         std::string timezone;
-        if (arguments.size() == argument_names.size() + 3)
+        if (arguments.size() == mandatory_argument_names.size() + 3)
             timezone = extractTimezone(arguments.back());
 
         return std::make_shared<DataTypeDateTime64>(precision, timezone);
@@ -345,22 +382,21 @@ public:
     {
         /// Optional precision argument
         Int64 precision = DEFAULT_PRECISION;
-        if (arguments.size() >= argument_names.size() + 2)
-            precision = extractPrecision(arguments[argument_names.size() + 1]);
+        if (arguments.size() >= mandatory_argument_names.size() + 2)
+            precision = extractPrecision(arguments[mandatory_argument_names.size() + 1]);
 
         /// Optional timezone argument
         std::string timezone;
-        if (arguments.size() == argument_names.size() + 3)
+        if (arguments.size() == mandatory_argument_names.size() + 3)
             timezone = extractTimezone(arguments.back());
 
-        Columns converted_arguments;
-        convertRequiredArguments(arguments, converted_arguments);
+        Columns converted_arguments = convertMandatoryArguments(arguments, mandatory_argument_names);
 
         /// Optional fraction argument
         const ColumnVector<Float64>::Container * fraction_data = nullptr;
-        if (arguments.size() >= argument_names.size() + 1)
+        if (arguments.size() >= mandatory_argument_names.size() + 1)
         {
-            ColumnPtr fraction_column = castColumn(arguments[argument_names.size()], std::make_shared<DataTypeFloat64>());
+            ColumnPtr fraction_column = castColumn(arguments[mandatory_argument_names.size()], std::make_shared<DataTypeFloat64>());
             fraction_column = fraction_column->convertToFullColumnIfConst();
             converted_arguments.push_back(fraction_column);
             fraction_data = &typeid_cast<const ColumnFloat64 &>(*converted_arguments[6]).getData();
@@ -394,21 +430,21 @@ public:
             auto date_time = dateTime(year, month, day, hour, minute, second, date_lut);
 
             double fraction = 0;
-            if (unlikely(date_time == min_date_time))
+            if (date_time == min_date_time) [[unlikely]]
                 fraction = 0;
-            else if (unlikely(date_time == max_date_time))
+            else if (date_time == max_date_time) [[unlikely]]
                 fraction = 999999999;
             else
             {
                 fraction = fraction_data ? (*fraction_data)[i] : 0;
-                if (unlikely(std::isnan(fraction)))
+                if (std::isnan(fraction)) [[unlikely]]
                 {
                     date_time = min_date_time;
                     fraction = 0;
                 }
-                else if (unlikely(fraction < 0))
+                else if (fraction < 0) [[unlikely]]
                     fraction = 0;
-                else if (unlikely(fraction > max_fraction))
+                else if (fraction > max_fraction) [[unlikely]]
                     fraction = max_fraction;
             }
 
@@ -441,7 +477,7 @@ private:
 
 REGISTER_FUNCTION(MakeDate)
 {
-    factory.registerFunction<FunctionMakeDate<MakeDateTraits>>();
+    factory.registerFunction<FunctionMakeDate<MakeDateTraits>>({}, FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionMakeDate<MakeDate32Traits>>();
     factory.registerFunction<FunctionMakeDateTime>();
     factory.registerFunction<FunctionMakeDateTime64>();
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 7fd4d3aa6d5..c950a0491a5 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -2,22 +2,13 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeFixedString.h>
-#include <Columns/ColumnMap.h>
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/getLeastSupertype.h>
+#include <Columns/ColumnMap.h>
 #include <Interpreters/castColumn.h>
-#include <memory>
-
-#include <Common/assert_cast.h>
-#include <Common/typeid_cast.h>
-#include "array/arrayIndex.h"
-#include "Functions/like.h"
-#include "Functions/FunctionsStringSearch.h"
+#include <Common/HashTable/HashSet.h>
 
 
 namespace DB
@@ -26,6 +17,8 @@ namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int SIZES_OF_ARRAYS_DONT_MATCH;
+    extern const int ILLEGAL_COLUMN;
 }
 
 namespace
@@ -147,370 +140,92 @@ public:
     }
 };
 
-
-struct NameMapContains { static constexpr auto name = "mapContains"; };
-
-class FunctionMapContains : public IFunction
+/// mapFromArrays(keys, values) is a function that allows you to make key-value pair from a pair of arrays
+class FunctionMapFromArrays : public IFunction
 {
 public:
-    static constexpr auto name = NameMapContains::name;
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapContains>(); }
+    static constexpr auto name = "mapFromArrays";
 
-    String getName() const override
-    {
-        return NameMapContains::name;
-    }
-
-    size_t getNumberOfArguments() const override { return impl.getNumberOfArguments(); }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
-    {
-        return impl.isSuitableForShortCircuitArgumentsExecution(arguments);
-    }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        return impl.getReturnTypeImpl(arguments);
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        return impl.executeImpl(arguments, result_type, input_rows_count);
-    }
-
-private:
-    FunctionArrayIndex<HasAction, NameMapContains> impl;
-};
-
-
-class FunctionMapKeys : public IFunction
-{
-public:
-    static constexpr auto name = "mapKeys";
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapKeys>(); }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    size_t getNumberOfArguments() const override { return 1; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        if (arguments.size() != 1)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                "Number of arguments for function {} doesn't match: passed {}, should be 1",
-                getName(), arguments.size());
-
-        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
-
-        if (!map_type)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be a map", getName());
-
-        auto key_type = map_type->getKeyType();
-
-        return std::make_shared<DataTypeArray>(key_type);
-    }
-
-    bool useDefaultImplementationForConstants() const override { return true; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const override
-    {
-        const ColumnMap * col_map = typeid_cast<const ColumnMap *>(arguments[0].column.get());
-        if (!col_map)
-            return nullptr;
-
-        const auto & nested_column = col_map->getNestedColumn();
-        const auto & keys_data = col_map->getNestedData().getColumn(0);
-
-        return ColumnArray::create(keys_data.getPtr(), nested_column.getOffsetsPtr());
-    }
-};
-
-
-class FunctionMapValues : public IFunction
-{
-public:
-    static constexpr auto name = "mapValues";
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapValues>(); }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    size_t getNumberOfArguments() const override { return 1; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        if (arguments.size() != 1)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                "Number of arguments for function {} doesn't match: passed {}, should be 1",
-                getName(), arguments.size());
-
-        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
-
-        if (!map_type)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be a map", getName());
-
-        auto value_type = map_type->getValueType();
-
-        return std::make_shared<DataTypeArray>(value_type);
-    }
-
-    bool useDefaultImplementationForConstants() const override { return true; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const override
-    {
-        const ColumnMap * col_map = typeid_cast<const ColumnMap *>(arguments[0].column.get());
-        if (!col_map)
-            return nullptr;
-
-        const auto & nested_column = col_map->getNestedColumn();
-        const auto & values_data = col_map->getNestedData().getColumn(1);
-
-        return ColumnArray::create(values_data.getPtr(), nested_column.getOffsetsPtr());
-    }
-};
-
-class FunctionMapContainsKeyLike : public IFunction
-{
-public:
-    static constexpr auto name = "mapContainsKeyLike";
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapContainsKeyLike>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapFromArrays>(); }
     String getName() const override { return name; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*info*/) const override { return true; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        bool is_const = isColumnConst(*arguments[0].column);
-        const ColumnMap * col_map = is_const ? checkAndGetColumnConstData<ColumnMap>(arguments[0].column.get())
-                                             : checkAndGetColumn<ColumnMap>(arguments[0].column.get());
-        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
-        if (!col_map || !map_type)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be a map", getName());
-
-        auto col_res = ColumnVector<UInt8>::create();
-        typename ColumnVector<UInt8>::Container & vec_res = col_res->getData();
-
-        if (input_rows_count == 0)
-            return col_res;
-
-        vec_res.resize(input_rows_count);
-
-        const auto & column_array = typeid_cast<const ColumnArray &>(col_map->getNestedColumn());
-        const auto & column_tuple = typeid_cast<const ColumnTuple &>(column_array.getData());
-
-        const ColumnString * column_string = checkAndGetColumn<ColumnString>(column_tuple.getColumn(0));
-        const ColumnFixedString * column_fixed_string = checkAndGetColumn<ColumnFixedString>(column_tuple.getColumn(0));
-
-        FunctionLike func_like;
-
-        for (size_t row = 0; row < input_rows_count; ++row)
-        {
-            size_t element_start_row = row != 0 ? column_array.getOffsets()[row-1] : 0;
-            size_t elem_size = column_array.getOffsets()[row]- element_start_row;
-
-            ColumnPtr sub_map_column;
-            DataTypePtr data_type;
-
-            //The keys of one row map will be processed as a single ColumnString
-            if (column_string)
-            {
-               sub_map_column = column_string->cut(element_start_row, elem_size);
-               data_type = std::make_shared<DataTypeString>();
-            }
-            else
-            {
-               sub_map_column = column_fixed_string->cut(element_start_row, elem_size);
-               data_type = std::make_shared<DataTypeFixedString>(checkAndGetColumn<ColumnFixedString>(sub_map_column.get())->getN());
-            }
-
-            size_t col_key_size = sub_map_column->size();
-            auto column = is_const ? ColumnConst::create(std::move(sub_map_column), std::move(col_key_size)) : std::move(sub_map_column);
-
-            ColumnsWithTypeAndName new_arguments =
-                {
-                    {
-                        column,
-                        data_type,
-                        ""
-                    },
-                    arguments[1]
-                };
-
-            auto res = func_like.executeImpl(new_arguments, result_type, input_rows_count);
-            const auto & container = checkAndGetColumn<ColumnUInt8>(res.get())->getData();
-
-            const auto it = std::find_if(container.begin(), container.end(), [](int element){ return element == 1; });  // NOLINT
-            vec_res[row] = it == container.end() ? 0 : 1;
-        }
-
-        return col_res;
-    }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        if (arguments.size() != 2)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                            "Number of arguments for function {} doesn't match: passed {}, should be 2",
-                            getName(), arguments.size());
-
-        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
-        const DataTypeString * pattern_type = checkAndGetDataType<DataTypeString>(arguments[1].type.get());
-
-        if (!map_type)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be a Map", getName());
-        if (!pattern_type)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Second argument for function {} must be String", getName());
-
-        if (!isStringOrFixedString(map_type->getKeyType()))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Key type of map for function {} must be `String` or `FixedString`", getName());
-
-        return std::make_shared<DataTypeUInt8>();
-    }
 
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+    bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
-};
 
-class FunctionExtractKeyLike : public IFunction
-{
-public:
-    static constexpr auto name = "mapExtractKeyLike";
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionExtractKeyLike>(); }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*info*/) const override { return true; }
-
-    size_t getNumberOfArguments() const override { return 2; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.size() != 2)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                "Number of arguments for function {} doesn't match: passed {}, should be 2",
-                getName(), arguments.size());
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Function {} requires 2 arguments, but {} given",
+                getName(),
+                arguments.size());
 
+        /// The first argument should always be Array.
+        /// Because key type can not be nested type of Map, which is Tuple
+        DataTypePtr key_type;
+        if (const auto * keys_type = checkAndGetDataType<DataTypeArray>(arguments[0].get()))
+            key_type = keys_type->getNestedType();
+        else
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be an Array", getName());
 
-        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
+        DataTypePtr value_type;
+        if (const auto * value_array_type = checkAndGetDataType<DataTypeArray>(arguments[1].get()))
+            value_type = value_array_type->getNestedType();
+        else if (const auto * value_map_type = checkAndGetDataType<DataTypeMap>(arguments[1].get()))
+            value_type = std::make_shared<DataTypeTuple>(value_map_type->getKeyValueTypes());
+        else
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Second argument for function {} must be Array or Map", getName());
 
-        if (!map_type)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be a map", getName());
-
-
-        auto key_type = map_type->getKeyType();
-
-        WhichDataType which(key_type);
-
-        if (!which.isStringOrFixedString())
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function {}only support the map with String or FixedString key",
-                getName());
-
-        if (!isStringOrFixedString(arguments[1].type))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Second argument passed to function {} must be String or FixedString", getName());
-
-        return std::make_shared<DataTypeMap>(map_type->getKeyType(), map_type->getValueType());
+        DataTypes key_value_types{key_type, value_type};
+        return std::make_shared<DataTypeMap>(key_value_types);
     }
 
-    bool useDefaultImplementationForConstants() const override { return true; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(
+        const ColumnsWithTypeAndName & arguments, const DataTypePtr & /* result_type */, size_t /* input_rows_count */) const override
     {
-        bool is_const = isColumnConst(*arguments[0].column);
-        const ColumnMap * col_map = typeid_cast<const ColumnMap *>(arguments[0].column.get());
-
-        //It may not be necessary to check this condition, cause it will be checked in getReturnTypeImpl function
-        if (!col_map)
-            return nullptr;
-
-        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
-        auto key_type = map_type->getKeyType();
-        auto value_type = map_type->getValueType();
-
-        const auto & nested_column = col_map->getNestedColumn();
-        const auto & keys_column = col_map->getNestedData().getColumn(0);
-        const auto & values_column = col_map->getNestedData().getColumn(1);
-        const ColumnString * keys_string_column = checkAndGetColumn<ColumnString>(keys_column);
-        const ColumnFixedString * keys_fixed_string_column = checkAndGetColumn<ColumnFixedString>(keys_column);
-
-        FunctionLike func_like;
-
-        //create result data
-        MutableColumnPtr keys_data = key_type->createColumn();
-        MutableColumnPtr values_data = value_type->createColumn();
-        MutableColumnPtr offsets = DataTypeNumber<IColumn::Offset>().createColumn();
-
-        IColumn::Offset current_offset = 0;
-
-        for (size_t row = 0; row < input_rows_count; ++row)
+        bool is_keys_const = isColumnConst(*arguments[0].column);
+        ColumnPtr holder_keys;
+        const ColumnArray * col_keys;
+        if (is_keys_const)
         {
-            size_t element_start_row = row != 0 ? nested_column.getOffsets()[row-1] : 0;
-            size_t element_size = nested_column.getOffsets()[row]- element_start_row;
-
-            ColumnsWithTypeAndName new_arguments;
-            ColumnPtr sub_map_column;
-            DataTypePtr data_type;
-
-            if (keys_string_column)
-            {
-                sub_map_column = keys_string_column->cut(element_start_row, element_size);
-                data_type = std::make_shared<DataTypeString>();
-            }
-            else
-            {
-                sub_map_column = keys_fixed_string_column->cut(element_start_row, element_size);
-                data_type =std::make_shared<DataTypeFixedString>(checkAndGetColumn<ColumnFixedString>(sub_map_column.get())->getN());
-            }
-
-            size_t col_key_size = sub_map_column->size();
-            auto column = is_const? ColumnConst::create(std::move(sub_map_column), std::move(col_key_size)) : std::move(sub_map_column);
-
-            new_arguments = {
-                    {
-                        column,
-                        data_type,
-                        ""
-                        },
-                    arguments[1]
-                    };
-
-            auto res = func_like.executeImpl(new_arguments, result_type, input_rows_count);
-            const auto & container = checkAndGetColumn<ColumnUInt8>(res.get())->getData();
-
-            for (size_t row_num = 0; row_num < element_size; ++row_num)
-            {
-                if (container[row_num] == 1)
-                {
-                    auto key_ref = keys_string_column ?
-                                   keys_string_column->getDataAt(element_start_row + row_num) :
-                                   keys_fixed_string_column->getDataAt(element_start_row + row_num);
-                    auto value_ref = values_column.getDataAt(element_start_row + row_num);
-
-                    keys_data->insertData(key_ref.data, key_ref.size);
-                    values_data->insertData(value_ref.data, value_ref.size);
-                    current_offset += 1;
-                }
-            }
-
-            offsets->insert(current_offset);
+            holder_keys = arguments[0].column->convertToFullColumnIfConst();
+            col_keys = checkAndGetColumn<ColumnArray>(holder_keys.get());
+        }
+        else
+        {
+            col_keys = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
         }
 
-        auto result_nested_column = ColumnArray::create(
-            ColumnTuple::create(Columns{std::move(keys_data), std::move(values_data)}),
-            std::move(offsets));
+        if (!col_keys)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "The first argument of function {} must be Array", getName());
 
-        return ColumnMap::create(result_nested_column);
+        bool is_values_const = isColumnConst(*arguments[1].column);
+        ColumnPtr holder_values;
+        if (is_values_const)
+            holder_values = arguments[1].column->convertToFullColumnIfConst();
+        else
+            holder_values = arguments[1].column;
+
+        const ColumnArray * col_values;
+        if (const auto * col_values_array = checkAndGetColumn<ColumnArray>(holder_values.get()))
+            col_values = col_values_array;
+        else if (const auto * col_values_map = checkAndGetColumn<ColumnMap>(holder_values.get()))
+            col_values = &col_values_map->getNestedColumn();
+        else
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "The second arguments of function {} must be Array or Map", getName());
+
+        if (!col_keys->hasEqualOffsets(*col_values))
+            throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH, "Two arguments for function {} must have equal sizes", getName());
+
+        const auto & data_keys = col_keys->getDataPtr();
+        const auto & data_values = col_values->getDataPtr();
+        const auto & offsets = col_keys->getOffsetsPtr();
+        auto nested_column = ColumnArray::create(ColumnTuple::create(Columns{data_keys, data_values}), offsets);
+        return ColumnMap::create(nested_column);
     }
 };
 
@@ -536,103 +251,116 @@ public:
                 "Number of arguments for function {} doesn't match: passed {}, should be 2",
                 getName(), arguments.size());
 
-        const DataTypeMap * left = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
-        const DataTypeMap * right = checkAndGetDataType<DataTypeMap>(arguments[1].type.get());
+        const auto * left = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
+        const auto * right = checkAndGetDataType<DataTypeMap>(arguments[1].type.get());
 
         if (!left || !right)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "The two arguments for function {} must be both Map type",
-                getName());
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "The two arguments for function {} must be both Map type", getName());
+
         if (!left->getKeyType()->equals(*right->getKeyType()) || !left->getValueType()->equals(*right->getValueType()))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "The Key And Value type of Map for function {} must be the same",
-                getName());
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "The Key And Value type of Map for function {} must be the same", getName());
 
         return std::make_shared<DataTypeMap>(left->getKeyType(), left->getValueType());
     }
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
-        const ColumnMap * col_map_left = typeid_cast<const ColumnMap *>(arguments[0].column.get());
-        const auto * col_const_map_left = checkAndGetColumnConst<ColumnMap>(arguments[0].column.get());
-        bool col_const_map_left_flag = false;
-        if (col_const_map_left)
-        {
-            col_const_map_left_flag = true;
-            col_map_left = typeid_cast<const ColumnMap *>(&col_const_map_left->getDataColumn());
-        }
-        if (!col_map_left)
-            return nullptr;
+        bool is_left_const = isColumnConst(*arguments[0].column);
+        bool is_right_const = isColumnConst(*arguments[1].column);
 
-        const ColumnMap * col_map_right = typeid_cast<const ColumnMap *>(arguments[1].column.get());
-        const auto * col_const_map_right = checkAndGetColumnConst<ColumnMap>(arguments[1].column.get());
-        bool col_const_map_right_flag = false;
-        if (col_const_map_right)
-        {
-            col_const_map_right_flag = true;
-            col_map_right = typeid_cast<const ColumnMap *>(&col_const_map_right->getDataColumn());
-        }
-        if (!col_map_right)
-            return nullptr;
+        const auto * map_column_left = is_left_const
+            ? checkAndGetColumnConstData<ColumnMap>(arguments[0].column.get())
+            : checkAndGetColumn<ColumnMap>(arguments[0].column.get());
 
-        const auto & nested_column_left = col_map_left->getNestedColumn();
-        const auto & keys_data_left = col_map_left->getNestedData().getColumn(0);
-        const auto & values_data_left = col_map_left->getNestedData().getColumn(1);
+        const auto * map_column_right = is_right_const
+            ? checkAndGetColumnConstData<ColumnMap>(arguments[1].column.get())
+            : checkAndGetColumn<ColumnMap>(arguments[1].column.get());
+
+        if (!map_column_left || !map_column_right)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                "Arguments for function {} must be maps, got {} and {} instead",
+                getName(), arguments[0].column->getName(), arguments[1].column->getName());
+
+        const auto & nested_column_left = map_column_left->getNestedColumn();
+        const auto & keys_data_left = map_column_left->getNestedData().getColumn(0);
+        const auto & values_data_left = map_column_left->getNestedData().getColumn(1);
         const auto & offsets_left = nested_column_left.getOffsets();
 
-        const auto & nested_column_right = col_map_right->getNestedColumn();
-        const auto & keys_data_right = col_map_right->getNestedData().getColumn(0);
-        const auto & values_data_right = col_map_right->getNestedData().getColumn(1);
+        const auto & nested_column_right = map_column_right->getNestedColumn();
+        const auto & keys_data_right = map_column_right->getNestedData().getColumn(0);
+        const auto & values_data_right = map_column_right->getNestedData().getColumn(1);
         const auto & offsets_right = nested_column_right.getOffsets();
 
-        const auto & result_type_map = static_cast<const DataTypeMap &>(*result_type);
-        const DataTypePtr & key_type = result_type_map.getKeyType();
-        const DataTypePtr & value_type = result_type_map.getValueType();
-        MutableColumnPtr keys_data = key_type->createColumn();
-        MutableColumnPtr values_data = value_type->createColumn();
-        MutableColumnPtr offsets = DataTypeNumber<IColumn::Offset>().createColumn();
+        auto result_keys = keys_data_left.cloneEmpty();
+        auto result_values = values_data_left.cloneEmpty();
+
+        size_t size_to_reserve = keys_data_right.size() + (keys_data_left.size() - keys_data_right.size());
+
+        result_keys->reserve(size_to_reserve);
+        result_values->reserve(size_to_reserve);
+
+        auto result_offsets = ColumnVector<IColumn::Offset>::create(input_rows_count);
+        auto & result_offsets_data = result_offsets->getData();
+
+        using Set = HashSetWithStackMemory<StringRef, StringRefHash, 4>;
+
+        Set right_keys_const;
+        if (is_right_const)
+        {
+            for (size_t i = 0; i < keys_data_right.size(); ++i)
+                right_keys_const.insert(keys_data_right.getDataAt(i));
+        }
 
         IColumn::Offset current_offset = 0;
         for (size_t row_idx = 0; row_idx < input_rows_count; ++row_idx)
         {
-            size_t left_it_begin = col_const_map_left_flag ? 0 : offsets_left[row_idx - 1];
-            size_t left_it_end = col_const_map_left_flag ? offsets_left.size() : offsets_left[row_idx];
-            size_t right_it_begin = col_const_map_right_flag ? 0 : offsets_right[row_idx - 1];
-            size_t right_it_end = col_const_map_right_flag ? offsets_right.size() : offsets_right[row_idx];
+            size_t left_from = is_left_const ? 0 : offsets_left[row_idx - 1];
+            size_t left_to = is_left_const ? offsets_left[0] : offsets_left[row_idx];
 
-            for (size_t i = left_it_begin; i < left_it_end; ++i)
+            size_t right_from = is_right_const ? 0 : offsets_right[row_idx - 1];
+            size_t right_to = is_right_const ? offsets_right[0] : offsets_right[row_idx];
+
+            auto execute_row = [&](const auto & set)
             {
-                bool matched = false;
-                auto key = keys_data_left.getDataAt(i);
-                for (size_t j = right_it_begin; j < right_it_end; ++j)
+                for (size_t i = left_from; i < left_to; ++i)
                 {
-                    if (keys_data_right.getDataAt(j).toString() == key.toString())
+                    if (!set.find(keys_data_left.getDataAt(i)))
                     {
-                        matched = true;
-                        break;
+                        result_keys->insertFrom(keys_data_left, i);
+                        result_values->insertFrom(values_data_left, i);
+                        ++current_offset;
                     }
                 }
-                if (!matched)
-                {
-                    keys_data->insertFrom(keys_data_left, i);
-                    values_data->insertFrom(values_data_left, i);
-                    ++current_offset;
-                }
-            }
+            };
 
-            for (size_t j = right_it_begin; j < right_it_end; ++j)
+            if (is_right_const)
             {
-                keys_data->insertFrom(keys_data_right, j);
-                values_data->insertFrom(values_data_right, j);
-                ++current_offset;
+                execute_row(right_keys_const);
+            }
+            else
+            {
+                Set right_keys;
+                for (size_t i = right_from; i < right_to; ++i)
+                    right_keys.insert(keys_data_right.getDataAt(i));
+
+                execute_row(right_keys);
             }
 
-            offsets->insert(current_offset);
+            size_t right_map_size = right_to - right_from;
+            result_keys->insertRangeFrom(keys_data_right, right_from, right_map_size);
+            result_values->insertRangeFrom(values_data_right, right_from, right_map_size);
+
+            current_offset += right_map_size;
+            result_offsets_data[row_idx] = current_offset;
         }
 
         auto nested_column = ColumnArray::create(
-            ColumnTuple::create(Columns{std::move(keys_data), std::move(values_data)}),
-            std::move(offsets));
+            ColumnTuple::create(Columns{std::move(result_keys), std::move(result_values)}),
+            std::move(result_offsets));
 
         return ColumnMap::create(nested_column);
     }
@@ -643,12 +371,9 @@ public:
 REGISTER_FUNCTION(Map)
 {
     factory.registerFunction<FunctionMap>();
-    factory.registerFunction<FunctionMapContains>();
-    factory.registerFunction<FunctionMapKeys>();
-    factory.registerFunction<FunctionMapValues>();
-    factory.registerFunction<FunctionMapContainsKeyLike>();
-    factory.registerFunction<FunctionExtractKeyLike>();
     factory.registerFunction<FunctionMapUpdate>();
+    factory.registerFunction<FunctionMapFromArrays>();
+    factory.registerAlias("MAP_FROM_ARRAYS", "mapFromArrays");
 }
 
 }
diff --git a/src/Functions/mapFilter.cpp b/src/Functions/mapFilter.cpp
deleted file mode 100644
index 038e3bb3ce0..00000000000
--- a/src/Functions/mapFilter.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-#include <Columns/ColumnMap.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnsNumber.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/array/FunctionArrayMapped.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_COLUMN;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
-
-/** Higher-order functions for map.
-  * These functions optionally apply a map by lambda function,
-  *  and return some result based on that transformation.
-  */
-
-
-/** mapFilter((k, v) -> predicate, map) - leave in the map only the kv elements for which the expression is true.
-  */
-struct MapFilterImpl
-{
-    using data_type = DataTypeMap;
-    using column_type = ColumnMap;
-
-    static constexpr auto name = "mapFilter";
-
-    static bool needBoolean() { return true; }
-    static bool needExpression() { return true; }
-    static bool needOneArray() { return true; }
-
-    static DataTypePtr getReturnType(const DataTypePtr & /*expression_return*/, const DataTypes & elems)
-    {
-        return std::make_shared<DataTypeMap>(elems);
-    }
-
-    /// If there are several arrays, the first one is passed here.
-    static ColumnPtr execute(const ColumnMap & map_column, ColumnPtr mapped)
-    {
-        const ColumnUInt8 * column_filter = typeid_cast<const ColumnUInt8 *>(&*mapped);
-
-        if (!column_filter)
-        {
-            const auto * column_filter_const = checkAndGetColumnConst<ColumnUInt8>(&*mapped);
-
-            if (!column_filter_const)
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected type of filter column");
-
-            if (column_filter_const->getValue<UInt8>())
-                return map_column.clone();
-            else
-            {
-                const auto * column_array = typeid_cast<const ColumnArray *>(map_column.getNestedColumnPtr().get());
-                const auto * column_tuple = typeid_cast<const ColumnTuple *>(column_array->getDataPtr().get());
-                ColumnPtr keys = column_tuple->getColumnPtr(0)->cloneEmpty();
-                ColumnPtr values = column_tuple->getColumnPtr(1)->cloneEmpty();
-                return ColumnMap::create(keys, values, ColumnArray::ColumnOffsets::create(map_column.size(), 0));
-            }
-        }
-
-        const IColumn::Filter & filter = column_filter->getData();
-        ColumnPtr filtered = map_column.getNestedColumn().getData().filter(filter, -1);
-
-        const IColumn::Offsets & in_offsets = map_column.getNestedColumn().getOffsets();
-        auto column_offsets = ColumnArray::ColumnOffsets::create(in_offsets.size());
-        IColumn::Offsets & out_offsets = column_offsets->getData();
-
-        size_t in_pos = 0;
-        size_t out_pos = 0;
-        for (size_t i = 0; i < in_offsets.size(); ++i)
-        {
-            for (; in_pos < in_offsets[i]; ++in_pos)
-            {
-                if (filter[in_pos])
-                    ++out_pos;
-            }
-            out_offsets[i] = out_pos;
-        }
-
-        return ColumnMap::create(ColumnArray::create(filtered, std::move(column_offsets)));
-    }
-};
-
-
-/** mapApply((k,v) -> expression, map) - apply the expression to the map.
-  */
-struct MapApplyImpl
-{
-    using data_type = DataTypeMap;
-    using column_type = ColumnMap;
-
-    static constexpr auto name = "mapApply";
-
-    /// true if the expression (for an overload of f(expression, maps)) or a map (for f(map)) should be boolean.
-    static bool needBoolean() { return false; }
-    static bool needExpression() { return true; }
-    static bool needOneArray() { return true; }
-
-    static DataTypePtr getReturnType(const DataTypePtr & expression_return, const DataTypes & /*elems*/)
-    {
-        const auto * tuple_types = typeid_cast<const DataTypeTuple *>(expression_return.get());
-        if (!tuple_types)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "Expected return type is tuple, got {}", expression_return->getName());
-        if (tuple_types->getElements().size() != 2)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                            "Expected 2 columns as map's key and value, but found {}", tuple_types->getElements().size());
-
-        return std::make_shared<DataTypeMap>(tuple_types->getElements());
-    }
-
-    static ColumnPtr execute(const ColumnMap & map, ColumnPtr mapped)
-    {
-        const auto * column_tuple = checkAndGetColumn<ColumnTuple>(mapped.get());
-        if (!column_tuple)
-        {
-            const ColumnConst * column_const_tuple = checkAndGetColumnConst<ColumnTuple>(mapped.get());
-            if (!column_const_tuple)
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Expected tuple column, found {}", mapped->getName());
-            auto cols = convertConstTupleToConstantElements(*column_const_tuple);
-            return ColumnMap::create(cols[0]->convertToFullColumnIfConst(), cols[1]->convertToFullColumnIfConst(), map.getNestedColumn().getOffsetsPtr());
-        }
-
-        return ColumnMap::create(column_tuple->getColumnPtr(0), column_tuple->getColumnPtr(1),
-            map.getNestedColumn().getOffsetsPtr());
-    }
-};
-
-REGISTER_FUNCTION(MapApply)
-{
-    factory.registerFunction<FunctionArrayMapped<MapFilterImpl, MapFilterImpl>>();
-    factory.registerFunction<FunctionArrayMapped<MapApplyImpl, MapApplyImpl>>();
-}
-
-}
-
-
diff --git a/src/Functions/modulo.cpp b/src/Functions/modulo.cpp
index be791bdeda0..8b8919f7b26 100644
--- a/src/Functions/modulo.cpp
+++ b/src/Functions/modulo.cpp
@@ -55,9 +55,6 @@ struct ModuloByConstantImpl
 
     static void NO_INLINE NO_SANITIZE_UNDEFINED vectorConstant(const A * __restrict src, B b, ResultType * __restrict dst, size_t size)
     {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-compare"
-
         /// Modulo with too small divisor.
         if (unlikely((std::is_signed_v<B> && b == -1) || b == 1))
         {
@@ -75,8 +72,6 @@ struct ModuloByConstantImpl
             return;
         }
 
-#pragma GCC diagnostic pop
-
         if (unlikely(static_cast<A>(b) == 0))
             throw Exception(ErrorCodes::ILLEGAL_DIVISION, "Division by zero");
 
@@ -179,15 +174,15 @@ using FunctionPositiveModulo = BinaryArithmeticOverloadResolver<PositiveModuloIm
 
 REGISTER_FUNCTION(PositiveModulo)
 {
-    factory.registerFunction<FunctionPositiveModulo>(
+    factory.registerFunction<FunctionPositiveModulo>(FunctionDocumentation
         {
-            R"(
+            .description=R"(
 Calculates the remainder when dividing `a` by `b`. Similar to function `modulo` except that `positiveModulo` always return non-negative number.
 Returns the difference between `a` and the nearest integer not greater than `a` divisible by `b`.
 In other words, the function returning the modulus (modulo) in the terms of Modular Arithmetic.
         )",
-            Documentation::Examples{{"positiveModulo", "SELECT positiveModulo(-1, 10);"}},
-            Documentation::Categories{"Arithmetic"}},
+            .examples{{"positiveModulo", "SELECT positiveModulo(-1, 10);", ""}},
+            .categories{"Arithmetic"}},
         FunctionFactory::CaseInsensitive);
 
     factory.registerAlias("positive_modulo", "positiveModulo", FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/mortonDecode.cpp b/src/Functions/mortonDecode.cpp
index 337fd5e3a38..126635a4521 100644
--- a/src/Functions/mortonDecode.cpp
+++ b/src/Functions/mortonDecode.cpp
@@ -380,8 +380,8 @@ private:
 
 REGISTER_FUNCTION(MortonDecode)
 {
-    factory.registerFunction<FunctionMortonDecode>({
-        R"(
+    factory.registerFunction<FunctionMortonDecode>(FunctionDocumentation{
+        .description=R"(
 Decodes a Morton encoding (ZCurve) into the corresponding unsigned integer tuple
 
 The function has two modes of operation:
@@ -418,15 +418,15 @@ The function accepts a column of codes as a second argument:
 The range tuple must be a constant:
 [example:from_table_range]
 )",
-        Documentation::Examples{
-            {"simple", "SELECT mortonDecode(4, 2149)"},
-            {"range_shrank", "SELECT mortonDecode((1,2), 1572864)"},
-            {"identity", "SELECT mortonDecode(1, 1)"},
-            {"identity_shrank", "SELECT mortonDecode(tuple(2), 32768)"},
-            {"from_table", "SELECT mortonDecode(2, code) FROM table"},
-            {"from_table_range", "SELECT mortonDecode((1,2), code) FROM table"},
+        .examples{
+            {"simple", "SELECT mortonDecode(4, 2149)", ""},
+            {"range_shrank", "SELECT mortonDecode((1,2), 1572864)", ""},
+            {"identity", "SELECT mortonDecode(1, 1)", ""},
+            {"identity_shrank", "SELECT mortonDecode(tuple(2), 32768)", ""},
+            {"from_table", "SELECT mortonDecode(2, code) FROM table", ""},
+            {"from_table_range", "SELECT mortonDecode((1,2), code) FROM table", ""},
             },
-        Documentation::Categories {"ZCurve", "Morton coding"}
+        .categories {"ZCurve", "Morton coding"}
     });
 }
 
diff --git a/src/Functions/mortonEncode.cpp b/src/Functions/mortonEncode.cpp
index 4bdd237fa9c..17d8077304d 100644
--- a/src/Functions/mortonEncode.cpp
+++ b/src/Functions/mortonEncode.cpp
@@ -335,8 +335,8 @@ private:
 
 REGISTER_FUNCTION(MortonEncode)
 {
-    factory.registerFunction<FunctionMortonEncode>({
-    R"(
+    factory.registerFunction<FunctionMortonEncode>(FunctionDocumentation{
+    .description=R"(
 Calculates Morton encoding (ZCurve) for a list of unsigned integers
 
 The function has two modes of operation:
@@ -378,15 +378,15 @@ Two arguments will have a range of maximum 2^32 (64/2) each
 Three arguments: range of max 2^21 (64/3) each
 And so on, all overflow will be clamped to zero
 )",
-        Documentation::Examples{
-            {"simple", "SELECT mortonEncode(1, 2, 3)"},
-            {"range_expanded", "SELECT mortonEncode((1,2), 1024, 16)"},
-            {"identity", "SELECT mortonEncode(1)"},
-            {"identity_expanded", "SELECT mortonEncode(tuple(2), 128)"},
-            {"from_table", "SELECT mortonEncode(n1, n2) FROM table"},
-            {"from_table_range", "SELECT mortonEncode((1,2), n1, n2) FROM table"},
+        .examples{
+            {"simple", "SELECT mortonEncode(1, 2, 3)", ""},
+            {"range_expanded", "SELECT mortonEncode((1,2), 1024, 16)", ""},
+            {"identity", "SELECT mortonEncode(1)", ""},
+            {"identity_expanded", "SELECT mortonEncode(tuple(2), 128)", ""},
+            {"from_table", "SELECT mortonEncode(n1, n2) FROM table", ""},
+            {"from_table_range", "SELECT mortonEncode((1,2), n1, n2) FROM table", ""},
             },
-        Documentation::Categories {"ZCurve", "Morton coding"}
+        .categories {"ZCurve", "Morton coding"}
     });
 }
 
diff --git a/src/Functions/multiplyDecimal.cpp b/src/Functions/multiplyDecimal.cpp
index 1ec2d4acc9b..ed6487c6683 100644
--- a/src/Functions/multiplyDecimal.cpp
+++ b/src/Functions/multiplyDecimal.cpp
@@ -58,8 +58,8 @@ struct MultiplyDecimalsImpl
 
 REGISTER_FUNCTION(MultiplyDecimals)
 {
-    factory.registerFunction<FunctionsDecimalArithmetics<MultiplyDecimalsImpl>>(Documentation(
-        R"(
+    factory.registerFunction<FunctionsDecimalArithmetics<MultiplyDecimalsImpl>>(FunctionDocumentation{
+        .description=R"(
 Performs multiplication on two decimals. Result value will be of type [Decimal256](../../sql-reference/data-types/decimal.md).
 Result scale can be explicitly specified by `result_scale` argument (const Integer in range `[0, 76]`). If not specified, the result scale is the max scale of given arguments.
 
@@ -127,7 +127,7 @@ SELECT
 Received exception from server (version 22.11.1):
 Code: 407. DB::Exception: Received from localhost:9000. DB::Exception: Decimal math overflow: While processing toDecimal64(-12.647987876, 9) AS a, toDecimal64(123.967645643, 9) AS b, a * b. (DECIMAL_OVERFLOW)
 ```
-)"));
+)"});
 
 }
 
diff --git a/src/Functions/negate.cpp b/src/Functions/negate.cpp
index 731c0766e9d..bd47780dea8 100644
--- a/src/Functions/negate.cpp
+++ b/src/Functions/negate.cpp
@@ -9,19 +9,11 @@ template <typename A>
 struct NegateImpl
 {
     using ResultType = std::conditional_t<is_decimal<A>, A, typename NumberTraits::ResultOfNegate<A>::Type>;
-    static constexpr const bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr const bool allow_string_or_fixed_string = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
-#if defined (__GNUC__) && __GNUC__ >= 10
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wvector-operation-performance"
-#endif
         return -static_cast<ResultType>(a);
-#if defined (__GNUC__) && __GNUC__ >= 10
-    #pragma GCC diagnostic pop
-#endif
     }
 
 #if USE_EMBEDDED_COMPILER
diff --git a/src/Functions/nested.cpp b/src/Functions/nested.cpp
index b22330cd881..0a094176a55 100644
--- a/src/Functions/nested.cpp
+++ b/src/Functions/nested.cpp
@@ -165,12 +165,12 @@ private:
 
 REGISTER_FUNCTION(Nested)
 {
-    factory.registerFunction<FunctionNested>({
-        R"(
+    factory.registerFunction<FunctionNested>(FunctionDocumentation{
+        .description=R"(
 Returns the array of tuples from multiple arrays.
 )",
-        Documentation::Examples{{"nested", "SELECT nested(['keys', 'values'], ['key_1', 'key_2'], ['value_1','value_2'])"}},
-        Documentation::Categories{"OtherFunctions"}
+        .examples{{"nested", "SELECT nested(['keys', 'values'], ['key_1', 'key_2'], ['value_1','value_2'])", ""}},
+        .categories{"OtherFunctions"}
     });
 }
 
diff --git a/src/Functions/now.cpp b/src/Functions/now.cpp
index 901ce369031..3c3bff1524f 100644
--- a/src/Functions/now.cpp
+++ b/src/Functions/now.cpp
@@ -1,13 +1,10 @@
-#include <DataTypes/DataTypeDateTime.h>
-
-#include <Functions/IFunction.h>
-#include <Core/DecimalFunctions.h>
-#include <Functions/FunctionFactory.h>
-
-#include <Functions/extractTimeZoneFromFunctionArguments.h>
-
 #include <ctime>
-
+#include <Core/Field.h>
+#include <Core/DecimalFunctions.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Functions/extractTimeZoneFromFunctionArguments.h>
 
 namespace DB
 {
diff --git a/src/Functions/nowInBlock.cpp b/src/Functions/nowInBlock.cpp
index 7b8d3d983ad..dfb3ed7c34a 100644
--- a/src/Functions/nowInBlock.cpp
+++ b/src/Functions/nowInBlock.cpp
@@ -3,6 +3,7 @@
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <Columns/ColumnsDateTime.h>
+#include <Columns/ColumnVector.h>
 
 
 namespace DB
diff --git a/src/Functions/numLiteralChars.h b/src/Functions/numLiteralChars.h
new file mode 100644
index 00000000000..ba7a0fbf193
--- /dev/null
+++ b/src/Functions/numLiteralChars.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <base/types.h>
+
+namespace DB
+{
+
+/// Counts the number of literal characters in Joda format string until the next closing literal
+/// sequence single quote. Returns -1 if no literal single quote was found.
+/// In Joda format string(https://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html)
+/// literal content must be quoted with single quote. and two single quote means literal with one single quote.
+/// For example:
+/// Format string: "'aaaa'", unescaped literal: "aaaa";
+/// Format string: "'aa''aa'", unescaped literal: "aa'aa";
+/// Format string: "'aaa''aa" is not valid because of missing of end single quote.
+inline Int64 numLiteralChars(const char * cur, const char * end)
+{
+    bool found = false;
+    Int64 count = 0;
+    while (cur < end)
+    {
+        if (*cur == '\'')
+        {
+            if (cur + 1 < end && *(cur + 1) == '\'')
+            {
+                count += 2;
+                cur += 2;
+            }
+            else
+            {
+                found = true;
+                break;
+            }
+        }
+        else
+        {
+            ++count;
+            ++cur;
+        }
+    }
+    return found ? count : -1;
+}
+
+}
diff --git a/src/Functions/parseDateTime.cpp b/src/Functions/parseDateTime.cpp
new file mode 100644
index 00000000000..c3fbc08c4a9
--- /dev/null
+++ b/src/Functions/parseDateTime.cpp
@@ -0,0 +1,1913 @@
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsDateTime.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/FunctionsConversion.h>
+#include <Functions/IFunction.h>
+#include <Functions/castTypeToEither.h>
+#include <Functions/numLiteralChars.h>
+
+#include <IO/WriteHelpers.h>
+#include <base/types.h>
+#include <boost/algorithm/string/case_conv.hpp>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_COLUMN;
+    extern const int NOT_IMPLEMENTED;
+    extern const int BAD_ARGUMENTS;
+    extern const int VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE;
+    extern const int CANNOT_PARSE_DATETIME;
+    extern const int NOT_ENOUGH_SPACE;
+}
+
+namespace
+{
+    using Pos = const char *;
+
+    constexpr Int32 minYear = 1970;
+    constexpr Int32 maxYear = 2106;
+
+    const std::unordered_map<String, std::pair<String, Int32>> dayOfWeekMap{
+        {"mon", {"day", 1}},
+        {"tue", {"sday", 2}},
+        {"wed", {"nesday", 3}},
+        {"thu", {"rsday", 4}},
+        {"fri", {"day", 5}},
+        {"sat", {"urday", 6}},
+        {"sun", {"day", 7}},
+    };
+
+    const std::unordered_map<String, std::pair<String, Int32>> monthMap{
+        {"jan", {"uary", 1}},
+        {"feb", {"ruary", 2}},
+        {"mar", {"ch", 3}},
+        {"apr", {"il", 4}},
+        {"may", {"", 5}},
+        {"jun", {"e", 6}},
+        {"jul", {"y", 7}},
+        {"aug", {"ust", 8}},
+        {"sep", {"tember", 9}},
+        {"oct", {"ober", 10}},
+        {"nov", {"ember", 11}},
+        {"dec", {"ember", 12}},
+    };
+
+    /// key: month, value: total days of current month if current year is leap year.
+    constexpr Int32 leapDays[] = {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+
+    /// key: month, value: total days of current month if current year is not leap year.
+    constexpr Int32 normalDays[] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+
+    /// key: month, value: cumulative days from January to current month(inclusive) if current year is leap year.
+    constexpr Int32 cumulativeLeapDays[] = {0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366};
+
+    /// key: month, value: cumulative days from January to current month(inclusive) if current year is not leap year.
+    constexpr Int32 cumulativeDays[] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
+
+    /// key: year, value: cumulative days from epoch(1970-01-01) to the first day of current year(exclusive).
+    constexpr Int32 cumulativeYearDays[]
+        = {0,     365,   730,   1096,  1461,  1826,  2191,  2557,  2922,  3287,  3652,  4018,  4383,  4748,  5113,  5479,  5844,  6209,
+           6574,  6940,  7305,  7670,  8035,  8401,  8766,  9131,  9496,  9862,  10227, 10592, 10957, 11323, 11688, 12053, 12418, 12784,
+           13149, 13514, 13879, 14245, 14610, 14975, 15340, 15706, 16071, 16436, 16801, 17167, 17532, 17897, 18262, 18628, 18993, 19358,
+           19723, 20089, 20454, 20819, 21184, 21550, 21915, 22280, 22645, 23011, 23376, 23741, 24106, 24472, 24837, 25202, 25567, 25933,
+           26298, 26663, 27028, 27394, 27759, 28124, 28489, 28855, 29220, 29585, 29950, 30316, 30681, 31046, 31411, 31777, 32142, 32507,
+           32872, 33238, 33603, 33968, 34333, 34699, 35064, 35429, 35794, 36160, 36525, 36890, 37255, 37621, 37986, 38351, 38716, 39082,
+           39447, 39812, 40177, 40543, 40908, 41273, 41638, 42004, 42369, 42734, 43099, 43465, 43830, 44195, 44560, 44926, 45291, 45656,
+           46021, 46387, 46752, 47117, 47482, 47847, 48212, 48577, 48942, 49308, 49673};
+
+    struct DateTime
+    {
+        /// If both week_date_format and week_date_format is false, date is composed of year, month and day
+        Int32 year = 1970; /// year, range [1970, 2106]
+        Int32 month = 1; /// month of year, range [1, 12]
+        Int32 day = 1; /// day of month, range [1, 31]
+
+        Int32 week = 1; /// ISO week of year, range [1, 53]
+        Int32 day_of_week = 1; /// day of week, range [1, 7], 1 represents Monday, 2 represents Tuesday...
+        bool week_date_format
+            = false; /// If true, date is composed of week year(reuse year), week of year(use week) and day of week(use day_of_week)
+
+        Int32 day_of_year = 1; /// day of year, range [1, 366]
+        bool day_of_year_format = false; /// If true, date is composed of year(reuse year), day of year(use day_of_year)
+
+        bool is_year_of_era = false; /// If true, year is calculated from era and year of era, the latter cannot be zero or negative.
+        bool has_year = false; /// Whether year was explicitly specified.
+
+        /// If hour_starts_at_1 = true, is_hour_of_half_day = true, hour's range is [1, 12]
+        /// If hour_starts_at_1 = true, is_hour_of_half_day = false, hour's range is [1, 24]
+        /// If hour_starts_at_1 = false, is_hour_of_half_day = true, hour's range is [0, 11]
+        /// If hour_starts_at_1 = false, is_hour_of_half_day = false, hour's range is [0, 23]
+        Int32 hour = 0;
+        Int32 minute = 0; /// range [0, 59]
+        Int32 second = 0; /// range [0, 59]
+
+        bool is_am = true; /// If is_hour_of_half_day = true and is_am = false (i.e. pm) then add 12 hours to the result DateTime
+        bool hour_starts_at_1 = false; /// Whether the hour is clockhour
+        bool is_hour_of_half_day = false; /// Whether the hour is of half day
+
+        bool has_time_zone_offset = false; /// If true, time zone offset is explicitly specified.
+        Int64 time_zone_offset = 0; /// Offset in seconds between current timezone to UTC.
+
+        void reset()
+        {
+            year = 1970;
+            month = 1;
+            day = 1;
+
+            week = 1;
+            day_of_week = 1;
+            week_date_format = false;
+
+            day_of_year = 1;
+            day_of_year_format = false;
+
+            is_year_of_era = false;
+            has_year = false;
+
+            hour = 0;
+            minute = 0;
+            second = 0;
+
+            is_am = true;
+            hour_starts_at_1 = false;
+            is_hour_of_half_day = false;
+
+            has_time_zone_offset = false;
+            time_zone_offset = 0;
+        }
+
+        /// Input text is expected to be lowered by caller
+        void setEra(const String & text) // NOLINT
+        {
+            if (text == "bc")
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Era BC exceeds the range of DateTime");
+            else if (text != "ad")
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Unknown era {} (expected 'ad' or 'bc')", text);
+        }
+
+        void setCentury(Int32 century)
+        {
+            if (century < 19 || century > 21)
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Value {} for century must be in the range [19, 21]", century);
+
+            year = 100 * century;
+            has_year = true;
+        }
+
+        void setYear(Int32 year_, bool is_year_of_era_ = false, bool is_week_year = false)
+        {
+            if (year_ < minYear || year_ > maxYear)
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Value {} for year must be in the range [{}, {}]", year_, minYear, maxYear);
+
+            year = year_;
+            has_year = true;
+            is_year_of_era = is_year_of_era_;
+            if (is_week_year)
+            {
+                week_date_format = true;
+                day_of_year_format = false;
+            }
+        }
+
+        void setYear2(Int32 year_)
+        {
+            if (year_ >= 70 && year_ < 100)
+                year_ += 1900;
+            else if (year_ >= 0 && year_ < 70)
+                year_ += 2000;
+            else
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Value {} for year2 must be in the range [0, 99]", year_);
+
+            setYear(year_, false, false);
+        }
+
+        void setMonth(Int32 month_)
+        {
+            if (month_ < 1 || month_ > 12)
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Value {} for month of year must be in the range [1, 12]", month_);
+
+            month = month_;
+            week_date_format = false;
+            day_of_year_format = false;
+            if (!has_year)
+            {
+                has_year = true;
+                year = 2000;
+            }
+        }
+
+        void setWeek(Int32 week_)
+        {
+            if (week_ < 1 || week_ > 53)
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Value {} for week of week year must be in the range [1, 53]", week_);
+
+            week = week_;
+            week_date_format = true;
+            day_of_year_format = false;
+            if (!has_year)
+            {
+                has_year = true;
+                year = 2000;
+            }
+        }
+
+        void setDayOfYear(Int32 day_of_year_)
+        {
+            if (day_of_year_ < 1 || day_of_year_ > 366)
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Value {} for day of year must be in the range [1, 366]", day_of_year_);
+
+            day_of_year = day_of_year_;
+            day_of_year_format = true;
+            week_date_format = false;
+            if (!has_year)
+            {
+                has_year = true;
+                year = 2000;
+            }
+        }
+
+        void setDayOfMonth(Int32 day_of_month)
+        {
+            if (day_of_month < 1 || day_of_month > 31)
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Value {} for day of month must be in the range [1, 31]", day_of_month);
+
+            day = day_of_month;
+            week_date_format = false;
+            day_of_year_format = false;
+            if (!has_year)
+            {
+                has_year = true;
+                year = 2000;
+            }
+        }
+
+        void setDayOfWeek(Int32 day_of_week_)
+        {
+            if (day_of_week_ < 1 || day_of_week_ > 7)
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Value {} for day of week must be in the range [1, 7]", day_of_week_);
+
+            day_of_week = day_of_week_;
+            week_date_format = true;
+            day_of_year_format = false;
+            if (!has_year)
+            {
+                has_year = true;
+                year = 2000;
+            }
+        }
+
+        /// Input text is expected to be lowered by caller
+        void setAMPM(const String & text)
+        {
+            if (text == "am")
+                is_am = true;
+            else if (text == "pm")
+                is_am = false;
+            else
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Unknown half day of day: {}", text);
+        }
+
+        void setHour(Int32 hour_, bool is_hour_of_half_day_ = false, bool hour_starts_at_1_ = false)
+        {
+            Int32 max_hour;
+            Int32 min_hour;
+            Int32 new_hour = hour_;
+            if (!is_hour_of_half_day_ && !hour_starts_at_1_)
+            {
+                max_hour = 23;
+                min_hour = 0;
+            }
+            else if (!is_hour_of_half_day_ && hour_starts_at_1_)
+            {
+                max_hour = 24;
+                min_hour = 1;
+                new_hour = hour_ % 24;
+            }
+            else if (is_hour_of_half_day_ && !hour_starts_at_1_)
+            {
+                max_hour = 11;
+                min_hour = 0;
+            }
+            else
+            {
+                max_hour = 12;
+                min_hour = 1;
+                new_hour = hour_ % 12;
+            }
+
+            if (hour_ < min_hour || hour_ > max_hour)
+                throw Exception(
+                    ErrorCodes::CANNOT_PARSE_DATETIME,
+                    "Value {} for hour must be in the range [{}, {}] if_hour_of_half_day={} and hour_starts_at_1={}",
+                    hour,
+                    max_hour,
+                    min_hour,
+                    is_hour_of_half_day_,
+                    hour_starts_at_1_);
+
+            hour = new_hour;
+            is_hour_of_half_day = is_hour_of_half_day_;
+            hour_starts_at_1 = hour_starts_at_1_;
+        }
+
+        void setMinute(Int32 minute_)
+        {
+            if (minute_ < 0 || minute_ > 59)
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Value {} for minute must be in the range [0, 59]", minute_);
+
+            minute = minute_;
+        }
+
+        void setSecond(Int32 second_)
+        {
+            if (second_ < 0 || second_ > 59)
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Value {} for second must be in the range [0, 59]", second_);
+
+            second = second_;
+        }
+
+        /// For debug
+        [[maybe_unused]] String toString() const
+        {
+            String res;
+            res += "year:" + std::to_string(year);
+            res += ",";
+            res += "month:" + std::to_string(month);
+            res += ",";
+            res += "day:" + std::to_string(day);
+            res += ",";
+            res += "hour:" + std::to_string(hour);
+            res += ",";
+            res += "minute:" + std::to_string(minute);
+            res += ",";
+            res += "second:" + std::to_string(second);
+            res += ",";
+            res += "AM:" + std::to_string(is_am);
+            return res;
+        }
+
+        static bool isLeapYear(Int32 year_) { return year_ % 4 == 0 && (year_ % 100 != 0 || year_ % 400 == 0); }
+
+        static bool isDateValid(Int32 year_, Int32 month_, Int32 day_)
+        {
+            /// The range of month[1, 12] and day[1, 31] already checked before
+            bool leap = isLeapYear(year_);
+            return (year_ >= minYear && year_ <= maxYear) && ((leap && day_ <= leapDays[month_]) || (!leap && day_ <= normalDays[month_]));
+        }
+
+        static bool isDayOfYearValid(Int32 year_, Int32 day_of_year_)
+        {
+            /// The range of day_of_year[1, 366] already checked before
+            bool leap = isLeapYear(year_);
+            return (year_ >= minYear && year_ <= maxYear) && (day_of_year_ <= 365 + (leap ? 1 : 0));
+        }
+
+        static Int32 extractISODayOfTheWeek(Int32 days_since_epoch)
+        {
+            if (days_since_epoch < 0)
+            {
+                // negative date: start off at 4 and cycle downwards
+                return (7 - ((-days_since_epoch + 3) % 7));
+            }
+            else
+            {
+                // positive date: start off at 4 and cycle upwards
+                return ((days_since_epoch + 3) % 7) + 1;
+            }
+        }
+
+        static Int32 daysSinceEpochFromWeekDate(int32_t week_year_, int32_t week_of_year_, int32_t day_of_week_)
+        {
+            /// The range of week_of_year[1, 53], day_of_week[1, 7] already checked before
+            if (week_year_ < minYear || week_year_ > maxYear)
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Invalid week year {}", week_year_);
+
+            Int32 days_since_epoch_of_jan_fourth = daysSinceEpochFromDate(week_year_, 1, 4);
+            Int32 first_day_of_week_year = extractISODayOfTheWeek(days_since_epoch_of_jan_fourth);
+            return days_since_epoch_of_jan_fourth - (first_day_of_week_year - 1) + 7 * (week_of_year_ - 1) + day_of_week_ - 1;
+        }
+
+        static Int32 daysSinceEpochFromDayOfYear(Int32 year_, Int32 day_of_year_)
+        {
+            if (!isDayOfYearValid(year_, day_of_year_))
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Invalid day of year, year:{} day of year:{}", year_, day_of_year_);
+
+            Int32 res = daysSinceEpochFromDate(year_, 1, 1);
+            res += day_of_year_ - 1;
+            return res;
+        }
+
+        static Int32 daysSinceEpochFromDate(Int32 year_, Int32 month_, Int32 day_)
+        {
+            if (!isDateValid(year_, month_, day_))
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Invalid date, year:{} month:{} day:{}", year_, month_, day_);
+
+            Int32 res = cumulativeYearDays[year_ - 1970];
+            res += isLeapYear(year_) ? cumulativeLeapDays[month_ - 1] : cumulativeDays[month_ - 1];
+            res += day_ - 1;
+            return res;
+        }
+
+        Int64 buildDateTime(const DateLUTImpl & time_zone)
+        {
+            if (is_hour_of_half_day && !is_am)
+                hour += 12;
+
+            // Convert the parsed date/time into a timestamp.
+            Int32 days_since_epoch;
+            if (week_date_format)
+                days_since_epoch = daysSinceEpochFromWeekDate(year, week, day_of_week);
+            else if (day_of_year_format)
+                days_since_epoch = daysSinceEpochFromDayOfYear(year, day_of_year);
+            else
+                days_since_epoch = daysSinceEpochFromDate(year, month, day);
+
+            Int64 seconds_since_epoch = days_since_epoch * 86400UZ + hour * 3600UZ + minute * 60UZ + second;
+
+            /// Time zone is not specified, use local time zone
+            if (!has_time_zone_offset)
+                time_zone_offset = time_zone.timezoneOffset(seconds_since_epoch);
+
+            /// Time zone is specified in format string.
+            if (seconds_since_epoch >= time_zone_offset)
+                seconds_since_epoch -= time_zone_offset;
+            else
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Seconds since epoch is negative");
+
+            return seconds_since_epoch;
+        }
+    };
+
+    enum class ParseSyntax
+    {
+        MySQL,
+        Joda
+    };
+
+    enum class ErrorHandling
+    {
+        Exception,
+        Zero,
+        Null
+    };
+
+    /// _FUNC_(str[, format, timezone])
+    template <typename Name, ParseSyntax parse_syntax, ErrorHandling error_handling>
+    class FunctionParseDateTimeImpl : public IFunction
+    {
+    public:
+        const bool mysql_M_is_month_name;
+
+        static constexpr auto name = Name::name;
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionParseDateTimeImpl>(context); }
+
+        explicit FunctionParseDateTimeImpl(ContextPtr context)
+            : mysql_M_is_month_name(context->getSettings().formatdatetime_parsedatetime_m_is_month_name)
+        {
+        }
+
+        String getName() const override { return name; }
+
+        bool useDefaultImplementationForConstants() const override { return true; }
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+        ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
+        bool isVariadic() const override { return true; }
+        size_t getNumberOfArguments() const override { return 0; }
+
+        DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+        {
+            FunctionArgumentDescriptors args{
+                {"time", &isString<IDataType>, nullptr, "String"},
+                {"format", &isString<IDataType>, nullptr, "String"},
+            };
+
+            if (arguments.size() == 3)
+                args.emplace_back(FunctionArgumentDescriptor{"timezone", &isString<IDataType>, nullptr, "String"});
+
+            validateFunctionArgumentTypes(*this, arguments, args);
+
+            String time_zone_name = getTimeZone(arguments).getTimeZone();
+            DataTypePtr date_type = std::make_shared<DataTypeDateTime>(time_zone_name);
+            if (error_handling == ErrorHandling::Null)
+                return std::make_shared<DataTypeNullable>(date_type);
+            else
+                return date_type;
+        }
+
+        ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+        {
+            const auto * col_str = checkAndGetColumn<ColumnString>(arguments[0].column.get());
+            if (!col_str)
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "Illegal column {} of first ('str') argument of function {}. Must be string.",
+                    arguments[0].column->getName(),
+                    getName());
+
+            String format = getFormat(arguments);
+            const auto & time_zone = getTimeZone(arguments);
+            std::vector<Instruction> instructions = parseFormat(format);
+
+            auto col_res = ColumnDateTime::create(input_rows_count);
+
+            ColumnUInt8::MutablePtr col_null_map;
+            if constexpr (error_handling == ErrorHandling::Null)
+                col_null_map = ColumnUInt8::create(input_rows_count, 0);
+
+            auto & res_data = col_res->getData();
+
+            /// Make datetime fit in a cache line.
+            alignas(64) DateTime datetime;
+            for (size_t i = 0; i < input_rows_count; ++i)
+            {
+                datetime.reset();
+                StringRef str_ref = col_str->getDataAt(i);
+                Pos cur = str_ref.data;
+                Pos end = str_ref.data + str_ref.size;
+                bool error = false;
+
+                for (const auto & instruction : instructions)
+                {
+                    try
+                    {
+                        cur = instruction.perform(cur, end, datetime);
+                    }
+                    catch (...)
+                    {
+                        if constexpr (error_handling == ErrorHandling::Zero)
+                        {
+                            res_data[i] = 0;
+                            error = true;
+                            break;
+                        }
+                        else if constexpr (error_handling == ErrorHandling::Null)
+                        {
+                            res_data[i] = 0;
+                            col_null_map->getData()[i] = 1;
+                            error = true;
+                            break;
+                        }
+                        else
+                        {
+                            static_assert(error_handling == ErrorHandling::Exception);
+                            throw;
+                        }
+                    }
+                }
+
+                if (error)
+                    continue;
+
+                try
+                {
+                    /// Ensure all input was consumed
+                    if (cur < end)
+                        throw Exception(
+                            ErrorCodes::CANNOT_PARSE_DATETIME,
+                            "Invalid format input {} is malformed at {}",
+                            str_ref.toView(),
+                            std::string_view(cur, end - cur));
+                    Int64 time = datetime.buildDateTime(time_zone);
+                    res_data[i] = static_cast<UInt32>(time);
+                }
+                catch (...)
+                {
+                    if constexpr (error_handling == ErrorHandling::Zero)
+                        res_data[i] = 0;
+                    else if constexpr (error_handling == ErrorHandling::Null)
+                    {
+                        res_data[i] = 0;
+                        col_null_map->getData()[i] = 1;
+                    }
+                    else
+                    {
+                        static_assert(error_handling == ErrorHandling::Exception);
+                        throw;
+                    }
+                }
+            }
+
+            if constexpr (error_handling == ErrorHandling::Null)
+                return ColumnNullable::create(std::move(col_res), std::move(col_null_map));
+            else
+                return col_res;
+            }
+
+
+    private:
+        class Instruction
+        {
+        private:
+            enum class NeedCheckSpace
+            {
+                Yes,
+                No
+            };
+
+            using Func = std::conditional_t<
+                parse_syntax == ParseSyntax::MySQL,
+                Pos (*)(Pos, Pos, const String &, DateTime &),
+                std::function<Pos(Pos, Pos, const String &, DateTime &)>>;
+            const Func func{};
+            const String func_name;
+            const String literal; /// Only used when current instruction parses literal
+            const String fragment; /// Parsed fragments in MySQL or Joda format string
+
+        public:
+            explicit Instruction(Func && func_, const char * func_name_, const std::string_view & fragment_)
+                : func(std::move(func_)), func_name(func_name_), fragment(fragment_)
+            {
+            }
+
+            explicit Instruction(const String & literal_) : literal(literal_), fragment("LITERAL") { }
+            explicit Instruction(String && literal_) : literal(std::move(literal_)), fragment("LITERAL") { }
+
+            /// For debug
+            [[maybe_unused]] String toString() const
+            {
+                if (func)
+                    return "func:" + func_name + ",fragment:" + fragment;
+                else
+                    return "literal:" + literal + ",fragment:" + fragment;
+            }
+
+            Pos perform(Pos cur, Pos end, DateTime & date) const
+            {
+                if (func)
+                    return func(cur, end, fragment, date);
+                else
+                {
+                    /// literal:
+                    checkSpace(cur, end, literal.size(), "insufficient space to parse literal", fragment);
+                    if (std::string_view(cur, literal.size()) != literal)
+                        throw Exception(
+                            ErrorCodes::CANNOT_PARSE_DATETIME,
+                            "Unable to parse fragment {} from {} because literal {} is expected but {} provided",
+                            fragment,
+                            std::string_view(cur, end - cur),
+                            literal,
+                            std::string_view(cur, literal.size()));
+                    cur += literal.size();
+                    return cur;
+                }
+            }
+
+            template <typename T, NeedCheckSpace need_check_space>
+            static Pos readNumber2(Pos cur, Pos end, [[maybe_unused]] const String & fragment, T & res)
+            {
+                if constexpr (need_check_space == NeedCheckSpace::Yes)
+                    checkSpace(cur, end, 2, "readNumber2 requires size >= 2", fragment);
+
+                res = (*cur - '0');
+                ++cur;
+                res = res * 10 + (*cur - '0');
+                ++cur;
+                return cur;
+            }
+
+            template <typename T, NeedCheckSpace need_check_space>
+            static Pos readNumber3(Pos cur, Pos end, [[maybe_unused]] const String & fragment, T & res)
+            {
+                if constexpr (need_check_space == NeedCheckSpace::Yes)
+                    checkSpace(cur, end, 3, "readNumber4 requires size >= 3", fragment);
+
+                res = (*cur - '0');
+                ++cur;
+                res = res * 10 + (*cur - '0');
+                ++cur;
+                res = res * 10 + (*cur - '0');
+                ++cur;
+                return cur;
+            }
+
+            template <typename T, NeedCheckSpace need_check_space>
+            static Pos readNumber4(Pos cur, Pos end, [[maybe_unused]] const String & fragment, T & res)
+            {
+                if constexpr (need_check_space == NeedCheckSpace::Yes)
+                    checkSpace(cur, end, 4, "readNumber4 requires size >= 4", fragment);
+
+                res = (*cur - '0');
+                ++cur;
+                res = res * 10 + (*cur - '0');
+                ++cur;
+                res = res * 10 + (*cur - '0');
+                ++cur;
+                res = res * 10 + (*cur - '0');
+                ++cur;
+                return cur;
+            }
+
+            static void checkSpace(Pos cur, Pos end, size_t len, const String & msg, const String & fragment)
+            {
+                if (cur > end || cur + len > end) [[unlikely]]
+                    throw Exception(
+                        ErrorCodes::NOT_ENOUGH_SPACE,
+                        "Unable to parse fragment {} from {} because {}",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        msg);
+            }
+
+            template <NeedCheckSpace need_check_space>
+            static Pos assertChar(Pos cur, Pos end, char expected, const String & fragment)
+            {
+                if constexpr (need_check_space == NeedCheckSpace::Yes)
+                    checkSpace(cur, end, 1, "assertChar requires size >= 1", fragment);
+
+                if (*cur != expected) [[unlikely]]
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse fragment {} from {} because char {} is expected but {} provided",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        String(expected, 1),
+                        String(*cur, 1));
+
+                ++cur;
+                return cur;
+            }
+
+            template <NeedCheckSpace need_check_space>
+            static Pos assertNumber(Pos cur, Pos end, const String & fragment)
+            {
+                if constexpr (need_check_space == NeedCheckSpace::Yes)
+                    checkSpace(cur, end, 1, "assertChar requires size >= 1", fragment);
+
+                if (*cur < '0' || *cur > '9') [[unlikely]]
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse fragment {} from {} because {} is not a number",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        String(*cur, 1));
+
+                ++cur;
+                return cur;
+            }
+
+            static Pos mysqlDayOfWeekTextShort(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 3, "mysqlDayOfWeekTextShort requires size >= 3", fragment);
+
+                String text(cur, 3);
+                boost::to_lower(text);
+                auto it = dayOfWeekMap.find(text);
+                if (it == dayOfWeekMap.end())
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse fragment {} from {} because of unknown day of week short text {} ",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        text);
+                date.setDayOfWeek(it->second.second);
+                cur += 3;
+                return cur;
+            }
+
+            static Pos mysqlMonthOfYearTextShort(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 3, "mysqlMonthOfYearTextShort requires size >= 3", fragment);
+
+                String text(cur, 3);
+                boost::to_lower(text);
+                auto it = monthMap.find(text);
+                if (it == monthMap.end())
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse fragment {} from {} because of unknown month of year short text {}",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        text);
+
+                date.setMonth(it->second.second);
+                cur += 3;
+                return cur;
+            }
+
+            static Pos mysqlMonthOfYearTextLong(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 3, "mysqlMonthOfYearTextLong requires size >= 3", fragment);
+                String text1(cur, 3);
+                boost::to_lower(text1);
+                auto it = monthMap.find(text1);
+                if (it == monthMap.end())
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse first part of fragment {} from {} because of unknown month of year text: {}",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        text1);
+                cur += 3;
+
+                size_t expected_remaining_size = it->second.first.size();
+                checkSpace(cur, end, expected_remaining_size, "mysqlMonthOfYearTextLong requires the second parg size >= " + std::to_string(expected_remaining_size), fragment);
+                String text2(cur, expected_remaining_size);
+                boost::to_lower(text2);
+                if (text2 != it->second.first)
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse second part of fragment {} from {} because of unknown month of year text: {}",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        text1 + text2);
+                cur += expected_remaining_size;
+
+                date.setMonth(it->second.second);
+                return cur;
+            }
+
+            static Pos mysqlMonth(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 month;
+                cur = readNumber2<Int32, NeedCheckSpace::Yes>(cur, end, fragment, month);
+                date.setMonth(month);
+                return cur;
+            }
+
+            static Pos mysqlCentury(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 century;
+                cur = readNumber2<Int32, NeedCheckSpace::Yes>(cur, end, fragment, century);
+                date.setCentury(century);
+                return cur;
+            }
+
+            static Pos mysqlDayOfMonth(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 day_of_month;
+                cur = readNumber2<Int32, NeedCheckSpace::Yes>(cur, end, fragment, day_of_month);
+                date.setDayOfMonth(day_of_month);
+                return cur;
+            }
+
+            static Pos mysqlAmericanDate(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 8, "mysqlAmericanDate requires size >= 8", fragment);
+
+                Int32 month;
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, month);
+                cur = assertChar<NeedCheckSpace::No>(cur, end, '/', fragment);
+                date.setMonth(month);
+
+                Int32 day;
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, day);
+                cur = assertChar<NeedCheckSpace::No>(cur, end, '/', fragment);
+                date.setDayOfMonth(day);
+
+                Int32 year;
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, year);
+                date.setYear(year);
+                return cur;
+            }
+
+            static Pos mysqlDayOfMonthSpacePadded(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 2, "mysqlDayOfMonthSpacePadded requires size >= 2", fragment);
+
+                Int32 day_of_month = *cur == ' ' ? 0 : (*cur - '0');
+                ++cur;
+
+                day_of_month = 10 * day_of_month + (*cur - '0');
+                ++cur;
+
+                date.setDayOfMonth(day_of_month);
+                return cur;
+            }
+
+            static Pos mysqlISO8601Date(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 10, "mysqlISO8601Date requires size >= 10", fragment);
+
+                Int32 year;
+                Int32 month;
+                Int32 day;
+                cur = readNumber4<Int32, NeedCheckSpace::No>(cur, end, fragment, year);
+                cur = assertChar<NeedCheckSpace::No>(cur, end, '-', fragment);
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, month);
+                cur = assertChar<NeedCheckSpace::No>(cur, end, '-', fragment);
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, day);
+
+                date.setYear(year);
+                date.setMonth(month);
+                date.setDayOfMonth(day);
+                return cur;
+            }
+
+            static Pos mysqlISO8601Year2(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 year2;
+                cur = readNumber2<Int32, NeedCheckSpace::Yes>(cur, end, fragment, year2);
+                date.setYear2(year2);
+                return cur;
+            }
+
+            static Pos mysqlISO8601Year4(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 year;
+                cur = readNumber4<Int32, NeedCheckSpace::Yes>(cur, end, fragment, year);
+                date.setYear(year);
+                return cur;
+            }
+
+            static Pos mysqlDayOfYear(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 day_of_year;
+                cur = readNumber3<Int32, NeedCheckSpace::Yes>(cur, end, fragment, day_of_year);
+                date.setDayOfYear(day_of_year);
+                return cur;
+            }
+
+            static Pos mysqlDayOfWeek(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 1, "mysqlDayOfWeek requires size >= 1", fragment);
+                date.setDayOfWeek(*cur - '0');
+                ++cur;
+                return cur;
+            }
+
+            static Pos mysqlISO8601Week(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 week;
+                cur = readNumber2<Int32, NeedCheckSpace::Yes>(cur, end, fragment, week);
+                date.setWeek(week);
+                return cur;
+            }
+
+            static Pos mysqlDayOfWeek0To6(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 1, "mysqlDayOfWeek requires size >= 1", fragment);
+
+                Int32 day_of_week = *cur - '0';
+                if (day_of_week == 0)
+                    day_of_week = 7;
+
+                date.setDayOfWeek(day_of_week);
+                ++cur;
+                return cur;
+            }
+
+            static Pos mysqlDayOfWeekTextLong(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 6, "mysqlDayOfWeekTextLong requires size >= 6", fragment);
+                String text1(cur, 3);
+                boost::to_lower(text1);
+                auto it = dayOfWeekMap.find(text1);
+                if (it == dayOfWeekMap.end())
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse first part of fragment {} from {} because of unknown day of week text: {}",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        text1);
+                cur += 3;
+
+                size_t expected_remaining_size = it->second.first.size();
+                checkSpace(cur, end, expected_remaining_size, "mysqlDayOfWeekTextLong requires the second parg size >= " + std::to_string(expected_remaining_size), fragment);
+                String text2(cur, expected_remaining_size);
+                boost::to_lower(text2);
+                if (text2 != it->second.first)
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse second part of fragment {} from {} because of unknown day of week text: {}",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        text1 + text2);
+                cur += expected_remaining_size;
+
+                date.setDayOfWeek(it->second.second);
+                return cur;
+            }
+
+            static Pos mysqlYear2(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 year2;
+                cur = readNumber2<Int32, NeedCheckSpace::Yes>(cur, end, fragment, year2);
+                date.setYear2(year2);
+                return cur;
+            }
+
+            static Pos mysqlYear4(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 year;
+                cur = readNumber4<Int32, NeedCheckSpace::Yes>(cur, end, fragment, year);
+                date.setYear(year);
+                return cur;
+            }
+
+            static Pos mysqlTimezoneOffset(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 5, "mysqlTimezoneOffset requires size >= 5", fragment);
+
+                Int32 sign;
+                if (*cur == '-')
+                    sign = -1;
+                else if (*cur == '+')
+                    sign = 1;
+                else
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse fragment {} from {} because of unknown sign time zone offset: {}",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        std::string_view(cur, 1));
+                ++cur;
+
+                Int32 hour;
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, hour);
+
+                Int32 minute;
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, minute);
+
+                date.has_time_zone_offset = true;
+                date.time_zone_offset = sign * (hour * 3600 + minute * 60);
+                return cur;
+            }
+
+            static Pos mysqlMinute(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 minute;
+                cur = readNumber2<Int32, NeedCheckSpace::Yes>(cur, end, fragment, minute);
+                date.setMinute(minute);
+                return cur;
+            }
+
+            static Pos mysqlAMPM(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 2, "mysqlAMPM requires size >= 2", fragment);
+
+                String text(cur, 2);
+                boost::to_lower(text);
+                date.setAMPM(text);
+                cur += 2;
+                return cur;
+            }
+
+            static Pos mysqlHHMM12(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 8, "mysqlHHMM12 requires size >= 8", fragment);
+
+                Int32 hour;
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, hour);
+                cur = assertChar<NeedCheckSpace::No>(cur, end, ':', fragment);
+                date.setHour(hour, true, true);
+
+                Int32 minute;
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, minute);
+                cur = assertChar<NeedCheckSpace::No>(cur, end, ' ', fragment);
+                date.setMinute(minute);
+
+                cur = mysqlAMPM(cur, end, fragment, date);
+                return cur;
+            }
+
+            static Pos mysqlHHMM24(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 5, "mysqlHHMM24 requires size >= 5", fragment);
+
+                Int32 hour;
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, hour);
+                cur = assertChar<NeedCheckSpace::No>(cur, end, ':', fragment);
+                date.setHour(hour, false, false);
+
+                Int32 minute;
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, minute);
+                date.setMinute(minute);
+                return cur;
+            }
+
+            static Pos mysqlSecond(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 second;
+                cur = readNumber2<Int32, NeedCheckSpace::Yes>(cur, end, fragment, second);
+                date.setSecond(second);
+                return cur;
+            }
+
+            static Pos mysqlMicrosecond(Pos cur, Pos end, const String & fragment, DateTime & /*date*/)
+            {
+                checkSpace(cur, end, 6, "mysqlMicrosecond requires size >= 6", fragment);
+
+                for (size_t i = 0; i < 6; ++i)
+                    cur = assertNumber<NeedCheckSpace::No>(cur, end, fragment);
+
+                return cur;
+            }
+
+            static Pos mysqlISO8601Time(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 8, "mysqlISO8601Time requires size >= 8", fragment);
+
+                Int32 hour;
+                Int32 minute;
+                Int32 second;
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, hour);
+                cur = assertChar<NeedCheckSpace::No>(cur, end, ':', fragment);
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, minute);
+                cur = assertChar<NeedCheckSpace::No>(cur, end, ':', fragment);
+                cur = readNumber2<Int32, NeedCheckSpace::No>(cur, end, fragment, second);
+
+                date.setHour(hour, false, false);
+                date.setMinute(minute);
+                date.setSecond(second);
+                return cur;
+            }
+
+            static Pos mysqlHour12(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 hour;
+                cur = readNumber2<Int32, NeedCheckSpace::Yes>(cur, end, fragment, hour);
+                date.setHour(hour, true, true);
+                return cur;
+            }
+
+            static Pos mysqlHour24(Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 hour;
+                cur = readNumber2<Int32, NeedCheckSpace::Yes>(cur, end, fragment, hour);
+                date.setHour(hour, false, false);
+                return cur;
+            }
+
+            static Pos readNumberWithVariableLength(
+                Pos cur,
+                Pos end,
+                bool allow_negative,
+                bool allow_plus_sign,
+                bool is_year,
+                size_t repetitions,
+                size_t max_digits_to_read,
+                const String & fragment,
+                Int32 & result)
+            {
+
+                bool negative = false;
+                if (allow_negative && cur < end && *cur == '-')
+                {
+                    negative = true;
+                    ++cur;
+                }
+                else if (allow_plus_sign && cur < end && *cur == '+')
+                {
+                    negative = false;
+                    ++cur;
+                }
+
+                Int64 number = 0;
+                const Pos start = cur;
+
+                /// Avoid integer overflow in (*)
+                if (max_digits_to_read >= std::numeric_limits<decltype(number)>::digits10) [[unlikely]]
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse fragment {} from {} because max_digits_to_read is too big",
+                        fragment,
+                        std::string_view(start, cur - start));
+
+                if (is_year && repetitions == 2)
+                {
+                    // If abbreviated two year digit is provided in format string, try to read
+                    // in two digits of year and convert to appropriate full length year The
+                    // two-digit mapping is as follows: [00, 69] -> [2000, 2069]
+                    //                                  [70, 99] -> [1970, 1999]
+                    // If more than two digits are provided, then simply read in full year
+                    // normally without conversion
+                    size_t count = 0;
+                    while (cur < end && cur < start + max_digits_to_read && *cur >= '0' && *cur <= '9')
+                    {
+                        number = number * 10 + (*cur - '0'); /// (*)
+                        ++cur;
+                        ++count;
+                    }
+                    if (count == 2)
+                    {
+                        if (number >= 70)
+                            number += 1900;
+                        else if (number >= 0 && number < 70)
+                            number += 2000;
+                    }
+                    else
+                    {
+                        while (cur < end && cur < start + max_digits_to_read && *cur >= '0' && *cur <= '9')
+                        {
+                            number = number * 10 + (*cur - '0'); /// (*)
+                            ++cur;
+                        }
+                    }
+                }
+                else
+                {
+                    while (cur < end && cur < start + max_digits_to_read && *cur >= '0' && *cur <= '9')
+                    {
+                        number = number * 10 + (*cur - '0');
+                        ++cur;
+                    }
+                }
+
+                if (negative)
+                    number *= -1;
+
+                /// Need to have read at least one digit.
+                if (cur == start) [[unlikely]]
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse fragment {} from {} because read number failed",
+                        fragment,
+                        std::string_view(cur, end - cur));
+
+                /// Check if number exceeds the range of Int32
+                if (number < std::numeric_limits<Int32>::min() || number > std::numeric_limits<Int32>::max()) [[unlikely]]
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse fragment {} from {} because number is out of range of Int32",
+                        fragment,
+                        std::string_view(start, cur - start));
+
+                result = static_cast<Int32>(number);
+
+                return cur;
+            }
+
+            static Pos jodaEra(int, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 2, "jodaEra requires size >= 2", fragment);
+
+                String era(cur, 2);
+                boost::to_lower(era);
+                date.setEra(era);
+                cur += 2;
+                return cur;
+            }
+
+            static Pos jodaCenturyOfEra(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 century;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, repetitions, fragment, century);
+                date.setCentury(century);
+                return cur;
+            }
+
+            static Pos jodaYearOfEra(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 year_of_era;
+                cur = readNumberWithVariableLength(cur, end, false, false, true, repetitions, repetitions, fragment, year_of_era);
+                date.setYear(year_of_era, true);
+                return cur;
+            }
+
+            static Pos jodaWeekYear(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 week_year;
+                cur = readNumberWithVariableLength(cur, end, true, true, true, repetitions, repetitions, fragment, week_year);
+                date.setYear(week_year, false, true);
+                return cur;
+            }
+
+            static Pos jodaWeekOfWeekYear(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 week;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, std::max(repetitions, 2uz), fragment, week);
+                date.setWeek(week);
+                return cur;
+            }
+
+            static Pos jodaDayOfWeek1Based(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 day_of_week;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, repetitions, fragment, day_of_week);
+                date.setDayOfWeek(day_of_week);
+                return cur;
+            }
+
+            static Pos
+            jodaDayOfWeekText(size_t /*min_represent_digits*/, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 3, "jodaDayOfWeekText requires size >= 3", fragment);
+
+                String text1(cur, 3);
+                boost::to_lower(text1);
+                auto it = dayOfWeekMap.find(text1);
+                if (it == dayOfWeekMap.end())
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse fragment {} from {} because of unknown day of week text: {}",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        text1);
+                cur += 3;
+                date.setDayOfWeek(it->second.second);
+
+                size_t expected_remaining_size = it->second.first.size();
+                if (cur + expected_remaining_size <= end)
+                {
+                    String text2(cur, expected_remaining_size);
+                    boost::to_lower(text2);
+                    if (text2 == it->second.first)
+                    {
+                        cur += expected_remaining_size;
+                        return cur;
+                    }
+                }
+                return cur;
+            }
+
+            static Pos jodaYear(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 year;
+                cur = readNumberWithVariableLength(cur, end, true, true, true, repetitions, repetitions, fragment, year);
+                date.setYear(year);
+                return cur;
+            }
+
+            static Pos jodaDayOfYear(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 day_of_year;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, std::max(repetitions, 3uz), fragment, day_of_year);
+                date.setDayOfYear(day_of_year);
+                return cur;
+            }
+
+            static Pos jodaMonthOfYear(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 month;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, 2, fragment, month);
+                date.setMonth(month);
+                return cur;
+            }
+
+            static Pos jodaMonthOfYearText(int, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 3, "jodaMonthOfYearText requires size >= 3", fragment);
+                String text1(cur, 3);
+                boost::to_lower(text1);
+                auto it = monthMap.find(text1);
+                if (it == monthMap.end())
+                    throw Exception(
+                        ErrorCodes::CANNOT_PARSE_DATETIME,
+                        "Unable to parse fragment {} from {} because of unknown month of year text: {}",
+                        fragment,
+                        std::string_view(cur, end - cur),
+                        text1);
+                cur += 3;
+                date.setMonth(it->second.second);
+
+                size_t expected_remaining_size = it->second.first.size();
+                if (cur + expected_remaining_size <= end)
+                {
+                    String text2(cur, expected_remaining_size);
+                    boost::to_lower(text2);
+                    if (text2 == it->second.first)
+                    {
+                        cur += expected_remaining_size;
+                        return cur;
+                    }
+                }
+                return cur;
+            }
+
+            static Pos jodaDayOfMonth(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 day_of_month;
+                cur = readNumberWithVariableLength(
+                    cur, end, false, false, false, repetitions, std::max(repetitions, 2uz), fragment, day_of_month);
+                date.setDayOfMonth(day_of_month);
+                return cur;
+            }
+
+            static Pos jodaHalfDayOfDay(int, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                checkSpace(cur, end, 2, "jodaHalfDayOfDay requires size >= 2", fragment);
+
+                String text(cur, 2);
+                boost::to_lower(text);
+                date.setAMPM(text);
+                cur += 2;
+                return cur;
+            }
+
+            static Pos jodaHourOfHalfDay(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 hour;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, std::max(repetitions, 2uz), fragment, hour);
+                date.setHour(hour, true, false);
+                return cur;
+            }
+
+            static Pos jodaClockHourOfHalfDay(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 hour;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, std::max(repetitions, 2uz), fragment, hour);
+                date.setHour(hour, true, true);
+                return cur;
+            }
+
+            static Pos jodaHourOfDay(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 hour;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, std::max(repetitions, 2uz), fragment, hour);
+                date.setHour(hour, false, false);
+                return cur;
+            }
+
+            static Pos jodaClockHourOfDay(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 hour;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, std::max(repetitions, 2uz), fragment, hour);
+                date.setHour(hour, false, true);
+                return cur;
+            }
+
+            static Pos jodaMinuteOfHour(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 minute;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, std::max(repetitions, 2uz), fragment, minute);
+                date.setMinute(minute);
+                return cur;
+            }
+
+            static Pos jodaSecondOfMinute(size_t repetitions, Pos cur, Pos end, const String & fragment, DateTime & date)
+            {
+                Int32 second;
+                cur = readNumberWithVariableLength(cur, end, false, false, false, repetitions, std::max(repetitions, 2uz), fragment, second);
+                date.setSecond(second);
+                return cur;
+            }
+        };
+
+        std::vector<Instruction> parseFormat(const String & format) const
+        {
+            static_assert(
+                parse_syntax == ParseSyntax::MySQL || parse_syntax == ParseSyntax::Joda,
+                "parse syntax must be one of MySQL or Joda");
+
+            if constexpr (parse_syntax == ParseSyntax::MySQL)
+                return parseMysqlFormat(format);
+            else
+                return parseJodaFormat(format);
+        }
+
+        std::vector<Instruction> parseMysqlFormat(const String & format) const
+        {
+#define ACTION_ARGS(func) &(func), #func, std::string_view(pos - 1, 2)
+
+            Pos pos = format.data();
+            Pos end = format.data() + format.size();
+
+            std::vector<Instruction> instructions;
+            while (true)
+            {
+                Pos next_percent_pos = find_first_symbols<'%'>(pos, end);
+
+                if (next_percent_pos < end)
+                {
+                    if (pos < next_percent_pos)
+                        instructions.emplace_back(String(pos, next_percent_pos - pos));
+
+                    pos = next_percent_pos + 1;
+                    if (pos >= end)
+                        throw Exception(
+                            ErrorCodes::BAD_ARGUMENTS, "'%' must not be the last character in the format string, use '%%' instead");
+
+                    switch (*pos)
+                    {
+                        // Abbreviated weekday [Mon...Sun]
+                        case 'a':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlDayOfWeekTextShort));
+                            break;
+
+                        // Abbreviated month [Jan...Dec]
+                        case 'b':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlMonthOfYearTextShort));
+                            break;
+
+                        // Month as a decimal number (01-12)
+                        case 'c':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlMonth));
+                            break;
+
+                        // Year, divided by 100, zero-padded
+                        case 'C':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlCentury));
+                            break;
+
+                        // Day of month, zero-padded (01-31)
+                        case 'd':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlDayOfMonth));
+                            break;
+
+                        // Short MM/DD/YY date, equivalent to %m/%d/%y
+                        case 'D':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlAmericanDate));
+                            break;
+
+                        // Day of month, space-padded ( 1-31)  23
+                        case 'e':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlDayOfMonthSpacePadded));
+                            break;
+
+                        // Fractional seconds
+                        case 'f':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlMicrosecond));
+                            break;
+
+                        // Short YYYY-MM-DD date, equivalent to %Y-%m-%d   2001-08-23
+                        case 'F':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlISO8601Date));
+                            break;
+
+                        // Last two digits of year of ISO 8601 week number (see %G)
+                        case 'g':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlISO8601Year2));
+                            break;
+
+                        // Year of ISO 8601 week number (see %V)
+                        case 'G':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlISO8601Year4));
+                            break;
+
+                        // Day of the year (001-366)   235
+                        case 'j':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlDayOfYear));
+                            break;
+
+                        // Month as a decimal number (01-12)
+                        case 'm':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlMonth));
+                            break;
+
+                        // ISO 8601 weekday as number with Monday as 1 (1-7)
+                        case 'u':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlDayOfWeek));
+                            break;
+
+                        // ISO 8601 week number (01-53)
+                        case 'V':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlISO8601Week));
+                            break;
+
+                        // Weekday as a integer number with Sunday as 0 (0-6)  4
+                        case 'w':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlDayOfWeek0To6));
+                            break;
+
+                        // Full weekday [Monday...Sunday]
+                        case 'W':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlDayOfWeekTextLong));
+                            break;
+
+                        // Two digits year
+                        case 'y':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlYear2));
+                            break;
+
+                        // Four digits year
+                        case 'Y':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlYear4));
+                            break;
+
+                        // Quarter (1-4)
+                        case 'Q':
+                            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for quarter");
+                            break;
+
+                        // Offset from UTC timezone as +hhmm or -hhmm
+                        case 'z':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlTimezoneOffset));
+                            break;
+
+                        // Depending on a setting
+                        // - Full month [January...December]
+                        // - Minute (00-59) OR
+                        case 'M':
+                            if (mysql_M_is_month_name)
+                                instructions.emplace_back(ACTION_ARGS(Instruction::mysqlMonthOfYearTextLong));
+                            else
+                                instructions.emplace_back(ACTION_ARGS(Instruction::mysqlMinute));
+                            break;
+
+                        // AM or PM
+                        case 'p':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlAMPM));
+                            break;
+
+                        // 12-hour HH:MM time, equivalent to %h:%i %p 2:55 PM
+                        case 'r':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlHHMM12));
+                            break;
+
+                        // 24-hour HH:MM time, equivalent to %H:%i 14:55
+                        case 'R':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlHHMM24));
+                            break;
+
+                        // Seconds
+                        case 's':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlSecond));
+                            break;
+
+                        // Seconds
+                        case 'S':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlSecond));
+                            break;
+
+                        // ISO 8601 time format (HH:MM:SS), equivalent to %H:%i:%S 14:55:02
+                        case 'T':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlISO8601Time));
+                            break;
+
+                        // Hour in 12h format (01-12)
+                        case 'h':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlHour12));
+                            break;
+
+                        // Hour in 24h format (00-23)
+                        case 'H':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlHour24));
+                            break;
+
+                        // Minute of hour range [0, 59]
+                        case 'i':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlMinute));
+                            break;
+
+                        // Hour in 12h format (01-12)
+                        case 'I':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlHour12));
+                            break;
+
+                        // Hour in 24h format (00-23)
+                        case 'k':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlHour24));
+                            break;
+
+                        // Hour in 12h format (01-12)
+                        case 'l':
+                            instructions.emplace_back(ACTION_ARGS(Instruction::mysqlHour12));
+                            break;
+
+                        case 't':
+                            instructions.emplace_back("\t");
+                            break;
+
+                        case 'n':
+                            instructions.emplace_back("\n");
+                            break;
+
+                        // Escaped literal characters.
+                        case '%':
+                            instructions.emplace_back("%");
+                            break;
+
+                        /// Unimplemented
+
+                        /// Fractional seconds
+                        case 'U':
+                            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for WEEK (Sun-Sat)");
+                        case 'v':
+                            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for WEEK (Mon-Sun)");
+                        case 'x':
+                            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for YEAR for week (Mon-Sun)");
+                        case 'X':
+                            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for YEAR for week (Sun-Sat)");
+                        default:
+                            throw Exception(
+                                ErrorCodes::BAD_ARGUMENTS,
+                                "Incorrect syntax '{}', symbol is not supported '{}' for function {}",
+                                format,
+                                *pos,
+                                getName());
+                    }
+
+                    ++pos;
+                }
+                else
+                {
+                    /// Handle characters after last %
+                    if (pos < end)
+                        instructions.emplace_back(String(pos, end - pos));
+                    break;
+                }
+            }
+            return instructions;
+#undef ACTION_ARGS
+        }
+
+        std::vector<Instruction> parseJodaFormat(const String & format) const
+        {
+#define ACTION_ARGS_WITH_BIND(func, arg) std::bind_front(&(func), (arg)), #func, std::string_view(cur_token, repetitions)
+
+            Pos pos = format.data();
+            Pos end = format.data() + format.size();
+
+            std::vector<Instruction> instructions;
+            while (pos < end)
+            {
+                Pos cur_token = pos;
+
+                // Literal case
+                if (*cur_token == '\'')
+                {
+                    // Case 1: 2 consecutive single quote
+                    if (pos + 1 < end && *(pos + 1) == '\'')
+                    {
+                        instructions.emplace_back(String(cur_token, 1));
+                        pos += 2;
+                    }
+                    else
+                    {
+                        // Case 2: find closing single quote
+                        Int64 count = numLiteralChars(cur_token + 1, end);
+                        if (count == -1)
+                            throw Exception(ErrorCodes::BAD_ARGUMENTS, "No closing single quote for literal");
+                        else
+                        {
+                            for (Int64 i = 1; i <= count; i++)
+                            {
+                                instructions.emplace_back(String(cur_token + i, 1));
+                                if (*(cur_token + i) == '\'')
+                                    i += 1;
+                            }
+                            pos += count + 2;
+                        }
+                    }
+                }
+                else
+                {
+                    size_t repetitions = 1;
+                    ++pos;
+                    while (pos < end && *cur_token == *pos)
+                    {
+                        ++repetitions;
+                        ++pos;
+                    }
+                    switch (*cur_token)
+                    {
+                        case 'G':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaEra, repetitions));
+                            break;
+                        case 'C':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaCenturyOfEra, repetitions));
+                            break;
+                        case 'Y':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaYearOfEra, repetitions));
+                            break;
+                        case 'x':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaWeekYear, repetitions));
+                            break;
+                        case 'w':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaWeekOfWeekYear, repetitions));
+                            break;
+                        case 'e':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaDayOfWeek1Based, repetitions));
+                            break;
+                        case 'E':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaDayOfWeekText, repetitions));
+                            break;
+                        case 'y':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaYear, repetitions));
+                            break;
+                        case 'D':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaDayOfYear, repetitions));
+                            break;
+                        case 'M':
+                            if (repetitions <= 2)
+                                instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaMonthOfYear, repetitions));
+                            else
+                                instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaMonthOfYearText, repetitions));
+                            break;
+                        case 'd':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaDayOfMonth, repetitions));
+                            break;
+                        case 'a':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaHalfDayOfDay, repetitions));
+                            break;
+                        case 'K':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaHourOfHalfDay, repetitions));
+                            break;
+                        case 'h':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaClockHourOfHalfDay, repetitions));
+                            break;
+                        case 'H':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaHourOfDay, repetitions));
+                            break;
+                        case 'k':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaClockHourOfDay, repetitions));
+                            break;
+                        case 'm':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaMinuteOfHour, repetitions));
+                            break;
+                        case 's':
+                            instructions.emplace_back(ACTION_ARGS_WITH_BIND(Instruction::jodaSecondOfMinute, repetitions));
+                            break;
+                        case 'S':
+                            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for fractional seconds");
+                        case 'z':
+                            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for timezone");
+                        case 'Z':
+                            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "format is not supported for timezone offset id");
+                        default:
+                            if (isalpha(*cur_token))
+                                throw Exception(
+                                    ErrorCodes::NOT_IMPLEMENTED, "format is not supported for {}", String(cur_token, repetitions));
+
+                            instructions.emplace_back(String(cur_token, pos - cur_token));
+                            break;
+                    }
+                }
+            }
+            return instructions;
+#undef ACTION_ARGS_WITH_BIND
+        }
+
+
+        String getFormat(const ColumnsWithTypeAndName & arguments) const
+        {
+            const auto * format_column = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
+            if (!format_column)
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "Illegal column {} of second ('format') argument of function {}. Must be constant string.",
+                    arguments[1].column->getName(),
+                    getName());
+            return format_column->getValue<String>();
+        }
+
+        const DateLUTImpl & getTimeZone(const ColumnsWithTypeAndName & arguments) const
+        {
+            if (arguments.size() < 3)
+                return DateLUT::instance();
+
+            const auto * col = checkAndGetColumnConst<ColumnString>(arguments[2].column.get());
+            if (!col)
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "Illegal column {} of third ('timezone') argument of function {}. Must be constant String.",
+                    arguments[2].column->getName(),
+                    getName());
+
+            String time_zone = col->getValue<String>();
+            return DateLUT::instance(time_zone);
+        }
+    };
+
+    struct NameParseDateTime
+    {
+        static constexpr auto name = "parseDateTime";
+    };
+
+    struct NameParseDateTimeOrZero
+    {
+        static constexpr auto name = "parseDateTimeOrZero";
+    };
+
+    struct NameParseDateTimeOrNull
+    {
+        static constexpr auto name = "parseDateTimeOrNull";
+    };
+
+    struct NameParseDateTimeInJodaSyntax
+    {
+        static constexpr auto name = "parseDateTimeInJodaSyntax";
+    };
+
+    struct NameParseDateTimeInJodaSyntaxOrZero
+    {
+        static constexpr auto name = "parseDateTimeInJodaSyntaxOrZero";
+    };
+
+    struct NameParseDateTimeInJodaSyntaxOrNull
+    {
+        static constexpr auto name = "parseDateTimeInJodaSyntaxOrNull";
+    };
+
+    using FunctionParseDateTime = FunctionParseDateTimeImpl<NameParseDateTime, ParseSyntax::MySQL, ErrorHandling::Exception>;
+    using FunctionParseDateTimeOrZero = FunctionParseDateTimeImpl<NameParseDateTimeOrZero, ParseSyntax::MySQL, ErrorHandling::Zero>;
+    using FunctionParseDateTimeOrNull = FunctionParseDateTimeImpl<NameParseDateTimeOrNull, ParseSyntax::MySQL, ErrorHandling::Null>;
+    using FunctionParseDateTimeInJodaSyntax = FunctionParseDateTimeImpl<NameParseDateTimeInJodaSyntax, ParseSyntax::Joda, ErrorHandling::Exception>;
+    using FunctionParseDateTimeInJodaSyntaxOrZero = FunctionParseDateTimeImpl<NameParseDateTimeInJodaSyntaxOrZero, ParseSyntax::Joda, ErrorHandling::Zero>;
+    using FunctionParseDateTimeInJodaSyntaxOrNull = FunctionParseDateTimeImpl<NameParseDateTimeInJodaSyntaxOrNull, ParseSyntax::Joda, ErrorHandling::Null>;
+}
+
+REGISTER_FUNCTION(ParseDateTime)
+{
+    factory.registerFunction<FunctionParseDateTime>();
+    factory.registerAlias("TO_UNIXTIME", FunctionParseDateTime::name);
+    factory.registerFunction<FunctionParseDateTimeOrZero>();
+    factory.registerFunction<FunctionParseDateTimeOrNull>();
+    factory.registerAlias("str_to_date", FunctionParseDateTimeOrNull::name, FunctionFactory::CaseInsensitive);
+
+    factory.registerFunction<FunctionParseDateTimeInJodaSyntax>();
+    factory.registerFunction<FunctionParseDateTimeInJodaSyntaxOrZero>();
+    factory.registerFunction<FunctionParseDateTimeInJodaSyntaxOrNull>();
+}
+
+
+}
diff --git a/src/Functions/pointInEllipses.cpp b/src/Functions/pointInEllipses.cpp
index 208f2ad2f82..2147428cee3 100644
--- a/src/Functions/pointInEllipses.cpp
+++ b/src/Functions/pointInEllipses.cpp
@@ -71,8 +71,9 @@ private:
         /// For array on stack, see below.
         if (arguments.size() > 10000)
         {
-            throw Exception(ErrorCodes::TOO_MANY_ARGUMENTS_FOR_FUNCTION, "Number of arguments of function {} is too large.",
-                getName());
+            throw Exception(ErrorCodes::TOO_MANY_ARGUMENTS_FOR_FUNCTION,
+                            "Number of arguments of function {} is too large (maximum: 10000).",
+                            getName());
         }
 
         for (const auto arg_idx : collections::range(0, arguments.size()))
diff --git a/src/Functions/pointInPolygon.cpp b/src/Functions/pointInPolygon.cpp
index 24ad1d20611..0e4467a8210 100644
--- a/src/Functions/pointInPolygon.cpp
+++ b/src/Functions/pointInPolygon.cpp
@@ -37,7 +37,7 @@ namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int BAD_ARGUMENTS;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ILLEGAL_COLUMN;
@@ -87,7 +87,7 @@ public:
     {
         if (arguments.size() < 2)
         {
-            throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION, "Too few arguments");
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least 2 arguments", getName());
         }
 
         /** We allow function invocation in one of the following forms:
diff --git a/src/Functions/positionCaseInsensitive.cpp b/src/Functions/positionCaseInsensitive.cpp
index 4e3b670fe54..f71ce0078cc 100644
--- a/src/Functions/positionCaseInsensitive.cpp
+++ b/src/Functions/positionCaseInsensitive.cpp
@@ -20,5 +20,6 @@ using FunctionPositionCaseInsensitive = FunctionsStringSearch<PositionImpl<NameP
 REGISTER_FUNCTION(PositionCaseInsensitive)
 {
     factory.registerFunction<FunctionPositionCaseInsensitive>();
+    factory.registerAlias("instr", NamePositionCaseInsensitive::name, FunctionFactory::CaseInsensitive);
 }
 }
diff --git a/src/Functions/randConstant.cpp b/src/Functions/randConstant.cpp
index dd629538e85..22ce6d88ea6 100644
--- a/src/Functions/randConstant.cpp
+++ b/src/Functions/randConstant.cpp
@@ -20,7 +20,7 @@ public:
 
     String getName() const override { return Name::name; }
 
-bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForNulls() const override { return false; }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
diff --git a/src/Functions/randDistribution.cpp b/src/Functions/randDistribution.cpp
index f92a2c7c034..725ae0b4e64 100644
--- a/src/Functions/randDistribution.cpp
+++ b/src/Functions/randDistribution.cpp
@@ -310,96 +310,96 @@ public:
 REGISTER_FUNCTION(Distribution)
 {
     factory.registerFunction<FunctionRandomDistribution<UniformDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the uniform distribution in the specified range.
 Accepts two parameters - minimum bound and maximum bound.
 
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randUniform(0, 1) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randUniform(0, 1) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 
     factory.registerFunction<FunctionRandomDistribution<NormalDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the normal distribution.
 Accepts two parameters - mean and variance.
 
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randNormal(0, 5) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randNormal(0, 5) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 
 
     factory.registerFunction<FunctionRandomDistribution<LogNormalDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the lognormal distribution (a distribution of a random variable whose logarithm is normally distributed).
 Accepts two parameters - mean and variance.
 
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randLogNormal(0, 5) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randLogNormal(0, 5) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 
 
     factory.registerFunction<FunctionRandomDistribution<ExponentialDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the exponential distribution.
 Accepts one parameter - lambda value.
 
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randExponential(0, 5) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randExponential(0, 5) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 
 
     factory.registerFunction<FunctionRandomDistribution<ChiSquaredDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the chi-squared distribution (a distribution of a sum of the squares of k independent standard normal random variables).
 Accepts one parameter - degree of freedom.
 
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randChiSquared(5) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randChiSquared(5) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 
     factory.registerFunction<FunctionRandomDistribution<StudentTDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the t-distribution.
 Accepts one parameter - degree of freedom.
 
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randStudentT(5) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randStudentT(5) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 
 
     factory.registerFunction<FunctionRandomDistribution<FisherFDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the f-distribution.
 The F-distribution is the distribution of X = (S1 / d1) / (S2 / d2) where d1 and d2 are degrees of freedom.
 Accepts two parameters - degrees of freedom.
@@ -407,69 +407,69 @@ Accepts two parameters - degrees of freedom.
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randFisherF(5) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randFisherF(5) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 
 
     factory.registerFunction<FunctionRandomDistribution<BernoulliDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the Bernoulli distribution.
 Accepts one parameter - probability of success.
 
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randBernoulli(0.1) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randBernoulli(0.1) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 
 
     factory.registerFunction<FunctionRandomDistribution<BinomialDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the binomial distribution.
 Accepts two parameters - number of experiments and probability of success in each experiment.
 
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randBinomial(10, 0.1) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randBinomial(10, 0.1) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 
 
     factory.registerFunction<FunctionRandomDistribution<NegativeBinomialDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the negative binomial distribution.
 Accepts two parameters - number of experiments and probability of success in each experiment.
 
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randNegativeBinomial(10, 0.1) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randNegativeBinomial(10, 0.1) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 
 
     factory.registerFunction<FunctionRandomDistribution<PoissonDistribution>>(
-    {
-    R"(
+    FunctionDocumentation{
+    .description=R"(
 Returns a random number from the poisson distribution.
 Accepts one parameter - the mean number of occurrences.
 
 Typical usage:
 [example:typical]
 )",
-    Documentation::Examples{
-        {"typical", "SELECT randPoisson(3) FROM numbers(100000);"}},
-    Documentation::Categories{"Distribution"}
+    .examples{
+        {"typical", "SELECT randPoisson(3) FROM numbers(100000);", ""}},
+    .categories{"Distribution"}
     });
 }
 
diff --git a/src/Functions/randomStringUTF8.cpp b/src/Functions/randomStringUTF8.cpp
index 14860338d4a..831b19a6216 100644
--- a/src/Functions/randomStringUTF8.cpp
+++ b/src/Functions/randomStringUTF8.cpp
@@ -61,26 +61,26 @@ public:
 
         offsets_to.resize(input_rows_count);
 
-        const IColumn & length_column = *arguments[0].column;
-        size_t summary_utf8_len = 0;
+        const IColumn & col_length = *arguments[0].column;
+        size_t total_codepoints = 0;
         for (size_t row_num = 0; row_num < input_rows_count; ++row_num)
         {
-            size_t utf8_len = length_column.getUInt(row_num);
-            summary_utf8_len += utf8_len;
+            size_t codepoints = col_length.getUInt(row_num);
+            total_codepoints += codepoints;
         }
 
         /* As we generate only assigned planes, the mathematical expectation of the number of bytes
          * per generated code point ~= 3.85. So, reserving for coefficient 4 will not be an overhead
          */
 
-        if (summary_utf8_len > (1 << 29))
+        if (total_codepoints > (1 << 29))
             throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too large string size in function {}", getName());
 
-        size_t size_in_bytes_with_margin = summary_utf8_len * 4 + input_rows_count;
-        data_to.resize(size_in_bytes_with_margin);
-        pcg64_fast rng(randomSeed()); // TODO It is inefficient. We should use SIMD PRNG instead.
+        size_t max_byte_size = total_codepoints * 4 + input_rows_count;
+        data_to.resize(max_byte_size);
 
-        const auto generate_code_point = [](UInt32 rand) -> UInt32 {
+        const auto generate_code_point = [](UInt32 rand)
+        {
             /// We want to generate number in [0x0, 0x70000) and shift it if need
 
             /// Generate highest byte in [0, 6]
@@ -104,43 +104,41 @@ public:
             return code_point;
         };
 
+        pcg64_fast rng(randomSeed());
         IColumn::Offset offset = 0;
+
         for (size_t row_num = 0; row_num < input_rows_count; ++row_num)
         {
-            size_t utf8_len = length_column.getUInt(row_num);
+            size_t codepoints = col_length.getUInt(row_num);
             auto * pos = data_to.data() + offset;
 
-            size_t last_writen_bytes = 0;
-            size_t i = 0;
-            for (; i < utf8_len; i += 2)
+            for (size_t i = 0; i < codepoints; i +=2)
             {
-                UInt64 rand = rng();
+                UInt64 rand = rng(); /// that's the bottleneck
 
                 UInt32 code_point1 = generate_code_point(static_cast<UInt32>(rand));
-                UInt32 code_point2 = generate_code_point(static_cast<UInt32>(rand >> 32u));
 
-                /// We have padding in column buffers that we can overwrite.
-                size_t length1 = UTF8::convertCodePointToUTF8(code_point1, pos, sizeof(int));
-                assert(length1 <= 4);
-                pos += length1;
+                size_t bytes1 = UTF8::convertCodePointToUTF8(code_point1, pos, 4);
+                chassert(bytes1 <= 4);
+                pos += bytes1;
 
-                size_t length2 = UTF8::convertCodePointToUTF8(code_point2, pos, sizeof(int));
-                assert(length2 <= 4);
-                last_writen_bytes = length2;
-                pos += last_writen_bytes;
-            }
-            offset = pos - data_to.data() + 1;
-            if (i > utf8_len)
-            {
-                offset -= last_writen_bytes;
+                if (i + 1 != codepoints)
+                {
+                    UInt32 code_point2 = generate_code_point(static_cast<UInt32>(rand >> 32u));
+                    size_t bytes2 = UTF8::convertCodePointToUTF8(code_point2, pos, 4);
+                    chassert(bytes2 <= 4);
+                    pos += bytes2;
+                }
             }
+
+            *pos = 0;
+            ++pos;
+
+            offset = pos - data_to.data();
             offsets_to[row_num] = offset;
         }
 
-        /// Put zero bytes in between.
-        auto * pos = data_to.data();
-        for (size_t row_num = 0; row_num < input_rows_count; ++row_num)
-            pos[offsets_to[row_num] - 1] = 0;
+        data_to.resize(offset);
 
         return col_to;
     }
diff --git a/src/Functions/regexpExtract.cpp b/src/Functions/regexpExtract.cpp
index 22f1b3599ba..2b3f0b2088d 100644
--- a/src/Functions/regexpExtract.cpp
+++ b/src/Functions/regexpExtract.cpp
@@ -8,7 +8,7 @@
 #include <Functions/Regexps.h>
 #include <Interpreters/Context.h>
 #include <base/StringRef.h>
-#include <Common/Documentation.h>
+#include <Common/FunctionDocumentation.h>
 
 namespace DB
 {
@@ -244,7 +244,7 @@ private:
 REGISTER_FUNCTION(RegexpExtract)
 {
     factory.registerFunction<FunctionRegexpExtract>(
-        Documentation{"Extracts the first string in haystack that matches the regexp pattern and corresponds to the regex group index."});
+        FunctionDocumentation{.description="Extracts the first string in haystack that matches the regexp pattern and corresponds to the regex group index."});
 
     /// For Spark compatibility.
     factory.registerAlias("REGEXP_EXTRACT", "regexpExtract", FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/reinterpretAs.cpp b/src/Functions/reinterpretAs.cpp
index 76afedb4f06..36c944d16fd 100644
--- a/src/Functions/reinterpretAs.cpp
+++ b/src/Functions/reinterpretAs.cpp
@@ -180,9 +180,19 @@ public:
                     size_t offset = 0;
                     for (size_t i = 0; i < size; ++i)
                     {
-                        memcpy(&vec_res[i],
-                            &data_from[offset],
-                            std::min(static_cast<UInt64>(sizeof(ToFieldType)), offsets_from[i] - offset - 1));
+                        size_t copy_size = std::min(static_cast<UInt64>(sizeof(ToFieldType)), offsets_from[i] - offset - 1);
+                        if constexpr (std::endian::native == std::endian::little)
+                            memcpy(&vec_res[i],
+                                &data_from[offset],
+                                copy_size);
+                        else
+                        {
+                            size_t offset_to = sizeof(ToFieldType) > copy_size ? sizeof(ToFieldType) - copy_size : 0;
+                            reverseMemcpy(
+                                reinterpret_cast<char*>(&vec_res[i]) + offset_to,
+                                &data_from[offset],
+                                copy_size);
+                        }
                         offset = offsets_from[i];
                     }
 
@@ -203,6 +213,7 @@ public:
 
                     size_t offset = 0;
                     size_t copy_size = std::min(step, sizeof(ToFieldType));
+                    size_t index = data_from.size() - copy_size;
 
                     if (sizeof(ToFieldType) <= step)
                         vec_res.resize(size);
@@ -211,7 +222,13 @@ public:
 
                     for (size_t i = 0; i < size; ++i)
                     {
-                        memcpy(&vec_res[i], &data_from[offset], copy_size);
+                        if constexpr (std::endian::native == std::endian::little)
+                            memcpy(&vec_res[i], &data_from[offset], copy_size);
+                        else
+                        {
+                            size_t offset_to = sizeof(ToFieldType) > copy_size ? sizeof(ToFieldType) - copy_size : 0;
+                            memcpy(reinterpret_cast<char*>(&vec_res[i]) + offset_to, &data_from[index - offset], copy_size);
+                        }
                         offset += step;
                     }
 
@@ -239,10 +256,18 @@ public:
                     static constexpr size_t copy_size = std::min(sizeof(From), sizeof(To));
 
                     for (size_t i = 0; i < size; ++i)
-                        memcpy(static_cast<void*>(&to[i]), static_cast<const void*>(&from[i]), copy_size);
+                    {
+                        if constexpr (std::endian::native == std::endian::little)
+                            memcpy(static_cast<void*>(&to[i]), static_cast<const void*>(&from[i]), copy_size);
+                        else
+                        {
+                            size_t offset_to = sizeof(To) > sizeof(From) ? sizeof(To) - sizeof(From) : 0;
+                            memcpy(reinterpret_cast<char*>(&to[i]) + offset_to, static_cast<const void*>(&from[i]), copy_size);
+                        }
+
+                    }
 
                     result = std::move(column_to);
-
                     return true;
                 }
             }
@@ -317,11 +342,21 @@ private:
             StringRef data = src.getDataAt(i);
 
             /// Cut trailing zero bytes.
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
             while (data.size && data.data[data.size - 1] == 0)
                 --data.size;
-
+#else
+            size_t index = 0;
+            while (index < data.size && data.data[index] == 0)
+                index++;
+            data.size -= index;
+#endif
             data_to.resize(offset + data.size + 1);
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
             memcpy(&data_to[offset], data.data, data.size);
+#else
+            reverseMemcpy(&data_to[offset], data.data + index, data.size);
+#endif
             offset += data.size;
             data_to[offset] = 0;
             ++offset;
@@ -341,24 +376,6 @@ private:
         else
             return ColumnType::create(column_size);
     }
-
-    template <typename FromContainer, typename ToContainer>
-    static void reinterpretImpl(const FromContainer & from, ToContainer & to)
-    {
-        using From = typename FromContainer::value_type;
-        using To = typename ToContainer::value_type;
-
-        size_t size = from.size();
-        static constexpr size_t copy_size = std::min(sizeof(From), sizeof(To));
-
-        if (sizeof(To) <= sizeof(From))
-            to.resize(size);
-        else
-            to.resize_fill(size);
-
-        for (size_t i = 0; i < size; ++i)
-            memcpy(static_cast<void*>(&to[i]), static_cast<const void*>(&from[i]), copy_size);
-    }
 };
 
 template <typename ToDataType, typename Name>
diff --git a/src/Functions/repeat.cpp b/src/Functions/repeat.cpp
index dcd05f373fc..c1b553ac6b3 100644
--- a/src/Functions/repeat.cpp
+++ b/src/Functions/repeat.cpp
@@ -13,7 +13,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int TOO_LARGE_STRING_SIZE;
 }
 
@@ -25,27 +24,27 @@ struct RepeatImpl
     /// Safety threshold against DoS.
     static inline void checkRepeatTime(UInt64 repeat_time)
     {
-        static constexpr UInt64 max_repeat_times = 1000000;
+        static constexpr UInt64 max_repeat_times = 1'000'000;
         if (repeat_time > max_repeat_times)
-            throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too many times to repeat ({}), maximum is: {}",
-                std::to_string(repeat_time), std::to_string(max_repeat_times));
+            throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too many times to repeat ({}), maximum is: {}", repeat_time, max_repeat_times);
     }
 
     static inline void checkStringSize(UInt64 size)
     {
         static constexpr UInt64 max_string_size = 1 << 30;
         if (size > max_string_size)
-            throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too large string size ({}) in function repeat, maximum is: {}",
-                size, max_string_size);
+            throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too large string size ({}) in function repeat, maximum is: {}", size, max_string_size);
     }
 
+    template <typename T>
     static void vectorStrConstRepeat(
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
         ColumnString::Offsets & res_offsets,
-        UInt64 repeat_time)
+        T repeat_time)
     {
+        repeat_time = repeat_time < 0 ? 0 : repeat_time;
         checkRepeatTime(repeat_time);
 
         UInt64 data_size = 0;
@@ -77,7 +76,8 @@ struct RepeatImpl
         res_offsets.assign(offsets);
         for (UInt64 i = 0; i < col_num.size(); ++i)
         {
-            size_t repeated_size = (offsets[i] - offsets[i - 1] - 1) * col_num[i] + 1;
+            T repeat_time = col_num[i] < 0 ? 0 : col_num[i];
+            size_t repeated_size = (offsets[i] - offsets[i - 1] - 1) * repeat_time + 1;
             checkStringSize(repeated_size);
             data_size += repeated_size;
             res_offsets[i] = data_size;
@@ -86,7 +86,7 @@ struct RepeatImpl
 
         for (UInt64 i = 0; i < col_num.size(); ++i)
         {
-            T repeat_time = col_num[i];
+            T repeat_time = col_num[i] < 0 ? 0 : col_num[i];
             checkRepeatTime(repeat_time);
             process(data.data() + offsets[i - 1], res_data.data() + res_offsets[i - 1], offsets[i] - offsets[i - 1], repeat_time);
         }
@@ -105,7 +105,8 @@ struct RepeatImpl
         UInt64 col_size = col_num.size();
         for (UInt64 i = 0; i < col_size; ++i)
         {
-            size_t repeated_size = str_size * col_num[i] + 1;
+            T repeat_time = col_num[i] < 0 ? 0 : col_num[i];
+            size_t repeated_size = str_size * repeat_time + 1;
             checkStringSize(repeated_size);
             data_size += repeated_size;
             res_offsets[i] = data_size;
@@ -113,7 +114,7 @@ struct RepeatImpl
         res_data.resize(data_size);
         for (UInt64 i = 0; i < col_size; ++i)
         {
-            T repeat_time = col_num[i];
+            T repeat_time = col_num[i] < 0 ? 0 : col_num[i];
             checkRepeatTime(repeat_time);
             process(
                 reinterpret_cast<UInt8 *>(const_cast<char *>(copy_str.data())),
@@ -168,7 +169,8 @@ class FunctionRepeat : public IFunction
     template <typename F>
     static bool castType(const IDataType * type, F && f)
     {
-        return castTypeToEither<DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64>(type, std::forward<F>(f));
+        return castTypeToEither<DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64,
+            DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64>(type, std::forward<F>(f));
     }
 
 public:
@@ -181,41 +183,48 @@ public:
 
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        if (!isString(arguments[0]))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}",
-                arguments[0]->getName(), getName());
-        if (!isUnsignedInteger(arguments[1]))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}",
-                arguments[1]->getName(), getName());
-        return arguments[0];
+        FunctionArgumentDescriptors args{
+            {"s", &isString<IDataType>, nullptr, "String"},
+            {"n", &isInteger<IDataType>, nullptr, "Integer"},
+        };
+
+        validateFunctionArgumentTypes(*this, arguments, args);
+
+        return std::make_shared<DataTypeString>();
     }
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const override
     {
-        const auto & strcolumn = arguments[0].column;
-        const auto & numcolumn = arguments[1].column;
+        const auto & col_str = arguments[0].column;
+        const auto & col_num = arguments[1].column;
         ColumnPtr res;
 
-        if (const ColumnString * col = checkAndGetColumn<ColumnString>(strcolumn.get()))
+        if (const ColumnString * col = checkAndGetColumn<ColumnString>(col_str.get()))
         {
-            if (const ColumnConst * scale_column_num = checkAndGetColumn<ColumnConst>(numcolumn.get()))
+            if (const ColumnConst * col_num_const = checkAndGetColumn<ColumnConst>(col_num.get()))
             {
-                UInt64 repeat_time = scale_column_num->getValue<UInt64>();
                 auto col_res = ColumnString::create();
-                RepeatImpl::vectorStrConstRepeat(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), repeat_time);
+                castType(arguments[1].type.get(), [&](const auto & type)
+                {
+                    using DataType = std::decay_t<decltype(type)>;
+                    using T = typename DataType::FieldType;
+                    T times = col_num_const->getValue<T>();
+                    RepeatImpl::vectorStrConstRepeat(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), times);
+                    return true;
+                });
                 return col_res;
             }
             else if (castType(arguments[1].type.get(), [&](const auto & type)
                 {
                     using DataType = std::decay_t<decltype(type)>;
                     using T = typename DataType::FieldType;
-                    const ColumnVector<T> * colnum = checkAndGetColumn<ColumnVector<T>>(numcolumn.get());
+                    const ColumnVector<T> * column = checkAndGetColumn<ColumnVector<T>>(col_num.get());
                     auto col_res = ColumnString::create();
-                    RepeatImpl::vectorStrVectorRepeat(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), colnum->getData());
+                    RepeatImpl::vectorStrVectorRepeat(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), column->getData());
                     res = std::move(col_res);
                     return true;
                 }))
@@ -223,7 +232,7 @@ public:
                 return res;
             }
         }
-        else if (const ColumnConst * col_const = checkAndGetColumn<ColumnConst>(strcolumn.get()))
+        else if (const ColumnConst * col_const = checkAndGetColumn<ColumnConst>(col_str.get()))
         {
             /// Note that const-const case is handled by useDefaultImplementationForConstants.
 
@@ -233,9 +242,9 @@ public:
                 {
                     using DataType = std::decay_t<decltype(type)>;
                     using T = typename DataType::FieldType;
-                    const ColumnVector<T> * colnum = checkAndGetColumn<ColumnVector<T>>(numcolumn.get());
+                    const ColumnVector<T> * column = checkAndGetColumn<ColumnVector<T>>(col_num.get());
                     auto col_res = ColumnString::create();
-                    RepeatImpl::constStrVectorRepeat(copy_str, col_res->getChars(), col_res->getOffsets(), colnum->getData());
+                    RepeatImpl::constStrVectorRepeat(copy_str, col_res->getChars(), col_res->getOffsets(), column->getData());
                     res = std::move(col_res);
                     return true;
                 }))
diff --git a/src/Functions/replaceAll.cpp b/src/Functions/replaceAll.cpp
index d85d192d199..6c06f5984b3 100644
--- a/src/Functions/replaceAll.cpp
+++ b/src/Functions/replaceAll.cpp
@@ -13,7 +13,7 @@ struct NameReplaceAll
     static constexpr auto name = "replaceAll";
 };
 
-using FunctionReplaceAll = FunctionStringReplace<ReplaceStringImpl<ReplaceStringTraits::Replace::All>, NameReplaceAll>;
+using FunctionReplaceAll = FunctionStringReplace<ReplaceStringImpl<NameReplaceAll, ReplaceStringTraits::Replace::All>, NameReplaceAll>;
 
 }
 
diff --git a/src/Functions/replaceOne.cpp b/src/Functions/replaceOne.cpp
index 6557339537e..62be2906a71 100644
--- a/src/Functions/replaceOne.cpp
+++ b/src/Functions/replaceOne.cpp
@@ -13,7 +13,7 @@ struct NameReplaceOne
     static constexpr auto name = "replaceOne";
 };
 
-using FunctionReplaceOne = FunctionStringReplace<ReplaceStringImpl<ReplaceStringTraits::Replace::First>, NameReplaceOne>;
+using FunctionReplaceOne = FunctionStringReplace<ReplaceStringImpl<NameReplaceOne, ReplaceStringTraits::Replace::First>, NameReplaceOne>;
 
 }
 
diff --git a/src/Functions/replaceRegexpAll.cpp b/src/Functions/replaceRegexpAll.cpp
index 4eaf46c05d4..f5f56fb0f35 100644
--- a/src/Functions/replaceRegexpAll.cpp
+++ b/src/Functions/replaceRegexpAll.cpp
@@ -13,7 +13,7 @@ struct NameReplaceRegexpAll
     static constexpr auto name = "replaceRegexpAll";
 };
 
-using FunctionReplaceRegexpAll = FunctionStringReplace<ReplaceRegexpImpl<ReplaceRegexpTraits::Replace::All>, NameReplaceRegexpAll>;
+using FunctionReplaceRegexpAll = FunctionStringReplace<ReplaceRegexpImpl<NameReplaceRegexpAll, ReplaceRegexpTraits::Replace::All>, NameReplaceRegexpAll>;
 
 }
 
diff --git a/src/Functions/replaceRegexpOne.cpp b/src/Functions/replaceRegexpOne.cpp
index 60e29213a9a..fc3e55aa791 100644
--- a/src/Functions/replaceRegexpOne.cpp
+++ b/src/Functions/replaceRegexpOne.cpp
@@ -13,7 +13,7 @@ struct NameReplaceRegexpOne
     static constexpr auto name = "replaceRegexpOne";
 };
 
-using FunctionReplaceRegexpOne = FunctionStringReplace<ReplaceRegexpImpl<ReplaceRegexpTraits::Replace::First>, NameReplaceRegexpOne>;
+using FunctionReplaceRegexpOne = FunctionStringReplace<ReplaceRegexpImpl<NameReplaceRegexpOne, ReplaceRegexpTraits::Replace::First>, NameReplaceRegexpOne>;
 
 }
 
diff --git a/src/Functions/reverseDNSQuery.cpp b/src/Functions/reverseDNSQuery.cpp
index 65ce5e859c5..b4d963a6a15 100644
--- a/src/Functions/reverseDNSQuery.cpp
+++ b/src/Functions/reverseDNSQuery.cpp
@@ -99,43 +99,19 @@ public:
 REGISTER_FUNCTION(ReverseDNSQuery)
 {
     factory.registerFunction<ReverseDNSQuery>(
-        Documentation(
-            R"(Performs a reverse DNS query to get the PTR records associated with the IP address.
-
-                **Syntax**
-
-                ``` sql
-                reverseDNSQuery(address)
-                ```
-
-                This function performs reverse DNS resolutions on both IPv4 and IPv6.
-
-                **Arguments**
-
-                -   `address` — An IPv4 or IPv6 address. [String](../../sql-reference/data-types/string.md).
-
-                **Returned value**
-
-                -   Associated domains (PTR records).
-
-                Type: Type: [Array(String)](../../sql-reference/data-types/array.md).
-
-                **Example**
-
-                Query:
-
-                ``` sql
-                SELECT reverseDNSQuery('192.168.0.2');
-                ```
-
-                Result:
-
-                ``` text
-                ┌─reverseDNSQuery('192.168.0.2')────────────┐
-                │ ['test2.example.com','test3.example.com'] │
-                └───────────────────────────────────────────┘
-                ```
-                )")
+            FunctionDocumentation{
+                .description = R"(Performs a reverse DNS query to get the PTR records associated with the IP address)",
+                .syntax = "reverseDNSQuery(address)",
+                .arguments = {{"address", "An IPv4 or IPv6 address. [String](../../sql-reference/data-types/string.md)"}},
+                .returned_value = "Associated domains (PTR records). [String](../../sql-reference/data-types/string.md).",
+                .examples = {{"",
+                              "SELECT reverseDNSQuery('192.168.0.2');",
+R"(
+┌─reverseDNSQuery('192.168.0.2')────────────┐
+│ ['test2.example.com','test3.example.com'] │
+└───────────────────────────────────────────┘
+)"}}
+            }
     );
 }
 
diff --git a/src/Functions/roundAge.cpp b/src/Functions/roundAge.cpp
index d2503bb6938..cca92c19b0c 100644
--- a/src/Functions/roundAge.cpp
+++ b/src/Functions/roundAge.cpp
@@ -10,8 +10,7 @@ template <typename A>
 struct RoundAgeImpl
 {
     using ResultType = UInt8;
-    static constexpr const bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr const bool allow_string_or_fixed_string = false;
 
     static inline ResultType apply(A x)
     {
diff --git a/src/Functions/roundDuration.cpp b/src/Functions/roundDuration.cpp
index 62d35ea194d..918f0b3425d 100644
--- a/src/Functions/roundDuration.cpp
+++ b/src/Functions/roundDuration.cpp
@@ -10,8 +10,7 @@ template <typename A>
 struct RoundDurationImpl
 {
     using ResultType = UInt16;
-    static constexpr const bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr bool allow_string_or_fixed_string = false;
 
     static inline ResultType apply(A x)
     {
diff --git a/src/Functions/roundToExp2.cpp b/src/Functions/roundToExp2.cpp
index ef29b5eaf4a..607c67b742e 100644
--- a/src/Functions/roundToExp2.cpp
+++ b/src/Functions/roundToExp2.cpp
@@ -63,8 +63,7 @@ template <typename T>
 struct RoundToExp2Impl
 {
     using ResultType = T;
-    static constexpr const bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr const bool allow_string_or_fixed_string = false;
 
     static inline T apply(T x)
     {
diff --git a/src/Functions/runningDifference.h b/src/Functions/runningDifference.h
index 154370d4cd9..f1ec4f9e523 100644
--- a/src/Functions/runningDifference.h
+++ b/src/Functions/runningDifference.h
@@ -70,7 +70,7 @@ private:
 
             if (!has_prev_value)
             {
-                dst[i] = is_first_line_zero ? 0 : src[i];
+                dst[i] = is_first_line_zero ? static_cast<Dst>(0) : static_cast<Dst>(src[i]);
                 prev = src[i];
                 has_prev_value = true;
             }
@@ -102,6 +102,10 @@ private:
             f(UInt32());
         else if (which.isUInt64())
             f(UInt64());
+        else if (which.isUInt128())
+            f(UInt128());
+        else if (which.isUInt256())
+            f(UInt256());
         else if (which.isInt8())
             f(Int8());
         else if (which.isInt16())
@@ -110,6 +114,10 @@ private:
             f(Int32());
         else if (which.isInt64())
             f(Int64());
+        else if (which.isInt128())
+            f(Int128());
+        else if (which.isInt256())
+            f(Int256());
         else if (which.isFloat32())
             f(Float32());
         else if (which.isFloat64())
diff --git a/src/Functions/serverConstants.cpp b/src/Functions/serverConstants.cpp
index 96615d0a4c9..19a0d82caf4 100644
--- a/src/Functions/serverConstants.cpp
+++ b/src/Functions/serverConstants.cpp
@@ -184,15 +184,15 @@ REGISTER_FUNCTION(GetOSKernelVersion)
 
 REGISTER_FUNCTION(DisplayName)
 {
-    factory.registerFunction<FunctionDisplayName>(
+    factory.registerFunction<FunctionDisplayName>(FunctionDocumentation
         {
-            R"(
+            .description=R"(
 Returns the value of `display_name` from config or server FQDN if not set.
 
 [example:displayName]
 )",
-            Documentation::Examples{{"displayName", "SELECT displayName();"}},
-            Documentation::Categories{"Constant", "Miscellaneous"}
+            .examples{{"displayName", "SELECT displayName();", ""}},
+            .categories{"Constant", "Miscellaneous"}
         },
         FunctionFactory::CaseSensitive);
 }
diff --git a/src/Functions/sign.cpp b/src/Functions/sign.cpp
index 60ad6ba5365..6c849760eed 100644
--- a/src/Functions/sign.cpp
+++ b/src/Functions/sign.cpp
@@ -9,8 +9,7 @@ template <typename A>
 struct SignImpl
 {
     using ResultType = Int8;
-    static const constexpr bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static constexpr bool allow_string_or_fixed_string = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
diff --git a/src/Functions/soundex.cpp b/src/Functions/soundex.cpp
new file mode 100644
index 00000000000..0cddfc90f7c
--- /dev/null
+++ b/src/Functions/soundex.cpp
@@ -0,0 +1,119 @@
+#include <cctype>
+
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionStringToString.h>
+#include <Common/StringUtils/StringUtils.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_COLUMN;
+}
+/** Soundex algorithm, https://en.wikipedia.org/wiki/Soundex
+  * Implemented similarly as in most SQL dialects:
+  * 1. Save the first letter. Map all occurrences of a, e, i, o, u, y, h, w. to zero(0)
+  * 2. Replace all consonants (include the first letter) with digits as follows:
+  *  - b, f, p, v → 1
+  *  - c, g, j, k, q, s, x, z → 2
+  *  - d, t → 3
+  *  - l → 4
+  *  - m, n → 5
+  *  - r → 6
+  * 3. Replace all adjacent same digits with one digit, and then remove all the zero (0) digits
+  * 4. If the saved letter's digit is the same as the resulting first digit, remove the digit (keep the letter).
+  * 5. Append 3 zeros if result contains less than 3 digits. Remove all except first letter and 3 digits after it.
+  */
+
+struct SoundexImpl
+{
+    static constexpr auto length = 4z;
+    static constexpr auto soundex_map = "01230120022455012623010202";
+
+    static void calculate(const char * value, size_t value_length, char * out)
+    {
+        const char * cur = value;
+        const char * const end = value + value_length;
+        char * const out_end = out + length;
+
+        while (cur < end && !isAlphaASCII(*cur))
+            ++cur;
+
+        char prev_code = '0';
+        if (cur < end)
+        {
+            *out = toUpperIfAlphaASCII(*cur);
+            ++out;
+            prev_code = soundex_map[toUpperIfAlphaASCII(*cur) - 'A'];
+            ++cur;
+        }
+
+        while (cur < end && !isAlphaASCII(*cur))
+            ++cur;
+
+        while (cur < end && out < out_end)
+        {
+            char current_code = soundex_map[toUpperIfAlphaASCII(*cur) - 'A'];
+            if ((current_code != '0') && (current_code != prev_code))
+            {
+                *out = current_code;
+                ++out;
+            }
+            prev_code = current_code;
+            ++cur;
+
+            while (cur < end && !isAlphaASCII(*cur))
+                ++cur;
+        }
+
+        while (out < out_end)
+        {
+            *out = '0';
+            ++out;
+        }
+    }
+
+    static void vector(
+        const ColumnString::Chars & data,
+        const ColumnString::Offsets & offsets,
+        ColumnString::Chars & res_data,
+        ColumnString::Offsets & res_offsets)
+    {
+        const size_t size = offsets.size();
+        res_data.resize(size * (length + 1));
+        res_offsets.resize(size);
+
+        size_t prev_offset = 0;
+        for (size_t i = 0; i < size; ++i)
+        {
+            const char * value = reinterpret_cast<const char *>(&data[prev_offset]);
+            const size_t value_length = offsets[i] - prev_offset - 1;
+            const size_t out_index = i * (length + 1);
+            calculate(value, value_length, reinterpret_cast<char *>(&res_data[out_index]));
+            res_data[out_index + length] = '\0';
+            res_offsets[i] = (out_index + length + 1);
+            prev_offset = offsets[i];
+        }
+    }
+
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
+    {
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column of type FixedString is not supported by soundex function");
+    }
+};
+
+struct NameSoundex
+{
+    static constexpr auto name = "soundex";
+};
+
+REGISTER_FUNCTION(Soundex)
+{
+    factory.registerFunction<FunctionStringToString<SoundexImpl, NameSoundex>>(
+        FunctionDocumentation{.description="Returns Soundex code of a string."}, FunctionFactory::CaseInsensitive);
+}
+
+
+}
diff --git a/src/Functions/space.cpp b/src/Functions/space.cpp
new file mode 100644
index 00000000000..009bc20e065
--- /dev/null
+++ b/src/Functions/space.cpp
@@ -0,0 +1,179 @@
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
+#include <cstring>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_COLUMN;
+    extern const int TOO_LARGE_STRING_SIZE;
+}
+
+namespace
+{
+
+/// Prints whitespace n-times. Actually, space() could also be pushed down to repeat(). Chose a standalone-implementation because
+/// we can do memset() whereas repeat() does memcpy().
+class FunctionSpace : public IFunction
+{
+private:
+    static constexpr auto space = ' ';
+
+    /// Safety threshold against DoS.
+    static inline void checkRepeatTime(size_t repeat_time)
+    {
+        static constexpr auto max_repeat_times = 1'000'000uz;
+        if (repeat_time > max_repeat_times)
+            throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too many times to repeat ({}), maximum is: {}", repeat_time, max_repeat_times);
+    }
+
+public:
+    static constexpr auto name = "space";
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionSpace>(); }
+
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 1; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        FunctionArgumentDescriptors args{
+            {"n", &isInteger<IDataType>, nullptr, "Integer"}
+        };
+
+        validateFunctionArgumentTypes(*this, arguments, args);
+
+        return std::make_shared<DataTypeString>();
+    }
+
+
+    template <typename DataType>
+    bool executeConstant(ColumnPtr col_times, ColumnString::Offsets & res_offsets, ColumnString::Chars & res_chars) const
+    {
+        const ColumnConst * col_times_const = checkAndGetColumn<ColumnConst>(col_times.get());
+
+        const ColumnPtr & col_times_const_internal = col_times_const->getDataColumnPtr();
+        if (!checkAndGetColumn<typename DataType::ColumnType>(col_times_const_internal.get()))
+            return false;
+
+        using T = typename DataType::FieldType;
+        T times = col_times_const->getValue<T>();
+
+        if (times < 1)
+            times = 0;
+
+        checkRepeatTime(times);
+
+        res_offsets.resize(col_times->size());
+        res_chars.resize(col_times->size() * (times + 1));
+
+        size_t pos = 0;
+
+        for (size_t i = 0; i < col_times->size(); ++i)
+        {
+            memset(res_chars.begin() + pos, space, times);
+            pos += times;
+
+            *(res_chars.begin() + pos) = '\0';
+            pos += 1;
+
+            res_offsets[i] = pos;
+        }
+
+        return true;
+    }
+
+
+    template <typename DataType>
+    bool executeVector(ColumnPtr col_times_, ColumnString::Offsets & res_offsets, ColumnString::Chars & res_chars) const
+    {
+        auto * col_times = checkAndGetColumn<typename DataType::ColumnType>(col_times_.get());
+        if (!col_times)
+            return false;
+
+        res_offsets.resize(col_times->size());
+        res_chars.resize(col_times->size() * 10); /// heuristic
+
+        const PaddedPODArray<typename DataType::FieldType> & times_data = col_times->getData();
+
+        size_t pos = 0;
+
+        for (size_t i = 0; i < col_times->size(); ++i)
+        {
+            typename DataType::FieldType times = times_data[i];
+
+            if (times < 1)
+                times = 0;
+
+            checkRepeatTime(times);
+
+            if (pos + times + 1 > res_chars.size())
+                res_chars.resize(std::max(2 * res_chars.size(), static_cast<size_t>(pos + times + 1)));
+
+            memset(res_chars.begin() + pos, space, times);
+            pos += times;
+
+            *(res_chars.begin() + pos) = '\0';
+            pos += 1;
+
+            res_offsets[i] = pos;
+        }
+
+        res_chars.resize(pos);
+
+        return true;
+    }
+
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    {
+        const auto & col_num = arguments[0].column;
+
+        auto col_res = ColumnString::create();
+
+        ColumnString::Offsets & res_offsets = col_res->getOffsets();
+        ColumnString::Chars & res_chars = col_res->getChars();
+
+        if (const ColumnConst * col_num_const = checkAndGetColumn<ColumnConst>(col_num.get()))
+        {
+            if ((executeConstant<DataTypeUInt8>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeUInt16>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeUInt32>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeUInt64>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeInt8>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeInt16>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeInt32>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeInt64>(col_num, res_offsets, res_chars)))
+                return col_res;
+        }
+        else
+        {
+            if ((executeVector<DataTypeUInt8>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeUInt16>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeUInt32>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeUInt64>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeInt8>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeInt16>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeInt32>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeInt64>(col_num, res_offsets, res_chars)))
+                return col_res;
+        }
+
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}", arguments[0].column->getName(), getName());
+    }
+};
+}
+
+REGISTER_FUNCTION(Space)
+{
+    factory.registerFunction<FunctionSpace>({}, FunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/Functions/svg.cpp b/src/Functions/svg.cpp
index 69e619df901..f8f85216b3f 100644
--- a/src/Functions/svg.cpp
+++ b/src/Functions/svg.cpp
@@ -13,8 +13,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int TOO_MANY_ARGUMENTS_FOR_FUNCTION;
-    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
 class FunctionSvg : public IFunction
@@ -48,13 +47,9 @@ public:
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
-        if (arguments.size() > 2)
+        if (arguments.empty() || arguments.size() > 2)
         {
-            throw Exception(ErrorCodes::TOO_MANY_ARGUMENTS_FOR_FUNCTION, "Too many arguments");
-        }
-        else if (arguments.empty())
-        {
-            throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION, "Too few arguments");
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Incorrect number of arguments: expected 1 or 2 arguments");
         }
         else if (arguments.size() == 2 && checkAndGetDataType<DataTypeString>(arguments[1].get()) == nullptr)
         {
diff --git a/src/Functions/tests/gtest_number_traits.cpp b/src/Functions/tests/gtest_number_traits.cpp
index 7f25c6cbeb7..d0ac681e6e8 100644
--- a/src/Functions/tests/gtest_number_traits.cpp
+++ b/src/Functions/tests/gtest_number_traits.cpp
@@ -5,8 +5,6 @@
 
 #include <DataTypes/NumberTraits.h>
 
-#pragma GCC diagnostic ignored "-Wframe-larger-than="
-
 static const std::map<std::pair<std::string, std::string>, std::string> answer =
 {
     {{"UInt8", "UInt8"}, "UInt8"},
diff --git a/src/Functions/toTimezone.cpp b/src/Functions/toTimezone.cpp
index ddac22d3173..0a54e5a86b7 100644
--- a/src/Functions/toTimezone.cpp
+++ b/src/Functions/toTimezone.cpp
@@ -8,7 +8,6 @@
 #include <IO/WriteHelpers.h>
 #include <Common/assert_cast.h>
 
-
 namespace DB
 {
 namespace ErrorCodes
@@ -100,6 +99,7 @@ public:
                 "Should be DateTime or DateTime64", arguments[0].type->getName(), getName());
 
         String time_zone_name = extractTimeZoneNameFromFunctionArguments(arguments, 1, 0);
+
         if (which_type.isDateTime())
             return std::make_shared<DataTypeDateTime>(time_zone_name);
 
diff --git a/src/Functions/toValidUTF8.cpp b/src/Functions/toValidUTF8.cpp
index e509b59a23e..528cef93dd3 100644
--- a/src/Functions/toValidUTF8.cpp
+++ b/src/Functions/toValidUTF8.cpp
@@ -13,9 +13,7 @@
 
 #if defined(__aarch64__) && defined(__ARM_NEON)
 #    include <arm_neon.h>
-#    ifdef HAS_RESERVED_IDENTIFIER
-#        pragma clang diagnostic ignored "-Wreserved-identifier"
-#    endif
+#      pragma clang diagnostic ignored "-Wreserved-identifier"
 #endif
 
 namespace DB
diff --git a/src/Functions/transform.cpp b/src/Functions/transform.cpp
index c8a94bcffa6..9970012ef4a 100644
--- a/src/Functions/transform.cpp
+++ b/src/Functions/transform.cpp
@@ -1,24 +1,21 @@
 #include <mutex>
 #include <base/bit_cast.h>
 
-#include <Common/FieldVisitorDump.h>
-#include <Common/FieldVisitorConvertToNumber.h>
-#include <DataTypes/DataTypeArray.h>
-#include <Columns/ColumnString.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
-#include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnString.h>
+#include <Core/DecimalFunctions.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/getLeastSupertype.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
+#include <Interpreters/castColumn.h>
+#include <Interpreters/convertFieldToType.h>
 #include <Common/Arena.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/typeid_cast.h>
-#include <base/StringRef.h>
-#include <Functions/IFunction.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/getLeastSupertype.h>
-#include <Interpreters/convertFieldToType.h>
-
 
 namespace DB
 {
@@ -32,11 +29,9 @@ namespace ErrorCodes
 
 namespace
 {
-
-/** transform(x, from_array, to_array[, default]) - convert x according to an explicitly passed match.
+    /** transform(x, from_array, to_array[, default]) - convert x according to an explicitly passed match.
   */
-
-/** transform(x, [from...], [to...], default)
+    /** transform(x, [from...], [to...], default)
   * - converts the values according to the explicitly specified mapping.
   *
   * x - what to transform.
@@ -56,1147 +51,663 @@ namespace
   *
   * Note: the implementation is rather cumbersome.
   */
-class FunctionTransform : public IFunction
-{
-public:
-    static constexpr auto name = "transform";
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionTransform>(); }
-
-    String getName() const override
+    class FunctionTransform : public IFunction
     {
-        return name;
-    }
+    public:
+        static constexpr auto name = "transform";
+        static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionTransform>(); }
 
-    bool isVariadic() const override { return true; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
-    bool useDefaultImplementationForConstants() const override { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
+        String getName() const override { return name; }
 
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
-    {
-        const auto args_size = arguments.size();
-        if (args_size != 3 && args_size != 4)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Number of arguments for function {} doesn't match: "
-                "passed {}, should be 3 or 4", getName(), args_size);
+        bool isVariadic() const override { return true; }
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+        size_t getNumberOfArguments() const override { return 0; }
+        bool useDefaultImplementationForConstants() const override { return false; }
+        bool useDefaultImplementationForNulls() const override { return false; }
+        bool useDefaultImplementationForNothing() const override { return false; }
+        ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
-        const DataTypePtr & type_x = arguments[0];
-
-        if (!type_x->isValueRepresentedByNumber() && !isString(type_x))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "Unsupported type {} of first argument "
-                            "of function {}, must be numeric type or Date/DateTime or String",
-                            type_x->getName(), getName());
-
-        const DataTypeArray * type_arr_from = checkAndGetDataType<DataTypeArray>(arguments[1].get());
-
-        if (!type_arr_from)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "Second argument of function {}, must be array of source values to transform from.",
-                            getName());
-
-        const auto type_arr_from_nested = type_arr_from->getNestedType();
-
-        if ((type_x->isValueRepresentedByNumber() != type_arr_from_nested->isValueRepresentedByNumber())
-            || (isString(type_x) != isString(type_arr_from_nested)))
+        DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
         {
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "First argument and elements of array "
-                            "of second argument of function {} must have compatible types: "
-                            "both numeric or both strings.", getName());
-        }
+            const auto args_size = arguments.size();
+            if (args_size != 3 && args_size != 4)
+                throw Exception(
+                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Number of arguments for function {} doesn't match: "
+                    "passed {}, should be 3 or 4",
+                    getName(),
+                    args_size);
 
-        const DataTypeArray * type_arr_to = checkAndGetDataType<DataTypeArray>(arguments[2].get());
+            const DataTypePtr & type_x = arguments[0];
+            const auto & type_x_nn = removeNullable(type_x);
 
-        if (!type_arr_to)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "Third argument of function {}, must be array of destination values to transform to.",
-                            getName());
+            if (!type_x_nn->isValueRepresentedByNumber() && !isString(type_x_nn) && !isNothing(type_x_nn))
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Unsupported type {} of first argument "
+                    "of function {}, must be numeric type or Date/DateTime or String",
+                    type_x->getName(),
+                    getName());
 
-        const DataTypePtr & type_arr_to_nested = type_arr_to->getNestedType();
+            const DataTypeArray * type_arr_from = checkAndGetDataType<DataTypeArray>(arguments[1].get());
 
-        if (args_size == 3)
-        {
-            if ((type_x->isValueRepresentedByNumber() != type_arr_to_nested->isValueRepresentedByNumber())
-                || (isString(type_x) != isString(type_arr_to_nested)))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function {} has signature: "
-                                "transform(T, Array(T), Array(U), U) -> U; "
-                                "or transform(T, Array(T), Array(T)) -> T; where T and U are types.", getName());
+            if (!type_arr_from)
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Second argument of function {}, must be array of source values to transform from.",
+                    getName());
 
-            return getLeastSupertype(DataTypes{type_x, type_arr_to_nested});
-        }
-        else
-        {
-            const DataTypePtr & type_default = arguments[3];
+            const auto type_arr_from_nested = type_arr_from->getNestedType();
 
-            if (!type_default->isValueRepresentedByNumber() && !isString(type_default))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                                "Unsupported type {} of fourth argument (default value) "
-                                "of function {}, must be numeric type or Date/DateTime or String",
-                                type_default->getName(), getName());
-
-            bool default_is_string = WhichDataType(type_default).isString();
-            bool nested_is_string = WhichDataType(type_arr_to_nested).isString();
-
-            if ((type_default->isValueRepresentedByNumber() != type_arr_to_nested->isValueRepresentedByNumber())
-                || (default_is_string != nested_is_string))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function {} have signature: "
-                                "transform(T, Array(T), Array(U), U) -> U; "
-                                "or transform(T, Array(T), Array(T)) -> T; where T and U are types.", getName());
-
-            if (type_arr_to_nested->isValueRepresentedByNumber() && type_default->isValueRepresentedByNumber())
+            if ((type_x->isValueRepresentedByNumber() != type_arr_from_nested->isValueRepresentedByNumber())
+                || (isString(type_x) != isString(type_arr_from_nested)))
             {
-                /// We take the smallest common type for the elements of the array of values `to` and for `default`.
-                return getLeastSupertype(DataTypes{type_arr_to_nested, type_default});
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "First argument and elements of array "
+                    "of second argument of function {} must have compatible types: "
+                    "both numeric or both strings.",
+                    getName());
             }
 
-            /// TODO More checks.
-            return type_arr_to_nested;
-        }
-    }
+            const DataTypeArray * type_arr_to = checkAndGetDataType<DataTypeArray>(arguments[2].get());
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        const ColumnConst * array_from = checkAndGetColumnConst<ColumnArray>(arguments[1].column.get());
-        const ColumnConst * array_to = checkAndGetColumnConst<ColumnArray>(arguments[2].column.get());
+            if (!type_arr_to)
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Third argument of function {}, must be array of destination values to transform to.",
+                    getName());
 
-        if (!array_from || !array_to)
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Second and third arguments of function {} must be constant arrays.", getName());
+            const DataTypePtr & type_arr_to_nested = type_arr_to->getNestedType();
 
-        initialize(array_from->getValue<Array>(), array_to->getValue<Array>(), arguments);
-
-        const auto * in = arguments.front().column.get();
-
-        if (isColumnConst(*in))
-            return executeConst(arguments, result_type, input_rows_count);
-
-        const IColumn * default_column = nullptr;
-        if (arguments.size() == 4)
-            default_column = arguments[3].column.get();
-
-        auto column_result = result_type->createColumn();
-        auto * out = column_result.get();
-
-        if (!executeNum<UInt8>(in, out, default_column)
-            && !executeNum<UInt16>(in, out, default_column)
-            && !executeNum<UInt32>(in, out, default_column)
-            && !executeNum<UInt64>(in, out, default_column)
-            && !executeNum<Int8>(in, out, default_column)
-            && !executeNum<Int16>(in, out, default_column)
-            && !executeNum<Int32>(in, out, default_column)
-            && !executeNum<Int64>(in, out, default_column)
-            && !executeNum<Float32>(in, out, default_column)
-            && !executeNum<Float64>(in, out, default_column)
-            && !executeDecimal<Decimal32>(in, out, default_column)
-            && !executeDecimal<Decimal64>(in, out, default_column)
-            && !executeString(in, out, default_column))
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}", in->getName(), getName());
-        }
-
-        return column_result;
-    }
-
-private:
-    static ColumnPtr executeConst(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
-    {
-        /// Materialize the input column and compute the function as usual.
-
-        ColumnsWithTypeAndName args = arguments;
-        args[0].column = args[0].column->cloneResized(input_rows_count)->convertToFullColumnIfConst();
-
-        auto impl = FunctionToOverloadResolverAdaptor(std::make_shared<FunctionTransform>()).build(args);
-
-        return impl->execute(args, result_type, input_rows_count);
-    }
-
-    template <typename T>
-    bool executeNum(const IColumn * in_untyped, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        if (const auto in = checkAndGetColumn<ColumnVector<T>>(in_untyped))
-        {
-            if (!default_untyped)
+            if (args_size == 3)
             {
-                auto out = typeid_cast<ColumnVector<T> *>(out_untyped);
-                if (!out)
-                {
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                                    "Illegal column {} of elements "
-                                    "of array of third argument of function {}, must be {}",
-                                    out_untyped->getName(), getName(), in->getName());
-                }
+                if ((type_x->isValueRepresentedByNumber() != type_arr_to_nested->isValueRepresentedByNumber())
+                    || (isString(type_x) != isString(type_arr_to_nested)))
+                    throw Exception(
+                        ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Function {} has signature: "
+                        "transform(T, Array(T), Array(U), U) -> U; "
+                        "or transform(T, Array(T), Array(T)) -> T; where T and U are types.",
+                        getName());
 
-                executeImplNumToNum<T>(in->getData(), out->getData());
-            }
-            else if (isColumnConst(*default_untyped))
-            {
-                if (!executeNumToNumWithConstDefault<T, UInt8>(in, out_untyped)
-                    && !executeNumToNumWithConstDefault<T, UInt16>(in, out_untyped)
-                    && !executeNumToNumWithConstDefault<T, UInt32>(in, out_untyped)
-                    && !executeNumToNumWithConstDefault<T, UInt64>(in, out_untyped)
-                    && !executeNumToNumWithConstDefault<T, Int8>(in, out_untyped)
-                    && !executeNumToNumWithConstDefault<T, Int16>(in, out_untyped)
-                    && !executeNumToNumWithConstDefault<T, Int32>(in, out_untyped)
-                    && !executeNumToNumWithConstDefault<T, Int64>(in, out_untyped)
-                    && !executeNumToNumWithConstDefault<T, Float32>(in, out_untyped)
-                    && !executeNumToNumWithConstDefault<T, Float64>(in, out_untyped)
-                    && !executeNumToDecimalWithConstDefault<T, Decimal32>(in, out_untyped)
-                    && !executeNumToDecimalWithConstDefault<T, Decimal64>(in, out_untyped)
-                    && !executeNumToStringWithConstDefault<T>(in, out_untyped))
-                {
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of elements of array of second argument of function {}",
-                        in->getName(), getName());
-                }
+                auto ret = tryGetLeastSupertype(DataTypes{type_arr_to_nested, type_x});
+                if (!ret)
+                    throw Exception(
+                        ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Function {} has signature: "
+                        "transform(T, Array(T), Array(U), U) -> U; "
+                        "or transform(T, Array(T), Array(T)) -> T; where T and U are types.",
+                        getName());
+                checkAllowedType(ret);
+                return ret;
             }
             else
             {
-                if (!executeNumToNumWithNonConstDefault<T, UInt8>(in, out_untyped, default_untyped)
-                    && !executeNumToNumWithNonConstDefault<T, UInt16>(in, out_untyped, default_untyped)
-                    && !executeNumToNumWithNonConstDefault<T, UInt32>(in, out_untyped, default_untyped)
-                    && !executeNumToNumWithNonConstDefault<T, UInt64>(in, out_untyped, default_untyped)
-                    && !executeNumToNumWithNonConstDefault<T, Int8>(in, out_untyped, default_untyped)
-                    && !executeNumToNumWithNonConstDefault<T, Int16>(in, out_untyped, default_untyped)
-                    && !executeNumToNumWithNonConstDefault<T, Int32>(in, out_untyped, default_untyped)
-                    && !executeNumToNumWithNonConstDefault<T, Int64>(in, out_untyped, default_untyped)
-                    && !executeNumToNumWithNonConstDefault<T, Float32>(in, out_untyped, default_untyped)
-                    && !executeNumToNumWithNonConstDefault<T, Float64>(in, out_untyped, default_untyped)
-                    && !executeNumToDecimalWithNonConstDefault<T, Decimal32>(in, out_untyped, default_untyped)
-                    && !executeNumToDecimalWithNonConstDefault<T, Decimal64>(in, out_untyped, default_untyped)
-                    && !executeNumToStringWithNonConstDefault<T>(in, out_untyped, default_untyped))
-                {
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of elements of array of second argument of function {}",
-                        in->getName(), getName());
-                }
+                auto ret = tryGetLeastSupertype(DataTypes{type_arr_to_nested, arguments[3]});
+                if (!ret)
+                    throw Exception(
+                        ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Function {} have signature: "
+                        "transform(T, Array(T), Array(U), U) -> U; "
+                        "or transform(T, Array(T), Array(T)) -> T; where T and U are types.",
+                        getName());
+                checkAllowedType(ret);
+                return ret;
             }
-
-            return true;
         }
 
-        return false;
-    }
-
-    template <typename T>
-    bool executeDecimal(const IColumn * in_untyped, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        if (const auto in = checkAndGetColumn<ColumnDecimal<T>>(in_untyped))
+        ColumnPtr
+        executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
         {
-            if (!default_untyped)
-            {
-                auto out = typeid_cast<ColumnDecimal<T> *>(out_untyped);
-                if (!out)
-                {
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                                    "Illegal column {} of elements "
-                                    "of array of third argument of function {}, must be {}",
-                                    out_untyped->getName(), getName(), in->getName());
-                }
+            initialize(arguments, result_type);
 
-                executeImplNumToNum<T>(in->getData(), out->getData());
+            const auto * in = arguments.front().column.get();
+
+            if (isColumnConst(*in))
+                return executeConst(arguments, result_type, input_rows_count);
+
+            ColumnPtr default_non_const;
+            if (!cache.default_column && arguments.size() == 4)
+                default_non_const = castColumn(arguments[3], result_type);
+
+            auto column_result = result_type->createColumn();
+            if (!executeNum<ColumnVector<UInt8>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnVector<UInt16>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnVector<UInt32>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnVector<UInt64>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnVector<Int8>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnVector<Int16>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnVector<Int32>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnVector<Int64>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnVector<Float32>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnVector<Float64>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnDecimal<Decimal32>>(in, *column_result, default_non_const)
+                && !executeNum<ColumnDecimal<Decimal64>>(in, *column_result, default_non_const)
+                && !executeString(in, *column_result, default_non_const))
+            {
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}", in->getName(), getName());
             }
-            else if (isColumnConst(*default_untyped))
+            return column_result;
+        }
+
+    private:
+        static ColumnPtr executeConst(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
+        {
+            /// Materialize the input column and compute the function as usual.
+
+            ColumnsWithTypeAndName args = arguments;
+            args[0].column = args[0].column->cloneResized(input_rows_count)->convertToFullColumnIfConst();
+
+            auto impl = FunctionToOverloadResolverAdaptor(std::make_shared<FunctionTransform>()).build(args);
+
+            return impl->execute(args, result_type, input_rows_count);
+        }
+
+        template <typename T>
+        bool executeNum(const IColumn * in_untyped, IColumn & column_result, const ColumnPtr default_non_const) const
+        {
+            const auto * const in = checkAndGetColumn<T>(in_untyped);
+            if (!in)
+                return false;
+            const auto & pod = in->getData();
+            UInt32 in_scale = 0;
+            if constexpr (std::is_same_v<ColumnDecimal<Decimal32>, T> || std::is_same_v<ColumnDecimal<Decimal64>, T>)
+                in_scale = in->getScale();
+
+            if (!executeNumToString(pod, column_result, default_non_const)
+                && !executeNumToNum<ColumnVector<UInt8>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<UInt16>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<UInt32>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<UInt64>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Int8>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Int16>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Int32>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Int64>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Float32>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Float64>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnDecimal<Decimal32>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnDecimal<Decimal64>>(pod, column_result, default_non_const, in_scale))
             {
-                if (!executeDecimalToNumWithConstDefault<T, UInt8>(in, out_untyped)
-                    && !executeDecimalToNumWithConstDefault<T, UInt16>(in, out_untyped)
-                    && !executeDecimalToNumWithConstDefault<T, UInt32>(in, out_untyped)
-                    && !executeDecimalToNumWithConstDefault<T, UInt64>(in, out_untyped)
-                    && !executeDecimalToNumWithConstDefault<T, Int8>(in, out_untyped)
-                    && !executeDecimalToNumWithConstDefault<T, Int16>(in, out_untyped)
-                    && !executeDecimalToNumWithConstDefault<T, Int32>(in, out_untyped)
-                    && !executeDecimalToNumWithConstDefault<T, Int64>(in, out_untyped)
-                    && !executeDecimalToNumWithConstDefault<T, Float32>(in, out_untyped)
-                    && !executeDecimalToNumWithConstDefault<T, Float64>(in, out_untyped)
-                    && !executeDecimalToDecimalWithConstDefault<T, Decimal32>(in, out_untyped)
-                    && !executeDecimalToDecimalWithConstDefault<T, Decimal64>(in, out_untyped)
-                    && !executeDecimalToStringWithConstDefault<T>(in, out_untyped))
-                {
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of elements of array of second argument of function {}",
-                                    in->getName(), getName());
-                }
-            }
-            else
-            {
-                if (!executeDecimalToNumWithNonConstDefault<T, UInt8>(in, out_untyped, default_untyped)
-                    && !executeDecimalToNumWithNonConstDefault<T, UInt16>(in, out_untyped, default_untyped)
-                    && !executeDecimalToNumWithNonConstDefault<T, UInt32>(in, out_untyped, default_untyped)
-                    && !executeDecimalToNumWithNonConstDefault<T, UInt64>(in, out_untyped, default_untyped)
-                    && !executeDecimalToNumWithNonConstDefault<T, Int8>(in, out_untyped, default_untyped)
-                    && !executeDecimalToNumWithNonConstDefault<T, Int16>(in, out_untyped, default_untyped)
-                    && !executeDecimalToNumWithNonConstDefault<T, Int32>(in, out_untyped, default_untyped)
-                    && !executeDecimalToNumWithNonConstDefault<T, Int64>(in, out_untyped, default_untyped)
-                    && !executeDecimalToNumWithNonConstDefault<T, Float32>(in, out_untyped, default_untyped)
-                    && !executeDecimalToNumWithNonConstDefault<T, Float64>(in, out_untyped, default_untyped)
-                    && !executeDecimalToDecimalWithNonConstDefault<T, Decimal32>(in, out_untyped, default_untyped)
-                    && !executeDecimalToDecimalWithNonConstDefault<T, Decimal64>(in, out_untyped, default_untyped)
-                    && !executeDecimalToStringWithNonConstDefault<T>(in, out_untyped, default_untyped))
-                {
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of elements of array of second argument of function {}",
-                                    in->getName(), getName());
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    bool executeString(const IColumn * in_untyped, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        if (const auto * in = checkAndGetColumn<ColumnString>(in_untyped))
-        {
-            if (!default_untyped)
-            {
-                if (!executeStringToString(in, out_untyped))
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of elements of array of second argument of function {}",
-                        in->getName(), getName());
-            }
-            else if (isColumnConst(*default_untyped))
-            {
-                if (!executeStringToNumWithConstDefault<UInt8>(in, out_untyped)
-                    && !executeStringToNumWithConstDefault<UInt16>(in, out_untyped)
-                    && !executeStringToNumWithConstDefault<UInt32>(in, out_untyped)
-                    && !executeStringToNumWithConstDefault<UInt64>(in, out_untyped)
-                    && !executeStringToNumWithConstDefault<Int8>(in, out_untyped)
-                    && !executeStringToNumWithConstDefault<Int16>(in, out_untyped)
-                    && !executeStringToNumWithConstDefault<Int32>(in, out_untyped)
-                    && !executeStringToNumWithConstDefault<Int64>(in, out_untyped)
-                    && !executeStringToNumWithConstDefault<Float32>(in, out_untyped)
-                    && !executeStringToNumWithConstDefault<Float64>(in, out_untyped)
-                    && !executeStringToDecimalWithConstDefault<Decimal32>(in, out_untyped)
-                    && !executeStringToDecimalWithConstDefault<Decimal64>(in, out_untyped)
-                    && !executeStringToStringWithConstDefault(in, out_untyped))
-                {
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of elements of array of second argument of function {}",
-                        in->getName(), getName());
-                }
-            }
-            else
-            {
-                if (!executeStringToNumWithNonConstDefault<UInt8>(in, out_untyped, default_untyped)
-                    && !executeStringToNumWithNonConstDefault<UInt16>(in, out_untyped, default_untyped)
-                    && !executeStringToNumWithNonConstDefault<UInt32>(in, out_untyped, default_untyped)
-                    && !executeStringToNumWithNonConstDefault<UInt64>(in, out_untyped, default_untyped)
-                    && !executeStringToNumWithNonConstDefault<Int8>(in, out_untyped, default_untyped)
-                    && !executeStringToNumWithNonConstDefault<Int16>(in, out_untyped, default_untyped)
-                    && !executeStringToNumWithNonConstDefault<Int32>(in, out_untyped, default_untyped)
-                    && !executeStringToNumWithNonConstDefault<Int64>(in, out_untyped, default_untyped)
-                    && !executeStringToNumWithNonConstDefault<Float32>(in, out_untyped, default_untyped)
-                    && !executeStringToNumWithNonConstDefault<Float64>(in, out_untyped, default_untyped)
-                    && !executeStringToDecimalWithNonConstDefault<Decimal32>(in, out_untyped, default_untyped)
-                    && !executeStringToDecimalWithNonConstDefault<Decimal64>(in, out_untyped, default_untyped)
-
-                    && !executeStringToStringWithNonConstDefault(in, out_untyped, default_untyped))
-                {
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of elements of array of second argument of function {}",
-                        in->getName(), getName());
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    template <typename T, typename U>
-    bool executeNumToNumWithConstDefault(const ColumnVector<T> * in, IColumn * out_untyped) const
-    {
-        auto out = typeid_cast<ColumnVector<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        executeImplNumToNumWithConstDefault<T, U>(in->getData(), out->getData(), static_cast<U>(cache.const_default_value.get<U>()));
-        return true;
-    }
-
-    template <typename T, typename U>
-    bool executeNumToDecimalWithConstDefault(const ColumnVector<T> * in, IColumn * out_untyped) const
-    {
-        auto out = typeid_cast<ColumnDecimal<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        executeImplNumToNumWithConstDefault<T, U>(in->getData(), out->getData(), cache.const_default_value.get<U>());
-        return true;
-    }
-
-
-    template <typename T, typename U>
-    bool executeDecimalToNumWithConstDefault(const ColumnDecimal<T> * in, IColumn * out_untyped) const
-    {
-        auto out = typeid_cast<ColumnVector<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        executeImplNumToNumWithConstDefault<T, U>(in->getData(), out->getData(), static_cast<U>(cache.const_default_value.get<U>()));
-        return true;
-    }
-
-    template <typename T, typename U>
-    bool executeDecimalToDecimalWithConstDefault(const ColumnDecimal<T> * in, IColumn * out_untyped) const
-    {
-        auto out = typeid_cast<ColumnDecimal<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        executeImplNumToNumWithConstDefault<T, U>(in->getData(), out->getData(), cache.const_default_value.get<U>());
-        return true;
-    }
-
-    template <typename T, typename U>
-    bool executeNumToNumWithNonConstDefault(const ColumnVector<T> * in, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        auto out = typeid_cast<ColumnVector<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        if (!executeNumToNumWithNonConstDefault2<T, U, UInt8>(in, out, default_untyped)
-            && !executeNumToNumWithNonConstDefault2<T, U, UInt16>(in, out, default_untyped)
-            && !executeNumToNumWithNonConstDefault2<T, U, UInt32>(in, out, default_untyped)
-            && !executeNumToNumWithNonConstDefault2<T, U, UInt64>(in, out, default_untyped)
-            && !executeNumToNumWithNonConstDefault2<T, U, Int8>(in, out, default_untyped)
-            && !executeNumToNumWithNonConstDefault2<T, U, Int16>(in, out, default_untyped)
-            && !executeNumToNumWithNonConstDefault2<T, U, Int32>(in, out, default_untyped)
-            && !executeNumToNumWithNonConstDefault2<T, U, Int64>(in, out, default_untyped)
-            && !executeNumToNumWithNonConstDefault2<T, U, Float32>(in, out, default_untyped)
-            && !executeNumToNumWithNonConstDefault2<T, U, Float64>(in, out, default_untyped))
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of fourth argument of function {}",
-                default_untyped->getName(), getName());
-        }
-
-        return true;
-    }
-
-    template <typename T, typename U>
-    bool executeNumToDecimalWithNonConstDefault(const ColumnVector<T> * in, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        auto out = typeid_cast<ColumnDecimal<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        if (!executeNumToDecimalWithNonConstDefault2<T, U, UInt8>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefault2<T, U, UInt16>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefault2<T, U, UInt32>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefault2<T, U, UInt64>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefault2<T, U, Int8>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefault2<T, U, Int16>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefault2<T, U, Int32>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefault2<T, U, Int64>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefault2<T, U, Float32>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefault2<T, U, Float64>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefaultDecimal2<T, U, Decimal32>(in, out, default_untyped)
-            && !executeNumToDecimalWithNonConstDefaultDecimal2<T, U, Decimal64>(in, out, default_untyped))
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of fourth argument of function {}",
-                default_untyped->getName(), getName());
-        }
-
-        return true;
-    }
-
-    template <typename T, typename U>
-    bool executeDecimalToNumWithNonConstDefault(const ColumnDecimal<T> * in, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        auto out = typeid_cast<ColumnVector<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        if (!executeDecimalToNumWithNonConstDefault2<T, U, UInt8>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefault2<T, U, UInt16>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefault2<T, U, UInt32>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefault2<T, U, UInt64>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefault2<T, U, Int8>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefault2<T, U, Int16>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefault2<T, U, Int32>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefault2<T, U, Int64>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefault2<T, U, Float32>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefault2<T, U, Float64>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefaultDecimal2<T, U, Decimal32>(in, out, default_untyped)
-            && !executeDecimalToNumWithNonConstDefaultDecimal2<T, U, Decimal64>(in, out, default_untyped))
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of fourth argument of function {}",
-                default_untyped->getName(), getName());
-        }
-
-        return true;
-    }
-
-    template <typename T, typename U>
-    bool executeDecimalToDecimalWithNonConstDefault(const ColumnDecimal<T> * in, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        auto out = typeid_cast<ColumnDecimal<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        if (!executeDecimalToDecimalWithNonConstDefault2<T, U, UInt8>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefault2<T, U, UInt16>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefault2<T, U, UInt32>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefault2<T, U, UInt64>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefault2<T, U, Int8>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefault2<T, U, Int16>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefault2<T, U, Int32>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefault2<T, U, Int64>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefault2<T, U, Float32>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefault2<T, U, Float64>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefaultDecimal2<T, U, Decimal32>(in, out, default_untyped)
-            && !executeDecimalToDecimalWithNonConstDefaultDecimal2<T, U, Decimal64>(in, out, default_untyped))
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of fourth argument of function {}",
-                default_untyped->getName(), getName());
-        }
-
-        return true;
-    }
-
-    template <typename T, typename U, typename V>
-    bool executeNumToNumWithNonConstDefault2(const ColumnVector<T> * in, ColumnVector<U> * out, const IColumn * default_untyped) const
-    {
-        auto col_default = checkAndGetColumn<ColumnVector<V>>(default_untyped);
-        if (!col_default)
-            return false;
-
-        executeImplNumToNumWithNonConstDefault<T, U, V>(in->getData(), out->getData(), col_default->getData());
-        return true;
-    }
-
-    template <typename T, typename U, typename V>
-    bool executeNumToDecimalWithNonConstDefault2(const ColumnVector<T> * in, ColumnDecimal<U> * out, const IColumn * default_untyped) const
-    {
-        auto col_default = checkAndGetColumn<ColumnVector<V>>(default_untyped);
-        if (!col_default)
-            return false;
-
-        executeImplNumToNumWithNonConstDefault<T, U, V>(in->getData(), out->getData(), col_default->getData());
-        return true;
-    }
-
-    template <typename T, typename U, typename V>
-    bool executeNumToDecimalWithNonConstDefaultDecimal2(const ColumnVector<T> * in, ColumnDecimal<U> * out, const IColumn * default_untyped) const
-    {
-        auto col_default = checkAndGetColumn<ColumnDecimal<V>>(default_untyped);
-        if (!col_default)
-            return false;
-
-        executeImplNumToNumWithNonConstDefault<T, U, V>(in->getData(), out->getData(), col_default->getData());
-        return true;
-    }
-
-    template <typename T, typename U, typename V>
-    bool executeDecimalToNumWithNonConstDefault2(const ColumnDecimal<T> * in, ColumnVector<U> * out, const IColumn * default_untyped) const
-    {
-        auto col_default = checkAndGetColumn<ColumnVector<V>>(default_untyped);
-        if (!col_default)
-            return false;
-
-        executeImplNumToNumWithNonConstDefault<T, U, V>(in->getData(), out->getData(), col_default->getData());
-        return true;
-    }
-
-    template <typename T, typename U, typename V>
-    bool executeDecimalToDecimalWithNonConstDefault2(const ColumnDecimal<T> * in, ColumnDecimal<U> * out, const IColumn * default_untyped) const
-    {
-        auto col_default = checkAndGetColumn<ColumnVector<V>>(default_untyped);
-        if (!col_default)
-            return false;
-
-        executeImplNumToNumWithNonConstDefault<T, U, V>(in->getData(), out->getData(), col_default->getData());
-        return true;
-    }
-
-    template <typename T, typename U, typename V>
-    bool executeDecimalToNumWithNonConstDefaultDecimal2(const ColumnDecimal<T> * in, ColumnVector<U> * out, const IColumn * default_untyped) const
-    {
-        auto col_default = checkAndGetColumn<ColumnDecimal<V>>(default_untyped);
-        if (!col_default)
-            return false;
-
-        executeImplNumToNumWithNonConstDefault<T, U, V>(in->getData(), out->getData(), col_default->getData());
-        return true;
-    }
-
-    template <typename T, typename U, typename V>
-    bool executeDecimalToDecimalWithNonConstDefaultDecimal2(const ColumnDecimal<T> * in, ColumnDecimal<U> * out, const IColumn * default_untyped) const
-    {
-        auto col_default = checkAndGetColumn<ColumnDecimal<V>>(default_untyped);
-        if (!col_default)
-            return false;
-
-        executeImplNumToNumWithNonConstDefault<T, U, V>(in->getData(), out->getData(), col_default->getData());
-        return true;
-    }
-
-    template <typename T>
-    bool executeNumToStringWithConstDefault(const ColumnVector<T> * in, IColumn * out_untyped) const
-    {
-        auto * out = typeid_cast<ColumnString *>(out_untyped);
-        if (!out)
-            return false;
-
-        const String & default_str = cache.const_default_value.get<const String &>();
-        StringRef default_string_ref{default_str.data(), default_str.size() + 1};
-        executeImplNumToStringWithConstDefault<T>(in->getData(), out->getChars(), out->getOffsets(), default_string_ref);
-        return true;
-    }
-
-    template <typename T>
-    bool executeDecimalToStringWithConstDefault(const ColumnDecimal<T> * in, IColumn * out_untyped) const
-    {
-        auto * out = typeid_cast<ColumnString *>(out_untyped);
-        if (!out)
-            return false;
-
-        const String & default_str = cache.const_default_value.get<const String &>();
-        StringRef default_string_ref{default_str.data(), default_str.size() + 1};
-        executeImplNumToStringWithConstDefault<T>(in->getData(), out->getChars(), out->getOffsets(), default_string_ref);
-        return true;
-    }
-
-    template <typename T>
-    bool executeNumToStringWithNonConstDefault(const ColumnVector<T> * in, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        auto * out = typeid_cast<ColumnString *>(out_untyped);
-        if (!out)
-            return false;
-
-        const auto * default_col = checkAndGetColumn<ColumnString>(default_untyped);
-        if (!default_col)
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of fourth argument of function {}",
-                default_untyped->getName(), getName());
-        }
-
-        executeImplNumToStringWithNonConstDefault<T>(
-            in->getData(),
-            out->getChars(), out->getOffsets(),
-            default_col->getChars(), default_col->getOffsets());
-
-        return true;
-    }
-
-    template <typename T>
-    bool executeDecimalToStringWithNonConstDefault(const ColumnDecimal<T> * in, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        auto * out = typeid_cast<ColumnString *>(out_untyped);
-        if (!out)
-            return false;
-
-        const auto * default_col = checkAndGetColumn<ColumnString>(default_untyped);
-        if (!default_col)
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of fourth argument of function {}",
-                            default_untyped->getName(), getName());
-        }
-
-        executeImplNumToStringWithNonConstDefault<T>(
-            in->getData(),
-            out->getChars(), out->getOffsets(),
-            default_col->getChars(), default_col->getOffsets());
-
-        return true;
-    }
-
-    template <typename U>
-    bool executeStringToNumWithConstDefault(const ColumnString * in, IColumn * out_untyped) const
-    {
-        auto out = typeid_cast<ColumnVector<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        executeImplStringToNumWithConstDefault<U>(
-            in->getChars(), in->getOffsets(), out->getData(), static_cast<U>(cache.const_default_value.get<U>()));
-        return true;
-    }
-
-    template <typename U>
-    bool executeStringToDecimalWithConstDefault(const ColumnString * in, IColumn * out_untyped) const
-    {
-        auto out = typeid_cast<ColumnDecimal<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        executeImplStringToNumWithConstDefault<U>(in->getChars(), in->getOffsets(), out->getData(), cache.const_default_value.get<U>());
-        return true;
-    }
-
-    template <typename U>
-    bool executeStringToNumWithNonConstDefault(const ColumnString * in, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        auto out = typeid_cast<ColumnVector<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        if (!executeStringToNumWithNonConstDefault2<U, UInt8>(in, out, default_untyped)
-            && !executeStringToNumWithNonConstDefault2<U, UInt16>(in, out, default_untyped)
-            && !executeStringToNumWithNonConstDefault2<U, UInt32>(in, out, default_untyped)
-            && !executeStringToNumWithNonConstDefault2<U, UInt64>(in, out, default_untyped)
-            && !executeStringToNumWithNonConstDefault2<U, Int8>(in, out, default_untyped)
-            && !executeStringToNumWithNonConstDefault2<U, Int16>(in, out, default_untyped)
-            && !executeStringToNumWithNonConstDefault2<U, Int32>(in, out, default_untyped)
-            && !executeStringToNumWithNonConstDefault2<U, Int64>(in, out, default_untyped)
-            && !executeStringToNumWithNonConstDefault2<U, Float32>(in, out, default_untyped)
-            && !executeStringToNumWithNonConstDefault2<U, Float64>(in, out, default_untyped))
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of fourth argument of function {}",
-                default_untyped->getName(), getName());
-        }
-
-        return true;
-    }
-
-    template <typename U>
-    bool executeStringToDecimalWithNonConstDefault(const ColumnString * in, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        auto out = typeid_cast<ColumnDecimal<U> *>(out_untyped);
-        if (!out)
-            return false;
-
-        if (!executeStringToDecimalWithNonConstDefault2<U, UInt8>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefault2<U, UInt16>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefault2<U, UInt32>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefault2<U, UInt64>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefault2<U, Int8>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefault2<U, Int16>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefault2<U, Int32>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefault2<U, Int64>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefault2<U, Float32>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefault2<U, Float64>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefaultDecimal2<U, Decimal32>(in, out, default_untyped)
-            && !executeStringToDecimalWithNonConstDefaultDecimal2<U, Decimal64>(in, out, default_untyped))
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of fourth argument of function {}",
-                            default_untyped->getName(), getName());
-        }
-
-        return true;
-    }
-
-
-    template <typename U, typename V>
-    bool executeStringToNumWithNonConstDefault2(const ColumnString * in, ColumnVector<U> * out, const IColumn * default_untyped) const
-    {
-        auto col_default = checkAndGetColumn<ColumnVector<V>>(default_untyped);
-        if (!col_default)
-            return false;
-
-        executeImplStringToNumWithNonConstDefault<U, V>(in->getChars(), in->getOffsets(), out->getData(), col_default->getData());
-        return true;
-    }
-
-    template <typename U, typename V>
-    bool executeStringToDecimalWithNonConstDefault2(const ColumnString * in, ColumnDecimal<U> * out, const IColumn * default_untyped) const
-    {
-        auto col_default = checkAndGetColumn<ColumnVector<V>>(default_untyped);
-        if (!col_default)
-            return false;
-
-        executeImplStringToNumWithNonConstDefault<U, V>(in->getChars(), in->getOffsets(), out->getData(), col_default->getData());
-        return true;
-    }
-
-    template <typename U, typename V>
-    bool executeStringToDecimalWithNonConstDefaultDecimal2(const ColumnString * in, ColumnDecimal<U> * out, const IColumn * default_untyped) const
-    {
-        auto col_default = checkAndGetColumn<ColumnDecimal<V>>(default_untyped);
-        if (!col_default)
-            return false;
-
-        executeImplStringToNumWithNonConstDefault<U, V>(in->getChars(), in->getOffsets(), out->getData(), col_default->getData());
-        return true;
-    }
-
-    bool executeStringToString(const ColumnString * in, IColumn * out_untyped) const
-    {
-        auto * out = typeid_cast<ColumnString *>(out_untyped);
-        if (!out)
-            return false;
-
-        executeImplStringToString(in->getChars(), in->getOffsets(), out->getChars(), out->getOffsets());
-        return true;
-    }
-
-    bool executeStringToStringWithConstDefault(const ColumnString * in, IColumn * out_untyped) const
-    {
-        auto * out = typeid_cast<ColumnString *>(out_untyped);
-        if (!out)
-            return false;
-
-        const String & default_str = cache.const_default_value.get<const String &>();
-        StringRef default_string_ref{default_str.data(), default_str.size() + 1};
-        executeImplStringToStringWithConstDefault(in->getChars(), in->getOffsets(), out->getChars(), out->getOffsets(), default_string_ref);
-        return true;
-    }
-
-    bool executeStringToStringWithNonConstDefault(const ColumnString * in, IColumn * out_untyped, const IColumn * default_untyped) const
-    {
-        auto * out = typeid_cast<ColumnString *>(out_untyped);
-        if (!out)
-            return false;
-
-        const auto * default_col = checkAndGetColumn<ColumnString>(default_untyped);
-        if (!default_col)
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of fourth argument of function {}",
-                default_untyped->getName(), getName());
-        }
-
-        executeImplStringToStringWithNonConstDefault(
-            in->getChars(), in->getOffsets(),
-            out->getChars(), out->getOffsets(),
-            default_col->getChars(), default_col->getOffsets());
-
-        return true;
-    }
-
-
-    template <typename T, typename U>
-    void executeImplNumToNumWithConstDefault(const PaddedPODArray<T> & src, PaddedPODArray<U> & dst, U dst_default) const
-    {
-        const auto & table = *cache.table_num_to_num;
-        size_t size = src.size();
-        dst.resize(size);
-        for (size_t i = 0; i < size; ++i)
-        {
-            const auto * it = table.find(bit_cast<UInt64>(src[i]));
-            if (it)
-            {
-                if (std::endian::native == std::endian::little)
-                    memcpy(&dst[i], &it->getMapped(), sizeof(dst[i]));
-                else
-                    memcpy(&dst[i], reinterpret_cast<const char *>(&it->getMapped()) + sizeof(UInt64) - sizeof(dst[i]), sizeof(dst[i]));
-            }
-            else
-                dst[i] = dst_default;
-        }
-    }
-
-    template <typename T, typename U, typename V>
-    void executeImplNumToNumWithNonConstDefault(const PaddedPODArray<T> & src, PaddedPODArray<U> & dst, const PaddedPODArray<V> & dst_default) const
-    {
-        const auto & table = *cache.table_num_to_num;
-        size_t size = src.size();
-        dst.resize(size);
-        for (size_t i = 0; i < size; ++i)
-        {
-            const auto * it = table.find(bit_cast<UInt64>(src[i]));
-            if (it)
-            {
-                if (std::endian::native == std::endian::little)
-                    memcpy(&dst[i], &it->getMapped(), sizeof(dst[i]));
-                else
-                    memcpy(&dst[i], reinterpret_cast<const char *>(&it->getMapped()) + sizeof(UInt64) - sizeof(dst[i]), sizeof(dst[i]));
-            }
-            else if constexpr (is_decimal<U>)
-                dst[i] = static_cast<typename U::NativeType>(dst_default[i]);
-            else
-                dst[i] = static_cast<U>(dst_default[i]); // NOLINT(bugprone-signed-char-misuse,cert-str34-c)
-        }
-    }
-
-    template <typename T>
-    void executeImplNumToNum(const PaddedPODArray<T> & src, PaddedPODArray<T> & dst) const
-    {
-        const auto & table = *cache.table_num_to_num;
-        size_t size = src.size();
-        dst.resize(size);
-        for (size_t i = 0; i < size; ++i)
-        {
-            const auto * it = table.find(bit_cast<UInt64>(src[i]));
-            if (it)
-            {
-                if (std::endian::native == std::endian::little)
-                    memcpy(&dst[i], &it->getMapped(), sizeof(dst[i]));
-                else
-                    memcpy(&dst[i], reinterpret_cast<const char *>(&it->getMapped()) + sizeof(UInt64) - sizeof(dst[i]), sizeof(dst[i]));
-            }
-            else
-                dst[i] = src[i];
-        }
-    }
-
-    template <typename T>
-    void executeImplNumToStringWithConstDefault(const PaddedPODArray<T> & src,
-        ColumnString::Chars & dst_data, ColumnString::Offsets & dst_offsets, StringRef dst_default) const
-    {
-        const auto & table = *cache.table_num_to_string;
-        size_t size = src.size();
-        dst_offsets.resize(size);
-        ColumnString::Offset current_dst_offset = 0;
-        for (size_t i = 0; i < size; ++i)
-        {
-            const auto * it = table.find(bit_cast<UInt64>(src[i]));
-            StringRef ref = it ? it->getMapped() : dst_default;
-            dst_data.resize(current_dst_offset + ref.size);
-            memcpy(&dst_data[current_dst_offset], ref.data, ref.size);
-            current_dst_offset += ref.size;
-            dst_offsets[i] = current_dst_offset;
-        }
-    }
-
-    template <typename T>
-    void executeImplNumToStringWithNonConstDefault(const PaddedPODArray<T> & src,
-        ColumnString::Chars & dst_data, ColumnString::Offsets & dst_offsets,
-        const ColumnString::Chars & dst_default_data, const ColumnString::Offsets & dst_default_offsets) const
-    {
-        const auto & table = *cache.table_num_to_string;
-        size_t size = src.size();
-        dst_offsets.resize(size);
-        ColumnString::Offset current_dst_offset = 0;
-        ColumnString::Offset current_dst_default_offset = 0;
-        for (size_t i = 0; i < size; ++i)
-        {
-            const auto * it = table.find(bit_cast<UInt64>(src[i]));
-            StringRef ref;
-
-            if (it)
-                ref = it->getMapped();
-            else
-            {
-                ref.data = reinterpret_cast<const char *>(&dst_default_data[current_dst_default_offset]);
-                ref.size = dst_default_offsets[i] - current_dst_default_offset;
-            }
-
-            dst_data.resize(current_dst_offset + ref.size);
-            memcpy(&dst_data[current_dst_offset], ref.data, ref.size);
-            current_dst_offset += ref.size;
-            current_dst_default_offset = dst_default_offsets[i];
-            dst_offsets[i] = current_dst_offset;
-        }
-    }
-
-    template <typename U>
-    void executeImplStringToNumWithConstDefault(
-        const ColumnString::Chars & src_data, const ColumnString::Offsets & src_offsets,
-        PaddedPODArray<U> & dst, U dst_default) const
-    {
-        const auto & table = *cache.table_string_to_num;
-        size_t size = src_offsets.size();
-        dst.resize(size);
-        ColumnString::Offset current_src_offset = 0;
-        for (size_t i = 0; i < size; ++i)
-        {
-            StringRef ref{&src_data[current_src_offset], src_offsets[i] - current_src_offset};
-            current_src_offset = src_offsets[i];
-            const auto * it = table.find(ref);
-            if (it)
-            {
-                if (std::endian::native == std::endian::little)
-                    memcpy(&dst[i], &it->getMapped(), sizeof(dst[i]));
-                else
-                    memcpy(&dst[i], reinterpret_cast<const char *>(&it->getMapped()) + sizeof(UInt64) - sizeof(dst[i]), sizeof(dst[i]));
-            }
-            else
-                dst[i] = dst_default;
-        }
-    }
-
-    template <typename U, typename V>
-    void executeImplStringToNumWithNonConstDefault(
-        const ColumnString::Chars & src_data, const ColumnString::Offsets & src_offsets,
-        PaddedPODArray<U> & dst, const PaddedPODArray<V> & dst_default) const
-    {
-        const auto & table = *cache.table_string_to_num;
-        size_t size = src_offsets.size();
-        dst.resize(size);
-        ColumnString::Offset current_src_offset = 0;
-        for (size_t i = 0; i < size; ++i)
-        {
-            StringRef ref{&src_data[current_src_offset], src_offsets[i] - current_src_offset};
-            current_src_offset = src_offsets[i];
-            const auto * it = table.find(ref);
-            if (it)
-            {
-                if (std::endian::native == std::endian::little)
-                    memcpy(&dst[i], &it->getMapped(), sizeof(dst[i]));
-                else
-                    memcpy(&dst[i], reinterpret_cast<const char *>(&it->getMapped()) + sizeof(UInt64) - sizeof(dst[i]), sizeof(dst[i]));
-            }
-            else if constexpr (is_decimal<U>)
-                dst[i] = static_cast<typename U::NativeType>(dst_default[i]);
-            else
-                dst[i] = static_cast<U>(dst_default[i]); // NOLINT(bugprone-signed-char-misuse,cert-str34-c)
-        }
-    }
-
-    template <bool with_default>
-    void executeImplStringToStringWithOrWithoutConstDefault(
-        const ColumnString::Chars & src_data, const ColumnString::Offsets & src_offsets,
-        ColumnString::Chars & dst_data, ColumnString::Offsets & dst_offsets, StringRef dst_default) const
-    {
-        const auto & table = *cache.table_string_to_string;
-        size_t size = src_offsets.size();
-        dst_offsets.resize(size);
-        ColumnString::Offset current_src_offset = 0;
-        ColumnString::Offset current_dst_offset = 0;
-        for (size_t i = 0; i < size; ++i)
-        {
-            StringRef src_ref{&src_data[current_src_offset], src_offsets[i] - current_src_offset};
-            current_src_offset = src_offsets[i];
-
-            const auto * it = table.find(src_ref);
-
-            StringRef dst_ref = it ? it->getMapped() : (with_default ? dst_default : src_ref);
-            dst_data.resize(current_dst_offset + dst_ref.size);
-            memcpy(&dst_data[current_dst_offset], dst_ref.data, dst_ref.size);
-            current_dst_offset += dst_ref.size;
-            dst_offsets[i] = current_dst_offset;
-        }
-    }
-
-    void executeImplStringToString(
-        const ColumnString::Chars & src_data, const ColumnString::Offsets & src_offsets,
-        ColumnString::Chars & dst_data, ColumnString::Offsets & dst_offsets) const
-    {
-        executeImplStringToStringWithOrWithoutConstDefault<false>(src_data, src_offsets, dst_data, dst_offsets, {});
-    }
-
-    void executeImplStringToStringWithConstDefault(
-        const ColumnString::Chars & src_data, const ColumnString::Offsets & src_offsets,
-        ColumnString::Chars & dst_data, ColumnString::Offsets & dst_offsets, StringRef dst_default) const
-    {
-        executeImplStringToStringWithOrWithoutConstDefault<true>(src_data, src_offsets, dst_data, dst_offsets, dst_default);
-    }
-
-    void executeImplStringToStringWithNonConstDefault(
-        const ColumnString::Chars & src_data, const ColumnString::Offsets & src_offsets,
-        ColumnString::Chars & dst_data, ColumnString::Offsets & dst_offsets,
-        const ColumnString::Chars & dst_default_data, const ColumnString::Offsets & dst_default_offsets) const
-    {
-        const auto & table = *cache.table_string_to_string;
-        size_t size = src_offsets.size();
-        dst_offsets.resize(size);
-        ColumnString::Offset current_src_offset = 0;
-        ColumnString::Offset current_dst_offset = 0;
-        ColumnString::Offset current_dst_default_offset = 0;
-        for (size_t i = 0; i < size; ++i)
-        {
-            StringRef src_ref{&src_data[current_src_offset], src_offsets[i] - current_src_offset};
-            current_src_offset = src_offsets[i];
-
-            const auto * it = table.find(src_ref);
-            StringRef dst_ref;
-
-            if (it)
-                dst_ref = it->getMapped();
-            else
-            {
-                dst_ref.data = reinterpret_cast<const char *>(&dst_default_data[current_dst_default_offset]);
-                dst_ref.size = dst_default_offsets[i] - current_dst_default_offset;
-            }
-
-            dst_data.resize(current_dst_offset + dst_ref.size);
-            memcpy(&dst_data[current_dst_offset], dst_ref.data, dst_ref.size);
-            current_dst_offset += dst_ref.size;
-            current_dst_default_offset = dst_default_offsets[i];
-            dst_offsets[i] = current_dst_offset;
-        }
-    }
-
-
-    /// Different versions of the hash tables to implement the mapping.
-
-    struct Cache
-    {
-        using NumToNum = HashMap<UInt64, UInt64, HashCRC32<UInt64>>;
-        using NumToString = HashMap<UInt64, StringRef, HashCRC32<UInt64>>;     /// Everywhere StringRef's with trailing zero.
-        using StringToNum = HashMap<StringRef, UInt64, StringRefHash>;
-        using StringToString = HashMap<StringRef, StringRef, StringRefHash>;
-
-        std::unique_ptr<NumToNum> table_num_to_num;
-        std::unique_ptr<NumToString> table_num_to_string;
-        std::unique_ptr<StringToNum> table_string_to_num;
-        std::unique_ptr<StringToString> table_string_to_string;
-
-        Arena string_pool;
-
-        Field const_default_value;    /// Null, if not specified.
-
-        std::atomic<bool> initialized{false};
-        std::mutex mutex;
-    };
-
-    mutable Cache cache;
-
-
-    static UInt64 bitCastToUInt64(const Field & x)
-    {
-        switch (x.getType())
-        {
-            case Field::Types::UInt64:      return x.get<UInt64>();
-            case Field::Types::Int64:       return x.get<Int64>();
-            case Field::Types::Float64:     return std::bit_cast<UInt64>(x.get<Float64>());
-            case Field::Types::Bool:        return x.get<bool>();
-            case Field::Types::Decimal32:   return x.get<DecimalField<Decimal32>>().getValue();
-            case Field::Types::Decimal64:   return x.get<DecimalField<Decimal64>>().getValue();
-            default:
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected type in function 'transform'");
-        }
-    }
-
-    /// Can be called from different threads. It works only on the first call.
-    void initialize(const Array & from, const Array & to, const ColumnsWithTypeAndName & arguments) const
-    {
-        if (cache.initialized)
-            return;
-
-        const size_t size = from.size();
-        if (0 == size)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Empty arrays are illegal in function {}", getName());
-
-        std::lock_guard lock(cache.mutex);
-
-        if (cache.initialized)
-            return;
-
-        if (size != to.size())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Second and third arguments of function {} must be arrays of same size", getName());
-
-        Array converted_to;
-        const Array * used_to = &to;
-
-        /// Whether the default value is set.
-
-        if (arguments.size() == 4)
-        {
-            const IColumn * default_col = arguments[3].column.get();
-            const ColumnConst * const_default_col = typeid_cast<const ColumnConst *>(default_col);
-
-            if (const_default_col)
-                cache.const_default_value = (*const_default_col)[0];
-
-            /// Do we need to convert the elements `to` and `default_value` to the smallest common type that is Float64?
-            bool default_col_is_float =
-                   checkColumn<ColumnFloat32>(default_col)
-                || checkColumn<ColumnFloat64>(default_col)
-                || checkColumnConst<ColumnFloat32>(default_col)
-                || checkColumnConst<ColumnFloat64>(default_col);
-
-            bool to_is_float = to[0].getType() == Field::Types::Float64;
-
-            if (default_col_is_float && !to_is_float)
-            {
-                converted_to.resize(size);
+                const size_t size = pod.size();
+                const auto & table = *cache.table_num_to_idx;
+                column_result.reserve(size);
                 for (size_t i = 0; i < size; ++i)
-                    converted_to[i] = applyVisitor(FieldVisitorConvertToNumber<Float64>(), to[i]);
-                used_to = &converted_to;
+                {
+                    const auto * it = table.find(bit_cast<UInt64>(pod[i]));
+                    if (it)
+                        column_result.insertFrom(*cache.to_columns, it->getMapped());
+                    else if (cache.default_column)
+                        column_result.insertFrom(*cache.default_column, 0);
+                    else if (default_non_const)
+                        column_result.insertFrom(*default_non_const, i);
+                    else
+                        column_result.insertFrom(*in, i);
+                }
             }
-            else if (!default_col_is_float && to_is_float)
+            return true;
+        }
+
+        template <typename T>
+        bool executeNumToString(const PaddedPODArray<T> & pod, IColumn & column_result, const ColumnPtr default_non_const) const
+        {
+            auto * out = typeid_cast<ColumnString *>(&column_result);
+            if (!out)
+                return false;
+            auto & out_offs = out->getOffsets();
+            const size_t size = pod.size();
+            out_offs.resize(size);
+            auto & out_chars = out->getChars();
+
+            const auto * to_col = reinterpret_cast<const ColumnString *>(cache.to_columns.get());
+            const auto & to_chars = to_col->getChars();
+            const auto & to_offs = to_col->getOffsets();
+            const auto & table = *cache.table_num_to_idx;
+
+            if (cache.default_column)
             {
-                if (const_default_col)
-                    cache.const_default_value = applyVisitor(FieldVisitorConvertToNumber<Float64>(), cache.const_default_value);
+                const auto * def = reinterpret_cast<const ColumnString *>(cache.default_column.get());
+                const auto & def_chars = def->getChars();
+                const auto & def_offs = def->getOffsets();
+                const auto * def_data = def_chars.data();
+                auto def_size = def_offs[0];
+                executeNumToStringHelper(table, pod, out_chars, out_offs, to_chars, to_offs, def_data, def_size, size);
+            }
+            else
+            {
+                const auto * def = reinterpret_cast<const ColumnString *>(default_non_const.get());
+                const auto & def_chars = def->getChars();
+                const auto & def_offs = def->getOffsets();
+                executeNumToStringHelper(table, pod, out_chars, out_offs, to_chars, to_offs, def_chars, def_offs, size);
+            }
+            return true;
+        }
+
+        template <typename Table, typename In, typename DefData, typename DefOffs>
+        void executeNumToStringHelper(
+            const Table & table,
+            const PaddedPODArray<In> & pod,
+            ColumnString::Chars & out_data,
+            ColumnString::Offsets & out_offsets,
+            const ColumnString::Chars & to_data,
+            const ColumnString::Offsets & to_offsets,
+            const DefData & def_data,
+            const DefOffs & def_offsets,
+            const size_t size) const
+        {
+            size_t out_cur_off = 0;
+            for (size_t i = 0; i < size; ++i)
+            {
+                const char8_t * to = nullptr;
+                size_t to_size = 0;
+                const auto * it = table.find(bit_cast<UInt64>(pod[i]));
+                if (it)
+                {
+                    const auto idx = it->getMapped();
+                    const auto start = to_offsets[idx - 1];
+                    to = &to_data[start];
+                    to_size = to_offsets[idx] - start;
+                }
+                else if constexpr (std::is_same_v<DefData, ColumnString::Chars>)
+                {
+                    const auto start = def_offsets[i - 1];
+                    to = &def_data[start];
+                    to_size = def_offsets[i] - start;
+                }
+                else
+                {
+                    to = def_data;
+                    to_size = def_offsets;
+                }
+                out_data.resize(out_cur_off + to_size);
+                memcpy(&out_data[out_cur_off], to, to_size);
+                out_cur_off += to_size;
+                out_offsets[i] = out_cur_off;
             }
         }
 
-        /// Note: Doesn't check the duplicates in the `from` array.
-
-        const IDataType & from_type = *arguments[0].type;
-
-        if (from[0].getType() != Field::Types::String)
+        template <typename T, typename U>
+        bool executeNumToNum(
+            const PaddedPODArray<U> & pod, IColumn & column_result, const ColumnPtr default_non_const, const UInt32 in_scale) const
         {
-            if (to[0].getType() != Field::Types::String)
+            auto * out = typeid_cast<T *>(&column_result);
+            if (!out)
+                return false;
+            auto & out_pod = out->getData();
+            const size_t size = pod.size();
+            out_pod.resize(size);
+            UInt32 out_scale = 0;
+            if constexpr (std::is_same_v<ColumnDecimal<Decimal32>, T> || std::is_same_v<ColumnDecimal<Decimal64>, T>)
+                out_scale = out->getScale();
+
+            const auto & to_pod = reinterpret_cast<const T *>(cache.to_columns.get())->getData();
+            const auto & table = *cache.table_num_to_idx;
+            if (cache.default_column)
             {
-                cache.table_num_to_num = std::make_unique<Cache::NumToNum>();
-                auto & table = *cache.table_num_to_num;
+                const auto const_def = reinterpret_cast<const T *>(cache.default_column.get())->getData()[0];
+                executeNumToNumHelper(table, pod, out_pod, to_pod, const_def, size, out_scale, out_scale);
+            }
+            else if (default_non_const)
+            {
+                const auto & nconst_def = reinterpret_cast<const T *>(default_non_const.get())->getData();
+                executeNumToNumHelper(table, pod, out_pod, to_pod, nconst_def, size, out_scale, out_scale);
+            }
+            else
+                executeNumToNumHelper(table, pod, out_pod, to_pod, pod, size, out_scale, in_scale);
+            return true;
+        }
+
+        template <typename Table, typename In, typename Out, typename Def>
+        void executeNumToNumHelper(
+            const Table & table,
+            const PaddedPODArray<In> & pod,
+            PaddedPODArray<Out> & out_pod,
+            const PaddedPODArray<Out> & to_pod,
+            const Def & def,
+            const size_t size,
+            const UInt32 out_scale,
+            const UInt32 def_scale) const
+        {
+            for (size_t i = 0; i < size; ++i)
+            {
+                const auto * it = table.find(bit_cast<UInt64>(pod[i]));
+                if (it)
+                {
+                    const auto idx = it->getMapped();
+                    out_pod[i] = to_pod[idx];
+                }
+                else if constexpr (std::is_same_v<Def, Out>)
+                    out_pod[i] = def;
+                else if constexpr (is_decimal<Out> && !is_decimal<typename Def::value_type>)
+                    out_pod[i] = DecimalUtils::decimalFromComponents<Out>(static_cast<typename Out::NativeType>(def[i]), 0, out_scale);
+                else if constexpr (is_decimal<Out>)
+                {
+                    if (def_scale == out_scale)
+                        out_pod[i] = static_cast<typename Out::NativeType>(def[i]);
+                    else
+                    {
+                        const auto whole = static_cast<typename Out::NativeType>(DecimalUtils::getWholePart(def[i], def_scale));
+                        const auto fract = static_cast<typename Out::NativeType>(DecimalUtils::getFractionalPart(def[i], def_scale));
+                        out_pod[i] = DecimalUtils::decimalFromComponents<Out>(whole, fract, out_scale);
+                    }
+                }
+                else
+                    out_pod[i] = static_cast<Out>(def[i]); // NOLINT(bugprone-signed-char-misuse,cert-str34-c)
+            }
+        }
+
+        bool executeString(const IColumn * in_untyped, IColumn & column_result, const ColumnPtr default_non_const) const
+        {
+            const auto * const in = checkAndGetColumn<ColumnString>(in_untyped);
+            if (!in)
+                return false;
+            const auto & data = in->getChars();
+            const auto & offsets = in->getOffsets();
+
+            if (!executeStringToString(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<UInt8>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<UInt16>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<UInt32>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<UInt64>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Int8>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Int16>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Int32>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Int64>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Float32>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Float64>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnDecimal<Decimal32>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnDecimal<Decimal64>>(data, offsets, column_result, default_non_const))
+            {
+                const size_t size = offsets.size();
+                const auto & table = *cache.table_string_to_idx;
+                ColumnString::Offset current_offset = 0;
+                for (size_t i = 0; i < size; ++i)
+                {
+                    const StringRef ref{&data[current_offset], offsets[i] - current_offset};
+                    current_offset = offsets[i];
+                    const auto * it = table.find(ref);
+                    if (it)
+                        column_result.insertFrom(*cache.to_columns, it->getMapped());
+                    else if (cache.default_column)
+                        column_result.insertFrom(*cache.default_column, 0);
+                    else if (default_non_const)
+                        column_result.insertFrom(*default_non_const, 0);
+                    else
+                        column_result.insertFrom(*in, i);
+                }
+            }
+            return true;
+        }
+
+        bool executeStringToString(
+            const ColumnString::Chars & data,
+            const ColumnString::Offsets & offsets,
+            IColumn & column_result,
+            const ColumnPtr default_non_const) const
+        {
+            auto * out = typeid_cast<ColumnString *>(&column_result);
+            if (!out)
+                return false;
+            auto & out_offs = out->getOffsets();
+            const size_t size = offsets.size();
+            out_offs.resize(size);
+            auto & out_chars = out->getChars();
+
+            const auto * to_col = reinterpret_cast<const ColumnString *>(cache.to_columns.get());
+            const auto & to_chars = to_col->getChars();
+            const auto & to_offs = to_col->getOffsets();
+
+            const auto & table = *cache.table_string_to_idx;
+            if (cache.default_column)
+            {
+                const auto * def = reinterpret_cast<const ColumnString *>(cache.default_column.get());
+                const auto & def_chars = def->getChars();
+                const auto & def_offs = def->getOffsets();
+                const auto * def_data = def_chars.data();
+                auto def_size = def_offs[0];
+                executeStringToStringHelper(table, data, offsets, out_chars, out_offs, to_chars, to_offs, def_data, def_size, size);
+            }
+            else if (default_non_const)
+            {
+                const auto * def = reinterpret_cast<const ColumnString *>(default_non_const.get());
+                const auto & def_chars = def->getChars();
+                const auto & def_offs = def->getOffsets();
+                executeStringToStringHelper(table, data, offsets, out_chars, out_offs, to_chars, to_offs, def_chars, def_offs, size);
+            }
+            else
+            {
+                executeStringToStringHelper(table, data, offsets, out_chars, out_offs, to_chars, to_offs, data, offsets, size);
+            }
+            return true;
+        }
+
+        template <typename Table, typename DefData, typename DefOffs>
+        void executeStringToStringHelper(
+            const Table & table,
+            const ColumnString::Chars & data,
+            const ColumnString::Offsets & offsets,
+            ColumnString::Chars & out_data,
+            ColumnString::Offsets & out_offsets,
+            const ColumnString::Chars & to_data,
+            const ColumnString::Offsets & to_offsets,
+            const DefData & def_data,
+            const DefOffs & def_offsets,
+            const size_t size) const
+        {
+            ColumnString::Offset current_offset = 0;
+            size_t out_cur_off = 0;
+            for (size_t i = 0; i < size; ++i)
+            {
+                const char8_t * to = nullptr;
+                size_t to_size = 0;
+                const StringRef ref{&data[current_offset], offsets[i] - current_offset};
+                current_offset = offsets[i];
+                const auto * it = table.find(ref);
+                if (it)
+                {
+                    const auto idx = it->getMapped();
+                    const auto start = to_offsets[idx - 1];
+                    to = &to_data[start];
+                    to_size = to_offsets[idx] - start;
+                }
+                else if constexpr (std::is_same_v<DefData, ColumnString::Chars>)
+                {
+                    const auto start = def_offsets[i - 1];
+                    to = &def_data[start];
+                    to_size = def_offsets[i] - start;
+                }
+                else
+                {
+                    to = def_data;
+                    to_size = def_offsets;
+                }
+                out_data.resize(out_cur_off + to_size);
+                memcpy(&out_data[out_cur_off], to, to_size);
+                out_cur_off += to_size;
+                out_offsets[i] = out_cur_off;
+            }
+        }
+
+        template <typename T>
+        bool executeStringToNum(
+            const ColumnString::Chars & data,
+            const ColumnString::Offsets & offsets,
+            IColumn & column_result,
+            const ColumnPtr default_non_const) const
+        {
+            auto * out = typeid_cast<T *>(&column_result);
+            if (!out)
+                return false;
+            auto & out_pod = out->getData();
+            const size_t size = offsets.size();
+            out_pod.resize(size);
+
+            const auto & to_pod = reinterpret_cast<const T *>(cache.to_columns.get())->getData();
+            const auto & table = *cache.table_string_to_idx;
+            if (cache.default_column)
+            {
+                const auto const_def = reinterpret_cast<const T *>(cache.default_column.get())->getData()[0];
+                executeStringToNumHelper(table, data, offsets, out_pod, to_pod, const_def, size);
+            }
+            else
+            {
+                const auto & nconst_def = reinterpret_cast<const T *>(default_non_const.get())->getData();
+                executeStringToNumHelper(table, data, offsets, out_pod, to_pod, nconst_def, size);
+            }
+            return true;
+        }
+
+        template <typename Table, typename Out, typename Def>
+        void executeStringToNumHelper(
+            const Table & table,
+            const ColumnString::Chars & data,
+            const ColumnString::Offsets & offsets,
+            PaddedPODArray<Out> & out_pod,
+            const PaddedPODArray<Out> & to_pod,
+            const Def & def,
+            const size_t size) const
+        {
+            ColumnString::Offset current_offset = 0;
+            for (size_t i = 0; i < size; ++i)
+            {
+                const StringRef ref{&data[current_offset], offsets[i] - current_offset};
+                current_offset = offsets[i];
+                const auto * it = table.find(ref);
+                if (it)
+                {
+                    const auto idx = it->getMapped();
+                    out_pod[i] = to_pod[idx];
+                }
+                else if constexpr (std::is_same_v<Def, Out>)
+                    out_pod[i] = def;
+                else if constexpr (is_decimal<Out>)
+                    out_pod[i] = static_cast<typename Out::NativeType>(def[i]);
+                else
+                    out_pod[i] = static_cast<Out>(def[i]); // NOLINT(bugprone-signed-char-misuse,cert-str34-c)
+            }
+        }
+
+        /// Different versions of the hash tables to implement the mapping.
+
+        struct Cache
+        {
+            using NumToIdx = HashMap<UInt64, size_t, HashCRC32<UInt64>>;
+            using StringToIdx = HashMap<StringRef, size_t, StringRefHash>;
+
+            std::unique_ptr<NumToIdx> table_num_to_idx;
+            std::unique_ptr<StringToIdx> table_string_to_idx;
+
+            ColumnPtr to_columns;
+            ColumnPtr default_column;
+
+            Arena string_pool;
+
+            std::atomic<bool> initialized{false};
+            std::mutex mutex;
+        };
+
+        mutable Cache cache;
+
+
+        static UInt64 bitCastToUInt64(const Field & x)
+        {
+            switch (x.getType())
+            {
+                case Field::Types::UInt64:
+                    return x.get<UInt64>();
+                case Field::Types::Int64:
+                    return x.get<Int64>();
+                case Field::Types::Float64:
+                    return std::bit_cast<UInt64>(x.get<Float64>());
+                case Field::Types::Bool:
+                    return x.get<bool>();
+                case Field::Types::Decimal32:
+                    return x.get<DecimalField<Decimal32>>().getValue();
+                case Field::Types::Decimal64:
+                    return x.get<DecimalField<Decimal64>>().getValue();
+                default:
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected type in function 'transform'");
+            }
+        }
+
+        static void checkAllowedType(const DataTypePtr & type)
+        {
+            if (type->isNullable())
+                checkAllowedTypeHelper(static_cast<const DataTypeNullable *>(type.get())->getNestedType());
+            else
+                checkAllowedTypeHelper(type);
+        }
+
+        static void checkAllowedTypeHelper(const DataTypePtr & type)
+        {
+            if (isStringOrFixedString(type))
+                return;
+
+            if (type->haveMaximumSizeOfValue())
+            {
+                auto data_type_size = type->getMaximumSizeOfValueInMemory();
+                if (data_type_size <= sizeof(UInt64))
+                    return;
+            }
+
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected type {} in function 'transform'", type->getName());
+        }
+
+        /// Can be called from different threads. It works only on the first call.
+        void initialize(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const
+        {
+            const ColumnConst * array_from = checkAndGetColumnConst<ColumnArray>(arguments[1].column.get());
+            const ColumnConst * array_to = checkAndGetColumnConst<ColumnArray>(arguments[2].column.get());
+
+            if (!array_from || !array_to)
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN, "Second and third arguments of function {} must be constant arrays.", getName());
+
+            if (cache.initialized)
+                return;
+
+            const auto & from = array_from->getValue<Array>();
+            const size_t size = from.size();
+            if (0 == size)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Empty arrays are illegal in function {}", getName());
+
+            std::lock_guard lock(cache.mutex);
+
+            if (cache.initialized)
+                return;
+
+            const auto & to = array_to->getValue<Array>();
+            if (size != to.size())
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS, "Second and third arguments of function {} must be arrays of same size", getName());
+
+            /// Whether the default value is set.
+
+            if (arguments.size() == 4)
+            {
+                const IColumn * default_col = arguments[3].column.get();
+                if (default_col && isColumnConst(*default_col))
+                {
+                    auto default_column = result_type->createColumn();
+                    if (!default_col->onlyNull())
+                    {
+                        Field f = convertFieldToType((*default_col)[0], *result_type);
+                        default_column->insert(f);
+                    }
+                    else
+                        default_column->insertDefault();
+                    cache.default_column = std::move(default_column);
+                }
+            }
+
+            /// Note: Doesn't check the duplicates in the `from` array.
+
+            const IDataType & from_type = *arguments[0].type;
+
+            if (from[0].getType() != Field::Types::String)
+            {
+                cache.table_num_to_idx = std::make_unique<Cache::NumToIdx>();
+                auto & table = *cache.table_num_to_idx;
                 for (size_t i = 0; i < size; ++i)
                 {
                     Field key = convertFieldToType(from[i], from_type);
@@ -1204,55 +715,31 @@ private:
                         continue;
 
                     /// Field may be of Float type, but for the purpose of bitwise equality we can treat them as UInt64
-                    table[bitCastToUInt64(key)] = bitCastToUInt64((*used_to)[i]);
+                    table[bitCastToUInt64(key)] = i;
                 }
             }
             else
             {
-                cache.table_num_to_string = std::make_unique<Cache::NumToString>();
-                auto & table = *cache.table_num_to_string;
-                for (size_t i = 0; i < size; ++i)
-                {
-                    Field key = convertFieldToType(from[i], from_type);
-                    if (key.isNull())
-                        continue;
-
-                    const String & str_to = to[i].get<const String &>();
-                    StringRef ref{cache.string_pool.insert(str_to.data(), str_to.size() + 1), str_to.size() + 1};
-                    table[bitCastToUInt64(key)] = ref;
-                }
-            }
-        }
-        else
-        {
-            if (to[0].getType() != Field::Types::String)
-            {
-                cache.table_string_to_num = std::make_unique<Cache::StringToNum>();
-                auto & table = *cache.table_string_to_num;
+                cache.table_string_to_idx = std::make_unique<Cache::StringToIdx>();
+                auto & table = *cache.table_string_to_idx;
                 for (size_t i = 0; i < size; ++i)
                 {
                     const String & str_from = from[i].get<const String &>();
                     StringRef ref{cache.string_pool.insert(str_from.data(), str_from.size() + 1), str_from.size() + 1};
-                    table[ref] = bitCastToUInt64((*used_to)[i]);
+                    table[ref] = i;
                 }
             }
-            else
-            {
-                cache.table_string_to_string = std::make_unique<Cache::StringToString>();
-                auto & table = *cache.table_string_to_string;
-                for (size_t i = 0; i < size; ++i)
-                {
-                    const String & str_from = from[i].get<const String &>();
-                    const String & str_to = to[i].get<const String &>();
-                    StringRef ref_from{cache.string_pool.insert(str_from.data(), str_from.size() + 1), str_from.size() + 1};
-                    StringRef ref_to{cache.string_pool.insert(str_to.data(), str_to.size() + 1), str_to.size() + 1};
-                    table[ref_from] = ref_to;
-                }
-            }
-        }
 
-        cache.initialized = true;
-    }
+            auto to_columns = result_type->createColumn();
+            for (size_t i = 0; i < size; ++i)
+            {
+                Field to_value = convertFieldToType(to[i], *result_type);
+                to_columns->insert(to_value);
+            }
+            cache.to_columns = std::move(to_columns);
+
+            cache.initialized = true;
+        }
 };
 
 }
diff --git a/src/Functions/trim.cpp b/src/Functions/trim.cpp
index acfab47a68b..dd51c606ff7 100644
--- a/src/Functions/trim.cpp
+++ b/src/Functions/trim.cpp
@@ -112,5 +112,8 @@ REGISTER_FUNCTION(Trim)
     factory.registerFunction<FunctionTrimLeft>();
     factory.registerFunction<FunctionTrimRight>();
     factory.registerFunction<FunctionTrimBoth>();
+    factory.registerAlias("ltrim", FunctionTrimLeft::name);
+    factory.registerAlias("rtrim", FunctionTrimRight::name);
+    factory.registerAlias("trim", FunctionTrimBoth::name);
 }
 }
diff --git a/src/Functions/tryDecrypt.cpp b/src/Functions/tryDecrypt.cpp
index 0992d5f4308..eccccb1e4a4 100644
--- a/src/Functions/tryDecrypt.cpp
+++ b/src/Functions/tryDecrypt.cpp
@@ -1,4 +1,4 @@
-#include <Common/Documentation.h>
+#include <Common/FunctionDocumentation.h>
 #include "config.h"
 
 #if USE_SSL
@@ -23,8 +23,8 @@ namespace DB
 
 REGISTER_FUNCTION(TryDecrypt)
 {
-    factory.registerFunction<FunctionDecrypt<TryDecryptImpl>>(Documentation(
-        "Similar to `decrypt`, but returns NULL if decryption fails because of using the wrong key."));
+    factory.registerFunction<FunctionDecrypt<TryDecryptImpl>>(FunctionDocumentation{
+        .description="Similar to `decrypt`, but returns NULL if decryption fails because of using the wrong key."});
 }
 
 }
diff --git a/src/Functions/vectorFunctions.cpp b/src/Functions/vectorFunctions.cpp
index a7ab09612cf..db907af972d 100644
--- a/src/Functions/vectorFunctions.cpp
+++ b/src/Functions/vectorFunctions.cpp
@@ -1429,6 +1429,8 @@ private:
     FunctionPtr array_function;
 };
 
+extern FunctionPtr createFunctionArrayDotProduct(ContextPtr context_);
+
 extern FunctionPtr createFunctionArrayL1Norm(ContextPtr context_);
 extern FunctionPtr createFunctionArrayL2Norm(ContextPtr context_);
 extern FunctionPtr createFunctionArrayL2SquaredNorm(ContextPtr context_);
@@ -1442,6 +1444,14 @@ extern FunctionPtr createFunctionArrayLpDistance(ContextPtr context_);
 extern FunctionPtr createFunctionArrayLinfDistance(ContextPtr context_);
 extern FunctionPtr createFunctionArrayCosineDistance(ContextPtr context_);
 
+struct DotProduct
+{
+    static constexpr auto name = "dotProduct";
+
+    static constexpr auto CreateTupleFunction = FunctionDotProduct::create;
+    static constexpr auto CreateArrayFunction = createFunctionArrayDotProduct;
+};
+
 struct L1NormTraits
 {
     static constexpr auto name = "L1Norm";
@@ -1530,6 +1540,8 @@ struct CosineDistanceTraits
     static constexpr auto CreateArrayFunction = createFunctionArrayCosineDistance;
 };
 
+using TupleOrArrayFunctionDotProduct = TupleOrArrayFunction<DotProduct>;
+
 using TupleOrArrayFunctionL1Norm = TupleOrArrayFunction<L1NormTraits>;
 using TupleOrArrayFunctionL2Norm = TupleOrArrayFunction<L2NormTraits>;
 using TupleOrArrayFunctionL2SquaredNorm = TupleOrArrayFunction<L2SquaredNormTraits>;
@@ -1553,33 +1565,33 @@ REGISTER_FUNCTION(VectorFunctions)
     factory.registerFunction<FunctionTupleDivide>();
     factory.registerFunction<FunctionTupleNegate>();
 
-    factory.registerFunction<FunctionAddTupleOfIntervals>(
+    factory.registerFunction<FunctionAddTupleOfIntervals>(FunctionDocumentation
         {
-            R"(
+            .description=R"(
 Consecutively adds a tuple of intervals to a Date or a DateTime.
 [example:tuple]
 )",
-            Documentation::Examples{
-                {"tuple", "WITH toDate('2018-01-01') AS date SELECT addTupleOfIntervals(date, (INTERVAL 1 DAY, INTERVAL 1 YEAR))"},
+            .examples{
+                {"tuple", "WITH toDate('2018-01-01') AS date SELECT addTupleOfIntervals(date, (INTERVAL 1 DAY, INTERVAL 1 YEAR))", ""},
                 },
-            Documentation::Categories{"Tuple", "Interval", "Date", "DateTime"}
+            .categories{"Tuple", "Interval", "Date", "DateTime"}
         });
 
-    factory.registerFunction<FunctionSubtractTupleOfIntervals>(
+    factory.registerFunction<FunctionSubtractTupleOfIntervals>(FunctionDocumentation
         {
-            R"(
+            .description=R"(
 Consecutively subtracts a tuple of intervals from a Date or a DateTime.
 [example:tuple]
 )",
-            Documentation::Examples{
-                {"tuple", "WITH toDate('2018-01-01') AS date SELECT subtractTupleOfIntervals(date, (INTERVAL 1 DAY, INTERVAL 1 YEAR))"},
+            .examples{
+                {"tuple", "WITH toDate('2018-01-01') AS date SELECT subtractTupleOfIntervals(date, (INTERVAL 1 DAY, INTERVAL 1 YEAR))", ""},
                 },
-            Documentation::Categories{"Tuple", "Interval", "Date", "DateTime"}
+            .categories{"Tuple", "Interval", "Date", "DateTime"}
         });
 
-    factory.registerFunction<FunctionTupleAddInterval>(
+    factory.registerFunction<FunctionTupleAddInterval>(FunctionDocumentation
         {
-            R"(
+            .description=R"(
 Adds an interval to another interval or tuple of intervals. The returned value is tuple of intervals.
 [example:tuple]
 [example:interval1]
@@ -1587,16 +1599,16 @@ Adds an interval to another interval or tuple of intervals. The returned value i
 If the types of the first interval (or the interval in the tuple) and the second interval are the same they will be merged into one interval.
 [example:interval2]
 )",
-            Documentation::Examples{
-                {"tuple", "SELECT addInterval((INTERVAL 1 DAY, INTERVAL 1 YEAR), INTERVAL 1 MONTH)"},
-                {"interval1", "SELECT addInterval(INTERVAL 1 DAY, INTERVAL 1 MONTH)"},
-                {"interval2", "SELECT addInterval(INTERVAL 1 DAY, INTERVAL 1 DAY)"},
+            .examples{
+                {"tuple", "SELECT addInterval((INTERVAL 1 DAY, INTERVAL 1 YEAR), INTERVAL 1 MONTH)", ""},
+                {"interval1", "SELECT addInterval(INTERVAL 1 DAY, INTERVAL 1 MONTH)", ""},
+                {"interval2", "SELECT addInterval(INTERVAL 1 DAY, INTERVAL 1 DAY)", ""},
                 },
-            Documentation::Categories{"Tuple", "Interval"}
+            .categories{"Tuple", "Interval"}
         });
-    factory.registerFunction<FunctionTupleSubtractInterval>(
+    factory.registerFunction<FunctionTupleSubtractInterval>(FunctionDocumentation
         {
-            R"(
+            .description=R"(
 Adds an negated interval to another interval or tuple of intervals. The returned value is tuple of intervals.
 [example:tuple]
 [example:interval1]
@@ -1604,19 +1616,19 @@ Adds an negated interval to another interval or tuple of intervals. The returned
 If the types of the first interval (or the interval in the tuple) and the second interval are the same they will be merged into one interval.
 [example:interval2]
 )",
-            Documentation::Examples{
-                {"tuple", "SELECT subtractInterval((INTERVAL 1 DAY, INTERVAL 1 YEAR), INTERVAL 1 MONTH)"},
-                {"interval1", "SELECT subtractInterval(INTERVAL 1 DAY, INTERVAL 1 MONTH)"},
-                {"interval2", "SELECT subtractInterval(INTERVAL 2 DAY, INTERVAL 1 DAY)"},
+            .examples{
+                {"tuple", "SELECT subtractInterval((INTERVAL 1 DAY, INTERVAL 1 YEAR), INTERVAL 1 MONTH)", ""},
+                {"interval1", "SELECT subtractInterval(INTERVAL 1 DAY, INTERVAL 1 MONTH)", ""},
+                {"interval2", "SELECT subtractInterval(INTERVAL 2 DAY, INTERVAL 1 DAY)", ""},
                 },
-            Documentation::Categories{"Tuple", "Interval"}
+            .categories{"Tuple", "Interval"}
         });
 
     factory.registerFunction<FunctionTupleMultiplyByNumber>();
     factory.registerFunction<FunctionTupleDivideByNumber>();
 
-    factory.registerFunction<FunctionDotProduct>();
-    factory.registerAlias("scalarProduct", FunctionDotProduct::name, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<TupleOrArrayFunctionDotProduct>();
+    factory.registerAlias("scalarProduct", TupleOrArrayFunctionDotProduct::name, FunctionFactory::CaseInsensitive);
 
     factory.registerFunction<TupleOrArrayFunctionL1Norm>();
     factory.registerFunction<TupleOrArrayFunctionL2Norm>();
diff --git a/src/Functions/widthBucket.cpp b/src/Functions/widthBucket.cpp
index a32fa159c2c..e95f7c05756 100644
--- a/src/Functions/widthBucket.cpp
+++ b/src/Functions/widthBucket.cpp
@@ -11,6 +11,7 @@
 #include <Functions/IFunction.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/castColumn.h>
+#include <Common/Concepts.h>
 #include <Common/Exception.h>
 #include <Common/NaNUtils.h>
 #include <Common/register_objects.h>
@@ -251,8 +252,8 @@ public:
 
 REGISTER_FUNCTION(WidthBucket)
 {
-    factory.registerFunction<FunctionWidthBucket>({
-        R"(
+    factory.registerFunction<FunctionWidthBucket>(FunctionDocumentation{
+        .description=R"(
 Returns the number of the bucket in which `operand` falls in a histogram having `count` equal-width buckets spanning the range `low` to `high`. Returns `0` if `operand < low`, and returns `count+1` if `operand >= high`.
 
 `operand`, `low`, `high` can be any native number type. `count` can only be unsigned native integer and its value cannot be zero.
@@ -278,10 +279,10 @@ Result:
 └──────────────────────────────────┘
 ```
 )",
-        Documentation::Examples{
-            {"simple", "SELECT widthBucket(10.15, -8.6, 23, 18)"},
+        .examples{
+            {"simple", "SELECT widthBucket(10.15, -8.6, 23, 18)", ""},
         },
-        Documentation::Categories{"Mathematical"},
+        .categories{"Mathematical"},
     });
 
     factory.registerAlias("width_bucket", "widthBucket", FunctionFactory::CaseInsensitive);
diff --git a/src/IO/Archives/IArchiveReader.h b/src/IO/Archives/IArchiveReader.h
index ff02dc7e733..37629cd7eed 100644
--- a/src/IO/Archives/IArchiveReader.h
+++ b/src/IO/Archives/IArchiveReader.h
@@ -2,6 +2,7 @@
 
 #include <boost/noncopyable.hpp>
 #include <base/types.h>
+#include <functional>
 #include <memory>
 
 
diff --git a/src/IO/Archives/createArchiveReader.h b/src/IO/Archives/createArchiveReader.h
index 9e1073b9481..64eb4c8eabc 100644
--- a/src/IO/Archives/createArchiveReader.h
+++ b/src/IO/Archives/createArchiveReader.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <base/types.h>
+#include <functional>
 #include <memory>
 
 
diff --git a/src/IO/AsyncReadCounters.h b/src/IO/AsyncReadCounters.h
index 1d941b4fc47..1f84b2a214b 100644
--- a/src/IO/AsyncReadCounters.h
+++ b/src/IO/AsyncReadCounters.h
@@ -27,5 +27,6 @@ struct AsyncReadCounters
 
     void dumpToMapColumn(IColumn * column) const;
 };
+using AsyncReadCountersPtr = std::shared_ptr<AsyncReadCounters>;
 
 }
diff --git a/src/IO/AsynchronousReadBufferFromFile.cpp b/src/IO/AsynchronousReadBufferFromFile.cpp
index 7499b684a89..0e6c8090cb5 100644
--- a/src/IO/AsynchronousReadBufferFromFile.cpp
+++ b/src/IO/AsynchronousReadBufferFromFile.cpp
@@ -26,7 +26,7 @@ namespace ErrorCodes
 
 AsynchronousReadBufferFromFile::AsynchronousReadBufferFromFile(
     IAsynchronousReader & reader_,
-    Int32 priority_,
+    Priority priority_,
     const std::string & file_name_,
     size_t buf_size,
     int flags,
@@ -60,7 +60,7 @@ AsynchronousReadBufferFromFile::AsynchronousReadBufferFromFile(
 
 AsynchronousReadBufferFromFile::AsynchronousReadBufferFromFile(
     IAsynchronousReader & reader_,
-    Int32 priority_,
+    Priority priority_,
     int & fd_,
     const std::string & original_file_name,
     size_t buf_size,
diff --git a/src/IO/AsynchronousReadBufferFromFile.h b/src/IO/AsynchronousReadBufferFromFile.h
index 1b7eeec4f19..d3b7ffbc7dc 100644
--- a/src/IO/AsynchronousReadBufferFromFile.h
+++ b/src/IO/AsynchronousReadBufferFromFile.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Common/Throttler_fwd.h>
 #include <IO/AsynchronousReadBufferFromFileDescriptor.h>
 #include <IO/OpenedFileCache.h>
 
@@ -7,6 +8,7 @@
 namespace DB
 {
 
+/* NOTE: Unused */
 class AsynchronousReadBufferFromFile : public AsynchronousReadBufferFromFileDescriptor
 {
 protected:
@@ -15,7 +17,7 @@ protected:
 public:
     explicit AsynchronousReadBufferFromFile(
         IAsynchronousReader & reader_,
-        Int32 priority_,
+        Priority priority_,
         const std::string & file_name_,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         int flags = -1,
@@ -26,7 +28,7 @@ public:
     /// Use pre-opened file descriptor.
     explicit AsynchronousReadBufferFromFile(
         IAsynchronousReader & reader_,
-        Int32 priority_,
+        Priority priority_,
         int & fd, /// Will be set to -1 if constructor didn't throw and ownership of file descriptor is passed to the object.
         const std::string & original_file_name = {},
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
@@ -56,14 +58,15 @@ private:
 public:
     AsynchronousReadBufferFromFileWithDescriptorsCache(
         IAsynchronousReader & reader_,
-        Int32 priority_,
+        Priority priority_,
         const std::string & file_name_,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         int flags = -1,
         char * existing_memory = nullptr,
         size_t alignment = 0,
-        std::optional<size_t> file_size_ = std::nullopt)
-        : AsynchronousReadBufferFromFileDescriptor(reader_, priority_, -1, buf_size, existing_memory, alignment, file_size_)
+        std::optional<size_t> file_size_ = std::nullopt,
+        ThrottlerPtr throttler_ = {})
+        : AsynchronousReadBufferFromFileDescriptor(reader_, priority_, -1, buf_size, existing_memory, alignment, file_size_, throttler_)
         , file_name(file_name_)
     {
         file = OpenedFileCache::instance().get(file_name, flags);
diff --git a/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp b/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp
index dc8dcc6c3e6..d30773f88f4 100644
--- a/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp
+++ b/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp
@@ -5,14 +5,17 @@
 #include <Common/Stopwatch.h>
 #include <Common/Exception.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/Throttler.h>
+#include <Common/filesystemHelpers.h>
 #include <IO/AsynchronousReadBufferFromFileDescriptor.h>
 #include <IO/WriteHelpers.h>
-#include <Common/filesystemHelpers.h>
 
 
 namespace ProfileEvents
 {
     extern const Event AsynchronousReadWaitMicroseconds;
+    extern const Event LocalReadThrottlerBytes;
+    extern const Event LocalReadThrottlerSleepMicroseconds;
 }
 
 namespace CurrentMetrics
@@ -37,14 +40,14 @@ std::string AsynchronousReadBufferFromFileDescriptor::getFileName() const
 }
 
 
-std::future<IAsynchronousReader::Result> AsynchronousReadBufferFromFileDescriptor::asyncReadInto(char * data, size_t size, int64_t priority)
+std::future<IAsynchronousReader::Result> AsynchronousReadBufferFromFileDescriptor::asyncReadInto(char * data, size_t size, Priority priority)
 {
     IAsynchronousReader::Request request;
     request.descriptor = std::make_shared<IAsynchronousReader::LocalFileDescriptor>(fd);
     request.buf = data;
     request.size = size;
     request.offset = file_offset_of_buffer_end;
-    request.priority = base_priority + priority;
+    request.priority = Priority{base_priority.value + priority.value};
     request.ignore = bytes_to_ignore;
     bytes_to_ignore = 0;
 
@@ -58,7 +61,7 @@ std::future<IAsynchronousReader::Result> AsynchronousReadBufferFromFileDescripto
 }
 
 
-void AsynchronousReadBufferFromFileDescriptor::prefetch(int64_t priority)
+void AsynchronousReadBufferFromFileDescriptor::prefetch(Priority priority)
 {
     if (prefetch_future.valid())
         return;
@@ -92,6 +95,8 @@ bool AsynchronousReadBufferFromFileDescriptor::nextImpl()
 
         assert(offset <= size);
         size_t bytes_read = size - offset;
+        if (throttler)
+            throttler->add(bytes_read, ProfileEvents::LocalReadThrottlerBytes, ProfileEvents::LocalReadThrottlerSleepMicroseconds);
 
         if (bytes_read)
         {
@@ -117,6 +122,8 @@ bool AsynchronousReadBufferFromFileDescriptor::nextImpl()
 
         assert(offset <= size);
         size_t bytes_read = size - offset;
+        if (throttler)
+            throttler->add(bytes_read, ProfileEvents::LocalReadThrottlerBytes, ProfileEvents::LocalReadThrottlerSleepMicroseconds);
 
         if (bytes_read)
         {
@@ -144,17 +151,19 @@ void AsynchronousReadBufferFromFileDescriptor::finalize()
 
 AsynchronousReadBufferFromFileDescriptor::AsynchronousReadBufferFromFileDescriptor(
     IAsynchronousReader & reader_,
-    Int32 priority_,
+    Priority priority_,
     int fd_,
     size_t buf_size,
     char * existing_memory,
     size_t alignment,
-    std::optional<size_t> file_size_)
+    std::optional<size_t> file_size_,
+    ThrottlerPtr throttler_)
     : ReadBufferFromFileBase(buf_size, existing_memory, alignment, file_size_)
     , reader(reader_)
     , base_priority(priority_)
     , required_alignment(alignment)
     , fd(fd_)
+    , throttler(throttler_)
 {
     if (required_alignment > buf_size)
         throw Exception(
diff --git a/src/IO/AsynchronousReadBufferFromFileDescriptor.h b/src/IO/AsynchronousReadBufferFromFileDescriptor.h
index 1629f344b35..4a4130ebab1 100644
--- a/src/IO/AsynchronousReadBufferFromFileDescriptor.h
+++ b/src/IO/AsynchronousReadBufferFromFileDescriptor.h
@@ -3,6 +3,8 @@
 #include <IO/ReadBufferFromFileBase.h>
 #include <IO/AsynchronousReader.h>
 #include <Interpreters/Context.h>
+#include <Common/Throttler_fwd.h>
+#include <Common/Priority.h>
 
 #include <optional>
 #include <unistd.h>
@@ -17,7 +19,7 @@ class AsynchronousReadBufferFromFileDescriptor : public ReadBufferFromFileBase
 {
 protected:
     IAsynchronousReader & reader;
-    int64_t base_priority;
+    Priority base_priority;
 
     Memory<> prefetch_buffer;
     std::future<IAsynchronousReader::Result> prefetch_future;
@@ -26,6 +28,7 @@ protected:
     size_t file_offset_of_buffer_end = 0; /// What offset in file corresponds to working_buffer.end().
     size_t bytes_to_ignore = 0;           /// How many bytes should we ignore upon a new read request.
     int fd;
+    ThrottlerPtr throttler;
 
     bool nextImpl() override;
 
@@ -37,16 +40,17 @@ protected:
 public:
     AsynchronousReadBufferFromFileDescriptor(
         IAsynchronousReader & reader_,
-        Int32 priority_,
+        Priority priority_,
         int fd_,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         char * existing_memory = nullptr,
         size_t alignment = 0,
-        std::optional<size_t> file_size_ = std::nullopt);
+        std::optional<size_t> file_size_ = std::nullopt,
+        ThrottlerPtr throttler_ = {});
 
     ~AsynchronousReadBufferFromFileDescriptor() override;
 
-    void prefetch(int64_t priority) override;
+    void prefetch(Priority priority) override;
 
     int getFD() const
     {
@@ -67,7 +71,7 @@ public:
     size_t getFileSize() override;
 
 private:
-    std::future<IAsynchronousReader::Result> asyncReadInto(char * data, size_t size, int64_t priority);
+    std::future<IAsynchronousReader::Result> asyncReadInto(char * data, size_t size, Priority priority);
 };
 
 }
diff --git a/src/IO/AsynchronousReader.h b/src/IO/AsynchronousReader.h
index 91a5db9dcdd..6b8b93fcc20 100644
--- a/src/IO/AsynchronousReader.h
+++ b/src/IO/AsynchronousReader.h
@@ -6,6 +6,7 @@
 #include <future>
 #include <boost/noncopyable.hpp>
 #include <Common/Stopwatch.h>
+#include <Common/Priority.h>
 
 
 namespace DB
@@ -47,7 +48,7 @@ public:
         size_t offset = 0;
         size_t size = 0;
         char * buf = nullptr;
-        int64_t priority = 0;
+        Priority priority;
         size_t ignore = 0;
     };
 
diff --git a/src/IO/BitHelpers.h b/src/IO/BitHelpers.h
index 34173ccd8f9..a9c7343f991 100644
--- a/src/IO/BitHelpers.h
+++ b/src/IO/BitHelpers.h
@@ -139,7 +139,7 @@ private:
         source_current += bytes_to_read;
 
         if constexpr (std::endian::native == std::endian::little)
-            tmp_buffer = __builtin_bswap64(tmp_buffer);
+            tmp_buffer = std::byteswap(tmp_buffer);
 
         bits_buffer |= BufferType(tmp_buffer) << ((sizeof(BufferType) - sizeof(tmp_buffer)) * 8 - bits_count);
         bits_count += static_cast<UInt8>(bytes_to_read) * 8;
@@ -217,14 +217,14 @@ private:
         if (available < to_write)
         {
             throw Exception(ErrorCodes::CANNOT_WRITE_AFTER_END_OF_BUFFER,
-                "Can not write past end of buffer. Space available {} bytes, required to write {} bytes.",
+                "Can not write past end of buffer. Space available is {} bytes, required to write {} bytes.",
                 available, to_write);
         }
-        UInt64 tmp_buffer = 0;
+
+        UInt64 tmp_buffer = static_cast<UInt64>(bits_buffer >> (sizeof(bits_buffer) - sizeof(UInt64)) * 8);
         if constexpr (std::endian::native == std::endian::little)
-            tmp_buffer = __builtin_bswap64(static_cast<UInt64>(bits_buffer >> (sizeof(bits_buffer) - sizeof(UInt64)) * 8));
-        else
-            tmp_buffer = static_cast<UInt64>(bits_buffer >> (sizeof(bits_buffer) - sizeof(UInt64)) * 8);
+            tmp_buffer = std::byteswap(tmp_buffer);
+
         memcpy(dest_current, &tmp_buffer, to_write);
         dest_current += to_write;
 
diff --git a/src/IO/BoundedReadBuffer.cpp b/src/IO/BoundedReadBuffer.cpp
index f4467bb2c0c..bda79d82ad3 100644
--- a/src/IO/BoundedReadBuffer.cpp
+++ b/src/IO/BoundedReadBuffer.cpp
@@ -19,14 +19,6 @@ void BoundedReadBuffer::setReadUntilEnd()
     read_until_position.reset();
 }
 
-SeekableReadBuffer::Range BoundedReadBuffer::getRemainingReadRange() const
-{
-    std::optional<size_t> right_bound_included;
-    if (read_until_position)
-        right_bound_included = *read_until_position - 1;
-    return Range{file_offset_of_buffer_end, right_bound_included};
-}
-
 off_t BoundedReadBuffer::getPosition()
 {
     return file_offset_of_buffer_end - (working_buffer.end() - pos);
diff --git a/src/IO/BoundedReadBuffer.h b/src/IO/BoundedReadBuffer.h
index e645e7f655c..183dbedb78b 100644
--- a/src/IO/BoundedReadBuffer.h
+++ b/src/IO/BoundedReadBuffer.h
@@ -22,8 +22,6 @@ public:
 
     off_t seek(off_t off, int whence) override;
 
-    Range getRemainingReadRange() const override;
-
     size_t getFileOffsetOfBufferEnd() const override { return file_offset_of_buffer_end; }
 
     /// file_offset_of_buffer_end can differ from impl's file_offset_of_buffer_end
diff --git a/src/IO/BrotliReadBuffer.cpp b/src/IO/BrotliReadBuffer.cpp
index 56ef2b5446b..1863cef8a39 100644
--- a/src/IO/BrotliReadBuffer.cpp
+++ b/src/IO/BrotliReadBuffer.cpp
@@ -3,6 +3,7 @@
 #if USE_BROTLI
 #    include <brotli/decode.h>
 #    include "BrotliReadBuffer.h"
+#    include <IO/WithFileName.h>
 
 namespace DB
 {
@@ -60,7 +61,10 @@ bool BrotliReadBuffer::nextImpl()
 
         if (brotli->result == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT && (!in_available || in->eof()))
         {
-            throw Exception(ErrorCodes::BROTLI_READ_FAILED, "brotli decode error");
+            throw Exception(
+                ErrorCodes::BROTLI_READ_FAILED,
+                "brotli decode error{}",
+                getExceptionEntryWithFileName(*in));
         }
 
         out_capacity = internal_buffer.size();
@@ -83,13 +87,19 @@ bool BrotliReadBuffer::nextImpl()
         }
         else
         {
-            throw Exception(ErrorCodes::BROTLI_READ_FAILED, "brotli decode error");
+            throw Exception(
+                ErrorCodes::BROTLI_READ_FAILED,
+                "brotli decode error{}",
+                getExceptionEntryWithFileName(*in));
         }
     }
 
     if (brotli->result == BROTLI_DECODER_RESULT_ERROR)
     {
-        throw Exception(ErrorCodes::BROTLI_READ_FAILED, "brotli decode error");
+        throw Exception(
+            ErrorCodes::BROTLI_READ_FAILED,
+            "brotli decode error{}",
+            getExceptionEntryWithFileName(*in));
     }
 
     return true;
diff --git a/src/IO/Bzip2ReadBuffer.cpp b/src/IO/Bzip2ReadBuffer.cpp
index 9970edcbcf3..45ce8f45232 100644
--- a/src/IO/Bzip2ReadBuffer.cpp
+++ b/src/IO/Bzip2ReadBuffer.cpp
@@ -3,6 +3,7 @@
 #if USE_BZIP2
 #    include <IO/Bzip2ReadBuffer.h>
 #    include <bzlib.h>
+#    include <IO/WithFileName.h>
 
 namespace DB
 {
@@ -118,13 +119,17 @@ bool Bzip2ReadBuffer::nextImpl()
     if (ret != BZ_OK)
         throw Exception(
             ErrorCodes::BZIP2_STREAM_DECODER_FAILED,
-            "bzip2 stream decoder failed: error code: {}",
-            ret);
+            "bzip2 stream decoder failed: error code: {}{}",
+            ret,
+            getExceptionEntryWithFileName(*in));
 
     if (in->eof())
     {
         eof_flag = true;
-        throw Exception(ErrorCodes::UNEXPECTED_END_OF_FILE, "Unexpected end of bzip2 archive");
+        throw Exception(
+            ErrorCodes::UNEXPECTED_END_OF_FILE,
+            "Unexpected end of bzip2 archive{}",
+            getExceptionEntryWithFileName(*in));
     }
 
     return true;
diff --git a/src/IO/CascadeWriteBuffer.cpp b/src/IO/CascadeWriteBuffer.cpp
index 629cbff90af..f0d98027609 100644
--- a/src/IO/CascadeWriteBuffer.cpp
+++ b/src/IO/CascadeWriteBuffer.cpp
@@ -1,4 +1,5 @@
 #include <IO/CascadeWriteBuffer.h>
+#include <IO/MemoryReadWriteBuffer.h>
 #include <Common/Exception.h>
 
 namespace DB
@@ -35,9 +36,9 @@ void CascadeWriteBuffer::nextImpl()
         curr_buffer->position() = position();
         curr_buffer->next();
     }
-    catch (const Exception & e)
+    catch (const MemoryWriteBuffer::CurrentBufferExhausted &)
     {
-        if (curr_buffer_num < num_sources && e.code() == ErrorCodes::CURRENT_WRITE_BUFFER_IS_EXHAUSTED)
+        if (curr_buffer_num < num_sources)
         {
             /// TODO: protocol should require set(position(), 0) before Exception
 
@@ -46,7 +47,7 @@ void CascadeWriteBuffer::nextImpl()
             curr_buffer = setNextBuffer();
         }
         else
-            throw;
+            throw Exception(ErrorCodes::CURRENT_WRITE_BUFFER_IS_EXHAUSTED, "MemoryWriteBuffer limit is exhausted");
     }
 
     set(curr_buffer->position(), curr_buffer->buffer().end() - curr_buffer->position());
diff --git a/src/IO/CascadeWriteBuffer.h b/src/IO/CascadeWriteBuffer.h
index ebd4f262aa2..1059c5b8ddb 100644
--- a/src/IO/CascadeWriteBuffer.h
+++ b/src/IO/CascadeWriteBuffer.h
@@ -16,7 +16,7 @@ namespace ErrorCodes
  * (lazy_sources contains not pointers themself, but their delayed constructors)
  *
  * Firtly, CascadeWriteBuffer redirects data to first buffer of the sequence
- * If current WriteBuffer cannot receive data anymore, it throws special exception CURRENT_WRITE_BUFFER_IS_EXHAUSTED in nextImpl() body,
+ * If current WriteBuffer cannot receive data anymore, it throws special exception MemoryWriteBuffer::CurrentBufferExhausted in nextImpl() body,
  *  CascadeWriteBuffer prepare next buffer and continuously redirects data to it.
  * If there are no buffers anymore CascadeWriteBuffer throws an exception.
  *
diff --git a/src/IO/CompressedReadBufferWrapper.h b/src/IO/CompressedReadBufferWrapper.h
index 8fe87d22dd9..bb58a7bfeb3 100644
--- a/src/IO/CompressedReadBufferWrapper.h
+++ b/src/IO/CompressedReadBufferWrapper.h
@@ -19,7 +19,7 @@ public:
     const ReadBuffer & getWrappedReadBuffer() const { return *in; }
     ReadBuffer & getWrappedReadBuffer() { return *in; }
 
-    void prefetch(int64_t priority) override { in->prefetch(priority); }
+    void prefetch(Priority priority) override { in->prefetch(priority); }
 
 protected:
     std::unique_ptr<ReadBuffer> in;
diff --git a/src/IO/HTTPChunkedReadBuffer.cpp b/src/IO/HTTPChunkedReadBuffer.cpp
index b9c42088c41..29034b35e16 100644
--- a/src/IO/HTTPChunkedReadBuffer.cpp
+++ b/src/IO/HTTPChunkedReadBuffer.cpp
@@ -2,7 +2,7 @@
 
 #include <IO/ReadHelpers.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <base/arithmeticOverflow.h>
 
 
@@ -33,7 +33,7 @@ size_t HTTPChunkedReadBuffer::readChunkHeader()
     } while (!in->eof() && isHexDigit(*in->position()));
 
     if (res > max_chunk_size)
-        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Chunk size exceeded the limit");
+        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Chunk size exceeded the limit (max size: {})", max_chunk_size);
 
     /// NOTE: If we want to read any chunk extensions, it should be done here.
 
diff --git a/src/IO/HTTPCommon.cpp b/src/IO/HTTPCommon.cpp
index 551ce797757..4bea646a42b 100644
--- a/src/IO/HTTPCommon.cpp
+++ b/src/IO/HTTPCommon.cpp
@@ -7,8 +7,6 @@
 #include <Common/ProfileEvents.h>
 #include <Common/SipHash.h>
 
-#include <Poco/Version.h>
-
 #include "config.h"
 
 #if USE_SSL
@@ -98,12 +96,14 @@ namespace
     private:
         const std::string host;
         const UInt16 port;
-        bool https;
+        const bool https;
         const String proxy_host;
         const UInt16 proxy_port;
-        bool proxy_https;
-        bool resolve_host;
+        const bool proxy_https;
+        const bool resolve_host;
+
         using Base = PoolBase<Poco::Net::HTTPClientSession>;
+
         ObjectPtr allocObject() override
         {
             auto session = makeHTTPSessionImpl(host, port, https, true, resolve_host);
@@ -123,14 +123,14 @@ namespace
 
     public:
         SingleEndpointHTTPSessionPool(
-                const std::string & host_,
-                UInt16 port_,
-                bool https_,
-                const std::string & proxy_host_,
-                UInt16 proxy_port_,
-                bool proxy_https_,
-                size_t max_pool_size_,
-                bool resolve_host_ = true)
+            const std::string & host_,
+            UInt16 port_,
+            bool https_,
+            const std::string & proxy_host_,
+            UInt16 proxy_port_,
+            bool proxy_https_,
+            size_t max_pool_size_,
+            bool resolve_host_ = true)
             : Base(static_cast<unsigned>(max_pool_size_), &Poco::Logger::get("HTTPSessionPool"))
             , host(host_)
             , port(port_)
diff --git a/src/IO/HTTPCommon.h b/src/IO/HTTPCommon.h
index e68df159be0..3616a33c1c7 100644
--- a/src/IO/HTTPCommon.h
+++ b/src/IO/HTTPCommon.h
@@ -19,20 +19,6 @@ namespace DB
 
 class HTTPServerResponse;
 
-class SingleEndpointHTTPSessionPool : public PoolBase<Poco::Net::HTTPClientSession>
-{
-private:
-    const std::string host;
-    const UInt16 port;
-    const bool https;
-    using Base = PoolBase<Poco::Net::HTTPClientSession>;
-
-    ObjectPtr allocObject() override;
-
-public:
-    SingleEndpointHTTPSessionPool(const std::string & host_, UInt16 port_, bool https_, size_t max_pool_size_);
-};
-
 class HTTPException : public Exception
 {
 public:
@@ -66,7 +52,7 @@ private:
     const char * className() const noexcept override { return "DB::HTTPException"; }
 };
 
-using PooledHTTPSessionPtr = SingleEndpointHTTPSessionPool::Entry;
+using PooledHTTPSessionPtr = PoolBase<Poco::Net::HTTPClientSession>::Entry; // SingleEndpointHTTPSessionPool::Entry
 using HTTPSessionPtr = std::shared_ptr<Poco::Net::HTTPClientSession>;
 
 void setResponseDefaultHeaders(HTTPServerResponse & response, size_t keep_alive_timeout);
diff --git a/src/IO/HadoopSnappyReadBuffer.cpp b/src/IO/HadoopSnappyReadBuffer.cpp
index 6ba31997b37..28588854268 100644
--- a/src/IO/HadoopSnappyReadBuffer.cpp
+++ b/src/IO/HadoopSnappyReadBuffer.cpp
@@ -11,6 +11,8 @@
 
 #include "HadoopSnappyReadBuffer.h"
 
+#include <IO/WithFileName.h>
+
 namespace DB
 {
 namespace ErrorCodes
@@ -89,9 +91,8 @@ inline HadoopSnappyDecoder::Status HadoopSnappyDecoder::readCompressedLength(siz
     {
         auto status = readLength(avail_in, next_in, &compressed_length);
         if (unlikely(compressed_length > 0 && static_cast<size_t>(compressed_length) > sizeof(buffer)))
-            throw Exception(ErrorCodes::SNAPPY_UNCOMPRESS_FAILED,
-                            "Too large snappy compressed block. buffer size: {}, compressed block size: {}",
-                            sizeof(buffer), compressed_length);
+            return Status::TOO_LARGE_COMPRESSED_BLOCK;
+
         return status;
     }
     return Status::OK;
@@ -196,7 +197,11 @@ bool HadoopSnappyReadBuffer::nextImpl()
 
         if (decoder->result == Status::NEEDS_MORE_INPUT && (!in_available || in->eof()))
         {
-            throw Exception(ErrorCodes::SNAPPY_UNCOMPRESS_FAILED, "hadoop snappy decode error: {}", statusToString(decoder->result));
+            throw Exception(
+                ErrorCodes::SNAPPY_UNCOMPRESS_FAILED,
+                "hadoop snappy decode error: {}{}",
+                statusToString(decoder->result),
+                getExceptionEntryWithFileName(*in));
         }
 
         out_capacity = internal_buffer.size();
@@ -219,9 +224,13 @@ bool HadoopSnappyReadBuffer::nextImpl()
         }
         return true;
     }
-    else if (decoder->result == Status::INVALID_INPUT || decoder->result == Status::BUFFER_TOO_SMALL)
+    else if (decoder->result != Status::NEEDS_MORE_INPUT)
     {
-        throw Exception(ErrorCodes::SNAPPY_UNCOMPRESS_FAILED, "hadoop snappy decode error: {}", statusToString(decoder->result));
+        throw Exception(
+            ErrorCodes::SNAPPY_UNCOMPRESS_FAILED,
+            "hadoop snappy decode error: {}{}",
+            statusToString(decoder->result),
+            getExceptionEntryWithFileName(*in));
     }
     return true;
 }
diff --git a/src/IO/HadoopSnappyReadBuffer.h b/src/IO/HadoopSnappyReadBuffer.h
index 6d1b95f6813..b5fb1fec093 100644
--- a/src/IO/HadoopSnappyReadBuffer.h
+++ b/src/IO/HadoopSnappyReadBuffer.h
@@ -29,6 +29,7 @@ public:
         INVALID_INPUT = 1,
         BUFFER_TOO_SMALL = 2,
         NEEDS_MORE_INPUT = 3,
+        TOO_LARGE_COMPRESSED_BLOCK = 4,
     };
 
     HadoopSnappyDecoder() = default;
@@ -84,6 +85,8 @@ public:
                 return "BUFFER_TOO_SMALL";
             case Status::NEEDS_MORE_INPUT:
                 return "NEEDS_MORE_INPUT";
+            case Status::TOO_LARGE_COMPRESSED_BLOCK:
+                return "TOO_LARGE_COMPRESSED_BLOCK";
         }
         UNREACHABLE();
     }
diff --git a/src/IO/IOThreadPool.cpp b/src/IO/IOThreadPool.cpp
deleted file mode 100644
index 4014d00d8b8..00000000000
--- a/src/IO/IOThreadPool.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <IO/IOThreadPool.h>
-#include "Core/Field.h"
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-std::unique_ptr<ThreadPool> IOThreadPool::instance;
-
-void IOThreadPool::initialize(size_t max_threads, size_t max_free_threads, size_t queue_size)
-{
-    if (instance)
-    {
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "The IO thread pool is initialized twice");
-    }
-
-    instance = std::make_unique<ThreadPool>(max_threads, max_free_threads, queue_size, false /*shutdown_on_exception*/);
-}
-
-ThreadPool & IOThreadPool::get()
-{
-    if (!instance)
-    {
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "The IO thread pool is not initialized");
-    }
-
-    return *instance;
-}
-
-}
diff --git a/src/IO/IOThreadPool.h b/src/IO/IOThreadPool.h
deleted file mode 100644
index 4fcf99b6048..00000000000
--- a/src/IO/IOThreadPool.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include <Common/ThreadPool.h>
-
-namespace DB
-{
-
-/*
- * ThreadPool used for the IO.
- */
-class IOThreadPool
-{
-    static std::unique_ptr<ThreadPool> instance;
-
-public:
-    static void initialize(size_t max_threads, size_t max_free_threads, size_t queue_size);
-    static ThreadPool & get();
-};
-
-}
diff --git a/src/IO/ISchedulerNode.h b/src/IO/ISchedulerNode.h
index 266f1ba07a0..1c33c033744 100644
--- a/src/IO/ISchedulerNode.h
+++ b/src/IO/ISchedulerNode.h
@@ -2,6 +2,7 @@
 
 #include <Common/ErrorCodes.h>
 #include <Common/Exception.h>
+#include <Common/Priority.h>
 
 #include <IO/ResourceRequest.h>
 #include <Poco/Util/AbstractConfiguration.h>
@@ -37,7 +38,7 @@ inline const Poco::Util::AbstractConfiguration & emptyConfig()
 struct SchedulerNodeInfo
 {
     double weight = 1.0; /// Weight of this node among it's siblings
-    Int64 priority = 0; /// Priority of this node among it's siblings (higher value means higher priority)
+    Priority priority; /// Priority of this node among it's siblings (lower value means higher priority)
 
     /// Arbitrary data accessed/stored by parent
     union {
@@ -65,7 +66,7 @@ struct SchedulerNodeInfo
 
     void setPriority(Int64 value)
     {
-        priority = value;
+        priority.value = value;
     }
 };
 
diff --git a/src/IO/LZMAInflatingReadBuffer.cpp b/src/IO/LZMAInflatingReadBuffer.cpp
index 6d40dafd517..a6f3c74ae73 100644
--- a/src/IO/LZMAInflatingReadBuffer.cpp
+++ b/src/IO/LZMAInflatingReadBuffer.cpp
@@ -1,4 +1,5 @@
 #include <IO/LZMAInflatingReadBuffer.h>
+#include <IO/WithFileName.h>
 
 namespace DB
 {
@@ -78,18 +79,20 @@ bool LZMAInflatingReadBuffer::nextImpl()
         {
             throw Exception(
                 ErrorCodes::LZMA_STREAM_DECODER_FAILED,
-                "lzma decoder finished, but input stream has not exceeded: error code: {}; lzma version: {}",
+                "lzma decoder finished, but input stream has not exceeded: error code: {}; lzma version: {}{}",
                 ret,
-                LZMA_VERSION_STRING);
+                LZMA_VERSION_STRING,
+                getExceptionEntryWithFileName(*in));
         }
     }
 
     if (ret != LZMA_OK)
         throw Exception(
             ErrorCodes::LZMA_STREAM_DECODER_FAILED,
-            "lzma_stream_decoder failed: error code: error codeL {}; lzma version: {}",
+            "lzma_stream_decoder failed: error code: error code {}; lzma version: {}{}",
             ret,
-            LZMA_VERSION_STRING);
+            LZMA_VERSION_STRING,
+            getExceptionEntryWithFileName(*in));
 
     return true;
 }
diff --git a/src/IO/LimitReadBuffer.cpp b/src/IO/LimitReadBuffer.cpp
index 6b3c383c753..e14112f8d19 100644
--- a/src/IO/LimitReadBuffer.cpp
+++ b/src/IO/LimitReadBuffer.cpp
@@ -9,6 +9,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LIMIT_EXCEEDED;
+    extern const int CANNOT_READ_ALL_DATA;
 }
 
 
@@ -21,14 +22,22 @@ bool LimitReadBuffer::nextImpl()
 
     if (bytes >= limit)
     {
+        if (exact_limit && bytes == *exact_limit)
+            return false;
+
+        if (exact_limit && bytes != *exact_limit)
+            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Unexpected data, got {} bytes, expected {}", bytes, *exact_limit);
+
         if (throw_exception)
             throw Exception(ErrorCodes::LIMIT_EXCEEDED, "Limit for LimitReadBuffer exceeded: {}", exception_message);
-        else
-            return false;
+
+        return false;
     }
 
     if (!in->next())
     {
+        if (exact_limit && bytes != *exact_limit)
+            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Unexpected EOF, got {} of {} bytes", bytes, *exact_limit);
         /// Clearing the buffer with existing data.
         set(in->position(), 0);
         return false;
@@ -43,12 +52,14 @@ bool LimitReadBuffer::nextImpl()
 }
 
 
-LimitReadBuffer::LimitReadBuffer(ReadBuffer * in_, bool owns, UInt64 limit_, bool throw_exception_, std::string exception_message_)
+LimitReadBuffer::LimitReadBuffer(ReadBuffer * in_, bool owns, UInt64 limit_, bool throw_exception_,
+                                 std::optional<size_t> exact_limit_, std::string exception_message_)
     : ReadBuffer(in_ ? in_->position() : nullptr, 0)
     , in(in_)
     , owns_in(owns)
     , limit(limit_)
     , throw_exception(throw_exception_)
+    , exact_limit(exact_limit_)
     , exception_message(std::move(exception_message_))
 {
     assert(in);
@@ -61,14 +72,16 @@ LimitReadBuffer::LimitReadBuffer(ReadBuffer * in_, bool owns, UInt64 limit_, boo
 }
 
 
-LimitReadBuffer::LimitReadBuffer(ReadBuffer & in_, UInt64 limit_, bool throw_exception_, std::string exception_message_)
-    : LimitReadBuffer(&in_, false, limit_, throw_exception_, exception_message_)
+LimitReadBuffer::LimitReadBuffer(ReadBuffer & in_, UInt64 limit_, bool throw_exception_,
+                                 std::optional<size_t> exact_limit_, std::string exception_message_)
+    : LimitReadBuffer(&in_, false, limit_, throw_exception_, exact_limit_, exception_message_)
 {
 }
 
 
-LimitReadBuffer::LimitReadBuffer(std::unique_ptr<ReadBuffer> in_, UInt64 limit_, bool throw_exception_, std::string exception_message_)
-    : LimitReadBuffer(in_.release(), true, limit_, throw_exception_, exception_message_)
+LimitReadBuffer::LimitReadBuffer(std::unique_ptr<ReadBuffer> in_, UInt64 limit_, bool throw_exception_,
+                                 std::optional<size_t> exact_limit_, std::string exception_message_)
+    : LimitReadBuffer(in_.release(), true, limit_, throw_exception_, exact_limit_, exception_message_)
 {
 }
 
diff --git a/src/IO/LimitReadBuffer.h b/src/IO/LimitReadBuffer.h
index 92e5fbb0aa6..15885c1d850 100644
--- a/src/IO/LimitReadBuffer.h
+++ b/src/IO/LimitReadBuffer.h
@@ -13,8 +13,10 @@ namespace DB
 class LimitReadBuffer : public ReadBuffer
 {
 public:
-    LimitReadBuffer(ReadBuffer & in_, UInt64 limit_, bool throw_exception_, std::string exception_message_ = {});
-    LimitReadBuffer(std::unique_ptr<ReadBuffer> in_, UInt64 limit_, bool throw_exception_, std::string exception_message_ = {});
+    LimitReadBuffer(ReadBuffer & in_, UInt64 limit_, bool throw_exception_,
+                    std::optional<size_t> exact_limit_, std::string exception_message_ = {});
+    LimitReadBuffer(std::unique_ptr<ReadBuffer> in_, UInt64 limit_, bool throw_exception_, std::optional<size_t> exact_limit_,
+                    std::string exception_message_ = {});
     ~LimitReadBuffer() override;
 
 private:
@@ -23,9 +25,10 @@ private:
 
     UInt64 limit;
     bool throw_exception;
+    std::optional<size_t> exact_limit;
     std::string exception_message;
 
-    LimitReadBuffer(ReadBuffer * in_, bool owns, UInt64 limit_, bool throw_exception_, std::string exception_message_);
+    LimitReadBuffer(ReadBuffer * in_, bool owns, UInt64 limit_, bool throw_exception_, std::optional<size_t> exact_limit_, std::string exception_message_);
 
     bool nextImpl() override;
 };
diff --git a/src/IO/LimitSeekableReadBuffer.cpp b/src/IO/LimitSeekableReadBuffer.cpp
index acd7ba6eaa0..587138cb2cf 100644
--- a/src/IO/LimitSeekableReadBuffer.cpp
+++ b/src/IO/LimitSeekableReadBuffer.cpp
@@ -19,7 +19,7 @@ LimitSeekableReadBuffer::LimitSeekableReadBuffer(std::unique_ptr<SeekableReadBuf
     , in(std::move(in_))
     , min_offset(start_offset_)
     , max_offset(start_offset_ + limit_size_)
-    , need_seek(start_offset_)
+    , need_seek(min_offset) /// We always start reading from `min_offset`.
 {
 }
 
@@ -31,44 +31,50 @@ bool LimitSeekableReadBuffer::nextImpl()
     if (need_seek)
     {
         /// Do actual seek.
-        if (in->getPosition() != *need_seek)
+        if (in->seek(*need_seek, SEEK_SET) != static_cast<off_t>(*need_seek))
         {
-            if (in->seek(*need_seek, SEEK_SET) != static_cast<off_t>(*need_seek))
-            {
-                /// Failed to seek, maybe because the new seek position is located after EOF.
-                set(in->position(), 0);
-                return false;
-            }
+            /// Failed to seek, maybe because the new seek position is located after EOF.
+            set(in->position(), 0);
+            return false;
         }
         need_seek.reset();
     }
 
-    if (in->getPosition() >= max_offset)
+    off_t seek_pos = in->getPosition();
+    off_t offset_after_min = seek_pos - min_offset;
+    off_t available_before_max = max_offset - seek_pos;
+
+    if (offset_after_min < 0 || available_before_max <= 0)
     {
         /// Limit reached.
         set(in->position(), 0);
         return false;
     }
 
-    if (in->eof())
+    if (in->eof()) /// `in->eof()` can call `in->next()`
     {
         /// EOF reached.
         set(in->position(), 0);
         return false;
     }
 
-    /// Adjust the size of the buffer (we don't allow to read more than `max_offset - min_offset`).
-    off_t size = in->buffer().size();
-    size = std::min(size, max_offset - in->getPosition());
+    /// in->eof() shouldn't change the seek position.
+    chassert(seek_pos == in->getPosition());
 
-    if (!size || (static_cast<off_t>(in->offset()) >= size))
-    {
-        /// Limit reached.
-        set(in->position(), 0);
-        return false;
-    }
+    /// Adjust the beginning and the end of the working buffer.
+    /// Because we don't want to read before `min_offset` or after `max_offset`.
+    auto * ptr = in->position();
+    auto * begin = in->buffer().begin();
+    auto * end = in->buffer().end();
+
+    if (ptr - begin > offset_after_min)
+        begin = ptr - offset_after_min;
+    if (end - ptr > available_before_max)
+        end = ptr + available_before_max;
+
+    BufferBase::set(begin, end - begin, ptr - begin);
+    chassert(position() == ptr && available());
 
-    BufferBase::set(in->buffer().begin(), size, in->offset());
     return true;
 }
 
diff --git a/src/IO/Lz4InflatingReadBuffer.cpp b/src/IO/Lz4InflatingReadBuffer.cpp
index 049f3a4d15a..eaa71048e70 100644
--- a/src/IO/Lz4InflatingReadBuffer.cpp
+++ b/src/IO/Lz4InflatingReadBuffer.cpp
@@ -1,4 +1,5 @@
 #include <IO/Lz4InflatingReadBuffer.h>
+#include <IO/WithFileName.h>
 
 namespace DB
 {
@@ -72,9 +73,10 @@ bool Lz4InflatingReadBuffer::nextImpl()
     if (LZ4F_isError(ret))
         throw Exception(
             ErrorCodes::LZ4_DECODER_FAILED,
-            "LZ4 decompression failed. LZ4F version: {}. Error: {}",
+            "LZ4 decompression failed. LZ4F version: {}. Error: {}{}",
             LZ4F_VERSION,
-            LZ4F_getErrorName(ret));
+            LZ4F_getErrorName(ret),
+            getExceptionEntryWithFileName(*in));
 
     if (in->eof())
     {
diff --git a/src/IO/MemoryReadWriteBuffer.cpp b/src/IO/MemoryReadWriteBuffer.cpp
index 8958390fe03..d6f89108561 100644
--- a/src/IO/MemoryReadWriteBuffer.cpp
+++ b/src/IO/MemoryReadWriteBuffer.cpp
@@ -5,12 +5,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int CURRENT_WRITE_BUFFER_IS_EXHAUSTED;
-}
-
-
 class ReadBufferFromMemoryWriteBuffer : public ReadBuffer, boost::noncopyable, private Allocator<false>
 {
 public:
@@ -106,7 +100,7 @@ void MemoryWriteBuffer::addChunk()
     }
     else
     {
-        next_chunk_size = std::max(static_cast<size_t>(1), static_cast<size_t>(chunk_tail->size() * growth_rate));
+        next_chunk_size = std::max(1uz, static_cast<size_t>(chunk_tail->size() * growth_rate));
         next_chunk_size = std::min(next_chunk_size, max_chunk_size);
     }
 
@@ -118,7 +112,7 @@ void MemoryWriteBuffer::addChunk()
         if (0 == next_chunk_size)
         {
             set(position(), 0);
-            throw Exception(ErrorCodes::CURRENT_WRITE_BUFFER_IS_EXHAUSTED, "MemoryWriteBuffer limit is exhausted");
+            throw MemoryWriteBuffer::CurrentBufferExhausted();
         }
     }
 
diff --git a/src/IO/MemoryReadWriteBuffer.h b/src/IO/MemoryReadWriteBuffer.h
index bcaf9a9a965..ee128c355c6 100644
--- a/src/IO/MemoryReadWriteBuffer.h
+++ b/src/IO/MemoryReadWriteBuffer.h
@@ -16,6 +16,12 @@ namespace DB
 class MemoryWriteBuffer : public WriteBuffer, public IReadableWriteBuffer, boost::noncopyable, private Allocator<false>
 {
 public:
+    /// Special exception to throw when the current WriteBuffer cannot receive data
+    class CurrentBufferExhausted : public std::exception
+    {
+    public:
+        const char * what() const noexcept override { return "MemoryWriteBuffer limit is exhausted"; }
+    };
 
     /// Use max_total_size_ = 0 for unlimited storage
     explicit MemoryWriteBuffer(
diff --git a/src/IO/Operators.h b/src/IO/Operators.h
index 06ff20c43e8..185745e8415 100644
--- a/src/IO/Operators.h
+++ b/src/IO/Operators.h
@@ -30,11 +30,13 @@ enum EscapeManip        { escape };           /// For strings - escape special c
 enum QuoteManip         { quote };            /// For strings, dates, datetimes - enclose in single quotes with escaping. In the rest, as usual.
 enum DoubleQuoteManip   { double_quote };     /// For strings, dates, datetimes - enclose in double quotes with escaping. In the rest, as usual.
 enum BinaryManip        { binary };           /// Output in binary format.
+enum XMLManip           { xml };              /// Output strings with XML escaping.
 
 struct EscapeManipWriteBuffer        : std::reference_wrapper<WriteBuffer> { using std::reference_wrapper<WriteBuffer>::reference_wrapper; };
 struct QuoteManipWriteBuffer         : std::reference_wrapper<WriteBuffer> { using std::reference_wrapper<WriteBuffer>::reference_wrapper; };
 struct DoubleQuoteManipWriteBuffer   : std::reference_wrapper<WriteBuffer> { using std::reference_wrapper<WriteBuffer>::reference_wrapper; };
 struct BinaryManipWriteBuffer        : std::reference_wrapper<WriteBuffer> { using std::reference_wrapper<WriteBuffer>::reference_wrapper; };
+struct XMLManipWriteBuffer           : std::reference_wrapper<WriteBuffer> { using std::reference_wrapper<WriteBuffer>::reference_wrapper; };
 
 struct EscapeManipReadBuffer         : std::reference_wrapper<ReadBuffer> { using std::reference_wrapper<ReadBuffer>::reference_wrapper; };
 struct QuoteManipReadBuffer          : std::reference_wrapper<ReadBuffer> { using std::reference_wrapper<ReadBuffer>::reference_wrapper; };
@@ -48,11 +50,13 @@ inline EscapeManipWriteBuffer      operator<< (WriteBuffer & buf, EscapeManip)
 inline QuoteManipWriteBuffer       operator<< (WriteBuffer & buf, QuoteManip)       { return buf; }
 inline DoubleQuoteManipWriteBuffer operator<< (WriteBuffer & buf, DoubleQuoteManip) { return buf; }
 inline BinaryManipWriteBuffer      operator<< (WriteBuffer & buf, BinaryManip)      { return buf; }
+inline XMLManipWriteBuffer         operator<< (WriteBuffer & buf, XMLManip)         { return buf; }
 
 template <typename T> WriteBuffer & operator<< (EscapeManipWriteBuffer buf,        const T & x) { writeText(x, buf.get());         return buf; }
 template <typename T> WriteBuffer & operator<< (QuoteManipWriteBuffer buf,         const T & x) { writeQuoted(x, buf.get());       return buf; }
 template <typename T> WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf,   const T & x) { writeDoubleQuoted(x, buf.get()); return buf; }
 template <typename T> WriteBuffer & operator<< (BinaryManipWriteBuffer buf,        const T & x) { writeBinary(x, buf.get());       return buf; }
+template <typename T> WriteBuffer & operator<< (XMLManipWriteBuffer buf,           const T & x) { writeText(x, buf.get());         return buf; }
 
 inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const String & x)   { writeEscapedString(x, buf); return buf; }
 inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, std::string_view x) { writeEscapedString(x, buf); return buf; }
@@ -63,6 +67,10 @@ inline WriteBuffer & operator<< (QuoteManipWriteBuffer buf,       const char * x
 inline WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf, const char * x) { writeAnyQuotedString<'"'>(x, x + strlen(x), buf.get()); return buf; }
 inline WriteBuffer & operator<< (BinaryManipWriteBuffer buf,      const char * x) { writeStringBinary(x, buf.get()); return buf; }
 
+inline  WriteBuffer & operator<< (XMLManipWriteBuffer buf, std::string_view x) { writeXMLStringForTextElementOrAttributeValue(x, buf); return buf; }
+inline  WriteBuffer & operator<< (XMLManipWriteBuffer buf, StringRef x)        { writeXMLStringForTextElementOrAttributeValue(x.toView(), buf); return buf; }
+inline  WriteBuffer & operator<< (XMLManipWriteBuffer buf, const char * x)     { writeXMLStringForTextElementOrAttributeValue(std::string_view(x), buf); return buf; }
+
 /// The manipulator calls the WriteBuffer method `next` - this makes the buffer reset. For nested buffers, the reset is not recursive.
 enum FlushManip { flush };
 
diff --git a/src/IO/ParallelReadBuffer.cpp b/src/IO/ParallelReadBuffer.cpp
index 1c7c136c315..fff02db1bd6 100644
--- a/src/IO/ParallelReadBuffer.cpp
+++ b/src/IO/ParallelReadBuffer.cpp
@@ -13,12 +13,13 @@ namespace ErrorCodes
 
 }
 
+// A subrange of the input, read by one SeekableReadBuffer.
 struct ParallelReadBuffer::ReadWorker
 {
-    explicit ReadWorker(SeekableReadBufferPtr reader_) : reader(std::move(reader_)), range(reader->getRemainingReadRange())
+    ReadWorker(std::unique_ptr<SeekableReadBuffer> reader_, size_t offset_, size_t size)
+        : reader(std::move(reader_)), offset(offset_), bytes_left(size), range_end(offset + bytes_left)
     {
-        assert(range.right);
-        bytes_left = *range.right - range.left + 1;
+        assert(bytes_left);
     }
 
     auto hasSegment() const { return current_segment_index < segments.size(); }
@@ -28,26 +29,34 @@ struct ParallelReadBuffer::ReadWorker
         assert(hasSegment());
         auto next_segment = std::move(segments[current_segment_index]);
         ++current_segment_index;
-        range.left += next_segment.size();
+        offset += next_segment.size();
         return next_segment;
     }
 
-    SeekableReadBufferPtr reader;
-    std::vector<Memory<>> segments;
-    size_t current_segment_index = 0;
-    bool finished{false};
-    SeekableReadBuffer::Range range;
-    size_t bytes_left{0};
+    std::unique_ptr<SeekableReadBuffer> reader;
+    // Reader thread produces segments, nextImpl() consumes them.
+    std::vector<Memory<>> segments; // segments that were produced
+    size_t current_segment_index = 0; // first segment that's not consumed
+    bool finished{false}; // no more segments will be produced
+    size_t offset; // start of segments[current_segment_idx]
+    size_t bytes_left; // bytes left to produce above segments end
+    size_t range_end; // segments end + bytes_left, i.e. how far this worker will read
+
+    //                  segments[current_segment_idx..end]           range_end
+    // |-------------|--------------------------------------|------------|
+    //             offset                                     bytes_left
+
     std::atomic_bool cancel{false};
     std::mutex worker_mutex;
 };
 
 ParallelReadBuffer::ParallelReadBuffer(
-    std::unique_ptr<ReadBufferFactory> reader_factory_, ThreadPoolCallbackRunner<void> schedule_, size_t max_working_readers_)
+    std::unique_ptr<SeekableReadBufferFactory> reader_factory_, ThreadPoolCallbackRunner<void> schedule_, size_t max_working_readers_, size_t range_step_)
     : SeekableReadBuffer(nullptr, 0)
     , max_working_readers(max_working_readers_)
     , schedule(std::move(schedule_))
     , reader_factory(std::move(reader_factory_))
+    , range_step(std::max(1ul, range_step_))
 {
     try
     {
@@ -62,16 +71,23 @@ ParallelReadBuffer::ParallelReadBuffer(
 
 bool ParallelReadBuffer::addReaderToPool()
 {
+    size_t file_size = reader_factory->getFileSize();
+    if (next_range_start >= file_size)
+        return false;
+    size_t range_start = next_range_start;
+    size_t size = std::min(range_step, file_size - range_start);
+    next_range_start += size;
+
     auto reader = reader_factory->getReader();
     if (!reader)
     {
         return false;
     }
 
-    auto worker = read_workers.emplace_back(std::make_shared<ReadWorker>(std::move(reader)));
+    auto worker = read_workers.emplace_back(std::make_shared<ReadWorker>(std::move(reader), range_start, size));
 
     ++active_working_reader;
-    schedule([this, worker = std::move(worker)]() mutable { readerThreadFunction(std::move(worker)); }, 0);
+    schedule([this, my_worker = std::move(worker)]() mutable { readerThreadFunction(std::move(my_worker)); }, Priority{});
 
     return true;
 }
@@ -100,9 +116,9 @@ off_t ParallelReadBuffer::seek(off_t offset, int whence)
     }
 
     const auto offset_is_in_range
-        = [&](const auto & range) { return static_cast<size_t>(offset) >= range.left && static_cast<size_t>(offset) <= *range.right; };
+        = [&](const auto & worker) { return static_cast<size_t>(offset) >= worker->offset && static_cast<size_t>(offset) < worker->range_end; };
 
-    while (!read_workers.empty() && (offset < current_position || !offset_is_in_range(read_workers.front()->range)))
+    while (!read_workers.empty() && (offset < current_position || !offset_is_in_range(read_workers.front())))
     {
         read_workers.front()->cancel = true;
         read_workers.pop_front();
@@ -111,7 +127,7 @@ off_t ParallelReadBuffer::seek(off_t offset, int whence)
     if (!read_workers.empty())
     {
         auto & front_worker = read_workers.front();
-        current_position = front_worker->range.left;
+        current_position = front_worker->offset;
         while (true)
         {
             std::unique_lock lock{front_worker->worker_mutex};
@@ -121,26 +137,24 @@ off_t ParallelReadBuffer::seek(off_t offset, int whence)
                 handleEmergencyStop();
 
             auto next_segment = front_worker->nextSegment();
-            if (static_cast<size_t>(offset) < current_position + next_segment.size())
+            current_position += next_segment.size();
+            if (offset < current_position)
             {
                 current_segment = std::move(next_segment);
                 working_buffer = internal_buffer = Buffer(current_segment.data(), current_segment.data() + current_segment.size());
-                current_position += current_segment.size();
                 pos = working_buffer.end() - (current_position - offset);
                 addReaders();
                 return offset;
             }
-
-            current_position += next_segment.size();
         }
     }
 
     finishAndWait();
 
-    reader_factory->seek(offset, whence);
     all_completed = false;
     read_workers.clear();
 
+    next_range_start = offset;
     current_position = offset;
     resetWorkingBuffer();
 
@@ -249,6 +263,9 @@ void ParallelReadBuffer::readerThreadFunction(ReadWorkerPtr read_worker)
 
     try
     {
+        read_worker->reader->setReadUntilPosition(read_worker->range_end);
+        read_worker->reader->seek(read_worker->offset, SEEK_SET);
+
         while (!emergency_stop && !read_worker->cancel)
         {
             if (!read_worker->reader->next())
diff --git a/src/IO/ParallelReadBuffer.h b/src/IO/ParallelReadBuffer.h
index d6e9b7989ad..70f925f9735 100644
--- a/src/IO/ParallelReadBuffer.h
+++ b/src/IO/ParallelReadBuffer.h
@@ -5,14 +5,13 @@
 #include <IO/SeekableReadBuffer.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
 #include <Common/ArenaWithFreeLists.h>
-#include <Common/ThreadPool.h>
 
 namespace DB
 {
 
 /**
  * Reads from multiple ReadBuffers in parallel.
- * Preserves order of readers obtained from ReadBufferFactory.
+ * Preserves order of readers obtained from SeekableReadBufferFactory.
  *
  * It consumes multiple readers and yields data from them in order as it passed.
  * Each working reader save segments of data to internal queue.
@@ -30,16 +29,7 @@ private:
     bool nextImpl() override;
 
 public:
-    class ReadBufferFactory : public WithFileSize
-    {
-    public:
-        ~ReadBufferFactory() override = default;
-
-        virtual SeekableReadBufferPtr getReader() = 0;
-        virtual off_t seek(off_t off, int whence) = 0;
-    };
-
-    ParallelReadBuffer(std::unique_ptr<ReadBufferFactory> reader_factory_, ThreadPoolCallbackRunner<void> schedule_, size_t max_working_readers);
+    ParallelReadBuffer(SeekableReadBufferFactoryPtr reader_factory_, ThreadPoolCallbackRunner<void> schedule_, size_t max_working_readers, size_t range_step_);
 
     ~ParallelReadBuffer() override { finishAndWait(); }
 
@@ -47,8 +37,8 @@ public:
     size_t getFileSize();
     off_t getPosition() override;
 
-    const ReadBufferFactory & getReadBufferFactory() const { return *reader_factory; }
-    ReadBufferFactory & getReadBufferFactory() { return *reader_factory; }
+    const SeekableReadBufferFactory & getReadBufferFactory() const { return *reader_factory; }
+    SeekableReadBufferFactory & getReadBufferFactory() { return *reader_factory; }
 
 private:
     /// Reader in progress with a list of read segments
@@ -78,7 +68,9 @@ private:
 
     ThreadPoolCallbackRunner<void> schedule;
 
-    std::unique_ptr<ReadBufferFactory> reader_factory;
+    std::unique_ptr<SeekableReadBufferFactory> reader_factory;
+    size_t range_step;
+    size_t next_range_start{0};
 
     /**
      * FIFO queue of readers.
@@ -95,7 +87,7 @@ private:
     std::exception_ptr background_exception = nullptr;
     std::atomic_bool emergency_stop{false};
 
-    off_t current_position{0};
+    off_t current_position{0}; // end of working_buffer
 
     bool all_completed{false};
 };
diff --git a/src/IO/PeekableReadBuffer.h b/src/IO/PeekableReadBuffer.h
index 7af17aff090..78cb319327d 100644
--- a/src/IO/PeekableReadBuffer.h
+++ b/src/IO/PeekableReadBuffer.h
@@ -20,7 +20,7 @@ public:
 
     ~PeekableReadBuffer() override;
 
-    void prefetch(int64_t priority) override { sub_buf->prefetch(priority); }
+    void prefetch(Priority priority) override { sub_buf->prefetch(priority); }
 
     /// Sets checkpoint at current position
     ALWAYS_INLINE inline void setCheckpoint()
diff --git a/src/IO/ReadBuffer.h b/src/IO/ReadBuffer.h
index 3c0add151c2..a4ae12f5069 100644
--- a/src/IO/ReadBuffer.h
+++ b/src/IO/ReadBuffer.h
@@ -6,6 +6,7 @@
 #include <memory>
 
 #include <Common/Exception.h>
+#include <Common/Priority.h>
 #include <IO/BufferBase.h>
 #include <IO/AsynchronousReader.h>
 
@@ -20,7 +21,7 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-static constexpr auto DEFAULT_PREFETCH_PRIORITY = 0;
+static constexpr auto DEFAULT_PREFETCH_PRIORITY = Priority{0};
 
 /** A simple abstract class for buffered data reading (char sequences) from somewhere.
   * Unlike std::istream, it provides access to the internal buffer,
@@ -54,8 +55,12 @@ public:
     // FIXME: behavior differs greately from `BufferBase::set()` and it's very confusing.
     void set(Position ptr, size_t size) { BufferBase::set(ptr, size, 0); working_buffer.resize(0); }
 
-    /** read next data and fill a buffer with it; set position to the beginning;
-      * return `false` in case of end, `true` otherwise; throw an exception, if something is wrong
+    /** read next data and fill a buffer with it; set position to the beginning of the new data
+      * (but not necessarily to the beginning of working_buffer!);
+      * return `false` in case of end, `true` otherwise; throw an exception, if something is wrong;
+      *
+      * if an exception was thrown, is the ReadBuffer left in a usable state? this varies across implementations;
+      * can the caller retry next() after an exception, or call other methods? not recommended
       */
     bool next()
     {
@@ -204,14 +209,28 @@ public:
 
     /** Do something to allow faster subsequent call to 'nextImpl' if possible.
       * It's used for asynchronous readers with double-buffering.
-      * `priority` is the Threadpool priority, with which the prefetch task will be schedules.
-      * Smaller is more priority.
+      * `priority` is the `ThreadPool` priority, with which the prefetch task will be scheduled.
+      * Lower value means higher priority.
       */
-    virtual void prefetch(int64_t /* priority */) {}
+    virtual void prefetch(Priority) {}
 
     /**
      * Set upper bound for read range [..., position).
-     * Required for reading from remote filesystem, when it matters how much we read.
+     * Useful for reading from remote filesystem, when it matters how much we read.
+     * Doesn't affect getFileSize().
+     * See also: SeekableReadBuffer::supportsRightBoundedReads().
+     *
+     * Behavior in weird cases is currently implementation-defined:
+     *  - setReadUntilPosition() below current position,
+     *  - setReadUntilPosition() above the end of the file,
+     *  - seek() to a position above the until position (even if you setReadUntilPosition() to a
+     *    higher value right after the seek!),
+     *
+     * Typical implementations discard any current buffers and connections, even if the position is
+     * adjusted only a little.
+     *
+     * Typical usage is to call it right after creating the ReadBuffer, before it started doing any
+     * work.
      */
     virtual void setReadUntilPosition(size_t /* position */) {}
 
diff --git a/src/IO/ReadBufferFromFile.cpp b/src/IO/ReadBufferFromFile.cpp
index 3b2decc1f94..79ac62c6421 100644
--- a/src/IO/ReadBufferFromFile.cpp
+++ b/src/IO/ReadBufferFromFile.cpp
@@ -30,8 +30,10 @@ ReadBufferFromFile::ReadBufferFromFile(
     int flags,
     char * existing_memory,
     size_t alignment,
-    std::optional<size_t> file_size_)
-    : ReadBufferFromFileDescriptor(-1, buf_size, existing_memory, alignment, file_size_), file_name(file_name_)
+    std::optional<size_t> file_size_,
+    ThrottlerPtr throttler_)
+    : ReadBufferFromFileDescriptor(-1, buf_size, existing_memory, alignment, file_size_, throttler_)
+    , file_name(file_name_)
 {
     ProfileEvents::increment(ProfileEvents::FileOpen);
 
@@ -61,8 +63,9 @@ ReadBufferFromFile::ReadBufferFromFile(
     size_t buf_size,
     char * existing_memory,
     size_t alignment,
-    std::optional<size_t> file_size_)
-    : ReadBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment, file_size_)
+    std::optional<size_t> file_size_,
+    ThrottlerPtr throttler_)
+    : ReadBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment, file_size_, throttler_)
     , file_name(original_file_name.empty() ? "(fd = " + toString(fd_) + ")" : original_file_name)
 {
     fd_ = -1;
diff --git a/src/IO/ReadBufferFromFile.h b/src/IO/ReadBufferFromFile.h
index a720f8dd36d..462453d974d 100644
--- a/src/IO/ReadBufferFromFile.h
+++ b/src/IO/ReadBufferFromFile.h
@@ -29,7 +29,8 @@ public:
         int flags = -1,
         char * existing_memory = nullptr,
         size_t alignment = 0,
-        std::optional<size_t> file_size_ = std::nullopt);
+        std::optional<size_t> file_size_ = std::nullopt,
+        ThrottlerPtr throttler = {});
 
     /// Use pre-opened file descriptor.
     explicit ReadBufferFromFile(
@@ -38,7 +39,8 @@ public:
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         char * existing_memory = nullptr,
         size_t alignment = 0,
-        std::optional<size_t> file_size_ = std::nullopt);
+        std::optional<size_t> file_size_ = std::nullopt,
+        ThrottlerPtr throttler = {});
 
     ~ReadBufferFromFile() override;
 
@@ -88,8 +90,9 @@ public:
         int flags = -1,
         char * existing_memory = nullptr,
         size_t alignment = 0,
-        std::optional<size_t> file_size_ = std::nullopt)
-        : ReadBufferFromFileDescriptorPRead(-1, buf_size, existing_memory, alignment, file_size_)
+        std::optional<size_t> file_size_ = std::nullopt,
+        ThrottlerPtr throttler_ = {})
+        : ReadBufferFromFileDescriptorPRead(-1, buf_size, existing_memory, alignment, file_size_, throttler_)
         , file_name(file_name_)
     {
         file = OpenedFileCache::instance().get(file_name, flags);
diff --git a/src/IO/ReadBufferFromFileBase.cpp b/src/IO/ReadBufferFromFileBase.cpp
index d94cf12294b..4181615bc52 100644
--- a/src/IO/ReadBufferFromFileBase.cpp
+++ b/src/IO/ReadBufferFromFileBase.cpp
@@ -1,4 +1,5 @@
 #include <IO/ReadBufferFromFileBase.h>
+#include <IO/Progress.h>
 #include <Interpreters/Context.h>
 
 namespace DB
diff --git a/src/IO/ReadBufferFromFileDecorator.h b/src/IO/ReadBufferFromFileDecorator.h
index 1d035e8d74b..6e62c7f741b 100644
--- a/src/IO/ReadBufferFromFileDecorator.h
+++ b/src/IO/ReadBufferFromFileDecorator.h
@@ -27,8 +27,6 @@ public:
 
     ReadBuffer & getWrappedReadBuffer() { return *impl; }
 
-    bool isIntegratedWithFilesystemCache() const override { return impl->isIntegratedWithFilesystemCache(); }
-
     size_t getFileSize() override;
 
 protected:
diff --git a/src/IO/ReadBufferFromFileDescriptor.cpp b/src/IO/ReadBufferFromFileDescriptor.cpp
index 417e985159d..bf44d9d10da 100644
--- a/src/IO/ReadBufferFromFileDescriptor.cpp
+++ b/src/IO/ReadBufferFromFileDescriptor.cpp
@@ -5,6 +5,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/Exception.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/Throttler.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteHelpers.h>
 #include <Common/filesystemHelpers.h>
@@ -12,9 +13,7 @@
 #include <Interpreters/Context.h>
 
 
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 namespace ProfileEvents
 {
@@ -23,6 +22,8 @@ namespace ProfileEvents
     extern const Event ReadBufferFromFileDescriptorReadBytes;
     extern const Event DiskReadElapsedMicroseconds;
     extern const Event Seek;
+    extern const Event LocalReadThrottlerBytes;
+    extern const Event LocalReadThrottlerSleepMicroseconds;
 }
 
 namespace CurrentMetrics
@@ -84,7 +85,12 @@ bool ReadBufferFromFileDescriptor::nextImpl()
         }
 
         if (res > 0)
+        {
             bytes_read += res;
+            if (throttler)
+                throttler->add(res, ProfileEvents::LocalReadThrottlerBytes, ProfileEvents::LocalReadThrottlerSleepMicroseconds);
+        }
+
 
         /// It reports real time spent including the time spent while thread was preempted doing nothing.
         /// And it is Ok for the purpose of this watch (it is used to lower the number of threads to read from tables).
@@ -118,7 +124,7 @@ bool ReadBufferFromFileDescriptor::nextImpl()
 }
 
 
-void ReadBufferFromFileDescriptor::prefetch(int64_t)
+void ReadBufferFromFileDescriptor::prefetch(Priority)
 {
 #if defined(POSIX_FADV_WILLNEED)
     /// For direct IO, loading data into page cache is pointless.
diff --git a/src/IO/ReadBufferFromFileDescriptor.h b/src/IO/ReadBufferFromFileDescriptor.h
index ebd0f6db32d..10f140275bb 100644
--- a/src/IO/ReadBufferFromFileDescriptor.h
+++ b/src/IO/ReadBufferFromFileDescriptor.h
@@ -2,6 +2,7 @@
 
 #include <IO/ReadBufferFromFileBase.h>
 #include <Interpreters/Context_fwd.h>
+#include <Common/Throttler_fwd.h>
 
 #include <unistd.h>
 
@@ -21,8 +22,10 @@ protected:
 
     int fd;
 
+    ThrottlerPtr throttler;
+
     bool nextImpl() override;
-    void prefetch(int64_t priority) override;
+    void prefetch(Priority priority) override;
 
     /// Name or some description of file.
     std::string getFileName() const override;
@@ -33,10 +36,12 @@ public:
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         char * existing_memory = nullptr,
         size_t alignment = 0,
-        std::optional<size_t> file_size_ = std::nullopt)
+        std::optional<size_t> file_size_ = std::nullopt,
+        ThrottlerPtr throttler_ = {})
         : ReadBufferFromFileBase(buf_size, existing_memory, alignment, file_size_)
         , required_alignment(alignment)
         , fd(fd_)
+        , throttler(throttler_)
     {
     }
 
@@ -50,8 +55,6 @@ public:
         return file_offset_of_buffer_end - (working_buffer.end() - pos);
     }
 
-    Range getRemainingReadRange() const override { return Range{ .left = file_offset_of_buffer_end, .right = std::nullopt }; }
-
     size_t getFileOffsetOfBufferEnd() const override { return file_offset_of_buffer_end; }
 
     /// If 'offset' is small enough to stay in buffer after seek, then true seek in file does not happen.
@@ -78,8 +81,9 @@ public:
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         char * existing_memory = nullptr,
         size_t alignment = 0,
-        std::optional<size_t> file_size_ = std::nullopt)
-        : ReadBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment, file_size_)
+        std::optional<size_t> file_size_ = std::nullopt,
+        ThrottlerPtr throttler_ = {})
+        : ReadBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment, file_size_, throttler_)
     {
         use_pread = true;
     }
diff --git a/src/IO/ReadBufferFromMemory.cpp b/src/IO/ReadBufferFromMemory.cpp
index ea0054f24d4..ede2c531e43 100644
--- a/src/IO/ReadBufferFromMemory.cpp
+++ b/src/IO/ReadBufferFromMemory.cpp
@@ -12,7 +12,7 @@ off_t ReadBufferFromMemory::seek(off_t offset, int whence)
 {
     if (whence == SEEK_SET)
     {
-        if (offset >= 0 && internal_buffer.begin() + offset < internal_buffer.end())
+        if (offset >= 0 && internal_buffer.begin() + offset <= internal_buffer.end())
         {
             pos = internal_buffer.begin() + offset;
             working_buffer = internal_buffer; /// We need to restore `working_buffer` in case the position was at EOF before this seek().
@@ -25,7 +25,7 @@ off_t ReadBufferFromMemory::seek(off_t offset, int whence)
     else if (whence == SEEK_CUR)
     {
         Position new_pos = pos + offset;
-        if (new_pos >= internal_buffer.begin() && new_pos < internal_buffer.end())
+        if (new_pos >= internal_buffer.begin() && new_pos <= internal_buffer.end())
         {
             pos = new_pos;
             working_buffer = internal_buffer; /// We need to restore `working_buffer` in case the position was at EOF before this seek().
diff --git a/src/IO/ReadBufferFromPocoSocket.cpp b/src/IO/ReadBufferFromPocoSocket.cpp
index 046646ed003..d0fba2c28e8 100644
--- a/src/IO/ReadBufferFromPocoSocket.cpp
+++ b/src/IO/ReadBufferFromPocoSocket.cpp
@@ -8,7 +8,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
-
+#include <Common/AsyncTaskExecutor.h>
 
 namespace ProfileEvents
 {
@@ -52,8 +52,8 @@ bool ReadBufferFromPocoSocket::nextImpl()
         /// If async_callback is specified, and read will block, run async_callback and try again later.
         /// It is expected that file descriptor may be polled externally.
         /// Note that receive timeout is not checked here. External code should check it while polling.
-        while (async_callback && !socket.poll(0, Poco::Net::Socket::SELECT_READ))
-            async_callback(socket.impl()->sockfd(), socket.getReceiveTimeout(), socket_description);
+        while (async_callback && !socket.poll(0, Poco::Net::Socket::SELECT_READ | Poco::Net::Socket::SELECT_ERROR))
+            async_callback(socket.impl()->sockfd(), socket.getReceiveTimeout(), AsyncEventTimeoutType::RECEIVE, socket_description, AsyncTaskExecutor::Event::READ | AsyncTaskExecutor::Event::ERROR);
 
         if (internal_buffer.size() > INT_MAX)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Buffer overflow");
diff --git a/src/IO/ReadBufferFromPocoSocket.h b/src/IO/ReadBufferFromPocoSocket.h
index c60aafc7e23..dab4ac86295 100644
--- a/src/IO/ReadBufferFromPocoSocket.h
+++ b/src/IO/ReadBufferFromPocoSocket.h
@@ -2,14 +2,12 @@
 
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/ReadBuffer.h>
-
+#include <Common/AsyncTaskExecutor.h>
 #include <Poco/Net/Socket.h>
 
 namespace DB
 {
 
-using AsyncCallback = std::function<void(int, Poco::Timespan, const std::string &)>;
-
 /// Works with the ready Poco::Net::Socket. Blocking operations.
 class ReadBufferFromPocoSocket : public BufferWithOwnMemory<ReadBuffer>
 {
diff --git a/src/IO/ReadBufferFromS3.cpp b/src/IO/ReadBufferFromS3.cpp
index 91905330b74..93e2c46b080 100644
--- a/src/IO/ReadBufferFromS3.cpp
+++ b/src/IO/ReadBufferFromS3.cpp
@@ -53,8 +53,9 @@ ReadBufferFromS3::ReadBufferFromS3(
     bool use_external_buffer_,
     size_t offset_,
     size_t read_until_position_,
-    bool restricted_seek_)
-    : ReadBufferFromFileBase(use_external_buffer_ ? 0 : settings_.remote_fs_buffer_size, nullptr, 0)
+    bool restricted_seek_,
+    std::optional<size_t> file_size_)
+    : ReadBufferFromFileBase(use_external_buffer_ ? 0 : settings_.remote_fs_buffer_size, nullptr, 0, file_size_)
     , client_ptr(std::move(client_ptr_))
     , bucket(bucket_)
     , key(key_)
@@ -177,6 +178,7 @@ bool ReadBufferFromS3::nextImpl()
             sleep_time_with_backoff_milliseconds *= 2;
 
             /// Try to reinitialize `impl`.
+            resetWorkingBuffer();
             impl.reset();
         }
     }
@@ -197,15 +199,17 @@ bool ReadBufferFromS3::nextImpl()
 
 off_t ReadBufferFromS3::seek(off_t offset_, int whence)
 {
-    if (offset_ == offset && whence == SEEK_SET)
-        return offset;
+    if (offset_ == getPosition() && whence == SEEK_SET)
+        return offset_;
 
     if (impl && restricted_seek)
+    {
         throw Exception(
-                        ErrorCodes::CANNOT_SEEK_THROUGH_FILE,
-                        "Seek is allowed only before first read attempt from the buffer (current offset: "
-                        "{}, new offset: {}, reading until position: {}, available: {})",
-                        offset, offset_, read_until_position, available());
+            ErrorCodes::CANNOT_SEEK_THROUGH_FILE,
+            "Seek is allowed only before first read attempt from the buffer (current offset: "
+            "{}, new offset: {}, reading until position: {}, available: {})",
+            getPosition(), offset_, read_until_position, available());
+    }
 
     if (whence != SEEK_SET)
         throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Only SEEK_SET mode is allowed.");
@@ -221,13 +225,13 @@ off_t ReadBufferFromS3::seek(off_t offset_, int whence)
         {
             pos = working_buffer.end() - (offset - offset_);
             assert(pos >= working_buffer.begin());
-            assert(pos <= working_buffer.end());
+            assert(pos < working_buffer.end());
 
             return getPosition();
         }
 
-        auto position = getPosition();
-        if (offset_ > position)
+        off_t position = getPosition();
+        if (impl && offset_ > position)
         {
             size_t diff = offset_ - position;
             if (diff < read_settings.remote_read_min_bytes_for_seek)
@@ -240,7 +244,8 @@ off_t ReadBufferFromS3::seek(off_t offset_, int whence)
         resetWorkingBuffer();
         if (impl)
         {
-            ProfileEvents::increment(ProfileEvents::ReadBufferSeekCancelConnection);
+            if (!atEndOfRequestedRangeGuess())
+                ProfileEvents::increment(ProfileEvents::ReadBufferSeekCancelConnection);
             impl.reset();
         }
     }
@@ -269,14 +274,43 @@ void ReadBufferFromS3::setReadUntilPosition(size_t position)
 {
     if (position != static_cast<size_t>(read_until_position))
     {
+        if (impl)
+        {
+            if (!atEndOfRequestedRangeGuess())
+                ProfileEvents::increment(ProfileEvents::ReadBufferSeekCancelConnection);
+            offset = getPosition();
+            resetWorkingBuffer();
+            impl.reset();
+        }
         read_until_position = position;
-        impl.reset();
     }
 }
 
-SeekableReadBuffer::Range ReadBufferFromS3::getRemainingReadRange() const
+void ReadBufferFromS3::setReadUntilEnd()
 {
-    return Range{ .left = static_cast<size_t>(offset), .right = read_until_position ? std::optional{read_until_position - 1} : std::nullopt };
+    if (read_until_position)
+    {
+        read_until_position = 0;
+        if (impl)
+        {
+            if (!atEndOfRequestedRangeGuess())
+                ProfileEvents::increment(ProfileEvents::ReadBufferSeekCancelConnection);
+            offset = getPosition();
+            resetWorkingBuffer();
+            impl.reset();
+        }
+    }
+}
+
+bool ReadBufferFromS3::atEndOfRequestedRangeGuess()
+{
+    if (!impl)
+        return true;
+    if (read_until_position)
+        return getPosition() >= read_until_position;
+    if (file_size)
+        return getPosition() >= static_cast<off_t>(*file_size);
+    return false;
 }
 
 std::unique_ptr<ReadBuffer> ReadBufferFromS3::initialize()
@@ -349,30 +383,15 @@ std::unique_ptr<ReadBuffer> ReadBufferFromS3::initialize()
     }
 }
 
-SeekableReadBufferPtr ReadBufferS3Factory::getReader()
+std::unique_ptr<SeekableReadBuffer> ReadBufferS3Factory::getReader()
 {
-    const auto next_range = range_generator.nextRange();
-    if (!next_range)
-        return nullptr;
-
-    auto reader = std::make_shared<ReadBufferFromS3>(
+    return std::make_unique<ReadBufferFromS3>(
         client_ptr,
         bucket,
         key,
         version_id,
         request_settings,
-        read_settings.adjustBufferSize(object_size),
-        false /*use_external_buffer*/,
-        next_range->first,
-        next_range->second);
-
-    return reader;
-}
-
-off_t ReadBufferS3Factory::seek(off_t off, [[maybe_unused]] int whence)
-{
-    range_generator = RangeGenerator{object_size, range_step, static_cast<size_t>(off)};
-    return off;
+        read_settings.adjustBufferSize(object_size));
 }
 
 size_t ReadBufferS3Factory::getFileSize()
diff --git a/src/IO/ReadBufferFromS3.h b/src/IO/ReadBufferFromS3.h
index 84e8d36865c..52dd74bdd14 100644
--- a/src/IO/ReadBufferFromS3.h
+++ b/src/IO/ReadBufferFromS3.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/RangeGenerator.h>
 #include <Storages/StorageS3Settings.h>
 #include "config.h"
 
@@ -58,7 +57,8 @@ public:
         bool use_external_buffer = false,
         size_t offset_ = 0,
         size_t read_until_position_ = 0,
-        bool restricted_seek_ = false);
+        bool restricted_seek_ = false,
+        std::optional<size_t> file_size = std::nullopt);
 
     bool nextImpl() override;
 
@@ -69,8 +69,7 @@ public:
     size_t getFileSize() override;
 
     void setReadUntilPosition(size_t position) override;
-
-    Range getRemainingReadRange() const override;
+    void setReadUntilEnd() override;
 
     size_t getFileOffsetOfBufferEnd() const override { return offset; }
 
@@ -81,6 +80,9 @@ public:
 private:
     std::unique_ptr<ReadBuffer> initialize();
 
+    // If true, if we destroy impl now, no work was wasted. Just for metrics.
+    bool atEndOfRequestedRangeGuess();
+
     ReadSettings read_settings;
 
     bool use_external_buffer;
@@ -91,7 +93,7 @@ private:
 };
 
 /// Creates separate ReadBufferFromS3 for sequence of ranges of particular object
-class ReadBufferS3Factory : public ParallelReadBuffer::ReadBufferFactory, public WithFileName
+class ReadBufferS3Factory : public SeekableReadBufferFactory, public WithFileName
 {
 public:
     explicit ReadBufferS3Factory(
@@ -99,7 +101,6 @@ public:
         const String & bucket_,
         const String & key_,
         const String & version_id_,
-        size_t range_step_,
         size_t object_size_,
         const S3Settings::RequestSettings & request_settings_,
         const ReadSettings & read_settings_)
@@ -108,18 +109,11 @@ public:
         , key(key_)
         , version_id(version_id_)
         , read_settings(read_settings_)
-        , range_generator(object_size_, range_step_)
-        , range_step(range_step_)
         , object_size(object_size_)
         , request_settings(request_settings_)
-    {
-        assert(range_step > 0);
-        assert(range_step < object_size);
-    }
+    {}
 
-    SeekableReadBufferPtr getReader() override;
-
-    off_t seek(off_t off, [[maybe_unused]] int whence) override;
+    std::unique_ptr<SeekableReadBuffer> getReader() override;
 
     size_t getFileSize() override;
 
@@ -131,11 +125,7 @@ private:
     const String key;
     const String version_id;
     ReadSettings read_settings;
-
-    RangeGenerator range_generator;
-    size_t range_step;
     size_t object_size;
-
     const S3Settings::RequestSettings request_settings;
 };
 
diff --git a/src/IO/ReadHelpers.cpp b/src/IO/ReadHelpers.cpp
index 86a2b9c650e..99d25ee6613 100644
--- a/src/IO/ReadHelpers.cpp
+++ b/src/IO/ReadHelpers.cpp
@@ -1,5 +1,5 @@
 #include <Core/Defines.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Common/PODArray.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/memcpySmall.h>
@@ -18,9 +18,7 @@
 
 #if defined(__aarch64__) && defined(__ARM_NEON)
 #    include <arm_neon.h>
-#    ifdef HAS_RESERVED_IDENTIFIER
-#        pragma clang diagnostic ignored "-Wreserved-identifier"
-#    endif
+#      pragma clang diagnostic ignored "-Wreserved-identifier"
 #endif
 
 namespace DB
@@ -322,13 +320,20 @@ template void readStringUntilEOFInto<PaddedPODArray<UInt8>>(PaddedPODArray<UInt8
 template <typename Vector, typename ReturnType = void>
 static ReturnType parseComplexEscapeSequence(Vector & s, ReadBuffer & buf)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
+    auto error = [](const char * message [[maybe_unused]], int code [[maybe_unused]])
+    {
+        if constexpr (throw_exception)
+            throw Exception::createDeprecated(message, code);
+        return ReturnType(false);
+    };
+
     ++buf.position();
+
     if (buf.eof())
     {
-        if constexpr (std::is_same_v<ReturnType, void>)
-            throw Exception(ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE, "Cannot parse escape sequence");
-        else
-            return ReturnType(false);
+        return error("Cannot parse escape sequence", ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
     }
 
     char char_after_backslash = *buf.position();
@@ -338,7 +343,14 @@ static ReturnType parseComplexEscapeSequence(Vector & s, ReadBuffer & buf)
         ++buf.position();
         /// escape sequence of the form \xAA
         char hex_code[2];
-        readPODBinary(hex_code, buf);
+
+        auto bytes_read = buf.read(hex_code, sizeof(hex_code));
+
+        if (bytes_read != sizeof(hex_code))
+        {
+            return error("Cannot parse escape sequence", ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+        }
+
         s.push_back(unhex2(hex_code));
     }
     else if (char_after_backslash == 'N')
@@ -372,6 +384,10 @@ static ReturnType parseComplexEscapeSequence(Vector & s, ReadBuffer & buf)
     return ReturnType(true);
 }
 
+bool parseComplexEscapeSequence(String & s, ReadBuffer & buf)
+{
+    return parseComplexEscapeSequence<String, bool>(s, buf);
+}
 
 template <typename Vector, typename ReturnType>
 static ReturnType parseJSONEscapeSequence(Vector & s, ReadBuffer & buf)
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index f8931a7f622..32338552b66 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -17,6 +17,7 @@
 #include <Common/LocalDateTime.h>
 #include <base/StringRef.h>
 #include <base/arithmeticOverflow.h>
+#include <base/sort.h>
 #include <base/unit.h>
 
 #include <Core/Types.h>
@@ -27,7 +28,6 @@
 #include <Common/Allocator.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <Common/Arena.h>
 #include <Common/intExp.h>
 
 #include <Formats/FormatSettings.h>
@@ -38,8 +38,6 @@
 #include <IO/PeekableReadBuffer.h>
 #include <IO/VarInt.h>
 
-#include <DataTypes/DataTypeDateTime.h>
-
 #include <double-conversion/double-conversion.h>
 
 static constexpr auto DEFAULT_MAX_STRING_SIZE = 1_GiB;
@@ -61,6 +59,8 @@ namespace ErrorCodes
     extern const int CANNOT_READ_ARRAY_FROM_TEXT;
     extern const int CANNOT_PARSE_NUMBER;
     extern const int INCORRECT_DATA;
+    extern const int TOO_LARGE_STRING_SIZE;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 
 /// Helper functions for formatted input.
@@ -93,19 +93,15 @@ inline char parseEscapeSequence(char c)
 }
 
 
-/// These functions are located in VarInt.h
-/// inline void throwReadAfterEOF()
+/// Function throwReadAfterEOF is located in VarInt.h
 
 
 inline void readChar(char & x, ReadBuffer & buf)
 {
-    if (!buf.eof())
-    {
-        x = *buf.position();
-        ++buf.position();
-    }
-    else
+    if (buf.eof()) [[unlikely]]
         throwReadAfterEOF();
+    x = *buf.position();
+    ++buf.position();
 }
 
 
@@ -128,39 +124,27 @@ inline void readFloatBinary(T & x, ReadBuffer & buf)
     readPODBinary(x, buf);
 }
 
-inline void readStringBinary(std::string & s, ReadBuffer & buf, size_t MAX_STRING_SIZE = DEFAULT_MAX_STRING_SIZE)
+inline void readStringBinary(std::string & s, ReadBuffer & buf, size_t max_string_size = DEFAULT_MAX_STRING_SIZE)
 {
     size_t size = 0;
     readVarUInt(size, buf);
 
-    if (size > MAX_STRING_SIZE)
-        throw Poco::Exception("Too large string size.");
+    if (size > max_string_size)
+        throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too large string size.");
 
     s.resize(size);
     buf.readStrict(s.data(), size);
 }
 
-
-inline StringRef readStringBinaryInto(Arena & arena, ReadBuffer & buf)
-{
-    size_t size = 0;
-    readVarUInt(size, buf);
-
-    char * data = arena.alloc(size);
-    buf.readStrict(data, size);
-
-    return StringRef(data, size);
-}
-
-
 template <typename T>
-void readVectorBinary(std::vector<T> & v, ReadBuffer & buf, size_t MAX_VECTOR_SIZE = DEFAULT_MAX_STRING_SIZE)
+void readVectorBinary(std::vector<T> & v, ReadBuffer & buf)
 {
     size_t size = 0;
     readVarUInt(size, buf);
 
-    if (size > MAX_VECTOR_SIZE)
-        throw Poco::Exception("Too large vector size.");
+    if (size > DEFAULT_MAX_STRING_SIZE)
+        throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                        "Too large array size (maximum: {})", DEFAULT_MAX_STRING_SIZE);
 
     v.resize(size);
     for (size_t i = 0; i < size; ++i)
@@ -251,7 +235,7 @@ inline void readBoolText(bool & x, ReadBuffer & buf)
 
 inline void readBoolTextWord(bool & x, ReadBuffer & buf, bool support_upper_case = false)
 {
-    if (buf.eof())
+    if (buf.eof()) [[unlikely]]
         throwReadAfterEOF();
 
     switch (*buf.position())
@@ -306,7 +290,7 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
 
     bool negative = false;
     UnsignedT res{};
-    if (buf.eof())
+    if (buf.eof()) [[unlikely]]
     {
         if constexpr (throw_exception)
             throwReadAfterEOF();
@@ -481,14 +465,14 @@ void readIntTextUnsafe(T & x, ReadBuffer & buf)
             throwReadAfterEOF();
     };
 
-    if (unlikely(buf.eof()))
+    if (buf.eof()) [[unlikely]]
         return on_error();
 
     if (is_signed_v<T> && *buf.position() == '-')
     {
         ++buf.position();
         negative = true;
-        if (unlikely(buf.eof()))
+        if (buf.eof()) [[unlikely]]
             return on_error();
     }
 
@@ -1022,12 +1006,15 @@ inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, Re
 
     bool is_ok = true;
     if constexpr (std::is_same_v<ReturnType, void>)
-        datetime64 = DecimalUtils::decimalFromComponents<DateTime64>(components, scale);
+    {
+        datetime64 = DecimalUtils::decimalFromComponents<DateTime64>(components, scale) * negative_multiplier;
+    }
     else
+    {
         is_ok = DecimalUtils::tryGetDecimalFromComponents<DateTime64>(components, scale, datetime64);
-
-    datetime64 *= negative_multiplier;
-
+        if (is_ok)
+            datetime64 *= negative_multiplier;
+    }
 
     return ReturnType(is_ok);
 }
@@ -1112,33 +1099,41 @@ inline void readBinary(Decimal256 & x, ReadBuffer & buf) { readPODBinary(x.value
 inline void readBinary(LocalDate & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 
 
-template <typename T>
+template <std::endian endian, typename T>
 requires is_arithmetic_v<T> && (sizeof(T) <= 8)
-inline void readBinaryBigEndian(T & x, ReadBuffer & buf)    /// Assuming little endian architecture.
+inline void readBinaryEndian(T & x, ReadBuffer & buf)
 {
     readPODBinary(x, buf);
-    if constexpr (std::endian::native == std::endian::little)
+    if constexpr (std::endian::native != endian)
+        x = std::byteswap(x);
+}
+
+template <std::endian endian, typename T>
+requires is_big_int_v<T>
+inline void readBinaryEndian(T & x, ReadBuffer & buf)
+{
+    if constexpr (std::endian::native == endian)
     {
-        if constexpr (sizeof(x) == 1)
-            return;
-        else if constexpr (sizeof(x) == 2)
-            x = __builtin_bswap16(x);
-        else if constexpr (sizeof(x) == 4)
-            x = __builtin_bswap32(x);
-        else if constexpr (sizeof(x) == 8)
-            x = __builtin_bswap64(x);
+        for (size_t i = 0; i != std::size(x.items); ++i)
+            readBinaryEndian<endian>(x.items[i], buf);
+    }
+    else
+    {
+        for (size_t i = 0; i != std::size(x.items); ++i)
+            readBinaryEndian<endian>(x.items[std::size(x.items) - i - 1], buf);
     }
 }
 
 template <typename T>
-requires is_big_int_v<T>
-inline void readBinaryBigEndian(T & x, ReadBuffer & buf)    /// Assuming little endian architecture.
+inline void readBinaryLittleEndian(T & x, ReadBuffer & buf)
 {
-    for (size_t i = 0; i != std::size(x.items); ++i)
-    {
-        auto & item = x.items[(std::endian::native == std::endian::little) ? std::size(x.items) - i - 1 : i];
-        readBinaryBigEndian(item, buf);
-    }
+    readBinaryEndian<std::endian::little>(x, buf);
+}
+
+template <typename T>
+inline void readBinaryBigEndian(T & x, ReadBuffer & buf)
+{
+    readBinaryEndian<std::endian::big>(x, buf);
 }
 
 
@@ -1239,7 +1234,7 @@ inline void readDoubleQuoted(LocalDateTime & x, ReadBuffer & buf)
 template <typename T>
 inline void readCSVSimple(T & x, ReadBuffer & buf)
 {
-    if (buf.eof())
+    if (buf.eof()) [[unlikely]]
         throwReadAfterEOF();
 
     char maybe_quote = *buf.position();
@@ -1528,8 +1523,8 @@ void skipToUnescapedNextLineOrEOF(ReadBuffer & buf);
 /// Skip to next character after next \0. If no \0 in stream, skip to end.
 void skipNullTerminated(ReadBuffer & buf);
 
-/** This function just copies the data from buffer's internal position (in.position())
-  * to current position (from arguments) into memory.
+/** This function just copies the data from buffer's position (in.position())
+  * to current position (from arguments) appending into memory.
   */
 void saveUpToPosition(ReadBuffer & in, Memory<Allocator<false>> & memory, char * current);
 
@@ -1574,4 +1569,10 @@ void readQuotedField(String & s, ReadBuffer & buf);
 void readJSONField(String & s, ReadBuffer & buf);
 
 void readTSVField(String & s, ReadBuffer & buf);
+
+/** Parse the escape sequence, which can be simple (one character after backslash) or more complex (multiple characters).
+  * It is assumed that the cursor is located on the `\` symbol
+  */
+bool parseComplexEscapeSequence(String & s, ReadBuffer & buf);
+
 }
diff --git a/src/IO/ReadHelpersArena.h b/src/IO/ReadHelpersArena.h
new file mode 100644
index 00000000000..b88d5c037d4
--- /dev/null
+++ b/src/IO/ReadHelpersArena.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/VarInt.h>
+#include <base/StringRef.h>
+#include <Common/Arena.h>
+
+
+namespace DB
+{
+
+
+namespace ErrorCodes
+{
+    extern const int TOO_LARGE_STRING_SIZE;
+}
+
+inline StringRef readStringBinaryInto(Arena & arena, ReadBuffer & buf)
+{
+    size_t size = 0;
+    readVarUInt(size, buf);
+
+    if (unlikely(size > DEFAULT_MAX_STRING_SIZE))
+        throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too large string size.");
+
+    char * data = arena.alloc(size);
+    buf.readStrict(data, size);
+
+    return StringRef(data, size);
+}
+
+}
diff --git a/src/IO/ReadSettings.h b/src/IO/ReadSettings.h
index a96766202ff..e43ecd7f275 100644
--- a/src/IO/ReadSettings.h
+++ b/src/IO/ReadSettings.h
@@ -5,6 +5,7 @@
 #include <Core/Defines.h>
 #include <Interpreters/Cache/FileCache_fwd.h>
 #include <Common/Throttler_fwd.h>
+#include <Common/Priority.h>
 #include <IO/ResourceLink.h>
 
 namespace DB
@@ -68,8 +69,11 @@ struct ReadSettings
     /// Method to use reading from remote filesystem.
     RemoteFSReadMethod remote_fs_method = RemoteFSReadMethod::threadpool;
 
-    size_t local_fs_buffer_size = DBMS_DEFAULT_BUFFER_SIZE;
+    /// https://eklitzke.org/efficient-file-copying-on-linux
+    size_t local_fs_buffer_size = 128 * 1024;
+
     size_t remote_fs_buffer_size = DBMS_DEFAULT_BUFFER_SIZE;
+    size_t prefetch_buffer_size = DBMS_DEFAULT_BUFFER_SIZE;
 
     bool local_fs_prefetch = false;
     bool remote_fs_prefetch = false;
@@ -81,8 +85,8 @@ struct ReadSettings
     size_t mmap_threshold = 0;
     MMappedFileCache * mmap_cache = nullptr;
 
-    /// For 'pread_threadpool' method. Lower is more priority.
-    size_t priority = 0;
+    /// For 'pread_threadpool'/'io_uring' method. Lower value is higher priority.
+    Priority priority;
 
     bool load_marks_asynchronously = true;
 
@@ -95,10 +99,6 @@ struct ReadSettings
     bool read_from_filesystem_cache_if_exists_otherwise_bypass_cache = false;
     bool enable_filesystem_cache_log = false;
     bool is_file_cache_persistent = false; /// Some files can be made non-evictable.
-    /// Some buffers which read via thread pool can also do caching in threadpool
-    /// (instead of caching the result outside of threadpool). By default, if they support it,
-    /// they will do it. But this behaviour can be changed with this setting.
-    bool enable_filesystem_cache_on_lower_level = true;
 
     size_t filesystem_cache_max_download_size = (128UL * 1024 * 1024 * 1024);
     bool skip_download_if_exceeds_query_cache = true;
@@ -109,6 +109,7 @@ struct ReadSettings
 
     /// Bandwidth throttler to use during reading
     ThrottlerPtr remote_throttler;
+    ThrottlerPtr local_throttler;
 
     // Resource to be used during reading
     ResourceLink resource_link;
@@ -124,8 +125,9 @@ struct ReadSettings
     ReadSettings adjustBufferSize(size_t file_size) const
     {
         ReadSettings res = *this;
-        res.local_fs_buffer_size = std::min(file_size, local_fs_buffer_size);
-        res.remote_fs_buffer_size = std::min(file_size, remote_fs_buffer_size);
+        res.local_fs_buffer_size = std::min(std::max(1ul, file_size), local_fs_buffer_size);
+        res.remote_fs_buffer_size = std::min(std::max(1ul, file_size), remote_fs_buffer_size);
+        res.prefetch_buffer_size = std::min(std::max(1ul, file_size), prefetch_buffer_size);
         return res;
     }
 };
diff --git a/src/IO/ReadWriteBufferFromHTTP.cpp b/src/IO/ReadWriteBufferFromHTTP.cpp
new file mode 100644
index 00000000000..8c3ab704d2b
--- /dev/null
+++ b/src/IO/ReadWriteBufferFromHTTP.cpp
@@ -0,0 +1,899 @@
+#include "ReadWriteBufferFromHTTP.h"
+
+namespace ProfileEvents
+{
+extern const Event ReadBufferSeekCancelConnection;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int TOO_MANY_REDIRECTS;
+    extern const int HTTP_RANGE_NOT_SATISFIABLE;
+    extern const int BAD_ARGUMENTS;
+    extern const int CANNOT_SEEK_THROUGH_FILE;
+    extern const int SEEK_POSITION_OUT_OF_BOUND;
+    extern const int UNKNOWN_FILE_SIZE;
+}
+
+template <typename TSessionFactory>
+UpdatableSession<TSessionFactory>::UpdatableSession(const Poco::URI & uri, UInt64 max_redirects_, std::shared_ptr<TSessionFactory> session_factory_)
+    : max_redirects{max_redirects_}
+    , initial_uri(uri)
+    , session_factory(std::move(session_factory_))
+{
+    session = session_factory->buildNewSession(uri);
+}
+
+template <typename TSessionFactory>
+typename UpdatableSession<TSessionFactory>::SessionPtr UpdatableSession<TSessionFactory>::getSession() { return session; }
+
+template <typename TSessionFactory>
+void UpdatableSession<TSessionFactory>::updateSession(const Poco::URI & uri)
+{
+    ++redirects;
+    if (redirects <= max_redirects)
+        session = session_factory->buildNewSession(uri);
+    else
+        throw Exception(ErrorCodes::TOO_MANY_REDIRECTS, "Too many redirects while trying to access {}", initial_uri.toString());
+}
+
+template <typename TSessionFactory>
+std::shared_ptr<UpdatableSession<TSessionFactory>> UpdatableSession<TSessionFactory>::clone(const Poco::URI & uri)
+{
+    return std::make_shared<UpdatableSession<TSessionFactory>>(uri, max_redirects, session_factory);
+}
+
+
+namespace detail
+{
+
+static bool isRetriableError(const Poco::Net::HTTPResponse::HTTPStatus http_status) noexcept
+{
+    static constexpr std::array non_retriable_errors{
+        Poco::Net::HTTPResponse::HTTPStatus::HTTP_BAD_REQUEST,
+        Poco::Net::HTTPResponse::HTTPStatus::HTTP_UNAUTHORIZED,
+        Poco::Net::HTTPResponse::HTTPStatus::HTTP_NOT_FOUND,
+        Poco::Net::HTTPResponse::HTTPStatus::HTTP_FORBIDDEN,
+        Poco::Net::HTTPResponse::HTTPStatus::HTTP_NOT_IMPLEMENTED,
+        Poco::Net::HTTPResponse::HTTPStatus::HTTP_METHOD_NOT_ALLOWED};
+
+    return std::all_of(
+        non_retriable_errors.begin(), non_retriable_errors.end(), [&](const auto status) { return http_status != status; });
+}
+
+static Poco::URI getUriAfterRedirect(const Poco::URI & prev_uri, Poco::Net::HTTPResponse & response)
+{
+    auto location = response.get("Location");
+    auto location_uri = Poco::URI(location);
+    if (!location_uri.isRelative())
+        return location_uri;
+    /// Location header contains relative path. So we need to concatenate it
+    /// with path from the original URI and normalize it.
+    auto path = std::filesystem::weakly_canonical(std::filesystem::path(prev_uri.getPath()) / location);
+    location_uri = prev_uri;
+    location_uri.setPath(path);
+    return location_uri;
+}
+
+template <typename UpdatableSessionPtr>
+bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::withPartialContent(const HTTPRange & range) const
+{
+    /**
+     * Add range header if we have some passed range
+     * or if we want to retry GET request on purpose.
+     */
+    return range.begin || range.end || retry_with_range_header;
+}
+
+template <typename UpdatableSessionPtr>
+size_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getRangeBegin() const { return read_range.begin.value_or(0); }
+
+template <typename UpdatableSessionPtr>
+size_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getOffset() const { return getRangeBegin() + offset_from_begin_pos; }
+
+template <typename UpdatableSessionPtr>
+std::istream * ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::callImpl(
+    UpdatableSessionPtr & current_session, Poco::URI uri_, Poco::Net::HTTPResponse & response,
+    const std::string & method_, bool for_object_info)
+{
+    // With empty path poco will send "POST  HTTP/1.1" its bug.
+    if (uri_.getPath().empty())
+        uri_.setPath("/");
+
+    Poco::Net::HTTPRequest request(method_, uri_.getPathAndQuery(), Poco::Net::HTTPRequest::HTTP_1_1);
+    request.setHost(uri_.getHost()); // use original, not resolved host name in header
+
+    if (out_stream_callback)
+        request.setChunkedTransferEncoding(true);
+    else if (method == Poco::Net::HTTPRequest::HTTP_POST)
+        request.setContentLength(0);    /// No callback - no body
+
+    for (auto & [header, value] : http_header_entries)
+        request.set(header, value);
+
+    std::optional<HTTPRange> range;
+    if (!for_object_info)
+    {
+        if (withPartialContent(read_range))
+            range = HTTPRange{getOffset(), read_range.end};
+    }
+
+    if (range)
+    {
+        String range_header_value;
+        if (range->end)
+            range_header_value = fmt::format("bytes={}-{}", *range->begin, *range->end);
+        else
+            range_header_value = fmt::format("bytes={}-", *range->begin);
+        LOG_TEST(log, "Adding header: Range: {}", range_header_value);
+        request.set("Range", range_header_value);
+    }
+
+    if (!credentials.getUsername().empty())
+        credentials.authenticate(request);
+
+    LOG_TRACE(log, "Sending request to {}", uri_.toString());
+
+    auto sess = current_session->getSession();
+    try
+    {
+        auto & stream_out = sess->sendRequest(request);
+
+        if (out_stream_callback)
+            out_stream_callback(stream_out);
+
+        auto result_istr = receiveResponse(*sess, request, response, true);
+        response.getCookies(cookies);
+
+        /// we can fetch object info while the request is being processed
+        /// and we don't want to override any context used by it
+        if (!for_object_info)
+            content_encoding = response.get("Content-Encoding", "");
+
+        return result_istr;
+    }
+    catch (const Poco::Exception & e)
+    {
+        /// We use session data storage as storage for exception text
+        /// Depend on it we can deduce to reconnect session or reresolve session host
+        sess->attachSessionData(e.message());
+        throw;
+    }
+}
+
+template <typename UpdatableSessionPtr>
+size_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getFileSize()
+{
+    if (!file_info)
+        file_info = getFileInfo();
+
+    if (file_info->file_size)
+        return *file_info->file_size;
+
+    throw Exception(ErrorCodes::UNKNOWN_FILE_SIZE, "Cannot find out file size for: {}", uri.toString());
+}
+
+template <typename UpdatableSessionPtr>
+bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::checkIfActuallySeekable()
+{
+    if (!file_info)
+        file_info = getFileInfo();
+    return file_info->seekable;
+}
+
+template <typename UpdatableSessionPtr>
+String ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getFileName() const { return uri.toString(); }
+
+template <typename UpdatableSessionPtr>
+void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getHeadResponse(Poco::Net::HTTPResponse & response)
+{
+    for (size_t i = 0; i < settings.http_max_tries; ++i)
+    {
+        try
+        {
+            callWithRedirects(response, Poco::Net::HTTPRequest::HTTP_HEAD, true, true);
+            break;
+        }
+        catch (const Poco::Exception & e)
+        {
+            if (i == settings.http_max_tries - 1 || !isRetriableError(response.getStatus()))
+                throw;
+
+            LOG_ERROR(log, "Failed to make HTTP_HEAD request to {}. Error: {}", uri.toString(), e.displayText());
+        }
+    }
+}
+
+template <typename UpdatableSessionPtr>
+void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::setupExternalBuffer()
+{
+    /**
+    * use_external_buffer -- means we read into the buffer which
+    * was passed to us from somewhere else. We do not check whether
+    * previously returned buffer was read or not (no hasPendingData() check is needed),
+    * because this branch means we are prefetching data,
+    * each nextImpl() call we can fill a different buffer.
+    */
+    impl->set(internal_buffer.begin(), internal_buffer.size());
+    assert(working_buffer.begin() != nullptr);
+    assert(!internal_buffer.empty());
+}
+
+template <typename UpdatableSessionPtr>
+ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::ReadWriteBufferFromHTTPBase(
+    UpdatableSessionPtr session_,
+    Poco::URI uri_,
+    const Poco::Net::HTTPBasicCredentials & credentials_,
+    const std::string & method_,
+    OutStreamCallback out_stream_callback_,
+    size_t buffer_size_,
+    const ReadSettings & settings_,
+    HTTPHeaderEntries http_header_entries_,
+    const RemoteHostFilter * remote_host_filter_,
+    bool delay_initialization,
+    bool use_external_buffer_,
+    bool http_skip_not_found_url_,
+    std::optional<HTTPFileInfo> file_info_)
+    : SeekableReadBuffer(nullptr, 0)
+    , uri {uri_}
+    , method {!method_.empty() ? method_ : out_stream_callback_ ? Poco::Net::HTTPRequest::HTTP_POST : Poco::Net::HTTPRequest::HTTP_GET}
+    , session {session_}
+    , out_stream_callback {out_stream_callback_}
+    , credentials {credentials_}
+    , http_header_entries {std::move(http_header_entries_)}
+    , remote_host_filter {remote_host_filter_}
+    , buffer_size {buffer_size_}
+    , use_external_buffer {use_external_buffer_}
+    , file_info(file_info_)
+    , http_skip_not_found_url(http_skip_not_found_url_)
+    , settings {settings_}
+    , log(&Poco::Logger::get("ReadWriteBufferFromHTTP"))
+{
+    if (settings.http_max_tries <= 0 || settings.http_retry_initial_backoff_ms <= 0
+        || settings.http_retry_initial_backoff_ms >= settings.http_retry_max_backoff_ms)
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "Invalid setting for http backoff, "
+            "must be http_max_tries >= 1 (current is {}) and "
+            "0 < http_retry_initial_backoff_ms < settings.http_retry_max_backoff_ms (now 0 < {} < {})",
+            settings.http_max_tries,
+            settings.http_retry_initial_backoff_ms,
+            settings.http_retry_max_backoff_ms);
+
+    // Configure User-Agent if it not already set.
+    const std::string user_agent = "User-Agent";
+    auto iter = std::find_if(
+        http_header_entries.begin(),
+        http_header_entries.end(),
+        [&user_agent](const HTTPHeaderEntry & entry) { return entry.name == user_agent; });
+
+    if (iter == http_header_entries.end())
+    {
+        http_header_entries.emplace_back("User-Agent", fmt::format("ClickHouse/{}", VERSION_STRING));
+    }
+
+    if (!delay_initialization)
+    {
+        initialize();
+        if (exception)
+            std::rethrow_exception(exception);
+    }
+}
+
+template <typename UpdatableSessionPtr>
+void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::callWithRedirects(Poco::Net::HTTPResponse & response, const String & method_, bool throw_on_all_errors, bool for_object_info)
+{
+    UpdatableSessionPtr current_session = nullptr;
+
+    /// we can fetch object info while the request is being processed
+    /// and we don't want to override any context used by it
+    if (for_object_info)
+        current_session = session->clone(uri);
+    else
+        current_session = session;
+
+    call(current_session, response, method_, throw_on_all_errors, for_object_info);
+    Poco::URI prev_uri = uri;
+
+    while (isRedirect(response.getStatus()))
+    {
+        Poco::URI uri_redirect = getUriAfterRedirect(prev_uri, response);
+        prev_uri = uri_redirect;
+        if (remote_host_filter)
+            remote_host_filter->checkURL(uri_redirect);
+
+        current_session->updateSession(uri_redirect);
+
+        /// we can fetch object info while the request is being processed
+        /// and we don't want to override any context used by it
+        auto result_istr = callImpl(current_session, uri_redirect, response, method, for_object_info);
+        if (!for_object_info)
+            istr = result_istr;
+    }
+}
+
+template <typename UpdatableSessionPtr>
+void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::call(UpdatableSessionPtr & current_session, Poco::Net::HTTPResponse & response, const String & method_, bool throw_on_all_errors, bool for_object_info)
+{
+    try
+    {
+        /// we can fetch object info while the request is being processed
+        /// and we don't want to override any context used by it
+        auto result_istr = callImpl(current_session, saved_uri_redirect ? *saved_uri_redirect : uri, response, method_, for_object_info);
+        if (!for_object_info)
+            istr = result_istr;
+    }
+    catch (...)
+    {
+        /// we can fetch object info while the request is being processed
+        /// and we don't want to override any context used by it
+        if (for_object_info)
+            throw;
+
+        if (throw_on_all_errors)
+            throw;
+
+        auto http_status = response.getStatus();
+
+        if (http_status == Poco::Net::HTTPResponse::HTTPStatus::HTTP_NOT_FOUND && http_skip_not_found_url)
+        {
+            initialization_error = InitializeError::SKIP_NOT_FOUND_URL;
+        }
+        else if (!isRetriableError(http_status))
+        {
+            initialization_error = InitializeError::NON_RETRYABLE_ERROR;
+            exception = std::current_exception();
+        }
+        else
+        {
+            throw;
+        }
+    }
+}
+
+template <typename UpdatableSessionPtr>
+void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::initialize()
+{
+    Poco::Net::HTTPResponse response;
+
+    call(session, response, method);
+    if (initialization_error != InitializeError::NONE)
+        return;
+
+    while (isRedirect(response.getStatus()))
+    {
+        Poco::URI uri_redirect = getUriAfterRedirect(saved_uri_redirect.value_or(uri), response);
+        if (remote_host_filter)
+            remote_host_filter->checkURL(uri_redirect);
+
+        session->updateSession(uri_redirect);
+
+        istr = callImpl(session, uri_redirect, response, method);
+        saved_uri_redirect = uri_redirect;
+    }
+
+    if (response.hasContentLength())
+        LOG_DEBUG(log, "Received response with content length: {}", response.getContentLength());
+
+    if (withPartialContent(read_range) && response.getStatus() != Poco::Net::HTTPResponse::HTTPStatus::HTTP_PARTIAL_CONTENT)
+    {
+        /// Having `200 OK` instead of `206 Partial Content` is acceptable in case we retried with range.begin == 0.
+        if (getOffset() != 0)
+        {
+            if (!exception)
+            {
+                exception = std::make_exception_ptr(Exception(
+                    ErrorCodes::HTTP_RANGE_NOT_SATISFIABLE,
+                    "Cannot read with range: [{}, {}] (response status: {}, reason: {})",
+                    *read_range.begin,
+                    read_range.end ? toString(*read_range.end) : "-",
+                    toString(response.getStatus()), response.getReason()));
+            }
+
+            /// Retry 200OK
+            if (response.getStatus() == Poco::Net::HTTPResponse::HTTPStatus::HTTP_OK)
+                initialization_error = InitializeError::RETRYABLE_ERROR;
+            else
+                initialization_error = InitializeError::NON_RETRYABLE_ERROR;
+
+            return;
+        }
+        else if (read_range.end)
+        {
+            /// We could have range.begin == 0 and range.end != 0 in case of DiskWeb and failing to read with partial content
+            /// will affect only performance, so a warning is enough.
+            LOG_WARNING(log, "Unable to read with range header: [{}, {}]", getRangeBegin(), *read_range.end);
+        }
+    }
+
+    // Remember file size. It'll be used to report eof in next nextImpl() call.
+    if (!read_range.end && response.hasContentLength())
+        file_info = parseFileInfo(response, withPartialContent(read_range) ? getOffset() : 0);
+
+    try
+    {
+        impl = std::make_unique<ReadBufferFromIStream>(*istr, buffer_size);
+
+        if (use_external_buffer)
+        {
+            setupExternalBuffer();
+        }
+    }
+    catch (const Poco::Exception & e)
+    {
+        /// We use session data storage as storage for exception text
+        /// Depend on it we can deduce to reconnect session or reresolve session host
+        auto sess = session->getSession();
+        sess->attachSessionData(e.message());
+        throw;
+    }
+}
+
+template <typename UpdatableSessionPtr>
+bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::nextImpl()
+{
+    if (initialization_error == InitializeError::SKIP_NOT_FOUND_URL)
+        return false;
+    assert(initialization_error == InitializeError::NONE);
+
+    if (next_callback)
+        next_callback(count());
+
+    if ((read_range.end && getOffset() > read_range.end.value()) ||
+        (file_info && file_info->file_size && getOffset() >= file_info->file_size.value()))
+        return false;
+
+    if (impl)
+    {
+        if (use_external_buffer)
+        {
+            setupExternalBuffer();
+        }
+        else
+        {
+            /**
+            * impl was initialized before, pass position() to it to make
+            * sure there is no pending data which was not read.
+            */
+            if (!working_buffer.empty())
+                impl->position() = position();
+        }
+    }
+
+    bool result = false;
+    size_t milliseconds_to_wait = settings.http_retry_initial_backoff_ms;
+    bool last_attempt = false;
+
+    auto on_retriable_error = [&]()
+    {
+        retry_with_range_header = true;
+        impl.reset();
+        auto http_session = session->getSession();
+        http_session->reset();
+        if (!last_attempt)
+        {
+            sleepForMilliseconds(milliseconds_to_wait);
+            milliseconds_to_wait = std::min(milliseconds_to_wait * 2, settings.http_retry_max_backoff_ms);
+        }
+    };
+
+    for (size_t i = 0;; ++i)
+    {
+        if (last_attempt)
+            break;
+        last_attempt = i + 1 >= settings.http_max_tries;
+
+        exception = nullptr;
+        initialization_error = InitializeError::NONE;
+
+        try
+        {
+            if (!impl)
+            {
+                initialize();
+
+                if (initialization_error == InitializeError::NON_RETRYABLE_ERROR)
+                {
+                    assert(exception);
+                    break;
+                }
+                else if (initialization_error == InitializeError::SKIP_NOT_FOUND_URL)
+                {
+                    return false;
+                }
+                else if (initialization_error == InitializeError::RETRYABLE_ERROR)
+                {
+                    LOG_ERROR(
+                        log,
+                        "HTTP request to `{}` failed at try {}/{} with bytes read: {}/{}. "
+                        "(Current backoff wait is {}/{} ms)",
+                        uri.toString(), i + 1, settings.http_max_tries, getOffset(),
+                        read_range.end ? toString(*read_range.end) : "unknown",
+                        milliseconds_to_wait, settings.http_retry_max_backoff_ms);
+
+                    assert(exception);
+                    on_retriable_error();
+                    continue;
+                }
+
+                assert(!exception);
+
+                if (use_external_buffer)
+                {
+                    setupExternalBuffer();
+                }
+            }
+
+            result = impl->next();
+            exception = nullptr;
+            break;
+        }
+        catch (const Poco::Exception & e)
+        {
+            /// Too many open files - non-retryable.
+            if (e.code() == POCO_EMFILE)
+                throw;
+
+            /** Retry request unconditionally if nothing has been read yet.
+                 * Otherwise if it is GET method retry with range header.
+                 */
+            bool can_retry_request = !offset_from_begin_pos || method == Poco::Net::HTTPRequest::HTTP_GET;
+            if (!can_retry_request)
+                throw;
+
+            LOG_ERROR(
+                log,
+                "HTTP request to `{}` failed at try {}/{} with bytes read: {}/{}. "
+                "Error: {}. (Current backoff wait is {}/{} ms)",
+                uri.toString(),
+                i + 1,
+                settings.http_max_tries,
+                getOffset(),
+                read_range.end ? toString(*read_range.end) : "unknown",
+                e.displayText(),
+                milliseconds_to_wait,
+                settings.http_retry_max_backoff_ms);
+
+            on_retriable_error();
+            exception = std::current_exception();
+        }
+    }
+
+    if (exception)
+        std::rethrow_exception(exception);
+
+    if (!result)
+        return false;
+
+    internal_buffer = impl->buffer();
+    working_buffer = internal_buffer;
+    offset_from_begin_pos += working_buffer.size();
+    return true;
+}
+
+template <typename UpdatableSessionPtr>
+off_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getPosition() { return getOffset() - available(); }
+
+template <typename UpdatableSessionPtr>
+off_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::seek(off_t offset_, int whence)
+{
+    if (whence != SEEK_SET)
+        throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Only SEEK_SET mode is allowed.");
+
+    if (offset_ < 0)
+        throw Exception(ErrorCodes::SEEK_POSITION_OUT_OF_BOUND, "Seek position is out of bounds. Offset: {}",
+            offset_);
+
+    off_t current_offset = getOffset();
+    if (!working_buffer.empty() && size_t(offset_) >= current_offset - working_buffer.size() && offset_ < current_offset)
+    {
+        pos = working_buffer.end() - (current_offset - offset_);
+        assert(pos >= working_buffer.begin());
+        assert(pos < working_buffer.end());
+
+        return getPosition();
+    }
+
+    if (impl)
+    {
+        auto position = getPosition();
+        if (offset_ > position)
+        {
+            size_t diff = offset_ - position;
+            if (diff < settings.remote_read_min_bytes_for_seek)
+            {
+                ignore(diff);
+                return offset_;
+            }
+        }
+
+        if (!atEndOfRequestedRangeGuess())
+            ProfileEvents::increment(ProfileEvents::ReadBufferSeekCancelConnection);
+        impl.reset();
+    }
+
+    resetWorkingBuffer();
+    read_range.begin = offset_;
+    offset_from_begin_pos = 0;
+
+    return offset_;
+}
+
+template <typename UpdatableSessionPtr>
+void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::setReadUntilPosition(size_t until)
+{
+    until = std::max(until, 1ul);
+    if (read_range.end && *read_range.end + 1 == until)
+        return;
+    read_range.end = until - 1;
+    read_range.begin = getPosition();
+    resetWorkingBuffer();
+    if (impl)
+    {
+        if (!atEndOfRequestedRangeGuess())
+            ProfileEvents::increment(ProfileEvents::ReadBufferSeekCancelConnection);
+        impl.reset();
+    }
+}
+
+template <typename UpdatableSessionPtr>
+void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::setReadUntilEnd()
+{
+    if (!read_range.end)
+        return;
+    read_range.end.reset();
+    read_range.begin = getPosition();
+    resetWorkingBuffer();
+    if (impl)
+    {
+        if (!atEndOfRequestedRangeGuess())
+            ProfileEvents::increment(ProfileEvents::ReadBufferSeekCancelConnection);
+        impl.reset();
+    }
+}
+
+template <typename UpdatableSessionPtr>
+bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::supportsRightBoundedReads() const { return true; }
+
+template <typename UpdatableSessionPtr>
+bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::atEndOfRequestedRangeGuess()
+{
+    if (!impl)
+        return true;
+    if (read_range.end)
+        return getPosition() > static_cast<off_t>(*read_range.end);
+    if (file_info && file_info->file_size)
+        return getPosition() >= static_cast<off_t>(*file_info->file_size);
+    return false;
+}
+
+template <typename UpdatableSessionPtr>
+std::string ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getResponseCookie(const std::string & name, const std::string & def) const
+{
+    for (const auto & cookie : cookies)
+        if (cookie.getName() == name)
+            return cookie.getValue();
+    return def;
+}
+
+template <typename UpdatableSessionPtr>
+void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::setNextCallback(NextCallback next_callback_)
+{
+    next_callback = next_callback_;
+    /// Some data maybe already read
+    next_callback(count());
+}
+
+template <typename UpdatableSessionPtr>
+const std::string & ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getCompressionMethod() const { return content_encoding; }
+
+template <typename UpdatableSessionPtr>
+std::optional<time_t> ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getLastModificationTime()
+{
+    return getFileInfo().last_modified;
+}
+
+template <typename UpdatableSessionPtr>
+HTTPFileInfo ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getFileInfo()
+{
+    Poco::Net::HTTPResponse response;
+    try
+    {
+        getHeadResponse(response);
+    }
+    catch (HTTPException & e)
+    {
+        /// Maybe the web server doesn't support HEAD requests.
+        /// E.g. webhdfs reports status 400.
+        /// We should proceed in hopes that the actual GET request will succeed.
+        /// (Unless the error in transient. Don't want to nondeterministically sometimes
+        /// fall back to slow whole-file reads when HEAD is actually supported; that sounds
+        /// like a nightmare to debug.)
+        if (e.getHTTPStatus() >= 400 && e.getHTTPStatus() <= 499 &&
+            e.getHTTPStatus() != Poco::Net::HTTPResponse::HTTP_TOO_MANY_REQUESTS)
+            return HTTPFileInfo{};
+
+        throw;
+    }
+    return parseFileInfo(response, 0);
+}
+
+template <typename UpdatableSessionPtr>
+HTTPFileInfo ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::parseFileInfo(const Poco::Net::HTTPResponse & response, size_t requested_range_begin)
+{
+    HTTPFileInfo res;
+
+    if (response.hasContentLength())
+    {
+        res.file_size = response.getContentLength();
+
+        if (response.getStatus() == Poco::Net::HTTPResponse::HTTPStatus::HTTP_PARTIAL_CONTENT)
+        {
+            *res.file_size += requested_range_begin;
+            res.seekable = true;
+        }
+        else
+        {
+            res.seekable = response.has("Accept-Ranges") && response.get("Accept-Ranges") == "bytes";
+        }
+    }
+
+    if (response.has("Last-Modified"))
+    {
+        String date_str = response.get("Last-Modified");
+        struct tm info;
+        char * end = strptime(date_str.data(), "%a, %d %b %Y %H:%M:%S %Z", &info);
+        if (end == date_str.data() + date_str.size())
+            res.last_modified = timegm(&info);
+    }
+
+    return res;
+}
+
+}
+
+SessionFactory::SessionFactory(const ConnectionTimeouts & timeouts_)
+    : timeouts(timeouts_) {}
+
+SessionFactory::SessionType SessionFactory::buildNewSession(const Poco::URI & uri)
+{
+    return makeHTTPSession(uri, timeouts);
+}
+
+ReadWriteBufferFromHTTP::ReadWriteBufferFromHTTP(
+    Poco::URI uri_,
+    const std::string & method_,
+    OutStreamCallback out_stream_callback_,
+    const ConnectionTimeouts & timeouts,
+    const Poco::Net::HTTPBasicCredentials & credentials_,
+    const UInt64 max_redirects,
+    size_t buffer_size_,
+    const ReadSettings & settings_,
+    const HTTPHeaderEntries & http_header_entries_,
+    const RemoteHostFilter * remote_host_filter_,
+    bool delay_initialization_,
+    bool use_external_buffer_,
+    bool skip_not_found_url_,
+    std::optional<HTTPFileInfo> file_info_)
+    : Parent(
+        std::make_shared<SessionType>(uri_, max_redirects, std::make_shared<SessionFactory>(timeouts)),
+        uri_,
+        credentials_,
+        method_,
+        out_stream_callback_,
+        buffer_size_,
+        settings_,
+        http_header_entries_,
+        remote_host_filter_,
+        delay_initialization_,
+        use_external_buffer_,
+        skip_not_found_url_,
+        file_info_) {}
+
+RangedReadWriteBufferFromHTTPFactory::RangedReadWriteBufferFromHTTPFactory(
+    Poco::URI uri_,
+    std::string method_,
+    OutStreamCallback out_stream_callback_,
+    ConnectionTimeouts timeouts_,
+    const Poco::Net::HTTPBasicCredentials & credentials_,
+    UInt64 max_redirects_,
+    size_t buffer_size_,
+    ReadSettings settings_,
+    HTTPHeaderEntries http_header_entries_,
+    const RemoteHostFilter * remote_host_filter_,
+    bool delay_initialization_,
+    bool use_external_buffer_,
+    bool skip_not_found_url_)
+    : uri(uri_)
+    , method(std::move(method_))
+    , out_stream_callback(out_stream_callback_)
+    , timeouts(std::move(timeouts_))
+    , credentials(credentials_)
+    , max_redirects(max_redirects_)
+    , buffer_size(buffer_size_)
+    , settings(std::move(settings_))
+    , http_header_entries(std::move(http_header_entries_))
+    , remote_host_filter(remote_host_filter_)
+    , delay_initialization(delay_initialization_)
+    , use_external_buffer(use_external_buffer_)
+    , skip_not_found_url(skip_not_found_url_) {}
+
+std::unique_ptr<SeekableReadBuffer> RangedReadWriteBufferFromHTTPFactory::getReader()
+{
+    return std::make_unique<ReadWriteBufferFromHTTP>(
+        uri,
+        method,
+        out_stream_callback,
+        timeouts,
+        credentials,
+        max_redirects,
+        buffer_size,
+        settings,
+        http_header_entries,
+        remote_host_filter,
+        delay_initialization,
+        use_external_buffer,
+        skip_not_found_url,
+        file_info);
+}
+
+size_t RangedReadWriteBufferFromHTTPFactory::getFileSize()
+{
+    auto s = getFileInfo().file_size;
+    if (!s)
+        throw Exception(ErrorCodes::UNKNOWN_FILE_SIZE, "Cannot find out file size for: {}", uri.toString());
+    return *s;
+}
+
+bool RangedReadWriteBufferFromHTTPFactory::checkIfActuallySeekable()
+{
+    return getFileInfo().seekable;
+}
+
+HTTPFileInfo RangedReadWriteBufferFromHTTPFactory::getFileInfo()
+{
+    if (!file_info)
+        file_info = static_cast<ReadWriteBufferFromHTTP*>(getReader().get())->getFileInfo();
+    return *file_info;
+}
+
+String RangedReadWriteBufferFromHTTPFactory::getFileName() const { return uri.toString(); }
+
+
+PooledSessionFactory::PooledSessionFactory(
+    const ConnectionTimeouts & timeouts_, size_t per_endpoint_pool_size_)
+    : timeouts(timeouts_)
+    , per_endpoint_pool_size(per_endpoint_pool_size_) {}
+
+PooledSessionFactory::SessionType PooledSessionFactory::buildNewSession(const Poco::URI & uri)
+{
+    return makePooledHTTPSession(uri, timeouts, per_endpoint_pool_size);
+}
+
+
+PooledReadWriteBufferFromHTTP::PooledReadWriteBufferFromHTTP(
+    Poco::URI uri_,
+    const std::string & method_,
+    OutStreamCallback out_stream_callback_,
+    const ConnectionTimeouts & timeouts_,
+    const Poco::Net::HTTPBasicCredentials & credentials_,
+    size_t buffer_size_,
+    const UInt64 max_redirects,
+    size_t max_connections_per_endpoint)
+    : Parent(
+        std::make_shared<SessionType>(uri_, max_redirects, std::make_shared<PooledSessionFactory>(timeouts_, max_connections_per_endpoint)),
+        uri_,
+        credentials_,
+        method_,
+        out_stream_callback_,
+        buffer_size_) {}
+
+template class UpdatableSession<SessionFactory>;
+template class UpdatableSession<PooledSessionFactory>;
+template class detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatableSession<SessionFactory>>>;
+template class detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatableSession<PooledSessionFactory>>>;
+
+}
diff --git a/src/IO/ReadWriteBufferFromHTTP.h b/src/IO/ReadWriteBufferFromHTTP.h
index a3a3c318f5a..de1946ced48 100644
--- a/src/IO/ReadWriteBufferFromHTTP.h
+++ b/src/IO/ReadWriteBufferFromHTTP.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <functional>
-#include <Common/RangeGenerator.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/HTTPCommon.h>
 #include <IO/ParallelReadBuffer.h>
@@ -21,7 +20,6 @@
 #include <Poco/Net/HTTPResponse.h>
 #include <Poco/URI.h>
 #include <Poco/URIStreamFactory.h>
-#include <Poco/Version.h>
 #include <Common/DNSResolver.h>
 #include <Common/RemoteHostFilter.h>
 #include "config.h"
@@ -29,76 +27,54 @@
 
 #include <filesystem>
 
-namespace ProfileEvents
-{
-extern const Event ReadBufferSeekCancelConnection;
-}
-
 namespace DB
 {
-/** Perform HTTP POST request and provide response to read.
-  */
 
-namespace ErrorCodes
+template <typename TSessionFactory>
+class UpdatableSession
 {
-    extern const int TOO_MANY_REDIRECTS;
-    extern const int HTTP_RANGE_NOT_SATISFIABLE;
-    extern const int BAD_ARGUMENTS;
-    extern const int CANNOT_SEEK_THROUGH_FILE;
-    extern const int SEEK_POSITION_OUT_OF_BOUND;
-    extern const int UNKNOWN_FILE_SIZE;
-}
+public:
+    using SessionPtr = typename TSessionFactory::SessionType;
 
-template <typename SessionPtr>
-class UpdatableSessionBase
-{
-protected:
+    explicit UpdatableSession(const Poco::URI & uri, UInt64 max_redirects_, std::shared_ptr<TSessionFactory> session_factory_);
+
+    SessionPtr getSession();
+
+    void updateSession(const Poco::URI & uri);
+
+    std::shared_ptr<UpdatableSession<TSessionFactory>> clone(const Poco::URI & uri);
+
+private:
     SessionPtr session;
     UInt64 redirects{0};
-    Poco::URI initial_uri;
-    ConnectionTimeouts timeouts;
     UInt64 max_redirects;
+    Poco::URI initial_uri;
+    std::shared_ptr<TSessionFactory> session_factory;
+};
 
-public:
-    virtual void buildNewSession(const Poco::URI & uri) = 0;
 
-    explicit UpdatableSessionBase(const Poco::URI uri, const ConnectionTimeouts & timeouts_, UInt64 max_redirects_)
-        : initial_uri{uri}, timeouts{timeouts_}, max_redirects{max_redirects_}
-    {
-    }
-
-    SessionPtr getSession() { return session; }
-
-    void updateSession(const Poco::URI & uri)
-    {
-        ++redirects;
-        if (redirects <= max_redirects)
-        {
-            buildNewSession(uri);
-        }
-        else
-        {
-            throw Exception(ErrorCodes::TOO_MANY_REDIRECTS, "Too many redirects while trying to access {}", initial_uri.toString());
-        }
-    }
-
-    virtual ~UpdatableSessionBase() = default;
+/// Information from HTTP response header.
+struct HTTPFileInfo
+{
+    // nullopt if the server doesn't report it.
+    std::optional<size_t> file_size;
+    std::optional<time_t> last_modified;
+    bool seekable = false;
 };
 
 
 namespace detail
 {
+    /// Byte range, including right bound [begin, end].
+    struct HTTPRange
+    {
+        std::optional<size_t> begin;
+        std::optional<size_t> end;
+    };
+
     template <typename UpdatableSessionPtr>
     class ReadWriteBufferFromHTTPBase : public SeekableReadBuffer, public WithFileName, public WithFileSize
     {
-    public:
-        /// HTTP range, including right bound [begin, end].
-        struct Range
-        {
-            std::optional<size_t> begin;
-            std::optional<size_t> end;
-        };
-
     protected:
         Poco::URI uri;
         std::string method;
@@ -118,8 +94,8 @@ namespace detail
         bool use_external_buffer;
 
         size_t offset_from_begin_pos = 0;
-        Range read_range;
-        std::optional<size_t> file_size;
+        HTTPRange read_range;
+        std::optional<HTTPFileInfo> file_info;
 
         /// Delayed exception in case retries with partial content are not satisfiable.
         std::exception_ptr exception;
@@ -132,95 +108,19 @@ namespace detail
         ReadSettings settings;
         Poco::Logger * log;
 
-        bool withPartialContent() const
-        {
-            /**
-             * Add range header if we have some passed range (for disk web)
-             * or if we want to retry GET request on purpose.
-             */
-            return read_range.begin || read_range.end || retry_with_range_header;
-        }
+        bool withPartialContent(const HTTPRange & range) const;
 
-        size_t getRangeBegin() const { return read_range.begin.value_or(0); }
+        size_t getRangeBegin() const;
 
-        size_t getOffset() const { return getRangeBegin() + offset_from_begin_pos; }
+        size_t getOffset() const;
 
-        std::istream * callImpl(Poco::URI uri_, Poco::Net::HTTPResponse & response, const std::string & method_)
-        {
-            // With empty path poco will send "POST  HTTP/1.1" its bug.
-            if (uri_.getPath().empty())
-                uri_.setPath("/");
+        std::istream * callImpl(UpdatableSessionPtr & current_session, Poco::URI uri_, Poco::Net::HTTPResponse & response, const std::string & method_, bool for_object_info = false);
 
-            Poco::Net::HTTPRequest request(method_, uri_.getPathAndQuery(), Poco::Net::HTTPRequest::HTTP_1_1);
-            request.setHost(uri_.getHost()); // use original, not resolved host name in header
+        size_t getFileSize() override;
 
-            if (out_stream_callback)
-                request.setChunkedTransferEncoding(true);
+        bool checkIfActuallySeekable() override;
 
-            for (auto & [header, value] : http_header_entries)
-                request.set(header, value);
-
-            if (withPartialContent())
-            {
-                String range_header_value;
-                if (read_range.end)
-                    range_header_value = fmt::format("bytes={}-{}", getOffset(), *read_range.end);
-                else
-                    range_header_value = fmt::format("bytes={}-", getOffset());
-                LOG_TEST(log, "Adding header: Range: {}", range_header_value);
-                request.set("Range", range_header_value);
-            }
-
-            if (!credentials.getUsername().empty())
-                credentials.authenticate(request);
-
-            LOG_TRACE(log, "Sending request to {}", uri_.toString());
-
-            auto sess = session->getSession();
-
-            try
-            {
-                auto & stream_out = sess->sendRequest(request);
-
-                if (out_stream_callback)
-                    out_stream_callback(stream_out);
-
-                istr = receiveResponse(*sess, request, response, true);
-                response.getCookies(cookies);
-
-                content_encoding = response.get("Content-Encoding", "");
-                return istr;
-            }
-            catch (const Poco::Exception & e)
-            {
-                /// We use session data storage as storage for exception text
-                /// Depend on it we can deduce to reconnect session or reresolve session host
-                sess->attachSessionData(e.message());
-                throw;
-            }
-        }
-
-        size_t getFileSize() override
-        {
-            if (file_size)
-                return *file_size;
-
-            Poco::Net::HTTPResponse response;
-            getHeadResponse(response);
-
-            if (response.hasContentLength())
-            {
-                if (!read_range.end)
-                    read_range.end = getRangeBegin() + response.getContentLength();
-
-                file_size = response.getContentLength();
-                return *file_size;
-            }
-
-            throw Exception(ErrorCodes::UNKNOWN_FILE_SIZE, "Cannot find out file size for: {}", uri.toString());
-        }
-
-        String getFileName() const override { return uri.toString(); }
+        String getFileName() const override;
 
         enum class InitializeError
         {
@@ -235,38 +135,9 @@ namespace detail
         InitializeError initialization_error = InitializeError::NONE;
 
     private:
-        void getHeadResponse(Poco::Net::HTTPResponse & response)
-        {
-            for (size_t i = 0; i < settings.http_max_tries; ++i)
-            {
-                try
-                {
-                    callWithRedirects(response, Poco::Net::HTTPRequest::HTTP_HEAD);
-                    break;
-                }
-                catch (const Poco::Exception & e)
-                {
-                    if (i == settings.http_max_tries - 1)
-                        throw;
+        void getHeadResponse(Poco::Net::HTTPResponse & response);
 
-                    LOG_ERROR(log, "Failed to make HTTP_HEAD request to {}. Error: {}", uri.toString(), e.displayText());
-                }
-            }
-        }
-
-        void setupExternalBuffer()
-        {
-            /**
-            * use_external_buffer -- means we read into the buffer which
-            * was passed to us from somewhere else. We do not check whether
-            * previously returned buffer was read or not (no hasPendingData() check is needed),
-            * because this branch means we are prefetching data,
-            * each nextImpl() call we can fill a different buffer.
-            */
-            impl->set(internal_buffer.begin(), internal_buffer.size());
-            assert(working_buffer.begin() != nullptr);
-            assert(!internal_buffer.empty());
-        }
+        void setupExternalBuffer();
 
     public:
         using NextCallback = std::function<void(size_t)>;
@@ -281,454 +152,72 @@ namespace detail
             size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
             const ReadSettings & settings_ = {},
             HTTPHeaderEntries http_header_entries_ = {},
-            Range read_range_ = {},
             const RemoteHostFilter * remote_host_filter_ = nullptr,
             bool delay_initialization = false,
             bool use_external_buffer_ = false,
-            bool http_skip_not_found_url_ = false)
-            : SeekableReadBuffer(nullptr, 0)
-            , uri {uri_}
-            , method {!method_.empty() ? method_ : out_stream_callback_ ? Poco::Net::HTTPRequest::HTTP_POST : Poco::Net::HTTPRequest::HTTP_GET}
-            , session {session_}
-            , out_stream_callback {out_stream_callback_}
-            , credentials {credentials_}
-            , http_header_entries {std::move(http_header_entries_)}
-            , remote_host_filter {remote_host_filter_}
-            , buffer_size {buffer_size_}
-            , use_external_buffer {use_external_buffer_}
-            , read_range(read_range_)
-            , http_skip_not_found_url(http_skip_not_found_url_)
-            , settings {settings_}
-            , log(&Poco::Logger::get("ReadWriteBufferFromHTTP"))
-        {
-            if (settings.http_max_tries <= 0 || settings.http_retry_initial_backoff_ms <= 0
-                || settings.http_retry_initial_backoff_ms >= settings.http_retry_max_backoff_ms)
-                throw Exception(
-                    ErrorCodes::BAD_ARGUMENTS,
-                    "Invalid setting for http backoff, "
-                    "must be http_max_tries >= 1 (current is {}) and "
-                    "0 < http_retry_initial_backoff_ms < settings.http_retry_max_backoff_ms (now 0 < {} < {})",
-                    settings.http_max_tries,
-                    settings.http_retry_initial_backoff_ms,
-                    settings.http_retry_max_backoff_ms);
+            bool http_skip_not_found_url_ = false,
+            std::optional<HTTPFileInfo> file_info_ = std::nullopt);
 
-            // Configure User-Agent if it not already set.
-            const std::string user_agent = "User-Agent";
-            auto iter = std::find_if(
-                http_header_entries.begin(),
-                http_header_entries.end(),
-                [&user_agent](const HTTPHeaderEntry & entry) { return entry.name == user_agent; });
+        void callWithRedirects(Poco::Net::HTTPResponse & response, const String & method_, bool throw_on_all_errors = false, bool for_object_info = false);
 
-            if (iter == http_header_entries.end())
-            {
-                http_header_entries.emplace_back("User-Agent", fmt::format("ClickHouse/{}", VERSION_STRING));
-            }
-
-            if (!delay_initialization)
-            {
-                initialize();
-                if (exception)
-                    std::rethrow_exception(exception);
-            }
-        }
-
-        static bool isRetriableError(const Poco::Net::HTTPResponse::HTTPStatus http_status) noexcept
-        {
-            constexpr std::array non_retriable_errors{
-                Poco::Net::HTTPResponse::HTTPStatus::HTTP_BAD_REQUEST,
-                Poco::Net::HTTPResponse::HTTPStatus::HTTP_UNAUTHORIZED,
-                Poco::Net::HTTPResponse::HTTPStatus::HTTP_NOT_FOUND,
-                Poco::Net::HTTPResponse::HTTPStatus::HTTP_FORBIDDEN,
-                Poco::Net::HTTPResponse::HTTPStatus::HTTP_METHOD_NOT_ALLOWED};
-
-            return std::all_of(
-                non_retriable_errors.begin(), non_retriable_errors.end(), [&](const auto status) { return http_status != status; });
-        }
-
-        Poco::URI getUriAfterRedirect(const Poco::URI & prev_uri, Poco::Net::HTTPResponse & response)
-        {
-            auto location = response.get("Location");
-            auto location_uri = Poco::URI(location);
-            if (!location_uri.isRelative())
-                return location_uri;
-            /// Location header contains relative path. So we need to concatenate it
-            /// with path from the original URI and normalize it.
-            auto path = std::filesystem::weakly_canonical(std::filesystem::path(prev_uri.getPath()) / location);
-            location_uri = prev_uri;
-            location_uri.setPath(path);
-            return location_uri;
-        }
-
-        void callWithRedirects(Poco::Net::HTTPResponse & response, const String & method_, bool throw_on_all_errors = false)
-        {
-            call(response, method_, throw_on_all_errors);
-            Poco::URI prev_uri = uri;
-
-            while (isRedirect(response.getStatus()))
-            {
-                Poco::URI uri_redirect = getUriAfterRedirect(prev_uri, response);
-                prev_uri = uri_redirect;
-                if (remote_host_filter)
-                    remote_host_filter->checkURL(uri_redirect);
-
-                session->updateSession(uri_redirect);
-
-                istr = callImpl(uri_redirect, response, method);
-            }
-        }
-
-        void call(Poco::Net::HTTPResponse & response, const String & method_, bool throw_on_all_errors = false)
-        {
-            try
-            {
-                istr = callImpl(saved_uri_redirect ? *saved_uri_redirect : uri, response, method_);
-            }
-            catch (...)
-            {
-                if (throw_on_all_errors)
-                {
-                    throw;
-                }
-
-                auto http_status = response.getStatus();
-
-                if (http_status == Poco::Net::HTTPResponse::HTTPStatus::HTTP_NOT_FOUND && http_skip_not_found_url)
-                {
-                    initialization_error = InitializeError::SKIP_NOT_FOUND_URL;
-                }
-                else if (!isRetriableError(http_status))
-                {
-                    initialization_error = InitializeError::NON_RETRYABLE_ERROR;
-                    exception = std::current_exception();
-                }
-                else
-                {
-                    throw;
-                }
-            }
-        }
+        void call(UpdatableSessionPtr & current_session, Poco::Net::HTTPResponse & response, const String & method_, bool throw_on_all_errors = false, bool for_object_info = false);
 
         /**
          * Throws if error is retryable, otherwise sets initialization_error = NON_RETRYABLE_ERROR and
          * saves exception into `exception` variable. In case url is not found and skip_not_found_url == true,
          * sets initialization_error = SKIP_NOT_FOUND_URL, otherwise throws.
          */
-        void initialize()
-        {
-            Poco::Net::HTTPResponse response;
+        void initialize();
 
-            call(response, method);
-            if (initialization_error != InitializeError::NONE)
-                return;
+        bool nextImpl() override;
 
-            while (isRedirect(response.getStatus()))
-            {
-                Poco::URI uri_redirect = getUriAfterRedirect(saved_uri_redirect.value_or(uri), response);
-                if (remote_host_filter)
-                    remote_host_filter->checkURL(uri_redirect);
+        off_t getPosition() override;
 
-                session->updateSession(uri_redirect);
+        off_t seek(off_t offset_, int whence) override;
 
-                istr = callImpl(uri_redirect, response, method);
-                saved_uri_redirect = uri_redirect;
-            }
+        void setReadUntilPosition(size_t until) override;
 
-            if (response.hasContentLength())
-                LOG_DEBUG(log, "Received response with content length: {}", response.getContentLength());
+        void setReadUntilEnd() override;
 
-            if (withPartialContent() && response.getStatus() != Poco::Net::HTTPResponse::HTTPStatus::HTTP_PARTIAL_CONTENT)
-            {
-                /// Having `200 OK` instead of `206 Partial Content` is acceptable in case we retried with range.begin == 0.
-                if (read_range.begin && *read_range.begin != 0)
-                {
-                    if (!exception)
-                    {
-                        exception = std::make_exception_ptr(Exception(
-                            ErrorCodes::HTTP_RANGE_NOT_SATISFIABLE,
-                            "Cannot read with range: [{}, {}] (response status: {}, reason: {})",
-                            *read_range.begin,
-                            read_range.end ? toString(*read_range.end) : "-",
-                            toString(response.getStatus()), response.getReason()));
-                    }
+        bool supportsRightBoundedReads() const override;
 
-                    /// Retry 200OK
-                    if (response.getStatus() == Poco::Net::HTTPResponse::HTTPStatus::HTTP_OK)
-                        initialization_error = InitializeError::RETRYABLE_ERROR;
-                    else
-                        initialization_error = InitializeError::NON_RETRYABLE_ERROR;
+        // If true, if we destroy impl now, no work was wasted. Just for metrics.
+        bool atEndOfRequestedRangeGuess();
 
-                    return;
-                }
-                else if (read_range.end)
-                {
-                    /// We could have range.begin == 0 and range.end != 0 in case of DiskWeb and failing to read with partial content
-                    /// will affect only performance, so a warning is enough.
-                    LOG_WARNING(log, "Unable to read with range header: [{}, {}]", getRangeBegin(), *read_range.end);
-                }
-            }
-
-            if (!offset_from_begin_pos && !read_range.end && response.hasContentLength())
-                read_range.end = getRangeBegin() + response.getContentLength();
-
-            try
-            {
-                impl = std::make_unique<ReadBufferFromIStream>(*istr, buffer_size);
-
-                if (use_external_buffer)
-                {
-                    setupExternalBuffer();
-                }
-            }
-            catch (const Poco::Exception & e)
-            {
-                /// We use session data storage as storage for exception text
-                /// Depend on it we can deduce to reconnect session or reresolve session host
-                auto sess = session->getSession();
-                sess->attachSessionData(e.message());
-                throw;
-            }
-        }
-
-        bool nextImpl() override
-        {
-            if (initialization_error == InitializeError::SKIP_NOT_FOUND_URL)
-                return false;
-            assert(initialization_error == InitializeError::NONE);
-
-            if (next_callback)
-                next_callback(count());
-
-            if (read_range.end && getOffset() > read_range.end.value())
-            {
-                assert(getOffset() == read_range.end.value() + 1);
-                return false;
-            }
-
-            if (impl)
-            {
-                if (use_external_buffer)
-                {
-                    setupExternalBuffer();
-                }
-                else
-                {
-                    /**
-                    * impl was initialized before, pass position() to it to make
-                    * sure there is no pending data which was not read.
-                    */
-                    if (!working_buffer.empty())
-                        impl->position() = position();
-                }
-            }
-
-            bool result = false;
-            size_t milliseconds_to_wait = settings.http_retry_initial_backoff_ms;
-
-            auto on_retriable_error = [&]()
-            {
-                retry_with_range_header = true;
-                impl.reset();
-                auto http_session = session->getSession();
-                http_session->reset();
-                sleepForMilliseconds(milliseconds_to_wait);
-            };
-
-            for (size_t i = 0; i < settings.http_max_tries; ++i)
-            {
-                exception = nullptr;
-                initialization_error = InitializeError::NONE;
-
-                try
-                {
-                    if (!impl)
-                    {
-                        initialize();
-
-                        if (initialization_error == InitializeError::NON_RETRYABLE_ERROR)
-                        {
-                            assert(exception);
-                            break;
-                        }
-                        else if (initialization_error == InitializeError::SKIP_NOT_FOUND_URL)
-                        {
-                            return false;
-                        }
-                        else if (initialization_error == InitializeError::RETRYABLE_ERROR)
-                        {
-                            LOG_ERROR(
-                                log,
-                                "HTTP request to `{}` failed at try {}/{} with bytes read: {}/{}. "
-                                "(Current backoff wait is {}/{} ms)",
-                                uri.toString(), i + 1, settings.http_max_tries, getOffset(),
-                                read_range.end ? toString(*read_range.end) : "unknown",
-                                milliseconds_to_wait, settings.http_retry_max_backoff_ms);
-
-                            assert(exception);
-                            on_retriable_error();
-                            continue;
-                        }
-
-                        assert(!exception);
-
-                        if (use_external_buffer)
-                        {
-                            setupExternalBuffer();
-                        }
-                    }
-
-                    result = impl->next();
-                    exception = nullptr;
-                    break;
-                }
-                catch (const Poco::Exception & e)
-                {
-                    /// Too many open files - non-retryable.
-                    if (e.code() == POCO_EMFILE)
-                        throw;
-
-                    /** Retry request unconditionally if nothing has been read yet.
-                      * Otherwise if it is GET method retry with range header.
-                      */
-                    bool can_retry_request = !offset_from_begin_pos || method == Poco::Net::HTTPRequest::HTTP_GET;
-                    if (!can_retry_request)
-                        throw;
-
-                    LOG_ERROR(
-                        log,
-                        "HTTP request to `{}` failed at try {}/{} with bytes read: {}/{}. "
-                        "Error: {}. (Current backoff wait is {}/{} ms)",
-                        uri.toString(),
-                        i + 1,
-                        settings.http_max_tries,
-                        getOffset(),
-                        read_range.end ? toString(*read_range.end) : "unknown",
-                        e.displayText(),
-                        milliseconds_to_wait,
-                        settings.http_retry_max_backoff_ms);
-
-                    on_retriable_error();
-                    exception = std::current_exception();
-                }
-
-                milliseconds_to_wait = std::min(milliseconds_to_wait * 2, settings.http_retry_max_backoff_ms);
-            }
-
-            if (exception)
-                std::rethrow_exception(exception);
-
-            if (!result)
-                return false;
-
-            internal_buffer = impl->buffer();
-            working_buffer = internal_buffer;
-            offset_from_begin_pos += working_buffer.size();
-            return true;
-        }
-
-        off_t getPosition() override { return getOffset() - available(); }
-
-        off_t seek(off_t offset_, int whence) override
-        {
-            if (whence != SEEK_SET)
-                throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Only SEEK_SET mode is allowed.");
-
-            if (offset_ < 0)
-                throw Exception(ErrorCodes::SEEK_POSITION_OUT_OF_BOUND, "Seek position is out of bounds. Offset: {}",
-                    offset_);
-
-            off_t current_offset = getOffset();
-            if (!working_buffer.empty() && size_t(offset_) >= current_offset - working_buffer.size() && offset_ < current_offset)
-            {
-                pos = working_buffer.end() - (current_offset - offset_);
-                assert(pos >= working_buffer.begin());
-                assert(pos <= working_buffer.end());
-
-                return getPosition();
-            }
-
-            auto position = getPosition();
-            if (offset_ > position)
-            {
-                size_t diff = offset_ - position;
-                if (diff < settings.remote_read_min_bytes_for_seek)
-                {
-                    ignore(diff);
-                    return offset_;
-                }
-            }
-
-            if (impl)
-            {
-                ProfileEvents::increment(ProfileEvents::ReadBufferSeekCancelConnection);
-                impl.reset();
-            }
-
-            resetWorkingBuffer();
-            read_range.begin = offset_;
-            read_range.end = std::nullopt;
-            offset_from_begin_pos = 0;
-
-            return offset_;
-        }
-
-        SeekableReadBuffer::Range getRemainingReadRange() const override { return {getOffset(), read_range.end}; }
-
-        std::string getResponseCookie(const std::string & name, const std::string & def) const
-        {
-            for (const auto & cookie : cookies)
-                if (cookie.getName() == name)
-                    return cookie.getValue();
-            return def;
-        }
+        std::string getResponseCookie(const std::string & name, const std::string & def) const;
 
         /// Set function to call on each nextImpl, useful when you need to track
         /// progress.
         /// NOTE: parameter on each call is not incremental -- it's all bytes count
         /// passed through the buffer
-        void setNextCallback(NextCallback next_callback_)
-        {
-            next_callback = next_callback_;
-            /// Some data maybe already read
-            next_callback(count());
-        }
+        void setNextCallback(NextCallback next_callback_);
 
-        const std::string & getCompressionMethod() const { return content_encoding; }
+        const std::string & getCompressionMethod() const;
 
-        std::optional<time_t> getLastModificationTime()
-        {
-            Poco::Net::HTTPResponse response;
-            getHeadResponse(response);
-            if (!response.has("Last-Modified"))
-                return std::nullopt;
+        std::optional<time_t> getLastModificationTime();
 
-            String date_str = response.get("Last-Modified");
-            struct tm info;
-            char * res = strptime(date_str.data(), "%a, %d %b %Y %H:%M:%S %Z", &info);
-            if (!res || res != date_str.data() + date_str.size())
-                return std::nullopt;
+        HTTPFileInfo getFileInfo();
 
-            return timegm(&info);
-        }
+        HTTPFileInfo parseFileInfo(const Poco::Net::HTTPResponse & response, size_t requested_range_begin);
     };
 }
 
-class UpdatableSession : public UpdatableSessionBase<HTTPSessionPtr>
+class SessionFactory
 {
-    using Parent = UpdatableSessionBase<HTTPSessionPtr>;
-
 public:
-    UpdatableSession(const Poco::URI uri, const ConnectionTimeouts & timeouts_, const UInt64 max_redirects_)
-        : Parent(uri, timeouts_, max_redirects_)
-    {
-        session = makeHTTPSession(initial_uri, timeouts);
-    }
+    explicit SessionFactory(const ConnectionTimeouts & timeouts_);
 
-    void buildNewSession(const Poco::URI & uri) override { session = makeHTTPSession(uri, timeouts); }
+    using SessionType = HTTPSessionPtr;
+
+    SessionType buildNewSession(const Poco::URI & uri);
+private:
+    ConnectionTimeouts timeouts;
 };
 
-class ReadWriteBufferFromHTTP : public detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatableSession>>
+class ReadWriteBufferFromHTTP : public detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatableSession<SessionFactory>>>
 {
-    using Parent = detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatableSession>>;
+    using SessionType = UpdatableSession<SessionFactory>;
+    using Parent = detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<SessionType>>;
 
 public:
     ReadWriteBufferFromHTTP(
@@ -741,37 +230,19 @@ public:
         size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
         const ReadSettings & settings_ = {},
         const HTTPHeaderEntries & http_header_entries_ = {},
-        Range read_range_ = {},
         const RemoteHostFilter * remote_host_filter_ = nullptr,
         bool delay_initialization_ = true,
         bool use_external_buffer_ = false,
-        bool skip_not_found_url_ = false)
-        : Parent(
-            std::make_shared<UpdatableSession>(uri_, timeouts, max_redirects),
-            uri_,
-            credentials_,
-            method_,
-            out_stream_callback_,
-            buffer_size_,
-            settings_,
-            http_header_entries_,
-            read_range_,
-            remote_host_filter_,
-            delay_initialization_,
-            use_external_buffer_,
-            skip_not_found_url_)
-    {
-    }
+        bool skip_not_found_url_ = false,
+        std::optional<HTTPFileInfo> file_info_ = std::nullopt);
 };
 
-class RangedReadWriteBufferFromHTTPFactory : public ParallelReadBuffer::ReadBufferFactory, public WithFileName
+class RangedReadWriteBufferFromHTTPFactory : public SeekableReadBufferFactory, public WithFileName
 {
     using OutStreamCallback = ReadWriteBufferFromHTTP::OutStreamCallback;
 
 public:
     RangedReadWriteBufferFromHTTPFactory(
-        size_t total_object_size_,
-        size_t range_step_,
         Poco::URI uri_,
         std::string method_,
         OutStreamCallback out_stream_callback_,
@@ -784,66 +255,19 @@ public:
         const RemoteHostFilter * remote_host_filter_ = nullptr,
         bool delay_initialization_ = true,
         bool use_external_buffer_ = false,
-        bool skip_not_found_url_ = false)
-        : range_generator(total_object_size_, range_step_)
-        , total_object_size(total_object_size_)
-        , range_step(range_step_)
-        , uri(uri_)
-        , method(std::move(method_))
-        , out_stream_callback(out_stream_callback_)
-        , timeouts(std::move(timeouts_))
-        , credentials(credentials_)
-        , max_redirects(max_redirects_)
-        , buffer_size(buffer_size_)
-        , settings(std::move(settings_))
-        , http_header_entries(std::move(http_header_entries_))
-        , remote_host_filter(remote_host_filter_)
-        , delay_initialization(delay_initialization_)
-        , use_external_buffer(use_external_buffer_)
-        , skip_not_found_url(skip_not_found_url_)
-    {
-    }
+        bool skip_not_found_url_ = false);
 
-    SeekableReadBufferPtr getReader() override
-    {
-        const auto next_range = range_generator.nextRange();
-        if (!next_range)
-        {
-            return nullptr;
-        }
+    std::unique_ptr<SeekableReadBuffer> getReader() override;
 
-        return std::make_shared<ReadWriteBufferFromHTTP>(
-            uri,
-            method,
-            out_stream_callback,
-            timeouts,
-            credentials,
-            max_redirects,
-            buffer_size,
-            settings,
-            http_header_entries,
-            // HTTP Range has inclusive bounds, i.e. [from, to]
-            ReadWriteBufferFromHTTP::Range{next_range->first, next_range->second - 1},
-            remote_host_filter,
-            delay_initialization,
-            use_external_buffer,
-            skip_not_found_url);
-    }
+    size_t getFileSize() override;
 
-    off_t seek(off_t off, [[maybe_unused]] int whence) override
-    {
-        range_generator = RangeGenerator{total_object_size, range_step, static_cast<size_t>(off)};
-        return off;
-    }
+    bool checkIfActuallySeekable() override;
 
-    size_t getFileSize() override { return total_object_size; }
+    HTTPFileInfo getFileInfo();
 
-    String getFileName() const override { return uri.toString(); }
+    String getFileName() const override;
 
 private:
-    RangeGenerator range_generator;
-    size_t total_object_size;
-    size_t range_step;
     Poco::URI uri;
     std::string method;
     OutStreamCallback out_stream_callback;
@@ -854,32 +278,30 @@ private:
     ReadSettings settings;
     HTTPHeaderEntries http_header_entries;
     const RemoteHostFilter * remote_host_filter;
+    std::optional<HTTPFileInfo> file_info;
     bool delay_initialization;
     bool use_external_buffer;
     bool skip_not_found_url;
 };
 
-class UpdatablePooledSession : public UpdatableSessionBase<PooledHTTPSessionPtr>
+class PooledSessionFactory
 {
-    using Parent = UpdatableSessionBase<PooledHTTPSessionPtr>;
-
-private:
-    size_t per_endpoint_pool_size;
-
 public:
-    explicit UpdatablePooledSession(
-        const Poco::URI uri, const ConnectionTimeouts & timeouts_, const UInt64 max_redirects_, size_t per_endpoint_pool_size_)
-        : Parent(uri, timeouts_, max_redirects_), per_endpoint_pool_size{per_endpoint_pool_size_}
-    {
-        session = makePooledHTTPSession(initial_uri, timeouts, per_endpoint_pool_size);
-    }
+    explicit PooledSessionFactory(
+        const ConnectionTimeouts & timeouts_, size_t per_endpoint_pool_size_);
 
-    void buildNewSession(const Poco::URI & uri) override { session = makePooledHTTPSession(uri, timeouts, per_endpoint_pool_size); }
+    using SessionType = PooledHTTPSessionPtr;
+
+    SessionType buildNewSession(const Poco::URI & uri);
+private:
+    ConnectionTimeouts timeouts;
+    size_t per_endpoint_pool_size;
 };
 
-class PooledReadWriteBufferFromHTTP : public detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatablePooledSession>>
+class PooledReadWriteBufferFromHTTP : public detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatableSession<PooledSessionFactory>>>
 {
-    using Parent = detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatablePooledSession>>;
+    using SessionType = UpdatableSession<PooledSessionFactory>;
+    using Parent = detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<SessionType>>;
 
 public:
     explicit PooledReadWriteBufferFromHTTP(
@@ -890,16 +312,12 @@ public:
         const Poco::Net::HTTPBasicCredentials & credentials_ = {},
         size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
         const UInt64 max_redirects = 0,
-        size_t max_connections_per_endpoint = DEFAULT_COUNT_OF_HTTP_CONNECTIONS_PER_ENDPOINT)
-        : Parent(
-            std::make_shared<UpdatablePooledSession>(uri_, timeouts_, max_redirects, max_connections_per_endpoint),
-            uri_,
-            credentials_,
-            method_,
-            out_stream_callback_,
-            buffer_size_)
-    {
-    }
+        size_t max_connections_per_endpoint = DEFAULT_COUNT_OF_HTTP_CONNECTIONS_PER_ENDPOINT);
 };
 
+extern template class UpdatableSession<SessionFactory>;
+extern template class UpdatableSession<PooledSessionFactory>;
+extern template class detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatableSession<SessionFactory>>>;
+extern template class detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatableSession<PooledSessionFactory>>>;
+
 }
diff --git a/src/IO/Resource/DynamicResourceManager.cpp b/src/IO/Resource/DynamicResourceManager.cpp
new file mode 100644
index 00000000000..df0de6575f4
--- /dev/null
+++ b/src/IO/Resource/DynamicResourceManager.cpp
@@ -0,0 +1,234 @@
+#include <IO/Resource/DynamicResourceManager.h>
+
+#include <IO/SchedulerNodeFactory.h>
+#include <IO/ResourceManagerFactory.h>
+#include <IO/ISchedulerQueue.h>
+
+#include <Common/Exception.h>
+#include <Common/StringUtils/StringUtils.h>
+
+#include <map>
+#include <tuple>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int RESOURCE_ACCESS_DENIED;
+    extern const int RESOURCE_NOT_FOUND;
+    extern const int INVALID_SCHEDULER_NODE;
+}
+
+DynamicResourceManager::State::State(EventQueue * event_queue, const Poco::Util::AbstractConfiguration & config)
+    : classifiers(config)
+{
+    Poco::Util::AbstractConfiguration::Keys keys;
+    const String config_prefix = "resources";
+    config.keys(config_prefix, keys);
+
+    // Create resource for every element under <resources> tag
+    for (const auto & key : keys)
+    {
+        resources.emplace(key, std::make_shared<Resource>(key, event_queue, config, config_prefix + "." + key));
+    }
+}
+
+DynamicResourceManager::State::Resource::Resource(
+    const String & name,
+    EventQueue * event_queue,
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & config_prefix)
+{
+    Poco::Util::AbstractConfiguration::Keys keys;
+    config.keys(config_prefix, keys);
+
+    // Sort nodes by path to create parents before children
+    std::map<String, String> path2key;
+    for (const auto & key : keys)
+    {
+        if (!startsWith(key, "node"))
+            continue;
+        String path = config.getString(config_prefix + "." + key + "[@path]", "");
+        if (path.empty())
+            throw Exception(ErrorCodes::INVALID_SCHEDULER_NODE, "Attribute 'path' must be specified in all nodes for resource '{}'", name);
+        if (path[0] != '/')
+            throw Exception(ErrorCodes::INVALID_SCHEDULER_NODE, "Path must start with '/' for resource '{}'", name);
+        if (auto [_, inserted] = path2key.emplace(path, key); !inserted)
+            throw Exception(ErrorCodes::INVALID_SCHEDULER_NODE, "Duplicate path '{}' for resource '{}'", path, name);
+    }
+
+    // Create nodes
+    bool has_root = false;
+    for (auto [path, key] : path2key)
+    {
+        // Validate path
+        size_t slash = path.rfind('/');
+        if (slash == String::npos)
+            throw Exception(ErrorCodes::INVALID_SCHEDULER_NODE, "Invalid scheduler node path '{}' for resource '{}'", path, name);
+
+        // Create node
+        String basename = path.substr(slash + 1); // root name is empty string
+        auto [iter, _] = nodes.emplace(path, Node(basename, event_queue, config, config_prefix + "." + key));
+        if (path == "/")
+        {
+            has_root = true;
+            continue;
+        }
+
+        // Attach created node to parent (if not root)
+        // NOTE: resource root is attached to the scheduler using event queue for thread-safety
+        String parent_path = path.substr(0, slash);
+        if (parent_path.empty())
+            parent_path = "/";
+        if (auto parent = nodes.find(parent_path); parent != nodes.end())
+            parent->second.ptr->attachChild(iter->second.ptr);
+        else
+            throw Exception(ErrorCodes::INVALID_SCHEDULER_NODE, "Parent node doesn't exist for path '{}' for resource '{}'", path, name);
+    }
+
+    if (!has_root)
+        throw Exception(ErrorCodes::INVALID_SCHEDULER_NODE, "undefined root node path '/' for resource '{}'", name);
+}
+
+DynamicResourceManager::State::Resource::~Resource()
+{
+    // NOTE: we should rely on `attached_to` and cannot use `parent`,
+    // NOTE: because `parent` can be `nullptr` in case attachment is still in event queue
+    if (attached_to != nullptr)
+    {
+        ISchedulerNode * root = nodes.find("/")->second.ptr.get();
+        attached_to->event_queue->enqueue([my_scheduler = attached_to, root]
+        {
+            my_scheduler->removeChild(root);
+        });
+    }
+}
+
+DynamicResourceManager::State::Node::Node(const String & name, EventQueue * event_queue, const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix)
+    : type(config.getString(config_prefix + ".type", "fifo"))
+    , ptr(SchedulerNodeFactory::instance().get(type, event_queue, config, config_prefix))
+{
+    ptr->basename = name;
+}
+
+bool DynamicResourceManager::State::Resource::equals(const DynamicResourceManager::State::Resource & o) const
+{
+    if (nodes.size() != o.nodes.size())
+        return false;
+
+    for (const auto & [path, o_node] : o.nodes)
+    {
+        auto iter = nodes.find(path);
+        if (iter == nodes.end())
+            return false;
+        if (!iter->second.equals(o_node))
+            return false;
+    }
+
+    return true;
+}
+
+bool DynamicResourceManager::State::Node::equals(const DynamicResourceManager::State::Node & o) const
+{
+    if (type != o.type)
+        return false;
+    return ptr->equals(o.ptr.get());
+}
+
+DynamicResourceManager::Classifier::Classifier(const DynamicResourceManager::StatePtr & state_, const String & classifier_name)
+    : state(state_)
+{
+    // State is immutable, but nodes are mutable and thread-safe
+    // So it's safe to obtain node pointers w/o lock
+    for (auto [resource_name, path] : state->classifiers.get(classifier_name))
+    {
+        if (auto resource_iter = state->resources.find(resource_name); resource_iter != state->resources.end())
+        {
+            const auto & resource = resource_iter->second;
+            if (auto node_iter = resource->nodes.find(path); node_iter != resource->nodes.end())
+            {
+                if (auto * queue = dynamic_cast<ISchedulerQueue *>(node_iter->second.ptr.get()))
+                    resources.emplace(resource_name, ResourceLink{.queue = queue});
+                else
+                    throw Exception(ErrorCodes::RESOURCE_NOT_FOUND, "Unable to access non-queue node at path '{}' for resource '{}'", path, resource_name);
+            }
+            else
+                throw Exception(ErrorCodes::RESOURCE_NOT_FOUND, "Path '{}' for resource '{}' does not exist", path, resource_name);
+        }
+        else
+            resources.emplace(resource_name, ResourceLink{}); // resource not configured yet - use unlimited resource
+    }
+}
+
+ResourceLink DynamicResourceManager::Classifier::get(const String & resource_name)
+{
+    if (auto iter = resources.find(resource_name); iter != resources.end())
+        return iter->second;
+    else
+        throw Exception(ErrorCodes::RESOURCE_ACCESS_DENIED, "Access denied to resource '{}'", resource_name);
+}
+
+DynamicResourceManager::DynamicResourceManager()
+    : state(new State())
+{
+    scheduler.start();
+}
+
+void DynamicResourceManager::updateConfiguration(const Poco::Util::AbstractConfiguration & config)
+{
+    StatePtr new_state = std::make_shared<State>(scheduler.event_queue, config);
+
+    std::lock_guard lock{mutex};
+
+    // Resource update leads to loss of runtime data of nodes and may lead to temporary violation of constraints (e.g. limits)
+    // Try to minimise this by reusing "equal" resources (initialized with the same configuration).
+    for (auto & [name, new_resource] : new_state->resources)
+    {
+        if (auto iter = state->resources.find(name); iter != state->resources.end()) // Resource update
+        {
+            State::ResourcePtr old_resource = iter->second;
+            if (old_resource->equals(*new_resource))
+                new_resource = old_resource; // Rewrite with older version to avoid loss of runtime data
+        }
+    }
+
+    // Commit new state
+    // NOTE: dtor will detach from scheduler old resources that are not in use currently
+    state = new_state;
+
+    // Attach new and updated resources to the scheduler
+    for (auto & [name, resource] : new_state->resources)
+    {
+        const SchedulerNodePtr & root = resource->nodes.find("/")->second.ptr;
+        if (root->parent == nullptr)
+        {
+            resource->attached_to = &scheduler;
+            scheduler.event_queue->enqueue([this, root]
+            {
+                scheduler.attachChild(root);
+            });
+        }
+    }
+
+    // NOTE: after mutex unlock `state` became available for Classifier(s) and must be immutable
+}
+
+ClassifierPtr DynamicResourceManager::acquire(const String & classifier_name)
+{
+    // Acquire a reference to the current state
+    StatePtr state_;
+    {
+        std::lock_guard lock{mutex};
+        state_ = state;
+    }
+
+    return std::make_shared<Classifier>(state_, classifier_name);
+}
+
+void registerDynamicResourceManager(ResourceManagerFactory & factory)
+{
+    factory.registerMethod<DynamicResourceManager>("dynamic");
+}
+
+}
diff --git a/src/IO/Resource/DynamicResourceManager.h b/src/IO/Resource/DynamicResourceManager.h
new file mode 100644
index 00000000000..aa1147f1fb2
--- /dev/null
+++ b/src/IO/Resource/DynamicResourceManager.h
@@ -0,0 +1,93 @@
+#pragma once
+
+#include <IO/IResourceManager.h>
+#include <IO/SchedulerRoot.h>
+#include <IO/Resource/ClassifiersConfig.h>
+
+#include <mutex>
+
+namespace DB
+{
+
+/*
+ * Implementation of `IResourceManager` supporting arbitrary dynamic hierarchy of scheduler nodes.
+ * All resources are controlled by single root `SchedulerRoot`.
+ *
+ * State of manager is set of resources attached to the scheduler. States are referenced by classifiers.
+ * Classifiers are used (1) to access resources and (2) to keep shared ownership of resources with pending
+ * resource requests. This allows `ResourceRequest` and `ResourceLink` to hold raw pointers as long as
+ * `ClassifierPtr` is acquired and held.
+ *
+ * Manager can update configuration after initialization. During update, new version of resources are also
+ * attached to scheduler, so multiple version can coexist for a short perid. This will violate constraints
+ * (e.g. in-fly-limit), because different version have independent nodes to impose constraints, the same
+ * violation will apply to fairness. Old version exists as long as there is at least one classifier
+ * instance referencing it. Classifiers are typically attached to queries and will be destructed with them.
+ */
+class DynamicResourceManager : public IResourceManager
+{
+public:
+    DynamicResourceManager();
+    void updateConfiguration(const Poco::Util::AbstractConfiguration & config) override;
+    ClassifierPtr acquire(const String & classifier_name) override;
+
+private:
+    /// Holds everything required to work with one specific configuration
+    struct State
+    {
+        struct Node
+        {
+            String type;
+            SchedulerNodePtr ptr;
+
+            Node(
+                const String & name,
+                EventQueue * event_queue,
+                const Poco::Util::AbstractConfiguration & config,
+                const std::string & config_prefix);
+            bool equals(const Node & o) const;
+        };
+
+        struct Resource
+        {
+            std::unordered_map<String, Node> nodes; // by path
+            SchedulerRoot * attached_to = nullptr;
+
+            Resource(
+                const String & name,
+                EventQueue * event_queue,
+                const Poco::Util::AbstractConfiguration & config,
+                const std::string & config_prefix);
+            ~Resource(); // unregisters resource from scheduler
+            bool equals(const Resource & o) const;
+        };
+
+        using ResourcePtr = std::shared_ptr<Resource>;
+
+        std::unordered_map<String, ResourcePtr> resources; // by name
+        ClassifiersConfig classifiers;
+
+        State() = default;
+        explicit State(EventQueue * event_queue, const Poco::Util::AbstractConfiguration & config);
+    };
+
+    using StatePtr = std::shared_ptr<State>;
+
+    /// Created per query, holds State used by that query
+    class Classifier : public IClassifier
+    {
+    public:
+        Classifier(const StatePtr & state_, const String & classifier_name);
+        ResourceLink get(const String & resource_name) override;
+    private:
+        std::unordered_map<String, ResourceLink> resources; // accessible resources by names
+        StatePtr state; // hold state to avoid ResourceLink invalidation due to resource deregistration from SchedulerRoot
+    };
+
+private:
+    SchedulerRoot scheduler;
+    std::mutex mutex;
+    StatePtr state;
+};
+
+}
diff --git a/src/IO/Resource/FairPolicy.cpp b/src/IO/Resource/FairPolicy.cpp
new file mode 100644
index 00000000000..248ff04cbd7
--- /dev/null
+++ b/src/IO/Resource/FairPolicy.cpp
@@ -0,0 +1,13 @@
+#include <IO/Resource/FairPolicy.h>
+
+#include <IO/SchedulerNodeFactory.h>
+
+namespace DB
+{
+
+void registerFairPolicy(SchedulerNodeFactory & factory)
+{
+    factory.registerMethod<FairPolicy>("fair");
+}
+
+}
diff --git a/src/IO/Resource/FairPolicy.h b/src/IO/Resource/FairPolicy.h
new file mode 100644
index 00000000000..9c0c78f057c
--- /dev/null
+++ b/src/IO/Resource/FairPolicy.h
@@ -0,0 +1,232 @@
+#pragma once
+
+#include <IO/ISchedulerQueue.h>
+#include <IO/SchedulerRoot.h>
+
+#include <Common/Stopwatch.h>
+
+#include <algorithm>
+#include <unordered_map>
+#include <vector>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INVALID_SCHEDULER_NODE;
+}
+
+/*
+ * Scheduler node that implements weight-based fair scheduling policy.
+ * Based on Start-time Fair Queueing (SFQ) algorithm.
+ *
+ * Algorithm description.
+ * Virtual runtime (total consumed cost divided by child weight) is tracked for every child.
+ * Active child with minimum vruntime is selected to be dequeued next. On activation, initial vruntime
+ * of a child is set to vruntime of "start" of the last request. This guarantees immediate processing
+ * of at least single request of newly activated children and thus best isolation and scheduling latency.
+ */
+class FairPolicy : public ISchedulerNode
+{
+    /// Scheduling state of a child
+    struct Item
+    {
+        ISchedulerNode * child = nullptr;
+        double vruntime = 0; /// total consumed cost divided by child weight
+
+        /// For min-heap by vruntime
+        bool operator<(const Item & rhs) const noexcept
+        {
+            return vruntime > rhs.vruntime;
+        }
+    };
+
+public:
+    explicit FairPolicy(EventQueue * event_queue_, const Poco::Util::AbstractConfiguration & config = emptyConfig(), const String & config_prefix = {})
+        : ISchedulerNode(event_queue_, config, config_prefix)
+    {}
+
+    bool equals(ISchedulerNode * other) override
+    {
+        if (auto * o = dynamic_cast<FairPolicy *>(other))
+            return true;
+        return false;
+    }
+
+    void attachChild(const SchedulerNodePtr & child) override
+    {
+        // Take ownership
+        if (auto [it, inserted] = children.emplace(child->basename, child); !inserted)
+            throw Exception(
+                ErrorCodes::INVALID_SCHEDULER_NODE,
+                "Can't add another child with the same path: {}",
+                it->second->getPath());
+
+        // Attach
+        child->setParent(this);
+
+        // At first attach as inactive child.
+        // Inactive attached child must have `info.parent.idx` equal it's index inside `items` array.
+        // This is needed to avoid later scanning through inactive `items` in O(N). Important optimization.
+        // NOTE: vruntime must be equal to `system_vruntime` for fairness.
+        child->info.parent.idx = items.size();
+        items.emplace_back(Item{child.get(), system_vruntime});
+
+        // Activate child if it is not empty
+        if (child->isActive())
+            activateChildImpl(items.size() - 1);
+    }
+
+    void removeChild(ISchedulerNode * child) override
+    {
+        if (auto iter = children.find(child->basename); iter != children.end())
+        {
+            SchedulerNodePtr removed = iter->second;
+
+            // Deactivate: detach is not very common operation, so we can afford O(N) here
+            size_t child_idx = 0;
+            [[ maybe_unused ]] bool found = false;
+            for (; child_idx != items.size(); child_idx++)
+            {
+                if (items[child_idx].child == removed.get())
+                {
+                    found = true;
+                    break;
+                }
+            }
+            assert(found);
+            if (child_idx < heap_size) // Detach of active child requires deactivation at first
+            {
+                heap_size--;
+                std::swap(items[child_idx], items[heap_size]);
+                // Element was removed from inside of heap -- heap must be rebuilt
+                std::make_heap(items.begin(), items.begin() + heap_size);
+                child_idx = heap_size;
+            }
+
+            // Now detach inactive child
+            if (child_idx != items.size() - 1)
+            {
+                std::swap(items[child_idx], items.back());
+                items[child_idx].child->info.parent.idx = child_idx;
+            }
+            items.pop_back();
+
+            // Detach
+            removed->setParent(nullptr);
+
+            // Get rid of ownership
+            children.erase(iter);
+        }
+    }
+
+    ISchedulerNode * getChild(const String & child_name) override
+    {
+        if (auto iter = children.find(child_name); iter != children.end())
+            return iter->second.get();
+        else
+            return nullptr;
+    }
+
+    std::pair<ResourceRequest *, bool> dequeueRequest() override
+    {
+        if (heap_size == 0)
+            return {nullptr, false};
+
+        // Recursively pull request from child
+        auto [request, child_active] = items.front().child->dequeueRequest();
+        assert(request != nullptr);
+        std::pop_heap(items.begin(), items.begin() + heap_size);
+        Item & current = items[heap_size - 1];
+
+        // SFQ fairness invariant: system vruntime equals last served request start-time
+        assert(current.vruntime >= system_vruntime);
+        system_vruntime = current.vruntime;
+
+        // By definition vruntime is amount of consumed resource (cost) divided by weight
+        current.vruntime += double(request->cost) / current.child->info.weight;
+        max_vruntime = std::max(max_vruntime, current.vruntime);
+
+        if (child_active) // Put active child back in heap after vruntime update
+        {
+            std::push_heap(items.begin(), items.begin() + heap_size);
+        }
+        else // Deactivate child if it is empty, but remember it's vruntime for latter activations
+        {
+            heap_size--;
+
+            // Store index of this inactive child in `parent.idx`
+            // This enables O(1) search of inactive children instead of O(n)
+            current.child->info.parent.idx = heap_size;
+        }
+
+        // Reset any difference between children on busy period end
+        if (heap_size == 0)
+        {
+            // Reset vtime to zero to avoid floating-point error accumulation,
+            // but do not reset too often, because it's O(N)
+            UInt64 ns = clock_gettime_ns();
+            if (last_reset_ns + 1000000000 < ns)
+            {
+                last_reset_ns = ns;
+                for (Item & item : items)
+                    item.vruntime = 0;
+                max_vruntime = 0;
+            }
+            system_vruntime = max_vruntime;
+        }
+
+        return {request, heap_size > 0};
+    }
+
+    bool isActive() override
+    {
+        return heap_size > 0;
+    }
+
+    void activateChild(ISchedulerNode * child) override
+    {
+        // Find this child; this is O(1), thanks to inactive index we hold in `parent.idx`
+        activateChildImpl(child->info.parent.idx);
+    }
+
+private:
+    void activateChildImpl(size_t inactive_idx)
+    {
+        bool activate_parent = heap_size == 0;
+
+        if (heap_size != inactive_idx)
+        {
+            std::swap(items[heap_size], items[inactive_idx]);
+            items[inactive_idx].child->info.parent.idx = inactive_idx;
+        }
+
+        // Newly activated child should have at least `system_vruntime` to keep fairness
+        items[heap_size].vruntime = std::max(system_vruntime, items[heap_size].vruntime);
+        heap_size++;
+        std::push_heap(items.begin(), items.begin() + heap_size);
+
+        // Recursive activation
+        if (activate_parent && parent)
+            parent->activateChild(this);
+    }
+
+private:
+    /// Beginning of `items` vector is heap of active children: [0; `heap_size`).
+    /// Next go inactive children in unsorted order.
+    /// NOTE: we have to track vruntime of inactive children for max-min fairness.
+    std::vector<Item> items;
+    size_t heap_size = 0;
+
+    /// Last request vruntime
+    double system_vruntime = 0;
+    double max_vruntime = 0;
+    UInt64 last_reset_ns = 0;
+
+    /// All children with ownership
+    std::unordered_map<String, SchedulerNodePtr> children; // basename -> child
+};
+
+}
diff --git a/src/IO/Resource/PriorityPolicy.h b/src/IO/Resource/PriorityPolicy.h
index 961f5af4d27..3c091dcc85a 100644
--- a/src/IO/Resource/PriorityPolicy.h
+++ b/src/IO/Resource/PriorityPolicy.h
@@ -26,12 +26,12 @@ class PriorityPolicy : public ISchedulerNode
     struct Item
     {
         ISchedulerNode * child = nullptr;
-        Int64 priority = 0; // higher value means higher priority
+        Priority priority; // lower value means higher priority
 
         /// For max-heap by priority
         bool operator<(const Item& rhs) const noexcept
         {
-            return priority < rhs.priority;
+            return priority > rhs.priority; // Reversed for heap top to yield highest priority (lowest value) child first
         }
     };
 
diff --git a/src/IO/Resource/registerResourceManagers.cpp b/src/IO/Resource/registerResourceManagers.cpp
index 0a394e3f0cd..5217bcdfbec 100644
--- a/src/IO/Resource/registerResourceManagers.cpp
+++ b/src/IO/Resource/registerResourceManagers.cpp
@@ -4,11 +4,13 @@
 namespace DB
 {
 
+void registerDynamicResourceManager(ResourceManagerFactory &);
 void registerStaticResourceManager(ResourceManagerFactory &);
 
 void registerResourceManagers()
 {
     auto & factory = ResourceManagerFactory::instance();
+    registerDynamicResourceManager(factory);
     registerStaticResourceManager(factory);
 }
 
diff --git a/src/IO/Resource/registerSchedulerNodes.cpp b/src/IO/Resource/registerSchedulerNodes.cpp
index 1b58b3981c2..896f96d7f50 100644
--- a/src/IO/Resource/registerSchedulerNodes.cpp
+++ b/src/IO/Resource/registerSchedulerNodes.cpp
@@ -8,6 +8,7 @@ namespace DB
 {
 
 void registerPriorityPolicy(SchedulerNodeFactory &);
+void registerFairPolicy(SchedulerNodeFactory &);
 void registerSemaphoreConstraint(SchedulerNodeFactory &);
 void registerFifoQueue(SchedulerNodeFactory &);
 
@@ -17,6 +18,7 @@ void registerSchedulerNodes()
 
     // ISchedulerNode
     registerPriorityPolicy(factory);
+    registerFairPolicy(factory);
 
     // ISchedulerConstraint
     registerSemaphoreConstraint(factory);
diff --git a/src/IO/Resource/tests/gtest_resource_class_fair.cpp b/src/IO/Resource/tests/gtest_resource_class_fair.cpp
new file mode 100644
index 00000000000..89ec2ac7c32
--- /dev/null
+++ b/src/IO/Resource/tests/gtest_resource_class_fair.cpp
@@ -0,0 +1,187 @@
+#include <gtest/gtest.h>
+
+#include <IO/Resource/tests/ResourceTest.h>
+
+#include <IO/Resource/FairPolicy.h>
+
+using namespace DB;
+
+using ResourceTest = ResourceTestClass;
+
+TEST(IOResourceFairPolicy, Factory)
+{
+    ResourceTest t;
+
+    Poco::AutoPtr cfg = new Poco::Util::XMLConfiguration();
+    SchedulerNodePtr fair = SchedulerNodeFactory::instance().get("fair", /* event_queue = */ nullptr, *cfg, "");
+    EXPECT_TRUE(dynamic_cast<FairPolicy *>(fair.get()) != nullptr);
+}
+
+TEST(IOResourceFairPolicy, FairnessWeights)
+{
+    ResourceTest t;
+
+    t.add<FairPolicy>("/");
+    t.add<FifoQueue>("/A", "<weight>1.0</weight>");
+    t.add<FifoQueue>("/B", "<weight>3.0</weight>");
+
+    t.enqueue("/A", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/B", {10, 10, 10, 10, 10, 10, 10, 10});
+
+    t.dequeue(4);
+    t.consumed("A", 10);
+    t.consumed("B", 30);
+
+    t.dequeue(4);
+    t.consumed("A", 10);
+    t.consumed("B", 30);
+
+    t.dequeue();
+    t.consumed("A", 60);
+    t.consumed("B", 20);
+}
+
+TEST(IOResourceFairPolicy, Activation)
+{
+    ResourceTest t;
+
+    t.add<FairPolicy>("/");
+    t.add<FifoQueue>("/A");
+    t.add<FifoQueue>("/B");
+    t.add<FifoQueue>("/C");
+
+    t.enqueue("/A", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/B", {10});
+    t.enqueue("/C", {10, 10});
+
+    t.dequeue(3);
+    t.consumed("A", 10);
+    t.consumed("B", 10);
+    t.consumed("C", 10);
+
+    t.dequeue(4);
+    t.consumed("A", 30);
+    t.consumed("B", 0);
+    t.consumed("C", 10);
+
+    t.enqueue("/B", {10, 10});
+    t.dequeue(1);
+    t.consumed("B", 10);
+
+    t.enqueue("/C", {10, 10});
+    t.dequeue(1);
+    t.consumed("C", 10);
+
+    t.dequeue(2); // A B or B A
+    t.consumed("A", 10);
+    t.consumed("B", 10);
+}
+
+TEST(IOResourceFairPolicy, FairnessMaxMin)
+{
+    ResourceTest t;
+
+    t.add<FairPolicy>("/");
+    t.add<FifoQueue>("/A");
+    t.add<FifoQueue>("/B");
+
+    t.enqueue("/A", {10, 10}); // make sure A is never empty
+
+    for (int i = 0; i < 10; i++)
+    {
+        t.enqueue("/A", {10, 10, 10, 10});
+        t.enqueue("/B", {10, 10});
+
+        t.dequeue(6);
+        t.consumed("A", 40);
+        t.consumed("B", 20);
+    }
+
+    t.dequeue(2);
+    t.consumed("A", 20);
+}
+
+TEST(IOResourceFairPolicy, HierarchicalFairness)
+{
+    ResourceTest t;
+
+    t.add<FairPolicy>("/");
+    t.add<FairPolicy>("/X");
+    t.add<FairPolicy>("/Y");
+    t.add<FifoQueue>("/X/A");
+    t.add<FifoQueue>("/X/B");
+    t.add<FifoQueue>("/Y/C");
+    t.add<FifoQueue>("/Y/D");
+
+    t.enqueue("/X/A", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/X/B", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/C", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/D", {10, 10, 10, 10, 10, 10, 10, 10});
+    for (int i = 0; i < 4; i++)
+    {
+        t.dequeue(8);
+        t.consumed("A", 20);
+        t.consumed("B", 20);
+        t.consumed("C", 20);
+        t.consumed("D", 20);
+    }
+
+    t.enqueue("/X/A", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/X/A", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/C", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/D", {10, 10, 10, 10, 10, 10, 10, 10});
+    for (int i = 0; i < 4; i++)
+    {
+        t.dequeue(8);
+        t.consumed("A", 40);
+        t.consumed("C", 20);
+        t.consumed("D", 20);
+    }
+
+    t.enqueue("/X/B", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/X/B", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/C", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/D", {10, 10, 10, 10, 10, 10, 10, 10});
+    for (int i = 0; i < 4; i++)
+    {
+        t.dequeue(8);
+        t.consumed("B", 40);
+        t.consumed("C", 20);
+        t.consumed("D", 20);
+    }
+
+    t.enqueue("/X/A", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/X/B", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/C", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/C", {10, 10, 10, 10, 10, 10, 10, 10});
+    for (int i = 0; i < 4; i++)
+    {
+        t.dequeue(8);
+        t.consumed("A", 20);
+        t.consumed("B", 20);
+        t.consumed("C", 40);
+    }
+
+    t.enqueue("/X/A", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/X/B", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/D", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/D", {10, 10, 10, 10, 10, 10, 10, 10});
+    for (int i = 0; i < 4; i++)
+    {
+        t.dequeue(8);
+        t.consumed("A", 20);
+        t.consumed("B", 20);
+        t.consumed("D", 40);
+    }
+
+    t.enqueue("/X/A", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/X/A", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/D", {10, 10, 10, 10, 10, 10, 10, 10});
+    t.enqueue("/Y/D", {10, 10, 10, 10, 10, 10, 10, 10});
+    for (int i = 0; i < 4; i++)
+    {
+        t.dequeue(8);
+        t.consumed("A", 40);
+        t.consumed("D", 40);
+    }
+}
diff --git a/src/IO/Resource/tests/gtest_resource_class_priority.cpp b/src/IO/Resource/tests/gtest_resource_class_priority.cpp
index 9e1a55a0741..83902453ed4 100644
--- a/src/IO/Resource/tests/gtest_resource_class_priority.cpp
+++ b/src/IO/Resource/tests/gtest_resource_class_priority.cpp
@@ -22,9 +22,9 @@ TEST(IOResourcePriorityPolicy, Priorities)
     ResourceTest t;
 
     t.add<PriorityPolicy>("/");
-    t.add<FifoQueue>("/A", "<priority>1</priority>");
+    t.add<FifoQueue>("/A", "<priority>3</priority>");
     t.add<FifoQueue>("/B", "<priority>2</priority>");
-    t.add<FifoQueue>("/C", "<priority>3</priority>");
+    t.add<FifoQueue>("/C", "<priority>1</priority>");
 
     t.enqueue("/A", {10, 10, 10});
     t.enqueue("/B", {10, 10, 10});
@@ -56,9 +56,9 @@ TEST(IOResourcePriorityPolicy, Activation)
     ResourceTest t;
 
     t.add<PriorityPolicy>("/");
-    t.add<FifoQueue>("/A", "<priority>1</priority>");
+    t.add<FifoQueue>("/A", "<priority>3</priority>");
     t.add<FifoQueue>("/B", "<priority>2</priority>");
-    t.add<FifoQueue>("/C", "<priority>3</priority>");
+    t.add<FifoQueue>("/C", "<priority>1</priority>");
 
     t.enqueue("/A", {10, 10, 10, 10, 10, 10});
     t.enqueue("/B", {10});
diff --git a/src/IO/Resource/tests/gtest_resource_manager_hierarchical.cpp b/src/IO/Resource/tests/gtest_resource_manager_hierarchical.cpp
new file mode 100644
index 00000000000..43773559f03
--- /dev/null
+++ b/src/IO/Resource/tests/gtest_resource_manager_hierarchical.cpp
@@ -0,0 +1,115 @@
+#include <gtest/gtest.h>
+
+#include <IO/Resource/tests/ResourceTest.h>
+
+#include <IO/Resource/DynamicResourceManager.h>
+#include <Poco/Util/XMLConfiguration.h>
+
+using namespace DB;
+
+using ResourceTest = ResourceTestManager<DynamicResourceManager>;
+using TestGuard = ResourceTest::Guard;
+
+TEST(IOResourceDynamicResourceManager, Smoke)
+{
+    ResourceTest t;
+
+    t.update(R"CONFIG(
+        <clickhouse>
+            <resources>
+                <res1>
+                    <node path="/"><type>inflight_limit</type><max_requests>10</max_requests></node>
+                    <node path="/fair"><type>fair</type></node>
+                    <node path="/fair/A"><type>fifo</type></node>
+                    <node path="/fair/B"><type>fifo</type><weight>3</weight></node>
+                </res1>
+            </resources>
+            <classifiers>
+                <A><res1>/fair/A</res1></A>
+                <B><res1>/fair/B</res1></B>
+            </classifiers>
+        </clickhouse>
+    )CONFIG");
+
+    ClassifierPtr cA = t.manager->acquire("A");
+    ClassifierPtr cB = t.manager->acquire("B");
+
+    for (int i = 0; i < 10; i++)
+    {
+        ResourceGuard gA(cA->get("res1"), ResourceGuard::PostponeLocking);
+        gA.lock();
+        gA.setFailure();
+        gA.unlock();
+
+        ResourceGuard gB(cB->get("res1"));
+    }
+}
+
+TEST(IOResourceDynamicResourceManager, Fairness)
+{
+    // Total cost for A and B cannot differ for more than 1 (every request has cost equal to 1).
+    // Requests from A use `value = 1` and from B `value = -1` is used.
+    std::atomic<Int64> unfairness = 0;
+    auto fairness_diff = [&] (Int64 value)
+    {
+        Int64 cur_unfairness = unfairness.fetch_add(value, std::memory_order_relaxed) + value;
+        EXPECT_NEAR(cur_unfairness, 0, 1);
+    };
+
+    constexpr size_t threads_per_queue = 3;
+    int requests_per_thread = 100;
+    ResourceTest t(2 * threads_per_queue + 1);
+
+    t.update(R"CONFIG(
+        <clickhouse>
+            <resources>
+                <res1>
+                    <node path="/">           <type>inflight_limit</type><max_requests>1</max_requests></node>
+                    <node path="/fair">       <type>fair</type></node>
+                    <node path="/fair/A">     <type>fifo</type></node>
+                    <node path="/fair/B">     <type>fifo</type></node>
+                    <node path="/fair/leader"><type>fifo</type></node>
+                </res1>
+            </resources>
+            <classifiers>
+                <A><res1>/fair/A</res1></A>
+                <B><res1>/fair/B</res1></B>
+                <leader><res1>/fair/leader</res1></leader>
+            </classifiers>
+        </clickhouse>
+    )CONFIG");
+
+    for (int thread = 0; thread < threads_per_queue; thread++)
+    {
+        t.threads.emplace_back([&]
+        {
+            ClassifierPtr c = t.manager->acquire("A");
+            ResourceLink link = c->get("res1");
+            t.startBusyPeriod(link, 1, requests_per_thread);
+            for (int request = 0; request < requests_per_thread; request++)
+            {
+                TestGuard g(t, link, 1);
+                fairness_diff(1);
+            }
+        });
+    }
+
+    for (int thread = 0; thread < threads_per_queue; thread++)
+    {
+        t.threads.emplace_back([&]
+        {
+            ClassifierPtr c = t.manager->acquire("B");
+            ResourceLink link = c->get("res1");
+            t.startBusyPeriod(link, 1, requests_per_thread);
+            for (int request = 0; request < requests_per_thread; request++)
+            {
+                TestGuard g(t, link, 1);
+                fairness_diff(-1);
+            }
+        });
+    }
+
+    ClassifierPtr c = t.manager->acquire("leader");
+    ResourceLink link = c->get("res1");
+    t.blockResource(link);
+}
diff --git a/src/IO/Resource/tests/gtest_resource_manager_static.cpp b/src/IO/Resource/tests/gtest_resource_manager_static.cpp
index cd426b1a6bc..091f6923714 100644
--- a/src/IO/Resource/tests/gtest_resource_manager_static.cpp
+++ b/src/IO/Resource/tests/gtest_resource_manager_static.cpp
@@ -44,6 +44,15 @@ TEST(IOResourceStaticResourceManager, Smoke)
 
 TEST(IOResourceStaticResourceManager, Prioritization)
 {
+    std::optional<Int64> last_priority;
+    auto check = [&] (Int64 priority)
+    {
+        // Lock is not required here because this is called during request execution and we have max_requests = 1
+        if (last_priority)
+            EXPECT_TRUE(priority >= *last_priority); // Should be true if every queue arrived at the same time at busy period start
+        last_priority = priority;
+    };
+
     constexpr size_t threads_per_queue = 2;
     int requests_per_thead = 100;
     ResourceTest t(4 * threads_per_queue + 1);
@@ -54,8 +63,8 @@ TEST(IOResourceStaticResourceManager, Prioritization)
                 <res1>
                     <node path="/">           <type>inflight_limit</type><max_requests>1</max_requests></node>
                     <node path="/prio">       <type>priority</type></node>
-                    <node path="/prio/A">     <priority>-1</priority></node>
-                    <node path="/prio/B">     <priority>1</priority></node>
+                    <node path="/prio/A">     <priority>1</priority></node>
+                    <node path="/prio/B">     <priority>-1</priority></node>
                     <node path="/prio/C">     </node>
                     <node path="/prio/D">     </node>
                     <node path="/prio/leader"></node>
@@ -71,15 +80,6 @@ TEST(IOResourceStaticResourceManager, Prioritization)
         </clickhouse>
     )CONFIG");
 
-    std::optional<Int64> last_priority;
-    auto check = [&] (Int64 priority)
-    {
-        // Lock is not required here because this is called during request execution and we have max_requests = 1
-        if (last_priority)
-            EXPECT_TRUE(priority <= *last_priority); // Should be true if every queue arrived at the same time at busy period start
-        last_priority = priority;
-    };
-
     for (String name : {"A", "B", "C", "D"})
     {
         for (int thr = 0; thr < threads_per_queue; thr++)
diff --git a/src/IO/S3/AWSLogger.cpp b/src/IO/S3/AWSLogger.cpp
index 48c30ccf881..d6162823aee 100644
--- a/src/IO/S3/AWSLogger.cpp
+++ b/src/IO/S3/AWSLogger.cpp
@@ -2,7 +2,10 @@
 
 #if USE_AWS_S3
 
+#include <Core/SettingsEnums.h>
+#include <Common/logger_useful.h>
 #include <aws/core/utils/logging/LogLevel.h>
+#include <Poco/Logger.h>
 
 namespace
 {
diff --git a/src/IO/S3/AWSLogger.h b/src/IO/S3/AWSLogger.h
index 897c0e8d964..fdb6eed1f86 100644
--- a/src/IO/S3/AWSLogger.h
+++ b/src/IO/S3/AWSLogger.h
@@ -4,8 +4,10 @@
 
 #if USE_AWS_S3
 #include <aws/core/utils/logging/LogSystemInterface.h>
+#include <base/types.h>
+#include <unordered_map>
 
-#include <Common/logger_useful.h>
+namespace Poco { class Logger; }
 
 namespace DB::S3
 {
diff --git a/src/IO/S3/Client.cpp b/src/IO/S3/Client.cpp
index 5c0539ee486..668b1a3959d 100644
--- a/src/IO/S3/Client.cpp
+++ b/src/IO/S3/Client.cpp
@@ -2,6 +2,7 @@
 
 #if USE_AWS_S3
 
+#include <aws/core/client/CoreErrors.h>
 #include <aws/core/client/DefaultRetryStrategy.h>
 #include <aws/s3/model/HeadBucketRequest.h>
 #include <aws/s3/model/GetObjectRequest.h>
@@ -10,6 +11,7 @@
 #include <aws/core/client/AWSErrorMarshaller.h>
 #include <aws/core/endpoint/EndpointParameter.h>
 #include <aws/core/utils/HashingUtils.h>
+#include <aws/core/utils/logging/ErrorMacros.h>
 
 #include <IO/S3Common.h>
 #include <IO/S3/Requests.h>
@@ -96,6 +98,7 @@ void verifyClientConfiguration(const Aws::Client::ClientConfiguration & client_c
 
 std::unique_ptr<Client> Client::create(
     size_t max_redirects_,
+    ServerSideEncryptionKMSConfig sse_kms_config_,
     const std::shared_ptr<Aws::Auth::AWSCredentialsProvider> & credentials_provider,
     const Aws::Client::ClientConfiguration & client_configuration,
     Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy sign_payloads,
@@ -103,7 +106,7 @@ std::unique_ptr<Client> Client::create(
 {
     verifyClientConfiguration(client_configuration);
     return std::unique_ptr<Client>(
-        new Client(max_redirects_, credentials_provider, client_configuration, sign_payloads, use_virtual_addressing));
+        new Client(max_redirects_, std::move(sse_kms_config_), credentials_provider, client_configuration, sign_payloads, use_virtual_addressing));
 }
 
 std::unique_ptr<Client> Client::create(const Client & other)
@@ -111,21 +114,62 @@ std::unique_ptr<Client> Client::create(const Client & other)
     return std::unique_ptr<Client>(new Client(other));
 }
 
+namespace
+{
+
+ProviderType deduceProviderType(const std::string & url)
+{
+    if (url.find(".amazonaws.com") != std::string::npos)
+        return ProviderType::AWS;
+
+    if (url.find("storage.googleapis.com") != std::string::npos)
+        return ProviderType::GCS;
+
+    return ProviderType::UNKNOWN;
+}
+
+}
+
 Client::Client(
     size_t max_redirects_,
-    const std::shared_ptr<Aws::Auth::AWSCredentialsProvider> & credentials_provider,
+    ServerSideEncryptionKMSConfig sse_kms_config_,
+    const std::shared_ptr<Aws::Auth::AWSCredentialsProvider> & credentials_provider_,
     const Aws::Client::ClientConfiguration & client_configuration,
     Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy sign_payloads,
     bool use_virtual_addressing)
-    : Aws::S3::S3Client(credentials_provider, client_configuration, std::move(sign_payloads), use_virtual_addressing)
+    : Aws::S3::S3Client(credentials_provider_, client_configuration, std::move(sign_payloads), use_virtual_addressing)
+    , credentials_provider(credentials_provider_)
     , max_redirects(max_redirects_)
+    , sse_kms_config(std::move(sse_kms_config_))
     , log(&Poco::Logger::get("S3Client"))
 {
     auto * endpoint_provider = dynamic_cast<Aws::S3::Endpoint::S3DefaultEpProviderBase *>(accessEndpointProvider().get());
     endpoint_provider->GetBuiltInParameters().GetParameter("Region").GetString(explicit_region);
-    std::string endpoint;
-    endpoint_provider->GetBuiltInParameters().GetParameter("Endpoint").GetString(endpoint);
-    detect_region = explicit_region == Aws::Region::AWS_GLOBAL && endpoint.find(".amazonaws.com") != std::string::npos;
+    endpoint_provider->GetBuiltInParameters().GetParameter("Endpoint").GetString(initial_endpoint);
+
+    provider_type = deduceProviderType(initial_endpoint);
+    LOG_TRACE(log, "Provider type: {}", toString(provider_type));
+
+    if (provider_type == ProviderType::GCS)
+    {
+        /// GCS can operate in 2 modes for header and query params names:
+        /// - with both x-amz and x-goog prefixes allowed (but cannot mix different prefixes in same request)
+        /// - only with x-goog prefix
+        /// first mode is allowed only with HMAC (or unsigned requests) so when we
+        /// find credential keys we can simply behave as the underlying storage is S3
+        /// otherwise, we need to be aware we are making requests to GCS
+        /// and replace all headers with a valid prefix when needed
+        if (credentials_provider)
+        {
+            auto credentials = credentials_provider->GetAWSCredentials();
+            if (credentials.IsEmpty())
+                api_mode = ApiMode::GCS;
+        }
+    }
+
+    LOG_TRACE(log, "API mode: {}", toString(api_mode));
+
+    detect_region = provider_type == ProviderType::AWS && explicit_region == Aws::Region::AWS_GLOBAL;
 
     cache = std::make_shared<ClientCache>();
     ClientCacheRegistry::instance().registerClient(cache);
@@ -133,15 +177,24 @@ Client::Client(
 
 Client::Client(const Client & other)
     : Aws::S3::S3Client(other)
+    , initial_endpoint(other.initial_endpoint)
+    , credentials_provider(other.credentials_provider)
     , explicit_region(other.explicit_region)
     , detect_region(other.detect_region)
+    , provider_type(other.provider_type)
     , max_redirects(other.max_redirects)
+    , sse_kms_config(other.sse_kms_config)
     , log(&Poco::Logger::get("S3Client"))
 {
     cache = std::make_shared<ClientCache>(*other.cache);
     ClientCacheRegistry::instance().registerClient(cache);
 }
 
+Aws::Auth::AWSCredentials Client::getCredentials() const
+{
+    return credentials_provider->GetAWSCredentials();
+}
+
 bool Client::checkIfWrongRegionDefined(const std::string & bucket, const Aws::S3::S3Error & error, std::string & region) const
 {
     if (detect_region)
@@ -173,10 +226,34 @@ void Client::insertRegionOverride(const std::string & bucket, const std::string
         LOG_INFO(log, "Detected different region ('{}') for bucket {} than the one defined ('{}')", region, bucket, explicit_region);
 }
 
+template <typename RequestType>
+void Client::setKMSHeaders(RequestType & request) const
+{
+    // Don't do anything unless a key ID was specified
+    if (sse_kms_config.key_id)
+    {
+        request.SetServerSideEncryption(Model::ServerSideEncryption::aws_kms);
+        // If the key ID was specified but is empty, treat it as using the AWS managed key and omit the header
+        if (!sse_kms_config.key_id->empty())
+            request.SetSSEKMSKeyId(*sse_kms_config.key_id);
+        if (sse_kms_config.encryption_context)
+            request.SetSSEKMSEncryptionContext(*sse_kms_config.encryption_context);
+        if (sse_kms_config.bucket_key_enabled)
+            request.SetBucketKeyEnabled(*sse_kms_config.bucket_key_enabled);
+    }
+}
+
+// Explicitly instantiate this method only for the request types that support KMS headers
+template void Client::setKMSHeaders<CreateMultipartUploadRequest>(CreateMultipartUploadRequest & request) const;
+template void Client::setKMSHeaders<CopyObjectRequest>(CopyObjectRequest & request) const;
+template void Client::setKMSHeaders<PutObjectRequest>(PutObjectRequest & request) const;
+
 Model::HeadObjectOutcome Client::HeadObject(const HeadObjectRequest & request) const
 {
     const auto & bucket = request.GetBucket();
 
+    request.setApiMode(api_mode);
+
     if (auto region = getRegionForBucket(bucket); !region.empty())
     {
         if (!detect_region)
@@ -187,7 +264,7 @@ Model::HeadObjectOutcome Client::HeadObject(const HeadObjectRequest & request) c
     if (auto uri = getURIForBucket(bucket); uri.has_value())
         request.overrideURI(std::move(*uri));
 
-    auto result = Aws::S3::S3Client::HeadObject(request);
+    auto result = HeadObject(static_cast<const Model::HeadObjectRequest&>(request));
     if (result.IsSuccess())
         return result;
 
@@ -244,70 +321,128 @@ Model::HeadObjectOutcome Client::HeadObject(const HeadObjectRequest & request) c
 
     request.overrideURI(std::move(*bucket_uri));
 
-    return Aws::S3::S3Client::HeadObject(request);
+    /// The next call is NOT a recurcive call
+    /// This is a virtuall call Aws::S3::S3Client::HeadObject(const Model::HeadObjectRequest&)
+    return HeadObject(static_cast<const Model::HeadObjectRequest&>(request));
 }
 
+/// For each request, we wrap the request functions from Aws::S3::Client with doRequest
+/// doRequest calls virtuall function from Aws::S3::Client while DB::S3::Client has not virtual calls for each request type
+
 Model::ListObjectsV2Outcome Client::ListObjectsV2(const ListObjectsV2Request & request) const
 {
-    return doRequest(request, [this](const Model::ListObjectsV2Request & req) { return Aws::S3::S3Client::ListObjectsV2(req); });
+    return doRequest(request, [this](const Model::ListObjectsV2Request & req) { return ListObjectsV2(req); });
 }
 
 Model::ListObjectsOutcome Client::ListObjects(const ListObjectsRequest & request) const
 {
-    return doRequest(request, [this](const Model::ListObjectsRequest & req) { return Aws::S3::S3Client::ListObjects(req); });
+    return doRequest(request, [this](const Model::ListObjectsRequest & req) { return ListObjects(req); });
 }
 
 Model::GetObjectOutcome Client::GetObject(const GetObjectRequest & request) const
 {
-    return doRequest(request, [this](const Model::GetObjectRequest & req) { return Aws::S3::S3Client::GetObject(req); });
+    return doRequest(request, [this](const Model::GetObjectRequest & req) { return GetObject(req); });
 }
 
 Model::AbortMultipartUploadOutcome Client::AbortMultipartUpload(const AbortMultipartUploadRequest & request) const
 {
     return doRequest(
-        request, [this](const Model::AbortMultipartUploadRequest & req) { return Aws::S3::S3Client::AbortMultipartUpload(req); });
+        request, [this](const Model::AbortMultipartUploadRequest & req) { return AbortMultipartUpload(req); });
 }
 
 Model::CreateMultipartUploadOutcome Client::CreateMultipartUpload(const CreateMultipartUploadRequest & request) const
 {
     return doRequest(
-        request, [this](const Model::CreateMultipartUploadRequest & req) { return Aws::S3::S3Client::CreateMultipartUpload(req); });
+        request, [this](const Model::CreateMultipartUploadRequest & req) { return CreateMultipartUpload(req); });
 }
 
 Model::CompleteMultipartUploadOutcome Client::CompleteMultipartUpload(const CompleteMultipartUploadRequest & request) const
 {
-    return doRequest(
-        request, [this](const Model::CompleteMultipartUploadRequest & req) { return Aws::S3::S3Client::CompleteMultipartUpload(req); });
+    auto outcome = doRequest(
+        request, [this](const Model::CompleteMultipartUploadRequest & req) { return CompleteMultipartUpload(req); });
+
+    if (!outcome.IsSuccess() || provider_type != ProviderType::GCS)
+        return outcome;
+
+    const auto & key = request.GetKey();
+    const auto & bucket = request.GetBucket();
+
+    /// For GCS we will try to compose object at the end, otherwise we cannot do a native copy
+    /// for the object (e.g. for backups)
+    /// We don't care if the compose fails, because the upload was still successful, only the
+    /// performance for copying the object will be affected
+    S3::ComposeObjectRequest compose_req;
+    compose_req.SetBucket(bucket);
+    compose_req.SetKey(key);
+    compose_req.SetComponentNames({key});
+    compose_req.SetContentType("binary/octet-stream");
+    auto compose_outcome = ComposeObject(compose_req);
+
+    if (compose_outcome.IsSuccess())
+        LOG_TRACE(log, "Composing object was successful");
+    else
+        LOG_INFO(log, "Failed to compose object. Message: {}, Key: {}, Bucket: {}", compose_outcome.GetError().GetMessage(), key, bucket);
+
+    return outcome;
 }
 
 Model::CopyObjectOutcome Client::CopyObject(const CopyObjectRequest & request) const
 {
-    return doRequest(request, [this](const Model::CopyObjectRequest & req) { return Aws::S3::S3Client::CopyObject(req); });
+    return doRequest(request, [this](const Model::CopyObjectRequest & req) { return CopyObject(req); });
 }
 
 Model::PutObjectOutcome Client::PutObject(const PutObjectRequest & request) const
 {
-    return doRequest(request, [this](const Model::PutObjectRequest & req) { return Aws::S3::S3Client::PutObject(req); });
+    return doRequest(request, [this](const Model::PutObjectRequest & req) { return PutObject(req); });
 }
 
 Model::UploadPartOutcome Client::UploadPart(const UploadPartRequest & request) const
 {
-    return doRequest(request, [this](const Model::UploadPartRequest & req) { return Aws::S3::S3Client::UploadPart(req); });
+    return doRequest(request, [this](const Model::UploadPartRequest & req) { return UploadPart(req); });
 }
 
 Model::UploadPartCopyOutcome Client::UploadPartCopy(const UploadPartCopyRequest & request) const
 {
-    return doRequest(request, [this](const Model::UploadPartCopyRequest & req) { return Aws::S3::S3Client::UploadPartCopy(req); });
+    return doRequest(request, [this](const Model::UploadPartCopyRequest & req) { return UploadPartCopy(req); });
 }
 
 Model::DeleteObjectOutcome Client::DeleteObject(const DeleteObjectRequest & request) const
 {
-    return doRequest(request, [this](const Model::DeleteObjectRequest & req) { return Aws::S3::S3Client::DeleteObject(req); });
+    return doRequest(request, [this](const Model::DeleteObjectRequest & req) { return DeleteObject(req); });
 }
 
 Model::DeleteObjectsOutcome Client::DeleteObjects(const DeleteObjectsRequest & request) const
 {
-    return doRequest(request, [this](const Model::DeleteObjectsRequest & req) { return Aws::S3::S3Client::DeleteObjects(req); });
+    return doRequest(request, [this](const Model::DeleteObjectsRequest & req) { return DeleteObjects(req); });
+}
+
+Client::ComposeObjectOutcome Client::ComposeObject(const ComposeObjectRequest & request) const
+{
+    auto request_fn = [this](const ComposeObjectRequest & req)
+    {
+        auto & endpoint_provider = const_cast<Client &>(*this).accessEndpointProvider();
+        AWS_OPERATION_CHECK_PTR(endpoint_provider, ComposeObject, Aws::Client::CoreErrors, Aws::Client::CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+
+        if (!req.BucketHasBeenSet())
+        {
+            AWS_LOGSTREAM_ERROR("ComposeObject", "Required field: Bucket, is not set")
+            return ComposeObjectOutcome(Aws::Client::AWSError<Aws::S3::S3Errors>(Aws::S3::S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Bucket]", false));
+        }
+
+        if (!req.KeyHasBeenSet())
+        {
+            AWS_LOGSTREAM_ERROR("ComposeObject", "Required field: Key, is not set")
+            return ComposeObjectOutcome(Aws::Client::AWSError<Aws::S3::S3Errors>(Aws::S3::S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Key]", false));
+        }
+
+        auto endpointResolutionOutcome = endpoint_provider->ResolveEndpoint(req.GetEndpointContextParams());
+        AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, ComposeObject, Aws::Client::CoreErrors, Aws::Client::CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+        endpointResolutionOutcome.GetResult().AddPathSegments(req.GetKey());
+        endpointResolutionOutcome.GetResult().SetQueryString("?compose");
+        return ComposeObjectOutcome(MakeRequest(req, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT));
+    };
+
+    return doRequest(request, request_fn);
 }
 
 template <typename RequestType, typename RequestFn>
@@ -315,6 +450,7 @@ std::invoke_result_t<RequestFn, RequestType>
 Client::doRequest(const RequestType & request, RequestFn request_fn) const
 {
     const auto & bucket = request.GetBucket();
+    request.setApiMode(api_mode);
 
     if (auto region = getRegionForBucket(bucket); !region.empty())
     {
@@ -387,6 +523,25 @@ Client::doRequest(const RequestType & request, RequestFn request_fn) const
     throw Exception(ErrorCodes::TOO_MANY_REDIRECTS, "Too many redirects");
 }
 
+bool Client::supportsMultiPartCopy() const
+{
+    return provider_type != ProviderType::GCS;
+}
+
+void Client::BuildHttpRequest(const Aws::AmazonWebServiceRequest& request,
+                      const std::shared_ptr<Aws::Http::HttpRequest>& httpRequest) const
+{
+    Aws::S3::S3Client::BuildHttpRequest(request, httpRequest);
+
+    if (api_mode == ApiMode::GCS)
+    {
+        /// some GCS requests don't like S3 specific headers that the client sets
+        httpRequest->DeleteHeader("x-amz-api-version");
+        httpRequest->DeleteHeader("amz-sdk-invocation-id");
+        httpRequest->DeleteHeader("amz-sdk-request");
+    }
+}
+
 std::string Client::getRegionForBucket(const std::string & bucket, bool force_detect) const
 {
     std::lock_guard lock(cache->region_cache_mutex);
@@ -396,7 +551,6 @@ std::string Client::getRegionForBucket(const std::string & bucket, bool force_de
     if (!force_detect && !detect_region)
         return "";
 
-
     LOG_INFO(log, "Resolving region for bucket {}", bucket);
     Aws::S3::Model::HeadBucketRequest req;
     req.SetBucket(bucket);
@@ -562,9 +716,10 @@ std::unique_ptr<S3::Client> ClientFactory::create( // NOLINT
     const String & access_key_id,
     const String & secret_access_key,
     const String & server_side_encryption_customer_key_base64,
+    ServerSideEncryptionKMSConfig sse_kms_config,
     HTTPHeaderEntries headers,
-    bool use_environment_credentials,
-    bool use_insecure_imds_request)
+    CredentialsConfiguration credentials_configuration,
+    const String & session_token)
 {
     PocoHTTPClientConfiguration client_configuration = cfg_;
     client_configuration.updateSchemeAndRegion();
@@ -585,18 +740,19 @@ std::unique_ptr<S3::Client> ClientFactory::create( // NOLINT
             Aws::Utils::HashingUtils::Base64Encode(Aws::Utils::HashingUtils::CalculateMD5(str_buffer))});
     }
 
+    // These will be added after request signing
     client_configuration.extra_headers = std::move(headers);
 
-    Aws::Auth::AWSCredentials credentials(access_key_id, secret_access_key);
+    Aws::Auth::AWSCredentials credentials(access_key_id, secret_access_key, session_token);
     auto credentials_provider = std::make_shared<S3CredentialsProviderChain>(
             client_configuration,
             std::move(credentials),
-            use_environment_credentials,
-            use_insecure_imds_request);
+            credentials_configuration);
 
     client_configuration.retryStrategy = std::make_shared<Client::RetryStrategy>(std::move(client_configuration.retryStrategy));
     return Client::create(
         client_configuration.s3_max_redirects,
+        std::move(sse_kms_config),
         credentials_provider,
         client_configuration, // Client configuration.
         Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
diff --git a/src/IO/S3/Client.h b/src/IO/S3/Client.h
index 18ba62d1006..e1b99c893a6 100644
--- a/src/IO/S3/Client.h
+++ b/src/IO/S3/Client.h
@@ -1,16 +1,37 @@
 #pragma once
 
+#include <optional>
+#include <base/types.h>
+
 #include "config.h"
 
+namespace DB::S3
+{
+
+/// See https://docs.aws.amazon.com/AmazonS3/latest/userguide/specifying-kms-encryption.html
+/// Needed by S3Common.h even if USE_AWS_S3 is 0
+struct ServerSideEncryptionKMSConfig
+{
+    // If key_id is non-null, enable SSE-KMS. If key_id is "", use the AWS managed key
+    std::optional<String> key_id = std::nullopt;
+    std::optional<String> encryption_context = std::nullopt;
+    std::optional<bool> bucket_key_enabled = std::nullopt;
+
+    bool operator==(const ServerSideEncryptionKMSConfig & other) const = default;
+};
+
+}
+
 #if USE_AWS_S3
 
-#include <Common/logger_useful.h>
 #include <Common/assert_cast.h>
 #include <base/scope_guard.h>
 
 #include <IO/S3/URI.h>
 #include <IO/S3/Requests.h>
 #include <IO/S3/PocoHTTPClient.h>
+#include <IO/S3/Credentials.h>
+#include <IO/S3/ProviderType.h>
 
 #include <aws/core/Aws.h>
 #include <aws/core/client/DefaultRetryStrategy.h>
@@ -19,6 +40,11 @@
 #include <aws/core/client/AWSErrorMarshaller.h>
 #include <aws/core/client/RetryStrategy.h>
 
+namespace MockS3
+{
+    struct Client;
+}
+
 namespace DB::S3
 {
 
@@ -84,6 +110,7 @@ public:
     /// e.g. Client::RetryStrategy should be used
     static std::unique_ptr<Client> create(
             size_t max_redirects_,
+            ServerSideEncryptionKMSConfig sse_kms_config_,
             const std::shared_ptr<Aws::Auth::AWSCredentialsProvider> & credentials_provider,
             const Aws::Client::ClientConfiguration & client_configuration,
             Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy sign_payloads,
@@ -109,6 +136,12 @@ public:
         }
     }
 
+    /// Returns the initial endpoint.
+    const String & getInitialEndpoint() const { return initial_endpoint; }
+    const String & getRegion() const { return explicit_region; }
+
+    Aws::Auth::AWSCredentials getCredentials() const;
+
     /// Decorator for RetryStrategy needed for this client to work correctly.
     /// We want to manually handle permanent moves (status code 301) because:
     /// - redirect location is written in XML format inside the response body something that doesn't exist for HEAD
@@ -139,6 +172,13 @@ public:
         std::shared_ptr<Aws::Client::RetryStrategy> wrapped_strategy;
     };
 
+    /// SSE-KMS headers MUST be signed, so they need to be added before the SDK signs the message
+    /// (before sending the request with one of the methods below).
+    /// Per the docs (https://docs.aws.amazon.com/AmazonS3/latest/userguide/specifying-kms-encryption.html),
+    /// the headers should only be set for PutObject, CopyObject, POST Object, and CreateMultipartUpload.
+    template <typename RequestType>
+    void setKMSHeaders(RequestType & request) const;
+
     Model::HeadObjectOutcome HeadObject(const HeadObjectRequest & request) const;
     Model::ListObjectsV2Outcome ListObjectsV2(const ListObjectsV2Request & request) const;
     Model::ListObjectsOutcome ListObjects(const ListObjectsRequest & request) const;
@@ -155,11 +195,22 @@ public:
     Model::DeleteObjectOutcome DeleteObject(const DeleteObjectRequest & request) const;
     Model::DeleteObjectsOutcome DeleteObjects(const DeleteObjectsRequest & request) const;
 
+    using ComposeObjectOutcome = Aws::Utils::Outcome<Aws::NoResult, Aws::S3::S3Error>;
+    ComposeObjectOutcome ComposeObject(const ComposeObjectRequest & request) const;
+
     using Aws::S3::S3Client::EnableRequestProcessing;
     using Aws::S3::S3Client::DisableRequestProcessing;
+
+    void BuildHttpRequest(const Aws::AmazonWebServiceRequest& request,
+                          const std::shared_ptr<Aws::Http::HttpRequest>& httpRequest) const override;
+
+    bool supportsMultiPartCopy() const;
 private:
+    friend struct ::MockS3::Client;
+
     Client(size_t max_redirects_,
-           const std::shared_ptr<Aws::Auth::AWSCredentialsProvider>& credentials_provider,
+           ServerSideEncryptionKMSConfig sse_kms_config_,
+           const std::shared_ptr<Aws::Auth::AWSCredentialsProvider> & credentials_provider_,
            const Aws::Client::ClientConfiguration& client_configuration,
            Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy sign_payloads,
            bool use_virtual_addressing);
@@ -198,13 +249,25 @@ private:
     bool checkIfWrongRegionDefined(const std::string & bucket, const Aws::S3::S3Error & error, std::string & region) const;
     void insertRegionOverride(const std::string & bucket, const std::string & region) const;
 
+    String initial_endpoint;
+    std::shared_ptr<Aws::Auth::AWSCredentialsProvider> credentials_provider;
+
     std::string explicit_region;
     mutable bool detect_region = true;
 
+    /// provider type can determine if some functionality is supported
+    /// but for same provider, we would need to generate different headers depending on the
+    /// mode
+    /// E.g. GCS can work in AWS mode in some cases and accept headers with x-amz prefix
+    ProviderType provider_type{ProviderType::UNKNOWN};
+    ApiMode api_mode{ApiMode::AWS};
+
     mutable std::shared_ptr<ClientCache> cache;
 
     const size_t max_redirects;
 
+    const ServerSideEncryptionKMSConfig sse_kms_config;
+
     Poco::Logger * log;
 };
 
@@ -221,9 +284,10 @@ public:
         const String & access_key_id,
         const String & secret_access_key,
         const String & server_side_encryption_customer_key_base64,
+        ServerSideEncryptionKMSConfig sse_kms_config,
         HTTPHeaderEntries headers,
-        bool use_environment_credentials,
-        bool use_insecure_imds_request);
+        CredentialsConfiguration credentials_configuration,
+        const String & session_token = "");
 
     PocoHTTPClientConfiguration createClientConfiguration(
         const String & force_region,
diff --git a/src/IO/S3/Credentials.cpp b/src/IO/S3/Credentials.cpp
index 4b9fa59ea2a..84550d3f7c5 100644
--- a/src/IO/S3/Credentials.cpp
+++ b/src/IO/S3/Credentials.cpp
@@ -1,6 +1,7 @@
 #include <IO/S3/Credentials.h>
 
 #if USE_AWS_S3
+
 #    include <aws/core/Version.h>
 #    include <aws/core/platform/OSVersionInfo.h>
 #    include <aws/core/auth/STSCredentialsProvider.h>
@@ -15,12 +16,35 @@
 #    include <IO/S3/PocoHTTPClient.h>
 #    include <IO/S3/PocoHTTPClientFactory.h>
 #    include <IO/S3/Client.h>
+#    include <IO/S3Common.h>
 
 #    include <fstream>
 
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int AWS_ERROR;
+}
+}
+
 namespace DB::S3
 {
 
+namespace
+{
+bool areCredentialsEmptyOrExpired(const Aws::Auth::AWSCredentials & credentials, uint64_t expiration_window_seconds)
+{
+    if (credentials.IsEmpty())
+        return true;
+
+    const Aws::Utils::DateTime now = Aws::Utils::DateTime::Now();
+    return now >= credentials.GetExpiration() - std::chrono::seconds(expiration_window_seconds);
+}
+
+}
+
 AWSEC2MetadataClient::AWSEC2MetadataClient(const Aws::Client::ClientConfiguration & client_configuration, const char * endpoint_)
     : Aws::Internal::AWSHttpResourceClient(client_configuration)
     , endpoint(endpoint_)
@@ -80,39 +104,22 @@ Aws::String AWSEC2MetadataClient::awsComputeUserAgentString()
 Aws::String AWSEC2MetadataClient::getDefaultCredentialsSecurely() const
 {
     String user_agent_string = awsComputeUserAgentString();
-    String new_token;
-
+    auto [new_token, response_code] = getEC2MetadataToken(user_agent_string);
+    if (response_code == Aws::Http::HttpResponseCode::BAD_REQUEST)
+        return {};
+    else if (response_code != Aws::Http::HttpResponseCode::OK || new_token.empty())
     {
-        std::lock_guard locker(token_mutex);
-
-        Aws::StringStream ss;
-        ss << endpoint << EC2_IMDS_TOKEN_RESOURCE;
-        std::shared_ptr<Aws::Http::HttpRequest> token_request(Aws::Http::CreateHttpRequest(ss.str(), Aws::Http::HttpMethod::HTTP_PUT,
-                                                                    Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
-        token_request->SetHeaderValue(EC2_IMDS_TOKEN_TTL_HEADER, EC2_IMDS_TOKEN_TTL_DEFAULT_VALUE);
-        token_request->SetUserAgent(user_agent_string);
-        LOG_TRACE(logger, "Calling EC2MetadataService to get token.");
-        auto result = GetResourceWithAWSWebServiceResult(token_request);
-        const String & token_string = result.GetPayload();
-        new_token = Aws::Utils::StringUtils::Trim(token_string.c_str());
-
-        if (result.GetResponseCode() == Aws::Http::HttpResponseCode::BAD_REQUEST)
-        {
-            return {};
-        }
-        else if (result.GetResponseCode() != Aws::Http::HttpResponseCode::OK || new_token.empty())
-        {
-            LOG_TRACE(logger, "Calling EC2MetadataService to get token failed, falling back to less secure way.");
-            return getDefaultCredentials();
-        }
-        token = new_token;
+        LOG_TRACE(logger, "Calling EC2MetadataService to get token failed, "
+                  "falling back to less secure way. HTTP response code: {}", response_code);
+        return getDefaultCredentials();
     }
 
+    token = std::move(new_token);
     String url = endpoint + EC2_SECURITY_CREDENTIALS_RESOURCE;
     std::shared_ptr<Aws::Http::HttpRequest> profile_request(Aws::Http::CreateHttpRequest(url,
             Aws::Http::HttpMethod::HTTP_GET,
             Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
-    profile_request->SetHeaderValue(EC2_IMDS_TOKEN_HEADER, new_token);
+    profile_request->SetHeaderValue(EC2_IMDS_TOKEN_HEADER, token);
     profile_request->SetUserAgent(user_agent_string);
     String profile_string = GetResourceWithAWSWebServiceResult(profile_request).GetPayload();
 
@@ -133,12 +140,55 @@ Aws::String AWSEC2MetadataClient::getDefaultCredentialsSecurely() const
     std::shared_ptr<Aws::Http::HttpRequest> credentials_request(Aws::Http::CreateHttpRequest(ss.str(),
             Aws::Http::HttpMethod::HTTP_GET,
             Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
-    credentials_request->SetHeaderValue(EC2_IMDS_TOKEN_HEADER, new_token);
+    credentials_request->SetHeaderValue(EC2_IMDS_TOKEN_HEADER, token);
     credentials_request->SetUserAgent(user_agent_string);
     LOG_DEBUG(logger, "Calling EC2MetadataService resource {} with token.", ss.str());
     return GetResourceWithAWSWebServiceResult(credentials_request).GetPayload();
 }
 
+Aws::String AWSEC2MetadataClient::getCurrentAvailabilityZone() const
+{
+    String user_agent_string = awsComputeUserAgentString();
+    auto [new_token, response_code] = getEC2MetadataToken(user_agent_string);
+    if (response_code != Aws::Http::HttpResponseCode::OK || new_token.empty())
+        throw DB::Exception(ErrorCodes::AWS_ERROR,
+            "Failed to make token request. HTTP response code: {}", response_code);
+
+    token = std::move(new_token);
+    const String url = endpoint + EC2_AVAILABILITY_ZONE_RESOURCE;
+    std::shared_ptr<Aws::Http::HttpRequest> profile_request(
+        Aws::Http::CreateHttpRequest(url, Aws::Http::HttpMethod::HTTP_GET, Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
+
+    profile_request->SetHeaderValue(EC2_IMDS_TOKEN_HEADER, token);
+    profile_request->SetUserAgent(user_agent_string);
+
+    const auto result = GetResourceWithAWSWebServiceResult(profile_request);
+    if (result.GetResponseCode() != Aws::Http::HttpResponseCode::OK)
+        throw DB::Exception(ErrorCodes::AWS_ERROR,
+            "Failed to get availability zone. HTTP response code: {}", result.GetResponseCode());
+
+    return Aws::Utils::StringUtils::Trim(result.GetPayload().c_str());
+}
+
+std::pair<Aws::String, Aws::Http::HttpResponseCode> AWSEC2MetadataClient::getEC2MetadataToken(const std::string & user_agent_string) const
+{
+    std::lock_guard locker(token_mutex);
+
+    Aws::StringStream ss;
+    ss << endpoint << EC2_IMDS_TOKEN_RESOURCE;
+    std::shared_ptr<Aws::Http::HttpRequest> token_request(
+        Aws::Http::CreateHttpRequest(
+            ss.str(), Aws::Http::HttpMethod::HTTP_PUT,
+            Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
+    token_request->SetHeaderValue(EC2_IMDS_TOKEN_TTL_HEADER, EC2_IMDS_TOKEN_TTL_DEFAULT_VALUE);
+    token_request->SetUserAgent(user_agent_string);
+
+    LOG_TRACE(logger, "Calling EC2MetadataService to get token.");
+    const auto result = GetResourceWithAWSWebServiceResult(token_request);
+    const auto & token_string = result.GetPayload();
+    return { Aws::Utils::StringUtils::Trim(token_string.c_str()), result.GetResponseCode() };
+}
+
 Aws::String AWSEC2MetadataClient::getCurrentRegion() const
 {
     return Aws::Region::AWS_GLOBAL;
@@ -255,7 +305,6 @@ void AWSInstanceProfileCredentialsProvider::Reload()
 
 void AWSInstanceProfileCredentialsProvider::refreshIfExpired()
 {
-    LOG_DEBUG(logger, "Checking if latest credential pull has expired.");
     Aws::Utils::Threading::ReaderLockGuard guard(m_reloadLock);
     if (!IsTimeToRefresh(load_frequency_ms))
     {
@@ -270,8 +319,10 @@ void AWSInstanceProfileCredentialsProvider::refreshIfExpired()
     Reload();
 }
 
-AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider::AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider(DB::S3::PocoHTTPClientConfiguration & aws_client_configuration)
+AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider::AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider(
+    DB::S3::PocoHTTPClientConfiguration & aws_client_configuration, uint64_t expiration_window_seconds_)
     : logger(&Poco::Logger::get("AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider"))
+    , expiration_window_seconds(expiration_window_seconds_)
 {
     // check environment variables
     String tmp_region = Aws::Environment::GetEnv("AWS_DEFAULT_REGION");
@@ -388,16 +439,12 @@ void AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider::Reload()
 void AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider::refreshIfExpired()
 {
     Aws::Utils::Threading::ReaderLockGuard guard(m_reloadLock);
-    if (!credentials.IsExpiredOrEmpty())
-    {
+    if (!areCredentialsEmptyOrExpired(credentials, expiration_window_seconds))
         return;
-    }
 
     guard.UpgradeToWriterLock();
-    if (!credentials.IsExpiredOrEmpty()) // double-checked lock to avoid refreshing twice
-    {
+    if (!areCredentialsEmptyOrExpired(credentials, expiration_window_seconds)) // double-checked lock to avoid refreshing twice
         return;
-    }
 
     Reload();
 }
@@ -405,11 +452,14 @@ void AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider::refreshIfExpired()
 S3CredentialsProviderChain::S3CredentialsProviderChain(
         const DB::S3::PocoHTTPClientConfiguration & configuration,
         const Aws::Auth::AWSCredentials & credentials,
-        bool use_environment_credentials,
-        bool use_insecure_imds_request)
+        CredentialsConfiguration credentials_configuration)
 {
     auto * logger = &Poco::Logger::get("S3CredentialsProviderChain");
 
+    /// we don't provide any credentials to avoid signing
+    if (credentials_configuration.no_sign_request)
+        return;
+
     /// add explicit credentials to the front of the chain
     /// because it's manually defined by the user
     if (!credentials.IsEmpty())
@@ -418,7 +468,7 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
         return;
     }
 
-    if (use_environment_credentials)
+    if (credentials_configuration.use_environment_credentials)
     {
         static const char AWS_ECS_CONTAINER_CREDENTIALS_RELATIVE_URI[] = "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI";
         static const char AWS_ECS_CONTAINER_CREDENTIALS_FULL_URI[] = "AWS_CONTAINER_CREDENTIALS_FULL_URI";
@@ -439,7 +489,7 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
                 configuration.for_disk_s3,
                 configuration.get_request_throttler,
                 configuration.put_request_throttler);
-            AddProvider(std::make_shared<AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider>(aws_client_configuration));
+            AddProvider(std::make_shared<AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider>(aws_client_configuration, credentials_configuration.expiration_window_seconds));
         }
 
         AddProvider(std::make_shared<Aws::Auth::EnvironmentAWSCredentialsProvider>());
@@ -505,7 +555,7 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
             aws_client_configuration.retryStrategy = std::make_shared<Aws::Client::DefaultRetryStrategy>(1, 1000);
 
             auto ec2_metadata_client = InitEC2MetadataClient(aws_client_configuration);
-            auto config_loader = std::make_shared<AWSEC2InstanceProfileConfigLoader>(ec2_metadata_client, !use_insecure_imds_request);
+            auto config_loader = std::make_shared<AWSEC2InstanceProfileConfigLoader>(ec2_metadata_client, !credentials_configuration.use_insecure_imds_request);
 
             AddProvider(std::make_shared<AWSInstanceProfileCredentialsProvider>(config_loader));
             LOG_INFO(logger, "Added EC2 metadata service credentials provider to the provider chain.");
diff --git a/src/IO/S3/Credentials.h b/src/IO/S3/Credentials.h
index f786810726d..324b750c683 100644
--- a/src/IO/S3/Credentials.h
+++ b/src/IO/S3/Credentials.h
@@ -3,23 +3,24 @@
 #include "config.h"
 
 #if USE_AWS_S3
+
 #    include <aws/core/client/ClientConfiguration.h>
 #    include <aws/core/internal/AWSHttpResourceClient.h>
 #    include <aws/core/config/AWSProfileConfigLoader.h>
-#    include <aws/core/auth/AWSCredentialsProvider.h>
 #    include <aws/core/auth/AWSCredentialsProviderChain.h>
 
-#    include <Common/logger_useful.h>
-
 #    include <IO/S3/PocoHTTPClient.h>
 
 
 namespace DB::S3
 {
 
+inline static constexpr uint64_t DEFAULT_EXPIRATION_WINDOW_SECONDS = 120;
+
 class AWSEC2MetadataClient : public Aws::Internal::AWSHttpResourceClient
 {
     static constexpr char EC2_SECURITY_CREDENTIALS_RESOURCE[] = "/latest/meta-data/iam/security-credentials";
+    static constexpr char EC2_AVAILABILITY_ZONE_RESOURCE[] = "/latest/meta-data/placement/availability-zone";
     static constexpr char EC2_IMDS_TOKEN_RESOURCE[] = "/latest/api/token";
     static constexpr char EC2_IMDS_TOKEN_HEADER[] = "x-aws-ec2-metadata-token";
     static constexpr char EC2_IMDS_TOKEN_TTL_DEFAULT_VALUE[] = "21600";
@@ -48,7 +49,11 @@ public:
 
     virtual Aws::String getCurrentRegion() const;
 
+    virtual Aws::String getCurrentAvailabilityZone() const;
+
 private:
+    std::pair<Aws::String, Aws::Http::HttpResponseCode> getEC2MetadataToken(const std::string & user_agent_string) const;
+
     const Aws::String endpoint;
     mutable std::recursive_mutex token_mutex;
     mutable Aws::String token;
@@ -97,9 +102,11 @@ class AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider : public Aws::Auth::AWS
     /// See STSAssumeRoleWebIdentityCredentialsProvider.
 
 public:
-    explicit AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider(DB::S3::PocoHTTPClientConfiguration & aws_client_configuration);
+    explicit AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider(
+        DB::S3::PocoHTTPClientConfiguration & aws_client_configuration, uint64_t expiration_window_seconds_);
 
     Aws::Auth::AWSCredentials GetAWSCredentials() override;
+
 protected:
     void Reload() override;
 
@@ -114,12 +121,24 @@ private:
     Aws::String token;
     bool initialized = false;
     Poco::Logger * logger;
+    uint64_t expiration_window_seconds;
+};
+
+struct CredentialsConfiguration
+{
+    bool use_environment_credentials = false;
+    bool use_insecure_imds_request = false;
+    uint64_t expiration_window_seconds = DEFAULT_EXPIRATION_WINDOW_SECONDS;
+    bool no_sign_request = false;
 };
 
 class S3CredentialsProviderChain : public Aws::Auth::AWSCredentialsProviderChain
 {
 public:
-    S3CredentialsProviderChain(const DB::S3::PocoHTTPClientConfiguration & configuration, const Aws::Auth::AWSCredentials & credentials, bool use_environment_credentials, bool use_insecure_imds_request);
+    S3CredentialsProviderChain(
+        const DB::S3::PocoHTTPClientConfiguration & configuration,
+        const Aws::Auth::AWSCredentials & credentials,
+        CredentialsConfiguration credentials_configuration);
 };
 
 }
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index b0ab1c52409..bfda7149343 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -15,6 +15,7 @@
 #include <IO/HTTPCommon.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
+#include <IO/S3/ProviderType.h>
 
 #include <aws/core/http/HttpRequest.h>
 #include <aws/core/http/HttpResponse.h>
@@ -187,7 +188,7 @@ namespace
     bool checkRequestCanReturn2xxAndErrorInBody(Aws::Http::HttpRequest & request)
     {
         auto query_params = request.GetQueryStringParameters();
-        if (request.HasHeader("x-amz-copy-source"))
+        if (request.HasHeader("x-amz-copy-source") || request.HasHeader("x-goog-copy-source"))
         {
             /// CopyObject https://docs.aws.amazon.com/AmazonS3/latest/API/API_CopyObject.html
             if (query_params.empty())
@@ -259,6 +260,7 @@ void PocoHTTPClient::makeRequestInternal(
     Poco::Logger * log = &Poco::Logger::get("AWSClient");
 
     auto uri = request.GetUri().GetURIString();
+
     if (enable_s3_requests_logging)
         LOG_TEST(log, "Make request to: {}", uri);
 
diff --git a/src/IO/S3/ProviderType.cpp b/src/IO/S3/ProviderType.cpp
new file mode 100644
index 00000000000..5987701db6b
--- /dev/null
+++ b/src/IO/S3/ProviderType.cpp
@@ -0,0 +1,40 @@
+#include <IO/S3/ProviderType.h>
+
+#if USE_AWS_S3
+
+#include <string>
+
+namespace DB::S3
+{
+
+std::string_view toString(ProviderType provider_type)
+{
+    using enum ProviderType;
+
+    switch (provider_type)
+    {
+        case AWS:
+            return "AWS";
+        case GCS:
+            return "GCS";
+        case UNKNOWN:
+            return "Unknown";
+    }
+}
+
+std::string_view toString(ApiMode api_mode)
+{
+    using enum ApiMode;
+
+    switch (api_mode)
+    {
+        case AWS:
+            return "AWS";
+        case GCS:
+            return "GCS";
+    }
+}
+
+}
+
+#endif
diff --git a/src/IO/S3/ProviderType.h b/src/IO/S3/ProviderType.h
new file mode 100644
index 00000000000..e1b79597a3e
--- /dev/null
+++ b/src/IO/S3/ProviderType.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "config.h"
+
+#if USE_AWS_S3
+
+#include <string_view>
+#include <cstdint>
+
+namespace DB::S3
+{
+
+/// Provider type defines the platform containing the object
+/// we are trying to access
+/// This information is useful for determining general support for
+/// some feature like multipart copy which is currently supported by AWS
+/// but not by GCS
+enum class ProviderType : uint8_t
+{
+    AWS,
+    GCS,
+    UNKNOWN
+};
+
+std::string_view toString(ProviderType provider_type);
+
+/// Mode in which we can use the XML API
+/// This value can be same as the provider type but there can be a difference
+/// For example, GCS can work in both
+/// AWS compatible mode (accept headers starting with x-amz)
+/// and GCS mode (accept only headers starting with x-goog)
+/// Because GCS mode is enforced when some features are used we
+/// need to have support for both.
+enum class ApiMode : uint8_t
+{
+    AWS,
+    GCS
+};
+
+std::string_view toString(ApiMode api_mode);
+
+}
+
+#endif
diff --git a/src/IO/S3/Requests.cpp b/src/IO/S3/Requests.cpp
new file mode 100644
index 00000000000..56d2e44a2c4
--- /dev/null
+++ b/src/IO/S3/Requests.cpp
@@ -0,0 +1,156 @@
+#include <IO/S3/Requests.h>
+
+#if USE_AWS_S3
+
+#include <Common/logger_useful.h>
+#include <aws/core/endpoint/EndpointParameter.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+
+namespace DB::S3
+{
+
+Aws::Http::HeaderValueCollection CopyObjectRequest::GetRequestSpecificHeaders() const
+{
+    auto headers = Model::CopyObjectRequest::GetRequestSpecificHeaders();
+    if (api_mode != ApiMode::GCS)
+        return headers;
+
+    /// GCS supports same headers as S3 but with a prefix x-goog instead of x-amz
+    /// we have to replace all the prefixes client set internally
+    const auto replace_with_gcs_header = [&](const std::string & amz_header, const std::string & gcs_header)
+    {
+        if (const auto it = headers.find(amz_header); it != headers.end())
+        {
+            auto header_value = std::move(it->second);
+            headers.erase(it);
+            headers.emplace(gcs_header, std::move(header_value));
+        }
+    };
+
+    replace_with_gcs_header("x-amz-copy-source", "x-goog-copy-source");
+    replace_with_gcs_header("x-amz-metadata-directive", "x-goog-metadata-directive");
+    replace_with_gcs_header("x-amz-storage-class", "x-goog-storage-class");
+
+    /// replace all x-amz-meta- headers
+    std::vector<std::pair<std::string, std::string>> new_meta_headers;
+    for (auto it = headers.begin(); it != headers.end();)
+    {
+        if (it->first.starts_with("x-amz-meta-"))
+        {
+            auto value = std::move(it->second);
+            auto header = "x-goog" + it->first.substr(/* x-amz */ 5);
+            new_meta_headers.emplace_back(std::pair{std::move(header), std::move(value)});
+            it = headers.erase(it);
+        }
+        else
+            ++it;
+    }
+
+    for (auto & [header, value] : new_meta_headers)
+        headers.emplace(std::move(header), std::move(value));
+
+    return headers;
+}
+
+Aws::String ComposeObjectRequest::SerializePayload() const
+{
+    if (component_names.empty())
+        return {};
+
+    Aws::Utils::Xml::XmlDocument payload_doc = Aws::Utils::Xml::XmlDocument::CreateWithRootNode("ComposeRequest");
+    auto root_node = payload_doc.GetRootElement();
+
+    for (const auto & name : component_names)
+    {
+        auto component_node = root_node.CreateChildElement("Component");
+        auto name_node = component_node.CreateChildElement("Name");
+        name_node.SetText(name);
+    }
+
+    return payload_doc.ConvertToString();
+}
+
+void ComposeObjectRequest::AddQueryStringParameters(Aws::Http::URI & /*uri*/) const
+{
+}
+
+Aws::Http::HeaderValueCollection ComposeObjectRequest::GetRequestSpecificHeaders() const
+{
+    if (content_type.empty())
+        return {};
+
+    return {Aws::Http::HeaderValuePair(Aws::Http::CONTENT_TYPE_HEADER, content_type)};
+}
+
+Aws::Endpoint::EndpointParameters ComposeObjectRequest::GetEndpointContextParams() const
+{
+    EndpointParameters parameters;
+    if (BucketHasBeenSet())
+        parameters.emplace_back("Bucket", GetBucket(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT);
+
+    return parameters;
+}
+
+const Aws::String & ComposeObjectRequest::GetBucket() const
+{
+    return bucket;
+}
+
+bool ComposeObjectRequest::BucketHasBeenSet() const
+{
+    return !bucket.empty();
+}
+
+void ComposeObjectRequest::SetBucket(const Aws::String & value)
+{
+    bucket = value;
+}
+
+void ComposeObjectRequest::SetBucket(Aws::String && value)
+{
+    bucket = std::move(value);
+}
+
+void ComposeObjectRequest::SetBucket(const char * value)
+{
+    bucket.assign(value);
+}
+
+const Aws::String & ComposeObjectRequest::GetKey() const
+{
+    return key;
+}
+
+bool ComposeObjectRequest::KeyHasBeenSet() const
+{
+    return !key.empty();
+}
+
+void ComposeObjectRequest::SetKey(const Aws::String & value)
+{
+    key = value;
+}
+
+void ComposeObjectRequest::SetKey(Aws::String && value)
+{
+    key = std::move(value);
+}
+
+void ComposeObjectRequest::SetKey(const char * value)
+{
+    key.assign(value);
+}
+
+void ComposeObjectRequest::SetComponentNames(std::vector<Aws::String> component_names_)
+{
+    component_names = std::move(component_names_);
+}
+
+void ComposeObjectRequest::SetContentType(Aws::String value)
+{
+    content_type = std::move(value);
+}
+
+}
+
+#endif
diff --git a/src/IO/S3/Requests.h b/src/IO/S3/Requests.h
index fac1a3eff0a..560ba9b2775 100644
--- a/src/IO/S3/Requests.h
+++ b/src/IO/S3/Requests.h
@@ -5,6 +5,7 @@
 #if USE_AWS_S3
 
 #include <IO/S3/URI.h>
+#include <IO/S3/ProviderType.h>
 
 #include <aws/core/endpoint/EndpointParameter.h>
 #include <aws/s3/model/HeadObjectRequest.h>
@@ -61,9 +62,21 @@ public:
         return uri_override;
     }
 
+    void setApiMode(ApiMode api_mode_) const
+    {
+        api_mode = api_mode_;
+    }
+
 protected:
     mutable std::string region_override;
     mutable std::optional<S3::URI> uri_override;
+    mutable ApiMode api_mode{ApiMode::AWS};
+};
+
+class CopyObjectRequest : public ExtendedRequest<Model::CopyObjectRequest>
+{
+public:
+    Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;
 };
 
 using HeadObjectRequest = ExtendedRequest<Model::HeadObjectRequest>;
@@ -78,10 +91,45 @@ using UploadPartRequest = ExtendedRequest<Model::UploadPartRequest>;
 using UploadPartCopyRequest = ExtendedRequest<Model::UploadPartCopyRequest>;
 
 using PutObjectRequest = ExtendedRequest<Model::PutObjectRequest>;
-using CopyObjectRequest = ExtendedRequest<Model::CopyObjectRequest>;
 using DeleteObjectRequest = ExtendedRequest<Model::DeleteObjectRequest>;
 using DeleteObjectsRequest = ExtendedRequest<Model::DeleteObjectsRequest>;
 
+
+class ComposeObjectRequest : public ExtendedRequest<Aws::S3::S3Request>
+{
+public:
+    inline const char * GetServiceRequestName() const override { return "ComposeObject"; }
+
+    AWS_S3_API Aws::String SerializePayload() const override;
+
+    AWS_S3_API void AddQueryStringParameters(Aws::Http::URI & uri) const override;
+
+    AWS_S3_API Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;
+
+    AWS_S3_API EndpointParameters GetEndpointContextParams() const override;
+
+    const Aws::String & GetBucket() const;
+    bool BucketHasBeenSet() const;
+    void SetBucket(const Aws::String & value);
+    void SetBucket(Aws::String && value);
+    void SetBucket(const char* value);
+
+    const Aws::String & GetKey() const;
+    bool KeyHasBeenSet() const;
+    void SetKey(const Aws::String & value);
+    void SetKey(Aws::String && value);
+    void SetKey(const char * value);
+
+    void SetComponentNames(std::vector<Aws::String> component_names_);
+
+    void SetContentType(Aws::String value);
+private:
+    Aws::String bucket;
+    Aws::String key;
+    std::vector<Aws::String> component_names;
+    Aws::String content_type;
+};
+
 }
 
 #endif
diff --git a/src/IO/S3/copyS3File.cpp b/src/IO/S3/copyS3File.cpp
index 6972e9f1c82..7886b84cd00 100644
--- a/src/IO/S3/copyS3File.cpp
+++ b/src/IO/S3/copyS3File.cpp
@@ -4,15 +4,21 @@
 
 #include <Common/ProfileEvents.h>
 #include <Common/typeid_cast.h>
+#include <Interpreters/Context.h>
 #include <IO/LimitSeekableReadBuffer.h>
 #include <IO/S3/getObjectInfo.h>
 #include <IO/SeekableReadBuffer.h>
 #include <IO/StdStreamFromReadBuffer.h>
+#include <IO/ReadBufferFromS3.h>
 
 #include <IO/S3/Requests.h>
 
 namespace ProfileEvents
 {
+    extern const Event WriteBufferFromS3Bytes;
+    extern const Event WriteBufferFromS3Microseconds;
+    extern const Event WriteBufferFromS3RequestsErrors;
+
     extern const Event S3CreateMultipartUpload;
     extern const Event S3CompleteMultipartUpload;
     extern const Event S3PutObject;
@@ -98,9 +104,8 @@ namespace
         std::mutex bg_tasks_mutex;
         std::condition_variable bg_tasks_condvar;
 
-        void createMultipartUpload()
+        void fillCreateMultipartRequest(S3::CreateMultipartUploadRequest & request)
         {
-            S3::CreateMultipartUploadRequest request;
             request.SetBucket(dest_bucket);
             request.SetKey(dest_key);
 
@@ -114,6 +119,14 @@ namespace
             if (!storage_class_name.empty())
                 request.SetStorageClass(Aws::S3::Model::StorageClassMapper::GetStorageClassForName(storage_class_name));
 
+            client_ptr->setKMSHeaders(request);
+        }
+
+        void createMultipartUpload()
+        {
+            S3::CreateMultipartUploadRequest request;
+            fillCreateMultipartRequest(request);
+
             ProfileEvents::increment(ProfileEvents::S3CreateMultipartUpload);
             if (for_disk_s3)
                 ProfileEvents::increment(ProfileEvents::DiskS3CreateMultipartUpload);
@@ -126,7 +139,10 @@ namespace
                 LOG_TRACE(log, "Multipart upload has created. Bucket: {}, Key: {}, Upload id: {}", dest_bucket, dest_key, multipart_upload_id);
             }
             else
+            {
+                ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
                 throw S3Exception(outcome.GetError().GetMessage(), outcome.GetError().GetErrorType());
+            }
         }
 
         void completeMultipartUpload()
@@ -175,7 +191,7 @@ namespace
                     LOG_INFO(log, "Multipart upload failed with NO_SUCH_KEY error for Bucket: {}, Key: {}, Upload_id: {}, Parts: {}, will retry", dest_bucket, dest_key, multipart_upload_id, part_tags.size());
                     continue; /// will retry
                 }
-
+                ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
                 throw S3Exception(
                     outcome.GetError().GetErrorType(),
                     "Message: {}, Key: {}, Bucket: {}, Tags: {}",
@@ -219,7 +235,12 @@ namespace
                     size_t next_position = std::min(position + normal_part_size, end_position);
                     size_t part_size = next_position - position; /// `part_size` is either `normal_part_size` or smaller if it's the final part.
 
+                    Stopwatch watch;
                     uploadPart(part_number, position, part_size);
+                    watch.stop();
+
+                    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Bytes, part_size);
+                    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Microseconds, watch.elapsedMicroseconds());
 
                     position = next_position;
                 }
@@ -230,11 +251,11 @@ namespace
                 // Multipart upload failed because it wasn't possible to schedule all the tasks.
                 // To avoid execution of already scheduled tasks we abort MultipartUpload.
                 abortMultipartUpload();
-                waitForAllBackGroundTasks();
+                waitForAllBackgroundTasks();
                 throw;
             }
 
-            waitForAllBackGroundTasks();
+            waitForAllBackgroundTasks();
             completeMultipartUpload();
         }
 
@@ -340,7 +361,7 @@ namespace
                             task->exception = std::current_exception();
                         }
                         task_finish_notify();
-                    }, 0);
+                    }, Priority{});
                 }
                 catch (...)
                 {
@@ -372,7 +393,7 @@ namespace
         virtual std::unique_ptr<Aws::AmazonWebServiceRequest> fillUploadPartRequest(size_t part_number, size_t part_offset, size_t part_size) = 0;
         virtual String processUploadPartRequest(Aws::AmazonWebServiceRequest & request) = 0;
 
-        void waitForAllBackGroundTasks()
+        void waitForAllBackgroundTasks()
         {
             if (!schedule)
                 return;
@@ -405,7 +426,7 @@ namespace
     {
     public:
         CopyDataToFileHelper(
-            const std::function<std::unique_ptr<SeekableReadBuffer>()> & create_read_buffer_,
+            const CreateReadBuffer & create_read_buffer_,
             size_t offset_,
             size_t size_,
             const std::shared_ptr<const S3::Client> & client_ptr_,
@@ -463,6 +484,8 @@ namespace
 
             /// If we don't do it, AWS SDK can mistakenly set it to application/xml, see https://github.com/aws/aws-sdk-cpp/issues/1840
             request.SetContentType("binary/octet-stream");
+
+            client_ptr->setKMSHeaders(request);
         }
 
         void processPutRequest(const S3::PutObjectRequest & request)
@@ -474,16 +497,21 @@ namespace
                 if (for_disk_s3)
                     ProfileEvents::increment(ProfileEvents::DiskS3PutObject);
 
+                Stopwatch watch;
                 auto outcome = client_ptr->PutObject(request);
+                watch.stop();
 
                 if (outcome.IsSuccess())
                 {
+                    Int64 object_size = request.GetContentLength();
+                    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Bytes, object_size);
+                    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Microseconds, watch.elapsedMicroseconds());
                     LOG_TRACE(
                         log,
                         "Single part upload has completed. Bucket: {}, Key: {}, Object size: {}",
                         dest_bucket,
                         dest_key,
-                        request.GetContentLength());
+                        object_size);
                     break;
                 }
 
@@ -512,7 +540,7 @@ namespace
                         request.GetContentLength());
                     continue; /// will retry
                 }
-
+                ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
                 throw S3Exception(
                     outcome.GetError().GetErrorType(),
                     "Message: {}, Key: {}, Bucket: {}, Object size: {}",
@@ -556,6 +584,7 @@ namespace
             if (!outcome.IsSuccess())
             {
                 abortMultipartUpload();
+                ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
                 throw S3Exception(outcome.GetError().GetMessage(), outcome.GetError().GetErrorType());
             }
 
@@ -584,12 +613,13 @@ namespace
             , src_key(src_key_)
             , offset(src_offset_)
             , size(src_size_)
+            , supports_multipart_copy(client_ptr_->supportsMultiPartCopy())
         {
         }
 
         void performCopy()
         {
-            if (size <= upload_settings.max_single_operation_copy_size)
+            if (!supports_multipart_copy || size <= upload_settings.max_single_operation_copy_size)
                 performSingleOperationCopy();
             else
                 performMultipartUploadCopy();
@@ -603,6 +633,15 @@ namespace
         const String & src_key;
         size_t offset;
         size_t size;
+        bool supports_multipart_copy;
+
+        CreateReadBuffer getSourceObjectReadBuffer()
+        {
+            return [&]
+            {
+                return std::make_unique<ReadBufferFromS3>(client_ptr, src_bucket, src_key, "", request_settings, Context::getGlobalContextInstance()->getReadSettings());
+            };
+        }
 
         void performSingleOperationCopy()
         {
@@ -629,6 +668,8 @@ namespace
 
             /// If we don't do it, AWS SDK can mistakenly set it to application/xml, see https://github.com/aws/aws-sdk-cpp/issues/1840
             request.SetContentType("binary/octet-stream");
+
+            client_ptr->setKMSHeaders(request);
         }
 
         void processCopyRequest(const S3::CopyObjectRequest & request)
@@ -652,18 +693,42 @@ namespace
                     break;
                 }
 
-                if (outcome.GetError().GetExceptionName() == "EntityTooLarge" || outcome.GetError().GetExceptionName() == "InvalidRequest")
+                if (outcome.GetError().GetExceptionName() == "EntityTooLarge" || outcome.GetError().GetExceptionName() == "InvalidRequest" || outcome.GetError().GetExceptionName() == "InvalidArgument")
                 {
-                    // Can't come here with MinIO, MinIO allows single part upload for large objects.
-                    LOG_INFO(
-                        log,
-                        "Single operation copy failed with error {} for Bucket: {}, Key: {}, Object size: {}, will retry with multipart upload copy",
-                        outcome.GetError().GetExceptionName(),
-                        dest_bucket,
-                        dest_key,
-                        size);
-                    performMultipartUploadCopy();
-                    break;
+                    if (!supports_multipart_copy)
+                    {
+                        LOG_INFO(log, "Multipart upload using copy is not supported, will try regular upload for Bucket: {}, Key: {}, Object size: {}",
+                                dest_bucket,
+                                dest_key,
+                                size);
+                        copyDataToS3File(
+                            getSourceObjectReadBuffer(),
+                            offset,
+                            size,
+                            client_ptr,
+                            dest_bucket,
+                            dest_key,
+                            request_settings,
+                            object_metadata,
+                            schedule,
+                            for_disk_s3);
+                        break;
+                    }
+                    else
+                    {
+                        // Can't come here with MinIO, MinIO allows single part upload for large objects.
+                        LOG_INFO(
+                            log,
+                            "Single operation copy failed with error {} for Bucket: {}, Key: {}, Object size: {}, will retry with multipart "
+                            "upload copy",
+                            outcome.GetError().GetExceptionName(),
+                            dest_bucket,
+                            dest_key,
+                            size);
+
+                        performMultipartUploadCopy();
+                        break;
+                    }
                 }
 
                 if ((outcome.GetError().GetErrorType() == Aws::S3::S3Errors::NO_SUCH_KEY) && (retries < max_retries))
diff --git a/src/IO/S3/copyS3File.h b/src/IO/S3/copyS3File.h
index 5204af5aa4b..618ef419a9b 100644
--- a/src/IO/S3/copyS3File.h
+++ b/src/IO/S3/copyS3File.h
@@ -15,6 +15,8 @@ namespace DB
 {
 class SeekableReadBuffer;
 
+using CreateReadBuffer = std::function<std::unique_ptr<SeekableReadBuffer>()>;
+
 /// Copies a file from S3 to S3.
 /// The same functionality can be done by using the function copyData() and the classes ReadBufferFromS3 and WriteBufferFromS3
 /// however copyS3File() is faster and spends less network traffic and memory.
@@ -30,7 +32,7 @@ void copyS3File(
     const S3Settings::RequestSettings & settings,
     const std::optional<std::map<String, String>> & object_metadata = std::nullopt,
     ThreadPoolCallbackRunner<void> schedule_ = {},
-    bool for_disk_s3 =  false);
+    bool for_disk_s3 = false);
 
 /// Copies data from any seekable source to S3.
 /// The same functionality can be done by using the function copyData() and the class WriteBufferFromS3
@@ -38,7 +40,7 @@ void copyS3File(
 /// The callback `create_read_buffer` can be called from multiple threads in parallel, so that should be thread-safe.
 /// The parameters `offset` and `size` specify a part in the source to copy.
 void copyDataToS3File(
-    const std::function<std::unique_ptr<SeekableReadBuffer>()> & create_read_buffer,
+    const CreateReadBuffer & create_read_buffer,
     size_t offset,
     size_t size,
     const std::shared_ptr<const S3::Client> & dest_s3_client,
@@ -47,7 +49,7 @@ void copyDataToS3File(
     const S3Settings::RequestSettings & settings,
     const std::optional<std::map<String, String>> & object_metadata = std::nullopt,
     ThreadPoolCallbackRunner<void> schedule_ = {},
-    bool for_disk_s3 =  false);
+    bool for_disk_s3 = false);
 
 }
 
diff --git a/src/IO/S3/tests/TestPocoHTTPServer.h b/src/IO/S3/tests/TestPocoHTTPServer.h
index 47ae90cb809..0f5ce86b388 100644
--- a/src/IO/S3/tests/TestPocoHTTPServer.h
+++ b/src/IO/S3/tests/TestPocoHTTPServer.h
@@ -8,38 +8,66 @@
 #include <Poco/Net/HTTPRequestHandlerFactory.h>
 #include <Poco/Net/HTTPServer.h>
 #include <Poco/Net/HTTPServerParams.h>
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+#include <Poco/Net/MessageHeader.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/ServerSocket.h>
 #include <Poco/AutoPtr.h>
 #include <Poco/SharedPtr.h>
 
+class MockRequestHandler : public Poco::Net::HTTPRequestHandler
+{
+    Poco::Net::MessageHeader & last_request_header;
+
+public:
+    MockRequestHandler(Poco::Net::MessageHeader & last_request_header_)
+    : Poco::Net::HTTPRequestHandler(), last_request_header(last_request_header_)
+    {
+    }
+
+    void handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response) override
+    {
+        response.setStatus(Poco::Net::HTTPResponse::HTTP_OK);
+        last_request_header = request;
+        response.send();
+    }
+};
 
-template <typename RequestHandler>
 class HTTPRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory
 {
+    Poco::Net::MessageHeader & last_request_header;
+
     virtual Poco::Net::HTTPRequestHandler * createRequestHandler(const Poco::Net::HTTPServerRequest &) override
     {
-        return new RequestHandler();
+        return new MockRequestHandler(last_request_header);
     }
 
 public:
+    HTTPRequestHandlerFactory(Poco::Net::MessageHeader & last_request_header_)
+    : Poco::Net::HTTPRequestHandlerFactory(), last_request_header(last_request_header_)
+    {
+    }
+
     virtual ~HTTPRequestHandlerFactory() override
     {
     }
 };
 
-template <typename RequestHandler>
 class TestPocoHTTPServer
 {
     std::unique_ptr<Poco::Net::ServerSocket> server_socket;
-    Poco::SharedPtr<HTTPRequestHandlerFactory<RequestHandler>> handler_factory;
+    Poco::SharedPtr<HTTPRequestHandlerFactory> handler_factory;
     Poco::AutoPtr<Poco::Net::HTTPServerParams> server_params;
     std::unique_ptr<Poco::Net::HTTPServer> server;
+    // Stores the last request header handled. It's obviously not thread-safe to share the same
+    // reference across request handlers, but it's good enough for this the purposes of this test.
+    Poco::Net::MessageHeader last_request_header;
 
 public:
     TestPocoHTTPServer():
         server_socket(std::make_unique<Poco::Net::ServerSocket>(0)),
-        handler_factory(new HTTPRequestHandlerFactory<RequestHandler>()),
+        handler_factory(new HTTPRequestHandlerFactory(last_request_header)),
         server_params(new Poco::Net::HTTPServerParams()),
         server(std::make_unique<Poco::Net::HTTPServer>(handler_factory, *server_socket, server_params))
     {
@@ -50,4 +78,9 @@ public:
     {
         return "http://" + server_socket->address().toString();
     }
+
+    const Poco::Net::MessageHeader & getLastRequestHeader() const
+    {
+        return last_request_header;
+    }
 };
diff --git a/src/IO/S3/tests/gtest_aws_s3_client.cpp b/src/IO/S3/tests/gtest_aws_s3_client.cpp
index bbbf6a430ab..a9b5fa03f30 100644
--- a/src/IO/S3/tests/gtest_aws_s3_client.cpp
+++ b/src/IO/S3/tests/gtest_aws_s3_client.cpp
@@ -1,18 +1,15 @@
 #include <gtest/gtest.h>
 
+#include "IO/S3/Credentials.h"
 #include "config.h"
 
 
 #if USE_AWS_S3
 
 #include <memory>
-#include <ostream>
 
 #include <boost/algorithm/string.hpp>
 
-#include <Poco/Net/HTTPRequestHandler.h>
-#include <Poco/Net/HTTPServerRequest.h>
-#include <Poco/Net/HTTPServerResponse.h>
 #include <Poco/URI.h>
 
 #include <aws/core/client/AWSError.h>
@@ -24,6 +21,7 @@
 #include <IO/ReadBufferFromS3.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadSettings.h>
+#include <IO/WriteBufferFromS3.h>
 #include <IO/S3Common.h>
 #include <IO/S3/Client.h>
 #include <IO/HTTPHeaderEntries.h>
@@ -40,80 +38,33 @@ public:
     ~NoRetryStrategy() override = default;
 };
 
-
-TEST(IOTestAwsS3Client, AppendExtraSSECHeaders)
+String getSSEAndSignedHeaders(const Poco::Net::MessageHeader & message_header)
 {
-    /// See https://github.com/ClickHouse/ClickHouse/pull/19748
-
-    class MyRequestHandler : public Poco::Net::HTTPRequestHandler
+    String content;
+    for (const auto & [header_name, header_value] : message_header)
     {
-    public:
-        void handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response) override
+        if (boost::algorithm::starts_with(header_name, "x-amz-server-side-encryption"))
         {
-            response.setStatus(Poco::Net::HTTPResponse::HTTP_OK);
-            std::ostream & out = response.send();
-            for (const auto & [header_name, header_value] : request)
-            {
-                if (boost::algorithm::starts_with(header_name, "x-amz-server-side-encryption-customer-"))
-                {
-                    out << header_name << ": " << header_value << "\n";
-                }
-                else if (header_name == "authorization")
-                {
-                    std::vector<String> parts;
-                    boost::split(parts, header_value, [](char c){ return c == ' '; });
-                    for (const auto & part : parts)
-                    {
-                        if (boost::algorithm::starts_with(part, "SignedHeaders="))
-                            out << header_name << ": ... " << part << " ...\n";
-                    }
-                }
-            }
-            out.flush();
+            content += header_name + ": " + header_value + "\n";
         }
-    };
+        else if (header_name == "authorization")
+        {
+            std::vector<String> parts;
+            boost::split(parts, header_value, [](char c){ return c == ' '; });
+            for (const auto & part : parts)
+            {
+                if (boost::algorithm::starts_with(part, "SignedHeaders="))
+                    content += header_name + ": ... " + part + " ...\n";
+            }
+        }
+    }
+    return content;
+}
 
-    TestPocoHTTPServer<MyRequestHandler> http;
-
-    DB::RemoteHostFilter remote_host_filter;
-    unsigned int s3_max_redirects = 100;
-    DB::S3::URI uri(http.getUrl() + "/IOTestAwsS3ClientAppendExtraHeaders/test.txt");
-    String access_key_id = "ACCESS_KEY_ID";
-    String secret_access_key = "SECRET_ACCESS_KEY";
-    String region = "us-east-1";
+void doReadRequest(std::shared_ptr<const DB::S3::Client> client, const DB::S3::URI & uri)
+{
     String version_id;
     UInt64 max_single_read_retries = 1;
-    bool enable_s3_requests_logging = false;
-    DB::S3::PocoHTTPClientConfiguration client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(
-        region,
-        remote_host_filter,
-        s3_max_redirects,
-        enable_s3_requests_logging,
-        /* for_disk_s3 = */ false,
-        /* get_request_throttler = */ {},
-        /* put_request_throttler = */ {}
-    );
-
-    client_configuration.endpointOverride = uri.endpoint;
-    client_configuration.retryStrategy = std::make_shared<NoRetryStrategy>();
-
-    String server_side_encryption_customer_key_base64 = "Kv/gDqdWVGIT4iDqg+btQvV3lc1idlm4WI+MMOyHOAw=";
-    DB::HTTPHeaderEntries headers;
-    bool use_environment_credentials = false;
-    bool use_insecure_imds_request = false;
-
-    std::shared_ptr<DB::S3::Client> client = DB::S3::ClientFactory::instance().create(
-        client_configuration,
-        uri.is_virtual_hosted_style,
-        access_key_id,
-        secret_access_key,
-        server_side_encryption_customer_key_base64,
-        headers,
-        use_environment_credentials,
-        use_insecure_imds_request
-    );
-
-    ASSERT_TRUE(client);
 
     DB::ReadSettings read_settings;
     DB::S3Settings::RequestSettings request_settings;
@@ -129,7 +80,171 @@ TEST(IOTestAwsS3Client, AppendExtraSSECHeaders)
 
     String content;
     DB::readStringUntilEOF(content, read_buffer);
-    EXPECT_EQ(content, "authorization: ... SignedHeaders=amz-sdk-invocation-id;amz-sdk-request;content-type;host;x-amz-api-version;x-amz-content-sha256;x-amz-date, ...\nx-amz-server-side-encryption-customer-algorithm: AES256\nx-amz-server-side-encryption-customer-key: Kv/gDqdWVGIT4iDqg+btQvV3lc1idlm4WI+MMOyHOAw=\nx-amz-server-side-encryption-customer-key-md5: fMNuOw6OLU5GG2vc6RTA+g==\n");
+}
+
+void doWriteRequest(std::shared_ptr<const DB::S3::Client> client, const DB::S3::URI & uri)
+{
+    UInt64 max_unexpected_write_error_retries = 1;
+
+    DB::S3Settings::RequestSettings request_settings;
+    request_settings.max_unexpected_write_error_retries = max_unexpected_write_error_retries;
+    DB::WriteBufferFromS3 write_buffer(
+        client,
+        uri.bucket,
+        uri.key,
+        DBMS_DEFAULT_BUFFER_SIZE,
+        request_settings
+    );
+
+    write_buffer.write('\0'); // doesn't matter what we write here, just needs to be something
+    write_buffer.finalize();
+}
+
+using RequestFn = std::function<void(std::shared_ptr<const DB::S3::Client>, const DB::S3::URI &)>;
+
+void testServerSideEncryption(
+    RequestFn do_request,
+    String server_side_encryption_customer_key_base64,
+    DB::S3::ServerSideEncryptionKMSConfig sse_kms_config,
+    String expected_headers)
+{
+    TestPocoHTTPServer http;
+
+    DB::RemoteHostFilter remote_host_filter;
+    unsigned int s3_max_redirects = 100;
+    DB::S3::URI uri(http.getUrl() + "/IOTestAwsS3ClientAppendExtraHeaders/test.txt");
+    String access_key_id = "ACCESS_KEY_ID";
+    String secret_access_key = "SECRET_ACCESS_KEY";
+    String region = "us-east-1";
+    bool enable_s3_requests_logging = false;
+    DB::S3::PocoHTTPClientConfiguration client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(
+        region,
+        remote_host_filter,
+        s3_max_redirects,
+        enable_s3_requests_logging,
+        /* for_disk_s3 = */ false,
+        /* get_request_throttler = */ {},
+        /* put_request_throttler = */ {}
+    );
+
+    client_configuration.endpointOverride = uri.endpoint;
+    client_configuration.retryStrategy = std::make_shared<NoRetryStrategy>();
+
+    DB::HTTPHeaderEntries headers;
+    bool use_environment_credentials = false;
+    bool use_insecure_imds_request = false;
+
+    std::shared_ptr<DB::S3::Client> client = DB::S3::ClientFactory::instance().create(
+        client_configuration,
+        uri.is_virtual_hosted_style,
+        access_key_id,
+        secret_access_key,
+        server_side_encryption_customer_key_base64,
+        sse_kms_config,
+        headers,
+        DB::S3::CredentialsConfiguration
+        {
+            .use_environment_credentials = use_environment_credentials,
+            .use_insecure_imds_request = use_insecure_imds_request
+        }
+    );
+
+    ASSERT_TRUE(client);
+
+    do_request(client, uri);
+    String content = getSSEAndSignedHeaders(http.getLastRequestHeader());
+    EXPECT_EQ(content, expected_headers);
+}
+
+TEST(IOTestAwsS3Client, AppendExtraSSECHeadersRead)
+{
+    /// See https://github.com/ClickHouse/ClickHouse/pull/19748
+    testServerSideEncryption(
+        doReadRequest,
+        "Kv/gDqdWVGIT4iDqg+btQvV3lc1idlm4WI+MMOyHOAw=",
+        {},
+        "authorization: ... SignedHeaders="
+        "amz-sdk-invocation-id;"
+        "amz-sdk-request;"
+        "content-type;"
+        "host;"
+        "x-amz-api-version;"
+        "x-amz-content-sha256;"
+        "x-amz-date, ...\n"
+        "x-amz-server-side-encryption-customer-algorithm: AES256\n"
+        "x-amz-server-side-encryption-customer-key: Kv/gDqdWVGIT4iDqg+btQvV3lc1idlm4WI+MMOyHOAw=\n"
+        "x-amz-server-side-encryption-customer-key-md5: fMNuOw6OLU5GG2vc6RTA+g==\n");
+}
+
+TEST(IOTestAwsS3Client, AppendExtraSSECHeadersWrite)
+{
+    /// See https://github.com/ClickHouse/ClickHouse/pull/19748
+    testServerSideEncryption(
+        doWriteRequest,
+        "Kv/gDqdWVGIT4iDqg+btQvV3lc1idlm4WI+MMOyHOAw=",
+        {},
+        "authorization: ... SignedHeaders="
+        "amz-sdk-invocation-id;"
+        "amz-sdk-request;"
+        "content-length;"
+        "content-md5;"
+        "content-type;"
+        "host;"
+        "x-amz-content-sha256;"
+        "x-amz-date, ...\n"
+        "x-amz-server-side-encryption-customer-algorithm: AES256\n"
+        "x-amz-server-side-encryption-customer-key: Kv/gDqdWVGIT4iDqg+btQvV3lc1idlm4WI+MMOyHOAw=\n"
+        "x-amz-server-side-encryption-customer-key-md5: fMNuOw6OLU5GG2vc6RTA+g==\n");
+}
+
+TEST(IOTestAwsS3Client, AppendExtraSSEKMSHeadersRead)
+{
+    DB::S3::ServerSideEncryptionKMSConfig sse_kms_config;
+    sse_kms_config.key_id = "alias/test-key";
+    sse_kms_config.encryption_context = "arn:aws:s3:::bucket_ARN";
+    sse_kms_config.bucket_key_enabled = true;
+    // KMS headers shouldn't be set on a read request
+    testServerSideEncryption(
+        doReadRequest,
+        "",
+        sse_kms_config,
+        "authorization: ... SignedHeaders="
+        "amz-sdk-invocation-id;"
+        "amz-sdk-request;"
+        "content-type;"
+        "host;"
+        "x-amz-api-version;"
+        "x-amz-content-sha256;"
+        "x-amz-date, ...\n");
+}
+
+TEST(IOTestAwsS3Client, AppendExtraSSEKMSHeadersWrite)
+{
+    DB::S3::ServerSideEncryptionKMSConfig sse_kms_config;
+    sse_kms_config.key_id = "alias/test-key";
+    sse_kms_config.encryption_context = "arn:aws:s3:::bucket_ARN";
+    sse_kms_config.bucket_key_enabled = true;
+    testServerSideEncryption(
+        doWriteRequest,
+        "",
+        sse_kms_config,
+        "authorization: ... SignedHeaders="
+        "amz-sdk-invocation-id;"
+        "amz-sdk-request;"
+        "content-length;"
+        "content-md5;"
+        "content-type;"
+        "host;"
+        "x-amz-content-sha256;"
+        "x-amz-date;"
+        "x-amz-server-side-encryption;"
+        "x-amz-server-side-encryption-aws-kms-key-id;"
+        "x-amz-server-side-encryption-bucket-key-enabled;"
+        "x-amz-server-side-encryption-context, ...\n"
+        "x-amz-server-side-encryption: aws:kms\n"
+        "x-amz-server-side-encryption-aws-kms-key-id: alias/test-key\n"
+        "x-amz-server-side-encryption-bucket-key-enabled: true\n"
+        "x-amz-server-side-encryption-context: arn:aws:s3:::bucket_ARN\n");
 }
 
 #endif
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index aa8de07c3f4..ffd6b6d711f 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -70,6 +70,41 @@ namespace ErrorCodes
 namespace S3
 {
 
+HTTPHeaderEntries getHTTPHeaders(const std::string & config_elem, const Poco::Util::AbstractConfiguration & config)
+{
+    HTTPHeaderEntries headers;
+    Poco::Util::AbstractConfiguration::Keys subconfig_keys;
+    config.keys(config_elem, subconfig_keys);
+    for (const std::string & subkey : subconfig_keys)
+    {
+        if (subkey.starts_with("header"))
+        {
+            auto header_str = config.getString(config_elem + "." + subkey);
+            auto delimiter = header_str.find(':');
+            if (delimiter == std::string::npos)
+                throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Malformed s3 header value");
+            headers.emplace_back(header_str.substr(0, delimiter), header_str.substr(delimiter + 1, String::npos));
+        }
+    }
+    return headers;
+}
+
+ServerSideEncryptionKMSConfig getSSEKMSConfig(const std::string & config_elem, const Poco::Util::AbstractConfiguration & config)
+{
+    ServerSideEncryptionKMSConfig sse_kms_config;
+
+    if (config.has(config_elem + ".server_side_encryption_kms_key_id"))
+        sse_kms_config.key_id = config.getString(config_elem + ".server_side_encryption_kms_key_id");
+
+    if (config.has(config_elem + ".server_side_encryption_kms_encryption_context"))
+        sse_kms_config.encryption_context = config.getString(config_elem + ".server_side_encryption_kms_encryption_context");
+
+    if (config.has(config_elem + ".server_side_encryption_kms_bucket_key_enabled"))
+        sse_kms_config.bucket_key_enabled = config.getBool(config_elem + ".server_side_encryption_kms_bucket_key_enabled");
+
+    return sse_kms_config;
+}
+
 AuthSettings AuthSettings::loadFromConfig(const std::string & config_elem, const Poco::Util::AbstractConfiguration & config)
 {
     auto access_key_id = config.getString(config_elem + ".access_key_id", "");
@@ -85,29 +120,28 @@ AuthSettings AuthSettings::loadFromConfig(const std::string & config_elem, const
     if (config.has(config_elem + ".use_insecure_imds_request"))
         use_insecure_imds_request = config.getBool(config_elem + ".use_insecure_imds_request");
 
-    HTTPHeaderEntries headers;
-    Poco::Util::AbstractConfiguration::Keys subconfig_keys;
-    config.keys(config_elem, subconfig_keys);
-    for (const std::string & subkey : subconfig_keys)
-    {
-        if (subkey.starts_with("header"))
-        {
-            auto header_str = config.getString(config_elem + "." + subkey);
-            auto delimiter = header_str.find(':');
-            if (delimiter == std::string::npos)
-                throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Malformed s3 header value");
-            headers.emplace_back(header_str.substr(0, delimiter), header_str.substr(delimiter + 1, String::npos));
-        }
-    }
+    std::optional<uint64_t> expiration_window_seconds;
+    if (config.has(config_elem + ".expiration_window_seconds"))
+        expiration_window_seconds = config.getUInt64(config_elem + ".expiration_window_seconds");
+
+    std::optional<bool> no_sign_request;
+    if (config.has(config_elem + ".no_sign_request"))
+        no_sign_request = config.getBool(config_elem + ".no_sign_request");
+
+    HTTPHeaderEntries headers = getHTTPHeaders(config_elem, config);
+    ServerSideEncryptionKMSConfig sse_kms_config = getSSEKMSConfig(config_elem, config);
 
     return AuthSettings
     {
         std::move(access_key_id), std::move(secret_access_key),
         std::move(region),
         std::move(server_side_encryption_customer_key_base64),
+        std::move(sse_kms_config),
         std::move(headers),
         use_environment_credentials,
-        use_insecure_imds_request
+        use_insecure_imds_request,
+        expiration_window_seconds,
+        no_sign_request
     };
 }
 
@@ -125,8 +159,19 @@ void AuthSettings::updateFrom(const AuthSettings & from)
     headers = from.headers;
     region = from.region;
     server_side_encryption_customer_key_base64 = from.server_side_encryption_customer_key_base64;
-    use_environment_credentials = from.use_environment_credentials;
-    use_insecure_imds_request = from.use_insecure_imds_request;
+    server_side_encryption_kms_config = from.server_side_encryption_kms_config;
+
+    if (from.use_environment_credentials.has_value())
+        use_environment_credentials = from.use_environment_credentials;
+
+    if (from.use_insecure_imds_request.has_value())
+        use_insecure_imds_request = from.use_insecure_imds_request;
+
+    if (from.expiration_window_seconds.has_value())
+        expiration_window_seconds = from.expiration_window_seconds;
+
+    if (from.no_sign_request.has_value())
+        no_sign_request = *from.no_sign_request;
 }
 
 }
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index 7f277176632..71d52c727c7 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <IO/S3/Client.h>
 #include <IO/S3/PocoHTTPClient.h>
 #include <IO/HTTPHeaderEntries.h>
 
@@ -14,14 +15,11 @@
 #include <Common/Exception.h>
 #include <Common/Throttler_fwd.h>
 
-#include <IO/S3/Client.h>
 #include <IO/S3/URI.h>
 
 #include <aws/core/Aws.h>
 #include <aws/s3/S3Errors.h>
 
-namespace Aws::S3 { class Client; }
-
 namespace DB
 {
 
@@ -71,6 +69,10 @@ namespace Poco::Util
 namespace DB::S3
 {
 
+HTTPHeaderEntries getHTTPHeaders(const std::string & config_elem, const Poco::Util::AbstractConfiguration & config);
+
+ServerSideEncryptionKMSConfig getSSEKMSConfig(const std::string & config_elem, const Poco::Util::AbstractConfiguration & config);
+
 struct AuthSettings
 {
     static AuthSettings loadFromConfig(const std::string & config_elem, const Poco::Util::AbstractConfiguration & config);
@@ -79,11 +81,14 @@ struct AuthSettings
     std::string secret_access_key;
     std::string region;
     std::string server_side_encryption_customer_key_base64;
+    ServerSideEncryptionKMSConfig server_side_encryption_kms_config;
 
     HTTPHeaderEntries headers;
 
     std::optional<bool> use_environment_credentials;
     std::optional<bool> use_insecure_imds_request;
+    std::optional<uint64_t> expiration_window_seconds;
+    std::optional<bool> no_sign_request;
 
     bool operator==(const AuthSettings & other) const = default;
 
diff --git a/src/IO/SeekAvoidingReadBuffer.h b/src/IO/SeekAvoidingReadBuffer.h
index af2a988ab3a..716d7c5046c 100644
--- a/src/IO/SeekAvoidingReadBuffer.h
+++ b/src/IO/SeekAvoidingReadBuffer.h
@@ -17,7 +17,7 @@ public:
 
     off_t seek(off_t off, int whence) override;
 
-    void prefetch(int64_t priority) override { impl->prefetch(priority); }
+    void prefetch(Priority priority) override { impl->prefetch(priority); }
 
 private:
     UInt64 min_bytes_for_seek; /// Minimum positive seek offset which shall be executed using seek operation.
diff --git a/src/IO/SeekableReadBuffer.h b/src/IO/SeekableReadBuffer.h
index 02142673b2b..736ab5bbc71 100644
--- a/src/IO/SeekableReadBuffer.h
+++ b/src/IO/SeekableReadBuffer.h
@@ -26,6 +26,8 @@ public:
      * @param off Offset.
      * @param whence Seek mode (@see SEEK_SET, @see SEEK_CUR).
      * @return New position from the beginning of underlying buffer / file.
+     *
+     * What happens if you seek above the end of the file? Implementation-defined.
      */
     virtual off_t seek(off_t off, int whence) = 0;
 
@@ -40,35 +42,53 @@ public:
      */
     virtual off_t getPosition() = 0;
 
-    struct Range
-    {
-        size_t left;
-        std::optional<size_t> right;
-
-        String toString() const { return fmt::format("[{}:{}]", left, right ? std::to_string(*right) : "None"); }
-    };
-
-    /**
-     * Returns a struct, where `left` is current read position in file and `right` is the
-     * last included offset for reading according to setReadUntilPosition() or setReadUntilEnd().
-     * E.g. next nextImpl() call will read within range [left, right].
-     */
-    virtual Range getRemainingReadRange() const
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getRemainingReadRange() not implemented");
-    }
-
     virtual String getInfoForLog() { return ""; }
 
     virtual size_t getFileOffsetOfBufferEnd() const { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getFileOffsetOfBufferEnd() not implemented"); }
 
+    /// If true, setReadUntilPosition() guarantees that eof will be reported at the given position.
     virtual bool supportsRightBoundedReads() const { return false; }
 
-    virtual bool isIntegratedWithFilesystemCache() const { return false; }
+    /// Returns true if seek() actually works, false if seek() will always throw (or make subsequent
+    /// nextImpl() calls throw).
+    ///
+    /// This is needed because:
+    ///  * Sometimes there's no cheap way to know in advance whether the buffer is really seekable.
+    ///    Specifically, HTTP read buffer needs to send a request to check whether the server
+    ///    supports byte ranges.
+    ///  * Sometimes when we create such buffer we don't know in advance whether we'll need it to be
+    ///    seekable or not. So we don't want to pay the price for this check in advance.
+    virtual bool checkIfActuallySeekable() { return true; }
+};
+
+/// Useful for reading in parallel.
+/// The created read buffers may outlive the factory.
+///
+/// There are 2 ways to use this:
+///  (1) Never call seek() or getFileSize(), read the file sequentially.
+///      For HTTP, this usually translates to just one HTTP request.
+///  (2) Call checkIfActuallySeekable(), then:
+///       a. If it returned false, go to (1). seek() and getFileSize() are not available (throw if called).
+///       b. If it returned true, seek() and getFileSize() are available, knock yourself out.
+///      For HTTP, checkIfActuallySeekable() sends a HEAD request and returns false if the web server
+///      doesn't support ranges (or doesn't support HEAD requests).
+class SeekableReadBufferFactory : public WithFileSize
+{
+public:
+    ~SeekableReadBufferFactory() override = default;
+
+    // We usually call setReadUntilPosition() and seek() on the returned buffer before reading.
+    // So it's recommended that the returned implementation be lazy, i.e. don't start reading
+    // before the first call to nextImpl().
+    virtual std::unique_ptr<SeekableReadBuffer> getReader() = 0;
+
+    virtual bool checkIfActuallySeekable() { return true; }
 };
 
 using SeekableReadBufferPtr = std::shared_ptr<SeekableReadBuffer>;
 
+using SeekableReadBufferFactoryPtr = std::unique_ptr<SeekableReadBufferFactory>;
+
 /// Wraps a reference to a SeekableReadBuffer into an unique pointer to SeekableReadBuffer.
 /// This function is like wrapReadBufferReference() but for SeekableReadBuffer.
 std::unique_ptr<SeekableReadBuffer> wrapSeekableReadBufferReference(SeekableReadBuffer & ref);
diff --git a/src/IO/SharedThreadPools.cpp b/src/IO/SharedThreadPools.cpp
new file mode 100644
index 00000000000..b7b6aea1567
--- /dev/null
+++ b/src/IO/SharedThreadPools.cpp
@@ -0,0 +1,108 @@
+#include <IO/SharedThreadPools.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/ThreadPool.h>
+#include <Core/Field.h>
+
+namespace CurrentMetrics
+{
+    extern const Metric IOThreads;
+    extern const Metric IOThreadsActive;
+    extern const Metric BackupsIOThreads;
+    extern const Metric BackupsIOThreadsActive;
+    extern const Metric OutdatedPartsLoadingThreads;
+    extern const Metric OutdatedPartsLoadingThreadsActive;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+std::unique_ptr<ThreadPool> IOThreadPool::instance;
+
+void IOThreadPool::initialize(size_t max_threads, size_t max_free_threads, size_t queue_size)
+{
+    if (instance)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The IO thread pool is initialized twice");
+    }
+
+    instance = std::make_unique<ThreadPool>(
+        CurrentMetrics::IOThreads,
+        CurrentMetrics::IOThreadsActive,
+        max_threads,
+        max_free_threads,
+        queue_size,
+        /* shutdown_on_exception= */ false);
+}
+
+ThreadPool & IOThreadPool::get()
+{
+    if (!instance)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The IO thread pool is not initialized");
+    }
+
+    return *instance;
+}
+
+std::unique_ptr<ThreadPool> BackupsIOThreadPool::instance;
+
+void BackupsIOThreadPool::initialize(size_t max_threads, size_t max_free_threads, size_t queue_size)
+{
+    if (instance)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The BackupsIO thread pool is initialized twice");
+    }
+
+    instance = std::make_unique<ThreadPool>(
+        CurrentMetrics::BackupsIOThreads,
+        CurrentMetrics::BackupsIOThreadsActive,
+        max_threads,
+        max_free_threads,
+        queue_size,
+        /* shutdown_on_exception= */ false);
+}
+
+ThreadPool & BackupsIOThreadPool::get()
+{
+    if (!instance)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The BackupsIO thread pool is not initialized");
+    }
+
+    return *instance;
+}
+
+std::unique_ptr<ThreadPool> OutdatedPartsLoadingThreadPool::instance;
+
+void OutdatedPartsLoadingThreadPool::initialize(size_t max_threads, size_t max_free_threads, size_t queue_size)
+{
+    if (instance)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The PartsLoadingThreadPool thread pool is initialized twice");
+    }
+
+    instance = std::make_unique<ThreadPool>(
+        CurrentMetrics::OutdatedPartsLoadingThreads,
+        CurrentMetrics::OutdatedPartsLoadingThreadsActive,
+        max_threads,
+        max_free_threads,
+        queue_size,
+        /* shutdown_on_exception= */ false);
+}
+
+ThreadPool & OutdatedPartsLoadingThreadPool::get()
+{
+    if (!instance)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The PartsLoadingThreadPool thread pool is not initialized");
+    }
+
+    return *instance;
+}
+
+}
diff --git a/src/IO/SharedThreadPools.h b/src/IO/SharedThreadPools.h
new file mode 100644
index 00000000000..1b43dfe778c
--- /dev/null
+++ b/src/IO/SharedThreadPools.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <Common/ThreadPool_fwd.h>
+#include <cstdlib>
+#include <memory>
+
+namespace DB
+{
+
+/*
+ * ThreadPool used for the IO.
+ */
+class IOThreadPool
+{
+    static std::unique_ptr<ThreadPool> instance;
+
+public:
+    static void initialize(size_t max_threads, size_t max_free_threads, size_t queue_size);
+    static ThreadPool & get();
+};
+
+
+/*
+ * ThreadPool used for the Backup IO.
+ */
+class BackupsIOThreadPool
+{
+    static std::unique_ptr<ThreadPool> instance;
+
+public:
+    static void initialize(size_t max_threads, size_t max_free_threads, size_t queue_size);
+    static ThreadPool & get();
+};
+
+
+/*
+ * ThreadPool used for the loading of Outdated data parts for MergeTree tables.
+ */
+class OutdatedPartsLoadingThreadPool
+{
+    static std::unique_ptr<ThreadPool> instance;
+
+public:
+    static void initialize(size_t max_threads, size_t max_free_threads, size_t queue_size);
+    static ThreadPool & get();
+};
+
+}
diff --git a/src/IO/StdIStreamFromMemory.cpp b/src/IO/StdIStreamFromMemory.cpp
new file mode 100644
index 00000000000..3242a7e6383
--- /dev/null
+++ b/src/IO/StdIStreamFromMemory.cpp
@@ -0,0 +1,62 @@
+#include <IO/StdIStreamFromMemory.h>
+
+namespace DB
+{
+
+StdIStreamFromMemory::MemoryBuf::MemoryBuf(char * begin_, size_t size_)
+    : begin(begin_)
+    , size(size_)
+{
+    this->setg(begin, begin, begin + size);
+}
+
+StdIStreamFromMemory::MemoryBuf::int_type StdIStreamFromMemory::MemoryBuf::underflow()
+{
+    if (gptr() < egptr())
+            return traits_type::to_int_type(*gptr());
+    return traits_type::eof();
+}
+
+StdIStreamFromMemory::MemoryBuf::pos_type
+StdIStreamFromMemory::MemoryBuf::seekoff(off_type off, std::ios_base::seekdir way,
+                 std::ios_base::openmode mode)
+{
+    bool out_mode = (std::ios_base::out & mode) != 0;
+    if (out_mode)
+        return off_type(-1);
+
+    off_type ret(-1);
+
+    if (way == std::ios_base::beg)
+        ret = 0;
+    else if (way == std::ios_base::cur)
+        ret = gptr() - begin;
+    else if (way == std::ios_base::end)
+        ret = size;
+
+    if (ret == off_type(-1))
+        return ret;
+
+    ret += off;
+    if (!(ret >= 0 && size_t(ret) <= size))
+        return off_type(-1);
+
+    this->setg(begin, begin + ret, begin + size);
+
+    return pos_type(ret);
+}
+
+StdIStreamFromMemory::MemoryBuf::pos_type StdIStreamFromMemory::MemoryBuf::seekpos(pos_type sp,
+                 std::ios_base::openmode mode)
+{
+    return seekoff(off_type(sp), std::ios_base::beg, mode);
+}
+
+StdIStreamFromMemory::StdIStreamFromMemory(char * begin_, size_t size_)
+    : std::iostream(nullptr)
+    , mem_buf(begin_, size_)
+{
+    init(&mem_buf);
+}
+
+}
diff --git a/src/IO/StdIStreamFromMemory.h b/src/IO/StdIStreamFromMemory.h
new file mode 100644
index 00000000000..64b147fd296
--- /dev/null
+++ b/src/IO/StdIStreamFromMemory.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <iostream>
+
+namespace DB
+{
+
+/// StdIStreamFromMemory is used in WriteBufferFromS3 as a stream which is passed to the S3::Client
+/// It provides istream interface (only reading) over the memory.
+/// However S3::Client requires iostream interface it only reads from the stream
+
+class StdIStreamFromMemory : public std::iostream
+{
+    struct MemoryBuf: std::streambuf
+    {
+            MemoryBuf(char * begin_, size_t size_);
+
+            int_type underflow() override;
+
+            pos_type seekoff(off_type off, std::ios_base::seekdir way,
+                             std::ios_base::openmode mode) override;
+
+            pos_type seekpos(pos_type sp,
+                             std::ios_base::openmode mode) override;
+
+            char * begin = nullptr;
+            size_t size = 0;
+    };
+
+    MemoryBuf mem_buf;
+
+public:
+    StdIStreamFromMemory(char * begin_, size_t size_);
+};
+
+}
diff --git a/src/IO/SwapHelper.cpp b/src/IO/SwapHelper.cpp
new file mode 100644
index 00000000000..4a1cc8acf4c
--- /dev/null
+++ b/src/IO/SwapHelper.cpp
@@ -0,0 +1,17 @@
+#include <IO/SwapHelper.h>
+
+namespace DB
+{
+
+SwapHelper::SwapHelper(BufferBase & b1_, BufferBase & b2_)
+    : b1(b1_), b2(b2_)
+{
+    b1.swap(b2);
+}
+
+SwapHelper::~SwapHelper()
+{
+    b1.swap(b2);
+}
+
+}
diff --git a/src/IO/SwapHelper.h b/src/IO/SwapHelper.h
index cedbf5f78fe..fcf32927f23 100644
--- a/src/IO/SwapHelper.h
+++ b/src/IO/SwapHelper.h
@@ -1,16 +1,19 @@
 #pragma once
+
 #include <IO/BufferBase.h>
 
 namespace DB
 {
-    class SwapHelper
-    {
-    public:
-        SwapHelper(BufferBase & b1_, BufferBase & b2_) : b1(b1_), b2(b2_) { b1.swap(b2); }
-        ~SwapHelper() { b1.swap(b2); }
 
-    private:
-        BufferBase & b1;
-        BufferBase & b2;
-    };
+class SwapHelper
+{
+public:
+    SwapHelper(BufferBase & b1_, BufferBase & b2_);
+    ~SwapHelper();
+
+private:
+    BufferBase & b1;
+    BufferBase & b2;
+};
+
 }
diff --git a/src/IO/TimeoutSetter.cpp b/src/IO/TimeoutSetter.cpp
index 1beb26772e5..ed21383ccd4 100644
--- a/src/IO/TimeoutSetter.cpp
+++ b/src/IO/TimeoutSetter.cpp
@@ -31,13 +31,15 @@ TimeoutSetter::~TimeoutSetter()
 {
     try
     {
+        bool connected = socket.impl()->initialized();
+        if (!connected)
+            return;
+
         socket.setSendTimeout(old_send_timeout);
         socket.setReceiveTimeout(old_receive_timeout);
     }
     catch (...)
     {
-        /// Sometimes caught on Mac OS X. This message can be safely ignored.
-        /// If you are developer using Mac, please debug this error message by yourself.
         tryLogCurrentException("Client", "TimeoutSetter: Can't reset timeouts");
     }
 }
diff --git a/src/IO/UncompressedCache.h b/src/IO/UncompressedCache.h
index 3d1c907d364..2e654b27ed7 100644
--- a/src/IO/UncompressedCache.h
+++ b/src/IO/UncompressedCache.h
@@ -42,8 +42,11 @@ private:
     using Base = CacheBase<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>;
 
 public:
-    explicit UncompressedCache(size_t max_size_in_bytes, const String & uncompressed_cache_policy = "")
-        : Base(max_size_in_bytes, 0, uncompressed_cache_policy) {}
+    explicit UncompressedCache(size_t max_size_in_bytes)
+        : Base(max_size_in_bytes) {}
+
+    UncompressedCache(const String & uncompressed_cache_policy, size_t max_size_in_bytes)
+        : Base(uncompressed_cache_policy, max_size_in_bytes) {}
 
     /// Calculate key from path to file and offset.
     static UInt128 hash(const String & path_to_file, size_t offset)
diff --git a/src/IO/VarInt.cpp b/src/IO/VarInt.cpp
new file mode 100644
index 00000000000..ca4b95fcb60
--- /dev/null
+++ b/src/IO/VarInt.cpp
@@ -0,0 +1,25 @@
+#include <IO/VarInt.h>
+#include <Common/Exception.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ATTEMPT_TO_READ_AFTER_EOF;
+    extern const int BAD_ARGUMENTS;
+}
+
+void throwReadAfterEOF()
+{
+    throw Exception(ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF, "Attempt to read after eof");
+}
+
+void throwValueTooLargeForVarIntEncoding(UInt64 x)
+{
+    /// Under practical circumstances, we should virtually never end up here but AST Fuzzer manages to create superlarge input integers
+    /// which trigger this exception. Intentionally not throwing LOGICAL_ERROR or calling abort() or [ch]assert(false), so AST Fuzzer
+    /// can swallow the exception and continue to run.
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Value {} is too large for VarInt encoding", x);
+}
+
+}
diff --git a/src/IO/VarInt.h b/src/IO/VarInt.h
index 0869051034a..f6441391c8f 100644
--- a/src/IO/VarInt.h
+++ b/src/IO/VarInt.h
@@ -2,40 +2,36 @@
 
 #include <iostream>
 #include <base/types.h>
+#include <base/defines.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 
 
 namespace DB
 {
-namespace ErrorCodes
-{
-    extern const int ATTEMPT_TO_READ_AFTER_EOF;
-}
 
+/// Variable-Length Quantity (VLQ) Base-128 compression, also known as Variable Byte (VB) or Varint encoding.
 
-/** Write UInt64 in variable length format (base128) NOTE Only up to 2^63 - 1 are supported. */
+/// Write UInt64 in variable length format (base128)
 void writeVarUInt(UInt64 x, std::ostream & ostr);
 void writeVarUInt(UInt64 x, WriteBuffer & ostr);
 char * writeVarUInt(UInt64 x, char * ostr);
 
-
-/** Read UInt64, written in variable length format (base128) */
+/// Read UInt64, written in variable length format (base128)
 void readVarUInt(UInt64 & x, std::istream & istr);
 void readVarUInt(UInt64 & x, ReadBuffer & istr);
 const char * readVarUInt(UInt64 & x, const char * istr, size_t size);
 
-
-/** Get the length of UInt64 in VarUInt format */
+/// Get the length of an variable-length-encoded integer
 size_t getLengthOfVarUInt(UInt64 x);
-
-/** Get the Int64 length in VarInt format */
 size_t getLengthOfVarInt(Int64 x);
 
+[[noreturn]] void throwReadAfterEOF();
+[[noreturn]] void throwValueTooLargeForVarIntEncoding(UInt64 x);
 
-/** Write Int64 in variable length format (base128) */
-template <typename OUT>
-inline void writeVarInt(Int64 x, OUT & ostr)
+/// Write Int64 in variable length format (base128)
+template <typename Out>
+inline void writeVarInt(Int64 x, Out & ostr)
 {
     writeVarUInt(static_cast<UInt64>((x << 1) ^ (x >> 63)), ostr);
 }
@@ -46,9 +42,9 @@ inline char * writeVarInt(Int64 x, char * ostr)
 }
 
 
-/** Read Int64, written in variable length format (base128) */
-template <typename IN>
-inline void readVarInt(Int64 & x, IN & istr)
+/// Read Int64, written in variable length format (base128)
+template <typename In>
+inline void readVarInt(Int64 & x, In & istr)
 {
     readVarUInt(*reinterpret_cast<UInt64*>(&x), istr);
     x = (static_cast<UInt64>(x) >> 1) ^ -(x & 1);
@@ -62,21 +58,6 @@ inline const char * readVarInt(Int64 & x, const char * istr, size_t size)
 }
 
 
-inline void writeVarT(UInt64 x, std::ostream & ostr) { writeVarUInt(x, ostr); }
-inline void writeVarT(Int64 x, std::ostream & ostr) { writeVarInt(x, ostr); }
-inline void writeVarT(UInt64 x, WriteBuffer & ostr) { writeVarUInt(x, ostr); }
-inline void writeVarT(Int64 x, WriteBuffer & ostr) { writeVarInt(x, ostr); }
-inline char * writeVarT(UInt64 x, char * & ostr) { return writeVarUInt(x, ostr); }
-inline char * writeVarT(Int64 x, char * & ostr) { return writeVarInt(x, ostr); }
-
-inline void readVarT(UInt64 & x, std::istream & istr) { readVarUInt(x, istr); }
-inline void readVarT(Int64 & x, std::istream & istr) { readVarInt(x, istr); }
-inline void readVarT(UInt64 & x, ReadBuffer & istr) { readVarUInt(x, istr); }
-inline void readVarT(Int64 & x, ReadBuffer & istr) { readVarInt(x, istr); }
-inline const char * readVarT(UInt64 & x, const char * istr, size_t size) { return readVarUInt(x, istr, size); }
-inline const char * readVarT(Int64 & x, const char * istr, size_t size) { return readVarInt(x, istr, size); }
-
-
 /// For [U]Int32, [U]Int16, size_t.
 
 inline void readVarUInt(UInt32 & x, ReadBuffer & istr)
@@ -116,12 +97,6 @@ inline void readVarUInt(T & x, ReadBuffer & istr)
     x = tmp;
 }
 
-
-[[noreturn]] inline void throwReadAfterEOF()
-{
-    throw Exception(ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF, "Attempt to read after eof");
-}
-
 template <bool fast>
 inline void readVarUIntImpl(UInt64 & x, ReadBuffer & istr)
 {
@@ -129,10 +104,10 @@ inline void readVarUIntImpl(UInt64 & x, ReadBuffer & istr)
     for (size_t i = 0; i < 9; ++i)
     {
         if constexpr (!fast)
-            if (istr.eof())
+            if (istr.eof()) [[unlikely]]
                 throwReadAfterEOF();
 
-        UInt64 byte = *istr.position(); /// NOLINT
+        UInt64 byte = *istr.position();
         ++istr.position();
         x |= (byte & 0x7F) << (7 * i);
 
@@ -169,10 +144,10 @@ inline const char * readVarUInt(UInt64 & x, const char * istr, size_t size)
     x = 0;
     for (size_t i = 0; i < 9; ++i)
     {
-        if (istr == end)
+        if (istr == end) [[unlikely]]
             throwReadAfterEOF();
 
-        UInt64 byte = *istr; /// NOLINT
+        UInt64 byte = *istr;
         ++istr;
         x |= (byte & 0x7F) << (7 * i);
 
@@ -183,9 +158,16 @@ inline const char * readVarUInt(UInt64 & x, const char * istr, size_t size)
     return istr;
 }
 
+/// NOTE: Due to historical reasons, only values up to 1<<63-1 can be safely encoded/decoded (bigger values are not idempotent under
+/// encoding/decoding). This cannot be changed without breaking backward compatibility (some drivers, e.g. clickhouse-rs (Rust), have the
+/// same limitation, others support the full 1<<64 range, e.g. clickhouse-driver (Python))
+constexpr UInt64 VAR_UINT_MAX = (1ULL<<63) - 1;
 
 inline void writeVarUInt(UInt64 x, WriteBuffer & ostr)
 {
+    if (x > VAR_UINT_MAX) [[unlikely]]
+        throwValueTooLargeForVarIntEncoding(x);
+
     for (size_t i = 0; i < 9; ++i)
     {
         uint8_t byte = x & 0x7F;
@@ -205,6 +187,9 @@ inline void writeVarUInt(UInt64 x, WriteBuffer & ostr)
 
 inline void writeVarUInt(UInt64 x, std::ostream & ostr)
 {
+    if (x > VAR_UINT_MAX) [[unlikely]]
+        throwValueTooLargeForVarIntEncoding(x);
+
     for (size_t i = 0; i < 9; ++i)
     {
         uint8_t byte = x & 0x7F;
@@ -222,6 +207,9 @@ inline void writeVarUInt(UInt64 x, std::ostream & ostr)
 
 inline char * writeVarUInt(UInt64 x, char * ostr)
 {
+    if (x > VAR_UINT_MAX) [[unlikely]]
+        throwValueTooLargeForVarIntEncoding(x);
+
     for (size_t i = 0; i < 9; ++i)
     {
         uint8_t byte = x & 0x7F;
diff --git a/src/IO/WithFileName.cpp b/src/IO/WithFileName.cpp
index 6ecb3671ca0..9d9f264c861 100644
--- a/src/IO/WithFileName.cpp
+++ b/src/IO/WithFileName.cpp
@@ -26,4 +26,14 @@ String getFileNameFromReadBuffer(const ReadBuffer & in)
         return getFileName(in);
 }
 
+String getExceptionEntryWithFileName(const ReadBuffer & in)
+{
+    auto filename = getFileNameFromReadBuffer(in);
+
+    if (filename.empty())
+        return "";
+
+    return fmt::format(": While reading from: {}", filename);
+}
+
 }
diff --git a/src/IO/WithFileName.h b/src/IO/WithFileName.h
index d770634e738..595f1a768c5 100644
--- a/src/IO/WithFileName.h
+++ b/src/IO/WithFileName.h
@@ -14,5 +14,6 @@ public:
 };
 
 String getFileNameFromReadBuffer(const ReadBuffer & in);
+String getExceptionEntryWithFileName(const ReadBuffer & in);
 
 }
diff --git a/src/IO/WriteBuffer.h b/src/IO/WriteBuffer.h
index 436d07515a3..2c891e17d9a 100644
--- a/src/IO/WriteBuffer.h
+++ b/src/IO/WriteBuffer.h
@@ -42,7 +42,8 @@ public:
     {
         if (!offset())
             return;
-        bytes += offset();
+
+        auto bytes_in_buffer = offset();
 
         try
         {
@@ -54,9 +55,11 @@ public:
               * so that later (for example, when the stack was expanded) there was no second attempt to write data.
               */
             pos = working_buffer.begin();
+            bytes += bytes_in_buffer;
             throw;
         }
 
+        bytes += bytes_in_buffer;
         pos = working_buffer.begin();
     }
 
diff --git a/src/IO/WriteBufferFromFile.cpp b/src/IO/WriteBufferFromFile.cpp
index 95a4bc8a652..e58f1e3a60c 100644
--- a/src/IO/WriteBufferFromFile.cpp
+++ b/src/IO/WriteBufferFromFile.cpp
@@ -29,10 +29,11 @@ WriteBufferFromFile::WriteBufferFromFile(
     const std::string & file_name_,
     size_t buf_size,
     int flags,
+    ThrottlerPtr throttler_,
     mode_t mode,
     char * existing_memory,
     size_t alignment)
-    : WriteBufferFromFileDescriptor(-1, buf_size, existing_memory, alignment, file_name_)
+    : WriteBufferFromFileDescriptor(-1, buf_size, existing_memory, throttler_, alignment, file_name_)
 {
     ProfileEvents::increment(ProfileEvents::FileOpen);
 
@@ -63,9 +64,10 @@ WriteBufferFromFile::WriteBufferFromFile(
     int & fd_,
     const std::string & original_file_name,
     size_t buf_size,
+    ThrottlerPtr throttler_,
     char * existing_memory,
     size_t alignment)
-    : WriteBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment, original_file_name)
+    : WriteBufferFromFileDescriptor(fd_, buf_size, existing_memory, throttler_, alignment, original_file_name)
 {
     fd_ = -1;
 }
diff --git a/src/IO/WriteBufferFromFile.h b/src/IO/WriteBufferFromFile.h
index 3363a568bac..57847d893af 100644
--- a/src/IO/WriteBufferFromFile.h
+++ b/src/IO/WriteBufferFromFile.h
@@ -3,6 +3,7 @@
 #include <sys/types.h>
 
 #include <Common/CurrentMetrics.h>
+#include <Common/Throttler_fwd.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 
 
@@ -32,6 +33,7 @@ public:
         const std::string & file_name_,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         int flags = -1,
+        ThrottlerPtr throttler_ = {},
         mode_t mode = 0666,
         char * existing_memory = nullptr,
         size_t alignment = 0);
@@ -41,6 +43,7 @@ public:
         int & fd,   /// Will be set to -1 if constructor didn't throw and ownership of file descriptor is passed to the object.
         const std::string & original_file_name = {},
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        ThrottlerPtr throttler_ = {},
         char * existing_memory = nullptr,
         size_t alignment = 0);
 
diff --git a/src/IO/WriteBufferFromFileDecorator.cpp b/src/IO/WriteBufferFromFileDecorator.cpp
index ac801534b4f..4cc881f177f 100644
--- a/src/IO/WriteBufferFromFileDecorator.cpp
+++ b/src/IO/WriteBufferFromFileDecorator.cpp
@@ -1,6 +1,7 @@
 #include "WriteBufferFromFileDecorator.h"
 
 #include <IO/WriteBuffer.h>
+#include <IO/SwapHelper.h>
 
 namespace DB
 {
@@ -13,12 +14,18 @@ WriteBufferFromFileDecorator::WriteBufferFromFileDecorator(std::unique_ptr<Write
 
 void WriteBufferFromFileDecorator::finalizeImpl()
 {
-    next();
 
+    /// In case of exception in preFinalize as a part of finalize call
+    /// WriteBufferFromFileDecorator.finalized is set as true
+    /// but impl->finalized is remain false
+    /// That leads to situation when the destructor of impl is called with impl->finalized equal false.
     if (!is_prefinalized)
         WriteBufferFromFileDecorator::preFinalize();
 
-    impl->finalize();
+    {
+        SwapHelper swap(*this, *impl);
+        impl->finalize();
+    }
 }
 
 WriteBufferFromFileDecorator::~WriteBufferFromFileDecorator()
@@ -31,11 +38,21 @@ WriteBufferFromFileDecorator::~WriteBufferFromFileDecorator()
     {
         tryLogCurrentException(__PRETTY_FUNCTION__);
     }
+
+    /// It is not a mistake that swap is called here
+    /// Swap has been called at constructor, it should be called at destructor
+    /// In oreder to provide valid buffer for impl's d-tor call
+    swap(*impl);
 }
 
 void WriteBufferFromFileDecorator::sync()
 {
-    impl->sync();
+    next();
+
+    {
+        SwapHelper swap(*this, *impl);
+        impl->sync();
+    }
 }
 
 std::string WriteBufferFromFileDecorator::getFileName() const
@@ -45,11 +62,22 @@ std::string WriteBufferFromFileDecorator::getFileName() const
     return std::string();
 }
 
+void WriteBufferFromFileDecorator::preFinalize()
+{
+    next();
+
+    {
+        SwapHelper swap(*this, *impl);
+        impl->preFinalize();
+    }
+
+    is_prefinalized = true;
+}
+
 void WriteBufferFromFileDecorator::nextImpl()
 {
-    swap(*impl);
+    SwapHelper swap(*this, *impl);
     impl->next();
-    swap(*impl);
 }
 
 }
diff --git a/src/IO/WriteBufferFromFileDecorator.h b/src/IO/WriteBufferFromFileDecorator.h
index dde05276c28..5344bb1425c 100644
--- a/src/IO/WriteBufferFromFileDecorator.h
+++ b/src/IO/WriteBufferFromFileDecorator.h
@@ -17,12 +17,7 @@ public:
 
     std::string getFileName() const override;
 
-    void preFinalize() override
-    {
-        next();
-        impl->preFinalize();
-        is_prefinalized = true;
-    }
+    void preFinalize() override;
 
     const WriteBuffer & getImpl() const { return *impl; }
 
diff --git a/src/IO/WriteBufferFromFileDescriptor.cpp b/src/IO/WriteBufferFromFileDescriptor.cpp
index ba49c16c11f..135ff608967 100644
--- a/src/IO/WriteBufferFromFileDescriptor.cpp
+++ b/src/IO/WriteBufferFromFileDescriptor.cpp
@@ -3,6 +3,7 @@
 #include <cassert>
 #include <sys/stat.h>
 
+#include <Common/Throttler.h>
 #include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
@@ -20,6 +21,8 @@ namespace ProfileEvents
     extern const Event DiskWriteElapsedMicroseconds;
     extern const Event FileSync;
     extern const Event FileSyncElapsedMicroseconds;
+    extern const Event LocalWriteThrottlerBytes;
+    extern const Event LocalWriteThrottlerSleepMicroseconds;
 }
 
 namespace CurrentMetrics
@@ -71,7 +74,11 @@ void WriteBufferFromFileDescriptor::nextImpl()
         }
 
         if (res > 0)
+        {
             bytes_written += res;
+            if (throttler)
+                throttler->add(res, ProfileEvents::LocalWriteThrottlerBytes, ProfileEvents::LocalWriteThrottlerSleepMicroseconds);
+        }
     }
 
     ProfileEvents::increment(ProfileEvents::DiskWriteElapsedMicroseconds, watch.elapsedMicroseconds());
@@ -85,10 +92,12 @@ WriteBufferFromFileDescriptor::WriteBufferFromFileDescriptor(
     int fd_,
     size_t buf_size,
     char * existing_memory,
+    ThrottlerPtr throttler_,
     size_t alignment,
     std::string file_name_)
     : WriteBufferFromFileBase(buf_size, existing_memory, alignment)
     , fd(fd_)
+    , throttler(throttler_)
     , file_name(std::move(file_name_))
 {
 }
diff --git a/src/IO/WriteBufferFromFileDescriptor.h b/src/IO/WriteBufferFromFileDescriptor.h
index cc69567932f..cb73b1e1d08 100644
--- a/src/IO/WriteBufferFromFileDescriptor.h
+++ b/src/IO/WriteBufferFromFileDescriptor.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <IO/WriteBufferFromFileBase.h>
+#include <Common/Throttler_fwd.h>
 
 
 namespace DB
@@ -15,6 +16,7 @@ public:
         int fd_ = -1,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         char * existing_memory = nullptr,
+        ThrottlerPtr throttler_ = {},
         size_t alignment = 0,
         std::string file_name_ = "");
 
@@ -49,6 +51,7 @@ protected:
     void nextImpl() override;
 
     int fd;
+    ThrottlerPtr throttler;
 
     /// If file has name contains filename, otherwise contains string "(fd=...)"
     std::string file_name;
diff --git a/src/IO/WriteBufferFromHTTP.cpp b/src/IO/WriteBufferFromHTTP.cpp
index f7456ad6b6c..355c42a23c9 100644
--- a/src/IO/WriteBufferFromHTTP.cpp
+++ b/src/IO/WriteBufferFromHTTP.cpp
@@ -11,6 +11,7 @@ WriteBufferFromHTTP::WriteBufferFromHTTP(
     const std::string & method,
     const std::string & content_type,
     const std::string & content_encoding,
+    const HTTPHeaderEntries & additional_headers,
     const ConnectionTimeouts & timeouts,
     size_t buffer_size_)
     : WriteBufferFromOStream(buffer_size_)
@@ -28,6 +29,9 @@ WriteBufferFromHTTP::WriteBufferFromHTTP(
     if (!content_encoding.empty())
         request.set("Content-Encoding", content_encoding);
 
+    for (const auto & header: additional_headers)
+        request.add(header.name, header.value);
+
     LOG_TRACE((&Poco::Logger::get("WriteBufferToHTTP")), "Sending request to {}", uri.toString());
 
     ostr = &session->sendRequest(request);
diff --git a/src/IO/WriteBufferFromHTTP.h b/src/IO/WriteBufferFromHTTP.h
index 6966bc8a5c5..ce5020dfa78 100644
--- a/src/IO/WriteBufferFromHTTP.h
+++ b/src/IO/WriteBufferFromHTTP.h
@@ -4,6 +4,7 @@
 #include <IO/WriteBuffer.h>
 #include <IO/WriteBufferFromOStream.h>
 #include <IO/HTTPCommon.h>
+#include <IO/HTTPHeaderEntries.h>
 #include <Poco/Net/HTTPClientSession.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
@@ -22,6 +23,7 @@ public:
                                  const std::string & method = Poco::Net::HTTPRequest::HTTP_POST, // POST or PUT only
                                  const std::string & content_type = "",
                                  const std::string & content_encoding = "",
+                                 const HTTPHeaderEntries & additional_headers = {},
                                  const ConnectionTimeouts & timeouts = {},
                                  size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE);
 
diff --git a/src/IO/WriteBufferFromPocoSocket.cpp b/src/IO/WriteBufferFromPocoSocket.cpp
index e01245849ae..039110dfb62 100644
--- a/src/IO/WriteBufferFromPocoSocket.cpp
+++ b/src/IO/WriteBufferFromPocoSocket.cpp
@@ -9,6 +9,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/AsyncTaskExecutor.h>
 
 
 namespace ProfileEvents
@@ -60,11 +61,19 @@ void WriteBufferFromPocoSocket::nextImpl()
             size_t size = offset() - bytes_written;
             if (size > INT_MAX)
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Buffer overflow");
+
+            /// If async_callback is specified, and write will block, run async_callback and try again later.
+            /// It is expected that file descriptor may be polled externally.
+            /// Note that send timeout is not checked here. External code should check it while polling.
+            while (async_callback && !socket.poll(0, Poco::Net::Socket::SELECT_WRITE | Poco::Net::Socket::SELECT_ERROR))
+                async_callback(socket.impl()->sockfd(), socket.getSendTimeout(), AsyncEventTimeoutType::SEND, socket_description, AsyncTaskExecutor::Event::WRITE | AsyncTaskExecutor::Event::ERROR);
+
             res = socket.impl()->sendBytes(pos, static_cast<int>(size));
         }
         catch (const Poco::Net::NetException & e)
         {
-            throw NetException(ErrorCodes::NETWORK_ERROR, "{}, while writing to socket ({})", e.displayText(), peer_address.toString());
+            throw NetException(ErrorCodes::NETWORK_ERROR, "{}, while writing to socket ({} -> {})", e.displayText(),
+                               our_address.toString(), peer_address.toString());
         }
         catch (const Poco::TimeoutException &)
         {
@@ -74,18 +83,24 @@ void WriteBufferFromPocoSocket::nextImpl()
         }
         catch (const Poco::IOException & e)
         {
-            throw NetException(ErrorCodes::NETWORK_ERROR, "{}, while writing to socket ({})", e.displayText(), peer_address.toString());
+            throw NetException(ErrorCodes::NETWORK_ERROR, "{}, while writing to socket ({} -> {})", e.displayText(),
+                               our_address.toString(), peer_address.toString());
         }
 
         if (res < 0)
-            throw NetException(ErrorCodes::CANNOT_WRITE_TO_SOCKET, "Cannot write to socket ({})", peer_address.toString());
+            throw NetException(ErrorCodes::CANNOT_WRITE_TO_SOCKET, "Cannot write to socket ({} -> {})",
+                               our_address.toString(), peer_address.toString());
 
         bytes_written += res;
     }
 }
 
 WriteBufferFromPocoSocket::WriteBufferFromPocoSocket(Poco::Net::Socket & socket_, size_t buf_size)
-    : BufferWithOwnMemory<WriteBuffer>(buf_size), socket(socket_), peer_address(socket.peerAddress())
+    : BufferWithOwnMemory<WriteBuffer>(buf_size)
+    , socket(socket_)
+    , peer_address(socket.peerAddress())
+    , our_address(socket.address())
+    , socket_description("socket (" + peer_address.toString() + ")")
 {
 }
 
diff --git a/src/IO/WriteBufferFromPocoSocket.h b/src/IO/WriteBufferFromPocoSocket.h
index 295ca16ecaf..ecb61020357 100644
--- a/src/IO/WriteBufferFromPocoSocket.h
+++ b/src/IO/WriteBufferFromPocoSocket.h
@@ -4,11 +4,13 @@
 
 #include <IO/WriteBuffer.h>
 #include <IO/BufferWithOwnMemory.h>
-
+#include <Common/AsyncTaskExecutor.h>
 
 namespace DB
 {
 
+using AsyncCallback = std::function<void(int, Poco::Timespan, AsyncEventTimeoutType, const std::string &, uint32_t)>;
+
 /** Works with the ready Poco::Net::Socket. Blocking operations.
   */
 class WriteBufferFromPocoSocket : public BufferWithOwnMemory<WriteBuffer>
@@ -18,6 +20,8 @@ public:
 
     ~WriteBufferFromPocoSocket() override;
 
+    void setAsyncCallback(AsyncCallback async_callback_) { async_callback = std::move(async_callback_); }
+
 protected:
     void nextImpl() override;
 
@@ -28,6 +32,11 @@ protected:
       *  (getpeername will return an error).
       */
     Poco::Net::SocketAddress peer_address;
+    Poco::Net::SocketAddress our_address;
+
+private:
+    AsyncCallback async_callback;
+    std::string socket_description;
 };
 
 }
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 86a4cebb5d8..954c996d929 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -2,13 +2,16 @@
 
 #if USE_AWS_S3
 
+#include "StdIStreamFromMemory.h"
+#include "WriteBufferFromS3.h"
+#include "WriteBufferFromS3TaskTracker.h"
+
 #include <Common/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/Throttler.h>
 #include <Interpreters/Cache/FileCache.h>
 
 #include <IO/ResourceGuard.h>
-#include <IO/WriteBufferFromS3.h>
 #include <IO/WriteHelpers.h>
 #include <IO/S3Common.h>
 #include <IO/S3/Requests.h>
@@ -23,15 +26,19 @@
 namespace ProfileEvents
 {
     extern const Event WriteBufferFromS3Bytes;
+    extern const Event WriteBufferFromS3Microseconds;
+    extern const Event WriteBufferFromS3RequestsErrors;
     extern const Event S3WriteBytes;
 
     extern const Event S3CreateMultipartUpload;
     extern const Event S3CompleteMultipartUpload;
+    extern const Event S3AbortMultipartUpload;
     extern const Event S3UploadPart;
     extern const Event S3PutObject;
 
     extern const Event DiskS3CreateMultipartUpload;
     extern const Event DiskS3CompleteMultipartUpload;
+    extern const Event DiskS3AbortMultipartUpload;
     extern const Event DiskS3UploadPart;
     extern const Event DiskS3PutObject;
 
@@ -41,152 +48,311 @@ namespace ProfileEvents
 
 namespace DB
 {
-// S3 protocol does not allow to have multipart upload with more than 10000 parts.
-// In case server does not return an error on exceeding that number, we print a warning
-// because custom S3 implementation may allow relaxed requirements on that.
-const int S3_WARN_MAX_PARTS = 10000;
 
 namespace ErrorCodes
 {
     extern const int S3_ERROR;
     extern const int INVALID_CONFIG_PARAMETER;
+    extern const int LOGICAL_ERROR;
 }
 
-struct WriteBufferFromS3::UploadPartTask
+struct WriteBufferFromS3::PartData
 {
-    S3::UploadPartRequest req;
-    bool is_finished = false;
-    std::string tag;
-    std::exception_ptr exception;
+    Memory<> memory;
+    size_t data_size = 0;
+
+    std::shared_ptr<std::iostream> createAwsBuffer()
+    {
+        auto buffer = std::make_shared<StdIStreamFromMemory>(memory.data(), data_size);
+        buffer->exceptions(std::ios::badbit);
+        return buffer;
+    }
+
+    bool isEmpty() const
+    {
+        return data_size == 0;
+    }
 };
 
-struct WriteBufferFromS3::PutObjectTask
-{
-    S3::PutObjectRequest req;
-    bool is_finished = false;
-    std::exception_ptr exception;
-};
 
 WriteBufferFromS3::WriteBufferFromS3(
     std::shared_ptr<const S3::Client> client_ptr_,
     const String & bucket_,
     const String & key_,
+    size_t buf_size_,
     const S3Settings::RequestSettings & request_settings_,
     std::optional<std::map<String, String>> object_metadata_,
-    size_t buffer_size_,
     ThreadPoolCallbackRunner<void> schedule_,
     const WriteSettings & write_settings_)
-    : BufferWithOwnMemory<WriteBuffer>(buffer_size_, nullptr, 0)
+    : WriteBufferFromFileBase(buf_size_, nullptr, 0)
     , bucket(bucket_)
     , key(key_)
     , request_settings(request_settings_)
     , upload_settings(request_settings.getUploadSettings())
+    , write_settings(write_settings_)
     , client_ptr(std::move(client_ptr_))
     , object_metadata(std::move(object_metadata_))
-    , upload_part_size(upload_settings.min_upload_part_size)
-    , schedule(std::move(schedule_))
-    , write_settings(write_settings_)
+    , buffer_allocation_policy(ChooseBufferPolicy(upload_settings))
+    , task_tracker(
+          std::make_unique<WriteBufferFromS3::TaskTracker>(
+              std::move(schedule_),
+              upload_settings.max_inflight_parts_for_one_file))
 {
+    LOG_TRACE(log, "Create WriteBufferFromS3, {}", getLogDetails());
+
     allocateBuffer();
 }
 
 void WriteBufferFromS3::nextImpl()
 {
-    if (!offset())
+    LOG_TRACE(log, "nextImpl with incoming data size {}, memory buffer size {}. {}", offset(), memory.size(), getLogDetails());
+
+    if (is_prefinalized)
+        throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Cannot write to prefinalized buffer for S3, the file could have been created with PutObjectRequest");
+
+    /// Make sense to call waitIfAny before adding new async task to check if there is an exception
+    /// The faster the exception is propagated the lesser time is spent for cancellation
+    /// Despite the fact that `task_tracker->add()` collects tasks statuses and propagates their exceptions
+    /// that call is necessary for the case when the is no in-flight limitation and therefore `task_tracker->add()` doesn't wait anything
+    task_tracker->waitIfAny();
+
+    hidePartialData();
+
+    reallocateFirstBuffer();
+
+    if (available() > 0)
         return;
 
-    /// Buffer in a bad state after exception
-    if (temporary_buffer->tellp() == -1)
-        allocateBuffer();
+    detachBuffer();
 
-    size_t size = offset();
-    temporary_buffer->write(working_buffer.begin(), size);
+    if (!multipart_upload_id.empty() || detached_part_data.size() > 1)
+        writeMultipartUpload();
 
-    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Bytes, offset());
-    last_part_size += offset();
-    if (write_settings.remote_throttler)
-        write_settings.remote_throttler->add(offset(), ProfileEvents::RemoteWriteThrottlerBytes, ProfileEvents::RemoteWriteThrottlerSleepMicroseconds);
-
-    /// Data size exceeds singlepart upload threshold, need to use multipart upload.
-    if (multipart_upload_id.empty() && last_part_size > upload_settings.max_single_part_upload_size)
-        createMultipartUpload();
-
-    chassert(upload_part_size > 0);
-    if (!multipart_upload_id.empty() && last_part_size > upload_part_size)
-    {
-        writePart();
-
-        allocateBuffer();
-    }
-
-    waitForReadyBackGroundTasks();
-}
-
-void WriteBufferFromS3::allocateBuffer()
-{
-    temporary_buffer = Aws::MakeShared<Aws::StringStream>("temporary buffer");
-    temporary_buffer->exceptions(std::ios::badbit);
-    last_part_size = 0;
-}
-
-WriteBufferFromS3::~WriteBufferFromS3()
-{
-#ifndef NDEBUG
-    if (!finalized)
-    {
-        LOG_ERROR(log, "WriteBufferFromS3 is not finalized in destructor. It's a bug");
-        std::terminate();
-    }
-#else
-    try
-    {
-        finalize();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
-#endif
+    allocateBuffer();
 }
 
 void WriteBufferFromS3::preFinalize()
 {
-    next();
+    if (is_prefinalized)
+        return;
 
-    if (multipart_upload_id.empty())
+    LOG_TRACE(log, "preFinalize WriteBufferFromS3. {}", getLogDetails());
+
+    /// This function should not be run again if an exception has occurred
+    is_prefinalized = true;
+
+    hidePartialData();
+
+    if (hidden_size > 0)
+        detachBuffer();
+    setFakeBufferWhenPreFinalized();
+
+    bool do_single_part_upload = false;
+
+    if (multipart_upload_id.empty() && detached_part_data.size() <= 1)
     {
-        makeSinglepartUpload();
+        if (detached_part_data.empty() || detached_part_data.front().data_size <= upload_settings.max_single_part_upload_size)
+            do_single_part_upload = true;
+    }
+
+    if (do_single_part_upload)
+    {
+        if (detached_part_data.empty())
+        {
+            makeSinglepartUpload({});
+        }
+        else
+        {
+            makeSinglepartUpload(std::move(detached_part_data.front()));
+            detached_part_data.pop_front();
+        }
     }
     else
     {
-        /// Write rest of the data as last part.
-        writePart();
+        writeMultipartUpload();
     }
-
-    is_prefinalized = true;
 }
 
 void WriteBufferFromS3::finalizeImpl()
 {
+    LOG_TRACE(log, "finalizeImpl WriteBufferFromS3. {}.", getLogDetails());
+
     if (!is_prefinalized)
         preFinalize();
 
-    waitForAllBackGroundTasks();
+    chassert(offset() == 0);
+    chassert(hidden_size == 0);
+
+    task_tracker->waitAll();
 
     if (!multipart_upload_id.empty())
+    {
         completeMultipartUpload();
+        multipart_upload_finished = true;
+    }
 
     if (request_settings.check_objects_after_upload)
     {
         LOG_TRACE(log, "Checking object {} exists after upload", key);
         S3::checkObjectExists(*client_ptr, bucket, key, {}, request_settings, /* for_disk_s3= */ write_settings.for_object_storage, "Immediately after upload");
+
+        LOG_TRACE(log, "Checking object {} has size as expected {}", key, total_size);
+        size_t actual_size = S3::getObjectSize(*client_ptr, bucket, key, {}, request_settings, /* for_disk_s3= */ write_settings.for_object_storage);
+        if (actual_size != total_size)
+            throw Exception(
+                    ErrorCodes::S3_ERROR,
+                    "Object {} from bucket {} has unexpected size {} after upload, expected size {}, it's a bug in S3 or S3 API.",
+                    key, bucket, actual_size, total_size);
+
         LOG_TRACE(log, "Object {} exists after upload", key);
     }
 }
 
+String WriteBufferFromS3::getLogDetails() const
+{
+    String multipart_upload_details;
+    if (!multipart_upload_id.empty())
+        multipart_upload_details = fmt::format(", upload id {}, upload has finished {}"
+                                       , multipart_upload_id, multipart_upload_finished);
+
+    return fmt::format("Details: bucket {}, key {}, total size {}, count {}, hidden_size {}, offset {}, with pool: {}, prefinalized {}, finalized {}{}",
+                       bucket, key, total_size, count(), hidden_size, offset(), task_tracker->isAsync(), is_prefinalized, finalized, multipart_upload_details);
+}
+
+void WriteBufferFromS3::tryToAbortMultipartUpload()
+{
+    try
+    {
+        task_tracker->safeWaitAll();
+        abortMultipartUpload();
+    }
+    catch (...)
+    {
+        LOG_ERROR(log, "Multipart upload hasn't aborted. {}", getLogDetails());
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+WriteBufferFromS3::~WriteBufferFromS3()
+{
+    LOG_TRACE(log, "Close WriteBufferFromS3. {}.", getLogDetails());
+
+    // That destructor could be call with finalized=false in case of exceptions
+    if (!finalized)
+    {
+        LOG_ERROR(log, "WriteBufferFromS3 is not finalized in destructor. It could be if an exception occurs. File is not written to S3. {}.", getLogDetails());
+    }
+
+    task_tracker->safeWaitAll();
+
+    if (!multipart_upload_id.empty() && !multipart_upload_finished)
+    {
+        LOG_WARNING(log, "WriteBufferFromS3 was neither finished nor aborted, try to abort upload in destructor. {}.", getLogDetails());
+        tryToAbortMultipartUpload();
+    }
+}
+
+void WriteBufferFromS3::hidePartialData()
+{
+    if (write_settings.remote_throttler)
+            write_settings.remote_throttler->add(offset(), ProfileEvents::RemoteWriteThrottlerBytes, ProfileEvents::RemoteWriteThrottlerSleepMicroseconds);
+
+    chassert(memory.size() >= hidden_size + offset());
+
+    hidden_size += offset();
+    chassert(memory.data() + hidden_size == working_buffer.begin() + offset());
+    chassert(memory.data() + hidden_size == position());
+
+    WriteBuffer::set(memory.data() + hidden_size, memory.size() - hidden_size);
+    chassert(offset() == 0);
+}
+
+void WriteBufferFromS3::reallocateFirstBuffer()
+{
+    chassert(offset() == 0);
+
+    if (buffer_allocation_policy->getBufferNumber() > 1 || available() > 0)
+        return;
+
+    const size_t max_first_buffer = buffer_allocation_policy->getBufferSize();
+    if (memory.size() == max_first_buffer)
+        return;
+
+    size_t size = std::min(memory.size() * 2, max_first_buffer);
+    memory.resize(size);
+
+    WriteBuffer::set(memory.data() + hidden_size, memory.size() - hidden_size);
+
+    chassert(offset() == 0);
+
+    LOG_TRACE(log, "Reallocated first buffer with size {}. {}", memory.size(), getLogDetails());
+}
+
+void WriteBufferFromS3::detachBuffer()
+{
+    size_t data_size = size_t(position() - memory.data());
+    chassert(data_size == hidden_size);
+
+    auto buf = std::move(memory);
+
+    WriteBuffer::set(nullptr, 0);
+    total_size += hidden_size;
+    hidden_size = 0;
+
+    detached_part_data.push_back({std::move(buf), data_size});
+}
+
+void WriteBufferFromS3::allocateFirstBuffer()
+{
+    const auto max_first_buffer = buffer_allocation_policy->getBufferSize();
+    const auto size = std::min(size_t(DBMS_DEFAULT_BUFFER_SIZE), max_first_buffer);
+    memory = Memory(size);
+    WriteBuffer::set(memory.data(), memory.size());
+
+    LOG_TRACE(log, "Allocated first buffer with size {}. {}", memory.size(), getLogDetails());
+}
+
+void WriteBufferFromS3::allocateBuffer()
+{
+    buffer_allocation_policy->nextBuffer();
+    chassert(0 == hidden_size);
+
+    if (buffer_allocation_policy->getBufferNumber() == 1)
+        return allocateFirstBuffer();
+
+    memory = Memory(buffer_allocation_policy->getBufferSize());
+    WriteBuffer::set(memory.data(), memory.size());
+
+    LOG_TRACE(log, "Allocated buffer with size {}. {}", buffer_allocation_policy->getBufferSize(), getLogDetails());
+}
+
+void WriteBufferFromS3::setFakeBufferWhenPreFinalized()
+{
+    WriteBuffer::set(fake_buffer_when_prefinalized, sizeof(fake_buffer_when_prefinalized));
+}
+
+void WriteBufferFromS3::writeMultipartUpload()
+{
+    if (multipart_upload_id.empty())
+    {
+        createMultipartUpload();
+    }
+
+    while (!detached_part_data.empty())
+    {
+        writePart(std::move(detached_part_data.front()));
+        detached_part_data.pop_front();
+    }
+}
+
 void WriteBufferFromS3::createMultipartUpload()
 {
-    DB::S3::CreateMultipartUploadRequest req;
+    LOG_TRACE(log, "Create multipart upload. Bucket: {}, Key: {}, Upload id: {}", bucket, key, multipart_upload_id);
+
+    S3::CreateMultipartUploadRequest req;
+
     req.SetBucket(bucket);
     req.SetKey(key);
 
@@ -196,179 +362,176 @@ void WriteBufferFromS3::createMultipartUpload()
     if (object_metadata.has_value())
         req.SetMetadata(object_metadata.value());
 
+    client_ptr->setKMSHeaders(req);
+
     ProfileEvents::increment(ProfileEvents::S3CreateMultipartUpload);
     if (write_settings.for_object_storage)
         ProfileEvents::increment(ProfileEvents::DiskS3CreateMultipartUpload);
 
+    Stopwatch watch;
     auto outcome = client_ptr->CreateMultipartUpload(req);
+    watch.stop();
 
-    if (outcome.IsSuccess())
+    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Microseconds, watch.elapsedMicroseconds());
+
+    if (!outcome.IsSuccess())
     {
-        multipart_upload_id = outcome.GetResult().GetUploadId();
-        LOG_TRACE(log, "Multipart upload has created. Bucket: {}, Key: {}, Upload id: {}", bucket, key, multipart_upload_id);
-    }
-    else
+        ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
         throw S3Exception(outcome.GetError().GetMessage(), outcome.GetError().GetErrorType());
+    }
+
+    multipart_upload_id = outcome.GetResult().GetUploadId();
+    LOG_TRACE(log, "Multipart upload has created. {}", getLogDetails());
 }
 
-void WriteBufferFromS3::writePart()
+void WriteBufferFromS3::abortMultipartUpload()
 {
-    auto size = temporary_buffer->tellp();
-
-    LOG_TRACE(log, "Writing part. Bucket: {}, Key: {}, Upload_id: {}, Size: {}", bucket, key, multipart_upload_id, size);
-
-    if (size < 0)
+    if (multipart_upload_id.empty())
     {
-        LOG_WARNING(log, "Skipping part upload. Buffer is in bad state, it means that we have tried to upload something, but got an exception.");
+        LOG_WARNING(log, "Nothing to abort. {}", getLogDetails());
         return;
     }
 
-    if (size == 0)
+    LOG_WARNING(log, "Abort multipart upload. {}", getLogDetails());
+
+    S3::AbortMultipartUploadRequest req;
+    req.SetBucket(bucket);
+    req.SetKey(key);
+    req.SetUploadId(multipart_upload_id);
+
+    ProfileEvents::increment(ProfileEvents::S3AbortMultipartUpload);
+    if (write_settings.for_object_storage)
+        ProfileEvents::increment(ProfileEvents::DiskS3AbortMultipartUpload);
+
+    Stopwatch watch;
+    auto outcome = client_ptr->AbortMultipartUpload(req);
+    watch.stop();
+
+    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Microseconds, watch.elapsedMicroseconds());
+
+    if (!outcome.IsSuccess())
     {
-        LOG_TRACE(log, "Skipping writing part. Buffer is empty.");
-        return;
+        ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
+        throw S3Exception(outcome.GetError().GetMessage(), outcome.GetError().GetErrorType());
     }
 
-    if (TSA_SUPPRESS_WARNING_FOR_READ(part_tags).size() == S3_WARN_MAX_PARTS)
-    {
-        // Don't throw exception here by ourselves but leave the decision to take by S3 server.
-        LOG_WARNING(log, "Maximum part number in S3 protocol has reached (too many parts). Server may not accept this whole upload.");
-    }
-
-    if (schedule)
-    {
-        UploadPartTask * task = nullptr;
-
-        {
-            std::lock_guard lock(bg_tasks_mutex);
-            task = &upload_object_tasks.emplace_back();
-            ++num_added_bg_tasks;
-        }
-
-        /// Notify waiting thread when task finished
-        auto task_finish_notify = [&, task]()
-        {
-            std::lock_guard lock(bg_tasks_mutex);
-            task->is_finished = true;
-            ++num_finished_bg_tasks;
-
-            /// Notification under mutex is important here.
-            /// Otherwise, WriteBuffer could be destroyed in between
-            /// Releasing lock and condvar notification.
-            bg_tasks_condvar.notify_one();
-        };
-
-        try
-        {
-            fillUploadRequest(task->req);
-
-            schedule([this, task, task_finish_notify]()
-            {
-                try
-                {
-                    processUploadRequest(*task);
-                }
-                catch (...)
-                {
-                    task->exception = std::current_exception();
-                }
-
-                task_finish_notify();
-            }, 0);
-        }
-        catch (...)
-        {
-            task_finish_notify();
-            throw;
-        }
-    }
-    else
-    {
-        UploadPartTask task;
-        auto & tags = TSA_SUPPRESS_WARNING_FOR_WRITE(part_tags); /// Suppress warning because schedule == false.
-
-        fillUploadRequest(task.req);
-        processUploadRequest(task);
-        tags.push_back(task.tag);
-    }
+    LOG_WARNING(log, "Multipart upload has aborted successfully. {}", getLogDetails());
 }
 
-void WriteBufferFromS3::fillUploadRequest(S3::UploadPartRequest & req)
+S3::UploadPartRequest WriteBufferFromS3::getUploadRequest(size_t part_number, PartData & data)
 {
-    /// Increase part number.
-    ++part_number;
+    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Bytes, data.data_size);
+    LOG_TRACE(log, "getUploadRequest, size {}, key: {}", data.data_size, key);
 
-    auto max_part_number = upload_settings.max_part_number;
-
-    if (!multipart_upload_id.empty() && (part_number > max_part_number))
-    {
-        throw Exception(
-                        ErrorCodes::INVALID_CONFIG_PARAMETER,
-                        "Part number exceeded {} while writing {} bytes to S3. "
-                        "Check min_upload_part_size = {}, max_upload_part_size = {}, "
-                        "upload_part_size_multiply_factor = {}, upload_part_size_multiply_parts_count_threshold = {}, "
-                        "max_single_part_upload_size = {}",
-                        max_part_number, count(),
-                        upload_settings.min_upload_part_size, upload_settings.max_upload_part_size,
-                        upload_settings.upload_part_size_multiply_factor,
-                        upload_settings.upload_part_size_multiply_parts_count_threshold,
-                        upload_settings.max_single_part_upload_size);
-    }
+    S3::UploadPartRequest req;
 
     /// Setup request.
     req.SetBucket(bucket);
     req.SetKey(key);
     req.SetPartNumber(static_cast<int>(part_number));
     req.SetUploadId(multipart_upload_id);
-    req.SetContentLength(temporary_buffer->tellp());
-    req.SetBody(temporary_buffer);
-
+    req.SetContentLength(data.data_size);
+    req.SetBody(data.createAwsBuffer());
     /// If we don't do it, AWS SDK can mistakenly set it to application/xml, see https://github.com/aws/aws-sdk-cpp/issues/1840
     req.SetContentType("binary/octet-stream");
 
-    /// Maybe increase `upload_part_size` (we need to increase it sometimes to keep `part_number` less or equal than `max_part_number`).
-    auto threshold = upload_settings.upload_part_size_multiply_parts_count_threshold;
-    if (!multipart_upload_id.empty() && (part_number % threshold == 0))
-    {
-        auto max_upload_part_size = upload_settings.max_upload_part_size;
-        auto upload_part_size_multiply_factor = upload_settings.upload_part_size_multiply_factor;
-        upload_part_size *= upload_part_size_multiply_factor;
-        upload_part_size = std::min(upload_part_size, max_upload_part_size);
-    }
+    return req;
 }
 
-void WriteBufferFromS3::processUploadRequest(UploadPartTask & task)
+void WriteBufferFromS3::writePart(WriteBufferFromS3::PartData && data)
 {
-    ProfileEvents::increment(ProfileEvents::S3UploadPart);
-    if (write_settings.for_object_storage)
-        ProfileEvents::increment(ProfileEvents::DiskS3UploadPart);
-
-    ResourceCost cost = task.req.GetContentLength();
-    ResourceGuard rlock(write_settings.resource_link, cost);
-    auto outcome = client_ptr->UploadPart(task.req);
-    rlock.unlock(); // Avoid acquiring other locks under resource lock
-
-    if (outcome.IsSuccess())
+    if (data.data_size == 0)
     {
-        task.tag = outcome.GetResult().GetETag();
-        std::lock_guard lock(bg_tasks_mutex); /// Protect part_tags from race
-        LOG_TRACE(log, "Writing part finished. Bucket: {}, Key: {}, Upload_id: {}, Etag: {}, Parts: {}", bucket, key, multipart_upload_id, task.tag, part_tags.size());
+        LOG_TRACE(log, "Skipping writing part as empty.");
+        return;
     }
-    else
+
+    multipart_tags.push_back({});
+    size_t part_number = multipart_tags.size();
+    LOG_TRACE(log, "writePart {}, part size: {}, part number: {}", getLogDetails(), data.data_size, part_number);
+
+    if (multipart_upload_id.empty())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Unable to write a part without multipart_upload_id, details: WriteBufferFromS3 created for bucket {}, key {}",
+            bucket, key);
+
+    if (part_number > upload_settings.max_part_number)
     {
-        write_settings.resource_link.accumulate(cost); // We assume no resource was used in case of failure
-        throw S3Exception(outcome.GetError().GetMessage(), outcome.GetError().GetErrorType());
+        throw Exception(
+            ErrorCodes::INVALID_CONFIG_PARAMETER,
+            "Part number exceeded {} while writing {} bytes to S3. Check min_upload_part_size = {}, max_upload_part_size = {}, "
+            "upload_part_size_multiply_factor = {}, upload_part_size_multiply_parts_count_threshold = {}, max_single_part_upload_size = {}",
+            upload_settings.max_part_number, count(), upload_settings.min_upload_part_size, upload_settings.max_upload_part_size,
+            upload_settings.upload_part_size_multiply_factor, upload_settings.upload_part_size_multiply_parts_count_threshold,
+            upload_settings.max_single_part_upload_size);
     }
+
+    if (data.data_size > upload_settings.max_upload_part_size)
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Part size exceeded max_upload_part_size, part number: {}, part size {}, max_upload_part_size {}, {}",
+            part_number,
+            data.data_size,
+            upload_settings.max_upload_part_size,
+            getLogDetails());
+    }
+
+    auto req = getUploadRequest(part_number, data);
+    auto worker_data = std::make_shared<std::tuple<S3::UploadPartRequest, WriteBufferFromS3::PartData>>(std::move(req), std::move(data));
+
+    auto upload_worker = [&, worker_data, part_number] ()
+    {
+        LOG_TEST(log, "Writing part started. bucket {}, key {}, part id {}", bucket, key, part_number);
+
+        ProfileEvents::increment(ProfileEvents::S3UploadPart);
+        if (write_settings.for_object_storage)
+            ProfileEvents::increment(ProfileEvents::DiskS3UploadPart);
+
+        auto & request = std::get<0>(*worker_data);
+
+        ResourceCost cost = request.GetContentLength();
+        ResourceGuard rlock(write_settings.resource_link, cost);
+        Stopwatch watch;
+        auto outcome = client_ptr->UploadPart(request);
+        watch.stop();
+        rlock.unlock(); // Avoid acquiring other locks under resource lock
+
+        ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Microseconds, watch.elapsedMicroseconds());
+
+        if (!outcome.IsSuccess())
+        {
+            ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
+            write_settings.resource_link.accumulate(cost); // We assume no resource was used in case of failure
+            throw S3Exception(outcome.GetError().GetMessage(), outcome.GetError().GetErrorType());
+        }
+
+        multipart_tags[part_number-1] = outcome.GetResult().GetETag();
+
+        LOG_TEST(log, "Writing part finished. bucket {}, key{}, part id {}, etag {}", bucket, key, part_number, multipart_tags[part_number-1]);
+    };
+
+    task_tracker->add(std::move(upload_worker));
 }
 
 void WriteBufferFromS3::completeMultipartUpload()
 {
-    const auto & tags = TSA_SUPPRESS_WARNING_FOR_READ(part_tags);
+    LOG_TRACE(log, "Completing multipart upload. {}, Parts: {}", getLogDetails(), multipart_tags.size());
 
-    LOG_TRACE(log, "Completing multipart upload. Bucket: {}, Key: {}, Upload_id: {}, Parts: {}", bucket, key, multipart_upload_id, tags.size());
+    if (multipart_tags.empty())
+        throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Failed to complete multipart upload. No parts have uploaded");
 
-    if (tags.empty())
-        throw Exception(ErrorCodes::S3_ERROR, "Failed to complete multipart upload. No parts have uploaded");
+    for (size_t i = 0; i < multipart_tags.size(); ++i)
+    {
+        const auto tag = multipart_tags.at(i);
+        if (tag.empty())
+            throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Failed to complete multipart upload. Part {} haven't been uploaded.", i);
+    }
 
     S3::CompleteMultipartUploadRequest req;
     req.SetBucket(bucket);
@@ -376,10 +539,10 @@ void WriteBufferFromS3::completeMultipartUpload()
     req.SetUploadId(multipart_upload_id);
 
     Aws::S3::Model::CompletedMultipartUpload multipart_upload;
-    for (size_t i = 0; i < tags.size(); ++i)
+    for (size_t i = 0; i < multipart_tags.size(); ++i)
     {
         Aws::S3::Model::CompletedPart part;
-        multipart_upload.AddParts(part.WithETag(tags[i]).WithPartNumber(static_cast<int>(i + 1)));
+        multipart_upload.AddParts(part.WithETag(multipart_tags[i]).WithPartNumber(static_cast<int>(i + 1)));
     }
 
     req.SetMultipartUpload(multipart_upload);
@@ -391,96 +554,52 @@ void WriteBufferFromS3::completeMultipartUpload()
         if (write_settings.for_object_storage)
             ProfileEvents::increment(ProfileEvents::DiskS3CompleteMultipartUpload);
 
+        Stopwatch watch;
         auto outcome = client_ptr->CompleteMultipartUpload(req);
+        watch.stop();
+
+        ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Microseconds, watch.elapsedMicroseconds());
 
         if (outcome.IsSuccess())
         {
-            LOG_TRACE(log, "Multipart upload has completed. Bucket: {}, Key: {}, Upload_id: {}, Parts: {}", bucket, key, multipart_upload_id, tags.size());
-            break;
+            LOG_TRACE(log, "Multipart upload has completed. {}, Parts: {}", getLogDetails(), multipart_tags.size());
+            return;
         }
-        else if (outcome.GetError().GetErrorType() == Aws::S3::S3Errors::NO_SUCH_KEY)
+
+        ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
+
+        if (outcome.GetError().GetErrorType() == Aws::S3::S3Errors::NO_SUCH_KEY)
         {
             /// For unknown reason, at least MinIO can respond with NO_SUCH_KEY for put requests
             /// BTW, NO_SUCH_UPLOAD is expected error and we shouldn't retry it
-            LOG_INFO(log, "Multipart upload failed with NO_SUCH_KEY error for Bucket: {}, Key: {}, Upload_id: {}, Parts: {}, will retry", bucket, key, multipart_upload_id, tags.size());
+            LOG_INFO(log, "Multipart upload failed with NO_SUCH_KEY error, will retry. {}, Parts: {}", getLogDetails(), multipart_tags.size());
         }
         else
         {
             throw S3Exception(
                 outcome.GetError().GetErrorType(),
                 "Message: {}, Key: {}, Bucket: {}, Tags: {}",
-                outcome.GetError().GetMessage(), key, bucket, fmt::join(tags.begin(), tags.end(), " "));
+                outcome.GetError().GetMessage(), key, bucket, fmt::join(multipart_tags.begin(), multipart_tags.end(), " "));
         }
     }
+
+    throw S3Exception(
+        Aws::S3::S3Errors::NO_SUCH_KEY,
+        "Message: Multipart upload failed with NO_SUCH_KEY error, retries {}, Key: {}, Bucket: {}",
+        max_retry, key, bucket);
 }
 
-void WriteBufferFromS3::makeSinglepartUpload()
+S3::PutObjectRequest WriteBufferFromS3::getPutRequest(PartData & data)
 {
-    auto size = temporary_buffer->tellp();
-    bool with_pool = static_cast<bool>(schedule);
+    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Bytes, data.data_size);
+    LOG_TRACE(log, "getPutRequest, size {}, key {}", data.data_size, key);
 
-    LOG_TRACE(log, "Making single part upload. Bucket: {}, Key: {}, Size: {}, WithPool: {}", bucket, key, size, with_pool);
+    S3::PutObjectRequest req;
 
-    if (size < 0)
-    {
-        LOG_WARNING(log, "Skipping single part upload. Buffer is in bad state, it mean that we have tried to upload something, but got an exception.");
-        return;
-    }
-
-    if (schedule)
-    {
-        put_object_task = std::make_unique<PutObjectTask>();
-
-        /// Notify waiting thread when put object task finished
-        auto task_notify_finish = [&]()
-        {
-            std::lock_guard lock(bg_tasks_mutex);
-            put_object_task->is_finished = true;
-
-            /// Notification under mutex is important here.
-            /// Othervies, WriteBuffer could be destroyed in between
-            /// Releasing lock and condvar notification.
-            bg_tasks_condvar.notify_one();
-        };
-
-        try
-        {
-            fillPutRequest(put_object_task->req);
-
-            schedule([this, task_notify_finish]()
-            {
-                try
-                {
-                    processPutRequest(*put_object_task);
-                }
-                catch (...)
-                {
-                    put_object_task->exception = std::current_exception();
-                }
-
-                task_notify_finish();
-            }, 0);
-        }
-        catch (...)
-        {
-            task_notify_finish();
-            throw;
-        }
-    }
-    else
-    {
-        PutObjectTask task;
-        fillPutRequest(task.req);
-        processPutRequest(task);
-    }
-}
-
-void WriteBufferFromS3::fillPutRequest(S3::PutObjectRequest & req)
-{
     req.SetBucket(bucket);
     req.SetKey(key);
-    req.SetContentLength(temporary_buffer->tellp());
-    req.SetBody(temporary_buffer);
+    req.SetContentLength(data.data_size);
+    req.SetBody(data.createAwsBuffer());
     if (object_metadata.has_value())
         req.SetMetadata(object_metadata.value());
     if (!upload_settings.storage_class_name.empty())
@@ -488,108 +607,75 @@ void WriteBufferFromS3::fillPutRequest(S3::PutObjectRequest & req)
 
     /// If we don't do it, AWS SDK can mistakenly set it to application/xml, see https://github.com/aws/aws-sdk-cpp/issues/1840
     req.SetContentType("binary/octet-stream");
+
+    client_ptr->setKMSHeaders(req);
+
+    return req;
 }
 
-void WriteBufferFromS3::processPutRequest(const PutObjectTask & task)
+void WriteBufferFromS3::makeSinglepartUpload(WriteBufferFromS3::PartData && data)
 {
-    size_t max_retry = std::max(request_settings.max_unexpected_write_error_retries, 1UL);
-    for (size_t i = 0; i < max_retry; ++i)
+    LOG_TRACE(log, "Making single part upload. {}.", getLogDetails());
+
+    auto req = getPutRequest(data);
+    auto worker_data = std::make_shared<std::tuple<S3::PutObjectRequest, WriteBufferFromS3::PartData>>(std::move(req), std::move(data));
+
+    auto upload_worker = [&, worker_data] ()
     {
-        ProfileEvents::increment(ProfileEvents::S3PutObject);
-        if (write_settings.for_object_storage)
-            ProfileEvents::increment(ProfileEvents::DiskS3PutObject);
+        LOG_TEST(log, "writing single part upload started. bucket {}, key {}", bucket, key);
 
-        ResourceCost cost = task.req.GetContentLength();
-        ResourceGuard rlock(write_settings.resource_link, cost);
-        auto outcome = client_ptr->PutObject(task.req);
-        rlock.unlock();
+        auto & request = std::get<0>(*worker_data);
+        size_t content_length = request.GetContentLength();
 
-        bool with_pool = static_cast<bool>(schedule);
-        if (outcome.IsSuccess())
+        size_t max_retry = std::max(request_settings.max_unexpected_write_error_retries, 1UL);
+        for (size_t i = 0; i < max_retry; ++i)
         {
-            LOG_TRACE(log, "Single part upload has completed. Bucket: {}, Key: {}, Object size: {}, WithPool: {}", bucket, key, task.req.GetContentLength(), with_pool);
-            break;
-        }
-        else if (outcome.GetError().GetErrorType() == Aws::S3::S3Errors::NO_SUCH_KEY)
-        {
-            write_settings.resource_link.accumulate(cost); // We assume no resource was used in case of failure
-            /// For unknown reason, at least MinIO can respond with NO_SUCH_KEY for put requests
-            LOG_INFO(log, "Single part upload failed with NO_SUCH_KEY error for Bucket: {}, Key: {}, Object size: {}, WithPool: {}, will retry", bucket, key, task.req.GetContentLength(), with_pool);
-        }
-        else
-        {
-            write_settings.resource_link.accumulate(cost); // We assume no resource was used in case of failure
-            throw S3Exception(
-                outcome.GetError().GetErrorType(),
-                "Message: {}, Key: {}, Bucket: {}, Object size: {}, WithPool: {}",
-                outcome.GetError().GetMessage(), key, bucket, task.req.GetContentLength(), with_pool);
-        }
-    }
-}
+            ProfileEvents::increment(ProfileEvents::S3PutObject);
+            if (write_settings.for_object_storage)
+                ProfileEvents::increment(ProfileEvents::DiskS3PutObject);
 
-void WriteBufferFromS3::waitForReadyBackGroundTasks()
-{
-    if (schedule)
-    {
-        std::unique_lock lock(bg_tasks_mutex);
+            ResourceCost cost = request.GetContentLength();
+            ResourceGuard rlock(write_settings.resource_link, cost);
+            Stopwatch watch;
+            auto outcome = client_ptr->PutObject(request);
+            watch.stop();
+            rlock.unlock();
 
-        /// Suppress warnings because bg_tasks_mutex is actually hold, but tsa annotations do not understand std::unique_lock
-        auto & tasks = TSA_SUPPRESS_WARNING_FOR_WRITE(upload_object_tasks);
+            ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Microseconds, watch.elapsedMicroseconds());
 
-        while (!tasks.empty() && tasks.front().is_finished)
-        {
-            auto & task = tasks.front();
-            auto exception = task.exception;
-            auto tag = std::move(task.tag);
-            tasks.pop_front();
-
-            if (exception)
+            if (outcome.IsSuccess())
             {
-                waitForAllBackGroundTasksUnlocked(lock);
-                std::rethrow_exception(exception);
+                LOG_TRACE(log, "Single part upload has completed. bucket {}, key {}, object size {}", bucket, key, content_length);
+                return;
             }
 
-            TSA_SUPPRESS_WARNING_FOR_WRITE(part_tags).push_back(tag);
-        }
-    }
-}
+            ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
+            write_settings.resource_link.accumulate(cost); // We assume no resource was used in case of failure
 
-void WriteBufferFromS3::waitForAllBackGroundTasks()
-{
-    if (schedule)
-    {
-        std::unique_lock lock(bg_tasks_mutex);
-        waitForAllBackGroundTasksUnlocked(lock);
-    }
-}
+            if (outcome.GetError().GetErrorType() == Aws::S3::S3Errors::NO_SUCH_KEY)
+            {
 
-void WriteBufferFromS3::waitForAllBackGroundTasksUnlocked(std::unique_lock<std::mutex> & bg_tasks_lock)
-{
-    if (schedule)
-    {
-        bg_tasks_condvar.wait(bg_tasks_lock, [this]() {return TSA_SUPPRESS_WARNING_FOR_READ(num_added_bg_tasks) == TSA_SUPPRESS_WARNING_FOR_READ(num_finished_bg_tasks); });
-
-        /// Suppress warnings because bg_tasks_mutex is actually hold, but tsa annotations do not understand std::unique_lock
-        auto & tasks = TSA_SUPPRESS_WARNING_FOR_WRITE(upload_object_tasks);
-        while (!tasks.empty())
-        {
-            auto & task = tasks.front();
-
-            if (task.exception)
-                std::rethrow_exception(task.exception);
-
-            TSA_SUPPRESS_WARNING_FOR_WRITE(part_tags).push_back(task.tag);
-
-            tasks.pop_front();
+                /// For unknown reason, at least MinIO can respond with NO_SUCH_KEY for put requests
+                LOG_INFO(log, "Single part upload failed with NO_SUCH_KEY error for  bucket {}, key {}, object size {}, will retry", bucket, key, content_length);
+            }
+            else
+            {
+                LOG_ERROR(log, "S3Exception name {}, Message: {}, bucket {}, key {}, object size {}",
+                          outcome.GetError().GetExceptionName(), outcome.GetError().GetMessage(), bucket, key, content_length);
+                throw S3Exception(
+                    outcome.GetError().GetErrorType(),
+                    "Message: {}, bucket {}, key {}, object size {}",
+                    outcome.GetError().GetMessage(), bucket, key, content_length);
+            }
         }
 
-        if (put_object_task)
-        {
-            bg_tasks_condvar.wait(bg_tasks_lock, [this]() { return put_object_task->is_finished; });
-            if (put_object_task->exception)
-                std::rethrow_exception(put_object_task->exception);
-        }
-    }
+        throw S3Exception(
+            Aws::S3::S3Errors::NO_SUCH_KEY,
+            "Message: Single part upload failed with NO_SUCH_KEY error, retries {}, Key: {}, Bucket: {}",
+            max_retry, key, bucket);
+    };
+
+    task_tracker->add(std::move(upload_worker));
 }
 
 }
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index e56d590c57a..f4200b0a646 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -4,33 +4,19 @@
 
 #if USE_AWS_S3
 
+#include <base/types.h>
+#include <IO/WriteBufferFromFileBase.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteSettings.h>
+#include <Storages/StorageS3Settings.h>
+#include <Interpreters/threadPoolCallbackRunner.h>
+
 #include <memory>
 #include <vector>
 #include <list>
 
-#include <base/types.h>
-#include <Common/logger_useful.h>
-#include <Common/ThreadPool.h>
-#include <IO/BufferWithOwnMemory.h>
-#include <IO/WriteBuffer.h>
-#include <IO/WriteSettings.h>
-#include <IO/S3/Requests.h>
-#include <Storages/StorageS3Settings.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
-
-#include <aws/core/utils/memory/stl/AWSStringStream.h>
-
-
-namespace Aws::S3
-{
-class Client;
-}
-
 namespace DB
 {
-
-class WriteBufferFromFile;
-
 /**
  * Buffer to write a data to a S3 object with specified bucket and key.
  * If data size written to the buffer is less than 'max_single_part_upload_size' write is performed using singlepart upload.
@@ -38,83 +24,97 @@ class WriteBufferFromFile;
  * Data is divided on chunks with size greater than 'minimum_upload_part_size'. Last chunk can be less than this threshold.
  * Each chunk is written as a part to S3.
  */
-class WriteBufferFromS3 final : public BufferWithOwnMemory<WriteBuffer>
+class WriteBufferFromS3 final : public WriteBufferFromFileBase
 {
 public:
     WriteBufferFromS3(
         std::shared_ptr<const S3::Client> client_ptr_,
         const String & bucket_,
         const String & key_,
+        size_t buf_size_,
         const S3Settings::RequestSettings & request_settings_,
         std::optional<std::map<String, String>> object_metadata_ = std::nullopt,
-        size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
         ThreadPoolCallbackRunner<void> schedule_ = {},
         const WriteSettings & write_settings_ = {});
 
     ~WriteBufferFromS3() override;
-
     void nextImpl() override;
-
     void preFinalize() override;
+    std::string getFileName() const override { return key; }
+    void sync() override { next(); }
+
+    class IBufferAllocationPolicy
+    {
+    public:
+        virtual size_t getBufferNumber() const = 0;
+        virtual size_t getBufferSize() const = 0;
+        virtual void nextBuffer() = 0;
+        virtual ~IBufferAllocationPolicy() = 0;
+    };
+    using IBufferAllocationPolicyPtr = std::unique_ptr<IBufferAllocationPolicy>;
+
+    static IBufferAllocationPolicyPtr ChooseBufferPolicy(const S3Settings::RequestSettings::PartUploadSettings & settings_);
 
 private:
-    void allocateBuffer();
-
-    void createMultipartUpload();
-    void writePart();
-    void completeMultipartUpload();
-
-    void makeSinglepartUpload();
-
     /// Receives response from the server after sending all data.
     void finalizeImpl() override;
 
-    struct UploadPartTask;
-    void fillUploadRequest(S3::UploadPartRequest & req);
-    void processUploadRequest(UploadPartTask & task);
+    String getLogDetails() const;
 
-    struct PutObjectTask;
-    void fillPutRequest(S3::PutObjectRequest & req);
-    void processPutRequest(const PutObjectTask & task);
+    struct PartData;
+    void hidePartialData();
+    void allocateFirstBuffer();
+    void reallocateFirstBuffer();
+    void detachBuffer();
+    void allocateBuffer();
+    void setFakeBufferWhenPreFinalized();
 
-    void waitForReadyBackGroundTasks();
-    void waitForAllBackGroundTasks();
-    void waitForAllBackGroundTasksUnlocked(std::unique_lock<std::mutex> & bg_tasks_lock);
+    S3::UploadPartRequest getUploadRequest(size_t part_number, PartData & data);
+    void writePart(PartData && data);
+    void writeMultipartUpload();
+    void createMultipartUpload();
+    void completeMultipartUpload();
+    void abortMultipartUpload();
+    void tryToAbortMultipartUpload();
+
+    S3::PutObjectRequest getPutRequest(PartData & data);
+    void makeSinglepartUpload(PartData && data);
 
     const String bucket;
     const String key;
     const S3Settings::RequestSettings request_settings;
     const S3Settings::RequestSettings::PartUploadSettings & upload_settings;
+    const WriteSettings write_settings;
     const std::shared_ptr<const S3::Client> client_ptr;
     const std::optional<std::map<String, String>> object_metadata;
+    Poco::Logger * log = &Poco::Logger::get("WriteBufferFromS3");
 
-    size_t upload_part_size = 0;
-    std::shared_ptr<Aws::StringStream> temporary_buffer; /// Buffer to accumulate data.
-    size_t last_part_size = 0;
-    size_t part_number = 0;
+    IBufferAllocationPolicyPtr buffer_allocation_policy;
 
     /// Upload in S3 is made in parts.
     /// We initiate upload, then upload each part and get ETag as a response, and then finalizeImpl() upload with listing all our parts.
     String multipart_upload_id;
-    std::vector<String> TSA_GUARDED_BY(bg_tasks_mutex) part_tags;
+    std::deque<String> multipart_tags;
+    bool multipart_upload_finished = false;
 
+    /// Track that prefinalize() is called only once
     bool is_prefinalized = false;
 
-    /// Following fields are for background uploads in thread pool (if specified).
-    /// We use std::function to avoid dependency of Interpreters
-    const ThreadPoolCallbackRunner<void> schedule;
+    /// First fully filled buffer has to be delayed
+    /// There are two ways after:
+    /// First is to call prefinalize/finalize, which leads to single part upload
+    /// Second is to write more data, which leads to multi part upload
+    std::deque<PartData> detached_part_data;
+    char fake_buffer_when_prefinalized[1] = {};
 
-    std::unique_ptr<PutObjectTask> put_object_task; /// Does not need protection by mutex because of the logic around is_finished field.
-    std::list<UploadPartTask> TSA_GUARDED_BY(bg_tasks_mutex) upload_object_tasks;
-    int num_added_bg_tasks TSA_GUARDED_BY(bg_tasks_mutex) = 0;
-    int num_finished_bg_tasks TSA_GUARDED_BY(bg_tasks_mutex) = 0;
+    /// offset() and count() are unstable inside nextImpl
+    /// For example nextImpl changes position hence offset() and count() is changed
+    /// This vars are dedicated to store information about sizes when offset() and count() are unstable
+    size_t total_size = 0;
+    size_t hidden_size = 0;
 
-    std::mutex bg_tasks_mutex;
-    std::condition_variable bg_tasks_condvar;
-
-    Poco::Logger * log = &Poco::Logger::get("WriteBufferFromS3");
-
-    WriteSettings write_settings;
+    class TaskTracker;
+    std::unique_ptr<TaskTracker> task_tracker;
 };
 
 }
diff --git a/src/IO/WriteBufferFromS3BufferAllocationPolicy.cpp b/src/IO/WriteBufferFromS3BufferAllocationPolicy.cpp
new file mode 100644
index 00000000000..6347c1acfd7
--- /dev/null
+++ b/src/IO/WriteBufferFromS3BufferAllocationPolicy.cpp
@@ -0,0 +1,112 @@
+#include "config.h"
+
+#if USE_AWS_S3
+
+#include <IO/WriteBufferFromS3.h>
+
+#include <memory>
+
+namespace
+{
+
+class FixedSizeBufferAllocationPolicy : public DB::WriteBufferFromS3::IBufferAllocationPolicy
+{
+    const size_t buffer_size = 0;
+    size_t buffer_number = 0;
+
+public:
+    explicit FixedSizeBufferAllocationPolicy(const DB::S3Settings::RequestSettings::PartUploadSettings & settings_)
+        : buffer_size(settings_.strict_upload_part_size)
+    {
+        chassert(buffer_size > 0);
+    }
+
+    size_t getBufferNumber() const override { return buffer_number; }
+
+    size_t getBufferSize() const override
+    {
+        chassert(buffer_number > 0);
+        return buffer_size;
+    }
+
+    void nextBuffer() override
+    {
+        ++buffer_number;
+    }
+};
+
+
+class ExpBufferAllocationPolicy : public DB::WriteBufferFromS3::IBufferAllocationPolicy
+{
+    const size_t first_size = 0;
+    const size_t second_size = 0;
+
+    const size_t multiply_factor = 0;
+    const size_t multiply_threshold = 0;
+    const size_t max_size = 0;
+
+    size_t current_size = 0;
+    size_t buffer_number = 0;
+
+public:
+    explicit ExpBufferAllocationPolicy(const DB::S3Settings::RequestSettings::PartUploadSettings & settings_)
+        : first_size(std::max(settings_.max_single_part_upload_size, settings_.min_upload_part_size))
+        , second_size(settings_.min_upload_part_size)
+        , multiply_factor(settings_.upload_part_size_multiply_factor)
+        , multiply_threshold(settings_.upload_part_size_multiply_parts_count_threshold)
+        , max_size(settings_.max_upload_part_size)
+    {
+        chassert(first_size > 0);
+        chassert(second_size > 0);
+        chassert(multiply_factor >= 1);
+        chassert(multiply_threshold > 0);
+        chassert(max_size > 0);
+    }
+
+    size_t getBufferNumber() const override { return buffer_number; }
+
+    size_t getBufferSize() const override
+    {
+        chassert(buffer_number > 0);
+        return current_size;
+    }
+
+    void nextBuffer() override
+    {
+        ++buffer_number;
+
+        if (1 == buffer_number)
+        {
+            current_size = first_size;
+            return;
+        }
+
+        if (2 == buffer_number)
+            current_size = second_size;
+
+        if (0 == ((buffer_number - 1) % multiply_threshold))
+        {
+            current_size *= multiply_factor;
+            current_size = std::min(current_size, max_size);
+        }
+    }
+};
+
+}
+
+namespace DB
+{
+
+WriteBufferFromS3::IBufferAllocationPolicy::~IBufferAllocationPolicy() = default;
+
+WriteBufferFromS3::IBufferAllocationPolicyPtr WriteBufferFromS3::ChooseBufferPolicy(const S3Settings::RequestSettings::PartUploadSettings & settings_)
+{
+    if (settings_.strict_upload_part_size > 0)
+        return std::make_unique<FixedSizeBufferAllocationPolicy>(settings_);
+    else
+        return std::make_unique<ExpBufferAllocationPolicy>(settings_);
+}
+
+}
+
+#endif
diff --git a/src/IO/WriteBufferFromS3TaskTracker.cpp b/src/IO/WriteBufferFromS3TaskTracker.cpp
new file mode 100644
index 00000000000..4abae90eeac
--- /dev/null
+++ b/src/IO/WriteBufferFromS3TaskTracker.cpp
@@ -0,0 +1,192 @@
+#include "config.h"
+
+#if USE_AWS_S3
+
+#include <IO/WriteBufferFromS3TaskTracker.h>
+
+namespace ProfileEvents
+{
+    extern const Event WriteBufferFromS3WaitInflightLimitMicroseconds;
+}
+
+namespace DB
+{
+
+WriteBufferFromS3::TaskTracker::TaskTracker(ThreadPoolCallbackRunner<void> scheduler_, size_t max_tasks_inflight_)
+    : is_async(bool(scheduler_))
+    , scheduler(scheduler_ ? std::move(scheduler_) : syncRunner())
+    , max_tasks_inflight(max_tasks_inflight_)
+{}
+
+WriteBufferFromS3::TaskTracker::~TaskTracker()
+{
+    safeWaitAll();
+}
+
+ThreadPoolCallbackRunner<void> WriteBufferFromS3::TaskTracker::syncRunner()
+{
+    return [](Callback && callback, int64_t) mutable -> std::future<void>
+    {
+        auto package = std::packaged_task<void()>(std::move(callback));
+        /// No exceptions are propagated, exceptions are packed to future
+        package();
+        return  package.get_future();
+    };
+}
+
+void WriteBufferFromS3::TaskTracker::waitAll()
+{
+    LOG_TEST(log, "waitAll, in queue {}", futures.size());
+
+    /// Exceptions are propagated
+    for (auto & future : futures)
+    {
+        future.get();
+    }
+    futures.clear();
+
+    std::lock_guard lock(mutex);
+    finished_futures.clear();
+}
+
+void WriteBufferFromS3::TaskTracker::safeWaitAll()
+{
+    LOG_TEST(log, "safeWaitAll, wait in queue {}", futures.size());
+
+    for (auto & future : futures)
+    {
+        if (future.valid())
+        {
+            try
+            {
+                /// Exceptions are not propagated
+                future.get();
+            } catch (...)
+            {
+                /// But at least they are printed
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+    }
+    futures.clear();
+
+    std::lock_guard lock(mutex);
+    finished_futures.clear();
+}
+
+void WriteBufferFromS3::TaskTracker::waitIfAny()
+{
+    LOG_TEST(log, "waitIfAny, in queue {}", futures.size());
+    if (futures.empty())
+        return;
+
+    Stopwatch watch;
+
+    {
+        std::lock_guard lock(mutex);
+        for (auto & it : finished_futures)
+        {
+            /// actually that call might lock this thread until the future is set finally
+            /// however that won't lock us for long, the task is about to finish when the pointer appears in the `finished_futures`
+            it->get();
+
+            /// in case of exception in `it->get()`
+            /// it it not necessary to remove `it` from list `futures`
+            /// `TaskTracker` has to be destroyed after any exception occurs, for this `safeWaitAll` is called.
+            /// `safeWaitAll` handles invalid futures in the list `futures`
+            futures.erase(it);
+        }
+        finished_futures.clear();
+    }
+
+    watch.stop();
+    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3WaitInflightLimitMicroseconds, watch.elapsedMicroseconds());
+
+    LOG_TEST(log, "waitIfAny ended, in queue {}", futures.size());
+}
+
+void WriteBufferFromS3::TaskTracker::add(Callback && func)
+{
+    /// All this fuzz is about 2 things. This is the most critical place of TaskTracker.
+    /// The first is not to fail insertion in the list `futures`.
+    /// In order to face it, the element is allocated at the end of the list `futures` in advance.
+    /// The second is not to fail the notification of the task.
+    /// In order to face it, the list element, which would be inserted to the list `finished_futures`,
+    /// is allocated in advance as an other list `pre_allocated_finished` with one element inside.
+
+    /// preallocation for the first issue
+    futures.emplace_back();
+    auto future_placeholder = std::prev(futures.end());
+
+    /// preallocation for the second issue
+    FinishedList pre_allocated_finished {future_placeholder};
+
+    Callback func_with_notification = [&, func=std::move(func), pre_allocated_finished=std::move(pre_allocated_finished)] () mutable
+    {
+        SCOPE_EXIT({
+            DENY_ALLOCATIONS_IN_SCOPE;
+
+            std::lock_guard lock(mutex);
+            finished_futures.splice(finished_futures.end(), pre_allocated_finished);
+            has_finished.notify_one();
+        });
+
+        func();
+    };
+
+    /// this move is nothrow
+    *future_placeholder = scheduler(std::move(func_with_notification), Priority{});
+
+    LOG_TEST(log, "add ended, in queue {}, limit {}", futures.size(), max_tasks_inflight);
+
+    waitTilInflightShrink();
+}
+
+void WriteBufferFromS3::TaskTracker::waitTilInflightShrink()
+{
+    if (!max_tasks_inflight)
+        return;
+
+    LOG_TEST(log, "waitTilInflightShrink, in queue {}", futures.size());
+
+    Stopwatch watch;
+
+    /// Alternative approach is to wait until at least futures.size() - max_tasks_inflight element are finished
+    /// However the faster finished task is collected the faster CH checks if there is an exception
+    /// The faster an exception is propagated the lesser time is spent for cancellation
+    while (futures.size() >= max_tasks_inflight)
+    {
+        std::unique_lock lock(mutex);
+
+        has_finished.wait(lock, [this] () TSA_REQUIRES(mutex) { return !finished_futures.empty(); });
+
+        for (auto & it : finished_futures)
+        {
+            SCOPE_EXIT({
+                /// According to basic exception safety TaskTracker has to be destroyed after exception
+                /// If it would be true than this SCOPE_EXIT is superfluous
+                /// However WriteBufferWithFinalizeCallback, WriteBufferFromFileDecorator do call finalize in d-tor
+                /// TaskTracker has to cope this until the issue with finalizing in d-tor is addressed in #50274
+                futures.erase(it);
+            });
+
+            it->get();
+        }
+
+        finished_futures.clear();
+    }
+
+    watch.stop();
+    ProfileEvents::increment(ProfileEvents::WriteBufferFromS3WaitInflightLimitMicroseconds, watch.elapsedMicroseconds());
+
+    LOG_TEST(log, "waitTilInflightShrink ended, in queue {}", futures.size());
+}
+
+bool WriteBufferFromS3::TaskTracker::isAsync() const
+{
+    return is_async;
+}
+
+}
+
+#endif
diff --git a/src/IO/WriteBufferFromS3TaskTracker.h b/src/IO/WriteBufferFromS3TaskTracker.h
new file mode 100644
index 00000000000..800e5239cc4
--- /dev/null
+++ b/src/IO/WriteBufferFromS3TaskTracker.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "config.h"
+
+#if USE_AWS_S3
+
+#include "WriteBufferFromS3.h"
+
+#include <list>
+
+namespace DB
+{
+
+/// That class is used only in WriteBufferFromS3 for now.
+/// Therefore it declared as a part of  WriteBufferFromS3.
+/// TaskTracker takes a Callback which is run by scheduler in some external shared ThreadPool.
+/// TaskTracker brings the methods waitIfAny, waitAll/safeWaitAll
+/// to help with coordination of the running tasks.
+
+/// Basic exception safety is provided. If exception occurred the object has to be destroyed.
+/// No thread safety is provided. Use this object with no concurrency.
+
+class WriteBufferFromS3::TaskTracker
+{
+public:
+    using Callback = std::function<void()>;
+
+    TaskTracker(ThreadPoolCallbackRunner<void> scheduler_, size_t max_tasks_inflight_);
+    ~TaskTracker();
+
+    static ThreadPoolCallbackRunner<void> syncRunner();
+
+    bool isAsync() const;
+
+    /// waitIfAny collects statuses from already finished tasks
+    /// There could be no finished tasks yet, so waitIfAny do nothing useful in that case
+    /// the first exception is thrown if any task has failed
+    void waitIfAny();
+
+    /// Well, waitAll waits all the tasks until they finish and collects their statuses
+    void waitAll();
+
+    /// safeWaitAll does the same as waitAll but mutes the exceptions
+    void safeWaitAll();
+
+    void add(Callback && func);
+
+private:
+    /// waitTilInflightShrink waits til the number of in-flight tasks beyond the limit `max_tasks_inflight`.
+    void waitTilInflightShrink() TSA_NO_THREAD_SAFETY_ANALYSIS;
+
+    const bool is_async;
+    ThreadPoolCallbackRunner<void> scheduler;
+    const size_t max_tasks_inflight;
+
+    using FutureList = std::list<std::future<void>>;
+    FutureList futures;
+    Poco::Logger * log = &Poco::Logger::get("TaskTracker");
+
+    std::mutex mutex;
+    std::condition_variable has_finished TSA_GUARDED_BY(mutex);
+    using FinishedList = std::list<FutureList::iterator>;
+    FinishedList finished_futures TSA_GUARDED_BY(mutex);
+};
+
+}
+
+#endif
diff --git a/src/IO/WriteBufferValidUTF8.cpp b/src/IO/WriteBufferValidUTF8.cpp
index 4c8e172f43c..b72bc627220 100644
--- a/src/IO/WriteBufferValidUTF8.cpp
+++ b/src/IO/WriteBufferValidUTF8.cpp
@@ -8,9 +8,7 @@
 
 #if defined(__aarch64__) && defined(__ARM_NEON)
 #    include <arm_neon.h>
-#    ifdef HAS_RESERVED_IDENTIFIER
-#        pragma clang diagnostic ignored "-Wreserved-identifier"
-#    endif
+#      pragma clang diagnostic ignored "-Wreserved-identifier"
 #endif
 
 namespace DB
diff --git a/src/IO/WriteHelpers.cpp b/src/IO/WriteHelpers.cpp
index caeea0a82a3..a0eceddc6f6 100644
--- a/src/IO/WriteHelpers.cpp
+++ b/src/IO/WriteHelpers.cpp
@@ -2,7 +2,7 @@
 #include <cinttypes>
 #include <utility>
 #include <Common/formatIPv6.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 
 namespace DB
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index 1c0b48c53c3..cdbc952690c 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -316,6 +316,15 @@ void writeAnyEscapedString(const char * begin, const char * end, WriteBuffer & b
             pos = next_pos;
             switch (*pos)
             {
+                case quote_character:
+                {
+                    if constexpr (escape_quote_with_quote)
+                        writeChar(quote_character, buf);
+                    else
+                        writeChar('\\', buf);
+                    writeChar(quote_character, buf);
+                    break;
+                }
                 case '\b':
                     writeChar('\\', buf);
                     writeChar('b', buf);
@@ -344,15 +353,6 @@ void writeAnyEscapedString(const char * begin, const char * end, WriteBuffer & b
                     writeChar('\\', buf);
                     writeChar('\\', buf);
                     break;
-                case quote_character:
-                {
-                    if constexpr (escape_quote_with_quote)
-                        writeChar(quote_character, buf);
-                    else
-                        writeChar('\\', buf);
-                    writeChar(quote_character, buf);
-                    break;
-                }
                 default:
                     writeChar(*pos, buf);
             }
@@ -891,26 +891,26 @@ inline void writeText(const IPv4 & x, WriteBuffer & buf) { writeIPv4Text(x, buf)
 inline void writeText(const IPv6 & x, WriteBuffer & buf) { writeIPv6Text(x, buf); }
 
 template <typename T>
-void writeDecimalFractional(const T & x, UInt32 scale, WriteBuffer & ostr, bool trailing_zeros)
+void writeDecimalFractional(const T & x, UInt32 scale, WriteBuffer & ostr, bool trailing_zeros,
+                            bool fixed_fractional_length, UInt32 fractional_length)
 {
     /// If it's big integer, but the number of digits is small,
     /// use the implementation for smaller integers for more efficient arithmetic.
-
     if constexpr (std::is_same_v<T, Int256>)
     {
         if (x <= std::numeric_limits<UInt32>::max())
         {
-            writeDecimalFractional(static_cast<UInt32>(x), scale, ostr, trailing_zeros);
+            writeDecimalFractional(static_cast<UInt32>(x), scale, ostr, trailing_zeros, fixed_fractional_length, fractional_length);
             return;
         }
         else if (x <= std::numeric_limits<UInt64>::max())
         {
-            writeDecimalFractional(static_cast<UInt64>(x), scale, ostr, trailing_zeros);
+            writeDecimalFractional(static_cast<UInt64>(x), scale, ostr, trailing_zeros, fixed_fractional_length, fractional_length);
             return;
         }
         else if (x <= std::numeric_limits<UInt128>::max())
         {
-            writeDecimalFractional(static_cast<UInt128>(x), scale, ostr, trailing_zeros);
+            writeDecimalFractional(static_cast<UInt128>(x), scale, ostr, trailing_zeros, fixed_fractional_length, fractional_length);
             return;
         }
     }
@@ -918,24 +918,36 @@ void writeDecimalFractional(const T & x, UInt32 scale, WriteBuffer & ostr, bool
     {
         if (x <= std::numeric_limits<UInt32>::max())
         {
-            writeDecimalFractional(static_cast<UInt32>(x), scale, ostr, trailing_zeros);
+            writeDecimalFractional(static_cast<UInt32>(x), scale, ostr, trailing_zeros, fixed_fractional_length, fractional_length);
             return;
         }
         else if (x <= std::numeric_limits<UInt64>::max())
         {
-            writeDecimalFractional(static_cast<UInt64>(x), scale, ostr, trailing_zeros);
+            writeDecimalFractional(static_cast<UInt64>(x), scale, ostr, trailing_zeros, fixed_fractional_length, fractional_length);
             return;
         }
     }
 
     constexpr size_t max_digits = std::numeric_limits<UInt256>::digits10;
     assert(scale <= max_digits);
+    assert(fractional_length <= max_digits);
+
     char buf[max_digits];
-    memset(buf, '0', scale);
+    memset(buf, '0', std::max(scale, fractional_length));
 
     T value = x;
     Int32 last_nonzero_pos = 0;
-    for (Int32 pos = scale - 1; pos >= 0; --pos)
+
+    if (fixed_fractional_length && fractional_length < scale)
+    {
+        T new_value = value / DecimalUtils::scaleMultiplier<Int256>(scale - fractional_length - 1);
+        auto round_carry = new_value % 10;
+        value = new_value / 10;
+        if (round_carry >= 5)
+            value += 1;
+    }
+
+    for (Int32 pos = fixed_fractional_length ? std::min(scale - 1, fractional_length - 1) : scale - 1; pos >= 0; --pos)
     {
         auto remainder = value % 10;
         value /= 10;
@@ -947,11 +959,12 @@ void writeDecimalFractional(const T & x, UInt32 scale, WriteBuffer & ostr, bool
     }
 
     writeChar('.', ostr);
-    ostr.write(buf, trailing_zeros ? scale : last_nonzero_pos + 1);
+    ostr.write(buf, fixed_fractional_length ? fractional_length : (trailing_zeros ? scale : last_nonzero_pos + 1));
 }
 
 template <typename T>
-void writeText(Decimal<T> x, UInt32 scale, WriteBuffer & ostr, bool trailing_zeros)
+void writeText(Decimal<T> x, UInt32 scale, WriteBuffer & ostr, bool trailing_zeros,
+               bool fixed_fractional_length = false, UInt32 fractional_length = 0)
 {
     T part = DecimalUtils::getWholePart(x, scale);
 
@@ -962,7 +975,7 @@ void writeText(Decimal<T> x, UInt32 scale, WriteBuffer & ostr, bool trailing_zer
 
     writeIntText(part, ostr);
 
-    if (scale)
+    if (scale || (fixed_fractional_length && fractional_length > 0))
     {
         part = DecimalUtils::getFractionalPart(x, scale);
         if (part || trailing_zeros)
@@ -970,7 +983,7 @@ void writeText(Decimal<T> x, UInt32 scale, WriteBuffer & ostr, bool trailing_zer
             if (part < 0)
                 part *= T(-1);
 
-            writeDecimalFractional(part, scale, ostr, trailing_zeros);
+            writeDecimalFractional(part, scale, ostr, trailing_zeros, fixed_fractional_length, fractional_length);
         }
     }
 }
@@ -1159,33 +1172,45 @@ inline void writeNullTerminatedString(const String & s, WriteBuffer & buffer)
     buffer.write(s.c_str(), s.size() + 1);
 }
 
-template <typename T>
+
+template <std::endian endian, typename T>
 requires is_arithmetic_v<T> && (sizeof(T) <= 8)
-inline void writeBinaryBigEndian(T x, WriteBuffer & buf)    /// Assuming little endian architecture.
+inline void writeBinaryEndian(T x, WriteBuffer & buf)
 {
-    if constexpr (std::endian::native == std::endian::little)
-    {
-        if constexpr (sizeof(x) == 2)
-            x = __builtin_bswap16(x);
-        else if constexpr (sizeof(x) == 4)
-            x = __builtin_bswap32(x);
-        else if constexpr (sizeof(x) == 8)
-            x = __builtin_bswap64(x);
-    }
+    if constexpr (std::endian::native != endian)
+        x = std::byteswap(x);
     writePODBinary(x, buf);
 }
 
-template <typename T>
+template <std::endian endian, typename T>
 requires is_big_int_v<T>
-inline void writeBinaryBigEndian(const T & x, WriteBuffer & buf)    /// Assuming little endian architecture.
+inline void writeBinaryEndian(const T & x, WriteBuffer & buf)
 {
-    for (size_t i = 0; i != std::size(x.items); ++i)
+    if constexpr (std::endian::native == endian)
     {
-        const auto & item = x.items[(std::endian::native == std::endian::little) ? std::size(x.items) - i - 1 : i];
-        writeBinaryBigEndian(item, buf);
+        for (size_t i = 0; i != std::size(x.items); ++i)
+            writeBinaryEndian<endian>(x.items[i], buf);
+    }
+    else
+    {
+        for (size_t i = 0; i != std::size(x.items); ++i)
+            writeBinaryEndian<endian>(x.items[std::size(x.items) - i - 1], buf);
     }
 }
 
+template <typename T>
+inline void writeBinaryLittleEndian(T x, WriteBuffer & buf)
+{
+    writeBinaryEndian<std::endian::little>(x, buf);
+}
+
+template <typename T>
+inline void writeBinaryBigEndian(T x, WriteBuffer & buf)
+{
+    writeBinaryEndian<std::endian::big>(x, buf);
+}
+
+
 struct PcgSerializer
 {
     static void serializePcg32(const pcg32_fast & rng, WriteBuffer & buf)
diff --git a/src/IO/WriteSettings.h b/src/IO/WriteSettings.h
index e7cd229bd6c..e160796d9a3 100644
--- a/src/IO/WriteSettings.h
+++ b/src/IO/WriteSettings.h
@@ -11,6 +11,7 @@ struct WriteSettings
 {
     /// Bandwidth throttler to use during writing
     ThrottlerPtr remote_throttler;
+    ThrottlerPtr local_throttler;
 
     // Resource to be used during reading
     ResourceLink resource_link;
diff --git a/src/IO/ZlibDeflatingWriteBuffer.cpp b/src/IO/ZlibDeflatingWriteBuffer.cpp
index 82442ea9699..43bb0405555 100644
--- a/src/IO/ZlibDeflatingWriteBuffer.cpp
+++ b/src/IO/ZlibDeflatingWriteBuffer.cpp
@@ -34,10 +34,7 @@ ZlibDeflatingWriteBuffer::ZlibDeflatingWriteBuffer(
         window_bits += 16;
     }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
     int rc = deflateInit2(&zstr, compression_level, Z_DEFLATED, window_bits, 8, Z_DEFAULT_STRATEGY);
-#pragma GCC diagnostic pop
 
     if (rc != Z_OK)
         throw Exception(ErrorCodes::ZLIB_DEFLATE_FAILED, "deflateInit2 failed: {}; zlib version: {}", zError(rc), ZLIB_VERSION);
diff --git a/src/IO/ZlibInflatingReadBuffer.cpp b/src/IO/ZlibInflatingReadBuffer.cpp
index 9c2ee640cbe..b43dda1bfcc 100644
--- a/src/IO/ZlibInflatingReadBuffer.cpp
+++ b/src/IO/ZlibInflatingReadBuffer.cpp
@@ -1,11 +1,12 @@
 #include <IO/ZlibInflatingReadBuffer.h>
-
+#include <IO/WithFileName.h>
 
 namespace DB
 {
 namespace ErrorCodes
 {
     extern const int ZLIB_INFLATE_FAILED;
+    extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
 ZlibInflatingReadBuffer::ZlibInflatingReadBuffer(
@@ -17,6 +18,11 @@ ZlibInflatingReadBuffer::ZlibInflatingReadBuffer(
     : CompressedReadBufferWrapper(std::move(in_), buf_size, existing_memory, alignment)
     , eof_flag(false)
 {
+    if (buf_size > max_buffer_size)
+        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+            "Zlib does not support decompression with buffer size greater than {}, got buffer size: {}",
+            max_buffer_size, buf_size);
+
     zstr.zalloc = nullptr;
     zstr.zfree = nullptr;
     zstr.opaque = nullptr;
@@ -31,10 +37,7 @@ ZlibInflatingReadBuffer::ZlibInflatingReadBuffer(
         window_bits += 16;
     }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
     int rc = inflateInit2(&zstr, window_bits);
-#pragma GCC diagnostic pop
 
     if (rc != Z_OK)
         throw Exception(ErrorCodes::ZLIB_INFLATE_FAILED, "inflateInit2 failed: {}; zlib version: {}.", zError(rc), ZLIB_VERSION);
@@ -61,16 +64,22 @@ bool ZlibInflatingReadBuffer::nextImpl()
         {
             in->nextIfAtEnd();
             zstr.next_in = reinterpret_cast<unsigned char *>(in->position());
-            zstr.avail_in = static_cast<unsigned>(in->buffer().end() - in->position());
+            zstr.avail_in = static_cast<BufferSizeType>(std::min(
+                static_cast<UInt64>(in->buffer().end() - in->position()),
+                static_cast<UInt64>(max_buffer_size)));
         }
+
         /// init output bytes (place, where decompressed data will be)
         zstr.next_out = reinterpret_cast<unsigned char *>(internal_buffer.begin());
-        zstr.avail_out = static_cast<unsigned>(internal_buffer.size());
+        zstr.avail_out = static_cast<BufferSizeType>(internal_buffer.size());
 
+        size_t old_total_in = zstr.total_in;
         int rc = inflate(&zstr, Z_NO_FLUSH);
 
         /// move in stream on place, where reading stopped
-        in->position() = in->buffer().end() - zstr.avail_in;
+        size_t bytes_read = zstr.total_in - old_total_in;
+        in->position() += bytes_read;
+
         /// change size of working buffer (it's size equal to internal_buffer size without unused uncompressed values)
         working_buffer.resize(internal_buffer.size() - zstr.avail_out);
 
@@ -90,13 +99,22 @@ bool ZlibInflatingReadBuffer::nextImpl()
             {
                 rc = inflateReset(&zstr);
                 if (rc != Z_OK)
-                    throw Exception(ErrorCodes::ZLIB_INFLATE_FAILED, "inflateReset failed: {}", zError(rc));
+                    throw Exception(
+                        ErrorCodes::ZLIB_INFLATE_FAILED,
+                        "inflateReset failed: {}{}",
+                        zError(rc),
+                        getExceptionEntryWithFileName(*in));
                 return true;
             }
         }
+
         /// If it is not end and not OK, something went wrong, throw exception
         if (rc != Z_OK)
-            throw Exception(ErrorCodes::ZLIB_INFLATE_FAILED, "inflateReset failed: {}", zError(rc));
+            throw Exception(
+                ErrorCodes::ZLIB_INFLATE_FAILED,
+                "inflate failed: {}{}",
+                zError(rc),
+                getExceptionEntryWithFileName(*in));
     }
     while (working_buffer.empty());
 
diff --git a/src/IO/ZlibInflatingReadBuffer.h b/src/IO/ZlibInflatingReadBuffer.h
index b534b7cb5c4..d9ca4c61268 100644
--- a/src/IO/ZlibInflatingReadBuffer.h
+++ b/src/IO/ZlibInflatingReadBuffer.h
@@ -4,6 +4,7 @@
 #include <IO/CompressedReadBufferWrapper.h>
 #include <IO/CompressionMethod.h>
 
+#include <limits>
 #include <zlib.h>
 
 
@@ -33,6 +34,11 @@ private:
 
     z_stream zstr;
     bool eof_flag;
+
+    /// Limit size of buffer because zlib uses
+    /// UInt32 for sizes of internal buffers.
+    using BufferSizeType =  decltype(zstr.avail_in);
+    static constexpr auto max_buffer_size = std::numeric_limits<BufferSizeType>::max();
 };
 
 }
diff --git a/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp b/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp
index f8c4d0e2bac..be739c0e654 100644
--- a/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp
+++ b/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp
@@ -23,11 +23,11 @@ ZstdDeflatingAppendableWriteBuffer::ZstdDeflatingAppendableWriteBuffer(
 {
     cctx = ZSTD_createCCtx();
     if (cctx == nullptr)
-        throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "zstd stream encoder init failed: zstd version: {}", ZSTD_VERSION_STRING);
+        throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "ZSTD stream encoder init failed: ZSTD version: {}", ZSTD_VERSION_STRING);
     size_t ret = ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, compression_level);
     if (ZSTD_isError(ret))
         throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED,
-                        "zstd stream encoder option setting failed: error code: {}; zstd version: {}",
+                        "ZSTD stream encoder option setting failed: error code: {}; zstd version: {}",
                         ret, ZSTD_VERSION_STRING);
 
     input = {nullptr, 0, 0};
@@ -64,7 +64,7 @@ void ZstdDeflatingAppendableWriteBuffer::nextImpl()
             if (ZSTD_isError(compression_result))
                 throw Exception(
                                 ErrorCodes::ZSTD_ENCODER_FAILED,
-                                "Zstd stream encoding failed: error code: {}; zstd version: {}",
+                                "ZSTD stream decoding failed: error code: {}; ZSTD version: {}",
                                 ZSTD_getErrorName(compression_result), ZSTD_VERSION_STRING);
 
             first_write = false;
@@ -138,7 +138,7 @@ void ZstdDeflatingAppendableWriteBuffer::finalizeBefore()
     {
         if (ZSTD_isError(remaining))
             throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED,
-                            "Zstd stream encoder end failed: error: '{}' zstd version: {}",
+                            "ZSTD stream encoder end failed: error: '{}' ZSTD version: {}",
                             ZSTD_getErrorName(remaining), ZSTD_VERSION_STRING);
 
         remaining = ZSTD_compressStream2(cctx, &output, &input, ZSTD_e_end);
diff --git a/src/IO/ZstdDeflatingWriteBuffer.cpp b/src/IO/ZstdDeflatingWriteBuffer.cpp
index a12b59b80f5..c6d2ffc39f9 100644
--- a/src/IO/ZstdDeflatingWriteBuffer.cpp
+++ b/src/IO/ZstdDeflatingWriteBuffer.cpp
@@ -63,7 +63,7 @@ void ZstdDeflatingWriteBuffer::nextImpl()
             if (ZSTD_isError(compression_result))
                 throw Exception(
                                 ErrorCodes::ZSTD_ENCODER_FAILED,
-                                "Zstd stream encoding failed: error: '{}'; zstd version: {}",
+                                "ZSTD stream encoding failed: error: '{}'; zstd version: {}",
                                 ZSTD_getErrorName(compression_result), ZSTD_VERSION_STRING);
 
             out->position() = out->buffer().begin() + output.pos;
diff --git a/src/IO/ZstdInflatingReadBuffer.cpp b/src/IO/ZstdInflatingReadBuffer.cpp
index 6956bdb6710..2b663ec7145 100644
--- a/src/IO/ZstdInflatingReadBuffer.cpp
+++ b/src/IO/ZstdInflatingReadBuffer.cpp
@@ -1,4 +1,6 @@
 #include <IO/ZstdInflatingReadBuffer.h>
+#include <IO/WithFileName.h>
+#include <zstd_errors.h>
 
 
 namespace DB
@@ -56,11 +58,18 @@ bool ZstdInflatingReadBuffer::nextImpl()
 
         /// Decompress data and check errors.
         size_t ret = ZSTD_decompressStream(dctx, &output, &input);
-        if (ZSTD_isError(ret))
+        if (ZSTD_getErrorCode(ret))
+        {
             throw Exception(
-                    ErrorCodes::ZSTD_DECODER_FAILED,
-                    "Zstd stream encoding failed: error '{}'; zstd version: {}",
-                    ZSTD_getErrorName(ret), ZSTD_VERSION_STRING);
+                ErrorCodes::ZSTD_DECODER_FAILED,
+                "ZSTD stream decoding failed: error '{}'{}; ZSTD version: {}{}",
+                ZSTD_getErrorName(ret),
+                ZSTD_error_frameParameter_windowTooLarge == ret
+                    ? ". You can increase the maximum window size with the 'zstd_window_log_max' setting in ClickHouse. Example: 'SET zstd_window_log_max = 31'"
+                    : "",
+                ZSTD_VERSION_STRING,
+                getExceptionEntryWithFileName(*in));
+        }
 
         /// Check that something has changed after decompress (input or output position)
         assert(in->eof() || output.pos > 0 || in->position() < in->buffer().begin() + input.pos);
diff --git a/src/IO/copyData.cpp b/src/IO/copyData.cpp
index b189c318d67..07222a930b5 100644
--- a/src/IO/copyData.cpp
+++ b/src/IO/copyData.cpp
@@ -10,6 +10,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ATTEMPT_TO_READ_AFTER_EOF;
+    extern const int CANNOT_READ_ALL_DATA;
 }
 
 namespace
@@ -91,6 +92,13 @@ void copyData(ReadBuffer & from, WriteBuffer & to, size_t bytes, std::function<v
     copyDataImpl(from, to, true, bytes, cancellation_hook, nullptr);
 }
 
+void copyDataMaxBytes(ReadBuffer & from, WriteBuffer & to, size_t max_bytes)
+{
+    copyDataImpl(from, to, false, max_bytes, nullptr, nullptr);
+    if (!from.eof())
+        throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read all data, max readable size reached.");
+}
+
 void copyDataWithThrottler(ReadBuffer & from, WriteBuffer & to, const std::atomic<int> & is_cancelled, ThrottlerPtr throttler)
 {
     copyDataImpl(from, to, false, std::numeric_limits<size_t>::max(), &is_cancelled, throttler);
diff --git a/src/IO/copyData.h b/src/IO/copyData.h
index 2202f36f79e..b67088d8e47 100644
--- a/src/IO/copyData.h
+++ b/src/IO/copyData.h
@@ -27,6 +27,9 @@ void copyData(ReadBuffer & from, WriteBuffer & to, size_t bytes, const std::atom
 void copyData(ReadBuffer & from, WriteBuffer & to, std::function<void()> cancellation_hook);
 void copyData(ReadBuffer & from, WriteBuffer & to, size_t bytes, std::function<void()> cancellation_hook);
 
+/// Copies at most `max_bytes` bytes from ReadBuffer to WriteBuffer. If there are more bytes, then throws an exception.
+void copyDataMaxBytes(ReadBuffer & from, WriteBuffer & to, size_t max_bytes);
+
 /// Same as above but also use throttler to limit maximum speed
 void copyDataWithThrottler(ReadBuffer & from, WriteBuffer & to, const std::atomic<int> & is_cancelled, ThrottlerPtr throttler);
 void copyDataWithThrottler(ReadBuffer & from, WriteBuffer & to, size_t bytes, const std::atomic<int> & is_cancelled, ThrottlerPtr throttler);
diff --git a/src/IO/examples/limit_read_buffer.cpp b/src/IO/examples/limit_read_buffer.cpp
index 559c87353f0..9c57c175620 100644
--- a/src/IO/examples/limit_read_buffer.cpp
+++ b/src/IO/examples/limit_read_buffer.cpp
@@ -24,13 +24,13 @@ int main(int argc, char ** argv)
 
     writeCString("--- first ---\n", out);
     {
-        LimitReadBuffer limit_in(in, limit, false);
+        LimitReadBuffer limit_in(in, limit, /* trow_exception */ false, /* exact_limit */ {});
         copyData(limit_in, out);
     }
 
     writeCString("\n--- second ---\n", out);
     {
-        LimitReadBuffer limit_in(in, limit, false);
+        LimitReadBuffer limit_in(in, limit, /* trow_exception */ false, /* exact_limit */ {});
         copyData(limit_in, out);
     }
 
diff --git a/src/IO/examples/limit_read_buffer2.cpp b/src/IO/examples/limit_read_buffer2.cpp
index ac7c43d764c..a0369047d3a 100644
--- a/src/IO/examples/limit_read_buffer2.cpp
+++ b/src/IO/examples/limit_read_buffer2.cpp
@@ -27,7 +27,7 @@ try
 
         ReadBuffer in(src.data(), src.size(), 0);
 
-        LimitReadBuffer limit_in(in, 1, false);
+        LimitReadBuffer limit_in(in, 1, /* trow_exception */ false, /* exact_limit */ {});
 
         {
             WriteBufferFromString out(dst);
@@ -55,7 +55,7 @@ try
             char x;
             readChar(x, in);
 
-            LimitReadBuffer limit_in(in, 1, false);
+            LimitReadBuffer limit_in(in, 1, /* trow_exception */ false, /* exact_limit */ {});
 
             copyData(limit_in, out);
 
@@ -85,7 +85,7 @@ try
         ReadBuffer in(src.data(), src.size(), 0);
 
         {
-            LimitReadBuffer limit_in(in, 1, false);
+            LimitReadBuffer limit_in(in, 1, /* trow_exception */ false, /* exact_limit */ {});
 
             char x;
             readChar(x, limit_in);
diff --git a/src/IO/examples/o_direct_and_dirty_pages.cpp b/src/IO/examples/o_direct_and_dirty_pages.cpp
index 228b7ffe146..85a29830af2 100644
--- a/src/IO/examples/o_direct_and_dirty_pages.cpp
+++ b/src/IO/examples/o_direct_and_dirty_pages.cpp
@@ -46,7 +46,7 @@ int main(int, char **)
         /// Write to file with O_DIRECT, read as usual.
 
         {
-            WriteBufferFromFile wb("test2", BUF_SIZE, O_WRONLY | O_CREAT | O_TRUNC | O_DIRECT, 0666, nullptr, page_size);
+            WriteBufferFromFile wb("test2", BUF_SIZE, O_WRONLY | O_CREAT | O_TRUNC | O_DIRECT, /* throttler= */ {}, 0666, nullptr, page_size);
 
             for (size_t i = 0; i < N; ++i)
                 writeStringBinary(test, wb);
diff --git a/src/IO/examples/var_uint.cpp b/src/IO/examples/var_uint.cpp
index 65e1f0495d3..0d20fa7172d 100644
--- a/src/IO/examples/var_uint.cpp
+++ b/src/IO/examples/var_uint.cpp
@@ -18,7 +18,11 @@ int main(int argc, char ** argv)
     }
 
     DB::UInt64 x = DB::parse<UInt64>(argv[1]);
+
+    std::cout << std::hex << std::showbase << "Input: " << x << std::endl;
+
     Poco::HexBinaryEncoder hex(std::cout);
+    std::cout << "writeVarUInt(std::ostream): 0x";
     DB::writeVarUInt(x, hex);
     std::cout << std::endl;
 
@@ -30,6 +34,7 @@ int main(int argc, char ** argv)
         wb.next();
     }
 
+    std::cout << "writeVarUInt(WriteBuffer): 0x";
     hex << s;
     std::cout << std::endl;
 
@@ -38,6 +43,7 @@ int main(int argc, char ** argv)
 
     s.resize(DB::writeVarUInt(x, s.data()) - s.data());
 
+    std::cout << "writeVarUInt(char *): 0x";
     hex << s;
     std::cout << std::endl;
 
@@ -46,7 +52,7 @@ int main(int argc, char ** argv)
     DB::ReadBufferFromString rb(s);
     DB::readVarUInt(y, rb);
 
-    std::cerr << "x: " << x << ", y: " << y << std::endl;
+    std::cerr << "Input: " << x << ", readVarUInt(writeVarUInt()): " << y << std::endl;
 
     return 0;
 }
diff --git a/src/IO/examples/zlib_ng_bug.cpp b/src/IO/examples/zlib_ng_bug.cpp
index f7c3d1eeefe..bc7c3ba939a 100644
--- a/src/IO/examples/zlib_ng_bug.cpp
+++ b/src/IO/examples/zlib_ng_bug.cpp
@@ -4,9 +4,6 @@
 
 #include <zlib.h>
 
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-
-
 /// https://github.com/zlib-ng/zlib-ng/issues/494
 int main(int, char **)
 {
diff --git a/src/IO/tests/gtest_DateTime64_parsing_and_writing.cpp b/src/IO/tests/gtest_DateTime64_parsing_and_writing.cpp
index c6208af2d5e..697851b217a 100644
--- a/src/IO/tests/gtest_DateTime64_parsing_and_writing.cpp
+++ b/src/IO/tests/gtest_DateTime64_parsing_and_writing.cpp
@@ -1,4 +1,3 @@
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <gtest/gtest.h>
 
 #include <IO/ReadHelpers.h>
diff --git a/src/IO/tests/gtest_bit_io.cpp b/src/IO/tests/gtest_bit_io.cpp
index 6a88f7baa64..6b59d13b5a3 100644
--- a/src/IO/tests/gtest_bit_io.cpp
+++ b/src/IO/tests/gtest_bit_io.cpp
@@ -1,6 +1,4 @@
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 #include <cstring>
 #include <IO/BitHelpers.h>
@@ -18,7 +16,6 @@
 #include <vector>
 #include <typeinfo>
 #include <iostream>
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <gtest/gtest.h>
 
 using namespace DB;
@@ -253,6 +250,7 @@ INSTANTIATE_TEST_SUITE_P(Primes,
 
 TEST(BitHelpers, maskLowBits)
 {
+    // unsigned
     EXPECT_EQ(0b00000111, ::maskLowBits<uint8_t>(3));
     EXPECT_EQ(0b01111111, ::maskLowBits<uint8_t>(7));
     EXPECT_EQ(0b0000000001111111, ::maskLowBits<UInt16>(7));
@@ -261,8 +259,24 @@ TEST(BitHelpers, maskLowBits)
     EXPECT_EQ(0b111111111111111111111111111111111, ::maskLowBits<UInt64>(33));
     EXPECT_EQ(0b11111111111111111111111111111111111, ::maskLowBits<UInt64>(35));
 
+    // signed
+    EXPECT_EQ(static_cast<int8_t>(0b00000111), ::maskLowBits<int8_t>(3));
+    EXPECT_EQ(static_cast<int8_t>(0b01111111), ::maskLowBits<int8_t>(7));
+    EXPECT_EQ(static_cast<Int16>(0b0000000001111111), ::maskLowBits<Int16>(7));
+    EXPECT_EQ(static_cast<Int16>(0b0001111111111111), ::maskLowBits<Int16>(13));
+    EXPECT_EQ(static_cast<Int32>(0b00000111111111111111111111111111), ::maskLowBits<Int32>(27));
+    EXPECT_EQ(static_cast<Int64>(0b111111111111111111111111111111111), ::maskLowBits<Int64>(33));
+    EXPECT_EQ(static_cast<Int64>(0b11111111111111111111111111111111111), ::maskLowBits<Int64>(35));
+
+    // unsigned
     EXPECT_EQ(0xFF, ::maskLowBits<uint8_t>(8));
     EXPECT_EQ(0xFFFF, ::maskLowBits<UInt16>(16));
     EXPECT_EQ(0xFFFFFFFF, ::maskLowBits<UInt32>(32));
     EXPECT_EQ(0xFFFFFFFFFFFFFFFF, ::maskLowBits<UInt64>(64));
+
+    // signed
+    EXPECT_EQ(static_cast<int8_t>(0xFF), ::maskLowBits<int8_t>(8));
+    EXPECT_EQ(static_cast<Int16>(0xFFFF), ::maskLowBits<Int16>(16));
+    EXPECT_EQ(static_cast<Int32>(0xFFFFFFFF), ::maskLowBits<Int32>(32));
+    EXPECT_EQ(static_cast<Int64>(0xFFFFFFFFFFFFFFFF), ::maskLowBits<Int64>(64));
 }
diff --git a/src/IO/tests/gtest_hadoop_snappy_decoder.cpp b/src/IO/tests/gtest_hadoop_snappy_decoder.cpp
index 4db0deac08e..2847c730735 100644
--- a/src/IO/tests/gtest_hadoop_snappy_decoder.cpp
+++ b/src/IO/tests/gtest_hadoop_snappy_decoder.cpp
@@ -14,7 +14,7 @@
 #include <Poco/StreamCopier.h>
 #include <Poco/String.h>
 #include <Common/SipHash.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 using namespace DB;
 TEST(HadoopSnappyDecoder, repeatNeedMoreInput)
 {
diff --git a/src/IO/tests/gtest_stringstream.cpp b/src/IO/tests/gtest_stringstream.cpp
new file mode 100644
index 00000000000..c4352740695
--- /dev/null
+++ b/src/IO/tests/gtest_stringstream.cpp
@@ -0,0 +1,37 @@
+#include <gtest/gtest.h>
+
+#include <sstream>
+#include <string>
+
+// There are few places where stringstream is used to pass data to some 3d
+// party code.
+//
+// And there was problems with feeding > INT_MAX to stringstream in libc++,
+// this is the regression test for it.
+//
+// Since that places in Clickhouse can operate on buffers > INT_MAX (i.e.
+// WriteBufferFromS3), so it is better to have a test for this in ClickHouse
+// too.
+TEST(stringstream, INTMAX)
+{
+    std::stringstream ss;
+    ss.exceptions(std::ios::badbit);
+
+    std::string payload(1<<20, 'A');
+
+    // write up to INT_MAX-1MiB
+    for (size_t i = 0; i < (2ULL<<30) - payload.size(); i += payload.size())
+    {
+        ASSERT_NE(ss.tellp(), -1);
+        ss.write(payload.data(), payload.size());
+        // std::cerr << "i: " << ss.tellp()/1024/1024 << " MB\n";
+    }
+
+    ASSERT_NE(ss.tellp(), -1);
+    // write up to INT_MAX
+    ss.write(payload.data(), payload.size());
+
+    ASSERT_NE(ss.tellp(), -1);
+    // write one more 1MiB chunk
+    ss.write(payload.data(), payload.size());
+}
diff --git a/src/IO/tests/gtest_writebuffer_s3.cpp b/src/IO/tests/gtest_writebuffer_s3.cpp
new file mode 100644
index 00000000000..bc16af7f779
--- /dev/null
+++ b/src/IO/tests/gtest_writebuffer_s3.cpp
@@ -0,0 +1,1115 @@
+#include <gtest/gtest.h>
+
+#include "config.h"
+
+#if USE_AWS_S3
+
+#include <gmock/gmock.h>
+
+#include <aws/core/Aws.h>
+#include <aws/core/auth/AWSCredentials.h>
+#include <aws/core/auth/AWSCredentialsProvider.h>
+#include <aws/core/config/AWSProfileConfigLoader.h>
+
+#include <aws/s3/model/CreateMultipartUploadRequest.h>
+#include <aws/s3/model/CompleteMultipartUploadRequest.h>
+#include <aws/s3/model/AbortMultipartUploadRequest.h>
+#include <aws/s3/model/PutObjectRequest.h>
+#include <aws/s3/model/UploadPartRequest.h>
+#include <aws/s3/model/HeadObjectRequest.h>
+#include <aws/s3/model/GetObjectRequest.h>
+#include <aws/s3/S3Client.h>
+#include <aws/s3/S3Errors.h>
+
+#include <IO/WriteBufferFromS3.h>
+#include <IO/S3Common.h>
+
+#include <Common/filesystemHelpers.h>
+#include <IO/S3/Client.h>
+#include <Core/Settings.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int S3_ERROR;
+}
+
+}
+
+namespace MockS3
+{
+
+class Sequencer
+{
+public:
+    size_t next() { return counter++; }
+    std::string next_id()
+    {
+        std::stringstream ss;
+        ss << "id-" << next();
+        return ss.str();
+    }
+
+private:
+    size_t counter = 0;
+};
+
+class BucketMemStore
+{
+public:
+    using Key = std::string;
+    using Data = std::string;
+    using ETag = std::string;
+    using MPU_ID = std::string;
+    using MPUPartsInProgress = std::map<ETag, Data>;
+    using MPUParts = std::vector<Data>;
+
+
+    std::map<Key, Data> objects;
+    std::map<MPU_ID, MPUPartsInProgress> multiPartUploads;
+    std::vector<std::pair<MPU_ID, MPUParts>> CompletedPartUploads;
+
+    Sequencer sequencer;
+
+    std::string CreateMPU()
+    {
+        auto id = sequencer.next_id();
+        multiPartUploads.emplace(id, MPUPartsInProgress{});
+        return id;
+    }
+
+    std::string UploadPart(const std::string & upload_id, const std::string & part)
+    {
+        auto etag = sequencer.next_id();
+        auto & parts = multiPartUploads.at(upload_id);
+        parts.emplace(etag, part);
+        return etag;
+    }
+
+    void PutObject(const std::string & key, const std::string & data)
+    {
+        objects[key] = data;
+    }
+
+    void CompleteMPU(const std::string & key, const std::string & upload_id, const std::vector<std::string> & etags)
+    {
+        MPUParts completedParts;
+        completedParts.reserve(etags.size());
+
+        auto & parts = multiPartUploads.at(upload_id);
+        for (const auto & tag: etags) {
+            completedParts.push_back(parts.at(tag));
+        }
+
+        std::stringstream file_data;
+        for (const auto & part_data: completedParts) {
+            file_data << part_data;
+        }
+
+        CompletedPartUploads.emplace_back(upload_id, std::move(completedParts));
+        objects[key] = file_data.str();
+        multiPartUploads.erase(upload_id);
+    }
+
+    void AbortMPU(const std::string & upload_id)
+    {
+        multiPartUploads.erase(upload_id);
+    }
+
+
+    const std::vector<std::pair<MPU_ID, MPUParts>> & GetCompletedPartUploads() const
+    {
+        return CompletedPartUploads;
+    }
+
+    static std::vector<size_t> GetPartSizes(const MPUParts & parts)
+    {
+        std::vector<size_t> result;
+        result.reserve(parts.size());
+        for (const auto & part_data : parts)
+            result.push_back(part_data.size());
+
+        return result;
+    }
+
+};
+
+class S3MemStrore
+{
+public:
+    void CreateBucket(const std::string & bucket)
+    {
+        assert(!buckets.contains(bucket));
+        buckets.emplace(bucket, BucketMemStore{});
+    }
+
+    BucketMemStore& GetBucketStore(const std::string & bucket) {
+        return buckets.at(bucket);
+    }
+
+private:
+    std::map<std::string, BucketMemStore> buckets;
+};
+
+struct EventCounts
+{
+    size_t headObject = 0;
+    size_t getObject = 0;
+    size_t putObject = 0;
+    size_t multiUploadCreate = 0;
+    size_t multiUploadComplete = 0;
+    size_t multiUploadAbort = 0;
+    size_t uploadParts = 0;
+    size_t writtenSize = 0;
+
+    size_t totalRequestsCount() const
+    {
+        return headObject + getObject + putObject + multiUploadCreate + multiUploadComplete + uploadParts;
+    }
+};
+
+struct Client;
+
+struct InjectionModel
+{
+    virtual ~InjectionModel() = default;
+
+#define DeclareInjectCall(ObjectTypePart) \
+    virtual std::optional<Aws::S3::Model::ObjectTypePart##Outcome> call(const Aws::S3::Model::ObjectTypePart##Request & /*request*/) \
+    { \
+        return std::nullopt; \
+    }
+    DeclareInjectCall(PutObject)
+    DeclareInjectCall(HeadObject)
+    DeclareInjectCall(CreateMultipartUpload)
+    DeclareInjectCall(CompleteMultipartUpload)
+    DeclareInjectCall(AbortMultipartUpload)
+    DeclareInjectCall(UploadPart)
+#undef DeclareInjectCall
+};
+
+struct Client : DB::S3::Client
+{
+    explicit Client(std::shared_ptr<S3MemStrore> mock_s3_store)
+        : DB::S3::Client(
+               100,
+               DB::S3::ServerSideEncryptionKMSConfig(),
+               std::make_shared<Aws::Auth::SimpleAWSCredentialsProvider>("", ""),
+               GetClientConfiguration(),
+               Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
+               /* use_virtual_addressing = */ true)
+        , store(mock_s3_store)
+    { }
+
+    static std::shared_ptr<Client> CreateClient(String bucket = "mock-s3-bucket")
+    {
+        auto s3store = std::make_shared<S3MemStrore>();
+        s3store->CreateBucket(bucket);
+        return std::make_shared<Client>(s3store);
+    }
+
+    static DB::S3::PocoHTTPClientConfiguration GetClientConfiguration()
+    {
+        DB::RemoteHostFilter remote_host_filter;
+        return DB::S3::ClientFactory::instance().createClientConfiguration(
+            "some-region",
+            remote_host_filter,
+            /* s3_max_redirects = */ 100,
+            /* enable_s3_requests_logging = */ true,
+            /* for_disk_s3 = */ false,
+            /* get_request_throttler = */ {},
+            /* put_request_throttler = */ {}
+        );
+    }
+
+    void setInjectionModel(std::shared_ptr<MockS3::InjectionModel> injections_)
+    {
+        injections = injections_;
+    }
+
+    Aws::S3::Model::PutObjectOutcome PutObject(const Aws::S3::Model::PutObjectRequest & request) const override
+    {
+        ++counters.putObject;
+
+        if (injections)
+        {
+            if (auto opt_val = injections->call(request))
+            {
+                return *opt_val;
+            }
+        }
+
+        auto & bStore = store->GetBucketStore(request.GetBucket());
+        std::stringstream data;
+        data << request.GetBody()->rdbuf();
+        bStore.PutObject(request.GetKey(), data.str());
+        counters.writtenSize += data.str().length();
+
+        Aws::S3::Model::PutObjectOutcome outcome;
+        Aws::S3::Model::PutObjectResult result(outcome.GetResultWithOwnership());
+        return result;
+    }
+
+    Aws::S3::Model::GetObjectOutcome GetObject(const Aws::S3::Model::GetObjectRequest & request) const override
+    {
+        ++counters.getObject;
+
+        auto & bStore = store->GetBucketStore(request.GetBucket());
+
+        auto factory = request.GetResponseStreamFactory();
+        Aws::Utils::Stream::ResponseStream responseStream(factory);
+        responseStream.GetUnderlyingStream() << std::stringstream(bStore.objects[request.GetKey()]).rdbuf();
+
+        Aws::AmazonWebServiceResult<Aws::Utils::Stream::ResponseStream> awsStream(std::move(responseStream), Aws::Http::HeaderValueCollection());
+        Aws::S3::Model::GetObjectResult getObjectResult(std::move(awsStream));
+        return Aws::S3::Model::GetObjectOutcome(std::move(getObjectResult));
+    }
+
+    Aws::S3::Model::HeadObjectOutcome HeadObject(const Aws::S3::Model::HeadObjectRequest & request) const override
+    {
+        ++counters.headObject;
+
+        if (injections)
+        {
+            if (auto opt_val = injections->call(request))
+            {
+                return std::move(*opt_val);
+            }
+        }
+
+        auto & bStore = store->GetBucketStore(request.GetBucket());
+        auto obj = bStore.objects[request.GetKey()];
+        Aws::S3::Model::HeadObjectOutcome outcome;
+        Aws::S3::Model::HeadObjectResult result(outcome.GetResultWithOwnership());
+        result.SetContentLength(obj.length());
+        return result;
+    }
+
+    Aws::S3::Model::CreateMultipartUploadOutcome CreateMultipartUpload(const Aws::S3::Model::CreateMultipartUploadRequest & request) const override
+    {
+        ++counters.multiUploadCreate;
+
+        if (injections)
+        {
+            if (auto opt_val = injections->call(request))
+            {
+                return std::move(*opt_val);
+            }
+        }
+
+        auto & bStore = store->GetBucketStore(request.GetBucket());
+        auto mpu_id = bStore.CreateMPU();
+
+        Aws::S3::Model::CreateMultipartUploadResult result;
+        result.SetUploadId(mpu_id.c_str());
+        return Aws::S3::Model::CreateMultipartUploadOutcome(result);
+    }
+
+    Aws::S3::Model::UploadPartOutcome UploadPart(const Aws::S3::Model::UploadPartRequest & request) const override
+    {
+        ++counters.uploadParts;
+
+        if (injections)
+        {
+            if (auto opt_val = injections->call(request))
+            {
+                return std::move(*opt_val);
+            }
+        }
+
+        std::stringstream data;
+        data << request.GetBody()->rdbuf();
+        counters.writtenSize += data.str().length();
+
+        auto & bStore = store->GetBucketStore(request.GetBucket());
+        auto etag = bStore.UploadPart(request.GetUploadId(), data.str());
+
+        Aws::S3::Model::UploadPartResult result;
+        result.SetETag(etag);
+        return Aws::S3::Model::UploadPartOutcome(result);
+    }
+
+    Aws::S3::Model::CompleteMultipartUploadOutcome CompleteMultipartUpload(const Aws::S3::Model::CompleteMultipartUploadRequest & request) const override
+    {
+        ++counters.multiUploadComplete;
+
+        if (injections)
+        {
+            if (auto opt_val = injections->call(request))
+            {
+                return std::move(*opt_val);
+            }
+        }
+
+        auto & bStore = store->GetBucketStore(request.GetBucket());
+
+        std::vector<std::string> etags;
+        for (const auto & x: request.GetMultipartUpload().GetParts()) {
+            etags.push_back(x.GetETag());
+        }
+        bStore.CompleteMPU(request.GetKey(), request.GetUploadId(), etags);
+
+        Aws::S3::Model::CompleteMultipartUploadResult result;
+        return Aws::S3::Model::CompleteMultipartUploadOutcome(result);
+    }
+
+    Aws::S3::Model::AbortMultipartUploadOutcome AbortMultipartUpload(const Aws::S3::Model::AbortMultipartUploadRequest & request) const override
+    {
+        ++counters.multiUploadAbort;
+
+        if (injections)
+        {
+            if (auto opt_val = injections->call(request))
+            {
+                return std::move(*opt_val);
+            }
+        }
+
+        auto & bStore = store->GetBucketStore(request.GetBucket());
+        bStore.AbortMPU(request.GetUploadId());
+
+        Aws::S3::Model::AbortMultipartUploadResult result;
+        return Aws::S3::Model::AbortMultipartUploadOutcome(result);
+    }
+
+    std::shared_ptr<S3MemStrore> store;
+    mutable EventCounts counters;
+    mutable std::shared_ptr<InjectionModel> injections;
+    void resetCounters() const { counters = {}; }
+};
+
+struct PutObjectFailIngection: InjectionModel
+{
+    std::optional<Aws::S3::Model::PutObjectOutcome> call(const Aws::S3::Model::PutObjectRequest & /*request*/) override
+    {
+        return Aws::Client::AWSError<Aws::Client::CoreErrors>(Aws::Client::CoreErrors::VALIDATION, "FailInjection", "PutObjectFailIngection", false);
+    }
+};
+
+struct HeadObjectFailIngection: InjectionModel
+{
+    std::optional<Aws::S3::Model::HeadObjectOutcome> call(const Aws::S3::Model::HeadObjectRequest & /*request*/) override
+    {
+        return Aws::Client::AWSError<Aws::Client::CoreErrors>(Aws::Client::CoreErrors::VALIDATION, "FailInjection", "HeadObjectFailIngection", false);
+    }
+};
+
+struct CreateMPUFailIngection: InjectionModel
+{
+    std::optional<Aws::S3::Model::CreateMultipartUploadOutcome> call(const Aws::S3::Model::CreateMultipartUploadRequest & /*request*/) override
+    {
+        return Aws::Client::AWSError<Aws::Client::CoreErrors>(Aws::Client::CoreErrors::VALIDATION, "FailInjection", "CreateMPUFailIngection", false);
+    }
+};
+
+struct CompleteMPUFailIngection: InjectionModel
+{
+    std::optional<Aws::S3::Model::CompleteMultipartUploadOutcome> call(const Aws::S3::Model::CompleteMultipartUploadRequest & /*request*/) override
+    {
+        return Aws::Client::AWSError<Aws::Client::CoreErrors>(Aws::Client::CoreErrors::VALIDATION, "FailInjection", "CompleteMPUFailIngection", false);
+    }
+};
+
+struct UploadPartFailIngection: InjectionModel
+{
+    std::optional<Aws::S3::Model::UploadPartOutcome> call(const Aws::S3::Model::UploadPartRequest & /*request*/) override
+    {
+        return Aws::Client::AWSError<Aws::Client::CoreErrors>(Aws::Client::CoreErrors::VALIDATION, "FailInjection", "UploadPartFailIngection", false);
+    }
+};
+
+struct BaseSyncPolicy
+{
+    virtual ~BaseSyncPolicy() = default;
+    virtual DB::ThreadPoolCallbackRunner<void> getScheduler() { return {}; }
+    virtual void execute(size_t) {}
+    virtual void setAutoExecute(bool) {}
+
+    virtual size_t size() const { return 0; }
+    virtual bool empty() const { return size() == 0; }
+};
+
+struct SimpleAsyncTasks : BaseSyncPolicy
+{
+    bool auto_execute = false;
+    std::deque<std::packaged_task<void()>> queue;
+
+    DB::ThreadPoolCallbackRunner<void> getScheduler() override
+    {
+        return [this] (std::function<void()> && operation, size_t /*priority*/)
+        {
+            if (auto_execute)
+            {
+                auto task = std::packaged_task<void()>(std::move(operation));
+                task();
+                return task.get_future();
+            }
+
+            queue.emplace_back(std::move(operation));
+            return queue.back().get_future();
+        };
+    }
+
+    void execute(size_t limit) override
+    {
+        if (limit == 0)
+            limit = queue.size();
+
+        while (!queue.empty() && limit)
+        {
+            auto & request = queue.front();
+            request();
+
+            queue.pop_front();
+            --limit;
+        }
+    }
+
+    void setAutoExecute(bool value) override
+    {
+        auto_execute = value;
+        if (auto_execute)
+            execute(0);
+    }
+
+    size_t size() const override { return queue.size(); }
+};
+
+}
+
+using namespace DB;
+
+void writeAsOneBlock(WriteBuffer& buf, size_t size)
+{
+    std::vector<char> data(size, 'a');
+    buf.write(data.data(), data.size());
+}
+
+void writeAsPieces(WriteBuffer& buf, size_t size)
+{
+    size_t ceil = 15ull*1024*1024*1024;
+    size_t piece = 1;
+    size_t written = 0;
+    while (written < size) {
+        size_t len = std::min({piece, size-written, ceil});
+        writeAsOneBlock(buf, len);
+        written += len;
+        piece *= 2;
+    }
+}
+
+class WBS3Test : public ::testing::Test
+{
+public:
+    const String bucket = "WBS3Test-bucket";
+
+    Settings & getSettings()
+    {
+        return settings;
+    }
+
+    MockS3::BaseSyncPolicy & getAsyncPolicy()
+    {
+        return *async_policy;
+    }
+
+    std::unique_ptr<WriteBufferFromS3> getWriteBuffer(String file_name = "file")
+    {
+        S3Settings::RequestSettings request_settings;
+        request_settings.updateFromSettings(settings);
+
+        client->resetCounters();
+
+        getAsyncPolicy().setAutoExecute(false);
+
+        return std::make_unique<WriteBufferFromS3>(
+                    client,
+                    bucket,
+                    file_name,
+                    DBMS_DEFAULT_BUFFER_SIZE,
+                    request_settings,
+                    std::nullopt,
+                    getAsyncPolicy().getScheduler());
+    }
+
+    void setInjectionModel(std::shared_ptr<MockS3::InjectionModel> injections_)
+    {
+        client->setInjectionModel(injections_);
+    }
+
+    void runSimpleScenario(MockS3::EventCounts expected_counters, size_t size)
+    {
+        auto scenario = [&] (std::function<void(WriteBuffer& buf, size_t size)> writeMethod) {
+            auto buffer = getWriteBuffer("file");
+            writeMethod(*buffer, size);
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+
+            expected_counters.writtenSize = size;
+            assertCountersEQ(expected_counters);
+
+            auto & bStore = client->store->GetBucketStore(bucket);
+            auto & data = bStore.objects["file"];
+            ASSERT_EQ(size, data.size());
+            for (char c : data)
+               ASSERT_EQ('a', c);
+        };
+
+        scenario(writeAsOneBlock);
+        scenario(writeAsPieces);
+    }
+
+    void assertCountersEQ(const MockS3::EventCounts & canonical) {
+        const auto & actual = client->counters;
+        ASSERT_EQ(canonical.headObject, actual.headObject);
+        ASSERT_EQ(canonical.getObject, actual.getObject);
+        ASSERT_EQ(canonical.putObject, actual.putObject);
+        ASSERT_EQ(canonical.multiUploadCreate, actual.multiUploadCreate);
+        ASSERT_EQ(canonical.multiUploadComplete, actual.multiUploadComplete);
+        ASSERT_EQ(canonical.multiUploadAbort, actual.multiUploadAbort);
+        ASSERT_EQ(canonical.uploadParts, actual.uploadParts);
+        ASSERT_EQ(canonical.writtenSize, actual.writtenSize);
+    }
+
+    auto getCompletedPartUploads ()
+    {
+         return client->store->GetBucketStore(bucket).GetCompletedPartUploads();
+    }
+
+protected:
+    Settings settings;
+
+    std::shared_ptr<MockS3::Client> client;
+    std::unique_ptr<MockS3::BaseSyncPolicy> async_policy;
+
+    void SetUp() override
+    {
+        client = MockS3::Client::CreateClient(bucket);
+        async_policy = std::make_unique<MockS3::BaseSyncPolicy>();
+    }
+
+    void TearDown() override
+    {
+        client.reset();
+        async_policy.reset();
+    }
+};
+
+class SyncAsync : public WBS3Test, public ::testing::WithParamInterface<bool>
+{
+protected:
+    bool test_with_pool = false;
+
+    void SetUp() override
+    {
+        test_with_pool = GetParam();
+        client = MockS3::Client::CreateClient(bucket);
+        if (test_with_pool)
+            async_policy = std::make_unique<MockS3::SimpleAsyncTasks>();
+        else
+            async_policy = std::make_unique<MockS3::BaseSyncPolicy>();
+    }
+};
+
+INSTANTIATE_TEST_SUITE_P(WBS3
+    , SyncAsync
+    , ::testing::Values(true, false)
+    , [] (const ::testing::TestParamInfo<SyncAsync::ParamType>& info_param) {
+        std::string name = info_param.param ? "async" : "sync";
+        return name;
+  });
+
+TEST_P(SyncAsync, ExceptionOnHead) {
+    setInjectionModel(std::make_shared<MockS3::HeadObjectFailIngection>());
+
+    getSettings().s3_check_objects_after_upload = true;
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_head_1");
+            buffer->write('A');
+            buffer->next();
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+        }
+        catch( const DB::Exception& e )
+        {
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("Immediately after upload:"));
+            throw;
+        }
+    }, DB::S3Exception);
+}
+
+TEST_P(SyncAsync, ExceptionOnPut) {
+    setInjectionModel(std::make_shared<MockS3::PutObjectFailIngection>());
+
+    EXPECT_THROW({
+        try
+        {
+            auto buffer = getWriteBuffer("exception_on_put_1");
+            buffer->write('A');
+            buffer->next();
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+        }
+        catch( const DB::Exception& e )
+        {
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("PutObjectFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_put_2");
+            buffer->write('A');
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+        }
+        catch( const DB::Exception& e )
+        {
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("PutObjectFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_put_3");
+            buffer->write('A');
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->preFinalize();
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+        }
+        catch( const DB::Exception& e )
+        {
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("PutObjectFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+
+}
+
+TEST_P(SyncAsync, ExceptionOnCreateMPU) {
+    setInjectionModel(std::make_shared<MockS3::CreateMPUFailIngection>());
+
+    getSettings().s3_max_single_part_upload_size = 0; // no single part
+    getSettings().s3_min_upload_part_size = 1; // small parts ara ok
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_create_mpu_1");
+            buffer->write('A');
+            buffer->next();
+            buffer->write('A');
+            buffer->next();
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+        }
+        catch( const DB::Exception& e )
+        {
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("CreateMPUFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_create_mpu_2");
+            buffer->write('A');
+            buffer->preFinalize();
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+        }
+        catch( const DB::Exception& e )
+        {
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("CreateMPUFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_create_mpu_2");
+            buffer->write('A');
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+        }
+        catch( const DB::Exception& e )
+        {
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("CreateMPUFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+}
+
+
+TEST_P(SyncAsync, ExceptionOnCompleteMPU) {
+    setInjectionModel(std::make_shared<MockS3::CompleteMPUFailIngection>());
+
+    getSettings().s3_max_single_part_upload_size = 0; // no single part
+    getSettings().s3_min_upload_part_size = 1; // small parts ara ok
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_complete_mpu_1");
+            buffer->write('A');
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+        }
+        catch(const DB::Exception & e)
+        {
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("CompleteMPUFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+}
+
+TEST_P(SyncAsync, ExceptionOnUploadPart) {
+    setInjectionModel(std::make_shared<MockS3::UploadPartFailIngection>());
+
+    getSettings().s3_max_single_part_upload_size = 0; // no single part
+    getSettings().s3_min_upload_part_size = 1; // small parts ara ok
+
+    MockS3::EventCounts counters = {.multiUploadCreate = 1, .multiUploadAbort = 1};
+
+    counters.uploadParts = 2;
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_upload_part_1");
+
+            buffer->write('A');
+            buffer->next();
+            buffer->write('A');
+            buffer->next();
+
+            getAsyncPolicy().setAutoExecute(true);
+
+            buffer->finalize();
+        }
+        catch(const DB::Exception & e)
+        {
+            assertCountersEQ(counters);
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("UploadPartFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_upload_part_2");
+            getAsyncPolicy().setAutoExecute(true);
+
+            buffer->write('A');
+            buffer->next();
+
+            buffer->write('A');
+            buffer->next();
+
+            buffer->finalize();
+        }
+        catch(const DB::Exception & e)
+        {
+            assertCountersEQ(counters);
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("UploadPartFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+
+    counters.uploadParts = 1;
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_upload_part_3");
+            buffer->write('A');
+
+            buffer->preFinalize();
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+        }
+        catch(const DB::Exception & e)
+        {
+            assertCountersEQ(counters);
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("UploadPartFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("exception_on_upload_part_4");
+            buffer->write('A');
+
+            getAsyncPolicy().setAutoExecute(true);
+            buffer->finalize();
+        }
+        catch(const DB::Exception & e)
+        {
+            assertCountersEQ(counters);
+            ASSERT_EQ(ErrorCodes::S3_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("UploadPartFailIngection"));
+            throw;
+        }
+      }, DB::S3Exception);
+}
+
+
+TEST_F(WBS3Test, PrefinalizeCalledMultipleTimes) {
+#ifdef ABORT_ON_LOGICAL_ERROR
+    GTEST_SKIP() << "this test trigger LOGICAL_ERROR, runs only if ABORT_ON_LOGICAL_ERROR is not defined";
+#else
+    EXPECT_THROW({
+        try {
+            auto buffer = getWriteBuffer("prefinalize_called_multiple_times");
+            buffer->write('A');
+            buffer->next();
+            buffer->preFinalize();
+            buffer->write('A');
+            buffer->next();
+            buffer->preFinalize();
+            buffer->finalize();
+        }
+        catch(const DB::Exception & e)
+        {
+            ASSERT_EQ(ErrorCodes::LOGICAL_ERROR, e.code());
+            EXPECT_THAT(e.what(), testing::HasSubstr("write to prefinalized buffer for S3"));
+            throw;
+        }
+    }, DB::Exception);
+#endif
+}
+
+TEST_P(SyncAsync, EmptyFile) {
+    getSettings().s3_check_objects_after_upload = true;
+
+    MockS3::EventCounts counters = {.headObject = 2, .putObject = 1};
+    runSimpleScenario(counters, 0);
+}
+
+TEST_P(SyncAsync, ManualNextCalls) {
+    getSettings().s3_check_objects_after_upload = true;
+
+    {
+        MockS3::EventCounts counters = {.headObject = 2, .putObject = 1};
+
+        auto buffer = getWriteBuffer("manual_next_calls_1");
+        buffer->next();
+
+        getAsyncPolicy().setAutoExecute(true);
+        buffer->finalize();
+
+        assertCountersEQ(counters);
+    }
+
+    {
+        MockS3::EventCounts counters = {.headObject = 2, .putObject = 1};
+
+        auto buffer = getWriteBuffer("manual_next_calls_2");
+        buffer->next();
+        buffer->next();
+
+        getAsyncPolicy().setAutoExecute(true);
+        buffer->finalize();
+
+        assertCountersEQ(counters);
+    }
+
+    {
+        MockS3::EventCounts counters = {.headObject = 2, .putObject = 1, .writtenSize = 1};
+
+        auto buffer = getWriteBuffer("manual_next_calls_3");
+        buffer->next();
+        buffer->write('A');
+        buffer->next();
+
+        getAsyncPolicy().setAutoExecute(true);
+        buffer->finalize();
+
+        assertCountersEQ(counters);
+    }
+
+    {
+        MockS3::EventCounts counters = {.headObject = 2, .putObject = 1, .writtenSize = 2};
+
+        auto buffer = getWriteBuffer("manual_next_calls_4");
+        buffer->write('A');
+        buffer->next();
+        buffer->write('A');
+        buffer->next();
+        buffer->next();
+
+        getAsyncPolicy().setAutoExecute(true);
+        buffer->finalize();
+
+        assertCountersEQ(counters);
+     }
+}
+
+TEST_P(SyncAsync, SmallFileIsOnePutRequest) {
+    getSettings().s3_check_objects_after_upload = true;
+
+    {
+        getSettings().s3_max_single_part_upload_size = 1000;
+        getSettings().s3_min_upload_part_size = 10;
+
+        MockS3::EventCounts counters = {.headObject = 2, .putObject = 1};
+
+        runSimpleScenario(counters, 1);
+        runSimpleScenario(counters, getSettings().s3_max_single_part_upload_size-1);
+        runSimpleScenario(counters, getSettings().s3_max_single_part_upload_size);
+        runSimpleScenario(counters, getSettings().s3_max_single_part_upload_size/2);
+    }
+
+    {
+
+        getSettings().s3_max_single_part_upload_size = 10;
+        getSettings().s3_min_upload_part_size = 1000;
+
+        MockS3::EventCounts counters = {.headObject = 2, .putObject = 1};
+
+        runSimpleScenario(counters, 1);
+        runSimpleScenario(counters, getSettings().s3_max_single_part_upload_size-1);
+        runSimpleScenario(counters, getSettings().s3_max_single_part_upload_size);
+        runSimpleScenario(counters, getSettings().s3_max_single_part_upload_size/2);
+    }
+}
+
+TEST_P(SyncAsync, LittleBiggerFileIsMultiPartUpload) {
+    getSettings().s3_check_objects_after_upload = true;
+
+    {
+        getSettings().s3_max_single_part_upload_size = 1000;
+        getSettings().s3_min_upload_part_size = 10;
+
+        MockS3::EventCounts counters = {.headObject = 2, .multiUploadCreate = 1, .multiUploadComplete = 1, .uploadParts = 2};
+        runSimpleScenario(counters, settings.s3_max_single_part_upload_size + 1);
+
+        counters.uploadParts = 101;
+        runSimpleScenario(counters, 2*settings.s3_max_single_part_upload_size);
+    }
+
+    {
+        getSettings().s3_max_single_part_upload_size = 10;
+        getSettings().s3_min_upload_part_size = 1000;
+
+        MockS3::EventCounts counters = {.headObject = 2, .multiUploadCreate = 1, .multiUploadComplete = 1, .uploadParts = 1};
+
+        runSimpleScenario(counters, settings.s3_max_single_part_upload_size + 1);
+        runSimpleScenario(counters, 2*settings.s3_max_single_part_upload_size);
+        runSimpleScenario(counters, settings.s3_min_upload_part_size-1);
+        runSimpleScenario(counters, settings.s3_min_upload_part_size);
+    }
+}
+
+TEST_P(SyncAsync, BiggerFileIsMultiPartUpload) {
+    getSettings().s3_check_objects_after_upload = true;
+
+    {
+        getSettings().s3_max_single_part_upload_size = 1000;
+        getSettings().s3_min_upload_part_size = 10;
+
+        auto counters = MockS3::EventCounts{.headObject = 2, .multiUploadCreate = 1, .multiUploadComplete = 1, .uploadParts = 2};
+        runSimpleScenario(counters, settings.s3_max_single_part_upload_size + settings.s3_min_upload_part_size);
+
+        counters.uploadParts = 3;
+        runSimpleScenario(counters, settings.s3_max_single_part_upload_size + settings.s3_min_upload_part_size + 1);
+        runSimpleScenario(counters, settings.s3_max_single_part_upload_size + 2*settings.s3_min_upload_part_size - 1);
+        runSimpleScenario(counters, settings.s3_max_single_part_upload_size + 2*settings.s3_min_upload_part_size);
+    }
+
+
+    {
+        // but not in that case, when s3_min_upload_part_size > s3_max_single_part_upload_size
+        getSettings().s3_max_single_part_upload_size = 10;
+        getSettings().s3_min_upload_part_size = 1000;
+
+        auto counters = MockS3::EventCounts{.headObject = 2, .multiUploadCreate = 1, .multiUploadComplete = 1, .uploadParts = 2};
+        runSimpleScenario(counters, settings.s3_max_single_part_upload_size + settings.s3_min_upload_part_size);
+        runSimpleScenario(counters, settings.s3_max_single_part_upload_size + settings.s3_min_upload_part_size + 1);
+        runSimpleScenario(counters, 2*settings.s3_min_upload_part_size-1);
+        runSimpleScenario(counters, 2*settings.s3_min_upload_part_size);
+
+        counters.uploadParts = 3;
+        runSimpleScenario(counters, 2*settings.s3_min_upload_part_size+1);
+    }
+}
+
+TEST_P(SyncAsync, IncreaseUploadBuffer) {
+    getSettings().s3_check_objects_after_upload = true;
+
+    {
+        getSettings().s3_max_single_part_upload_size = 10;
+        getSettings().s3_min_upload_part_size = 10;
+        getSettings().s3_upload_part_size_multiply_parts_count_threshold = 1;
+        // parts: 10 20 40 80  160
+        // size:  10 30 70 150 310
+
+        auto counters = MockS3::EventCounts{.headObject = 2, .multiUploadCreate = 1, .multiUploadComplete = 1, .uploadParts = 6};
+        runSimpleScenario(counters, 350);
+
+        auto actual_parts_sizes = MockS3::BucketMemStore::GetPartSizes(getCompletedPartUploads().back().second);
+        ASSERT_THAT(actual_parts_sizes, testing::ElementsAre(10, 20, 40, 80, 160, 40));
+    }
+
+    {
+        getSettings().s3_max_single_part_upload_size = 10;
+        getSettings().s3_min_upload_part_size = 10;
+        getSettings().s3_upload_part_size_multiply_parts_count_threshold = 2;
+        getSettings().s3_upload_part_size_multiply_factor = 3;
+        // parts: 10 10 30 30 90
+        // size:  10 20 50 80 170
+
+        auto counters = MockS3::EventCounts{.headObject = 2, .multiUploadCreate = 1, .multiUploadComplete = 1, .uploadParts = 6};
+        runSimpleScenario(counters, 190);
+
+        auto actual_parts_sizes = MockS3::BucketMemStore::GetPartSizes(getCompletedPartUploads().back().second);
+        ASSERT_THAT(actual_parts_sizes, testing::ElementsAre(10, 10, 30, 30, 90, 20));
+    }
+}
+
+TEST_P(SyncAsync, IncreaseLimited) {
+    getSettings().s3_check_objects_after_upload = true;
+
+    {
+        getSettings().s3_max_single_part_upload_size = 10;
+        getSettings().s3_min_upload_part_size = 10;
+        getSettings().s3_upload_part_size_multiply_parts_count_threshold = 1;
+        getSettings().s3_max_upload_part_size = 45;
+        // parts: 10 20 40 45  45  45
+        // size:  10 30 70 115 160 205
+
+        auto counters = MockS3::EventCounts{.headObject = 2, .multiUploadCreate = 1, .multiUploadComplete = 1, .uploadParts = 7};
+        runSimpleScenario(counters, 220);
+
+        auto actual_parts_sizes = MockS3::BucketMemStore::GetPartSizes(getCompletedPartUploads().back().second);
+        ASSERT_THAT(actual_parts_sizes, testing::ElementsAre(10, 20, 40, 45, 45, 45, 15));
+    }
+}
+
+#endif
diff --git a/src/Interpreters/Access/InterpreterCreateUserQuery.cpp b/src/Interpreters/Access/InterpreterCreateUserQuery.cpp
index 0bde147fbb6..165937560cc 100644
--- a/src/Interpreters/Access/InterpreterCreateUserQuery.cpp
+++ b/src/Interpreters/Access/InterpreterCreateUserQuery.cpp
@@ -23,10 +23,12 @@ namespace
     void updateUserFromQueryImpl(
         User & user,
         const ASTCreateUserQuery & query,
+        const std::optional<AuthenticationData> auth_data,
         const std::shared_ptr<ASTUserNameWithHost> & override_name,
         const std::optional<RolesOrUsersSet> & override_default_roles,
         const std::optional<SettingsProfileElements> & override_settings,
         const std::optional<RolesOrUsersSet> & override_grantees,
+        bool allow_implicit_no_password,
         bool allow_no_password,
         bool allow_plaintext_password)
     {
@@ -37,10 +39,16 @@ namespace
         else if (query.names->size() == 1)
             user.setName(query.names->front()->toString());
 
-        if (query.auth_data)
-            user.auth_data = *query.auth_data;
+        if (!query.attach && !query.alter && !auth_data && !allow_implicit_no_password)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Authentication type NO_PASSWORD must "
+                            "be explicitly specified, check the setting allow_implicit_no_password "
+                            "in the server configuration");
 
-        if (query.auth_data || !query.alter)
+        if (auth_data)
+            user.auth_data = *auth_data;
+
+        if (auth_data || !query.alter)
         {
             auto auth_type = user.auth_data.getType();
             if (((auth_type == AuthenticationType::NO_PASSWORD) && !allow_no_password) ||
@@ -104,17 +112,9 @@ BlockIO InterpreterCreateUserQuery::execute()
     bool no_password_allowed = access_control.isNoPasswordAllowed();
     bool plaintext_password_allowed = access_control.isPlaintextPasswordAllowed();
 
-     if (!query.attach && !query.alter && !query.auth_data && !implicit_no_password_allowed)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Authentication type NO_PASSWORD must "
-                        "be explicitly specified, check the setting allow_implicit_no_password "
-                        "in the server configuration");
-
-    if (!query.attach && query.temporary_password_for_checks)
-    {
-        access_control.checkPasswordComplexityRules(query.temporary_password_for_checks.value());
-        query.temporary_password_for_checks.reset();
-    }
+    std::optional<AuthenticationData> auth_data;
+    if (query.auth_data)
+        auth_data = AuthenticationData::fromAST(*query.auth_data, getContext(), !query.attach);
 
     std::optional<RolesOrUsersSet> default_roles_from_query;
     if (query.default_roles)
@@ -148,7 +148,7 @@ BlockIO InterpreterCreateUserQuery::execute()
         auto update_func = [&](const AccessEntityPtr & entity) -> AccessEntityPtr
         {
             auto updated_user = typeid_cast<std::shared_ptr<User>>(entity->clone());
-            updateUserFromQueryImpl(*updated_user, query, {}, default_roles_from_query, settings_from_query, grantees_from_query, no_password_allowed, plaintext_password_allowed);
+            updateUserFromQueryImpl(*updated_user, query, auth_data, {}, default_roles_from_query, settings_from_query, grantees_from_query, implicit_no_password_allowed, no_password_allowed, plaintext_password_allowed);
             return updated_user;
         };
 
@@ -167,7 +167,7 @@ BlockIO InterpreterCreateUserQuery::execute()
         for (const auto & name : *query.names)
         {
             auto new_user = std::make_shared<User>();
-            updateUserFromQueryImpl(*new_user, query, name, default_roles_from_query, settings_from_query, RolesOrUsersSet::AllTag{}, no_password_allowed, plaintext_password_allowed);
+            updateUserFromQueryImpl(*new_user, query, auth_data, name, default_roles_from_query, settings_from_query, RolesOrUsersSet::AllTag{}, implicit_no_password_allowed, no_password_allowed, plaintext_password_allowed);
             new_users.emplace_back(std::move(new_user));
         }
 
@@ -197,7 +197,11 @@ BlockIO InterpreterCreateUserQuery::execute()
 
 void InterpreterCreateUserQuery::updateUserFromQuery(User & user, const ASTCreateUserQuery & query, bool allow_no_password, bool allow_plaintext_password)
 {
-    updateUserFromQueryImpl(user, query, {}, {}, {}, {}, allow_no_password, allow_plaintext_password);
+    std::optional<AuthenticationData> auth_data;
+    if (query.auth_data)
+        auth_data = AuthenticationData::fromAST(*query.auth_data, {}, !query.attach);
+
+    updateUserFromQueryImpl(user, query, auth_data, {}, {}, {}, {}, allow_no_password, allow_plaintext_password, true);
 }
 
 }
diff --git a/src/Interpreters/Access/InterpreterGrantQuery.cpp b/src/Interpreters/Access/InterpreterGrantQuery.cpp
index f7e170965e2..77474d68795 100644
--- a/src/Interpreters/Access/InterpreterGrantQuery.cpp
+++ b/src/Interpreters/Access/InterpreterGrantQuery.cpp
@@ -17,6 +17,7 @@ namespace DB
 {
 namespace ErrorCodes
 {
+    extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
 }
 
@@ -330,6 +331,54 @@ namespace
             updateGrantedAccessRightsAndRolesTemplate(*role, elements_to_grant, elements_to_revoke, roles_to_grant, roles_to_revoke, admin_option);
     }
 
+    template <typename T>
+    void grantCurrentGrantsTemplate(
+        T & grantee,
+        const AccessRights & rights_to_grant,
+        const AccessRightsElements & elements_to_revoke)
+    {
+        if (!elements_to_revoke.empty())
+            grantee.access.revoke(elements_to_revoke);
+
+        grantee.access.makeUnion(rights_to_grant);
+    }
+
+    /// Grants current user's grants with grant options to specified user.
+    void grantCurrentGrants(
+        IAccessEntity & grantee,
+        const AccessRights & new_rights,
+        const AccessRightsElements & elements_to_revoke)
+    {
+        if (auto * user = typeid_cast<User *>(&grantee))
+            grantCurrentGrantsTemplate(*user, new_rights, elements_to_revoke);
+        else if (auto * role = typeid_cast<Role *>(&grantee))
+            grantCurrentGrantsTemplate(*role, new_rights, elements_to_revoke);
+    }
+
+    /// Calculates all available rights to grant with current user intersection.
+    void calculateCurrentGrantRightsWithIntersection(
+        AccessRights & rights,
+        std::shared_ptr<const ContextAccess> current_user_access,
+        const AccessRightsElements & elements_to_grant)
+    {
+        AccessRightsElements current_user_grantable_elements;
+        auto available_grant_elements = current_user_access->getAccessRights()->getElements();
+        AccessRights current_user_rights;
+        for (auto & element : available_grant_elements)
+        {
+            if (!element.grant_option && !element.is_partial_revoke)
+                continue;
+
+            if (element.is_partial_revoke)
+                current_user_rights.revoke(element);
+            else
+                current_user_rights.grant(element);
+        }
+
+        rights.grant(elements_to_grant);
+        rights.makeIntersection(current_user_rights);
+    }
+
     /// Updates grants of a specified user or role.
     void updateFromQuery(IAccessEntity & grantee, const ASTGrantQuery & query)
     {
@@ -373,6 +422,9 @@ BlockIO InterpreterGrantQuery::execute()
     /// Executing on cluster.
     if (!query.cluster.empty())
     {
+        if (query.current_grants)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "GRANT CURRENT GRANTS can't be executed on cluster.");
+
         auto required_access = getRequiredAccessForExecutingOnCluster(elements_to_grant, elements_to_revoke);
         checkAdminOptionForExecutingOnCluster(*current_user_access, roles_to_grant, roles_to_revoke);
         current_user_access->checkGranteesAreAllowed(grantees);
@@ -386,7 +438,8 @@ BlockIO InterpreterGrantQuery::execute()
     elements_to_grant.replaceEmptyDatabase(current_database);
     elements_to_revoke.replaceEmptyDatabase(current_database);
     bool need_check_grantees_are_allowed = true;
-    checkGrantOption(access_control, *current_user_access, grantees, need_check_grantees_are_allowed, elements_to_grant, elements_to_revoke);
+    if (!query.current_grants)
+        checkGrantOption(access_control, *current_user_access, grantees, need_check_grantees_are_allowed, elements_to_grant, elements_to_revoke);
 
     /// Check if the current user has corresponding roles granted with admin option.
     checkAdminOption(access_control, *current_user_access, grantees, need_check_grantees_are_allowed, roles_to_grant, roles_to_revoke, query.admin_option);
@@ -394,11 +447,18 @@ BlockIO InterpreterGrantQuery::execute()
     if (need_check_grantees_are_allowed)
         current_user_access->checkGranteesAreAllowed(grantees);
 
+    AccessRights new_rights;
+    if (query.current_grants)
+        calculateCurrentGrantRightsWithIntersection(new_rights, current_user_access, elements_to_grant);
+
     /// Update roles and users listed in `grantees`.
     auto update_func = [&](const AccessEntityPtr & entity) -> AccessEntityPtr
     {
         auto clone = entity->clone();
-        updateGrantedAccessRightsAndRoles(*clone, elements_to_grant, elements_to_revoke, roles_to_grant, roles_to_revoke, query.admin_option);
+        if (query.current_grants)
+            grantCurrentGrants(*clone, new_rights, elements_to_revoke);
+        else
+            updateGrantedAccessRightsAndRoles(*clone, elements_to_grant, elements_to_revoke, roles_to_grant, roles_to_revoke, query.admin_option);
         return clone;
     };
 
diff --git a/src/Interpreters/Access/InterpreterShowAccessQuery.cpp b/src/Interpreters/Access/InterpreterShowAccessQuery.cpp
index b5478f434b4..e9862e99393 100644
--- a/src/Interpreters/Access/InterpreterShowAccessQuery.cpp
+++ b/src/Interpreters/Access/InterpreterShowAccessQuery.cpp
@@ -4,6 +4,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/Access/InterpreterShowCreateAccessEntityQuery.h>
 #include <Interpreters/Access/InterpreterShowGrantsQuery.h>
+#include <Interpreters/formatWithPossiblyHidingSecrets.h>
 #include <Columns/ColumnString.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <DataTypes/DataTypeString.h>
@@ -33,7 +34,7 @@ QueryPipeline InterpreterShowAccessQuery::executeImpl() const
     /// Build the result column.
     MutableColumnPtr column = ColumnString::create();
     for (const auto & query : queries)
-        column->insert(query->formatWithSecretsHidden());
+        column->insert(format({getContext(), *query}));
 
     String desc = "ACCESS";
     return QueryPipeline(std::make_shared<SourceFromSingleChunk>(Block{{std::move(column), std::make_shared<DataTypeString>(), desc}}));
diff --git a/src/Interpreters/Access/InterpreterShowCreateAccessEntityQuery.cpp b/src/Interpreters/Access/InterpreterShowCreateAccessEntityQuery.cpp
index 7b9a8f98c8f..7292892d3c1 100644
--- a/src/Interpreters/Access/InterpreterShowCreateAccessEntityQuery.cpp
+++ b/src/Interpreters/Access/InterpreterShowCreateAccessEntityQuery.cpp
@@ -1,4 +1,5 @@
 #include <Interpreters/Access/InterpreterShowCreateAccessEntityQuery.h>
+#include <Interpreters/formatWithPossiblyHidingSecrets.h>
 #include <Parsers/Access/ASTShowCreateAccessEntityQuery.h>
 #include <Parsers/Access/ASTCreateUserQuery.h>
 #include <Parsers/Access/ASTCreateRoleQuery.h>
@@ -62,7 +63,7 @@ namespace
         }
 
         if (user.auth_data.getType() != AuthenticationType::NO_PASSWORD)
-            query->auth_data = user.auth_data;
+            query->auth_data = user.auth_data.toAST();
 
         if (!user.settings.empty())
         {
@@ -254,7 +255,7 @@ QueryPipeline InterpreterShowCreateAccessEntityQuery::executeImpl()
     /// Build the result column.
     MutableColumnPtr column = ColumnString::create();
     for (const auto & create_query : create_queries)
-        column->insert(create_query->formatWithSecretsHidden());
+        column->insert(format({getContext(), *create_query}));
 
     /// Prepare description of the result column.
     const auto & show_query = query_ptr->as<const ASTShowCreateAccessEntityQuery &>();
diff --git a/src/Interpreters/Access/InterpreterShowGrantsQuery.cpp b/src/Interpreters/Access/InterpreterShowGrantsQuery.cpp
index 2ff6d44e041..56fbb34a577 100644
--- a/src/Interpreters/Access/InterpreterShowGrantsQuery.cpp
+++ b/src/Interpreters/Access/InterpreterShowGrantsQuery.cpp
@@ -48,7 +48,7 @@ namespace
             if (current_query)
             {
                 const auto & prev_element = current_query->access_rights_elements.back();
-                bool continue_with_current_query = element.sameDatabaseAndTable(prev_element) && element.sameOptions(prev_element);
+                bool continue_with_current_query = element.sameDatabaseAndTableAndParameter(prev_element) && element.sameOptions(prev_element);
                 if (!continue_with_current_query)
                     current_query = nullptr;
             }
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index bfb010b6105..cbf6cc1cbe3 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -1,5 +1,6 @@
 #include <Interpreters/ActionsDAG.h>
 
+#include <Analyzer/FunctionNode.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/IFunction.h>
@@ -8,6 +9,7 @@
 #include <Functions/materialize.h>
 #include <Functions/FunctionsLogical.h>
 #include <Functions/CastOverloadResolver.h>
+#include <Functions/indexHint.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ArrayJoinAction.h>
 #include <IO/WriteBufferFromString.h>
@@ -187,9 +189,9 @@ const ActionsDAG::Node & ActionsDAG::addArrayJoin(const Node & child, std::strin
 }
 
 const ActionsDAG::Node & ActionsDAG::addFunction(
-        const FunctionOverloadResolverPtr & function,
-        NodeRawConstPtrs children,
-        std::string result_name)
+    const FunctionOverloadResolverPtr & function,
+    NodeRawConstPtrs children,
+    std::string result_name)
 {
     auto [arguments, all_const] = getFunctionArguments(children);
 
@@ -199,6 +201,23 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
         std::move(children),
         std::move(arguments),
         std::move(result_name),
+        function_base->getResultType(),
+        all_const);
+}
+
+const ActionsDAG::Node & ActionsDAG::addFunction(
+    const FunctionNode & function,
+    NodeRawConstPtrs children,
+    std::string result_name)
+{
+    auto [arguments, all_const] = getFunctionArguments(children);
+
+    return addFunctionImpl(
+        function.getFunction(),
+        std::move(children),
+        std::move(arguments),
+        std::move(result_name),
+        function.getResultType(),
         all_const);
 }
 
@@ -214,6 +233,7 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
         std::move(children),
         std::move(arguments),
         std::move(result_name),
+        function_base->getResultType(),
         all_const);
 }
 
@@ -238,6 +258,7 @@ const ActionsDAG::Node & ActionsDAG::addFunctionImpl(
     NodeRawConstPtrs children,
     ColumnsWithTypeAndName arguments,
     std::string result_name,
+    DataTypePtr result_type,
     bool all_const)
 {
     size_t num_arguments = children.size();
@@ -247,7 +268,7 @@ const ActionsDAG::Node & ActionsDAG::addFunctionImpl(
     node.children = std::move(children);
 
     node.function_base = function_base;
-    node.result_type = node.function_base->getResultType();
+    node.result_type = result_type;
     node.function = node.function_base->prepare(arguments);
     node.is_deterministic = node.function_base->isDeterministic();
 
@@ -740,6 +761,102 @@ NameSet ActionsDAG::foldActionsByProjection(
     return next_required_columns;
 }
 
+
+ActionsDAGPtr ActionsDAG::foldActionsByProjection(const std::unordered_map<const Node *, const Node *> & new_inputs, const NodeRawConstPtrs & required_outputs)
+{
+    auto dag = std::make_unique<ActionsDAG>();
+    std::unordered_map<const Node *, const Node *> inputs_mapping;
+    std::unordered_map<const Node *, const Node *> mapping;
+    struct Frame
+    {
+        const Node * node;
+        size_t next_child = 0;
+    };
+
+    std::vector<Frame> stack;
+    for (const auto * output : required_outputs)
+    {
+        if (mapping.contains(output))
+            continue;
+
+        stack.push_back({.node = output});
+        while (!stack.empty())
+        {
+            auto & frame = stack.back();
+
+            if (frame.next_child == 0)
+            {
+                auto it = new_inputs.find(frame.node);
+                if (it != new_inputs.end())
+                {
+                    const auto & [new_input, rename] = *it;
+
+                    auto & node = mapping[frame.node];
+
+                    if (!node)
+                    {
+                        /// It is possible to have a few aliases on the same column.
+                        /// We may want to replace all the aliases,
+                        /// in this case they should have a single input as a child.
+                        auto & mapped_input = inputs_mapping[rename];
+
+                        if (!mapped_input)
+                        {
+                            bool should_rename = new_input->result_name != rename->result_name;
+                            const auto & input_name = should_rename ? rename->result_name : new_input->result_name;
+                            mapped_input = &dag->addInput(input_name, new_input->result_type);
+                            if (should_rename)
+                                mapped_input = &dag->addAlias(*mapped_input, new_input->result_name);
+                        }
+
+                        node = mapped_input;
+                    }
+
+                    stack.pop_back();
+                    continue;
+                }
+            }
+
+            const auto & children = frame.node->children;
+
+            while (frame.next_child < children.size() && !mapping.emplace(children[frame.next_child], nullptr).second)
+                ++frame.next_child;
+
+            if (frame.next_child < children.size())
+            {
+                const auto * child = children[frame.next_child];
+                ++frame.next_child;
+                stack.push_back({.node = child});
+                continue;
+            }
+
+            if (frame.node->type == ActionType::INPUT)
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "Cannot fold actions for projection. Node {} requires input {} which does not belong to projection",
+                    stack.front().node->result_name, frame.node->result_name);
+
+            auto & node = dag->nodes.emplace_back(*frame.node);
+            for (auto & child : node.children)
+                child = mapping[child];
+
+            mapping[frame.node] = &node;
+            stack.pop_back();
+        }
+    }
+
+    for (const auto * output : required_outputs)
+    {
+        /// Keep the names for outputs.
+        /// Add an alias if the mapped node has a different result name.
+        const auto * mapped_output = mapping[output];
+        if (output->result_name != mapped_output->result_name)
+            mapped_output = &dag->addAlias(*mapped_output, output->result_name);
+        dag->outputs.push_back(mapped_output);
+    }
+
+    return dag;
+}
+
 void ActionsDAG::reorderAggregationKeysForProjection(const std::unordered_map<std::string_view, size_t> & key_names_pos_map)
 {
     ::sort(outputs.begin(), outputs.end(), [&key_names_pos_map](const Node * lhs, const Node * rhs)
@@ -950,7 +1067,7 @@ ActionsDAGPtr ActionsDAG::clone() const
 void ActionsDAG::compileExpressions(size_t min_count_to_compile_expression, const std::unordered_set<const ActionsDAG::Node *> & lazy_executed_nodes)
 {
     compileFunctions(min_count_to_compile_expression, lazy_executed_nodes);
-    removeUnusedActions();
+    removeUnusedActions(/*allow_remove_inputs = */ false);
 }
 #endif
 
@@ -1344,6 +1461,83 @@ void ActionsDAG::mergeInplace(ActionsDAG && second)
     first.projected_output = second.projected_output;
 }
 
+void ActionsDAG::mergeNodes(ActionsDAG && second)
+{
+    std::unordered_map<std::string, const ActionsDAG::Node *> node_name_to_node;
+    for (auto & node : nodes)
+        node_name_to_node.emplace(node.result_name, &node);
+
+    struct Frame
+    {
+        ActionsDAG::Node * node = nullptr;
+        bool visited_children = false;
+    };
+
+    std::unordered_map<const ActionsDAG::Node *, ActionsDAG::Node *> const_node_to_node;
+    for (auto & node : second.nodes)
+        const_node_to_node.emplace(&node, &node);
+
+    std::vector<Frame> nodes_to_process;
+    nodes_to_process.reserve(second.getOutputs().size());
+    for (auto & node : second.getOutputs())
+        nodes_to_process.push_back({const_node_to_node.at(node), false /*visited_children*/});
+
+    std::unordered_set<const ActionsDAG::Node *> nodes_to_move_from_second_dag;
+
+    while (!nodes_to_process.empty())
+    {
+        auto & node_to_process = nodes_to_process.back();
+        auto * node = node_to_process.node;
+
+        auto node_it = node_name_to_node.find(node->result_name);
+        if (node_it != node_name_to_node.end())
+        {
+            nodes_to_process.pop_back();
+            continue;
+        }
+
+        if (!node_to_process.visited_children)
+        {
+            node_to_process.visited_children = true;
+
+            for (auto & child : node->children)
+                nodes_to_process.push_back({const_node_to_node.at(child), false /*visited_children*/});
+
+            /// If node has children process them first
+            if (!node->children.empty())
+                continue;
+        }
+
+        for (auto & child : node->children)
+            child = node_name_to_node.at(child->result_name);
+
+        node_name_to_node.emplace(node->result_name, node);
+        nodes_to_move_from_second_dag.insert(node);
+
+        nodes_to_process.pop_back();
+    }
+
+    if (nodes_to_move_from_second_dag.empty())
+        return;
+
+    auto second_nodes_end = second.nodes.end();
+    for (auto second_node_it = second.nodes.begin(); second_node_it != second_nodes_end;)
+    {
+        if (!nodes_to_move_from_second_dag.contains(&(*second_node_it)))
+        {
+            ++second_node_it;
+            continue;
+        }
+
+        auto node_to_move_it = second_node_it;
+        ++second_node_it;
+        nodes.splice(nodes.end(), second.nodes, node_to_move_it);
+
+        if (node_to_move_it->type == ActionType::INPUT)
+            inputs.push_back(&(*node_to_move_it));
+    }
+}
+
 ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split_nodes) const
 {
     /// Split DAG into two parts.
@@ -1946,8 +2140,12 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
     }
 
     auto conjunction = getConjunctionNodes(predicate, allowed_nodes);
-    if (conjunction.rejected.size() == 1 && WhichDataType{conjunction.rejected.front()->result_type}.isFloat())
+    if (conjunction.rejected.size() == 1 && !conjunction.rejected.front()->result_type->equals(*predicate->result_type)
+        && conjunction.allowed.front()->type == ActionType::COLUMN)
+    {
+        // No further optimization can be done
         return nullptr;
+    }
 
     auto actions = cloneActionsForConjunction(conjunction.allowed, all_inputs);
     if (!actions)
@@ -1997,55 +2195,26 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
     else
     {
         /// Predicate is conjunction, where both allowed and rejected sets are not empty.
-        /// Replace this node to conjunction of rejected predicates.
 
         NodeRawConstPtrs new_children = std::move(conjunction.rejected);
 
-        if (new_children.size() == 1)
+        if (new_children.size() == 1 && new_children.front()->result_type->equals(*predicate->result_type))
         {
-            /// Rejected set has only one predicate.
-            if (new_children.front()->result_type->equals(*predicate->result_type))
-            {
-                /// If it's type is same, just add alias.
-                Node node;
-                node.type = ActionType::ALIAS;
-                node.result_name = predicate->result_name;
-                node.result_type = predicate->result_type;
-                node.children.swap(new_children);
-                *predicate = std::move(node);
-            }
-            else if (!WhichDataType{new_children.front()->result_type}.isFloat())
-            {
-                /// If type is different, cast column.
-                /// This case is possible, cause AND can use any numeric type as argument.
-                /// But casting floats to UInt8 or Bool produces different results.
-                /// so we can't apply this optimization to them.
-                Node node;
-                node.type = ActionType::COLUMN;
-                node.result_name = predicate->result_type->getName();
-                node.column = DataTypeString().createColumnConst(0, node.result_name);
-                node.result_type = std::make_shared<DataTypeString>();
-
-                const auto * right_arg = &nodes.emplace_back(std::move(node));
-                const auto * left_arg = new_children.front();
-
-                predicate->children = {left_arg, right_arg};
-                auto arguments = prepareFunctionArguments(predicate->children);
-
-                FunctionOverloadResolverPtr func_builder_cast = CastInternalOverloadResolver<CastType::nonAccurate>::createImpl();
-
-                predicate->function_base = func_builder_cast->build(arguments);
-                predicate->function = predicate->function_base->prepare(arguments);
-            }
+            /// Rejected set has only one predicate. And the type is the same as the result_type.
+            /// Just add alias.
+            Node node;
+            node.type = ActionType::ALIAS;
+            node.result_name = predicate->result_name;
+            node.result_type = predicate->result_type;
+            node.children.swap(new_children);
+            *predicate = std::move(node);
         }
         else
         {
-            /// Predicate is function AND, which still have more then one argument.
-            /// Or there is only one argument that is a float and we can't just
-            /// remove the AND.
+            /// Predicate is function AND, which still have more then one argument
+            /// or it has one argument of the wrong type.
             /// Just update children and rebuild it.
-            predicate->children.swap(new_children);
-            if (WhichDataType{predicate->children.front()->result_type}.isFloat())
+            if (new_children.size() == 1)
             {
                 Node node;
                 node.type = ActionType::COLUMN;
@@ -2053,8 +2222,9 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
                 node.column = DataTypeUInt8().createColumnConst(0, 1u);
                 node.result_type = std::make_shared<DataTypeUInt8>();
                 const auto * const_col = &nodes.emplace_back(std::move(node));
-                predicate->children.emplace_back(const_col);
+                new_children.emplace_back(const_col);
             }
+            predicate->children.swap(new_children);
             auto arguments = prepareFunctionArguments(predicate->children);
 
             FunctionOverloadResolverPtr func_builder_and = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
@@ -2173,7 +2343,8 @@ bool ActionsDAG::isSortingPreserved(
 ActionsDAGPtr ActionsDAG::buildFilterActionsDAG(
     const NodeRawConstPtrs & filter_nodes,
     const std::unordered_map<std::string, ColumnWithTypeAndName> & node_name_to_input_node_column,
-    const ContextPtr & context)
+    const ContextPtr & context,
+    bool single_output_condition_node)
 {
     if (filter_nodes.empty())
         return nullptr;
@@ -2261,10 +2432,40 @@ ActionsDAGPtr ActionsDAG::buildFilterActionsDAG(
                 NodeRawConstPtrs function_children;
                 function_children.reserve(node->children.size());
 
+                FunctionOverloadResolverPtr function_overload_resolver;
+
+                if (node->function_base->getName() == "indexHint")
+                {
+                    ActionsDAG::NodeRawConstPtrs children;
+                    if (const auto * adaptor = typeid_cast<const FunctionToFunctionBaseAdaptor *>(node->function_base.get()))
+                    {
+                        if (const auto * index_hint = typeid_cast<const FunctionIndexHint *>(adaptor->getFunction().get()))
+                        {
+                            auto index_hint_filter_dag = buildFilterActionsDAG(index_hint->getActions()->getOutputs(),
+                                node_name_to_input_node_column,
+                                context,
+                                false /*single_output_condition_node*/);
+
+                            auto index_hint_function_clone = std::make_shared<FunctionIndexHint>();
+                            index_hint_function_clone->setActions(std::move(index_hint_filter_dag));
+                            function_overload_resolver = std::make_shared<FunctionToOverloadResolverAdaptor>(std::move(index_hint_function_clone));
+                        }
+                    }
+                }
+
                 for (const auto & child : node->children)
                     function_children.push_back(node_to_result_node.find(child)->second);
 
-                result_node = &result_dag->addFunction(node->function_base, std::move(function_children), {});
+                auto [arguments, all_const] = getFunctionArguments(function_children);
+                auto function_base = function_overload_resolver ? function_overload_resolver->build(arguments) : node->function_base;
+
+                result_node = &result_dag->addFunctionImpl(
+                    function_base,
+                    std::move(function_children),
+                    std::move(arguments),
+                    {},
+                    node->result_type,
+                    all_const);
                 break;
             }
         }
@@ -2279,7 +2480,7 @@ ActionsDAGPtr ActionsDAG::buildFilterActionsDAG(
     for (const auto & node : filter_nodes)
         result_dag_outputs.push_back(node_to_result_node.find(node)->second);
 
-    if (result_dag_outputs.size() > 1)
+    if (result_dag_outputs.size() > 1 && single_output_condition_node)
     {
         auto function_builder = FunctionFactory::instance().get("and", context);
         result_dag_outputs = { &result_dag->addFunction(function_builder, result_dag_outputs, {}) };
@@ -2288,4 +2489,62 @@ ActionsDAGPtr ActionsDAG::buildFilterActionsDAG(
     return result_dag;
 }
 
+FindOriginalNodeForOutputName::FindOriginalNodeForOutputName(const ActionsDAGPtr & actions_)
+    :actions(actions_)
+{
+    const auto & actions_outputs = actions->getOutputs();
+    for (const auto * output_node : actions_outputs)
+    {
+        /// find input node which refers to the output node
+        /// consider only aliases on the path
+        const auto * node = output_node;
+        while (node && node->type == ActionsDAG::ActionType::ALIAS)
+        {
+            /// alias has only one child
+            chassert(node->children.size() == 1);
+            node = node->children.front();
+        }
+        if (node && node->type == ActionsDAG::ActionType::INPUT)
+            index.emplace(output_node->result_name, node);
+    }
+}
+
+const ActionsDAG::Node * FindOriginalNodeForOutputName::find(const String & output_name)
+{
+    const auto it = index.find(output_name);
+    if (it == index.end())
+        return nullptr;
+
+    return it->second;
+}
+
+FindAliasForInputName::FindAliasForInputName(const ActionsDAGPtr & actions_)
+    :actions(actions_)
+{
+    const auto & actions_outputs = actions->getOutputs();
+    for (const auto * output_node : actions_outputs)
+    {
+        /// find input node which corresponds to alias
+        const auto * node = output_node;
+        while (node && node->type == ActionsDAG::ActionType::ALIAS)
+        {
+            /// alias has only one child
+            chassert(node->children.size() == 1);
+            node = node->children.front();
+        }
+        if (node && node->type == ActionsDAG::ActionType::INPUT)
+            /// node can have several aliases but we consider only the first one
+            index.emplace(node->result_name, output_node);
+    }
+}
+
+const ActionsDAG::Node * FindAliasForInputName::find(const String & name)
+{
+    const auto it = index.find(name);
+    if (it == index.end())
+        return nullptr;
+
+    return it->second;
+}
+
 }
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 0182db8e027..51edecf2bd6 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -23,6 +23,8 @@ using FunctionBasePtr = std::shared_ptr<const IFunctionBase>;
 class IFunctionOverloadResolver;
 using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 
+class FunctionNode;
+
 class IDataType;
 using DataTypePtr = std::shared_ptr<const IDataType>;
 
@@ -139,6 +141,10 @@ public:
             const FunctionOverloadResolverPtr & function,
             NodeRawConstPtrs children,
             std::string result_name);
+    const Node & addFunction(
+        const FunctionNode & function,
+        NodeRawConstPtrs children,
+        std::string result_name);
     const Node & addFunction(
         const FunctionBasePtr & function_base,
         NodeRawConstPtrs children,
@@ -215,6 +221,30 @@ public:
         const String & predicate_column_name = {},
         bool add_missing_keys = true);
 
+    /// Get an ActionsDAG in a following way:
+    /// * Traverse a tree starting from required_outputs
+    /// * If there is a node from new_inputs keys, replace it to INPUT
+    /// * INPUT name should be taken from new_inputs mapped node name
+    /// * Mapped nodes may be the same nodes, and in this case there would be a single INPUT
+    /// Here want to substitute some expressions to columns from projection.
+    /// This function expects that all required_outputs can be calculated from nodes in new_inputs.
+    /// If not, exception will happen.
+    /// This function also expects that new_inputs and required_outputs are valid nodes from the same DAG.
+    /// Example:
+    /// DAG:                   new_inputs:                   Result DAG
+    /// a      b               c * d -> "(a + b) * d"
+    /// \     /                e     -> ""
+    ///  a + b
+    ///     \                  required_outputs:         =>  "(a + b) * d"    e
+    ///   c (alias)   d        c * d - e                              \      /
+    ///       \      /                                               c * d - e
+    ///        c * d       e
+    ///            \      /
+    ///            c * d - e
+    static ActionsDAGPtr foldActionsByProjection(
+        const std::unordered_map<const Node *, const Node *> & new_inputs,
+        const NodeRawConstPtrs & required_outputs);
+
     /// Reorder the output nodes using given position mapping.
     void reorderAggregationKeysForProjection(const std::unordered_map<std::string_view, size_t> & key_names_pos_map);
 
@@ -284,6 +314,9 @@ public:
     /// So that pointers to nodes are kept valid.
     void mergeInplace(ActionsDAG && second);
 
+    /// Merge current nodes with specified dag nodes
+    void mergeNodes(ActionsDAG && second);
+
     using SplitResult = std::pair<ActionsDAGPtr, ActionsDAGPtr>;
 
     /// Split ActionsDAG into two DAGs, where first part contains all nodes from split_nodes and their children.
@@ -338,15 +371,18 @@ public:
       * Additionally during dag construction if node has name that exists in node_name_to_input_column map argument
       * in final dag this node is represented as INPUT node with specified column.
       *
-      * Result dag has only single output node:
+      * If single_output_condition_node = true, result dag has single output node:
       * 1. If there is single filter node, result dag output will contain this node.
       * 2. If there are multiple filter nodes, result dag output will contain single `and` function node
       * and children of this node will be filter nodes.
+      *
+      * If single_output_condition_node = false, result dag has multiple output nodes.
       */
     static ActionsDAGPtr buildFilterActionsDAG(
         const NodeRawConstPtrs & filter_nodes,
         const std::unordered_map<std::string, ColumnWithTypeAndName> & node_name_to_input_node_column,
-        const ContextPtr & context);
+        const ContextPtr & context,
+        bool single_output_condition_node = true);
 
 private:
     NodeRawConstPtrs getParents(const Node * target) const;
@@ -358,6 +394,7 @@ private:
         NodeRawConstPtrs children,
         ColumnsWithTypeAndName arguments,
         std::string result_name,
+        DataTypePtr result_type,
         bool all_const);
 
 #if USE_EMBEDDED_COMPILER
@@ -367,6 +404,32 @@ private:
     static ActionsDAGPtr cloneActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs);
 };
 
+class FindOriginalNodeForOutputName
+{
+    using NameToNodeIndex = std::unordered_map<std::string_view, const ActionsDAG::Node *>;
+
+public:
+    explicit FindOriginalNodeForOutputName(const ActionsDAGPtr & actions);
+    const ActionsDAG::Node * find(const String & output_name);
+
+private:
+    ActionsDAGPtr actions;
+    NameToNodeIndex index;
+};
+
+class FindAliasForInputName
+{
+    using NameToNodeIndex = std::unordered_map<std::string_view, const ActionsDAG::Node *>;
+
+public:
+    explicit FindAliasForInputName(const ActionsDAGPtr & actions);
+    const ActionsDAG::Node * find(const String & name);
+
+private:
+    ActionsDAGPtr actions;
+    NameToNodeIndex index;
+};
+
 /// This is an ugly way to bypass impossibility to forward declare ActionDAG::Node.
 struct ActionDAGNodes
 {
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 43db25e775f..28ba2e3e838 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -75,6 +75,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
     extern const int TOO_MANY_ARGUMENTS_FOR_FUNCTION;
+    extern const int FUNCTION_CANNOT_HAVE_PARAMETERS;
 }
 
 static NamesAndTypesList::iterator findColumn(const String & name, NamesAndTypesList & cols)
@@ -467,10 +468,6 @@ SetPtr makeExplicitSet(
     return set;
 }
 
-ScopeStack::Level::~Level() = default;
-ScopeStack::Level::Level() = default;
-ScopeStack::Level::Level(Level &&) noexcept = default;
-
 class ScopeStack::Index
 {
     /// Map column name -> Node.
@@ -524,6 +521,10 @@ public:
     }
 };
 
+ScopeStack::Level::~Level() = default;
+ScopeStack::Level::Level() = default;
+ScopeStack::Level::Level(Level &&) noexcept = default;
+
 ActionsMatcher::Data::Data(
     ContextPtr context_,
     SizeLimits set_size_limit_,
@@ -534,7 +535,6 @@ ActionsMatcher::Data::Data(
     bool no_subqueries_,
     bool no_makeset_,
     bool only_consts_,
-    bool create_source_for_in_,
     AggregationKeysInfo aggregation_keys_info_,
     bool build_expression_with_window_functions_,
     bool is_create_parameterized_view_)
@@ -546,7 +546,6 @@ ActionsMatcher::Data::Data(
     , no_subqueries(no_subqueries_)
     , no_makeset(no_makeset_)
     , only_consts(only_consts_)
-    , create_source_for_in(create_source_for_in_)
     , visit_depth(0)
     , actions_stack(std::move(actions_dag), context_)
     , aggregation_keys_info(aggregation_keys_info_)
@@ -951,14 +950,16 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
         return;
     }
 
-    SetPtr prepared_set;
+    FutureSet prepared_set;
     if (checkFunctionIsInOrGlobalInOperator(node))
     {
         /// Let's find the type of the first argument (then getActionsImpl will be called again and will not affect anything).
         visit(node.arguments->children.at(0), data);
 
-        if (!data.no_makeset && !(data.is_create_parameterized_view && !analyzeReceiveQueryParams(ast).empty())
-            && (prepared_set = makeSet(node, data, data.no_subqueries)))
+        if (!data.no_makeset && !(data.is_create_parameterized_view && !analyzeReceiveQueryParams(ast).empty()))
+            prepared_set = makeSet(node, data, data.no_subqueries);
+
+        if (prepared_set.isValid())
         {
             /// Transform tuple or subquery into a set.
         }
@@ -997,7 +998,6 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
             data.no_subqueries,
             data.no_makeset,
             data.only_consts,
-            /*create_source_for_in*/ false,
             data.aggregation_keys_info);
 
         NamesWithAliases args;
@@ -1109,6 +1109,12 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
         }
     }
 
+    /// Normal functions are not parametric for now.
+    if (node.parameters)
+    {
+        throw Exception(ErrorCodes::FUNCTION_CANNOT_HAVE_PARAMETERS, "Function {} is not parametric", node.name);
+    }
+
     Names argument_names;
     DataTypes argument_types;
     bool arguments_present = true;
@@ -1165,14 +1171,15 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                 num_arguments += columns.size() - 1;
                 arg += columns.size() - 1;
             }
-            else if (checkFunctionIsInOrGlobalInOperator(node) && arg == 1 && prepared_set)
+            else if (checkFunctionIsInOrGlobalInOperator(node) && arg == 1 && prepared_set.isValid())
             {
                 ColumnWithTypeAndName column;
                 column.type = std::make_shared<DataTypeSet>();
 
                 /// If the argument is a set given by an enumeration of values (so, the set was already built), give it a unique name,
                 ///  so that sets with the same literal representation do not fuse together (they can have different types).
-                if (!prepared_set->empty())
+                const bool is_constant_set = prepared_set.isCreated();
+                if (is_constant_set)
                     column.name = data.getUniqueName("__set");
                 else
                     column.name = child->getColumnName();
@@ -1182,7 +1189,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                     auto column_set = ColumnSet::create(1, prepared_set);
                     /// If prepared_set is not empty, we have a set made with literals.
                     /// Create a const ColumnSet to make constant folding work
-                    if (!prepared_set->empty())
+                    if (is_constant_set)
                         column.column = ColumnConst::create(std::move(column_set), 1);
                     else
                         column.column = std::move(column_set);
@@ -1209,11 +1216,22 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
             else if (data.is_create_parameterized_view && query_parameter)
             {
                 const auto data_type = DataTypeFactory::instance().get(query_parameter->type);
-                ColumnWithTypeAndName column(data_type,query_parameter->getColumnName());
+                /// Use getUniqueName() to allow multiple use of query parameter in the query:
+                ///
+                ///     CREATE VIEW view AS
+                ///     SELECT *
+                ///     FROM system.one
+                ///     WHERE dummy = {k1:Int}+1 OR dummy = {k1:Int}+2
+                ///                    ^^                    ^^
+                ///
+                /// NOTE: query in the VIEW will not be modified this is needed
+                /// only during analysis for CREATE VIEW to avoid duplicated
+                /// column names.
+                ColumnWithTypeAndName column(data_type, data.getUniqueName("__" + query_parameter->getColumnName()));
                 data.addColumn(column);
 
                 argument_types.push_back(data_type);
-                argument_names.push_back(query_parameter->name);
+                argument_names.push_back(column.name);
             }
             else
             {
@@ -1363,10 +1381,10 @@ void ActionsMatcher::visit(const ASTLiteral & literal, const ASTPtr & /* ast */,
     data.addColumn(std::move(column));
 }
 
-SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_subqueries)
+FutureSet ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_subqueries)
 {
     if (!data.prepared_sets)
-        return nullptr;
+        return {};
 
     /** You need to convert the right argument to a set.
       * This can be a table name, a value, a value enumeration, or a subquery.
@@ -1383,8 +1401,12 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
         if (no_subqueries)
             return {};
         auto set_key = PreparedSetKey::forSubquery(*right_in_operand);
-        if (SetPtr set = data.prepared_sets->get(set_key))
-            return set;
+
+        {
+            auto set = data.prepared_sets->getFuture(set_key);
+            if (set.isValid())
+                return set;
+        }
 
         /// A special case is if the name of the table is specified on the right side of the IN statement,
         ///  and the table has the type Set (a previously prepared set).
@@ -1400,7 +1422,7 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
                 {
                     SetPtr set = storage_set->getSet();
                     data.prepared_sets->set(set_key, set);
-                    return set;
+                    return FutureSet(set);
                 }
             }
         }
@@ -1418,7 +1440,7 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
           * In case that we have HAVING with IN subquery, we have to force creating set for it.
           * Also it doesn't make sense if it is GLOBAL IN or ordinary IN.
           */
-        if (data.create_source_for_in && !subquery_for_set.hasSource())
+        if (!subquery_for_set.hasSource())
         {
             auto interpreter = interpretSubquery(right_in_operand, data.getContext(), data.subquery_depth, {});
             subquery_for_set.createSource(*interpreter);
@@ -1432,7 +1454,8 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
         const auto & index = data.actions_stack.getLastActionsIndex();
         if (data.prepared_sets && index.contains(left_in_operand->getColumnName()))
             /// An explicit enumeration of values in parentheses.
-            return makeExplicitSet(&node, last_actions, false, data.getContext(), data.set_size_limit, *data.prepared_sets);
+            return FutureSet(
+                makeExplicitSet(&node, last_actions, false, data.getContext(), data.set_size_limit, *data.prepared_sets));
         else
             return {};
     }
diff --git a/src/Interpreters/ActionsVisitor.h b/src/Interpreters/ActionsVisitor.h
index 0269371b46e..3cf43746630 100644
--- a/src/Interpreters/ActionsVisitor.h
+++ b/src/Interpreters/ActionsVisitor.h
@@ -129,7 +129,6 @@ public:
         bool no_subqueries;
         bool no_makeset;
         bool only_consts;
-        bool create_source_for_in;
         size_t visit_depth;
         ScopeStack actions_stack;
         AggregationKeysInfo aggregation_keys_info;
@@ -153,7 +152,6 @@ public:
             bool no_subqueries_,
             bool no_makeset_,
             bool only_consts_,
-            bool create_source_for_in_,
             AggregationKeysInfo aggregation_keys_info_,
             bool build_expression_with_window_functions_ = false,
             bool is_create_parameterized_view_ = false);
@@ -219,7 +217,7 @@ private:
     static void visit(const ASTLiteral & literal, const ASTPtr & ast, Data & data);
     static void visit(ASTExpressionList & expression_list, const ASTPtr & ast, Data & data);
 
-    static SetPtr makeSet(const ASTFunction & node, Data & data, bool no_subqueries);
+    static FutureSet makeSet(const ASTFunction & node, Data & data, bool no_subqueries);
     static ASTs doUntuple(const ASTFunction * function, ActionsMatcher::Data & data);
     static std::optional<NameAndTypePair> getNameAndTypeFromAST(const ASTPtr & ast, Data & data);
 };
diff --git a/src/Interpreters/AddIndexConstraintsOptimizer.cpp b/src/Interpreters/AddIndexConstraintsOptimizer.cpp
index b28e31d22f6..b9d56ec2ff8 100644
--- a/src/Interpreters/AddIndexConstraintsOptimizer.cpp
+++ b/src/Interpreters/AddIndexConstraintsOptimizer.cpp
@@ -41,35 +41,35 @@ namespace
         return true;
     }
 
-    const std::unordered_map<std::string, ComparisonGraph::CompareResult> & getRelationMap()
+    const std::unordered_map<std::string, ComparisonGraphCompareResult> & getRelationMap()
     {
-        const static std::unordered_map<std::string, ComparisonGraph::CompareResult> relations =
+        const static std::unordered_map<std::string, ComparisonGraphCompareResult> relations =
         {
-            {"equals", ComparisonGraph::CompareResult::EQUAL},
-            {"less", ComparisonGraph::CompareResult::LESS},
-            {"lessOrEquals", ComparisonGraph::CompareResult::LESS_OR_EQUAL},
-            {"greaterOrEquals", ComparisonGraph::CompareResult::GREATER_OR_EQUAL},
-            {"greater", ComparisonGraph::CompareResult::GREATER},
+            {"equals", ComparisonGraphCompareResult::EQUAL},
+            {"less", ComparisonGraphCompareResult::LESS},
+            {"lessOrEquals", ComparisonGraphCompareResult::LESS_OR_EQUAL},
+            {"greaterOrEquals", ComparisonGraphCompareResult::GREATER_OR_EQUAL},
+            {"greater", ComparisonGraphCompareResult::GREATER},
         };
         return relations;
     }
 
-    const std::unordered_map<ComparisonGraph::CompareResult, std::string> & getReverseRelationMap()
+    const std::unordered_map<ComparisonGraphCompareResult, std::string> & getReverseRelationMap()
     {
-        const static std::unordered_map<ComparisonGraph::CompareResult, std::string> relations =
+        const static std::unordered_map<ComparisonGraphCompareResult, std::string> relations =
         {
-            {ComparisonGraph::CompareResult::EQUAL, "equals"},
-            {ComparisonGraph::CompareResult::LESS, "less"},
-            {ComparisonGraph::CompareResult::LESS_OR_EQUAL, "lessOrEquals"},
-            {ComparisonGraph::CompareResult::GREATER_OR_EQUAL, "greaterOrEquals"},
-            {ComparisonGraph::CompareResult::GREATER, "greater"},
+            {ComparisonGraphCompareResult::EQUAL, "equals"},
+            {ComparisonGraphCompareResult::LESS, "less"},
+            {ComparisonGraphCompareResult::LESS_OR_EQUAL, "lessOrEquals"},
+            {ComparisonGraphCompareResult::GREATER_OR_EQUAL, "greaterOrEquals"},
+            {ComparisonGraphCompareResult::GREATER, "greater"},
         };
         return relations;
     }
 
-    bool canBeSequence(const ComparisonGraph::CompareResult left, const ComparisonGraph::CompareResult right)
+    bool canBeSequence(const ComparisonGraphCompareResult left, const ComparisonGraphCompareResult right)
     {
-        using CR = ComparisonGraph::CompareResult;
+        using CR = ComparisonGraphCompareResult;
         if (left == CR::UNKNOWN || right == CR::UNKNOWN || left == CR::NOT_EQUAL || right == CR::NOT_EQUAL)
             return false;
         if ((left == CR::GREATER || left == CR::GREATER_OR_EQUAL) && (right == CR::LESS || right == CR::LESS_OR_EQUAL))
@@ -79,9 +79,9 @@ namespace
         return true;
     }
 
-    ComparisonGraph::CompareResult mostStrict(const ComparisonGraph::CompareResult left, const ComparisonGraph::CompareResult right)
+    ComparisonGraphCompareResult mostStrict(const ComparisonGraphCompareResult left, const ComparisonGraphCompareResult right)
     {
-        using CR = ComparisonGraph::CompareResult;
+        using CR = ComparisonGraphCompareResult;
         if (left == CR::LESS || left == CR::GREATER)
             return left;
         if (right == CR::LESS || right == CR::GREATER)
@@ -104,7 +104,7 @@ namespace
     /// we can add to expression 'indexHint(I < A)' condition.
     CNFQuery::OrGroup createIndexHintGroup(
         const CNFQuery::OrGroup & group,
-        const ComparisonGraph & graph,
+        const ComparisonGraph<ASTPtr> & graph,
         const ASTs & primary_key_only_asts)
     {
         CNFQuery::OrGroup result;
@@ -113,14 +113,14 @@ namespace
             const auto * func = atom.ast->as<ASTFunction>();
             if (func && func->arguments->children.size() == 2 && getRelationMap().contains(func->name))
             {
-                auto check_and_insert = [&](const size_t index, const ComparisonGraph::CompareResult need_result)
+                auto check_and_insert = [&](const size_t index, const ComparisonGraphCompareResult need_result)
                 {
                     if (!onlyConstants(func->arguments->children[1 - index]))
                         return false;
 
                     for (const auto & primary_key_ast : primary_key_only_asts)
                     {
-                        ComparisonGraph::CompareResult actual_result;
+                        ComparisonGraphCompareResult actual_result;
                         if (index == 0)
                             actual_result = graph.compare(primary_key_ast, func->arguments->children[index]);
                         else
diff --git a/src/Interpreters/AggregationCommon.h b/src/Interpreters/AggregationCommon.h
index 32b01ee0416..7ba9011f18b 100644
--- a/src/Interpreters/AggregationCommon.h
+++ b/src/Interpreters/AggregationCommon.h
@@ -3,8 +3,6 @@
 #include <array>
 
 #include <Common/SipHash.h>
-#include <Common/Arena.h>
-#include <Common/HashTable/Hash.h>
 #include <Common/memcpySmall.h>
 #include <Common/assert_cast.h>
 #include <Core/Defines.h>
@@ -25,6 +23,8 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+class Arena;
+
 using Sizes = std::vector<size_t>;
 
 /// When packing the values of nullable columns at a given row, we have to
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index 55e49eb8d19..c7d4b87694b 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -8,9 +8,6 @@
 #endif
 
 #include <base/sort.h>
-#include <Common/Stopwatch.h>
-#include <Common/setThreadName.h>
-#include <Common/formatReadable.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
@@ -21,13 +18,6 @@
 #include <IO/WriteBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Interpreters/Aggregator.h>
-#include <Common/CacheBase.h>
-#include <Common/MemoryTracker.h>
-#include <Common/CurrentThread.h>
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
-#include <Common/JSONBuilder.h>
-#include <Common/filesystemHelpers.h>
 #include <AggregateFunctions/AggregateFunctionArray.h>
 #include <AggregateFunctions/AggregateFunctionState.h>
 #include <IO/Operators.h>
@@ -36,6 +26,18 @@
 #include <Core/ProtocolDefines.h>
 #include <Disks/TemporaryFileOnDisk.h>
 #include <Interpreters/TemporaryDataOnDisk.h>
+#include <Common/Stopwatch.h>
+#include <Common/setThreadName.h>
+#include <Common/formatReadable.h>
+#include <Common/logger_useful.h>
+#include <Common/CacheBase.h>
+#include <Common/MemoryTracker.h>
+#include <Common/CurrentThread.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/typeid_cast.h>
+#include <Common/assert_cast.h>
+#include <Common/JSONBuilder.h>
+#include <Common/filesystemHelpers.h>
 #include <Common/scope_guard_safe.h>
 
 #include <Parsers/ASTSelectQuery.h>
@@ -59,6 +61,8 @@ namespace ProfileEvents
 namespace CurrentMetrics
 {
     extern const Metric TemporaryFilesForAggregation;
+    extern const Metric AggregatorThreads;
+    extern const Metric AggregatorThreadsActive;
 }
 
 namespace DB
@@ -775,6 +779,31 @@ AggregatedDataVariants::Type Aggregator::chooseAggregationMethod()
 
     if (has_nullable_key)
     {
+        /// Optimization for one key
+        if (params.keys_size == 1 && !has_low_cardinality)
+        {
+            if (types_removed_nullable[0]->isValueRepresentedByNumber())
+            {
+                size_t size_of_field = types_removed_nullable[0]->getSizeOfValueInMemory();
+                if (size_of_field == 1)
+                    return AggregatedDataVariants::Type::nullable_key8;
+                if (size_of_field == 2)
+                    return AggregatedDataVariants::Type::nullable_key16;
+                if (size_of_field == 4)
+                    return AggregatedDataVariants::Type::nullable_key32;
+                if (size_of_field == 8)
+                    return AggregatedDataVariants::Type::nullable_key64;
+            }
+            if (isFixedString(types_removed_nullable[0]))
+            {
+                return AggregatedDataVariants::Type::nullable_key_fixed_string;
+            }
+            if (isString(types_removed_nullable[0]))
+            {
+                return AggregatedDataVariants::Type::nullable_key_string;
+            }
+        }
+
         if (params.keys_size == num_fixed_contiguous_keys && !has_low_cardinality)
         {
             /// Pack if possible all the keys along with information about which key values are nulls
@@ -975,6 +1004,13 @@ void Aggregator::mergeOnBlockSmall(
         result.key_sizes = key_sizes;
     }
 
+    if ((params.overflow_row || result.type == AggregatedDataVariants::Type::without_key) && !result.without_key)
+    {
+        AggregateDataPtr place = result.aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
+        createAggregateStates(place);
+        result.without_key = place;
+    }
+
     if (false) {} // NOLINT
 #define M(NAME, IS_TWO_LEVEL) \
     else if (result.type == AggregatedDataVariants::Type::NAME) \
@@ -1416,6 +1452,11 @@ void Aggregator::prepareAggregateInstructions(
             materialized_columns.push_back(columns.at(pos)->convertToFullColumnIfConst());
             aggregate_columns[i][j] = materialized_columns.back().get();
 
+            /// Sparse columns without defaults may be handled incorrectly.
+            if (aggregate_columns[i][j]->isSparse()
+                && aggregate_columns[i][j]->getNumberOfDefaultRows() == 0)
+                allow_sparse_arguments = false;
+
             auto full_column = allow_sparse_arguments
                 ? aggregate_columns[i][j]->getPtr()
                 : recursiveRemoveSparse(aggregate_columns[i][j]->getPtr());
@@ -1889,7 +1930,7 @@ inline void Aggregator::insertAggregatesIntoColumns(Mapped & mapped, MutableColu
 
 
 template <bool use_compiled_functions>
-Block Aggregator::insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & places, OutputBlockColumns && out_cols, Arena * arena) const
+Block Aggregator::insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & places, OutputBlockColumns && out_cols, Arena * arena, bool has_null_key_data [[maybe_unused]]) const
 {
     std::exception_ptr exception;
     size_t aggregate_functions_destroy_index = 0;
@@ -1912,8 +1953,12 @@ Block Aggregator::insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & pl
                     continue;
 
                 auto & final_aggregate_column = out_cols.final_aggregate_columns[i];
-                final_aggregate_column = final_aggregate_column->cloneResized(places.size());
-                columns_data.emplace_back(getColumnData(final_aggregate_column.get()));
+                /**
+                 * In convertToBlockImplFinal, additional data with a key of null may be written,
+                 * and additional memory for null data needs to be allocated when using the compiled function
+                 */
+                final_aggregate_column = final_aggregate_column->cloneResized(places.size() + (has_null_key_data ? 1 : 0));
+                columns_data.emplace_back(getColumnData(final_aggregate_column.get(), (has_null_key_data ? 1 : 0)));
             }
 
             auto insert_aggregates_into_columns_function = compiled_functions.insert_aggregates_into_columns_function;
@@ -1982,15 +2027,21 @@ Aggregator::convertToBlockImplFinal(Method & method, Table & data, Arena * arena
     std::optional<OutputBlockColumns> out_cols;
     std::optional<Sizes> shuffled_key_sizes;
     PaddedPODArray<AggregateDataPtr> places;
+    bool has_null_key_data = false;
 
     auto init_out_cols = [&]()
     {
         out_cols = prepareOutputBlockColumns(params, aggregate_functions, getHeader(final), aggregates_pools, final, max_block_size);
 
-        if constexpr (Method::low_cardinality_optimization)
+        if constexpr (Method::low_cardinality_optimization || Method::one_key_nullable_optimization)
         {
+            /**
+             * When one_key_nullable_optimization is enabled, null data will be written to the key column and result column in advance.
+             * And in insertResultsIntoColumns need to allocate memory for null data.
+             */
             if (data.hasNullKeyData())
             {
+                has_null_key_data = true;
                 out_cols->key_columns[0]->insertDefault();
                 insertAggregatesIntoColumns(data.getNullKeyData(), out_cols->final_aggregate_columns, arena);
                 data.hasNullKeyData() = false;
@@ -2022,21 +2073,22 @@ Aggregator::convertToBlockImplFinal(Method & method, Table & data, Arena * arena
             {
                 if (places.size() >= max_block_size)
                 {
-                    res.emplace_back(insertResultsIntoColumns<use_compiled_functions>(places, std::move(out_cols.value()), arena));
+                    res.emplace_back(insertResultsIntoColumns<use_compiled_functions>(places, std::move(out_cols.value()), arena, has_null_key_data));
                     places.clear();
                     out_cols.reset();
+                    has_null_key_data = false;
                 }
             }
         });
 
     if constexpr (return_single_block)
     {
-        return insertResultsIntoColumns<use_compiled_functions>(places, std::move(out_cols.value()), arena);
+        return insertResultsIntoColumns<use_compiled_functions>(places, std::move(out_cols.value()), arena, has_null_key_data);
     }
     else
     {
         if (out_cols.has_value())
-            res.emplace_back(insertResultsIntoColumns<use_compiled_functions>(places, std::move(out_cols.value()), arena));
+            res.emplace_back(insertResultsIntoColumns<use_compiled_functions>(places, std::move(out_cols.value()), arena, has_null_key_data));
         return res;
     }
 }
@@ -2051,12 +2103,13 @@ Aggregator::convertToBlockImplNotFinal(Method & method, Table & data, Arenas & a
 
     std::optional<OutputBlockColumns> out_cols;
     std::optional<Sizes> shuffled_key_sizes;
+    size_t rows_in_current_block = 0;
 
     auto init_out_cols = [&]()
     {
         out_cols = prepareOutputBlockColumns(params, aggregate_functions, getHeader(final), aggregates_pools, final, max_block_size);
 
-        if constexpr (Method::low_cardinality_optimization)
+        if constexpr (Method::low_cardinality_optimization || Method::one_key_nullable_optimization)
         {
             if (data.hasNullKeyData())
             {
@@ -2065,6 +2118,7 @@ Aggregator::convertToBlockImplNotFinal(Method & method, Table & data, Arenas & a
                 for (size_t i = 0; i < params.aggregates_size; ++i)
                     out_cols->aggregate_columns_data[i]->push_back(data.getNullKeyData() + offsets_of_aggregate_states[i]);
 
+                ++rows_in_current_block;
                 data.getNullKeyData() = nullptr;
                 data.hasNullKeyData() = false;
             }
@@ -2076,8 +2130,6 @@ Aggregator::convertToBlockImplNotFinal(Method & method, Table & data, Arenas & a
     // should be invoked at least once, because null data might be the only content of the `data`
     init_out_cols();
 
-    size_t rows_in_current_block = 0;
-
     data.forEachValue(
         [&](const auto & key, auto & mapped)
         {
@@ -2265,14 +2317,14 @@ BlocksList Aggregator::prepareBlocksAndFillTwoLevelImpl(
 
     std::atomic<UInt32> next_bucket_to_merge = 0;
 
-    auto converter = [&](size_t thread_id, ThreadGroupStatusPtr thread_group)
+    auto converter = [&](size_t thread_id, ThreadGroupPtr thread_group)
     {
         SCOPE_EXIT_SAFE(
             if (thread_group)
-                CurrentThread::detachQueryIfNotDetached();
+                CurrentThread::detachFromGroupIfNotDetached();
         );
         if (thread_group)
-            CurrentThread::attachToIfDetached(thread_group);
+            CurrentThread::attachToGroupIfDetached(thread_group);
 
         BlocksList blocks;
         while (true)
@@ -2350,7 +2402,7 @@ BlocksList Aggregator::convertToBlocks(AggregatedDataVariants & data_variants, b
     std::unique_ptr<ThreadPool> thread_pool;
     if (max_threads > 1 && data_variants.sizeWithoutOverflowRow() > 100000  /// TODO Make a custom threshold.
         && data_variants.isTwoLevel())                      /// TODO Use the shared thread pool with the `merge` function.
-        thread_pool = std::make_unique<ThreadPool>(max_threads);
+        thread_pool = std::make_unique<ThreadPool>(CurrentMetrics::AggregatorThreads, CurrentMetrics::AggregatorThreadsActive, max_threads);
 
     if (data_variants.without_key)
         blocks.emplace_back(prepareBlockAndFillWithoutKey(
@@ -2397,7 +2449,7 @@ void NO_INLINE Aggregator::mergeDataNullKey(
     Table & table_src,
     Arena * arena) const
 {
-    if constexpr (Method::low_cardinality_optimization)
+    if constexpr (Method::low_cardinality_optimization || Method::one_key_nullable_optimization)
     {
         if (table_src.hasNullKeyData())
         {
@@ -2429,7 +2481,7 @@ void NO_INLINE Aggregator::mergeDataNullKey(
 template <typename Method, bool use_compiled_functions, bool prefetch, typename Table>
 void NO_INLINE Aggregator::mergeDataImpl(Table & table_dst, Table & table_src, Arena * arena) const
 {
-    if constexpr (Method::low_cardinality_optimization)
+    if constexpr (Method::low_cardinality_optimization || Method::one_key_nullable_optimization)
         mergeDataNullKey<Method, Table>(table_dst, table_src, arena);
 
     auto merge = [&](AggregateDataPtr & __restrict dst, AggregateDataPtr & __restrict src, bool inserted)
@@ -2490,7 +2542,7 @@ void NO_INLINE Aggregator::mergeDataNoMoreKeysImpl(
     Arena * arena) const
 {
     /// Note : will create data for NULL key if not exist
-    if constexpr (Method::low_cardinality_optimization)
+    if constexpr (Method::low_cardinality_optimization || Method::one_key_nullable_optimization)
         mergeDataNullKey<Method, Table>(table_dst, table_src, arena);
 
     table_src.mergeToViaFind(table_dst, [&](AggregateDataPtr dst, AggregateDataPtr & src, bool found)
@@ -2518,7 +2570,7 @@ void NO_INLINE Aggregator::mergeDataOnlyExistingKeysImpl(
     Arena * arena) const
 {
     /// Note : will create data for NULL key if not exist
-    if constexpr (Method::low_cardinality_optimization)
+    if constexpr (Method::low_cardinality_optimization || Method::one_key_nullable_optimization)
         mergeDataNullKey<Method, Table>(table_dst, table_src, arena);
 
     table_src.mergeToViaFind(table_dst,
@@ -2545,7 +2597,7 @@ void NO_INLINE Aggregator::mergeDataOnlyExistingKeysImpl(
 void NO_INLINE Aggregator::mergeWithoutKeyDataImpl(
     ManyAggregatedDataVariants & non_empty_data) const
 {
-    ThreadPool thread_pool{params.max_threads};
+    ThreadPool thread_pool{CurrentMetrics::AggregatorThreads, CurrentMetrics::AggregatorThreadsActive, params.max_threads};
 
     AggregatedDataVariantsPtr & res = non_empty_data[0];
 
@@ -2890,6 +2942,13 @@ bool Aggregator::mergeOnBlock(Block block, AggregatedDataVariants & result, bool
         LOG_TRACE(log, "Aggregation method: {}", result.getMethodName());
     }
 
+    if ((params.overflow_row || result.type == AggregatedDataVariants::Type::without_key) && !result.without_key)
+    {
+        AggregateDataPtr place = result.aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
+        createAggregateStates(place);
+        result.without_key = place;
+    }
+
     if (result.type == AggregatedDataVariants::Type::without_key || block.info.is_overflows)
         mergeBlockWithoutKeyStreamsImpl(std::move(block), result);
 #define M(NAME, IS_TWO_LEVEL) \
@@ -2986,14 +3045,14 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
 
         LOG_TRACE(log, "Merging partially aggregated two-level data.");
 
-        auto merge_bucket = [&bucket_to_blocks, &result, this](Int32 bucket, Arena * aggregates_pool, ThreadGroupStatusPtr thread_group)
+        auto merge_bucket = [&bucket_to_blocks, &result, this](Int32 bucket, Arena * aggregates_pool, ThreadGroupPtr thread_group)
         {
             SCOPE_EXIT_SAFE(
                 if (thread_group)
-                    CurrentThread::detachQueryIfNotDetached();
+                    CurrentThread::detachFromGroupIfNotDetached();
             );
             if (thread_group)
-                CurrentThread::attachToIfDetached(thread_group);
+                CurrentThread::attachToGroupIfDetached(thread_group);
 
             for (Block & block : bucket_to_blocks[bucket])
             {
@@ -3011,7 +3070,7 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
 
         std::unique_ptr<ThreadPool> thread_pool;
         if (max_threads > 1 && total_input_rows > 100000)    /// TODO Make a custom threshold.
-            thread_pool = std::make_unique<ThreadPool>(max_threads);
+            thread_pool = std::make_unique<ThreadPool>(CurrentMetrics::AggregatorThreads, CurrentMetrics::AggregatorThreadsActive, max_threads);
 
         for (const auto & bucket_blocks : bucket_to_blocks)
         {
@@ -3194,7 +3253,7 @@ void NO_INLINE Aggregator::convertBlockToTwoLevelImpl(
     /// For every row.
     for (size_t i = 0; i < rows; ++i)
     {
-        if constexpr (Method::low_cardinality_optimization)
+        if constexpr (Method::low_cardinality_optimization || Method::one_key_nullable_optimization)
         {
             if (state.isNullAt(i))
             {
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index 6e776fb9fa8..05b34e8460f 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -5,10 +5,8 @@
 #include <mutex>
 #include <type_traits>
 
-#include <Common/logger_useful.h>
 
 #include <base/StringRef.h>
-#include <Common/Arena.h>
 #include <Common/HashTable/FixedHashMap.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/TwoLevelHashMap.h>
@@ -48,6 +46,10 @@ namespace ErrorCodes
     extern const int UNKNOWN_AGGREGATED_DATA_VARIANT;
 }
 
+class Arena;
+using ArenaPtr = std::shared_ptr<Arena>;
+using Arenas = std::vector<ArenaPtr>;
+
 /** Different data structures that can be used for aggregation
   * For efficiency, the aggregation data itself is put into the pool.
   * Data and pool ownership (states of aggregate functions)
@@ -159,10 +161,17 @@ using StringHashTableWithNullKey = AggregationDataWithNullKey<StringHashMap<Type
 
 using AggregatedDataWithNullableUInt8Key = AggregationDataWithNullKey<AggregatedDataWithUInt8Key>;
 using AggregatedDataWithNullableUInt16Key = AggregationDataWithNullKey<AggregatedDataWithUInt16Key>;
+using AggregatedDataWithNullableUInt32Key = AggregationDataWithNullKey<AggregatedDataWithUInt32Key>;
+
 
 using AggregatedDataWithNullableUInt64Key = AggregationDataWithNullKey<AggregatedDataWithUInt64Key>;
 using AggregatedDataWithNullableStringKey = AggregationDataWithNullKey<AggregatedDataWithStringKey>;
+using AggregatedDataWithNullableShortStringKey = AggregationDataWithNullKey<AggregatedDataWithShortStringKey>;
 
+
+using AggregatedDataWithNullableUInt32KeyTwoLevel = AggregationDataWithNullKeyTwoLevel<
+    TwoLevelHashMap<UInt32, AggregateDataPtr, HashCRC32<UInt32>,
+                    TwoLevelHashTableGrower<>, HashTableAllocator, HashTableWithNullKey>>;
 using AggregatedDataWithNullableUInt64KeyTwoLevel = AggregationDataWithNullKeyTwoLevel<
         TwoLevelHashMap<UInt64, AggregateDataPtr, HashCRC32<UInt64>,
         TwoLevelHashTableGrower<>, HashTableAllocator, HashTableWithNullKey>>;
@@ -174,11 +183,10 @@ using AggregatedDataWithNullableStringKeyTwoLevel = AggregationDataWithNullKeyTw
         TwoLevelHashMapWithSavedHash<StringRef, AggregateDataPtr, DefaultHash<StringRef>,
         TwoLevelHashTableGrower<>, HashTableAllocator, HashTableWithNullKey>>;
 
-
 /// For the case where there is one numeric key.
 /// FieldType is UInt8/16/32/64 for any type with corresponding bit width.
 template <typename FieldType, typename TData,
-        bool consecutive_keys_optimization = true>
+        bool consecutive_keys_optimization = true, bool nullable = false>
 struct AggregationMethodOneNumber
 {
     using Data = TData;
@@ -198,10 +206,11 @@ struct AggregationMethodOneNumber
 
     /// To use one `Method` in different threads, use different `State`.
     using State = ColumnsHashing::HashMethodOneNumber<typename Data::value_type,
-        Mapped, FieldType, consecutive_keys_optimization>;
+        Mapped, FieldType, consecutive_keys_optimization, false, nullable>;
 
     /// Use optimization for low cardinality.
     static const bool low_cardinality_optimization = false;
+    static const bool one_key_nullable_optimization = nullable;
 
     /// Shuffle key columns before `insertKeyIntoColumns` call if needed.
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
@@ -209,9 +218,20 @@ struct AggregationMethodOneNumber
     // Insert the key from the hash table into columns.
     static void insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & /*key_sizes*/)
     {
+        ColumnVectorHelper * column;
+        if constexpr (nullable)
+        {
+            ColumnNullable & nullable_col = assert_cast<ColumnNullable &>(*key_columns[0]);
+            ColumnUInt8 * null_map = assert_cast<ColumnUInt8 *>(&nullable_col.getNullMapColumn());
+            null_map->insertDefault();
+            column = static_cast<ColumnVectorHelper *>(&nullable_col.getNestedColumn());
+        }
+        else
+        {
+            column = static_cast<ColumnVectorHelper *>(key_columns[0]);
+        }
         static_assert(sizeof(FieldType) <= sizeof(Key));
         const auto * key_holder = reinterpret_cast<const char *>(&key);
-        auto * column = static_cast<ColumnVectorHelper *>(key_columns[0]);
         if constexpr (sizeof(FieldType) < sizeof(Key) && std::endian::native == std::endian::big)
             column->insertRawData<sizeof(FieldType)>(key_holder + (sizeof(Key) - sizeof(FieldType)));
         else
@@ -242,6 +262,7 @@ struct AggregationMethodString
     using State = ColumnsHashing::HashMethodString<typename Data::value_type, Mapped>;
 
     static const bool low_cardinality_optimization = false;
+    static const bool one_key_nullable_optimization = false;
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
@@ -253,7 +274,7 @@ struct AggregationMethodString
 
 
 /// Same as above but without cache
-template <typename TData>
+template <typename TData, bool nullable = false>
 struct AggregationMethodStringNoCache
 {
     using Data = TData;
@@ -271,15 +292,25 @@ struct AggregationMethodStringNoCache
     {
     }
 
-    using State = ColumnsHashing::HashMethodString<typename Data::value_type, Mapped, true, false>;
+    using State = ColumnsHashing::HashMethodString<typename Data::value_type, Mapped, true, false, false ,nullable>;
 
     static const bool low_cardinality_optimization = false;
+    static const bool one_key_nullable_optimization = nullable;
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
     static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
     {
-        static_cast<ColumnString *>(key_columns[0])->insertData(key.data, key.size);
+        if constexpr (nullable)
+        {
+            ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*key_columns[0]);
+            assert_cast<ColumnString &>(column_nullable.getNestedColumn()).insertData(key.data, key.size);
+            column_nullable.getNullMapData().push_back(0);
+        }
+        else
+        {
+            assert_cast<ColumnString &>(*key_columns[0]).insertData(key.data, key.size);
+        }
     }
 };
 
@@ -306,17 +337,18 @@ struct AggregationMethodFixedString
     using State = ColumnsHashing::HashMethodFixedString<typename Data::value_type, Mapped>;
 
     static const bool low_cardinality_optimization = false;
+    static const bool one_key_nullable_optimization = false;
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
     static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
     {
-        static_cast<ColumnFixedString *>(key_columns[0])->insertData(key.data, key.size);
+        assert_cast<ColumnFixedString &>(*key_columns[0]).insertData(key.data, key.size);
     }
 };
 
 /// Same as above but without cache
-template <typename TData>
+template <typename TData, bool nullable = false>
 struct AggregationMethodFixedStringNoCache
 {
     using Data = TData;
@@ -334,15 +366,23 @@ struct AggregationMethodFixedStringNoCache
     {
     }
 
-    using State = ColumnsHashing::HashMethodFixedString<typename Data::value_type, Mapped, true, false>;
+    using State = ColumnsHashing::HashMethodFixedString<typename Data::value_type, Mapped, true, false, false, nullable>;
 
     static const bool low_cardinality_optimization = false;
+    static const bool one_key_nullable_optimization = nullable;
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
     static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
     {
-        static_cast<ColumnFixedString *>(key_columns[0])->insertData(key.data, key.size);
+        if constexpr (nullable)
+        {
+            assert_cast<ColumnNullable &>(*key_columns[0]).insertData(key.data, key.size);
+        }
+        else
+        {
+            assert_cast<ColumnFixedString &>(*key_columns[0]).insertData(key.data, key.size);
+        }
     }
 };
 
@@ -418,6 +458,7 @@ struct AggregationMethodKeysFixed
         use_cache>;
 
     static const bool low_cardinality_optimization = false;
+    static const bool one_key_nullable_optimization = false;
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> & key_columns, const Sizes & key_sizes)
     {
@@ -505,6 +546,7 @@ struct AggregationMethodSerialized
     using State = ColumnsHashing::HashMethodSerialized<typename Data::value_type, Mapped>;
 
     static const bool low_cardinality_optimization = false;
+    static const bool one_key_nullable_optimization = false;
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
@@ -588,6 +630,18 @@ struct AggregatedDataVariants : private boost::noncopyable
     std::unique_ptr<AggregationMethodSerialized<AggregatedDataWithStringKeyHash64>>          serialized_hash64;
 
     /// Support for nullable keys.
+    std::unique_ptr<AggregationMethodOneNumber<UInt8, AggregatedDataWithNullableUInt8Key, false, true>>         nullable_key8;
+    std::unique_ptr<AggregationMethodOneNumber<UInt16, AggregatedDataWithNullableUInt16Key, false, true>>         nullable_key16;
+    std::unique_ptr<AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt32Key, true, true>>         nullable_key32;
+    std::unique_ptr<AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64Key, true, true>>         nullable_key64;
+    std::unique_ptr<AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt32KeyTwoLevel, true, true>>         nullable_key32_two_level;
+    std::unique_ptr<AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64KeyTwoLevel, true, true>>         nullable_key64_two_level;
+
+    std::unique_ptr<AggregationMethodStringNoCache<AggregatedDataWithNullableShortStringKey, true>> nullable_key_string;
+    std::unique_ptr<AggregationMethodFixedStringNoCache<AggregatedDataWithNullableShortStringKey, true>> nullable_key_fixed_string;
+    std::unique_ptr<AggregationMethodStringNoCache<AggregatedDataWithNullableShortStringKeyTwoLevel, true>> nullable_key_string_two_level;
+    std::unique_ptr<AggregationMethodFixedStringNoCache<AggregatedDataWithNullableShortStringKeyTwoLevel, true>> nullable_key_fixed_string_two_level;
+
     std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128, true>>             nullable_keys128;
     std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256, true>>             nullable_keys256;
     std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128TwoLevel, true>>     nullable_keys128_two_level;
@@ -640,6 +694,16 @@ struct AggregatedDataVariants : private boost::noncopyable
         M(keys128_hash64,             false) \
         M(keys256_hash64,             false) \
         M(serialized_hash64,          false) \
+        M(nullable_key8,             false) \
+        M(nullable_key16,             false) \
+        M(nullable_key32,             false) \
+        M(nullable_key64,             false) \
+        M(nullable_key32_two_level,   true) \
+        M(nullable_key64_two_level,   true) \
+        M(nullable_key_string,        false) \
+        M(nullable_key_fixed_string,  false) \
+        M(nullable_key_string_two_level, true) \
+        M(nullable_key_fixed_string_two_level, true) \
         M(nullable_keys128,           false) \
         M(nullable_keys256,           false) \
         M(nullable_keys128_two_level, true) \
@@ -754,6 +818,10 @@ struct AggregatedDataVariants : private boost::noncopyable
         M(keys128)          \
         M(keys256)          \
         M(serialized)       \
+        M(nullable_key32) \
+        M(nullable_key64) \
+        M(nullable_key_string) \
+        M(nullable_key_fixed_string) \
         M(nullable_keys128) \
         M(nullable_keys256) \
         M(low_cardinality_key32) \
@@ -767,6 +835,8 @@ struct AggregatedDataVariants : private boost::noncopyable
     #define APPLY_FOR_VARIANTS_NOT_CONVERTIBLE_TO_TWO_LEVEL(M) \
         M(key8)             \
         M(key16)            \
+        M(nullable_key8) \
+        M(nullable_key16) \
         M(keys16)           \
         M(key64_hash64)     \
         M(key_string_hash64)\
@@ -810,6 +880,10 @@ struct AggregatedDataVariants : private boost::noncopyable
         M(keys128_two_level)          \
         M(keys256_two_level)          \
         M(serialized_two_level)       \
+        M(nullable_key32_two_level) \
+        M(nullable_key64_two_level) \
+        M(nullable_key_string_two_level) \
+        M(nullable_key_fixed_string_two_level) \
         M(nullable_keys128_two_level) \
         M(nullable_keys256_two_level) \
         M(low_cardinality_key32_two_level) \
@@ -1290,7 +1364,7 @@ private:
         Arena * arena) const;
 
     template <bool use_compiled_functions>
-    Block insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & places, OutputBlockColumns && out_cols, Arena * arena) const;
+    Block insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & places, OutputBlockColumns && out_cols, Arena * arena, bool has_null_key_data) const;
 
     template <typename Method, bool use_compiled_functions, bool return_single_block, typename Table>
     ConvertToBlockRes<return_single_block>
diff --git a/src/Interpreters/AsynchronousInsertLog.cpp b/src/Interpreters/AsynchronousInsertLog.cpp
index 916ec8f3d56..eeccd9ad92e 100644
--- a/src/Interpreters/AsynchronousInsertLog.cpp
+++ b/src/Interpreters/AsynchronousInsertLog.cpp
@@ -36,6 +36,7 @@ NamesAndTypesList AsynchronousInsertLogElement::getNamesAndTypes()
         {"format", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
         {"query_id", std::make_shared<DataTypeString>()},
         {"bytes", std::make_shared<DataTypeUInt64>()},
+        {"rows", std::make_shared<DataTypeUInt64>()},
         {"exception", std::make_shared<DataTypeString>()},
         {"status", type_status},
 
@@ -71,6 +72,7 @@ void AsynchronousInsertLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(insert_query.format);
     columns[i++]->insert(query_id);
     columns[i++]->insert(bytes);
+    columns[i++]->insert(rows);
     columns[i++]->insert(exception);
     columns[i++]->insert(status);
 
diff --git a/src/Interpreters/AsynchronousInsertLog.h b/src/Interpreters/AsynchronousInsertLog.h
index e2fdd4c90a0..372d1cf5a1b 100644
--- a/src/Interpreters/AsynchronousInsertLog.h
+++ b/src/Interpreters/AsynchronousInsertLog.h
@@ -24,6 +24,7 @@ struct AsynchronousInsertLogElement
     ASTPtr query;
     String query_id;
     UInt64 bytes{};
+    UInt64 rows{};
     String exception;
     Status status{};
 
@@ -44,7 +45,7 @@ public:
     using SystemLog<AsynchronousInsertLogElement>::SystemLog;
 
     /// This table is usually queried for fixed table name.
-    static const char * getDefaultOrderBy() { return "(database, table, event_date, event_time)"; }
+    static const char * getDefaultOrderBy() { return "database, table, event_date, event_time"; }
 };
 
 }
diff --git a/src/Interpreters/AsynchronousInsertQueue.cpp b/src/Interpreters/AsynchronousInsertQueue.cpp
index ac8101d4ca2..dc2310cfebf 100644
--- a/src/Interpreters/AsynchronousInsertQueue.cpp
+++ b/src/Interpreters/AsynchronousInsertQueue.cpp
@@ -33,12 +33,15 @@
 namespace CurrentMetrics
 {
     extern const Metric PendingAsyncInsert;
+    extern const Metric AsynchronousInsertThreads;
+    extern const Metric AsynchronousInsertThreadsActive;
 }
 
 namespace ProfileEvents
 {
     extern const Event AsyncInsertQuery;
     extern const Event AsyncInsertBytes;
+    extern const Event AsyncInsertRows;
     extern const Event FailedAsyncInsertQuery;
 }
 
@@ -117,6 +120,15 @@ void AsynchronousInsertQueue::InsertData::Entry::finish(std::exception_ptr excep
     if (finished.exchange(true))
         return;
 
+    {
+        // To avoid races on counter of user's MemoryTracker we should free memory at this moment.
+        // Entries data must be destroyed in context of user who runs async insert.
+        // Each entry in the list may correspond to a different user,
+        // so we need to switch current thread's MemoryTracker.
+        UserMemoryTrackerSwitcher switcher(user_memory_tracker);
+        bytes = "";
+    }
+
     if (exception_)
     {
         promise.set_exception(exception_);
@@ -132,7 +144,7 @@ AsynchronousInsertQueue::AsynchronousInsertQueue(ContextPtr context_, size_t poo
     : WithContext(context_)
     , pool_size(pool_size_)
     , queue_shards(pool_size)
-    , pool(pool_size)
+    , pool(CurrentMetrics::AsynchronousInsertThreads, CurrentMetrics::AsynchronousInsertThreadsActive, pool_size)
 {
     if (!pool_size)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "pool_size cannot be zero");
@@ -178,9 +190,9 @@ void AsynchronousInsertQueue::scheduleDataProcessingJob(const InsertQuery & key,
 {
     /// Wrap 'unique_ptr' with 'shared_ptr' to make this
     /// lambda copyable and allow to save it to the thread pool.
-    pool.scheduleOrThrowOnError([key, global_context, data = std::make_shared<InsertDataPtr>(std::move(data))]() mutable
+    pool.scheduleOrThrowOnError([key, global_context, my_data = std::make_shared<InsertDataPtr>(std::move(data))]() mutable
     {
-        processData(key, std::move(*data), std::move(global_context));
+        processData(key, std::move(*my_data), std::move(global_context));
     });
 }
 
@@ -210,7 +222,7 @@ AsynchronousInsertQueue::push(ASTPtr query, ContextPtr query_context)
         /// to avoid buffering of huge amount of data in memory.
 
         auto read_buf = getReadBufferFromASTInsertQuery(query);
-        LimitReadBuffer limit_buf(*read_buf, settings.async_insert_max_data_size, false);
+        LimitReadBuffer limit_buf(*read_buf, settings.async_insert_max_data_size, /* trow_exception */ false, /* exact_limit */ {});
 
         WriteBufferFromString write_buf(bytes);
         copyData(limit_buf, write_buf);
@@ -342,10 +354,15 @@ void AsynchronousInsertQueue::processBatchDeadlines(size_t shard_num)
     }
 }
 
-static void appendElementsToLogSafe(
+namespace
+{
+
+using TimePoint = std::chrono::time_point<std::chrono::system_clock>;
+
+void appendElementsToLogSafe(
     AsynchronousInsertLog & log,
     std::vector<AsynchronousInsertLogElement> elements,
-    std::chrono::time_point<std::chrono::system_clock> flush_time,
+    TimePoint flush_time,
     const String & flush_query_id,
     const String & flush_exception)
 try
@@ -367,6 +384,8 @@ catch (...)
     tryLogCurrentException("AsynchronousInsertQueue", "Failed to add elements to AsynchronousInsertLog");
 }
 
+}
+
 // static
 void AsynchronousInsertQueue::processData(InsertQuery key, InsertDataPtr data, ContextPtr global_context)
 try
@@ -437,7 +456,9 @@ try
     {
         auto buffer = std::make_unique<ReadBufferFromString>(entry->bytes);
         current_entry = entry;
-        total_rows += executor.execute(*buffer);
+        auto bytes_size = entry->bytes.size();
+        size_t num_rows = executor.execute(*buffer);
+        total_rows += num_rows;
         chunk_info->offsets.push_back(total_rows);
 
         /// Keep buffer, because it still can be used
@@ -451,7 +472,8 @@ try
             elem.event_time_microseconds = timeInMicroseconds(entry->create_time);
             elem.query = key.query;
             elem.query_id = entry->query_id;
-            elem.bytes = entry->bytes.size();
+            elem.bytes = bytes_size;
+            elem.rows = num_rows;
             elem.exception = current_exception;
             current_exception.clear();
 
@@ -472,9 +494,28 @@ try
 
     format->addBuffer(std::move(last_buffer));
     auto insert_query_id = insert_context->getCurrentQueryId();
+    ProfileEvents::increment(ProfileEvents::AsyncInsertRows, total_rows);
+
+    auto finish_entries = [&]
+    {
+        for (const auto & entry : data->entries)
+        {
+            if (!entry->isFinished())
+                entry->finish();
+        }
+
+        if (!log_elements.empty())
+        {
+            auto flush_time = std::chrono::system_clock::now();
+            appendElementsToLogSafe(*insert_log, std::move(log_elements), flush_time, insert_query_id, "");
+        }
+    };
 
     if (total_rows == 0)
+    {
+        finish_entries();
         return;
+    }
 
     try
     {
@@ -502,17 +543,7 @@ try
         throw;
     }
 
-    for (const auto & entry : data->entries)
-    {
-        if (!entry->isFinished())
-            entry->finish();
-    }
-
-    if (!log_elements.empty())
-    {
-        auto flush_time = std::chrono::system_clock::now();
-        appendElementsToLogSafe(*insert_log, std::move(log_elements), flush_time, insert_query_id, "");
-    }
+    finish_entries();
 }
 catch (const Exception & e)
 {
diff --git a/src/Interpreters/AsynchronousInsertQueue.h b/src/Interpreters/AsynchronousInsertQueue.h
index e6b7bff8d26..bc60c86d067 100644
--- a/src/Interpreters/AsynchronousInsertQueue.h
+++ b/src/Interpreters/AsynchronousInsertQueue.h
@@ -90,7 +90,7 @@ private:
         struct Entry
         {
         public:
-            const String bytes;
+            String bytes;
             const String query_id;
             MemoryTracker * const user_memory_tracker;
             const std::chrono::time_point<std::chrono::system_clock> create_time;
diff --git a/src/Interpreters/AsynchronousMetricLog.h b/src/Interpreters/AsynchronousMetricLog.h
index 1937aa09dbd..3b0ce1bee04 100644
--- a/src/Interpreters/AsynchronousMetricLog.h
+++ b/src/Interpreters/AsynchronousMetricLog.h
@@ -49,7 +49,7 @@ public:
     void addValues(const AsynchronousMetricValues &);
 
     /// This table is usually queried for fixed metric name.
-    static const char * getDefaultOrderBy() { return "(metric, event_date, event_time)"; }
+    static const char * getDefaultOrderBy() { return "metric, event_date, event_time"; }
 };
 
 }
diff --git a/src/Interpreters/Cache/FileCache.cpp b/src/Interpreters/Cache/FileCache.cpp
index 825dc70f9c8..1908a4ce895 100644
--- a/src/Interpreters/Cache/FileCache.cpp
+++ b/src/Interpreters/Cache/FileCache.cpp
@@ -1,20 +1,16 @@
 #include "FileCache.h"
 
 #include <Common/randomSeed.h>
-#include <Common/SipHash.h>
-#include <Common/logger_useful.h>
 #include <Interpreters/Cache/FileCacheSettings.h>
 #include <Interpreters/Cache/LRUFileCachePriority.h>
+#include <Interpreters/Context.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadSettings.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <pcg-random/pcg_random.hpp>
-#include <filesystem>
-
-
-namespace fs = std::filesystem;
+#include <base/hex.h>
 
 namespace DB
 {
@@ -23,210 +19,160 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-FileCache::FileCache(
-    const String & cache_base_path_,
-    const FileCacheSettings & cache_settings_)
-    : cache_base_path(cache_base_path_)
-    , max_size(cache_settings_.max_size)
-    , max_element_size(cache_settings_.max_elements)
-    , max_file_segment_size(cache_settings_.max_file_segment_size)
-    , allow_persistent_files(cache_settings_.do_not_evict_index_and_mark_files)
-    , enable_cache_hits_threshold(cache_settings_.enable_cache_hits_threshold)
-    , enable_filesystem_query_cache_limit(cache_settings_.enable_filesystem_query_cache_limit)
-    , enable_bypass_cache_with_threashold(cache_settings_.enable_bypass_cache_with_threashold)
-    , bypass_cache_threashold(cache_settings_.bypass_cache_threashold)
+FileCache::FileCache(const FileCacheSettings & settings)
+    : max_file_segment_size(settings.max_file_segment_size)
+    , allow_persistent_files(settings.do_not_evict_index_and_mark_files)
+    , bypass_cache_threshold(settings.enable_bypass_cache_with_threashold ? settings.bypass_cache_threashold : 0)
+    , delayed_cleanup_interval_ms(settings.delayed_cleanup_interval_ms)
     , log(&Poco::Logger::get("FileCache"))
-    , main_priority(std::make_unique<LRUFileCachePriority>())
-    , stash_priority(std::make_unique<LRUFileCachePriority>())
-    , max_stash_element_size(cache_settings_.max_elements)
+    , metadata(settings.base_path)
 {
+    main_priority = std::make_unique<LRUFileCachePriority>(settings.max_size, settings.max_elements);
+
+    if (settings.cache_hits_threshold)
+        stash = std::make_unique<HitsCountStash>(settings.cache_hits_threshold, settings.max_elements);
+
+    if (settings.enable_filesystem_query_cache_limit)
+        query_limit = std::make_unique<FileCacheQueryLimit>();
 }
 
-FileCache::Key FileCache::hash(const String & path)
+FileCache::Key FileCache::createKeyForPath(const String & path)
 {
-    return Key(sipHash128(path.data(), path.size()));
+    return Key(path);
+}
+
+const String & FileCache::getBasePath() const
+{
+    return metadata.getBaseDirectory();
 }
 
 String FileCache::getPathInLocalCache(const Key & key, size_t offset, FileSegmentKind segment_kind) const
 {
-    String file_suffix;
-    switch (segment_kind)
-    {
-        case FileSegmentKind::Persistent:
-            file_suffix = "_persistent";
-            break;
-        case FileSegmentKind::Temporary:
-            file_suffix = "_temporary";
-            break;
-        case FileSegmentKind::Regular:
-            file_suffix = "";
-            break;
-    }
-
-    auto key_str = key.toString();
-    return fs::path(cache_base_path)
-        / key_str.substr(0, 3)
-        / key_str
-        / (std::to_string(offset) + file_suffix);
+    return metadata.getPathInLocalCache(key, offset, segment_kind);
 }
 
 String FileCache::getPathInLocalCache(const Key & key) const
 {
-    auto key_str = key.toString();
-    return fs::path(cache_base_path) / key_str.substr(0, 3) / key_str;
+    return metadata.getPathInLocalCache(key);
 }
 
-void FileCache::removeKeyDirectoryIfExists(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) const
+void FileCache::assertInitialized() const
 {
-    /// Note: it is guaranteed that there is no concurrency here with files deletion
-    /// because cache key directories are create only in FileCache class under cache_lock.
-
-    auto key_str = key.toString();
-    auto key_prefix_path = fs::path(cache_base_path) / key_str.substr(0, 3);
-    auto key_path = key_prefix_path / key_str;
-
-    if (!fs::exists(key_path))
+    if (is_initialized)
         return;
 
-    fs::remove_all(key_path);
+    std::unique_lock lock(init_mutex);
+    if (is_initialized)
+        return;
 
-    if (fs::is_empty(key_prefix_path))
-        fs::remove(key_prefix_path);
-}
-
-static bool isQueryInitialized()
-{
-    return CurrentThread::isInitialized()
-        && CurrentThread::get().getQueryContext()
-        && !CurrentThread::getQueryId().empty();
-}
-
-bool FileCache::isReadOnly()
-{
-    return !isQueryInitialized();
-}
-
-void FileCache::assertInitialized(std::lock_guard<std::mutex> & /* cache_lock */) const
-{
+    if (init_exception)
+        std::rethrow_exception(init_exception);
     if (!is_initialized)
-    {
-        if (initialization_exception)
-            std::rethrow_exception(initialization_exception);
-        else
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache not initialized");
-    }
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache not initialized");
 }
 
 void FileCache::initialize()
 {
-    std::lock_guard cache_lock(mutex);
-    if (!is_initialized)
+    std::lock_guard lock(init_mutex);
+
+    if (is_initialized)
+        return;
+
+    try
     {
-        if (fs::exists(cache_base_path))
+        if (fs::exists(getBasePath()))
         {
-            try
-            {
-                loadCacheInfoIntoMemory(cache_lock);
-            }
-            catch (...)
-            {
-                initialization_exception = std::current_exception();
-                throw;
-            }
+            loadMetadata();
         }
         else
         {
-            fs::create_directories(cache_base_path);
+            fs::create_directories(getBasePath());
         }
-
-        is_initialized = true;
     }
-}
-
-void FileCache::useCell(
-    const FileSegmentCell & cell, FileSegments & result, std::lock_guard<std::mutex> & cache_lock)
-{
-    auto file_segment = cell.file_segment;
-
-    if (file_segment->isDownloaded())
+    catch (...)
     {
-        fs::path path = file_segment->getPathInLocalCache();
-        if (!fs::exists(path))
-        {
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "File path does not exist, but file has DOWNLOADED state. {}",
-                file_segment->getInfoForLog());
-        }
-
-        if (fs::file_size(path) == 0)
-        {
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Cannot have zero size downloaded file segments. {}",
-                file_segment->getInfoForLog());
-        }
+        init_exception = std::current_exception();
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        throw;
     }
 
-    result.push_back(cell.file_segment);
+    is_initialized = true;
 
-    /**
-     * A cell receives a queue iterator on first successful space reservation attempt
-     * (space is reserved incrementally on each read buffer nextImpl() call).
-     */
-    if (cell.queue_iterator)
-    {
-        /// Move to the end of the queue. The iterator remains valid.
-        cell.queue_iterator->use(cache_lock);
-    }
+    cleanup_task = Context::getGlobalContextInstance()->getSchedulePool().createTask("FileCacheCleanup", [this]{ cleanupThreadFunc(); });
+    cleanup_task->activate();
+    cleanup_task->scheduleAfter(delayed_cleanup_interval_ms);
 }
 
-FileCache::FileSegmentCell * FileCache::getCell(
-    const Key & key, size_t offset, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    auto it = files.find(key);
-    if (it == files.end())
-        return nullptr;
-
-    auto & offsets = it->second;
-    auto cell_it = offsets.find(offset);
-    if (cell_it == offsets.end())
-        return nullptr;
-
-    return &cell_it->second;
-}
-
-FileSegments FileCache::getImpl(
-    const Key & key, const FileSegment::Range & range, std::lock_guard<std::mutex> & cache_lock)
+FileSegments FileCache::getImpl(const LockedKey & locked_key, const FileSegment::Range & range) const
 {
     /// Given range = [left, right] and non-overlapping ordered set of file segments,
     /// find list [segment1, ..., segmentN] of segments which intersect with given range.
 
-    FileSegments result;
-
-    if (enable_bypass_cache_with_threashold && (range.size() > bypass_cache_threashold))
+    if (bypass_cache_threshold && range.size() > bypass_cache_threshold)
     {
         auto file_segment = std::make_shared<FileSegment>(
-            range.left, range.size(), key, this, FileSegment::State::SKIP_CACHE, CreateFileSegmentSettings{});
-        {
-            std::unique_lock segment_lock(file_segment->mutex);
-            file_segment->detachAssumeStateFinalized(segment_lock);
-        }
-        result.emplace_back(file_segment);
-        return result;
+            locked_key.getKey(), range.left, range.size(), FileSegment::State::DETACHED);
+        return { file_segment };
     }
 
-    auto it = files.find(key);
-    if (it == files.end())
-        return {};
-
-    const auto & file_segments = it->second;
+    const auto & file_segments = *locked_key.getKeyMetadata();
     if (file_segments.empty())
-    {
-        files.erase(key);
-        removeKeyDirectoryIfExists(key, cache_lock);
         return {};
-    }
+
+    FileSegments result;
+    auto add_to_result = [&](const FileSegmentMetadata & file_segment_metadata)
+    {
+        FileSegmentPtr file_segment;
+        if (file_segment_metadata.valid())
+        {
+            file_segment = file_segment_metadata.file_segment;
+            if (file_segment->isDownloaded())
+            {
+                if (file_segment->getDownloadedSize(true) == 0)
+                {
+                    throw Exception(
+                        ErrorCodes::LOGICAL_ERROR,
+                        "Cannot have zero size downloaded file segments. {}",
+                        file_segment->getInfoForLog());
+                }
+
+#ifndef NDEBUG
+                /**
+                * Check that in-memory state of the cache is consistent with the state on disk.
+                * Check only in debug build, because such checks can be done often and can be quite
+                * expensive compared to overall query execution time.
+                */
+
+                fs::path path = file_segment->getPathInLocalCache();
+                if (!fs::exists(path))
+                {
+                    throw Exception(
+                        ErrorCodes::LOGICAL_ERROR,
+                        "File path does not exist, but file has DOWNLOADED state. {}",
+                        file_segment->getInfoForLog());
+                }
+
+                if (fs::file_size(path) == 0)
+                {
+                    throw Exception(
+                        ErrorCodes::LOGICAL_ERROR,
+                        "Cannot have zero size downloaded file segments. {}",
+                        file_segment->getInfoForLog());
+                }
+#endif
+            }
+        }
+        else
+        {
+            file_segment = std::make_shared<FileSegment>(
+                locked_key.getKey(),
+                file_segment_metadata.file_segment->offset(),
+                file_segment_metadata.file_segment->range().size(),
+                FileSegment::State::DETACHED);
+        }
+
+        result.push_back(file_segment);
+    };
 
     auto segment_it = file_segments.lower_bound(range.left);
     if (segment_it == file_segments.end())
@@ -238,27 +184,27 @@ FileSegments FileCache::getImpl(
         ///     ^                                        ^
         ///     range.left                               range.left
 
-        const auto & cell = file_segments.rbegin()->second;
-        if (cell.file_segment->range().right < range.left)
+        const auto & file_segment_metadata = *file_segments.rbegin()->second;
+        if (file_segment_metadata.file_segment->range().right < range.left)
             return {};
 
-        useCell(cell, result, cache_lock);
+        add_to_result(file_segment_metadata);
     }
     else /// segment_it <-- segmment{k}
     {
         if (segment_it != file_segments.begin())
         {
-            const auto & prev_cell = std::prev(segment_it)->second;
-            const auto & prev_cell_range = prev_cell.file_segment->range();
+            const auto & prev_file_segment_metadata = *std::prev(segment_it)->second;
+            const auto & prev_range = prev_file_segment_metadata.file_segment->range();
 
-            if (range.left <= prev_cell_range.right)
+            if (range.left <= prev_range.right)
             {
                 ///   segment{k-1}  segment{k}
                 ///   [________]   [_____
                 ///       [___________
                 ///       ^
                 ///       range.left
-                useCell(prev_cell, result, cache_lock);
+                add_to_result(prev_file_segment_metadata);
             }
         }
 
@@ -270,11 +216,11 @@ FileSegments FileCache::getImpl(
 
         while (segment_it != file_segments.end())
         {
-            const auto & cell = segment_it->second;
-            if (range.right < cell.file_segment->range().left)
+            const auto & file_segment_metadata = *segment_it->second;
+            if (range.right < file_segment_metadata.file_segment->range().left)
                 break;
 
-            useCell(cell, result, cache_lock);
+            add_to_result(file_segment_metadata);
             ++segment_it;
         }
     }
@@ -282,34 +228,32 @@ FileSegments FileCache::getImpl(
     return result;
 }
 
-FileSegments FileCache::splitRangeIntoCells(
-    const Key & key,
+FileSegments FileCache::splitRangeIntoFileSegments(
+    LockedKey & locked_key,
     size_t offset,
     size_t size,
     FileSegment::State state,
-    const CreateFileSegmentSettings & settings,
-    std::lock_guard<std::mutex> & cache_lock)
+    const CreateFileSegmentSettings & settings)
 {
     assert(size > 0);
 
     auto current_pos = offset;
     auto end_pos_non_included = offset + size;
 
-    size_t current_cell_size;
+    size_t current_file_segment_size;
     size_t remaining_size = size;
 
     FileSegments file_segments;
     while (current_pos < end_pos_non_included)
     {
-        current_cell_size = std::min(remaining_size, max_file_segment_size);
-        remaining_size -= current_cell_size;
+        current_file_segment_size = std::min(remaining_size, max_file_segment_size);
+        remaining_size -= current_file_segment_size;
 
-        auto * cell = addCell(key, current_pos, current_cell_size, state, settings, cache_lock);
-        if (cell)
-            file_segments.push_back(cell->file_segment);
-        assert(cell);
+        auto file_segment_metadata_it = addFileSegment(
+            locked_key, current_pos, current_file_segment_size, state, settings, nullptr);
+        file_segments.push_back(file_segment_metadata_it->second->file_segment);
 
-        current_pos += current_cell_size;
+        current_pos += current_file_segment_size;
     }
 
     assert(file_segments.empty() || offset + size - 1 == file_segments.back()->range().right);
@@ -317,12 +261,11 @@ FileSegments FileCache::splitRangeIntoCells(
 }
 
 void FileCache::fillHolesWithEmptyFileSegments(
+    LockedKey & locked_key,
     FileSegments & file_segments,
-    const Key & key,
     const FileSegment::Range & range,
     bool fill_with_detached_file_segments,
-    const CreateFileSegmentSettings & settings,
-    std::lock_guard<std::mutex> & cache_lock)
+    const CreateFileSegmentSettings & settings)
 {
     /// There are segments [segment1, ..., segmentN]
     /// (non-overlapping, non-empty, ascending-ordered) which (maybe partially)
@@ -332,7 +275,9 @@ void FileCache::fillHolesWithEmptyFileSegments(
     /// [____________________]         -- requested range
     ///     [____]  [_]   [_________]  -- intersecting cache [segment1, ..., segmentN]
     ///
-    /// For each such hole create a cell with file segment state EMPTY.
+    /// For each such hole create a file_segment_metadata with file segment state EMPTY.
+
+    assert(!file_segments.empty());
 
     auto it = file_segments.begin();
     auto segment_range = (*it)->range();
@@ -368,16 +313,16 @@ void FileCache::fillHolesWithEmptyFileSegments(
 
         if (fill_with_detached_file_segments)
         {
-            auto file_segment = std::make_shared<FileSegment>(current_pos, hole_size, key, this, FileSegment::State::EMPTY, settings);
-            {
-                std::unique_lock segment_lock(file_segment->mutex);
-                file_segment->detachAssumeStateFinalized(segment_lock);
-            }
+            auto file_segment = std::make_shared<FileSegment>(
+                locked_key.getKey(), current_pos, hole_size, FileSegment::State::DETACHED, settings);
+
             file_segments.insert(it, file_segment);
         }
         else
         {
-            file_segments.splice(it, splitRangeIntoCells(key, current_pos, hole_size, FileSegment::State::EMPTY, settings, cache_lock));
+            auto split = splitRangeIntoFileSegments(
+                locked_key, current_pos, hole_size, FileSegment::State::EMPTY, settings);
+            file_segments.splice(it, std::move(split));
         }
 
         current_pos = segment_range.right + 1;
@@ -395,655 +340,517 @@ void FileCache::fillHolesWithEmptyFileSegments(
 
         if (fill_with_detached_file_segments)
         {
-            auto file_segment = std::make_shared<FileSegment>(current_pos, hole_size, key, this, FileSegment::State::EMPTY, settings);
-            {
-                std::unique_lock segment_lock(file_segment->mutex);
-                file_segment->detachAssumeStateFinalized(segment_lock);
-            }
+            auto file_segment = std::make_shared<FileSegment>(
+                locked_key.getKey(), current_pos, hole_size, FileSegment::State::DETACHED, settings);
+
             file_segments.insert(file_segments.end(), file_segment);
         }
         else
         {
-            file_segments.splice(
-                file_segments.end(),
-                splitRangeIntoCells(key, current_pos, hole_size, FileSegment::State::EMPTY, settings, cache_lock));
+            auto split = splitRangeIntoFileSegments(
+                locked_key, current_pos, hole_size, FileSegment::State::EMPTY, settings);
+            file_segments.splice(file_segments.end(), std::move(split));
         }
     }
 }
 
-FileSegmentsHolder FileCache::getOrSet(const Key & key, size_t offset, size_t size, const CreateFileSegmentSettings & settings)
-{
-    std::lock_guard cache_lock(mutex);
-
-    assertInitialized(cache_lock);
-
-#ifndef NDEBUG
-    assertCacheCorrectness(key, cache_lock);
-#endif
-
-    FileSegment::Range range(offset, offset + size - 1);
-    /// Get all segments which intersect with the given range.
-    auto file_segments = getImpl(key, range, cache_lock);
-
-    if (file_segments.empty())
-    {
-        file_segments = splitRangeIntoCells(key, offset, size, FileSegment::State::EMPTY, settings, cache_lock);
-    }
-    else
-    {
-        fillHolesWithEmptyFileSegments(file_segments, key, range, /* fill_with_detached */false, settings, cache_lock);
-    }
-    assert(!file_segments.empty());
-    return FileSegmentsHolder(std::move(file_segments));
-}
-
-FileSegmentsHolder FileCache::set(const Key & key, size_t offset, size_t size, const CreateFileSegmentSettings & settings)
-{
-    std::lock_guard cache_lock(mutex);
-
-    auto it = files.find(key);
-    if (it != files.end())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "File {} already exists", key.toString());
-
-    if (settings.unbounded)
-    {
-        /// If the file is unbounded, we can create a single cell for it.
-        FileSegments file_segments;
-        if (auto * cell = addCell(key, offset, size, FileSegment::State::EMPTY, settings, cache_lock))
-            file_segments.push_back(cell->file_segment);
-        else
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot add cell for file {}", key.toString());
-        return FileSegmentsHolder(std::move(file_segments));
-    }
-    return FileSegmentsHolder(splitRangeIntoCells(key, offset, size, FileSegment::State::EMPTY, settings, cache_lock));
-}
-
-FileSegmentsHolder FileCache::get(const Key & key, size_t offset, size_t size)
-{
-    std::lock_guard cache_lock(mutex);
-
-    assertInitialized(cache_lock);
-
-#ifndef NDEBUG
-    assertCacheCorrectness(key, cache_lock);
-#endif
-
-    FileSegment::Range range(offset, offset + size - 1);
-
-    /// Get all segments which intersect with the given range.
-    auto file_segments = getImpl(key, range, cache_lock);
-
-    if (file_segments.empty())
-    {
-        auto file_segment = std::make_shared<FileSegment>(
-            offset, size, key, this, FileSegment::State::EMPTY, CreateFileSegmentSettings{});
-        {
-            std::unique_lock segment_lock(file_segment->mutex);
-            file_segment->detachAssumeStateFinalized(segment_lock);
-        }
-        file_segments = { file_segment };
-    }
-    else
-    {
-        fillHolesWithEmptyFileSegments(file_segments, key, range, /* fill_with_detached */true, {}, cache_lock);
-    }
-
-    return FileSegmentsHolder(std::move(file_segments));
-}
-
-FileCache::FileSegmentCell * FileCache::addCell(
-    const Key & key, size_t offset, size_t size,
-    FileSegment::State state, const CreateFileSegmentSettings & settings,
-    std::lock_guard<std::mutex> & cache_lock)
-{
-    /// Create a file segment cell and put it in `files` map by [key][offset].
-
-    if (!size)
-        return nullptr; /// Empty files are not cached.
-
-    if (files[key].contains(offset))
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Cache cell already exists for key: `{}`, offset: {}, size: {}.\nCurrent cache structure: {}",
-            key.toString(), offset, size, dumpStructureUnlocked(key, cache_lock));
-
-    auto skip_or_download = [&]() -> FileSegmentPtr
-    {
-        FileSegment::State result_state = state;
-        if (state == FileSegment::State::EMPTY && enable_cache_hits_threshold)
-        {
-            auto record = stash_records.find({key, offset});
-
-            if (record == stash_records.end())
-            {
-                auto priority_iter = stash_priority->add(key, offset, 0, cache_lock);
-                stash_records.insert({{key, offset}, priority_iter});
-
-                if (stash_priority->getElementsNum(cache_lock) > max_stash_element_size)
-                {
-                    auto remove_priority_iter = stash_priority->getLowestPriorityWriteIterator(cache_lock);
-                    stash_records.erase({remove_priority_iter->key(), remove_priority_iter->offset()});
-                    remove_priority_iter->removeAndGetNext(cache_lock);
-                }
-
-                /// For segments that do not reach the download threshold,
-                /// we do not download them, but directly read them
-                result_state = FileSegment::State::SKIP_CACHE;
-            }
-            else
-            {
-                auto priority_iter = record->second;
-                priority_iter->use(cache_lock);
-
-                result_state = priority_iter->hits() >= enable_cache_hits_threshold
-                    ? FileSegment::State::EMPTY
-                    : FileSegment::State::SKIP_CACHE;
-            }
-        }
-
-        return std::make_shared<FileSegment>(offset, size, key, this, result_state, settings);
-    };
-
-    FileSegmentCell cell(skip_or_download(), this, cache_lock);
-    auto & offsets = files[key];
-
-    if (offsets.empty())
-    {
-        auto key_path = getPathInLocalCache(key);
-
-        if (!fs::exists(key_path))
-            fs::create_directories(key_path);
-    }
-
-    auto [it, inserted] = offsets.insert({offset, std::move(cell)});
-    if (!inserted)
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Failed to insert into cache key: `{}`, offset: {}, size: {}",
-            key.toString(), offset, size);
-
-    return &(it->second);
-}
-
-FileSegmentPtr FileCache::createFileSegmentForDownload(
+FileSegmentsHolderPtr FileCache::set(
     const Key & key,
     size_t offset,
     size_t size,
-    const CreateFileSegmentSettings & settings,
-    std::lock_guard<std::mutex> & cache_lock)
+    const CreateFileSegmentSettings & settings)
 {
-#ifndef NDEBUG
-    assertCacheCorrectness(key, cache_lock);
-#endif
+    assertInitialized();
 
-    if (!settings.unbounded && size > max_file_segment_size)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Requested size exceeds max file segment size");
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::CREATE_EMPTY);
+    FileSegment::Range range(offset, offset + size - 1);
 
-    auto * cell = getCell(key, offset, cache_lock);
-    if (cell)
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Cache cell already exists for key `{}` and offset {}",
-            key.toString(), offset);
+    auto file_segments = getImpl(*locked_key, range);
+    if (!file_segments.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Having intersection with already existing cache");
 
-    cell = addCell(key, offset, size, FileSegment::State::EMPTY, settings, cache_lock);
-
-    if (!cell)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to add a new cell for download");
-
-    return cell->file_segment;
-}
-
-bool FileCache::tryReserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
-{
-    auto query_context = enable_filesystem_query_cache_limit ? getCurrentQueryContext(cache_lock) : nullptr;
-    if (!query_context)
+    if (settings.unbounded)
     {
-        return tryReserveForMainList(key, offset, size, nullptr, cache_lock);
+        /// If the file is unbounded, we can create a single file_segment_metadata for it.
+        auto file_segment_metadata_it = addFileSegment(
+            *locked_key, offset, size, FileSegment::State::EMPTY, settings, nullptr);
+        file_segments = {file_segment_metadata_it->second->file_segment};
     }
-    /// The maximum cache capacity of the request is not reached, thus the
-    //// cache block is evicted from the main LRU queue by tryReserveForMainList().
-    else if (query_context->getCacheSize() + size <= query_context->getMaxCacheSize())
-    {
-        return tryReserveForMainList(key, offset, size, query_context, cache_lock);
-    }
-    /// When skip_download_if_exceeds_query_cache is true, there is no need
-    /// to evict old data, skip the cache and read directly from remote fs.
-    else if (query_context->isSkipDownloadIfExceed())
-    {
-        return false;
-    }
-    /// The maximum cache size of the query is reached, the cache will be
-    /// evicted from the history cache accessed by the current query.
     else
     {
-        size_t removed_size = 0;
-        size_t queue_size = main_priority->getElementsNum(cache_lock);
+        file_segments = splitRangeIntoFileSegments(
+            *locked_key, offset, size, FileSegment::State::EMPTY, settings);
+    }
 
-        auto * cell_for_reserve = getCell(key, offset, cache_lock);
+    return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
+}
 
-        struct Segment
+FileSegmentsHolderPtr FileCache::getOrSet(
+    const Key & key,
+    size_t offset,
+    size_t size,
+    const CreateFileSegmentSettings & settings)
+{
+    assertInitialized();
+
+    FileSegment::Range range(offset, offset + size - 1);
+
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::CREATE_EMPTY);
+
+    /// Get all segments which intersect with the given range.
+    auto file_segments = getImpl(*locked_key, range);
+    if (file_segments.empty())
+    {
+        file_segments = splitRangeIntoFileSegments(
+            *locked_key, offset, size, FileSegment::State::EMPTY, settings);
+    }
+    else
+    {
+        fillHolesWithEmptyFileSegments(
+            *locked_key, file_segments, range, /* fill_with_detached */false, settings);
+    }
+
+    chassert(!file_segments.empty());
+    return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
+}
+
+FileSegmentsHolderPtr FileCache::get(const Key & key, size_t offset, size_t size)
+{
+    assertInitialized();
+
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::RETURN_NULL);
+    if (locked_key)
+    {
+        FileSegment::Range range(offset, offset + size - 1);
+
+        /// Get all segments which intersect with the given range.
+        auto file_segments = getImpl(*locked_key, range);
+        if (!file_segments.empty())
         {
-            Key key;
-            size_t offset;
-            size_t size;
+            fillHolesWithEmptyFileSegments(
+                *locked_key, file_segments, range, /* fill_with_detached */true, CreateFileSegmentSettings{});
 
-            Segment(Key key_, size_t offset_, size_t size_)
-                : key(key_), offset(offset_), size(size_) {}
-        };
+            return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
+        }
+    }
 
-        std::vector<Segment> ghost;
-        std::vector<FileSegmentCell *> trash;
-        std::vector<FileSegmentCell *> to_evict;
+    return std::make_unique<FileSegmentsHolder>(FileSegments{
+        std::make_shared<FileSegment>(key, offset, size, FileSegment::State::DETACHED)});
+}
 
-        auto is_overflow = [&]
+KeyMetadata::iterator FileCache::addFileSegment(
+    LockedKey & locked_key,
+    size_t offset,
+    size_t size,
+    FileSegment::State state,
+    const CreateFileSegmentSettings & settings,
+    const CacheGuard::Lock * lock)
+{
+    /// Create a file_segment_metadata and put it in `files` map by [key][offset].
+
+    chassert(size > 0); /// Empty file segments in cache are not allowed.
+
+    const auto & key = locked_key.getKey();
+    if (locked_key.tryGetByOffset(offset))
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cache entry already exists for key: `{}`, offset: {}, size: {}.",
+            key, offset, size);
+    }
+
+    FileSegment::State result_state;
+
+    /// `stash` - a queue of "stashed" key-offset pairs. Implements counting of
+    /// cache entries and allows caching only if cache hit threadhold is reached.
+    if (stash && state == FileSegment::State::EMPTY)
+    {
+        if (!lock)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Using stash requires cache_lock");
+
+        KeyAndOffset stash_key(key, offset);
+
+        auto record_it = stash->records.find(stash_key);
+        if (record_it == stash->records.end())
         {
-            return (max_size != 0 && main_priority->getCacheSize(cache_lock) + size - removed_size > max_size)
-            || (max_element_size != 0 && queue_size > max_element_size)
-            || (query_context->getCacheSize() + size - removed_size > query_context->getMaxCacheSize());
-        };
+            auto & stash_records = stash->records;
 
-        /// Select the cache from the LRU queue held by query for expulsion.
-        for (auto iter = query_context->getPriority()->getLowestPriorityWriteIterator(cache_lock); iter->valid();)
+            stash_records.emplace(
+                stash_key, stash->queue->add(locked_key.getKeyMetadata(), offset, 0, *lock));
+
+            if (stash->queue->getElementsCount(*lock) > stash->queue->getElementsLimit())
+                stash->queue->pop(*lock);
+
+            result_state = FileSegment::State::DETACHED;
+        }
+        else
         {
-            if (!is_overflow())
-                break;
+            result_state = record_it->second->use(*lock) >= stash->hits_threshold
+                ? FileSegment::State::EMPTY
+                : FileSegment::State::DETACHED;
+        }
+    }
+    else
+    {
+        result_state = state;
+    }
 
-            auto * cell = getCell(iter->key(), iter->offset(), cache_lock);
+    PriorityIterator cache_it;
+    if (state == FileSegment::State::DOWNLOADED)
+    {
+        cache_it = main_priority->add(locked_key.getKeyMetadata(), offset, size, *lock);
+    }
 
-            if (!cell)
-            {
-                /// The cache corresponding to this record may be swapped out by
-                /// other queries, so it has become invalid.
-                removed_size += iter->size();
-                ghost.push_back(Segment(iter->key(), iter->offset(), iter->size()));
-                /// next()
-                iter->removeAndGetNext(cache_lock);
-            }
-            else
-            {
-                size_t cell_size = cell->size();
-                assert(iter->size() == cell_size);
+    try
+    {
+        auto file_segment = std::make_shared<FileSegment>(
+            key, offset, size, result_state, settings, this, locked_key.getKeyMetadata(), cache_it);
+        auto file_segment_metadata = std::make_shared<FileSegmentMetadata>(std::move(file_segment));
 
-                if (cell->releasable())
-                {
-                    auto & file_segment = cell->file_segment;
+        auto [file_segment_metadata_it, inserted] = locked_key.getKeyMetadata()->emplace(offset, file_segment_metadata);
+        if (!inserted)
+        {
+            if (cache_it)
+                cache_it->remove(*lock);
 
-                    if (file_segment->isPersistent() && allow_persistent_files)
-                    {
-                        LOG_DEBUG(log, "File segment will not be removed, because it is persistent: {}", file_segment->getInfoForLog());
-                        continue;
-                    }
-
-                    std::lock_guard segment_lock(file_segment->mutex);
-
-                    switch (file_segment->download_state)
-                    {
-                        case FileSegment::State::DOWNLOADED:
-                        {
-                            to_evict.push_back(cell);
-                            break;
-                        }
-                        default:
-                        {
-                            trash.push_back(cell);
-                            break;
-                        }
-                    }
-                    removed_size += cell_size;
-                    --queue_size;
-                }
-
-                iter->next();
-            }
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Failed to insert {}:{}: entry already exists", key, offset);
         }
 
-        auto remove_file_segment = [&](FileSegmentPtr file_segment, size_t file_segment_size)
-        {
-            query_context->remove(file_segment->key(), file_segment->offset(), file_segment_size, cache_lock);
-            remove(file_segment, cache_lock);
-        };
-
-        assert(trash.empty());
-        for (auto & cell : trash)
-        {
-            if (auto file_segment = cell->file_segment)
-                remove_file_segment(file_segment, cell->size());
-        }
-
-        for (auto & entry : ghost)
-            query_context->remove(entry.key, entry.offset, entry.size, cache_lock);
-
-        if (is_overflow())
-            return false;
-
-        if (cell_for_reserve)
-        {
-            auto queue_iterator = cell_for_reserve->queue_iterator;
-            if (queue_iterator)
-                queue_iterator->incrementSize(size, cache_lock);
-            else
-                cell_for_reserve->queue_iterator = main_priority->add(key, offset, size, cache_lock);
-        }
-
-        for (auto & cell : to_evict)
-        {
-            if (auto file_segment = cell->file_segment)
-                remove_file_segment(file_segment, cell->size());
-        }
-
-        query_context->reserve(key, offset, size, cache_lock);
-        return true;
+        return file_segment_metadata_it;
+    }
+    catch (...)
+    {
+        if (cache_it)
+            cache_it->remove(*lock);
+        throw;
     }
 }
 
-bool FileCache::tryReserveForMainList(
-    const Key & key, size_t offset, size_t size, QueryContextPtr query_context, std::lock_guard<std::mutex> & cache_lock)
+bool FileCache::tryReserve(FileSegment & file_segment, const size_t size)
 {
-    auto removed_size = 0;
-    size_t queue_size = main_priority->getElementsNum(cache_lock);
-    assert(queue_size <= max_element_size);
+    assertInitialized();
+    auto cache_lock = cache_guard.lock();
 
-    /// Since space reservation is incremental, cache cell already exists if it's state is EMPTY.
-    /// And it cache cell does not exist on startup -- as we first check for space and then add a cell.
-    auto * cell_for_reserve = getCell(key, offset, cache_lock);
+    LOG_TEST(
+        log, "Trying to reserve space ({} bytes) for {}:{}, current usage {}/{}",
+        size, file_segment.key(), file_segment.offset(),
+        main_priority->getSize(cache_lock), main_priority->getSizeLimit());
 
-    /// A cell acquires a LRUQueue iterator on first successful space reservation attempt.
-    /// cell_for_reserve can be nullptr here when we call tryReserve() from loadCacheInfoIntoMemory().
-    if (!cell_for_reserve || !cell_for_reserve->queue_iterator)
-        queue_size += 1;
+    /// In case of per query cache limit (by default disabled), we add/remove entries from both
+    /// (main_priority and query_priority) priority queues, but iterate entries in order of query_priority,
+    /// while checking the limits in both.
+    Priority * query_priority = nullptr;
 
-    auto is_overflow = [&]
+    auto query_context = query_limit ? query_limit->tryGetQueryContext(cache_lock) : nullptr;
+    if (query_context)
     {
-        /// max_size == 0 means unlimited cache size, max_element_size means unlimited number of cache elements.
-        return (max_size != 0 && main_priority->getCacheSize(cache_lock) + size - removed_size > max_size)
-            || (max_element_size != 0 && queue_size > max_element_size);
+        query_priority = &query_context->getPriority();
+
+        const bool query_limit_exceeded = query_priority->getSize(cache_lock) + size > query_priority->getSizeLimit();
+        if (query_limit_exceeded && !query_context->recacheOnFileCacheQueryLimitExceeded())
+        {
+            LOG_TEST(log, "Query limit exceeded, space reservation failed, "
+                     "recache_on_query_limit_exceeded is disabled (while reserving for {}:{})",
+                     file_segment.key(), file_segment.offset());
+            return false;
+        }
+
+        LOG_TEST(
+            log, "Using query limit, current usage: {}/{} (while reserving for {}:{})",
+            query_priority->getSize(cache_lock), query_priority->getSizeLimit(),
+            file_segment.key(), file_segment.offset());
+    }
+
+    /// A file_segment_metadata acquires a LRUQueue iterator on first successful space reservation attempt.
+    auto queue_iterator = file_segment.getQueueIterator();
+    chassert(!queue_iterator || file_segment.getReservedSize() > 0);
+
+    struct EvictionCandidates
+    {
+        explicit EvictionCandidates(KeyMetadataPtr key_metadata_) : key_metadata(key_metadata_) {}
+
+        void add(FileSegmentMetadataPtr candidate)
+        {
+            candidate->removal_candidate = true;
+            candidates.push_back(candidate);
+        }
+
+        ~EvictionCandidates()
+        {
+            /// If failed to reserve space, we don't delete the candidates but drop the flag instead
+            /// so the segments can be used again
+            for (const auto & candidate : candidates)
+                candidate->removal_candidate = false;
+        }
+
+        KeyMetadataPtr key_metadata;
+        std::vector<FileSegmentMetadataPtr> candidates;
     };
 
-    std::vector<FileSegmentCell *> to_evict;
-    std::vector<FileSegmentCell *> trash;
+    std::unordered_map<Key, EvictionCandidates> to_delete;
+    size_t freeable_space = 0, freeable_count = 0;
 
-    for (auto it = main_priority->getLowestPriorityReadIterator(cache_lock); it->valid(); it->next())
+    size_t removed_size = 0;
+    auto iterate_func = [&](LockedKey & locked_key, FileSegmentMetadataPtr segment_metadata)
     {
-        const auto & entry_key = it->key();
-        auto entry_offset = it->offset();
+        chassert(segment_metadata->file_segment->assertCorrectness());
 
-        if (!is_overflow())
-            break;
+        const bool is_persistent = allow_persistent_files && segment_metadata->file_segment->isPersistent();
+        const bool releasable = segment_metadata->releasable() && !is_persistent;
 
-        auto * cell = getCell(entry_key, entry_offset, cache_lock);
-        if (!cell)
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Cache became inconsistent. Key: {}, offset: {}",
-                key.toString(), offset);
-
-        size_t cell_size = cell->size();
-        assert(it->size() == cell_size);
-
-        /// It is guaranteed that cell is not removed from cache as long as
-        /// pointer to corresponding file segment is hold by any other thread.
-
-        if (cell->releasable())
+        if (releasable)
         {
-            auto & file_segment = cell->file_segment;
-
-            if (file_segment->isPersistent() && allow_persistent_files)
+            auto segment = segment_metadata->file_segment;
+            if (segment->state() == FileSegment::State::DOWNLOADED)
             {
-                LOG_DEBUG(log, "File segment will not be removed, because it is persistent: {}", file_segment->getInfoForLog());
-                continue;
+                const auto & key = segment->key();
+
+                auto it = to_delete.find(key);
+                if (it == to_delete.end())
+                    it = to_delete.emplace(key, locked_key.getKeyMetadata()).first;
+                it->second.add(segment_metadata);
+
+                freeable_space += segment_metadata->size();
+                freeable_count += 1;
+
+                return PriorityIterationResult::CONTINUE;
             }
 
-            std::lock_guard segment_lock(file_segment->mutex);
+            /// TODO: we can resize if partially downloaded instead.
+            locked_key.removeFileSegment(segment->offset(), segment->lock());
+            return PriorityIterationResult::REMOVE_AND_CONTINUE;
+        }
+        return PriorityIterationResult::CONTINUE;
+    };
 
-            switch (file_segment->download_state)
-            {
-                case FileSegment::State::DOWNLOADED:
-                {
-                    /// Cell will actually be removed only if
-                    /// we managed to reserve enough space.
+    if (query_priority)
+    {
+        auto is_query_priority_overflow = [&]
+        {
+            const size_t new_size = query_priority->getSize(cache_lock) + size - freeable_space;
+            return new_size > query_priority->getSizeLimit();
+        };
 
-                    to_evict.push_back(cell);
-                    break;
-                }
-                default:
-                {
-                    trash.push_back(cell);
-                    break;
-                }
-            }
+        if (is_query_priority_overflow())
+        {
+            query_priority->iterate(
+                [&](LockedKey & locked_key, FileSegmentMetadataPtr segment_metadata)
+                { return is_query_priority_overflow() ? iterate_func(locked_key, segment_metadata) : PriorityIterationResult::BREAK; },
+                cache_lock);
 
-            removed_size += cell_size;
-            --queue_size;
+            if (is_query_priority_overflow())
+                return false;
+        }
+
+        LOG_TEST(
+            log, "Query limits satisfied (while reserving for {}:{})",
+            file_segment.key(), file_segment.offset());
+    }
+
+    auto is_main_priority_overflow = [&]
+    {
+        /// max_size == 0 means unlimited cache size,
+        /// max_element_size == 0 means unlimited number of cache elements.
+        const bool is_overflow = (main_priority->getSizeLimit() != 0
+                                  && (main_priority->getSize(cache_lock) + size - freeable_space > main_priority->getSizeLimit()))
+            || (main_priority->getElementsLimit() != 0
+                && freeable_count == 0 && main_priority->getElementsCount(cache_lock) == main_priority->getElementsLimit());
+
+        LOG_TEST(
+            log, "Overflow: {}, size: {}, ready to remove: {}, current cache size: {}/{}, elements: {}/{}, while reserving for {}:{}",
+            is_overflow, size, removed_size,
+            main_priority->getSize(cache_lock), main_priority->getSizeLimit(),
+            main_priority->getElementsCount(cache_lock), main_priority->getElementsLimit(),
+            file_segment.key(), file_segment.offset());
+
+        return is_overflow;
+    };
+
+    if (is_main_priority_overflow())
+    {
+        main_priority->iterate(
+            [&](LockedKey & locked_key, FileSegmentMetadataPtr segment_metadata)
+            { return is_main_priority_overflow() ? iterate_func(locked_key, segment_metadata) : PriorityIterationResult::BREAK; },
+            cache_lock);
+
+        if (is_main_priority_overflow())
+            return false;
+    }
+
+    if (!file_segment.getKeyMetadata()->createBaseDirectory())
+        return false;
+
+    for (auto & [current_key, deletion_info] : to_delete)
+    {
+        auto locked_key = deletion_info.key_metadata->tryLock();
+        if (!locked_key)
+            continue; /// key could become invalid after we released the key lock above, just skip it.
+
+        /// delete from vector in reverse order just for efficiency
+        auto & candidates = deletion_info.candidates;
+        while (!candidates.empty())
+        {
+            auto & candidate = candidates.back();
+            chassert(candidate->releasable());
+
+            const auto * segment = candidate->file_segment.get();
+            locked_key->removeFileSegment(segment->offset(), segment->lock());
+            segment->getQueueIterator()->remove(cache_lock);
+
+            if (query_context)
+                query_context->remove(current_key, segment->offset(), cache_lock);
+
+            candidates.pop_back();
         }
     }
 
-    /// This case is very unlikely, can happen in case of exception from
-    /// file_segment->complete(), which would be a logical error.
-    assert(trash.empty());
-    for (auto & cell : trash)
+    /// queue_iteratir is std::nullopt here if no space has been reserved yet, a file_segment_metadata
+    /// acquires queue iterator on first successful space reservation attempt.
+    /// If queue iterator already exists, we need to update the size after each space reservation.
+    if (queue_iterator)
     {
-        if (auto file_segment = cell->file_segment)
-            remove(file_segment, cache_lock);
+        queue_iterator->updateSize(size);
+    }
+    else
+    {
+        /// Space reservation is incremental, so file_segment_metadata is created first (with state empty),
+        /// and getQueueIterator() is assigned on first space reservation attempt.
+        queue_iterator = main_priority->add(file_segment.getKeyMetadata(), file_segment.offset(), size, cache_lock);
+        file_segment.setQueueIterator(queue_iterator);
     }
 
-    if (is_overflow())
-        return false;
-
-    /// cache cell is nullptr on server startup because we first check for space and then add a cell.
-    if (cell_for_reserve)
-    {
-        /// queue_iteratir is std::nullopt here if no space has been reserved yet, a cache cell
-        /// acquires queue iterator on first successful space reservation attempt.
-        /// If queue iterator already exists, we need to update the size after each space reservation.
-        auto queue_iterator = cell_for_reserve->queue_iterator;
-        if (queue_iterator)
-            queue_iterator->incrementSize(size, cache_lock);
-        else
-            cell_for_reserve->queue_iterator = main_priority->add(key, offset, size, cache_lock);
-    }
-
-    for (auto & cell : to_evict)
-    {
-        if (auto file_segment = cell->file_segment)
-            remove(file_segment, cache_lock);
-    }
-
-    if (main_priority->getCacheSize(cache_lock) > (1ull << 63))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache became inconsistent. There must be a bug");
+    file_segment.reserved_size += size;
+    chassert(file_segment.reserved_size == queue_iterator->getEntry().size);
 
     if (query_context)
-        query_context->reserve(key, offset, size, cache_lock);
+    {
+        auto query_queue_it = query_context->tryGet(file_segment.key(), file_segment.offset(), cache_lock);
+        if (query_queue_it)
+            query_queue_it->updateSize(size);
+        else
+            query_context->add(file_segment.getKeyMetadata(), file_segment.offset(), size, cache_lock);
+    }
+
+    if (main_priority->getSize(cache_lock) > (1ull << 63))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache became inconsistent. There must be a bug");
 
     return true;
 }
 
-void FileCache::removeIfExists(const Key & key)
+void FileCache::removeKeyIfExists(const Key & key)
 {
-    std::lock_guard cache_lock(mutex);
+    assertInitialized();
 
-    assertInitialized(cache_lock);
-
-    auto it = files.find(key);
-    if (it == files.end())
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::RETURN_NULL);
+    if (!locked_key)
         return;
 
-    auto & offsets = it->second;
-
-    std::vector<FileSegmentCell *> to_remove;
-    to_remove.reserve(offsets.size());
-
-    for (auto & [offset, cell] : offsets)
-        to_remove.push_back(&cell);
-
-    bool some_cells_were_skipped = false;
-    for (auto & cell : to_remove)
-    {
-        /// In ordinary case we remove data from cache when it's not used by anyone.
-        /// But if we have multiple replicated zero-copy tables on the same server
-        /// it became possible to start removing something from cache when it is used
-        /// by other "zero-copy" tables. That is why it's not an error.
-        if (!cell->releasable())
-        {
-            some_cells_were_skipped = true;
-            continue;
-        }
-
-        auto file_segment = cell->file_segment;
-        if (file_segment)
-        {
-            std::unique_lock<std::mutex> segment_lock(file_segment->mutex);
-            file_segment->detach(cache_lock, segment_lock);
-            remove(file_segment->key(), file_segment->offset(), cache_lock, segment_lock);
-        }
-    }
-
-    if (!some_cells_were_skipped)
-    {
-        files.erase(key);
-        removeKeyDirectoryIfExists(key, cache_lock);
-    }
+    /// In ordinary case we remove data from cache when it's not used by anyone.
+    /// But if we have multiple replicated zero-copy tables on the same server
+    /// it became possible to start removing something from cache when it is used
+    /// by other "zero-copy" tables. That is why it's not an error.
+    locked_key->removeAllReleasable();
 }
 
-void FileCache::removeIfReleasable()
+void FileCache::removeAllReleasable()
 {
-    /// Try remove all cached files by cache_base_path.
+    assertInitialized();
+
     /// Only releasable file segments are evicted.
     /// `remove_persistent_files` defines whether non-evictable by some criteria files
     /// (they do not comply with the cache eviction policy) should also be removed.
 
-    std::lock_guard cache_lock(mutex);
+    auto lock = cache_guard.lock();
 
-    std::vector<FileSegmentPtr> to_remove;
-    for (auto it = main_priority->getLowestPriorityReadIterator(cache_lock); it->valid(); it->next())
+    main_priority->iterate([&](LockedKey & locked_key, FileSegmentMetadataPtr segment_metadata)
     {
-        const auto & key = it->key();
-        auto offset = it->offset();
-
-        auto * cell = getCell(key, offset, cache_lock);
-        if (!cell)
+        if (segment_metadata->releasable())
         {
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Cache is in inconsistent state: LRU queue contains entries with no cache cell");
+            auto file_segment = segment_metadata->file_segment;
+            locked_key.removeFileSegment(file_segment->offset(), file_segment->lock());
+            return PriorityIterationResult::REMOVE_AND_CONTINUE;
         }
+        return PriorityIterationResult::CONTINUE;
+    }, lock);
 
-        if (cell->releasable())
-        {
-            auto file_segment = cell->file_segment;
-
-            if (file_segment)
-            {
-                to_remove.emplace_back(file_segment);
-            }
-        }
-    }
-
-    for (auto & file_segment : to_remove)
+    if (stash)
     {
-        std::unique_lock segment_lock(file_segment->mutex);
-        file_segment->detach(cache_lock, segment_lock);
-        remove(file_segment->key(), file_segment->offset(), cache_lock, segment_lock);
-    }
-
-    /// Remove all access information.
-    stash_records.clear();
-    stash_priority->removeAll(cache_lock);
-
-#ifndef NDEBUG
-    assertCacheCorrectness(cache_lock);
-#endif
-}
-
-void FileCache::remove(FileSegmentPtr file_segment, std::lock_guard<std::mutex> & cache_lock)
-{
-    std::unique_lock segment_lock(file_segment->mutex);
-    remove(file_segment->key(), file_segment->offset(), cache_lock, segment_lock);
-}
-
-void FileCache::remove(
-    Key key, size_t offset,
-    std::lock_guard<std::mutex> & cache_lock, std::unique_lock<std::mutex> & /* segment_lock */)
-{
-    LOG_DEBUG(log, "Remove from cache. Key: {}, offset: {}", key.toString(), offset);
-
-    String cache_file_path;
-
-    {
-        auto * cell = getCell(key, offset, cache_lock);
-        if (!cell)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "No cache cell for key: {}, offset: {}", key.toString(), offset);
-
-        if (cell->queue_iterator)
-        {
-            cell->queue_iterator->removeAndGetNext(cache_lock);
-        }
-
-        cache_file_path = cell->file_segment->getPathInLocalCache();
-    }
-
-    auto & offsets = files[key];
-    offsets.erase(offset);
-
-    if (fs::exists(cache_file_path))
-    {
-        try
-        {
-            fs::remove(cache_file_path);
-
-            if (is_initialized && offsets.empty())
-            {
-                files.erase(key);
-                removeKeyDirectoryIfExists(key, cache_lock);
-            }
-        }
-        catch (...)
-        {
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Removal of cached file failed. Key: {}, offset: {}, path: {}, error: {}",
-                key.toString(), offset, cache_file_path, getCurrentExceptionMessage(false));
-        }
+        /// Remove all access information.
+        stash->records.clear();
+        stash->queue->removeAll(lock);
     }
 }
 
-void FileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock)
+void FileCache::loadMetadata()
 {
-    Key key;
+    auto lock = cache_guard.lock();
+
     UInt64 offset = 0;
     size_t size = 0;
-    std::vector<std::pair<IFileCachePriority::WriteIterator, std::weak_ptr<FileSegment>>> queue_entries;
+    std::vector<std::pair<PriorityIterator, std::weak_ptr<FileSegment>>> queue_entries;
 
     /// cache_base_path / key_prefix / key / offset
-    if (!files.empty())
+    if (!metadata.empty())
+    {
         throw Exception(
             ErrorCodes::LOGICAL_ERROR,
             "Cache initialization is partially made. "
             "This can be a result of a failed first attempt to initialize cache. "
             "Please, check log for error messages");
+    }
 
-    fs::directory_iterator key_prefix_it{cache_base_path};
-    for (; key_prefix_it != fs::directory_iterator(); ++key_prefix_it)
+    size_t total_size = 0;
+    for (auto key_prefix_it = fs::directory_iterator{metadata.getBaseDirectory()};
+         key_prefix_it != fs::directory_iterator();)
     {
-        if (!key_prefix_it->is_directory())
+        const fs::path key_prefix_directory = key_prefix_it->path();
+        key_prefix_it++;
+
+        if (!fs::is_directory(key_prefix_directory))
         {
-            if (key_prefix_it->path().filename() != "status")
-                LOG_DEBUG(log, "Unexpected file {} (not a directory), will skip it", key_prefix_it->path().string());
+            if (key_prefix_directory.filename() != "status")
+            {
+                LOG_WARNING(
+                    log, "Unexpected file {} (not a directory), will skip it",
+                    key_prefix_directory.string());
+            }
             continue;
         }
 
-        fs::directory_iterator key_it{key_prefix_it->path()};
-        for (; key_it != fs::directory_iterator(); ++key_it)
+        if (fs::is_empty(key_prefix_directory))
         {
-            if (!key_it->is_directory())
+            LOG_DEBUG(log, "Removing empty key prefix directory: {}", key_prefix_directory.string());
+            fs::remove(key_prefix_directory);
+            continue;
+        }
+
+        for (fs::directory_iterator key_it{key_prefix_directory}; key_it != fs::directory_iterator();)
+        {
+            const fs::path key_directory = key_it->path();
+            ++key_it;
+
+            if (!fs::is_directory(key_directory))
             {
-                LOG_DEBUG(log, "Unexpected file: {}. Expected a directory", key_it->path().string());
+                LOG_DEBUG(
+                    log,
+                    "Unexpected file: {} (not a directory). Expected a directory",
+                    key_directory.string());
                 continue;
             }
 
-            key = Key(unhexUInt<UInt128>(key_it->path().filename().string().data()));
-            fs::directory_iterator offset_it{key_it->path()};
-            for (; offset_it != fs::directory_iterator(); ++offset_it)
+            if (fs::is_empty(key_directory))
+            {
+                LOG_DEBUG(log, "Removing empty key directory: {}", key_directory.string());
+                fs::remove(key_directory);
+                continue;
+            }
+
+            const auto key = Key(unhexUInt<UInt128>(key_directory.filename().string().data()));
+            auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::CREATE_EMPTY, /* is_initial_load */true);
+
+            for (fs::directory_iterator offset_it{key_directory}; offset_it != fs::directory_iterator(); ++offset_it)
             {
                 auto offset_with_suffix = offset_it->path().filename().string();
                 auto delim_pos = offset_with_suffix.find('_');
@@ -1056,7 +863,9 @@ void FileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock
                 {
                     parsed = tryParse<UInt64>(offset, offset_with_suffix.substr(0, delim_pos));
                     if (offset_with_suffix.substr(delim_pos+1) == "persistent")
+                    {
                         segment_kind = FileSegmentKind::Persistent;
+                    }
                     if (offset_with_suffix.substr(delim_pos+1) == "temporary")
                     {
                         fs::remove(offset_it->path());
@@ -1077,21 +886,27 @@ void FileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock
                     continue;
                 }
 
-                if (tryReserve(key, offset, size, cache_lock))
+                if ((main_priority->getSizeLimit() == 0 || main_priority->getSize(lock) + size <= main_priority->getSizeLimit())
+                    && (main_priority->getElementsLimit() == 0 || main_priority->getElementsCount(lock) + 1 <= main_priority->getElementsLimit()))
                 {
-                    auto * cell = addCell(
-                        key, offset, size, FileSegment::State::DOWNLOADED,
-                        CreateFileSegmentSettings(segment_kind), cache_lock);
+                    auto file_segment_metadata_it = addFileSegment(
+                        *locked_key, offset, size, FileSegment::State::DOWNLOADED, CreateFileSegmentSettings(segment_kind), &lock);
 
-                    if (cell)
-                        queue_entries.emplace_back(cell->queue_iterator, cell->file_segment);
+                    const auto & file_segment_metadata = file_segment_metadata_it->second;
+                    chassert(file_segment_metadata->file_segment->assertCorrectness());
+                    total_size += size;
+
+                    queue_entries.emplace_back(
+                        file_segment_metadata->getQueueIterator(),
+                        file_segment_metadata->file_segment);
                 }
                 else
                 {
                     LOG_WARNING(
                         log,
-                        "Cache capacity changed (max size: {}, available: {}), cached file `{}` does not fit in cache anymore (size: {})",
-                        max_size, getAvailableCacheSizeUnlocked(cache_lock), key_it->path().string(), size);
+                        "Cache capacity changed (max size: {}, used: {}), "
+                        "cached file `{}` does not fit in cache anymore (size: {})",
+                        main_priority->getSizeLimit(), main_priority->getSize(lock), key_directory.string(), size);
 
                     fs::remove(offset_it->path());
                 }
@@ -1099,252 +914,142 @@ void FileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock
         }
     }
 
-    /// Shuffle cells to have random order in LRUQueue as at startup all cells have the same priority.
+    chassert(total_size == main_priority->getSize(lock));
+    chassert(total_size <= main_priority->getSizeLimit());
+
+    /// Shuffle file_segment_metadatas to have random order in LRUQueue
+    /// as at startup all file_segment_metadatas have the same priority.
     pcg64 generator(randomSeed());
     std::shuffle(queue_entries.begin(), queue_entries.end(), generator);
-    for (const auto & [it, file_segment] : queue_entries)
+    for (auto & [it, file_segment] : queue_entries)
     {
-        /// Cell cache size changed and, for example, 1st file segment fits into cache
+        /// Cache size changed and, for example, 1st file segment fits into cache
         /// and 2nd file segment will fit only if first was evicted, then first will be removed and
-        /// cell is nullptr here.
+        /// file_segment_metadata is nullptr here.
         if (file_segment.expired())
             continue;
 
-        it->use(cache_lock);
+        it->use(lock);
     }
+}
+
+FileCache::~FileCache()
+{
+    deactivateBackgroundOperations();
+}
+
+void FileCache::deactivateBackgroundOperations()
+{
+    if (cleanup_task)
+        cleanup_task->deactivate();
+}
+
+void FileCache::cleanup()
+{
+    metadata.doCleanup();
+}
+
+void FileCache::cleanupThreadFunc()
+{
 #ifndef NDEBUG
-    assertCacheCorrectness(cache_lock);
+    assertCacheCorrectness();
 #endif
-}
 
-void FileCache::reduceSizeToDownloaded(
-    const Key & key, size_t offset,
-    std::lock_guard<std::mutex> & cache_lock, std::unique_lock<std::mutex> & segment_lock)
-{
-    /**
-     * In case file was partially downloaded and it's download cannot be continued
-     * because of no space left in cache, we need to be able to cut cell's size to downloaded_size.
-     */
-
-    auto * cell = getCell(key, offset, cache_lock);
-
-    if (!cell)
+    try
     {
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "No cell found for key: {}, offset: {}",
-            key.toString(), offset);
+        cleanup();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
     }
 
-    const auto & file_segment = cell->file_segment;
-
-    size_t downloaded_size = file_segment->downloaded_size;
-    size_t full_size = file_segment->range().size();
-
-    if (downloaded_size == full_size)
-    {
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Nothing to reduce, file segment fully downloaded: {}",
-            file_segment->getInfoForLogUnlocked(segment_lock));
-    }
-
-    CreateFileSegmentSettings create_settings(file_segment->getKind());
-
-    cell->file_segment = std::make_shared<FileSegment>(
-        offset, downloaded_size, key, this, FileSegment::State::DOWNLOADED, create_settings);
-
-    assert(file_segment->reserved_size == downloaded_size);
+    cleanup_task->scheduleAfter(delayed_cleanup_interval_ms);
 }
 
-bool FileCache::isLastFileSegmentHolder(
-    const Key & key, size_t offset,
-    std::lock_guard<std::mutex> & cache_lock, std::unique_lock<std::mutex> & /* segment_lock */)
+FileSegmentsHolderPtr FileCache::getSnapshot()
 {
-    auto * cell = getCell(key, offset, cache_lock);
-
-    if (!cell)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "No cell found for key: {}, offset: {}", key.toString(), offset);
-
-    /// The caller of this method is last file segment holder if use count is 2 (the second pointer is cache itself)
-    return cell->file_segment.use_count() == 2;
-}
-
-FileSegments FileCache::getSnapshot() const
-{
-    std::lock_guard cache_lock(mutex);
+    assertInitialized();
+#ifndef NDEBUG
+    assertCacheCorrectness();
+#endif
 
     FileSegments file_segments;
-
-    for (const auto & [key, cells_by_offset] : files)
+    metadata.iterate([&](const LockedKey & locked_key)
     {
-        for (const auto & [offset, cell] : cells_by_offset)
-            file_segments.push_back(FileSegment::getSnapshot(cell.file_segment, cache_lock));
-    }
-    return file_segments;
+        for (const auto & [_, file_segment_metadata] : locked_key)
+            file_segments.push_back(FileSegment::getSnapshot(file_segment_metadata->file_segment));
+    });
+    return std::make_unique<FileSegmentsHolder>(std::move(file_segments), /* complete_on_dtor */false);
+}
+
+FileSegmentsHolderPtr FileCache::getSnapshot(const Key & key)
+{
+    FileSegments file_segments;
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::THROW);
+    for (const auto & [_, file_segment_metadata] : *locked_key->getKeyMetadata())
+        file_segments.push_back(FileSegment::getSnapshot(file_segment_metadata->file_segment));
+    return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
+}
+
+FileSegmentsHolderPtr FileCache::dumpQueue()
+{
+    assertInitialized();
+
+    FileSegments file_segments;
+    main_priority->iterate([&](LockedKey &, FileSegmentMetadataPtr segment_metadata)
+    {
+        file_segments.push_back(FileSegment::getSnapshot(segment_metadata->file_segment));
+        return PriorityIterationResult::CONTINUE;
+    }, cache_guard.lock());
+
+    return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
 }
 
 std::vector<String> FileCache::tryGetCachePaths(const Key & key)
 {
-    std::lock_guard cache_lock(mutex);
+    assertInitialized();
+
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::RETURN_NULL);
+    if (!locked_key)
+        return {};
 
     std::vector<String> cache_paths;
 
-    const auto & cells_by_offset = files[key];
-
-    for (const auto & [offset, cell] : cells_by_offset)
+    for (const auto & [offset, file_segment_metadata] : *locked_key->getKeyMetadata())
     {
-        if (cell.file_segment->state() == FileSegment::State::DOWNLOADED)
-            cache_paths.push_back(getPathInLocalCache(key, offset, cell.file_segment->getKind()));
+        if (file_segment_metadata->file_segment->state() == FileSegment::State::DOWNLOADED)
+            cache_paths.push_back(metadata.getPathInLocalCache(key, offset, file_segment_metadata->file_segment->getKind()));
     }
-
     return cache_paths;
 }
 
 size_t FileCache::getUsedCacheSize() const
 {
-    std::lock_guard cache_lock(mutex);
-    return getUsedCacheSizeUnlocked(cache_lock);
-}
-
-size_t FileCache::getUsedCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const
-{
-    return main_priority->getCacheSize(cache_lock);
-}
-
-size_t FileCache::getAvailableCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const
-{
-    return max_size - getUsedCacheSizeUnlocked(cache_lock);
+    return main_priority->getSize(cache_guard.lock());
 }
 
 size_t FileCache::getFileSegmentsNum() const
 {
-    std::lock_guard cache_lock(mutex);
-    return getFileSegmentsNumUnlocked(cache_lock);
+    return main_priority->getElementsCount(cache_guard.lock());
 }
 
-size_t FileCache::getFileSegmentsNumUnlocked(std::lock_guard<std::mutex> & cache_lock) const
+void FileCache::assertCacheCorrectness()
 {
-    return main_priority->getElementsNum(cache_lock);
-}
-
-FileCache::FileSegmentCell::FileSegmentCell(
-    FileSegmentPtr file_segment_,
-    FileCache * cache,
-    std::lock_guard<std::mutex> & cache_lock)
-    : file_segment(file_segment_)
-{
-    /**
-     * Cell can be created with either DOWNLOADED or EMPTY file segment's state.
-     * File segment acquires DOWNLOADING state and creates LRUQueue iterator on first
-     * successful getOrSetDownaloder call.
-     */
-
-    switch (file_segment->download_state)
+    auto lock = cache_guard.lock();
+    main_priority->iterate([&](LockedKey &, FileSegmentMetadataPtr segment_metadata)
     {
-        case FileSegment::State::DOWNLOADED:
-        {
-            queue_iterator = cache->main_priority->add(
-                file_segment->key(), file_segment->offset(), file_segment->range().size(), cache_lock);
-            break;
-        }
-        case FileSegment::State::SKIP_CACHE:
-        case FileSegment::State::EMPTY:
-        case FileSegment::State::DOWNLOADING:
-        {
-            break;
-        }
-        default:
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Can create cell with either EMPTY, DOWNLOADED, DOWNLOADING state, got: {}",
-                FileSegment::stateToString(file_segment->download_state));
-    }
-}
-
-String FileCache::dumpStructure(const Key & key)
-{
-    std::lock_guard cache_lock(mutex);
-    return dumpStructureUnlocked(key, cache_lock);
-}
-
-String FileCache::dumpStructureUnlocked(const Key & key, std::lock_guard<std::mutex> &)
-{
-    WriteBufferFromOwnString result;
-    const auto & cells_by_offset = files[key];
-
-    for (const auto & [offset, cell] : cells_by_offset)
-        result << cell.file_segment->getInfoForLog() << "\n";
-
-    return result.str();
-}
-
-void FileCache::assertCacheCellsCorrectness(
-    const FileSegmentsByOffset & cells_by_offset, [[maybe_unused]] std::lock_guard<std::mutex> & cache_lock)
-{
-    for (const auto & [_, cell] : cells_by_offset)
-    {
-        const auto & file_segment = cell.file_segment;
-        file_segment->assertCorrectness();
-
-        if (file_segment->reserved_size != 0)
-        {
-            assert(cell.queue_iterator);
-            assert(main_priority->contains(file_segment->key(), file_segment->offset(), cache_lock));
-        }
-    }
-}
-
-void FileCache::assertCacheCorrectness(const Key & key, std::lock_guard<std::mutex> & cache_lock)
-{
-    assertCacheCellsCorrectness(files[key], cache_lock);
-    assertPriorityCorrectness(cache_lock);
-}
-
-void FileCache::assertCacheCorrectness(std::lock_guard<std::mutex> & cache_lock)
-{
-    for (const auto & [key, cells_by_offset] : files)
-        assertCacheCellsCorrectness(files[key], cache_lock);
-    assertPriorityCorrectness(cache_lock);
-}
-
-void FileCache::assertPriorityCorrectness(std::lock_guard<std::mutex> & cache_lock)
-{
-    [[maybe_unused]] size_t total_size = 0;
-    for (auto it = main_priority->getLowestPriorityReadIterator(cache_lock); it->valid(); it->next())
-    {
-        const auto & key = it->key();
-        auto offset = it->offset();
-        auto size = it->size();
-
-        auto * cell = getCell(key, offset, cache_lock);
-        if (!cell)
-        {
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Cache is in inconsistent state: LRU queue contains entries with no cache cell (assertCorrectness())");
-        }
-
-        if (cell->size() != size)
-        {
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Expected {} == {} size ({})",
-                cell->size(), size, cell->file_segment->getInfoForLog());
-        }
-
-        total_size += size;
-    }
-
-    assert(total_size == main_priority->getCacheSize(cache_lock));
-    assert(main_priority->getCacheSize(cache_lock) <= max_size);
-    assert(main_priority->getElementsNum(cache_lock) <= max_element_size);
+        const auto & file_segment = *segment_metadata->file_segment;
+        UNUSED(file_segment);
+        chassert(file_segment.assertCorrectness());
+        return PriorityIterationResult::CONTINUE;
+    }, lock);
 }
 
 FileCache::QueryContextHolder::QueryContextHolder(
     const String & query_id_,
     FileCache * cache_,
-    FileCache::QueryContextPtr context_)
+    FileCacheQueryLimit::QueryContextPtr context_)
     : query_id(query_id_)
     , cache(cache_)
     , context(context_)
@@ -1356,115 +1061,21 @@ FileCache::QueryContextHolder::~QueryContextHolder()
     /// If only the query_map and the current holder hold the context_query,
     /// the query has been completed and the query_context is released.
     if (context && context.use_count() == 2)
-        cache->removeQueryContext(query_id);
-}
-
-FileCache::QueryContextPtr FileCache::getCurrentQueryContext(std::lock_guard<std::mutex> & cache_lock)
-{
-    if (!isQueryInitialized())
-        return nullptr;
-
-    return getQueryContext(std::string(CurrentThread::getQueryId()), cache_lock);
-}
-
-FileCache::QueryContextPtr FileCache::getQueryContext(const String & query_id, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    auto query_iter = query_map.find(query_id);
-    return (query_iter == query_map.end()) ? nullptr : query_iter->second;
-}
-
-void FileCache::removeQueryContext(const String & query_id)
-{
-    std::lock_guard cache_lock(mutex);
-    auto query_iter = query_map.find(query_id);
-
-    if (query_iter == query_map.end())
     {
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Attempt to release query context that does not exist (query_id: {})",
-            query_id);
+        auto lock = cache->cache_guard.lock();
+        cache->query_limit->removeQueryContext(query_id, lock);
     }
-
-    query_map.erase(query_iter);
 }
 
-FileCache::QueryContextPtr FileCache::getOrSetQueryContext(
-    const String & query_id, const ReadSettings & settings, std::lock_guard<std::mutex> & cache_lock)
+FileCache::QueryContextHolderPtr FileCache::getQueryContextHolder(
+    const String & query_id, const ReadSettings & settings)
 {
-    if (query_id.empty())
-        return nullptr;
-
-    auto context = getQueryContext(query_id, cache_lock);
-    if (context)
-        return context;
-
-    auto query_context = std::make_shared<QueryContext>(settings.filesystem_cache_max_download_size, settings.skip_download_if_exceeds_query_cache);
-    auto query_iter = query_map.emplace(query_id, query_context).first;
-    return query_iter->second;
-}
-
-FileCache::QueryContextHolder FileCache::getQueryContextHolder(const String & query_id, const ReadSettings & settings)
-{
-    std::lock_guard cache_lock(mutex);
-
-    if (!enable_filesystem_query_cache_limit || settings.filesystem_cache_max_download_size == 0)
+    if (!query_limit || settings.filesystem_cache_max_download_size == 0)
         return {};
 
-    /// if enable_filesystem_query_cache_limit is true, and filesystem_cache_max_download_size large than zero,
-    /// we create context query for current query.
-    auto context = getOrSetQueryContext(query_id, settings, cache_lock);
-    return QueryContextHolder(query_id, this, context);
-}
-
-void FileCache::QueryContext::remove(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (cache_size < size)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Deleted cache size exceeds existing cache size");
-
-    if (!skip_download_if_exceeds_query_cache)
-    {
-        auto record = records.find({key, offset});
-        if (record != records.end())
-        {
-            record->second->removeAndGetNext(cache_lock);
-            records.erase({key, offset});
-        }
-    }
-    cache_size -= size;
-}
-
-void FileCache::QueryContext::reserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (cache_size + size > max_cache_size)
-    {
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Reserved cache size exceeds the remaining cache size (key: {}, offset: {})",
-            key.toString(), offset);
-    }
-
-    if (!skip_download_if_exceeds_query_cache)
-    {
-        auto record = records.find({key, offset});
-        if (record == records.end())
-        {
-            auto queue_iter = priority->add(key, offset, 0, cache_lock);
-            record = records.insert({{key, offset}, queue_iter}).first;
-        }
-        record->second->incrementSize(size, cache_lock);
-    }
-    cache_size += size;
-}
-
-void FileCache::QueryContext::use(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (skip_download_if_exceeds_query_cache)
-        return;
-
-    auto record = records.find({key, offset});
-    if (record != records.end())
-        record->second->use(cache_lock);
+    auto lock = cache_guard.lock();
+    auto context = query_limit->getOrSetQueryContext(query_id, settings, lock);
+    return std::make_unique<QueryContextHolder>(query_id, this, std::move(context));
 }
 
 }
diff --git a/src/Interpreters/Cache/FileCache.h b/src/Interpreters/Cache/FileCache.h
index afafa39c4c6..2ceb6825a54 100644
--- a/src/Interpreters/Cache/FileCache.h
+++ b/src/Interpreters/Cache/FileCache.h
@@ -9,44 +9,52 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <boost/functional/hash.hpp>
-#include <boost/noncopyable.hpp>
 
-#include <Core/Types.h>
-#include <Common/logger_useful.h>
-#include <Common/ThreadPool.h>
 #include <IO/ReadSettings.h>
-#include <Interpreters/Cache/IFileCachePriority.h>
-#include <Interpreters/Cache/FileCacheKey.h>
+
+#include <Core/BackgroundSchedulePool.h>
+#include <Interpreters/Cache/LRUFileCachePriority.h>
 #include <Interpreters/Cache/FileCache_fwd.h>
 #include <Interpreters/Cache/FileSegment.h>
+#include <Interpreters/Cache/Metadata.h>
+#include <Interpreters/Cache/QueryLimit.h>
+#include <Interpreters/Cache/FileCache_fwd_internal.h>
+#include <filesystem>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
 /// Local cache for remote filesystem files, represented as a set of non-overlapping non-empty file segments.
 /// Different caching algorithms are implemented using IFileCachePriority.
 class FileCache : private boost::noncopyable
 {
-
-friend class FileSegment;
-friend class IFileCachePriority;
-friend struct FileSegmentsHolder;
-friend class FileSegmentRangeWriter;
-
-struct QueryContext;
-using QueryContextPtr = std::shared_ptr<QueryContext>;
-
 public:
     using Key = DB::FileCacheKey;
+    using QueryLimit = DB::FileCacheQueryLimit;
+    using Priority = IFileCachePriority;
+    using PriorityEntry = IFileCachePriority::Entry;
+    using PriorityIterator = IFileCachePriority::Iterator;
+    using PriorityIterationResult = IFileCachePriority::IterationResult;
 
-    FileCache(const String & cache_base_path_, const FileCacheSettings & cache_settings_);
+    explicit FileCache(const FileCacheSettings & settings);
 
-    ~FileCache() = default;
+    ~FileCache();
 
     void initialize();
 
-    const String & getBasePath() const { return cache_base_path; }
+    const String & getBasePath() const;
+
+    static Key createKeyForPath(const String & path);
+
+    String getPathInLocalCache(const Key & key, size_t offset, FileSegmentKind segment_kind) const;
+
+    String getPathInLocalCache(const Key & key) const;
 
     /**
      * Given an `offset` and `size` representing [offset, offset + size) bytes interval,
@@ -56,11 +64,10 @@ public:
      * Segments in returned list are ordered in ascending order and represent a full contiguous
      * interval (no holes). Each segment in returned list has state: DOWNLOADED, DOWNLOADING or EMPTY.
      *
-     * As long as pointers to returned file segments are hold
+     * As long as pointers to returned file segments are held
      * it is guaranteed that these file segments are not removed from cache.
      */
-    FileSegmentsHolder getOrSet(const Key & key, size_t offset, size_t size, const CreateFileSegmentSettings & settings);
-    FileSegmentsHolder set(const Key & key, size_t offset, size_t size, const CreateFileSegmentSettings & settings);
+    FileSegmentsHolderPtr getOrSet(const Key & key, size_t offset, size_t size, const CreateFileSegmentSettings & settings);
 
     /**
      * Segments in returned list are ordered in ascending order and represent a full contiguous
@@ -71,53 +78,40 @@ public:
      * with the destruction of the holder, while in getOrSet() EMPTY file segments can eventually change
      * it's state (and become DOWNLOADED).
      */
-    FileSegmentsHolder get(const Key & key, size_t offset, size_t size);
+    FileSegmentsHolderPtr get(const Key & key, size_t offset, size_t size);
+
+    FileSegmentsHolderPtr set(const Key & key, size_t offset, size_t size, const CreateFileSegmentSettings & settings);
 
     /// Remove files by `key`. Removes files which might be used at the moment.
-    void removeIfExists(const Key & key);
+    void removeKeyIfExists(const Key & key);
 
     /// Remove files by `key`. Will not remove files which are used at the moment.
-    void removeIfReleasable();
-
-    static Key hash(const String & path);
-
-    String getPathInLocalCache(const Key & key, size_t offset, FileSegmentKind segment_kind) const;
-
-    String getPathInLocalCache(const Key & key) const;
+    void removeAllReleasable();
 
     std::vector<String> tryGetCachePaths(const Key & key);
 
-    size_t capacity() const { return max_size; }
-
     size_t getUsedCacheSize() const;
 
     size_t getFileSegmentsNum() const;
 
-    static bool isReadOnly();
+    size_t getMaxFileSegmentSize() const { return max_file_segment_size; }
 
-    /**
-     * Create a file segment of exactly requested size with EMPTY state.
-     * Throw exception if requested size exceeds max allowed file segment size.
-     * This method is for protected usage: file segment range writer uses it
-     * to dynamically allocate file segments.
-     */
-    FileSegmentPtr createFileSegmentForDownload(
-         const Key & key,
-         size_t offset,
-         size_t size,
-         const CreateFileSegmentSettings & create_settings,
-         std::lock_guard<std::mutex> & cache_lock);
+    bool tryReserve(FileSegment & file_segment, size_t size);
 
-    FileSegments getSnapshot() const;
+    FileSegmentsHolderPtr getSnapshot();
 
-    /// For debug.
-    String dumpStructure(const Key & key);
+    FileSegmentsHolderPtr getSnapshot(const Key & key);
 
-    /// Save a query context information, and adopt different cache policies
-    /// for different queries through the context cache layer.
+    FileSegmentsHolderPtr dumpQueue();
+
+    void cleanup();
+
+    void deactivateBackgroundOperations();
+
+    /// For per query cache limit.
     struct QueryContextHolder : private boost::noncopyable
     {
-        QueryContextHolder(const String & query_id_, FileCache * cache_, QueryContextPtr context_);
+        QueryContextHolder(const String & query_id_, FileCache * cache_, QueryLimit::QueryContextPtr context_);
 
         QueryContextHolder() = default;
 
@@ -125,198 +119,95 @@ public:
 
         String query_id;
         FileCache * cache = nullptr;
-        QueryContextPtr context;
+        QueryLimit::QueryContextPtr context;
     };
+    using QueryContextHolderPtr = std::unique_ptr<QueryContextHolder>;
+    QueryContextHolderPtr getQueryContextHolder(const String & query_id, const ReadSettings & settings);
 
-    QueryContextHolder getQueryContextHolder(const String & query_id, const ReadSettings & settings);
+    CacheGuard::Lock lockCache() { return cache_guard.lock(); }
 
 private:
-    String cache_base_path;
+    using KeyAndOffset = FileCacheKeyAndOffset;
 
-    const size_t max_size;
-    const size_t max_element_size;
     const size_t max_file_segment_size;
-
     const bool allow_persistent_files;
-    const size_t enable_cache_hits_threshold;
-    const bool enable_filesystem_query_cache_limit;
+    const size_t bypass_cache_threshold = 0;
+    const size_t delayed_cleanup_interval_ms;
 
-    const bool enable_bypass_cache_with_threashold;
-    const size_t bypass_cache_threashold;
-
-    mutable std::mutex mutex;
     Poco::Logger * log;
 
-    bool is_initialized = false;
-    std::exception_ptr initialization_exception;
+    std::exception_ptr init_exception;
+    std::atomic<bool> is_initialized = false;
+    mutable std::mutex init_mutex;
 
-    void assertInitialized(std::lock_guard<std::mutex> & cache_lock) const;
+    CacheMetadata metadata;
 
-    bool tryReserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
+    FileCachePriorityPtr main_priority;
+    mutable CacheGuard cache_guard;
 
-    void remove(
-        Key key,
-        size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::unique_lock<std::mutex> & segment_lock);
-
-    void remove(
-        FileSegmentPtr file_segment,
-        std::lock_guard<std::mutex> & cache_lock);
-
-    bool isLastFileSegmentHolder(
-        const Key & key,
-        size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::unique_lock<std::mutex> & segment_lock);
-
-    void reduceSizeToDownloaded(
-        const Key & key,
-        size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::unique_lock<std::mutex> & segment_lock);
-
-    struct FileSegmentCell : private boost::noncopyable
+    struct HitsCountStash
     {
-        FileSegmentPtr file_segment;
-
-        /// Iterator is put here on first reservation attempt, if successful.
-        IFileCachePriority::WriteIterator queue_iterator;
-
-        /// Pointer to file segment is always hold by the cache itself.
-        /// Apart from pointer in cache, it can be hold by cache users, when they call
-        /// getorSet(), but cache users always hold it via FileSegmentsHolder.
-        bool releasable() const { return file_segment.unique(); }
-
-        size_t size() const { return file_segment->reserved_size; }
-
-        FileSegmentCell(FileSegmentPtr file_segment_, FileCache * cache, std::lock_guard<std::mutex> & cache_lock);
-
-        FileSegmentCell(FileSegmentCell && other) noexcept
-            : file_segment(std::move(other.file_segment)), queue_iterator(std::move(other.queue_iterator)) {}
-    };
-
-    using AccessKeyAndOffset = std::pair<Key, size_t>;
-    struct KeyAndOffsetHash
-    {
-        std::size_t operator()(const AccessKeyAndOffset & key) const
+        HitsCountStash(size_t hits_threashold_, size_t queue_size_)
+            : hits_threshold(hits_threashold_), queue(std::make_unique<LRUFileCachePriority>(0, queue_size_))
         {
-            return std::hash<UInt128>()(key.first.key) ^ std::hash<UInt64>()(key.second);
+            if (!queue_size_)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Queue size for hits queue must be non-zero");
         }
+
+        const size_t hits_threshold;
+        FileCachePriorityPtr queue;
+        using Records = std::unordered_map<KeyAndOffset, PriorityIterator, FileCacheKeyAndOffsetHash>;
+        Records records;
     };
 
-    using FileSegmentsByOffset = std::map<size_t, FileSegmentCell>;
-    using CachedFiles = std::unordered_map<Key, FileSegmentsByOffset>;
-    using FileCacheRecords = std::unordered_map<AccessKeyAndOffset, IFileCachePriority::WriteIterator, KeyAndOffsetHash>;
+    /**
+     * A HitsCountStash allows to cache certain data only after it reached
+     * a certain hit rate, e.g. if hit rate it 5, then data is cached on 6th cache hit.
+     */
+    mutable std::unique_ptr<HitsCountStash> stash;
+    /**
+     * A QueryLimit allows to control cache write limit per query.
+     * E.g. if a query needs n bytes from cache, but it has only k bytes, where 0 <= k <= n
+     * then allowed loaded cache size is std::min(n - k, max_query_cache_size).
+     */
+    FileCacheQueryLimitPtr query_limit;
+    /**
+     * A background cleanup task.
+     * Clears removed cache entries from metadata.
+     */
+    BackgroundSchedulePool::TaskHolder cleanup_task;
 
-    CachedFiles files;
-    std::unique_ptr<IFileCachePriority> main_priority;
+    void assertInitialized() const;
 
-    FileCacheRecords stash_records;
-    std::unique_ptr<IFileCachePriority> stash_priority;
-    size_t max_stash_element_size;
+    void assertCacheCorrectness();
 
-    void loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock);
+    void loadMetadata();
 
-    FileSegments getImpl(const Key & key, const FileSegment::Range & range, std::lock_guard<std::mutex> & cache_lock);
+    FileSegments getImpl(const LockedKey & locked_key, const FileSegment::Range & range) const;
 
-    FileSegmentCell * getCell(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock);
-
-    /// Returns non-owned pointer to the cell stored in the `files` map.
-    /// Doesn't reserve any space.
-    FileSegmentCell * addCell(
-        const Key & key,
+    FileSegments splitRangeIntoFileSegments(
+        LockedKey & locked_key,
         size_t offset,
         size_t size,
         FileSegment::State state,
-        const CreateFileSegmentSettings & create_settings,
-        std::lock_guard<std::mutex> & cache_lock);
-
-    static void useCell(const FileSegmentCell & cell, FileSegments & result, std::lock_guard<std::mutex> & cache_lock);
-
-    bool tryReserveForMainList(
-        const Key & key,
-        size_t offset,
-        size_t size,
-        QueryContextPtr query_context,
-        std::lock_guard<std::mutex> & cache_lock);
-
-    FileSegments splitRangeIntoCells(
-        const Key & key,
-        size_t offset,
-        size_t size,
-        FileSegment::State state,
-        const CreateFileSegmentSettings & create_settings,
-        std::lock_guard<std::mutex> & cache_lock);
-
-    String dumpStructureUnlocked(const Key & key_, std::lock_guard<std::mutex> & cache_lock);
+        const CreateFileSegmentSettings & create_settings);
 
     void fillHolesWithEmptyFileSegments(
+        LockedKey & locked_key,
         FileSegments & file_segments,
-        const Key & key,
         const FileSegment::Range & range,
         bool fill_with_detached_file_segments,
-        const CreateFileSegmentSettings & settings,
-        std::lock_guard<std::mutex> & cache_lock);
+        const CreateFileSegmentSettings & settings);
 
-    size_t getUsedCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
+    KeyMetadata::iterator addFileSegment(
+        LockedKey & locked_key,
+        size_t offset,
+        size_t size,
+        FileSegment::State state,
+        const CreateFileSegmentSettings & create_settings,
+        const CacheGuard::Lock *);
 
-    size_t getAvailableCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
-
-    size_t getFileSegmentsNumUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
-
-    void assertCacheCellsCorrectness(const FileSegmentsByOffset & cells_by_offset, std::lock_guard<std::mutex> & cache_lock);
-
-    void removeKeyDirectoryIfExists(const Key & key, std::lock_guard<std::mutex> & cache_lock) const;
-
-    /// Used to track and control the cache access of each query.
-    /// Through it, we can realize the processing of different queries by the cache layer.
-    struct QueryContext
-    {
-        FileCacheRecords records;
-        FileCachePriorityPtr priority;
-
-        size_t cache_size = 0;
-        size_t max_cache_size;
-
-        bool skip_download_if_exceeds_query_cache;
-
-        QueryContext(size_t max_cache_size_, bool skip_download_if_exceeds_query_cache_)
-            : max_cache_size(max_cache_size_)
-            , skip_download_if_exceeds_query_cache(skip_download_if_exceeds_query_cache_) {}
-
-        size_t getMaxCacheSize() const { return max_cache_size; }
-
-        size_t getCacheSize() const { return cache_size; }
-
-        FileCachePriorityPtr getPriority() const { return priority; }
-
-        bool isSkipDownloadIfExceed() const { return skip_download_if_exceeds_query_cache; }
-
-        void remove(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
-
-        void reserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
-
-        void use(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock);
-    };
-
-    using QueryContextMap = std::unordered_map<String, QueryContextPtr>;
-    QueryContextMap query_map;
-
-    QueryContextPtr getCurrentQueryContext(std::lock_guard<std::mutex> & cache_lock);
-
-    QueryContextPtr getQueryContext(const String & query_id, std::lock_guard<std::mutex> & cache_lock);
-
-    void removeQueryContext(const String & query_id);
-
-    QueryContextPtr getOrSetQueryContext(const String & query_id, const ReadSettings & settings, std::lock_guard<std::mutex> &);
-
-public:
-    void assertCacheCorrectness(const Key & key, std::lock_guard<std::mutex> & cache_lock);
-
-    void assertCacheCorrectness(std::lock_guard<std::mutex> & cache_lock);
-
-    void assertPriorityCorrectness(std::lock_guard<std::mutex> & cache_lock);
+    void cleanupThreadFunc();
 };
 
 }
diff --git a/src/Interpreters/Cache/FileCacheFactory.cpp b/src/Interpreters/Cache/FileCacheFactory.cpp
index e120fe3fc27..0f14da8c88f 100644
--- a/src/Interpreters/Cache/FileCacheFactory.cpp
+++ b/src/Interpreters/Cache/FileCacheFactory.cpp
@@ -15,76 +15,37 @@ FileCacheFactory & FileCacheFactory::instance()
     return ret;
 }
 
-FileCacheFactory::CacheByBasePath FileCacheFactory::getAll()
-{
-    std::lock_guard lock(mutex);
-    return caches_by_path;
-}
-
-const FileCacheSettings & FileCacheFactory::getSettings(const std::string & cache_base_path)
-{
-    std::lock_guard lock(mutex);
-    auto it = caches_by_path.find(cache_base_path);
-    if (it == caches_by_path.end())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No cache found by path: {}", cache_base_path);
-    return it->second->settings;
-
-}
-
-FileCachePtr FileCacheFactory::tryGet(const std::string & cache_base_path)
-{
-    std::lock_guard lock(mutex);
-    auto it = caches_by_path.find(cache_base_path);
-    if (it == caches_by_path.end())
-        return nullptr;
-    return it->second->cache;
-}
-
-FileCachePtr FileCacheFactory::get(const std::string & cache_base_path)
-{
-    auto file_cache_ptr = tryGet(cache_base_path);
-    if (!file_cache_ptr)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No cache found by path: {}", cache_base_path);
-    return file_cache_ptr;
-}
-
-FileCachePtr FileCacheFactory::getOrCreate(
-    const std::string & cache_base_path, const FileCacheSettings & file_cache_settings, const std::string & name)
-{
-    std::lock_guard lock(mutex);
-
-    auto it = caches_by_path.find(cache_base_path);
-    if (it != caches_by_path.end())
-    {
-        caches_by_name.emplace(name, it->second);
-        return it->second->cache;
-    }
-
-    auto cache = std::make_shared<FileCache>(cache_base_path, file_cache_settings);
-    FileCacheData result{cache, file_cache_settings};
-
-    auto cache_it = caches.insert(caches.end(), std::move(result));
-    caches_by_name.emplace(name, cache_it);
-    caches_by_path.emplace(cache_base_path, cache_it);
-
-    return cache;
-}
-
-FileCacheFactory::FileCacheData FileCacheFactory::getByName(const std::string & name)
-{
-    std::lock_guard lock(mutex);
-
-    auto it = caches_by_name.find(name);
-    if (it == caches_by_name.end())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No cache found by name: {}", name);
-
-    return *it->second;
-}
-
-FileCacheFactory::CacheByName FileCacheFactory::getAllByName()
+FileCacheFactory::CacheByName FileCacheFactory::getAll()
 {
     std::lock_guard lock(mutex);
     return caches_by_name;
 }
 
+FileCachePtr FileCacheFactory::getOrCreate(
+    const std::string & cache_name, const FileCacheSettings & file_cache_settings)
+{
+    std::lock_guard lock(mutex);
+
+    auto it = caches_by_name.find(cache_name);
+    if (it == caches_by_name.end())
+    {
+        auto cache = std::make_shared<FileCache>(file_cache_settings);
+        it = caches_by_name.emplace(
+            cache_name, std::make_unique<FileCacheData>(cache, file_cache_settings)).first;
+    }
+
+    return it->second->cache;
+}
+
+FileCacheFactory::FileCacheData FileCacheFactory::getByName(const std::string & cache_name)
+{
+    std::lock_guard lock(mutex);
+
+    auto it = caches_by_name.find(cache_name);
+    if (it == caches_by_name.end())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no cache by name: {}", cache_name);
+
+    return *it->second;
+}
+
 }
diff --git a/src/Interpreters/Cache/FileCacheFactory.h b/src/Interpreters/Cache/FileCacheFactory.h
index 32ecd05f019..13e07074a97 100644
--- a/src/Interpreters/Cache/FileCacheFactory.h
+++ b/src/Interpreters/Cache/FileCacheFactory.h
@@ -22,33 +22,22 @@ public:
         FileCachePtr cache;
         FileCacheSettings settings;
 
+        FileCacheData() = default;
         FileCacheData(FileCachePtr cache_, const FileCacheSettings & settings_) : cache(cache_), settings(settings_) {}
     };
-
-    using Caches = std::list<FileCacheData>;
-    using CacheByBasePath = std::unordered_map<std::string, Caches::iterator>;
-    using CacheByName = std::unordered_map<std::string, Caches::iterator>;
+    using FileCacheDataPtr = std::shared_ptr<FileCacheData>;
+    using CacheByName = std::unordered_map<std::string, FileCacheDataPtr>;
 
     static FileCacheFactory & instance();
 
-    FileCachePtr getOrCreate(const std::string & cache_base_path, const FileCacheSettings & file_cache_settings, const std::string & name);
+    FileCachePtr getOrCreate(const std::string & cache_name, const FileCacheSettings & file_cache_settings);
 
-    FileCachePtr tryGet(const std::string & cache_base_path);
-    FileCachePtr get(const std::string & cache_base_path);
+    CacheByName getAll();
 
-    CacheByBasePath getAll();
-
-    const FileCacheSettings & getSettings(const std::string & cache_base_path);
-
-    FileCacheData getByName(const std::string & name);
-
-    CacheByName getAllByName();
+    FileCacheData getByName(const std::string & cache_name);
 
 private:
     std::mutex mutex;
-    Caches caches;
-
-    CacheByBasePath caches_by_path;
     CacheByName caches_by_name;
 };
 
diff --git a/src/Interpreters/Cache/FileCacheKey.cpp b/src/Interpreters/Cache/FileCacheKey.cpp
new file mode 100644
index 00000000000..f97cdc058aa
--- /dev/null
+++ b/src/Interpreters/Cache/FileCacheKey.cpp
@@ -0,0 +1,31 @@
+#include "FileCacheKey.h"
+
+#include <base/hex.h>
+#include <Common/SipHash.h>
+#include <Core/UUID.h>
+
+
+namespace DB
+{
+
+FileCacheKey::FileCacheKey(const std::string & path)
+    : key(sipHash128(path.data(), path.size()))
+{
+}
+
+FileCacheKey::FileCacheKey(const UInt128 & key_)
+    : key(key_)
+{
+}
+
+std::string FileCacheKey::toString() const
+{
+    return getHexUIntLowercase(key);
+}
+
+FileCacheKey FileCacheKey::random()
+{
+    return FileCacheKey(UUIDHelpers::generateV4().toUnderType());
+}
+
+}
diff --git a/src/Interpreters/Cache/FileCacheKey.h b/src/Interpreters/Cache/FileCacheKey.h
index fed4c7f47e0..bab8359732c 100644
--- a/src/Interpreters/Cache/FileCacheKey.h
+++ b/src/Interpreters/Cache/FileCacheKey.h
@@ -1,26 +1,37 @@
 #pragma once
 #include <Core/Types.h>
-#include <Common/hex.h>
-#include <Core/UUID.h>
+#include <fmt/format.h>
 
 namespace DB
 {
 
 struct FileCacheKey
 {
-    UInt128 key;
+    using KeyHash = UInt128;
+    KeyHash key;
 
-    String toString() const { return getHexUIntLowercase(key); }
+    std::string toString() const;
 
     FileCacheKey() = default;
 
-    explicit FileCacheKey(const UInt128 & key_) : key(key_) { }
+    explicit FileCacheKey(const std::string & path);
 
-    static FileCacheKey random() { return FileCacheKey(UUIDHelpers::generateV4().toUnderType()); }
+    explicit FileCacheKey(const UInt128 & key_);
+
+    static FileCacheKey random();
 
     bool operator==(const FileCacheKey & other) const { return key == other.key; }
 };
 
+using FileCacheKeyAndOffset = std::pair<FileCacheKey, size_t>;
+struct FileCacheKeyAndOffsetHash
+{
+    std::size_t operator()(const FileCacheKeyAndOffset & key) const
+    {
+        return std::hash<UInt128>()(key.first.key) ^ std::hash<UInt64>()(key.second);
+    }
+};
+
 }
 
 namespace std
@@ -32,3 +43,13 @@ struct hash<DB::FileCacheKey>
 };
 
 }
+
+template <>
+struct fmt::formatter<DB::FileCacheKey> : fmt::formatter<std::string>
+{
+    template <typename FormatCtx>
+    auto format(const DB::FileCacheKey & key, FormatCtx & ctx) const
+    {
+        return fmt::formatter<std::string>::format(key.toString(), ctx);
+    }
+};
diff --git a/src/Interpreters/Cache/FileCacheSettings.cpp b/src/Interpreters/Cache/FileCacheSettings.cpp
index b13cdd2ed04..b6bf77cb306 100644
--- a/src/Interpreters/Cache/FileCacheSettings.cpp
+++ b/src/Interpreters/Cache/FileCacheSettings.cpp
@@ -14,6 +14,11 @@ namespace ErrorCodes
 
 void FileCacheSettings::loadFromConfig(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix)
 {
+    if (!config.has(config_prefix + ".path"))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected cache path (`path`) in configuration");
+
+    base_path = config.getString(config_prefix + ".path");
+
     if (!config.has(config_prefix + ".max_size"))
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected cache size (`max_size`) in configuration");
 
@@ -25,24 +30,26 @@ void FileCacheSettings::loadFromConfig(const Poco::Util::AbstractConfiguration &
     if (path.empty())
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Disk Cache requires non-empty `path` field (cache base path) in config");
 
-    max_elements = config.getUInt64(config_prefix + ".max_elements", REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS);
+    max_elements = config.getUInt64(config_prefix + ".max_elements", FILECACHE_DEFAULT_MAX_ELEMENTS);
     if (config.has(config_prefix + ".max_file_segment_size"))
         max_file_segment_size = parseWithSizeSuffix<uint64_t>(config.getString(config_prefix + ".max_file_segment_size"));
     else
-        max_file_segment_size = REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE;
+        max_file_segment_size = FILECACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE;
 
     cache_on_write_operations = config.getUInt64(config_prefix + ".cache_on_write_operations", false);
     enable_filesystem_query_cache_limit = config.getUInt64(config_prefix + ".enable_filesystem_query_cache_limit", false);
-    enable_cache_hits_threshold = config.getUInt64(config_prefix + ".enable_cache_hits_threshold", REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD);
+    cache_hits_threshold = config.getUInt64(config_prefix + ".cache_hits_threshold", FILECACHE_DEFAULT_HITS_THRESHOLD);
 
     enable_bypass_cache_with_threashold = config.getUInt64(config_prefix + ".enable_bypass_cache_with_threashold", false);
 
     if (config.has(config_prefix + ".bypass_cache_threashold"))
         bypass_cache_threashold = parseWithSizeSuffix<uint64_t>(config.getString(config_prefix + ".bypass_cache_threashold"));
     else
-         bypass_cache_threashold = REMOTE_FS_OBJECTS_CACHE_BYPASS_THRESHOLD;
+         bypass_cache_threashold = FILECACHE_BYPASS_THRESHOLD;
 
-    do_not_evict_index_and_mark_files = config.getUInt64(config_prefix + ".do_not_evict_index_and_mark_files", false);
+    do_not_evict_index_and_mark_files = config.getUInt64(config_prefix + ".do_not_evict_index_and_mark_files", true);
+
+    delayed_cleanup_interval_ms = config.getUInt64(config_prefix + ".delayed_cleanup_interval_ms", FILECACHE_DELAYED_CLEANUP_INTERVAL_MS);
 }
 
 }
diff --git a/src/Interpreters/Cache/FileCacheSettings.h b/src/Interpreters/Cache/FileCacheSettings.h
index 80f7b5fa93f..e316cc6d6fe 100644
--- a/src/Interpreters/Cache/FileCacheSettings.h
+++ b/src/Interpreters/Cache/FileCacheSettings.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Interpreters/Cache/FileCache_fwd.h>
+#include <string>
 
 namespace Poco { namespace Util { class AbstractConfiguration; } } // NOLINT(cppcoreguidelines-virtual-class-destructor)
 
@@ -9,19 +10,22 @@ namespace DB
 
 struct FileCacheSettings
 {
+    std::string base_path;
+
     size_t max_size = 0;
-    size_t max_elements = REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS;
-    size_t max_file_segment_size = REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE;
+    size_t max_elements = FILECACHE_DEFAULT_MAX_ELEMENTS;
+    size_t max_file_segment_size = FILECACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE;
 
     bool cache_on_write_operations = false;
 
-    size_t enable_cache_hits_threshold = REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD;
+    size_t cache_hits_threshold = FILECACHE_DEFAULT_HITS_THRESHOLD;
     bool enable_filesystem_query_cache_limit = false;
 
     bool do_not_evict_index_and_mark_files = true;
 
     bool enable_bypass_cache_with_threashold = false;
-    size_t bypass_cache_threashold = REMOTE_FS_OBJECTS_CACHE_BYPASS_THRESHOLD;
+    size_t bypass_cache_threashold = FILECACHE_BYPASS_THRESHOLD;
+    size_t delayed_cleanup_interval_ms = FILECACHE_DELAYED_CLEANUP_INTERVAL_MS;
 
     void loadFromConfig(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
 };
diff --git a/src/Interpreters/Cache/FileCache_fwd.h b/src/Interpreters/Cache/FileCache_fwd.h
index 72dc1144fb9..afd8d86074e 100644
--- a/src/Interpreters/Cache/FileCache_fwd.h
+++ b/src/Interpreters/Cache/FileCache_fwd.h
@@ -4,10 +4,11 @@
 namespace DB
 {
 
-static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE = 100 * 1024 * 1024;
-static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS = 1024 * 1024;
-static constexpr int REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD = 0;
-static constexpr size_t REMOTE_FS_OBJECTS_CACHE_BYPASS_THRESHOLD = 256 * 1024 * 1024;;
+static constexpr int FILECACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE = 100 * 1024 * 1024;
+static constexpr int FILECACHE_DEFAULT_MAX_ELEMENTS = 1024 * 1024;
+static constexpr int FILECACHE_DEFAULT_HITS_THRESHOLD = 0;
+static constexpr size_t FILECACHE_BYPASS_THRESHOLD = 256 * 1024 * 1024;
+static constexpr size_t FILECACHE_DELAYED_CLEANUP_INTERVAL_MS = 1000 * 60; /// 1 min
 
 class FileCache;
 using FileCachePtr = std::shared_ptr<FileCache>;
diff --git a/src/Interpreters/Cache/FileCache_fwd_internal.h b/src/Interpreters/Cache/FileCache_fwd_internal.h
new file mode 100644
index 00000000000..5ded018a674
--- /dev/null
+++ b/src/Interpreters/Cache/FileCache_fwd_internal.h
@@ -0,0 +1,26 @@
+#pragma once
+#include <list>
+
+namespace DB
+{
+
+class FileCache;
+using FileCachePtr = std::shared_ptr<FileCache>;
+
+class IFileCachePriority;
+using FileCachePriorityPtr = std::unique_ptr<IFileCachePriority>;
+
+class FileSegment;
+using FileSegmentPtr = std::shared_ptr<FileSegment>;
+using FileSegments = std::list<FileSegmentPtr>;
+
+struct FileSegmentMetadata;
+using FileSegmentMetadataPtr = std::shared_ptr<FileSegmentMetadata>;
+
+struct LockedKey;
+using LockedKeyPtr = std::shared_ptr<LockedKey>;
+
+struct KeyMetadata;
+using KeyMetadataPtr = std::shared_ptr<KeyMetadata>;
+
+}
diff --git a/src/Interpreters/Cache/FileSegment.cpp b/src/Interpreters/Cache/FileSegment.cpp
index f4d7b2612a5..60228573666 100644
--- a/src/Interpreters/Cache/FileSegment.cpp
+++ b/src/Interpreters/Cache/FileSegment.cpp
@@ -2,7 +2,7 @@
 
 #include <base/getThreadId.h>
 #include <Common/scope_guard_safe.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Common/logger_useful.h>
 #include <Interpreters/Cache/FileCache.h>
 #include <IO/WriteBufferFromString.h>
@@ -11,10 +11,7 @@
 
 #include <magic_enum.hpp>
 
-namespace CurrentMetrics
-{
-extern const Metric CacheDetachedFileSegments;
-}
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -30,23 +27,27 @@ String toString(FileSegmentKind kind)
 }
 
 FileSegment::FileSegment(
+        const Key & key_,
         size_t offset_,
         size_t size_,
-        const Key & key_,
-        FileCache * cache_,
         State download_state_,
-        const CreateFileSegmentSettings & settings)
-    : segment_range(offset_, offset_ + size_ - 1)
+        const CreateFileSegmentSettings & settings,
+        FileCache * cache_,
+        std::weak_ptr<KeyMetadata> key_metadata_,
+        Priority::Iterator queue_iterator_)
+    : file_key(key_)
+    , segment_range(offset_, offset_ + size_ - 1)
+    , segment_kind(settings.kind)
+    , is_unbound(settings.unbounded)
     , download_state(download_state_)
-    , file_key(key_)
+    , key_metadata(key_metadata_)
+    , queue_iterator(queue_iterator_)
     , cache(cache_)
-#ifndef NDEBUG
-    , log(&Poco::Logger::get(fmt::format("FileSegment({}) : {}", getHexUIntLowercase(key_), range().toString())))
+#ifdef ABORT_ON_LOGICAL_ERROR
+    , log(&Poco::Logger::get(fmt::format("FileSegment({}) : {}", key_.toString(), range().toString())))
 #else
     , log(&Poco::Logger::get("FileSegment"))
 #endif
-    , segment_kind(settings.kind)
-    , is_unbound(settings.unbounded)
 {
     /// On creation, file segment state can be EMPTY, DOWNLOADED, DOWNLOADING.
     switch (download_state)
@@ -55,18 +56,20 @@ FileSegment::FileSegment(
         /// someone will _potentially_ want to download it (after calling getOrSetDownloader()).
         case (State::EMPTY):
         {
+            chassert(key_metadata.lock());
             break;
         }
         /// DOWNLOADED is used either on initial cache metadata load into memory on server startup
-        /// or on reduceSizeToDownloaded() -- when file segment object is updated.
+        /// or on shrinkFileSegmentToDownloadedSize() -- when file segment object is updated.
         case (State::DOWNLOADED):
         {
             reserved_size = downloaded_size = size_;
-            is_downloaded = true;
-            chassert(std::filesystem::file_size(getPathInLocalCache()) == size_);
+            chassert(fs::file_size(getPathInLocalCache()) == size_);
+            chassert(queue_iterator);
+            chassert(key_metadata.lock());
             break;
         }
-        case (State::SKIP_CACHE):
+        case (State::DETACHED):
         {
             break;
         }
@@ -74,82 +77,87 @@ FileSegment::FileSegment(
         {
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
-                "Can only create cell with either EMPTY, DOWNLOADED or SKIP_CACHE state");
+                "Can only create file segment with either EMPTY, DOWNLOADED or DETACHED state");
         }
     }
 }
 
-String FileSegment::getPathInLocalCache() const
-{
-    chassert(cache);
-    return cache->getPathInLocalCache(key(), offset(), segment_kind);
-}
-
 FileSegment::State FileSegment::state() const
 {
-    std::unique_lock segment_lock(mutex);
+    auto lock = segment_guard.lock();
     return download_state;
 }
 
-void FileSegment::setDownloadState(State state)
+String FileSegment::getPathInLocalCache() const
 {
+    return getKeyMetadata()->getFileSegmentPath(*this);
+}
+
+void FileSegment::setDownloadState(State state, const FileSegmentGuard::Lock & lock)
+{
+    if (isCompleted(false) && state != State::DETACHED)
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Updating state to {} of file segment is not allowed, because it is already completed ({})",
+            stateToString(state), getInfoForLogUnlocked(lock));
+    }
+
     LOG_TEST(log, "Updated state from {} to {}", stateToString(download_state), stateToString(state));
     download_state = state;
 }
 
-size_t FileSegment::getFirstNonDownloadedOffset() const
+size_t FileSegment::getReservedSize() const
 {
-    std::unique_lock segment_lock(mutex);
-    return getFirstNonDownloadedOffsetUnlocked(segment_lock);
+    auto lock = segment_guard.lock();
+    return reserved_size;
 }
 
-size_t FileSegment::getFirstNonDownloadedOffsetUnlocked(std::unique_lock<std::mutex> & segment_lock) const
+FileSegment::Priority::Iterator FileSegment::getQueueIterator() const
 {
-    return range().left + getDownloadedSizeUnlocked(segment_lock);
+    auto lock = segment_guard.lock();
+    return queue_iterator;
 }
 
-size_t FileSegment::getCurrentWriteOffset() const
+void FileSegment::setQueueIterator(Priority::Iterator iterator)
 {
-    std::unique_lock segment_lock(mutex);
-    return getCurrentWriteOffsetUnlocked(segment_lock);
+    auto lock = segment_guard.lock();
+    if (queue_iterator)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Queue iterator cannot be set twice");
+    queue_iterator = iterator;
 }
 
-size_t FileSegment::getCurrentWriteOffsetUnlocked(std::unique_lock<std::mutex> & segment_lock) const
+size_t FileSegment::getFirstNonDownloadedOffset(bool sync) const
 {
-    return getFirstNonDownloadedOffsetUnlocked(segment_lock);
+    return range().left + getDownloadedSize(sync);
 }
 
-size_t FileSegment::getDownloadedSize() const
+size_t FileSegment::getCurrentWriteOffset(bool sync) const
 {
-    std::unique_lock segment_lock(mutex);
-    return getDownloadedSizeUnlocked(segment_lock);
+    return getFirstNonDownloadedOffset(sync);
 }
 
-size_t FileSegment::getDownloadedSizeUnlocked(std::unique_lock<std::mutex> & /* segment_lock */) const
+size_t FileSegment::getDownloadedSize(bool sync) const
 {
-    if (download_state == State::DOWNLOADED)
+    if (sync)
+    {
+        std::lock_guard lock(download_mutex);
         return downloaded_size;
-
-    std::unique_lock download_lock(download_mutex);
+    }
     return downloaded_size;
 }
 
 void FileSegment::setDownloadedSize(size_t delta)
 {
-    std::unique_lock download_lock(download_mutex);
-    setDownloadedSizeUnlocked(download_lock, delta);
-}
-
-void FileSegment::setDownloadedSizeUnlocked(std::unique_lock<std::mutex> & /* download_lock */, size_t delta)
-{
+    auto lock = segment_guard.lock();
     downloaded_size += delta;
     assert(downloaded_size == std::filesystem::file_size(getPathInLocalCache()));
 }
 
 bool FileSegment::isDownloaded() const
 {
-    std::lock_guard segment_lock(mutex);
-    return is_downloaded;
+    auto lock = segment_guard.lock();
+    return download_state == State::DOWNLOADED;
 }
 
 String FileSegment::getCallerId()
@@ -164,71 +172,75 @@ String FileSegment::getCallerId()
 
 String FileSegment::getDownloader() const
 {
-    std::unique_lock segment_lock(mutex);
-    return getDownloaderUnlocked(segment_lock);
+    auto lock = segment_guard.lock();
+    return getDownloaderUnlocked(lock);
 }
 
-String FileSegment::getDownloaderUnlocked(std::unique_lock<std::mutex> & /* segment_lock */) const
+String FileSegment::getDownloaderUnlocked(const FileSegmentGuard::Lock &) const
 {
     return downloader_id;
 }
 
 String FileSegment::getOrSetDownloader()
 {
-    std::unique_lock segment_lock(mutex);
+    auto lock = segment_guard.lock();
 
-    assertNotDetachedUnlocked(segment_lock);
+    assertNotDetachedUnlocked(lock);
 
-    auto current_downloader = getDownloaderUnlocked(segment_lock);
+    auto current_downloader = getDownloaderUnlocked(lock);
 
     if (current_downloader.empty())
     {
+        const auto caller_id = getCallerId();
         bool allow_new_downloader = download_state == State::EMPTY || download_state == State::PARTIALLY_DOWNLOADED;
         if (!allow_new_downloader)
             return "notAllowed:" + stateToString(download_state);
 
-        current_downloader = downloader_id = getCallerId();
-        setDownloadState(State::DOWNLOADING);
+        current_downloader = downloader_id = caller_id;
+        setDownloadState(State::DOWNLOADING, lock);
+        chassert(key_metadata.lock());
     }
 
     return current_downloader;
 }
 
-void FileSegment::resetDownloadingStateUnlocked([[maybe_unused]] std::unique_lock<std::mutex> & segment_lock)
+void FileSegment::resetDownloadingStateUnlocked(const FileSegmentGuard::Lock & lock)
 {
-    assert(isDownloaderUnlocked(segment_lock));
+    assert(isDownloaderUnlocked(lock));
     assert(download_state == State::DOWNLOADING);
 
-    size_t current_downloaded_size = getDownloadedSizeUnlocked(segment_lock);
+    size_t current_downloaded_size = getDownloadedSize(true);
     /// range().size() can equal 0 in case of write-though cache.
-    if (current_downloaded_size != 0 && current_downloaded_size == range().size())
-        setDownloadedUnlocked(segment_lock);
+    if (!is_unbound && current_downloaded_size != 0 && current_downloaded_size == range().size())
+        setDownloadedUnlocked(lock);
     else
-        setDownloadState(State::PARTIALLY_DOWNLOADED);
+        setDownloadState(State::PARTIALLY_DOWNLOADED, lock);
 }
 
 void FileSegment::resetDownloader()
 {
-    std::unique_lock segment_lock(mutex);
+    auto lock = segment_guard.lock();
 
-    assertNotDetachedUnlocked(segment_lock);
-    assertIsDownloaderUnlocked("resetDownloader", segment_lock);
+    SCOPE_EXIT({ cv.notify_all(); });
 
-    resetDownloadingStateUnlocked(segment_lock);
-    resetDownloaderUnlocked(segment_lock);
+    assertNotDetachedUnlocked(lock);
+    assertIsDownloaderUnlocked("resetDownloader", lock);
+
+    resetDownloadingStateUnlocked(lock);
+    resetDownloaderUnlocked(lock);
 }
 
-void FileSegment::resetDownloaderUnlocked(std::unique_lock<std::mutex> & /* segment_lock */)
+void FileSegment::resetDownloaderUnlocked(const FileSegmentGuard::Lock &)
 {
     LOG_TEST(log, "Resetting downloader from {}", downloader_id);
     downloader_id.clear();
 }
 
-void FileSegment::assertIsDownloaderUnlocked(const std::string & operation, std::unique_lock<std::mutex> & segment_lock) const
+void FileSegment::assertIsDownloaderUnlocked(const std::string & operation, const FileSegmentGuard::Lock & lock) const
 {
     auto caller = getCallerId();
-    auto current_downloader = getDownloaderUnlocked(segment_lock);
-    LOG_TEST(log, "Downloader id: {}, caller id: {}", current_downloader, caller);
+    auto current_downloader = getDownloaderUnlocked(lock);
+    LOG_TEST(log, "Downloader id: {}, caller id: {}, operation: {}", current_downloader, caller, operation);
 
     if (caller != current_downloader)
     {
@@ -242,41 +254,53 @@ void FileSegment::assertIsDownloaderUnlocked(const std::string & operation, std:
 
 bool FileSegment::isDownloader() const
 {
-    std::unique_lock segment_lock(mutex);
-    return isDownloaderUnlocked(segment_lock);
+    auto lock = segment_guard.lock();
+    return isDownloaderUnlocked(lock);
 }
 
-bool FileSegment::isDownloaderUnlocked(std::unique_lock<std::mutex> & segment_lock) const
+bool FileSegment::isDownloaderUnlocked(const FileSegmentGuard::Lock & lock) const
 {
-    return getCallerId() == getDownloaderUnlocked(segment_lock);
+    return getCallerId() == getDownloaderUnlocked(lock);
 }
 
 FileSegment::RemoteFileReaderPtr FileSegment::getRemoteFileReader()
 {
-    std::unique_lock segment_lock(mutex);
-    assertIsDownloaderUnlocked("getRemoteFileReader", segment_lock);
+    auto lock = segment_guard.lock();
+    assertIsDownloaderUnlocked("getRemoteFileReader", lock);
     return remote_file_reader;
 }
 
+void FileSegment::resetRemoteFileReader()
+{
+    auto lock = segment_guard.lock();
+    assertIsDownloaderUnlocked("resetRemoteFileReader", lock);
+    remote_file_reader.reset();
+}
+
 FileSegment::RemoteFileReaderPtr FileSegment::extractRemoteFileReader()
 {
-    std::lock_guard cache_lock(cache->mutex);
-    std::unique_lock segment_lock(mutex);
-
-    if (!is_detached)
+    auto locked_key = lockKeyMetadata(false);
+    if (!locked_key)
     {
-        bool is_last_holder = cache->isLastFileSegmentHolder(key(), offset(), cache_lock, segment_lock);
-        if (!downloader_id.empty() || !is_last_holder)
-            return nullptr;
+        assert(isDetached());
+        return std::move(remote_file_reader);
     }
 
+    auto segment_lock = segment_guard.lock();
+
+    assert(download_state != State::DETACHED);
+
+    bool is_last_holder = locked_key->isLastOwnerOfFileSegment(offset());
+    if (!downloader_id.empty() || !is_last_holder)
+        return nullptr;
+
     return std::move(remote_file_reader);
 }
 
 void FileSegment::setRemoteFileReader(RemoteFileReaderPtr remote_file_reader_)
 {
-    std::unique_lock segment_lock(mutex);
-    assertIsDownloaderUnlocked("setRemoteFileReader", segment_lock);
+    auto lock = segment_guard.lock();
+    assertIsDownloaderUnlocked("setRemoteFileReader", lock);
 
     if (remote_file_reader)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Remote file reader already exists");
@@ -284,57 +308,30 @@ void FileSegment::setRemoteFileReader(RemoteFileReaderPtr remote_file_reader_)
     remote_file_reader = remote_file_reader_;
 }
 
-void FileSegment::resetRemoteFileReader()
-{
-    std::unique_lock segment_lock(mutex);
-    assertIsDownloaderUnlocked("resetRemoteFileReader", segment_lock);
-
-    if (!remote_file_reader)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Remote file reader does not exist");
-
-    remote_file_reader.reset();
-}
-
-std::unique_ptr<WriteBufferFromFile> FileSegment::detachWriter()
-{
-    std::unique_lock segment_lock(mutex);
-
-    if (!cache_writer)
-    {
-        if (detached_writer)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Writer is already detached");
-
-        auto download_path = getPathInLocalCache();
-        cache_writer = std::make_unique<WriteBufferFromFile>(download_path);
-    }
-    detached_writer = true;
-    return std::move(cache_writer);
-}
-
 void FileSegment::write(const char * from, size_t size, size_t offset)
 {
     if (!size)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Writing zero size is not allowed");
 
     {
-        std::unique_lock segment_lock(mutex);
+        auto lock = segment_guard.lock();
 
-        assertIsDownloaderUnlocked("write", segment_lock);
-        assertNotDetachedUnlocked(segment_lock);
+        assertIsDownloaderUnlocked("write", lock);
+        assertNotDetachedUnlocked(lock);
 
         if (download_state != State::DOWNLOADING)
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
                 "Expected DOWNLOADING state, got {}", stateToString(download_state));
 
-        size_t first_non_downloaded_offset = getFirstNonDownloadedOffsetUnlocked(segment_lock);
+        size_t first_non_downloaded_offset = getFirstNonDownloadedOffset(false);
         if (offset != first_non_downloaded_offset)
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
                 "Attempt to write {} bytes to offset: {}, but current write offset is {}",
                 size, offset, first_non_downloaded_offset);
 
-        size_t current_downloaded_size = getDownloadedSizeUnlocked(segment_lock);
+        size_t current_downloaded_size = getDownloadedSize(false);
         chassert(reserved_size >= current_downloaded_size);
         size_t free_reserved_size = reserved_size - current_downloaded_size;
 
@@ -343,7 +340,7 @@ void FileSegment::write(const char * from, size_t size, size_t offset)
                 ErrorCodes::LOGICAL_ERROR,
                 "Not enough space is reserved. Available: {}, expected: {}", free_reserved_size, size);
 
-        if (current_downloaded_size == range().size())
+        if (!is_unbound && current_downloaded_size == range().size())
             throw Exception(ErrorCodes::LOGICAL_ERROR, "File segment is already fully downloaded");
 
         if (!cache_writer)
@@ -354,11 +351,7 @@ void FileSegment::write(const char * from, size_t size, size_t offset)
                     "Cache writer was finalized (downloaded size: {}, state: {})",
                     current_downloaded_size, stateToString(download_state));
 
-            if (detached_writer)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache writer was detached");
-
-            auto download_path = getPathInLocalCache();
-            cache_writer = std::make_unique<WriteBufferFromFile>(download_path);
+            cache_writer = std::make_unique<WriteBufferFromFile>(getPathInLocalCache());
         }
     }
 
@@ -366,7 +359,7 @@ void FileSegment::write(const char * from, size_t size, size_t offset)
     {
         cache_writer->write(from, size);
 
-        std::unique_lock download_lock(download_mutex);
+        std::lock_guard lock(download_mutex);
 
         cache_writer->next();
 
@@ -374,32 +367,41 @@ void FileSegment::write(const char * from, size_t size, size_t offset)
 
         chassert(std::filesystem::file_size(getPathInLocalCache()) == downloaded_size);
     }
+    catch (ErrnoException & e)
+    {
+        auto lock = segment_guard.lock();
+        e.addMessage(fmt::format("{}, current cache state: {}", e.what(), getInfoForLogUnlocked(lock)));
+
+        int code = e.getErrno();
+        if (code == /* No space left on device */28 || code == /* Quota exceeded */122)
+        {
+            const auto file_size = fs::file_size(getPathInLocalCache());
+            chassert(downloaded_size <= file_size);
+            chassert(reserved_size >= file_size);
+            if (downloaded_size != file_size)
+                downloaded_size = file_size;
+        }
+
+        setDownloadFailedUnlocked(lock);
+        throw;
+
+    }
     catch (Exception & e)
     {
-        std::unique_lock segment_lock(mutex);
-
-        wrapWithCacheInfo(e, "while writing into cache", segment_lock);
-
-        setDownloadFailedUnlocked(segment_lock);
-
-        cv.notify_all();
-
+        auto lock = segment_guard.lock();
+        e.addMessage(fmt::format("{}, current cache state: {}", e.what(), getInfoForLogUnlocked(lock)));
+        setDownloadFailedUnlocked(lock);
         throw;
     }
 
-    chassert(getFirstNonDownloadedOffset() == offset + size);
+    chassert(getFirstNonDownloadedOffset(false) == offset + size);
 }
 
-FileSegment::State FileSegment::wait()
+FileSegment::State FileSegment::wait(size_t offset)
 {
-    std::unique_lock segment_lock(mutex);
+    auto lock = segment_guard.lock();
 
-    if (is_detached)
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Cache file segment is in detached state, operation not allowed");
-
-    if (downloader_id.empty())
+    if (downloader_id.empty() || offset < getCurrentWriteOffset(true))
         return download_state;
 
     if (download_state == State::EMPTY)
@@ -409,15 +411,46 @@ FileSegment::State FileSegment::wait()
     {
         LOG_TEST(log, "{} waiting on: {}, current downloader: {}", getCallerId(), range().toString(), downloader_id);
 
-        chassert(!getDownloaderUnlocked(segment_lock).empty());
-        chassert(!isDownloaderUnlocked(segment_lock));
+        chassert(!getDownloaderUnlocked(lock).empty());
+        chassert(!isDownloaderUnlocked(lock));
 
-        cv.wait_for(segment_lock, std::chrono::seconds(60));
+        [[maybe_unused]] const auto ok = cv.wait_for(lock, std::chrono::seconds(60), [&, this]()
+        {
+            return download_state != State::DOWNLOADING || offset < getCurrentWriteOffset(true);
+        });
+        /// chassert(ok);
     }
 
     return download_state;
 }
 
+KeyMetadataPtr FileSegment::getKeyMetadata() const
+{
+    auto metadata = tryGetKeyMetadata();
+    if (metadata)
+        return metadata;
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot lock key, key metadata is not set ({})", stateToString(download_state));
+}
+
+KeyMetadataPtr FileSegment::tryGetKeyMetadata() const
+{
+    auto metadata = key_metadata.lock();
+    if (metadata)
+        return metadata;
+    return nullptr;
+}
+
+LockedKeyPtr FileSegment::lockKeyMetadata(bool assert_exists) const
+{
+    if (assert_exists)
+        return getKeyMetadata()->lock();
+
+    auto metadata = tryGetKeyMetadata();
+    if (!metadata)
+        return nullptr;
+    return metadata->tryLock();
+}
+
 bool FileSegment::reserve(size_t size_to_reserve)
 {
     if (!size_to_reserve)
@@ -427,13 +460,12 @@ bool FileSegment::reserve(size_t size_to_reserve)
 
     bool is_file_segment_size_exceeded;
     {
-        std::unique_lock segment_lock(mutex);
+        auto lock = segment_guard.lock();
 
+        assertNotDetachedUnlocked(lock);
+        assertIsDownloaderUnlocked("reserve", lock);
 
-        assertNotDetachedUnlocked(segment_lock);
-        assertIsDownloaderUnlocked("reserve", segment_lock);
-
-        expected_downloaded_size = getDownloadedSizeUnlocked(segment_lock);
+        expected_downloaded_size = getDownloadedSize(false);
 
         is_file_segment_size_exceeded = expected_downloaded_size + size_to_reserve > range().size();
         if (is_file_segment_size_exceeded && !is_unbound)
@@ -456,32 +488,31 @@ bool FileSegment::reserve(size_t size_to_reserve)
     size_t already_reserved_size = reserved_size - expected_downloaded_size;
 
     bool reserved = already_reserved_size >= size_to_reserve;
+    if (reserved)
+        return reserved;
+
+    size_to_reserve = size_to_reserve - already_reserved_size;
+
+    /// This (resizable file segments) is allowed only for single threaded use of file segment.
+    /// Currently it is used only for temporary files through cache.
+    if (is_unbound && is_file_segment_size_exceeded)
+        segment_range.right = range().left + expected_downloaded_size + size_to_reserve;
+
+    reserved = cache->tryReserve(*this, size_to_reserve);
+
     if (!reserved)
-    {
-        std::lock_guard cache_lock(cache->mutex);
-        std::lock_guard segment_lock(mutex);
-
-        size_to_reserve = size_to_reserve - already_reserved_size;
-
-        if (is_unbound && is_file_segment_size_exceeded)
-        {
-            segment_range.right = range().left + expected_downloaded_size + size_to_reserve;
-        }
-
-        reserved = cache->tryReserve(key(), offset(), size_to_reserve, cache_lock);
-
-        if (reserved)
-            reserved_size += size_to_reserve;
-    }
+        setDownloadFailedUnlocked(segment_guard.lock());
 
     return reserved;
 }
 
-void FileSegment::setDownloadedUnlocked([[maybe_unused]] std::unique_lock<std::mutex> & segment_lock)
+void FileSegment::setDownloadedUnlocked(const FileSegmentGuard::Lock &)
 {
-    if (is_downloaded)
+    if (download_state == State::DOWNLOADED)
         return;
 
+    download_state = State::DOWNLOADED;
+
     if (cache_writer)
     {
         cache_writer->finalize();
@@ -489,137 +520,112 @@ void FileSegment::setDownloadedUnlocked([[maybe_unused]] std::unique_lock<std::m
         remote_file_reader.reset();
     }
 
-    download_state = State::DOWNLOADED;
-    is_downloaded = true;
-
-    assert(getDownloadedSizeUnlocked(segment_lock) > 0);
-    assert(std::filesystem::file_size(getPathInLocalCache()) > 0);
+    chassert(getDownloadedSize(false) > 0);
+    chassert(fs::file_size(getPathInLocalCache()) > 0);
 }
 
-void FileSegment::setDownloadFailedUnlocked(std::unique_lock<std::mutex> & segment_lock)
+void FileSegment::setDownloadFailedUnlocked(const FileSegmentGuard::Lock & lock)
 {
-    LOG_INFO(log, "Settings download as failed: {}", getInfoForLogUnlocked(segment_lock));
+    LOG_INFO(log, "Setting download as failed: {}", getInfoForLogUnlocked(lock));
 
-    setDownloadState(State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
-    resetDownloaderUnlocked(segment_lock);
+    SCOPE_EXIT({ cv.notify_all(); });
+
+    setDownloadState(State::PARTIALLY_DOWNLOADED_NO_CONTINUATION, lock);
 
     if (cache_writer)
     {
         cache_writer->finalize();
         cache_writer.reset();
-        remote_file_reader.reset();
     }
+
+    remote_file_reader.reset();
 }
 
 void FileSegment::completePartAndResetDownloader()
 {
-    std::unique_lock segment_lock(mutex);
-    completePartAndResetDownloaderUnlocked(segment_lock);
+    auto lock = segment_guard.lock();
+
+    SCOPE_EXIT({ cv.notify_all(); });
+
+    assertNotDetachedUnlocked(lock);
+    assertIsDownloaderUnlocked("completePartAndResetDownloader", lock);
+
+    chassert(download_state == State::DOWNLOADING
+             || download_state == State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
+
+    if (download_state == State::DOWNLOADING)
+        resetDownloadingStateUnlocked(lock);
+
+    resetDownloaderUnlocked(lock);
+
+    LOG_TEST(log, "Complete batch. ({})", getInfoForLogUnlocked(lock));
 }
 
-void FileSegment::completePartAndResetDownloaderUnlocked(std::unique_lock<std::mutex> & segment_lock)
+void FileSegment::complete()
 {
-    assertNotDetachedUnlocked(segment_lock);
-    assertIsDownloaderUnlocked("completePartAndResetDownloader", segment_lock);
-
-    resetDownloadingStateUnlocked(segment_lock);
-    resetDownloaderUnlocked(segment_lock);
-
-    LOG_TEST(log, "Complete batch. ({})", getInfoForLogUnlocked(segment_lock));
-    cv.notify_all();
-}
-
-void FileSegment::completeWithState(State state)
-{
-    std::lock_guard cache_lock(cache->mutex);
-    std::unique_lock segment_lock(mutex);
-
-    assertNotDetachedUnlocked(segment_lock);
-    assertIsDownloaderUnlocked("complete", segment_lock);
-
-    if (state != State::DOWNLOADED
-        && state != State::PARTIALLY_DOWNLOADED
-        && state != State::PARTIALLY_DOWNLOADED_NO_CONTINUATION)
-    {
-        cv.notify_all();
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Cannot complete file segment with state: {}", stateToString(state));
-    }
-
-    setDownloadState(state);
-    completeBasedOnCurrentState(cache_lock, segment_lock);
-}
-
-void FileSegment::completeWithoutState()
-{
-    std::lock_guard cache_lock(cache->mutex);
-    completeWithoutStateUnlocked(cache_lock);
-}
-
-void FileSegment::completeWithoutStateUnlocked(std::lock_guard<std::mutex> & cache_lock)
-{
-    std::unique_lock segment_lock(mutex);
-    completeBasedOnCurrentState(cache_lock, segment_lock);
-}
-
-void FileSegment::completeBasedOnCurrentState(std::lock_guard<std::mutex> & cache_lock, std::unique_lock<std::mutex> & segment_lock)
-{
-    if (is_detached)
+    if (isCompleted())
         return;
 
-    bool is_downloader = isDownloaderUnlocked(segment_lock);
-    bool is_last_holder = cache->isLastFileSegmentHolder(key(), offset(), cache_lock, segment_lock);
-    size_t current_downloaded_size = getDownloadedSizeUnlocked(segment_lock);
+    auto locked_key = lockKeyMetadata(false);
+    if (!locked_key)
+    {
+        /// If we failed to lock a key, it must be in detached state.
+        if (isDetached())
+            return;
+
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot complete file segment: {}", getInfoForLog());
+    }
+
+    auto segment_lock = segment_guard.lock();
+
+    if (isCompleted(false))
+        return;
+
+    const bool is_downloader = isDownloaderUnlocked(segment_lock);
+    const bool is_last_holder = locked_key->isLastOwnerOfFileSegment(offset());
+    const size_t current_downloaded_size = getDownloadedSize(true);
 
     SCOPE_EXIT({
         if (is_downloader)
-        {
             cv.notify_all();
-        }
     });
 
     LOG_TEST(
-        log,
-        "Complete based on current state (is_last_holder: {}, {})",
+        log, "Complete based on current state (is_last_holder: {}, {})",
         is_last_holder, getInfoForLogUnlocked(segment_lock));
 
     if (is_downloader)
     {
-        if (download_state == State::DOWNLOADING) /// != in case of completeWithState
+        if (download_state == State::DOWNLOADING)
             resetDownloadingStateUnlocked(segment_lock);
         resetDownloaderUnlocked(segment_lock);
     }
 
-    if (cache_writer && (is_downloader || is_last_holder))
+    if (is_downloader || is_last_holder)
     {
-        cache_writer->finalize();
-        cache_writer.reset();
+        if (cache_writer)
+        {
+            cache_writer->finalize();
+            cache_writer.reset();
+        }
         remote_file_reader.reset();
     }
 
     if (segment_kind == FileSegmentKind::Temporary && is_last_holder)
     {
         LOG_TEST(log, "Removing temporary file segment: {}", getInfoForLogUnlocked(segment_lock));
-        detach(cache_lock, segment_lock);
-        setDownloadState(State::SKIP_CACHE);
-        cache->remove(key(), offset(), cache_lock, segment_lock);
+        detach(segment_lock, *locked_key);
+        setDownloadState(State::DETACHED, segment_lock);
+        locked_key->removeFileSegment(offset(), segment_lock);
         return;
     }
 
     switch (download_state)
     {
-        case State::SKIP_CACHE:
-        {
-            if (is_last_holder)
-                cache->remove(key(), offset(), cache_lock, segment_lock);
-            break;
-        }
         case State::DOWNLOADED:
         {
-            chassert(getDownloadedSizeUnlocked(segment_lock) == range().size());
-            chassert(getDownloadedSizeUnlocked(segment_lock) == std::filesystem::file_size(getPathInLocalCache()));
-            chassert(is_downloaded);
+            chassert(current_downloaded_size == range().size());
+            chassert(current_downloaded_size == fs::file_size(getPathInLocalCache()));
             chassert(!cache_writer);
             break;
         }
@@ -632,73 +638,71 @@ void FileSegment::completeBasedOnCurrentState(std::lock_guard<std::mutex> & cach
         case State::PARTIALLY_DOWNLOADED:
         case State::PARTIALLY_DOWNLOADED_NO_CONTINUATION:
         {
+            chassert(current_downloaded_size != range().size());
+
             if (is_last_holder)
             {
                 if (current_downloaded_size == 0)
                 {
-                    LOG_TEST(log, "Remove cell {} (nothing downloaded)", range().toString());
-
-                    setDownloadState(State::SKIP_CACHE);
-                    cache->remove(key(), offset(), cache_lock, segment_lock);
+                    LOG_TEST(log, "Remove file segment {} (nothing downloaded)", range().toString());
+                    locked_key->removeFileSegment(offset(), segment_lock);
                 }
                 else
                 {
-                    LOG_TEST(log, "Resize cell {} to downloaded: {}", range().toString(), current_downloaded_size);
+                    LOG_TEST(log, "Resize file segment {} to downloaded: {}", range().toString(), current_downloaded_size);
 
                     /**
-                    * Only last holder of current file segment can resize the cell,
+                    * Only last holder of current file segment can resize the file segment,
                     * because there is an invariant that file segments returned to users
                     * in FileSegmentsHolder represent a contiguous range, so we can resize
                     * it only when nobody needs it.
                     */
-                    setDownloadState(State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
 
                     /// Resize this file segment by creating a copy file segment with DOWNLOADED state,
                     /// but current file segment should remain PARRTIALLY_DOWNLOADED_NO_CONTINUATION and with detached state,
                     /// because otherwise an invariant that getOrSet() returns a contiguous range of file segments will be broken
                     /// (this will be crucial for other file segment holder, not for current one).
-                    cache->reduceSizeToDownloaded(key(), offset(), cache_lock, segment_lock);
+                    locked_key->shrinkFileSegmentToDownloadedSize(offset(), segment_lock);
+
+                    /// We mark current file segment with state DETACHED, even though the data is still in cache
+                    /// (but a separate file segment) because is_last_holder is satisfied, so it does not matter.
                 }
 
-                detachAssumeStateFinalized(segment_lock);
+                setDetachedState(segment_lock);
             }
             break;
         }
+        default:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected state while completing file segment");
     }
 
-    is_completed = true;
     LOG_TEST(log, "Completed file segment: {}", getInfoForLogUnlocked(segment_lock));
 }
 
 String FileSegment::getInfoForLog() const
 {
-    std::unique_lock segment_lock(mutex);
-    return getInfoForLogUnlocked(segment_lock);
+    auto lock = segment_guard.lock();
+    return getInfoForLogUnlocked(lock);
 }
 
-String FileSegment::getInfoForLogUnlocked(std::unique_lock<std::mutex> & segment_lock) const
+String FileSegment::getInfoForLogUnlocked(const FileSegmentGuard::Lock &) const
 {
     WriteBufferFromOwnString info;
     info << "File segment: " << range().toString() << ", ";
     info << "key: " << key().toString() << ", ";
-    info << "state: " << download_state << ", ";
-    info << "downloaded size: " << getDownloadedSizeUnlocked(segment_lock) << ", ";
-    info << "reserved size: " << reserved_size << ", ";
+    info << "state: " << download_state.load() << ", ";
+    info << "downloaded size: " << getDownloadedSize(false) << ", ";
+    info << "reserved size: " << reserved_size.load() << ", ";
     info << "downloader id: " << (downloader_id.empty() ? "None" : downloader_id) << ", ";
-    info << "current write offset: " << getCurrentWriteOffsetUnlocked(segment_lock) << ", ";
-    info << "first non-downloaded offset: " << getFirstNonDownloadedOffsetUnlocked(segment_lock) << ", ";
+    info << "current write offset: " << getCurrentWriteOffset(false) << ", ";
+    info << "first non-downloaded offset: " << getFirstNonDownloadedOffset(false) << ", ";
     info << "caller id: " << getCallerId() << ", ";
-    info << "detached: " << is_detached << ", ";
-    info << "kind: " << toString(segment_kind);
+    info << "kind: " << toString(segment_kind) << ", ";
+    info << "unbound: " << is_unbound;
 
     return info.str();
 }
 
-void FileSegment::wrapWithCacheInfo(Exception & e, const String & message, std::unique_lock<std::mutex> & segment_lock) const
-{
-    e.addMessage(fmt::format("{}, current cache state: {}", message, getInfoForLogUnlocked(segment_lock)));
-}
-
 String FileSegment::stateToString(FileSegment::State state)
 {
     switch (state)
@@ -713,188 +717,167 @@ String FileSegment::stateToString(FileSegment::State state)
             return "PARTIALLY DOWNLOADED";
         case FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION:
             return "PARTIALLY DOWNLOADED NO CONTINUATION";
-        case FileSegment::State::SKIP_CACHE:
-            return "SKIP_CACHE";
+        case FileSegment::State::DETACHED:
+            return "DETACHED";
     }
     UNREACHABLE();
 }
 
-void FileSegment::assertCorrectness() const
+bool FileSegment::assertCorrectness() const
 {
-    std::unique_lock segment_lock(mutex);
-    assertCorrectnessUnlocked(segment_lock);
+    return assertCorrectnessUnlocked(segment_guard.lock());
 }
 
-void FileSegment::assertCorrectnessUnlocked(std::unique_lock<std::mutex> & segment_lock) const
+bool FileSegment::assertCorrectnessUnlocked(const FileSegmentGuard::Lock &) const
 {
-    auto current_downloader = getDownloaderUnlocked(segment_lock);
-    chassert(current_downloader.empty() == (download_state != FileSegment::State::DOWNLOADING));
-    chassert(!current_downloader.empty() == (download_state == FileSegment::State::DOWNLOADING));
-    chassert(download_state != FileSegment::State::DOWNLOADED || std::filesystem::file_size(getPathInLocalCache()) > 0);
-}
+    auto check_iterator = [this](const Priority::Iterator & it)
+    {
+        UNUSED(this);
+        if (!it)
+            return;
 
-void FileSegment::throwIfDetachedUnlocked(std::unique_lock<std::mutex> & segment_lock) const
-{
-    throw Exception(
-        ErrorCodes::LOGICAL_ERROR,
-        "Cache file segment is in detached state, operation not allowed. "
-        "It can happen when cache was concurrently dropped with SYSTEM DROP FILESYSTEM CACHE FORCE. "
-        "Please, retry. File segment info: {}", getInfoForLogUnlocked(segment_lock));
+        const auto & entry = it->getEntry();
+        UNUSED(entry);
+        chassert(entry.size == reserved_size);
+        chassert(entry.key == key());
+        chassert(entry.offset == offset());
+    };
+
+    if (download_state == State::DOWNLOADED)
+    {
+        chassert(downloader_id.empty());
+        chassert(downloaded_size == reserved_size);
+        chassert(std::filesystem::file_size(getPathInLocalCache()) > 0);
+        chassert(queue_iterator);
+        check_iterator(queue_iterator);
+    }
+    else
+    {
+        if (download_state == State::DOWNLOADING)
+        {
+            chassert(!downloader_id.empty());
+        }
+        else if (download_state == State::PARTIALLY_DOWNLOADED
+                 || download_state == State::EMPTY)
+        {
+            chassert(downloader_id.empty());
+        }
+
+        chassert(reserved_size >= downloaded_size);
+        chassert((reserved_size == 0) || queue_iterator);
+        check_iterator(queue_iterator);
+    }
+
+    return true;
 }
 
 void FileSegment::assertNotDetached() const
 {
-    std::unique_lock segment_lock(mutex);
-    assertNotDetachedUnlocked(segment_lock);
+    auto lock = segment_guard.lock();
+    assertNotDetachedUnlocked(lock);
 }
 
-void FileSegment::assertNotDetachedUnlocked(std::unique_lock<std::mutex> & segment_lock) const
+void FileSegment::assertNotDetachedUnlocked(const FileSegmentGuard::Lock & lock) const
 {
-    if (is_detached)
-        throwIfDetachedUnlocked(segment_lock);
-}
-
-void FileSegment::assertDetachedStatus(std::unique_lock<std::mutex> & segment_lock) const
-{
-    /// Detached file segment is allowed to have only a certain subset of states.
-    /// It should be either EMPTY or one of the finalized states.
-
-    if (download_state != State::EMPTY && !hasFinalizedStateUnlocked(segment_lock))
+    if (download_state == State::DETACHED)
     {
         throw Exception(
             ErrorCodes::LOGICAL_ERROR,
-            "Detached file segment has incorrect state: {}",
-            getInfoForLogUnlocked(segment_lock));
+            "Cache file segment is in detached state, operation not allowed. "
+            "It can happen when cache was concurrently dropped with SYSTEM DROP FILESYSTEM CACHE FORCE. "
+            "Please, retry. File segment info: {}", getInfoForLogUnlocked(lock));
     }
 }
 
-FileSegmentPtr FileSegment::getSnapshot(const FileSegmentPtr & file_segment, std::lock_guard<std::mutex> & /* cache_lock */)
+FileSegmentPtr FileSegment::getSnapshot(const FileSegmentPtr & file_segment)
 {
-    std::unique_lock segment_lock(file_segment->mutex);
+    auto lock = file_segment->segment_guard.lock();
 
     auto snapshot = std::make_shared<FileSegment>(
+        file_segment->key(),
         file_segment->offset(),
         file_segment->range().size(),
-        file_segment->key(),
-        nullptr,
-        State::EMPTY,
-        CreateFileSegmentSettings{});
+        State::DETACHED,
+        CreateFileSegmentSettings(file_segment->getKind(), file_segment->is_unbound));
 
     snapshot->hits_count = file_segment->getHitsCount();
+    snapshot->downloaded_size = file_segment->getDownloadedSize(false);
+    snapshot->download_state = file_segment->download_state.load();
     snapshot->ref_count = file_segment.use_count();
-    snapshot->downloaded_size = file_segment->getDownloadedSizeUnlocked(segment_lock);
-    snapshot->download_state = file_segment->download_state;
-    snapshot->segment_kind = file_segment->getKind();
 
     return snapshot;
 }
 
-bool FileSegment::hasFinalizedStateUnlocked(std::unique_lock<std::mutex> & /* segment_lock */) const
-{
-    return download_state == State::DOWNLOADED
-        || download_state == State::PARTIALLY_DOWNLOADED_NO_CONTINUATION
-        || download_state == State::SKIP_CACHE;
-}
-
 bool FileSegment::isDetached() const
 {
-    std::unique_lock segment_lock(mutex);
-    return is_detached;
+    auto lock = segment_guard.lock();
+    return download_state == State::DETACHED;
 }
 
-bool FileSegment::isCompleted() const
+bool FileSegment::isCompleted(bool sync) const
 {
-    std::unique_lock segment_lock(mutex);
-    return is_completed;
+    auto is_completed_state = [this]() -> bool
+    {
+        return download_state == State::DOWNLOADED || download_state == State::DETACHED;
+    };
+
+    if (sync)
+    {
+        if (is_completed_state())
+            return true;
+
+        auto lock = segment_guard.lock();
+        return is_completed_state();
+    }
+
+    return is_completed_state();
 }
 
-void FileSegment::detach(std::lock_guard<std::mutex> & /* cache_lock */, std::unique_lock<std::mutex> & segment_lock)
+void FileSegment::setDetachedState(const FileSegmentGuard::Lock & lock)
 {
-    if (is_detached)
+    setDownloadState(State::DETACHED, lock);
+    key_metadata.reset();
+    cache = nullptr;
+}
+
+void FileSegment::detach(const FileSegmentGuard::Lock & lock, const LockedKey &)
+{
+    if (download_state == State::DETACHED)
         return;
 
-    if (download_state == State::DOWNLOADING)
-        resetDownloadingStateUnlocked(segment_lock);
-    else
-        setDownloadState(State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
-
-    resetDownloaderUnlocked(segment_lock);
-    detachAssumeStateFinalized(segment_lock);
+    resetDownloaderUnlocked(lock);
+    setDetachedState(lock);
 }
 
-void FileSegment::detachAssumeStateFinalized(std::unique_lock<std::mutex> & segment_lock)
+void FileSegment::use()
 {
-    is_detached = true;
-    CurrentMetrics::add(CurrentMetrics::CacheDetachedFileSegments);
-    LOG_TEST(log, "Detached file segment: {}", getInfoForLogUnlocked(segment_lock));
-}
-
-FileSegment::~FileSegment()
-{
-    std::unique_lock segment_lock(mutex);
-    if (is_detached)
-        CurrentMetrics::sub(CurrentMetrics::CacheDetachedFileSegments);
-}
-
-void FileSegmentsHolder::reset()
-{
-    /// In CacheableReadBufferFromRemoteFS file segment's downloader removes file segments from
-    /// FileSegmentsHolder right after calling file_segment->complete(), so on destruction here
-    /// remain only uncompleted file segments.
-
-    SCOPE_EXIT({
-        file_segments.clear();
-    });
-
-    FileCache * cache = nullptr;
-
-    for (auto file_segment_it = file_segments.begin(); file_segment_it != file_segments.end();)
+    if (!cache)
     {
-        auto current_file_segment_it = file_segment_it;
-        auto & file_segment = *current_file_segment_it;
-
-        if (!cache)
-            cache = file_segment->cache;
-
-        assert(cache == file_segment->cache); /// all segments should belong to the same cache
-
-        try
-        {
-            bool is_detached = false;
-
-            {
-                std::unique_lock segment_lock(file_segment->mutex);
-                is_detached = file_segment->isDetached(segment_lock);
-                if (is_detached)
-                    file_segment->assertDetachedStatus(segment_lock);
-            }
-
-            if (is_detached)
-            {
-                /// This file segment is not owned by cache, so it will be destructed
-                /// at this point, therefore no completion required.
-                file_segment_it = file_segments.erase(current_file_segment_it);
-                continue;
-            }
-
-            /// File segment pointer must be reset right after calling complete() and
-            /// under the same mutex, because complete() checks for segment pointers.
-            std::lock_guard cache_lock(cache->mutex);
-
-            file_segment->completeWithoutStateUnlocked(cache_lock);
-
-            file_segment_it = file_segments.erase(current_file_segment_it);
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
+        chassert(isCompleted(true));
+        return;
     }
+
+    auto it = getQueueIterator();
+    if (it)
+    {
+        auto cache_lock = cache->lockCache();
+        it->use(cache_lock);
+    }
+}
+
+FileSegments::iterator FileSegmentsHolder::completeAndPopFrontImpl()
+{
+    front().complete();
+    return file_segments.erase(file_segments.begin());
 }
 
 FileSegmentsHolder::~FileSegmentsHolder()
 {
-    reset();
+    if (!complete_on_dtor)
+        return;
+
+    for (auto file_segment_it = file_segments.begin(); file_segment_it != file_segments.end();)
+        file_segment_it = completeAndPopFrontImpl();
 }
 
 String FileSegmentsHolder::toString()
@@ -905,6 +888,8 @@ String FileSegmentsHolder::toString()
         if (!ranges.empty())
             ranges += ", ";
         ranges += file_segment->range().toString();
+        if (file_segment->isUnbound())
+            ranges += "(unbound)";
     }
     return ranges;
 }
diff --git a/src/Interpreters/Cache/FileSegment.h b/src/Interpreters/Cache/FileSegment.h
index d49f73d2aa2..163a15fcfda 100644
--- a/src/Interpreters/Cache/FileSegment.h
+++ b/src/Interpreters/Cache/FileSegment.h
@@ -2,13 +2,16 @@
 
 #include <boost/noncopyable.hpp>
 #include <Interpreters/Cache/FileCacheKey.h>
+#include <Interpreters/Cache/Guards.h>
 
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFileBase.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
+#include <IO/OpenedFileCache.h>
 #include <base/getThreadId.h>
-#include <list>
+#include <Interpreters/Cache/IFileCachePriority.h>
+#include <Interpreters/Cache/FileCache_fwd_internal.h>
 #include <queue>
 
 
@@ -22,14 +25,8 @@ extern const Metric CacheFileSegments;
 namespace DB
 {
 
-class FileCache;
 class ReadBufferFromFileBase;
 
-class FileSegment;
-using FileSegmentPtr = std::shared_ptr<FileSegment>;
-using FileSegments = std::list<FileSegmentPtr>;
-
-
 /*
  * FileSegmentKind is used to specify the eviction policy for file segments.
  */
@@ -61,17 +58,13 @@ struct CreateFileSegmentSettings
     CreateFileSegmentSettings() = default;
 
     explicit CreateFileSegmentSettings(FileSegmentKind kind_, bool unbounded_ = false)
-        : kind(kind_), unbounded(unbounded_)
-    {}
+        : kind(kind_), unbounded(unbounded_) {}
 };
 
-class FileSegment : private boost::noncopyable, public std::enable_shared_from_this<FileSegment>
+class FileSegment : private boost::noncopyable
 {
-
-friend class FileCache;
-friend struct FileSegmentsHolder;
-friend class FileSegmentRangeWriter;
-friend class StorageSystemFilesystemCache;
+friend struct LockedKey;
+friend class FileCache; /// Because of reserved_size in tryReserve().
 
 public:
     using Key = FileCacheKey;
@@ -79,6 +72,7 @@ public:
     using LocalCacheWriterPtr = std::unique_ptr<WriteBufferFromFile>;
     using Downloader = std::string;
     using DownloaderId = std::string;
+    using Priority = IFileCachePriority;
 
     enum class State
     {
@@ -111,18 +105,20 @@ public:
          * If file segment cannot possibly be downloaded (first space reservation attempt failed), mark
          * this file segment as out of cache scope.
          */
-        SKIP_CACHE,
+        DETACHED,
     };
 
     FileSegment(
+        const Key & key_,
         size_t offset_,
         size_t size_,
-        const Key & key_,
-        FileCache * cache_,
         State download_state_,
-        const CreateFileSegmentSettings & create_settings);
+        const CreateFileSegmentSettings & create_settings = {},
+        FileCache * cache_ = nullptr,
+        std::weak_ptr<KeyMetadata> key_metadata_ = std::weak_ptr<KeyMetadata>(),
+        Priority::Iterator queue_iterator_ = Priority::Iterator{});
 
-    ~FileSegment();
+    ~FileSegment() = default;
 
     State state() const;
 
@@ -158,10 +154,10 @@ public:
     size_t offset() const { return range().left; }
 
     FileSegmentKind getKind() const { return segment_kind; }
+
     bool isPersistent() const { return segment_kind == FileSegmentKind::Persistent; }
 
-    using UniqueId = std::pair<FileCacheKey, size_t>;
-    UniqueId getUniqueId() const { return std::pair(key(), offset()); }
+    bool isUnbound() const { return is_unbound; }
 
     String getPathInLocalCache() const;
 
@@ -176,7 +172,7 @@ public:
     DownloaderId getDownloader() const;
 
     /// Wait for the change of state from DOWNLOADING to any other.
-    State wait();
+    State wait(size_t offset);
 
     bool isDownloaded() const;
 
@@ -186,11 +182,13 @@ public:
 
     void incrementHitsCount() { ++hits_count; }
 
-    size_t getCurrentWriteOffset() const;
+    size_t getCurrentWriteOffset(bool sync) const;
 
-    size_t getFirstNonDownloadedOffset() const;
+    size_t getFirstNonDownloadedOffset(bool sync) const;
 
-    size_t getDownloadedSize() const;
+    size_t getDownloadedSize(bool sync) const;
+
+    size_t getReservedSize() const;
 
     /// Now detached status can be used in the following cases:
     /// 1. there is only 1 remaining file segment holder
@@ -206,21 +204,49 @@ public:
     /// 2. Detached file segment can still be hold by some cache users, but it's state became
     /// immutable at the point it was detached, any non-const / stateful method will throw an
     /// exception.
-    void detach(std::lock_guard<std::mutex> & cache_lock, std::unique_lock<std::mutex> & segment_lock);
+    void detach(const FileSegmentGuard::Lock &, const LockedKey &);
 
-    static FileSegmentPtr getSnapshot(const FileSegmentPtr & file_segment, std::lock_guard<std::mutex> & cache_lock);
+    static FileSegmentPtr getSnapshot(const FileSegmentPtr & file_segment);
 
     bool isDetached() const;
 
-    bool isCompleted() const;
+    /// File segment has a completed state, if this state is final and
+    /// is not going to be changed. Completed states: DOWNALODED, DETACHED.
+    bool isCompleted(bool sync = false) const;
 
-    void assertCorrectness() const;
+    void use();
+
+    /**
+     * ========== Methods used by `cache` ========================
+     */
+
+    FileSegmentGuard::Lock lock() const { return segment_guard.lock(); }
+
+    Priority::Iterator getQueueIterator() const;
+
+    void setQueueIterator(Priority::Iterator iterator);
+
+    KeyMetadataPtr tryGetKeyMetadata() const;
+
+    KeyMetadataPtr getKeyMetadata() const;
+
+    bool assertCorrectness() const;
+
+    /**
+     * ========== Methods that must do cv.notify() ==================
+     */
+
+    void complete();
+
+    void completePartAndResetDownloader();
+
+    void resetDownloader();
 
     /**
      * ========== Methods for _only_ file segment's `downloader` ==================
      */
 
-    /// Try to reserve exactly `size` bytes.
+    /// Try to reserve exactly `size` bytes (in addition to the getDownloadedSize() bytes already downloaded).
     /// Returns true if reservation was successful, false otherwise.
     bool reserve(size_t size_to_reserve);
 
@@ -232,139 +258,121 @@ public:
     /// Write data into reserved space.
     void write(const char * from, size_t size, size_t offset);
 
-    /// Complete file segment with a certain state.
-    void completeWithState(State state);
-
-    void completeWithoutState();
-
-    /// Complete file segment's part which was last written.
-    void completePartAndResetDownloader();
-
-    void resetDownloader();
-
+    // Invariant: if state() != DOWNLOADING and remote file reader is present, the reader's
+    // available() == 0, and getFileOffsetOfBufferEnd() == our getCurrentWriteOffset().
+    //
+    // The reader typically requires its internal_buffer to be assigned from the outside before
+    // calling next().
     RemoteFileReaderPtr getRemoteFileReader();
 
     RemoteFileReaderPtr extractRemoteFileReader();
 
-    void setRemoteFileReader(RemoteFileReaderPtr remote_file_reader_);
-
     void resetRemoteFileReader();
 
+    void setRemoteFileReader(RemoteFileReaderPtr remote_file_reader_);
+
     void setDownloadedSize(size_t delta);
 
-    LocalCacheWriterPtr detachWriter();
-
 private:
-    size_t getFirstNonDownloadedOffsetUnlocked(std::unique_lock<std::mutex> & segment_lock) const;
-    size_t getCurrentWriteOffsetUnlocked(std::unique_lock<std::mutex> & segment_lock) const;
-    size_t getDownloadedSizeUnlocked(std::unique_lock<std::mutex> & segment_lock) const;
+    String getDownloaderUnlocked(const FileSegmentGuard::Lock &) const;
+    bool isDownloaderUnlocked(const FileSegmentGuard::Lock & segment_lock) const;
+    void resetDownloaderUnlocked(const FileSegmentGuard::Lock &);
 
-    String getInfoForLogUnlocked(std::unique_lock<std::mutex> & segment_lock) const;
+    void setDownloadState(State state, const FileSegmentGuard::Lock &);
+    void resetDownloadingStateUnlocked(const FileSegmentGuard::Lock &);
+    void setDetachedState(const FileSegmentGuard::Lock &);
 
-    String getDownloaderUnlocked(std::unique_lock<std::mutex> & segment_lock) const;
-    void resetDownloaderUnlocked(std::unique_lock<std::mutex> & segment_lock);
-    void resetDownloadingStateUnlocked(std::unique_lock<std::mutex> & segment_lock);
+    String getInfoForLogUnlocked(const FileSegmentGuard::Lock &) const;
 
-    void setDownloadState(State state);
+    void setDownloadedUnlocked(const FileSegmentGuard::Lock &);
+    void setDownloadFailedUnlocked(const FileSegmentGuard::Lock &);
 
-    void setDownloadedUnlocked(std::unique_lock<std::mutex> & segment_lock);
-    void setDownloadFailedUnlocked(std::unique_lock<std::mutex> & segment_lock);
-    void setDownloadedSizeUnlocked(std::unique_lock<std::mutex> & /* download_lock */, size_t delta);
-
-    bool hasFinalizedStateUnlocked(std::unique_lock<std::mutex> & segment_lock) const;
-
-    bool isDownloaderUnlocked(std::unique_lock<std::mutex> & segment_lock) const;
-
-    bool isDetached(std::unique_lock<std::mutex> & /* segment_lock */) const { return is_detached; }
-    void detachAssumeStateFinalized(std::unique_lock<std::mutex> & segment_lock);
-    [[noreturn]] void throwIfDetachedUnlocked(std::unique_lock<std::mutex> & segment_lock) const;
-
-    void assertDetachedStatus(std::unique_lock<std::mutex> & segment_lock) const;
     void assertNotDetached() const;
-    void assertNotDetachedUnlocked(std::unique_lock<std::mutex> & segment_lock) const;
-    void assertIsDownloaderUnlocked(const std::string & operation, std::unique_lock<std::mutex> & segment_lock) const;
-    void assertCorrectnessUnlocked(std::unique_lock<std::mutex> & segment_lock) const;
+    void assertNotDetachedUnlocked(const FileSegmentGuard::Lock &) const;
+    void assertIsDownloaderUnlocked(const std::string & operation, const FileSegmentGuard::Lock &) const;
+    bool assertCorrectnessUnlocked(const FileSegmentGuard::Lock &) const;
 
-    /// completeWithoutStateUnlocked() is called from destructor of FileSegmentsHolder.
-    /// Function might check if the caller of the method
-    /// is the last alive holder of the segment. Therefore, completion and destruction
-    /// of the file segment pointer must be done under the same cache mutex.
-    void completeWithoutStateUnlocked(std::lock_guard<std::mutex> & cache_lock);
-    void completeBasedOnCurrentState(std::lock_guard<std::mutex> & cache_lock, std::unique_lock<std::mutex> & segment_lock);
-
-    void completePartAndResetDownloaderUnlocked(std::unique_lock<std::mutex> & segment_lock);
-
-    void wrapWithCacheInfo(Exception & e, const String & message, std::unique_lock<std::mutex> & segment_lock) const;
+    LockedKeyPtr lockKeyMetadata(bool assert_exists = true) const;
 
+    Key file_key;
     Range segment_range;
+    const FileSegmentKind segment_kind;
+    /// Size of the segment is not known until it is downloaded and
+    /// can be bigger than max_file_segment_size.
+    const bool is_unbound = false;
 
-    State download_state;
-
-    /// The one who prepares the download
-    DownloaderId downloader_id;
+    std::atomic<State> download_state;
+    DownloaderId downloader_id; /// The one who prepares the download
 
     RemoteFileReaderPtr remote_file_reader;
     LocalCacheWriterPtr cache_writer;
-    bool detached_writer = false;
 
     /// downloaded_size should always be less or equal to reserved_size
-    size_t downloaded_size = 0;
-    size_t reserved_size = 0;
-
-    /// global locking order rule:
-    /// 1. cache lock
-    /// 2. segment lock
-
-    mutable std::mutex mutex;
-    std::condition_variable cv;
-
-    /// Protects downloaded_size access with actual write into fs.
-    /// downloaded_size is not protected by download_mutex in methods which
-    /// can never be run in parallel to FileSegment::write() method
-    /// as downloaded_size is updated only in FileSegment::write() method.
-    /// Such methods are identified by isDownloader() check at their start,
-    /// e.g. they are executed strictly by the same thread, sequentially.
+    std::atomic<size_t> downloaded_size = 0;
+    std::atomic<size_t> reserved_size = 0;
     mutable std::mutex download_mutex;
 
-    Key file_key;
+    mutable FileSegmentGuard segment_guard;
+    std::weak_ptr<KeyMetadata> key_metadata;
+    mutable Priority::Iterator queue_iterator; /// Iterator is put here on first reservation attempt, if successful.
     FileCache * cache;
+    std::condition_variable cv;
 
     Poco::Logger * log;
 
-    /// "detached" file segment means that it is not owned by cache ("detached" from cache).
-    /// In general case, all file segments are owned by cache.
-    bool is_detached = false;
-    bool is_completed = false;
-
-    bool is_downloaded = false;
-
     std::atomic<size_t> hits_count = 0; /// cache hits.
     std::atomic<size_t> ref_count = 0; /// Used for getting snapshot state
 
-    FileSegmentKind segment_kind;
-
-    /// Size of the segment is not known until it is downloaded and can be bigger than max_file_segment_size.
-    bool is_unbound = false;
-
     CurrentMetrics::Increment metric_increment{CurrentMetrics::CacheFileSegments};
 };
 
+
 struct FileSegmentsHolder : private boost::noncopyable
 {
     FileSegmentsHolder() = default;
 
-    explicit FileSegmentsHolder(FileSegments && file_segments_) : file_segments(std::move(file_segments_)) {}
-
-    FileSegmentsHolder(FileSegmentsHolder && other) noexcept : file_segments(std::move(other.file_segments)) {}
-
-    void reset();
-    bool empty() const { return file_segments.empty(); }
+    explicit FileSegmentsHolder(FileSegments && file_segments_, bool complete_on_dtor_ = true)
+        : file_segments(std::move(file_segments_)), complete_on_dtor(complete_on_dtor_) {}
 
     ~FileSegmentsHolder();
 
+    bool empty() const { return file_segments.empty(); }
+
+    size_t size() const { return file_segments.size(); }
+
     String toString();
 
+    void popFront() { completeAndPopFrontImpl(); }
+
+    FileSegment & front() { return *file_segments.front(); }
+
+    FileSegment & back() { return *file_segments.back(); }
+
+    FileSegment & add(FileSegmentPtr && file_segment)
+    {
+        file_segments.push_back(file_segment);
+        return *file_segments.back();
+    }
+
+    FileSegments::iterator begin() { return file_segments.begin(); }
+    FileSegments::iterator end() { return file_segments.end(); }
+
+    FileSegments::const_iterator begin() const { return file_segments.begin(); }
+    FileSegments::const_iterator end() const { return file_segments.end(); }
+
+    void moveTo(FileSegmentsHolder & holder)
+    {
+        holder.file_segments.insert(holder.file_segments.end(), file_segments.begin(), file_segments.end());
+        file_segments.clear();
+    }
+
+private:
     FileSegments file_segments{};
+    const bool complete_on_dtor = true;
+
+    FileSegments::iterator completeAndPopFrontImpl();
 };
 
+using FileSegmentsHolderPtr = std::unique_ptr<FileSegmentsHolder>;
+
 }
diff --git a/src/Interpreters/Cache/Guards.h b/src/Interpreters/Cache/Guards.h
new file mode 100644
index 00000000000..09586b55c61
--- /dev/null
+++ b/src/Interpreters/Cache/Guards.h
@@ -0,0 +1,117 @@
+#pragma once
+#include <mutex>
+#include <boost/noncopyable.hpp>
+
+namespace DB
+{
+/**
+ * FileCache::get/getOrSet/set
+ * 1. CacheMetadataGuard::Lock (take key lock and release metadata lock)
+ * 2. KeyGuard::Lock (hold till the end of the method)
+ *
+ * FileCache::tryReserve
+ * 1. CacheGuard::Lock
+ * 2. KeyGuard::Lock (taken without metadata lock)
+ * 3. any number of KeyGuard::Lock's for files which are going to be evicted (taken via metadata lock)
+ *
+ * FileCache::removeIfExists
+ * 1. CacheGuard::Lock
+ * 2. KeyGuard::Lock (taken via metadata lock)
+ * 3. FileSegmentGuard::Lock
+ *
+ * FileCache::removeAllReleasable
+ * 1. CacheGuard::Lock
+ * 2. any number of KeyGuard::Lock's locks (takken via metadata lock), but at a moment of time only one key lock can be hold
+ * 3. FileSegmentGuard::Lock
+ *
+ * FileCache::getSnapshot (for all cache)
+ * 1. metadata lock
+ * 2. any number of KeyGuard::Lock's locks (takken via metadata lock), but at a moment of time only one key lock can be hold
+ * 3. FileSegmentGuard::Lock
+ *
+ * FileCache::getSnapshot(key)
+ * 1. KeyGuard::Lock (taken via metadata lock)
+ * 2. FileSegmentGuard::Lock
+ *
+ * FileSegment::complete
+ * 1. CacheGuard::Lock
+ * 2. KeyGuard::Lock (taken without metadata lock)
+ * 3. FileSegmentGuard::Lock
+ *
+ * Rules:
+ * 1. Priority of locking: CacheGuard::Lock > CacheMetadataGuard::Lock > KeyGuard::Lock > FileSegmentGuard::Lock
+ * 2. If we take more than one key lock at a moment of time, we need to take CacheGuard::Lock (example: tryReserve())
+ *
+ *
+ *                                 _CacheGuard_
+ *                                 1. FileCache::tryReserve
+ *                                 2. FileCache::removeIfExists(key)
+ *                                 3. FileCache::removeAllReleasable
+ *                                 4. FileSegment::complete
+ *
+ *             _KeyGuard_                                      _CacheMetadataGuard_
+ *             1. all from CacheGuard                          1. getOrSet/get/set
+ *             2. getOrSet/get/Set
+ *
+ * *This table does not include locks taken for introspection and system tables.
+ */
+
+/**
+ * Cache priority queue guard.
+ */
+struct CacheGuard : private boost::noncopyable
+{
+    /// struct is used (not keyword `using`) to make CacheGuard::Lock non-interchangable with other guards locks
+    /// so, we wouldn't be able to pass CacheGuard::Lock to a function which accepts KeyGuard::Lock, for example
+    struct Lock : public std::unique_lock<std::mutex>
+    {
+        explicit Lock(std::mutex & mutex_) : std::unique_lock<std::mutex>(mutex_) {}
+    };
+
+    Lock lock() { return Lock(mutex); }
+    std::mutex mutex;
+};
+
+/**
+ * Guard for cache metadata.
+ */
+struct CacheMetadataGuard : private boost::noncopyable
+{
+    struct Lock : public std::unique_lock<std::mutex>
+    {
+        explicit Lock(std::mutex & mutex_) : std::unique_lock<std::mutex>(mutex_) {}
+    };
+
+    Lock lock() { return Lock(mutex); }
+    std::mutex mutex;
+};
+
+/**
+ * Key guard. A separate guard for each cache key.
+ */
+struct KeyGuard : private boost::noncopyable
+{
+    struct Lock : public std::unique_lock<std::mutex>
+    {
+        explicit Lock(std::mutex & mutex_) : std::unique_lock<std::mutex>(mutex_) {}
+    };
+
+    Lock lock() { return Lock(mutex); }
+    std::mutex mutex;
+};
+
+/**
+ * Guard for a file segment.
+ */
+struct FileSegmentGuard : private boost::noncopyable
+{
+    struct Lock : public std::unique_lock<std::mutex>
+    {
+        explicit Lock(std::mutex & mutex_) : std::unique_lock<std::mutex>(mutex_) {}
+    };
+
+    Lock lock() { return Lock(mutex); }
+    std::mutex mutex;
+};
+
+}
diff --git a/src/Interpreters/Cache/IFileCachePriority.h b/src/Interpreters/Cache/IFileCachePriority.h
index de5e3f1428c..ad63dcc7ea5 100644
--- a/src/Interpreters/Cache/IFileCachePriority.h
+++ b/src/Interpreters/Cache/IFileCachePriority.h
@@ -5,33 +5,35 @@
 #include <Core/Types.h>
 #include <Common/Exception.h>
 #include <Interpreters/Cache/FileCacheKey.h>
+#include <Interpreters/Cache/Guards.h>
+#include <Interpreters/Cache/FileCache_fwd_internal.h>
 
 namespace DB
 {
 
-class IFileCachePriority;
-using FileCachePriorityPtr = std::shared_ptr<IFileCachePriority>;
-
 /// IFileCachePriority is used to maintain the priority of cached data.
-class IFileCachePriority
+class IFileCachePriority : private boost::noncopyable
 {
 public:
-    class IIterator;
     using Key = FileCacheKey;
-    using ReadIterator = std::unique_ptr<const IIterator>;
-    using WriteIterator = std::shared_ptr<IIterator>;
+    using KeyAndOffset = FileCacheKeyAndOffset;
 
-    struct FileCacheRecord
+    struct Entry
     {
-        Key key;
-        size_t offset;
-        size_t size;
-        size_t hits = 0;
+        Entry(const Key & key_, size_t offset_, size_t size_, KeyMetadataPtr key_metadata_)
+            : key(key_), offset(offset_), size(size_), key_metadata(key_metadata_) {}
 
-        FileCacheRecord(const Key & key_, size_t offset_, size_t size_) : key(key_), offset(offset_), size(size_) { }
+        Entry(const Entry & other)
+            : key(other.key), offset(other.offset), size(other.size.load()), hits(other.hits), key_metadata(other.key_metadata) {}
+
+        const Key key;
+        const size_t offset;
+        std::atomic<size_t> size;
+        size_t hits = 0;
+        const KeyMetadataPtr key_metadata;
     };
 
-    /// It provides an iterator to traverse the cache priority. Under normal circumstances,
+    /// Provides an iterator to traverse the cache priority. Under normal circumstances,
     /// the iterator can only return the records that have been directly swapped out.
     /// For example, in the LRU algorithm, it can traverse all records, but in the LRU-K, it
     /// can only traverse the records in the low priority queue.
@@ -40,56 +42,54 @@ public:
     public:
         virtual ~IIterator() = default;
 
-        virtual const Key & key() const = 0;
+        virtual size_t use(const CacheGuard::Lock &) = 0;
 
-        virtual size_t offset() const = 0;
+        virtual std::shared_ptr<IIterator> remove(const CacheGuard::Lock &) = 0;
 
-        virtual size_t size() const = 0;
+        virtual const Entry & getEntry() const = 0;
 
-        virtual size_t hits() const = 0;
+        virtual Entry & getEntry() = 0;
 
-        /// Point the iterator to the next higher priority cache record.
-        virtual void next() const = 0;
+        virtual void annul() = 0;
 
-        virtual bool valid() const = 0;
-
-        /// Mark a cache record as recently used, it will update the priority
-        /// of the cache record according to different cache algorithms.
-        virtual void use(std::lock_guard<std::mutex> &) = 0;
-
-        /// Deletes an existing cached record. And to avoid pointer suspension
-        /// the iterator should automatically point to the next record.
-        virtual void removeAndGetNext(std::lock_guard<std::mutex> &) = 0;
-
-        virtual void incrementSize(size_t, std::lock_guard<std::mutex> &) = 0;
+        virtual void updateSize(int64_t size) = 0;
     };
 
-public:
+    using Iterator = std::shared_ptr<IIterator>;
+    using ConstIterator = std::shared_ptr<const IIterator>;
+
+    enum class IterationResult
+    {
+        BREAK,
+        CONTINUE,
+        REMOVE_AND_CONTINUE,
+    };
+    using IterateFunc = std::function<IterationResult(LockedKey &, FileSegmentMetadataPtr)>;
+
+    IFileCachePriority(size_t max_size_, size_t max_elements_) : max_size(max_size_), max_elements(max_elements_) {}
+
     virtual ~IFileCachePriority() = default;
 
-    /// Add a cache record that did not exist before, and throw a
-    /// logical exception if the cache block already exists.
-    virtual WriteIterator add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock) = 0;
+    size_t getElementsLimit() const { return max_elements; }
 
-    /// This method is used for assertions in debug mode. So we do not care about complexity here.
-    /// Query whether a cache record exists. If it exists, return true. If not, return false.
-    virtual bool contains(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock) = 0;
+    size_t getSizeLimit() const { return max_size; }
 
-    virtual void removeAll(std::lock_guard<std::mutex> & cache_lock) = 0;
+    virtual size_t getSize(const CacheGuard::Lock &) const = 0;
 
-    /// Returns an iterator pointing to the lowest priority cached record.
-    /// We can traverse all cached records through the iterator's next().
-    virtual ReadIterator getLowestPriorityReadIterator(std::lock_guard<std::mutex> & cache_lock) = 0;
+    virtual size_t getElementsCount(const CacheGuard::Lock &) const = 0;
 
-    /// The same as getLowestPriorityReadIterator(), but it is writeable.
-    virtual WriteIterator getLowestPriorityWriteIterator(std::lock_guard<std::mutex> & cache_lock) = 0;
+    virtual Iterator add(
+        KeyMetadataPtr key_metadata, size_t offset, size_t size, const CacheGuard::Lock &) = 0;
 
-    virtual size_t getElementsNum(std::lock_guard<std::mutex> & cache_lock) const = 0;
+    virtual void pop(const CacheGuard::Lock &) = 0;
 
-    size_t getCacheSize(std::lock_guard<std::mutex> &) const { return cache_size; }
+    virtual void removeAll(const CacheGuard::Lock &) = 0;
 
-protected:
-    size_t max_cache_size = 0;
-    size_t cache_size = 0;
-};
+    virtual void iterate(IterateFunc && func, const CacheGuard::Lock &) = 0;
+
+private:
+    const size_t max_size = 0;
+    const size_t max_elements = 0;
 };
+
+}
diff --git a/src/Interpreters/Cache/LRUFileCachePriority.cpp b/src/Interpreters/Cache/LRUFileCachePriority.cpp
index 8010b9c682b..3c36962a0e5 100644
--- a/src/Interpreters/Cache/LRUFileCachePriority.cpp
+++ b/src/Interpreters/Cache/LRUFileCachePriority.cpp
@@ -1,5 +1,8 @@
 #include <Interpreters/Cache/LRUFileCachePriority.h>
+#include <Interpreters/Cache/FileCache.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/randomSeed.h>
+#include <Common/logger_useful.h>
 
 namespace CurrentMetrics
 {
@@ -15,95 +18,167 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-IFileCachePriority::WriteIterator LRUFileCachePriority::add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> &)
+IFileCachePriority::Iterator LRUFileCachePriority::add(
+    KeyMetadataPtr key_metadata,
+    size_t offset,
+    size_t size,
+    const CacheGuard::Lock &)
 {
+    const auto & key = key_metadata->key;
 #ifndef NDEBUG
     for (const auto & entry : queue)
     {
-        if (entry.key == key && entry.offset == offset)
+        /// entry.size == 0 means entry was invalidated.
+        if (entry.size != 0 && entry.key == key && entry.offset == offset)
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
-                "Attempt to add duplicate queue entry to queue. (Key: {}, offset: {}, size: {})",
-                entry.key.toString(), entry.offset, entry.size);
+                "Attempt to add duplicate queue entry to queue. "
+                "(Key: {}, offset: {}, size: {})",
+                entry.key, entry.offset, entry.size);
     }
 #endif
 
-    auto iter = queue.insert(queue.end(), FileCacheRecord(key, offset, size));
-    cache_size += size;
+    const auto & size_limit = getSizeLimit();
+    if (size_limit && current_size + size > size_limit)
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Not enough space to add {}:{} with size {}: current size: {}/{}",
+            key, offset, size, current_size, size_limit);
+    }
+
+    auto iter = queue.insert(queue.end(), Entry(key, offset, size, key_metadata));
+    current_size += size;
 
     CurrentMetrics::add(CurrentMetrics::FilesystemCacheSize, size);
     CurrentMetrics::add(CurrentMetrics::FilesystemCacheElements);
 
-    LOG_TRACE(log, "Added entry into LRU queue, key: {}, offset: {}", key.toString(), offset);
+    LOG_TEST(
+        log, "Added entry into LRU queue, key: {}, offset: {}, size: {}",
+        key, offset, size);
 
     return std::make_shared<LRUFileCacheIterator>(this, iter);
 }
 
-bool LRUFileCachePriority::contains(const Key & key, size_t offset, std::lock_guard<std::mutex> &)
+void LRUFileCachePriority::removeAll(const CacheGuard::Lock &)
 {
-    for (const auto & record : queue)
-    {
-        if (key == record.key && offset == record.offset)
-            return true;
-    }
-    return false;
-}
-
-void LRUFileCachePriority::removeAll(std::lock_guard<std::mutex> &)
-{
-    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheSize, cache_size);
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheSize, current_size);
     CurrentMetrics::sub(CurrentMetrics::FilesystemCacheElements, queue.size());
 
-    LOG_TRACE(log, "Removed all entries from LRU queue");
+    LOG_TEST(log, "Removed all entries from LRU queue");
 
     queue.clear();
-    cache_size = 0;
+    current_size = 0;
+}
+
+void LRUFileCachePriority::pop(const CacheGuard::Lock &)
+{
+    remove(queue.begin());
+}
+
+LRUFileCachePriority::LRUQueueIterator LRUFileCachePriority::remove(LRUQueueIterator it)
+{
+    current_size -= it->size;
+
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheSize, it->size);
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheElements);
+
+    LOG_TEST(
+        log, "Removed entry from LRU queue, key: {}, offset: {}, size: {}",
+        it->key, it->offset, it->size);
+
+    return queue.erase(it);
 }
 
 LRUFileCachePriority::LRUFileCacheIterator::LRUFileCacheIterator(
-    LRUFileCachePriority * cache_priority_, LRUFileCachePriority::LRUQueueIterator queue_iter_)
-    : cache_priority(cache_priority_), queue_iter(queue_iter_)
+    LRUFileCachePriority * cache_priority_,
+    LRUFileCachePriority::LRUQueueIterator queue_iter_)
+    : cache_priority(cache_priority_)
+    , queue_iter(queue_iter_)
 {
 }
 
-IFileCachePriority::ReadIterator LRUFileCachePriority::getLowestPriorityReadIterator(std::lock_guard<std::mutex> &)
+void LRUFileCachePriority::iterate(IterateFunc && func, const CacheGuard::Lock &)
 {
-    return std::make_unique<const LRUFileCacheIterator>(this, queue.begin());
+    for (auto it = queue.begin(); it != queue.end();)
+    {
+        auto locked_key = it->key_metadata->tryLock();
+        if (!locked_key || it->size == 0)
+        {
+            it = remove(it);
+            continue;
+        }
+
+        auto metadata = locked_key->tryGetByOffset(it->offset);
+        if (!metadata)
+        {
+            it = remove(it);
+            continue;
+        }
+
+        if (metadata->size() != it->size)
+        {
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Mismatch of file segment size in file segment metadata "
+                "and priority queue: {} != {} ({})",
+                it->size, metadata->size(), metadata->file_segment->getInfoForLog());
+        }
+
+        auto result = func(*locked_key, metadata);
+        switch (result)
+        {
+            case IterationResult::BREAK:
+            {
+                return;
+            }
+            case IterationResult::CONTINUE:
+            {
+                ++it;
+                break;
+            }
+            case IterationResult::REMOVE_AND_CONTINUE:
+            {
+                it = remove(it);
+                break;
+            }
+        }
+    }
 }
 
-IFileCachePriority::WriteIterator LRUFileCachePriority::getLowestPriorityWriteIterator(std::lock_guard<std::mutex> &)
+LRUFileCachePriority::Iterator
+LRUFileCachePriority::LRUFileCacheIterator::remove(const CacheGuard::Lock &)
 {
-    return std::make_shared<LRUFileCacheIterator>(this, queue.begin());
+    return std::make_shared<LRUFileCacheIterator>(
+        cache_priority, cache_priority->remove(queue_iter));
 }
 
-size_t LRUFileCachePriority::getElementsNum(std::lock_guard<std::mutex> &) const
+void LRUFileCachePriority::LRUFileCacheIterator::annul()
 {
-    return queue.size();
+    updateSize(-queue_iter->size);
+    chassert(queue_iter->size == 0);
 }
 
-void LRUFileCachePriority::LRUFileCacheIterator::removeAndGetNext(std::lock_guard<std::mutex> &)
+void LRUFileCachePriority::LRUFileCacheIterator::updateSize(int64_t size)
 {
-    cache_priority->cache_size -= queue_iter->size;
+    LOG_TEST(
+        cache_priority->log,
+        "Update size with {} in LRU queue for key: {}, offset: {}, previous size: {}",
+        size, queue_iter->key, queue_iter->offset, queue_iter->size);
 
-    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheSize, queue_iter->size);
-    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheElements);
+    cache_priority->current_size += size;
+    queue_iter->size += size;
 
-    LOG_TRACE(cache_priority->log, "Removed entry from LRU queue, key: {}, offset: {}", queue_iter->key.toString(), queue_iter->offset);
+    CurrentMetrics::add(CurrentMetrics::FilesystemCacheSize, size);
 
-    queue_iter = cache_priority->queue.erase(queue_iter);
+    chassert(cache_priority->current_size >= 0);
+    chassert(queue_iter->size >= 0);
 }
 
-void LRUFileCachePriority::LRUFileCacheIterator::incrementSize(size_t size_increment, std::lock_guard<std::mutex> &)
+size_t LRUFileCachePriority::LRUFileCacheIterator::use(const CacheGuard::Lock &)
 {
-    cache_priority->cache_size += size_increment;
-    CurrentMetrics::add(CurrentMetrics::FilesystemCacheSize, size_increment);
-    queue_iter->size += size_increment;
-}
-
-void LRUFileCachePriority::LRUFileCacheIterator::use(std::lock_guard<std::mutex> &)
-{
-    queue_iter->hits++;
     cache_priority->queue.splice(cache_priority->queue.end(), cache_priority->queue, queue_iter);
+    return ++queue_iter->hits;
 }
 
-};
+}
diff --git a/src/Interpreters/Cache/LRUFileCachePriority.h b/src/Interpreters/Cache/LRUFileCachePriority.h
index 2345d3c47db..a80e4647f2d 100644
--- a/src/Interpreters/Cache/LRUFileCachePriority.h
+++ b/src/Interpreters/Cache/LRUFileCachePriority.h
@@ -2,6 +2,7 @@
 
 #include <list>
 #include <Interpreters/Cache/IFileCachePriority.h>
+#include <Interpreters/Cache/FileCacheKey.h>
 #include <Common/logger_useful.h>
 
 namespace DB
@@ -13,55 +14,55 @@ class LRUFileCachePriority : public IFileCachePriority
 {
 private:
     class LRUFileCacheIterator;
-    using LRUQueue = std::list<FileCacheRecord>;
+    using LRUQueue = std::list<Entry>;
     using LRUQueueIterator = typename LRUQueue::iterator;
 
 public:
-    LRUFileCachePriority() = default;
+    LRUFileCachePriority(size_t max_size_, size_t max_elements_) : IFileCachePriority(max_size_, max_elements_) {}
 
-    WriteIterator add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> &) override;
+    size_t getSize(const CacheGuard::Lock &) const override { return current_size; }
 
-    bool contains(const Key & key, size_t offset, std::lock_guard<std::mutex> &) override;
+    size_t getElementsCount(const CacheGuard::Lock &) const override { return queue.size(); }
 
-    void removeAll(std::lock_guard<std::mutex> &) override;
+    Iterator add(KeyMetadataPtr key_metadata, size_t offset, size_t size, const CacheGuard::Lock &) override;
 
-    ReadIterator getLowestPriorityReadIterator(std::lock_guard<std::mutex> &) override;
+    void pop(const CacheGuard::Lock &) override;
 
-    WriteIterator getLowestPriorityWriteIterator(std::lock_guard<std::mutex> &) override;
+    void removeAll(const CacheGuard::Lock &) override;
 
-    size_t getElementsNum(std::lock_guard<std::mutex> &) const override;
+    void iterate(IterateFunc && func, const CacheGuard::Lock &) override;
 
 private:
     LRUQueue queue;
     Poco::Logger * log = &Poco::Logger::get("LRUFileCachePriority");
+
+    std::atomic<size_t> current_size = 0;
+
+    LRUQueueIterator remove(LRUQueueIterator it);
 };
 
 class LRUFileCachePriority::LRUFileCacheIterator : public IFileCachePriority::IIterator
 {
 public:
-    LRUFileCacheIterator(LRUFileCachePriority * cache_priority_, LRUFileCachePriority::LRUQueueIterator queue_iter_);
+    LRUFileCacheIterator(
+        LRUFileCachePriority * cache_priority_,
+        LRUFileCachePriority::LRUQueueIterator queue_iter_);
 
-    void next() const override { queue_iter++; }
+    const Entry & getEntry() const override { return *queue_iter; }
 
-    bool valid() const override { return queue_iter != cache_priority->queue.end(); }
+    Entry & getEntry() override { return *queue_iter; }
 
-    const Key & key() const override { return queue_iter->key; }
+    size_t use(const CacheGuard::Lock &) override;
 
-    size_t offset() const override { return queue_iter->offset; }
+    Iterator remove(const CacheGuard::Lock &) override;
 
-    size_t size() const override { return queue_iter->size; }
+    void annul() override;
 
-    size_t hits() const override { return queue_iter->hits; }
-
-    void removeAndGetNext(std::lock_guard<std::mutex> &) override;
-
-    void incrementSize(size_t size_increment, std::lock_guard<std::mutex> &) override;
-
-    void use(std::lock_guard<std::mutex> &) override;
+    void updateSize(int64_t size) override;
 
 private:
     LRUFileCachePriority * cache_priority;
     mutable LRUFileCachePriority::LRUQueueIterator queue_iter;
 };
 
-};
+}
diff --git a/src/Interpreters/Cache/Metadata.cpp b/src/Interpreters/Cache/Metadata.cpp
new file mode 100644
index 00000000000..843ffd45b63
--- /dev/null
+++ b/src/Interpreters/Cache/Metadata.cpp
@@ -0,0 +1,491 @@
+#include <Interpreters/Cache/Metadata.h>
+#include <Interpreters/Cache/FileCache.h>
+#include <Interpreters/Cache/FileSegment.h>
+#include <Common/logger_useful.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+FileSegmentMetadata::FileSegmentMetadata(FileSegmentPtr && file_segment_)
+    : file_segment(std::move(file_segment_))
+{
+    switch (file_segment->state())
+    {
+        case FileSegment::State::DOWNLOADED:
+        {
+            chassert(file_segment->getQueueIterator());
+            break;
+        }
+        case FileSegment::State::EMPTY:
+        case FileSegment::State::DOWNLOADING:
+        {
+            break;
+        }
+        default:
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Can create file segment with either EMPTY, DOWNLOADED, DOWNLOADING state, got: {}",
+                FileSegment::stateToString(file_segment->state()));
+    }
+}
+
+size_t FileSegmentMetadata::size() const
+{
+    return file_segment->getReservedSize();
+}
+
+KeyMetadata::KeyMetadata(
+    const Key & key_,
+    const std::string & key_path_,
+    CleanupQueue & cleanup_queue_,
+    bool created_base_directory_)
+    : key(key_)
+    , key_path(key_path_)
+    , cleanup_queue(cleanup_queue_)
+    , created_base_directory(created_base_directory_)
+{
+    if (created_base_directory)
+        chassert(fs::exists(key_path));
+}
+
+LockedKeyPtr KeyMetadata::lock()
+{
+    auto locked = tryLock();
+    if (locked)
+        return locked;
+
+    throw Exception(
+        ErrorCodes::LOGICAL_ERROR,
+        "Cannot lock key {} (state: {})", key, magic_enum::enum_name(key_state));
+}
+
+LockedKeyPtr KeyMetadata::tryLock()
+{
+    auto locked = std::make_unique<LockedKey>(shared_from_this());
+    if (key_state == KeyMetadata::KeyState::ACTIVE)
+        return locked;
+
+    return nullptr;
+}
+
+bool KeyMetadata::createBaseDirectory()
+{
+    if (!created_base_directory.exchange(true))
+    {
+        try
+        {
+            fs::create_directories(key_path);
+        }
+        catch (...)
+        {
+            /// Avoid errors like
+            /// std::__1::__fs::filesystem::filesystem_error: filesystem error: in create_directories: No space left on device
+            /// and mark file segment with SKIP_CACHE state
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+            created_base_directory = false;
+            return false;
+        }
+    }
+    return true;
+}
+
+std::string KeyMetadata::getFileSegmentPath(const FileSegment & file_segment)
+{
+    return fs::path(key_path)
+        / CacheMetadata::getFileNameForFileSegment(file_segment.offset(), file_segment.getKind());
+}
+
+
+class CleanupQueue
+{
+    friend struct CacheMetadata;
+public:
+    void add(const FileCacheKey & key);
+    void remove(const FileCacheKey & key);
+    size_t getSize() const;
+
+private:
+    bool tryPop(FileCacheKey & key);
+
+    std::unordered_set<FileCacheKey> keys;
+    mutable std::mutex mutex;
+};
+
+
+CacheMetadata::CacheMetadata(const std::string & path_)
+    : path(path_)
+    , cleanup_queue(std::make_unique<CleanupQueue>())
+    , log(&Poco::Logger::get("CacheMetadata"))
+{
+}
+
+String CacheMetadata::getFileNameForFileSegment(size_t offset, FileSegmentKind segment_kind)
+{
+    String file_suffix;
+    switch (segment_kind)
+    {
+        case FileSegmentKind::Persistent:
+            file_suffix = "_persistent";
+            break;
+        case FileSegmentKind::Temporary:
+            file_suffix = "_temporary";
+            break;
+        case FileSegmentKind::Regular:
+            file_suffix = "";
+            break;
+    }
+    return std::to_string(offset) + file_suffix;
+}
+
+String CacheMetadata::getPathInLocalCache(const Key & key, size_t offset, FileSegmentKind segment_kind) const
+{
+    String file_suffix;
+
+    const auto key_str = key.toString();
+    return fs::path(path) / key_str.substr(0, 3) / key_str / getFileNameForFileSegment(offset, segment_kind);
+}
+
+String CacheMetadata::getPathInLocalCache(const Key & key) const
+{
+    const auto key_str = key.toString();
+    return fs::path(path) / key_str.substr(0, 3) / key_str;
+}
+
+LockedKeyPtr CacheMetadata::lockKeyMetadata(
+    const FileCacheKey & key,
+    KeyNotFoundPolicy key_not_found_policy,
+    bool is_initial_load)
+{
+    KeyMetadataPtr key_metadata;
+    {
+        auto lock = guard.lock();
+
+        auto it = find(key);
+        if (it == end())
+        {
+            if (key_not_found_policy == KeyNotFoundPolicy::THROW)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "No such key `{}` in cache", key);
+            else if (key_not_found_policy == KeyNotFoundPolicy::RETURN_NULL)
+                return nullptr;
+
+            it = emplace(
+                key, std::make_shared<KeyMetadata>(
+                    key, getPathInLocalCache(key), *cleanup_queue, is_initial_load)).first;
+        }
+
+        key_metadata = it->second;
+    }
+
+    {
+        auto locked_metadata = std::make_unique<LockedKey>(key_metadata);
+        const auto key_state = locked_metadata->getKeyState();
+
+        if (key_state == KeyMetadata::KeyState::ACTIVE)
+            return locked_metadata;
+
+        if (key_not_found_policy == KeyNotFoundPolicy::THROW)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "No such key `{}` in cache", key);
+
+        if (key_not_found_policy == KeyNotFoundPolicy::RETURN_NULL)
+            return nullptr;
+
+        if (key_state == KeyMetadata::KeyState::REMOVING)
+        {
+            locked_metadata->removeFromCleanupQueue();
+            LOG_DEBUG(log, "Removal of key {} is cancelled", key);
+            return locked_metadata;
+        }
+
+        chassert(key_state == KeyMetadata::KeyState::REMOVED);
+        chassert(key_not_found_policy == KeyNotFoundPolicy::CREATE_EMPTY);
+    }
+
+    /// Now we are at the case when the key was removed (key_state == KeyMetadata::KeyState::REMOVED)
+    /// but we need to return empty key (key_not_found_policy == KeyNotFoundPolicy::CREATE_EMPTY)
+    /// Retry
+    return lockKeyMetadata(key, key_not_found_policy);
+}
+
+void CacheMetadata::iterate(IterateCacheMetadataFunc && func)
+{
+    auto lock = guard.lock();
+    for (const auto & [key, key_metadata] : *this)
+    {
+        auto locked_key = std::make_unique<LockedKey>(key_metadata);
+        const auto key_state = locked_key->getKeyState();
+
+        if (key_state == KeyMetadata::KeyState::ACTIVE)
+        {
+            func(*locked_key);
+            continue;
+        }
+
+        if (key_state == KeyMetadata::KeyState::REMOVING)
+            continue;
+
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR, "Cannot lock key {}: key does not exist", key_metadata->key);
+    }
+}
+
+void CacheMetadata::doCleanup()
+{
+    auto lock = guard.lock();
+
+    FileCacheKey cleanup_key;
+    while (cleanup_queue->tryPop(cleanup_key))
+    {
+        auto it = find(cleanup_key);
+        if (it == end())
+            continue;
+
+        auto locked_metadata = std::make_unique<LockedKey>(it->second);
+        const auto key_state = locked_metadata->getKeyState();
+
+        if (key_state == KeyMetadata::KeyState::ACTIVE)
+        {
+            /// Key was added back to cache after we submitted it to removal queue.
+            continue;
+        }
+
+        locked_metadata->markAsRemoved();
+        erase(it);
+        LOG_DEBUG(log, "Key {} is removed from metadata", cleanup_key);
+
+        const fs::path key_directory = getPathInLocalCache(cleanup_key);
+        const fs::path key_prefix_directory = key_directory.parent_path();
+
+        try
+        {
+            if (fs::exists(key_directory))
+                fs::remove_all(key_directory);
+        }
+        catch (...)
+        {
+            LOG_ERROR(log, "Error while removing key {}: {}", cleanup_key, getCurrentExceptionMessage(true));
+            chassert(false);
+            continue;
+        }
+
+        try
+        {
+            if (fs::exists(key_prefix_directory) && fs::is_empty(key_prefix_directory))
+                fs::remove_all(key_prefix_directory);
+        }
+        catch (const fs::filesystem_error & e)
+        {
+            /// Key prefix directory can become non-empty just now, it is expected.
+            if (e.code() == std::errc::directory_not_empty)
+                continue;
+            LOG_ERROR(log, "Error while removing key {}: {}", cleanup_key, getCurrentExceptionMessage(true));
+            chassert(false);
+        }
+        catch (...)
+        {
+            LOG_ERROR(log, "Error while removing key {}: {}", cleanup_key, getCurrentExceptionMessage(true));
+            chassert(false);
+        }
+    }
+}
+
+LockedKey::LockedKey(std::shared_ptr<KeyMetadata> key_metadata_)
+    : key_metadata(key_metadata_)
+    , lock(key_metadata->guard.lock())
+#ifdef ABORT_ON_LOGICAL_ERROR
+    , log(&Poco::Logger::get("LockedKey(" + key_metadata_->key.toString() + ")"))
+#else
+    , log(&Poco::Logger::get("LockedKey"))
+#endif
+{
+}
+
+LockedKey::~LockedKey()
+{
+    if (!key_metadata->empty() || getKeyState() != KeyMetadata::KeyState::ACTIVE)
+        return;
+
+    key_metadata->key_state = KeyMetadata::KeyState::REMOVING;
+    LOG_DEBUG(log, "Submitting key {} for removal", getKey());
+    key_metadata->cleanup_queue.add(getKey());
+}
+
+void LockedKey::removeFromCleanupQueue()
+{
+    if (key_metadata->key_state != KeyMetadata::KeyState::REMOVING)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot remove non-removing");
+
+    /// Just mark key_state as "not to be removed", the cleanup thread will check it and skip the key.
+    key_metadata->key_state = KeyMetadata::KeyState::ACTIVE;
+}
+
+void LockedKey::markAsRemoved()
+{
+    key_metadata->key_state = KeyMetadata::KeyState::REMOVED;
+}
+
+bool LockedKey::isLastOwnerOfFileSegment(size_t offset) const
+{
+    const auto file_segment_metadata = getByOffset(offset);
+    return file_segment_metadata->file_segment.use_count() == 2;
+}
+
+void LockedKey::removeAllReleasable()
+{
+    for (auto it = key_metadata->begin(); it != key_metadata->end();)
+    {
+        if (!it->second->releasable())
+        {
+            ++it;
+            continue;
+        }
+
+        auto file_segment = it->second->file_segment;
+        it = removeFileSegment(file_segment->offset(), file_segment->lock());
+    }
+}
+
+KeyMetadata::iterator LockedKey::removeFileSegment(size_t offset, const FileSegmentGuard::Lock & segment_lock)
+{
+    auto it = key_metadata->find(offset);
+    if (it == key_metadata->end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is no offset {}", offset);
+
+    auto file_segment = it->second->file_segment;
+
+    LOG_DEBUG(
+        log, "Remove from cache. Key: {}, offset: {}, size: {}",
+        getKey(), offset, file_segment->reserved_size);
+
+    chassert(file_segment->assertCorrectnessUnlocked(segment_lock));
+
+    if (file_segment->queue_iterator)
+        file_segment->queue_iterator->annul();
+
+    const auto path = key_metadata->getFileSegmentPath(*file_segment);
+    if (fs::exists(path))
+        fs::remove(path);
+
+    file_segment->detach(segment_lock, *this);
+    return key_metadata->erase(it);
+}
+
+void LockedKey::shrinkFileSegmentToDownloadedSize(
+    size_t offset,
+    const FileSegmentGuard::Lock & segment_lock)
+{
+    /**
+     * In case file was partially downloaded and it's download cannot be continued
+     * because of no space left in cache, we need to be able to cut file segment's size to downloaded_size.
+     */
+
+    auto metadata = getByOffset(offset);
+    const auto & file_segment = metadata->file_segment;
+    chassert(file_segment->assertCorrectnessUnlocked(segment_lock));
+
+    const size_t downloaded_size = file_segment->getDownloadedSize(false);
+    if (downloaded_size == file_segment->range().size())
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Nothing to reduce, file segment fully downloaded: {}",
+            file_segment->getInfoForLogUnlocked(segment_lock));
+    }
+
+    chassert(file_segment->reserved_size >= downloaded_size);
+    int64_t diff = file_segment->reserved_size - downloaded_size;
+
+    metadata->file_segment = std::make_shared<FileSegment>(
+        getKey(), offset, downloaded_size, FileSegment::State::DOWNLOADED,
+        CreateFileSegmentSettings(file_segment->getKind()),
+        file_segment->cache, key_metadata, file_segment->queue_iterator);
+
+    if (diff)
+        metadata->getQueueIterator()->updateSize(-diff);
+
+    chassert(file_segment->assertCorrectnessUnlocked(segment_lock));
+}
+
+std::shared_ptr<const FileSegmentMetadata> LockedKey::getByOffset(size_t offset) const
+{
+    auto it = key_metadata->find(offset);
+    if (it == key_metadata->end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is not offset {}", offset);
+    return it->second;
+}
+
+std::shared_ptr<FileSegmentMetadata> LockedKey::getByOffset(size_t offset)
+{
+    auto it = key_metadata->find(offset);
+    if (it == key_metadata->end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is not offset {}", offset);
+    return it->second;
+}
+
+std::shared_ptr<const FileSegmentMetadata> LockedKey::tryGetByOffset(size_t offset) const
+{
+    auto it = key_metadata->find(offset);
+    if (it == key_metadata->end())
+        return nullptr;
+    return it->second;
+}
+
+std::shared_ptr<FileSegmentMetadata> LockedKey::tryGetByOffset(size_t offset)
+{
+    auto it = key_metadata->find(offset);
+    if (it == key_metadata->end())
+        return nullptr;
+    return it->second;
+}
+
+std::string LockedKey::toString() const
+{
+    std::string result;
+    for (auto it = key_metadata->begin(); it != key_metadata->end(); ++it)
+    {
+        if (it != key_metadata->begin())
+            result += ", ";
+        result += std::to_string(it->first);
+    }
+    return result;
+}
+
+void CleanupQueue::add(const FileCacheKey & key)
+{
+    std::lock_guard lock(mutex);
+    keys.insert(key);
+}
+
+void CleanupQueue::remove(const FileCacheKey & key)
+{
+    std::lock_guard lock(mutex);
+    bool erased = keys.erase(key);
+    if (!erased)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No such key {} in removal queue", key);
+}
+
+bool CleanupQueue::tryPop(FileCacheKey & key)
+{
+    std::lock_guard lock(mutex);
+    if (keys.empty())
+        return false;
+    auto it = keys.begin();
+    key = *it;
+    keys.erase(it);
+    return true;
+}
+
+size_t CleanupQueue::getSize() const
+{
+    std::lock_guard lock(mutex);
+    return keys.size();
+}
+
+}
diff --git a/src/Interpreters/Cache/Metadata.h b/src/Interpreters/Cache/Metadata.h
new file mode 100644
index 00000000000..2e015b07ed0
--- /dev/null
+++ b/src/Interpreters/Cache/Metadata.h
@@ -0,0 +1,176 @@
+#pragma once
+#include <boost/noncopyable.hpp>
+#include <Interpreters/Cache/Guards.h>
+#include <Interpreters/Cache/IFileCachePriority.h>
+#include <Interpreters/Cache/FileCacheKey.h>
+#include <Interpreters/Cache/FileSegment.h>
+#include <Interpreters/Cache/FileCache_fwd_internal.h>
+
+namespace DB
+{
+class CleanupQueue;
+using CleanupQueuePtr = std::shared_ptr<CleanupQueue>;
+
+
+struct FileSegmentMetadata : private boost::noncopyable
+{
+    using Priority = IFileCachePriority;
+
+    explicit FileSegmentMetadata(FileSegmentPtr && file_segment_);
+
+    bool releasable() const { return file_segment.unique(); }
+
+    size_t size() const;
+
+    bool valid() const { return !removal_candidate.load(); }
+
+    Priority::Iterator getQueueIterator() const { return file_segment->getQueueIterator(); }
+
+    FileSegmentPtr file_segment;
+    std::atomic<bool> removal_candidate{false};
+};
+
+using FileSegmentMetadataPtr = std::shared_ptr<FileSegmentMetadata>;
+
+
+struct KeyMetadata : public std::map<size_t, FileSegmentMetadataPtr>,
+                     private boost::noncopyable,
+                     public std::enable_shared_from_this<KeyMetadata>
+{
+    friend struct LockedKey;
+    using Key = FileCacheKey;
+
+    KeyMetadata(
+        const Key & key_,
+        const std::string & key_path_,
+        CleanupQueue & cleanup_queue_,
+        bool created_base_directory_ = false);
+
+    enum class KeyState
+    {
+        ACTIVE,
+        REMOVING,
+        REMOVED,
+    };
+
+    const Key key;
+    const std::string key_path;
+
+    LockedKeyPtr lock();
+
+    /// Return nullptr if key has non-ACTIVE state.
+    LockedKeyPtr tryLock();
+
+    bool createBaseDirectory();
+
+    std::string getFileSegmentPath(const FileSegment & file_segment);
+
+private:
+    KeyState key_state = KeyState::ACTIVE;
+    KeyGuard guard;
+    CleanupQueue & cleanup_queue;
+    std::atomic<bool> created_base_directory = false;
+};
+
+using KeyMetadataPtr = std::shared_ptr<KeyMetadata>;
+
+
+struct CacheMetadata : public std::unordered_map<FileCacheKey, KeyMetadataPtr>, private boost::noncopyable
+{
+public:
+    using Key = FileCacheKey;
+    using IterateCacheMetadataFunc = std::function<void(const LockedKey &)>;
+
+    explicit CacheMetadata(const std::string & path_);
+
+    const String & getBaseDirectory() const { return path; }
+
+    String getPathInLocalCache(
+        const Key & key,
+        size_t offset,
+        FileSegmentKind segment_kind) const;
+
+    String getPathInLocalCache(const Key & key) const;
+    static String getFileNameForFileSegment(size_t offset, FileSegmentKind segment_kind);
+
+    void iterate(IterateCacheMetadataFunc && func);
+
+    enum class KeyNotFoundPolicy
+    {
+        THROW,
+        CREATE_EMPTY,
+        RETURN_NULL,
+    };
+
+    LockedKeyPtr lockKeyMetadata(
+        const Key & key,
+        KeyNotFoundPolicy key_not_found_policy,
+        bool is_initial_load = false);
+
+    void doCleanup();
+
+private:
+    const std::string path; /// Cache base path
+    CacheMetadataGuard guard;
+    const CleanupQueuePtr cleanup_queue;
+    Poco::Logger * log;
+};
+
+
+/**
+ * `LockedKey` is an object which makes sure that as long as it exists the following is true:
+ * 1. the key cannot be removed from cache
+ *    (Why: this LockedKey locks key metadata mutex in ctor, unlocks it in dtor, and so
+ *    when key is going to be deleted, key mutex is also locked.
+ *    Why it cannot be the other way round? E.g. that ctor of LockedKey locks the key
+ *    right after it was deleted? This case it taken into consideration in createLockedKey())
+ * 2. the key cannot be modified, e.g. new offsets cannot be added to key; already existing
+ *    offsets cannot be deleted from the key
+ * And also provides some methods which allow the owner of this LockedKey object to do such
+ * modification of the key (adding/deleting offsets) and deleting the key from cache.
+ */
+struct LockedKey : private boost::noncopyable
+{
+    using Key = FileCacheKey;
+
+    explicit LockedKey(std::shared_ptr<KeyMetadata> key_metadata_);
+
+    ~LockedKey();
+
+    const Key & getKey() const { return key_metadata->key; }
+
+    auto begin() const { return key_metadata->begin(); }
+    auto end() const { return key_metadata->end(); }
+
+    std::shared_ptr<const FileSegmentMetadata> getByOffset(size_t offset) const;
+    std::shared_ptr<FileSegmentMetadata> getByOffset(size_t offset);
+
+    std::shared_ptr<const FileSegmentMetadata> tryGetByOffset(size_t offset) const;
+    std::shared_ptr<FileSegmentMetadata> tryGetByOffset(size_t offset);
+
+    KeyMetadata::KeyState getKeyState() const { return key_metadata->key_state; }
+
+    std::shared_ptr<const KeyMetadata> getKeyMetadata() const { return key_metadata; }
+    std::shared_ptr<KeyMetadata> getKeyMetadata() { return key_metadata; }
+
+    void removeAllReleasable();
+
+    KeyMetadata::iterator removeFileSegment(size_t offset, const FileSegmentGuard::Lock &);
+
+    void shrinkFileSegmentToDownloadedSize(size_t offset, const FileSegmentGuard::Lock &);
+
+    bool isLastOwnerOfFileSegment(size_t offset) const;
+
+    void removeFromCleanupQueue();
+
+    void markAsRemoved();
+
+    std::string toString() const;
+
+private:
+    const std::shared_ptr<KeyMetadata> key_metadata;
+    KeyGuard::Lock lock; /// `lock` must be destructed before `key_metadata`.
+    Poco::Logger * log;
+};
+
+}
diff --git a/src/Interpreters/Cache/QueryCache.cpp b/src/Interpreters/Cache/QueryCache.cpp
index b0c8766e505..3118f386111 100644
--- a/src/Interpreters/Cache/QueryCache.cpp
+++ b/src/Interpreters/Cache/QueryCache.cpp
@@ -6,10 +6,10 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/IAST.h>
-#include <Processors/Sources/SourceFromChunks.h>
 #include <Common/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/SipHash.h>
+#include <Common/TTLCachePolicy.h>
 #include <Core/Settings.h>
 #include <base/defines.h> /// chassert
 
@@ -79,9 +79,7 @@ public:
 
             auto is_query_cache_related_setting = [](const auto & change)
             {
-                return change.name == "allow_experimental_query_cache"
-                    || change.name.starts_with("query_cache")
-                    || change.name.ends_with("query_cache");
+                return change.name.starts_with("query_cache_") || change.name.ends_with("_query_cache");
             };
 
             std::erase_if(set_clause->changes, is_query_cache_related_setting);
@@ -121,12 +119,16 @@ ASTPtr removeQueryCacheSettings(ASTPtr ast)
 
 QueryCache::Key::Key(
     ASTPtr ast_,
-    Block header_, const std::optional<String> & username_,
-    std::chrono::time_point<std::chrono::system_clock> expires_at_)
+    Block header_,
+    const String & user_name_, bool is_shared_,
+    std::chrono::time_point<std::chrono::system_clock> expires_at_,
+    bool is_compressed_)
     : ast(removeQueryCacheSettings(ast_))
     , header(header_)
-    , username(username_)
+    , user_name(user_name_)
+    , is_shared(is_shared_)
     , expires_at(expires_at_)
+    , is_compressed(is_compressed_)
 {
 }
 
@@ -152,63 +154,93 @@ size_t QueryCache::KeyHasher::operator()(const Key & key) const
     return res;
 }
 
-size_t QueryCache::QueryResult::sizeInBytes() const
+size_t QueryCache::QueryCacheEntryWeight::operator()(const Entry & entry) const
 {
     size_t res = 0;
-    for (const auto & chunk : *chunks)
+    for (const auto & chunk : entry.chunks)
         res += chunk.allocatedBytes();
+    res += entry.totals.has_value() ? entry.totals->allocatedBytes() : 0;
+    res += entry.extremes.has_value() ? entry.extremes->allocatedBytes() : 0;
     return res;
-};
+}
 
-namespace
-{
-
-auto is_stale = [](const QueryCache::Key & key)
+bool QueryCache::IsStale::operator()(const Key & key) const
 {
     return (key.expires_at < std::chrono::system_clock::now());
 };
 
-}
-
-QueryCache::Writer::Writer(std::mutex & mutex_, Cache & cache_, const Key & key_,
-    size_t & cache_size_in_bytes_, size_t max_cache_size_in_bytes_,
-    size_t max_cache_entries_,
+QueryCache::Writer::Writer(
+    Cache & cache_, const Key & key_,
     size_t max_entry_size_in_bytes_, size_t max_entry_size_in_rows_,
-    std::chrono::milliseconds min_query_runtime_)
-    : mutex(mutex_)
-    , cache(cache_)
+    std::chrono::milliseconds min_query_runtime_,
+    bool squash_partial_results_,
+    size_t max_block_size_)
+    : cache(cache_)
     , key(key_)
-    , cache_size_in_bytes(cache_size_in_bytes_)
-    , max_cache_size_in_bytes(max_cache_size_in_bytes_)
-    , max_cache_entries(max_cache_entries_)
     , max_entry_size_in_bytes(max_entry_size_in_bytes_)
     , max_entry_size_in_rows(max_entry_size_in_rows_)
     , min_query_runtime(min_query_runtime_)
+    , squash_partial_results(squash_partial_results_)
+    , max_block_size(max_block_size_)
 {
-    if (auto it = cache.find(key); it != cache.end() && !is_stale(it->first))
+    if (auto entry = cache.getWithKey(key); entry.has_value() && !IsStale()(entry->key))
     {
         skip_insert = true; /// Key already contained in cache and did not expire yet --> don't replace it
-        LOG_TRACE(&Poco::Logger::get("QueryResultCache"), "Skipped insert (non-stale entry found), query: {}", key.queryStringFromAst());
+        LOG_TRACE(&Poco::Logger::get("QueryCache"), "Skipped insert (non-stale entry found), query: {}", key.queryStringFromAst());
     }
 }
 
-void QueryCache::Writer::buffer(Chunk && partial_query_result)
+QueryCache::Writer::Writer(const Writer & other)
+    : cache(other.cache)
+    , key(other.key)
+    , max_entry_size_in_bytes(other.max_entry_size_in_bytes)
+    , max_entry_size_in_rows(other.max_entry_size_in_rows)
+    , min_query_runtime(other.min_query_runtime)
+    , squash_partial_results(other.squash_partial_results)
+    , max_block_size(other.max_block_size)
+{
+}
+
+void QueryCache::Writer::buffer(Chunk && chunk, ChunkType chunk_type)
 {
     if (skip_insert)
         return;
 
-    auto & chunks = query_result.chunks;
+    /// Reading from the query cache is implemented using processor `SourceFromChunks` which inherits from `ISource`.
+    /// The latter has logic which finishes processing (= calls `.finish()` on the output port + returns `Status::Finished`)
+    /// when the derived class returns an empty chunk. If this empty chunk is not the last chunk,
+    /// i.e. if it is followed by non-empty chunks, the query result will be incorrect.
+    /// This situation should theoretically never occur in practice but who knows...
+    /// To be on the safe side, writing into the query cache now rejects empty chunks and thereby avoids this scenario.
+    if (chunk.empty())
+        return;
 
-    chunks->emplace_back(std::move(partial_query_result));
+    std::lock_guard lock(mutex);
 
-    new_entry_size_in_bytes += chunks->back().allocatedBytes();
-    new_entry_size_in_rows += chunks->back().getNumRows();
-
-    if ((new_entry_size_in_bytes > max_entry_size_in_bytes) || (new_entry_size_in_rows > max_entry_size_in_rows))
+    switch (chunk_type)
     {
-        chunks->clear(); /// eagerly free some space
-        skip_insert = true;
-        LOG_TRACE(&Poco::Logger::get("QueryResultCache"), "Skipped insert (query result too big), new_entry_size_in_bytes: {} ({}), new_entry_size_in_rows: {} ({}), query: {}", new_entry_size_in_bytes, max_entry_size_in_bytes, new_entry_size_in_rows, max_entry_size_in_rows, key.queryStringFromAst());
+        case ChunkType::Result:
+        {
+            /// Normal query result chunks are simply buffered. They are squashed and compressed later in finalizeWrite().
+            query_result->chunks.emplace_back(std::move(chunk));
+            break;
+        }
+        case ChunkType::Totals:
+        case ChunkType::Extremes:
+        {
+            /// For simplicity, totals and extremes chunks are immediately squashed (totals/extremes are obscure and even if enabled, few
+            /// such chunks are expected).
+            auto & buffered_chunk = (chunk_type == ChunkType::Totals) ? query_result->totals : query_result->extremes;
+
+            convertToFullIfSparse(chunk);
+
+            if (!buffered_chunk.has_value())
+                buffered_chunk = std::move(chunk);
+            else
+                buffered_chunk->append(chunk);
+
+            break;
+        }
     }
 }
 
@@ -217,118 +249,239 @@ void QueryCache::Writer::finalizeWrite()
     if (skip_insert)
         return;
 
-    if (std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - query_start_time) < min_query_runtime)
-    {
-        LOG_TRACE(&Poco::Logger::get("QueryResultCache"), "Skipped insert (query not expensive enough), query: {}", key.queryStringFromAst());
-        return;
-    }
-
     std::lock_guard lock(mutex);
 
-    if (auto it = cache.find(key); it != cache.end() && !is_stale(it->first))
+    chassert(!was_finalized);
+
+    /// Check some reasons why the entry must not be cached:
+
+    if (std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - query_start_time) < min_query_runtime)
     {
-        /// same check as in ctor because a parallel Writer could have inserted the current key in the meantime
-        LOG_TRACE(&Poco::Logger::get("QueryResultCache"), "Skipped insert (non-stale entry found), query: {}", key.queryStringFromAst());
+        LOG_TRACE(&Poco::Logger::get("QueryCache"), "Skipped insert (query not expensive enough), query: {}", key.queryStringFromAst());
         return;
     }
 
-    auto sufficient_space_in_cache = [this]() TSA_REQUIRES(mutex)
+    if (auto entry = cache.getWithKey(key); entry.has_value() && !IsStale()(entry->key))
     {
-        return (cache_size_in_bytes + new_entry_size_in_bytes <= max_cache_size_in_bytes) && (cache.size() + 1 <= max_cache_entries);
-    };
-
-    if (!sufficient_space_in_cache())
-    {
-        size_t removed_items = 0;
-        /// Remove stale entries
-        for (auto it = cache.begin(); it != cache.end();)
-            if (is_stale(it->first))
-            {
-                cache_size_in_bytes -= it->second.sizeInBytes();
-                it = cache.erase(it);
-                ++removed_items;
-            }
-            else
-                ++it;
-        LOG_TRACE(&Poco::Logger::get("QueryCache"), "Removed {} stale entries", removed_items);
+        /// same check as in ctor because a parallel Writer could have inserted the current key in the meantime
+        LOG_TRACE(&Poco::Logger::get("QueryCache"), "Skipped insert (non-stale entry found), query: {}", key.queryStringFromAst());
+        return;
     }
 
-    if (!sufficient_space_in_cache())
-        LOG_TRACE(&Poco::Logger::get("QueryResultCache"), "Skipped insert (cache has insufficient space), query: {}", key.queryStringFromAst());
-    else
+    if (squash_partial_results)
     {
-        //// Insert or replace key
-        cache_size_in_bytes += query_result.sizeInBytes();
-        if (auto it = cache.find(key); it != cache.end())
-            cache_size_in_bytes -= it->second.sizeInBytes(); // key replacement
+        // Squash partial result chunks to chunks of size 'max_block_size' each. This costs some performance but provides a more natural
+        // compression of neither too small nor big blocks. Also, it will look like 'max_block_size' is respected when the query result is
+        // served later on from the query cache.
 
-        cache[key] = std::move(query_result);
-        LOG_TRACE(&Poco::Logger::get("QueryCache"), "Stored result of query {}", key.queryStringFromAst());
+        Chunks squashed_chunks;
+        size_t rows_remaining_in_squashed = 0; /// how many further rows can the last squashed chunk consume until it reaches max_block_size
+
+        for (auto & chunk : query_result->chunks)
+        {
+            convertToFullIfSparse(chunk);
+
+            const size_t rows_chunk = chunk.getNumRows();
+            if (rows_chunk == 0)
+                continue;
+
+            size_t rows_chunk_processed = 0;
+            while (true)
+            {
+                if (rows_remaining_in_squashed == 0)
+                {
+                    Chunk empty_chunk = Chunk(chunk.cloneEmptyColumns(), 0);
+                    squashed_chunks.push_back(std::move(empty_chunk));
+                    rows_remaining_in_squashed = max_block_size;
+                }
+
+                const size_t rows_to_append = std::min(rows_chunk - rows_chunk_processed, rows_remaining_in_squashed);
+                squashed_chunks.back().append(chunk, rows_chunk_processed, rows_to_append);
+                rows_chunk_processed += rows_to_append;
+                rows_remaining_in_squashed -= rows_to_append;
+
+                if (rows_chunk_processed == rows_chunk)
+                    break;
+            }
+        }
+
+        query_result->chunks = std::move(squashed_chunks);
+    }
+
+    if (key.is_compressed)
+    {
+        /// Compress result chunks. Reduces the space consumption of the cache but means reading from it will be slower due to decompression.
+
+        Chunks compressed_chunks;
+
+        for (const auto & chunk : query_result->chunks)
+        {
+            const Columns & columns = chunk.getColumns();
+            Columns compressed_columns;
+            for (const auto & column : columns)
+            {
+                auto compressed_column = column->compress();
+                compressed_columns.push_back(compressed_column);
+            }
+            Chunk compressed_chunk(compressed_columns, chunk.getNumRows());
+            compressed_chunks.push_back(std::move(compressed_chunk));
+        }
+        query_result->chunks = std::move(compressed_chunks);
+    }
+
+    /// Check more reasons why the entry must not be cached.
+
+    auto count_rows_in_chunks = [](const Entry & entry)
+    {
+        size_t res = 0;
+        for (const auto & chunk : entry.chunks)
+            res += chunk.getNumRows();
+        res += entry.totals.has_value() ? entry.totals->getNumRows() : 0;
+        res += entry.extremes.has_value() ? entry.extremes->getNumRows() : 0;
+        return res;
+    };
+
+    size_t new_entry_size_in_bytes = QueryCacheEntryWeight()(*query_result);
+    size_t new_entry_size_in_rows = count_rows_in_chunks(*query_result);
+
+    if ((new_entry_size_in_bytes > max_entry_size_in_bytes) || (new_entry_size_in_rows > max_entry_size_in_rows))
+    {
+        LOG_TRACE(&Poco::Logger::get("QueryCache"), "Skipped insert (query result too big), new_entry_size_in_bytes: {} ({}), new_entry_size_in_rows: {} ({}), query: {}", new_entry_size_in_bytes, max_entry_size_in_bytes, new_entry_size_in_rows, max_entry_size_in_rows, key.queryStringFromAst());
+        return;
+    }
+
+    cache.set(key, query_result);
+
+    was_finalized = true;
+}
+
+/// Creates a source processor which serves result chunks stored in the query cache, and separate sources for optional totals/extremes.
+void QueryCache::Reader::buildSourceFromChunks(Block header, Chunks && chunks, const std::optional<Chunk> & totals, const std::optional<Chunk> & extremes)
+{
+    source_from_chunks = std::make_unique<SourceFromChunks>(header, std::move(chunks));
+
+    if (totals.has_value())
+    {
+        Chunks chunks_totals;
+        chunks_totals.emplace_back(totals->clone());
+        source_from_chunks_totals = std::make_unique<SourceFromChunks>(header, std::move(chunks_totals));
+    }
+
+    if (extremes.has_value())
+    {
+        Chunks chunks_extremes;
+        chunks_extremes.emplace_back(extremes->clone());
+        source_from_chunks_extremes = std::make_unique<SourceFromChunks>(header, std::move(chunks_extremes));
     }
 }
 
-QueryCache::Reader::Reader(const Cache & cache_, const Key & key, size_t & cache_size_in_bytes_, const std::lock_guard<std::mutex> &)
+QueryCache::Reader::Reader(Cache & cache_, const Key & key, const std::lock_guard<std::mutex> &)
 {
-    auto it = cache_.find(key);
+    auto entry = cache_.getWithKey(key);
 
-    if (it == cache_.end())
+    if (!entry.has_value())
     {
         LOG_TRACE(&Poco::Logger::get("QueryCache"), "No entry found for query {}", key.queryStringFromAst());
         return;
     }
 
-    if (it->first.username.has_value() && it->first.username != key.username)
+    if (!entry->key.is_shared && entry->key.user_name != key.user_name)
     {
         LOG_TRACE(&Poco::Logger::get("QueryCache"), "Inaccessible entry found for query {}", key.queryStringFromAst());
         return;
     }
 
-    if (is_stale(it->first))
+    if (IsStale()(entry->key))
     {
-        cache_size_in_bytes_ -= it->second.sizeInBytes();
-        const_cast<Cache &>(cache_).erase(it);
-        LOG_TRACE(&Poco::Logger::get("QueryCache"), "Stale entry found and removed for query {}", key.queryStringFromAst());
+        LOG_TRACE(&Poco::Logger::get("QueryCache"), "Stale entry found for query {}", key.queryStringFromAst());
         return;
     }
 
-    pipe = Pipe(std::make_shared<SourceFromChunks>(it->first.header, it->second.chunks));
+    if (!entry->key.is_compressed)
+    {
+        // Cloning chunks isn't exactly great. It could be avoided by another indirection, i.e. wrapping Entry's members chunks, totals and
+        // extremes into shared_ptrs and assuming that the lifecycle of these shared_ptrs coincides with the lifecycle of the Entry
+        // shared_ptr. This is not done 1. to keep things simple 2. this case (uncompressed chunks) is the exceptional case, in the other
+        // case (the default case aka. compressed chunks) we need to decompress the entry anyways and couldn't apply the potential
+        // optimization.
+
+        Chunks cloned_chunks;
+        for (const auto & chunk : entry->mapped->chunks)
+            cloned_chunks.push_back(chunk.clone());
+
+        buildSourceFromChunks(entry->key.header, std::move(cloned_chunks), entry->mapped->totals, entry->mapped->extremes);
+    }
+    else
+    {
+        Chunks decompressed_chunks;
+        const Chunks & chunks = entry->mapped->chunks;
+        for (const auto & chunk : chunks)
+        {
+            const Columns & columns = chunk.getColumns();
+            Columns decompressed_columns;
+            for (const auto & column : columns)
+            {
+                auto decompressed_column = column->decompress();
+                decompressed_columns.push_back(decompressed_column);
+            }
+            Chunk decompressed_chunk(decompressed_columns, chunk.getNumRows());
+            decompressed_chunks.push_back(std::move(decompressed_chunk));
+        }
+
+        buildSourceFromChunks(entry->key.header, std::move(decompressed_chunks), entry->mapped->totals, entry->mapped->extremes);
+    }
+
     LOG_TRACE(&Poco::Logger::get("QueryCache"), "Entry found for query {}", key.queryStringFromAst());
 }
 
 bool QueryCache::Reader::hasCacheEntryForKey() const
 {
-    bool res = !pipe.empty();
+    bool has_entry = (source_from_chunks != nullptr);
 
-    if (res)
+    if (has_entry)
         ProfileEvents::increment(ProfileEvents::QueryCacheHits);
     else
         ProfileEvents::increment(ProfileEvents::QueryCacheMisses);
 
-    return res;
+    return has_entry;
 }
 
-Pipe && QueryCache::Reader::getPipe()
+std::unique_ptr<SourceFromChunks> QueryCache::Reader::getSource()
 {
-    chassert(!pipe.empty()); // cf. hasCacheEntryForKey()
-    return std::move(pipe);
+    return std::move(source_from_chunks);
+}
+
+std::unique_ptr<SourceFromChunks> QueryCache::Reader::getSourceTotals()
+{
+    return std::move(source_from_chunks_totals);
+}
+
+std::unique_ptr<SourceFromChunks> QueryCache::Reader::getSourceExtremes()
+{
+    return std::move(source_from_chunks_extremes);
 }
 
 QueryCache::Reader QueryCache::createReader(const Key & key)
 {
     std::lock_guard lock(mutex);
-    return Reader(cache, key, cache_size_in_bytes, lock);
+    return Reader(cache, key, lock);
 }
 
-QueryCache::Writer QueryCache::createWriter(const Key & key, std::chrono::milliseconds min_query_runtime)
+QueryCache::Writer QueryCache::createWriter(const Key & key, std::chrono::milliseconds min_query_runtime, bool squash_partial_results, size_t max_block_size, size_t max_query_cache_size_in_bytes_quota, size_t max_query_cache_entries_quota)
 {
+    /// Update the per-user cache quotas with the values stored in the query context. This happens per query which writes into the query
+    /// cache. Obviously, this is overkill but I could find the good place to hook into which is called when the settings profiles in
+    /// users.xml change.
+    cache.setQuotaForUser(key.user_name, max_query_cache_size_in_bytes_quota, max_query_cache_entries_quota);
+
     std::lock_guard lock(mutex);
-    return Writer(mutex, cache, key, cache_size_in_bytes, max_cache_size_in_bytes, max_cache_entries, max_cache_entry_size_in_bytes, max_cache_entry_size_in_rows, min_query_runtime);
+    return Writer(cache, key, max_entry_size_in_bytes, max_entry_size_in_rows, min_query_runtime, squash_partial_results, max_block_size);
 }
 
 void QueryCache::reset()
 {
+    cache.reset();
     std::lock_guard lock(mutex);
-    cache.clear();
     times_executed.clear();
     cache_size_in_bytes = 0;
 }
@@ -344,13 +497,28 @@ size_t QueryCache::recordQueryRun(const Key & key)
     return times;
 }
 
+std::vector<QueryCache::Cache::KeyMapped> QueryCache::dump() const
+{
+    return cache.dump();
+}
+
+QueryCache::QueryCache()
+    : cache(std::make_unique<TTLCachePolicy<Key, Entry, KeyHasher, QueryCacheEntryWeight, IsStale>>(std::make_unique<PerUserTTLCachePolicyUserQuota>()))
+{
+}
+
 void QueryCache::updateConfiguration(const Poco::Util::AbstractConfiguration & config)
 {
     std::lock_guard lock(mutex);
-    max_cache_size_in_bytes = config.getUInt64("query_cache.size", 1_GiB);
-    max_cache_entries = config.getUInt64("query_cache.max_entries", 1024);
-    max_cache_entry_size_in_bytes = config.getUInt64("query_cache.max_entry_size", 1_MiB);
-    max_cache_entry_size_in_rows = config.getUInt64("query_cache.max_entry_rows", 30'000'000);
+
+    size_t max_size_in_bytes = config.getUInt64("query_cache.max_size_in_bytes", 1_GiB);
+    cache.setMaxSize(max_size_in_bytes);
+
+    size_t max_entries = config.getUInt64("query_cache.max_entries", 1024);
+    cache.setMaxCount(max_entries);
+
+    max_entry_size_in_bytes = config.getUInt64("query_cache.max_entry_size_in_bytes", 1_MiB);
+    max_entry_size_in_rows = config.getUInt64("query_cache.max_entry_rows_in_rows", 30'000'000);
 }
 
 }
diff --git a/src/Interpreters/Cache/QueryCache.h b/src/Interpreters/Cache/QueryCache.h
index 66477d77dcb..bafa78f13d5 100644
--- a/src/Interpreters/Cache/QueryCache.h
+++ b/src/Interpreters/Cache/QueryCache.h
@@ -1,7 +1,9 @@
 #pragma once
 
+#include <Common/CacheBase.h>
 #include <Core/Block.h>
 #include <Parsers/IAST_fwd.h>
+#include <Processors/Sources/SourceFromChunks.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Processors/Chunk.h>
 #include <QueryPipeline/Pipe.h>
@@ -41,30 +43,36 @@ public:
         /// Result metadata for constructing the pipe.
         const Block header;
 
-        /// Std::nullopt means that the associated entry can be read by other users. In general, sharing is a bad idea: First, it is
-        /// unlikely that different users pose the same queries. Second, sharing potentially breaches security. E.g. User A should not be
-        /// able to bypass row policies on some table by running the same queries as user B for whom no row policies exist.
-        const std::optional<String> username;
+        /// The user who executed the query.
+        const String user_name;
+
+        /// If the associated entry can be read by other users. In general, sharing is a bad idea: First, it is unlikely that different
+        /// users pose the same queries. Second, sharing potentially breaches security. E.g. User A should not be able to bypass row
+        /// policies on some table by running the same queries as user B for whom no row policies exist.
+        bool is_shared;
 
         /// When does the entry expire?
         const std::chrono::time_point<std::chrono::system_clock> expires_at;
 
+        /// Are the chunks in the entry compressed?
+        /// (we could theoretically apply compression also to the totals and extremes but it's an obscure use case)
+        const bool is_compressed;
+
         Key(ASTPtr ast_,
-            Block header_, const std::optional<String> & username_,
-            std::chrono::time_point<std::chrono::system_clock> expires_at_);
+            Block header_,
+            const String & user_name_, bool is_shared_,
+            std::chrono::time_point<std::chrono::system_clock> expires_at_,
+            bool is_compressed);
 
         bool operator==(const Key & other) const;
         String queryStringFromAst() const;
     };
 
-    struct QueryResult
+    struct Entry
     {
-        std::shared_ptr<Chunks> chunks = std::make_shared<Chunks>();
-        size_t sizeInBytes() const;
-
-        /// Notes: 1. For performance reasons, we cache the original result chunks as-is (no concatenation during cache insert or lookup).
-        ///        2. Ref-counting (shared_ptr) ensures that eviction of an entry does not affect queries which still read from the cache.
-        ///           (this can also be achieved by copying the chunks during lookup but that would be under the cache lock --> too slow)
+        Chunks chunks;
+        std::optional<Chunk> totals = std::nullopt;
+        std::optional<Chunk> extremes = std::nullopt;
     };
 
 private:
@@ -73,8 +81,18 @@ private:
         size_t operator()(const Key & key) const;
     };
 
+    struct QueryCacheEntryWeight
+    {
+        size_t operator()(const Entry & entry) const;
+    };
+
+    struct IsStale
+    {
+        bool operator()(const Key & key) const;
+    };
+
     /// query --> query result
-    using Cache = std::unordered_map<Key, QueryResult, KeyHasher>;
+    using Cache = CacheBase<Key, Entry, KeyHasher, QueryCacheEntryWeight>;
 
     /// query --> query execution count
     using TimesExecuted = std::unordered_map<Key, size_t, KeyHasher>;
@@ -94,72 +112,79 @@ public:
     class Writer
     {
     public:
-        void buffer(Chunk && partial_query_result);
+
+        Writer(const Writer & other);
+
+        enum class ChunkType {Result, Totals, Extremes};
+        void buffer(Chunk && chunk, ChunkType chunk_type);
+
         void finalizeWrite();
     private:
-        std::mutex & mutex;
-        Cache & cache TSA_GUARDED_BY(mutex);
+        std::mutex mutex;
+        Cache & cache;
         const Key key;
-        size_t & cache_size_in_bytes TSA_GUARDED_BY(mutex);
-        const size_t max_cache_size_in_bytes;
-        const size_t max_cache_entries;
-        size_t new_entry_size_in_bytes = 0;
         const size_t max_entry_size_in_bytes;
-        size_t new_entry_size_in_rows = 0;
         const size_t max_entry_size_in_rows;
         const std::chrono::time_point<std::chrono::system_clock> query_start_time = std::chrono::system_clock::now(); /// Writer construction and finalizeWrite() coincide with query start/end
         const std::chrono::milliseconds min_query_runtime;
-        QueryResult query_result;
+        const bool squash_partial_results;
+        const size_t max_block_size;
+        Cache::MappedPtr query_result TSA_GUARDED_BY(mutex) = std::make_shared<Entry>();
         std::atomic<bool> skip_insert = false;
+        bool was_finalized = false;
 
-        Writer(std::mutex & mutex_, Cache & cache_, const Key & key_,
-            size_t & cache_size_in_bytes_, size_t max_cache_size_in_bytes_,
-            size_t max_cache_entries_,
+        Writer(Cache & cache_, const Key & key_,
             size_t max_entry_size_in_bytes_, size_t max_entry_size_in_rows_,
-            std::chrono::milliseconds min_query_runtime_);
+            std::chrono::milliseconds min_query_runtime_,
+            bool squash_partial_results_,
+            size_t max_block_size_);
 
         friend class QueryCache; /// for createWriter()
     };
 
-    /// Looks up a query result for a key in the cache and (if found) constructs a pipe with the query result chunks as source.
+    /// Reader's constructor looks up a query result for a key in the cache. If found, it constructs source processors (that generate the
+    /// cached result) for use in a pipe or query pipeline.
     class Reader
     {
     public:
         bool hasCacheEntryForKey() const;
-        Pipe && getPipe(); /// must be called only if hasCacheEntryForKey() returns true
+        /// getSource*() moves source processors out of the Reader. Call each of these method just once.
+        std::unique_ptr<SourceFromChunks> getSource();
+        std::unique_ptr<SourceFromChunks> getSourceTotals();
+        std::unique_ptr<SourceFromChunks> getSourceExtremes();
     private:
-        Reader(const Cache & cache_, const Key & key, size_t & cache_size_in_bytes_, const std::lock_guard<std::mutex> &);
-        Pipe pipe;
+        Reader(Cache & cache_, const Key & key, const std::lock_guard<std::mutex> &);
+        void buildSourceFromChunks(Block header, Chunks && chunks, const std::optional<Chunk> & totals, const std::optional<Chunk> & extremes);
+        std::unique_ptr<SourceFromChunks> source_from_chunks;
+        std::unique_ptr<SourceFromChunks> source_from_chunks_totals;
+        std::unique_ptr<SourceFromChunks> source_from_chunks_extremes;
         friend class QueryCache; /// for createReader()
     };
 
+    QueryCache();
+
     void updateConfiguration(const Poco::Util::AbstractConfiguration & config);
 
     Reader createReader(const Key & key);
-    Writer createWriter(const Key & key, std::chrono::milliseconds min_query_runtime);
+    Writer createWriter(const Key & key, std::chrono::milliseconds min_query_runtime, bool squash_partial_results, size_t max_block_size, size_t max_query_cache_size_in_bytes_quota, size_t max_query_cache_entries_quota);
 
     void reset();
 
     /// Record new execution of query represented by key. Returns number of executions so far.
     size_t recordQueryRun(const Key & key);
 
+    /// For debugging and system tables
+    std::vector<QueryCache::Cache::KeyMapped> dump() const;
+
 private:
-    /// Implementation note: The query result implements a custom caching mechanism and doesn't make use of CacheBase, unlike many other
-    /// internal caches in ClickHouse. The main reason is that we don't need standard CacheBase (S)LRU eviction as the expiry times
-    /// associated with cache entries provide a "natural" eviction criterion. As a future TODO, we could make an expiry-based eviction
-    /// policy and use that with CacheBase (e.g. see #23706)
-    /// TODO To speed up removal of stale entries, we could also add another container sorted on expiry times which maps keys to iterators
-    /// into the cache. To insert an entry, add it to the cache + add the iterator to the sorted container. To remove stale entries, do a
-    /// binary search on the sorted container and erase all left of the found key.
+    Cache cache;
+
     mutable std::mutex mutex;
-    Cache cache TSA_GUARDED_BY(mutex);
     TimesExecuted times_executed TSA_GUARDED_BY(mutex);
 
     /// Cache configuration
-    size_t max_cache_size_in_bytes TSA_GUARDED_BY(mutex) = 0;
-    size_t max_cache_entries TSA_GUARDED_BY(mutex) = 0;
-    size_t max_cache_entry_size_in_bytes TSA_GUARDED_BY(mutex) = 0;
-    size_t max_cache_entry_size_in_rows TSA_GUARDED_BY(mutex) = 0;
+    size_t max_entry_size_in_bytes TSA_GUARDED_BY(mutex) = 0;
+    size_t max_entry_size_in_rows TSA_GUARDED_BY(mutex) = 0;
 
     size_t cache_size_in_bytes TSA_GUARDED_BY(mutex) = 0; /// Updated in each cache insert/delete
 
diff --git a/src/Interpreters/Cache/QueryLimit.cpp b/src/Interpreters/Cache/QueryLimit.cpp
new file mode 100644
index 00000000000..8b5b42cca1a
--- /dev/null
+++ b/src/Interpreters/Cache/QueryLimit.cpp
@@ -0,0 +1,110 @@
+#include <Interpreters/Cache/QueryLimit.h>
+#include <Interpreters/Cache/Metadata.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+static bool isQueryInitialized()
+{
+    return CurrentThread::isInitialized()
+        && CurrentThread::get().getQueryContext()
+        && !CurrentThread::getQueryId().empty();
+}
+
+FileCacheQueryLimit::QueryContextPtr FileCacheQueryLimit::tryGetQueryContext(const CacheGuard::Lock &)
+{
+    if (!isQueryInitialized())
+        return nullptr;
+
+    auto query_iter = query_map.find(std::string(CurrentThread::getQueryId()));
+    return (query_iter == query_map.end()) ? nullptr : query_iter->second;
+}
+
+void FileCacheQueryLimit::removeQueryContext(const std::string & query_id, const CacheGuard::Lock &)
+{
+    auto query_iter = query_map.find(query_id);
+    if (query_iter == query_map.end())
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Attempt to release query context that does not exist (query_id: {})",
+            query_id);
+    }
+    query_map.erase(query_iter);
+}
+
+FileCacheQueryLimit::QueryContextPtr FileCacheQueryLimit::getOrSetQueryContext(
+    const std::string & query_id,
+    const ReadSettings & settings,
+    const CacheGuard::Lock &)
+{
+    if (query_id.empty())
+        return nullptr;
+
+    auto [it, inserted] = query_map.emplace(query_id, nullptr);
+    if (inserted)
+    {
+        it->second = std::make_shared<QueryContext>(
+            settings.filesystem_cache_max_download_size,
+            !settings.skip_download_if_exceeds_query_cache);
+    }
+
+    return it->second;
+}
+
+FileCacheQueryLimit::QueryContext::QueryContext(
+    size_t query_cache_size,
+    bool recache_on_query_limit_exceeded_)
+    : priority(LRUFileCachePriority(query_cache_size, 0))
+    , recache_on_query_limit_exceeded(recache_on_query_limit_exceeded_)
+{
+}
+
+void FileCacheQueryLimit::QueryContext::add(
+    KeyMetadataPtr key_metadata,
+    size_t offset,
+    size_t size,
+    const CacheGuard::Lock & lock)
+{
+    auto it = getPriority().add(key_metadata, offset, size, lock);
+    auto [_, inserted] = records.emplace(FileCacheKeyAndOffset{key_metadata->key, offset}, it);
+    if (!inserted)
+    {
+        it->remove(lock);
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot add offset {} to query context under key {}, it already exists",
+            offset, key_metadata->key);
+    }
+}
+
+void FileCacheQueryLimit::QueryContext::remove(
+    const Key & key,
+    size_t offset,
+    const CacheGuard::Lock & lock)
+{
+    auto record = records.find({key, offset});
+    if (record == records.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is no {}:{} in query context", key, offset);
+
+    record->second->remove(lock);
+    records.erase({key, offset});
+}
+
+IFileCachePriority::Iterator FileCacheQueryLimit::QueryContext::tryGet(
+    const Key & key,
+    size_t offset,
+    const CacheGuard::Lock &)
+{
+    auto it = records.find({key, offset});
+    if (it == records.end())
+        return nullptr;
+    return it->second;
+
+}
+
+}
diff --git a/src/Interpreters/Cache/QueryLimit.h b/src/Interpreters/Cache/QueryLimit.h
new file mode 100644
index 00000000000..f8247e8c520
--- /dev/null
+++ b/src/Interpreters/Cache/QueryLimit.h
@@ -0,0 +1,69 @@
+#pragma once
+#include <Interpreters/Cache/Guards.h>
+#include <Interpreters/Cache/LRUFileCachePriority.h>
+
+namespace DB
+{
+struct ReadSettings;
+class FileSegment;
+
+class FileCacheQueryLimit
+{
+public:
+    class QueryContext;
+    using QueryContextPtr = std::shared_ptr<QueryContext>;
+
+    QueryContextPtr tryGetQueryContext(const CacheGuard::Lock & lock);
+
+    QueryContextPtr getOrSetQueryContext(
+        const std::string & query_id,
+        const ReadSettings & settings,
+        const CacheGuard::Lock &);
+
+    void removeQueryContext(const std::string & query_id, const CacheGuard::Lock &);
+
+    class QueryContext
+    {
+    public:
+        using Key = FileCacheKey;
+        using Priority = IFileCachePriority;
+        using PriorityIterator = IFileCachePriority::Iterator;
+
+        QueryContext(size_t query_cache_size, bool recache_on_query_limit_exceeded_);
+
+        Priority & getPriority() { return priority; }
+        const Priority & getPriority() const { return priority; }
+
+        bool recacheOnFileCacheQueryLimitExceeded() const { return recache_on_query_limit_exceeded; }
+
+        IFileCachePriority::Iterator tryGet(
+            const Key & key,
+            size_t offset,
+            const CacheGuard::Lock &);
+
+        void add(
+            KeyMetadataPtr key_metadata,
+            size_t offset,
+            size_t size,
+            const CacheGuard::Lock &);
+
+        void remove(
+            const Key & key,
+            size_t offset,
+            const CacheGuard::Lock &);
+
+    private:
+        using Records = std::unordered_map<FileCacheKeyAndOffset, IFileCachePriority::Iterator, FileCacheKeyAndOffsetHash>;
+        Records records;
+        LRUFileCachePriority priority;
+        const bool recache_on_query_limit_exceeded;
+    };
+
+private:
+    using QueryContextMap = std::unordered_map<String, QueryContextPtr>;
+    QueryContextMap query_map;
+};
+
+using FileCacheQueryLimitPtr = std::unique_ptr<FileCacheQueryLimit>;
+
+}
diff --git a/src/Interpreters/Cache/WriteBufferToFileSegment.cpp b/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
index 08c083b1976..1eac87a804d 100644
--- a/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
+++ b/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
@@ -1,6 +1,9 @@
 #include <Interpreters/Cache/WriteBufferToFileSegment.h>
 #include <Interpreters/Cache/FileSegment.h>
 #include <IO/SwapHelper.h>
+#include <IO/ReadBufferFromFile.h>
+
+#include <base/scope_guard.h>
 
 #include <Common/logger_useful.h>
 
@@ -9,21 +12,36 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int NOT_ENOUGH_SPACE;
     extern const int LOGICAL_ERROR;
+    extern const int NOT_ENOUGH_SPACE;
 }
 
 WriteBufferToFileSegment::WriteBufferToFileSegment(FileSegment * file_segment_)
-    : WriteBufferFromFileDecorator(file_segment_->detachWriter()), file_segment(file_segment_)
+    : WriteBufferFromFileDecorator(std::make_unique<WriteBufferFromFile>(file_segment_->getPathInLocalCache()))
+    , file_segment(file_segment_)
+{
+}
+
+WriteBufferToFileSegment::WriteBufferToFileSegment(FileSegmentsHolderPtr segment_holder_)
+    : WriteBufferFromFileDecorator(
+        segment_holder_->size() == 1
+        ? std::make_unique<WriteBufferFromFile>(segment_holder_->front().getPathInLocalCache())
+        : throw Exception(ErrorCodes::LOGICAL_ERROR, "WriteBufferToFileSegment can be created only from single segment"))
+    , file_segment(&segment_holder_->front())
+    , segment_holder(std::move(segment_holder_))
 {
-    auto downloader = file_segment->getOrSetDownloader();
-    if (downloader != FileSegment::getCallerId())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to set a downloader. ({})", file_segment->getInfoForLog());
 }
 
 /// If it throws an exception, the file segment will be incomplete, so you should not use it in the future.
 void WriteBufferToFileSegment::nextImpl()
 {
+    auto downloader [[maybe_unused]] = file_segment->getOrSetDownloader();
+    chassert(downloader == FileSegment::getCallerId());
+
+    SCOPE_EXIT({
+        file_segment->completePartAndResetDownloader();
+    });
+
     size_t bytes_to_write = offset();
 
     /// In case of an error, we don't need to finalize the file segment
@@ -47,6 +65,11 @@ void WriteBufferToFileSegment::nextImpl()
     file_segment->setDownloadedSize(bytes_to_write);
 }
 
+std::shared_ptr<ReadBuffer> WriteBufferToFileSegment::getReadBufferImpl()
+{
+    finalize();
+    return std::make_shared<ReadBufferFromFile>(file_segment->getPathInLocalCache());
+}
 
 WriteBufferToFileSegment::~WriteBufferToFileSegment()
 {
diff --git a/src/Interpreters/Cache/WriteBufferToFileSegment.h b/src/Interpreters/Cache/WriteBufferToFileSegment.h
index 4748891a6e0..4d1e82996a3 100644
--- a/src/Interpreters/Cache/WriteBufferToFileSegment.h
+++ b/src/Interpreters/Cache/WriteBufferToFileSegment.h
@@ -1,23 +1,34 @@
 #pragma once
 
 #include <IO/WriteBufferFromFileDecorator.h>
+#include <Interpreters/Cache/FileSegment.h>
+#include <IO/IReadableWriteBuffer.h>
 
 namespace DB
 {
 
 class FileSegment;
 
-class WriteBufferToFileSegment : public WriteBufferFromFileDecorator
+class WriteBufferToFileSegment : public WriteBufferFromFileDecorator, public IReadableWriteBuffer
 {
 public:
     explicit WriteBufferToFileSegment(FileSegment * file_segment_);
+    explicit WriteBufferToFileSegment(FileSegmentsHolderPtr segment_holder);
 
     void nextImpl() override;
 
     ~WriteBufferToFileSegment() override;
 
 private:
+
+    std::shared_ptr<ReadBuffer> getReadBufferImpl() override;
+
+    /// Reference to the file segment in segment_holder if owned by this WriteBufferToFileSegment
+    /// or to the external file segment passed to the constructor
     FileSegment * file_segment;
+
+    /// Empty if file_segment is not owned by this WriteBufferToFileSegment
+    FileSegmentsHolderPtr segment_holder;
 };
 
 
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index bf3a66fed99..8c30dbe230f 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -15,6 +15,7 @@
 #include <base/sort.h>
 #include <boost/range/algorithm_ext/erase.hpp>
 
+#include <span>
 
 namespace DB
 {
@@ -126,24 +127,17 @@ Cluster::Address::Address(
 
 
 Cluster::Address::Address(
-    const String & host_port_,
-    const String & user_,
-    const String & password_,
-    UInt16 clickhouse_port,
-    bool treat_local_port_as_remote,
-    bool secure_,
-    Int64 priority_,
+    const DatabaseReplicaInfo & info,
+    const ClusterConnectionParameters & params,
     UInt32 shard_index_,
-    UInt32 replica_index_,
-    String cluster_name_,
-    String cluster_secret_)
-    : user(user_), password(password_)
+    UInt32 replica_index_)
+    : user(params.username), password(params.password)
 {
     bool can_be_local = true;
     std::pair<std::string, UInt16> parsed_host_port;
-    if (!treat_local_port_as_remote)
+    if (!params.treat_local_port_as_remote)
     {
-        parsed_host_port = parseAddress(host_port_, clickhouse_port);
+        parsed_host_port = parseAddress(info.hostname, params.clickhouse_port);
     }
     else
     {
@@ -153,23 +147,25 @@ Cluster::Address::Address(
         /// If it doesn't include a port then use the default one and it could be local (if the address is)
         try
         {
-            parsed_host_port = parseAddress(host_port_, 0);
+            parsed_host_port = parseAddress(info.hostname, 0);
             can_be_local = false;
         }
         catch (...)
         {
-            parsed_host_port = parseAddress(host_port_, clickhouse_port);
+            parsed_host_port = parseAddress(info.hostname, params.clickhouse_port);
         }
     }
     host_name = parsed_host_port.first;
+    database_shard_name = info.shard_name;
+    database_replica_name = info.replica_name;
     port = parsed_host_port.second;
-    secure = secure_ ? Protocol::Secure::Enable : Protocol::Secure::Disable;
-    priority = priority_;
-    is_local = can_be_local && isLocal(clickhouse_port);
+    secure = params.secure ? Protocol::Secure::Enable : Protocol::Secure::Disable;
+    priority = params.priority;
+    is_local = can_be_local && isLocal(params.clickhouse_port);
     shard_index = shard_index_;
     replica_index = replica_index_;
-    cluster = cluster_name_;
-    cluster_secret = cluster_secret_;
+    cluster = params.cluster_name;
+    cluster_secret = params.cluster_secret;
 }
 
 
@@ -395,6 +391,9 @@ Cluster::Cluster(const Poco::Util::AbstractConfiguration & config,
     secret = config.getString(config_prefix + "secret", "");
     boost::range::remove_erase(config_keys, "secret");
 
+    allow_distributed_ddl_queries = config.getBool(config_prefix + "allow_distributed_ddl_queries", true);
+    boost::range::remove_erase(config_keys, "allow_distributed_ddl_queries");
+
     if (config_keys.empty())
         throw Exception(ErrorCodes::SHARD_HAS_NO_CONNECTIONS, "No cluster elements (shard, node) specified in config at path {}", config_prefix);
 
@@ -488,45 +487,8 @@ Cluster::Cluster(const Poco::Util::AbstractConfiguration & config,
                     throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Unknown element in config: {}", replica_key);
             }
 
-            Addresses shard_local_addresses;
-            Addresses shard_all_addresses;
-
-            ConnectionPoolPtrs all_replicas_pools;
-            all_replicas_pools.reserve(replica_addresses.size());
-
-            for (const auto & replica : replica_addresses)
-            {
-                auto replica_pool = ConnectionPoolFactory::instance().get(
-                    static_cast<unsigned>(settings.distributed_connections_pool_size),
-                    replica.host_name, replica.port,
-                    replica.default_database, replica.user, replica.password, replica.quota_key,
-                    replica.cluster, replica.cluster_secret,
-                    "server", replica.compression,
-                    replica.secure, replica.priority);
-
-                all_replicas_pools.emplace_back(replica_pool);
-                if (replica.is_local)
-                    shard_local_addresses.push_back(replica);
-                shard_all_addresses.push_back(replica);
-            }
-
-            ConnectionPoolWithFailoverPtr shard_pool = std::make_shared<ConnectionPoolWithFailover>(
-                        all_replicas_pools, settings.load_balancing,
-                        settings.distributed_replica_error_half_life.totalSeconds(), settings.distributed_replica_error_cap);
-
-            if (weight)
-                slot_to_shard.insert(std::end(slot_to_shard), weight, shards_info.size());
-
-            shards_info.push_back({
-                std::move(insert_paths),
-                current_shard_num,
-                weight,
-                std::move(shard_local_addresses),
-                std::move(shard_all_addresses),
-                std::move(shard_pool),
-                std::move(all_replicas_pools),
-                internal_replication
-            });
+            addShard(settings, std::move(replica_addresses), /* treat_local_as_remote = */ false, current_shard_num,
+                     std::move(insert_paths), weight, internal_replication);
         }
         else
             throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Unknown element in config: {}", key);
@@ -544,79 +506,102 @@ Cluster::Cluster(const Poco::Util::AbstractConfiguration & config,
 Cluster::Cluster(
     const Settings & settings,
     const std::vector<std::vector<String>> & names,
-    const String & username,
-    const String & password,
-    UInt16 clickhouse_port,
-    bool treat_local_as_remote,
-    bool treat_local_port_as_remote,
-    bool secure,
-    Int64 priority,
-    String cluster_name,
-    String cluster_secret)
+    const ClusterConnectionParameters & params)
 {
     UInt32 current_shard_num = 1;
 
-    secret = cluster_secret;
+    secret = params.cluster_secret;
 
     for (const auto & shard : names)
     {
         Addresses current;
         for (const auto & replica : shard)
             current.emplace_back(
-                replica,
-                username,
-                password,
-                clickhouse_port,
-                treat_local_port_as_remote,
-                secure,
-                priority,
+                DatabaseReplicaInfo{replica, "", ""},
+                params,
                 current_shard_num,
-                current.size() + 1,
-                cluster_name,
-                cluster_secret);
+                current.size() + 1);
 
         addresses_with_failover.emplace_back(current);
 
-        Addresses shard_local_addresses;
-        Addresses all_addresses;
-        ConnectionPoolPtrs all_replicas;
-        all_replicas.reserve(current.size());
-
-        for (const auto & replica : current)
-        {
-            auto replica_pool = ConnectionPoolFactory::instance().get(
-                static_cast<unsigned>(settings.distributed_connections_pool_size),
-                replica.host_name, replica.port,
-                replica.default_database, replica.user, replica.password, replica.quota_key,
-                replica.cluster, replica.cluster_secret,
-                "server", replica.compression, replica.secure, replica.priority);
-            all_replicas.emplace_back(replica_pool);
-            if (replica.is_local && !treat_local_as_remote)
-                shard_local_addresses.push_back(replica);
-            all_addresses.push_back(replica);
-        }
-
-        ConnectionPoolWithFailoverPtr shard_pool = std::make_shared<ConnectionPoolWithFailover>(
-                all_replicas, settings.load_balancing,
-                settings.distributed_replica_error_half_life.totalSeconds(), settings.distributed_replica_error_cap);
-
-        slot_to_shard.insert(std::end(slot_to_shard), default_weight, shards_info.size());
-        shards_info.push_back({
-            {}, // insert_path_for_internal_replication
-            current_shard_num,
-            default_weight,
-            std::move(shard_local_addresses),
-            std::move(all_addresses),
-            std::move(shard_pool),
-            std::move(all_replicas),
-            false // has_internal_replication
-        });
+        addShard(settings, std::move(current), params.treat_local_as_remote, current_shard_num);
         ++current_shard_num;
     }
 
     initMisc();
 }
 
+Cluster::Cluster(
+    const Settings & settings,
+    const std::vector<std::vector<DatabaseReplicaInfo>> & infos,
+    const ClusterConnectionParameters & params)
+{
+    UInt32 current_shard_num = 1;
+
+    secret = params.cluster_secret;
+
+    for (const auto & shard : infos)
+    {
+        Addresses current;
+        for (const auto & replica : shard)
+            current.emplace_back(
+                replica,
+                params,
+                current_shard_num,
+                current.size() + 1);
+
+        addresses_with_failover.emplace_back(current);
+
+        addShard(settings, std::move(current), params.treat_local_as_remote, current_shard_num);
+        ++current_shard_num;
+    }
+
+    initMisc();
+}
+
+void Cluster::addShard(const Settings & settings, Addresses && addresses, bool treat_local_as_remote, UInt32 current_shard_num,
+                       ShardInfoInsertPathForInternalReplication && insert_paths, UInt32 weight, bool internal_replication)
+{
+    Addresses shard_local_addresses;
+    Addresses shard_all_addresses;
+
+    ConnectionPoolPtrs all_replicas_pools;
+    all_replicas_pools.reserve(addresses.size());
+
+    for (const auto & replica : addresses)
+    {
+        auto replica_pool = ConnectionPoolFactory::instance().get(
+            static_cast<unsigned>(settings.distributed_connections_pool_size),
+            replica.host_name, replica.port,
+            replica.default_database, replica.user, replica.password, replica.quota_key,
+            replica.cluster, replica.cluster_secret,
+            "server", replica.compression,
+            replica.secure, replica.priority);
+
+        all_replicas_pools.emplace_back(replica_pool);
+        if (replica.is_local && !treat_local_as_remote)
+            shard_local_addresses.push_back(replica);
+        shard_all_addresses.push_back(replica);
+    }
+    ConnectionPoolWithFailoverPtr shard_pool = std::make_shared<ConnectionPoolWithFailover>(
+        all_replicas_pools, settings.load_balancing,
+        settings.distributed_replica_error_half_life.totalSeconds(), settings.distributed_replica_error_cap);
+
+    if (weight)
+        slot_to_shard.insert(std::end(slot_to_shard), weight, shards_info.size());
+
+    shards_info.push_back({
+        std::move(insert_paths),
+        current_shard_num,
+        weight,
+        std::move(shard_local_addresses),
+        std::move(shard_all_addresses),
+        std::move(shard_pool),
+        std::move(all_replicas_pools),
+        internal_replication
+    });
+}
+
 
 Poco::Timespan Cluster::saturate(Poco::Timespan v, Poco::Timespan limit)
 {
@@ -653,9 +638,9 @@ void Cluster::initMisc()
     }
 }
 
-std::unique_ptr<Cluster> Cluster::getClusterWithReplicasAsShards(const Settings & settings) const
+std::unique_ptr<Cluster> Cluster::getClusterWithReplicasAsShards(const Settings & settings, size_t max_replicas_from_shard) const
 {
-    return std::unique_ptr<Cluster>{ new Cluster(ReplicasAsShardsTag{}, *this, settings)};
+    return std::unique_ptr<Cluster>{ new Cluster(ReplicasAsShardsTag{}, *this, settings, max_replicas_from_shard)};
 }
 
 std::unique_ptr<Cluster> Cluster::getClusterWithSingleShard(size_t index) const
@@ -668,7 +653,44 @@ std::unique_ptr<Cluster> Cluster::getClusterWithMultipleShards(const std::vector
     return std::unique_ptr<Cluster>{ new Cluster(SubclusterTag{}, *this, indices) };
 }
 
-Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Settings & settings)
+namespace
+{
+
+void shuffleReplicas(std::vector<Cluster::Address> & replicas, const Settings & settings, size_t replicas_needed)
+{
+    std::random_device rd;
+    std::mt19937 gen{rd()};
+
+    if (settings.prefer_localhost_replica)
+    {
+        // force for local replica to always be included
+        auto first_non_local_replica = std::partition(replicas.begin(), replicas.end(), [](const auto & replica) { return replica.is_local; });
+        size_t local_replicas_count = first_non_local_replica - replicas.begin();
+
+        if (local_replicas_count == replicas_needed)
+        {
+            /// we have exact amount of local replicas as needed, no need to do anything
+            return;
+        }
+
+        if (local_replicas_count > replicas_needed)
+        {
+            /// we can use only local replicas, shuffle them
+            std::shuffle(replicas.begin(), first_non_local_replica, gen);
+            return;
+        }
+
+        /// shuffle just non local replicas
+        std::shuffle(first_non_local_replica, replicas.end(), gen);
+        return;
+    }
+
+    std::shuffle(replicas.begin(), replicas.end(), gen);
+}
+
+}
+
+Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Settings & settings, size_t max_replicas_from_shard)
 {
     if (from.addresses_with_failover.empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cluster is empty");
@@ -677,40 +699,55 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
     std::set<std::pair<String, int>> unique_hosts;
     for (size_t shard_index : collections::range(0, from.shards_info.size()))
     {
-        const auto & replicas = from.addresses_with_failover[shard_index];
-        for (const auto & address : replicas)
+        auto create_shards_from_replicas = [&](std::span<const Address> replicas)
         {
-            if (!unique_hosts.emplace(address.host_name, address.port).second)
-                continue;   /// Duplicate host, skip.
+            for (const auto & address : replicas)
+            {
+                if (!unique_hosts.emplace(address.host_name, address.port).second)
+                    continue;   /// Duplicate host, skip.
 
-            ShardInfo info;
-            info.shard_num = ++shard_num;
+                ShardInfo info;
+                info.shard_num = ++shard_num;
 
-            if (address.is_local)
-                info.local_addresses.push_back(address);
+                if (address.is_local)
+                    info.local_addresses.push_back(address);
 
-            info.all_addresses.push_back(address);
+                info.all_addresses.push_back(address);
 
-            auto pool = ConnectionPoolFactory::instance().get(
-                static_cast<unsigned>(settings.distributed_connections_pool_size),
-                address.host_name,
-                address.port,
-                address.default_database,
-                address.user,
-                address.password,
-                address.quota_key,
-                address.cluster,
-                address.cluster_secret,
-                "server",
-                address.compression,
-                address.secure,
-                address.priority);
+                auto pool = ConnectionPoolFactory::instance().get(
+                    static_cast<unsigned>(settings.distributed_connections_pool_size),
+                    address.host_name,
+                    address.port,
+                    address.default_database,
+                    address.user,
+                    address.password,
+                    address.quota_key,
+                    address.cluster,
+                    address.cluster_secret,
+                    "server",
+                    address.compression,
+                    address.secure,
+                    address.priority);
 
-            info.pool = std::make_shared<ConnectionPoolWithFailover>(ConnectionPoolPtrs{pool}, settings.load_balancing);
-            info.per_replica_pools = {std::move(pool)};
+                info.pool = std::make_shared<ConnectionPoolWithFailover>(ConnectionPoolPtrs{pool}, settings.load_balancing);
+                info.per_replica_pools = {std::move(pool)};
 
-            addresses_with_failover.emplace_back(Addresses{address});
-            shards_info.emplace_back(std::move(info));
+                addresses_with_failover.emplace_back(Addresses{address});
+                shards_info.emplace_back(std::move(info));
+            }
+        };
+
+        const auto & replicas = from.addresses_with_failover[shard_index];
+        if (!max_replicas_from_shard || replicas.size() <= max_replicas_from_shard)
+        {
+            create_shards_from_replicas(replicas);
+        }
+        else
+        {
+            auto shuffled_replicas = replicas;
+            // shuffle replicas so we don't always pick the same subset
+            shuffleReplicas(shuffled_replicas, settings, max_replicas_from_shard);
+            create_shards_from_replicas(std::span{shuffled_replicas.begin(), max_replicas_from_shard});
         }
     }
 
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index a7f5a914974..4798384f29c 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -29,6 +29,26 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+struct DatabaseReplicaInfo
+{
+    String hostname;
+    String shard_name;
+    String replica_name;
+};
+
+struct ClusterConnectionParameters
+{
+    const String & username;
+    const String & password;
+    UInt16 clickhouse_port;
+    bool treat_local_as_remote;
+    bool treat_local_port_as_remote;
+    bool secure = false;
+    Int64 priority = 1;
+    String cluster_name;
+    String cluster_secret;
+};
+
 /// Cluster contains connection pools to each node
 /// With the local nodes, the connection is not established, but the request is executed directly.
 /// Therefore we store only the number of local nodes
@@ -51,15 +71,13 @@ public:
     Cluster(
         const Settings & settings,
         const std::vector<std::vector<String>> & names,
-        const String & username,
-        const String & password,
-        UInt16 clickhouse_port,
-        bool treat_local_as_remote,
-        bool treat_local_port_as_remote,
-        bool secure = false,
-        Int64 priority = 1,
-        String cluster_name = "",
-        String cluster_secret = "");
+        const ClusterConnectionParameters & params);
+
+
+    Cluster(
+        const Settings & settings,
+        const std::vector<std::vector<DatabaseReplicaInfo>> & infos,
+        const ClusterConnectionParameters & params);
 
     Cluster(const Cluster &)= delete;
     Cluster & operator=(const Cluster &) = delete;
@@ -90,6 +108,8 @@ public:
         */
 
         String host_name;
+        String database_shard_name;
+        String database_replica_name;
         UInt16 port{0};
         String user;
         String password;
@@ -125,16 +145,15 @@ public:
 
         Address(
             const String & host_port_,
-            const String & user_,
-            const String & password_,
-            UInt16 clickhouse_port,
-            bool treat_local_port_as_remote,
-            bool secure_ = false,
-            Int64 priority_ = 1,
-            UInt32 shard_index_ = 0,
-            UInt32 replica_index_ = 0,
-            String cluster_name = "",
-            String cluster_secret_ = "");
+            const ClusterConnectionParameters & params,
+            UInt32 shard_index_,
+            UInt32 replica_index_);
+
+        Address(
+            const DatabaseReplicaInfo & info,
+            const ClusterConnectionParameters & params,
+            UInt32 shard_index_,
+            UInt32 replica_index_);
 
         /// Returns 'escaped_host_name:port'
         String toString() const;
@@ -250,12 +269,15 @@ public:
     std::unique_ptr<Cluster> getClusterWithMultipleShards(const std::vector<size_t> & indices) const;
 
     /// Get a new Cluster that contains all servers (all shards with all replicas) from existing cluster as independent shards.
-    std::unique_ptr<Cluster> getClusterWithReplicasAsShards(const Settings & settings) const;
+    std::unique_ptr<Cluster> getClusterWithReplicasAsShards(const Settings & settings, size_t max_replicas_from_shard = 0) const;
 
     /// Returns false if cluster configuration doesn't allow to use it for cross-replication.
     /// NOTE: true does not mean, that it's actually a cross-replication cluster.
     bool maybeCrossReplication() const;
 
+    /// Are distributed DDL Queries (ON CLUSTER Clause) allowed for this cluster
+    bool areDistributedDDLQueriesAllowed() const { return allow_distributed_ddl_queries; }
+
 private:
     SlotToShard slot_to_shard;
 
@@ -271,7 +293,10 @@ private:
 
     /// For getClusterWithReplicasAsShards implementation
     struct ReplicasAsShardsTag {};
-    Cluster(ReplicasAsShardsTag, const Cluster & from, const Settings & settings);
+    Cluster(ReplicasAsShardsTag, const Cluster & from, const Settings & settings, size_t max_replicas_from_shard);
+
+    void addShard(const Settings & settings, Addresses && addresses, bool treat_local_as_remote, UInt32 current_shard_num,
+                  ShardInfoInsertPathForInternalReplication && insert_paths = {}, UInt32 weight = 1, bool internal_replication = false);
 
     /// Inter-server secret
     String secret;
@@ -287,6 +312,8 @@ private:
     /// An array of shards. For each shard, an array of replica addresses (servers that are considered identical).
     AddressesWithFailover addresses_with_failover;
 
+    bool allow_distributed_ddl_queries = true;
+
     size_t remote_shard_count = 0;
     size_t local_shard_count = 0;
 
diff --git a/src/Interpreters/ClusterDiscovery.cpp b/src/Interpreters/ClusterDiscovery.cpp
index 36b2f17e8a1..884e3b87343 100644
--- a/src/Interpreters/ClusterDiscovery.cpp
+++ b/src/Interpreters/ClusterDiscovery.cpp
@@ -125,10 +125,12 @@ ClusterDiscovery::ClusterDiscovery(
             ClusterInfo(
                 /* name_= */ key,
                 /* zk_root_= */ config.getString(prefix + ".path"),
+                /* host_name= */ config.getString(prefix + ".my_hostname", getFQDNOrHostName()),
                 /* port= */ context->getTCPPort(),
                 /* secure= */ config.getBool(prefix + ".secure", false),
                 /* shard_id= */ config.getUInt(prefix + ".shard", 0),
-                /* observer_mode= */ ConfigHelper::getBool(config, prefix + ".observer")
+                /* observer_mode= */ ConfigHelper::getBool(config, prefix + ".observer"),
+                /* invisible= */ ConfigHelper::getBool(config, prefix + ".invisible")
             )
         );
     }
@@ -149,7 +151,7 @@ Strings ClusterDiscovery::getNodeNames(zkutil::ZooKeeperPtr & zk,
                                        int * version,
                                        bool set_callback)
 {
-    auto watch_callback = [cluster_name, clusters_to_update=clusters_to_update](auto) { clusters_to_update->set(cluster_name); };
+    auto watch_callback = [cluster_name, my_clusters_to_update = clusters_to_update](auto) { my_clusters_to_update->set(cluster_name); };
 
     Coordination::Stat stat;
     Strings nodes = zk->getChildrenWatch(getShardsListPath(zk_root), &stat, set_callback ? watch_callback : Coordination::WatchCallback{});
@@ -219,7 +221,7 @@ ClusterPtr ClusterDiscovery::makeCluster(const ClusterInfo & cluster_info)
 {
     std::vector<Strings> shards;
     {
-        std::map<size_t, Strings> replica_adresses;
+        std::map<size_t, Strings> replica_addresses;
 
         for (const auto & [_, node] : cluster_info.nodes_info)
         {
@@ -228,24 +230,29 @@ ClusterPtr ClusterDiscovery::makeCluster(const ClusterInfo & cluster_info)
                 LOG_WARNING(log, "Node '{}' in cluster '{}' has different 'secure' value, skipping it", node.address, cluster_info.name);
                 continue;
             }
-            replica_adresses[node.shard_id].emplace_back(node.address);
+            replica_addresses[node.shard_id].emplace_back(node.address);
         }
 
-        shards.reserve(replica_adresses.size());
-        for (auto & [_, replicas] : replica_adresses)
+        shards.reserve(replica_addresses.size());
+        for (auto & [_, replicas] : replica_addresses)
             shards.emplace_back(std::move(replicas));
     }
 
     bool secure = cluster_info.current_node.secure;
-    auto cluster = std::make_shared<Cluster>(
-        context->getSettingsRef(),
-        shards,
+    ClusterConnectionParameters params{
         /* username= */ context->getUserName(),
         /* password= */ "",
         /* clickhouse_port= */ secure ? context->getTCPPortSecure().value_or(DBMS_DEFAULT_SECURE_PORT) : context->getTCPPort(),
         /* treat_local_as_remote= */ false,
         /* treat_local_port_as_remote= */ false, /// should be set only for clickhouse-local, but cluster discovery is not used there
-        /* secure= */ secure);
+        /* secure= */ secure,
+        /* priority= */ 1,
+        /* cluster_name= */ "",
+        /* password= */ ""};
+    auto cluster = std::make_shared<Cluster>(
+        context->getSettingsRef(),
+        shards,
+        params);
     return cluster;
 }
 
@@ -289,6 +296,12 @@ bool ClusterDiscovery::updateCluster(ClusterInfo & cluster_info)
         return false;
     }
 
+    if (cluster_info.current_cluster_is_invisible)
+    {
+        LOG_DEBUG(log, "cluster '{}' is invisible!", cluster_info.name);
+        return true;
+    }
+
     if (!needUpdate(node_uuids, nodes_info))
     {
         LOG_DEBUG(log, "No update required for cluster '{}'", cluster_info.name);
@@ -308,7 +321,9 @@ bool ClusterDiscovery::updateCluster(ClusterInfo & cluster_info)
     LOG_DEBUG(log, "Updating system.clusters record for '{}' with {} nodes", cluster_info.name, cluster_info.nodes_info.size());
 
     auto cluster = makeCluster(cluster_info);
-    context->setCluster(cluster_info.name, cluster);
+
+    std::lock_guard lock(mutex);
+    cluster_impls[cluster_info.name] = cluster;
     return true;
 }
 
@@ -445,6 +460,21 @@ bool ClusterDiscovery::runMainThread(std::function<void()> up_to_date_callback)
     return finished;
 }
 
+ClusterPtr ClusterDiscovery::getCluster(const String & cluster_name) const
+{
+    std::lock_guard lock(mutex);
+    auto it = cluster_impls.find(cluster_name);
+    if (it == cluster_impls.end())
+        return nullptr;
+    return it->second;
+}
+
+std::unordered_map<String, ClusterPtr> ClusterDiscovery::getClusters() const
+{
+    std::lock_guard lock(mutex);
+    return cluster_impls;
+}
+
 void ClusterDiscovery::shutdown()
 {
     LOG_DEBUG(log, "Shutting down");
@@ -456,7 +486,14 @@ void ClusterDiscovery::shutdown()
 
 ClusterDiscovery::~ClusterDiscovery()
 {
-    ClusterDiscovery::shutdown();
+    try
+    {
+        ClusterDiscovery::shutdown();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, "Error on ClusterDiscovery shutdown");
+    }
 }
 
 bool ClusterDiscovery::NodeInfo::parse(const String & data, NodeInfo & result)
diff --git a/src/Interpreters/ClusterDiscovery.h b/src/Interpreters/ClusterDiscovery.h
index 1c7337406b7..140e3691c03 100644
--- a/src/Interpreters/ClusterDiscovery.h
+++ b/src/Interpreters/ClusterDiscovery.h
@@ -3,7 +3,6 @@
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/ThreadPool.h>
 #include <Common/ZooKeeper/Common.h>
-#include <base/getFQDNOrHostName.h>
 #include <Interpreters/Cluster.h>
 
 #include <Poco/Logger.h>
@@ -33,6 +32,9 @@ public:
 
     void start();
 
+    ClusterPtr getCluster(const String & cluster_name) const;
+    std::unordered_map<String, ClusterPtr> getClusters() const;
+
     ~ClusterDiscovery();
 
 private:
@@ -75,16 +77,24 @@ private:
         /// Current node may not belong to cluster, to be just an observer.
         bool current_node_is_observer = false;
 
+        /// For internal management need.
+        /// Is it designed that when deploying multiple compute groups,
+        /// they are mutually invisible to each other.
+        bool current_cluster_is_invisible = false;
+
         explicit ClusterInfo(const String & name_,
                              const String & zk_root_,
+                             const String & host_name,
                              UInt16 port,
                              bool secure,
                              size_t shard_id,
-                             bool observer_mode)
+                             bool observer_mode,
+                             bool invisible)
             : name(name_)
             , zk_root(zk_root_)
-            , current_node(getFQDNOrHostName() + ":" + toString(port), secure, shard_id)
+            , current_node(host_name + ":" + toString(port), secure, shard_id)
             , current_node_is_observer(observer_mode)
+            , current_cluster_is_invisible(invisible)
         {
         }
     };
@@ -124,6 +134,9 @@ private:
     /// It prevents accessing to invalid object after ClusterDiscovery is destroyed.
     std::shared_ptr<UpdateFlags> clusters_to_update;
 
+    mutable std::mutex mutex;
+    std::unordered_map<String, ClusterPtr> cluster_impls;
+
     ThreadFromGlobalPool main_thread;
 
     Poco::Logger * log;
diff --git a/src/Interpreters/ClusterProxy/executeQuery.cpp b/src/Interpreters/ClusterProxy/executeQuery.cpp
index 85a012d126f..e2f1dfe8ba7 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.cpp
+++ b/src/Interpreters/ClusterProxy/executeQuery.cpp
@@ -10,6 +10,7 @@
 #include <Interpreters/IInterpreter.h>
 #include <Interpreters/OptimizeShardingKeyRewriteInVisitor.h>
 #include <Parsers/queryToString.h>
+#include <Parsers/ASTFunction.h>
 #include <Interpreters/ProcessList.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromRemote.h>
@@ -20,6 +21,7 @@
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 
+
 namespace DB
 {
 
@@ -157,7 +159,8 @@ void executeQuery(
     const ASTPtr & query_ast, ContextPtr context, const SelectQueryInfo & query_info,
     const ExpressionActionsPtr & sharding_key_expr,
     const std::string & sharding_key_column_name,
-    const ClusterPtr & not_optimized_cluster)
+    const ClusterPtr & not_optimized_cluster,
+    AdditionalShardFilterGenerator shard_filter_generator)
 {
     const Settings & settings = context->getSettingsRef();
 
@@ -189,7 +192,22 @@ void executeQuery(
             visitor.visit(query_ast_for_shard);
         }
         else
-            query_ast_for_shard = query_ast;
+            query_ast_for_shard = query_ast->clone();
+
+        if (shard_filter_generator)
+        {
+            auto shard_filter = shard_filter_generator(shard_info.shard_num);
+            if (shard_filter)
+            {
+                auto & select_query = query_ast_for_shard->as<ASTSelectQuery &>();
+
+                auto where_expression = select_query.where();
+                if (where_expression)
+                    shard_filter = makeASTFunction("and", where_expression, shard_filter);
+
+                select_query.setExpression(ASTSelectQuery::Expression::WHERE, std::move(shard_filter));
+            }
+        }
 
         stream_factory.createForShard(shard_info,
             query_ast_for_shard, main_table, table_func_ptr,
@@ -257,7 +275,9 @@ void executeQueryWithParallelReplicas(
     auto shard_info = not_optimized_cluster->getShardsInfo().front();
 
     const auto & settings = context->getSettingsRef();
-    auto all_replicas_count = std::min(static_cast<size_t>(settings.max_parallel_replicas), shard_info.all_addresses.size());
+    ClusterPtr new_cluster = not_optimized_cluster->getClusterWithReplicasAsShards(settings);
+
+    auto all_replicas_count = std::min(static_cast<size_t>(settings.max_parallel_replicas), new_cluster->getShardCount());
     auto coordinator = std::make_shared<ParallelReplicasReadingCoordinator>(all_replicas_count);
     auto remote_plan = std::make_unique<QueryPlan>();
     auto plans = std::vector<QueryPlanPtr>();
@@ -269,35 +289,13 @@ void executeQueryWithParallelReplicas(
     /// to then tell it about the reading method we chose.
     query_info.coordinator = coordinator;
 
-    UUID parallel_group_id = UUIDHelpers::generateV4();
-
-    plans.emplace_back(createLocalPlan(
-        query_ast,
-        stream_factory.header,
-        context,
-        stream_factory.processed_stage,
-        shard_info.shard_num,
-        /*shard_count*/1,
-        0,
-        all_replicas_count,
-        coordinator,
-        parallel_group_id));
-
-    if (!shard_info.hasRemoteConnections())
-    {
-        if (!plans.front())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "An empty plan was generated to read from local shard and there is no remote connections. This is a bug");
-        query_plan = std::move(*plans.front());
-        return;
-    }
-
     auto new_context = Context::createCopy(context);
     auto scalars = new_context->hasQueryContext() ? new_context->getQueryContext()->getScalars() : Scalars{};
     auto external_tables = new_context->getExternalTables();
 
     auto read_from_remote = std::make_unique<ReadFromParallelRemoteReplicasStep>(
         query_ast,
-        std::move(shard_info),
+        new_cluster,
         coordinator,
         stream_factory.header,
         stream_factory.processed_stage,
@@ -308,8 +306,7 @@ void executeQueryWithParallelReplicas(
         std::move(scalars),
         std::move(external_tables),
         &Poco::Logger::get("ReadFromParallelRemoteReplicasStep"),
-        query_info.storage_limits,
-        parallel_group_id);
+        query_info.storage_limits);
 
     remote_plan->addStep(std::move(read_from_remote));
     remote_plan->addInterpreterContext(context);
diff --git a/src/Interpreters/ClusterProxy/executeQuery.h b/src/Interpreters/ClusterProxy/executeQuery.h
index 787e79313cc..41f6da55686 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.h
+++ b/src/Interpreters/ClusterProxy/executeQuery.h
@@ -37,6 +37,7 @@ class SelectStreamFactory;
 ContextMutablePtr updateSettingsForCluster(
     const Cluster & cluster, ContextPtr context, const Settings & settings, const StorageID & main_table, const SelectQueryInfo * query_info = nullptr, Poco::Logger * log = nullptr);
 
+using AdditionalShardFilterGenerator = std::function<ASTPtr(uint64_t)>;
 /// Execute a distributed query, creating a query plan, from which the query pipeline can be built.
 /// `stream_factory` object encapsulates the logic of creating plans for a different type of query
 /// (currently SELECT, DESCRIBE).
@@ -50,7 +51,8 @@ void executeQuery(
     const ASTPtr & query_ast, ContextPtr context, const SelectQueryInfo & query_info,
     const ExpressionActionsPtr & sharding_key_expr,
     const std::string & sharding_key_column_name,
-    const ClusterPtr & not_optimized_cluster);
+    const ClusterPtr & not_optimized_cluster,
+    AdditionalShardFilterGenerator shard_filter_generator = {});
 
 
 void executeQueryWithParallelReplicas(
diff --git a/src/Interpreters/ComparisonGraph.cpp b/src/Interpreters/ComparisonGraph.cpp
index aa44a03a0ce..53e63903c43 100644
--- a/src/Interpreters/ComparisonGraph.cpp
+++ b/src/Interpreters/ComparisonGraph.cpp
@@ -1,10 +1,17 @@
 #include <Interpreters/ComparisonGraph.h>
+
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/queryToString.h>
+
 #include <Common/FieldVisitorsAccurateComparison.h>
 
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/ConstantNode.h>
+
+#include <Functions/FunctionFactory.h>
+
 namespace DB
 {
 
@@ -17,7 +24,7 @@ namespace
 {
 
 /// Make function a > b or a >= b
-ASTPtr normalizeAtom(const ASTPtr & atom)
+ASTPtr normalizeAtom(const ASTPtr & atom, ContextPtr)
 {
     static const std::map<std::string, std::string> inverse_relations =
     {
@@ -29,26 +36,158 @@ ASTPtr normalizeAtom(const ASTPtr & atom)
     if (const auto * func = res->as<ASTFunction>())
     {
         if (const auto it = inverse_relations.find(func->name); it != std::end(inverse_relations))
-        {
             res = makeASTFunction(it->second, func->arguments->children[1]->clone(), func->arguments->children[0]->clone());
-        }
     }
 
     return res;
 }
 
+QueryTreeNodePtr normalizeAtom(const QueryTreeNodePtr & atom, const ContextPtr & context)
+{
+    static const std::map<std::string, std::string> inverse_relations =
+    {
+        {"lessOrEquals", "greaterOrEquals"},
+        {"less", "greater"},
+    };
+
+    if (const auto * function_node = atom->as<FunctionNode>())
+    {
+        if (const auto it = inverse_relations.find(function_node->getFunctionName()); it != inverse_relations.end())
+        {
+            auto inverted_node = function_node->clone();
+            auto * inverted_function_node = inverted_node->as<FunctionNode>();
+            auto function_resolver = FunctionFactory::instance().get(it->second, context);
+            auto & arguments = inverted_function_node->getArguments().getNodes();
+            assert(arguments.size() == 2);
+            std::swap(arguments[0], arguments[1]);
+            inverted_function_node->resolveAsFunction(function_resolver);
+            return inverted_node;
+        }
+    }
+
+    return atom;
+}
+
+const FunctionNode * tryGetFunctionNode(const QueryTreeNodePtr & node)
+{
+    return node->as<FunctionNode>();
+}
+
+const ASTFunction * tryGetFunctionNode(const ASTPtr & node)
+{
+    return node->as<ASTFunction>();
+}
+
+std::string functionName(const QueryTreeNodePtr & node)
+{
+    return node->as<FunctionNode &>().getFunctionName();
+}
+
+std::string functionName(const ASTPtr & node)
+{
+    return node->as<ASTFunction &>().name;
+}
+
+const Field * tryGetConstantValue(const QueryTreeNodePtr & node)
+{
+    if (const auto * constant = node->as<ConstantNode>())
+        return &constant->getValue();
+
+    return nullptr;
+}
+
+const Field * tryGetConstantValue(const ASTPtr & node)
+{
+    if (const auto * constant = node->as<ASTLiteral>())
+        return &constant->value;
+
+    return nullptr;
+}
+
+template <typename Node>
+const Field & getConstantValue(const Node & node)
+{
+    const auto * constant = tryGetConstantValue(node);
+    assert(constant);
+    return *constant;
+}
+
+const auto & getNode(const Analyzer::CNF::AtomicFormula & atom)
+{
+    return atom.node_with_hash.node;
+}
+
+const auto & getNode(const CNFQuery::AtomicFormula & atom)
+{
+    return atom.ast;
+}
+
+std::string nodeToString(const ASTPtr & ast)
+{
+    return queryToString(ast);
+}
+
+std::string nodeToString(const QueryTreeNodePtr & node)
+{
+    return queryToString(node->toAST());
+}
+
+const auto & getArguments(const ASTFunction * function)
+{
+    return function->arguments->children;
+}
+
+const auto & getArguments(const FunctionNode * function)
+{
+    return function->getArguments().getNodes();
+}
+
 bool less(const Field & lhs, const Field & rhs) { return applyVisitor(FieldVisitorAccurateLess{}, lhs, rhs); }
 bool greater(const Field & lhs, const Field & rhs) { return applyVisitor(FieldVisitorAccurateLess{}, rhs, lhs); }
 bool equals(const Field & lhs, const Field & rhs) { return applyVisitor(FieldVisitorAccurateEquals{}, lhs, rhs); }
 
+ComparisonGraphCompareResult functionNameToCompareResult(const std::string & name)
+{
+    using enum ComparisonGraphCompareResult;
+    static const std::unordered_map<std::string, ComparisonGraphCompareResult> relation_to_compare =
+    {
+        {"equals", EQUAL},
+        {"notEquals", NOT_EQUAL},
+        {"less", LESS},
+        {"lessOrEquals", LESS_OR_EQUAL},
+        {"greaterOrEquals", GREATER_OR_EQUAL},
+        {"greater", GREATER},
+    };
+
+    const auto it = relation_to_compare.find(name);
+    return it == std::end(relation_to_compare) ? UNKNOWN : it->second;
 }
 
-ComparisonGraph::ComparisonGraph(const ASTs & atomic_formulas)
+ComparisonGraphCompareResult inverseCompareResult(ComparisonGraphCompareResult result)
+{
+    using enum ComparisonGraphCompareResult;
+    static const std::unordered_map<ComparisonGraphCompareResult, ComparisonGraphCompareResult> inverse_relations =
+    {
+        {NOT_EQUAL, EQUAL},
+        {EQUAL, NOT_EQUAL},
+        {GREATER_OR_EQUAL, LESS},
+        {GREATER, LESS_OR_EQUAL},
+        {LESS, GREATER_OR_EQUAL},
+        {LESS_OR_EQUAL, GREATER},
+        {UNKNOWN, UNKNOWN},
+    };
+    return inverse_relations.at(result);
+}
+
+}
+
+template <ComparisonGraphNodeType Node>
+ComparisonGraph<Node>::ComparisonGraph(const NodeContainer & atomic_formulas, ContextPtr context)
 {
     if (atomic_formulas.empty())
         return;
 
-    static const std::unordered_map<std::string, Edge::Type> relation_to_enum =
+    static const std::unordered_map<std::string, typename Edge::Type> relation_to_enum =
     {
         {"equals", Edge::EQUAL},
         {"greater", Edge::GREATER},
@@ -63,20 +202,23 @@ ComparisonGraph::ComparisonGraph(const ASTs & atomic_formulas)
     Graph g;
     for (const auto & atom_raw : atomic_formulas)
     {
-        const auto atom = normalizeAtom(atom_raw);
+        const auto atom = normalizeAtom(atom_raw, context);
 
-        auto get_index = [](const ASTPtr & ast, Graph & asts_graph) -> std::optional<size_t>
+        auto get_index = [](const Node & node, Graph & nodes_graph) -> std::optional<size_t>
         {
-            const auto it = asts_graph.ast_hash_to_component.find(ast->getTreeHash());
-            if (it != std::end(asts_graph.ast_hash_to_component))
+            const auto it = nodes_graph.node_hash_to_component.find(Graph::getHash(node));
+            if (it != std::end(nodes_graph.node_hash_to_component))
             {
                 if (!std::any_of(
-                        std::cbegin(asts_graph.vertices[it->second].asts),
-                        std::cend(asts_graph.vertices[it->second].asts),
-                        [ast](const ASTPtr & constraint_ast)
+                        std::cbegin(nodes_graph.vertices[it->second].nodes),
+                        std::cend(nodes_graph.vertices[it->second].nodes),
+                        [node](const Node & constraint_node)
                         {
-                            return constraint_ast->getTreeHash() == ast->getTreeHash()
-                                && constraint_ast->getColumnName() == ast->getColumnName();
+                            if constexpr (with_ast)
+                                return constraint_node->getTreeHash() == node->getTreeHash()
+                                    && constraint_node->getColumnName() == node->getColumnName();
+                            else
+                                return constraint_node->isEqual(*node);
                         }))
                 {
                     return {};
@@ -86,26 +228,30 @@ ComparisonGraph::ComparisonGraph(const ASTs & atomic_formulas)
             }
             else
             {
-                asts_graph.ast_hash_to_component[ast->getTreeHash()] = asts_graph.vertices.size();
-                asts_graph.vertices.push_back(EqualComponent{{ast}, std::nullopt});
-                asts_graph.edges.emplace_back();
-                return asts_graph.vertices.size() - 1;
+                nodes_graph.node_hash_to_component[Graph::getHash(node)] = nodes_graph.vertices.size();
+                nodes_graph.vertices.push_back(EqualComponent{{node}, std::nullopt});
+                nodes_graph.edges.emplace_back();
+                return nodes_graph.vertices.size() - 1;
             }
         };
 
-        const auto * func = atom->as<ASTFunction>();
-        if (func && func->arguments->children.size() == 2)
+        const auto * function_node = tryGetFunctionNode(atom);
+        if (function_node)
         {
-            auto index_left = get_index(func->arguments->children[0], g);
-            auto index_right = get_index(func->arguments->children[1], g);
-
-            if (index_left && index_right)
+            const auto & arguments = getArguments(function_node);
+            if (arguments.size() == 2)
             {
-                if (const auto it = relation_to_enum.find(func->name); it != std::end(relation_to_enum))
+                auto index_left = get_index(arguments[0], g);
+                auto index_right = get_index(arguments[1], g);
+
+                if (index_left && index_right)
                 {
-                    g.edges[*index_left].push_back(Edge{it->second, *index_right});
-                    if (it->second == Edge::EQUAL)
-                        g.edges[*index_right].push_back(Edge{it->second, *index_left});
+                    if (const auto it = relation_to_enum.find(functionName(atom)); it != std::end(relation_to_enum))
+                    {
+                        g.edges[*index_left].push_back(Edge{it->second, *index_right});
+                        if (it->second == Edge::EQUAL)
+                            g.edges[*index_right].push_back(Edge{it->second, *index_left});
+                    }
                 }
             }
         }
@@ -119,9 +265,9 @@ ComparisonGraph::ComparisonGraph(const ASTs & atomic_formulas)
     /// All expressions from one equivalence class will be stored
     /// in the corresponding vertex of new graph.
 
-    graph = buildGraphFromAstsGraph(g);
+    graph = buildGraphFromNodesGraph(g);
     dists = buildDistsFromGraph(graph);
-    std::tie(ast_const_lower_bound, ast_const_upper_bound) = buildConstBounds();
+    std::tie(node_const_lower_bound, node_const_upper_bound) = buildConstBounds();
 
     /// Find expressions that are known to be unequal.
     static const std::unordered_set<String> not_equals_functions = {"notEquals", "greater"};
@@ -130,36 +276,44 @@ ComparisonGraph::ComparisonGraph(const ASTs & atomic_formulas)
     /// TODO: Build a graph for unequal components.
     for (const auto & atom_raw : atomic_formulas)
     {
-        const auto atom = normalizeAtom(atom_raw);
-        const auto * func = atom->as<ASTFunction>();
+        const auto atom = normalizeAtom(atom_raw, context);
 
-        if (func && not_equals_functions.contains(func->name))
+        const auto * function_node = tryGetFunctionNode(atom);
+        if (function_node && not_equals_functions.contains(functionName(atom)))
         {
-            auto index_left = graph.ast_hash_to_component.at(func->arguments->children[0]->getTreeHash());
-            auto index_right = graph.ast_hash_to_component.at(func->arguments->children[1]->getTreeHash());
+            const auto & arguments = getArguments(function_node);
+            if (arguments.size() == 2)
+            {
+                auto index_left = graph.node_hash_to_component.at(Graph::getHash(arguments[0]));
+                auto index_right = graph.node_hash_to_component.at(Graph::getHash(arguments[1]));
 
-            if (index_left == index_right)
-                throw Exception(ErrorCodes::VIOLATED_CONSTRAINT,
-                    "Found expression '{}', but its arguments considered equal according to constraints",
-                    queryToString(atom));
+                if (index_left == index_right)
+                {
+                    throw Exception(ErrorCodes::VIOLATED_CONSTRAINT,
+                        "Found expression '{}', but its arguments considered equal according to constraints",
+                        nodeToString(atom));
+                }
 
-            not_equal.emplace(index_left, index_right);
-            not_equal.emplace(index_right, index_left);
+                not_equal.emplace(index_left, index_right);
+                not_equal.emplace(index_right, index_left);
+            }
         }
     }
 }
 
-ComparisonGraph::CompareResult ComparisonGraph::pathToCompareResult(Path path, bool inverse)
+template <ComparisonGraphNodeType Node>
+ComparisonGraphCompareResult ComparisonGraph<Node>::pathToCompareResult(Path path, bool inverse)
 {
     switch (path)
     {
-        case Path::GREATER: return inverse ? CompareResult::LESS : CompareResult::GREATER;
-        case Path::GREATER_OR_EQUAL: return inverse ? CompareResult::LESS_OR_EQUAL : CompareResult::GREATER_OR_EQUAL;
+        case Path::GREATER: return inverse ? ComparisonGraphCompareResult::LESS : ComparisonGraphCompareResult::GREATER;
+        case Path::GREATER_OR_EQUAL: return inverse ? ComparisonGraphCompareResult::LESS_OR_EQUAL : ComparisonGraphCompareResult::GREATER_OR_EQUAL;
     }
     UNREACHABLE();
 }
 
-std::optional<ComparisonGraph::Path> ComparisonGraph::findPath(size_t start, size_t finish) const
+template <ComparisonGraphNodeType Node>
+std::optional<typename ComparisonGraph<Node>::Path> ComparisonGraph<Node>::findPath(size_t start, size_t finish) const
 {
     const auto it = dists.find(std::make_pair(start, finish));
     if (it == std::end(dists))
@@ -170,18 +324,19 @@ std::optional<ComparisonGraph::Path> ComparisonGraph::findPath(size_t start, siz
     return not_equal.contains({start, finish}) ? Path::GREATER : it->second;
 }
 
-ComparisonGraph::CompareResult ComparisonGraph::compare(const ASTPtr & left, const ASTPtr & right) const
+template <ComparisonGraphNodeType Node>
+ComparisonGraphCompareResult ComparisonGraph<Node>::compare(const Node & left, const Node & right) const
 {
     size_t start = 0;
     size_t finish = 0;
 
     /// TODO: check full ast
-    const auto it_left = graph.ast_hash_to_component.find(left->getTreeHash());
-    const auto it_right = graph.ast_hash_to_component.find(right->getTreeHash());
+    const auto it_left = graph.node_hash_to_component.find(Graph::getHash(left));
+    const auto it_right = graph.node_hash_to_component.find(Graph::getHash(right));
 
-    if (it_left == std::end(graph.ast_hash_to_component) || it_right == std::end(graph.ast_hash_to_component))
+    if (it_left == std::end(graph.node_hash_to_component) || it_right == std::end(graph.node_hash_to_component))
     {
-        CompareResult result = CompareResult::UNKNOWN;
+        auto result = ComparisonGraphCompareResult::UNKNOWN;
         {
             const auto left_bound = getConstLowerBound(left);
             const auto right_bound = getConstUpperBound(right);
@@ -189,10 +344,10 @@ ComparisonGraph::CompareResult ComparisonGraph::compare(const ASTPtr & left, con
             if (left_bound && right_bound)
             {
                 if (greater(left_bound->first, right_bound->first))
-                    result = CompareResult::GREATER;
+                    result = ComparisonGraphCompareResult::GREATER;
                 else if (equals(left_bound->first, right_bound->first))
                     result = left_bound->second || right_bound->second
-                        ? CompareResult::GREATER : CompareResult::GREATER_OR_EQUAL;
+                        ? ComparisonGraphCompareResult::GREATER : ComparisonGraphCompareResult::GREATER_OR_EQUAL;
             }
         }
         {
@@ -202,10 +357,10 @@ ComparisonGraph::CompareResult ComparisonGraph::compare(const ASTPtr & left, con
             if (left_bound && right_bound)
             {
                 if (less(left_bound->first, right_bound->first))
-                    result = CompareResult::LESS;
+                    result = ComparisonGraphCompareResult::LESS;
                 else if (equals(left_bound->first, right_bound->first))
                     result = left_bound->second || right_bound->second
-                        ? CompareResult::LESS : CompareResult::LESS_OR_EQUAL;
+                        ? ComparisonGraphCompareResult::LESS : ComparisonGraphCompareResult::LESS_OR_EQUAL;
             }
         }
 
@@ -218,7 +373,7 @@ ComparisonGraph::CompareResult ComparisonGraph::compare(const ASTPtr & left, con
     }
 
     if (start == finish)
-        return CompareResult::EQUAL;
+        return ComparisonGraphCompareResult::EQUAL;
 
     if (auto path = findPath(start, finish))
         return pathToCompareResult(*path, /*inverse=*/ false);
@@ -227,93 +382,102 @@ ComparisonGraph::CompareResult ComparisonGraph::compare(const ASTPtr & left, con
         return pathToCompareResult(*path, /*inverse=*/ true);
 
     if (not_equal.contains({start, finish}))
-        return CompareResult::NOT_EQUAL;
+        return ComparisonGraphCompareResult::NOT_EQUAL;
 
-    return CompareResult::UNKNOWN;
+    return ComparisonGraphCompareResult::UNKNOWN;
 }
 
-bool ComparisonGraph::isPossibleCompare(CompareResult expected, const ASTPtr & left, const ASTPtr & right) const
+template <ComparisonGraphNodeType Node>
+bool ComparisonGraph<Node>::isPossibleCompare(ComparisonGraphCompareResult expected, const Node & left, const Node & right) const
 {
     const auto result = compare(left, right);
 
-    if (expected == CompareResult::UNKNOWN || result == CompareResult::UNKNOWN)
+    using enum ComparisonGraphCompareResult;
+    if (expected == UNKNOWN || result == UNKNOWN)
         return true;
 
     if (expected == result)
         return true;
 
-    static const std::set<std::pair<CompareResult, CompareResult>> possible_pairs =
+    static const std::set<std::pair<ComparisonGraphCompareResult, ComparisonGraphCompareResult>> possible_pairs =
     {
-        {CompareResult::EQUAL, CompareResult::LESS_OR_EQUAL},
-        {CompareResult::EQUAL, CompareResult::GREATER_OR_EQUAL},
-        {CompareResult::LESS_OR_EQUAL, CompareResult::LESS},
-        {CompareResult::LESS_OR_EQUAL, CompareResult::EQUAL},
-        {CompareResult::LESS_OR_EQUAL, CompareResult::NOT_EQUAL},
-        {CompareResult::GREATER_OR_EQUAL, CompareResult::GREATER},
-        {CompareResult::GREATER_OR_EQUAL, CompareResult::EQUAL},
-        {CompareResult::GREATER_OR_EQUAL, CompareResult::NOT_EQUAL},
-        {CompareResult::LESS, CompareResult::LESS},
-        {CompareResult::LESS, CompareResult::LESS_OR_EQUAL},
-        {CompareResult::LESS, CompareResult::NOT_EQUAL},
-        {CompareResult::GREATER, CompareResult::GREATER},
-        {CompareResult::GREATER, CompareResult::GREATER_OR_EQUAL},
-        {CompareResult::GREATER, CompareResult::NOT_EQUAL},
-        {CompareResult::NOT_EQUAL, CompareResult::LESS},
-        {CompareResult::NOT_EQUAL, CompareResult::GREATER},
-        {CompareResult::NOT_EQUAL, CompareResult::LESS_OR_EQUAL},
-        {CompareResult::NOT_EQUAL, CompareResult::GREATER_OR_EQUAL},
+        {EQUAL, LESS_OR_EQUAL},
+        {EQUAL, GREATER_OR_EQUAL},
+        {LESS_OR_EQUAL, LESS},
+        {LESS_OR_EQUAL, EQUAL},
+        {LESS_OR_EQUAL, NOT_EQUAL},
+        {GREATER_OR_EQUAL, GREATER},
+        {GREATER_OR_EQUAL, EQUAL},
+        {GREATER_OR_EQUAL, NOT_EQUAL},
+        {LESS, LESS},
+        {LESS, LESS_OR_EQUAL},
+        {LESS, NOT_EQUAL},
+        {GREATER, GREATER},
+        {GREATER, GREATER_OR_EQUAL},
+        {GREATER, NOT_EQUAL},
+        {NOT_EQUAL, LESS},
+        {NOT_EQUAL, GREATER},
+        {NOT_EQUAL, LESS_OR_EQUAL},
+        {NOT_EQUAL, GREATER_OR_EQUAL},
     };
 
     return possible_pairs.contains({expected, result});
 }
 
-bool ComparisonGraph::isAlwaysCompare(CompareResult expected, const ASTPtr & left, const ASTPtr & right) const
+template <ComparisonGraphNodeType Node>
+bool ComparisonGraph<Node>::isAlwaysCompare(ComparisonGraphCompareResult expected, const Node & left, const Node & right) const
 {
     const auto result = compare(left, right);
 
-    if (expected == CompareResult::UNKNOWN || result == CompareResult::UNKNOWN)
+    using enum ComparisonGraphCompareResult;
+    if (expected == UNKNOWN || result == UNKNOWN)
         return false;
 
     if (expected == result)
         return true;
 
-    static const std::set<std::pair<CompareResult, CompareResult>> possible_pairs =
+    static const std::set<std::pair<ComparisonGraphCompareResult, ComparisonGraphCompareResult>> possible_pairs =
     {
-        {CompareResult::LESS_OR_EQUAL, CompareResult::LESS},
-        {CompareResult::LESS_OR_EQUAL, CompareResult::EQUAL},
-        {CompareResult::GREATER_OR_EQUAL, CompareResult::GREATER},
-        {CompareResult::GREATER_OR_EQUAL, CompareResult::EQUAL},
-        {CompareResult::NOT_EQUAL, CompareResult::GREATER},
-        {CompareResult::NOT_EQUAL, CompareResult::LESS},
+        {LESS_OR_EQUAL, LESS},
+        {LESS_OR_EQUAL, EQUAL},
+        {GREATER_OR_EQUAL, GREATER},
+        {GREATER_OR_EQUAL, EQUAL},
+        {NOT_EQUAL, GREATER},
+        {NOT_EQUAL, LESS},
     };
 
     return possible_pairs.contains({expected, result});
 }
 
 
-ASTs ComparisonGraph::getEqual(const ASTPtr & ast) const
+template <ComparisonGraphNodeType Node>
+typename ComparisonGraph<Node>::NodeContainer ComparisonGraph<Node>::getEqual(const Node & node) const
 {
-    const auto res = getComponentId(ast);
+    const auto res = getComponentId(node);
     if (!res)
         return {};
     else
         return getComponent(res.value());
 }
 
-std::optional<size_t> ComparisonGraph::getComponentId(const ASTPtr & ast) const
+template <ComparisonGraphNodeType Node>
+std::optional<size_t> ComparisonGraph<Node>::getComponentId(const Node & node) const
 {
-    const auto hash_it = graph.ast_hash_to_component.find(ast->getTreeHash());
-    if (hash_it == std::end(graph.ast_hash_to_component))
+    const auto hash_it = graph.node_hash_to_component.find(Graph::getHash(node));
+    if (hash_it == std::end(graph.node_hash_to_component))
         return {};
 
     const size_t index = hash_it->second;
     if (std::any_of(
-        std::cbegin(graph.vertices[index].asts),
-        std::cend(graph.vertices[index].asts),
-        [ast](const ASTPtr & constraint_ast)
+        std::cbegin(graph.vertices[index].nodes),
+        std::cend(graph.vertices[index].nodes),
+        [node](const Node & constraint_node)
         {
-            return constraint_ast->getTreeHash() == ast->getTreeHash() &&
-                   constraint_ast->getColumnName() == ast->getColumnName();
+            if constexpr (with_ast)
+                return constraint_node->getTreeHash() == node->getTreeHash()
+                    && constraint_node->getColumnName() == node->getColumnName();
+            else
+                return constraint_node->getTreeHash() == node->getTreeHash();
         }))
     {
         return index;
@@ -324,33 +488,38 @@ std::optional<size_t> ComparisonGraph::getComponentId(const ASTPtr & ast) const
     }
 }
 
-bool ComparisonGraph::hasPath(size_t left, size_t right) const
+template <ComparisonGraphNodeType Node>
+bool ComparisonGraph<Node>::hasPath(size_t left, size_t right) const
 {
     return findPath(left, right) || findPath(right, left);
 }
 
-ASTs ComparisonGraph::getComponent(size_t id) const
+template <ComparisonGraphNodeType Node>
+typename ComparisonGraph<Node>::NodeContainer ComparisonGraph<Node>::getComponent(size_t id) const
 {
-    return graph.vertices[id].asts;
+    return graph.vertices[id].nodes;
 }
 
-bool ComparisonGraph::EqualComponent::hasConstant() const
+template <ComparisonGraphNodeType Node>
+bool ComparisonGraph<Node>::EqualComponent::hasConstant() const
 {
     return constant_index.has_value();
 }
 
-ASTPtr ComparisonGraph::EqualComponent::getConstant() const
+template <ComparisonGraphNodeType Node>
+Node ComparisonGraph<Node>::EqualComponent::getConstant() const
 {
     assert(constant_index);
-    return asts[*constant_index];
+    return nodes[*constant_index];
 }
 
-void ComparisonGraph::EqualComponent::buildConstants()
+template <ComparisonGraphNodeType Node>
+void ComparisonGraph<Node>::EqualComponent::buildConstants()
 {
     constant_index.reset();
-    for (size_t i = 0; i < asts.size(); ++i)
+    for (size_t i = 0; i < nodes.size(); ++i)
     {
-        if (asts[i]->as<ASTLiteral>())
+        if (tryGetConstantValue(nodes[i]) != nullptr)
         {
             constant_index = i;
             return;
@@ -358,133 +527,120 @@ void ComparisonGraph::EqualComponent::buildConstants()
     }
 }
 
-ComparisonGraph::CompareResult ComparisonGraph::atomToCompareResult(const CNFQuery::AtomicFormula & atom)
+template <ComparisonGraphNodeType Node>
+ComparisonGraphCompareResult ComparisonGraph<Node>::atomToCompareResult(const typename CNF::AtomicFormula & atom)
 {
-    if (const auto * func = atom.ast->as<ASTFunction>())
+    const auto & node = getNode(atom);
+    if (tryGetFunctionNode(node) != nullptr)
     {
-        auto expected = functionNameToCompareResult(func->name);
+        auto expected = functionNameToCompareResult(functionName(node));
         if (atom.negative)
             expected = inverseCompareResult(expected);
         return expected;
     }
 
-    return ComparisonGraph::CompareResult::UNKNOWN;
+    return ComparisonGraphCompareResult::UNKNOWN;
 }
 
-ComparisonGraph::CompareResult ComparisonGraph::functionNameToCompareResult(const std::string & name)
+template <ComparisonGraphNodeType Node>
+std::optional<Node> ComparisonGraph<Node>::getEqualConst(const Node & node) const
 {
-    static const std::unordered_map<std::string, CompareResult> relation_to_compare =
-    {
-        {"equals", CompareResult::EQUAL},
-        {"notEquals", CompareResult::NOT_EQUAL},
-        {"less", CompareResult::LESS},
-        {"lessOrEquals", CompareResult::LESS_OR_EQUAL},
-        {"greaterOrEquals", CompareResult::GREATER_OR_EQUAL},
-        {"greater", CompareResult::GREATER},
-    };
-
-    const auto it = relation_to_compare.find(name);
-    return it == std::end(relation_to_compare) ? CompareResult::UNKNOWN : it->second;
-}
-
-ComparisonGraph::CompareResult ComparisonGraph::inverseCompareResult(CompareResult result)
-{
-    static const std::unordered_map<CompareResult, CompareResult> inverse_relations =
-    {
-        {CompareResult::NOT_EQUAL, CompareResult::EQUAL},
-        {CompareResult::EQUAL, CompareResult::NOT_EQUAL},
-        {CompareResult::GREATER_OR_EQUAL, CompareResult::LESS},
-        {CompareResult::GREATER, CompareResult::LESS_OR_EQUAL},
-        {CompareResult::LESS, CompareResult::GREATER_OR_EQUAL},
-        {CompareResult::LESS_OR_EQUAL, CompareResult::GREATER},
-        {CompareResult::UNKNOWN, CompareResult::UNKNOWN},
-    };
-    return inverse_relations.at(result);
-}
-
-std::optional<ASTPtr> ComparisonGraph::getEqualConst(const ASTPtr & ast) const
-{
-    const auto hash_it = graph.ast_hash_to_component.find(ast->getTreeHash());
-    if (hash_it == std::end(graph.ast_hash_to_component))
+    const auto hash_it = graph.node_hash_to_component.find(Graph::getHash(node));
+    if (hash_it == std::end(graph.node_hash_to_component))
         return std::nullopt;
 
     const size_t index = hash_it->second;
-    return graph.vertices[index].hasConstant()
-        ? std::optional<ASTPtr>{graph.vertices[index].getConstant()}
-        : std::nullopt;
+
+    if (!graph.vertices[index].hasConstant())
+        return std::nullopt;
+
+    if constexpr (with_ast)
+        return graph.vertices[index].getConstant();
+    else
+    {
+        const auto & constant = getConstantValue(graph.vertices[index].getConstant());
+        auto constant_node = std::make_shared<ConstantNode>(constant, node->getResultType());
+        return constant_node;
+    }
 }
 
-std::optional<std::pair<Field, bool>> ComparisonGraph::getConstUpperBound(const ASTPtr & ast) const
+template <ComparisonGraphNodeType Node>
+std::optional<std::pair<Field, bool>> ComparisonGraph<Node>::getConstUpperBound(const Node & node) const
 {
-    if (const auto * literal = ast->as<ASTLiteral>())
-        return std::make_pair(literal->value, false);
+    if (const auto * constant = tryGetConstantValue(node))
+        return std::make_pair(*constant, false);
 
-    const auto it = graph.ast_hash_to_component.find(ast->getTreeHash());
-    if (it == std::end(graph.ast_hash_to_component))
+    const auto it = graph.node_hash_to_component.find(Graph::getHash(node));
+    if (it == std::end(graph.node_hash_to_component))
         return std::nullopt;
 
     const size_t to = it->second;
-    const ssize_t from = ast_const_upper_bound[to];
+    const ssize_t from = node_const_upper_bound[to];
     if (from == -1)
         return  std::nullopt;
 
-    return std::make_pair(graph.vertices[from].getConstant()->as<ASTLiteral>()->value, dists.at({from, to}) == Path::GREATER);
+    return std::make_pair(getConstantValue(graph.vertices[from].getConstant()), dists.at({from, to}) == Path::GREATER);
 }
 
-std::optional<std::pair<Field, bool>> ComparisonGraph::getConstLowerBound(const ASTPtr & ast) const
+template <ComparisonGraphNodeType Node>
+std::optional<std::pair<Field, bool>> ComparisonGraph<Node>::getConstLowerBound(const Node & node) const
 {
-    if (const auto * literal = ast->as<ASTLiteral>())
-        return std::make_pair(literal->value, false);
+    if (const auto * constant = tryGetConstantValue(node))
+        return std::make_pair(*constant, false);
 
-    const auto it = graph.ast_hash_to_component.find(ast->getTreeHash());
-    if (it == std::end(graph.ast_hash_to_component))
+    const auto it = graph.node_hash_to_component.find(Graph::getHash(node));
+    if (it == std::end(graph.node_hash_to_component))
         return std::nullopt;
 
     const size_t from = it->second;
-    const ssize_t to = ast_const_lower_bound[from];
+    const ssize_t to = node_const_lower_bound[from];
     if (to == -1)
         return std::nullopt;
 
-    return std::make_pair(graph.vertices[to].getConstant()->as<ASTLiteral>()->value, dists.at({from, to}) == Path::GREATER);
+    return std::make_pair(getConstantValue(graph.vertices[to].getConstant()), dists.at({from, to}) == Path::GREATER);
 }
 
-void ComparisonGraph::dfsOrder(const Graph & asts_graph, size_t v, std::vector<bool> & visited, std::vector<size_t> & order)
+template <ComparisonGraphNodeType Node>
+void ComparisonGraph<Node>::dfsOrder(const Graph & nodes_graph, size_t v, std::vector<bool> & visited, std::vector<size_t> & order)
 {
     visited[v] = true;
-    for (const auto & edge : asts_graph.edges[v])
+    for (const auto & edge : nodes_graph.edges[v])
         if (!visited[edge.to])
-            dfsOrder(asts_graph, edge.to, visited, order);
+            dfsOrder(nodes_graph, edge.to, visited, order);
 
     order.push_back(v);
 }
 
-ComparisonGraph::Graph ComparisonGraph::reverseGraph(const Graph & asts_graph)
+template <ComparisonGraphNodeType Node>
+typename ComparisonGraph<Node>::Graph ComparisonGraph<Node>::reverseGraph(const Graph & nodes_graph)
 {
     Graph g;
-    g.ast_hash_to_component = asts_graph.ast_hash_to_component;
-    g.vertices = asts_graph.vertices;
+    g.node_hash_to_component = nodes_graph.node_hash_to_component;
+    g.vertices = nodes_graph.vertices;
     g.edges.resize(g.vertices.size());
 
-    for (size_t v = 0; v < asts_graph.vertices.size(); ++v)
-        for (const auto & edge : asts_graph.edges[v])
+    for (size_t v = 0; v < nodes_graph.vertices.size(); ++v)
+        for (const auto & edge : nodes_graph.edges[v])
             g.edges[edge.to].push_back(Edge{edge.type, v});
 
     return g;
 }
 
-std::vector<ASTs> ComparisonGraph::getVertices() const
+template <ComparisonGraphNodeType Node>
+std::vector<typename ComparisonGraph<Node>::NodeContainer> ComparisonGraph<Node>::getVertices() const
 {
-    std::vector<ASTs> result;
+    std::vector<NodeContainer> result;
     for (const auto & vertex : graph.vertices)
     {
         result.emplace_back();
-        for (const auto & ast : vertex.asts)
-            result.back().push_back(ast);
+        for (const auto & node : vertex.nodes)
+            result.back().push_back(node);
     }
     return result;
 }
 
-void ComparisonGraph::dfsComponents(
+template <ComparisonGraphNodeType Node>
+void ComparisonGraph<Node>::dfsComponents(
     const Graph & reversed_graph, size_t v,
     OptionalIndices & components, size_t component)
 {
@@ -494,11 +650,12 @@ void ComparisonGraph::dfsComponents(
             dfsComponents(reversed_graph, edge.to, components, component);
 }
 
-ComparisonGraph::Graph ComparisonGraph::buildGraphFromAstsGraph(const Graph & asts_graph)
+template <ComparisonGraphNodeType Node>
+typename ComparisonGraph<Node>::Graph ComparisonGraph<Node>::buildGraphFromNodesGraph(const Graph & nodes_graph)
 {
     /// Find strongly connected component by using 2 dfs traversals.
     /// https://en.wikipedia.org/wiki/Kosaraju%27s_algorithm
-    const auto n = asts_graph.vertices.size();
+    const auto n = nodes_graph.vertices.size();
 
     std::vector<size_t> order;
     {
@@ -506,14 +663,14 @@ ComparisonGraph::Graph ComparisonGraph::buildGraphFromAstsGraph(const Graph & as
         for (size_t v = 0; v < n; ++v)
         {
             if (!visited[v])
-                dfsOrder(asts_graph, v, visited, order);
+                dfsOrder(nodes_graph, v, visited, order);
         }
     }
 
     OptionalIndices components(n);
     size_t component = 0;
     {
-        const Graph reversed_graph = reverseGraph(asts_graph);
+        const Graph reversed_graph = reverseGraph(nodes_graph);
         for (auto it = order.rbegin(); it != order.rend(); ++it)
         {
             if (!components[*it])
@@ -527,14 +684,14 @@ ComparisonGraph::Graph ComparisonGraph::buildGraphFromAstsGraph(const Graph & as
     Graph result;
     result.vertices.resize(component);
     result.edges.resize(component);
-    for (const auto & [hash, index] : asts_graph.ast_hash_to_component)
+    for (const auto & [hash, index] : nodes_graph.node_hash_to_component)
     {
         assert(components[index]);
-        result.ast_hash_to_component[hash] = *components[index];
-        result.vertices[*components[index]].asts.insert(
-            std::end(result.vertices[*components[index]].asts),
-            std::begin(asts_graph.vertices[index].asts),
-            std::end(asts_graph.vertices[index].asts)); // asts_graph has only one ast per vertex
+        result.node_hash_to_component[hash] = *components[index];
+        result.vertices[*components[index]].nodes.insert(
+            std::end(result.vertices[*components[index]].nodes),
+            std::begin(nodes_graph.vertices[index].nodes),
+            std::end(nodes_graph.vertices[index].nodes)); // asts_graph has only one ast per vertex
     }
 
     /// Calculate constants
@@ -544,7 +701,7 @@ ComparisonGraph::Graph ComparisonGraph::buildGraphFromAstsGraph(const Graph & as
     /// For each edge in initial graph, we add an edge between components in condensation graph.
     for (size_t v = 0; v < n; ++v)
     {
-        for (const auto & edge : asts_graph.edges[v])
+        for (const auto & edge : nodes_graph.edges[v])
             result.edges[*components[v]].push_back(Edge{edge.type, *components[edge.to]});
 
         /// TODO: make edges unique (left most strict)
@@ -557,11 +714,11 @@ ComparisonGraph::Graph ComparisonGraph::buildGraphFromAstsGraph(const Graph & as
         {
             if (v != u && result.vertices[v].hasConstant() && result.vertices[u].hasConstant())
             {
-                const auto * left = result.vertices[v].getConstant()->as<ASTLiteral>();
-                const auto * right = result.vertices[u].getConstant()->as<ASTLiteral>();
+                const auto & left = getConstantValue(result.vertices[v].getConstant());
+                const auto & right = getConstantValue(result.vertices[u].getConstant());
 
                 /// Only GREATER. Equal constant fields = equal literals so it was already considered above.
-                if (greater(left->value, right->value))
+                if (greater(left, right))
                     result.edges[v].push_back(Edge{Edge::GREATER, u});
             }
         }
@@ -570,7 +727,8 @@ ComparisonGraph::Graph ComparisonGraph::buildGraphFromAstsGraph(const Graph & as
     return result;
 }
 
-std::map<std::pair<size_t, size_t>, ComparisonGraph::Path> ComparisonGraph::buildDistsFromGraph(const Graph & g)
+template <ComparisonGraphNodeType Node>
+std::map<std::pair<size_t, size_t>, typename ComparisonGraph<Node>::Path> ComparisonGraph<Node>::buildDistsFromGraph(const Graph & g)
 {
     /// Min path : -1 means GREATER, 0 means GREATER_OR_EQUALS.
     /// We use Floyd–Warshall algorithm to find distances between all pairs of vertices.
@@ -602,7 +760,8 @@ std::map<std::pair<size_t, size_t>, ComparisonGraph::Path> ComparisonGraph::buil
     return path;
 }
 
-std::pair<std::vector<ssize_t>, std::vector<ssize_t>> ComparisonGraph::buildConstBounds() const
+template <ComparisonGraphNodeType Node>
+std::pair<std::vector<ssize_t>, std::vector<ssize_t>> ComparisonGraph<Node>::buildConstBounds() const
 {
     const size_t n = graph.vertices.size();
     std::vector<ssize_t> lower(n, -1);
@@ -610,7 +769,7 @@ std::pair<std::vector<ssize_t>, std::vector<ssize_t>> ComparisonGraph::buildCons
 
     auto get_value = [this](const size_t vertex) -> Field
     {
-        return graph.vertices[vertex].getConstant()->as<ASTLiteral>()->value;
+        return getConstantValue(graph.vertices[vertex].getConstant());
     };
 
     for (const auto & [edge, path] : dists)
@@ -634,7 +793,10 @@ std::pair<std::vector<ssize_t>, std::vector<ssize_t>> ComparisonGraph::buildCons
         }
     }
 
-    return {lower, upper};
+    return {std::move(lower), std::move(upper)};
 }
 
+template class ComparisonGraph<ASTPtr>;
+template class ComparisonGraph<QueryTreeNodePtr>;
+
 }
diff --git a/src/Interpreters/ComparisonGraph.h b/src/Interpreters/ComparisonGraph.h
index 996526b60df..70543227b58 100644
--- a/src/Interpreters/ComparisonGraph.h
+++ b/src/Interpreters/ComparisonGraph.h
@@ -2,6 +2,12 @@
 
 #include <Parsers/IAST_fwd.h>
 #include <Interpreters/TreeCNFConverter.h>
+
+#include <Analyzer/Passes/CNF.h>
+#include <Analyzer/HashUtils.h>
+#include <Analyzer/IQueryTreeNode.h>
+
+#include <type_traits>
 #include <unordered_map>
 #include <map>
 #include <vector>
@@ -9,50 +15,56 @@
 namespace DB
 {
 
+enum class ComparisonGraphCompareResult : uint8_t
+{
+    LESS,
+    LESS_OR_EQUAL,
+    EQUAL,
+    GREATER_OR_EQUAL,
+    GREATER,
+    NOT_EQUAL,
+    UNKNOWN,
+};
+
+template <typename T>
+concept ComparisonGraphNodeType = std::same_as<T, ASTPtr> || std::same_as<T, QueryTreeNodePtr>;
+
 /*
  * Graph of relations between terms in constraints.
  * Allows to compare terms and get equal terms.
  */
+template <ComparisonGraphNodeType Node>
 class ComparisonGraph
 {
 public:
+    static constexpr bool with_ast = std::same_as<Node, ASTPtr>;
+    using NodeContainer = std::conditional_t<with_ast, ASTs, QueryTreeNodes>;
+    using CNF = std::conditional_t<with_ast, CNFQuery, Analyzer::CNF>;
+
     /// atomic_formulas are extracted from constraints.
-    explicit ComparisonGraph(const ASTs & atomic_formulas);
+    explicit ComparisonGraph(const NodeContainer & atomic_formulas, ContextPtr context = nullptr);
 
-    enum class CompareResult
-    {
-        LESS,
-        LESS_OR_EQUAL,
-        EQUAL,
-        GREATER_OR_EQUAL,
-        GREATER,
-        NOT_EQUAL,
-        UNKNOWN,
-    };
+    static ComparisonGraphCompareResult atomToCompareResult(const typename CNF::AtomicFormula & atom);
 
-    static CompareResult atomToCompareResult(const CNFQuery::AtomicFormula & atom);
-    static CompareResult functionNameToCompareResult(const std::string & name);
-    static CompareResult inverseCompareResult(CompareResult result);
-
-    CompareResult compare(const ASTPtr & left, const ASTPtr & right) const;
+    ComparisonGraphCompareResult compare(const Node & left, const Node & right) const;
 
     /// It's possible that left <expected> right
-    bool isPossibleCompare(CompareResult expected, const ASTPtr & left, const ASTPtr & right) const;
+    bool isPossibleCompare(ComparisonGraphCompareResult expected, const Node & left, const Node & right) const;
 
     /// It's always true that left <expected> right
-    bool isAlwaysCompare(CompareResult expected, const ASTPtr & left, const ASTPtr & right) const;
+    bool isAlwaysCompare(ComparisonGraphCompareResult expected, const Node & left, const Node & right) const;
 
-    /// Returns all expressions from component to which @ast belongs if any.
-    ASTs getEqual(const ASTPtr & ast) const;
+    /// Returns all expressions from component to which @node belongs if any.
+    NodeContainer getEqual(const Node & node) const;
 
-    /// Returns constant expression from component to which @ast belongs if any.
-    std::optional<ASTPtr> getEqualConst(const ASTPtr & ast) const;
+    /// Returns constant expression from component to which @node belongs if any.
+    std::optional<Node> getEqualConst(const Node & node) const;
 
-    /// Finds component id to which @ast belongs if any.
-    std::optional<std::size_t> getComponentId(const ASTPtr & ast) const;
+    /// Finds component id to which @node belongs if any.
+    std::optional<std::size_t> getComponentId(const Node & node) const;
 
     /// Returns all expressions from component.
-    ASTs getComponent(size_t id) const;
+    NodeContainer getComponent(size_t id) const;
 
     size_t getNumOfComponents() const { return graph.vertices.size(); }
 
@@ -61,22 +73,22 @@ public:
     /// Find constants lessOrEqual and greaterOrEqual.
     /// For int and double linear programming can be applied here.
     /// Returns: {constant, is strict less/greater}
-    std::optional<std::pair<Field, bool>> getConstUpperBound(const ASTPtr & ast) const;
-    std::optional<std::pair<Field, bool>> getConstLowerBound(const ASTPtr & ast) const;
+    std::optional<std::pair<Field, bool>> getConstUpperBound(const Node & node) const;
+    std::optional<std::pair<Field, bool>> getConstLowerBound(const Node & node) const;
 
     /// Returns all expression in graph.
-    std::vector<ASTs> getVertices() const;
+    std::vector<NodeContainer> getVertices() const;
 
 private:
     /// Strongly connected component
     struct EqualComponent
     {
         /// All these expressions are considered as equal.
-        ASTs  asts;
+        NodeContainer nodes;
         std::optional<size_t> constant_index;
 
         bool hasConstant() const;
-        ASTPtr getConstant() const;
+        Node getConstant() const;
         void buildConstants();
     };
 
@@ -110,20 +122,29 @@ private:
             }
         };
 
-        std::unordered_map<IAST::Hash, size_t, ASTHash> ast_hash_to_component;
+        static auto getHash(const Node & node)
+        {
+            if constexpr (with_ast)
+                return node->getTreeHash();
+            else
+                return QueryTreeNodePtrWithHash{node};
+        }
+
+        using NodeHashToComponentContainer = std::conditional_t<with_ast, std::unordered_map<IAST::Hash, size_t, ASTHash>, QueryTreeNodePtrWithHashMap<size_t>>;
+        NodeHashToComponentContainer node_hash_to_component;
         std::vector<EqualComponent> vertices;
         std::vector<std::vector<Edge>> edges;
     };
 
     /// Receives graph, in which each vertex corresponds to one expression.
     /// Then finds strongly connected components and builds graph on them.
-    static Graph buildGraphFromAstsGraph(const Graph & asts_graph);
+    static Graph buildGraphFromNodesGraph(const Graph & nodes_graph);
 
-    static Graph reverseGraph(const Graph & asts_graph);
+    static Graph reverseGraph(const Graph & nodes_graph);
 
     /// The first part of finding strongly connected components.
     /// Finds order of exit from vertices of dfs traversal of graph.
-    static void dfsOrder(const Graph & asts_graph, size_t v, std::vector<bool> & visited, std::vector<size_t> & order);
+    static void dfsOrder(const Graph & nodes_graph, size_t v, std::vector<bool> & visited, std::vector<size_t> & order);
 
     using OptionalIndices = std::vector<std::optional<size_t>>;
 
@@ -139,13 +160,13 @@ private:
         GREATER_OR_EQUAL,
     };
 
-    static CompareResult pathToCompareResult(Path path, bool inverse);
+    static ComparisonGraphCompareResult pathToCompareResult(Path path, bool inverse);
     std::optional<Path> findPath(size_t start, size_t finish) const;
 
     /// Calculate @dists.
     static std::map<std::pair<size_t, size_t>, Path> buildDistsFromGraph(const Graph & g);
 
-    /// Calculate @ast_const_lower_bound and @ast_const_lower_bound.
+    /// Calculate @nodeconst_lower_bound and @node_const_lower_bound.
     std::pair<std::vector<ssize_t>, std::vector<ssize_t>> buildConstBounds() const;
 
     /// Direct acyclic graph in which each vertex corresponds
@@ -165,11 +186,11 @@ private:
 
     /// Maximal constant value for each component that
     /// is lower bound for all expressions in component.
-    std::vector<ssize_t> ast_const_lower_bound;
+    std::vector<ssize_t> node_const_lower_bound;
 
     /// Minimal constant value for each component that
     /// is upper bound for all expressions in component.
-    std::vector<ssize_t> ast_const_upper_bound;
+    std::vector<ssize_t> node_const_upper_bound;
 };
 
 }
diff --git a/src/Interpreters/ComparisonTupleEliminationVisitor.cpp b/src/Interpreters/ComparisonTupleEliminationVisitor.cpp
new file mode 100644
index 00000000000..4f06f345b96
--- /dev/null
+++ b/src/Interpreters/ComparisonTupleEliminationVisitor.cpp
@@ -0,0 +1,100 @@
+#include <Interpreters/ComparisonTupleEliminationVisitor.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+
+ASTs splitTuple(const ASTPtr & node)
+{
+    if (const auto * func = node->as<ASTFunction>(); func && func->name == "tuple")
+        return func->arguments->children;
+
+    if (const auto * literal = node->as<ASTLiteral>(); literal && literal->value.getType() == Field::Types::Tuple)
+    {
+        ASTs result;
+        const auto & tuple = literal->value.get<const Tuple &>();
+        for (const auto & child : tuple)
+            result.emplace_back(std::make_shared<ASTLiteral>(child));
+        return result;
+    }
+
+    return {};
+}
+
+ASTPtr concatWithAnd(const ASTs & nodes)
+{
+    if (nodes.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot concat empty list of nodes");
+
+    if (nodes.size() == 1)
+        return nodes[0];
+
+    auto result = makeASTFunction("and");
+    result->arguments->children = nodes;
+    return result;
+}
+
+class SplitTupleComparsionExpressionMatcher
+{
+public:
+    using Data = ComparisonTupleEliminationMatcher::Data;
+
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+    static void visit(ASTPtr & ast, Data &)
+    {
+        auto * func = ast->as<ASTFunction>();
+        if (!func || func->arguments->children.size() != 2)
+            return;
+
+        if (func->name != "equals" && func->name != "notEquals")
+            return;
+
+        auto lhs = splitTuple(func->arguments->children[0]);
+        auto rhs = splitTuple(func->arguments->children[1]);
+        if (lhs.size() != rhs.size() || lhs.empty())
+            return;
+
+        ASTs new_args;
+        new_args.reserve(lhs.size());
+        for (size_t i = 0; i < lhs.size(); ++i)
+        {
+            new_args.emplace_back(makeASTFunction("equals", lhs[i], rhs[i]));
+        }
+
+        if (func->name == "notEquals")
+            ast = makeASTFunction("not", concatWithAnd(new_args));
+        else
+            ast = concatWithAnd(new_args);
+    }
+};
+
+using SplitTupleComparsionExpressionVisitor = InDepthNodeVisitor<SplitTupleComparsionExpressionMatcher, true>;
+
+}
+
+bool ComparisonTupleEliminationMatcher::needChildVisit(ASTPtr &, const ASTPtr &)
+{
+    return true;
+}
+
+void ComparisonTupleEliminationMatcher::visit(ASTPtr & ast, Data & data)
+{
+    auto * select_ast = ast->as<ASTSelectQuery>();
+    if (!select_ast || !select_ast->where())
+        return;
+
+    if (select_ast->where())
+        SplitTupleComparsionExpressionVisitor(data).visit(select_ast->refWhere());
+}
+
+}
diff --git a/src/Interpreters/ComparisonTupleEliminationVisitor.h b/src/Interpreters/ComparisonTupleEliminationVisitor.h
new file mode 100644
index 00000000000..1ad7b089d5d
--- /dev/null
+++ b/src/Interpreters/ComparisonTupleEliminationVisitor.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/Aliases.h>
+
+namespace DB
+{
+
+class ASTSelectQuery;
+struct TableWithColumnNamesAndTypes;
+
+/** Replaces tuple comparisons with multiple comparisons.
+  *
+  * Example: SELECT id FROM test_table WHERE (id, value) = (1, 'Value');
+  * Result: SELECT id FROM test_table WHERE id = 1 AND value = 'Value';
+  */
+class ComparisonTupleEliminationMatcher
+{
+public:
+    struct Data {};
+
+    static bool needChildVisit(ASTPtr &, const ASTPtr &);
+    static void visit(ASTPtr & ast, Data & data);
+};
+
+using ComparisonTupleEliminationVisitor = InDepthNodeVisitor<ComparisonTupleEliminationMatcher, true>;
+
+}
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index d1b09707bca..8fb06e21d22 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -42,6 +42,10 @@
 #include <Interpreters/ExternalLoaderXMLConfigRepository.h>
 #include <Interpreters/TemporaryDataOnDisk.h>
 #include <Interpreters/Cache/QueryCache.h>
+#include <Interpreters/Cache/FileCacheFactory.h>
+#include <Interpreters/Cache/FileCache.h>
+#include <Core/ServerSettings.h>
+#include <Interpreters/PreparedSets.h>
 #include <Core/Settings.h>
 #include <Core/SettingsQuirks.h>
 #include <Access/AccessControl.h>
@@ -105,15 +109,12 @@
 #include <Interpreters/Lemmatizers.h>
 #include <Interpreters/ClusterDiscovery.h>
 #include <Interpreters/TransactionLog.h>
-#include <Interpreters/Cache/FileCacheFactory.h>
 #include <filesystem>
 #include <re2/re2.h>
 #include <Storages/StorageView.h>
 #include <Parsers/ASTFunction.h>
 #include <base/find_symbols.h>
 
-#include <Interpreters/Cache/FileCache.h>
-
 #if USE_ROCKSDB
 #include <rocksdb/table.h>
 #endif
@@ -129,13 +130,27 @@ namespace CurrentMetrics
 {
     extern const Metric ContextLockWait;
     extern const Metric BackgroundMovePoolTask;
+    extern const Metric BackgroundMovePoolSize;
     extern const Metric BackgroundSchedulePoolTask;
+    extern const Metric BackgroundSchedulePoolSize;
     extern const Metric BackgroundBufferFlushSchedulePoolTask;
+    extern const Metric BackgroundBufferFlushSchedulePoolSize;
     extern const Metric BackgroundDistributedSchedulePoolTask;
+    extern const Metric BackgroundDistributedSchedulePoolSize;
     extern const Metric BackgroundMessageBrokerSchedulePoolTask;
+    extern const Metric BackgroundMessageBrokerSchedulePoolSize;
     extern const Metric BackgroundMergesAndMutationsPoolTask;
+    extern const Metric BackgroundMergesAndMutationsPoolSize;
     extern const Metric BackgroundFetchesPoolTask;
+    extern const Metric BackgroundFetchesPoolSize;
     extern const Metric BackgroundCommonPoolTask;
+    extern const Metric BackgroundCommonPoolSize;
+    extern const Metric MarksLoaderThreads;
+    extern const Metric MarksLoaderThreadsActive;
+    extern const Metric IOPrefetchThreads;
+    extern const Metric IOPrefetchThreadsActive;
+    extern const Metric IOWriterThreads;
+    extern const Metric IOWriterThreadsActive;
 }
 
 namespace DB
@@ -157,6 +172,8 @@ namespace ErrorCodes
     extern const int UNKNOWN_READ_METHOD;
     extern const int NOT_IMPLEMENTED;
     extern const int UNKNOWN_FUNCTION;
+    extern const int ILLEGAL_COLUMN;
+    extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
 }
 
 
@@ -204,7 +221,11 @@ struct ContextSharedPart : boost::noncopyable
     ConfigurationPtr config;                                /// Global configuration settings.
 
     String tmp_path;                                        /// Path to the temporary files that occur when processing the request.
-    TemporaryDataOnDiskScopePtr temp_data_on_disk;          /// Temporary files that occur when processing the request accounted here.
+
+    /// All temporary files that occur when processing the requests accounted here.
+    /// Child scopes for more fine-grained accounting are created per user/query/etc.
+    /// Initialized once during server startup.
+    TemporaryDataOnDiskScopePtr root_temp_data_on_disk;
 
     mutable std::unique_ptr<EmbeddedDictionaries> embedded_dictionaries;    /// Metrica's dictionaries. Have lazy initialization.
     mutable std::unique_ptr<ExternalDictionariesLoader> external_dictionaries_loader;
@@ -261,9 +282,15 @@ struct ContextSharedPart : boost::noncopyable
 
     mutable ThrottlerPtr replicated_fetches_throttler;      /// A server-wide throttler for replicated fetches
     mutable ThrottlerPtr replicated_sends_throttler;        /// A server-wide throttler for replicated sends
+
     mutable ThrottlerPtr remote_read_throttler;             /// A server-wide throttler for remote IO reads
     mutable ThrottlerPtr remote_write_throttler;            /// A server-wide throttler for remote IO writes
 
+    mutable ThrottlerPtr local_read_throttler;              /// A server-wide throttler for local IO reads
+    mutable ThrottlerPtr local_write_throttler;             /// A server-wide throttler for local IO writes
+
+    mutable ThrottlerPtr backups_server_throttler;          /// A server-wide throttler for BACKUPs
+
     MultiVersion<Macros> macros;                            /// Substitutions extracted from config.
     std::unique_ptr<DDLWorker> ddl_worker;                  /// Process ddl commands from zk.
     /// Rules for selecting the compression settings, depending on the size of the part.
@@ -273,6 +300,8 @@ struct ContextSharedPart : boost::noncopyable
     /// Storage policy chooser for MergeTree engines
     mutable std::shared_ptr<const StoragePolicySelector> merge_tree_storage_policy_selector;
 
+    ServerSettings server_settings;
+
     std::optional<MergeTreeSettings> merge_tree_settings;   /// Settings of MergeTree* engines.
     std::optional<MergeTreeSettings> replicated_merge_tree_settings;   /// Settings of ReplicatedMergeTree* engines.
     std::atomic_size_t max_table_size_to_drop = 50000000000lu; /// Protects MergeTree tables from accidental DROP (50GB by default)
@@ -297,8 +326,8 @@ struct ContextSharedPart : boost::noncopyable
     /// Initialized on demand (on distributed storages initialization) since Settings should be initialized
     std::shared_ptr<Clusters> clusters;
     ConfigurationPtr clusters_config;                        /// Stores updated configs
-    mutable std::mutex clusters_mutex;                       /// Guards clusters and clusters_config
     std::unique_ptr<ClusterDiscovery> cluster_discovery;
+    mutable std::mutex clusters_mutex;                       /// Guards clusters, clusters_config and cluster_discovery
 
     std::shared_ptr<AsynchronousInsertQueue> async_insert_queue;
     std::map<String, UInt16> server_ports;
@@ -506,6 +535,12 @@ struct ContextSharedPart : boost::noncopyable
         /// take it as well, which will cause deadlock.
         delete_ddl_worker.reset();
 
+        /// Background operations in cache use background schedule pool.
+        /// Deactivate them before destructing it.
+        const auto & caches = FileCacheFactory::instance().getAll();
+        for (const auto & [_, cache] : caches)
+            cache->cache->deactivateBackgroundOperations();
+
         {
             auto lock = std::lock_guard(mutex);
 
@@ -596,6 +631,30 @@ struct ContextSharedPart : boost::noncopyable
         log->warning(message);
         warnings.push_back(message);
     }
+
+    void configureServerWideThrottling()
+    {
+        if (auto bandwidth = server_settings.max_replicated_fetches_network_bandwidth_for_server)
+            replicated_fetches_throttler = std::make_shared<Throttler>(bandwidth);
+
+        if (auto bandwidth = server_settings.max_replicated_sends_network_bandwidth_for_server)
+            replicated_sends_throttler = std::make_shared<Throttler>(bandwidth);
+
+        if (auto bandwidth = server_settings.max_remote_read_network_bandwidth_for_server)
+            remote_read_throttler = std::make_shared<Throttler>(bandwidth);
+
+        if (auto bandwidth = server_settings.max_remote_write_network_bandwidth_for_server)
+            remote_write_throttler = std::make_shared<Throttler>(bandwidth);
+
+        if (auto bandwidth = server_settings.max_local_read_bandwidth_for_server)
+            local_read_throttler = std::make_shared<Throttler>(bandwidth);
+
+        if (auto bandwidth = server_settings.max_local_write_bandwidth_for_server)
+            local_write_throttler = std::make_shared<Throttler>(bandwidth);
+
+        if (auto bandwidth = server_settings.max_backup_bandwidth_for_server)
+            backups_server_throttler = std::make_shared<Throttler>(bandwidth);
+    }
 };
 
 
@@ -634,13 +693,15 @@ SharedContextHolder Context::createShared()
 
 ContextMutablePtr Context::createCopy(const ContextPtr & other)
 {
+    auto lock = other->getLock();
     return std::shared_ptr<Context>(new Context(*other));
 }
 
 ContextMutablePtr Context::createCopy(const ContextWeakPtr & other)
 {
     auto ptr = other.lock();
-    if (!ptr) throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't copy an expired context");
+    if (!ptr)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't copy an expired context");
     return createCopy(ptr);
 }
 
@@ -729,25 +790,35 @@ Strings Context::getWarnings() const
 }
 
 /// TODO: remove, use `getTempDataOnDisk`
-VolumePtr Context::getTemporaryVolume() const
+VolumePtr Context::getGlobalTemporaryVolume() const
 {
     auto lock = getLock();
-    if (shared->temp_data_on_disk)
-        return shared->temp_data_on_disk->getVolume();
+    /// Calling this method we just bypass the `temp_data_on_disk` and write to the file on the volume directly.
+    /// Volume is the same for `root_temp_data_on_disk` (always set) and `temp_data_on_disk` (if it's set).
+    if (shared->root_temp_data_on_disk)
+        return shared->root_temp_data_on_disk->getVolume();
     return nullptr;
 }
 
 TemporaryDataOnDiskScopePtr Context::getTempDataOnDisk() const
 {
-    auto lock = getLock();
     if (this->temp_data_on_disk)
         return this->temp_data_on_disk;
-    return shared->temp_data_on_disk;
+
+    auto lock = getLock();
+    return shared->root_temp_data_on_disk;
+}
+
+TemporaryDataOnDiskScopePtr Context::getSharedTempDataOnDisk() const
+{
+    auto lock = getLock();
+    return shared->root_temp_data_on_disk;
 }
 
 void Context::setTempDataOnDisk(TemporaryDataOnDiskScopePtr temp_data_on_disk_)
 {
-    auto lock = getLock();
+    /// It's set from `ProcessList::insert` in `executeQueryImpl` before query execution
+    /// so no races with `getTempDataOnDisk` which is called from query execution.
     this->temp_data_on_disk = std::move(temp_data_on_disk_);
 }
 
@@ -757,7 +828,7 @@ void Context::setPath(const String & path)
 
     shared->path = path;
 
-    if (shared->tmp_path.empty() && !shared->temp_data_on_disk)
+    if (shared->tmp_path.empty() && !shared->root_temp_data_on_disk)
         shared->tmp_path = shared->path + "tmp/";
 
     if (shared->flags_path.empty())
@@ -813,6 +884,11 @@ static VolumePtr createLocalSingleDiskVolume(const std::string & path)
 
 void Context::setTemporaryStoragePath(const String & path, size_t max_size)
 {
+    auto lock = getLock();
+
+    if (shared->root_temp_data_on_disk)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary storage is already set");
+
     shared->tmp_path = path;
     if (!shared->tmp_path.ends_with('/'))
         shared->tmp_path += '/';
@@ -824,17 +900,23 @@ void Context::setTemporaryStoragePath(const String & path, size_t max_size)
         setupTmpPath(shared->log, disk->getPath());
     }
 
-    shared->temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(volume, max_size);
+    shared->root_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(volume, max_size);
 }
 
 void Context::setTemporaryStoragePolicy(const String & policy_name, size_t max_size)
 {
-    std::lock_guard lock(shared->storage_policies_mutex);
+    StoragePolicyPtr tmp_policy;
+    {
+        /// lock in required only for accessing `shared->merge_tree_storage_policy_selector`
+        /// StoragePolicy itself is immutable.
+        std::lock_guard storage_policies_lock(shared->storage_policies_mutex);
+        tmp_policy = getStoragePolicySelector(storage_policies_lock)->get(policy_name);
+    }
 
-     StoragePolicyPtr tmp_policy = getStoragePolicySelector(lock)->get(policy_name);
     if (tmp_policy->getVolumes().size() != 1)
-            throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG,
+        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG,
             "Policy '{}' is used temporary files, such policy should have exactly one volume", policy_name);
+
     VolumePtr volume = tmp_policy->getVolume(0);
 
     if (volume->getDisks().empty())
@@ -859,9 +941,13 @@ void Context::setTemporaryStoragePolicy(const String & policy_name, size_t max_s
         setupTmpPath(shared->log, disk->getPath());
     }
 
-    shared->temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(volume, max_size);
-}
+    auto lock = getLock();
 
+    if (shared->root_temp_data_on_disk)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary storage is already set");
+
+    shared->root_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(volume, max_size);
+}
 
 void Context::setTemporaryStorageInCache(const String & cache_disk_name, size_t max_size)
 {
@@ -869,11 +955,11 @@ void Context::setTemporaryStorageInCache(const String & cache_disk_name, size_t
     if (!disk_ptr)
         throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Disk '{}' is not found", cache_disk_name);
 
-    const auto * disk_object_storage_ptr = dynamic_cast<const DiskObjectStorage *>(disk_ptr.get());
-    if (!disk_object_storage_ptr)
-        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Disk '{}' does not use cache", cache_disk_name);
+    auto lock = getLock();
+    if (shared->root_temp_data_on_disk)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary storage is already set");
 
-    auto file_cache = disk_object_storage_ptr->getCache();
+    auto file_cache = FileCacheFactory::instance().getByName(disk_ptr->getCacheName()).cache;
     if (!file_cache)
         throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Cache '{}' is not found", file_cache->getBasePath());
 
@@ -881,7 +967,7 @@ void Context::setTemporaryStorageInCache(const String & cache_disk_name, size_t
 
     shared->tmp_path = file_cache->getBasePath();
     VolumePtr volume = createLocalSingleDiskVolume(shared->tmp_path);
-    shared->temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(volume, file_cache.get(), max_size);
+    shared->root_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(volume, file_cache.get(), max_size);
 }
 
 void Context::setFlagsPath(const String & path)
@@ -1158,7 +1244,7 @@ ResourceManagerPtr Context::getResourceManager() const
 {
     auto lock = getLock();
     if (!shared->resource_manager)
-        shared->resource_manager = ResourceManagerFactory::instance().get(getConfigRef().getString("resource_manager", "static"));
+        shared->resource_manager = ResourceManagerFactory::instance().get(getConfigRef().getString("resource_manager", "dynamic"));
     return shared->resource_manager;
 }
 
@@ -1300,6 +1386,20 @@ void Context::addQueryAccessInfo(
         query_access_info.views.emplace(view_name);
 }
 
+void Context::addQueryAccessInfo(const Names & partition_names)
+{
+    if (isGlobalContext())
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context cannot have query access info");
+    }
+
+    std::lock_guard<std::mutex> lock(query_access_info.mutex);
+    for (const auto & partition_name : partition_names)
+    {
+        query_access_info.partitions.emplace(partition_name);
+    }
+}
+
 void Context::addQueryFactoriesInfo(QueryLogFactories factory_type, const String & created_object) const
 {
     if (isGlobalContext())
@@ -1338,6 +1438,22 @@ void Context::addQueryFactoriesInfo(QueryLogFactories factory_type, const String
     }
 }
 
+static bool findIdentifier(const ASTFunction * function)
+{
+    if (!function || !function->arguments)
+        return false;
+    if (const auto * arguments = function->arguments->as<ASTExpressionList>())
+    {
+        for (const auto & argument : arguments->children)
+        {
+            if (argument->as<ASTIdentifier>())
+                return true;
+            if (const auto * f = argument->as<ASTFunction>(); f && findIdentifier(f))
+                return true;
+        }
+    }
+    return false;
+}
 
 StoragePtr Context::executeTableFunction(const ASTPtr & table_expression, const ASTSelectQuery * select_query_hint)
 {
@@ -1384,62 +1500,125 @@ StoragePtr Context::executeTableFunction(const ASTPtr & table_expression, const
             }
             throw;
         }
-        if (getSettingsRef().use_structure_from_insertion_table_in_table_functions && table_function_ptr->needStructureHint() && hasInsertionTable())
+
+        uint64_t use_structure_from_insertion_table_in_table_functions = getSettingsRef().use_structure_from_insertion_table_in_table_functions;
+        if (use_structure_from_insertion_table_in_table_functions && table_function_ptr->needStructureHint() && hasInsertionTable())
         {
-            const auto & structure_hint = DatabaseCatalog::instance().getTable(getInsertionTable(), shared_from_this())->getInMemoryMetadataPtr()->getColumns();
+            const auto & insert_structure = DatabaseCatalog::instance().getTable(getInsertionTable(), shared_from_this())->getInMemoryMetadataPtr()->getColumns();
+            DB::ColumnsDescription structure_hint;
+
             bool use_columns_from_insert_query = true;
 
-            /// use_structure_from_insertion_table_in_table_functions=2 means `auto`
-            if (select_query_hint && getSettingsRef().use_structure_from_insertion_table_in_table_functions == 2)
+            /// Insert table matches columns against SELECT expression by position, so we want to map
+            /// insert table columns to table function columns through names from SELECT expression.
+
+            auto insert_column = insert_structure.begin();
+            auto insert_structure_end = insert_structure.end();  /// end iterator of the range covered by possible asterisk
+            auto virtual_column_names = table_function_ptr->getVirtualsToCheckBeforeUsingStructureHint();
+            bool asterisk = false;
+            const auto & expression_list = select_query_hint->select()->as<ASTExpressionList>()->children;
+            const auto * expression = expression_list.begin();
+
+            /// We want to go through SELECT expression list and correspond each expression to column in insert table
+            /// which type will be used as a hint for the file structure inference.
+            for (; expression != expression_list.end() && insert_column != insert_structure_end; ++expression)
             {
-                const auto * expression_list = select_query_hint->select()->as<ASTExpressionList>();
-                std::unordered_set<String> virtual_column_names = table_function_ptr->getVirtualsToCheckBeforeUsingStructureHint();
-                Names columns_names;
-                bool have_asterisk = false;
-                /// First, check if we have only identifiers, asterisk and literals in select expression,
-                /// and if no, we cannot use the structure from insertion table.
-                for (const auto & expression : expression_list->children)
+                if (auto * identifier = (*expression)->as<ASTIdentifier>())
                 {
-                    if (auto * identifier = expression->as<ASTIdentifier>())
+                    if (!virtual_column_names.contains(identifier->name()))
                     {
-                        columns_names.push_back(identifier->name());
-                    }
-                    else if (expression->as<ASTAsterisk>())
-                    {
-                        have_asterisk = true;
-                    }
-                    else if (!expression->as<ASTLiteral>())
-                    {
-                        use_columns_from_insert_query = false;
-                        break;
-                    }
-                }
+                        if (asterisk)
+                        {
+                            if (use_structure_from_insertion_table_in_table_functions == 1)
+                                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Asterisk cannot be mixed with column list in INSERT SELECT query.");
 
-                /// Check that all identifiers are column names from insertion table and not virtual column names from storage.
-                for (const auto & column_name : columns_names)
-                {
-                    if (!structure_hint.has(column_name) || virtual_column_names.contains(column_name))
-                    {
-                        use_columns_from_insert_query = false;
-                        break;
-                    }
-                }
+                            use_columns_from_insert_query = false;
+                            break;
+                        }
 
-                /// If we don't have asterisk but only subset of columns, we should use
-                /// structure from insertion table only in case when table function
-                /// supports reading subset of columns from data.
-                if (use_columns_from_insert_query && !have_asterisk && !columns_names.empty())
-                {
-                    /// For input function we should check if input format supports reading subset of columns.
-                    if (table_function_ptr->getName() == "input")
-                        use_columns_from_insert_query = FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(getInsertFormat());
+                        structure_hint.add({ identifier->name(), insert_column->type });
+                    }
+
+                    /// Once we hit asterisk we want to find end of the range covered by asterisk
+                    /// contributing every further SELECT expression to the tail of insert structure
+                    if (asterisk)
+                        --insert_structure_end;
                     else
-                        use_columns_from_insert_query = table_function_ptr->supportsReadingSubsetOfColumns();
+                        ++insert_column;
+                }
+                else if ((*expression)->as<ASTAsterisk>())
+                {
+                    if (asterisk)
+                    {
+                        if (use_structure_from_insertion_table_in_table_functions == 1)
+                            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Only one asterisk can be used in INSERT SELECT query.");
+
+                        use_columns_from_insert_query = false;
+                        break;
+                    }
+                    if (!structure_hint.empty())
+                    {
+                        if (use_structure_from_insertion_table_in_table_functions == 1)
+                            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Asterisk cannot be mixed with column list in INSERT SELECT query.");
+
+                        use_columns_from_insert_query = false;
+                        break;
+                    }
+
+                    asterisk = true;
+                }
+                else if (auto * func = (*expression)->as<ASTFunction>())
+                {
+                    if (use_structure_from_insertion_table_in_table_functions == 2 && findIdentifier(func))
+                    {
+                        use_columns_from_insert_query = false;
+                        break;
+                    }
+
+                    /// Once we hit asterisk we want to find end of the range covered by asterisk
+                    /// contributing every further SELECT expression to the tail of insert structure
+                    if (asterisk)
+                        --insert_structure_end;
+                    else
+                        ++insert_column;
+                }
+                else
+                {
+                    /// Once we hit asterisk we want to find end of the range covered by asterisk
+                    /// contributing every further SELECT expression to the tail of insert structure
+                    if (asterisk)
+                        --insert_structure_end;
+                    else
+                        ++insert_column;
                 }
             }
 
+            if (use_structure_from_insertion_table_in_table_functions == 2 && !asterisk)
+            {
+                /// For input function we should check if input format supports reading subset of columns.
+                if (table_function_ptr->getName() == "input")
+                    use_columns_from_insert_query = FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(getInsertFormat());
+                else
+                    use_columns_from_insert_query = table_function_ptr->supportsReadingSubsetOfColumns();
+            }
+
             if (use_columns_from_insert_query)
-                table_function_ptr->setStructureHint(structure_hint);
+            {
+                if (expression == expression_list.end())
+                {
+                    /// Append tail of insert structure to the hint
+                    if (asterisk)
+                    {
+                        for (; insert_column != insert_structure_end; ++insert_column)
+                            structure_hint.add({ insert_column->name, insert_column->type });
+                    }
+
+                    if (!structure_hint.empty())
+                        table_function_ptr->setStructureHint(structure_hint);
+
+                } else if (use_structure_from_insertion_table_in_table_functions == 1)
+                    throw Exception(ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH, "Number of columns in insert table less than required by SELECT expression.");
+            }
         }
 
         res = table_function_ptr->execute(table_expression, shared_from_this(), table_function_ptr->getName());
@@ -1458,6 +1637,20 @@ StoragePtr Context::executeTableFunction(const ASTPtr & table_expression, const
     return res;
 }
 
+StoragePtr Context::executeTableFunction(const ASTPtr & table_expression, const TableFunctionPtr & table_function_ptr)
+{
+    auto hash = table_expression->getTreeHash();
+    String key = toString(hash.first) + '_' + toString(hash.second);
+    StoragePtr & res = table_function_results[key];
+
+    if (!res)
+    {
+        res = table_function_ptr->execute(table_expression, shared_from_this(), table_function_ptr->getName());
+    }
+
+    return res;
+}
+
 
 void Context::addViewSource(const StoragePtr & storage)
 {
@@ -1473,26 +1666,42 @@ StoragePtr Context::getViewSource() const
     return view_source;
 }
 
+bool Context::displaySecretsInShowAndSelect() const
+{
+    return shared->server_settings.display_secrets_in_show_and_select;
+}
+
 Settings Context::getSettings() const
 {
     auto lock = getLock();
     return settings;
 }
 
-
 void Context::setSettings(const Settings & settings_)
 {
     auto lock = getLock();
-    auto old_readonly = settings.readonly;
-    auto old_allow_ddl = settings.allow_ddl;
-    auto old_allow_introspection_functions = settings.allow_introspection_functions;
+    const auto old_readonly = settings.readonly;
+    const auto old_allow_ddl = settings.allow_ddl;
+    const auto old_allow_introspection_functions = settings.allow_introspection_functions;
+    const auto old_display_secrets = settings.format_display_secrets_in_show_and_select;
 
     settings = settings_;
 
-    if ((settings.readonly != old_readonly) || (settings.allow_ddl != old_allow_ddl) || (settings.allow_introspection_functions != old_allow_introspection_functions))
+    if ((settings.readonly != old_readonly)
+        || (settings.allow_ddl != old_allow_ddl)
+        || (settings.allow_introspection_functions != old_allow_introspection_functions)
+        || (settings.format_display_secrets_in_show_and_select != old_display_secrets))
         calculateAccessRights();
 }
 
+void Context::recalculateAccessRightsIfNeeded(std::string_view name)
+{
+    if (name == "readonly"
+        || name == "allow_ddl"
+        || name == "allow_introspection_functions"
+        || name == "format_display_secrets_in_show_and_select")
+        calculateAccessRights();
+}
 
 void Context::setSetting(std::string_view name, const String & value)
 {
@@ -1503,12 +1712,9 @@ void Context::setSetting(std::string_view name, const String & value)
         return;
     }
     settings.set(name, value);
-
-    if (name == "readonly" || name == "allow_ddl" || name == "allow_introspection_functions")
-        calculateAccessRights();
+    recalculateAccessRightsIfNeeded(name);
 }
 
-
 void Context::setSetting(std::string_view name, const Field & value)
 {
     auto lock = getLock();
@@ -1518,12 +1724,9 @@ void Context::setSetting(std::string_view name, const Field & value)
         return;
     }
     settings.set(name, value);
-
-    if (name == "readonly" || name == "allow_ddl" || name == "allow_introspection_functions")
-        calculateAccessRights();
+    recalculateAccessRightsIfNeeded(name);
 }
 
-
 void Context::applySettingChange(const SettingChange & change)
 {
     try
@@ -1742,6 +1945,38 @@ ContextMutablePtr Context::getBufferContext() const
     return buffer_context;
 }
 
+void Context::makeQueryContext()
+{
+    query_context = shared_from_this();
+
+    /// Throttling should not be inherited, otherwise if you will set
+    /// throttling for default profile you will not able to overwrite it
+    /// per-user/query.
+    ///
+    /// Note, that if you need to set it server-wide, you should use
+    /// per-server settings, i.e.:
+    /// - max_backup_bandwidth_for_server
+    /// - max_remote_read_network_bandwidth_for_server
+    /// - max_remote_write_network_bandwidth_for_server
+    /// - max_local_read_bandwidth_for_server
+    /// - max_local_write_bandwidth_for_server
+    remote_read_query_throttler.reset();
+    remote_write_query_throttler.reset();
+    local_read_query_throttler.reset();
+    local_write_query_throttler.reset();
+    backups_query_throttler.reset();
+}
+
+void Context::makeSessionContext()
+{
+    session_context = shared_from_this();
+}
+
+void Context::makeGlobalContext()
+{
+    initGlobal();
+    global_context = shared_from_this();
+}
 
 const EmbeddedDictionaries & Context::getEmbeddedDictionaries() const
 {
@@ -1910,8 +2145,13 @@ BackupsWorker & Context::getBackupsWorker() const
     const bool allow_concurrent_backups = this->getConfigRef().getBool("backups.allow_concurrent_backups", true);
     const bool allow_concurrent_restores = this->getConfigRef().getBool("backups.allow_concurrent_restores", true);
 
+    const auto & config = getConfigRef();
+    const auto & settings_ = getSettingsRef();
+    UInt64 backup_threads = config.getUInt64("backup_threads", settings_.backup_threads);
+    UInt64 restore_threads = config.getUInt64("restore_threads", settings_.restore_threads);
+
     if (!shared->backups_worker)
-        shared->backups_worker.emplace(getSettingsRef().backup_threads, getSettingsRef().restore_threads, allow_concurrent_backups, allow_concurrent_restores);
+        shared->backups_worker.emplace(backup_threads, restore_threads, allow_concurrent_backups, allow_concurrent_restores);
 
     return *shared->backups_worker;
 }
@@ -1946,14 +2186,14 @@ QueryStatusPtr Context::getProcessListElement() const
 }
 
 
-void Context::setUncompressedCache(size_t max_size_in_bytes, const String & uncompressed_cache_policy)
+void Context::setUncompressedCache(const String & uncompressed_cache_policy, size_t max_size_in_bytes)
 {
     auto lock = getLock();
 
     if (shared->uncompressed_cache)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Uncompressed cache has been already created.");
 
-    shared->uncompressed_cache = std::make_shared<UncompressedCache>(max_size_in_bytes, uncompressed_cache_policy);
+    shared->uncompressed_cache = std::make_shared<UncompressedCache>(uncompressed_cache_policy, max_size_in_bytes);
 }
 
 
@@ -1972,14 +2212,14 @@ void Context::dropUncompressedCache() const
 }
 
 
-void Context::setMarkCache(size_t cache_size_in_bytes, const String & mark_cache_policy)
+void Context::setMarkCache(const String & mark_cache_policy, size_t cache_size_in_bytes)
 {
     auto lock = getLock();
 
     if (shared->mark_cache)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Mark cache has been already created.");
 
-    shared->mark_cache = std::make_shared<MarkCache>(cache_size_in_bytes, mark_cache_policy);
+    shared->mark_cache = std::make_shared<MarkCache>(mark_cache_policy, cache_size_in_bytes);
 }
 
 MarkCachePtr Context::getMarkCache() const
@@ -2004,7 +2244,8 @@ ThreadPool & Context::getLoadMarksThreadpool() const
     {
         auto pool_size = config.getUInt(".load_marks_threadpool_pool_size", 50);
         auto queue_size = config.getUInt(".load_marks_threadpool_queue_size", 1000000);
-        shared->load_marks_threadpool = std::make_unique<ThreadPool>(pool_size, pool_size, queue_size);
+        shared->load_marks_threadpool = std::make_unique<ThreadPool>(
+            CurrentMetrics::MarksLoaderThreads, CurrentMetrics::MarksLoaderThreadsActive, pool_size, pool_size, queue_size);
     }
     return *shared->load_marks_threadpool;
 }
@@ -2029,7 +2270,8 @@ ThreadPool & Context::getPrefetchThreadpool() const
     {
         auto pool_size = getPrefetchThreadpoolSize();
         auto queue_size = config.getUInt(".prefetch_threadpool_queue_size", 1000000);
-        shared->prefetch_threadpool = std::make_unique<ThreadPool>(pool_size, pool_size, queue_size);
+        shared->prefetch_threadpool = std::make_unique<ThreadPool>(
+            CurrentMetrics::IOPrefetchThreads, CurrentMetrics::IOPrefetchThreadsActive, pool_size, pool_size, queue_size);
     }
     return *shared->prefetch_threadpool;
 }
@@ -2166,15 +2408,10 @@ BackgroundSchedulePool & Context::getBufferFlushSchedulePool() const
     auto lock = getLock();
     if (!shared->buffer_flush_schedule_pool)
     {
-        size_t background_buffer_flush_schedule_pool_size = 16;
-        if (getConfigRef().has("background_buffer_flush_schedule_pool_size"))
-            background_buffer_flush_schedule_pool_size = getConfigRef().getUInt64("background_buffer_flush_schedule_pool_size");
-        else if (getConfigRef().has("profiles.default.background_buffer_flush_schedule_pool_size"))
-            background_buffer_flush_schedule_pool_size = getConfigRef().getUInt64("profiles.default.background_buffer_flush_schedule_pool_size");
-
         shared->buffer_flush_schedule_pool = std::make_unique<BackgroundSchedulePool>(
-            background_buffer_flush_schedule_pool_size,
+            shared->server_settings.background_buffer_flush_schedule_pool_size,
             CurrentMetrics::BackgroundBufferFlushSchedulePoolTask,
+            CurrentMetrics::BackgroundBufferFlushSchedulePoolSize,
             "BgBufSchPool");
     }
 
@@ -2217,15 +2454,10 @@ BackgroundSchedulePool & Context::getSchedulePool() const
     auto lock = getLock();
     if (!shared->schedule_pool)
     {
-        size_t background_schedule_pool_size = 128;
-        if (getConfigRef().has("background_schedule_pool_size"))
-            background_schedule_pool_size = getConfigRef().getUInt64("background_schedule_pool_size");
-        else if (getConfigRef().has("profiles.default.background_schedule_pool_size"))
-            background_schedule_pool_size = getConfigRef().getUInt64("profiles.default.background_schedule_pool_size");
-
         shared->schedule_pool = std::make_unique<BackgroundSchedulePool>(
-            background_schedule_pool_size,
+            shared->server_settings.background_schedule_pool_size,
             CurrentMetrics::BackgroundSchedulePoolTask,
+            CurrentMetrics::BackgroundSchedulePoolSize,
             "BgSchPool");
     }
 
@@ -2237,15 +2469,10 @@ BackgroundSchedulePool & Context::getDistributedSchedulePool() const
     auto lock = getLock();
     if (!shared->distributed_schedule_pool)
     {
-        size_t background_distributed_schedule_pool_size = 16;
-        if (getConfigRef().has("background_distributed_schedule_pool_size"))
-            background_distributed_schedule_pool_size = getConfigRef().getUInt64("background_distributed_schedule_pool_size");
-        else if (getConfigRef().has("profiles.default.background_distributed_schedule_pool_size"))
-            background_distributed_schedule_pool_size = getConfigRef().getUInt64("profiles.default.background_distributed_schedule_pool_size");
-
         shared->distributed_schedule_pool = std::make_unique<BackgroundSchedulePool>(
-            background_distributed_schedule_pool_size,
+            shared->server_settings.background_distributed_schedule_pool_size,
             CurrentMetrics::BackgroundDistributedSchedulePoolTask,
+            CurrentMetrics::BackgroundDistributedSchedulePoolSize,
             "BgDistSchPool");
     }
 
@@ -2257,15 +2484,10 @@ BackgroundSchedulePool & Context::getMessageBrokerSchedulePool() const
     auto lock = getLock();
     if (!shared->message_broker_schedule_pool)
     {
-        size_t background_message_broker_schedule_pool_size = 16;
-        if (getConfigRef().has("background_message_broker_schedule_pool_size"))
-            background_message_broker_schedule_pool_size = getConfigRef().getUInt64("background_message_broker_schedule_pool_size");
-        else if (getConfigRef().has("profiles.default.background_message_broker_schedule_pool_size"))
-            background_message_broker_schedule_pool_size = getConfigRef().getUInt64("profiles.default.background_message_broker_schedule_pool_size");
-
         shared->message_broker_schedule_pool = std::make_unique<BackgroundSchedulePool>(
-            background_message_broker_schedule_pool_size,
+            shared->server_settings.background_message_broker_schedule_pool_size,
             CurrentMetrics::BackgroundMessageBrokerSchedulePoolTask,
+            CurrentMetrics::BackgroundMessageBrokerSchedulePoolSize,
             "BgMBSchPool");
     }
 
@@ -2274,42 +2496,77 @@ BackgroundSchedulePool & Context::getMessageBrokerSchedulePool() const
 
 ThrottlerPtr Context::getReplicatedFetchesThrottler() const
 {
-    auto lock = getLock();
-    if (!shared->replicated_fetches_throttler)
-        shared->replicated_fetches_throttler = std::make_shared<Throttler>(
-            settings.max_replicated_fetches_network_bandwidth_for_server);
-
     return shared->replicated_fetches_throttler;
 }
 
 ThrottlerPtr Context::getReplicatedSendsThrottler() const
 {
-    auto lock = getLock();
-    if (!shared->replicated_sends_throttler)
-        shared->replicated_sends_throttler = std::make_shared<Throttler>(
-            settings.max_replicated_sends_network_bandwidth_for_server);
-
     return shared->replicated_sends_throttler;
 }
 
 ThrottlerPtr Context::getRemoteReadThrottler() const
 {
-    auto lock = getLock();
-    if (!shared->remote_read_throttler)
-        shared->remote_read_throttler = std::make_shared<Throttler>(
-            settings.max_remote_read_network_bandwidth_for_server);
-
-    return shared->remote_read_throttler;
+    ThrottlerPtr throttler = shared->remote_read_throttler;
+    if (auto bandwidth = getSettingsRef().max_remote_read_network_bandwidth)
+    {
+        auto lock = getLock();
+        if (!remote_read_query_throttler)
+            remote_read_query_throttler = std::make_shared<Throttler>(bandwidth, throttler);
+        throttler = remote_read_query_throttler;
+    }
+    return throttler;
 }
 
 ThrottlerPtr Context::getRemoteWriteThrottler() const
 {
-    auto lock = getLock();
-    if (!shared->remote_write_throttler)
-        shared->remote_write_throttler = std::make_shared<Throttler>(
-            settings.max_remote_write_network_bandwidth_for_server);
+    ThrottlerPtr throttler = shared->remote_write_throttler;
+    if (auto bandwidth = getSettingsRef().max_remote_write_network_bandwidth)
+    {
+        auto lock = getLock();
+        if (!remote_write_query_throttler)
+            remote_write_query_throttler = std::make_shared<Throttler>(bandwidth, throttler);
+        throttler = remote_write_query_throttler;
+    }
+    return throttler;
+}
 
-    return shared->remote_write_throttler;
+ThrottlerPtr Context::getLocalReadThrottler() const
+{
+    ThrottlerPtr throttler = shared->local_read_throttler;
+    if (auto bandwidth = getSettingsRef().max_local_read_bandwidth)
+    {
+        auto lock = getLock();
+        if (!local_read_query_throttler)
+            local_read_query_throttler = std::make_shared<Throttler>(bandwidth, throttler);
+        throttler = local_read_query_throttler;
+    }
+    return throttler;
+}
+
+ThrottlerPtr Context::getLocalWriteThrottler() const
+{
+    ThrottlerPtr throttler = shared->local_write_throttler;
+    if (auto bandwidth = getSettingsRef().max_local_write_bandwidth)
+    {
+        auto lock = getLock();
+        if (!local_write_query_throttler)
+            local_write_query_throttler = std::make_shared<Throttler>(bandwidth, throttler);
+        throttler = local_write_query_throttler;
+    }
+    return throttler;
+}
+
+ThrottlerPtr Context::getBackupsThrottler() const
+{
+    ThrottlerPtr throttler = shared->backups_server_throttler;
+    if (auto bandwidth = getSettingsRef().max_backup_bandwidth)
+    {
+        auto lock = getLock();
+        if (!backups_query_throttler)
+            backups_query_throttler = std::make_shared<Throttler>(bandwidth, throttler);
+        throttler = backups_query_throttler;
+    }
+    return throttler;
 }
 
 bool Context::hasDistributedDDL() const
@@ -2348,7 +2605,7 @@ zkutil::ZooKeeperPtr Context::getZooKeeper() const
 
     const auto & config = shared->zookeeper_config ? *shared->zookeeper_config : getConfigRef();
     if (!shared->zookeeper)
-        shared->zookeeper = std::make_shared<zkutil::ZooKeeper>(config, "zookeeper", getZooKeeperLog());
+        shared->zookeeper = std::make_shared<zkutil::ZooKeeper>(config, zkutil::getZooKeeperConfigName(config), getZooKeeperLog());
     else if (shared->zookeeper->expired())
     {
         Stopwatch watch;
@@ -2387,8 +2644,9 @@ bool Context::tryCheckClientConnectionToMyKeeperCluster() const
 {
     try
     {
+        const auto config_name = zkutil::getZooKeeperConfigName(getConfigRef());
         /// If our server is part of main Keeper cluster
-        if (checkZooKeeperConfigIsLocal(getConfigRef(), "zookeeper"))
+        if (config_name == "keeper_server" || checkZooKeeperConfigIsLocal(getConfigRef(), config_name))
         {
             LOG_DEBUG(shared->log, "Keeper server is participant of the main zookeeper cluster, will try to connect to it");
             getZooKeeper();
@@ -2548,6 +2806,13 @@ zkutil::ZooKeeperPtr Context::getAuxiliaryZooKeeper(const String & name) const
     return zookeeper->second;
 }
 
+
+std::map<String, zkutil::ZooKeeperPtr> Context::getAuxiliaryZooKeepers() const
+{
+    std::lock_guard lock(shared->auxiliary_zookeepers_mutex);
+    return shared->auxiliary_zookeepers;
+}
+
 #if USE_ROCKSDB
 MergeTreeMetadataCachePtr Context::getMergeTreeMetadataCache() const
 {
@@ -2571,8 +2836,12 @@ void Context::resetZooKeeper() const
     shared->zookeeper.reset();
 }
 
-static void reloadZooKeeperIfChangedImpl(const ConfigurationPtr & config, const std::string & config_name, zkutil::ZooKeeperPtr & zk,
-                                         std::shared_ptr<ZooKeeperLog> zk_log)
+static void reloadZooKeeperIfChangedImpl(
+    const ConfigurationPtr & config,
+    const std::string & config_name,
+    zkutil::ZooKeeperPtr & zk,
+    std::shared_ptr<ZooKeeperLog> zk_log,
+    bool server_started)
 {
     if (!zk || zk->configChanged(*config, config_name))
     {
@@ -2580,18 +2849,22 @@ static void reloadZooKeeperIfChangedImpl(const ConfigurationPtr & config, const
             zk->finalize("Config changed");
 
         zk = std::make_shared<zkutil::ZooKeeper>(*config, config_name, std::move(zk_log));
+        if (server_started)
+            zk->setServerCompletelyStarted();
     }
 }
 
 void Context::reloadZooKeeperIfChanged(const ConfigurationPtr & config) const
 {
+    bool server_started = isServerCompletelyStarted();
     std::lock_guard lock(shared->zookeeper_mutex);
     shared->zookeeper_config = config;
-    reloadZooKeeperIfChangedImpl(config, "zookeeper", shared->zookeeper, getZooKeeperLog());
+    reloadZooKeeperIfChangedImpl(config, zkutil::getZooKeeperConfigName(*config), shared->zookeeper, getZooKeeperLog(), server_started);
 }
 
 void Context::reloadAuxiliaryZooKeepersConfigIfChanged(const ConfigurationPtr & config)
 {
+    bool server_started = isServerCompletelyStarted();
     std::lock_guard lock(shared->auxiliary_zookeepers_mutex);
 
     shared->auxiliary_zookeepers_config = config;
@@ -2602,7 +2875,7 @@ void Context::reloadAuxiliaryZooKeepersConfigIfChanged(const ConfigurationPtr &
             it = shared->auxiliary_zookeepers.erase(it);
         else
         {
-            reloadZooKeeperIfChangedImpl(config, "auxiliary_zookeepers." + it->first, it->second, getZooKeeperLog());
+            reloadZooKeeperIfChangedImpl(config, "auxiliary_zookeepers." + it->first, it->second, getZooKeeperLog(), server_started);
             ++it;
         }
     }
@@ -2611,7 +2884,7 @@ void Context::reloadAuxiliaryZooKeepersConfigIfChanged(const ConfigurationPtr &
 
 bool Context::hasZooKeeper() const
 {
-    return getConfigRef().has("zookeeper");
+    return zkutil::hasZooKeeperConfig(getConfigRef());
 }
 
 bool Context::hasAuxiliaryZooKeeper(const String & name) const
@@ -2708,11 +2981,19 @@ std::shared_ptr<Cluster> Context::getCluster(const std::string & cluster_name) c
 
 std::shared_ptr<Cluster> Context::tryGetCluster(const std::string & cluster_name) const
 {
-    auto res = getClusters()->getCluster(cluster_name);
-    if (res)
-        return res;
-    if (!cluster_name.empty())
+    std::shared_ptr<Cluster> res = nullptr;
+
+    {
+        std::lock_guard lock(shared->clusters_mutex);
+        res = getClustersImpl(lock)->getCluster(cluster_name);
+
+        if (res == nullptr && shared->cluster_discovery)
+            res = shared->cluster_discovery->getCluster(cluster_name);
+    }
+
+    if (res == nullptr && !cluster_name.empty())
         res = tryGetReplicatedDatabaseCluster(cluster_name);
+
     return res;
 }
 
@@ -2743,10 +3024,23 @@ void Context::reloadClusterConfig() const
     }
 }
 
-
-std::shared_ptr<Clusters> Context::getClusters() const
+std::map<String, ClusterPtr> Context::getClusters() const
 {
     std::lock_guard lock(shared->clusters_mutex);
+
+    auto clusters = getClustersImpl(lock)->getContainer();
+
+    if (shared->cluster_discovery)
+    {
+        const auto & cluster_discovery_map = shared->cluster_discovery->getClusters();
+        for (const auto & [name, cluster] : cluster_discovery_map)
+            clusters.emplace(name, cluster);
+    }
+    return clusters;
+}
+
+std::shared_ptr<Clusters> Context::getClustersImpl(std::lock_guard<std::mutex> & /* lock */) const
+{
     if (!shared->clusters)
     {
         const auto & config = shared->clusters_config ? *shared->clusters_config : getConfigRef();
@@ -2758,6 +3052,7 @@ std::shared_ptr<Clusters> Context::getClusters() const
 
 void Context::startClusterDiscovery()
 {
+    std::lock_guard lock(shared->clusters_mutex);
     if (!shared->cluster_discovery)
         return;
     shared->cluster_discovery->start();
@@ -3260,9 +3555,9 @@ void Context::checkPartitionCanBeDropped(const String & database, const String &
 }
 
 
-InputFormatPtr Context::getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size, const std::optional<FormatSettings> & format_settings) const
+InputFormatPtr Context::getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size, const std::optional<FormatSettings> & format_settings, const std::optional<size_t> max_parsing_threads) const
 {
-    return FormatFactory::instance().getInput(name, buf, sample, shared_from_this(), max_block_size, format_settings);
+    return FormatFactory::instance().getInput(name, buf, sample, shared_from_this(), max_block_size, format_settings, max_parsing_threads);
 }
 
 OutputFormatPtr Context::getOutputFormat(const String & name, WriteBuffer & buf, const Block & sample) const
@@ -3313,7 +3608,7 @@ void Context::shutdown()
     }
 
     /// Special volumes might also use disks that require shutdown.
-    auto & tmp_data = shared->temp_data_on_disk;
+    auto & tmp_data = shared->root_temp_data_on_disk;
     if (tmp_data && tmp_data->getVolume())
     {
         auto & disks = tmp_data->getVolume()->getDisks();
@@ -3334,6 +3629,12 @@ void Context::setApplicationType(ApplicationType type)
 {
     /// Lock isn't required, you should set it at start
     shared->application_type = type;
+
+    if (type == ApplicationType::SERVER)
+    {
+        shared->server_settings.loadSettingsFromConfig(Poco::Util::Application::instance().config());
+        shared->configureServerWideThrottling();
+    }
 }
 
 void Context::setDefaultProfiles(const Poco::Util::AbstractConfiguration & config)
@@ -3678,6 +3979,15 @@ bool Context::isServerCompletelyStarted() const
 
 void Context::setServerCompletelyStarted()
 {
+    {
+        std::lock_guard lock(shared->zookeeper_mutex);
+        if (shared->zookeeper)
+            shared->zookeeper->setServerCompletelyStarted();
+
+        for (auto & zk : shared->auxiliary_zookeepers)
+            zk.second->setServerCompletelyStarted();
+    }
+
     auto lock = getLock();
     assert(global_context.lock().get() == this);
     assert(!shared->is_server_completely_started);
@@ -3781,62 +4091,35 @@ void Context::initializeBackgroundExecutorsIfNeeded()
     if (shared->are_background_executors_initialized)
         return;
 
-    const auto & config = getConfigRef();
-
-    size_t background_pool_size = 16;
-    if (config.has("background_pool_size"))
-        background_pool_size = config.getUInt64("background_pool_size");
-    else if (config.has("profiles.default.background_pool_size"))
-        background_pool_size = config.getUInt64("profiles.default.background_pool_size");
-
-    size_t background_merges_mutations_concurrency_ratio = 2;
-    if (config.has("background_merges_mutations_concurrency_ratio"))
-        background_merges_mutations_concurrency_ratio = config.getUInt64("background_merges_mutations_concurrency_ratio");
-    else if (config.has("profiles.default.background_merges_mutations_concurrency_ratio"))
-        background_merges_mutations_concurrency_ratio = config.getUInt64("profiles.default.background_merges_mutations_concurrency_ratio");
-
-    String background_merges_mutations_scheduling_policy = "round_robin";
-    if (config.has("background_merges_mutations_scheduling_policy"))
-        background_merges_mutations_scheduling_policy = config.getString("background_merges_mutations_scheduling_policy");
-    else if (config.has("profiles.default.background_merges_mutations_scheduling_policy"))
-        background_merges_mutations_scheduling_policy = config.getString("profiles.default.background_merges_mutations_scheduling_policy");
-
-    size_t background_move_pool_size = 8;
-    if (config.has("background_move_pool_size"))
-        background_move_pool_size = config.getUInt64("background_move_pool_size");
-    else if (config.has("profiles.default.background_move_pool_size"))
-        background_move_pool_size = config.getUInt64("profiles.default.background_move_pool_size");
-
-    size_t background_fetches_pool_size = 8;
-    if (config.has("background_fetches_pool_size"))
-        background_fetches_pool_size = config.getUInt64("background_fetches_pool_size");
-    else if (config.has("profiles.default.background_fetches_pool_size"))
-        background_fetches_pool_size = config.getUInt64("profiles.default.background_fetches_pool_size");
-
-    size_t background_common_pool_size = 8;
-    if (config.has("background_common_pool_size"))
-        background_common_pool_size = config.getUInt64("background_common_pool_size");
-    else if (config.has("profiles.default.background_common_pool_size"))
-        background_common_pool_size = config.getUInt64("profiles.default.background_common_pool_size");
+    const ServerSettings & server_settings = shared->server_settings;
+    size_t background_pool_size = server_settings.background_pool_size;
+    auto background_merges_mutations_concurrency_ratio = server_settings.background_merges_mutations_concurrency_ratio;
+    size_t background_pool_max_tasks_count = static_cast<size_t>(background_pool_size * background_merges_mutations_concurrency_ratio);
+    String background_merges_mutations_scheduling_policy = server_settings.background_merges_mutations_scheduling_policy;
+    size_t background_move_pool_size = server_settings.background_move_pool_size;
+    size_t background_fetches_pool_size = server_settings.background_fetches_pool_size;
+    size_t background_common_pool_size = server_settings.background_common_pool_size;
 
     /// With this executor we can execute more tasks than threads we have
     shared->merge_mutate_executor = std::make_shared<MergeMutateBackgroundExecutor>
     (
         "MergeMutate",
         /*max_threads_count*/background_pool_size,
-        /*max_tasks_count*/background_pool_size * background_merges_mutations_concurrency_ratio,
+        /*max_tasks_count*/background_pool_max_tasks_count,
         CurrentMetrics::BackgroundMergesAndMutationsPoolTask,
+        CurrentMetrics::BackgroundMergesAndMutationsPoolSize,
         background_merges_mutations_scheduling_policy
     );
     LOG_INFO(shared->log, "Initialized background executor for merges and mutations with num_threads={}, num_tasks={}, scheduling_policy={}",
-        background_pool_size, background_pool_size * background_merges_mutations_concurrency_ratio, background_merges_mutations_scheduling_policy);
+        background_pool_size, background_pool_max_tasks_count, background_merges_mutations_scheduling_policy);
 
     shared->moves_executor = std::make_shared<OrdinaryBackgroundExecutor>
     (
         "Move",
         background_move_pool_size,
         background_move_pool_size,
-        CurrentMetrics::BackgroundMovePoolTask
+        CurrentMetrics::BackgroundMovePoolTask,
+        CurrentMetrics::BackgroundMovePoolSize
     );
     LOG_INFO(shared->log, "Initialized background executor for move operations with num_threads={}, num_tasks={}", background_move_pool_size, background_move_pool_size);
 
@@ -3845,7 +4128,8 @@ void Context::initializeBackgroundExecutorsIfNeeded()
         "Fetch",
         background_fetches_pool_size,
         background_fetches_pool_size,
-        CurrentMetrics::BackgroundFetchesPoolTask
+        CurrentMetrics::BackgroundFetchesPoolTask,
+        CurrentMetrics::BackgroundFetchesPoolSize
     );
     LOG_INFO(shared->log, "Initialized background executor for fetches with num_threads={}, num_tasks={}", background_fetches_pool_size, background_fetches_pool_size);
 
@@ -3854,7 +4138,8 @@ void Context::initializeBackgroundExecutorsIfNeeded()
         "Common",
         background_common_pool_size,
         background_common_pool_size,
-        CurrentMetrics::BackgroundCommonPoolTask
+        CurrentMetrics::BackgroundCommonPoolTask,
+        CurrentMetrics::BackgroundCommonPoolSize
     );
     LOG_INFO(shared->log, "Initialized background executor for common operations (e.g. clearing old parts) with num_threads={}, num_tasks={}", background_common_pool_size, background_common_pool_size);
 
@@ -3887,35 +4172,8 @@ OrdinaryBackgroundExecutorPtr Context::getCommonExecutor() const
     return shared->common_executor;
 }
 
-static size_t getThreadPoolReaderSizeFromConfig(Context::FilesystemReaderType type, const Poco::Util::AbstractConfiguration & config)
-{
-    switch (type)
-    {
-        case Context::FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER:
-        {
-            return config.getUInt(".threadpool_remote_fs_reader_pool_size", 250);
-        }
-        case Context::FilesystemReaderType::ASYNCHRONOUS_LOCAL_FS_READER:
-        {
-            return config.getUInt(".threadpool_local_fs_reader_pool_size", 100);
-        }
-        case Context::FilesystemReaderType::SYNCHRONOUS_LOCAL_FS_READER:
-        {
-            return std::numeric_limits<std::size_t>::max();
-        }
-    }
-}
-
-size_t Context::getThreadPoolReaderSize(FilesystemReaderType type) const
-{
-    const auto & config = getConfigRef();
-    return getThreadPoolReaderSizeFromConfig(type, config);
-}
-
 IAsynchronousReader & Context::getThreadPoolReader(FilesystemReaderType type) const
 {
-    const auto & config = getConfigRef();
-
     auto lock = getLock();
 
     switch (type)
@@ -3923,31 +4181,20 @@ IAsynchronousReader & Context::getThreadPoolReader(FilesystemReaderType type) co
         case FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER:
         {
             if (!shared->asynchronous_remote_fs_reader)
-            {
-                auto pool_size = getThreadPoolReaderSizeFromConfig(type, config);
-                auto queue_size = config.getUInt(".threadpool_remote_fs_reader_queue_size", 1000000);
-                shared->asynchronous_remote_fs_reader = std::make_unique<ThreadPoolRemoteFSReader>(pool_size, queue_size);
-            }
-
+                shared->asynchronous_remote_fs_reader = createThreadPoolReader(type, getConfigRef());
             return *shared->asynchronous_remote_fs_reader;
         }
         case FilesystemReaderType::ASYNCHRONOUS_LOCAL_FS_READER:
         {
             if (!shared->asynchronous_local_fs_reader)
-            {
-                auto pool_size = getThreadPoolReaderSizeFromConfig(type, config);
-                auto queue_size = config.getUInt(".threadpool_local_fs_reader_queue_size", 1000000);
-                shared->asynchronous_local_fs_reader = std::make_unique<ThreadPoolReader>(pool_size, queue_size);
-            }
+                shared->asynchronous_local_fs_reader = createThreadPoolReader(type, getConfigRef());
 
             return *shared->asynchronous_local_fs_reader;
         }
         case FilesystemReaderType::SYNCHRONOUS_LOCAL_FS_READER:
         {
             if (!shared->synchronous_local_fs_reader)
-            {
-                shared->synchronous_local_fs_reader = std::make_unique<SynchronousReader>();
-            }
+                shared->synchronous_local_fs_reader = createThreadPoolReader(type, getConfigRef());
 
             return *shared->synchronous_local_fs_reader;
         }
@@ -3965,7 +4212,8 @@ ThreadPool & Context::getThreadPoolWriter() const
         auto pool_size = config.getUInt(".threadpool_writer_pool_size", 100);
         auto queue_size = config.getUInt(".threadpool_writer_queue_size", 1000000);
 
-        shared->threadpool_writer = std::make_unique<ThreadPool>(pool_size, pool_size, queue_size);
+        shared->threadpool_writer = std::make_unique<ThreadPool>(
+            CurrentMetrics::IOWriterThreads, CurrentMetrics::IOWriterThreadsActive, pool_size, pool_size, queue_size);
     }
 
     return *shared->threadpool_writer;
@@ -4001,7 +4249,6 @@ ReadSettings Context::getReadSettings() const
     res.enable_filesystem_cache = settings.enable_filesystem_cache;
     res.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache;
     res.enable_filesystem_cache_log = settings.enable_filesystem_cache_log;
-    res.enable_filesystem_cache_on_lower_level = settings.enable_filesystem_cache_on_lower_level;
 
     res.filesystem_cache_max_download_size = settings.filesystem_cache_max_download_size;
     res.skip_download_if_exceeds_query_cache = settings.skip_download_if_exceeds_query_cache;
@@ -4015,13 +4262,17 @@ ReadSettings Context::getReadSettings() const
             "Invalid value '{}' for max_read_buffer_size", settings.max_read_buffer_size);
     }
 
-    res.local_fs_buffer_size = settings.max_read_buffer_size;
-    res.remote_fs_buffer_size = settings.max_read_buffer_size;
+    res.local_fs_buffer_size
+        = settings.max_read_buffer_size_local_fs ? settings.max_read_buffer_size_local_fs : settings.max_read_buffer_size;
+    res.remote_fs_buffer_size
+        = settings.max_read_buffer_size_remote_fs ? settings.max_read_buffer_size_remote_fs : settings.max_read_buffer_size;
+    res.prefetch_buffer_size = settings.prefetch_buffer_size;
     res.direct_io_threshold = settings.min_bytes_to_use_direct_io;
     res.mmap_threshold = settings.min_bytes_to_use_mmap_io;
-    res.priority = settings.read_priority;
+    res.priority = Priority{settings.read_priority};
 
     res.remote_throttler = getRemoteReadThrottler();
+    res.local_throttler = getLocalReadThrottler();
 
     res.http_max_tries = settings.http_max_tries;
     res.http_retry_initial_backoff_ms = settings.http_retry_initial_backoff_ms;
@@ -4033,6 +4284,14 @@ ReadSettings Context::getReadSettings() const
     return res;
 }
 
+ReadSettings Context::getBackupReadSettings() const
+{
+    ReadSettings settings_ = getReadSettings();
+    settings_.remote_throttler = getBackupsThrottler();
+    settings_.local_throttler = getBackupsThrottler();
+    return settings_;
+}
+
 WriteSettings Context::getWriteSettings() const
 {
     WriteSettings res;
@@ -4044,6 +4303,7 @@ WriteSettings Context::getWriteSettings() const
     res.s3_allow_parallel_part_upload = settings.s3_allow_parallel_part_upload;
 
     res.remote_throttler = getRemoteWriteThrottler();
+    res.local_throttler = getLocalWriteThrottler();
 
     return res;
 }
@@ -4056,24 +4316,47 @@ std::shared_ptr<AsyncReadCounters> Context::getAsyncReadCounters() const
     return async_read_counters;
 }
 
+Context::ParallelReplicasMode Context::getParallelReplicasMode() const
+{
+    const auto & settings_ = getSettingsRef();
+
+    using enum Context::ParallelReplicasMode;
+    if (!settings_.parallel_replicas_custom_key.value.empty())
+        return CUSTOM_KEY;
+
+    if (settings_.allow_experimental_parallel_reading_from_replicas > 0
+        && !settings_.use_hedged_requests)
+        return READ_TASKS;
+
+    return SAMPLE_KEY;
+}
+
 bool Context::canUseParallelReplicasOnInitiator() const
 {
-    const auto & settings = getSettingsRef();
-    return settings.allow_experimental_parallel_reading_from_replicas
-        && settings.max_parallel_replicas > 1
-        && !settings.use_hedged_requests
+    const auto & settings_ = getSettingsRef();
+    return getParallelReplicasMode() == ParallelReplicasMode::READ_TASKS
+        && settings_.max_parallel_replicas > 1
         && !getClientInfo().collaborate_with_initiator;
 }
 
 bool Context::canUseParallelReplicasOnFollower() const
 {
-    const auto & settings = getSettingsRef();
-    return settings.allow_experimental_parallel_reading_from_replicas
-        && settings.max_parallel_replicas > 1
-        && !settings.use_hedged_requests
+    const auto & settings_ = getSettingsRef();
+    return getParallelReplicasMode() == ParallelReplicasMode::READ_TASKS
+        && settings_.max_parallel_replicas > 1
         && getClientInfo().collaborate_with_initiator;
 }
 
+void Context::setPreparedSetsCache(const PreparedSetsCachePtr & cache)
+{
+    prepared_sets_cache = cache;
+}
+
+PreparedSetsCachePtr Context::getPreparedSetsCache() const
+{
+    return prepared_sets_cache;
+}
+
 UInt64 Context::getClientProtocolVersion() const
 {
     return client_protocol_version;
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 19bb6868331..194da016ee7 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -3,23 +3,20 @@
 #include <base/types.h>
 #include <Common/isLocalAddress.h>
 #include <Common/MultiVersion.h>
-#include <Common/OpenTelemetryTraceContext.h>
 #include <Common/RemoteHostFilter.h>
-#include <Common/ThreadPool.h>
-#include <Core/Block.h>
+#include <Common/ThreadPool_fwd.h>
+#include <Common/Throttler_fwd.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/Settings.h>
 #include <Core/UUID.h>
 #include <IO/AsyncReadCounters.h>
+#include <Disks/IO/getThreadPoolReader.h>
 #include <Interpreters/ClientInfo.h>
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/MergeTreeTransactionHolder.h>
 #include <IO/IResourceManager.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/IAST_fwd.h>
-#include <Processors/ResizeProcessor.h>
-#include <Processors/Transforms/ReadFromMergeTreeDependencyTransform.h>
 #include <Server/HTTP/HTTPContext.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/IStorage_fwd.h>
@@ -27,22 +24,26 @@
 #include "config.h"
 
 #include <boost/container/flat_set.hpp>
-#include <exception>
 #include <functional>
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <thread>
 
 
 namespace Poco::Net { class IPAddress; }
-namespace zkutil { class ZooKeeper; }
+namespace zkutil
+{
+    class ZooKeeper;
+    using ZooKeeperPtr = std::shared_ptr<ZooKeeper>;
+}
 
 struct OvercommitTracker;
 
 namespace DB
 {
 
+class ASTSelectQuery;
+
 struct ContextSharedPart;
 class ContextAccess;
 struct User;
@@ -107,6 +108,7 @@ class StorageS3Settings;
 class IDatabase;
 class DDLWorker;
 class ITableFunction;
+using TableFunctionPtr = std::shared_ptr<ITableFunction>;
 class Block;
 class ActionLocksManager;
 using ActionLocksManagerPtr = std::shared_ptr<ActionLocksManager>;
@@ -163,9 +165,6 @@ struct BackgroundTaskSchedulingSettings;
     class Lemmatizers;
 #endif
 
-class Throttler;
-using ThrottlerPtr = std::shared_ptr<Throttler>;
-
 class ZooKeeperMetadataTransaction;
 using ZooKeeperMetadataTransactionPtr = std::shared_ptr<ZooKeeperMetadataTransaction>;
 
@@ -196,6 +195,9 @@ class MergeTreeMetadataCache;
 using MergeTreeMetadataCachePtr = std::shared_ptr<MergeTreeMetadataCache>;
 #endif
 
+class PreparedSetsCache;
+using PreparedSetsCachePtr = std::shared_ptr<PreparedSetsCache>;
+
 /// An empty interface for an arbitrary object that may be attached by a shared pointer
 /// to query context, when using ClickHouse as a library.
 struct IHostContext
@@ -293,6 +295,7 @@ private:
             databases = rhs.databases;
             tables = rhs.tables;
             columns = rhs.columns;
+            partitions = rhs.partitions;
             projections = rhs.projections;
             views = rhs.views;
         }
@@ -310,6 +313,7 @@ private:
             std::swap(databases, rhs.databases);
             std::swap(tables, rhs.tables);
             std::swap(columns, rhs.columns);
+            std::swap(partitions, rhs.partitions);
             std::swap(projections, rhs.projections);
             std::swap(views, rhs.views);
         }
@@ -319,6 +323,7 @@ private:
         std::set<std::string> databases{};
         std::set<std::string> tables{};
         std::set<std::string> columns{};
+        std::set<std::string> partitions{};
         std::set<std::string> projections{};
         std::set<std::string> views{};
     };
@@ -402,6 +407,10 @@ private:
     /// Temporary data for query execution accounting.
     TemporaryDataOnDiskScopePtr temp_data_on_disk;
 
+    /// Prepared sets that can be shared between different queries. One use case is when is to share prepared sets between
+    /// mutation tasks of one mutation executed against different parts of the same table.
+    PreparedSetsCachePtr prepared_sets_cache;
+
 public:
     /// Some counters for current query execution.
     /// Most of them are workarounds and should be removed in the future.
@@ -476,9 +485,10 @@ public:
     /// A list of warnings about server configuration to place in `system.warnings` table.
     Strings getWarnings() const;
 
-    VolumePtr getTemporaryVolume() const; /// TODO: remove, use `getTempDataOnDisk`
+    VolumePtr getGlobalTemporaryVolume() const; /// TODO: remove, use `getTempDataOnDisk`
 
     TemporaryDataOnDiskScopePtr getTempDataOnDisk() const;
+    TemporaryDataOnDiskScopePtr getSharedTempDataOnDisk() const;
     void setTempDataOnDisk(TemporaryDataOnDiskScopePtr temp_data_on_disk_);
 
     void setPath(const String & path);
@@ -622,6 +632,7 @@ public:
         const Names & column_names,
         const String & projection_name = {},
         const String & view_name = {});
+    void addQueryAccessInfo(const Names & partition_names);
 
 
     /// Supported factories for records in query_log
@@ -644,6 +655,8 @@ public:
     /// For table functions s3/file/url/hdfs/input we can use structure from
     /// insertion table depending on select expression.
     StoragePtr executeTableFunction(const ASTPtr & table_expression, const ASTSelectQuery * select_query_hint = nullptr);
+    /// Overload for the new analyzer. Structure inference is performed in QueryAnalysisPass.
+    StoragePtr executeTableFunction(const ASTPtr & table_expression, const TableFunctionPtr & table_function_ptr);
 
     void addViewSource(const StoragePtr & storage);
     StoragePtr getViewSource() const;
@@ -678,6 +691,7 @@ public:
     MultiVersion<Macros>::Version getMacros() const;
     void setMacros(std::unique_ptr<Macros> && macros);
 
+    bool displaySecretsInShowAndSelect() const;
     Settings getSettings() const;
     void setSettings(const Settings & settings_);
 
@@ -724,7 +738,8 @@ public:
     BackupsWorker & getBackupsWorker() const;
 
     /// I/O formats.
-    InputFormatPtr getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size, const std::optional<FormatSettings> & format_settings = std::nullopt) const;
+    InputFormatPtr getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size,
+                                  const std::optional<FormatSettings> & format_settings = std::nullopt, const std::optional<size_t> max_parsing_threads = std::nullopt) const;
 
     OutputFormatPtr getOutputFormat(const String & name, WriteBuffer & buf, const Block & sample) const;
     OutputFormatPtr getOutputFormatParallelIfPossible(const String & name, WriteBuffer & buf, const Block & sample) const;
@@ -783,9 +798,9 @@ public:
     void setQueryContext(ContextMutablePtr context_) { query_context = context_; }
     void setSessionContext(ContextMutablePtr context_) { session_context = context_; }
 
-    void makeQueryContext() { query_context = shared_from_this(); }
-    void makeSessionContext() { session_context = shared_from_this(); }
-    void makeGlobalContext() { initGlobal(); global_context = shared_from_this(); }
+    void makeQueryContext();
+    void makeSessionContext();
+    void makeGlobalContext();
 
     const Settings & getSettingsRef() const { return settings; }
 
@@ -823,6 +838,8 @@ public:
     std::shared_ptr<zkutil::ZooKeeper> getZooKeeper() const;
     /// Same as above but return a zookeeper connection from auxiliary_zookeepers configuration entry.
     std::shared_ptr<zkutil::ZooKeeper> getAuxiliaryZooKeeper(const String & name) const;
+    /// return Auxiliary Zookeeper map
+    std::map<String, zkutil::ZooKeeperPtr> getAuxiliaryZooKeepers() const;
 
     /// Try to connect to Keeper using get(Auxiliary)ZooKeeper. Useful for
     /// internal Keeper start (check connection to some other node). Return true
@@ -861,12 +878,12 @@ public:
     void setSystemZooKeeperLogAfterInitializationIfNeeded();
 
     /// Create a cache of uncompressed blocks of specified size. This can be done only once.
-    void setUncompressedCache(size_t max_size_in_bytes, const String & uncompressed_cache_policy);
+    void setUncompressedCache(const String & uncompressed_cache_policy, size_t max_size_in_bytes);
     std::shared_ptr<UncompressedCache> getUncompressedCache() const;
     void dropUncompressedCache() const;
 
     /// Create a cache of marks of specified size. This can be done only once.
-    void setMarkCache(size_t cache_size_in_bytes, const String & mark_cache_policy);
+    void setMarkCache(const String & mark_cache_policy, size_t cache_size_in_bytes);
     std::shared_ptr<MarkCache> getMarkCache() const;
     void dropMarkCache() const;
     ThreadPool & getLoadMarksThreadpool() const;
@@ -916,17 +933,12 @@ public:
     BackgroundSchedulePool & getMessageBrokerSchedulePool() const;
     BackgroundSchedulePool & getDistributedSchedulePool() const;
 
-    ThrottlerPtr getReplicatedFetchesThrottler() const;
-    ThrottlerPtr getReplicatedSendsThrottler() const;
-    ThrottlerPtr getRemoteReadThrottler() const;
-    ThrottlerPtr getRemoteWriteThrottler() const;
-
     /// Has distributed_ddl configuration or not.
     bool hasDistributedDDL() const;
     void setDDLWorker(std::unique_ptr<DDLWorker> ddl_worker);
     DDLWorker & getDDLWorker() const;
 
-    std::shared_ptr<Clusters> getClusters() const;
+    std::map<String, std::shared_ptr<Cluster>> getClusters() const;
     std::shared_ptr<Cluster> getCluster(const std::string & cluster_name) const;
     std::shared_ptr<Cluster> tryGetCluster(const std::string & cluster_name) const;
     void setClustersConfig(const ConfigurationPtr & config, bool enable_discovery = false, const String & config_name = "remote_servers");
@@ -1098,17 +1110,8 @@ public:
     OrdinaryBackgroundExecutorPtr getFetchesExecutor() const;
     OrdinaryBackgroundExecutorPtr getCommonExecutor() const;
 
-    enum class FilesystemReaderType
-    {
-        SYNCHRONOUS_LOCAL_FS_READER,
-        ASYNCHRONOUS_LOCAL_FS_READER,
-        ASYNCHRONOUS_REMOTE_FS_READER,
-    };
-
     IAsynchronousReader & getThreadPoolReader(FilesystemReaderType type) const;
 
-    size_t getThreadPoolReaderSize(FilesystemReaderType type) const;
-
     std::shared_ptr<AsyncReadCounters> getAsyncReadCounters() const;
 
     ThreadPool & getThreadPoolWriter() const;
@@ -1116,6 +1119,9 @@ public:
     /** Get settings for reading from filesystem. */
     ReadSettings getReadSettings() const;
 
+    /** Get settings for reading from filesystem for BACKUPs. */
+    ReadSettings getBackupReadSettings() const;
+
     /** Get settings for writing to filesystem. */
     WriteSettings getWriteSettings() const;
 
@@ -1123,6 +1129,18 @@ public:
     bool canUseParallelReplicasOnInitiator() const;
     bool canUseParallelReplicasOnFollower() const;
 
+    enum class ParallelReplicasMode : uint8_t
+    {
+        SAMPLE_KEY,
+        CUSTOM_KEY,
+        READ_TASKS,
+    };
+
+    ParallelReplicasMode getParallelReplicasMode() const;
+
+    void setPreparedSetsCache(const PreparedSetsCachePtr & cache);
+    PreparedSetsCachePtr getPreparedSetsCache() const;
+
 private:
     std::unique_lock<std::recursive_mutex> getLock() const;
 
@@ -1130,6 +1148,7 @@ private:
 
     /// Compute and set actual user settings, client_info.current_user should be set
     void calculateAccessRights();
+    void recalculateAccessRightsIfNeeded(std::string_view setting_name);
 
     template <typename... Args>
     void checkAccessImpl(const Args &... args) const;
@@ -1143,6 +1162,31 @@ private:
     DiskSelectorPtr getDiskSelector(std::lock_guard<std::mutex> & lock) const;
 
     DisksMap getDisksMap(std::lock_guard<std::mutex> & lock) const;
+
+    /// Expect lock for shared->clusters_mutex
+    std::shared_ptr<Clusters> getClustersImpl(std::lock_guard<std::mutex> & lock) const;
+
+    /// Throttling
+public:
+    ThrottlerPtr getReplicatedFetchesThrottler() const;
+    ThrottlerPtr getReplicatedSendsThrottler() const;
+
+    ThrottlerPtr getRemoteReadThrottler() const;
+    ThrottlerPtr getRemoteWriteThrottler() const;
+
+    ThrottlerPtr getLocalReadThrottler() const;
+    ThrottlerPtr getLocalWriteThrottler() const;
+
+    ThrottlerPtr getBackupsThrottler() const;
+
+private:
+    mutable ThrottlerPtr remote_read_query_throttler;       /// A query-wide throttler for remote IO reads
+    mutable ThrottlerPtr remote_write_query_throttler;      /// A query-wide throttler for remote IO writes
+
+    mutable ThrottlerPtr local_read_query_throttler;        /// A query-wide throttler for local IO reads
+    mutable ThrottlerPtr local_write_query_throttler;       /// A query-wide throttler for local IO writes
+
+    mutable ThrottlerPtr backups_query_throttler;           /// A query-wide throttler for BACKUPs
 };
 
 struct HTTPContext : public IHTTPContext
diff --git a/src/Interpreters/CrashLog.cpp b/src/Interpreters/CrashLog.cpp
index 47a9d62fba6..f1f0ffb6f60 100644
--- a/src/Interpreters/CrashLog.cpp
+++ b/src/Interpreters/CrashLog.cpp
@@ -80,7 +80,7 @@ void collectCrashLog(Int32 signal, UInt64 thread_id, const String & query_id, co
         for (size_t i = stack_trace_offset; i < stack_trace_size; ++i)
             trace.push_back(reinterpret_cast<uintptr_t>(stack_trace.getFramePointers()[i]));
 
-        stack_trace.toStringEveryLine([&trace_full](const std::string & line) { trace_full.push_back(line); });
+        stack_trace.toStringEveryLine([&trace_full](std::string_view line) { trace_full.push_back(line); });
 
         CrashLogElement element{static_cast<time_t>(time / 1000000000), time, signal, thread_id, query_id, trace, trace_full};
         crash_log_owned->add(element);
diff --git a/src/Interpreters/CrashLog.h b/src/Interpreters/CrashLog.h
index f6061355562..78794574c82 100644
--- a/src/Interpreters/CrashLog.h
+++ b/src/Interpreters/CrashLog.h
@@ -3,6 +3,7 @@
 #include <Interpreters/SystemLog.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/NamesAndAliases.h>
+#include <Core/Field.h>
 
 
 /// Call this function on crash.
diff --git a/src/Interpreters/CrossToInnerJoinVisitor.cpp b/src/Interpreters/CrossToInnerJoinVisitor.cpp
index 0675f2bb19c..8755daa1dc8 100644
--- a/src/Interpreters/CrossToInnerJoinVisitor.cpp
+++ b/src/Interpreters/CrossToInnerJoinVisitor.cpp
@@ -189,7 +189,7 @@ std::vector<JoinedElement> getTables(const ASTSelectQuery & select)
         if (t.hasUsing())
         {
             if (has_using)
-                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Multuple USING statements are not supported");
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Multiple USING statements are not supported");
             has_using = true;
         }
 
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index 799f1b0b4f4..b24856a6146 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -104,6 +104,14 @@ String DDLLogEntry::toString() const
 
     if (version >= OPENTELEMETRY_ENABLED_VERSION)
         wb << "tracing: " << this->tracing_context;
+    /// NOTE: OPENTELEMETRY_ENABLED_VERSION has new line in TracingContext::serialize(), so no need to add one more
+
+    if (version >= PRESERVE_INITIAL_QUERY_ID_VERSION)
+    {
+        writeString("initial_query_id: ", wb);
+        writeEscapedString(initial_query_id, wb);
+        writeChar('\n', wb);
+    }
 
     return wb.str();
 }
@@ -150,6 +158,14 @@ void DDLLogEntry::parse(const String & data)
             rb >> "tracing: " >> this->tracing_context;
     }
 
+    if (version >= PRESERVE_INITIAL_QUERY_ID_VERSION)
+    {
+        checkString("initial_query_id: ", rb);
+        readEscapedString(initial_query_id, rb);
+        checkChar('\n', rb);
+    }
+
+
     assertEOF(rb);
 
     if (!host_id_strings.empty())
diff --git a/src/Interpreters/DDLTask.h b/src/Interpreters/DDLTask.h
index 2043de6701e..e92b1f9a885 100644
--- a/src/Interpreters/DDLTask.h
+++ b/src/Interpreters/DDLTask.h
@@ -71,10 +71,11 @@ struct DDLLogEntry
     static constexpr const UInt64 SETTINGS_IN_ZK_VERSION = 2;
     static constexpr const UInt64 NORMALIZE_CREATE_ON_INITIATOR_VERSION = 3;
     static constexpr const UInt64 OPENTELEMETRY_ENABLED_VERSION = 4;
+    static constexpr const UInt64 PRESERVE_INITIAL_QUERY_ID_VERSION = 5;
     /// Add new version here
 
     /// Remember to update the value below once new version is added
-    static constexpr const UInt64 DDL_ENTRY_FORMAT_MAX_VERSION = 4;
+    static constexpr const UInt64 DDL_ENTRY_FORMAT_MAX_VERSION = 5;
 
     UInt64 version = 1;
     String query;
@@ -82,6 +83,7 @@ struct DDLLogEntry
     String initiator; // optional
     std::optional<SettingsChanges> settings;
     OpenTelemetry::TracingContext tracing_context;
+    String initial_query_id;
 
     void setSettingsIfRequired(ContextPtr context);
     String toString() const;
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 7179ce94e0b..81c78000ac3 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -31,15 +31,23 @@
 #include <base/getFQDNOrHostName.h>
 #include <Common/logger_useful.h>
 #include <base/sort.h>
+#include <memory>
 #include <random>
 #include <pcg_random.hpp>
 #include <Common/scope_guard_safe.h>
+#include <Common/ThreadPool.h>
 
 #include <Interpreters/ZooKeeperLog.h>
 
 namespace fs = std::filesystem;
 
 
+namespace CurrentMetrics
+{
+    extern const Metric DDLWorkerThreads;
+    extern const Metric DDLWorkerThreadsActive;
+}
+
 namespace DB
 {
 
@@ -85,7 +93,7 @@ DDLWorker::DDLWorker(
     {
         LOG_WARNING(log, "DDLWorker is configured to use multiple threads. "
                          "It's not recommended because queries can be reordered. Also it may cause some unknown issues to appear.");
-        worker_pool = std::make_unique<ThreadPool>(pool_size);
+        worker_pool = std::make_unique<ThreadPool>(CurrentMetrics::DDLWorkerThreads, CurrentMetrics::DDLWorkerThreadsActive, pool_size);
     }
 
     queue_dir = zk_root_dir;
@@ -115,8 +123,8 @@ void DDLWorker::startup()
 {
     [[maybe_unused]] bool prev_stop_flag = stop_flag.exchange(false);
     chassert(prev_stop_flag);
-    main_thread = ThreadFromGlobalPool(&DDLWorker::runMainThread, this);
-    cleanup_thread = ThreadFromGlobalPool(&DDLWorker::runCleanupThread, this);
+    main_thread = std::make_unique<ThreadFromGlobalPool>(&DDLWorker::runMainThread, this);
+    cleanup_thread = std::make_unique<ThreadFromGlobalPool>(&DDLWorker::runCleanupThread, this);
 }
 
 void DDLWorker::shutdown()
@@ -126,8 +134,10 @@ void DDLWorker::shutdown()
     {
         queue_updated_event->set();
         cleanup_event->set();
-        main_thread.join();
-        cleanup_thread.join();
+        if (main_thread)
+            main_thread->join();
+        if (cleanup_thread)
+            cleanup_thread->join();
         worker_pool.reset();
     }
 }
@@ -169,11 +179,11 @@ DDLTaskPtr DDLWorker::initAndCheckTask(const String & entry_name, String & out_r
         return {};
     }
 
-    auto write_error_status = [&](const String & host_id, const String & error_message, const String & reason)
+    auto write_error_status = [&](const String & host_id, const ExecutionStatus & status, const String & reason)
     {
-        LOG_ERROR(log, "Cannot parse DDL task {}: {}. Will try to send error status: {}", entry_name, reason, error_message);
+        LOG_ERROR(log, "Cannot parse DDL task {}: {}. Will try to send error status: {}", entry_name, reason, status.message);
         createStatusDirs(entry_path, zookeeper);
-        zookeeper->tryCreate(fs::path(entry_path) / "finished" / host_id, error_message, zkutil::CreateMode::Persistent);
+        zookeeper->tryCreate(fs::path(entry_path) / "finished" / host_id, status.serializeText(), zkutil::CreateMode::Persistent);
     };
 
     try
@@ -187,7 +197,7 @@ DDLTaskPtr DDLWorker::initAndCheckTask(const String & entry_name, String & out_r
         /// We can try to create fail node using FQDN if it equal to host name in cluster config attempt will be successful.
         /// Otherwise, that node will be ignored by DDLQueryStatusSource.
         out_reason = "Incorrect task format";
-        write_error_status(host_fqdn_id, ExecutionStatus::fromCurrentException().serializeText(), out_reason);
+        write_error_status(host_fqdn_id, ExecutionStatus::fromCurrentException(), out_reason);
         return {};
     }
 
@@ -212,7 +222,7 @@ DDLTaskPtr DDLWorker::initAndCheckTask(const String & entry_name, String & out_r
     catch (...)
     {
         out_reason = "Cannot parse query or obtain cluster info";
-        write_error_status(task->host_id_str, ExecutionStatus::fromCurrentException().serializeText(), out_reason);
+        write_error_status(task->host_id_str, ExecutionStatus::fromCurrentException(), out_reason);
         return {};
     }
 
@@ -466,6 +476,8 @@ bool DDLWorker::tryExecuteQuery(DDLTaskBase & task, const ZooKeeperPtr & zookeep
             query_context->setSetting("implicit_transaction", Field{0});
         }
 
+        query_context->getClientInfo().initial_query_id = task.entry.initial_query_id;
+
         if (!task.is_initial_query)
             query_scope.emplace(query_context);
         executeQuery(istr, ostr, !task.is_initial_query, query_context, {});
@@ -542,6 +554,7 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
     OpenTelemetry::TracingContextHolder tracing_ctx_holder(__PRETTY_FUNCTION__ ,
         task.entry.tracing_context,
         this->context->getOpenTelemetrySpanLog());
+    tracing_ctx_holder.root_span.kind = OpenTelemetry::CONSUMER;
 
     String active_node_path = task.getActiveNodePath();
     String finished_node_path = task.getFinishedNodePath();
@@ -650,7 +663,7 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
             bool status_written_by_table_or_db = task.ops.empty();
             if (status_written_by_table_or_db)
             {
-                throw Exception(ErrorCodes::UNFINISHED, "Unexpected error: {}", task.execution_status.serializeText());
+                throw Exception(ErrorCodes::UNFINISHED, "Unexpected error: {}", task.execution_status.message);
             }
             else
             {
@@ -1015,10 +1028,10 @@ String DDLWorker::enqueueQuery(DDLLogEntry & entry)
     {
         String str_buf = node_path.substr(query_path_prefix.length());
         DB::ReadBufferFromString in(str_buf);
-        CurrentMetrics::Metric id;
-        readText(id, in);
-        id = std::max(*max_pushed_entry_metric, id);
-        CurrentMetrics::set(*max_pushed_entry_metric, id);
+        CurrentMetrics::Value pushed_entry;
+        readText(pushed_entry, in);
+        pushed_entry = std::max(CurrentMetrics::get(*max_pushed_entry_metric), pushed_entry);
+        CurrentMetrics::set(*max_pushed_entry_metric, pushed_entry);
     }
 
     /// We cannot create status dirs in a single transaction with previous request,
@@ -1083,7 +1096,7 @@ void DDLWorker::runMainThread()
         /// It will wait for all threads in pool to finish and will not rethrow exceptions (if any).
         /// We create new thread pool to forget previous exceptions.
         if (1 < pool_size)
-            worker_pool = std::make_unique<ThreadPool>(pool_size);
+            worker_pool = std::make_unique<ThreadPool>(CurrentMetrics::DDLWorkerThreads, CurrentMetrics::DDLWorkerThreadsActive, pool_size);
         /// Clear other in-memory state, like server just started.
         current_tasks.clear();
         last_skipped_entry_name.reset();
@@ -1122,7 +1135,7 @@ void DDLWorker::runMainThread()
                 initialized = false;
                 /// Wait for pending async tasks
                 if (1 < pool_size)
-                    worker_pool = std::make_unique<ThreadPool>(pool_size);
+                    worker_pool = std::make_unique<ThreadPool>(CurrentMetrics::DDLWorkerThreads, CurrentMetrics::DDLWorkerThreadsActive, pool_size);
                 LOG_INFO(log, "Lost ZooKeeper connection, will try to connect again: {}", getCurrentExceptionMessage(true));
             }
             else
diff --git a/src/Interpreters/DDLWorker.h b/src/Interpreters/DDLWorker.h
index 65ef4b440a1..01ed89907a1 100644
--- a/src/Interpreters/DDLWorker.h
+++ b/src/Interpreters/DDLWorker.h
@@ -1,8 +1,9 @@
 #pragma once
 
 #include <Common/CurrentThread.h>
+#include <Common/CurrentMetrics.h>
 #include <Common/DNSResolver.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <Common/ZooKeeper/IKeeper.h>
 #include <Storages/IStorage_fwd.h>
 #include <Parsers/IAST_fwd.h>
@@ -144,8 +145,8 @@ protected:
     std::atomic<bool> initialized = false;
     std::atomic<bool> stop_flag = true;
 
-    ThreadFromGlobalPool main_thread;
-    ThreadFromGlobalPool cleanup_thread;
+    std::unique_ptr<ThreadFromGlobalPool> main_thread;
+    std::unique_ptr<ThreadFromGlobalPool> cleanup_thread;
 
     /// Size of the pool for query execution.
     size_t pool_size = 1;
diff --git a/src/Interpreters/DNSCacheUpdater.cpp b/src/Interpreters/DNSCacheUpdater.cpp
index bf88d19b7ef..c6a38d85acb 100644
--- a/src/Interpreters/DNSCacheUpdater.cpp
+++ b/src/Interpreters/DNSCacheUpdater.cpp
@@ -2,6 +2,7 @@
 
 #include <Interpreters/Context.h>
 #include <Common/DNSResolver.h>
+#include <Common/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 975e0da66ce..8d3fa91a7fe 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -1,21 +1,24 @@
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/loadMetadata.h>
+#include <Interpreters/executeQuery.h>
+#include <Interpreters/InterpreterCreateQuery.h>
 #include <Storages/IStorage.h>
 #include <Databases/IDatabase.h>
 #include <Databases/DatabaseMemory.h>
 #include <Databases/DatabaseOnDisk.h>
 #include <Disks/IDisk.h>
-#include <Common/quoteString.h>
 #include <Storages/StorageMemory.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Parsers/formatAST.h>
 #include <IO/ReadHelpers.h>
 #include <Poco/DirectoryIterator.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/quoteString.h>
 #include <Common/atomicRename.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/logger_useful.h>
-#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/ThreadPool.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/noexcept_scope.h>
 #include <Common/checkStackSize.h>
@@ -36,6 +39,8 @@
 namespace CurrentMetrics
 {
     extern const Metric TablesToDropQueueSize;
+    extern const Metric DatabaseCatalogThreads;
+    extern const Metric DatabaseCatalogThreadsActive;
 }
 
 namespace DB
@@ -121,9 +126,16 @@ TemporaryTableHolder::~TemporaryTableHolder()
 {
     if (id != UUIDHelpers::Nil)
     {
-        auto table = getTable();
-        table->flushAndShutdown();
-        temporary_tables->dropTable(getContext(), "_tmp_" + toString(id));
+        try
+        {
+            auto table = getTable();
+            table->flushAndShutdown();
+            temporary_tables->dropTable(getContext(), "_tmp_" + toString(id));
+        }
+        catch (...)
+        {
+            tryLogCurrentException("TemporaryTableHolder");
+        }
     }
 }
 
@@ -140,7 +152,6 @@ StoragePtr TemporaryTableHolder::getTable() const
     return table;
 }
 
-
 void DatabaseCatalog::initializeAndLoadTemporaryDatabase()
 {
     drop_delay_sec = getContext()->getConfigRef().getInt("database_atomic_delay_before_drop_table_sec", default_drop_delay_sec);
@@ -844,7 +855,7 @@ void DatabaseCatalog::loadMarkedAsDroppedTables()
 
     LOG_INFO(log, "Found {} partially dropped tables. Will load them and retry removal.", dropped_metadata.size());
 
-    ThreadPool pool;
+    ThreadPool pool(CurrentMetrics::DatabaseCatalogThreads, CurrentMetrics::DatabaseCatalogThreadsActive);
     for (const auto & elem : dropped_metadata)
     {
         pool.scheduleOrThrowOnError([&]()
@@ -863,6 +874,13 @@ String DatabaseCatalog::getPathForDroppedMetadata(const StorageID & table_id) co
            toString(table_id.uuid) + ".sql";
 }
 
+String DatabaseCatalog::getPathForMetadata(const StorageID & table_id) const
+{
+    return getContext()->getPath() + "metadata/" +
+           escapeForFileName(table_id.getDatabaseName()) + "/" +
+           escapeForFileName(table_id.getTableName()) + ".sql";
+}
+
 void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr table, String dropped_metadata_path, bool ignore_delay)
 {
     assert(table_id.hasUUID());
@@ -930,6 +948,79 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
         (*drop_task)->schedule();
 }
 
+void DatabaseCatalog::dequeueDroppedTableCleanup(StorageID table_id)
+{
+    String latest_metadata_dropped_path;
+    TableMarkedAsDropped dropped_table;
+    {
+        std::lock_guard lock(tables_marked_dropped_mutex);
+        time_t latest_drop_time = std::numeric_limits<time_t>::min();
+        auto it_dropped_table = tables_marked_dropped.end();
+        for (auto it = tables_marked_dropped.begin(); it != tables_marked_dropped.end(); ++it)
+        {
+            auto storage_ptr = it->table;
+            if (it->table_id.uuid == table_id.uuid)
+            {
+                it_dropped_table = it;
+                dropped_table = *it;
+                break;
+            }
+            /// If table uuid exists, only find tables with equal uuid.
+            if (table_id.uuid != UUIDHelpers::Nil)
+                continue;
+            if (it->table_id.database_name == table_id.database_name &&
+                it->table_id.table_name == table_id.table_name &&
+                it->drop_time >= latest_drop_time)
+            {
+                latest_drop_time = it->drop_time;
+                it_dropped_table = it;
+                dropped_table = *it;
+            }
+        }
+        if (it_dropped_table == tables_marked_dropped.end())
+            throw Exception(ErrorCodes::UNKNOWN_TABLE,
+                "The drop task of table {} is in progress, has been dropped or the database engine doesn't support it",
+                table_id.getNameForLogs());
+        latest_metadata_dropped_path = it_dropped_table->metadata_path;
+        String table_metadata_path = getPathForMetadata(it_dropped_table->table_id);
+
+        /// a table is successfully marked undropped,
+        /// if and only if its metadata file was moved to a database.
+        /// This maybe throw exception.
+        renameNoReplace(latest_metadata_dropped_path, table_metadata_path);
+
+        tables_marked_dropped.erase(it_dropped_table);
+        [[maybe_unused]] auto removed = tables_marked_dropped_ids.erase(dropped_table.table_id.uuid);
+        assert(removed);
+        CurrentMetrics::sub(CurrentMetrics::TablesToDropQueueSize, 1);
+    }
+
+    LOG_INFO(log, "Attaching undropped table {} (metadata moved from {})",
+             dropped_table.table_id.getNameForLogs(), latest_metadata_dropped_path);
+
+    /// It's unsafe to create another instance while the old one exists
+    /// We cannot wait on shared_ptr's refcount, so it's busy wait
+    while (!dropped_table.table.unique())
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    dropped_table.table.reset();
+
+    auto ast_attach = std::make_shared<ASTCreateQuery>();
+    ast_attach->attach = true;
+    ast_attach->setDatabase(dropped_table.table_id.database_name);
+    ast_attach->setTable(dropped_table.table_id.table_name);
+
+    auto query_context = Context::createCopy(getContext());
+    /// Attach table needs to acquire ddl guard, that has already been acquired in undrop table,
+    /// and cannot be acquired in the attach table again.
+    InterpreterCreateQuery interpreter(ast_attach, query_context);
+    interpreter.setForceAttach(true);
+    interpreter.setForceRestoreData(true);
+    interpreter.setDontNeedDDLGuard();  /// It's already locked by caller
+    interpreter.execute();
+
+    LOG_INFO(log, "Table {} was successfully undropped.", dropped_table.table_id.getNameForLogs());
+}
+
 void DatabaseCatalog::dropTableDataTask()
 {
     /// Background task that removes data of tables which were marked as dropped by Atomic databases.
@@ -942,7 +1033,8 @@ void DatabaseCatalog::dropTableDataTask()
     try
     {
         std::lock_guard lock(tables_marked_dropped_mutex);
-        assert(!tables_marked_dropped.empty());
+        if (tables_marked_dropped.empty())
+            return;
         time_t current_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
         time_t min_drop_time = std::numeric_limits<time_t>::max();
         size_t tables_in_use_count = 0;
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index 4200373018d..51e9fbdb936 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -215,7 +215,9 @@ public:
     DatabaseAndTable tryGetByUUID(const UUID & uuid) const;
 
     String getPathForDroppedMetadata(const StorageID & table_id) const;
+    String getPathForMetadata(const StorageID & table_id) const;
     void enqueueDroppedTableCleanup(StorageID table_id, StoragePtr table, String dropped_metadata_path, bool ignore_delay = false);
+    void dequeueDroppedTableCleanup(StorageID table_id);
 
     void waitTableFinallyDropped(const UUID & uuid);
 
@@ -235,6 +237,21 @@ public:
 
     void checkTableCanBeRemovedOrRenamed(const StorageID & table_id, bool check_referential_dependencies, bool check_loading_dependencies, bool is_drop_database = false) const;
 
+
+    struct TableMarkedAsDropped
+    {
+        StorageID table_id = StorageID::createEmpty();
+        StoragePtr table;
+        String metadata_path;
+        time_t drop_time{};
+    };
+    using TablesMarkedAsDropped = std::list<TableMarkedAsDropped>;
+
+    TablesMarkedAsDropped getTablesMarkedDropped()
+    {
+        std::lock_guard lock(tables_marked_dropped_mutex);
+        return tables_marked_dropped;
+    }
 private:
     // The global instance of database catalog. unique_ptr is to allow
     // deferred initialization. Thought I'd use std::optional, but I can't
@@ -263,15 +280,6 @@ private:
         return uuid.toUnderType().items[0] >> (64 - bits_for_first_level);
     }
 
-    struct TableMarkedAsDropped
-    {
-        StorageID table_id = StorageID::createEmpty();
-        StoragePtr table;
-        String metadata_path;
-        time_t drop_time{};
-    };
-    using TablesMarkedAsDropped = std::list<TableMarkedAsDropped>;
-
     void dropTableDataTask();
     void dropTableFinally(const TableMarkedAsDropped & table);
 
diff --git a/src/Interpreters/DirectJoin.cpp b/src/Interpreters/DirectJoin.cpp
index e148db1d8e6..cfefd7c5a91 100644
--- a/src/Interpreters/DirectJoin.cpp
+++ b/src/Interpreters/DirectJoin.cpp
@@ -1,7 +1,7 @@
 #include <Interpreters/DirectJoin.h>
-
-#include <Columns/ColumnNullable.h>
 #include <Interpreters/castColumn.h>
+#include <Columns/ColumnNullable.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/DirectJoin.h b/src/Interpreters/DirectJoin.h
index bdbd155dc36..644b66a9d99 100644
--- a/src/Interpreters/DirectJoin.h
+++ b/src/Interpreters/DirectJoin.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 
 #include <Core/Block.h>
 
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
index 7a5fc67596f..3d821b60e81 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
@@ -19,6 +19,8 @@
 #include <Parsers/queryToString.h>
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
 #include <Common/ProfileEvents.h>
+#include <Common/FieldVisitorToString.h>
+#include <IO/WriteBufferFromString.h>
 
 namespace ProfileEvents
 {
@@ -68,17 +70,6 @@ void ExecuteScalarSubqueriesMatcher::visit(ASTPtr & ast, Data & data)
         visit(*t, ast, data);
 }
 
-/// Converting to literal values might take a fair amount of overhead when the value is large, (e.g.
-///  Array, BitMap, etc.), This conversion is required for constant folding, index lookup, branch
-///  elimination. However, these optimizations should never be related to large values, thus we
-///  blacklist them here.
-static bool worthConvertingToLiteral(const Block & scalar)
-{
-    const auto * scalar_type_name = scalar.safeGetByPosition(0).type->getFamilyName();
-    static const std::set<std::string_view> useless_literal_types = {"Array", "Tuple", "AggregateFunction", "Function", "Set", "LowCardinality"};
-    return !useless_literal_types.contains(scalar_type_name);
-}
-
 static auto getQueryInterpreter(const ASTSubquery & subquery, ExecuteScalarSubqueriesMatcher::Data & data)
 {
     auto subquery_context = Context::createCopy(data.getContext());
@@ -98,6 +89,7 @@ static auto getQueryInterpreter(const ASTSubquery & subquery, ExecuteScalarSubqu
     ASTPtr subquery_select = subquery.children.at(0);
 
     auto options = SelectQueryOptions(QueryProcessingStage::Complete, data.subquery_depth + 1, true);
+    options.is_create_parameterized_view = data.is_create_parameterized_view;
     options.analyze(data.only_analyze);
 
     return std::make_unique<InterpreterSelectWithUnionQuery>(subquery_select, subquery_context, options);
@@ -254,7 +246,9 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
     const Settings & settings = data.getContext()->getSettingsRef();
 
     // Always convert to literals when there is no query context.
-    if (data.only_analyze || !settings.enable_scalar_subquery_optimization || worthConvertingToLiteral(scalar)
+    if (data.only_analyze
+        || !settings.enable_scalar_subquery_optimization
+        || worthConvertingScalarToLiteral(scalar, data.max_literal_size)
         || !data.getContext()->hasQueryContext())
     {
         /// subquery and ast can be the same object and ast will be moved.
@@ -277,7 +271,7 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
             ast = std::move(func);
         }
     }
-    else
+    else if (!data.replace_only_to_literals)
     {
         auto func = makeASTFunction("__getScalar", std::make_shared<ASTLiteral>(scalar_query_hash_str));
         func->alias = subquery.alias;
@@ -317,4 +311,31 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTFunction & func, ASTPtr & as
         Visitor(data).visit(*add_node);
 }
 
+static size_t getSizeOfSerializedLiteral(const Field & field)
+{
+    auto field_str = applyVisitor(FieldVisitorToString(), field);
+    return field_str.size();
+}
+
+bool worthConvertingScalarToLiteral(const Block & scalar, std::optional<size_t> max_literal_size)
+{
+    /// Converting to literal values might take a fair amount of overhead when the value is large, (e.g.
+    /// Array, BitMap, etc.), This conversion is required for constant folding, index lookup, branch
+    /// elimination. However, these optimizations should never be related to large values, thus we blacklist them here.
+    const auto * scalar_type_name = scalar.safeGetByPosition(0).type->getFamilyName();
+    static const std::set<std::string_view> maybe_large_literal_types = {"Array", "Tuple", "AggregateFunction", "Function", "Set", "LowCardinality"};
+
+    if (!maybe_large_literal_types.contains(scalar_type_name))
+        return true;
+
+    if (!max_literal_size)
+        return false;
+
+    /// Size of serialized literal cannot be less than size in bytes.
+    if (scalar.bytes() > *max_literal_size)
+        return false;
+
+    return getSizeOfSerializedLiteral((*scalar.safeGetByPosition(0).column)[0]) <= *max_literal_size;
+}
+
 }
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.h b/src/Interpreters/ExecuteScalarSubqueriesVisitor.h
index d702404dab6..7e2e06d8f8e 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.h
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.h
@@ -36,6 +36,9 @@ public:
         Scalars & scalars;
         Scalars & local_scalars;
         bool only_analyze;
+        bool is_create_parameterized_view;
+        bool replace_only_to_literals;
+        std::optional<size_t> max_literal_size;
     };
 
     static bool needChildVisit(ASTPtr & node, const ASTPtr &);
@@ -48,4 +51,6 @@ private:
 
 using ExecuteScalarSubqueriesVisitor = ExecuteScalarSubqueriesMatcher::Visitor;
 
+bool worthConvertingScalarToLiteral(const Block & scalar, std::optional<size_t> max_literal_size);
+
 }
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index 9931ae97286..36725f36804 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -848,6 +848,23 @@ std::string ExpressionActions::dumpActions() const
     return ss.str();
 }
 
+void ExpressionActions::describeActions(WriteBuffer & out, std::string_view prefix) const
+{
+    bool first = true;
+
+    for (const auto & action : actions)
+    {
+        out << prefix << (first ? "Actions: " : "         ");
+        out << action.toString() << '\n';
+        first = false;
+    }
+
+    out << prefix << "Positions:";
+    for (const auto & pos : result_positions)
+        out << ' ' << pos;
+    out << '\n';
+}
+
 JSONBuilder::ItemPtr ExpressionActions::toTree() const
 {
     auto inputs_array = std::make_unique<JSONBuilder::JSONArray>();
@@ -923,7 +940,8 @@ bool ExpressionActions::checkColumnIsAlwaysFalse(const String & column_name) con
                 // Constant ColumnSet cannot be empty, so we only need to check non-constant ones.
                 if (const auto * column_set = checkAndGetColumn<const ColumnSet>(action.node->column.get()))
                 {
-                    if (column_set->getData()->isCreated() && column_set->getData()->getTotalRowCount() == 0)
+                    auto set = column_set->getData();
+                    if (set && set->isCreated() && set->getTotalRowCount() == 0)
                         return true;
                 }
             }
@@ -1094,12 +1112,12 @@ void ExpressionActionsChain::JoinStep::finalize(const NameSet & required_output_
 
 ActionsDAGPtr & ExpressionActionsChain::Step::actions()
 {
-    return typeid_cast<ExpressionActionsStep *>(this)->actions_dag;
+    return typeid_cast<ExpressionActionsStep &>(*this).actions_dag;
 }
 
 const ActionsDAGPtr & ExpressionActionsChain::Step::actions() const
 {
-    return typeid_cast<const ExpressionActionsStep *>(this)->actions_dag;
+    return typeid_cast<const ExpressionActionsStep &>(*this).actions_dag;
 }
 
 }
diff --git a/src/Interpreters/ExpressionActions.h b/src/Interpreters/ExpressionActions.h
index 11957997a30..db6670c50b9 100644
--- a/src/Interpreters/ExpressionActions.h
+++ b/src/Interpreters/ExpressionActions.h
@@ -109,6 +109,9 @@ public:
     const Block & getSampleBlock() const { return sample_block; }
 
     std::string dumpActions() const;
+
+    void describeActions(WriteBuffer & out, std::string_view prefix) const;
+
     JSONBuilder::ItemPtr toTree() const;
 
     static NameAndTypePair getSmallestColumn(const NamesAndTypesList & columns);
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 2b88ff6a353..c7c66f6f414 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -56,6 +56,7 @@
 #include <Core/Names.h>
 #include <Core/NamesAndTypes.h>
 #include <Common/logger_useful.h>
+#include <QueryPipeline/SizeLimits.h>
 
 
 #include <DataTypes/DataTypesNumber.h>
@@ -68,6 +69,7 @@
 #include <Interpreters/interpretSubquery.h>
 #include <Interpreters/JoinUtils.h>
 #include <Interpreters/misc.h>
+#include <Interpreters/PreparedSets.h>
 
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
@@ -147,6 +149,11 @@ ExpressionAnalyzerData::~ExpressionAnalyzerData() = default;
 ExpressionAnalyzer::ExtractedSettings::ExtractedSettings(const Settings & settings_)
     : use_index_for_in_with_subqueries(settings_.use_index_for_in_with_subqueries)
     , size_limits_for_set(settings_.max_rows_in_set, settings_.max_bytes_in_set, settings_.set_overflow_mode)
+    , size_limits_for_set_used_with_index(
+        (settings_.use_index_for_in_with_subqueries_max_values &&
+            settings_.use_index_for_in_with_subqueries_max_values < settings_.max_rows_in_set) ?
+        size_limits_for_set :
+        SizeLimits(settings_.use_index_for_in_with_subqueries_max_values, settings_.max_bytes_in_set, OverflowMode::BREAK))
     , distributed_group_by_no_merge(settings_.distributed_group_by_no_merge)
 {}
 
@@ -450,7 +457,7 @@ void ExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_
 
     auto set_key = PreparedSetKey::forSubquery(*subquery_or_table_name);
 
-    if (prepared_sets->get(set_key))
+    if (prepared_sets->getFuture(set_key).isValid())
         return; /// Already prepared.
 
     if (auto set_ptr_from_storage_set = isPlainStorageSetInSubquery(subquery_or_table_name))
@@ -459,25 +466,57 @@ void ExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_
         return;
     }
 
-    auto interpreter_subquery = interpretSubquery(subquery_or_table_name, getContext(), {}, query_options);
-    auto io = interpreter_subquery->execute();
-    PullingAsyncPipelineExecutor executor(io.pipeline);
-
-    SetPtr set = std::make_shared<Set>(settings.size_limits_for_set, true, getContext()->getSettingsRef().transform_null_in);
-    set->setHeader(executor.getHeader().getColumnsWithTypeAndName());
-
-    Block block;
-    while (executor.pull(block))
+    auto build_set = [&] () -> SetPtr
     {
-        if (block.rows() == 0)
-            continue;
+        LOG_TRACE(getLogger(), "Building set, key: {}", set_key.toString());
 
-        /// If the limits have been exceeded, give up and let the default subquery processing actions take place.
-        if (!set->insertFromBlock(block.getColumnsWithTypeAndName()))
-            return;
+        auto interpreter_subquery = interpretSubquery(subquery_or_table_name, getContext(), {}, query_options);
+        auto io = interpreter_subquery->execute();
+        PullingAsyncPipelineExecutor executor(io.pipeline);
+
+        SetPtr set = std::make_shared<Set>(settings.size_limits_for_set_used_with_index, true, getContext()->getSettingsRef().transform_null_in);
+        set->setHeader(executor.getHeader().getColumnsWithTypeAndName());
+
+        Block block;
+        while (executor.pull(block))
+        {
+            if (block.rows() == 0)
+                continue;
+
+            /// If the limits have been exceeded, give up and let the default subquery processing actions take place.
+            if (!set->insertFromBlock(block.getColumnsWithTypeAndName()))
+                return nullptr;
+        }
+
+        set->finishInsert();
+
+        return set;
+    };
+
+    SetPtr set;
+
+    auto set_cache = getContext()->getPreparedSetsCache();
+    if (set_cache)
+    {
+        auto from_cache = set_cache->findOrPromiseToBuild(set_key.toString());
+        if (from_cache.index() == 0)
+        {
+            set = build_set();
+            std::get<0>(from_cache).set_value(set);
+        }
+        else
+        {
+            LOG_TRACE(getLogger(), "Waiting for set, key: {}", set_key.toString());
+            set = std::get<1>(from_cache).get();
+        }
+    }
+    else
+    {
+        set = build_set();
     }
 
-    set->finishInsert();
+    if (!set)
+        return;
 
     prepared_sets->set(set_key, std::move(set));
 }
@@ -556,7 +595,6 @@ void ExpressionAnalyzer::getRootActions(const ASTPtr & ast, bool no_makeset_for_
         no_makeset_for_subqueries,
         false /* no_makeset */,
         only_consts,
-        !isRemoteStorage() /* create_source_for_in */,
         getAggregationKeysInfo(),
         false /* build_expression_with_window_functions */,
         is_create_parameterized_view);
@@ -577,7 +615,6 @@ void ExpressionAnalyzer::getRootActionsNoMakeSet(const ASTPtr & ast, ActionsDAGP
         true /* no_makeset_for_subqueries, no_makeset implies no_makeset_for_subqueries */,
         true /* no_makeset */,
         only_consts,
-        !isRemoteStorage() /* create_source_for_in */,
         getAggregationKeysInfo(),
         false /* build_expression_with_window_functions */,
         is_create_parameterized_view);
@@ -600,7 +637,6 @@ void ExpressionAnalyzer::getRootActionsForHaving(
         no_makeset_for_subqueries,
         false /* no_makeset */,
         only_consts,
-        true /* create_source_for_in */,
         getAggregationKeysInfo(),
         false /* build_expression_with_window_functions */,
         is_create_parameterized_view);
@@ -622,7 +658,6 @@ void ExpressionAnalyzer::getRootActionsForWindowFunctions(const ASTPtr & ast, bo
         no_makeset_for_subqueries,
         false /* no_makeset */,
         false /*only_consts */,
-        !isRemoteStorage() /* create_source_for_in */,
         getAggregationKeysInfo(),
         true);
     ActionsVisitor(visitor_data, log.stream()).visit(ast);
@@ -934,6 +969,15 @@ const ASTSelectQuery * ExpressionAnalyzer::getSelectQuery() const
     return select_query;
 }
 
+bool ExpressionAnalyzer::isRemoteStorage() const
+{
+    const Settings & csettings = getContext()->getSettingsRef();
+    // Consider any storage used in parallel replicas as remote, so the query is executed in multiple servers
+    const bool enable_parallel_processing_of_joins
+        = csettings.max_parallel_replicas > 1 && csettings.allow_experimental_parallel_reading_from_replicas > 0;
+    return syntax->is_remote_storage || enable_parallel_processing_of_joins;
+}
+
 const ASTSelectQuery * SelectQueryExpressionAnalyzer::getAggregatingQuery() const
 {
     if (!has_aggregation)
@@ -1027,13 +1071,6 @@ static std::shared_ptr<IJoin> chooseJoinAlgorithm(
 {
     const auto & settings = context->getSettings();
 
-    Block left_sample_block(left_sample_columns);
-    for (auto & column : left_sample_block)
-    {
-        if (!column.column)
-            column.column = column.type->createColumn();
-    }
-
     Block right_sample_block = joined_plan->getCurrentDataStream().header;
 
     std::vector<String> tried_algorithms;
@@ -1079,7 +1116,10 @@ static std::shared_ptr<IJoin> chooseJoinAlgorithm(
     if (analyzed_join->isEnabledAlgorithm(JoinAlgorithm::GRACE_HASH))
     {
         tried_algorithms.push_back(toString(JoinAlgorithm::GRACE_HASH));
-        if (GraceHashJoin::isSupported(analyzed_join))
+
+        // Grace hash join requires that columns exist in left_sample_block.
+        Block left_sample_block(left_sample_columns);
+        if (sanitizeBlock(left_sample_block, false) && GraceHashJoin::isSupported(analyzed_join))
             return std::make_shared<GraceHashJoin>(context, analyzed_join, left_sample_block, right_sample_block, context->getTempDataOnDisk());
     }
 
@@ -1089,6 +1129,7 @@ static std::shared_ptr<IJoin> chooseJoinAlgorithm(
 
         if (MergeJoin::isSupported(analyzed_join))
             return std::make_shared<JoinSwitcher>(analyzed_join, right_sample_block);
+        return std::make_shared<HashJoin>(analyzed_join, right_sample_block);
     }
 
     throw Exception(ErrorCodes::NOT_IMPLEMENTED,
@@ -1865,8 +1906,8 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         {
             ExpressionActionsChain::Step & step = *chain.steps.at(prewhere_step_num);
 
-            auto required_columns = prewhere_info->prewhere_actions->getRequiredColumnsNames();
-            NameSet required_source_columns(required_columns.begin(), required_columns.end());
+            auto required_columns_ = prewhere_info->prewhere_actions->getRequiredColumnsNames();
+            NameSet required_source_columns(required_columns_.begin(), required_columns_.end());
             /// Add required columns to required output in order not to remove them after prewhere execution.
             /// TODO: add sampling and final execution to common chain.
             for (const auto & column : additional_required_columns_after_prewhere)
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index 1676cb506c0..00cd353aa66 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -95,6 +95,7 @@ private:
     {
         const bool use_index_for_in_with_subqueries;
         const SizeLimits size_limits_for_set;
+        const SizeLimits size_limits_for_set_used_with_index;
         const UInt64 distributed_group_by_no_merge;
 
         explicit ExtractedSettings(const Settings & settings_);
@@ -200,7 +201,7 @@ protected:
 
     const ASTSelectQuery * getSelectQuery() const;
 
-    bool isRemoteStorage() const { return syntax->is_remote_storage; }
+    bool isRemoteStorage() const;
 
     NamesAndTypesList getColumnsAfterArrayJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns);
     NamesAndTypesList analyzeJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns);
diff --git a/src/Interpreters/ExternalDictionariesLoader.cpp b/src/Interpreters/ExternalDictionariesLoader.cpp
index 2de0ff13e2b..080878c7d86 100644
--- a/src/Interpreters/ExternalDictionariesLoader.cpp
+++ b/src/Interpreters/ExternalDictionariesLoader.cpp
@@ -85,6 +85,11 @@ DictionaryStructure ExternalDictionariesLoader::getDictionaryStructure(const std
     return ExternalDictionariesLoader::getDictionaryStructure(*load_result.config);
 }
 
+void ExternalDictionariesLoader::assertDictionaryStructureExists(const std::string & dictionary_name, ContextPtr query_context) const
+{
+    getDictionaryStructure(dictionary_name, query_context);
+}
+
 QualifiedTableName ExternalDictionariesLoader::qualifyDictionaryNameWithDatabase(const std::string & dictionary_name, ContextPtr query_context) const
 {
     auto qualified_name = QualifiedTableName::tryParseFromString(dictionary_name);
diff --git a/src/Interpreters/ExternalDictionariesLoader.h b/src/Interpreters/ExternalDictionariesLoader.h
index 421154a6d4f..5f27d695c8b 100644
--- a/src/Interpreters/ExternalDictionariesLoader.h
+++ b/src/Interpreters/ExternalDictionariesLoader.h
@@ -31,6 +31,8 @@ public:
 
     DictionaryStructure getDictionaryStructure(const std::string & dictionary_name, ContextPtr context) const;
 
+    void assertDictionaryStructureExists(const std::string & dictionary_name, ContextPtr context) const;
+
     static DictionaryStructure getDictionaryStructure(const Poco::Util::AbstractConfiguration & config, const std::string & key_in_config = "dictionary");
 
     static DictionaryStructure getDictionaryStructure(const ObjectConfig & config);
@@ -48,6 +50,7 @@ protected:
 
     friend class StorageSystemDictionaries;
     friend class DatabaseDictionary;
+    friend class TableFunctionDictionary;
 };
 
 }
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index 9858b27d57a..5dee750889c 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -2,6 +2,7 @@
 
 #include <mutex>
 #include <pcg_random.hpp>
+#include <Common/MemoryTrackerBlockerInThread.h>
 #include <Common/Config/AbstractConfigurationComparison.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
@@ -9,8 +10,9 @@
 #include <Common/randomSeed.h>
 #include <Common/setThreadName.h>
 #include <Common/StatusInfo.h>
-#include <base/chrono_io.h>
 #include <Common/scope_guard_safe.h>
+#include <Common/logger_useful.h>
+#include <base/chrono_io.h>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <unordered_set>
@@ -967,15 +969,18 @@ private:
     }
 
     /// Does the loading, possibly in the separate thread.
-    void doLoading(const String & name, size_t loading_id, bool forced_to_reload, size_t min_id_to_finish_loading_dependencies_, bool async, ThreadGroupStatusPtr thread_group = {})
+    void doLoading(const String & name, size_t loading_id, bool forced_to_reload, size_t min_id_to_finish_loading_dependencies_, bool async, ThreadGroupPtr thread_group = {})
     {
         SCOPE_EXIT_SAFE(
             if (thread_group)
-                CurrentThread::detachQueryIfNotDetached();
+                CurrentThread::detachFromGroupIfNotDetached();
         );
 
         if (thread_group)
-            CurrentThread::attachTo(thread_group);
+            CurrentThread::attachToGroup(thread_group);
+
+        /// Do not account memory that was occupied by the dictionaries for the query/user context.
+        MemoryTrackerBlockerInThread memory_blocker;
 
         LOG_TRACE(log, "Start loading object '{}'", name);
         try
diff --git a/src/Interpreters/ExternalLoader.h b/src/Interpreters/ExternalLoader.h
index 3ce7c40ef03..49b4ea77e0d 100644
--- a/src/Interpreters/ExternalLoader.h
+++ b/src/Interpreters/ExternalLoader.h
@@ -6,10 +6,11 @@
 #include <base/types.h>
 #include <Interpreters/IExternalLoadable.h>
 #include <Interpreters/IExternalLoaderConfigRepository.h>
-#include <Common/logger_useful.h>
 #include <base/scope_guard.h>
 #include <Common/ExternalLoaderStatus.h>
+#include <Core/Types.h>
 
+namespace Poco { class Logger; }
 
 namespace DB
 {
diff --git a/src/Interpreters/FilesystemCacheLog.h b/src/Interpreters/FilesystemCacheLog.h
index bf5361ef324..1b22d561c51 100644
--- a/src/Interpreters/FilesystemCacheLog.h
+++ b/src/Interpreters/FilesystemCacheLog.h
@@ -8,7 +8,6 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Interpreters/SystemLog.h>
 #include <Interpreters/TransactionVersionMetadata.h>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/FilesystemReadPrefetchesLog.cpp b/src/Interpreters/FilesystemReadPrefetchesLog.cpp
index 9dd0fce84b0..221cb11f09a 100644
--- a/src/Interpreters/FilesystemReadPrefetchesLog.cpp
+++ b/src/Interpreters/FilesystemReadPrefetchesLog.cpp
@@ -19,7 +19,7 @@ NamesAndTypesList FilesystemReadPrefetchesLogElement::getNamesAndTypes()
         {"offset", std::make_shared<DataTypeUInt64>()},
         {"size", std::make_shared<DataTypeInt64>()},
         {"prefetch_submit_time", std::make_shared<DataTypeDateTime64>(6)},
-        {"priority", std::make_shared<DataTypeUInt64>()},
+        {"priority", std::make_shared<DataTypeInt64>()},
         {"prefetch_execution_start_time", std::make_shared<DataTypeDateTime64>(6)},
         {"prefetch_execution_end_time", std::make_shared<DataTypeDateTime64>(6)},
         {"prefetch_execution_time_us", std::make_shared<DataTypeUInt64>()},
@@ -40,7 +40,7 @@ void FilesystemReadPrefetchesLogElement::appendToBlock(MutableColumns & columns)
     columns[i++]->insert(offset);
     columns[i++]->insert(size);
     columns[i++]->insert(prefetch_submit_time);
-    columns[i++]->insert(priority);
+    columns[i++]->insert(priority.value);
     if (execution_watch)
     {
         columns[i++]->insert(execution_watch->getStart());
diff --git a/src/Interpreters/FilesystemReadPrefetchesLog.h b/src/Interpreters/FilesystemReadPrefetchesLog.h
index a7672c49d91..cf36f513f5a 100644
--- a/src/Interpreters/FilesystemReadPrefetchesLog.h
+++ b/src/Interpreters/FilesystemReadPrefetchesLog.h
@@ -4,6 +4,7 @@
 #include <Core/NamesAndTypes.h>
 #include <Interpreters/SystemLog.h>
 #include <Common/Stopwatch.h>
+#include <Common/Priority.h>
 
 namespace DB
 {
@@ -25,7 +26,7 @@ struct FilesystemReadPrefetchesLogElement
     Int64 size; /// -1 means unknown
     Decimal64 prefetch_submit_time{};
     std::optional<Stopwatch> execution_watch;
-    size_t priority;
+    Priority priority;
     FilesystemPrefetchState state;
     UInt64 thread_id;
     String reader_id;
@@ -45,4 +46,6 @@ public:
     using SystemLog<FilesystemReadPrefetchesLogElement>::SystemLog;
 };
 
+using FilesystemReadPrefetchesLogPtr = std::shared_ptr<FilesystemReadPrefetchesLog>;
+
 }
diff --git a/src/Interpreters/FillingRow.cpp b/src/Interpreters/FillingRow.cpp
index b03049a209f..7efbb62b0d2 100644
--- a/src/Interpreters/FillingRow.cpp
+++ b/src/Interpreters/FillingRow.cpp
@@ -1,5 +1,6 @@
 #include <Interpreters/FillingRow.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
+#include <IO/Operators.h>
 
 
 namespace DB
@@ -44,32 +45,49 @@ bool FillingRow::operator==(const FillingRow & other) const
     return true;
 }
 
-bool FillingRow::next(const FillingRow & to_row)
+bool FillingRow::operator>=(const FillingRow & other) const
 {
+    return !(*this < other);
+}
+
+bool FillingRow::isNull() const
+{
+    for (const auto & field : row)
+        if (!field.isNull())
+            return false;
+
+    return true;
+}
+
+std::pair<bool, bool> FillingRow::next(const FillingRow & to_row)
+{
+    const size_t row_size = size();
     size_t pos = 0;
 
     /// Find position we need to increment for generating next row.
-    for (size_t s = size(); pos < s; ++pos)
+    for (; pos < row_size; ++pos)
         if (!row[pos].isNull() && !to_row.row[pos].isNull() && !equals(row[pos], to_row.row[pos]))
             break;
 
-    if (pos == size() || less(to_row.row[pos], row[pos], getDirection(pos)))
-        return false;
+    if (pos == row_size || less(to_row.row[pos], row[pos], getDirection(pos)))
+        return {false, false};
 
     /// If we have any 'fill_to' value at position greater than 'pos',
     ///  we need to generate rows up to 'fill_to' value.
-    for (size_t i = size() - 1; i > pos; --i)
+    for (size_t i = row_size - 1; i > pos; --i)
     {
-        if (getFillDescription(i).fill_to.isNull() || row[i].isNull())
+        auto & fill_column_desc = getFillDescription(i);
+
+        if (fill_column_desc.fill_to.isNull() || row[i].isNull())
             continue;
 
-        auto next_value = row[i];
-        getFillDescription(i).step_func(next_value);
-        if (less(next_value, getFillDescription(i).fill_to, getDirection(i)))
+        Field next_value = row[i];
+        fill_column_desc.step_func(next_value);
+        if (less(next_value, fill_column_desc.fill_to, getDirection(i)))
         {
             row[i] = next_value;
             initFromDefaults(i + 1);
-            return true;
+            return {true, true};
         }
     }
 
@@ -77,14 +95,13 @@ bool FillingRow::next(const FillingRow & to_row)
     getFillDescription(pos).step_func(next_value);
 
     if (less(to_row.row[pos], next_value, getDirection(pos)) || equals(next_value, getFillDescription(pos).fill_to))
-        return false;
+        return {false, false};
 
     row[pos] = next_value;
     if (equals(row[pos], to_row.row[pos]))
     {
         bool is_less = false;
-        size_t i = pos + 1;
-        for (; i < size(); ++i)
+        for (size_t i = pos + 1; i < row_size; ++i)
         {
             const auto & fill_from = getFillDescription(i).fill_from;
             if (!fill_from.isNull())
@@ -94,11 +111,11 @@ bool FillingRow::next(const FillingRow & to_row)
             is_less |= less(row[i], to_row.row[i], getDirection(i));
         }
 
-        return is_less;
+        return {is_less, true};
     }
 
     initFromDefaults(pos + 1);
-    return true;
+    return {true, true};
 }
 
 void FillingRow::initFromDefaults(size_t from_pos)
@@ -107,39 +124,22 @@ void FillingRow::initFromDefaults(size_t from_pos)
         row[i] = getFillDescription(i).fill_from;
 }
 
-void insertFromFillingRow(MutableColumns & filling_columns, MutableColumns & interpolate_columns, MutableColumns & other_columns,
-    const FillingRow & filling_row, const Block & interpolate_block)
+String FillingRow::dump() const
 {
-    for (size_t i = 0, size = filling_columns.size(); i < size; ++i)
+    WriteBufferFromOwnString out;
+    for (size_t i = 0; i < row.size(); ++i)
     {
-        if (filling_row[i].isNull())
-        {
-            filling_columns[i]->insertDefault();
-        }
-        else
-        {
-            filling_columns[i]->insert(filling_row[i]);
-        }
+        if (i != 0)
+            out << ", ";
+        out << row[i].dump();
     }
-
-    if (size_t size = interpolate_block.columns())
-    {
-        Columns columns = interpolate_block.getColumns();
-        for (size_t i = 0; i < size; ++i)
-            interpolate_columns[i]->insertFrom(*columns[i]->convertToFullColumnIfConst(), 0);
-    }
-    else
-        for (const auto & interpolate_column : interpolate_columns)
-            interpolate_column->insertDefault();
-
-    for (const auto & other_column : other_columns)
-        other_column->insertDefault();
+    return out.str();
 }
 
-void copyRowFromColumns(MutableColumns & dest, const Columns & source, size_t row_num)
+WriteBuffer & operator<<(WriteBuffer & out, const FillingRow & row)
 {
-    for (size_t i = 0, size = source.size(); i < size; ++i)
-        dest[i]->insertFrom(*source[i], row_num);
+    out << row.dump();
+    return out;
 }
 
 }
diff --git a/src/Interpreters/FillingRow.h b/src/Interpreters/FillingRow.h
index 331c237285b..004b417542c 100644
--- a/src/Interpreters/FillingRow.h
+++ b/src/Interpreters/FillingRow.h
@@ -1,7 +1,5 @@
 #pragma once
 #include <Core/SortDescription.h>
-#include <Core/InterpolateDescription.h>
-#include <Columns/IColumn.h>
 
 
 namespace DB
@@ -21,7 +19,10 @@ public:
     explicit FillingRow(const SortDescription & sort_description);
 
     /// Generates next row according to fill 'from', 'to' and 'step' values.
-    bool next(const FillingRow & to_row);
+    /// Return pair of boolean
+    /// apply - true if filling values should be inserted into result set
+    /// value_changed - true if filling row value was changed
+    std::pair<bool, bool> next(const FillingRow & to_row);
 
     void initFromDefaults(size_t from_pos = 0);
 
@@ -30,17 +31,20 @@ public:
     size_t size() const { return row.size(); }
     bool operator<(const FillingRow & other) const;
     bool operator==(const FillingRow & other) const;
+    bool operator>=(const FillingRow & other) const;
+    bool isNull() const;
 
     int getDirection(size_t index) const { return sort_description[index].direction; }
     FillColumnDescription & getFillDescription(size_t index) { return sort_description[index].fill_description; }
+    const FillColumnDescription & getFillDescription(size_t index) const { return sort_description[index].fill_description; }
+
+    String dump() const;
 
 private:
     Row row;
     SortDescription sort_description;
 };
 
-void insertFromFillingRow(MutableColumns & filling_columns, MutableColumns & interpolate_columns, MutableColumns & other_columns,
-    const FillingRow & filling_row, const Block & interpolate_block);
-void copyRowFromColumns(MutableColumns & dest, const Columns & source, size_t row_num);
+WriteBuffer & operator<<(WriteBuffer & out, const FillingRow & row);
 
 }
diff --git a/src/Interpreters/FullSortingMergeJoin.h b/src/Interpreters/FullSortingMergeJoin.h
index fa7d0478535..7318d1d24a1 100644
--- a/src/Interpreters/FullSortingMergeJoin.h
+++ b/src/Interpreters/FullSortingMergeJoin.h
@@ -4,6 +4,7 @@
 #include <Interpreters/TableJoin.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <Common/logger_useful.h>
 #include <Poco/Logger.h>
 
 namespace DB
@@ -44,6 +45,10 @@ public:
         const auto & on_expr = table_join->getOnlyClause();
         bool support_conditions = !on_expr.on_filter_condition_left && !on_expr.on_filter_condition_right;
 
+        if (!on_expr.analyzer_left_filter_condition_column_name.empty() ||
+            !on_expr.analyzer_right_filter_condition_column_name.empty())
+            support_conditions = false;
+
         /// Key column can change nullability and it's not handled on type conversion stage, so algorithm should be aware of it
         bool support_using_and_nulls = !table_join->hasUsing() || !table_join->joinUseNulls();
 
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index b105cae31c6..08862032007 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -205,10 +205,19 @@ public:
     }
 
 private:
+    static bool shouldBeExecutedGlobally(const Data & data)
+    {
+        const Settings & settings = data.getContext()->getSettingsRef();
+        /// For parallel replicas we reinterpret JOIN as GLOBAL JOIN as a way to broadcast data
+        const bool enable_parallel_processing_of_joins = data.getContext()->canUseParallelReplicasOnInitiator();
+        return settings.prefer_global_in_and_join || enable_parallel_processing_of_joins;
+    }
+
+
     /// GLOBAL IN
     static void visit(ASTFunction & func, ASTPtr &, Data & data)
     {
-        if ((data.getContext()->getSettingsRef().prefer_global_in_and_join
+        if ((shouldBeExecutedGlobally(data)
              && (func.name == "in" || func.name == "notIn" || func.name == "nullIn" || func.name == "notNullIn"))
             || func.name == "globalIn" || func.name == "globalNotIn" || func.name == "globalNullIn" || func.name == "globalNotNullIn")
         {
@@ -238,8 +247,7 @@ private:
     static void visit(ASTTablesInSelectQueryElement & table_elem, ASTPtr &, Data & data)
     {
         if (table_elem.table_join
-            && (table_elem.table_join->as<ASTTableJoin &>().locality == JoinLocality::Global
-                || data.getContext()->getSettingsRef().prefer_global_in_and_join))
+            && (table_elem.table_join->as<ASTTableJoin &>().locality == JoinLocality::Global || shouldBeExecutedGlobally(data)))
         {
             data.addExternalStorage(table_elem.table_expression, true);
             data.has_global_subqueries = true;
diff --git a/src/Interpreters/GraceHashJoin.cpp b/src/Interpreters/GraceHashJoin.cpp
index 79a825a752f..f54ee9d85c7 100644
--- a/src/Interpreters/GraceHashJoin.cpp
+++ b/src/Interpreters/GraceHashJoin.cpp
@@ -10,7 +10,6 @@
 #include <Core/ProtocolDefines.h>
 #include <Disks/IVolume.h>
 #include <Disks/TemporaryFileOnDisk.h>
-#include <IO/WriteBufferFromTemporaryFile.h>
 #include <Common/logger_useful.h>
 #include <Common/thread_local_rng.h>
 
@@ -305,8 +304,10 @@ void GraceHashJoin::initBuckets()
 
 bool GraceHashJoin::isSupported(const std::shared_ptr<TableJoin> & table_join)
 {
+
     bool is_asof = (table_join->strictness() == JoinStrictness::Asof);
-    return !is_asof && isInnerOrLeft(table_join->kind()) && table_join->oneDisjunct();
+    auto kind = table_join->kind();
+    return !is_asof && (isInner(kind) || isLeft(kind) || isRight(kind) || isFull(kind)) && table_join->oneDisjunct();
 }
 
 GraceHashJoin::~GraceHashJoin() = default;
@@ -326,7 +327,6 @@ bool GraceHashJoin::hasMemoryOverflow(size_t total_rows, size_t total_bytes) con
     /// One row can't be split, avoid loop
     if (total_rows < 2)
         return false;
-
     bool has_overflow = !table_join->sizeLimits().softCheck(total_rows, total_bytes);
 
     if (has_overflow)
@@ -471,18 +471,30 @@ bool GraceHashJoin::alwaysReturnsEmptySet() const
 
     return hash_join_is_empty;
 }
-
-IBlocksStreamPtr GraceHashJoin::getNonJoinedBlocks(const Block &, const Block &, UInt64) const
+/// Each bucket are handled by the following steps
+/// 1. build hash_join by the right side blocks.
+/// 2. join left side with the hash_join,
+/// 3. read right non-joined blocks from hash_join.
+/// buckets are handled one by one, each hash_join will not be release before the right non-joined blocks are emitted.
+///
+/// There is a finished counter in JoiningTransform/DelayedJoinedBlocksWorkerTransform,
+/// only one processor could take the non-joined blocks from right stream, and ensure all rows from
+/// left stream have been emitted before this.
+IBlocksStreamPtr
+GraceHashJoin::getNonJoinedBlocks(const Block & left_sample_block_, const Block & result_sample_block_, UInt64 max_block_size_) const
 {
-    /// We do no support returning non joined blocks here.
-    /// TODO: They _should_ be reported by getDelayedBlocks instead
-    return nullptr;
+    return hash_join->getNonJoinedBlocks(left_sample_block_, result_sample_block_, max_block_size_);
 }
 
 class GraceHashJoin::DelayedBlocks : public IBlocksStream
 {
 public:
-    explicit DelayedBlocks(size_t current_bucket_, Buckets buckets_, InMemoryJoinPtr hash_join_, const Names & left_key_names_, const Names & right_key_names_)
+    explicit DelayedBlocks(
+        size_t current_bucket_,
+        Buckets buckets_,
+        InMemoryJoinPtr hash_join_,
+        const Names & left_key_names_,
+        const Names & right_key_names_)
         : current_bucket(current_bucket_)
         , buckets(std::move(buckets_))
         , hash_join(std::move(hash_join_))
@@ -500,12 +512,15 @@ public:
 
         do
         {
+            // One DelayedBlocks is shared among multiple DelayedJoinedBlocksWorkerTransform.
+            // There is a lock inside left_reader.read().
             block = left_reader.read();
             if (!block)
             {
                 return {};
             }
 
+            // block comes from left_reader, need to join with right table to get the result.
             Blocks blocks = JoinCommon::scatterBlockByHash(left_key_names, block, num_buckets);
             block = std::move(blocks[current_idx]);
 
@@ -556,18 +571,14 @@ IBlocksStreamPtr GraceHashJoin::getDelayedBlocks()
 
     size_t bucket_idx = current_bucket->idx;
 
-    if (hash_join)
+    size_t prev_keys_num = 0;
+    // If there is only one bucket, don't take this check.
+    if (hash_join && buckets.size() > 1)
     {
-        auto right_blocks = hash_join->releaseJoinedBlocks(/* restructure */ false);
-        for (auto & block : right_blocks)
-        {
-            Blocks blocks = JoinCommon::scatterBlockByHash(right_key_names, block, buckets.size());
-            flushBlocksToBuckets<JoinTableSide::Right>(blocks, buckets, bucket_idx);
-        }
+        // Use previous hash_join's keys number to estimate next hash_join's size is reasonable.
+        prev_keys_num = hash_join->getTotalRowCount();
     }
 
-    hash_join = makeInMemoryJoin();
-
     for (bucket_idx = bucket_idx + 1; bucket_idx < buckets.size(); ++bucket_idx)
     {
         current_bucket = buckets[bucket_idx].get();
@@ -580,6 +591,7 @@ IBlocksStreamPtr GraceHashJoin::getDelayedBlocks()
             continue;
         }
 
+        hash_join = makeInMemoryJoin(prev_keys_num);
         auto right_reader = current_bucket->startJoining();
         size_t num_rows = 0; /// count rows that were written and rehashed
         while (Block block = right_reader.read())
@@ -590,7 +602,6 @@ IBlocksStreamPtr GraceHashJoin::getDelayedBlocks()
 
         LOG_TRACE(log, "Loaded bucket {} with {}(/{}) rows",
             bucket_idx, hash_join->getTotalRowCount(), num_rows);
-
         return std::make_unique<DelayedBlocks>(current_bucket->idx, buckets, hash_join, left_key_names, right_key_names);
     }
 
@@ -600,9 +611,9 @@ IBlocksStreamPtr GraceHashJoin::getDelayedBlocks()
     return nullptr;
 }
 
-GraceHashJoin::InMemoryJoinPtr GraceHashJoin::makeInMemoryJoin()
+GraceHashJoin::InMemoryJoinPtr GraceHashJoin::makeInMemoryJoin(size_t reserve_num)
 {
-    return std::make_unique<InMemoryJoin>(table_join, right_sample_block, any_take_last_row);
+    return std::make_unique<InMemoryJoin>(table_join, right_sample_block, any_take_last_row, reserve_num);
 }
 
 Block GraceHashJoin::prepareRightBlock(const Block & block)
@@ -630,6 +641,19 @@ void GraceHashJoin::addJoinedBlockImpl(Block block)
         if (!hash_join)
             hash_join = makeInMemoryJoin();
 
+        // buckets size has been changed in other threads. Need to scatter current_block again.
+        // rehash could only happen under hash_join_mutex's scope.
+        auto current_buckets = getCurrentBuckets();
+        if (buckets_snapshot.size() != current_buckets.size())
+        {
+            LOG_TRACE(log, "mismatch buckets size. previous:{}, current:{}", buckets_snapshot.size(), getCurrentBuckets().size());
+            Blocks blocks = JoinCommon::scatterBlockByHash(right_key_names, current_block, current_buckets.size());
+            flushBlocksToBuckets<JoinTableSide::Right>(blocks, current_buckets, bucket_index);
+            current_block = std::move(blocks[bucket_index]);
+            if (!current_block.rows())
+                return;
+        }
+        auto prev_keys_num = hash_join->getTotalRowCount();
         hash_join->addJoinedBlock(current_block, /* check_limits = */ false);
 
         if (!hasMemoryOverflow(hash_join))
@@ -638,7 +662,6 @@ void GraceHashJoin::addJoinedBlockImpl(Block block)
         current_block = {};
 
         auto right_blocks = hash_join->releaseJoinedBlocks(/* restructure */ false);
-        hash_join = nullptr;
 
         buckets_snapshot = rehashBuckets(buckets_snapshot.size() * 2);
 
@@ -658,7 +681,7 @@ void GraceHashJoin::addJoinedBlockImpl(Block block)
                 current_block = concatenateBlocks(current_blocks);
         }
 
-        hash_join = makeInMemoryJoin();
+        hash_join = makeInMemoryJoin(prev_keys_num);
 
         if (current_block.rows() > 0)
             hash_join->addJoinedBlock(current_block, /* check_limits = */ false);
diff --git a/src/Interpreters/GraceHashJoin.h b/src/Interpreters/GraceHashJoin.h
index 4f7694e2f07..ec611f373ed 100644
--- a/src/Interpreters/GraceHashJoin.h
+++ b/src/Interpreters/GraceHashJoin.h
@@ -13,7 +13,6 @@
 
 namespace DB
 {
-
 class TableJoin;
 class HashJoin;
 
@@ -79,7 +78,7 @@ public:
     bool supportTotals() const override { return false; }
 
     IBlocksStreamPtr
-    getNonJoinedBlocks(const Block & left_sample_block, const Block & result_sample_block, UInt64 max_block_size) const override;
+    getNonJoinedBlocks(const Block & left_sample_block_, const Block & result_sample_block_, UInt64 max_block_size) const override;
 
     /// Open iterator over joined blocks.
     /// Must be called after all @joinBlock calls.
@@ -91,7 +90,8 @@ public:
 private:
     void initBuckets();
     /// Create empty join for in-memory processing.
-    InMemoryJoinPtr makeInMemoryJoin();
+    /// reserve_num for reserving space in hash table.
+    InMemoryJoinPtr makeInMemoryJoin(size_t reserve_num = 0);
 
     /// Add right table block to the @join. Calls @rehash on overflow.
     void addJoinedBlockImpl(Block block);
@@ -139,6 +139,7 @@ private:
     mutable SharedMutex rehash_mutex;
 
     FileBucket * current_bucket = nullptr;
+
     mutable std::mutex current_bucket_mutex;
 
     InMemoryJoinPtr hash_join;
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index fba985da41c..146b57049a6 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -79,7 +79,13 @@ namespace JoinStuff
         {
             assert(flags[nullptr].size() <= size);
             need_flags = true;
-            flags[nullptr] = std::vector<std::atomic_bool>(size);
+            // For one disjunct clause case, we don't need to reinit each time we call addJoinedBlock.
+            // and there is no value inserted in this JoinUsedFlags before addJoinedBlock finish.
+            // So we reinit only when the hash table is rehashed to a larger size.
+            if (flags.empty() || flags[nullptr].size() < size) [[unlikely]]
+            {
+                flags[nullptr] = std::vector<std::atomic_bool>(size);
+            }
         }
     }
 
@@ -211,7 +217,7 @@ static void correctNullabilityInplace(ColumnWithTypeAndName & column, bool nulla
         JoinCommon::removeColumnNullability(column);
 }
 
-HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block_, bool any_take_last_row_)
+HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block_, bool any_take_last_row_, size_t reserve_num)
     : table_join(table_join_)
     , kind(table_join->kind())
     , strictness(table_join->strictness())
@@ -296,7 +302,7 @@ HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_s
     }
 
     for (auto & maps : data->maps)
-        dataMapInit(maps);
+        dataMapInit(maps, reserve_num);
 }
 
 HashJoin::Type HashJoin::chooseMethod(JoinKind kind, const ColumnRawPtrs & key_columns, Sizes & key_sizes)
@@ -448,13 +454,15 @@ struct KeyGetterForType
     using Type = typename KeyGetterForTypeImpl<type, Value, Mapped>::Type;
 };
 
-void HashJoin::dataMapInit(MapsVariant & map)
+void HashJoin::dataMapInit(MapsVariant & map, size_t reserve_num)
 {
 
     if (kind == JoinKind::Cross)
         return;
     joinDispatchInit(kind, strictness, map);
     joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { map_.create(data->type); });
+    if (reserve_num)
+        joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { map_.reserve(data->type, reserve_num); });
 }
 
 bool HashJoin::empty() const
@@ -495,7 +503,7 @@ size_t HashJoin::getTotalByteCount() const
     if (!data)
         return 0;
 
-#ifdef NDEBUG
+#ifndef NDEBUG
     size_t debug_blocks_allocated_size = 0;
     for (const auto & block : data->blocks)
         debug_blocks_allocated_size += block.allocatedBytes();
@@ -517,7 +525,7 @@ size_t HashJoin::getTotalByteCount() const
 
     res += data->blocks_allocated_size;
     res += data->blocks_nullmaps_allocated_size;
-    res += data->pool.size();
+    res += data->pool.allocatedBytes();
 
     if (data->type != Type::CROSS)
     {
@@ -704,15 +712,48 @@ Block HashJoin::prepareRightBlock(const Block & block) const
     return prepareRightBlock(block, savedBlockSample());
 }
 
-bool HashJoin::addJoinedBlock(const Block & source_block, bool check_limits)
+bool HashJoin::addJoinedBlock(const Block & source_block_, bool check_limits)
 {
     if (!data)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Join data was released");
 
     /// RowRef::SizeT is uint32_t (not size_t) for hash table Cell memory efficiency.
     /// It's possible to split bigger blocks and insert them by parts here. But it would be a dead code.
-    if (unlikely(source_block.rows() > std::numeric_limits<RowRef::SizeT>::max()))
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Too many rows in right table block for HashJoin: {}", source_block.rows());
+    if (unlikely(source_block_.rows() > std::numeric_limits<RowRef::SizeT>::max()))
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Too many rows in right table block for HashJoin: {}", source_block_.rows());
+
+    Block source_block = source_block_;
+    if (strictness == JoinStrictness::Asof)
+    {
+        chassert(kind == JoinKind::Left || kind == JoinKind::Inner);
+
+        /// Filter out rows with NULLs in ASOF key, nulls are not joined with anything since they are not comparable
+        /// We support only INNER/LEFT ASOF join, so rows with NULLs never return from the right joined table.
+        /// So filter them out here not to handle in implementation.
+        const auto & asof_key_name = table_join->getOnlyClause().key_names_right.back();
+        auto & asof_column = source_block.getByName(asof_key_name);
+
+        if (asof_column.type->isNullable())
+        {
+            /// filter rows with nulls in asof key
+            if (const auto * asof_const_column = typeid_cast<const ColumnConst *>(asof_column.column.get()))
+            {
+                if (asof_const_column->isNullAt(0))
+                    return false;
+            }
+            else
+            {
+                const auto & asof_column_nullable = assert_cast<const ColumnNullable &>(*asof_column.column).getNullMapData();
+
+                NullMap negative_null_map(asof_column_nullable.size());
+                for (size_t i = 0; i < asof_column_nullable.size(); ++i)
+                    negative_null_map[i] = !asof_column_nullable[i];
+
+                for (auto & column : source_block)
+                    column.column = column.column->filter(negative_null_map, -1);
+            }
+        }
+    }
 
     size_t rows = source_block.rows();
 
@@ -1022,7 +1063,6 @@ private:
 
     void addColumn(const ColumnWithTypeAndName & src_column, const std::string & qualified_name)
     {
-
         columns.push_back(src_column.column->cloneEmpty());
         columns.back()->reserve(src_column.column->size());
         type_name.emplace_back(src_column.type, src_column.name, qualified_name);
@@ -1049,7 +1089,6 @@ struct JoinFeatures
     static constexpr bool add_missing = (left || full) && !is_semi_join;
 
     static constexpr bool need_flags = MapGetter<KIND, STRICTNESS>::flagged;
-
 };
 
 template <bool multiple_disjuncts>
@@ -1203,7 +1242,7 @@ NO_INLINE IColumn::Filter joinRightColumns(
     AddedColumns & added_columns,
     JoinStuff::JoinUsedFlags & used_flags [[maybe_unused]])
 {
-    constexpr JoinFeatures<KIND, STRICTNESS> jf;
+    constexpr JoinFeatures<KIND, STRICTNESS> join_features;
 
     size_t rows = added_columns.rows_to_add;
     IColumn::Filter filter;
@@ -1212,7 +1251,7 @@ NO_INLINE IColumn::Filter joinRightColumns(
 
     Arena pool;
 
-    if constexpr (jf.need_replication)
+    if constexpr (join_features.need_replication)
         added_columns.offsets_to_replicate = std::make_unique<IColumn::Offsets>(rows);
 
     IColumn::Offset current_offset = 0;
@@ -1243,7 +1282,7 @@ NO_INLINE IColumn::Filter joinRightColumns(
             {
                 right_row_found = true;
                 auto & mapped = find_result.getMapped();
-                if constexpr (jf.is_asof_join)
+                if constexpr (join_features.is_asof_join)
                 {
                     const IColumn & left_asof_key = added_columns.leftAsofKey();
 
@@ -1252,62 +1291,62 @@ NO_INLINE IColumn::Filter joinRightColumns(
                     {
                         setUsed<need_filter>(filter, i);
                         if constexpr (multiple_disjuncts)
-                            used_flags.template setUsed<jf.need_flags, multiple_disjuncts>(row_ref.block, row_ref.row_num, 0);
+                            used_flags.template setUsed<join_features.need_flags, multiple_disjuncts>(row_ref.block, row_ref.row_num, 0);
                         else
-                            used_flags.template setUsed<jf.need_flags, multiple_disjuncts>(find_result);
+                            used_flags.template setUsed<join_features.need_flags, multiple_disjuncts>(find_result);
 
-                        added_columns.appendFromBlock<jf.add_missing>(*row_ref.block, row_ref.row_num);
+                        added_columns.appendFromBlock<join_features.add_missing>(*row_ref.block, row_ref.row_num);
                     }
                     else
-                        addNotFoundRow<jf.add_missing, jf.need_replication>(added_columns, current_offset);
+                        addNotFoundRow<join_features.add_missing, join_features.need_replication>(added_columns, current_offset);
                 }
-                else if constexpr (jf.is_all_join)
+                else if constexpr (join_features.is_all_join)
                 {
                     setUsed<need_filter>(filter, i);
-                    used_flags.template setUsed<jf.need_flags, multiple_disjuncts>(find_result);
-                    auto used_flags_opt = jf.need_flags ? &used_flags : nullptr;
-                    addFoundRowAll<Map, jf.add_missing>(mapped, added_columns, current_offset, known_rows, used_flags_opt);
+                    used_flags.template setUsed<join_features.need_flags, multiple_disjuncts>(find_result);
+                    auto used_flags_opt = join_features.need_flags ? &used_flags : nullptr;
+                    addFoundRowAll<Map, join_features.add_missing>(mapped, added_columns, current_offset, known_rows, used_flags_opt);
                 }
-                else if constexpr ((jf.is_any_join || jf.is_semi_join) && jf.right)
+                else if constexpr ((join_features.is_any_join || join_features.is_semi_join) && join_features.right)
                 {
                     /// Use first appeared left key + it needs left columns replication
-                    bool used_once = used_flags.template setUsedOnce<jf.need_flags, multiple_disjuncts>(find_result);
+                    bool used_once = used_flags.template setUsedOnce<join_features.need_flags, multiple_disjuncts>(find_result);
                     if (used_once)
                     {
-                        auto used_flags_opt = jf.need_flags ? &used_flags : nullptr;
+                        auto used_flags_opt = join_features.need_flags ? &used_flags : nullptr;
                         setUsed<need_filter>(filter, i);
-                        addFoundRowAll<Map, jf.add_missing>(mapped, added_columns, current_offset, known_rows, used_flags_opt);
+                        addFoundRowAll<Map, join_features.add_missing>(mapped, added_columns, current_offset, known_rows, used_flags_opt);
                     }
                 }
-                else if constexpr (jf.is_any_join && KIND == JoinKind::Inner)
+                else if constexpr (join_features.is_any_join && KIND == JoinKind::Inner)
                 {
-                    bool used_once = used_flags.template setUsedOnce<jf.need_flags, multiple_disjuncts>(find_result);
+                    bool used_once = used_flags.template setUsedOnce<join_features.need_flags, multiple_disjuncts>(find_result);
 
                     /// Use first appeared left key only
                     if (used_once)
                     {
                         setUsed<need_filter>(filter, i);
-                        added_columns.appendFromBlock<jf.add_missing>(*mapped.block, mapped.row_num);
+                        added_columns.appendFromBlock<join_features.add_missing>(*mapped.block, mapped.row_num);
                     }
 
                     break;
                 }
-                else if constexpr (jf.is_any_join && jf.full)
+                else if constexpr (join_features.is_any_join && join_features.full)
                 {
                     /// TODO
                 }
-                else if constexpr (jf.is_anti_join)
+                else if constexpr (join_features.is_anti_join)
                 {
-                    if constexpr (jf.right && jf.need_flags)
-                        used_flags.template setUsed<jf.need_flags, multiple_disjuncts>(find_result);
+                    if constexpr (join_features.right && join_features.need_flags)
+                        used_flags.template setUsed<join_features.need_flags, multiple_disjuncts>(find_result);
                 }
                 else /// ANY LEFT, SEMI LEFT, old ANY (RightAny)
                 {
                     setUsed<need_filter>(filter, i);
-                    used_flags.template setUsed<jf.need_flags, multiple_disjuncts>(find_result);
-                    added_columns.appendFromBlock<jf.add_missing>(*mapped.block, mapped.row_num);
+                    used_flags.template setUsed<join_features.need_flags, multiple_disjuncts>(find_result);
+                    added_columns.appendFromBlock<join_features.add_missing>(*mapped.block, mapped.row_num);
 
-                    if (jf.is_any_or_semi_join)
+                    if (join_features.is_any_or_semi_join)
                     {
                         break;
                     }
@@ -1319,9 +1358,9 @@ NO_INLINE IColumn::Filter joinRightColumns(
         {
             if (!right_row_found && null_element_found)
             {
-                addNotFoundRow<jf.add_missing, jf.need_replication>(added_columns, current_offset);
+                addNotFoundRow<join_features.add_missing, join_features.need_replication>(added_columns, current_offset);
 
-                if constexpr (jf.need_replication)
+                if constexpr (join_features.need_replication)
                 {
                    (*added_columns.offsets_to_replicate)[i] = current_offset;
                 }
@@ -1331,12 +1370,12 @@ NO_INLINE IColumn::Filter joinRightColumns(
 
         if (!right_row_found)
         {
-            if constexpr (jf.is_anti_join && jf.left)
+            if constexpr (join_features.is_anti_join && join_features.left)
                 setUsed<need_filter>(filter, i);
-            addNotFoundRow<jf.add_missing, jf.need_replication>(added_columns, current_offset);
+            addNotFoundRow<join_features.add_missing, join_features.need_replication>(added_columns, current_offset);
         }
 
-        if constexpr (jf.need_replication)
+        if constexpr (join_features.need_replication)
         {
            (*added_columns.offsets_to_replicate)[i] = current_offset;
         }
@@ -1442,7 +1481,7 @@ void HashJoin::joinBlockImpl(
     const std::vector<const Maps *> & maps_,
     bool is_join_get) const
 {
-    constexpr JoinFeatures<KIND, STRICTNESS> jf;
+    constexpr JoinFeatures<KIND, STRICTNESS> join_features;
 
     std::vector<JoinOnKeyColumns> join_on_keys;
     const auto & onexprs = table_join->getClauses();
@@ -1457,7 +1496,7 @@ void HashJoin::joinBlockImpl(
       * Because if they are constants, then in the "not joined" rows, they may have different values
       *  - default values, which can differ from the values of these constants.
       */
-    if constexpr (jf.right || jf.full)
+    if constexpr (join_features.right || join_features.full)
     {
         materializeBlockInplace(block);
     }
@@ -1473,11 +1512,11 @@ void HashJoin::joinBlockImpl(
         savedBlockSample(),
         *this,
         std::move(join_on_keys),
-        jf.is_asof_join,
+        join_features.is_asof_join,
         is_join_get);
 
     bool has_required_right_keys = (required_right_keys.columns() != 0);
-    added_columns.need_filter = jf.need_filter || has_required_right_keys;
+    added_columns.need_filter = join_features.need_filter || has_required_right_keys;
 
     IColumn::Filter row_filter = switchJoinRightColumns<KIND, STRICTNESS>(maps_, added_columns, data->type, used_flags);
 
@@ -1486,7 +1525,7 @@ void HashJoin::joinBlockImpl(
 
     std::vector<size_t> right_keys_to_replicate [[maybe_unused]];
 
-    if constexpr (jf.need_filter)
+    if constexpr (join_features.need_filter)
     {
         /// If ANY INNER | RIGHT JOIN - filter all the columns except the new ones.
         for (size_t i = 0; i < existing_columns; ++i)
@@ -1502,7 +1541,7 @@ void HashJoin::joinBlockImpl(
                 const auto & left_name = required_right_keys_sources[i];
 
                 /// asof column is already in block.
-                if (jf.is_asof_join && right_key.name == table_join->getOnlyClause().key_names_right.back())
+                if (join_features.is_asof_join && right_key.name == table_join->getOnlyClause().key_names_right.back())
                     continue;
 
                 const auto & col = block.getByName(left_name);
@@ -1534,7 +1573,7 @@ void HashJoin::joinBlockImpl(
                 const auto & left_name = required_right_keys_sources[i];
 
                 /// asof column is already in block.
-                if (jf.is_asof_join && right_key.name == table_join->getOnlyClause().key_names_right.back())
+                if (join_features.is_asof_join && right_key.name == table_join->getOnlyClause().key_names_right.back())
                     continue;
 
                 const auto & col = block.getByName(left_name);
@@ -1548,13 +1587,13 @@ void HashJoin::joinBlockImpl(
                 correctNullabilityInplace(right_col, is_nullable, null_map_filter);
                 block.insert(std::move(right_col));
 
-                if constexpr (jf.need_replication)
+                if constexpr (join_features.need_replication)
                     right_keys_to_replicate.push_back(block.getPositionByName(right_col_name));
             }
         }
     }
 
-    if constexpr (jf.need_replication)
+    if constexpr (join_features.need_replication)
     {
         std::unique_ptr<IColumn::Offsets> & offsets_to_replicate = added_columns.offsets_to_replicate;
 
diff --git a/src/Interpreters/HashJoin.h b/src/Interpreters/HashJoin.h
index b29b6e617c8..58e47432d41 100644
--- a/src/Interpreters/HashJoin.h
+++ b/src/Interpreters/HashJoin.h
@@ -16,7 +16,6 @@
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/FixedHashMap.h>
 #include <Storages/TableLockHolder.h>
-#include <Common/logger_useful.h>
 
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
@@ -147,7 +146,7 @@ public:
 class HashJoin : public IJoin
 {
 public:
-    HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block, bool any_take_last_row_ = false);
+    HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block, bool any_take_last_row_ = false, size_t reserve_num = 0);
 
     ~HashJoin() override;
 
@@ -156,7 +155,7 @@ public:
     /** Add block of data from right hand of JOIN to the map.
       * Returns false, if some limit was exceeded and you should not insert more data.
       */
-    bool addJoinedBlock(const Block & block, bool check_limits) override;
+    bool addJoinedBlock(const Block & source_block_, bool check_limits) override;
 
     void checkTypesOfKeys(const Block & block) const override;
 
@@ -218,6 +217,16 @@ public:
         M(keys256)                     \
         M(hashed)
 
+    /// Only for maps using hash table.
+    #define APPLY_FOR_HASH_JOIN_VARIANTS(M) \
+        M(key32)                            \
+        M(key64)                            \
+        M(key_string)                       \
+        M(key_fixed_string)                 \
+        M(keys128)                          \
+        M(keys256)                          \
+        M(hashed)
+
 
     /// Used for reading from StorageJoin and applying joinGet function
     #define APPLY_FOR_JOIN_VARIANTS_LIMITED(M) \
@@ -267,6 +276,22 @@ public:
             }
         }
 
+        void reserve(Type which, size_t num)
+        {
+            switch (which)
+            {
+                case Type::EMPTY:            break;
+                case Type::CROSS:            break;
+                case Type::key8:             break;
+                case Type::key16:            break;
+
+            #define M(NAME) \
+                case Type::NAME: NAME->reserve(num); break;
+                APPLY_FOR_HASH_JOIN_VARIANTS(M)
+            #undef M
+            }
+        }
+
         size_t getTotalRowCount(Type which) const
         {
             switch (which)
@@ -410,7 +435,7 @@ private:
     /// If set HashJoin instance is not available for modification (addJoinedBlock)
     TableLockHolder storage_join_lock = nullptr;
 
-    void dataMapInit(MapsVariant &);
+    void dataMapInit(MapsVariant &, size_t);
 
     void initRightBlockStructure(Block & saved_block_sample);
 
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
index b6e910eac94..4aa87346e80 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
@@ -18,9 +18,12 @@ namespace DB
 QueryPipelineBuilder IInterpreterUnionOrSelectQuery::buildQueryPipeline()
 {
     QueryPlan query_plan;
+    return buildQueryPipeline(query_plan);
+}
 
+QueryPipelineBuilder IInterpreterUnionOrSelectQuery::buildQueryPipeline(QueryPlan & query_plan)
+{
     buildQueryPlan(query_plan);
-
     return std::move(*query_plan.buildQueryPipeline(
         QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context)));
 }
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.h b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
index 1147070f48a..e4425a73505 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.h
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
@@ -35,6 +35,7 @@ public:
 
     virtual void buildQueryPlan(QueryPlan & query_plan) = 0;
     QueryPipelineBuilder buildQueryPipeline();
+    QueryPipelineBuilder buildQueryPipeline(QueryPlan & query_plan);
 
     virtual void ignoreWithTotals() = 0;
 
diff --git a/src/Interpreters/IJoin.h b/src/Interpreters/IJoin.h
index 69d69ce30a6..83067b0eab7 100644
--- a/src/Interpreters/IJoin.h
+++ b/src/Interpreters/IJoin.h
@@ -7,7 +7,6 @@
 #include <Core/Block.h>
 #include <Columns/IColumn.h>
 #include <Common/Exception.h>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/InterpreterAlterNamedCollectionQuery.cpp b/src/Interpreters/InterpreterAlterNamedCollectionQuery.cpp
index 040a8714983..478735c432b 100644
--- a/src/Interpreters/InterpreterAlterNamedCollectionQuery.cpp
+++ b/src/Interpreters/InterpreterAlterNamedCollectionQuery.cpp
@@ -12,9 +12,10 @@ namespace DB
 BlockIO InterpreterAlterNamedCollectionQuery::execute()
 {
     auto current_context = getContext();
-    current_context->checkAccess(AccessType::ALTER_NAMED_COLLECTION);
-
     const auto & query = query_ptr->as<const ASTAlterNamedCollectionQuery &>();
+
+    current_context->checkAccess(AccessType::ALTER_NAMED_COLLECTION, query.collection_name);
+
     if (!query.cluster.empty())
     {
         DDLQueryOnClusterParams params;
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index fabcc6844e5..ec2145b38bf 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -8,18 +8,21 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/FunctionNameNormalizer.h>
 #include <Interpreters/MutationsInterpreter.h>
+#include <Interpreters/MutationsNonDeterministicHelpers.h>
 #include <Interpreters/QueryLog.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTAssignment.h>
 #include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTColumnDeclaration.h>
+#include <Parsers/queryToString.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/IStorage.h>
 #include <Storages/LiveView/LiveViewCommands.h>
 #include <Storages/LiveView/StorageLiveView.h>
 #include <Storages/MutationCommands.h>
 #include <Storages/PartitionCommands.h>
+#include <Storages/StorageKeeperMap.h>
 #include <Common/typeid_cast.h>
 
 #include <Functions/UserDefined/UserDefinedSQLFunctionFactory.h>
@@ -39,6 +42,8 @@ namespace ErrorCodes
     extern const int INCORRECT_QUERY;
     extern const int NOT_IMPLEMENTED;
     extern const int TABLE_IS_READ_ONLY;
+    extern const int BAD_ARGUMENTS;
+    extern const int UNKNOWN_TABLE;
 }
 
 
@@ -64,7 +69,6 @@ BlockIO InterpreterAlterQuery::execute()
     throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown alter object type");
 }
 
-
 BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
 {
     BlockIO res;
@@ -72,16 +76,21 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
     if (!UserDefinedSQLFunctionFactory::instance().empty())
         UserDefinedSQLFunctionVisitor::visit(query_ptr);
 
+    auto table_id = getContext()->resolveStorageID(alter, Context::ResolveOrdinary);
+    query_ptr->as<ASTAlterQuery &>().setDatabase(table_id.database_name);
+    StoragePtr table = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
+
     if (!alter.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
     {
+        if (table && table->as<StorageKeeperMap>())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Mutations with ON CLUSTER are not allowed for KeeperMap tables");
+
         DDLQueryOnClusterParams params;
         params.access_to_check = getRequiredAccess();
         return executeDDLQueryOnCluster(query_ptr, getContext(), params);
     }
 
     getContext()->checkAccess(getRequiredAccess());
-    auto table_id = getContext()->resolveStorageID(alter, Context::ResolveOrdinary);
-    query_ptr->as<ASTAlterQuery &>().setDatabase(table_id.database_name);
 
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
     if (database->shouldReplicateQuery(getContext(), query_ptr))
@@ -91,7 +100,9 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
         return database->tryEnqueueReplicatedDDL(query_ptr, getContext());
     }
 
-    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
+    if (!table)
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Could not find table: {}", table_id.table_name);
+
     checkStorageSupportsTransactionsIfNeeded(table, getContext());
     if (table->isStaticStorage())
         throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
@@ -146,7 +157,8 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
     if (mutation_commands.hasNonEmptyMutationCommands())
     {
         table->checkMutationIsPossible(mutation_commands, getContext()->getSettingsRef());
-        MutationsInterpreter(table, metadata_snapshot, mutation_commands, getContext(), false).validate();
+        MutationsInterpreter::Settings settings(false);
+        MutationsInterpreter(table, metadata_snapshot, mutation_commands, getContext(), settings).validate();
         table->mutate(mutation_commands, getContext());
     }
 
@@ -226,6 +238,7 @@ BlockIO InterpreterAlterQuery::executeToDatabase(const ASTAlterQuery & alter)
 
     return res;
 }
+
 AccessRightsElements InterpreterAlterQuery::getRequiredAccess() const
 {
     AccessRightsElements required_access;
diff --git a/src/Interpreters/InterpreterCreateNamedCollectionQuery.cpp b/src/Interpreters/InterpreterCreateNamedCollectionQuery.cpp
index 8a1a8d9dde6..bac59998062 100644
--- a/src/Interpreters/InterpreterCreateNamedCollectionQuery.cpp
+++ b/src/Interpreters/InterpreterCreateNamedCollectionQuery.cpp
@@ -13,10 +13,10 @@ namespace DB
 BlockIO InterpreterCreateNamedCollectionQuery::execute()
 {
     auto current_context = getContext();
-    current_context->checkAccess(AccessType::CREATE_NAMED_COLLECTION);
-
     const auto & query = query_ptr->as<const ASTCreateNamedCollectionQuery &>();
 
+    current_context->checkAccess(AccessType::CREATE_NAMED_COLLECTION, query.collection_name);
+
     if (!query.cluster.empty())
     {
         DDLQueryOnClusterParams params;
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 559fc3532f5..ab9e1fb04d6 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -9,7 +9,7 @@
 #include <Common/Macros.h>
 #include <Common/randomSeed.h>
 #include <Common/atomicRename.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 #include <Core/Defines.h>
 #include <Core/SettingsEnums.h>
@@ -38,6 +38,7 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/InterpreterRenameQuery.h>
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
@@ -226,13 +227,23 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         metadata_path = metadata_path / "metadata" / database_name_escaped;
     }
 
+    if (create.storage->engine->name == "Replicated" && !internal && !create.attach && create.storage->engine->arguments)
+    {
+        /// Fill in default parameters
+        if (create.storage->engine->arguments->children.size() == 1)
+            create.storage->engine->arguments->children.push_back(std::make_shared<ASTLiteral>("{shard}"));
+
+        if (create.storage->engine->arguments->children.size() == 2)
+            create.storage->engine->arguments->children.push_back(std::make_shared<ASTLiteral>("{replica}"));
+    }
+
     if ((create.storage->engine->name == "MaterializeMySQL" || create.storage->engine->name == "MaterializedMySQL")
         && !getContext()->getSettingsRef().allow_experimental_database_materialized_mysql
         && !internal && !create.attach)
     {
         throw Exception(ErrorCodes::UNKNOWN_DATABASE_ENGINE,
                         "MaterializedMySQL is an experimental database engine. "
-                        "Enable allow_experimental_database_materialized_mysql to use it.");
+                        "Enable allow_experimental_database_materialized_mysql to use it");
     }
 
     if (create.storage->engine->name == "Replicated"
@@ -241,7 +252,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
     {
         throw Exception(ErrorCodes::UNKNOWN_DATABASE_ENGINE,
                         "Replicated is an experimental database engine. "
-                        "Enable allow_experimental_database_replicated to use it.");
+                        "Enable allow_experimental_database_replicated to use it");
     }
 
     if (create.storage->engine->name == "MaterializedPostgreSQL"
@@ -250,7 +261,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
     {
         throw Exception(ErrorCodes::UNKNOWN_DATABASE_ENGINE,
                         "MaterializedPostgreSQL is an experimental database engine. "
-                        "Enable allow_experimental_database_materialized_postgresql to use it.");
+                        "Enable allow_experimental_database_materialized_postgresql to use it");
     }
 
     bool need_write_metadata = !create.attach || !fs::exists(metadata_file_path);
@@ -730,7 +741,21 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTableProperti
     }
     else if (create.select)
     {
-        Block as_select_sample = InterpreterSelectWithUnionQuery::getSampleBlock(create.select->clone(), getContext(), false /* is_subquery */, create.isParameterizedView());
+
+        Block as_select_sample;
+
+        if (getContext()->getSettingsRef().allow_experimental_analyzer)
+        {
+            as_select_sample = InterpreterSelectQueryAnalyzer::getSampleBlock(create.select->clone(), getContext());
+        }
+        else
+        {
+            as_select_sample = InterpreterSelectWithUnionQuery::getSampleBlock(create.select->clone(),
+                getContext(),
+                false /* is_subquery */,
+                create.isParameterizedView());
+        }
+
         properties.columns = ColumnsDescription(as_select_sample.getNamesAndTypesList());
     }
     else if (create.as_table_function)
@@ -823,21 +848,6 @@ void InterpreterCreateQuery::validateTableStructure(const ASTCreateQuery & creat
         }
     }
 
-    if (!create.attach && !settings.allow_experimental_geo_types)
-    {
-        for (const auto & name_and_type_pair : properties.columns.getAllPhysical())
-        {
-            const auto & type = name_and_type_pair.type->getName();
-            if (type == "MultiPolygon" || type == "Polygon" || type == "Ring" || type == "Point")
-            {
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot create table with column '{}' which type is '{}' "
-                                "because experimental geo types are not allowed. "
-                                "Set setting allow_experimental_geo_types = 1 in order to allow it",
-                                name_and_type_pair.name, type);
-            }
-        }
-    }
-
     if (!create.attach && !settings.allow_experimental_object_type)
     {
         for (const auto & [name, type] : properties.columns.getAllPhysical())
@@ -925,23 +935,32 @@ void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
 
     if (create.temporary)
     {
-        if (create.storage && create.storage->engine && create.storage->engine->name != "Memory")
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Temporary tables can only be created with ENGINE = Memory, not {}",
-                create.storage->engine->name);
-
         /// It's possible if some part of storage definition (such as PARTITION BY) is specified, but ENGINE is not.
         /// It makes sense when default_table_engine setting is used, but not for temporary tables.
         /// For temporary tables we ignore this setting to allow CREATE TEMPORARY TABLE query without specifying ENGINE
-        /// even if setting is set to MergeTree or something like that (otherwise MergeTree will be substituted and query will fail).
-        if (create.storage && !create.storage->engine)
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Invalid storage definition for temporary table: must be either ENGINE = Memory or empty");
 
-        auto engine_ast = std::make_shared<ASTFunction>();
-        engine_ast->name = "Memory";
-        engine_ast->no_empty_args = true;
-        auto storage_ast = std::make_shared<ASTStorage>();
-        storage_ast->set(storage_ast->engine, engine_ast);
-        create.set(create.storage, storage_ast);
+        if (!create.cluster.empty())
+            throw Exception(ErrorCodes::INCORRECT_QUERY, "Temporary tables cannot be created with ON CLUSTER clause");
+
+        if (create.storage)
+        {
+            if (create.storage->engine)
+            {
+                if (create.storage->engine->name.starts_with("Replicated") || create.storage->engine->name == "KeeperMap")
+                    throw Exception(ErrorCodes::INCORRECT_QUERY, "Temporary tables cannot be created with Replicated or KeeperMap table engines");
+            }
+            else
+                throw Exception(ErrorCodes::INCORRECT_QUERY, "Invalid storage definition for temporary table");
+        }
+        else
+        {
+            auto engine_ast = std::make_shared<ASTFunction>();
+            engine_ast->name = "Memory";
+            engine_ast->no_empty_args = true;
+            auto storage_ast = std::make_shared<ASTStorage>();
+            storage_ast->set(storage_ast->engine, engine_ast);
+            create.set(create.storage, storage_ast);
+        }
         return;
     }
 
@@ -1083,7 +1102,8 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
 
         /// For short syntax of ATTACH query we have to lock table name here, before reading metadata
         /// and hold it until table is attached
-        ddl_guard = DatabaseCatalog::instance().getDDLGuard(database_name, create.getTable());
+        if (likely(need_ddl_guard))
+            ddl_guard = DatabaseCatalog::instance().getDDLGuard(database_name, create.getTable());
 
         bool if_not_exists = create.if_not_exists;
 
@@ -1177,15 +1197,25 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     TableProperties properties = getTablePropertiesAndNormalizeCreateQuery(create);
 
     /// Check type compatible for materialized dest table and select columns
-    if (create.select && create.is_materialized_view && create.to_table_id)
+    if (create.select && create.is_materialized_view && create.to_table_id && !create.attach)
     {
         if (StoragePtr to_table = DatabaseCatalog::instance().tryGetTable(
             {create.to_table_id.database_name, create.to_table_id.table_name, create.to_table_id.uuid},
             getContext()
         ))
         {
-            Block input_block = InterpreterSelectWithUnionQuery(
-                create.select->clone(), getContext(), SelectQueryOptions().analyze()).getSampleBlock();
+            Block input_block;
+
+            if (getContext()->getSettingsRef().allow_experimental_analyzer)
+            {
+                input_block = InterpreterSelectQueryAnalyzer::getSampleBlock(create.select->clone(), getContext());
+            }
+            else
+            {
+                input_block = InterpreterSelectWithUnionQuery(create.select->clone(),
+                    getContext(),
+                    SelectQueryOptions().analyze()).getSampleBlock();
+            }
 
             Block output_block = to_table->getInMemoryMetadataPtr()->getSampleBlock();
 
@@ -1259,13 +1289,26 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
         if (create.if_not_exists && getContext()->tryResolveStorageID({"", create.getTable()}, Context::ResolveExternal))
             return false;
 
+        DatabasePtr database = DatabaseCatalog::instance().getDatabase(DatabaseCatalog::TEMPORARY_DATABASE);
+
         String temporary_table_name = create.getTable();
-        auto temporary_table = TemporaryTableHolder(getContext(), properties.columns, properties.constraints, query_ptr);
+        auto creator = [&](const StorageID & table_id)
+        {
+            return StorageFactory::instance().get(create,
+                database->getTableDataPath(table_id.getTableName()),
+                getContext(),
+                getContext()->getGlobalContext(),
+                properties.columns,
+                properties.constraints,
+                false);
+        };
+        auto temporary_table = TemporaryTableHolder(getContext(), creator, query_ptr);
+
         getContext()->getSessionContext()->addExternalTable(temporary_table_name, std::move(temporary_table));
         return true;
     }
 
-    if (!ddl_guard)
+    if (!ddl_guard && likely(need_ddl_guard))
         ddl_guard = DatabaseCatalog::instance().getDDLGuard(create.getDatabase(), create.getTable());
 
     String data_path;
@@ -1687,7 +1730,13 @@ AccessRightsElements InterpreterCreateQuery::getRequiredAccess() const
     else
     {
         if (create.temporary)
-            required_access.emplace_back(AccessType::CREATE_TEMPORARY_TABLE);
+        {
+            /// Currently default table engine for temporary tables is Memory. default_table_engine does not affect temporary tables.
+            if (create.storage && create.storage->engine && create.storage->engine->name != "Memory")
+                required_access.emplace_back(AccessType::CREATE_ARBITRARY_TEMPORARY_TABLE);
+            else
+                required_access.emplace_back(AccessType::CREATE_TEMPORARY_TABLE);
+        }
         else
         {
             if (create.replace_table)
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
index 4d11387f44c..a5fa6576091 100644
--- a/src/Interpreters/InterpreterCreateQuery.h
+++ b/src/Interpreters/InterpreterCreateQuery.h
@@ -61,6 +61,11 @@ public:
         load_database_without_tables = load_database_without_tables_;
     }
 
+    void setDontNeedDDLGuard()
+    {
+        need_ddl_guard = false;
+    }
+
     /// Obtain information about columns, their types, default values and column comments,
     ///  for case when columns in CREATE query is specified explicitly.
     static ColumnsDescription getColumnsDescription(const ASTExpressionList & columns, ContextPtr context, bool attach);
@@ -112,6 +117,7 @@ private:
     bool internal = false;
     bool force_attach = false;
     bool load_database_without_tables = false;
+    bool need_ddl_guard = true;
 
     mutable String as_database_saved;
     mutable String as_table_saved;
diff --git a/src/Interpreters/InterpreterDeleteQuery.cpp b/src/Interpreters/InterpreterDeleteQuery.cpp
index fabd1c38ce3..52723416400 100644
--- a/src/Interpreters/InterpreterDeleteQuery.cpp
+++ b/src/Interpreters/InterpreterDeleteQuery.cpp
@@ -72,7 +72,8 @@ BlockIO InterpreterDeleteQuery::execute()
         mutation_commands.emplace_back(mut_command);
 
         table->checkMutationIsPossible(mutation_commands, getContext()->getSettingsRef());
-        MutationsInterpreter(table, metadata_snapshot, mutation_commands, getContext(), false).validate();
+        MutationsInterpreter::Settings settings(false);
+        MutationsInterpreter(table, metadata_snapshot, mutation_commands, getContext(), settings).validate();
         table->mutate(mutation_commands, getContext());
         return {};
     }
diff --git a/src/Interpreters/InterpreterDescribeCacheQuery.cpp b/src/Interpreters/InterpreterDescribeCacheQuery.cpp
index b8f6a9b308d..ca875ee57b2 100644
--- a/src/Interpreters/InterpreterDescribeCacheQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeCacheQuery.cpp
@@ -20,7 +20,7 @@ static Block getSampleBlock()
         ColumnWithTypeAndName{std::make_shared<DataTypeUInt64>(), "max_elements"},
         ColumnWithTypeAndName{std::make_shared<DataTypeUInt64>(), "max_file_segment_size"},
         ColumnWithTypeAndName{std::make_shared<DataTypeNumber<UInt8>>(), "cache_on_write_operations"},
-        ColumnWithTypeAndName{std::make_shared<DataTypeNumber<UInt8>>(), "enable_cache_hits_threshold"},
+        ColumnWithTypeAndName{std::make_shared<DataTypeNumber<UInt8>>(), "cache_hits_threshold"},
         ColumnWithTypeAndName{std::make_shared<DataTypeUInt64>(), "current_size"},
         ColumnWithTypeAndName{std::make_shared<DataTypeUInt64>(), "current_elements"},
         ColumnWithTypeAndName{std::make_shared<DataTypeString>(), "path"},
@@ -45,7 +45,7 @@ BlockIO InterpreterDescribeCacheQuery::execute()
     res_columns[1]->insert(settings.max_elements);
     res_columns[2]->insert(settings.max_file_segment_size);
     res_columns[3]->insert(settings.cache_on_write_operations);
-    res_columns[4]->insert(settings.enable_cache_hits_threshold);
+    res_columns[4]->insert(settings.cache_hits_threshold);
     res_columns[5]->insert(cache->getUsedCacheSize());
     res_columns[6]->insert(cache->getFileSegmentsNum());
     res_columns[7]->insert(cache->getBasePath());
diff --git a/src/Interpreters/InterpreterDropNamedCollectionQuery.cpp b/src/Interpreters/InterpreterDropNamedCollectionQuery.cpp
index 064a13012a6..cc3444bb4df 100644
--- a/src/Interpreters/InterpreterDropNamedCollectionQuery.cpp
+++ b/src/Interpreters/InterpreterDropNamedCollectionQuery.cpp
@@ -12,9 +12,10 @@ namespace DB
 BlockIO InterpreterDropNamedCollectionQuery::execute()
 {
     auto current_context = getContext();
-    current_context->checkAccess(AccessType::DROP_NAMED_COLLECTION);
-
     const auto & query = query_ptr->as<const ASTDropNamedCollectionQuery &>();
+
+    current_context->checkAccess(AccessType::DROP_NAMED_COLLECTION, query.collection_name);
+
     if (!query.cluster.empty())
     {
         DDLQueryOnClusterParams params;
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index f4507de5ac7..0beb4492aef 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -282,11 +282,6 @@ BlockIO InterpreterDropQuery::executeToTemporaryTable(const String & table_name,
             else if (kind == ASTDropQuery::Kind::Drop)
             {
                 context_handle->removeExternalTable(table_name);
-                table->flushAndShutdown();
-                auto table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
-                /// Delete table data
-                table->drop();
-                table->is_dropped = true;
             }
             else if (kind == ASTDropQuery::Kind::Detach)
             {
@@ -360,19 +355,22 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                 /// Flush should not be done if shouldBeEmptyOnDetach() == false,
                 /// since in this case getTablesIterator() may do some additional work,
                 /// see DatabaseMaterializedMySQL::getTablesIterator()
-                for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
-                {
-                    iterator->table()->flush();
-                }
-
                 auto table_context = Context::createCopy(getContext());
                 table_context->setInternalQuery(true);
+                /// Do not hold extra shared pointers to tables
+                std::vector<std::pair<String, bool>> tables_to_drop;
                 for (auto iterator = database->getTablesIterator(table_context); iterator->isValid(); iterator->next())
                 {
+                    iterator->table()->flush();
+                    tables_to_drop.push_back({iterator->name(), iterator->table()->isDictionary()});
+                }
+
+                for (const auto & table : tables_to_drop)
+                {
+                    query_for_table.setTable(table.first);
+                    query_for_table.is_dictionary = table.second;
                     DatabasePtr db;
                     UUID table_to_wait = UUIDHelpers::Nil;
-                    query_for_table.setTable(iterator->name());
-                    query_for_table.is_dictionary = iterator->table()->isDictionary();
                     executeToTableImpl(table_context, query_for_table, db, table_to_wait);
                     uuids_to_wait.push_back(table_to_wait);
                 }
@@ -433,7 +431,8 @@ AccessRightsElements InterpreterDropQuery::getRequiredAccessForDDLOnCluster() co
     return required_access;
 }
 
-void InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind kind, ContextPtr global_context, ContextPtr current_context, const StorageID & target_table_id, bool sync)
+void InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind kind, ContextPtr global_context, ContextPtr current_context,
+                                            const StorageID & target_table_id, bool sync, bool ignore_sync_setting)
 {
     if (DatabaseCatalog::instance().tryGetTable(target_table_id, current_context))
     {
@@ -450,6 +449,8 @@ void InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind kind, ContextPtr
         /// and not allowed to drop inner table explicitly. Allowing to drop inner table without explicit grant
         /// looks like expected behaviour and we have tests for it.
         auto drop_context = Context::createCopy(global_context);
+        if (ignore_sync_setting)
+            drop_context->setSetting("database_atomic_wait_for_drop_and_detach_synchronously", false);
         drop_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
         if (auto txn = current_context->getZooKeeperMetadataTransaction())
         {
diff --git a/src/Interpreters/InterpreterDropQuery.h b/src/Interpreters/InterpreterDropQuery.h
index afec26424ba..af7a4ddef25 100644
--- a/src/Interpreters/InterpreterDropQuery.h
+++ b/src/Interpreters/InterpreterDropQuery.h
@@ -24,7 +24,8 @@ public:
     /// Drop table or database.
     BlockIO execute() override;
 
-    static void executeDropQuery(ASTDropQuery::Kind kind, ContextPtr global_context, ContextPtr current_context, const StorageID & target_table_id, bool sync);
+    static void executeDropQuery(ASTDropQuery::Kind kind, ContextPtr global_context, ContextPtr current_context,
+                                 const StorageID & target_table_id, bool sync, bool ignore_sync_setting = false);
 
     bool supportsTransactions() const override;
 
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index 3c225522cc4..3a381cd8dab 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -41,6 +41,7 @@ namespace ErrorCodes
     extern const int INVALID_SETTING_VALUE;
     extern const int UNKNOWN_SETTING;
     extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
 }
 
 namespace
@@ -386,6 +387,10 @@ QueryPipeline InterpreterExplainQuery::executeImpl()
         }
         case ASTExplainQuery::QueryTree:
         {
+            if (!getContext()->getSettingsRef().allow_experimental_analyzer)
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                    "EXPLAIN QUERY TREE is only supported with a new analyzer. Set allow_experimental_analyzer = 1.");
+
             if (ast.getExplainedQuery()->as<ASTSelectWithUnionQuery>() == nullptr)
                 throw Exception(ErrorCodes::INCORRECT_QUERY, "Only SELECT is supported for EXPLAIN QUERY TREE query");
 
diff --git a/src/Interpreters/InterpreterFactory.cpp b/src/Interpreters/InterpreterFactory.cpp
index 502de459156..9cd1f2a251c 100644
--- a/src/Interpreters/InterpreterFactory.cpp
+++ b/src/Interpreters/InterpreterFactory.cpp
@@ -8,6 +8,7 @@
 #include <Parsers/ASTDropFunctionQuery.h>
 #include <Parsers/ASTDropIndexQuery.h>
 #include <Parsers/ASTDropQuery.h>
+#include <Parsers/ASTUndropQuery.h>
 #include <Parsers/ASTExplainQuery.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTSelectIntersectExceptQuery.h>
@@ -20,6 +21,8 @@
 #include <Parsers/ASTShowEngineQuery.h>
 #include <Parsers/ASTShowProcesslistQuery.h>
 #include <Parsers/ASTShowTablesQuery.h>
+#include <Parsers/ASTShowColumnsQuery.h>
+#include <Parsers/ASTShowIndexesQuery.h>
 #include <Parsers/ASTUseQuery.h>
 #include <Parsers/ASTWatchQuery.h>
 #include <Parsers/ASTCreateNamedCollectionQuery.h>
@@ -60,6 +63,7 @@
 #include <Interpreters/InterpreterDropFunctionQuery.h>
 #include <Interpreters/InterpreterDropIndexQuery.h>
 #include <Interpreters/InterpreterDropQuery.h>
+#include <Interpreters/InterpreterUndropQuery.h>
 #include <Interpreters/InterpreterExistsQuery.h>
 #include <Interpreters/InterpreterExplainQuery.h>
 #include <Interpreters/InterpreterExternalDDLQuery.h>
@@ -77,6 +81,8 @@
 #include <Interpreters/InterpreterShowEngineQuery.h>
 #include <Interpreters/InterpreterShowProcesslistQuery.h>
 #include <Interpreters/InterpreterShowTablesQuery.h>
+#include <Interpreters/InterpreterShowColumnsQuery.h>
+#include <Interpreters/InterpreterShowIndexesQuery.h>
 #include <Interpreters/InterpreterSystemQuery.h>
 #include <Interpreters/InterpreterUseQuery.h>
 #include <Interpreters/InterpreterWatchQuery.h>
@@ -108,6 +114,7 @@
 namespace ProfileEvents
 {
     extern const Event Query;
+    extern const Event QueriesWithSubqueries;
     extern const Event SelectQuery;
     extern const Event InsertQuery;
 }
@@ -125,6 +132,15 @@ std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, ContextMut
 {
     ProfileEvents::increment(ProfileEvents::Query);
 
+    /// SELECT and INSERT query will handle QueriesWithSubqueries on their own.
+    if (!(query->as<ASTSelectQuery>() ||
+        query->as<ASTSelectWithUnionQuery>() ||
+        query->as<ASTSelectIntersectExceptQuery>() ||
+        query->as<ASTInsertQuery>()))
+    {
+        ProfileEvents::increment(ProfileEvents::QueriesWithSubqueries);
+    }
+
     if (query->as<ASTSelectQuery>())
     {
         if (context->getSettingsRef().allow_experimental_analyzer)
@@ -161,6 +177,10 @@ std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, ContextMut
     {
         return std::make_unique<InterpreterDropQuery>(query, context);
     }
+    else if (query->as<ASTUndropQuery>())
+    {
+        return std::make_unique<InterpreterUndropQuery>(query, context);
+    }
     else if (query->as<ASTRenameQuery>())
     {
         return std::make_unique<InterpreterRenameQuery>(query, context);
@@ -169,6 +189,14 @@ std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, ContextMut
     {
         return std::make_unique<InterpreterShowTablesQuery>(query, context);
     }
+    else if (query->as<ASTShowColumnsQuery>())
+    {
+        return std::make_unique<InterpreterShowColumnsQuery>(query, context);
+    }
+    else if (query->as<ASTShowIndexesQuery>())
+    {
+        return std::make_unique<InterpreterShowIndexesQuery>(query, context);
+    }
     else if (query->as<ASTShowEnginesQuery>())
     {
         return std::make_unique<InterpreterShowEnginesQuery>(query, context);
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index b4a19ea7403..e87b16f0e9d 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -32,9 +32,17 @@
 #include <Storages/StorageMaterializedView.h>
 #include <Storages/WindowView/StorageWindowView.h>
 #include <TableFunctions/TableFunctionFactory.h>
+#include <Common/ThreadStatus.h>
 #include <Common/checkStackSize.h>
+#include <Common/ProfileEvents.h>
 
 
+namespace ProfileEvents
+{
+    extern const Event InsertQueriesWithSubqueries;
+    extern const Event QueriesWithSubqueries;
+}
+
 namespace DB
 {
 
@@ -233,15 +241,29 @@ Chain InterpreterInsertQuery::buildChain(
     ThreadStatusesHolderPtr thread_status_holder,
     std::atomic_uint64_t * elapsed_counter_ms)
 {
+    ProfileEvents::increment(ProfileEvents::InsertQueriesWithSubqueries);
+    ProfileEvents::increment(ProfileEvents::QueriesWithSubqueries);
+
+    ThreadGroupPtr running_group;
+    if (current_thread)
+        running_group = current_thread->getThreadGroup();
+    if (!running_group)
+        running_group = std::make_shared<ThreadGroup>(getContext());
+
     auto sample = getSampleBlock(columns, table, metadata_snapshot);
-    return buildChainImpl(table, metadata_snapshot, sample, thread_status_holder, elapsed_counter_ms);
+
+    Chain sink = buildSink(table, metadata_snapshot, thread_status_holder, running_group, elapsed_counter_ms);
+    Chain chain = buildPreSinkChain(sink.getInputHeader(), table, metadata_snapshot, sample, thread_status_holder);
+
+    chain.appendChain(std::move(sink));
+    return chain;
 }
 
-Chain InterpreterInsertQuery::buildChainImpl(
+Chain InterpreterInsertQuery::buildSink(
     const StoragePtr & table,
     const StorageMetadataPtr & metadata_snapshot,
-    const Block & query_sample_block,
     ThreadStatusesHolderPtr thread_status_holder,
+    ThreadGroupPtr running_group,
     std::atomic_uint64_t * elapsed_counter_ms)
 {
     ThreadStatus * thread_status = current_thread;
@@ -250,14 +272,7 @@ Chain InterpreterInsertQuery::buildChainImpl(
         thread_status = nullptr;
 
     auto context_ptr = getContext();
-    const ASTInsertQuery * query = nullptr;
-    if (query_ptr)
-        query = query_ptr->as<ASTInsertQuery>();
 
-    const Settings & settings = context_ptr->getSettingsRef();
-    bool null_as_default = query && query->select && context_ptr->getSettingsRef().insert_null_as_default;
-
-    /// We create a pipeline of several streams, into which we will write data.
     Chain out;
 
     /// Keep a reference to the context to make sure it stays alive until the chain is executed and destroyed
@@ -273,19 +288,53 @@ Chain InterpreterInsertQuery::buildChainImpl(
     }
     else
     {
-        out = buildPushingToViewsChain(table, metadata_snapshot, context_ptr, query_ptr, no_destination, thread_status_holder, elapsed_counter_ms);
+        out = buildPushingToViewsChain(table, metadata_snapshot, context_ptr,
+            query_ptr, no_destination,
+            thread_status_holder, running_group, elapsed_counter_ms);
     }
 
+    return out;
+}
+
+Chain InterpreterInsertQuery::buildPreSinkChain(
+    const Block & subsequent_header,
+    const StoragePtr & table,
+    const StorageMetadataPtr & metadata_snapshot,
+    const Block & query_sample_block,
+    ThreadStatusesHolderPtr thread_status_holder)
+{
+    ThreadStatus * thread_status = current_thread;
+
+    if (!thread_status_holder)
+        thread_status = nullptr;
+
+    auto context_ptr = getContext();
+
+    const ASTInsertQuery * query = nullptr;
+    if (query_ptr)
+        query = query_ptr->as<ASTInsertQuery>();
+
+    const Settings & settings = context_ptr->getSettingsRef();
+    bool null_as_default = query && query->select && context_ptr->getSettingsRef().insert_null_as_default;
+
+    /// We create a pipeline of several streams, into which we will write data.
+    Chain out;
+
+    auto input_header = [&]() -> const Block &
+    {
+        return out.empty() ? subsequent_header : out.getInputHeader();
+    };
+
     /// Note that we wrap transforms one on top of another, so we write them in reverse of data processing order.
 
     /// Checking constraints. It must be done after calculation of all defaults, so we can check them on calculated columns.
     if (const auto & constraints = metadata_snapshot->getConstraints(); !constraints.empty())
         out.addSource(std::make_shared<CheckConstraintsTransform>(
-            table->getStorageID(), out.getInputHeader(), metadata_snapshot->getConstraints(), context_ptr));
+            table->getStorageID(), input_header(), metadata_snapshot->getConstraints(), context_ptr));
 
     auto adding_missing_defaults_dag = addMissingDefaults(
         query_sample_block,
-        out.getInputHeader().getNamesAndTypesList(),
+        input_header().getNamesAndTypesList(),
         metadata_snapshot->getColumns(),
         context_ptr,
         null_as_default);
@@ -306,12 +355,12 @@ Chain InterpreterInsertQuery::buildChainImpl(
         bool table_prefers_large_blocks = table->prefersLargeBlocks();
 
         out.addSource(std::make_shared<SquashingChunksTransform>(
-            out.getInputHeader(),
+            input_header(),
             table_prefers_large_blocks ? settings.min_insert_block_size_rows : settings.max_block_size,
             table_prefers_large_blocks ? settings.min_insert_block_size_bytes : 0ULL));
     }
 
-    auto counting = std::make_shared<CountingTransform>(out.getInputHeader(), thread_status, getContext()->getQuota());
+    auto counting = std::make_shared<CountingTransform>(input_header(), thread_status, getContext()->getQuota());
     counting->setProcessListElement(context_ptr->getProcessListElement());
     counting->setProgressCallback(context_ptr->getProgressCallback());
     out.addSource(std::move(counting));
@@ -352,10 +401,20 @@ BlockIO InterpreterInsertQuery::execute()
         // Distributed INSERT SELECT
         distributed_pipeline = table->distributedWrite(query, getContext());
 
-    std::vector<Chain> out_chains;
+    std::vector<Chain> presink_chains;
+    std::vector<Chain> sink_chains;
     if (!distributed_pipeline || query.watch)
     {
-        size_t out_streams_size = 1;
+        /// Number of streams works like this:
+        ///  * For the SELECT, use `max_threads`, or `max_insert_threads`, or whatever
+        ///    InterpreterSelectQuery ends up with.
+        ///  * Use `max_insert_threads` streams for various insert-preparation steps, e.g.
+        ///    materializing and squashing (too slow to do in one thread). That's `presink_chains`.
+        ///  * If the table supports parallel inserts, use the same streams for writing to IStorage.
+        ///    Otherwise ResizeProcessor them down to 1 stream.
+        ///  * If it's not an INSERT SELECT, forget all that and use one stream.
+        size_t pre_streams_size = 1;
+        size_t sink_streams_size = 1;
 
         if (query.select)
         {
@@ -431,10 +490,14 @@ BlockIO InterpreterInsertQuery::execute()
 
             pipeline.dropTotalsAndExtremes();
 
-            if (table->supportsParallelInsert() && settings.max_insert_threads > 1)
-                out_streams_size = std::min(static_cast<size_t>(settings.max_insert_threads), pipeline.getNumStreams());
+            if (settings.max_insert_threads > 1)
+            {
+                pre_streams_size = std::min(static_cast<size_t>(settings.max_insert_threads), pipeline.getNumStreams());
+                if (table->supportsParallelInsert())
+                    sink_streams_size = pre_streams_size;
+            }
 
-            pipeline.resize(out_streams_size);
+            pipeline.resize(pre_streams_size);
 
             /// Allow to insert Nullable into non-Nullable columns, NULL values will be added as defaults values.
             if (getContext()->getSettingsRef().insert_null_as_default)
@@ -461,10 +524,22 @@ BlockIO InterpreterInsertQuery::execute()
             pipeline = interpreter_watch.buildQueryPipeline();
         }
 
-        for (size_t i = 0; i < out_streams_size; ++i)
+        ThreadGroupPtr running_group;
+        if (current_thread)
+            running_group = current_thread->getThreadGroup();
+        if (!running_group)
+            running_group = std::make_shared<ThreadGroup>(getContext());
+        for (size_t i = 0; i < sink_streams_size; ++i)
         {
-            auto out = buildChainImpl(table, metadata_snapshot, query_sample_block, nullptr, nullptr);
-            out_chains.emplace_back(std::move(out));
+            auto out = buildSink(table, metadata_snapshot, /* thread_status_holder= */ nullptr,
+                running_group, /* elapsed_counter_ms= */ nullptr);
+            sink_chains.emplace_back(std::move(out));
+        }
+        for (size_t i = 0; i < pre_streams_size; ++i)
+        {
+            auto out = buildPreSinkChain(sink_chains[0].getInputHeader(), table, metadata_snapshot,
+                query_sample_block, /* thread_status_holder= */ nullptr);
+            presink_chains.emplace_back(std::move(out));
         }
     }
 
@@ -477,7 +552,7 @@ BlockIO InterpreterInsertQuery::execute()
     }
     else if (query.select || query.watch)
     {
-        const auto & header = out_chains.at(0).getInputHeader();
+        const auto & header = presink_chains.at(0).getInputHeader();
         auto actions_dag = ActionsDAG::makeConvertingActions(
                 pipeline.getHeader().getColumnsWithTypeAndName(),
                 header.getColumnsWithTypeAndName(),
@@ -498,10 +573,14 @@ BlockIO InterpreterInsertQuery::execute()
 
         size_t num_select_threads = pipeline.getNumThreads();
 
-        for (auto & chain : out_chains)
+        for (auto & chain : presink_chains)
+            resources = chain.detachResources();
+        for (auto & chain : sink_chains)
             resources = chain.detachResources();
 
-        pipeline.addChains(std::move(out_chains));
+        pipeline.addChains(std::move(presink_chains));
+        pipeline.resize(sink_chains.size());
+        pipeline.addChains(std::move(sink_chains));
 
         if (!settings.parallel_view_processing)
         {
@@ -534,7 +613,8 @@ BlockIO InterpreterInsertQuery::execute()
     }
     else
     {
-        res.pipeline = QueryPipeline(std::move(out_chains.at(0)));
+        presink_chains.at(0).appendChain(std::move(sink_chains.at(0)));
+        res.pipeline = QueryPipeline(std::move(presink_chains[0]));
         res.pipeline.setNumThreads(std::min<size_t>(res.pipeline.getNumThreads(), settings.max_threads));
 
         if (query.hasInlinedData() && !async_insert)
diff --git a/src/Interpreters/InterpreterInsertQuery.h b/src/Interpreters/InterpreterInsertQuery.h
index bb6509a9102..b9a146e5338 100644
--- a/src/Interpreters/InterpreterInsertQuery.h
+++ b/src/Interpreters/InterpreterInsertQuery.h
@@ -4,6 +4,7 @@
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Storages/StorageInMemoryMetadata.h>
+#include <Common/ThreadStatus.h>
 
 namespace DB
 {
@@ -65,12 +66,19 @@ private:
 
     std::vector<std::unique_ptr<ReadBuffer>> owned_buffers;
 
-    Chain buildChainImpl(
+    Chain buildSink(
+        const StoragePtr & table,
+        const StorageMetadataPtr & metadata_snapshot,
+        ThreadStatusesHolderPtr thread_status_holder,
+        ThreadGroupPtr running_group,
+        std::atomic_uint64_t * elapsed_counter_ms);
+
+    Chain buildPreSinkChain(
+        const Block & subsequent_header,
         const StoragePtr & table,
         const StorageMetadataPtr & metadata_snapshot,
         const Block & query_sample_block,
-        ThreadStatusesHolderPtr thread_status_holder,
-        std::atomic_uint64_t * elapsed_counter_ms);
+        ThreadStatusesHolderPtr thread_status_holder);
 };
 
 
diff --git a/src/Interpreters/InterpreterKillQueryQuery.cpp b/src/Interpreters/InterpreterKillQueryQuery.cpp
index 40698386ccb..3330159aff5 100644
--- a/src/Interpreters/InterpreterKillQueryQuery.cpp
+++ b/src/Interpreters/InterpreterKillQueryQuery.cpp
@@ -161,6 +161,8 @@ public:
                 if (curr_process.processed)
                     continue;
 
+                LOG_DEBUG(&Poco::Logger::get("KillQuery"), "Will kill query {} (synchronously)", curr_process.query_id);
+
                 auto code = process_list.sendCancelToQuery(curr_process.query_id, curr_process.user, true);
 
                 if (code != CancellationCode::QueryIsNotInitializedYet && code != CancellationCode::CancelSent)
@@ -226,6 +228,8 @@ BlockIO InterpreterKillQueryQuery::execute()
             MutableColumns res_columns = header.cloneEmptyColumns();
             for (const auto & query_desc : queries_to_stop)
             {
+                if (!query.test)
+                    LOG_DEBUG(&Poco::Logger::get("KillQuery"), "Will kill query {} (asynchronously)", query_desc.query_id);
                 auto code = (query.test) ? CancellationCode::Unknown : process_list.sendCancelToQuery(query_desc.query_id, query_desc.user, true);
                 insertResultRow(query_desc.source_num, code, processes_block, header, res_columns);
             }
diff --git a/src/Interpreters/InterpreterRenameQuery.cpp b/src/Interpreters/InterpreterRenameQuery.cpp
index 01c04999287..75d43b541e1 100644
--- a/src/Interpreters/InterpreterRenameQuery.cpp
+++ b/src/Interpreters/InterpreterRenameQuery.cpp
@@ -136,15 +136,24 @@ BlockIO InterpreterRenameQuery::executeToTables(const ASTRenameQuery & rename, c
                 std::tie(ref_dependencies, loading_dependencies) = database_catalog.removeDependencies(from_table_id, check_ref_deps, check_loading_deps);
             }
 
-            database->renameTable(
-                getContext(),
-                elem.from_table_name,
-                *database_catalog.getDatabase(elem.to_database_name),
-                elem.to_table_name,
-                exchange_tables,
-                rename.dictionary);
+            try
+            {
+                database->renameTable(
+                    getContext(),
+                    elem.from_table_name,
+                    *database_catalog.getDatabase(elem.to_database_name),
+                    elem.to_table_name,
+                    exchange_tables,
+                    rename.dictionary);
 
-            DatabaseCatalog::instance().addDependencies(to_table_id, ref_dependencies, loading_dependencies);
+                DatabaseCatalog::instance().addDependencies(to_table_id, ref_dependencies, loading_dependencies);
+            }
+            catch (...)
+            {
+                /// Restore dependencies if RENAME fails
+                DatabaseCatalog::instance().addDependencies(from_table_id, ref_dependencies, loading_dependencies);
+                throw;
+            }
         }
     }
 
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 318ea5fdf42..a4ea474e4e9 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -13,6 +13,7 @@
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseQuery.h>
+#include <Parsers/FunctionParameterValuesVisitor.h>
 
 #include <Access/Common/AccessFlags.h>
 #include <Access/ContextAccess.h>
@@ -38,6 +39,7 @@
 #include <Interpreters/QueryLog.h>
 #include <Interpreters/replaceAliasColumnsInQuery.h>
 #include <Interpreters/RewriteCountDistinctVisitor.h>
+#include <Interpreters/getCustomKeyFilterForParallelReplicas.h>
 
 #include <QueryPipeline/Pipe.h>
 #include <Processors/QueryPlan/AggregatingStep.h>
@@ -92,11 +94,17 @@
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/checkStackSize.h>
 #include <Common/scope_guard_safe.h>
-#include <Parsers/FunctionParameterValuesVisitor.h>
 #include <Common/typeid_cast.h>
+#include <Common/ProfileEvents.h>
 
 #include "config_version.h"
 
+namespace ProfileEvents
+{
+    extern const Event SelectQueriesWithSubqueries;
+    extern const Event QueriesWithSubqueries;
+}
+
 namespace DB
 {
 
@@ -114,6 +122,8 @@ namespace ErrorCodes
     extern const int INVALID_WITH_FILL_EXPRESSION;
     extern const int ACCESS_DENIED;
     extern const int UNKNOWN_IDENTIFIER;
+    extern const int BAD_ARGUMENTS;
+    extern const int SUPPORT_IS_DISABLED;
 }
 
 /// Assumes `storage` is set and the table filter (row-level security) is not empty.
@@ -148,7 +158,8 @@ FilterDAGInfoPtr generateFilterActions(
     for (const auto & column_str : prerequisite_columns)
     {
         ParserExpression expr_parser;
-        expr_list->children.push_back(parseQuery(expr_parser, column_str, 0, context->getSettingsRef().max_parser_depth));
+        /// We should add back quotes around column name as it can contain dots.
+        expr_list->children.push_back(parseQuery(expr_parser, backQuoteIfNeed(column_str), 0, context->getSettingsRef().max_parser_depth));
     }
 
     select_ast->setExpression(ASTSelectQuery::Expression::TABLES, std::make_shared<ASTTablesInSelectQuery>());
@@ -229,10 +240,13 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 InterpreterSelectQuery::~InterpreterSelectQuery() = default;
 
 
+namespace
+{
+
 /** There are no limits on the maximum size of the result for the subquery.
   *  Since the result of the query is not the result of the entire query.
   */
-static ContextPtr getSubqueryContext(const ContextPtr & context)
+ContextPtr getSubqueryContext(const ContextPtr & context)
 {
     auto subquery_context = Context::createCopy(context);
     Settings subquery_settings = context->getSettings();
@@ -244,7 +258,7 @@ static ContextPtr getSubqueryContext(const ContextPtr & context)
     return subquery_context;
 }
 
-static void rewriteMultipleJoins(ASTPtr & query, const TablesWithColumns & tables, const String & database, const Settings & settings)
+void rewriteMultipleJoins(ASTPtr & query, const TablesWithColumns & tables, const String & database, const Settings & settings)
 {
     ASTSelectQuery & select = query->as<ASTSelectQuery &>();
 
@@ -264,7 +278,7 @@ static void rewriteMultipleJoins(ASTPtr & query, const TablesWithColumns & table
 }
 
 /// Checks that the current user has the SELECT privilege.
-static void checkAccessRightsForSelect(
+void checkAccessRightsForSelect(
     const ContextPtr & context,
     const StorageID & table_id,
     const StorageMetadataPtr & table_metadata,
@@ -294,14 +308,14 @@ static void checkAccessRightsForSelect(
     context->checkAccess(AccessType::SELECT, table_id, syntax_analyzer_result.requiredSourceColumnsForAccessCheck());
 }
 
-static ASTPtr parseAdditionalFilterConditionForTable(
-    const Map & setting,
+ASTPtr parseAdditionalFilterConditionForTable(
+    const Map & additional_table_filters,
     const DatabaseAndTableWithAlias & target,
     const Context & context)
 {
-    for (size_t i = 0; i < setting.size(); ++i)
+    for (const auto & additional_filter : additional_table_filters)
     {
-        const auto & tuple = setting[i].safeGet<const Tuple &>();
+        const auto & tuple = additional_filter.safeGet<const Tuple &>();
         auto & table = tuple.at(0).safeGet<String>();
         auto & filter = tuple.at(1).safeGet<String>();
 
@@ -322,7 +336,7 @@ static ASTPtr parseAdditionalFilterConditionForTable(
 }
 
 /// Returns true if we should ignore quotas and limits for a specified table in the system database.
-static bool shouldIgnoreQuotaAndLimits(const StorageID & table_id)
+bool shouldIgnoreQuotaAndLimits(const StorageID & table_id)
 {
     if (table_id.database_name == DatabaseCatalog::SYSTEM_DATABASE)
     {
@@ -333,6 +347,8 @@ static bool shouldIgnoreQuotaAndLimits(const StorageID & table_id)
     return false;
 }
 
+}
+
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
     const ContextPtr & context_,
@@ -377,6 +393,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
     query_info.ignore_projections = options.ignore_projections;
     query_info.is_projection_query = options.is_projection_query;
+    query_info.is_internal = options.is_internal;
 
     initSettings();
     const Settings & settings = context->getSettingsRef();
@@ -400,6 +417,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         ApplyWithSubqueryVisitor().visit(query_ptr);
     }
 
+    query_info.query = query_ptr->clone();
     query_info.original_query = query_ptr->clone();
 
     if (settings.count_distinct_optimization)
@@ -408,7 +426,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         RewriteCountDistinctFunctionVisitor(data_rewrite_countdistinct).visit(query_ptr);
     }
 
-    JoinedTables joined_tables(getSubqueryContext(context), getSelectQuery(), options.with_all_cols);
+    JoinedTables joined_tables(getSubqueryContext(context), getSelectQuery(), options.with_all_cols, options_.is_create_parameterized_view);
 
     bool got_storage_from_query = false;
     if (!has_input && !storage)
@@ -426,13 +444,15 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         if (!metadata_snapshot)
             metadata_snapshot = storage->getInMemoryMetadataPtr();
 
-        storage_snapshot = storage->getStorageSnapshotForQuery(metadata_snapshot, query_ptr, context);
+        if (options.only_analyze)
+            storage_snapshot = storage->getStorageSnapshotWithoutData(metadata_snapshot, context);
+        else
+            storage_snapshot = storage->getStorageSnapshotForQuery(metadata_snapshot, query_ptr, context);
     }
 
     if (has_input || !joined_tables.resolveTables())
         joined_tables.makeFakeTable(storage, metadata_snapshot, source_header);
 
-
     if (context->getCurrentTransaction() && context->getSettingsRef().throw_on_unsupported_query_inside_transaction)
     {
         if (storage)
@@ -448,10 +468,42 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         }
     }
 
-    if (joined_tables.tablesCount() > 1 && settings.allow_experimental_parallel_reading_from_replicas)
+    /// Check support for JOIN for parallel replicas with custom key
+    if (joined_tables.tablesCount() > 1 && !settings.parallel_replicas_custom_key.value.empty())
     {
-        LOG_WARNING(log, "Joins are not supported with parallel replicas. Query will be executed without using them.");
-        context->setSetting("allow_experimental_parallel_reading_from_replicas", false);
+        LOG_WARNING(log, "JOINs are not supported with parallel_replicas_custom_key. Query will be executed without using them.");
+        context->setSetting("parallel_replicas_custom_key", String{""});
+    }
+
+    /// Check support for FINAL for parallel replicas
+    bool is_query_with_final = isQueryWithFinal(query_info);
+    if (is_query_with_final && (!settings.parallel_replicas_custom_key.value.empty() || settings.allow_experimental_parallel_reading_from_replicas > 0))
+    {
+        if (settings.allow_experimental_parallel_reading_from_replicas == 1)
+        {
+            LOG_WARNING(log, "FINAL modifier is not supported with parallel replicas. Query will be executed without using them.");
+            context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
+            context->setSetting("parallel_replicas_custom_key", String{""});
+        }
+        else if (settings.allow_experimental_parallel_reading_from_replicas == 2)
+        {
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "FINAL modifier is not supported with parallel replicas");
+        }
+    }
+
+    /// Check support for parallel replicas for non-replicated storage (plain MergeTree)
+    bool is_plain_merge_tree = storage && storage->isMergeTree() && !storage->supportsReplication();
+    if (is_plain_merge_tree && settings.allow_experimental_parallel_reading_from_replicas > 0 && !settings.parallel_replicas_for_non_replicated_merge_tree)
+    {
+        if (settings.allow_experimental_parallel_reading_from_replicas == 1)
+        {
+            LOG_WARNING(log, "To use parallel replicas with plain MergeTree tables please enable setting `parallel_replicas_for_non_replicated_merge_tree`. For now query will be executed without using them.");
+            context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
+        }
+        else if (settings.allow_experimental_parallel_reading_from_replicas == 2)
+        {
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "To use parallel replicas with plain MergeTree tables please enable setting `parallel_replicas_for_non_replicated_merge_tree`");
+        }
     }
 
     /// Rewrite JOINs
@@ -509,6 +561,40 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         query_info.additional_filter_ast = parseAdditionalFilterConditionForTable(
             settings.additional_table_filters, joined_tables.tablesWithColumns().front().table, *context);
 
+    ASTPtr parallel_replicas_custom_filter_ast = nullptr;
+    if (storage && context->getParallelReplicasMode() == Context::ParallelReplicasMode::CUSTOM_KEY && !joined_tables.tablesWithColumns().empty())
+    {
+        if (settings.parallel_replicas_count > 1)
+        {
+            if (auto custom_key_ast = parseCustomKeyForTable(settings.parallel_replicas_custom_key, *context))
+            {
+                LOG_TRACE(log, "Processing query on a replica using custom_key '{}'", settings.parallel_replicas_custom_key.value);
+
+                parallel_replicas_custom_filter_ast = getCustomKeyFilterForParallelReplica(
+                    settings.parallel_replicas_count,
+                    settings.parallel_replica_offset,
+                    std::move(custom_key_ast),
+                    settings.parallel_replicas_custom_key_filter_type,
+                    *storage,
+                    context);
+            }
+            else if (settings.parallel_replica_offset > 0)
+            {
+                throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Parallel replicas processing with custom_key has been requested "
+                        "(setting 'max_parallel_replicas') but the table does not have custom_key defined for it "
+                        "or it's invalid (settings `parallel_replicas_custom_key`)");
+            }
+        }
+        else if (auto * distributed = dynamic_cast<StorageDistributed *>(storage.get());
+                 distributed && canUseCustomKey(settings, *distributed->getCluster(), *context))
+        {
+            query_info.use_custom_key = true;
+            context->setSetting("distributed_group_by_no_merge", 2);
+        }
+    }
+
     if (autoFinalOnQuery(query))
     {
         query.setFinal();
@@ -518,7 +604,6 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     {
         /// Allow push down and other optimizations for VIEW: replace with subquery and rewrite it.
         ASTPtr view_table;
-        NameToNameMap parameter_values;
         NameToNameMap parameter_types;
         if (view)
         {
@@ -531,14 +616,13 @@ InterpreterSelectQuery::InterpreterSelectQuery(
             /// and after query is replaced, we use these parameters to substitute in the parameterized view query
             if (query_info.is_parameterized_view)
             {
-                parameter_values = analyzeFunctionParamValues(query_ptr);
-                view->setParameterValues(parameter_values);
-                parameter_types = view->getParameterValues();
+                query_info.parameterized_view_values = analyzeFunctionParamValues(query_ptr);
+                parameter_types = view->getParameterTypes();
             }
             view->replaceWithSubquery(getSelectQuery(), view_table, metadata_snapshot, view->isParameterizedView());
             if (query_info.is_parameterized_view)
             {
-                view->replaceQueryParametersIfParametrizedView(query_ptr);
+                view->replaceQueryParametersIfParametrizedView(query_ptr, query_info.parameterized_view_values);
             }
 
         }
@@ -551,7 +635,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
             required_result_column_names,
             table_join,
             query_info.is_parameterized_view,
-            parameter_values,
+            query_info.parameterized_view_values,
             parameter_types);
 
 
@@ -593,16 +677,15 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
                 Names queried_columns = syntax_analyzer_result->requiredSourceColumns();
                 const auto & supported_prewhere_columns = storage->supportedPrewhereColumns();
-                if (supported_prewhere_columns.has_value())
-                    std::erase_if(queried_columns, [&](const auto & name) { return !supported_prewhere_columns->contains(name); });
 
-                MergeTreeWhereOptimizer{
-                    current_info,
-                    context,
+                MergeTreeWhereOptimizer where_optimizer{
                     std::move(column_compressed_sizes),
                     metadata_snapshot,
                     queried_columns,
+                    supported_prewhere_columns,
                     log};
+
+                where_optimizer.optimize(current_info, context);
             }
         }
 
@@ -694,7 +777,17 @@ InterpreterSelectQuery::InterpreterSelectQuery(
                 query_info.filter_asts.push_back(query_info.additional_filter_ast);
             }
 
-            source_header = storage_snapshot->getSampleBlockForColumns(required_columns, parameter_values);
+            if (parallel_replicas_custom_filter_ast)
+            {
+                parallel_replicas_custom_filter_info = generateFilterActions(
+                        table_id, parallel_replicas_custom_filter_ast, context, storage, storage_snapshot, metadata_snapshot, required_columns,
+                        prepared_sets);
+
+                parallel_replicas_custom_filter_info->do_remove_column = true;
+                query_info.filter_asts.push_back(parallel_replicas_custom_filter_ast);
+            }
+
+            source_header = storage_snapshot->getSampleBlockForColumns(required_columns, query_info.parameterized_view_values);
         }
 
         /// Calculate structure of the result.
@@ -1246,6 +1339,9 @@ static bool hasWithTotalsInAnySubqueryInFromClause(const ASTSelectQuery & query)
 
 void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<Pipe> prepared_pipe)
 {
+    ProfileEvents::increment(ProfileEvents::SelectQueriesWithSubqueries);
+    ProfileEvents::increment(ProfileEvents::QueriesWithSubqueries);
+
     /** Streams of data. When the query is executed in parallel, we have several data streams.
      *  If there is no GROUP BY, then perform all operations before ORDER BY and LIMIT in parallel, then
      *  if there is an ORDER BY, then glue the streams using ResizeProcessor, and then MergeSorting transforms,
@@ -1436,17 +1532,23 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
                 query_plan.addStep(std::move(row_level_security_step));
             }
 
-            if (additional_filter_info)
+            const auto add_filter_step = [&](const auto & new_filter_info, const std::string & description)
             {
-                auto additional_filter_step = std::make_unique<FilterStep>(
+                auto filter_step = std::make_unique<FilterStep>(
                     query_plan.getCurrentDataStream(),
-                    additional_filter_info->actions,
-                    additional_filter_info->column_name,
-                    additional_filter_info->do_remove_column);
+                    new_filter_info->actions,
+                    new_filter_info->column_name,
+                    new_filter_info->do_remove_column);
 
-                additional_filter_step->setStepDescription("Additional filter");
-                query_plan.addStep(std::move(additional_filter_step));
-            }
+                filter_step->setStepDescription(description);
+                query_plan.addStep(std::move(filter_step));
+            };
+
+            if (additional_filter_info)
+                add_filter_step(additional_filter_info, "Additional filter");
+
+            if (parallel_replicas_custom_filter_info)
+                add_filter_step(parallel_replicas_custom_filter_info, "Parallel replica custom key filter");
 
             if (expressions.before_array_join)
             {
@@ -2817,8 +2919,10 @@ void InterpreterSelectQuery::executeMergeSorted(QueryPlan & query_plan, const st
     SortDescription sort_description = getSortDescription(query, context);
     const UInt64 limit = getLimitForSorting(query, context);
     const auto max_block_size = context->getSettingsRef().max_block_size;
+    const auto exact_rows_before_limit = context->getSettingsRef().exact_rows_before_limit;
 
-    auto merging_sorted = std::make_unique<SortingStep>(query_plan.getCurrentDataStream(), std::move(sort_description), max_block_size, limit);
+    auto merging_sorted = std::make_unique<SortingStep>(
+        query_plan.getCurrentDataStream(), std::move(sort_description), max_block_size, limit, exact_rows_before_limit);
     merging_sorted->setStepDescription("Merge sorted streams " + description);
     query_plan.addStep(std::move(merging_sorted));
 }
@@ -2923,20 +3027,27 @@ void InterpreterSelectQuery::executeWithFill(QueryPlan & query_plan)
     auto & query = getSelectQuery();
     if (query.orderBy())
     {
-        SortDescription order_descr = getSortDescription(query, context);
-        SortDescription fill_descr;
-        for (auto & desc : order_descr)
+        SortDescription sort_description = getSortDescription(query, context);
+        SortDescription fill_description;
+        for (auto & desc : sort_description)
         {
             if (desc.with_fill)
-                fill_descr.push_back(desc);
+                fill_description.push_back(desc);
         }
 
-        if (fill_descr.empty())
+        if (fill_description.empty())
             return;
 
         InterpolateDescriptionPtr interpolate_descr =
             getInterpolateDescription(query, source_header, result_header, syntax_analyzer_result->aliases, context);
-        auto filling_step = std::make_unique<FillingStep>(query_plan.getCurrentDataStream(), std::move(fill_descr), interpolate_descr);
+
+        const Settings & settings = context->getSettingsRef();
+        auto filling_step = std::make_unique<FillingStep>(
+            query_plan.getCurrentDataStream(),
+            std::move(sort_description),
+            std::move(fill_description),
+            interpolate_descr,
+            settings.use_with_fill_by_sorting_prefix);
         query_plan.addStep(std::move(filling_step));
     }
 }
@@ -3055,4 +3166,14 @@ void InterpreterSelectQuery::initSettings()
     }
 }
 
+bool InterpreterSelectQuery::isQueryWithFinal(const SelectQueryInfo & info)
+{
+    bool result = info.query->as<ASTSelectQuery &>().final();
+    if (info.table_expression_modifiers)
+        result |= info.table_expression_modifiers->hasFinal();
+
+    return result;
+}
+
+
 }
diff --git a/src/Interpreters/InterpreterSelectQuery.h b/src/Interpreters/InterpreterSelectQuery.h
index 140e10a5f81..e39dd675136 100644
--- a/src/Interpreters/InterpreterSelectQuery.h
+++ b/src/Interpreters/InterpreterSelectQuery.h
@@ -131,6 +131,8 @@ public:
     static SortDescription getSortDescription(const ASTSelectQuery & query, const ContextPtr & context);
     static UInt64 getLimitForSorting(const ASTSelectQuery & query, const ContextPtr & context);
 
+    static bool isQueryWithFinal(const SelectQueryInfo & info);
+
 private:
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
@@ -215,6 +217,9 @@ private:
     /// For additional_filter setting.
     FilterDAGInfoPtr additional_filter_info;
 
+    /// For "per replica" filter when multiple replicas are used
+    FilterDAGInfoPtr parallel_replicas_custom_filter_info;
+
     QueryProcessingStage::Enum from_stage = QueryProcessingStage::FetchColumns;
 
     /// List of columns to read to execute the query.
diff --git a/src/Interpreters/InterpreterSelectQueryAnalyzer.cpp b/src/Interpreters/InterpreterSelectQueryAnalyzer.cpp
index 0536ee10f7c..98f70c25dcd 100644
--- a/src/Interpreters/InterpreterSelectQueryAnalyzer.cpp
+++ b/src/Interpreters/InterpreterSelectQueryAnalyzer.cpp
@@ -226,6 +226,12 @@ BlockIO InterpreterSelectQueryAnalyzer::execute()
     return result;
 }
 
+QueryPlan & InterpreterSelectQueryAnalyzer::getQueryPlan()
+{
+    planner.buildQueryPlanIfNeeded();
+    return planner.getQueryPlan();
+}
+
 QueryPlan && InterpreterSelectQueryAnalyzer::extractQueryPlan() &&
 {
     planner.buildQueryPlanIfNeeded();
diff --git a/src/Interpreters/InterpreterSelectQueryAnalyzer.h b/src/Interpreters/InterpreterSelectQueryAnalyzer.h
index 681a9cfe5a3..1e0ac737536 100644
--- a/src/Interpreters/InterpreterSelectQueryAnalyzer.h
+++ b/src/Interpreters/InterpreterSelectQueryAnalyzer.h
@@ -3,8 +3,6 @@
 #include <Interpreters/IInterpreter.h>
 #include <Interpreters/SelectQueryOptions.h>
 
-#include <Storages/MergeTree/RequestResponse.h>
-#include <Processors/QueryPlan/QueryPlan.h>
 #include <Analyzer/QueryTreePassManager.h>
 #include <Planner/Planner.h>
 #include <Interpreters/Context_fwd.h>
@@ -51,6 +49,8 @@ public:
 
     BlockIO execute() override;
 
+    QueryPlan & getQueryPlan();
+
     QueryPlan && extractQueryPlan() &&;
 
     QueryPipelineBuilder buildQueryPipeline();
@@ -63,12 +63,12 @@ public:
 
     bool ignoreQuota() const override { return select_query_options.ignore_quota; }
 
-    /// Set merge tree read task callback in context and set collaborate_with_initiator in client info
-    void setMergeTreeReadTaskCallbackAndClientInfo(MergeTreeReadTaskCallback && callback);
-
     /// Set number_of_current_replica and count_participating_replicas in client_info
     void setProperClientInfo(size_t replica_number, size_t count_participating_replicas);
 
+    const Planner & getPlanner() const { return planner; }
+    Planner & getPlanner() { return planner; }
+
 private:
     ASTPtr query;
     ContextMutablePtr context;
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
index bfa3d16bf29..2ae74955e4f 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
@@ -2,22 +2,23 @@
 
 #include <Columns/getLeastSuperColumn.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/InterpreterSelectIntersectExceptQuery.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
-#include <Interpreters/InterpreterSelectIntersectExceptQuery.h>
 #include <Interpreters/QueryLog.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
-#include <Parsers/ASTSelectIntersectExceptQuery.h>
 #include <Parsers/queryToString.h>
 #include <Processors/QueryPlan/DistinctStep.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/IQueryPlanStep.h>
-#include <Processors/QueryPlan/QueryPlan.h>
-#include <Processors/QueryPlan/UnionStep.h>
 #include <Processors/QueryPlan/LimitStep.h>
 #include <Processors/QueryPlan/OffsetStep.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/UnionStep.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Common/typeid_cast.h>
 
@@ -106,32 +107,35 @@ InterpreterSelectWithUnionQuery::InterpreterSelectWithUnionQuery(
             const ASTPtr limit_offset_ast = select_query->limitOffset();
             if (limit_offset_ast)
             {
-                limit_offset = limit_offset_ast->as<ASTLiteral &>().value.safeGet<UInt64>();
+                limit_offset = evaluateConstantExpressionAsLiteral(limit_offset_ast, context)->as<ASTLiteral &>().value.safeGet<UInt64>();
                 UInt64 new_limit_offset = settings.offset + limit_offset;
-                limit_offset_ast->as<ASTLiteral &>().value = Field(new_limit_offset);
+                ASTPtr new_limit_offset_ast = std::make_shared<ASTLiteral>(new_limit_offset);
+                select_query->setExpression(ASTSelectQuery::Expression::LIMIT_OFFSET, std::move(new_limit_offset_ast));
             }
             else if (settings.offset)
             {
-                ASTPtr new_limit_offset_ast = std::make_shared<ASTLiteral>(Field(static_cast<UInt64>(settings.offset)));
+                ASTPtr new_limit_offset_ast = std::make_shared<ASTLiteral>(settings.offset.value);
                 select_query->setExpression(ASTSelectQuery::Expression::LIMIT_OFFSET, std::move(new_limit_offset_ast));
             }
 
             const ASTPtr limit_length_ast = select_query->limitLength();
             if (limit_length_ast)
             {
-                limit_length = limit_length_ast->as<ASTLiteral &>().value.safeGet<UInt64>();
+                limit_length = evaluateConstantExpressionAsLiteral(limit_length_ast, context)->as<ASTLiteral &>().value.safeGet<UInt64>();
 
                 UInt64 new_limit_length = 0;
                 if (settings.offset == 0)
-                    new_limit_length = std::min(limit_length, static_cast<UInt64>(settings.limit));
+                    new_limit_length = std::min(limit_length, settings.limit.value);
                 else if (settings.offset < limit_length)
-                    new_limit_length =  settings.limit ? std::min(static_cast<UInt64>(settings.limit), limit_length - settings.offset) : (limit_length - settings.offset);
+                    new_limit_length = settings.limit ? std::min(settings.limit.value, limit_length - settings.offset.value)
+                                                      : (limit_length - settings.offset.value);
 
-                limit_length_ast->as<ASTLiteral &>().value = Field(new_limit_length);
+                ASTPtr new_limit_length_ast = std::make_shared<ASTLiteral>(new_limit_length);
+                select_query->setExpression(ASTSelectQuery::Expression::LIMIT_LENGTH, std::move(new_limit_length_ast));
             }
             else if (settings.limit)
             {
-                ASTPtr new_limit_length_ast = std::make_shared<ASTLiteral>(Field(static_cast<UInt64>(settings.limit)));
+                ASTPtr new_limit_length_ast = std::make_shared<ASTLiteral>(settings.limit.value);
                 select_query->setExpression(ASTSelectQuery::Expression::LIMIT_LENGTH, std::move(new_limit_length_ast));
             }
 
@@ -258,12 +262,12 @@ Block InterpreterSelectWithUnionQuery::getSampleBlock(const ASTPtr & query_ptr_,
 {
     if (!context_->hasQueryContext())
     {
+        SelectQueryOptions options;
         if (is_subquery)
-            return InterpreterSelectWithUnionQuery(query_ptr_, context_, SelectQueryOptions().subquery().analyze()).getSampleBlock();
-        else if (is_create_parameterized_view)
-            return InterpreterSelectWithUnionQuery(query_ptr_, context_, SelectQueryOptions().createParameterizedView().analyze()).getSampleBlock();
-        else
-            return InterpreterSelectWithUnionQuery(query_ptr_, context_, SelectQueryOptions().analyze()).getSampleBlock();
+            options = options.subquery();
+        if (is_create_parameterized_view)
+            options = options.createParameterizedView();
+        return InterpreterSelectWithUnionQuery(query_ptr_, context_, std::move(options.analyze())).getSampleBlock();
     }
 
     auto & cache = context_->getSampleBlockCache();
@@ -274,21 +278,12 @@ Block InterpreterSelectWithUnionQuery::getSampleBlock(const ASTPtr & query_ptr_,
         return cache[key];
     }
 
+    SelectQueryOptions options;
     if (is_subquery)
-    {
-        return cache[key]
-            = InterpreterSelectWithUnionQuery(query_ptr_, context_, SelectQueryOptions().subquery().analyze()).getSampleBlock();
-    }
-    else if (is_create_parameterized_view)
-    {
-        return cache[key]
-            = InterpreterSelectWithUnionQuery(query_ptr_, context_, SelectQueryOptions().createParameterizedView().analyze())
-            .getSampleBlock();
-    }
-    else
-    {
-        return cache[key] = InterpreterSelectWithUnionQuery(query_ptr_, context_, SelectQueryOptions().analyze()).getSampleBlock();
-    }
+        options = options.subquery();
+    if (is_create_parameterized_view)
+        options = options.createParameterizedView();
+    return cache[key] = InterpreterSelectWithUnionQuery(query_ptr_, context_, std::move(options.analyze())).getSampleBlock();
 }
 
 
diff --git a/src/Interpreters/InterpreterSetQuery.cpp b/src/Interpreters/InterpreterSetQuery.cpp
index 2c8611ffb63..c25de7c55ea 100644
--- a/src/Interpreters/InterpreterSetQuery.cpp
+++ b/src/Interpreters/InterpreterSetQuery.cpp
@@ -1,6 +1,12 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterSetQuery.h>
+#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTExplainQuery.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTQueryWithOutput.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 
 namespace DB
 {
@@ -26,4 +32,59 @@ void InterpreterSetQuery::executeForCurrentContext()
     getContext()->resetSettingsToDefaultValue(ast.default_settings);
 }
 
+static void applySettingsFromSelectWithUnion(const ASTSelectWithUnionQuery & select_with_union, ContextMutablePtr context)
+{
+    const ASTs & children = select_with_union.list_of_selects->children;
+    if (children.empty())
+        return;
+
+    // We might have an arbitrarily complex UNION tree, so just give
+    // up if the last first-order child is not a plain SELECT.
+    // It is flattened later, when we process UNION ALL/DISTINCT.
+    const auto * last_select = children.back()->as<ASTSelectQuery>();
+    if (last_select && last_select->settings())
+    {
+        InterpreterSetQuery(last_select->settings(), context).executeForCurrentContext();
+    }
+}
+
+void InterpreterSetQuery::applySettingsFromQuery(const ASTPtr & ast, ContextMutablePtr context_)
+{
+    if (!ast)
+        return;
+
+    if (const auto * select_query = ast->as<ASTSelectQuery>())
+    {
+        if (auto new_settings = select_query->settings())
+            InterpreterSetQuery(new_settings, context_).executeForCurrentContext();
+    }
+    else if (const auto * select_with_union_query = ast->as<ASTSelectWithUnionQuery>())
+    {
+        applySettingsFromSelectWithUnion(*select_with_union_query, context_);
+    }
+    else if (const auto * explain_query = ast->as<ASTExplainQuery>())
+    {
+        applySettingsFromQuery(explain_query->getExplainedQuery(), context_);
+    }
+    else if (const auto * query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get()))
+    {
+        if (query_with_output->settings_ast)
+            InterpreterSetQuery(query_with_output->settings_ast, context_).executeForCurrentContext();
+
+        if (const auto * create_query = ast->as<ASTCreateQuery>())
+        {
+            if (create_query->select)
+            {
+                applySettingsFromSelectWithUnion(create_query->select->as<ASTSelectWithUnionQuery &>(), context_);
+            }
+        }
+    }
+    else if (auto * insert_query = ast->as<ASTInsertQuery>())
+    {
+        context_->setInsertFormat(insert_query->format);
+        if (insert_query->settings_ast)
+            InterpreterSetQuery(insert_query->settings_ast, context_).executeForCurrentContext();
+    }
+}
+
 }
diff --git a/src/Interpreters/InterpreterSetQuery.h b/src/Interpreters/InterpreterSetQuery.h
index 39d331100d6..bcd4022f9bb 100644
--- a/src/Interpreters/InterpreterSetQuery.h
+++ b/src/Interpreters/InterpreterSetQuery.h
@@ -27,6 +27,9 @@ public:
 
     bool supportsTransactions() const override { return true; }
 
+    /// To apply SETTINGS clauses from query as early as possible
+    static void applySettingsFromQuery(const ASTPtr & ast, ContextMutablePtr context_);
+
 private:
     ASTPtr query_ptr;
 };
diff --git a/src/Interpreters/InterpreterShowColumnsQuery.cpp b/src/Interpreters/InterpreterShowColumnsQuery.cpp
new file mode 100644
index 00000000000..c86d3c753c4
--- /dev/null
+++ b/src/Interpreters/InterpreterShowColumnsQuery.cpp
@@ -0,0 +1,98 @@
+#include <Interpreters/InterpreterShowColumnsQuery.h>
+
+#include <Common/quoteString.h>
+#include <IO/Operators.h>
+#include <IO/WriteBufferFromString.h>
+#include <Parsers/ASTShowColumnsQuery.h>
+#include <Parsers/formatAST.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/executeQuery.h>
+
+
+namespace DB
+{
+
+
+InterpreterShowColumnsQuery::InterpreterShowColumnsQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
+    : WithMutableContext(context_)
+    , query_ptr(query_ptr_)
+{
+}
+
+
+String InterpreterShowColumnsQuery::getRewrittenQuery()
+{
+    const auto & query = query_ptr->as<ASTShowColumnsQuery &>();
+
+    WriteBufferFromOwnString buf_database;
+    String resolved_database = getContext()->resolveDatabase(query.database);
+    writeEscapedString(resolved_database, buf_database);
+    String database = buf_database.str();
+
+    WriteBufferFromOwnString buf_table;
+    writeEscapedString(query.table, buf_table);
+    String table = buf_table.str();
+
+    String rewritten_query = R"(
+SELECT
+    name AS field,
+    type AS type,
+    startsWith(type, 'Nullable') AS null,
+    trim(concatWithSeparator(' ', if (is_in_primary_key, 'PRI', ''), if (is_in_sorting_key, 'SOR', ''))) AS key,
+    if (default_kind IN ('ALIAS', 'DEFAULT', 'MATERIALIZED'), default_expression, NULL) AS default,
+    '' AS extra )";
+
+    // TODO Interpret query.extended. It is supposed to show internal/virtual columns. Need to fetch virtual column names, see
+    // IStorage::getVirtuals(). We can't easily do that via SQL.
+
+    if (query.full)
+    {
+        /// "Full" mode is mostly for MySQL compat
+        /// - collation: no such thing in ClickHouse
+        /// - comment
+        /// - privileges: <not implemented, TODO ask system.grants>
+        rewritten_query += R"(,
+    NULL AS collation,
+    comment,
+    '' AS privileges )";
+    }
+
+    rewritten_query += fmt::format(R"(
+FROM system.columns
+WHERE
+    database = '{}'
+    AND table = '{}' )", database, table);
+
+    if (!query.like.empty())
+    {
+        rewritten_query += " AND name ";
+        if (query.not_like)
+            rewritten_query += "NOT ";
+        if (query.case_insensitive_like)
+            rewritten_query += "ILIKE ";
+        else
+            rewritten_query += "LIKE ";
+        rewritten_query += fmt::format("'{}'", query.like);
+    }
+    else if (query.where_expression)
+        rewritten_query += fmt::format(" AND ({})", query.where_expression);
+
+    /// Sorting is strictly speaking not necessary but 1. it is convenient for users, 2. SQL currently does not allow to
+    /// sort the output of SHOW COLUMNS otherwise (SELECT * FROM (SHOW COLUMNS ...) ORDER BY ...) is rejected) and 3. some
+    /// SQL tests can take advantage of this.
+    rewritten_query += " ORDER BY field, type, null, key, default, extra";
+
+    if (query.limit_length)
+        rewritten_query += fmt::format(" LIMIT {}", query.limit_length);
+
+    return rewritten_query;
+}
+
+
+BlockIO InterpreterShowColumnsQuery::execute()
+{
+    return executeQuery(getRewrittenQuery(), getContext(), true);
+}
+
+
+}
diff --git a/src/Interpreters/InterpreterShowColumnsQuery.h b/src/Interpreters/InterpreterShowColumnsQuery.h
new file mode 100644
index 00000000000..ee6dcabd97b
--- /dev/null
+++ b/src/Interpreters/InterpreterShowColumnsQuery.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <Interpreters/IInterpreter.h>
+#include <Parsers/IAST_fwd.h>
+
+
+namespace DB
+{
+
+class Context;
+
+
+/// Returns a list of columns which meet some conditions.
+class InterpreterShowColumnsQuery : public IInterpreter, WithMutableContext
+{
+public:
+    InterpreterShowColumnsQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_);
+
+    BlockIO execute() override;
+
+    /// Ignore quota and limits here because execute() produces a SELECT query which checks quotas/limits by itself.
+    bool ignoreQuota() const override { return true; }
+    bool ignoreLimits() const override { return true; }
+
+private:
+    ASTPtr query_ptr;
+
+    String getRewrittenQuery();
+};
+
+
+}
diff --git a/src/Interpreters/InterpreterShowCreateQuery.cpp b/src/Interpreters/InterpreterShowCreateQuery.cpp
index 5e1b74681fe..0d60f13af66 100644
--- a/src/Interpreters/InterpreterShowCreateQuery.cpp
+++ b/src/Interpreters/InterpreterShowCreateQuery.cpp
@@ -9,6 +9,7 @@
 #include <Common/typeid_cast.h>
 #include <Access/Common/AccessFlags.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/formatWithPossiblyHidingSecrets.h>
 #include <Interpreters/InterpreterShowCreateQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 
@@ -94,10 +95,8 @@ QueryPipeline InterpreterShowCreateQuery::executeImpl()
         create.to_inner_uuid = UUIDHelpers::Nil;
     }
 
-    String res = create_query->formatWithSecretsHidden(/* max_length= */ 0, /* one_line= */ false);
-
     MutableColumnPtr column = ColumnString::create();
-    column->insert(res);
+    column->insert(format({.ctx = getContext(), .query = *create_query, .one_line = false}));
 
     return QueryPipeline(std::make_shared<SourceFromSingleChunk>(Block{{
         std::move(column),
diff --git a/src/Interpreters/InterpreterShowEngineQuery.cpp b/src/Interpreters/InterpreterShowEngineQuery.cpp
index 5aae6ad5d28..8fd829f39ec 100644
--- a/src/Interpreters/InterpreterShowEngineQuery.cpp
+++ b/src/Interpreters/InterpreterShowEngineQuery.cpp
@@ -12,7 +12,7 @@ namespace DB
 
 BlockIO InterpreterShowEnginesQuery::execute()
 {
-    return executeQuery("SELECT * FROM system.table_engines", getContext(), true);
+    return executeQuery("SELECT * FROM system.table_engines ORDER BY name", getContext(), true);
 }
 
 }
diff --git a/src/Interpreters/InterpreterShowIndexesQuery.cpp b/src/Interpreters/InterpreterShowIndexesQuery.cpp
new file mode 100644
index 00000000000..51311c82eeb
--- /dev/null
+++ b/src/Interpreters/InterpreterShowIndexesQuery.cpp
@@ -0,0 +1,100 @@
+#include <Interpreters/InterpreterShowIndexesQuery.h>
+
+#include <Common/quoteString.h>
+#include <IO/Operators.h>
+#include <IO/WriteBufferFromString.h>
+#include <Parsers/ASTShowIndexesQuery.h>
+#include <Parsers/formatAST.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/executeQuery.h>
+
+
+namespace DB
+{
+
+
+InterpreterShowIndexesQuery::InterpreterShowIndexesQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
+    : WithMutableContext(context_)
+    , query_ptr(query_ptr_)
+{
+}
+
+
+String InterpreterShowIndexesQuery::getRewrittenQuery()
+{
+    const auto & query = query_ptr->as<ASTShowIndexesQuery &>();
+
+    WriteBufferFromOwnString buf_table;
+    writeEscapedString(query.table, buf_table);
+    String table = buf_table.str();
+
+    WriteBufferFromOwnString buf_database;
+    String resolved_database = getContext()->resolveDatabase(query.database);
+    writeEscapedString(resolved_database, buf_database);
+    String database = buf_database.str();
+
+    String where_expression = query.where_expression ? fmt::format("WHERE ({})", query.where_expression) : "";
+
+    String rewritten_query = fmt::format(R"(
+SELECT *
+FROM (
+        (SELECT
+            name AS table,
+            0 AS non_unique,
+            'PRIMARY' AS key_name,
+            NULL AS seq_in_index,
+            NULL AS column_name,
+            'A' AS collation,
+            NULL AS cardinality,
+            NULL AS sub_part,
+            NULL AS packed,
+            NULL AS null,
+            'primary' AS index_type,
+            NULL AS comment,
+            NULL AS index_comment,
+            'YES' AS visible,
+            primary_key AS expression
+        FROM system.tables
+        WHERE
+            database = '{0}'
+            AND name = '{1}')
+    UNION ALL (
+        SELECT
+            table AS table,
+            0 AS non_unique,
+            name AS key_name,
+            NULL AS seq_in_index,
+            NULL AS column_name,
+            NULL AS collation,
+            NULL AS cardinality,
+            NULL AS sub_part,
+            NULL AS packed,
+            NULL AS null,
+            type AS index_type,
+            NULL AS comment,
+            NULL AS index_comment,
+            'YES' AS visible,
+            expr AS expression
+        FROM system.data_skipping_indices
+        WHERE
+            database = '{0}'
+            AND table = '{1}'))
+{2}
+ORDER BY index_type, expression;)", database, table, where_expression);
+
+    /// Sorting is strictly speaking not necessary but 1. it is convenient for users, 2. SQL currently does not allow to
+    /// sort the output of SHOW INDEXES otherwise (SELECT * FROM (SHOW INDEXES ...) ORDER BY ...) is rejected) and 3. some
+    /// SQL tests can take advantage of this.
+
+    return rewritten_query;
+}
+
+
+BlockIO InterpreterShowIndexesQuery::execute()
+{
+    return executeQuery(getRewrittenQuery(), getContext(), true);
+}
+
+
+}
+
diff --git a/src/Interpreters/InterpreterShowIndexesQuery.h b/src/Interpreters/InterpreterShowIndexesQuery.h
new file mode 100644
index 00000000000..0b4fa591e35
--- /dev/null
+++ b/src/Interpreters/InterpreterShowIndexesQuery.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <Interpreters/IInterpreter.h>
+#include <Parsers/IAST_fwd.h>
+
+
+namespace DB
+{
+
+class Context;
+
+
+/// Returns a list of indexes which meet some conditions.
+class InterpreterShowIndexesQuery : public IInterpreter, WithMutableContext
+{
+public:
+    InterpreterShowIndexesQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_);
+
+    BlockIO execute() override;
+
+    /// Ignore quota and limits here because execute() produces a SELECT query which checks quotas/limits by itself.
+    bool ignoreQuota() const override { return true; }
+    bool ignoreLimits() const override { return true; }
+
+private:
+    ASTPtr query_ptr;
+
+    String getRewrittenQuery();
+};
+
+
+}
+
diff --git a/src/Interpreters/InterpreterShowProcesslistQuery.cpp b/src/Interpreters/InterpreterShowProcesslistQuery.cpp
index 780ba688a89..f9241368a8f 100644
--- a/src/Interpreters/InterpreterShowProcesslistQuery.cpp
+++ b/src/Interpreters/InterpreterShowProcesslistQuery.cpp
@@ -12,7 +12,7 @@ namespace DB
 
 BlockIO InterpreterShowProcesslistQuery::execute()
 {
-    return executeQuery("SELECT * FROM system.processes", getContext(), true);
+    return executeQuery("SELECT * FROM system.processes ORDER BY elapsed DESC", getContext(), true);
 }
 
 }
diff --git a/src/Interpreters/InterpreterShowTablesQuery.cpp b/src/Interpreters/InterpreterShowTablesQuery.cpp
index 4e0dfdc9236..2f1a4a32bee 100644
--- a/src/Interpreters/InterpreterShowTablesQuery.cpp
+++ b/src/Interpreters/InterpreterShowTablesQuery.cpp
@@ -1,4 +1,4 @@
-#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
 #include <Parsers/ASTShowTablesQuery.h>
 #include <Parsers/formatAST.h>
 #include <Interpreters/Context.h>
@@ -24,11 +24,11 @@ namespace ErrorCodes
 
 
 InterpreterShowTablesQuery::InterpreterShowTablesQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
-    : WithMutableContext(context_), query_ptr(query_ptr_)
+    : WithMutableContext(context_)
+    , query_ptr(query_ptr_)
 {
 }
 
-
 String InterpreterShowTablesQuery::getRewrittenQuery()
 {
     const auto & query = query_ptr->as<ASTShowTablesQuery &>();
@@ -51,6 +51,9 @@ String InterpreterShowTablesQuery::getRewrittenQuery()
         if (query.limit_length)
             rewritten_query << " LIMIT " << query.limit_length;
 
+        /// (*)
+        rewritten_query << " ORDER BY name";
+
         return rewritten_query.str();
     }
 
@@ -69,6 +72,9 @@ String InterpreterShowTablesQuery::getRewrittenQuery()
                 << DB::quote << query.like;
         }
 
+        /// (*)
+        rewritten_query << " ORDER BY cluster";
+
         if (query.limit_length)
             rewritten_query << " LIMIT " << query.limit_length;
 
@@ -81,6 +87,9 @@ String InterpreterShowTablesQuery::getRewrittenQuery()
 
         rewritten_query << " WHERE cluster = " << DB::quote << query.cluster_str;
 
+        /// (*)
+        rewritten_query << " ORDER BY cluster, shard_num, replica_num, host_name, host_address, port";
+
         return rewritten_query.str();
     }
 
@@ -101,6 +110,9 @@ String InterpreterShowTablesQuery::getRewrittenQuery()
                 << DB::quote << query.like;
         }
 
+        /// (*)
+        rewritten_query << " ORDER BY name, type, value ";
+
         return rewritten_query.str();
     }
 
@@ -146,6 +158,9 @@ String InterpreterShowTablesQuery::getRewrittenQuery()
     else if (query.where_expression)
         rewritten_query << " AND (" << query.where_expression << ")";
 
+        /// (*)
+    rewritten_query << " ORDER BY name ";
+
     if (query.limit_length)
         rewritten_query << " LIMIT " << query.limit_length;
 
@@ -162,7 +177,7 @@ BlockIO InterpreterShowTablesQuery::execute()
 
         Block sample_block{ColumnWithTypeAndName(std::make_shared<DataTypeString>(), "Caches")};
         MutableColumns res_columns = sample_block.cloneEmptyColumns();
-        auto caches = FileCacheFactory::instance().getAllByName();
+        auto caches = FileCacheFactory::instance().getAll();
         for (const auto & [name, _] : caches)
             res_columns[0]->insert(name);
         BlockIO res;
@@ -176,5 +191,8 @@ BlockIO InterpreterShowTablesQuery::execute()
     return executeQuery(getRewrittenQuery(), getContext(), true);
 }
 
+/// (*) Sorting is strictly speaking not necessary but 1. it is convenient for users, 2. SQL currently does not allow to
+///     sort the output of SHOW <INFO> otherwise (SELECT * FROM (SHOW <INFO> ...) ORDER BY ...) is rejected) and 3. some
+///     SQL tests can take advantage of this.
 
 }
diff --git a/src/Interpreters/InterpreterShowTablesQuery.h b/src/Interpreters/InterpreterShowTablesQuery.h
index 16fc9ef2cf4..2693e5b08ed 100644
--- a/src/Interpreters/InterpreterShowTablesQuery.h
+++ b/src/Interpreters/InterpreterShowTablesQuery.h
@@ -20,8 +20,7 @@ public:
 
     BlockIO execute() override;
 
-    /// We ignore the quota and limits here because execute() will rewrite a show query as a SELECT query and then
-    /// the SELECT query will checks the quota and limits.
+    /// Ignore quota and limits here because execute() produces a SELECT query which checks quotas/limits by itself.
     bool ignoreQuota() const override { return true; }
     bool ignoreLimits() const override { return true; }
 
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index 66ab8e43f7e..f2d011b12d1 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -7,6 +7,8 @@
 #include <Common/ThreadPool.h>
 #include <Common/escapeForFileName.h>
 #include <Common/ShellCommand.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/FailPoint.h>
 #include <Interpreters/Cache/FileCacheFactory.h>
 #include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Context.h>
@@ -64,6 +66,12 @@
 
 #include "config.h"
 
+namespace CurrentMetrics
+{
+    extern const Metric RestartReplicaThreads;
+    extern const Metric RestartReplicaThreadsActive;
+}
+
 namespace DB
 {
 
@@ -352,16 +360,17 @@ BlockIO InterpreterSystemQuery::execute()
         case Type::DROP_FILESYSTEM_CACHE:
         {
             getContext()->checkAccess(AccessType::SYSTEM_DROP_FILESYSTEM_CACHE);
-            if (query.filesystem_cache_path.empty())
+
+            if (query.filesystem_cache_name.empty())
             {
                 auto caches = FileCacheFactory::instance().getAll();
                 for (const auto & [_, cache_data] : caches)
-                    cache_data->cache->removeIfReleasable();
+                    cache_data->cache->removeAllReleasable();
             }
             else
             {
-                auto cache = FileCacheFactory::instance().get(query.filesystem_cache_path);
-                cache->removeIfReleasable();
+                auto cache = FileCacheFactory::instance().getByName(query.filesystem_cache_name).cache;
+                cache->removeAllReleasable();
             }
             break;
         }
@@ -509,7 +518,7 @@ BlockIO InterpreterSystemQuery::execute()
             dropDatabaseReplica(query);
             break;
         case Type::SYNC_REPLICA:
-            syncReplica();
+            syncReplica(query);
             break;
         case Type::SYNC_DATABASE_REPLICA:
             syncReplicatedDatabase(query);
@@ -574,6 +583,18 @@ BlockIO InterpreterSystemQuery::execute()
             result = Unfreezer(getContext()).systemUnfreeze(query.backup_name);
             break;
         }
+        case Type::ENABLE_FAILPOINT:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_FAILPOINT);
+            FailPointInjection::enableFailPoint(query.fail_point_name);
+            break;
+        }
+        case Type::DISABLE_FAILPOINT:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_FAILPOINT);
+            FailPointInjection::disableFailPoint(query.fail_point_name);
+            break;
+        }
         default:
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown type of SYSTEM query");
     }
@@ -597,6 +618,7 @@ void InterpreterSystemQuery::restoreReplica()
 
 StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica, ContextMutablePtr system_context, bool need_ddl_guard)
 {
+    LOG_TRACE(log, "Restarting replica {}", replica);
     auto table_ddl_guard = need_ddl_guard
         ? DatabaseCatalog::instance().getDDLGuard(replica.getDatabaseName(), replica.getTableName())
         : nullptr;
@@ -640,6 +662,7 @@ StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica,
     database->attachTable(system_context, replica.table_name, table, data_path);
 
     table->startup();
+    LOG_TRACE(log, "Restarted replica {}", replica);
     return table;
 }
 
@@ -685,11 +708,12 @@ void InterpreterSystemQuery::restartReplicas(ContextMutablePtr system_context)
     for (auto & guard : guards)
         guard.second = catalog.getDDLGuard(guard.first.database_name, guard.first.table_name);
 
-    ThreadPool pool(std::min(static_cast<size_t>(getNumberOfPhysicalCPUCores()), replica_names.size()));
+    size_t threads = std::min(static_cast<size_t>(getNumberOfPhysicalCPUCores()), replica_names.size());
+    LOG_DEBUG(log, "Will restart {} replicas using {} threads", replica_names.size(), threads);
+    ThreadPool pool(CurrentMetrics::RestartReplicaThreads, CurrentMetrics::RestartReplicaThreadsActive, threads);
 
     for (auto & replica : replica_names)
     {
-        LOG_TRACE(log, "Restarting replica on {}", replica.getNameForLogs());
         pool.scheduleOrThrowOnError([&]() { tryRestartReplica(replica, system_context, false); });
     }
     pool.wait();
@@ -789,7 +813,6 @@ bool InterpreterSystemQuery::dropReplicaImpl(ASTSystemQuery & query, const Stora
         return false;
 
     ReplicatedTableStatus status;
-    auto zookeeper = getContext()->getZooKeeper();
     storage_replicated->getStatus(status);
 
     /// Do not allow to drop local replicas and active remote replicas
@@ -798,13 +821,7 @@ bool InterpreterSystemQuery::dropReplicaImpl(ASTSystemQuery & query, const Stora
                         "We can't drop local replica, please use `DROP TABLE` if you want "
                         "to clean the data and drop this replica");
 
-    /// NOTE it's not atomic: replica may become active after this check, but before dropReplica(...)
-    /// However, the main use case is to drop dead replica, which cannot become active.
-    /// This check prevents only from accidental drop of some other replica.
-    if (zookeeper->exists(status.zookeeper_path + "/replicas/" + query.replica + "/is_active"))
-        throw Exception(ErrorCodes::TABLE_WAS_NOT_DROPPED, "Can't drop replica: {}, because it's active", query.replica);
-
-    storage_replicated->dropReplica(zookeeper, status.zookeeper_path, query.replica, log);
+    storage_replicated->dropReplica(status.zookeeper_path, query.replica, log);
     LOG_TRACE(log, "Dropped replica {} of {}", query.replica, table->getStorageID().getNameForLogs());
 
     return true;
@@ -815,11 +832,13 @@ void InterpreterSystemQuery::dropDatabaseReplica(ASTSystemQuery & query)
     if (query.replica.empty())
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Replica name is empty");
 
-    auto check_not_local_replica = [](const DatabaseReplicated * replicated, const ASTSystemQuery & query)
+    auto check_not_local_replica = [](const DatabaseReplicated * replicated, const ASTSystemQuery & query_)
     {
-        if (!query.replica_zk_path.empty() && fs::path(replicated->getZooKeeperPath()) != fs::path(query.replica_zk_path))
+        if (!query_.replica_zk_path.empty() && fs::path(replicated->getZooKeeperPath()) != fs::path(query_.replica_zk_path))
             return;
-        if (replicated->getFullReplicaName() != query.replica)
+        String full_replica_name = query_.shard.empty() ? query_.replica
+                                                        : DatabaseReplicated::getFullReplicaName(query_.shard, query_.replica);
+        if (replicated->getFullReplicaName() != full_replica_name)
             return;
 
         throw Exception(ErrorCodes::TABLE_WAS_NOT_DROPPED, "There is a local database {}, which has the same path in ZooKeeper "
@@ -834,7 +853,7 @@ void InterpreterSystemQuery::dropDatabaseReplica(ASTSystemQuery & query)
         if (auto * replicated = dynamic_cast<DatabaseReplicated *>(database.get()))
         {
             check_not_local_replica(replicated, query);
-            DatabaseReplicated::dropReplica(replicated, replicated->getZooKeeperPath(), query.replica);
+            DatabaseReplicated::dropReplica(replicated, replicated->getZooKeeperPath(), query.shard, query.replica);
         }
         else
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Database {} is not Replicated, cannot drop replica", query.getDatabase());
@@ -859,7 +878,7 @@ void InterpreterSystemQuery::dropDatabaseReplica(ASTSystemQuery & query)
             }
 
             check_not_local_replica(replicated, query);
-            DatabaseReplicated::dropReplica(replicated, replicated->getZooKeeperPath(), query.replica);
+            DatabaseReplicated::dropReplica(replicated, replicated->getZooKeeperPath(), query.shard, query.replica);
             LOG_TRACE(log, "Dropped replica {} of Replicated database {}", query.replica, backQuoteIfNeed(database->getDatabaseName()));
         }
     }
@@ -872,14 +891,14 @@ void InterpreterSystemQuery::dropDatabaseReplica(ASTSystemQuery & query)
             if (auto * replicated = dynamic_cast<DatabaseReplicated *>(elem.second.get()))
                 check_not_local_replica(replicated, query);
 
-        DatabaseReplicated::dropReplica(nullptr, query.replica_zk_path, query.replica);
+        DatabaseReplicated::dropReplica(nullptr, query.replica_zk_path, query.shard, query.replica);
         LOG_INFO(log, "Dropped replica {} of Replicated database with path {}", query.replica, query.replica_zk_path);
     }
     else
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid query");
 }
 
-void InterpreterSystemQuery::syncReplica()
+void InterpreterSystemQuery::syncReplica(ASTSystemQuery & query)
 {
     getContext()->checkAccess(AccessType::SYSTEM_SYNC_REPLICA, table_id);
     StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
@@ -887,7 +906,8 @@ void InterpreterSystemQuery::syncReplica()
     if (auto * storage_replicated = dynamic_cast<StorageReplicatedMergeTree *>(table.get()))
     {
         LOG_TRACE(log, "Synchronizing entries in replica's queue with table's log and waiting for current last entry to be processed");
-        if (!storage_replicated->waitForProcessingQueue(getContext()->getSettingsRef().receive_timeout.totalMilliseconds()))
+        auto sync_timeout = getContext()->getSettingsRef().receive_timeout.totalMilliseconds();
+        if (!storage_replicated->waitForProcessingQueue(sync_timeout, query.sync_replica_mode))
         {
             LOG_ERROR(log, "SYNC REPLICA {}: Timed out!", table_id.getNameForLogs());
             throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "SYNC REPLICA {}: command timed out. " \
@@ -1163,6 +1183,8 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
         case Type::START_LISTEN_QUERIES:
         case Type::STOP_THREAD_FUZZER:
         case Type::START_THREAD_FUZZER:
+        case Type::ENABLE_FAILPOINT:
+        case Type::DISABLE_FAILPOINT:
         case Type::UNKNOWN:
         case Type::END: break;
     }
diff --git a/src/Interpreters/InterpreterSystemQuery.h b/src/Interpreters/InterpreterSystemQuery.h
index df06a2fa4ef..8a1cdaf8edd 100644
--- a/src/Interpreters/InterpreterSystemQuery.h
+++ b/src/Interpreters/InterpreterSystemQuery.h
@@ -56,7 +56,7 @@ private:
 
     void restartReplica(const StorageID & replica, ContextMutablePtr system_context);
     void restartReplicas(ContextMutablePtr system_context);
-    void syncReplica();
+    void syncReplica(ASTSystemQuery & query);
     void waitLoadingParts();
 
     void syncReplicatedDatabase(ASTSystemQuery & query);
diff --git a/src/Interpreters/InterpreterUndropQuery.cpp b/src/Interpreters/InterpreterUndropQuery.cpp
new file mode 100644
index 00000000000..72b8e7eba4f
--- /dev/null
+++ b/src/Interpreters/InterpreterUndropQuery.cpp
@@ -0,0 +1,80 @@
+#include <Interpreters/Context.h>
+#include <Interpreters/executeDDLQueryOnCluster.h>
+#include <Interpreters/InterpreterUndropQuery.h>
+#include <Access/Common/AccessRightsElement.h>
+#include <Parsers/ASTUndropQuery.h>
+
+#include "config.h"
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int TABLE_ALREADY_EXISTS;
+    extern const int SUPPORT_IS_DISABLED;
+}
+
+InterpreterUndropQuery::InterpreterUndropQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_)
+{
+}
+
+
+BlockIO InterpreterUndropQuery::execute()
+{
+    if (!getContext()->getSettingsRef().allow_experimental_undrop_table_query)
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+                        "Undrop table is experimental. "
+                        "Set `allow_experimental_undrop_table_query` setting to enable it");
+
+    getContext()->checkAccess(AccessType::UNDROP_TABLE);
+    auto & undrop = query_ptr->as<ASTUndropQuery &>();
+    if (!undrop.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
+    {
+        DDLQueryOnClusterParams params;
+        params.access_to_check = getRequiredAccessForDDLOnCluster();
+        return executeDDLQueryOnCluster(query_ptr, getContext(), params);
+    }
+
+    if (undrop.table)
+        return executeToTable(undrop);
+    else
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Nothing to undrop, both names are empty");
+}
+
+BlockIO InterpreterUndropQuery::executeToTable(ASTUndropQuery & query)
+{
+    auto table_id = StorageID(query);
+
+    auto context = getContext();
+    if (table_id.database_name.empty())
+    {
+        table_id.database_name = context->getCurrentDatabase();
+        query.setDatabase(table_id.database_name);
+    }
+
+    auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name);
+
+    auto database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
+    if (database->getEngineName() == "Replicated")
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Replicated database does not support UNDROP query");
+    if (database->isTableExist(table_id.table_name, getContext()))
+        throw Exception(
+            ErrorCodes::TABLE_ALREADY_EXISTS, "Cannot undrop table, {} already exists", table_id);
+
+    database->checkMetadataFilenameAvailability(table_id.table_name);
+
+    DatabaseCatalog::instance().dequeueDroppedTableCleanup(table_id);
+    return {};
+}
+
+AccessRightsElements InterpreterUndropQuery::getRequiredAccessForDDLOnCluster() const
+{
+    AccessRightsElements required_access;
+    const auto & undrop = query_ptr->as<const ASTUndropQuery &>();
+
+    required_access.emplace_back(AccessType::UNDROP_TABLE, undrop.getDatabase(), undrop.getTable());
+    return required_access;
+}
+}
diff --git a/src/Interpreters/InterpreterUndropQuery.h b/src/Interpreters/InterpreterUndropQuery.h
new file mode 100644
index 00000000000..a47617fd17f
--- /dev/null
+++ b/src/Interpreters/InterpreterUndropQuery.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <Databases/IDatabase.h>
+#include <Interpreters/IInterpreter.h>
+#include <Parsers/ASTUndropQuery.h>
+
+namespace DB
+{
+
+class Context;
+using DatabaseAndTable = std::pair<DatabasePtr, StoragePtr>;
+class AccessRightsElements;
+
+
+class InterpreterUndropQuery : public IInterpreter, WithMutableContext
+{
+public:
+    InterpreterUndropQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_);
+
+    /// Undrop table.
+    BlockIO execute() override;
+
+private:
+    AccessRightsElements getRequiredAccessForDDLOnCluster() const;
+    ASTPtr query_ptr;
+
+    BlockIO executeToTable(ASTUndropQuery & query);
+};
+}
diff --git a/src/Interpreters/InterserverCredentials.h b/src/Interpreters/InterserverCredentials.h
index c4370c83e9b..33176c943a4 100644
--- a/src/Interpreters/InterserverCredentials.h
+++ b/src/Interpreters/InterserverCredentials.h
@@ -2,7 +2,6 @@
 
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
-#include <Common/logger_useful.h>
 #include <unordered_set>
 
 namespace DB
diff --git a/src/Interpreters/JIT/compileFunction.cpp b/src/Interpreters/JIT/compileFunction.cpp
index 8bf0eb25b60..a7233433861 100644
--- a/src/Interpreters/JIT/compileFunction.cpp
+++ b/src/Interpreters/JIT/compileFunction.cpp
@@ -41,7 +41,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-ColumnData getColumnData(const IColumn * column)
+ColumnData getColumnData(const IColumn * column, size_t skip_rows)
 {
     const bool is_const = isColumnConst(*column);
 
@@ -52,11 +52,11 @@ ColumnData getColumnData(const IColumn * column)
 
     if (const auto * nullable = typeid_cast<const ColumnNullable *>(column))
     {
-        result.null_data = nullable->getNullMapColumn().getRawData().data();
+        result.null_data = nullable->getNullMapColumn().getDataAt(skip_rows).data;
         column = &nullable->getNestedColumn();
     }
-
-    result.data = column->getRawData().data();
+    /// skip null key data for one nullable key optimization
+    result.data = column->getDataAt(skip_rows).data;
 
     return result;
 }
diff --git a/src/Interpreters/JIT/compileFunction.h b/src/Interpreters/JIT/compileFunction.h
index 0e0a1106698..fe5abe1988c 100644
--- a/src/Interpreters/JIT/compileFunction.h
+++ b/src/Interpreters/JIT/compileFunction.h
@@ -26,7 +26,7 @@ struct ColumnData
 /** Returns ColumnData for column.
   * If constant column is passed, LOGICAL_ERROR will be thrown.
   */
-ColumnData getColumnData(const IColumn * column);
+ColumnData getColumnData(const IColumn * column, size_t skip_rows = 0);
 
 using ColumnDataRowsOffset = size_t;
 using ColumnDataRowsSize = size_t;
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index 7c999803b44..ee5c288afbb 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -173,13 +173,14 @@ using RenameQualifiedIdentifiersVisitor = InDepthNodeVisitor<RenameQualifiedIden
 
 }
 
-JoinedTables::JoinedTables(ContextPtr context_, const ASTSelectQuery & select_query_, bool include_all_columns_)
+JoinedTables::JoinedTables(ContextPtr context_, const ASTSelectQuery & select_query_, bool include_all_columns_, bool is_create_parameterized_view_)
     : context(context_)
     , table_expressions(getTableExpressions(select_query_))
     , include_all_columns(include_all_columns_)
     , left_table_expression(extractTableExpression(select_query_, 0))
     , left_db_and_table(getDatabaseAndTable(select_query_, 0))
     , select_query(select_query_)
+    , is_create_parameterized_view(is_create_parameterized_view_)
 {}
 
 bool JoinedTables::isLeftTableSubquery() const
@@ -239,7 +240,7 @@ bool JoinedTables::resolveTables()
     const auto & settings = context->getSettingsRef();
     bool include_alias_cols = include_all_columns || settings.asterisk_include_alias_columns;
     bool include_materialized_cols = include_all_columns || settings.asterisk_include_materialized_columns;
-    tables_with_columns = getDatabaseAndTablesWithColumns(table_expressions, context, include_alias_cols, include_materialized_cols);
+    tables_with_columns = getDatabaseAndTablesWithColumns(table_expressions, context, include_alias_cols, include_materialized_cols, is_create_parameterized_view);
     if (tables_with_columns.size() != table_expressions.size())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected tables count");
 
@@ -300,16 +301,16 @@ void JoinedTables::rewriteDistributedInAndJoins(ASTPtr & query)
     }
 }
 
-std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & select_query)
+std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & select_query_)
 {
     if (tables_with_columns.size() < 2)
         return {};
 
     auto settings = context->getSettingsRef();
     MultiEnum<JoinAlgorithm> join_algorithm = settings.join_algorithm;
-    auto table_join = std::make_shared<TableJoin>(settings, context->getTemporaryVolume());
+    auto table_join = std::make_shared<TableJoin>(settings, context->getGlobalTemporaryVolume());
 
-    const ASTTablesInSelectQueryElement * ast_join = select_query.join();
+    const ASTTablesInSelectQueryElement * ast_join = select_query_.join();
     const auto & table_to_join = ast_join->table_expression->as<ASTTableExpression &>();
 
     /// TODO This syntax does not support specifying a database name.
@@ -351,16 +352,16 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
 
     if (!table_join->isSpecialStorage() &&
         settings.enable_optimize_predicate_expression)
-        replaceJoinedTable(select_query);
+        replaceJoinedTable(select_query_);
 
     return table_join;
 }
 
-void JoinedTables::reset(const ASTSelectQuery & select_query)
+void JoinedTables::reset(const ASTSelectQuery & select_query_)
 {
-    table_expressions = getTableExpressions(select_query);
-    left_table_expression = extractTableExpression(select_query, 0);
-    left_db_and_table = getDatabaseAndTable(select_query, 0);
+    table_expressions = getTableExpressions(select_query_);
+    left_table_expression = extractTableExpression(select_query_, 0);
+    left_db_and_table = getDatabaseAndTable(select_query_, 0);
 }
 
 }
diff --git a/src/Interpreters/JoinedTables.h b/src/Interpreters/JoinedTables.h
index 7562dbc9ac5..771f5ae6ef0 100644
--- a/src/Interpreters/JoinedTables.h
+++ b/src/Interpreters/JoinedTables.h
@@ -22,7 +22,7 @@ using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 class JoinedTables
 {
 public:
-    JoinedTables(ContextPtr context, const ASTSelectQuery & select_query_, bool include_all_columns_ = false);
+    JoinedTables(ContextPtr context, const ASTSelectQuery & select_query_, bool include_all_columns_ = false, bool is_create_parameterized_view_ = false);
 
     void reset(const ASTSelectQuery & select_query);
 
@@ -53,6 +53,7 @@ private:
     ASTPtr left_table_expression;
     std::optional<DatabaseAndTableWithAlias> left_db_and_table;
     const ASTSelectQuery & select_query;
+    const bool is_create_parameterized_view;
 };
 
 }
diff --git a/src/Interpreters/LogicalExpressionsOptimizer.cpp b/src/Interpreters/LogicalExpressionsOptimizer.cpp
index 02594269f08..5dd1b510480 100644
--- a/src/Interpreters/LogicalExpressionsOptimizer.cpp
+++ b/src/Interpreters/LogicalExpressionsOptimizer.cpp
@@ -119,7 +119,9 @@ void LogicalExpressionsOptimizer::collectDisjunctiveEqualityChains()
         bool found_chain = false;
 
         auto * function = to_node->as<ASTFunction>();
-        if (function && function->name == "or" && function->children.size() == 1)
+        /// Optimization does not respect aliases properly, which can lead to MULTIPLE_EXPRESSION_FOR_ALIAS error.
+        /// Disable it if an expression has an alias. Proper implementation is done with the new analyzer.
+        if (function && function->alias.empty() && function->name == "or" && function->children.size() == 1)
         {
             const auto * expression_list = function->children[0]->as<ASTExpressionList>();
             if (expression_list)
@@ -128,14 +130,14 @@ void LogicalExpressionsOptimizer::collectDisjunctiveEqualityChains()
                 for (const auto & child : expression_list->children)
                 {
                     auto * equals = child->as<ASTFunction>();
-                    if (equals && equals->name == "equals" && equals->children.size() == 1)
+                    if (equals && equals->alias.empty() && equals->name == "equals" && equals->children.size() == 1)
                     {
                         const auto * equals_expression_list = equals->children[0]->as<ASTExpressionList>();
                         if (equals_expression_list && equals_expression_list->children.size() == 2)
                         {
                             /// Equality expr = xN.
                             const auto * literal = equals_expression_list->children[1]->as<ASTLiteral>();
-                            if (literal)
+                            if (literal && literal->alias.empty())
                             {
                                 auto expr_lhs = equals_expression_list->children[0]->getTreeHash();
                                 OrWithExpression or_with_expression{function, expr_lhs, function->tryGetAlias()};
@@ -230,6 +232,9 @@ bool LogicalExpressionsOptimizer::mayOptimizeDisjunctiveEqualityChain(const Disj
     const auto & equalities = chain.second;
     const auto & equality_functions = equalities.functions;
 
+    if (settings.optimize_min_equality_disjunction_chain_length == 0)
+        return false;
+
     /// For LowCardinality column, the dict is usually smaller and the index is relatively large.
     /// In most cases, merging OR-chain as IN is better than converting each LowCardinality into full column individually.
     /// For non-LowCardinality, we need to eliminate too short chains.
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index a5ab6b25d02..d31510c2fb5 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -3,6 +3,7 @@
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnLowCardinality.h>
 
+#include <Common/logger_useful.h>
 #include <Core/SortCursor.h>
 #include <Formats/TemporaryFileStreamLegacy.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -1045,7 +1046,7 @@ std::shared_ptr<Block> MergeJoin::loadRightBlock(size_t pos) const
 
 void MergeJoin::initRightTableWriter()
 {
-    disk_writer = std::make_unique<SortedBlocksWriter>(size_limits, table_join->getTemporaryVolume(),
+    disk_writer = std::make_unique<SortedBlocksWriter>(size_limits, table_join->getGlobalTemporaryVolume(),
                     right_sample_block, right_sort_description, max_rows_in_right_block, max_files_to_merge,
                     table_join->temporaryFilesCodec());
     disk_writer->addBlocks(right_blocks);
diff --git a/src/Interpreters/MergeTreeTransaction.cpp b/src/Interpreters/MergeTreeTransaction.cpp
index f16ece46530..1358e3ed3c2 100644
--- a/src/Interpreters/MergeTreeTransaction.cpp
+++ b/src/Interpreters/MergeTreeTransaction.cpp
@@ -168,6 +168,8 @@ void MergeTreeTransaction::addMutation(const StoragePtr & table, const String &
 bool MergeTreeTransaction::isReadOnly() const
 {
     std::lock_guard lock{mutex};
+    if (finalized)
+        return is_read_only;
     chassert((creating_parts.empty() && removing_parts.empty() && mutations.empty()) == storages.empty());
     return storages.empty();
 }
@@ -182,7 +184,7 @@ scope_guard MergeTreeTransaction::beforeCommit()
 
     /// We should wait for mutations to finish before committing transaction, because some mutation may fail and cause rollback.
     for (const auto & table_and_mutation : mutations_to_wait)
-        table_and_mutation.first->waitForMutation(table_and_mutation.second);
+        table_and_mutation.first->waitForMutation(table_and_mutation.second, /* wait_for_another_mutation */ false);
 
     assert([&]()
     {
@@ -315,6 +317,20 @@ bool MergeTreeTransaction::rollback() noexcept
     return true;
 }
 
+void MergeTreeTransaction::afterFinalize()
+{
+    std::lock_guard lock{mutex};
+    chassert((creating_parts.empty() && removing_parts.empty() && mutations.empty()) == storages.empty());
+
+    /// Remember if it was read-only transaction before we clear storages
+    is_read_only = storages.empty();
+
+    /// Release shared pointers just in case
+    storages.clear();
+    mutations.clear();
+    finalized = true;
+}
+
 void MergeTreeTransaction::onException()
 {
     TransactionLog::instance().rollbackTransaction(shared_from_this());
@@ -331,6 +347,11 @@ String MergeTreeTransaction::dumpDescription() const
     }
 
     std::lock_guard lock{mutex};
+    if (finalized)
+    {
+        res += ", cannot dump detailed description, transaction is finalized";
+        return res;
+    }
 
     res += fmt::format(", affects {} tables:", storages.size());
 
diff --git a/src/Interpreters/MergeTreeTransaction.h b/src/Interpreters/MergeTreeTransaction.h
index f2d8d29d244..4ca36cf64ad 100644
--- a/src/Interpreters/MergeTreeTransaction.h
+++ b/src/Interpreters/MergeTreeTransaction.h
@@ -65,6 +65,8 @@ private:
     scope_guard beforeCommit();
     void afterCommit(CSN assigned_csn) noexcept;
     bool rollback() noexcept;
+    void afterFinalize();
+
     void checkIsNotCancelled() const;
 
     mutable std::mutex mutex;
@@ -74,6 +76,11 @@ private:
     std::atomic<CSN> snapshot;
     const std::list<CSN>::iterator snapshot_in_use_it;
 
+    bool finalized TSA_GUARDED_BY(mutex) = false;
+
+    /// Indicates if transaction was read-only before `afterFinalize`
+    bool is_read_only TSA_GUARDED_BY(mutex) = false;
+
     /// Lists of changes made by transaction
     std::unordered_set<StoragePtr> storages TSA_GUARDED_BY(mutex);
     DataPartsVector creating_parts TSA_GUARDED_BY(mutex);
diff --git a/src/Interpreters/MetricLog.cpp b/src/Interpreters/MetricLog.cpp
index 6e98f84bc82..24f77f7d0ba 100644
--- a/src/Interpreters/MetricLog.cpp
+++ b/src/Interpreters/MetricLog.cpp
@@ -1,4 +1,5 @@
 #include <Interpreters/MetricLog.h>
+#include <Common/ThreadPool.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
@@ -50,7 +51,7 @@ void MetricLogElement::appendToBlock(MutableColumns & columns) const
         columns[column_idx++]->insert(profile_events[i]);
 
     for (size_t i = 0, end = CurrentMetrics::end(); i < end; ++i)
-        columns[column_idx++]->insert(current_metrics[i]);
+        columns[column_idx++]->insert(current_metrics[i].toUnderType());
 }
 
 
@@ -58,7 +59,7 @@ void MetricLog::startCollectMetric(size_t collect_interval_milliseconds_)
 {
     collect_interval_milliseconds = collect_interval_milliseconds_;
     is_shutdown_metric_thread = false;
-    metric_flush_thread = ThreadFromGlobalPool([this] { metricThreadFunction(); });
+    metric_flush_thread = std::make_unique<ThreadFromGlobalPool>([this] { metricThreadFunction(); });
 }
 
 
@@ -67,7 +68,8 @@ void MetricLog::stopCollectMetric()
     bool old_val = false;
     if (!is_shutdown_metric_thread.compare_exchange_strong(old_val, true))
         return;
-    metric_flush_thread.join();
+    if (metric_flush_thread)
+        metric_flush_thread->join();
 }
 
 
@@ -97,7 +99,7 @@ void MetricLog::metricThreadFunction()
             elem.milliseconds = timeInMilliseconds(current_time) - timeInSeconds(current_time) * 1000;
 
             elem.profile_events.resize(ProfileEvents::end());
-            for (size_t i = 0, end = ProfileEvents::end(); i < end; ++i)
+            for (ProfileEvents::Event i = ProfileEvents::Event(0), end = ProfileEvents::end(); i < end; ++i)
             {
                 const ProfileEvents::Count new_value = ProfileEvents::global_counters[i].load(std::memory_order_relaxed);
                 auto & old_value = prev_profile_events[i];
diff --git a/src/Interpreters/MetricLog.h b/src/Interpreters/MetricLog.h
index 44fcdced07c..aacdd4f49d2 100644
--- a/src/Interpreters/MetricLog.h
+++ b/src/Interpreters/MetricLog.h
@@ -3,6 +3,7 @@
 #include <Interpreters/SystemLog.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/ThreadPool_fwd.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/NamesAndAliases.h>
 
@@ -50,7 +51,7 @@ public:
 private:
     void metricThreadFunction();
 
-    ThreadFromGlobalPool metric_flush_thread;
+    std::unique_ptr<ThreadFromGlobalPool> metric_flush_thread;
     size_t collect_interval_milliseconds;
     std::atomic<bool> is_shutdown_metric_thread{false};
 };
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index 034f327db91..713ebade1d5 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -1,9 +1,9 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
-#include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/MutationsInterpreter.h>
 #include <Interpreters/TreeRewriter.h>
+#include <Interpreters/MutationsNonDeterministicHelpers.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
 #include <Storages/StorageMergeTree.h>
@@ -31,13 +31,13 @@
 #include <Interpreters/PreparedSets.h>
 #include <Storages/LightweightDeleteDescription.h>
 #include <Storages/MergeTree/MergeTreeSequentialSource.h>
-#include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
 #include <Processors/Sources/ThrowingExceptionSource.h>
 #include <Analyzer/QueryTreeBuilder.h>
 #include <Analyzer/QueryTreePassManager.h>
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/TableNode.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
+#include <Parsers/makeASTForLogicalFunction.h>
 
 
 namespace DB
@@ -52,90 +52,12 @@ namespace ErrorCodes
     extern const int NO_SUCH_COLUMN_IN_TABLE;
     extern const int CANNOT_UPDATE_COLUMN;
     extern const int UNEXPECTED_EXPRESSION;
+    extern const int THERE_IS_NO_COLUMN;
 }
 
 namespace
 {
 
-/// Helps to detect situations, where non-deterministic functions may be used in mutations of Replicated*MergeTree.
-class FirstNonDeterministicFunctionMatcher
-{
-public:
-    struct Data
-    {
-        ContextPtr context;
-        std::optional<String> nondeterministic_function_name;
-        bool subquery = false;
-    };
-
-    static bool needChildVisit(const ASTPtr & /*node*/, const ASTPtr & /*child*/)
-    {
-        return true;
-    }
-
-    static void visit(const ASTPtr & node, Data & data)
-    {
-        if (data.nondeterministic_function_name || data.subquery)
-            return;
-
-        if (node->as<ASTSelectQuery>())
-        {
-            /// We cannot determine if subquery is deterministic or not,
-            /// so we do not allow to use subqueries in mutation without allow_nondeterministic_mutations=1
-            data.subquery = true;
-        }
-        else if (const auto * function = typeid_cast<const ASTFunction *>(node.get()))
-        {
-            /// Property of being deterministic for lambda expression is completely determined
-            /// by the contents of its definition, so we just proceed to it.
-            if (function->name != "lambda")
-            {
-                /// NOTE It may be an aggregate function, so get(...) may throw.
-                /// However, an aggregate function can be used only in subquery and we do not go into subquery.
-                const auto func = FunctionFactory::instance().get(function->name, data.context);
-                if (!func->isDeterministic())
-                    data.nondeterministic_function_name = func->getName();
-            }
-        }
-    }
-};
-
-using FirstNonDeterministicFunctionFinder = InDepthNodeVisitor<FirstNonDeterministicFunctionMatcher, true>;
-using FirstNonDeterministicFunctionData = FirstNonDeterministicFunctionMatcher::Data;
-
-FirstNonDeterministicFunctionData findFirstNonDeterministicFunctionName(const MutationCommand & command, ContextPtr context)
-{
-    FirstNonDeterministicFunctionMatcher::Data finder_data{context, std::nullopt, false};
-
-    switch (command.type)
-    {
-        case MutationCommand::UPDATE:
-        {
-            auto update_assignments_ast = command.ast->as<const ASTAlterCommand &>().update_assignments->clone();
-            FirstNonDeterministicFunctionFinder(finder_data).visit(update_assignments_ast);
-
-            if (finder_data.nondeterministic_function_name)
-                return finder_data;
-
-            /// Currently UPDATE and DELETE both always have predicates so we can use fallthrough
-            [[fallthrough]];
-        }
-
-        case MutationCommand::DELETE:
-        {
-            auto predicate_ast = command.predicate->clone();
-            FirstNonDeterministicFunctionFinder(finder_data).visit(predicate_ast);
-
-            return finder_data;
-        }
-
-        default:
-            break;
-    }
-
-    return {};
-}
-
 ASTPtr prepareQueryAffectedAST(const std::vector<MutationCommand> & commands, const StoragePtr & storage, ContextPtr context)
 {
     /// Execute `SELECT count() FROM storage WHERE predicate1 OR predicate2 OR ...` query.
@@ -172,6 +94,21 @@ ASTPtr prepareQueryAffectedAST(const std::vector<MutationCommand> & commands, co
     return select;
 }
 
+QueryTreeNodePtr prepareQueryAffectedQueryTree(const std::vector<MutationCommand> & commands, const StoragePtr & storage, ContextPtr context)
+{
+    auto ast = prepareQueryAffectedAST(commands, storage, context);
+    auto query_tree = buildQueryTree(ast, context);
+
+    auto & query_node = query_tree->as<QueryNode &>();
+    query_node.getJoinTree() = std::make_shared<TableNode>(storage, context);
+
+    QueryTreePassManager query_tree_pass_manager(context);
+    addQueryTreePasses(query_tree_pass_manager);
+    query_tree_pass_manager.run(query_tree);
+
+    return query_tree;
+}
+
 ColumnDependencies getAllColumnDependencies(const StorageMetadataPtr & metadata_snapshot, const NameSet & updated_columns)
 {
     NameSet new_updated_columns = updated_columns;
@@ -231,18 +168,15 @@ bool isStorageTouchedByMutations(
     std::optional<InterpreterSelectQuery> interpreter_select_query;
     BlockIO io;
 
-    ASTPtr select_query = prepareQueryAffectedAST(commands, storage.shared_from_this(), context);
-
     if (context->getSettingsRef().allow_experimental_analyzer)
     {
-        InterpreterSelectQueryAnalyzer interpreter(select_query,
-            context,
-            storage_from_part,
-            SelectQueryOptions().ignoreLimits().ignoreProjections());
+        auto select_query_tree = prepareQueryAffectedQueryTree(commands, storage.shared_from_this(), context);
+        InterpreterSelectQueryAnalyzer interpreter(select_query_tree, context, SelectQueryOptions().ignoreLimits().ignoreProjections());
         io = interpreter.execute();
     }
     else
     {
+        ASTPtr select_query = prepareQueryAffectedAST(commands, storage.shared_from_this(), context);
         /// Interpreter must be alive, when we use result of execute() method.
         /// For some reason it may copy context and give it into ExpressionTransform
         /// after that we will use context from destroyed stack frame in our stream.
@@ -313,10 +247,10 @@ MutationsInterpreter::Source::Source(MergeTreeData & storage_, MergeTreeData::Da
 
 StorageSnapshotPtr MutationsInterpreter::Source::getStorageSnapshot(const StorageMetadataPtr & snapshot_, const ContextPtr & context_) const
 {
-    if (data)
-        return data->getStorageSnapshot(snapshot_, context_);
+    if (const auto * merge_tree = getMergeTreeData())
+        return merge_tree->getStorageSnapshotWithoutData(snapshot_, context_);
 
-    return storage->getStorageSnapshot(snapshot_, context_);
+    return storage->getStorageSnapshotWithoutData(snapshot_, context_);
 }
 
 StoragePtr MutationsInterpreter::Source::getStorage() const
@@ -354,20 +288,27 @@ bool MutationsInterpreter::Source::materializeTTLRecalculateOnly() const
     return data && data->getSettings()->materialize_ttl_recalculate_only;
 }
 
+static Names getAvailableColumnsWithVirtuals(StorageMetadataPtr metadata_snapshot, const IStorage & storage)
+{
+    auto all_columns = metadata_snapshot->getColumns().getNamesOfPhysical();
+    for (const auto & column : storage.getVirtuals())
+        all_columns.push_back(column.name);
+    return all_columns;
+}
+
 MutationsInterpreter::MutationsInterpreter(
     StoragePtr storage_,
-    const StorageMetadataPtr & metadata_snapshot_,
+    StorageMetadataPtr metadata_snapshot_,
     MutationCommands commands_,
     ContextPtr context_,
-    bool can_execute_,
-    bool return_all_columns_,
-    bool return_deleted_rows_)
+    Settings settings_)
     : MutationsInterpreter(
-        Source(std::move(storage_)),
-        metadata_snapshot_, std::move(commands_), std::move(context_),
-        can_execute_, return_all_columns_, return_deleted_rows_)
+        Source(storage_),
+        metadata_snapshot_, std::move(commands_),
+        getAvailableColumnsWithVirtuals(metadata_snapshot_, *storage_),
+        std::move(context_), std::move(settings_))
 {
-    if (can_execute_ && dynamic_cast<const MergeTreeData *>(source.getStorage().get()))
+    if (settings.can_execute && dynamic_cast<const MergeTreeData *>(source.getStorage().get()))
     {
         throw Exception(
             ErrorCodes::LOGICAL_ERROR,
@@ -379,37 +320,34 @@ MutationsInterpreter::MutationsInterpreter(
 MutationsInterpreter::MutationsInterpreter(
     MergeTreeData & storage_,
     MergeTreeData::DataPartPtr source_part_,
-    const StorageMetadataPtr & metadata_snapshot_,
+    StorageMetadataPtr metadata_snapshot_,
     MutationCommands commands_,
+    Names available_columns_,
     ContextPtr context_,
-    bool can_execute_,
-    bool return_all_columns_,
-    bool return_deleted_rows_)
+    Settings settings_)
     : MutationsInterpreter(
         Source(storage_, std::move(source_part_)),
-        metadata_snapshot_, std::move(commands_), std::move(context_),
-        can_execute_, return_all_columns_, return_deleted_rows_)
+        std::move(metadata_snapshot_), std::move(commands_),
+        std::move(available_columns_), std::move(context_), std::move(settings_))
 {
 }
 
 MutationsInterpreter::MutationsInterpreter(
     Source source_,
-    const StorageMetadataPtr & metadata_snapshot_,
+    StorageMetadataPtr metadata_snapshot_,
     MutationCommands commands_,
+    Names available_columns_,
     ContextPtr context_,
-    bool can_execute_,
-    bool return_all_columns_,
-    bool return_deleted_rows_)
+    Settings settings_)
     : source(std::move(source_))
     , metadata_snapshot(metadata_snapshot_)
     , commands(std::move(commands_))
+    , available_columns(std::move(available_columns_))
     , context(Context::createCopy(context_))
-    , can_execute(can_execute_)
-    , select_limits(SelectQueryOptions().analyze(!can_execute).ignoreLimits().ignoreProjections())
-    , return_all_columns(return_all_columns_)
-    , return_deleted_rows(return_deleted_rows_)
+    , settings(std::move(settings_))
+    , select_limits(SelectQueryOptions().analyze(!settings.can_execute).ignoreLimits().ignoreProjections())
 {
-    prepare(!can_execute);
+    prepare(!settings.can_execute);
 }
 
 static NameSet getKeyColumns(const MutationsInterpreter::Source & source, const StorageMetadataPtr & metadata_snapshot)
@@ -529,14 +467,23 @@ void MutationsInterpreter::prepare(bool dry_run)
     if (commands.empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty mutation commands list");
 
+    /// TODO Should we get columns, indices and projections from the part itself? Table metadata may be different
     const ColumnsDescription & columns_desc = metadata_snapshot->getColumns();
     const IndicesDescription & indices_desc = metadata_snapshot->getSecondaryIndices();
     const ProjectionsDescription & projections_desc = metadata_snapshot->getProjections();
-    NamesAndTypesList all_columns = columns_desc.getAllPhysical();
+
+    auto storage_snapshot = std::make_shared<StorageSnapshot>(*source.getStorage(), metadata_snapshot);
+    auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical).withVirtuals();
+
+    auto all_columns = storage_snapshot->getColumnsByNames(options, available_columns);
+    NameSet available_columns_set(available_columns.begin(), available_columns.end());
 
     /// Add _row_exists column if it is physically present in the part
     if (source.hasLightweightDeleteMask())
+    {
         all_columns.push_back({LightweightDeleteDescription::FILTER_COLUMN});
+        available_columns_set.insert(LightweightDeleteDescription::FILTER_COLUMN.name);
+    }
 
     NameSet updated_columns;
     bool materialize_ttl_recalculate_only = source.materializeTTLRecalculateOnly();
@@ -547,9 +494,13 @@ void MutationsInterpreter::prepare(bool dry_run)
             || command.type == MutationCommand::Type::DELETE)
             materialize_ttl_recalculate_only = false;
 
-        for (const auto & kv : command.column_to_update_expression)
+        for (const auto & [name, _] : command.column_to_update_expression)
         {
-            updated_columns.insert(kv.first);
+            if (!available_columns_set.contains(name) && name != LightweightDeleteDescription::FILTER_COLUMN.name)
+                throw Exception(ErrorCodes::THERE_IS_NO_COLUMN,
+                    "Column {} is updated but not requested to read", name);
+
+            updated_columns.insert(name);
         }
     }
 
@@ -560,29 +511,28 @@ void MutationsInterpreter::prepare(bool dry_run)
     {
         for (const auto & column : columns_desc)
         {
-            if (column.default_desc.kind == ColumnDefaultKind::Materialized)
+            if (column.default_desc.kind == ColumnDefaultKind::Materialized && available_columns_set.contains(column.name))
             {
                 auto query = column.default_desc.expression->clone();
                 auto syntax_result = TreeRewriter(context).analyze(query, all_columns);
-                for (const String & dependency : syntax_result->requiredSourceColumns())
-                {
+                for (const auto & dependency : syntax_result->requiredSourceColumns())
                     if (updated_columns.contains(dependency))
                         column_to_affected_materialized[dependency].push_back(column.name);
-                }
             }
         }
 
         validateUpdateColumns(source, metadata_snapshot, updated_columns, column_to_affected_materialized);
     }
 
-    dependencies = getAllColumnDependencies(metadata_snapshot, updated_columns);
+    if (settings.recalculate_dependencies_of_updated_columns)
+        dependencies = getAllColumnDependencies(metadata_snapshot, updated_columns);
 
     std::vector<String> read_columns;
     /// First, break a sequence of commands into stages.
     for (auto & command : commands)
     {
         // we can return deleted rows only if it's the only present command
-        assert(command.type == MutationCommand::DELETE || !return_deleted_rows);
+        assert(command.type == MutationCommand::DELETE || command.type == MutationCommand::UPDATE || !settings.return_mutated_rows);
 
         if (command.type == MutationCommand::DELETE)
         {
@@ -592,7 +542,7 @@ void MutationsInterpreter::prepare(bool dry_run)
 
             auto predicate  = getPartitionAndPredicateExpressionForMutationCommand(command);
 
-            if (!return_deleted_rows)
+            if (!settings.return_mutated_rows)
                 predicate = makeASTFunction("isZeroOrNull", predicate);
 
             stages.back().filters.push_back(predicate);
@@ -679,6 +629,9 @@ void MutationsInterpreter::prepare(bool dry_run)
                     type_literal);
 
                 stages.back().column_to_updated.emplace(column, updated_column);
+
+                if (condition && settings.return_mutated_rows)
+                    stages.back().filters.push_back(condition);
             }
 
             if (!affected_materialized.empty())
@@ -886,15 +839,15 @@ void MutationsInterpreter::prepare(bool dry_run)
     }
 
     is_prepared = true;
-
     prepareMutationStages(stages, dry_run);
 }
 
 void MutationsInterpreter::prepareMutationStages(std::vector<Stage> & prepared_stages, bool dry_run)
 {
     auto storage_snapshot = source.getStorageSnapshot(metadata_snapshot, context);
-    auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical).withExtendedObjects();
-    auto all_columns = storage_snapshot->getColumns(options);
+    auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical).withExtendedObjects().withVirtuals();
+
+    auto all_columns = storage_snapshot->getColumnsByNames(options, available_columns);
 
     /// Add _row_exists column if it is present in the part
     if (source.hasLightweightDeleteMask())
@@ -903,7 +856,7 @@ void MutationsInterpreter::prepareMutationStages(std::vector<Stage> & prepared_s
     /// Next, for each stage calculate columns changed by this and previous stages.
     for (size_t i = 0; i < prepared_stages.size(); ++i)
     {
-        if (return_all_columns || !prepared_stages[i].filters.empty())
+        if (settings.return_all_columns || !prepared_stages[i].filters.empty())
         {
             for (const auto & column : all_columns)
                 prepared_stages[i].output_columns.insert(column.name);
@@ -953,10 +906,15 @@ void MutationsInterpreter::prepareMutationStages(std::vector<Stage> & prepared_s
 
         ExpressionActionsChain & actions_chain = stage.expressions_chain;
 
-        for (const auto & ast : stage.filters)
+        if (!stage.filters.empty())
         {
+            auto ast = stage.filters.front();
+            if (stage.filters.size() > 1)
+                ast = makeASTForLogicalAnd(std::move(stage.filters));
+
             if (!actions_chain.steps.empty())
                 actions_chain.addStep();
+
             stage.analyzer->appendExpression(actions_chain, ast, dry_run);
             stage.filter_column_names.push_back(ast->getColumnName());
         }
@@ -1024,8 +982,7 @@ struct VirtualColumns
         {
             if (columns_to_read[i] == LightweightDeleteDescription::FILTER_COLUMN.name)
             {
-                LoadedMergeTreeDataPartInfoForReader part_info_reader(part);
-                if (!part_info_reader.getColumns().contains(LightweightDeleteDescription::FILTER_COLUMN.name))
+                if (!part->getColumns().contains(LightweightDeleteDescription::FILTER_COLUMN.name))
                 {
                     ColumnWithTypeAndName mask_column;
                     mask_column.type = LightweightDeleteDescription::FILTER_COLUMN.type;
@@ -1114,7 +1071,6 @@ void MutationsInterpreter::Source::read(
         ActionsDAGPtr filter;
         if (!first_stage.filter_column_names.empty())
         {
-
             ActionsDAG::NodeRawConstPtrs nodes(num_filters);
             for (size_t i = 0; i < num_filters; ++i)
                 nodes[i] = &steps[i]->actions()->findInOutputs(names[i]);
@@ -1125,7 +1081,9 @@ void MutationsInterpreter::Source::read(
         VirtualColumns virtual_columns(std::move(required_columns), part);
 
         createMergeTreeSequentialSource(
-            plan, *data, storage_snapshot, part, std::move(virtual_columns.columns_to_read), apply_deleted_mask_, filter, context_,
+            plan, *data, storage_snapshot, part,
+            std::move(virtual_columns.columns_to_read),
+            apply_deleted_mask_, filter, context_,
             &Poco::Logger::get("MutationsInterpreter"));
 
         virtual_columns.addVirtuals(plan);
@@ -1178,7 +1136,7 @@ void MutationsInterpreter::Source::read(
 
 void MutationsInterpreter::initQueryPlan(Stage & first_stage, QueryPlan & plan)
 {
-    source.read(first_stage, plan, metadata_snapshot, context, apply_deleted_mask, can_execute);
+    source.read(first_stage, plan, metadata_snapshot, context, settings.apply_deleted_mask, settings.can_execute);
     addCreatingSetsStep(plan, first_stage.analyzer->getPreparedSets(), context);
 }
 
@@ -1191,6 +1149,7 @@ QueryPipelineBuilder MutationsInterpreter::addStreamsForLaterStages(const std::v
             const auto & step = stage.expressions_chain.steps[i];
             if (step->actions()->hasArrayJoin())
                 throw Exception(ErrorCodes::UNEXPECTED_EXPRESSION, "arrayJoin is not allowed in mutations");
+
             if (i < stage.filter_column_names.size())
             {
                 /// Execute DELETEs.
@@ -1223,15 +1182,13 @@ QueryPipelineBuilder MutationsInterpreter::addStreamsForLaterStages(const std::v
 
 void MutationsInterpreter::validate()
 {
-    const Settings & settings = context->getSettingsRef();
-
     /// For Replicated* storages mutations cannot employ non-deterministic functions
     /// because that produces inconsistencies between replicas
-    if (startsWith(source.getStorage()->getName(), "Replicated") && !settings.allow_nondeterministic_mutations)
+    if (startsWith(source.getStorage()->getName(), "Replicated") && !context->getSettingsRef().allow_nondeterministic_mutations)
     {
         for (const auto & command : commands)
         {
-            const auto nondeterministic_func_data = findFirstNonDeterministicFunctionName(command, context);
+            const auto nondeterministic_func_data = findFirstNonDeterministicFunction(command, context);
             if (nondeterministic_func_data.subquery)
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "ALTER UPDATE/ALTER DELETE statement with subquery may be nondeterministic, "
                                                            "see allow_nondeterministic_mutations setting");
@@ -1244,13 +1201,14 @@ void MutationsInterpreter::validate()
     }
 
     QueryPlan plan;
+
     initQueryPlan(stages.front(), plan);
     auto pipeline = addStreamsForLaterStages(stages, plan);
 }
 
 QueryPipelineBuilder MutationsInterpreter::execute()
 {
-    if (!can_execute)
+    if (!settings.can_execute)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot execute mutations interpreter because can_execute flag set to false");
 
     QueryPlan plan;
diff --git a/src/Interpreters/MutationsInterpreter.h b/src/Interpreters/MutationsInterpreter.h
index e2d9c5938d6..49ba07641d9 100644
--- a/src/Interpreters/MutationsInterpreter.h
+++ b/src/Interpreters/MutationsInterpreter.h
@@ -36,30 +36,44 @@ ASTPtr getPartitionAndPredicateExpressionForMutationCommand(
 /// to this data.
 class MutationsInterpreter
 {
+private:
     struct Stage;
 
 public:
+    struct Settings
+    {
+        explicit Settings(bool can_execute_) : can_execute(can_execute_) {}
+
+        /// If false only analyze mutation expressions.
+        bool can_execute = false;
+        /// Whether all columns should be returned, not just updated
+        bool return_all_columns = false;
+        /// Whether we should return mutated or all existing rows
+        bool return_mutated_rows = false;
+        /// Where we should filter deleted rows by lightweight DELETE.
+        bool apply_deleted_mask = true;
+        /// Where we should recalculate skip indexes, TTL expressions, etc. that depend on updated columns.
+        bool recalculate_dependencies_of_updated_columns = true;
+    };
+
     /// Storage to mutate, array of mutations commands and context. If you really want to execute mutation
     /// use can_execute = true, in other cases (validation, amount of commands) it can be false
     MutationsInterpreter(
         StoragePtr storage_,
-        const StorageMetadataPtr & metadata_snapshot_,
+        StorageMetadataPtr metadata_snapshot_,
         MutationCommands commands_,
         ContextPtr context_,
-        bool can_execute_,
-        bool return_all_columns_ = false,
-        bool return_deleted_rows_ = false);
+        Settings settings_);
 
-    /// Special case for MergeTree
+    /// Special case for *MergeTree
     MutationsInterpreter(
         MergeTreeData & storage_,
         MergeTreeData::DataPartPtr source_part_,
-        const StorageMetadataPtr & metadata_snapshot_,
+        StorageMetadataPtr metadata_snapshot_,
         MutationCommands commands_,
+        Names available_columns_,
         ContextPtr context_,
-        bool can_execute_,
-        bool return_all_columns_ = false,
-        bool return_deleted_rows_ = false);
+        Settings settings_);
 
     void validate();
     size_t evaluateCommandsSize();
@@ -93,8 +107,6 @@ public:
 
     MutationKind::MutationKindEnum getMutationKind() const { return mutation_kind.mutation_kind; }
 
-    void setApplyDeletedMask(bool apply) { apply_deleted_mask = apply; }
-
     /// Internal class which represents a data part for MergeTree
     /// or just storage for other storages.
     /// The main idea is to create a dedicated reading from MergeTree part.
@@ -123,7 +135,7 @@ public:
     private:
         StoragePtr storage;
 
-        /// Special case for MergeTree.
+        /// Special case for *MergeTree.
         MergeTreeData * data = nullptr;
         MergeTreeData::DataPartPtr part;
     };
@@ -131,12 +143,11 @@ public:
 private:
     MutationsInterpreter(
         Source source_,
-        const StorageMetadataPtr & metadata_snapshot_,
+        StorageMetadataPtr metadata_snapshot_,
         MutationCommands commands_,
+        Names available_columns_,
         ContextPtr context_,
-        bool can_execute_,
-        bool return_all_columns_,
-        bool return_deleted_rows_);
+        Settings settings_);
 
     void prepare(bool dry_run);
 
@@ -151,12 +162,11 @@ private:
     Source source;
     StorageMetadataPtr metadata_snapshot;
     MutationCommands commands;
+    Names available_columns;
     ContextPtr context;
-    bool can_execute;
+    Settings settings;
     SelectQueryOptions select_limits;
 
-    bool apply_deleted_mask = true;
-
     /// A sequence of mutation commands is executed as a sequence of stages. Each stage consists of several
     /// filters, followed by updating values of some columns. Commands can reuse expressions calculated by the
     /// previous commands in the same stage, but at the end of each stage intermediate columns are thrown away
@@ -206,12 +216,6 @@ private:
 
     /// Columns, that we need to read for calculation of skip indices, projections or TTL expressions.
     ColumnDependencies dependencies;
-
-    // whether all columns should be returned, not just updated
-    bool return_all_columns;
-
-    // whether we should return deleted or nondeleted rows on DELETE mutation
-    bool return_deleted_rows;
 };
 
 }
diff --git a/src/Interpreters/MutationsNonDeterministicHelpers.cpp b/src/Interpreters/MutationsNonDeterministicHelpers.cpp
new file mode 100644
index 00000000000..46c203e15bc
--- /dev/null
+++ b/src/Interpreters/MutationsNonDeterministicHelpers.cpp
@@ -0,0 +1,100 @@
+#include "Parsers/IAST_fwd.h"
+#include <Interpreters/MutationsNonDeterministicHelpers.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTAlterQuery.h>
+#include <Storages/MutationCommands.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/ExecuteScalarSubqueriesVisitor.h>
+#include <Interpreters/addTypeConversionToAST.h>
+#include <Interpreters/Context.h>
+#include <Functions/FunctionFactory.h>
+
+namespace DB
+{
+
+namespace
+{
+
+/// Helps to detect situations, where non-deterministic functions may be used in mutations.
+class FirstNonDeterministicFunctionMatcher
+{
+public:
+    struct Data
+    {
+        ContextPtr context;
+        FirstNonDeterministicFunctionResult result;
+    };
+
+    static bool needChildVisit(const ASTPtr & /*node*/, const ASTPtr & /*child*/)
+    {
+        return true;
+    }
+
+    static void visit(const ASTPtr & node, Data & data)
+    {
+        if (data.result.nondeterministic_function_name || data.result.subquery)
+            return;
+
+        if (node->as<ASTSelectQuery>())
+        {
+            /// We cannot determine if subquery is deterministic or not,
+            /// so we do not allow to use subqueries in mutation without allow_nondeterministic_mutations=1
+            data.result.subquery = true;
+        }
+        else if (const auto * function = typeid_cast<const ASTFunction *>(node.get()))
+        {
+            /// Property of being deterministic for lambda expression is completely determined
+            /// by the contents of its definition, so we just proceed to it.
+            if (function->name != "lambda")
+            {
+                /// NOTE It may be an aggregate function, so get(...) may throw.
+                /// However, an aggregate function can be used only in subquery and we do not go into subquery.
+                const auto func = FunctionFactory::instance().get(function->name, data.context);
+                if (!func->isDeterministic())
+                    data.result.nondeterministic_function_name = func->getName();
+            }
+        }
+    }
+};
+
+using FirstNonDeterministicFunctionFinder = InDepthNodeVisitor<FirstNonDeterministicFunctionMatcher, true>;
+using FirstNonDeterministicFunctionData = FirstNonDeterministicFunctionMatcher::Data;
+
+}
+
+FirstNonDeterministicFunctionResult findFirstNonDeterministicFunction(const MutationCommand & command, ContextPtr context)
+{
+    FirstNonDeterministicFunctionMatcher::Data finder_data{context, {}};
+
+    switch (command.type)
+    {
+        case MutationCommand::UPDATE:
+        {
+            auto update_assignments_ast = command.ast->as<const ASTAlterCommand &>().update_assignments->clone();
+            FirstNonDeterministicFunctionFinder(finder_data).visit(update_assignments_ast);
+
+            if (finder_data.result.nondeterministic_function_name)
+                return finder_data.result;
+
+            /// Currently UPDATE and DELETE both always have predicates so we can use fallthrough
+            [[fallthrough]];
+        }
+
+        case MutationCommand::DELETE:
+        {
+            auto predicate_ast = command.predicate->clone();
+            FirstNonDeterministicFunctionFinder(finder_data).visit(predicate_ast);
+            return finder_data.result;
+        }
+
+        default:
+            break;
+    }
+
+    return {};
+}
+
+}
diff --git a/src/Interpreters/MutationsNonDeterministicHelpers.h b/src/Interpreters/MutationsNonDeterministicHelpers.h
new file mode 100644
index 00000000000..eb3a3b1c7a4
--- /dev/null
+++ b/src/Interpreters/MutationsNonDeterministicHelpers.h
@@ -0,0 +1,21 @@
+#pragma once
+#include <Interpreters/Context_fwd.h>
+#include <Parsers/IAST_fwd.h>
+#include <Core/Types.h>
+
+namespace DB
+{
+
+struct MutationCommand;
+
+struct FirstNonDeterministicFunctionResult
+{
+    std::optional<String> nondeterministic_function_name;
+    bool subquery = false;
+};
+
+/// Searches for non-deterministic functions and subqueries which
+/// may also be non-deterministic in expressions of mutation command.
+FirstNonDeterministicFunctionResult findFirstNonDeterministicFunction(const MutationCommand & command, ContextPtr context);
+
+}
diff --git a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h
index 824024e020d..27f467a12ae 100644
--- a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h
+++ b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h
@@ -13,6 +13,8 @@
 namespace DB
 {
 
+class NamesAndTypesList;
+
 namespace MySQLInterpreter
 {
     struct InterpreterDropImpl
diff --git a/src/Interpreters/OpenTelemetrySpanLog.cpp b/src/Interpreters/OpenTelemetrySpanLog.cpp
index 57d5c11ad97..610330b8559 100644
--- a/src/Interpreters/OpenTelemetrySpanLog.cpp
+++ b/src/Interpreters/OpenTelemetrySpanLog.cpp
@@ -1,18 +1,14 @@
-#include "OpenTelemetrySpanLog.h"
+#include <Interpreters/OpenTelemetrySpanLog.h>
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeUUID.h>
-#include <Interpreters/Context.h>
-
-#include <Common/hex.h>
-#include <Common/CurrentThread.h>
-#include <Core/Field.h>
+#include <DataTypes/DataTypeEnum.h>
 
 
 namespace DB
@@ -20,11 +16,25 @@ namespace DB
 
 NamesAndTypesList OpenTelemetrySpanLogElement::getNamesAndTypes()
 {
+    auto span_kind_type = std::make_shared<DataTypeEnum8>(
+        DataTypeEnum8::Values
+        {
+            {"INTERNAL",    static_cast<Int8>(OpenTelemetry::INTERNAL)},
+            {"SERVER",      static_cast<Int8>(OpenTelemetry::SERVER)},
+            {"CLIENT",      static_cast<Int8>(OpenTelemetry::CLIENT)},
+            {"PRODUCER",    static_cast<Int8>(OpenTelemetry::PRODUCER)},
+            {"CONSUMER",    static_cast<Int8>(OpenTelemetry::CONSUMER)}
+        }
+    );
+
+    auto low_cardinality_string = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+
     return {
         {"trace_id", std::make_shared<DataTypeUUID>()},
         {"span_id", std::make_shared<DataTypeUInt64>()},
         {"parent_span_id", std::make_shared<DataTypeUInt64>()},
-        {"operation_name", std::make_shared<DataTypeString>()},
+        {"operation_name", low_cardinality_string},
+        {"kind", std::move(span_kind_type)},
         // DateTime64 is really unwieldy -- there is no "normal" way to convert
         // it to an UInt64 count of microseconds, except:
         // 1) reinterpretAsUInt64(reinterpretAsFixedString(date)), which just
@@ -38,15 +48,17 @@ NamesAndTypesList OpenTelemetrySpanLogElement::getNamesAndTypes()
         {"start_time_us", std::make_shared<DataTypeUInt64>()},
         {"finish_time_us", std::make_shared<DataTypeUInt64>()},
         {"finish_date", std::make_shared<DataTypeDate>()},
-        {"attribute", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeString>())},
+        {"attribute", std::make_shared<DataTypeMap>(low_cardinality_string, std::make_shared<DataTypeString>())},
     };
 }
 
 NamesAndAliases OpenTelemetrySpanLogElement::getNamesAndAliases()
 {
+    auto low_cardinality_string = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+
     return
     {
-        {"attribute.names", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "mapKeys(attribute)"},
+        {"attribute.names", std::make_shared<DataTypeArray>(low_cardinality_string), "mapKeys(attribute)"},
         {"attribute.values", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "mapValues(attribute)"}
     };
 }
@@ -59,6 +71,7 @@ void OpenTelemetrySpanLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(span_id);
     columns[i++]->insert(parent_span_id);
     columns[i++]->insert(operation_name);
+    columns[i++]->insert(kind);
     columns[i++]->insert(start_time_us);
     columns[i++]->insert(finish_time_us);
     columns[i++]->insert(DateLUT::instance().toDayNum(finish_time_us / 1000000).toUnderType());
@@ -69,4 +82,3 @@ void OpenTelemetrySpanLogElement::appendToBlock(MutableColumns & columns) const
 }
 
 }
-
diff --git a/src/Interpreters/OpenTelemetrySpanLog.h b/src/Interpreters/OpenTelemetrySpanLog.h
index 9305605f30b..7368b184e5e 100644
--- a/src/Interpreters/OpenTelemetrySpanLog.h
+++ b/src/Interpreters/OpenTelemetrySpanLog.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Interpreters/SystemLog.h>
+#include <Common/OpenTelemetryTraceContext.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/NamesAndAliases.h>
 
diff --git a/src/Interpreters/OptimizeDateFilterVisitor.cpp b/src/Interpreters/OptimizeDateFilterVisitor.cpp
new file mode 100644
index 00000000000..58e1b3335f9
--- /dev/null
+++ b/src/Interpreters/OptimizeDateFilterVisitor.cpp
@@ -0,0 +1,121 @@
+#include <Interpreters/OptimizeDateFilterVisitor.h>
+
+#include <Common/DateLUT.h>
+#include <Common/DateLUTImpl.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+
+
+namespace DB
+{
+
+ASTPtr generateOptimizedDateFilterAST(const String & comparator, const String & converter, const String & column, UInt64 year)
+{
+    const DateLUTImpl & date_lut = DateLUT::instance();
+
+    if (converter != "toYear") return {};
+
+    String start_date = date_lut.dateToString(date_lut.makeDayNum(year, 1, 1));
+    String end_date = date_lut.dateToString(date_lut.makeDayNum(year, 12, 31));
+
+    if (comparator == "equals")
+    {
+        return makeASTFunction("and",
+                                makeASTFunction("greaterOrEquals",
+                                            std::make_shared<ASTIdentifier>(column),
+                                            std::make_shared<ASTLiteral>(start_date)
+                                            ),
+                                makeASTFunction("lessOrEquals",
+                                            std::make_shared<ASTIdentifier>(column),
+                                            std::make_shared<ASTLiteral>(end_date)
+                                            )
+                                );
+    }
+    else if (comparator == "notEquals")
+    {
+        return makeASTFunction("or",
+                                makeASTFunction("less",
+                                            std::make_shared<ASTIdentifier>(column),
+                                            std::make_shared<ASTLiteral>(start_date)
+                                            ),
+                                makeASTFunction("greater",
+                                            std::make_shared<ASTIdentifier>(column),
+                                            std::make_shared<ASTLiteral>(end_date)
+                                            )
+                                );
+    }
+    else if (comparator == "less" || comparator == "greaterOrEquals")
+    {
+        return makeASTFunction(comparator,
+                    std::make_shared<ASTIdentifier>(column),
+                    std::make_shared<ASTLiteral>(start_date)
+                    );
+    }
+    else
+    {
+        return makeASTFunction(comparator,
+                    std::make_shared<ASTIdentifier>(column),
+                    std::make_shared<ASTLiteral>(end_date)
+                    );
+    }
+}
+
+bool rewritePredicateInPlace(ASTFunction & function, ASTPtr & ast)
+{
+    const static std::unordered_map<String, String> swap_relations = {
+        {"equals", "equals"},
+        {"notEquals", "notEquals"},
+        {"less", "greater"},
+        {"greater", "less"},
+        {"lessOrEquals", "greaterOrEquals"},
+        {"greaterOrEquals", "lessOrEquals"},
+    };
+
+    if (!swap_relations.contains(function.name)) return false;
+
+    if (!function.arguments || function.arguments->children.size() != 2) return false;
+
+    size_t func_id = function.arguments->children.size();
+
+    for (size_t i = 0; i < function.arguments->children.size(); i++)
+    {
+        if (const auto * func = function.arguments->children[i]->as<ASTFunction>(); func)
+        {
+            if (func->name == "toYear")
+            {
+                func_id = i;
+            }
+        }
+    }
+
+    if (func_id == function.arguments->children.size()) return false;
+
+    size_t literal_id = 1 - func_id;
+    const auto * literal = function.arguments->children[literal_id]->as<ASTLiteral>();
+
+    if (!literal || literal->value.getType() != Field::Types::UInt64) return false;
+
+    UInt64 compare_to = literal->value.get<UInt64>();
+    String comparator = literal_id > func_id ? function.name : swap_relations.at(function.name);
+
+    const auto * func = function.arguments->children[func_id]->as<ASTFunction>();
+    const auto * column_id = func->arguments->children.at(0)->as<ASTIdentifier>();
+
+    if (!column_id) return false;
+
+    String column = column_id->name();
+
+    const auto new_ast = generateOptimizedDateFilterAST(comparator, func->name, column, compare_to);
+
+    if (!new_ast) return false;
+
+    ast = new_ast;
+    return true;
+}
+
+void OptimizeDateFilterInPlaceData::visit(ASTFunction & function, ASTPtr & ast) const
+{
+    rewritePredicateInPlace(function, ast);
+}
+}
diff --git a/src/Interpreters/OptimizeDateFilterVisitor.h b/src/Interpreters/OptimizeDateFilterVisitor.h
new file mode 100644
index 00000000000..84394372901
--- /dev/null
+++ b/src/Interpreters/OptimizeDateFilterVisitor.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <Interpreters/InDepthNodeVisitor.h>
+
+namespace DB
+{
+
+class ASTFunction;
+
+/// Rewrite the predicates in place
+class OptimizeDateFilterInPlaceData
+{
+public:
+    using TypeToVisit = ASTFunction;
+    void visit(ASTFunction & function, ASTPtr & ast) const;
+};
+
+using OptimizeDateFilterInPlaceMatcher = OneTypeMatcher<OptimizeDateFilterInPlaceData>;
+using OptimizeDateFilterInPlaceVisitor = InDepthNodeVisitor<OptimizeDateFilterInPlaceMatcher, true>;
+}
diff --git a/src/Interpreters/OptimizeIfChains.cpp b/src/Interpreters/OptimizeIfChains.cpp
index ba4c7bcd95f..9a5f9bcb2e1 100644
--- a/src/Interpreters/OptimizeIfChains.cpp
+++ b/src/Interpreters/OptimizeIfChains.cpp
@@ -64,6 +64,7 @@ ASTs OptimizeIfChainsVisitor::ifChain(const ASTPtr & child)
         throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected AST for function 'if'");
 
     const auto * function_args = function_node->arguments->as<ASTExpressionList>();
+    chassert(function_args);
 
     if (!function_args || function_args->children.size() != 3)
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
diff --git a/src/Interpreters/PartLog.cpp b/src/Interpreters/PartLog.cpp
index cf231cbd7c9..881fcae4de6 100644
--- a/src/Interpreters/PartLog.cpp
+++ b/src/Interpreters/PartLog.cpp
@@ -135,6 +135,7 @@ NamesAndAliases PartLogElement::getNamesAndAliases()
     {
         {"ProfileEvents.Names", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapKeys(ProfileEvents)"},
         {"ProfileEvents.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())}, "mapValues(ProfileEvents)"},
+        {"name", {std::make_shared<DataTypeString>()}, "part_name"},
     };
 }
 
diff --git a/src/Interpreters/PreparedSets.cpp b/src/Interpreters/PreparedSets.cpp
index 79cfb8b688a..7b0efddae87 100644
--- a/src/Interpreters/PreparedSets.cpp
+++ b/src/Interpreters/PreparedSets.cpp
@@ -1,7 +1,10 @@
+#include <chrono>
+#include <variant>
 #include <Interpreters/PreparedSets.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/Set.h>
+#include <IO/Operators.h>
 
 namespace DB
 {
@@ -43,6 +46,26 @@ bool PreparedSetKey::operator==(const PreparedSetKey & other) const
     return true;
 }
 
+String PreparedSetKey::toString() const
+{
+    WriteBufferFromOwnString buf;
+    buf << "__set_" << ast_hash.first << "_" << ast_hash.second;
+    if (!types.empty())
+    {
+        buf << "(";
+        bool first = true;
+        for (const auto & type : types)
+        {
+            if (!first)
+                buf << ",";
+            first = false;
+            buf << type->getName();
+        }
+        buf << ")";
+    }
+    return buf.str();
+}
+
 SubqueryForSet & PreparedSets::createOrGetSubquery(const String & subquery_id, const PreparedSetKey & key,
                                                    SizeLimits set_size_limit, bool transform_null_in)
 {
@@ -51,10 +74,20 @@ SubqueryForSet & PreparedSets::createOrGetSubquery(const String & subquery_id, c
     /// If you already created a Set with the same subquery / table for another ast
     /// In that case several PreparedSetKey would share same subquery and set
     /// Not sure if it's really possible case (maybe for distributed query when set was filled by external table?)
-    if (subquery.set)
+    if (subquery.set.isValid())
         sets[key] = subquery.set;
     else
-        sets[key] = subquery.set = std::make_shared<Set>(set_size_limit, false, transform_null_in);
+    {
+        subquery.set_in_progress = std::make_shared<Set>(set_size_limit, false, transform_null_in);
+        sets[key] = FutureSet(subquery.promise_to_fill_set.get_future());
+    }
+
+    if (!subquery.set_in_progress)
+    {
+        subquery.key = key.toString();
+        subquery.set_in_progress = std::make_shared<Set>(set_size_limit, false, transform_null_in);
+    }
+
     return subquery;
 }
 
@@ -62,13 +95,27 @@ SubqueryForSet & PreparedSets::createOrGetSubquery(const String & subquery_id, c
 /// It's aimed to fill external table passed to SubqueryForSet::createSource.
 SubqueryForSet & PreparedSets::getSubquery(const String & subquery_id) { return subqueries[subquery_id]; }
 
-void PreparedSets::set(const PreparedSetKey & key, SetPtr set_) { sets[key] = set_; }
+void PreparedSets::set(const PreparedSetKey & key, SetPtr set_) { sets[key] = FutureSet(set_); }
 
-SetPtr & PreparedSets::get(const PreparedSetKey & key) { return sets[key]; }
-
-std::vector<SetPtr> PreparedSets::getByTreeHash(IAST::Hash ast_hash)
+FutureSet PreparedSets::getFuture(const PreparedSetKey & key) const
 {
-    std::vector<SetPtr> res;
+    auto it = sets.find(key);
+    if (it == sets.end())
+        return {};
+    return it->second;
+}
+
+SetPtr PreparedSets::get(const PreparedSetKey & key) const
+{
+    auto it = sets.find(key);
+    if (it == sets.end() || !it->second.isReady())
+        return nullptr;
+    return it->second.get();
+}
+
+std::vector<FutureSet> PreparedSets::getByTreeHash(IAST::Hash ast_hash) const
+{
+    std::vector<FutureSet> res;
     for (const auto & it : this->sets)
     {
         if (it.first.ast_hash == ast_hash)
@@ -106,4 +153,45 @@ QueryPlanPtr SubqueryForSet::detachSource()
     return res;
 }
 
+
+FutureSet::FutureSet(SetPtr set)
+{
+    std::promise<SetPtr> promise;
+    promise.set_value(set);
+    *this = FutureSet(promise.get_future());
+}
+
+
+bool FutureSet::isReady() const
+{
+    return future_set.valid() &&
+        future_set.wait_for(std::chrono::seconds(0)) == std::future_status::ready;
+}
+
+bool FutureSet::isCreated() const
+{
+    return isReady() && get() != nullptr && get()->isCreated();
+}
+
+
+std::variant<std::promise<SetPtr>, SharedSet> PreparedSetsCache::findOrPromiseToBuild(const String & key)
+{
+    std::lock_guard lock(cache_mutex);
+
+    auto it = cache.find(key);
+    if (it != cache.end())
+    {
+        /// If the set is being built, return its future, but if it's ready and is nullptr then we should retry building it.
+        if (it->second.future.valid() &&
+            (it->second.future.wait_for(std::chrono::seconds(0)) != std::future_status::ready || it->second.future.get() != nullptr))
+            return it->second.future;
+    }
+
+    /// Insert the entry into the cache so that other threads can find it and start waiting for the set.
+    std::promise<SetPtr> promise_to_fill_set;
+    Entry & entry = cache[key];
+    entry.future = promise_to_fill_set.get_future();
+    return promise_to_fill_set;
+}
+
 };
diff --git a/src/Interpreters/PreparedSets.h b/src/Interpreters/PreparedSets.h
index a50e390ee5a..4a7d1c3de46 100644
--- a/src/Interpreters/PreparedSets.h
+++ b/src/Interpreters/PreparedSets.h
@@ -2,6 +2,7 @@
 
 #include <Parsers/IAST.h>
 #include <DataTypes/IDataType.h>
+#include <future>
 #include <memory>
 #include <unordered_map>
 #include <vector>
@@ -19,6 +20,37 @@ class Set;
 using SetPtr = std::shared_ptr<Set>;
 class InterpreterSelectWithUnionQuery;
 
+/// Represents a set in a query that might be referenced at analysis time and built later during execution.
+/// Also it can represent a constant set that is ready to use.
+/// At analysis stage the FutureSets are created but not necessarily filled. Then for non-constant sets there
+/// must be an explicit step to build them before they can be used.
+/// FutureSet objects can be stored in PreparedSets and are not intended to be used from multiple threads.
+class FutureSet final
+{
+public:
+    FutureSet() = default;
+
+    /// Create FutureSet from an object that will be created in the future.
+    explicit FutureSet(const std::shared_future<SetPtr> & future_set_) : future_set(future_set_) {}
+
+    /// Create FutureSet from a ready set.
+    explicit FutureSet(SetPtr readySet);
+
+    /// The set object will be ready in the future, as opposed to 'null' object  when FutureSet is default constructed.
+    bool isValid() const { return future_set.valid(); }
+
+    /// The the value of SetPtr is ready, but the set object might not have been filled yet.
+    bool isReady() const;
+
+    /// The set object is ready and filled.
+    bool isCreated() const;
+
+    SetPtr get() const { chassert(isReady()); return future_set.get(); }
+
+private:
+    std::shared_future<SetPtr> future_set;
+};
+
 /// Information on how to build set for the [GLOBAL] IN section.
 class SubqueryForSet
 {
@@ -33,7 +65,12 @@ public:
     std::unique_ptr<QueryPlan> detachSource();
 
     /// Build this set from the result of the subquery.
-    SetPtr set;
+    String key;
+    SetPtr set_in_progress;
+    /// After set_in_progress is finished it will be put into promise_to_fill_set and thus all FutureSet's
+    /// that are referencing this set will be filled.
+    std::promise<SetPtr> promise_to_fill_set;
+    FutureSet set = FutureSet{promise_to_fill_set.get_future()};
 
     /// If set, put the result into the table.
     /// This is a temporary table for transferring to remote servers for distributed query processing.
@@ -59,6 +96,8 @@ struct PreparedSetKey
 
     bool operator==(const PreparedSetKey & other) const;
 
+    String toString() const;
+
     struct Hash
     {
         UInt64 operator()(const PreparedSetKey & key) const { return key.ast_hash.first; }
@@ -75,7 +114,8 @@ public:
     SubqueryForSet & getSubquery(const String & subquery_id);
 
     void set(const PreparedSetKey & key, SetPtr set_);
-    SetPtr & get(const PreparedSetKey & key);
+    FutureSet getFuture(const PreparedSetKey & key) const;
+    SetPtr get(const PreparedSetKey & key) const;
 
     /// Get subqueries and clear them.
     /// We need to build a plan for subqueries just once. That's why we can clear them after accessing them.
@@ -84,12 +124,12 @@ public:
 
     /// Returns all sets that match the given ast hash not checking types
     /// Used in KeyCondition and MergeTreeIndexConditionBloomFilter to make non exact match for types in PreparedSetKey
-    std::vector<SetPtr> getByTreeHash(IAST::Hash ast_hash);
+    std::vector<FutureSet> getByTreeHash(IAST::Hash ast_hash) const;
 
     bool empty() const;
 
 private:
-    std::unordered_map<PreparedSetKey, SetPtr, PreparedSetKey::Hash> sets;
+    std::unordered_map<PreparedSetKey, FutureSet, PreparedSetKey::Hash> sets;
 
     /// This is the information required for building sets
     SubqueriesForSets subqueries;
@@ -97,4 +137,31 @@ private:
 
 using PreparedSetsPtr = std::shared_ptr<PreparedSets>;
 
+/// A reference to a set that is being built by another task.
+/// The difference from FutureSet is that this object can be used to wait for the set to be built in another thread.
+using SharedSet = std::shared_future<SetPtr>;
+
+/// This set cache is used to avoid building the same set multiple times. It is different from PreparedSets in way that
+/// it can be used across multiple queries. One use case is when we execute the same mutation on multiple parts. In this
+/// case each part is processed by a separate mutation task but they can share the same set.
+class PreparedSetsCache
+{
+public:
+    /// Lookup for set in the cache.
+    /// If it is found, get the future to be able to wait for the set to be built.
+    /// Otherwise create a promise, build the set and set the promise value.
+    std::variant<std::promise<SetPtr>, SharedSet> findOrPromiseToBuild(const String & key);
+
+private:
+    struct Entry
+    {
+        SharedSet future; /// Other tasks can wait for the set to be built.
+    };
+
+    std::mutex cache_mutex;
+    std::unordered_map<String, Entry> cache;
+};
+
+using PreparedSetsCachePtr = std::shared_ptr<PreparedSetsCache>;
+
 }
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index 49d7989ac5e..aca474bf152 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -203,10 +203,10 @@ ProcessList::insert(const String & query_, const IAST * ast, ContextMutablePtr q
         ProcessListForUser & user_process_list = user_process_list_it->second;
 
         /// Actualize thread group info
+        CurrentThread::attachQueryForLog(query_);
         auto thread_group = CurrentThread::getGroup();
         if (thread_group)
         {
-            std::lock_guard lock_thread_group(thread_group->mutex);
             thread_group->performance_counters.setParent(&user_process_list.user_performance_counters);
             thread_group->memory_tracker.setParent(&user_process_list.user_memory_tracker);
             if (user_process_list.user_temp_data_on_disk)
@@ -214,8 +214,6 @@ ProcessList::insert(const String & query_, const IAST * ast, ContextMutablePtr q
                 query_context->setTempDataOnDisk(std::make_shared<TemporaryDataOnDiskScope>(
                     user_process_list.user_temp_data_on_disk, settings.max_temporary_data_on_disk_size_for_query));
             }
-            thread_group->query = query_;
-            thread_group->normalized_query_hash = normalizedQueryHash<false>(query_);
 
             /// Set query-level memory trackers
             thread_group->memory_tracker.setOrRaiseHardLimit(settings.max_memory_usage);
@@ -342,7 +340,7 @@ QueryStatus::QueryStatus(
     const String & query_,
     const ClientInfo & client_info_,
     QueryPriorities::Handle && priority_handle_,
-    ThreadGroupStatusPtr && thread_group_,
+    ThreadGroupPtr && thread_group_,
     IAST::QueryKind query_kind_,
     UInt64 watch_start_nanoseconds)
     : WithContext(context_)
@@ -362,7 +360,11 @@ QueryStatus::QueryStatus(
 
 QueryStatus::~QueryStatus()
 {
-    assert(executors.empty());
+#if !defined(NDEBUG)
+    /// Check that all executors were invalidated.
+    for (const auto & [_, e] : executors)
+        assert(!e->executor);
+#endif
 
     if (auto * memory_tracker = getMemoryTracker())
     {
@@ -373,6 +375,19 @@ QueryStatus::~QueryStatus()
     }
 }
 
+void QueryStatus::ExecutorHolder::cancel()
+{
+    std::lock_guard lock(mutex);
+    if (executor)
+        executor->cancel();
+}
+
+void QueryStatus::ExecutorHolder::remove()
+{
+    std::lock_guard lock(mutex);
+    executor = nullptr;
+}
+
 CancellationCode QueryStatus::cancelQuery(bool)
 {
     if (is_killed.load())
@@ -380,8 +395,27 @@ CancellationCode QueryStatus::cancelQuery(bool)
 
     is_killed.store(true);
 
-    std::lock_guard lock(executors_mutex);
-    for (auto * e : executors)
+    std::vector<ExecutorHolderPtr> executors_snapshot;
+
+    {
+        /// Create a snapshot of executors under a mutex.
+        std::lock_guard lock(executors_mutex);
+        executors_snapshot.reserve(executors.size());
+        for (const auto & [_, e] : executors)
+            executors_snapshot.push_back(e);
+    }
+
+    /// We should call cancel() for each executor with unlocked executors_mutex, because
+    /// cancel() can try to lock some internal mutex that is already locked by query executing
+    /// thread, and query executing thread can call removePipelineExecutor and lock executors_mutex,
+    /// which will lead to deadlock.
+    /// Note that the size and the content of executors cannot be changed while
+    /// executors_mutex is unlocked, because:
+    /// 1) We don't allow adding new executors while cancelling query in addPipelineExecutor
+    /// 2) We don't actually remove executor holder from executors in removePipelineExecutor,
+    /// just mark that executor is invalid.
+    /// So, it's ok to use a snapshot created above under a mutex, it won't be any differ from actual executors.
+    for (const auto & e : executors_snapshot)
         e->cancel();
 
     return CancellationCode::CancelSent;
@@ -396,15 +430,24 @@ void QueryStatus::addPipelineExecutor(PipelineExecutor * e)
         throw Exception(ErrorCodes::QUERY_WAS_CANCELLED, "Query was cancelled");
 
     std::lock_guard lock(executors_mutex);
-    assert(std::find(executors.begin(), executors.end(), e) == executors.end());
-    executors.push_back(e);
+    assert(!executors.contains(e));
+    executors[e] = std::make_shared<ExecutorHolder>(e);
 }
 
 void QueryStatus::removePipelineExecutor(PipelineExecutor * e)
 {
-    std::lock_guard lock(executors_mutex);
-    assert(std::find(executors.begin(), executors.end(), e) != executors.end());
-    std::erase_if(executors, [e](PipelineExecutor * x) { return x == e; });
+    ExecutorHolderPtr executor_holder;
+
+    {
+        std::lock_guard lock(executors_mutex);
+        assert(executors.contains(e));
+        executor_holder = executors[e];
+        executors.erase(e);
+    }
+
+    /// Invalidate executor pointer inside holder.
+    /// We should do it with released executors_mutex to avoid possible lock order inversion.
+    executor_holder->remove();
 }
 
 bool QueryStatus::checkTimeLimit()
@@ -540,10 +583,7 @@ QueryStatusInfo QueryStatus::getInfo(bool get_thread_list, bool get_profile_even
         res.peak_memory_usage = thread_group->memory_tracker.getPeak();
 
         if (get_thread_list)
-        {
-            std::lock_guard lock(thread_group->mutex);
-            res.thread_ids.assign(thread_group->thread_ids.begin(), thread_group->thread_ids.end());
-        }
+            res.thread_ids = thread_group->getInvolvedThreadIds();
 
         if (get_profile_events)
             res.profile_counters = std::make_shared<ProfileEvents::Counters::Snapshot>(thread_group->performance_counters.getPartiallyAtomicSnapshot());
@@ -585,7 +625,7 @@ ProcessListForUser::ProcessListForUser(ContextPtr global_context, ProcessList *
     if (global_context)
     {
         size_t size_limit = global_context->getSettingsRef().max_temporary_data_on_disk_size_for_user;
-        user_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(global_context->getTempDataOnDisk(), size_limit);
+        user_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(global_context->getSharedTempDataOnDisk(), size_limit);
     }
 }
 
diff --git a/src/Interpreters/ProcessList.h b/src/Interpreters/ProcessList.h
index d5c136ab62a..b593bcef395 100644
--- a/src/Interpreters/ProcessList.h
+++ b/src/Interpreters/ProcessList.h
@@ -86,7 +86,7 @@ protected:
     ClientInfo client_info;
 
     /// Info about all threads involved in query execution
-    ThreadGroupStatusPtr thread_group;
+    ThreadGroupPtr thread_group;
 
     Stopwatch watch;
 
@@ -119,8 +119,22 @@ protected:
 
     mutable std::mutex executors_mutex;
 
-    /// Array of PipelineExecutors to be cancelled when a cancelQuery is received
-    std::vector<PipelineExecutor *> executors;
+    struct ExecutorHolder
+    {
+        ExecutorHolder(PipelineExecutor * e) : executor(e) {}
+
+        void cancel();
+
+        void remove();
+
+        PipelineExecutor * executor;
+        std::mutex mutex;
+    };
+
+    using ExecutorHolderPtr = std::shared_ptr<ExecutorHolder>;
+
+    /// Container of PipelineExecutors to be cancelled when a cancelQuery is received
+    std::unordered_map<PipelineExecutor *, ExecutorHolderPtr> executors;
 
     enum QueryStreamsStatus
     {
@@ -148,7 +162,7 @@ public:
         const String & query_,
         const ClientInfo & client_info_,
         QueryPriorities::Handle && priority_handle_,
-        ThreadGroupStatusPtr && thread_group_,
+        ThreadGroupPtr && thread_group_,
         IAST::QueryKind query_kind_,
         UInt64 watch_start_nanoseconds);
 
diff --git a/src/Interpreters/ProcessorsProfileLog.cpp b/src/Interpreters/ProcessorsProfileLog.cpp
index f6ce801605a..e78a07bb752 100644
--- a/src/Interpreters/ProcessorsProfileLog.cpp
+++ b/src/Interpreters/ProcessorsProfileLog.cpp
@@ -29,6 +29,7 @@ NamesAndTypesList ProcessorProfileLogElement::getNamesAndTypes()
         {"plan_step", std::make_shared<DataTypeUInt64>()},
         {"plan_group", std::make_shared<DataTypeUInt64>()},
 
+        {"initial_query_id", std::make_shared<DataTypeString>()},
         {"query_id", std::make_shared<DataTypeString>()},
         {"name", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
         {"elapsed_us", std::make_shared<DataTypeUInt64>()},
@@ -60,6 +61,7 @@ void ProcessorProfileLogElement::appendToBlock(MutableColumns & columns) const
 
     columns[i++]->insert(plan_step);
     columns[i++]->insert(plan_group);
+    columns[i++]->insertData(initial_query_id.data(), initial_query_id.size());
     columns[i++]->insertData(query_id.data(), query_id.size());
     columns[i++]->insertData(processor_name.data(), processor_name.size());
     columns[i++]->insert(elapsed_us);
diff --git a/src/Interpreters/ProcessorsProfileLog.h b/src/Interpreters/ProcessorsProfileLog.h
index 07837bdd10e..81d58edd913 100644
--- a/src/Interpreters/ProcessorsProfileLog.h
+++ b/src/Interpreters/ProcessorsProfileLog.h
@@ -19,6 +19,7 @@ struct ProcessorProfileLogElement
     UInt64 plan_step{};
     UInt64 plan_group{};
 
+    String initial_query_id;
     String query_id;
     String processor_name;
 
diff --git a/src/Interpreters/ProfileEventsExt.cpp b/src/Interpreters/ProfileEventsExt.cpp
index 0f6b52b2611..bf8d060bd3c 100644
--- a/src/Interpreters/ProfileEventsExt.cpp
+++ b/src/Interpreters/ProfileEventsExt.cpp
@@ -10,6 +10,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDateTime.h>
 
 namespace ProfileEvents
 {
@@ -32,7 +33,7 @@ void dumpToMapColumn(const Counters::Snapshot & counters, DB::IColumn * column,
     auto & value_column = tuple_column.getColumn(1);
 
     size_t size = 0;
-    for (Event event = 0; event < Counters::num_counters; ++event)
+    for (Event event = Event(0); event < Counters::num_counters; ++event)
     {
         UInt64 value = counters[event];
 
@@ -54,7 +55,7 @@ static void dumpProfileEvents(ProfileEventsSnapshot const & snapshot, DB::Mutabl
     size_t rows = 0;
     auto & name_column = columns[NAME_COLUMN_INDEX];
     auto & value_column = columns[VALUE_COLUMN_INDEX];
-    for (Event event = 0; event < Counters::num_counters; ++event)
+    for (Event event = Event(0); event < Counters::num_counters; ++event)
     {
         Int64 value = snapshot.counters[event];
 
@@ -113,34 +114,10 @@ void getProfileEvents(
     block = std::move(temp_columns);
     MutableColumns columns = block.mutateColumns();
     auto thread_group = CurrentThread::getGroup();
-    auto const current_thread_id = CurrentThread::get().thread_id;
-    std::vector<ProfileEventsSnapshot> snapshots;
     ThreadIdToCountersSnapshot new_snapshots;
+
     ProfileEventsSnapshot group_snapshot;
     {
-        auto stats = thread_group->getProfileEventsCountersAndMemoryForThreads();
-        snapshots.reserve(stats.size());
-
-        for (auto & stat : stats)
-        {
-            auto const thread_id = stat.thread_id;
-            if (thread_id == current_thread_id)
-                continue;
-            auto current_time = time(nullptr);
-            auto previous_snapshot = last_sent_snapshots.find(thread_id);
-            auto increment =
-                previous_snapshot != last_sent_snapshots.end()
-                ? CountersIncrement(stat.counters, previous_snapshot->second)
-                : CountersIncrement(stat.counters);
-            snapshots.push_back(ProfileEventsSnapshot{
-                thread_id,
-                std::move(increment),
-                stat.memory_usage,
-                current_time
-            });
-            new_snapshots[thread_id] = std::move(stat.counters);
-        }
-
         group_snapshot.thread_id    = 0;
         group_snapshot.current_time = time(nullptr);
         group_snapshot.memory_usage = thread_group->memory_tracker.get();
@@ -154,11 +131,6 @@ void getProfileEvents(
     }
     last_sent_snapshots = std::move(new_snapshots);
 
-    for (auto & snapshot : snapshots)
-    {
-        dumpProfileEvents(snapshot, columns, server_display_name);
-        dumpMemoryTracker(snapshot, columns, server_display_name);
-    }
     dumpProfileEvents(group_snapshot, columns, server_display_name);
     dumpMemoryTracker(group_snapshot, columns, server_display_name);
 
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index 5015f3e4a6e..ec0315c2f95 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -41,6 +41,9 @@ NamesAndTypesList QueryLogElement::getNamesAndTypes()
             {"ExceptionWhileProcessing",    static_cast<Int8>(EXCEPTION_WHILE_PROCESSING)}
         });
 
+    auto low_cardinality_string = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+    auto array_low_cardinality_string = std::make_shared<DataTypeArray>(low_cardinality_string);
+
     return
     {
         {"type", std::move(query_status_datatype)},
@@ -59,31 +62,27 @@ NamesAndTypesList QueryLogElement::getNamesAndTypes()
         {"result_bytes", std::make_shared<DataTypeUInt64>()},
         {"memory_usage", std::make_shared<DataTypeUInt64>()},
 
-        {"current_database", std::make_shared<DataTypeString>()},
+        {"current_database", low_cardinality_string},
         {"query", std::make_shared<DataTypeString>()},
         {"formatted_query", std::make_shared<DataTypeString>()},
         {"normalized_query_hash", std::make_shared<DataTypeUInt64>()},
-        {"query_kind", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"databases", std::make_shared<DataTypeArray>(
-            std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()))},
-        {"tables", std::make_shared<DataTypeArray>(
-            std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()))},
-        {"columns", std::make_shared<DataTypeArray>(
-            std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()))},
-        {"projections", std::make_shared<DataTypeArray>(
-            std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()))},
-        {"views", std::make_shared<DataTypeArray>(
-            std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()))},
+        {"query_kind", low_cardinality_string},
+        {"databases", array_low_cardinality_string},
+        {"tables", array_low_cardinality_string},
+        {"columns", array_low_cardinality_string},
+        {"partitions", array_low_cardinality_string},
+        {"projections", array_low_cardinality_string},
+        {"views", array_low_cardinality_string},
         {"exception_code", std::make_shared<DataTypeInt32>()},
         {"exception", std::make_shared<DataTypeString>()},
         {"stack_trace", std::make_shared<DataTypeString>()},
 
         {"is_initial_query", std::make_shared<DataTypeUInt8>()},
-        {"user", std::make_shared<DataTypeString>()},
+        {"user", low_cardinality_string},
         {"query_id", std::make_shared<DataTypeString>()},
         {"address", DataTypeFactory::instance().get("IPv6")},
         {"port", std::make_shared<DataTypeUInt16>()},
-        {"initial_user", std::make_shared<DataTypeString>()},
+        {"initial_user", low_cardinality_string},
         {"initial_query_id", std::make_shared<DataTypeString>()},
         {"initial_address", DataTypeFactory::instance().get("IPv6")},
         {"initial_port", std::make_shared<DataTypeUInt16>()},
@@ -91,15 +90,15 @@ NamesAndTypesList QueryLogElement::getNamesAndTypes()
         {"initial_query_start_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
         {"interface", std::make_shared<DataTypeUInt8>()},
         {"is_secure", std::make_shared<DataTypeUInt8>()},
-        {"os_user", std::make_shared<DataTypeString>()},
-        {"client_hostname", std::make_shared<DataTypeString>()},
-        {"client_name", std::make_shared<DataTypeString>()},
+        {"os_user", low_cardinality_string},
+        {"client_hostname", low_cardinality_string},
+        {"client_name", low_cardinality_string},
         {"client_revision", std::make_shared<DataTypeUInt32>()},
         {"client_version_major", std::make_shared<DataTypeUInt32>()},
         {"client_version_minor", std::make_shared<DataTypeUInt32>()},
         {"client_version_patch", std::make_shared<DataTypeUInt32>()},
         {"http_method", std::make_shared<DataTypeUInt8>()},
-        {"http_user_agent", std::make_shared<DataTypeString>()},
+        {"http_user_agent", low_cardinality_string},
         {"http_referer", std::make_shared<DataTypeString>()},
         {"forwarded_for", std::make_shared<DataTypeString>()},
         {"quota_key", std::make_shared<DataTypeString>()},
@@ -110,36 +109,38 @@ NamesAndTypesList QueryLogElement::getNamesAndTypes()
         {"log_comment", std::make_shared<DataTypeString>()},
 
         {"thread_ids", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
-        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>())},
-        {"Settings", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeString>())},
+        {"ProfileEvents", std::make_shared<DataTypeMap>(low_cardinality_string, std::make_shared<DataTypeUInt64>())},
+        {"Settings", std::make_shared<DataTypeMap>(low_cardinality_string, low_cardinality_string)},
 
-        {"used_aggregate_functions", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"used_aggregate_function_combinators", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"used_database_engines", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"used_data_type_families", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"used_dictionaries", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"used_formats", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"used_functions", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"used_storages", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"used_table_functions", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"used_aggregate_functions", array_low_cardinality_string},
+        {"used_aggregate_function_combinators", array_low_cardinality_string},
+        {"used_database_engines", array_low_cardinality_string},
+        {"used_data_type_families", array_low_cardinality_string},
+        {"used_dictionaries", array_low_cardinality_string},
+        {"used_formats", array_low_cardinality_string},
+        {"used_functions", array_low_cardinality_string},
+        {"used_storages", array_low_cardinality_string},
+        {"used_table_functions", array_low_cardinality_string},
 
-        {"used_row_policies", std::make_shared<DataTypeArray>(std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()))},
+        {"used_row_policies", array_low_cardinality_string},
 
         {"transaction_id", getTransactionIDDataType()},
 
-        {"AsyncReadCounters", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>())},
+        {"asynchronous_read_counters", std::make_shared<DataTypeMap>(low_cardinality_string, std::make_shared<DataTypeUInt64>())},
     };
-
 }
 
 NamesAndAliases QueryLogElement::getNamesAndAliases()
 {
+    auto low_cardinality_string = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+    auto array_low_cardinality_string = std::make_shared<DataTypeArray>(low_cardinality_string);
+
     return
     {
-        {"ProfileEvents.Names", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapKeys(ProfileEvents)"},
+        {"ProfileEvents.Names", array_low_cardinality_string, "mapKeys(ProfileEvents)"},
         {"ProfileEvents.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())}, "mapValues(ProfileEvents)"},
-        {"Settings.Names", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapKeys(Settings)" },
-        {"Settings.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapValues(Settings)"}
+        {"Settings.Names", array_low_cardinality_string, "mapKeys(Settings)" },
+        {"Settings.Values", array_low_cardinality_string, "mapValues(Settings)"}
     };
 }
 
@@ -176,6 +177,7 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
         auto & column_databases = typeid_cast<ColumnArray &>(*columns[i++]);
         auto & column_tables = typeid_cast<ColumnArray &>(*columns[i++]);
         auto & column_columns = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_partitions = typeid_cast<ColumnArray &>(*columns[i++]);
         auto & column_projections = typeid_cast<ColumnArray &>(*columns[i++]);
         auto & column_views = typeid_cast<ColumnArray &>(*columns[i++]);
 
@@ -194,6 +196,7 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
         fill_column(query_databases, column_databases);
         fill_column(query_tables, column_tables);
         fill_column(query_columns, column_columns);
+        fill_column(query_partitions, column_partitions);
         fill_column(query_projections, column_projections);
         fill_column(query_views, column_views);
     }
diff --git a/src/Interpreters/QueryLog.h b/src/Interpreters/QueryLog.h
index a2d434e8843..570d1297239 100644
--- a/src/Interpreters/QueryLog.h
+++ b/src/Interpreters/QueryLog.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Common/ProfileEvents.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/NamesAndAliases.h>
 #include <Core/Settings.h>
@@ -64,6 +65,7 @@ struct QueryLogElement
     std::set<String> query_databases;
     std::set<String> query_tables;
     std::set<String> query_columns;
+    std::set<String> query_partitions;
     std::set<String> query_projections;
     std::set<String> query_views;
 
diff --git a/src/Interpreters/QueryThreadLog.cpp b/src/Interpreters/QueryThreadLog.cpp
index 3b28df17999..fe9c8f91d30 100644
--- a/src/Interpreters/QueryThreadLog.cpp
+++ b/src/Interpreters/QueryThreadLog.cpp
@@ -10,6 +10,7 @@
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/ProfileEventsExt.h>
 #include <Interpreters/QueryLog.h>
@@ -22,7 +23,10 @@ namespace DB
 
 NamesAndTypesList QueryThreadLogElement::getNamesAndTypes()
 {
-    return {
+    auto low_cardinality_string = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+
+    return
+    {
         {"event_date", std::make_shared<DataTypeDate>()},
         {"event_time", std::make_shared<DataTypeDateTime>()},
         {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
@@ -37,19 +41,19 @@ NamesAndTypesList QueryThreadLogElement::getNamesAndTypes()
         {"memory_usage", std::make_shared<DataTypeInt64>()},
         {"peak_memory_usage", std::make_shared<DataTypeInt64>()},
 
-        {"thread_name", std::make_shared<DataTypeString>()},
+        {"thread_name", low_cardinality_string},
         {"thread_id", std::make_shared<DataTypeUInt64>()},
         {"master_thread_id", std::make_shared<DataTypeUInt64>()},
-        {"current_database", std::make_shared<DataTypeString>()},
+        {"current_database", low_cardinality_string},
         {"query", std::make_shared<DataTypeString>()},
         {"normalized_query_hash", std::make_shared<DataTypeUInt64>()},
 
         {"is_initial_query", std::make_shared<DataTypeUInt8>()},
-        {"user", std::make_shared<DataTypeString>()},
+        {"user", low_cardinality_string},
         {"query_id", std::make_shared<DataTypeString>()},
         {"address", DataTypeFactory::instance().get("IPv6")},
         {"port", std::make_shared<DataTypeUInt16>()},
-        {"initial_user", std::make_shared<DataTypeString>()},
+        {"initial_user", low_cardinality_string},
         {"initial_query_id", std::make_shared<DataTypeString>()},
         {"initial_address", DataTypeFactory::instance().get("IPv6")},
         {"initial_port", std::make_shared<DataTypeUInt16>()},
@@ -57,15 +61,15 @@ NamesAndTypesList QueryThreadLogElement::getNamesAndTypes()
         {"initial_query_start_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
         {"interface", std::make_shared<DataTypeUInt8>()},
         {"is_secure", std::make_shared<DataTypeUInt8>()},
-        {"os_user", std::make_shared<DataTypeString>()},
-        {"client_hostname", std::make_shared<DataTypeString>()},
-        {"client_name", std::make_shared<DataTypeString>()},
+        {"os_user", low_cardinality_string},
+        {"client_hostname", low_cardinality_string},
+        {"client_name", low_cardinality_string},
         {"client_revision", std::make_shared<DataTypeUInt32>()},
         {"client_version_major", std::make_shared<DataTypeUInt32>()},
         {"client_version_minor", std::make_shared<DataTypeUInt32>()},
         {"client_version_patch", std::make_shared<DataTypeUInt32>()},
         {"http_method", std::make_shared<DataTypeUInt8>()},
-        {"http_user_agent", std::make_shared<DataTypeString>()},
+        {"http_user_agent", low_cardinality_string},
         {"http_referer", std::make_shared<DataTypeString>()},
         {"forwarded_for", std::make_shared<DataTypeString>()},
         {"quota_key", std::make_shared<DataTypeString>()},
@@ -73,7 +77,7 @@ NamesAndTypesList QueryThreadLogElement::getNamesAndTypes()
 
         {"revision", std::make_shared<DataTypeUInt32>()},
 
-        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>())},
+        {"ProfileEvents", std::make_shared<DataTypeMap>(low_cardinality_string, std::make_shared<DataTypeUInt64>())},
     };
 }
 
@@ -81,7 +85,7 @@ NamesAndAliases QueryThreadLogElement::getNamesAndAliases()
 {
     return
     {
-        {"ProfileEvents.Names", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapKeys(ProfileEvents)"},
+        {"ProfileEvents.Names", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()))}, "mapKeys(ProfileEvents)"},
         {"ProfileEvents.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())}, "mapValues(ProfileEvents)"}
     };
 }
diff --git a/src/Interpreters/QueryThreadLog.h b/src/Interpreters/QueryThreadLog.h
index 6cdb3142ba3..684d7fce53e 100644
--- a/src/Interpreters/QueryThreadLog.h
+++ b/src/Interpreters/QueryThreadLog.h
@@ -2,16 +2,11 @@
 
 #include <Interpreters/SystemLog.h>
 #include <Interpreters/ClientInfo.h>
+#include <Common/ProfileEvents.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/NamesAndAliases.h>
 
 
-namespace ProfileEvents
-{
-    class Counters;
-}
-
-
 namespace DB
 {
 
diff --git a/src/Interpreters/QueryViewsLog.h b/src/Interpreters/QueryViewsLog.h
index 986311fc822..e28bce0b91c 100644
--- a/src/Interpreters/QueryViewsLog.h
+++ b/src/Interpreters/QueryViewsLog.h
@@ -13,6 +13,7 @@
 #include <Core/NamesAndAliases.h>
 #include <Interpreters/SystemLog.h>
 #include <base/types.h>
+#include <Common/ProfileEvents.h>
 
 namespace ProfileEvents
 {
diff --git a/src/Interpreters/ReplaceQueryParameterVisitor.cpp b/src/Interpreters/ReplaceQueryParameterVisitor.cpp
index f271de26ca4..e4a052388ac 100644
--- a/src/Interpreters/ReplaceQueryParameterVisitor.cpp
+++ b/src/Interpreters/ReplaceQueryParameterVisitor.cpp
@@ -1,6 +1,7 @@
 #include <Columns/IColumn.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeString.h>
 #include <Formats/FormatSettings.h>
 #include <IO/ReadBufferFromString.h>
 #include <Interpreters/IdentifierSemantic.h>
@@ -50,7 +51,16 @@ void ReplaceQueryParameterVisitor::visit(ASTPtr & ast)
 void ReplaceQueryParameterVisitor::visitChildren(ASTPtr & ast)
 {
     for (auto & child : ast->children)
+    {
+        void * old_ptr = child.get();
         visit(child);
+        void * new_ptr = child.get();
+
+        /// Some AST classes have naked pointers to children elements as members.
+        /// We have to replace them if the child was replaced.
+        if (new_ptr != old_ptr)
+            ast->updatePointerToChild(old_ptr, new_ptr);
+    }
 }
 
 const String & ReplaceQueryParameterVisitor::getParamValue(const String & name)
@@ -74,7 +84,20 @@ void ReplaceQueryParameterVisitor::visitQueryParameter(ASTPtr & ast)
     IColumn & temp_column = *temp_column_ptr;
     ReadBufferFromString read_buffer{value};
     FormatSettings format_settings;
-    data_type->getDefaultSerialization()->deserializeTextEscaped(temp_column, read_buffer, format_settings);
+
+    const SerializationPtr & serialization = data_type->getDefaultSerialization();
+    try
+    {
+        if (ast_param.name == "_request_body")
+            serialization->deserializeWholeText(temp_column, read_buffer, format_settings);
+        else
+            serialization->deserializeTextEscaped(temp_column, read_buffer, format_settings);
+    }
+    catch (Exception & e)
+    {
+        e.addMessage("value {} cannot be parsed as {} for query parameter '{}'", value, type_name, ast_param.name);
+        throw;
+    }
 
     if (!read_buffer.eof())
         throw Exception(ErrorCodes::BAD_QUERY_PARAMETER,
@@ -89,7 +112,14 @@ void ReplaceQueryParameterVisitor::visitQueryParameter(ASTPtr & ast)
         literal = value;
     else
         literal = temp_column[0];
-    ast = addTypeConversionToAST(std::make_shared<ASTLiteral>(literal), type_name);
+
+    /// If it's a String, substitute it in the form of a string literal without CAST
+    /// to enable substitutions in simple queries that don't support expressions
+    /// (such as CREATE USER).
+    if (typeid_cast<const DataTypeString *>(data_type.get()))
+        ast = std::make_shared<ASTLiteral>(literal);
+    else
+        ast = addTypeConversionToAST(std::make_shared<ASTLiteral>(literal), type_name);
 
     /// Keep the original alias.
     ast->setAlias(alias);
diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp
index 2d4f807ad46..4335cde47f9 100644
--- a/src/Interpreters/RowRefs.cpp
+++ b/src/Interpreters/RowRefs.cpp
@@ -74,9 +74,8 @@ class SortedLookupVector : public SortedLookupVectorBase
 
 
 public:
-    using Keys = std::vector<TKey>;
-    using Entries = PaddedPODArray<Entry>;
-    using RowRefs = PaddedPODArray<RowRef>;
+    using Entries = PODArrayWithStackMemory<Entry, sizeof(Entry)>;
+    using RowRefs = PODArrayWithStackMemory<RowRef, sizeof(RowRef)>;
 
     static constexpr bool is_descending = (inequality == ASOFJoinInequality::Greater || inequality == ASOFJoinInequality::GreaterOrEquals);
     static constexpr bool is_strict = (inequality == ASOFJoinInequality::Less) || (inequality == ASOFJoinInequality::Greater);
diff --git a/src/Interpreters/RowRefs.h b/src/Interpreters/RowRefs.h
index 294da1da571..650b2311ba7 100644
--- a/src/Interpreters/RowRefs.h
+++ b/src/Interpreters/RowRefs.h
@@ -63,7 +63,8 @@ struct RowRefList : RowRef
                 return batch;
             }
 
-            row_refs[size++] = std::move(row_ref);
+            row_refs[size] = std::move(row_ref);
+            ++size;
             return this;
         }
     };
diff --git a/src/Interpreters/Session.cpp b/src/Interpreters/Session.cpp
index 7411050aa2d..64f7b4fc934 100644
--- a/src/Interpreters/Session.cpp
+++ b/src/Interpreters/Session.cpp
@@ -107,7 +107,7 @@ public:
         if (it == sessions.end())
         {
             if (throw_if_not_found)
-                throw Exception(ErrorCodes::SESSION_NOT_FOUND, "Session not found.");
+                throw Exception(ErrorCodes::SESSION_NOT_FOUND, "Session {} not found", session_id);
 
             /// Create a new session from current context.
             auto context = Context::createCopy(global_context);
@@ -129,7 +129,7 @@ public:
             LOG_TEST(log, "Reuse session from storage with session_id: {}, user_id: {}", key.second, key.first);
 
             if (!session.unique())
-                throw Exception(ErrorCodes::SESSION_IS_LOCKED, "Session is locked by a concurrent client.");
+                throw Exception(ErrorCodes::SESSION_IS_LOCKED, "Session {} is locked by a concurrent client", session_id);
             return {session, false};
         }
     }
@@ -140,6 +140,26 @@ public:
         scheduleCloseSession(session, lock);
     }
 
+    void releaseAndCloseSession(const UUID & user_id, const String & session_id, std::shared_ptr<NamedSessionData> & session_data)
+    {
+        std::unique_lock lock(mutex);
+        scheduleCloseSession(*session_data, lock);
+        session_data = nullptr;
+
+        Key key{user_id, session_id};
+        auto it = sessions.find(key);
+        if (it == sessions.end())
+        {
+            LOG_INFO(log, "Session {} not found for user {}, probably it's already closed", session_id, user_id);
+            return;
+        }
+
+        if (!it->second.unique())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot close session {} with refcount {}", session_id, it->second.use_count());
+
+        sessions.erase(it);
+    }
+
 private:
     class SessionKeyHash
     {
@@ -408,7 +428,7 @@ ContextMutablePtr Session::makeSessionContext(const String & session_name_, std:
     std::shared_ptr<NamedSessionData> new_named_session;
     bool new_named_session_created = false;
     std::tie(new_named_session, new_named_session_created)
-        = NamedSessionsStorage::instance().acquireSession(global_context, user_id.value_or(UUID{}), session_name_, timeout_, session_check_);
+        = NamedSessionsStorage::instance().acquireSession(global_context, *user_id, session_name_, timeout_, session_check_);
 
     auto new_session_context = new_named_session->context;
     new_session_context->makeSessionContext();
@@ -533,5 +553,17 @@ void Session::releaseSessionID()
     named_session = nullptr;
 }
 
+void Session::closeSession(const String & session_id)
+{
+    if (!user_id)   /// User was not authenticated
+        return;
+
+    /// named_session may be not set due to an early exception
+    if (!named_session)
+        return;
+
+    NamedSessionsStorage::instance().releaseAndCloseSession(*user_id, session_id, named_session);
+}
+
 }
 
diff --git a/src/Interpreters/Session.h b/src/Interpreters/Session.h
index 0f17c378915..d7c06a60464 100644
--- a/src/Interpreters/Session.h
+++ b/src/Interpreters/Session.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/SettingsChanges.h>
-#include <Access/Common/AuthenticationData.h>
+#include <Access/AuthenticationData.h>
 #include <Interpreters/ClientInfo.h>
 #include <Interpreters/Context_fwd.h>
 
@@ -77,6 +77,9 @@ public:
     /// Releases the currently used session ID so it becomes available for reuse by another session.
     void releaseSessionID();
 
+    /// Closes and removes session
+    void closeSession(const String & session_id);
+
 private:
     std::shared_ptr<SessionLog> getSessionLog() const;
     ContextMutablePtr makeQueryContextImpl(const ClientInfo * client_info_to_copy, ClientInfo * client_info_to_move) const;
diff --git a/src/Interpreters/SessionLog.cpp b/src/Interpreters/SessionLog.cpp
index 79aac63b40c..c930013e52b 100644
--- a/src/Interpreters/SessionLog.cpp
+++ b/src/Interpreters/SessionLog.cpp
@@ -87,9 +87,10 @@ NamesAndTypesList SessionLogElement::getNamesAndTypes()
             AUTH_TYPE_NAME_AND_VALUE(AuthType::LDAP),
             AUTH_TYPE_NAME_AND_VALUE(AuthType::KERBEROS),
             AUTH_TYPE_NAME_AND_VALUE(AuthType::SSL_CERTIFICATE),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::BCRYPT_PASSWORD),
         });
 #undef AUTH_TYPE_NAME_AND_VALUE
-    static_assert(static_cast<int>(AuthenticationType::MAX) == 7);
+    static_assert(static_cast<int>(AuthenticationType::MAX) == 8);
 
     auto interface_type_column = std::make_shared<DataTypeEnum8>(
         DataTypeEnum8::Values
diff --git a/src/Interpreters/SessionLog.h b/src/Interpreters/SessionLog.h
index 990c7ffea01..1282ac09c4d 100644
--- a/src/Interpreters/SessionLog.h
+++ b/src/Interpreters/SessionLog.h
@@ -2,7 +2,7 @@
 
 #include <Interpreters/SystemLog.h>
 #include <Interpreters/ClientInfo.h>
-#include <Access/Common/AuthenticationData.h>
+#include <Access/Common/AuthenticationType.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/NamesAndAliases.h>
 #include <Columns/IColumn.h>
diff --git a/src/Interpreters/Set.cpp b/src/Interpreters/Set.cpp
index 75bb05f8346..a7bea63bd99 100644
--- a/src/Interpreters/Set.cpp
+++ b/src/Interpreters/Set.cpp
@@ -236,6 +236,11 @@ bool Set::insertFromBlock(const Columns & columns)
     return limits.check(data.getTotalRowCount(), data.getTotalByteCount(), "IN-set", ErrorCodes::SET_SIZE_LIMIT_EXCEEDED);
 }
 
+void Set::checkIsCreated() const
+{
+    if (!is_created.load())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: Trying to use set before it has been built.");
+}
 
 ColumnPtr Set::execute(const ColumnsWithTypeAndName & columns, bool negative) const
 {
diff --git a/src/Interpreters/Set.h b/src/Interpreters/Set.h
index 00eff614c7c..fff5fa4e1b1 100644
--- a/src/Interpreters/Set.h
+++ b/src/Interpreters/Set.h
@@ -8,7 +8,6 @@
 #include <Storages/MergeTree/BoolMask.h>
 
 #include <Common/SharedMutex.h>
-#include <Common/logger_useful.h>
 
 
 namespace DB
@@ -55,6 +54,8 @@ public:
     /// finishInsert and isCreated are thread-safe
     bool isCreated() const { return is_created.load(); }
 
+    void checkIsCreated() const;
+
     /** For columns of 'block', check belonging of corresponding rows to the set.
       * Return UInt8 column with the result.
       */
@@ -68,7 +69,7 @@ public:
     const DataTypes & getElementsTypes() const { return set_elements_types; }
 
     bool hasExplicitSetElements() const { return fill_set_elements; }
-    Columns getSetElements() const { return { set_elements.begin(), set_elements.end() }; }
+    Columns getSetElements() const { checkIsCreated(); return { set_elements.begin(), set_elements.end() }; }
 
     void checkColumnsNumber(size_t num_key_columns) const;
     bool areTypesEqual(size_t set_type_idx, const DataTypePtr & other_type) const;
diff --git a/src/Interpreters/SortedBlocksWriter.cpp b/src/Interpreters/SortedBlocksWriter.cpp
index d8c42cba9c1..e09a66a38e6 100644
--- a/src/Interpreters/SortedBlocksWriter.cpp
+++ b/src/Interpreters/SortedBlocksWriter.cpp
@@ -165,6 +165,7 @@ SortedBlocksWriter::TmpFilePtr SortedBlocksWriter::flush(const BlocksList & bloc
             pipeline.getNumStreams(),
             sort_description,
             rows_in_block,
+            /*max_block_size_bytes=*/0,
             SortingQueueStrategy::Default);
 
         pipeline.addTransform(std::move(transform));
@@ -220,6 +221,7 @@ SortedBlocksWriter::PremergedFiles SortedBlocksWriter::premerge()
                             pipeline.getNumStreams(),
                             sort_description,
                             rows_in_block,
+                            /*max_block_size_bytes=*/0,
                             SortingQueueStrategy::Default);
 
                         pipeline.addTransform(std::move(transform));
@@ -254,6 +256,7 @@ SortedBlocksWriter::SortedFiles SortedBlocksWriter::finishMerge(std::function<vo
             pipeline.getNumStreams(),
             sort_description,
             rows_in_block,
+            /*max_block_size_bytes=*/0,
             SortingQueueStrategy::Default);
 
         pipeline.addTransform(std::move(transform));
@@ -331,6 +334,7 @@ Block SortedBlocksBuffer::mergeBlocks(Blocks && blocks) const
                 builder.getNumStreams(),
                 sort_description,
                 num_rows,
+                /*max_block_size_bytes=*/0,
                 SortingQueueStrategy::Default);
 
             builder.addTransform(std::move(transform));
diff --git a/src/Interpreters/StorageID.h b/src/Interpreters/StorageID.h
index 147d50b4e4f..96e3cefe00c 100644
--- a/src/Interpreters/StorageID.h
+++ b/src/Interpreters/StorageID.h
@@ -138,7 +138,7 @@ namespace fmt
         template <typename FormatContext>
         auto format(const DB::StorageID & storage_id, FormatContext & ctx)
         {
-            return format_to(ctx.out(), "{}", storage_id.getNameForLogs());
+            return fmt::format_to(ctx.out(), "{}", storage_id.getNameForLogs());
         }
     };
 }
diff --git a/src/Interpreters/SubstituteColumnOptimizer.cpp b/src/Interpreters/SubstituteColumnOptimizer.cpp
index d98491aaf9e..c4aef89fed2 100644
--- a/src/Interpreters/SubstituteColumnOptimizer.cpp
+++ b/src/Interpreters/SubstituteColumnOptimizer.cpp
@@ -32,13 +32,13 @@ public:
 
     struct Data
     {
-        const ComparisonGraph & graph;
+        const ComparisonGraph<ASTPtr> & graph;
         std::set<UInt64> & components;
         std::unordered_map<String, String> & old_name;
         std::unordered_map<String, UInt64> & component;
         UInt64 & current_id;
 
-        Data(const ComparisonGraph & graph_,
+        Data(const ComparisonGraph<ASTPtr> & graph_,
              std::set<UInt64> & components_,
              std::unordered_map<String, String> & old_name_,
              std::unordered_map<String, UInt64> & component_,
@@ -165,7 +165,7 @@ ColumnPrice calculatePrice(
 /// price of all columns on which ast depends.
 /// TODO: branch-and-bound
 void bruteforce(
-    const ComparisonGraph & graph,
+    const ComparisonGraph<ASTPtr> & graph,
     const std::vector<UInt64> & components,
     size_t current_component,
     const ColumnPriceByName & column_prices,
diff --git a/src/Interpreters/SystemLog.cpp b/src/Interpreters/SystemLog.cpp
index 9d8547abcf2..3fd0297f5b8 100644
--- a/src/Interpreters/SystemLog.cpp
+++ b/src/Interpreters/SystemLog.cpp
@@ -143,28 +143,58 @@ std::shared_ptr<TSystemLog> createSystemLog(
                             "If 'engine' is specified for system table, PARTITION BY parameters should "
                             "be specified directly inside 'engine' and 'partition_by' setting doesn't make sense");
         if (config.has(config_prefix + ".ttl"))
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "If 'engine' is specified for system table, "
-                            "TTL parameters should be specified directly inside 'engine' and 'ttl' setting doesn't make sense");
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "If 'engine' is specified for system table, TTL parameters should "
+                            "be specified directly inside 'engine' and 'ttl' setting doesn't make sense");
+        if (config.has(config_prefix + ".order_by"))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "If 'engine' is specified for system table, ORDER BY parameters should "
+                            "be specified directly inside 'engine' and 'order_by' setting doesn't make sense");
         if (config.has(config_prefix + ".storage_policy"))
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "If 'engine' is specified for system table, SETTINGS storage_policy = '...' "
-                            "should be specified directly inside 'engine' and 'storage_policy' setting doesn't make sense");
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "If 'engine' is specified for system table, SETTINGS storage_policy = '...' should "
+                            "be specified directly inside 'engine' and 'storage_policy' setting doesn't make sense");
+        if (config.has(config_prefix + ".settings"))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "If 'engine' is specified for system table, SETTINGS parameters should "
+                            "be specified directly inside 'engine' and 'settings' setting doesn't make sense");
+
         engine = config.getString(config_prefix + ".engine");
     }
     else
     {
-        String partition_by = config.getString(config_prefix + ".partition_by", "toYYYYMM(event_date)");
+        /// ENGINE expr is necessary.
         engine = "ENGINE = MergeTree";
+
+        /// PARTITION expr is not necessary.
+        String partition_by = config.getString(config_prefix + ".partition_by", "toYYYYMM(event_date)");
         if (!partition_by.empty())
             engine += " PARTITION BY (" + partition_by + ")";
+
+        /// TTL expr is not necessary.
         String ttl = config.getString(config_prefix + ".ttl", "");
         if (!ttl.empty())
             engine += " TTL " + ttl;
 
-        engine += " ORDER BY ";
-        engine += TSystemLog::getDefaultOrderBy();
+        /// ORDER BY expr is necessary.
+        String order_by = config.getString(config_prefix + ".order_by", TSystemLog::getDefaultOrderBy());
+        engine += " ORDER BY (" + order_by + ")";
+
+        /// SETTINGS expr is not necessary.
+        ///   https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree#settings
+        ///
+        /// STORAGE POLICY expr is retained for backward compatible.
         String storage_policy = config.getString(config_prefix + ".storage_policy", "");
-        if (!storage_policy.empty())
-            engine += " SETTINGS storage_policy = " + quoteString(storage_policy);
+        String settings = config.getString(config_prefix + ".settings", "");
+        if (!storage_policy.empty() || !settings.empty())
+        {
+            engine += " SETTINGS";
+            /// If 'storage_policy' is repeated, the 'settings' configuration is preferred.
+            if (!storage_policy.empty())
+                engine += " storage_policy = " + quoteString(storage_policy);
+            if (!settings.empty())
+                engine += (storage_policy.empty() ? " " : ", ") + settings;
+        }
     }
 
     /// Validate engine definition syntax to prevent some configuration errors.
@@ -426,6 +456,8 @@ void SystemLog<LogElement>::flushImpl(const std::vector<LogElement> & to_flush,
         // we need query context to do inserts to target table with MV containing subqueries or joins
         auto insert_context = Context::createCopy(context);
         insert_context->makeQueryContext();
+        /// We always want to deliver the data to the original table regardless of the MVs
+        insert_context->setSetting("materialized_views_ignore_errors", true);
 
         InterpreterInsertQuery interpreter(query_ptr, insert_context);
         BlockIO io = interpreter.execute();
@@ -501,6 +533,9 @@ void SystemLog<LogElement>::prepareTable()
             rename->elements.emplace_back(std::move(elem));
 
             auto query_context = Context::createCopy(context);
+            /// As this operation is performed automatically we don't want it to fail because of user dependencies on log tables
+            query_context->setSetting("check_table_dependencies", Field{false});
+            query_context->setSetting("check_referential_table_dependencies", Field{false});
             query_context->makeQueryContext();
             InterpreterRenameQuery(rename, query_context).execute();
 
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index 7ea7a265263..5a23fbd00ff 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -147,6 +147,7 @@ void TableJoin::addDisjunct()
 void TableJoin::addOnKeys(ASTPtr & left_table_ast, ASTPtr & right_table_ast)
 {
     addKey(left_table_ast->getColumnName(), right_table_ast->getAliasOrColumnName(), left_table_ast, right_table_ast);
+    right_key_aliases[right_table_ast->getColumnName()] = right_table_ast->getAliasOrColumnName();
 }
 
 /// @return how many times right key appears in ON section.
@@ -491,10 +492,6 @@ void TableJoin::inferJoinKeyCommonType(const LeftNamesAndTypes & left, const Rig
     {
         if (clauses.size() != 1)
             throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "ASOF join over multiple keys is not supported");
-
-        auto asof_key_type = right_types.find(clauses.back().key_names_right.back());
-        if (asof_key_type != right_types.end() && asof_key_type->second->isNullable())
-            throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "ASOF join over right table Nullable column is not implemented");
     }
 
     forAllKeys(clauses, [&](const auto & left_key_name, const auto & right_key_name)
@@ -662,6 +659,14 @@ String TableJoin::renamedRightColumnName(const String & name) const
     return name;
 }
 
+String TableJoin::renamedRightColumnNameWithAlias(const String & name) const
+{
+    auto renamed = renamedRightColumnName(name);
+    if (const auto it = right_key_aliases.find(renamed); it != right_key_aliases.end())
+        return it->second;
+    return renamed;
+}
+
 void TableJoin::setRename(const String & from, const String & to)
 {
     renames[from] = to;
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
index 84390adc0df..0e0c905e30c 100644
--- a/src/Interpreters/TableJoin.h
+++ b/src/Interpreters/TableJoin.h
@@ -19,7 +19,6 @@
 #include <utility>
 #include <memory>
 #include <base/types.h>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -157,6 +156,13 @@ private:
     /// Original name -> name. Only renamed columns.
     std::unordered_map<String, String> renames;
 
+    /// Map column name to actual key name that can be an alias.
+    /// Example: SELECT r.id as rid from t JOIN r ON t.id = rid
+    /// Map: r.id -> rid
+    /// Required only for StorageJoin to map join keys back to original column names.
+    /// (workaround for ExpressionAnalyzer)
+    std::unordered_map<String, String> right_key_aliases;
+
     VolumePtr tmp_volume;
 
     std::shared_ptr<StorageJoin> right_storage_join;
@@ -209,7 +215,7 @@ public:
     JoinStrictness strictness() const { return table_join.strictness; }
     bool sameStrictnessAndKind(JoinStrictness, JoinKind) const;
     const SizeLimits & sizeLimits() const { return size_limits; }
-    VolumePtr getTemporaryVolume() { return tmp_volume; }
+    VolumePtr getGlobalTemporaryVolume() { return tmp_volume; }
 
     bool isEnabledAlgorithm(JoinAlgorithm val) const
     {
@@ -334,6 +340,7 @@ public:
     Block getRequiredRightKeys(const Block & right_table_keys, std::vector<String> & keys_sources) const;
 
     String renamedRightColumnName(const String & name) const;
+    String renamedRightColumnNameWithAlias(const String & name) const;
     void setRename(const String & from, const String & to);
 
     void resetKeys();
diff --git a/src/Interpreters/TemporaryDataOnDisk.cpp b/src/Interpreters/TemporaryDataOnDisk.cpp
index e183124cadf..69fef21dbab 100644
--- a/src/Interpreters/TemporaryDataOnDisk.cpp
+++ b/src/Interpreters/TemporaryDataOnDisk.cpp
@@ -9,6 +9,7 @@
 #include <Core/ProtocolDefines.h>
 #include <Disks/SingleDiskVolume.h>
 #include <Disks/DiskLocal.h>
+#include <Disks/IO/WriteBufferFromTemporaryFile.h>
 
 #include <Common/logger_useful.h>
 #include <Interpreters/Cache/WriteBufferToFileSegment.h>
@@ -45,29 +46,64 @@ void TemporaryDataOnDiskScope::deltaAllocAndCheck(ssize_t compressed_delta, ssiz
     stat.uncompressed_size += uncompressed_delta;
 }
 
-TemporaryFileStream & TemporaryDataOnDisk::createStream(const Block & header, size_t max_file_size)
+TemporaryDataOnDisk::TemporaryDataOnDisk(TemporaryDataOnDiskScopePtr parent_)
+    : TemporaryDataOnDiskScope(std::move(parent_), /* limit_ = */ 0)
+{}
+
+TemporaryDataOnDisk::TemporaryDataOnDisk(TemporaryDataOnDiskScopePtr parent_, CurrentMetrics::Metric metric_scope)
+    : TemporaryDataOnDiskScope(std::move(parent_), /* limit_ = */ 0)
+    , current_metric_scope(metric_scope)
+{}
+
+WriteBufferPtr TemporaryDataOnDisk::createRawStream(size_t max_file_size)
 {
     if (file_cache)
-        return createStreamToCacheFile(header, max_file_size);
+    {
+        auto holder = createCacheFile(max_file_size);
+        return std::make_shared<WriteBufferToFileSegment>(std::move(holder));
+    }
     else if (volume)
-        return createStreamToRegularFile(header, max_file_size);
+    {
+        auto tmp_file = createRegularFile(max_file_size);
+        return std::make_shared<WriteBufferFromTemporaryFile>(std::move(tmp_file));
+    }
 
     throw Exception(ErrorCodes::LOGICAL_ERROR, "TemporaryDataOnDiskScope has no cache and no volume");
 }
 
-TemporaryFileStream & TemporaryDataOnDisk::createStreamToCacheFile(const Block & header, size_t max_file_size)
+TemporaryFileStream & TemporaryDataOnDisk::createStream(const Block & header, size_t max_file_size)
+{
+    if (file_cache)
+    {
+        auto holder = createCacheFile(max_file_size);
+
+        std::lock_guard lock(mutex);
+        TemporaryFileStreamPtr & tmp_stream = streams.emplace_back(std::make_unique<TemporaryFileStream>(std::move(holder), header, this));
+        return *tmp_stream;
+    }
+    else if (volume)
+    {
+        auto tmp_file = createRegularFile(max_file_size);
+        std::lock_guard lock(mutex);
+        TemporaryFileStreamPtr & tmp_stream = streams.emplace_back(std::make_unique<TemporaryFileStream>(std::move(tmp_file), header, this));
+        return *tmp_stream;
+    }
+
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "TemporaryDataOnDiskScope has no cache and no volume");
+}
+
+FileSegmentsHolderPtr TemporaryDataOnDisk::createCacheFile(size_t max_file_size)
 {
     if (!file_cache)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "TemporaryDataOnDiskScope has no cache");
 
-    auto holder = file_cache->set(FileSegment::Key::random(), 0, std::max(10_MiB, max_file_size), CreateFileSegmentSettings(FileSegmentKind::Temporary, /* unbounded */ true));
-
-    std::lock_guard lock(mutex);
-    TemporaryFileStreamPtr & tmp_stream = streams.emplace_back(std::make_unique<TemporaryFileStream>(std::move(holder), header, this));
-    return *tmp_stream;
+    const auto key = FileSegment::Key::random();
+    auto holder = file_cache->set(key, 0, std::max(10_MiB, max_file_size), CreateFileSegmentSettings(FileSegmentKind::Temporary, /* unbounded */ true));
+    fs::create_directories(file_cache->getPathInLocalCache(key));
+    return holder;
 }
 
-TemporaryFileStream & TemporaryDataOnDisk::createStreamToRegularFile(const Block & header, size_t max_file_size)
+TemporaryFileOnDiskHolder TemporaryDataOnDisk::createRegularFile(size_t max_file_size)
 {
     if (!volume)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "TemporaryDataOnDiskScope has no volume");
@@ -85,11 +121,7 @@ TemporaryFileStream & TemporaryDataOnDisk::createStreamToRegularFile(const Block
         disk = volume->getDisk();
     }
 
-    auto tmp_file = std::make_unique<TemporaryFileOnDisk>(disk, current_metric_scope);
-
-    std::lock_guard lock(mutex);
-    TemporaryFileStreamPtr & tmp_stream = streams.emplace_back(std::make_unique<TemporaryFileStream>(std::move(tmp_file), header, this));
-    return *tmp_stream;
+    return std::make_unique<TemporaryFileOnDisk>(disk, current_metric_scope);
 }
 
 std::vector<TemporaryFileStream *> TemporaryDataOnDisk::getStreams() const
@@ -110,22 +142,11 @@ bool TemporaryDataOnDisk::empty() const
 
 struct TemporaryFileStream::OutputWriter
 {
-    OutputWriter(const String & path, const Block & header_)
-        : out_buf(std::make_unique<WriteBufferFromFile>(path))
-        , out_compressed_buf(*out_buf)
-        , out_writer(out_compressed_buf, DBMS_TCP_PROTOCOL_VERSION, header_)
-    {
-        LOG_TEST(&Poco::Logger::get("TemporaryFileStream"), "Writing to {}", path);
-    }
-
-    OutputWriter(std::unique_ptr<WriteBufferToFileSegment> out_buf_, const Block & header_)
+    OutputWriter(std::unique_ptr<WriteBuffer> out_buf_, const Block & header_)
         : out_buf(std::move(out_buf_))
         , out_compressed_buf(*out_buf)
         , out_writer(out_compressed_buf, DBMS_TCP_PROTOCOL_VERSION, header_)
     {
-        LOG_TEST(&Poco::Logger::get("TemporaryFileStream"),
-            "Writing to {}",
-            static_cast<const WriteBufferToFileSegment *>(out_buf.get())->getFileName());
     }
 
     size_t write(const Block & block)
@@ -214,19 +235,21 @@ TemporaryFileStream::TemporaryFileStream(TemporaryFileOnDiskHolder file_, const
     : parent(parent_)
     , header(header_)
     , file(std::move(file_))
-    , out_writer(std::make_unique<OutputWriter>(file->getPath(), header))
+    , out_writer(std::make_unique<OutputWriter>(std::make_unique<WriteBufferFromFile>(file->getPath()), header))
 {
+    LOG_TEST(&Poco::Logger::get("TemporaryFileStream"), "Writing to temporary file {}", file->getPath());
 }
 
-TemporaryFileStream::TemporaryFileStream(FileSegmentsHolder && segments_, const Block & header_, TemporaryDataOnDisk * parent_)
+TemporaryFileStream::TemporaryFileStream(FileSegmentsHolderPtr segments_, const Block & header_, TemporaryDataOnDisk * parent_)
     : parent(parent_)
     , header(header_)
     , segment_holder(std::move(segments_))
 {
-    if (segment_holder.file_segments.size() != 1)
+    if (segment_holder->size() != 1)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "TemporaryFileStream can be created only from single segment");
-    auto & segment = segment_holder.file_segments.front();
-    auto out_buf = std::make_unique<WriteBufferToFileSegment>(segment.get());
+    auto out_buf = std::make_unique<WriteBufferToFileSegment>(&segment_holder->front());
+
+    LOG_TEST(&Poco::Logger::get("TemporaryFileStream"), "Writing to temporary file {}", out_buf->getFileName());
     out_writer = std::make_unique<OutputWriter>(std::move(out_buf), header);
 }
 
@@ -315,7 +338,7 @@ void TemporaryFileStream::updateAllocAndCheck()
 
 bool TemporaryFileStream::isEof() const
 {
-    return file == nullptr && segment_holder.empty();
+    return file == nullptr && !segment_holder;
 }
 
 void TemporaryFileStream::release()
@@ -335,7 +358,7 @@ void TemporaryFileStream::release()
         parent->deltaAllocAndCheck(-stat.compressed_size, -stat.uncompressed_size);
     }
 
-    if (!segment_holder.empty())
+    if (segment_holder)
         segment_holder.reset();
 }
 
@@ -343,8 +366,8 @@ String TemporaryFileStream::getPath() const
 {
     if (file)
         return file->getPath();
-    if (!segment_holder.file_segments.empty())
-        return segment_holder.file_segments.front()->getPathInLocalCache();
+    if (segment_holder && !segment_holder->empty())
+        return segment_holder->front().getPathInLocalCache();
 
     throw Exception(ErrorCodes::LOGICAL_ERROR, "TemporaryFileStream has no file");
 }
diff --git a/src/Interpreters/TemporaryDataOnDisk.h b/src/Interpreters/TemporaryDataOnDisk.h
index 1b56f953d17..14eefbf984d 100644
--- a/src/Interpreters/TemporaryDataOnDisk.h
+++ b/src/Interpreters/TemporaryDataOnDisk.h
@@ -83,31 +83,33 @@ class TemporaryDataOnDisk : private TemporaryDataOnDiskScope
 public:
     using TemporaryDataOnDiskScope::StatAtomic;
 
-    explicit TemporaryDataOnDisk(TemporaryDataOnDiskScopePtr parent_)
-        : TemporaryDataOnDiskScope(std::move(parent_), /* limit_ = */ 0)
-    {}
+    explicit TemporaryDataOnDisk(TemporaryDataOnDiskScopePtr parent_);
 
-    explicit TemporaryDataOnDisk(TemporaryDataOnDiskScopePtr parent_, CurrentMetrics::Value metric_scope)
-        : TemporaryDataOnDiskScope(std::move(parent_), /* limit_ = */ 0)
-        , current_metric_scope(metric_scope)
-    {}
+    explicit TemporaryDataOnDisk(TemporaryDataOnDiskScopePtr parent_, CurrentMetrics::Metric metric_scope);
 
     /// If max_file_size > 0, then check that there's enough space on the disk and throw an exception in case of lack of free space
     TemporaryFileStream & createStream(const Block & header, size_t max_file_size = 0);
 
+    /// Write raw data directly into buffer.
+    /// Differences from `createStream`:
+    ///   1) it doesn't account data in parent scope
+    ///   2) returned buffer owns resources (instead of TemporaryDataOnDisk itself)
+    /// If max_file_size > 0, then check that there's enough space on the disk and throw an exception in case of lack of free space
+    WriteBufferPtr createRawStream(size_t max_file_size = 0);
+
     std::vector<TemporaryFileStream *> getStreams() const;
     bool empty() const;
 
     const StatAtomic & getStat() const { return stat; }
 
 private:
-    TemporaryFileStream & createStreamToCacheFile(const Block & header, size_t max_file_size);
-    TemporaryFileStream & createStreamToRegularFile(const Block & header, size_t max_file_size);
+    FileSegmentsHolderPtr createCacheFile(size_t max_file_size);
+    TemporaryFileOnDiskHolder createRegularFile(size_t max_file_size);
 
     mutable std::mutex mutex;
     std::vector<TemporaryFileStreamPtr> streams TSA_GUARDED_BY(mutex);
 
-    typename CurrentMetrics::Value current_metric_scope = CurrentMetrics::TemporaryFilesUnknown;
+    typename CurrentMetrics::Metric current_metric_scope = CurrentMetrics::TemporaryFilesUnknown;
 };
 
 /*
@@ -128,7 +130,7 @@ public:
     };
 
     TemporaryFileStream(TemporaryFileOnDiskHolder file_, const Block & header_, TemporaryDataOnDisk * parent_);
-    TemporaryFileStream(FileSegmentsHolder && segments_, const Block & header_, TemporaryDataOnDisk * parent_);
+    TemporaryFileStream(FileSegmentsHolderPtr segments_, const Block & header_, TemporaryDataOnDisk * parent_);
 
     size_t write(const Block & block);
     void flush();
@@ -159,7 +161,7 @@ private:
 
     /// Data can be stored in file directly or in the cache
     TemporaryFileOnDiskHolder file;
-    FileSegmentsHolder segment_holder;
+    FileSegmentsHolderPtr segment_holder;
 
     Stat stat;
 
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index 84400fc3711..6a4f4576eca 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -9,6 +9,7 @@
 #include <Interpreters/QueryViewsLog.h>
 #include <Interpreters/TraceCollector.h>
 #include <Parsers/formatAST.h>
+#include <Parsers/queryNormalization.h>
 #include <Common/CurrentThread.h>
 #include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
@@ -18,6 +19,7 @@
 #include <Common/setThreadName.h>
 #include <Common/noexcept_scope.h>
 #include <Common/DateLUT.h>
+#include <Common/logger_useful.h>
 #include <base/errnoToString.h>
 
 #if defined(OS_LINUX)
@@ -40,13 +42,131 @@ namespace ErrorCodes
     extern const int CANNOT_SET_THREAD_PRIORITY;
 }
 
+ThreadGroup::ThreadGroup(ContextPtr query_context_, FatalErrorCallback fatal_error_callback_)
+    : master_thread_id(CurrentThread::get().thread_id)
+    , query_context(query_context_)
+    , global_context(query_context_->getGlobalContext())
+    , fatal_error_callback(fatal_error_callback_)
+{}
+
+std::vector<UInt64> ThreadGroup::getInvolvedThreadIds() const
+{
+    std::vector<UInt64> res;
+
+    {
+        std::lock_guard lock(mutex);
+        res.assign(thread_ids.begin(), thread_ids.end());
+    }
+
+    return res;
+}
+
+void ThreadGroup::linkThread(UInt64 thread_it)
+{
+    std::lock_guard lock(mutex);
+    thread_ids.insert(thread_it);
+}
+
+ThreadGroupPtr ThreadGroup::createForQuery(ContextPtr query_context_, std::function<void()> fatal_error_callback_)
+{
+    auto group = std::make_shared<ThreadGroup>(query_context_, std::move(fatal_error_callback_));
+    group->memory_tracker.setDescription("(for query)");
+    return group;
+}
+
+ThreadGroupPtr ThreadGroup::createForBackgroundProcess(ContextPtr storage_context)
+{
+    auto group = std::make_shared<ThreadGroup>(storage_context);
+
+    group->memory_tracker.setDescription("background process to apply mutate/merge in table");
+    /// However settings from storage context have to be applied
+    const Settings & settings = storage_context->getSettingsRef();
+    group->memory_tracker.setProfilerStep(settings.memory_profiler_step);
+    group->memory_tracker.setSampleProbability(settings.memory_profiler_sample_probability);
+    group->memory_tracker.setSoftLimit(settings.memory_overcommit_ratio_denominator);
+    group->memory_tracker.setParent(&background_memory_tracker);
+    if (settings.memory_tracker_fault_probability > 0.0)
+        group->memory_tracker.setFaultProbability(settings.memory_tracker_fault_probability);
+
+    return group;
+}
+
+void ThreadGroup::attachQueryForLog(const String & query_, UInt64 normalized_hash)
+{
+    auto hash = normalized_hash ? normalized_hash : normalizedQueryHash<false>(query_);
+
+    std::lock_guard lock(mutex);
+    shared_data.query_for_logs = query_;
+    shared_data.normalized_query_hash = hash;
+}
+
+void ThreadStatus::attachQueryForLog(const String & query_)
+{
+    local_data.query_for_logs = query_;
+    local_data.normalized_query_hash = normalizedQueryHash<false>(query_);
+
+    if (!thread_group)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No thread group attached to the thread {}", thread_id);
+
+    thread_group->attachQueryForLog(local_data.query_for_logs, local_data.normalized_query_hash);
+}
+
+void ThreadGroup::attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & profile_queue)
+{
+    std::lock_guard lock(mutex);
+    shared_data.profile_queue_ptr = profile_queue;
+}
+
+ThreadGroupSwitcher::ThreadGroupSwitcher(ThreadGroupPtr thread_group)
+{
+    chassert(thread_group);
+
+    /// might be nullptr
+    prev_thread_group = CurrentThread::getGroup();
+
+    CurrentThread::detachFromGroupIfNotDetached();
+    CurrentThread::attachToGroup(thread_group);
+}
+
+ThreadGroupSwitcher::~ThreadGroupSwitcher()
+{
+    CurrentThread::detachFromGroupIfNotDetached();
+    if (prev_thread_group)
+        CurrentThread::attachToGroup(prev_thread_group);
+}
+
+void ThreadStatus::attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & profile_queue)
+{
+    if (!thread_group)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No thread group attached to the thread {}", thread_id);
+
+    local_data.profile_queue_ptr = profile_queue;
+    thread_group->attachInternalProfileEventsQueue(profile_queue);
+}
+
+void CurrentThread::attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & queue)
+{
+    if (unlikely(!current_thread))
+        return;
+    current_thread->attachInternalProfileEventsQueue(queue);
+}
+
+void CurrentThread::attachQueryForLog(const String & query_)
+{
+    if (unlikely(!current_thread))
+        return;
+    current_thread->attachQueryForLog(query_);
+}
+
 void ThreadStatus::applyQuerySettings()
 {
     auto query_context_ptr = query_context.lock();
-    assert(query_context_ptr);
+    if (!query_context_ptr)
+        return;
+
     const Settings & settings = query_context_ptr->getSettingsRef();
 
-    query_id = query_context_ptr->getCurrentQueryId();
+    query_id_from_query_context = query_context_ptr->getCurrentQueryId();
     initQueryProfiler();
 
     untracked_memory_limit = settings.max_untracked_memory;
@@ -68,67 +188,65 @@ void ThreadStatus::applyQuerySettings()
 #endif
 }
 
-
-void ThreadStatus::attachQueryContext(ContextPtr query_context_)
+void ThreadStatus::attachToGroupImpl(const ThreadGroupPtr & thread_group_)
 {
-    query_context = query_context_;
-
-    if (global_context.expired())
-        global_context = query_context_->getGlobalContext();
-
-    if (thread_group)
-    {
-        std::lock_guard lock(thread_group->mutex);
-
-        thread_group->query_context = query_context;
-        if (thread_group->global_context.expired())
-            thread_group->global_context = global_context;
-    }
-
-    applyQuerySettings();
-}
-
-void CurrentThread::defaultThreadDeleter()
-{
-    if (unlikely(!current_thread))
-        return;
-    current_thread->detachQuery(true, true);
-}
-
-void ThreadStatus::setupState(const ThreadGroupStatusPtr & thread_group_)
-{
-    assertState(ThreadState::DetachedFromQuery, __PRETTY_FUNCTION__);
-
     /// Attach or init current thread to thread group and copy useful information from it
     thread_group = thread_group_;
+    thread_group->linkThread(thread_id);
 
     performance_counters.setParent(&thread_group->performance_counters);
     memory_tracker.setParent(&thread_group->memory_tracker);
 
-    {
-        std::lock_guard lock(thread_group->mutex);
+    query_context = thread_group->query_context;
+    global_context = thread_group->global_context;
 
-        /// NOTE: thread may be attached multiple times if it is reused from a thread pool.
-        thread_group->thread_ids.insert(thread_id);
-        thread_group->threads.insert(this);
+    fatal_error_callback = thread_group->fatal_error_callback;
 
-        logs_queue_ptr = thread_group->logs_queue_ptr;
-        fatal_error_callback = thread_group->fatal_error_callback;
-        query_context = thread_group->query_context;
-        profile_queue_ptr = thread_group->profile_queue_ptr;
-
-        if (global_context.expired())
-            global_context = thread_group->global_context;
-    }
-
-    if (auto query_context_ptr = query_context.lock())
-    {
-        applyQuerySettings();
-    }
+    local_data = thread_group->getSharedData();
 
+    applyQuerySettings();
     initPerformanceCounters();
+}
 
-    thread_state = ThreadState::AttachedToQuery;
+void ThreadStatus::detachFromGroup()
+{
+    if (!thread_group)
+        return;
+
+    LockMemoryExceptionInThread lock_memory_tracker(VariableContext::Global);
+
+    /// flash untracked memory before resetting memory_tracker parent
+    flushUntrackedMemory();
+
+    finalizeQueryProfiler();
+    finalizePerformanceCounters();
+
+    performance_counters.setParent(&ProfileEvents::global_counters);
+
+    memory_tracker.reset();
+    /// Extract MemoryTracker out from query and user context
+    memory_tracker.setParent(&total_memory_tracker);
+
+    thread_group.reset();
+
+    query_id_from_query_context.clear();
+    query_context.reset();
+
+    local_data = {};
+
+    fatal_error_callback = {};
+
+#if defined(OS_LINUX)
+    if (os_thread_priority)
+    {
+        LOG_TRACE(log, "Resetting nice");
+
+        if (0 != setpriority(PRIO_PROCESS, static_cast<int>(thread_id), 0))
+            LOG_ERROR(log, "Cannot 'setpriority' back to zero: {}", errnoToString());
+
+        os_thread_priority = 0;
+    }
+#endif
 }
 
 void ThreadStatus::setInternalThread()
@@ -137,28 +255,19 @@ void ThreadStatus::setInternalThread()
     internal_thread = true;
 }
 
-void ThreadStatus::initializeQuery()
+void ThreadStatus::attachToGroup(const ThreadGroupPtr & thread_group_, bool check_detached)
 {
-    setupState(std::make_shared<ThreadGroupStatus>());
-
-    /// No need to lock on mutex here
-    thread_group->memory_tracker.setDescription("(for query)");
-    thread_group->master_thread_id = thread_id;
-}
-
-void ThreadStatus::attachQuery(const ThreadGroupStatusPtr & thread_group_, bool check_detached)
-{
-    if (thread_state == ThreadState::AttachedToQuery)
-    {
-        if (check_detached)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't attach query to the thread, it is already attached");
-        return;
-    }
+    if (thread_group && check_detached)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't attach query to the thread, it is already attached");
 
     if (!thread_group_)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to attach to nullptr thread group");
 
-    setupState(thread_group_);
+    if (thread_group)
+        return;
+
+    deleter = [this] () { detachFromGroup(); };
+    attachToGroupImpl(thread_group_);
 }
 
 ProfileEvents::Counters * ThreadStatus::attachProfileCountersScope(ProfileEvents::Counters * performance_counters_scope)
@@ -178,6 +287,26 @@ ProfileEvents::Counters * ThreadStatus::attachProfileCountersScope(ProfileEvents
     return prev_counters;
 }
 
+void ThreadStatus::TimePoint::setUp()
+{
+    point = std::chrono::system_clock::now();
+}
+
+UInt64 ThreadStatus::TimePoint::nanoseconds() const
+{
+    return timeInNanoseconds(point);
+}
+
+UInt64 ThreadStatus::TimePoint::microseconds() const
+{
+    return timeInMicroseconds(point);
+}
+
+UInt64 ThreadStatus::TimePoint::seconds() const
+{
+    return timeInSeconds(point);
+}
+
 void ThreadStatus::initPerformanceCounters()
 {
     performance_counters_finalized = false;
@@ -188,16 +317,9 @@ void ThreadStatus::initPerformanceCounters()
     memory_tracker.resetCounters();
     memory_tracker.setDescription("(for thread)");
 
-    // query_start_time_{microseconds, nanoseconds} are all constructed from the same time point
-    // to ensure that they are all equal up to the precision of a second.
-    const auto now = std::chrono::system_clock::now();
+    query_start_time.setUp();
 
-    query_start_time_nanoseconds = timeInNanoseconds(now);
-    query_start_time = timeInSeconds(now);
-    query_start_time_microseconds = timeInMicroseconds(now);
-    ++queries_started;
-
-    // query_start_time_nanoseconds cannot be used here since RUsageCounters expect CLOCK_MONOTONIC
+    // query_start_time.nanoseconds cannot be used here since RUsageCounters expect CLOCK_MONOTONIC
     *last_rusage = RUsageCounters::current();
 
     if (!internal_thread)
@@ -272,11 +394,11 @@ void ThreadStatus::finalizePerformanceCounters()
             if (settings.log_queries && settings.log_query_threads)
             {
                 const auto now = std::chrono::system_clock::now();
-                Int64 query_duration_ms = (timeInMicroseconds(now) - query_start_time_microseconds) / 1000;
+                Int64 query_duration_ms = std::chrono::duration_cast<std::chrono::microseconds>(now - query_start_time.point).count();
                 if (query_duration_ms >= settings.log_queries_min_query_duration_ms.totalMilliseconds())
                 {
                     if (auto thread_log = global_context_ptr->getQueryThreadLog())
-                        logToQueryThreadLog(*thread_log, query_context_ptr->getCurrentDatabase(), now);
+                        logToQueryThreadLog(*thread_log, query_context_ptr->getCurrentDatabase());
                 }
             }
         }
@@ -331,75 +453,20 @@ void ThreadStatus::finalizeQueryProfiler()
     query_profiler_cpu.reset();
 }
 
-void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
-{
-    LockMemoryExceptionInThread lock_memory_tracker(VariableContext::Global);
-
-    if (exit_if_already_detached && thread_state == ThreadState::DetachedFromQuery)
-    {
-        thread_state = thread_exits ? ThreadState::Died : ThreadState::DetachedFromQuery;
-        return;
-    }
-
-    assertState(ThreadState::AttachedToQuery, __PRETTY_FUNCTION__);
-
-    finalizeQueryProfiler();
-    finalizePerformanceCounters();
-
-    /// Detach from thread group
-    {
-        std::lock_guard guard(thread_group->mutex);
-        thread_group->threads.erase(this);
-    }
-    performance_counters.setParent(&ProfileEvents::global_counters);
-    memory_tracker.reset();
-
-    memory_tracker.setParent(thread_group->memory_tracker.getParent());
-
-    query_id.clear();
-    query_context.reset();
-
-    /// The memory of thread_group->finished_threads_counters_memory is temporarily moved to this vector, which is deallocated out of critical section.
-    std::vector<ThreadGroupStatus::ProfileEventsCountersAndMemory> move_to_temp;
-
-    /// Avoid leaking of ThreadGroupStatus::finished_threads_counters_memory
-    /// (this is in case someone uses system thread but did not call getProfileEventsCountersAndMemoryForThreads())
-    {
-        std::lock_guard guard(thread_group->mutex);
-        move_to_temp = std::move(thread_group->finished_threads_counters_memory);
-    }
-
-    thread_group.reset();
-
-    thread_state = thread_exits ? ThreadState::Died : ThreadState::DetachedFromQuery;
-
-#if defined(OS_LINUX)
-    if (os_thread_priority)
-    {
-        LOG_TRACE(log, "Resetting nice");
-
-        if (0 != setpriority(PRIO_PROCESS, static_cast<int>(thread_id), 0))
-            LOG_ERROR(log, "Cannot 'setpriority' back to zero: {}", errnoToString());
-
-        os_thread_priority = 0;
-    }
-#endif
-}
-
-void ThreadStatus::logToQueryThreadLog(QueryThreadLog & thread_log, const String & current_database, std::chrono::time_point<std::chrono::system_clock> now)
+void ThreadStatus::logToQueryThreadLog(QueryThreadLog & thread_log, const String & current_database)
 {
     QueryThreadLogElement elem;
 
     // construct current_time and current_time_microseconds using the same time point
     // so that the two times will always be equal up to a precision of a second.
-    auto current_time = timeInSeconds(now);
-    auto current_time_microseconds = timeInMicroseconds(now);
+    TimePoint current_time;
+    current_time.setUp();
 
-    elem.event_time = current_time;
-    elem.event_time_microseconds = current_time_microseconds;
-    elem.query_start_time = query_start_time;
-    elem.query_start_time_microseconds = query_start_time_microseconds;
-    elem.query_duration_ms = (timeInNanoseconds(now) - query_start_time_nanoseconds) / 1000000U;
+    elem.event_time = current_time.seconds();
+    elem.event_time_microseconds = current_time.microseconds();
+    elem.query_start_time = query_start_time.seconds();
+    elem.query_start_time_microseconds = query_start_time.microseconds();
+    elem.query_duration_ms = std::chrono::duration_cast<std::chrono::milliseconds>(current_time.point - query_start_time.point).count();
 
     elem.read_rows = progress_in.read_rows.load(std::memory_order_relaxed);
     elem.read_bytes = progress_in.read_bytes.load(std::memory_order_relaxed);
@@ -415,13 +482,9 @@ void ThreadStatus::logToQueryThreadLog(QueryThreadLog & thread_log, const String
     elem.current_database = current_database;
     if (thread_group)
     {
-        {
-            std::lock_guard lock(thread_group->mutex);
-
-            elem.master_thread_id = thread_group->master_thread_id;
-            elem.query = thread_group->query;
-            elem.normalized_query_hash = thread_group->normalized_query_hash;
-        }
+        elem.master_thread_id = thread_group->master_thread_id;
+        elem.query = local_data.query_for_logs;
+        elem.normalized_query_hash = local_data.normalized_query_hash;
     }
 
     auto query_context_ptr = query_context.lock();
@@ -454,7 +517,11 @@ void ThreadStatus::logToQueryViewsLog(const ViewRuntimeData & vinfo)
 {
     auto query_context_ptr = query_context.lock();
     if (!query_context_ptr)
+    {
+        LOG_ERROR(log, "No query context, query_views_log will not be written (this should never happen)");
         return;
+    }
+
     auto views_log = query_context_ptr->getQueryViewsLog();
     if (!views_log)
         return;
@@ -465,7 +532,7 @@ void ThreadStatus::logToQueryViewsLog(const ViewRuntimeData & vinfo)
     element.event_time_microseconds = timeInMicroseconds(vinfo.runtime_stats->event_time);
     element.view_duration_ms = vinfo.runtime_stats->elapsed_ms;
 
-    element.initial_query_id = query_id;
+    element.initial_query_id = query_id_from_query_context;
     element.view_name = vinfo.table_id.getFullTableName();
     element.view_uuid = vinfo.table_id.uuid;
     element.view_type = vinfo.runtime_stats->type;
@@ -473,16 +540,14 @@ void ThreadStatus::logToQueryViewsLog(const ViewRuntimeData & vinfo)
         element.view_query = getCleanQueryAst(vinfo.query, query_context_ptr);
     element.view_target = vinfo.runtime_stats->target_name;
 
-    auto events = std::make_shared<ProfileEvents::Counters::Snapshot>(performance_counters.getPartiallyAtomicSnapshot());
     element.read_rows = progress_in.read_rows.load(std::memory_order_relaxed);
     element.read_bytes = progress_in.read_bytes.load(std::memory_order_relaxed);
     element.written_rows = progress_out.written_rows.load(std::memory_order_relaxed);
     element.written_bytes = progress_out.written_bytes.load(std::memory_order_relaxed);
     element.peak_memory_usage = memory_tracker.getPeak() > 0 ? memory_tracker.getPeak() : 0;
     if (query_context_ptr->getSettingsRef().log_profile_events != 0)
-    {
-        element.profile_counters = events;
-    }
+        element.profile_counters = std::make_shared<ProfileEvents::Counters::Snapshot>(
+                performance_counters.getPartiallyAtomicSnapshot());
 
     element.status = vinfo.runtime_stats->event_status;
     element.exception_code = 0;
@@ -497,35 +562,18 @@ void ThreadStatus::logToQueryViewsLog(const ViewRuntimeData & vinfo)
     views_log->add(element);
 }
 
-void CurrentThread::initializeQuery()
+void CurrentThread::attachToGroup(const ThreadGroupPtr & thread_group)
 {
     if (unlikely(!current_thread))
         return;
-    current_thread->initializeQuery();
-    current_thread->deleter = CurrentThread::defaultThreadDeleter;
+    current_thread->attachToGroup(thread_group, true);
 }
 
-void CurrentThread::attachTo(const ThreadGroupStatusPtr & thread_group)
+void CurrentThread::attachToGroupIfDetached(const ThreadGroupPtr & thread_group)
 {
     if (unlikely(!current_thread))
         return;
-    current_thread->attachQuery(thread_group, true);
-    current_thread->deleter = CurrentThread::defaultThreadDeleter;
-}
-
-void CurrentThread::attachToIfDetached(const ThreadGroupStatusPtr & thread_group)
-{
-    if (unlikely(!current_thread))
-        return;
-    current_thread->attachQuery(thread_group, false);
-    current_thread->deleter = CurrentThread::defaultThreadDeleter;
-}
-
-void CurrentThread::attachQueryContext(ContextPtr query_context)
-{
-    if (unlikely(!current_thread))
-        return;
-    current_thread->attachQueryContext(query_context);
+    current_thread->attachToGroup(thread_group, false);
 }
 
 void CurrentThread::finalizePerformanceCounters()
@@ -535,37 +583,30 @@ void CurrentThread::finalizePerformanceCounters()
     current_thread->finalizePerformanceCounters();
 }
 
-void CurrentThread::detachQuery()
+void CurrentThread::detachFromGroupIfNotDetached()
 {
     if (unlikely(!current_thread))
         return;
-    current_thread->detachQuery(false);
+    current_thread->detachFromGroup();
 }
 
-void CurrentThread::detachQueryIfNotDetached()
+CurrentThread::QueryScope::QueryScope(ContextMutablePtr query_context, std::function<void()> fatal_error_callback)
 {
-    if (unlikely(!current_thread))
-        return;
-    current_thread->detachQuery(true);
-}
-
-
-CurrentThread::QueryScope::QueryScope(ContextMutablePtr query_context)
-{
-    CurrentThread::initializeQuery();
-    CurrentThread::attachQueryContext(query_context);
     if (!query_context->hasQueryContext())
         query_context->makeQueryContext();
+
+    auto group = ThreadGroup::createForQuery(query_context, std::move(fatal_error_callback));
+    CurrentThread::attachToGroup(group);
 }
 
-CurrentThread::QueryScope::QueryScope(ContextPtr query_context)
+CurrentThread::QueryScope::QueryScope(ContextPtr query_context, std::function<void()> fatal_error_callback)
 {
     if (!query_context->hasQueryContext())
         throw Exception(
             ErrorCodes::LOGICAL_ERROR, "Cannot initialize query scope without query context");
 
-    CurrentThread::initializeQuery();
-    CurrentThread::attachQueryContext(query_context);
+    auto group = ThreadGroup::createForQuery(query_context, std::move(fatal_error_callback));
+    CurrentThread::attachToGroup(group);
 }
 
 void CurrentThread::QueryScope::logPeakMemoryUsage()
@@ -585,7 +626,7 @@ CurrentThread::QueryScope::~QueryScope()
         if (log_peak_memory_usage_in_destructor)
             logPeakMemoryUsage();
 
-        CurrentThread::detachQueryIfNotDetached();
+        CurrentThread::detachFromGroupIfNotDetached();
     }
     catch (...)
     {
diff --git a/src/Interpreters/TraceCollector.cpp b/src/Interpreters/TraceCollector.cpp
index 49588d490f5..cb00e37df69 100644
--- a/src/Interpreters/TraceCollector.cpp
+++ b/src/Interpreters/TraceCollector.cpp
@@ -29,16 +29,10 @@ TraceCollector::TraceCollector(std::shared_ptr<TraceLog> trace_log_)
     thread = ThreadFromGlobalPool(&TraceCollector::run, this);
 }
 
-
-TraceCollector::~TraceCollector()
+void TraceCollector::tryClosePipe()
 {
     try
     {
-        if (!thread.joinable())
-            LOG_ERROR(&Poco::Logger::get("TraceCollector"), "TraceCollector thread is malformed and cannot be joined");
-        else
-            stop();
-
         TraceSender::pipe.close();
     }
     catch (...)
@@ -47,19 +41,31 @@ TraceCollector::~TraceCollector()
     }
 }
 
-
-/** Sends TraceCollector stop message
-  *
-  * Each sequence of data for TraceCollector thread starts with a boolean flag.
-  * If this flag is true, TraceCollector must stop reading trace_pipe and exit.
-  * This function sends flag with a true value to stop TraceCollector gracefully.
-  */
-void TraceCollector::stop()
+TraceCollector::~TraceCollector()
 {
-    WriteBufferFromFileDescriptor out(TraceSender::pipe.fds_rw[1]);
-    writeChar(true, out);
-    out.next();
-    thread.join();
+    try
+    {
+        /** Sends TraceCollector stop message
+        *
+        * Each sequence of data for TraceCollector thread starts with a boolean flag.
+        * If this flag is true, TraceCollector must stop reading trace_pipe and exit.
+        * This function sends flag with a true value to stop TraceCollector gracefully.
+        */
+        WriteBufferFromFileDescriptor out(TraceSender::pipe.fds_rw[1]);
+        writeChar(true, out);
+        out.next();
+    }
+    catch (...)
+    {
+        tryLogCurrentException("TraceCollector");
+    }
+
+    tryClosePipe();
+
+    if (thread.joinable())
+        thread.join();
+    else
+        LOG_ERROR(&Poco::Logger::get("TraceCollector"), "TraceCollector thread is malformed and cannot be joined");
 }
 
 
@@ -69,60 +75,68 @@ void TraceCollector::run()
 
     ReadBufferFromFileDescriptor in(TraceSender::pipe.fds_rw[0]);
 
-    while (true)
+    try
     {
-        char is_last;
-        readChar(is_last, in);
-        if (is_last)
-            break;
-
-        std::string query_id;
-        UInt8 query_id_size = 0;
-        readBinary(query_id_size, in);
-        query_id.resize(query_id_size);
-        in.readStrict(query_id.data(), query_id_size);
-
-        UInt8 trace_size = 0;
-        readIntBinary(trace_size, in);
-
-        Array trace;
-        trace.reserve(trace_size);
-
-        for (size_t i = 0; i < trace_size; ++i)
+        while (true)
         {
-            uintptr_t addr = 0;
-            readPODBinary(addr, in);
-            trace.emplace_back(static_cast<UInt64>(addr));
-        }
-
-        TraceType trace_type;
-        readPODBinary(trace_type, in);
-
-        UInt64 thread_id;
-        readPODBinary(thread_id, in);
-
-        Int64 size;
-        readPODBinary(size, in);
-
-        ProfileEvents::Event event;
-        readPODBinary(event, in);
-
-        ProfileEvents::Count increment;
-        readPODBinary(increment, in);
-
-        if (trace_log)
-        {
-            // time and time_in_microseconds are both being constructed from the same timespec so that the
-            // times will be equal up to the precision of a second.
-            struct timespec ts;
-            clock_gettime(CLOCK_REALTIME, &ts);
-
-            UInt64 time = static_cast<UInt64>(ts.tv_sec * 1000000000LL + ts.tv_nsec);
-            UInt64 time_in_microseconds = static_cast<UInt64>((ts.tv_sec * 1000000LL) + (ts.tv_nsec / 1000));
-            TraceLogElement element{time_t(time / 1000000000), time_in_microseconds, time, trace_type, thread_id, query_id, trace, size, event, increment};
-            trace_log->add(element);
+            char is_last;
+            readChar(is_last, in);
+            if (is_last)
+                break;
+
+            std::string query_id;
+            UInt8 query_id_size = 0;
+            readBinary(query_id_size, in);
+            query_id.resize(query_id_size);
+            in.readStrict(query_id.data(), query_id_size);
+
+            UInt8 trace_size = 0;
+            readIntBinary(trace_size, in);
+
+            Array trace;
+            trace.reserve(trace_size);
+
+            for (size_t i = 0; i < trace_size; ++i)
+            {
+                uintptr_t addr = 0;
+                readPODBinary(addr, in);
+                trace.emplace_back(static_cast<UInt64>(addr));
+            }
+
+            TraceType trace_type;
+            readPODBinary(trace_type, in);
+
+            UInt64 thread_id;
+            readPODBinary(thread_id, in);
+
+            Int64 size;
+            readPODBinary(size, in);
+
+            ProfileEvents::Event event;
+            readPODBinary(event, in);
+
+            ProfileEvents::Count increment;
+            readPODBinary(increment, in);
+
+            if (trace_log)
+            {
+                // time and time_in_microseconds are both being constructed from the same timespec so that the
+                // times will be equal up to the precision of a second.
+                struct timespec ts;
+                clock_gettime(CLOCK_REALTIME, &ts);
+
+                UInt64 time = static_cast<UInt64>(ts.tv_sec * 1000000000LL + ts.tv_nsec);
+                UInt64 time_in_microseconds = static_cast<UInt64>((ts.tv_sec * 1000000LL) + (ts.tv_nsec / 1000));
+                TraceLogElement element{time_t(time / 1000000000), time_in_microseconds, time, trace_type, thread_id, query_id, trace, size, event, increment};
+                trace_log->add(element);
+            }
         }
     }
+    catch (...)
+    {
+        tryClosePipe();
+        throw;
+    }
 }
 
 }
diff --git a/src/Interpreters/TraceCollector.h b/src/Interpreters/TraceCollector.h
index 40fa854b791..382e7511ac6 100644
--- a/src/Interpreters/TraceCollector.h
+++ b/src/Interpreters/TraceCollector.h
@@ -23,8 +23,9 @@ private:
     std::shared_ptr<TraceLog> trace_log;
     ThreadFromGlobalPool thread;
 
+    void tryClosePipe();
+
     void run();
-    void stop();
 };
 
 }
diff --git a/src/Interpreters/TransactionLog.cpp b/src/Interpreters/TransactionLog.cpp
index 827957b8749..6257e617d4a 100644
--- a/src/Interpreters/TransactionLog.cpp
+++ b/src/Interpreters/TransactionLog.cpp
@@ -350,7 +350,7 @@ void TransactionLog::tryFinalizeUnknownStateTransactions()
         /// CSNs must be already loaded, only need to check if the corresponding mapping exists.
         if (auto csn = getCSN(txn->tid))
         {
-            finalizeCommittedTransaction(txn, csn, state_guard);
+            finalizeCommittedTransaction(txn.get(), csn, state_guard);
         }
         else
         {
@@ -431,7 +431,7 @@ CSN TransactionLog::commitTransaction(const MergeTreeTransactionPtr & txn, bool
             /// The only thing we can do is to postpone its finalization.
             {
                 std::lock_guard lock{running_list_mutex};
-                unknown_state_list.emplace_back(txn.get(), std::move(state_guard));
+                unknown_state_list.emplace_back(txn, std::move(state_guard));
             }
             log_updated_event->set();
             if (throw_on_unknown_status)
@@ -487,6 +487,7 @@ CSN TransactionLog::finalizeCommittedTransaction(MergeTreeTransaction * txn, CSN
         }
     }
 
+    txn->afterFinalize();
     return allocated_csn;
 }
 
@@ -523,6 +524,7 @@ void TransactionLog::rollbackTransaction(const MergeTreeTransactionPtr & txn) no
     }
 
     tryWriteEventToSystemLog(log, global_context, TransactionsInfoLogElement::ROLLBACK, txn->tid);
+    txn->afterFinalize();
 }
 
 MergeTreeTransactionPtr TransactionLog::tryGetRunningTransaction(const TIDHash & tid)
diff --git a/src/Interpreters/TransactionLog.h b/src/Interpreters/TransactionLog.h
index 64d02ad3ac5..6e8777d8519 100644
--- a/src/Interpreters/TransactionLog.h
+++ b/src/Interpreters/TransactionLog.h
@@ -177,7 +177,7 @@ private:
     /// Transactions that are currently processed
     TransactionsList running_list TSA_GUARDED_BY(running_list_mutex);
     /// If we lost connection on attempt to create csn- node then we don't know transaction's state.
-    using UnknownStateList = std::vector<std::pair<MergeTreeTransaction *, scope_guard>>;
+    using UnknownStateList = std::vector<std::pair<MergeTreeTransactionPtr, scope_guard>>;
     UnknownStateList unknown_state_list TSA_GUARDED_BY(running_list_mutex);
     UnknownStateList unknown_state_list_loaded TSA_GUARDED_BY(running_list_mutex);
     /// Ordered list of snapshots that are currently used by some transactions. Needed for background cleanup.
diff --git a/src/Interpreters/TreeCNFConverter.cpp b/src/Interpreters/TreeCNFConverter.cpp
index d036c6728fe..1613b09ee48 100644
--- a/src/Interpreters/TreeCNFConverter.cpp
+++ b/src/Interpreters/TreeCNFConverter.cpp
@@ -360,80 +360,14 @@ CNFQuery & CNFQuery::pushNotInFunctions()
     return *this;
 }
 
-namespace
-{
-    CNFQuery::AndGroup reduceOnce(const CNFQuery::AndGroup & groups)
-    {
-        CNFQuery::AndGroup result;
-        for (const CNFQuery::OrGroup & group : groups)
-        {
-            CNFQuery::OrGroup copy(group);
-            bool inserted = false;
-            for (const CNFQuery::AtomicFormula & atom : group)
-            {
-                copy.erase(atom);
-                CNFQuery::AtomicFormula negative_atom(atom);
-                negative_atom.negative = !atom.negative;
-                copy.insert(negative_atom);
-
-                if (groups.contains(copy))
-                {
-                    copy.erase(negative_atom);
-                    result.insert(copy);
-                    inserted = true;
-                    break;
-                }
-
-                copy.erase(negative_atom);
-                copy.insert(atom);
-            }
-            if (!inserted)
-                result.insert(group);
-        }
-        return result;
-    }
-
-    bool isSubset(const CNFQuery::OrGroup & left, const CNFQuery::OrGroup & right)
-    {
-        if (left.size() > right.size())
-            return false;
-        for (const auto & elem : left)
-            if (!right.contains(elem))
-                return false;
-        return true;
-    }
-
-    CNFQuery::AndGroup filterSubsets(const CNFQuery::AndGroup & groups)
-    {
-        CNFQuery::AndGroup result;
-        for (const CNFQuery::OrGroup & group : groups)
-        {
-            bool insert = true;
-
-            for (const CNFQuery::OrGroup & other_group : groups)
-            {
-                if (isSubset(other_group, group) && group != other_group)
-                {
-                    insert = false;
-                    break;
-                }
-            }
-
-            if (insert)
-                result.insert(group);
-        }
-        return result;
-    }
-}
-
 CNFQuery & CNFQuery::reduce()
 {
     while (true)
     {
-        AndGroup new_statements = reduceOnce(statements);
+        AndGroup new_statements = reduceOnceCNFStatements(statements);
         if (statements == new_statements)
         {
-            statements = filterSubsets(statements);
+            statements = filterCNFSubsets(statements);
             return *this;
         }
         else
diff --git a/src/Interpreters/TreeCNFConverter.h b/src/Interpreters/TreeCNFConverter.h
index 70c8990f74a..7f2fee4e6fd 100644
--- a/src/Interpreters/TreeCNFConverter.h
+++ b/src/Interpreters/TreeCNFConverter.h
@@ -164,4 +164,72 @@ public:
 
 void pushNotIn(CNFQuery::AtomicFormula & atom);
 
+template <typename TAndGroup>
+TAndGroup reduceOnceCNFStatements(const TAndGroup & groups)
+{
+    TAndGroup result;
+    for (const auto & group : groups)
+    {
+        using GroupType = std::decay_t<decltype(group)>;
+        GroupType copy(group);
+        bool inserted = false;
+        for (const auto & atom : group)
+        {
+            copy.erase(atom);
+            using AtomType = std::decay_t<decltype(atom)>;
+            AtomType negative_atom(atom);
+            negative_atom.negative = !atom.negative;
+            copy.insert(negative_atom);
+
+            if (groups.contains(copy))
+            {
+                copy.erase(negative_atom);
+                result.insert(copy);
+                inserted = true;
+                break;
+            }
+
+            copy.erase(negative_atom);
+            copy.insert(atom);
+        }
+        if (!inserted)
+            result.insert(group);
+    }
+    return result;
+}
+
+template <typename TOrGroup>
+bool isCNFGroupSubset(const TOrGroup & left, const TOrGroup & right)
+{
+    if (left.size() > right.size())
+        return false;
+    for (const auto & elem : left)
+        if (!right.contains(elem))
+            return false;
+    return true;
+}
+
+template <typename TAndGroup>
+TAndGroup filterCNFSubsets(const TAndGroup & groups)
+{
+    TAndGroup result;
+    for (const auto & group : groups)
+    {
+        bool insert = true;
+
+        for (const auto & other_group : groups)
+        {
+            if (isCNFGroupSubset(other_group, group) && group != other_group)
+            {
+                insert = false;
+                break;
+            }
+        }
+
+        if (insert)
+            result.insert(group);
+    }
+    return result;
+}
+
 }
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index da15b2a7e5f..825114b20b7 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -25,6 +25,7 @@
 #include <Interpreters/GatherFunctionQuantileVisitor.h>
 #include <Interpreters/RewriteSumIfFunctionVisitor.h>
 #include <Interpreters/RewriteArrayExistsFunctionVisitor.h>
+#include <Interpreters/OptimizeDateFilterVisitor.h>
 
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
@@ -677,6 +678,21 @@ void optimizeInjectiveFunctionsInsideUniq(ASTPtr & query, ContextPtr context)
     RemoveInjectiveFunctionsVisitor(data).visit(query);
 }
 
+void optimizeDateFilters(ASTSelectQuery * select_query)
+{
+    /// Predicates in HAVING clause has been moved to WHERE clause.
+    if (select_query->where())
+    {
+        OptimizeDateFilterInPlaceVisitor::Data data;
+        OptimizeDateFilterInPlaceVisitor(data).visit(select_query->refWhere());
+    }
+    if (select_query->prewhere())
+    {
+        OptimizeDateFilterInPlaceVisitor::Data data;
+        OptimizeDateFilterInPlaceVisitor(data).visit(select_query->refPrewhere());
+    }
+}
+
 void transformIfStringsIntoEnum(ASTPtr & query)
 {
     std::unordered_set<String> function_names = {"if", "transform"};
@@ -703,8 +719,11 @@ void optimizeOrLikeChain(ASTPtr & query)
 
 }
 
-void TreeOptimizer::optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_to_multiif)
+void TreeOptimizer::optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_to_multiif, bool multiif_to_if)
 {
+    if (multiif_to_if)
+        optimizeMultiIfToIf(query);
+
     /// Optimize if with constant condition after constants was substituted instead of scalar subqueries.
     OptimizeIfWithConstantConditionVisitor(aliases).visit(query);
 
@@ -777,6 +796,9 @@ void TreeOptimizer::apply(ASTPtr & query, TreeRewriterResult & result,
                 tables_with_columns, result.storage_snapshot->metadata, result.storage);
     }
 
+    /// Rewrite date filters to avoid the calls of converters such as toYear, toYYYYMM, toISOWeek, etc.
+    optimizeDateFilters(select_query);
+
     /// GROUP BY injective function elimination.
     optimizeGroupBy(select_query, context);
 
@@ -791,9 +813,6 @@ void TreeOptimizer::apply(ASTPtr & query, TreeRewriterResult & result,
     if (settings.optimize_normalize_count_variants)
         optimizeCountConstantAndSumOne(query, context);
 
-    if (settings.optimize_multiif_to_if)
-        optimizeMultiIfToIf(query);
-
     if (settings.optimize_rewrite_sum_if_to_count_if)
         optimizeSumIfFunctions(query);
 
diff --git a/src/Interpreters/TreeOptimizer.h b/src/Interpreters/TreeOptimizer.h
index 07ae2fbd12d..74a0a9928c4 100644
--- a/src/Interpreters/TreeOptimizer.h
+++ b/src/Interpreters/TreeOptimizer.h
@@ -23,7 +23,7 @@ public:
         const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns,
         ContextPtr context);
 
-    static void optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_to_multiif);
+    static void optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_to_multiif, bool multiif_to_if);
     static void optimizeCountConstantAndSumOne(ASTPtr & query, ContextPtr context);
     static void optimizeGroupByFunctionKeys(ASTSelectQuery * select_query);
 };
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 4c134e175dc..cda5ceeb164 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -8,6 +8,7 @@
 
 #include <Interpreters/ArrayJoinedColumnsVisitor.h>
 #include <Interpreters/CollectJoinOnKeysVisitor.h>
+#include <Interpreters/ComparisonTupleEliminationVisitor.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExecuteScalarSubqueriesVisitor.h>
 #include <Interpreters/ExpressionActions.h> /// getSmallestColumn()
@@ -451,10 +452,14 @@ void removeUnneededColumnsFromSelectClause(ASTSelectQuery * select_query, const
 
 /// Replacing scalar subqueries with constant values.
 void executeScalarSubqueries(
-    ASTPtr & query, ContextPtr context, size_t subquery_depth, Scalars & scalars, Scalars & local_scalars, bool only_analyze)
+    ASTPtr & query, ContextPtr context, size_t subquery_depth, Scalars & scalars, Scalars & local_scalars, bool only_analyze, bool is_create_parameterized_view)
 {
     LogAST log;
-    ExecuteScalarSubqueriesVisitor::Data visitor_data{WithContext{context}, subquery_depth, scalars, local_scalars, only_analyze};
+    ExecuteScalarSubqueriesVisitor::Data visitor_data{
+        WithContext{context}, subquery_depth, scalars,
+        local_scalars, only_analyze, is_create_parameterized_view,
+        /*replace_only_to_literals=*/ false, /*max_literal_size=*/ std::nullopt};
+
     ExecuteScalarSubqueriesVisitor(visitor_data, log.stream()).visit(query);
 }
 
@@ -1221,7 +1226,7 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     removeUnneededColumnsFromSelectClause(select_query, required_result_columns, remove_duplicates);
 
     /// Executing scalar subqueries - replacing them with constant values.
-    executeScalarSubqueries(query, getContext(), subquery_depth, result.scalars, result.local_scalars, select_options.only_analyze);
+    executeScalarSubqueries(query, getContext(), subquery_depth, result.scalars, result.local_scalars, select_options.only_analyze, select_options.is_create_parameterized_view);
 
     if (settings.legacy_column_name_of_tuple_literal)
         markTupleLiteralsAsLegacy(query);
@@ -1229,11 +1234,14 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     /// Push the predicate expression down to subqueries. The optimization should be applied to both initial and secondary queries.
     result.rewrite_subqueries = PredicateExpressionsOptimizer(getContext(), tables_with_columns, settings).optimize(*select_query);
 
-    TreeOptimizer::optimizeIf(query, result.aliases, settings.optimize_if_chain_to_multiif);
+     /// Only apply AST optimization for initial queries.
+    const bool ast_optimizations_allowed =
+        getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY
+        && !select_options.ignore_ast_optimizations;
+
+    bool optimize_multiif_to_if = ast_optimizations_allowed && settings.optimize_multiif_to_if;
+    TreeOptimizer::optimizeIf(query, result.aliases, settings.optimize_if_chain_to_multiif, optimize_multiif_to_if);
 
-    /// Only apply AST optimization for initial queries.
-    const bool ast_optimizations_allowed
-        = getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY && !select_options.ignore_ast_optimizations;
     if (ast_optimizations_allowed)
         TreeOptimizer::apply(query, result, tables_with_columns, getContext());
 
@@ -1335,12 +1343,12 @@ TreeRewriterResultPtr TreeRewriter::analyze(
     normalize(query, result.aliases, result.source_columns_set, false, settings, allow_self_aliases, getContext(), is_create_parameterized_view);
 
     /// Executing scalar subqueries. Column defaults could be a scalar subquery.
-    executeScalarSubqueries(query, getContext(), 0, result.scalars, result.local_scalars, !execute_scalar_subqueries);
+    executeScalarSubqueries(query, getContext(), 0, result.scalars, result.local_scalars, !execute_scalar_subqueries, is_create_parameterized_view);
 
     if (settings.legacy_column_name_of_tuple_literal)
         markTupleLiteralsAsLegacy(query);
 
-    TreeOptimizer::optimizeIf(query, result.aliases, settings.optimize_if_chain_to_multiif);
+    TreeOptimizer::optimizeIf(query, result.aliases, settings.optimize_if_chain_to_multiif, false);
 
     if (allow_aggregations)
     {
@@ -1424,6 +1432,13 @@ void TreeRewriter::normalize(
     if (context_->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY && settings.normalize_function_names)
         FunctionNameNormalizer().visit(query.get());
 
+    if (settings.optimize_move_to_prewhere)
+    {
+        /// Required for PREWHERE
+        ComparisonTupleEliminationVisitor::Data data_comparison_tuple_elimination;
+        ComparisonTupleEliminationVisitor(data_comparison_tuple_elimination).visit(query);
+    }
+
     /// Common subexpression elimination. Rewrite rules.
     QueryNormalizer::Data normalizer_data(aliases, source_columns_set, ignore_alias, settings, allow_self_aliases, is_create_parameterized_view);
     QueryNormalizer(normalizer_data).visit(query);
diff --git a/src/Interpreters/WhereConstraintsOptimizer.cpp b/src/Interpreters/WhereConstraintsOptimizer.cpp
index 234b99167bb..91c19fa264e 100644
--- a/src/Interpreters/WhereConstraintsOptimizer.cpp
+++ b/src/Interpreters/WhereConstraintsOptimizer.cpp
@@ -74,7 +74,7 @@ bool checkIfGroupAlwaysTrueFullMatch(const CNFQuery::OrGroup & group, const Cons
     return false;
 }
 
-bool checkIfGroupAlwaysTrueGraph(const CNFQuery::OrGroup & group, const ComparisonGraph & graph)
+bool checkIfGroupAlwaysTrueGraph(const CNFQuery::OrGroup & group, const ComparisonGraph<ASTPtr> & graph)
 {
     /// We try to find at least one atom that is always true by using comparison graph.
     for (const auto & atom : group)
@@ -82,7 +82,7 @@ bool checkIfGroupAlwaysTrueGraph(const CNFQuery::OrGroup & group, const Comparis
         const auto * func = atom.ast->as<ASTFunction>();
         if (func && func->arguments->children.size() == 2)
         {
-            const auto expected = ComparisonGraph::atomToCompareResult(atom);
+            const auto expected = ComparisonGraph<ASTPtr>::atomToCompareResult(atom);
             if (graph.isAlwaysCompare(expected, func->arguments->children[0], func->arguments->children[1]))
                 return true;
         }
@@ -108,20 +108,20 @@ bool checkIfAtomAlwaysFalseFullMatch(const CNFQuery::AtomicFormula & atom, const
     return false;
 }
 
-bool checkIfAtomAlwaysFalseGraph(const CNFQuery::AtomicFormula & atom, const ComparisonGraph & graph)
+bool checkIfAtomAlwaysFalseGraph(const CNFQuery::AtomicFormula & atom, const ComparisonGraph<ASTPtr> & graph)
 {
     const auto * func = atom.ast->as<ASTFunction>();
     if (func && func->arguments->children.size() == 2)
     {
         /// TODO: special support for !=
-        const auto expected = ComparisonGraph::atomToCompareResult(atom);
+        const auto expected = ComparisonGraph<ASTPtr>::atomToCompareResult(atom);
         return !graph.isPossibleCompare(expected, func->arguments->children[0], func->arguments->children[1]);
     }
 
     return false;
 }
 
-void replaceToConstants(ASTPtr & term, const ComparisonGraph & graph)
+void replaceToConstants(ASTPtr & term, const ComparisonGraph<ASTPtr> & graph)
 {
     const auto equal_constant = graph.getEqualConst(term);
     if (equal_constant)
@@ -135,7 +135,7 @@ void replaceToConstants(ASTPtr & term, const ComparisonGraph & graph)
     }
 }
 
-CNFQuery::AtomicFormula replaceTermsToConstants(const CNFQuery::AtomicFormula & atom, const ComparisonGraph & graph)
+CNFQuery::AtomicFormula replaceTermsToConstants(const CNFQuery::AtomicFormula & atom, const ComparisonGraph<ASTPtr> & graph)
 {
     CNFQuery::AtomicFormula result;
     result.negative = atom.negative;
diff --git a/src/Interpreters/WindowDescription.h b/src/Interpreters/WindowDescription.h
index 3b9af6575e8..d14908fe993 100644
--- a/src/Interpreters/WindowDescription.h
+++ b/src/Interpreters/WindowDescription.h
@@ -7,13 +7,15 @@
 #include <DataTypes/IDataType.h>
 #include <Core/Names.h>
 #include <Core/Types.h>
-#include <Processors/QueryPlan/FilterStep.h>
 
 namespace DB
 {
 
 class ASTFunction;
 
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
 struct WindowFunctionDescription
 {
     std::string column_name;
diff --git a/src/Interpreters/ZooKeeperLog.cpp b/src/Interpreters/ZooKeeperLog.cpp
index faa6d1f9f02..48f4d510af7 100644
--- a/src/Interpreters/ZooKeeperLog.cpp
+++ b/src/Interpreters/ZooKeeperLog.cpp
@@ -87,6 +87,7 @@ NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
                 {"Auth",                static_cast<Int16>(Coordination::OpNum::Auth)},
                 {"SessionID",           static_cast<Int16>(Coordination::OpNum::SessionID)},
                 {"FilteredList",        static_cast<Int16>(Coordination::OpNum::FilteredList)},
+                {"CheckNotExists",      static_cast<Int16>(Coordination::OpNum::CheckNotExists)},
             });
 
     auto error_enum = getCoordinationErrorCodesEnumType();
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index 9e4f543db43..dc61e748db6 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -149,6 +149,8 @@ Field convertDecimalType(const Field & from, const To & type)
         return convertDecimalToDecimalType<Decimal64>(from, type);
     if (from.getType() == Field::Types::Decimal128)
         return convertDecimalToDecimalType<Decimal128>(from, type);
+    if (from.getType() == Field::Types::Decimal256)
+        return convertDecimalToDecimalType<Decimal256>(from, type);
 
     if (from.getType() == Field::Types::Float64)
         return convertFloatToDecimalType<Float64>(from, type);
@@ -235,6 +237,20 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
             return src;
         }
 
+        /// For toDate('xxx') in 1::Int64, we CAST `src` to UInt64, which may
+        /// produce wrong result in some special cases.
+        if (which_type.isDate() && src.getType() == Field::Types::Int64)
+        {
+            return convertNumericType<UInt64>(src, type);
+        }
+
+        /// For toDate32('xxx') in 1, we CAST `src` to Int64. Also, it may
+        /// produce wrong result in some special cases.
+        if (which_type.isDate32() && src.getType() == Field::Types::UInt64)
+        {
+            return convertNumericType<Int64>(src, type);
+        }
+
         if (which_type.isDateTime64()
             && (src.getType() == Field::Types::UInt64 || src.getType() == Field::Types::Int64 || src.getType() == Field::Types::Decimal64))
         {
@@ -432,9 +448,9 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         {
             Object object;
             const auto & map = src.get<const Map &>();
-            for (size_t i = 0; i < map.size(); ++i)
+            for (const auto & element : map)
             {
-                const auto & map_entry = map[i].get<Tuple>();
+                const auto & map_entry = element.get<Tuple>();
                 const auto & key = map_entry[0];
                 const auto & value = map_entry[1];
 
diff --git a/src/Interpreters/evaluateConstantExpression.cpp b/src/Interpreters/evaluateConstantExpression.cpp
index ebefa0d9ce7..5a333172b14 100644
--- a/src/Interpreters/evaluateConstantExpression.cpp
+++ b/src/Interpreters/evaluateConstantExpression.cpp
@@ -70,7 +70,6 @@ std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(co
     if (context->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY && context->getSettingsRef().normalize_function_names)
         FunctionNameNormalizer().visit(ast.get());
 
-    String result_name = ast->getColumnName();
     auto syntax_result = TreeRewriter(context).analyze(ast, source_columns);
 
     /// AST potentially could be transformed to literal during TreeRewriter analyze.
@@ -82,6 +81,7 @@ std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(co
 
     ColumnPtr result_column;
     DataTypePtr result_type;
+    String result_name = ast->getColumnName();
     for (const auto & action_node : actions->getOutputs())
     {
         if ((action_node->result_name == result_name) && action_node->column)
diff --git a/src/Interpreters/examples/hash_map.cpp b/src/Interpreters/examples/hash_map.cpp
index fe2cbda019d..f9fc36454f6 100644
--- a/src/Interpreters/examples/hash_map.cpp
+++ b/src/Interpreters/examples/hash_map.cpp
@@ -15,6 +15,7 @@
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/PackedHashMap.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/Interpreters/examples/string_hash_map.cpp b/src/Interpreters/examples/string_hash_map.cpp
index 15df8c399de..f55ed983fbc 100644
--- a/src/Interpreters/examples/string_hash_map.cpp
+++ b/src/Interpreters/examples/string_hash_map.cpp
@@ -156,7 +156,7 @@ void NO_INLINE bench(const std::vector<StringRef> & data, DB::Arena &, const cha
         }
         watch.stop();
 
-        std::cerr << "arena-memory " << pool.size() + map.getBufferSizeInBytes() << std::endl;
+        std::cerr << "arena-memory " << pool.allocatedBytes() + map.getBufferSizeInBytes() << std::endl;
         std::cerr << "single-run " << std::setprecision(3)
                   << watch.elapsedSeconds() << std::endl;
     }
diff --git a/src/Interpreters/examples/string_hash_set.cpp b/src/Interpreters/examples/string_hash_set.cpp
index 355789e97ec..527ada1579d 100644
--- a/src/Interpreters/examples/string_hash_set.cpp
+++ b/src/Interpreters/examples/string_hash_set.cpp
@@ -34,7 +34,7 @@ void NO_INLINE bench(const std::vector<StringRef> & data, DB::Arena & pool, cons
         }
         watch.stop();
 
-        std::cerr << "arena-memory " << pool.size() + set.getBufferSizeInBytes() << std::endl;
+        std::cerr << "arena-memory " << pool.allocatedBytes() + set.getBufferSizeInBytes() << std::endl;
         std::cerr << "single-run " << std::setprecision(3)
                   << watch.elapsedSeconds() << std::endl;
     }
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 60d16eda6ba..04c1d545207 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -37,6 +37,18 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+static ZooKeeperRetriesInfo getRetriesInfo()
+{
+    const auto & config_ref = Context::getGlobalContextInstance()->getConfigRef();
+    return ZooKeeperRetriesInfo(
+        "DistributedDDL",
+        &Poco::Logger::get("DDLQueryStatusSource"),
+        config_ref.getInt("distributed_ddl_keeper_max_retries", 5),
+        config_ref.getInt("distributed_ddl_keeper_initial_backoff_ms", 100),
+        config_ref.getInt("distributed_ddl_keeper_max_backoff_ms", 5000)
+    );
+}
+
 bool isSupportedAlterType(int type)
 {
     assert(type != ASTAlterCommand::NO_TYPE);
@@ -55,7 +67,7 @@ bool isSupportedAlterType(int type)
 
 BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, ContextPtr context, const DDLQueryOnClusterParams & params)
 {
-    OpenTelemetry::SpanHolder span(__FUNCTION__);
+    OpenTelemetry::SpanHolder span(__FUNCTION__, OpenTelemetry::PRODUCER);
 
     if (context->getCurrentTransaction() && context->getSettingsRef().throw_on_unsupported_query_inside_transaction)
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "ON CLUSTER queries inside transactions are not supported");
@@ -92,6 +104,9 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, ContextPtr context,
 
     span.addAttribute("clickhouse.cluster", query->cluster);
 
+    if (!cluster->areDistributedDDLQueriesAllowed())
+        throw Exception(ErrorCodes::QUERY_IS_PROHIBITED, "Distributed DDL queries are prohibited for the cluster");
+
     /// TODO: support per-cluster grant
     context->checkAccess(AccessType::CLUSTER);
 
@@ -169,9 +184,10 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, ContextPtr context,
     entry.initiator = ddl_worker.getCommonHostID();
     entry.setSettingsIfRequired(context);
     entry.tracing_context = OpenTelemetry::CurrentContext();
+    entry.initial_query_id = context->getClientInfo().initial_query_id;
     String node_path = ddl_worker.enqueueQuery(entry);
 
-    return getDistributedDDLStatus(node_path, entry, context);
+    return getDistributedDDLStatus(node_path, entry, context, /* hosts_to_wait */ nullptr);
 }
 
 
@@ -179,7 +195,7 @@ class DDLQueryStatusSource final : public ISource
 {
 public:
     DDLQueryStatusSource(
-        const String & zk_node_path, const DDLLogEntry & entry, ContextPtr context_, const std::optional<Strings> & hosts_to_wait = {});
+        const String & zk_node_path, const DDLLogEntry & entry, ContextPtr context_, const Strings * hosts_to_wait);
 
     String getName() const override { return "DDLQueryStatus"; }
     Chunk generate() override;
@@ -227,7 +243,7 @@ private:
 };
 
 
-BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & entry, ContextPtr context, const std::optional<Strings> & hosts_to_wait)
+BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & entry, ContextPtr context, const Strings * hosts_to_wait)
 {
     BlockIO io;
     if (context->getSettingsRef().distributed_ddl_task_timeout == 0)
@@ -288,8 +304,8 @@ Block DDLQueryStatusSource::getSampleBlock(ContextPtr context_, bool hosts_to_wa
 }
 
 DDLQueryStatusSource::DDLQueryStatusSource(
-    const String & zk_node_path, const DDLLogEntry & entry, ContextPtr context_, const std::optional<Strings> & hosts_to_wait)
-    : ISource(getSampleBlock(context_, hosts_to_wait.has_value()))
+    const String & zk_node_path, const DDLLogEntry & entry, ContextPtr context_, const Strings * hosts_to_wait)
+    : ISource(getSampleBlock(context_, static_cast<bool>(hosts_to_wait)))
     , node_path(zk_node_path)
     , context(context_)
     , watch(CLOCK_MONOTONIC_COARSE)
@@ -377,7 +393,6 @@ Chunk DDLQueryStatusSource::generate()
     if (is_replicated_database && context->getSettingsRef().database_replicated_enforce_synchronous_settings)
         node_to_wait = "synced";
 
-    auto zookeeper = context->getZooKeeper();
     size_t try_number = 0;
 
     while (true)
@@ -417,7 +432,23 @@ Chunk DDLQueryStatusSource::generate()
             sleepForMilliseconds(std::min<size_t>(1000, 50 * (try_number + 1)));
         }
 
-        if (!zookeeper->exists(node_path))
+        bool node_exists = false;
+        Strings tmp_hosts;
+        Strings tmp_active_hosts;
+
+        {
+            auto retries_info = getRetriesInfo();
+            auto retries_ctl = ZooKeeperRetriesControl("executeDDLQueryOnCluster", retries_info, context->getProcessListElement());
+            retries_ctl.retryLoop([&]()
+            {
+                auto zookeeper = context->getZooKeeper();
+                node_exists = zookeeper->exists(node_path);
+                tmp_hosts = getChildrenAllowNoNode(zookeeper, fs::path(node_path) / node_to_wait);
+                tmp_active_hosts = getChildrenAllowNoNode(zookeeper, fs::path(node_path) / "active");
+            });
+        }
+
+        if (!node_exists)
         {
             /// Paradoxically, this exception will be throw even in case of "never_throw" mode.
 
@@ -429,12 +460,12 @@ Chunk DDLQueryStatusSource::generate()
             return {};
         }
 
-        Strings new_hosts = getNewAndUpdate(getChildrenAllowNoNode(zookeeper, fs::path(node_path) / node_to_wait));
+        Strings new_hosts = getNewAndUpdate(tmp_hosts);
         ++try_number;
         if (new_hosts.empty())
             continue;
 
-        current_active_hosts = getChildrenAllowNoNode(zookeeper, fs::path(node_path) / "active");
+        current_active_hosts = std::move(tmp_active_hosts);
 
         MutableColumns columns = output.getHeader().cloneEmptyColumns();
         for (const String & host_id : new_hosts)
@@ -444,7 +475,15 @@ Chunk DDLQueryStatusSource::generate()
             if (node_to_wait == "finished")
             {
                 String status_data;
-                if (zookeeper->tryGet(fs::path(node_path) / "finished" / host_id, status_data))
+                bool finished_exists = false;
+
+                auto retries_info = getRetriesInfo();
+                auto retries_ctl = ZooKeeperRetriesControl("executeDDLQueryOnCluster", retries_info, context->getProcessListElement());
+                retries_ctl.retryLoop([&]()
+                {
+                    finished_exists = context->getZooKeeper()->tryGet(fs::path(node_path) / "finished" / host_id, status_data);
+                });
+                if (finished_exists)
                     status.tryDeserializeText(status_data);
             }
             else
diff --git a/src/Interpreters/executeDDLQueryOnCluster.h b/src/Interpreters/executeDDLQueryOnCluster.h
index 8df199f0ede..40db13d7ef5 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.h
+++ b/src/Interpreters/executeDDLQueryOnCluster.h
@@ -5,6 +5,7 @@
 #include <Processors/ISource.h>
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
+#include <Storages/MergeTree/ZooKeeperRetries.h>
 
 
 namespace zkutil
@@ -42,8 +43,7 @@ struct DDLQueryOnClusterParams
 /// Returns DDLQueryStatusSource, which reads results of query execution on each host in the cluster.
 BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context, const DDLQueryOnClusterParams & params = {});
 
-BlockIO getDistributedDDLStatus(
-    const String & node_path, const DDLLogEntry & entry, ContextPtr context, const std::optional<Strings> & hosts_to_wait = {});
+BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & entry, ContextPtr context, const Strings * hosts_to_wait);
 
 bool maybeRemoveOnCluster(const ASTPtr & query_ptr, ContextPtr context);
 
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 435401796a0..6e13afa9f43 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -57,6 +57,7 @@
 #include <Interpreters/SelectQueryOptions.h>
 #include <Interpreters/TransactionLog.h>
 #include <Interpreters/executeQuery.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Common/ProfileEvents.h>
 
 #include <IO/CompressionMethod.h>
@@ -176,7 +177,7 @@ static void setExceptionStackTrace(QueryLogElement & elem)
 
 
 /// Log exception (with query info) into text log (not into system table).
-static void logException(ContextPtr context, QueryLogElement & elem)
+static void logException(ContextPtr context, QueryLogElement & elem, bool log_error = true)
 {
     String comment;
     if (!elem.log_comment.empty())
@@ -187,7 +188,7 @@ static void logException(ContextPtr context, QueryLogElement & elem)
     PreformattedMessage message;
     message.format_string = elem.exception_format_string;
 
-    if (elem.stack_trace.empty())
+    if (elem.stack_trace.empty() || !log_error)
         message.text = fmt::format("{} (from {}){} (in query: {})", elem.exception,
                         context->getClientInfo().current_address.toString(),
                         comment,
@@ -201,7 +202,10 @@ static void logException(ContextPtr context, QueryLogElement & elem)
             toOneLineQuery(elem.query),
             elem.stack_trace);
 
-    LOG_ERROR(&Poco::Logger::get("executeQuery"), message);
+    if (log_error)
+        LOG_ERROR(&Poco::Logger::get("executeQuery"), message);
+    else
+        LOG_INFO(&Poco::Logger::get("executeQuery"), message);
 }
 
 static void onExceptionBeforeStart(
@@ -303,22 +307,6 @@ static void setQuerySpecificSettings(ASTPtr & ast, ContextMutablePtr context)
     }
 }
 
-static void applySettingsFromSelectWithUnion(const ASTSelectWithUnionQuery & select_with_union, ContextMutablePtr context)
-{
-    const ASTs & children = select_with_union.list_of_selects->children;
-    if (children.empty())
-        return;
-
-    // We might have an arbitrarily complex UNION tree, so just give
-    // up if the last first-order child is not a plain SELECT.
-    // It is flattened later, when we process UNION ALL/DISTINCT.
-    const auto * last_select = children.back()->as<ASTSelectQuery>();
-    if (last_select && last_select->settings())
-    {
-        InterpreterSetQuery(last_select->settings(), context).executeForCurrentContext();
-    }
-}
-
 static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     const char * begin,
     const char * end,
@@ -448,10 +436,24 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     /// Avoid early destruction of process_list_entry if it was not saved to `res` yet (in case of exception)
     ProcessList::EntryPtr process_list_entry;
     BlockIO res;
-    std::shared_ptr<InterpreterTransactionControlQuery> implicit_txn_control{};
+    auto implicit_txn_control = std::make_shared<bool>(false);
     String query_database;
     String query_table;
 
+    auto execute_implicit_tcl_query = [implicit_txn_control](const ContextMutablePtr & query_context, ASTTransactionControl::QueryType tcl_type)
+    {
+        /// Unset the flag on COMMIT and ROLLBACK
+        SCOPE_EXIT({ if (tcl_type != ASTTransactionControl::BEGIN) *implicit_txn_control = false; });
+
+        ASTPtr tcl_ast = std::make_shared<ASTTransactionControl>(tcl_type);
+        InterpreterTransactionControlQuery tc(tcl_ast, query_context);
+        tc.execute();
+
+        /// Set the flag after successful BIGIN
+        if (tcl_type == ASTTransactionControl::BEGIN)
+            *implicit_txn_control = true;
+    };
+
     try
     {
         if (auto txn = context->getCurrentTransaction())
@@ -466,35 +468,10 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
         /// Interpret SETTINGS clauses as early as possible (before invoking the corresponding interpreter),
         /// to allow settings to take effect.
-        if (const auto * select_query = ast->as<ASTSelectQuery>())
-        {
-            if (auto new_settings = select_query->settings())
-                InterpreterSetQuery(new_settings, context).executeForCurrentContext();
-        }
-        else if (const auto * select_with_union_query = ast->as<ASTSelectWithUnionQuery>())
-        {
-            applySettingsFromSelectWithUnion(*select_with_union_query, context);
-        }
-        else if (const auto * query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get()))
-        {
-            if (query_with_output->settings_ast)
-                InterpreterSetQuery(query_with_output->settings_ast, context).executeForCurrentContext();
+        InterpreterSetQuery::applySettingsFromQuery(ast, context);
 
-            if (const auto * create_query = ast->as<ASTCreateQuery>())
-            {
-                if (create_query->select)
-                {
-                    applySettingsFromSelectWithUnion(create_query->select->as<ASTSelectWithUnionQuery &>(), context);
-                }
-            }
-        }
-        else if (auto * insert_query = ast->as<ASTInsertQuery>())
-        {
-            context->setInsertFormat(insert_query->format);
-            if (insert_query->settings_ast)
-                InterpreterSetQuery(insert_query->settings_ast, context).executeForCurrentContext();
+        if (auto * insert_query = ast->as<ASTInsertQuery>())
             insert_query->tail = istr;
-        }
 
         setQuerySpecificSettings(ast, context);
 
@@ -550,6 +527,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         context->initializeExternalTablesIfSet();
 
         auto * insert_query = ast->as<ASTInsertQuery>();
+        bool async_insert_enabled = settings.async_insert;
 
         /// Resolve database before trying to use async insert feature - to properly hash the query.
         if (insert_query)
@@ -558,6 +536,10 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 insert_query->table_id = context->resolveStorageID(insert_query->table_id);
             else if (auto table = insert_query->getTable(); !table.empty())
                 insert_query->table_id = context->resolveStorageID(StorageID{insert_query->getDatabase(), table});
+
+            if (insert_query->table_id)
+                if (auto table = DatabaseCatalog::instance().tryGetTable(insert_query->table_id, context))
+                    async_insert_enabled |= table->areAsynchronousInsertsEnabled();
         }
 
         if (insert_query && insert_query->select)
@@ -592,7 +574,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         auto * queue = context->getAsynchronousInsertQueue();
         auto * logger = &Poco::Logger::get("executeQuery");
 
-        if (insert_query && settings.async_insert)
+        if (insert_query && async_insert_enabled)
         {
             String reason;
 
@@ -661,6 +643,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             }
         }
 
+        bool can_use_query_cache = settings.use_query_cache && !internal && !ast->as<ASTExplainQuery>();
+
         if (!async_insert)
         {
             /// We need to start the (implicit) transaction before getting the interpreter as this will get links to the latest snapshots
@@ -671,14 +655,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                     if (context->isGlobalContext())
                         throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context cannot create transactions");
 
-                    /// If there is no session (which is the default for the HTTP Handler), set up one just for this as it is necessary
-                    /// to control the transaction lifetime
-                    if (!context->hasSessionContext())
-                        context->makeSessionContext();
-
-                    auto tc = std::make_shared<InterpreterTransactionControlQuery>(ast, context);
-                    tc->executeBegin(context->getSessionContext());
-                    implicit_txn_control = std::move(tc);
+                    execute_implicit_tcl_query(context, ASTTransactionControl::BEGIN);
                 }
                 catch (Exception & e)
                 {
@@ -689,9 +666,13 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
             interpreter = InterpreterFactory::get(ast, context, SelectQueryOptions(stage).setInternal(internal));
 
-            if (context->getCurrentTransaction() && !interpreter->supportsTransactions() &&
-                context->getSettingsRef().throw_on_unsupported_query_inside_transaction)
-                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Transactions are not supported for this type of query ({})", ast->getID());
+            const auto & query_settings = context->getSettingsRef();
+            if (context->getCurrentTransaction() && query_settings.throw_on_unsupported_query_inside_transaction)
+            {
+                if (!interpreter->supportsTransactions())
+                    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Transactions are not supported for this type of query ({})", ast->getID());
+
+            }
 
             if (!interpreter->ignoreQuota() && !quota_checked)
             {
@@ -747,17 +728,20 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 auto query_cache = context->getQueryCache();
                 bool read_result_from_query_cache = false; /// a query must not read from *and* write to the query cache at the same time
                 if (query_cache != nullptr
-                    && (settings.allow_experimental_query_cache && settings.use_query_cache && settings.enable_reads_from_query_cache)
+                    && (can_use_query_cache && settings.enable_reads_from_query_cache)
                     && res.pipeline.pulling())
                 {
                     QueryCache::Key key(
                         ast, res.pipeline.getHeader(),
-                        std::make_optional<String>(context->getUserName()),
-                        std::chrono::system_clock::now() + std::chrono::seconds(settings.query_cache_ttl));
+                        context->getUserName(), /*dummy for is_shared*/ false,
+                        /*dummy value for expires_at*/ std::chrono::system_clock::from_time_t(1),
+                        /*dummy value for is_compressed*/ false);
                     QueryCache::Reader reader = query_cache->createReader(key);
                     if (reader.hasCacheEntryForKey())
                     {
-                        res.pipeline = QueryPipeline(reader.getPipe());
+                        QueryPipeline pipeline;
+                        pipeline.readFromQueryCache(reader.getSource(), reader.getSourceTotals(), reader.getSourceExtremes());
+                        res.pipeline = std::move(pipeline);
                         read_result_from_query_cache = true;
                     }
                 }
@@ -768,21 +752,27 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 /// then add a processor on top of the pipeline which stores the result in the query cache.
                 if (!read_result_from_query_cache
                     && query_cache != nullptr
-                    && settings.allow_experimental_query_cache && settings.use_query_cache && settings.enable_writes_to_query_cache
+                    && can_use_query_cache && settings.enable_writes_to_query_cache
                     && res.pipeline.pulling()
                     && (!astContainsNonDeterministicFunctions(ast, context) || settings.query_cache_store_results_of_queries_with_nondeterministic_functions))
                 {
                     QueryCache::Key key(
                         ast, res.pipeline.getHeader(),
-                        settings.query_cache_share_between_users ? std::nullopt : std::make_optional<String>(context->getUserName()),
-                        std::chrono::system_clock::now() + std::chrono::seconds(settings.query_cache_ttl));
+                        context->getUserName(), settings.query_cache_share_between_users,
+                        std::chrono::system_clock::now() + std::chrono::seconds(settings.query_cache_ttl),
+                        settings.query_cache_compress_entries);
 
                     const size_t num_query_runs = query_cache->recordQueryRun(key);
                     if (num_query_runs > settings.query_cache_min_query_runs)
                     {
-                        auto stream_in_query_cache_transform = std::make_shared<StreamInQueryCacheTransform>(res.pipeline.getHeader(), query_cache, key,
-                                std::chrono::milliseconds(context->getSettings().query_cache_min_query_duration.totalMilliseconds()));
-                        res.pipeline.streamIntoQueryCache(stream_in_query_cache_transform);
+                        auto query_cache_writer = std::make_shared<QueryCache::Writer>(query_cache->createWriter(
+                                         key,
+                                         std::chrono::milliseconds(settings.query_cache_min_query_duration.totalMilliseconds()),
+                                         settings.query_cache_squash_partial_results,
+                                         settings.max_block_size,
+                                         settings.query_cache_max_size_in_bytes,
+                                         settings.query_cache_max_entries));
+                        res.pipeline.writeResultIntoQueryCache(query_cache_writer);
                     }
                 }
 
@@ -851,6 +841,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                     elem.query_databases = info.databases;
                     elem.query_tables = info.tables;
                     elem.query_columns = info.columns;
+                    elem.query_partitions = info.partitions;
                     elem.query_projections = info.projections;
                     elem.query_views = info.views;
                 }
@@ -915,6 +906,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 element.query_databases.insert(access_info.databases.begin(), access_info.databases.end());
                 element.query_tables.insert(access_info.tables.begin(), access_info.tables.end());
                 element.query_columns.insert(access_info.columns.begin(), access_info.columns.end());
+                element.query_partitions.insert(access_info.partitions.begin(), access_info.partitions.end());
                 element.query_projections.insert(access_info.projections.begin(), access_info.projections.end());
                 element.query_views.insert(access_info.views.begin(), access_info.views.end());
 
@@ -936,8 +928,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             auto finish_callback = [elem,
                                     context,
                                     ast,
-                                    allow_experimental_query_cache = settings.allow_experimental_query_cache,
-                                    use_query_cache = settings.use_query_cache,
+                                    my_can_use_query_cache = can_use_query_cache,
                                     enable_writes_to_query_cache = settings.enable_writes_to_query_cache,
                                     query_cache_store_results_of_queries_with_nondeterministic_functions = settings.query_cache_store_results_of_queries_with_nondeterministic_functions,
                                     log_queries,
@@ -946,6 +937,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                                     log_processors_profiles = settings.log_processors_profiles,
                                     status_info_to_query_log,
                                     implicit_txn_control,
+                                    execute_implicit_tcl_query,
                                     pulling_pipeline = pipeline.pulling(),
                                     query_span](QueryPipeline & query_pipeline) mutable
             {
@@ -954,7 +946,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 auto query_cache = context->getQueryCache();
                 if (query_cache != nullptr
                     && pulling_pipeline
-                    && allow_experimental_query_cache && use_query_cache && enable_writes_to_query_cache
+                    && my_can_use_query_cache && enable_writes_to_query_cache
                     && (!astContainsNonDeterministicFunctions(ast, context) || query_cache_store_results_of_queries_with_nondeterministic_functions))
                 {
                     query_pipeline.finalizeWriteInQueryCache();
@@ -995,7 +987,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                     {
                         double elapsed_seconds = static_cast<double>(info.elapsed_microseconds) / 1000000.0;
                         double rows_per_second = static_cast<double>(elem.read_rows) / elapsed_seconds;
-                        LOG_INFO(
+                        LOG_DEBUG(
                             &Poco::Logger::get("executeQuery"),
                             "Read {} rows, {} in {} sec., {} rows/sec., {}/sec.",
                             elem.read_rows,
@@ -1017,6 +1009,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                             ProcessorProfileLogElement processor_elem;
                             processor_elem.event_time = elem.event_time;
                             processor_elem.event_time_microseconds = elem.event_time_microseconds;
+                            processor_elem.initial_query_id = elem.client_info.initial_query_id;
                             processor_elem.query_id = elem.client_info.current_query_id;
 
                             auto get_proc_id = [](const IProcessor & proc) -> UInt64
@@ -1059,21 +1052,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                         }
                     }
 
-                    if (implicit_txn_control)
-                    {
-                        try
-                        {
-                            implicit_txn_control->executeCommit(context->getSessionContext());
-                            implicit_txn_control.reset();
-                        }
-                        catch (const Exception &)
-                        {
-                            /// An exception might happen when trying to commit the transaction. For example we might get an immediate exception
-                            /// because ZK is down and wait_changes_become_visible_after_commit_mode == WAIT_UNKNOWN
-                            implicit_txn_control.reset();
-                            throw;
-                        }
-                    }
+                    if (*implicit_txn_control)
+                        execute_implicit_tcl_query(context, ASTTransactionControl::COMMIT);
                 }
 
                 if (query_span)
@@ -1098,21 +1078,19 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                                        log_queries,
                                        log_queries_min_type = settings.log_queries_min_type,
                                        log_queries_min_query_duration_ms = settings.log_queries_min_query_duration_ms.totalMilliseconds(),
-                                       quota(quota),
+                                       my_quota(quota),
                                        status_info_to_query_log,
                                        implicit_txn_control,
-                                       query_span]() mutable
+                                       execute_implicit_tcl_query,
+                                       query_span](bool log_error) mutable
             {
-                if (implicit_txn_control)
-                {
-                    implicit_txn_control->executeRollback(context->getSessionContext());
-                    implicit_txn_control.reset();
-                }
+                if (*implicit_txn_control)
+                    execute_implicit_tcl_query(context, ASTTransactionControl::ROLLBACK);
                 else if (auto txn = context->getCurrentTransaction())
                     txn->onException();
 
-                if (quota)
-                    quota->used(QuotaType::ERRORS, 1, /* check_exceeded = */ false);
+                if (my_quota)
+                    my_quota->used(QuotaType::ERRORS, 1, /* check_exceeded = */ false);
 
                 elem.type = QueryLogElementType::EXCEPTION_WHILE_PROCESSING;
                 elem.exception_code = getCurrentExceptionCode();
@@ -1139,9 +1117,9 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                     elem.query_duration_ms = start_watch.elapsedMilliseconds();
                 }
 
-                if (current_settings.calculate_text_stack_trace)
+                if (current_settings.calculate_text_stack_trace && log_error)
                     setExceptionStackTrace(elem);
-                logException(context, elem);
+                logException(context, elem, log_error);
 
                 /// In case of exception we log internal queries also
                 if (log_queries && elem.type >= log_queries_min_type && static_cast<Int64>(elem.query_duration_ms) >= log_queries_min_query_duration_ms)
@@ -1176,15 +1154,10 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     }
     catch (...)
     {
-        if (implicit_txn_control)
-        {
-            implicit_txn_control->executeRollback(context->getSessionContext());
-            implicit_txn_control.reset();
-        }
+        if (*implicit_txn_control)
+            execute_implicit_tcl_query(context, ASTTransactionControl::ROLLBACK);
         else if (auto txn = context->getCurrentTransaction())
-        {
             txn->onException();
-        }
 
         if (!internal)
             onExceptionBeforeStart(query_for_logging, context, ast, query_span, start_watch.elapsedMilliseconds());
@@ -1262,7 +1235,7 @@ void executeQuery(
 
         /// If not - copy enough data into 'parse_buf'.
         WriteBufferFromVector<PODArray<char>> out(parse_buf);
-        LimitReadBuffer limit(istr, max_query_size + 1, false);
+        LimitReadBuffer limit(istr, max_query_size + 1, /* trow_exception */ false, /* exact_limit */ {});
         copyData(limit, out);
         out.finalize();
 
@@ -1270,18 +1243,37 @@ void executeQuery(
         end = begin + parse_buf.size();
     }
 
-    ASTPtr ast;
-    BlockIO streams;
-
-    std::tie(ast, streams) = executeQueryImpl(begin, end, context, false, QueryProcessingStage::Complete, &istr);
-    auto & pipeline = streams.pipeline;
-
     QueryResultDetails result_details
     {
         .query_id = context->getClientInfo().current_query_id,
         .timezone = DateLUT::instance().getTimeZone(),
     };
 
+    /// Set the result details in case of any exception raised during query execution
+    SCOPE_EXIT({
+        if (set_result_details == nullptr)
+            /// Either the result_details have been set in the flow below or the caller of this function does not provide this callback
+            return;
+
+        try
+        {
+            set_result_details(result_details);
+        }
+        catch (...)
+        {
+            /// This exception can be ignored.
+            /// because if the code goes here, it means there's already an exception raised during query execution,
+            /// and that exception will be propagated to outer caller,
+            /// there's no need to report the exception thrown here.
+        }
+    });
+
+    ASTPtr ast;
+    BlockIO streams;
+
+    std::tie(ast, streams) = executeQueryImpl(begin, end, context, false, QueryProcessingStage::Complete, &istr);
+    auto & pipeline = streams.pipeline;
+
     std::unique_ptr<WriteBuffer> compressed_buffer;
     try
     {
@@ -1351,7 +1343,15 @@ void executeQuery(
         }
 
         if (set_result_details)
-            set_result_details(result_details);
+        {
+            /// The call of set_result_details itself might throw exception,
+            /// in such case there's no need to call this function again in the SCOPE_EXIT defined above.
+            /// So the callback is cleared before its execution.
+            auto set_result_details_copy = set_result_details;
+            set_result_details = nullptr;
+
+            set_result_details_copy(result_details);
+        }
 
         if (pipeline.initialized())
         {
diff --git a/src/Interpreters/formatWithPossiblyHidingSecrets.h b/src/Interpreters/formatWithPossiblyHidingSecrets.h
new file mode 100644
index 00000000000..25e1e7a5616
--- /dev/null
+++ b/src/Interpreters/formatWithPossiblyHidingSecrets.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "Access/ContextAccess.h"
+#include "Interpreters/Context.h"
+
+namespace DB
+{
+struct SecretHidingFormatSettings
+{
+    // We can't store const Context& as there's a dangerous usage {.ctx = *getContext()}
+    // which is UB in case getContext()'s return ptr is the only one holding the object
+    const ContextPtr & ctx;
+    const IAST & query;
+    size_t max_length = 0;
+    bool one_line = true;
+};
+
+inline String format(const SecretHidingFormatSettings & settings)
+{
+    const bool show_secrets = settings.ctx->displaySecretsInShowAndSelect()
+        && settings.ctx->getSettingsRef().format_display_secrets_in_show_and_select
+        && settings.ctx->getAccess()->isGranted(AccessType::displaySecretsInShowAndSelect);
+
+    return settings.query.formatWithPossiblyHidingSensitiveData(settings.max_length, settings.one_line, show_secrets);
+}
+}
diff --git a/src/Interpreters/fuzzers/execute_query_fuzzer.cpp b/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
index 30db25668cf..284e780ed1f 100644
--- a/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
+++ b/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
 #include <Interpreters/executeQuery.h>
 #include <Interpreters/Context.h>
 #include "Processors/Executors/PullingPipelineExecutor.h"
diff --git a/src/Interpreters/getColumnFromBlock.cpp b/src/Interpreters/getColumnFromBlock.cpp
index ce6fa2904db..972e109afb3 100644
--- a/src/Interpreters/getColumnFromBlock.cpp
+++ b/src/Interpreters/getColumnFromBlock.cpp
@@ -15,23 +15,18 @@ ColumnPtr tryGetColumnFromBlock(const Block & block, const NameAndTypePair & req
     if (!elem)
         return nullptr;
 
-    DataTypePtr elem_type;
-    ColumnPtr elem_column;
+    auto elem_type = elem->type;
+    auto elem_column = elem->column->decompress();
 
     if (requested_column.isSubcolumn())
     {
         auto subcolumn_name = requested_column.getSubcolumnName();
-        elem_type = elem->type->tryGetSubcolumnType(subcolumn_name);
-        elem_column = elem->type->tryGetSubcolumn(subcolumn_name, elem->column);
+        elem_column = elem_type->tryGetSubcolumn(subcolumn_name, elem_column);
+        elem_type = elem_type->tryGetSubcolumnType(subcolumn_name);
 
         if (!elem_type || !elem_column)
             return nullptr;
     }
-    else
-    {
-        elem_type = elem->type;
-        elem_column = elem->column;
-    }
 
     return castColumn({elem_column, elem_type, ""}, requested_column.type);
 }
diff --git a/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp b/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp
new file mode 100644
index 00000000000..2a32d450497
--- /dev/null
+++ b/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp
@@ -0,0 +1,134 @@
+#include <Interpreters/getCustomKeyFilterForParallelReplicas.h>
+
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSampleRatio.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/parseQuery.h>
+
+#include <Interpreters/Context.h>
+
+#include <DataTypes/DataTypesNumber.h>
+
+#include <boost/rational.hpp>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
+}
+
+bool canUseCustomKey(const Settings & settings, const Cluster & cluster, const Context & context)
+{
+    return settings.max_parallel_replicas > 1 && context.getParallelReplicasMode() == Context::ParallelReplicasMode::CUSTOM_KEY
+        && cluster.getShardCount() == 1 && cluster.getShardsInfo()[0].getAllNodeCount() > 1;
+}
+
+ASTPtr getCustomKeyFilterForParallelReplica(
+    size_t replicas_count,
+    size_t replica_num,
+    ASTPtr custom_key_ast,
+    ParallelReplicasCustomKeyFilterType filter_type,
+    const IStorage & storage,
+    const ContextPtr & context)
+{
+    assert(replicas_count > 1);
+    if (filter_type == ParallelReplicasCustomKeyFilterType::DEFAULT)
+    {
+        // first we do modulo with replica count
+        auto modulo_function = makeASTFunction("positiveModulo", custom_key_ast, std::make_shared<ASTLiteral>(replicas_count));
+
+        /// then we compare result to the current replica number (offset)
+        auto equals_function = makeASTFunction("equals", std::move(modulo_function), std::make_shared<ASTLiteral>(replica_num));
+
+        return equals_function;
+    }
+
+    assert(filter_type == ParallelReplicasCustomKeyFilterType::RANGE);
+
+    KeyDescription custom_key_description
+        = KeyDescription::getKeyFromAST(custom_key_ast, storage.getInMemoryMetadataPtr()->columns, context);
+
+    using RelativeSize = boost::rational<ASTSampleRatio::BigNum>;
+
+    RelativeSize size_of_universum = 0;
+    DataTypePtr custom_key_column_type = custom_key_description.data_types[0];
+
+    size_of_universum = RelativeSize(std::numeric_limits<UInt32>::max()) + RelativeSize(1);
+    if (custom_key_description.data_types.size() == 1)
+    {
+        if (typeid_cast<const DataTypeUInt64 *>(custom_key_column_type.get()))
+            size_of_universum = RelativeSize(std::numeric_limits<UInt64>::max()) + RelativeSize(1);
+        else if (typeid_cast<const DataTypeUInt32 *>(custom_key_column_type.get()))
+            size_of_universum = RelativeSize(std::numeric_limits<UInt32>::max()) + RelativeSize(1);
+        else if (typeid_cast<const DataTypeUInt16 *>(custom_key_column_type.get()))
+            size_of_universum = RelativeSize(std::numeric_limits<UInt16>::max()) + RelativeSize(1);
+        else if (typeid_cast<const DataTypeUInt8 *>(custom_key_column_type.get()))
+            size_of_universum = RelativeSize(std::numeric_limits<UInt8>::max()) + RelativeSize(1);
+    }
+
+    if (size_of_universum == RelativeSize(0))
+        throw Exception(
+            ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER,
+            "Invalid custom key column type: {}. Must be one unsigned integer type",
+            custom_key_column_type->getName());
+
+    RelativeSize relative_range_size = RelativeSize(1) / replicas_count;
+    RelativeSize relative_range_offset = relative_range_size * RelativeSize(replica_num);
+
+    /// Calculate the half-interval of `[lower, upper)` column values.
+    bool has_lower_limit = false;
+    bool has_upper_limit = false;
+
+    RelativeSize lower_limit_rational = relative_range_offset * size_of_universum;
+    RelativeSize upper_limit_rational = (relative_range_offset + relative_range_size) * size_of_universum;
+
+    UInt64 lower = boost::rational_cast<ASTSampleRatio::BigNum>(lower_limit_rational);
+    UInt64 upper = boost::rational_cast<ASTSampleRatio::BigNum>(upper_limit_rational);
+
+    if (lower > 0)
+        has_lower_limit = true;
+
+    if (upper_limit_rational < size_of_universum)
+        has_upper_limit = true;
+
+    assert(has_lower_limit || has_upper_limit);
+
+    /// Let's add the conditions to cut off something else when the index is scanned again and when the request is processed.
+    std::shared_ptr<ASTFunction> lower_function;
+    std::shared_ptr<ASTFunction> upper_function;
+
+    if (has_lower_limit)
+    {
+        lower_function = makeASTFunction("greaterOrEquals", custom_key_ast, std::make_shared<ASTLiteral>(lower));
+
+        if (!has_upper_limit)
+            return lower_function;
+    }
+
+    if (has_upper_limit)
+    {
+        upper_function = makeASTFunction("less", custom_key_ast, std::make_shared<ASTLiteral>(upper));
+
+        if (!has_lower_limit)
+            return upper_function;
+    }
+
+    assert(upper_function && lower_function);
+
+    return makeASTFunction("and", std::move(lower_function), std::move(upper_function));
+}
+
+ASTPtr parseCustomKeyForTable(const String & custom_key, const Context & context)
+{
+    /// Try to parse expression
+    ParserExpression parser;
+    const auto & settings = context.getSettingsRef();
+    return parseQuery(
+        parser, custom_key.data(), custom_key.data() + custom_key.size(),
+        "parallel replicas custom key", settings.max_query_size, settings.max_parser_depth);
+}
+
+}
diff --git a/src/Interpreters/getCustomKeyFilterForParallelReplicas.h b/src/Interpreters/getCustomKeyFilterForParallelReplicas.h
new file mode 100644
index 00000000000..543f1889b32
--- /dev/null
+++ b/src/Interpreters/getCustomKeyFilterForParallelReplicas.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/Cluster.h>
+#include <Parsers/IAST_fwd.h>
+#include <Storages/IStorage.h>
+#include <Core/SettingsEnums.h>
+#include <Interpreters/DatabaseAndTableWithAlias.h>
+
+namespace DB
+{
+
+bool canUseCustomKey(const Settings & settings, const Cluster & cluster, const Context & context);
+
+/// Get AST for filter created from custom_key
+/// replica_num is the number of the replica for which we are generating filter starting from 0
+ASTPtr getCustomKeyFilterForParallelReplica(
+    size_t replicas_count,
+    size_t replica_num,
+    ASTPtr custom_key_ast,
+    ParallelReplicasCustomKeyFilterType filter_type,
+    const IStorage & storage,
+    const ContextPtr & context);
+
+ASTPtr parseCustomKeyForTable(const String & custom_keys, const Context & context);
+
+}
diff --git a/src/Interpreters/getHeaderForProcessingStage.cpp b/src/Interpreters/getHeaderForProcessingStage.cpp
index ab10bd2024c..3f52b2f5099 100644
--- a/src/Interpreters/getHeaderForProcessingStage.cpp
+++ b/src/Interpreters/getHeaderForProcessingStage.cpp
@@ -4,6 +4,7 @@
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/IdentifierSemantic.h>
 #include <Storages/IStorage.h>
+#include <Storages/StorageDummy.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
@@ -83,44 +84,6 @@ bool removeJoin(ASTSelectQuery & select, TreeRewriterResult & rewriter_result, C
     return true;
 }
 
-class StorageDummy : public IStorage
-{
-public:
-    StorageDummy(const StorageID & table_id_, const ColumnsDescription & columns_)
-        : IStorage(table_id_)
-    {
-        StorageInMemoryMetadata storage_metadata;
-        storage_metadata.setColumns(columns_);
-        setInMemoryMetadata(storage_metadata);
-    }
-
-    std::string getName() const override { return "StorageDummy"; }
-
-    bool supportsSampling() const override { return true; }
-    bool supportsFinal() const override { return true; }
-    bool supportsPrewhere() const override { return true; }
-    bool supportsSubcolumns() const override { return true; }
-    bool supportsDynamicSubcolumns() const override { return true; }
-    bool canMoveConditionsToPrewhere() const override { return false; }
-
-    QueryProcessingStage::Enum
-    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageSnapshotPtr &, SelectQueryInfo &) const override
-    {
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "StorageDummy does not support getQueryProcessingStage method");
-    }
-
-    Pipe read(const Names & /*column_names*/,
-        const StorageSnapshotPtr & /*storage_snapshot*/,
-        SelectQueryInfo & /*query_info*/,
-        ContextPtr /*context*/,
-        QueryProcessingStage::Enum /*processed_stage*/,
-        size_t /*max_block_size*/,
-        size_t /*num_streams*/) override
-    {
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "StorageDummy does not support read method");
-    }
-};
-
 Block getHeaderForProcessingStage(
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
diff --git a/src/Interpreters/getTableExpressions.cpp b/src/Interpreters/getTableExpressions.cpp
index 830f0ea4411..70e38526648 100644
--- a/src/Interpreters/getTableExpressions.cpp
+++ b/src/Interpreters/getTableExpressions.cpp
@@ -73,18 +73,21 @@ ASTPtr extractTableExpression(const ASTSelectQuery & select, size_t table_number
     return nullptr;
 }
 
+/// The parameter is_create_parameterized_view is used in getSampleBlock of the subquery.
+/// If it is set to true, then query parameters are allowed in the subquery, and that expression is not evaluated.
 static NamesAndTypesList getColumnsFromTableExpression(
     const ASTTableExpression & table_expression,
     ContextPtr context,
     NamesAndTypesList & materialized,
     NamesAndTypesList & aliases,
-    NamesAndTypesList & virtuals)
+    NamesAndTypesList & virtuals,
+    bool is_create_parameterized_view)
 {
     NamesAndTypesList names_and_type_list;
     if (table_expression.subquery)
     {
         const auto & subquery = table_expression.subquery->children.at(0);
-        names_and_type_list = InterpreterSelectWithUnionQuery::getSampleBlock(subquery, context, true).getNamesAndTypesList();
+        names_and_type_list = InterpreterSelectWithUnionQuery::getSampleBlock(subquery, context, true, is_create_parameterized_view).getNamesAndTypesList();
     }
     else if (table_expression.table_function)
     {
@@ -117,7 +120,8 @@ TablesWithColumns getDatabaseAndTablesWithColumns(
         const ASTTableExprConstPtrs & table_expressions,
         ContextPtr context,
         bool include_alias_cols,
-        bool include_materialized_cols)
+        bool include_materialized_cols,
+        bool is_create_parameterized_view)
 {
     TablesWithColumns tables_with_columns;
 
@@ -129,7 +133,7 @@ TablesWithColumns getDatabaseAndTablesWithColumns(
         NamesAndTypesList aliases;
         NamesAndTypesList virtuals;
         NamesAndTypesList names_and_types = getColumnsFromTableExpression(
-            *table_expression, context, materialized, aliases, virtuals);
+            *table_expression, context, materialized, aliases, virtuals, is_create_parameterized_view);
 
         removeDuplicateColumns(names_and_types);
 
diff --git a/src/Interpreters/getTableExpressions.h b/src/Interpreters/getTableExpressions.h
index c4ca01ee3c3..02262e5f313 100644
--- a/src/Interpreters/getTableExpressions.h
+++ b/src/Interpreters/getTableExpressions.h
@@ -20,7 +20,9 @@ const ASTTableExpression * getTableExpression(const ASTSelectQuery & select, siz
 
 ASTPtr extractTableExpression(const ASTSelectQuery & select, size_t table_number);
 
+/// The parameter is_create_parameterized_view is used in getSampleBlock of the subquery. It is forwarded to getColumnsFromTableExpression.
+/// If it is set to true, then query parameters are allowed in the subquery, and that expression is not evaluated.
 TablesWithColumns getDatabaseAndTablesWithColumns(
-    const ASTTableExprConstPtrs & table_expressions, ContextPtr context, bool include_alias_cols, bool include_materialized_cols);
+    const ASTTableExprConstPtrs & table_expressions, ContextPtr context, bool include_alias_cols, bool include_materialized_cols, bool is_create_parameterized_view = false);
 
 }
diff --git a/src/Interpreters/inplaceBlockConversions.cpp b/src/Interpreters/inplaceBlockConversions.cpp
index 55d2f7ce5a8..5bbd2667f55 100644
--- a/src/Interpreters/inplaceBlockConversions.cpp
+++ b/src/Interpreters/inplaceBlockConversions.cpp
@@ -61,11 +61,17 @@ void addDefaultRequiredExpressionsRecursively(
         RequiredSourceColumnsVisitor::Data columns_context;
         RequiredSourceColumnsVisitor(columns_context).visit(column_default_expr);
         NameSet required_columns_names = columns_context.requiredColumns();
+        auto required_type = std::make_shared<ASTLiteral>(columns.get(required_column_name).type->getName());
 
-        auto expr = makeASTFunction("_CAST", column_default_expr, std::make_shared<ASTLiteral>(columns.get(required_column_name).type->getName()));
+        auto expr = makeASTFunction("_CAST", column_default_expr, required_type);
 
         if (is_column_in_query && convert_null_to_default)
+        {
             expr = makeASTFunction("ifNull", std::make_shared<ASTIdentifier>(required_column_name), std::move(expr));
+            /// ifNull does not respect LowCardinality.
+            /// It may be fixed later or re-implemented properly for identical types.
+            expr = makeASTFunction("_CAST", std::move(expr), required_type);
+        }
         default_expr_list_accum->children.emplace_back(setAlias(expr, required_column_name));
 
         added_columns.emplace(required_column_name);
diff --git a/src/Interpreters/interpretSubquery.cpp b/src/Interpreters/interpretSubquery.cpp
index 2358b0ab42a..5f00be07fa5 100644
--- a/src/Interpreters/interpretSubquery.cpp
+++ b/src/Interpreters/interpretSubquery.cpp
@@ -112,8 +112,6 @@ std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
         subquery_options.removeDuplicates();
     }
 
-    /// We don't want to execute reading for subqueries in parallel
-    subquery_context->setSetting("allow_experimental_parallel_reading_from_replicas", false);
     return std::make_shared<InterpreterSelectWithUnionQuery>(query, subquery_context, subquery_options, required_source_columns);
 }
 
diff --git a/src/Interpreters/loadMetadata.cpp b/src/Interpreters/loadMetadata.cpp
index 837d0f1789d..83af2684322 100644
--- a/src/Interpreters/loadMetadata.cpp
+++ b/src/Interpreters/loadMetadata.cpp
@@ -16,14 +16,24 @@
 
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
-#include <Common/escapeForFileName.h>
 
+#include <Common/escapeForFileName.h>
 #include <Common/typeid_cast.h>
-#include <filesystem>
 #include <Common/logger_useful.h>
+#include <Common/CurrentMetrics.h>
+
+#include <filesystem>
+
+#define ORDINARY_TO_ATOMIC_PREFIX ".tmp_convert."
 
 namespace fs = std::filesystem;
 
+namespace CurrentMetrics
+{
+    extern const Metric StartupSystemTablesThreads;
+    extern const Metric StartupSystemTablesThreadsActive;
+}
+
 namespace DB
 {
 
@@ -117,6 +127,37 @@ static void checkUnsupportedVersion(ContextMutablePtr context, const String & da
                                                      "If so, you should upgrade through intermediate version.", database_name);
 }
 
+static void checkIncompleteOrdinaryToAtomicConversion(ContextPtr context, const std::map<String, String> & databases)
+{
+    if (context->getConfigRef().has("allow_reserved_database_name_tmp_convert"))
+        return;
+
+    auto convert_flag_path = fs::path(context->getFlagsPath()) / "convert_ordinary_to_atomic";
+    if (!fs::exists(convert_flag_path))
+        return;
+
+    /// Flag exists. Let's check if we had an unsuccessful conversion attempt previously
+    for (const auto & db : databases)
+    {
+        if (!db.first.starts_with(ORDINARY_TO_ATOMIC_PREFIX))
+            continue;
+        size_t last_dot = db.first.rfind('.');
+        if (last_dot <= strlen(ORDINARY_TO_ATOMIC_PREFIX))
+            continue;
+
+        String actual_name = db.first.substr(strlen(ORDINARY_TO_ATOMIC_PREFIX), last_dot - strlen(ORDINARY_TO_ATOMIC_PREFIX));
+
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Found a database with special name: {}. "
+                        "Most likely it indicates that conversion of database {} from Ordinary to Atomic "
+                        "was interrupted or failed in the middle. You can add <allow_reserved_database_name_tmp_convert> to config.xml "
+                        "or remove convert_ordinary_to_atomic file from flags/ directory, so the server will start forcefully. "
+                        "After starting the server, you can finish conversion manually by moving rest of the tables from {} to {} "
+                        "(using RENAME TABLE) and executing DROP DATABASE {} and RENAME DATABASE {} TO {}",
+                        backQuote(db.first), backQuote(actual_name), backQuote(actual_name), backQuote(db.first),
+                        backQuote(actual_name), backQuote(db.first), backQuote(actual_name));
+    }
+}
+
 void loadMetadata(ContextMutablePtr context, const String & default_database_name)
 {
     Poco::Logger * log = &Poco::Logger::get("loadMetadata");
@@ -168,6 +209,8 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
         }
     }
 
+    checkIncompleteOrdinaryToAtomicConversion(context, databases);
+
     /// clickhouse-local creates DatabaseMemory as default database by itself
     /// For clickhouse-server we need create default database
     bool create_default_db_if_not_exists = !default_database_name.empty();
@@ -324,14 +367,14 @@ static void maybeConvertOrdinaryDatabaseToAtomic(ContextMutablePtr context, cons
                         database_name, fmt::join(permanently_detached_tables, ", "));
     }
 
-    String tmp_name = fmt::format(".tmp_convert.{}.{}", database_name, thread_local_rng());
+    String tmp_name = fmt::format(ORDINARY_TO_ATOMIC_PREFIX"{}.{}", database_name, thread_local_rng());
 
     try
     {
         if (!tables_started)
         {
             /// It's not quite correct to run DDL queries while database is not started up.
-            ThreadPool pool;
+            ThreadPool pool(CurrentMetrics::StartupSystemTablesThreads, CurrentMetrics::StartupSystemTablesThreadsActive);
             DatabaseCatalog::instance().getSystemDatabase()->startupTables(pool, LoadingStrictnessLevel::FORCE_RESTORE);
         }
 
@@ -415,16 +458,18 @@ void convertDatabasesEnginesIfNeed(ContextMutablePtr context)
 
     LOG_INFO(&Poco::Logger::get("loadMetadata"), "Found convert_ordinary_to_atomic file in flags directory, "
                                                  "will try to convert all Ordinary databases to Atomic");
-    fs::remove(convert_flag_path);
 
     for (const auto & [name, _] : DatabaseCatalog::instance().getDatabases())
         if (name != DatabaseCatalog::SYSTEM_DATABASE)
             maybeConvertOrdinaryDatabaseToAtomic(context, name, /* tables_started */ true);
+
+    LOG_INFO(&Poco::Logger::get("loadMetadata"), "Conversion finished, removing convert_ordinary_to_atomic flag");
+    fs::remove(convert_flag_path);
 }
 
 void startupSystemTables()
 {
-    ThreadPool pool;
+    ThreadPool pool(CurrentMetrics::StartupSystemTablesThreads, CurrentMetrics::StartupSystemTablesThreadsActive);
     DatabaseCatalog::instance().getSystemDatabase()->startupTables(pool, LoadingStrictnessLevel::FORCE_RESTORE);
 }
 
diff --git a/src/Interpreters/parseColumnsListForTableFunction.cpp b/src/Interpreters/parseColumnsListForTableFunction.cpp
index e7302b6324a..05d28bc53a8 100644
--- a/src/Interpreters/parseColumnsListForTableFunction.cpp
+++ b/src/Interpreters/parseColumnsListForTableFunction.cpp
@@ -35,18 +35,6 @@ void validateDataType(const DataTypePtr & type, const DataTypeValidationSettings
         }
     }
 
-    if (!settings.allow_experimental_geo_types)
-    {
-        const auto & type_name = type->getName();
-        if (type_name == "MultiPolygon" || type_name == "Polygon" || type_name == "Ring" || type_name == "Point")
-        {
-            throw Exception(
-                ErrorCodes::ILLEGAL_COLUMN,
-                "Cannot create column with type '{}' because experimental geo types are not allowed. Set setting "
-                "allow_experimental_geo_types = 1 in order to allow it", type_name);
-        }
-    }
-
     if (!settings.allow_experimental_object_type)
     {
         if (type->hasDynamicSubcolumns())
diff --git a/src/Interpreters/parseColumnsListForTableFunction.h b/src/Interpreters/parseColumnsListForTableFunction.h
index 212c378d3b5..ef1bbe5498e 100644
--- a/src/Interpreters/parseColumnsListForTableFunction.h
+++ b/src/Interpreters/parseColumnsListForTableFunction.h
@@ -16,14 +16,12 @@ struct DataTypeValidationSettings
 
     explicit DataTypeValidationSettings(const Settings & settings)
         : allow_suspicious_low_cardinality_types(settings.allow_suspicious_low_cardinality_types)
-        , allow_experimental_geo_types(settings.allow_experimental_geo_types)
         , allow_experimental_object_type(settings.allow_experimental_object_type)
         , allow_suspicious_fixed_string_types(settings.allow_suspicious_fixed_string_types)
     {
     }
 
     bool allow_suspicious_low_cardinality_types = true;
-    bool allow_experimental_geo_types = true;
     bool allow_experimental_object_type = true;
     bool allow_suspicious_fixed_string_types = true;
 };
@@ -31,7 +29,7 @@ struct DataTypeValidationSettings
 void validateDataType(const DataTypePtr & type, const DataTypeValidationSettings & settings);
 
 /// Parses a common argument for table functions such as table structure given in string
-ColumnsDescription parseColumnsListFromString(const std::string & structure, const ContextPtr & context);
+[[nodiscard]] ColumnsDescription parseColumnsListFromString(const std::string & structure, const ContextPtr & context);
 
 bool tryParseColumnsListFromString(const std::string & structure, ColumnsDescription & columns, const ContextPtr & context, String & error);
 
diff --git a/src/Interpreters/tests/gtest_comparison_graph.cpp b/src/Interpreters/tests/gtest_comparison_graph.cpp
index 72e72b4b802..96a78241c8e 100644
--- a/src/Interpreters/tests/gtest_comparison_graph.cpp
+++ b/src/Interpreters/tests/gtest_comparison_graph.cpp
@@ -9,11 +9,11 @@
 
 using namespace DB;
 
-static ComparisonGraph getGraph(const String & query)
+static ComparisonGraph<ASTPtr> getGraph(const String & query)
 {
     ParserExpressionList parser(false);
     ASTPtr ast = parseQuery(parser, query, 0, 0);
-    return ComparisonGraph(ast->children);
+    return ComparisonGraph<ASTPtr>(ast->children);
 }
 
 TEST(ComparisonGraph, Bounds)
@@ -47,8 +47,8 @@ TEST(ComparisonGraph, Bounds)
         auto x = std::make_shared<ASTIdentifier>("x");
         auto y = std::make_shared<ASTIdentifier>("y");
 
-        ASSERT_EQ(graph.compare(x, y), ComparisonGraph::CompareResult::LESS);
-        ASSERT_EQ(graph.compare(y, x), ComparisonGraph::CompareResult::GREATER);
+        ASSERT_EQ(graph.compare(x, y), ComparisonGraphCompareResult::LESS);
+        ASSERT_EQ(graph.compare(y, x), ComparisonGraphCompareResult::GREATER);
     }
 }
 
@@ -93,7 +93,7 @@ TEST(ComparisonGraph, Components)
 
 TEST(ComparisonGraph, Compare)
 {
-    using CompareResult = ComparisonGraph::CompareResult;
+    using enum ComparisonGraphCompareResult;
 
     {
         String query = "a >= b, c >= b";
@@ -102,7 +102,7 @@ TEST(ComparisonGraph, Compare)
         auto a = std::make_shared<ASTIdentifier>("a");
         auto c = std::make_shared<ASTIdentifier>("c");
 
-        ASSERT_EQ(graph.compare(a, c), CompareResult::UNKNOWN);
+        ASSERT_EQ(graph.compare(a, c), UNKNOWN);
     }
 
     {
@@ -113,9 +113,9 @@ TEST(ComparisonGraph, Compare)
         auto b = std::make_shared<ASTIdentifier>("b");
         auto c = std::make_shared<ASTIdentifier>("c");
 
-        ASSERT_EQ(graph.compare(a, c), CompareResult::GREATER);
-        ASSERT_EQ(graph.compare(a, b), CompareResult::GREATER_OR_EQUAL);
-        ASSERT_EQ(graph.compare(b, c), CompareResult::GREATER);
+        ASSERT_EQ(graph.compare(a, c), GREATER);
+        ASSERT_EQ(graph.compare(a, b), GREATER_OR_EQUAL);
+        ASSERT_EQ(graph.compare(b, c), GREATER);
     }
 
     {
@@ -126,9 +126,9 @@ TEST(ComparisonGraph, Compare)
         auto b = std::make_shared<ASTIdentifier>("b");
         auto c = std::make_shared<ASTIdentifier>("c");
 
-        ASSERT_EQ(graph.compare(a, b), CompareResult::NOT_EQUAL);
-        ASSERT_EQ(graph.compare(a, c), CompareResult::GREATER);
-        ASSERT_EQ(graph.compare(b, c), CompareResult::UNKNOWN);
+        ASSERT_EQ(graph.compare(a, b), NOT_EQUAL);
+        ASSERT_EQ(graph.compare(a, c), GREATER);
+        ASSERT_EQ(graph.compare(b, c), UNKNOWN);
     }
 
     {
@@ -154,17 +154,17 @@ TEST(ComparisonGraph, Compare)
         auto lit_3 = std::make_shared<ASTLiteral>(3u);
         auto lit_4 = std::make_shared<ASTLiteral>(4u);
 
-        ASSERT_EQ(graph.compare(lit_3, a), CompareResult::LESS_OR_EQUAL);
-        ASSERT_FALSE(graph.isAlwaysCompare(CompareResult::LESS, lit_3, a));
-        ASSERT_TRUE(graph.isAlwaysCompare(CompareResult::LESS, lit_2, a));
+        ASSERT_EQ(graph.compare(lit_3, a), LESS_OR_EQUAL);
+        ASSERT_FALSE(graph.isAlwaysCompare(LESS, lit_3, a));
+        ASSERT_TRUE(graph.isAlwaysCompare(LESS, lit_2, a));
 
-        ASSERT_EQ(graph.compare(b, lit_2), CompareResult::GREATER);
-        ASSERT_EQ(graph.compare(b, lit_3), CompareResult::GREATER);
-        ASSERT_EQ(graph.compare(b, lit_4), CompareResult::UNKNOWN);
+        ASSERT_EQ(graph.compare(b, lit_2), GREATER);
+        ASSERT_EQ(graph.compare(b, lit_3), GREATER);
+        ASSERT_EQ(graph.compare(b, lit_4), UNKNOWN);
 
-        ASSERT_EQ(graph.compare(d, lit_2), CompareResult::GREATER);
-        ASSERT_EQ(graph.compare(d, lit_3), CompareResult::GREATER_OR_EQUAL);
-        ASSERT_EQ(graph.compare(d, lit_4), CompareResult::UNKNOWN);
+        ASSERT_EQ(graph.compare(d, lit_2), GREATER);
+        ASSERT_EQ(graph.compare(d, lit_3), GREATER_OR_EQUAL);
+        ASSERT_EQ(graph.compare(d, lit_4), UNKNOWN);
     }
 
     {
@@ -176,8 +176,8 @@ TEST(ComparisonGraph, Compare)
         auto lit_3 = std::make_shared<ASTLiteral>(3);
         auto lit_15 = std::make_shared<ASTLiteral>(15);
 
-        ASSERT_EQ(graph.compare(a, lit_8), CompareResult::UNKNOWN);
-        ASSERT_EQ(graph.compare(a, lit_3), CompareResult::GREATER);
-        ASSERT_EQ(graph.compare(a, lit_15), CompareResult::LESS);
+        ASSERT_EQ(graph.compare(a, lit_8), UNKNOWN);
+        ASSERT_EQ(graph.compare(a, lit_3), GREATER);
+        ASSERT_EQ(graph.compare(a, lit_15), LESS);
     }
 }
diff --git a/src/Interpreters/tests/gtest_context_race.cpp b/src/Interpreters/tests/gtest_context_race.cpp
new file mode 100644
index 00000000000..ec61fc9467c
--- /dev/null
+++ b/src/Interpreters/tests/gtest_context_race.cpp
@@ -0,0 +1,50 @@
+#include <Interpreters/Context.h>
+#include <Common/tests/gtest_global_context.h>
+#include <gtest/gtest.h>
+#include <thread>
+
+using namespace DB;
+
+template <typename Ptr>
+void run(Ptr context)
+{
+    for (size_t i = 0; i < 100; ++i)
+    {
+        std::thread t1([context]
+        {
+            if constexpr (std::is_same_v<ContextWeakPtr, Ptr>)
+                context.lock()->getAsyncReadCounters();
+            else
+                context->getAsyncReadCounters();
+        });
+
+        std::thread t2([context]
+        {
+            Context::createCopy(context);
+        });
+
+        t1.join();
+        t2.join();
+    }
+}
+
+TEST(Context, MutableRace)
+{
+    auto context = Context::createCopy(getContext().context);
+    context->makeQueryContext();
+    run<ContextMutablePtr>(context);
+}
+
+TEST(Context, ConstRace)
+{
+    auto context = Context::createCopy(getContext().context);
+    context->makeQueryContext();
+    run<ContextPtr>(context);
+}
+
+TEST(Context, WeakRace)
+{
+    auto context = Context::createCopy(getContext().context);
+    context->makeQueryContext();
+    run<ContextWeakPtr>(context);
+}
diff --git a/src/Interpreters/tests/gtest_lru_file_cache.cpp b/src/Interpreters/tests/gtest_lru_file_cache.cpp
index 93faafb5cea..e26d412b35e 100644
--- a/src/Interpreters/tests/gtest_lru_file_cache.cpp
+++ b/src/Interpreters/tests/gtest_lru_file_cache.cpp
@@ -9,13 +9,16 @@
 #include <Interpreters/TemporaryDataOnDisk.h>
 #include <Common/tests/gtest_global_context.h>
 #include <Common/SipHash.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Interpreters/Context.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <filesystem>
 #include <thread>
 #include <DataTypes/DataTypesNumber.h>
+#include <Poco/Util/XMLConfiguration.h>
+#include <Poco/DOM/DOMParser.h>
+#include <base/sleep.h>
 
 #include <Poco/ConsoleChannel.h>
 #include <Disks/IO/CachedOnDiskWriteBufferFromFile.h>
@@ -26,21 +29,6 @@ using namespace DB;
 
 static constexpr auto TEST_LOG_LEVEL = "debug";
 
-void assertRange(
-    [[maybe_unused]] size_t assert_n, DB::FileSegmentPtr file_segment,
-    const DB::FileSegment::Range & expected_range, DB::FileSegment::State expected_state)
-{
-    auto range = file_segment->range();
-
-    std::cerr << fmt::format("\nAssert #{} : {} == {} (state: {} == {})\n", assert_n,
-                             range.toString(), expected_range.toString(),
-                             toString(file_segment->state()), toString(expected_state));
-
-    ASSERT_EQ(range.left, expected_range.left);
-    ASSERT_EQ(range.right, expected_range.right);
-    ASSERT_EQ(file_segment->state(), expected_state);
-}
-
 void printRanges(const auto & segments)
 {
     std::cerr << "\nHaving file segments: ";
@@ -48,21 +36,16 @@ void printRanges(const auto & segments)
         std::cerr << '\n' << segment->range().toString() << " (state: " + DB::FileSegment::stateToString(segment->state()) + ")" << "\n";
 }
 
-std::vector<DB::FileSegmentPtr> fromHolder(const DB::FileSegmentsHolder & holder)
-{
-    return std::vector<DB::FileSegmentPtr>(holder.file_segments.begin(), holder.file_segments.end());
-}
-
 String getFileSegmentPath(const String & base_path, const DB::FileCache::Key & key, size_t offset)
 {
     auto key_str = key.toString();
     return fs::path(base_path) / key_str.substr(0, 3) / key_str / DB::toString(offset);
 }
 
-void download(const std::string & cache_base_path, DB::FileSegmentPtr file_segment)
+void download(const std::string & cache_base_path, DB::FileSegment & file_segment)
 {
-    const auto & key = file_segment->key();
-    size_t size = file_segment->range().size();
+    const auto & key = file_segment.key();
+    size_t size = file_segment.range().size();
 
     auto key_str = key.toString();
     auto subdir = fs::path(cache_base_path) / key_str.substr(0, 3) / key_str;
@@ -70,29 +53,94 @@ void download(const std::string & cache_base_path, DB::FileSegmentPtr file_segme
         fs::create_directories(subdir);
 
     std::string data(size, '0');
-    file_segment->write(data.data(), size, file_segment->getCurrentWriteOffset());
+    file_segment.write(data.data(), size, file_segment.getCurrentWriteOffset(false));
 }
 
-void prepareAndDownload(const std::string & cache_base_path, DB::FileSegmentPtr file_segment)
-{
-    ASSERT_TRUE(file_segment->reserve(file_segment->range().size()));
-    download(cache_base_path, file_segment);
-}
+using Range = FileSegment::Range;
+using Ranges = std::vector<Range>;
+using State = FileSegment::State;
+using States = std::vector<State>;
+using Holder = FileSegmentsHolder;
+using HolderPtr = FileSegmentsHolderPtr;
 
-void complete(const std::string & cache_base_path, const DB::FileSegmentsHolder & holder)
+fs::path caches_dir = fs::current_path() / "lru_cache_test";
+std::string cache_base_path = caches_dir / "cache1" / "";
+
+
+void assertEqual(const HolderPtr & holder, const Ranges & expected_ranges, const States & expected_states = {})
 {
-    for (const auto & file_segment : holder.file_segments)
+    std::cerr << "Holder: " << holder->toString() << "\n";
+    ASSERT_EQ(holder->size(), expected_ranges.size());
+
+    if (!expected_states.empty())
+        ASSERT_EQ(holder->size(), expected_states.size());
+
+    auto get_expected_state = [&](size_t i)
     {
-        ASSERT_TRUE(file_segment->getOrSetDownloader() == DB::FileSegment::getCallerId());
-        prepareAndDownload(cache_base_path, file_segment);
-        file_segment->completeWithoutState();
+        if (expected_states.empty())
+            return State::DOWNLOADED;
+        else
+            return expected_states[i];
+    };
+
+    size_t i = 0;
+    for (const auto & file_segment : *holder)
+    {
+        ASSERT_EQ(file_segment->range(), expected_ranges[i]);
+        ASSERT_EQ(file_segment->state(), get_expected_state(i));
+        ++i;
     }
 }
 
+FileSegment & get(const HolderPtr & holder, int i)
+{
+    auto it = std::next(holder->begin(), i);
+    if (it == holder->end())
+        std::terminate();
+    return **it;
+}
+
+void download(FileSegment & file_segment)
+{
+    std::cerr << "Downloading range " << file_segment.range().toString() << "\n";
+
+    ASSERT_EQ(file_segment.getOrSetDownloader(), FileSegment::getCallerId());
+    ASSERT_EQ(file_segment.state(), State::DOWNLOADING);
+    ASSERT_EQ(file_segment.getDownloadedSize(false), 0);
+
+    ASSERT_TRUE(file_segment.reserve(file_segment.range().size()));
+    download(cache_base_path, file_segment);
+    ASSERT_EQ(file_segment.state(), State::DOWNLOADING);
+
+    file_segment.complete();
+    ASSERT_EQ(file_segment.state(), State::DOWNLOADED);
+}
+
+void assertDownloadFails(FileSegment & file_segment)
+{
+    ASSERT_EQ(file_segment.getOrSetDownloader(), FileSegment::getCallerId());
+    ASSERT_EQ(file_segment.getDownloadedSize(false), 0);
+    ASSERT_FALSE(file_segment.reserve(file_segment.range().size()));
+    file_segment.complete();
+}
+
+void download(const HolderPtr & holder)
+{
+    for (auto & it : *holder)
+    {
+        download(*it);
+    }
+}
+
+void increasePriority(const HolderPtr & holder)
+{
+    for (auto & it : *holder)
+        it->use();
+}
+
 class FileCacheTest : public ::testing::Test
 {
 public:
-
     static void setupLogs(const std::string & level)
     {
         Poco::AutoPtr<Poco::ConsoleChannel> channel(new Poco::ConsoleChannel(std::cerr));
@@ -118,8 +166,6 @@ public:
             fs::remove_all(cache_base_path);
     }
 
-    fs::path caches_dir = fs::current_path() / "lru_cache_test";
-    std::string cache_base_path = caches_dir / "cache1" / "";
 };
 
 TEST_F(FileCacheTest, get)
@@ -128,265 +174,269 @@ TEST_F(FileCacheTest, get)
 
     /// To work with cache need query_id and query context.
     std::string query_id = "query_id";
+
+    Poco::XML::DOMParser dom_parser;
+    std::string xml(R"CONFIG(<clickhouse>
+</clickhouse>)CONFIG");
+    Poco::AutoPtr<Poco::XML::Document> document = dom_parser.parseString(xml);
+    Poco::AutoPtr<Poco::Util::XMLConfiguration> config = new Poco::Util::XMLConfiguration(document);
+    getMutableContext().context->setConfig(config);
+
     auto query_context = DB::Context::createCopy(getContext().context);
     query_context->makeQueryContext();
     query_context->setCurrentQueryId(query_id);
+    chassert(&DB::CurrentThread::get() == &thread_status);
     DB::CurrentThread::QueryScope query_scope_holder(query_context);
 
     DB::FileCacheSettings settings;
+    settings.base_path = cache_base_path;
     settings.max_size = 30;
     settings.max_elements = 5;
 
     {
-        auto cache = DB::FileCache(cache_base_path, settings);
+        std::cerr << "Step 1\n";
+        auto cache = DB::FileCache(settings);
         cache.initialize();
-        auto key = cache.hash("key1");
+        auto key = cache.createKeyForPath("key1");
 
         {
             auto holder = cache.getOrSet(key, 0, 10, {});  /// Add range [0, 9]
-            auto segments = fromHolder(holder);
-            /// Range was not present in cache. It should be added in cache as one while file segment.
-            ASSERT_EQ(segments.size(), 1);
-
-            assertRange(1, segments[0], DB::FileSegment::Range(0, 9), DB::FileSegment::State::EMPTY);
-
-            /// Exception because space not reserved.
-            /// EXPECT_THROW(download(segments[0]), DB::Exception);
-            /// Exception because space can be reserved only by downloader
-            /// EXPECT_THROW(segments[0]->reserve(segments[0]->range().size()), DB::Exception);
-
-            ASSERT_TRUE(segments[0]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            ASSERT_TRUE(segments[0]->reserve(segments[0]->range().size()));
-            assertRange(2, segments[0], DB::FileSegment::Range(0, 9), DB::FileSegment::State::DOWNLOADING);
-
-            download(cache_base_path, segments[0]);
-            segments[0]->completeWithoutState();
-            assertRange(3, segments[0], DB::FileSegment::Range(0, 9), DB::FileSegment::State::DOWNLOADED);
+            assertEqual(holder, { Range(0, 9) }, { State::EMPTY });
+            download(holder->front());
+            assertEqual(holder, { Range(0, 9) }, { State::DOWNLOADED });
+            increasePriority(holder);
         }
 
         /// Current cache:    [__________]
         ///                   ^          ^
         ///                   0          9
+        assertEqual(cache.getSnapshot(key), { Range(0, 9) });
+        assertEqual(cache.dumpQueue(), { Range(0, 9) });
         ASSERT_EQ(cache.getFileSegmentsNum(), 1);
         ASSERT_EQ(cache.getUsedCacheSize(), 10);
 
+        std::cerr << "Step 2\n";
+
         {
             /// Want range [5, 14], but [0, 9] already in cache, so only [10, 14] will be put in cache.
             auto holder = cache.getOrSet(key, 5, 10, {});
-            auto segments = fromHolder(holder);
-            ASSERT_EQ(segments.size(), 2);
-
-            assertRange(4, segments[0], DB::FileSegment::Range(0, 9), DB::FileSegment::State::DOWNLOADED);
-            assertRange(5, segments[1], DB::FileSegment::Range(10, 14), DB::FileSegment::State::EMPTY);
-
-            ASSERT_TRUE(segments[1]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            prepareAndDownload(cache_base_path, segments[1]);
-            segments[1]->completeWithoutState();
-            assertRange(6, segments[1], DB::FileSegment::Range(10, 14), DB::FileSegment::State::DOWNLOADED);
+            assertEqual(holder, { Range(0, 9), Range(10, 14) }, { State::DOWNLOADED, State::EMPTY });
+            download(get(holder, 1));
+            assertEqual(holder, { Range(0, 9), Range(10, 14) }, { State::DOWNLOADED, State::DOWNLOADED });
+            increasePriority(holder);
         }
 
         /// Current cache:    [__________][_____]
         ///                   ^          ^^     ^
         ///                   0          910    14
+        assertEqual(cache.getSnapshot(key), { Range(0, 9), Range(10, 14) });
+        assertEqual(cache.dumpQueue(), { Range(0, 9), Range(10, 14) });
         ASSERT_EQ(cache.getFileSegmentsNum(), 2);
         ASSERT_EQ(cache.getUsedCacheSize(), 15);
 
+        std::cerr << "Step 3\n";
+
+        /// Get [9, 9]
         {
-            auto holder = cache.getOrSet(key, 9, 1, {});  /// Get [9, 9]
-            auto segments = fromHolder(holder);
-            ASSERT_EQ(segments.size(), 1);
-            assertRange(7, segments[0], DB::FileSegment::Range(0, 9), DB::FileSegment::State::DOWNLOADED);
+            auto holder = cache.getOrSet(key, 9, 1, {});
+            assertEqual(holder, { Range(0, 9) }, { State::DOWNLOADED });
+            increasePriority(holder);
+        }
+
+        assertEqual(cache.dumpQueue(), { Range(10, 14), Range(0, 9) });
+        /// Get [9, 10]
+        assertEqual(cache.getOrSet(key, 9, 2, {}),
+                    { Range(0, 9),       Range(10, 14) },
+                    { State::DOWNLOADED, State::DOWNLOADED });
+
+        /// Get [10, 10]
+        {
+            auto holder = cache.getOrSet(key, 10, 1, {});
+            assertEqual(holder, { Range(10, 14) }, { State::DOWNLOADED });
+            increasePriority(holder);
+        }
+
+        assertEqual(cache.getSnapshot(key), { Range(0, 9), Range(10, 14) });
+        assertEqual(cache.dumpQueue(), { Range(0, 9), Range(10, 14) });
+        ASSERT_EQ(cache.getFileSegmentsNum(), 2);
+        ASSERT_EQ(cache.getUsedCacheSize(), 15);
+
+        std::cerr << "Step 4\n";
+
+        {
+            auto holder = cache.getOrSet(key, 17, 4, {});
+            download(holder); /// Get [17, 20]
+            increasePriority(holder);
         }
 
         {
-            auto holder = cache.getOrSet(key, 9, 2, {});  /// Get [9, 10]
-            auto segments = fromHolder(holder);
-            ASSERT_EQ(segments.size(), 2);
-            assertRange(8, segments[0], DB::FileSegment::Range(0, 9), DB::FileSegment::State::DOWNLOADED);
-            assertRange(9, segments[1], DB::FileSegment::Range(10, 14), DB::FileSegment::State::DOWNLOADED);
+            auto holder = cache.getOrSet(key, 24, 3, {});
+            download(holder); /// Get [24, 26]
+            increasePriority(holder);
         }
 
         {
-            auto holder = cache.getOrSet(key, 10, 1, {});  /// Get [10, 10]
-            auto segments = fromHolder(holder);
-            ASSERT_EQ(segments.size(), 1);
-            assertRange(10, segments[0], DB::FileSegment::Range(10, 14), DB::FileSegment::State::DOWNLOADED);
+            auto holder = cache.getOrSet(key, 27, 1, {});
+            download(holder); /// Get [27, 27]
+            increasePriority(holder);
         }
 
-        complete(cache_base_path, cache.getOrSet(key, 17, 4, {})); /// Get [17, 20]
-        complete(cache_base_path, cache.getOrSet(key, 24, 3, {})); /// Get [24, 26]
-        /// completeWithState(cache.getOrSet(key, 27, 1, false)); /// Get [27, 27]
-
         /// Current cache:    [__________][_____]   [____]    [___][]
         ///                   ^          ^^     ^   ^    ^    ^   ^^^
         ///                   0          910    14  17   20   24  2627
         ///
-        ASSERT_EQ(cache.getFileSegmentsNum(), 4);
-        ASSERT_EQ(cache.getUsedCacheSize(), 22);
+        assertEqual(cache.getSnapshot(key), { Range(0, 9), Range(10, 14), Range(17, 20), Range(24, 26), Range(27, 27) });
+        assertEqual(cache.dumpQueue(), { Range(0, 9), Range(10, 14), Range(17, 20), Range(24, 26), Range(27, 27) });
+        ASSERT_EQ(cache.getFileSegmentsNum(), 5);
+        ASSERT_EQ(cache.getUsedCacheSize(), 23);
 
+        std::cerr << "Step 5\n";
         {
             auto holder = cache.getOrSet(key, 0, 26, {}); /// Get [0, 25]
-            auto segments = fromHolder(holder);
-            ASSERT_EQ(segments.size(), 6);
-
-            assertRange(11, segments[0], DB::FileSegment::Range(0, 9), DB::FileSegment::State::DOWNLOADED);
-            assertRange(12, segments[1], DB::FileSegment::Range(10, 14), DB::FileSegment::State::DOWNLOADED);
-
-            /// Missing [15, 16] should be added in cache.
-            assertRange(13, segments[2], DB::FileSegment::Range(15, 16), DB::FileSegment::State::EMPTY);
-
-            ASSERT_TRUE(segments[2]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            prepareAndDownload(cache_base_path, segments[2]);
-
-            segments[2]->completeWithoutState();
-
-            assertRange(14, segments[3], DB::FileSegment::Range(17, 20), DB::FileSegment::State::DOWNLOADED);
-
-            /// New [21, 23], but will not be added in cache because of elements limit (5)
-            assertRange(15, segments[4], DB::FileSegment::Range(21, 23), DB::FileSegment::State::EMPTY);
-            ASSERT_TRUE(segments[4]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            ASSERT_FALSE(segments[4]->reserve(1));
-
-            assertRange(16, segments[5], DB::FileSegment::Range(24, 26), DB::FileSegment::State::DOWNLOADED);
-
-            /// Current cache:    [__________][_____][   ][____]    [___]
-            ///                   ^                            ^    ^
-            ///                   0                            20   24
-            ///
+            assertEqual(holder,
+                        { Range(0, 9),       Range(10, 14),     Range(15, 16),  Range(17, 20),     Range(21, 23), Range(24, 26) },
+                        { State::DOWNLOADED, State::DOWNLOADED, State::EMPTY,   State::DOWNLOADED, State::EMPTY,  State::DOWNLOADED });
+            download(get(holder, 2)); /// [27, 27] was evicted.
+            assertEqual(holder,
+                        { Range(0, 9),       Range(10, 14),     Range(15, 16),     Range(17, 20),     Range(21, 23), Range(24, 26) },
+                        { State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED, State::EMPTY,  State::DOWNLOADED });
+            assertDownloadFails(get(holder, 4));
+            assertEqual(holder,
+                        { Range(0, 9),       Range(10, 14),     Range(15, 16),     Range(17, 20),     Range(21, 23),     Range(24, 26) },
+                        { State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED, State::DETACHED, State::DOWNLOADED });
 
             /// Range [27, 27] must be evicted in previous getOrSet [0, 25].
             /// Let's not invalidate pointers to returned segments from range [0, 25] and
             /// as max elements size is reached, next attempt to put something in cache should fail.
             /// This will also check that [27, 27] was indeed evicted.
+            auto holder2 = cache.getOrSet(key, 27, 1, {});
+            assertEqual(holder2, { Range(27, 27) }, { State::EMPTY });
+            assertDownloadFails(holder2->front());
+            assertEqual(holder2, { Range(27, 27) }, { State::DETACHED });
 
-            auto holder1 = cache.getOrSet(key, 27, 1, {});
-            auto segments_1 = fromHolder(holder1); /// Get [27, 27]
-            ASSERT_EQ(segments_1.size(), 1);
-            assertRange(17, segments_1[0], DB::FileSegment::Range(27, 27), DB::FileSegment::State::EMPTY);
+            auto holder3 = cache.getOrSet(key, 28, 3, {});
+            assertEqual(holder3, { Range(28, 30) }, { State::EMPTY });
+            assertDownloadFails(holder3->front());
+            assertEqual(holder3, { Range(28, 30) }, { State::DETACHED });
+
+            increasePriority(holder);
+            increasePriority(holder2);
+            increasePriority(holder3);
         }
 
+        /// Current cache:    [__________][_____][   ][____]    [___]
+        ///                   ^                            ^    ^
+        ///                   0                            20   24
+        ///
+        assertEqual(cache.getSnapshot(key), { Range(0, 9), Range(10, 14), Range(15, 16), Range(17, 20), Range(24, 26) });
+        assertEqual(cache.dumpQueue(), { Range(0, 9), Range(10, 14), Range(15, 16), Range(17, 20), Range(24, 26) });
+        ASSERT_EQ(cache.getFileSegmentsNum(), 5);
+        ASSERT_EQ(cache.getUsedCacheSize(), 24);
+
+        std::cerr << "Step 6\n";
+
         {
             auto holder = cache.getOrSet(key, 12, 10, {}); /// Get [12, 21]
-            auto segments = fromHolder(holder);
-            ASSERT_EQ(segments.size(), 4);
-
-            assertRange(18, segments[0], DB::FileSegment::Range(10, 14), DB::FileSegment::State::DOWNLOADED);
-            assertRange(19, segments[1], DB::FileSegment::Range(15, 16), DB::FileSegment::State::DOWNLOADED);
-            assertRange(20, segments[2], DB::FileSegment::Range(17, 20), DB::FileSegment::State::DOWNLOADED);
-
-            assertRange(21, segments[3], DB::FileSegment::Range(21, 21), DB::FileSegment::State::EMPTY);
-
-            ASSERT_TRUE(segments[3]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            prepareAndDownload(cache_base_path, segments[3]);
-
-            segments[3]->completeWithoutState();
-            ASSERT_TRUE(segments[3]->state() == DB::FileSegment::State::DOWNLOADED);
+            assertEqual(holder,
+                        { Range(10, 14),     Range(15, 16),     Range(17, 20),     Range(21, 21) },
+                        { State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED, State::EMPTY });
+            download(get(holder, 3));
+            assertEqual(holder,
+                        { Range(10, 14),     Range(15, 16),     Range(17, 20),     Range(21, 21) },
+                        { State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED });
+            increasePriority(holder);
         }
 
         /// Current cache:    [_____][__][____][_]   [___]
         ///                   ^          ^       ^   ^   ^
         ///                   10         17      21  24  26
-
+        assertEqual(cache.getSnapshot(key), { Range(10, 14), Range(15, 16), Range(17, 20), Range(21, 21), Range(24, 26) });
+        assertEqual(cache.dumpQueue(), { Range(24, 26), Range(10, 14), Range(15, 16), Range(17, 20), Range(21, 21) });
         ASSERT_EQ(cache.getFileSegmentsNum(), 5);
+        ASSERT_EQ(cache.getUsedCacheSize(), 15);
 
+        std::cerr << "Step 7\n";
         {
-            auto holder = cache.getOrSet(key, 23, 5, {}); /// Get [23, 28]
-            auto segments = fromHolder(holder);
-            ASSERT_EQ(segments.size(), 3);
-
-            assertRange(22, segments[0], DB::FileSegment::Range(23, 23), DB::FileSegment::State::EMPTY);
-            assertRange(23, segments[1], DB::FileSegment::Range(24, 26), DB::FileSegment::State::DOWNLOADED);
-            assertRange(24, segments[2], DB::FileSegment::Range(27, 27), DB::FileSegment::State::EMPTY);
-
-            ASSERT_TRUE(segments[0]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            ASSERT_TRUE(segments[2]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            prepareAndDownload(cache_base_path, segments[0]);
-            prepareAndDownload(cache_base_path, segments[2]);
-            segments[0]->completeWithoutState();
-            segments[2]->completeWithoutState();
+            auto holder = cache.getOrSet(key, 23, 5, {}); /// Get [23, 27]
+            assertEqual(holder,
+                        { Range(23, 23), Range(24, 26),     Range(27, 27) },
+                        { State::EMPTY,  State::DOWNLOADED, State::EMPTY });
+            download(get(holder, 0));
+            download(get(holder, 2));
+            increasePriority(holder);
         }
 
         /// Current cache:    [____][_]  [][___][__]
         ///                   ^       ^  ^^^   ^^  ^
-        ///                   17      21 2324  26  28
-
-        {
-            auto holder5 = cache.getOrSet(key, 2, 3, {}); /// Get [2, 4]
-            auto s5 = fromHolder(holder5);
-            ASSERT_EQ(s5.size(), 1);
-            assertRange(25, s5[0], DB::FileSegment::Range(2, 4), DB::FileSegment::State::EMPTY);
-
-            auto holder1 = cache.getOrSet(key, 30, 2, {}); /// Get [30, 31]
-            auto s1 = fromHolder(holder1);
-            ASSERT_EQ(s1.size(), 1);
-            assertRange(26, s1[0], DB::FileSegment::Range(30, 31), DB::FileSegment::State::EMPTY);
-
-            ASSERT_TRUE(s5[0]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            ASSERT_TRUE(s1[0]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            prepareAndDownload(cache_base_path, s5[0]);
-            prepareAndDownload(cache_base_path, s1[0]);
-            s5[0]->completeWithoutState();
-            s1[0]->completeWithoutState();
-
-            /// Current cache:    [___]       [_][___][_]   [__]
-            ///                   ^   ^       ^  ^   ^  ^   ^  ^
-            ///                   2   4       23 24  26 27  30 31
-
-            auto holder2 = cache.getOrSet(key, 23, 1, {}); /// Get [23, 23]
-            auto s2 = fromHolder(holder2);
-            ASSERT_EQ(s2.size(), 1);
-
-            auto holder3 = cache.getOrSet(key, 24, 3, {}); /// Get [24, 26]
-            auto s3 = fromHolder(holder3);
-            ASSERT_EQ(s3.size(), 1);
-
-            auto holder4 = cache.getOrSet(key, 27, 1, {}); /// Get [27, 27]
-            auto s4 = fromHolder(holder4);
-            ASSERT_EQ(s4.size(), 1);
-
-            /// All cache is now unreleasable because pointers are still hold
-            auto holder6 = cache.getOrSet(key, 0, 40, {});
-            auto f = fromHolder(holder6);
-            ASSERT_EQ(f.size(), 9);
-
-            assertRange(27, f[0], DB::FileSegment::Range(0, 1), DB::FileSegment::State::EMPTY);
-            assertRange(28, f[2], DB::FileSegment::Range(5, 22), DB::FileSegment::State::EMPTY);
-            assertRange(29, f[6], DB::FileSegment::Range(28, 29), DB::FileSegment::State::EMPTY);
-            assertRange(30, f[8], DB::FileSegment::Range(32, 39), DB::FileSegment::State::EMPTY);
-
-            ASSERT_TRUE(f[0]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            ASSERT_TRUE(f[2]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            ASSERT_TRUE(f[6]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            ASSERT_TRUE(f[8]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-
-            ASSERT_FALSE(f[0]->reserve(1));
-            ASSERT_FALSE(f[2]->reserve(1));
-            ASSERT_FALSE(f[6]->reserve(1));
-            ASSERT_FALSE(f[8]->reserve(1));
-        }
+        ///                   17      21 2324  26  27
+        assertEqual(cache.getSnapshot(key), { Range(17, 20), Range(21, 21), Range(23, 23), Range(24, 26), Range(27, 27) });
+        assertEqual(cache.dumpQueue(), { Range(17, 20), Range(21, 21), Range(23, 23), Range(24, 26), Range(27, 27) });
+        ASSERT_EQ(cache.getFileSegmentsNum(), 5);
+        ASSERT_EQ(cache.getUsedCacheSize(), 10);
 
+        std::cerr << "Step 8\n";
         {
             auto holder = cache.getOrSet(key, 2, 3, {}); /// Get [2, 4]
-            auto segments = fromHolder(holder);
-            ASSERT_EQ(segments.size(), 1);
-            assertRange(31, segments[0], DB::FileSegment::Range(2, 4), DB::FileSegment::State::DOWNLOADED);
+            assertEqual(holder, { Range(2, 4) }, { State::EMPTY });
+
+            auto holder2 = cache.getOrSet(key, 30, 2, {}); /// Get [30, 31]
+            assertEqual(holder2, { Range(30, 31) }, { State::EMPTY });
+
+            download(get(holder, 0));
+            download(get(holder2, 0));
+
+            auto holder3 = cache.getOrSet(key, 23, 1, {}); /// Get [23, 23]
+            assertEqual(holder3, { Range(23, 23) }, { State::DOWNLOADED });
+
+            auto holder4 = cache.getOrSet(key, 24, 3, {}); /// Get [24, 26]
+            assertEqual(holder4, { Range(24, 26) }, { State::DOWNLOADED });
+
+            auto holder5 = cache.getOrSet(key, 27, 1, {}); /// Get [27, 27]
+            assertEqual(holder5, { Range(27, 27) }, { State::DOWNLOADED });
+
+            auto holder6 = cache.getOrSet(key, 0, 40, {});
+            assertEqual(holder6,
+                        { Range(0, 1), Range(2, 4),        Range(5, 22), Range(23, 23),     Range(24, 26),     Range(27, 27),    Range(28, 29), Range(30, 31),     Range(32, 39) },
+                        { State::EMPTY, State::DOWNLOADED, State::EMPTY, State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED, State::EMPTY, State::DOWNLOADED, State::EMPTY });
+
+            assertDownloadFails(get(holder6, 0));
+            assertDownloadFails(get(holder6, 2));
+            assertDownloadFails(get(holder6, 6));
+            assertDownloadFails(get(holder6, 8));
+
+            increasePriority(holder);
+            increasePriority(holder2);
+            increasePriority(holder3);
+            increasePriority(holder4);
+            increasePriority(holder5);
+            increasePriority(holder6);
         }
 
         /// Current cache:    [___]       [_][___][_]   [__]
         ///                   ^   ^       ^  ^   ^  ^   ^  ^
         ///                   2   4       23 24  26 27  30 31
+        assertEqual(cache.getSnapshot(key), { Range(2, 4), Range(23, 23), Range(24, 26), Range(27, 27), Range(30, 31) });
+        assertEqual(cache.dumpQueue(), { Range(2, 4), Range(23, 23), Range(24, 26), Range(27, 27), Range(30, 31) });
+
+        std::cerr << "Step 9\n";
+
+        /// Get [2, 4]
+        {
+            auto holder = cache.getOrSet(key, 2, 3, {});
+            assertEqual(holder, { Range(2, 4) }, { State::DOWNLOADED });
+            increasePriority(holder);
+        }
+
 
         {
             auto holder = cache.getOrSet(key, 25, 5, {}); /// Get [25, 29]
-            auto segments = fromHolder(holder);
-            ASSERT_EQ(segments.size(), 3);
+            assertEqual(holder,
+                        { Range(24, 26),     Range(27, 27),     Range(28, 29) },
+                        { State::DOWNLOADED, State::DOWNLOADED, State::EMPTY });
 
-            assertRange(32, segments[0], DB::FileSegment::Range(24, 26), DB::FileSegment::State::DOWNLOADED);
-            assertRange(33, segments[1], DB::FileSegment::Range(27, 27), DB::FileSegment::State::DOWNLOADED);
-
-            assertRange(34, segments[2], DB::FileSegment::Range(28, 29), DB::FileSegment::State::EMPTY);
-            ASSERT_TRUE(segments[2]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            ASSERT_TRUE(segments[2]->state() == DB::FileSegment::State::DOWNLOADING);
+            auto & file_segment = get(holder, 2);
+            ASSERT_TRUE(file_segment.getOrSetDownloader() == FileSegment::getCallerId());
+            ASSERT_TRUE(file_segment.state() == State::DOWNLOADING);
 
             bool lets_start_download = false;
             std::mutex mutex;
@@ -398,19 +448,16 @@ TEST_F(FileCacheTest, get)
                 auto query_context_1 = DB::Context::createCopy(getContext().context);
                 query_context_1->makeQueryContext();
                 query_context_1->setCurrentQueryId("query_id_1");
+                chassert(&DB::CurrentThread::get() == &thread_status_1);
                 DB::CurrentThread::QueryScope query_scope_holder_1(query_context_1);
-                thread_status_1.attachQueryContext(query_context_1);
 
-                auto holder_2 = cache.getOrSet(key, 25, 5, {}); /// Get [25, 29] once again.
-                auto segments_2 = fromHolder(holder_2);
-                ASSERT_EQ(segments.size(), 3);
+                auto holder2 = cache.getOrSet(key, 25, 5, {}); /// Get [25, 29] once again.
+                assertEqual(holder2,
+                            { Range(24, 26),     Range(27, 27),     Range(28, 29) },
+                            { State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADING });
 
-                assertRange(35, segments_2[0], DB::FileSegment::Range(24, 26), DB::FileSegment::State::DOWNLOADED);
-                assertRange(36, segments_2[1], DB::FileSegment::Range(27, 27), DB::FileSegment::State::DOWNLOADED);
-                assertRange(37, segments_2[2], DB::FileSegment::Range(28, 29), DB::FileSegment::State::DOWNLOADING);
-
-                ASSERT_TRUE(segments[2]->getOrSetDownloader() != DB::FileSegment::getCallerId());
-                ASSERT_TRUE(segments[2]->state() == DB::FileSegment::State::DOWNLOADING);
+                auto & file_segment2 = get(holder2, 2);
+                ASSERT_TRUE(file_segment2.getOrSetDownloader() != FileSegment::getCallerId());
 
                 {
                     std::lock_guard lock(mutex);
@@ -418,8 +465,8 @@ TEST_F(FileCacheTest, get)
                 }
                 cv.notify_one();
 
-                segments_2[2]->wait();
-                ASSERT_TRUE(segments_2[2]->state() == DB::FileSegment::State::DOWNLOADED);
+                file_segment2.wait(file_segment2.range().left);
+                ASSERT_TRUE(file_segment2.state() == State::DOWNLOADED);
             });
 
             {
@@ -427,35 +474,34 @@ TEST_F(FileCacheTest, get)
                 cv.wait(lock, [&]{ return lets_start_download; });
             }
 
-            prepareAndDownload(cache_base_path, segments[2]);
-            segments[2]->completeWithoutState();
-            ASSERT_TRUE(segments[2]->state() == DB::FileSegment::State::DOWNLOADED);
+            download(file_segment);
+            ASSERT_TRUE(file_segment.state() == State::DOWNLOADED);
 
             other_1.join();
+
+            increasePriority(holder);
         }
 
         /// Current cache:    [___]       [___][_][__][__]
         ///                   ^   ^       ^   ^  ^^  ^^  ^
         ///                   2   4       24  26 27  2930 31
+        assertEqual(cache.getSnapshot(key), { Range(2, 4), Range(24, 26), Range(27, 27), Range(28, 29), Range(30, 31) });
+        assertEqual(cache.dumpQueue(), { Range(30, 31), Range(2, 4), Range(24, 26), Range(27, 27), Range(28, 29) });
 
+        std::cerr << "Step 10\n";
         {
             /// Now let's check the similar case but getting ERROR state after segment->wait(), when
             /// state is changed not manually via segment->completeWithState(state) but from destructor of holder
             /// and notify_all() is also called from destructor of holder.
 
-            std::optional<DB::FileSegmentsHolder> holder;
-            holder.emplace(cache.getOrSet(key, 3, 23, {})); /// Get [3, 25]
+            auto holder = cache.getOrSet(key, 3, 23, {}); /// Get [3, 25]
+            assertEqual(holder,
+                        { Range(2, 4),       Range(5, 23), Range(24, 26) },
+                        { State::DOWNLOADED, State::EMPTY, State::DOWNLOADED });
 
-            auto segments = fromHolder(*holder);
-            ASSERT_EQ(segments.size(), 3);
-
-            assertRange(38, segments[0], DB::FileSegment::Range(2, 4), DB::FileSegment::State::DOWNLOADED);
-
-            assertRange(39, segments[1], DB::FileSegment::Range(5, 23), DB::FileSegment::State::EMPTY);
-            ASSERT_TRUE(segments[1]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            ASSERT_TRUE(segments[1]->state() == DB::FileSegment::State::DOWNLOADING);
-
-            assertRange(40, segments[2], DB::FileSegment::Range(24, 26), DB::FileSegment::State::DOWNLOADED);
+            auto & file_segment = get(holder, 1);
+            ASSERT_TRUE(file_segment.getOrSetDownloader() == FileSegment::getCallerId());
+            ASSERT_TRUE(file_segment.state() == State::DOWNLOADING);
 
             bool lets_start_download = false;
             std::mutex mutex;
@@ -467,19 +513,16 @@ TEST_F(FileCacheTest, get)
                 auto query_context_1 = DB::Context::createCopy(getContext().context);
                 query_context_1->makeQueryContext();
                 query_context_1->setCurrentQueryId("query_id_1");
+                chassert(&DB::CurrentThread::get() == &thread_status_1);
                 DB::CurrentThread::QueryScope query_scope_holder_1(query_context_1);
-                thread_status_1.attachQueryContext(query_context_1);
 
-                auto holder_2 = cache.getOrSet(key, 3, 23, {}); /// Get [3, 25] once again
-                auto segments_2 = fromHolder(*holder);
-                ASSERT_EQ(segments_2.size(), 3);
+                auto holder2 = cache.getOrSet(key, 3, 23, {}); /// Get [3, 25] once again
+                assertEqual(holder,
+                            { Range(2, 4),       Range(5, 23),       Range(24, 26) },
+                            { State::DOWNLOADED, State::DOWNLOADING, State::DOWNLOADED });
 
-                assertRange(41, segments_2[0], DB::FileSegment::Range(2, 4), DB::FileSegment::State::DOWNLOADED);
-                assertRange(42, segments_2[1], DB::FileSegment::Range(5, 23), DB::FileSegment::State::DOWNLOADING);
-                assertRange(43, segments_2[2], DB::FileSegment::Range(24, 26), DB::FileSegment::State::DOWNLOADED);
-
-                ASSERT_TRUE(segments_2[1]->getDownloader() != DB::FileSegment::getCallerId());
-                ASSERT_TRUE(segments_2[1]->state() == DB::FileSegment::State::DOWNLOADING);
+                auto & file_segment2 = get(holder, 1);
+                ASSERT_TRUE(file_segment2.getDownloader() != FileSegment::getCallerId());
 
                 {
                     std::lock_guard lock(mutex);
@@ -487,13 +530,10 @@ TEST_F(FileCacheTest, get)
                 }
                 cv.notify_one();
 
-                segments_2[1]->wait();
-                printRanges(segments_2);
-                ASSERT_TRUE(segments_2[1]->state() == DB::FileSegment::State::PARTIALLY_DOWNLOADED);
-
-                ASSERT_TRUE(segments_2[1]->getOrSetDownloader() == DB::FileSegment::getCallerId());
-                prepareAndDownload(cache_base_path, segments_2[1]);
-                segments_2[1]->completeWithoutState();
+                file_segment2.wait(file_segment2.range().left);
+                ASSERT_TRUE(file_segment2.state() == DB::FileSegment::State::PARTIALLY_DOWNLOADED);
+                ASSERT_TRUE(file_segment2.getOrSetDownloader() == DB::FileSegment::getCallerId());
+                download(file_segment2);
             });
 
             {
@@ -503,8 +543,7 @@ TEST_F(FileCacheTest, get)
 
             holder.reset();
             other_1.join();
-            printRanges(segments);
-            ASSERT_TRUE(segments[1]->state() == DB::FileSegment::State::DOWNLOADED);
+            ASSERT_TRUE(file_segment.state() == DB::FileSegment::State::DOWNLOADED);
         }
     }
 
@@ -512,85 +551,155 @@ TEST_F(FileCacheTest, get)
     ///                   ^   ^^         ^   ^^  ^  ^
     ///                   2   45       24  2627 28 29
 
+    std::cerr << "Step 11\n";
     {
         /// Test LRUCache::restore().
 
-        auto cache2 = DB::FileCache(cache_base_path, settings);
+        auto cache2 = DB::FileCache(settings);
         cache2.initialize();
-        auto key = cache2.hash("key1");
+        auto key = cache2.createKeyForPath("key1");
 
-        auto holder1 = cache2.getOrSet(key, 2, 28, {}); /// Get [2, 29]
-
-        auto segments1 = fromHolder(holder1);
-        ASSERT_EQ(segments1.size(), 5);
-
-        assertRange(44, segments1[0], DB::FileSegment::Range(2, 4), DB::FileSegment::State::DOWNLOADED);
-        assertRange(45, segments1[1], DB::FileSegment::Range(5, 23), DB::FileSegment::State::DOWNLOADED);
-        assertRange(45, segments1[2], DB::FileSegment::Range(24, 26), DB::FileSegment::State::DOWNLOADED);
-        assertRange(46, segments1[3], DB::FileSegment::Range(27, 27), DB::FileSegment::State::DOWNLOADED);
-        assertRange(47, segments1[4], DB::FileSegment::Range(28, 29), DB::FileSegment::State::DOWNLOADED);
+        /// Get [2, 29]
+        assertEqual(cache2.getOrSet(key, 2, 28, {}),
+                    { Range(2, 4),       Range(5, 23),      Range(24, 26),     Range(27, 27),     Range(28, 29) },
+                    { State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED });
     }
 
+    std::cerr << "Step 12\n";
     {
         /// Test max file segment size
 
         auto settings2 = settings;
         settings2.max_file_segment_size = 10;
-        auto cache2 = DB::FileCache(caches_dir / "cache2", settings2);
+        settings2.base_path = caches_dir / "cache2";
+        fs::create_directories(settings2.base_path);
+        auto cache2 = DB::FileCache(settings2);
         cache2.initialize();
-        auto key = cache2.hash("key1");
+        auto key = cache2.createKeyForPath("key1");
 
-        auto holder1 = cache2.getOrSet(key, 0, 25, {}); /// Get [0, 24]
-        auto segments1 = fromHolder(holder1);
-
-        ASSERT_EQ(segments1.size(), 3);
-        assertRange(48, segments1[0], DB::FileSegment::Range(0, 9), DB::FileSegment::State::EMPTY);
-        assertRange(49, segments1[1], DB::FileSegment::Range(10, 19), DB::FileSegment::State::EMPTY);
-        assertRange(50, segments1[2], DB::FileSegment::Range(20, 24), DB::FileSegment::State::EMPTY);
+        /// Get [0, 24]
+        assertEqual(cache2.getOrSet(key, 0, 25, {}),
+                    { Range(0, 9),  Range(10, 19), Range(20, 24) },
+                    { State::EMPTY, State::EMPTY,  State::EMPTY });
     }
 
+    std::cerr << "Step 13\n";
+    {
+        /// Test delated cleanup
+
+        auto cache = FileCache(settings);
+        cache.initialize();
+        cache.cleanup();
+        const auto key = cache.createKeyForPath("key10");
+        const auto key_path = cache.getPathInLocalCache(key);
+
+        cache.removeAllReleasable();
+        ASSERT_EQ(cache.getUsedCacheSize(), 0);
+        ASSERT_TRUE(!fs::exists(key_path));
+        ASSERT_TRUE(!fs::exists(fs::path(key_path).parent_path()));
+
+        download(cache.getOrSet(key, 0, 10, {}));
+        ASSERT_EQ(cache.getUsedCacheSize(), 10);
+        ASSERT_TRUE(fs::exists(cache.getPathInLocalCache(key, 0, FileSegmentKind::Regular)));
+
+        cache.removeAllReleasable();
+        ASSERT_EQ(cache.getUsedCacheSize(), 0);
+        ASSERT_TRUE(fs::exists(key_path));
+        ASSERT_TRUE(!fs::exists(cache.getPathInLocalCache(key, 0, FileSegmentKind::Regular)));
+
+        cache.cleanup();
+        ASSERT_TRUE(!fs::exists(key_path));
+        ASSERT_TRUE(!fs::exists(fs::path(key_path).parent_path()));
+    }
+
+    std::cerr << "Step 14\n";
+    {
+        /// Test background thread delated cleanup
+
+        auto settings2{settings};
+        settings2.delayed_cleanup_interval_ms = 0;
+        auto cache = DB::FileCache(settings2);
+        cache.initialize();
+        const auto key = cache.createKeyForPath("key10");
+        const auto key_path = cache.getPathInLocalCache(key);
+
+        cache.removeAllReleasable();
+        ASSERT_EQ(cache.getUsedCacheSize(), 0);
+        ASSERT_TRUE(!fs::exists(key_path));
+        ASSERT_TRUE(!fs::exists(fs::path(key_path).parent_path()));
+
+        download(cache.getOrSet(key, 0, 10, {}));
+        ASSERT_EQ(cache.getUsedCacheSize(), 10);
+        ASSERT_TRUE(fs::exists(key_path));
+
+        cache.removeAllReleasable();
+        ASSERT_EQ(cache.getUsedCacheSize(), 0);
+        sleepForSeconds(2);
+        ASSERT_TRUE(!fs::exists(key_path));
+    }
 }
 
 TEST_F(FileCacheTest, writeBuffer)
 {
-    DB::FileCacheSettings settings;
+    FileCacheSettings settings;
     settings.max_size = 100;
     settings.max_elements = 5;
     settings.max_file_segment_size = 5;
+    settings.base_path = cache_base_path;
 
-    DB::FileCache cache(cache_base_path, settings);
+    FileCache cache(settings);
     cache.initialize();
 
-    auto write_to_cache = [&cache](const String & key, const Strings & data)
+    auto write_to_cache = [&cache](const String & key, const Strings & data, bool flush)
     {
         CreateFileSegmentSettings segment_settings;
         segment_settings.kind = FileSegmentKind::Temporary;
         segment_settings.unbounded = true;
 
-        auto holder = cache.set(cache.hash(key), 0, 3, segment_settings);
-        EXPECT_EQ(holder.file_segments.size(), 1);
-        auto & segment = holder.file_segments.front();
-        WriteBufferToFileSegment out(segment.get());
+        auto cache_key = cache.createKeyForPath(key);
+        auto holder = cache.set(cache_key, 0, 3, segment_settings);
+        /// The same is done in TemporaryDataOnDisk::createStreamToCacheFile.
+        std::filesystem::create_directories(cache.getPathInLocalCache(cache_key));
+        EXPECT_EQ(holder->size(), 1);
+        auto & segment = holder->front();
+        WriteBufferToFileSegment out(&segment);
+        std::list<std::thread> threads;
+        std::mutex mu;
         for (const auto & s : data)
-            out.write(s.data(), s.size());
+        {
+            /// Write from diffetent threads to check
+            /// that no assertions inside cache related to downloaderId are triggered
+            threads.emplace_back([&]
+            {
+                std::unique_lock lock(mu);
+                out.write(s.data(), s.size());
+                /// test different buffering scenarios
+                if (flush)
+                {
+                    out.next();
+                }
+            });
+        }
+        for (auto & t : threads)
+            t.join();
         return holder;
     };
 
     std::vector<fs::path> file_segment_paths;
     {
-        auto holder = write_to_cache("key1", {"abc", "defg"});
-        file_segment_paths.emplace_back(holder.file_segments.front()->getPathInLocalCache());
+        auto holder = write_to_cache("key1", {"abc", "defg"}, false);
+        file_segment_paths.emplace_back(holder->front().getPathInLocalCache());
 
         ASSERT_EQ(fs::file_size(file_segment_paths.back()), 7);
-        ASSERT_TRUE(holder.file_segments.front()->range() == FileSegment::Range(0, 7));
+        ASSERT_TRUE(holder->front().range() == FileSegment::Range(0, 7));
         ASSERT_EQ(cache.getUsedCacheSize(), 7);
 
         {
-            auto holder2 = write_to_cache("key2", {"1", "22", "333", "4444", "55555"});
-            file_segment_paths.emplace_back(holder2.file_segments.front()->getPathInLocalCache());
+            auto holder2 = write_to_cache("key2", {"1", "22", "333", "4444", "55555"}, true);
+            file_segment_paths.emplace_back(holder2->front().getPathInLocalCache());
 
             ASSERT_EQ(fs::file_size(file_segment_paths.back()), 15);
-            ASSERT_TRUE(holder2.file_segments.front()->range() == FileSegment::Range(0, 15));
+            ASSERT_TRUE(holder2->front().range() == FileSegment::Range(0, 15));
             ASSERT_EQ(cache.getUsedCacheSize(), 22);
         }
         ASSERT_FALSE(fs::exists(file_segment_paths.back()));
@@ -640,23 +749,23 @@ TEST_F(FileCacheTest, temporaryData)
     DB::FileCacheSettings settings;
     settings.max_size = 10_KiB;
     settings.max_file_segment_size = 1_KiB;
+    settings.base_path = cache_base_path;
 
-    DB::FileCache file_cache(cache_base_path, settings);
+    DB::FileCache file_cache(settings);
     file_cache.initialize();
 
     auto tmp_data_scope = std::make_shared<TemporaryDataOnDiskScope>(nullptr, &file_cache, 0);
 
-    auto some_data_holder = file_cache.getOrSet(file_cache.hash("some_data"), 0, 5_KiB, CreateFileSegmentSettings{});
+    auto some_data_holder = file_cache.getOrSet(file_cache.createKeyForPath("some_data"), 0, 5_KiB, CreateFileSegmentSettings{});
 
     {
-        auto segments = fromHolder(some_data_holder);
-        ASSERT_EQ(segments.size(), 5);
-        for (auto & segment : segments)
+        ASSERT_EQ(some_data_holder->size(), 5);
+        for (auto & segment : *some_data_holder)
         {
             ASSERT_TRUE(segment->getOrSetDownloader() == DB::FileSegment::getCallerId());
             ASSERT_TRUE(segment->reserve(segment->range().size()));
-            download(cache_base_path, segment);
-            segment->completeWithoutState();
+            download(*segment);
+            segment->complete();
         }
     }
 
@@ -686,6 +795,27 @@ TEST_F(FileCacheTest, temporaryData)
 
         ASSERT_EQ(file_cache.getUsedCacheSize(), used_size_before_attempt);
     }
+
+    {
+        size_t before_used_size = file_cache.getUsedCacheSize();
+        auto tmp_data = std::make_unique<TemporaryDataOnDisk>(tmp_data_scope);
+
+        auto write_buf_stream = tmp_data->createRawStream();
+
+        write_buf_stream->write("1234567890", 10);
+        write_buf_stream->write("abcde", 5);
+        auto read_buf = dynamic_cast<IReadableWriteBuffer *>(write_buf_stream.get())->tryGetReadBuffer();
+
+        ASSERT_GT(file_cache.getUsedCacheSize(), before_used_size + 10);
+
+        char buf[15];
+        size_t read_size = read_buf->read(buf, 15);
+        ASSERT_EQ(read_size, 15);
+        ASSERT_EQ(std::string(buf, 15), "1234567890abcde");
+        read_size = read_buf->read(buf, 15);
+        ASSERT_EQ(read_size, 0);
+    }
+
     {
         auto tmp_data = std::make_unique<TemporaryDataOnDisk>(tmp_data_scope);
         auto & stream = tmp_data->createStream(generateBlock());
diff --git a/src/Interpreters/threadPoolCallbackRunner.h b/src/Interpreters/threadPoolCallbackRunner.h
index 1d2f67e8e59..55c6a848b77 100644
--- a/src/Interpreters/threadPoolCallbackRunner.h
+++ b/src/Interpreters/threadPoolCallbackRunner.h
@@ -11,48 +11,47 @@ namespace DB
 
 /// High-order function to run callbacks (functions with 'void()' signature) somewhere asynchronously.
 template <typename Result, typename Callback = std::function<Result()>>
-using ThreadPoolCallbackRunner = std::function<std::future<Result>(Callback &&, int64_t priority)>;
+using ThreadPoolCallbackRunner = std::function<std::future<Result>(Callback &&, Priority)>;
 
 /// Creates CallbackRunner that runs every callback with 'pool->scheduleOrThrow()'.
 template <typename Result, typename Callback = std::function<Result()>>
 ThreadPoolCallbackRunner<Result, Callback> threadPoolCallbackRunner(ThreadPool & pool, const std::string & thread_name)
 {
-    return [pool = &pool, thread_group = CurrentThread::getGroup(), thread_name](Callback && callback, int64_t priority) mutable -> std::future<Result>
+    return [my_pool = &pool, thread_group = CurrentThread::getGroup(), thread_name](Callback && callback, Priority priority) mutable -> std::future<Result>
     {
-        auto task = std::make_shared<std::packaged_task<Result()>>([thread_group, thread_name, callback = std::move(callback)]() mutable -> Result
+        auto task = std::make_shared<std::packaged_task<Result()>>([thread_group, thread_name, my_callback = std::move(callback)]() mutable -> Result
         {
             if (thread_group)
-                CurrentThread::attachTo(thread_group);
+                CurrentThread::attachToGroup(thread_group);
 
             SCOPE_EXIT_SAFE({
                 {
                     /// Release all captutred resources before detaching thread group
                     /// Releasing has to use proper memory tracker which has been set here before callback
 
-                    [[maybe_unused]] auto tmp = std::move(callback);
+                    [[maybe_unused]] auto tmp = std::move(my_callback);
                 }
 
                 if (thread_group)
-                    CurrentThread::detachQueryIfNotDetached();
+                    CurrentThread::detachFromGroupIfNotDetached();
 
             });
 
             setThreadName(thread_name.data());
 
-            return callback();
+            return my_callback();
         });
 
         auto future = task->get_future();
 
-        /// ThreadPool is using "bigger is higher priority" instead of "smaller is more priority".
-        pool->scheduleOrThrow([task = std::move(task)]{ (*task)(); }, -priority);
+        my_pool->scheduleOrThrow([my_task = std::move(task)]{ (*my_task)(); }, priority);
 
         return future;
     };
 }
 
 template <typename Result, typename T>
-std::future<Result> scheduleFromThreadPool(T && task, ThreadPool & pool, const std::string & thread_name, int64_t priority = 0)
+std::future<Result> scheduleFromThreadPool(T && task, ThreadPool & pool, const std::string & thread_name, Priority priority = {})
 {
     auto schedule = threadPoolCallbackRunner<Result, T>(pool, thread_name);
     return schedule(std::move(task), priority);
diff --git a/src/Loggers/OwnPatternFormatter.cpp b/src/Loggers/OwnPatternFormatter.cpp
index 02a2c2e510b..ccf6c479b80 100644
--- a/src/Loggers/OwnPatternFormatter.cpp
+++ b/src/Loggers/OwnPatternFormatter.cpp
@@ -5,7 +5,6 @@
 #include <IO/WriteHelpers.h>
 #include <Common/HashTable/Hash.h>
 #include <Interpreters/InternalTextLogsQueue.h>
-#include <Common/CurrentThread.h>
 #include <base/terminalColors.h>
 
 
diff --git a/src/Loggers/OwnSplitChannel.cpp b/src/Loggers/OwnSplitChannel.cpp
index 047f6caffcd..03db198c305 100644
--- a/src/Loggers/OwnSplitChannel.cpp
+++ b/src/Loggers/OwnSplitChannel.cpp
@@ -56,7 +56,7 @@ void OwnSplitChannel::tryLogSplit(const Poco::Message & msg)
     /// breaking some functionality because of unexpected "File not
     /// found" (or similar) error.
     ///
-    /// For example StorageDistributedDirectoryMonitor will mark batch
+    /// For example DistributedAsyncInsertDirectoryQueue will mark batch
     /// as broken, some MergeTree code can also be affected.
     ///
     /// Also note, that we cannot log the exception here, since this
diff --git a/src/Parsers/ASTAlterQuery.cpp b/src/Parsers/ASTAlterQuery.cpp
index 426b63a9d28..61e5903fad5 100644
--- a/src/Parsers/ASTAlterQuery.cpp
+++ b/src/Parsers/ASTAlterQuery.cpp
@@ -611,8 +611,16 @@ void ASTAlterQuery::formatQueryImpl(const FormatSettings & settings, FormatState
 
     FormatStateStacked frame_nested = frame;
     frame_nested.need_parens = false;
-    frame_nested.expression_list_always_start_on_new_line = true;
-    static_cast<ASTExpressionList *>(command_list)->formatImplMultiline(settings, state, frame_nested);
+    if (settings.one_line)
+    {
+        frame_nested.expression_list_prepend_whitespace = true;
+        command_list->formatImpl(settings, state, frame_nested);
+    }
+    else
+    {
+        frame_nested.expression_list_always_start_on_new_line = true;
+        command_list->as<ASTExpressionList &>().formatImplMultiline(settings, state, frame_nested);
+    }
 }
 
 }
diff --git a/src/Parsers/ASTAlterQuery.h b/src/Parsers/ASTAlterQuery.h
index 2a48f5bbd9e..1400113fa9c 100644
--- a/src/Parsers/ASTAlterQuery.h
+++ b/src/Parsers/ASTAlterQuery.h
@@ -256,6 +256,11 @@ protected:
     void formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
 
     bool isOneCommandTypeOnly(const ASTAlterCommand::Type & type) const;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&command_list));
+    }
 };
 
 }
diff --git a/src/Parsers/ASTBackupQuery.h b/src/Parsers/ASTBackupQuery.h
index a3e3a144c72..0201c2b14f9 100644
--- a/src/Parsers/ASTBackupQuery.h
+++ b/src/Parsers/ASTBackupQuery.h
@@ -94,5 +94,12 @@ public:
     void formatImpl(const FormatSettings & format, FormatState &, FormatStateStacked) const override;
     ASTPtr getRewrittenASTWithoutOnCluster(const WithoutOnClusterASTRewriteParams &) const override;
     QueryKind getQueryKind() const override;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&backup_name));
+        f(reinterpret_cast<void **>(&base_backup_name));
+    }
 };
+
 }
diff --git a/src/Parsers/ASTColumnDeclaration.h b/src/Parsers/ASTColumnDeclaration.h
index 2008e4f99d1..45814551db8 100644
--- a/src/Parsers/ASTColumnDeclaration.h
+++ b/src/Parsers/ASTColumnDeclaration.h
@@ -16,7 +16,7 @@ public:
     std::optional<bool> null_modifier;
     String default_specifier;
     ASTPtr default_expression;
-    bool ephemeral_default;
+    bool ephemeral_default = false;
     ASTPtr comment;
     ASTPtr codec;
     ASTPtr ttl;
diff --git a/src/Parsers/ASTConstraintDeclaration.h b/src/Parsers/ASTConstraintDeclaration.h
index 437aab1a82d..f48d7ef77fe 100644
--- a/src/Parsers/ASTConstraintDeclaration.h
+++ b/src/Parsers/ASTConstraintDeclaration.h
@@ -25,5 +25,11 @@ public:
     ASTPtr clone() const override;
 
     void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&expr));
+    }
 };
+
 }
diff --git a/src/Parsers/ASTCreateQuery.cpp b/src/Parsers/ASTCreateQuery.cpp
index 955ce62b0f7..196681a8801 100644
--- a/src/Parsers/ASTCreateQuery.cpp
+++ b/src/Parsers/ASTCreateQuery.cpp
@@ -91,6 +91,11 @@ public:
     ASTPtr clone() const override;
 
     void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&elem));
+    }
 };
 
 ASTPtr ASTColumnsElement::clone() const
@@ -435,10 +440,10 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
     if (select)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " AS"
-                      << (comment ? "(" : "")
-                      << settings.nl_or_ws << (settings.hilite ? hilite_none : "");
+                      << settings.nl_or_ws
+                      << (comment ? "(" : "") << (settings.hilite ? hilite_none : "");
         select->formatImpl(settings, state, frame);
-        settings.ostr << (comment ? ")" : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << (comment ? ")" : "") << (settings.hilite ? hilite_none : "");
     }
 
     if (comment)
diff --git a/src/Parsers/ASTCreateQuery.h b/src/Parsers/ASTCreateQuery.h
index 90a15e09369..230996f610e 100644
--- a/src/Parsers/ASTCreateQuery.h
+++ b/src/Parsers/ASTCreateQuery.h
@@ -32,6 +32,17 @@ public:
     void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
 
     bool isExtendedStorageDefinition() const;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&engine));
+        f(reinterpret_cast<void **>(&partition_by));
+        f(reinterpret_cast<void **>(&primary_key));
+        f(reinterpret_cast<void **>(&order_by));
+        f(reinterpret_cast<void **>(&sample_by));
+        f(reinterpret_cast<void **>(&ttl_table));
+        f(reinterpret_cast<void **>(&settings));
+    }
 };
 
 
@@ -57,6 +68,16 @@ public:
         return (!columns || columns->children.empty()) && (!indices || indices->children.empty()) && (!constraints || constraints->children.empty())
             && (!projections || projections->children.empty());
     }
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&columns));
+        f(reinterpret_cast<void **>(&indices));
+        f(reinterpret_cast<void **>(&primary_key));
+        f(reinterpret_cast<void **>(&constraints));
+        f(reinterpret_cast<void **>(&projections));
+        f(reinterpret_cast<void **>(&primary_key));
+    }
 };
 
 
@@ -126,6 +147,19 @@ public:
 
 protected:
     void formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&columns_list));
+        f(reinterpret_cast<void **>(&inner_storage));
+        f(reinterpret_cast<void **>(&storage));
+        f(reinterpret_cast<void **>(&as_table_function));
+        f(reinterpret_cast<void **>(&select));
+        f(reinterpret_cast<void **>(&comment));
+        f(reinterpret_cast<void **>(&table_overrides));
+        f(reinterpret_cast<void **>(&dictionary_attributes_list));
+        f(reinterpret_cast<void **>(&dictionary));
+    }
 };
 
 }
diff --git a/src/Parsers/ASTDictionary.cpp b/src/Parsers/ASTDictionary.cpp
index 66c1c3791b8..e33a7de6836 100644
--- a/src/Parsers/ASTDictionary.cpp
+++ b/src/Parsers/ASTDictionary.cpp
@@ -161,8 +161,9 @@ void ASTDictionary::formatImpl(const FormatSettings & settings, FormatState & st
 
     if (source)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << settings.nl_or_ws << "SOURCE("
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << settings.nl_or_ws << "SOURCE"
             << (settings.hilite ? hilite_none : "");
+        settings.ostr << "(";
         source->formatImpl(settings, state, frame);
         settings.ostr << ")";
     }
diff --git a/src/Parsers/ASTDictionary.h b/src/Parsers/ASTDictionary.h
index 3611621b8ad..8c332247d52 100644
--- a/src/Parsers/ASTDictionary.h
+++ b/src/Parsers/ASTDictionary.h
@@ -47,6 +47,11 @@ public:
     ASTPtr clone() const override;
 
     void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&parameters));
+    }
 };
 
 
diff --git a/src/Parsers/ASTDictionaryAttributeDeclaration.cpp b/src/Parsers/ASTDictionaryAttributeDeclaration.cpp
index 760b96b0927..daf708c9478 100644
--- a/src/Parsers/ASTDictionaryAttributeDeclaration.cpp
+++ b/src/Parsers/ASTDictionaryAttributeDeclaration.cpp
@@ -56,16 +56,16 @@ void ASTDictionaryAttributeDeclaration::formatImpl(const FormatSettings & settin
     }
 
     if (hierarchical)
-        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "HIERARCHICAL";
+        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "HIERARCHICAL" << (settings.hilite ? hilite_none : "");
 
     if (bidirectional)
-        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "BIDIRECTIONAL";
+        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "BIDIRECTIONAL" << (settings.hilite ? hilite_none : "");
 
     if (injective)
-        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "INJECTIVE";
+        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "INJECTIVE" << (settings.hilite ? hilite_none : "");
 
     if (is_object_id)
-        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "IS_OBJECT_ID";
+        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "IS_OBJECT_ID" << (settings.hilite ? hilite_none : "");
 }
 
 }
diff --git a/src/Parsers/ASTDictionaryAttributeDeclaration.h b/src/Parsers/ASTDictionaryAttributeDeclaration.h
index b6572e89d16..52103650684 100644
--- a/src/Parsers/ASTDictionaryAttributeDeclaration.h
+++ b/src/Parsers/ASTDictionaryAttributeDeclaration.h
@@ -19,13 +19,13 @@ public:
     /// Attribute expression
     ASTPtr expression;
     /// Is attribute mirrored to the parent identifier
-    bool hierarchical;
+    bool hierarchical = false;
     /// Is hierarchical attribute bidirectional
-    bool bidirectional;
+    bool bidirectional = false;
     /// Flag that shows whether the id->attribute image is injective
-    bool injective;
+    bool injective = false;
     /// MongoDB object ID
-    bool is_object_id;
+    bool is_object_id = false;
 
     String getID(char delim) const override { return "DictionaryAttributeDeclaration" + (delim + name); }
 
diff --git a/src/Parsers/ASTExplainQuery.h b/src/Parsers/ASTExplainQuery.h
index 3903cf42269..701bde8cebd 100644
--- a/src/Parsers/ASTExplainQuery.h
+++ b/src/Parsers/ASTExplainQuery.h
@@ -80,6 +80,8 @@ public:
         return res;
     }
 
+    void setExplainKind(ExplainKind kind_) { kind = kind_; }
+
     void setExplainedQuery(ASTPtr query_)
     {
         children.emplace_back(query_);
diff --git a/src/Parsers/ASTExternalDDLQuery.h b/src/Parsers/ASTExternalDDLQuery.h
index 7913d44b970..96600b07f29 100644
--- a/src/Parsers/ASTExternalDDLQuery.h
+++ b/src/Parsers/ASTExternalDDLQuery.h
@@ -41,6 +41,11 @@ public:
     }
 
     QueryKind getQueryKind() const override { return QueryKind::ExternalDDL; }
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&from));
+    }
 };
 
 }
diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
index 129d3d60744..ecd7ecccb2e 100644
--- a/src/Parsers/ASTFunction.cpp
+++ b/src/Parsers/ASTFunction.cpp
@@ -2,6 +2,7 @@
 
 #include <Parsers/ASTFunction.h>
 
+#include <Common/assert_cast.h>
 #include <Common/quoteString.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/KnownObjectNames.h>
@@ -28,8 +29,8 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int UNEXPECTED_EXPRESSION;
     extern const int UNEXPECTED_AST_STRUCTURE;
+    extern const int UNKNOWN_FUNCTION;
 }
 
 
@@ -471,8 +472,9 @@ namespace
 
 void ASTFunction::appendColumnNameImpl(WriteBuffer & ostr) const
 {
-    if (name == "view")
-        throw Exception(ErrorCodes::UNEXPECTED_EXPRESSION, "Table function view cannot be used as an expression");
+    /// These functions contain some unexpected ASTs in arguments (e.g. SETTINGS or even a SELECT query)
+    if (name == "view" || name == "viewIfPermitted" || name == "mysql" || name == "postgresql" || name == "mongodb" || name == "s3")
+        throw Exception(ErrorCodes::UNKNOWN_FUNCTION, "Table function '{}' cannot be used as an expression", name);
 
     /// If function can be converted to literal it will be parsed as literal after formatting.
     /// In distributed query it may lead to mismathed column names.
@@ -691,12 +693,15 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
     {
         std::string nl_or_nothing = settings.one_line ? "" : "\n";
         std::string indent_str = settings.one_line ? "" : std::string(4u * frame.indent, ' ');
-        settings.ostr << (settings.hilite ? hilite_function : "") << name << "(" << nl_or_nothing;
+        settings.ostr << (settings.hilite ? hilite_function : "") << name << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_function : "") << "(" << (settings.hilite ? hilite_none : "");
+        settings.ostr << nl_or_nothing;
         FormatStateStacked frame_nested = frame;
         frame_nested.need_parens = false;
         ++frame_nested.indent;
         query->formatImpl(settings, state, frame_nested);
-        settings.ostr << nl_or_nothing << indent_str << ")";
+        settings.ostr << nl_or_nothing << indent_str;
+        settings.ostr << (settings.hilite ? hilite_function : "") << ")" << (settings.hilite ? hilite_none : "");
         return;
     }
 
diff --git a/src/Parsers/ASTFunctionWithKeyValueArguments.h b/src/Parsers/ASTFunctionWithKeyValueArguments.h
index 67d591dfcdc..75a8ae0415e 100644
--- a/src/Parsers/ASTFunctionWithKeyValueArguments.h
+++ b/src/Parsers/ASTFunctionWithKeyValueArguments.h
@@ -33,6 +33,11 @@ public:
     bool hasSecretParts() const override;
 
     void updateTreeHashImpl(SipHash & hash_state) const override;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&second));
+    }
 };
 
 
diff --git a/src/Parsers/ASTIdentifier_fwd.h b/src/Parsers/ASTIdentifier_fwd.h
index c4434477fdb..01cfbb8fec7 100644
--- a/src/Parsers/ASTIdentifier_fwd.h
+++ b/src/Parsers/ASTIdentifier_fwd.h
@@ -17,17 +17,21 @@ class ASTTableIdentifier;
 void setIdentifierSpecial(ASTPtr & ast);
 
 String getIdentifierName(const IAST * ast);
+
 std::optional<String> tryGetIdentifierName(const IAST * ast);
+
 bool tryGetIdentifierNameInto(const IAST * ast, String & name);
 
 inline String getIdentifierName(const ASTPtr & ast)
 {
     return getIdentifierName(ast.get());
 }
+
 inline std::optional<String> tryGetIdentifierName(const ASTPtr & ast)
 {
     return tryGetIdentifierName(ast.get());
 }
+
 inline bool tryGetIdentifierNameInto(const ASTPtr & ast, String & name)
 {
     return tryGetIdentifierNameInto(ast.get(), name);
diff --git a/src/Parsers/ASTIndexDeclaration.h b/src/Parsers/ASTIndexDeclaration.h
index e22c1da4489..bd52a611f3f 100644
--- a/src/Parsers/ASTIndexDeclaration.h
+++ b/src/Parsers/ASTIndexDeclaration.h
@@ -23,6 +23,12 @@ public:
 
     ASTPtr clone() const override;
     void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&expr));
+        f(reinterpret_cast<void **>(&type));
+    }
 };
 
 }
diff --git a/src/Parsers/ASTKillQueryQuery.cpp b/src/Parsers/ASTKillQueryQuery.cpp
index 8bf99312544..a3c0f48f28a 100644
--- a/src/Parsers/ASTKillQueryQuery.cpp
+++ b/src/Parsers/ASTKillQueryQuery.cpp
@@ -29,11 +29,13 @@ void ASTKillQueryQuery::formatQueryImpl(const FormatSettings & settings, FormatS
             break;
     }
 
+    settings.ostr << (settings.hilite ? hilite_none : "");
+
     formatOnCluster(settings);
 
     if (where_expression)
     {
-        settings.ostr << " WHERE " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << " WHERE " << (settings.hilite ? hilite_none : "");
         where_expression->formatImpl(settings, state, frame);
     }
 
diff --git a/src/Parsers/ASTOrderByElement.h b/src/Parsers/ASTOrderByElement.h
index 4d07405c17a..468d2161dff 100644
--- a/src/Parsers/ASTOrderByElement.h
+++ b/src/Parsers/ASTOrderByElement.h
@@ -11,14 +11,14 @@ namespace DB
 class ASTOrderByElement : public IAST
 {
 public:
-    int direction; /// 1 for ASC, -1 for DESC
-    int nulls_direction; /// Same as direction for NULLS LAST, opposite for NULLS FIRST.
-    bool nulls_direction_was_explicitly_specified;
+    int direction = 0; /// 1 for ASC, -1 for DESC
+    int nulls_direction = 0; /// Same as direction for NULLS LAST, opposite for NULLS FIRST.
+    bool nulls_direction_was_explicitly_specified = false;
 
     /** Collation for locale-specific string comparison. If empty, then sorting done by bytes. */
     ASTPtr collation;
 
-    bool with_fill;
+    bool with_fill = false;
     ASTPtr fill_from;
     ASTPtr fill_to;
     ASTPtr fill_step;
diff --git a/src/Parsers/ASTProjectionDeclaration.h b/src/Parsers/ASTProjectionDeclaration.h
index 53c681c3ec1..df7a7c832a6 100644
--- a/src/Parsers/ASTProjectionDeclaration.h
+++ b/src/Parsers/ASTProjectionDeclaration.h
@@ -18,6 +18,11 @@ public:
 
     ASTPtr clone() const override;
     void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&query));
+    }
 };
 
 }
diff --git a/src/Parsers/ASTQueryWithOutput.cpp b/src/Parsers/ASTQueryWithOutput.cpp
index 6db011417a6..5f717715a69 100644
--- a/src/Parsers/ASTQueryWithOutput.cpp
+++ b/src/Parsers/ASTQueryWithOutput.cpp
@@ -1,4 +1,6 @@
 #include <Parsers/ASTQueryWithOutput.h>
+
+#include <Common/assert_cast.h>
 #include <Parsers/ASTSetQuery.h>
 
 namespace DB
@@ -33,6 +35,13 @@ void ASTQueryWithOutput::formatImpl(const FormatSettings & s, FormatState & stat
     {
         s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << "INTO OUTFILE " << (s.hilite ? hilite_none : "");
         out_file->formatImpl(s, state, frame);
+
+        s.ostr << (s.hilite ? hilite_keyword : "");
+        if (is_outfile_append)
+            s.ostr << " APPEND";
+        if (is_into_outfile_with_stdout)
+            s.ostr << " AND STDOUT";
+        s.ostr << (s.hilite ? hilite_none : "");
     }
 
     if (format)
diff --git a/src/Parsers/ASTQueryWithOutput.h b/src/Parsers/ASTQueryWithOutput.h
index 892d911e2e2..7db021405e7 100644
--- a/src/Parsers/ASTQueryWithOutput.h
+++ b/src/Parsers/ASTQueryWithOutput.h
@@ -15,7 +15,8 @@ class ASTQueryWithOutput : public IAST
 {
 public:
     ASTPtr out_file;
-    bool is_into_outfile_with_stdout;
+    bool is_into_outfile_with_stdout = false;
+    bool is_outfile_append = false;
     ASTPtr format;
     ASTPtr settings_ast;
     ASTPtr compression;
diff --git a/src/Parsers/ASTSelectQuery.cpp b/src/Parsers/ASTSelectQuery.cpp
index 2936c2e9ef1..2d82708c70d 100644
--- a/src/Parsers/ASTSelectQuery.cpp
+++ b/src/Parsers/ASTSelectQuery.cpp
@@ -1,3 +1,4 @@
+#include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/Parsers/ASTShowColumnsQuery.cpp b/src/Parsers/ASTShowColumnsQuery.cpp
new file mode 100644
index 00000000000..a02dba9c288
--- /dev/null
+++ b/src/Parsers/ASTShowColumnsQuery.cpp
@@ -0,0 +1,52 @@
+#include <Parsers/ASTShowColumnsQuery.h>
+
+#include <iomanip>
+#include <Common/quoteString.h>
+#include <IO/Operators.h>
+
+namespace DB
+{
+
+ASTPtr ASTShowColumnsQuery::clone() const
+{
+    auto res = std::make_shared<ASTShowColumnsQuery>(*this);
+    res->children.clear();
+    cloneOutputOptions(*res);
+    return res;
+}
+
+void ASTShowColumnsQuery::formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+{
+    settings.ostr << (settings.hilite ? hilite_keyword : "")
+                  << "SHOW "
+                  << (extended ? "EXTENDED " : "")
+                  << (full ? "FULL " : "")
+                  << "COLUMNS"
+                  << (settings.hilite ? hilite_none : "");
+
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM " << (settings.hilite ? hilite_none : "") << backQuoteIfNeed(table);
+    if (!database.empty())
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM " << (settings.hilite ? hilite_none : "") << backQuoteIfNeed(database);
+
+
+    if (!like.empty())
+        settings.ostr << (settings.hilite ? hilite_keyword : "")
+                      << (not_like ? " NOT" : "")
+                      << (case_insensitive_like ? " ILIKE " : " LIKE")
+                      << (settings.hilite ? hilite_none : "")
+                      << DB::quote << like;
+
+    if (where_expression)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << " WHERE " << (settings.hilite ? hilite_none : "");
+        where_expression->formatImpl(settings, state, frame);
+    }
+
+    if (limit_length)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << " LIMIT " << (settings.hilite ? hilite_none : "");
+        limit_length->formatImpl(settings, state, frame);
+    }
+}
+
+}
diff --git a/src/Parsers/ASTShowColumnsQuery.h b/src/Parsers/ASTShowColumnsQuery.h
new file mode 100644
index 00000000000..b49d688dcdb
--- /dev/null
+++ b/src/Parsers/ASTShowColumnsQuery.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <Parsers/IAST_fwd.h>
+#include <Parsers/ASTQueryWithOutput.h>
+
+namespace DB
+{
+
+/// Query SHOW COLUMNS
+class ASTShowColumnsQuery : public ASTQueryWithOutput
+{
+public:
+    bool extended = false;
+    bool full = false;
+    bool not_like = false;
+    bool case_insensitive_like = false;
+
+    ASTPtr where_expression;
+    ASTPtr limit_length;
+
+    String database;
+    String table;
+
+    String like;
+
+    String getID(char) const override { return "ShowColumns"; }
+    ASTPtr clone() const override;
+    QueryKind getQueryKind() const override { return QueryKind::Show; }
+
+protected:
+    void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
+};
+
+}
diff --git a/src/Parsers/ASTShowIndexesQuery.cpp b/src/Parsers/ASTShowIndexesQuery.cpp
new file mode 100644
index 00000000000..df1e242a239
--- /dev/null
+++ b/src/Parsers/ASTShowIndexesQuery.cpp
@@ -0,0 +1,38 @@
+#include <Parsers/ASTShowIndexesQuery.h>
+
+#include <iomanip>
+#include <Common/quoteString.h>
+#include <IO/Operators.h>
+
+namespace DB
+{
+
+ASTPtr ASTShowIndexesQuery::clone() const
+{
+    auto res = std::make_shared<ASTShowIndexesQuery>(*this);
+    res->children.clear();
+    cloneOutputOptions(*res);
+    return res;
+}
+
+void ASTShowIndexesQuery::formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+{
+    settings.ostr << (settings.hilite ? hilite_keyword : "")
+                  << "SHOW "
+                  << (extended ? "EXTENDED " : "")
+                  << "INDEXES"
+                  << (settings.hilite ? hilite_none : "");
+
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM " << (settings.hilite ? hilite_none : "") << backQuoteIfNeed(table);
+    if (!database.empty())
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM " << (settings.hilite ? hilite_none : "") << backQuoteIfNeed(database);
+
+    if (where_expression)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << " WHERE " << (settings.hilite ? hilite_none : "");
+        where_expression->formatImpl(settings, state, frame);
+    }
+}
+
+}
+
diff --git a/src/Parsers/ASTShowIndexesQuery.h b/src/Parsers/ASTShowIndexesQuery.h
new file mode 100644
index 00000000000..ab504bf71da
--- /dev/null
+++ b/src/Parsers/ASTShowIndexesQuery.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <Parsers/IAST_fwd.h>
+#include <Parsers/ASTQueryWithOutput.h>
+
+namespace DB
+{
+
+/// Query SHOW INDEXES
+class ASTShowIndexesQuery : public ASTQueryWithOutput
+{
+public:
+    bool extended = false;
+
+    ASTPtr where_expression;
+
+    String database;
+    String table;
+
+    String getID(char) const override { return "ShowColumns"; }
+    ASTPtr clone() const override;
+    QueryKind getQueryKind() const override { return QueryKind::Show; }
+
+protected:
+    void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
+};
+
+}
+
diff --git a/src/Parsers/ASTShowTablesQuery.h b/src/Parsers/ASTShowTablesQuery.h
index b58d65e37ab..2878df54bcc 100644
--- a/src/Parsers/ASTShowTablesQuery.h
+++ b/src/Parsers/ASTShowTablesQuery.h
@@ -14,31 +14,28 @@ namespace DB
 class ASTShowTablesQuery : public ASTQueryWithOutput
 {
 public:
-    bool databases{false};
-    bool clusters{false};
-    bool cluster{false};
-    bool dictionaries{false};
-    bool m_settings{false};
-    bool changed{false};
-    bool temporary{false};
-    bool caches{false};
-    bool full{false};
+    bool databases = false;
+    bool clusters = false;
+    bool cluster = false;
+    bool dictionaries = false;
+    bool m_settings = false;
+    bool changed = false;
+    bool temporary = false;
+    bool caches = false;
+    bool full = false;
 
     String cluster_str;
     String from;
     String like;
 
-    bool not_like{false};
-    bool case_insensitive_like{false};
+    bool not_like = false;
+    bool case_insensitive_like = false;
 
     ASTPtr where_expression;
     ASTPtr limit_length;
 
-    /** Get the text that identifies this element. */
     String getID(char) const override { return "ShowTables"; }
-
     ASTPtr clone() const override;
-
     QueryKind getQueryKind() const override { return QueryKind::Show; }
 
 protected:
diff --git a/src/Parsers/ASTSubquery.h b/src/Parsers/ASTSubquery.h
index 7d0fabf3ed4..e4de766621a 100644
--- a/src/Parsers/ASTSubquery.h
+++ b/src/Parsers/ASTSubquery.h
@@ -21,15 +21,9 @@ public:
 
     ASTPtr clone() const override
     {
-        const auto res = std::make_shared<ASTSubquery>(*this);
-        ASTPtr ptr{res};
-
-        res->children.clear();
-
-        for (const auto & child : children)
-            res->children.emplace_back(child->clone());
-
-        return ptr;
+        auto clone = std::make_shared<ASTSubquery>(*this);
+        clone->cloneChildren();
+        return clone;
     }
 
     void updateTreeHashImpl(SipHash & hash_state) const override;
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index ffb018f23fe..a91449ff035 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -104,6 +104,12 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &,
     auto print_drop_replica = [&]
     {
         settings.ostr << " " << quoteString(replica);
+        if (!shard.empty())
+        {
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM SHARD "
+                          << (settings.hilite ? hilite_none : "") << quoteString(shard);
+        }
+
         if (table)
         {
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM TABLE"
@@ -181,6 +187,10 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &,
             print_identifier(target_function);
         else if (!disk.empty())
             print_identifier(disk);
+
+        if (sync_replica_mode != SyncReplicaMode::DEFAULT)
+            settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << magic_enum::enum_name(sync_replica_mode)
+                          << (settings.hilite ? hilite_none : "");
     }
     else if (type == Type::SYNC_DATABASE_REPLICA)
     {
@@ -199,8 +209,8 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &,
     }
     else if (type == Type::DROP_FILESYSTEM_CACHE)
     {
-        if (!filesystem_cache_path.empty())
-            settings.ostr << (settings.hilite ? hilite_none : "") << " " << filesystem_cache_path;
+        if (!filesystem_cache_name.empty())
+            settings.ostr << (settings.hilite ? hilite_none : "") << " " << filesystem_cache_name;
     }
     else if (type == Type::UNFREEZE)
     {
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index 80a891712a6..ca4802d9a9b 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -2,6 +2,7 @@
 
 #include <Parsers/ASTQueryWithOnCluster.h>
 #include <Parsers/IAST.h>
+#include <Parsers/SyncReplicaMode.h>
 
 #include "config.h"
 
@@ -76,6 +77,8 @@ public:
         START_THREAD_FUZZER,
         STOP_THREAD_FUZZER,
         UNFREEZE,
+        ENABLE_FAILPOINT,
+        DISABLE_FAILPOINT,
         END
     };
 
@@ -95,6 +98,7 @@ public:
     String target_model;
     String target_function;
     String replica;
+    String shard;
     String replica_zk_path;
     bool is_drop_whole_replica{};
     String storage_policy;
@@ -102,12 +106,16 @@ public:
     String disk;
     UInt64 seconds{};
 
-    String filesystem_cache_path;
+    String filesystem_cache_name;
 
     String backup_name;
 
     String schema_cache_storage;
 
+    String fail_point_name;
+
+    SyncReplicaMode sync_replica_mode = SyncReplicaMode::DEFAULT;
+
     String getID(char) const override { return "SYSTEM query"; }
 
     ASTPtr clone() const override
diff --git a/src/Parsers/ASTTableOverrides.h b/src/Parsers/ASTTableOverrides.h
index c47260789d8..1df267acaa9 100644
--- a/src/Parsers/ASTTableOverrides.h
+++ b/src/Parsers/ASTTableOverrides.h
@@ -27,6 +27,12 @@ public:
     String getID(char) const override { return "TableOverride " + table_name; }
     ASTPtr clone() const override;
     void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&columns));
+        f(reinterpret_cast<void **>(&storage));
+    }
 };
 
 /// List of table overrides, for example:
diff --git a/src/Parsers/ASTUndropQuery.cpp b/src/Parsers/ASTUndropQuery.cpp
new file mode 100644
index 00000000000..0b8a18b12c9
--- /dev/null
+++ b/src/Parsers/ASTUndropQuery.cpp
@@ -0,0 +1,42 @@
+#include <Parsers/ASTUndropQuery.h>
+#include <Common/quoteString.h>
+#include <IO/Operators.h>
+
+
+namespace DB
+{
+
+String ASTUndropQuery::getID(char delim) const
+{
+    return "UndropQuery" + (delim + getDatabase()) + delim + getTable();
+}
+
+ASTPtr ASTUndropQuery::clone() const
+{
+    auto res = std::make_shared<ASTUndropQuery>(*this);
+    cloneOutputOptions(*res);
+    cloneTableOptions(*res);
+    return res;
+}
+
+void ASTUndropQuery::formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
+{
+    settings.ostr << (settings.hilite ? hilite_keyword : "");
+    settings.ostr << "UNDROP ";
+    settings.ostr << "TABLE ";
+    settings.ostr << (settings.hilite ? hilite_none : "");
+
+    assert (table);
+    if (!database)
+        settings.ostr << backQuoteIfNeed(getTable());
+    else
+        settings.ostr << backQuoteIfNeed(getDatabase()) + "." << backQuoteIfNeed(getTable());
+
+    if (uuid != UUIDHelpers::Nil)
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << " UUID " << (settings.hilite ? hilite_none : "")
+            << quoteString(toString(uuid));
+
+    formatOnCluster(settings);
+}
+
+}
diff --git a/src/Parsers/ASTUndropQuery.h b/src/Parsers/ASTUndropQuery.h
new file mode 100644
index 00000000000..7aac4c86c5b
--- /dev/null
+++ b/src/Parsers/ASTUndropQuery.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <Parsers/ASTQueryWithTableAndOutput.h>
+#include <Parsers/ASTQueryWithOnCluster.h>
+
+
+namespace DB
+{
+
+/** UNDROP query
+  */
+class ASTUndropQuery : public ASTQueryWithTableAndOutput, public ASTQueryWithOnCluster
+{
+public:
+    /** Get the text that identifies this element. */
+    String getID(char) const override;
+    ASTPtr clone() const override;
+
+    ASTPtr getRewrittenASTWithoutOnCluster(const WithoutOnClusterASTRewriteParams & params) const override
+    {
+        return removeOnCluster<ASTUndropQuery>(clone(), params.default_database);
+    }
+
+    QueryKind getQueryKind() const override { return QueryKind::Undrop; }
+
+protected:
+    void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
+};
+
+}
diff --git a/src/Parsers/ASTWatchQuery.h b/src/Parsers/ASTWatchQuery.h
index 29dadd71675..156fe6828bc 100644
--- a/src/Parsers/ASTWatchQuery.h
+++ b/src/Parsers/ASTWatchQuery.h
@@ -23,7 +23,7 @@ class ASTWatchQuery : public ASTQueryWithTableAndOutput
 
 public:
     ASTPtr limit_length;
-    bool is_watch_events;
+    bool is_watch_events = false;
 
     ASTWatchQuery() = default;
     String getID(char) const override { return "WatchQuery_" + getDatabase() + "_" + getTable(); }
diff --git a/src/Parsers/ASTWithAlias.cpp b/src/Parsers/ASTWithAlias.cpp
index 88f6568a719..1b5397654fd 100644
--- a/src/Parsers/ASTWithAlias.cpp
+++ b/src/Parsers/ASTWithAlias.cpp
@@ -20,7 +20,9 @@ void ASTWithAlias::formatImpl(const FormatSettings & settings, FormatState & sta
     /// This is needed because the query can become extraordinary large after substitution of aliases.
     if (!alias.empty() && !state.printed_asts_with_alias.emplace(frame.current_select, alias, getTreeHash()).second)
     {
+        settings.ostr << (settings.hilite ? IAST::hilite_identifier : "");
         settings.writeIdentifier(alias);
+        settings.ostr << (settings.hilite ? IAST::hilite_none : "");
     }
     else
     {
diff --git a/src/Parsers/ASTWithElement.cpp b/src/Parsers/ASTWithElement.cpp
index b517509c4bc..c2cb1177c17 100644
--- a/src/Parsers/ASTWithElement.cpp
+++ b/src/Parsers/ASTWithElement.cpp
@@ -18,7 +18,9 @@ void ASTWithElement::formatImpl(const FormatSettings & settings, FormatState & s
 {
     std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
 
+    settings.ostr << (settings.hilite ? hilite_alias : "");
     settings.writeIdentifier(name);
+    settings.ostr << (settings.hilite ? hilite_none : "");
     settings.ostr << (settings.hilite ? hilite_keyword : "") << " AS" << (settings.hilite ? hilite_none : "");
     settings.ostr << settings.nl_or_ws << indent_str;
     dynamic_cast<const ASTWithAlias &>(*subquery).formatImplWithoutAlias(settings, state, frame);
diff --git a/src/Parsers/Access/ASTAuthenticationData.cpp b/src/Parsers/Access/ASTAuthenticationData.cpp
new file mode 100644
index 00000000000..d730a08889d
--- /dev/null
+++ b/src/Parsers/Access/ASTAuthenticationData.cpp
@@ -0,0 +1,199 @@
+#include <Parsers/Access/ASTAuthenticationData.h>
+
+#include <Access/AccessControl.h>
+#include <Common/Exception.h>
+#include <Parsers/ASTLiteral.h>
+#include <IO/Operators.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+std::optional<String> ASTAuthenticationData::getPassword() const
+{
+    if (contains_password)
+    {
+        if (const auto * password = children[0]->as<const ASTLiteral>())
+        {
+            return password->value.safeGet<String>();
+        }
+    }
+
+    return {};
+}
+std::optional<String> ASTAuthenticationData::getSalt() const
+{
+    if (type && *type == AuthenticationType::SHA256_PASSWORD && children.size() == 2)
+    {
+        if (const auto * salt = children[1]->as<const ASTLiteral>())
+        {
+            return salt->value.safeGet<String>();
+        }
+    }
+
+    return {};
+}
+
+void ASTAuthenticationData::formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
+{
+    if (type && *type == AuthenticationType::NO_PASSWORD)
+    {
+        settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " NOT IDENTIFIED"
+                      << (settings.hilite ? IAST::hilite_none : "");
+        return;
+    }
+
+    String auth_type_name;
+    String prefix; /// "BY" or "SERVER" or "REALM"
+    bool password = false; /// either a password or hash
+    bool salt = false;
+    bool parameter = false;
+    bool parameters = false;
+
+    if (type)
+    {
+        auth_type_name = AuthenticationTypeInfo::get(*type).name;
+
+        switch (*type)
+        {
+            case AuthenticationType::PLAINTEXT_PASSWORD:
+            {
+                prefix = "BY";
+                password = true;
+                break;
+            }
+            case AuthenticationType::SHA256_PASSWORD:
+            {
+                if (contains_hash)
+                    auth_type_name = "sha256_hash";
+
+                prefix = "BY";
+                password = true;
+                if (children.size() == 2)
+                    salt = true;
+                break;
+            }
+            case AuthenticationType::DOUBLE_SHA1_PASSWORD:
+            {
+                if (contains_hash)
+                    auth_type_name = "double_sha1_hash";
+
+                prefix = "BY";
+                password = true;
+                break;
+            }
+            case AuthenticationType::LDAP:
+            {
+                prefix = "SERVER";
+                parameter = true;
+                break;
+            }
+            case AuthenticationType::KERBEROS:
+            {
+                if (!children.empty())
+                {
+                    prefix = "REALM";
+                    parameter = true;
+                }
+                break;
+            }
+            case AuthenticationType::SSL_CERTIFICATE:
+            {
+                prefix = "CN";
+                parameters = true;
+                break;
+            }
+            case AuthenticationType::BCRYPT_PASSWORD:
+            {
+                if (contains_hash)
+                    auth_type_name = "bcrypt_hash";
+
+                prefix = "BY";
+                password = true;
+                break;
+            }
+            case AuthenticationType::NO_PASSWORD: [[fallthrough]];
+            case AuthenticationType::MAX:
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "AST: Unexpected authentication type {}", toString(*type));
+        }
+    }
+    else
+    {
+        /// Default password type
+        prefix = "BY";
+        password = true;
+    }
+
+    if (password && !settings.show_secrets)
+    {
+        prefix = "";
+        password = false;
+        salt = false;
+        if (type)
+            auth_type_name = AuthenticationTypeInfo::get(*type).name;
+    }
+
+    settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " IDENTIFIED" << (settings.hilite ? IAST::hilite_none : "");
+
+    if (!auth_type_name.empty())
+    {
+        settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " WITH " << auth_type_name
+                        << (settings.hilite ? IAST::hilite_none : "");
+    }
+
+    if (!prefix.empty())
+    {
+        settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " " << prefix << (settings.hilite ? IAST::hilite_none : "");
+    }
+
+    if (password)
+    {
+        settings.ostr << " ";
+        children[0]->format(settings);
+    }
+
+    if (salt)
+    {
+        settings.ostr << " SALT ";
+        children[1]->format(settings);
+    }
+
+    if (parameter)
+    {
+        settings.ostr << " ";
+        children[0]->format(settings);
+    }
+    else if (parameters)
+    {
+        settings.ostr << " ";
+        bool need_comma = false;
+        for (const auto & child : children)
+        {
+            if (std::exchange(need_comma, true))
+                settings.ostr << ", ";
+            child->format(settings);
+        }
+    }
+}
+
+bool ASTAuthenticationData::hasSecretParts() const
+{
+    /// Default password type is used hence secret part
+    if (!type)
+        return true;
+
+    auto auth_type = *type;
+    if ((auth_type == AuthenticationType::PLAINTEXT_PASSWORD)
+        || (auth_type == AuthenticationType::SHA256_PASSWORD)
+        || (auth_type == AuthenticationType::DOUBLE_SHA1_PASSWORD))
+        return true;
+
+    return childrenHaveSecretParts();
+}
+
+}
diff --git a/src/Parsers/Access/ASTAuthenticationData.h b/src/Parsers/Access/ASTAuthenticationData.h
new file mode 100644
index 00000000000..de166bdf234
--- /dev/null
+++ b/src/Parsers/Access/ASTAuthenticationData.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <Parsers/IAST.h>
+#include <Access/Common/AuthenticationType.h>
+#include <optional>
+
+
+namespace DB
+{
+
+/** Represents authentication data in CREATE/ALTER USER query:
+  *  ... IDENTIFIED WITH sha256_password BY 'password'
+  *
+  * Can store password, hash and salt, LDAP server name, Kerberos Realm, or common names.
+  * They are stored in children vector as ASTLiteral or ASTQueryParameter.
+  * ASTAuthenticationData without a type represents authentication data with
+  *  the default password type that will be later inferred from the server parameters.
+  */
+
+class ASTAuthenticationData : public IAST
+{
+public:
+    String getID(char) const override { return "AuthenticationData"; }
+
+    ASTPtr clone() const override
+    {
+        auto clone = std::make_shared<ASTAuthenticationData>(*this);
+        clone->cloneChildren();
+        return clone;
+    }
+
+    bool hasSecretParts() const override;
+
+    std::optional<String> getPassword() const;
+    std::optional<String> getSalt() const;
+
+    /// If type is empty we use the default password type.
+    /// AuthenticationType::NO_PASSWORD is specified explicitly.
+    std::optional<AuthenticationType> type;
+
+    bool contains_password = false;
+    bool contains_hash = false;
+
+protected:
+    void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
+};
+
+}
diff --git a/src/Parsers/Access/ASTCreateUserQuery.cpp b/src/Parsers/Access/ASTCreateUserQuery.cpp
index b0d4aef38b8..0611545adf0 100644
--- a/src/Parsers/Access/ASTCreateUserQuery.cpp
+++ b/src/Parsers/Access/ASTCreateUserQuery.cpp
@@ -2,17 +2,13 @@
 #include <Parsers/Access/ASTRolesOrUsersSet.h>
 #include <Parsers/Access/ASTSettingsProfileElement.h>
 #include <Parsers/Access/ASTUserNameWithHost.h>
+#include <Parsers/Access/ASTAuthenticationData.h>
 #include <Common/quoteString.h>
 #include <IO/Operators.h>
 
 
 namespace DB
 {
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 
 namespace
 {
@@ -23,122 +19,9 @@ namespace
     }
 
 
-    void formatAuthenticationData(const AuthenticationData & auth_data, const IAST::FormatSettings & settings)
+    void formatAuthenticationData(const ASTAuthenticationData & auth_data, const IAST::FormatSettings & settings)
     {
-        auto auth_type = auth_data.getType();
-        if (auth_type == AuthenticationType::NO_PASSWORD)
-        {
-            settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " NOT IDENTIFIED"
-                          << (settings.hilite ? IAST::hilite_none : "");
-            return;
-        }
-
-        String auth_type_name = AuthenticationTypeInfo::get(auth_type).name;
-        String prefix; /// "BY" or "SERVER" or "REALM"
-        std::optional<String> password; /// either a password or hash
-        std::optional<String> salt;
-        std::optional<String> parameter;
-        const boost::container::flat_set<String> * parameters = nullptr;
-
-        switch (auth_type)
-        {
-            case AuthenticationType::PLAINTEXT_PASSWORD:
-            {
-                prefix = "BY";
-                password = auth_data.getPassword();
-                break;
-            }
-            case AuthenticationType::SHA256_PASSWORD:
-            {
-                auth_type_name = "sha256_hash";
-                prefix = "BY";
-                password = auth_data.getPasswordHashHex();
-                if (!auth_data.getSalt().empty())
-                    salt = auth_data.getSalt();
-                break;
-            }
-            case AuthenticationType::DOUBLE_SHA1_PASSWORD:
-            {
-                auth_type_name = "double_sha1_hash";
-                prefix = "BY";
-                password = auth_data.getPasswordHashHex();
-                break;
-            }
-            case AuthenticationType::LDAP:
-            {
-                prefix = "SERVER";
-                parameter = auth_data.getLDAPServerName();
-                break;
-            }
-            case AuthenticationType::KERBEROS:
-            {
-                const auto & realm = auth_data.getKerberosRealm();
-                if (!realm.empty())
-                {
-                    prefix = "REALM";
-                    parameter = realm;
-                }
-                break;
-            }
-
-            case AuthenticationType::SSL_CERTIFICATE:
-            {
-                prefix = "CN";
-                parameters = &auth_data.getSSLCertificateCommonNames();
-                break;
-            }
-
-            case AuthenticationType::NO_PASSWORD: [[fallthrough]];
-            case AuthenticationType::MAX:
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "AST: Unexpected authentication type {}", toString(auth_type));
-        }
-
-        if (password && !settings.show_secrets)
-        {
-            prefix = "";
-            password.reset();
-            salt.reset();
-            auth_type_name = AuthenticationTypeInfo::get(auth_type).name;
-        }
-
-        settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " IDENTIFIED" << (settings.hilite ? IAST::hilite_none : "");
-
-        if (!auth_type_name.empty())
-        {
-            settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " WITH " << auth_type_name
-                          << (settings.hilite ? IAST::hilite_none : "");
-        }
-
-        if (!prefix.empty())
-        {
-            settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " " << prefix << (settings.hilite ? IAST::hilite_none : "");
-        }
-
-        if (password)
-        {
-            settings.ostr << " " << quoteString(*password);
-        }
-
-        if (salt)
-        {
-            settings.ostr << " SALT " << quoteString(*salt);
-        }
-
-        if (parameter)
-        {
-            settings.ostr << " " << quoteString(*parameter);
-        }
-        else if (parameters)
-        {
-            settings.ostr << " ";
-            bool need_comma = false;
-            for (const auto & param : *parameters)
-            {
-                if (std::exchange(need_comma, true))
-                    settings.ostr << ", ";
-                settings.ostr << quoteString(param);
-            }
-        }
+        auth_data.format(settings);
     }
 
 
@@ -276,6 +159,7 @@ String ASTCreateUserQuery::getID(char) const
 ASTPtr ASTCreateUserQuery::clone() const
 {
     auto res = std::make_shared<ASTCreateUserQuery>(*this);
+    res->children.clear();
 
     if (names)
         res->names = std::static_pointer_cast<ASTUserNamesWithHost>(names->clone());
@@ -292,6 +176,12 @@ ASTPtr ASTCreateUserQuery::clone() const
     if (settings)
         res->settings = std::static_pointer_cast<ASTSettingsProfileElements>(settings->clone());
 
+    if (auth_data)
+    {
+        res->auth_data = std::static_pointer_cast<ASTAuthenticationData>(auth_data->clone());
+        res->children.push_back(res->auth_data);
+    }
+
     return res;
 }
 
@@ -346,17 +236,4 @@ void ASTCreateUserQuery::formatImpl(const FormatSettings & format, FormatState &
         formatGrantees(*grantees, format);
 }
 
-bool ASTCreateUserQuery::hasSecretParts() const
-{
-    if (auth_data)
-    {
-        auto auth_type = auth_data->getType();
-        if ((auth_type == AuthenticationType::PLAINTEXT_PASSWORD)
-            || (auth_type == AuthenticationType::SHA256_PASSWORD)
-            || (auth_type == AuthenticationType::DOUBLE_SHA1_PASSWORD))
-            return true;
-    }
-    return childrenHaveSecretParts();
-}
-
 }
diff --git a/src/Parsers/Access/ASTCreateUserQuery.h b/src/Parsers/Access/ASTCreateUserQuery.h
index a3571dd6c61..62ddbfd0040 100644
--- a/src/Parsers/Access/ASTCreateUserQuery.h
+++ b/src/Parsers/Access/ASTCreateUserQuery.h
@@ -3,7 +3,7 @@
 #include <Parsers/IAST.h>
 #include <Parsers/ASTQueryWithOnCluster.h>
 #include <Parsers/ASTDatabaseOrNone.h>
-#include <Access/Common/AuthenticationData.h>
+#include <Access/Common/AuthenticationType.h>
 #include <Access/Common/AllowedClientHosts.h>
 
 
@@ -13,6 +13,8 @@ class ASTUserNamesWithHost;
 class ASTRolesOrUsersSet;
 class ASTDatabaseOrNone;
 class ASTSettingsProfileElements;
+class ASTAuthenticationData;
+
 
 /** CREATE USER [IF NOT EXISTS | OR REPLACE] name
   *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}]
@@ -44,9 +46,7 @@ public:
     std::shared_ptr<ASTUserNamesWithHost> names;
     std::optional<String> new_name;
 
-    std::optional<AuthenticationData> auth_data;
-
-    mutable std::optional<String> temporary_password_for_checks;
+    std::shared_ptr<ASTAuthenticationData> auth_data;
 
     std::optional<AllowedClientHosts> hosts;
     std::optional<AllowedClientHosts> add_hosts;
@@ -61,7 +61,6 @@ public:
     String getID(char) const override;
     ASTPtr clone() const override;
     void formatImpl(const FormatSettings & format, FormatState &, FormatStateStacked) const override;
-    bool hasSecretParts() const override;
     ASTPtr getRewrittenASTWithoutOnCluster(const WithoutOnClusterASTRewriteParams &) const override { return removeOnCluster<ASTCreateUserQuery>(clone()); }
 
     QueryKind getQueryKind() const override { return QueryKind::Create; }
diff --git a/src/Parsers/Access/ASTGrantQuery.cpp b/src/Parsers/Access/ASTGrantQuery.cpp
index f92541ec672..331f1798d77 100644
--- a/src/Parsers/Access/ASTGrantQuery.cpp
+++ b/src/Parsers/Access/ASTGrantQuery.cpp
@@ -27,21 +27,28 @@ namespace
     }
 
 
-    void formatONClause(const String & database, bool any_database, const String & table, bool any_table, const IAST::FormatSettings & settings)
+    void formatONClause(const AccessRightsElement & element, const IAST::FormatSettings & settings)
     {
         settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << "ON " << (settings.hilite ? IAST::hilite_none : "");
-        if (any_database)
+        if (element.isGlobalWithParameter())
+        {
+            if (element.any_parameter)
+                settings.ostr << "*";
+            else
+                settings.ostr << backQuoteIfNeed(element.parameter);
+        }
+        else if (element.any_database)
         {
             settings.ostr << "*.*";
         }
         else
         {
-            if (!database.empty())
-                settings.ostr << backQuoteIfNeed(database) << ".";
-            if (any_table)
+            if (!element.database.empty())
+                settings.ostr << backQuoteIfNeed(element.database) << ".";
+            if (element.any_table)
                 settings.ostr << "*";
             else
-                settings.ostr << backQuoteIfNeed(table);
+                settings.ostr << backQuoteIfNeed(element.table);
         }
     }
 
@@ -70,15 +77,16 @@ namespace
             if (i != elements.size() - 1)
             {
                 const auto & next_element = elements[i + 1];
-                if ((element.database == next_element.database) && (element.any_database == next_element.any_database)
-                    && (element.table == next_element.table) && (element.any_table == next_element.any_table))
+                if (element.sameDatabaseAndTableAndParameter(next_element))
+                {
                     next_element_on_same_db_and_table = true;
+                }
             }
 
             if (!next_element_on_same_db_and_table)
             {
                 settings.ostr << " ";
-                formatONClause(element.database, element.any_database, element.table, element.any_table, settings);
+                formatONClause(element, settings);
             }
         }
 
@@ -111,7 +119,6 @@ ASTPtr ASTGrantQuery::clone() const
 void ASTGrantQuery::formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
 {
     settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << (attach_mode ? "ATTACH " : "")
-                  << (settings.hilite ? hilite_keyword : "") << ((!is_revoke && (replace_access || replace_granted_roles)) ? "REPLACE " : "") << (settings.hilite ? hilite_none : "")
                   << (settings.hilite ? hilite_keyword : "") << (is_revoke ? "REVOKE" : "GRANT")
                   << (settings.hilite ? IAST::hilite_none : "");
 
@@ -140,6 +147,8 @@ void ASTGrantQuery::formatImpl(const FormatSettings & settings, FormatState &, F
                             "ASTGrantQuery can contain either roles or access rights elements "
                             "to grant or revoke, not both of them");
     }
+    else if (current_grants)
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << " CURRENT GRANTS" << (settings.hilite ? hilite_none : "");
     else
         formatElementsWithoutOptions(access_rights_elements, settings);
 
@@ -153,6 +162,9 @@ void ASTGrantQuery::formatImpl(const FormatSettings & settings, FormatState &, F
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " WITH GRANT OPTION" << (settings.hilite ? hilite_none : "");
         else if (admin_option)
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " WITH ADMIN OPTION" << (settings.hilite ? hilite_none : "");
+
+        if (replace_access || replace_granted_roles)
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " WITH REPLACE OPTION" << (settings.hilite ? hilite_none : "");
     }
 }
 
diff --git a/src/Parsers/Access/ASTGrantQuery.h b/src/Parsers/Access/ASTGrantQuery.h
index 8c7df3cd57e..2ccbac3dac8 100644
--- a/src/Parsers/Access/ASTGrantQuery.h
+++ b/src/Parsers/Access/ASTGrantQuery.h
@@ -26,6 +26,8 @@ public:
     bool admin_option = false;
     bool replace_access = false;
     bool replace_granted_roles = false;
+    bool current_grants = false;
+
     std::shared_ptr<ASTRolesOrUsersSet> grantees;
 
     String getID(char) const override;
diff --git a/src/Parsers/Access/ASTRowPolicyName.cpp b/src/Parsers/Access/ASTRowPolicyName.cpp
index 4edfa61f10e..81a90de9d53 100644
--- a/src/Parsers/Access/ASTRowPolicyName.cpp
+++ b/src/Parsers/Access/ASTRowPolicyName.cpp
@@ -30,6 +30,11 @@ void ASTRowPolicyName::replaceEmptyDatabase(const String & current_database)
         full_name.database = current_database;
 }
 
+String ASTRowPolicyNames::tableOrAsterisk(const String & table_name) const
+{
+    return table_name == RowPolicyName::ANY_TABLE_MARK ? "*" : backQuoteIfNeed(table_name);
+}
+
 
 void ASTRowPolicyNames::formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
 {
@@ -73,7 +78,7 @@ void ASTRowPolicyNames::formatImpl(const FormatSettings & settings, FormatState
             const String & table_name = full_name.table_name;
             if (!database.empty())
                 settings.ostr << backQuoteIfNeed(database) + ".";
-            settings.ostr << backQuoteIfNeed(table_name);
+            settings.ostr << tableOrAsterisk(table_name);
         }
     }
     else if (same_db_and_table_name)
@@ -92,7 +97,7 @@ void ASTRowPolicyNames::formatImpl(const FormatSettings & settings, FormatState
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " ON " << (settings.hilite ? hilite_none : "");
         if (!database.empty())
             settings.ostr << backQuoteIfNeed(database) + ".";
-        settings.ostr << backQuoteIfNeed(table_name);
+        settings.ostr << tableOrAsterisk(table_name);
     }
     else
     {
@@ -108,7 +113,7 @@ void ASTRowPolicyNames::formatImpl(const FormatSettings & settings, FormatState
                           << (settings.hilite ? hilite_none : "");
             if (!database.empty())
                 settings.ostr << backQuoteIfNeed(database) + ".";
-            settings.ostr << backQuoteIfNeed(table_name);
+            settings.ostr << tableOrAsterisk(table_name);
         }
     }
 
diff --git a/src/Parsers/Access/ASTRowPolicyName.h b/src/Parsers/Access/ASTRowPolicyName.h
index 9f4848bd612..86171475a0a 100644
--- a/src/Parsers/Access/ASTRowPolicyName.h
+++ b/src/Parsers/Access/ASTRowPolicyName.h
@@ -45,5 +45,8 @@ public:
     ASTPtr getRewrittenASTWithoutOnCluster(const WithoutOnClusterASTRewriteParams &) const override { return removeOnCluster<ASTRowPolicyNames>(clone()); }
 
     void replaceEmptyDatabase(const String & current_database);
+
+private:
+    String tableOrAsterisk(const String & table_name) const;
 };
 }
diff --git a/src/Parsers/Access/ASTSettingsProfileElement.cpp b/src/Parsers/Access/ASTSettingsProfileElement.cpp
index 76973c428b2..7b29b15cb29 100644
--- a/src/Parsers/Access/ASTSettingsProfileElement.cpp
+++ b/src/Parsers/Access/ASTSettingsProfileElement.cpp
@@ -35,21 +35,21 @@ void ASTSettingsProfileElement::formatImpl(const FormatSettings & settings, Form
 
     formatSettingName(setting_name, settings.ostr);
 
-    if (!value.isNull())
+    if (value)
     {
-        settings.ostr << " = " << applyVisitor(FieldVisitorToString{}, value);
+        settings.ostr << " = " << applyVisitor(FieldVisitorToString{}, *value);
     }
 
-    if (!min_value.isNull())
+    if (min_value)
     {
         settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " MIN " << (settings.hilite ? IAST::hilite_none : "")
-                      << applyVisitor(FieldVisitorToString{}, min_value);
+                      << applyVisitor(FieldVisitorToString{}, *min_value);
     }
 
-    if (!max_value.isNull())
+    if (max_value)
     {
         settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " MAX " << (settings.hilite ? IAST::hilite_none : "")
-                      << applyVisitor(FieldVisitorToString{}, max_value);
+                      << applyVisitor(FieldVisitorToString{}, *max_value);
     }
 
     if (writability)
diff --git a/src/Parsers/Access/ASTSettingsProfileElement.h b/src/Parsers/Access/ASTSettingsProfileElement.h
index 275257e4f8e..13c1926d9b0 100644
--- a/src/Parsers/Access/ASTSettingsProfileElement.h
+++ b/src/Parsers/Access/ASTSettingsProfileElement.h
@@ -14,9 +14,9 @@ class ASTSettingsProfileElement : public IAST
 public:
     String parent_profile;
     String setting_name;
-    Field value;
-    Field min_value;
-    Field max_value;
+    std::optional<Field> value;
+    std::optional<Field> min_value;
+    std::optional<Field> max_value;
     std::optional<SettingConstraintWritability> writability;
     bool id_mode = false;  /// If true then `parent_profile` keeps UUID, not a name.
     bool use_inherit_keyword = false;  /// If true then this element is a part of ASTCreateSettingsProfileQuery.
diff --git a/src/Parsers/Access/ParserCreateQuotaQuery.cpp b/src/Parsers/Access/ParserCreateQuotaQuery.cpp
index a67051be398..2330ba7771c 100644
--- a/src/Parsers/Access/ParserCreateQuotaQuery.cpp
+++ b/src/Parsers/Access/ParserCreateQuotaQuery.cpp
@@ -1,20 +1,21 @@
-#include <Parsers/Access/ParserCreateQuotaQuery.h>
-#include <Parsers/Access/ASTCreateQuotaQuery.h>
-#include <Parsers/Access/ASTRolesOrUsersSet.h>
-#include <Parsers/Access/ParserRolesOrUsersSet.h>
+#include <IO/ReadHelpers.h>
 #include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/Access/ASTCreateQuotaQuery.h>
+#include <Parsers/Access/ASTRolesOrUsersSet.h>
+#include <Parsers/Access/ParserCreateQuotaQuery.h>
+#include <Parsers/Access/ParserRolesOrUsersSet.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ExpressionListParsers.h>
-#include <Parsers/parseIntervalKind.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
-#include <Common/FieldVisitorConvertToNumber.h>
+#include <Parsers/parseIntervalKind.h>
 #include <base/range.h>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/algorithm/string/trim.hpp>
+#include <Common/FieldVisitorConvertToNumber.h>
 
 
 namespace DB
@@ -82,7 +83,7 @@ namespace
         {
             for (auto qt : collections::range(QuotaType::MAX))
             {
-                if (ParserKeyword{QuotaTypeInfo::get(qt).keyword.c_str()}.ignore(pos, expected))
+                if (ParserKeyword{QuotaTypeInfo::get(qt).keyword}.ignore(pos, expected))
                 {
                     quota_type = qt;
                     return true;
@@ -107,23 +108,30 @@ namespace
         });
     }
 
+    template <typename T, typename = std::enable_if_t<std::is_same_v<T, double> || std::is_same_v<T, QuotaValue>>>
+    T fieldToNumber(const Field & f)
+    {
+        if (f.getType() == Field::Types::String)
+            return parseWithSizeSuffix<QuotaValue>(boost::algorithm::trim_copy(f.get<std::string>()));
+        else
+            return applyVisitor(FieldVisitorConvertToNumber<T>(), f);
+    }
 
     bool parseMaxValue(IParserBase::Pos & pos, Expected & expected, QuotaType quota_type, QuotaValue & max_value)
     {
         ASTPtr ast;
-        if (!ParserNumber{}.parse(pos, ast, expected))
+        if (!ParserNumber{}.parse(pos, ast, expected) && !ParserStringLiteral{}.parse(pos, ast, expected))
             return false;
 
         const Field & max_field = ast->as<ASTLiteral &>().value;
         const auto & type_info = QuotaTypeInfo::get(quota_type);
         if (type_info.output_denominator == 1)
-            max_value = applyVisitor(FieldVisitorConvertToNumber<QuotaValue>(), max_field);
+            max_value = fieldToNumber<QuotaValue>(max_field);
         else
-            max_value = static_cast<QuotaValue>(applyVisitor(FieldVisitorConvertToNumber<double>(), max_field) * type_info.output_denominator);
+            max_value = static_cast<QuotaValue>(fieldToNumber<double>(max_field) * type_info.output_denominator);
         return true;
     }
 
-
     bool parseLimits(IParserBase::Pos & pos, Expected & expected, std::vector<std::pair<QuotaType, QuotaValue>> & limits)
     {
         std::vector<std::pair<QuotaType, QuotaValue>> res_limits;
diff --git a/src/Parsers/Access/ParserCreateUserQuery.cpp b/src/Parsers/Access/ParserCreateUserQuery.cpp
index de83c5760c1..0344fb99c04 100644
--- a/src/Parsers/Access/ParserCreateUserQuery.cpp
+++ b/src/Parsers/Access/ParserCreateUserQuery.cpp
@@ -3,6 +3,7 @@
 #include <Parsers/Access/ASTRolesOrUsersSet.h>
 #include <Parsers/Access/ASTSettingsProfileElement.h>
 #include <Parsers/Access/ASTUserNameWithHost.h>
+#include <Parsers/Access/ASTAuthenticationData.h>
 #include <Parsers/Access/ParserRolesOrUsersSet.h>
 #include <Parsers/Access/ParserSettingsProfileElement.h>
 #include <Parsers/Access/ParserUserNameWithHost.h>
@@ -17,21 +18,11 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <base/insertAtEnd.h>
 #include "config.h"
-#include <Common/hex.h>
-#if USE_SSL
-#     include <openssl/crypto.h>
-#     include <openssl/rand.h>
-#     include <openssl/err.h>
-#endif
+
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int OPENSSL_ERROR;
-}
-
 namespace
 {
     bool parseRenameTo(IParserBase::Pos & pos, Expected & expected, std::optional<String> & new_name)
@@ -50,14 +41,29 @@ namespace
         });
     }
 
+    class ParserStringAndSubstitution : public IParserBase
+    {
+    private:
+        const char * getName() const override { return "ParserStringAndSubstitution"; }
+        bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override
+        {
+            return ParserStringLiteral{}.parse(pos, node, expected) || ParserSubstitution{}.parse(pos, node, expected);
+        }
 
-    bool parseAuthenticationData(IParserBase::Pos & pos, Expected & expected, AuthenticationData & auth_data, std::optional<String> & temporary_password_for_checks)
+    public:
+        explicit ParserStringAndSubstitution() = default;
+    };
+
+
+    bool parseAuthenticationData(IParserBase::Pos & pos, Expected & expected, std::shared_ptr<ASTAuthenticationData> & auth_data)
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
             if (ParserKeyword{"NOT IDENTIFIED"}.ignore(pos, expected))
             {
-                auth_data = AuthenticationData{AuthenticationType::NO_PASSWORD};
+                auth_data = std::make_shared<ASTAuthenticationData>();
+                auth_data->type = AuthenticationType::NO_PASSWORD;
+
                 return true;
             }
 
@@ -65,6 +71,7 @@ namespace
                 return false;
 
             std::optional<AuthenticationType> type;
+
             bool expect_password = false;
             bool expect_hash = false;
             bool expect_ldap_server_name = false;
@@ -104,52 +111,48 @@ namespace
                         type = AuthenticationType::DOUBLE_SHA1_PASSWORD;
                         expect_hash = true;
                     }
+                    else if (ParserKeyword{"BCRYPT_HASH"}.ignore(pos, expected))
+                    {
+                        type = AuthenticationType::BCRYPT_PASSWORD;
+                        expect_hash = true;
+                    }
                     else
                         return false;
                 }
             }
 
+            /// If authentication type is not specified, then the default password type is used
             if (!type)
-            {
-                type = AuthenticationType::SHA256_PASSWORD;
                 expect_password = true;
-            }
 
-            String value;
-            String parsed_salt;
-            boost::container::flat_set<String> common_names;
+            ASTPtr value;
+            ASTPtr parsed_salt;
+            ASTPtr common_names;
             if (expect_password || expect_hash)
             {
-                ASTPtr ast;
-                if (!ParserKeyword{"BY"}.ignore(pos, expected) || !ParserStringLiteral{}.parse(pos, ast, expected))
+                if (!ParserKeyword{"BY"}.ignore(pos, expected) || !ParserStringAndSubstitution{}.parse(pos, value, expected))
                     return false;
-                value = ast->as<const ASTLiteral &>().value.safeGet<String>();
 
                 if (expect_hash && type == AuthenticationType::SHA256_PASSWORD)
                 {
-                    if (ParserKeyword{"SALT"}.ignore(pos, expected) && ParserStringLiteral{}.parse(pos, ast, expected))
+                    if (ParserKeyword{"SALT"}.ignore(pos, expected))
                     {
-                        parsed_salt = ast->as<const ASTLiteral &>().value.safeGet<String>();
+                        if (!ParserStringAndSubstitution{}.parse(pos, parsed_salt, expected))
+                            return false;
                     }
                 }
             }
             else if (expect_ldap_server_name)
             {
-                ASTPtr ast;
-                if (!ParserKeyword{"SERVER"}.ignore(pos, expected) || !ParserStringLiteral{}.parse(pos, ast, expected))
+                if (!ParserKeyword{"SERVER"}.ignore(pos, expected) || !ParserStringAndSubstitution{}.parse(pos, value, expected))
                     return false;
-
-                value = ast->as<const ASTLiteral &>().value.safeGet<String>();
             }
             else if (expect_kerberos_realm)
             {
                 if (ParserKeyword{"REALM"}.ignore(pos, expected))
                 {
-                    ASTPtr ast;
-                    if (!ParserStringLiteral{}.parse(pos, ast, expected))
+                    if (!ParserStringAndSubstitution{}.parse(pos, value, expected))
                         return false;
-
-                    value = ast->as<const ASTLiteral &>().value.safeGet<String>();
                 }
             }
             else if (expect_common_names)
@@ -157,63 +160,24 @@ namespace
                 if (!ParserKeyword{"CN"}.ignore(pos, expected))
                     return false;
 
-                ASTPtr ast;
-                if (!ParserList{std::make_unique<ParserStringLiteral>(), std::make_unique<ParserToken>(TokenType::Comma), false}.parse(pos, ast, expected))
+                if (!ParserList{std::make_unique<ParserStringAndSubstitution>(), std::make_unique<ParserToken>(TokenType::Comma), false}.parse(pos, common_names, expected))
                     return false;
-
-                for (const auto & ast_child : ast->children)
-                    common_names.insert(ast_child->as<const ASTLiteral &>().value.safeGet<String>());
             }
 
-            /// Save password separately for future complexity rules check
-            if (expect_password)
-                temporary_password_for_checks = value;
+            auth_data = std::make_shared<ASTAuthenticationData>();
 
-            auth_data = AuthenticationData{*type};
-            if (auth_data.getType() == AuthenticationType::SHA256_PASSWORD)
-            {
-                if (!parsed_salt.empty())
-                {
-                    auth_data.setSalt(parsed_salt);
-                }
-                else if (expect_password)
-                {
-#if USE_SSL
-                    ///generate and add salt here
-                    ///random generator FIPS complaint
-                    uint8_t key[32];
-                    if (RAND_bytes(key, sizeof(key)) != 1)
-                    {
-                        char buf[512] = {0};
-                        ERR_error_string_n(ERR_get_error(), buf, sizeof(buf));
-                        throw Exception(ErrorCodes::OPENSSL_ERROR, "Cannot generate salt for password. OpenSSL {}", buf);
-                    }
+            auth_data->type = type;
+            auth_data->contains_password = expect_password;
+            auth_data->contains_hash = expect_hash;
 
-                    String salt;
-                    salt.resize(sizeof(key) * 2);
-                    char * buf_pos = salt.data();
-                    for (uint8_t k : key)
-                    {
-                        writeHexByteUppercase(k, buf_pos);
-                        buf_pos += 2;
-                    }
-                    value.append(salt);
-                    auth_data.setSalt(salt);
-#else
-                    ///if USE_SSL is not defined, Exception thrown later
-#endif
-                }
-            }
-            if (expect_password)
-                auth_data.setPassword(value);
-            else if (expect_hash)
-                auth_data.setPasswordHashHex(value);
-            else if (expect_ldap_server_name)
-                auth_data.setLDAPServerName(value);
-            else if (expect_kerberos_realm)
-                auth_data.setKerberosRealm(value);
-            else if (expect_common_names)
-                auth_data.setSSLCertificateCommonNames(std::move(common_names));
+            if (value)
+                auth_data->children.push_back(std::move(value));
+
+            if (parsed_salt)
+                auth_data->children.push_back(std::move(parsed_salt));
+
+            if (common_names)
+                auth_data->children = std::move(common_names->children);
 
             return true;
         });
@@ -441,11 +405,10 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     auto names_ref = names->names;
 
     std::optional<String> new_name;
-    std::optional<AuthenticationData> auth_data;
-    std::optional<String> temporary_password_for_checks;
     std::optional<AllowedClientHosts> hosts;
     std::optional<AllowedClientHosts> add_hosts;
     std::optional<AllowedClientHosts> remove_hosts;
+    std::shared_ptr<ASTAuthenticationData> auth_data;
     std::shared_ptr<ASTRolesOrUsersSet> default_roles;
     std::shared_ptr<ASTSettingsProfileElements> settings;
     std::shared_ptr<ASTRolesOrUsersSet> grantees;
@@ -456,12 +419,10 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     {
         if (!auth_data)
         {
-            AuthenticationData new_auth_data;
-            std::optional<String> new_temporary_password_for_checks;
-            if (parseAuthenticationData(pos, expected, new_auth_data, new_temporary_password_for_checks))
+            std::shared_ptr<ASTAuthenticationData> new_auth_data;
+            if (parseAuthenticationData(pos, expected, new_auth_data))
             {
                 auth_data = std::move(new_auth_data);
-                temporary_password_for_checks = std::move(new_temporary_password_for_checks);
                 continue;
             }
         }
@@ -546,7 +507,6 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     query->names = std::move(names);
     query->new_name = std::move(new_name);
     query->auth_data = std::move(auth_data);
-    query->temporary_password_for_checks = std::move(temporary_password_for_checks);
     query->hosts = std::move(hosts);
     query->add_hosts = std::move(add_hosts);
     query->remove_hosts = std::move(remove_hosts);
@@ -555,6 +515,9 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     query->grantees = std::move(grantees);
     query->default_database = std::move(default_database);
 
+    if (query->auth_data)
+        query->children.push_back(query->auth_data);
+
     return true;
 }
 }
diff --git a/src/Parsers/Access/ParserDropAccessEntityQuery.cpp b/src/Parsers/Access/ParserDropAccessEntityQuery.cpp
index 1a6784d2d3c..d21164bc1a2 100644
--- a/src/Parsers/Access/ParserDropAccessEntityQuery.cpp
+++ b/src/Parsers/Access/ParserDropAccessEntityQuery.cpp
@@ -17,8 +17,8 @@ namespace
         for (auto i : collections::range(AccessEntityType::MAX))
         {
             const auto & type_info = AccessEntityTypeInfo::get(i);
-            if (ParserKeyword{type_info.name.c_str()}.ignore(pos, expected)
-                || (!type_info.alias.empty() && ParserKeyword{type_info.alias.c_str()}.ignore(pos, expected)))
+            if (ParserKeyword{type_info.name}.ignore(pos, expected)
+                || (!type_info.alias.empty() && ParserKeyword{type_info.alias}.ignore(pos, expected)))
             {
                 type = i;
                 return true;
diff --git a/src/Parsers/Access/ParserGrantQuery.cpp b/src/Parsers/Access/ParserGrantQuery.cpp
index 2211969c61e..f495cb60786 100644
--- a/src/Parsers/Access/ParserGrantQuery.cpp
+++ b/src/Parsers/Access/ParserGrantQuery.cpp
@@ -43,7 +43,6 @@ namespace
             {
                 if (!str.empty())
                     str += " ";
-                std::string_view word{pos->begin, pos->size()};
                 str += std::string_view(pos->begin, pos->size());
                 ++pos;
             }
@@ -123,13 +122,40 @@ namespace
                 if (!parseAccessFlagsWithColumns(pos, expected, access_and_columns))
                     return false;
 
+                String database_name, table_name, parameter;
+                bool any_database = false, any_table = false, any_parameter = false;
+
+                size_t is_global_with_parameter = 0;
+                for (const auto & elem : access_and_columns)
+                {
+                    if (elem.first.isGlobalWithParameter())
+                        ++is_global_with_parameter;
+                }
+
                 if (!ParserKeyword{"ON"}.ignore(pos, expected))
                     return false;
 
-                String database_name, table_name;
-                bool any_database = false, any_table = false;
-                if (!parseDatabaseAndTableNameOrAsterisks(pos, expected, database_name, any_database, table_name, any_table))
+                if (is_global_with_parameter && is_global_with_parameter == access_and_columns.size())
+                {
+                    ASTPtr parameter_ast;
+                    if (ParserToken{TokenType::Asterisk}.ignore(pos, expected))
+                    {
+                        any_parameter = true;
+                    }
+                    else if (ParserIdentifier{}.parse(pos, parameter_ast, expected))
+                    {
+                        any_parameter = false;
+                        parameter = getIdentifierName(parameter_ast);
+                    }
+                    else
+                        return false;
+
+                    any_database = any_table = true;
+                }
+                else if (!parseDatabaseAndTableNameOrAsterisks(pos, expected, database_name, any_database, table_name, any_table))
+                {
                     return false;
+                }
 
                 for (auto & [access_flags, columns] : access_and_columns)
                 {
@@ -140,7 +166,9 @@ namespace
                     element.any_database = any_database;
                     element.database = database_name;
                     element.any_table = any_table;
+                    element.any_parameter = any_parameter;
                     element.table = table_name;
+                    element.parameter = parameter;
                     res_elements.emplace_back(std::move(element));
                 }
 
@@ -155,6 +183,37 @@ namespace
         });
     }
 
+    bool parseCurrentGrants(IParser::Pos & pos, Expected & expected, AccessRightsElements & elements)
+    {
+        if (ParserToken(TokenType::OpeningRoundBracket).ignore(pos, expected))
+        {
+            if (!parseElementsWithoutOptions(pos, expected, elements))
+                return false;
+
+            if (!ParserToken(TokenType::ClosingRoundBracket).ignore(pos, expected))
+                return false;
+        }
+        else
+        {
+            AccessRightsElement default_element(AccessType::ALL);
+
+            if (!ParserKeyword{"ON"}.ignore(pos, expected))
+                return false;
+
+            String database_name, table_name;
+            bool any_database = false, any_table = false;
+            if (!parseDatabaseAndTableNameOrAsterisks(pos, expected, database_name, any_database, table_name, any_table))
+                return false;
+
+            default_element.any_database = any_database;
+            default_element.database = database_name;
+            default_element.any_table = any_table;
+            default_element.table = table_name;
+            elements.push_back(std::move(default_element));
+        }
+
+        return true;
+    }
 
     void throwIfNotGrantable(AccessRightsElements & elements)
     {
@@ -173,6 +232,8 @@ namespace
                 throw Exception(ErrorCodes::INVALID_GRANT, "{} cannot be granted on the table level", old_flags.toString());
             else if (!element.any_database)
                 throw Exception(ErrorCodes::INVALID_GRANT, "{} cannot be granted on the database level", old_flags.toString());
+            else if (!element.any_parameter)
+                throw Exception(ErrorCodes::INVALID_GRANT, "{} cannot be granted on the global with parameter level", old_flags.toString());
             else
                 throw Exception(ErrorCodes::INVALID_GRANT, "{} cannot be granted", old_flags.toString());
         });
@@ -253,14 +314,25 @@ bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     AccessRightsElements elements;
     std::shared_ptr<ASTRolesOrUsersSet> roles;
-    if (!parseElementsWithoutOptions(pos, expected, elements) && !parseRoles(pos, expected, is_revoke, attach_mode, roles))
-        return false;
+
+    bool current_grants = false;
+    if (!is_revoke && ParserKeyword{"CURRENT GRANTS"}.ignore(pos, expected))
+    {
+        current_grants = true;
+        if (!parseCurrentGrants(pos, expected, elements))
+            return false;
+    }
+    else
+    {
+        if (!parseElementsWithoutOptions(pos, expected, elements) && !parseRoles(pos, expected, is_revoke, attach_mode, roles))
+            return false;
+    }
 
     if (cluster.empty())
         parseOnCluster(pos, expected, cluster);
 
     std::shared_ptr<ASTRolesOrUsersSet> grantees;
-    if (!parseToGrantees(pos, expected, is_revoke, grantees))
+    if (!parseToGrantees(pos, expected, is_revoke, grantees) && !allow_no_grantees)
         return false;
 
     if (cluster.empty())
@@ -322,6 +394,7 @@ bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     query->admin_option = admin_option;
     query->replace_access = replace_access;
     query->replace_granted_roles = replace_role;
+    query->current_grants = current_grants;
 
     return true;
 }
diff --git a/src/Parsers/Access/ParserGrantQuery.h b/src/Parsers/Access/ParserGrantQuery.h
index b14f175c12b..58c2be433d5 100644
--- a/src/Parsers/Access/ParserGrantQuery.h
+++ b/src/Parsers/Access/ParserGrantQuery.h
@@ -14,11 +14,14 @@ class ParserGrantQuery : public IParserBase
 public:
     ParserGrantQuery & useAttachMode(bool attach_mode_ = true) { attach_mode = attach_mode_; return *this; }
 
+    ParserGrantQuery & parseWithoutGrantees(bool allow_no_grantees_ = true) { allow_no_grantees = allow_no_grantees_; return *this; }
+
 protected:
     const char * getName() const override { return "GRANT or REVOKE query"; }
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 
 private:
     bool attach_mode = false;
+    bool allow_no_grantees = false;  /// if set, the parser will allow grant queries without any grantees.
 };
 }
diff --git a/src/Parsers/Access/ParserRowPolicyName.cpp b/src/Parsers/Access/ParserRowPolicyName.cpp
index cf5d2ab21b6..efdff3c24bf 100644
--- a/src/Parsers/Access/ParserRowPolicyName.cpp
+++ b/src/Parsers/Access/ParserRowPolicyName.cpp
@@ -26,8 +26,18 @@ namespace
         return IParserBase::wrapParseImpl(pos, [&]
         {
             String res_database, res_table_name;
-            if (!parseDatabaseAndTableName(pos, expected, res_database, res_table_name))
+            bool is_any_database = false;
+            bool is_any_table = false;
+
+            if (!parseDatabaseAndTableNameOrAsterisks(pos, expected, res_database, is_any_database, res_table_name, is_any_table)
+                || is_any_database)
+            {
                 return false;
+            }
+            else if (is_any_table)
+            {
+                res_table_name = RowPolicyName::ANY_TABLE_MARK;
+            }
 
             /// If table is specified without DB it cannot be followed by "ON"
             /// (but can be followed by "ON CLUSTER").
diff --git a/src/Parsers/Access/ParserSettingsProfileElement.cpp b/src/Parsers/Access/ParserSettingsProfileElement.cpp
index db23a806a12..36330b96622 100644
--- a/src/Parsers/Access/ParserSettingsProfileElement.cpp
+++ b/src/Parsers/Access/ParserSettingsProfileElement.cpp
@@ -52,7 +52,7 @@ namespace
     }
 
 
-    bool parseValue(IParserBase::Pos & pos, Expected & expected, Field & res)
+    bool parseValue(IParserBase::Pos & pos, Expected & expected, std::optional<Field> & res)
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
@@ -69,7 +69,7 @@ namespace
     }
 
 
-    bool parseMinMaxValue(IParserBase::Pos & pos, Expected & expected, Field & min_value, Field & max_value)
+    bool parseMinMaxValue(IParserBase::Pos & pos, Expected & expected, std::optional<Field> & min_value, std::optional<Field> & max_value)
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
@@ -124,9 +124,9 @@ namespace
         IParserBase::Pos & pos,
         Expected & expected,
         String & setting_name,
-        Field & value,
-        Field & min_value,
-        Field & max_value,
+        std::optional<Field> & value,
+        std::optional<Field> & min_value,
+        std::optional<Field> & max_value,
         std::optional<SettingConstraintWritability> & writability)
     {
         return IParserBase::wrapParseImpl(pos, [&]
@@ -136,9 +136,9 @@ namespace
                 return false;
 
             String res_setting_name = getIdentifierName(name_ast);
-            Field res_value;
-            Field res_min_value;
-            Field res_max_value;
+            std::optional<Field> res_value;
+            std::optional<Field> res_min_value;
+            std::optional<Field> res_max_value;
             std::optional<SettingConstraintWritability> res_writability;
 
             bool has_value_or_constraint = false;
@@ -151,7 +151,7 @@ namespace
             if (!has_value_or_constraint)
                 return false;
 
-            if (boost::iequals(res_setting_name, "PROFILE") && res_value.isNull() && res_min_value.isNull() && res_max_value.isNull()
+            if (boost::iequals(res_setting_name, "PROFILE") && !res_value && !res_min_value && !res_max_value
                 && res_writability == SettingConstraintWritability::CONST)
             {
                 /// Ambiguity: "profile readonly" can be treated either as a profile named "readonly" or
@@ -181,9 +181,9 @@ namespace
         {
             String parent_profile;
             String setting_name;
-            Field value;
-            Field min_value;
-            Field max_value;
+            std::optional<Field> value;
+            std::optional<Field> min_value;
+            std::optional<Field> max_value;
             std::optional<SettingConstraintWritability> writability;
 
             bool ok = parseSettingNameWithValueOrConstraints(pos, expected, setting_name, value, min_value, max_value, writability);
diff --git a/src/Parsers/Access/ParserShowAccessEntitiesQuery.cpp b/src/Parsers/Access/ParserShowAccessEntitiesQuery.cpp
index 3953c28c356..15cb815f457 100644
--- a/src/Parsers/Access/ParserShowAccessEntitiesQuery.cpp
+++ b/src/Parsers/Access/ParserShowAccessEntitiesQuery.cpp
@@ -15,8 +15,8 @@ namespace
         for (auto i : collections::range(AccessEntityType::MAX))
         {
             const auto & type_info = AccessEntityTypeInfo::get(i);
-            if (ParserKeyword{type_info.plural_name.c_str()}.ignore(pos, expected)
-                || (!type_info.plural_alias.empty() && ParserKeyword{type_info.plural_alias.c_str()}.ignore(pos, expected)))
+            if (ParserKeyword{type_info.plural_name}.ignore(pos, expected)
+                || (!type_info.plural_alias.empty() && ParserKeyword{type_info.plural_alias}.ignore(pos, expected)))
             {
                 type = i;
                 return true;
diff --git a/src/Parsers/Access/ParserShowCreateAccessEntityQuery.cpp b/src/Parsers/Access/ParserShowCreateAccessEntityQuery.cpp
index 15622062961..17caa6366f1 100644
--- a/src/Parsers/Access/ParserShowCreateAccessEntityQuery.cpp
+++ b/src/Parsers/Access/ParserShowCreateAccessEntityQuery.cpp
@@ -25,8 +25,8 @@ namespace
         for (auto i : collections::range(AccessEntityType::MAX))
         {
             const auto & type_info = AccessEntityTypeInfo::get(i);
-            if (ParserKeyword{type_info.name.c_str()}.ignore(pos, expected)
-                || (!type_info.alias.empty() && ParserKeyword{type_info.alias.c_str()}.ignore(pos, expected)))
+            if (ParserKeyword{type_info.name}.ignore(pos, expected)
+                || (!type_info.alias.empty() && ParserKeyword{type_info.alias}.ignore(pos, expected)))
             {
                 type = i;
                 plural = false;
@@ -37,8 +37,8 @@ namespace
         for (auto i : collections::range(AccessEntityType::MAX))
         {
             const auto & type_info = AccessEntityTypeInfo::get(i);
-            if (ParserKeyword{type_info.plural_name.c_str()}.ignore(pos, expected)
-                || (!type_info.plural_alias.empty() && ParserKeyword{type_info.plural_alias.c_str()}.ignore(pos, expected)))
+            if (ParserKeyword{type_info.plural_name}.ignore(pos, expected)
+                || (!type_info.plural_alias.empty() && ParserKeyword{type_info.plural_alias}.ignore(pos, expected)))
             {
                 type = i;
                 plural = true;
diff --git a/src/Parsers/CMakeLists.txt b/src/Parsers/CMakeLists.txt
index 73d46593e04..d5cf2bd4784 100644
--- a/src/Parsers/CMakeLists.txt
+++ b/src/Parsers/CMakeLists.txt
@@ -22,3 +22,7 @@ endif()
 if (ENABLE_FUZZING)
     add_subdirectory(fuzzers)
 endif()
+
+if (ENABLE_TESTS)
+    add_subdirectory(HiliteComparator)
+endif ()
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index f2660e5a40c..28cef51e571 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -1429,10 +1429,12 @@ bool ParserAlias::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     if (!allow_alias_without_as_keyword && !has_as_word)
         return false;
 
+    bool is_quoted = pos->type == TokenType::QuotedIdentifier;
+
     if (!id_p.parse(pos, node, expected))
         return false;
 
-    if (!has_as_word)
+    if (!has_as_word && !is_quoted)
     {
         /** In this case, the alias can not match the keyword -
           *  so that in the query "SELECT x FROM t", the word FROM was not considered an alias,
@@ -1474,7 +1476,7 @@ bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & e
         auto opos = pos;
         if (ParserExpression().parse(pos, lambda, expected))
         {
-            if (const auto * func = lambda->as<ASTFunction>(); func && func->name == "lambda")
+            if (auto * func = lambda->as<ASTFunction>(); func && func->name == "lambda")
             {
                 if (func->arguments->children.size() != 2)
                     throw Exception(ErrorCodes::SYNTAX_ERROR, "lambda requires two arguments");
@@ -1491,6 +1493,8 @@ bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & e
                     lambda_arg = *opt_arg_name;
                 else
                     throw Exception(ErrorCodes::SYNTAX_ERROR, "lambda argument declarations must be identifiers");
+
+                func->is_lambda_function = true;
             }
             else
             {
@@ -2149,8 +2153,9 @@ bool ParserTTLElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserKeyword s_set("SET");
     ParserKeyword s_recompress("RECOMPRESS");
     ParserKeyword s_codec("CODEC");
-    ParserToken s_comma(TokenType::Comma);
-    ParserToken s_eq(TokenType::Equals);
+    ParserKeyword s_materialize("MATERIALIZE");
+    ParserKeyword s_remove("REMOVE");
+    ParserKeyword s_modify("MODIFY");
 
     ParserIdentifier parser_identifier;
     ParserStringLiteral parser_string_literal;
@@ -2158,8 +2163,11 @@ bool ParserTTLElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserExpressionList parser_keys_list(false);
     ParserCodec parser_codec;
 
-    ParserList parser_assignment_list(
-        std::make_unique<ParserAssignment>(), std::make_unique<ParserToken>(TokenType::Comma));
+    if (s_materialize.checkWithoutMoving(pos, expected) ||
+        s_remove.checkWithoutMoving(pos, expected) ||
+        s_modify.checkWithoutMoving(pos, expected))
+
+        return false;
 
     ASTPtr ttl_expr;
     if (!parser_exp.parse(pos, ttl_expr, expected))
@@ -2217,6 +2225,9 @@ bool ParserTTLElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
         if (s_set.ignore(pos))
         {
+            ParserList parser_assignment_list(
+                std::make_unique<ParserAssignment>(), std::make_unique<ParserToken>(TokenType::Comma));
+
             if (!parser_assignment_list.parse(pos, group_by_assignments, expected))
                 return false;
         }
diff --git a/src/Parsers/ExpressionListParsers.cpp b/src/Parsers/ExpressionListParsers.cpp
index 054a22a0c3a..1477f3d000d 100644
--- a/src/Parsers/ExpressionListParsers.cpp
+++ b/src/Parsers/ExpressionListParsers.cpp
@@ -1,4 +1,5 @@
 #include <string_view>
+#include <unordered_map>
 
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ParserSetQuery.h>
@@ -18,12 +19,14 @@
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserUnionQueryElement.h>
 #include <Parsers/parseIntervalKind.h>
+#include <Common/assert_cast.h>
 #include <Common/StringUtils/StringUtils.h>
 
 #include <Parsers/ParserSelectWithUnionQuery.h>
 
 #include <Common/logger_useful.h>
 #include <Parsers/queryToString.h>
+#include <Parsers/CommonParsers.h>
 
 using namespace std::literals;
 
@@ -125,21 +128,19 @@ bool ParserUnionList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     return true;
 }
 
-static bool parseOperator(IParser::Pos & pos, const char * op, Expected & expected)
+static bool parseOperator(IParser::Pos & pos, std::string_view op, Expected & expected)
 {
-    if (isWordCharASCII(*op))
+    if (!op.empty() && isWordCharASCII(op.front()))
     {
         return ParserKeyword(op).ignore(pos, expected);
     }
-    else
+    else if (op.length() == pos->size() && 0 == memcmp(op.data(), pos->begin, pos->size()))
     {
-        if (strlen(op) == pos->size() && 0 == memcmp(op, pos->begin, pos->size()))
-        {
-            ++pos;
-            return true;
-        }
-        return false;
+        ++pos;
+        return true;
     }
+
+    return false;
 }
 
 enum class SubqueryFunctionType
@@ -303,9 +304,9 @@ ASTPtr makeBetweenOperator(bool negative, ASTs arguments)
     }
 }
 
-ParserExpressionWithOptionalAlias::ParserExpressionWithOptionalAlias(bool allow_alias_without_as_keyword, bool is_table_function)
+ParserExpressionWithOptionalAlias::ParserExpressionWithOptionalAlias(bool allow_alias_without_as_keyword, bool is_table_function, bool allow_trailing_commas)
     : impl(std::make_unique<ParserWithOptionalAlias>(
-        is_table_function ? ParserPtr(std::make_unique<ParserTableFunctionExpression>()) : ParserPtr(std::make_unique<ParserExpression>()),
+        is_table_function ? ParserPtr(std::make_unique<ParserTableFunctionExpression>()) : ParserPtr(std::make_unique<ParserExpression>(allow_trailing_commas)),
         allow_alias_without_as_keyword))
 {
 }
@@ -314,7 +315,7 @@ ParserExpressionWithOptionalAlias::ParserExpressionWithOptionalAlias(bool allow_
 bool ParserExpressionList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     return ParserList(
-        std::make_unique<ParserExpressionWithOptionalAlias>(allow_alias_without_as_keyword, is_table_function),
+        std::make_unique<ParserExpressionWithOptionalAlias>(allow_alias_without_as_keyword, is_table_function, allow_trailing_commas),
         std::make_unique<ParserToken>(TokenType::Comma))
         .parse(pos, node, expected);
 }
@@ -778,14 +779,49 @@ protected:
     int state = 0;
 };
 
+struct ParserExpressionImpl
+{
+    static const std::vector<std::pair<std::string_view, Operator>> operators_table;
+    static const std::vector<std::pair<std::string_view, Operator>> unary_operators_table;
+    static const std::array<std::string_view, 1> overlapping_operators_to_skip;
+
+    static const Operator finish_between_operator;
+
+    ParserCompoundIdentifier identifier_parser{false, true};
+    ParserNumber number_parser;
+    ParserAsterisk asterisk_parser;
+    ParserLiteral literal_parser;
+    ParserTupleOfLiterals tuple_literal_parser;
+    ParserArrayOfLiterals array_literal_parser;
+    ParserSubstitution substitution_parser;
+    ParserMySQLGlobalVariable mysql_global_variable_parser;
+
+    ParserKeyword any_parser{"ANY"};
+    ParserKeyword all_parser{"ALL"};
+
+    // Recursion
+    ParserQualifiedAsterisk qualified_asterisk_parser;
+    ParserColumnsMatcher columns_matcher_parser;
+    ParserQualifiedColumnsMatcher qualified_columns_matcher_parser;
+    ParserSubquery subquery_parser;
+
+    bool parse(std::unique_ptr<Layer> start, IParser::Pos & pos, ASTPtr & node, Expected & expected);
+
+    using Layers = std::vector<std::unique_ptr<Layer>>;
+
+    Action tryParseOperand(Layers & layers, IParser::Pos & pos, Expected & expected);
+    Action tryParseOperator(Layers & layers, IParser::Pos & pos, Expected & expected);
+};
 
 class ExpressionLayer : public Layer
 {
 public:
 
-    explicit ExpressionLayer(bool is_table_function_) : Layer(false, false)
+    explicit ExpressionLayer(bool is_table_function_, bool allow_trailing_commas_ = false)
+        : Layer(false, false)
     {
         is_table_function = is_table_function_;
+        allow_trailing_commas = allow_trailing_commas_;
     }
 
     bool getResult(ASTPtr & node) override
@@ -802,10 +838,62 @@ public:
     bool parse(IParser::Pos & pos, Expected & /*expected*/, Action & /*action*/) override
     {
         if (pos->type == TokenType::Comma)
+        {
             finished = true;
 
+            if (!allow_trailing_commas)
+                return true;
+
+            /// We support trailing commas at the end of the column declaration:
+            ///  - SELECT a, b, c, FROM table
+            ///  - SELECT 1,
+
+            /// For this purpose we need to eliminate the following cases:
+            ///  1. WITH 1 AS from SELECT 2, from
+            ///  2. SELECT to, from FROM table
+            ///  3. SELECT to, from AS alias FROM table
+            ///  4. SELECT to, from + to, from IN [1,2,3], FROM table
+
+            Expected test_expected;
+            auto test_pos = pos;
+            ++test_pos;
+
+            /// End of query
+            if (test_pos.isValid() && test_pos->type != TokenType::Semicolon)
+            {
+                /// If we can't parse FROM then return
+                if (!ParserKeyword("FROM").ignore(test_pos, test_expected))
+                    return true;
+
+                /// If we parse a second FROM then the first one was a name of a column
+                if (ParserKeyword("FROM").ignore(test_pos, test_expected))
+                    return true;
+
+                /// If we parse an explicit alias to FROM, then it was a name of a column
+                if (ParserAlias(false).ignore(test_pos, test_expected))
+                    return true;
+
+                /// If we parse an operator after FROM then it was a name of a column
+                auto cur_op = ParserExpressionImpl::operators_table.begin();
+                for (; cur_op != ParserExpressionImpl::operators_table.end(); ++cur_op)
+                {
+                    if (parseOperator(test_pos, cur_op->first, test_expected))
+                        break;
+                }
+
+                if (cur_op != ParserExpressionImpl::operators_table.end())
+                    return true;
+            }
+
+            ++pos;
+            return true;
+        }
+
         return true;
     }
+
+private:
+    bool allow_trailing_commas;
 };
 
 /// Basic layer for a function with certain separator and end tokens:
@@ -999,6 +1087,8 @@ public:
 
             ParserKeyword filter("FILTER");
             ParserKeyword over("OVER");
+            ParserKeyword respect_nulls("RESPECT NULLS");
+            ParserKeyword ignore_nulls("IGNORE NULLS");
 
             if (filter.ignore(pos, expected))
             {
@@ -1014,6 +1104,17 @@ public:
                     return false;
             }
 
+            NullsAction nulls_action = NullsAction::EMPTY;
+            if (respect_nulls.ignore(pos, expected))
+            {
+                nulls_action = NullsAction::RESPECT_NULLS;
+            }
+            if (ignore_nulls.ignore(pos, expected))
+            {
+                nulls_action = NullsAction::IGNORE_NULLS;
+            }
+            function_node->name = transformFunctionNameForRepectNulls(function_node->name, nulls_action);
+
             if (over.ignore(pos, expected))
             {
                 function_node->is_window_function = true;
@@ -1046,6 +1147,30 @@ private:
 
     bool allow_function_parameters;
     bool is_compound_name;
+
+    enum NullsAction
+    {
+        EMPTY = 0,
+        RESPECT_NULLS = 1,
+        IGNORE_NULLS = 2,
+    };
+    static String transformFunctionNameForRepectNulls(const String & original_function_name, NullsAction nulls_action)
+    {
+        static std::unordered_map<String, std::vector<String>> renamed_functions_with_nulls = {
+            {"first_value", {"first_value", "first_value_respect_nulls", "first_value"}},
+            {"last_value", {"last_value", "last_value_respect_nulls", "last_value"}},
+        };
+        auto it = renamed_functions_with_nulls.find(original_function_name);
+        if (it == renamed_functions_with_nulls.end())
+        {
+            if (nulls_action == NullsAction::EMPTY)
+                return original_function_name;
+            else
+                throw Exception(
+                    ErrorCodes::SYNTAX_ERROR, "Function {} does not support RESPECT NULLS or IGNORE NULLS", original_function_name);
+        }
+        return it->second[nulls_action];
+    }
 };
 
 /// Layer for priority brackets and tuple function
@@ -2164,44 +2289,9 @@ bool ParseTimestampOperatorExpression(IParser::Pos & pos, ASTPtr & node, Expecte
     return true;
 }
 
-struct ParserExpressionImpl
-{
-    static std::vector<std::pair<const char *, Operator>> operators_table;
-    static std::vector<std::pair<const char *, Operator>> unary_operators_table;
-    static const char * overlapping_operators_to_skip[];
-
-    static Operator finish_between_operator;
-
-    ParserCompoundIdentifier identifier_parser{false, true};
-    ParserNumber number_parser;
-    ParserAsterisk asterisk_parser;
-    ParserLiteral literal_parser;
-    ParserTupleOfLiterals tuple_literal_parser;
-    ParserArrayOfLiterals array_literal_parser;
-    ParserSubstitution substitution_parser;
-    ParserMySQLGlobalVariable mysql_global_variable_parser;
-
-    ParserKeyword any_parser{"ANY"};
-    ParserKeyword all_parser{"ALL"};
-
-    // Recursion
-    ParserQualifiedAsterisk qualified_asterisk_parser;
-    ParserColumnsMatcher columns_matcher_parser;
-    ParserQualifiedColumnsMatcher qualified_columns_matcher_parser;
-    ParserSubquery subquery_parser;
-
-    bool parse(std::unique_ptr<Layer> start, IParser::Pos & pos, ASTPtr & node, Expected & expected);
-
-    using Layers = std::vector<std::unique_ptr<Layer>>;
-
-    Action tryParseOperand(Layers & layers, IParser::Pos & pos, Expected & expected);
-    Action tryParseOperator(Layers & layers, IParser::Pos & pos, Expected & expected);
-};
-
-
 bool ParserExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    auto start = std::make_unique<ExpressionLayer>(false);
+    auto start = std::make_unique<ExpressionLayer>(false, allow_trailing_commas);
     return ParserExpressionImpl().parse(std::move(start), pos, node, expected);
 }
 
@@ -2235,56 +2325,58 @@ bool ParserFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     }
 }
 
-std::vector<std::pair<const char *, Operator>> ParserExpressionImpl::operators_table({
-        {"->",            Operator("lambda",          1,  2, OperatorType::Lambda)},
-        {"?",             Operator("",                2,  0, OperatorType::StartIf)},
-        {":",             Operator("if",              3,  3, OperatorType::FinishIf)},
-        {"OR",            Operator("or",              3,  2, OperatorType::Mergeable)},
-        {"AND",           Operator("and",             4,  2, OperatorType::Mergeable)},
-        {"BETWEEN",       Operator("",                6,  0, OperatorType::StartBetween)},
-        {"NOT BETWEEN",   Operator("",                6,  0, OperatorType::StartNotBetween)},
-        {"==",            Operator("equals",          8,  2, OperatorType::Comparison)},
-        {"!=",            Operator("notEquals",       8,  2, OperatorType::Comparison)},
-        {"<>",            Operator("notEquals",       8,  2, OperatorType::Comparison)},
-        {"<=",            Operator("lessOrEquals",    8,  2, OperatorType::Comparison)},
-        {">=",            Operator("greaterOrEquals", 8,  2, OperatorType::Comparison)},
-        {"<",             Operator("less",            8,  2, OperatorType::Comparison)},
-        {">",             Operator("greater",         8,  2, OperatorType::Comparison)},
-        {"=",             Operator("equals",          8,  2, OperatorType::Comparison)},
-        {"LIKE",          Operator("like",            8,  2)},
-        {"ILIKE",         Operator("ilike",           8,  2)},
-        {"NOT LIKE",      Operator("notLike",         8,  2)},
-        {"NOT ILIKE",     Operator("notILike",        8,  2)},
-        {"IN",            Operator("in",              8,  2)},
-        {"NOT IN",        Operator("notIn",           8,  2)},
-        {"GLOBAL IN",     Operator("globalIn",        8,  2)},
-        {"GLOBAL NOT IN", Operator("globalNotIn",     8,  2)},
-        {"||",            Operator("concat",          9,  2, OperatorType::Mergeable)},
-        {"+",             Operator("plus",            10, 2)},
-        {"-",             Operator("minus",           10, 2)},
-        {"*",             Operator("multiply",        11, 2)},
-        {"/",             Operator("divide",          11, 2)},
-        {"%",             Operator("modulo",          11, 2)},
-        {"MOD",           Operator("modulo",          11, 2)},
-        {"DIV",           Operator("intDiv",          11, 2)},
-        {".",             Operator("tupleElement",    13, 2, OperatorType::TupleElement)},
-        {"[",             Operator("arrayElement",    13, 2, OperatorType::ArrayElement)},
-        {"::",            Operator("CAST",            13, 2, OperatorType::Cast)},
-        {"IS NULL",       Operator("isNull",          13, 1, OperatorType::IsNull)},
-        {"IS NOT NULL",   Operator("isNotNull",       13, 1, OperatorType::IsNull)},
-    });
-
-std::vector<std::pair<const char *, Operator>> ParserExpressionImpl::unary_operators_table({
-        {"NOT",           Operator("not",             5,  1)},
-        {"-",             Operator("negate",          12, 1)}
-    });
-
-Operator ParserExpressionImpl::finish_between_operator = Operator("", 7, 0, OperatorType::FinishBetween);
-
-const char * ParserExpressionImpl::overlapping_operators_to_skip[] =
+const std::vector<std::pair<std::string_view, Operator>> ParserExpressionImpl::operators_table
 {
-    "IN PARTITION",
-    nullptr
+    {"->",            Operator("lambda",          1,  2, OperatorType::Lambda)},
+    {"?",             Operator("",                2,  0, OperatorType::StartIf)},
+    {":",             Operator("if",              3,  3, OperatorType::FinishIf)},
+    {"OR",            Operator("or",              3,  2, OperatorType::Mergeable)},
+    {"AND",           Operator("and",             4,  2, OperatorType::Mergeable)},
+    {"BETWEEN",       Operator("",                6,  0, OperatorType::StartBetween)},
+    {"NOT BETWEEN",   Operator("",                6,  0, OperatorType::StartNotBetween)},
+    {"==",            Operator("equals",          8,  2, OperatorType::Comparison)},
+    {"!=",            Operator("notEquals",       8,  2, OperatorType::Comparison)},
+    {"<>",            Operator("notEquals",       8,  2, OperatorType::Comparison)},
+    {"<=",            Operator("lessOrEquals",    8,  2, OperatorType::Comparison)},
+    {">=",            Operator("greaterOrEquals", 8,  2, OperatorType::Comparison)},
+    {"<",             Operator("less",            8,  2, OperatorType::Comparison)},
+    {">",             Operator("greater",         8,  2, OperatorType::Comparison)},
+    {"=",             Operator("equals",          8,  2, OperatorType::Comparison)},
+    {"LIKE",          Operator("like",            8,  2)},
+    {"ILIKE",         Operator("ilike",           8,  2)},
+    {"NOT LIKE",      Operator("notLike",         8,  2)},
+    {"NOT ILIKE",     Operator("notILike",        8,  2)},
+    {"REGEXP",        Operator("match",           8,  2)},
+    {"IN",            Operator("in",              8,  2)},
+    {"NOT IN",        Operator("notIn",           8,  2)},
+    {"GLOBAL IN",     Operator("globalIn",        8,  2)},
+    {"GLOBAL NOT IN", Operator("globalNotIn",     8,  2)},
+    {"||",            Operator("concat",          9,  2, OperatorType::Mergeable)},
+    {"+",             Operator("plus",            10, 2)},
+    {"-",             Operator("minus",           10, 2)},
+    {"*",             Operator("multiply",        11, 2)},
+    {"/",             Operator("divide",          11, 2)},
+    {"%",             Operator("modulo",          11, 2)},
+    {"MOD",           Operator("modulo",          11, 2)},
+    {"DIV",           Operator("intDiv",          11, 2)},
+    {".",             Operator("tupleElement",    13, 2, OperatorType::TupleElement)},
+    {"[",             Operator("arrayElement",    13, 2, OperatorType::ArrayElement)},
+    {"::",            Operator("CAST",            13, 2, OperatorType::Cast)},
+    {"IS NULL",       Operator("isNull",          13, 1, OperatorType::IsNull)},
+    {"IS NOT NULL",   Operator("isNotNull",       13, 1, OperatorType::IsNull)},
+};
+
+const std::vector<std::pair<std::string_view, Operator>> ParserExpressionImpl::unary_operators_table
+{
+    {"NOT",           Operator("not",             5,  1)},
+    {"-",             Operator("negate",          12, 1)}
+};
+
+const Operator ParserExpressionImpl::finish_between_operator("", 7, 0, OperatorType::FinishBetween);
+
+const std::array<std::string_view, 1> ParserExpressionImpl::overlapping_operators_to_skip
+{
+    "IN PARTITION"
 };
 
 bool ParserExpressionImpl::parse(std::unique_ptr<Layer> start, IParser::Pos & pos, ASTPtr & node, Expected & expected)
@@ -2300,7 +2392,6 @@ bool ParserExpressionImpl::parse(std::unique_ptr<Layer> start, IParser::Pos & po
         {
             if (!layers.back()->parse(pos, expected, next))
                 break;
-
             if (layers.back()->isFinished())
             {
                 if (layers.size() == 1)
@@ -2529,8 +2620,8 @@ Action ParserExpressionImpl::tryParseOperator(Layers & layers, IParser::Pos & po
     ///
     /// 'IN PARTITION' here is not an 'IN' operator, so we should stop parsing immediately
     Expected stub;
-    for (const char ** it = overlapping_operators_to_skip; *it; ++it)
-        if (ParserKeyword{*it}.checkWithoutMoving(pos, stub))
+    for (const auto & it : overlapping_operators_to_skip)
+        if (ParserKeyword{it}.checkWithoutMoving(pos, stub))
             return Action::NONE;
 
     /// Try to find operators from 'operators_table'
@@ -2543,18 +2634,17 @@ Action ParserExpressionImpl::tryParseOperator(Layers & layers, IParser::Pos & po
 
     if (cur_op == operators_table.end())
     {
+        if (!layers.back()->allow_alias || layers.back()->parsed_alias)
+            return Action::NONE;
+
         ASTPtr alias;
         ParserAlias alias_parser(layers.back()->allow_alias_without_as_keyword);
 
-        if (layers.back()->allow_alias &&
-            !layers.back()->parsed_alias &&
-            alias_parser.parse(pos, alias, expected) &&
-            layers.back()->insertAlias(alias))
-        {
-            layers.back()->parsed_alias = true;
-            return Action::OPERATOR;
-        }
-        return Action::NONE;
+        if (!alias_parser.parse(pos, alias, expected) || !layers.back()->insertAlias(alias))
+            return Action::NONE;
+
+        layers.back()->parsed_alias = true;
+        return Action::OPERATOR;
     }
 
     auto op = cur_op->second;
diff --git a/src/Parsers/ExpressionListParsers.h b/src/Parsers/ExpressionListParsers.h
index 653654e5a33..040a81bbe27 100644
--- a/src/Parsers/ExpressionListParsers.h
+++ b/src/Parsers/ExpressionListParsers.h
@@ -172,10 +172,15 @@ protected:
 
 class ParserExpression : public IParserBase
 {
+public:
+    ParserExpression(bool allow_trailing_commas_ = false) : allow_trailing_commas(allow_trailing_commas_) {}
+
 protected:
     const char * getName() const override { return "lambda expression"; }
 
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+
+    bool allow_trailing_commas;
 };
 
 
@@ -192,7 +197,7 @@ protected:
 class ParserExpressionWithOptionalAlias : public IParserBase
 {
 public:
-    explicit ParserExpressionWithOptionalAlias(bool allow_alias_without_as_keyword_, bool is_table_function_ = false);
+    explicit ParserExpressionWithOptionalAlias(bool allow_alias_without_as_keyword_, bool is_table_function_ = false, bool allow_trailing_commas_ = false);
 protected:
     ParserPtr impl;
 
@@ -209,12 +214,15 @@ protected:
 class ParserExpressionList : public IParserBase
 {
 public:
-    explicit ParserExpressionList(bool allow_alias_without_as_keyword_, bool is_table_function_ = false)
-        : allow_alias_without_as_keyword(allow_alias_without_as_keyword_), is_table_function(is_table_function_) {}
+    explicit ParserExpressionList(bool allow_alias_without_as_keyword_, bool is_table_function_ = false, bool allow_trailing_commas_ = false)
+        : allow_alias_without_as_keyword(allow_alias_without_as_keyword_)
+        , is_table_function(is_table_function_)
+        , allow_trailing_commas(allow_trailing_commas_) {}
 
 protected:
     bool allow_alias_without_as_keyword;
     bool is_table_function; // This expression list is used by a table function
+    bool allow_trailing_commas;
 
     const char * getName() const override { return "list of expressions"; }
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
@@ -224,8 +232,8 @@ protected:
 class ParserNotEmptyExpressionList : public IParserBase
 {
 public:
-    explicit ParserNotEmptyExpressionList(bool allow_alias_without_as_keyword)
-        : nested_parser(allow_alias_without_as_keyword) {}
+    explicit ParserNotEmptyExpressionList(bool allow_alias_without_as_keyword_, bool allow_trailing_commas_ = false)
+        : nested_parser(allow_alias_without_as_keyword_, false, allow_trailing_commas_) {}
 private:
     ParserExpressionList nested_parser;
 protected:
diff --git a/src/Parsers/FieldFromAST.cpp b/src/Parsers/FieldFromAST.cpp
index 3cd10c1cf80..a81bf45a8be 100644
--- a/src/Parsers/FieldFromAST.cpp
+++ b/src/Parsers/FieldFromAST.cpp
@@ -6,6 +6,7 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/isDiskFunction.h>
 #include <Common/assert_cast.h>
+#include <Interpreters/InDepthNodeVisitor.h>
 
 
 namespace DB
@@ -31,42 +32,64 @@ bool FieldFromASTImpl::isSecret() const
     return isDiskFunction(ast);
 }
 
+class DiskConfigurationMasker
+{
+public:
+    struct Data {};
+
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+
+    static void visit(ASTPtr & ast, Data &)
+    {
+        if (isDiskFunction(ast))
+        {
+            const auto & disk_function = assert_cast<const ASTFunction &>(*ast);
+            const auto * disk_function_args_expr = assert_cast<const ASTExpressionList *>(disk_function.arguments.get());
+            const auto & disk_function_args = disk_function_args_expr->children;
+
+            auto is_secret_arg = [](const std::string & arg_name)
+            {
+                /// We allow to not hide type of the disk, e.g. disk(type = s3, ...)
+                /// and also nested disk, e.g. disk = 'disk_name'
+                return arg_name != "type" && arg_name != "disk";
+            };
+
+            for (const auto & arg : disk_function_args)
+            {
+                auto * setting_function = arg->as<ASTFunction>();
+                if (!setting_function || setting_function->name != "equals")
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad format: expected equals function");
+
+                auto * function_args_expr = assert_cast<ASTExpressionList *>(setting_function->arguments.get());
+                if (!function_args_expr)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad format: expected arguments");
+
+                auto & function_args = function_args_expr->children;
+                if (function_args.empty())
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad format: expected non zero number of arguments");
+
+                auto * key_identifier = function_args[0]->as<ASTIdentifier>();
+                if (!key_identifier)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad format: expected Identifier");
+
+                const std::string & key = key_identifier->name();
+                if (is_secret_arg(key))
+                    function_args[1] = std::make_shared<ASTLiteral>("[HIDDEN]");
+            }
+        }
+    }
+};
+
+/// Visits children first.
+using HideDiskConfigurationVisitor = InDepthNodeVisitor<DiskConfigurationMasker, false>;
+
 String FieldFromASTImpl::toString(bool show_secrets) const
 {
     if (!show_secrets && isDiskFunction(ast))
     {
         auto hidden = ast->clone();
-        const auto & disk_function = assert_cast<const ASTFunction &>(*hidden);
-        const auto * disk_function_args_expr = assert_cast<const ASTExpressionList *>(disk_function.arguments.get());
-        const auto & disk_function_args = disk_function_args_expr->children;
-
-        auto is_secret_arg = [](const std::string & arg_name)
-        {
-            return arg_name != "type";
-        };
-
-        for (const auto & arg : disk_function_args)
-        {
-            auto * setting_function = arg->as<ASTFunction>();
-            if (!setting_function || setting_function->name != "equals")
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad format: expected equals function");
-
-            auto * function_args_expr = assert_cast<ASTExpressionList *>(setting_function->arguments.get());
-            if (!function_args_expr)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad format: expected arguments");
-
-            auto & function_args = function_args_expr->children;
-            if (function_args.empty())
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad format: expected non zero number of arguments");
-
-            auto * key_identifier = function_args[0]->as<ASTIdentifier>();
-            if (!key_identifier)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad format: expected Identifier");
-
-            const std::string & key = key_identifier->name();
-            if (is_secret_arg(key))
-                function_args[1] = std::make_shared<ASTLiteral>("[HIDDEN]");
-        }
+        HideDiskConfigurationVisitor::Data data{};
+        HideDiskConfigurationVisitor{data}.visit(hidden);
         return serializeAST(*hidden);
     }
 
diff --git a/src/Parsers/HiliteComparator/CMakeLists.txt b/src/Parsers/HiliteComparator/CMakeLists.txt
new file mode 100644
index 00000000000..0e68b19be08
--- /dev/null
+++ b/src/Parsers/HiliteComparator/CMakeLists.txt
@@ -0,0 +1,7 @@
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
+
+add_headers_and_sources(hilite_comparator .)
+
+add_library(hilite_comparator ${hilite_comparator_sources})
+
+target_link_libraries(hilite_comparator PRIVATE dbms)
diff --git a/src/Parsers/HiliteComparator/HiliteComparator.cpp b/src/Parsers/HiliteComparator/HiliteComparator.cpp
new file mode 100644
index 00000000000..0c12c6e821c
--- /dev/null
+++ b/src/Parsers/HiliteComparator/HiliteComparator.cpp
@@ -0,0 +1,98 @@
+#include "HiliteComparator.h"
+
+namespace HiliteComparator
+{
+
+void consume_hilites(const char * & ptr, Hilite * last_hilite)
+{
+    while (true)
+    {
+        bool changed_hilite = false;
+        for (Hilite hilite : hilites)
+        {
+            if (std::string_view(ptr).starts_with(hilite))
+            {
+                ptr += strlen(hilite);
+                changed_hilite = true;
+                if (last_hilite != nullptr)
+                    *last_hilite = hilite;
+            }
+        }
+        if (!changed_hilite)
+            break;
+    }
+}
+
+bool are_equal_with_hilites_removed(std::string_view left, std::string_view right)
+{
+    return remove_hilites(left) == remove_hilites(right);
+}
+
+String remove_hilites(std::string_view string)
+{
+    const char * ptr = string.begin();
+    String string_without_hilites;
+    while (true)
+    {
+        consume_hilites(ptr);
+        if (ptr == string.end())
+            return string_without_hilites;
+        string_without_hilites += *(ptr++);
+    }
+}
+
+/*
+ * Hilited queries cannot be compared symbol-by-symbol, as there's some frivolousness introduced with the hilites. Specifically:
+ * 1. Whitespaces could be hilited with any hilite type.
+ * 2. Hilite could or could be not reset with hilite_none before the next hilite, i.e. the following strings a and b are equal:
+ *      a. hilite_keyword foo hilite_none hilite_operator +
+ *      b. hilite_keyword foo hilite_operator +
+ */
+bool are_equal_with_hilites(std::string_view left, std::string_view right, bool check_end_without_hilite)
+{
+    const char * left_it = left.begin();
+    const char * right_it = right.begin();
+    Hilite left_hilite = DB::IAST::hilite_none;
+    Hilite right_hilite = DB::IAST::hilite_none;
+
+    while (true)
+    {
+        // For each argument, consume all prefix hilites, and update the current hilite to be the last one.
+        consume_hilites(left_it, &left_hilite);
+        consume_hilites(right_it, &right_hilite);
+
+        if (left_it == left.end() && right_it == right.end())
+        {
+            if (left_hilite != right_hilite)
+                return false;
+            if (check_end_without_hilite)
+                if (left_hilite != DB::IAST::hilite_none)
+                    throw std::logic_error("Expected string ends with a hilite");
+            return true;
+        }
+
+        if (left_it == left.end() || right_it == right.end())
+            return false;
+
+        // Lookup one character.
+        // Check characters match.
+        if (*left_it != *right_it)
+            return false;
+
+        // Check hilites match if it's not a whitespace.
+        if (!std::isspace(*left_it) && left_hilite != right_hilite)
+            return false;
+
+        // Consume one character.
+        left_it++;
+        right_it++;
+    }
+}
+
+bool are_equal_with_hilites_and_end_without_hilite(std::string_view left, std::string_view right)
+{
+    return are_equal_with_hilites(left, right, true);
+}
+
+
+}
diff --git a/src/Parsers/HiliteComparator/HiliteComparator.h b/src/Parsers/HiliteComparator/HiliteComparator.h
new file mode 100644
index 00000000000..137c5892b3a
--- /dev/null
+++ b/src/Parsers/HiliteComparator/HiliteComparator.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <Parsers/IAST.h>
+#include <string>
+#include <string_view>
+
+
+namespace HiliteComparator
+{
+
+using Hilite = const char *;
+
+static const std::vector<Hilite> hilites = {
+        DB::IAST::hilite_keyword,
+        DB::IAST::hilite_identifier,
+        DB::IAST::hilite_function,
+        DB::IAST::hilite_operator,
+        DB::IAST::hilite_alias,
+        DB::IAST::hilite_substitution,
+        DB::IAST::hilite_none
+    };
+
+/*
+ * Consume all prefix hilites, by moving `ptr` to
+ * If `last_hilite` is not `nullptr`, update the last hilite to be the last hilite of the prefix hilites.
+ */
+void consume_hilites(const char * & ptr, Hilite * last_hilite = nullptr);
+
+String remove_hilites(std::string_view string);
+
+/*
+ * Copies both strings, for the simplicity of the implementation.
+ */
+bool are_equal_with_hilites_removed(std::string_view left, std::string_view right);
+
+/*
+ * Hilited queries cannot be compared symbol-by-symbol, as there's some frivolousness introduced with the hilites. Specifically:
+ * 1. Whitespaces could be hilited with any hilite type.
+ * 2. Hilite could or could be not reset with hilite_none before the next hilite, i.e. the following strings a and b are equal:
+ *      a. hilite_keyword foo hilite_none hilite_operator +
+ *      b. hilite_keyword foo hilite_operator +
+ */
+bool are_equal_with_hilites(std::string_view left, std::string_view right, bool check_end_without_hilite);
+
+// Google tests's ASSERT_PRED_2 doesn't see overloads with default parameter values.
+bool are_equal_with_hilites_and_end_without_hilite(std::string_view left, std::string_view right);
+
+}
diff --git a/src/Parsers/HiliteComparator/tests/gtest_hilite_comparator.cpp b/src/Parsers/HiliteComparator/tests/gtest_hilite_comparator.cpp
new file mode 100644
index 00000000000..785e83d09cc
--- /dev/null
+++ b/src/Parsers/HiliteComparator/tests/gtest_hilite_comparator.cpp
@@ -0,0 +1,98 @@
+#include <gtest/gtest.h>
+#include <Parsers/IAST.h>
+#include <Parsers/HiliteComparator/HiliteComparator.h>
+
+using namespace HiliteComparator;
+
+TEST(HiliteComparator, ConsumeHilites)
+{
+    using namespace DB;
+    // The order is different from the order in HILITES on purpose.
+    String s;
+    s += IAST::hilite_keyword;
+    s += IAST::hilite_alias;
+    s += IAST::hilite_identifier;
+    s += IAST::hilite_none;
+    s += IAST::hilite_operator;
+    s += IAST::hilite_substitution;
+    s += IAST::hilite_function;
+    s += "test";
+    s += IAST::hilite_keyword;
+    const char * ptr = s.c_str();
+    const char * expected_ptr = strchr(ptr, 't');
+    const char * last_hilite = nullptr;
+    consume_hilites(ptr, &last_hilite);
+    ASSERT_EQ(expected_ptr, ptr);
+    ASSERT_TRUE(last_hilite != nullptr);
+    ASSERT_EQ(IAST::hilite_function, last_hilite);
+}
+
+TEST(HiliteComparator, RemoveHilites)
+{
+    using namespace DB;
+    String s;
+    s += IAST::hilite_keyword;
+    s += "te";
+    s += IAST::hilite_alias;
+    s += IAST::hilite_identifier;
+    s += "s";
+    s += IAST::hilite_none;
+    s += "t";
+    s += IAST::hilite_operator;
+    s += IAST::hilite_substitution;
+    s += IAST::hilite_function;
+    ASSERT_EQ("test", remove_hilites(s));
+}
+
+TEST(HiliteComparator, AreEqualWithHilites)
+{
+    using namespace DB;
+    String s = IAST::hilite_keyword;
+    ASSERT_THROW(are_equal_with_hilites(s, s, true), std::logic_error);
+    ASSERT_TRUE(are_equal_with_hilites(s, s, false));
+}
+
+TEST(HiliteComparator, AreEqualWithHilitesAndEndWithoutHilite)
+{
+    using namespace DB;
+
+    ASSERT_PRED2(are_equal_with_hilites_and_end_without_hilite, "", "");
+    ASSERT_PRED2(are_equal_with_hilites_and_end_without_hilite, "", IAST::hilite_none);
+    ASSERT_PRED2(are_equal_with_hilites_and_end_without_hilite, IAST::hilite_none, "");
+    ASSERT_PRED2(are_equal_with_hilites_and_end_without_hilite, IAST::hilite_none, IAST::hilite_none);
+
+    {
+        String s;
+        s += IAST::hilite_none;
+        s += "select";
+        s += IAST::hilite_none;
+        ASSERT_PRED2(are_equal_with_hilites_and_end_without_hilite, s, "select");
+    }
+
+    {
+        String s;
+        s += DB::IAST::hilite_none;
+        s += "\n sel";
+        s += DB::IAST::hilite_none;
+        s += "ect";
+        s += DB::IAST::hilite_none;
+        ASSERT_PRED2(are_equal_with_hilites_and_end_without_hilite, s, "\n select");
+    }
+
+    {
+        String left;
+        left += DB::IAST::hilite_keyword;
+        left += "keyword long";
+        left += DB::IAST::hilite_none;
+
+        String right;
+        right += DB::IAST::hilite_keyword;
+        right += "keyword";
+        right += DB::IAST::hilite_none;
+        right += " ";
+        right += DB::IAST::hilite_keyword;
+        right += "long";
+        right += DB::IAST::hilite_none;
+        ASSERT_PRED2(are_equal_with_hilites_and_end_without_hilite, left, right);
+    }
+}
diff --git a/src/Parsers/IAST.cpp b/src/Parsers/IAST.cpp
index 869c0969dd6..0138372ce89 100644
--- a/src/Parsers/IAST.cpp
+++ b/src/Parsers/IAST.cpp
@@ -167,14 +167,10 @@ size_t IAST::checkDepthImpl(size_t max_depth) const
     return res;
 }
 
-String IAST::formatWithSecretsHidden(size_t max_length, bool one_line) const
+String IAST::formatWithPossiblyHidingSensitiveData(size_t max_length, bool one_line, bool show_secrets) const
 {
     WriteBufferFromOwnString buf;
-
-    FormatSettings settings{buf, one_line};
-    settings.show_secrets = false;
-    format(settings);
-
+    format({buf, one_line, show_secrets});
     return wipeSensitiveDataAndCutToLength(buf.str(), max_length);
 }
 
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
index 627b1174b33..aa5302a15b9 100644
--- a/src/Parsers/IAST.h
+++ b/src/Parsers/IAST.h
@@ -175,6 +175,16 @@ public:
         field = nullptr;
     }
 
+    /// After changing one of `children` elements, update the corresponding member pointer if needed.
+    void updatePointerToChild(void * old_ptr, void * new_ptr)
+    {
+        forEachPointerToChild([old_ptr, new_ptr](void ** ptr) mutable
+        {
+            if (*ptr == old_ptr)
+                *ptr = new_ptr;
+        });
+    }
+
     /// Convert to a string.
 
     /// Format settings.
@@ -190,15 +200,16 @@ public:
         // Newline or whitespace.
         char nl_or_ws;
 
-        FormatSettings(WriteBuffer & ostr_, bool one_line_)
-            : ostr(ostr_), one_line(one_line_)
+        FormatSettings(WriteBuffer & ostr_, bool one_line_, bool show_secrets_ = true)
+            : ostr(ostr_), one_line(one_line_), show_secrets(show_secrets_)
         {
             nl_or_ws = one_line ? ' ' : '\n';
         }
 
         FormatSettings(WriteBuffer & ostr_, const FormatSettings & other)
             : ostr(ostr_), hilite(other.hilite), one_line(other.one_line),
-            always_quote_identifiers(other.always_quote_identifiers), identifier_quoting_style(other.identifier_quoting_style)
+            always_quote_identifiers(other.always_quote_identifiers), identifier_quoting_style(other.identifier_quoting_style),
+            show_secrets(other.show_secrets)
         {
             nl_or_ws = one_line ? ' ' : '\n';
         }
@@ -240,12 +251,26 @@ public:
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown element in AST: {}", getID());
     }
 
-    // A simple way to add some user-readable context to an error message.
-    String formatWithSecretsHidden(size_t max_length = 0, bool one_line = true) const;
-    String formatForLogging(size_t max_length = 0) const { return formatWithSecretsHidden(max_length, true); }
-    String formatForErrorMessage() const { return formatWithSecretsHidden(0, true); }
+    // Secrets are displayed regarding show_secrets, then SensitiveDataMasker is applied.
+    // You can use Interpreters/formatWithPossiblyHidingSecrets.h for convenience.
+    String formatWithPossiblyHidingSensitiveData(size_t max_length, bool one_line, bool show_secrets) const;
+
+    /*
+     * formatForLogging and formatForErrorMessage always hide secrets. This inconsistent
+     * behaviour is due to the fact such functions are called from Client which knows nothing about
+     * access rights and settings. Moreover, the only use case for displaying secrets are backups,
+     * and backup tools use only direct input and ignore logs and error messages.
+     */
+    String formatForLogging(size_t max_length = 0) const
+    {
+        return formatWithPossiblyHidingSensitiveData(max_length, true, false);
+    }
+
+    String formatForErrorMessage() const
+    {
+        return formatWithPossiblyHidingSensitiveData(0, true, false);
+    }
 
-    /// If an AST has secret parts then formatForLogging() will replace them with the placeholder '[HIDDEN]'.
     virtual bool hasSecretParts() const { return childrenHaveSecretParts(); }
 
     void cloneChildren();
@@ -258,6 +283,7 @@ public:
         Delete,
         Create,
         Drop,
+        Undrop,
         Rename,
         Optimize,
         Check,
@@ -295,6 +321,10 @@ public:
 protected:
     bool childrenHaveSecretParts() const;
 
+    /// Some AST classes have naked pointers to children elements as members.
+    /// This method allows to iterate over them.
+    virtual void forEachPointerToChild(std::function<void(void**)>) {}
+
 private:
     size_t checkDepthImpl(size_t max_depth) const;
 
diff --git a/src/Parsers/IParser.h b/src/Parsers/IParser.h
index dbd292bcd9f..d53b58baa7c 100644
--- a/src/Parsers/IParser.h
+++ b/src/Parsers/IParser.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <absl/container/inlined_vector.h>
+#include <algorithm>
 #include <memory>
 
 #include <Core/Defines.h>
diff --git a/src/Parsers/Kusto/ParserKQLSort.cpp b/src/Parsers/Kusto/ParserKQLSort.cpp
index f7540d729fd..ef4b84b17c7 100644
--- a/src/Parsers/Kusto/ParserKQLSort.cpp
+++ b/src/Parsers/Kusto/ParserKQLSort.cpp
@@ -27,7 +27,7 @@ bool ParserKQLSort :: parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     while (!new_pos->isEnd() && new_pos->type != TokenType::PipeMark && new_pos->type != TokenType::Semicolon)
     {
         String tmp(new_pos->begin, new_pos->end);
-        if (tmp == "desc" or tmp == "asc")
+        if (tmp == "desc" || tmp == "asc")
             has_dir = true;
 
         if (new_pos->type == TokenType::Comma)
diff --git a/src/Parsers/MySQL/ASTAlterCommand.h b/src/Parsers/MySQL/ASTAlterCommand.h
index f097ed71219..87b665ec6a5 100644
--- a/src/Parsers/MySQL/ASTAlterCommand.h
+++ b/src/Parsers/MySQL/ASTAlterCommand.h
@@ -80,6 +80,15 @@ protected:
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method formatImpl is not supported by MySQLParser::ASTAlterCommand.");
     }
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&index_decl));
+        f(reinterpret_cast<void **>(&default_expression));
+        f(reinterpret_cast<void **>(&additional_columns));
+        f(reinterpret_cast<void **>(&order_by_columns));
+        f(reinterpret_cast<void **>(&properties));
+    }
 };
 
 class ParserAlterCommand : public IParserBase
diff --git a/src/Parsers/MySQL/ASTCreateDefines.h b/src/Parsers/MySQL/ASTCreateDefines.h
index 3d2a79568ab..7c23d1cb87f 100644
--- a/src/Parsers/MySQL/ASTCreateDefines.h
+++ b/src/Parsers/MySQL/ASTCreateDefines.h
@@ -31,6 +31,13 @@ protected:
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method formatImpl is not supported by MySQLParser::ASTCreateDefines.");
     }
+
+    void forEachPointerToChild(std::function<void(void**)> f) override
+    {
+        f(reinterpret_cast<void **>(&columns));
+        f(reinterpret_cast<void **>(&indices));
+        f(reinterpret_cast<void **>(&constraints));
+    }
 };
 
 class ParserCreateDefines : public IParserBase
@@ -44,4 +51,3 @@ protected:
 }
 
 }
-
diff --git a/src/Parsers/ParserBackupQuery.cpp b/src/Parsers/ParserBackupQuery.cpp
index cead1a98c1a..cbe4567ee90 100644
--- a/src/Parsers/ParserBackupQuery.cpp
+++ b/src/Parsers/ParserBackupQuery.cpp
@@ -103,7 +103,7 @@ namespace
         });
     }
 
-    bool parseElement(IParser::Pos & pos, Expected & expected, bool allow_all, Element & element)
+    bool parseElement(IParser::Pos & pos, Expected & expected, Element & element)
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
@@ -169,7 +169,7 @@ namespace
                 return true;
             }
 
-            if (allow_all && ParserKeyword{"ALL"}.ignore(pos, expected))
+            if (ParserKeyword{"ALL"}.ignore(pos, expected))
             {
                 element.type = ElementType::ALL;
                 parseExceptDatabases(pos, expected, element.except_databases);
@@ -181,7 +181,7 @@ namespace
         });
     }
 
-    bool parseElements(IParser::Pos & pos, Expected & expected, bool allow_all, std::vector<Element> & elements)
+    bool parseElements(IParser::Pos & pos, Expected & expected, std::vector<Element> & elements)
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
@@ -190,7 +190,7 @@ namespace
             auto parse_element = [&]
             {
                 Element element;
-                if (parseElement(pos, expected, allow_all, element))
+                if (parseElement(pos, expected, element))
                 {
                     result.emplace_back(std::move(element));
                     return true;
@@ -334,11 +334,8 @@ bool ParserBackupQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     else
         return false;
 
-    /// Disable "ALL" if this is a RESTORE command.
-    bool allow_all = (kind == Kind::RESTORE);
-
     std::vector<Element> elements;
-    if (!parseElements(pos, expected, allow_all, elements))
+    if (!parseElements(pos, expected, elements))
         return false;
 
     String cluster;
diff --git a/src/Parsers/ParserCreateQuery.h b/src/Parsers/ParserCreateQuery.h
index ef87988aab2..5f79a4b68f6 100644
--- a/src/Parsers/ParserCreateQuery.h
+++ b/src/Parsers/ParserCreateQuery.h
@@ -244,7 +244,9 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
             auto default_function = std::make_shared<ASTFunction>();
             default_function->name = "defaultValueOfTypeName";
             default_function->arguments = std::make_shared<ASTExpressionList>();
-            default_function->arguments->children.emplace_back(std::make_shared<ASTLiteral>(type->as<ASTFunction>()->formatWithSecretsHidden()));
+            // Ephemeral columns don't really have secrets but we need to format
+            // into a String, hence the strange call
+            default_function->arguments->children.emplace_back(std::make_shared<ASTLiteral>(type->as<ASTFunction>()->formatForLogging()));
             default_expression = default_function;
         }
 
@@ -265,6 +267,10 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
         }
     }
 
+    /// This will rule out unusual expressions like *, t.* that cannot appear in DEFAULT
+    if (default_expression && !dynamic_cast<const ASTWithAlias *>(default_expression.get()))
+        return false;
+
     if (require_type && !type && !default_expression)
         return false; /// reject column name without type
 
diff --git a/src/Parsers/ParserQueryWithOutput.cpp b/src/Parsers/ParserQueryWithOutput.cpp
index 7024d8cbe11..6796f4528c4 100644
--- a/src/Parsers/ParserQueryWithOutput.cpp
+++ b/src/Parsers/ParserQueryWithOutput.cpp
@@ -6,6 +6,7 @@
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserDescribeTableQuery.h>
 #include <Parsers/ParserDropQuery.h>
+#include <Parsers/ParserUndropQuery.h>
 #include <Parsers/ParserExplainQuery.h>
 #include <Parsers/ParserKillQueryQuery.h>
 #include <Parsers/ParserOptimizeQuery.h>
@@ -15,7 +16,9 @@
 #include <Parsers/ParserSetQuery.h>
 #include <Parsers/ParserShowProcesslistQuery.h>
 #include <Parsers/ParserShowTablesQuery.h>
+#include <Parsers/ParserShowColumnsQuery.h>
 #include <Parsers/ParserShowEngineQuery.h>
+#include <Parsers/ParserShowIndexesQuery.h>
 #include <Parsers/ParserTablePropertiesQuery.h>
 #include <Parsers/ParserWatchQuery.h>
 #include <Parsers/ParserDescribeCacheQuery.h>
@@ -25,7 +28,8 @@
 #include <Parsers/Access/ParserShowCreateAccessEntityQuery.h>
 #include <Parsers/Access/ParserShowGrantsQuery.h>
 #include <Parsers/Access/ParserShowPrivilegesQuery.h>
-#include "Common/Exception.h"
+#include <Common/Exception.h>
+#include <Common/assert_cast.h>
 
 
 namespace DB
@@ -34,7 +38,9 @@ namespace DB
 bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ParserShowTablesQuery show_tables_p;
+    ParserShowColumnsQuery show_columns_p;
     ParserShowEnginesQuery show_engine_p;
+    ParserShowIndexesQuery show_indexes_p;
     ParserSelectWithUnionQuery select_p;
     ParserTablePropertiesQuery table_p;
     ParserDescribeTableQuery describe_table_p;
@@ -44,6 +50,7 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     ParserAlterQuery alter_p;
     ParserRenameQuery rename_p;
     ParserDropQuery drop_p;
+    ParserUndropQuery undrop_p;
     ParserCheckQuery check_p;
     ParserOptimizeQuery optimize_p;
     ParserKillQueryQuery kill_query_p;
@@ -62,7 +69,9 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         || select_p.parse(pos, query, expected)
         || show_create_access_entity_p.parse(pos, query, expected) /// should be before `show_tables_p`
         || show_tables_p.parse(pos, query, expected)
+        || show_columns_p.parse(pos, query, expected)
         || show_engine_p.parse(pos, query, expected)
+        || show_indexes_p.parse(pos, query, expected)
         || table_p.parse(pos, query, expected)
         || describe_cache_p.parse(pos, query, expected)
         || describe_table_p.parse(pos, query, expected)
@@ -71,6 +80,7 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         || alter_p.parse(pos, query, expected)
         || rename_p.parse(pos, query, expected)
         || drop_p.parse(pos, query, expected)
+        || undrop_p.parse(pos, query, expected)
         || check_p.parse(pos, query, expected)
         || kill_query_p.parse(pos, query, expected)
         || optimize_p.parse(pos, query, expected)
@@ -93,6 +103,12 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         if (!out_file_p.parse(pos, query_with_output.out_file, expected))
             return false;
 
+        ParserKeyword s_append("APPEND");
+        if (s_append.ignore(pos, expected))
+        {
+            query_with_output.is_outfile_append = true;
+        }
+
         ParserKeyword s_stdout("AND STDOUT");
         if (s_stdout.ignore(pos, expected))
         {
diff --git a/src/Parsers/ParserSelectQuery.cpp b/src/Parsers/ParserSelectQuery.cpp
index 17b082a2ddb..1c48f773823 100644
--- a/src/Parsers/ParserSelectQuery.cpp
+++ b/src/Parsers/ParserSelectQuery.cpp
@@ -68,7 +68,7 @@ bool ParserSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     ParserNotEmptyExpressionList exp_list(false);
     ParserNotEmptyExpressionList exp_list_for_with_clause(false);
-    ParserNotEmptyExpressionList exp_list_for_select_clause(true);    /// Allows aliases without AS keyword.
+    ParserNotEmptyExpressionList exp_list_for_select_clause(/*allow_alias_without_as_keyword*/ true, /*allow_trailing_commas*/ true);
     ParserExpressionWithOptionalAlias exp_elem(false);
     ParserOrderByExpressionList order_list;
     ParserGroupingSetsExpressionList grouping_sets_list;
diff --git a/src/Parsers/ParserShowColumnsQuery.cpp b/src/Parsers/ParserShowColumnsQuery.cpp
new file mode 100644
index 00000000000..e5fc5c39701
--- /dev/null
+++ b/src/Parsers/ParserShowColumnsQuery.cpp
@@ -0,0 +1,97 @@
+#include <Parsers/ParserShowColumnsQuery.h>
+
+#include <Parsers/ASTIdentifier_fwd.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTShowColumnsQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+
+#include <boost/algorithm/string.hpp>
+
+namespace DB
+{
+
+bool ParserShowColumnsQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ASTPtr like;
+    ASTPtr from1;
+    ASTPtr from2;
+
+    String from1_str;
+    String from2_str;
+
+    auto query = std::make_shared<ASTShowColumnsQuery>();
+
+    if (!ParserKeyword("SHOW").ignore(pos, expected))
+        return false;
+
+    if (ParserKeyword("EXTENDED").ignore(pos, expected))
+        query->extended = true;
+
+    if (ParserKeyword("FULL").ignore(pos, expected))
+        query->full = true;
+
+    if (!(ParserKeyword("COLUMNS").ignore(pos, expected) || ParserKeyword("FIELDS").ignore(pos, expected)))
+        return false;
+
+    if (ParserKeyword("FROM").ignore(pos, expected) || ParserKeyword("IN").ignore(pos, expected))
+    {
+        if (!ParserCompoundIdentifier().parse(pos, from1, expected))
+            return false;
+    }
+    else
+        return false;
+
+    tryGetIdentifierNameInto(from1, from1_str);
+
+    bool abbreviated_form = from1_str.contains("."); // FROM database.table
+    if (abbreviated_form)
+    {
+        std::vector<String> split;
+        boost::split(split, from1_str, boost::is_any_of("."));
+        query->database = split[0];
+        query->table = split[1];
+    }
+    else
+    {
+        if (ParserKeyword("FROM").ignore(pos, expected) || ParserKeyword("IN").ignore(pos, expected))
+            if (!ParserIdentifier().parse(pos, from2, expected))
+                return false;
+
+        tryGetIdentifierNameInto(from2, from2_str);
+
+        query->table = from1_str;
+        query->database = from2_str;
+    }
+
+    if (ParserKeyword("NOT").ignore(pos, expected))
+        query->not_like = true;
+
+    if (bool insensitive = ParserKeyword("ILIKE").ignore(pos, expected); insensitive || ParserKeyword("LIKE").ignore(pos, expected))
+    {
+        if (insensitive)
+            query->case_insensitive_like = true;
+
+        if (!ParserStringLiteral().parse(pos, like, expected))
+            return false;
+    }
+    else if (query->not_like)
+        return false;
+    else if (ParserKeyword("WHERE").ignore(pos, expected))
+        if (!ParserExpressionWithOptionalAlias(false).parse(pos, query->where_expression, expected))
+            return false;
+
+    if (ParserKeyword("LIMIT").ignore(pos, expected))
+        if (!ParserExpressionWithOptionalAlias(false).parse(pos, query->limit_length, expected))
+            return false;
+
+    if (like)
+        query->like = like->as<ASTLiteral &>().value.safeGet<const String &>();
+
+    node = query;
+
+    return true;
+}
+
+}
diff --git a/src/Parsers/ParserShowColumnsQuery.h b/src/Parsers/ParserShowColumnsQuery.h
new file mode 100644
index 00000000000..a2941ca71d1
--- /dev/null
+++ b/src/Parsers/ParserShowColumnsQuery.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <Parsers/IParserBase.h>
+
+namespace DB
+{
+
+/** Parses queries of the form
+ * SHOW [EXTENDED] [FULL] COLUMNS FROM|IN tbl [FROM|IN db] [[NOT] LIKE|ILIKE expr | WHERE expr] [LIMIT n]
+ */
+class ParserShowColumnsQuery : public IParserBase
+{
+protected:
+    const char * getName() const override { return "SHOW COLUMNS query"; }
+
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
+}
diff --git a/src/Parsers/ParserShowIndexesQuery.cpp b/src/Parsers/ParserShowIndexesQuery.cpp
new file mode 100644
index 00000000000..fe08b463069
--- /dev/null
+++ b/src/Parsers/ParserShowIndexesQuery.cpp
@@ -0,0 +1,74 @@
+#include <Parsers/ParserShowIndexesQuery.h>
+
+#include <Parsers/ASTIdentifier_fwd.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTShowIndexesQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+
+#include <boost/algorithm/string.hpp>
+
+namespace DB
+{
+
+bool ParserShowIndexesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ASTPtr from1;
+    ASTPtr from2;
+
+    String from1_str;
+    String from2_str;
+
+    auto query = std::make_shared<ASTShowIndexesQuery>();
+
+    if (!ParserKeyword("SHOW").ignore(pos, expected))
+        return false;
+
+    if (ParserKeyword("EXTENDED").ignore(pos, expected))
+        query->extended = true;
+
+    if (!(ParserKeyword("INDEX").ignore(pos, expected) || ParserKeyword("INDEXES").ignore(pos, expected) || ParserKeyword("KEYS").ignore(pos, expected)))
+        return false;
+
+    if (ParserKeyword("FROM").ignore(pos, expected) || ParserKeyword("IN").ignore(pos, expected))
+    {
+        if (!ParserCompoundIdentifier().parse(pos, from1, expected))
+            return false;
+    }
+    else
+        return false;
+
+    tryGetIdentifierNameInto(from1, from1_str);
+
+    bool abbreviated_form = from1_str.contains("."); // FROM database.table
+    if (abbreviated_form)
+    {
+        std::vector<String> split;
+        boost::split(split, from1_str, boost::is_any_of("."));
+        query->database = split[0];
+        query->table = split[1];
+    }
+    else
+    {
+        if (ParserKeyword("FROM").ignore(pos, expected) || ParserKeyword("IN").ignore(pos, expected))
+            if (!ParserIdentifier().parse(pos, from2, expected))
+                return false;
+
+        tryGetIdentifierNameInto(from2, from2_str);
+
+        query->table = from1_str;
+        query->database = from2_str;
+    }
+
+    if (ParserKeyword("WHERE").ignore(pos, expected))
+        if (!ParserExpressionWithOptionalAlias(false).parse(pos, query->where_expression, expected))
+            return false;
+
+    node = query;
+
+    return true;
+}
+
+}
+
diff --git a/src/Parsers/ParserShowIndexesQuery.h b/src/Parsers/ParserShowIndexesQuery.h
new file mode 100644
index 00000000000..0ece5e89ef7
--- /dev/null
+++ b/src/Parsers/ParserShowIndexesQuery.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <Parsers/IParserBase.h>
+
+namespace DB
+{
+
+/** Parses queries of the form
+ * SHOW [EXTENDED] INDEX|INDEXES|KEYS FROM|IN tbl [FROM|IN db] [WHERE expr]
+ */
+class ParserShowIndexesQuery : public IParserBase
+{
+protected:
+    const char * getName() const override { return "SHOW INDEXES query"; }
+
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
+}
+
diff --git a/src/Parsers/ParserShowTablesQuery.cpp b/src/Parsers/ParserShowTablesQuery.cpp
index 1647dd9a5b4..3540a6d3fc8 100644
--- a/src/Parsers/ParserShowTablesQuery.cpp
+++ b/src/Parsers/ParserShowTablesQuery.cpp
@@ -149,10 +149,8 @@ bool ParserShowTablesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         }
 
         if (s_from.ignore(pos, expected) || s_in.ignore(pos, expected))
-        {
             if (!name_p.parse(pos, database, expected))
                 return false;
-        }
 
         if (s_not.ignore(pos, expected))
             query->not_like = true;
@@ -168,16 +166,12 @@ bool ParserShowTablesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         else if (query->not_like)
             return false;
         else if (s_where.ignore(pos, expected))
-        {
             if (!exp_elem.parse(pos, query->where_expression, expected))
                 return false;
-        }
 
         if (s_limit.ignore(pos, expected))
-        {
             if (!exp_elem.parse(pos, query->limit_length, expected))
                 return false;
-        }
     }
 
     tryGetIdentifierNameInto(database, query->from);
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index 0eb263869b1..48dbe60e241 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -159,6 +159,14 @@ enum class SystemQueryTargetType
     if (!ParserStringLiteral{}.parse(pos, ast, expected))
         return false;
     res->replica = ast->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (ParserKeyword{"FROM SHARD"}.ignore(pos, expected))
+    {
+        if (!ParserStringLiteral{}.parse(pos, ast, expected))
+            return false;
+        res->shard = ast->as<ASTLiteral &>().value.safeGet<String>();
+    }
+
     if (ParserKeyword{"FROM"}.ignore(pos, expected))
     {
         // way 1. parse replica database
@@ -250,6 +258,16 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                 return false;
             break;
         }
+        case Type::ENABLE_FAILPOINT:
+        case Type::DISABLE_FAILPOINT:
+        {
+            ASTPtr ast;
+            if (ParserIdentifier{}.parse(pos, ast, expected))
+                res->fail_point_name = ast->as<ASTIdentifier &>().name();
+            else
+                return false;
+            break;
+        }
 
         case Type::RESTART_REPLICA:
         case Type::SYNC_REPLICA:
@@ -259,6 +277,15 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                 return false;
             if (!parseDatabaseAndTableAsAST(pos, expected, res->database, res->table))
                 return false;
+            if (res->type == Type::SYNC_REPLICA)
+            {
+                if (ParserKeyword{"STRICT"}.ignore(pos, expected))
+                    res->sync_replica_mode = SyncReplicaMode::STRICT;
+                else if (ParserKeyword{"LIGHTWEIGHT"}.ignore(pos, expected))
+                    res->sync_replica_mode = SyncReplicaMode::LIGHTWEIGHT;
+                else if (ParserKeyword{"PULL"}.ignore(pos, expected))
+                    res->sync_replica_mode = SyncReplicaMode::PULL;
+            }
             break;
         }
 
@@ -378,7 +405,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
             ParserLiteral path_parser;
             ASTPtr ast;
             if (path_parser.parse(pos, ast, expected))
-                res->filesystem_cache_path = ast->as<ASTLiteral>()->value.safeGet<String>();
+                res->filesystem_cache_name = ast->as<ASTLiteral>()->value.safeGet<String>();
             if (!parseQueryWithOnCluster(res, pos, expected))
                 return false;
             break;
diff --git a/src/Parsers/ParserTablePropertiesQuery.cpp b/src/Parsers/ParserTablePropertiesQuery.cpp
index 84f12f97ea1..b73ce8de359 100644
--- a/src/Parsers/ParserTablePropertiesQuery.cpp
+++ b/src/Parsers/ParserTablePropertiesQuery.cpp
@@ -61,8 +61,13 @@ bool ParserTablePropertiesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
     }
     else if (s_show.ignore(pos, expected))
     {
-        if (!s_create.ignore(pos, expected))
-            return false;
+        bool has_create = false;
+
+        if (s_create.checkWithoutMoving(pos, expected))
+        {
+            has_create = true;
+            s_create.ignore(pos, expected);
+        }
 
         if (s_database.ignore(pos, expected))
         {
@@ -77,7 +82,15 @@ bool ParserTablePropertiesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
             parse_show_create_view = true;
         }
         else
-            query = std::make_shared<ASTShowCreateTableQuery>();
+        {
+            /// We support `SHOW CREATE tbl;` and `SHOW TABLE tbl`,
+            /// but do not support `SHOW tbl`, which is ambiguous
+            /// with other statement like `SHOW PRIVILEGES`.
+            if (has_create || s_table.checkWithoutMoving(pos, expected))
+                query = std::make_shared<ASTShowCreateTableQuery>();
+            else
+                return false;
+        }
     }
     else
     {
diff --git a/src/Parsers/ParserTablesInSelectQuery.cpp b/src/Parsers/ParserTablesInSelectQuery.cpp
index 617ab7816d4..08b6f77fafa 100644
--- a/src/Parsers/ParserTablesInSelectQuery.cpp
+++ b/src/Parsers/ParserTablesInSelectQuery.cpp
@@ -225,7 +225,6 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
             }
             else if (ParserKeyword("ON").ignore(pos, expected))
             {
-                /// OR is operator with lowest priority, so start parsing from it.
                 if (!ParserExpression().parse(pos, table_join->on_expression, expected))
                     return false;
             }
diff --git a/src/Parsers/ParserUndropQuery.cpp b/src/Parsers/ParserUndropQuery.cpp
new file mode 100644
index 00000000000..3784ab0f353
--- /dev/null
+++ b/src/Parsers/ParserUndropQuery.cpp
@@ -0,0 +1,81 @@
+#include <Parsers/ASTUndropQuery.h>
+
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ParserUndropQuery.h>
+#include "Parsers/ASTLiteral.h"
+
+
+namespace DB
+{
+
+namespace
+{
+
+bool parseUndropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ParserKeyword s_table("TABLE");
+    ParserToken s_dot(TokenType::Dot);
+    ParserIdentifier name_p(true);
+
+    ASTPtr database;
+    ASTPtr table;
+    String cluster_str;
+    /// We can specify the table's uuid for exact undrop.
+    /// because the same name of a table can be created and deleted multiple times,
+    /// and can generate multiple different uuids.
+    UUID uuid = UUIDHelpers::Nil;
+
+    if (!s_table.ignore(pos, expected))
+        return false;
+    if (!name_p.parse(pos, table, expected))
+        return false;
+    if (s_dot.ignore(pos, expected))
+    {
+        database = table;
+        if (!name_p.parse(pos, table, expected))
+            return false;
+    }
+    if (ParserKeyword("UUID").ignore(pos, expected))
+    {
+        ParserStringLiteral uuid_p;
+        ASTPtr ast_uuid;
+        if (!uuid_p.parse(pos, ast_uuid, expected))
+            return false;
+        uuid = parseFromString<UUID>(ast_uuid->as<ASTLiteral>()->value.get<String>());
+    }
+    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    {
+        if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+            return false;
+    }
+    auto query = std::make_shared<ASTUndropQuery>();
+    node = query;
+
+    query->database = database;
+    query->table = table;
+    query->uuid = uuid;
+
+    if (database)
+        query->children.push_back(database);
+
+    assert (table);
+    query->children.push_back(table);
+
+    query->cluster = cluster_str;
+
+    return true;
+}
+
+}
+
+bool ParserUndropQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ParserKeyword s_undrop("UNDROP");
+
+    if (s_undrop.ignore(pos, expected))
+        return parseUndropQuery(pos, node, expected);
+    else
+        return false;
+}
+
+}
diff --git a/src/Parsers/ParserUndropQuery.h b/src/Parsers/ParserUndropQuery.h
new file mode 100644
index 00000000000..4b289600396
--- /dev/null
+++ b/src/Parsers/ParserUndropQuery.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <Parsers/IParserBase.h>
+#include <Parsers/ExpressionElementParsers.h>
+
+
+namespace DB
+{
+
+/** Query like this:
+  * UNDROP TABLE [db.]name [UUID uuid]
+  */
+class ParserUndropQuery : public IParserBase
+{
+protected:
+    const char * getName() const  override{ return "UNDROP query"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
+}
diff --git a/src/Parsers/SyncReplicaMode.h b/src/Parsers/SyncReplicaMode.h
new file mode 100644
index 00000000000..6b19eb57fdc
--- /dev/null
+++ b/src/Parsers/SyncReplicaMode.h
@@ -0,0 +1,13 @@
+#pragma once
+#include <cstdint>
+
+namespace DB
+{
+enum class SyncReplicaMode : uint8_t
+{
+    DEFAULT,
+    STRICT,
+    LIGHTWEIGHT,
+    PULL,
+};
+}
diff --git a/src/Parsers/tests/gtest_Parser.cpp b/src/Parsers/tests/gtest_Parser.cpp
index b452bd27642..19872c4189a 100644
--- a/src/Parsers/tests/gtest_Parser.cpp
+++ b/src/Parsers/tests/gtest_Parser.cpp
@@ -5,6 +5,7 @@
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/Access/ASTCreateUserQuery.h>
 #include <Parsers/Access/ParserCreateUserQuery.h>
+#include <Parsers/Access/ASTAuthenticationData.h>
 #include <Parsers/ParserAlterQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserOptimizeQuery.h>
@@ -69,7 +70,7 @@ TEST_P(ParserTest, parseQuery)
             {
                 if (input_text.starts_with("ATTACH"))
                 {
-                    auto salt = (dynamic_cast<const ASTCreateUserQuery *>(ast.get())->auth_data)->getSalt();
+                    auto salt = (dynamic_cast<const ASTCreateUserQuery *>(ast.get())->auth_data)->getSalt().value_or("");
                     EXPECT_TRUE(std::regex_match(salt, std::regex(expected_ast)));
                 }
                 else
@@ -260,7 +261,7 @@ INSTANTIATE_TEST_SUITE_P(ParserCreateUserQuery, ParserTest,
         ::testing::ValuesIn(std::initializer_list<ParserTestCase>{
         {
             "CREATE USER user1 IDENTIFIED WITH sha256_password BY 'qwe123'",
-            "CREATE USER user1 IDENTIFIED WITH sha256_hash BY '[A-Za-z0-9]{64}' SALT '[A-Za-z0-9]{64}'"
+            "CREATE USER user1 IDENTIFIED WITH sha256_password BY 'qwe123'"
         },
         {
             "CREATE USER user1 IDENTIFIED WITH sha256_hash BY '7A37B85C8918EAC19A9089C0FA5A2AB4DCE3F90528DCDEEC108B23DDF3607B99' SALT 'salt'",
@@ -268,7 +269,7 @@ INSTANTIATE_TEST_SUITE_P(ParserCreateUserQuery, ParserTest,
         },
         {
             "ALTER USER user1 IDENTIFIED WITH sha256_password BY 'qwe123'",
-            "ALTER USER user1 IDENTIFIED WITH sha256_hash BY '[A-Za-z0-9]{64}' SALT '[A-Za-z0-9]{64}'"
+            "ALTER USER user1 IDENTIFIED WITH sha256_password BY 'qwe123'"
         },
         {
             "ALTER USER user1 IDENTIFIED WITH sha256_hash BY '7A37B85C8918EAC19A9089C0FA5A2AB4DCE3F90528DCDEEC108B23DDF3607B99' SALT 'salt'",
diff --git a/src/Parsers/tests/gtest_dictionary_parser.cpp b/src/Parsers/tests/gtest_dictionary_parser.cpp
index fa824a1807a..22484727ea2 100644
--- a/src/Parsers/tests/gtest_dictionary_parser.cpp
+++ b/src/Parsers/tests/gtest_dictionary_parser.cpp
@@ -16,9 +16,7 @@
 
 using namespace DB;
 
-#pragma GCC diagnostic ignored "-Wunused-function"
-
-static String astToString(IAST * ast)
+[[maybe_unused]] static String astToString(IAST * ast)
 {
     WriteBufferFromOwnString buf;
     dumpAST(*ast, buf);
diff --git a/src/Parsers/tests/gtest_format_hiliting.cpp b/src/Parsers/tests/gtest_format_hiliting.cpp
new file mode 100644
index 00000000000..d0ce8f2c897
--- /dev/null
+++ b/src/Parsers/tests/gtest_format_hiliting.cpp
@@ -0,0 +1,133 @@
+#include <unordered_set>
+
+#include <Parsers/IAST.h>
+#include <Parsers/ParserQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/HiliteComparator/HiliteComparator.h>
+#include <gtest/gtest.h>
+#include <Common/StackTrace.h>
+
+
+String hilite(const String & s, const char * hilite_type)
+{
+    return hilite_type + s + DB::IAST::hilite_none;
+}
+
+String keyword(const String & s)
+{
+    return hilite(s, DB::IAST::hilite_keyword);
+}
+
+String identifier(const String & s)
+{
+    return hilite(s, DB::IAST::hilite_identifier);
+}
+
+String alias(const String & s)
+{
+    return hilite(s, DB::IAST::hilite_alias);
+}
+
+String op(const String & s)
+{
+    return hilite(s, DB::IAST::hilite_operator);
+}
+
+String function(const String & s)
+{
+    return hilite(s, DB::IAST::hilite_function);
+}
+
+String substitution(const String & s)
+{
+    return hilite(s, DB::IAST::hilite_substitution);
+}
+
+
+void compare(const String & expected, const String & query)
+{
+    using namespace DB;
+    ParserQuery parser(query.data() + query.size());
+    ASTPtr ast = parseQuery(parser, query, 0, 0);
+
+    WriteBufferFromOwnString write_buffer;
+    IAST::FormatSettings settings(write_buffer, true);
+    settings.hilite = true;
+    ast->format(settings);
+
+    ASSERT_PRED2(HiliteComparator::are_equal_with_hilites_removed, expected, write_buffer.str());
+    ASSERT_PRED2(HiliteComparator::are_equal_with_hilites_and_end_without_hilite, expected, write_buffer.str());
+}
+
+const std::vector<std::pair<std::string, std::string>> expected_and_query_pairs = {
+    // Simple select
+    {
+        keyword("SELECT ") + "* " + keyword("FROM ") + identifier("table"),
+        "select * from table"
+    },
+
+    // ASTWithElement
+    {
+        keyword("WITH ") + alias("alias ") + keyword("AS ")
+            + "(" + keyword("SELECT ") + "* " + keyword("FROM ") + identifier("table") + ") "
+            + keyword("SELECT ") + "* " + keyword("FROM ") + identifier("table"),
+        "with alias as (select * from table) select * from table"
+    },
+
+    // ASTWithAlias
+    {
+        keyword("SELECT ") + identifier("a ") + op("+ ") + "1 " + keyword("AS ") + alias("b") + ", " + identifier("b"),
+        "select a + 1 as b, b"
+    },
+
+    // ASTFunction
+    {
+        keyword("SELECT ") + "* " + keyword("FROM ")
+            + function("view(") + keyword("SELECT ") + "* " + keyword("FROM ") + identifier("table") + function(")"),
+        "select * from view(select * from table)"
+    },
+
+    // ASTDictionaryAttributeDeclaration
+    {
+        keyword("CREATE DICTIONARY ") + "name "
+            + "(`Name` " + function("ClickHouseDataType ")
+            + keyword("DEFAULT ") + "'' "
+            + keyword("EXPRESSION ") + function("rand64() ")
+            + keyword("IS_OBJECT_ID") + ")",
+        "CREATE DICTIONARY name (`Name` ClickHouseDataType DEFAULT '' EXPRESSION rand64() IS_OBJECT_ID)"
+    },
+
+    // ASTDictionary, SOURCE keyword
+    {
+        keyword("CREATE DICTIONARY ") + "name "
+            + "(`Name` " + function("ClickHouseDataType ")
+            + keyword("DEFAULT ") + "'' "
+            + keyword("EXPRESSION ") + function("rand64() ")
+            + keyword("IS_OBJECT_ID") + ") "
+            + keyword("SOURCE") + "(" + keyword("FILE") + "(" + keyword("PATH ") + "'path'))",
+        "CREATE DICTIONARY name (`Name` ClickHouseDataType DEFAULT '' EXPRESSION rand64() IS_OBJECT_ID) "
+        "SOURCE(FILE(PATH 'path'))"
+    },
+
+    // ASTKillQueryQuery
+    {
+        keyword("KILL QUERY ON CLUSTER ") + "clustername "
+            + keyword("WHERE ") + identifier("user ") + op("= ") + "'username' "
+            + keyword("SYNC"),
+        "KILL QUERY ON CLUSTER clustername WHERE user = 'username' SYNC"
+    },
+
+    // ASTCreateQuery
+    {
+        keyword("CREATE TABLE ") + "name " + keyword("AS (SELECT ") + "*" + keyword(") ")
+            + keyword("COMMENT ") + "'hello'",
+        "CREATE TABLE name AS (SELECT *) COMMENT 'hello'"
+    },
+};
+
+
+TEST(FormatHiliting, Queries)
+{
+    for (const auto & [expected, query] : expected_and_query_pairs)
+        compare(expected, query);
+}
diff --git a/src/Planner/CollectSets.cpp b/src/Planner/CollectSets.cpp
index bc4b0dd09f3..02069aad292 100644
--- a/src/Planner/CollectSets.cpp
+++ b/src/Planner/CollectSets.cpp
@@ -1,6 +1,7 @@
 #include <Planner/CollectSets.h>
 
 #include <Interpreters/Context.h>
+#include <Interpreters/PreparedSets.h>
 
 #include <Storages/StorageSet.h>
 
@@ -52,7 +53,8 @@ public:
 
         if (storage_set)
         {
-            planner_context.registerSet(set_key, PlannerSet(storage_set->getSet()));
+            /// Handle storage_set as ready set.
+            planner_context.registerSet(set_key, PlannerSet(FutureSet(storage_set->getSet())));
         }
         else if (const auto * constant_node = in_second_argument->as<ConstantNode>())
         {
@@ -62,16 +64,12 @@ public:
                 constant_node->getResultType(),
                 settings);
 
-            planner_context.registerSet(set_key, PlannerSet(std::move(set)));
+            planner_context.registerSet(set_key, PlannerSet(FutureSet(std::move(set))));
         }
         else if (in_second_argument_node_type == QueryTreeNodeType::QUERY ||
             in_second_argument_node_type == QueryTreeNodeType::UNION)
         {
-            SizeLimits size_limits_for_set = {settings.max_rows_in_set, settings.max_bytes_in_set, settings.set_overflow_mode};
-            bool tranform_null_in = settings.transform_null_in;
-            auto set = std::make_shared<Set>(size_limits_for_set, false /*fill_set_elements*/, tranform_null_in);
-
-            planner_context.registerSet(set_key, PlannerSet(std::move(set), in_second_argument));
+            planner_context.registerSet(set_key, PlannerSet(in_second_argument));
         }
         else
         {
diff --git a/src/Planner/CollectTableExpressionData.cpp b/src/Planner/CollectTableExpressionData.cpp
index 0b820e849f3..4b44374e8eb 100644
--- a/src/Planner/CollectTableExpressionData.cpp
+++ b/src/Planner/CollectTableExpressionData.cpp
@@ -10,6 +10,7 @@
 #include <Analyzer/TableFunctionNode.h>
 
 #include <Planner/PlannerContext.h>
+#include <Planner/PlannerActionsVisitor.h>
 
 namespace DB
 {
@@ -17,6 +18,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int ILLEGAL_PREWHERE;
 }
 
 namespace
@@ -78,23 +80,128 @@ public:
 
     static bool needChildVisit(const QueryTreeNodePtr &, const QueryTreeNodePtr & child_node)
     {
-        return !(child_node->getNodeType() == QueryTreeNodeType::QUERY || child_node->getNodeType() == QueryTreeNodeType::UNION);
+        auto child_node_type = child_node->getNodeType();
+        return !(child_node_type == QueryTreeNodeType::QUERY || child_node_type == QueryTreeNodeType::UNION);
     }
 
 private:
     PlannerContext & planner_context;
 };
 
+class CollectPrewhereTableExpressionVisitor : public ConstInDepthQueryTreeVisitor<CollectPrewhereTableExpressionVisitor>
+{
+public:
+    explicit CollectPrewhereTableExpressionVisitor(const QueryTreeNodePtr & query_node_)
+        : query_node(query_node_)
+    {}
+
+    const QueryTreeNodePtr & getPrewhereTableExpression() const
+    {
+        return table_expression;
+    }
+
+    void visitImpl(const QueryTreeNodePtr & node)
+    {
+        auto * column_node = node->as<ColumnNode>();
+        if (!column_node)
+            return;
+
+        auto column_source = column_node->getColumnSourceOrNull();
+        if (!column_source)
+            throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
+                "Invalid column {} in PREWHERE. In query {}",
+                column_node->formatASTForErrorMessage(),
+                query_node->formatASTForErrorMessage());
+
+        auto * table_column_source = column_source->as<TableNode>();
+        auto * table_function_column_source = column_source->as<TableFunctionNode>();
+
+        if (!table_column_source && !table_function_column_source)
+            throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
+                "Invalid column {} in PREWHERE. Expected column source to be table or table function. Actual {}. In query {}",
+                column_node->formatASTForErrorMessage(),
+                column_source->formatASTForErrorMessage(),
+                query_node->formatASTForErrorMessage());
+
+        if (table_expression && table_expression.get() != column_source.get())
+            throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
+                "Invalid column {} in PREWHERE. Expected columns from single table or table function {}. Actual {}. In query {}",
+                column_node->formatASTForErrorMessage(),
+                table_expression->formatASTForErrorMessage(),
+                column_source->formatASTForErrorMessage(),
+                query_node->formatASTForErrorMessage());
+
+        if (!table_expression)
+        {
+            const auto & storage = table_column_source ? table_column_source->getStorage() : table_function_column_source->getStorage();
+            if (!storage->supportsPrewhere())
+                throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
+                    "Storage {} (table {}) does not support PREWHERE",
+                    storage->getName(),
+                    storage->getStorageID().getNameForLogs());
+
+            table_expression = std::move(column_source);
+            table_supported_prewhere_columns = storage->supportedPrewhereColumns();
+        }
+
+        if (table_supported_prewhere_columns && !table_supported_prewhere_columns->contains(column_node->getColumnName()))
+            throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
+                "Table expression {} does not support column {} in PREWHERE. In query {}",
+                table_expression->formatASTForErrorMessage(),
+                column_node->formatASTForErrorMessage(),
+                query_node->formatASTForErrorMessage());
+    }
+
+    static bool needChildVisit(const QueryTreeNodePtr &, const QueryTreeNodePtr & child_node)
+    {
+        auto child_node_type = child_node->getNodeType();
+        return !(child_node_type == QueryTreeNodeType::QUERY || child_node_type == QueryTreeNodeType::UNION);
+    }
+
+private:
+    QueryTreeNodePtr query_node;
+    QueryTreeNodePtr table_expression;
+    std::optional<NameSet> table_supported_prewhere_columns;
+};
+
+void checkStorageSupportPrewhere(const QueryTreeNodePtr & table_expression)
+{
+    if (auto * table_node = table_expression->as<TableNode>())
+    {
+        auto storage = table_node->getStorage();
+        if (!storage->supportsPrewhere())
+            throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
+                "Storage {} (table {}) does not support PREWHERE",
+                storage->getName(),
+                storage->getStorageID().getNameForLogs());
+    }
+    else if (auto * table_function_node = table_expression->as<TableFunctionNode>())
+    {
+        auto storage = table_function_node->getStorage();
+        if (!storage->supportsPrewhere())
+            throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
+                "Table function storage {} (table {}) does not support PREWHERE",
+                storage->getName(),
+                storage->getStorageID().getNameForLogs());
+    }
+    else
+    {
+        throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
+            "Subquery {} does not support PREWHERE",
+            table_expression->formatASTForErrorMessage());
+    }
 }
 
-void collectTableExpressionData(QueryTreeNodePtr & query_node, PlannerContext & planner_context)
+}
+
+void collectTableExpressionData(QueryTreeNodePtr & query_node, PlannerContextPtr & planner_context)
 {
     auto & query_node_typed = query_node->as<QueryNode &>();
     auto table_expressions_nodes = extractTableExpressions(query_node_typed.getJoinTree());
 
     for (auto & table_expression_node : table_expressions_nodes)
     {
-        auto & table_expression_data = planner_context.getOrCreateTableExpressionData(table_expression_node);
+        auto & table_expression_data = planner_context->getOrCreateTableExpressionData(table_expression_node);
 
         if (auto * table_node = table_expression_node->as<TableNode>())
         {
@@ -108,8 +215,60 @@ void collectTableExpressionData(QueryTreeNodePtr & query_node, PlannerContext &
         }
     }
 
-    CollectSourceColumnsVisitor collect_source_columns_visitor(planner_context);
-    collect_source_columns_visitor.visit(query_node);
+    CollectSourceColumnsVisitor collect_source_columns_visitor(*planner_context);
+    for (auto & node : query_node_typed.getChildren())
+    {
+        if (!node || node == query_node_typed.getPrewhere())
+            continue;
+
+        auto node_type = node->getNodeType();
+        if (node_type == QueryTreeNodeType::QUERY || node_type == QueryTreeNodeType::UNION)
+            continue;
+
+        collect_source_columns_visitor.visit(node);
+    }
+
+    if (query_node_typed.hasPrewhere())
+    {
+        CollectPrewhereTableExpressionVisitor collect_prewhere_table_expression_visitor(query_node);
+        collect_prewhere_table_expression_visitor.visit(query_node_typed.getPrewhere());
+
+        auto prewhere_table_expression = collect_prewhere_table_expression_visitor.getPrewhereTableExpression();
+        if (!prewhere_table_expression)
+        {
+            prewhere_table_expression = table_expressions_nodes[0];
+            checkStorageSupportPrewhere(prewhere_table_expression);
+        }
+
+        auto & table_expression_data = planner_context->getOrCreateTableExpressionData(prewhere_table_expression);
+        const auto & column_names = table_expression_data.getColumnNames();
+        NameSet required_column_names_without_prewhere(column_names.begin(), column_names.end());
+
+        collect_source_columns_visitor.visit(query_node_typed.getPrewhere());
+
+        auto prewhere_actions_dag = std::make_shared<ActionsDAG>();
+
+        PlannerActionsVisitor visitor(planner_context, false /*use_column_identifier_as_action_node_name*/);
+        auto expression_nodes = visitor.visit(prewhere_actions_dag, query_node_typed.getPrewhere());
+        if (expression_nodes.size() != 1)
+            throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
+                "Invalid PREWHERE. Expected single boolean expression. In query {}",
+                query_node->formatASTForErrorMessage());
+
+        prewhere_actions_dag->getOutputs().push_back(expression_nodes[0]);
+
+        for (const auto & prewhere_input_node : prewhere_actions_dag->getInputs())
+            if (required_column_names_without_prewhere.contains(prewhere_input_node->result_name))
+                prewhere_actions_dag->getOutputs().push_back(prewhere_input_node);
+
+        table_expression_data.setPrewhereFilterActions(std::move(prewhere_actions_dag));
+    }
+}
+
+void collectSourceColumns(QueryTreeNodePtr & expression_node, PlannerContextPtr & planner_context)
+{
+    CollectSourceColumnsVisitor collect_source_columns_visitor(*planner_context);
+    collect_source_columns_visitor.visit(expression_node);
 }
 
 }
diff --git a/src/Planner/CollectTableExpressionData.h b/src/Planner/CollectTableExpressionData.h
index f4e2d579dca..ed3f0ff7a47 100644
--- a/src/Planner/CollectTableExpressionData.h
+++ b/src/Planner/CollectTableExpressionData.h
@@ -12,6 +12,13 @@ namespace DB
   *
   * ALIAS table column nodes are registered in table expression data and replaced in query tree with inner alias expression.
   */
-void collectTableExpressionData(QueryTreeNodePtr & query_node, PlannerContext & planner_context);
+void collectTableExpressionData(QueryTreeNodePtr & query_node, PlannerContextPtr & planner_context);
+
+/** Collect source columns for expression node.
+  * Collected source columns are registered in planner context.
+  *
+  * ALIAS table column nodes are registered in table expression data and replaced in query tree with inner alias expression.
+  */
+void collectSourceColumns(QueryTreeNodePtr & expression_node, PlannerContextPtr & planner_context);
 
 }
diff --git a/src/Planner/Planner.cpp b/src/Planner/Planner.cpp
index f0fe44e368f..7292f73e21c 100644
--- a/src/Planner/Planner.cpp
+++ b/src/Planner/Planner.cpp
@@ -1,6 +1,8 @@
 #include <Planner/Planner.h>
 
 #include <Core/ProtocolDefines.h>
+#include <Common/logger_useful.h>
+#include <Common/ProfileEvents.h>
 
 #include <DataTypes/DataTypeString.h>
 
@@ -33,8 +35,11 @@
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
 #include <Interpreters/Context.h>
+#include <Interpreters/StorageID.h>
 
+#include <Storages/ColumnsDescription.h>
 #include <Storages/SelectQueryInfo.h>
+#include <Storages/StorageDummy.h>
 #include <Storages/IStorage.h>
 
 #include <Analyzer/Utils.h>
@@ -69,6 +74,12 @@
 #include <Planner/CollectColumnIdentifiers.h>
 #include <Planner/PlannerQueryProcessingInfo.h>
 
+namespace ProfileEvents
+{
+    extern const Event SelectQueriesWithSubqueries;
+    extern const Event QueriesWithSubqueries;
+}
+
 namespace DB
 {
 
@@ -79,26 +90,15 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int TOO_DEEP_SUBQUERIES;
     extern const int NOT_IMPLEMENTED;
-    extern const int ILLEGAL_PREWHERE;
+    extern const int SUPPORT_IS_DISABLED;
 }
 
 /** ClickHouse query planner.
   *
-  * TODO: Support JOIN with JOIN engine.
-  * TODO: Support VIEWs.
-  * TODO: JOIN drop unnecessary columns after ON, USING section
-  * TODO: Support RBAC. Support RBAC for ALIAS columns
-  * TODO: Support PREWHERE
-  * TODO: Support DISTINCT
-  * TODO: Support trivial count optimization
-  * TODO: Support projections
-  * TODO: Support read in order optimization
-  * TODO: UNION storage limits
-  * TODO: Support max streams
-  * TODO: Support ORDER BY read in order optimization
-  * TODO: Support GROUP BY read in order optimization
-  * TODO: Support Key Condition. Support indexes for IN function.
-  * TODO: Better support for quota and limits.
+  * TODO: Support projections.
+  * TODO: Support trivial count using partition predicates.
+  * TODO: Support trivial count for table functions.
+  * TODO: Support indexes for IN function.
   */
 
 namespace
@@ -135,37 +135,6 @@ void checkStoragesSupportTransactions(const PlannerContextPtr & planner_context)
     }
 }
 
-void checkStorageSupportPrewhere(const QueryTreeNodePtr & query_node)
-{
-    auto & query_node_typed = query_node->as<QueryNode &>();
-    auto table_expression = extractLeftTableExpression(query_node_typed.getJoinTree());
-
-    if (auto * table_node = table_expression->as<TableNode>())
-    {
-        auto storage = table_node->getStorage();
-        if (!storage->supportsPrewhere())
-            throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
-                "Storage {} (table {}) does not support PREWHERE",
-                storage->getName(),
-                storage->getStorageID().getNameForLogs());
-    }
-    else if (auto * table_function_node = table_expression->as<TableFunctionNode>())
-    {
-        auto storage = table_function_node->getStorage();
-        if (!storage->supportsPrewhere())
-            throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
-                "Table function storage {} (table {}) does not support PREWHERE",
-                storage->getName(),
-                storage->getStorageID().getNameForLogs());
-    }
-    else
-    {
-        throw Exception(ErrorCodes::ILLEGAL_PREWHERE,
-            "Subquery {} does not support PREWHERE",
-            query_node->formatASTForErrorMessage());
-    }
-}
-
 /// Extend lifetime of query context, storages, and table locks
 void extendQueryContextAndStoragesLifetime(QueryPlan & query_plan, const PlannerContextPtr & planner_context)
 {
@@ -214,9 +183,14 @@ public:
         {
             /// Constness of limit is validated during query analysis stage
             limit_length = query_node.getLimit()->as<ConstantNode &>().getValue().safeGet<UInt64>();
-        }
 
-        if (query_node.hasOffset())
+            if (query_node.hasOffset() && limit_length)
+            {
+                /// Constness of offset is validated during query analysis stage
+                limit_offset = query_node.getOffset()->as<ConstantNode &>().getValue().safeGet<UInt64>();
+            }
+        }
+        else if (query_node.hasOffset())
         {
             /// Constness of offset is validated during query analysis stage
             limit_offset = query_node.getOffset()->as<ConstantNode &>().getValue().safeGet<UInt64>();
@@ -390,7 +364,11 @@ void addMergingAggregatedStep(QueryPlan & query_plan,
       * but it can work more slowly.
       */
 
-    Aggregator::Params params(aggregation_analysis_result.aggregation_keys,
+    auto keys = aggregation_analysis_result.aggregation_keys;
+    if (!aggregation_analysis_result.grouping_sets_parameters_list.empty())
+        keys.insert(keys.begin(), "__grouping_set");
+
+    Aggregator::Params params(keys,
         aggregation_analysis_result.aggregate_descriptions,
         query_analysis_result.aggregate_overflow_row,
         settings.max_threads,
@@ -559,7 +537,8 @@ void addMergeSortingStep(QueryPlan & query_plan,
     auto merging_sorted = std::make_unique<SortingStep>(query_plan.getCurrentDataStream(),
         sort_description,
         max_block_size,
-        query_analysis_result.partial_sorting_limit);
+        query_analysis_result.partial_sorting_limit,
+        settings.exact_rows_before_limit);
     merging_sorted->setStepDescription("Merge sorted streams " + description);
     query_plan.addStep(std::move(merging_sorted));
 }
@@ -591,20 +570,25 @@ void addWithFillStepIfNeeded(QueryPlan & query_plan,
     if (query_node.hasInterpolate())
     {
         auto interpolate_actions_dag = std::make_shared<ActionsDAG>();
+        auto query_plan_columns = query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName();
+        for (auto & query_plan_column : query_plan_columns)
+        {
+            /// INTERPOLATE actions dag input columns must be non constant
+            query_plan_column.column = nullptr;
+            interpolate_actions_dag->addInput(query_plan_column);
+        }
 
         auto & interpolate_list_node = query_node.getInterpolate()->as<ListNode &>();
         auto & interpolate_list_nodes = interpolate_list_node.getNodes();
 
         if (interpolate_list_nodes.empty())
         {
-            auto query_plan_columns = query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName();
-            for (auto & query_plan_column : query_plan_columns)
+            for (const auto * input_node : interpolate_actions_dag->getInputs())
             {
-                if (column_names_with_fill.contains(query_plan_column.name))
+                if (column_names_with_fill.contains(input_node->result_name))
                     continue;
 
-                const auto * input_action_node = &interpolate_actions_dag->addInput(query_plan_column);
-                interpolate_actions_dag->getOutputs().push_back(input_action_node);
+                interpolate_actions_dag->getOutputs().push_back(input_node);
             }
         }
         else
@@ -646,7 +630,14 @@ void addWithFillStepIfNeeded(QueryPlan & query_plan,
         interpolate_description = std::make_shared<InterpolateDescription>(std::move(interpolate_actions_dag), empty_aliases);
     }
 
-    auto filling_step = std::make_unique<FillingStep>(query_plan.getCurrentDataStream(), std::move(fill_description), interpolate_description);
+    const auto & query_context = planner_context->getQueryContext();
+    const Settings & settings = query_context->getSettingsRef();
+    auto filling_step = std::make_unique<FillingStep>(
+        query_plan.getCurrentDataStream(),
+        sort_description,
+        std::move(fill_description),
+        interpolate_description,
+        settings.use_with_fill_by_sorting_prefix);
     query_plan.addStep(std::move(filling_step));
 }
 
@@ -914,11 +905,11 @@ void addBuildSubqueriesForSetsStepIfNeeded(QueryPlan & query_plan,
         for (const auto & node : actions_to_execute->getNodes())
         {
             const auto & set_key = node.result_name;
-            const auto * planner_set = planner_context->getSetOrNull(set_key);
+            auto * planner_set = planner_context->getSetOrNull(set_key);
             if (!planner_set)
                 continue;
 
-            if (planner_set->getSet()->isCreated() || !planner_set->getSubqueryNode())
+            if (planner_set->getSet().isCreated() || !planner_set->getSubqueryNode())
                 continue;
 
             auto subquery_options = select_query_options.subquery();
@@ -928,8 +919,16 @@ void addBuildSubqueriesForSetsStepIfNeeded(QueryPlan & query_plan,
                 planner_context->getGlobalPlannerContext());
             subquery_planner.buildQueryPlanIfNeeded();
 
+            const auto & settings = planner_context->getQueryContext()->getSettingsRef();
+            SizeLimits size_limits_for_set = {settings.max_rows_in_set, settings.max_bytes_in_set, settings.set_overflow_mode};
+            bool tranform_null_in = settings.transform_null_in;
+            auto set = std::make_shared<Set>(size_limits_for_set, false /*fill_set_elements*/, tranform_null_in);
+
             SubqueryForSet subquery_for_set;
+            subquery_for_set.key = set_key;
+            subquery_for_set.set_in_progress = set;
             subquery_for_set.set = planner_set->getSet();
+            subquery_for_set.promise_to_fill_set = planner_set->extractPromiseToBuildSet();
             subquery_for_set.source = std::make_unique<QueryPlan>(std::move(subquery_planner).extractQueryPlan());
 
             subqueries_for_sets.emplace(set_key, std::move(subquery_for_set));
@@ -939,6 +938,46 @@ void addBuildSubqueriesForSetsStepIfNeeded(QueryPlan & query_plan,
     addCreatingSetsStep(query_plan, std::move(subqueries_for_sets), planner_context->getQueryContext());
 }
 
+/// Support for `additional_result_filter` setting
+void addAdditionalFilterStepIfNeeded(QueryPlan & query_plan,
+    const QueryNode & query_node,
+    const SelectQueryOptions & select_query_options,
+    PlannerContextPtr & planner_context
+)
+{
+    if (select_query_options.subquery_depth != 0)
+        return;
+
+    const auto & query_context = planner_context->getQueryContext();
+    const auto & settings = query_context->getSettingsRef();
+
+    auto additional_result_filter_ast = parseAdditionalResultFilter(settings);
+    if (!additional_result_filter_ast)
+        return;
+
+    ColumnsDescription fake_column_descriptions;
+    NameSet fake_name_set;
+    for (const auto & column : query_node.getProjectionColumns())
+    {
+        fake_column_descriptions.add(ColumnDescription(column.name, column.type));
+        fake_name_set.emplace(column.name);
+    }
+
+    auto storage = std::make_shared<StorageDummy>(StorageID{"dummy", "dummy"}, fake_column_descriptions);
+    auto fake_table_expression = std::make_shared<TableNode>(std::move(storage), query_context);
+
+    auto filter_info = buildFilterInfo(additional_result_filter_ast, fake_table_expression, planner_context, std::move(fake_name_set));
+    if (!filter_info.actions || !query_plan.isInitialized())
+        return;
+
+    auto filter_step = std::make_unique<FilterStep>(query_plan.getCurrentDataStream(),
+        filter_info.actions,
+        filter_info.column_name,
+        filter_info.do_remove_column);
+    filter_step->setStepDescription("additional result filter");
+    query_plan.addStep(std::move(filter_step));
+}
+
 }
 
 PlannerContextPtr buildPlannerContext(const QueryTreeNodePtr & query_tree_node,
@@ -1012,6 +1051,11 @@ void Planner::buildQueryPlanIfNeeded()
     if (query_plan.isInitialized())
         return;
 
+    LOG_TRACE(&Poco::Logger::get("Planner"), "Query {} to stage {}{}",
+        query_tree->formatConvertedASTForErrorMessage(),
+        QueryProcessingStage::toString(select_query_options.to_stage),
+        select_query_options.only_analyze ? " only analyze" : "");
+
     if (query_tree->getNodeType() == QueryTreeNodeType::UNION)
         buildPlanForUnionNode();
     else
@@ -1118,21 +1162,12 @@ void Planner::buildPlanForUnionNode()
 
 void Planner::buildPlanForQueryNode()
 {
+    ProfileEvents::increment(ProfileEvents::SelectQueriesWithSubqueries);
+    ProfileEvents::increment(ProfileEvents::QueriesWithSubqueries);
+
     auto & query_node = query_tree->as<QueryNode &>();
     const auto & query_context = planner_context->getQueryContext();
 
-    if (query_node.hasPrewhere())
-    {
-        checkStorageSupportPrewhere(query_tree);
-
-        if (query_node.hasWhere())
-            query_node.getWhere() = mergeConditionNodes({query_node.getPrewhere(), query_node.getWhere()}, query_context);
-        else
-            query_node.getWhere() = query_node.getPrewhere();
-
-        query_node.getPrewhere() = {};
-    }
-
     if (query_node.hasWhere())
     {
         auto condition_constant = tryExtractConstantFromConditionNode(query_node.getWhere());
@@ -1140,11 +1175,7 @@ void Planner::buildPlanForQueryNode()
             query_node.getWhere() = {};
     }
 
-    SelectQueryInfo select_query_info;
-    select_query_info.original_query = queryNodeToSelectQuery(query_tree);
-    select_query_info.query = select_query_info.original_query;
-    select_query_info.query_tree = query_tree;
-    select_query_info.planner_context = planner_context;
+    SelectQueryInfo select_query_info = buildSelectQueryInfo();
 
     StorageLimitsList current_storage_limits = storage_limits;
     select_query_info.local_storage_limits = buildStorageLimits(*query_context, select_query_options);
@@ -1166,40 +1197,47 @@ void Planner::buildPlanForQueryNode()
     }
 
     checkStoragesSupportTransactions(planner_context);
-    collectTableExpressionData(query_tree, *planner_context);
     collectSets(query_tree, *planner_context);
+    collectTableExpressionData(query_tree, planner_context);
 
-    QueryProcessingStage::Enum from_stage = QueryProcessingStage::FetchColumns;
+    const auto & settings = query_context->getSettingsRef();
 
-    if (select_query_options.only_analyze)
+    /// Check support for JOIN for parallel replicas with custom key
+    if (planner_context->getTableExpressionNodeToData().size() > 1)
     {
-        Block join_tree_block;
-
-        for (const auto & [_, table_expression_data] : planner_context->getTableExpressionNodeToData())
+        if (settings.allow_experimental_parallel_reading_from_replicas == 1 || !settings.parallel_replicas_custom_key.value.empty())
         {
-            for (const auto & [column_name, column] : table_expression_data.getColumnNameToColumn())
-            {
-                const auto & column_identifier = table_expression_data.getColumnIdentifierOrThrow(column_name);
-                join_tree_block.insert(ColumnWithTypeAndName(column.type, column_identifier));
-            }
-        }
+            LOG_WARNING(
+                &Poco::Logger::get("Planner"),
+                "JOINs are not supported with parallel replicas. Query will be executed without using them.");
 
-        auto read_nothing_step = std::make_unique<ReadNothingStep>(join_tree_block);
-        read_nothing_step->setStepDescription("Read nothing");
-        query_plan.addStep(std::move(read_nothing_step));
-    }
-    else
-    {
-        auto top_level_identifiers = collectTopLevelColumnIdentifiers(query_tree, planner_context);
-        auto join_tree_query_plan = buildJoinTreeQueryPlan(query_tree,
-            select_query_info,
-            select_query_options,
-            top_level_identifiers,
-            planner_context);
-        from_stage = join_tree_query_plan.from_stage;
-        query_plan = std::move(join_tree_query_plan.query_plan);
+            auto & mutable_context = planner_context->getMutableQueryContext();
+            mutable_context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
+            mutable_context->setSetting("parallel_replicas_custom_key", String{""});
+        }
+        else if (settings.allow_experimental_parallel_reading_from_replicas == 2)
+        {
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "JOINs are not supported with parallel replicas");
+        }
     }
 
+    /// TODO: Also disable parallel replicas in case of FINAL
+
+    auto top_level_identifiers = collectTopLevelColumnIdentifiers(query_tree, planner_context);
+    auto join_tree_query_plan = buildJoinTreeQueryPlan(query_tree,
+        select_query_info,
+        select_query_options,
+        top_level_identifiers,
+        planner_context);
+    auto from_stage = join_tree_query_plan.from_stage;
+    query_plan = std::move(join_tree_query_plan.query_plan);
+
+    LOG_TRACE(&Poco::Logger::get("Planner"), "Query {} from stage {} to stage {}{}",
+        query_tree->formatConvertedASTForErrorMessage(),
+        QueryProcessingStage::toString(from_stage),
+        QueryProcessingStage::toString(select_query_options.to_stage),
+        select_query_options.only_analyze ? " only analyze" : "");
+
     if (select_query_options.to_stage == QueryProcessingStage::FetchColumns)
         return;
 
@@ -1212,6 +1250,12 @@ void Planner::buildPlanForQueryNode()
 
     std::vector<ActionsDAGPtr> result_actions_to_execute;
 
+    for (auto & [_, table_expression_data] : planner_context->getTableExpressionNodeToData())
+    {
+        if (table_expression_data.getPrewhereFilterActions())
+            result_actions_to_execute.push_back(table_expression_data.getPrewhereFilterActions());
+    }
+
     if (query_processing_info.isIntermediateStage())
     {
         addPreliminarySortOrDistinctOrLimitStepsIfNeeded(query_plan,
@@ -1416,7 +1460,8 @@ void Planner::buildPlanForQueryNode()
             addLimitByStep(query_plan, limit_by_analysis_result, query_node);
         }
 
-        addWithFillStepIfNeeded(query_plan, query_analysis_result, planner_context, query_node);
+        if (query_node.hasOrderBy())
+            addWithFillStepIfNeeded(query_plan, query_analysis_result, planner_context, query_node);
 
         bool apply_offset = query_processing_info.getToStage() != QueryProcessingStage::WithMergeableStateAfterAggregationAndLimit;
 
@@ -1445,9 +1490,18 @@ void Planner::buildPlanForQueryNode()
             const auto & projection_analysis_result = expression_analysis_result.getProjection();
             addExpressionStep(query_plan, projection_analysis_result.project_names_actions, "Project names", result_actions_to_execute);
         }
+
+        // For additional_result_filter setting
+        addAdditionalFilterStepIfNeeded(query_plan, query_node, select_query_options, planner_context);
     }
 
-    addBuildSubqueriesForSetsStepIfNeeded(query_plan, select_query_options, planner_context, result_actions_to_execute);
+    if (!select_query_options.only_analyze)
+        addBuildSubqueriesForSetsStepIfNeeded(query_plan, select_query_options, planner_context, result_actions_to_execute);
+}
+
+SelectQueryInfo Planner::buildSelectQueryInfo() const
+{
+    return ::DB::buildSelectQueryInfo(query_tree, planner_context);
 }
 
 void Planner::addStorageLimits(const StorageLimitsList & limits)
diff --git a/src/Planner/Planner.h b/src/Planner/Planner.h
index 443dfa114ee..783a07f6e99 100644
--- a/src/Planner/Planner.h
+++ b/src/Planner/Planner.h
@@ -6,6 +6,7 @@
 #include <Analyzer/QueryTreePassManager.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Interpreters/Context_fwd.h>
+#include <Storages/SelectQueryInfo.h>
 
 namespace DB
 {
@@ -50,8 +51,15 @@ public:
         return std::move(query_plan);
     }
 
+    SelectQueryInfo buildSelectQueryInfo() const;
+
     void addStorageLimits(const StorageLimitsList & limits);
 
+    PlannerContextPtr getPlannerContext() const
+    {
+        return planner_context;
+    }
+
 private:
     void buildPlanForUnionNode();
 
diff --git a/src/Planner/PlannerActionsVisitor.cpp b/src/Planner/PlannerActionsVisitor.cpp
index 614e5c03bc1..c64d82299ca 100644
--- a/src/Planner/PlannerActionsVisitor.cpp
+++ b/src/Planner/PlannerActionsVisitor.cpp
@@ -44,6 +44,264 @@ namespace ErrorCodes
 namespace
 {
 
+class ActionNodeNameHelper
+{
+public:
+    ActionNodeNameHelper(QueryTreeNodeToName & node_to_name_,
+        const PlannerContext & planner_context_,
+        bool use_column_identifier_as_action_node_name_)
+        : node_to_name(node_to_name_)
+        , planner_context(planner_context_)
+        , use_column_identifier_as_action_node_name(use_column_identifier_as_action_node_name_)
+    {
+    }
+
+    String calculateActionNodeName(const QueryTreeNodePtr & node)
+    {
+        auto it = node_to_name.find(node);
+        if (it != node_to_name.end())
+            return it->second;
+
+        String result;
+        auto node_type = node->getNodeType();
+
+        switch (node_type)
+        {
+            case QueryTreeNodeType::COLUMN:
+            {
+                const ColumnIdentifier * column_identifier = nullptr;
+                if (use_column_identifier_as_action_node_name)
+                    column_identifier = planner_context.getColumnNodeIdentifierOrNull(node);
+
+                if (column_identifier)
+                {
+                    result = *column_identifier;
+                }
+                else
+                {
+                    const auto & column_node = node->as<ColumnNode &>();
+                    result = column_node.getColumnName();
+                }
+
+                break;
+            }
+            case QueryTreeNodeType::CONSTANT:
+            {
+                const auto & constant_node = node->as<ConstantNode &>();
+                result = calculateConstantActionNodeName(constant_node.getValue(), constant_node.getResultType());
+                break;
+            }
+            case QueryTreeNodeType::FUNCTION:
+            {
+                const auto & function_node = node->as<FunctionNode &>();
+                String in_function_second_argument_node_name;
+
+                if (isNameOfInFunction(function_node.getFunctionName()))
+                {
+                    const auto & in_second_argument_node = function_node.getArguments().getNodes().at(1);
+                    in_function_second_argument_node_name = planner_context.createSetKey(in_second_argument_node);
+                }
+
+                WriteBufferFromOwnString buffer;
+                buffer << function_node.getFunctionName();
+
+                const auto & function_parameters_nodes = function_node.getParameters().getNodes();
+
+                if (!function_parameters_nodes.empty())
+                {
+                    buffer << '(';
+
+                    size_t function_parameters_nodes_size = function_parameters_nodes.size();
+                    for (size_t i = 0; i < function_parameters_nodes_size; ++i)
+                    {
+                        const auto & function_parameter_node = function_parameters_nodes[i];
+                        buffer << calculateActionNodeName(function_parameter_node);
+
+                        if (i + 1 != function_parameters_nodes_size)
+                            buffer << ", ";
+                    }
+
+                    buffer << ')';
+                }
+
+                const auto & function_arguments_nodes = function_node.getArguments().getNodes();
+                String function_argument_name;
+
+                buffer << '(';
+
+                size_t function_arguments_nodes_size = function_arguments_nodes.size();
+                for (size_t i = 0; i < function_arguments_nodes_size; ++i)
+                {
+                    if (i == 1 && !in_function_second_argument_node_name.empty())
+                    {
+                        function_argument_name = in_function_second_argument_node_name;
+                    }
+                    else
+                    {
+                        const auto & function_argument_node = function_arguments_nodes[i];
+                        function_argument_name = calculateActionNodeName(function_argument_node);
+                    }
+
+                    buffer << function_argument_name;
+
+                    if (i + 1 != function_arguments_nodes_size)
+                        buffer << ", ";
+                }
+
+                buffer << ')';
+
+                if (function_node.isWindowFunction())
+                {
+                    buffer << " OVER (";
+                    buffer << calculateWindowNodeActionName(function_node.getWindowNode());
+                    buffer << ')';
+                }
+
+                result = buffer.str();
+                break;
+            }
+            case QueryTreeNodeType::LAMBDA:
+            {
+                auto lambda_hash = node->getTreeHash();
+                result = "__lambda_" + toString(lambda_hash.first) + '_' + toString(lambda_hash.second);
+                break;
+            }
+            default:
+            {
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid action query tree node {}", node->formatASTForErrorMessage());
+            }
+        }
+
+        node_to_name.emplace(node, result);
+
+        return result;
+    }
+
+    static String calculateConstantActionNodeName(const Field & constant_literal, const DataTypePtr & constant_type)
+    {
+        auto constant_name = applyVisitor(FieldVisitorToString(), constant_literal);
+        return constant_name + "_" + constant_type->getName();
+    }
+
+    static String calculateConstantActionNodeName(const Field & constant_literal)
+    {
+        return calculateConstantActionNodeName(constant_literal, applyVisitor(FieldToDataType(), constant_literal));
+    }
+
+    String calculateWindowNodeActionName(const QueryTreeNodePtr & node)
+    {
+        auto & window_node = node->as<WindowNode &>();
+        WriteBufferFromOwnString buffer;
+
+        if (window_node.hasPartitionBy())
+        {
+            buffer << "PARTITION BY ";
+
+            auto & partition_by_nodes = window_node.getPartitionBy().getNodes();
+            size_t partition_by_nodes_size = partition_by_nodes.size();
+
+            for (size_t i = 0; i < partition_by_nodes_size; ++i)
+            {
+                auto & partition_by_node = partition_by_nodes[i];
+                buffer << calculateActionNodeName(partition_by_node);
+                if (i + 1 != partition_by_nodes_size)
+                    buffer << ", ";
+            }
+        }
+
+        if (window_node.hasOrderBy())
+        {
+            if (window_node.hasPartitionBy())
+                buffer << ' ';
+
+            buffer << "ORDER BY ";
+
+            auto & order_by_nodes = window_node.getOrderBy().getNodes();
+            size_t order_by_nodes_size = order_by_nodes.size();
+
+            for (size_t i = 0; i < order_by_nodes_size; ++i)
+            {
+                auto & sort_node = order_by_nodes[i]->as<SortNode &>();
+                buffer << calculateActionNodeName(sort_node.getExpression());
+
+                auto sort_direction = sort_node.getSortDirection();
+                buffer << (sort_direction == SortDirection::ASCENDING ? " ASC" : " DESC");
+
+                auto nulls_sort_direction = sort_node.getNullsSortDirection();
+
+                if (nulls_sort_direction)
+                    buffer << " NULLS " << (nulls_sort_direction == sort_direction ? "LAST" : "FIRST");
+
+                if (auto collator = sort_node.getCollator())
+                    buffer << " COLLATE " << collator->getLocale();
+
+                if (sort_node.withFill())
+                {
+                    buffer << " WITH FILL";
+
+                    if (sort_node.hasFillFrom())
+                        buffer << " FROM " << calculateActionNodeName(sort_node.getFillFrom());
+
+                    if (sort_node.hasFillTo())
+                        buffer << " TO " << calculateActionNodeName(sort_node.getFillTo());
+
+                    if (sort_node.hasFillStep())
+                        buffer << " STEP " << calculateActionNodeName(sort_node.getFillStep());
+                }
+
+                if (i + 1 != order_by_nodes_size)
+                    buffer << ", ";
+            }
+        }
+
+        auto & window_frame = window_node.getWindowFrame();
+        if (!window_frame.is_default)
+        {
+            if (window_node.hasPartitionBy() || window_node.hasOrderBy())
+                buffer << ' ';
+
+            buffer << window_frame.type << " BETWEEN ";
+            if (window_frame.begin_type == WindowFrame::BoundaryType::Current)
+            {
+                buffer << "CURRENT ROW";
+            }
+            else if (window_frame.begin_type == WindowFrame::BoundaryType::Unbounded)
+            {
+                buffer << "UNBOUNDED";
+                buffer << " " << (window_frame.begin_preceding ? "PRECEDING" : "FOLLOWING");
+            }
+            else
+            {
+                buffer << calculateActionNodeName(window_node.getFrameBeginOffsetNode());
+                buffer << " " << (window_frame.begin_preceding ? "PRECEDING" : "FOLLOWING");
+            }
+
+            buffer << " AND ";
+
+            if (window_frame.end_type == WindowFrame::BoundaryType::Current)
+            {
+                buffer << "CURRENT ROW";
+            }
+            else if (window_frame.end_type == WindowFrame::BoundaryType::Unbounded)
+            {
+                buffer << "UNBOUNDED";
+                buffer << " " << (window_frame.end_preceding ? "PRECEDING" : "FOLLOWING");
+            }
+            else
+            {
+                buffer << calculateActionNodeName(window_node.getFrameEndOffsetNode());
+                buffer << " " << (window_frame.end_preceding ? "PRECEDING" : "FOLLOWING");
+            }
+        }
+
+        return buffer.str();
+    }
+private:
+    std::unordered_map<QueryTreeNodePtr, std::string> & node_to_name;
+    const PlannerContext & planner_context;
+    bool use_column_identifier_as_action_node_name = true;
+};
+
 class ActionsScopeNode
 {
 public:
@@ -132,7 +390,7 @@ public:
     }
 
     template <typename FunctionOrOverloadResolver>
-    const ActionsDAG::Node * addFunctionIfNecessary(const std::string & node_name, ActionsDAG::NodeRawConstPtrs children, FunctionOrOverloadResolver function)
+    const ActionsDAG::Node * addFunctionIfNecessary(const std::string & node_name, ActionsDAG::NodeRawConstPtrs children, const FunctionOrOverloadResolver & function)
     {
         auto it = node_name_to_node.find(node_name);
         if (it != node_name_to_node.end())
@@ -165,7 +423,9 @@ private:
 class PlannerActionsVisitorImpl
 {
 public:
-    PlannerActionsVisitorImpl(ActionsDAGPtr actions_dag, const PlannerContextPtr & planner_context_);
+    PlannerActionsVisitorImpl(ActionsDAGPtr actions_dag,
+        const PlannerContextPtr & planner_context_,
+        bool use_column_identifier_as_action_node_name_);
 
     ActionsDAG::NodeRawConstPtrs visit(QueryTreeNodePtr expression_node);
 
@@ -189,10 +449,14 @@ private:
     std::vector<ActionsScopeNode> actions_stack;
     std::unordered_map<QueryTreeNodePtr, std::string> node_to_node_name;
     const PlannerContextPtr planner_context;
+    ActionNodeNameHelper action_node_name_helper;
 };
 
-PlannerActionsVisitorImpl::PlannerActionsVisitorImpl(ActionsDAGPtr actions_dag, const PlannerContextPtr & planner_context_)
+PlannerActionsVisitorImpl::PlannerActionsVisitorImpl(ActionsDAGPtr actions_dag,
+    const PlannerContextPtr & planner_context_,
+    bool use_column_identifier_as_action_node_name_)
     : planner_context(planner_context_)
+    , action_node_name_helper(node_to_node_name, *planner_context, use_column_identifier_as_action_node_name_)
 {
     actions_stack.emplace_back(std::move(actions_dag), nullptr);
 }
@@ -236,7 +500,7 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
 
 PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::visitColumn(const QueryTreeNodePtr & node)
 {
-    auto column_node_name = calculateActionNodeName(node, *planner_context, node_to_node_name);
+    auto column_node_name = action_node_name_helper.calculateActionNodeName(node);
     const auto & column_node = node->as<ColumnNode &>();
 
     Int64 actions_stack_size = static_cast<Int64>(actions_stack.size() - 1);
@@ -335,11 +599,16 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
 
     auto lambda_node_name = calculateActionNodeName(node, *planner_context);
     auto function_capture = std::make_shared<FunctionCaptureOverloadResolver>(
-        lambda_actions, captured_column_names, lambda_arguments_names_and_types, result_type, lambda_expression_node_name);
+        lambda_actions, captured_column_names, lambda_arguments_names_and_types, lambda_node.getExpression()->getResultType(), lambda_expression_node_name);
     actions_stack.pop_back();
 
     // TODO: Pass IFunctionBase here not FunctionCaptureOverloadResolver.
-    actions_stack[level].addFunctionIfNecessary(lambda_node_name, std::move(lambda_children), std::move(function_capture));
+    const auto * actions_node = actions_stack[level].addFunctionIfNecessary(lambda_node_name, std::move(lambda_children), function_capture);
+
+    if (!result_type->equals(*actions_node->result_type))
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Lambda resolved type {} is not equal to type from actions DAG {}",
+            result_type, actions_node->result_type);
 
     size_t actions_stack_size = actions_stack.size();
     for (size_t i = level + 1; i < actions_stack_size; ++i)
@@ -363,7 +632,7 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::ma
     column.name = set_key;
     column.type = std::make_shared<DataTypeSet>();
 
-    bool set_is_created = planner_set.getSet()->isCreated();
+    bool set_is_created = planner_set.getSet().isCreated();
     auto column_set = ColumnSet::create(1, planner_set.getSet());
 
     if (set_is_created)
@@ -386,7 +655,7 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::ma
 PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::visitIndexHintFunction(const QueryTreeNodePtr & node)
 {
     const auto & function_node = node->as<FunctionNode &>();
-    auto function_node_name = calculateActionNodeName(node, *planner_context, node_to_node_name);
+    auto function_node_name = action_node_name_helper.calculateActionNodeName(node);
 
     auto index_hint_actions_dag = std::make_shared<ActionsDAG>();
     auto & index_hint_actions_dag_outputs = index_hint_actions_dag->getOutputs();
@@ -428,7 +697,7 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
     if (isNameOfInFunction(function_node.getFunctionName()))
         in_function_second_argument_node_name_with_level = makeSetForInFunction(node);
 
-    auto function_node_name = calculateActionNodeName(node, *planner_context, node_to_node_name);
+    auto function_node_name = action_node_name_helper.calculateActionNodeName(node);
 
     /* Aggregate functions, window functions, and GROUP BY expressions were already analyzed in the previous steps.
      * If we have already visited some expression, we don't need to revisit it or its arguments again.
@@ -501,7 +770,7 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
     }
     else
     {
-        actions_stack[level].addFunctionIfNecessary(function_node_name, children, function_node.getFunction());
+        actions_stack[level].addFunctionIfNecessary(function_node_name, children, function_node);
     }
 
     size_t actions_stack_size = actions_stack.size();
@@ -516,266 +785,57 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
 
 }
 
-PlannerActionsVisitor::PlannerActionsVisitor(const PlannerContextPtr & planner_context_)
+PlannerActionsVisitor::PlannerActionsVisitor(const PlannerContextPtr & planner_context_, bool use_column_identifier_as_action_node_name_)
     : planner_context(planner_context_)
+    , use_column_identifier_as_action_node_name(use_column_identifier_as_action_node_name_)
 {}
 
 ActionsDAG::NodeRawConstPtrs PlannerActionsVisitor::visit(ActionsDAGPtr actions_dag, QueryTreeNodePtr expression_node)
 {
-    PlannerActionsVisitorImpl actions_visitor_impl(actions_dag, planner_context);
+    PlannerActionsVisitorImpl actions_visitor_impl(actions_dag, planner_context, use_column_identifier_as_action_node_name);
     return actions_visitor_impl.visit(expression_node);
 }
 
-String calculateActionNodeName(const QueryTreeNodePtr & node, const PlannerContext & planner_context, QueryTreeNodeToName & node_to_name)
+String calculateActionNodeName(const QueryTreeNodePtr & node,
+    const PlannerContext & planner_context,
+    QueryTreeNodeToName & node_to_name,
+    bool use_column_identifier_as_action_node_name)
 {
-    auto it = node_to_name.find(node);
-    if (it != node_to_name.end())
-        return it->second;
-
-    String result;
-    auto node_type = node->getNodeType();
-
-    switch (node_type)
-    {
-        case QueryTreeNodeType::COLUMN:
-        {
-            const auto * column_identifier = planner_context.getColumnNodeIdentifierOrNull(node);
-
-            if (column_identifier)
-            {
-                result = *column_identifier;
-            }
-            else
-            {
-                const auto & column_node = node->as<ColumnNode &>();
-                result = column_node.getColumnName();
-            }
-
-            break;
-        }
-        case QueryTreeNodeType::CONSTANT:
-        {
-            const auto & constant_node = node->as<ConstantNode &>();
-            result = calculateConstantActionNodeName(constant_node.getValue(), constant_node.getResultType());
-            break;
-        }
-        case QueryTreeNodeType::FUNCTION:
-        {
-            const auto & function_node = node->as<FunctionNode &>();
-            String in_function_second_argument_node_name;
-
-            if (isNameOfInFunction(function_node.getFunctionName()))
-            {
-                const auto & in_second_argument_node = function_node.getArguments().getNodes().at(1);
-                in_function_second_argument_node_name = planner_context.createSetKey(in_second_argument_node);
-            }
-
-            WriteBufferFromOwnString buffer;
-            buffer << function_node.getFunctionName();
-
-            const auto & function_parameters_nodes = function_node.getParameters().getNodes();
-
-            if (!function_parameters_nodes.empty())
-            {
-                buffer << '(';
-
-                size_t function_parameters_nodes_size = function_parameters_nodes.size();
-                for (size_t i = 0; i < function_parameters_nodes_size; ++i)
-                {
-                    const auto & function_parameter_node = function_parameters_nodes[i];
-                    buffer << calculateActionNodeName(function_parameter_node, planner_context, node_to_name);
-
-                    if (i + 1 != function_parameters_nodes_size)
-                        buffer << ", ";
-                }
-
-                buffer << ')';
-            }
-
-            const auto & function_arguments_nodes = function_node.getArguments().getNodes();
-            String function_argument_name;
-
-            buffer << '(';
-
-            size_t function_arguments_nodes_size = function_arguments_nodes.size();
-            for (size_t i = 0; i < function_arguments_nodes_size; ++i)
-            {
-                if (i == 1 && !in_function_second_argument_node_name.empty())
-                {
-                    function_argument_name = in_function_second_argument_node_name;
-                }
-                else
-                {
-                    const auto & function_argument_node = function_arguments_nodes[i];
-                    function_argument_name = calculateActionNodeName(function_argument_node, planner_context, node_to_name);
-                }
-
-                buffer << function_argument_name;
-
-                if (i + 1 != function_arguments_nodes_size)
-                    buffer << ", ";
-            }
-
-            buffer << ')';
-
-            if (function_node.isWindowFunction())
-            {
-                buffer << " OVER (";
-                buffer << calculateWindowNodeActionName(function_node.getWindowNode(), planner_context, node_to_name);
-                buffer << ')';
-            }
-
-            result = buffer.str();
-            break;
-        }
-        case QueryTreeNodeType::LAMBDA:
-        {
-            auto lambda_hash = node->getTreeHash();
-
-            result = "__lambda_" + toString(lambda_hash.first) + '_' + toString(lambda_hash.second);
-            break;
-        }
-        default:
-        {
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid action query tree node {}", node->formatASTForErrorMessage());
-        }
-    }
-
-    node_to_name.emplace(node, result);
-
-    return result;
+    ActionNodeNameHelper helper(node_to_name, planner_context, use_column_identifier_as_action_node_name);
+    return helper.calculateActionNodeName(node);
 }
 
-String calculateActionNodeName(const QueryTreeNodePtr & node, const PlannerContext & planner_context)
+String calculateActionNodeName(const QueryTreeNodePtr & node, const PlannerContext & planner_context, bool use_column_identifier_as_action_node_name)
 {
     QueryTreeNodeToName empty_map;
-    return calculateActionNodeName(node, planner_context, empty_map);
+    ActionNodeNameHelper helper(empty_map, planner_context, use_column_identifier_as_action_node_name);
+    return helper.calculateActionNodeName(node);
 }
 
 String calculateConstantActionNodeName(const Field & constant_literal, const DataTypePtr & constant_type)
 {
-    auto constant_name = applyVisitor(FieldVisitorToString(), constant_literal);
-    return constant_name + "_" + constant_type->getName();
+    return ActionNodeNameHelper::calculateConstantActionNodeName(constant_literal, constant_type);
 }
 
 String calculateConstantActionNodeName(const Field & constant_literal)
 {
-    return calculateConstantActionNodeName(constant_literal, applyVisitor(FieldToDataType(), constant_literal));
+    return ActionNodeNameHelper::calculateConstantActionNodeName(constant_literal);
 }
 
-String calculateWindowNodeActionName(const QueryTreeNodePtr & node, const PlannerContext & planner_context, QueryTreeNodeToName & node_to_name)
+String calculateWindowNodeActionName(const QueryTreeNodePtr & node,
+    const PlannerContext & planner_context,
+    QueryTreeNodeToName & node_to_name,
+    bool use_column_identifier_as_action_node_name)
 {
-    auto & window_node = node->as<WindowNode &>();
-    WriteBufferFromOwnString buffer;
-
-    if (window_node.hasPartitionBy())
-    {
-        buffer << "PARTITION BY ";
-
-        auto & partition_by_nodes = window_node.getPartitionBy().getNodes();
-        size_t partition_by_nodes_size = partition_by_nodes.size();
-
-        for (size_t i = 0; i < partition_by_nodes_size; ++i)
-        {
-            auto & partition_by_node = partition_by_nodes[i];
-            buffer << calculateActionNodeName(partition_by_node, planner_context, node_to_name);
-            if (i + 1 != partition_by_nodes_size)
-                buffer << ", ";
-        }
-    }
-
-    if (window_node.hasOrderBy())
-    {
-        if (window_node.hasPartitionBy())
-            buffer << ' ';
-
-        buffer << "ORDER BY ";
-
-        auto & order_by_nodes = window_node.getOrderBy().getNodes();
-        size_t order_by_nodes_size = order_by_nodes.size();
-
-        for (size_t i = 0; i < order_by_nodes_size; ++i)
-        {
-            auto & sort_node = order_by_nodes[i]->as<SortNode &>();
-            buffer << calculateActionNodeName(sort_node.getExpression(), planner_context, node_to_name);
-
-            auto sort_direction = sort_node.getSortDirection();
-            buffer << (sort_direction == SortDirection::ASCENDING ? " ASC" : " DESC");
-
-            auto nulls_sort_direction = sort_node.getNullsSortDirection();
-
-            if (nulls_sort_direction)
-                buffer << " NULLS " << (nulls_sort_direction == sort_direction ? "LAST" : "FIRST");
-
-            if (auto collator = sort_node.getCollator())
-                buffer << " COLLATE " << collator->getLocale();
-
-            if (sort_node.withFill())
-            {
-                buffer << " WITH FILL";
-
-                if (sort_node.hasFillFrom())
-                    buffer << " FROM " << calculateActionNodeName(sort_node.getFillFrom(), planner_context, node_to_name);
-
-                if (sort_node.hasFillTo())
-                    buffer << " TO " << calculateActionNodeName(sort_node.getFillTo(), planner_context, node_to_name);
-
-                if (sort_node.hasFillStep())
-                    buffer << " STEP " << calculateActionNodeName(sort_node.getFillStep(), planner_context, node_to_name);
-            }
-
-            if (i + 1 != order_by_nodes_size)
-                buffer << ", ";
-        }
-    }
-
-    auto & window_frame = window_node.getWindowFrame();
-    if (!window_frame.is_default)
-    {
-        if (window_node.hasPartitionBy() || window_node.hasOrderBy())
-            buffer << ' ';
-
-        buffer << window_frame.type << " BETWEEN ";
-        if (window_frame.begin_type == WindowFrame::BoundaryType::Current)
-        {
-            buffer << "CURRENT ROW";
-        }
-        else if (window_frame.begin_type == WindowFrame::BoundaryType::Unbounded)
-        {
-            buffer << "UNBOUNDED";
-            buffer << " " << (window_frame.begin_preceding ? "PRECEDING" : "FOLLOWING");
-        }
-        else
-        {
-            buffer << calculateActionNodeName(window_node.getFrameBeginOffsetNode(), planner_context, node_to_name);
-            buffer << " " << (window_frame.begin_preceding ? "PRECEDING" : "FOLLOWING");
-        }
-
-        buffer << " AND ";
-
-        if (window_frame.end_type == WindowFrame::BoundaryType::Current)
-        {
-            buffer << "CURRENT ROW";
-        }
-        else if (window_frame.end_type == WindowFrame::BoundaryType::Unbounded)
-        {
-            buffer << "UNBOUNDED";
-            buffer << " " << (window_frame.end_preceding ? "PRECEDING" : "FOLLOWING");
-        }
-        else
-        {
-            buffer << calculateActionNodeName(window_node.getFrameEndOffsetNode(), planner_context, node_to_name);
-            buffer << " " << (window_frame.end_preceding ? "PRECEDING" : "FOLLOWING");
-        }
-    }
-
-    return buffer.str();
+    ActionNodeNameHelper helper(node_to_name, planner_context, use_column_identifier_as_action_node_name);
+    return helper.calculateWindowNodeActionName(node);
 }
 
-String calculateWindowNodeActionName(const QueryTreeNodePtr & node, const PlannerContext & planner_context)
+String calculateWindowNodeActionName(const QueryTreeNodePtr & node, const PlannerContext & planner_context, bool use_column_identifier_as_action_node_name)
 {
     QueryTreeNodeToName empty_map;
-    return calculateWindowNodeActionName(node, planner_context, empty_map);
+    ActionNodeNameHelper helper(empty_map, planner_context, use_column_identifier_as_action_node_name);
+    return helper.calculateWindowNodeActionName(node);
 }
 
 }
diff --git a/src/Planner/PlannerActionsVisitor.h b/src/Planner/PlannerActionsVisitor.h
index 405031daa40..8506c309171 100644
--- a/src/Planner/PlannerActionsVisitor.h
+++ b/src/Planner/PlannerActionsVisitor.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <Common/HashTable/Hash.h>
-
 #include <Core/Names.h>
 #include <Core/NamesAndTypes.h>
 
@@ -23,7 +21,7 @@ using PlannerContextPtr = std::shared_ptr<PlannerContext>;
   * Preconditions:
   * 1. Table expression data for table expression nodes is collected in planner context.
   * For column node, that has column table expression source, identifier for column name in table expression data
-  * is used as action dag node name.
+  * is used as action dag node name, if use_column_identifier_as_action_node_name = true.
   * 2. Sets for IN functions are already collected in planner context.
   *
   * During actions build, there is special handling for following functions:
@@ -33,7 +31,7 @@ using PlannerContextPtr = std::shared_ptr<PlannerContext>;
 class PlannerActionsVisitor
 {
 public:
-    explicit PlannerActionsVisitor(const PlannerContextPtr & planner_context_);
+    explicit PlannerActionsVisitor(const PlannerContextPtr & planner_context_, bool use_column_identifier_as_action_node_name_ = true);
 
     /** Add actions necessary to calculate expression node into expression dag.
       * Necessary actions are not added in actions dag output.
@@ -43,21 +41,27 @@ public:
 
 private:
     const PlannerContextPtr planner_context;
+    bool use_column_identifier_as_action_node_name = true;
 };
 
 /** Calculate query tree expression node action dag name and add them into node to name map.
   * If node exists in map, name from map is used.
   *
-  * For column node column node identifier from planner context is used.
+  * For column node column node identifier from planner context is used, if use_column_identifier_as_action_node_name = true.
   */
 using QueryTreeNodeToName = std::unordered_map<QueryTreeNodePtr, String>;
-String calculateActionNodeName(const QueryTreeNodePtr & node, const PlannerContext & planner_context, QueryTreeNodeToName & node_to_name);
+String calculateActionNodeName(const QueryTreeNodePtr & node,
+    const PlannerContext & planner_context,
+    QueryTreeNodeToName & node_to_name,
+    bool use_column_identifier_as_action_node_name = true);
 
 /** Calculate query tree expression node action dag name.
   *
-  * For column node column node identifier from planner context is used.
+  * For column node column node identifier from planner context is used, if use_column_identifier_as_action_node_name = true.
   */
-String calculateActionNodeName(const QueryTreeNodePtr & node, const PlannerContext & planner_context);
+String calculateActionNodeName(const QueryTreeNodePtr & node,
+    const PlannerContext & planner_context,
+    bool use_column_identifier_as_action_node_name = true);
 
 /// Calculate action node name for constant
 String calculateConstantActionNodeName(const Field & constant_literal, const DataTypePtr & constant_type);
@@ -67,12 +71,19 @@ String calculateConstantActionNodeName(const Field & constant_literal);
 
 /** Calculate action node name for window node.
   * Window node action name can only be part of window function action name.
+  * For column node column node identifier from planner context is used, if use_column_identifier_as_action_node_name = true.
   */
-String calculateWindowNodeActionName(const QueryTreeNodePtr & node, const PlannerContext & planner_context, QueryTreeNodeToName & node_to_name);
+String calculateWindowNodeActionName(const QueryTreeNodePtr & node,
+    const PlannerContext & planner_context,
+    QueryTreeNodeToName & node_to_name,
+    bool use_column_identifier_as_action_node_name = true);
 
 /** Calculate action node name for window node.
   * Window node action name can only be part of window function action name.
+  * For column node column node identifier from planner context is used, if use_column_identifier_as_action_node_name = true.
   */
-String calculateWindowNodeActionName(const QueryTreeNodePtr & node, const PlannerContext & planner_context);
+String calculateWindowNodeActionName(const QueryTreeNodePtr & node,
+    const PlannerContext & planner_context,
+    bool use_column_identifier_as_action_node_name = true);
 
 }
diff --git a/src/Planner/PlannerContext.cpp b/src/Planner/PlannerContext.cpp
index 9f4a489bf5f..346cc6d2080 100644
--- a/src/Planner/PlannerContext.cpp
+++ b/src/Planner/PlannerContext.cpp
@@ -45,7 +45,7 @@ bool GlobalPlannerContext::hasColumnIdentifier(const ColumnIdentifier & column_i
     return column_identifiers.contains(column_identifier);
 }
 
-PlannerContext::PlannerContext(ContextPtr query_context_, GlobalPlannerContextPtr global_planner_context_)
+PlannerContext::PlannerContext(ContextMutablePtr query_context_, GlobalPlannerContextPtr global_planner_context_)
     : query_context(std::move(query_context_))
     , global_planner_context(std::move(global_planner_context_))
 {}
@@ -128,7 +128,7 @@ PlannerContext::SetKey PlannerContext::createSetKey(const QueryTreeNodePtr & set
 
 void PlannerContext::registerSet(const SetKey & key, PlannerSet planner_set)
 {
-    if (!planner_set.getSet())
+    if (!planner_set.getSet().isValid())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Set must be initialized");
 
     const auto & subquery_node = planner_set.getSubqueryNode();
@@ -162,7 +162,7 @@ const PlannerSet & PlannerContext::getSetOrThrow(const SetKey & key) const
     return it->second;
 }
 
-const PlannerSet * PlannerContext::getSetOrNull(const SetKey & key) const
+PlannerSet * PlannerContext::getSetOrNull(const SetKey & key)
 {
     auto it = set_key_to_set.find(key);
     if (it == set_key_to_set.end())
diff --git a/src/Planner/PlannerContext.h b/src/Planner/PlannerContext.h
index 63874bf7ab9..4199c863033 100644
--- a/src/Planner/PlannerContext.h
+++ b/src/Planner/PlannerContext.h
@@ -1,12 +1,11 @@
 #pragma once
 
-#include <Common/HashTable/Hash.h>
-
 #include <Core/Names.h>
 #include <Core/NamesAndTypes.h>
 
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/Set.h>
+#include <Interpreters/PreparedSets.h>
 
 #include <Analyzer/IQueryTreeNode.h>
 
@@ -56,18 +55,18 @@ class PlannerSet
 {
 public:
     /// Construct planner set that is ready for execution
-    explicit PlannerSet(SetPtr set_)
+    explicit PlannerSet(FutureSet set_)
         : set(std::move(set_))
     {}
 
     /// Construct planner set with set and subquery node
-    explicit PlannerSet(SetPtr set_, QueryTreeNodePtr subquery_node_)
-        : set(std::move(set_))
+    explicit PlannerSet(QueryTreeNodePtr subquery_node_)
+        : set(promise_to_build_set.get_future())
         , subquery_node(std::move(subquery_node_))
     {}
 
-    /// Get set
-    const SetPtr & getSet() const
+    /// Get a reference to a set that might be not built yet
+    const FutureSet & getSet() const
     {
         return set;
     }
@@ -78,8 +77,15 @@ public:
         return subquery_node;
     }
 
+    /// This promise will be fulfilled when set is built and all FutureSet objects will become ready
+    std::promise<SetPtr> extractPromiseToBuildSet()
+    {
+        return std::move(promise_to_build_set);
+    }
+
 private:
-    SetPtr set;
+    std::promise<SetPtr> promise_to_build_set;
+    FutureSet set;
 
     QueryTreeNodePtr subquery_node;
 };
@@ -88,16 +94,22 @@ class PlannerContext
 {
 public:
     /// Create planner context with query context and global planner context
-    PlannerContext(ContextPtr query_context_, GlobalPlannerContextPtr global_planner_context_);
+    PlannerContext(ContextMutablePtr query_context_, GlobalPlannerContextPtr global_planner_context_);
 
     /// Get planner context query context
-    const ContextPtr & getQueryContext() const
+    ContextPtr getQueryContext() const
     {
         return query_context;
     }
 
-    /// Get planner context query context
-    ContextPtr & getQueryContext()
+    /// Get planner context mutable query context
+    const ContextMutablePtr & getMutableQueryContext() const
+    {
+        return query_context;
+    }
+
+    /// Get planner context mutable query context
+    ContextMutablePtr & getMutableQueryContext()
     {
         return query_context;
     }
@@ -137,12 +149,18 @@ public:
       */
     TableExpressionData * getTableExpressionDataOrNull(const QueryTreeNodePtr & table_expression_node);
 
-    /// Get table expression node to data read only map
+    /// Get table expression node to data map
     const std::unordered_map<QueryTreeNodePtr, TableExpressionData> & getTableExpressionNodeToData() const
     {
         return table_expression_node_to_data;
     }
 
+    /// Get table expression node to data map
+    std::unordered_map<QueryTreeNodePtr, TableExpressionData> & getTableExpressionNodeToData()
+    {
+        return table_expression_node_to_data;
+    }
+
     /** Get column node identifier.
       * For column node source check if table expression data is registered.
       * If table expression data is not registered exception is thrown.
@@ -174,7 +192,7 @@ public:
     const PlannerSet & getSetOrThrow(const SetKey & key) const;
 
     /// Get set for key, if no set is registered null is returned
-    const PlannerSet * getSetOrNull(const SetKey & key) const;
+    PlannerSet * getSetOrNull(const SetKey & key);
 
     /// Get registered sets
     const SetKeyToSet & getRegisteredSets() const
@@ -184,7 +202,7 @@ public:
 
 private:
     /// Query context
-    ContextPtr query_context;
+    ContextMutablePtr query_context;
 
     /// Global planner context
     GlobalPlannerContextPtr global_planner_context;
diff --git a/src/Planner/PlannerExpressionAnalysis.cpp b/src/Planner/PlannerExpressionAnalysis.cpp
index a813d3b753a..b6b6b2e2d85 100644
--- a/src/Planner/PlannerExpressionAnalysis.cpp
+++ b/src/Planner/PlannerExpressionAnalysis.cpp
@@ -1,6 +1,7 @@
 #include <Planner/PlannerExpressionAnalysis.h>
 
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNullable.h>
 
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/ConstantNode.h>
@@ -33,16 +34,13 @@ namespace
   * It is client responsibility to update filter analysis result if filter column must be removed after chain is finalized.
   */
 FilterAnalysisResult analyzeFilter(const QueryTreeNodePtr & filter_expression_node,
-    const ColumnsWithTypeAndName & join_tree_input_columns,
+    const ColumnsWithTypeAndName & input_columns,
     const PlannerContextPtr & planner_context,
     ActionsChain & actions_chain)
 {
-    const auto * chain_available_output_columns = actions_chain.getLastStepAvailableOutputColumnsOrNull();
-    const auto & filter_input = chain_available_output_columns ? *chain_available_output_columns : join_tree_input_columns;
-
     FilterAnalysisResult result;
 
-    result.filter_actions = buildActionsDAGFromExpressionNode(filter_expression_node, filter_input, planner_context);
+    result.filter_actions = buildActionsDAGFromExpressionNode(filter_expression_node, input_columns, planner_context);
     result.filter_column_name = result.filter_actions->getOutputs().at(0)->result_name;
     actions_chain.addStep(std::make_unique<ActionsChainStep>(result.filter_actions));
 
@@ -53,7 +51,7 @@ FilterAnalysisResult analyzeFilter(const QueryTreeNodePtr & filter_expression_no
   * Actions before aggregation are added into actions chain, if result is not null optional.
   */
 std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodePtr & query_tree,
-    const ColumnsWithTypeAndName & join_tree_input_columns,
+    const ColumnsWithTypeAndName & input_columns,
     const PlannerContextPtr & planner_context,
     ActionsChain & actions_chain)
 {
@@ -69,10 +67,7 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
 
     Names aggregation_keys;
 
-    const auto * chain_available_output_columns = actions_chain.getLastStepAvailableOutputColumnsOrNull();
-    const auto & group_by_input = chain_available_output_columns ? *chain_available_output_columns : join_tree_input_columns;
-
-    ActionsDAGPtr before_aggregation_actions = std::make_shared<ActionsDAG>(group_by_input);
+    ActionsDAGPtr before_aggregation_actions = std::make_shared<ActionsDAG>(input_columns);
     before_aggregation_actions->getOutputs().clear();
 
     std::unordered_set<std::string_view> before_aggregation_actions_output_node_names;
@@ -83,6 +78,8 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
     PlannerActionsVisitor actions_visitor(planner_context);
 
     /// Add expressions from GROUP BY
+    bool group_by_use_nulls = planner_context->getQueryContext()->getSettingsRef().group_by_use_nulls &&
+        (query_node.isGroupByWithGroupingSets() || query_node.isGroupByWithRollup() || query_node.isGroupByWithCube());
 
     if (query_node.hasGroupBy())
     {
@@ -96,7 +93,11 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
 
                 for (auto & grouping_set_key_node : grouping_set_keys_list_node_typed.getNodes())
                 {
-                    group_by_with_constant_keys |= (grouping_set_key_node->as<ConstantNode>() != nullptr);
+                    auto is_constant_key = grouping_set_key_node->as<ConstantNode>() != nullptr;
+                    group_by_with_constant_keys |= is_constant_key;
+
+                    if (is_constant_key && !aggregates_descriptions.empty())
+                        continue;
 
                     auto expression_dag_nodes = actions_visitor.visit(before_aggregation_actions, grouping_set_key_node);
                     aggregation_keys.reserve(expression_dag_nodes.size());
@@ -107,6 +108,8 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
                         if (before_aggregation_actions_output_node_names.contains(expression_dag_node->result_name))
                             continue;
 
+                        auto expression_type_after_aggregation = group_by_use_nulls ? makeNullableSafe(expression_dag_node->result_type) : expression_dag_node->result_type;
+                        available_columns_after_aggregation.emplace_back(nullptr, expression_type_after_aggregation, expression_dag_node->result_name);
                         aggregation_keys.push_back(expression_dag_node->result_name);
                         before_aggregation_actions->getOutputs().push_back(expression_dag_node);
                         before_aggregation_actions_output_node_names.insert(expression_dag_node->result_name);
@@ -140,26 +143,31 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
         else
         {
             for (auto & group_by_key_node : query_node.getGroupBy().getNodes())
-                group_by_with_constant_keys |= (group_by_key_node->as<ConstantNode>() != nullptr);
-
-            auto expression_dag_nodes = actions_visitor.visit(before_aggregation_actions, query_node.getGroupByNode());
-            aggregation_keys.reserve(expression_dag_nodes.size());
-
-            for (auto & expression_dag_node : expression_dag_nodes)
             {
-                if (before_aggregation_actions_output_node_names.contains(expression_dag_node->result_name))
+                auto is_constant_key = group_by_key_node->as<ConstantNode>() != nullptr;
+                group_by_with_constant_keys |= is_constant_key;
+
+                if (is_constant_key && !aggregates_descriptions.empty())
                     continue;
 
-                aggregation_keys.push_back(expression_dag_node->result_name);
-                before_aggregation_actions->getOutputs().push_back(expression_dag_node);
-                before_aggregation_actions_output_node_names.insert(expression_dag_node->result_name);
+                auto expression_dag_nodes = actions_visitor.visit(before_aggregation_actions, group_by_key_node);
+                aggregation_keys.reserve(expression_dag_nodes.size());
+
+                for (auto & expression_dag_node : expression_dag_nodes)
+                {
+                    if (before_aggregation_actions_output_node_names.contains(expression_dag_node->result_name))
+                        continue;
+
+                    auto expression_type_after_aggregation = group_by_use_nulls ? makeNullableSafe(expression_dag_node->result_type) : expression_dag_node->result_type;
+                    available_columns_after_aggregation.emplace_back(nullptr, expression_type_after_aggregation, expression_dag_node->result_name);
+                    aggregation_keys.push_back(expression_dag_node->result_name);
+                    before_aggregation_actions->getOutputs().push_back(expression_dag_node);
+                    before_aggregation_actions_output_node_names.insert(expression_dag_node->result_name);
+                }
             }
         }
     }
 
-    for (auto & node : before_aggregation_actions->getOutputs())
-        available_columns_after_aggregation.emplace_back(nullptr, node->result_type, node->result_name);
-
     /// Add expressions from aggregate functions arguments
 
     for (auto & aggregate_function_node : aggregate_function_nodes)
@@ -208,7 +216,7 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
   * Actions before window functions are added into actions chain, if result is not null optional.
   */
 std::optional<WindowAnalysisResult> analyzeWindow(const QueryTreeNodePtr & query_tree,
-    const ColumnsWithTypeAndName & join_tree_input_columns,
+    const ColumnsWithTypeAndName & input_columns,
     const PlannerContextPtr & planner_context,
     ActionsChain & actions_chain)
 {
@@ -218,12 +226,9 @@ std::optional<WindowAnalysisResult> analyzeWindow(const QueryTreeNodePtr & query
 
     auto window_descriptions = extractWindowDescriptions(window_function_nodes, *planner_context);
 
-    const auto * chain_available_output_columns = actions_chain.getLastStepAvailableOutputColumnsOrNull();
-    const auto & window_input = chain_available_output_columns ? *chain_available_output_columns : join_tree_input_columns;
-
     PlannerActionsVisitor actions_visitor(planner_context);
 
-    ActionsDAGPtr before_window_actions = std::make_shared<ActionsDAG>(window_input);
+    ActionsDAGPtr before_window_actions = std::make_shared<ActionsDAG>(input_columns);
     before_window_actions->getOutputs().clear();
 
     std::unordered_set<std::string_view> before_window_actions_output_node_names;
@@ -298,13 +303,11 @@ std::optional<WindowAnalysisResult> analyzeWindow(const QueryTreeNodePtr & query
   * It is client responsibility to update projection analysis result with project names actions after chain is finalized.
   */
 ProjectionAnalysisResult analyzeProjection(const QueryNode & query_node,
-    const ColumnsWithTypeAndName & join_tree_input_columns,
+    const ColumnsWithTypeAndName & input_columns,
     const PlannerContextPtr & planner_context,
     ActionsChain & actions_chain)
 {
-    const auto * chain_available_output_columns = actions_chain.getLastStepAvailableOutputColumnsOrNull();
-    const auto & projection_input = chain_available_output_columns ? *chain_available_output_columns : join_tree_input_columns;
-    auto projection_actions = buildActionsDAGFromExpressionNode(query_node.getProjectionNode(), projection_input, planner_context);
+    auto projection_actions = buildActionsDAGFromExpressionNode(query_node.getProjectionNode(), input_columns, planner_context);
 
     auto projection_columns = query_node.getProjectionColumns();
     size_t projection_columns_size = projection_columns.size();
@@ -347,19 +350,16 @@ ProjectionAnalysisResult analyzeProjection(const QueryNode & query_node,
   * Actions before sort are added into actions chain.
   */
 SortAnalysisResult analyzeSort(const QueryNode & query_node,
-    const ColumnsWithTypeAndName & join_tree_input_columns,
+    const ColumnsWithTypeAndName & input_columns,
     const PlannerContextPtr & planner_context,
     ActionsChain & actions_chain)
 {
-    const auto * chain_available_output_columns = actions_chain.getLastStepAvailableOutputColumnsOrNull();
-    const auto & order_by_input = chain_available_output_columns ? *chain_available_output_columns : join_tree_input_columns;
-
-    ActionsDAGPtr before_sort_actions = std::make_shared<ActionsDAG>(order_by_input);
+    ActionsDAGPtr before_sort_actions = std::make_shared<ActionsDAG>(input_columns);
     auto & before_sort_actions_outputs = before_sort_actions->getOutputs();
     before_sort_actions_outputs.clear();
 
     PlannerActionsVisitor actions_visitor(planner_context);
-
+    bool has_with_fill = false;
     std::unordered_set<std::string_view> before_sort_actions_dag_output_node_names;
 
     /** We add only sort node sort expression in before ORDER BY actions DAG.
@@ -370,6 +370,7 @@ SortAnalysisResult analyzeSort(const QueryNode & query_node,
     {
         auto & sort_node_typed = sort_node->as<SortNode &>();
         auto expression_dag_nodes = actions_visitor.visit(before_sort_actions, sort_node_typed.getExpression());
+        has_with_fill |= sort_node_typed.withFill();
 
         for (auto & action_dag_node : expression_dag_nodes)
         {
@@ -381,24 +382,67 @@ SortAnalysisResult analyzeSort(const QueryNode & query_node,
         }
     }
 
+    if (has_with_fill)
+    {
+        for (auto & output_node : before_sort_actions_outputs)
+            output_node = &before_sort_actions->materializeNode(*output_node);
+    }
+
+    /// We add only INPUT columns necessary for INTERPOLATE expression in before ORDER BY actions DAG
+    if (query_node.hasInterpolate())
+    {
+        auto & interpolate_list_node = query_node.getInterpolate()->as<ListNode &>();
+
+        PlannerActionsVisitor interpolate_actions_visitor(planner_context);
+        auto interpolate_actions_dag = std::make_shared<ActionsDAG>();
+
+        for (auto & interpolate_node : interpolate_list_node.getNodes())
+        {
+            auto & interpolate_node_typed = interpolate_node->as<InterpolateNode &>();
+            interpolate_actions_visitor.visit(interpolate_actions_dag, interpolate_node_typed.getExpression());
+            interpolate_actions_visitor.visit(interpolate_actions_dag, interpolate_node_typed.getInterpolateExpression());
+        }
+
+        std::unordered_map<std::string_view, const ActionsDAG::Node *> before_sort_actions_inputs_name_to_node;
+        for (const auto & node : before_sort_actions->getInputs())
+            before_sort_actions_inputs_name_to_node.emplace(node->result_name, node);
+
+        for (const auto & node : interpolate_actions_dag->getNodes())
+        {
+            if (before_sort_actions_dag_output_node_names.contains(node.result_name) ||
+                node.type != ActionsDAG::ActionType::INPUT)
+                continue;
+
+            auto input_node_it = before_sort_actions_inputs_name_to_node.find(node.result_name);
+            if (input_node_it == before_sort_actions_inputs_name_to_node.end())
+            {
+                auto input_column = ColumnWithTypeAndName{node.column, node.result_type, node.result_name};
+                const auto * input_node = &before_sort_actions->addInput(std::move(input_column));
+                auto [it, _] = before_sort_actions_inputs_name_to_node.emplace(node.result_name, input_node);
+                input_node_it = it;
+            }
+
+            before_sort_actions_outputs.push_back(input_node_it->second);
+            before_sort_actions_dag_output_node_names.insert(node.result_name);
+        }
+    }
+
     auto actions_step_before_sort = std::make_unique<ActionsChainStep>(before_sort_actions);
     actions_chain.addStep(std::move(actions_step_before_sort));
 
-    return SortAnalysisResult{std::move(before_sort_actions)};
+    return SortAnalysisResult{std::move(before_sort_actions), has_with_fill};
 }
 
 /** Construct limit by analysis result.
   * Actions before limit by are added into actions chain.
   */
 LimitByAnalysisResult analyzeLimitBy(const QueryNode & query_node,
-    const ColumnsWithTypeAndName & join_tree_input_columns,
+    const ColumnsWithTypeAndName & input_columns,
     const PlannerContextPtr & planner_context,
     const NameSet & required_output_nodes_names,
     ActionsChain & actions_chain)
 {
-    const auto * chain_available_output_columns = actions_chain.getLastStepAvailableOutputColumnsOrNull();
-    const auto & limit_by_input = chain_available_output_columns ? *chain_available_output_columns : join_tree_input_columns;
-    auto before_limit_by_actions = buildActionsDAGFromExpressionNode(query_node.getLimitByNode(), limit_by_input, planner_context);
+    auto before_limit_by_actions = buildActionsDAGFromExpressionNode(query_node.getLimitByNode(), input_columns, planner_context);
 
     NameSet limit_by_column_names_set;
     Names limit_by_column_names;
@@ -436,29 +480,42 @@ PlannerExpressionsAnalysisResult buildExpressionAnalysisResult(const QueryTreeNo
     std::optional<FilterAnalysisResult> where_analysis_result_optional;
     std::optional<size_t> where_action_step_index_optional;
 
+    ColumnsWithTypeAndName current_output_columns = join_tree_input_columns;
+
     if (query_node.hasWhere())
     {
-        where_analysis_result_optional = analyzeFilter(query_node.getWhere(), join_tree_input_columns, planner_context, actions_chain);
+        where_analysis_result_optional = analyzeFilter(query_node.getWhere(), current_output_columns, planner_context, actions_chain);
         where_action_step_index_optional = actions_chain.getLastStepIndex();
+        current_output_columns = actions_chain.getLastStepAvailableOutputColumns();
     }
 
-    auto aggregation_analysis_result_optional = analyzeAggregation(query_tree, join_tree_input_columns, planner_context, actions_chain);
+    auto aggregation_analysis_result_optional = analyzeAggregation(query_tree, current_output_columns, planner_context, actions_chain);
+    if (aggregation_analysis_result_optional)
+        current_output_columns = actions_chain.getLastStepAvailableOutputColumns();
 
     std::optional<FilterAnalysisResult> having_analysis_result_optional;
     std::optional<size_t> having_action_step_index_optional;
 
     if (query_node.hasHaving())
     {
-        having_analysis_result_optional = analyzeFilter(query_node.getHaving(), join_tree_input_columns, planner_context, actions_chain);
+        having_analysis_result_optional = analyzeFilter(query_node.getHaving(), current_output_columns, planner_context, actions_chain);
         having_action_step_index_optional = actions_chain.getLastStepIndex();
+        current_output_columns = actions_chain.getLastStepAvailableOutputColumns();
     }
 
-    auto window_analysis_result_optional = analyzeWindow(query_tree, join_tree_input_columns, planner_context, actions_chain);
-    auto projection_analysis_result = analyzeProjection(query_node, join_tree_input_columns, planner_context, actions_chain);
+    auto window_analysis_result_optional = analyzeWindow(query_tree, current_output_columns, planner_context, actions_chain);
+    if (window_analysis_result_optional)
+        current_output_columns = actions_chain.getLastStepAvailableOutputColumns();
+
+    auto projection_analysis_result = analyzeProjection(query_node, current_output_columns, planner_context, actions_chain);
+    current_output_columns = actions_chain.getLastStepAvailableOutputColumns();
 
     std::optional<SortAnalysisResult> sort_analysis_result_optional;
     if (query_node.hasOrderBy())
-        sort_analysis_result_optional = analyzeSort(query_node, join_tree_input_columns, planner_context, actions_chain);
+    {
+        sort_analysis_result_optional = analyzeSort(query_node, current_output_columns, planner_context, actions_chain);
+        current_output_columns = actions_chain.getLastStepAvailableOutputColumns();
+    }
 
     std::optional<LimitByAnalysisResult> limit_by_analysis_result_optional;
 
@@ -480,29 +537,39 @@ PlannerExpressionsAnalysisResult buildExpressionAnalysisResult(const QueryTreeNo
         }
 
         limit_by_analysis_result_optional = analyzeLimitBy(query_node,
-            join_tree_input_columns,
+            current_output_columns,
             planner_context,
             required_output_nodes_names,
             actions_chain);
+        current_output_columns = actions_chain.getLastStepAvailableOutputColumns();
     }
 
     const auto * chain_available_output_columns = actions_chain.getLastStepAvailableOutputColumnsOrNull();
-    auto project_names_input = chain_available_output_columns ? *chain_available_output_columns : join_tree_input_columns;
+    auto project_names_input = chain_available_output_columns ? *chain_available_output_columns : current_output_columns;
+    bool has_with_fill = sort_analysis_result_optional.has_value() && sort_analysis_result_optional->has_with_fill;
 
-    /** If there is DISTINCT we must preserve non constant projection output columns
+    /** If there is WITH FILL we must use non constant projection columns.
+      *
+      * Example: SELECT 1 AS value ORDER BY value ASC WITH FILL FROM 0 TO 5 STEP 1;
+      *
+      * If there is DISTINCT we must preserve non constant projection output columns
       * in project names actions, to prevent removing of unused expressions during chain finalize.
       *
       * Example: SELECT DISTINCT id, 1 AS value FROM test_table ORDER BY id;
       */
-    if (query_node.isDistinct())
+    if (has_with_fill || query_node.isDistinct())
     {
         std::unordered_set<std::string_view> projection_column_names;
-        for (auto & [column_name, _] : projection_analysis_result.projection_column_names_with_display_aliases)
-            projection_column_names.insert(column_name);
+
+        if (query_node.isDistinct())
+        {
+            for (auto & [column_name, _] : projection_analysis_result.projection_column_names_with_display_aliases)
+                projection_column_names.insert(column_name);
+        }
 
         for (auto & column : project_names_input)
         {
-            if (projection_column_names.contains(column.name))
+            if (has_with_fill || projection_column_names.contains(column.name))
                 column.column = nullptr;
         }
     }
diff --git a/src/Planner/PlannerExpressionAnalysis.h b/src/Planner/PlannerExpressionAnalysis.h
index b6d6ed96e9d..792cfdec2ff 100644
--- a/src/Planner/PlannerExpressionAnalysis.h
+++ b/src/Planner/PlannerExpressionAnalysis.h
@@ -48,6 +48,7 @@ struct WindowAnalysisResult
 struct SortAnalysisResult
 {
     ActionsDAGPtr before_order_by_actions;
+    bool has_with_fill = false;
 };
 
 struct LimitByAnalysisResult
diff --git a/src/Planner/PlannerJoinTree.cpp b/src/Planner/PlannerJoinTree.cpp
index f2259ca7e33..4f091f73187 100644
--- a/src/Planner/PlannerJoinTree.cpp
+++ b/src/Planner/PlannerJoinTree.cpp
@@ -1,17 +1,27 @@
 #include <Planner/PlannerJoinTree.h>
 
+#include <Common/scope_guard_safe.h>
+
+#include <Columns/ColumnAggregateFunction.h>
+
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Functions/FunctionFactory.h>
 
+#include <AggregateFunctions/AggregateFunctionCount.h>
+
 #include <Access/Common/AccessFlags.h>
 #include <Access/ContextAccess.h>
 
 #include <Storages/IStorage.h>
 #include <Storages/StorageDictionary.h>
+#include <Storages/StorageDistributed.h>
 
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/ColumnNode.h>
+#include <Analyzer/FunctionNode.h>
 #include <Analyzer/TableNode.h>
 #include <Analyzer/TableFunctionNode.h>
 #include <Analyzer/QueryNode.h>
@@ -19,26 +29,38 @@
 #include <Analyzer/JoinNode.h>
 #include <Analyzer/ArrayJoinNode.h>
 #include <Analyzer/Utils.h>
+#include <Analyzer/AggregationUtils.h>
+#include <Analyzer/Passes/QueryAnalysisPass.h>
+#include <Analyzer/QueryTreeBuilder.h>
+
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/parseQuery.h>
 
 #include <Processors/Sources/NullSource.h>
 #include <Processors/QueryPlan/SortingStep.h>
 #include <Processors/QueryPlan/CreateSetAndFilterOnTheFlyStep.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/QueryPlan/JoinStep.h>
 #include <Processors/QueryPlan/ArrayJoinStep.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 
 #include <Interpreters/Context.h>
 #include <Interpreters/IJoin.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/HashJoin.h>
 #include <Interpreters/ArrayJoinAction.h>
+#include <Interpreters/getCustomKeyFilterForParallelReplicas.h>
 
 #include <Planner/CollectColumnIdentifiers.h>
 #include <Planner/Planner.h>
 #include <Planner/PlannerJoins.h>
 #include <Planner/PlannerActionsVisitor.h>
 #include <Planner/Utils.h>
+#include <Planner/CollectSets.h>
+#include <Planner/CollectTableExpressionData.h>
+
 
 namespace DB
 {
@@ -53,6 +75,7 @@ namespace ErrorCodes
     extern const int PARAMETER_OUT_OF_BOUND;
     extern const int TOO_MANY_COLUMNS;
     extern const int UNSUPPORTED_METHOD;
+    extern const int BAD_ARGUMENTS;
 }
 
 namespace
@@ -143,17 +166,332 @@ NameAndTypePair chooseSmallestColumnToReadFromStorage(const StoragePtr & storage
     return result;
 }
 
-JoinTreeQueryPlan buildQueryPlanForTableExpression(const QueryTreeNodePtr & table_expression,
-    const SelectQueryInfo & select_query_info,
-    const SelectQueryOptions & select_query_options,
-    PlannerContextPtr & planner_context,
-    bool is_single_table_expression)
+bool applyTrivialCountIfPossible(
+    QueryPlan & query_plan,
+    const TableNode & table_node,
+    const QueryTreeNodePtr & query_tree,
+    const ContextPtr & query_context,
+    const Names & columns_names)
+{
+    const auto & settings = query_context->getSettingsRef();
+    if (!settings.optimize_trivial_count_query)
+        return false;
+
+    const auto & storage = table_node.getStorage();
+    auto storage_id = storage->getStorageID();
+    auto row_policy_filter = query_context->getRowPolicyFilter(storage_id.getDatabaseName(),
+        storage_id.getTableName(),
+        RowPolicyFilterType::SELECT_FILTER);
+    if (row_policy_filter)
+        return {};
+
+    /** Transaction check here is necessary because
+      * MergeTree maintains total count for all parts in Active state and it simply returns that number for trivial select count() from table query.
+      * But if we have current transaction, then we should return number of rows in current snapshot (that may include parts in Outdated state),
+      * so we have to use totalRowsByPartitionPredicate() instead of totalRows even for trivial query
+      * See https://github.com/ClickHouse/ClickHouse/pull/24258/files#r828182031
+      */
+    if (query_context->getCurrentTransaction())
+        return false;
+
+    /// can't apply if FINAL
+    if (table_node.getTableExpressionModifiers().has_value() &&
+        (table_node.getTableExpressionModifiers()->hasFinal() || table_node.getTableExpressionModifiers()->hasSampleSizeRatio() ||
+            table_node.getTableExpressionModifiers()->hasSampleOffsetRatio()))
+        return false;
+
+    // TODO: It's possible to optimize count() given only partition predicates
+    auto & main_query_node = query_tree->as<QueryNode &>();
+    if (main_query_node.hasGroupBy() || main_query_node.hasPrewhere() || main_query_node.hasWhere())
+        return false;
+
+    if (storage->hasLightweightDeletedMask())
+        return false;
+
+    if (settings.max_parallel_replicas > 1 ||
+        settings.allow_experimental_query_deduplication
+        || settings.empty_result_for_aggregation_by_empty_set)
+        return false;
+
+    QueryTreeNodes aggregates = collectAggregateFunctionNodes(query_tree);
+    if (aggregates.size() != 1)
+        return false;
+
+    const auto & function_node = aggregates.front().get()->as<const FunctionNode &>();
+    chassert(function_node.getAggregateFunction() != nullptr);
+    const auto * count_func = typeid_cast<const AggregateFunctionCount *>(function_node.getAggregateFunction().get());
+    if (!count_func)
+        return false;
+
+    /// Get number of rows
+    std::optional<UInt64> num_rows = storage->totalRows(settings);
+    if (!num_rows)
+        return false;
+
+    /// Set aggregation state
+    const AggregateFunctionCount & agg_count = *count_func;
+    std::vector<char> state(agg_count.sizeOfData());
+    AggregateDataPtr place = state.data();
+    agg_count.create(place);
+    SCOPE_EXIT_MEMORY_SAFE(agg_count.destroy(place));
+    agg_count.set(place, num_rows.value());
+
+    auto column = ColumnAggregateFunction::create(function_node.getAggregateFunction());
+    column->insertFrom(place);
+
+    /// get count() argument type
+    DataTypes argument_types;
+    argument_types.reserve(columns_names.size());
+    {
+        const Block source_header = table_node.getStorageSnapshot()->getSampleBlockForColumns(columns_names);
+        for (const auto & column_name : columns_names)
+            argument_types.push_back(source_header.getByName(column_name).type);
+    }
+
+    Block block_with_count{
+        {std::move(column),
+         std::make_shared<DataTypeAggregateFunction>(function_node.getAggregateFunction(), argument_types, Array{}),
+         columns_names.front()}};
+
+    auto source = std::make_shared<SourceFromSingleChunk>(block_with_count);
+    auto prepared_count = std::make_unique<ReadFromPreparedSource>(Pipe(std::move(source)));
+    prepared_count->setStepDescription("Optimized trivial count");
+    query_plan.addStep(std::move(prepared_count));
+
+    return true;
+}
+
+void prepareBuildQueryPlanForTableExpression(const QueryTreeNodePtr & table_expression, PlannerContextPtr & planner_context)
 {
     const auto & query_context = planner_context->getQueryContext();
     const auto & settings = query_context->getSettingsRef();
 
+    auto & table_expression_data = planner_context->getTableExpressionDataOrThrow(table_expression);
+    auto columns_names = table_expression_data.getColumnNames();
+
+    auto * table_node = table_expression->as<TableNode>();
+    auto * table_function_node = table_expression->as<TableFunctionNode>();
+    auto * query_node = table_expression->as<QueryNode>();
+    auto * union_node = table_expression->as<UnionNode>();
+
+    /** The current user must have the SELECT privilege.
+      * We do not check access rights for table functions because they have been already checked in ITableFunction::execute().
+      */
+    if (table_node)
+    {
+        auto column_names_with_aliases = columns_names;
+        const auto & alias_columns_names = table_expression_data.getAliasColumnsNames();
+        column_names_with_aliases.insert(column_names_with_aliases.end(), alias_columns_names.begin(), alias_columns_names.end());
+        checkAccessRights(*table_node, column_names_with_aliases, query_context);
+    }
+
+    if (columns_names.empty())
+    {
+        NameAndTypePair additional_column_to_read;
+
+        if (table_node || table_function_node)
+        {
+            const auto & storage = table_node ? table_node->getStorage() : table_function_node->getStorage();
+            const auto & storage_snapshot = table_node ? table_node->getStorageSnapshot() : table_function_node->getStorageSnapshot();
+            additional_column_to_read = chooseSmallestColumnToReadFromStorage(storage, storage_snapshot);
+
+        }
+        else if (query_node || union_node)
+        {
+            const auto & projection_columns = query_node ? query_node->getProjectionColumns() : union_node->computeProjectionColumns();
+            NamesAndTypesList projection_columns_list(projection_columns.begin(), projection_columns.end());
+            additional_column_to_read = ExpressionActions::getSmallestColumn(projection_columns_list);
+        }
+        else
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected table, table function, query or union. Actual {}",
+                            table_expression->formatASTForErrorMessage());
+        }
+
+        auto & global_planner_context = planner_context->getGlobalPlannerContext();
+        const auto & column_identifier = global_planner_context->createColumnIdentifier(additional_column_to_read, table_expression);
+        columns_names.push_back(additional_column_to_read.name);
+        table_expression_data.addColumn(additional_column_to_read, column_identifier);
+    }
+
+    /// Limitation on the number of columns to read
+    if (settings.max_columns_to_read && columns_names.size() > settings.max_columns_to_read)
+        throw Exception(ErrorCodes::TOO_MANY_COLUMNS,
+            "Limit for number of columns to read exceeded. Requested: {}, maximum: {}",
+            columns_names.size(),
+            settings.max_columns_to_read);
+}
+
+void updatePrewhereOutputsIfNeeded(SelectQueryInfo & table_expression_query_info,
+    const Names & column_names,
+    const StorageSnapshotPtr & storage_snapshot)
+{
+    if (!table_expression_query_info.prewhere_info)
+        return;
+
+    auto & prewhere_actions = table_expression_query_info.prewhere_info->prewhere_actions;
+
+    NameSet required_columns;
+    if (column_names.size() == 1)
+        required_columns.insert(column_names[0]);
+
+    auto & table_expression_modifiers = table_expression_query_info.table_expression_modifiers;
+    if (table_expression_modifiers)
+    {
+        if (table_expression_modifiers->hasSampleSizeRatio() ||
+            table_expression_query_info.planner_context->getQueryContext()->getSettingsRef().parallel_replicas_count > 1)
+        {
+            /// We evaluate sampling for Merge lazily so we need to get all the columns
+            if (storage_snapshot->storage.getName() == "Merge")
+            {
+                const auto columns = storage_snapshot->getMetadataForQuery()->getColumns().getAll();
+                for (const auto & column : columns)
+                    required_columns.insert(column.name);
+            }
+            else
+            {
+                auto columns_required_for_sampling = storage_snapshot->getMetadataForQuery()->getColumnsRequiredForSampling();
+                required_columns.insert(columns_required_for_sampling.begin(), columns_required_for_sampling.end());
+            }
+        }
+
+        if (table_expression_modifiers->hasFinal())
+        {
+            auto columns_required_for_final = storage_snapshot->getMetadataForQuery()->getColumnsRequiredForFinal();
+            required_columns.insert(columns_required_for_final.begin(), columns_required_for_final.end());
+        }
+    }
+
+    std::unordered_set<const ActionsDAG::Node *> required_output_nodes;
+
+    for (const auto * input : prewhere_actions->getInputs())
+    {
+        if (required_columns.contains(input->result_name))
+            required_output_nodes.insert(input);
+    }
+
+    if (required_output_nodes.empty())
+        return;
+
+    auto & prewhere_outputs = prewhere_actions->getOutputs();
+    for (const auto & output : prewhere_outputs)
+    {
+        auto required_output_node_it = required_output_nodes.find(output);
+        if (required_output_node_it == required_output_nodes.end())
+            continue;
+
+        required_output_nodes.erase(required_output_node_it);
+    }
+
+    prewhere_outputs.insert(prewhere_outputs.end(), required_output_nodes.begin(), required_output_nodes.end());
+}
+
+FilterDAGInfo buildRowPolicyFilterIfNeeded(const StoragePtr & storage,
+    SelectQueryInfo & table_expression_query_info,
+    PlannerContextPtr & planner_context)
+{
+    auto storage_id = storage->getStorageID();
+    const auto & query_context = planner_context->getQueryContext();
+
+    auto row_policy_filter = query_context->getRowPolicyFilter(storage_id.getDatabaseName(), storage_id.getTableName(), RowPolicyFilterType::SELECT_FILTER);
+    if (!row_policy_filter)
+        return {};
+
+    return buildFilterInfo(row_policy_filter->expression, table_expression_query_info.table_expression, planner_context);
+}
+
+FilterDAGInfo buildCustomKeyFilterIfNeeded(const StoragePtr & storage,
+    SelectQueryInfo & table_expression_query_info,
+    PlannerContextPtr & planner_context)
+{
+    const auto & query_context = planner_context->getQueryContext();
+    const auto & settings = query_context->getSettingsRef();
+
+    if (settings.parallel_replicas_count <= 1 || settings.parallel_replicas_custom_key.value.empty())
+        return {};
+
+    auto custom_key_ast = parseCustomKeyForTable(settings.parallel_replicas_custom_key, *query_context);
+    if (!custom_key_ast)
+        throw DB::Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Parallel replicas processing with custom_key has been requested "
+                "(setting 'max_parallel_replcias'), but the table does not have custom_key defined for it "
+                " or it's invalid (setting 'parallel_replicas_custom_key')");
+
+    LOG_TRACE(&Poco::Logger::get("Planner"), "Processing query on a replica using custom_key '{}'", settings.parallel_replicas_custom_key.value);
+
+    auto parallel_replicas_custom_filter_ast = getCustomKeyFilterForParallelReplica(
+            settings.parallel_replicas_count,
+            settings.parallel_replica_offset,
+            std::move(custom_key_ast),
+            settings.parallel_replicas_custom_key_filter_type,
+            *storage,
+            query_context);
+
+    return buildFilterInfo(parallel_replicas_custom_filter_ast, table_expression_query_info.table_expression, planner_context);
+}
+
+/// Apply filters from additional_table_filters setting
+FilterDAGInfo buildAdditionalFiltersIfNeeded(const StoragePtr & storage,
+    const String & table_expression_alias,
+    SelectQueryInfo & table_expression_query_info,
+    PlannerContextPtr & planner_context)
+{
+    const auto & query_context = planner_context->getQueryContext();
+    const auto & settings = query_context->getSettingsRef();
+
+    auto const & additional_filters = settings.additional_table_filters.value;
+    if (additional_filters.empty())
+        return {};
+
+    auto const & storage_id = storage->getStorageID();
+
+    ASTPtr additional_filter_ast;
+    for (const auto & additional_filter : additional_filters)
+    {
+        const auto & tuple = additional_filter.safeGet<const Tuple &>();
+        auto const & table = tuple.at(0).safeGet<String>();
+        auto const & filter = tuple.at(1).safeGet<String>();
+
+        if (table == table_expression_alias ||
+            (table == storage_id.getTableName() && query_context->getCurrentDatabase() == storage_id.getDatabaseName()) ||
+            (table == storage_id.getFullNameNotQuoted()))
+        {
+            ParserExpression parser;
+            additional_filter_ast = parseQuery(
+                parser, filter.data(), filter.data() + filter.size(),
+                "additional filter", settings.max_query_size, settings.max_parser_depth);
+            break;
+        }
+    }
+
+    if (!additional_filter_ast)
+        return {};
+
+    table_expression_query_info.additional_filter_ast = additional_filter_ast;
+    return buildFilterInfo(additional_filter_ast, table_expression_query_info.table_expression, planner_context);
+}
+
+JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expression,
+    const SelectQueryInfo & select_query_info,
+    const SelectQueryOptions & select_query_options,
+    PlannerContextPtr & planner_context,
+    bool is_single_table_expression,
+    bool wrap_read_columns_in_subquery)
+{
+    const auto & query_context = planner_context->getQueryContext();
+    const auto & settings = query_context->getSettingsRef();
+
+    auto & table_expression_data = planner_context->getTableExpressionDataOrThrow(table_expression);
+
     QueryProcessingStage::Enum from_stage = QueryProcessingStage::Enum::FetchColumns;
 
+    if (wrap_read_columns_in_subquery)
+    {
+        auto columns = table_expression_data.getColumns();
+        table_expression = buildSubqueryToReadColumnsFromTableExpression(columns, table_expression, query_context);
+    }
+
     auto * table_node = table_expression->as<TableNode>();
     auto * table_function_node = table_expression->as<TableFunctionNode>();
     auto * query_node = table_expression->as<QueryNode>();
@@ -161,8 +499,6 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(const QueryTreeNodePtr & tabl
 
     QueryPlan query_plan;
 
-    auto & table_expression_data = planner_context->getTableExpressionDataOrThrow(table_expression);
-
     if (table_node || table_function_node)
     {
         const auto & storage = table_node ? table_node->getStorage() : table_function_node->getStorage();
@@ -257,37 +593,7 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(const QueryTreeNodePtr & tabl
         else
             table_expression_query_info.table_expression_modifiers = table_function_node->getTableExpressionModifiers();
 
-        from_stage = storage->getQueryProcessingStage(query_context, select_query_options.to_stage, storage_snapshot, table_expression_query_info);
-
-        Names columns_names = table_expression_data.getColumnNames();
-
-        /** The current user must have the SELECT privilege.
-          * We do not check access rights for table functions because they have been already checked in ITableFunction::execute().
-          */
-        if (table_node)
-        {
-            auto column_names_with_aliases = columns_names;
-            const auto & alias_columns_names = table_expression_data.getAliasColumnsNames();
-            column_names_with_aliases.insert(column_names_with_aliases.end(), alias_columns_names.begin(), alias_columns_names.end());
-            checkAccessRights(*table_node, column_names_with_aliases, planner_context->getQueryContext());
-        }
-
-        /// Limitation on the number of columns to read
-        if (settings.max_columns_to_read && columns_names.size() > settings.max_columns_to_read)
-            throw Exception(ErrorCodes::TOO_MANY_COLUMNS,
-                "Limit for number of columns to read exceeded. Requested: {}, maximum: {}",
-                columns_names.size(),
-                settings.max_columns_to_read);
-
-        if (columns_names.empty())
-        {
-            auto additional_column_to_read = chooseSmallestColumnToReadFromStorage(storage, storage_snapshot);
-            const auto & column_identifier = planner_context->getGlobalPlannerContext()->createColumnIdentifier(additional_column_to_read, table_expression);
-            columns_names.push_back(additional_column_to_read.name);
-            table_expression_data.addColumn(additional_column_to_read, column_identifier);
-        }
-
-        bool need_rewrite_query_with_final = storage->needRewriteQueryWithFinal(columns_names);
+        bool need_rewrite_query_with_final = storage->needRewriteQueryWithFinal(table_expression_data.getColumnNames());
         if (need_rewrite_query_with_final)
         {
             if (table_expression_query_info.table_expression_modifiers)
@@ -308,48 +614,173 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(const QueryTreeNodePtr & tabl
             }
         }
 
-        storage->read(query_plan, columns_names, storage_snapshot, table_expression_query_info, query_context, from_stage, max_block_size, max_streams);
+        /// Apply trivial_count optimization if possible
+        bool is_trivial_count_applied = !select_query_options.only_analyze &&
+            is_single_table_expression &&
+            table_node &&
+            select_query_info.has_aggregates &&
+            applyTrivialCountIfPossible(query_plan, *table_node, select_query_info.query_tree, planner_context->getQueryContext(), table_expression_data.getColumnNames());
 
-        if (query_plan.isInitialized())
+        if (is_trivial_count_applied)
         {
-            /** Specify the number of threads only if it wasn't specified in storage.
-              *
-              * But in case of remote query and prefer_localhost_replica=1 (default)
-              * The inner local query (that is done in the same process, without
-              * network interaction), it will setMaxThreads earlier and distributed
-              * query will not update it.
-              */
-            if (!query_plan.getMaxThreads() || is_remote)
-                query_plan.setMaxThreads(max_threads_execute_query);
+            from_stage = QueryProcessingStage::WithMergeableState;
         }
         else
         {
-            /// Create step which reads from empty source if storage has no data.
-            auto source_header = storage_snapshot->getSampleBlockForColumns(columns_names);
+            if (!select_query_options.only_analyze)
+            {
+                const auto & prewhere_actions = table_expression_data.getPrewhereFilterActions();
+
+                if (prewhere_actions)
+                {
+                    table_expression_query_info.prewhere_info = std::make_shared<PrewhereInfo>();
+                    table_expression_query_info.prewhere_info->prewhere_actions = prewhere_actions;
+                    table_expression_query_info.prewhere_info->prewhere_column_name = prewhere_actions->getOutputs().at(0)->result_name;
+                    table_expression_query_info.prewhere_info->remove_prewhere_column = true;
+                    table_expression_query_info.prewhere_info->need_filter = true;
+                }
+
+                updatePrewhereOutputsIfNeeded(table_expression_query_info, table_expression_data.getColumnNames(), storage_snapshot);
+
+                const auto & columns_names = table_expression_data.getColumnNames();
+
+                std::vector<std::pair<FilterDAGInfo, std::string>> where_filters;
+                const auto add_filter = [&](const FilterDAGInfo & filter_info, std::string description)
+                {
+                    if (!filter_info.actions)
+                        return;
+
+                    bool is_final = table_expression_query_info.table_expression_modifiers &&
+                        table_expression_query_info.table_expression_modifiers->hasFinal();
+                    bool optimize_move_to_prewhere = settings.optimize_move_to_prewhere && (!is_final || settings.optimize_move_to_prewhere_if_final);
+
+                    if (storage->supportsPrewhere() && optimize_move_to_prewhere)
+                    {
+                        if (!table_expression_query_info.prewhere_info)
+                            table_expression_query_info.prewhere_info = std::make_shared<PrewhereInfo>();
+
+                        if (!table_expression_query_info.prewhere_info->prewhere_actions)
+                        {
+                            table_expression_query_info.prewhere_info->prewhere_actions = filter_info.actions;
+                            table_expression_query_info.prewhere_info->prewhere_column_name = filter_info.column_name;
+                            table_expression_query_info.prewhere_info->remove_prewhere_column = filter_info.do_remove_column;
+                        }
+                        else
+                        {
+                            table_expression_query_info.prewhere_info->row_level_filter = filter_info.actions;
+                            table_expression_query_info.prewhere_info->row_level_column_name = filter_info.column_name;
+                        }
+
+                        table_expression_query_info.prewhere_info->need_filter = true;
+                    }
+                    else
+                    {
+                        where_filters.emplace_back(filter_info, std::move(description));
+                    }
+                };
+
+                auto row_policy_filter_info = buildRowPolicyFilterIfNeeded(storage, table_expression_query_info, planner_context);
+                add_filter(row_policy_filter_info, "Row-level security filter");
+
+                if (query_context->getParallelReplicasMode() == Context::ParallelReplicasMode::CUSTOM_KEY)
+                {
+                    if (settings.parallel_replicas_count > 1)
+                    {
+                        auto parallel_replicas_custom_key_filter_info = buildCustomKeyFilterIfNeeded(storage, table_expression_query_info, planner_context);
+                        add_filter(parallel_replicas_custom_key_filter_info, "Parallel replicas custom key filter");
+                    }
+                    else
+                    {
+                        if (auto * distributed = typeid_cast<StorageDistributed *>(storage.get());
+                            distributed && canUseCustomKey(settings, *distributed->getCluster(), *query_context))
+                        {
+                            table_expression_query_info.use_custom_key = true;
+                            planner_context->getMutableQueryContext()->setSetting("distributed_group_by_no_merge", 2);
+                        }
+                    }
+                }
+
+                const auto & table_expression_alias = table_expression->getAlias();
+                auto additional_filters_info = buildAdditionalFiltersIfNeeded(storage, table_expression_alias, table_expression_query_info, planner_context);
+                add_filter(additional_filters_info, "additional filter");
+
+                from_stage = storage->getQueryProcessingStage(query_context, select_query_options.to_stage, storage_snapshot, table_expression_query_info);
+                storage->read(query_plan, columns_names, storage_snapshot, table_expression_query_info, query_context, from_stage, max_block_size, max_streams);
+
+                for (const auto & filter_info_and_description : where_filters)
+                {
+                    const auto & [filter_info, description] = filter_info_and_description;
+                    if (query_plan.isInitialized() &&
+                        from_stage == QueryProcessingStage::FetchColumns &&
+                        filter_info.actions)
+                    {
+                        auto filter_step = std::make_unique<FilterStep>(query_plan.getCurrentDataStream(),
+                            filter_info.actions,
+                            filter_info.column_name,
+                            filter_info.do_remove_column);
+                        filter_step->setStepDescription(description);
+                        query_plan.addStep(std::move(filter_step));
+                    }
+                }
+
+                if (query_context->hasQueryContext() && !select_query_options.is_internal)
+                {
+                    auto local_storage_id = storage->getStorageID();
+                    query_context->getQueryContext()->addQueryAccessInfo(
+                        backQuoteIfNeed(local_storage_id.getDatabaseName()),
+                        local_storage_id.getFullTableName(),
+                        columns_names,
+                        {},
+                        {});
+                }
+            }
+
+            if (query_plan.isInitialized())
+            {
+                /** Specify the number of threads only if it wasn't specified in storage.
+                  *
+                  * But in case of remote query and prefer_localhost_replica=1 (default)
+                  * The inner local query (that is done in the same process, without
+                  * network interaction), it will setMaxThreads earlier and distributed
+                  * query will not update it.
+                  */
+                if (!query_plan.getMaxThreads() || is_remote)
+                    query_plan.setMaxThreads(max_threads_execute_query);
+            }
+            else
+            {
+                /// Create step which reads from empty source if storage has no data.
+                auto source_header = storage_snapshot->getSampleBlockForColumns(table_expression_data.getColumnNames());
+                Pipe pipe(std::make_shared<NullSource>(source_header));
+                auto read_from_pipe = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
+                read_from_pipe->setStepDescription("Read from NullSource");
+                query_plan.addStep(std::move(read_from_pipe));
+            }
+        }
+    }
+    else if (query_node || union_node)
+    {
+        if (select_query_options.only_analyze)
+        {
+            auto projection_columns = query_node ? query_node->getProjectionColumns() : union_node->computeProjectionColumns();
+            Block source_header;
+            for (auto & projection_column : projection_columns)
+                source_header.insert(ColumnWithTypeAndName(projection_column.type, projection_column.name));
+
             Pipe pipe(std::make_shared<NullSource>(source_header));
             auto read_from_pipe = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
             read_from_pipe->setStepDescription("Read from NullSource");
             query_plan.addStep(std::move(read_from_pipe));
         }
-    }
-    else if (query_node || union_node)
-    {
-        if (table_expression_data.getColumnNames().empty())
+        else
         {
-            const auto & projection_columns = query_node ? query_node->getProjectionColumns() : union_node->computeProjectionColumns();
-            NamesAndTypesList projection_columns_list(projection_columns.begin(), projection_columns.end());
-            auto additional_column_to_read = ExpressionActions::getSmallestColumn(projection_columns_list);
-
-            const auto & column_identifier = planner_context->getGlobalPlannerContext()->createColumnIdentifier(additional_column_to_read, table_expression);
-            table_expression_data.addColumn(additional_column_to_read, column_identifier);
+            auto subquery_options = select_query_options.subquery();
+            Planner subquery_planner(table_expression, subquery_options, planner_context->getGlobalPlannerContext());
+            /// Propagate storage limits to subquery
+            subquery_planner.addStorageLimits(*select_query_info.storage_limits);
+            subquery_planner.buildQueryPlanIfNeeded();
+            query_plan = std::move(subquery_planner).extractQueryPlan();
         }
-
-        auto subquery_options = select_query_options.subquery();
-        Planner subquery_planner(table_expression, subquery_options, planner_context->getGlobalPlannerContext());
-        /// Propagate storage limits to subquery
-        subquery_planner.addStorageLimits(*select_query_info.storage_limits);
-        subquery_planner.buildQueryPlanIfNeeded();
-        query_plan = std::move(subquery_planner).extractQueryPlan();
     }
     else
     {
@@ -385,17 +816,21 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(const QueryTreeNodePtr & tabl
         planner.buildQueryPlanIfNeeded();
 
         auto expected_header = planner.getQueryPlan().getCurrentDataStream().header;
-        materializeBlockInplace(expected_header);
 
-        auto rename_actions_dag = ActionsDAG::makeConvertingActions(
-            query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName(),
-            expected_header.getColumnsWithTypeAndName(),
-            ActionsDAG::MatchColumnsMode::Position,
-            true /*ignore_constant_values*/);
-        auto rename_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(rename_actions_dag));
-        std::string step_description = table_expression_data.isRemote() ? "Change remote column names to local column names" : "Change column names";
-        rename_step->setStepDescription(std::move(step_description));
-        query_plan.addStep(std::move(rename_step));
+        if (!blocksHaveEqualStructure(query_plan.getCurrentDataStream().header, expected_header))
+        {
+            materializeBlockInplace(expected_header);
+
+            auto rename_actions_dag = ActionsDAG::makeConvertingActions(
+                query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName(),
+                expected_header.getColumnsWithTypeAndName(),
+                ActionsDAG::MatchColumnsMode::Position,
+                true /*ignore_constant_values*/);
+            auto rename_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(rename_actions_dag));
+            std::string step_description = table_expression_data.isRemote() ? "Change remote column names to local column names" : "Change column names";
+            rename_step->setStepDescription(std::move(step_description));
+            query_plan.addStep(std::move(rename_step));
+        }
     }
 
     return {std::move(query_plan), from_stage};
@@ -534,7 +969,14 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
         for (auto & output_node : cast_actions_dag->getOutputs())
         {
             if (planner_context->getGlobalPlannerContext()->hasColumnIdentifier(output_node->result_name))
-                output_node = &cast_actions_dag->addFunction(to_nullable_function, {output_node}, output_node->result_name);
+            {
+                DataTypePtr type_to_check = output_node->result_type;
+                if (const auto * type_to_check_low_cardinality = typeid_cast<const DataTypeLowCardinality *>(type_to_check.get()))
+                    type_to_check = type_to_check_low_cardinality->getDictionaryType();
+
+                if (type_to_check->canBeInsideNullable())
+                    output_node = &cast_actions_dag->addFunction(to_nullable_function, {output_node}, output_node->result_name);
+            }
         }
 
         cast_actions_dag->projectInput();
@@ -560,7 +1002,7 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
         }
     }
 
-    auto table_join = std::make_shared<TableJoin>(settings, query_context->getTemporaryVolume());
+    auto table_join = std::make_shared<TableJoin>(settings, query_context->getGlobalTemporaryVolume());
     table_join->getTableJoin() = join_node.toASTTableJoin()->as<ASTTableJoin &>();
     table_join->getTableJoin().kind = join_kind;
 
@@ -918,14 +1360,40 @@ JoinTreeQueryPlan buildJoinTreeQueryPlan(const QueryTreeNodePtr & query_node,
     const ColumnIdentifierSet & outer_scope_columns,
     PlannerContextPtr & planner_context)
 {
-    const auto & query_node_typed = query_node->as<QueryNode &>();
-    auto table_expressions_stack = buildTableExpressionsStack(query_node_typed.getJoinTree());
+    auto table_expressions_stack = buildTableExpressionsStack(query_node->as<QueryNode &>().getJoinTree());
     size_t table_expressions_stack_size = table_expressions_stack.size();
     bool is_single_table_expression = table_expressions_stack_size == 1;
 
     std::vector<ColumnIdentifierSet> table_expressions_outer_scope_columns(table_expressions_stack_size);
     ColumnIdentifierSet current_outer_scope_columns = outer_scope_columns;
 
+    /// For each table, table function, query, union table expressions prepare before query plan build
+    for (size_t i = 0; i < table_expressions_stack_size; ++i)
+    {
+        const auto & table_expression = table_expressions_stack[i];
+        auto table_expression_type = table_expression->getNodeType();
+        if (table_expression_type == QueryTreeNodeType::JOIN ||
+            table_expression_type == QueryTreeNodeType::ARRAY_JOIN)
+            continue;
+
+        prepareBuildQueryPlanForTableExpression(table_expression, planner_context);
+    }
+
+    /** If left most table expression query plan is planned to stage that is not equal to fetch columns,
+      * then left most table expression is responsible for providing valid JOIN TREE part of final query plan.
+      *
+      * Examples: Distributed, LiveView, Merge storages.
+      */
+    auto left_table_expression = table_expressions_stack.front();
+    auto left_table_expression_query_plan = buildQueryPlanForTableExpression(left_table_expression,
+        select_query_info,
+        select_query_options,
+        planner_context,
+        is_single_table_expression,
+        false /*wrap_read_columns_in_subquery*/);
+    if (left_table_expression_query_plan.from_stage != QueryProcessingStage::FetchColumns)
+        return left_table_expression_query_plan;
+
     for (Int64 i = static_cast<Int64>(table_expressions_stack_size) - 1; i >= 0; --i)
     {
         table_expressions_outer_scope_columns[i] = current_outer_scope_columns;
@@ -979,19 +1447,23 @@ JoinTreeQueryPlan buildJoinTreeQueryPlan(const QueryTreeNodePtr & query_node,
         }
         else
         {
-            const auto & table_expression_data = planner_context->getTableExpressionDataOrThrow(table_expression);
-            if (table_expression_data.isRemote() && i != 0)
-                throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-                    "JOIN with multiple remote storages is unsupported");
+            if (table_expression == left_table_expression)
+            {
+                query_plans_stack.push_back(std::move(left_table_expression_query_plan)); /// NOLINT
+                left_table_expression = {};
+                continue;
+            }
 
+            /** If table expression is remote and it is not left most table expression, we wrap read columns from such
+              * table expression in subquery.
+              */
+            bool is_remote = planner_context->getTableExpressionDataOrThrow(table_expression).isRemote();
             query_plans_stack.push_back(buildQueryPlanForTableExpression(table_expression,
                 select_query_info,
                 select_query_options,
                 planner_context,
-                is_single_table_expression));
-
-            if (query_plans_stack.back().from_stage != QueryProcessingStage::FetchColumns)
-                break;
+                is_single_table_expression,
+                is_remote /*wrap_read_columns_in_subquery*/));
         }
     }
 
diff --git a/src/Planner/PlannerJoins.cpp b/src/Planner/PlannerJoins.cpp
index e1c137ddfb8..7da10a8523b 100644
--- a/src/Planner/PlannerJoins.cpp
+++ b/src/Planner/PlannerJoins.cpp
@@ -18,6 +18,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 
+#include <Analyzer/Utils.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/TableNode.h>
@@ -61,6 +62,8 @@ void JoinClause::dump(WriteBuffer & buffer) const
             for (const auto & dag_node : dag_nodes)
             {
                 dag_nodes_dump += dag_node->result_name;
+                dag_nodes_dump += " ";
+                dag_nodes_dump += dag_node->result_type->getName();
                 dag_nodes_dump += ", ";
             }
 
@@ -604,8 +607,8 @@ std::shared_ptr<DirectKeyValueJoin> tryDirectJoin(const std::shared_ptr<TableJoi
 
     for (const auto & right_table_expression_column : right_table_expression_header)
     {
-        const auto * table_column_name = right_table_expression_data.getColumnNameOrNull(right_table_expression_column.name);
-        if (!table_column_name)
+        const auto * table_column_name_ = right_table_expression_data.getColumnNameOrNull(right_table_expression_column.name);
+        if (!table_column_name_)
             return {};
 
         auto right_table_expression_column_with_storage_column_name = right_table_expression_column;
@@ -655,7 +658,7 @@ std::shared_ptr<IJoin> chooseJoinAlgorithm(std::shared_ptr<TableJoin> & table_jo
         return std::make_shared<HashJoin>(table_join, right_table_expression_header);
     }
 
-    if (!table_join->oneDisjunct() && !table_join->isEnabledAlgorithm(JoinAlgorithm::HASH))
+    if (!table_join->oneDisjunct() && !table_join->isEnabledAlgorithm(JoinAlgorithm::HASH) && !table_join->isEnabledAlgorithm(JoinAlgorithm::AUTO))
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Only `hash` join supports multiple ORs for keys in JOIN ON section");
 
     /// Direct JOIN with special storages that support key value access. For example JOIN with Dictionary
@@ -708,7 +711,11 @@ std::shared_ptr<IJoin> chooseJoinAlgorithm(std::shared_ptr<TableJoin> & table_jo
     }
 
     if (table_join->isEnabledAlgorithm(JoinAlgorithm::AUTO))
-        return std::make_shared<JoinSwitcher>(table_join, right_table_expression_header);
+    {
+        if (MergeJoin::isSupported(table_join))
+            return std::make_shared<JoinSwitcher>(table_join, right_table_expression_header);
+        return std::make_shared<HashJoin>(table_join, right_table_expression_header);
+    }
 
     throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                     "Can't execute any of specified algorithms for specified strictness/kind and right storage type");
diff --git a/src/Planner/TableExpressionData.h b/src/Planner/TableExpressionData.h
index 6b4a9b4748d..e945fe26bb0 100644
--- a/src/Planner/TableExpressionData.h
+++ b/src/Planner/TableExpressionData.h
@@ -3,6 +3,8 @@
 #include <Core/Names.h>
 #include <Core/NamesAndTypes.h>
 
+#include <Interpreters/ActionsDAG.h>
+
 namespace DB
 {
 
@@ -63,9 +65,7 @@ public:
         if (hasColumn(column.name))
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Column with name {} already exists");
 
-        column_name_to_column.emplace(column.name, column);
-        column_name_to_column_identifier.emplace(column.name, column_identifier);
-        column_identifier_to_column_name.emplace(column_identifier, column.name);
+        addColumnImpl(column, column_identifier);
     }
 
     /** Add column if it does not exists in table expression data.
@@ -76,9 +76,7 @@ public:
         if (hasColumn(column.name))
             return;
 
-        column_name_to_column.emplace(column.name, column);
-        column_name_to_column_identifier.emplace(column.name, column_identifier);
-        column_identifier_to_column_name.emplace(column_identifier, column.name);
+        addColumnImpl(column, column_identifier);
     }
 
     /// Add alias column name
@@ -100,13 +98,18 @@ public:
     }
 
     /// Get column names
-    Names getColumnNames() const
+    const Names & getColumnNames() const
     {
-        Names result;
-        result.reserve(column_name_to_column.size());
+        return column_names;
+    }
 
-        for (const auto & [column_name, _] : column_name_to_column)
-            result.push_back(column_name);
+    NamesAndTypes getColumns() const
+    {
+        NamesAndTypes result;
+        result.reserve(column_names.size());
+
+        for (const auto & column_name : column_names)
+            result.push_back(column_name_to_column.at(column_name));
 
         return result;
     }
@@ -142,7 +145,6 @@ public:
         auto it = column_name_to_column.find(column_name);
         if (it == column_name_to_column.end())
         {
-            auto column_names = getColumnNames();
             throw Exception(ErrorCodes::LOGICAL_ERROR,
                 "Column for column name {} does not exists. There are only column names: {}",
                 column_name,
@@ -172,7 +174,6 @@ public:
         auto it = column_name_to_column_identifier.find(column_name);
         if (it == column_name_to_column_identifier.end())
         {
-            auto column_names = getColumnNames();
             throw Exception(ErrorCodes::LOGICAL_ERROR,
                 "Column identifier for column name {} does not exists. There are only column names: {}",
                 column_name,
@@ -239,7 +240,38 @@ public:
         is_remote = is_remote_value;
     }
 
+    const ActionsDAGPtr & getPrewhereFilterActions() const
+    {
+        return prewhere_filter_actions;
+    }
+
+    void setPrewhereFilterActions(ActionsDAGPtr prewhere_filter_actions_value)
+    {
+        prewhere_filter_actions = std::move(prewhere_filter_actions_value);
+    }
+
+    const ActionsDAGPtr & getFilterActions() const
+    {
+        return filter_actions;
+    }
+
+    void setFilterActions(ActionsDAGPtr filter_actions_value)
+    {
+        filter_actions = std::move(filter_actions_value);
+    }
+
 private:
+    void addColumnImpl(const NameAndTypePair & column, const ColumnIdentifier & column_identifier)
+    {
+        column_names.push_back(column.name);
+        column_name_to_column.emplace(column.name, column);
+        column_name_to_column_identifier.emplace(column.name, column_identifier);
+        column_identifier_to_column_name.emplace(column_identifier, column.name);
+    }
+
+    /// Valid for table, table function, array join, query, union nodes
+    Names column_names;
+
     /// Valid for table, table function, array join, query, union nodes
     ColumnNameToColumn column_name_to_column;
 
@@ -252,6 +284,12 @@ private:
     /// Valid for table, table function, array join, query, union nodes
     ColumnIdentifierToColumnName column_identifier_to_column_name;
 
+    /// Valid for table, table function
+    ActionsDAGPtr filter_actions;
+
+    /// Valid for table, table function
+    ActionsDAGPtr prewhere_filter_actions;
+
     /// Is storage remote
     bool is_remote = false;
 };
diff --git a/src/Planner/Utils.cpp b/src/Planner/Utils.cpp
index 6df024fee4c..5c61b2fc2c7 100644
--- a/src/Planner/Utils.cpp
+++ b/src/Planner/Utils.cpp
@@ -3,7 +3,10 @@
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSubquery.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/parseQuery.h>
 
+#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
 
@@ -13,22 +16,33 @@
 
 #include <Functions/FunctionFactory.h>
 
+#include <Storages/StorageDummy.h>
+
 #include <Interpreters/Context.h>
 
+#include <Analyzer/Utils.h>
 #include <Analyzer/ConstantNode.h>
+#include <Analyzer/ColumnNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/UnionNode.h>
+#include <Analyzer/TableNode.h>
+#include <Analyzer/TableFunctionNode.h>
 #include <Analyzer/ArrayJoinNode.h>
 #include <Analyzer/JoinNode.h>
+#include <Analyzer/QueryTreeBuilder.h>
+#include <Analyzer/Passes/QueryAnalysisPass.h>
 
 #include <Planner/PlannerActionsVisitor.h>
+#include <Planner/CollectTableExpressionData.h>
+#include <Planner/CollectSets.h>
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
+    extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
     extern const int UNION_ALL_RESULT_STRUCTURES_MISMATCH;
     extern const int INTERSECT_OR_EXCEPT_RESULT_STRUCTURES_MISMATCH;
@@ -185,7 +199,9 @@ StorageLimits buildStorageLimits(const Context & context, const SelectQueryOptio
     return {limits, leaf_limits};
 }
 
-ActionsDAGPtr buildActionsDAGFromExpressionNode(const QueryTreeNodePtr & expression_node, const ColumnsWithTypeAndName & input_columns, const PlannerContextPtr & planner_context)
+ActionsDAGPtr buildActionsDAGFromExpressionNode(const QueryTreeNodePtr & expression_node,
+    const ColumnsWithTypeAndName & input_columns,
+    const PlannerContextPtr & planner_context)
 {
     ActionsDAGPtr action_dag = std::make_shared<ActionsDAG>(input_columns);
     PlannerActionsVisitor actions_visitor(planner_context);
@@ -336,25 +352,132 @@ QueryTreeNodePtr mergeConditionNodes(const QueryTreeNodes & condition_nodes, con
     return function_node;
 }
 
-std::optional<bool> tryExtractConstantFromConditionNode(const QueryTreeNodePtr & condition_node)
+QueryTreeNodePtr replaceTablesAndTableFunctionsWithDummyTables(const QueryTreeNodePtr & query_node,
+    const ContextPtr & context,
+    ResultReplacementMap * result_replacement_map)
 {
-    const auto * constant_node = condition_node->as<ConstantNode>();
-    if (!constant_node)
+    auto & query_node_typed = query_node->as<QueryNode &>();
+    auto table_expressions = extractTableExpressions(query_node_typed.getJoinTree());
+    std::unordered_map<const IQueryTreeNode *, QueryTreeNodePtr> replacement_map;
+
+    for (auto & table_expression : table_expressions)
+    {
+        auto * table_node = table_expression->as<TableNode>();
+        auto * table_function_node = table_expression->as<TableFunctionNode>();
+        if (!table_node && !table_function_node)
+            continue;
+
+        const auto & storage_snapshot = table_node ? table_node->getStorageSnapshot() : table_function_node->getStorageSnapshot();
+        auto storage_dummy = std::make_shared<StorageDummy>(storage_snapshot->storage.getStorageID(),
+            storage_snapshot->metadata->getColumns());
+        auto dummy_table_node = std::make_shared<TableNode>(std::move(storage_dummy), context);
+
+        if (result_replacement_map)
+            result_replacement_map->emplace(table_expression, dummy_table_node);
+
+        replacement_map.emplace(table_expression.get(), std::move(dummy_table_node));
+    }
+
+    return query_node->cloneAndReplace(replacement_map);
+}
+
+QueryTreeNodePtr buildSubqueryToReadColumnsFromTableExpression(const NamesAndTypes & columns,
+    const QueryTreeNodePtr & table_expression,
+    const ContextPtr & context)
+{
+    auto projection_columns = columns;
+
+    QueryTreeNodes subquery_projection_nodes;
+    subquery_projection_nodes.reserve(projection_columns.size());
+
+    for (const auto & column : projection_columns)
+        subquery_projection_nodes.push_back(std::make_shared<ColumnNode>(column, table_expression));
+
+    if (subquery_projection_nodes.empty())
+    {
+        auto constant_data_type = std::make_shared<DataTypeUInt64>();
+        subquery_projection_nodes.push_back(std::make_shared<ConstantNode>(1UL, constant_data_type));
+        projection_columns.push_back({"1", std::move(constant_data_type)});
+    }
+
+    auto context_copy = Context::createCopy(context);
+    updateContextForSubqueryExecution(context_copy);
+
+    auto query_node = std::make_shared<QueryNode>(std::move(context_copy));
+
+    query_node->resolveProjectionColumns(projection_columns);
+    query_node->getProjection().getNodes() = std::move(subquery_projection_nodes);
+    query_node->getJoinTree() = table_expression;
+    query_node->setIsSubquery(true);
+
+    return query_node;
+}
+
+SelectQueryInfo buildSelectQueryInfo(const QueryTreeNodePtr & query_tree, const PlannerContextPtr & planner_context)
+{
+    SelectQueryInfo select_query_info;
+    select_query_info.original_query = queryNodeToSelectQuery(query_tree);
+    select_query_info.query = select_query_info.original_query;
+    select_query_info.query_tree = query_tree;
+    select_query_info.planner_context = planner_context;
+    return select_query_info;
+}
+
+FilterDAGInfo buildFilterInfo(ASTPtr filter_expression,
+        const QueryTreeNodePtr & table_expression,
+        PlannerContextPtr & planner_context,
+        NameSet table_expression_required_names_without_filter)
+{
+    const auto & query_context = planner_context->getQueryContext();
+
+    auto filter_query_tree = buildQueryTree(filter_expression, query_context);
+
+    QueryAnalysisPass query_analysis_pass(table_expression);
+    query_analysis_pass.run(filter_query_tree, query_context);
+
+    if (table_expression_required_names_without_filter.empty())
+    {
+        auto & table_expression_data = planner_context->getTableExpressionDataOrThrow(table_expression);
+        const auto & table_expression_names = table_expression_data.getColumnNames();
+        table_expression_required_names_without_filter.insert(table_expression_names.begin(), table_expression_names.end());
+    }
+
+    collectSourceColumns(filter_query_tree, planner_context);
+    collectSets(filter_query_tree, *planner_context);
+
+    auto filter_actions_dag = std::make_shared<ActionsDAG>();
+
+    PlannerActionsVisitor actions_visitor(planner_context, false /*use_column_identifier_as_action_node_name*/);
+    auto expression_nodes = actions_visitor.visit(filter_actions_dag, filter_query_tree);
+    if (expression_nodes.size() != 1)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "Filter actions must return single output node. Actual {}",
+            expression_nodes.size());
+
+    auto & filter_actions_outputs = filter_actions_dag->getOutputs();
+    filter_actions_outputs = std::move(expression_nodes);
+
+    std::string filter_node_name = filter_actions_outputs[0]->result_name;
+    bool remove_filter_column = true;
+
+    for (const auto & filter_input_node : filter_actions_dag->getInputs())
+        if (table_expression_required_names_without_filter.contains(filter_input_node->result_name))
+            filter_actions_outputs.push_back(filter_input_node);
+
+    return {std::move(filter_actions_dag), std::move(filter_node_name), remove_filter_column};
+}
+
+ASTPtr parseAdditionalResultFilter(const Settings & settings)
+{
+    const String & additional_result_filter = settings.additional_result_filter;
+    if (additional_result_filter.empty())
         return {};
 
-    const auto & value = constant_node->getValue();
-    auto constant_type = constant_node->getResultType();
-    constant_type = removeNullable(removeLowCardinality(constant_type));
-
-    auto which_constant_type = WhichDataType(constant_type);
-    if (!which_constant_type.isUInt8() && !which_constant_type.isNothing())
-        return {};
-
-    if (value.isNull())
-        return false;
-
-    UInt8 predicate_value = value.safeGet<UInt8>();
-    return predicate_value > 0;
+    ParserExpression parser;
+    auto additional_result_filter_ast = parseQuery(
+                parser, additional_result_filter.data(), additional_result_filter.data() + additional_result_filter.size(),
+                "additional result filter", settings.max_query_size, settings.max_parser_depth);
+    return additional_result_filter_ast;
 }
 
 }
diff --git a/src/Planner/Utils.h b/src/Planner/Utils.h
index e304ae13eb5..d9412800e61 100644
--- a/src/Planner/Utils.h
+++ b/src/Planner/Utils.h
@@ -17,6 +17,8 @@
 
 #include <Planner/PlannerContext.h>
 
+#include <Storages/SelectQueryInfo.h>
+
 namespace DB
 {
 
@@ -63,7 +65,25 @@ bool queryHasWithTotalsInAnySubqueryInJoinTree(const QueryTreeNodePtr & query_no
 /// Returns `and` function node that has condition nodes as its arguments
 QueryTreeNodePtr mergeConditionNodes(const QueryTreeNodes & condition_nodes, const ContextPtr & context);
 
-/// Try extract boolean constant from condition node
-std::optional<bool> tryExtractConstantFromConditionNode(const QueryTreeNodePtr & condition_node);
+/// Replace tables nodes and table function nodes with dummy table nodes
+using ResultReplacementMap = std::unordered_map<QueryTreeNodePtr, QueryTreeNodePtr>;
+QueryTreeNodePtr replaceTablesAndTableFunctionsWithDummyTables(const QueryTreeNodePtr & query_node,
+    const ContextPtr & context,
+    ResultReplacementMap * result_replacement_map = nullptr);
+
+/// Build subquery to read specified columns from table expression
+QueryTreeNodePtr buildSubqueryToReadColumnsFromTableExpression(const NamesAndTypes & columns,
+    const QueryTreeNodePtr & table_expression,
+    const ContextPtr & context);
+
+SelectQueryInfo buildSelectQueryInfo(const QueryTreeNodePtr & query_tree, const PlannerContextPtr & planner_context);
+
+/// Build filter for specific table_expression
+FilterDAGInfo buildFilterInfo(ASTPtr filter_expression,
+        const QueryTreeNodePtr & table_expression,
+        PlannerContextPtr & planner_context,
+        NameSet table_expression_required_names_without_filter = {});
+
+ASTPtr parseAdditionalResultFilter(const Settings & settings);
 
 }
diff --git a/src/Processors/Chunk.cpp b/src/Processors/Chunk.cpp
index bbfa1683cf6..0a4b2413e4c 100644
--- a/src/Processors/Chunk.cpp
+++ b/src/Processors/Chunk.cpp
@@ -23,11 +23,11 @@ Chunk::Chunk(Columns columns_, UInt64 num_rows_, ChunkInfoPtr chunk_info_)
     checkNumRowsIsConsistent();
 }
 
-static Columns unmuteColumns(MutableColumns && mut_columns)
+static Columns unmuteColumns(MutableColumns && mutable_columns)
 {
     Columns columns;
-    columns.reserve(mut_columns.size());
-    for (auto & col : mut_columns)
+    columns.reserve(mutable_columns.size());
+    for (auto & col : mutable_columns)
         columns.emplace_back(std::move(col));
 
     return columns;
@@ -78,23 +78,23 @@ void Chunk::checkNumRowsIsConsistent()
 MutableColumns Chunk::mutateColumns()
 {
     size_t num_columns = columns.size();
-    MutableColumns mut_columns(num_columns);
+    MutableColumns mutable_columns(num_columns);
     for (size_t i = 0; i < num_columns; ++i)
-        mut_columns[i] = IColumn::mutate(std::move(columns[i]));
+        mutable_columns[i] = IColumn::mutate(std::move(columns[i]));
 
     columns.clear();
     num_rows = 0;
 
-    return mut_columns;
+    return mutable_columns;
 }
 
 MutableColumns Chunk::cloneEmptyColumns() const
 {
     size_t num_columns = columns.size();
-    MutableColumns mut_columns(num_columns);
+    MutableColumns mutable_columns(num_columns);
     for (size_t i = 0; i < num_columns; ++i)
-        mut_columns[i] = columns[i]->cloneEmpty();
-    return mut_columns;
+        mutable_columns[i] = columns[i]->cloneEmpty();
+    return mutable_columns;
 }
 
 Columns Chunk::detachColumns()
@@ -171,14 +171,19 @@ std::string Chunk::dumpStructure() const
 
 void Chunk::append(const Chunk & chunk)
 {
-    MutableColumns mutation = mutateColumns();
-    for (size_t position = 0; position < mutation.size(); ++position)
+    append(chunk, 0, chunk.getNumRows());
+}
+
+void Chunk::append(const Chunk & chunk, size_t from, size_t length)
+{
+    MutableColumns mutable_columns = mutateColumns();
+    for (size_t position = 0; position < mutable_columns.size(); ++position)
     {
         auto column = chunk.getColumns()[position];
-        mutation[position]->insertRangeFrom(*column, 0, column->size());
+        mutable_columns[position]->insertRangeFrom(*column, from, length);
     }
-    size_t rows = mutation[0]->size();
-    setColumns(std::move(mutation), rows);
+    size_t rows = mutable_columns[0]->size();
+    setColumns(std::move(mutable_columns), rows);
 }
 
 void ChunkMissingValues::setBit(size_t column_idx, size_t row_idx)
diff --git a/src/Processors/Chunk.h b/src/Processors/Chunk.h
index 15d91431b68..6f2097b71f1 100644
--- a/src/Processors/Chunk.h
+++ b/src/Processors/Chunk.h
@@ -102,6 +102,7 @@ public:
     std::string dumpStructure() const;
 
     void append(const Chunk & chunk);
+    void append(const Chunk & chunk, size_t from, size_t length); // append rows [from, from+length) of chunk
 
 private:
     Columns columns;
diff --git a/src/Processors/Executors/CompletedPipelineExecutor.cpp b/src/Processors/Executors/CompletedPipelineExecutor.cpp
index 22b924337c5..2964d9b6aa2 100644
--- a/src/Processors/Executors/CompletedPipelineExecutor.cpp
+++ b/src/Processors/Executors/CompletedPipelineExecutor.cpp
@@ -5,8 +5,8 @@
 #include <Poco/Event.h>
 #include <Common/setThreadName.h>
 #include <Common/ThreadPool.h>
-#include <iostream>
 #include <Common/scope_guard_safe.h>
+#include <Common/CurrentThread.h>
 
 namespace DB
 {
@@ -32,18 +32,18 @@ struct CompletedPipelineExecutor::Data
     }
 };
 
-static void threadFunction(CompletedPipelineExecutor::Data & data, ThreadGroupStatusPtr thread_group, size_t num_threads)
+static void threadFunction(CompletedPipelineExecutor::Data & data, ThreadGroupPtr thread_group, size_t num_threads)
 {
     SCOPE_EXIT_SAFE(
         if (thread_group)
-            CurrentThread::detachQueryIfNotDetached();
+            CurrentThread::detachFromGroupIfNotDetached();
     );
     setThreadName("QueryCompPipeEx");
 
     try
     {
         if (thread_group)
-            CurrentThread::attachTo(thread_group);
+            CurrentThread::attachToGroup(thread_group);
 
         data.executor->execute(num_threads);
     }
diff --git a/src/Processors/Executors/ExecutingGraph.cpp b/src/Processors/Executors/ExecutingGraph.cpp
index f84efabdee1..27f6a454b24 100644
--- a/src/Processors/Executors/ExecutingGraph.cpp
+++ b/src/Processors/Executors/ExecutingGraph.cpp
@@ -16,6 +16,7 @@ ExecutingGraph::ExecutingGraph(std::shared_ptr<Processors> processors_, bool pro
 {
     uint64_t num_processors = processors->size();
     nodes.reserve(num_processors);
+    source_processors.reserve(num_processors);
 
     /// Create nodes.
     for (uint64_t node = 0; node < num_processors; ++node)
@@ -23,6 +24,9 @@ ExecutingGraph::ExecutingGraph(std::shared_ptr<Processors> processors_, bool pro
         IProcessor * proc = processors->at(node).get();
         processors_map[proc] = node;
         nodes.emplace_back(std::make_unique<Node>(proc, node));
+
+        bool is_source = proc->getInputs().empty();
+        source_processors.emplace_back(is_source);
     }
 
     /// Create edges.
@@ -117,6 +121,9 @@ bool ExecutingGraph::expandPipeline(std::stack<uint64_t> & stack, uint64_t pid)
             return false;
         }
         processors->insert(processors->end(), new_processors.begin(), new_processors.end());
+
+        // Do not consider sources added during pipeline expansion as cancelable to avoid tricky corner cases (e.g. ConvertingAggregatedToChunksWithMergingSource cancellation)
+        source_processors.resize(source_processors.size() + new_processors.size(), false);
     }
 
     uint64_t num_processors = processors->size();
@@ -212,7 +219,7 @@ bool ExecutingGraph::updateNode(uint64_t pid, Queue & queue, Queue & async_queue
     std::stack<uint64_t> updated_processors;
     updated_processors.push(pid);
 
-    UpgradableMutex::ReadGuard read_lock(nodes_mutex);
+    std::shared_lock read_lock(nodes_mutex);
 
     while (!updated_processors.empty() || !updated_edges.empty())
     {
@@ -375,11 +382,14 @@ bool ExecutingGraph::updateNode(uint64_t pid, Queue & queue, Queue & async_queue
 
             if (need_expand_pipeline)
             {
+                // We do not need to upgrade lock atomically, so we can safely release shared_lock and acquire unique_lock
+                read_lock.unlock();
                 {
-                    UpgradableMutex::WriteGuard lock(read_lock);
+                    std::unique_lock lock(nodes_mutex);
                     if (!expandPipeline(updated_processors, pid))
                         return false;
                 }
+                read_lock.lock();
 
                 /// Add itself back to be prepared again.
                 updated_processors.push(pid);
@@ -390,17 +400,25 @@ bool ExecutingGraph::updateNode(uint64_t pid, Queue & queue, Queue & async_queue
     return true;
 }
 
-void ExecutingGraph::cancel()
+void ExecutingGraph::cancel(bool cancel_all_processors)
 {
     std::exception_ptr exception_ptr;
 
     {
         std::lock_guard guard(processors_mutex);
-        for (auto & processor : *processors)
+        uint64_t num_processors = processors->size();
+        for (uint64_t proc = 0; proc < num_processors; ++proc)
         {
             try
             {
-                processor->cancel();
+                /// Stop all processors in the general case, but in a specific case
+                /// where the pipeline needs to return a result on a partially read table,
+                /// stop only the processors that read from the source
+                if (cancel_all_processors || source_processors.at(proc))
+                {
+                    IProcessor * processor = processors->at(proc).get();
+                    processor->cancel();
+                }
             }
             catch (...)
             {
@@ -415,7 +433,8 @@ void ExecutingGraph::cancel()
                 tryLogCurrentException("ExecutingGraph");
             }
         }
-        cancelled = true;
+        if (cancel_all_processors)
+            cancelled = true;
     }
 
     if (exception_ptr)
diff --git a/src/Processors/Executors/ExecutingGraph.h b/src/Processors/Executors/ExecutingGraph.h
index 834ef5d4d9d..1a7659d3e08 100644
--- a/src/Processors/Executors/ExecutingGraph.h
+++ b/src/Processors/Executors/ExecutingGraph.h
@@ -2,10 +2,11 @@
 
 #include <Processors/Port.h>
 #include <Processors/IProcessor.h>
-#include <Processors/Executors/UpgradableLock.h>
+#include <Common/SharedMutex.h>
 #include <mutex>
 #include <queue>
 #include <stack>
+#include <vector>
 
 
 namespace DB
@@ -137,7 +138,7 @@ public:
     /// If processor wants to be expanded, lock will be upgraded to get write access to pipeline.
     bool updateNode(uint64_t pid, Queue & queue, Queue & async_queue);
 
-    void cancel();
+    void cancel(bool cancel_all_processors = true);
 
 private:
     /// Add single edge to edges list. Check processor is known.
@@ -152,9 +153,10 @@ private:
     bool expandPipeline(std::stack<uint64_t> & stack, uint64_t pid);
 
     std::shared_ptr<Processors> processors;
+    std::vector<bool> source_processors;
     std::mutex processors_mutex;
 
-    UpgradableMutex nodes_mutex;
+    SharedMutex nodes_mutex;
 
     const bool profile_processors;
     bool cancelled = false;
diff --git a/src/Processors/Executors/ExecutionThreadContext.cpp b/src/Processors/Executors/ExecutionThreadContext.cpp
index eddc1b76d8a..794f478b272 100644
--- a/src/Processors/Executors/ExecutionThreadContext.cpp
+++ b/src/Processors/Executors/ExecutionThreadContext.cpp
@@ -75,7 +75,7 @@ bool ExecutionThreadContext::executeTask()
 
     if (trace_processors)
     {
-        span = std::make_unique<OpenTelemetry::SpanHolder>("ExecutionThreadContext::executeTask() " + node->processor->getName());
+        span = std::make_unique<OpenTelemetry::SpanHolder>(node->processor->getName());
         span->addAttribute("thread_number", thread_number);
     }
     std::optional<Stopwatch> execution_time_watch;
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index f1e044e470b..f523e7b7cf9 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -1,5 +1,7 @@
 #include <IO/WriteBufferFromString.h>
+#include <Common/ThreadPool.h>
 #include <Common/CurrentThread.h>
+#include <Common/CurrentMetrics.h>
 #include <Common/setThreadName.h>
 #include <Common/MemoryTracker.h>
 #include <Processors/Executors/PipelineExecutor.h>
@@ -10,12 +12,21 @@
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/Context.h>
 #include <Common/scope_guard_safe.h>
+#include <Common/logger_useful.h>
+#include <Common/Exception.h>
+#include <Common/OpenTelemetryTraceContext.h>
 
 #ifndef NDEBUG
     #include <Common/Stopwatch.h>
 #endif
 
 
+namespace CurrentMetrics
+{
+    extern const Metric QueryPipelineExecutorThreads;
+    extern const Metric QueryPipelineExecutorThreadsActive;
+}
+
 namespace DB
 {
 
@@ -74,6 +85,15 @@ void PipelineExecutor::cancel()
     graph->cancel();
 }
 
+void PipelineExecutor::cancelReading()
+{
+    if (!cancelled_reading)
+    {
+        cancelled_reading = true;
+        graph->cancel(/*cancel_all_processors*/ false);
+    }
+}
+
 void PipelineExecutor::finish()
 {
     tasks.finish();
@@ -85,6 +105,9 @@ void PipelineExecutor::execute(size_t num_threads)
     if (num_threads < 1)
         num_threads = 1;
 
+    OpenTelemetry::SpanHolder span("PipelineExecutor::execute()");
+    span.addAttribute("clickhouse.thread_num", num_threads);
+
     try
     {
         executeImpl(num_threads);
@@ -99,6 +122,8 @@ void PipelineExecutor::execute(size_t num_threads)
     }
     catch (...)
     {
+        span.addAttribute(ExecutionStatus::fromCurrentException());
+
 #ifndef NDEBUG
         LOG_TRACE(log, "Exception while executing query. Current state:\n{}", dumpPipeline());
 #endif
@@ -148,6 +173,7 @@ bool PipelineExecutor::checkTimeLimitSoft()
         // so that the "break" is faster and doesn't wait for long events
         if (!continuing)
             cancel();
+
         return continuing;
     }
 
@@ -286,34 +312,31 @@ void PipelineExecutor::initializeExecution(size_t num_threads)
     tasks.init(num_threads, use_threads, profile_processors, trace_processors, read_progress_callback.get());
     tasks.fill(queue);
 
-    std::unique_lock lock{threads_mutex};
-    threads.reserve(num_threads);
+    if (num_threads > 1)
+        pool = std::make_unique<ThreadPool>(CurrentMetrics::QueryPipelineExecutorThreads, CurrentMetrics::QueryPipelineExecutorThreadsActive, num_threads);
 }
 
 void PipelineExecutor::spawnThreads()
 {
     while (auto slot = slots->tryAcquire())
     {
-        std::unique_lock lock{threads_mutex};
-        size_t thread_num = threads.size();
+        size_t thread_num = threads++;
 
         /// Count of threads in use should be updated for proper finish() condition.
         /// NOTE: this will not decrease `use_threads` below initially granted count
         tasks.upscale(thread_num + 1);
 
         /// Start new thread
-        threads.emplace_back([this, thread_num, thread_group = CurrentThread::getGroup(), slot = std::move(slot)]
+        pool->scheduleOrThrowOnError([this, thread_num, thread_group = CurrentThread::getGroup(), my_slot = std::move(slot)]
         {
-            /// ThreadStatus thread_status;
-
             SCOPE_EXIT_SAFE(
                 if (thread_group)
-                    CurrentThread::detachQueryIfNotDetached();
+                    CurrentThread::detachFromGroupIfNotDetached();
             );
             setThreadName("QueryPipelineEx");
 
             if (thread_group)
-                CurrentThread::attachTo(thread_group);
+                CurrentThread::attachToGroup(thread_group);
 
             try
             {
@@ -329,23 +352,6 @@ void PipelineExecutor::spawnThreads()
     }
 }
 
-void PipelineExecutor::joinThreads()
-{
-    for (size_t thread_num = 0; ; thread_num++)
-    {
-        std::unique_lock lock{threads_mutex};
-        if (thread_num >= threads.size())
-            break;
-        if (threads[thread_num].joinable())
-        {
-            auto & thread = threads[thread_num];
-            lock.unlock(); // to avoid deadlock if thread we are going to join starts spawning threads
-            thread.join();
-        }
-    }
-    // NOTE: No races: all concurrent spawnThreads() calls are done from `threads`, but they're already joined.
-}
-
 void PipelineExecutor::executeImpl(size_t num_threads)
 {
     initializeExecution(num_threads);
@@ -356,7 +362,8 @@ void PipelineExecutor::executeImpl(size_t num_threads)
         if (!finished_flag)
         {
             finish();
-            joinThreads();
+            if (pool)
+                pool->wait();
         }
     );
 
@@ -364,7 +371,7 @@ void PipelineExecutor::executeImpl(size_t num_threads)
     {
         spawnThreads(); // start at least one thread
         tasks.processAsyncTasks();
-        joinThreads();
+        pool->wait();
     }
     else
     {
diff --git a/src/Processors/Executors/PipelineExecutor.h b/src/Processors/Executors/PipelineExecutor.h
index 21bde312cbc..1e7d52d8290 100644
--- a/src/Processors/Executors/PipelineExecutor.h
+++ b/src/Processors/Executors/PipelineExecutor.h
@@ -3,12 +3,12 @@
 #include <Processors/IProcessor.h>
 #include <Processors/Executors/ExecutorTasks.h>
 #include <Common/EventCounter.h>
-#include <Common/logger_useful.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <Common/ConcurrencyControl.h>
 
 #include <queue>
 #include <mutex>
+#include <memory>
 
 
 namespace DB
@@ -50,6 +50,9 @@ public:
     /// Cancel execution. May be called from another thread.
     void cancel();
 
+    /// Cancel processors which only read data from source. May be called from another thread.
+    void cancelReading();
+
     /// Checks the query time limits (cancelled or timeout). Throws on cancellation or when time limit is reached and the query uses "break"
     bool checkTimeLimit();
     /// Same as checkTimeLimit but it never throws. It returns false on cancellation or time limit reached
@@ -67,8 +70,8 @@ private:
     // Concurrency control related
     ConcurrencyControl::AllocationPtr slots;
     ConcurrencyControl::SlotPtr single_thread_slot; // slot for single-thread mode to work using executeStep()
-    std::mutex threads_mutex;
-    std::vector<ThreadFromGlobalPool> threads;
+    std::unique_ptr<ThreadPool> pool;
+    std::atomic_size_t threads = 0;
 
     /// Flag that checks that initializeExecution was called.
     bool is_execution_initialized = false;
@@ -78,6 +81,7 @@ private:
     bool trace_processors = false;
 
     std::atomic_bool cancelled = false;
+    std::atomic_bool cancelled_reading = false;
 
     Poco::Logger * log = &Poco::Logger::get("PipelineExecutor");
 
@@ -91,7 +95,6 @@ private:
     void initializeExecution(size_t num_threads); /// Initialize executor contexts and task_queue.
     void finalizeExecution(); /// Check all processors are finished.
     void spawnThreads();
-    void joinThreads();
 
     /// Methods connected to execution.
     void executeImpl(size_t num_threads);
diff --git a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
index 0a7a9025b30..b2608f665b7 100644
--- a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
+++ b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
@@ -67,18 +67,18 @@ const Block & PullingAsyncPipelineExecutor::getHeader() const
     return lazy_format->getPort(IOutputFormat::PortKind::Main).getHeader();
 }
 
-static void threadFunction(PullingAsyncPipelineExecutor::Data & data, ThreadGroupStatusPtr thread_group, size_t num_threads)
+static void threadFunction(PullingAsyncPipelineExecutor::Data & data, ThreadGroupPtr thread_group, size_t num_threads)
 {
     SCOPE_EXIT_SAFE(
         if (thread_group)
-            CurrentThread::detachQueryIfNotDetached();
+            CurrentThread::detachFromGroupIfNotDetached();
     );
     setThreadName("QueryPullPipeEx");
 
     try
     {
         if (thread_group)
-            CurrentThread::attachTo(thread_group);
+            CurrentThread::attachToGroup(thread_group);
 
         data.executor->execute(num_threads);
     }
@@ -179,10 +179,41 @@ void PullingAsyncPipelineExecutor::cancel()
         return;
 
     /// Cancel execution if it wasn't finished.
-    try
+    cancelWithExceptionHandling([&]()
     {
         if (!data->is_finished && data->executor)
             data->executor->cancel();
+    });
+
+    /// The following code is needed to rethrow exception from PipelineExecutor.
+    /// It could have been thrown from pull(), but we will not likely call it again.
+
+    /// Join thread here to wait for possible exception.
+    if (data->thread.joinable())
+        data->thread.join();
+
+    /// Rethrow exception to not swallow it in destructor.
+    data->rethrowExceptionIfHas();
+}
+
+void PullingAsyncPipelineExecutor::cancelReading()
+{
+    if (!data)
+        return;
+
+    /// Stop reading from source if pipeline wasn't finished.
+    cancelWithExceptionHandling([&]()
+    {
+        if (!data->is_finished && data->executor)
+            data->executor->cancelReading();
+    });
+}
+
+void PullingAsyncPipelineExecutor::cancelWithExceptionHandling(CancelFunc && cancel_func)
+{
+    try
+    {
+        cancel_func();
     }
     catch (...)
     {
@@ -194,16 +225,6 @@ void PullingAsyncPipelineExecutor::cancel()
             data->has_exception = true;
         }
     }
-
-    /// The following code is needed to rethrow exception from PipelineExecutor.
-    /// It could have been thrown from pull(), but we will not likely call it again.
-
-    /// Join thread here to wait for possible exception.
-    if (data->thread.joinable())
-        data->thread.join();
-
-    /// Rethrow exception to not swallow it in destructor.
-    data->rethrowExceptionIfHas();
 }
 
 Chunk PullingAsyncPipelineExecutor::getTotals()
diff --git a/src/Processors/Executors/PullingAsyncPipelineExecutor.h b/src/Processors/Executors/PullingAsyncPipelineExecutor.h
index 7e45246ffd6..361bcc0155c 100644
--- a/src/Processors/Executors/PullingAsyncPipelineExecutor.h
+++ b/src/Processors/Executors/PullingAsyncPipelineExecutor.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <functional>
 #include <memory>
 
 namespace DB
@@ -32,9 +33,12 @@ public:
     bool pull(Chunk & chunk, uint64_t milliseconds = 0);
     bool pull(Block & block, uint64_t milliseconds = 0);
 
-    /// Stop execution. It is not necessary, but helps to stop execution before executor is destroyed.
+    /// Stop execution of all processors. It is not necessary, but helps to stop execution before executor is destroyed.
     void cancel();
 
+    /// Stop processors which only read data from source.
+    void cancelReading();
+
     /// Get totals and extremes. Returns empty chunk if doesn't have any.
     Chunk getTotals();
     Chunk getExtremes();
@@ -49,6 +53,11 @@ public:
     /// Internal executor data.
     struct Data;
 
+private:
+    using CancelFunc = std::function<void()>;
+
+    void cancelWithExceptionHandling(CancelFunc && cancel_func);
+
 private:
     QueryPipeline & pipeline;
     std::shared_ptr<LazyOutputFormat> lazy_format;
diff --git a/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
index 54c1e7bf30f..59d33cbffed 100644
--- a/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
+++ b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
@@ -5,8 +5,9 @@
 #include <QueryPipeline/ReadProgressCallback.h>
 #include <Common/ThreadPool.h>
 #include <Common/setThreadName.h>
-#include <Poco/Event.h>
 #include <Common/scope_guard_safe.h>
+#include <Common/CurrentThread.h>
+#include <Poco/Event.h>
 
 namespace DB
 {
@@ -97,18 +98,18 @@ struct PushingAsyncPipelineExecutor::Data
     }
 };
 
-static void threadFunction(PushingAsyncPipelineExecutor::Data & data, ThreadGroupStatusPtr thread_group, size_t num_threads)
+static void threadFunction(PushingAsyncPipelineExecutor::Data & data, ThreadGroupPtr thread_group, size_t num_threads)
 {
     SCOPE_EXIT_SAFE(
         if (thread_group)
-            CurrentThread::detachQueryIfNotDetached();
+            CurrentThread::detachFromGroupIfNotDetached();
     );
     setThreadName("QueryPushPipeEx");
 
     try
     {
         if (thread_group)
-            CurrentThread::attachTo(thread_group);
+            CurrentThread::attachToGroup(thread_group);
 
         data.executor->execute(num_threads);
     }
@@ -139,9 +140,11 @@ PushingAsyncPipelineExecutor::PushingAsyncPipelineExecutor(QueryPipeline & pipel
 
 PushingAsyncPipelineExecutor::~PushingAsyncPipelineExecutor()
 {
+    /// It must be finalized explicitly. Otherwise we cancel it assuming it's due to an exception.
+    chassert(finished || std::uncaught_exceptions() || std::current_exception());
     try
     {
-        finish();
+        cancel();
     }
     catch (...)
     {
@@ -185,7 +188,7 @@ void PushingAsyncPipelineExecutor::push(Chunk chunk)
 
     if (!is_pushed)
         throw Exception(ErrorCodes::LOGICAL_ERROR,
-                        "Pipeline for PushingPipelineExecutor was finished before all data was inserted");
+                        "Pipeline for PushingAsyncPipelineExecutor was finished before all data was inserted");
 }
 
 void PushingAsyncPipelineExecutor::push(Block block)
diff --git a/src/Processors/Executors/PushingPipelineExecutor.cpp b/src/Processors/Executors/PushingPipelineExecutor.cpp
index d9a14704cd0..696932932df 100644
--- a/src/Processors/Executors/PushingPipelineExecutor.cpp
+++ b/src/Processors/Executors/PushingPipelineExecutor.cpp
@@ -63,9 +63,11 @@ PushingPipelineExecutor::PushingPipelineExecutor(QueryPipeline & pipeline_) : pi
 
 PushingPipelineExecutor::~PushingPipelineExecutor()
 {
+    /// It must be finalized explicitly. Otherwise we cancel it assuming it's due to an exception.
+    chassert(finished || std::uncaught_exceptions() || std::current_exception());
     try
     {
-        finish();
+        cancel();
     }
     catch (...)
     {
diff --git a/src/Processors/Executors/UpgradableLock.h b/src/Processors/Executors/UpgradableLock.h
deleted file mode 100644
index b5a31885424..00000000000
--- a/src/Processors/Executors/UpgradableLock.h
+++ /dev/null
@@ -1,175 +0,0 @@
-#pragma once
-#include <atomic>
-#include <cassert>
-#include <list>
-#include <mutex>
-#include <condition_variable>
-
-namespace DB
-{
-
-/// RWLock which allows to upgrade read lock to write lock.
-/// Read locks should be fast if there is no write lock.
-///
-/// Newly created write lock waits for all active read locks.
-/// Newly created read lock waits for all write locks. Starvation is possible.
-///
-/// Mutex must live longer than locks.
-/// Read lock must live longer than corresponding  write lock.
-///
-/// For every write lock, a new internal state is created inside mutex.
-/// This state is not deallocated until the destruction of mutex itself.
-///
-/// Usage example:
-///
-/// UpgradableMutex mutex;
-/// {
-///     UpgradableMutex::ReadLock read_lock(mutex);
-///     ...
-///     {
-///         UpgradableMutex::WriteLock write_lock(read_lock);
-///         ...
-///     }
-///     ...
-/// }
-class UpgradableMutex
-{
-private:
-    /// Implementation idea
-    ///
-    /// ----------- (read scope)
-    /// ++num_readers
-    /// ** wait for active writer (in loop, starvation is possible here) **
-    ///
-    /// =========== (write scope)
-    /// ** create new State **
-    /// ** wait for active writer (in loop, starvation is possible here) **
-    /// ** wait for all active readers **
-    ///
-    /// ** notify all waiting readers for the current state.
-    /// =========== (end write scope)
-    ///
-    /// --num_readers
-    /// ** notify current active writer **
-    /// ----------- (end read scope)
-    struct State
-    {
-        size_t num_waiting = 0;
-        bool is_done = false;
-
-        std::mutex mutex;
-        std::condition_variable read_condvar;
-        std::condition_variable write_condvar;
-
-        void wait() noexcept
-        {
-            std::unique_lock lock(mutex);
-            ++num_waiting;
-            write_condvar.notify_one();
-            while (!is_done)
-                read_condvar.wait(lock);
-        }
-
-        void lock(std::atomic_size_t & num_readers_) noexcept
-        {
-            /// Note : num_locked is an atomic
-            /// which can change it's value without locked mutex.
-            /// We support an invariant that after changing num_locked value,
-            /// UpgradableMutex::write_state is checked, and in case of active
-            /// write lock, we always notify it's write condvar.
-            std::unique_lock lock(mutex);
-            ++num_waiting;
-            while (num_waiting < num_readers_.load())
-                write_condvar.wait(lock);
-        }
-
-        void unlock() noexcept
-        {
-            {
-                std::unique_lock lock(mutex);
-                is_done = true;
-            }
-            read_condvar.notify_all();
-        }
-    };
-
-    std::atomic_size_t num_readers = 0;
-
-    std::list<State> states;
-    std::mutex states_mutex;
-    std::atomic<State *> write_state{nullptr};
-
-    void lock() noexcept
-    {
-        ++num_readers;
-        while (auto * state = write_state.load())
-            state->wait();
-    }
-
-    void unlock() noexcept
-    {
-        --num_readers;
-        while (auto * state = write_state.load())
-            state->write_condvar.notify_one();
-    }
-
-    State * allocState()
-    {
-        std::lock_guard guard(states_mutex);
-        return &states.emplace_back();
-    }
-
-    void upgrade(State & state) noexcept
-    {
-        State * expected = nullptr;
-
-        /// Only change nullptr -> state is possible.
-        while (!write_state.compare_exchange_strong(expected, &state))
-        {
-            expected->wait();
-            expected = nullptr;
-        }
-
-        state.lock(num_readers);
-    }
-
-    void degrade(State & state) noexcept
-    {
-        State * my = write_state.exchange(nullptr);
-        if (&state != my)
-            std::terminate();
-        state.unlock();
-    }
-
-public:
-    class ReadGuard
-    {
-    public:
-        explicit ReadGuard(UpgradableMutex & lock_) : lock(lock_) { lock.lock(); }
-        ~ReadGuard() { lock.unlock(); }
-
-        UpgradableMutex & lock;
-    };
-
-    class WriteGuard
-    {
-    public:
-        explicit WriteGuard(ReadGuard & read_guard_) : read_guard(read_guard_)
-        {
-            state = read_guard.lock.allocState();
-            read_guard.lock.upgrade(*state);
-        }
-
-        ~WriteGuard()
-        {
-            if (state)
-                read_guard.lock.degrade(*state);
-        }
-
-    private:
-        ReadGuard & read_guard;
-        State * state = nullptr;
-    };
-};
-
-}
diff --git a/src/Processors/Formats/IInputFormat.cpp b/src/Processors/Formats/IInputFormat.cpp
index 674a4affc46..20f87d60e88 100644
--- a/src/Processors/Formats/IInputFormat.cpp
+++ b/src/Processors/Formats/IInputFormat.cpp
@@ -5,14 +5,15 @@
 namespace DB
 {
 
-IInputFormat::IInputFormat(Block header, ReadBuffer & in_)
-    : ISource(std::move(header)), in(&in_)
+IInputFormat::IInputFormat(Block header, ReadBuffer * in_)
+    : ISource(std::move(header)), in(in_)
 {
     column_mapping = std::make_shared<ColumnMapping>();
 }
 
 void IInputFormat::resetParser()
 {
+    chassert(in);
     in->ignoreAll();
     // those are protected attributes from ISource (I didn't want to propagate resetParser up there)
     finished = false;
@@ -23,6 +24,7 @@ void IInputFormat::resetParser()
 
 void IInputFormat::setReadBuffer(ReadBuffer & in_)
 {
+    chassert(in); // not supported by random-access formats
     in = &in_;
 }
 
diff --git a/src/Processors/Formats/IInputFormat.h b/src/Processors/Formats/IInputFormat.h
index 4e84eb65aaf..a5a39a5f5b4 100644
--- a/src/Processors/Formats/IInputFormat.h
+++ b/src/Processors/Formats/IInputFormat.h
@@ -18,16 +18,11 @@ class IInputFormat : public ISource
 {
 protected:
 
-    /// Skip GCC warning: ‘maybe_unused’ attribute ignored
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wattributes"
-
-    ReadBuffer * in [[maybe_unused]];
-
-#pragma GCC diagnostic pop
+    ReadBuffer * in [[maybe_unused]] = nullptr;
 
 public:
-    IInputFormat(Block header, ReadBuffer & in_);
+    // ReadBuffer can be nullptr for random-access formats.
+    IInputFormat(Block header, ReadBuffer * in_);
 
     /** In some usecase (hello Kafka) we need to read a lot of tiny streams in exactly the same format.
      * The recreating of parser for each small stream takes too long, so we introduce a method
@@ -38,7 +33,7 @@ public:
     virtual void resetParser();
 
     virtual void setReadBuffer(ReadBuffer & in_);
-    ReadBuffer & getReadBuffer() const { return *in; }
+    ReadBuffer & getReadBuffer() const { chassert(in); return *in; }
 
     virtual const BlockMissingValues & getMissingValues() const
     {
diff --git a/src/Processors/Formats/IOutputFormat.h b/src/Processors/Formats/IOutputFormat.h
index 02e91d5b28b..58700a978ff 100644
--- a/src/Processors/Formats/IOutputFormat.h
+++ b/src/Processors/Formats/IOutputFormat.h
@@ -39,7 +39,7 @@ public:
     virtual void setRowsBeforeLimit(size_t /*rows_before_limit*/) {}
 
     /// Counter to calculate rows_before_limit_at_least in processors pipeline.
-    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) { rows_before_limit_counter.swap(counter); }
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { rows_before_limit_counter.swap(counter); }
 
     /// Notify about progress. Method could be called from different threads.
     /// Passed value are delta, that must be summarized.
diff --git a/src/Processors/Formats/IRowInputFormat.cpp b/src/Processors/Formats/IRowInputFormat.cpp
index 81c818e3334..2686a44806d 100644
--- a/src/Processors/Formats/IRowInputFormat.cpp
+++ b/src/Processors/Formats/IRowInputFormat.cpp
@@ -28,6 +28,7 @@ namespace ErrorCodes
     extern const int CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING;
     extern const int CANNOT_PARSE_IPV4;
     extern const int CANNOT_PARSE_IPV6;
+    extern const int UNKNOWN_ELEMENT_OF_ENUM;
 }
 
 
@@ -48,11 +49,12 @@ bool isParseError(int code)
         || code == ErrorCodes::INCORRECT_DATA              /// For some ReadHelpers
         || code == ErrorCodes::CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING
         || code == ErrorCodes::CANNOT_PARSE_IPV4
-        || code == ErrorCodes::CANNOT_PARSE_IPV6;
+        || code == ErrorCodes::CANNOT_PARSE_IPV6
+        || code == ErrorCodes::UNKNOWN_ELEMENT_OF_ENUM;
 }
 
 IRowInputFormat::IRowInputFormat(Block header, ReadBuffer & in_, Params params_)
-    : IInputFormat(std::move(header), in_), serializations(getPort().getHeader().getSerializations()), params(params_)
+    : IInputFormat(std::move(header), &in_), serializations(getPort().getHeader().getSerializations()), params(params_)
 {
 }
 
diff --git a/src/Processors/Formats/ISchemaReader.h b/src/Processors/Formats/ISchemaReader.h
index 81bc94afa6c..78b34a07840 100644
--- a/src/Processors/Formats/ISchemaReader.h
+++ b/src/Processors/Formats/ISchemaReader.h
@@ -16,7 +16,7 @@ namespace ErrorCodes
 }
 
 /// Base class for schema inference for the data in some specific format.
-/// It reads some data from read buffer and try to determine the schema
+/// It reads some data from read buffer and tries to determine the schema
 /// from read data.
 class ISchemaReader
 {
@@ -173,19 +173,19 @@ void chooseResultColumnType(
                 ErrorCodes::TYPE_MISMATCH,
                 "Automatically defined type {} for column '{}' in row {} differs from type defined by previous rows: {}. "
                 "You can specify the type for this column using setting schema_inference_hints",
-                type->getName(),
+                new_type->getName(),
                 column_name,
                 row,
-                new_type->getName());
+                type->getName());
         else
             throw Exception(
                 ErrorCodes::TYPE_MISMATCH,
                 "Automatically defined type {} for column '{}' in row {} differs from type defined by previous rows: {}. "
                 "Column types from setting schema_inference_hints couldn't be parsed because of error: {}",
-                type->getName(),
+                new_type->getName(),
                 column_name,
                 row,
-                new_type->getName(),
+                type->getName(),
                 hints_parsing_error);
     }
 }
diff --git a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
index cd8facb83eb..ef1a4d9754d 100644
--- a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
@@ -24,7 +24,7 @@ namespace ErrorCodes
 }
 
 ArrowBlockInputFormat::ArrowBlockInputFormat(ReadBuffer & in_, const Block & header_, bool stream_, const FormatSettings & format_settings_)
-    : IInputFormat(header_, in_), stream{stream_}, format_settings(format_settings_)
+    : IInputFormat(header_, &in_), stream{stream_}, format_settings(format_settings_)
 {
 }
 
diff --git a/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp
index bf0e2448082..5e7d3edb528 100644
--- a/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp
@@ -17,6 +17,24 @@ namespace ErrorCodes
     extern const int UNKNOWN_EXCEPTION;
 }
 
+namespace
+{
+
+arrow::Compression::type getArrowCompression(FormatSettings::ArrowCompression method)
+{
+    switch (method)
+    {
+        case FormatSettings::ArrowCompression::NONE:
+            return arrow::Compression::type::UNCOMPRESSED;
+        case FormatSettings::ArrowCompression::ZSTD:
+            return arrow::Compression::type::ZSTD;
+        case FormatSettings::ArrowCompression::LZ4_FRAME:
+            return arrow::Compression::type::LZ4_FRAME;
+    }
+}
+
+}
+
 ArrowBlockOutputFormat::ArrowBlockOutputFormat(WriteBuffer & out_, const Block & header_, bool stream_, const FormatSettings & format_settings_)
     : IOutputFormat(header_, out_)
     , stream{stream_}
@@ -78,12 +96,15 @@ void ArrowBlockOutputFormat::prepareWriter(const std::shared_ptr<arrow::Schema>
 {
     arrow_ostream = std::make_shared<ArrowBufferedOutputStream>(out);
     arrow::Result<std::shared_ptr<arrow::ipc::RecordBatchWriter>> writer_status;
+    arrow::ipc::IpcWriteOptions options = arrow::ipc::IpcWriteOptions::Defaults();
+    options.codec = *arrow::util::Codec::Create(getArrowCompression(format_settings.arrow.output_compression_method));
+    options.emit_dictionary_deltas = true;
 
     // TODO: should we use arrow::ipc::IpcOptions::alignment?
     if (stream)
-        writer_status = arrow::ipc::MakeStreamWriter(arrow_ostream.get(), schema);
+        writer_status = arrow::ipc::MakeStreamWriter(arrow_ostream.get(), schema, options);
     else
-        writer_status = arrow::ipc::MakeFileWriter(arrow_ostream.get(), schema);
+        writer_status = arrow::ipc::MakeFileWriter(arrow_ostream.get(), schema,options);
 
     if (!writer_status.ok())
         throw Exception(ErrorCodes::UNKNOWN_EXCEPTION,
@@ -113,6 +134,7 @@ void registerOutputFormatArrow(FormatFactory & factory)
             return std::make_shared<ArrowBlockOutputFormat>(buf, sample, true, format_settings);
         });
     factory.markFormatHasNoAppendSupport("ArrowStream");
+    factory.markOutputFormatPrefersLargeBlocks("ArrowStream");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
index 96ed2a7021e..54f3b76ff60 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
@@ -1,6 +1,4 @@
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 #include "ArrowBufferedStreams.h"
 
@@ -49,13 +47,8 @@ arrow::Status ArrowBufferedOutputStream::Write(const void * data, int64_t length
     return arrow::Status::OK();
 }
 
-RandomAccessFileFromSeekableReadBuffer::RandomAccessFileFromSeekableReadBuffer(ReadBuffer & in_, off_t file_size_)
-    : in{in_}, seekable_in{dynamic_cast<SeekableReadBuffer &>(in_)}, file_size{file_size_}, is_open{true}
-{
-}
-
-RandomAccessFileFromSeekableReadBuffer::RandomAccessFileFromSeekableReadBuffer(ReadBuffer & in_)
-    : in{in_}, seekable_in{dynamic_cast<SeekableReadBuffer &>(in_)}, is_open{true}
+RandomAccessFileFromSeekableReadBuffer::RandomAccessFileFromSeekableReadBuffer(ReadBuffer & in_, std::optional<off_t> file_size_, bool avoid_buffering_)
+    : in{in_}, seekable_in{dynamic_cast<SeekableReadBuffer &>(in_)}, file_size{file_size_}, is_open{true}, avoid_buffering(avoid_buffering_)
 {
 }
 
@@ -82,6 +75,8 @@ arrow::Result<int64_t> RandomAccessFileFromSeekableReadBuffer::Tell() const
 
 arrow::Result<int64_t> RandomAccessFileFromSeekableReadBuffer::Read(int64_t nbytes, void * out)
 {
+    if (avoid_buffering)
+        in.setReadUntilPosition(seekable_in.getPosition() + nbytes);
     return in.readBig(reinterpret_cast<char *>(out), nbytes);
 }
 
@@ -104,6 +99,12 @@ arrow::Future<std::shared_ptr<arrow::Buffer>> RandomAccessFileFromSeekableReadBu
 
 arrow::Status RandomAccessFileFromSeekableReadBuffer::Seek(int64_t position)
 {
+    if (avoid_buffering)
+    {
+        // Seeking to a position above a previous setReadUntilPosition() confuses some of the
+        // ReadBuffer implementations.
+        in.setReadUntilEnd();
+    }
     seekable_in.seek(position, SEEK_SET);
     return arrow::Status::OK();
 }
@@ -145,28 +146,105 @@ arrow::Status ArrowInputStreamFromReadBuffer::Close()
     return arrow::Status();
 }
 
+RandomAccessFileFromManyReadBuffers::RandomAccessFileFromManyReadBuffers(SeekableReadBufferFactory & factory) : buf_factory(factory) {}
+
+arrow::Result<int64_t> RandomAccessFileFromManyReadBuffers::GetSize()
+{
+    return buf_factory.getFileSize();
+}
+
+arrow::Result<int64_t> RandomAccessFileFromManyReadBuffers::ReadAt(int64_t position, int64_t nbytes, void* out)
+{
+    std::unique_lock lock(mutex);
+    if (free_bufs.empty())
+        free_bufs.push_back(buf_factory.getReader());
+    auto buf = std::move(free_bufs.back());
+    free_bufs.pop_back();
+    lock.unlock();
+
+    // To work well with this, ReadBuffer implementations need to respect setReadUntilPosition() and
+    // not read above it. We often do very small reads here.
+    // Also nice if they:
+    //  * Make readBig() read directly into the provided memory, instead of copying from internal
+    //    buffer.
+    //  * Allocate the internal buffer (if any) lazily in first nextImpl() call. If all reads are
+    //    tiny readBig() calls (as is typical here), it won't allocate an unnecessary 1 MB buffer.
+
+    buf->seek(position, SEEK_SET);
+    buf->setReadUntilPosition(position + nbytes);
+    size_t bytes_read = buf->readBig(reinterpret_cast<char *>(out), nbytes);
+
+    // Seeking to a position above a previous setReadUntilPosition() confuses some of the
+    // ReadBuffer implementations. So we reset it before next seek.
+    buf->setReadUntilEnd();
+
+    lock.lock();
+    free_bufs.push_back(std::move(buf));
+
+    return static_cast<int64_t>(bytes_read);
+}
+
+arrow::Result<std::shared_ptr<arrow::Buffer>> RandomAccessFileFromManyReadBuffers::ReadAt(int64_t position, int64_t nbytes)
+{
+    ARROW_ASSIGN_OR_RAISE(auto buffer, arrow::AllocateResizableBuffer(nbytes))
+    ARROW_ASSIGN_OR_RAISE(int64_t bytes_read, ReadAt(position, nbytes, buffer->mutable_data()))
+
+    if (bytes_read < nbytes)
+        RETURN_NOT_OK(buffer->Resize(bytes_read));
+
+    return buffer;
+}
+
+arrow::Future<std::shared_ptr<arrow::Buffer>> RandomAccessFileFromManyReadBuffers::ReadAsync(const arrow::io::IOContext&, int64_t position, int64_t nbytes)
+{
+    return arrow::Future<std::shared_ptr<arrow::Buffer>>::MakeFinished(ReadAt(position, nbytes));
+}
+
+arrow::Status RandomAccessFileFromManyReadBuffers::Close()
+{
+    chassert(is_open);
+    is_open = false;
+    return arrow::Status::OK();
+}
+
+arrow::Status RandomAccessFileFromManyReadBuffers::Seek(int64_t) { return arrow::Status::NotImplemented(""); }
+arrow::Result<int64_t> RandomAccessFileFromManyReadBuffers::Tell() const { return arrow::Status::NotImplemented(""); }
+arrow::Result<int64_t> RandomAccessFileFromManyReadBuffers::Read(int64_t, void*) { return arrow::Status::NotImplemented(""); }
+arrow::Result<std::shared_ptr<arrow::Buffer>> RandomAccessFileFromManyReadBuffers::Read(int64_t) { return arrow::Status::NotImplemented(""); }
+
 std::shared_ptr<arrow::io::RandomAccessFile> asArrowFile(
     ReadBuffer & in,
     const FormatSettings & settings,
     std::atomic<int> & is_cancelled,
     const std::string & format_name,
-    const std::string & magic_bytes)
+    const std::string & magic_bytes,
+    bool avoid_buffering)
 {
     if (auto * fd_in = dynamic_cast<ReadBufferFromFileDescriptor *>(&in))
     {
-        struct stat stat;
-        auto res = ::fstat(fd_in->getFD(), &stat);
-        // if fd is a regular file i.e. not stdin
-        if (res == 0 && S_ISREG(stat.st_mode))
-            return std::make_shared<RandomAccessFileFromSeekableReadBuffer>(*fd_in, stat.st_size);
+            struct stat stat;
+            auto res = ::fstat(fd_in->getFD(), &stat);
+            // if fd is a regular file i.e. not stdin
+            if (res == 0 && S_ISREG(stat.st_mode))
+                return std::make_shared<RandomAccessFileFromSeekableReadBuffer>(*fd_in, stat.st_size, avoid_buffering);
     }
-    else if (dynamic_cast<SeekableReadBuffer *>(&in) && isBufferWithFileSize(in))
+    else if (auto * seekable_in = dynamic_cast<SeekableReadBuffer *>(&in);
+             seekable_in && settings.seekable_read && isBufferWithFileSize(in) &&
+             seekable_in->checkIfActuallySeekable())
     {
-        if (settings.seekable_read)
-            return std::make_shared<RandomAccessFileFromSeekableReadBuffer>(in);
+            return std::make_shared<RandomAccessFileFromSeekableReadBuffer>(in, std::nullopt, avoid_buffering);
     }
 
     // fallback to loading the entire file in memory
+    return asArrowFileLoadIntoMemory(in, is_cancelled, format_name, magic_bytes);
+}
+
+std::shared_ptr<arrow::io::RandomAccessFile> asArrowFileLoadIntoMemory(
+    ReadBuffer & in,
+    std::atomic<int> & is_cancelled,
+    const std::string & format_name,
+    const std::string & magic_bytes)
+{
     std::string file_data;
     {
         PeekableReadBuffer buf(in);
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.h b/src/Processors/Formats/Impl/ArrowBufferedStreams.h
index 325975a7cfe..9307172cb11 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.h
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.h
@@ -18,6 +18,7 @@ class ReadBuffer;
 class WriteBuffer;
 
 class SeekableReadBuffer;
+class SeekableReadBufferFactory;
 struct FormatSettings;
 
 class ArrowBufferedOutputStream : public arrow::io::OutputStream
@@ -46,9 +47,7 @@ private:
 class RandomAccessFileFromSeekableReadBuffer : public arrow::io::RandomAccessFile
 {
 public:
-    RandomAccessFileFromSeekableReadBuffer(ReadBuffer & in_, off_t file_size_);
-
-    explicit RandomAccessFileFromSeekableReadBuffer(ReadBuffer & in_);
+    RandomAccessFileFromSeekableReadBuffer(ReadBuffer & in_, std::optional<off_t> file_size_, bool avoid_buffering_);
 
     arrow::Result<int64_t> GetSize() override;
 
@@ -74,10 +73,44 @@ private:
     SeekableReadBuffer & seekable_in;
     std::optional<off_t> file_size;
     bool is_open = false;
+    bool avoid_buffering = false;
 
     ARROW_DISALLOW_COPY_AND_ASSIGN(RandomAccessFileFromSeekableReadBuffer);
 };
 
+// Thread-safe.
+// Maintains a pool of SeekableReadBuffer-s. For each ReadAt(), takes a buffer, seeks it, and reads.
+class RandomAccessFileFromManyReadBuffers : public arrow::io::RandomAccessFile
+{
+public:
+    explicit RandomAccessFileFromManyReadBuffers(SeekableReadBufferFactory & factory);
+
+    // These are thread safe.
+    arrow::Result<int64_t> GetSize() override;
+    arrow::Result<int64_t> ReadAt(int64_t position, int64_t nbytes, void* out) override;
+    arrow::Result<std::shared_ptr<arrow::Buffer>> ReadAt(int64_t position, int64_t nbytes) override;
+    arrow::Future<std::shared_ptr<arrow::Buffer>> ReadAsync(const arrow::io::IOContext&, int64_t position,
+                                              int64_t nbytes) override;
+
+    // These are not thread safe, and arrow shouldn't call them. Return NotImplemented error.
+    arrow::Status Seek(int64_t) override;
+    arrow::Result<int64_t> Tell() const override;
+    arrow::Result<int64_t> Read(int64_t, void*) override;
+    arrow::Result<std::shared_ptr<arrow::Buffer>> Read(int64_t) override;
+
+    arrow::Status Close() override;
+    bool closed() const override { return !is_open; }
+
+private:
+    SeekableReadBufferFactory & buf_factory;
+    bool is_open = true;
+
+    std::mutex mutex;
+    std::vector<std::unique_ptr<SeekableReadBuffer>> free_bufs;
+
+    ARROW_DISALLOW_COPY_AND_ASSIGN(RandomAccessFileFromManyReadBuffers);
+};
+
 class ArrowInputStreamFromReadBuffer : public arrow::io::InputStream
 {
 public:
@@ -101,6 +134,19 @@ std::shared_ptr<arrow::io::RandomAccessFile> asArrowFile(
     const FormatSettings & settings,
     std::atomic<int> & is_cancelled,
     const std::string & format_name,
+    const std::string & magic_bytes,
+    // If true, we'll use ReadBuffer::setReadUntilPosition() to avoid buffering and readahead as
+    // much as possible. For HTTP or S3 ReadBuffer, this means that each RandomAccessFile
+    // read call will do a new HTTP request. Used in parquet pre-buffered reading mode, which makes
+    // arrow do its own buffering and coalescing of reads.
+    // (ReadBuffer is not a good abstraction in this case, but it works.)
+    bool avoid_buffering = false);
+
+// Reads the whole file into a memory buffer, owned by the returned RandomAccessFile.
+std::shared_ptr<arrow::io::RandomAccessFile> asArrowFileLoadIntoMemory(
+    ReadBuffer & in,
+    std::atomic<int> & is_cancelled,
+    const std::string & format_name,
     const std::string & magic_bytes);
 
 }
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index f73846f15e6..0b4700c9d4c 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -17,6 +17,7 @@
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeIPv4andIPv6.h>
 #include <Common/DateLUTImpl.h>
 #include <base/types.h>
 #include <Processors/Chunk.h>
@@ -43,7 +44,6 @@
         M(arrow::Type::UINT8, DB::UInt8) \
         M(arrow::Type::INT8, DB::Int8) \
         M(arrow::Type::INT16, DB::Int16) \
-        M(arrow::Type::INT32, DB::Int32) \
         M(arrow::Type::UINT64, DB::UInt64) \
         M(arrow::Type::INT64, DB::Int64) \
         M(arrow::Type::DURATION, DB::Int64) \
@@ -92,7 +92,7 @@ static ColumnWithTypeAndName readColumnWithNumericData(std::shared_ptr<arrow::Ch
 
         /// buffers[0] is a null bitmap and buffers[1] are actual values
         std::shared_ptr<arrow::Buffer> buffer = chunk->data()->buffers[1];
-        const auto * raw_data = reinterpret_cast<const NumericType *>(buffer->data());
+        const auto * raw_data = reinterpret_cast<const NumericType *>(buffer->data()) + chunk->offset();
         column_data.insert_assume_reserved(raw_data, raw_data + chunk->length());
     }
     return {std::move(internal_column), std::move(internal_type), column_name};
@@ -158,12 +158,79 @@ static ColumnWithTypeAndName readColumnWithFixedStringData(std::shared_ptr<arrow
     for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         arrow::FixedSizeBinaryArray & chunk = dynamic_cast<arrow::FixedSizeBinaryArray &>(*(arrow_column->chunk(chunk_i)));
-        std::shared_ptr<arrow::Buffer> buffer = chunk.values();
-        column_chars_t.insert_assume_reserved(buffer->data(), buffer->data() + buffer->size());
+        const uint8_t * raw_data = chunk.raw_values();
+        column_chars_t.insert_assume_reserved(raw_data, raw_data + fixed_len * chunk.length());
     }
     return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
+template <typename ValueType>
+static ColumnWithTypeAndName readColumnWithBigIntegerFromFixedBinaryData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name, const DataTypePtr & column_type)
+{
+    const auto * fixed_type = assert_cast<arrow::FixedSizeBinaryType *>(arrow_column->type().get());
+    size_t fixed_len = fixed_type->byte_width();
+    if (fixed_len != sizeof(ValueType))
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "Cannot insert data into {} column from fixed size binary, expected data with size {}, got {}",
+            column_type->getName(),
+            sizeof(ValueType),
+            fixed_len);
+
+    auto internal_column = column_type->createColumn();
+    auto & data = assert_cast<ColumnVector<ValueType> &>(*internal_column).getData();
+    data.reserve(arrow_column->length());
+
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
+    {
+        arrow::FixedSizeBinaryArray & chunk = dynamic_cast<arrow::FixedSizeBinaryArray &>(*(arrow_column->chunk(chunk_i)));
+        const auto * raw_data = reinterpret_cast<const ValueType *>(chunk.raw_values());
+        data.insert_assume_reserved(raw_data, raw_data + chunk.length());
+    }
+
+    return {std::move(internal_column), column_type, column_name};
+}
+
+template <typename ColumnType, typename ValueType = typename ColumnType::ValueType>
+static ColumnWithTypeAndName readColumnWithBigNumberFromBinaryData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name, const DataTypePtr & column_type)
+{
+    size_t total_size = 0;
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
+    {
+        auto & chunk = dynamic_cast<arrow::BinaryArray &>(*(arrow_column->chunk(chunk_i)));
+        const size_t chunk_length = chunk.length();
+
+        for (size_t i = 0; i != chunk_length; ++i)
+        {
+            if (!chunk.IsNull(i) && chunk.value_length(i) != sizeof(ValueType))
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Cannot insert data into {} column from binary value, expected data with size {}, got {}",
+                    column_type->getName(),
+                    sizeof(ValueType),
+                    chunk.value_length(i));
+            total_size += chunk_length;
+        }
+    }
+
+    auto internal_column = column_type->createColumn();
+    auto & integer_column = assert_cast<ColumnType &>(*internal_column);
+    integer_column.reserve(total_size);
+
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
+    {
+        auto & chunk = dynamic_cast<arrow::BinaryArray &>(*(arrow_column->chunk(chunk_i)));
+        for (size_t value_i = 0, length = static_cast<size_t>(chunk.length()); value_i < length; ++value_i)
+        {
+            if (chunk.IsNull(value_i))
+                integer_column.insertDefault();
+            else
+                integer_column.insertData(chunk.Value(value_i).data(), chunk.Value(value_i).size());
+        }
+    }
+    return {std::move(internal_column), column_type, column_name};
+}
+
 static ColumnWithTypeAndName readColumnWithBooleanData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     auto internal_type = DataTypeFactory::instance().get("Bool");
@@ -177,18 +244,27 @@ static ColumnWithTypeAndName readColumnWithBooleanData(std::shared_ptr<arrow::Ch
         if (chunk.length() == 0)
             continue;
 
-        /// buffers[0] is a null bitmap and buffers[1] are actual values
-        std::shared_ptr<arrow::Buffer> buffer = chunk.data()->buffers[1];
-
         for (size_t bool_i = 0; bool_i != static_cast<size_t>(chunk.length()); ++bool_i)
             column_data.emplace_back(chunk.Value(bool_i));
     }
     return {std::move(internal_column), internal_type, column_name};
 }
 
-static ColumnWithTypeAndName readColumnWithDate32Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithDate32Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name, const DataTypePtr & type_hint)
 {
-    auto internal_type = std::make_shared<DataTypeDate32>();
+    DataTypePtr internal_type;
+    bool check_date_range = false;
+    /// Make result type Date32 when requested type is actually Date32 or when we use schema inference
+    if (!type_hint || (type_hint && isDate32(*type_hint)))
+    {
+        internal_type = std::make_shared<DataTypeDate32>();
+        check_date_range = true;
+    }
+    else
+    {
+        internal_type = std::make_shared<DataTypeInt32>();
+    }
+
     auto internal_column = internal_type->createColumn();
     PaddedPODArray<Int32> & column_data = assert_cast<ColumnVector<Int32> &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
@@ -197,17 +273,27 @@ static ColumnWithTypeAndName readColumnWithDate32Data(std::shared_ptr<arrow::Chu
     {
         arrow::Date32Array & chunk = dynamic_cast<arrow::Date32Array &>(*(arrow_column->chunk(chunk_i)));
 
-        for (size_t value_i = 0, length = static_cast<size_t>(chunk.length()); value_i < length; ++value_i)
+        /// Check date range only when requested type is actually Date32
+        if (check_date_range)
         {
-            Int32 days_num = static_cast<Int32>(chunk.Value(value_i));
-            if (days_num > DATE_LUT_MAX_EXTEND_DAY_NUM)
-                throw Exception{ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE,
-                        "Input value {} of a column \"{}\" is greater than max allowed Date value, which is {}", days_num, column_name, DATE_LUT_MAX_DAY_NUM};
+            for (size_t value_i = 0, length = static_cast<size_t>(chunk.length()); value_i < length; ++value_i)
+            {
+                Int32 days_num = static_cast<Int32>(chunk.Value(value_i));
+                if (days_num > DATE_LUT_MAX_EXTEND_DAY_NUM || days_num < -DAYNUM_OFFSET_EPOCH)
+                    throw Exception{ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE,
+                            "Input value {} of a column \"{}\" is out of allowed Date32 range, which is [{}, {}]", days_num, column_name, DAYNUM_OFFSET_EPOCH, DATE_LUT_MAX_EXTEND_DAY_NUM};
 
-            column_data.emplace_back(days_num);
+                column_data.emplace_back(days_num);
+            }
+        }
+        else
+        {
+            std::shared_ptr<arrow::Buffer> buffer = chunk.data()->buffers[1];
+            const auto * raw_data = reinterpret_cast<const Int32 *>(buffer->data()) + chunk.offset();
+            column_data.insert_assume_reserved(raw_data, raw_data + chunk.length());
         }
     }
-    return {std::move(internal_column), std::move(internal_type), column_name};
+    return {std::move(internal_column), internal_type, column_name};
 }
 
 /// Arrow stores Parquet::DATETIME in Int64, while ClickHouse stores DateTime in UInt32. Therefore, it should be checked before saving
@@ -401,7 +487,7 @@ static ColumnWithTypeAndName readColumnWithIndexesDataImpl(std::shared_ptr<arrow
 
         /// buffers[0] is a null bitmap and buffers[1] are actual values
         std::shared_ptr<arrow::Buffer> buffer = chunk->data()->buffers[1];
-        const auto * data = reinterpret_cast<const NumericType *>(buffer->data());
+        const auto * data = reinterpret_cast<const NumericType *>(buffer->data()) + chunk->offset();
 
         /// Check that indexes are correct (protection against corrupted files)
         /// Note that on null values index can be arbitrary value.
@@ -528,6 +614,63 @@ static std::shared_ptr<arrow::ChunkedArray> getNestedArrowColumn(std::shared_ptr
     return std::make_shared<arrow::ChunkedArray>(array_vector);
 }
 
+static ColumnWithTypeAndName readIPv6ColumnFromBinaryData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+{
+    size_t total_size = 0;
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
+    {
+        auto & chunk = dynamic_cast<arrow::BinaryArray &>(*(arrow_column->chunk(chunk_i)));
+        const size_t chunk_length = chunk.length();
+
+        for (size_t i = 0; i != chunk_length; ++i)
+        {
+            /// If at least one value size is not 16 bytes, fallback to reading String column and further cast to IPv6.
+            if (!chunk.IsNull(i) && chunk.value_length(i) != sizeof(IPv6))
+                return readColumnWithStringData<arrow::BinaryArray>(arrow_column, column_name);
+        }
+        total_size += chunk_length;
+    }
+
+    auto internal_type = std::make_shared<DataTypeIPv6>();
+    auto internal_column = internal_type->createColumn();
+    auto & ipv6_column = assert_cast<ColumnIPv6 &>(*internal_column);
+    ipv6_column.reserve(total_size);
+
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
+    {
+        auto & chunk = dynamic_cast<arrow::BinaryArray &>(*(arrow_column->chunk(chunk_i)));
+        for (size_t value_i = 0, length = static_cast<size_t>(chunk.length()); value_i < length; ++value_i)
+        {
+            if (chunk.IsNull(value_i))
+                ipv6_column.insertDefault();
+            else
+                ipv6_column.insertData(chunk.Value(value_i).data(), chunk.Value(value_i).size());
+        }
+    }
+    return {std::move(internal_column), std::move(internal_type), column_name};
+}
+
+static ColumnWithTypeAndName readIPv4ColumnWithInt32Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+{
+    auto internal_type = std::make_shared<DataTypeIPv4>();
+    auto internal_column = internal_type->createColumn();
+    auto & column_data = assert_cast<ColumnIPv4 &>(*internal_column).getData();
+    column_data.reserve(arrow_column->length());
+
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
+    {
+        std::shared_ptr<arrow::Array> chunk = arrow_column->chunk(chunk_i);
+        if (chunk->length() == 0)
+            continue;
+
+        /// buffers[0] is a null bitmap and buffers[1] are actual values
+        std::shared_ptr<arrow::Buffer> buffer = chunk->data()->buffers[1];
+        const auto * raw_data = reinterpret_cast<const IPv4 *>(buffer->data()) + chunk->offset();
+        column_data.insert_assume_reserved(raw_data, raw_data + chunk->length());
+    }
+    return {std::move(internal_column), std::move(internal_type), column_name};
+}
+
 static ColumnWithTypeAndName readColumnFromArrowColumn(
     std::shared_ptr<arrow::ChunkedArray> & arrow_column,
     const std::string & column_name,
@@ -537,7 +680,8 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
     bool allow_null_type,
     bool skip_columns_with_unsupported_types,
     bool & skipped,
-    DataTypePtr type_hint = nullptr)
+    DataTypePtr type_hint = nullptr,
+    bool is_map_nested = false)
 {
     if (!is_nullable && (arrow_column->null_count() || (type_hint && type_hint->isNullable())) && arrow_column->type()->id() != arrow::Type::LIST
         && arrow_column->type()->id() != arrow::Type::MAP && arrow_column->type()->id() != arrow::Type::STRUCT &&
@@ -559,16 +703,57 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
     {
         case arrow::Type::STRING:
         case arrow::Type::BINARY:
+        {
+            if (type_hint)
+            {
+                switch (type_hint->getTypeId())
+                {
+                    case TypeIndex::IPv6:
+                        return readIPv6ColumnFromBinaryData(arrow_column, column_name);
+                    /// ORC format outputs big integers as binary column, because there is no fixed binary in ORC.
+                    case TypeIndex::Int128:
+                        return readColumnWithBigNumberFromBinaryData<ColumnInt128>(arrow_column, column_name, type_hint);
+                    case TypeIndex::UInt128:
+                        return readColumnWithBigNumberFromBinaryData<ColumnUInt128>(arrow_column, column_name, type_hint);
+                    case TypeIndex::Int256:
+                        return readColumnWithBigNumberFromBinaryData<ColumnInt256>(arrow_column, column_name, type_hint);
+                    case TypeIndex::UInt256:
+                        return readColumnWithBigNumberFromBinaryData<ColumnUInt256>(arrow_column, column_name, type_hint);
+                    /// ORC doesn't support Decimal256 as separate type. We read and write it as binary data.
+                    case TypeIndex::Decimal256:
+                        return readColumnWithBigNumberFromBinaryData<ColumnDecimal<Decimal256>>(arrow_column, column_name, type_hint);
+                    default:;
+                }
+            }
             return readColumnWithStringData<arrow::BinaryArray>(arrow_column, column_name);
+        }
         case arrow::Type::FIXED_SIZE_BINARY:
+        {
+            if (type_hint)
+            {
+                switch (type_hint->getTypeId())
+                {
+                    case TypeIndex::Int128:
+                        return readColumnWithBigIntegerFromFixedBinaryData<Int128>(arrow_column, column_name, type_hint);
+                    case TypeIndex::UInt128:
+                        return readColumnWithBigIntegerFromFixedBinaryData<UInt128>(arrow_column, column_name, type_hint);
+                    case TypeIndex::Int256:
+                        return readColumnWithBigIntegerFromFixedBinaryData<Int256>(arrow_column, column_name, type_hint);
+                    case TypeIndex::UInt256:
+                        return readColumnWithBigIntegerFromFixedBinaryData<UInt256>(arrow_column, column_name, type_hint);
+                    default:;
+                }
+            }
+
             return readColumnWithFixedStringData(arrow_column, column_name);
+        }
         case arrow::Type::LARGE_BINARY:
         case arrow::Type::LARGE_STRING:
             return readColumnWithStringData<arrow::LargeBinaryArray>(arrow_column, column_name);
         case arrow::Type::BOOL:
             return readColumnWithBooleanData(arrow_column, column_name);
         case arrow::Type::DATE32:
-            return readColumnWithDate32Data(arrow_column, column_name);
+            return readColumnWithDate32Data(arrow_column, column_name, type_hint);
         case arrow::Type::DATE64:
             return readColumnWithDate64Data(arrow_column, column_name);
         // ClickHouse writes Date as arrow UINT16 and DateTime as arrow UINT32,
@@ -588,6 +773,14 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
                 column.type = std::make_shared<DataTypeDateTime>();
             return column;
         }
+        case arrow::Type::INT32:
+        {
+            /// ORC format doesn't have unsigned integers and we output IPv4 as Int32.
+            /// We should allow to read it back from Int32.
+            if (type_hint && isIPv4(type_hint))
+                return readIPv4ColumnWithInt32Data(arrow_column, column_name);
+            return readColumnWithNumericData<Int32>(arrow_column, column_name);
+        }
         case arrow::Type::TIMESTAMP:
             return readColumnWithTimestampData(arrow_column, column_name);
         case arrow::Type::DECIMAL128:
@@ -597,14 +790,18 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
         case arrow::Type::MAP:
         {
             DataTypePtr nested_type_hint;
+            DataTypePtr key_type_hint;
             if (type_hint)
             {
                 const auto * map_type_hint = typeid_cast<const DataTypeMap *>(type_hint.get());
                 if (map_type_hint)
+                {
                     nested_type_hint = assert_cast<const DataTypeArray *>(map_type_hint->getNestedType().get())->getNestedType();
+                    key_type_hint = map_type_hint->getKeyType();
+                }
             }
             auto arrow_nested_column = getNestedArrowColumn(arrow_column);
-            auto nested_column = readColumnFromArrowColumn(arrow_nested_column, column_name, format_name, false, dictionary_infos, allow_null_type, skip_columns_with_unsupported_types, skipped, nested_type_hint);
+            auto nested_column = readColumnFromArrowColumn(arrow_nested_column, column_name, format_name, false, dictionary_infos, allow_null_type, skip_columns_with_unsupported_types, skipped, nested_type_hint, true);
             if (skipped)
                 return {};
 
@@ -612,8 +809,21 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
 
             const auto * tuple_column = assert_cast<const ColumnTuple *>(nested_column.column.get());
             const auto * tuple_type = assert_cast<const DataTypeTuple *>(nested_column.type.get());
-            auto map_column = ColumnMap::create(tuple_column->getColumnPtr(0), tuple_column->getColumnPtr(1), offsets_column);
-            auto map_type = std::make_shared<DataTypeMap>(tuple_type->getElements()[0], tuple_type->getElements()[1]);
+            auto key_column = tuple_column->getColumnPtr(0);
+            auto key_type = tuple_type->getElements()[0];
+            auto value_column = tuple_column->getColumnPtr(1);
+            auto value_type = tuple_type->getElements()[1];
+
+            if (key_type_hint && !key_type_hint->equals(*key_type))
+            {
+                /// Cast key column to target type, because it can happen
+                /// that parsed type cannot be ClickHouse Map key type.
+                key_column = castColumn({key_column, key_type, "key"}, key_type_hint);
+                key_type = key_type_hint;
+            }
+
+            auto map_column = ColumnMap::create(key_column, value_column, offsets_column);
+            auto map_type = std::make_shared<DataTypeMap>(key_type, value_type);
             return {std::move(map_column), std::move(map_type), column_name};
         }
         case arrow::Type::LIST:
@@ -657,7 +867,7 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
                 DataTypePtr nested_type_hint;
                 if (tuple_type_hint)
                 {
-                    if (tuple_type_hint->haveExplicitNames())
+                    if (tuple_type_hint->haveExplicitNames() && !is_map_nested)
                     {
                         auto pos = tuple_type_hint->tryGetPositionByName(field_name);
                         if (pos)
diff --git a/src/Processors/Formats/Impl/ArrowFieldIndexUtil.h b/src/Processors/Formats/Impl/ArrowFieldIndexUtil.h
index ba39d94fcf1..4beffbcf869 100644
--- a/src/Processors/Formats/Impl/ArrowFieldIndexUtil.h
+++ b/src/Processors/Formats/Impl/ArrowFieldIndexUtil.h
@@ -19,11 +19,9 @@ namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
+    extern const int THERE_IS_NO_COLUMN;
 }
-/// For ORC format, index_nested_type = true, a nested type takes one index count. And the
-/// the start index for ORC format should be 1, since index 0 indicates to select all columns.
-template<bool index_nested_type>
+
 class ArrowFieldIndexUtil
 {
 public:
@@ -46,9 +44,7 @@ public:
         calculateFieldIndices(const arrow::Schema & schema)
     {
         std::unordered_map<std::string, std::pair<int, int>> result;
-        // For format like ORC, index = 0 indicates to select all columns, so we skip 0 and start
-        // from 1.
-        int index_start = index_nested_type;
+        int index_start = 0;
         for (int i = 0; i < schema.num_fields(); ++i)
         {
             const auto & field = schema.field(i);
@@ -79,7 +75,7 @@ public:
             {
                 if (!allow_missing_columns)
                     throw Exception(
-                        ErrorCodes::LOGICAL_ERROR, "Not found field({}) in arrow schema:{}.", named_col.name, schema.ToString());
+                        ErrorCodes::THERE_IS_NO_COLUMN, "Not found field({}) in arrow schema:{}.", named_col.name, schema.ToString());
                 else
                     continue;
             }
@@ -94,17 +90,16 @@ public:
     }
 
     /// Count the number of indices for types.
-    /// For orc format, index_nested_type is true, a complex type takes one index.
     size_t countIndicesForType(std::shared_ptr<arrow::DataType> type)
     {
         if (type->id() == arrow::Type::LIST)
         {
-            return countIndicesForType(static_cast<arrow::ListType *>(type.get())->value_type()) + index_nested_type;
+            return countIndicesForType(static_cast<arrow::ListType *>(type.get())->value_type());
         }
 
         if (type->id() == arrow::Type::STRUCT)
         {
-            int indices = index_nested_type;
+            int indices = 0;
             auto * struct_type = static_cast<arrow::StructType *>(type.get());
             for (int i = 0; i != struct_type->num_fields(); ++i)
                 indices += countIndicesForType(struct_type->field(i)->type());
@@ -114,7 +109,7 @@ public:
         if (type->id() == arrow::Type::MAP)
         {
             auto * map_type = static_cast<arrow::MapType *>(type.get());
-            return countIndicesForType(map_type->key_type()) + countIndicesForType(map_type->item_type()) + index_nested_type;
+            return countIndicesForType(map_type->key_type()) + countIndicesForType(map_type->item_type()) ;
         }
 
         return 1;
@@ -144,8 +139,6 @@ private:
         index_info.first = current_start_index;
         if (field_type->id() == arrow::Type::STRUCT)
         {
-            current_start_index += index_nested_type;
-
             auto * struct_type = static_cast<arrow::StructType *>(field_type.get());
             for (int i = 0, n = struct_type->num_fields(); i < n; ++i)
             {
@@ -161,7 +154,6 @@ private:
             const auto * list_type = static_cast<arrow::ListType *>(field_type.get());
             const auto value_field = list_type->value_field();
             auto index_snapshot = current_start_index;
-            current_start_index += index_nested_type;
             calculateFieldIndices(*value_field, field_name, current_start_index, result, name_prefix);
             // The nested struct field has the same name as this list field.
             // rewrite it back to the original value.
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
index c3ea1b5e23b..c2602a4d1d5 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
@@ -11,11 +11,14 @@
 #include <IO/Operators.h>
 #include <IO/ReadHelpers.h>
 #include <IO/HTTPCommon.h>
+#include <IO/ReadBufferFromString.h>
 
 #include <Formats/FormatFactory.h>
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeDate32.h>
+#include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeNothing.h>
@@ -124,6 +127,7 @@ static void insertNumber(IColumn & column, WhichDataType type, T value)
         case TypeIndex::Int16:
             assert_cast<ColumnInt16 &>(column).insertValue(static_cast<Int16>(value));
             break;
+        case TypeIndex::Date32: [[fallthrough]];
         case TypeIndex::Int32:
             assert_cast<ColumnInt32 &>(column).insertValue(static_cast<Int32>(value));
             break;
@@ -145,11 +149,49 @@ static void insertNumber(IColumn & column, WhichDataType type, T value)
         case TypeIndex::DateTime64:
             assert_cast<ColumnDecimal<DateTime64> &>(column).insertValue(static_cast<Int64>(value));
             break;
+        case TypeIndex::IPv4:
+            assert_cast<ColumnIPv4 &>(column).insertValue(IPv4(static_cast<UInt32>(value)));
+            break;
         default:
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Type is not compatible with Avro");
     }
 }
 
+template <typename DecimalType>
+static AvroDeserializer::DeserializeFn createDecimalDeserializeFn(const avro::NodePtr & root_node, const DataTypePtr & target_type)
+{
+    auto logical_type = root_node->logicalType();
+    const auto & decimal_type = assert_cast<const DecimalType &>(*target_type);
+    if (decimal_type.getScale() != static_cast<UInt32>(logical_type.scale()) || decimal_type.getPrecision() != static_cast<UInt32>(logical_type.precision()))
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "Cannot insert Avro decimal with scale {} and precision {} to ClickHouse type {} with scale {} and precision {}",
+            logical_type.scale(),
+            logical_type.precision(),
+            target_type->getName(),
+            decimal_type.getScale(),
+            decimal_type.getPrecision());
+
+    return [tmp = std::string(), target_type](IColumn & column, avro::Decoder & decoder) mutable
+    {
+        static constexpr size_t field_type_size = sizeof(typename DecimalType::FieldType);
+        decoder.decodeString(tmp);
+        if (tmp.size() != field_type_size)
+            throw ParsingException(
+                ErrorCodes::CANNOT_PARSE_UUID,
+                "Cannot parse type {}, expected binary data with size {}, got {}",
+                target_type->getName(),
+                field_type_size,
+                tmp.size());
+
+        typename DecimalType::FieldType field;
+        ReadBufferFromString buf(tmp);
+        readBinaryBigEndian(field.value, buf);
+        assert_cast<typename DecimalType::ColumnType &>(column).insertValue(field);
+        return true;
+    };
+}
+
 static std::string nodeToJson(avro::NodePtr root_node)
 {
     std::ostringstream ss;      // STYLE_CHECK_ALLOW_STD_STRING_STREAM
@@ -166,7 +208,25 @@ static std::string nodeName(avro::NodePtr node)
         return avro::toString(node->type());
 }
 
-AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::NodePtr root_node, DataTypePtr target_type)
+static bool canBeDeserializedFromFixed(const DataTypePtr & target_type, size_t fixed_size)
+{
+    switch (target_type->getTypeId())
+    {
+        case TypeIndex::String:
+            return true;
+        case TypeIndex::FixedString: [[fallthrough]];
+        case TypeIndex::IPv6: [[fallthrough]];
+        case TypeIndex::Int128: [[fallthrough]];
+        case TypeIndex::UInt128: [[fallthrough]];
+        case TypeIndex::Int256: [[fallthrough]];
+        case TypeIndex::UInt256:
+            return target_type->getSizeOfValueInMemory() == fixed_size;
+        default:
+            return false;
+    }
+}
+
+AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(const avro::NodePtr & root_node, const DataTypePtr & target_type)
 {
     if (target_type->lowCardinality())
     {
@@ -211,6 +271,16 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::Node
                     return true;
                 };
             }
+            if (target.isDecimal32())
+                return createDecimalDeserializeFn<DataTypeDecimal32>(root_node, target_type);
+            if (target.isDecimal64())
+                return createDecimalDeserializeFn<DataTypeDecimal64>(root_node, target_type);
+            if (target.isDecimal128())
+                return createDecimalDeserializeFn<DataTypeDecimal128>(root_node, target_type);
+            if (target.isDecimal256())
+                return createDecimalDeserializeFn<DataTypeDecimal256>(root_node, target_type);
+            if (target.isDateTime64())
+                return createDecimalDeserializeFn<DataTypeDateTime64>(root_node, target_type);
             break;
         case avro::AVRO_INT:
             if (target_type->isValueRepresentedByNumber())
@@ -415,7 +485,7 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::Node
         case avro::AVRO_FIXED:
         {
             size_t fixed_size = root_node->fixedSize();
-            if ((target.isFixedString() && target_type->getSizeOfValueInMemory() == fixed_size) || target.isString())
+            if (canBeDeserializedFromFixed(target_type, fixed_size))
             {
                 return [tmp_fixed = std::vector<uint8_t>(fixed_size)](IColumn & column, avro::Decoder & decoder) mutable
                 {
@@ -467,7 +537,14 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::Node
                 const auto & values_type = map_type.getValueType();
                 auto keys_source_type = root_node->leafAt(0);
                 auto values_source_type = root_node->leafAt(1);
-                auto keys_deserializer = createDeserializeFn(keys_source_type, keys_type);
+                auto keys_deserializer = [keys_type, this](IColumn & column, avro::Decoder & decoder)
+                {
+                    String key = decoder.decodeString();
+                    ReadBufferFromString buf(key);
+                    keys_type->getDefaultSerialization()->deserializeWholeText(column, buf, settings);
+                    return true;
+                };
+
                 auto values_deserializer = createDeserializeFn(values_source_type, values_type);
                 return [keys_deserializer, values_deserializer](IColumn & column, avro::Decoder & decoder)
                 {
@@ -514,7 +591,7 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::Node
         target_type->getName(), avro::toString(root_node->type()), nodeToJson(root_node));
 }
 
-AvroDeserializer::SkipFn AvroDeserializer::createSkipFn(avro::NodePtr root_node)
+AvroDeserializer::SkipFn AvroDeserializer::createSkipFn(const avro::NodePtr & root_node)
 {
     switch (root_node->type())
     {
@@ -752,8 +829,8 @@ AvroDeserializer::Action AvroDeserializer::createAction(const Block & header, co
     }
 }
 
-AvroDeserializer::AvroDeserializer(const Block & header, avro::ValidSchema schema, bool allow_missing_fields, bool null_as_default_)
-    : null_as_default(null_as_default_)
+AvroDeserializer::AvroDeserializer(const Block & header, avro::ValidSchema schema, bool allow_missing_fields, bool null_as_default_, const FormatSettings & settings_)
+    : null_as_default(null_as_default_), settings(settings_)
 {
     const auto & schema_root = schema.root();
     if (schema_root->type() != avro::AVRO_RECORD)
@@ -799,7 +876,7 @@ void AvroRowInputFormat::readPrefix()
 {
     file_reader_ptr = std::make_unique<avro::DataFileReaderBase>(std::make_unique<AvroInputStreamReadBufferAdapter>(*in));
     deserializer_ptr = std::make_unique<AvroDeserializer>(
-        output.getHeader(), file_reader_ptr->dataSchema(), format_settings.avro.allow_missing_fields, format_settings.null_as_default);
+        output.getHeader(), file_reader_ptr->dataSchema(), format_settings.avro.allow_missing_fields, format_settings.null_as_default, format_settings);
     file_reader_ptr->init();
 }
 
@@ -990,7 +1067,7 @@ const AvroDeserializer & AvroConfluentRowInputFormat::getOrCreateDeserializer(Sc
     {
         auto schema = schema_registry->getSchema(schema_id);
         AvroDeserializer deserializer(
-            output.getHeader(), schema, format_settings.avro.allow_missing_fields, format_settings.null_as_default);
+            output.getHeader(), schema, format_settings.avro.allow_missing_fields, format_settings.null_as_default, format_settings);
         it = deserializer_cache.emplace(schema_id, deserializer).first;
     }
     return it->second;
@@ -1030,19 +1107,40 @@ DataTypePtr AvroSchemaReader::avroNodeToDataType(avro::NodePtr node)
     switch (node->type())
     {
         case avro::Type::AVRO_INT:
+        {
+            if (node->logicalType().type() == avro::LogicalType::DATE)
+                return {std::make_shared<DataTypeDate32>()};
+
             return {std::make_shared<DataTypeInt32>()};
+        }
         case avro::Type::AVRO_LONG:
+        {
+            auto logical_type = node->logicalType();
+            if (logical_type.type() == avro::LogicalType::TIMESTAMP_MILLIS)
+                return {std::make_shared<DataTypeDateTime64>(3)};
+            if (logical_type.type() == avro::LogicalType::TIMESTAMP_MICROS)
+                return {std::make_shared<DataTypeDateTime64>(6)};
+
             return std::make_shared<DataTypeInt64>();
+        }
         case avro::Type::AVRO_BOOL:
             return DataTypeFactory::instance().get("Bool");
         case avro::Type::AVRO_FLOAT:
             return std::make_shared<DataTypeFloat32>();
         case avro::Type::AVRO_DOUBLE:
             return std::make_shared<DataTypeFloat64>();
-        case avro::Type::AVRO_STRING:
-            return std::make_shared<DataTypeString>();
+        case avro::Type::AVRO_STRING: [[fallthrough]];
         case avro::Type::AVRO_BYTES:
+        {
+            auto logical_type = node->logicalType();
+            if (logical_type.type() == avro::LogicalType::UUID)
+                return std::make_shared<DataTypeUUID>();
+
+            if (logical_type.type() == avro::LogicalType::DECIMAL)
+                return createDecimal<DataTypeDecimal>(logical_type.precision(), logical_type.scale());
+
             return std::make_shared<DataTypeString>();
+        }
         case avro::Type::AVRO_ENUM:
         {
             if (node->names() < 128)
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.h b/src/Processors/Formats/Impl/AvroRowInputFormat.h
index 25589880c14..341b430205f 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.h
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.h
@@ -48,16 +48,16 @@ private:
 class AvroDeserializer
 {
 public:
-    AvroDeserializer(const Block & header, avro::ValidSchema schema, bool allow_missing_fields, bool null_as_default_);
+    AvroDeserializer(const Block & header, avro::ValidSchema schema, bool allow_missing_fields, bool null_as_default_, const FormatSettings & settings_);
     void deserializeRow(MutableColumns & columns, avro::Decoder & decoder, RowReadExtension & ext) const;
 
-private:
     using DeserializeFn = std::function<bool(IColumn & column, avro::Decoder & decoder)>;
     using DeserializeNestedFn = std::function<bool(IColumn & column, avro::Decoder & decoder)>;
 
+private:
     using SkipFn = std::function<void(avro::Decoder & decoder)>;
-    DeserializeFn createDeserializeFn(avro::NodePtr root_node, DataTypePtr target_type);
-    SkipFn createSkipFn(avro::NodePtr root_node);
+    DeserializeFn createDeserializeFn(const avro::NodePtr & root_node, const DataTypePtr & target_type);
+    SkipFn createSkipFn(const avro::NodePtr & root_node);
 
     struct Action
     {
@@ -86,14 +86,14 @@ private:
             : type(Skip)
             , skip_fn(skip_fn_) {}
 
-        Action(std::vector<size_t> nested_column_indexes_, std::vector<DeserializeFn> nested_deserializers_)
+        Action(const std::vector<size_t> & nested_column_indexes_, const std::vector<DeserializeFn> & nested_deserializers_)
             : type(Nested)
             , nested_column_indexes(nested_column_indexes_)
             , nested_deserializers(nested_deserializers_) {}
 
-        static Action recordAction(std::vector<Action> field_actions) { return Action(Type::Record, field_actions); }
+        static Action recordAction(const std::vector<Action> & field_actions) { return Action(Type::Record, field_actions); }
 
-        static Action unionAction(std::vector<Action> branch_actions) { return Action(Type::Union, branch_actions); }
+        static Action unionAction(const std::vector<Action> & branch_actions) { return Action(Type::Union, branch_actions); }
 
 
         void execute(MutableColumns & columns, avro::Decoder & decoder, RowReadExtension & ext) const
@@ -145,6 +145,8 @@ private:
     std::map<avro::Name, SkipFn> symbolic_skip_fn_map;
 
     bool null_as_default = false;
+
+    const FormatSettings & settings;
 };
 
 class AvroRowInputFormat final : public IRowInputFormat
diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
index 8483a91df62..c743b2c1766 100644
--- a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
@@ -10,6 +10,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -32,6 +33,7 @@
 #include <Schema.hh>
 
 #include <re2/re2.h>
+#include <boost/algorithm/string.hpp>
 
 namespace DB
 {
@@ -88,8 +90,43 @@ private:
     WriteBuffer & out;
 };
 
+namespace
+{
 
-AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeFn(DataTypePtr data_type, size_t & type_name_increment, const String & column_name)
+template <typename DecimalType>
+AvroSerializer::SchemaWithSerializeFn createDecimalSchemaWithSerializeFn(const DataTypePtr & data_type)
+{
+    auto schema = avro::BytesSchema();
+    const auto & provided_type = assert_cast<const DecimalType &>(*data_type);
+    auto logical_type = avro::LogicalType(avro::LogicalType::DECIMAL);
+    logical_type.setScale(provided_type.getScale());
+    logical_type.setPrecision(provided_type.getPrecision());
+    schema.root()->setLogicalType(logical_type);
+    return {schema, [](const IColumn & column, size_t row_num, avro::Encoder & encoder)
+    {
+        const auto & col = assert_cast<const typename DecimalType::ColumnType &>(column);
+        WriteBufferFromOwnString buf;
+        writeBinaryBigEndian(col.getElement(row_num).value, buf);
+        encoder.encodeBytes(reinterpret_cast<const uint8_t *>(buf.str().data()), buf.str().size());
+    }};
+}
+
+template <typename BigIntegerType>
+AvroSerializer::SchemaWithSerializeFn createBigIntegerSchemaWithSerializeFn(const DataTypePtr & data_type, size_t type_name_increment)
+{
+    auto schema = avro::FixedSchema(sizeof(BigIntegerType), boost::algorithm::to_lower_copy(data_type->getName()) + std::to_string(type_name_increment));
+    return {schema, [](const IColumn & column, size_t row_num, avro::Encoder & encoder)
+    {
+        const auto & col = assert_cast<const ColumnVector<BigIntegerType> &>(column);
+        WriteBufferFromOwnString buf;
+        writeBinary(col.getElement(row_num), buf);
+        encoder.encodeFixed(reinterpret_cast<const uint8_t *>(buf.str().data()), buf.str().size());
+    }};
+}
+
+}
+
+AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeFn(const DataTypePtr & data_type, size_t & type_name_increment, const String & column_name)
 {
     ++type_name_increment;
 
@@ -127,6 +164,11 @@ AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeF
             {
                 encoder.encodeInt(assert_cast<const ColumnUInt32 &>(column).getElement(row_num));
             }};
+        case TypeIndex::IPv4:
+            return {avro::IntSchema(), [](const IColumn & column, size_t row_num, avro::Encoder & encoder)
+            {
+                encoder.encodeInt(assert_cast<const ColumnIPv4 &>(column).getElement(row_num));
+            }};
         case TypeIndex::Int32:
             return {avro::IntSchema(), [](const IColumn & column, size_t row_num, avro::Encoder & encoder)
             {
@@ -152,6 +194,14 @@ AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeF
             {
                 encoder.encodeDouble(assert_cast<const ColumnFloat64 &>(column).getElement(row_num));
             }};
+        case TypeIndex::Int128:
+            return createBigIntegerSchemaWithSerializeFn<Int128>(data_type, type_name_increment);
+        case TypeIndex::UInt128:
+            return createBigIntegerSchemaWithSerializeFn<UInt128>(data_type, type_name_increment);
+        case TypeIndex::Int256:
+            return createBigIntegerSchemaWithSerializeFn<Int256>(data_type, type_name_increment);
+        case TypeIndex::UInt256:
+            return createBigIntegerSchemaWithSerializeFn<UInt256>(data_type, type_name_increment);
         case TypeIndex::Date:
         {
             auto schema = avro::IntSchema();
@@ -162,6 +212,16 @@ AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeF
                 encoder.encodeInt(date);
             }};
         }
+        case TypeIndex::Date32:
+        {
+            auto schema = avro::IntSchema();
+            schema.root()->setLogicalType(avro::LogicalType(avro::LogicalType::DATE));
+            return {schema, [](const IColumn & column, size_t row_num, avro::Encoder & encoder)
+            {
+                Int32 date = assert_cast<const ColumnInt32 &>(column).getElement(row_num);
+                encoder.encodeInt(date);
+            }};
+        }
         case TypeIndex::DateTime64:
         {
             auto schema = avro::LongSchema();
@@ -172,7 +232,7 @@ AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeF
             else if (provided_type.getScale() == 6)
                 schema.root()->setLogicalType(avro::LogicalType(avro::LogicalType::TIMESTAMP_MICROS));
             else
-                break;
+                return createDecimalSchemaWithSerializeFn<DataTypeDateTime64>(data_type);
 
             return {schema, [](const IColumn & column, size_t row_num, avro::Encoder & encoder)
             {
@@ -180,6 +240,22 @@ AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeF
                 encoder.encodeLong(col.getElement(row_num));
             }};
         }
+        case TypeIndex::Decimal32:
+        {
+            return createDecimalSchemaWithSerializeFn<DataTypeDecimal32>(data_type);
+        }
+        case TypeIndex::Decimal64:
+        {
+            return createDecimalSchemaWithSerializeFn<DataTypeDecimal64>(data_type);
+        }
+        case TypeIndex::Decimal128:
+        {
+            return createDecimalSchemaWithSerializeFn<DataTypeDecimal128>(data_type);
+        }
+        case TypeIndex::Decimal256:
+        {
+            return createDecimalSchemaWithSerializeFn<DataTypeDecimal256>(data_type);
+        }
         case TypeIndex::String:
             if (traits->isStringAsString(column_name))
                 return {avro::StringSchema(), [](const IColumn & column, size_t row_num, avro::Encoder & encoder)
@@ -205,6 +281,15 @@ AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeF
                 encoder.encodeFixed(reinterpret_cast<const uint8_t *>(s.data()), s.size());
             }};
         }
+        case TypeIndex::IPv6:
+        {
+            auto schema = avro::FixedSchema(sizeof(IPv6), "ipv6_" + toString(type_name_increment));
+            return {schema, [](const IColumn & column, size_t row_num, avro::Encoder & encoder)
+            {
+                const std::string_view & s = assert_cast<const ColumnIPv6 &>(column).getDataAt(row_num).toView();
+                encoder.encodeFixed(reinterpret_cast<const uint8_t *>(s.data()), s.size());
+            }};
+        }
         case TypeIndex::Enum8:
         {
             auto schema = avro::EnumSchema("enum8_" + toString(type_name_increment));    /// type names must be different for different types.
@@ -323,7 +408,9 @@ AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeF
             const auto & nested_names = tuple_type.getElementNames();
             std::vector<SerializeFn> nested_serializers;
             nested_serializers.reserve(nested_types.size());
-            auto schema = avro::RecordSchema(column_name);
+            /// We should use unique names for records. Otherwise avro will reuse schema of this record later
+            /// for all records with the same name.
+            auto schema = avro::RecordSchema(column_name + "_" + std::to_string(type_name_increment));
             for (size_t i = 0; i != nested_types.size(); ++i)
             {
                 auto nested_mapping = createSchemaWithSerializeFn(nested_types[i], type_name_increment, nested_names[i]);
@@ -343,13 +430,13 @@ AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeF
         {
             const auto & map_type = assert_cast<const DataTypeMap &>(*data_type);
             const auto & keys_type = map_type.getKeyType();
-            if (!isStringOrFixedString(keys_type))
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Avro Maps support only keys with type String, got {}", keys_type->getName());
+            auto keys_serialization = keys_type->getDefaultSerialization();
 
-            auto keys_serializer = [](const IColumn & column, size_t row_num, avro::Encoder & encoder)
+            auto keys_serializer = [keys_serialization, this](const IColumn & column, size_t row_num, avro::Encoder & encoder)
             {
-                const std::string_view & s = column.getDataAt(row_num).toView();
-                encoder.encodeString(std::string(s));
+                WriteBufferFromOwnString buf;
+                keys_serialization->serializeText(column, row_num, buf, settings);
+                encoder.encodeString(buf.str());
             };
 
             const auto & values_type = map_type.getValueType();
@@ -387,8 +474,8 @@ AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeF
 }
 
 
-AvroSerializer::AvroSerializer(const ColumnsWithTypeAndName & columns, std::unique_ptr<AvroSerializerTraits> traits_)
-    : traits(std::move(traits_))
+AvroSerializer::AvroSerializer(const ColumnsWithTypeAndName & columns, std::unique_ptr<AvroSerializerTraits> traits_, const FormatSettings & settings_)
+    : traits(std::move(traits_)), settings(settings_)
 {
     avro::RecordSchema record_schema("row");
 
@@ -444,7 +531,7 @@ AvroRowOutputFormat::AvroRowOutputFormat(
     WriteBuffer & out_, const Block & header_, const FormatSettings & settings_)
     : IRowOutputFormat(header_, out_)
     , settings(settings_)
-    , serializer(header_.getColumnsWithTypeAndName(), std::make_unique<AvroSerializerTraits>(settings))
+    , serializer(header_.getColumnsWithTypeAndName(), std::make_unique<AvroSerializerTraits>(settings), settings)
 {
 }
 
@@ -478,6 +565,11 @@ void AvroRowOutputFormat::write(const Columns & columns, size_t row_num)
 
 void AvroRowOutputFormat::finalizeImpl()
 {
+    /// If file writer weren't created, we should create it here to write file prefix/suffix
+    /// even without actual data so the file will be valid Avro file
+    if (!file_writer_ptr)
+        createFileWriter();
+
     file_writer_ptr->close();
 }
 
diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.h b/src/Processors/Formats/Impl/AvroRowOutputFormat.h
index d7b15a95d26..c526936b383 100644
--- a/src/Processors/Formats/Impl/AvroRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.h
@@ -23,11 +23,10 @@ class AvroSerializerTraits;
 class AvroSerializer
 {
 public:
-    AvroSerializer(const ColumnsWithTypeAndName & columns, std::unique_ptr<AvroSerializerTraits>);
+    AvroSerializer(const ColumnsWithTypeAndName & columns, std::unique_ptr<AvroSerializerTraits>, const FormatSettings & settings_);
     const avro::ValidSchema & getSchema() const { return valid_schema; }
     void serializeRow(const Columns & columns, size_t row_num, avro::Encoder & encoder);
 
-private:
     using SerializeFn = std::function<void(const IColumn & column, size_t row_num, avro::Encoder & encoder)>;
     struct SchemaWithSerializeFn
     {
@@ -35,12 +34,14 @@ private:
         SerializeFn serialize;
     };
 
+private:
     /// Type names for different complex types (e.g. enums, fixed strings) must be unique. We use simple incremental number to give them different names.
-    SchemaWithSerializeFn createSchemaWithSerializeFn(DataTypePtr data_type, size_t & type_name_increment, const String & column_name);
+    SchemaWithSerializeFn createSchemaWithSerializeFn(const DataTypePtr & data_type, size_t & type_name_increment, const String & column_name);
 
     std::vector<SerializeFn> serialize_fns;
     avro::ValidSchema valid_schema;
     std::unique_ptr<AvroSerializerTraits> traits;
+    const FormatSettings & settings;
 };
 
 class AvroRowOutputFormat final : public IRowOutputFormat
diff --git a/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.cpp
index 5d747888b92..57598fb507f 100644
--- a/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.cpp
@@ -64,20 +64,22 @@ inline size_t BSONEachRowRowInputFormat::columnIndex(const StringRef & name, siz
     /// Optimization by caching the order of fields (which is almost always the same)
     /// and a quick check to match the next expected field, instead of searching the hash table.
 
-    if (prev_positions.size() > key_index && prev_positions[key_index] && name == prev_positions[key_index]->getKey())
+    if (prev_positions.size() > key_index
+        && prev_positions[key_index] != Block::NameMap::const_iterator{}
+        && name == prev_positions[key_index]->first)
     {
-        return prev_positions[key_index]->getMapped();
+        return prev_positions[key_index]->second;
     }
     else
     {
-        auto * it = name_map.find(name);
+        const auto it = name_map.find(name);
 
-        if (it)
+        if (it != name_map.end())
         {
             if (key_index < prev_positions.size())
                 prev_positions[key_index] = it;
 
-            return it->getMapped();
+            return it->second;
         }
         else
             return UNKNOWN_FIELD;
@@ -151,6 +153,17 @@ static void readAndInsertInteger(ReadBuffer & in, IColumn & column, const DataTy
     }
 }
 
+static void readAndInsertIPv4(ReadBuffer & in, IColumn & column, BSONType bson_type)
+{
+    /// We expect BSON type Int32 as IPv4 value.
+    if (bson_type != BSONType::INT32)
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert BSON Int32 into column with type IPv4");
+
+    UInt32 value;
+    readBinary(value, in);
+    assert_cast<ColumnIPv4 &>(column).insertValue(IPv4(value));
+}
+
 template <typename T>
 static void readAndInsertDouble(ReadBuffer & in, IColumn & column, const DataTypePtr & data_type, BSONType bson_type)
 {
@@ -271,6 +284,8 @@ static void readAndInsertString(ReadBuffer & in, IColumn & column, BSONType bson
     if (bson_type == BSONType::STRING || bson_type == BSONType::SYMBOL || bson_type == BSONType::JAVA_SCRIPT_CODE)
     {
         auto size = readBSONSize(in);
+        if (size == 0)
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect size of a string (zero) in BSON");
         readAndInsertStringImpl<is_fixed_string>(in, column, size - 1);
         assertChar(0, in);
     }
@@ -296,37 +311,52 @@ static void readAndInsertString(ReadBuffer & in, IColumn & column, BSONType bson
     }
 }
 
+static void readAndInsertIPv6(ReadBuffer & in, IColumn & column, BSONType bson_type)
+{
+    if (bson_type != BSONType::BINARY)
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert BSON {} into IPv6 column", getBSONTypeName(bson_type));
+
+    auto size = readBSONSize(in);
+    auto subtype = getBSONBinarySubtype(readBSONType(in));
+    if (subtype != BSONBinarySubtype::BINARY)
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert BSON Binary subtype {} into IPv6 column", getBSONBinarySubtypeName(subtype));
+
+    if (size != sizeof(IPv6))
+        throw Exception(
+            ErrorCodes::INCORRECT_DATA,
+            "Cannot parse value of type IPv6, size of binary data is not equal to the binary size of IPv6 value: {} != {}",
+            size,
+            sizeof(IPv6));
+
+    IPv6 value;
+    readBinary(value, in);
+    assert_cast<ColumnIPv6 &>(column).insertValue(value);
+}
+
+
 static void readAndInsertUUID(ReadBuffer & in, IColumn & column, BSONType bson_type)
 {
-    if (bson_type == BSONType::BINARY)
-    {
-        auto size = readBSONSize(in);
-        auto subtype = getBSONBinarySubtype(readBSONType(in));
-        if (subtype == BSONBinarySubtype::UUID || subtype == BSONBinarySubtype::UUID_OLD)
-        {
-            if (size != sizeof(UUID))
-                throw Exception(
-                    ErrorCodes::INCORRECT_DATA,
-                    "Cannot parse value of type UUID, size of binary data is not equal to the binary size of UUID value: {} != {}",
-                    size,
-                    sizeof(UUID));
-
-            UUID value;
-            readBinary(value, in);
-            assert_cast<ColumnUUID &>(column).insertValue(value);
-        }
-        else
-        {
-            throw Exception(
-                ErrorCodes::ILLEGAL_COLUMN,
-                "Cannot insert BSON Binary subtype {} into UUID column",
-                getBSONBinarySubtypeName(subtype));
-        }
-    }
-    else
-    {
+    if (bson_type != BSONType::BINARY)
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert BSON {} into UUID column", getBSONTypeName(bson_type));
-    }
+
+    auto size = readBSONSize(in);
+    auto subtype = getBSONBinarySubtype(readBSONType(in));
+    if (subtype != BSONBinarySubtype::UUID && subtype != BSONBinarySubtype::UUID_OLD)
+        throw Exception(
+            ErrorCodes::ILLEGAL_COLUMN,
+            "Cannot insert BSON Binary subtype {} into UUID column",
+            getBSONBinarySubtypeName(subtype));
+
+    if (size != sizeof(UUID))
+        throw Exception(
+            ErrorCodes::INCORRECT_DATA,
+            "Cannot parse value of type UUID, size of binary data is not equal to the binary size of UUID value: {} != {}",
+            size,
+            sizeof(UUID));
+
+    UUID value;
+    readBinary(value, in);
+    assert_cast<ColumnUUID &>(column).insertValue(value);
 }
 
 void BSONEachRowRowInputFormat::readArray(IColumn & column, const DataTypePtr & data_type, BSONType bson_type)
@@ -418,11 +448,6 @@ void BSONEachRowRowInputFormat::readMap(IColumn & column, const DataTypePtr & da
 
     const auto * data_type_map = assert_cast<const DataTypeMap *>(data_type.get());
     const auto & key_data_type = data_type_map->getKeyType();
-    if (!isStringOrFixedString(key_data_type))
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                        "Only maps with String key type are supported in BSON, got key type: {}",
-                        key_data_type->getName());
-
     const auto & value_data_type = data_type_map->getValueType();
     auto & column_map = assert_cast<ColumnMap &>(column);
     auto & key_column = column_map.getNestedData().getColumn(0);
@@ -436,7 +461,8 @@ void BSONEachRowRowInputFormat::readMap(IColumn & column, const DataTypePtr & da
     {
         auto nested_bson_type = getBSONType(readBSONType(*in));
         auto name = readBSONKeyName(*in, current_key_name);
-        key_column.insertData(name.data, name.size);
+        ReadBufferFromMemory buf(name.data, name.size);
+        key_data_type->getDefaultSerialization()->deserializeWholeText(key_column, buf, format_settings);
         readField(value_column, value_data_type, nested_bson_type);
     }
 
@@ -483,6 +509,7 @@ bool BSONEachRowRowInputFormat::readField(IColumn & column, const DataTypePtr &
             lc_column.insertFromFullColumn(*tmp_column, 0);
             return res;
         }
+        case TypeIndex::Enum8: [[fallthrough]];
         case TypeIndex::Int8:
         {
             readAndInsertInteger<Int8>(*in, column, data_type, bson_type);
@@ -493,6 +520,7 @@ bool BSONEachRowRowInputFormat::readField(IColumn & column, const DataTypePtr &
             readAndInsertInteger<UInt8>(*in, column, data_type, bson_type);
             return true;
         }
+        case TypeIndex::Enum16: [[fallthrough]];
         case TypeIndex::Int16:
         {
             readAndInsertInteger<Int16>(*in, column, data_type, bson_type);
@@ -591,6 +619,16 @@ bool BSONEachRowRowInputFormat::readField(IColumn & column, const DataTypePtr &
             readAndInsertString<false>(*in, column, bson_type);
             return true;
         }
+        case TypeIndex::IPv4:
+        {
+            readAndInsertIPv4(*in, column, bson_type);
+            return true;
+        }
+        case TypeIndex::IPv6:
+        {
+            readAndInsertIPv6(*in, column, bson_type);
+            return true;
+        }
         case TypeIndex::UUID:
         {
             readAndInsertUUID(*in, column, bson_type);
@@ -750,6 +788,9 @@ bool BSONEachRowRowInputFormat::readRow(MutableColumns & columns, RowReadExtensi
         }
         else
         {
+            if (seen_columns[index])
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Duplicate field found while parsing BSONEachRow format: {}", name);
+
             seen_columns[index] = true;
             read_columns[index] = readField(*columns[index], types[index], BSONType(type));
         }
@@ -956,6 +997,10 @@ fileSegmentationEngineBSONEachRow(ReadBuffer & in, DB::Memory<> & memory, size_t
     {
         BSONSizeT document_size;
         readBinary(document_size, in);
+
+        if (document_size < sizeof(document_size))
+            throw ParsingException(ErrorCodes::INCORRECT_DATA, "Size of BSON document is invalid");
+
         if (min_bytes != 0 && document_size > 10 * min_bytes)
             throw ParsingException(
                 ErrorCodes::INCORRECT_DATA,
@@ -963,9 +1008,12 @@ fileSegmentationEngineBSONEachRow(ReadBuffer & in, DB::Memory<> & memory, size_t
                 "the value setting 'min_chunk_bytes_for_parallel_parsing' or check your data manually, most likely BSON is malformed",
                 min_bytes, document_size);
 
+        if (document_size < sizeof(document_size))
+            throw ParsingException(ErrorCodes::INCORRECT_DATA, "Size of BSON document is invalid");
+
         size_t old_size = memory.size();
         memory.resize(old_size + document_size);
-        memcpy(memory.data() + old_size, reinterpret_cast<char *>(&document_size), sizeof(document_size));
+        unalignedStore<BSONSizeT>(memory.data() + old_size, document_size);
         in.readStrict(memory.data() + old_size + sizeof(document_size), document_size - sizeof(document_size));
         ++number_of_rows;
     }
diff --git a/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.h b/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.h
index ad6d712b6dd..538a59e05c3 100644
--- a/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.h
+++ b/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.h
@@ -91,7 +91,7 @@ private:
     Block::NameMap name_map;
 
     /// Cached search results for previous row (keyed as index in JSON object) - used as a hint.
-    std::vector<Block::NameMap::LookupResult> prev_positions;
+    std::vector<Block::NameMap::const_iterator> prev_positions;
 
     DataTypes types;
 
diff --git a/src/Processors/Formats/Impl/BSONEachRowRowOutputFormat.cpp b/src/Processors/Formats/Impl/BSONEachRowRowOutputFormat.cpp
index 211021b0d78..2bb5410781c 100644
--- a/src/Processors/Formats/Impl/BSONEachRowRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/BSONEachRowRowOutputFormat.cpp
@@ -33,13 +33,14 @@ namespace ErrorCodes
 }
 
 /// In BSON all names should be valid UTF8 sequences
-static String toValidUTF8String(const String & name)
+static String toValidUTF8String(const String & name, const FormatSettings & settings)
 {
     WriteBufferFromOwnString buf;
     WriteBufferValidUTF8 validating_buf(buf);
-    writeString(name, validating_buf);
+    writeJSONString(name, validating_buf, settings);
     validating_buf.finalize();
-    return buf.str();
+    /// Return value without quotes
+    return buf.str().substr(1, buf.str().size() - 2);
 }
 
 BSONEachRowRowOutputFormat::BSONEachRowRowOutputFormat(
@@ -49,7 +50,7 @@ BSONEachRowRowOutputFormat::BSONEachRowRowOutputFormat(
     const auto & sample = getPort(PortKind::Main).getHeader();
     fields.reserve(sample.columns());
     for (const auto & field : sample.getNamesAndTypes())
-        fields.emplace_back(toValidUTF8String(field.name), field.type);
+        fields.emplace_back(toValidUTF8String(field.name, settings), field.type);
 }
 
 static void writeBSONSize(size_t size, WriteBuffer & buf)
@@ -112,11 +113,11 @@ static void writeBSONBigInteger(const IColumn & column, size_t row_num, const St
     buf.write(data.data, data.size);
 }
 
-size_t BSONEachRowRowOutputFormat::countBSONFieldSize(const IColumn & column, const DataTypePtr & data_type, size_t row_num, const String & name)
+size_t BSONEachRowRowOutputFormat::countBSONFieldSize(const IColumn & column, const DataTypePtr & data_type, size_t row_num, const String & name, const String & path, std::unordered_map<String, size_t> & nested_document_sizes)
 {
     size_t size = 1; // Field type
     size += name.size() + 1; // Field name and \0
-    switch (column.getDataType())
+    switch (data_type->getTypeId())
     {
         case TypeIndex::Int8: [[fallthrough]];
         case TypeIndex::Int16: [[fallthrough]];
@@ -124,6 +125,9 @@ size_t BSONEachRowRowOutputFormat::countBSONFieldSize(const IColumn & column, co
         case TypeIndex::Date: [[fallthrough]];
         case TypeIndex::Date32: [[fallthrough]];
         case TypeIndex::Decimal32: [[fallthrough]];
+        case TypeIndex::IPv4: [[fallthrough]];
+        case TypeIndex::Enum8: [[fallthrough]];
+        case TypeIndex::Enum16: [[fallthrough]];
         case TypeIndex::Int32:
         {
             return size + sizeof(Int32);
@@ -168,6 +172,10 @@ size_t BSONEachRowRowOutputFormat::countBSONFieldSize(const IColumn & column, co
             const auto & string_column = assert_cast<const ColumnFixedString &>(column);
             return size + sizeof(BSONSizeT) + string_column.getN() + 1; // Size of data + data + \0 or BSON subtype (in case of BSON binary)
         }
+        case TypeIndex::IPv6:
+        {
+            return size + sizeof(BSONSizeT) + 1 + sizeof(IPv6); // Size of data + BSON binary subtype + 16 bytes of value
+        }
         case TypeIndex::UUID:
         {
             return size + sizeof(BSONSizeT) + 1 + sizeof(UUID); // Size of data + BSON binary subtype + 16 bytes of value
@@ -178,7 +186,7 @@ size_t BSONEachRowRowOutputFormat::countBSONFieldSize(const IColumn & column, co
             auto dict_type = assert_cast<const DataTypeLowCardinality *>(data_type.get())->getDictionaryType();
             auto dict_column = lc_column.getDictionary().getNestedColumn();
             size_t index = lc_column.getIndexAt(row_num);
-            return countBSONFieldSize(*dict_column, dict_type, index, name);
+            return countBSONFieldSize(*dict_column, dict_type, index, name, path, nested_document_sizes);
         }
         case TypeIndex::Nullable:
         {
@@ -186,11 +194,11 @@ size_t BSONEachRowRowOutputFormat::countBSONFieldSize(const IColumn & column, co
             const ColumnNullable & column_nullable = assert_cast<const ColumnNullable &>(column);
             if (column_nullable.isNullAt(row_num))
                 return size; /// Null has no value, just type
-            return countBSONFieldSize(column_nullable.getNestedColumn(), nested_type, row_num, name);
+            return countBSONFieldSize(column_nullable.getNestedColumn(), nested_type, row_num, name, path, nested_document_sizes);
         }
         case TypeIndex::Array:
         {
-            size += sizeof(BSONSizeT); // Size of a document
+            size_t document_size = sizeof(BSONSizeT); // Size of a document
 
             const auto & nested_type = assert_cast<const DataTypeArray *>(data_type.get())->getNestedType();
             const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
@@ -199,39 +207,41 @@ size_t BSONEachRowRowOutputFormat::countBSONFieldSize(const IColumn & column, co
             size_t offset = offsets[row_num - 1];
             size_t array_size = offsets[row_num] - offset;
 
+            String current_path = path + "." + name;
             for (size_t i = 0; i < array_size; ++i)
-                size += countBSONFieldSize(nested_column, nested_type, offset + i, std::to_string(i)); // Add size of each value from array
+                document_size += countBSONFieldSize(nested_column, nested_type, offset + i, std::to_string(i), current_path, nested_document_sizes); // Add size of each value from array
 
-            return size + sizeof(BSON_DOCUMENT_END); // Add final \0
+            document_size += sizeof(BSON_DOCUMENT_END); // Add final \0
+            nested_document_sizes[current_path] = document_size;
+            return size + document_size;
         }
         case TypeIndex::Tuple:
         {
-            size += sizeof(BSONSizeT); // Size of a document
+            size_t document_size = sizeof(BSONSizeT); // Size of a document
 
             const auto * tuple_type = assert_cast<const DataTypeTuple *>(data_type.get());
             const auto & nested_types = tuple_type->getElements();
-            bool have_explicit_names = tuple_type->haveExplicitNames();
             const auto & nested_names = tuple_type->getElementNames();
             const auto & tuple_column = assert_cast<const ColumnTuple &>(column);
             const auto & nested_columns = tuple_column.getColumns();
 
+            String current_path = path + "." + name;
             for (size_t i = 0; i < nested_columns.size(); ++i)
             {
-                String key_name = have_explicit_names ? toValidUTF8String(nested_names[i]) : std::to_string(i);
-                size += countBSONFieldSize(*nested_columns[i], nested_types[i], row_num, key_name); // Add size of each value from tuple
+                String key_name = toValidUTF8String(nested_names[i], settings);
+                document_size += countBSONFieldSize(*nested_columns[i], nested_types[i], row_num, key_name, current_path, nested_document_sizes); // Add size of each value from tuple
             }
 
-            return size + sizeof(BSON_DOCUMENT_END); // Add final \0
+            document_size += sizeof(BSON_DOCUMENT_END); // Add final \0
+            nested_document_sizes[current_path] = document_size;
+            return size + document_size;
         }
         case TypeIndex::Map:
         {
-            size += sizeof(BSONSizeT); // Size of a document
+            size_t document_size = sizeof(BSONSizeT); // Size of a document
 
             const auto & map_type = assert_cast<const DataTypeMap &>(*data_type);
-            if (!isStringOrFixedString(map_type.getKeyType()))
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                                "Only maps with String key type are supported in BSON, got key type: {}",
-                                map_type.getKeyType()->getName());
+            const auto & key_type = map_type.getKeyType();
             const auto & value_type = map_type.getValueType();
 
             const auto & map_column = assert_cast<const ColumnMap &>(column);
@@ -243,22 +253,28 @@ size_t BSONEachRowRowOutputFormat::countBSONFieldSize(const IColumn & column, co
             size_t offset = offsets[row_num - 1];
             size_t map_size = offsets[row_num] - offset;
 
+            WriteBufferFromOwnString buf;
+            String current_path = path + "." + name;
             for (size_t i = 0; i < map_size; ++i)
             {
-                String key = toValidUTF8String(key_column->getDataAt(offset + i).toString());
-                size += countBSONFieldSize(*value_column, value_type, offset + i, key);
+                key_type->getDefaultSerialization()->serializeText(*key_column, offset + i, buf, settings);
+                auto s = countBSONFieldSize(*value_column, value_type, offset + i, toValidUTF8String(buf.str(), settings), current_path, nested_document_sizes);
+                document_size += s;
+                buf.restart();
             }
 
-            return size + sizeof(BSON_DOCUMENT_END); // Add final \0
+            document_size += sizeof(BSON_DOCUMENT_END); // Add final \0
+            nested_document_sizes[current_path] = document_size;
+            return size + document_size;
         }
         default:
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Type {} is not supported in BSON output format", data_type->getName());
     }
 }
 
-void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const DataTypePtr & data_type, size_t row_num, const String & name)
+void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const DataTypePtr & data_type, size_t row_num, const String & name, const String & path, std::unordered_map<String, size_t> & nested_document_sizes)
 {
-    switch (column.getDataType())
+    switch (data_type->getTypeId())
     {
         case TypeIndex::Float32:
         {
@@ -270,6 +286,7 @@ void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const Da
             writeBSONNumber<ColumnFloat64, double>(BSONType::DOUBLE, column, row_num, name, out);
             break;
         }
+        case TypeIndex::Enum8: [[fallthrough]];
         case TypeIndex::Int8:
         {
             writeBSONNumber<ColumnInt8, Int32>(BSONType::INT32, column, row_num, name, out);
@@ -283,6 +300,7 @@ void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const Da
                 writeBSONNumber<ColumnUInt8, Int32>(BSONType::INT32, column, row_num, name, out);
             break;
         }
+        case TypeIndex::Enum16: [[fallthrough]];
         case TypeIndex::Int16:
         {
             writeBSONNumber<ColumnInt16, Int32>(BSONType::INT32, column, row_num, name, out);
@@ -371,6 +389,19 @@ void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const Da
             writeBSONString<ColumnFixedString>(column, row_num, name, out, settings.bson.output_string_as_string);
             break;
         }
+        case TypeIndex::IPv4:
+        {
+            writeBSONNumber<ColumnIPv4, Int32>(BSONType::INT32, column, row_num, name, out);
+            break;
+        }
+        case TypeIndex::IPv6:
+        {
+            writeBSONTypeAndKeyName(BSONType::BINARY, name, out);
+            writeBSONSize(sizeof(IPv6), out);
+            writeBSONType(BSONBinarySubtype::BINARY, out);
+            writeBinary(assert_cast<const ColumnIPv6 &>(column).getElement(row_num), out);
+            break;
+        }
         case TypeIndex::UUID:
         {
             writeBSONTypeAndKeyName(BSONType::BINARY, name, out);
@@ -385,7 +416,7 @@ void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const Da
             auto dict_type = assert_cast<const DataTypeLowCardinality *>(data_type.get())->getDictionaryType();
             auto dict_column = lc_column.getDictionary().getNestedColumn();
             size_t index = lc_column.getIndexAt(row_num);
-            serializeField(*dict_column, dict_type, index, name);
+            serializeField(*dict_column, dict_type, index, name, path, nested_document_sizes);
             break;
         }
         case TypeIndex::Nullable:
@@ -393,7 +424,7 @@ void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const Da
             auto nested_type = removeNullable(data_type);
             const ColumnNullable & column_nullable = assert_cast<const ColumnNullable &>(column);
             if (!column_nullable.isNullAt(row_num))
-                serializeField(column_nullable.getNestedColumn(), nested_type, row_num, name);
+                serializeField(column_nullable.getNestedColumn(), nested_type, row_num, name, path, nested_document_sizes);
             else
                 writeBSONTypeAndKeyName(BSONType::NULL_VALUE, name, out);
             break;
@@ -409,15 +440,12 @@ void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const Da
 
             writeBSONTypeAndKeyName(BSONType::ARRAY, name, out);
 
-            size_t document_size = sizeof(BSONSizeT);
-            for (size_t i = 0; i < array_size; ++i)
-                document_size += countBSONFieldSize(nested_column, nested_type, offset + i, std::to_string(i)); // Add size of each value from array
-            document_size += sizeof(BSON_DOCUMENT_END); // Add final \0
-
+            String current_path = path + "." + name;
+            size_t document_size = nested_document_sizes[current_path];
             writeBSONSize(document_size, out);
 
             for (size_t i = 0; i < array_size; ++i)
-                serializeField(nested_column, nested_type, offset + i, std::to_string(i));
+                serializeField(nested_column, nested_type, offset + i, std::to_string(i), current_path, nested_document_sizes);
 
             writeChar(BSON_DOCUMENT_END, out);
             break;
@@ -426,26 +454,19 @@ void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const Da
         {
             const auto * tuple_type = assert_cast<const DataTypeTuple *>(data_type.get());
             const auto & nested_types = tuple_type->getElements();
-            bool have_explicit_names = tuple_type->haveExplicitNames();
             const auto & nested_names = tuple_type->getElementNames();
             const auto & tuple_column = assert_cast<const ColumnTuple &>(column);
             const auto & nested_columns = tuple_column.getColumns();
 
-            BSONType bson_type = have_explicit_names ? BSONType::DOCUMENT : BSONType::ARRAY;
+            BSONType bson_type =  tuple_type->haveExplicitNames() ? BSONType::DOCUMENT : BSONType::ARRAY;
             writeBSONTypeAndKeyName(bson_type, name, out);
 
-            size_t document_size = sizeof(BSONSizeT);
-            for (size_t i = 0; i < nested_columns.size(); ++i)
-            {
-                String key_name = have_explicit_names ? toValidUTF8String(nested_names[i]) : std::to_string(i);
-                document_size += countBSONFieldSize(*nested_columns[i], nested_types[i], row_num, key_name); // Add size of each value from tuple
-            }
-            document_size += sizeof(BSON_DOCUMENT_END); // Add final \0
-
+            String current_path = path + "." + name;
+            size_t document_size = nested_document_sizes[current_path];
             writeBSONSize(document_size, out);
 
             for (size_t i = 0; i < nested_columns.size(); ++i)
-                serializeField(*nested_columns[i], nested_types[i], row_num, toValidUTF8String(nested_names[i]));
+                serializeField(*nested_columns[i], nested_types[i], row_num, toValidUTF8String(nested_names[i], settings), current_path, nested_document_sizes);
 
             writeChar(BSON_DOCUMENT_END, out);
             break;
@@ -453,10 +474,7 @@ void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const Da
         case TypeIndex::Map:
         {
             const auto & map_type = assert_cast<const DataTypeMap &>(*data_type);
-            if (!isStringOrFixedString(map_type.getKeyType()))
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                                "Only maps with String key type are supported in BSON, got key type: {}",
-                                map_type.getKeyType()->getName());
+            const auto & key_type = map_type.getKeyType();
             const auto & value_type = map_type.getValueType();
 
             const auto & map_column = assert_cast<const ColumnMap &>(column);
@@ -470,20 +488,16 @@ void BSONEachRowRowOutputFormat::serializeField(const IColumn & column, const Da
 
             writeBSONTypeAndKeyName(BSONType::DOCUMENT, name, out);
 
-            size_t document_size = sizeof(BSONSizeT);
-            for (size_t i = 0; i < map_size; ++i)
-            {
-                String key = toValidUTF8String(key_column->getDataAt(offset + i).toString());
-                document_size += countBSONFieldSize(*value_column, value_type, offset + i, key);
-            }
-            document_size += sizeof(BSON_DOCUMENT_END);
-
+            String current_path = path + "." + name;
+            size_t document_size = nested_document_sizes[current_path];
             writeBSONSize(document_size, out);
 
+            WriteBufferFromOwnString buf;
             for (size_t i = 0; i < map_size; ++i)
             {
-                String key = toValidUTF8String(key_column->getDataAt(offset + i).toString());
-                serializeField(*value_column, value_type, offset + i, key);
+                key_type->getDefaultSerialization()->serializeText(*key_column, offset + i, buf, settings);
+                serializeField(*value_column, value_type, offset + i, toValidUTF8String(buf.str(), settings), current_path, nested_document_sizes);
+                buf.restart();
             }
 
             writeChar(BSON_DOCUMENT_END, out);
@@ -498,15 +512,18 @@ void BSONEachRowRowOutputFormat::write(const Columns & columns, size_t row_num)
 {
     /// We should calculate and write document size before its content
     size_t document_size = sizeof(BSONSizeT);
+    /// Remember calculated sizes for nested documents (map document path -> size), so we won't need
+    /// to recalculate it while serializing.
+    std::unordered_map<String, size_t> nested_document_sizes;
     for (size_t i = 0; i != columns.size(); ++i)
-        document_size += countBSONFieldSize(*columns[i], fields[i].type, row_num, fields[i].name);
+        document_size += countBSONFieldSize(*columns[i], fields[i].type, row_num, fields[i].name, "$", nested_document_sizes);
     document_size += sizeof(BSON_DOCUMENT_END);
 
     size_t document_start = out.count();
     writeBSONSize(document_size, out);
 
     for (size_t i = 0; i != columns.size(); ++i)
-        serializeField(*columns[i], fields[i].type, row_num, fields[i].name);
+        serializeField(*columns[i], fields[i].type, row_num, fields[i].name, "$", nested_document_sizes);
 
     writeChar(BSON_DOCUMENT_END, out);
 
diff --git a/src/Processors/Formats/Impl/BSONEachRowRowOutputFormat.h b/src/Processors/Formats/Impl/BSONEachRowRowOutputFormat.h
index d6fcd38c841..d885cd497af 100644
--- a/src/Processors/Formats/Impl/BSONEachRowRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/BSONEachRowRowOutputFormat.h
@@ -17,8 +17,8 @@ namespace DB
  *
  * ClickHouse type         | BSON Type
  * Bool                    | \x08 boolean
- * Int8/UInt8              | \x10 int32
- * Int16UInt16             | \x10 int32
+ * Int8/UInt8/Enum8        | \x10 int32
+ * Int16UInt16/Enum16      | \x10 int32
  * Int32                   | \x10 int32
  * UInt32                  | \x12 int64
  * Int64                   | \x12 int64
@@ -38,7 +38,7 @@ namespace DB
  * Array                   | \x04 array
  * Tuple                   | \x04 array
  * Named Tuple             | \x03 document
- * Map (with String keys)  | \x03 document
+ * Map                     | \x03 document
  *
  * Note: on Big-Endian platforms this format will not work properly.
  */
@@ -55,12 +55,24 @@ private:
     void write(const Columns & columns, size_t row_num) override;
     void writeField(const IColumn &, const ISerialization &, size_t) override { }
 
-    void serializeField(const IColumn & column, const DataTypePtr & data_type, size_t row_num, const String & name);
+    void serializeField(
+        const IColumn & column,
+        const DataTypePtr & data_type,
+        size_t row_num,
+        const String & name,
+        const String & path,
+        std::unordered_map<String, size_t> & nested_document_sizes);
 
     /// Count field size in bytes that we will get after serialization in BSON format.
     /// It's needed to calculate document size before actual serialization,
     /// because in BSON format we should write the size of the document before its content.
-    size_t countBSONFieldSize(const IColumn & column, const DataTypePtr & data_type, size_t row_num, const String & name);
+    size_t countBSONFieldSize(
+        const IColumn & column,
+        const DataTypePtr & data_type,
+        size_t row_num,
+        const String & name,
+        const String & path,
+        std::unordered_map<String, size_t> & nested_document_sizes);
 
     NamesAndTypes fields;
     FormatSettings settings;
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
index aef54516627..19b2dcccf64 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
@@ -26,7 +26,6 @@
 #include <arrow/util/decimal.h>
 
 #define FOR_INTERNAL_NUMERIC_TYPES(M) \
-        M(UInt8, arrow::UInt8Builder) \
         M(Int8, arrow::Int8Builder) \
         M(UInt16, arrow::UInt16Builder) \
         M(Int16, arrow::Int16Builder) \
@@ -65,8 +64,10 @@ namespace DB
     {
         {"UInt8", arrow::uint8()},
         {"Int8", arrow::int8()},
+        {"Enum8", arrow::int8()},
         {"UInt16", arrow::uint16()},
         {"Int16", arrow::int16()},
+        {"Enum16", arrow::int16()},
         {"UInt32", arrow::uint32()},
         {"Int32", arrow::int32()},
         {"UInt64", arrow::uint64()},
@@ -80,6 +81,11 @@ namespace DB
 
         {"String", arrow::binary()},
         {"FixedString", arrow::binary()},
+
+        {"Int128", arrow::fixed_size_binary(sizeof(Int128))},
+        {"UInt128", arrow::fixed_size_binary(sizeof(UInt128))},
+        {"Int256", arrow::fixed_size_binary(sizeof(Int256))},
+        {"UInt256", arrow::fixed_size_binary(sizeof(UInt256))},
     };
 
 
@@ -148,7 +154,7 @@ namespace DB
     }
 
     static void fillArrowArrayWithDateTime64ColumnData(
-        const DataTypeDateTime64 * type,
+        const DataTypePtr & type,
         ColumnPtr write_column,
         const PaddedPODArray<UInt8> * null_bytemap,
         const String & format_name,
@@ -156,11 +162,12 @@ namespace DB
         size_t start,
         size_t end)
     {
+        const auto * datetime64_type = assert_cast<const DataTypeDateTime64 *>(type.get());
         const auto & column = assert_cast<const ColumnDecimal<DateTime64> &>(*write_column);
         arrow::TimestampBuilder & builder = assert_cast<arrow::TimestampBuilder &>(*array_builder);
         arrow::Status status;
 
-        auto scale = type->getScale();
+        auto scale = datetime64_type->getScale();
         bool need_rescale = scale % 3;
         auto rescale_multiplier = DecimalUtils::scaleMultiplier<DateTime64::NativeType>(3 - scale % 3);
         for (size_t value_i = start; value_i < end; ++value_i)
@@ -186,7 +193,7 @@ namespace DB
     static void fillArrowArray(
         const String & column_name,
         ColumnPtr & column,
-        const std::shared_ptr<const IDataType> & column_type,
+        const DataTypePtr & column_type,
         const PaddedPODArray<UInt8> * null_bytemap,
         arrow::ArrayBuilder * array_builder,
         String format_name,
@@ -194,13 +201,13 @@ namespace DB
         size_t end,
         bool output_string_as_string,
         bool output_fixed_string_as_fixed_byte_array,
-        std::unordered_map<String, std::shared_ptr<arrow::Array>> & dictionary_values);
+        std::unordered_map<String, MutableColumnPtr> & dictionary_values);
 
     template <typename Builder>
     static void fillArrowArrayWithArrayColumnData(
         const String & column_name,
         ColumnPtr & column,
-        const std::shared_ptr<const IDataType> & column_type,
+        const DataTypePtr & column_type,
         const PaddedPODArray<UInt8> * null_bytemap,
         arrow::ArrayBuilder * array_builder,
         String format_name,
@@ -208,7 +215,7 @@ namespace DB
         size_t end,
         bool output_string_as_string,
         bool output_fixed_string_as_fixed_byte_array,
-        std::unordered_map<String, std::shared_ptr<arrow::Array>> & dictionary_values)
+        std::unordered_map<String, MutableColumnPtr> & dictionary_values)
     {
         const auto * column_array = assert_cast<const ColumnArray *>(column.get());
         ColumnPtr nested_column = column_array->getDataPtr();
@@ -231,7 +238,7 @@ namespace DB
     static void fillArrowArrayWithTupleColumnData(
         const String & column_name,
         ColumnPtr & column,
-        const std::shared_ptr<const IDataType> & column_type,
+        const DataTypePtr & column_type,
         const PaddedPODArray<UInt8> * null_bytemap,
         arrow::ArrayBuilder * array_builder,
         String format_name,
@@ -239,7 +246,7 @@ namespace DB
         size_t end,
         bool output_string_as_string,
         bool output_fixed_string_as_fixed_byte_array,
-        std::unordered_map<String, std::shared_ptr<arrow::Array>> & dictionary_values)
+        std::unordered_map<String, MutableColumnPtr> & dictionary_values)
     {
         const auto * column_tuple = assert_cast<const ColumnTuple *>(column.get());
         const auto * type_tuple = assert_cast<const DataTypeTuple *>(column_type.get());
@@ -270,7 +277,7 @@ namespace DB
     }
 
     template<typename T>
-    static PaddedPODArray<Int64> extractIndexesImpl(ColumnPtr column, size_t start, size_t end, bool shift)
+    static PaddedPODArray<Int64> extractIndexes(ColumnPtr column, size_t start, size_t end, bool shift)
     {
         const PaddedPODArray<T> & data = assert_cast<const ColumnVector<T> *>(column.get())->getData();
         PaddedPODArray<Int64> result;
@@ -282,28 +289,74 @@ namespace DB
         return result;
     }
 
-    static PaddedPODArray<Int64> extractIndexesImpl(ColumnPtr column, size_t start, size_t end, bool shift)
+    static PaddedPODArray<Int64> extractIndexes(ColumnPtr column, size_t start, size_t end, bool shift)
     {
         switch (column->getDataType())
         {
             case TypeIndex::UInt8:
-                return extractIndexesImpl<UInt8>(column, start, end, shift);
+                return extractIndexes<UInt8>(column, start, end, shift);
             case TypeIndex::UInt16:
-                return extractIndexesImpl<UInt16>(column, start, end, shift);
+                return extractIndexes<UInt16>(column, start, end, shift);
             case TypeIndex::UInt32:
-                return extractIndexesImpl<UInt32>(column, start, end, shift);
+                return extractIndexes<UInt32>(column, start, end, shift);
             case TypeIndex::UInt64:
-                return extractIndexesImpl<UInt64>(column, start, end, shift);
+                return extractIndexes<UInt64>(column, start, end, shift);
             default:
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Indexes column must be ColumnUInt, got {}.", column->getName());
         }
     }
 
+    template <typename IndexesType, typename MappingType>
+    static PaddedPODArray<Int64> extractIndexesWithRemapping(ColumnPtr indexes, ColumnPtr mapping, size_t start, size_t end, bool shift)
+    {
+        const PaddedPODArray<IndexesType> & indexes_data = assert_cast<const ColumnVector<IndexesType> *>(indexes.get())->getData();
+        const PaddedPODArray<MappingType> & mapping_data = assert_cast<const ColumnVector<MappingType> *>(mapping.get())->getData();
+        PaddedPODArray<Int64> result;
+        result.reserve(end - start);
+        std::transform(indexes_data.begin() + start, indexes_data.begin() + end, std::back_inserter(result), [&](IndexesType value) { return mapping_data[Int64(value)] - shift; });
+        return result;
+    }
+
+    template <typename IndexesType>
+    static PaddedPODArray<Int64> extractIndexesWithRemapping(ColumnPtr indexes, ColumnPtr mapping, size_t start, size_t end, bool shift)
+    {
+        switch (mapping->getDataType())
+        {
+            case TypeIndex::UInt8:
+                return extractIndexesWithRemapping<IndexesType, UInt8>(indexes, mapping, start, end, shift);
+            case TypeIndex::UInt16:
+                return extractIndexesWithRemapping<IndexesType, UInt16>(indexes, mapping, start, end, shift);
+            case TypeIndex::UInt32:
+                return extractIndexesWithRemapping<IndexesType, UInt32>(indexes, mapping, start, end, shift);
+            case TypeIndex::UInt64:
+                return extractIndexesWithRemapping<IndexesType, UInt64>(indexes, mapping, start, end, shift);
+            default:
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Indexes column must be ColumnUInt, got {}.", indexes->getName());
+        }
+    }
+
+    static PaddedPODArray<Int64> extractIndexesWithRemapping(ColumnPtr indexes, ColumnPtr mapping, size_t start, size_t end, bool shift)
+    {
+        switch (indexes->getDataType())
+        {
+            case TypeIndex::UInt8:
+                return extractIndexesWithRemapping<UInt8>(indexes, mapping, start, end, shift);
+            case TypeIndex::UInt16:
+                return extractIndexesWithRemapping<UInt16>(indexes, mapping, start, end, shift);
+            case TypeIndex::UInt32:
+                return extractIndexesWithRemapping<UInt32>(indexes, mapping, start, end, shift);
+            case TypeIndex::UInt64:
+                return extractIndexesWithRemapping<UInt64>(indexes, mapping, start, end, shift);
+            default:
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Indexes column must be ColumnUInt, got {}.", indexes->getName());
+        }
+    }
+
     template<typename ValueType>
     static void fillArrowArrayWithLowCardinalityColumnDataImpl(
         const String & column_name,
         ColumnPtr & column,
-        const std::shared_ptr<const IDataType> & column_type,
+        const DataTypePtr & column_type,
         const PaddedPODArray<UInt8> *,
         arrow::ArrayBuilder * array_builder,
         String format_name,
@@ -311,35 +364,61 @@ namespace DB
         size_t end,
         bool output_string_as_string,
         bool output_fixed_string_as_fixed_byte_array,
-        std::unordered_map<String, std::shared_ptr<arrow::Array>> & dictionary_values)
+        std::unordered_map<String, MutableColumnPtr> & dictionary_values)
     {
         const auto * column_lc = assert_cast<const ColumnLowCardinality *>(column.get());
         arrow::DictionaryBuilder<ValueType> * builder = assert_cast<arrow::DictionaryBuilder<ValueType> *>(array_builder);
         auto & dict_values = dictionary_values[column_name];
         bool is_nullable = column_type->isLowCardinalityNullable();
 
-        /// Convert dictionary from LowCardinality to Arrow dictionary only once and then reuse it.
+        ColumnPtr mapping;
         if (!dict_values)
         {
-            auto value_type = assert_cast<arrow::DictionaryType *>(builder->type().get())->value_type();
-            std::unique_ptr<arrow::ArrayBuilder> values_builder;
-            arrow::MemoryPool* pool = arrow::default_memory_pool();
-            arrow::Status status = MakeBuilder(pool, value_type, &values_builder);
-            checkStatus(status, column->getName(), format_name);
-
-            auto dict_column = column_lc->getDictionary().getNestedNotNullableColumn();
-            const auto & dict_type = removeNullable(assert_cast<const DataTypeLowCardinality *>(column_type.get())->getDictionaryType());
-            fillArrowArray(column_name, dict_column, dict_type, nullptr, values_builder.get(), format_name, is_nullable, dict_column->size(), output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
-            status = values_builder->Finish(&dict_values);
-            checkStatus(status, column->getName(), format_name);
+            /// On first time just remember the first dictionary
+            dict_values = IColumn::mutate(column_lc->getDictionaryPtr());
+        }
+        else
+        {
+            /// In ClickHouse blocks with same header can contain LowCardinality columns with
+            /// different dictionaries.
+            /// Arrow supports only single dictionary for all batches, but it allows to extend
+            /// dictionary if previous dictionary is a prefix of a new one.
+            /// So, if new LowCardinality column has different dictionary
+            /// we extend previous one by using IColumnUnique::uniqueInsertRangeFrom
+            /// and then remap indexes so they match with the new extended dictionary.
+            const auto & new_dict = column_lc->getDictionary();
+            auto & dict = dynamic_cast<IColumnUnique &>(*dict_values);
+            if (dict.getHash() != new_dict.getHash())
+            {
+                const auto & new_values = new_dict.getNestedColumn();
+                mapping = dict.uniqueInsertRangeFrom(*new_values, 0, new_values->size());
+            }
         }
 
-        arrow::Status status = builder->InsertMemoValues(*dict_values);
+        /// Convert dictionary values to arrow array.
+        auto value_type = assert_cast<arrow::DictionaryType *>(builder->type().get())->value_type();
+        std::unique_ptr<arrow::ArrayBuilder> values_builder;
+        arrow::MemoryPool* pool = arrow::default_memory_pool();
+        arrow::Status status = MakeBuilder(pool, value_type, &values_builder);
+        checkStatus(status, column->getName(), format_name);
+
+        auto dict_column = dynamic_cast<IColumnUnique &>(*dict_values).getNestedNotNullableColumn();
+        const auto & dict_type = removeNullable(assert_cast<const DataTypeLowCardinality *>(column_type.get())->getDictionaryType());
+        fillArrowArray(column_name, dict_column, dict_type, nullptr, values_builder.get(), format_name, is_nullable, dict_column->size(), output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
+        std::shared_ptr<arrow::Array> arrow_dict_array;
+        status = values_builder->Finish(&arrow_dict_array);
+        checkStatus(status, column->getName(), format_name);
+
+        status = builder->InsertMemoValues(*arrow_dict_array);
         checkStatus(status, column->getName(), format_name);
 
         /// AppendIndices in DictionaryBuilder works only with int64_t data, so we cannot use
         /// fillArrowArray here and should copy all indexes to int64_t container.
-        auto indexes = extractIndexesImpl(column_lc->getIndexesPtr(), start, end, is_nullable);
+        PaddedPODArray<Int64> indexes;
+        if (mapping)
+            indexes = extractIndexesWithRemapping(column_lc->getIndexesPtr(), mapping, start, end, is_nullable);
+        else
+            indexes = extractIndexes(column_lc->getIndexesPtr(), start, end, is_nullable);
         const uint8_t * arrow_null_bytemap_raw_ptr = nullptr;
         PaddedPODArray<uint8_t> arrow_null_bytemap;
         if (column_type->isLowCardinalityNullable())
@@ -359,7 +438,7 @@ namespace DB
     static void fillArrowArrayWithLowCardinalityColumnData(
         const String & column_name,
         ColumnPtr & column,
-        const std::shared_ptr<const IDataType> & column_type,
+        const DataTypePtr & column_type,
         const PaddedPODArray<UInt8> * null_bytemap,
         arrow::ArrayBuilder * array_builder,
         String format_name,
@@ -367,7 +446,7 @@ namespace DB
         size_t end,
         bool output_string_as_string,
         bool output_fixed_string_as_fixed_byte_array,
-        std::unordered_map<String, std::shared_ptr<arrow::Array>> & dictionary_values)
+        std::unordered_map<String, MutableColumnPtr> & dictionary_values)
     {
         auto value_type = assert_cast<arrow::DictionaryType *>(array_builder->type().get())->value_type();
 
@@ -424,13 +503,50 @@ namespace DB
         const auto & internal_data = internal_column.getChars();
         size_t fixed_length = internal_column.getN();
         arrow::FixedSizeBinaryBuilder & builder = assert_cast<arrow::FixedSizeBinaryBuilder &>(*array_builder);
-        arrow::Status status;
 
         PaddedPODArray<UInt8> arrow_null_bytemap = revertNullByteMap(null_bytemap, start, end);
         const UInt8 * arrow_null_bytemap_raw_ptr = arrow_null_bytemap.empty() ? nullptr : arrow_null_bytemap.data();
 
         const uint8_t * data_start = reinterpret_cast<const uint8_t *>(internal_data.data() + start * fixed_length);
-        status = builder.AppendValues(data_start, end - start, reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
+        arrow::Status status = builder.AppendValues(data_start, end - start, reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
+        checkStatus(status, write_column->getName(), format_name);
+    }
+
+    static void fillArrowArrayWithIPv6ColumnData(
+        ColumnPtr write_column,
+        const PaddedPODArray<UInt8> * null_bytemap,
+        const String & format_name,
+        arrow::ArrayBuilder* array_builder,
+        size_t start,
+        size_t end)
+    {
+        const auto & internal_column = assert_cast<const ColumnIPv6 &>(*write_column);
+        const auto & internal_data = internal_column.getData();
+        size_t fixed_length = sizeof(IPv6);
+        arrow::FixedSizeBinaryBuilder & builder = assert_cast<arrow::FixedSizeBinaryBuilder &>(*array_builder);
+
+        PaddedPODArray<UInt8> arrow_null_bytemap = revertNullByteMap(null_bytemap, start, end);
+        const UInt8 * arrow_null_bytemap_raw_ptr = arrow_null_bytemap.empty() ? nullptr : arrow_null_bytemap.data();
+
+        const uint8_t * data_start = reinterpret_cast<const uint8_t *>(internal_data.data()) + start * fixed_length;
+        arrow::Status status = builder.AppendValues(data_start, end - start, reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
+        checkStatus(status, write_column->getName(), format_name);
+    }
+
+    static void fillArrowArrayWithIPv4ColumnData(
+        ColumnPtr write_column,
+        const PaddedPODArray<UInt8> * null_bytemap,
+        const String & format_name,
+        arrow::ArrayBuilder* array_builder,
+        size_t start,
+        size_t end)
+    {
+        const auto & internal_data = assert_cast<const ColumnIPv4 &>(*write_column).getData();
+        auto & builder = assert_cast<arrow::UInt32Builder &>(*array_builder);
+
+        PaddedPODArray<UInt8> arrow_null_bytemap = revertNullByteMap(null_bytemap, start, end);
+        const UInt8 * arrow_null_bytemap_raw_ptr = arrow_null_bytemap.empty() ? nullptr : arrow_null_bytemap.data();
+        arrow::Status status = builder.AppendValues(&(internal_data.data() + start)->toUnderType(), end - start, reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
         checkStatus(status, write_column->getName(), format_name);
     }
 
@@ -501,126 +617,6 @@ namespace DB
         }
     }
 
-    static void fillArrowArray(
-        const String & column_name,
-        ColumnPtr & column,
-        const std::shared_ptr<const IDataType> & column_type,
-        const PaddedPODArray<UInt8> * null_bytemap,
-        arrow::ArrayBuilder * array_builder,
-        String format_name,
-        size_t start,
-        size_t end,
-        bool output_string_as_string,
-        bool output_fixed_string_as_fixed_byte_array,
-        std::unordered_map<String, std::shared_ptr<arrow::Array>> & dictionary_values)
-    {
-        const String column_type_name = column_type->getFamilyName();
-
-        if (column_type->isNullable())
-        {
-            const ColumnNullable * column_nullable = assert_cast<const ColumnNullable *>(column.get());
-            ColumnPtr nested_column = column_nullable->getNestedColumnPtr();
-            DataTypePtr nested_type = assert_cast<const DataTypeNullable *>(column_type.get())->getNestedType();
-            const ColumnPtr & null_column = column_nullable->getNullMapColumnPtr();
-            const PaddedPODArray<UInt8> & bytemap = assert_cast<const ColumnVector<UInt8> &>(*null_column).getData();
-            fillArrowArray(column_name, nested_column, nested_type, &bytemap, array_builder, format_name, start, end, output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
-        }
-        else if (isString(column_type))
-        {
-            if (output_string_as_string)
-                fillArrowArrayWithStringColumnData<ColumnString, arrow::StringBuilder>(column, null_bytemap, format_name, array_builder, start, end);
-            else
-                fillArrowArrayWithStringColumnData<ColumnString, arrow::BinaryBuilder>(column, null_bytemap, format_name, array_builder, start, end);
-        }
-        else if (isFixedString(column_type))
-        {
-            if (output_fixed_string_as_fixed_byte_array)
-                fillArrowArrayWithFixedStringColumnData(column, null_bytemap, format_name, array_builder, start, end);
-            else if (output_string_as_string)
-                fillArrowArrayWithStringColumnData<ColumnFixedString, arrow::StringBuilder>(column, null_bytemap, format_name, array_builder, start, end);
-            else
-                fillArrowArrayWithStringColumnData<ColumnFixedString, arrow::BinaryBuilder>(column, null_bytemap, format_name, array_builder, start, end);
-        }
-        else if (isDate(column_type))
-        {
-            fillArrowArrayWithDateColumnData(column, null_bytemap, format_name, array_builder, start, end);
-        }
-        else if (isDateTime(column_type))
-        {
-            fillArrowArrayWithDateTimeColumnData(column, null_bytemap, format_name, array_builder, start, end);
-        }
-        else if (isDate32(column_type))
-        {
-            fillArrowArrayWithDate32ColumnData(column, null_bytemap, format_name, array_builder, start, end);
-        }
-        else if (isArray(column_type))
-        {
-            fillArrowArrayWithArrayColumnData<arrow::ListBuilder>(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
-        }
-        else if (isTuple(column_type))
-        {
-            fillArrowArrayWithTupleColumnData(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
-        }
-        else if (column_type->getTypeId() == TypeIndex::LowCardinality)
-        {
-            fillArrowArrayWithLowCardinalityColumnData(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
-        }
-        else if (isMap(column_type))
-        {
-            ColumnPtr column_array = assert_cast<const ColumnMap *>(column.get())->getNestedColumnPtr();
-            DataTypePtr array_type = assert_cast<const DataTypeMap *>(column_type.get())->getNestedType();
-            fillArrowArrayWithArrayColumnData<arrow::MapBuilder>(column_name, column_array, array_type, null_bytemap, array_builder, format_name, start, end, output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
-        }
-        else if (isDecimal(column_type))
-        {
-            auto fill_decimal = [&](const auto & types) -> bool
-            {
-                using Types = std::decay_t<decltype(types)>;
-                using ToDataType = typename Types::LeftType;
-                if constexpr (
-                    std::is_same_v<ToDataType,DataTypeDecimal<Decimal32>>
-                    || std::is_same_v<ToDataType, DataTypeDecimal<Decimal64>>
-                    || std::is_same_v<ToDataType, DataTypeDecimal<Decimal128>>)
-                {
-                    fillArrowArrayWithDecimalColumnData<ToDataType, Int128, arrow::Decimal128, arrow::Decimal128Builder>(column, null_bytemap, array_builder, format_name, start, end);
-                    return true;
-                }
-                if constexpr (std::is_same_v<ToDataType,DataTypeDecimal<Decimal256>>)
-                {
-                    fillArrowArrayWithDecimalColumnData<ToDataType, Int256, arrow::Decimal256, arrow::Decimal256Builder>(column, null_bytemap, array_builder, format_name, start, end);
-                    return true;
-                }
-
-                return false;
-            };
-
-            if (!callOnIndexAndDataType<void>(column_type->getTypeId(), fill_decimal))
-                throw Exception{ErrorCodes::LOGICAL_ERROR, "Cannot fill arrow array with decimal data with type {}", column_type_name};
-        }
-        else if (isDateTime64(column_type))
-        {
-            const auto * datetime64_type = assert_cast<const DataTypeDateTime64 *>(column_type.get());
-            fillArrowArrayWithDateTime64ColumnData(datetime64_type, column, null_bytemap, format_name, array_builder, start, end);
-        }
-        else if (isBool(column_type))
-        {
-            fillArrowArrayWithBoolColumnData(column, null_bytemap, format_name, array_builder, start, end);
-        }
-    #define DISPATCH(CPP_NUMERIC_TYPE, ARROW_BUILDER_TYPE) \
-        else if (#CPP_NUMERIC_TYPE == column_type_name) \
-        { \
-            fillArrowArrayWithNumericColumnData<CPP_NUMERIC_TYPE, ARROW_BUILDER_TYPE>(column, null_bytemap, format_name, array_builder, start, end); \
-        }
-
-        FOR_INTERNAL_NUMERIC_TYPES(DISPATCH)
-    #undef DISPATCH
-        else
-        {
-            throw Exception(ErrorCodes::UNKNOWN_TYPE,
-                    "Internal type '{}' of a column '{}' is not supported for conversion into {} data format.", column_type_name, column_name, format_name);
-        }
-    }
-
     template <typename DataType, typename FieldType, typename ArrowDecimalType, typename ArrowBuilder>
     static void fillArrowArrayWithDecimalColumnData(
         ColumnPtr write_column,
@@ -649,6 +645,157 @@ namespace DB
         checkStatus(status, write_column->getName(), format_name);
     }
 
+    template <typename ColumnType>
+    static void fillArrowArrayWithBigIntegerColumnData(
+        ColumnPtr write_column,
+        const PaddedPODArray<UInt8> * null_bytemap,
+        const String & format_name,
+        arrow::ArrayBuilder* array_builder,
+        size_t start,
+        size_t end)
+    {
+        const auto & internal_column = assert_cast<const ColumnType &>(*write_column);
+        const auto & internal_data = internal_column.getData();
+        size_t fixed_length = sizeof(typename ColumnType::ValueType);
+        arrow::FixedSizeBinaryBuilder & builder = assert_cast<arrow::FixedSizeBinaryBuilder &>(*array_builder);
+
+        PaddedPODArray<UInt8> arrow_null_bytemap = revertNullByteMap(null_bytemap, start, end);
+        const UInt8 * arrow_null_bytemap_raw_ptr = arrow_null_bytemap.empty() ? nullptr : arrow_null_bytemap.data();
+
+        const uint8_t * data_start = reinterpret_cast<const uint8_t *>(internal_data.data()) + start * fixed_length;
+        arrow::Status status = builder.AppendValues(data_start, end - start, reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
+        checkStatus(status, write_column->getName(), format_name);
+    }
+
+    static void fillArrowArray(
+        const String & column_name,
+        ColumnPtr & column,
+        const DataTypePtr & column_type,
+        const PaddedPODArray<UInt8> * null_bytemap,
+        arrow::ArrayBuilder * array_builder,
+        String format_name,
+        size_t start,
+        size_t end,
+        bool output_string_as_string,
+        bool output_fixed_string_as_fixed_byte_array,
+        std::unordered_map<String, MutableColumnPtr> & dictionary_values)
+    {
+        const String column_type_name = column_type->getFamilyName();
+        WhichDataType which(column_type);
+
+        switch (column_type->getTypeId())
+        {
+            case TypeIndex::Nullable:
+            {
+                const ColumnNullable * column_nullable = assert_cast<const ColumnNullable *>(column.get());
+                ColumnPtr nested_column = column_nullable->getNestedColumnPtr();
+                DataTypePtr nested_type = assert_cast<const DataTypeNullable *>(column_type.get())->getNestedType();
+                const ColumnPtr & null_column = column_nullable->getNullMapColumnPtr();
+                const PaddedPODArray<UInt8> & bytemap = assert_cast<const ColumnVector<UInt8> &>(*null_column).getData();
+                fillArrowArray(column_name, nested_column, nested_type, &bytemap, array_builder, format_name, start, end, output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
+                break;
+            }
+            case TypeIndex::String:
+            {
+                if (output_string_as_string)
+                    fillArrowArrayWithStringColumnData<ColumnString, arrow::StringBuilder>(column, null_bytemap, format_name, array_builder, start, end);
+                else
+                    fillArrowArrayWithStringColumnData<ColumnString, arrow::BinaryBuilder>(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            }
+            case TypeIndex::FixedString:
+            {
+                if (output_fixed_string_as_fixed_byte_array)
+                    fillArrowArrayWithFixedStringColumnData(column, null_bytemap, format_name, array_builder, start, end);
+                else if (output_string_as_string)
+                    fillArrowArrayWithStringColumnData<ColumnFixedString, arrow::StringBuilder>(column, null_bytemap, format_name, array_builder, start, end);
+                else
+                    fillArrowArrayWithStringColumnData<ColumnFixedString, arrow::BinaryBuilder>(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            }
+            case TypeIndex::IPv6:
+                fillArrowArrayWithIPv6ColumnData(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::IPv4:
+                fillArrowArrayWithIPv4ColumnData(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::Date:
+                fillArrowArrayWithDateColumnData(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::DateTime:
+                fillArrowArrayWithDateTimeColumnData(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::Date32:
+                fillArrowArrayWithDate32ColumnData(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::Array:
+                fillArrowArrayWithArrayColumnData<arrow::ListBuilder>(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
+                break;
+            case TypeIndex::Tuple:
+                fillArrowArrayWithTupleColumnData(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
+                break;
+            case TypeIndex::LowCardinality:
+                fillArrowArrayWithLowCardinalityColumnData(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
+                break;
+            case TypeIndex::Map:
+            {
+                ColumnPtr column_array = assert_cast<const ColumnMap *>(column.get())->getNestedColumnPtr();
+                DataTypePtr array_type = assert_cast<const DataTypeMap *>(column_type.get())->getNestedType();
+                fillArrowArrayWithArrayColumnData<arrow::MapBuilder>(column_name, column_array, array_type, null_bytemap, array_builder, format_name, start, end, output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
+                break;
+            }
+            case TypeIndex::Decimal32:
+                fillArrowArrayWithDecimalColumnData<DataTypeDecimal32, Int128, arrow::Decimal128, arrow::Decimal128Builder>(column, null_bytemap, array_builder, format_name, start, end);
+                break;
+            case TypeIndex::Decimal64:
+                fillArrowArrayWithDecimalColumnData<DataTypeDecimal64, Int128, arrow::Decimal128, arrow::Decimal128Builder>(column, null_bytemap, array_builder, format_name, start, end);
+                break;
+            case TypeIndex::Decimal128:
+                fillArrowArrayWithDecimalColumnData<DataTypeDecimal128, Int128, arrow::Decimal128, arrow::Decimal128Builder>(column, null_bytemap, array_builder, format_name, start, end);
+                break;
+            case TypeIndex::Decimal256:
+                fillArrowArrayWithDecimalColumnData<DataTypeDecimal256, Int256, arrow::Decimal256, arrow::Decimal256Builder>(column, null_bytemap, array_builder, format_name, start, end);
+                break;
+            case TypeIndex::DateTime64:
+                fillArrowArrayWithDateTime64ColumnData(column_type, column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::UInt8:
+            {
+                if (isBool(column_type))
+                    fillArrowArrayWithBoolColumnData(column, null_bytemap, format_name, array_builder, start, end);
+                else
+                    fillArrowArrayWithNumericColumnData<UInt8, arrow::UInt8Builder>(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            }
+            case TypeIndex::Enum8:
+                fillArrowArrayWithNumericColumnData<Int8, arrow::Int8Builder>(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::Enum16:
+                fillArrowArrayWithNumericColumnData<Int16, arrow::Int16Builder>(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::Int128:
+                fillArrowArrayWithBigIntegerColumnData<ColumnInt128>(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::UInt128:
+                fillArrowArrayWithBigIntegerColumnData<ColumnUInt128>(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::Int256:
+                fillArrowArrayWithBigIntegerColumnData<ColumnInt256>(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+            case TypeIndex::UInt256:
+                fillArrowArrayWithBigIntegerColumnData<ColumnUInt256>(column, null_bytemap, format_name, array_builder, start, end);
+                break;
+#define DISPATCH(CPP_NUMERIC_TYPE, ARROW_BUILDER_TYPE) \
+            case TypeIndex::CPP_NUMERIC_TYPE: \
+                fillArrowArrayWithNumericColumnData<CPP_NUMERIC_TYPE, ARROW_BUILDER_TYPE>(column, null_bytemap, format_name, array_builder, start, end); \
+                break;
+                FOR_INTERNAL_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+            default:
+                throw Exception(ErrorCodes::UNKNOWN_TYPE, "Internal type '{}' of a column '{}' is not supported for conversion into {} data format.", column_type_name, column_name, format_name);
+        }
+    }
+
     static std::shared_ptr<arrow::DataType> getArrowTypeForLowCardinalityIndexes(ColumnPtr indexes_column)
     {
         /// Arrow docs recommend preferring signed integers over unsigned integers for representing dictionary indices.
@@ -781,6 +928,12 @@ namespace DB
         if (isBool(column_type))
             return arrow::boolean();
 
+        if (isIPv6(column_type))
+            return arrow::fixed_size_binary(sizeof(IPv6));
+
+        if (isIPv4(column_type))
+            return arrow::uint32();
+
         const std::string type_name = column_type->getFamilyName();
         if (const auto * arrow_type_it = std::find_if(
                 internal_type_to_arrow_type.begin(),
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.h b/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
index 62fdcaa8086..3649d0eed9b 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
@@ -26,7 +26,7 @@ private:
     /// Map {column name : arrow dictionary}.
     /// To avoid converting dictionary from LowCardinality to Arrow
     /// Dictionary every chunk we save it and reuse.
-    std::unordered_map<std::string, std::shared_ptr<arrow::Array>> dictionary_values;
+    std::unordered_map<std::string, MutableColumnPtr> dictionary_values;
 
     /// We should initialize arrow fields on first call of chChunkToArrowTable, not in constructor
     /// because LowCardinality column from header always has indexes type UInt8, so, we should get
diff --git a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
index 58ace9cfca5..2f84e9bde3c 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
@@ -16,6 +16,7 @@
 #include <Columns/ColumnLowCardinality.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnMap.h>
 
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeArray.h>
@@ -23,6 +24,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeMap.h>
 
 namespace DB
 {
@@ -80,22 +82,39 @@ kj::Array<capnp::word> CapnProtoRowInputFormat::readMessage()
     return msg;
 }
 
-static void insertSignedInteger(IColumn & column, const DataTypePtr & column_type, Int64 value)
+static void insertInteger(IColumn & column, const DataTypePtr & column_type, UInt64 value)
 {
     switch (column_type->getTypeId())
     {
         case TypeIndex::Int8:
             assert_cast<ColumnInt8 &>(column).insertValue(value);
             break;
+        case TypeIndex::UInt8:
+            assert_cast<ColumnUInt8 &>(column).insertValue(value);
+            break;
         case TypeIndex::Int16:
             assert_cast<ColumnInt16 &>(column).insertValue(value);
             break;
+        case TypeIndex::Date: [[fallthrough]];
+        case TypeIndex::UInt16:
+            assert_cast<ColumnUInt16 &>(column).insertValue(value);
+            break;
         case TypeIndex::Int32:
             assert_cast<ColumnInt32 &>(column).insertValue(static_cast<Int32>(value));
             break;
+        case TypeIndex::DateTime: [[fallthrough]];
+        case TypeIndex::UInt32:
+            assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(value));
+            break;
+        case TypeIndex::IPv4:
+            assert_cast<ColumnIPv4 &>(column).insertValue(IPv4(static_cast<UInt32>(value)));
+            break;
         case TypeIndex::Int64:
             assert_cast<ColumnInt64 &>(column).insertValue(value);
             break;
+        case TypeIndex::UInt64:
+            assert_cast<ColumnUInt64 &>(column).insertValue(value);
+            break;
         case TypeIndex::DateTime64:
             assert_cast<ColumnDecimal<DateTime64> &>(column).insertValue(value);
             break;
@@ -106,30 +125,7 @@ static void insertSignedInteger(IColumn & column, const DataTypePtr & column_typ
             assert_cast<ColumnDecimal<Decimal64> &>(column).insertValue(value);
             break;
         default:
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Column type is not a signed integer.");
-    }
-}
-
-static void insertUnsignedInteger(IColumn & column, const DataTypePtr & column_type, UInt64 value)
-{
-    switch (column_type->getTypeId())
-    {
-        case TypeIndex::UInt8:
-            assert_cast<ColumnUInt8 &>(column).insertValue(value);
-            break;
-        case TypeIndex::Date: [[fallthrough]];
-        case TypeIndex::UInt16:
-            assert_cast<ColumnUInt16 &>(column).insertValue(value);
-            break;
-        case TypeIndex::DateTime: [[fallthrough]];
-        case TypeIndex::UInt32:
-            assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(value));
-            break;
-        case TypeIndex::UInt64:
-            assert_cast<ColumnUInt64 &>(column).insertValue(value);
-            break;
-        default:
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Column type is not an unsigned integer.");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Column type {} cannot be parsed from integer", column_type->getName());
     }
 }
 
@@ -149,8 +145,11 @@ static void insertFloat(IColumn & column, const DataTypePtr & column_type, Float
 }
 
 template <typename Value>
-static void insertString(IColumn & column, Value value)
+static void insertData(IColumn & column, const DataTypePtr & column_type, Value value)
 {
+    if (column_type->haveMaximumSizeOfValue() && value.size() != column_type->getSizeOfValueInMemory())
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected size of {} value: {}", column_type->getName(), value.size());
+
     column.insertData(reinterpret_cast<const char *>(value.begin()), value.size());
 }
 
@@ -163,10 +162,10 @@ static void insertEnum(IColumn & column, const DataTypePtr & column_type, const
     switch (enum_comparing_mode)
     {
         case FormatSettings::EnumComparingMode::BY_VALUES:
-            insertSignedInteger(column, nested_type, Int64(enumerant.getOrdinal()));
+            insertInteger(column, nested_type, Int64(enumerant.getOrdinal()));
             return;
         case FormatSettings::EnumComparingMode::BY_NAMES:
-            insertSignedInteger(column, nested_type, Int64(enum_type->getValue(String(enumerant.getProto().getName()))));
+            insertInteger(column, nested_type, Int64(enum_type->getValue(String(enumerant.getProto().getName()))));
             return;
         case FormatSettings::EnumComparingMode::BY_NAMES_CASE_INSENSITIVE:
         {
@@ -176,7 +175,7 @@ static void insertEnum(IColumn & column, const DataTypePtr & column_type, const
             {
                 if (compareEnumNames(name, enum_name, enum_comparing_mode))
                 {
-                    insertSignedInteger(column, nested_type, Int64(enum_type->getValue(name)));
+                    insertInteger(column, nested_type, Int64(enum_type->getValue(name)));
                     break;
                 }
             }
@@ -199,22 +198,22 @@ static void insertValue(IColumn & column, const DataTypePtr & column_type, const
     switch (value.getType())
     {
         case capnp::DynamicValue::Type::INT:
-            insertSignedInteger(column, column_type, value.as<Int64>());
+            insertInteger(column, column_type, value.as<Int64>());
             break;
         case capnp::DynamicValue::Type::UINT:
-            insertUnsignedInteger(column, column_type, value.as<UInt64>());
+            insertInteger(column, column_type, value.as<UInt64>());
             break;
         case capnp::DynamicValue::Type::FLOAT:
             insertFloat(column, column_type, value.as<Float64>());
             break;
         case capnp::DynamicValue::Type::BOOL:
-            insertUnsignedInteger(column, column_type, UInt64(value.as<bool>()));
+            insertInteger(column, column_type, UInt64(value.as<bool>()));
             break;
         case capnp::DynamicValue::Type::DATA:
-            insertString(column, value.as<capnp::Data>());
+            insertData(column, column_type, value.as<capnp::Data>());
             break;
         case capnp::DynamicValue::Type::TEXT:
-            insertString(column, value.as<capnp::Text>());
+            insertData(column, column_type, value.as<capnp::Text>());
             break;
         case capnp::DynamicValue::Type::ENUM:
             if (column_type->getTypeId() == TypeIndex::Enum8)
@@ -257,14 +256,26 @@ static void insertValue(IColumn & column, const DataTypePtr & column_type, const
             {
                 auto & tuple_column = assert_cast<ColumnTuple &>(column);
                 const auto * tuple_type = assert_cast<const DataTypeTuple *>(column_type.get());
-                for (size_t i = 0; i != tuple_column.tupleSize(); ++i)
+                bool have_explicit_names = tuple_type->haveExplicitNames();
+                auto struct_schema = struct_value.getSchema();
+                for (uint32_t i = 0; i != tuple_column.tupleSize(); ++i)
                     insertValue(
                         tuple_column.getColumn(i),
                         tuple_type->getElements()[i],
                         tuple_type->getElementNames()[i],
-                        struct_value.get(tuple_type->getElementNames()[i]),
+                        struct_value.get(have_explicit_names ? struct_schema.getFieldByName(tuple_type->getElementNames()[i]) : struct_schema.getFields()[i]),
                         enum_comparing_mode);
             }
+            else if (isMap(column_type))
+            {
+                const auto & map_type = assert_cast<const DataTypeMap &>(*column_type);
+                DataTypes key_value_types = {map_type.getKeyType(), map_type.getValueType()};
+                Names key_value_names = {"key", "value"};
+                auto entries_type = std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(key_value_types, key_value_names));
+                auto & entries_column = assert_cast<ColumnMap &>(column).getNestedColumn();
+                auto entries_field = struct_value.getSchema().getFields()[0];
+                insertValue(entries_column, entries_type, column_name, struct_value.get(entries_field), enum_comparing_mode);
+            }
             else
             {
                 /// It can be nested column from Nested type.
diff --git a/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp b/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp
index dcbd5db5f9b..0225680b396 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp
@@ -14,12 +14,14 @@
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnLowCardinality.h>
 #include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnMap.h>
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeMap.h>
 
 namespace DB
 {
@@ -111,7 +113,12 @@ static std::optional<capnp::DynamicValue::Reader> convertToDynamicValue(
         case capnp::DynamicValue::Type::INT:
             return capnp::DynamicValue::Reader(column->getInt(row_num));
         case capnp::DynamicValue::Type::UINT:
+        {
+            /// IPv4 column doesn't support getUInt method.
+            if (isIPv4(data_type))
+                return capnp::DynamicValue::Reader(assert_cast<const ColumnIPv4 *>(column.get())->getElement(row_num));
             return capnp::DynamicValue::Reader(column->getUInt(row_num));
+        }
         case capnp::DynamicValue::Type::BOOL:
             return capnp::DynamicValue::Reader(column->getBool(row_num));
         case capnp::DynamicValue::Type::FLOAT:
@@ -172,18 +179,46 @@ static std::optional<capnp::DynamicValue::Reader> convertToDynamicValue(
             else if (isTuple(data_type))
             {
                 const auto * tuple_data_type = assert_cast<const DataTypeTuple *>(data_type.get());
-                auto nested_types = tuple_data_type->getElements();
+                const auto & nested_types = tuple_data_type->getElements();
+                const auto & nested_names = tuple_data_type->getElementNames();
                 const auto & nested_columns = assert_cast<const ColumnTuple *>(column.get())->getColumns();
-                for (const auto & name : tuple_data_type->getElementNames())
+                bool have_explicit_names = tuple_data_type->haveExplicitNames();
+                for (uint32_t i = 0; i != nested_names.size(); ++i)
                 {
-                    auto pos = tuple_data_type->getPositionByName(name);
-                    auto field_builder
-                        = initStructFieldBuilder(nested_columns[pos], row_num, struct_builder, nested_struct_schema.getFieldByName(name));
-                    auto value = convertToDynamicValue(nested_columns[pos], nested_types[pos], row_num, column_name, field_builder, enum_comparing_mode, temporary_text_data_storage);
+                    capnp::StructSchema::Field nested_field = have_explicit_names ? nested_struct_schema.getFieldByName(nested_names[i]) : nested_struct_schema.getFields()[i];
+                    auto field_builder = initStructFieldBuilder(nested_columns[i], row_num, struct_builder, nested_field);
+                    auto value = convertToDynamicValue(nested_columns[i], nested_types[i], row_num, nested_names[i], field_builder, enum_comparing_mode, temporary_text_data_storage);
                     if (value)
-                        struct_builder.set(name, *value);
+                        struct_builder.set(nested_field, *value);
                 }
             }
+            else if (isMap(data_type))
+            {
+                /// We output Map type as follow CapnProto schema
+                ///
+                /// struct Map {
+                ///     struct Entry {
+                ///         key @0: Key;
+                ///         value @1: Value;
+                ///     }
+                ///     entries @0 :List(Entry);
+                /// }
+                ///
+                /// And we don't need to check that struct have this form here because we checked it before.
+                const auto & map_type = assert_cast<const DataTypeMap &>(*data_type);
+                DataTypes key_value_types = {map_type.getKeyType(), map_type.getValueType()};
+                Names key_value_names = {"key", "value"};
+                auto entries_type = std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(key_value_types, key_value_names));
+
+                /// Nested column in Map is actually Array(Tuple), so we can output it according to "entries" field schema.
+                const auto & entries_column = assert_cast<const ColumnMap *>(column.get())->getNestedColumnPtr();
+
+                auto entries_field = nested_struct_schema.getFields()[0];
+                auto field_builder = initStructFieldBuilder(entries_column, row_num, struct_builder, entries_field);
+                auto entries_value = convertToDynamicValue(entries_column, entries_type, row_num, column_name, field_builder, enum_comparing_mode, temporary_text_data_storage);
+                if (entries_value)
+                    struct_builder.set(entries_field, *entries_value);
+            }
             else
             {
                 /// It can be nested column from Nested type.
diff --git a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
index 6f73ede5d4d..1c2efe3a41d 100644
--- a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
@@ -44,7 +44,7 @@ CustomSeparatedRowInputFormat::CustomSeparatedRowInputFormat(
         format_settings_,
         std::make_unique<CustomSeparatedFormatReader>(*buf_, ignore_spaces_, format_settings_),
         format_settings_.custom.try_detect_header)
-    , buf(std::move(buf_))
+    , buf(std::move(buf_)), ignore_spaces(ignore_spaces_)
 {
     /// In case of CustomSeparatedWithNames(AndTypes) formats and enabled setting input_format_with_names_use_header we don't know
     /// the exact number of columns in data (because it can contain unknown columns). So, if field_delimiter and row_after_delimiter are
diff --git a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
index 26ee32be370..2acf35bd143 100644
--- a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
@@ -76,7 +76,7 @@ public:
 
     bool checkEndOfRow();
     bool checkForSuffixImpl(bool check_eof);
-    inline void skipSpaces() { if (ignore_spaces) skipWhitespaceIfAny(*buf); }
+    inline void skipSpaces() { if (ignore_spaces) skipWhitespaceIfAny(*buf, true); }
 
     EscapingRule getEscapingRule() const override { return format_settings.custom.escaping_rule; }
 
diff --git a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
index a39722950e4..2e264c59f56 100644
--- a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
+++ b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
@@ -72,7 +72,7 @@ void JSONColumnsReaderBase::skipColumn()
 
 JSONColumnsBlockInputFormatBase::JSONColumnsBlockInputFormatBase(
     ReadBuffer & in_, const Block & header_, const FormatSettings & format_settings_, std::unique_ptr<JSONColumnsReaderBase> reader_)
-    : IInputFormat(header_, in_)
+    : IInputFormat(header_, &in_)
     , format_settings(format_settings_)
     , fields(header_.getNamesAndTypes())
     , serializations(header_.getSerializations())
@@ -128,7 +128,7 @@ Chunk JSONColumnsBlockInputFormatBase::generate()
         {
             /// Check if this name appears in header. If no, skip this column or throw
             /// an exception according to setting input_format_skip_unknown_fields
-            if (!name_to_index.has(*column_name))
+            if (name_to_index.find(*column_name) == name_to_index.end())
             {
                 if (!format_settings.skip_unknown_fields)
                     throw Exception(ErrorCodes::INCORRECT_DATA, "Unknown column found in input data: {}", *column_name);
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
index 22ac31c7824..e5f52936021 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
@@ -71,21 +71,20 @@ inline size_t JSONEachRowRowInputFormat::columnIndex(StringRef name, size_t key_
     /// and a quick check to match the next expected field, instead of searching the hash table.
 
     if (prev_positions.size() > key_index
-        && prev_positions[key_index]
-        && name == prev_positions[key_index]->getKey())
+        && prev_positions[key_index] != Block::NameMap::const_iterator{}
+        && name == prev_positions[key_index]->first)
     {
-        return prev_positions[key_index]->getMapped();
+        return prev_positions[key_index]->second;
     }
     else
     {
-        auto * it = name_map.find(name);
-
-        if (it)
+        const auto it = name_map.find(name);
+        if (it != name_map.end())
         {
             if (key_index < prev_positions.size())
                 prev_positions[key_index] = it;
 
-            return it->getMapped();
+            return it->second;
         }
         else
             return UNKNOWN_FIELD;
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
index beee9e95821..ce42071585e 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
@@ -71,11 +71,10 @@ private:
     /// for row like {..., "non-nullable column name" : null, ...}
 
     /// Hash table match `field name -> position in the block`. NOTE You can use perfect hash map.
-    using NameMap = HashMap<StringRef, size_t, StringRefHash>;
-    NameMap name_map;
+    Block::NameMap name_map;
 
     /// Cached search results for previous row (keyed as index in JSON object) - used as a hint.
-    std::vector<NameMap::LookupResult> prev_positions;
+    std::vector<Block::NameMap::const_iterator> prev_positions;
 
     bool allow_new_rows = true;
 
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
index 2e2209bb6e3..5b8f6cc1af7 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
@@ -12,9 +12,11 @@ namespace DB
 JSONEachRowRowOutputFormat::JSONEachRowRowOutputFormat(
     WriteBuffer & out_,
     const Block & header_,
-    const FormatSettings & settings_)
+    const FormatSettings & settings_,
+    bool pretty_json_)
         : RowOutputFormatWithUTF8ValidationAdaptor(settings_.json.validate_utf8, header_, out_),
-            settings(settings_)
+        pretty_json(pretty_json_),
+        settings(settings_)
 {
     fields = JSONUtils::makeNamesValidJSONStrings(getPort(PortKind::Main).getHeader().getNames(), settings, settings.json.validate_utf8);
 }
@@ -22,7 +24,7 @@ JSONEachRowRowOutputFormat::JSONEachRowRowOutputFormat(
 
 void JSONEachRowRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
-    JSONUtils::writeFieldFromColumn(column, serialization, row_num, settings.json.serialize_as_strings, settings, *ostr, fields[field_number], 0, "");
+    JSONUtils::writeFieldFromColumn(column, serialization, row_num, settings.json.serialize_as_strings, settings, *ostr, fields[field_number], pretty_json ? 1 : 0, "", pretty_json);
     ++field_number;
 }
 
@@ -30,17 +32,24 @@ void JSONEachRowRowOutputFormat::writeField(const IColumn & column, const ISeria
 void JSONEachRowRowOutputFormat::writeFieldDelimiter()
 {
     writeChar(',', *ostr);
+    if (pretty_json)
+        writeChar('\n', *ostr);
 }
 
 
 void JSONEachRowRowOutputFormat::writeRowStartDelimiter()
 {
     writeChar('{', *ostr);
+    if (pretty_json)
+        writeChar('\n', *ostr);
 }
 
 
 void JSONEachRowRowOutputFormat::writeRowEndDelimiter()
 {
+    if (pretty_json)
+        writeChar('\n', *ostr);
+
     if (settings.json.array_of_rows)
         writeChar('}', *ostr);
     else
@@ -74,24 +83,27 @@ void JSONEachRowRowOutputFormat::writeSuffix()
 
 void registerOutputFormatJSONEachRow(FormatFactory & factory)
 {
-    auto register_function = [&](const String & format, bool serialize_as_strings)
+    auto register_function = [&](const String & format, bool serialize_as_strings, bool pretty_json)
     {
-        factory.registerOutputFormat(format, [serialize_as_strings](
+        factory.registerOutputFormat(format, [serialize_as_strings, pretty_json](
             WriteBuffer & buf,
             const Block & sample,
             const FormatSettings & _format_settings)
         {
             FormatSettings settings = _format_settings;
             settings.json.serialize_as_strings = serialize_as_strings;
-            return std::make_shared<JSONEachRowRowOutputFormat>(buf, sample, settings);
+            return std::make_shared<JSONEachRowRowOutputFormat>(buf, sample, settings, pretty_json);
         });
         factory.markOutputFormatSupportsParallelFormatting(format);
     };
 
-    register_function("JSONEachRow", false);
-    register_function("JSONLines", false);
-    register_function("NDJSON", false);
-    register_function("JSONStringsEachRow", true);
+    register_function("JSONEachRow", false, false);
+    register_function("PrettyJSONEachRow", false, true);
+    register_function("JSONLines", false, false);
+    register_function("PrettyJSONLines", false, true);
+    register_function("NDJSON", false, false);
+    register_function("PrettyNDJSON", false, true);
+    register_function("JSONStringsEachRow", true, false);
 }
 
 }
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h
index 62b8188cb4d..e05d189afe9 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h
@@ -17,7 +17,8 @@ public:
     JSONEachRowRowOutputFormat(
         WriteBuffer & out_,
         const Block & header_,
-        const FormatSettings & settings_);
+        const FormatSettings & settings_,
+        bool pretty_json_ = false);
 
     String getName() const override { return "JSONEachRowRowOutputFormat"; }
 
@@ -37,6 +38,7 @@ protected:
     void writeSuffix() override;
 
     size_t field_number = 0;
+    bool pretty_json;
 
 private:
     Names fields;
diff --git a/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp b/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
index a86d68c17ff..2fd87540e7d 100644
--- a/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
@@ -1,5 +1,4 @@
 #include <Processors/Formats/Impl/LineAsStringRowInputFormat.h>
-#include <Formats/newLineSegmentationEngine.h>
 #include <base/find_symbols.h>
 #include <IO/ReadHelpers.h>
 #include <Columns/ColumnString.h>
@@ -11,6 +10,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int INCORRECT_QUERY;
+    extern const int LOGICAL_ERROR;
 }
 
 LineAsStringRowInputFormat::LineAsStringRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_) :
@@ -63,9 +63,37 @@ void registerInputFormatLineAsString(FormatFactory & factory)
     });
 }
 
+
+static std::pair<bool, size_t> segmentationEngine(ReadBuffer & in, DB::Memory<> & memory, size_t min_bytes, size_t max_rows)
+{
+    char * pos = in.position();
+    bool need_more_data = true;
+    size_t number_of_rows = 0;
+
+    while (loadAtPosition(in, memory, pos) && need_more_data)
+    {
+        pos = find_first_symbols<'\n'>(pos, in.buffer().end());
+        if (pos > in.buffer().end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Position in buffer is out of bounds. There must be a bug.");
+        else if (pos == in.buffer().end())
+            continue;
+
+        ++number_of_rows;
+        if ((memory.size() + static_cast<size_t>(pos - in.position()) >= min_bytes) || (number_of_rows == max_rows))
+            need_more_data = false;
+
+        if (*pos == '\n')
+            ++pos;
+    }
+
+    saveUpToPosition(in, memory, pos);
+
+    return {loadAtPosition(in, memory, pos), number_of_rows};
+}
+
 void registerFileSegmentationEngineLineAsString(FormatFactory & factory)
 {
-    factory.registerFileSegmentationEngine("LineAsString", &newLineFileSegmentationEngine);
+    factory.registerFileSegmentationEngine("LineAsString", &segmentationEngine);
 }
 
 
diff --git a/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp b/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
index 488f4ff9a73..eeca14176cc 100644
--- a/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
@@ -17,6 +17,7 @@
 #include <IO/ReadBufferFromMemory.h>
 
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeMap.h>
@@ -25,6 +26,7 @@
 #include <DataTypes/DataTypeUUID.h>
 
 #include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
@@ -64,7 +66,7 @@ void MsgPackVisitor::set_info(IColumn & column, DataTypePtr type, UInt8 & read)
     {
         info_stack.pop();
     }
-    info_stack.push(Info{column, type, &read});
+    info_stack.push(Info{column, type, false, std::nullopt, &read});
 }
 
 void MsgPackVisitor::reset()
@@ -137,16 +139,19 @@ static void insertInteger(IColumn & column, DataTypePtr type, UInt64 value)
             assert_cast<ColumnUInt64 &>(column).insertValue(value);
             break;
         }
+        case TypeIndex::Enum8: [[fallthrough]];
         case TypeIndex::Int8:
         {
             assert_cast<ColumnInt8 &>(column).insertValue(value);
             break;
         }
+        case TypeIndex::Enum16: [[fallthrough]];
         case TypeIndex::Int16:
         {
             assert_cast<ColumnInt16 &>(column).insertValue(value);
             break;
         }
+        case TypeIndex::Date32: [[fallthrough]];
         case TypeIndex::Int32:
         {
             assert_cast<ColumnInt32 &>(column).insertValue(static_cast<Int32>(value));
@@ -162,11 +167,35 @@ static void insertInteger(IColumn & column, DataTypePtr type, UInt64 value)
             assert_cast<DataTypeDateTime64::ColumnType &>(column).insertValue(value);
             break;
         }
+        case TypeIndex::IPv4:
+        {
+            assert_cast<ColumnIPv4 &>(column).insertValue(IPv4(static_cast<UInt32>(value)));
+            break;
+        }
+        case TypeIndex::Decimal32:
+        {
+            assert_cast<ColumnDecimal<Decimal32> &>(column).insertValue(static_cast<Int32>(value));
+            break;
+        }
+        case TypeIndex::Decimal64:
+        {
+            assert_cast<ColumnDecimal<Decimal64> &>(column).insertValue(value);
+            break;
+        }
         default:
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack integer into column with type {}.", type->getName());
     }
 }
 
+template <typename ColumnType>
+static void insertFromBinaryRepresentation(IColumn & column, DataTypePtr type, const char * value, size_t size)
+{
+    if (size != sizeof(typename ColumnType::ValueType))
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected size of {} value: {}", type->getName(), size);
+
+    assert_cast<ColumnType &>(column).insertData(value, size);
+}
+
 static void insertString(IColumn & column, DataTypePtr type, const char * value, size_t size, bool bin)
 {
     auto insert_func = [&](IColumn & column_, DataTypePtr type_)
@@ -190,6 +219,35 @@ static void insertString(IColumn & column, DataTypePtr type, const char * value,
         return;
     }
 
+    if (bin)
+    {
+        switch (type->getTypeId())
+        {
+            case TypeIndex::IPv6:
+                insertFromBinaryRepresentation<ColumnIPv6>(column, type, value, size);
+                return;
+            case TypeIndex::Int128:
+                insertFromBinaryRepresentation<ColumnInt128>(column, type, value, size);
+                return;
+            case TypeIndex::UInt128:
+                insertFromBinaryRepresentation<ColumnUInt128>(column, type, value, size);
+                return;
+            case TypeIndex::Int256:
+                insertFromBinaryRepresentation<ColumnInt256>(column, type, value, size);
+                return;
+            case TypeIndex::UInt256:
+                insertFromBinaryRepresentation<ColumnUInt256>(column, type, value, size);
+                return;
+            case TypeIndex::Decimal128:
+                insertFromBinaryRepresentation<ColumnDecimal<Decimal128>>(column, type, value, size);
+                return;
+            case TypeIndex::Decimal256:
+                insertFromBinaryRepresentation<ColumnDecimal<Decimal256>>(column, type, value, size);
+                return;
+            default:;
+        }
+    }
+
     if (!isStringOrFixedString(type))
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack string into column with type {}.", type->getName());
 
@@ -317,21 +375,49 @@ bool MsgPackVisitor::visit_boolean(bool value)
 
 bool MsgPackVisitor::start_array(size_t size) // NOLINT
 {
-    if (!isArray(info_stack.top().type))
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack array into column with type {}.", info_stack.top().type->getName());
+    if (isArray(info_stack.top().type))
+    {
+        auto nested_type = assert_cast<const DataTypeArray &>(*info_stack.top().type).getNestedType();
+        ColumnArray & column_array = assert_cast<ColumnArray &>(info_stack.top().column);
+        ColumnArray::Offsets & offsets = column_array.getOffsets();
+        IColumn & nested_column = column_array.getData();
+        offsets.push_back(offsets.back() + size);
+        if (size > 0)
+            info_stack.push(Info{nested_column, nested_type, false, size, nullptr});
+    }
+    else if (isTuple(info_stack.top().type))
+    {
+        const auto & tuple_type = assert_cast<const DataTypeTuple &>(*info_stack.top().type);
+        const auto & nested_types = tuple_type.getElements();
+        if (size != nested_types.size())
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack array with size {} into Tuple column with {} elements", size, nested_types.size());
+
+        ColumnTuple & column_tuple = assert_cast<ColumnTuple &>(info_stack.top().column);
+        /// Push nested columns into stack in reverse order.
+        for (ssize_t i = nested_types.size() - 1; i >= 0; --i)
+            info_stack.push(Info{column_tuple.getColumn(i), nested_types[i], true, std::nullopt, nullptr});
+    }
+    else
+    {
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack array into column with type {}", info_stack.top().type->getName());
+    }
 
-    auto nested_type = assert_cast<const DataTypeArray &>(*info_stack.top().type).getNestedType();
-    ColumnArray & column_array = assert_cast<ColumnArray &>(info_stack.top().column);
-    ColumnArray::Offsets & offsets = column_array.getOffsets();
-    IColumn & nested_column = column_array.getData();
-    offsets.push_back(offsets.back() + size);
-    info_stack.push(Info{nested_column, nested_type, nullptr});
     return true;
 }
 
-bool MsgPackVisitor::end_array() // NOLINT
+
+bool MsgPackVisitor::end_array_item() // NOLINT
 {
-    info_stack.pop();
+    if (info_stack.top().is_tuple_element)
+        info_stack.pop();
+    else
+    {
+        assert(info_stack.top().array_size.has_value());
+        auto & current_array_size = *info_stack.top().array_size;
+        --current_array_size;
+        if (current_array_size == 0)
+            info_stack.pop();
+    }
     return true;
 }
 
@@ -349,7 +435,7 @@ bool MsgPackVisitor::start_map_key() // NOLINT
 {
     auto key_column = assert_cast<ColumnMap &>(info_stack.top().column).getNestedData().getColumns()[0];
     auto key_type = assert_cast<const DataTypeMap &>(*info_stack.top().type).getKeyType();
-    info_stack.push(Info{*key_column, key_type, nullptr});
+    info_stack.push(Info{*key_column, key_type, false, std::nullopt, nullptr});
     return true;
 }
 
@@ -363,7 +449,7 @@ bool MsgPackVisitor::start_map_value() // NOLINT
 {
     auto value_column = assert_cast<ColumnMap &>(info_stack.top().column).getNestedData().getColumns()[1];
     auto value_type = assert_cast<const DataTypeMap &>(*info_stack.top().type).getValueType();
-    info_stack.push(Info{*value_column, value_type, nullptr});
+    info_stack.push(Info{*value_column, value_type, false, std::nullopt, nullptr});
     return true;
 }
 
@@ -502,13 +588,26 @@ DataTypePtr MsgPackSchemaReader::getDataType(const msgpack::object & object)
         case msgpack::type::object_type::ARRAY:
         {
             msgpack::object_array object_array = object.via.array;
-            if (object_array.size)
+            if (!object_array.size)
+                return nullptr;
+
+            DataTypes nested_types;
+            nested_types.reserve(object_array.size);
+            bool nested_types_are_equal = true;
+            for (size_t i = 0; i != object_array.size; ++i)
             {
-                auto nested_type = getDataType(object_array.ptr[0]);
-                if (nested_type)
-                    return std::make_shared<DataTypeArray>(getDataType(object_array.ptr[0]));
+                auto nested_type = getDataType(object_array.ptr[i]);
+                if (!nested_type)
+                    return nullptr;
+
+                nested_types.push_back(nested_type);
+                nested_types_are_equal &= nested_type->equals(*nested_types[0]);
             }
-            return nullptr;
+
+            if (nested_types_are_equal)
+                return std::make_shared<DataTypeArray>(nested_types[0]);
+
+            return std::make_shared<DataTypeTuple>(std::move(nested_types));
         }
         case msgpack::type::object_type::MAP:
         {
diff --git a/src/Processors/Formats/Impl/MsgPackRowInputFormat.h b/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
index 5eaa3719d0c..0b485d3b97c 100644
--- a/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
+++ b/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
@@ -25,6 +25,8 @@ public:
     {
         IColumn & column;
         DataTypePtr type;
+        bool is_tuple_element;
+        std::optional<size_t> array_size;
         UInt8 * read;
     };
 
@@ -37,7 +39,7 @@ public:
     bool visit_bin(const char * value, size_t size);
     bool visit_boolean(bool value);
     bool start_array(size_t size);
-    bool end_array();
+    bool end_array_item();
     bool visit_nil();
     bool start_map(uint32_t size);
     bool start_map_key();
diff --git a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
index a1ed45ec40f..9c601492217 100644
--- a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
@@ -9,12 +9,14 @@
 #include <IO/WriteHelpers.h>
 
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
@@ -56,21 +58,29 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
             packer.pack_uint32(assert_cast<const ColumnUInt32 &>(column).getElement(row_num));
             return;
         }
+        case TypeIndex::IPv4:
+        {
+            packer.pack_uint32(assert_cast<const ColumnIPv4 &>(column).getElement(row_num));
+            return;
+        }
         case TypeIndex::UInt64:
         {
             packer.pack_uint64(assert_cast<const ColumnUInt64 &>(column).getElement(row_num));
             return;
         }
+        case TypeIndex::Enum8: [[fallthrough]];
         case TypeIndex::Int8:
         {
             packer.pack_int8(assert_cast<const ColumnInt8 &>(column).getElement(row_num));
             return;
         }
+        case TypeIndex::Enum16: [[fallthrough]];
         case TypeIndex::Int16:
         {
             packer.pack_int16(assert_cast<const ColumnInt16 &>(column).getElement(row_num));
             return;
         }
+        case TypeIndex::Date32: [[fallthrough]];
         case TypeIndex::Int32:
         {
             packer.pack_int32(assert_cast<const ColumnInt32 &>(column).getElement(row_num));
@@ -81,6 +91,30 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
             packer.pack_int64(assert_cast<const ColumnInt64 &>(column).getElement(row_num));
             return;
         }
+        case TypeIndex::Int128:
+        {
+            packer.pack_bin(static_cast<unsigned>(sizeof(Int128)));
+            packer.pack_bin_body(column.getDataAt(row_num).data, sizeof(Int128));
+            return;
+        }
+        case TypeIndex::UInt128:
+        {
+            packer.pack_bin(static_cast<unsigned>(sizeof(UInt128)));
+            packer.pack_bin_body(column.getDataAt(row_num).data, sizeof(UInt128));
+            return;
+        }
+        case TypeIndex::Int256:
+        {
+            packer.pack_bin(static_cast<unsigned>(sizeof(Int256)));
+            packer.pack_bin_body(column.getDataAt(row_num).data, sizeof(Int256));
+            return;
+        }
+        case TypeIndex::UInt256:
+        {
+            packer.pack_bin(static_cast<unsigned>(sizeof(UInt256)));
+            packer.pack_bin_body(column.getDataAt(row_num).data, sizeof(UInt256));
+            return;
+        }
         case TypeIndex::Float32:
         {
             packer.pack_float(assert_cast<const ColumnFloat32 &>(column).getElement(row_num));
@@ -96,6 +130,28 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
             packer.pack_uint64(assert_cast<const DataTypeDateTime64::ColumnType &>(column).getElement(row_num));
             return;
         }
+        case TypeIndex::Decimal32:
+        {
+            packer.pack_int32(assert_cast<const ColumnDecimal<Decimal32> &>(column).getElement(row_num));
+            return;
+        }
+        case TypeIndex::Decimal64:
+        {
+            packer.pack_int64(assert_cast<const ColumnDecimal<Decimal64> &>(column).getElement(row_num));
+            return;
+        }
+        case TypeIndex::Decimal128:
+        {
+            packer.pack_bin(static_cast<unsigned>(sizeof(Decimal128)));
+            packer.pack_bin_body(column.getDataAt(row_num).data, sizeof(Decimal128));
+            return;
+        }
+        case TypeIndex::Decimal256:
+        {
+            packer.pack_bin(static_cast<unsigned>(sizeof(Decimal256)));
+            packer.pack_bin_body(column.getDataAt(row_num).data, sizeof(Decimal256));
+            return;
+        }
         case TypeIndex::String:
         {
             const std::string_view & string = assert_cast<const ColumnString &>(column).getDataAt(row_num).toView();
@@ -110,6 +166,13 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
             packer.pack_bin_body(string.data(), static_cast<unsigned>(string.size()));
             return;
         }
+        case TypeIndex::IPv6:
+        {
+            const std::string_view & data = assert_cast<const ColumnIPv6 &>(column).getDataAt(row_num).toView();
+            packer.pack_bin(static_cast<unsigned>(data.size()));
+            packer.pack_bin_body(data.data(), static_cast<unsigned>(data.size()));
+            return;
+        }
         case TypeIndex::Array:
         {
             auto nested_type = assert_cast<const DataTypeArray &>(*data_type).getNestedType();
@@ -124,7 +187,18 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
                 serializeField(nested_column, nested_type, offset + i);
             }
             return;
-         }
+        }
+        case TypeIndex::Tuple:
+        {
+            const auto & tuple_type = assert_cast<const DataTypeTuple &>(*data_type);
+            const auto & nested_types = tuple_type.getElements();
+            const ColumnTuple & column_tuple = assert_cast<const ColumnTuple &>(column);
+            const auto & nested_columns = column_tuple.getColumns();
+            packer.pack_array(static_cast<unsigned>(nested_types.size()));
+            for (size_t i = 0; i < nested_types.size(); ++i)
+                serializeField(*nested_columns[i], nested_types[i], row_num);
+            return;
+        }
         case TypeIndex::Nullable:
         {
             auto nested_type = removeNullable(data_type);
diff --git a/src/Processors/Formats/Impl/NativeFormat.cpp b/src/Processors/Formats/Impl/NativeFormat.cpp
index bd1b13ce2ef..cf1fecca810 100644
--- a/src/Processors/Formats/Impl/NativeFormat.cpp
+++ b/src/Processors/Formats/Impl/NativeFormat.cpp
@@ -16,13 +16,14 @@ class NativeInputFormat final : public IInputFormat
 {
 public:
     NativeInputFormat(ReadBuffer & buf, const Block & header_, const FormatSettings & settings)
-        : IInputFormat(header_, buf)
+        : IInputFormat(header_, &buf)
         , reader(std::make_unique<NativeReader>(
               buf,
               header_,
               0,
               settings.skip_unknown_fields,
               settings.null_as_default,
+              settings.native.allow_types_conversion,
               settings.defaults_for_omitted_fields ? &block_missing_values : nullptr))
         , header(header_) {}
 
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
index 03f056e22b3..5cbe2e24359 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
@@ -22,7 +22,7 @@ namespace ErrorCodes
 }
 
 ORCBlockInputFormat::ORCBlockInputFormat(ReadBuffer & in_, Block header_, const FormatSettings & format_settings_)
-    : IInputFormat(std::move(header_), in_), format_settings(format_settings_), skip_stripes(format_settings.orc.skip_stripes)
+    : IInputFormat(std::move(header_), &in_), format_settings(format_settings_), skip_stripes(format_settings.orc.skip_stripes)
 {
 }
 
@@ -129,10 +129,17 @@ void ORCBlockInputFormat::prepareReader()
         format_settings.null_as_default,
         format_settings.orc.case_insensitive_column_matching);
 
-    ArrowFieldIndexUtil<true> field_util(
-        format_settings.orc.case_insensitive_column_matching,
-        format_settings.orc.allow_missing_columns);
-    include_indices = field_util.findRequiredIndices(getPort().getHeader(), *schema);
+    const bool ignore_case = format_settings.orc.case_insensitive_column_matching;
+    std::unordered_set<String> nested_table_names;
+    if (format_settings.orc.import_nested)
+        nested_table_names = Nested::getAllTableNames(getPort().getHeader(), ignore_case);
+
+    for (int i = 0; i < schema->num_fields(); ++i)
+    {
+        const auto & name = schema->field(i)->name();
+        if (getPort().getHeader().has(name, ignore_case) || nested_table_names.contains(ignore_case ? boost::to_lower_copy(name) : name))
+            include_indices.push_back(i);
+    }
 }
 
 ORCSchemaReader::ORCSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
diff --git a/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
index 42c3e178436..9ef6ba51065 100644
--- a/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
@@ -28,6 +28,34 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
+    extern const int NOT_IMPLEMENTED;
+}
+
+namespace
+{
+
+orc::CompressionKind getORCCompression(FormatSettings::ORCCompression method)
+{
+    if (method == FormatSettings::ORCCompression::NONE)
+        return orc::CompressionKind::CompressionKind_NONE;
+
+#if USE_SNAPPY
+    if (method == FormatSettings::ORCCompression::SNAPPY)
+        return orc::CompressionKind::CompressionKind_SNAPPY;
+#endif
+
+    if (method == FormatSettings::ORCCompression::ZSTD)
+        return orc::CompressionKind::CompressionKind_ZSTD;
+
+    if (method == FormatSettings::ORCCompression::LZ4)
+        return orc::CompressionKind::CompressionKind_LZ4;
+
+    if (method == FormatSettings::ORCCompression::ZLIB)
+        return orc::CompressionKind::CompressionKind_ZLIB;
+
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unsupported compression method");
+}
+
 }
 
 ORCOutputStream::ORCOutputStream(WriteBuffer & out_) : out(out_) {}
@@ -65,16 +93,19 @@ std::unique_ptr<orc::Type> ORCBlockOutputFormat::getORCType(const DataTypePtr &
                 return orc::createPrimitiveType(orc::TypeKind::BOOLEAN);
             return orc::createPrimitiveType(orc::TypeKind::BYTE);
         }
+        case TypeIndex::Enum8: [[fallthrough]];
         case TypeIndex::Int8:
         {
             return orc::createPrimitiveType(orc::TypeKind::BYTE);
         }
+        case TypeIndex::Enum16: [[fallthrough]];
         case TypeIndex::UInt16: [[fallthrough]];
         case TypeIndex::Int16:
         {
             return orc::createPrimitiveType(orc::TypeKind::SHORT);
         }
         case TypeIndex::UInt32: [[fallthrough]];
+        case TypeIndex::IPv4: [[fallthrough]];
         case TypeIndex::Int32:
         {
             return orc::createPrimitiveType(orc::TypeKind::INT);
@@ -102,6 +133,12 @@ std::unique_ptr<orc::Type> ORCBlockOutputFormat::getORCType(const DataTypePtr &
         {
             return orc::createPrimitiveType(orc::TypeKind::TIMESTAMP);
         }
+        case TypeIndex::Int128: [[fallthrough]];
+        case TypeIndex::UInt128: [[fallthrough]];
+        case TypeIndex::Int256: [[fallthrough]];
+        case TypeIndex::UInt256: [[fallthrough]];
+        case TypeIndex::Decimal256:
+            return orc::createPrimitiveType(orc::TypeKind::BINARY);
         case TypeIndex::FixedString: [[fallthrough]];
         case TypeIndex::String:
         {
@@ -109,6 +146,10 @@ std::unique_ptr<orc::Type> ORCBlockOutputFormat::getORCType(const DataTypePtr &
                 return orc::createPrimitiveType(orc::TypeKind::STRING);
             return orc::createPrimitiveType(orc::TypeKind::BINARY);
         }
+        case TypeIndex::IPv6:
+        {
+            return orc::createPrimitiveType(orc::TypeKind::BINARY);
+        }
         case TypeIndex::Nullable:
         {
             return getORCType(removeNullable(type));
@@ -276,6 +317,7 @@ void ORCBlockOutputFormat::writeColumn(
 
     switch (type->getTypeId())
     {
+        case TypeIndex::Enum8: [[fallthrough]];
         case TypeIndex::Int8:
         {
             /// Note: Explicit cast to avoid clang-tidy error: 'signed char' to 'long' conversion; consider casting to 'unsigned char' first.
@@ -287,6 +329,7 @@ void ORCBlockOutputFormat::writeColumn(
             writeNumbers<UInt8, orc::LongVectorBatch>(orc_column, column, null_bytemap, [](const UInt8 & value){ return value; });
             break;
         }
+        case TypeIndex::Enum16: [[fallthrough]];
         case TypeIndex::Int16:
         {
             writeNumbers<Int16, orc::LongVectorBatch>(orc_column, column, null_bytemap, [](const Int16 & value){ return value; });
@@ -309,6 +352,11 @@ void ORCBlockOutputFormat::writeColumn(
             writeNumbers<UInt32, orc::LongVectorBatch>(orc_column, column, null_bytemap, [](const UInt32 & value){ return value; });
             break;
         }
+        case TypeIndex::IPv4:
+        {
+            writeNumbers<IPv4, orc::LongVectorBatch>(orc_column, column, null_bytemap, [](const IPv4 & value){ return value.toUnderType(); });
+            break;
+        }
         case TypeIndex::Int64:
         {
             writeNumbers<Int64, orc::LongVectorBatch>(orc_column, column, null_bytemap, [](const Int64 & value){ return value; });
@@ -319,6 +367,26 @@ void ORCBlockOutputFormat::writeColumn(
             writeNumbers<UInt64,orc::LongVectorBatch>(orc_column, column, null_bytemap, [](const UInt64 & value){ return value; });
             break;
         }
+        case TypeIndex::Int128:
+        {
+            writeStrings<ColumnInt128>(orc_column, column, null_bytemap);
+            break;
+        }
+        case TypeIndex::UInt128:
+        {
+            writeStrings<ColumnUInt128>(orc_column, column, null_bytemap);
+            break;
+        }
+        case TypeIndex::Int256:
+        {
+            writeStrings<ColumnInt256>(orc_column, column, null_bytemap);
+            break;
+        }
+        case TypeIndex::UInt256:
+        {
+            writeStrings<ColumnUInt256>(orc_column, column, null_bytemap);
+            break;
+        }
         case TypeIndex::Float32:
         {
             writeNumbers<Float32, orc::DoubleVectorBatch>(orc_column, column, null_bytemap, [](const Float32 & value){ return value; });
@@ -339,6 +407,11 @@ void ORCBlockOutputFormat::writeColumn(
             writeStrings<ColumnString>(orc_column, column, null_bytemap);
             break;
         }
+        case TypeIndex::IPv6:
+        {
+            writeStrings<ColumnIPv6>(orc_column, column, null_bytemap);
+            break;
+        }
         case TypeIndex::DateTime:
         {
             writeDateTimes<ColumnUInt32>(
@@ -389,6 +462,11 @@ void ORCBlockOutputFormat::writeColumn(
                     [](Int128 value){ return orc::Int128(value >> 64, (value << 64) >> 64); });
             break;
         }
+        case TypeIndex::Decimal256:
+        {
+            writeStrings<ColumnDecimal<Decimal256>>(orc_column, column, null_bytemap);
+            break;
+        }
         case TypeIndex::Nullable:
         {
             const auto & nullable_column = assert_cast<const ColumnNullable &>(column);
@@ -529,7 +607,7 @@ void ORCBlockOutputFormat::prepareWriter()
 {
     const Block & header = getPort(PortKind::Main).getHeader();
     schema = orc::createStructType();
-    options.setCompression(orc::CompressionKind::CompressionKind_NONE);
+    options.setCompression(getORCCompression(format_settings.orc.output_compression_method));
     size_t columns_count = header.columns();
     for (size_t i = 0; i != columns_count; ++i)
         schema->addStructField(header.safeGetByPosition(i).name, getORCType(recursiveRemoveLowCardinality(data_types[i])));
@@ -546,6 +624,7 @@ void registerOutputFormatORC(FormatFactory & factory)
         return std::make_shared<ORCBlockOutputFormat>(buf, sample, format_settings);
     });
     factory.markFormatHasNoAppendSupport("ORC");
+    factory.markOutputFormatPrefersLargeBlocks("ORC");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
index 35d4dd9ddcd..62ee4e4a48d 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
@@ -96,15 +96,15 @@ namespace DB
     }
 
 
-    void ParallelFormattingOutputFormat::collectorThreadFunction(const ThreadGroupStatusPtr & thread_group)
+    void ParallelFormattingOutputFormat::collectorThreadFunction(const ThreadGroupPtr & thread_group)
     {
         SCOPE_EXIT_SAFE(
             if (thread_group)
-                CurrentThread::detachQueryIfNotDetached();
+                CurrentThread::detachFromGroupIfNotDetached();
         );
         setThreadName("Collector");
         if (thread_group)
-            CurrentThread::attachToIfDetached(thread_group);
+            CurrentThread::attachToGroupIfDetached(thread_group);
 
         try
         {
@@ -157,15 +157,15 @@ namespace DB
     }
 
 
-    void ParallelFormattingOutputFormat::formatterThreadFunction(size_t current_unit_number, size_t first_row_num, const ThreadGroupStatusPtr & thread_group)
+    void ParallelFormattingOutputFormat::formatterThreadFunction(size_t current_unit_number, size_t first_row_num, const ThreadGroupPtr & thread_group)
     {
         SCOPE_EXIT_SAFE(
             if (thread_group)
-                CurrentThread::detachQueryIfNotDetached();
+                CurrentThread::detachFromGroupIfNotDetached();
         );
         setThreadName("Formatter");
         if (thread_group)
-            CurrentThread::attachToIfDetached(thread_group);
+            CurrentThread::attachToGroupIfDetached(thread_group);
 
         try
         {
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
index 7ea19f01e01..fddcd059be5 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
@@ -2,12 +2,12 @@
 
 #include <Processors/Formats/IOutputFormat.h>
 
-#include <Common/Arena.h>
 #include <Common/ThreadPool.h>
 #include <Common/Stopwatch.h>
 #include <Common/logger_useful.h>
 #include <Common/Exception.h>
-#include "IO/WriteBufferFromString.h"
+#include <Common/CurrentMetrics.h>
+#include <IO/WriteBufferFromString.h>
 #include <Formats/FormatFactory.h>
 #include <Poco/Event.h>
 #include <IO/BufferWithOwnMemory.h>
@@ -17,6 +17,12 @@
 #include <deque>
 #include <atomic>
 
+namespace CurrentMetrics
+{
+    extern const Metric ParallelFormattingOutputFormatThreads;
+    extern const Metric ParallelFormattingOutputFormatThreadsActive;
+}
+
 namespace DB
 {
 
@@ -74,7 +80,7 @@ public:
     explicit ParallelFormattingOutputFormat(Params params)
         : IOutputFormat(params.header, params.out)
         , internal_formatter_creator(params.internal_formatter_creator)
-        , pool(params.max_threads_for_parallel_formatting)
+        , pool(CurrentMetrics::ParallelFormattingOutputFormatThreads, CurrentMetrics::ParallelFormattingOutputFormatThreadsActive, params.max_threads_for_parallel_formatting)
 
     {
         LOG_TEST(&Poco::Logger::get("ParallelFormattingOutputFormat"), "Parallel formatting is being used");
@@ -263,10 +269,10 @@ private:
     }
 
     /// Collects all temporary buffers into main WriteBuffer.
-    void collectorThreadFunction(const ThreadGroupStatusPtr & thread_group);
+    void collectorThreadFunction(const ThreadGroupPtr & thread_group);
 
     /// This function is executed in ThreadPool and the only purpose of it is to format one Chunk into a continuous buffer in memory.
-    void formatterThreadFunction(size_t current_unit_number, size_t first_row_num, const ThreadGroupStatusPtr & thread_group);
+    void formatterThreadFunction(size_t current_unit_number, size_t first_row_num, const ThreadGroupPtr & thread_group);
 
     void setRowsBeforeLimit(size_t rows_before_limit) override
     {
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
index 293bf4f73f3..f4d619a263b 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
@@ -8,16 +8,17 @@
 namespace DB
 {
 
-void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr thread_group)
+void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupPtr thread_group)
 {
     SCOPE_EXIT_SAFE(
         if (thread_group)
-            CurrentThread::detachQueryIfNotDetached();
+            CurrentThread::detachFromGroupIfNotDetached();
     );
     if (thread_group)
-        CurrentThread::attachTo(thread_group);
+        CurrentThread::attachToGroup(thread_group);
 
     setThreadName("Segmentator");
+
     try
     {
         while (!parsing_finished)
@@ -50,6 +51,9 @@ void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr
 
             if (!have_more_data)
                 break;
+
+            // Segmentator thread can be long-living, so we have to manually update performance counters for CPU progress to be correct
+            CurrentThread::updatePerformanceCountersIfNeeded();
         }
     }
     catch (...)
@@ -58,14 +62,14 @@ void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr
     }
 }
 
-void ParallelParsingInputFormat::parserThreadFunction(ThreadGroupStatusPtr thread_group, size_t current_ticket_number)
+void ParallelParsingInputFormat::parserThreadFunction(ThreadGroupPtr thread_group, size_t current_ticket_number)
 {
     SCOPE_EXIT_SAFE(
         if (thread_group)
-            CurrentThread::detachQueryIfNotDetached();
+            CurrentThread::detachFromGroupIfNotDetached();
     );
     if (thread_group)
-        CurrentThread::attachToIfDetached(thread_group);
+        CurrentThread::attachToGroupIfDetached(thread_group);
 
     const auto parser_unit_number = current_ticket_number % processing_units.size();
     auto & unit = processing_units[parser_unit_number];
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
index 03fb2d650dc..6b084962710 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
@@ -5,14 +5,21 @@
 #include <Common/CurrentThread.h>
 #include <Common/ThreadPool.h>
 #include <Common/setThreadName.h>
+#include <Common/logger_useful.h>
+#include <Common/CurrentMetrics.h>
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/ReadBuffer.h>
 #include <Processors/Formats/IRowInputFormat.h>
 #include <Interpreters/Context.h>
-#include <Common/logger_useful.h>
 #include <Poco/Event.h>
 
 
+namespace CurrentMetrics
+{
+    extern const Metric ParallelParsingInputFormatThreads;
+    extern const Metric ParallelParsingInputFormatThreadsActive;
+}
+
 namespace DB
 {
 
@@ -87,14 +94,14 @@ public:
     };
 
     explicit ParallelParsingInputFormat(Params params)
-        : IInputFormat(std::move(params.header), params.in)
+        : IInputFormat(std::move(params.header), &params.in)
         , internal_parser_creator(params.internal_parser_creator)
         , file_segmentation_engine(params.file_segmentation_engine)
         , format_name(params.format_name)
         , min_chunk_bytes(params.min_chunk_bytes)
         , max_block_size(params.max_block_size)
         , is_server(params.is_server)
-        , pool(params.max_threads)
+        , pool(CurrentMetrics::ParallelParsingInputFormatThreads, CurrentMetrics::ParallelParsingInputFormatThreadsActive, params.max_threads)
     {
         // One unit for each thread, including segmentator and reader, plus a
         // couple more units so that the segmentation thread doesn't spuriously
@@ -310,8 +317,8 @@ private:
         }
     }
 
-    void segmentatorThreadFunction(ThreadGroupStatusPtr thread_group);
-    void parserThreadFunction(ThreadGroupStatusPtr thread_group, size_t current_ticket_number);
+    void segmentatorThreadFunction(ThreadGroupPtr thread_group);
+    void parserThreadFunction(ThreadGroupPtr thread_group, size_t current_ticket_number);
 
     /// Save/log a background exception, set termination flag, wake up all
     /// threads. This function is used by segmentator and parsed threads.
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
index fca097d8ea7..7f90c1197ce 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
@@ -3,6 +3,7 @@
 
 #if USE_PARQUET
 
+#include <Common/ThreadPool.h>
 #include <Formats/FormatFactory.h>
 #include <Formats/SchemaInferenceUtils.h>
 #include <IO/ReadBufferFromMemory.h>
@@ -11,12 +12,19 @@
 #include <arrow/io/api.h>
 #include <arrow/status.h>
 #include <parquet/arrow/reader.h>
+#include <parquet/arrow/schema.h>
 #include <parquet/file_reader.h>
 #include "ArrowBufferedStreams.h"
 #include "ArrowColumnToCHColumn.h"
 #include "ArrowFieldIndexUtil.h"
+#include <base/scope_guard.h>
 #include <DataTypes/NestedUtils.h>
 
+namespace CurrentMetrics
+{
+    extern const Metric ParquetDecoderThreads;
+    extern const Metric ParquetDecoderThreadsActive;
+}
 
 namespace DB
 {
@@ -34,109 +42,342 @@ namespace ErrorCodes
             throw Exception::createDeprecated(_s.ToString(), ErrorCodes::BAD_ARGUMENTS); \
     } while (false)
 
-ParquetBlockInputFormat::ParquetBlockInputFormat(ReadBuffer & in_, Block header_, const FormatSettings & format_settings_)
-    : IInputFormat(std::move(header_), in_), format_settings(format_settings_), skip_row_groups(format_settings.parquet.skip_row_groups)
+ParquetBlockInputFormat::ParquetBlockInputFormat(
+    ReadBuffer * buf,
+    SeekableReadBufferFactoryPtr buf_factory_,
+    const Block & header_,
+    const FormatSettings & format_settings_,
+    size_t max_decoding_threads_,
+    size_t min_bytes_for_seek_)
+    : IInputFormat(header_, buf)
+    , buf_factory(std::move(buf_factory_))
+    , format_settings(format_settings_)
+    , skip_row_groups(format_settings.parquet.skip_row_groups)
+    , max_decoding_threads(max_decoding_threads_)
+    , min_bytes_for_seek(min_bytes_for_seek_)
+    , pending_chunks(PendingChunk::Compare { .row_group_first = format_settings_.parquet.preserve_order })
 {
+    if (max_decoding_threads > 1)
+        pool = std::make_unique<ThreadPool>(CurrentMetrics::ParquetDecoderThreads, CurrentMetrics::ParquetDecoderThreadsActive, max_decoding_threads);
 }
 
-Chunk ParquetBlockInputFormat::generate()
+ParquetBlockInputFormat::~ParquetBlockInputFormat() = default;
+
+void ParquetBlockInputFormat::initializeIfNeeded()
 {
-    Chunk res;
-    block_missing_values.clear();
+    if (std::exchange(is_initialized, true))
+        return;
 
-    if (!file_reader)
+    // Create arrow file adapter.
+    // TODO: Make the adapter do prefetching on IO threads, based on the full set of ranges that
+    //       we'll need to read (which we know in advance). Use max_download_threads for that.
+    if (buf_factory)
     {
-        prepareReader();
-        file_reader->set_batch_size(format_settings.parquet.max_block_size);
-        std::vector<int> row_group_indices;
-        for (int i = 0; i < row_group_total; ++i)
-        {
-            if (!skip_row_groups.contains(i))
-                row_group_indices.emplace_back(i);
-        }
-        auto read_status = file_reader->GetRecordBatchReader(row_group_indices, column_indices, &current_record_batch_reader);
-        if (!read_status.ok())
-            throw DB::ParsingException(ErrorCodes::CANNOT_READ_ALL_DATA, "Error while reading Parquet data: {}", read_status.ToString());
-    }
-
-    if (is_stopped)
-        return {};
-
-    auto batch = current_record_batch_reader->Next();
-    if (!batch.ok())
-    {
-        throw ParsingException(ErrorCodes::CANNOT_READ_ALL_DATA, "Error while reading Parquet data: {}",
-                               batch.status().ToString());
-    }
-    if (*batch)
-    {
-        auto tmp_table = arrow::Table::FromRecordBatches({*batch});
-        /// If defaults_for_omitted_fields is true, calculate the default values from default expression for omitted fields.
-        /// Otherwise fill the missing columns with zero values of its type.
-        BlockMissingValues * block_missing_values_ptr = format_settings.defaults_for_omitted_fields ? &block_missing_values : nullptr;
-        arrow_column_to_ch_column->arrowTableToCHChunk(res, *tmp_table, (*tmp_table)->num_rows(), block_missing_values_ptr);
+        if (format_settings.seekable_read && buf_factory->checkIfActuallySeekable())
+            arrow_file = std::make_shared<RandomAccessFileFromManyReadBuffers>(*buf_factory);
+        else
+            arrow_file = asArrowFileLoadIntoMemory(*buf_factory->getReader(), is_stopped, "Parquet", PARQUET_MAGIC_BYTES);
     }
     else
     {
-        current_record_batch_reader.reset();
-        file_reader.reset();
-        return {};
+        arrow_file = asArrowFile(*in, format_settings, is_stopped, "Parquet", PARQUET_MAGIC_BYTES, /* avoid_buffering */ true);
     }
 
-    return res;
-}
-
-void ParquetBlockInputFormat::resetParser()
-{
-    IInputFormat::resetParser();
-
-    file_reader.reset();
-    column_indices.clear();
-    row_group_current = 0;
-    block_missing_values.clear();
-}
-
-const BlockMissingValues & ParquetBlockInputFormat::getMissingValues() const
-{
-    return block_missing_values;
-}
-
-static void getFileReaderAndSchema(
-    ReadBuffer & in,
-    std::unique_ptr<parquet::arrow::FileReader> & file_reader,
-    std::shared_ptr<arrow::Schema> & schema,
-    const FormatSettings & format_settings,
-    std::atomic<int> & is_stopped)
-{
-    auto arrow_file = asArrowFile(in, format_settings, is_stopped, "Parquet", PARQUET_MAGIC_BYTES);
     if (is_stopped)
         return;
-    THROW_ARROW_NOT_OK(parquet::arrow::OpenFile(std::move(arrow_file), arrow::default_memory_pool(), &file_reader));
-    THROW_ARROW_NOT_OK(file_reader->GetSchema(&schema));
-}
 
-void ParquetBlockInputFormat::prepareReader()
-{
+    metadata = parquet::ReadMetaData(arrow_file);
+
     std::shared_ptr<arrow::Schema> schema;
-    getFileReaderAndSchema(*in, file_reader, schema, format_settings, is_stopped);
-    if (is_stopped)
-        return;
+    THROW_ARROW_NOT_OK(parquet::arrow::FromParquetSchema(metadata->schema(), &schema));
 
-    row_group_total = file_reader->num_row_groups();
-    row_group_current = 0;
+    row_groups.resize(metadata->num_row_groups());
 
-    arrow_column_to_ch_column = std::make_unique<ArrowColumnToCHColumn>(
+    ArrowFieldIndexUtil field_util(
+        format_settings.parquet.case_insensitive_column_matching,
+        format_settings.parquet.allow_missing_columns);
+    column_indices = field_util.findRequiredIndices(getPort().getHeader(), *schema);
+}
+
+void ParquetBlockInputFormat::initializeRowGroupReader(size_t row_group_idx)
+{
+    auto & row_group = row_groups[row_group_idx];
+
+    parquet::ArrowReaderProperties properties;
+    properties.set_use_threads(false);
+    properties.set_batch_size(format_settings.parquet.max_block_size);
+
+    // When reading a row group, arrow will:
+    //  1. Look at `metadata` to get all byte ranges it'll need to read from the file (typically one
+    //     per requested column in the row group).
+    //  2. Coalesce ranges that are close together, trading off seeks vs read amplification.
+    //     This is controlled by CacheOptions.
+    //  3. Process the columns one by one, issuing the corresponding (coalesced) range reads as
+    //     needed. Each range gets its own memory buffer allocated. These buffers stay in memory
+    //     (in arrow::io::internal::ReadRangeCache) until the whole row group reading is done.
+    //     So the memory usage of a "SELECT *" will be at least the compressed size of a row group
+    //     (typically hundreds of MB).
+    //
+    // With this coalescing, we don't need any readahead on our side, hence avoid_buffering in
+    // asArrowFile().
+    //
+    // This adds one unnecessary copy. We should probably do coalescing and prefetch scheduling on
+    // our side instead.
+    properties.set_pre_buffer(true);
+    auto cache_options = arrow::io::CacheOptions::LazyDefaults();
+    cache_options.hole_size_limit = min_bytes_for_seek;
+    cache_options.range_size_limit = 1l << 40; // reading the whole row group at once is fine
+    properties.set_cache_options(cache_options);
+
+    // Workaround for a workaround in the parquet library.
+    //
+    // From ComputeColumnChunkRange() in contrib/arrow/cpp/src/parquet/file_reader.cc:
+    //  > The Parquet MR writer had a bug in 1.2.8 and below where it didn't include the
+    //  > dictionary page header size in total_compressed_size and total_uncompressed_size
+    //  > (see IMPALA-694). We add padding to compensate.
+    //
+    // That padding breaks the pre-buffered mode because the padded read ranges may overlap each
+    // other, failing an assert. So we disable pre-buffering in this case.
+    // That version is >10 years old, so this is not very important.
+    if (metadata->writer_version().VersionLt(parquet::ApplicationVersion::PARQUET_816_FIXED_VERSION()))
+        properties.set_pre_buffer(false);
+
+    parquet::arrow::FileReaderBuilder builder;
+    THROW_ARROW_NOT_OK(
+        builder.Open(arrow_file, /* not to be confused with ArrowReaderProperties */ parquet::default_reader_properties(), metadata));
+    builder.properties(properties);
+    // TODO: Pass custom memory_pool() to enable memory accounting with non-jemalloc allocators.
+    THROW_ARROW_NOT_OK(builder.Build(&row_group.file_reader));
+
+    THROW_ARROW_NOT_OK(
+        row_group.file_reader->GetRecordBatchReader({static_cast<int>(row_group_idx)}, column_indices, &row_group.record_batch_reader));
+
+    row_group.arrow_column_to_ch_column = std::make_unique<ArrowColumnToCHColumn>(
         getPort().getHeader(),
         "Parquet",
         format_settings.parquet.import_nested,
         format_settings.parquet.allow_missing_columns,
         format_settings.null_as_default,
         format_settings.parquet.case_insensitive_column_matching);
+}
 
-    ArrowFieldIndexUtil<false> field_util(
-        format_settings.parquet.case_insensitive_column_matching,
-        format_settings.parquet.allow_missing_columns);
-    column_indices = field_util.findRequiredIndices(getPort().getHeader(), *schema);
+void ParquetBlockInputFormat::scheduleRowGroup(size_t row_group_idx)
+{
+    chassert(!mutex.try_lock());
+
+    auto & status = row_groups[row_group_idx].status;
+    chassert(status == RowGroupState::Status::NotStarted || status == RowGroupState::Status::Paused);
+
+    status = RowGroupState::Status::Running;
+
+    pool->scheduleOrThrowOnError(
+        [this, row_group_idx, thread_group = CurrentThread::getGroup()]()
+        {
+            if (thread_group)
+                CurrentThread::attachToGroupIfDetached(thread_group);
+            SCOPE_EXIT_SAFE(if (thread_group) CurrentThread::detachFromGroupIfNotDetached(););
+
+            try
+            {
+                setThreadName("ParquetDecoder");
+
+                threadFunction(row_group_idx);
+            }
+            catch (...)
+            {
+                std::lock_guard lock(mutex);
+                background_exception = std::current_exception();
+                condvar.notify_all();
+            }
+        });
+}
+
+void ParquetBlockInputFormat::threadFunction(size_t row_group_idx)
+{
+    std::unique_lock lock(mutex);
+
+    auto & row_group = row_groups[row_group_idx];
+    chassert(row_group.status == RowGroupState::Status::Running);
+
+    while (true)
+    {
+        if (is_stopped || row_group.num_pending_chunks >= max_pending_chunks_per_row_group)
+        {
+            row_group.status = RowGroupState::Status::Paused;
+            return;
+        }
+
+        decodeOneChunk(row_group_idx, lock);
+
+        if (row_group.status == RowGroupState::Status::Done)
+            return;
+    }
+}
+
+void ParquetBlockInputFormat::decodeOneChunk(size_t row_group_idx, std::unique_lock<std::mutex> & lock)
+{
+    auto & row_group = row_groups[row_group_idx];
+    chassert(row_group.status != RowGroupState::Status::Done);
+    chassert(lock.owns_lock());
+    SCOPE_EXIT({ chassert(lock.owns_lock() || std::uncaught_exceptions()); });
+
+    lock.unlock();
+
+    auto end_of_row_group = [&] {
+        row_group.arrow_column_to_ch_column.reset();
+        row_group.record_batch_reader.reset();
+        row_group.file_reader.reset();
+
+        lock.lock();
+        row_group.status = RowGroupState::Status::Done;
+
+        // We may be able to schedule more work now, but can't call scheduleMoreWorkIfNeeded() right
+        // here because we're running on the same thread pool, so it'll deadlock if thread limit is
+        // reached. Wake up generate() instead.
+        condvar.notify_all();
+    };
+
+    if (!row_group.record_batch_reader)
+    {
+        if (skip_row_groups.contains(static_cast<int>(row_group_idx)))
+        {
+            // Pretend that the row group is empty.
+            // (We could avoid scheduling the row group on a thread in the first place. But the
+            // skip_row_groups feature is mostly unused, so it's better to be a little inefficient
+            // than to add a bunch of extra mostly-dead code for this.)
+            end_of_row_group();
+            return;
+        }
+
+        initializeRowGroupReader(row_group_idx);
+    }
+
+
+    auto batch = row_group.record_batch_reader->Next();
+    if (!batch.ok())
+        throw ParsingException(ErrorCodes::CANNOT_READ_ALL_DATA, "Error while reading Parquet data: {}", batch.status().ToString());
+
+    if (!*batch)
+    {
+        end_of_row_group();
+        return;
+    }
+
+    auto tmp_table = arrow::Table::FromRecordBatches({*batch});
+
+    PendingChunk res = {.chunk_idx = row_group.next_chunk_idx, .row_group_idx = row_group_idx};
+
+    /// If defaults_for_omitted_fields is true, calculate the default values from default expression for omitted fields.
+    /// Otherwise fill the missing columns with zero values of its type.
+    BlockMissingValues * block_missing_values_ptr = format_settings.defaults_for_omitted_fields ? &res.block_missing_values : nullptr;
+    row_group.arrow_column_to_ch_column->arrowTableToCHChunk(res.chunk, *tmp_table, (*tmp_table)->num_rows(), block_missing_values_ptr);
+
+    lock.lock();
+
+    ++row_group.next_chunk_idx;
+    ++row_group.num_pending_chunks;
+    pending_chunks.push(std::move(res));
+    condvar.notify_all();
+}
+
+void ParquetBlockInputFormat::scheduleMoreWorkIfNeeded(std::optional<size_t> row_group_touched)
+{
+    while (row_groups_completed < row_groups.size())
+    {
+        auto & row_group = row_groups[row_groups_completed];
+        if (row_group.status != RowGroupState::Status::Done || row_group.num_pending_chunks != 0)
+            break;
+        ++row_groups_completed;
+    }
+
+    if (pool)
+    {
+        while (row_groups_started - row_groups_completed < max_decoding_threads &&
+               row_groups_started < row_groups.size())
+            scheduleRowGroup(row_groups_started++);
+
+        if (row_group_touched)
+        {
+            auto & row_group = row_groups[*row_group_touched];
+            if (row_group.status == RowGroupState::Status::Paused &&
+                row_group.num_pending_chunks < max_pending_chunks_per_row_group)
+                scheduleRowGroup(*row_group_touched);
+        }
+    }
+}
+
+Chunk ParquetBlockInputFormat::generate()
+{
+    initializeIfNeeded();
+
+    std::unique_lock lock(mutex);
+
+    while (true)
+    {
+        if (background_exception)
+        {
+            is_stopped = true;
+            std::rethrow_exception(background_exception);
+        }
+        if (is_stopped)
+            return {};
+
+        scheduleMoreWorkIfNeeded();
+
+        if (!pending_chunks.empty() &&
+            (!format_settings.parquet.preserve_order ||
+             pending_chunks.top().row_group_idx == row_groups_completed))
+        {
+            PendingChunk chunk = std::move(const_cast<PendingChunk&>(pending_chunks.top()));
+            pending_chunks.pop();
+
+            auto & row_group = row_groups[chunk.row_group_idx];
+            chassert(row_group.num_pending_chunks != 0);
+            chassert(chunk.chunk_idx == row_group.next_chunk_idx - row_group.num_pending_chunks);
+            --row_group.num_pending_chunks;
+
+            scheduleMoreWorkIfNeeded(chunk.row_group_idx);
+
+            previous_block_missing_values = std::move(chunk.block_missing_values);
+            return std::move(chunk.chunk);
+        }
+
+        if (row_groups_completed == row_groups.size())
+            return {};
+
+        if (pool)
+            condvar.wait(lock);
+        else
+            decodeOneChunk(row_groups_completed, lock);
+    }
+}
+
+void ParquetBlockInputFormat::resetParser()
+{
+    is_stopped = true;
+    if (pool)
+        pool->wait();
+
+    arrow_file.reset();
+    metadata.reset();
+    column_indices.clear();
+    row_groups.clear();
+    while (!pending_chunks.empty())
+        pending_chunks.pop();
+    row_groups_completed = 0;
+    previous_block_missing_values.clear();
+    row_groups_started = 0;
+    background_exception = nullptr;
+
+    is_stopped = false;
+    is_initialized = false;
+
+    IInputFormat::resetParser();
+}
+
+const BlockMissingValues & ParquetBlockInputFormat::getMissingValues() const
+{
+    return previous_block_missing_values;
 }
 
 ParquetSchemaReader::ParquetSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
@@ -146,10 +387,14 @@ ParquetSchemaReader::ParquetSchemaReader(ReadBuffer & in_, const FormatSettings
 
 NamesAndTypesList ParquetSchemaReader::readSchema()
 {
-    std::unique_ptr<parquet::arrow::FileReader> file_reader;
+    std::atomic<int> is_stopped{0};
+    auto file = asArrowFile(in, format_settings, is_stopped, "Parquet", PARQUET_MAGIC_BYTES);
+
+    auto metadata = parquet::ReadMetaData(file);
+
     std::shared_ptr<arrow::Schema> schema;
-    std::atomic<int> is_stopped = 0;
-    getFileReaderAndSchema(in, file_reader, schema, format_settings, is_stopped);
+    THROW_ARROW_NOT_OK(parquet::arrow::FromParquetSchema(metadata->schema(), &schema));
+
     auto header = ArrowColumnToCHColumn::arrowSchemaToCHHeader(
         *schema, "Parquet", format_settings.parquet.skip_columns_with_unsupported_types_in_schema_inference);
     if (format_settings.schema_inference_make_columns_nullable)
@@ -159,14 +404,25 @@ NamesAndTypesList ParquetSchemaReader::readSchema()
 
 void registerInputFormatParquet(FormatFactory & factory)
 {
-    factory.registerInputFormat(
+    factory.registerRandomAccessInputFormat(
             "Parquet",
-            [](ReadBuffer &buf,
-                const Block &sample,
-                const RowInputFormatParams &,
-                const FormatSettings & settings)
+            [](ReadBuffer * buf,
+               SeekableReadBufferFactoryPtr buf_factory,
+               const Block & sample,
+               const FormatSettings & settings,
+               const ReadSettings& read_settings,
+               bool is_remote_fs,
+               size_t /* max_download_threads */,
+               size_t max_parsing_threads)
             {
-                return std::make_shared<ParquetBlockInputFormat>(buf, sample, settings);
+                size_t min_bytes_for_seek = is_remote_fs ? read_settings.remote_read_min_bytes_for_seek : 8 * 1024;
+                return std::make_shared<ParquetBlockInputFormat>(
+                    buf,
+                    std::move(buf_factory),
+                    sample,
+                    settings,
+                    max_parsing_threads,
+                    min_bytes_for_seek);
             });
     factory.markFormatSupportsSubcolumns("Parquet");
     factory.markFormatSupportsSubsetOfColumns("Parquet");
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
index afc46939c79..f17eee59414 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
@@ -6,19 +6,56 @@
 #include <Processors/Formats/ISchemaReader.h>
 #include <Formats/FormatSettings.h>
 
+namespace parquet { class FileMetaData; }
 namespace parquet::arrow { class FileReader; }
-
 namespace arrow { class Buffer; class RecordBatchReader;}
+namespace arrow::io { class RandomAccessFile; }
 
 namespace DB
 {
 
 class ArrowColumnToCHColumn;
+class SeekableReadBufferFactory;
+
+// Parquet files contain a metadata block with the following information:
+//  * list of columns,
+//  * list of "row groups",
+//  * for each column in each row group:
+//     - byte range for the data,
+//     - min, max, count,
+//     - (note that we *don't* have a reliable estimate of the decompressed+decoded size; the
+//       metadata has decompressed size, but decoded size is sometimes much bigger because of
+//       dictionary encoding)
+//
+// This information could be used for:
+//  (1) Precise reads - only reading the byte ranges we need, instead of filling the whole
+//      arbitrarily-sized buffer inside ReadBuffer. We know in advance exactly what ranges we'll
+//      need to read.
+//  (2) Skipping row groups based on WHERE conditions.
+//  (3) Skipping decoding of individual pages based on PREWHERE.
+//  (4) Projections. I.e. for queries that only request min/max/count, we can report the
+//      min/max/count from metadata. This can be done per row group. I.e. for row groups that
+//      fully pass the WHERE conditions we'll use min/max/count from metadata, for row groups that
+//      only partially overlap with the WHERE conditions we'll read data.
+//  (4a) Before projections are implemented, we should at least be able to do `SELECT count(*)`
+//       without reading data.
+//
+// For (1), we need the IInputFormat to be in control of reading, with its own implementation of
+// parallel reading+decoding, instead of using ParallelReadBuffer and ParallelParsingInputFormat.
+// That's what RandomAccessInputCreator in FormatFactory is about.
 
 class ParquetBlockInputFormat : public IInputFormat
 {
 public:
-    ParquetBlockInputFormat(ReadBuffer & in_, Block header_, const FormatSettings & format_settings_);
+    ParquetBlockInputFormat(
+        // exactly one of these two is nullptr
+        ReadBuffer * buf,
+        std::unique_ptr<SeekableReadBufferFactory> buf_factory,
+        const Block & header,
+        const FormatSettings & format_settings,
+        size_t max_decoding_threads,
+        size_t min_bytes_for_seek);
+    ~ParquetBlockInputFormat() override;
 
     void resetParser() override;
 
@@ -29,25 +66,215 @@ public:
 private:
     Chunk generate() override;
 
-    void prepareReader();
-
     void onCancel() override
     {
         is_stopped = 1;
     }
 
-    std::unique_ptr<parquet::arrow::FileReader> file_reader;
-    int row_group_total = 0;
-    int row_group_current = 0;
-    // indices of columns to read from Parquet file
-    std::vector<int> column_indices;
-    std::unique_ptr<ArrowColumnToCHColumn> arrow_column_to_ch_column;
-    BlockMissingValues block_missing_values;
+    void initializeIfNeeded();
+    void initializeRowGroupReader(size_t row_group_idx);
+
+    void decodeOneChunk(size_t row_group_idx, std::unique_lock<std::mutex> & lock);
+
+    void scheduleMoreWorkIfNeeded(std::optional<size_t> row_group_touched = std::nullopt);
+    void scheduleRowGroup(size_t row_group_idx);
+
+    void threadFunction(size_t row_group_idx);
+
+    // Data layout in the file:
+    //
+    // row group 0
+    //   column 0
+    //     page 0, page 1, ...
+    //   column 1
+    //     page 0, page 1, ...
+    //   ...
+    // row group 1
+    //   column 0
+    //     ...
+    //   ...
+    // ...
+    //
+    // All columns in one row group have the same number of rows.
+    // (Not necessarily the same number of *values* if there are arrays or nulls.)
+    // Pages have arbitrary sizes and numbers of rows, independent from each other, even if in the
+    // same column or row group.
+    //
+    // We can think of this as having lots of data streams, one for each column x row group.
+    // The main job of this class is to schedule read operations for these streams across threads.
+    // Also: reassembling the results into chunks, creating/destroying these streams, prefetching.
+    //
+    // Some considerations:
+    //  * Row group size is typically hundreds of MB (compressed). Apache recommends 0.5 - 1 GB.
+    //  * Compression ratio can be pretty extreme, especially with dictionary compression.
+    //    We can afford to keep a compressed row group in memory, but not uncompressed.
+    //  * For each pair <row group idx, column idx>, the data lives in one contiguous range in the
+    //    file. We know all these ranges in advance, from metadata.
+    //  * The byte range for a column in a row group is often very short, like a few KB.
+    //    So we need to:
+    //     - Avoid unnecessary readahead, e.g. don't read 1 MB when we only need 1 KB.
+    //     - Coalesce nearby ranges into longer reads when needed. E.g. if we need to read 5 ranges,
+    //       1 KB each, with 1 KB gaps between them, it's better to do 1 x 9 KB read instead of
+    //       5 x 1 KB reads.
+    //     - Have lots of parallelism for reading (not necessarily for parsing). E.g. if we're
+    //       reading one small column, it may translate to hundreds of tiny reads with long gaps
+    //       between them. If the data comes from an HTTP server, that's hundreds of tiny HTTP GET
+    //       requests. To get good performance, we have to do tens or hundreds of them in parallel.
+    //       So we should probably have separate parallelism control for IO vs parsing (since we
+    //       don't want hundreds of worker threads oversubscribing the CPU cores).
+    //
+    // (Some motivating example access patterns:
+    //   - 'SELECT small_column'. Bottlenecked on number of seeks. Need to do lots of file/network
+    //     reads in parallel, for lots of row groups.
+    //   - 'SELECT *' when row group size is big and there are many columns. Read the whole file.
+    //     Need some moderate parallelism for IO and for parsing. Ideally read+parse columns of
+    //     one row group in parallel to avoid having multiple row groups in memory at once.
+    //   - 'SELECT big_column'. Have to read+parse multiple row groups in parallel.
+    //   - 'SELECT big_column, many small columns'. This is a mix of the previous two scenarios.
+    //     We have many columns, but still need to read+parse multiple row groups in parallel.)
+
+    // With all that in mind, here's what we do.
+    //
+    // We treat each row group as a sequential single-threaded stream of blocks.
+    //
+    // We have a sliding window of active row groups. When a row group becomes active, we start
+    // reading its data (using RAM). Row group becomes inactive when we finish reading and
+    // delivering all its blocks and free the RAM. Size of the window is max_decoding_threads.
+    //
+    // Decoded blocks are placed in `pending_chunks` queue, then picked up by generate().
+    // If row group decoding runs too far ahead of delivery (by `max_pending_chunks_per_row_group`
+    // chunks), we pause the stream for the row group, to avoid using too much memory when decoded
+    // chunks are much bigger than the compressed data.
+    //
+    // Also:
+    //  * If preserve_order = true, we deliver chunks strictly in order of increasing row group.
+    //    Decoding may still proceed in later row groups.
+    //  * If max_decoding_threads <= 1, we run all tasks inline in generate(), without thread pool.
+
+    // Potential improvements:
+    //  * Plan all read ranges ahead of time, for the whole file, and do prefetching for them
+    //    in background. Using max_download_threads, which can be made much greater than
+    //    max_decoding_threads by default.
+    //  * Can parse different columns within the same row group in parallel. This would let us have
+    //    fewer row groups in memory at once, reducing memory usage when selecting many columns.
+    //    Should probably do more than one column per task because columns are often very small.
+    //    Maybe split each row group into, say, max_decoding_threads * 2 equal-sized column bunches?
+    //  * Sliding window could take into account the (predicted) memory usage of row groups.
+    //    If row groups are big and many columns are selected, we may use lots of memory when
+    //    reading max_decoding_threads row groups at once. Can adjust the sliding window size based
+    //    on row groups' data sizes from metadata.
+    //  * The max_pending_chunks_per_row_group limit could be based on actual memory usage too.
+    //    Useful for preserve_order.
+
+    struct RowGroupState
+    {
+        // Transitions:
+        //
+        // NotStarted -> Running -> Complete
+        //                  Ʌ
+        //                  V
+        //               Paused
+        //
+        // If max_decoding_threads <= 1: NotStarted -> Complete.
+        enum class Status
+        {
+            NotStarted,
+            Running,
+            // Paused decoding because too many chunks are pending.
+            Paused,
+            // Decoded everything.
+            Done,
+        };
+
+        Status status = Status::NotStarted;
+
+        // Window of chunks that were decoded but not returned from generate():
+        //
+        // (delivered)            next_chunk_idx
+        //   v   v                       v
+        // +---+---+---+---+---+---+---+---+---+---+
+        // | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |    <-- all chunks
+        // +---+---+---+---+---+---+---+---+---+---+
+        //           ^   ^   ^   ^   ^
+        //           num_pending_chunks
+        //           (in pending_chunks)
+        //  (at most max_pending_chunks_per_row_group)
+
+        size_t next_chunk_idx = 0;
+        size_t num_pending_chunks = 0;
+
+        // These are only used by the decoding thread, so don't require locking the mutex.
+        std::unique_ptr<parquet::arrow::FileReader> file_reader;
+        std::shared_ptr<arrow::RecordBatchReader> record_batch_reader;
+        std::unique_ptr<ArrowColumnToCHColumn> arrow_column_to_ch_column;
+    };
+
+    // Chunk ready to be delivered by generate().
+    struct PendingChunk
+    {
+        Chunk chunk;
+        BlockMissingValues block_missing_values;
+        size_t chunk_idx; // within row group
+        size_t row_group_idx;
+
+        // For priority_queue.
+        // In ordered mode we deliver strictly in order of increasing row group idx,
+        // in unordered mode we prefer to interleave chunks from different row groups.
+        struct Compare
+        {
+            bool row_group_first = false;
+
+            bool operator()(const PendingChunk & a, const PendingChunk & b) const
+            {
+                auto tuplificate = [this](const PendingChunk & c)
+                { return row_group_first ? std::tie(c.row_group_idx, c.chunk_idx)
+                                         : std::tie(c.chunk_idx, c.row_group_idx); };
+                return tuplificate(a) > tuplificate(b);
+            }
+        };
+    };
+
+    std::unique_ptr<SeekableReadBufferFactory> buf_factory;
     const FormatSettings format_settings;
     const std::unordered_set<int> & skip_row_groups;
-    std::shared_ptr<arrow::RecordBatchReader> current_record_batch_reader;
+    size_t max_decoding_threads;
+    size_t min_bytes_for_seek;
+    const size_t max_pending_chunks_per_row_group = 2;
 
+    // RandomAccessFile is thread safe, so we share it among threads.
+    // FileReader is not, so each thread creates its own.
+    std::shared_ptr<arrow::io::RandomAccessFile> arrow_file;
+    std::shared_ptr<parquet::FileMetaData> metadata;
+    // indices of columns to read from Parquet file
+    std::vector<int> column_indices;
+
+    // Window of active row groups:
+    //
+    // row_groups_completed   row_groups_started
+    //          v                   v
+    //  +---+---+---+---+---+---+---+---+---+---+
+    //  | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |   <-- all row groups
+    //  +---+---+---+---+---+---+---+---+---+---+
+    //    ^   ^                       ^   ^   ^
+    //    Done                        NotStarted
+
+    std::mutex mutex;
+    // Wakes up the generate() call, if any.
+    std::condition_variable condvar;
+
+    std::vector<RowGroupState> row_groups;
+    std::priority_queue<PendingChunk, std::vector<PendingChunk>, PendingChunk::Compare> pending_chunks;
+    size_t row_groups_completed = 0;
+
+    // These are only used when max_decoding_threads > 1.
+    size_t row_groups_started = 0;
+    std::unique_ptr<ThreadPool> pool;
+
+    BlockMissingValues previous_block_missing_values;
+
+    std::exception_ptr background_exception = nullptr;
     std::atomic<int> is_stopped{0};
+    bool is_initialized = false;
 };
 
 class ParquetSchemaReader : public ISchemaReader
diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
index 18c81f8fd6a..e39271efa7c 100644
--- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
@@ -14,9 +14,13 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int UNKNOWN_EXCEPTION;
+    extern const int NOT_IMPLEMENTED;
 }
 
-static parquet::ParquetVersion::type getParquetVersion(const FormatSettings & settings)
+namespace
+{
+
+parquet::ParquetVersion::type getParquetVersion(const FormatSettings & settings)
 {
     switch (settings.parquet.output_version)
     {
@@ -31,12 +35,102 @@ static parquet::ParquetVersion::type getParquetVersion(const FormatSettings & se
     }
 }
 
+parquet::Compression::type getParquetCompression(FormatSettings::ParquetCompression method)
+{
+    if (method == FormatSettings::ParquetCompression::NONE)
+        return parquet::Compression::type::UNCOMPRESSED;
+
+#if USE_SNAPPY
+    if (method == FormatSettings::ParquetCompression::SNAPPY)
+        return parquet::Compression::type::SNAPPY;
+#endif
+
+#if USE_BROTLI
+    if (method == FormatSettings::ParquetCompression::BROTLI)
+        return parquet::Compression::type::BROTLI;
+#endif
+
+    if (method == FormatSettings::ParquetCompression::ZSTD)
+        return parquet::Compression::type::ZSTD;
+
+    if (method == FormatSettings::ParquetCompression::LZ4)
+        return parquet::Compression::type::LZ4;
+
+    if (method == FormatSettings::ParquetCompression::GZIP)
+        return parquet::Compression::type::GZIP;
+
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unsupported compression method");
+}
+
+}
+
 ParquetBlockOutputFormat::ParquetBlockOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_)
     : IOutputFormat(header_, out_), format_settings{format_settings_}
 {
 }
 
 void ParquetBlockOutputFormat::consume(Chunk chunk)
+{
+    /// Do something like SquashingTransform to produce big enough row groups.
+    /// Because the real SquashingTransform is only used for INSERT, not for SELECT ... INTO OUTFILE.
+    /// The latter doesn't even have a pipeline where a transform could be inserted, so it's more
+    /// convenient to do the squashing here.
+
+    appendToAccumulatedChunk(std::move(chunk));
+
+    if (!accumulated_chunk)
+        return;
+
+    const size_t target_rows = std::max(static_cast<UInt64>(1), format_settings.parquet.row_group_rows);
+
+    if (accumulated_chunk.getNumRows() < target_rows &&
+        accumulated_chunk.bytes() < format_settings.parquet.row_group_bytes)
+        return;
+
+    /// Increase row group size slightly (by < 2x) to avoid adding a small row groups for the
+    /// remainder of the new chunk.
+    /// E.g. suppose input chunks are 70K rows each, and max_rows = 1M. Then we'll have
+    /// getNumRows() = 1.05M. We want to write all 1.05M as one row group instead of 1M and 0.05M.
+    size_t num_row_groups = std::max(static_cast<UInt64>(1), accumulated_chunk.getNumRows() / target_rows);
+    size_t row_group_size = (accumulated_chunk.getNumRows() - 1) / num_row_groups + 1; // round up
+
+    write(std::move(accumulated_chunk), row_group_size);
+    accumulated_chunk.clear();
+}
+
+void ParquetBlockOutputFormat::finalizeImpl()
+{
+    if (accumulated_chunk)
+        write(std::move(accumulated_chunk), format_settings.parquet.row_group_rows);
+
+    if (!file_writer)
+    {
+        const Block & header = getPort(PortKind::Main).getHeader();
+        write(Chunk(header.getColumns(), 0), 1);
+    }
+
+    auto status = file_writer->Close();
+    if (!status.ok())
+        throw Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Error while closing a table: {}", status.ToString());
+}
+
+void ParquetBlockOutputFormat::resetFormatterImpl()
+{
+    file_writer.reset();
+}
+
+void ParquetBlockOutputFormat::appendToAccumulatedChunk(Chunk chunk)
+{
+    if (!accumulated_chunk)
+    {
+        accumulated_chunk = std::move(chunk);
+        return;
+    }
+    chassert(accumulated_chunk.getNumColumns() == chunk.getNumColumns());
+    accumulated_chunk.append(chunk);
+}
+
+void ParquetBlockOutputFormat::write(Chunk chunk, size_t row_group_size)
 {
     const size_t columns_num = chunk.getNumColumns();
     std::shared_ptr<arrow::Table> arrow_table;
@@ -60,46 +154,31 @@ void ParquetBlockOutputFormat::consume(Chunk chunk)
 
         parquet::WriterProperties::Builder builder;
         builder.version(getParquetVersion(format_settings));
-#if USE_SNAPPY
-        builder.compression(parquet::Compression::SNAPPY);
-#endif
-        auto props = builder.build();
-        auto status = parquet::arrow::FileWriter::Open(
+        builder.compression(getParquetCompression(format_settings.parquet.output_compression_method));
+
+        parquet::ArrowWriterProperties::Builder writer_props_builder;
+        if (format_settings.parquet.output_compliant_nested_types)
+            writer_props_builder.enable_compliant_nested_types();
+        else
+            writer_props_builder.disable_compliant_nested_types();
+
+        auto result = parquet::arrow::FileWriter::Open(
             *arrow_table->schema(),
             arrow::default_memory_pool(),
             sink,
-            props, /*parquet::default_writer_properties(),*/
-            &file_writer);
-        if (!status.ok())
-            throw Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Error while opening a table: {}", status.ToString());
+            builder.build(),
+            writer_props_builder.build());
+        if (!result.ok())
+            throw Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Error while opening a table: {}", result.status().ToString());
+        file_writer = std::move(result.ValueOrDie());
     }
 
-    // TODO: calculate row_group_size depending on a number of rows and table size
-    auto status = file_writer->WriteTable(*arrow_table, format_settings.parquet.row_group_size);
+    auto status = file_writer->WriteTable(*arrow_table, row_group_size);
 
     if (!status.ok())
         throw Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Error while writing a table: {}", status.ToString());
 }
 
-void ParquetBlockOutputFormat::finalizeImpl()
-{
-    if (!file_writer)
-    {
-        const Block & header = getPort(PortKind::Main).getHeader();
-
-        consume(Chunk(header.getColumns(), 0));
-    }
-
-    auto status = file_writer->Close();
-    if (!status.ok())
-        throw Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Error while closing a table: {}", status.ToString());
-}
-
-void ParquetBlockOutputFormat::resetFormatterImpl()
-{
-    file_writer.reset();
-}
-
 void registerOutputFormatParquet(FormatFactory & factory)
 {
     factory.registerOutputFormat(
diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
index 0518d9df77c..0fb7013e6d6 100644
--- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
@@ -35,6 +35,8 @@ public:
 
 private:
     void consume(Chunk) override;
+    void appendToAccumulatedChunk(Chunk chunk);
+    void write(Chunk chunk, size_t row_group_size);
     void finalizeImpl() override;
     void resetFormatterImpl() override;
 
@@ -42,6 +44,8 @@ private:
 
     std::unique_ptr<parquet::arrow::FileWriter> file_writer;
     std::unique_ptr<CHColumnToArrowColumn> ch_column_to_arrow_column;
+
+    Chunk accumulated_chunk;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/ParquetMetadataInputFormat.cpp b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.cpp
new file mode 100644
index 00000000000..229a0630328
--- /dev/null
+++ b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.cpp
@@ -0,0 +1,536 @@
+#include "ParquetMetadataInputFormat.h"
+
+#if USE_PARQUET
+
+#include <Formats/FormatFactory.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnNullable.h>
+#include <Core/NamesAndTypes.h>
+#include <arrow/api.h>
+#include <arrow/status.h>
+#include <parquet/file_reader.h>
+#include <parquet/statistics.h>
+#include "ArrowBufferedStreams.h"
+#include <DataTypes/NestedUtils.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+static NamesAndTypesList getHeaderForParquetMetadata()
+{
+    NamesAndTypesList names_and_types{
+        {"num_columns", std::make_shared<DataTypeUInt64>()},
+        {"num_rows", std::make_shared<DataTypeUInt64>()},
+        {"num_row_groups", std::make_shared<DataTypeUInt64>()},
+        {"format_version", std::make_shared<DataTypeString>()},
+        {"metadata_size", std::make_shared<DataTypeUInt64>()},
+        {"total_uncompressed_size", std::make_shared<DataTypeUInt64>()},
+        {"total_compressed_size", std::make_shared<DataTypeUInt64>()},
+        {"columns",
+         std::make_shared<DataTypeArray>(
+             std::make_shared<DataTypeTuple>(
+                 DataTypes{
+                     std::make_shared<DataTypeString>(),
+                     std::make_shared<DataTypeString>(),
+                     std::make_shared<DataTypeUInt64>(),
+                     std::make_shared<DataTypeUInt64>(),
+                     std::make_shared<DataTypeString>(),
+                     std::make_shared<DataTypeString>(),
+                     std::make_shared<DataTypeString>(),
+                     std::make_shared<DataTypeUInt64>(),
+                     std::make_shared<DataTypeUInt64>(),
+                     std::make_shared<DataTypeString>(),
+                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+                 Names{
+                     "name",
+                     "path",
+                     "max_definition_level",
+                     "max_repetition_level",
+                     "physical_type",
+                     "logical_type",
+                     "compression",
+                     "total_uncompressed_size",
+                     "total_compressed_size",
+                     "space_saved",
+                     "encodings"}))},
+        {"row_groups",
+         std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(
+             DataTypes{
+                 std::make_shared<DataTypeUInt64>(),
+                 std::make_shared<DataTypeUInt64>(),
+                 std::make_shared<DataTypeUInt64>(),
+                 std::make_shared<DataTypeUInt64>(),
+                 std::make_shared<DataTypeArray>(
+                     std::make_shared<DataTypeTuple>(
+                         DataTypes{
+                             std::make_shared<DataTypeString>(),
+                             std::make_shared<DataTypeString>(),
+                             std::make_shared<DataTypeUInt64>(),
+                             std::make_shared<DataTypeUInt64>(),
+                             DataTypeFactory::instance().get("Bool"),
+                             std::make_shared<DataTypeTuple>(
+                                 DataTypes{
+                                     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()),
+                                     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()),
+                                     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()),
+                                     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()),
+                                     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
+                                 Names{"num_values", "null_count", "distinct_count", "min", "max"}),
+                         },
+                         Names{"name", "path", "total_compressed_size", "total_uncompressed_size", "have_statistics", "statistics"}))},
+             Names{"num_columns", "num_rows", "total_uncompressed_size", "total_compressed_size", "columns"}))},
+    };
+    return names_and_types;
+}
+
+void checkHeader(const Block & header)
+{
+    auto expected_names_and_types = getHeaderForParquetMetadata();
+    std::unordered_map<String, DataTypePtr> name_to_type;
+    for (const auto & [name, type] : expected_names_and_types)
+        name_to_type[name] = type;
+
+    for (const auto & [name, type] : header.getNamesAndTypes())
+    {
+        auto it = name_to_type.find(name);
+        if (it == name_to_type.end())
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Unexpected column: {}. ParquetMetadata format allows only the next columns: num_columns, num_rows, num_row_groups, "
+                "format_version, metadata_size, total_uncompressed_size, total_compressed_size, columns, row_groups", name);
+
+        if (!it->second->equals(*type))
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Unexpected type {} for column {}. Expected type: {}",
+                type->getName(),
+                name,
+                it->second->getName());
+    }
+}
+
+static std::shared_ptr<parquet::FileMetaData> getFileMetadata(
+    ReadBuffer & in,
+    const FormatSettings & format_settings,
+    std::atomic<int> & is_stopped)
+{
+    auto arrow_file = asArrowFile(in, format_settings, is_stopped, "Parquet", PARQUET_MAGIC_BYTES);
+    return parquet::ReadMetaData(arrow_file);
+}
+
+ParquetMetadataInputFormat::ParquetMetadataInputFormat(ReadBuffer & in_, Block header_, const FormatSettings & format_settings_)
+    : IInputFormat(std::move(header_), &in_), format_settings(format_settings_)
+{
+    checkHeader(getPort().getHeader());
+}
+
+Chunk ParquetMetadataInputFormat::generate()
+{
+    Chunk res;
+    if (done)
+        return res;
+
+    auto metadata = getFileMetadata(*in, format_settings, is_stopped);
+
+    const auto & header = getPort().getHeader();
+    auto names_and_types = getHeaderForParquetMetadata();
+    auto names = names_and_types.getNames();
+    auto types = names_and_types.getTypes();
+
+    for (const auto & name : header.getNames())
+    {
+        /// num_columns
+        if (name == names[0])
+        {
+            auto column = types[0]->createColumn();
+            assert_cast<ColumnUInt64 &>(*column).insertValue(metadata->num_columns());
+            res.addColumn(std::move(column));
+        }
+        /// num_rows
+        else if (name == names[1])
+        {
+            auto column = types[1]->createColumn();
+            assert_cast<ColumnUInt64 &>(*column).insertValue(metadata->num_rows());
+            res.addColumn(std::move(column));
+        }
+        /// num_row_groups
+        else if (name == names[2])
+        {
+            auto column = types[2]->createColumn();
+            assert_cast<ColumnUInt64 &>(*column).insertValue(metadata->num_row_groups());
+            res.addColumn(std::move(column));
+        }
+        /// format_version
+        else if (name == names[3])
+        {
+            auto column = types[3]->createColumn();
+            /// Version сan be only PARQUET_1_0 or PARQUET_2_LATEST (which is 2.6).
+            String version = metadata->version() == parquet::ParquetVersion::PARQUET_1_0 ? "1.0" : "2.6";
+            assert_cast<ColumnString &>(*column).insertData(version.data(), version.size());
+            res.addColumn(std::move(column));
+        }
+        /// metadata_size
+        else if (name == names[4])
+        {
+            auto column = types[4]->createColumn();
+            assert_cast<ColumnUInt64 &>(*column).insertValue(metadata->size());
+            res.addColumn(std::move(column));
+        }
+        /// total_uncompressed_size
+        else if (name == names[5])
+        {
+            auto column = types[5]->createColumn();
+            size_t total_uncompressed_size = 0;
+            for (int32_t i = 0; i != metadata->num_row_groups(); ++i)
+                total_uncompressed_size += metadata->RowGroup(i)->total_byte_size();
+
+            assert_cast<ColumnUInt64 &>(*column).insertValue(total_uncompressed_size);
+            res.addColumn(std::move(column));
+        }
+        /// total_compressed_size
+        else if (name == names[6])
+        {
+            auto column = types[6]->createColumn();
+            size_t total_compressed_size = 0;
+            for (int32_t i = 0; i != metadata->num_row_groups(); ++i)
+                total_compressed_size += metadata->RowGroup(i)->total_compressed_size();
+
+            assert_cast<ColumnUInt64 &>(*column).insertValue(total_compressed_size);
+            res.addColumn(std::move(column));
+        }
+        /// columns
+        else if (name == names[7])
+        {
+            auto column = types[7]->createColumn();
+            fillColumnsMetadata(metadata, column);
+            res.addColumn(std::move(column));
+        }
+        /// row_groups
+        else if (name == names[8])
+        {
+            auto column = types[8]->createColumn();
+            fillRowGroupsMetadata(metadata, column);
+            res.addColumn(std::move(column));
+        }
+    }
+
+    done = true;
+    return res;
+}
+
+void ParquetMetadataInputFormat::fillColumnsMetadata(const std::shared_ptr<parquet::FileMetaData> & metadata, MutableColumnPtr & column)
+{
+    auto & array_column = assert_cast<ColumnArray &>(*column);
+    auto & tuple_column = assert_cast<ColumnTuple &>(array_column.getData());
+    int32_t num_columns = metadata->num_columns();
+    for (int32_t column_i = 0; column_i != num_columns; ++column_i)
+    {
+        const auto * column_info = metadata->schema()->Column(column_i);
+        /// name
+        String column_name = column_info->name();
+        assert_cast<ColumnString &>(tuple_column.getColumn(0)).insertData(column_name.data(), column_name.size());
+        /// path
+        String path = column_info->path()->ToDotString();
+        assert_cast<ColumnString &>(tuple_column.getColumn(1)).insertData(path.data(), path.size());
+        /// max_definition_level
+        assert_cast<ColumnUInt64 &>(tuple_column.getColumn(2)).insertValue(column_info->max_definition_level());
+        /// max_repetition_level
+        assert_cast<ColumnUInt64 &>(tuple_column.getColumn(3)).insertValue(column_info->max_repetition_level());
+        /// physical_type
+        std::string_view physical_type = magic_enum::enum_name(column_info->physical_type());
+        assert_cast<ColumnString &>(tuple_column.getColumn(4)).insertData(physical_type.data(), physical_type.size());
+        /// logical_type
+        String logical_type = column_info->logical_type()->ToString();
+        assert_cast<ColumnString &>(tuple_column.getColumn(5)).insertData(logical_type.data(), logical_type.size());
+
+        if (metadata->num_row_groups() > 0)
+        {
+            auto column_chunk_metadata = metadata->RowGroup(0)->ColumnChunk(column_i);
+            /// compression
+            std::string_view compression = magic_enum::enum_name(column_chunk_metadata->compression());
+            assert_cast<ColumnString &>(tuple_column.getColumn(6)).insertData(compression.data(), compression.size());
+
+            /// total_uncompressed_size/total_compressed_size
+            size_t total_uncompressed_size = 0;
+            size_t total_compressed_size = 0;
+            for (int32_t row_group_i = 0; row_group_i != metadata->num_row_groups(); ++row_group_i)
+            {
+                column_chunk_metadata = metadata->RowGroup(row_group_i)->ColumnChunk(column_i);
+                total_uncompressed_size += column_chunk_metadata->total_uncompressed_size();
+                total_compressed_size += column_chunk_metadata->total_compressed_size();
+            }
+            assert_cast<ColumnUInt64 &>(tuple_column.getColumn(7)).insertValue(total_uncompressed_size);
+            assert_cast<ColumnUInt64 &>(tuple_column.getColumn(8)).insertValue(total_compressed_size);
+
+            /// space_saved
+            String space_saved = fmt::format("{:.4}%", (1 - double(total_compressed_size) / total_uncompressed_size) * 100);
+            assert_cast<ColumnString &>(tuple_column.getColumn(9)).insertData(space_saved.data(), space_saved.size());
+
+            /// encodings
+            auto & encodings_array_column = assert_cast<ColumnArray &>(tuple_column.getColumn(10));
+            auto & encodings_nested_column = assert_cast<ColumnString &>(encodings_array_column.getData());
+            for (auto codec : column_chunk_metadata->encodings())
+            {
+                auto codec_name = magic_enum::enum_name(codec);
+                encodings_nested_column.insertData(codec_name.data(), codec_name.size());
+            }
+            encodings_array_column.getOffsets().push_back(encodings_nested_column.size());
+        }
+        else
+        {
+            String compression = "NONE";
+            assert_cast<ColumnString &>(tuple_column.getColumn(6)).insertData(compression.data(), compression.size());
+            tuple_column.getColumn(7).insertDefault();
+            tuple_column.getColumn(8).insertDefault();
+            tuple_column.getColumn(9).insertDefault();
+            tuple_column.getColumn(10).insertDefault();
+        }
+    }
+    array_column.getOffsets().push_back(tuple_column.size());
+}
+
+void ParquetMetadataInputFormat::fillRowGroupsMetadata(const std::shared_ptr<parquet::FileMetaData> & metadata, MutableColumnPtr & column)
+{
+    auto & row_groups_array_column = assert_cast<ColumnArray &>(*column);
+    auto & row_groups_column = assert_cast<ColumnTuple &>(row_groups_array_column.getData());
+    for (int32_t i = 0; i != metadata->num_row_groups(); ++i)
+    {
+        auto row_group_metadata = metadata->RowGroup(i);
+        /// num_columns
+        assert_cast<ColumnUInt64 &>(row_groups_column.getColumn(0)).insertValue(row_group_metadata->num_columns());
+        /// num_rows
+        assert_cast<ColumnUInt64 &>(row_groups_column.getColumn(1)).insertValue(row_group_metadata->num_rows());
+        /// total_uncompressed_size
+        assert_cast<ColumnUInt64 &>(row_groups_column.getColumn(2)).insertValue(row_group_metadata->total_byte_size());
+        /// total_compressed_size
+        assert_cast<ColumnUInt64 &>(row_groups_column.getColumn(3)).insertValue(row_group_metadata->total_compressed_size());
+        /// columns
+        fillColumnChunksMetadata(row_group_metadata, row_groups_column.getColumn(4));
+    }
+    row_groups_array_column.getOffsets().push_back(row_groups_column.size());
+}
+
+void ParquetMetadataInputFormat::fillColumnChunksMetadata(const std::unique_ptr<parquet::RowGroupMetaData> & row_group_metadata, IColumn & column)
+{
+    auto & array_column = assert_cast<ColumnArray &>(column);
+    auto & tuple_column = assert_cast<ColumnTuple &>(array_column.getData());
+    for (int32_t column_i = 0; column_i != row_group_metadata->num_columns(); ++column_i)
+    {
+        auto column_chunk_metadata = row_group_metadata->ColumnChunk(column_i);
+        /// name
+        String column_name = row_group_metadata->schema()->Column(column_i)->name();
+        assert_cast<ColumnString &>(tuple_column.getColumn(0)).insertData(column_name.data(), column_name.size());
+        /// path
+        String path = row_group_metadata->schema()->Column(column_i)->path()->ToDotString();
+        assert_cast<ColumnString &>(tuple_column.getColumn(1)).insertData(path.data(), path.size());
+        /// total_compressed_size
+        assert_cast<ColumnUInt64 &>(tuple_column.getColumn(2)).insertValue(column_chunk_metadata->total_compressed_size());
+        /// total_uncompressed_size
+        assert_cast<ColumnUInt64 &>(tuple_column.getColumn(3)).insertValue(column_chunk_metadata->total_uncompressed_size());
+        /// have_statistics
+        bool have_statistics = column_chunk_metadata->is_stats_set();
+        assert_cast<ColumnUInt8 &>(tuple_column.getColumn(4)).insertValue(have_statistics);
+        if (have_statistics)
+            fillColumnStatistics(column_chunk_metadata->statistics(), tuple_column.getColumn(5), row_group_metadata->schema()->Column(column_i)->type_length());
+        else
+            tuple_column.getColumn(5).insertDefault();
+    }
+    array_column.getOffsets().push_back(tuple_column.size());
+}
+
+template <typename T>
+static void getMinMaxNumberStatistics(const std::shared_ptr<parquet::Statistics> & statistics, String & min, String & max)
+{
+    const auto & typed_statistics = dynamic_cast<parquet::TypedStatistics<T> &>(*statistics);
+    min = std::to_string(typed_statistics.min());
+    max = std::to_string(typed_statistics.max());
+}
+
+void ParquetMetadataInputFormat::fillColumnStatistics(const std::shared_ptr<parquet::Statistics> & statistics, IColumn & column, int32_t type_length)
+{
+    auto & statistics_column = assert_cast<ColumnTuple &>(column);
+    /// num_values
+    auto & nullable_num_values = assert_cast<ColumnNullable &>(statistics_column.getColumn(0));
+    assert_cast<ColumnUInt64 &>(nullable_num_values.getNestedColumn()).insertValue(statistics->num_values());
+    nullable_num_values.getNullMapData().push_back(0);
+
+    /// null_count
+    if (statistics->HasNullCount())
+    {
+        auto & nullable_null_count = assert_cast<ColumnNullable &>(statistics_column.getColumn(1));
+        assert_cast<ColumnUInt64 &>(nullable_null_count.getNestedColumn()).insertValue(statistics->null_count());
+        nullable_null_count.getNullMapData().push_back(0);
+    }
+    else
+    {
+        statistics_column.getColumn(1).insertDefault();
+    }
+
+    /// distinct_count
+    if (statistics->HasDistinctCount())
+    {
+        auto & nullable_distinct_count = assert_cast<ColumnNullable &>(statistics_column.getColumn(2));
+        size_t distinct_count = statistics->distinct_count();
+        /// It can be set but still be 0 because of a bug: https://github.com/apache/arrow/issues/27644
+        /// If we see distinct_count = 0 with non 0 values in chunk, set it to NULL
+        if (distinct_count == 0 && statistics->num_values() != 0)
+        {
+            nullable_distinct_count.insertDefault();
+        }
+        else
+        {
+            assert_cast<ColumnUInt64 &>(nullable_distinct_count.getNestedColumn()).insertValue(distinct_count);
+            nullable_distinct_count.getNullMapData().push_back(0);
+        }
+    }
+    else
+    {
+        statistics_column.getColumn(2).insertDefault();
+    }
+
+    /// min/max
+    if (statistics->HasMinMax() && statistics->physical_type() != parquet::Type::type::UNDEFINED)
+    {
+        String min;
+        String max;
+        switch (statistics->physical_type())
+        {
+            case parquet::Type::type::FLOAT:
+            {
+                getMinMaxNumberStatistics<parquet::FloatType>(statistics, min, max);
+                break;
+            }
+            case parquet::Type::type::DOUBLE:
+            {
+                getMinMaxNumberStatistics<parquet::DoubleType>(statistics, min, max);
+                break;
+            }
+            case parquet::Type::type::INT32:
+            {
+                getMinMaxNumberStatistics<parquet::Int32Type>(statistics, min, max);
+                break;
+            }
+            case parquet::Type::type::INT64:
+            {
+                getMinMaxNumberStatistics<parquet::Int64Type>(statistics, min, max);
+                break;
+            }
+            case parquet::Type::type::INT96:
+            {
+                const auto & int96_statistics = dynamic_cast<parquet::TypedStatistics<parquet::Int96Type> &>(*statistics);
+                min = parquet::Int96ToString(int96_statistics.min());
+                max = parquet::Int96ToString(int96_statistics.max());
+                break;
+            }
+            case parquet::Type::type::BOOLEAN:
+            {
+                getMinMaxNumberStatistics<parquet::BooleanType>(statistics, min, max);
+                break;
+            }
+            case parquet::Type::type::BYTE_ARRAY:
+            {
+                const auto & byte_array_statistics = dynamic_cast<parquet::ByteArrayStatistics &>(*statistics);
+                min = parquet::ByteArrayToString(byte_array_statistics.min());
+                max = parquet::ByteArrayToString(byte_array_statistics.max());
+                break;
+            }
+            case parquet::Type::type::FIXED_LEN_BYTE_ARRAY:
+            {
+                const auto & flba_statistics = dynamic_cast<parquet::FLBAStatistics &>(*statistics);
+                min = parquet::FixedLenByteArrayToString(flba_statistics.min(), type_length);
+                max = parquet::FixedLenByteArrayToString(flba_statistics.max(), type_length);
+                break;
+            }
+            case parquet::Type::type::UNDEFINED:
+            {
+                break; /// unreachable
+            }
+        }
+
+        auto & nullable_min = assert_cast<ColumnNullable &>(statistics_column.getColumn(3));
+        assert_cast<ColumnString &>(nullable_min.getNestedColumn()).insertData(min.data(), min.size());
+        nullable_min.getNullMapData().push_back(0);
+        auto & nullable_max = assert_cast<ColumnNullable &>(statistics_column.getColumn(4));
+        assert_cast<ColumnString &>(nullable_max.getNestedColumn()).insertData(max.data(), max.size());
+        nullable_max.getNullMapData().push_back(0);
+    }
+    else
+    {
+        statistics_column.getColumn(3).insertDefault();
+        statistics_column.getColumn(4).insertDefault();
+    }
+}
+
+void ParquetMetadataInputFormat::resetParser()
+{
+    IInputFormat::resetParser();
+    done = false;
+}
+
+ParquetMetadataSchemaReader::ParquetMetadataSchemaReader(ReadBuffer & in_)
+    : ISchemaReader(in_)
+{
+}
+
+NamesAndTypesList ParquetMetadataSchemaReader::readSchema()
+{
+    return getHeaderForParquetMetadata();
+}
+
+void registerInputFormatParquetMetadata(FormatFactory & factory)
+{
+    factory.registerInputFormat(
+        "ParquetMetadata",
+        [](ReadBuffer &buf,
+           const Block &sample,
+           const RowInputFormatParams &,
+           const FormatSettings & settings)
+        {
+            return std::make_shared<ParquetMetadataInputFormat>(buf, sample, settings);
+        });
+    factory.markFormatSupportsSubcolumns("ParquetMetadata");
+    factory.markFormatSupportsSubsetOfColumns("ParquetMetadata");
+}
+
+void registerParquetMetadataSchemaReader(FormatFactory & factory)
+{
+    factory.registerSchemaReader(
+        "ParquetMetadata",
+        [](ReadBuffer & buf, const FormatSettings &)
+        {
+            return std::make_shared<ParquetMetadataSchemaReader>(buf);
+        }
+    );
+}
+
+}
+
+#else
+
+namespace DB
+{
+class FormatFactory;
+void registerInputFormatParquetMetadata(FormatFactory &)
+{
+}
+
+void registerParquetMetadataSchemaReader(FormatFactory &) {}
+}
+
+#endif
diff --git a/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
new file mode 100644
index 00000000000..2d027e5000f
--- /dev/null
+++ b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
@@ -0,0 +1,93 @@
+#pragma once
+#include "config.h"
+#if USE_PARQUET
+
+#include <Processors/Formats/IInputFormat.h>
+#include <Processors/Formats/ISchemaReader.h>
+#include <Formats/FormatSettings.h>
+#include <parquet/metadata.h>
+
+namespace parquet::arrow { class FileReader; }
+
+namespace arrow { class Buffer; class RecordBatchReader;}
+
+namespace DB
+{
+
+/* Special format that always returns just one row with Parquet file metadata (see https://parquet.apache.org/docs/file-format/metadata/).
+ * The result row have the next structure:
+ * num_columns - the number of columns
+ * num_rows - the total number of rows
+ * num_row_groups - the total number of row groups
+ * format_version - parquet format version, always 1.0 or 2.6
+ * total_uncompressed_size - total bytes size of the data, calculated as the sum of total_uncompressed_size from all row groups
+ * total_compressed_size - total compressed bytes size of the data, calculated as the sum of total_compressed_size from all row groups
+ * columns - the list of columns metadata with the next structure:
+ *     name - column name
+ *     path - column path (differs from name for nested column)
+ *     max_definition_level - maximum definition level
+ *     max_repetition_level - maximum repetition level
+ *     physical_type - column physical type
+ *     logical_type - column logical type
+ *     compression - compression used for this column
+ *     total_compressed_size - total compressed bytes size of the column, calculated as the sum of total_uncompressed_size of the column from all row groups
+ *     total_uncompressed_size - total uncompressed bytes size of the column, calculated as the sum of total_compressed_size of the column from all row groups
+ *     space_saved - percent of space saved by compression, calculated as (1 - total_compressed_size/total_uncompressed_size).
+ *     encodings - the list of encodings used for this column
+ * row_groups - the list of row groups metadata with the next structure:
+ *     num_columns - the number of columns in the row group
+ *     num_rows - the number of rows in the row group
+ *     total_uncompressed_size - total bytes size of the row group
+ *     total_compressed_size - total compressed bytes size of the row group
+ *     columns - the list of column chunks metadata with the next structure:
+ *         name - column name
+ *         path - column path
+ *         total_compressed_size - total compressed bytes size of the column in the row group
+ *         total_uncompressed_size - total uncompressed bytes size of the column in the row group
+ *         have_statistics - bool flag that indicates if column chunk metadata contains column statistics
+ *         statistics - column chunk statistics (all fields are NULL if have_statistics = false) with the next structure:
+ *             num_values - the number of non-null values in the column chunk
+ *             null_count - the number of NULL values in the column chunk
+ *             distinct_count - the number pf distinct values in the column chunk
+ *             min - the minimum value of the column chunk
+ *             max - the maximum column of the column chunk
+ * */
+
+class ParquetMetadataInputFormat : public IInputFormat
+{
+public:
+    ParquetMetadataInputFormat(ReadBuffer & in_, Block header_, const FormatSettings & format_settings_);
+
+    String getName() const override { return "ParquetMetadataInputFormat"; }
+
+    void resetParser() override;
+
+private:
+    Chunk generate() override;
+
+    void onCancel() override
+    {
+        is_stopped = 1;
+    }
+
+    void fillColumnsMetadata(const std::shared_ptr<parquet::FileMetaData> & metadata, MutableColumnPtr & column);
+    void fillRowGroupsMetadata(const std::shared_ptr<parquet::FileMetaData> & metadata, MutableColumnPtr & column);
+    void fillColumnChunksMetadata(const std::unique_ptr<parquet::RowGroupMetaData> & row_group_metadata, IColumn & column);
+    void fillColumnStatistics(const std::shared_ptr<parquet::Statistics> & statistics, IColumn & column, int32_t type_length);
+
+    const FormatSettings format_settings;
+    bool done = false;
+    std::atomic<int> is_stopped{0};
+};
+
+class ParquetMetadataSchemaReader : public ISchemaReader
+{
+public:
+    ParquetMetadataSchemaReader(ReadBuffer & in_);
+
+    NamesAndTypesList readSchema() override;
+};
+
+}
+
+#endif
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
index cefe3ee4a98..14648e68f94 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
@@ -1,8 +1,3 @@
-#include <sys/ioctl.h>
-#if defined(OS_SUNOS)
-#  include <sys/termios.h>
-#endif
-#include <unistd.h>
 #include <Processors/Formats/Impl/PrettyBlockOutputFormat.h>
 #include <Formats/FormatFactory.h>
 #include <IO/WriteBuffer.h>
@@ -10,6 +5,8 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <Common/UTF8Helpers.h>
+#include <Common/PODArray.h>
+
 
 namespace DB
 {
@@ -18,9 +15,6 @@ PrettyBlockOutputFormat::PrettyBlockOutputFormat(
     WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_, bool mono_block_)
      : IOutputFormat(header_, out_), format_settings(format_settings_), serializations(header_.getSerializations()), mono_block(mono_block_)
 {
-    struct winsize w;
-    if (0 == ioctl(STDOUT_FILENO, TIOCGWINSZ, &w))
-        terminal_width = w.ws_col;
 }
 
 
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
index 95c72d15fa9..dfb23ac63f9 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
@@ -29,8 +29,6 @@ protected:
     void consumeExtremes(Chunk) override;
 
     size_t total_rows = 0;
-    size_t terminal_width = 0;
-
     size_t row_number_width = 7; // "10000. "
 
     const FormatSettings format_settings;
diff --git a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
index 46d1872412c..0fb1a413a6c 100644
--- a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
@@ -45,7 +45,7 @@ void PrettySpaceBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port
 
         if (col.type->shouldAlignRightInPrettyFormats())
         {
-            for (ssize_t k = 0; k < std::max(static_cast<ssize_t>(0), static_cast<ssize_t>(max_widths[i] - name_widths[i])); ++k)
+            for (ssize_t k = 0; k < std::max(0z, static_cast<ssize_t>(max_widths[i] - name_widths[i])); ++k)
                 writeChar(' ', out);
 
             if (format_settings.pretty.color)
@@ -62,7 +62,7 @@ void PrettySpaceBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port
             if (format_settings.pretty.color)
                 writeCString("\033[0m", out);
 
-            for (ssize_t k = 0; k < std::max(static_cast<ssize_t>(0), static_cast<ssize_t>(max_widths[i] - name_widths[i])); ++k)
+            for (ssize_t k = 0; k < std::max(0z, static_cast<ssize_t>(max_widths[i] - name_widths[i])); ++k)
                 writeChar(' ', out);
         }
     }
diff --git a/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp b/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
index d290280bdbf..c2ee5923c01 100644
--- a/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
@@ -281,9 +281,9 @@ static void columnMapToContainer(const ColumnMap * col_map, size_t row_num, Cont
     Field field;
     col_map->get(row_num, field);
     const auto & map_field = field.get<Map>();
-    for (size_t i = 0; i < map_field.size(); ++i)
+    for (const auto & map_element : map_field)
     {
-        const auto & map_entry = map_field[i].get<Tuple>();
+        const auto & map_entry = map_element.get<Tuple>();
 
         String entry_key;
         String entry_value;
diff --git a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
index 74ce7d7f2ac..d902a8be6a7 100644
--- a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
@@ -4,7 +4,6 @@
 #include <DataTypes/Serializations/SerializationNullable.h>
 #include <Formats/EscapingRuleUtils.h>
 #include <Formats/SchemaInferenceUtils.h>
-#include <Formats/newLineSegmentationEngine.h>
 #include <IO/ReadHelpers.h>
 
 namespace DB
@@ -180,9 +179,46 @@ void registerInputFormatRegexp(FormatFactory & factory)
     });
 }
 
+static std::pair<bool, size_t> segmentationEngine(ReadBuffer & in, DB::Memory<> & memory, size_t min_bytes, size_t max_rows)
+{
+    char * pos = in.position();
+    bool need_more_data = true;
+    size_t number_of_rows = 0;
+
+    while (loadAtPosition(in, memory, pos) && need_more_data)
+    {
+        pos = find_first_symbols<'\r', '\n'>(pos, in.buffer().end());
+        if (pos > in.buffer().end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Position in buffer is out of bounds. There must be a bug.");
+        else if (pos == in.buffer().end())
+            continue;
+
+        ++number_of_rows;
+        if ((memory.size() + static_cast<size_t>(pos - in.position()) >= min_bytes) || (number_of_rows == max_rows))
+            need_more_data = false;
+
+        if (*pos == '\n')
+        {
+            ++pos;
+            if (loadAtPosition(in, memory, pos) && *pos == '\r')
+                ++pos;
+        }
+        else if (*pos == '\r')
+        {
+            ++pos;
+            if (loadAtPosition(in, memory, pos) && *pos == '\n')
+                ++pos;
+        }
+    }
+
+    saveUpToPosition(in, memory, pos);
+
+    return {loadAtPosition(in, memory, pos), number_of_rows};
+}
+
 void registerFileSegmentationEngineRegexp(FormatFactory & factory)
 {
-    factory.registerFileSegmentationEngine("Regexp", &newLineFileSegmentationEngine);
+    factory.registerFileSegmentationEngine("Regexp", &segmentationEngine);
 }
 
 void registerRegexpSchemaReader(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
index 1a519fa977f..8a09e800fa7 100644
--- a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
@@ -169,7 +169,7 @@ bool TemplateRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & col
 {
     out << "Suffix does not match: ";
     size_t last_successfully_parsed_idx = format_reader->getFormatDataIdx() + 1;
-    const ReadBuffer::Position row_begin_pos = buf->position();
+    auto * const row_begin_pos = buf->position();
     bool caught = false;
     try
     {
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index 98f47b30b1b..ad4e259d874 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -45,7 +45,7 @@ ValuesBlockInputFormat::ValuesBlockInputFormat(
     const Block & header_,
     const RowInputFormatParams & params_,
     const FormatSettings & format_settings_)
-    : IInputFormat(header_, *buf_), buf(std::move(buf_)),
+    : IInputFormat(header_, buf_.get()), buf(std::move(buf_)),
         params(params_), format_settings(format_settings_), num_columns(header_.columns()),
         parser_type_for_column(num_columns, ParserType::Streaming),
         attempts_to_deduce_template(num_columns), attempts_to_deduce_template_cached(num_columns),
@@ -251,7 +251,7 @@ bool ValuesBlockInputFormat::tryParseExpressionUsingTemplate(MutableColumnPtr &
     /// Do not use this template anymore
     templates[column_idx].reset();
     buf->rollbackToCheckpoint();
-    *token_iterator = start;
+    token_iterator = start;
 
     /// It will deduce new template or fallback to slow SQL parser
     return parseExpression(*column, column_idx);
diff --git a/src/Processors/IProcessor.h b/src/Processors/IProcessor.h
index 6d17db69c9e..34322acb2af 100644
--- a/src/Processors/IProcessor.h
+++ b/src/Processors/IProcessor.h
@@ -21,6 +21,9 @@ class IQueryPlanStep;
 struct StorageLimits;
 using StorageLimitsList = std::list<StorageLimits>;
 
+class RowsBeforeLimitCounter;
+using RowsBeforeLimitCounterPtr = std::shared_ptr<RowsBeforeLimitCounter>;
+
 class IProcessor;
 using ProcessorPtr = std::shared_ptr<IProcessor>;
 using Processors = std::vector<ProcessorPtr>;
@@ -234,11 +237,12 @@ public:
 
     /// In case if query was cancelled executor will wait till all processors finish their jobs.
     /// Generally, there is no reason to check this flag. However, it may be reasonable for long operations (e.g. i/o).
-    bool isCancelled() const { return is_cancelled; }
+    bool isCancelled() const { return is_cancelled.load(std::memory_order_acquire); }
     void cancel()
     {
-        is_cancelled = true;
-        onCancel();
+        bool already_cancelled = is_cancelled.exchange(true, std::memory_order_acq_rel);
+        if (!already_cancelled)
+            onCancel();
     }
 
     /// Additional method which is called in case if ports were updated while work() method.
@@ -357,6 +361,10 @@ public:
     /// You should zero internal counters in the call, in order to make in idempotent.
     virtual std::optional<ReadProgress> getReadProgress() { return std::nullopt; }
 
+    /// Set rows_before_limit counter for current processor.
+    /// This counter is used to calculate the number of rows right before any filtration of LimitTransform.
+    virtual void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr /* counter */) {}
+
 protected:
     virtual void onCancel() {}
 
diff --git a/src/Processors/ISource.cpp b/src/Processors/ISource.cpp
index 221b98642f6..6a88d3973a1 100644
--- a/src/Processors/ISource.cpp
+++ b/src/Processors/ISource.cpp
@@ -72,7 +72,7 @@ void ISource::progress(size_t read_rows, size_t read_bytes)
 
 std::optional<ISource::ReadProgress> ISource::getReadProgress()
 {
-    if (finished && read_progress.read_bytes == 0 && read_progress.read_bytes == 0 && read_progress.total_rows_approx == 0)
+    if (finished && read_progress.read_bytes == 0 && read_progress.total_rows_approx == 0)
         return {};
 
     ReadProgressCounters res_progress;
@@ -124,7 +124,7 @@ std::optional<Chunk> ISource::tryGenerate()
 {
     auto chunk = generate();
     if (!chunk)
-        return {};
+        return std::nullopt;
 
     return chunk;
 }
diff --git a/src/Processors/LimitTransform.cpp b/src/Processors/LimitTransform.cpp
index 2feee7e65b1..5e24062d67a 100644
--- a/src/Processors/LimitTransform.cpp
+++ b/src/Processors/LimitTransform.cpp
@@ -183,7 +183,7 @@ LimitTransform::Status LimitTransform::preparePair(PortsData & data)
 
     auto rows = data.current_chunk.getNumRows();
 
-    if (rows_before_limit_at_least)
+    if (rows_before_limit_at_least && !data.input_port_has_counter)
         rows_before_limit_at_least->add(rows);
 
     /// Skip block (for 'always_read_till_end' case).
diff --git a/src/Processors/LimitTransform.h b/src/Processors/LimitTransform.h
index 0d8c5f4ea47..33ff968985f 100644
--- a/src/Processors/LimitTransform.h
+++ b/src/Processors/LimitTransform.h
@@ -41,6 +41,11 @@ private:
         InputPort * input_port = nullptr;
         OutputPort * output_port = nullptr;
         bool is_finished = false;
+
+        /// This flag is used to avoid counting rows multiple times before applying a limit
+        /// condition, which can happen through certain input ports like PartialSortingTransform and
+        /// RemoteSource.
+        bool input_port_has_counter = false;
     };
 
     std::vector<PortsData> ports_data;
@@ -66,7 +71,8 @@ public:
     InputPort & getInputPort() { return inputs.front(); }
     OutputPort & getOutputPort() { return outputs.front(); }
 
-    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) { rows_before_limit_at_least.swap(counter); }
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { rows_before_limit_at_least.swap(counter); }
+    void setInputPortHasCounter(size_t pos) { ports_data[pos].input_port_has_counter = true; }
 };
 
 }
diff --git a/src/Processors/Merges/AggregatingSortedTransform.h b/src/Processors/Merges/AggregatingSortedTransform.h
index b0cdf4c8a3c..c6d7e844c65 100644
--- a/src/Processors/Merges/AggregatingSortedTransform.h
+++ b/src/Processors/Merges/AggregatingSortedTransform.h
@@ -13,14 +13,18 @@ class AggregatingSortedTransform final : public IMergingTransform<AggregatingSor
 {
 public:
     AggregatingSortedTransform(
-        const Block & header, size_t num_inputs,
-        SortDescription description_, size_t max_block_size)
+        const Block & header,
+        size_t num_inputs,
+        SortDescription description_,
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
             header,
             num_inputs,
             std::move(description_),
-            max_block_size)
+            max_block_size_rows,
+            max_block_size_bytes)
     {
     }
 
diff --git a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp
index 560be60987b..3525a5cab77 100644
--- a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp
@@ -117,7 +117,7 @@ static void postprocessChunk(Chunk & chunk, const AggregatingSortedAlgorithm::Co
         {
             const auto & from_type = desc.nested_type;
             const auto & to_type = desc.real_type;
-            columns[desc.column_number] = recursiveTypeConversion(columns[desc.column_number], from_type, to_type);
+            columns[desc.column_number] = recursiveLowCardinalityTypeConversion(columns[desc.column_number], from_type, to_type);
         }
     }
 
@@ -159,8 +159,11 @@ AggregatingSortedAlgorithm::SimpleAggregateDescription::~SimpleAggregateDescript
 
 
 AggregatingSortedAlgorithm::AggregatingMergedData::AggregatingMergedData(
-    MutableColumns columns_, UInt64 max_block_size_, ColumnsDefinition & def_)
-    : MergedData(std::move(columns_), false, max_block_size_), def(def_)
+    MutableColumns columns_,
+    UInt64 max_block_size_rows_,
+    UInt64 max_block_size_bytes_,
+    ColumnsDefinition & def_)
+    : MergedData(std::move(columns_), false, max_block_size_rows_, max_block_size_bytes_), def(def_)
 {
     initAggregateDescription();
 
@@ -168,7 +171,7 @@ AggregatingSortedAlgorithm::AggregatingMergedData::AggregatingMergedData(
     if (def.allocates_memory_in_arena)
     {
         arena = std::make_unique<Arena>();
-        arena_size = arena->size();
+        arena_size = arena->allocatedBytes();
     }
 }
 
@@ -194,10 +197,10 @@ void AggregatingSortedAlgorithm::AggregatingMergedData::startGroup(const ColumnR
     /// To avoid this, reset arena if and only if:
     /// - arena is required (i.e. SimpleAggregateFunction(any, String) in PK),
     /// - arena was used in the previous groups.
-    if (def.allocates_memory_in_arena && arena->size() > arena_size)
+    if (def.allocates_memory_in_arena && arena->allocatedBytes() > arena_size)
     {
         arena = std::make_unique<Arena>();
-        arena_size = arena->size();
+        arena_size = arena->allocatedBytes();
     }
 
     is_group_started = true;
@@ -257,10 +260,14 @@ void AggregatingSortedAlgorithm::AggregatingMergedData::initAggregateDescription
 
 
 AggregatingSortedAlgorithm::AggregatingSortedAlgorithm(
-    const Block & header_, size_t num_inputs, SortDescription description_, size_t max_block_size)
+    const Block & header_,
+    size_t num_inputs,
+    SortDescription description_,
+    size_t max_block_size_rows_,
+    size_t max_block_size_bytes_)
     : IMergingAlgorithmWithDelayedChunk(header_, num_inputs, description_)
     , columns_definition(defineColumns(header_, description_))
-    , merged_data(getMergedColumns(header_, columns_definition), max_block_size, columns_definition)
+    , merged_data(getMergedColumns(header_, columns_definition), max_block_size_rows_, max_block_size_bytes_, columns_definition)
 {
 }
 
diff --git a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
index d670242ed81..456b94c69ce 100644
--- a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
@@ -18,8 +18,11 @@ class AggregatingSortedAlgorithm final : public IMergingAlgorithmWithDelayedChun
 {
 public:
     AggregatingSortedAlgorithm(
-        const Block & header, size_t num_inputs,
-        SortDescription description_, size_t max_block_size);
+        const Block & header,
+        size_t num_inputs,
+        SortDescription description_,
+        size_t max_block_size_rows_,
+        size_t max_block_size_bytes_);
 
     void initialize(Inputs inputs) override;
     void consume(Input & input, size_t source_num) override;
@@ -96,7 +99,11 @@ private:
         using MergedData::insertRow;
 
     public:
-        AggregatingMergedData(MutableColumns columns_, UInt64 max_block_size_, ColumnsDefinition & def_);
+        AggregatingMergedData(
+            MutableColumns columns_,
+            UInt64 max_block_size_rows_,
+            UInt64 max_block_size_bytes_,
+            ColumnsDefinition & def_);
 
         /// Group is a group of rows with the same sorting key. It represents single row in result.
         /// Algorithm is: start group, add several rows, finish group.
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
index 0c23dd51f3c..1b47cb824d1 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
@@ -26,12 +26,13 @@ CollapsingSortedAlgorithm::CollapsingSortedAlgorithm(
     SortDescription description_,
     const String & sign_column,
     bool only_positive_sign_,
-    size_t max_block_size,
+    size_t max_block_size_rows_,
+    size_t max_block_size_bytes_,
     Poco::Logger * log_,
     WriteBuffer * out_row_sources_buf_,
     bool use_average_block_sizes)
     : IMergingAlgorithmWithSharedChunks(header_, num_inputs, std::move(description_), out_row_sources_buf_, max_row_refs)
-    , merged_data(header_.cloneEmptyColumns(), use_average_block_sizes, max_block_size)
+    , merged_data(header_.cloneEmptyColumns(), use_average_block_sizes, max_block_size_rows_, max_block_size_bytes_)
     , sign_column_number(header_.getPositionByName(sign_column))
     , only_positive_sign(only_positive_sign_)
     , log(log_)
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
index f457af05bd5..c90ddbbab5d 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
@@ -32,7 +32,8 @@ public:
         SortDescription description_,
         const String & sign_column,
         bool only_positive_sign_, /// For select final. Skip rows with sum(sign) < 0.
-        size_t max_block_size,
+        size_t max_block_size_rows_,
+        size_t max_block_size_bytes_,
         Poco::Logger * log_,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false);
@@ -74,4 +75,3 @@ private:
 };
 
 }
-
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
index aef1e9c70da..a5befca7233 100644
--- a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
@@ -30,9 +30,9 @@ FinishAggregatingInOrderAlgorithm::FinishAggregatingInOrderAlgorithm(
     size_t num_inputs_,
     AggregatingTransformParamsPtr params_,
     const SortDescription & description_,
-    size_t max_block_size_,
-    size_t max_block_bytes_)
-    : header(header_), num_inputs(num_inputs_), params(params_), max_block_size(max_block_size_), max_block_bytes(max_block_bytes_)
+    size_t max_block_size_rows_,
+    size_t max_block_size_bytes_)
+    : header(header_), num_inputs(num_inputs_), params(params_), max_block_size_rows(max_block_size_rows_), max_block_size_bytes(max_block_size_bytes_)
 {
     for (const auto & column_description : description_)
         description.emplace_back(column_description, header_.getPositionByName(column_description.column_name));
@@ -118,7 +118,7 @@ IMergingAlgorithm::Status FinishAggregatingInOrderAlgorithm::merge()
     inputs_to_update.pop_back();
 
     /// Do not merge blocks, if there are too few rows or bytes.
-    if (accumulated_rows >= max_block_size || accumulated_bytes >= max_block_bytes)
+    if (accumulated_rows >= max_block_size_rows || accumulated_bytes >= max_block_size_bytes)
         status.chunk = prepareToMerge();
 
     return status;
@@ -168,7 +168,6 @@ void FinishAggregatingInOrderAlgorithm::addToAggregation()
         accumulated_bytes += static_cast<size_t>(static_cast<double>(states[i].total_bytes) * current_rows / states[i].num_rows);
         accumulated_rows += current_rows;
 
-
         if (!states[i].isValid())
             inputs_to_update.push_back(i);
     }
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
index b1a74a09459..13522b70834 100644
--- a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
@@ -42,8 +42,8 @@ public:
         size_t num_inputs_,
         AggregatingTransformParamsPtr params_,
         const SortDescription & description_,
-        size_t max_block_size_,
-        size_t max_block_bytes_);
+        size_t max_block_size_rows_,
+        size_t max_block_size_bytes_);
 
     void initialize(Inputs inputs) override;
     void consume(Input & input, size_t source_num) override;
@@ -79,8 +79,8 @@ private:
     size_t num_inputs;
     AggregatingTransformParamsPtr params;
     SortDescriptionWithPositions description;
-    size_t max_block_size;
-    size_t max_block_bytes;
+    size_t max_block_size_rows;
+    size_t max_block_size_bytes;
 
     Inputs current_inputs;
 
diff --git a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
index 123748f9b43..814625d7aee 100644
--- a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
@@ -42,11 +42,12 @@ GraphiteRollupSortedAlgorithm::GraphiteRollupSortedAlgorithm(
     const Block & header_,
     size_t num_inputs,
     SortDescription description_,
-    size_t max_block_size,
+    size_t max_block_size_rows_,
+    size_t max_block_size_bytes_,
     Graphite::Params params_,
     time_t time_of_merge_)
     : IMergingAlgorithmWithSharedChunks(header_, num_inputs, std::move(description_), nullptr, max_row_refs)
-    , merged_data(header_.cloneEmptyColumns(), false, max_block_size)
+    , merged_data(header_.cloneEmptyColumns(), false, max_block_size_rows_, max_block_size_bytes_)
     , params(std::move(params_))
     , time_of_merge(time_of_merge_)
 {
diff --git a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h
index d6d2f66fb82..f920d623b1f 100644
--- a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h
@@ -22,9 +22,13 @@ class GraphiteRollupSortedAlgorithm final : public IMergingAlgorithmWithSharedCh
 {
 public:
     GraphiteRollupSortedAlgorithm(
-        const Block & header, size_t num_inputs,
-        SortDescription description_, size_t max_block_size,
-        Graphite::Params params_, time_t time_of_merge_);
+        const Block & header,
+        size_t num_inputs,
+        SortDescription description_,
+        size_t max_block_size_rows_,
+        size_t max_block_size_bytes_,
+        Graphite::Params params_,
+        time_t time_of_merge_);
 
     Status merge() override;
 
diff --git a/src/Processors/Merges/Algorithms/MergedData.h b/src/Processors/Merges/Algorithms/MergedData.h
index f4ef0b77c53..f92d20d22e1 100644
--- a/src/Processors/Merges/Algorithms/MergedData.h
+++ b/src/Processors/Merges/Algorithms/MergedData.h
@@ -19,8 +19,8 @@ namespace ErrorCodes
 class MergedData
 {
 public:
-    explicit MergedData(MutableColumns columns_, bool use_average_block_size_, UInt64 max_block_size_)
-        : columns(std::move(columns_)), max_block_size(max_block_size_), use_average_block_size(use_average_block_size_)
+    explicit MergedData(MutableColumns columns_, bool use_average_block_size_, UInt64 max_block_size_, UInt64 max_block_size_bytes_)
+        : columns(std::move(columns_)), max_block_size(max_block_size_), max_block_size_bytes(max_block_size_bytes_), use_average_block_size(use_average_block_size_)
     {
     }
 
@@ -117,6 +117,16 @@ public:
         if (merged_rows >= max_block_size)
             return true;
 
+        /// Never return more than max_block_size_bytes
+        if (max_block_size_bytes)
+        {
+            size_t merged_bytes = 0;
+            for (const auto & column : columns)
+                merged_bytes += column->allocatedBytes();
+            if (merged_bytes >= max_block_size_bytes)
+                return true;
+        }
+
         if (!use_average_block_size)
             return false;
 
@@ -143,8 +153,9 @@ protected:
     UInt64 total_chunks = 0;
     UInt64 total_allocated_bytes = 0;
 
-    const UInt64 max_block_size;
-    const bool use_average_block_size;
+    const UInt64 max_block_size = 0;
+    const UInt64 max_block_size_bytes = 0;
+    const bool use_average_block_size = false;
 
     bool need_flush = false;
 };
diff --git a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
index 77db1e06d06..1debfcec8e0 100644
--- a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
@@ -11,13 +11,14 @@ MergingSortedAlgorithm::MergingSortedAlgorithm(
     Block header_,
     size_t num_inputs,
     const SortDescription & description_,
-    size_t max_block_size,
+    size_t max_block_size_,
+    size_t max_block_size_bytes_,
     SortingQueueStrategy sorting_queue_strategy_,
     UInt64 limit_,
     WriteBuffer * out_row_sources_buf_,
     bool use_average_block_sizes)
     : header(std::move(header_))
-    , merged_data(header.cloneEmptyColumns(), use_average_block_sizes, max_block_size)
+    , merged_data(header.cloneEmptyColumns(), use_average_block_sizes, max_block_size_, max_block_size_bytes_)
     , description(description_)
     , limit(limit_)
     , out_row_sources_buf(out_row_sources_buf_)
diff --git a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
index 2537c48b128..1357e58f0f1 100644
--- a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
@@ -17,7 +17,8 @@ public:
         Block header_,
         size_t num_inputs,
         const SortDescription & description_,
-        size_t max_block_size,
+        size_t max_block_size_,
+        size_t max_block_size_bytes_,
         SortingQueueStrategy sorting_queue_strategy_,
         UInt64 limit_ = 0,
         WriteBuffer * out_row_sources_buf_ = nullptr,
diff --git a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
index e8d1f836591..db770de858c 100644
--- a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
@@ -17,12 +17,13 @@ ReplacingSortedAlgorithm::ReplacingSortedAlgorithm(
     SortDescription description_,
     const String & is_deleted_column,
     const String & version_column,
-    size_t max_block_size,
+    size_t max_block_size_rows,
+    size_t max_block_size_bytes,
     WriteBuffer * out_row_sources_buf_,
     bool use_average_block_sizes,
     bool cleanup_)
     : IMergingAlgorithmWithSharedChunks(header_, num_inputs, std::move(description_), out_row_sources_buf_, max_row_refs)
-    , merged_data(header_.cloneEmptyColumns(), use_average_block_sizes, max_block_size), cleanup(cleanup_)
+    , merged_data(header_.cloneEmptyColumns(), use_average_block_sizes, max_block_size_rows, max_block_size_bytes), cleanup(cleanup_)
 {
     if (!is_deleted_column.empty())
         is_deleted_column_number = header_.getPositionByName(is_deleted_column);
diff --git a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
index 6b9fb8f98c5..4d8de55b032 100644
--- a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
@@ -23,7 +23,8 @@ public:
         SortDescription description_,
         const String & is_deleted_column,
         const String & version_column,
-        size_t max_block_size,
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false,
         bool cleanup = false);
diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
index 0f1775d4ac0..7dac5715f95 100644
--- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
@@ -328,8 +328,11 @@ static SummingSortedAlgorithm::ColumnsDefinition defineColumns(
                 || endsWith(name, "Key")
                 || endsWith(name, "Type"))
             {
-                if (!nested_type.isValueRepresentedByInteger() && !isStringOrFixedString(nested_type))
-                    break;
+                if (!nested_type.isValueRepresentedByInteger() &&
+                    !isStringOrFixedString(nested_type) &&
+                    !typeid_cast<const DataTypeIPv6 *>(&nested_type) &&
+                    !typeid_cast<const DataTypeUUID *>(&nested_type))
+                        break;
 
                 map_desc.key_col_nums.push_back(*column_num_it);
             }
@@ -450,7 +453,7 @@ static void postprocessChunk(
         {
             const auto & from_type = desc.nested_type;
             const auto & to_type = desc.real_type;
-            res_columns[desc.column_numbers[0]] = recursiveTypeConversion(column, from_type, to_type);
+            res_columns[desc.column_numbers[0]] = recursiveLowCardinalityTypeConversion(column, from_type, to_type);
         }
         else
             res_columns[desc.column_numbers[0]] = std::move(column);
@@ -494,8 +497,8 @@ static void setRow(Row & row, const ColumnRawPtrs & raw_columns, size_t row_num,
 
 
 SummingSortedAlgorithm::SummingMergedData::SummingMergedData(
-    MutableColumns columns_, UInt64 max_block_size_, ColumnsDefinition & def_)
-    : MergedData(std::move(columns_), false, max_block_size_)
+    MutableColumns columns_, UInt64 max_block_size_rows_, UInt64 max_block_size_bytes_, ColumnsDefinition & def_)
+    : MergedData(std::move(columns_), false, max_block_size_rows_, max_block_size_bytes_)
     , def(def_)
 {
     current_row.resize(def.column_names.size());
@@ -505,7 +508,7 @@ SummingSortedAlgorithm::SummingMergedData::SummingMergedData(
     if (def.allocates_memory_in_arena)
     {
         arena = std::make_unique<Arena>();
-        arena_size = arena->size();
+        arena_size = arena->allocatedBytes();
     }
 }
 
@@ -519,10 +522,10 @@ void SummingSortedAlgorithm::SummingMergedData::startGroup(ColumnRawPtrs & raw_c
     for (auto & desc : def.columns_to_aggregate)
         desc.createState();
 
-    if (def.allocates_memory_in_arena && arena->size() > arena_size)
+    if (def.allocates_memory_in_arena && arena->allocatedBytes() > arena_size)
     {
         arena = std::make_unique<Arena>();
-        arena_size = arena->size();
+        arena_size = arena->allocatedBytes();
     }
 
     if (def.maps_to_sum.empty())
@@ -683,10 +686,11 @@ SummingSortedAlgorithm::SummingSortedAlgorithm(
     SortDescription description_,
     const Names & column_names_to_sum,
     const Names & partition_key_columns,
-    size_t max_block_size)
+    size_t max_block_size_rows,
+    size_t max_block_size_bytes)
     : IMergingAlgorithmWithDelayedChunk(header_, num_inputs, std::move(description_))
     , columns_definition(defineColumns(header_, description, column_names_to_sum, partition_key_columns))
-    , merged_data(getMergedDataColumns(header_, columns_definition), max_block_size, columns_definition)
+    , merged_data(getMergedDataColumns(header_, columns_definition), max_block_size_rows, max_block_size_bytes, columns_definition)
 {
 }
 
diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
index c77bf7c0ba5..8943e235729 100644
--- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
@@ -22,7 +22,8 @@ public:
         const Names & column_names_to_sum,
         /// List of partition key columns. They have to be excluded.
         const Names & partition_key_columns,
-        size_t max_block_size);
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes);
 
     void initialize(Inputs inputs) override;
     void consume(Input & input, size_t source_num) override;
@@ -63,7 +64,7 @@ public:
         using MergedData::insertRow;
 
     public:
-        SummingMergedData(MutableColumns columns_, UInt64 max_block_size_, ColumnsDefinition & def_);
+        SummingMergedData(MutableColumns columns_, UInt64 max_block_size_rows, UInt64 max_block_size_bytes_, ColumnsDefinition & def_);
 
         void startGroup(ColumnRawPtrs & raw_columns, size_t row);
         void finishGroup();
diff --git a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp
index cbafa53d0a3..e7a431dc1d0 100644
--- a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp
@@ -12,13 +12,14 @@ VersionedCollapsingAlgorithm::VersionedCollapsingAlgorithm(
     size_t num_inputs,
     SortDescription description_,
     const String & sign_column_,
-    size_t max_block_size,
+    size_t max_block_size_rows_,
+    size_t max_block_size_bytes_,
     WriteBuffer * out_row_sources_buf_,
     bool use_average_block_sizes)
     : IMergingAlgorithmWithSharedChunks(header_, num_inputs, std::move(description_), out_row_sources_buf_, MAX_ROWS_IN_MULTIVERSION_QUEUE)
-    , merged_data(header_.cloneEmptyColumns(), use_average_block_sizes, max_block_size)
+    , merged_data(header_.cloneEmptyColumns(), use_average_block_sizes, max_block_size_rows_, max_block_size_bytes_)
     /// -1 for +1 in FixedSizeDequeWithGaps's internal buffer. 3 is a reasonable minimum size to collapse anything.
-    , max_rows_in_queue(std::min(std::max<size_t>(3, max_block_size), MAX_ROWS_IN_MULTIVERSION_QUEUE) - 1)
+    , max_rows_in_queue(std::min(std::max<size_t>(3, max_block_size_rows_), MAX_ROWS_IN_MULTIVERSION_QUEUE) - 1)
     , current_keys(max_rows_in_queue)
 {
     sign_column_number = header_.getPositionByName(sign_column_);
diff --git a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h
index 2226762d541..578100f080d 100644
--- a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h
@@ -20,7 +20,8 @@ public:
     VersionedCollapsingAlgorithm(
         const Block & header, size_t num_inputs,
         SortDescription description_, const String & sign_column_,
-        size_t max_block_size,
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false);
 
diff --git a/src/Processors/Merges/Algorithms/tests/gtest_graphite.cpp b/src/Processors/Merges/Algorithms/tests/gtest_graphite.cpp
index 1bb6acbcb5c..46980ceb56b 100644
--- a/src/Processors/Merges/Algorithms/tests/gtest_graphite.cpp
+++ b/src/Processors/Merges/Algorithms/tests/gtest_graphite.cpp
@@ -18,17 +18,6 @@
 
 using namespace DB;
 
-static int regAggregateFunctions = 0;
-
-void tryRegisterAggregateFunctions()
-{
-    if (!regAggregateFunctions)
-    {
-        registerAggregateFunctions();
-        regAggregateFunctions = 1;
-    }
-}
-
 static ConfigProcessor::LoadedConfig loadConfiguration(const std::string & config_path)
 {
     ConfigProcessor config_processor(config_path, true, true);
diff --git a/src/Processors/Merges/CollapsingSortedTransform.h b/src/Processors/Merges/CollapsingSortedTransform.h
index a37e1c8402f..b0cb6bc6d62 100644
--- a/src/Processors/Merges/CollapsingSortedTransform.h
+++ b/src/Processors/Merges/CollapsingSortedTransform.h
@@ -16,17 +16,19 @@ public:
         SortDescription description_,
         const String & sign_column,
         bool only_positive_sign,
-        size_t max_block_size,
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
             header,
             num_inputs,
             std::move(description_),
             sign_column,
             only_positive_sign,
-            max_block_size,
+            max_block_size_rows,
+            max_block_size_bytes,
             &Poco::Logger::get("CollapsingSortedTransform"),
             out_row_sources_buf_,
             use_average_block_sizes)
diff --git a/src/Processors/Merges/FinishAggregatingInOrderTransform.h b/src/Processors/Merges/FinishAggregatingInOrderTransform.h
index ecc88899e88..0960b9d4127 100644
--- a/src/Processors/Merges/FinishAggregatingInOrderTransform.h
+++ b/src/Processors/Merges/FinishAggregatingInOrderTransform.h
@@ -17,16 +17,16 @@ public:
         size_t num_inputs,
         AggregatingTransformParamsPtr params,
         SortDescription description,
-        size_t max_block_size,
-        size_t max_block_bytes)
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes)
         : IMergingTransform(
-            num_inputs, header, {}, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
+            num_inputs, header, {}, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
             header,
             num_inputs,
             params,
             std::move(description),
-            max_block_size,
-            max_block_bytes)
+            max_block_size_rows,
+            max_block_size_bytes)
     {
     }
 
diff --git a/src/Processors/Merges/GraphiteRollupSortedTransform.h b/src/Processors/Merges/GraphiteRollupSortedTransform.h
index e6307c629ea..b69feff1fb6 100644
--- a/src/Processors/Merges/GraphiteRollupSortedTransform.h
+++ b/src/Processors/Merges/GraphiteRollupSortedTransform.h
@@ -11,15 +11,20 @@ class GraphiteRollupSortedTransform final : public IMergingTransform<GraphiteRol
 {
 public:
     GraphiteRollupSortedTransform(
-        const Block & header, size_t num_inputs,
-        SortDescription description_, size_t max_block_size,
-        Graphite::Params params_, time_t time_of_merge_)
+        const Block & header,
+        size_t num_inputs,
+        SortDescription description_,
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes,
+        Graphite::Params params_,
+        time_t time_of_merge_)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
             header,
             num_inputs,
             std::move(description_),
-            max_block_size,
+            max_block_size_rows,
+            max_block_size_bytes,
             std::move(params_),
             time_of_merge_)
     {
diff --git a/src/Processors/Merges/IMergingTransform.cpp b/src/Processors/Merges/IMergingTransform.cpp
index 4a6a1662f16..fbb47969b2f 100644
--- a/src/Processors/Merges/IMergingTransform.cpp
+++ b/src/Processors/Merges/IMergingTransform.cpp
@@ -14,10 +14,12 @@ IMergingTransformBase::IMergingTransformBase(
     const Block & input_header,
     const Block & output_header,
     bool have_all_inputs_,
-    UInt64 limit_hint_)
+    UInt64 limit_hint_,
+    bool always_read_till_end_)
     : IProcessor(InputPorts(num_inputs, input_header), {output_header})
     , have_all_inputs(have_all_inputs_)
     , limit_hint(limit_hint_)
+    , always_read_till_end(always_read_till_end_)
 {
 }
 
@@ -33,10 +35,12 @@ IMergingTransformBase::IMergingTransformBase(
     const Blocks & input_headers,
     const Block & output_header,
     bool have_all_inputs_,
-    UInt64 limit_hint_)
+    UInt64 limit_hint_,
+    bool always_read_till_end_)
     : IProcessor(createPorts(input_headers), {output_header})
     , have_all_inputs(have_all_inputs_)
     , limit_hint(limit_hint_)
+    , always_read_till_end(always_read_till_end_)
 {
 }
 
@@ -98,7 +102,7 @@ IProcessor::Status IMergingTransformBase::prepareInitializeInputs()
         /// (e.g. with optimized 'ORDER BY primary_key LIMIT n' and small 'n')
         /// we won't have to read any chunks anymore;
         auto chunk = input.pull(limit_hint != 0);
-        if (limit_hint && chunk.getNumRows() < limit_hint)
+        if ((limit_hint && chunk.getNumRows() < limit_hint) || always_read_till_end)
             input.setNeeded();
 
         if (!chunk.hasRows())
@@ -164,6 +168,21 @@ IProcessor::Status IMergingTransformBase::prepare()
         if (is_port_full)
             return Status::PortFull;
 
+        if (always_read_till_end)
+        {
+            for (auto & input : inputs)
+            {
+                if (!input.isFinished())
+                {
+                    input.setNeeded();
+                    if (input.hasData())
+                        std::ignore = input.pull();
+
+                    return Status::NeedData;
+                }
+            }
+        }
+
         for (auto & input : inputs)
             input.close();
 
diff --git a/src/Processors/Merges/IMergingTransform.h b/src/Processors/Merges/IMergingTransform.h
index 1d223179f8a..c218f622870 100644
--- a/src/Processors/Merges/IMergingTransform.h
+++ b/src/Processors/Merges/IMergingTransform.h
@@ -17,13 +17,15 @@ public:
         const Block & input_header,
         const Block & output_header,
         bool have_all_inputs_,
-        UInt64 limit_hint_);
+        UInt64 limit_hint_,
+        bool always_read_till_end_);
 
     IMergingTransformBase(
         const Blocks & input_headers,
         const Block & output_header,
         bool have_all_inputs_,
-        UInt64 limit_hint_);
+        UInt64 limit_hint_,
+        bool always_read_till_end_);
 
     OutputPort & getOutputPort() { return outputs.front(); }
 
@@ -67,6 +69,7 @@ private:
     std::atomic<bool> have_all_inputs;
     bool is_initialized = false;
     UInt64 limit_hint = 0;
+    bool always_read_till_end = false;
 
     IProcessor::Status prepareInitializeInputs();
 };
@@ -83,8 +86,9 @@ public:
         const Block & output_header,
         bool have_all_inputs_,
         UInt64 limit_hint_,
+        bool always_read_till_end_,
         Args && ... args)
-        : IMergingTransformBase(num_inputs, input_header, output_header, have_all_inputs_, limit_hint_)
+        : IMergingTransformBase(num_inputs, input_header, output_header, have_all_inputs_, limit_hint_, always_read_till_end_)
         , algorithm(std::forward<Args>(args) ...)
     {
     }
@@ -95,9 +99,10 @@ public:
         const Block & output_header,
         bool have_all_inputs_,
         UInt64 limit_hint_,
+        bool always_read_till_end_,
         bool empty_chunk_on_finish_,
         Args && ... args)
-        : IMergingTransformBase(input_headers, output_header, have_all_inputs_, limit_hint_)
+        : IMergingTransformBase(input_headers, output_header, have_all_inputs_, limit_hint_, always_read_till_end_)
         , empty_chunk_on_finish(empty_chunk_on_finish_)
         , algorithm(std::forward<Args>(args) ...)
     {
diff --git a/src/Processors/Merges/MergingSortedTransform.cpp b/src/Processors/Merges/MergingSortedTransform.cpp
index 12cbeecff8d..572a5204df7 100644
--- a/src/Processors/Merges/MergingSortedTransform.cpp
+++ b/src/Processors/Merges/MergingSortedTransform.cpp
@@ -11,9 +11,11 @@ MergingSortedTransform::MergingSortedTransform(
     const Block & header,
     size_t num_inputs,
     const SortDescription & description_,
-    size_t max_block_size,
+    size_t max_block_size_rows,
+    size_t max_block_size_bytes,
     SortingQueueStrategy sorting_queue_strategy,
     UInt64 limit_,
+    bool always_read_till_end_,
     WriteBuffer * out_row_sources_buf_,
     bool quiet_,
     bool use_average_block_sizes,
@@ -24,10 +26,12 @@ MergingSortedTransform::MergingSortedTransform(
         header,
         have_all_inputs_,
         limit_,
+        always_read_till_end_,
         header,
         num_inputs,
         description_,
-        max_block_size,
+        max_block_size_rows,
+        max_block_size_bytes,
         sorting_queue_strategy,
         limit_,
         out_row_sources_buf_,
diff --git a/src/Processors/Merges/MergingSortedTransform.h b/src/Processors/Merges/MergingSortedTransform.h
index 50586177c6d..2b53939f309 100644
--- a/src/Processors/Merges/MergingSortedTransform.h
+++ b/src/Processors/Merges/MergingSortedTransform.h
@@ -15,9 +15,11 @@ public:
         const Block & header,
         size_t num_inputs,
         const SortDescription & description,
-        size_t max_block_size,
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes,
         SortingQueueStrategy sorting_queue_strategy,
         UInt64 limit_ = 0,
+        bool always_read_till_end_ = false,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool quiet_ = false,
         bool use_average_block_sizes = false,
diff --git a/src/Processors/Merges/ReplacingSortedTransform.h b/src/Processors/Merges/ReplacingSortedTransform.h
index 8284a2c3a26..9cd2f29a862 100644
--- a/src/Processors/Merges/ReplacingSortedTransform.h
+++ b/src/Processors/Merges/ReplacingSortedTransform.h
@@ -15,18 +15,20 @@ public:
         const Block & header, size_t num_inputs,
         SortDescription description_,
         const String & is_deleted_column, const String & version_column,
-        size_t max_block_size,
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false,
         bool cleanup = false)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
             header,
             num_inputs,
             std::move(description_),
             is_deleted_column,
             version_column,
-            max_block_size,
+            max_block_size_rows,
+            max_block_size_bytes,
             out_row_sources_buf_,
             use_average_block_sizes,
             cleanup)
diff --git a/src/Processors/Merges/SummingSortedTransform.h b/src/Processors/Merges/SummingSortedTransform.h
index 0530ac2e96b..70ddebfea95 100644
--- a/src/Processors/Merges/SummingSortedTransform.h
+++ b/src/Processors/Merges/SummingSortedTransform.h
@@ -17,15 +17,18 @@ public:
         /// List of columns to be summed. If empty, all numeric columns that are not in the description are taken.
         const Names & column_names_to_sum,
         const Names & partition_key_columns,
-        size_t max_block_size)
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes
+        )
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
             header,
             num_inputs,
             std::move(description_),
             column_names_to_sum,
             partition_key_columns,
-            max_block_size)
+            max_block_size_rows,
+            max_block_size_bytes)
     {
     }
 
diff --git a/src/Processors/Merges/VersionedCollapsingTransform.h b/src/Processors/Merges/VersionedCollapsingTransform.h
index 5eced1cb58d..18244469bd7 100644
--- a/src/Processors/Merges/VersionedCollapsingTransform.h
+++ b/src/Processors/Merges/VersionedCollapsingTransform.h
@@ -15,16 +15,18 @@ public:
     VersionedCollapsingTransform(
         const Block & header, size_t num_inputs,
         SortDescription description_, const String & sign_column_,
-        size_t max_block_size,
+        size_t max_block_size_rows,
+        size_t max_block_size_bytes,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
             header,
             num_inputs,
             std::move(description_),
             sign_column_,
-            max_block_size,
+            max_block_size_rows,
+            max_block_size_bytes,
             out_row_sources_buf_,
             use_average_block_sizes)
     {
diff --git a/src/Processors/OffsetTransform.h b/src/Processors/OffsetTransform.h
index d24440d68ea..79a7d15fe0b 100644
--- a/src/Processors/OffsetTransform.h
+++ b/src/Processors/OffsetTransform.h
@@ -45,7 +45,7 @@ public:
     InputPort & getInputPort() { return inputs.front(); }
     OutputPort & getOutputPort() { return outputs.front(); }
 
-    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) { rows_before_limit_at_least.swap(counter); }
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { rows_before_limit_at_least.swap(counter); }
 };
 
 }
diff --git a/src/Processors/PingPongProcessor.h b/src/Processors/PingPongProcessor.h
index 0f2fffbd70f..976b29f0d8a 100644
--- a/src/Processors/PingPongProcessor.h
+++ b/src/Processors/PingPongProcessor.h
@@ -3,7 +3,6 @@
 #include <Processors/IProcessor.h>
 #include <base/unit.h>
 #include <Processors/Chunk.h>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index 9bf351442b2..4ac972e2a79 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -25,6 +25,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 static bool memoryBoundMergingWillBeUsed(
     bool should_produce_results_in_order_of_bucket_number,
     bool memory_bound_merging_of_aggregation_results_enabled,
@@ -38,7 +43,6 @@ static ITransformingStep::Traits getTraits(bool should_produce_results_in_order_
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = false, /// Actually, we may check that distinct names are in aggregation keys
             .returns_single_stream = should_produce_results_in_order_of_bucket_number,
             .preserves_number_of_streams = false,
             .preserves_sorting = false,
@@ -509,6 +513,43 @@ void AggregatingStep::describePipeline(FormatSettings & settings) const
     }
 }
 
+bool AggregatingStep::canUseProjection() const
+{
+    /// For now, grouping sets are not supported.
+    /// Aggregation in order should be applied after projection optimization if projection is full.
+    /// Skip it here just in case.
+    return grouping_sets_params.empty() && sort_description_for_merging.empty();
+}
+
+void AggregatingStep::requestOnlyMergeForAggregateProjection(const DataStream & input_stream)
+{
+    if (!canUseProjection())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot aggregate from projection");
+
+    auto output_header = getOutputStream().header;
+    input_streams.front() = input_stream;
+    params.only_merge = true;
+    updateOutputStream();
+    assertBlocksHaveEqualStructure(output_header, getOutputStream().header, "AggregatingStep");
+}
+
+std::unique_ptr<AggregatingProjectionStep> AggregatingStep::convertToAggregatingProjection(const DataStream & input_stream) const
+{
+    if (!canUseProjection())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot aggregate from projection");
+
+    auto aggregating_projection = std::make_unique<AggregatingProjectionStep>(
+        DataStreams{input_streams.front(), input_stream},
+        params,
+        final,
+        merge_threads,
+        temporary_data_merge_threads
+    );
+
+    assertBlocksHaveEqualStructure(getOutputStream().header, aggregating_projection->getOutputStream().header, "AggregatingStep");
+    return aggregating_projection;
+}
+
 void AggregatingStep::updateOutputStream()
 {
     output_stream = createOutputStream(
@@ -523,4 +564,88 @@ bool AggregatingStep::memoryBoundMergingWillBeUsed() const
         should_produce_results_in_order_of_bucket_number, memory_bound_merging_of_aggregation_results_enabled, sort_description_for_merging);
 }
 
+AggregatingProjectionStep::AggregatingProjectionStep(
+    DataStreams input_streams_,
+    Aggregator::Params params_,
+    bool final_,
+    size_t merge_threads_,
+    size_t temporary_data_merge_threads_)
+    : params(std::move(params_))
+    , final(final_)
+    , merge_threads(merge_threads_)
+    , temporary_data_merge_threads(temporary_data_merge_threads_)
+{
+    input_streams = std::move(input_streams_);
+
+    if (input_streams.size() != 2)
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "AggregatingProjectionStep is expected to have two input streams, got {}",
+            input_streams.size());
+
+    auto normal_parts_header = params.getHeader(input_streams.front().header, final);
+    params.only_merge = true;
+    auto projection_parts_header = params.getHeader(input_streams.back().header, final);
+    params.only_merge = false;
+
+    assertBlocksHaveEqualStructure(normal_parts_header, projection_parts_header, "AggregatingProjectionStep");
+    output_stream.emplace();
+    output_stream->header = std::move(normal_parts_header);
+}
+
+QueryPipelineBuilderPtr AggregatingProjectionStep::updatePipeline(
+    QueryPipelineBuilders pipelines,
+    const BuildQueryPipelineSettings &)
+{
+    auto & normal_parts_pipeline = pipelines.front();
+    auto & projection_parts_pipeline = pipelines.back();
+
+    /// Here we create shared ManyAggregatedData for both projection and ordinary data.
+    /// For ordinary data, AggregatedData is filled in a usual way.
+    /// For projection data, AggregatedData is filled by merging aggregation states.
+    /// When all AggregatedData is filled, we merge aggregation states together in a usual way.
+    /// Pipeline will look like:
+    /// ReadFromProjection   -> Aggregating (only merge states) ->
+    /// ReadFromProjection   -> Aggregating (only merge states) ->
+    /// ...                                                     -> Resize -> ConvertingAggregatedToChunks
+    /// ReadFromOrdinaryPart -> Aggregating (usual)             ->           (added by last Aggregating)
+    /// ReadFromOrdinaryPart -> Aggregating (usual)             ->
+    /// ...
+    auto many_data = std::make_shared<ManyAggregatedData>(normal_parts_pipeline->getNumStreams() + projection_parts_pipeline->getNumStreams());
+    size_t counter = 0;
+
+    AggregatorListPtr aggregator_list_ptr = std::make_shared<AggregatorList>();
+
+    /// TODO apply optimize_aggregation_in_order here somehow
+    auto build_aggregate_pipeline = [&](QueryPipelineBuilder & pipeline, bool projection)
+    {
+        auto params_copy = params;
+        if (projection)
+            params_copy.only_merge = true;
+
+        AggregatingTransformParamsPtr transform_params = std::make_shared<AggregatingTransformParams>(
+            pipeline.getHeader(), std::move(params_copy), aggregator_list_ptr, final);
+
+        pipeline.resize(pipeline.getNumStreams(), true, true);
+
+        pipeline.addSimpleTransform([&](const Block & header)
+        {
+            return std::make_shared<AggregatingTransform>(
+                header, transform_params, many_data, counter++, merge_threads, temporary_data_merge_threads);
+        });
+    };
+
+    build_aggregate_pipeline(*normal_parts_pipeline, false);
+    build_aggregate_pipeline(*projection_parts_pipeline, true);
+
+    auto pipeline = std::make_unique<QueryPipelineBuilder>();
+
+    for (auto & cur_pipeline : pipelines)
+        assertBlocksHaveEqualStructure(cur_pipeline->getHeader(), getOutputStream().header, "AggregatingProjectionStep");
+
+    *pipeline = QueryPipelineBuilder::unitePipelines(std::move(pipelines), 0, &processors);
+    pipeline->resize(1);
+    return pipeline;
+}
+
 }
diff --git a/src/Processors/QueryPlan/AggregatingStep.h b/src/Processors/QueryPlan/AggregatingStep.h
index 5f5557fb204..3d128d788ac 100644
--- a/src/Processors/QueryPlan/AggregatingStep.h
+++ b/src/Processors/QueryPlan/AggregatingStep.h
@@ -22,6 +22,8 @@ using GroupingSetsParamsList = std::vector<GroupingSetsParams>;
 Block appendGroupingSetColumn(Block header);
 Block generateOutputHeader(const Block & input_header, const Names & keys, bool use_nulls);
 
+class AggregatingProjectionStep;
+
 /// Aggregation. See AggregatingTransform.
 class AggregatingStep : public ITransformingStep
 {
@@ -65,6 +67,15 @@ public:
     bool memoryBoundMergingWillBeUsed() const;
     void skipMerging() { skip_merging = true; }
 
+    bool canUseProjection() const;
+    /// When we apply aggregate projection (which is full), this step will only merge data.
+    /// Argument input_stream replaces current single input.
+    /// Probably we should replace this step to MergingAggregated later? (now, aggregation-in-order will not work)
+    void requestOnlyMergeForAggregateProjection(const DataStream & input_stream);
+    /// When we apply aggregate projection (which is partial), this step should be replaced to AggregatingProjection.
+    /// Argument input_stream would be the second input (from projection).
+    std::unique_ptr<AggregatingProjectionStep> convertToAggregatingProjection(const DataStream & input_stream) const;
+
 private:
     void updateOutputStream() override;
 
@@ -99,4 +110,27 @@ private:
     Processors aggregating;
 };
 
+class AggregatingProjectionStep : public IQueryPlanStep
+{
+public:
+    AggregatingProjectionStep(
+        DataStreams input_streams_,
+        Aggregator::Params params_,
+        bool final_,
+        size_t merge_threads_,
+        size_t temporary_data_merge_threads_
+    );
+
+    String getName() const override { return "AggregatingProjection"; }
+    QueryPipelineBuilderPtr updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings &) override;
+
+private:
+    Aggregator::Params params;
+    bool final;
+    size_t merge_threads;
+    size_t temporary_data_merge_threads;
+
+    Processors aggregating;
+};
+
 }
diff --git a/src/Processors/QueryPlan/ArrayJoinStep.cpp b/src/Processors/QueryPlan/ArrayJoinStep.cpp
index bd1908a4a6d..23a0a756f0d 100644
--- a/src/Processors/QueryPlan/ArrayJoinStep.cpp
+++ b/src/Processors/QueryPlan/ArrayJoinStep.cpp
@@ -14,7 +14,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = false,
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
             .preserves_sorting = false,
diff --git a/src/Processors/QueryPlan/CreateSetAndFilterOnTheFlyStep.cpp b/src/Processors/QueryPlan/CreateSetAndFilterOnTheFlyStep.cpp
index 53dcec9ef0a..fe362f64b96 100644
--- a/src/Processors/QueryPlan/CreateSetAndFilterOnTheFlyStep.cpp
+++ b/src/Processors/QueryPlan/CreateSetAndFilterOnTheFlyStep.cpp
@@ -4,6 +4,7 @@
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <IO/Operators.h>
 #include <Common/JSONBuilder.h>
+#include <Common/logger_useful.h>
 #include <Core/ColumnWithTypeAndName.h>
 #include <Core/ColumnsWithTypeAndName.h>
 #include <Processors/IProcessor.h>
@@ -40,7 +41,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = true,
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
             .preserves_sorting = true,
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.cpp b/src/Processors/QueryPlan/CreatingSetsStep.cpp
index 23e0a17a31b..b5d773d889f 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.cpp
+++ b/src/Processors/QueryPlan/CreatingSetsStep.cpp
@@ -1,3 +1,4 @@
+#include <exception>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
@@ -21,7 +22,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = true,
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
             .preserves_sorting = true,
@@ -61,7 +61,7 @@ void CreatingSetStep::describeActions(FormatSettings & settings) const
     String prefix(settings.offset, ' ');
 
     settings.out << prefix;
-    if (subquery_for_set.set)
+    if (subquery_for_set.set_in_progress)
         settings.out << "Set: ";
 
     settings.out << description << '\n';
@@ -69,7 +69,7 @@ void CreatingSetStep::describeActions(FormatSettings & settings) const
 
 void CreatingSetStep::describeActions(JSONBuilder::JSONMap & map) const
 {
-    if (subquery_for_set.set)
+    if (subquery_for_set.set_in_progress)
         map.add("Set", description);
 }
 
@@ -134,7 +134,11 @@ void addCreatingSetsStep(QueryPlan & query_plan, PreparedSets::SubqueriesForSets
     for (auto & [description, subquery_for_set] : subqueries_for_sets)
     {
         if (!subquery_for_set.hasSource())
+        {
+            subquery_for_set.promise_to_fill_set.set_exception(std::make_exception_ptr(
+                Exception(ErrorCodes::LOGICAL_ERROR, "Subquery for set {} has no source", subquery_for_set.key)));
             continue;
+        }
 
         auto plan = subquery_for_set.detachSource();
 
diff --git a/src/Processors/QueryPlan/CubeStep.cpp b/src/Processors/QueryPlan/CubeStep.cpp
index 03f952ac782..0c632c346c7 100644
--- a/src/Processors/QueryPlan/CubeStep.cpp
+++ b/src/Processors/QueryPlan/CubeStep.cpp
@@ -14,7 +14,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = false,
             .returns_single_stream = true,
             .preserves_number_of_streams = false,
             .preserves_sorting = false,
@@ -32,9 +31,6 @@ CubeStep::CubeStep(const DataStream & input_stream_, Aggregator::Params params_,
     , final(final_)
     , use_nulls(use_nulls_)
 {
-    /// Aggregation keys are distinct
-    for (const auto & key : params.keys)
-        output_stream->distinct_columns.insert(key);
 }
 
 ProcessorPtr addGroupingSetForTotals(const Block & header, const Names & keys, bool use_nulls, const BuildQueryPipelineSettings & settings, UInt64 grouping_set_number)
@@ -89,9 +85,5 @@ void CubeStep::updateOutputStream()
 {
     output_stream = createOutputStream(
         input_streams.front(), generateOutputHeader(params.getHeader(input_streams.front().header, final), params.keys, use_nulls), getDataStreamTraits());
-
-    /// Aggregation keys are distinct
-    for (const auto & key : params.keys)
-        output_stream->distinct_columns.insert(key);
 }
 }
diff --git a/src/Processors/QueryPlan/DistinctStep.cpp b/src/Processors/QueryPlan/DistinctStep.cpp
index 323ef0bbdab..a481454139d 100644
--- a/src/Processors/QueryPlan/DistinctStep.cpp
+++ b/src/Processors/QueryPlan/DistinctStep.cpp
@@ -10,29 +10,15 @@
 namespace DB
 {
 
-static bool checkColumnsAlreadyDistinct(const Names & columns, const NameSet & distinct_names)
-{
-    if (distinct_names.empty())
-        return false;
-
-    /// Now we need to check that distinct_names is a subset of columns.
-    std::unordered_set<std::string_view> columns_set(columns.begin(), columns.end());
-    for (const auto & name : distinct_names)
-        if (!columns_set.contains(name))
-            return false;
-
-    return true;
-}
-
-static ITransformingStep::Traits getTraits(bool pre_distinct, bool already_distinct_columns)
+static ITransformingStep::Traits getTraits(bool pre_distinct)
 {
+    const bool preserves_number_of_streams = pre_distinct;
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = already_distinct_columns, /// Will be calculated separately otherwise
-            .returns_single_stream = !pre_distinct && !already_distinct_columns,
-            .preserves_number_of_streams = pre_distinct || already_distinct_columns,
-            .preserves_sorting = true, /// Sorting is preserved indeed because of implementation.
+            .returns_single_stream = !pre_distinct,
+            .preserves_number_of_streams = preserves_number_of_streams,
+            .preserves_sorting = preserves_number_of_streams,
         },
         {
             .preserves_number_of_rows = false,
@@ -62,34 +48,23 @@ DistinctStep::DistinctStep(
     : ITransformingStep(
             input_stream_,
             input_stream_.header,
-            getTraits(pre_distinct_, checkColumnsAlreadyDistinct(columns_, input_stream_.distinct_columns)))
+            getTraits(pre_distinct_))
     , set_size_limits(set_size_limits_)
     , limit_hint(limit_hint_)
     , columns(columns_)
     , pre_distinct(pre_distinct_)
     , optimize_distinct_in_order(optimize_distinct_in_order_)
 {
-    if (!output_stream->distinct_columns.empty() /// Columns already distinct, do nothing
-        && (!pre_distinct /// Main distinct
-            || input_stream_.has_single_port)) /// pre_distinct for single port works as usual one
-    {
-        /// Build distinct set.
-        for (const auto & name : columns)
-            output_stream->distinct_columns.insert(name);
-    }
 }
 
 void DistinctStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
-    const auto & input_stream = input_streams.back();
-    if (checkColumnsAlreadyDistinct(columns, input_stream.distinct_columns))
-        return;
-
     if (!pre_distinct)
         pipeline.resize(1);
 
     if (optimize_distinct_in_order)
     {
+        const auto & input_stream = input_streams.back();
         const SortDescription distinct_sort_desc = getSortDescription(input_stream.sort_description, columns);
         if (!distinct_sort_desc.empty())
         {
@@ -197,16 +172,7 @@ void DistinctStep::updateOutputStream()
     output_stream = createOutputStream(
         input_streams.front(),
         input_streams.front().header,
-        getTraits(pre_distinct, checkColumnsAlreadyDistinct(columns, input_streams.front().distinct_columns)).data_stream_traits);
-
-    if (!output_stream->distinct_columns.empty() /// Columns already distinct, do nothing
-        && (!pre_distinct /// Main distinct
-            || input_streams.front().has_single_port)) /// pre_distinct for single port works as usual one
-    {
-        /// Build distinct set.
-        for (const auto & name : columns)
-            output_stream->distinct_columns.insert(name);
-    }
+        getTraits(pre_distinct).data_stream_traits);
 }
 
 }
diff --git a/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp b/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
index 2bb29a0b6fe..9b9cc221ca8 100644
--- a/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
+++ b/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
@@ -55,6 +55,10 @@ std::unique_ptr<QueryPlan> createLocalPlan(
     auto query_plan = std::make_unique<QueryPlan>();
     auto new_context = Context::createCopy(context);
 
+    /// Do not push down limit to local plan, as it will break `rows_before_limit_at_least` counter.
+    if (processed_stage == QueryProcessingStage::WithMergeableStateAfterAggregationAndLimit)
+        processed_stage = QueryProcessingStage::WithMergeableStateAfterAggregation;
+
     /// Do not apply AST optimizations, because query
     /// is already optimized and some optimizations
     /// can be applied only for non-distributed tables
diff --git a/src/Processors/QueryPlan/DistributedCreateLocalPlan.h b/src/Processors/QueryPlan/DistributedCreateLocalPlan.h
index 16bf1c565ff..1afdc07fa4d 100644
--- a/src/Processors/QueryPlan/DistributedCreateLocalPlan.h
+++ b/src/Processors/QueryPlan/DistributedCreateLocalPlan.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Core/QueryProcessingStage.h>
+#include <Core/UUID.h>
 #include <Parsers/IAST_fwd.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/ResizeProcessor.h>
diff --git a/src/Processors/QueryPlan/ExpressionStep.cpp b/src/Processors/QueryPlan/ExpressionStep.cpp
index dcfa6e5a891..5062ff5479e 100644
--- a/src/Processors/QueryPlan/ExpressionStep.cpp
+++ b/src/Processors/QueryPlan/ExpressionStep.cpp
@@ -15,7 +15,6 @@ static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions, const
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = !actions->hasArrayJoin(),
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
             .preserves_sorting = actions->isSortingPreserved(header, sort_description),
@@ -33,8 +32,6 @@ ExpressionStep::ExpressionStep(const DataStream & input_stream_, const ActionsDA
         getTraits(actions_dag_, input_stream_.header, input_stream_.sort_description))
     , actions_dag(actions_dag_)
 {
-    /// Some columns may be removed by expression.
-    updateDistinctColumns(output_stream->header, output_stream->distinct_columns);
 }
 
 void ExpressionStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
@@ -63,22 +60,9 @@ void ExpressionStep::transformPipeline(QueryPipelineBuilder & pipeline, const Bu
 
 void ExpressionStep::describeActions(FormatSettings & settings) const
 {
-    String prefix(settings.offset, ' ');
-    bool first = true;
-
+    String prefix(settings.offset, settings.indent_char);
     auto expression = std::make_shared<ExpressionActions>(actions_dag);
-    for (const auto & action : expression->getActions())
-    {
-        settings.out << prefix << (first ? "Actions: "
-                                         : "         ");
-        first = false;
-        settings.out << action.toString() << '\n';
-    }
-
-    settings.out << prefix << "Positions:";
-    for (const auto & pos : expression->getResultPositions())
-        settings.out << ' ' << pos;
-    settings.out << '\n';
+    expression->describeActions(settings.out, prefix);
 }
 
 void ExpressionStep::describeActions(JSONBuilder::JSONMap & map) const
@@ -91,6 +75,20 @@ void ExpressionStep::updateOutputStream()
 {
     output_stream = createOutputStream(
         input_streams.front(), ExpressionTransform::transformHeader(input_streams.front().header, *actions_dag), getDataStreamTraits());
+
+    if (!getDataStreamTraits().preserves_sorting)
+        return;
+
+    FindAliasForInputName alias_finder(actions_dag);
+    const auto & input_sort_description = getInputStreams().front().sort_description;
+    for (size_t i = 0, s = input_sort_description.size(); i < s; ++i)
+    {
+        String alias;
+        const auto & original_column = input_sort_description[i].column_name;
+        const auto * alias_node = alias_finder.find(original_column);
+        if (alias_node)
+            output_stream->sort_description[i].column_name = alias_node->result_name;
+    }
 }
 
 }
diff --git a/src/Processors/QueryPlan/ExtremesStep.cpp b/src/Processors/QueryPlan/ExtremesStep.cpp
index 4524b9883d6..010a82072cf 100644
--- a/src/Processors/QueryPlan/ExtremesStep.cpp
+++ b/src/Processors/QueryPlan/ExtremesStep.cpp
@@ -9,7 +9,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = true,
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
             .preserves_sorting = true,
diff --git a/src/Processors/QueryPlan/FillingStep.cpp b/src/Processors/QueryPlan/FillingStep.cpp
index dde3bdbf850..65c9cf11661 100644
--- a/src/Processors/QueryPlan/FillingStep.cpp
+++ b/src/Processors/QueryPlan/FillingStep.cpp
@@ -17,7 +17,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = false, /// TODO: it seem to actually be true. Check it later.
             .returns_single_stream = true,
             .preserves_number_of_streams = true,
             .preserves_sorting = true,
@@ -28,9 +27,17 @@ static ITransformingStep::Traits getTraits()
     };
 }
 
-FillingStep::FillingStep(const DataStream & input_stream_, SortDescription sort_description_, InterpolateDescriptionPtr interpolate_description_)
+FillingStep::FillingStep(
+    const DataStream & input_stream_,
+    SortDescription sort_description_,
+    SortDescription fill_description_,
+    InterpolateDescriptionPtr interpolate_description_,
+    bool use_with_fill_by_sorting_prefix_)
     : ITransformingStep(input_stream_, FillingTransform::transformHeader(input_stream_.header, sort_description_), getTraits())
-    , sort_description(std::move(sort_description_)), interpolate_description(interpolate_description_)
+    , sort_description(std::move(sort_description_))
+    , fill_description(std::move(fill_description_))
+    , interpolate_description(interpolate_description_)
+    , use_with_fill_by_sorting_prefix(use_with_fill_by_sorting_prefix_)
 {
     if (!input_stream_.has_single_port)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FillingStep expects single input");
@@ -40,8 +47,11 @@ void FillingStep::transformPipeline(QueryPipelineBuilder & pipeline, const Build
 {
     pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
     {
-        bool on_totals = stream_type == QueryPipelineBuilder::StreamType::Totals;
-        return std::make_shared<FillingTransform>(header, sort_description, std::move(interpolate_description), on_totals);
+        if (stream_type == QueryPipelineBuilder::StreamType::Totals)
+            return std::make_shared<FillingNoopTransform>(header, fill_description);
+
+        return std::make_shared<FillingTransform>(
+            header, sort_description, fill_description, std::move(interpolate_description), use_with_fill_by_sorting_prefix);
     });
 }
 
diff --git a/src/Processors/QueryPlan/FillingStep.h b/src/Processors/QueryPlan/FillingStep.h
index 4e1b5b3654d..3e0e1e79060 100644
--- a/src/Processors/QueryPlan/FillingStep.h
+++ b/src/Processors/QueryPlan/FillingStep.h
@@ -10,7 +10,12 @@ namespace DB
 class FillingStep : public ITransformingStep
 {
 public:
-    FillingStep(const DataStream & input_stream_, SortDescription sort_description_, InterpolateDescriptionPtr interpolate_description_);
+    FillingStep(
+        const DataStream & input_stream_,
+        SortDescription sort_description_,
+        SortDescription fill_description_,
+        InterpolateDescriptionPtr interpolate_description_,
+        bool use_with_fill_by_sorting_prefix);
 
     String getName() const override { return "Filling"; }
 
@@ -25,7 +30,9 @@ private:
     void updateOutputStream() override;
 
     SortDescription sort_description;
+    SortDescription fill_description;
     InterpolateDescriptionPtr interpolate_description;
+    const bool use_with_fill_by_sorting_prefix;
 };
 
 }
diff --git a/src/Processors/QueryPlan/FilterStep.cpp b/src/Processors/QueryPlan/FilterStep.cpp
index 4699a7c1908..1b9b47f46ac 100644
--- a/src/Processors/QueryPlan/FilterStep.cpp
+++ b/src/Processors/QueryPlan/FilterStep.cpp
@@ -14,7 +14,7 @@ static ITransformingStep::Traits getTraits(const ActionsDAGPtr & expression, con
     bool preserves_sorting = expression->isSortingPreserved(header, sort_description, remove_filter_column ? filter_column_name : "");
     if (remove_filter_column)
     {
-        preserves_sorting &= find_if(
+        preserves_sorting &= std::find_if(
                                  begin(sort_description),
                                  end(sort_description),
                                  [&](const auto & column_desc) { return column_desc.column_name == filter_column_name; })
@@ -23,7 +23,6 @@ static ITransformingStep::Traits getTraits(const ActionsDAGPtr & expression, con
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = !expression->hasArrayJoin(), /// I suppose it actually never happens
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
             .preserves_sorting = preserves_sorting,
@@ -51,8 +50,6 @@ FilterStep::FilterStep(
     , filter_column_name(std::move(filter_column_name_))
     , remove_filter_column(remove_filter_column_)
 {
-    /// TODO: it would be easier to remove all expressions from filter step. It should only filter by column name.
-    updateDistinctColumns(output_stream->header, output_stream->distinct_columns);
 }
 
 void FilterStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
@@ -82,27 +79,15 @@ void FilterStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQ
 
 void FilterStep::describeActions(FormatSettings & settings) const
 {
-    String prefix(settings.offset, ' ');
+    String prefix(settings.offset, settings.indent_char);
     settings.out << prefix << "Filter column: " << filter_column_name;
 
     if (remove_filter_column)
         settings.out << " (removed)";
     settings.out << '\n';
 
-    bool first = true;
     auto expression = std::make_shared<ExpressionActions>(actions_dag);
-    for (const auto & action : expression->getActions())
-    {
-        settings.out << prefix << (first ? "Actions: "
-                                         : "         ");
-        first = false;
-        settings.out << action.toString() << '\n';
-    }
-
-    settings.out << prefix << "Positions:";
-    for (const auto & pos : expression->getResultPositions())
-        settings.out << ' ' << pos;
-    settings.out << '\n';
+    expression->describeActions(settings.out, prefix);
 }
 
 void FilterStep::describeActions(JSONBuilder::JSONMap & map) const
@@ -120,6 +105,20 @@ void FilterStep::updateOutputStream()
         input_streams.front(),
         FilterTransform::transformHeader(input_streams.front().header, actions_dag.get(), filter_column_name, remove_filter_column),
         getDataStreamTraits());
+
+    if (!getDataStreamTraits().preserves_sorting)
+        return;
+
+    FindAliasForInputName alias_finder(actions_dag);
+    const auto & input_sort_description = getInputStreams().front().sort_description;
+    for (size_t i = 0, s = input_sort_description.size(); i < s; ++i)
+    {
+        String alias;
+        const auto & original_column = input_sort_description[i].column_name;
+        const auto * alias_node = alias_finder.find(original_column);
+        if (alias_node)
+            output_stream->sort_description[i].column_name = alias_node->result_name;
+    }
 }
 
 }
diff --git a/src/Processors/QueryPlan/IQueryPlanStep.h b/src/Processors/QueryPlan/IQueryPlanStep.h
index 316ecff9c2e..a608c6f8058 100644
--- a/src/Processors/QueryPlan/IQueryPlanStep.h
+++ b/src/Processors/QueryPlan/IQueryPlanStep.h
@@ -23,11 +23,6 @@ class DataStream
 public:
     Block header;
 
-    /// Tuples with those columns are distinct.
-    /// It doesn't mean that columns are distinct separately.
-    /// Removing any column from this list breaks this invariant.
-    NameSet distinct_columns = {};
-
     /// QueryPipeline has single port. Totals or extremes ports are not counted.
     bool has_single_port = false;
 
@@ -51,8 +46,7 @@ public:
 
     bool hasEqualPropertiesWith(const DataStream & other) const
     {
-        return distinct_columns == other.distinct_columns
-            && has_single_port == other.has_single_port
+        return has_single_port == other.has_single_port
             && sort_description == other.sort_description
             && (sort_description.empty() || sort_scope == other.sort_scope);
     }
diff --git a/src/Processors/QueryPlan/ISourceStep.cpp b/src/Processors/QueryPlan/ISourceStep.cpp
index 0644d9b44eb..37f56bc7a43 100644
--- a/src/Processors/QueryPlan/ISourceStep.cpp
+++ b/src/Processors/QueryPlan/ISourceStep.cpp
@@ -12,10 +12,19 @@ ISourceStep::ISourceStep(DataStream output_stream_)
 QueryPipelineBuilderPtr ISourceStep::updatePipeline(QueryPipelineBuilders, const BuildQueryPipelineSettings & settings)
 {
     auto pipeline = std::make_unique<QueryPipelineBuilder>();
-    QueryPipelineProcessorsCollector collector(*pipeline, this);
+
+    /// For `Source` step, since it's not add new Processors to `pipeline->pipe`
+    /// in `initializePipeline`, but make an assign with new created Pipe.
+    /// And Processors for the Step is added here. So we do not need to use
+    /// `QueryPipelineProcessorsCollector` to collect Processors.
     initializePipeline(*pipeline, settings);
-    auto added_processors = collector.detachProcessors();
-    processors.insert(processors.end(), added_processors.begin(), added_processors.end());
+
+    /// But we need to set QueryPlanStep manually for the Processors, which
+    /// will be used in `EXPLAIN PIPELINE`
+    for (auto & processor : processors)
+    {
+        processor->setQueryPlanStep(this);
+    }
     return pipeline;
 }
 
diff --git a/src/Processors/QueryPlan/ITransformingStep.cpp b/src/Processors/QueryPlan/ITransformingStep.cpp
index 195fa9ad68c..9ecfdb0af22 100644
--- a/src/Processors/QueryPlan/ITransformingStep.cpp
+++ b/src/Processors/QueryPlan/ITransformingStep.cpp
@@ -20,9 +20,6 @@ DataStream ITransformingStep::createOutputStream(
 {
     DataStream output_stream{.header = std::move(output_header)};
 
-    if (stream_traits.preserves_distinct_columns)
-        output_stream.distinct_columns = input_stream.distinct_columns;
-
     output_stream.has_single_port = stream_traits.returns_single_stream
                                      || (input_stream.has_single_port && stream_traits.preserves_number_of_streams);
 
@@ -50,21 +47,6 @@ QueryPipelineBuilderPtr ITransformingStep::updatePipeline(QueryPipelineBuilders
     return std::move(pipelines.front());
 }
 
-void ITransformingStep::updateDistinctColumns(const Block & res_header, NameSet & distinct_columns)
-{
-    if (distinct_columns.empty())
-        return;
-
-    for (const auto & column : distinct_columns)
-    {
-        if (!res_header.has(column))
-        {
-            distinct_columns.clear();
-            break;
-        }
-    }
-}
-
 void ITransformingStep::describePipeline(FormatSettings & settings) const
 {
     IQueryPlanStep::describePipeline(processors, settings);
diff --git a/src/Processors/QueryPlan/ITransformingStep.h b/src/Processors/QueryPlan/ITransformingStep.h
index 1513b4307f8..77de668fbdb 100644
--- a/src/Processors/QueryPlan/ITransformingStep.h
+++ b/src/Processors/QueryPlan/ITransformingStep.h
@@ -18,11 +18,6 @@ public:
     /// They are specified in constructor and cannot be changed.
     struct DataStreamTraits
     {
-        /// Keep distinct_columns unchanged.
-        /// Examples: true for LimitStep, false for ExpressionStep with ARRAY JOIN
-        /// It some columns may be removed from result header, call updateDistinctColumns
-        bool preserves_distinct_columns;
-
         /// True if pipeline has single output port after this step.
         /// Examples: MergeSortingStep, AggregatingStep
         bool returns_single_stream;
@@ -69,8 +64,6 @@ public:
         input_streams.emplace_back(std::move(input_stream));
 
         updateOutputStream();
-
-        updateDistinctColumns(output_stream->header, output_stream->distinct_columns);
     }
 
     void describePipeline(FormatSettings & settings) const override;
@@ -83,9 +76,6 @@ public:
     }
 
 protected:
-    /// Clear distinct_columns if res_header doesn't contain all of them.
-    static void updateDistinctColumns(const Block & res_header, NameSet & distinct_columns);
-
     /// Create output stream from header and traits.
     static DataStream createOutputStream(
             const DataStream & input_stream,
diff --git a/src/Processors/QueryPlan/JoinStep.cpp b/src/Processors/QueryPlan/JoinStep.cpp
index 6e212a53bc6..2ff8f161e99 100644
--- a/src/Processors/QueryPlan/JoinStep.cpp
+++ b/src/Processors/QueryPlan/JoinStep.cpp
@@ -83,7 +83,6 @@ static ITransformingStep::Traits getStorageJoinTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = false,
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
             .preserves_sorting = false,
diff --git a/src/Processors/QueryPlan/JoinStep.h b/src/Processors/QueryPlan/JoinStep.h
index a814d541574..e7185f36588 100644
--- a/src/Processors/QueryPlan/JoinStep.h
+++ b/src/Processors/QueryPlan/JoinStep.h
@@ -49,6 +49,8 @@ public:
     String getName() const override { return "FilledJoin"; }
     void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
+    const JoinPtr & getJoin() const { return join; }
+
 private:
     void updateOutputStream() override;
 
diff --git a/src/Processors/QueryPlan/LimitByStep.cpp b/src/Processors/QueryPlan/LimitByStep.cpp
index 39086e995fc..8b4abecc12c 100644
--- a/src/Processors/QueryPlan/LimitByStep.cpp
+++ b/src/Processors/QueryPlan/LimitByStep.cpp
@@ -12,7 +12,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = true,
             .returns_single_stream = true,
             .preserves_number_of_streams = false,
             .preserves_sorting = true,
diff --git a/src/Processors/QueryPlan/LimitStep.cpp b/src/Processors/QueryPlan/LimitStep.cpp
index 144ac16f0d5..5e5a7387832 100644
--- a/src/Processors/QueryPlan/LimitStep.cpp
+++ b/src/Processors/QueryPlan/LimitStep.cpp
@@ -12,7 +12,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = true,
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
             .preserves_sorting = true,
diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.cpp b/src/Processors/QueryPlan/MergingAggregatedStep.cpp
index e4fc332a1fd..c724de02de8 100644
--- a/src/Processors/QueryPlan/MergingAggregatedStep.cpp
+++ b/src/Processors/QueryPlan/MergingAggregatedStep.cpp
@@ -24,7 +24,6 @@ static ITransformingStep::Traits getTraits(bool should_produce_results_in_order_
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = false,
             .returns_single_stream = should_produce_results_in_order_of_bucket_number,
             .preserves_number_of_streams = false,
             .preserves_sorting = false,
@@ -62,10 +61,6 @@ MergingAggregatedStep::MergingAggregatedStep(
     , should_produce_results_in_order_of_bucket_number(should_produce_results_in_order_of_bucket_number_)
     , memory_bound_merging_of_aggregation_results_enabled(memory_bound_merging_of_aggregation_results_enabled_)
 {
-    /// Aggregation keys are distinct
-    for (const auto & key : params.keys)
-        output_stream->distinct_columns.insert(key);
-
     if (memoryBoundMergingWillBeUsed() && should_produce_results_in_order_of_bucket_number)
     {
         output_stream->sort_description = group_by_sort_description;
@@ -75,6 +70,9 @@ MergingAggregatedStep::MergingAggregatedStep(
 
 void MergingAggregatedStep::applyOrder(SortDescription sort_description, DataStream::SortScope sort_scope)
 {
+    is_order_overwritten = true;
+    overwritten_sort_scope = sort_scope;
+
     auto & input_stream = input_streams.front();
     input_stream.sort_scope = sort_scope;
     input_stream.sort_description = sort_description;
@@ -157,10 +155,8 @@ void MergingAggregatedStep::describeActions(JSONBuilder::JSONMap & map) const
 void MergingAggregatedStep::updateOutputStream()
 {
     output_stream = createOutputStream(input_streams.front(), params.getHeader(input_streams.front().header, final), getDataStreamTraits());
-
-    /// Aggregation keys are distinct
-    for (const auto & key : params.keys)
-        output_stream->distinct_columns.insert(key);
+    if (is_order_overwritten)  /// overwrite order again
+        applyOrder(group_by_sort_description, overwritten_sort_scope);
 }
 
 bool MergingAggregatedStep::memoryBoundMergingWillBeUsed() const
diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.h b/src/Processors/QueryPlan/MergingAggregatedStep.h
index 2dea289ca89..654f794d5f5 100644
--- a/src/Processors/QueryPlan/MergingAggregatedStep.h
+++ b/src/Processors/QueryPlan/MergingAggregatedStep.h
@@ -27,6 +27,7 @@ public:
         bool memory_bound_merging_of_aggregation_results_enabled_);
 
     String getName() const override { return "MergingAggregated"; }
+    const Aggregator::Params & getParams() const { return params; }
 
     void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
@@ -50,6 +51,9 @@ private:
     const size_t memory_bound_merging_max_block_bytes;
     SortDescription group_by_sort_description;
 
+    bool is_order_overwritten = false;
+    DataStream::SortScope overwritten_sort_scope = DataStream::SortScope::None;
+
     /// These settings are used to determine if we should resize pipeline to 1 at the end.
     const bool should_produce_results_in_order_of_bucket_number;
     const bool memory_bound_merging_of_aggregation_results_enabled;
diff --git a/src/Processors/QueryPlan/OffsetStep.cpp b/src/Processors/QueryPlan/OffsetStep.cpp
index e0c70ba2f28..4bbe81f9169 100644
--- a/src/Processors/QueryPlan/OffsetStep.cpp
+++ b/src/Processors/QueryPlan/OffsetStep.cpp
@@ -12,7 +12,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = true,
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
             .preserves_sorting = true,
diff --git a/src/Processors/QueryPlan/Optimizations/Optimizations.h b/src/Processors/QueryPlan/Optimizations/Optimizations.h
index 774626bffa4..de1d43bed1b 100644
--- a/src/Processors/QueryPlan/Optimizations/Optimizations.h
+++ b/src/Processors/QueryPlan/Optimizations/Optimizations.h
@@ -105,8 +105,11 @@ using Stack = std::vector<Frame>;
 
 /// Second pass optimizations
 void optimizePrimaryKeyCondition(const Stack & stack);
+void optimizePrewhere(Stack & stack, QueryPlan::Nodes & nodes);
 void optimizeReadInOrder(QueryPlan::Node & node, QueryPlan::Nodes & nodes);
 void optimizeAggregationInOrder(QueryPlan::Node & node, QueryPlan::Nodes &);
+bool optimizeUseAggregateProjections(QueryPlan::Node & node, QueryPlan::Nodes & nodes);
+bool optimizeUseNormalProjections(Stack & stack, QueryPlan::Nodes & nodes);
 
 /// Enable memory bound merging of aggregation states for remote queries
 /// in case it was enabled for local plan
diff --git a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
index afcd585a3b4..21c7d362b17 100644
--- a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
+++ b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
@@ -17,6 +17,8 @@ QueryPlanOptimizationSettings QueryPlanOptimizationSettings::fromSettings(const
     settings.remove_redundant_sorting = from.query_plan_remove_redundant_sorting;
     settings.aggregate_partitions_independently = from.allow_aggregate_partitions_independently;
     settings.remove_redundant_distinct = from.query_plan_remove_redundant_distinct;
+    settings.optimize_projection = from.optimize_use_projections && from.query_plan_optimize_projection;
+    settings.force_use_projection = settings.optimize_projection && from.force_optimize_projection;
     return settings;
 }
 
diff --git a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
index db27993aeb1..967cfdaca7f 100644
--- a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
+++ b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
@@ -38,6 +38,10 @@ struct QueryPlanOptimizationSettings
     /// If removing redundant distinct steps is enabled
     bool remove_redundant_distinct = true;
 
+    /// If reading from projection can be applied
+    bool optimize_projection = false;
+    bool force_use_projection = false;
+
     static QueryPlanOptimizationSettings fromSettings(const Settings & from);
     static QueryPlanOptimizationSettings fromContext(ContextPtr from);
 };
diff --git a/src/Processors/QueryPlan/Optimizations/actionsDAGUtils.cpp b/src/Processors/QueryPlan/Optimizations/actionsDAGUtils.cpp
index 643e93146f4..c9cf46aaeca 100644
--- a/src/Processors/QueryPlan/Optimizations/actionsDAGUtils.cpp
+++ b/src/Processors/QueryPlan/Optimizations/actionsDAGUtils.cpp
@@ -2,6 +2,7 @@
 
 #include <Core/Field.h>
 #include <Functions/IFunction.h>
+#include <Columns/ColumnConst.h>
 
 #include <stack>
 
@@ -11,7 +12,7 @@ MatchedTrees::Matches matchTrees(const ActionsDAG & inner_dag, const ActionsDAG
 {
     using Parents = std::set<const ActionsDAG::Node *>;
     std::unordered_map<const ActionsDAG::Node *, Parents> inner_parents;
-    std::unordered_map<std::string_view, const ActionsDAG::Node *> inner_inputs_and_constants;
+    std::unordered_map<std::string_view, const ActionsDAG::Node *> inner_inputs;
 
     {
         std::stack<const ActionsDAG::Node *> stack;
@@ -27,8 +28,8 @@ MatchedTrees::Matches matchTrees(const ActionsDAG & inner_dag, const ActionsDAG
                 const auto * node = stack.top();
                 stack.pop();
 
-                if (node->type == ActionsDAG::ActionType::INPUT || node->type == ActionsDAG::ActionType::COLUMN)
-                    inner_inputs_and_constants.emplace(node->result_name, node);
+                if (node->type == ActionsDAG::ActionType::INPUT)
+                    inner_inputs.emplace(node->result_name, node);
 
                 for (const auto * child : node->children)
                 {
@@ -84,10 +85,10 @@ MatchedTrees::Matches matchTrees(const ActionsDAG & inner_dag, const ActionsDAG
             /// match.node will be set if match is found.
             auto & match = matches[frame.node];
 
-            if (frame.node->type == ActionsDAG::ActionType::INPUT || frame.node->type == ActionsDAG::ActionType::COLUMN)
+            if (frame.node->type == ActionsDAG::ActionType::INPUT)
             {
                 const ActionsDAG::Node * mapped = nullptr;
-                if (auto it = inner_inputs_and_constants.find(frame.node->result_name); it != inner_inputs_and_constants.end())
+                if (auto it = inner_inputs.find(frame.node->result_name); it != inner_inputs.end())
                     mapped = it->second;
 
                 match.node = mapped;
@@ -101,14 +102,20 @@ MatchedTrees::Matches matchTrees(const ActionsDAG & inner_dag, const ActionsDAG
                 //std::cerr << "... Processing " << frame.node->function_base->getName() << std::endl;
 
                 bool found_all_children = true;
-                for (const auto * child : frame.mapped_children)
-                    if (!child)
+                const ActionsDAG::Node * any_child = nullptr;
+                size_t num_children = frame.node->children.size();
+                for (size_t i = 0; i < num_children; ++i)
+                {
+                    if (frame.mapped_children[i])
+                        any_child = frame.mapped_children[i];
+                    else if (!frame.node->children[i]->column || !isColumnConst(*frame.node->children[i]->column))
                         found_all_children = false;
+                }
 
-                if (found_all_children && !frame.mapped_children.empty())
+                if (found_all_children && any_child)
                 {
                     Parents container;
-                    Parents * intersection = &inner_parents[frame.mapped_children[0]];
+                    Parents * intersection = &inner_parents[any_child];
 
                     if (frame.mapped_children.size() > 1)
                     {
@@ -116,7 +123,8 @@ MatchedTrees::Matches matchTrees(const ActionsDAG & inner_dag, const ActionsDAG
                         size_t mapped_children_size = frame.mapped_children.size();
                         other_parents.reserve(mapped_children_size);
                         for (size_t i = 1; i < mapped_children_size; ++i)
-                            other_parents.push_back(&inner_parents[frame.mapped_children[i]]);
+                            if (frame.mapped_children[i])
+                                other_parents.push_back(&inner_parents[frame.mapped_children[i]]);
 
                         for (const auto * parent : *intersection)
                         {
@@ -148,12 +156,20 @@ MatchedTrees::Matches matchTrees(const ActionsDAG & inner_dag, const ActionsDAG
                             if (parent->type == ActionsDAG::ActionType::FUNCTION && func_name == parent->function_base->getName())
                             {
                                 const auto & children = parent->children;
-                                size_t num_children = children.size();
-                                if (frame.mapped_children.size() == num_children)
+                                if (children.size() == num_children)
                                 {
                                     bool all_children_matched = true;
                                     for (size_t i = 0; all_children_matched && i < num_children; ++i)
-                                        all_children_matched = frame.mapped_children[i] == children[i];
+                                    {
+                                        if (frame.mapped_children[i] == nullptr)
+                                        {
+                                            all_children_matched = children[i]->column && isColumnConst(*children[i]->column)
+                                                && children[i]->result_type->equals(*frame.node->children[i]->result_type)
+                                                && assert_cast<const ColumnConst &>(*children[i]->column).getField() == assert_cast<const ColumnConst &>(*frame.node->children[i]->column).getField();
+                                        }
+                                        else
+                                            all_children_matched = frame.mapped_children[i] == children[i];
+                                    }
 
                                     if (all_children_matched)
                                     {
@@ -212,5 +228,4 @@ MatchedTrees::Matches matchTrees(const ActionsDAG & inner_dag, const ActionsDAG
     return matches;
 }
 
-
 }
diff --git a/src/Processors/QueryPlan/Optimizations/distinctReadInOrder.cpp b/src/Processors/QueryPlan/Optimizations/distinctReadInOrder.cpp
index d584a27f16e..0a3a4094a66 100644
--- a/src/Processors/QueryPlan/Optimizations/distinctReadInOrder.cpp
+++ b/src/Processors/QueryPlan/Optimizations/distinctReadInOrder.cpp
@@ -1,5 +1,7 @@
 #include <memory>
 #include <Processors/QueryPlan/DistinctStep.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
@@ -7,6 +9,44 @@
 
 namespace DB::QueryPlanOptimizations
 {
+/// build actions DAG from stack of steps
+static ActionsDAGPtr buildActionsForPlanPath(std::vector<ActionsDAGPtr> & dag_stack)
+{
+    if (dag_stack.empty())
+        return nullptr;
+
+    ActionsDAGPtr path_actions = dag_stack.back()->clone();
+    dag_stack.pop_back();
+    while (!dag_stack.empty())
+    {
+        ActionsDAGPtr clone = dag_stack.back()->clone();
+        dag_stack.pop_back();
+        path_actions->mergeInplace(std::move(*clone));
+    }
+    return path_actions;
+}
+
+static std::set<std::string>
+getOriginalDistinctColumns(const ColumnsWithTypeAndName & distinct_columns, std::vector<ActionsDAGPtr> & dag_stack)
+{
+    auto actions = buildActionsForPlanPath(dag_stack);
+    FindOriginalNodeForOutputName original_node_finder(actions);
+    std::set<std::string> original_distinct_columns;
+    for (const auto & column : distinct_columns)
+    {
+        /// const columns doesn't affect DISTINCT, so skip them
+        if (isColumnConst(*column.column))
+            continue;
+
+        const auto * input_node = original_node_finder.find(column.name);
+        if (!input_node)
+            break;
+
+        original_distinct_columns.insert(input_node->result_name);
+    }
+    return original_distinct_columns;
+}
+
 size_t tryDistinctReadInOrder(QueryPlan::Node * parent_node)
 {
     /// check if it is preliminary distinct node
@@ -22,8 +62,10 @@ size_t tryDistinctReadInOrder(QueryPlan::Node * parent_node)
     /// walk through the plan
     /// (1) check if nodes below preliminary distinct preserve sorting
     /// (2) gather transforming steps to update their sorting properties later
+    /// (3) gather actions DAG to find original names for columns in distinct step later
     std::vector<ITransformingStep *> steps_to_update;
     QueryPlan::Node * node = parent_node;
+    std::vector<ActionsDAGPtr> dag_stack;
     while (!node->children.empty())
     {
         auto * step = dynamic_cast<ITransformingStep *>(node->step.get());
@@ -36,6 +78,11 @@ size_t tryDistinctReadInOrder(QueryPlan::Node * parent_node)
 
         steps_to_update.push_back(step);
 
+        if (const auto * const expr = typeid_cast<const ExpressionStep *>(step); expr)
+            dag_stack.push_back(expr->getExpression());
+        else if (const auto * const filter = typeid_cast<const FilterStep *>(step); filter)
+            dag_stack.push_back(filter->getExpression());
+
         node = node->children.front();
     }
 
@@ -50,28 +97,24 @@ size_t tryDistinctReadInOrder(QueryPlan::Node * parent_node)
     if (read_from_merge_tree->getOutputStream().sort_description.empty())
         return 0;
 
-    /// find non-const columns in DISTINCT
+    /// get original names for DISTINCT columns
     const ColumnsWithTypeAndName & distinct_columns = pre_distinct->getOutputStream().header.getColumnsWithTypeAndName();
-    std::set<std::string_view> non_const_columns;
-    for (const auto & column : distinct_columns)
-    {
-        if (!isColumnConst(*column.column))
-            non_const_columns.emplace(column.name);
-    }
+    auto original_distinct_columns = getOriginalDistinctColumns(distinct_columns, dag_stack);
 
-    const Names& sorting_key_columns = read_from_merge_tree->getStorageMetadata()->getSortingKeyColumns();
     /// check if DISTINCT has the same columns as sorting key
+    const Names & sorting_key_columns = read_from_merge_tree->getStorageMetadata()->getSortingKeyColumns();
     size_t number_of_sorted_distinct_columns = 0;
     for (const auto & column_name : sorting_key_columns)
     {
-        if (non_const_columns.end() == non_const_columns.find(column_name))
+        if (!original_distinct_columns.contains(column_name))
             break;
 
         ++number_of_sorted_distinct_columns;
     }
+
     /// apply optimization only when distinct columns match or form prefix of sorting key
     /// todo: check if reading in order optimization would be beneficial when sorting key is prefix of columns in DISTINCT
-    if (number_of_sorted_distinct_columns != non_const_columns.size())
+    if (number_of_sorted_distinct_columns != original_distinct_columns.size())
         return 0;
 
     /// check if another read in order optimization is already applied
diff --git a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
index d466c52725f..37bc894339f 100644
--- a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
+++ b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
@@ -314,11 +314,14 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
     if (auto updated_steps = simplePushDownOverStep<DistinctStep>(parent_node, nodes, child))
         return updated_steps;
 
-    if (auto * join = typeid_cast<JoinStep *>(child.get()))
+    auto * join = typeid_cast<JoinStep *>(child.get());
+    auto * filled_join = typeid_cast<FilledJoinStep *>(child.get());
+
+    if (join || filled_join)
     {
         auto join_push_down = [&](JoinKind kind) -> size_t
         {
-            const auto & table_join = join->getJoin()->getTableJoin();
+            const auto & table_join = join ? join->getJoin()->getTableJoin() : filled_join->getJoin()->getTableJoin();
 
             /// Only inner and left(/right) join are supported. Other types may generate default values for left table keys.
             /// So, if we push down a condition like `key != 0`, not all rows may be filtered.
@@ -326,8 +329,8 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
                 return 0;
 
             bool is_left = kind == JoinKind::Left;
-            const auto & input_header = is_left ? join->getInputStreams().front().header : join->getInputStreams().back().header;
-            const auto & res_header = join->getOutputStream().header;
+            const auto & input_header = is_left ? child->getInputStreams().front().header : child->getInputStreams().back().header;
+            const auto & res_header = child->getOutputStream().header;
             Names allowed_keys;
             const auto & source_columns = input_header.getNames();
             for (const auto & name : source_columns)
@@ -372,7 +375,7 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
             return updated_steps;
 
         /// For full sorting merge join we push down both to the left and right tables, because left and right streams are not independent.
-        if (join->allowPushDownToRight())
+        if (join && join->allowPushDownToRight())
         {
             if (size_t updated_steps = join_push_down(JoinKind::Right))
                 return updated_steps;
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
new file mode 100644
index 00000000000..ca8a412bf2e
--- /dev/null
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
@@ -0,0 +1,380 @@
+#include <Processors/QueryPlan/Optimizations/Optimizations.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
+#include <Storages/MergeTree/MergeTreeWhereOptimizer.h>
+#include <Interpreters/ActionsDAG.h>
+#include <Planner/ActionsChain.h>
+#include <deque>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+
+void matchDAGOutputNodesOrderWithHeader(ActionsDAGPtr & actions_dag, const Block & expected_header)
+{
+    std::unordered_map<std::string, const ActionsDAG::Node *> output_name_to_node;
+    for (const auto * output_node : actions_dag->getOutputs())
+        output_name_to_node.emplace(output_node->result_name, output_node);
+
+    std::unordered_set<const ActionsDAG::Node *> used_output_nodes;
+
+    ActionsDAG::NodeRawConstPtrs updated_outputs;
+    updated_outputs.reserve(expected_header.columns());
+
+    for (const auto & column : expected_header)
+    {
+        auto output_node_it = output_name_to_node.find(column.name);
+        if (output_node_it == output_name_to_node.end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Invalid move to PREWHERE optimization. Cannot find column {} in output",
+                column.name);
+
+        updated_outputs.push_back(output_node_it->second);
+        used_output_nodes.insert(output_node_it->second);
+    }
+
+    ActionsDAG::NodeRawConstPtrs unused_outputs;
+    for (const auto * output_node : actions_dag->getOutputs())
+    {
+        if (used_output_nodes.contains(output_node))
+            continue;
+
+        unused_outputs.push_back(output_node);
+    }
+
+    auto & actions_dag_outputs = actions_dag->getOutputs();
+    actions_dag_outputs = std::move(updated_outputs);
+    actions_dag_outputs.insert(actions_dag_outputs.end(), unused_outputs.begin(), unused_outputs.end());
+}
+
+}
+
+
+namespace QueryPlanOptimizations
+{
+
+void optimizePrewhere(Stack & stack, QueryPlan::Nodes & nodes)
+{
+    if (stack.size() < 3)
+        return;
+
+    const auto & frame = stack.back();
+
+    /** Assume that on stack there are at least 3 nodes:
+      *
+      * 1. SomeNode
+      * 2. FilterNode
+      * 3. ReadFromMergeTreeNode
+      */
+    auto * read_from_merge_tree = typeid_cast<ReadFromMergeTree *>(frame.node->step.get());
+    if (!read_from_merge_tree)
+        return;
+
+    const auto & storage_prewhere_info = read_from_merge_tree->getPrewhereInfo();
+    if (storage_prewhere_info && storage_prewhere_info->prewhere_actions)
+        return;
+
+    const QueryPlan::Node * filter_node = (stack.rbegin() + 1)->node;
+    const auto * filter_step = typeid_cast<FilterStep *>(filter_node->step.get());
+    if (!filter_step)
+        return;
+
+    /** Collect required filter output columns.
+      * Collect output nodes that are mapped to input nodes.
+      * Collect input node to output nodes mapping.
+      */
+    ColumnsWithTypeAndName required_columns_after_filter;
+    std::unordered_set<std::string> output_nodes_mapped_to_input;
+    std::unordered_map<std::string, std::vector<std::string>> input_node_to_output_names;
+
+    for (const auto * output_node : filter_step->getExpression()->getOutputs())
+    {
+        const auto * node_without_alias = output_node;
+        while (node_without_alias->type == ActionsDAG::ActionType::ALIAS)
+            node_without_alias = node_without_alias->children[0];
+
+        if (node_without_alias->type == ActionsDAG::ActionType::INPUT)
+        {
+            output_nodes_mapped_to_input.emplace(output_node->result_name);
+
+            auto output_names_it = input_node_to_output_names.find(node_without_alias->result_name);
+            if (output_names_it == input_node_to_output_names.end())
+            {
+                auto [insert_it, _] = input_node_to_output_names.emplace(node_without_alias->result_name, std::vector<std::string>());
+                output_names_it = insert_it;
+            }
+
+            output_names_it->second.push_back(output_node->result_name);
+        }
+
+        if (output_node->result_name == filter_step->getFilterColumnName() && filter_step->removesFilterColumn())
+            continue;
+
+        required_columns_after_filter.push_back(ColumnWithTypeAndName(output_node->result_type, output_node->result_name));
+    }
+
+    const auto & context = read_from_merge_tree->getContext();
+    const auto & settings = context->getSettingsRef();
+
+    if (!settings.allow_experimental_analyzer)
+        return;
+
+    const auto & table_expression_modifiers = read_from_merge_tree->getQueryInfo().table_expression_modifiers;
+    bool is_final = table_expression_modifiers && table_expression_modifiers->hasFinal();
+    bool optimize_move_to_prewhere = settings.optimize_move_to_prewhere && (!is_final || settings.optimize_move_to_prewhere_if_final);
+    if (!optimize_move_to_prewhere)
+        return;
+
+    const auto & storage_snapshot = read_from_merge_tree->getStorageSnapshot();
+
+    if (table_expression_modifiers && table_expression_modifiers->hasSampleSizeRatio())
+    {
+        const auto & sampling_key = storage_snapshot->getMetadataForQuery()->getSamplingKey();
+        const auto & sampling_columns = sampling_key.sample_block.getColumnsWithTypeAndName();
+        required_columns_after_filter.insert(required_columns_after_filter.end(), sampling_columns.begin(), sampling_columns.end());
+    }
+
+    const auto & storage = storage_snapshot->storage;
+    const auto & storage_metadata = storage_snapshot->metadata;
+    auto column_sizes = storage.getColumnSizes();
+    if (column_sizes.empty())
+        return;
+
+    /// Extract column compressed sizes
+    std::unordered_map<std::string, UInt64> column_compressed_sizes;
+    for (const auto & [name, sizes] : column_sizes)
+        column_compressed_sizes[name] = sizes.data_compressed;
+
+    Names queried_columns = read_from_merge_tree->getRealColumnNames();
+
+    MergeTreeWhereOptimizer where_optimizer{
+        std::move(column_compressed_sizes),
+        storage_metadata,
+        queried_columns,
+        storage.supportedPrewhereColumns(),
+        &Poco::Logger::get("QueryPlanOptimizePrewhere")};
+
+    auto optimize_result = where_optimizer.optimize(filter_step->getExpression(),
+        filter_step->getFilterColumnName(),
+        read_from_merge_tree->getContext(),
+        is_final);
+    if (!optimize_result.has_value())
+        return;
+
+    PrewhereInfoPtr prewhere_info;
+    if (storage_prewhere_info)
+        prewhere_info = storage_prewhere_info->clone();
+    else
+        prewhere_info = std::make_shared<PrewhereInfo>();
+
+    prewhere_info->need_filter = true;
+
+    auto & prewhere_filter_actions = optimize_result->prewhere_filter_actions;
+
+    ActionsChain actions_chain;
+
+    std::string prewere_filter_node_name = prewhere_filter_actions->getOutputs().at(0)->result_name;
+    actions_chain.addStep(std::make_unique<ActionsChainStep>(prewhere_filter_actions));
+
+    auto & filter_actions = optimize_result->filter_actions;
+
+    /** Merge tree where optimizer splits conjunctions in filter expression into 2 parts:
+      * 1. Filter expressions.
+      * 2. Prewhere filter expressions.
+      *
+      * There can be cases when all expressions are moved to PREWHERE, but it is not
+      * enough to produce required filter output columns.
+      *
+      * Example: SELECT (a AND b) AS cond FROM test_table WHERE cond AND c;
+      * In this example condition expressions `a`, `b`, `c` can move to PREWHERE, but PREWHERE will not contain expression `and(a, b)`.
+      * It will contain only `a`, `b`, `c`, `and(a, b, c)` expressions.
+      *
+      * In such scenario we need to create additional step to calculate `and(a, b)` expression after PREWHERE.
+      */
+    bool need_additional_filter_after_prewhere = false;
+
+    if (!filter_actions)
+    {
+        /// Any node from PREWHERE filter actions can be used as possible output node
+        std::unordered_set<std::string> possible_prewhere_output_nodes;
+        for (const auto & node : prewhere_filter_actions->getNodes())
+            possible_prewhere_output_nodes.insert(node.result_name);
+
+        for (auto & required_column : required_columns_after_filter)
+        {
+            if (!possible_prewhere_output_nodes.contains(required_column.name) &&
+                !output_nodes_mapped_to_input.contains(required_column.name))
+            {
+                need_additional_filter_after_prewhere = true;
+                break;
+            }
+        }
+    }
+
+    /** If there are additional filter actions after PREWHERE filter actions, we create filter actions dag using PREWHERE filter
+      * actions output columns as filter actions dag input columns.
+      * Then we merge this filter actions dag nodes with old filter step actions dag nodes, to reuse some expressions from
+      * PREWHERE filter actions.
+      */
+    if (need_additional_filter_after_prewhere || filter_actions)
+    {
+        auto merged_filter_actions = std::make_shared<ActionsDAG>(actions_chain.getLastStepAvailableOutputColumns());
+        merged_filter_actions->getOutputs().clear();
+        merged_filter_actions->mergeNodes(std::move(*filter_step->getExpression()->clone()));
+
+        /// Add old filter step filter column to outputs
+        for (const auto & node : merged_filter_actions->getNodes())
+        {
+            if (node.result_name == filter_step->getFilterColumnName())
+            {
+                merged_filter_actions->getOutputs().push_back(&node);
+                break;
+            }
+        }
+
+        filter_actions = std::move(merged_filter_actions);
+
+        /// If there is filter after PREWHERE, we can ignore filtering during PREWHERE stage
+        prewhere_info->need_filter = false;
+
+        actions_chain.addStep(std::make_unique<ActionsChainStep>(filter_actions));
+    }
+
+    auto required_output_actions = std::make_shared<ActionsDAG>(required_columns_after_filter);
+    actions_chain.addStep(std::make_unique<ActionsChainStep>(required_output_actions));
+
+    actions_chain.finalize();
+
+    prewhere_filter_actions->projectInput(false);
+
+    auto & prewhere_actions_chain_node = actions_chain[0];
+    prewhere_info->prewhere_actions = std::move(prewhere_filter_actions);
+    prewhere_info->prewhere_column_name = prewere_filter_node_name;
+    prewhere_info->remove_prewhere_column = !prewhere_actions_chain_node->getChildRequiredOutputColumnsNames().contains(prewere_filter_node_name);
+
+    read_from_merge_tree->updatePrewhereInfo(prewhere_info);
+
+    QueryPlan::Node * replace_old_filter_node = nullptr;
+    bool remove_filter_node = false;
+
+    if (filter_actions)
+    {
+        filter_actions->projectInput(false);
+
+        /// Match dag output nodes with old filter step header
+        matchDAGOutputNodesOrderWithHeader(filter_actions, filter_step->getOutputStream().header);
+
+        auto & filter_actions_chain_node = actions_chain[1];
+        bool remove_filter_column = !filter_actions_chain_node->getChildRequiredOutputColumnsNames().contains(filter_step->getFilterColumnName());
+        auto after_prewhere_filter_step = std::make_unique<FilterStep>(read_from_merge_tree->getOutputStream(),
+            filter_actions,
+            filter_step->getFilterColumnName(),
+            remove_filter_column);
+
+        auto & node = nodes.emplace_back();
+        node.children.emplace_back(frame.node);
+        node.step = std::move(after_prewhere_filter_step);
+
+        replace_old_filter_node = &node;
+    }
+    else
+    {
+        auto rename_actions_dag = std::make_shared<ActionsDAG>(read_from_merge_tree->getOutputStream().header.getColumnsWithTypeAndName());
+        bool apply_rename_step = false;
+
+        ActionsDAG::NodeRawConstPtrs updated_outputs;
+
+        /** If in output after read from merge tree there are column names without aliases,
+          * apply old filter step aliases to them.
+          */
+        for (const auto * output_node : rename_actions_dag->getOutputs())
+        {
+            const auto alias_it = input_node_to_output_names.find(output_node->result_name);
+            if (alias_it == input_node_to_output_names.end())
+            {
+                updated_outputs.push_back(output_node);
+                continue;
+            }
+
+            for (auto & output_name : alias_it->second)
+            {
+                if (output_name == output_node->result_name)
+                {
+                    updated_outputs.push_back(output_node);
+                    continue;
+                }
+
+                updated_outputs.push_back(&rename_actions_dag->addAlias(*output_node, output_name));
+                apply_rename_step = true;
+            }
+        }
+
+        rename_actions_dag->getOutputs() = std::move(updated_outputs);
+
+        bool apply_match_step = false;
+
+        /// If column order does not match old filter step column order, match dag output nodes with header
+        if (!blocksHaveEqualStructure(read_from_merge_tree->getOutputStream().header, filter_step->getOutputStream().header))
+        {
+            apply_match_step = true;
+            matchDAGOutputNodesOrderWithHeader(rename_actions_dag, filter_step->getOutputStream().header);
+        }
+
+        if (apply_rename_step || apply_match_step)
+        {
+            auto rename_step = std::make_unique<ExpressionStep>(read_from_merge_tree->getOutputStream(), rename_actions_dag);
+            if (apply_rename_step)
+                rename_step->setStepDescription("Change column names to column identifiers");
+
+            auto & node = nodes.emplace_back();
+            node.children.emplace_back(frame.node);
+            node.step = std::move(rename_step);
+
+            replace_old_filter_node = &node;
+        }
+        else
+        {
+            replace_old_filter_node = frame.node;
+            remove_filter_node = true;
+        }
+    }
+
+    QueryPlan::Node * filter_parent_node = (stack.rbegin() + 2)->node;
+
+    for (auto & filter_parent_child : filter_parent_node->children)
+    {
+        if (filter_parent_child == filter_node)
+        {
+            filter_parent_child = replace_old_filter_node;
+
+            size_t stack_size = stack.size();
+
+            /** If filter step is completely replaced with PREWHERE filter actions, remove it from stack.
+              * Otherwise replace old filter step with new filter step after PREWHERE.
+              */
+            if (remove_filter_node)
+            {
+                std::swap(stack[stack_size - 1], stack[stack_size - 2]);
+                stack.pop_back();
+            }
+            else
+            {
+                stack[stack_size - 2] = Frame{.node = replace_old_filter_node, .next_child = 1};
+            }
+
+            break;
+        }
+    }
+}
+
+}
+
+}
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
index cac4944bad7..e98386a6ee9 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
@@ -1,9 +1,7 @@
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/FilterStep.h>
-#include <Processors/QueryPlan/ReadFromMergeTree.h>
-#include <Storages/StorageMerge.h>
-#include <Interpreters/ActionsDAG.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
 #include <deque>
 
 namespace DB::QueryPlanOptimizations
@@ -13,21 +11,15 @@ void optimizePrimaryKeyCondition(const Stack & stack)
 {
     const auto & frame = stack.back();
 
-    auto * read_from_merge_tree = typeid_cast<ReadFromMergeTree *>(frame.node->step.get());
-    auto * read_from_merge = typeid_cast<ReadFromMerge *>(frame.node->step.get());
-
-    if (!read_from_merge && !read_from_merge_tree)
+    auto * source_step_with_filter = dynamic_cast<SourceStepWithFilter *>(frame.node->step.get());
+    if (!source_step_with_filter)
         return;
 
     for (auto iter = stack.rbegin() + 1; iter != stack.rend(); ++iter)
     {
         if (auto * filter_step = typeid_cast<FilterStep *>(iter->node->step.get()))
-        {
-            if (read_from_merge_tree)
-                read_from_merge_tree->addFilter(filter_step->getExpression(), filter_step->getFilterColumnName());
-            if (read_from_merge)
-                read_from_merge->addFilter(filter_step->getExpression(), filter_step->getFilterColumnName());
-        }
+            source_step_with_filter->addFilter(filter_step->getExpression(), filter_step->getFilterColumnName());
+
         /// Note: actually, plan optimizations merge Filter and Expression steps.
         /// Ideally, chain should look like (Expression -> ...) -> (Filter -> ...) -> ReadFromStorage,
         /// So this is likely not needed.
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp b/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
index 0874a3771ae..655cb1fdb80 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
@@ -12,6 +12,7 @@
 #include <Processors/QueryPlan/CubeStep.h>
 #include <Processors/QueryPlan/DistinctStep.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <Processors/QueryPlan/JoinStep.h>
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
@@ -30,7 +31,7 @@
 namespace DB::QueryPlanOptimizations
 {
 
-ISourceStep * checkSupportedReadingStep(IQueryPlanStep * step)
+static ISourceStep * checkSupportedReadingStep(IQueryPlanStep * step)
 {
     if (auto * reading = typeid_cast<ReadFromMergeTree *>(step))
     {
@@ -67,7 +68,7 @@ ISourceStep * checkSupportedReadingStep(IQueryPlanStep * step)
 
 using StepStack = std::vector<IQueryPlanStep*>;
 
-QueryPlan::Node * findReadingStep(QueryPlan::Node & node, StepStack & backward_path)
+static QueryPlan::Node * findReadingStep(QueryPlan::Node & node, StepStack & backward_path)
 {
     IQueryPlanStep * step = node.step.get();
     if (auto * reading = checkSupportedReadingStep(step))
@@ -119,7 +120,7 @@ using FixedColumns = std::unordered_set<const ActionsDAG::Node *>;
 
 /// Right now we find only simple cases like 'and(..., and(..., and(column = value, ...), ...'
 /// Injective functions are supported here. For a condition 'injectiveFunction(x) = 5' column 'x' is fixed.
-void appendFixedColumnsFromFilterExpression(const ActionsDAG::Node & filter_expression, FixedColumns & fixed_columns)
+static void appendFixedColumnsFromFilterExpression(const ActionsDAG::Node & filter_expression, FixedColumns & fixed_columns)
 {
     std::stack<const ActionsDAG::Node *> stack;
     stack.push(&filter_expression);
@@ -168,7 +169,7 @@ void appendFixedColumnsFromFilterExpression(const ActionsDAG::Node & filter_expr
     }
 }
 
-void appendExpression(ActionsDAGPtr & dag, const ActionsDAGPtr & expression)
+static void appendExpression(ActionsDAGPtr & dag, const ActionsDAGPtr & expression)
 {
     if (dag)
         dag->mergeInplace(std::move(*expression->clone()));
@@ -176,14 +177,14 @@ void appendExpression(ActionsDAGPtr & dag, const ActionsDAGPtr & expression)
         dag = expression->clone();
 }
 
-/// This function builds a common DAG which is a gerge of DAGs from Filter and Expression steps chain.
+/// This function builds a common DAG which is a merge of DAGs from Filter and Expression steps chain.
 /// Additionally, build a set of fixed columns.
 void buildSortingDAG(QueryPlan::Node & node, ActionsDAGPtr & dag, FixedColumns & fixed_columns, size_t & limit)
 {
     IQueryPlanStep * step = node.step.get();
     if (auto * reading = typeid_cast<ReadFromMergeTree *>(step))
     {
-        if (const auto * prewhere_info = reading->getPrewhereInfo())
+        if (const auto prewhere_info = reading->getPrewhereInfo())
         {
             /// Should ignore limit if there is filtering.
             limit = 0;
@@ -519,8 +520,9 @@ AggregationInputOrder buildInputOrderInfo(
 
         enreachFixedColumns(sorting_key_dag, fixed_key_columns);
 
-        for (auto it = matches.cbegin(); it != matches.cend(); ++it)
+        for (const auto * output : dag->getOutputs())
         {
+            auto it = matches.find(output);
             const MatchedTrees::Match * match = &it->second;
             if (match->node)
             {
@@ -981,6 +983,10 @@ void optimizeAggregationInOrder(QueryPlan::Node & node, QueryPlan::Nodes &)
     if ((aggregating->inOrder() && !aggregating->explicitSortingRequired()) || aggregating->isGroupingSets())
         return;
 
+    /// It just does not work, see 02515_projections_with_totals
+    if (aggregating->getParams().overflow_row)
+        return;
+
     /// TODO: maybe add support for UNION later.
     std::vector<IQueryPlanStep*> steps_to_update;
     if (auto order_info = buildInputOrderInfo(*aggregating, *node.children.front(), steps_to_update); order_info.input_order)
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp b/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
index 0378c5ef416..dd17c1b5a30 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
@@ -1,4 +1,5 @@
 #include <Common/Exception.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
 #include <Processors/QueryPlan/MergingAggregatedStep.h>
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
@@ -12,6 +13,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int TOO_MANY_QUERY_PLAN_OPTIMIZATIONS;
+    extern const int PROJECTION_NOT_USED;
 }
 
 namespace QueryPlanOptimizations
@@ -103,6 +105,10 @@ void optimizeTreeFirstPass(const QueryPlanOptimizationSettings & settings, Query
 
 void optimizeTreeSecondPass(const QueryPlanOptimizationSettings & optimization_settings, QueryPlan::Node & root, QueryPlan::Nodes & nodes)
 {
+    size_t max_optimizations_to_apply = optimization_settings.max_optimizations_to_apply;
+    size_t num_applied_projection = 0;
+    bool has_reading_from_mt = false;
+
     Stack stack;
     stack.push_back({.node = &root});
 
@@ -112,9 +118,14 @@ void optimizeTreeSecondPass(const QueryPlanOptimizationSettings & optimization_s
 
         if (frame.next_child == 0)
         {
+            has_reading_from_mt |= typeid_cast<const ReadFromMergeTree *>(frame.node->step.get()) != nullptr;
+
             if (optimization_settings.read_in_order)
                 optimizeReadInOrder(*frame.node, nodes);
 
+            if (optimization_settings.optimize_projection)
+                num_applied_projection += optimizeUseAggregateProjections(*frame.node, nodes);
+
             if (optimization_settings.aggregation_in_order)
                 optimizeAggregationInOrder(*frame.node, nodes);
 
@@ -131,11 +142,35 @@ void optimizeTreeSecondPass(const QueryPlanOptimizationSettings & optimization_s
             continue;
         }
 
+        if (optimization_settings.optimize_projection)
+        {
+            if (optimizeUseNormalProjections(stack, nodes))
+            {
+                ++num_applied_projection;
+
+                if (max_optimizations_to_apply && max_optimizations_to_apply < num_applied_projection)
+                    throw Exception(ErrorCodes::TOO_MANY_QUERY_PLAN_OPTIMIZATIONS,
+                                    "Too many projection optimizations applied to query plan. Current limit {}",
+                                    max_optimizations_to_apply);
+
+                /// Stack is updated after this optimization and frame is not valid anymore.
+                /// Try to apply optimizations again to newly added plan steps.
+                --stack.back().next_child;
+                continue;
+            }
+        }
+
+        optimizePrewhere(stack, nodes);
         optimizePrimaryKeyCondition(stack);
         enableMemoryBoundMerging(*frame.node, nodes);
 
         stack.pop_back();
     }
+
+    if (optimization_settings.force_use_projection && has_reading_from_mt && num_applied_projection == 0)
+        throw Exception(
+            ErrorCodes::PROJECTION_NOT_USED,
+            "No projection is used when optimize_use_projections = 1 and force_optimize_projection = 1");
 }
 
 }
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp b/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
new file mode 100644
index 00000000000..2959178b2e5
--- /dev/null
+++ b/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
@@ -0,0 +1,705 @@
+#include <Processors/QueryPlan/Optimizations/projectionsCommon.h>
+#include <Processors/QueryPlan/Optimizations/actionsDAGUtils.h>
+#include <Processors/QueryPlan/AggregatingStep.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
+#include <Processors/QueryPlan/ReadFromPreparedSource.h>
+
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/Sources/NullSource.h>
+
+#include <AggregateFunctions/AggregateFunctionCount.h>
+#include <Analyzer/JoinNode.h>
+#include <Analyzer/TableNode.h>
+#include <Analyzer/QueryTreeBuilder.h>
+#include <Analyzer/QueryTreePassManager.h>
+#include <Analyzer/QueryNode.h>
+
+#include <Common/logger_useful.h>
+#include <Storages/StorageDummy.h>
+#include <Planner/PlannerExpressionAnalysis.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
+#include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+#include <Storages/ProjectionsDescription.h>
+#include <Parsers/queryToString.h>
+
+namespace DB::QueryPlanOptimizations
+{
+
+using DAGIndex = std::unordered_map<std::string_view, const ActionsDAG::Node *>;
+static DAGIndex buildDAGIndex(const ActionsDAG & dag)
+{
+    DAGIndex index;
+    for (const auto * output : dag.getOutputs())
+        index.emplace(output->result_name, output);
+
+    return index;
+}
+
+/// Required analysis info from aggregate projection.
+struct AggregateProjectionInfo
+{
+    ActionsDAGPtr before_aggregation;
+    Names keys;
+    AggregateDescriptions aggregates;
+
+    /// A context copy from interpreter which was used for analysis.
+    /// Just in case it is used by some function.
+    ContextPtr context;
+};
+
+/// Get required info from aggregate projection.
+/// Ideally, this should be pre-calculated and stored inside ProjectionDescription.
+static AggregateProjectionInfo getAggregatingProjectionInfo(
+    const ProjectionDescription & projection,
+    const ContextPtr & context,
+    const StorageMetadataPtr & metadata_snapshot,
+    const Block & key_virtual_columns)
+{
+    /// This is a bad approach.
+    /// We'd better have a separate interpreter for projections.
+    /// Now it's not obvious we didn't miss anything here.
+    ///
+    /// Setting ignoreASTOptimizations is used because some of them are invalid for projections.
+    /// Example: 'SELECT min(c0), max(c0), count() GROUP BY -c0' for minmax_count projection can be rewritten to
+    /// 'SELECT min(c0), max(c0), count() GROUP BY c0' which is incorrect cause we store a column '-c0' in projection.
+    InterpreterSelectQuery interpreter(
+        projection.query_ast,
+        context,
+        Pipe(std::make_shared<SourceFromSingleChunk>(metadata_snapshot->getSampleBlock())),
+        SelectQueryOptions{QueryProcessingStage::WithMergeableState}.ignoreASTOptimizations());
+
+    const auto & analysis_result = interpreter.getAnalysisResult();
+    const auto & query_analyzer = interpreter.getQueryAnalyzer();
+
+    AggregateProjectionInfo info;
+    info.context = interpreter.getContext();
+    info.before_aggregation = analysis_result.before_aggregation;
+    info.keys = query_analyzer->aggregationKeys().getNames();
+    info.aggregates = query_analyzer->aggregates();
+
+    /// Add part/partition virtual columns to projection aggregation keys.
+    /// We can do it because projection is stored for every part separately.
+    for (const auto & virt_column : key_virtual_columns)
+    {
+        const auto * input = &info.before_aggregation->addInput(virt_column);
+        info.before_aggregation->getOutputs().push_back(input);
+        info.keys.push_back(virt_column.name);
+    }
+
+    return info;
+}
+
+static bool hasNullableOrMissingColumn(const DAGIndex & index, const Names & names)
+{
+    for (const auto & query_name : names)
+    {
+        auto jt = index.find(query_name);
+        if (jt == index.end() || jt->second->result_type->isNullable())
+            return true;
+    }
+
+    return false;
+}
+
+struct AggregateFunctionMatch
+{
+    const AggregateDescription * description = nullptr;
+    DataTypes argument_types;
+};
+
+using AggregateFunctionMatches = std::vector<AggregateFunctionMatch>;
+
+/// Here we try to match aggregate functions from the query to
+/// aggregate functions from projection.
+std::optional<AggregateFunctionMatches> matchAggregateFunctions(
+    const AggregateProjectionInfo & info,
+    const AggregateDescriptions & aggregates,
+    const MatchedTrees::Matches & matches,
+    const DAGIndex & query_index,
+    const DAGIndex & proj_index)
+{
+    AggregateFunctionMatches res;
+
+    /// Index (projection agg function name) -> pos
+    std::unordered_map<std::string, std::vector<size_t>> projection_aggregate_functions;
+    for (size_t i = 0; i < info.aggregates.size(); ++i)
+        projection_aggregate_functions[info.aggregates[i].function->getName()].push_back(i);
+
+    for (const auto & aggregate : aggregates)
+    {
+        /// Get a list of candidates by name first.
+        auto it = projection_aggregate_functions.find(aggregate.function->getName());
+        if (it == projection_aggregate_functions.end())
+        {
+            // LOG_TRACE(
+            //     &Poco::Logger::get("optimizeUseProjections"),
+            //     "Cannot match agg func {} by name {}",
+            //     aggregate.column_name, aggregate.function->getName());
+
+            return {};
+        }
+
+        size_t num_args = aggregate.argument_names.size();
+
+        DataTypes argument_types;
+        argument_types.reserve(num_args);
+
+        auto & candidates = it->second;
+        bool found_match = false;
+
+        for (size_t idx : candidates)
+        {
+            argument_types.clear();
+            const auto & candidate = info.aggregates[idx];
+
+            /// Note: this check is a bit strict.
+            /// We check that aggregate function names, argument types and parameters are equal.
+            /// In some cases it's possible only to check that states are equal,
+            /// e.g. for quantile(0.3)(...) and quantile(0.5)(...).
+            /// But also functions sum(...) and sumIf(...) will have equal states,
+            /// and we can't replace one to another from projection.
+            if (!candidate.function->getStateType()->equals(*aggregate.function->getStateType()))
+            {
+                // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Cannot match agg func {} vs {} by state {} vs {}",
+                //     aggregate.column_name, candidate.column_name,
+                //     candidate.function->getStateType()->getName(), aggregate.function->getStateType()->getName());
+                continue;
+            }
+
+            /// This is a special case for the function count().
+            /// We can assume that 'count(expr) == count()' if expr is not nullable.
+            if (typeid_cast<const AggregateFunctionCount *>(candidate.function.get()))
+            {
+                bool has_nullable_or_missing_arg = false;
+                has_nullable_or_missing_arg |= hasNullableOrMissingColumn(query_index, aggregate.argument_names);
+                has_nullable_or_missing_arg |= hasNullableOrMissingColumn(proj_index, candidate.argument_names);
+
+                if (!has_nullable_or_missing_arg)
+                {
+                    /// we can ignore arguments for count()
+                    found_match = true;
+                    res.push_back({&candidate, DataTypes()});
+                    break;
+                }
+            }
+
+            /// Now, function names and types matched.
+            /// Next, match arguments from DAGs.
+
+            if (num_args != candidate.argument_names.size())
+                continue;
+
+            size_t next_arg = 0;
+            while (next_arg < num_args)
+            {
+                const auto & query_name = aggregate.argument_names[next_arg];
+                const auto & proj_name = candidate.argument_names[next_arg];
+
+                auto jt = query_index.find(query_name);
+                auto kt = proj_index.find(proj_name);
+
+                /// This should not happen ideally.
+                if (jt == query_index.end() || kt == proj_index.end())
+                    break;
+
+                const auto * query_node = jt->second;
+                const auto * proj_node = kt->second;
+
+                auto mt = matches.find(query_node);
+                if (mt == matches.end())
+                {
+                    // LOG_TRACE(
+                    //     &Poco::Logger::get("optimizeUseProjections"),
+                    //     "Cannot match agg func {} vs {} : can't match arg {} vs {} : no node in map",
+                    //     aggregate.column_name, candidate.column_name, query_name, proj_name);
+
+                    break;
+                }
+
+                const auto & node_match = mt->second;
+                if (node_match.node != proj_node || node_match.monotonicity)
+                {
+                    // LOG_TRACE(
+                    //     &Poco::Logger::get("optimizeUseProjections"),
+                    //     "Cannot match agg func {} vs {} : can't match arg {} vs {} : no match or monotonicity",
+                    //     aggregate.column_name, candidate.column_name, query_name, proj_name);
+
+                    break;
+                }
+
+                argument_types.push_back(query_node->result_type);
+                ++next_arg;
+            }
+
+            if (next_arg < aggregate.argument_names.size())
+                continue;
+
+            found_match = true;
+            res.push_back({&candidate, std::move(argument_types)});
+            break;
+        }
+
+        if (!found_match)
+            return {};
+    }
+
+    return res;
+}
+
+static void appendAggregateFunctions(
+    ActionsDAG & proj_dag,
+    const AggregateDescriptions & aggregates,
+    const AggregateFunctionMatches & matched_aggregates)
+{
+    std::unordered_map<const AggregateDescription *, const ActionsDAG::Node *> inputs;
+
+    /// Just add all the aggregates to dag inputs.
+    auto & proj_dag_outputs =  proj_dag.getOutputs();
+    size_t num_aggregates = aggregates.size();
+    for (size_t i = 0; i < num_aggregates; ++i)
+    {
+        const auto & aggregate = aggregates[i];
+        const auto & match = matched_aggregates[i];
+        auto type = std::make_shared<DataTypeAggregateFunction>(aggregate.function, match.argument_types, aggregate.parameters);
+
+        auto & input = inputs[match.description];
+        if (!input)
+            input = &proj_dag.addInput(match.description->column_name, std::move(type));
+
+        const auto * node = input;
+
+        if (node->result_name != aggregate.column_name)
+            node = &proj_dag.addAlias(*node, aggregate.column_name);
+
+        proj_dag_outputs.push_back(node);
+    }
+}
+
+ActionsDAGPtr analyzeAggregateProjection(
+    const AggregateProjectionInfo & info,
+    const QueryDAG & query,
+    const DAGIndex & query_index,
+    const Names & keys,
+    const AggregateDescriptions & aggregates)
+{
+    auto proj_index = buildDAGIndex(*info.before_aggregation);
+
+    MatchedTrees::Matches matches = matchTrees(*info.before_aggregation, *query.dag);
+
+    // for (const auto & [node, match] : matches)
+    // {
+    //     LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Match {} {} -> {} {} (with monotonicity : {})",
+    //         static_cast<const void *>(node), node->result_name,
+    //         static_cast<const void *>(match.node), (match.node ? match.node->result_name : ""), match.monotonicity != std::nullopt);
+    // }
+
+    auto matched_aggregates = matchAggregateFunctions(info, aggregates, matches, query_index, proj_index);
+    if (!matched_aggregates)
+        return {};
+
+    ActionsDAG::NodeRawConstPtrs query_key_nodes;
+    std::unordered_set<const ActionsDAG::Node *> proj_key_nodes;
+
+    {
+        /// Just, filling the set above.
+
+        for (const auto & key : info.keys)
+        {
+            auto it = proj_index.find(key);
+            /// This should not happen ideally.
+            if (it == proj_index.end())
+                return {};
+
+            proj_key_nodes.insert(it->second);
+        }
+
+        query_key_nodes.reserve(keys.size() + 1);
+
+        /// We need to add filter column to keys set.
+        /// It should be computable from projection keys.
+        /// It will be removed in FilterStep.
+        if (query.filter_node)
+            query_key_nodes.push_back(query.filter_node);
+
+        for (const auto & key : keys)
+        {
+            auto it = query_index.find(key);
+            /// This should not happen ideally.
+            if (it == query_index.end())
+                return {};
+
+            query_key_nodes.push_back(it->second);
+        }
+    }
+
+    /// Here we want to match query keys with projection keys.
+    /// Query key can be any expression depending on projection keys.
+
+    struct Frame
+    {
+        const ActionsDAG::Node * node;
+        size_t next_child_to_visit = 0;
+    };
+
+    std::stack<Frame> stack;
+    std::unordered_set<const ActionsDAG::Node *> visited;
+    std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> new_inputs;
+
+    for (const auto * key_node : query_key_nodes)
+    {
+        if (visited.contains(key_node))
+            continue;
+
+        stack.push({.node = key_node});
+
+        while (!stack.empty())
+        {
+            auto & frame = stack.top();
+
+            if (frame.next_child_to_visit == 0)
+            {
+                auto jt = matches.find(frame.node);
+                if (jt != matches.end())
+                {
+                    auto & match = jt->second;
+                    if (match.node && !match.monotonicity && proj_key_nodes.contains(match.node))
+                    {
+                        visited.insert(frame.node);
+                        new_inputs[frame.node] = match.node;
+                        stack.pop();
+                        continue;
+                    }
+                }
+            }
+
+            if (frame.next_child_to_visit < frame.node->children.size())
+            {
+                stack.push({.node = frame.node->children[frame.next_child_to_visit]});
+                ++frame.next_child_to_visit;
+                continue;
+            }
+
+            /// Not a match and there is no matched child.
+            if (frame.node->type == ActionsDAG::ActionType::INPUT)
+            {
+                // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Cannot find match for {}", frame.node->result_name);
+                return {};
+            }
+
+            /// Not a match, but all children matched.
+            visited.insert(frame.node);
+            stack.pop();
+        }
+    }
+
+    // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Folding actions by projection");
+
+    auto proj_dag = query.dag->foldActionsByProjection(new_inputs, query_key_nodes);
+    appendAggregateFunctions(*proj_dag, aggregates, *matched_aggregates);
+    return proj_dag;
+}
+
+
+/// Aggregate projection analysis result in case it can be applied.
+struct AggregateProjectionCandidate : public ProjectionCandidate
+{
+    AggregateProjectionInfo info;
+
+    /// Actions which need to be applied to columns from projection
+    /// in order to get all the columns required for aggregation.
+    ActionsDAGPtr dag;
+};
+
+struct MinMaxProjectionCandidate
+{
+    AggregateProjectionCandidate candidate;
+    Block block;
+    MergeTreeData::DataPartsVector normal_parts;
+};
+
+struct AggregateProjectionCandidates
+{
+    std::vector<AggregateProjectionCandidate> real;
+    std::optional<MinMaxProjectionCandidate> minmax_projection;
+
+    /// This flag means that DAG for projection candidate should be used in FilterStep.
+    bool has_filter = false;
+};
+
+AggregateProjectionCandidates getAggregateProjectionCandidates(
+    QueryPlan::Node & node,
+    AggregatingStep & aggregating,
+    ReadFromMergeTree & reading,
+    const std::shared_ptr<PartitionIdToMaxBlock> & max_added_blocks)
+{
+    const auto & keys = aggregating.getParams().keys;
+    const auto & aggregates = aggregating.getParams().aggregates;
+    Block key_virtual_columns = reading.getMergeTreeData().getSampleBlockWithVirtualColumns();
+
+    AggregateProjectionCandidates candidates;
+
+    const auto & parts = reading.getParts();
+    const auto & query_info = reading.getQueryInfo();
+
+    const auto metadata = reading.getStorageMetadata();
+    ContextPtr context = reading.getContext();
+
+    const auto & projections = metadata->projections;
+    std::vector<const ProjectionDescription *> agg_projections;
+    for (const auto & projection : projections)
+        if (projection.type == ProjectionDescription::Type::Aggregate)
+            agg_projections.push_back(&projection);
+
+    bool can_use_minmax_projection = metadata->minmax_count_projection && !reading.getMergeTreeData().has_lightweight_delete_parts.load();
+
+    if (!can_use_minmax_projection && agg_projections.empty())
+        return candidates;
+
+    // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Has agg projection");
+
+    QueryDAG dag;
+    if (!dag.build(*node.children.front()))
+        return candidates;
+
+    auto query_index = buildDAGIndex(*dag.dag);
+
+    // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Query DAG: {}", dag.dag->dumpDAG());
+
+    candidates.has_filter = dag.filter_node;
+
+    if (can_use_minmax_projection)
+    {
+        const auto * projection = &*(metadata->minmax_count_projection);
+        // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Try projection {}", projection->name);
+        auto info = getAggregatingProjectionInfo(*projection, context, metadata, key_virtual_columns);
+        // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Projection DAG {}", info.before_aggregation->dumpDAG());
+        if (auto proj_dag = analyzeAggregateProjection(info, dag, query_index, keys, aggregates))
+        {
+            // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Projection analyzed DAG {}", proj_dag->dumpDAG());
+            AggregateProjectionCandidate candidate{.info = std::move(info), .dag = std::move(proj_dag)};
+            MergeTreeData::DataPartsVector minmax_projection_normal_parts;
+
+            // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Projection sample block {}", sample_block.dumpStructure());
+            auto block = reading.getMergeTreeData().getMinMaxCountProjectionBlock(
+                metadata,
+                candidate.dag->getRequiredColumnsNames(),
+                dag.filter_node != nullptr,
+                query_info,
+                parts,
+                minmax_projection_normal_parts,
+                max_added_blocks.get(),
+                context);
+
+            // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Projection sample block 2 {}", block.dumpStructure());
+
+            if (block)
+            {
+                MinMaxProjectionCandidate minmax;
+                minmax.candidate = std::move(candidate);
+                minmax.block = std::move(block);
+                minmax.normal_parts = std::move(minmax_projection_normal_parts);
+                minmax.candidate.projection = projection;
+                candidates.minmax_projection.emplace(std::move(minmax));
+            }
+        }
+    }
+
+    if (!candidates.minmax_projection)
+    {
+        candidates.real.reserve(agg_projections.size());
+        for (const auto * projection : agg_projections)
+        {
+            // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Try projection {}", projection->name);
+            auto info = getAggregatingProjectionInfo(*projection, context, metadata, key_virtual_columns);
+            // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Projection DAG {}", info.before_aggregation->dumpDAG());
+            if (auto proj_dag = analyzeAggregateProjection(info, dag, query_index, keys, aggregates))
+            {
+                // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Projection analyzed DAG {}", proj_dag->dumpDAG());
+                AggregateProjectionCandidate candidate{.info = std::move(info), .dag = std::move(proj_dag)};
+                candidate.projection = projection;
+                candidates.real.emplace_back(std::move(candidate));
+            }
+        }
+    }
+
+    return candidates;
+}
+
+static QueryPlan::Node * findReadingStep(QueryPlan::Node & node)
+{
+    IQueryPlanStep * step = node.step.get();
+    if (auto * reading = typeid_cast<ReadFromMergeTree *>(step))
+        return &node;
+
+    if (node.children.size() != 1)
+        return nullptr;
+
+    if (typeid_cast<ExpressionStep *>(step) || typeid_cast<FilterStep *>(step))
+        return findReadingStep(*node.children.front());
+
+    return nullptr;
+}
+
+bool optimizeUseAggregateProjections(QueryPlan::Node & node, QueryPlan::Nodes & nodes)
+{
+    if (node.children.size() != 1)
+        return false;
+
+    auto * aggregating = typeid_cast<AggregatingStep *>(node.step.get());
+    if (!aggregating)
+        return false;
+
+    if (!aggregating->canUseProjection())
+        return false;
+
+    QueryPlan::Node * reading_node = findReadingStep(*node.children.front());
+    if (!reading_node)
+        return false;
+
+    auto * reading = typeid_cast<ReadFromMergeTree *>(reading_node->step.get());
+    if (!reading)
+        return false;
+
+    if (!canUseProjectionForReadingStep(reading))
+        return false;
+
+    std::shared_ptr<PartitionIdToMaxBlock> max_added_blocks = getMaxAddedBlocks(reading);
+
+    auto candidates = getAggregateProjectionCandidates(node, *aggregating, *reading, max_added_blocks);
+
+    AggregateProjectionCandidate * best_candidate = nullptr;
+    if (candidates.minmax_projection)
+        best_candidate = &candidates.minmax_projection->candidate;
+    else if (candidates.real.empty())
+        return false;
+
+    const auto & parts = reading->getParts();
+    const auto & query_info = reading->getQueryInfo();
+    const auto metadata = reading->getStorageMetadata();
+    ContextPtr context = reading->getContext();
+    MergeTreeDataSelectExecutor reader(reading->getMergeTreeData());
+
+    auto ordinary_reading_select_result = reading->selectRangesToRead(parts, /* alter_conversions = */ {});
+    size_t ordinary_reading_marks = ordinary_reading_select_result->marks();
+
+    /// Selecting best candidate.
+    for (auto & candidate : candidates.real)
+    {
+        auto required_column_names = candidate.dag->getRequiredColumnsNames();
+        ActionDAGNodes added_filter_nodes;
+        if (candidates.has_filter)
+            added_filter_nodes.nodes.push_back(candidate.dag->getOutputs().front());
+
+        bool analyzed = analyzeProjectionCandidate(
+            candidate, *reading, reader, required_column_names, parts,
+            metadata, query_info, context, max_added_blocks, added_filter_nodes);
+
+        if (!analyzed)
+            continue;
+
+        if (candidate.sum_marks > ordinary_reading_marks)
+            continue;
+
+        if (best_candidate == nullptr || best_candidate->sum_marks > candidate.sum_marks)
+            best_candidate = &candidate;
+    }
+
+    if (!best_candidate)
+    {
+        reading->setAnalyzedResult(std::move(ordinary_reading_select_result));
+        return false;
+    }
+
+    QueryPlanStepPtr projection_reading;
+    bool has_ordinary_parts;
+
+    /// Add reading from projection step.
+    if (candidates.minmax_projection)
+    {
+        // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Minmax proj block {}",
+        //           candidates.minmax_projection->block.dumpStructure());
+
+        Pipe pipe(std::make_shared<SourceFromSingleChunk>(std::move(candidates.minmax_projection->block)));
+        projection_reading = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
+
+        has_ordinary_parts = !candidates.minmax_projection->normal_parts.empty();
+        if (has_ordinary_parts)
+            reading->resetParts(std::move(candidates.minmax_projection->normal_parts));
+    }
+    else
+    {
+        auto storage_snapshot = reading->getStorageSnapshot();
+        auto proj_snapshot = std::make_shared<StorageSnapshot>(
+            storage_snapshot->storage, storage_snapshot->metadata, storage_snapshot->object_columns);
+        proj_snapshot->addProjection(best_candidate->projection);
+
+        auto query_info_copy = query_info;
+        query_info_copy.prewhere_info = nullptr;
+
+        projection_reading = reader.readFromParts(
+            /* parts = */ {},
+            /* alter_conversions = */ {},
+            best_candidate->dag->getRequiredColumnsNames(),
+            proj_snapshot,
+            query_info_copy,
+            context,
+            reading->getMaxBlockSize(),
+            reading->getNumStreams(),
+            max_added_blocks,
+            best_candidate->merge_tree_projection_select_result_ptr,
+            reading->isParallelReadingEnabled());
+
+        if (!projection_reading)
+        {
+            auto header = proj_snapshot->getSampleBlockForColumns(best_candidate->dag->getRequiredColumnsNames());
+            Pipe pipe(std::make_shared<NullSource>(std::move(header)));
+            projection_reading = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
+        }
+
+        has_ordinary_parts = best_candidate->merge_tree_ordinary_select_result_ptr != nullptr;
+        if (has_ordinary_parts)
+            reading->setAnalyzedResult(std::move(best_candidate->merge_tree_ordinary_select_result_ptr));
+    }
+
+    // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Projection reading header {}",
+    //           projection_reading->getOutputStream().header.dumpStructure());
+
+    projection_reading->setStepDescription(best_candidate->projection->name);
+
+    auto & projection_reading_node = nodes.emplace_back(QueryPlan::Node{.step = std::move(projection_reading)});
+    auto & expr_or_filter_node = nodes.emplace_back();
+
+    if (candidates.has_filter)
+    {
+        expr_or_filter_node.step = std::make_unique<FilterStep>(
+            projection_reading_node.step->getOutputStream(),
+            best_candidate->dag,
+            best_candidate->dag->getOutputs().front()->result_name,
+            true);
+    }
+    else
+        expr_or_filter_node.step = std::make_unique<ExpressionStep>(
+            projection_reading_node.step->getOutputStream(),
+            best_candidate->dag);
+
+    expr_or_filter_node.children.push_back(&projection_reading_node);
+
+    if (!has_ordinary_parts)
+    {
+        /// All parts are taken from projection
+        aggregating->requestOnlyMergeForAggregateProjection(expr_or_filter_node.step->getOutputStream());
+        node.children.front() = &expr_or_filter_node;
+    }
+    else
+    {
+        node.step = aggregating->convertToAggregatingProjection(expr_or_filter_node.step->getOutputStream());
+        node.children.push_back(&expr_or_filter_node);
+    }
+
+    return true;
+}
+
+}
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp b/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
new file mode 100644
index 00000000000..dd7a5d449bc
--- /dev/null
+++ b/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
@@ -0,0 +1,253 @@
+#include <Processors/QueryPlan/Optimizations/Optimizations.h>
+#include <Processors/QueryPlan/Optimizations/projectionsCommon.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
+#include <Processors/QueryPlan/UnionStep.h>
+#include <Processors/QueryPlan/ReadFromPreparedSource.h>
+#include <Processors/Sources/NullSource.h>
+#include <Common/logger_useful.h>
+#include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+#include <stack>
+
+namespace DB::QueryPlanOptimizations
+{
+
+/// Normal projection analysis result in case it can be applied.
+/// For now, it is empty.
+/// Normal projection can be used only if it contains all required source columns.
+/// It would not be hard to support pre-computed expressions and filtration.
+struct NormalProjectionCandidate : public ProjectionCandidate
+{
+};
+
+static ActionsDAGPtr makeMaterializingDAG(const Block & proj_header, const Block main_header)
+{
+    /// Materialize constants in case we don't have it in output header.
+    /// This may happen e.g. if we have PREWHERE.
+
+    size_t num_columns = main_header.columns();
+    /// This is a error; will have block structure mismatch later.
+    if (proj_header.columns() != num_columns)
+        return nullptr;
+
+    std::vector<size_t> const_positions;
+    for (size_t i = 0; i < num_columns; ++i)
+    {
+        auto col_proj = proj_header.getByPosition(i).column;
+        auto col_main = main_header.getByPosition(i).column;
+        bool is_proj_const = col_proj && isColumnConst(*col_proj);
+        bool is_main_proj = col_main && isColumnConst(*col_main);
+        if (is_proj_const && !is_main_proj)
+            const_positions.push_back(i);
+    }
+
+    if (const_positions.empty())
+        return nullptr;
+
+    ActionsDAGPtr dag = std::make_unique<ActionsDAG>();
+    auto & outputs = dag->getOutputs();
+    for (const auto & col : proj_header.getColumnsWithTypeAndName())
+        outputs.push_back(&dag->addInput(col));
+
+    for (auto pos : const_positions)
+    {
+        auto & output = outputs[pos];
+        output = &dag->materializeNode(*output);
+    }
+
+    return dag;
+}
+
+static bool hasAllRequiredColumns(const ProjectionDescription * projection, const Names & required_columns)
+{
+    for (const auto & col : required_columns)
+    {
+        if (!projection->sample_block.has(col))
+            return false;
+    }
+
+    return true;
+}
+
+
+bool optimizeUseNormalProjections(Stack & stack, QueryPlan::Nodes & nodes)
+{
+    const auto & frame = stack.back();
+
+    auto * reading = typeid_cast<ReadFromMergeTree *>(frame.node->step.get());
+    if (!reading)
+        return false;
+
+    if (!canUseProjectionForReadingStep(reading))
+        return false;
+
+    auto iter = stack.rbegin();
+    while (std::next(iter) != stack.rend())
+    {
+        iter = std::next(iter);
+
+        if (!typeid_cast<FilterStep *>(iter->node->step.get()) &&
+            !typeid_cast<ExpressionStep *>(iter->node->step.get()))
+            break;
+    }
+
+    const auto metadata = reading->getStorageMetadata();
+    const auto & projections = metadata->projections;
+
+    std::vector<const ProjectionDescription *> normal_projections;
+    for (const auto & projection : projections)
+        if (projection.type == ProjectionDescription::Type::Normal)
+            normal_projections.push_back(&projection);
+
+    if (normal_projections.empty())
+        return false;
+
+    QueryDAG query;
+    {
+        auto & clild = iter->node->children[iter->next_child - 1];
+        if (!query.build(*clild))
+            return false;
+
+        if (query.dag)
+            query.dag->removeUnusedActions();
+    }
+
+    std::list<NormalProjectionCandidate> candidates;
+    NormalProjectionCandidate * best_candidate = nullptr;
+
+    const Names & required_columns = reading->getRealColumnNames();
+    const auto & parts = reading->getParts();
+    const auto & query_info = reading->getQueryInfo();
+    ContextPtr context = reading->getContext();
+    MergeTreeDataSelectExecutor reader(reading->getMergeTreeData());
+
+    auto ordinary_reading_select_result = reading->selectRangesToRead(parts, /* alter_conversions = */ {});
+    size_t ordinary_reading_marks = ordinary_reading_select_result->marks();
+
+    std::shared_ptr<PartitionIdToMaxBlock> max_added_blocks = getMaxAddedBlocks(reading);
+
+    for (const auto * projection : normal_projections)
+    {
+        if (!hasAllRequiredColumns(projection, required_columns))
+            continue;
+
+        auto & candidate = candidates.emplace_back();
+        candidate.projection = projection;
+
+        ActionDAGNodes added_filter_nodes;
+        if (query.filter_node)
+            added_filter_nodes.nodes.push_back(query.filter_node);
+
+        bool analyzed = analyzeProjectionCandidate(
+            candidate, *reading, reader, required_columns, parts,
+            metadata, query_info, context, max_added_blocks, added_filter_nodes);
+
+        if (!analyzed)
+            continue;
+
+        if (candidate.sum_marks >= ordinary_reading_marks)
+            continue;
+
+        if (best_candidate == nullptr || candidate.sum_marks < best_candidate->sum_marks)
+            best_candidate = &candidate;
+    }
+
+    if (!best_candidate)
+    {
+        reading->setAnalyzedResult(std::move(ordinary_reading_select_result));
+        return false;
+    }
+
+    auto storage_snapshot = reading->getStorageSnapshot();
+    auto proj_snapshot = std::make_shared<StorageSnapshot>(
+        storage_snapshot->storage, storage_snapshot->metadata, storage_snapshot->object_columns); //, storage_snapshot->data);
+    proj_snapshot->addProjection(best_candidate->projection);
+
+    auto query_info_copy = query_info;
+    query_info_copy.prewhere_info = nullptr;
+
+    auto projection_reading = reader.readFromParts(
+        /*parts=*/ {},
+        /*alter_conversions=*/ {},
+        required_columns,
+        proj_snapshot,
+        query_info_copy,
+        context,
+        reading->getMaxBlockSize(),
+        reading->getNumStreams(),
+        max_added_blocks,
+        best_candidate->merge_tree_projection_select_result_ptr,
+        reading->isParallelReadingEnabled());
+
+    if (!projection_reading)
+    {
+        Pipe pipe(std::make_shared<NullSource>(proj_snapshot->getSampleBlockForColumns(required_columns)));
+        projection_reading = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
+    }
+
+    bool has_ordinary_parts = best_candidate->merge_tree_ordinary_select_result_ptr != nullptr;
+    if (has_ordinary_parts)
+        reading->setAnalyzedResult(std::move(best_candidate->merge_tree_ordinary_select_result_ptr));
+
+    projection_reading->setStepDescription(best_candidate->projection->name);
+
+    auto & projection_reading_node = nodes.emplace_back(QueryPlan::Node{.step = std::move(projection_reading)});
+    auto * next_node = &projection_reading_node;
+
+    if (query.dag)
+    {
+        auto & expr_or_filter_node = nodes.emplace_back();
+
+        if (query.filter_node)
+        {
+            expr_or_filter_node.step = std::make_unique<FilterStep>(
+                projection_reading_node.step->getOutputStream(),
+                query.dag,
+                query.filter_node->result_name,
+                true);
+        }
+        else
+            expr_or_filter_node.step = std::make_unique<ExpressionStep>(
+                projection_reading_node.step->getOutputStream(),
+                query.dag);
+
+        expr_or_filter_node.children.push_back(&projection_reading_node);
+        next_node = &expr_or_filter_node;
+    }
+
+    if (!has_ordinary_parts)
+    {
+        /// All parts are taken from projection
+        iter->node->children[iter->next_child - 1] = next_node;
+    }
+    else
+    {
+        const auto & main_stream = iter->node->children.front()->step->getOutputStream();
+        const auto * proj_stream = &next_node->step->getOutputStream();
+
+        if (auto materializing = makeMaterializingDAG(proj_stream->header, main_stream.header))
+        {
+            auto converting = std::make_unique<ExpressionStep>(*proj_stream, materializing);
+            proj_stream = &converting->getOutputStream();
+            auto & expr_node = nodes.emplace_back();
+            expr_node.step = std::move(converting);
+            expr_node.children.push_back(next_node);
+            next_node = &expr_node;
+        }
+
+        auto & union_node = nodes.emplace_back();
+        DataStreams input_streams = {main_stream, *proj_stream};
+        union_node.step = std::make_unique<UnionStep>(std::move(input_streams));
+        union_node.children = {iter->node->children.front(), next_node};
+        iter->node->children[iter->next_child - 1] = &union_node;
+    }
+
+    /// Here we remove last steps from stack to be able to optimize again.
+    /// In theory, read-in-order can be applied to projection.
+    stack.resize(iter.base() - stack.begin());
+
+    return true;
+}
+
+}
diff --git a/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp b/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
new file mode 100644
index 00000000000..2f73e14b2a0
--- /dev/null
+++ b/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
@@ -0,0 +1,267 @@
+#include <Processors/QueryPlan/Optimizations/projectionsCommon.h>
+
+#include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
+
+#include <Common/logger_useful.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Functions/IFunctionAdaptors.h>
+#include <Functions/FunctionsLogical.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
+}
+
+namespace QueryPlanOptimizations
+{
+
+bool canUseProjectionForReadingStep(ReadFromMergeTree * reading)
+{
+    /// Probably some projection already was applied.
+    if (reading->hasAnalyzedResult())
+        return false;
+
+    if (reading->isQueryWithFinal())
+        return false;
+
+    if (reading->isQueryWithSampling())
+        return false;
+
+    if (reading->isParallelReadingEnabled())
+        return false;
+
+    // Currently projection don't support deduplication when moving parts between shards.
+    if (reading->getContext()->getSettingsRef().allow_experimental_query_deduplication)
+        return false;
+
+    // Currently projection don't support settings which implicitly modify aggregate functions.
+    if (reading->getContext()->getSettingsRef().aggregate_functions_null_for_empty)
+        return false;
+
+    return true;
+}
+
+std::shared_ptr<PartitionIdToMaxBlock> getMaxAddedBlocks(ReadFromMergeTree * reading)
+{
+    ContextPtr context = reading->getContext();
+
+    if (context->getSettingsRef().select_sequential_consistency)
+    {
+        if (const auto * replicated = dynamic_cast<const StorageReplicatedMergeTree *>(&reading->getMergeTreeData()))
+            return std::make_shared<PartitionIdToMaxBlock>(replicated->getMaxAddedBlocks());
+    }
+
+    return {};
+}
+
+void QueryDAG::appendExpression(const ActionsDAGPtr & expression)
+{
+    if (dag)
+        dag->mergeInplace(std::move(*expression->clone()));
+    else
+        dag = expression->clone();
+}
+
+const ActionsDAG::Node * findInOutputs(ActionsDAG & dag, const std::string & name, bool remove)
+{
+    auto & outputs = dag.getOutputs();
+    for (auto it = outputs.begin(); it != outputs.end(); ++it)
+    {
+        if ((*it)->result_name == name)
+        {
+            const auto * node = *it;
+
+            /// We allow to use Null as a filter.
+            /// In this case, result is empty. Ignore optimizations.
+            if (node->result_type->onlyNull())
+                return nullptr;
+
+            if (!isUInt8(removeNullable(removeLowCardinality(node->result_type))))
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER,
+                    "Illegal type {} of column {} for filter. Must be UInt8 or Nullable(UInt8).",
+                    node->result_type->getName(), name);
+
+            if (remove)
+            {
+                outputs.erase(it);
+            }
+            else
+            {
+                ColumnWithTypeAndName col;
+                col.name = node->result_name;
+                col.type = node->result_type;
+                col.column = col.type->createColumnConst(1, 1);
+                *it = &dag.addColumn(std::move(col));
+            }
+
+            return node;
+        }
+    }
+
+    return nullptr;
+}
+
+bool QueryDAG::buildImpl(QueryPlan::Node & node, ActionsDAG::NodeRawConstPtrs & filter_nodes)
+{
+    IQueryPlanStep * step = node.step.get();
+    if (auto * reading = typeid_cast<ReadFromMergeTree *>(step))
+    {
+        if (const auto & prewhere_info = reading->getPrewhereInfo())
+        {
+            if (prewhere_info->row_level_filter)
+            {
+                appendExpression(prewhere_info->row_level_filter);
+                if (const auto * filter_expression = findInOutputs(*dag, prewhere_info->row_level_column_name, false))
+                    filter_nodes.push_back(filter_expression);
+                else
+                    return false;
+            }
+
+            if (prewhere_info->prewhere_actions)
+            {
+                appendExpression(prewhere_info->prewhere_actions);
+                if (const auto * filter_expression = findInOutputs(*dag, prewhere_info->prewhere_column_name, prewhere_info->remove_prewhere_column))
+                    filter_nodes.push_back(filter_expression);
+                else
+                    return false;
+            }
+        }
+        return true;
+    }
+
+    if (node.children.size() != 1)
+        return false;
+
+    if (!buildImpl(*node.children.front(), filter_nodes))
+        return false;
+
+    if (auto * expression = typeid_cast<ExpressionStep *>(step))
+    {
+        const auto & actions = expression->getExpression();
+        if (actions->hasArrayJoin())
+            return false;
+
+        appendExpression(actions);
+        return true;
+    }
+
+    if (auto * filter = typeid_cast<FilterStep *>(step))
+    {
+        const auto & actions = filter->getExpression();
+        if (actions->hasArrayJoin())
+            return false;
+
+        appendExpression(actions);
+        const auto * filter_expression = findInOutputs(*dag, filter->getFilterColumnName(), filter->removesFilterColumn());
+        if (!filter_expression)
+            return false;
+
+        filter_nodes.push_back(filter_expression);
+        return true;
+    }
+
+    return false;
+}
+
+bool QueryDAG::build(QueryPlan::Node & node)
+{
+    ActionsDAG::NodeRawConstPtrs filter_nodes;
+    if (!buildImpl(node, filter_nodes))
+        return false;
+
+    if (!filter_nodes.empty())
+    {
+        filter_node = filter_nodes.back();
+
+        if (filter_nodes.size() > 1)
+        {
+            /// Add a conjunction of all the filters.
+
+            FunctionOverloadResolverPtr func_builder_and =
+                std::make_unique<FunctionToOverloadResolverAdaptor>(
+                    std::make_shared<FunctionAnd>());
+
+            filter_node = &dag->addFunction(func_builder_and, std::move(filter_nodes), {});
+        }
+        else
+            filter_node = &dag->addAlias(*filter_node, "_projection_filter");
+
+        auto & outputs = dag->getOutputs();
+        outputs.insert(outputs.begin(), filter_node);
+    }
+
+    return true;
+}
+
+bool analyzeProjectionCandidate(
+    ProjectionCandidate & candidate,
+    const ReadFromMergeTree & reading,
+    const MergeTreeDataSelectExecutor & reader,
+    const Names & required_column_names,
+    const MergeTreeData::DataPartsVector & parts,
+    const StorageMetadataPtr & metadata,
+    const SelectQueryInfo & query_info,
+    const ContextPtr & context,
+    const std::shared_ptr<PartitionIdToMaxBlock> & max_added_blocks,
+    const ActionDAGNodes & added_filter_nodes)
+{
+    MergeTreeData::DataPartsVector projection_parts;
+    MergeTreeData::DataPartsVector normal_parts;
+    for (const auto & part : parts)
+    {
+        const auto & created_projections = part->getProjectionParts();
+        auto it = created_projections.find(candidate.projection->name);
+        if (it != created_projections.end())
+            projection_parts.push_back(it->second);
+        else
+            normal_parts.push_back(part);
+    }
+
+    if (projection_parts.empty())
+        return false;
+
+    auto projection_result_ptr = reader.estimateNumMarksToRead(
+        std::move(projection_parts),
+        nullptr,
+        required_column_names,
+        metadata,
+        candidate.projection->metadata,
+        query_info, /// How it is actually used? I hope that for index we need only added_filter_nodes
+        added_filter_nodes,
+        context,
+        context->getSettingsRef().max_threads,
+        max_added_blocks);
+
+    if (projection_result_ptr->error())
+        return false;
+
+    candidate.merge_tree_projection_select_result_ptr = std::move(projection_result_ptr);
+    candidate.sum_marks += candidate.merge_tree_projection_select_result_ptr->marks();
+
+    if (!normal_parts.empty())
+    {
+        auto normal_result_ptr = reading.selectRangesToRead(std::move(normal_parts), /* alter_conversions = */ {});
+
+        if (normal_result_ptr->error())
+            return false;
+
+        if (normal_result_ptr->marks() != 0)
+        {
+            candidate.sum_marks += normal_result_ptr->marks();
+            candidate.merge_tree_ordinary_select_result_ptr = std::move(normal_result_ptr);
+        }
+    }
+
+    return true;
+}
+
+}
+}
diff --git a/src/Processors/QueryPlan/Optimizations/projectionsCommon.h b/src/Processors/QueryPlan/Optimizations/projectionsCommon.h
new file mode 100644
index 00000000000..1e9ab67c8fe
--- /dev/null
+++ b/src/Processors/QueryPlan/Optimizations/projectionsCommon.h
@@ -0,0 +1,82 @@
+#pragma once
+#include <Interpreters/ActionsDAG.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+
+namespace DB
+{
+
+class ReadFromMergeTree;
+
+using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
+
+struct ProjectionDescription;
+
+class MergeTreeDataSelectExecutor;
+
+struct MergeTreeDataSelectAnalysisResult;
+using MergeTreeDataSelectAnalysisResultPtr = std::shared_ptr<MergeTreeDataSelectAnalysisResult>;
+
+class IMergeTreeDataPart;
+using DataPartPtr = std::shared_ptr<const IMergeTreeDataPart>;
+using DataPartsVector = std::vector<DataPartPtr>;
+
+struct StorageInMemoryMetadata;
+using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
+
+struct SelectQueryInfo;
+
+}
+
+namespace DB::QueryPlanOptimizations
+{
+
+/// Common checks that projection can be used for this step.
+bool canUseProjectionForReadingStep(ReadFromMergeTree * reading);
+
+/// Max blocks for sequential consistency reading from replicated table.
+std::shared_ptr<PartitionIdToMaxBlock> getMaxAddedBlocks(ReadFromMergeTree * reading);
+
+/// This is a common DAG which is a merge of DAGs from Filter and Expression steps chain.
+/// Additionally, for all the Filter steps, we collect filter conditions into filter_nodes.
+/// Flag remove_last_filter_node is set in case if the last step is a Filter step and it should remove filter column.
+struct QueryDAG
+{
+    ActionsDAGPtr dag;
+    const ActionsDAG::Node * filter_node = nullptr;
+
+    bool build(QueryPlan::Node & node);
+
+private:
+    bool buildImpl(QueryPlan::Node & node, ActionsDAG::NodeRawConstPtrs & filter_nodes);
+    void appendExpression(const ActionsDAGPtr & expression);
+};
+
+struct ProjectionCandidate
+{
+    const ProjectionDescription * projection;
+
+    /// The number of marks we are going to read
+    size_t sum_marks = 0;
+
+    /// Analysis result, separate for parts with and without projection.
+    /// Analysis is done in order to estimate the number of marks we are going to read.
+    /// For chosen projection, it is reused for reading step.
+    MergeTreeDataSelectAnalysisResultPtr merge_tree_projection_select_result_ptr;
+    MergeTreeDataSelectAnalysisResultPtr merge_tree_ordinary_select_result_ptr;
+};
+
+/// This function fills ProjectionCandidate structure for specified projection.
+/// It returns false if for some reason we cannot read from projection.
+bool analyzeProjectionCandidate(
+    ProjectionCandidate & candidate,
+    const ReadFromMergeTree & reading,
+    const MergeTreeDataSelectExecutor & reader,
+    const Names & required_column_names,
+    const DataPartsVector & parts,
+    const StorageMetadataPtr & metadata,
+    const SelectQueryInfo & query_info,
+    const ContextPtr & context,
+    const std::shared_ptr<PartitionIdToMaxBlock> & max_added_blocks,
+    const ActionDAGNodes & added_filter_nodes);
+
+}
diff --git a/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp b/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp
index 02725dc3122..a6029d673e3 100644
--- a/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp
+++ b/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp
@@ -11,6 +11,7 @@
 #include <Processors/QueryPlan/JoinStep.h>
 #include <Processors/QueryPlan/LimitByStep.h>
 #include <Processors/QueryPlan/LimitStep.h>
+#include <Processors/QueryPlan/MergingAggregatedStep.h>
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
 #include <Processors/QueryPlan/RollupStep.h>
 #include <Processors/QueryPlan/SortingStep.h>
@@ -63,61 +64,36 @@ namespace
         return non_const_columns;
     }
 
-    const ActionsDAG::Node * getOriginalNodeForOutputAlias(const ActionsDAGPtr & actions, const String & output_name)
-    {
-        /// find alias in output
-        const ActionsDAG::Node * output_alias = nullptr;
-        for (const auto * node : actions->getOutputs())
-        {
-            if (node->result_name == output_name)
-            {
-                output_alias = node;
-                break;
-            }
-        }
-        if (!output_alias)
-        {
-            logDebug("getOriginalNodeForOutputAlias: no output alias found", output_name);
-            return nullptr;
-        }
-
-        /// find original(non alias) node it refers to
-        const ActionsDAG::Node * node = output_alias;
-        while (node && node->type == ActionsDAG::ActionType::ALIAS)
-        {
-            chassert(!node->children.empty());
-            node = node->children.front();
-        }
-        if (node && node->type != ActionsDAG::ActionType::INPUT)
-            return nullptr;
-
-        return node;
-    }
-
     bool compareAggregationKeysWithDistinctColumns(
         const Names & aggregation_keys, const DistinctColumns & distinct_columns, const ActionsDAGPtr & path_actions)
     {
         logDebug("aggregation_keys", aggregation_keys);
         logDebug("aggregation_keys size", aggregation_keys.size());
         logDebug("distinct_columns size", distinct_columns.size());
-        if (aggregation_keys.size() != distinct_columns.size())
-            return false;
 
-        /// compare columns of two DISTINCTs
+        std::set<std::string_view> original_distinct_columns;
+        FindOriginalNodeForOutputName original_node_finder(path_actions);
         for (const auto & column : distinct_columns)
         {
             logDebug("distinct column name", column);
-            const auto * alias_node = getOriginalNodeForOutputAlias(path_actions, String(column));
+            const auto * alias_node = original_node_finder.find(String(column));
             if (!alias_node)
             {
-                logDebug("original name for alias is not found for", column);
-                return false;
+                logDebug("original name for alias is not found", column);
+                original_distinct_columns.insert(column);
             }
-
-            logDebug("alias result name", alias_node->result_name);
-            if (std::find(cbegin(aggregation_keys), cend(aggregation_keys), alias_node->result_name) == aggregation_keys.cend())
+            else
             {
-                logDebug("alias result name is not found in aggregation keys", alias_node->result_name);
+                logDebug("alias result name", alias_node->result_name);
+                original_distinct_columns.insert(alias_node->result_name);
+            }
+        }
+        /// if aggregation keys are part of distinct columns then rows already distinct
+        for (const auto & key : aggregation_keys)
+        {
+            if (!original_distinct_columns.contains(key))
+            {
+                logDebug("aggregation key NOT found: {}", key);
                 return false;
             }
         }
@@ -176,7 +152,7 @@ namespace
         while (!node->children.empty())
         {
             const IQueryPlanStep * current_step = node->step.get();
-            if (typeid_cast<const AggregatingStep *>(current_step))
+            if (typeid_cast<const AggregatingStep *>(current_step) || typeid_cast<const MergingAggregatedStep *>(current_step))
             {
                 aggregation_before_distinct = current_step;
                 break;
@@ -208,6 +184,9 @@ namespace
 
             if (const auto * aggregating_step = typeid_cast<const AggregatingStep *>(aggregation_before_distinct); aggregating_step)
                 return compareAggregationKeysWithDistinctColumns(aggregating_step->getParams().keys, distinct_columns, actions);
+            else if (const auto * merging_aggregated_step = typeid_cast<const MergingAggregatedStep *>(aggregation_before_distinct);
+                     merging_aggregated_step)
+                return compareAggregationKeysWithDistinctColumns(merging_aggregated_step->getParams().keys, distinct_columns, actions);
         }
 
         return false;
@@ -264,9 +243,10 @@ namespace
             logActionsDAG("distinct pass: merged DAG", path_actions);
 
             /// compare columns of two DISTINCTs
+            FindOriginalNodeForOutputName original_node_finder(path_actions);
             for (const auto & column : distinct_columns)
             {
-                const auto * alias_node = getOriginalNodeForOutputAlias(path_actions, String(column));
+                const auto * alias_node = original_node_finder.find(String(column));
                 if (!alias_node)
                     return false;
 
diff --git a/src/Processors/QueryPlan/Optimizations/removeRedundantSorting.cpp b/src/Processors/QueryPlan/Optimizations/removeRedundantSorting.cpp
index 41e30dee83e..9d66806e380 100644
--- a/src/Processors/QueryPlan/Optimizations/removeRedundantSorting.cpp
+++ b/src/Processors/QueryPlan/Optimizations/removeRedundantSorting.cpp
@@ -3,11 +3,13 @@
 #include <Processors/QueryPlan/AggregatingStep.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/FillingStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <Processors/QueryPlan/JoinStep.h>
 #include <Processors/QueryPlan/LimitByStep.h>
 #include <Processors/QueryPlan/LimitStep.h>
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
+#include <Processors/QueryPlan/QueryPlanVisitor.h>
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
 #include <Processors/QueryPlan/ReadFromRemote.h>
 #include <Processors/QueryPlan/SortingStep.h>
@@ -18,108 +20,6 @@
 
 namespace DB::QueryPlanOptimizations
 {
-template <typename Derived, bool debug_logging = false>
-class QueryPlanVisitor
-{
-protected:
-    struct FrameWithParent
-    {
-        QueryPlan::Node * node = nullptr;
-        QueryPlan::Node * parent_node = nullptr;
-        size_t next_child = 0;
-    };
-
-    using StackWithParent = std::vector<FrameWithParent>;
-
-    QueryPlan::Node * root = nullptr;
-    StackWithParent stack;
-
-public:
-    explicit QueryPlanVisitor(QueryPlan::Node * root_) : root(root_) { }
-
-    void visit()
-    {
-        stack.push_back({.node = root});
-
-        while (!stack.empty())
-        {
-            auto & frame = stack.back();
-
-            QueryPlan::Node * current_node = frame.node;
-            QueryPlan::Node * parent_node = frame.parent_node;
-
-            logStep("back", current_node);
-
-            /// top-down visit
-            if (0 == frame.next_child)
-            {
-                logStep("top-down", current_node);
-                if (!visitTopDown(current_node, parent_node))
-                    continue;
-            }
-            /// Traverse all children
-            if (frame.next_child < frame.node->children.size())
-            {
-                auto next_frame = FrameWithParent{.node = current_node->children[frame.next_child], .parent_node = current_node};
-                ++frame.next_child;
-                logStep("push", next_frame.node);
-                stack.push_back(next_frame);
-                continue;
-            }
-
-            /// bottom-up visit
-            logStep("bottom-up", current_node);
-            visitBottomUp(current_node, parent_node);
-
-            logStep("pop", current_node);
-            stack.pop_back();
-        }
-    }
-
-    bool visitTopDown(QueryPlan::Node * current_node, QueryPlan::Node * parent_node)
-    {
-        return getDerived().visitTopDownImpl(current_node, parent_node);
-    }
-    void visitBottomUp(QueryPlan::Node * current_node, QueryPlan::Node * parent_node)
-    {
-        getDerived().visitBottomUpImpl(current_node, parent_node);
-    }
-
-private:
-    Derived & getDerived() { return *static_cast<Derived *>(this); }
-
-    const Derived & getDerived() const { return *static_cast<Derived *>(this); }
-
-    std::unordered_map<const IQueryPlanStep*, std::string> address2name;
-    std::unordered_map<std::string, UInt32> name_gen;
-
-    std::string getStepId(const IQueryPlanStep* step)
-    {
-        const auto step_name = step->getName();
-        auto it = address2name.find(step);
-        if (it != address2name.end())
-            return it->second;
-
-        const auto seq_num = name_gen[step_name]++;
-        return address2name.insert({step, fmt::format("{}{}", step_name, seq_num)}).first->second;
-    }
-
-protected:
-    void logStep(const char * prefix, const QueryPlan::Node * node)
-    {
-        if constexpr (debug_logging)
-        {
-            const IQueryPlanStep * current_step = node->step.get();
-            LOG_DEBUG(
-                &Poco::Logger::get("QueryPlanVisitor"),
-                "{}: {}: {}",
-                prefix,
-                getStepId(current_step),
-                reinterpret_cast<const void *>(current_step));
-        }
-    }
-};
-
 constexpr bool debug_logging_enabled = false;
 
 class RemoveRedundantSorting : public QueryPlanVisitor<RemoveRedundantSorting, debug_logging_enabled>
diff --git a/src/Processors/QueryPlan/Optimizations/useDataParallelAggregation.cpp b/src/Processors/QueryPlan/Optimizations/useDataParallelAggregation.cpp
index 13a749bd0b6..dc801d10514 100644
--- a/src/Processors/QueryPlan/Optimizations/useDataParallelAggregation.cpp
+++ b/src/Processors/QueryPlan/Optimizations/useDataParallelAggregation.cpp
@@ -153,6 +153,10 @@ bool isPartitionKeySuitsGroupByKey(
 
     if (group_by_actions->hasArrayJoin() || group_by_actions->hasStatefulFunctions() || group_by_actions->hasNonDeterministic())
         return false;
+
+    /// We are interested only in calculations required to obtain group by keys (and not aggregate function arguments for example).
+    group_by_actions->removeUnusedActions(aggregating.getParams().keys);
+
     const auto & gb_key_required_columns = group_by_actions->getRequiredColumnsNames();
 
     const auto & partition_actions = reading.getStorageMetadata()->getPartitionKey().expression->getActionsDAG();
@@ -202,7 +206,7 @@ size_t tryAggregatePartitionsIndependently(QueryPlan::Node * node, QueryPlan::No
         return 0;
 
     if (!reading->willOutputEachPartitionThroughSeparatePort()
-        && isPartitionKeySuitsGroupByKey(*reading, expression_step->getExpression(), *aggregating_step))
+        && isPartitionKeySuitsGroupByKey(*reading, expression_step->getExpression()->clone(), *aggregating_step))
     {
         if (reading->requestOutputEachPartitionThroughSeparatePort())
             aggregating_step->skipMerging();
diff --git a/src/Processors/QueryPlan/PartsSplitter.cpp b/src/Processors/QueryPlan/PartsSplitter.cpp
index 917bea4c884..936182f8c00 100644
--- a/src/Processors/QueryPlan/PartsSplitter.cpp
+++ b/src/Processors/QueryPlan/PartsSplitter.cpp
@@ -94,7 +94,8 @@ std::pair<std::vector<Values>, std::vector<RangesInDataParts>> split(RangesInDat
             parts_ranges_queue.push(
                 {index_access->getValue(part_idx, range.begin), {range, part_idx}, PartsRangesIterator::EventType::RangeStart});
             const auto & index_granularity = parts[part_idx].data_part->index_granularity;
-            if (index_granularity.hasFinalMark() && range.end + 1 == index_granularity.getMarksCount())
+            const bool value_is_defined_at_end_mark = range.end < index_granularity.getMarksCount();
+            if (value_is_defined_at_end_mark)
                 parts_ranges_queue.push(
                     {index_access->getValue(part_idx, range.end), {range, part_idx}, PartsRangesIterator::EventType::RangeEnd});
         }
@@ -141,8 +142,10 @@ std::pair<std::vector<Values>, std::vector<RangesInDataParts>> split(RangesInDat
                 {
                     result_layers.back().emplace_back(
                         parts[part_idx].data_part,
+                        parts[part_idx].alter_conversions,
                         parts[part_idx].part_index_in_query,
                         MarkRanges{{current_part_range_begin[part_idx], current.range.end}});
+
                     current_part_range_begin.erase(part_idx);
                     current_part_range_end.erase(part_idx);
                     continue;
@@ -169,8 +172,10 @@ std::pair<std::vector<Values>, std::vector<RangesInDataParts>> split(RangesInDat
         {
             result_layers.back().emplace_back(
                 parts[part_idx].data_part,
+                parts[part_idx].alter_conversions,
                 parts[part_idx].part_index_in_query,
                 MarkRanges{{current_part_range_begin[part_idx], last_mark + 1}});
+
             current_part_range_begin[part_idx] = current_part_range_end[part_idx];
         }
     }
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 8b666bba7da..3fbe3d89845 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -14,6 +14,8 @@
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
+#include <Processors/QueryPlan/ITransformingStep.h>
+#include <Processors/QueryPlan/QueryPlanVisitor.h>
 
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
@@ -199,13 +201,6 @@ QueryPipelineBuilderPtr QueryPlan::buildQueryPipeline(
     last_pipeline->setProcessListElement(build_pipeline_settings.process_list_element);
     last_pipeline->addResources(std::move(resources));
 
-    /// This is related to parallel replicas.
-    /// Not to let the remote sources starve for CPU we create an
-    /// explicit dependency between processors which read from local replica
-    /// and ones that receive data from remote replicas and constantly answer
-    /// to coordination packets.
-    last_pipeline->connectDependencies();
-
     return last_pipeline;
 }
 
@@ -452,6 +447,31 @@ void QueryPlan::explainPipeline(WriteBuffer & buffer, const ExplainPipelineOptio
     }
 }
 
+static void updateDataStreams(QueryPlan::Node & root)
+{
+    class UpdateDataStreams : public QueryPlanVisitor<UpdateDataStreams, false>
+    {
+    public:
+        explicit UpdateDataStreams(QueryPlan::Node * root_) : QueryPlanVisitor<UpdateDataStreams, false>(root_) { }
+
+        static bool visitTopDownImpl(QueryPlan::Node * /*current_node*/, QueryPlan::Node * /*parent_node*/) { return true; }
+
+        static void visitBottomUpImpl(QueryPlan::Node * current_node, QueryPlan::Node * parent_node)
+        {
+            if (!parent_node || parent_node->children.size() != 1)
+                return;
+
+            if (!current_node->step->hasOutputStream())
+                return;
+
+            if (auto * parent_transform_step = dynamic_cast<ITransformingStep *>(parent_node->step.get()); parent_transform_step)
+                parent_transform_step->updateInputStream(current_node->step->getOutputStream());
+        }
+    };
+
+    UpdateDataStreams(&root).visit();
+}
+
 void QueryPlan::optimize(const QueryPlanOptimizationSettings & optimization_settings)
 {
     /// optimization need to be applied before "mergeExpressions" optimization
@@ -462,6 +482,8 @@ void QueryPlan::optimize(const QueryPlanOptimizationSettings & optimization_sett
 
     QueryPlanOptimizations::optimizeTreeFirstPass(optimization_settings, *root, nodes);
     QueryPlanOptimizations::optimizeTreeSecondPass(optimization_settings, *root, nodes);
+
+    updateDataStreams(*root);
 }
 
 void QueryPlan::explainEstimate(MutableColumns & columns)
diff --git a/src/Processors/QueryPlan/QueryPlanVisitor.h b/src/Processors/QueryPlan/QueryPlanVisitor.h
new file mode 100644
index 00000000000..0f265216649
--- /dev/null
+++ b/src/Processors/QueryPlan/QueryPlanVisitor.h
@@ -0,0 +1,111 @@
+#pragma once
+
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/IQueryPlanStep.h>
+#include <Poco/Logger.h>
+
+namespace DB
+{
+template <typename Derived, bool debug_logging = false>
+class QueryPlanVisitor
+{
+protected:
+    struct FrameWithParent
+    {
+        QueryPlan::Node * node = nullptr;
+        QueryPlan::Node * parent_node = nullptr;
+        size_t next_child = 0;
+    };
+
+    using StackWithParent = std::vector<FrameWithParent>;
+
+    QueryPlan::Node * root = nullptr;
+    StackWithParent stack;
+
+public:
+    explicit QueryPlanVisitor(QueryPlan::Node * root_) : root(root_) { }
+
+    void visit()
+    {
+        stack.push_back({.node = root});
+
+        while (!stack.empty())
+        {
+            auto & frame = stack.back();
+
+            QueryPlan::Node * current_node = frame.node;
+            QueryPlan::Node * parent_node = frame.parent_node;
+
+            logStep("back", current_node);
+
+            /// top-down visit
+            if (0 == frame.next_child)
+            {
+                logStep("top-down", current_node);
+                if (!visitTopDown(current_node, parent_node))
+                    continue;
+            }
+            /// Traverse all children
+            if (frame.next_child < frame.node->children.size())
+            {
+                auto next_frame = FrameWithParent{.node = current_node->children[frame.next_child], .parent_node = current_node};
+                ++frame.next_child;
+                logStep("push", next_frame.node);
+                stack.push_back(next_frame);
+                continue;
+            }
+
+            /// bottom-up visit
+            logStep("bottom-up", current_node);
+            visitBottomUp(current_node, parent_node);
+
+            logStep("pop", current_node);
+            stack.pop_back();
+        }
+    }
+
+    bool visitTopDown(QueryPlan::Node * current_node, QueryPlan::Node * parent_node)
+    {
+        return getDerived().visitTopDownImpl(current_node, parent_node);
+    }
+    void visitBottomUp(QueryPlan::Node * current_node, QueryPlan::Node * parent_node)
+    {
+        getDerived().visitBottomUpImpl(current_node, parent_node);
+    }
+
+private:
+    Derived & getDerived() { return *static_cast<Derived *>(this); }
+
+    const Derived & getDerived() const { return *static_cast<Derived *>(this); }
+
+    std::unordered_map<const IQueryPlanStep*, std::string> address2name;
+    std::unordered_map<std::string, UInt32> name_gen;
+
+    std::string getStepId(const IQueryPlanStep* step)
+    {
+        const auto step_name = step->getName();
+        auto it = address2name.find(step);
+        if (it != address2name.end())
+            return it->second;
+
+        const auto seq_num = name_gen[step_name]++;
+        return address2name.insert({step, fmt::format("{}{}", step_name, seq_num)}).first->second;
+    }
+
+protected:
+    void logStep(const char * prefix, const QueryPlan::Node * node)
+    {
+        if constexpr (debug_logging)
+        {
+            const IQueryPlanStep * current_step = node->step.get();
+            LOG_DEBUG(
+                &Poco::Logger::get("QueryPlanVisitor"),
+                "{}: {}: {}",
+                prefix,
+                getStepId(current_step),
+                reinterpret_cast<const void *>(current_step));
+        }
+    }
+};
+
+}
diff --git a/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp b/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp
new file mode 100644
index 00000000000..2080c31d253
--- /dev/null
+++ b/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp
@@ -0,0 +1,167 @@
+#include "ReadFromMemoryStorageStep.h"
+
+#include <atomic>
+#include <functional>
+#include <memory>
+
+#include <Interpreters/getColumnFromBlock.h>
+#include <Interpreters/inplaceBlockConversions.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Storages/StorageSnapshot.h>
+#include <Storages/StorageMemory.h>
+
+#include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/ISource.h>
+#include <Processors/Sources/NullSource.h>
+
+namespace DB
+{
+
+class MemorySource : public ISource
+{
+    using InitializerFunc = std::function<void(std::shared_ptr<const Blocks> &)>;
+public:
+
+    MemorySource(
+        Names column_names_,
+        const StorageSnapshotPtr & storage_snapshot,
+        std::shared_ptr<const Blocks> data_,
+        std::shared_ptr<std::atomic<size_t>> parallel_execution_index_,
+        InitializerFunc initializer_func_ = {})
+        : ISource(storage_snapshot->getSampleBlockForColumns(column_names_))
+        , column_names_and_types(storage_snapshot->getColumnsByNames(
+              GetColumnsOptions(GetColumnsOptions::All).withSubcolumns().withExtendedObjects(), column_names_))
+        , data(data_)
+        , parallel_execution_index(parallel_execution_index_)
+        , initializer_func(std::move(initializer_func_))
+    {
+    }
+
+    String getName() const override { return "Memory"; }
+
+protected:
+    Chunk generate() override
+    {
+        if (initializer_func)
+        {
+            initializer_func(data);
+            initializer_func = {};
+        }
+
+        size_t current_index = getAndIncrementExecutionIndex();
+
+        if (!data || current_index >= data->size())
+        {
+            return {};
+        }
+
+        const Block & src = (*data)[current_index];
+
+        Columns columns;
+        size_t num_columns = column_names_and_types.size();
+        columns.reserve(num_columns);
+
+        auto name_and_type = column_names_and_types.begin();
+        for (size_t i = 0; i < num_columns; ++i)
+        {
+            columns.emplace_back(tryGetColumnFromBlock(src, *name_and_type));
+            ++name_and_type;
+        }
+
+        fillMissingColumns(columns, src.rows(), column_names_and_types, column_names_and_types, {}, nullptr);
+        assert(std::all_of(columns.begin(), columns.end(), [](const auto & column) { return column != nullptr; }));
+
+        return Chunk(std::move(columns), src.rows());
+    }
+
+private:
+    size_t getAndIncrementExecutionIndex()
+    {
+        if (parallel_execution_index)
+        {
+            return (*parallel_execution_index)++;
+        }
+        else
+        {
+            return execution_index++;
+        }
+    }
+
+    const NamesAndTypesList column_names_and_types;
+    size_t execution_index = 0;
+    std::shared_ptr<const Blocks> data;
+    std::shared_ptr<std::atomic<size_t>> parallel_execution_index;
+    InitializerFunc initializer_func;
+};
+
+ReadFromMemoryStorageStep::ReadFromMemoryStorageStep(const Names & columns_to_read_,
+                                                     const StorageSnapshotPtr & storage_snapshot_,
+                                                     const size_t num_streams_,
+                                                     const bool delay_read_for_global_sub_queries_) :
+    SourceStepWithFilter(DataStream{.header=storage_snapshot_->getSampleBlockForColumns(columns_to_read_)}),
+    columns_to_read(columns_to_read_),
+    storage_snapshot(storage_snapshot_),
+    num_streams(num_streams_),
+    delay_read_for_global_sub_queries(delay_read_for_global_sub_queries_)
+{
+}
+
+void ReadFromMemoryStorageStep::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    auto pipe = makePipe();
+
+    if (pipe.empty())
+    {
+        assert(output_stream != std::nullopt);
+        pipe = Pipe(std::make_shared<NullSource>(output_stream->header));
+    }
+
+    pipeline.init(std::move(pipe));
+}
+
+Pipe ReadFromMemoryStorageStep::makePipe()
+{
+    storage_snapshot->check(columns_to_read);
+
+    const auto & snapshot_data = assert_cast<const StorageMemory::SnapshotData &>(*storage_snapshot->data);
+    auto current_data = snapshot_data.blocks;
+
+    if (delay_read_for_global_sub_queries)
+    {
+        /// Note: for global subquery we use single source.
+        /// Mainly, the reason is that at this point table is empty,
+        /// and we don't know the number of blocks are going to be inserted into it.
+        ///
+        /// It may seem to be not optimal, but actually data from such table is used to fill
+        /// set for IN or hash table for JOIN, which can't be done concurrently.
+        /// Since no other manipulation with data is done, multiple sources shouldn't give any profit.
+
+        return Pipe(std::make_shared<MemorySource>(
+            columns_to_read,
+            storage_snapshot,
+            nullptr /* data */,
+            nullptr /* parallel execution index */,
+            [current_data](std::shared_ptr<const Blocks> & data_to_initialize)
+            {
+                data_to_initialize = current_data;
+            }));
+    }
+
+    size_t size = current_data->size();
+
+    if (num_streams > size)
+        num_streams = size;
+
+    Pipes pipes;
+
+    auto parallel_execution_index = std::make_shared<std::atomic<size_t>>(0);
+
+    for (size_t stream = 0; stream < num_streams; ++stream)
+    {
+        pipes.emplace_back(std::make_shared<MemorySource>(columns_to_read, storage_snapshot, current_data, parallel_execution_index));
+    }
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+}
diff --git a/src/Processors/QueryPlan/ReadFromMemoryStorageStep.h b/src/Processors/QueryPlan/ReadFromMemoryStorageStep.h
new file mode 100644
index 00000000000..cec523ed58b
--- /dev/null
+++ b/src/Processors/QueryPlan/ReadFromMemoryStorageStep.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include <memory>
+
+#include <Interpreters/TreeRewriter.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
+#include <QueryPipeline/Pipe.h>
+#include <Storages/SelectQueryInfo.h>
+
+namespace DB
+{
+
+class QueryPipelineBuilder;
+
+class ReadFromMemoryStorageStep final : public SourceStepWithFilter
+{
+public:
+    ReadFromMemoryStorageStep(const Names & columns_to_read_,
+                              const StorageSnapshotPtr & storage_snapshot_,
+                              size_t num_streams_,
+                              bool delay_read_for_global_sub_queries_);
+
+    ReadFromMemoryStorageStep() = delete;
+    ReadFromMemoryStorageStep(const ReadFromMemoryStorageStep &) = delete;
+    ReadFromMemoryStorageStep & operator=(const ReadFromMemoryStorageStep &) = delete;
+
+    ReadFromMemoryStorageStep(ReadFromMemoryStorageStep &&) = default;
+    ReadFromMemoryStorageStep & operator=(ReadFromMemoryStorageStep &&) = default;
+
+    String getName() const override { return name; }
+
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
+
+private:
+    static constexpr auto name = "ReadFromMemoryStorage";
+
+    Names columns_to_read;
+    StorageSnapshotPtr storage_snapshot;
+    size_t num_streams;
+    bool delay_read_for_global_sub_queries;
+
+    Pipe makePipe();
+};
+
+}
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index 2e19f21a69d..2415507a6eb 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -3,6 +3,7 @@
 #include <IO/Operators.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
@@ -19,7 +20,6 @@
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/FilterTransform.h>
-#include <Processors/Transforms/ReadFromMergeTreeDependencyTransform.h>
 #include <Processors/Transforms/ReverseTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
@@ -99,6 +99,7 @@ namespace ErrorCodes
 {
     extern const int INDEX_NOT_USED;
     extern const int LOGICAL_ERROR;
+    extern const int TOO_MANY_ROWS;
 }
 
 static MergeTreeReaderSettings getMergeTreeReaderSettings(
@@ -133,8 +134,44 @@ static bool checkAllPartsOnRemoteFS(const RangesInDataParts & parts)
     return true;
 }
 
+void ReadFromMergeTree::AnalysisResult::checkLimits(const Settings & settings, const SelectQueryInfo & query_info_) const
+{
+
+    /// Do not check number of read rows if we have reading
+    /// in order of sorting key with limit.
+    /// In general case, when there exists WHERE clause
+    /// it's impossible to estimate number of rows precisely,
+    /// because we can stop reading at any time.
+
+    SizeLimits limits;
+    if (settings.read_overflow_mode == OverflowMode::THROW
+        && settings.max_rows_to_read
+        && !query_info_.input_order_info)
+        limits = SizeLimits(settings.max_rows_to_read, 0, settings.read_overflow_mode);
+
+    SizeLimits leaf_limits;
+    if (settings.read_overflow_mode_leaf == OverflowMode::THROW
+        && settings.max_rows_to_read_leaf
+        && !query_info_.input_order_info)
+        leaf_limits = SizeLimits(settings.max_rows_to_read_leaf, 0, settings.read_overflow_mode_leaf);
+
+    if (limits.max_rows || leaf_limits.max_rows)
+    {
+        /// Fail fast if estimated number of rows to read exceeds the limit
+        size_t total_rows_estimate = selected_rows;
+        if (query_info_.limit > 0 && total_rows_estimate > query_info_.limit)
+        {
+            total_rows_estimate = query_info_.limit;
+        }
+        limits.check(total_rows_estimate, 0, "rows (controlled by 'max_rows_to_read' setting)", ErrorCodes::TOO_MANY_ROWS);
+        leaf_limits.check(
+            total_rows_estimate, 0, "rows (controlled by 'max_rows_to_read_leaf' setting)", ErrorCodes::TOO_MANY_ROWS);
+    }
+}
+
 ReadFromMergeTree::ReadFromMergeTree(
     MergeTreeData::DataPartsVector parts_,
+    std::vector<AlterConversionsPtr> alter_conversions_,
     Names real_column_names_,
     Names virt_column_names_,
     const MergeTreeData & data_,
@@ -148,13 +185,14 @@ ReadFromMergeTree::ReadFromMergeTree(
     Poco::Logger * log_,
     MergeTreeDataSelectAnalysisResultPtr analyzed_result_ptr_,
     bool enable_parallel_reading)
-    : ISourceStep(DataStream{.header = IMergeTreeSelectAlgorithm::transformHeader(
+    : SourceStepWithFilter(DataStream{.header = IMergeTreeSelectAlgorithm::transformHeader(
         storage_snapshot_->getSampleBlockForColumns(real_column_names_),
         getPrewhereInfoFromQueryInfo(query_info_),
         data_.getPartitionValueType(),
         virt_column_names_)})
     , reader_settings(getMergeTreeReaderSettings(context_, query_info_))
     , prepared_parts(std::move(parts_))
+    , alter_conversions_for_parts(std::move(alter_conversions_))
     , real_column_names(std::move(real_column_names_))
     , virt_column_names(std::move(virt_column_names_))
     , data(data_)
@@ -254,14 +292,12 @@ Pipe ReadFromMergeTree::readFromPoolParallelReplicas(
         .callback = read_task_callback.value(),
         .count_participating_replicas = client_info.count_participating_replicas,
         .number_of_current_replica = client_info.number_of_current_replica,
-        .colums_to_read = required_columns
+        .columns_to_read = required_columns
     };
 
     /// We have a special logic for local replica. It has to read less data, because in some cases it should
     /// merge states of aggregate functions or do some other important stuff other than reading from Disk.
-    auto is_local_replica = context->getClientInfo().interface == ClientInfo::Interface::LOCAL;
-    if (!is_local_replica)
-        min_marks_for_concurrent_read = static_cast<size_t>(min_marks_for_concurrent_read * context->getSettingsRef().parallel_replicas_single_task_marks_count_multiplier);
+    min_marks_for_concurrent_read = static_cast<size_t>(min_marks_for_concurrent_read * context->getSettingsRef().parallel_replicas_single_task_marks_count_multiplier);
 
     auto pool = std::make_shared<MergeTreeReadPoolParallelReplicas>(
         storage_snapshot,
@@ -273,8 +309,7 @@ Pipe ReadFromMergeTree::readFromPoolParallelReplicas(
         reader_settings,
         required_columns,
         virt_column_names,
-        min_marks_for_concurrent_read
-    );
+        min_marks_for_concurrent_read);
 
     Pipes pipes;
     const auto & settings = context->getSettingsRef();
@@ -298,16 +333,6 @@ Pipe ReadFromMergeTree::readFromPoolParallelReplicas(
             source->addTotalRowsApprox(total_rows);
 
         pipes.emplace_back(std::move(source));
-
-        /// Add a special dependency transform which will be connected later with
-        /// all RemoteSources through a simple scheduler (ResizeProcessor)
-        if (context->getClientInfo().interface == ClientInfo::Interface::LOCAL)
-        {
-            pipes.back().addSimpleTransform([&](const Block & header) -> ProcessorPtr
-            {
-                return std::make_shared<ReadFromMergeTreeDependencyTransform>(header, context->getParallelReplicasGroupUUID());
-            });
-        }
     }
 
     return Pipe::unitePipes(std::move(pipes));
@@ -340,57 +365,55 @@ Pipe ReadFromMergeTree::readFromPool(
             / max_block_size * max_block_size / fixed_index_granularity;
     }
 
-     bool all_parts_are_remote = true;
-     bool all_parts_are_local = true;
-     for (const auto & part : parts_with_range)
-     {
-         const bool is_remote = part.data_part->isStoredOnRemoteDisk();
-         all_parts_are_local &= !is_remote;
-         all_parts_are_remote &= is_remote;
-     }
+    bool all_parts_are_remote = true;
+    bool all_parts_are_local = true;
+    for (const auto & part : parts_with_range)
+    {
+        const bool is_remote = part.data_part->isStoredOnRemoteDisk();
+        all_parts_are_local &= !is_remote;
+        all_parts_are_remote &= is_remote;
+    }
 
-     MergeTreeReadPoolPtr pool;
+    MergeTreeReadPoolPtr pool;
 
-     if ((all_parts_are_remote
-          && settings.allow_prefetched_read_pool_for_remote_filesystem
-          && MergeTreePrefetchedReadPool::checkReadMethodAllowed(reader_settings.read_settings.remote_fs_method))
-         || (all_parts_are_local
-             && settings.allow_prefetched_read_pool_for_local_filesystem
-             && MergeTreePrefetchedReadPool::checkReadMethodAllowed(reader_settings.read_settings.local_fs_method)))
-     {
-         pool = std::make_shared<MergeTreePrefetchedReadPool>(
-             max_streams,
-             sum_marks,
-             min_marks_for_concurrent_read,
-             std::move(parts_with_range),
-             storage_snapshot,
-             prewhere_info,
-             actions_settings,
-             required_columns,
-             virt_column_names,
-             settings.preferred_block_size_bytes,
-             reader_settings,
-             context,
-             use_uncompressed_cache,
-             all_parts_are_remote,
-             *data.getSettings());
-     }
-     else
-     {
-         pool = std::make_shared<MergeTreeReadPool>(
-             max_streams,
-             sum_marks,
-             min_marks_for_concurrent_read,
-             std::move(parts_with_range),
-             storage_snapshot,
-             prewhere_info,
-             actions_settings,
-             reader_settings,
-             required_columns,
-             virt_column_names,
-             context,
-             false);
-     }
+    if ((all_parts_are_remote && settings.allow_prefetched_read_pool_for_remote_filesystem
+         && MergeTreePrefetchedReadPool::checkReadMethodAllowed(reader_settings.read_settings.remote_fs_method))
+        || (all_parts_are_local && settings.allow_prefetched_read_pool_for_local_filesystem
+            && MergeTreePrefetchedReadPool::checkReadMethodAllowed(reader_settings.read_settings.local_fs_method)))
+    {
+        pool = std::make_shared<MergeTreePrefetchedReadPool>(
+            max_streams,
+            sum_marks,
+            min_marks_for_concurrent_read,
+            std::move(parts_with_range),
+            storage_snapshot,
+            prewhere_info,
+            actions_settings,
+            required_columns,
+            virt_column_names,
+            settings.preferred_block_size_bytes,
+            reader_settings,
+            context,
+            use_uncompressed_cache,
+            all_parts_are_remote,
+            *data.getSettings());
+    }
+    else
+    {
+        pool = std::make_shared<MergeTreeReadPool>(
+            max_streams,
+            sum_marks,
+            min_marks_for_concurrent_read,
+            std::move(parts_with_range),
+            storage_snapshot,
+            prewhere_info,
+            actions_settings,
+            reader_settings,
+            required_columns,
+            virt_column_names,
+            context,
+            false);
+    }
 
     auto * logger = &Poco::Logger::get(data.getLogName() + " (SelectExecutor)");
     LOG_DEBUG(logger, "Reading approx. {} rows with {} streams", total_rows, max_streams);
@@ -437,7 +460,7 @@ ProcessorPtr ReadFromMergeTree::createSource(
     bool set_rows_approx = !is_parallel_reading_from_replicas && !reader_settings.read_in_order;
 
     auto algorithm = std::make_unique<Algorithm>(
-            data, storage_snapshot, part.data_part, max_block_size, preferred_block_size_bytes,
+            data, storage_snapshot, part.data_part, part.alter_conversions, max_block_size, preferred_block_size_bytes,
             preferred_max_column_in_block_size_bytes, required_columns, part.ranges, use_uncompressed_cache, prewhere_info,
             actions_settings, reader_settings, pool, virt_column_names, part.part_index_in_query, has_limit_below_one_block);
 
@@ -647,10 +670,10 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
 
     /// Let's split ranges to avoid reading much data.
     auto split_ranges
-        = [rows_granularity = data_settings->index_granularity, max_block_size = max_block_size](const auto & ranges, int direction)
+        = [rows_granularity = data_settings->index_granularity, my_max_block_size = max_block_size](const auto & ranges, int direction)
     {
         MarkRanges new_ranges;
-        const size_t max_marks_in_range = (max_block_size + rows_granularity - 1) / rows_granularity;
+        const size_t max_marks_in_range = (my_max_block_size + rows_granularity - 1) / rows_granularity;
         size_t marks_in_range = 1;
 
         if (direction == 1)
@@ -712,15 +735,11 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
             .callback = read_task_callback.value(),
             .count_participating_replicas = client_info.count_participating_replicas,
             .number_of_current_replica = client_info.number_of_current_replica,
-            .colums_to_read = column_names
+            .columns_to_read = column_names
         };
 
-        /// We have a special logic for local replica. It has to read less data, because in some cases it should
-        /// merge states of aggregate functions or do some other important stuff other than reading from Disk.
-        auto is_local_replica = context->getClientInfo().interface == ClientInfo::Interface::LOCAL;
         auto min_marks_for_concurrent_read = info.min_marks_for_concurrent_read;
-        if (!is_local_replica)
-            min_marks_for_concurrent_read = static_cast<size_t>(min_marks_for_concurrent_read * settings.parallel_replicas_single_task_marks_count_multiplier);
+        min_marks_for_concurrent_read = static_cast<size_t>(min_marks_for_concurrent_read * settings.parallel_replicas_single_task_marks_count_multiplier);
 
         pool = std::make_shared<MergeTreeInOrderReadPoolParallelReplicas>(
             parts_with_ranges,
@@ -790,7 +809,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
             }
 
             ranges_to_get_from_part = split_ranges(ranges_to_get_from_part, input_order_info->direction);
-            new_parts.emplace_back(part.data_part, part.part_index_in_query, std::move(ranges_to_get_from_part));
+            new_parts.emplace_back(part.data_part, part.alter_conversions, part.part_index_in_query, std::move(ranges_to_get_from_part));
         }
 
         splitted_parts_and_ranges.emplace_back(std::move(new_parts));
@@ -834,7 +853,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
             if (pipe.numOutputPorts() > 1)
             {
                 auto transform = std::make_shared<MergingSortedTransform>(
-                    pipe.getHeader(), pipe.numOutputPorts(), sort_description, max_block_size, SortingQueueStrategy::Batch);
+                    pipe.getHeader(), pipe.numOutputPorts(), sort_description, max_block_size, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch);
 
                 pipe.addTransform(std::move(transform));
             }
@@ -880,31 +899,31 @@ static void addMergingFinal(
         {
             case MergeTreeData::MergingParams::Ordinary:
                 return std::make_shared<MergingSortedTransform>(header, num_outputs,
-                            sort_description, max_block_size, SortingQueueStrategy::Batch);
+                            sort_description, max_block_size, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch);
 
             case MergeTreeData::MergingParams::Collapsing:
                 return std::make_shared<CollapsingSortedTransform>(header, num_outputs,
-                            sort_description, merging_params.sign_column, true, max_block_size);
+                            sort_description, merging_params.sign_column, true, max_block_size, /*max_block_size_bytes=*/0);
 
             case MergeTreeData::MergingParams::Summing:
                 return std::make_shared<SummingSortedTransform>(header, num_outputs,
-                            sort_description, merging_params.columns_to_sum, partition_key_columns, max_block_size);
+                            sort_description, merging_params.columns_to_sum, partition_key_columns, max_block_size, /*max_block_size_bytes=*/0);
 
             case MergeTreeData::MergingParams::Aggregating:
                 return std::make_shared<AggregatingSortedTransform>(header, num_outputs,
-                            sort_description, max_block_size);
+                            sort_description, max_block_size, /*max_block_size_bytes=*/0);
 
             case MergeTreeData::MergingParams::Replacing:
                 return std::make_shared<ReplacingSortedTransform>(header, num_outputs,
-                            sort_description, merging_params.is_deleted_column, merging_params.version_column, max_block_size, /*out_row_sources_buf_*/ nullptr, /*use_average_block_sizes*/ false, /*cleanup*/ !merging_params.is_deleted_column.empty());
+                            sort_description, merging_params.is_deleted_column, merging_params.version_column, max_block_size, /*max_block_size_bytes=*/0, /*out_row_sources_buf_*/ nullptr, /*use_average_block_sizes*/ false, /*cleanup*/ !merging_params.is_deleted_column.empty());
 
             case MergeTreeData::MergingParams::VersionedCollapsing:
                 return std::make_shared<VersionedCollapsingTransform>(header, num_outputs,
-                            sort_description, merging_params.sign_column, max_block_size);
+                            sort_description, merging_params.sign_column, max_block_size, /*max_block_size_bytes=*/0);
 
             case MergeTreeData::MergingParams::Graphite:
                 return std::make_shared<GraphiteRollupSortedTransform>(header, num_outputs,
-                            sort_description, max_block_size, merging_params.graphite_params, now);
+                            sort_description, max_block_size, /*max_block_size_bytes=*/0, merging_params.graphite_params, now);
         }
 
         UNREACHABLE();
@@ -982,7 +1001,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
             {
                 for (auto part_it = parts_to_merge_ranges[range_index]; part_it != parts_to_merge_ranges[range_index + 1]; ++part_it)
                 {
-                    new_parts.emplace_back(part_it->data_part, part_it->part_index_in_query, part_it->ranges);
+                    new_parts.emplace_back(part_it->data_part, part_it->alter_conversions, part_it->part_index_in_query, part_it->ranges);
                 }
             }
 
@@ -1093,12 +1112,15 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
     return Pipe::unitePipes(std::move(partition_pipes));
 }
 
-MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(MergeTreeData::DataPartsVector parts) const
+MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
+    MergeTreeData::DataPartsVector parts,
+    std::vector<AlterConversionsPtr> alter_conversions) const
 {
     return selectRangesToRead(
         std::move(parts),
+        std::move(alter_conversions),
         prewhere_info,
-        added_filter_nodes,
+        filter_nodes,
         storage_snapshot->metadata,
         storage_snapshot->getMetadataForQuery(),
         query_info,
@@ -1113,6 +1135,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(Merge
 
 MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     MergeTreeData::DataPartsVector parts,
+    std::vector<AlterConversionsPtr> alter_conversions,
     const PrewhereInfoPtr & prewhere_info,
     const ActionDAGNodes & added_filter_nodes,
     const StorageMetadataPtr & metadata_snapshot_base,
@@ -1164,7 +1187,8 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
         updated_query_info_with_filter_dag.filter_actions_dag = ActionsDAG::buildFilterActionsDAG(nodes, node_name_to_input_node_column, context);
 
         return selectRangesToReadImpl(
-            parts,
+            std::move(parts),
+            std::move(alter_conversions),
             metadata_snapshot_base,
             metadata_snapshot,
             updated_query_info_with_filter_dag,
@@ -1178,7 +1202,8 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     }
 
     return selectRangesToReadImpl(
-        parts,
+        std::move(parts),
+        std::move(alter_conversions),
         metadata_snapshot_base,
         metadata_snapshot,
         query_info,
@@ -1193,6 +1218,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
 
 MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToReadImpl(
     MergeTreeData::DataPartsVector parts,
+    std::vector<AlterConversionsPtr> alter_conversions,
     const StorageMetadataPtr & metadata_snapshot_base,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
@@ -1266,6 +1292,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToReadImpl(
     {
         MergeTreeDataSelectExecutor::filterPartsByPartition(
             parts,
+            alter_conversions,
             part_values,
             metadata_snapshot_base,
             data,
@@ -1296,13 +1323,14 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToReadImpl(
         auto reader_settings = getMergeTreeReaderSettings(context, query_info);
 
         bool use_skip_indexes = settings.use_skip_indexes;
-        bool final = isFinal(query_info);
+        bool final = InterpreterSelectQuery::isQueryWithFinal(query_info);
 
         if (final && !settings.use_skip_indexes_if_final)
             use_skip_indexes = false;
 
         result.parts_with_ranges = MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipIndexes(
             std::move(parts),
+            std::move(alter_conversions),
             metadata_snapshot,
             query_info,
             context,
@@ -1359,7 +1387,7 @@ bool ReadFromMergeTree::requestReadingInOrder(size_t prefix_size, int direction,
 
     /// Disable read-in-order optimization for reverse order with final.
     /// Otherwise, it can lead to incorrect final behavior because the implementation may rely on the reading in direct order).
-    if (direction != 1 && isFinal(query_info))
+    if (direction != 1 && isQueryWithFinal())
         return false;
 
     auto order_info = std::make_shared<InputOrderInfo>(SortDescription{}, prefix_size, direction, limit);
@@ -1399,6 +1427,17 @@ bool ReadFromMergeTree::requestReadingInOrder(size_t prefix_size, int direction,
     return true;
 }
 
+void ReadFromMergeTree::updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info_value)
+{
+    query_info.prewhere_info = prewhere_info_value;
+    prewhere_info = prewhere_info_value;
+    output_stream = DataStream{.header = IMergeTreeSelectAlgorithm::transformHeader(
+        storage_snapshot->getSampleBlockForColumns(real_column_names),
+        prewhere_info_value,
+        data.getPartitionValueType(),
+        virt_column_names)};
+}
+
 bool ReadFromMergeTree::requestOutputEachPartitionThroughSeparatePort()
 {
     if (isQueryWithFinal())
@@ -1462,26 +1501,34 @@ bool ReadFromMergeTree::requestOutputEachPartitionThroughSeparatePort()
 
 ReadFromMergeTree::AnalysisResult ReadFromMergeTree::getAnalysisResult() const
 {
-    auto result_ptr = analyzed_result_ptr ? analyzed_result_ptr : selectRangesToRead(prepared_parts);
+    auto result_ptr = analyzed_result_ptr ? analyzed_result_ptr : selectRangesToRead(prepared_parts, alter_conversions_for_parts);
     if (std::holds_alternative<std::exception_ptr>(result_ptr->result))
         std::rethrow_exception(std::get<std::exception_ptr>(result_ptr->result));
 
-    return std::get<ReadFromMergeTree::AnalysisResult>(result_ptr->result);
+    return std::get<AnalysisResult>(result_ptr->result);
 }
 
 bool ReadFromMergeTree::isQueryWithFinal() const
 {
+    return InterpreterSelectQuery::isQueryWithFinal(query_info);
+}
+
+bool ReadFromMergeTree::isQueryWithSampling() const
+{
+    if (context->getSettingsRef().parallel_replicas_count > 1 && data.supportsSampling())
+        return true;
+
     const auto & select = query_info.query->as<ASTSelectQuery &>();
     if (query_info.table_expression_modifiers)
-        return query_info.table_expression_modifiers->hasFinal();
+        return query_info.table_expression_modifiers->getSampleSizeRatio() != std::nullopt;
     else
-        return select.final();
+        return select.sampleSize() != nullptr;
 }
 
 Pipe ReadFromMergeTree::spreadMarkRanges(
     RangesInDataParts && parts_with_ranges, size_t num_streams, AnalysisResult & result, ActionsDAGPtr & result_projection)
 {
-    bool final = isQueryWithFinal();
+    const bool final = isQueryWithFinal();
     const auto & input_order_info = query_info.getInputOrderInfo();
 
     Names column_names_to_read = result.column_names_to_read;
@@ -1496,18 +1543,9 @@ Pipe ReadFromMergeTree::spreadMarkRanges(
         column_names_to_read.erase(std::unique(column_names_to_read.begin(), column_names_to_read.end()), column_names_to_read.end());
     }
 
-    /// Construct a proper coordinator
-    if (input_order_info && is_parallel_reading_from_replicas && context->getClientInfo().interface == ClientInfo::Interface::LOCAL)
-    {
-        assert(context->parallel_reading_coordinator);
-        auto mode = input_order_info->direction == 1 ? CoordinationMode::WithOrder : CoordinationMode::ReverseOrder;
-        context->parallel_reading_coordinator->setMode(mode);
-    }
-
     if (final)
     {
-        if (is_parallel_reading_from_replicas)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Final modifier is not supported with parallel replicas");
+        chassert(!is_parallel_reading_from_replicas);
 
         if (output_each_partition_through_separate_port)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Optimisation isn't supposed to be used for queries with final");
@@ -1572,6 +1610,8 @@ Pipe ReadFromMergeTree::groupStreamsByPartition(AnalysisResult & result, Actions
 void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     auto result = getAnalysisResult();
+    result.checkLimits(context->getSettingsRef(), query_info);
+
     LOG_DEBUG(
         log,
         "Selected {}/{} parts by partition key, {} parts by primary key, {}/{} marks by primary key, {} marks to read from {} ranges",
@@ -1583,6 +1623,18 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
         result.selected_marks,
         result.selected_ranges);
 
+    // Adding partition info to QueryAccessInfo.
+    if (context->hasQueryContext() && !query_info.is_internal)
+    {
+        Names partition_names;
+        for (const auto & part : result.parts_with_ranges)
+        {
+            partition_names.emplace_back(
+                fmt::format("{}.{}", data.getStorageID().getFullNameNotQuoted(), part.data_part->info.partition_id));
+        }
+        context->getQueryContext()->addQueryAccessInfo(partition_names);
+    }
+
     ProfileEvents::increment(ProfileEvents::SelectedParts, result.selected_parts);
     ProfileEvents::increment(ProfileEvents::SelectedRanges, result.selected_ranges);
     ProfileEvents::increment(ProfileEvents::SelectedMarks, result.selected_marks);
@@ -1678,7 +1730,6 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
     for (const auto & processor : pipe.getProcessors())
         processors.emplace_back(processor);
 
-
     pipeline.init(std::move(pipe));
     // Attach QueryIdHolder if needed
     if (query_id_holder)
@@ -1732,6 +1783,36 @@ void ReadFromMergeTree::describeActions(FormatSettings & format_settings) const
         format_settings.out << prefix << "Parts: " << result.index_stats.back().num_parts_after << '\n';
         format_settings.out << prefix << "Granules: " << result.index_stats.back().num_granules_after << '\n';
     }
+
+    if (prewhere_info)
+    {
+        format_settings.out << prefix << "Prewhere info" << '\n';
+        format_settings.out << prefix << "Need filter: " << prewhere_info->need_filter << '\n';
+
+        prefix.push_back(format_settings.indent_char);
+        prefix.push_back(format_settings.indent_char);
+
+        if (prewhere_info->prewhere_actions)
+        {
+            format_settings.out << prefix << "Prewhere filter" << '\n';
+            format_settings.out << prefix << "Prewhere filter column: " << prewhere_info->prewhere_column_name;
+            if (prewhere_info->remove_prewhere_column)
+               format_settings.out << " (removed)";
+            format_settings.out << '\n';
+
+            auto expression = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions);
+            expression->describeActions(format_settings.out, prefix);
+        }
+
+        if (prewhere_info->row_level_filter)
+        {
+            format_settings.out << prefix << "Row level filter" << '\n';
+            format_settings.out << prefix << "Row level filter column: " << prewhere_info->row_level_column_name << '\n';
+
+            auto expression = std::make_shared<ExpressionActions>(prewhere_info->row_level_filter);
+            expression->describeActions(format_settings.out, prefix);
+        }
+    }
 }
 
 void ReadFromMergeTree::describeActions(JSONBuilder::JSONMap & map) const
@@ -1743,6 +1824,35 @@ void ReadFromMergeTree::describeActions(JSONBuilder::JSONMap & map) const
         map.add("Parts", result.index_stats.back().num_parts_after);
         map.add("Granules", result.index_stats.back().num_granules_after);
     }
+
+    if (prewhere_info)
+    {
+        std::unique_ptr<JSONBuilder::JSONMap> prewhere_info_map = std::make_unique<JSONBuilder::JSONMap>();
+        prewhere_info_map->add("Need filter", prewhere_info->need_filter);
+
+        if (prewhere_info->prewhere_actions)
+        {
+            std::unique_ptr<JSONBuilder::JSONMap> prewhere_filter_map = std::make_unique<JSONBuilder::JSONMap>();
+            prewhere_filter_map->add("Prewhere filter column", prewhere_info->prewhere_column_name);
+            prewhere_filter_map->add("Prewhere filter remove filter column", prewhere_info->remove_prewhere_column);
+            auto expression = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions);
+            prewhere_filter_map->add("Prewhere filter expression", expression->toTree());
+
+            prewhere_info_map->add("Prewhere filter", std::move(prewhere_filter_map));
+        }
+
+        if (prewhere_info->row_level_filter)
+        {
+            std::unique_ptr<JSONBuilder::JSONMap> row_level_filter_map = std::make_unique<JSONBuilder::JSONMap>();
+            row_level_filter_map->add("Row level filter column", prewhere_info->row_level_column_name);
+            auto expression = std::make_shared<ExpressionActions>(prewhere_info->row_level_filter);
+            row_level_filter_map->add("Row level filter expression", expression->toTree());
+
+            prewhere_info_map->add("Row level filter", std::move(row_level_filter_map));
+        }
+
+        map.add("Prewhere info", std::move(prewhere_info_map));
+    }
 }
 
 void ReadFromMergeTree::describeIndexes(FormatSettings & format_settings) const
@@ -1854,15 +1964,6 @@ void ReadFromMergeTree::describeIndexes(JSONBuilder::JSONMap & map) const
     }
 }
 
-bool ReadFromMergeTree::isFinal(const SelectQueryInfo & query_info)
-{
-    if (query_info.table_expression_modifiers)
-        return query_info.table_expression_modifiers->hasFinal();
-
-    const auto & select = query_info.query->as<ASTSelectQuery &>();
-    return select.final();
-}
-
 bool MergeTreeDataSelectAnalysisResult::error() const
 {
     return std::holds_alternative<std::exception_ptr>(result);
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
index 4fd37fd6edf..45beaaaf013 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.h
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -1,10 +1,11 @@
 #pragma once
-#include <Processors/QueryPlan/ISourceStep.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
 #include <Storages/MergeTree/RequestResponse.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeReadPool.h>
+#include <Storages/MergeTree/AlterConversions.h>
 
 namespace DB
 {
@@ -29,7 +30,7 @@ using MergeTreeDataSelectAnalysisResultPtr = std::shared_ptr<MergeTreeDataSelect
 
 /// This step is created to read from MergeTree* table.
 /// For now, it takes a list of parts and creates source from it.
-class ReadFromMergeTree final : public ISourceStep
+class ReadFromMergeTree final : public SourceStepWithFilter
 {
 public:
 
@@ -91,10 +92,13 @@ public:
         UInt64 selected_marks_pk = 0;
         UInt64 total_marks_pk = 0;
         UInt64 selected_rows = 0;
+
+        void checkLimits(const Settings & settings, const SelectQueryInfo & query_info_) const;
     };
 
     ReadFromMergeTree(
         MergeTreeData::DataPartsVector parts_,
+        std::vector<AlterConversionsPtr> alter_conversions_,
         Names real_column_names_,
         Names virt_column_names_,
         const MergeTreeData & data_,
@@ -121,25 +125,18 @@ public:
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeIndexes(JSONBuilder::JSONMap & map) const override;
 
-    void addFilter(ActionsDAGPtr expression, std::string column_name)
-    {
-        added_filter_dags.push_back(expression);
-        added_filter_nodes.nodes.push_back(&expression->findInOutputs(column_name));
-    }
-
-    void addFilterNodes(const ActionDAGNodes & filter_nodes)
-    {
-        for (const auto & node : filter_nodes.nodes)
-            added_filter_nodes.nodes.push_back(node);
-    }
+    const Names & getRealColumnNames() const { return real_column_names; }
+    const Names & getVirtualColumnNames() const { return virt_column_names; }
 
     StorageID getStorageID() const { return data.getStorageID(); }
+    const StorageSnapshotPtr & getStorageSnapshot() const { return storage_snapshot; }
     UInt64 getSelectedParts() const { return selected_parts; }
     UInt64 getSelectedRows() const { return selected_rows; }
     UInt64 getSelectedMarks() const { return selected_marks; }
 
     static MergeTreeDataSelectAnalysisResultPtr selectRangesToRead(
         MergeTreeData::DataPartsVector parts,
+        std::vector<AlterConversionsPtr> alter_conversions,
         const PrewhereInfoPtr & prewhere_info,
         const ActionDAGNodes & added_filter_nodes,
         const StorageMetadataPtr & metadata_snapshot_base,
@@ -153,23 +150,46 @@ public:
         bool sample_factor_column_queried,
         Poco::Logger * log);
 
+    MergeTreeDataSelectAnalysisResultPtr selectRangesToRead(
+        MergeTreeData::DataPartsVector parts,
+        std::vector<AlterConversionsPtr> alter_conversions) const;
+
     ContextPtr getContext() const { return context; }
     const SelectQueryInfo & getQueryInfo() const { return query_info; }
     StorageMetadataPtr getStorageMetadata() const { return metadata_for_reading; }
-    const PrewhereInfo * getPrewhereInfo() const { return prewhere_info.get(); }
+    const PrewhereInfoPtr & getPrewhereInfo() const { return prewhere_info; }
 
     /// Returns `false` if requested reading cannot be performed.
     bool requestReadingInOrder(size_t prefix_size, int direction, size_t limit);
 
-    static bool isFinal(const SelectQueryInfo & query_info);
+    void updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info_value);
+
+    bool isQueryWithFinal() const;
+    bool isQueryWithSampling() const;
 
     /// Returns true if the optimisation is applicable (and applies it then).
     bool requestOutputEachPartitionThroughSeparatePort();
     bool willOutputEachPartitionThroughSeparatePort() const { return output_each_partition_through_separate_port; }
 
+    bool hasAnalyzedResult() const { return analyzed_result_ptr != nullptr; }
+    void setAnalyzedResult(MergeTreeDataSelectAnalysisResultPtr analyzed_result_ptr_) { analyzed_result_ptr = std::move(analyzed_result_ptr_); }
+
+    void resetParts(MergeTreeData::DataPartsVector parts)
+    {
+        prepared_parts = std::move(parts);
+        alter_conversions_for_parts = {};
+    }
+
+    const MergeTreeData::DataPartsVector & getParts() const { return prepared_parts; }
+    const MergeTreeData & getMergeTreeData() const { return data; }
+    size_t getMaxBlockSize() const { return max_block_size; }
+    size_t getNumStreams() const { return requested_num_streams; }
+    bool isParallelReadingEnabled() const { return read_task_callback != std::nullopt; }
+
 private:
     static MergeTreeDataSelectAnalysisResultPtr selectRangesToReadImpl(
         MergeTreeData::DataPartsVector parts,
+        std::vector<AlterConversionsPtr> alter_conversions,
         const StorageMetadataPtr & metadata_snapshot_base,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
@@ -181,8 +201,6 @@ private:
         bool sample_factor_column_queried,
         Poco::Logger * log);
 
-    bool isQueryWithFinal() const;
-
     int getSortDirection() const
     {
         const InputOrderInfoPtr & order_info = query_info.getInputOrderInfo();
@@ -195,6 +213,8 @@ private:
     MergeTreeReaderSettings reader_settings;
 
     MergeTreeData::DataPartsVector prepared_parts;
+    std::vector<AlterConversionsPtr> alter_conversions_for_parts;
+
     Names real_column_names;
     Names virt_column_names;
 
@@ -203,9 +223,6 @@ private:
     PrewhereInfoPtr prewhere_info;
     ExpressionActionsSettings actions_settings;
 
-    std::vector<ActionsDAGPtr> added_filter_dags;
-    ActionDAGNodes added_filter_nodes;
-
     StorageSnapshotPtr storage_snapshot;
     StorageMetadataPtr metadata_for_reading;
 
@@ -253,7 +270,6 @@ private:
     Pipe spreadMarkRangesAmongStreamsFinal(
         RangesInDataParts && parts, size_t num_streams, const Names & column_names, ActionsDAGPtr & out_projection);
 
-    MergeTreeDataSelectAnalysisResultPtr selectRangesToRead(MergeTreeData::DataPartsVector parts) const;
     ReadFromMergeTree::AnalysisResult getAnalysisResult() const;
     MergeTreeDataSelectAnalysisResultPtr analyzed_result_ptr;
 
diff --git a/src/Processors/QueryPlan/ReadFromRemote.cpp b/src/Processors/QueryPlan/ReadFromRemote.cpp
index 6a3670f964e..ed740e3e242 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.cpp
+++ b/src/Processors/QueryPlan/ReadFromRemote.cpp
@@ -11,7 +11,6 @@
 #include <Processors/Sources/RemoteSource.h>
 #include <Processors/Sources/DelayedSource.h>
 #include <Processors/Transforms/ExpressionTransform.h>
-#include <Processors/Transforms/ReadFromMergeTreeDependencyTransform.h>
 #include <Interpreters/ActionsDAG.h>
 #include "Common/logger_useful.h"
 #include <Common/checkStackSize.h>
@@ -138,6 +137,8 @@ void ReadFromRemote::addLazyPipe(Pipes & pipes, const ClusterProxy::SelectStream
     bool add_totals = false;
     bool add_extremes = false;
     bool async_read = context->getSettingsRef().async_socket_for_remote;
+    const bool async_query_sending = context->getSettingsRef().async_query_sending_for_remote;
+
     if (stage == QueryProcessingStage::Complete)
     {
         add_totals = shard.query->as<ASTSelectQuery &>().group_by_with_totals;
@@ -145,31 +146,31 @@ void ReadFromRemote::addLazyPipe(Pipes & pipes, const ClusterProxy::SelectStream
     }
 
     auto lazily_create_stream = [
-            shard = shard, shard_count = shard_count, query = shard.query, header = shard.header,
-            context = context, throttler = throttler,
-            main_table = main_table, table_func_ptr = table_func_ptr,
-            scalars = scalars, external_tables = external_tables,
-            stage = stage, local_delay = shard.local_delay,
-            add_agg_info, add_totals, add_extremes, async_read]() mutable
+            my_shard = shard, my_shard_count = shard_count, query = shard.query, header = shard.header,
+            my_context = context, my_throttler = throttler,
+            my_main_table = main_table, my_table_func_ptr = table_func_ptr,
+            my_scalars = scalars, my_external_tables = external_tables,
+            my_stage = stage, local_delay = shard.local_delay,
+            add_agg_info, add_totals, add_extremes, async_read, async_query_sending]() mutable
         -> QueryPipelineBuilder
     {
-        auto current_settings = context->getSettingsRef();
+        auto current_settings = my_context->getSettingsRef();
         auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(
             current_settings).getSaturated(
                 current_settings.max_execution_time);
         std::vector<ConnectionPoolWithFailover::TryResult> try_results;
         try
         {
-            if (table_func_ptr)
-                try_results = shard.shard_info.pool->getManyForTableFunction(timeouts, &current_settings, PoolMode::GET_MANY);
+            if (my_table_func_ptr)
+                try_results = my_shard.shard_info.pool->getManyForTableFunction(timeouts, &current_settings, PoolMode::GET_MANY);
             else
-                try_results = shard.shard_info.pool->getManyChecked(timeouts, &current_settings, PoolMode::GET_MANY, main_table.getQualifiedName());
+                try_results = my_shard.shard_info.pool->getManyChecked(timeouts, &current_settings, PoolMode::GET_MANY, my_main_table.getQualifiedName());
         }
         catch (const Exception & ex)
         {
             if (ex.code() == ErrorCodes::ALL_CONNECTION_TRIES_FAILED)
                 LOG_WARNING(&Poco::Logger::get("ClusterProxy::SelectStreamFactory"),
-                    "Connections to remote replicas of local shard {} failed, will use stale local replica", shard.shard_info.shard_num);
+                    "Connections to remote replicas of local shard {} failed, will use stale local replica", my_shard.shard_info.shard_num);
             else
                 throw;
         }
@@ -184,11 +185,11 @@ void ReadFromRemote::addLazyPipe(Pipes & pipes, const ClusterProxy::SelectStream
         if (try_results.empty() || local_delay < max_remote_delay)
         {
             auto plan = createLocalPlan(
-                query, header, context, stage, shard.shard_info.shard_num, shard_count, 0, 0, /*coordinator=*/nullptr);
+                query, header, my_context, my_stage, my_shard.shard_info.shard_num, my_shard_count, 0, 0, /*coordinator=*/nullptr);
 
             return std::move(*plan->buildQueryPipeline(
-                QueryPlanOptimizationSettings::fromContext(context),
-                BuildQueryPipelineSettings::fromContext(context)));
+                QueryPlanOptimizationSettings::fromContext(my_context),
+                BuildQueryPipelineSettings::fromContext(my_context)));
         }
         else
         {
@@ -199,12 +200,12 @@ void ReadFromRemote::addLazyPipe(Pipes & pipes, const ClusterProxy::SelectStream
 
             String query_string = formattedAST(query);
 
-            scalars["_shard_num"]
-                = Block{{DataTypeUInt32().createColumnConst(1, shard.shard_info.shard_num), std::make_shared<DataTypeUInt32>(), "_shard_num"}};
+            my_scalars["_shard_num"]
+                = Block{{DataTypeUInt32().createColumnConst(1, my_shard.shard_info.shard_num), std::make_shared<DataTypeUInt32>(), "_shard_num"}};
             auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
-                shard.shard_info.pool, std::move(connections), query_string, header, context, throttler, scalars, external_tables, stage);
+                std::move(connections), query_string, header, my_context, my_throttler, my_scalars, my_external_tables, my_stage);
 
-            auto pipe = createRemoteSourcePipe(remote_query_executor, add_agg_info, add_totals, add_extremes, async_read);
+            auto pipe = createRemoteSourcePipe(remote_query_executor, add_agg_info, add_totals, add_extremes, async_read, async_query_sending);
             QueryPipelineBuilder builder;
             builder.init(std::move(pipe));
             return builder;
@@ -221,6 +222,7 @@ void ReadFromRemote::addPipe(Pipes & pipes, const ClusterProxy::SelectStreamFact
     bool add_totals = false;
     bool add_extremes = false;
     bool async_read = context->getSettingsRef().async_socket_for_remote;
+    bool async_query_sending = context->getSettingsRef().async_query_sending_for_remote;
     if (stage == QueryProcessingStage::Complete)
     {
         add_totals = shard.query->as<ASTSelectQuery &>().group_by_with_totals;
@@ -243,7 +245,7 @@ void ReadFromRemote::addPipe(Pipes & pipes, const ClusterProxy::SelectStreamFact
     if (!table_func_ptr)
         remote_query_executor->setMainTable(main_table);
 
-    pipes.emplace_back(createRemoteSourcePipe(remote_query_executor, add_agg_info, add_totals, add_extremes, async_read));
+    pipes.emplace_back(createRemoteSourcePipe(remote_query_executor, add_agg_info, add_totals, add_extremes, async_read, async_query_sending));
     addConvertingActions(pipes.back(), output_stream->header);
 }
 
@@ -270,7 +272,7 @@ void ReadFromRemote::initializePipeline(QueryPipelineBuilder & pipeline, const B
 
 ReadFromParallelRemoteReplicasStep::ReadFromParallelRemoteReplicasStep(
     ASTPtr query_ast_,
-    Cluster::ShardInfo shard_info_,
+    ClusterPtr cluster_,
     ParallelReplicasReadingCoordinatorPtr coordinator_,
     Block header_,
     QueryProcessingStage::Enum stage_,
@@ -281,10 +283,9 @@ ReadFromParallelRemoteReplicasStep::ReadFromParallelRemoteReplicasStep(
     Scalars scalars_,
     Tables external_tables_,
     Poco::Logger * log_,
-    std::shared_ptr<const StorageLimitsList> storage_limits_,
-    UUID uuid_)
+    std::shared_ptr<const StorageLimitsList> storage_limits_)
     : ISourceStep(DataStream{.header = std::move(header_)})
-    , shard_info(shard_info_)
+    , cluster(cluster_)
     , query_ast(query_ast_)
     , coordinator(std::move(coordinator_))
     , stage(std::move(stage_))
@@ -296,13 +297,11 @@ ReadFromParallelRemoteReplicasStep::ReadFromParallelRemoteReplicasStep(
     , external_tables{external_tables_}
     , storage_limits(std::move(storage_limits_))
     , log(log_)
-    , uuid(uuid_)
 {
     std::vector<String> description;
 
-    for (const auto & address : shard_info.all_addresses)
-        if (!address.is_local)
-            description.push_back(fmt::format("Replica: {}", address.host_name));
+    for (const auto & address : cluster->getShardsAddresses())
+        description.push_back(fmt::format("Replica: {}", address[0].host_name));
 
     setStepDescription(boost::algorithm::join(description, ", "));
 }
@@ -324,42 +323,46 @@ void ReadFromParallelRemoteReplicasStep::initializePipeline(QueryPipelineBuilder
     auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
 
     size_t all_replicas_count = current_settings.max_parallel_replicas;
-    if (all_replicas_count > shard_info.all_addresses.size())
+    if (all_replicas_count > cluster->getShardsInfo().size())
     {
         LOG_INFO(&Poco::Logger::get("ReadFromParallelRemoteReplicasStep"),
             "The number of replicas requested ({}) is bigger than the real number available in the cluster ({}). "\
-            "Will use the latter number to execute the query.", current_settings.max_parallel_replicas, shard_info.all_addresses.size());
-        all_replicas_count = shard_info.all_addresses.size();
+            "Will use the latter number to execute the query.", current_settings.max_parallel_replicas, cluster->getShardsInfo().size());
+        all_replicas_count = cluster->getShardsInfo().size();
     }
 
-    /// The requested number of replicas to read from could be less
-    /// than the total number of replicas in the shard
-    /// And we have to pick only "remote" ones
-    /// So, that's why this loop looks like this.
-    size_t replica_num = 0;
-    while (pipes.size() != all_replicas_count - 1)
+    /// Find local shard. It might happen that there is no local shard, but that's fine
+    for (const auto & shard: cluster->getShardsInfo())
     {
-        if (shard_info.all_addresses[replica_num].is_local)
+        if (shard.isLocal())
         {
-            ++replica_num;
+            IConnections::ReplicaInfo replica_info
+            {
+                .all_replicas_count = all_replicas_count,
+                .number_of_current_replica = 0
+            };
+
+            addPipeForSingeReplica(pipes, shard.pool, replica_info);
+        }
+    }
+
+    auto current_shard = cluster->getShardsInfo().begin();
+    while (pipes.size() != all_replicas_count)
+    {
+        if (current_shard->isLocal())
+        {
+            ++current_shard;
             continue;
         }
 
         IConnections::ReplicaInfo replica_info
         {
             .all_replicas_count = all_replicas_count,
-            /// Replica 0 is threated as local always
-            .number_of_current_replica = pipes.size() + 1
+            .number_of_current_replica = pipes.size()
         };
 
-        auto pool = shard_info.per_replica_pools[replica_num];
-        assert(pool);
-
-        auto pool_with_failover = std::make_shared<ConnectionPoolWithFailover>(
-            ConnectionPoolPtrs{pool}, current_settings.load_balancing);
-
-        addPipeForSingeReplica(pipes, std::move(pool_with_failover), replica_info);
-        ++replica_num;
+        addPipeForSingeReplica(pipes, current_shard->pool, replica_info);
+        ++current_shard;
     }
 
     auto pipe = Pipe::unitePipes(std::move(pipes));
@@ -378,6 +381,7 @@ void ReadFromParallelRemoteReplicasStep::addPipeForSingeReplica(Pipes & pipes, s
     bool add_totals = false;
     bool add_extremes = false;
     bool async_read = context->getSettingsRef().async_socket_for_remote;
+    bool async_query_sending = context->getSettingsRef().async_query_sending_for_remote;
 
     if (stage == QueryProcessingStage::Complete)
     {
@@ -396,7 +400,7 @@ void ReadFromParallelRemoteReplicasStep::addPipeForSingeReplica(Pipes & pipes, s
 
     remote_query_executor->setLogger(log);
 
-    pipes.emplace_back(createRemoteSourcePipe(std::move(remote_query_executor), add_agg_info, add_totals, add_extremes, async_read, uuid));
+    pipes.emplace_back(createRemoteSourcePipe(std::move(remote_query_executor), add_agg_info, add_totals, add_extremes, async_read, async_query_sending));
     addConvertingActions(pipes.back(), output_stream->header);
 }
 
diff --git a/src/Processors/QueryPlan/ReadFromRemote.h b/src/Processors/QueryPlan/ReadFromRemote.h
index e1979ee1aaa..d4005d81f1b 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.h
+++ b/src/Processors/QueryPlan/ReadFromRemote.h
@@ -66,7 +66,7 @@ class ReadFromParallelRemoteReplicasStep : public ISourceStep
 public:
     ReadFromParallelRemoteReplicasStep(
         ASTPtr query_ast_,
-        Cluster::ShardInfo shard_info,
+        ClusterPtr cluster_,
         ParallelReplicasReadingCoordinatorPtr coordinator_,
         Block header_,
         QueryProcessingStage::Enum stage_,
@@ -77,8 +77,7 @@ public:
         Scalars scalars_,
         Tables external_tables_,
         Poco::Logger * log_,
-        std::shared_ptr<const StorageLimitsList> storage_limits_,
-        UUID uuid);
+        std::shared_ptr<const StorageLimitsList> storage_limits_);
 
     String getName() const override { return "ReadFromRemoteParallelReplicas"; }
 
@@ -91,7 +90,7 @@ private:
 
     void addPipeForSingeReplica(Pipes & pipes, std::shared_ptr<ConnectionPoolWithFailover> pool, IConnections::ReplicaInfo replica_info);
 
-    Cluster::ShardInfo shard_info;
+    ClusterPtr cluster;
     ASTPtr query_ast;
     ParallelReplicasReadingCoordinatorPtr coordinator;
     QueryProcessingStage::Enum stage;
@@ -101,10 +100,8 @@ private:
     ThrottlerPtr throttler;
     Scalars scalars;
     Tables external_tables;
-
     std::shared_ptr<const StorageLimitsList> storage_limits;
     Poco::Logger * log;
-    UUID uuid;
 };
 
 }
diff --git a/src/Processors/QueryPlan/RollupStep.cpp b/src/Processors/QueryPlan/RollupStep.cpp
index 3305f24602f..aa6efa930e6 100644
--- a/src/Processors/QueryPlan/RollupStep.cpp
+++ b/src/Processors/QueryPlan/RollupStep.cpp
@@ -11,7 +11,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = false,
             .returns_single_stream = true,
             .preserves_number_of_streams = false,
             .preserves_sorting = false,
@@ -29,9 +28,6 @@ RollupStep::RollupStep(const DataStream & input_stream_, Aggregator::Params para
     , final(final_)
     , use_nulls(use_nulls_)
 {
-    /// Aggregation keys are distinct
-    for (const auto & key : params.keys)
-        output_stream->distinct_columns.insert(key);
 }
 
 ProcessorPtr addGroupingSetForTotals(const Block & header, const Names & keys, bool use_nulls, const BuildQueryPipelineSettings & settings, UInt64 grouping_set_number);
@@ -53,11 +49,9 @@ void RollupStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQ
 void RollupStep::updateOutputStream()
 {
     output_stream = createOutputStream(
-        input_streams.front(), appendGroupingSetColumn(params.getHeader(input_streams.front().header, final)), getDataStreamTraits());
-
-    /// Aggregation keys are distinct
-    for (const auto & key : params.keys)
-        output_stream->distinct_columns.insert(key);
+        input_streams.front(),
+        generateOutputHeader(params.getHeader(input_streams.front().header, final), params.keys, use_nulls),
+        getDataStreamTraits());
 }
 
 
diff --git a/src/Processors/QueryPlan/SortingStep.cpp b/src/Processors/QueryPlan/SortingStep.cpp
index 0308e320e3a..55ce763575e 100644
--- a/src/Processors/QueryPlan/SortingStep.cpp
+++ b/src/Processors/QueryPlan/SortingStep.cpp
@@ -45,7 +45,6 @@ static ITransformingStep::Traits getTraits(size_t limit)
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = true,
             .returns_single_stream = true,
             .preserves_number_of_streams = false,
             .preserves_sorting = false,
@@ -99,11 +98,13 @@ SortingStep::SortingStep(
     const DataStream & input_stream,
     SortDescription sort_description_,
     size_t max_block_size_,
-    UInt64 limit_)
+    UInt64 limit_,
+    bool always_read_till_end_)
     : ITransformingStep(input_stream, input_stream.header, getTraits(limit_))
     , type(Type::MergingSorted)
     , result_description(std::move(sort_description_))
     , limit(limit_)
+    , always_read_till_end(always_read_till_end_)
     , sort_settings(max_block_size_)
 {
     sort_settings.max_block_size = max_block_size_;
@@ -175,8 +176,10 @@ void SortingStep::mergingSorted(QueryPipelineBuilder & pipeline, const SortDescr
             pipeline.getNumStreams(),
             result_sort_desc,
             sort_settings.max_block_size,
+            /*max_block_size_bytes=*/0,
             SortingQueueStrategy::Batch,
-            limit_);
+            limit_,
+            always_read_till_end);
 
         pipeline.addTransform(std::move(transform));
     }
@@ -263,7 +266,14 @@ void SortingStep::fullSort(
     if (pipeline.getNumStreams() > 1)
     {
         auto transform = std::make_shared<MergingSortedTransform>(
-            pipeline.getHeader(), pipeline.getNumStreams(), result_sort_desc, sort_settings.max_block_size, SortingQueueStrategy::Batch, limit_);
+            pipeline.getHeader(),
+            pipeline.getNumStreams(),
+            result_sort_desc,
+            sort_settings.max_block_size,
+            /*max_block_size_bytes=*/0,
+            SortingQueueStrategy::Batch,
+            limit_,
+            always_read_till_end);
 
         pipeline.addTransform(std::move(transform));
     }
diff --git a/src/Processors/QueryPlan/SortingStep.h b/src/Processors/QueryPlan/SortingStep.h
index eed1f26e110..371a24ac6f2 100644
--- a/src/Processors/QueryPlan/SortingStep.h
+++ b/src/Processors/QueryPlan/SortingStep.h
@@ -53,7 +53,9 @@ public:
         const DataStream & input_stream,
         SortDescription sort_description_,
         size_t max_block_size_,
-        UInt64 limit_ = 0);
+        UInt64 limit_ = 0,
+        bool always_read_till_end_ = false
+    );
 
     String getName() const override { return "Sorting"; }
 
@@ -100,6 +102,7 @@ private:
     SortDescription prefix_description;
     const SortDescription result_description;
     UInt64 limit;
+    bool always_read_till_end = false;
 
     Settings sort_settings;
 
diff --git a/src/Processors/QueryPlan/SourceStepWithFilter.h b/src/Processors/QueryPlan/SourceStepWithFilter.h
new file mode 100644
index 00000000000..a363451fff2
--- /dev/null
+++ b/src/Processors/QueryPlan/SourceStepWithFilter.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include <Processors/QueryPlan/ISourceStep.h>
+#include <Interpreters/ActionsDAG.h>
+
+namespace DB
+{
+
+/** Source step that can use filters for more efficient pipeline initialization.
+  * Filters must be added before pipeline initialization.
+  */
+class SourceStepWithFilter : public ISourceStep
+{
+public:
+    using Base = ISourceStep;
+    using Base::Base;
+
+    const std::vector<ActionsDAGPtr> & getFilters() const
+    {
+        return filter_dags;
+    }
+
+    const ActionDAGNodes & getFilterNodes() const
+    {
+        return filter_nodes;
+    }
+
+    void addFilter(ActionsDAGPtr filter_dag, std::string column_name)
+    {
+        filter_nodes.nodes.push_back(&filter_dag->findInOutputs(column_name));
+        filter_dags.push_back(std::move(filter_dag));
+    }
+
+    void addFilter(ActionsDAGPtr filter_dag, const ActionsDAG::Node * filter_node)
+    {
+        filter_nodes.nodes.push_back(filter_node);
+        filter_dags.push_back(std::move(filter_dag));
+    }
+
+protected:
+    std::vector<ActionsDAGPtr> filter_dags;
+    ActionDAGNodes filter_nodes;
+};
+
+}
diff --git a/src/Processors/QueryPlan/TotalsHavingStep.cpp b/src/Processors/QueryPlan/TotalsHavingStep.cpp
index 63991655426..d1bd70fd0b2 100644
--- a/src/Processors/QueryPlan/TotalsHavingStep.cpp
+++ b/src/Processors/QueryPlan/TotalsHavingStep.cpp
@@ -14,7 +14,6 @@ static ITransformingStep::Traits getTraits(bool has_filter)
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = true,
             .returns_single_stream = true,
             .preserves_number_of_streams = false,
             .preserves_sorting = true,
diff --git a/src/Processors/QueryPlan/WindowStep.cpp b/src/Processors/QueryPlan/WindowStep.cpp
index 92e9948c4c7..d313b210854 100644
--- a/src/Processors/QueryPlan/WindowStep.cpp
+++ b/src/Processors/QueryPlan/WindowStep.cpp
@@ -15,7 +15,6 @@ static ITransformingStep::Traits getTraits()
     return ITransformingStep::Traits
     {
         {
-            .preserves_distinct_columns = true,
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
             .preserves_sorting = true,
diff --git a/src/Processors/ResizeProcessor.h b/src/Processors/ResizeProcessor.h
index 07d7149ebb4..766c39172a2 100644
--- a/src/Processors/ResizeProcessor.h
+++ b/src/Processors/ResizeProcessor.h
@@ -10,7 +10,7 @@ namespace DB
 /** Has arbitrary non zero number of inputs and arbitrary non zero number of outputs.
   * All of them have the same structure.
   *
-  * Pulls data from arbitrary input (whenever it is ready) and pushes it to arbitrary output (whenever is is not full).
+  * Pulls data from arbitrary input (whenever it is ready) and pushes it to arbitrary output (whenever it is not full).
   * Doesn't do any heavy calculations.
   * Doesn't preserve an order of data.
   *
diff --git a/src/Processors/Sources/MongoDBSource.cpp b/src/Processors/Sources/MongoDBSource.cpp
index a8bfefdf8a6..279a842143f 100644
--- a/src/Processors/Sources/MongoDBSource.cpp
+++ b/src/Processors/Sources/MongoDBSource.cpp
@@ -6,7 +6,9 @@
 #include <Poco/MongoDB/Connection.h>
 #include <Poco/MongoDB/Cursor.h>
 #include <Poco/MongoDB/ObjectId.h>
+#include <Poco/MongoDB/Array.h>
 
+#include <Columns/ColumnArray.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
@@ -15,7 +17,9 @@
 #include <Common/quoteString.h>
 #include <base/range.h>
 #include <Poco/URI.h>
-#include <Poco/Version.h>
+
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
 
 // only after poco
 // naming conflict:
@@ -31,43 +35,130 @@ namespace ErrorCodes
     extern const int TYPE_MISMATCH;
     extern const int UNKNOWN_TYPE;
     extern const int MONGODB_ERROR;
+    extern const int BAD_ARGUMENTS;
 }
 
-
-std::unique_ptr<Poco::MongoDB::Cursor> createCursor(const std::string & database, const std::string & collection, const Block & sample_block_to_select)
-{
-    auto cursor = std::make_unique<Poco::MongoDB::Cursor>(database, collection);
-
-    /// Looks like selecting _id column is implicit by default.
-    if (!sample_block_to_select.has("_id"))
-        cursor->query().returnFieldSelector().add("_id", 0);
-
-    for (const auto & column : sample_block_to_select)
-        cursor->query().returnFieldSelector().add(column.name, 1);
-    return cursor;
-}
-
-MongoDBSource::MongoDBSource(
-    std::shared_ptr<Poco::MongoDB::Connection> & connection_,
-    std::unique_ptr<Poco::MongoDB::Cursor> cursor_,
-    const Block & sample_block,
-    UInt64 max_block_size_)
-    : ISource(sample_block.cloneEmpty())
-    , connection(connection_)
-    , cursor{std::move(cursor_)}
-    , max_block_size{max_block_size_}
-{
-    description.init(sample_block);
-}
-
-
-MongoDBSource::~MongoDBSource() = default;
-
-
 namespace
 {
     using ValueType = ExternalResultDescription::ValueType;
     using ObjectId = Poco::MongoDB::ObjectId;
+    using MongoArray = Poco::MongoDB::Array;
+
+
+    template <typename T>
+    Field getNumber(const Poco::MongoDB::Element & value, const std::string & name)
+    {
+        switch (value.type())
+        {
+            case Poco::MongoDB::ElementTraits<Int32>::TypeId:
+                return static_cast<T>(static_cast<const Poco::MongoDB::ConcreteElement<Int32> &>(value).value());
+            case Poco::MongoDB::ElementTraits<Poco::Int64>::TypeId:
+                return static_cast<T>(static_cast<const Poco::MongoDB::ConcreteElement<Poco::Int64> &>(value).value());
+            case Poco::MongoDB::ElementTraits<Float64>::TypeId:
+                return static_cast<T>(static_cast<const Poco::MongoDB::ConcreteElement<Float64> &>(value).value());
+            case Poco::MongoDB::ElementTraits<bool>::TypeId:
+                return static_cast<T>(static_cast<const Poco::MongoDB::ConcreteElement<bool> &>(value).value());
+            case Poco::MongoDB::ElementTraits<Poco::MongoDB::NullValue>::TypeId:
+                return Field();
+            case Poco::MongoDB::ElementTraits<String>::TypeId:
+                return parse<T>(static_cast<const Poco::MongoDB::ConcreteElement<String> &>(value).value());
+            default:
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected a number, got type id = {} for column {}",
+                    toString(value.type()), name);
+        }
+    }
+
+    void prepareMongoDBArrayInfo(
+        std::unordered_map<size_t, MongoDBArrayInfo> & array_info, size_t column_idx, const DataTypePtr data_type)
+    {
+        const auto * array_type = assert_cast<const DataTypeArray *>(data_type.get());
+        auto nested = array_type->getNestedType();
+
+        size_t count_dimensions = 1;
+        while (isArray(nested))
+        {
+            ++count_dimensions;
+            nested = assert_cast<const DataTypeArray *>(nested.get())->getNestedType();
+        }
+
+        Field default_value = nested->getDefault();
+        if (nested->isNullable())
+            nested = assert_cast<const DataTypeNullable *>(nested.get())->getNestedType();
+
+        WhichDataType which(nested);
+        std::function<Field(const Poco::MongoDB::Element & value, const std::string & name)> parser;
+
+        if (which.isUInt8())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field { return getNumber<UInt8>(value, name); };
+        else if (which.isUInt16())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field { return getNumber<UInt16>(value, name); };
+        else if (which.isUInt32())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field { return getNumber<UInt32>(value, name); };
+        else if (which.isUInt64())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field { return getNumber<UInt64>(value, name); };
+        else if (which.isInt8())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field { return getNumber<Int8>(value, name); };
+        else if (which.isInt16())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field { return getNumber<Int16>(value, name); };
+        else if (which.isInt32())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field { return getNumber<Int32>(value, name); };
+        else if (which.isInt64())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field { return getNumber<Int64>(value, name); };
+        else if (which.isFloat32())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field { return getNumber<Float32>(value, name); };
+        else if (which.isFloat64())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field { return getNumber<Float64>(value, name); };
+        else if (which.isString() || which.isFixedString())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field
+            {
+                if (value.type() == Poco::MongoDB::ElementTraits<ObjectId::Ptr>::TypeId)
+                {
+                    String string_id = value.toString();
+                    return Field(string_id.data(), string_id.size());
+                }
+                else if (value.type() == Poco::MongoDB::ElementTraits<String>::TypeId)
+                {
+                    String string = static_cast<const Poco::MongoDB::ConcreteElement<String> &>(value).value();
+                    return Field(string.data(), string.size());
+                }
+
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected String, got type id = {} for column {}",
+                                toString(value.type()), name);
+            };
+        else if (which.isDate())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field
+            {
+                if (value.type() != Poco::MongoDB::ElementTraits<Poco::Timestamp>::TypeId)
+                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected Timestamp, got type id = {} for column {}",
+                                    toString(value.type()), name);
+
+                return static_cast<UInt16>(DateLUT::instance().toDayNum(
+                    static_cast<const Poco::MongoDB::ConcreteElement<Poco::Timestamp> &>(value).value().epochTime()));
+            };
+        else if (which.isDateTime())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field
+            {
+                if (value.type() != Poco::MongoDB::ElementTraits<Poco::Timestamp>::TypeId)
+                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected Timestamp, got type id = {} for column {}",
+                                    toString(value.type()), name);
+
+                return static_cast<UInt32>(static_cast<const Poco::MongoDB::ConcreteElement<Poco::Timestamp> &>(value).value().epochTime());
+            };
+        else if (which.isUUID())
+            parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field
+            {
+                if (value.type() != Poco::MongoDB::ElementTraits<String>::TypeId)
+                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected String (UUID), got type id = {} for column {}",
+                                        toString(value.type()), name);
+
+                String string = static_cast<const Poco::MongoDB::ConcreteElement<String> &>(value).value();
+                return parse<UUID>(string);
+            };
+        else
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Type conversion to {} is not supported", nested->getName());
+
+        array_info[column_idx] = {count_dimensions, default_value, parser};
+    }
 
     template <typename T>
     void insertNumber(IColumn & column, const Poco::MongoDB::Element & value, const std::string & name)
@@ -103,7 +194,13 @@ namespace
         }
     }
 
-    void insertValue(IColumn & column, const ValueType type, const Poco::MongoDB::Element & value, const std::string & name)
+    void insertValue(
+        IColumn & column,
+        const ValueType type,
+        const Poco::MongoDB::Element & value,
+        const std::string & name,
+        std::unordered_map<size_t, MongoDBArrayInfo> & array_info,
+        size_t idx)
     {
         switch (type)
         {
@@ -192,8 +289,75 @@ namespace
                                         toString(value.type()), name);
                 break;
             }
+            case ValueType::vtArray:
+            {
+                if (value.type() != Poco::MongoDB::ElementTraits<MongoArray::Ptr>::TypeId)
+                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected Array, got type id = {} for column {}",
+                                    toString(value.type()), name);
+
+                size_t expected_dimensions = array_info[idx].num_dimensions;
+                const auto parse_value = array_info[idx].parser;
+                std::vector<Row> dimensions(expected_dimensions + 1);
+
+                auto array = static_cast<const Poco::MongoDB::ConcreteElement<MongoArray::Ptr> &>(value).value();
+
+                std::vector<std::pair<const Poco::MongoDB::Element *, size_t>> arrays;
+                arrays.emplace_back(&value, 0);
+
+                while (!arrays.empty())
+                {
+                    size_t dimension_idx = arrays.size() - 1;
+
+                    if (dimension_idx + 1 > expected_dimensions)
+                        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Got more dimensions than expected");
+
+                    auto [parent_ptr, child_idx] = arrays.back();
+                    auto parent = static_cast<const Poco::MongoDB::ConcreteElement<MongoArray::Ptr> &>(*parent_ptr).value();
+
+                    if (child_idx >= parent->size())
+                    {
+                        arrays.pop_back();
+
+                        if (dimension_idx == 0)
+                            break;
+
+                        dimensions[dimension_idx].emplace_back(Array(dimensions[dimension_idx + 1].begin(), dimensions[dimension_idx + 1].end()));
+                        dimensions[dimension_idx + 1].clear();
+
+                        continue;
+                    }
+
+                    Poco::MongoDB::Element::Ptr child = parent->get(static_cast<int>(child_idx));
+                    arrays.back().second += 1;
+
+                    if (child->type() == Poco::MongoDB::ElementTraits<MongoArray::Ptr>::TypeId)
+                    {
+                        arrays.emplace_back(child.get(), 0);
+                    }
+                    else if (child->type() == Poco::MongoDB::ElementTraits<Poco::MongoDB::NullValue>::TypeId)
+                    {
+                        if (dimension_idx + 1 == expected_dimensions)
+                            dimensions[dimension_idx + 1].emplace_back(array_info[idx].default_value);
+                        else
+                            dimensions[dimension_idx + 1].emplace_back(Array());
+                    }
+                    else if (dimension_idx + 1 == expected_dimensions)
+                    {
+                        dimensions[dimension_idx + 1].emplace_back(parse_value(*child, name));
+                    }
+                    else
+                    {
+                        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Got less dimensions than expected. ({} instead of {})", dimension_idx + 1, expected_dimensions);
+                    }
+                }
+
+                assert_cast<ColumnArray &>(column).insert(Array(dimensions[1].begin(), dimensions[1].end()));
+                break;
+
+            }
             default:
-                throw Exception(ErrorCodes::UNKNOWN_TYPE, "Value of unsupported type:{}", column.getName());
+                throw Exception(ErrorCodes::UNKNOWN_TYPE, "Value of unsupported type: {}", column.getName());
         }
     }
 
@@ -201,6 +365,39 @@ namespace
 }
 
 
+std::unique_ptr<Poco::MongoDB::Cursor> createCursor(const std::string & database, const std::string & collection, const Block & sample_block_to_select)
+{
+    auto cursor = std::make_unique<Poco::MongoDB::Cursor>(database, collection);
+
+    /// Looks like selecting _id column is implicit by default.
+    if (!sample_block_to_select.has("_id"))
+        cursor->query().returnFieldSelector().add("_id", 0);
+
+    for (const auto & column : sample_block_to_select)
+        cursor->query().returnFieldSelector().add(column.name, 1);
+    return cursor;
+}
+
+MongoDBSource::MongoDBSource(
+    std::shared_ptr<Poco::MongoDB::Connection> & connection_,
+    std::unique_ptr<Poco::MongoDB::Cursor> cursor_,
+    const Block & sample_block,
+    UInt64 max_block_size_)
+    : ISource(sample_block.cloneEmpty())
+    , connection(connection_)
+    , cursor{std::move(cursor_)}
+    , max_block_size{max_block_size_}
+{
+    description.init(sample_block);
+
+    for (const auto idx : collections::range(0, description.sample_block.columns()))
+        if (description.types[idx].first == ExternalResultDescription::ValueType::vtArray)
+            prepareMongoDBArrayInfo(array_info, idx, description.sample_block.getByPosition(idx).type);
+}
+
+
+MongoDBSource::~MongoDBSource() = default;
+
 Chunk MongoDBSource::generate()
 {
     if (all_read)
@@ -252,11 +449,11 @@ Chunk MongoDBSource::generate()
                     if (is_nullable)
                     {
                         ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[idx]);
-                        insertValue(column_nullable.getNestedColumn(), description.types[idx].first, *value, name);
+                        insertValue(column_nullable.getNestedColumn(), description.types[idx].first, *value, name, array_info, idx);
                         column_nullable.getNullMapData().emplace_back(0);
                     }
                     else
-                        insertValue(*columns[idx], description.types[idx].first, *value, name);
+                        insertValue(*columns[idx], description.types[idx].first, *value, name, array_info, idx);
                 }
             }
         }
diff --git a/src/Processors/Sources/MongoDBSource.h b/src/Processors/Sources/MongoDBSource.h
index d03a7a45477..d4681d2c05f 100644
--- a/src/Processors/Sources/MongoDBSource.h
+++ b/src/Processors/Sources/MongoDBSource.h
@@ -6,6 +6,8 @@
 #include <Processors/ISource.h>
 #include <Core/ExternalResultDescription.h>
 
+#include <Core/Field.h>
+
 
 namespace Poco
 {
@@ -19,6 +21,13 @@ namespace MongoDB
 namespace DB
 {
 
+struct MongoDBArrayInfo
+{
+    size_t num_dimensions;
+    Field default_value;
+    std::function<Field(const Poco::MongoDB::Element & value, const std::string & name)> parser;
+};
+
 void authenticate(Poco::MongoDB::Connection & connection, const std::string & database, const std::string & user, const std::string & password);
 
 std::unique_ptr<Poco::MongoDB::Cursor> createCursor(const std::string & database, const std::string & collection, const Block & sample_block_to_select);
@@ -45,6 +54,8 @@ private:
     const UInt64 max_block_size;
     ExternalResultDescription description;
     bool all_read = false;
+
+    std::unordered_map<size_t, MongoDBArrayInfo> array_info;
 };
 
 }
diff --git a/src/Processors/Sources/MySQLSource.cpp b/src/Processors/Sources/MySQLSource.cpp
index 434d413a238..4877660dc3f 100644
--- a/src/Processors/Sources/MySQLSource.cpp
+++ b/src/Processors/Sources/MySQLSource.cpp
@@ -11,6 +11,7 @@
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeDateTime.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
@@ -107,6 +108,11 @@ void MySQLWithFailoverSource::onStart()
                 throw;
             }
         }
+        catch (const mysqlxx::BadQuery & e)
+        {
+            LOG_ERROR(log, "Error processing query '{}': {}", query_str, e.displayText());
+            throw;
+        }
     }
 
     initPositionMappingFromQueryResultStructure();
diff --git a/src/Processors/Sources/PostgreSQLSource.cpp b/src/Processors/Sources/PostgreSQLSource.cpp
index 77c2fc41aa1..115e24d5740 100644
--- a/src/Processors/Sources/PostgreSQLSource.cpp
+++ b/src/Processors/Sources/PostgreSQLSource.cpp
@@ -176,12 +176,10 @@ template<typename T>
 void PostgreSQLSource<T>::onFinish()
 {
     if (stream)
-    {
-        stream->complete();
+        stream->close();
 
-        if (auto_commit)
-            tx->commit();
-    }
+    if (tx && auto_commit)
+        tx->commit();
 }
 
 template
diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index 69964d569fa..310a1d33e28 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -14,11 +14,11 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-RemoteSource::RemoteSource(RemoteQueryExecutorPtr executor, bool add_aggregation_info_, bool async_read_, UUID uuid_)
+RemoteSource::RemoteSource(RemoteQueryExecutorPtr executor, bool add_aggregation_info_, bool async_read_, bool async_query_sending_)
     : ISource(executor->getHeader(), false)
     , add_aggregation_info(add_aggregation_info_), query_executor(std::move(executor))
     , async_read(async_read_)
-    , uuid(uuid_)
+    , async_query_sending(async_query_sending_)
 {
     /// Add AggregatedChunkInfo if we expect DataTypeAggregateFunction as a result.
     const auto & sample = getPort().getHeader();
@@ -29,18 +29,6 @@ RemoteSource::RemoteSource(RemoteQueryExecutorPtr executor, bool add_aggregation
 
 RemoteSource::~RemoteSource() = default;
 
-void RemoteSource::connectToScheduler(InputPort & input_port)
-{
-    outputs.emplace_back(Block{}, this);
-    dependency_port = &outputs.back();
-    connect(*dependency_port, input_port);
-}
-
-UUID RemoteSource::getParallelReplicasGroupUUID()
-{
-    return uuid;
-}
-
 void RemoteSource::setStorageLimits(const std::shared_ptr<const StorageLimitsList> & storage_limits_)
 {
     /// Remove leaf limits for remote source.
@@ -68,22 +56,11 @@ ISource::Status RemoteSource::prepare()
     /// RemoteQueryExecutor it should be finished explicitly.
     if (status == Status::Finished)
     {
-        query_executor->finish(&read_context);
-        if (dependency_port)
-            dependency_port->finish();
+        query_executor->finish();
         is_async_state = false;
-
         return status;
     }
 
-    if (status == Status::PortFull)
-    {
-        /// Also push empty chunk to dependency to signal that we read data from remote source
-        /// or answered to the incoming request from parallel replica
-        if (dependency_port && !dependency_port->isFinished() && dependency_port->canPush())
-            dependency_port->push(Chunk());
-    }
-
     return status;
 }
 
@@ -106,11 +83,31 @@ std::optional<Chunk> RemoteSource::tryGenerate()
         /// Get rows_before_limit result for remote query from ProfileInfo packet.
         query_executor->setProfileInfoCallback([this](const ProfileInfo & info)
         {
-            if (rows_before_limit && info.hasAppliedLimit())
-                rows_before_limit->set(info.getRowsBeforeLimit());
+            if (rows_before_limit)
+            {
+                if (info.hasAppliedLimit())
+                    rows_before_limit->add(info.getRowsBeforeLimit());
+                else
+                    manually_add_rows_before_limit_counter = true; /// Remote subquery doesn't contain a limit
+            }
         });
 
-        query_executor->sendQuery();
+        if (async_query_sending)
+        {
+            int fd_ = query_executor->sendQueryAsync();
+            if (fd_ >= 0)
+            {
+                fd = fd_;
+                is_async_state = true;
+                return Chunk();
+            }
+
+            is_async_state = false;
+        }
+        else
+        {
+            query_executor->sendQuery();
+        }
 
         was_query_sent = true;
     }
@@ -119,7 +116,7 @@ std::optional<Chunk> RemoteSource::tryGenerate()
 
     if (async_read)
     {
-        auto res = query_executor->read(read_context);
+        auto res = query_executor->readAsync();
 
         if (res.getType() == RemoteQueryExecutor::ReadResult::Type::Nothing)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Got an empty packet from the RemoteQueryExecutor. This is a bug");
@@ -146,11 +143,15 @@ std::optional<Chunk> RemoteSource::tryGenerate()
 
     if (!block)
     {
-        query_executor->finish(&read_context);
+        if (manually_add_rows_before_limit_counter)
+            rows_before_limit->add(rows);
+
+        query_executor->finish();
         return {};
     }
 
     UInt64 num_rows = block.rows();
+    rows += num_rows;
     Chunk chunk(block.getColumns(), num_rows);
 
     if (add_aggregation_info)
@@ -167,7 +168,7 @@ std::optional<Chunk> RemoteSource::tryGenerate()
 void RemoteSource::onCancel()
 {
     was_query_canceled = true;
-    query_executor->cancel(&read_context);
+    query_executor->cancel();
 }
 
 void RemoteSource::onUpdatePorts()
@@ -175,7 +176,7 @@ void RemoteSource::onUpdatePorts()
     if (getPort().isFinished())
     {
         was_query_canceled = true;
-        query_executor->finish(&read_context);
+        query_executor->finish();
     }
 }
 
@@ -222,9 +223,9 @@ Chunk RemoteExtremesSource::generate()
 
 Pipe createRemoteSourcePipe(
     RemoteQueryExecutorPtr query_executor,
-    bool add_aggregation_info, bool add_totals, bool add_extremes, bool async_read, UUID uuid)
+    bool add_aggregation_info, bool add_totals, bool add_extremes, bool async_read, bool async_query_sending)
 {
-    Pipe pipe(std::make_shared<RemoteSource>(query_executor, add_aggregation_info, async_read, uuid));
+    Pipe pipe(std::make_shared<RemoteSource>(query_executor, add_aggregation_info, async_read, async_query_sending));
 
     if (add_totals)
         pipe.addTotalsSource(std::make_shared<RemoteTotalsSource>(query_executor));
diff --git a/src/Processors/Sources/RemoteSource.h b/src/Processors/Sources/RemoteSource.h
index 8fe0114ab6f..da39b5d0046 100644
--- a/src/Processors/Sources/RemoteSource.h
+++ b/src/Processors/Sources/RemoteSource.h
@@ -3,7 +3,7 @@
 #include <Processors/ISource.h>
 #include <Processors/RowsBeforeLimitCounter.h>
 #include <QueryPipeline/Pipe.h>
-#include "Core/UUID.h"
+#include <Core/UUID.h>
 #include <atomic>
 
 namespace DB
@@ -12,8 +12,6 @@ namespace DB
 class RemoteQueryExecutor;
 using RemoteQueryExecutorPtr = std::shared_ptr<RemoteQueryExecutor>;
 
-class RemoteQueryExecutorReadContext;
-
 /// Source from RemoteQueryExecutor. Executes remote query and returns query result chunks.
 class RemoteSource final : public ISource
 {
@@ -21,17 +19,13 @@ public:
     /// Flag add_aggregation_info tells if AggregatedChunkInfo should be added to result chunk.
     /// AggregatedChunkInfo stores the bucket number used for two-level aggregation.
     /// This flag should be typically enabled for queries with GROUP BY which are executed till WithMergeableState.
-    RemoteSource(RemoteQueryExecutorPtr executor, bool add_aggregation_info_, bool async_read_, UUID uuid = UUIDHelpers::Nil);
+    RemoteSource(RemoteQueryExecutorPtr executor, bool add_aggregation_info_, bool async_read_, bool async_query_sending_);
     ~RemoteSource() override;
 
     Status prepare() override;
     String getName() const override { return "Remote"; }
 
-    void connectToScheduler(InputPort & input_port);
-
-    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) { rows_before_limit.swap(counter); }
-
-    UUID getParallelReplicasGroupUUID();
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { rows_before_limit.swap(counter); }
 
     /// Stop reading from stream if output port is finished.
     void onUpdatePorts() override;
@@ -51,13 +45,12 @@ private:
     RemoteQueryExecutorPtr query_executor;
     RowsBeforeLimitCounterPtr rows_before_limit;
 
-    OutputPort * dependency_port{nullptr};
-
     const bool async_read;
+    const bool async_query_sending;
     bool is_async_state = false;
-    std::unique_ptr<RemoteQueryExecutorReadContext> read_context;
-    UUID uuid;
     int fd = -1;
+    size_t rows = 0;
+    bool manually_add_rows_before_limit_counter = false;
 };
 
 /// Totals source from RemoteQueryExecutor.
@@ -95,6 +88,6 @@ private:
 /// Create pipe with remote sources.
 Pipe createRemoteSourcePipe(
     RemoteQueryExecutorPtr query_executor,
-    bool add_aggregation_info, bool add_totals, bool add_extremes, bool async_read, UUID uuid = UUIDHelpers::Nil);
+    bool add_aggregation_info, bool add_totals, bool add_extremes, bool async_read, bool async_query_sending);
 
 }
diff --git a/src/Processors/Sources/ShellCommandSource.h b/src/Processors/Sources/ShellCommandSource.h
index 80ba1d59adf..b9afaa345cf 100644
--- a/src/Processors/Sources/ShellCommandSource.h
+++ b/src/Processors/Sources/ShellCommandSource.h
@@ -2,7 +2,6 @@
 
 #include <memory>
 
-#include <Common/logger_useful.h>
 #include <base/BorrowedObjectPool.h>
 
 #include <Common/ShellCommand.h>
diff --git a/src/Processors/Sources/SourceFromChunks.cpp b/src/Processors/Sources/SourceFromChunks.cpp
index 7b73b877d2e..9fad508c23b 100644
--- a/src/Processors/Sources/SourceFromChunks.cpp
+++ b/src/Processors/Sources/SourceFromChunks.cpp
@@ -4,20 +4,10 @@ namespace DB
 {
 
 SourceFromChunks::SourceFromChunks(Block header, Chunks chunks_)
-    : SourceFromChunks(header, std::make_shared<Chunks>(std::move(chunks_)), true)
-{}
-
-SourceFromChunks::SourceFromChunks(Block header, std::shared_ptr<Chunks> chunks_)
-    : SourceFromChunks(header, chunks_, false)
-{}
-
-SourceFromChunks::SourceFromChunks(Block header, std::shared_ptr<Chunks> chunks_, bool move_from_chunks_)
     : ISource(std::move(header))
-    , chunks(chunks_)
-    , it(chunks->begin())
-    , move_from_chunks(move_from_chunks_)
-{
-}
+    , chunks(std::move(chunks_))
+    , it(chunks.begin())
+{}
 
 String SourceFromChunks::getName() const
 {
@@ -26,22 +16,14 @@ String SourceFromChunks::getName() const
 
 Chunk SourceFromChunks::generate()
 {
-    if (it != chunks->end())
-        if (move_from_chunks)
-        {
-            Chunk && chunk = std::move(*it);
-            it++;
-            return chunk;
-        }
-        else
-        {
-            Chunk chunk = it->clone();
-            it++;
-            return chunk;
-        }
+    if (it != chunks.end())
+    {
+        Chunk && chunk = std::move(*it);
+        it++;
+        return chunk;
+    }
     else
         return {};
 }
 
 }
-
diff --git a/src/Processors/Sources/SourceFromChunks.h b/src/Processors/Sources/SourceFromChunks.h
index d41999208a0..b508f206d0c 100644
--- a/src/Processors/Sources/SourceFromChunks.h
+++ b/src/Processors/Sources/SourceFromChunks.h
@@ -7,11 +7,11 @@
 namespace DB
 {
 
+/// The big brother of SourceFromSingleChunk.
 class SourceFromChunks : public ISource
 {
 public:
     SourceFromChunks(Block header, Chunks chunks_);
-    SourceFromChunks(Block header, std::shared_ptr<Chunks> chunks_);
 
     String getName() const override;
 
@@ -19,12 +19,8 @@ protected:
     Chunk generate() override;
 
 private:
-    SourceFromChunks(Block header, std::shared_ptr<Chunks> chunks_, bool move_from_chunks_);
-
-    const std::shared_ptr<Chunks> chunks;
+    Chunks chunks;
     Chunks::iterator it;
-    /// Optimization: if the chunks are exclusively owned by SourceFromChunks, then generate() can move from them
-    const bool move_from_chunks;
 };
 
 }
diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.cpp b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
index 95e9b953840..3d5a910f054 100644
--- a/src/Processors/Transforms/AggregatingInOrderTransform.cpp
+++ b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
@@ -2,6 +2,7 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Core/SortCursor.h>
+#include <Common/logger_useful.h>
 #include <Interpreters/sortBlock.h>
 #include <base/range.h>
 
diff --git a/src/Processors/Transforms/AggregatingTransform.cpp b/src/Processors/Transforms/AggregatingTransform.cpp
index 69eeb76bf53..4bd000797a6 100644
--- a/src/Processors/Transforms/AggregatingTransform.cpp
+++ b/src/Processors/Transforms/AggregatingTransform.cpp
@@ -5,6 +5,7 @@
 #include <QueryPipeline/Pipe.h>
 #include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
 #include <Core/ProtocolDefines.h>
+#include <Common/logger_useful.h>
 
 #include <Processors/Transforms/SquashingChunksTransform.h>
 
diff --git a/src/Processors/Transforms/AggregatingTransform.h b/src/Processors/Transforms/AggregatingTransform.h
index 83dfc01e6b0..38baa4d0394 100644
--- a/src/Processors/Transforms/AggregatingTransform.h
+++ b/src/Processors/Transforms/AggregatingTransform.h
@@ -6,6 +6,14 @@
 #include <Common/Stopwatch.h>
 #include <Common/setThreadName.h>
 #include <Common/scope_guard_safe.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/CurrentThread.h>
+
+namespace CurrentMetrics
+{
+    extern const Metric DestroyAggregatesThreads;
+    extern const Metric DestroyAggregatesThreadsActive;
+}
 
 namespace DB
 {
@@ -84,7 +92,10 @@ struct ManyAggregatedData
             // Aggregation states destruction may be very time-consuming.
             // In the case of a query with LIMIT, most states won't be destroyed during conversion to blocks.
             // Without the following code, they would be destroyed in the destructor of AggregatedDataVariants in the current thread (i.e. sequentially).
-            const auto pool = std::make_unique<ThreadPool>(variants.size());
+            const auto pool = std::make_unique<ThreadPool>(
+                CurrentMetrics::DestroyAggregatesThreads,
+                CurrentMetrics::DestroyAggregatesThreadsActive,
+                variants.size());
 
             for (auto && variant : variants)
             {
@@ -96,14 +107,14 @@ struct ManyAggregatedData
                 {
                     // variant is moved here and will be destroyed in the destructor of the lambda function.
                     pool->trySchedule(
-                        [variant = std::move(variant), thread_group = CurrentThread::getGroup()]()
+                        [my_variant = std::move(variant), thread_group = CurrentThread::getGroup()]()
                         {
                             SCOPE_EXIT_SAFE(
                                 if (thread_group)
-                                    CurrentThread::detachQueryIfNotDetached();
+                                    CurrentThread::detachFromGroupIfNotDetached();
                             );
                             if (thread_group)
-                                CurrentThread::attachToIfDetached(thread_group);
+                                CurrentThread::attachToGroupIfDetached(thread_group);
 
                             setThreadName("AggregDestruct");
                         });
diff --git a/src/Processors/Transforms/ColumnGathererTransform.cpp b/src/Processors/Transforms/ColumnGathererTransform.cpp
index 2628bf7d6db..7c2b93faa91 100644
--- a/src/Processors/Transforms/ColumnGathererTransform.cpp
+++ b/src/Processors/Transforms/ColumnGathererTransform.cpp
@@ -126,7 +126,7 @@ ColumnGathererTransform::ColumnGathererTransform(
     ReadBuffer & row_sources_buf_,
     size_t block_preferred_size_)
     : IMergingTransform<ColumnGathererStream>(
-        num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
+        num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
         num_inputs, row_sources_buf_, block_preferred_size_)
     , log(&Poco::Logger::get("ColumnGathererStream"))
 {
diff --git a/src/Processors/Transforms/CreatingSetsTransform.cpp b/src/Processors/Transforms/CreatingSetsTransform.cpp
index 6a8d08cb661..e3ae2d4fd4e 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.cpp
+++ b/src/Processors/Transforms/CreatingSetsTransform.cpp
@@ -4,8 +4,10 @@
 
 #include <Interpreters/Set.h>
 #include <Interpreters/IJoin.h>
+#include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
 
+#include <Common/logger_useful.h>
 #include <iomanip>
 
 
@@ -38,13 +40,52 @@ void CreatingSetsTransform::work()
     if (!is_initialized)
         init();
 
+    if (done_with_set && done_with_table)
+    {
+        finishConsume();
+        input.close();
+    }
+
     IAccumulatingTransform::work();
 }
 
 void CreatingSetsTransform::startSubquery()
 {
-    if (subquery.set)
-        LOG_TRACE(log, "Creating set.");
+    /// Lookup the set in the cache if we don't need to build table.
+    auto ctx = context.lock();
+    if (ctx && ctx->getPreparedSetsCache() && !subquery.table)
+    {
+        /// Try to find the set in the cache and wait for it to be built.
+        /// Retry if the set from cache fails to be built.
+        while (true)
+        {
+            auto from_cache = ctx->getPreparedSetsCache()->findOrPromiseToBuild(subquery.key);
+            if (from_cache.index() == 0)
+            {
+                promise_to_build = std::move(std::get<0>(from_cache));
+            }
+            else
+            {
+                LOG_TRACE(log, "Waiting for set to be build by another thread, key: {}", subquery.key);
+                SharedSet set_built_by_another_thread = std::move(std::get<1>(from_cache));
+                const SetPtr & ready_set = set_built_by_another_thread.get();
+                if (!ready_set)
+                {
+                    LOG_TRACE(log, "Failed to use set from cache, key: {}", subquery.key);
+                    continue;
+                }
+
+                subquery.promise_to_fill_set.set_value(ready_set);
+                subquery.set_in_progress.reset();
+                done_with_set = true;
+                set_from_cache = true;
+            }
+            break;
+        }
+    }
+
+    if (subquery.set_in_progress)
+        LOG_TRACE(log, "Creating set, key: {}", subquery.key);
     if (subquery.table)
         LOG_TRACE(log, "Filling temporary table.");
 
@@ -52,10 +93,10 @@ void CreatingSetsTransform::startSubquery()
         /// TODO: make via port
         table_out = QueryPipeline(subquery.table->write({}, subquery.table->getInMemoryMetadataPtr(), getContext()));
 
-    done_with_set = !subquery.set;
+    done_with_set = !subquery.set_in_progress;
     done_with_table = !subquery.table;
 
-    if (done_with_set /*&& done_with_join*/ && done_with_table)
+    if ((done_with_set && !set_from_cache) /*&& done_with_join*/ && done_with_table)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: nothing to do with subquery");
 
     if (table_out.initialized())
@@ -67,12 +108,16 @@ void CreatingSetsTransform::startSubquery()
 
 void CreatingSetsTransform::finishSubquery()
 {
-    if (read_rows != 0)
-    {
-        auto seconds = watch.elapsedNanoseconds() / 1e9;
+    auto seconds = watch.elapsedNanoseconds() / 1e9;
 
-        if (subquery.set)
-            LOG_DEBUG(log, "Created Set with {} entries from {} rows in {} sec.", subquery.set->getTotalRowCount(), read_rows, seconds);
+    if (set_from_cache)
+    {
+        LOG_DEBUG(log, "Got set from cache in {} sec.", seconds);
+    }
+    else if (read_rows != 0)
+    {
+        if (subquery.set_in_progress)
+            LOG_DEBUG(log, "Created Set with {} entries from {} rows in {} sec.", subquery.set_in_progress->getTotalRowCount(), read_rows, seconds);
         if (subquery.table)
             LOG_DEBUG(log, "Created Table with {} rows in {} sec.", read_rows, seconds);
     }
@@ -86,8 +131,10 @@ void CreatingSetsTransform::init()
 {
     is_initialized = true;
 
-    if (subquery.set)
-        subquery.set->setHeader(getInputPort().getHeader().getColumnsWithTypeAndName());
+    if (subquery.set_in_progress)
+    {
+        subquery.set_in_progress->setHeader(getInputPort().getHeader().getColumnsWithTypeAndName());
+    }
 
     watch.restart();
     startSubquery();
@@ -100,7 +147,7 @@ void CreatingSetsTransform::consume(Chunk chunk)
 
     if (!done_with_set)
     {
-        if (!subquery.set->insertFromBlock(block.getColumnsWithTypeAndName()))
+        if (!subquery.set_in_progress->insertFromBlock(block.getColumnsWithTypeAndName()))
             done_with_set = true;
     }
 
@@ -123,8 +170,13 @@ void CreatingSetsTransform::consume(Chunk chunk)
 
 Chunk CreatingSetsTransform::generate()
 {
-    if (subquery.set)
-        subquery.set->finishInsert();
+    if (subquery.set_in_progress)
+    {
+        subquery.set_in_progress->finishInsert();
+        subquery.promise_to_fill_set.set_value(subquery.set_in_progress);
+        if (promise_to_build)
+            promise_to_build->set_value(subquery.set_in_progress);
+    }
 
     if (table_out.initialized())
     {
diff --git a/src/Processors/Transforms/CreatingSetsTransform.h b/src/Processors/Transforms/CreatingSetsTransform.h
index ca59fb9e220..26bbc45933d 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.h
+++ b/src/Processors/Transforms/CreatingSetsTransform.h
@@ -43,10 +43,12 @@ public:
 
 private:
     SubqueryForSet subquery;
+    std::optional<std::promise<SetPtr>> promise_to_build;
 
     QueryPipeline table_out;
     std::unique_ptr<PushingPipelineExecutor> executor;
     UInt64 read_rows = 0;
+    bool set_from_cache = false;
     Stopwatch watch;
 
     bool done_with_set = true;
diff --git a/src/Processors/Transforms/FillingTransform.cpp b/src/Processors/Transforms/FillingTransform.cpp
index e0c79d50141..e75f83b8c80 100644
--- a/src/Processors/Transforms/FillingTransform.cpp
+++ b/src/Processors/Transforms/FillingTransform.cpp
@@ -8,11 +8,29 @@
 #include <Functions/FunctionDateOrDateTimeAddInterval.h>
 #include <Common/FieldVisitorSum.h>
 #include <Common/FieldVisitorToString.h>
+#include <Common/logger_useful.h>
 
 
 namespace DB
 {
 
+constexpr bool debug_logging_enabled = false;
+
+template <typename T>
+void logDebug(String key, const T & value, const char * separator = " : ")
+{
+    if constexpr (debug_logging_enabled)
+    {
+        WriteBufferFromOwnString ss;
+        if constexpr (std::is_pointer_v<T>)
+            ss << *value;
+        else
+            ss << value;
+
+        LOG_DEBUG(&Poco::Logger::get("FillingTransform"), "{}{}{}", key, separator, ss.str());
+    }
+}
+
 namespace ErrorCodes
 {
     extern const int INVALID_WITH_FILL_EXPRESSION;
@@ -169,29 +187,31 @@ static bool tryConvertFields(FillColumnDescription & descr, const DataTypePtr &
 }
 
 FillingTransform::FillingTransform(
-        const Block & header_, const SortDescription & sort_description_, InterpolateDescriptionPtr interpolate_description_, bool on_totals_)
-        : ISimpleTransform(header_, transformHeader(header_, sort_description_), true)
-        , sort_description(sort_description_)
-        , interpolate_description(interpolate_description_)
-        , on_totals(on_totals_)
-        , filling_row(sort_description_)
-        , next_row(sort_description_)
+    const Block & header_,
+    const SortDescription & sort_description_,
+    const SortDescription & fill_description_,
+    InterpolateDescriptionPtr interpolate_description_,
+    const bool use_with_fill_by_sorting_prefix_)
+    : ISimpleTransform(header_, transformHeader(header_, fill_description_), true)
+    , sort_description(sort_description_)
+    , fill_description(fill_description_)
+    , interpolate_description(interpolate_description_)
+    , filling_row(fill_description_)
+    , next_row(fill_description_)
+    , use_with_fill_by_sorting_prefix(use_with_fill_by_sorting_prefix_)
 {
-    if (on_totals)
-        return;
-
     if (interpolate_description)
         interpolate_actions = std::make_shared<ExpressionActions>(interpolate_description->actions);
 
     std::vector<bool> is_fill_column(header_.columns());
-    for (size_t i = 0, size = sort_description.size(); i < size; ++i)
+    for (size_t i = 0, size = fill_description.size(); i < size; ++i)
     {
-        if (interpolate_description && interpolate_description->result_columns_set.contains(sort_description[i].column_name))
+        if (interpolate_description && interpolate_description->result_columns_set.contains(fill_description[i].column_name))
             throw Exception(ErrorCodes::INVALID_WITH_FILL_EXPRESSION,
                 "Column '{}' is participating in ORDER BY ... WITH FILL expression and can't be INTERPOLATE output",
-                sort_description[i].column_name);
+                fill_description[i].column_name);
 
-        size_t block_position = header_.getPositionByName(sort_description[i].column_name);
+        size_t block_position = header_.getPositionByName(fill_description[i].column_name);
         is_fill_column[block_position] = true;
         fill_column_positions.push_back(block_position);
 
@@ -212,21 +232,40 @@ FillingTransform::FillingTransform(
                 "WITH FILL bound values cannot be negative for unsigned type {}", type->getName());
         }
     }
+    logDebug("fill description", dumpSortDescription(fill_description));
 
     std::set<size_t> unique_positions;
     for (auto pos : fill_column_positions)
         if (!unique_positions.insert(pos).second)
             throw Exception(ErrorCodes::INVALID_WITH_FILL_EXPRESSION, "Multiple WITH FILL for identical expressions is not supported in ORDER BY");
 
+    if (use_with_fill_by_sorting_prefix)
+    {
+        /// build sorting prefix for first fill column
+        for (const auto & desc : sort_description)
+        {
+            if (desc.column_name == fill_description[0].column_name)
+                break;
+
+            size_t pos = header_.getPositionByName(desc.column_name);
+            sort_prefix_positions.push_back(pos);
+
+            sort_prefix.push_back(desc);
+        }
+        logDebug("sort prefix", dumpSortDescription(sort_prefix));
+        last_range_sort_prefix.reserve(sort_prefix.size());
+    }
+
     size_t idx = 0;
     for (const ColumnWithTypeAndName & column : header_.getColumnsWithTypeAndName())
     {
         if (interpolate_description)
             if (const auto & p = interpolate_description->required_columns_map.find(column.name);
                 p != interpolate_description->required_columns_map.end())
-                    input_positions.emplace_back(idx, p->second);
+                input_positions.emplace_back(idx, p->second);
 
-        if (!is_fill_column[idx] && !(interpolate_description && interpolate_description->result_columns_set.contains(column.name)))
+        if (!is_fill_column[idx] && !(interpolate_description && interpolate_description->result_columns_set.contains(column.name))
+            && sort_prefix_positions.end() == std::find(sort_prefix_positions.begin(), sort_prefix_positions.end(), idx))
             other_column_positions.push_back(idx);
 
         ++idx;
@@ -235,167 +274,341 @@ FillingTransform::FillingTransform(
     if (interpolate_description)
         for (const auto & name : interpolate_description->result_columns_order)
             interpolate_column_positions.push_back(header_.getPositionByName(name));
+
+    /// check conflict in positions between interpolate and sorting prefix columns
+    if (!sort_prefix_positions.empty() && !interpolate_column_positions.empty())
+    {
+        std::unordered_set<size_t> interpolate_positions(interpolate_column_positions.begin(), interpolate_column_positions.end());
+        for (auto sort_prefix_pos : sort_prefix_positions)
+        {
+            if (interpolate_positions.contains(sort_prefix_pos))
+                throw Exception(
+                    ErrorCodes::INVALID_WITH_FILL_EXPRESSION,
+                    "The same column in ORDER BY before WITH FILL (sorting prefix) and INTERPOLATE is not allowed. Column: {}",
+                    (header_.begin() + sort_prefix_pos)->name);
+        }
+    }
 }
 
+/// prepare() is overrididen to call transform() after all chunks are processed
+/// it can be necessary for suffix generation in case of WITH FILL .. TO is provided
 IProcessor::Status FillingTransform::prepare()
 {
-    if (!on_totals && input.isFinished() && !output.isFinished() && !has_input && !generate_suffix)
+    if (input.isFinished() && !output.isFinished() && !has_input && !all_chunks_processed)
     {
-        should_insert_first = next_row < filling_row || first;
+        logDebug("prepare()", "all chunks processed");
+        all_chunks_processed = true;
 
-        for (size_t i = 0, size = filling_row.size(); i < size; ++i)
-            next_row[i] = filling_row.getFillDescription(i).fill_to;
-
-        if (first || filling_row < next_row)
+        /// push output data to output port if we can
+        if (has_output && output.canPush())
         {
-            /// Output if has data.
-            if (has_output)
-            {
-                output.pushData(std::move(output_data));
-                has_output = false;
-            }
-
-            generate_suffix = true;
-            return Status::Ready;
+            output.pushData(std::move(output_data));
+            has_output = false;
         }
+
+        /// return Ready to call transform() for generating filling rows after latest chunk was processed
+        return Status::Ready;
     }
 
     return ISimpleTransform::prepare();
 }
 
-
-void FillingTransform::transform(Chunk & chunk)
+void FillingTransform::interpolate(const MutableColumns & result_columns, Block & interpolate_block)
 {
-    if (on_totals)
-        return;
-
-    if (!chunk.hasRows() && !generate_suffix)
-        return;
-
-    Columns old_fill_columns;
-    Columns old_interpolate_columns;
-    Columns old_other_columns;
-    MutableColumns res_fill_columns;
-    MutableColumns res_interpolate_columns;
-    MutableColumns res_other_columns;
-
-    std::vector<std::pair<MutableColumns *, size_t>> res_map;
-    res_map.resize(input.getHeader().columns());
-
-    auto init_columns_by_positions = [&res_map](const Columns & old_columns, Columns & new_columns,
-        MutableColumns & new_mutable_columns, const Positions & positions)
+    if (interpolate_description)
     {
-        for (size_t pos : positions)
+        interpolate_block.clear();
+
+        if (!input_positions.empty())
         {
-            auto old_column = old_columns[pos]->convertToFullColumnIfConst();
-            new_columns.push_back(old_column);
-            res_map[pos] = {&new_mutable_columns, new_mutable_columns.size()};
-            new_mutable_columns.push_back(old_column->cloneEmpty()->assumeMutable());
-        }
-    };
-
-    Block interpolate_block;
-
-    auto interpolate = [&]()
-    {
-        if (interpolate_description)
-        {
-            interpolate_block.clear();
-
-            if (!input_positions.empty())
+            /// populate calculation block with required columns with values from previous row
+            for (const auto & [col_pos, name_type] : input_positions)
             {
-                /// populate calculation block with required columns with values from previous row
-                for (const auto & [col_pos, name_type] : input_positions)
+                MutableColumnPtr column = name_type.type->createColumn();
+                const auto * res_column = result_columns[col_pos].get();
+                size_t size = res_column->size();
+                if (size == 0) /// this is the first row in current chunk
                 {
-                    MutableColumnPtr column = name_type.type->createColumn();
-                    auto [res_columns, pos] = res_map[col_pos];
-                    size_t size = (*res_columns)[pos]->size();
-                    if (size == 0) /// this is the first row in current chunk
-                    {
-                        /// take value from last row of previous chunk if exists, else use default
-                        if (last_row.size() > col_pos && !last_row[col_pos]->empty())
-                            column->insertFrom(*last_row[col_pos], 0);
-                        else
-                            column->insertDefault();
-                    }
-                    else /// take value from previous row of current chunk
-                        column->insertFrom(*(*res_columns)[pos], size - 1);
-
-                    interpolate_block.insert({std::move(column), name_type.type, name_type.name});
+                    /// take value from last row of previous chunk if exists, else use default
+                    if (last_row.size() > col_pos && !last_row[col_pos]->empty())
+                        column->insertFrom(*last_row[col_pos], 0);
+                    else
+                        column->insertDefault();
                 }
-                interpolate_actions->execute(interpolate_block);
-            }
-            else /// all INTERPOLATE expressions are constants
-            {
-                size_t n = 1;
-                interpolate_actions->execute(interpolate_block, n);
-            }
-        }
-    };
+                else /// take value from previous row of current chunk
+                    column->insertFrom(*res_column, size - 1);
 
-    if (generate_suffix)
+                interpolate_block.insert({std::move(column), name_type.type, name_type.name});
+            }
+            interpolate_actions->execute(interpolate_block);
+        }
+        else /// all INTERPOLATE expressions are constants
+        {
+            size_t n = 1;
+            interpolate_actions->execute(interpolate_block, n);
+        }
+    }
+}
+
+using MutableColumnRawPtrs = std::vector<IColumn*>;
+
+void FillingTransform::insertFromFillingRow(
+    const MutableColumnRawPtrs & filling_columns,
+    const MutableColumnRawPtrs & interpolate_columns,
+    const MutableColumnRawPtrs & other_columns,
+    const Block & interpolate_block)
+{
+    logDebug("insertFromFillingRow", filling_row);
+
+    for (size_t i = 0, size = filling_columns.size(); i < size; ++i)
     {
-        const auto & empty_columns = input.getHeader().getColumns();
-        init_columns_by_positions(empty_columns, old_fill_columns, res_fill_columns, fill_column_positions);
-        init_columns_by_positions(empty_columns, old_interpolate_columns, res_interpolate_columns, interpolate_column_positions);
-        init_columns_by_positions(empty_columns, old_other_columns, res_other_columns, other_column_positions);
-
-        if (first)
-            filling_row.initFromDefaults();
-
-        if (should_insert_first && filling_row < next_row)
-        {
-            interpolate();
-            insertFromFillingRow(res_fill_columns, res_interpolate_columns, res_other_columns, filling_row, interpolate_block);
-        }
-
-        interpolate();
-        while (filling_row.next(next_row))
-        {
-            insertFromFillingRow(res_fill_columns, res_interpolate_columns, res_other_columns, filling_row, interpolate_block);
-            interpolate();
-        }
-
-        setResultColumns(chunk, res_fill_columns, res_interpolate_columns, res_other_columns);
-        return;
+        if (filling_row[i].isNull())
+            filling_columns[i]->insertDefault();
+        else
+            filling_columns[i]->insert(filling_row[i]);
     }
 
-    size_t num_rows = chunk.getNumRows();
-    auto old_columns = chunk.detachColumns();
-
-    init_columns_by_positions(old_columns, old_fill_columns, res_fill_columns, fill_column_positions);
-    init_columns_by_positions(old_columns, old_interpolate_columns, res_interpolate_columns, interpolate_column_positions);
-    init_columns_by_positions(old_columns, old_other_columns, res_other_columns, other_column_positions);
-
-    if (first)
+    if (size_t size = interpolate_block.columns())
     {
+        Columns columns = interpolate_block.getColumns();
+        for (size_t i = 0; i < size; ++i)
+            interpolate_columns[i]->insertFrom(*columns[i]->convertToFullColumnIfConst(), 0);
+    }
+    else
+    {
+        for (auto * interpolate_column : interpolate_columns)
+            interpolate_column->insertDefault();
+    }
+
+    for (auto * other_column : other_columns)
+        other_column->insertDefault();
+
+    filling_row_inserted = true;
+}
+
+static void copyRowFromColumns(const MutableColumnRawPtrs & dest, const Columns & source, size_t row_num)
+{
+    chassert(dest.size() == source.size());
+
+    for (size_t i = 0, size = source.size(); i < size; ++i)
+        dest[i]->insertFrom(*source[i], row_num);
+}
+
+static void initColumnsByPositions(
+    const Columns & input_columns,
+    Columns & input_columns_by_positions,
+    const MutableColumns & output_columns,
+    MutableColumnRawPtrs & output_columns_by_position,
+    const std::vector<size_t> & positions)
+{
+    for (const size_t pos : positions)
+    {
+        input_columns_by_positions.push_back(input_columns[pos]);
+        output_columns_by_position.push_back(output_columns[pos].get());
+    }
+}
+
+void FillingTransform::initColumns(
+    const Columns & input_columns,
+    Columns & input_fill_columns,
+    Columns & input_interpolate_columns,
+    Columns & input_sort_prefix_columns,
+    Columns & input_other_columns,
+    MutableColumns & output_columns,
+    MutableColumnRawPtrs & output_fill_columns,
+    MutableColumnRawPtrs & output_interpolate_columns,
+    MutableColumnRawPtrs & output_sort_prefix_columns,
+    MutableColumnRawPtrs & output_other_columns)
+{
+    Columns non_const_columns;
+    non_const_columns.reserve(input_columns.size());
+
+    for (const auto & column : input_columns)
+        non_const_columns.push_back(column->convertToFullColumnIfConst());
+
+    for (const auto & column : non_const_columns)
+        output_columns.push_back(column->cloneEmpty()->assumeMutable());
+
+    initColumnsByPositions(non_const_columns, input_fill_columns, output_columns, output_fill_columns, fill_column_positions);
+    initColumnsByPositions(
+        non_const_columns, input_interpolate_columns, output_columns, output_interpolate_columns, interpolate_column_positions);
+    initColumnsByPositions(non_const_columns, input_sort_prefix_columns, output_columns, output_sort_prefix_columns, sort_prefix_positions);
+    initColumnsByPositions(non_const_columns, input_other_columns, output_columns, output_other_columns, other_column_positions);
+}
+
+bool FillingTransform::generateSuffixIfNeeded(const Columns & input_columns, MutableColumns & result_columns)
+{
+    Columns input_fill_columns;
+    Columns input_interpolate_columns;
+    Columns input_sort_prefix_columns;
+    Columns input_other_columns;
+    MutableColumnRawPtrs res_fill_columns;
+    MutableColumnRawPtrs res_interpolate_columns;
+    MutableColumnRawPtrs res_sort_prefix_columns;
+    MutableColumnRawPtrs res_other_columns;
+
+    initColumns(
+        input_columns,
+        input_fill_columns,
+        input_interpolate_columns,
+        input_sort_prefix_columns,
+        input_other_columns,
+        result_columns,
+        res_fill_columns,
+        res_interpolate_columns,
+        res_sort_prefix_columns,
+        res_other_columns);
+
+    return generateSuffixIfNeeded(result_columns, res_fill_columns, res_interpolate_columns, res_sort_prefix_columns, res_other_columns);
+}
+
+bool FillingTransform::generateSuffixIfNeeded(
+    const MutableColumns & result_columns,
+    MutableColumnRawPtrs res_fill_columns,
+    MutableColumnRawPtrs res_interpolate_columns,
+    MutableColumnRawPtrs res_sort_prefix_columns,
+    MutableColumnRawPtrs res_other_columns)
+{
+    logDebug("generateSuffixIfNeeded() filling_row", filling_row);
+    logDebug("generateSuffixIfNeeded() next_row", next_row);
+
+    /// Determines if we should insert filling row before start generating next rows
+    bool should_insert_first = (next_row < filling_row && !filling_row_inserted) || next_row.isNull();
+    logDebug("should_insert_first", should_insert_first);
+
+    for (size_t i = 0, size = filling_row.size(); i < size; ++i)
+        next_row[i] = filling_row.getFillDescription(i).fill_to;
+
+    logDebug("generateSuffixIfNeeded() next_row updated", next_row);
+
+    if (filling_row >= next_row)
+    {
+        logDebug("generateSuffixIfNeeded()", "no need to generate suffix");
+        return false;
+    }
+
+    Block interpolate_block;
+    if (should_insert_first && filling_row < next_row)
+    {
+        interpolate(result_columns, interpolate_block);
+        insertFromFillingRow(res_fill_columns, res_interpolate_columns, res_other_columns, interpolate_block);
+        /// fulfill sort prefix columns with last row values or defaults
+        if (!last_range_sort_prefix.empty())
+            copyRowFromColumns(res_sort_prefix_columns, last_range_sort_prefix, 0);
+        else
+            for (auto * sort_prefix_column : res_sort_prefix_columns)
+                sort_prefix_column->insertDefault();
+    }
+
+    bool filling_row_changed = false;
+    while (true)
+    {
+        const auto [apply, changed] = filling_row.next(next_row);
+        filling_row_changed = changed;
+        if (!apply)
+            break;
+
+        interpolate(result_columns, interpolate_block);
+        insertFromFillingRow(res_fill_columns, res_interpolate_columns, res_other_columns, interpolate_block);
+        /// fulfill sort prefix columns with last row values or defaults
+        if (!last_range_sort_prefix.empty())
+            copyRowFromColumns(res_sort_prefix_columns, last_range_sort_prefix, 0);
+        else
+            for (auto * sort_prefix_column : res_sort_prefix_columns)
+                sort_prefix_column->insertDefault();
+    }
+    /// new valid filling row was generated but not inserted
+    if (filling_row_changed)
+        filling_row_inserted = false;
+
+    return true;
+}
+
+template <typename Predicate>
+size_t getRangeEnd(size_t begin, size_t end, Predicate pred)
+{
+    chassert(begin < end);
+
+    const size_t linear_probe_threadhold = 16;
+    size_t linear_probe_end = begin + linear_probe_threadhold;
+    if (linear_probe_end > end)
+        linear_probe_end = end;
+
+    for (size_t pos = begin; pos < linear_probe_end; ++pos)
+    {
+        if (!pred(begin, pos))
+            return pos;
+    }
+
+    size_t low = linear_probe_end;
+    size_t high = end - 1;
+    while (low <= high)
+    {
+        size_t mid = low + (high - low) / 2;
+        if (pred(begin, mid))
+            low = mid + 1;
+        else
+        {
+            high = mid - 1;
+            end = mid;
+        }
+    }
+    return end;
+}
+
+void FillingTransform::transformRange(
+    const Columns & input_fill_columns,
+    const Columns & input_interpolate_columns,
+    const Columns & input_sort_prefix_columns,
+    const Columns & input_other_columns,
+    const MutableColumns & result_columns,
+    const MutableColumnRawPtrs & res_fill_columns,
+    const MutableColumnRawPtrs & res_interpolate_columns,
+    const MutableColumnRawPtrs & res_sort_prefix_columns,
+    const MutableColumnRawPtrs & res_other_columns,
+    std::pair<size_t, size_t> range,
+    const bool new_sorting_prefix)
+{
+    const size_t range_begin = range.first;
+    const size_t range_end = range.second;
+
+    Block interpolate_block;
+    if (new_sorting_prefix)
+    {
+        logDebug("--- new range ---", range_end);
         for (size_t i = 0, size = filling_row.size(); i < size; ++i)
         {
-            auto current_value = (*old_fill_columns[i])[0];
+            const auto current_value = (*input_fill_columns[i])[range_begin];
             const auto & fill_from = filling_row.getFillDescription(i).fill_from;
 
             if (!fill_from.isNull() && !equals(current_value, fill_from))
             {
                 filling_row.initFromDefaults(i);
+                filling_row_inserted = false;
                 if (less(fill_from, current_value, filling_row.getDirection(i)))
                 {
-                    interpolate();
-                    insertFromFillingRow(res_fill_columns, res_interpolate_columns, res_other_columns, filling_row, interpolate_block);
+                    interpolate(result_columns, interpolate_block);
+                    insertFromFillingRow(res_fill_columns, res_interpolate_columns, res_other_columns, interpolate_block);
+                    copyRowFromColumns(res_sort_prefix_columns, input_sort_prefix_columns, range_begin);
                 }
                 break;
             }
             filling_row[i] = current_value;
         }
-        first = false;
     }
 
-    for (size_t row_ind = 0; row_ind < num_rows; ++row_ind)
+    for (size_t row_ind = range_begin; row_ind < range_end; ++row_ind)
     {
-        should_insert_first = next_row < filling_row;
+        logDebug("row", row_ind);
+        logDebug("filling_row", filling_row);
+        logDebug("next_row", next_row);
 
-        for (size_t i = 0; i < filling_row.size(); ++i)
+        bool should_insert_first = next_row < filling_row;
+        logDebug("should_insert_first", should_insert_first);
+
+        for (size_t i = 0, size = filling_row.size(); i < size; ++i)
         {
-            auto current_value = (*old_fill_columns[i])[row_ind];
+            const auto current_value = (*input_fill_columns[i])[row_ind];
             const auto & fill_to = filling_row.getFillDescription(i).fill_to;
 
             if (fill_to.isNull() || less(current_value, fill_to, filling_row.getDirection(i)))
@@ -403,76 +616,215 @@ void FillingTransform::transform(Chunk & chunk)
             else
                 next_row[i] = fill_to;
         }
+        logDebug("next_row updated", next_row);
 
-        /// A case, when at previous step row was initialized from defaults 'fill_from' values
-        ///  and probably we need to insert it to block.
+        /// The condition is true when filling row is initialized by value(s) in FILL FROM,
+        /// and there are row(s) in current range with value(s) < then in the filling row.
+        /// It can happen only once for a range.
         if (should_insert_first && filling_row < next_row)
         {
-            interpolate();
-            insertFromFillingRow(res_fill_columns, res_interpolate_columns, res_other_columns, filling_row, interpolate_block);
+            interpolate(result_columns, interpolate_block);
+            insertFromFillingRow(res_fill_columns, res_interpolate_columns, res_other_columns, interpolate_block);
+            copyRowFromColumns(res_sort_prefix_columns, input_sort_prefix_columns, row_ind);
         }
 
-        interpolate();
-        while (filling_row.next(next_row))
+        bool filling_row_changed = false;
+        while (true)
         {
-            insertFromFillingRow(res_fill_columns, res_interpolate_columns, res_other_columns, filling_row, interpolate_block);
-            interpolate();
-        }
+            const auto [apply, changed] = filling_row.next(next_row);
+            filling_row_changed = changed;
+            if (!apply)
+                break;
 
-        copyRowFromColumns(res_fill_columns, old_fill_columns, row_ind);
-        copyRowFromColumns(res_interpolate_columns, old_interpolate_columns, row_ind);
-        copyRowFromColumns(res_other_columns, old_other_columns, row_ind);
+            interpolate(result_columns, interpolate_block);
+            insertFromFillingRow(res_fill_columns, res_interpolate_columns, res_other_columns, interpolate_block);
+            copyRowFromColumns(res_sort_prefix_columns, input_sort_prefix_columns, row_ind);
+        }
+        /// new valid filling row was generated but not inserted, will use it during suffix generation
+        if (filling_row_changed)
+            filling_row_inserted = false;
+
+        logDebug("filling_row after", filling_row);
+
+        copyRowFromColumns(res_fill_columns, input_fill_columns, row_ind);
+        copyRowFromColumns(res_interpolate_columns, input_interpolate_columns, row_ind);
+        copyRowFromColumns(res_sort_prefix_columns, input_sort_prefix_columns, row_ind);
+        copyRowFromColumns(res_other_columns, input_other_columns, row_ind);
     }
 
-    saveLastRow(res_fill_columns, res_interpolate_columns, res_other_columns);
-    setResultColumns(chunk, res_fill_columns, res_interpolate_columns, res_other_columns);
+    /// save sort prefix of last row in the range, it's used to generate suffix
+    last_range_sort_prefix.clear();
+    for (const auto & sort_prefix_column : input_sort_prefix_columns)
+    {
+        auto column = sort_prefix_column->cloneEmpty();
+        column->insertFrom(*sort_prefix_column, range_end - 1);
+        last_range_sort_prefix.push_back(std::move(column));
+    }
 }
 
-void FillingTransform::setResultColumns(Chunk & chunk, MutableColumns & fill_columns, MutableColumns & interpolate_columns, MutableColumns & other_columns) const
+void FillingTransform::transform(Chunk & chunk)
 {
-    MutableColumns result_columns(fill_columns.size() + interpolate_columns.size() + other_columns.size());
-    /// fill_columns always non-empty.
-    size_t num_rows = fill_columns[0]->size();
+    logDebug("new chunk rows", chunk.getNumRows());
+    logDebug("all chunks processed", all_chunks_processed);
 
-    for (size_t i = 0, size = fill_columns.size(); i < size; ++i)
-        result_columns[fill_column_positions[i]] = std::move(fill_columns[i]);
-    for (size_t i = 0, size = interpolate_columns.size(); i < size; ++i)
-        result_columns[interpolate_column_positions[i]] = std::move(interpolate_columns[i]);
-    for (size_t i = 0, size = other_columns.size(); i < size; ++i)
-        result_columns[other_column_positions[i]] = std::move(other_columns[i]);
+    /// if got chunk with no rows and it's not for suffix generation, then just skip it
+    /// Note: ExpressionTransform can return chunk with no rows, see 02579_fill_empty_chunk.sql for example
+    if (!chunk.hasRows() && !all_chunks_processed)
+        return;
 
-    chunk.setColumns(std::move(result_columns), num_rows);
+    Columns input_fill_columns;
+    Columns input_interpolate_columns;
+    Columns input_sort_prefix_columns;
+    Columns input_other_columns;
+    MutableColumnRawPtrs res_fill_columns;
+    MutableColumnRawPtrs res_interpolate_columns;
+    MutableColumnRawPtrs res_sort_prefix_columns;
+    MutableColumnRawPtrs res_other_columns;
+    MutableColumns result_columns;
+
+    Block interpolate_block;
+
+    if (all_chunks_processed)
+    {
+        chassert(!chunk.hasRows());
+
+        /// if all chunks are processed, then we may need to generate suffix for the following cases:
+        /// (1) when all data are processed and WITH FILL .. TO is provided
+        /// (2) for empty result set when WITH FILL FROM .. TO is provided (see PR #30888)
+
+        /// if no data was processed, then need to initialize filling_row
+        if (last_row.empty())
+        {
+            filling_row.initFromDefaults();
+            filling_row_inserted = false;
+        }
+
+        if (generateSuffixIfNeeded(input.getHeader().getColumns(), result_columns))
+        {
+            size_t num_output_rows = result_columns[0]->size();
+            chunk.setColumns(std::move(result_columns), num_output_rows);
+        }
+
+        return;
+    }
+
+    chassert(chunk.hasRows());
+
+    const size_t num_rows = chunk.getNumRows();
+    auto input_columns = chunk.detachColumns();
+    initColumns(
+        input_columns,
+        input_fill_columns,
+        input_interpolate_columns,
+        input_sort_prefix_columns,
+        input_other_columns,
+        result_columns,
+        res_fill_columns,
+        res_interpolate_columns,
+        res_sort_prefix_columns,
+        res_other_columns);
+
+    if (sort_prefix.empty() || !use_with_fill_by_sorting_prefix)
+    {
+        transformRange(
+            input_fill_columns,
+            input_interpolate_columns,
+            input_sort_prefix_columns,
+            input_other_columns,
+            result_columns,
+            res_fill_columns,
+            res_interpolate_columns,
+            res_sort_prefix_columns,
+            res_other_columns,
+            {0, num_rows},
+            last_row.empty());
+
+        saveLastRow(result_columns);
+        size_t num_output_rows = result_columns[0]->size();
+        chunk.setColumns(std::move(result_columns), num_output_rows);
+        return;
+    }
+
+    /// check if last row in prev chunk had the same sorting prefix as the first in new one
+    /// if not, we need to reinitialize filling row
+    bool new_sort_prefix = last_row.empty();
+    if (!last_row.empty())
+    {
+        ColumnRawPtrs last_sort_prefix_columns;
+        last_sort_prefix_columns.reserve(sort_prefix.size());
+        for (size_t pos : sort_prefix_positions)
+            last_sort_prefix_columns.push_back(last_row[pos].get());
+
+        new_sort_prefix = false;
+        for (size_t i = 0; i < input_sort_prefix_columns.size(); ++i)
+        {
+            const int res = input_sort_prefix_columns[i]->compareAt(0, 0, *last_sort_prefix_columns[i], sort_prefix[i].nulls_direction);
+            if (res != 0)
+            {
+                new_sort_prefix = true;
+                break;
+            }
+        }
+    }
+
+    for (size_t row_ind = 0; row_ind < num_rows;)
+    {
+        /// find next range
+        auto current_sort_prefix_end_pos = getRangeEnd(
+            row_ind,
+            num_rows,
+            [&](size_t pos_with_current_sort_prefix, size_t row_pos)
+            {
+                for (size_t i = 0; i < input_sort_prefix_columns.size(); ++i)
+                {
+                    const int res = input_sort_prefix_columns[i]->compareAt(
+                        pos_with_current_sort_prefix, row_pos, *input_sort_prefix_columns[i], sort_prefix[i].nulls_direction);
+                    if (res != 0)
+                        return false;
+                }
+                return true;
+            });
+
+        /// generate suffix for the previous range
+        if (!last_range_sort_prefix.empty() && new_sort_prefix)
+            generateSuffixIfNeeded(result_columns, res_fill_columns, res_interpolate_columns, res_sort_prefix_columns, res_other_columns);
+
+        transformRange(
+            input_fill_columns,
+            input_interpolate_columns,
+            input_sort_prefix_columns,
+            input_other_columns,
+            result_columns,
+            res_fill_columns,
+            res_interpolate_columns,
+            res_sort_prefix_columns,
+            res_other_columns,
+            {row_ind, current_sort_prefix_end_pos},
+            new_sort_prefix);
+
+        logDebug("range end", current_sort_prefix_end_pos);
+        row_ind = current_sort_prefix_end_pos;
+        new_sort_prefix = true;
+    }
+
+    saveLastRow(result_columns);
+    size_t num_output_rows = result_columns[0]->size();
+    chunk.setColumns(std::move(result_columns), num_output_rows);
 }
 
-void FillingTransform::saveLastRow(const MutableColumns & fill_columns, const MutableColumns & interpolate_columns, const MutableColumns & other_columns)
+void FillingTransform::saveLastRow(const MutableColumns & result_columns)
 {
     last_row.clear();
-    last_row.resize(fill_columns.size() + interpolate_columns.size() + other_columns.size());
 
-    size_t num_rows = fill_columns[0]->size();
+    const size_t num_rows = result_columns[0]->size();
     if (num_rows == 0)
         return;
 
-    for (size_t i = 0, size = fill_columns.size(); i < size; ++i)
+    for (const auto & result_column : result_columns)
     {
-        auto column = fill_columns[i]->cloneEmpty();
-        column->insertFrom(*fill_columns[i], num_rows - 1);
-        last_row[fill_column_positions[i]] = std::move(column);
-    }
-
-    for (size_t i = 0, size = interpolate_columns.size(); i < size; ++i)
-    {
-        auto column = interpolate_columns[i]->cloneEmpty();
-        column->insertFrom(*interpolate_columns[i], num_rows - 1);
-        last_row[interpolate_column_positions[i]] = std::move(column);
-    }
-
-    for (size_t i = 0, size = other_columns.size(); i < size; ++i)
-    {
-        auto column = other_columns[i]->cloneEmpty();
-        column->insertFrom(*other_columns[i], num_rows - 1);
-        last_row[other_column_positions[i]] = std::move(column);
+        auto column = result_column->cloneEmpty();
+        column->insertFrom(*result_column, num_rows - 1);
+        last_row.push_back(std::move(column));
     }
 }
-
 }
diff --git a/src/Processors/Transforms/FillingTransform.h b/src/Processors/Transforms/FillingTransform.h
index 7b41ab795d1..85da544ef2d 100644
--- a/src/Processors/Transforms/FillingTransform.h
+++ b/src/Processors/Transforms/FillingTransform.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <Processors/ISimpleTransform.h>
-#include <Core/SortDescription.h>
 #include <Core/InterpolateDescription.h>
+#include <Core/SortDescription.h>
 #include <Interpreters/FillingRow.h>
+#include <Processors/ISimpleTransform.h>
 
 
 namespace DB
@@ -16,7 +16,12 @@ namespace DB
 class FillingTransform : public ISimpleTransform
 {
 public:
-    FillingTransform(const Block & header_, const SortDescription & sort_description_, InterpolateDescriptionPtr interpolate_description_, bool on_totals_);
+    FillingTransform(
+        const Block & header_,
+        const SortDescription & sort_description_,
+        const SortDescription & fill_description_,
+        InterpolateDescriptionPtr interpolate_description_,
+        bool use_with_fill_by_sorting_prefix_);
 
     String getName() const override { return "FillingTransform"; }
 
@@ -25,32 +30,84 @@ public:
     static Block transformHeader(Block header, const SortDescription & sort_description);
 
 protected:
-    void transform(Chunk & Chunk) override;
+    void transform(Chunk & chunk) override;
 
 private:
-    void setResultColumns(Chunk & chunk, MutableColumns & fill_columns, MutableColumns & interpolate_columns, MutableColumns & other_columns) const;
-    void saveLastRow(const MutableColumns & fill_columns, const MutableColumns & interpolate_columns, const MutableColumns & other_columns);
+    using MutableColumnRawPtrs = std::vector<IColumn *>;
+    void transformRange(
+        const Columns & input_fill_columns,
+        const Columns & input_interpolate_columns,
+        const Columns & input_sort_prefix_columns,
+        const Columns & input_other_columns,
+        const MutableColumns & result_columns,
+        const MutableColumnRawPtrs & res_fill_columns,
+        const MutableColumnRawPtrs & res_interpolate_columns,
+        const MutableColumnRawPtrs & res_sort_prefix_columns,
+        const MutableColumnRawPtrs & res_other_columns,
+        std::pair<size_t, size_t> range,
+        bool new_sorting_prefix);
 
-    const SortDescription sort_description; /// Contains only columns with WITH FILL.
+    void saveLastRow(const MutableColumns & result_columns);
+    void interpolate(const MutableColumns & result_columns, Block & interpolate_block);
+
+    void initColumns(
+        const Columns & input_columns,
+        Columns & input_fill_columns,
+        Columns & input_interpolate_columns,
+        Columns & input_sort_prefix_columns,
+        Columns & input_other_columns,
+        MutableColumns & output_columns,
+        MutableColumnRawPtrs & output_fill_columns,
+        MutableColumnRawPtrs & output_interpolate_columns,
+        MutableColumnRawPtrs & output_sort_prefix_columns,
+        MutableColumnRawPtrs & output_other_columns);
+
+    bool generateSuffixIfNeeded(
+        const MutableColumns & result_columns,
+        MutableColumnRawPtrs res_fill_columns,
+        MutableColumnRawPtrs res_interpolate_columns,
+        MutableColumnRawPtrs res_sort_prefix_columns,
+        MutableColumnRawPtrs res_other_columns);
+    bool generateSuffixIfNeeded(const Columns & input_columns, MutableColumns & result_columns);
+
+    void insertFromFillingRow(
+        const MutableColumnRawPtrs & filling_columns,
+        const MutableColumnRawPtrs & interpolate_columns,
+        const MutableColumnRawPtrs & other_columns,
+        const Block & interpolate_block);
+
+    const SortDescription sort_description;
+    const SortDescription fill_description; /// Contains only columns with WITH FILL.
+    SortDescription sort_prefix;
     const InterpolateDescriptionPtr interpolate_description; /// Contains INTERPOLATE columns
-    const bool on_totals; /// FillingTransform does nothing on totals.
 
     FillingRow filling_row; /// Current row, which is used to fill gaps.
     FillingRow next_row; /// Row to which we need to generate filling rows.
+    bool filling_row_inserted = false;
 
     using Positions = std::vector<size_t>;
     Positions fill_column_positions;
     Positions interpolate_column_positions;
     Positions other_column_positions;
+    Positions sort_prefix_positions;
     std::vector<std::pair<size_t, NameAndTypePair>> input_positions; /// positions in result columns required for actions
     ExpressionActionsPtr interpolate_actions;
-    bool first = true;
-    bool generate_suffix = false;
-
     Columns last_row;
+    Columns last_range_sort_prefix;
+    bool all_chunks_processed = false;    /// flag to determine if we have already processed all chunks
+    const bool use_with_fill_by_sorting_prefix;
+};
 
-    /// Determines should we insert filling row before start generating next rows.
-    bool should_insert_first = false;
+class FillingNoopTransform : public ISimpleTransform
+{
+public:
+    FillingNoopTransform(const Block & header, const SortDescription & sort_description_)
+        : ISimpleTransform(header, FillingTransform::transformHeader(header, sort_description_), true)
+    {
+    }
+
+    void transform(Chunk &) override {}
+    String getName() const override { return "FillingNoopTransform"; }
 };
 
 }
diff --git a/src/Processors/Transforms/FilterTransform.cpp b/src/Processors/Transforms/FilterTransform.cpp
index 2f5f3d69cff..089393a1430 100644
--- a/src/Processors/Transforms/FilterTransform.cpp
+++ b/src/Processors/Transforms/FilterTransform.cpp
@@ -3,10 +3,17 @@
 #include <Interpreters/ExpressionActions.h>
 #include <Columns/ColumnsCommon.h>
 #include <Core/Field.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
+}
+
 static void replaceFilterToConstant(Block & block, const String & filter_column_name)
 {
     ConstantFilterDescription constant_filter_description;
@@ -36,6 +43,12 @@ Block FilterTransform::transformHeader(
     if (expression)
         header = expression->updateHeader(std::move(header));
 
+    auto filter_type = header.getByName(filter_column_name).type;
+    if (!filter_type->onlyNull() && !isUInt8(removeNullable(removeLowCardinality(filter_type))))
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER,
+            "Illegal type {} of column {} for filter. Must be UInt8 or Nullable(UInt8).",
+            filter_type->getName(), filter_column_name);
+
     if (remove_filter_column)
         header.erase(filter_column_name);
     else
diff --git a/src/Processors/Transforms/FinishSortingTransform.cpp b/src/Processors/Transforms/FinishSortingTransform.cpp
index d8412eff588..05fddc35e15 100644
--- a/src/Processors/Transforms/FinishSortingTransform.cpp
+++ b/src/Processors/Transforms/FinishSortingTransform.cpp
@@ -109,6 +109,7 @@ void FinishSortingTransform::generate()
         generated_prefix = true;
     }
 
+    // TODO: Here we should also consider LIMIT optimization.
     generated_chunk = merge_sorter->read();
 
     if (!generated_chunk)
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index c28a84e9d5d..256ef66a27d 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -189,7 +189,6 @@ void JoiningTransform::transform(Chunk & chunk)
     }
     else
         block = readExecute(chunk);
-
     auto num_rows = block.rows();
     chunk.setColumns(block.getColumns(), num_rows);
 }
@@ -311,20 +310,39 @@ void FillingRightJoinSideTransform::work()
 }
 
 
-DelayedJoinedBlocksWorkerTransform::DelayedJoinedBlocksWorkerTransform(Block output_header)
-    : IProcessor(InputPorts{Block()}, OutputPorts{output_header})
+DelayedJoinedBlocksWorkerTransform::DelayedJoinedBlocksWorkerTransform(
+    Block left_header_,
+    Block output_header_,
+    size_t max_block_size_,
+    JoinPtr join_)
+    : IProcessor(InputPorts{Block()}, OutputPorts{output_header_})
+    , left_header(left_header_)
+    , output_header(output_header_)
+    , max_block_size(max_block_size_)
+    , join(join_)
 {
 }
 
 IProcessor::Status DelayedJoinedBlocksWorkerTransform::prepare()
 {
+    auto & output = outputs.front();
+    auto & input = inputs.front();
+
+    if (output.isFinished())
+    {
+        input.close();
+        return Status::Finished;
+    }
+
+    if (!output.canPush())
+    {
+        input.setNotNeeded();
+        return Status::PortFull;
+    }
+
     if (inputs.size() != 1 && outputs.size() != 1)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "DelayedJoinedBlocksWorkerTransform must have exactly one input port");
 
-    auto & output = outputs.front();
-
-    auto & input = inputs.front();
-
     if (output_chunk)
     {
         input.setNotNeeded();
@@ -355,6 +373,7 @@ IProcessor::Status DelayedJoinedBlocksWorkerTransform::prepare()
         if (!data.chunk.hasChunkInfo())
             throw Exception(ErrorCodes::LOGICAL_ERROR, "DelayedJoinedBlocksWorkerTransform must have chunk info");
         task = std::dynamic_pointer_cast<const DelayedBlocksTask>(data.chunk.getChunkInfo());
+
     }
     else
     {
@@ -375,12 +394,24 @@ void DelayedJoinedBlocksWorkerTransform::work()
 {
     if (!task)
         return;
+    Block block;
+    if (!left_delayed_stream_finished)
+    {
+        block = task->delayed_blocks->next();
 
-    Block block = task->delayed_blocks->next();
-
+        if (!block)
+        {
+            left_delayed_stream_finished = true;
+            block = nextNonJoinedBlock();
+        }
+    }
+    else
+    {
+        block = nextNonJoinedBlock();
+    }
     if (!block)
     {
-        task.reset();
+        resetTask();
         return;
     }
 
@@ -389,6 +420,38 @@ void DelayedJoinedBlocksWorkerTransform::work()
     output_chunk.setColumns(block.getColumns(), rows);
 }
 
+void DelayedJoinedBlocksWorkerTransform::resetTask()
+{
+    task.reset();
+    left_delayed_stream_finished = false;
+    setup_non_joined_stream = false;
+    non_joined_delayed_stream = nullptr;
+}
+
+Block DelayedJoinedBlocksWorkerTransform::nextNonJoinedBlock()
+{
+    if (!setup_non_joined_stream)
+    {
+        setup_non_joined_stream = true;
+        // Before read from non-joined stream, all blocks in left file reader must have been joined.
+        // For example, in HashJoin, it may return invalid mismatch rows from non-joined stream before
+        // the all blocks in left file reader have been finished, since the used flags are incomplete.
+        // To make only one processor could read from non-joined stream seems be a easy way.
+        if (task && task->left_delayed_stream_finish_counter->isLast())
+        {
+            if (!non_joined_delayed_stream)
+            {
+                non_joined_delayed_stream = join->getNonJoinedBlocks(left_header, output_header, max_block_size);
+            }
+        }
+    }
+    if (non_joined_delayed_stream)
+    {
+        return non_joined_delayed_stream->next();
+    }
+    return {};
+}
+
 DelayedJoinedBlocksTransform::DelayedJoinedBlocksTransform(size_t num_streams, JoinPtr join_)
     : IProcessor(InputPorts{}, OutputPorts(num_streams, Block()))
     , join(std::move(join_))
@@ -397,23 +460,38 @@ DelayedJoinedBlocksTransform::DelayedJoinedBlocksTransform(size_t num_streams, J
 
 void DelayedJoinedBlocksTransform::work()
 {
+    if (finished)
+        return;
+
     delayed_blocks = join->getDelayedBlocks();
     finished = finished || delayed_blocks == nullptr;
 }
 
-
 IProcessor::Status DelayedJoinedBlocksTransform::prepare()
 {
     for (auto & output : outputs)
     {
+        if (output.isFinished())
+        {
+            /// If at least one output is finished, then we have read all data from buckets.
+            /// Some workers can still be busy with joining the last chunk of data in memory,
+            /// but after that they also will finish when they will try to get next chunk.
+            finished = true;
+            continue;
+        }
         if (!output.canPush())
             return Status::PortFull;
     }
 
     if (finished)
     {
+        // Since have memory limit, cannot handle all buckets parallelly by different
+        // DelayedJoinedBlocksWorkerTransform. So send the same task to all outputs.
+        // Wait for all DelayedJoinedBlocksWorkerTransform be idle before getting next bucket.
         for (auto & output : outputs)
         {
+            if (output.isFinished())
+                continue;
             Chunk chunk;
             chunk.setChunkInfo(std::make_shared<DelayedBlocksTask>());
             output.push(std::move(chunk));
@@ -425,10 +503,14 @@ IProcessor::Status DelayedJoinedBlocksTransform::prepare()
 
     if (delayed_blocks)
     {
+        // This counter is used to ensure that only the last DelayedJoinedBlocksWorkerTransform
+        // could read right non-joined blocks from the join.
+        auto left_delayed_stream_finished_counter = std::make_shared<JoiningTransform::FinishCounter>(outputs.size());
         for (auto & output : outputs)
         {
             Chunk chunk;
-            chunk.setChunkInfo(std::make_shared<DelayedBlocksTask>(delayed_blocks));
+            auto task = std::make_shared<DelayedBlocksTask>(delayed_blocks, left_delayed_stream_finished_counter);
+            chunk.setChunkInfo(task);
             output.push(std::move(chunk));
         }
         delayed_blocks = nullptr;
diff --git a/src/Processors/Transforms/JoiningTransform.h b/src/Processors/Transforms/JoiningTransform.h
index e7edff40c56..3577906b26a 100644
--- a/src/Processors/Transforms/JoiningTransform.h
+++ b/src/Processors/Transforms/JoiningTransform.h
@@ -116,9 +116,14 @@ class DelayedBlocksTask : public ChunkInfo
 public:
 
     explicit DelayedBlocksTask() : finished(true) {}
-    explicit DelayedBlocksTask(IBlocksStreamPtr delayed_blocks_) : delayed_blocks(std::move(delayed_blocks_)) {}
+    explicit DelayedBlocksTask(IBlocksStreamPtr delayed_blocks_, JoiningTransform::FinishCounterPtr left_delayed_stream_finish_counter_)
+        : delayed_blocks(std::move(delayed_blocks_))
+        , left_delayed_stream_finish_counter(left_delayed_stream_finish_counter_)
+    {
+    }
 
     IBlocksStreamPtr delayed_blocks = nullptr;
+    JoiningTransform::FinishCounterPtr left_delayed_stream_finish_counter = nullptr;
 
     bool finished = false;
 };
@@ -147,7 +152,11 @@ private:
 class DelayedJoinedBlocksWorkerTransform : public IProcessor
 {
 public:
-    explicit DelayedJoinedBlocksWorkerTransform(Block output_header);
+    explicit DelayedJoinedBlocksWorkerTransform(
+        Block left_header_,
+        Block output_header_,
+        size_t max_block_size_,
+        JoinPtr join_);
 
     String getName() const override { return "DelayedJoinedBlocksWorkerTransform"; }
 
@@ -155,10 +164,20 @@ public:
     void work() override;
 
 private:
+    Block left_header;
+    Block output_header;
+    size_t max_block_size;
+    JoinPtr join;
     DelayedBlocksTaskPtr task;
     Chunk output_chunk;
 
-    bool finished = false;
+    /// All joined and non-joined rows from left stream are emitted, only right non-joined rows are left
+    bool left_delayed_stream_finished = false;
+    bool setup_non_joined_stream = false;
+    IBlocksStreamPtr non_joined_delayed_stream = nullptr;
+
+    void resetTask();
+    Block nextNonJoinedBlock();
 };
 
 }
diff --git a/src/Processors/Transforms/MemoryBoundMerging.h b/src/Processors/Transforms/MemoryBoundMerging.h
index 3193a07a0bd..607087fb39c 100644
--- a/src/Processors/Transforms/MemoryBoundMerging.h
+++ b/src/Processors/Transforms/MemoryBoundMerging.h
@@ -6,7 +6,6 @@
 #include <Processors/Transforms/AggregatingTransform.h>
 
 #include <Poco/Logger.h>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Processors/Transforms/MergeJoinTransform.cpp b/src/Processors/Transforms/MergeJoinTransform.cpp
index cf5b4be4239..46abd5c891d 100644
--- a/src/Processors/Transforms/MergeJoinTransform.cpp
+++ b/src/Processors/Transforms/MergeJoinTransform.cpp
@@ -302,6 +302,16 @@ MergeJoinAlgorithm::MergeJoinAlgorithm(
     }
 }
 
+void MergeJoinAlgorithm::logElapsed(double seconds)
+{
+    LOG_TRACE(log,
+        "Finished pocessing in {} seconds"
+        ", left: {} blocks, {} rows; right: {} blocks, {} rows"
+        ", max blocks loaded to memory: {}",
+        seconds, stat.num_blocks[0], stat.num_rows[0], stat.num_blocks[1], stat.num_rows[1],
+        stat.max_blocks_loaded);
+}
+
 static void prepareChunk(Chunk & chunk)
 {
     if (!chunk)
@@ -844,6 +854,7 @@ MergeJoinTransform::MergeJoinTransform(
         output_header,
         /* have_all_inputs_= */ true,
         limit_hint_,
+        /* always_read_till_end_= */ false,
         /* empty_chunk_on_finish_= */ true,
         table_join, input_headers, max_block_size)
     , log(&Poco::Logger::get("MergeJoinTransform"))
diff --git a/src/Processors/Transforms/MergeJoinTransform.h b/src/Processors/Transforms/MergeJoinTransform.h
index 58ac652cb18..6bf4484df24 100644
--- a/src/Processors/Transforms/MergeJoinTransform.h
+++ b/src/Processors/Transforms/MergeJoinTransform.h
@@ -233,15 +233,7 @@ public:
     virtual void consume(Input & input, size_t source_num) override;
     virtual Status merge() override;
 
-    void logElapsed(double seconds)
-    {
-        LOG_TRACE(log,
-            "Finished pocessing in {} seconds"
-            ", left: {} blocks, {} rows; right: {} blocks, {} rows"
-            ", max blocks loaded to memory: {}",
-            seconds, stat.num_blocks[0], stat.num_rows[0], stat.num_blocks[1], stat.num_rows[1],
-            stat.max_blocks_loaded);
-    }
+    void logElapsed(double seconds);
 
 private:
     std::optional<Status> handleAnyJoinState();
diff --git a/src/Processors/Transforms/MergeSortingTransform.cpp b/src/Processors/Transforms/MergeSortingTransform.cpp
index efd9249066c..de77711d129 100644
--- a/src/Processors/Transforms/MergeSortingTransform.cpp
+++ b/src/Processors/Transforms/MergeSortingTransform.cpp
@@ -3,6 +3,7 @@
 #include <Processors/Merges/MergingSortedTransform.h>
 #include <Common/ProfileEvents.h>
 #include <Common/formatReadable.h>
+#include <Common/logger_useful.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
@@ -185,8 +186,10 @@ void MergeSortingTransform::consume(Chunk chunk)
                     0,
                     description,
                     max_merged_block_size,
+                    /*max_merged_block_size_bytes*/0,
                     SortingQueueStrategy::Batch,
                     limit,
+                    /*always_read_till_end_=*/ false,
                     nullptr,
                     quiet,
                     use_average_block_sizes,
diff --git a/src/Processors/Transforms/MergeSortingTransform.h b/src/Processors/Transforms/MergeSortingTransform.h
index c64c93393ce..e8c180b6903 100644
--- a/src/Processors/Transforms/MergeSortingTransform.h
+++ b/src/Processors/Transforms/MergeSortingTransform.h
@@ -5,7 +5,6 @@
 #include <Common/filesystemHelpers.h>
 #include <Disks/TemporaryFileOnDisk.h>
 #include <Interpreters/TemporaryDataOnDisk.h>
-#include <Common/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Processors/Transforms/MergingAggregatedTransform.cpp b/src/Processors/Transforms/MergingAggregatedTransform.cpp
index 9d0be86ff83..e4955d06859 100644
--- a/src/Processors/Transforms/MergingAggregatedTransform.cpp
+++ b/src/Processors/Transforms/MergingAggregatedTransform.cpp
@@ -1,6 +1,7 @@
 #include <Processors/Transforms/MergingAggregatedTransform.h>
 #include <Processors/Transforms/AggregatingTransform.h>
 #include <Processors/Transforms/AggregatingInOrderTransform.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Processors/Transforms/PartialSortingTransform.h b/src/Processors/Transforms/PartialSortingTransform.h
index 6dab4497fc7..8f25c93037f 100644
--- a/src/Processors/Transforms/PartialSortingTransform.h
+++ b/src/Processors/Transforms/PartialSortingTransform.h
@@ -20,7 +20,7 @@ public:
 
     String getName() const override { return "PartialSortingTransform"; }
 
-    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) { read_rows.swap(counter); }
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { read_rows.swap(counter); }
 
 protected:
     void transform(Chunk & chunk) override;
diff --git a/src/Processors/Transforms/ReadFromMergeTreeDependencyTransform.cpp b/src/Processors/Transforms/ReadFromMergeTreeDependencyTransform.cpp
deleted file mode 100644
index 295eddb206d..00000000000
--- a/src/Processors/Transforms/ReadFromMergeTreeDependencyTransform.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include <Processors/Transforms/ReadFromMergeTreeDependencyTransform.h>
-
-#include <QueryPipeline/RemoteQueryExecutor.h>
-#include "Processors/Port.h"
-
-namespace DB
-{
-
-ReadFromMergeTreeDependencyTransform::ReadFromMergeTreeDependencyTransform(const Block & header, UUID uuid_)
-    : IProcessor(InputPorts(1, header), OutputPorts(1, header))
-    , uuid(uuid_)
-    , data_port(&inputs.front())
-{
-}
-
-void ReadFromMergeTreeDependencyTransform::connectToScheduler(OutputPort & output_port)
-{
-    inputs.emplace_back(Block{}, this);
-    dependency_port = &inputs.back();
-    connect(output_port, *dependency_port);
-}
-
-UUID ReadFromMergeTreeDependencyTransform::getParallelReplicasGroupUUID()
-{
-    return uuid;
-}
-
-IProcessor::Status ReadFromMergeTreeDependencyTransform::prepare()
-{
-    Status status = Status::Ready;
-
-    while (status == Status::Ready)
-    {
-        status = !has_data ? prepareConsume()
-                           : prepareGenerate();
-    }
-
-    return status;
-}
-
-IProcessor::Status ReadFromMergeTreeDependencyTransform::prepareConsume()
-{
-    auto & output_port = getOutputPort();
-
-    /// Check all outputs are finished or ready to get data.
-    if (output_port.isFinished())
-    {
-        data_port->close();
-        dependency_port->close();
-        return Status::Finished;
-    }
-
-    /// Try get chunk from input.
-    if (data_port->isFinished())
-    {
-        if (dependency_port->hasData())
-            dependency_port->pull(true);
-        dependency_port->close();
-        output_port.finish();
-        return Status::Finished;
-    }
-
-    if (!dependency_port->isFinished())
-    {
-        dependency_port->setNeeded();
-        if (!dependency_port->hasData())
-            return Status::NeedData;
-    }
-
-    data_port->setNeeded();
-    if (!data_port->hasData())
-        return Status::NeedData;
-
-    if (!dependency_port->isFinished())
-        dependency_port->pull();
-
-    chunk = data_port->pull();
-    has_data = true;
-
-    return Status::Ready;
-}
-
-IProcessor::Status ReadFromMergeTreeDependencyTransform::prepareGenerate()
-{
-    auto & output_port = getOutputPort();
-    if (!output_port.isFinished() && output_port.canPush())
-    {
-        output_port.push(std::move(chunk));
-        has_data = false;
-        return Status::Ready;
-    }
-
-    if (output_port.isFinished())
-    {
-        data_port->close();
-        dependency_port->close();
-        return Status::Finished;
-    }
-
-    return Status::PortFull;
-}
-
-}
diff --git a/src/Processors/Transforms/ReadFromMergeTreeDependencyTransform.h b/src/Processors/Transforms/ReadFromMergeTreeDependencyTransform.h
deleted file mode 100644
index 929841e7ce0..00000000000
--- a/src/Processors/Transforms/ReadFromMergeTreeDependencyTransform.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-#include <Processors/IProcessor.h>
-
-namespace DB
-{
-
-class RemoteQueryExecutor;
-using RemoteQueryExecutorPtr = std::shared_ptr<RemoteQueryExecutor>;
-
-/// A tiny class which is used for reading with multiple replicas in parallel.
-/// Motivation is that we don't have a full control on how
-/// processors are scheduled across threads and there could be a situation
-/// when all available threads will read from local replica and will just
-/// forget about remote replicas existence. That is not what we want.
-/// For parallel replicas we have to constantly answer to incoming requests
-/// with a set of marks to read.
-/// With the help of this class, we explicitly connect a "local" source with
-/// all the remote ones. And thus achieve fairness somehow.
-class ReadFromMergeTreeDependencyTransform : public IProcessor
-{
-public:
-    ReadFromMergeTreeDependencyTransform(const Block & header, UUID uuid_);
-
-    String getName() const override { return "ReadFromMergeTreeDependency"; }
-    Status prepare() override;
-
-    InputPort & getInputPort() { assert(data_port); return *data_port; }
-    InputPort & getDependencyPort() { assert(dependency_port); return *dependency_port; }
-    OutputPort & getOutputPort() { return outputs.front(); }
-
-    UUID getParallelReplicasGroupUUID();
-
-    void connectToScheduler(OutputPort & output_port);
-private:
-    bool has_data{false};
-    Chunk chunk;
-
-    UUID uuid;
-
-    InputPort * data_port{nullptr};
-    InputPort * dependency_port{nullptr};
-
-    Status prepareGenerate();
-    Status prepareConsume();
-};
-
-
-}
diff --git a/src/Processors/Transforms/StreamInQueryCacheTransform.cpp b/src/Processors/Transforms/StreamInQueryCacheTransform.cpp
index 1ba57ea8ed2..6bcae1d3053 100644
--- a/src/Processors/Transforms/StreamInQueryCacheTransform.cpp
+++ b/src/Processors/Transforms/StreamInQueryCacheTransform.cpp
@@ -4,21 +4,24 @@ namespace DB
 {
 
 StreamInQueryCacheTransform::StreamInQueryCacheTransform(
-    const Block & header_, QueryCachePtr cache, const QueryCache::Key & cache_key, std::chrono::milliseconds min_query_duration)
+    const Block & header_,
+    std::shared_ptr<QueryCache::Writer> query_cache_writer_,
+    QueryCache::Writer::ChunkType chunk_type_)
     : ISimpleTransform(header_, header_, false)
-    , cache_writer(cache->createWriter(cache_key, min_query_duration))
+    , query_cache_writer(query_cache_writer_)
+    , chunk_type(chunk_type_)
 {
 }
 
 void StreamInQueryCacheTransform::transform(Chunk & chunk)
 {
-    cache_writer.buffer(chunk.clone());
+    query_cache_writer->buffer(chunk.clone(), chunk_type);
 }
 
 void StreamInQueryCacheTransform::finalizeWriteInQueryCache()
 {
     if (!isCancelled())
-        cache_writer.finalizeWrite();
+        query_cache_writer->finalizeWrite();
 }
 
 };
diff --git a/src/Processors/Transforms/StreamInQueryCacheTransform.h b/src/Processors/Transforms/StreamInQueryCacheTransform.h
index 15d977cd445..c2357049cc1 100644
--- a/src/Processors/Transforms/StreamInQueryCacheTransform.h
+++ b/src/Processors/Transforms/StreamInQueryCacheTransform.h
@@ -10,7 +10,9 @@ class StreamInQueryCacheTransform : public ISimpleTransform
 {
 public:
     StreamInQueryCacheTransform(
-        const Block & header_, QueryCachePtr cache, const QueryCache::Key & cache_key, std::chrono::milliseconds min_query_duration);
+        const Block & header_,
+        std::shared_ptr<QueryCache::Writer> query_cache_writer,
+        QueryCache::Writer::ChunkType chunk_type);
 
 protected:
     void transform(Chunk & chunk) override;
@@ -20,7 +22,8 @@ public:
     String getName() const override { return "StreamInQueryCacheTransform"; }
 
 private:
-    QueryCache::Writer cache_writer;
+    const std::shared_ptr<QueryCache::Writer> query_cache_writer;
+    const QueryCache::Writer::ChunkType chunk_type;
 };
 
 }
diff --git a/src/Processors/Transforms/TotalsHavingTransform.h b/src/Processors/Transforms/TotalsHavingTransform.h
index 2567781771e..350956c9c6b 100644
--- a/src/Processors/Transforms/TotalsHavingTransform.h
+++ b/src/Processors/Transforms/TotalsHavingTransform.h
@@ -2,14 +2,10 @@
 
 #include <Processors/ISimpleTransform.h>
 #include <Processors/Transforms/finalizeChunk.h>
-#include <Common/Arena.h>
 
 namespace DB
 {
 
-class Arena;
-using ArenaPtr = std::shared_ptr<Arena>;
-
 class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 
@@ -42,6 +38,8 @@ public:
     Status prepare() override;
     void work() override;
 
+    bool hasFilter() const { return !filter_column_name.empty(); }
+
     static Block transformHeader(Block block, const ActionsDAG * expression, const std::string & filter_column_name, bool remove_filter, bool final, const ColumnsMask & aggregates_mask);
 
 protected:
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index c2293c3097d..a785d52bf65 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -19,6 +19,30 @@
 #include <DataTypes/DataTypeDateTime64.h>
 
 
+/// See https://fmt.dev/latest/api.html#formatting-user-defined-types
+template <>
+struct fmt::formatter<DB::RowNumber>
+{
+    static constexpr auto parse(format_parse_context & ctx)
+    {
+        const auto * it = ctx.begin();
+        const auto * end = ctx.end();
+
+        /// Only support {}.
+        if (it != end && *it != '}')
+            throw fmt::format_error("Invalid format");
+
+        return it;
+    }
+
+    template <typename FormatContext>
+    auto format(const DB::RowNumber & x, FormatContext & ctx)
+    {
+        return fmt::format_to(ctx.out(), "{}:{}", x.block, x.row);
+    }
+};
+
+
 namespace DB
 {
 
@@ -34,7 +58,7 @@ namespace ErrorCodes
 // Interface for true window functions. It's not much of an interface, they just
 // accept the guts of WindowTransform and do 'something'. Given a small number of
 // true window functions, and the fact that the WindowTransform internals are
-// pretty much well defined in domain terms (e.g. frame boundaries), this is
+// pretty much well-defined in domain terms (e.g. frame boundaries), this is
 // somewhat acceptable.
 class IWindowFunction
 {
@@ -44,6 +68,8 @@ public:
     // Must insert the result for current_row.
     virtual void windowInsertResultInto(const WindowTransform * transform,
         size_t function_index) = 0;
+
+    virtual std::optional<WindowFrame> getDefaultFrame() const { return {}; }
 };
 
 // Compares ORDER BY column values at given rows to find the boundaries of frame:
@@ -222,6 +248,15 @@ WindowTransform::WindowTransform(const Block & input_header_,
         /// Currently we have slightly wrong mixup of the interfaces of Window and Aggregate functions.
         workspace.window_function_impl = dynamic_cast<IWindowFunction *>(const_cast<IAggregateFunction *>(aggregate_function.get()));
 
+        /// Some functions may have non-standard default frame.
+        /// Use it if it's the only function over the current window.
+        if (window_description.frame.is_default && functions.size() == 1 && workspace.window_function_impl)
+        {
+            auto custom_default_frame = workspace.window_function_impl->getDefaultFrame();
+            if (custom_default_frame)
+                window_description.frame = *custom_default_frame;
+        }
+
         workspace.aggregate_function_state.reset(
             aggregate_function->sizeOfData(),
             aggregate_function->alignOfData());
@@ -312,8 +347,6 @@ void WindowTransform::advancePartitionEnd()
 
     const RowNumber end = blocksEnd();
 
-//    fmt::print(stderr, "end {}, partition_end {}\n", end, partition_end);
-
     // If we're at the total end of data, we must end the partition. This is one
     // of the few places in calculations where we need special handling for end
     // of data, other places will work as usual based on
@@ -372,9 +405,6 @@ void WindowTransform::advancePartitionEnd()
     const auto block_rows = blockRowsNumber(partition_end);
     for (; partition_end.row < block_rows; ++partition_end.row)
     {
-//        fmt::print(stderr, "compare reference '{}' to compared '{}'\n",
-//            prev_frame_start, partition_end);
-
         size_t i = 0;
         for (; i < partition_by_columns; ++i)
         {
@@ -383,9 +413,6 @@ void WindowTransform::advancePartitionEnd()
             const auto * compared_column
                 = inputAt(partition_end)[partition_by_indices[i]].get();
 
-//            fmt::print(stderr, "reference '{}', compared '{}'\n",
-//                (*reference_column)[prev_frame_start.row],
-//                (*compared_column)[partition_end.row]);
             if (compared_column->compareAt(partition_end.row,
                     prev_frame_start.row, *reference_column,
                     1 /* nan_direction_hint */) != 0)
@@ -410,26 +437,26 @@ void WindowTransform::advancePartitionEnd()
     assert(!partition_ended && partition_end == blocksEnd());
 }
 
-auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int64_t offset) const
+auto WindowTransform::moveRowNumberNoCheck(const RowNumber & original_row_number, Int64 offset) const
 {
-    RowNumber x = _x;
+    RowNumber moved_row_number = original_row_number;
 
-    if (offset > 0 && x != blocksEnd())
+    if (offset > 0 && moved_row_number != blocksEnd())
     {
         for (;;)
         {
-            assertValid(x);
+            assertValid(moved_row_number);
             assert(offset >= 0);
 
-            const auto block_rows = blockRowsNumber(x);
-            x.row += offset;
-            if (x.row >= block_rows)
+            const auto block_rows = blockRowsNumber(moved_row_number);
+            moved_row_number.row += offset;
+            if (moved_row_number.row >= block_rows)
             {
-                offset = x.row - block_rows;
-                x.row = 0;
-                x.block++;
+                offset = moved_row_number.row - block_rows;
+                moved_row_number.row = 0;
+                ++moved_row_number.block;
 
-                if (x == blocksEnd())
+                if (moved_row_number == blocksEnd())
                 {
                     break;
                 }
@@ -445,56 +472,55 @@ auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int64_t offset)
     {
         for (;;)
         {
-            assertValid(x);
+            assertValid(moved_row_number);
             assert(offset <= 0);
 
             // abs(offset) is less than INT64_MAX, as checked in the parser, so
             // this negation should always work.
             assert(offset >= -INT64_MAX);
-            if (x.row >= static_cast<uint64_t>(-offset))
+            if (moved_row_number.row >= static_cast<UInt64>(-offset))
             {
-                x.row -= -offset;
+                moved_row_number.row -= -offset;
                 offset = 0;
                 break;
             }
 
             // Move to the first row in current block. Note that the offset is
             // negative.
-            offset += x.row;
-            x.row = 0;
+            offset += moved_row_number.row;
+            moved_row_number.row = 0;
 
             // Move to the last row of the previous block, if we are not at the
             // first one. Offset also is incremented by one, because we pass over
             // the first row of this block.
-            if (x.block == first_block_number)
+            if (moved_row_number.block == first_block_number)
             {
                 break;
             }
 
-            --x.block;
+            --moved_row_number.block;
             offset += 1;
-            x.row = blockRowsNumber(x) - 1;
+            moved_row_number.row = blockRowsNumber(moved_row_number) - 1;
         }
     }
 
-    return std::tuple<RowNumber, int64_t>{x, offset};
+    return std::tuple<RowNumber, Int64>{moved_row_number, offset};
 }
 
-auto WindowTransform::moveRowNumber(const RowNumber & _x, int64_t offset) const
+auto WindowTransform::moveRowNumber(const RowNumber & original_row_number, Int64 offset) const
 {
-    auto [x, o] = moveRowNumberNoCheck(_x, offset);
+    auto [moved_row_number, offset_after_move] = moveRowNumberNoCheck(original_row_number, offset);
 
 #ifndef NDEBUG
-    // Check that it was reversible.
-    auto [xx, oo] = moveRowNumberNoCheck(x, -(offset - o));
+    /// Check that it was reversible. If we move back, we get the original row number with zero offset.
+    const auto [original_row_number_to_validate, offset_after_move_back]
+        = moveRowNumberNoCheck(moved_row_number, -(offset - offset_after_move));
 
-//    fmt::print(stderr, "{} -> {}, result {}, {}, new offset {}, twice {}, {}\n",
-//        _x, offset, x, o, -(offset - o), xx, oo);
-    assert(xx == _x);
-    assert(oo == 0);
+    assert(original_row_number_to_validate == original_row_number);
+    assert(0 == offset_after_move_back);
 #endif
 
-    return std::tuple<RowNumber, int64_t>{x, o};
+    return std::tuple<RowNumber, Int64>{moved_row_number, offset_after_move};
 }
 
 
@@ -509,9 +535,6 @@ void WindowTransform::advanceFrameStartRowsOffset()
 
     assertValid(frame_start);
 
-//    fmt::print(stderr, "frame start {} left {} partition start {}\n",
-//        frame_start, offset_left, partition_start);
-
     if (frame_start <= partition_start)
     {
         // Got to the beginning of partition and can't go further back.
@@ -674,8 +697,6 @@ bool WindowTransform::arePeers(const RowNumber & x, const RowNumber & y) const
 
 void WindowTransform::advanceFrameEndCurrentRow()
 {
-//    fmt::print(stderr, "starting from frame_end {}\n", frame_end);
-
     // We only process one block here, and frame_end must be already in it: if
     // we didn't find the end in the previous block, frame_end is now the first
     // row of the current block. We need this knowledge to write a simpler loop
@@ -697,7 +718,7 @@ void WindowTransform::advanceFrameEndCurrentRow()
     // We advance until the partition end. It's either in the current block or
     // in the next one, which is also the past-the-end block. Figure out how
     // many rows we have to process.
-    uint64_t rows_end;
+    UInt64 rows_end;
     if (partition_end.row == 0)
     {
         assert(partition_end == blocksEnd());
@@ -711,14 +732,11 @@ void WindowTransform::advanceFrameEndCurrentRow()
     // Equality would mean "no data to process", for which we checked above.
     assert(frame_end.row < rows_end);
 
-//    fmt::print(stderr, "first row {} last {}\n", frame_end.row, rows_end);
-
     // Advance frame_end while it is still peers with the current row.
     for (; frame_end.row < rows_end; ++frame_end.row)
     {
         if (!arePeers(current_row, frame_end))
         {
-//            fmt::print(stderr, "{} and {} don't match\n", reference, frame_end);
             frame_ended = true;
             return;
         }
@@ -841,8 +859,6 @@ void WindowTransform::advanceFrameEnd()
             break;
     }
 
-//    fmt::print(stderr, "frame_end {} -> {}\n", frame_end_before, frame_end);
-
     // We might not have advanced the frame end if we found out we reached the
     // end of input or the partition, or if we still don't know the frame start.
     if (frame_end_before == frame_end)
@@ -854,9 +870,6 @@ void WindowTransform::advanceFrameEnd()
 // Update the aggregation states after the frame has changed.
 void WindowTransform::updateAggregationState()
 {
-//    fmt::print(stderr, "update agg states [{}, {}) -> [{}, {})\n",
-//        prev_frame_start, prev_frame_end, frame_start, frame_end);
-
     // Assert that the frame boundaries are known, have proper order wrt each
     // other, and have not gone back wrt the previous frame.
     assert(frame_started);
@@ -904,7 +917,6 @@ void WindowTransform::updateAggregationState()
 
         if (reset_aggregation)
         {
-//            fmt::print(stderr, "(2) reset aggregation\n");
             a->destroy(buf);
             a->create(buf);
         }
@@ -980,9 +992,6 @@ void WindowTransform::writeOutCurrentRow()
             a->insertMergeResultInto(buf, *result_column, arena.get());
         }
     }
-
-//    fmt::print(stderr, "wrote out aggregation state for current row '{}'\n",
-//        current_row);
 }
 
 static void assertSameColumns(const Columns & left_all,
@@ -1019,10 +1028,6 @@ static void assertSameColumns(const Columns & left_all,
 
 void WindowTransform::appendChunk(Chunk & chunk)
 {
-//    fmt::print(stderr, "new chunk, {} rows, finished={}\n", chunk.getNumRows(),
-//        input_is_finished);
-//    fmt::print(stderr, "chunk structure '{}'\n", chunk.dumpStructure());
-
     // First, prepare the new input block and add it to the queue. We might not
     // have it if it's end of data, though.
     if (!input_is_finished)
@@ -1082,9 +1087,6 @@ void WindowTransform::appendChunk(Chunk & chunk)
     for (;;)
     {
         advancePartitionEnd();
-//        fmt::print(stderr, "partition [{}, {}), {}\n",
-//            partition_start, partition_end, partition_ended);
-
         // Either we ran out of data or we found the end of partition (maybe
         // both, but this only happens at the total end of data).
         assert(partition_ended || partition_end == blocksEnd());
@@ -1098,10 +1100,6 @@ void WindowTransform::appendChunk(Chunk & chunk)
         // which is precisely the definition of `partition_end`.
         while (current_row < partition_end)
         {
-//            fmt::print(stderr, "(1) row {} frame [{}, {}) {}, {}\n",
-//                current_row, frame_start, frame_end,
-//                frame_started, frame_ended);
-
             // We now know that the current row is valid, so we can update the
             // peer group start.
             if (!arePeers(peer_group_start, current_row))
@@ -1141,10 +1139,6 @@ void WindowTransform::appendChunk(Chunk & chunk)
                 return;
             }
 
-//            fmt::print(stderr, "(2) row {} frame [{}, {}) {}, {}\n",
-//                current_row, frame_start, frame_end,
-//                frame_started, frame_ended);
-
             // The frame can be empty sometimes, e.g. the boundaries coincide
             // or the start is after the partition end. But hopefully start is
             // not after end.
@@ -1225,8 +1219,6 @@ void WindowTransform::appendChunk(Chunk & chunk)
         peer_group_start_row_number = 1;
         peer_group_number = 1;
 
-//        fmt::print(stderr, "reinitialize agg data at start of {}\n",
-//            partition_start);
         // Reinitialize the aggregate function states because the new partition
         // has started.
         for (auto & ws : workspaces)
@@ -1267,10 +1259,6 @@ void WindowTransform::appendChunk(Chunk & chunk)
 
 IProcessor::Status WindowTransform::prepare()
 {
-//    fmt::print(stderr, "prepare, next output {}, not ready row {}, first block {}, hold {} blocks\n",
-//        next_output_block_number, first_not_ready_row, first_block_number,
-//        blocks.size());
-
     if (output.isFinished() || isCancelled())
     {
         // The consumer asked us not to continue (or we decided it ourselves),
@@ -1314,10 +1302,6 @@ IProcessor::Status WindowTransform::prepare()
             }
             output_data.chunk.setColumns(columns, block.rows);
 
-//            fmt::print(stderr, "output block {} as chunk '{}'\n",
-//                next_output_block_number,
-//                output_data.chunk.dumpStructure());
-
             ++next_output_block_number;
 
             output.pushData(std::move(output_data));
@@ -1417,9 +1401,6 @@ void WindowTransform::work()
         std::min(prev_frame_start.block, current_row.block));
     if (first_block_number < first_used_block)
     {
-//        fmt::print(stderr, "will drop blocks from {} to {}\n", first_block_number,
-//            first_used_block);
-
         blocks.erase(blocks.begin(),
             blocks.begin() + (first_used_block - first_block_number));
         first_block_number = first_used_block;
@@ -1977,18 +1958,23 @@ struct WindowFunctionNtile final : public WindowFunction
         : WindowFunction(name_, argument_types_, parameters_, std::make_shared<DataTypeUInt64>())
     {
         if (argument_types.size() != 1)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function {} takes exactly one parameter", name_);
-        }
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function {} takes exactly one argument", name_);
+
         auto type_id = argument_types[0]->getTypeId();
-        if (type_id != TypeIndex::UInt8 && type_id != TypeIndex::UInt16 && type_id != TypeIndex::UInt32 && type_id != TypeIndex::UInt32 && type_id != TypeIndex::UInt64)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "ntile's argument type must be an unsigned integer (not larger then 64-bit), but got {}", argument_types[0]->getName());
-        }
+        if (type_id != TypeIndex::UInt8 && type_id != TypeIndex::UInt16 && type_id != TypeIndex::UInt32 && type_id != TypeIndex::UInt64)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "'{}' argument type must be an unsigned integer (not larger than 64-bit), got {}", name_, argument_types[0]->getName());
     }
 
     bool allocatesMemoryInArena() const override { return false; }
 
+    std::optional<WindowFrame> getDefaultFrame() const override
+    {
+        WindowFrame frame;
+        frame.type = WindowFrame::FrameType::ROWS;
+        frame.end_type = WindowFrame::BoundaryType::Unbounded;
+        return frame;
+    }
+
     void windowInsertResultInto(const WindowTransform * transform,
         size_t function_index) override
     {
@@ -1999,7 +1985,7 @@ struct WindowFunctionNtile final : public WindowFunction
             const auto & workspace = transform->workspaces[function_index];
             const auto & arg_col = *current_block.original_input_columns[workspace.argument_column_indices[0]];
             if (!isColumnConst(arg_col))
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "ntile's argument must be a constant");
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument of 'ntile' function must be a constant");
             auto type_id = argument_types[0]->getTypeId();
             if (type_id == TypeIndex::UInt8)
                 buckets = arg_col[transform->current_row.row].get<UInt8>();
@@ -2012,7 +1998,7 @@ struct WindowFunctionNtile final : public WindowFunction
 
             if (!buckets)
             {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "ntile's argument must > 0");
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument of 'ntile' funtcion must be greater than zero");
             }
         }
         // new partition
@@ -2090,22 +2076,16 @@ private:
     static void checkWindowFrameType(const WindowTransform * transform)
     {
         if (transform->order_by_indices.empty())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "ntile's window frame must have order by clause");
-        if (transform->window_description.frame.type != WindowFrame::FrameType::ROWS)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "ntile's frame type must be ROWS");
-        }
-        if (transform->window_description.frame.begin_type != WindowFrame::BoundaryType::Unbounded)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "ntile's frame start type must be UNBOUNDED PRECEDING");
-        }
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Window frame for 'ntile' function must have ORDER BY clause");
 
-        if (transform->window_description.frame.end_type != WindowFrame::BoundaryType::Unbounded)
+        // We must wait all for the partition end and get the total rows number in this
+        // partition. So before the end of this partition, there is no any block could be
+        // dropped out.
+        bool is_frame_supported = transform->window_description.frame.begin_type == WindowFrame::BoundaryType::Unbounded
+            && transform->window_description.frame.end_type == WindowFrame::BoundaryType::Unbounded;
+        if (!is_frame_supported)
         {
-            // We must wait all for the partition end and get the total rows number in this
-            // partition. So before the end of this partition, there is no any block could be
-            // dropped out.
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "ntile's frame end type must be UNBOUNDED FOLLOWING");
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Window frame for function 'ntile' should be 'ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING'");
         }
     }
 };
@@ -2186,7 +2166,7 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
         IColumn & to = *current_block.output_columns[function_index];
         const auto & workspace = transform->workspaces[function_index];
 
-        int64_t offset = 1;
+        Int64 offset = 1;
         if (argument_types.size() > 1)
         {
             offset = (*current_block.input_columns[
@@ -2276,7 +2256,7 @@ struct WindowFunctionNthValue final : public WindowFunction
         IColumn & to = *current_block.output_columns[function_index];
         const auto & workspace = transform->workspaces[function_index];
 
-        int64_t offset = (*current_block.input_columns[
+        Int64 offset = (*current_block.input_columns[
                 workspace.argument_column_indices[1]])[
             transform->current_row.row].get<Int64>();
 
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index 424466bca8a..de3e82d15ee 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -8,6 +8,10 @@
 
 #include <deque>
 
+/// See https://stackoverflow.com/questions/72533435/error-zero-as-null-pointer-constant-while-comparing-template-class-using-spaces
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+
 
 namespace DB
 {
@@ -34,7 +38,7 @@ struct WindowFunctionWorkspace
 
     // Argument columns. Be careful, this is a per-block cache.
     std::vector<const IColumn *> argument_columns;
-    uint64_t cached_block_number = std::numeric_limits<uint64_t>::max();
+    UInt64 cached_block_number = std::numeric_limits<UInt64>::max();
 };
 
 struct WindowTransformBlock
@@ -48,28 +52,14 @@ struct WindowTransformBlock
 
 struct RowNumber
 {
-    uint64_t block = 0;
-    uint64_t row = 0;
+    UInt64 block = 0;
+    UInt64 row = 0;
 
-    bool operator < (const RowNumber & other) const
-    {
-        return block < other.block
-            || (block == other.block && row < other.row);
-    }
-
-    bool operator == (const RowNumber & other) const
-    {
-        return block == other.block && row == other.row;
-    }
-
-    bool operator <= (const RowNumber & other) const
-    {
-        return *this < other || *this == other;
-    }
+    auto operator <=>(const RowNumber &) const = default;
 };
 
-/*
- * Computes several window functions that share the same window. The input must
+
+/* Computes several window functions that share the same window. The input must
  * be sorted by PARTITION BY (in any order), then by ORDER BY.
  * We need to track the following pointers:
  * 1) boundaries of partition -- rows that compare equal w/PARTITION BY.
@@ -103,19 +93,16 @@ public:
 
     static Block transformHeader(Block header, const ExpressionActionsPtr & expression);
 
-    /*
-     * (former) Implementation of ISimpleTransform.
+    /* (former) Implementation of ISimpleTransform.
      */
     void appendChunk(Chunk & chunk) /*override*/;
 
-    /*
-     * Implementation of IProcessor;
+    /* Implementation of IProcessor;
      */
     Status prepare() override;
     void work() override;
 
-    /*
-     * Implementation details.
+    /* Implementation details.
      */
     void advancePartitionEnd();
 
@@ -146,14 +133,14 @@ public:
         return const_cast<WindowTransform *>(this)->inputAt(x);
     }
 
-    auto & blockAt(const uint64_t block_number)
+    auto & blockAt(const UInt64 block_number)
     {
         assert(block_number >= first_block_number);
         assert(block_number - first_block_number < blocks.size());
         return blocks[block_number - first_block_number];
     }
 
-    const auto & blockAt(const uint64_t block_number) const
+    const auto & blockAt(const UInt64 block_number) const
     {
         return const_cast<WindowTransform *>(this)->blockAt(block_number);
     }
@@ -188,7 +175,7 @@ public:
         const auto block_rows = blockAt(x).rows;
         assert(x.row < block_rows);
 
-        x.row++;
+        ++x.row;
         if (x.row < block_rows)
         {
             return;
@@ -237,20 +224,16 @@ public:
         return result;
     }
 
-    auto moveRowNumber(const RowNumber & _x, int64_t offset) const;
-    auto moveRowNumberNoCheck(const RowNumber & _x, int64_t offset) const;
+    auto moveRowNumber(const RowNumber & original_row_number, Int64 offset) const;
+    auto moveRowNumberNoCheck(const RowNumber & original_row_number, Int64 offset) const;
 
     void assertValid(const RowNumber & x) const
     {
         assert(x.block >= first_block_number);
         if (x.block == first_block_number + blocks.size())
-        {
             assert(x.row == 0);
-        }
         else
-        {
             assert(x.row < blockRowsNumber(x));
-        }
     }
 
     RowNumber blocksEnd() const
@@ -263,8 +246,7 @@ public:
         return RowNumber{first_block_number, 0};
     }
 
-    /*
-     * Data (formerly) inherited from ISimpleTransform, needed for the
+    /* Data (formerly) inherited from ISimpleTransform, needed for the
      * implementation of the IProcessor interface.
      */
     InputPort & input;
@@ -276,8 +258,7 @@ public:
     bool has_output = false;
     Port::Data output_data;
 
-    /*
-     * Data for window transform itself.
+    /* Data for window transform itself.
      */
     Block input_header;
 
@@ -300,9 +281,9 @@ public:
     // have an always-incrementing index. The index of the first block is in
     // `first_block_number`.
     std::deque<WindowTransformBlock> blocks;
-    uint64_t first_block_number = 0;
+    UInt64 first_block_number = 0;
     // The next block we are going to pass to the consumer.
-    uint64_t next_output_block_number = 0;
+    UInt64 next_output_block_number = 0;
     // The first row for which we still haven't calculated the window functions.
     // Used to determine which resulting blocks we can pass to the consumer.
     RowNumber first_not_ready_row;
@@ -326,9 +307,9 @@ public:
     RowNumber peer_group_start;
 
     // Row and group numbers in partition for calculating rank() and friends.
-    uint64_t current_row_number = 1;
-    uint64_t peer_group_start_row_number = 1;
-    uint64_t peer_group_number = 1;
+    UInt64 current_row_number = 1;
+    UInt64 peer_group_start_row_number = 1;
+    UInt64 peer_group_number = 1;
 
     // The frame is [frame_start, frame_end) if frame_ended && frame_started,
     // and unknown otherwise. Note that when we move to the next row, both the
@@ -353,34 +334,13 @@ public:
     // Comparison function for RANGE OFFSET frames. We choose the appropriate
     // overload once, based on the type of the ORDER BY column. Choosing it for
     // each row would be slow.
-    int (* compare_values_with_offset) (
+    std::function<int(
         const IColumn * compared_column, size_t compared_row,
         const IColumn * reference_column, size_t reference_row,
         const Field & offset,
-        bool offset_is_preceding);
+        bool offset_is_preceding)> compare_values_with_offset;
 };
 
 }
 
-/// See https://fmt.dev/latest/api.html#formatting-user-defined-types
-template <>
-struct fmt::formatter<DB::RowNumber>
-{
-    static constexpr auto parse(format_parse_context & ctx)
-    {
-        const auto * it = ctx.begin();
-        const auto * end = ctx.end();
-
-        /// Only support {}.
-        if (it != end && *it != '}')
-            throw format_error("invalid format");
-
-        return it;
-    }
-
-    template <typename FormatContext>
-    auto format(const DB::RowNumber & x, FormatContext & ctx)
-    {
-        return format_to(ctx.out(), "{}:{}", x.block, x.row);
-    }
-};
+#pragma clang diagnostic pop
diff --git a/src/Processors/Transforms/buildPushingToViewsChain.cpp b/src/Processors/Transforms/buildPushingToViewsChain.cpp
index 870106d794f..31bab46b868 100644
--- a/src/Processors/Transforms/buildPushingToViewsChain.cpp
+++ b/src/Processors/Transforms/buildPushingToViewsChain.cpp
@@ -4,7 +4,6 @@
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
-#include <Interpreters/ProcessList.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Processors/Transforms/SquashingChunksTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
@@ -15,6 +14,7 @@
 #include <Storages/StorageMaterializedView.h>
 #include <Storages/StorageValues.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Common/Exception.h>
 #include <Common/CurrentThread.h>
 #include <Common/MemoryTracker.h>
 #include <Common/ProfileEvents.h>
@@ -22,11 +22,11 @@
 #include <Common/ThreadStatus.h>
 #include <Common/checkStackSize.h>
 #include <Common/logger_useful.h>
-#include <base/scope_guard.h>
 
 #include <atomic>
 #include <chrono>
 
+
 namespace ProfileEvents
 {
     extern const Event SelectedBytes;
@@ -194,6 +194,7 @@ Chain buildPushingToViewsChain(
     const ASTPtr & query_ptr,
     bool no_destination,
     ThreadStatusesHolderPtr thread_status_holder,
+    ThreadGroupPtr running_group,
     std::atomic_uint64_t * elapsed_counter_ms,
     const Block & live_view_header)
 {
@@ -269,12 +270,6 @@ Chain buildPushingToViewsChain(
         ASTPtr query;
         Chain out;
 
-        ThreadGroupStatusPtr running_group;
-        if (current_thread && current_thread->getThreadGroup())
-            running_group = current_thread->getThreadGroup();
-        else
-            running_group = std::make_shared<ThreadGroupStatus>();
-
         /// We are creating a ThreadStatus per view to store its metrics individually
         /// Since calling ThreadStatus() changes current_thread we save it and restore it after the calls
         /// Later on, before doing any task related to a view, we'll switch to its ThreadStatus, do the work,
@@ -285,12 +280,7 @@ Chain buildPushingToViewsChain(
         std::unique_ptr<ThreadStatus> view_thread_status_ptr = std::make_unique<ThreadStatus>();
         /// Copy of a ThreadStatus should be internal.
         view_thread_status_ptr->setInternalThread();
-        /// view_thread_status_ptr will be moved later (on and on), so need to capture raw pointer.
-        view_thread_status_ptr->deleter = [thread_status = view_thread_status_ptr.get(), running_group]
-        {
-            thread_status->detachQuery();
-        };
-        view_thread_status_ptr->attachQuery(running_group);
+        view_thread_status_ptr->attachToGroup(running_group);
 
         auto * view_thread_status = view_thread_status_ptr.get();
         views_data->thread_status_holder->thread_statuses.push_front(std::move(view_thread_status_ptr));
@@ -355,18 +345,24 @@ Chain buildPushingToViewsChain(
             runtime_stats->type = QueryViewsLogElement::ViewType::LIVE;
             query = live_view->getInnerQuery(); // Used only to log in system.query_views_log
             out = buildPushingToViewsChain(
-                view, view_metadata_snapshot, insert_context, ASTPtr(), true, thread_status_holder, view_counter_ms, storage_header);
+                view, view_metadata_snapshot, insert_context, ASTPtr(),
+                /* no_destination= */ true,
+                thread_status_holder, running_group, view_counter_ms, storage_header);
         }
         else if (auto * window_view = dynamic_cast<StorageWindowView *>(view.get()))
         {
             runtime_stats->type = QueryViewsLogElement::ViewType::WINDOW;
             query = window_view->getMergeableQuery(); // Used only to log in system.query_views_log
             out = buildPushingToViewsChain(
-                view, view_metadata_snapshot, insert_context, ASTPtr(), true, thread_status_holder, view_counter_ms);
+                view, view_metadata_snapshot, insert_context, ASTPtr(),
+                /* no_destination= */ true,
+                thread_status_holder, running_group, view_counter_ms);
         }
         else
             out = buildPushingToViewsChain(
-                view, view_metadata_snapshot, insert_context, ASTPtr(), false, thread_status_holder, view_counter_ms);
+                view, view_metadata_snapshot, insert_context, ASTPtr(),
+                /* no_destination= */ false,
+                thread_status_holder, running_group, view_counter_ms);
 
         views_data->views.emplace_back(ViewRuntimeData{
             std::move(query),
@@ -710,6 +706,7 @@ IProcessor::Status FinalizingViewsTransform::prepare()
     if (!output.canPush())
         return Status::PortFull;
 
+    bool materialized_views_ignore_errors = views_data->context->getSettingsRef().materialized_views_ignore_errors;
     size_t num_finished = 0;
     size_t pos = 0;
     for (auto & input : inputs)
@@ -735,7 +732,7 @@ IProcessor::Status FinalizingViewsTransform::prepare()
                 else
                     statuses[i].exception = data.exception;
 
-                if (i == 0 && statuses[0].is_first)
+                if (i == 0 && statuses[0].is_first && !materialized_views_ignore_errors)
                 {
                     output.pushData(std::move(data));
                     return Status::PortFull;
@@ -752,7 +749,7 @@ IProcessor::Status FinalizingViewsTransform::prepare()
         if (!statuses.empty())
             return Status::Ready;
 
-        if (any_exception)
+        if (any_exception && !materialized_views_ignore_errors)
             output.pushException(any_exception);
 
         output.finish();
@@ -782,6 +779,8 @@ static std::exception_ptr addStorageToException(std::exception_ptr ptr, const St
 
 void FinalizingViewsTransform::work()
 {
+    bool materialized_views_ignore_errors = views_data->context->getSettingsRef().materialized_views_ignore_errors;
+
     size_t i = 0;
     for (auto & view : views_data->views)
     {
@@ -794,6 +793,10 @@ void FinalizingViewsTransform::work()
                 any_exception = status.exception;
 
             view.setException(addStorageToException(status.exception, view.table_id));
+
+            /// Exception will be ignored, it is saved here for the system.query_views_log
+            if (materialized_views_ignore_errors)
+                tryLogException(view.exception, &Poco::Logger::get("PushingToViews"), "Cannot push to the storage, ignoring the error");
         }
         else
         {
diff --git a/src/Processors/Transforms/buildPushingToViewsChain.h b/src/Processors/Transforms/buildPushingToViewsChain.h
index 76131a8df6e..0f413bee5c6 100644
--- a/src/Processors/Transforms/buildPushingToViewsChain.h
+++ b/src/Processors/Transforms/buildPushingToViewsChain.h
@@ -7,6 +7,8 @@
 #include <Storages/IStorage.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Common/Stopwatch.h>
+#include <Common/ThreadStatus.h>
+
 
 namespace Poco
 {
@@ -61,6 +63,10 @@ Chain buildPushingToViewsChain(
     /// We could specify separate thread_status for each view.
     /// Needed mainly to collect counters separately. Should be improved.
     ThreadStatusesHolderPtr thread_status_holder,
+    /// Usually current_thread->getThreadGroup(), but sometimes ThreadStatus
+    /// may not have ThreadGroup (i.e. Buffer background flush), and in this
+    /// case it should be passed outside.
+    ThreadGroupPtr running_group,
     /// Counter to measure time spent separately per view. Should be improved.
     std::atomic_uint64_t * elapsed_counter_ms,
     /// LiveView executes query itself, it needs source block structure.
diff --git a/src/Processors/examples/CMakeLists.txt b/src/Processors/examples/CMakeLists.txt
index 72c3a16d32f..5d43a0d7d08 100644
--- a/src/Processors/examples/CMakeLists.txt
+++ b/src/Processors/examples/CMakeLists.txt
@@ -1,2 +1,4 @@
-clickhouse_add_executable (comma_separated_streams comma_separated_streams.cpp)
-target_link_libraries (comma_separated_streams PRIVATE dbms)
+if (TARGET ch_contrib::hivemetastore)
+    clickhouse_add_executable (comma_separated_streams comma_separated_streams.cpp)
+    target_link_libraries (comma_separated_streams PRIVATE dbms)
+endif()
diff --git a/src/Processors/tests/gtest_assert_arrow_log_does_not_abort.cpp b/src/Processors/tests/gtest_assert_arrow_log_does_not_abort.cpp
new file mode 100644
index 00000000000..8152ced287e
--- /dev/null
+++ b/src/Processors/tests/gtest_assert_arrow_log_does_not_abort.cpp
@@ -0,0 +1,27 @@
+#include "config.h"
+
+#if USE_ARROW || USE_PARQUET
+
+#include <gtest/gtest.h>
+#include <arrow/chunked_array.h>
+#include <vector>
+#include <arrow/util/logging.h>
+
+namespace DB
+{
+
+TEST(ChunkedArray, ChunkedArrayWithZeroChunksShouldNotAbort)
+{
+    std::vector<std::shared_ptr<::arrow::Array>> empty_chunks_vector;
+
+    EXPECT_ANY_THROW(::arrow::ChunkedArray{empty_chunks_vector});
+}
+
+TEST(ArrowLog, FatalLogShouldThrow)
+{
+    EXPECT_ANY_THROW(::arrow::util::ArrowLog(__FILE__, __LINE__, ::arrow::util::ArrowLogLevel::ARROW_FATAL));
+}
+
+}
+
+#endif
diff --git a/src/QueryPipeline/BlockIO.cpp b/src/QueryPipeline/BlockIO.cpp
index 9af7cd2b772..231c369707e 100644
--- a/src/QueryPipeline/BlockIO.cpp
+++ b/src/QueryPipeline/BlockIO.cpp
@@ -4,6 +4,10 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int QUERY_WAS_CANCELLED;
+}
 
 void BlockIO::reset()
 {
@@ -58,7 +62,26 @@ void BlockIO::onFinish()
 void BlockIO::onException()
 {
     if (exception_callback)
-        exception_callback();
+        exception_callback(/* log_error */ true);
+
+    pipeline.reset();
+}
+
+void BlockIO::onCancelOrConnectionLoss()
+{
+    /// Query was not finished gracefully, so we should call exception_callback
+    /// But we don't have a real exception
+    if (exception_callback)
+    {
+        try
+        {
+            throw Exception(ErrorCodes::QUERY_WAS_CANCELLED, "Query was cancelled or a client has unexpectedly dropped the connection");
+        }
+        catch (...)
+        {
+            exception_callback(/* log_error */ false);
+        }
+    }
 
     pipeline.reset();
 }
diff --git a/src/QueryPipeline/BlockIO.h b/src/QueryPipeline/BlockIO.h
index 4c8d29d0ba8..ff85a0d6772 100644
--- a/src/QueryPipeline/BlockIO.h
+++ b/src/QueryPipeline/BlockIO.h
@@ -26,13 +26,14 @@ struct BlockIO
 
     /// Callbacks for query logging could be set here.
     std::function<void(QueryPipeline &)> finish_callback;
-    std::function<void()> exception_callback;
+    std::function<void(bool)> exception_callback;
 
     /// When it is true, don't bother sending any non-empty blocks to the out stream
     bool null_format = false;
 
     void onFinish();
     void onException();
+    void onCancelOrConnectionLoss();
 
     /// Set is_all_data_sent in system.processes for this query.
     void setAllDataSent() const;
diff --git a/src/QueryPipeline/Chain.cpp b/src/QueryPipeline/Chain.cpp
index 6122517432a..eaa36071542 100644
--- a/src/QueryPipeline/Chain.cpp
+++ b/src/QueryPipeline/Chain.cpp
@@ -99,6 +99,14 @@ void Chain::addSink(ProcessorPtr processor)
     processors.emplace_back(std::move(processor));
 }
 
+void Chain::appendChain(Chain chain)
+{
+    connect(getOutputPort(), chain.getInputPort());
+    processors.splice(processors.end(), std::move(chain.processors));
+    attachResources(chain.detachResources());
+    num_threads += chain.num_threads;
+}
+
 IProcessor & Chain::getSource()
 {
     checkInitialized(processors);
diff --git a/src/QueryPipeline/Chain.h b/src/QueryPipeline/Chain.h
index d6139281990..322e49d0d49 100644
--- a/src/QueryPipeline/Chain.h
+++ b/src/QueryPipeline/Chain.h
@@ -7,6 +7,10 @@
 namespace DB
 {
 
+/// Has one unconnected input port and one unconnected output port.
+/// There may be other ports on the processors, but they must all be connected.
+/// The unconnected input must be on the first processor, output - on the last.
+/// The processors don't necessarily form an actual chain.
 class Chain
 {
 public:
@@ -27,6 +31,7 @@ public:
 
     void addSource(ProcessorPtr processor);
     void addSink(ProcessorPtr processor);
+    void appendChain(Chain chain);
 
     IProcessor & getSource();
     IProcessor & getSink();
@@ -44,7 +49,11 @@ public:
     void addStorageHolder(StoragePtr storage) { holder.storage_holders.emplace_back(std::move(storage)); }
     void addInterpreterContext(ContextPtr context) { holder.interpreter_context.emplace_back(std::move(context)); }
 
-    void attachResources(QueryPlanResourceHolder holder_) { holder = std::move(holder_); }
+    void attachResources(QueryPlanResourceHolder holder_)
+    {
+        /// This operator "=" actually merges holder_ into holder, doesn't replace.
+        holder = std::move(holder_);
+    }
     QueryPlanResourceHolder detachResources() { return std::move(holder); }
 
     void reset();
diff --git a/src/QueryPipeline/ConnectionCollector.cpp b/src/QueryPipeline/ConnectionCollector.cpp
deleted file mode 100644
index 7c484dcd6e8..00000000000
--- a/src/QueryPipeline/ConnectionCollector.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-#include <QueryPipeline/ConnectionCollector.h>
-
-#include <Core/BackgroundSchedulePool.h>
-#include <Interpreters/Context.h>
-#include <Common/Exception.h>
-#include <Common/NetException.h>
-#include "Core/Protocol.h"
-#include <Common/logger_useful.h>
-
-namespace CurrentMetrics
-{
-extern const Metric AsyncDrainedConnections;
-extern const Metric ActiveAsyncDrainedConnections;
-}
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-    extern const int UNEXPECTED_PACKET_FROM_SERVER;
-}
-
-std::unique_ptr<ConnectionCollector> ConnectionCollector::connection_collector;
-
-static constexpr UInt64 max_connection_draining_tasks_per_thread = 20;
-
-ConnectionCollector::ConnectionCollector(ContextMutablePtr global_context_, size_t max_threads)
-    : WithMutableContext(global_context_), pool(max_threads, max_threads, max_threads * max_connection_draining_tasks_per_thread)
-{
-}
-
-ConnectionCollector & ConnectionCollector::init(ContextMutablePtr global_context_, size_t max_threads)
-{
-    if (connection_collector)
-    {
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Connection collector is initialized twice. This is a bug");
-    }
-
-    connection_collector.reset(new ConnectionCollector(global_context_, max_threads));
-    return *connection_collector;
-}
-
-struct AsyncDrainTask
-{
-    const ConnectionPoolWithFailoverPtr pool;
-    std::shared_ptr<IConnections> shared_connections;
-    void operator()() const
-    {
-        ConnectionCollector::drainConnections(*shared_connections, /* throw_error= */ false);
-    }
-
-    // We don't have std::unique_function yet. Wrap it in shared_ptr to make the functor copyable.
-    std::shared_ptr<CurrentMetrics::Increment> metric_increment
-        = std::make_shared<CurrentMetrics::Increment>(CurrentMetrics::ActiveAsyncDrainedConnections);
-};
-
-std::shared_ptr<IConnections> ConnectionCollector::enqueueConnectionCleanup(
-    const ConnectionPoolWithFailoverPtr & pool, std::shared_ptr<IConnections> connections) noexcept
-{
-    if (!connections)
-        return nullptr;
-
-    if (connection_collector)
-    {
-        if (connection_collector->pool.trySchedule(AsyncDrainTask{pool, connections}))
-        {
-            CurrentMetrics::add(CurrentMetrics::AsyncDrainedConnections, 1);
-            return nullptr;
-        }
-    }
-    return connections;
-}
-
-void ConnectionCollector::drainConnections(IConnections & connections, bool throw_error)
-{
-    bool is_drained = false;
-    try
-    {
-        Packet packet = connections.drain();
-        is_drained = true;
-        switch (packet.type)
-        {
-            case Protocol::Server::EndOfStream:
-            case Protocol::Server::Log:
-            case Protocol::Server::ProfileEvents:
-                break;
-
-            case Protocol::Server::Exception:
-                packet.exception->rethrow();
-                break;
-
-            default:
-                /// Connection should be closed in case of unexpected packet,
-                /// since this means that the connection in some bad state.
-                is_drained = false;
-                throw NetException(
-                    ErrorCodes::UNEXPECTED_PACKET_FROM_SERVER,
-                    "Unexpected packet {} from one of the following replicas: {}. (expected EndOfStream, Log, ProfileEvents or Exception)",
-                    Protocol::Server::toString(packet.type),
-                    connections.dumpAddresses());
-        }
-    }
-    catch (...)
-    {
-        tryLogCurrentException(&Poco::Logger::get("ConnectionCollector"), __PRETTY_FUNCTION__);
-        if (!is_drained)
-        {
-            try
-            {
-                connections.disconnect();
-            }
-            catch (...)
-            {
-                tryLogCurrentException(&Poco::Logger::get("ConnectionCollector"), __PRETTY_FUNCTION__);
-            }
-        }
-
-        if (throw_error)
-            throw;
-    }
-}
-
-}
diff --git a/src/QueryPipeline/ConnectionCollector.h b/src/QueryPipeline/ConnectionCollector.h
deleted file mode 100644
index 44482607277..00000000000
--- a/src/QueryPipeline/ConnectionCollector.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <Client/IConnections.h>
-#include <Interpreters/Context_fwd.h>
-#include <boost/noncopyable.hpp>
-#include <Common/ThreadPool.h>
-
-namespace DB
-{
-
-class ConnectionPoolWithFailover;
-using ConnectionPoolWithFailoverPtr = std::shared_ptr<ConnectionPoolWithFailover>;
-
-class ConnectionCollector : boost::noncopyable, WithMutableContext
-{
-public:
-    static ConnectionCollector & init(ContextMutablePtr global_context_, size_t max_threads);
-    static std::shared_ptr<IConnections>
-    enqueueConnectionCleanup(const ConnectionPoolWithFailoverPtr & pool, std::shared_ptr<IConnections> connections) noexcept;
-    static void drainConnections(IConnections & connections, bool throw_error);
-
-private:
-    explicit ConnectionCollector(ContextMutablePtr global_context_, size_t max_threads);
-
-    static constexpr size_t reschedule_time_ms = 1000;
-    ThreadPool pool;
-    static std::unique_ptr<ConnectionCollector> connection_collector;
-};
-
-}
diff --git a/src/QueryPipeline/QueryPipeline.cpp b/src/QueryPipeline/QueryPipeline.cpp
index b7b18014f1f..87a1408969e 100644
--- a/src/QueryPipeline/QueryPipeline.cpp
+++ b/src/QueryPipeline/QueryPipeline.cpp
@@ -1,3 +1,5 @@
+#include <QueryPipeline/QueryPipeline.h>
+
 #include <queue>
 #include <QueryPipeline/Chain.h>
 #include <Processors/Formats/IOutputFormat.h>
@@ -7,12 +9,12 @@
 #include <Interpreters/ExpressionActions.h>
 #include <QueryPipeline/ReadProgressCallback.h>
 #include <QueryPipeline/Pipe.h>
-#include <QueryPipeline/QueryPipeline.h>
 #include <Processors/Sinks/EmptySink.h>
 #include <Processors/Sinks/NullSink.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Sources/RemoteSource.h>
+#include <Processors/Sources/SourceFromChunks.h>
 #include <Processors/ISource.h>
 #include <Processors/Transforms/CountingTransform.h>
 #include <Processors/Transforms/LimitsCheckingTransform.h>
@@ -20,6 +22,7 @@
 #include <Processors/Transforms/PartialSortingTransform.h>
 #include <Processors/Transforms/StreamInQueryCacheTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Transforms/TotalsHavingTransform.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 
 
@@ -129,50 +132,79 @@ static void checkCompleted(Processors & processors)
 static void initRowsBeforeLimit(IOutputFormat * output_format)
 {
     RowsBeforeLimitCounterPtr rows_before_limit_at_least;
-
-    /// TODO: add setRowsBeforeLimitCounter as virtual method to IProcessor.
-    std::vector<LimitTransform *> limits;
-    std::vector<RemoteSource *> remote_sources;
-
+    std::vector<IProcessor *> processors;
+    std::map<LimitTransform *, std::vector<size_t>> limit_candidates;
     std::unordered_set<IProcessor *> visited;
+    bool has_limit = false;
 
     struct QueuedEntry
     {
         IProcessor * processor;
-        bool visited_limit;
+        LimitTransform * limit_processor;
+        ssize_t limit_input_port;
     };
 
     std::queue<QueuedEntry> queue;
 
-    queue.push({ output_format, false });
+    queue.push({ output_format, nullptr, -1 });
     visited.emplace(output_format);
 
     while (!queue.empty())
     {
         auto * processor = queue.front().processor;
-        auto visited_limit = queue.front().visited_limit;
+        auto * limit_processor = queue.front().limit_processor;
+        auto limit_input_port = queue.front().limit_input_port;
         queue.pop();
 
-        if (!visited_limit)
+        /// Set counter based on the following cases:
+        ///   1. Remote: Set counter on Remote
+        ///   2. Limit ... PartialSorting: Set counter on PartialSorting
+        ///   3. Limit ... TotalsHaving(with filter) ... Remote: Set counter on the input port of Limit
+        ///   4. Limit ... Remote: Set counter on Remote
+        ///   5. Limit ... : Set counter on the input port of Limit
+
+        /// Case 1.
+        if (typeid_cast<RemoteSource *>(processor) && !limit_processor)
         {
-            if (auto * limit = typeid_cast<LimitTransform *>(processor))
+            processors.emplace_back(processor);
+            continue;
+        }
+
+        if (auto * limit = typeid_cast<LimitTransform *>(processor))
+        {
+            has_limit = true;
+
+            /// Ignore child limits
+            if (limit_processor)
+                continue;
+
+            limit_processor = limit;
+            limit_candidates[limit_processor] = {};
+        }
+        else if (limit_processor)
+        {
+            /// Case 2.
+            if (typeid_cast<PartialSortingTransform *>(processor))
             {
-                visited_limit = true;
-                limits.emplace_back(limit);
+                processors.emplace_back(processor);
+                limit_candidates[limit_processor].push_back(limit_input_port);
+                continue;
             }
 
-            if (auto * source = typeid_cast<RemoteSource *>(processor))
-                remote_sources.emplace_back(source);
-        }
-        else if (auto * sorting = typeid_cast<PartialSortingTransform *>(processor))
-        {
-            if (!rows_before_limit_at_least)
-                rows_before_limit_at_least = std::make_shared<RowsBeforeLimitCounter>();
+            /// Case 3.
+            if (auto * having = typeid_cast<TotalsHavingTransform *>(processor))
+            {
+                if (having->hasFilter())
+                    continue;
+            }
 
-            sorting->setRowsBeforeLimitCounter(rows_before_limit_at_least);
-
-            /// Don't go to children. Take rows_before_limit from last PartialSortingTransform.
-            continue;
+            /// Case 4.
+            if (typeid_cast<RemoteSource *>(processor))
+            {
+                processors.emplace_back(processor);
+                limit_candidates[limit_processor].push_back(limit_input_port);
+                continue;
+            }
         }
 
         /// Skip totals and extremes port for output format.
@@ -180,37 +212,58 @@ static void initRowsBeforeLimit(IOutputFormat * output_format)
         {
             auto * child_processor = &format->getPort(IOutputFormat::PortKind::Main).getOutputPort().getProcessor();
             if (visited.emplace(child_processor).second)
-                queue.push({ child_processor, visited_limit });
+                queue.push({ child_processor, limit_processor, limit_input_port });
 
             continue;
         }
 
-        for (auto & child_port : processor->getInputs())
+        if (limit_processor == processor)
         {
-            auto * child_processor = &child_port.getOutputPort().getProcessor();
-            if (visited.emplace(child_processor).second)
-                queue.push({ child_processor, visited_limit });
+            ssize_t i = 0;
+            for (auto & child_port : processor->getInputs())
+            {
+                auto * child_processor = &child_port.getOutputPort().getProcessor();
+                if (visited.emplace(child_processor).second)
+                    queue.push({ child_processor, limit_processor, i });
+                ++i;
+            }
+        }
+        else
+        {
+            for (auto & child_port : processor->getInputs())
+            {
+                auto * child_processor = &child_port.getOutputPort().getProcessor();
+                if (visited.emplace(child_processor).second)
+                    queue.push({ child_processor, limit_processor, limit_input_port });
+            }
         }
     }
 
-    if (!rows_before_limit_at_least && (!limits.empty() || !remote_sources.empty()))
+    /// Case 5.
+    for (auto && [limit, ports] : limit_candidates)
     {
-        rows_before_limit_at_least = std::make_shared<RowsBeforeLimitCounter>();
-
-        for (auto & limit : limits)
-            limit->setRowsBeforeLimitCounter(rows_before_limit_at_least);
-
-        for (auto & source : remote_sources)
-            source->setRowsBeforeLimitCounter(rows_before_limit_at_least);
+        /// If there are some input ports which don't have the counter, add it to LimitTransform.
+        if (ports.size() < limit->getInputs().size())
+        {
+            processors.push_back(limit);
+            for (auto port : ports)
+                limit->setInputPortHasCounter(port);
+        }
     }
 
-    /// If there is a limit, then enable rows_before_limit_at_least
-    /// It is needed when zero rows is read, but we still want rows_before_limit_at_least in result.
-    if (!limits.empty())
-        rows_before_limit_at_least->add(0);
+    if (!processors.empty())
+    {
+        rows_before_limit_at_least = std::make_shared<RowsBeforeLimitCounter>();
+        for (auto & processor : processors)
+            processor->setRowsBeforeLimitCounter(rows_before_limit_at_least);
+
+        /// If there is a limit, then enable rows_before_limit_at_least
+        /// It is needed when zero rows is read, but we still want rows_before_limit_at_least in result.
+        if (has_limit)
+            rows_before_limit_at_least->add(0);
 
-    if (rows_before_limit_at_least)
         output_format->setRowsBeforeLimitCounter(rows_before_limit_at_least);
+    }
 }
 
 
@@ -525,13 +578,31 @@ bool QueryPipeline::tryGetResultRowsAndBytes(UInt64 & result_rows, UInt64 & resu
     return true;
 }
 
-void QueryPipeline::streamIntoQueryCache(std::shared_ptr<StreamInQueryCacheTransform> transform)
+void QueryPipeline::writeResultIntoQueryCache(std::shared_ptr<QueryCache::Writer> query_cache_writer)
 {
     assert(pulling());
 
-    connect(*output, transform->getInputPort());
-    output = &transform->getOutputPort();
-    processors->emplace_back(transform);
+    /// Attach a special transform to all output ports (result + possibly totals/extremes). The only purpose of the transform is
+    /// to write each chunk into the query cache. All transforms hold a refcounted reference to the same query cache writer object.
+    /// This ensures that all transforms write to the single same cache entry. The writer object synchronizes internally, the
+    /// expensive stuff like cloning chunks happens outside lock scopes).
+
+    auto add_stream_in_query_cache_transform = [&](OutputPort *& out_port, QueryCache::Writer::ChunkType chunk_type)
+    {
+        if (!out_port)
+            return;
+
+        auto transform = std::make_shared<StreamInQueryCacheTransform>(out_port->getHeader(), query_cache_writer, chunk_type);
+        connect(*out_port, transform->getInputPort());
+        out_port = &transform->getOutputPort();
+        processors->emplace_back(std::move(transform));
+    };
+
+    using enum QueryCache::Writer::ChunkType;
+
+    add_stream_in_query_cache_transform(output, Result);
+    add_stream_in_query_cache_transform(totals, Totals);
+    add_stream_in_query_cache_transform(extremes, Extremes);
 }
 
 void QueryPipeline::finalizeWriteInQueryCache()
@@ -540,12 +611,33 @@ void QueryPipeline::finalizeWriteInQueryCache()
         processors->begin(), processors->end(),
         [](ProcessorPtr processor){ return dynamic_cast<StreamInQueryCacheTransform *>(&*processor); });
 
-    /// the pipeline should theoretically contain just one StreamInQueryCacheTransform
-
+    /// The pipeline can contain up to three StreamInQueryCacheTransforms which all point to the same query cache writer object.
+    /// We can call finalize() on any of them.
     if (it != processors->end())
         dynamic_cast<StreamInQueryCacheTransform &>(**it).finalizeWriteInQueryCache();
 }
 
+void QueryPipeline::readFromQueryCache(
+        std::unique_ptr<SourceFromChunks> source,
+        std::unique_ptr<SourceFromChunks> source_totals,
+        std::unique_ptr<SourceFromChunks> source_extremes)
+{
+    /// Construct the pipeline from the input source processors. The processors are provided by the query cache to produce chunks of a
+    /// previous query result.
+
+    auto add_stream_from_query_cache_source = [&](OutputPort *& out_port, std::unique_ptr<SourceFromChunks> source_)
+    {
+        if (!source_)
+            return;
+        out_port = &source_->getPort();
+        processors->emplace_back(std::shared_ptr<SourceFromChunks>(std::move(source_)));
+    };
+
+    add_stream_from_query_cache_source(output, std::move(source));
+    add_stream_from_query_cache_source(totals, std::move(source_totals));
+    add_stream_from_query_cache_source(extremes, std::move(source_extremes));
+}
+
 void QueryPipeline::addStorageHolder(StoragePtr storage)
 {
     resources.storage_holders.emplace_back(std::move(storage));
diff --git a/src/QueryPipeline/QueryPipeline.h b/src/QueryPipeline/QueryPipeline.h
index 55c78ca78ed..0476b8e4bbf 100644
--- a/src/QueryPipeline/QueryPipeline.h
+++ b/src/QueryPipeline/QueryPipeline.h
@@ -2,6 +2,7 @@
 #include <QueryPipeline/QueryPlanResourceHolder.h>
 #include <QueryPipeline/SizeLimits.h>
 #include <QueryPipeline/StreamLocalLimits.h>
+#include <Interpreters/Cache/QueryCache.h> /// nested classes such as QC::Writer can't be fwd declared
 #include <functional>
 
 namespace DB
@@ -31,7 +32,6 @@ class SinkToStorage;
 class ISource;
 class ISink;
 class ReadProgressCallback;
-class StreamInQueryCacheTransform;
 
 struct ColumnWithTypeAndName;
 using ColumnsWithTypeAndName = std::vector<ColumnWithTypeAndName>;
@@ -105,8 +105,12 @@ public:
     void setLimitsAndQuota(const StreamLocalLimits & limits, std::shared_ptr<const EnabledQuota> quota_);
     bool tryGetResultRowsAndBytes(UInt64 & result_rows, UInt64 & result_bytes) const;
 
-    void streamIntoQueryCache(std::shared_ptr<StreamInQueryCacheTransform> transform);
+    void writeResultIntoQueryCache(std::shared_ptr<QueryCache::Writer> query_cache_writer);
     void finalizeWriteInQueryCache();
+    void readFromQueryCache(
+        std::unique_ptr<SourceFromChunks> source,
+        std::unique_ptr<SourceFromChunks> source_totals,
+        std::unique_ptr<SourceFromChunks> source_extremes);
 
     void setQuota(std::shared_ptr<const EnabledQuota> quota_);
 
diff --git a/src/QueryPipeline/QueryPipelineBuilder.cpp b/src/QueryPipeline/QueryPipelineBuilder.cpp
index 07adc6b0b3a..764997e7b7e 100644
--- a/src/QueryPipeline/QueryPipelineBuilder.cpp
+++ b/src/QueryPipeline/QueryPipelineBuilder.cpp
@@ -27,7 +27,6 @@
 #include <Processors/Transforms/MergeJoinTransform.h>
 #include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
 #include <Processors/Transforms/PartialSortingTransform.h>
-#include <Processors/Transforms/ReadFromMergeTreeDependencyTransform.h>
 #include <Processors/Transforms/TotalsHavingTransform.h>
 #include <QueryPipeline/narrowPipe.h>
 
@@ -492,7 +491,7 @@ std::unique_ptr<QueryPipelineBuilder> QueryPipelineBuilder::joinPipelinesRightLe
         if (delayed_root)
         {
             // Process delayed joined blocks when all JoiningTransform are finished.
-            auto delayed = std::make_shared<DelayedJoinedBlocksWorkerTransform>(joined_header);
+            auto delayed = std::make_shared<DelayedJoinedBlocksWorkerTransform>(left_header, joined_header, max_block_size, join);
             if (delayed->getInputs().size() != 1 || delayed->getOutputs().size() != 1)
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "DelayedJoinedBlocksWorkerTransform should have one input and one output");
 
@@ -621,65 +620,6 @@ void QueryPipelineBuilder::setProgressCallback(ProgressCallback callback)
     progress_callback = callback;
 }
 
-void QueryPipelineBuilder::connectDependencies()
-{
-    /**
-    * This is needed because among all RemoteSources there could be
-    * one or several that don't belong to the parallel replicas reading process.
-    * It could happen for example if we read through distributed table + prefer_localhost_replica=1 + parallel replicas
-    * SELECT * FROM remote('127.0.0.{1,2}', table.merge_tree)
-    * Will generate a local pipeline and a remote source. For local pipeline because of parallel replicas we will create
-    * several processors to read and several remote sources.
-    */
-    std::set<UUID> all_parallel_replicas_groups;
-    for (auto & processor : *pipe.getProcessorsPtr())
-    {
-        if (auto * remote_dependency = typeid_cast<RemoteSource *>(processor.get()); remote_dependency)
-            if (auto uuid = remote_dependency->getParallelReplicasGroupUUID(); uuid != UUIDHelpers::Nil)
-                all_parallel_replicas_groups.insert(uuid);
-        if (auto * merge_tree_dependency = typeid_cast<ReadFromMergeTreeDependencyTransform *>(processor.get()); merge_tree_dependency)
-            if (auto uuid = merge_tree_dependency->getParallelReplicasGroupUUID(); uuid != UUIDHelpers::Nil)
-                all_parallel_replicas_groups.insert(uuid);
-    }
-
-    for (const auto & group_id : all_parallel_replicas_groups)
-    {
-        std::vector<RemoteSource *> input_dependencies;
-        std::vector<ReadFromMergeTreeDependencyTransform *> output_dependencies;
-
-        for (auto & processor : *pipe.getProcessorsPtr())
-        {
-            if (auto * remote_dependency = typeid_cast<RemoteSource *>(processor.get()); remote_dependency)
-                if (auto uuid = remote_dependency->getParallelReplicasGroupUUID(); uuid == group_id)
-                    input_dependencies.emplace_back(remote_dependency);
-            if (auto * merge_tree_dependency = typeid_cast<ReadFromMergeTreeDependencyTransform *>(processor.get()); merge_tree_dependency)
-                if (auto uuid = merge_tree_dependency->getParallelReplicasGroupUUID(); uuid == group_id)
-                    output_dependencies.emplace_back(merge_tree_dependency);
-        }
-
-        if (input_dependencies.empty() || output_dependencies.empty())
-            continue;
-
-        auto input_dependency_iter = input_dependencies.begin();
-        auto output_dependency_iter = output_dependencies.begin();
-        auto scheduler = std::make_shared<ResizeProcessor>(Block{}, input_dependencies.size(), output_dependencies.size());
-
-        for (auto & scheduler_input : scheduler->getInputs())
-        {
-            (*input_dependency_iter)->connectToScheduler(scheduler_input);
-            ++input_dependency_iter;
-        }
-
-        for (auto & scheduler_output : scheduler->getOutputs())
-        {
-            (*output_dependency_iter)->connectToScheduler(scheduler_output);
-            ++output_dependency_iter;
-        }
-
-        pipe.getProcessorsPtr()->emplace_back(std::move(scheduler));
-    }
-}
-
 PipelineExecutorPtr QueryPipelineBuilder::execute()
 {
     if (!isCompleted())
diff --git a/src/QueryPipeline/QueryPipelineBuilder.h b/src/QueryPipeline/QueryPipelineBuilder.h
index 4f984680c75..3a5d65d4388 100644
--- a/src/QueryPipeline/QueryPipelineBuilder.h
+++ b/src/QueryPipeline/QueryPipelineBuilder.h
@@ -140,12 +140,6 @@ public:
 
     void addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, ContextPtr context);
 
-    /// Finds all processors for reading from MergeTree
-    /// And explicitly connects them with all RemoteSources
-    /// using a ResizeProcessor. This is needed not to let
-    /// the RemoteSource to starve for CPU time
-    void connectDependencies();
-
     PipelineExecutorPtr execute();
 
     size_t getNumStreams() const { return pipe.numOutputPorts(); }
diff --git a/src/QueryPipeline/ReadProgressCallback.cpp b/src/QueryPipeline/ReadProgressCallback.cpp
index 6692b0f96bd..0f50d56f1a5 100644
--- a/src/QueryPipeline/ReadProgressCallback.cpp
+++ b/src/QueryPipeline/ReadProgressCallback.cpp
@@ -112,22 +112,13 @@ bool ReadProgressCallback::onProgress(uint64_t read_rows, uint64_t read_bytes, c
 
         size_t total_rows = progress.total_rows_to_read;
 
-        constexpr UInt64 profile_events_update_period_microseconds = 10 * 1000; // 10 milliseconds
-        UInt64 total_elapsed_microseconds = total_stopwatch.elapsedMicroseconds();
+        CurrentThread::updatePerformanceCountersIfNeeded();
 
-        std::lock_guard lock(last_profile_events_update_time_mutex);
-        {
-            if (last_profile_events_update_time + profile_events_update_period_microseconds < total_elapsed_microseconds)
-            {
-                /// TODO: Should be done in PipelineExecutor.
-                CurrentThread::updatePerformanceCounters();
-                last_profile_events_update_time = total_elapsed_microseconds;
-            }
-        }
+        std::lock_guard lock(limits_and_quotas_mutex);
 
         /// TODO: Should be done in PipelineExecutor.
         for (const auto & limits : storage_limits)
-            limits.local_limits.speed_limits.throttle(progress.read_rows, progress.read_bytes, total_rows, total_elapsed_microseconds);
+            limits.local_limits.speed_limits.throttle(progress.read_rows, progress.read_bytes, total_rows, total_stopwatch.elapsedMicroseconds());
 
         if (quota)
             quota->used({QuotaType::READ_ROWS, value.read_rows}, {QuotaType::READ_BYTES, value.read_bytes});
diff --git a/src/QueryPipeline/ReadProgressCallback.h b/src/QueryPipeline/ReadProgressCallback.h
index c8f0d4cf537..08f2f9fc99b 100644
--- a/src/QueryPipeline/ReadProgressCallback.h
+++ b/src/QueryPipeline/ReadProgressCallback.h
@@ -38,10 +38,8 @@ private:
     /// The approximate total number of rows to read. For progress bar.
     std::atomic_size_t total_rows_approx = 0;
 
-    Stopwatch total_stopwatch {CLOCK_MONOTONIC_COARSE};    /// Time with waiting time.
-    /// According to total_stopwatch in microseconds.
-    UInt64 last_profile_events_update_time = 0;
-    std::mutex last_profile_events_update_time_mutex;
+    std::mutex limits_and_quotas_mutex;
+    Stopwatch total_stopwatch{CLOCK_MONOTONIC_COARSE};  /// Including waiting time
 
     bool update_profile_events = true;
 };
diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
index a10d70d22e9..991876eccbd 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -1,6 +1,4 @@
 #include <Common/ConcurrentBoundedQueue.h>
-
-#include <QueryPipeline/ConnectionCollector.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
 #include <QueryPipeline/RemoteQueryExecutorReadContext.h>
 
@@ -13,7 +11,6 @@
 #include <Processors/Transforms/LimitsCheckingTransform.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
-#include <Storages/IStorage.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Interpreters/castColumn.h>
 #include <Interpreters/Cluster.h>
@@ -23,16 +20,12 @@
 #include <Client/MultiplexedConnections.h>
 #include <Client/HedgedConnections.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
+#include <Storages/StorageMemory.h>
 
 
-namespace CurrentMetrics
-{
-    extern const Metric SyncDrainedConnections;
-    extern const Metric ActiveSyncDrainedConnections;
-}
-
 namespace ProfileEvents
 {
+    extern const Event SuspendSendingQueryToShard;
     extern const Event ReadTaskRequestsReceived;
     extern const Event MergeTreeReadTaskRequestsReceived;
 }
@@ -65,9 +58,9 @@ RemoteQueryExecutor::RemoteQueryExecutor(
     QueryProcessingStage::Enum stage_, std::optional<Extension> extension_)
     : RemoteQueryExecutor(query_, header_, context_, scalars_, external_tables_, stage_, extension_)
 {
-    create_connections = [this, &connection, throttler, extension_]()
+    create_connections = [this, &connection, throttler, extension_](AsyncCallback)
     {
-        auto res = std::make_shared<MultiplexedConnections>(connection, context->getSettingsRef(), throttler);
+        auto res = std::make_unique<MultiplexedConnections>(connection, context->getSettingsRef(), throttler);
         if (extension_ && extension_->replica_info)
             res->setReplicaInfo(*extension_->replica_info);
         return res;
@@ -81,9 +74,9 @@ RemoteQueryExecutor::RemoteQueryExecutor(
     QueryProcessingStage::Enum stage_, std::optional<Extension> extension_)
     : RemoteQueryExecutor(query_, header_, context_, scalars_, external_tables_, stage_, extension_)
 {
-    create_connections = [this, connection_ptr, throttler, extension_]()
+    create_connections = [this, connection_ptr, throttler, extension_](AsyncCallback)
     {
-        auto res = std::make_shared<MultiplexedConnections>(connection_ptr, context->getSettingsRef(), throttler);
+        auto res = std::make_unique<MultiplexedConnections>(connection_ptr, context->getSettingsRef(), throttler);
         if (extension_ && extension_->replica_info)
             res->setReplicaInfo(*extension_->replica_info);
         return res;
@@ -91,7 +84,6 @@ RemoteQueryExecutor::RemoteQueryExecutor(
 }
 
 RemoteQueryExecutor::RemoteQueryExecutor(
-    const ConnectionPoolWithFailoverPtr & pool_,
     std::vector<IConnectionPool::Entry> && connections_,
     const String & query_, const Block & header_, ContextPtr context_,
     const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_,
@@ -100,10 +92,9 @@ RemoteQueryExecutor::RemoteQueryExecutor(
     , scalars(scalars_), external_tables(external_tables_), stage(stage_)
     , task_iterator(extension_ ? extension_->task_iterator : nullptr)
     , parallel_reading_coordinator(extension_ ? extension_->parallel_reading_coordinator : nullptr)
-    , pool(pool_)
 {
-    create_connections = [this, connections_, throttler, extension_]() mutable {
-        auto res = std::make_shared<MultiplexedConnections>(std::move(connections_), context->getSettingsRef(), throttler);
+    create_connections = [this, connections_, throttler, extension_](AsyncCallback) mutable {
+        auto res = std::make_unique<MultiplexedConnections>(std::move(connections_), context->getSettingsRef(), throttler);
         if (extension_ && extension_->replica_info)
             res->setReplicaInfo(*extension_->replica_info);
         return res;
@@ -111,7 +102,7 @@ RemoteQueryExecutor::RemoteQueryExecutor(
 }
 
 RemoteQueryExecutor::RemoteQueryExecutor(
-    const ConnectionPoolWithFailoverPtr & pool_,
+    const ConnectionPoolWithFailoverPtr & pool,
     const String & query_, const Block & header_, ContextPtr context_,
     const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_,
     QueryProcessingStage::Enum stage_, std::optional<Extension> extension_)
@@ -119,9 +110,8 @@ RemoteQueryExecutor::RemoteQueryExecutor(
     , scalars(scalars_), external_tables(external_tables_), stage(stage_)
     , task_iterator(extension_ ? extension_->task_iterator : nullptr)
     , parallel_reading_coordinator(extension_ ? extension_->parallel_reading_coordinator : nullptr)
-    , pool(pool_)
 {
-    create_connections = [this, throttler, extension_]()->std::shared_ptr<IConnections>
+    create_connections = [this, pool, throttler, extension_](AsyncCallback async_callback)->std::unique_ptr<IConnections>
     {
         const Settings & current_settings = context->getSettingsRef();
         auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
@@ -133,7 +123,7 @@ RemoteQueryExecutor::RemoteQueryExecutor(
             if (main_table)
                 table_to_check = std::make_shared<QualifiedTableName>(main_table.getQualifiedName());
 
-            auto res = std::make_shared<HedgedConnections>(pool, context, timeouts, throttler, pool_mode, table_to_check);
+            auto res = std::make_unique<HedgedConnections>(pool, context, timeouts, throttler, pool_mode, table_to_check, std::move(async_callback));
             if (extension_ && extension_->replica_info)
                 res->setReplicaInfo(*extension_->replica_info);
             return res;
@@ -143,15 +133,15 @@ RemoteQueryExecutor::RemoteQueryExecutor(
         std::vector<IConnectionPool::Entry> connection_entries;
         if (main_table)
         {
-            auto try_results = pool->getManyChecked(timeouts, &current_settings, pool_mode, main_table.getQualifiedName());
+            auto try_results = pool->getManyChecked(timeouts, &current_settings, pool_mode, main_table.getQualifiedName(), std::move(async_callback));
             connection_entries.reserve(try_results.size());
             for (auto & try_result : try_results)
                 connection_entries.emplace_back(std::move(try_result.entry));
         }
         else
-            connection_entries = pool->getMany(timeouts, &current_settings, pool_mode);
+            connection_entries = pool->getMany(timeouts, &current_settings, pool_mode, std::move(async_callback));
 
-        auto res = std::make_shared<MultiplexedConnections>(std::move(connection_entries), current_settings, throttler);
+        auto res = std::make_unique<MultiplexedConnections>(std::move(connection_entries), current_settings, throttler);
         if (extension_ && extension_->replica_info)
             res->setReplicaInfo(*extension_->replica_info);
         return res;
@@ -160,11 +150,20 @@ RemoteQueryExecutor::RemoteQueryExecutor(
 
 RemoteQueryExecutor::~RemoteQueryExecutor()
 {
+    /// We should finish establishing connections to disconnect it later,
+    /// so these connections won't be in the out-of-sync state.
+    if (read_context && !established)
+    {
+        /// Set was_cancelled, so the query won't be sent after creating connections.
+        was_cancelled = true;
+        read_context->cancel();
+    }
+
     /** If interrupted in the middle of the loop of communication with replicas, then interrupt
       * all connections, then read and skip the remaining packets to make sure
       * these connections did not remain hanging in the out-of-sync state.
       */
-    if (established || isQueryPending())
+    if (established || (isQueryPending() && connections))
         connections->disconnect();
 }
 
@@ -217,17 +216,8 @@ static Block adaptBlockStructure(const Block & block, const Block & header)
     return res;
 }
 
-void RemoteQueryExecutor::sendQuery(ClientInfo::QueryKind query_kind)
+void RemoteQueryExecutor::sendQuery(ClientInfo::QueryKind query_kind, AsyncCallback async_callback)
 {
-    if (sent_query)
-        return;
-
-    connections = create_connections();
-
-    const auto & settings = context->getSettingsRef();
-    if (settings.skip_unavailable_shards && 0 == connections->size())
-        return;
-
     /// Query cannot be canceled in the middle of the send query,
     /// since there are multiple packets:
     /// - Query
@@ -238,19 +228,36 @@ void RemoteQueryExecutor::sendQuery(ClientInfo::QueryKind query_kind)
     ///     Unexpected packet Data received from client
     ///
     std::lock_guard guard(was_cancelled_mutex);
+    sendQueryUnlocked(query_kind, async_callback);
+}
+
+void RemoteQueryExecutor::sendQueryUnlocked(ClientInfo::QueryKind query_kind, AsyncCallback async_callback)
+{
+    if (sent_query || was_cancelled)
+        return;
+
+    connections = create_connections(async_callback);
+    AsyncCallbackSetter async_callback_setter(connections.get(), async_callback);
+
+    const auto & settings = context->getSettingsRef();
+    if (needToSkipUnavailableShard())
+    {
+        /// To avoid sending the query again in the read(), we need to update the following flags:
+        was_cancelled = true;
+        finished = true;
+        sent_query = true;
+
+        return;
+    }
 
     established = true;
-    was_cancelled = false;
 
     auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
     ClientInfo modified_client_info = context->getClientInfo();
     modified_client_info.query_kind = query_kind;
 
-    {
-        std::lock_guard lock(duplicated_part_uuids_mutex);
-        if (!duplicated_part_uuids.empty())
-            connections->sendIgnoredPartUUIDs(duplicated_part_uuids);
-    }
+    if (!duplicated_part_uuids.empty())
+        connections->sendIgnoredPartUUIDs(duplicated_part_uuids);
 
     connections->sendQuery(timeouts, query, query_id, stage, modified_client_info, true);
 
@@ -262,6 +269,33 @@ void RemoteQueryExecutor::sendQuery(ClientInfo::QueryKind query_kind)
     sendExternalTables();
 }
 
+int RemoteQueryExecutor::sendQueryAsync()
+{
+#if defined(OS_LINUX)
+    std::lock_guard lock(was_cancelled_mutex);
+    if (was_cancelled)
+        return -1;
+
+    if (!read_context)
+        read_context = std::make_unique<ReadContext>(*this, /*suspend_when_query_sent*/ true);
+
+    /// If query already sent, do nothing. Note that we cannot use sent_query flag here,
+    /// because we can still be in process of sending scalars or external tables.
+    if (read_context->isQuerySent())
+        return -1;
+
+    read_context->resume();
+
+    if (read_context->isQuerySent())
+        return -1;
+
+    ProfileEvents::increment(ProfileEvents::SuspendSendingQueryToShard); /// Mostly for testing purposes.
+    return read_context->getFileDescriptor();
+#else
+    sendQuery();
+    return -1;
+#endif
+}
 
 Block RemoteQueryExecutor::readBlock()
 {
@@ -298,85 +332,86 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::read()
             return anything;
 
         if (got_duplicated_part_uuids)
-            return restartQueryWithoutDuplicatedUUIDs();
+            break;
     }
+
+    return restartQueryWithoutDuplicatedUUIDs();
 }
 
-RemoteQueryExecutor::ReadResult RemoteQueryExecutor::read(std::unique_ptr<ReadContext> & read_context [[maybe_unused]])
+RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync()
 {
 #if defined(OS_LINUX)
-    if (!sent_query)
-    {
-        sendQuery();
-
-        if (context->getSettingsRef().skip_unavailable_shards && (0 == connections->size()))
-            return ReadResult(Block());
-    }
-
-    if (!read_context || resent_query)
+    if (!read_context || (resent_query && recreate_read_context))
     {
         std::lock_guard lock(was_cancelled_mutex);
         if (was_cancelled)
             return ReadResult(Block());
 
-        read_context = std::make_unique<ReadContext>(*connections);
+        read_context = std::make_unique<ReadContext>(*this);
+        recreate_read_context = false;
     }
 
     while (true)
     {
-        if (!read_context->resumeRoutine())
+        std::lock_guard lock(was_cancelled_mutex);
+        if (was_cancelled)
             return ReadResult(Block());
 
-        if (read_context->is_read_in_progress.load(std::memory_order_relaxed))
-        {
-            read_context->setTimer();
-            return ReadResult(read_context->epoll.getFileDescriptor());
-        }
-        else
-        {
-            /// We need to check that query was not cancelled again,
-            /// to avoid the race between cancel() thread and read() thread.
-            /// (since cancel() thread will steal the fiber and may update the packet).
-            if (was_cancelled)
-                return ReadResult(Block());
+        read_context->resume();
 
-            auto anything = processPacket(std::move(read_context->packet));
+        if (needToSkipUnavailableShard())
+            return ReadResult(Block());
 
-            if (anything.getType() == ReadResult::Type::Data || anything.getType() == ReadResult::Type::ParallelReplicasToken)
-                return anything;
+        /// Check if packet is not ready yet.
+        if (read_context->isInProgress())
+            return ReadResult(read_context->getFileDescriptor());
 
-            if (got_duplicated_part_uuids)
-                return restartQueryWithoutDuplicatedUUIDs(&read_context);
-        }
+        auto anything = processPacket(read_context->getPacket());
+
+        if (anything.getType() == ReadResult::Type::Data || anything.getType() == ReadResult::Type::ParallelReplicasToken)
+            return anything;
+
+        if (got_duplicated_part_uuids)
+            break;
     }
+
+    return restartQueryWithoutDuplicatedUUIDs();
 #else
     return read();
 #endif
 }
 
 
-RemoteQueryExecutor::ReadResult RemoteQueryExecutor::restartQueryWithoutDuplicatedUUIDs(std::unique_ptr<ReadContext> * read_context)
+RemoteQueryExecutor::ReadResult RemoteQueryExecutor::restartQueryWithoutDuplicatedUUIDs()
 {
-    /// Cancel previous query and disconnect before retry.
-    cancel(read_context);
-    connections->disconnect();
-
-    /// Only resend once, otherwise throw an exception
-    if (!resent_query)
     {
+        std::lock_guard lock(was_cancelled_mutex);
+        if (was_cancelled)
+            return ReadResult(Block());
+
+        /// Cancel previous query and disconnect before retry.
+        cancelUnlocked();
+        connections->disconnect();
+
+        /// Only resend once, otherwise throw an exception
+        if (resent_query)
+            throw Exception(ErrorCodes::DUPLICATED_PART_UUIDS, "Found duplicate uuids while processing query");
+
         if (log)
             LOG_DEBUG(log, "Found duplicate UUIDs, will retry query without those parts");
 
         resent_query = true;
+        recreate_read_context = true;
         sent_query = false;
         got_duplicated_part_uuids = false;
-        /// Consecutive read will implicitly send query first.
-        if (!read_context)
-            return read();
-        else
-            return read(*read_context);
+        was_cancelled = false;
     }
-    throw Exception(ErrorCodes::DUPLICATED_PART_UUIDS, "Found duplicate uuids while processing query");
+
+    /// Consecutive read will implicitly send query first.
+    if (!read_context)
+        return read();
+    else
+        return readAsync();
 }
 
 RemoteQueryExecutor::ReadResult RemoteQueryExecutor::processPacket(Packet packet)
@@ -481,7 +516,6 @@ bool RemoteQueryExecutor::setPartUUIDs(const std::vector<UUID> & uuids)
 
     if (!duplicates.empty())
     {
-        std::lock_guard lock(duplicated_part_uuids_mutex);
         duplicated_part_uuids.insert(duplicated_part_uuids.begin(), duplicates.begin(), duplicates.end());
         return false;
     }
@@ -516,8 +550,10 @@ void RemoteQueryExecutor::processMergeTreeInitialReadAnnounecement(InitialAllRan
     parallel_reading_coordinator->handleInitialAllRangesAnnouncement(announcement);
 }
 
-void RemoteQueryExecutor::finish(std::unique_ptr<ReadContext> * read_context)
+void RemoteQueryExecutor::finish()
 {
+    std::lock_guard guard(was_cancelled_mutex);
+
     /** If one of:
       * - nothing started to do;
       * - received all packets before EndOfStream;
@@ -533,31 +569,53 @@ void RemoteQueryExecutor::finish(std::unique_ptr<ReadContext> * read_context)
       */
 
     /// Send the request to abort the execution of the request, if not already sent.
-    tryCancel("Cancelling query because enough data has been read", read_context);
+    tryCancel("Cancelling query because enough data has been read");
 
-    if (context->getSettingsRef().drain_timeout != Poco::Timespan(-1000000))
-    {
-        auto connections_left = ConnectionCollector::enqueueConnectionCleanup(pool, connections);
-        if (connections_left)
-        {
-            /// Drain connections synchronously and suppress errors.
-            CurrentMetrics::Increment metric_increment(CurrentMetrics::ActiveSyncDrainedConnections);
-            ConnectionCollector::drainConnections(*connections_left, /* throw_error= */ false);
-            CurrentMetrics::add(CurrentMetrics::SyncDrainedConnections, 1);
-        }
-    }
-    else
-    {
-        /// Drain connections synchronously without suppressing errors.
-        CurrentMetrics::Increment metric_increment(CurrentMetrics::ActiveSyncDrainedConnections);
-        ConnectionCollector::drainConnections(*connections, /* throw_error= */ true);
-        CurrentMetrics::add(CurrentMetrics::SyncDrainedConnections, 1);
-    }
+    /// If connections weren't created yet or query wasn't sent, nothing to do.
+    if (!connections || !sent_query)
+        return;
 
-    finished = true;
+    /// Get the remaining packets so that there is no out of sync in the connections to the replicas.
+    Packet packet = connections->drain();
+    switch (packet.type)
+    {
+        case Protocol::Server::EndOfStream:
+            finished = true;
+            break;
+
+        case Protocol::Server::Log:
+            /// Pass logs from remote server to client
+            if (auto log_queue = CurrentThread::getInternalTextLogsQueue())
+                log_queue->pushBlock(std::move(packet.block));
+            break;
+
+        case Protocol::Server::Exception:
+            got_exception_from_replica = true;
+            packet.exception->rethrow();
+            break;
+
+        case Protocol::Server::ProfileEvents:
+            /// Pass profile events from remote server to client
+            if (auto profile_queue = CurrentThread::getInternalProfileEventsQueue())
+                if (!profile_queue->emplace(std::move(packet.block)))
+                    throw Exception(ErrorCodes::SYSTEM_ERROR, "Could not push into profile queue");
+            break;
+
+        default:
+            got_unknown_packet_from_replica = true;
+            throw Exception(ErrorCodes::UNKNOWN_PACKET_FROM_SERVER, "Unknown packet {} from one of the following replicas: {}",
+                toString(packet.type),
+                connections->dumpAddresses());
+    }
 }
 
-void RemoteQueryExecutor::cancel(std::unique_ptr<ReadContext> * read_context)
+void RemoteQueryExecutor::cancel()
+{
+    std::lock_guard guard(was_cancelled_mutex);
+    cancelUnlocked();
+}
+
+void RemoteQueryExecutor::cancelUnlocked()
 {
     {
         std::lock_guard lock(external_tables_mutex);
@@ -571,7 +629,7 @@ void RemoteQueryExecutor::cancel(std::unique_ptr<ReadContext> * read_context)
     if (!isQueryPending() || hasThrownException())
         return;
 
-    tryCancel("Cancelling query", read_context);
+    tryCancel("Cancelling query");
 }
 
 void RemoteQueryExecutor::sendScalars()
@@ -601,27 +659,30 @@ void RemoteQueryExecutor::sendExternalTables()
             for (const auto & table : external_tables)
             {
                 StoragePtr cur = table.second;
+                /// Send only temporary tables with StorageMemory
+                if (!std::dynamic_pointer_cast<StorageMemory>(cur))
+                    continue;
 
                 auto data = std::make_unique<ExternalTableData>();
                 data->table_name = table.first;
-                data->creating_pipe_callback = [cur, limits, context = this->context]()
+                data->creating_pipe_callback = [cur, limits, my_context = this->context]()
                 {
                     SelectQueryInfo query_info;
                     auto metadata_snapshot = cur->getInMemoryMetadataPtr();
-                    auto storage_snapshot = cur->getStorageSnapshot(metadata_snapshot, context);
+                    auto storage_snapshot = cur->getStorageSnapshot(metadata_snapshot, my_context);
                     QueryProcessingStage::Enum read_from_table_stage = cur->getQueryProcessingStage(
-                        context, QueryProcessingStage::Complete, storage_snapshot, query_info);
+                        my_context, QueryProcessingStage::Complete, storage_snapshot, query_info);
 
                     QueryPlan plan;
                     cur->read(
                         plan,
                         metadata_snapshot->getColumns().getNamesOfPhysical(),
-                        storage_snapshot, query_info, context,
+                        storage_snapshot, query_info, my_context,
                         read_from_table_stage, DEFAULT_BLOCK_SIZE, 1);
 
                     auto builder = plan.buildQueryPipeline(
-                        QueryPlanOptimizationSettings::fromContext(context),
-                        BuildQueryPipelineSettings::fromContext(context));
+                        QueryPlanOptimizationSettings::fromContext(my_context),
+                        BuildQueryPipelineSettings::fromContext(my_context));
 
                     builder->resize(1);
                     builder->addTransform(std::make_shared<LimitsCheckingTransform>(builder->getHeader(), limits));
@@ -639,40 +700,30 @@ void RemoteQueryExecutor::sendExternalTables()
     connections->sendExternalTablesData(external_tables_data);
 }
 
-void RemoteQueryExecutor::tryCancel(const char * reason, std::unique_ptr<ReadContext> * read_context)
+void RemoteQueryExecutor::tryCancel(const char * reason)
 {
-    /// Flag was_cancelled is atomic because it is checked in read(),
-    /// in case of packet had been read by fiber (async_socket_for_remote).
-    std::lock_guard guard(was_cancelled_mutex);
-
     if (was_cancelled)
         return;
 
     was_cancelled = true;
 
-    if (read_context && *read_context)
+    if (read_context)
+        read_context->cancel();
+
+    /// Query could be cancelled during connection creation, query sending or data receiving.
+    /// We should send cancel request if connections were already created, query were sent
+    /// and remote query is not finished.
+    if (connections && sent_query && !finished)
     {
-        /// The timer should be set for query cancellation to avoid query cancellation hung.
-        ///
-        /// Since in case the remote server will abnormally terminated, neither
-        /// FIN nor RST packet will be sent, and the initiator will not know that
-        /// the connection died (unless tcp_keep_alive_timeout > 0).
-        ///
-        /// Also note that it is possible to get this situation even when
-        /// enough data already had been read.
-        (*read_context)->setTimer();
-        (*read_context)->cancel();
+        connections->sendCancel();
+        if (log)
+            LOG_TRACE(log, "({}) {}", connections->dumpAddresses(), reason);
     }
-
-    connections->sendCancel();
-
-    if (log)
-        LOG_TRACE(log, "({}) {}", connections->dumpAddresses(), reason);
 }
 
 bool RemoteQueryExecutor::isQueryPending() const
 {
-    return sent_query && !finished;
+    return (sent_query || read_context) && !finished;
 }
 
 bool RemoteQueryExecutor::hasThrownException() const
diff --git a/src/QueryPipeline/RemoteQueryExecutor.h b/src/QueryPipeline/RemoteQueryExecutor.h
index c67a45c7275..96dc5510bf4 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.h
+++ b/src/QueryPipeline/RemoteQueryExecutor.h
@@ -52,7 +52,6 @@ public:
     };
 
     /// Takes already set connection.
-    /// We don't own connection, thus we have to drain it synchronously.
     RemoteQueryExecutor(
         Connection & connection,
         const String & query_, const Block & header_, ContextPtr context_,
@@ -68,7 +67,6 @@ public:
 
     /// Accepts several connections already taken from pool.
     RemoteQueryExecutor(
-        const ConnectionPoolWithFailoverPtr & pool,
         std::vector<IConnectionPool::Entry> && connections_,
         const String & query_, const Block & header_, ContextPtr context_,
         const ThrottlerPtr & throttler = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
@@ -90,10 +88,14 @@ public:
     ///                     (for which this code was written in general).
     ///                     But clickhouse-benchmark uses the same code,
     ///                     and it should pass INITIAL_QUERY.
-    void sendQuery(ClientInfo::QueryKind query_kind = ClientInfo::QueryKind::SECONDARY_QUERY);
+    void sendQuery(ClientInfo::QueryKind query_kind = ClientInfo::QueryKind::SECONDARY_QUERY, AsyncCallback async_callback = {});
+    void sendQueryUnlocked(ClientInfo::QueryKind query_kind = ClientInfo::QueryKind::SECONDARY_QUERY, AsyncCallback async_callback = {});
+
+    int sendQueryAsync();
 
     /// Query is resent to a replica, the query itself can be modified.
-    std::atomic<bool> resent_query { false };
+    bool resent_query { false };
+    bool recreate_read_context { false };
 
     struct ReadResult
     {
@@ -147,16 +149,15 @@ public:
     ReadResult read();
 
     /// Async variant of read. Returns ready block or file descriptor which may be used for polling.
-    /// ReadContext is an internal read state. Pass empty ptr first time, reuse created one for every call.
-    ReadResult read(std::unique_ptr<ReadContext> & read_context);
+    ReadResult readAsync();
 
     /// Receive all remain packets and finish query.
     /// It should be cancelled after read returned empty block.
-    void finish(std::unique_ptr<ReadContext> * read_context = nullptr);
+    void finish();
 
     /// Cancel query execution. Sends Cancel packet and ignore others.
     /// This method may be called from separate thread.
-    void cancel(std::unique_ptr<ReadContext> * read_context = nullptr);
+    void cancel();
 
     /// Get totals and extremes if any.
     Block getTotals() { return std::move(totals); }
@@ -181,6 +182,10 @@ public:
 
     const Block & getHeader() const { return header; }
 
+    IConnections & getConnections() { return *connections; }
+
+    bool needToSkipUnavailableShard() const { return context->getSettingsRef().skip_unavailable_shards && (0 == connections->size()); }
+
 private:
     RemoteQueryExecutor(
         const String & query_, const Block & header_, ContextPtr context_,
@@ -191,6 +196,10 @@ private:
     Block totals;
     Block extremes;
 
+    std::function<std::unique_ptr<IConnections>(AsyncCallback)> create_connections;
+    std::unique_ptr<IConnections> connections;
+    std::unique_ptr<ReadContext> read_context;
+
     const String query;
     String query_id;
     ContextPtr context;
@@ -213,54 +222,47 @@ private:
     /// about the number of the current replica or the count of replicas at all.
     IConnections::ReplicaInfo replica_info;
 
-    std::function<std::shared_ptr<IConnections>()> create_connections;
-    /// Hold a shared reference to the connection pool so that asynchronous connection draining will
-    /// work safely. Make sure it's the first member so that we don't destruct it too early.
-    const ConnectionPoolWithFailoverPtr pool;
-    std::shared_ptr<IConnections> connections;
-
     /// Streams for reading from temporary tables and following sending of data
     /// to remote servers for GLOBAL-subqueries
     std::vector<ExternalTablesData> external_tables_data;
     std::mutex external_tables_mutex;
 
     /// Connections to replicas are established, but no queries are sent yet
-    std::atomic<bool> established { false };
+    bool established = false;
 
     /// Query is sent (used before getting first block)
-    std::atomic<bool> sent_query { false };
+    bool sent_query { false };
 
     /** All data from all replicas are received, before EndOfStream packet.
       * To prevent desynchronization, if not all data is read before object
       * destruction, it's required to send cancel query request to replicas and
       * read all packets before EndOfStream
       */
-    std::atomic<bool> finished { false };
+    bool finished = false;
 
     /** Cancel query request was sent to all replicas because data is not needed anymore
       * This behaviour may occur when:
       * - data size is already satisfactory (when using LIMIT, for example)
       * - an exception was thrown from client side
       */
-    std::atomic<bool> was_cancelled { false };
+    bool was_cancelled = false;
     std::mutex was_cancelled_mutex;
 
     /** An exception from replica was received. No need in receiving more packets or
       * requesting to cancel query execution
       */
-    std::atomic<bool> got_exception_from_replica { false };
+    bool got_exception_from_replica = false;
 
     /** Unknown packet was received from replica. No need in receiving more packets or
       * requesting to cancel query execution
       */
-    std::atomic<bool> got_unknown_packet_from_replica { false };
+    bool got_unknown_packet_from_replica = false;
 
     /** Got duplicated uuids from replica
       */
-    std::atomic<bool> got_duplicated_part_uuids{ false };
+    bool got_duplicated_part_uuids = false;
 
     /// Parts uuids, collected from remote replicas
-    std::mutex duplicated_part_uuids_mutex;
     std::vector<UUID> duplicated_part_uuids;
 
     PoolMode pool_mode = PoolMode::GET_MANY;
@@ -285,10 +287,11 @@ private:
 
     /// Cancel query and restart it with info about duplicate UUIDs
     /// only for `allow_experimental_query_deduplication`.
-    ReadResult restartQueryWithoutDuplicatedUUIDs(std::unique_ptr<ReadContext> * read_context = nullptr);
+    ReadResult restartQueryWithoutDuplicatedUUIDs();
 
     /// If wasn't sent yet, send request to cancel all connections to replicas
-    void tryCancel(const char * reason, std::unique_ptr<ReadContext> * read_context);
+    void cancelUnlocked();
+    void tryCancel(const char * reason);
 
     /// Returns true if query was sent
     bool isQueryPending() const;
diff --git a/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp b/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
index 0abf5a26794..0b23b4836ce 100644
--- a/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
@@ -1,69 +1,16 @@
 #if defined(OS_LINUX)
 
 #include <QueryPipeline/RemoteQueryExecutorReadContext.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
 #include <base/defines.h>
 #include <Common/Exception.h>
 #include <Common/NetException.h>
 #include <Client/IConnections.h>
-#include <sys/epoll.h>
+#include <Common/AsyncTaskExecutor.h>
 
 namespace DB
 {
 
-struct RemoteQueryExecutorRoutine
-{
-    IConnections & connections;
-    RemoteQueryExecutorReadContext & read_context;
-
-    struct ReadCallback
-    {
-        RemoteQueryExecutorReadContext & read_context;
-        Fiber & fiber;
-
-        void operator()(int fd, Poco::Timespan timeout = 0, const std::string fd_description = "")
-        {
-            try
-            {
-                read_context.setConnectionFD(fd, timeout, fd_description);
-            }
-            catch (DB::Exception & e)
-            {
-                e.addMessage(" while reading from {}", fd_description);
-                throw;
-            }
-
-            read_context.is_read_in_progress.store(true, std::memory_order_relaxed);
-            fiber = std::move(fiber).resume();
-            read_context.is_read_in_progress.store(false, std::memory_order_relaxed);
-        }
-    };
-
-    Fiber operator()(Fiber && sink) const
-    {
-        try
-        {
-            while (true)
-            {
-                read_context.packet = connections.receivePacketUnlocked(ReadCallback{read_context, sink}, false /* is_draining */);
-                sink = std::move(sink).resume();
-            }
-        }
-        catch (const boost::context::detail::forced_unwind &)
-        {
-            /// This exception is thrown by fiber implementation in case if fiber is being deleted but hasn't exited
-            /// It should not be caught or it will segfault.
-            /// Other exceptions must be caught
-            throw;
-        }
-        catch (...)
-        {
-            read_context.exception = std::current_exception();
-        }
-
-        return std::move(sink);
-    }
-};
-
 namespace ErrorCodes
 {
     extern const int CANNOT_READ_FROM_SOCKET;
@@ -71,57 +18,59 @@ namespace ErrorCodes
     extern const int SOCKET_TIMEOUT;
 }
 
-RemoteQueryExecutorReadContext::RemoteQueryExecutorReadContext(IConnections & connections_)
-    : connections(connections_)
+RemoteQueryExecutorReadContext::RemoteQueryExecutorReadContext(RemoteQueryExecutor & executor_, bool suspend_when_query_sent_)
+    : AsyncTaskExecutor(std::make_unique<Task>(*this)), executor(executor_), suspend_when_query_sent(suspend_when_query_sent_)
 {
-
     if (-1 == pipe2(pipe_fd, O_NONBLOCK))
         throwFromErrno("Cannot create pipe", ErrorCodes::CANNOT_OPEN_FILE);
 
-    {
-        epoll.add(pipe_fd[0]);
-    }
-
-    {
-        epoll.add(timer.getDescriptor());
-    }
-
-    auto routine = RemoteQueryExecutorRoutine{connections, *this};
-    fiber = boost::context::fiber(std::allocator_arg_t(), stack, std::move(routine));
+    epoll.add(pipe_fd[0]);
+    epoll.add(timer.getDescriptor());
 }
 
-void RemoteQueryExecutorReadContext::setConnectionFD(int fd, Poco::Timespan timeout, const std::string & fd_description)
+bool RemoteQueryExecutorReadContext::checkBeforeTaskResume()
 {
-    if (fd == connection_fd)
+    return !is_in_progress.load(std::memory_order_relaxed) || checkTimeout();
+}
+
+
+void RemoteQueryExecutorReadContext::Task::run(AsyncCallback async_callback, ResumeCallback suspend_callback)
+{
+    read_context.executor.sendQueryUnlocked(ClientInfo::QueryKind::SECONDARY_QUERY, async_callback);
+    read_context.is_query_sent = true;
+
+    if (read_context.suspend_when_query_sent)
+        suspend_callback();
+
+    if (read_context.executor.needToSkipUnavailableShard())
         return;
 
-    if (connection_fd != -1)
-        epoll.remove(connection_fd);
+    while (true)
+    {
+        read_context.packet = read_context.executor.getConnections().receivePacketUnlocked(async_callback);
+        suspend_callback();
+    }
+}
 
+void RemoteQueryExecutorReadContext::processAsyncEvent(int fd, Poco::Timespan socket_timeout, AsyncEventTimeoutType type, const std::string & description, uint32_t events)
+{
     connection_fd = fd;
-    epoll.add(connection_fd);
+    epoll.add(connection_fd, events);
+    timeout = socket_timeout;
+    timer.setRelative(socket_timeout);
+    timeout_type = type;
+    connection_fd_description = description;
+    is_in_progress.store(true);
+}
 
-    receive_timeout_usec = timeout.totalMicroseconds();
-    connection_fd_description = fd_description;
+void RemoteQueryExecutorReadContext::clearAsyncEvent()
+{
+    epoll.remove(connection_fd);
+    timer.reset();
+    is_in_progress.store(false);
 }
 
 bool RemoteQueryExecutorReadContext::checkTimeout(bool blocking)
-{
-    try
-    {
-        return checkTimeoutImpl(blocking);
-    }
-    catch (DB::Exception & e)
-    {
-        if (last_used_socket)
-            e.addMessage(" while reading from socket ({})", last_used_socket->peerAddress().toString());
-        if (e.code() == ErrorCodes::SOCKET_TIMEOUT)
-            e.addMessage(" (receive timeout {} ms)", receive_timeout_usec / 1000);
-        throw;
-    }
-}
-
-bool RemoteQueryExecutorReadContext::checkTimeoutImpl(bool blocking)
 {
     /// Wait for epoll will not block if it was polled externally.
     epoll_event events[3];
@@ -130,7 +79,6 @@ bool RemoteQueryExecutorReadContext::checkTimeoutImpl(bool blocking)
     size_t num_events = epoll.getManyReady(3, events, blocking);
 
     bool is_socket_ready = false;
-    bool is_pipe_alarmed = false;
 
     for (size_t i = 0; i < num_events; ++i)
     {
@@ -147,60 +95,32 @@ bool RemoteQueryExecutorReadContext::checkTimeoutImpl(bool blocking)
 
     if (is_timer_alarmed && !is_socket_ready)
     {
-        /// Socket receive timeout. Drain it in case of error, or it may be hide by timeout exception.
+        /// Socket timeout. Drain it in case of error, or it may be hide by timeout exception.
         timer.drain();
-        throw NetException(ErrorCodes::SOCKET_TIMEOUT, "Timeout exceeded");
+        const String exception_message = getSocketTimeoutExceededMessageByTimeoutType(timeout_type, timeout, connection_fd_description);
+        throw NetException(ErrorCodes::SOCKET_TIMEOUT, exception_message);
     }
 
     return true;
 }
 
-void RemoteQueryExecutorReadContext::setTimer() const
+void RemoteQueryExecutorReadContext::cancelBefore()
 {
-    /// Did not get packet yet. Init timeout for the next async reading.
-    timer.reset();
-
-    if (receive_timeout_usec)
-        timer.setRelative(receive_timeout_usec);
-}
-
-bool RemoteQueryExecutorReadContext::resumeRoutine()
-{
-    if (is_read_in_progress.load(std::memory_order_relaxed) && !checkTimeout())
-        return false;
-
-    {
-        std::lock_guard guard(fiber_lock);
-        if (!fiber)
-            return false;
-
-        fiber = std::move(fiber).resume();
-
-        if (exception)
-            std::rethrow_exception(exception);
-    }
-
-    return true;
-}
-
-void RemoteQueryExecutorReadContext::cancel()
-{
-    std::lock_guard guard(fiber_lock);
-
-    /// It is safe to just destroy fiber - we are not in the process of reading from socket.
-    boost::context::fiber to_destroy = std::move(fiber);
-
     /// One should not try to wait for the current packet here in case of
     /// timeout because this will exceed the timeout.
     /// Anyway if the timeout is exceeded, then the connection will be shutdown
     /// (disconnected), so it will not left in an unsynchronised state.
     if (!is_timer_alarmed)
     {
+        /// If query wasn't sent, just complete sending it.
+        if (!is_query_sent)
+            suspend_when_query_sent = true;
+
         /// Wait for current pending packet, to avoid leaving connection in unsynchronised state.
-        while (is_read_in_progress.load(std::memory_order_relaxed))
+        while (is_in_progress.load(std::memory_order_relaxed))
         {
             checkTimeout(/* blocking= */ true);
-            to_destroy = std::move(to_destroy).resume();
+            resumeUnlocked();
         }
     }
 
diff --git a/src/QueryPipeline/RemoteQueryExecutorReadContext.h b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
index 91e34dbb82c..4d1d6c17606 100644
--- a/src/QueryPipeline/RemoteQueryExecutorReadContext.h
+++ b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
@@ -8,6 +8,7 @@
 #include <Common/FiberStack.h>
 #include <Common/TimerDescriptor.h>
 #include <Common/Epoll.h>
+#include <Common/AsyncTaskExecutor.h>
 #include <Client/Connection.h>
 #include <Client/IConnections.h>
 #include <Poco/Timespan.h>
@@ -21,23 +22,49 @@ namespace DB
 {
 
 class MultiplexedConnections;
+class RemoteQueryExecutor;
 
-class RemoteQueryExecutorReadContext
+class RemoteQueryExecutorReadContext : public AsyncTaskExecutor
 {
 public:
-    std::atomic_bool is_read_in_progress = false;
+    explicit RemoteQueryExecutorReadContext(RemoteQueryExecutor & executor_, bool suspend_when_query_sent_ = false);
+
+    ~RemoteQueryExecutorReadContext() override;
+
+    bool isInProgress() const { return is_in_progress.load(std::memory_order_relaxed); }
+
+    bool isCancelled() const { return AsyncTaskExecutor::isCancelled() || is_pipe_alarmed; }
+
+    bool isQuerySent() const { return is_query_sent;  }
+
+    int getFileDescriptor() const { return epoll.getFileDescriptor(); }
+
+    Packet getPacket() { return std::move(packet); }
+
+private:
+    bool checkTimeout(bool blocking = false);
+
+    bool checkBeforeTaskResume() override;
+    void afterTaskResume() override {}
+
+    void processAsyncEvent(int fd, Poco::Timespan socket_timeout, AsyncEventTimeoutType type, const std::string & description, uint32_t events) override;
+    void clearAsyncEvent() override;
+
+    void cancelBefore() override;
+
+    struct Task : public AsyncTask
+    {
+        Task(RemoteQueryExecutorReadContext & read_context_) : read_context(read_context_) {}
+
+        RemoteQueryExecutorReadContext & read_context;
+
+        void run(AsyncCallback async_callback, ResumeCallback suspend_callback) override;
+    };
+
+    std::atomic_bool is_in_progress = false;
     Packet packet;
 
-    std::exception_ptr exception;
-    FiberStack stack;
-    boost::context::fiber fiber;
-    /// This mutex for fiber is needed because fiber could be destroyed in cancel method from another thread.
-    std::mutex fiber_lock;
-
-    /// atomic is required due to data-race between setConnectionFD() and setTimer() from the cancellation path.
-    std::atomic<uint64_t> receive_timeout_usec = 0;
-    IConnections & connections;
-    Poco::Net::Socket * last_used_socket = nullptr;
+    RemoteQueryExecutor & executor;
 
     /// Here we have three descriptors we are going to wait:
     /// * connection_fd is a descriptor of connection. It may be changed in case of reading from several replicas.
@@ -45,25 +72,18 @@ public:
     /// * pipe_fd is a pipe we use to cancel query and socket polling by executor.
     /// We put those descriptors into our own epoll which is used by external executor.
     TimerDescriptor timer{CLOCK_MONOTONIC, 0};
-    bool is_timer_alarmed = false;
+    Poco::Timespan timeout;
+    AsyncEventTimeoutType timeout_type;
+    std::atomic_bool is_timer_alarmed = false;
     int connection_fd = -1;
     int pipe_fd[2] = { -1, -1 };
+    std::atomic_bool is_pipe_alarmed = false;
 
     Epoll epoll;
 
     std::string connection_fd_description;
-
-    explicit RemoteQueryExecutorReadContext(IConnections & connections_);
-    ~RemoteQueryExecutorReadContext();
-
-    bool checkTimeout(bool blocking = false);
-    bool checkTimeoutImpl(bool blocking);
-
-    void setConnectionFD(int fd, Poco::Timespan timeout = 0, const std::string & fd_description = "");
-    void setTimer() const;
-
-    bool resumeRoutine();
-    void cancel();
+    bool suspend_when_query_sent = false;
+    bool is_query_sent = false;
 };
 
 }
diff --git a/src/QueryPipeline/printPipeline.h b/src/QueryPipeline/printPipeline.h
index 76143211875..e91909cb50b 100644
--- a/src/QueryPipeline/printPipeline.h
+++ b/src/QueryPipeline/printPipeline.h
@@ -10,7 +10,6 @@ namespace DB
   * You can render it with:
   *  dot -T png < pipeline.dot > pipeline.png
   */
-
 template <typename Processors, typename Statuses>
 void printPipeline(const Processors & processors, const Statuses & statuses, WriteBuffer & out)
 {
@@ -70,5 +69,4 @@ void printPipeline(const Processors & processors, WriteBuffer & out)
 /// If QueryPlanStep wasn't set for processor, representation may be not correct.
 /// If with_header is set, prints block header for each edge.
 void printPipelineCompact(const Processors & processors, WriteBuffer & out, bool with_header);
-
 }
diff --git a/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp b/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
index 2fa5873544f..bc22f249f97 100644
--- a/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
+++ b/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
@@ -83,7 +83,7 @@ TEST(MergingSortedTest, SimpleBlockSizeTest)
     EXPECT_EQ(pipe.numOutputPorts(), 3);
 
     auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
-        DEFAULT_MERGE_BLOCK_SIZE, SortingQueueStrategy::Batch, 0, nullptr, false, true);
+        8192, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch, 0, false, nullptr, false, true);
 
     pipe.addTransform(std::move(transform));
 
@@ -125,7 +125,7 @@ TEST(MergingSortedTest, MoreInterestingBlockSizes)
     EXPECT_EQ(pipe.numOutputPorts(), 3);
 
     auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
-            DEFAULT_MERGE_BLOCK_SIZE, SortingQueueStrategy::Batch, 0, nullptr, false, true);
+        8192, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch, 0, false, nullptr, false, true);
 
     pipe.addTransform(std::move(transform));
 
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index 595f5a8c2b7..7b8eaa21947 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -9,6 +9,7 @@
 #include <Common/SettingsChanges.h>
 #include <Common/setThreadName.h>
 #include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <QueryPipeline/ProfileInfo.h>
 #include <Interpreters/Context.h>
@@ -836,13 +837,14 @@ namespace
         query_context->applySettingsChanges(settings_changes);
 
         query_context->setCurrentQueryId(query_info.query_id());
-        query_scope.emplace(query_context);
+        query_scope.emplace(query_context, /* fatal_error_callback */ [this]{ onFatalError(); });
 
         /// Set up tracing context for this query on current thread
         thread_trace_context = std::make_unique<OpenTelemetry::TracingContextHolder>("GRPCServer",
             query_context->getClientInfo().client_trace_context,
             query_context->getSettingsRef(),
             query_context->getOpenTelemetrySpanLog());
+        thread_trace_context->root_span.kind = OpenTelemetry::SERVER;
 
         /// Prepare for sending exceptions and logs.
         const Settings & settings = query_context->getSettingsRef();
@@ -854,7 +856,6 @@ namespace
             logs_queue->max_priority = Poco::Logger::parseLevel(client_logs_level.toString());
             logs_queue->setSourceRegexp(settings.send_logs_source_regexp);
             CurrentThread::attachInternalTextLogsQueue(logs_queue, client_logs_level);
-            CurrentThread::setFatalErrorCallback([this]{ onFatalError(); });
         }
 
         /// Set the current database if specified.
@@ -984,7 +985,10 @@ namespace
                 executor.push(block);
         }
 
-        executor.finish();
+        if (isQueryCancelled())
+            executor.cancel();
+        else
+            executor.finish();
     }
 
     void Call::initializePipeline(const Block & header)
diff --git a/src/Server/HTTP/HTMLForm.cpp b/src/Server/HTTP/HTMLForm.cpp
index d9d897d20c4..1abf9e5b83e 100644
--- a/src/Server/HTTP/HTMLForm.cpp
+++ b/src/Server/HTTP/HTMLForm.cpp
@@ -20,6 +20,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int CANNOT_READ_ALL_DATA;
+}
+
 namespace
 {
 
@@ -229,6 +234,11 @@ void HTMLForm::readMultipart(ReadBuffer & in_, PartHandler & handler)
         if (!in.skipToNextBoundary())
             break;
     }
+
+    /// It's important to check, because we could get "fake" EOF and incomplete request if a client suddenly died in the middle.
+    if (!in.isActualEOF())
+        throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Unexpected EOF, "
+                        "did not find the last boundary while parsing a multipart HTTP request");
 }
 
 
@@ -244,7 +254,8 @@ bool HTMLForm::MultipartReadBuffer::skipToNextBoundary()
     if (in.eof())
         return false;
 
-    assert(boundary_hit);
+    chassert(boundary_hit);
+    chassert(!found_last_boundary);
 
     boundary_hit = false;
 
@@ -255,7 +266,8 @@ bool HTMLForm::MultipartReadBuffer::skipToNextBoundary()
         {
             set(in.position(), 0);
             next();  /// We need to restrict our buffer to size of next available line.
-            return !startsWith(line, boundary + "--");
+            found_last_boundary = startsWith(line, boundary + "--");
+            return !found_last_boundary;
         }
     }
 
diff --git a/src/Server/HTTP/HTMLForm.h b/src/Server/HTTP/HTMLForm.h
index 16889b41d80..c75dafccaf0 100644
--- a/src/Server/HTTP/HTMLForm.h
+++ b/src/Server/HTTP/HTMLForm.h
@@ -108,10 +108,13 @@ public:
     /// Returns false if last boundary found.
     bool skipToNextBoundary();
 
+    bool isActualEOF() const { return found_last_boundary; }
+
 private:
     PeekableReadBuffer in;
     const std::string boundary;
     bool boundary_hit = true;
+    bool found_last_boundary = false;
 
     std::string readLine(bool append_crlf);
 
diff --git a/src/Server/HTTP/HTTPServerRequest.cpp b/src/Server/HTTP/HTTPServerRequest.cpp
index a82eb95aee1..891ac39c931 100644
--- a/src/Server/HTTP/HTTPServerRequest.cpp
+++ b/src/Server/HTTP/HTTPServerRequest.cpp
@@ -12,6 +12,8 @@
 #include <Poco/Net/HTTPStream.h>
 #include <Poco/Net/NetException.h>
 
+#include <Common/logger_useful.h>
+
 #if USE_SSL
 #include <Poco/Net/SecureStreamSocketImpl.h>
 #include <Poco/Net/SSLException.h>
@@ -44,12 +46,28 @@ HTTPServerRequest::HTTPServerRequest(HTTPContextPtr context, HTTPServerResponse
 
     readRequest(*in);  /// Try parse according to RFC7230
 
+    /// If a client crashes, most systems will gracefully terminate the connection with FIN just like it's done on close().
+    /// So we will get 0 from recv(...) and will not be able to understand that something went wrong (well, we probably
+    /// will get RST later on attempt to write to the socket that closed on the other side, but it will happen when the query is finished).
+    /// If we are extremely unlucky and data format is TSV, for example, then we may stop parsing exactly between rows
+    /// and decide that it's EOF (but it is not). It may break deduplication, because clients cannot control it
+    /// and retry with exactly the same (incomplete) set of rows.
+    /// That's why we have to check body size if it's provided.
     if (getChunkedTransferEncoding())
         stream = std::make_unique<HTTPChunkedReadBuffer>(std::move(in), context->getMaxChunkSize());
     else if (hasContentLength())
-        stream = std::make_unique<LimitReadBuffer>(std::move(in), getContentLength(), false);
+    {
+        size_t content_length = getContentLength();
+        stream = std::make_unique<LimitReadBuffer>(std::move(in), content_length,
+                                                   /* trow_exception */ true, /* exact_limit */ content_length);
+    }
     else if (getMethod() != HTTPRequest::HTTP_GET && getMethod() != HTTPRequest::HTTP_HEAD && getMethod() != HTTPRequest::HTTP_DELETE)
+    {
         stream = std::move(in);
+        if (!startsWith(getContentType(), "multipart/form-data"))
+            LOG_WARNING(LogFrequencyLimiter(&Poco::Logger::get("HTTPServerRequest"), 10), "Got an HTTP request with no content length "
+                "and no chunked/multipart encoding, it may be impossible to distinguish graceful EOF from abnormal connection loss");
+    }
     else
         /// We have to distinguish empty buffer and nullptr.
         stream = std::make_unique<EmptyReadBuffer>();
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index 702743ef1f0..5a2bf0bad6c 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -11,10 +11,10 @@
 #include <IO/ConcatReadBuffer.h>
 #include <IO/MemoryReadWriteBuffer.h>
 #include <IO/ReadBufferFromString.h>
-#include <IO/WriteBufferFromTemporaryFile.h>
 #include <IO/WriteHelpers.h>
 #include <IO/copyData.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/TemporaryDataOnDisk.h>
 #include <Parsers/QueryParameterVisitor.h>
 #include <Interpreters/executeQuery.h>
 #include <Interpreters/Session.h>
@@ -24,6 +24,7 @@
 #include <Common/logger_useful.h>
 #include <Common/SettingsChanges.h>
 #include <Common/StringUtils/StringUtils.h>
+#include <Common/scope_guard_safe.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
 #include <Parsers/ASTSetQuery.h>
@@ -45,9 +46,6 @@
 
 #include <chrono>
 #include <sstream>
-#include <filesystem>
-
-namespace fs = std::filesystem;
 
 #if USE_SSL
 #include <Poco/Net/X509Certificate.h>
@@ -441,10 +439,10 @@ bool HTTPHandler::authenticateUser(
         if (!gss_acceptor_context)
             throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Invalid authentication: unexpected 'Negotiate' HTTP Authorization scheme expected");
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunreachable-code"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code"
         const auto spnego_response = base64Encode(gss_acceptor_context->processToken(base64Decode(spnego_challenge), log));
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
         if (!spnego_response.empty())
             response.set("WWW-Authenticate", "Negotiate " + spnego_response);
@@ -588,11 +586,12 @@ void HTTPHandler::processQuery(
 
     /// At least, we should postpone sending of first buffer_size result bytes
     size_t buffer_size_total = std::max(
-        params.getParsed<size_t>("buffer_size", DBMS_DEFAULT_BUFFER_SIZE), static_cast<size_t>(DBMS_DEFAULT_BUFFER_SIZE));
+        params.getParsed<size_t>("buffer_size", context->getSettingsRef().http_response_buffer_size),
+        static_cast<size_t>(DBMS_DEFAULT_BUFFER_SIZE));
 
     /// If it is specified, the whole result will be buffered.
     ///  First ~buffer_size bytes will be buffered in memory, the remaining bytes will be stored in temporary file.
-    bool buffer_until_eof = params.getParsed<bool>("wait_end_of_query", false);
+    bool buffer_until_eof = params.getParsed<bool>("wait_end_of_query", context->getSettingsRef().http_wait_end_of_query);
 
     size_t buffer_size_http = DBMS_DEFAULT_BUFFER_SIZE;
     size_t buffer_size_memory = (buffer_size_total > buffer_size_http) ? buffer_size_total : 0;
@@ -621,12 +620,11 @@ void HTTPHandler::processQuery(
 
         if (buffer_until_eof)
         {
-            const std::string tmp_path(server.context()->getTemporaryVolume()->getDisk()->getPath());
-            const std::string tmp_path_template(fs::path(tmp_path) / "http_buffers/");
+            auto tmp_data = std::make_shared<TemporaryDataOnDisk>(server.context()->getTempDataOnDisk());
 
-            auto create_tmp_disk_buffer = [tmp_path_template] (const WriteBufferPtr &)
+            auto create_tmp_disk_buffer = [tmp_data] (const WriteBufferPtr &) -> WriteBufferPtr
             {
-                return WriteBufferFromTemporaryFile::create(tmp_path_template);
+                return tmp_data->createRawStream();
             };
 
             cascade_buffer2.emplace_back(std::move(create_tmp_disk_buffer));
@@ -678,7 +676,7 @@ void HTTPHandler::processQuery(
     std::unique_ptr<ReadBuffer> in;
 
     static const NameSet reserved_param_names{"compress", "decompress", "user", "password", "quota_key", "query_id", "stacktrace",
-        "buffer_size", "wait_end_of_query", "session_id", "session_timeout", "session_check", "client_protocol_version"};
+        "buffer_size", "wait_end_of_query", "session_id", "session_timeout", "session_check", "client_protocol_version", "close_session"};
 
     Names reserved_param_suffixes;
 
@@ -781,7 +779,6 @@ void HTTPHandler::processQuery(
     /// they will be applied in ProcessList::insert() from executeQuery() itself.
     const auto & query = getQuery(request, params, context);
     std::unique_ptr<ReadBuffer> in_param = std::make_unique<ReadBufferFromString>(query);
-    in = has_external_data ? std::move(in_param) : std::make_unique<ConcatReadBuffer>(*in_param, *in_post_maybe_compressed);
 
     /// HTTP response compression is turned on only if the client signalled that they support it
     /// (using Accept-Encoding header) and 'enable_http_compression' setting is turned on.
@@ -803,11 +800,11 @@ void HTTPHandler::processQuery(
     if (settings.add_http_cors_header && !request.get("Origin", "").empty() && !config.has("http_options_response"))
         used_output.out->addHeaderCORS(true);
 
-    auto append_callback = [context = context] (ProgressCallback callback)
+    auto append_callback = [my_context = context] (ProgressCallback callback)
     {
-        auto prev = context->getProgressCallback();
+        auto prev = my_context->getProgressCallback();
 
-        context->setProgressCallback([prev, callback] (const Progress & progress)
+        my_context->setProgressCallback([prev, callback] (const Progress & progress)
         {
             if (prev)
                 prev(progress);
@@ -831,7 +828,8 @@ void HTTPHandler::processQuery(
         });
     }
 
-    customizeContext(request, context);
+    customizeContext(request, context, *in_post_maybe_compressed);
+    in = has_external_data ? std::move(in_param) : std::make_unique<ConcatReadBuffer>(*in_param, *in_post_maybe_compressed);
 
     executeQuery(*in, *used_output.out_maybe_delayed_and_compressed, /* allow_into_outfile = */ false, context,
         [&response, this] (const QueryResultDetails & details)
@@ -957,6 +955,14 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
 
     /// In case of exception, send stack trace to client.
     bool with_stacktrace = false;
+    /// Close http session (if any) after processing the request
+    bool close_session = false;
+    String session_id;
+
+    SCOPE_EXIT_SAFE({
+        if (close_session && !session_id.empty())
+            session->closeSession(session_id);
+    });
 
     OpenTelemetry::TracingContextHolderPtr thread_trace_context;
     SCOPE_EXIT({
@@ -992,6 +998,7 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
             client_info.client_trace_context,
             context->getSettingsRef(),
             context->getOpenTelemetrySpanLog());
+        thread_trace_context->root_span.kind = OpenTelemetry::SERVER;
         thread_trace_context->root_span.addAttribute("clickhouse.uri", request.getURI());
 
         response.setContentType("text/plain; charset=UTF-8");
@@ -1006,6 +1013,9 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
 
         HTMLForm params(default_settings, request);
         with_stacktrace = params.getParsed<bool>("stacktrace", false);
+        close_session = params.getParsed<bool>("close_session", false);
+        if (close_session)
+            session_id = params.get("session_id");
 
         /// FIXME: maybe this check is already unnecessary.
         /// Workaround. Poco does not detect 411 Length Required case.
@@ -1045,13 +1055,11 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         /** If exception is received from remote server, then stack trace is embedded in message.
           * If exception is thrown on local server, then stack trace is in separate field.
           */
-        std::string exception_message = getCurrentExceptionMessage(with_stacktrace, true);
-        int exception_code = getCurrentExceptionCode();
-
-        trySendExceptionToClient(exception_message, exception_code, request, response, used_output);
+        ExecutionStatus status = ExecutionStatus::fromCurrentException("", with_stacktrace);
+        trySendExceptionToClient(status.message, status.code, request, response, used_output);
 
         if (thread_trace_context)
-            thread_trace_context->root_span.addAttribute("clickhouse.exception_code", exception_code);
+            thread_trace_context->root_span.addAttribute(status);
     }
 
     used_output.finalize();
@@ -1139,7 +1147,7 @@ bool PredefinedQueryHandler::customizeQueryParam(ContextMutablePtr context, cons
     return false;
 }
 
-void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, ContextMutablePtr context)
+void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, ContextMutablePtr context, ReadBuffer & body)
 {
     /// If in the configuration file, the handler's header is regex and contains named capture group
     /// We will extract regex named capture groups as query parameters
@@ -1173,6 +1181,15 @@ void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, Conte
         const auto & header_value = request.get(header_name);
         set_query_params(header_value.data(), header_value.data() + header_value.size(), regex);
     }
+
+    if (unlikely(receive_params.contains("_request_body") && !context->getQueryParameters().contains("_request_body")))
+    {
+        WriteBufferFromOwnString value;
+        const auto & settings = context->getSettingsRef();
+
+        copyDataMaxBytes(body, value, settings.http_max_request_param_data_size);
+        context->setQueryParameter("_request_body", value.str());
+    }
 }
 
 std::string PredefinedQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm & params, ContextMutablePtr context)
diff --git a/src/Server/HTTPHandler.h b/src/Server/HTTPHandler.h
index fa742ebc8fb..5eda5927538 100644
--- a/src/Server/HTTPHandler.h
+++ b/src/Server/HTTPHandler.h
@@ -36,7 +36,7 @@ public:
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
 
     /// This method is called right before the query execution.
-    virtual void customizeContext(HTTPServerRequest & /* request */, ContextMutablePtr /* context */) {}
+    virtual void customizeContext(HTTPServerRequest & /* request */, ContextMutablePtr /* context */, ReadBuffer & /* body */) {}
 
     virtual bool customizeQueryParam(ContextMutablePtr context, const std::string & key, const std::string & value) = 0;
 
@@ -163,7 +163,7 @@ public:
         , const CompiledRegexPtr & url_regex_, const std::unordered_map<String, CompiledRegexPtr> & header_name_with_regex_
         , const std::optional<std::string> & content_type_override_);
 
-    virtual void customizeContext(HTTPServerRequest & request, ContextMutablePtr context) override;
+    void customizeContext(HTTPServerRequest & request, ContextMutablePtr context, ReadBuffer & body) override;
 
     std::string getQuery(HTTPServerRequest & request, HTMLForm & params, ContextMutablePtr context) override;
 
diff --git a/src/Server/HTTPHandlerFactory.h b/src/Server/HTTPHandlerFactory.h
index ebdfa954bf7..fe11833dc31 100644
--- a/src/Server/HTTPHandlerFactory.h
+++ b/src/Server/HTTPHandlerFactory.h
@@ -6,7 +6,6 @@
 #include <Server/HTTPHandlerRequestFilter.h>
 #include <Server/HTTPRequestHandlerFactoryMain.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <Common/logger_useful.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
 
@@ -29,12 +28,12 @@ public:
     template <typename... TArgs>
     explicit HandlingRuleHTTPHandlerFactory(TArgs &&... args)
     {
-        creator = [args = std::tuple<TArgs...>(std::forward<TArgs>(args) ...)]()
+        creator = [my_args = std::tuple<TArgs...>(std::forward<TArgs>(args) ...)]()
         {
             return std::apply([&](auto && ... endpoint_args)
             {
                 return std::make_unique<TEndpoint>(std::forward<decltype(endpoint_args)>(endpoint_args)...);
-            }, std::move(args));
+            }, std::move(my_args));
         };
     }
 
diff --git a/src/Server/KeeperTCPHandler.cpp b/src/Server/KeeperTCPHandler.cpp
index 0853c6ee62b..e3edc281e83 100644
--- a/src/Server/KeeperTCPHandler.cpp
+++ b/src/Server/KeeperTCPHandler.cpp
@@ -20,7 +20,7 @@
 #include <queue>
 #include <mutex>
 #include <Coordination/FourLetterCommand.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 
 #ifdef POCO_HAVE_FD_EPOLL
@@ -293,7 +293,7 @@ Poco::Timespan KeeperTCPHandler::receiveHandshake(int32_t handshake_length)
     if (handshake_length == Coordination::CLIENT_HANDSHAKE_LENGTH_WITH_READONLY)
         Coordination::read(readonly, *in);
 
-    return Poco::Timespan(0, timeout_ms * 1000);
+    return Poco::Timespan(timeout_ms * 1000);
 }
 
 
@@ -342,8 +342,8 @@ void KeeperTCPHandler::runImpl()
         int32_t handshake_length = header;
         auto client_timeout = receiveHandshake(handshake_length);
 
-        if (client_timeout == 0)
-            client_timeout = Coordination::DEFAULT_SESSION_TIMEOUT_MS;
+        if (client_timeout.totalMilliseconds() == 0)
+            client_timeout = Poco::Timespan(Coordination::DEFAULT_SESSION_TIMEOUT_MS * Poco::Timespan::MILLISECONDS);
         session_timeout = std::max(client_timeout, min_session_timeout);
         session_timeout = std::min(session_timeout, max_session_timeout);
     }
diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index d8ea359ce5f..7318b0ad89b 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -22,6 +22,7 @@
 #include <Common/setThreadName.h>
 #include <Core/MySQL/Authentication.h>
 #include <Common/logger_useful.h>
+#include <base/scope_guard.h>
 
 #include "config_version.h"
 
@@ -155,7 +156,7 @@ void MySQLHandler::run()
             payload.readStrict(command);
 
             // For commands which are executed without MemoryTracker.
-            LimitReadBuffer limited_payload(payload, 10000, true, "too long MySQL packet.");
+            LimitReadBuffer limited_payload(payload, 10000, /* trow_exception */ true, /* exact_limit */ {}, "too long MySQL packet.");
 
             LOG_DEBUG(log, "Received command: {}. Connection id: {}.",
                 static_cast<int>(static_cast<unsigned char>(command)), connection_id);
@@ -339,10 +340,10 @@ void MySQLHandler::comQuery(ReadBuffer & payload)
 
         std::atomic<size_t> affected_rows {0};
         auto prev = query_context->getProgressCallback();
-        query_context->setProgressCallback([&, prev = prev](const Progress & progress)
+        query_context->setProgressCallback([&, my_prev = prev](const Progress & progress)
         {
-            if (prev)
-                prev(progress);
+            if (my_prev)
+                my_prev(progress);
 
             affected_rows += progress.written_rows;
         });
diff --git a/src/Server/PostgreSQLHandler.cpp b/src/Server/PostgreSQLHandler.cpp
index b017b87fcc1..36b05932979 100644
--- a/src/Server/PostgreSQLHandler.cpp
+++ b/src/Server/PostgreSQLHandler.cpp
@@ -318,6 +318,9 @@ bool PostgreSQLHandler::isEmptyQuery(const String & query)
 {
     if (query.empty())
         return true;
+    /// golang driver pgx sends ";"
+    if (query == ";")
+        return true;
 
     Poco::RegularExpression regex(R"(\A\s*\z)");
     return regex.match(query);
diff --git a/src/Server/PostgreSQLHandler.h b/src/Server/PostgreSQLHandler.h
index 6fc128e3883..f20af3df02c 100644
--- a/src/Server/PostgreSQLHandler.h
+++ b/src/Server/PostgreSQLHandler.h
@@ -4,7 +4,6 @@
 #include "config.h"
 #include <Core/PostgreSQLProtocol.h>
 #include <Poco/Net/TCPServerConnection.h>
-#include <Common/logger_useful.h>
 #include "IServer.h"
 
 #if USE_SSL
diff --git a/src/Server/PrometheusMetricsWriter.cpp b/src/Server/PrometheusMetricsWriter.cpp
index abf2a2c0b6b..2331e455225 100644
--- a/src/Server/PrometheusMetricsWriter.cpp
+++ b/src/Server/PrometheusMetricsWriter.cpp
@@ -59,7 +59,7 @@ void PrometheusMetricsWriter::write(WriteBuffer & wb) const
 {
     if (send_events)
     {
-        for (size_t i = 0, end = ProfileEvents::end(); i < end; ++i)
+        for (ProfileEvents::Event i = ProfileEvents::Event(0), end = ProfileEvents::end(); i < end; ++i)
         {
             const auto counter = ProfileEvents::global_counters[i].load(std::memory_order_relaxed);
 
diff --git a/src/Server/ProtocolServerAdapter.cpp b/src/Server/ProtocolServerAdapter.cpp
index dbc676432f5..915b6265993 100644
--- a/src/Server/ProtocolServerAdapter.cpp
+++ b/src/Server/ProtocolServerAdapter.cpp
@@ -1,7 +1,7 @@
 #include <Server/ProtocolServerAdapter.h>
 #include <Server/TCPServer.h>
 
-#if USE_GRPC && !defined(KEEPER_STANDALONE_BUILD)
+#if USE_GRPC && !defined(CLICKHOUSE_PROGRAM_STANDALONE_BUILD)
 #include <Server/GRPCServer.h>
 #endif
 
@@ -37,7 +37,7 @@ ProtocolServerAdapter::ProtocolServerAdapter(
 {
 }
 
-#if USE_GRPC && !defined(KEEPER_STANDALONE_BUILD)
+#if USE_GRPC && !defined(CLICKHOUSE_PROGRAM_STANDALONE_BUILD)
 class ProtocolServerAdapter::GRPCServerAdapterImpl : public Impl
 {
 public:
diff --git a/src/Server/ProtocolServerAdapter.h b/src/Server/ProtocolServerAdapter.h
index 514354f9723..e08b12e67f2 100644
--- a/src/Server/ProtocolServerAdapter.h
+++ b/src/Server/ProtocolServerAdapter.h
@@ -23,7 +23,7 @@ public:
     ProtocolServerAdapter & operator =(ProtocolServerAdapter && src) = default;
     ProtocolServerAdapter(const std::string & listen_host_, const char * port_name_, const std::string & description_, std::unique_ptr<TCPServer> tcp_server_);
 
-#if USE_GRPC && !defined(KEEPER_STANDALONE_BUILD)
+#if USE_GRPC && !defined(CLICKHOUSE_PROGRAM_STANDALONE_BUILD)
     ProtocolServerAdapter(const std::string & listen_host_, const char * port_name_, const std::string & description_, std::unique_ptr<GRPCServer> grpc_server_);
 #endif
 
diff --git a/src/Server/ProxyV1Handler.cpp b/src/Server/ProxyV1Handler.cpp
index cd5fe29112a..56621940a23 100644
--- a/src/Server/ProxyV1Handler.cpp
+++ b/src/Server/ProxyV1Handler.cpp
@@ -1,6 +1,7 @@
 #include <Server/ProxyV1Handler.h>
 #include <Poco/Net/NetException.h>
 #include <Common/NetException.h>
+#include <Common/logger_useful.h>
 #include <Interpreters/Context.h>
 
 
diff --git a/src/Server/ProxyV1Handler.h b/src/Server/ProxyV1Handler.h
index e56f4cd3545..b50c2acbc55 100644
--- a/src/Server/ProxyV1Handler.h
+++ b/src/Server/ProxyV1Handler.h
@@ -3,7 +3,6 @@
 #include <Poco/Net/TCPServerConnection.h>
 #include <Server/IServer.h>
 #include <Server/TCPProtocolStackData.h>
-#include <Common/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index a307b472a64..0522b6d8a48 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -41,6 +41,7 @@
 #include <Compression/CompressionFactory.h>
 #include <Common/logger_useful.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/thread_local_rng.h>
 #include <fmt/format.h>
 
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
@@ -49,6 +50,11 @@
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/Sinks/SinkToStorage.h>
 
+#if USE_SSL
+#   include <Poco/Net/SecureStreamSocket.h>
+#   include <Poco/Net/SecureStreamSocketImpl.h>
+#endif
+
 #include "Core/Protocol.h"
 #include "Storages/MergeTree/RequestResponse.h"
 #include "TCPHandler.h"
@@ -109,6 +115,7 @@ namespace ErrorCodes
     extern const int UNEXPECTED_PACKET_FROM_CLIENT;
     extern const int UNKNOWN_PROTOCOL;
     extern const int AUTHENTICATION_FAILED;
+    extern const int QUERY_WAS_CANCELLED;
 }
 
 TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string server_display_name_)
@@ -276,8 +283,13 @@ void TCPHandler::runImpl()
                 query_context->getClientInfo().client_trace_context,
                 query_context->getSettingsRef(),
                 query_context->getOpenTelemetrySpanLog());
+            thread_trace_context->root_span.kind = OpenTelemetry::SERVER;
 
-            query_scope.emplace(query_context);
+            query_scope.emplace(query_context, /* fatal_error_callback */ [this]
+            {
+                std::lock_guard lock(fatal_error_mutex);
+                sendLogs();
+            });
 
             /// If query received, then settings in query_context has been updated.
             /// So it's better to update the connection settings for flexibility.
@@ -298,11 +310,6 @@ void TCPHandler::runImpl()
                 state.logs_queue->max_priority = Poco::Logger::parseLevel(client_logs_level.toString());
                 state.logs_queue->setSourceRegexp(query_context->getSettingsRef().send_logs_source_regexp);
                 CurrentThread::attachInternalTextLogsQueue(state.logs_queue, client_logs_level);
-                CurrentThread::setFatalErrorCallback([this]
-                {
-                    std::lock_guard lock(fatal_error_mutex);
-                    sendLogs();
-                });
             }
             if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_INCREMENTAL_PROFILE_EVENTS)
             {
@@ -369,7 +376,7 @@ void TCPHandler::runImpl()
 
                 std::lock_guard lock(task_callback_mutex);
 
-                if (state.is_cancelled)
+                if (state.cancellation_status == CancellationStatus::FULLY_CANCELLED)
                     return {};
 
                 sendReadTaskRequestAssumeLocked();
@@ -385,7 +392,7 @@ void TCPHandler::runImpl()
                 CurrentMetrics::Increment callback_metric_increment(CurrentMetrics::MergeTreeAllRangesAnnouncementsSent);
                 std::lock_guard lock(task_callback_mutex);
 
-                if (state.is_cancelled)
+                if (state.cancellation_status == CancellationStatus::FULLY_CANCELLED)
                     return;
 
                 sendMergeTreeAllRangesAnnounecementAssumeLocked(announcement);
@@ -399,7 +406,7 @@ void TCPHandler::runImpl()
                 CurrentMetrics::Increment callback_metric_increment(CurrentMetrics::MergeTreeReadTaskRequestsSent);
                 std::lock_guard lock(task_callback_mutex);
 
-                if (state.is_cancelled)
+                if (state.cancellation_status == CancellationStatus::FULLY_CANCELLED)
                     return std::nullopt;
 
                 sendMergeTreeReadTaskRequestAssumeLocked(std::move(request));
@@ -415,17 +422,25 @@ void TCPHandler::runImpl()
             after_check_cancelled.restart();
             after_send_progress.restart();
 
+            auto finish_or_cancel = [this]()
+            {
+                if (state.cancellation_status == CancellationStatus::FULLY_CANCELLED)
+                    state.io.onCancelOrConnectionLoss();
+                else
+                    state.io.onFinish();
+            };
+
             if (state.io.pipeline.pushing())
             {
                 /// FIXME: check explicitly that insert query suggests to receive data via native protocol,
                 state.need_receive_data_for_insert = true;
                 processInsertQuery();
-                state.io.onFinish();
+                finish_or_cancel();
             }
             else if (state.io.pipeline.pulling())
             {
                 processOrdinaryQueryWithProcessors();
-                state.io.onFinish();
+                finish_or_cancel();
             }
             else if (state.io.pipeline.completed())
             {
@@ -439,7 +454,7 @@ void TCPHandler::runImpl()
                         {
                             std::scoped_lock lock(task_callback_mutex, fatal_error_mutex);
 
-                            if (isQueryCancelled())
+                            if (getQueryCancellationStatus() == CancellationStatus::FULLY_CANCELLED)
                                 return true;
 
                             sendProgress();
@@ -454,7 +469,7 @@ void TCPHandler::runImpl()
                     executor.execute();
                 }
 
-                state.io.onFinish();
+                finish_or_cancel();
 
                 std::lock_guard lock(task_callback_mutex);
 
@@ -468,7 +483,7 @@ void TCPHandler::runImpl()
             }
             else
             {
-                state.io.onFinish();
+                finish_or_cancel();
             }
 
             /// Do it before sending end of stream, to have a chance to show log message in client.
@@ -490,6 +505,7 @@ void TCPHandler::runImpl()
             /// the MemoryTracker will be wrong for possible deallocations.
             /// (i.e. deallocations from the Aggregator with two-level aggregation)
             state.reset();
+            last_sent_snapshots = ProfileEvents::ThreadIdToCountersSnapshot{};
             query_scope.reset();
             thread_trace_context.reset();
         }
@@ -611,8 +627,6 @@ void TCPHandler::runImpl()
         /// It is important to destroy query context here. We do not want it to live arbitrarily longer than the query.
         query_context.reset();
 
-        CurrentThread::setFatalErrorCallback({});
-
         if (is_interserver_mode)
         {
             /// We don't really have session in interserver mode, new one is created for each query. It's better to reset it now.
@@ -636,7 +650,6 @@ void TCPHandler::extractConnectionSettingsFromContext(const ContextPtr & context
     interactive_delay = settings.interactive_delay;
     sleep_in_send_tables_status = settings.sleep_in_send_tables_status_ms;
     unknown_packet_in_send_data = settings.unknown_packet_in_send_data;
-    sleep_in_receive_cancel = settings.sleep_in_receive_cancel_ms;
     sleep_after_receiving_query = settings.sleep_after_receiving_query_ms;
 }
 
@@ -660,6 +673,7 @@ bool TCPHandler::readDataNext()
             {
                 LOG_INFO(log, "Client has dropped the connection, cancel the query.");
                 state.is_connection_closed = true;
+                state.cancellation_status = CancellationStatus::FULLY_CANCELLED;
                 break;
             }
 
@@ -703,6 +717,9 @@ void TCPHandler::readData()
 
     while (readDataNext())
         ;
+
+    if (state.cancellation_status == CancellationStatus::FULLY_CANCELLED)
+        throw Exception(ErrorCodes::QUERY_WAS_CANCELLED, "Query was cancelled");
 }
 
 
@@ -713,6 +730,9 @@ void TCPHandler::skipData()
 
     while (readDataNext())
         ;
+
+    if (state.cancellation_status == CancellationStatus::FULLY_CANCELLED)
+        throw Exception(ErrorCodes::QUERY_WAS_CANCELLED, "Query was cancelled");
 }
 
 
@@ -749,7 +769,10 @@ void TCPHandler::processInsertQuery()
         while (readDataNext())
             executor.push(std::move(state.block_for_insert));
 
-        executor.finish();
+        if (state.cancellation_status == CancellationStatus::FULLY_CANCELLED)
+            executor.cancel();
+        else
+            executor.finish();
     };
 
     if (num_threads > 1)
@@ -800,7 +823,8 @@ void TCPHandler::processOrdinaryQueryWithProcessors()
         {
             std::unique_lock lock(task_callback_mutex);
 
-            if (isQueryCancelled())
+            auto cancellation_status = getQueryCancellationStatus();
+            if (cancellation_status == CancellationStatus::FULLY_CANCELLED)
             {
                 /// Several callback like callback for parallel reading could be called from inside the pipeline
                 /// and we have to unlock the mutex from our side to prevent deadlock.
@@ -809,6 +833,10 @@ void TCPHandler::processOrdinaryQueryWithProcessors()
                 executor.cancel();
                 break;
             }
+            else if (cancellation_status == CancellationStatus::READ_CANCELLED)
+            {
+                executor.cancelReading();
+            }
 
             if (after_send_progress.elapsed() / 1000 >= interactive_delay)
             {
@@ -839,7 +867,7 @@ void TCPHandler::processOrdinaryQueryWithProcessors()
           *  because we have not read all the data yet,
           *  and there could be ongoing calculations in other threads at the same time.
           */
-        if (!isQueryCancelled())
+        if (getQueryCancellationStatus() != CancellationStatus::FULLY_CANCELLED)
         {
             sendTotals(executor.getTotalsBlock());
             sendExtremes(executor.getExtremesBlock());
@@ -1048,7 +1076,7 @@ bool TCPHandler::receiveProxyHeader()
     /// Only PROXYv1 is supported.
     /// Validation of protocol is not fully performed.
 
-    LimitReadBuffer limit_in(*in, 107, true); /// Maximum length from the specs.
+    LimitReadBuffer limit_in(*in, 107, /* trow_exception */ true, /* exact_limit */ {}); /// Maximum length from the specs.
 
     assertString("PROXY ", limit_in);
 
@@ -1174,7 +1202,8 @@ void TCPHandler::receiveHello()
             throw Exception(ErrorCodes::CLIENT_HAS_CONNECTED_TO_WRONG_PORT, "Client has connected to wrong port");
         }
         else
-            throw NetException(ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT, "Unexpected packet from client");
+            throw NetException(ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT,
+                               "Unexpected packet from client (expected Hello, got {})", packet_type);
     }
 
     readStringBinary(client_name, *in);
@@ -1202,6 +1231,9 @@ void TCPHandler::receiveHello()
     is_interserver_mode = (user == USER_INTERSERVER_MARKER) && password.empty();
     if (is_interserver_mode)
     {
+        if (client_tcp_protocol_version < DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2)
+            LOG_WARNING(LogFrequencyLimiter(log, 10),
+                        "Using deprecated interserver protocol because the client is too old. Consider upgrading all nodes in cluster.");
         receiveClusterNameAndSalt();
         return;
     }
@@ -1209,13 +1241,29 @@ void TCPHandler::receiveHello()
     session = makeSession();
     auto & client_info = session->getClientInfo();
 
-    /// Extract the last entry from comma separated list of forwarded_for addresses.
-    /// Only the last proxy can be trusted (if any).
-    String forwarded_address = client_info.getLastForwardedFor();
-    if (!forwarded_address.empty() && server.config().getBool("auth_use_forwarded_address", false))
-        session->authenticate(user, password, Poco::Net::SocketAddress(forwarded_address, socket().peerAddress().port()));
-    else
-        session->authenticate(user, password, socket().peerAddress());
+#if USE_SSL
+    /// Authentication with SSL user certificate
+    if (dynamic_cast<Poco::Net::SecureStreamSocketImpl*>(socket().impl()))
+    {
+        Poco::Net::SecureStreamSocket secure_socket(socket());
+        if (secure_socket.havePeerCertificate())
+        {
+            try
+            {
+                session->authenticate(
+                    SSLCertificateCredentials{user, secure_socket.peerCertificate().commonName()},
+                    getClientAddress(client_info));
+                return;
+            }
+            catch (...)
+            {
+                tryLogCurrentException(log, "SSL authentication failed, falling back to password authentication");
+            }
+        }
+    }
+#endif
+
+    session->authenticate(user, password, getClientAddress(client_info));
 }
 
 void TCPHandler::receiveAddendum()
@@ -1270,6 +1318,13 @@ void TCPHandler::sendHello()
             writeStringBinary(exception_message, *out);
         }
     }
+    if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2)
+    {
+        chassert(!nonce.has_value());
+        /// Contains lots of stuff (including time), so this should be enough for NONCE.
+        nonce.emplace(thread_local_rng());
+        writeIntBinary(nonce.value(), *out);
+    }
     out->next();
 }
 
@@ -1308,16 +1363,8 @@ bool TCPHandler::receivePacket()
             return false;
 
         case Protocol::Client::Cancel:
-        {
-            /// For testing connection collector.
-            if (unlikely(sleep_in_receive_cancel.totalMilliseconds()))
-            {
-                std::chrono::milliseconds ms(sleep_in_receive_cancel.totalMilliseconds());
-                std::this_thread::sleep_for(ms);
-            }
-
+            decreaseCancellationStatus("Received 'Cancel' packet from the client, canceling the query.");
             return false;
-        }
 
         case Protocol::Client::Hello:
             receiveUnexpectedHello();
@@ -1357,13 +1404,7 @@ String TCPHandler::receiveReadTaskResponseAssumeLocked()
     {
         if (packet_type == Protocol::Client::Cancel)
         {
-            state.is_cancelled = true;
-            /// For testing connection collector.
-            if (unlikely(sleep_in_receive_cancel.totalMilliseconds()))
-            {
-                std::chrono::milliseconds ms(sleep_in_receive_cancel.totalMilliseconds());
-                std::this_thread::sleep_for(ms);
-            }
+            decreaseCancellationStatus("Received 'Cancel' packet from the client, canceling the read task.");
             return {};
         }
         else
@@ -1390,13 +1431,7 @@ std::optional<ParallelReadResponse> TCPHandler::receivePartitionMergeTreeReadTas
     {
         if (packet_type == Protocol::Client::Cancel)
         {
-            state.is_cancelled = true;
-            /// For testing connection collector.
-            if (unlikely(sleep_in_receive_cancel.totalMilliseconds()))
-            {
-                std::chrono::milliseconds ms(sleep_in_receive_cancel.totalMilliseconds());
-                std::this_thread::sleep_for(ms);
-            }
+            decreaseCancellationStatus("Received 'Cancel' packet from the client, canceling the MergeTree read task.");
             return std::nullopt;
         }
         else
@@ -1467,20 +1502,30 @@ void TCPHandler::receiveQuery()
     if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
         passed_params.read(*in, settings_format);
 
-    /// TODO Unify interserver authentication (and make sure that it's secure enough)
     if (is_interserver_mode)
     {
         client_info.interface = ClientInfo::Interface::TCP_INTERSERVER;
 #if USE_SSL
         String cluster_secret = server.context()->getCluster(cluster)->getSecret();
+
         if (salt.empty() || cluster_secret.empty())
         {
-            auto exception = Exception(ErrorCodes::AUTHENTICATION_FAILED, "Interserver authentication failed");
-            session->onAuthenticationFailure(/* user_name */ std::nullopt, socket().peerAddress(), exception);
+            auto exception = Exception(ErrorCodes::AUTHENTICATION_FAILED, "Interserver authentication failed (no salt/cluster secret)");
+            session->onAuthenticationFailure(/* user_name= */ std::nullopt, socket().peerAddress(), exception);
+            throw exception; /// NOLINT
+        }
+
+        if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2 && !nonce.has_value())
+        {
+            auto exception = Exception(ErrorCodes::AUTHENTICATION_FAILED, "Interserver authentication failed (no nonce)");
+            session->onAuthenticationFailure(/* user_name= */ std::nullopt, socket().peerAddress(), exception);
             throw exception; /// NOLINT
         }
 
         std::string data(salt);
+        // For backward compatibility
+        if (nonce.has_value())
+            data += std::to_string(nonce.value());
         data += cluster_secret;
         data += state.query;
         data += state.query_id;
@@ -1501,11 +1546,16 @@ void TCPHandler::receiveQuery()
         /// so we should not rely on that. However, in this particular case we got client_info from other clickhouse-server, so it's ok.
         if (client_info.initial_user.empty())
         {
-            LOG_DEBUG(log, "User (no user, interserver mode)");
+            LOG_DEBUG(log, "User (no user, interserver mode) (client: {})", getClientAddress(client_info).toString());
         }
         else
         {
-            LOG_DEBUG(log, "User (initial, interserver mode): {}", client_info.initial_user);
+            LOG_DEBUG(log, "User (initial, interserver mode): {} (client: {})", client_info.initial_user, getClientAddress(client_info).toString());
+            /// In case of inter-server mode authorization is done with the
+            /// initial address of the client, not the real address from which
+            /// the query was come, since the real address is the address of
+            /// the initiator server, while we are interested in client's
+            /// address.
             session->authenticate(AlwaysAllowCredentials{client_info.initial_user}, client_info.initial_address);
         }
 #else
@@ -1770,14 +1820,37 @@ void TCPHandler::initProfileEventsBlockOutput(const Block & block)
     }
 }
 
-
-bool TCPHandler::isQueryCancelled()
+void TCPHandler::decreaseCancellationStatus(const std::string & log_message)
 {
-    if (state.is_cancelled || state.sent_all_data)
-        return true;
+    auto prev_status = magic_enum::enum_name(state.cancellation_status);
+
+    bool partial_result_on_first_cancel = false;
+    if (query_context)
+    {
+        const auto & settings = query_context->getSettingsRef();
+        partial_result_on_first_cancel = settings.partial_result_on_first_cancel;
+    }
+
+    if (partial_result_on_first_cancel && state.cancellation_status == CancellationStatus::NOT_CANCELLED)
+    {
+        state.cancellation_status = CancellationStatus::READ_CANCELLED;
+    }
+    else
+    {
+        state.cancellation_status = CancellationStatus::FULLY_CANCELLED;
+    }
+
+    auto current_status = magic_enum::enum_name(state.cancellation_status);
+    LOG_INFO(log, "Change cancellation status from {} to {}. Log message: {}", prev_status, current_status, log_message);
+}
+
+QueryState::CancellationStatus TCPHandler::getQueryCancellationStatus()
+{
+    if (state.cancellation_status == CancellationStatus::FULLY_CANCELLED || state.sent_all_data)
+        return CancellationStatus::FULLY_CANCELLED;
 
     if (after_check_cancelled.elapsed() / 1000 < interactive_delay)
-        return false;
+        return state.cancellation_status;
 
     after_check_cancelled.restart();
 
@@ -1787,9 +1860,9 @@ bool TCPHandler::isQueryCancelled()
         if (in->eof())
         {
             LOG_INFO(log, "Client has dropped the connection, cancel the query.");
-            state.is_cancelled = true;
+            state.cancellation_status = CancellationStatus::FULLY_CANCELLED;
             state.is_connection_closed = true;
-            return true;
+            return CancellationStatus::FULLY_CANCELLED;
         }
 
         UInt64 packet_type = 0;
@@ -1800,25 +1873,17 @@ bool TCPHandler::isQueryCancelled()
             case Protocol::Client::Cancel:
                 if (state.empty())
                     throw NetException(ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT, "Unexpected packet Cancel received from client");
-                LOG_INFO(log, "Query was cancelled.");
-                state.is_cancelled = true;
-                /// For testing connection collector.
-                {
-                    if (unlikely(sleep_in_receive_cancel.totalMilliseconds()))
-                    {
-                        std::chrono::milliseconds ms(sleep_in_receive_cancel.totalMilliseconds());
-                        std::this_thread::sleep_for(ms);
-                    }
-                }
 
-                return true;
+                decreaseCancellationStatus("Query was cancelled.");
+
+                return state.cancellation_status;
 
             default:
                 throw NetException(ErrorCodes::UNKNOWN_PACKET_FROM_CLIENT, "Unknown packet from client {}", toString(packet_type));
         }
     }
 
-    return false;
+    return state.cancellation_status;
 }
 
 
@@ -1836,7 +1901,7 @@ void TCPHandler::sendData(const Block & block)
         {
             --unknown_packet_in_send_data;
             if (unknown_packet_in_send_data == 0)
-                writeVarUInt(UInt64(-1), *out);
+                writeVarUInt(VAR_UINT_MAX, *out);
         }
 
         writeVarUInt(Protocol::Server::Data, *out);
@@ -1991,4 +2056,15 @@ void TCPHandler::run()
     }
 }
 
+Poco::Net::SocketAddress TCPHandler::getClientAddress(const ClientInfo & client_info)
+{
+    /// Extract the last entry from comma separated list of forwarded_for addresses.
+    /// Only the last proxy can be trusted (if any).
+    String forwarded_address = client_info.getLastForwardedFor();
+    if (!forwarded_address.empty() && server.config().getBool("auth_use_forwarded_address", false))
+        return Poco::Net::SocketAddress(forwarded_address, socket().peerAddress().port());
+    else
+        return socket().peerAddress();
+}
+
 }
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index f06b0b060b3..d18ffc5afe8 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <optional>
 #include <Poco/Net/TCPServerConnection.h>
 
 #include <base/getFQDNOrHostName.h>
@@ -75,8 +76,17 @@ struct QueryState
     /// Streams of blocks, that are processing the query.
     BlockIO io;
 
+    enum class CancellationStatus: UInt8
+    {
+        FULLY_CANCELLED,
+        READ_CANCELLED,
+        NOT_CANCELLED
+    };
+
+    static std::string cancellationStatusToName(CancellationStatus status);
+
     /// Is request cancelled
-    bool is_cancelled = false;
+    CancellationStatus cancellation_status = CancellationStatus::NOT_CANCELLED;
     bool is_connection_closed = false;
     /// empty or not
     bool is_empty = true;
@@ -163,14 +173,13 @@ private:
 
     /// Connection settings, which are extracted from a context.
     bool send_exception_with_stack_trace = true;
-    Poco::Timespan send_timeout = DBMS_DEFAULT_SEND_TIMEOUT_SEC;
-    Poco::Timespan receive_timeout = DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC;
+    Poco::Timespan send_timeout = Poco::Timespan(DBMS_DEFAULT_SEND_TIMEOUT_SEC, 0);
+    Poco::Timespan receive_timeout = Poco::Timespan(DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC, 0);
     UInt64 poll_interval = DBMS_DEFAULT_POLL_INTERVAL;
     UInt64 idle_connection_timeout = 3600;
     UInt64 interactive_delay = 100000;
     Poco::Timespan sleep_in_send_tables_status;
     UInt64 unknown_packet_in_send_data = 0;
-    Poco::Timespan sleep_in_receive_cancel;
     Poco::Timespan sleep_after_receiving_query;
 
     std::unique_ptr<Session> session;
@@ -189,7 +198,10 @@ private:
 
     /// For inter-server secret (remote_server.*.secret)
     bool is_interserver_mode = false;
+    /// For DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET
     String salt;
+    /// For DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2
+    std::optional<UInt64> nonce;
     String cluster;
 
     std::mutex task_callback_mutex;
@@ -269,10 +281,15 @@ private:
     void initLogsBlockOutput(const Block & block);
     void initProfileEventsBlockOutput(const Block & block);
 
-    bool isQueryCancelled();
+    using CancellationStatus = QueryState::CancellationStatus;
+
+    void decreaseCancellationStatus(const std::string & log_message);
+    CancellationStatus getQueryCancellationStatus();
 
     /// This function is called from different threads.
     void updateProgress(const Progress & value);
+
+    Poco::Net::SocketAddress getClientAddress(const ClientInfo & client_info);
 };
 
 }
diff --git a/src/Server/waitServersToFinish.cpp b/src/Server/waitServersToFinish.cpp
new file mode 100644
index 00000000000..f2e36fae86c
--- /dev/null
+++ b/src/Server/waitServersToFinish.cpp
@@ -0,0 +1,36 @@
+#include <Server/waitServersToFinish.h>
+#include <Server/ProtocolServerAdapter.h>
+#include <base/sleep.h>
+
+namespace DB
+{
+
+size_t waitServersToFinish(std::vector<DB::ProtocolServerAdapter> & servers, size_t seconds_to_wait)
+{
+    const size_t sleep_max_ms = 1000 * seconds_to_wait;
+    const size_t sleep_one_ms = 100;
+    size_t sleep_current_ms = 0;
+    size_t current_connections = 0;
+    for (;;)
+    {
+        current_connections = 0;
+
+        for (auto & server : servers)
+        {
+            server.stop();
+            current_connections += server.currentConnections();
+        }
+
+        if (!current_connections)
+            break;
+
+        sleep_current_ms += sleep_one_ms;
+        if (sleep_current_ms < sleep_max_ms)
+            sleepForMilliseconds(sleep_one_ms);
+        else
+            break;
+    }
+    return current_connections;
+}
+
+}
diff --git a/src/Server/waitServersToFinish.h b/src/Server/waitServersToFinish.h
new file mode 100644
index 00000000000..5e90790cefb
--- /dev/null
+++ b/src/Server/waitServersToFinish.h
@@ -0,0 +1,10 @@
+#pragma once
+#include <Core/Types.h>
+
+namespace DB
+{
+class ProtocolServerAdapter;
+
+size_t waitServersToFinish(std::vector<ProtocolServerAdapter> & servers, size_t seconds_to_wait);
+
+}
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index da11a87eb4d..5fd823b9e01 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -719,7 +719,7 @@ bool isMetadataOnlyConversion(const IDataType * from, const IDataType * to)
             { typeid(DataTypeUInt16),   typeid(DataTypeDate)     },
         };
 
-    /// Unwrap some nested and check for valid conevrsions
+    /// Unwrap some nested and check for valid conversions
     while (true)
     {
         /// types are equal, obviously pure metadata alter
@@ -749,10 +749,9 @@ bool isMetadataOnlyConversion(const IDataType * from, const IDataType * to)
 
         const auto * nullable_from = typeid_cast<const DataTypeNullable *>(from);
         const auto * nullable_to = typeid_cast<const DataTypeNullable *>(to);
-        if (nullable_to)
+        if (nullable_from && nullable_to)
         {
-            /// Here we allow a conversion X -> Nullable(X) to make a metadata-only conversion.
-            from = nullable_from ? nullable_from->getNestedType().get() : from;
+            from = nullable_from->getNestedType().get();
             to = nullable_to->getNestedType().get();
             continue;
         }
@@ -1091,7 +1090,11 @@ void AlterCommands::validate(const StoragePtr & table, ContextPtr context) const
                                                              "in a single ALTER query", backQuote(column_name));
 
             if (command.codec)
+            {
+                if (all_columns.hasAlias(column_name))
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot specify codec for column type ALIAS");
                 CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context->getSettingsRef().allow_suspicious_codecs, context->getSettingsRef().allow_experimental_codecs);
+            }
             auto column_default = all_columns.getDefault(column_name);
             if (column_default)
             {
@@ -1118,6 +1121,20 @@ void AlterCommands::validate(const StoragePtr & table, ContextPtr context) const
                 }
             }
 
+            /// The change of data type to/from Object is broken, so disable it for now
+            if (command.data_type)
+            {
+                const GetColumnsOptions options(GetColumnsOptions::AllPhysical);
+                const auto old_data_type = all_columns.getColumn(options, column_name).type;
+
+                if (command.data_type->getName().contains("Object")
+                    || old_data_type->getName().contains("Object"))
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "The change of data type {} of column {} to {} is not allowed",
+                        old_data_type->getName(), backQuote(column_name), command.data_type->getName());
+            }
+
             if (command.isRemovingProperty())
             {
                 if (!column_default && command.to_remove == AlterCommand::RemoveProperty::DEFAULT)
diff --git a/src/Storages/Cache/ExternalDataSourceCache.cpp b/src/Storages/Cache/ExternalDataSourceCache.cpp
index 56b2e661836..1fc68a2d774 100644
--- a/src/Storages/Cache/ExternalDataSourceCache.cpp
+++ b/src/Storages/Cache/ExternalDataSourceCache.cpp
@@ -15,7 +15,7 @@
 #include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
 #include <Common/SipHash.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Core/Types.h>
 #include <base/types.h>
 #include <consistent_hashing.h>
diff --git a/src/Storages/Cache/RemoteCacheController.h b/src/Storages/Cache/RemoteCacheController.h
index 18732acc273..fafe363bbd4 100644
--- a/src/Storages/Cache/RemoteCacheController.h
+++ b/src/Storages/Cache/RemoteCacheController.h
@@ -9,7 +9,6 @@
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteBufferFromFileBase.h>
 #include <Storages/Cache/IRemoteFileMetadata.h>
-#include <Common/logger_useful.h>
 #include <Poco/Logger.h>
 #include <Common/ErrorCodes.h>
 
diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
index d401840eec7..8eabae7929c 100644
--- a/src/Storages/ColumnsDescription.cpp
+++ b/src/Storages/ColumnsDescription.cpp
@@ -650,6 +650,12 @@ bool ColumnsDescription::hasPhysical(const String & column_name) const
         it->default_desc.kind != ColumnDefaultKind::Alias && it->default_desc.kind != ColumnDefaultKind::Ephemeral;
 }
 
+bool ColumnsDescription::hasAlias(const String & column_name) const
+{
+    auto it = columns.get<1>().find(column_name);
+    return it != columns.get<1>().end() && it->default_desc.kind == ColumnDefaultKind::Alias;
+}
+
 bool ColumnsDescription::hasColumnOrSubcolumn(GetColumnsOptions::Kind kind, const String & column_name) const
 {
     auto it = columns.get<1>().find(column_name);
diff --git a/src/Storages/ColumnsDescription.h b/src/Storages/ColumnsDescription.h
index 4f874f4b850..365a999673e 100644
--- a/src/Storages/ColumnsDescription.h
+++ b/src/Storages/ColumnsDescription.h
@@ -176,6 +176,7 @@ public:
     Names getNamesOfPhysical() const;
 
     bool hasPhysical(const String & column_name) const;
+    bool hasAlias(const String & column_name) const;
     bool hasColumnOrSubcolumn(GetColumnsOptions::Kind kind, const String & column_name) const;
     bool hasColumnOrNested(GetColumnsOptions::Kind kind, const String & column_name) const;
 
diff --git a/src/Storages/ConstraintsDescription.cpp b/src/Storages/ConstraintsDescription.cpp
index 5207458af8c..db37ac7c4c3 100644
--- a/src/Storages/ConstraintsDescription.cpp
+++ b/src/Storages/ConstraintsDescription.cpp
@@ -11,6 +11,13 @@
 
 #include <Core/Defines.h>
 
+#include <Analyzer/QueryTreeBuilder.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/TableNode.h>
+#include <Analyzer/QueryNode.h>
+#include <Analyzer/Passes/QueryAnalysisPass.h>
+
+#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -103,7 +110,7 @@ std::vector<CNFQuery::AtomicFormula> ConstraintsDescription::getAtomicConstraint
     return constraint_data;
 }
 
-std::unique_ptr<ComparisonGraph> ConstraintsDescription::buildGraph() const
+std::unique_ptr<ComparisonGraph<ASTPtr>> ConstraintsDescription::buildGraph() const
 {
     static const NameSet relations = { "equals", "less", "lessOrEquals", "greaterOrEquals", "greater" };
 
@@ -121,7 +128,7 @@ std::unique_ptr<ComparisonGraph> ConstraintsDescription::buildGraph() const
         }
     }
 
-    return std::make_unique<ComparisonGraph>(constraints_for_graph);
+    return std::make_unique<ComparisonGraph<ASTPtr>>(constraints_for_graph);
 }
 
 ConstraintsExpressions ConstraintsDescription::getExpressions(const DB::ContextPtr context,
@@ -143,7 +150,7 @@ ConstraintsExpressions ConstraintsDescription::getExpressions(const DB::ContextP
     return res;
 }
 
-const ComparisonGraph & ConstraintsDescription::getGraph() const
+const ComparisonGraph<ASTPtr> & ConstraintsDescription::getGraph() const
 {
     return *graph;
 }
@@ -175,6 +182,94 @@ std::vector<CNFQuery::AtomicFormula> ConstraintsDescription::getAtomsById(const
     return result;
 }
 
+ConstraintsDescription::QueryTreeData ConstraintsDescription::getQueryTreeData(const ContextPtr & context, const QueryTreeNodePtr & table_node) const
+{
+    QueryTreeData data;
+    std::vector<Analyzer::CNF::AtomicFormula> atomic_constraints_data;
+
+    QueryAnalysisPass pass(table_node);
+
+    for (const auto & constraint : filterConstraints(ConstraintsDescription::ConstraintType::ALWAYS_TRUE))
+    {
+        auto query_tree = buildQueryTree(constraint->as<ASTConstraintDeclaration>()->expr->ptr(), context);
+        pass.run(query_tree, context);
+
+        const auto cnf = Analyzer::CNF::toCNF(query_tree, context)
+            .pullNotOutFunctions(context);
+        for (const auto & group : cnf.getStatements())
+        {
+            data.cnf_constraints.emplace_back(group.begin(), group.end());
+
+            if (group.size() == 1)
+                atomic_constraints_data.emplace_back(*group.begin());
+        }
+
+        data.constraints.push_back(std::move(query_tree));
+    }
+
+    for (size_t i = 0; i < data.cnf_constraints.size(); ++i)
+        for (size_t j = 0; j < data.cnf_constraints[i].size(); ++j)
+            data.query_node_to_atom_ids[data.cnf_constraints[i][j].node_with_hash].push_back({i, j});
+
+    /// build graph
+    if (constraints.empty())
+    {
+        data.graph = std::make_unique<ComparisonGraph<QueryTreeNodePtr>>(QueryTreeNodes(), context);
+    }
+    else
+    {
+        static const NameSet relations = { "equals", "less", "lessOrEquals", "greaterOrEquals", "greater" };
+
+        QueryTreeNodes constraints_for_graph;
+        for (const auto & atomic_formula : atomic_constraints_data)
+        {
+            Analyzer::CNF::AtomicFormula atom{atomic_formula.negative, atomic_formula.node_with_hash.node->clone()};
+            atom = Analyzer::CNF::pushNotIntoFunction(atom, context);
+
+            auto * function_node = atom.node_with_hash.node->as<FunctionNode>();
+            if (function_node && relations.contains(function_node->getFunctionName()))
+            {
+                assert(!atom.negative);
+                constraints_for_graph.push_back(atom.node_with_hash.node);
+            }
+        }
+        data.graph = std::make_unique<ComparisonGraph<QueryTreeNodePtr>>(constraints_for_graph, context);
+    }
+
+    return data;
+}
+
+const QueryTreeNodes & ConstraintsDescription::QueryTreeData::getConstraints() const
+{
+    return constraints;
+}
+
+const std::vector<std::vector<Analyzer::CNF::AtomicFormula>> & ConstraintsDescription::QueryTreeData::getConstraintData() const
+{
+    return cnf_constraints;
+}
+
+const ComparisonGraph<QueryTreeNodePtr> & ConstraintsDescription::QueryTreeData::getGraph() const
+{
+    return *graph;
+}
+
+std::optional<ConstraintsDescription::AtomIds> ConstraintsDescription::QueryTreeData::getAtomIds(const QueryTreeNodePtrWithHash & node_with_hash) const
+{
+    auto it = query_node_to_atom_ids.find(node_with_hash);
+    if (it != query_node_to_atom_ids.end())
+        return it->second;
+    return std::nullopt;
+}
+
+std::vector<Analyzer::CNF::AtomicFormula> ConstraintsDescription::QueryTreeData::getAtomsById(const AtomIds & ids) const
+{
+    std::vector<Analyzer::CNF::AtomicFormula> result;
+    for (const auto & id : ids)
+        result.push_back(cnf_constraints[id.group_id][id.atom_id]);
+    return result;
+}
+
 ConstraintsDescription::ConstraintsDescription(const ASTs & constraints_)
     : constraints(constraints_)
 {
@@ -218,7 +313,7 @@ void ConstraintsDescription::update()
     {
         cnf_constraints.clear();
         ast_to_atom_ids.clear();
-        graph = std::make_unique<ComparisonGraph>(ASTs());
+        graph = std::make_unique<ComparisonGraph<ASTPtr>>(ASTs());
         return;
     }
 
diff --git a/src/Storages/ConstraintsDescription.h b/src/Storages/ConstraintsDescription.h
index eb1eb95d33d..33bd8e1abf9 100644
--- a/src/Storages/ConstraintsDescription.h
+++ b/src/Storages/ConstraintsDescription.h
@@ -5,6 +5,8 @@
 #include <Interpreters/TreeCNFConverter.h>
 #include <Interpreters/ComparisonGraph.h>
 
+#include <Analyzer/Passes/CNF.h>
+
 namespace DB
 {
 
@@ -41,7 +43,7 @@ public:
     const std::vector<std::vector<CNFQuery::AtomicFormula>> & getConstraintData() const;
     std::vector<CNFQuery::AtomicFormula> getAtomicConstraintData() const;
 
-    const ComparisonGraph & getGraph() const;
+    const ComparisonGraph<ASTPtr> & getGraph() const;
 
     ConstraintsExpressions getExpressions(ContextPtr context, const NamesAndTypesList & source_columns_) const;
 
@@ -56,15 +58,36 @@ public:
     std::optional<AtomIds> getAtomIds(const ASTPtr & ast) const;
     std::vector<CNFQuery::AtomicFormula> getAtomsById(const AtomIds & ids) const;
 
+    class QueryTreeData
+    {
+    public:
+        const QueryTreeNodes & getConstraints() const;
+        const std::vector<std::vector<Analyzer::CNF::AtomicFormula>> & getConstraintData() const;
+        std::optional<AtomIds> getAtomIds(const QueryTreeNodePtrWithHash & node_with_hash) const;
+        std::vector<Analyzer::CNF::AtomicFormula> getAtomsById(const AtomIds & ids) const;
+        const ComparisonGraph<QueryTreeNodePtr> & getGraph() const;
+    private:
+        QueryTreeNodes constraints;
+        std::vector<std::vector<Analyzer::CNF::AtomicFormula>> cnf_constraints;
+        QueryTreeNodePtrWithHashMap<AtomIds> query_node_to_atom_ids;
+        std::unique_ptr<ComparisonGraph<QueryTreeNodePtr>> graph;
+
+        friend ConstraintsDescription;
+    };
+
+    QueryTreeData getQueryTreeData(const ContextPtr & context, const QueryTreeNodePtr & table_node) const;
+
 private:
     std::vector<std::vector<CNFQuery::AtomicFormula>> buildConstraintData() const;
-    std::unique_ptr<ComparisonGraph> buildGraph() const;
+    std::unique_ptr<ComparisonGraph<ASTPtr>> buildGraph() const;
     void update();
 
     ASTs constraints;
+
     std::vector<std::vector<CNFQuery::AtomicFormula>> cnf_constraints;
     std::map<IAST::Hash, AtomIds> ast_to_atom_ids;
-    std::unique_ptr<ComparisonGraph> graph;
+
+    std::unique_ptr<ComparisonGraph<ASTPtr>> graph;
 };
 
 }
diff --git a/src/Storages/DataLakes/DeltaLakeMetadataParser.cpp b/src/Storages/DataLakes/DeltaLakeMetadataParser.cpp
new file mode 100644
index 00000000000..309aa54909a
--- /dev/null
+++ b/src/Storages/DataLakes/DeltaLakeMetadataParser.cpp
@@ -0,0 +1,342 @@
+#include <Storages/DataLakes/DeltaLakeMetadataParser.h>
+#include <base/JSON.h>
+#include "config.h"
+#include <set>
+
+#if USE_AWS_S3 && USE_PARQUET
+#include <Storages/DataLakes/S3MetadataReader.h>
+#include <Storages/StorageS3.h>
+#include <parquet/file_reader.h>
+#include <Processors/Formats/Impl/ArrowBufferedStreams.h>
+#include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
+#include <Processors/Formats/Impl/ArrowColumnToCHColumn.h>
+#include <Formats/FormatFactory.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnNullable.h>
+#include <IO/ReadHelpers.h>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <parquet/arrow/reader.h>
+#include <ranges>
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INCORRECT_DATA;
+    extern const int BAD_ARGUMENTS;
+}
+
+template <typename Configuration, typename MetadataReadHelper>
+struct DeltaLakeMetadataParser<Configuration, MetadataReadHelper>::Impl
+{
+    /**
+     * Useful links:
+     *  - https://github.com/delta-io/delta/blob/master/PROTOCOL.md#data-files
+     */
+
+    /**
+     * DeltaLake tables store metadata files and data files.
+     * Metadata files are stored as JSON in a directory at the root of the table named _delta_log,
+     * and together with checkpoints make up the log of all changes that have occurred to a table.
+     *
+     * Delta files are the unit of atomicity for a table,
+     * and are named using the next available version number, zero-padded to 20 digits.
+     * For example:
+     *     ./_delta_log/00000000000000000000.json
+     */
+    static constexpr auto deltalake_metadata_directory = "_delta_log";
+    static constexpr auto metadata_file_suffix = ".json";
+
+    std::string withPadding(size_t version)
+    {
+        /// File names are zero-padded to 20 digits.
+        static constexpr auto padding = 20;
+
+        const auto version_str = toString(version);
+        return std::string(padding - version_str.size(), '0') + version_str;
+    }
+
+    /**
+     * A delta file, n.json, contains an atomic set of actions that should be applied to the
+     * previous table state (n-1.json) in order to the construct nth snapshot of the table.
+     * An action changes one aspect of the table's state, for example, adding or removing a file.
+     * Note: it is not a valid json, but a list of json's, so we read it in a while cycle.
+     */
+    std::set<String> processMetadataFiles(const Configuration & configuration, ContextPtr context)
+    {
+        std::set<String> result_files;
+        const auto checkpoint_version = getCheckpointIfExists(result_files, configuration, context);
+
+        if (checkpoint_version)
+        {
+            auto current_version = checkpoint_version;
+            while (true)
+            {
+                const auto filename = withPadding(++current_version) + metadata_file_suffix;
+                const auto file_path = fs::path(configuration.getPath()) / deltalake_metadata_directory / filename;
+
+                if (!MetadataReadHelper::exists(file_path, configuration))
+                    break;
+
+                processMetadataFile(file_path, result_files, configuration, context);
+            }
+
+            LOG_TRACE(
+                log, "Processed metadata files from checkpoint {} to {}",
+                checkpoint_version, current_version - 1);
+        }
+        else
+        {
+            const auto keys = MetadataReadHelper::listFiles(
+                configuration, deltalake_metadata_directory, metadata_file_suffix);
+
+            for (const String & key : keys)
+                processMetadataFile(key, result_files, configuration, context);
+        }
+
+        return result_files;
+    }
+
+    /**
+     * Example of content of a single .json metadata file:
+     * "
+     *     {"commitInfo":{
+     *         "timestamp":1679424650713,
+     *         "operation":"WRITE",
+     *         "operationMetrics":{"numFiles":"1","numOutputRows":"100","numOutputBytes":"2560"},
+     *         ...}
+     *     {"protocol":{"minReaderVersion":2,"minWriterVersion":5}}
+     *     {"metaData":{
+     *         "id":"bd11ad96-bc2c-40b0-be1f-6fdd90d04459",
+     *         "format":{"provider":"parquet","options":{}},
+     *         "schemaString":"{...}",
+     *         "partitionColumns":[],
+     *         "configuration":{...},
+     *         "createdTime":1679424648640}}
+     *     {"add":{
+     *         "path":"part-00000-ecf8ed08-d04a-4a71-a5ec-57d8bb2ab4ee-c000.parquet",
+     *         "partitionValues":{},
+     *         "size":2560,
+     *         "modificationTime":1679424649568,
+     *         "dataChange":true,
+     *         "stats":"{
+     *             \"numRecords\":100,
+     *             \"minValues\":{\"col-6c990940-59bb-4709-8f2e-17083a82c01a\":0},
+     *             \"maxValues\":{\"col-6c990940-59bb-4709-8f2e-17083a82c01a\":99},
+     *             \"nullCount\":{\"col-6c990940-59bb-4709-8f2e-17083a82c01a\":0,\"col-763cd7e2-7627-4d8e-9fb7-9e85d0c8845b\":0}}"}}
+     * "
+     */
+    void processMetadataFile(
+        const String & key,
+        std::set<String> & result,
+        const Configuration & configuration,
+        ContextPtr context)
+    {
+        auto buf = MetadataReadHelper::createReadBuffer(key, context, configuration);
+
+        char c;
+        while (!buf->eof())
+        {
+            /// May be some invalid characters before json.
+            while (buf->peek(c) && c != '{')
+                buf->ignore();
+
+            if (buf->eof())
+                break;
+
+            String json_str;
+            readJSONObjectPossiblyInvalid(json_str, *buf);
+
+            if (json_str.empty())
+                continue;
+
+            const JSON json(json_str);
+            if (json.has("add"))
+            {
+                const auto path = json["add"]["path"].getString();
+                const auto [_, inserted] = result.insert(fs::path(configuration.getPath()) / path);
+                if (!inserted)
+                    throw Exception(ErrorCodes::INCORRECT_DATA, "File already exists {}", path);
+            }
+            else if (json.has("remove"))
+            {
+                const auto path = json["remove"]["path"].getString();
+                const bool erase = result.erase(fs::path(configuration.getPath()) / path);
+                if (!erase)
+                    throw Exception(ErrorCodes::INCORRECT_DATA, "File doesn't exist {}", path);
+            }
+        }
+    }
+
+    /**
+     * Checkpoints in delta-lake are created each 10 commits by default.
+     * Latest checkpoint is written in _last_checkpoint file: _delta_log/_last_checkpoint
+     *
+     * _last_checkpoint contains the following:
+     * {"version":20,
+     *  "size":23,
+     *  "sizeInBytes":14057,
+     *  "numOfAddFiles":21,
+     *  "checkpointSchema":{...}}
+     *
+     *  We need to get "version", which is the version of the checkpoint we need to read.
+     */
+    size_t readLastCheckpointIfExists(const Configuration & configuration, ContextPtr context)
+    {
+        const auto last_checkpoint_file = fs::path(configuration.getPath()) / deltalake_metadata_directory / "_last_checkpoint";
+        if (!MetadataReadHelper::exists(last_checkpoint_file, configuration))
+            return 0;
+
+        String json_str;
+        auto buf = MetadataReadHelper::createReadBuffer(last_checkpoint_file, context, configuration);
+        readJSONObjectPossiblyInvalid(json_str, *buf);
+
+        const JSON json(json_str);
+        const auto version = json["version"].getUInt();
+
+        LOG_TRACE(log, "Last checkpoint file version: {}", version);
+        return version;
+    }
+
+    /**
+     *  The format of the checkpoint file name can take one of two forms:
+     *  1. A single checkpoint file for version n of the table will be named n.checkpoint.parquet.
+     *     For example:
+     *         00000000000000000010.checkpoint.parquet
+     *  2. A multi-part checkpoint for version n can be fragmented into p files. Fragment o of p is
+     *     named n.checkpoint.o.p.parquet. For example:
+     *         00000000000000000010.checkpoint.0000000001.0000000003.parquet
+     *         00000000000000000010.checkpoint.0000000002.0000000003.parquet
+     *         00000000000000000010.checkpoint.0000000003.0000000003.parquet
+     *  TODO: Only (1) is supported, need to support (2).
+     *
+     *  Such checkpoint files parquet contain data with the following contents:
+     *
+     *  Row 1:
+     *  ──────
+     *  txn:      (NULL,NULL,NULL)
+     *  add:      ('part-00000-1e9cd0c1-57b5-43b4-9ed8-39854287b83a-c000.parquet',{},1070,1680614340485,false,{},'{"numRecords":1,"minValues":{"col-360dade5-6d0e-4831-8467-a25d64695975":13,"col-e27b0253-569a-4fe1-8f02-f3342c54d08b":"14"},"maxValues":{"col-360dade5-6d0e-4831-8467-a25d64695975":13,"col-e27b0253-569a-4fe1-8f02-f3342c54d08b":"14"},"nullCount":{"col-360dade5-6d0e-4831-8467-a25d64695975":0,"col-e27b0253-569a-4fe1-8f02-f3342c54d08b":0}}')
+     *  remove:   (NULL,NULL,NULL,NULL,{},NULL,{})
+     *  metaData: (NULL,NULL,NULL,(NULL,{}),NULL,[],{},NULL)
+     *  protocol: (NULL,NULL)
+     *
+     *  Row 2:
+     *  ──────
+     *  txn:      (NULL,NULL,NULL)
+     *  add:      ('part-00000-8887e898-91dd-4951-a367-48f7eb7bd5fd-c000.parquet',{},1063,1680614318485,false,{},'{"numRecords":1,"minValues":{"col-360dade5-6d0e-4831-8467-a25d64695975":2,"col-e27b0253-569a-4fe1-8f02-f3342c54d08b":"3"},"maxValues":{"col-360dade5-6d0e-4831-8467-a25d64695975":2,"col-e27b0253-569a-4fe1-8f02-f3342c54d08b":"3"},"nullCount":{"col-360dade5-6d0e-4831-8467-a25d64695975":0,"col-e27b0253-569a-4fe1-8f02-f3342c54d08b":0}}')
+     *  remove:   (NULL,NULL,NULL,NULL,{},NULL,{})
+     *  metaData: (NULL,NULL,NULL,(NULL,{}),NULL,[],{},NULL)
+     *  protocol: (NULL,NULL)
+     *
+     * We need to check only `add` column, `remove` column does not have intersections with `add` column.
+     *  ...
+     */
+    #define THROW_ARROW_NOT_OK(status)                                    \
+        do                                                                \
+        {                                                                 \
+            if (const ::arrow::Status & _s = (status); !_s.ok())          \
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Arrow error: {}", _s.ToString()); \
+        } while (false)
+
+    size_t getCheckpointIfExists(std::set<String> & result, const Configuration & configuration, ContextPtr context)
+    {
+        const auto version = readLastCheckpointIfExists(configuration, context);
+        if (!version)
+            return 0;
+
+        const auto checkpoint_filename = withPadding(version) + ".checkpoint.parquet";
+        const auto checkpoint_path = fs::path(configuration.getPath()) / deltalake_metadata_directory / checkpoint_filename;
+
+        LOG_TRACE(log, "Using checkpoint file: {}", checkpoint_path.string());
+
+        auto buf = MetadataReadHelper::createReadBuffer(checkpoint_path, context, configuration);
+        auto format_settings = getFormatSettings(context);
+
+        /// Force nullable, because this parquet file for some reason does not have nullable
+        /// in parquet file metadata while the type are in fact nullable.
+        format_settings.schema_inference_make_columns_nullable = true;
+        auto columns = ParquetSchemaReader(*buf, format_settings).readSchema();
+
+        /// Read only columns that we need.
+        columns.filterColumns(NameSet{"add", "remove"});
+        Block header;
+        for (const auto & column : columns)
+            header.insert({column.type->createColumn(), column.type, column.name});
+
+        std::atomic<int> is_stopped{0};
+        auto arrow_file = asArrowFile(*buf, format_settings, is_stopped, "Parquet", PARQUET_MAGIC_BYTES);
+
+        std::unique_ptr<parquet::arrow::FileReader> reader;
+        THROW_ARROW_NOT_OK(
+            parquet::arrow::OpenFile(
+                asArrowFile(*buf, format_settings, is_stopped, "Parquet", PARQUET_MAGIC_BYTES),
+                arrow::default_memory_pool(),
+                &reader));
+
+        std::shared_ptr<arrow::Schema> schema;
+        THROW_ARROW_NOT_OK(reader->GetSchema(&schema));
+
+        ArrowColumnToCHColumn column_reader(
+            header, "Parquet",
+            format_settings.parquet.import_nested,
+            format_settings.parquet.allow_missing_columns,
+            /* null_as_default */true,
+            /* case_insensitive_column_matching */false);
+
+        Chunk res;
+        std::shared_ptr<arrow::Table> table;
+        THROW_ARROW_NOT_OK(reader->ReadTable(&table));
+
+        column_reader.arrowTableToCHChunk(res, table, reader->parquet_reader()->metadata()->num_rows());
+        const auto & res_columns = res.getColumns();
+
+        if (res_columns.size() != 2)
+        {
+            throw Exception(
+                ErrorCodes::INCORRECT_DATA,
+                "Unexpected number of columns: {} (having: {}, expected: {})",
+                res_columns.size(), res.dumpStructure(), header.dumpStructure());
+        }
+
+        const auto * tuple_column = assert_cast<const ColumnTuple *>(res_columns[0].get());
+        const auto & nullable_column = assert_cast<const ColumnNullable &>(tuple_column->getColumn(0));
+        const auto & path_column = assert_cast<const ColumnString &>(nullable_column.getNestedColumn());
+        for (size_t i = 0; i < path_column.size(); ++i)
+        {
+            const auto filename = String(path_column.getDataAt(i));
+            if (filename.empty())
+                continue;
+            LOG_TEST(log, "Adding {}", filename);
+            const auto [_, inserted] = result.insert(fs::path(configuration.getPath()) / filename);
+            if (!inserted)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "File already exists {}", filename);
+        }
+
+        return version;
+    }
+
+    Poco::Logger * log = &Poco::Logger::get("DeltaLakeMetadataParser");
+};
+
+
+template <typename Configuration, typename MetadataReadHelper>
+DeltaLakeMetadataParser<Configuration, MetadataReadHelper>::DeltaLakeMetadataParser() : impl(std::make_unique<Impl>())
+{
+}
+
+template <typename Configuration, typename MetadataReadHelper>
+Strings DeltaLakeMetadataParser<Configuration, MetadataReadHelper>::getFiles(const Configuration & configuration, ContextPtr context)
+{
+    auto result = impl->processMetadataFiles(configuration, context);
+    return Strings(result.begin(), result.end());
+}
+
+template DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::DeltaLakeMetadataParser();
+template Strings DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::getFiles(
+    const StorageS3::Configuration & configuration, ContextPtr);
+}
+
+#endif
diff --git a/src/Storages/DataLakes/DeltaLakeMetadataParser.h b/src/Storages/DataLakes/DeltaLakeMetadataParser.h
new file mode 100644
index 00000000000..df7276b90b4
--- /dev/null
+++ b/src/Storages/DataLakes/DeltaLakeMetadataParser.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <Interpreters/Context_fwd.h>
+#include <Core/Types.h>
+
+namespace DB
+{
+
+template <typename Configuration, typename MetadataReadHelper>
+struct DeltaLakeMetadataParser
+{
+public:
+    DeltaLakeMetadataParser<Configuration, MetadataReadHelper>();
+
+    Strings getFiles(const Configuration & configuration, ContextPtr context);
+
+private:
+    struct Impl;
+    std::shared_ptr<Impl> impl;
+};
+
+}
diff --git a/src/Storages/DataLakes/HudiMetadataParser.cpp b/src/Storages/DataLakes/HudiMetadataParser.cpp
new file mode 100644
index 00000000000..a1f35a5ae42
--- /dev/null
+++ b/src/Storages/DataLakes/HudiMetadataParser.cpp
@@ -0,0 +1,115 @@
+#include <Storages/DataLakes/HudiMetadataParser.h>
+#include <Common/logger_useful.h>
+#include <ranges>
+#include <base/find_symbols.h>
+#include <Poco/String.h>
+#include "config.h"
+#include <filesystem>
+#include <IO/ReadHelpers.h>
+
+#if USE_AWS_S3
+#include <Storages/DataLakes/S3MetadataReader.h>
+#include <Storages/StorageS3.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+template <typename Configuration, typename MetadataReadHelper>
+struct HudiMetadataParser<Configuration, MetadataReadHelper>::Impl
+{
+    /**
+     * Useful links:
+     * - https://hudi.apache.org/tech-specs/
+     * - https://hudi.apache.org/docs/file_layouts/
+     */
+
+    /**
+      * Hudi tables store metadata files and data files.
+      * Metadata files are stored in .hoodie/metadata directory. Though unlike DeltaLake and Iceberg,
+      * metadata is not required in order to understand which files we need to read, moreover,
+      * for Hudi metadata does not always exist.
+      *
+      * There can be two types of data files
+      * 1. base files (columnar file formats like Apache Parquet/Orc)
+      * 2. log files
+      * Currently we support reading only `base files`.
+      * Data file name format:
+      * [File Id]_[File Write Token]_[Transaction timestamp].[File Extension]
+      *
+      * To find needed parts we need to find out latest part file for every file group for every partition.
+      * Explanation why:
+      *    Hudi reads in and overwrites the entire table/partition with each update.
+      *    Hudi controls the number of file groups under a single partition according to the
+      *    hoodie.parquet.max.file.size option. Once a single Parquet file is too large, Hudi creates a second file group.
+      *    Each file group is identified by File Id.
+      */
+    Strings processMetadataFiles(const Configuration & configuration)
+    {
+        auto * log = &Poco::Logger::get("HudiMetadataParser");
+
+        const auto keys = MetadataReadHelper::listFiles(configuration, "", Poco::toLower(configuration.format));
+
+        using Partition = std::string;
+        using FileID = std::string;
+        struct FileInfo
+        {
+            String key;
+            UInt64 timestamp = 0;
+        };
+        std::unordered_map<Partition, std::unordered_map<FileID, FileInfo>> data_files;
+
+        for (const auto & key : keys)
+        {
+            auto key_file = std::filesystem::path(key);
+            Strings file_parts;
+            splitInto<'_'>(file_parts, key_file.stem());
+            if (file_parts.size() != 3)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected format for file: {}", key);
+
+            const auto partition = key_file.parent_path().stem();
+            const auto & file_id = file_parts[0];
+            const auto timestamp = parse<UInt64>(file_parts[2]);
+
+            auto & file_info = data_files[partition][file_id];
+            if (file_info.timestamp == 0 || file_info.timestamp < timestamp)
+            {
+                file_info.key = std::move(key);
+                file_info.timestamp = timestamp;
+            }
+        }
+
+        Strings result;
+        for (auto & [partition, partition_data] : data_files)
+        {
+            LOG_TRACE(log, "Adding {} data files from partition {}", partition, partition_data.size());
+            for (auto & [file_id, file_data] : partition_data)
+                result.push_back(std::move(file_data.key));
+        }
+        return result;
+    }
+};
+
+
+template <typename Configuration, typename MetadataReadHelper>
+HudiMetadataParser<Configuration, MetadataReadHelper>::HudiMetadataParser() : impl(std::make_unique<Impl>())
+{
+}
+
+template <typename Configuration, typename MetadataReadHelper>
+Strings HudiMetadataParser<Configuration, MetadataReadHelper>::getFiles(const Configuration & configuration, ContextPtr)
+{
+    return impl->processMetadataFiles(configuration);
+}
+
+template HudiMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::HudiMetadataParser();
+template Strings HudiMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::getFiles(
+    const StorageS3::Configuration & configuration, ContextPtr);
+
+}
+
+#endif
diff --git a/src/Storages/DataLakes/HudiMetadataParser.h b/src/Storages/DataLakes/HudiMetadataParser.h
new file mode 100644
index 00000000000..6727ba2f718
--- /dev/null
+++ b/src/Storages/DataLakes/HudiMetadataParser.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <Interpreters/Context_fwd.h>
+#include <Core/Types.h>
+
+namespace DB
+{
+
+template <typename Configuration, typename MetadataReadHelper>
+struct HudiMetadataParser
+{
+public:
+    HudiMetadataParser<Configuration, MetadataReadHelper>();
+
+    Strings getFiles(const Configuration & configuration, ContextPtr context);
+
+private:
+    struct Impl;
+    std::shared_ptr<Impl> impl;
+};
+
+}
diff --git a/src/Storages/DataLakes/IStorageDataLake.h b/src/Storages/DataLakes/IStorageDataLake.h
new file mode 100644
index 00000000000..759cade28a7
--- /dev/null
+++ b/src/Storages/DataLakes/IStorageDataLake.h
@@ -0,0 +1,119 @@
+#pragma once
+
+#include "config.h"
+
+#if USE_AWS_S3
+
+#include <Storages/IStorage.h>
+#include <Common/logger_useful.h>
+#include <Storages/StorageFactory.h>
+#include <Formats/FormatFactory.h>
+#include <filesystem>
+
+
+namespace DB
+{
+
+template <typename Storage, typename Name, typename MetadataParser>
+class IStorageDataLake : public Storage
+{
+public:
+    static constexpr auto name = Name::name;
+    using Configuration = typename Storage::Configuration;
+
+    template <class ...Args>
+    explicit IStorageDataLake(const Configuration & configuration_, ContextPtr context_, Args && ...args)
+        : Storage(getConfigurationForDataRead(configuration_, context_), context_, std::forward<Args>(args)...)
+        , base_configuration(configuration_)
+        , log(&Poco::Logger::get(getName())) {}
+
+    String getName() const override { return name; }
+
+    static ColumnsDescription getTableStructureFromData(
+        Configuration & base_configuration,
+        const std::optional<FormatSettings> & format_settings,
+        ContextPtr local_context)
+    {
+        auto configuration = getConfigurationForDataRead(base_configuration, local_context);
+        return Storage::getTableStructureFromData(configuration, format_settings, local_context);
+    }
+
+    static Configuration getConfiguration(ASTs & engine_args, ContextPtr local_context)
+    {
+        return Storage::getConfiguration(engine_args, local_context, /* get_format_from_file */false);
+    }
+
+    Configuration updateConfigurationAndGetCopy(ContextPtr local_context) override
+    {
+        std::lock_guard lock(configuration_update_mutex);
+        updateConfigurationImpl(local_context);
+        return Storage::getConfiguration();
+    }
+
+    void updateConfiguration(ContextPtr local_context) override
+    {
+        std::lock_guard lock(configuration_update_mutex);
+        updateConfigurationImpl(local_context);
+    }
+
+private:
+    static Configuration getConfigurationForDataRead(
+        const Configuration & base_configuration, ContextPtr local_context, const Strings & keys = {})
+    {
+        auto configuration{base_configuration};
+        configuration.update(local_context);
+        configuration.static_configuration = true;
+
+        if (keys.empty())
+            configuration.keys = getDataFiles(configuration, local_context);
+        else
+            configuration.keys = keys;
+
+        LOG_TRACE(
+            &Poco::Logger::get("DataLake"),
+            "New configuration path: {}, keys: {}",
+            configuration.getPath(), fmt::join(configuration.keys, ", "));
+
+        configuration.connect(local_context);
+        return configuration;
+    }
+
+    static Strings getDataFiles(const Configuration & configuration, ContextPtr local_context)
+    {
+        return MetadataParser().getFiles(configuration, local_context);
+    }
+
+    void updateConfigurationImpl(ContextPtr local_context)
+    {
+        const bool updated = base_configuration.update(local_context);
+        auto new_keys = getDataFiles(base_configuration, local_context);
+
+        if (!updated && new_keys == Storage::getConfiguration().keys)
+            return;
+
+        Storage::useConfiguration(getConfigurationForDataRead(base_configuration, local_context, new_keys));
+    }
+
+    Configuration base_configuration;
+    std::mutex configuration_update_mutex;
+    Poco::Logger * log;
+};
+
+
+template <typename DataLake>
+static StoragePtr createDataLakeStorage(const StorageFactory::Arguments & args)
+{
+    auto configuration = DataLake::getConfiguration(args.engine_args, args.getLocalContext());
+
+    /// Data lakes use parquet format, no need for schema inference.
+    if (configuration.format == "auto")
+        configuration.format = "Parquet";
+
+    return std::make_shared<DataLake>(
+        configuration, args.getContext(), args.table_id, args.columns, args.constraints,
+        args.comment, getFormatSettings(args.getContext()));
+}
+
+}
+
+#endif
diff --git a/src/Storages/DataLakes/IcebergMetadataParser.cpp b/src/Storages/DataLakes/IcebergMetadataParser.cpp
new file mode 100644
index 00000000000..3ab90e271cf
--- /dev/null
+++ b/src/Storages/DataLakes/IcebergMetadataParser.cpp
@@ -0,0 +1,302 @@
+#include "config.h"
+
+#if USE_AWS_S3 && USE_AVRO
+
+#include <Common/logger_useful.h>
+
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/IColumn.h>
+#include <Storages/DataLakes/IcebergMetadataParser.h>
+#include <Storages/DataLakes/S3MetadataReader.h>
+#include <Storages/StorageS3.h>
+#include <Processors/Formats/Impl/AvroRowInputFormat.h>
+#include <Formats/FormatFactory.h>
+#include <IO/ReadHelpers.h>
+
+#include <Poco/JSON/Array.h>
+#include <Poco/JSON/Object.h>
+#include <Poco/JSON/Parser.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int FILE_DOESNT_EXIST;
+    extern const int ILLEGAL_COLUMN;
+    extern const int BAD_ARGUMENTS;
+}
+
+template <typename Configuration, typename MetadataReadHelper>
+struct IcebergMetadataParser<Configuration, MetadataReadHelper>::Impl
+{
+    /**
+     * Useful links:
+     * - https://iceberg.apache.org/spec/
+     */
+
+    /**
+     * Iceberg has two format versions, currently we support only format V1.
+     *
+     * Unlike DeltaLake, Iceberg has several metadata layers: `table metadata`, `manifest list` and `manifest_files`.
+     * Metadata file - json file.
+     * Manifest list – a file that lists manifest files; one per snapshot.
+     * Manifest file – a file that lists data or delete files; a subset of a snapshot.
+     * All changes to table state create a new metadata file and replace the old metadata with an atomic swap.
+     */
+
+    static constexpr auto metadata_directory = "metadata";
+
+    /**
+     * Each version of table metadata is stored in a `metadata` directory and
+     * has format: v<V>.metadata.json, where V - metadata version.
+     */
+    String getMetadataFile(const Configuration & configuration)
+    {
+        static constexpr auto metadata_file_suffix = ".metadata.json";
+
+        const auto metadata_files = MetadataReadHelper::listFiles(configuration, metadata_directory, metadata_file_suffix);
+        if (metadata_files.empty())
+        {
+            throw Exception(
+                ErrorCodes::FILE_DOESNT_EXIST,
+                "The metadata file for Iceberg table with path {} doesn't exist",
+                configuration.url.key);
+        }
+
+        /// Get the latest version of metadata file: v<V>.metadata.json
+        return *std::max_element(metadata_files.begin(), metadata_files.end());
+    }
+
+    /**
+     * In order to find out which data files to read, we need to find the `manifest list`
+     * which corresponds to the latest snapshot. We find it by checking a list of snapshots
+     * in metadata's "snapshots" section.
+     *
+     * Example of metadata.json file.
+     *
+     * {
+     *     "format-version" : 1,
+     *     "table-uuid" : "ca2965ad-aae2-4813-8cf7-2c394e0c10f5",
+     *     "location" : "/iceberg_data/db/table_name",
+     *     "last-updated-ms" : 1680206743150,
+     *     "last-column-id" : 2,
+     *     "schema" : { "type" : "struct", "schema-id" : 0, "fields" : [ {<field1_info>}, {<field2_info>}, ... ] },
+     *     "current-schema-id" : 0,
+     *     "schemas" : [ ],
+     *     ...
+     *     "current-snapshot-id" : 2819310504515118887,
+     *     "refs" : { "main" : { "snapshot-id" : 2819310504515118887, "type" : "branch" } },
+     *     "snapshots" : [ {
+     *       "snapshot-id" : 2819310504515118887,
+     *       "timestamp-ms" : 1680206743150,
+     *       "summary" : {
+     *         "operation" : "append", "spark.app.id" : "local-1680206733239",
+     *         "added-data-files" : "1", "added-records" : "100",
+     *         "added-files-size" : "1070", "changed-partition-count" : "1",
+     *         "total-records" : "100", "total-files-size" : "1070", "total-data-files" : "1", "total-delete-files" : "0",
+     *         "total-position-deletes" : "0", "total-equality-deletes" : "0"
+     *       },
+     *       "manifest-list" : "/iceberg_data/db/table_name/metadata/snap-2819310504515118887-1-c87bfec7-d36c-4075-ad04-600b6b0f2020.avro",
+     *       "schema-id" : 0
+     *     } ],
+     *     "statistics" : [ ],
+     *     "snapshot-log" : [ ... ],
+     *     "metadata-log" : [ ]
+     * }
+     */
+    struct Metadata
+    {
+        int format_version;
+        String manifest_list;
+        Strings manifest_files;
+    };
+    Metadata processMetadataFile(const Configuration & configuration, ContextPtr context)
+    {
+        const auto metadata_file_path = getMetadataFile(configuration);
+        auto buf = MetadataReadHelper::createReadBuffer(metadata_file_path, context, configuration);
+        String json_str;
+        readJSONObjectPossiblyInvalid(json_str, *buf);
+
+        Poco::JSON::Parser parser; /// For some reason base/base/JSON.h can not parse this json file
+        Poco::Dynamic::Var json = parser.parse(json_str);
+        Poco::JSON::Object::Ptr object = json.extract<Poco::JSON::Object::Ptr>();
+
+        Metadata result;
+        result.format_version = object->getValue<int>("format-version");
+
+        auto current_snapshot_id = object->getValue<Int64>("current-snapshot-id");
+        auto snapshots = object->get("snapshots").extract<Poco::JSON::Array::Ptr>();
+
+        for (size_t i = 0; i < snapshots->size(); ++i)
+        {
+            const auto snapshot = snapshots->getObject(static_cast<UInt32>(i));
+            if (snapshot->getValue<Int64>("snapshot-id") == current_snapshot_id)
+            {
+                const auto path = snapshot->getValue<String>("manifest-list");
+                result.manifest_list = std::filesystem::path(configuration.url.key) / metadata_directory / std::filesystem::path(path).filename();
+                break;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Manifest list has Avro as default format (and currently we support only Avro).
+     * Manifest list file format of manifest list is: snap-2819310504515118887-1-c87bfec7-d36c-4075-ad04-600b6b0f2020.avro
+     *
+     * `manifest list` has the following contents:
+     * ┌─manifest_path────────────────────────────────────────────────────────────────────────────────────────┬─manifest_length─┬─partition_spec_id─┬───added_snapshot_id─┬─added_data_files_count─┬─existing_data_files_count─┬─deleted_data_files_count─┬─partitions─┬─added_rows_count─┬─existing_rows_count─┬─deleted_rows_count─┐
+     * │ /iceberg_data/db/table_name/metadata/c87bfec7-d36c-4075-ad04-600b6b0f2020-m0.avro │            5813 │                 0 │ 2819310504515118887 │                      1 │                         0 │                        0 │ []         │              100 │                   0 │                  0 │
+     * └──────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────┴───────────────────┴─────────────────────┴────────────────────────┴───────────────────────────┴──────────────────────────┴────────────┴──────────────────┴─────────────────────┴────────────────────┘
+     */
+    void processManifestList(Metadata & metadata, const Configuration & configuration, ContextPtr context)
+    {
+        static constexpr auto manifest_path = "manifest_path";
+
+        auto buf = MetadataReadHelper::createReadBuffer(metadata.manifest_list, context, configuration);
+        auto file_reader = std::make_unique<avro::DataFileReaderBase>(std::make_unique<AvroInputStreamReadBufferAdapter>(*buf));
+
+        auto data_type = AvroSchemaReader::avroNodeToDataType(file_reader->dataSchema().root()->leafAt(0));
+        auto columns = parseAvro(*file_reader, data_type, manifest_path, getFormatSettings(context));
+        auto & col = columns.at(0);
+
+        if (col->getDataType() != TypeIndex::String)
+        {
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "The parsed column from Avro file of `manifest_path` field should be String type, got {}",
+                col->getFamilyName());
+        }
+
+        const auto * col_str = typeid_cast<ColumnString *>(col.get());
+        for (size_t i = 0; i < col_str->size(); ++i)
+        {
+            const auto file_path = col_str->getDataAt(i).toView();
+            const auto filename = std::filesystem::path(file_path).filename();
+            metadata.manifest_files.emplace_back(std::filesystem::path(configuration.url.key) / metadata_directory / filename);
+        }
+    }
+
+    /**
+     * Manifest file has the following format: '/iceberg_data/db/table_name/metadata/c87bfec7-d36c-4075-ad04-600b6b0f2020-m0.avro'
+     *
+     * `manifest file` is different in format version V1 and V2 and has the following contents:
+     * Format version V1:
+     * ┌─status─┬─────────snapshot_id─┬─data_file───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+     * │      1 │ 2819310504515118887 │ ('/iceberg_data/db/table_name/data/00000-1-3edca534-15a0-4f74-8a28-4733e0bf1270-00001.parquet','PARQUET',(),100,1070,67108864,[(1,233),(2,210)],[(1,100),(2,100)],[(1,0),(2,0)],[],[(1,'\0'),(2,'0')],[(1,'c'),(2,'99')],NULL,[4],0) │
+     * └────────┴─────────────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+     * Format version V2:
+     * ┌─status─┬─────────snapshot_id─┬─sequence_number─┬─file_sequence_number─┬─data_file───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+     * │      1 │ 5887006101709926452 │            ᴺᵁᴸᴸ │                 ᴺᵁᴸᴸ │ (0,'/iceberg_data/db/table_name/data/00000-1-c8045c90-8799-4eac-b957-79a0484e223c-00001.parquet','PARQUET',(),100,1070,[(1,233),(2,210)],[(1,100),(2,100)],[(1,0),(2,0)],[],[(1,'\0'),(2,'0')],[(1,'c'),(2,'99')],NULL,[4],[],0) │
+     * └────────┴─────────────────────┴─────────────────┴──────────────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+     * In case of partitioned data we'll have extra directory partition=value:
+     * ─status─┬─────────snapshot_id─┬─data_file──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+     * │      1 │ 2252246380142525104 │ ('/iceberg_data/db/table_name/data/a=0/00000-1-c9535a00-2f4f-405c-bcfa-6d4f9f477235-00001.parquet','PARQUET',(0),1,631,67108864,[(1,46),(2,48)],[(1,1),(2,1)],[(1,0),(2,0)],[],[(1,'\0\0\0\0\0\0\0\0'),(2,'1')],[(1,'\0\0\0\0\0\0\0\0'),(2,'1')],NULL,[4],0) │
+     * │      1 │ 2252246380142525104 │ ('/iceberg_data/db/table_name/data/a=1/00000-1-c9535a00-2f4f-405c-bcfa-6d4f9f477235-00002.parquet','PARQUET',(1),1,631,67108864,[(1,46),(2,48)],[(1,1),(2,1)],[(1,0),(2,0)],[],[(1,'\0\0\0\0\0\0\0'),(2,'2')],[(1,'\0\0\0\0\0\0\0'),(2,'2')],NULL,[4],0) │
+     * │      1 │ 2252246380142525104 │ ('/iceberg_data/db/table_name/data/a=2/00000-1-c9535a00-2f4f-405c-bcfa-6d4f9f477235-00003.parquet','PARQUET',(2),1,631,67108864,[(1,46),(2,48)],[(1,1),(2,1)],[(1,0),(2,0)],[],[(1,'\0\0\0\0\0\0\0'),(2,'3')],[(1,'\0\0\0\0\0\0\0'),(2,'3')],NULL,[4],0) │
+     * └────────┴─────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+     */
+    Strings getFilesForRead(const Metadata & metadata, const Configuration & configuration, ContextPtr context)
+    {
+        static constexpr auto manifest_path = "data_file";
+
+        Strings keys;
+        for (const auto & manifest_file : metadata.manifest_files)
+        {
+            auto buffer = MetadataReadHelper::createReadBuffer(manifest_file, context, configuration);
+            auto file_reader = std::make_unique<avro::DataFileReaderBase>(std::make_unique<AvroInputStreamReadBufferAdapter>(*buffer));
+
+            avro::NodePtr node;
+            if (metadata.format_version == 1)
+                node = file_reader->dataSchema().root()->leafAt(2);
+            else if (metadata.format_version == 2)
+                node = file_reader->dataSchema().root()->leafAt(4);
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected format version: {}", metadata.format_version);
+
+            if (node->type() != avro::Type::AVRO_RECORD)
+            {
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "The parsed column from Avro file of `data_file` field should be Tuple type, got {}",
+                    node->type());
+            }
+            auto data_type = AvroSchemaReader::avroNodeToDataType(node);
+            const auto columns = parseAvro(*file_reader, data_type, manifest_path, getFormatSettings(context));
+            const auto col_tuple = typeid_cast<ColumnTuple *>(columns.at(0).get());
+
+            ColumnPtr col_str;
+            if (metadata.format_version == 1)
+                col_str = col_tuple->getColumnPtr(0);
+            else
+                col_str = col_tuple->getColumnPtr(1);
+
+            if (col_str->getDataType() != TypeIndex::String)
+            {
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "The parsed column from Avro file of `file_path` field should be String type, got {}",
+                    col_str->getFamilyName());
+            }
+
+            const auto * str_col = assert_cast<const ColumnString *>(col_str.get());
+            for (size_t i = 0; i < str_col->size(); ++i)
+                keys.emplace_back(str_col->getDataAt(i).toView());
+        }
+
+        return keys;
+    }
+
+    MutableColumns parseAvro(
+        avro::DataFileReaderBase & file_reader,
+        const DataTypePtr & data_type,
+        const String & field_name,
+        const FormatSettings & settings)
+    {
+        auto deserializer = std::make_unique<AvroDeserializer>(
+            Block{{data_type->createColumn(), data_type, field_name}}, file_reader.dataSchema(), true, true, settings);
+
+        file_reader.init();
+        MutableColumns columns;
+        columns.emplace_back(data_type->createColumn());
+
+        RowReadExtension ext;
+        while (file_reader.hasMore())
+        {
+            file_reader.decr();
+            deserializer->deserializeRow(columns, file_reader.decoder(), ext);
+        }
+        return columns;
+    }
+
+};
+
+
+template <typename Configuration, typename MetadataReadHelper>
+IcebergMetadataParser<Configuration, MetadataReadHelper>::IcebergMetadataParser() : impl(std::make_unique<Impl>())
+{
+}
+
+template <typename Configuration, typename MetadataReadHelper>
+Strings IcebergMetadataParser<Configuration, MetadataReadHelper>::getFiles(const Configuration & configuration, ContextPtr context)
+{
+    auto metadata = impl->processMetadataFile(configuration, context);
+
+    /// When table first created and does not have any data
+    if (metadata.manifest_list.empty())
+        return {};
+
+    impl->processManifestList(metadata, configuration, context);
+    return impl->getFilesForRead(metadata, configuration, context);
+}
+
+
+template IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::IcebergMetadataParser();
+template Strings IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::getFiles(const StorageS3::Configuration & configuration, ContextPtr);
+
+}
+
+#endif
diff --git a/src/Storages/DataLakes/IcebergMetadataParser.h b/src/Storages/DataLakes/IcebergMetadataParser.h
new file mode 100644
index 00000000000..226b1bd8b6c
--- /dev/null
+++ b/src/Storages/DataLakes/IcebergMetadataParser.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#if USE_AVRO /// StorageIceberg depending on Avro to parse metadata with Avro format.
+
+#include <Interpreters/Context_fwd.h>
+#include <Core/Types.h>
+
+namespace DB
+{
+
+template <typename Configuration, typename MetadataReadHelper>
+struct IcebergMetadataParser
+{
+public:
+    IcebergMetadataParser<Configuration, MetadataReadHelper>();
+
+    Strings getFiles(const Configuration & configuration, ContextPtr context);
+
+private:
+    struct Impl;
+    std::shared_ptr<Impl> impl;
+};
+
+}
+
+#endif
diff --git a/src/Storages/S3DataLakeMetadataReadHelper.cpp b/src/Storages/DataLakes/S3MetadataReader.cpp
similarity index 50%
rename from src/Storages/S3DataLakeMetadataReadHelper.cpp
rename to src/Storages/DataLakes/S3MetadataReader.cpp
index 2890cc5d6e0..f62c440bc2f 100644
--- a/src/Storages/S3DataLakeMetadataReadHelper.cpp
+++ b/src/Storages/DataLakes/S3MetadataReader.cpp
@@ -2,13 +2,13 @@
 
 #if USE_AWS_S3
 
-#    include <IO/ReadBufferFromS3.h>
-#    include <IO/S3/Requests.h>
-#    include <Interpreters/Context.h>
-#    include <Storages/S3DataLakeMetadataReadHelper.h>
-#    include <aws/core/auth/AWSCredentials.h>
-#    include <aws/s3/S3Client.h>
-#    include <aws/s3/model/ListObjectsV2Request.h>
+#include <IO/ReadBufferFromS3.h>
+#include <IO/S3/Requests.h>
+#include <Interpreters/Context.h>
+#include <Storages/DataLakes/S3MetadataReader.h>
+#include <aws/core/auth/AWSCredentials.h>
+#include <aws/s3/S3Client.h>
+#include <aws/s3/model/ListObjectsV2Request.h>
 
 
 namespace DB
@@ -33,8 +33,13 @@ S3DataLakeMetadataReadHelper::createReadBuffer(const String & key, ContextPtr co
         context->getReadSettings());
 }
 
-std::vector<String> S3DataLakeMetadataReadHelper::listFilesMatchSuffix(
-    const StorageS3::Configuration & base_configuration, const String & directory, const String & suffix)
+bool S3DataLakeMetadataReadHelper::exists(const String & key, const StorageS3::Configuration & configuration)
+{
+    return S3::objectExists(*configuration.client, configuration.url.bucket, key);
+}
+
+std::vector<String> S3DataLakeMetadataReadHelper::listFiles(
+    const StorageS3::Configuration & base_configuration, const String & prefix, const String & suffix)
 {
     const auto & table_path = base_configuration.url.key;
     const auto & bucket = base_configuration.url.bucket;
@@ -44,12 +49,10 @@ std::vector<String> S3DataLakeMetadataReadHelper::listFilesMatchSuffix(
     S3::ListObjectsV2Request request;
     Aws::S3::Model::ListObjectsV2Outcome outcome;
 
-    bool is_finished{false};
-
     request.SetBucket(bucket);
+    request.SetPrefix(std::filesystem::path(table_path) / prefix);
 
-    request.SetPrefix(std::filesystem::path(table_path) / directory);
-
+    bool is_finished{false};
     while (!is_finished)
     {
         outcome = client->ListObjectsV2(request);
@@ -66,58 +69,18 @@ std::vector<String> S3DataLakeMetadataReadHelper::listFilesMatchSuffix(
         for (const auto & obj : result_batch)
         {
             const auto & filename = obj.GetKey();
-
-            if (std::filesystem::path(filename).extension() == suffix)
+            if (filename.ends_with(suffix))
                 res.push_back(filename);
         }
 
         request.SetContinuationToken(outcome.GetResult().GetNextContinuationToken());
-
         is_finished = !outcome.GetResult().GetIsTruncated();
     }
 
+    LOG_TRACE(&Poco::Logger::get("S3DataLakeMetadataReadHelper"), "Listed {} files", res.size());
+
     return res;
 }
 
-std::vector<String> S3DataLakeMetadataReadHelper::listFiles(const StorageS3::Configuration & configuration)
-{
-    const auto & client = configuration.client;
-    const auto & table_path = configuration.url.key;
-    const auto & bucket = configuration.url.bucket;
-
-    std::vector<std::string> keys;
-    S3::ListObjectsV2Request request;
-    Aws::S3::Model::ListObjectsV2Outcome outcome;
-
-    bool is_finished{false};
-
-    request.SetBucket(bucket);
-    request.SetPrefix(table_path);
-
-    while (!is_finished)
-    {
-        outcome = client->ListObjectsV2(request);
-        if (!outcome.IsSuccess())
-            throw Exception(
-                ErrorCodes::S3_ERROR,
-                "Could not list objects in bucket {} with key {}, S3 exception: {}, message: {}",
-                quoteString(bucket),
-                quoteString(table_path),
-                backQuote(outcome.GetError().GetExceptionName()),
-                quoteString(outcome.GetError().GetMessage()));
-
-        const auto & result_batch = outcome.GetResult().GetContents();
-        for (const auto & obj : result_batch)
-        {
-            const auto & filename = obj.GetKey().substr(table_path.size()); /// Object name without tablepath prefix.
-            keys.push_back(filename);
-        }
-
-        request.SetContinuationToken(outcome.GetResult().GetNextContinuationToken());
-        is_finished = !outcome.GetResult().GetIsTruncated();
-    }
-
-    return keys;
-}
 }
 #endif
diff --git a/src/Storages/DataLakes/S3MetadataReader.h b/src/Storages/DataLakes/S3MetadataReader.h
new file mode 100644
index 00000000000..cae7dd1fa3d
--- /dev/null
+++ b/src/Storages/DataLakes/S3MetadataReader.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <config.h>
+
+#if USE_AWS_S3
+
+#include <Storages/StorageS3.h>
+
+class ReadBuffer;
+
+namespace DB
+{
+
+struct S3DataLakeMetadataReadHelper
+{
+    static std::shared_ptr<ReadBuffer> createReadBuffer(
+        const String & key, ContextPtr context, const StorageS3::Configuration & base_configuration);
+
+    static bool exists(const String & key, const StorageS3::Configuration & configuration);
+
+    static std::vector<String> listFiles(const StorageS3::Configuration & configuration, const std::string & prefix = "", const std::string & suffix = "");
+};
+}
+
+#endif
diff --git a/src/Storages/DataLakes/StorageDeltaLake.h b/src/Storages/DataLakes/StorageDeltaLake.h
new file mode 100644
index 00000000000..8b4ba28d6f7
--- /dev/null
+++ b/src/Storages/DataLakes/StorageDeltaLake.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <Storages/IStorage.h>
+#include <Storages/DataLakes/IStorageDataLake.h>
+#include <Storages/DataLakes/DeltaLakeMetadataParser.h>
+#include "config.h"
+
+#if USE_AWS_S3
+#include <Storages/DataLakes/S3MetadataReader.h>
+#include <Storages/StorageS3.h>
+#endif
+
+namespace DB
+{
+
+struct StorageDeltaLakeName
+{
+    static constexpr auto name = "DeltaLake";
+};
+
+#if USE_AWS_S3 && USE_PARQUET
+using StorageDeltaLakeS3 = IStorageDataLake<StorageS3, StorageDeltaLakeName, DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>>;
+#endif
+
+}
diff --git a/src/Storages/DataLakes/StorageHudi.h b/src/Storages/DataLakes/StorageHudi.h
new file mode 100644
index 00000000000..84666f51405
--- /dev/null
+++ b/src/Storages/DataLakes/StorageHudi.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <Storages/IStorage.h>
+#include <Storages/DataLakes/IStorageDataLake.h>
+#include <Storages/DataLakes/HudiMetadataParser.h>
+#include "config.h"
+
+#if USE_AWS_S3
+#include <Storages/DataLakes/S3MetadataReader.h>
+#include <Storages/StorageS3.h>
+#endif
+
+namespace DB
+{
+
+struct StorageHudiName
+{
+    static constexpr auto name = "Hudi";
+};
+
+#if USE_AWS_S3
+using StorageHudiS3 = IStorageDataLake<StorageS3, StorageHudiName, HudiMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>>;
+#endif
+
+}
diff --git a/src/Storages/DataLakes/StorageIceberg.h b/src/Storages/DataLakes/StorageIceberg.h
new file mode 100644
index 00000000000..f1c9c485ef0
--- /dev/null
+++ b/src/Storages/DataLakes/StorageIceberg.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <Storages/IStorage.h>
+#include <Storages/DataLakes/IStorageDataLake.h>
+#include <Storages/DataLakes/IcebergMetadataParser.h>
+#include "config.h"
+
+#if USE_AWS_S3 && USE_AVRO
+#include <Storages/DataLakes/S3MetadataReader.h>
+#include <Storages/StorageS3.h>
+#endif
+
+namespace DB
+{
+
+struct StorageIcebergName
+{
+    static constexpr auto name = "Iceberg";
+};
+
+#if USE_AWS_S3 && USE_AVRO
+using StorageIcebergS3 = IStorageDataLake<StorageS3, StorageIcebergName, IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>>;
+#endif
+
+}
diff --git a/src/Storages/DataLakes/registerDataLakes.cpp b/src/Storages/DataLakes/registerDataLakes.cpp
new file mode 100644
index 00000000000..1447a4777c5
--- /dev/null
+++ b/src/Storages/DataLakes/registerDataLakes.cpp
@@ -0,0 +1,50 @@
+#include <Storages/DataLakes/IStorageDataLake.h>
+#include "config.h"
+
+#if USE_AWS_S3
+
+#include <Storages/DataLakes/StorageDeltaLake.h>
+#include <Storages/DataLakes/StorageIceberg.h>
+#include <Storages/DataLakes/StorageHudi.h>
+
+
+namespace DB
+{
+
+#define REGISTER_DATA_LAKE_STORAGE(STORAGE, NAME)       \
+    factory.registerStorage(                            \
+        NAME,                                           \
+        [](const StorageFactory::Arguments & args)      \
+        {                                               \
+            return createDataLakeStorage<STORAGE>(args);\
+        },                                              \
+        {                                               \
+            .supports_settings = false,                 \
+            .supports_schema_inference = true,          \
+            .source_access_type = AccessType::S3,       \
+        });
+
+#if USE_PARQUET
+void registerStorageDeltaLake(StorageFactory & factory)
+{
+    REGISTER_DATA_LAKE_STORAGE(StorageDeltaLakeS3, StorageDeltaLakeName::name)
+}
+#endif
+
+#if USE_AVRO /// StorageIceberg depending on Avro to parse metadata with Avro format.
+
+void registerStorageIceberg(StorageFactory & factory)
+{
+    REGISTER_DATA_LAKE_STORAGE(StorageIcebergS3, StorageIcebergName::name)
+}
+
+#endif
+
+void registerStorageHudi(StorageFactory & factory)
+{
+    REGISTER_DATA_LAKE_STORAGE(StorageHudiS3, StorageHudiName::name)
+}
+
+}
+
+#endif
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
deleted file mode 100644
index cb6659e59ce..00000000000
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ /dev/null
@@ -1,1239 +0,0 @@
-#include <QueryPipeline/RemoteInserter.h>
-#include <Formats/NativeReader.h>
-#include <Processors/ISource.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/StringUtils/StringUtils.h>
-#include <Common/SipHash.h>
-#include <Common/quoteString.h>
-#include <Common/hex.h>
-#include <Common/ActionBlocker.h>
-#include <Common/formatReadable.h>
-#include <Common/Stopwatch.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/Cluster.h>
-#include <Storages/Distributed/DirectoryMonitor.h>
-#include <Storages/Distributed/Defines.h>
-#include <Storages/StorageDistributed.h>
-#include <IO/ReadBufferFromFile.h>
-#include <IO/ReadBufferFromString.h>
-#include <IO/WriteBufferFromFile.h>
-#include <Compression/CompressedReadBuffer.h>
-#include <Compression/CheckingCompressedReadBuffer.h>
-#include <IO/ConnectionTimeouts.h>
-#include <IO/Operators.h>
-#include <Disks/IDisk.h>
-#include <boost/algorithm/string/find_iterator.hpp>
-#include <boost/algorithm/string/finder.hpp>
-#include <boost/range/adaptor/indexed.hpp>
-#include <filesystem>
-
-
-namespace CurrentMetrics
-{
-    extern const Metric DistributedSend;
-    extern const Metric DistributedFilesToInsert;
-    extern const Metric BrokenDistributedFilesToInsert;
-}
-
-namespace fs = std::filesystem;
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int CANNOT_READ_ALL_DATA;
-    extern const int UNKNOWN_CODEC;
-    extern const int CANNOT_DECOMPRESS;
-    extern const int CHECKSUM_DOESNT_MATCH;
-    extern const int TOO_LARGE_SIZE_COMPRESSED;
-    extern const int ATTEMPT_TO_READ_AFTER_EOF;
-    extern const int EMPTY_DATA_PASSED;
-    extern const int INCORRECT_FILE_NAME;
-    extern const int MEMORY_LIMIT_EXCEEDED;
-    extern const int DISTRIBUTED_BROKEN_BATCH_INFO;
-    extern const int DISTRIBUTED_BROKEN_BATCH_FILES;
-    extern const int TOO_MANY_PARTS;
-    extern const int TOO_MANY_BYTES;
-    extern const int TOO_MANY_ROWS_OR_BYTES;
-    extern const int TOO_MANY_PARTITIONS;
-    extern const int DISTRIBUTED_TOO_MANY_PENDING_BYTES;
-    extern const int ARGUMENT_OUT_OF_BOUND;
-}
-
-
-namespace
-{
-    constexpr const std::chrono::minutes decrease_error_count_period{5};
-
-    template <typename PoolFactory>
-    ConnectionPoolPtrs createPoolsForAddresses(const std::string & name, PoolFactory && factory, const Cluster::ShardsInfo & shards_info, Poco::Logger * log)
-    {
-        ConnectionPoolPtrs pools;
-
-        auto make_connection = [&](const Cluster::Address & address)
-        {
-            try
-            {
-                pools.emplace_back(factory(address));
-            }
-            catch (const Exception & e)
-            {
-                if (e.code() == ErrorCodes::INCORRECT_FILE_NAME)
-                {
-                    tryLogCurrentException(log);
-                    return;
-                }
-                throw;
-            }
-        };
-
-        for (auto it = boost::make_split_iterator(name, boost::first_finder(",")); it != decltype(it){}; ++it)
-        {
-            const std::string & dirname = boost::copy_range<std::string>(*it);
-            Cluster::Address address = Cluster::Address::fromFullString(dirname);
-            if (address.shard_index && dirname.ends_with("_all_replicas"))
-            {
-                if (address.shard_index > shards_info.size())
-                {
-                    LOG_ERROR(log, "No shard with shard_index={} ({})", address.shard_index, name);
-                    continue;
-                }
-
-                const auto & shard_info = shards_info[address.shard_index - 1];
-                size_t replicas = shard_info.per_replica_pools.size();
-
-                for (size_t replica_index = 1; replica_index <= replicas; ++replica_index)
-                {
-                    address.replica_index = static_cast<UInt32>(replica_index);
-                    make_connection(address);
-                }
-            }
-            else
-                make_connection(address);
-        }
-
-        return pools;
-    }
-
-    void assertChecksum(CityHash_v1_0_2::uint128 expected, CityHash_v1_0_2::uint128 calculated)
-    {
-        if (expected != calculated)
-        {
-            throw Exception(ErrorCodes::CHECKSUM_DOESNT_MATCH,
-                            "Checksum of extra info doesn't match: corrupted data. Reference: {}{}. Actual: {}{}.",
-                            getHexUIntLowercase(expected.first), getHexUIntLowercase(expected.second),
-                            getHexUIntLowercase(calculated.first), getHexUIntLowercase(calculated.second));
-        }
-    }
-
-    struct DistributedHeader
-    {
-        UInt64 revision = 0;
-        Settings insert_settings;
-        std::string insert_query;
-        ClientInfo client_info;
-
-        /// .bin file cannot have zero rows/bytes.
-        size_t rows = 0;
-        size_t bytes = 0;
-
-        UInt32 shard_num = 0;
-        std::string cluster;
-        std::string distributed_table;
-        std::string remote_table;
-
-        /// dumpStructure() of the header -- obsolete
-        std::string block_header_string;
-        Block block_header;
-    };
-
-    DistributedHeader readDistributedHeader(ReadBufferFromFile & in, Poco::Logger * log)
-    {
-        DistributedHeader distributed_header;
-
-        UInt64 query_size;
-        readVarUInt(query_size, in);
-
-        if (query_size == DBMS_DISTRIBUTED_SIGNATURE_HEADER)
-        {
-            /// Read the header as a string.
-            String header_data;
-            readStringBinary(header_data, in);
-
-            /// Check the checksum of the header.
-            CityHash_v1_0_2::uint128 checksum;
-            readPODBinary(checksum, in);
-            assertChecksum(checksum, CityHash_v1_0_2::CityHash128(header_data.data(), header_data.size()));
-
-            /// Read the parts of the header.
-            ReadBufferFromString header_buf(header_data);
-
-            readVarUInt(distributed_header.revision, header_buf);
-            if (DBMS_TCP_PROTOCOL_VERSION < distributed_header.revision)
-            {
-                LOG_WARNING(log, "ClickHouse shard version is older than ClickHouse initiator version. It may lack support for new features.");
-            }
-
-            readStringBinary(distributed_header.insert_query, header_buf);
-            distributed_header.insert_settings.read(header_buf);
-
-            if (header_buf.hasPendingData())
-                distributed_header.client_info.read(header_buf, distributed_header.revision);
-
-            if (header_buf.hasPendingData())
-            {
-                readVarUInt(distributed_header.rows, header_buf);
-                readVarUInt(distributed_header.bytes, header_buf);
-                readStringBinary(distributed_header.block_header_string, header_buf);
-            }
-
-            if (header_buf.hasPendingData())
-            {
-                NativeReader header_block_in(header_buf, distributed_header.revision);
-                distributed_header.block_header = header_block_in.read();
-                if (!distributed_header.block_header)
-                    throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA,
-                        "Cannot read header from the {} batch. Data was written with protocol version {}, current version: {}",
-                            in.getFileName(), distributed_header.revision, DBMS_TCP_PROTOCOL_VERSION);
-            }
-
-            if (header_buf.hasPendingData())
-            {
-                readVarUInt(distributed_header.shard_num, header_buf);
-                readStringBinary(distributed_header.cluster, header_buf);
-                readStringBinary(distributed_header.distributed_table, header_buf);
-                readStringBinary(distributed_header.remote_table, header_buf);
-            }
-
-            /// Add handling new data here, for example:
-            ///
-            /// if (header_buf.hasPendingData())
-            ///     readVarUInt(my_new_data, header_buf);
-            ///
-            /// And note that it is safe, because we have checksum and size for header.
-
-            return distributed_header;
-        }
-
-        if (query_size == DBMS_DISTRIBUTED_SIGNATURE_HEADER_OLD_FORMAT)
-        {
-            distributed_header.insert_settings.read(in, SettingsWriteFormat::BINARY);
-            readStringBinary(distributed_header.insert_query, in);
-            return distributed_header;
-        }
-
-        distributed_header.insert_query.resize(query_size);
-        in.readStrict(distributed_header.insert_query.data(), query_size);
-
-        return distributed_header;
-    }
-
-    /// 'remote_error' argument is used to decide whether some errors should be
-    /// ignored or not, in particular:
-    ///
-    /// - ATTEMPT_TO_READ_AFTER_EOF should not be ignored
-    ///   if we receive it from remote (receiver), since:
-    ///   - the sender will got ATTEMPT_TO_READ_AFTER_EOF when the client just go away,
-    ///     i.e. server had been restarted
-    ///   - since #18853 the file will be checked on the sender locally, and
-    ///     if there is something wrong with the file itself, we will receive
-    ///     ATTEMPT_TO_READ_AFTER_EOF not from the remote at first
-    ///     and mark batch as broken.
-    bool isFileBrokenErrorCode(int code, bool remote_error)
-    {
-        return code == ErrorCodes::CHECKSUM_DOESNT_MATCH
-            || code == ErrorCodes::EMPTY_DATA_PASSED
-            || code == ErrorCodes::TOO_LARGE_SIZE_COMPRESSED
-            || code == ErrorCodes::CANNOT_READ_ALL_DATA
-            || code == ErrorCodes::UNKNOWN_CODEC
-            || code == ErrorCodes::CANNOT_DECOMPRESS
-            || code == ErrorCodes::DISTRIBUTED_BROKEN_BATCH_INFO
-            || code == ErrorCodes::DISTRIBUTED_BROKEN_BATCH_FILES
-            || (!remote_error && code == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF);
-    }
-
-    /// Can the batch be split and send files from batch one-by-one instead?
-    bool isSplittableErrorCode(int code, bool remote)
-    {
-        return code == ErrorCodes::MEMORY_LIMIT_EXCEEDED
-            /// FunctionRange::max_elements and similar
-            || code == ErrorCodes::ARGUMENT_OUT_OF_BOUND
-            || code == ErrorCodes::TOO_MANY_PARTS
-            || code == ErrorCodes::TOO_MANY_BYTES
-            || code == ErrorCodes::TOO_MANY_ROWS_OR_BYTES
-            || code == ErrorCodes::TOO_MANY_PARTITIONS
-            || code == ErrorCodes::DISTRIBUTED_TOO_MANY_PENDING_BYTES
-            || code == ErrorCodes::DISTRIBUTED_BROKEN_BATCH_INFO
-            || isFileBrokenErrorCode(code, remote)
-        ;
-    }
-
-    SyncGuardPtr getDirectorySyncGuard(bool dir_fsync, const DiskPtr & disk, const String & path)
-    {
-        if (dir_fsync)
-            return disk->getDirectorySyncGuard(path);
-        return nullptr;
-    }
-
-    void writeAndConvert(RemoteInserter & remote, const DistributedHeader & distributed_header, ReadBufferFromFile & in)
-    {
-        CompressedReadBuffer decompressing_in(in);
-        NativeReader block_in(decompressing_in, distributed_header.revision);
-
-        while (Block block = block_in.read())
-        {
-            auto converting_dag = ActionsDAG::makeConvertingActions(
-                block.cloneEmpty().getColumnsWithTypeAndName(),
-                remote.getHeader().getColumnsWithTypeAndName(),
-                ActionsDAG::MatchColumnsMode::Name);
-
-            auto converting_actions = std::make_shared<ExpressionActions>(std::move(converting_dag));
-            converting_actions->execute(block);
-            remote.write(block);
-        }
-    }
-
-    void writeRemoteConvert(
-        const DistributedHeader & distributed_header,
-        RemoteInserter & remote,
-        bool compression_expected,
-        ReadBufferFromFile & in,
-        Poco::Logger * log)
-    {
-        if (!remote.getHeader())
-        {
-            CheckingCompressedReadBuffer checking_in(in);
-            remote.writePrepared(checking_in);
-            return;
-        }
-
-        /// This is old format, that does not have header for the block in the file header,
-        /// applying ConvertingTransform in this case is not a big overhead.
-        ///
-        /// Anyway we can get header only from the first block, which contain all rows anyway.
-        if (!distributed_header.block_header)
-        {
-            LOG_TRACE(log, "Processing batch {} with old format (no header)", in.getFileName());
-
-            writeAndConvert(remote, distributed_header, in);
-            return;
-        }
-
-        if (!blocksHaveEqualStructure(distributed_header.block_header, remote.getHeader()))
-        {
-            LOG_WARNING(log,
-                "Structure does not match (remote: {}, local: {}), implicit conversion will be done",
-                remote.getHeader().dumpStructure(), distributed_header.block_header.dumpStructure());
-
-            writeAndConvert(remote, distributed_header, in);
-            return;
-        }
-
-        /// If connection does not use compression, we have to uncompress the data.
-        if (!compression_expected)
-        {
-            writeAndConvert(remote, distributed_header, in);
-            return;
-        }
-
-        if (distributed_header.revision != remote.getServerRevision())
-        {
-            writeAndConvert(remote, distributed_header, in);
-            return;
-        }
-
-        /// Otherwise write data as it was already prepared (more efficient path).
-        CheckingCompressedReadBuffer checking_in(in);
-        remote.writePrepared(checking_in);
-    }
-
-    uint64_t doubleToUInt64(double d)
-    {
-        if (d >= static_cast<double>(std::numeric_limits<uint64_t>::max()))
-            return std::numeric_limits<uint64_t>::max();
-        return static_cast<uint64_t>(d);
-    }
-}
-
-
-StorageDistributedDirectoryMonitor::StorageDistributedDirectoryMonitor(
-    StorageDistributed & storage_,
-    const DiskPtr & disk_,
-    const std::string & relative_path_,
-    ConnectionPoolPtr pool_,
-    ActionBlocker & monitor_blocker_,
-    BackgroundSchedulePool & bg_pool)
-    : storage(storage_)
-    , pool(std::move(pool_))
-    , disk(disk_)
-    , relative_path(relative_path_)
-    , path(fs::path(disk->getPath()) / relative_path / "")
-    , should_batch_inserts(storage.getDistributedSettingsRef().monitor_batch_inserts)
-    , split_batch_on_failure(storage.getDistributedSettingsRef().monitor_split_batch_on_failure)
-    , dir_fsync(storage.getDistributedSettingsRef().fsync_directories)
-    , min_batched_block_size_rows(storage.getContext()->getSettingsRef().min_insert_block_size_rows)
-    , min_batched_block_size_bytes(storage.getContext()->getSettingsRef().min_insert_block_size_bytes)
-    , current_batch_file_path(path + "current_batch.txt")
-    , default_sleep_time(storage.getDistributedSettingsRef().monitor_sleep_time_ms.totalMilliseconds())
-    , sleep_time(default_sleep_time)
-    , max_sleep_time(storage.getDistributedSettingsRef().monitor_max_sleep_time_ms.totalMilliseconds())
-    , log(&Poco::Logger::get(getLoggerName()))
-    , monitor_blocker(monitor_blocker_)
-    , metric_pending_files(CurrentMetrics::DistributedFilesToInsert, 0)
-    , metric_broken_files(CurrentMetrics::BrokenDistributedFilesToInsert, 0)
-{
-    task_handle = bg_pool.createTask(getLoggerName() + "/Bg", [this]{ run(); });
-    task_handle->activateAndSchedule();
-}
-
-
-StorageDistributedDirectoryMonitor::~StorageDistributedDirectoryMonitor()
-{
-    if (!quit)
-    {
-        quit = true;
-        task_handle->deactivate();
-    }
-}
-
-void StorageDistributedDirectoryMonitor::flushAllData()
-{
-    if (quit)
-        return;
-
-    std::lock_guard lock{mutex};
-
-    const auto & files = getFiles();
-    if (!files.empty())
-    {
-        processFiles(files);
-
-        /// Update counters.
-        getFiles();
-    }
-}
-
-void StorageDistributedDirectoryMonitor::shutdownAndDropAllData()
-{
-    if (!quit)
-    {
-        quit = true;
-        task_handle->deactivate();
-    }
-
-    auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
-    fs::remove_all(path);
-}
-
-
-void StorageDistributedDirectoryMonitor::run()
-{
-    std::lock_guard lock{mutex};
-
-    bool do_sleep = false;
-    while (!quit)
-    {
-        do_sleep = true;
-
-        const auto & files = getFiles();
-        if (files.empty())
-            break;
-
-        if (!monitor_blocker.isCancelled())
-        {
-            try
-            {
-                do_sleep = !processFiles(files);
-
-                std::lock_guard status_lock(status_mutex);
-                status.last_exception = std::exception_ptr{};
-            }
-            catch (...)
-            {
-                std::lock_guard status_lock(status_mutex);
-
-                do_sleep = true;
-                ++status.error_count;
-
-                UInt64 q = doubleToUInt64(std::exp2(status.error_count));
-                std::chrono::milliseconds new_sleep_time(default_sleep_time.count() * q);
-                if (new_sleep_time.count() < 0)
-                    sleep_time = max_sleep_time;
-                else
-                    sleep_time = std::min(new_sleep_time, max_sleep_time);
-
-                tryLogCurrentException(getLoggerName().data());
-                status.last_exception = std::current_exception();
-                status.last_exception_time = std::chrono::system_clock::now();
-            }
-        }
-        else
-        {
-            LOG_DEBUG(log, "Skipping send data over distributed table.");
-        }
-
-        const auto now = std::chrono::system_clock::now();
-        if (now - last_decrease_time > decrease_error_count_period)
-        {
-            std::lock_guard status_lock(status_mutex);
-
-            status.error_count /= 2;
-            last_decrease_time = now;
-        }
-
-        if (do_sleep)
-            break;
-    }
-
-    /// Update counters.
-    getFiles();
-
-    if (!quit && do_sleep)
-        task_handle->scheduleAfter(sleep_time.count());
-}
-
-
-ConnectionPoolPtr StorageDistributedDirectoryMonitor::createPool(const std::string & name, const StorageDistributed & storage)
-{
-    const auto pool_factory = [&storage, &name] (const Cluster::Address & address) -> ConnectionPoolPtr
-    {
-        const auto & cluster = storage.getCluster();
-        const auto & shards_info = cluster->getShardsInfo();
-        const auto & shards_addresses = cluster->getShardsAddresses();
-
-        /// Check new format shard{shard_index}_replica{replica_index}
-        /// (shard_index and replica_index starts from 1).
-        if (address.shard_index != 0)
-        {
-            if (!address.replica_index)
-                throw Exception(ErrorCodes::INCORRECT_FILE_NAME,
-                    "Wrong replica_index={} ({})", address.replica_index, name);
-
-            if (address.shard_index > shards_info.size())
-                throw Exception(ErrorCodes::INCORRECT_FILE_NAME,
-                    "No shard with shard_index={} ({})", address.shard_index, name);
-
-            const auto & shard_info = shards_info[address.shard_index - 1];
-            if (address.replica_index > shard_info.per_replica_pools.size())
-                throw Exception(ErrorCodes::INCORRECT_FILE_NAME,
-                    "No shard with replica_index={} ({})", address.replica_index, name);
-
-            return shard_info.per_replica_pools[address.replica_index - 1];
-        }
-
-        /// Existing connections pool have a higher priority.
-        for (size_t shard_index = 0; shard_index < shards_info.size(); ++shard_index)
-        {
-            const Cluster::Addresses & replicas_addresses = shards_addresses[shard_index];
-
-            for (size_t replica_index = 0; replica_index < replicas_addresses.size(); ++replica_index)
-            {
-                const Cluster::Address & replica_address = replicas_addresses[replica_index];
-
-                if (address.user == replica_address.user &&
-                    address.password == replica_address.password &&
-                    address.host_name == replica_address.host_name &&
-                    address.port == replica_address.port &&
-                    address.default_database == replica_address.default_database &&
-                    address.secure == replica_address.secure)
-                {
-                    return shards_info[shard_index].per_replica_pools[replica_index];
-                }
-            }
-        }
-
-        return std::make_shared<ConnectionPool>(
-            1, /* max_connections */
-            address.host_name,
-            address.port,
-            address.default_database,
-            address.user,
-            address.password,
-            address.quota_key,
-            address.cluster,
-            address.cluster_secret,
-            storage.getName() + '_' + address.user, /* client */
-            Protocol::Compression::Enable,
-            address.secure);
-    };
-
-    auto pools = createPoolsForAddresses(name, pool_factory, storage.getCluster()->getShardsInfo(), storage.log);
-
-    const auto settings = storage.getContext()->getSettings();
-    return pools.size() == 1 ? pools.front() : std::make_shared<ConnectionPoolWithFailover>(pools,
-        settings.load_balancing,
-        settings.distributed_replica_error_half_life.totalSeconds(),
-        settings.distributed_replica_error_cap);
-}
-
-
-std::map<UInt64, std::string> StorageDistributedDirectoryMonitor::getFiles()
-{
-    std::map<UInt64, std::string> files;
-
-    fs::directory_iterator end;
-    for (fs::directory_iterator it{path}; it != end; ++it)
-    {
-        const auto & file_path_str = it->path();
-        if (!it->is_directory() && startsWith(fs::path(file_path_str).extension(), ".bin"))
-        {
-            files[parse<UInt64>(fs::path(file_path_str).stem())] = file_path_str;
-        }
-    }
-
-    return files;
-}
-bool StorageDistributedDirectoryMonitor::processFiles(const std::map<UInt64, std::string> & files)
-{
-    if (should_batch_inserts)
-    {
-        processFilesWithBatching(files);
-    }
-    else
-    {
-        for (const auto & file : files)
-        {
-            if (quit)
-                return true;
-
-            processFile(file.second);
-        }
-    }
-
-    return true;
-}
-
-void StorageDistributedDirectoryMonitor::processFile(const std::string & file_path)
-{
-    OpenTelemetry::TracingContextHolderPtr thread_trace_context;
-
-    Stopwatch watch;
-    try
-    {
-        CurrentMetrics::Increment metric_increment{CurrentMetrics::DistributedSend};
-
-        ReadBufferFromFile in(file_path);
-        const auto & distributed_header = readDistributedHeader(in, log);
-
-        thread_trace_context = std::make_unique<OpenTelemetry::TracingContextHolder>(__PRETTY_FUNCTION__,
-            distributed_header.client_info.client_trace_context,
-            this->storage.getContext()->getOpenTelemetrySpanLog());
-        thread_trace_context->root_span.addAttribute("clickhouse.shard_num", distributed_header.shard_num);
-        thread_trace_context->root_span.addAttribute("clickhouse.cluster", distributed_header.cluster);
-        thread_trace_context->root_span.addAttribute("clickhouse.distributed", distributed_header.distributed_table);
-        thread_trace_context->root_span.addAttribute("clickhouse.remote", distributed_header.remote_table);
-        thread_trace_context->root_span.addAttribute("clickhouse.rows", distributed_header.rows);
-        thread_trace_context->root_span.addAttribute("clickhouse.bytes", distributed_header.bytes);
-
-        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(distributed_header.insert_settings);
-        auto connection = pool->get(timeouts, &distributed_header.insert_settings);
-        LOG_DEBUG(log, "Sending `{}` to {} ({} rows, {} bytes)",
-            file_path,
-            connection->getDescription(),
-            formatReadableQuantity(distributed_header.rows),
-            formatReadableSizeWithBinarySuffix(distributed_header.bytes));
-
-        RemoteInserter remote{*connection, timeouts,
-            distributed_header.insert_query,
-            distributed_header.insert_settings,
-            distributed_header.client_info};
-        bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
-        writeRemoteConvert(distributed_header, remote, compression_expected, in, log);
-        remote.onFinish();
-    }
-    catch (Exception & e)
-    {
-        if (thread_trace_context)
-            thread_trace_context->root_span.addAttribute(std::current_exception());
-
-        e.addMessage(fmt::format("While sending {}", file_path));
-        maybeMarkAsBroken(file_path, e);
-        throw;
-    }
-    catch (...)
-    {
-        if (thread_trace_context)
-            thread_trace_context->root_span.addAttribute(std::current_exception());
-
-        throw;
-    }
-
-    auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
-    markAsSend(file_path);
-    LOG_TRACE(log, "Finished processing `{}` (took {} ms)", file_path, watch.elapsedMilliseconds());
-}
-
-struct StorageDistributedDirectoryMonitor::BatchHeader
-{
-    Settings settings;
-    String query;
-    ClientInfo client_info;
-    Block header;
-
-    BatchHeader(Settings settings_, String query_, ClientInfo client_info_, Block header_)
-        : settings(std::move(settings_))
-        , query(std::move(query_))
-        , client_info(std::move(client_info_))
-        , header(std::move(header_))
-    {
-    }
-
-    bool operator==(const BatchHeader & other) const
-    {
-        return std::tie(settings, query, client_info.query_kind) ==
-               std::tie(other.settings, other.query, other.client_info.query_kind) &&
-               blocksHaveEqualStructure(header, other.header);
-    }
-
-    struct Hash
-    {
-        size_t operator()(const BatchHeader & batch_header) const
-        {
-            SipHash hash_state;
-            hash_state.update(batch_header.query.data(), batch_header.query.size());
-            batch_header.header.updateHash(hash_state);
-            return hash_state.get64();
-        }
-    };
-};
-
-struct StorageDistributedDirectoryMonitor::Batch
-{
-    /// File indexes for this batch.
-    std::vector<UInt64> file_indices;
-    size_t total_rows = 0;
-    size_t total_bytes = 0;
-    bool recovered = false;
-
-    StorageDistributedDirectoryMonitor & parent;
-    /// Information about all available indexes (not only for the current batch).
-    const std::map<UInt64, String> & file_index_to_path;
-
-    bool split_batch_on_failure = true;
-    bool fsync = false;
-    bool dir_fsync = false;
-
-    Batch(
-        StorageDistributedDirectoryMonitor & parent_,
-        const std::map<UInt64, String> & file_index_to_path_)
-        : parent(parent_)
-        , file_index_to_path(file_index_to_path_)
-        , split_batch_on_failure(parent.split_batch_on_failure)
-        , fsync(parent.storage.getDistributedSettingsRef().fsync_after_insert)
-        , dir_fsync(parent.dir_fsync)
-    {}
-
-    bool isEnoughSize() const
-    {
-        return (!parent.min_batched_block_size_rows && !parent.min_batched_block_size_bytes)
-            || (parent.min_batched_block_size_rows && total_rows >= parent.min_batched_block_size_rows)
-            || (parent.min_batched_block_size_bytes && total_bytes >= parent.min_batched_block_size_bytes);
-    }
-
-    void send()
-    {
-        if (file_indices.empty())
-            return;
-
-        CurrentMetrics::Increment metric_increment{CurrentMetrics::DistributedSend};
-
-        Stopwatch watch;
-
-        if (!recovered)
-        {
-            /// For deduplication in Replicated tables to work, in case of error
-            /// we must try to re-send exactly the same batches.
-            /// So we save contents of the current batch into the current_batch_file_path file
-            /// and truncate it afterwards if all went well.
-
-            /// Temporary file is required for atomicity.
-            String tmp_file{parent.current_batch_file_path + ".tmp"};
-
-            auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, parent.disk, parent.relative_path);
-            if (fs::exists(tmp_file))
-                LOG_ERROR(parent.log, "Temporary file {} exists. Unclean shutdown?", backQuote(tmp_file));
-
-            {
-                WriteBufferFromFile out{tmp_file, O_WRONLY | O_TRUNC | O_CREAT};
-                writeText(out);
-
-                out.finalize();
-                if (fsync)
-                    out.sync();
-            }
-
-            fs::rename(tmp_file, parent.current_batch_file_path);
-        }
-
-        bool batch_broken = false;
-        bool batch_marked_as_broken = false;
-        try
-        {
-            try
-            {
-                sendBatch();
-            }
-            catch (const Exception & e)
-            {
-                if (split_batch_on_failure && file_indices.size() > 1 && isSplittableErrorCode(e.code(), e.isRemoteException()))
-                {
-                    tryLogCurrentException(parent.log, "Trying to split batch due to");
-                    sendSeparateFiles();
-                }
-                else
-                    throw;
-            }
-        }
-        catch (Exception & e)
-        {
-            if (isFileBrokenErrorCode(e.code(), e.isRemoteException()))
-            {
-                tryLogCurrentException(parent.log, "Failed to send batch due to");
-                batch_broken = true;
-                if (!e.isRemoteException() && e.code() == ErrorCodes::DISTRIBUTED_BROKEN_BATCH_FILES)
-                    batch_marked_as_broken = true;
-            }
-            else
-            {
-                std::vector<std::string> files;
-                for (auto file_index_info : file_indices | boost::adaptors::indexed())
-                {
-                    if (file_index_info.index() > 8)
-                    {
-                        files.push_back("...");
-                        break;
-                    }
-
-                    auto file_index = file_index_info.value();
-                    auto file_path = file_index_to_path.find(file_index);
-                    if (file_path != file_index_to_path.end())
-                        files.push_back(file_path->second);
-                    else
-                        files.push_back(fmt::format("#{}.bin (deleted)", file_index));
-                }
-                e.addMessage(fmt::format("While sending batch, size: {}, files: {}", file_indices.size(), fmt::join(files, "\n")));
-
-                throw;
-            }
-        }
-
-        if (!batch_broken)
-        {
-            LOG_TRACE(parent.log, "Sent a batch of {} files (took {} ms).", file_indices.size(), watch.elapsedMilliseconds());
-
-            auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, parent.disk, parent.relative_path);
-            for (UInt64 file_index : file_indices)
-                parent.markAsSend(file_index_to_path.at(file_index));
-        }
-        else if (!batch_marked_as_broken)
-        {
-            LOG_ERROR(parent.log, "Marking a batch of {} files as broken.", file_indices.size());
-
-            for (UInt64 file_idx : file_indices)
-            {
-                auto file_path = file_index_to_path.find(file_idx);
-                if (file_path != file_index_to_path.end())
-                    parent.markAsBroken(file_path->second);
-            }
-        }
-
-        file_indices.clear();
-        total_rows = 0;
-        total_bytes = 0;
-        recovered = false;
-
-        fs::resize_file(parent.current_batch_file_path, 0);
-    }
-
-    void writeText(WriteBuffer & out)
-    {
-        for (UInt64 file_idx : file_indices)
-            out << file_idx << '\n';
-    }
-
-    void readText(ReadBuffer & in)
-    {
-        while (!in.eof())
-        {
-            UInt64 idx;
-            in >> idx >> "\n";
-            file_indices.push_back(idx);
-        }
-        recovered = true;
-    }
-
-private:
-    void sendBatch()
-    {
-        std::unique_ptr<RemoteInserter> remote;
-        bool compression_expected = false;
-
-        IConnectionPool::Entry connection;
-
-        for (UInt64 file_idx : file_indices)
-        {
-            auto file_path = file_index_to_path.find(file_idx);
-            if (file_path == file_index_to_path.end())
-                throw Exception(ErrorCodes::DISTRIBUTED_BROKEN_BATCH_INFO,
-                    "Failed to send batch: file with index {} is absent", file_idx);
-
-            ReadBufferFromFile in(file_path->second);
-            const auto & distributed_header = readDistributedHeader(in, parent.log);
-
-            OpenTelemetry::TracingContextHolder thread_trace_context(__PRETTY_FUNCTION__,
-                distributed_header.client_info.client_trace_context,
-                parent.storage.getContext()->getOpenTelemetrySpanLog());
-
-            if (!remote)
-            {
-                auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(distributed_header.insert_settings);
-                connection = parent.pool->get(timeouts);
-                compression_expected = connection->getCompression() == Protocol::Compression::Enable;
-
-                LOG_DEBUG(parent.log, "Sending a batch of {} files to {} ({} rows, {} bytes).",
-                    file_indices.size(),
-                    connection->getDescription(),
-                    formatReadableQuantity(total_rows),
-                    formatReadableSizeWithBinarySuffix(total_bytes));
-
-                remote = std::make_unique<RemoteInserter>(*connection, timeouts,
-                    distributed_header.insert_query,
-                    distributed_header.insert_settings,
-                    distributed_header.client_info);
-            }
-            writeRemoteConvert(distributed_header, *remote, compression_expected, in, parent.log);
-        }
-
-        if (remote)
-            remote->onFinish();
-    }
-
-    void sendSeparateFiles()
-    {
-        size_t broken_files = 0;
-
-        for (UInt64 file_idx : file_indices)
-        {
-            auto file_path = file_index_to_path.find(file_idx);
-            if (file_path == file_index_to_path.end())
-            {
-                LOG_ERROR(parent.log, "Failed to send one file from batch: file with index {} is absent", file_idx);
-                ++broken_files;
-                continue;
-            }
-
-            try
-            {
-                ReadBufferFromFile in(file_path->second);
-                const auto & distributed_header = readDistributedHeader(in, parent.log);
-
-                // this function is called in a separated thread, so we set up the trace context from the file
-                OpenTelemetry::TracingContextHolder thread_trace_context(__PRETTY_FUNCTION__,
-                    distributed_header.client_info.client_trace_context,
-                    parent.storage.getContext()->getOpenTelemetrySpanLog());
-
-                auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(distributed_header.insert_settings);
-                auto connection = parent.pool->get(timeouts);
-                bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
-
-                RemoteInserter remote(*connection, timeouts,
-                    distributed_header.insert_query,
-                    distributed_header.insert_settings,
-                    distributed_header.client_info);
-
-                writeRemoteConvert(distributed_header, remote, compression_expected, in, parent.log);
-                remote.onFinish();
-            }
-            catch (Exception & e)
-            {
-                e.addMessage(fmt::format("While sending {}", file_path->second));
-                parent.maybeMarkAsBroken(file_path->second, e);
-                ++broken_files;
-            }
-        }
-
-        if (broken_files)
-            throw Exception(ErrorCodes::DISTRIBUTED_BROKEN_BATCH_FILES,
-                "Failed to send {} files", broken_files);
-    }
-};
-
-class DirectoryMonitorSource : public ISource
-{
-public:
-
-    struct Data
-    {
-        std::unique_ptr<ReadBufferFromFile> in;
-        std::unique_ptr<CompressedReadBuffer> decompressing_in;
-        std::unique_ptr<NativeReader> block_in;
-
-        Poco::Logger * log = nullptr;
-
-        Block first_block;
-
-        explicit Data(const String & file_name)
-        {
-            in = std::make_unique<ReadBufferFromFile>(file_name);
-            decompressing_in = std::make_unique<CompressedReadBuffer>(*in);
-            log = &Poco::Logger::get("DirectoryMonitorSource");
-
-            auto distributed_header = readDistributedHeader(*in, log);
-            block_in = std::make_unique<NativeReader>(*decompressing_in, distributed_header.revision);
-
-            first_block = block_in->read();
-        }
-
-        Data(Data &&) = default;
-    };
-
-    explicit DirectoryMonitorSource(const String & file_name)
-        : DirectoryMonitorSource(Data(file_name))
-    {
-    }
-
-    explicit DirectoryMonitorSource(Data data_)
-        : ISource(data_.first_block.cloneEmpty())
-        , data(std::move(data_))
-    {
-    }
-
-    String getName() const override { return "DirectoryMonitorSource"; }
-
-protected:
-    Chunk generate() override
-    {
-        if (data.first_block)
-        {
-            size_t num_rows = data.first_block.rows();
-            Chunk res(data.first_block.getColumns(), num_rows);
-            data.first_block.clear();
-            return res;
-        }
-
-        auto block = data.block_in->read();
-        if (!block)
-            return {};
-
-        size_t num_rows = block.rows();
-        return Chunk(block.getColumns(), num_rows);
-    }
-
-private:
-    Data data;
-};
-
-std::shared_ptr<ISource> StorageDistributedDirectoryMonitor::createSourceFromFile(const String & file_name)
-{
-    return std::make_shared<DirectoryMonitorSource>(file_name);
-}
-
-bool StorageDistributedDirectoryMonitor::addAndSchedule(size_t file_size, size_t ms)
-{
-    if (quit)
-        return false;
-
-    {
-        std::lock_guard status_lock(status_mutex);
-        metric_pending_files.add();
-        status.bytes_count += file_size;
-        ++status.files_count;
-    }
-
-    return task_handle->scheduleAfter(ms, false);
-}
-
-StorageDistributedDirectoryMonitor::Status StorageDistributedDirectoryMonitor::getStatus()
-{
-    std::lock_guard status_lock(status_mutex);
-    Status current_status{status, path, monitor_blocker.isCancelled()};
-    return current_status;
-}
-
-void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map<UInt64, std::string> & files)
-{
-    std::unordered_set<UInt64> file_indices_to_skip;
-
-    if (fs::exists(current_batch_file_path))
-    {
-        /// Possibly, we failed to send a batch on the previous iteration. Try to send exactly the same batch.
-        Batch batch(*this, files);
-        ReadBufferFromFile in{current_batch_file_path};
-        batch.readText(in);
-        file_indices_to_skip.insert(batch.file_indices.begin(), batch.file_indices.end());
-        batch.send();
-    }
-
-    std::unordered_map<BatchHeader, Batch, BatchHeader::Hash> header_to_batch;
-
-    for (const auto & file : files)
-    {
-        if (quit)
-            return;
-
-        UInt64 file_idx = file.first;
-        const String & file_path = file.second;
-
-        if (file_indices_to_skip.contains(file_idx))
-            continue;
-
-        size_t total_rows = 0;
-        size_t total_bytes = 0;
-        Block header;
-        DistributedHeader distributed_header;
-        try
-        {
-            /// Determine metadata of the current file and check if it is not broken.
-            ReadBufferFromFile in{file_path};
-            distributed_header = readDistributedHeader(in, log);
-
-            if (distributed_header.rows)
-            {
-                total_rows += distributed_header.rows;
-                total_bytes += distributed_header.bytes;
-            }
-
-            if (distributed_header.block_header)
-                header = distributed_header.block_header;
-
-            if (!total_rows || !header)
-            {
-                LOG_DEBUG(log, "Processing batch {} with old format (no header/rows)", in.getFileName());
-
-                CompressedReadBuffer decompressing_in(in);
-                NativeReader block_in(decompressing_in, distributed_header.revision);
-
-                while (Block block = block_in.read())
-                {
-                    total_rows += block.rows();
-                    total_bytes += block.bytes();
-
-                    if (!header)
-                        header = block.cloneEmpty();
-                }
-            }
-        }
-        catch (const Exception & e)
-        {
-            if (maybeMarkAsBroken(file_path, e))
-            {
-                tryLogCurrentException(log, "File is marked broken due to");
-                continue;
-            }
-            else
-                throw;
-        }
-
-        BatchHeader batch_header(
-            std::move(distributed_header.insert_settings),
-            std::move(distributed_header.insert_query),
-            std::move(distributed_header.client_info),
-            std::move(header)
-        );
-        Batch & batch = header_to_batch.try_emplace(batch_header, *this, files).first->second;
-
-        batch.file_indices.push_back(file_idx);
-        batch.total_rows += total_rows;
-        batch.total_bytes += total_bytes;
-
-        if (batch.isEnoughSize())
-        {
-            batch.send();
-        }
-    }
-
-    for (auto & kv : header_to_batch)
-    {
-        Batch & batch = kv.second;
-        batch.send();
-    }
-
-    {
-        auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
-
-        /// current_batch.txt will not exist if there was no send
-        /// (this is the case when all batches that was pending has been marked as pending)
-        if (fs::exists(current_batch_file_path))
-            fs::remove(current_batch_file_path);
-    }
-}
-
-void StorageDistributedDirectoryMonitor::markAsBroken(const std::string & file_path)
-{
-    const auto last_path_separator_pos = file_path.rfind('/');
-    const auto & base_path = file_path.substr(0, last_path_separator_pos + 1);
-    const auto & file_name = file_path.substr(last_path_separator_pos + 1);
-    const String & broken_path = fs::path(base_path) / "broken/";
-    const String & broken_file_path = fs::path(broken_path) / file_name;
-
-    fs::create_directory(broken_path);
-
-    auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
-    auto broken_dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, fs::path(relative_path) / "broken/");
-
-    {
-        std::lock_guard status_lock(status_mutex);
-
-        size_t file_size = fs::file_size(file_path);
-
-        --status.files_count;
-        status.bytes_count -= file_size;
-
-        ++status.broken_files_count;
-        status.broken_bytes_count += file_size;
-
-        metric_broken_files.add();
-    }
-
-    fs::rename(file_path, broken_file_path);
-    LOG_ERROR(log, "Renamed `{}` to `{}`", file_path, broken_file_path);
-}
-
-void StorageDistributedDirectoryMonitor::markAsSend(const std::string & file_path)
-{
-    size_t file_size = fs::file_size(file_path);
-
-    {
-        std::lock_guard status_lock(status_mutex);
-        metric_pending_files.sub();
-        --status.files_count;
-        status.bytes_count -= file_size;
-    }
-
-    fs::remove(file_path);
-}
-
-bool StorageDistributedDirectoryMonitor::maybeMarkAsBroken(const std::string & file_path, const Exception & e)
-{
-    /// Mark file as broken if necessary.
-    if (isFileBrokenErrorCode(e.code(), e.isRemoteException()))
-    {
-        markAsBroken(file_path);
-        return true;
-    }
-    else
-        return false;
-}
-
-std::string StorageDistributedDirectoryMonitor::getLoggerName() const
-{
-    return storage.getStorageID().getFullTableName() + ".DirectoryMonitor";
-}
-
-void StorageDistributedDirectoryMonitor::updatePath(const std::string & new_relative_path)
-{
-    task_handle->deactivate();
-    std::lock_guard lock{mutex};
-
-    {
-        std::lock_guard status_lock(status_mutex);
-        relative_path = new_relative_path;
-        path = fs::path(disk->getPath()) / relative_path / "";
-    }
-    current_batch_file_path = path + "current_batch.txt";
-
-    task_handle->activateAndSchedule();
-}
-
-}
diff --git a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
new file mode 100644
index 00000000000..b82cf1d7ffc
--- /dev/null
+++ b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
@@ -0,0 +1,305 @@
+#include <Storages/Distributed/DistributedAsyncInsertBatch.h>
+#include <Storages/Distributed/DistributedAsyncInsertHelpers.h>
+#include <Storages/Distributed/DistributedAsyncInsertHeader.h>
+#include <Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h>
+#include <Storages/StorageDistributed.h>
+#include <QueryPipeline/RemoteInserter.h>
+#include <Common/CurrentMetrics.h>
+#include <IO/Operators.h>
+#include <IO/WriteBufferFromFile.h>
+
+namespace CurrentMetrics
+{
+    extern const Metric DistributedSend;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int MEMORY_LIMIT_EXCEEDED;
+    extern const int DISTRIBUTED_BROKEN_BATCH_INFO;
+    extern const int DISTRIBUTED_BROKEN_BATCH_FILES;
+    extern const int TOO_MANY_PARTS;
+    extern const int TOO_MANY_BYTES;
+    extern const int TOO_MANY_ROWS_OR_BYTES;
+    extern const int TOO_MANY_PARTITIONS;
+    extern const int DISTRIBUTED_TOO_MANY_PENDING_BYTES;
+    extern const int ARGUMENT_OUT_OF_BOUND;
+}
+
+/// Can the batch be split and send files from batch one-by-one instead?
+bool isSplittableErrorCode(int code, bool remote)
+{
+    return code == ErrorCodes::MEMORY_LIMIT_EXCEEDED
+        /// FunctionRange::max_elements and similar
+        || code == ErrorCodes::ARGUMENT_OUT_OF_BOUND
+        || code == ErrorCodes::TOO_MANY_PARTS
+        || code == ErrorCodes::TOO_MANY_BYTES
+        || code == ErrorCodes::TOO_MANY_ROWS_OR_BYTES
+        || code == ErrorCodes::TOO_MANY_PARTITIONS
+        || code == ErrorCodes::DISTRIBUTED_TOO_MANY_PENDING_BYTES
+        || code == ErrorCodes::DISTRIBUTED_BROKEN_BATCH_INFO
+        || isDistributedSendBroken(code, remote)
+    ;
+}
+
+DistributedAsyncInsertBatch::DistributedAsyncInsertBatch(DistributedAsyncInsertDirectoryQueue & parent_)
+    : parent(parent_)
+    , split_batch_on_failure(parent.split_batch_on_failure)
+    , fsync(parent.storage.getDistributedSettingsRef().fsync_after_insert)
+    , dir_fsync(parent.dir_fsync)
+{}
+
+bool DistributedAsyncInsertBatch::isEnoughSize() const
+{
+    return (!parent.min_batched_block_size_rows && !parent.min_batched_block_size_bytes)
+        || (parent.min_batched_block_size_rows && total_rows >= parent.min_batched_block_size_rows)
+        || (parent.min_batched_block_size_bytes && total_bytes >= parent.min_batched_block_size_bytes);
+}
+
+void DistributedAsyncInsertBatch::send()
+{
+    if (files.empty())
+        return;
+
+    CurrentMetrics::Increment metric_increment{CurrentMetrics::DistributedSend};
+
+    Stopwatch watch;
+
+    if (!recovered)
+    {
+        /// For deduplication in Replicated tables to work, in case of error
+        /// we must try to re-send exactly the same batches.
+        /// So we save contents of the current batch into the current_batch_file_path file
+        /// and truncate it afterwards if all went well.
+        serialize();
+    }
+
+    bool batch_broken = false;
+    bool batch_marked_as_broken = false;
+    try
+    {
+        try
+        {
+            sendBatch();
+        }
+        catch (const Exception & e)
+        {
+            if (split_batch_on_failure && files.size() > 1 && isSplittableErrorCode(e.code(), e.isRemoteException()))
+            {
+                tryLogCurrentException(parent.log, "Trying to split batch due to");
+                sendSeparateFiles();
+            }
+            else
+                throw;
+        }
+    }
+    catch (Exception & e)
+    {
+        if (isDistributedSendBroken(e.code(), e.isRemoteException()))
+        {
+            tryLogCurrentException(parent.log, "Failed to send batch due to");
+            batch_broken = true;
+            if (!e.isRemoteException() && e.code() == ErrorCodes::DISTRIBUTED_BROKEN_BATCH_FILES)
+                batch_marked_as_broken = true;
+        }
+        else
+        {
+            e.addMessage(fmt::format("While sending a batch of {} files, files: {}", files.size(), fmt::join(files, "\n")));
+            throw;
+        }
+    }
+
+    if (!batch_broken)
+    {
+        LOG_TRACE(parent.log, "Sent a batch of {} files (took {} ms).", files.size(), watch.elapsedMilliseconds());
+
+        auto dir_sync_guard = parent.getDirectorySyncGuard(parent.relative_path);
+        for (const auto & file : files)
+            parent.markAsSend(file);
+    }
+    else if (!batch_marked_as_broken)
+    {
+        LOG_ERROR(parent.log, "Marking a batch of {} files as broken, files: {}", files.size(), fmt::join(files, "\n"));
+
+        for (const auto & file : files)
+            parent.markAsBroken(file);
+    }
+
+    files.clear();
+    total_rows = 0;
+    total_bytes = 0;
+    recovered = false;
+
+    std::filesystem::resize_file(parent.current_batch_file_path, 0);
+}
+
+void DistributedAsyncInsertBatch::serialize()
+{
+    /// Temporary file is required for atomicity.
+    String tmp_file{parent.current_batch_file_path + ".tmp"};
+
+    auto dir_sync_guard = parent.getDirectorySyncGuard(parent.relative_path);
+    if (std::filesystem::exists(tmp_file))
+        LOG_ERROR(parent.log, "Temporary file {} exists. Unclean shutdown?", backQuote(tmp_file));
+
+    {
+        WriteBufferFromFile out{tmp_file, O_WRONLY | O_TRUNC | O_CREAT};
+        writeText(out);
+
+        out.finalize();
+        if (fsync)
+            out.sync();
+    }
+
+    std::filesystem::rename(tmp_file, parent.current_batch_file_path);
+}
+
+void DistributedAsyncInsertBatch::deserialize()
+{
+    ReadBufferFromFile in{parent.current_batch_file_path};
+    readText(in);
+}
+
+void DistributedAsyncInsertBatch::writeText(WriteBuffer & out)
+{
+    for (const auto & file : files)
+    {
+        UInt64 file_index = parse<UInt64>(std::filesystem::path(file).stem());
+        out << file_index << '\n';
+    }
+}
+
+void DistributedAsyncInsertBatch::readText(ReadBuffer & in)
+{
+    while (!in.eof())
+    {
+        UInt64 idx;
+        in >> idx >> "\n";
+        files.push_back(std::filesystem::absolute(fmt::format("{}/{}.bin", parent.path, idx)).string());
+    }
+
+    recovered = true;
+}
+
+void DistributedAsyncInsertBatch::sendBatch()
+{
+    std::unique_ptr<RemoteInserter> remote;
+    bool compression_expected = false;
+
+    IConnectionPool::Entry connection;
+
+    /// Since the batch is sent as a whole (in case of failure, the whole batch
+    /// will be repeated), we need to mark the whole batch as failed in case of
+    /// error).
+    std::vector<OpenTelemetry::TracingContextHolderPtr> tracing_contexts;
+    UInt64 batch_start_time = clock_gettime_ns();
+
+    try
+    {
+        for (const auto & file : files)
+        {
+            /// In case of recovery it is possible that some of files will be
+            /// missing, if server had been restarted abnormally
+            if (recovered && !fs::exists(file))
+            {
+                LOG_WARNING(parent.log, "File {} does not exists, likely due abnormal shutdown", file);
+                continue;
+            }
+
+            ReadBufferFromFile in(file);
+            const auto & distributed_header = DistributedAsyncInsertHeader::read(in, parent.log);
+
+            tracing_contexts.emplace_back(distributed_header.createTracingContextHolder(
+                __PRETTY_FUNCTION__,
+                parent.storage.getContext()->getOpenTelemetrySpanLog()));
+            tracing_contexts.back()->root_span.addAttribute("clickhouse.distributed_batch_start_time", batch_start_time);
+
+            if (!remote)
+            {
+                auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(distributed_header.insert_settings);
+                connection = parent.pool->get(timeouts);
+                compression_expected = connection->getCompression() == Protocol::Compression::Enable;
+
+                LOG_DEBUG(parent.log, "Sending a batch of {} files to {} ({} rows, {} bytes).",
+                    files.size(),
+                    connection->getDescription(),
+                    formatReadableQuantity(total_rows),
+                    formatReadableSizeWithBinarySuffix(total_bytes));
+
+                remote = std::make_unique<RemoteInserter>(*connection, timeouts,
+                    distributed_header.insert_query,
+                    distributed_header.insert_settings,
+                    distributed_header.client_info);
+            }
+            writeRemoteConvert(distributed_header, *remote, compression_expected, in, parent.log);
+        }
+
+        if (remote)
+            remote->onFinish();
+    }
+    catch (...)
+    {
+        try
+        {
+            for (auto & tracing_context : tracing_contexts)
+                tracing_context->root_span.addAttribute(std::current_exception());
+        }
+        catch (...)
+        {
+            tryLogCurrentException(parent.log, "Cannot append exception to tracing context");
+        }
+        throw;
+    }
+}
+
+void DistributedAsyncInsertBatch::sendSeparateFiles()
+{
+    size_t broken_files = 0;
+
+    for (const auto & file : files)
+    {
+        OpenTelemetry::TracingContextHolderPtr trace_context;
+
+        try
+        {
+            ReadBufferFromFile in(file);
+            const auto & distributed_header = DistributedAsyncInsertHeader::read(in, parent.log);
+
+            // This function is called in a separated thread, so we set up the trace context from the file
+            trace_context = distributed_header.createTracingContextHolder(
+                __PRETTY_FUNCTION__,
+                parent.storage.getContext()->getOpenTelemetrySpanLog());
+
+            auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(distributed_header.insert_settings);
+            auto connection = parent.pool->get(timeouts);
+            bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
+
+            RemoteInserter remote(*connection, timeouts,
+                distributed_header.insert_query,
+                distributed_header.insert_settings,
+                distributed_header.client_info);
+
+            writeRemoteConvert(distributed_header, remote, compression_expected, in, parent.log);
+            remote.onFinish();
+        }
+        catch (Exception & e)
+        {
+            trace_context->root_span.addAttribute(std::current_exception());
+
+            if (isDistributedSendBroken(e.code(), e.isRemoteException()))
+            {
+                parent.markAsBroken(file);
+                ++broken_files;
+            }
+        }
+    }
+
+    if (broken_files)
+        throw Exception(ErrorCodes::DISTRIBUTED_BROKEN_BATCH_FILES,
+            "Failed to send {} files", broken_files);
+}
+
+}
diff --git a/src/Storages/Distributed/DistributedAsyncInsertBatch.h b/src/Storages/Distributed/DistributedAsyncInsertBatch.h
new file mode 100644
index 00000000000..867a0de89fa
--- /dev/null
+++ b/src/Storages/Distributed/DistributedAsyncInsertBatch.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace DB
+{
+
+class DistributedAsyncInsertDirectoryQueue;
+class WriteBuffer;
+class ReadBuffer;
+
+class DistributedAsyncInsertBatch
+{
+public:
+    explicit DistributedAsyncInsertBatch(DistributedAsyncInsertDirectoryQueue & parent_);
+
+    bool isEnoughSize() const;
+    void send();
+
+    void serialize();
+    void deserialize();
+
+    size_t total_rows = 0;
+    size_t total_bytes = 0;
+    std::vector<std::string> files;
+
+private:
+    void writeText(WriteBuffer & out);
+    void readText(ReadBuffer & in);
+    void sendBatch();
+    void sendSeparateFiles();
+
+    DistributedAsyncInsertDirectoryQueue & parent;
+
+    /// Does the batch had been created from the files in current_batch.txt?
+    bool recovered = false;
+
+    bool split_batch_on_failure = true;
+    bool fsync = false;
+    bool dir_fsync = false;
+};
+
+}
diff --git a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
new file mode 100644
index 00000000000..9a9a6651bc4
--- /dev/null
+++ b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
@@ -0,0 +1,729 @@
+#include <Storages/Distributed/DistributedAsyncInsertBatch.h>
+#include <Storages/Distributed/DistributedAsyncInsertHeader.h>
+#include <Storages/Distributed/DistributedAsyncInsertHelpers.h>
+#include <Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h>
+#include <Storages/StorageDistributed.h>
+#include <QueryPipeline/RemoteInserter.h>
+#include <Formats/NativeReader.h>
+#include <Processors/ISource.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/Cluster.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ConnectionTimeouts.h>
+#include <Compression/CompressedReadBuffer.h>
+#include <Disks/IDisk.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/StringUtils/StringUtils.h>
+#include <Common/SipHash.h>
+#include <Common/quoteString.h>
+#include <base/hex.h>
+#include <Common/ActionBlocker.h>
+#include <Common/formatReadable.h>
+#include <Common/Stopwatch.h>
+#include <Common/logger_useful.h>
+#include <Compression/CheckingCompressedReadBuffer.h>
+#include <IO/Operators.h>
+#include <boost/algorithm/string/find_iterator.hpp>
+#include <boost/algorithm/string/finder.hpp>
+#include <boost/range/adaptor/indexed.hpp>
+#include <filesystem>
+
+
+namespace CurrentMetrics
+{
+    extern const Metric DistributedSend;
+    extern const Metric DistributedFilesToInsert;
+    extern const Metric BrokenDistributedFilesToInsert;
+}
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INCORRECT_FILE_NAME;
+    extern const int LOGICAL_ERROR;
+}
+
+
+namespace
+{
+
+template <typename PoolFactory>
+ConnectionPoolPtrs createPoolsForAddresses(const std::string & name, PoolFactory && factory, const Cluster::ShardsInfo & shards_info, Poco::Logger * log)
+{
+    ConnectionPoolPtrs pools;
+
+    auto make_connection = [&](const Cluster::Address & address)
+    {
+        try
+        {
+            pools.emplace_back(factory(address));
+        }
+        catch (const Exception & e)
+        {
+            if (e.code() == ErrorCodes::INCORRECT_FILE_NAME)
+            {
+                tryLogCurrentException(log);
+                return;
+            }
+            throw;
+        }
+    };
+
+    for (auto it = boost::make_split_iterator(name, boost::first_finder(",")); it != decltype(it){}; ++it)
+    {
+        const std::string & dirname = boost::copy_range<std::string>(*it);
+        Cluster::Address address = Cluster::Address::fromFullString(dirname);
+        if (address.shard_index && dirname.ends_with("_all_replicas"))
+        {
+            if (address.shard_index > shards_info.size())
+            {
+                LOG_ERROR(log, "No shard with shard_index={} ({})", address.shard_index, name);
+                continue;
+            }
+
+            const auto & shard_info = shards_info[address.shard_index - 1];
+            size_t replicas = shard_info.per_replica_pools.size();
+
+            for (size_t replica_index = 1; replica_index <= replicas; ++replica_index)
+            {
+                address.replica_index = static_cast<UInt32>(replica_index);
+                make_connection(address);
+            }
+        }
+        else
+            make_connection(address);
+    }
+
+    return pools;
+}
+
+uint64_t doubleToUInt64(double d)
+{
+    if (d >= static_cast<double>(std::numeric_limits<uint64_t>::max()))
+        return std::numeric_limits<uint64_t>::max();
+    return static_cast<uint64_t>(d);
+}
+
+}
+
+
+DistributedAsyncInsertDirectoryQueue::DistributedAsyncInsertDirectoryQueue(
+    StorageDistributed & storage_,
+    const DiskPtr & disk_,
+    const std::string & relative_path_,
+    ConnectionPoolPtr pool_,
+    ActionBlocker & monitor_blocker_,
+    BackgroundSchedulePool & bg_pool)
+    : storage(storage_)
+    , pool(std::move(pool_))
+    , disk(disk_)
+    , relative_path(relative_path_)
+    , path(fs::path(disk->getPath()) / relative_path / "")
+    , broken_relative_path(fs::path(relative_path) / "broken")
+    , broken_path(fs::path(path) / "broken" / "")
+    , should_batch_inserts(storage.getDistributedSettingsRef().monitor_batch_inserts)
+    , split_batch_on_failure(storage.getDistributedSettingsRef().monitor_split_batch_on_failure)
+    , dir_fsync(storage.getDistributedSettingsRef().fsync_directories)
+    , min_batched_block_size_rows(storage.getContext()->getSettingsRef().min_insert_block_size_rows)
+    , min_batched_block_size_bytes(storage.getContext()->getSettingsRef().min_insert_block_size_bytes)
+    , current_batch_file_path(path + "current_batch.txt")
+    , pending_files(std::numeric_limits<size_t>::max())
+    , default_sleep_time(storage.getDistributedSettingsRef().monitor_sleep_time_ms.totalMilliseconds())
+    , sleep_time(default_sleep_time)
+    , max_sleep_time(storage.getDistributedSettingsRef().monitor_max_sleep_time_ms.totalMilliseconds())
+    , log(&Poco::Logger::get(getLoggerName()))
+    , monitor_blocker(monitor_blocker_)
+    , metric_pending_files(CurrentMetrics::DistributedFilesToInsert, 0)
+    , metric_broken_files(CurrentMetrics::BrokenDistributedFilesToInsert, 0)
+{
+    fs::create_directory(broken_path);
+
+    initializeFilesFromDisk();
+
+    task_handle = bg_pool.createTask(getLoggerName() + "/Bg", [this]{ run(); });
+    task_handle->activateAndSchedule();
+}
+
+
+DistributedAsyncInsertDirectoryQueue::~DistributedAsyncInsertDirectoryQueue()
+{
+    if (!pending_files.isFinished())
+    {
+        pending_files.clearAndFinish();
+        task_handle->deactivate();
+    }
+}
+
+void DistributedAsyncInsertDirectoryQueue::flushAllData()
+{
+    if (pending_files.isFinished())
+        return;
+
+    std::lock_guard lock{mutex};
+    if (!hasPendingFiles())
+        return;
+    processFiles();
+}
+
+void DistributedAsyncInsertDirectoryQueue::shutdownAndDropAllData()
+{
+    if (!pending_files.isFinished())
+    {
+        pending_files.clearAndFinish();
+        task_handle->deactivate();
+    }
+
+    auto dir_sync_guard = getDirectorySyncGuard(relative_path);
+    fs::remove_all(path);
+}
+
+
+void DistributedAsyncInsertDirectoryQueue::run()
+{
+    constexpr const std::chrono::minutes decrease_error_count_period{5};
+
+    std::lock_guard lock{mutex};
+
+    bool do_sleep = false;
+    while (!pending_files.isFinished())
+    {
+        do_sleep = true;
+
+        if (!hasPendingFiles())
+            break;
+
+        if (!monitor_blocker.isCancelled())
+        {
+            try
+            {
+                processFiles();
+                /// No errors while processing existing files.
+                /// Let's see maybe there are more files to process.
+                do_sleep = false;
+            }
+            catch (...)
+            {
+                tryLogCurrentException(getLoggerName().data());
+
+                UInt64 q = doubleToUInt64(std::exp2(status.error_count));
+                std::chrono::milliseconds new_sleep_time(default_sleep_time.count() * q);
+                if (new_sleep_time.count() < 0)
+                    sleep_time = max_sleep_time;
+                else
+                    sleep_time = std::min(new_sleep_time, max_sleep_time);
+
+                do_sleep = true;
+            }
+        }
+        else
+            LOG_TEST(log, "Skipping send data over distributed table.");
+
+        const auto now = std::chrono::system_clock::now();
+        if (now - last_decrease_time > decrease_error_count_period)
+        {
+            std::lock_guard status_lock(status_mutex);
+
+            status.error_count /= 2;
+            last_decrease_time = now;
+        }
+
+        if (do_sleep)
+            break;
+    }
+
+    if (!pending_files.isFinished() && do_sleep)
+        task_handle->scheduleAfter(sleep_time.count());
+}
+
+
+ConnectionPoolPtr DistributedAsyncInsertDirectoryQueue::createPool(const std::string & name, const StorageDistributed & storage)
+{
+    const auto pool_factory = [&storage, &name] (const Cluster::Address & address) -> ConnectionPoolPtr
+    {
+        const auto & cluster = storage.getCluster();
+        const auto & shards_info = cluster->getShardsInfo();
+        const auto & shards_addresses = cluster->getShardsAddresses();
+
+        /// Check new format shard{shard_index}_replica{replica_index}
+        /// (shard_index and replica_index starts from 1).
+        if (address.shard_index != 0)
+        {
+            if (!address.replica_index)
+                throw Exception(ErrorCodes::INCORRECT_FILE_NAME,
+                    "Wrong replica_index={} ({})", address.replica_index, name);
+
+            if (address.shard_index > shards_info.size())
+                throw Exception(ErrorCodes::INCORRECT_FILE_NAME,
+                    "No shard with shard_index={} ({})", address.shard_index, name);
+
+            const auto & shard_info = shards_info[address.shard_index - 1];
+            if (address.replica_index > shard_info.per_replica_pools.size())
+                throw Exception(ErrorCodes::INCORRECT_FILE_NAME,
+                    "No shard with replica_index={} ({})", address.replica_index, name);
+
+            return shard_info.per_replica_pools[address.replica_index - 1];
+        }
+
+        /// Existing connections pool have a higher priority.
+        for (size_t shard_index = 0; shard_index < shards_info.size(); ++shard_index)
+        {
+            const Cluster::Addresses & replicas_addresses = shards_addresses[shard_index];
+
+            for (size_t replica_index = 0; replica_index < replicas_addresses.size(); ++replica_index)
+            {
+                const Cluster::Address & replica_address = replicas_addresses[replica_index];
+
+                if (address.user == replica_address.user &&
+                    address.password == replica_address.password &&
+                    address.host_name == replica_address.host_name &&
+                    address.port == replica_address.port &&
+                    address.default_database == replica_address.default_database &&
+                    address.secure == replica_address.secure)
+                {
+                    return shards_info[shard_index].per_replica_pools[replica_index];
+                }
+            }
+        }
+
+        return std::make_shared<ConnectionPool>(
+            1, /* max_connections */
+            address.host_name,
+            address.port,
+            address.default_database,
+            address.user,
+            address.password,
+            address.quota_key,
+            address.cluster,
+            address.cluster_secret,
+            storage.getName() + '_' + address.user, /* client */
+            Protocol::Compression::Enable,
+            address.secure);
+    };
+
+    auto pools = createPoolsForAddresses(name, pool_factory, storage.getCluster()->getShardsInfo(), storage.log);
+
+    const auto settings = storage.getContext()->getSettings();
+    return pools.size() == 1 ? pools.front() : std::make_shared<ConnectionPoolWithFailover>(pools,
+        settings.load_balancing,
+        settings.distributed_replica_error_half_life.totalSeconds(),
+        settings.distributed_replica_error_cap);
+}
+
+bool DistributedAsyncInsertDirectoryQueue::hasPendingFiles() const
+{
+    return fs::exists(current_batch_file_path) || !current_file.empty() || !pending_files.empty();
+}
+
+void DistributedAsyncInsertDirectoryQueue::addFile(const std::string & file_path)
+{
+    if (!pending_files.push(fs::absolute(file_path).string()))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot schedule a file '{}'", file_path);
+}
+
+void DistributedAsyncInsertDirectoryQueue::initializeFilesFromDisk()
+{
+    /// NOTE: This method does not requires to hold status_mutex (because this
+    /// object is not in the list that the caller may iterate over), hence, no
+    /// TSA annotations in the header file.
+
+    fs::directory_iterator end;
+
+    /// Initialize pending files
+    {
+        size_t bytes_count = 0;
+
+        for (fs::directory_iterator it{path}; it != end; ++it)
+        {
+            const auto & file_path = it->path();
+            const auto & base_name = file_path.stem().string();
+            if (!it->is_directory() && startsWith(fs::path(file_path).extension(), ".bin") && parse<UInt64>(base_name))
+            {
+                const std::string & file_path_str = file_path.string();
+                addFile(file_path_str);
+                bytes_count += fs::file_size(file_path);
+            }
+            else if (base_name != "tmp" && base_name != "broken")
+            {
+                /// It is OK to log current_batch.txt here too (useful for debugging).
+                LOG_WARNING(log, "Unexpected file {} in {}", file_path.string(), path);
+            }
+        }
+
+        LOG_TRACE(log, "Files set to {}", pending_files.size());
+        LOG_TRACE(log, "Bytes set to {}", bytes_count);
+
+        metric_pending_files.changeTo(pending_files.size());
+        status.files_count = pending_files.size();
+        status.bytes_count = bytes_count;
+    }
+
+    /// Initialize broken files
+    {
+        size_t broken_bytes_count = 0;
+        size_t broken_files = 0;
+
+        for (fs::directory_iterator it{broken_path}; it != end; ++it)
+        {
+            const auto & file_path = it->path();
+            if (!it->is_directory() && startsWith(fs::path(file_path).extension(), ".bin") && parse<UInt64>(file_path.stem()))
+                broken_bytes_count += fs::file_size(file_path);
+            else
+                LOG_WARNING(log, "Unexpected file {} in {}", file_path.string(), broken_path);
+        }
+
+        LOG_TRACE(log, "Broken files set to {}", broken_files);
+        LOG_TRACE(log, "Broken bytes set to {}", broken_bytes_count);
+
+        metric_broken_files.changeTo(broken_files);
+        status.broken_files_count = broken_files;
+        status.broken_bytes_count = broken_bytes_count;
+    }
+}
+void DistributedAsyncInsertDirectoryQueue::processFiles()
+try
+{
+    if (should_batch_inserts)
+        processFilesWithBatching();
+    else
+    {
+        /// Process unprocessed file.
+        if (!current_file.empty())
+            processFile(current_file);
+
+        while (pending_files.tryPop(current_file))
+            processFile(current_file);
+    }
+
+    std::lock_guard status_lock(status_mutex);
+    status.last_exception = std::exception_ptr{};
+}
+catch (...)
+{
+    std::lock_guard status_lock(status_mutex);
+
+    ++status.error_count;
+    status.last_exception = std::current_exception();
+    status.last_exception_time = std::chrono::system_clock::now();
+
+    throw;
+}
+
+void DistributedAsyncInsertDirectoryQueue::processFile(const std::string & file_path)
+{
+    OpenTelemetry::TracingContextHolderPtr thread_trace_context;
+
+    Stopwatch watch;
+    try
+    {
+        CurrentMetrics::Increment metric_increment{CurrentMetrics::DistributedSend};
+
+        ReadBufferFromFile in(file_path);
+        const auto & distributed_header = DistributedAsyncInsertHeader::read(in, log);
+        thread_trace_context = distributed_header.createTracingContextHolder(
+            __PRETTY_FUNCTION__,
+            storage.getContext()->getOpenTelemetrySpanLog());
+
+        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(distributed_header.insert_settings);
+        auto connection = pool->get(timeouts, &distributed_header.insert_settings);
+        LOG_DEBUG(log, "Sending `{}` to {} ({} rows, {} bytes)",
+            file_path,
+            connection->getDescription(),
+            formatReadableQuantity(distributed_header.rows),
+            formatReadableSizeWithBinarySuffix(distributed_header.bytes));
+
+        RemoteInserter remote{*connection, timeouts,
+            distributed_header.insert_query,
+            distributed_header.insert_settings,
+            distributed_header.client_info};
+        bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
+        writeRemoteConvert(distributed_header, remote, compression_expected, in, log);
+        remote.onFinish();
+    }
+    catch (Exception & e)
+    {
+        if (thread_trace_context)
+            thread_trace_context->root_span.addAttribute(std::current_exception());
+
+        e.addMessage(fmt::format("While sending {}", file_path));
+        if (isDistributedSendBroken(e.code(), e.isRemoteException()))
+        {
+            markAsBroken(file_path);
+            current_file.clear();
+        }
+        throw;
+    }
+    catch (...)
+    {
+        if (thread_trace_context)
+            thread_trace_context->root_span.addAttribute(std::current_exception());
+
+        throw;
+    }
+
+    auto dir_sync_guard = getDirectorySyncGuard(relative_path);
+    markAsSend(file_path);
+    current_file.clear();
+    LOG_TRACE(log, "Finished processing `{}` (took {} ms)", file_path, watch.elapsedMilliseconds());
+}
+
+struct DistributedAsyncInsertDirectoryQueue::BatchHeader
+{
+    Settings settings;
+    String query;
+    ClientInfo client_info;
+    Block header;
+
+    BatchHeader(Settings settings_, String query_, ClientInfo client_info_, Block header_)
+        : settings(std::move(settings_))
+        , query(std::move(query_))
+        , client_info(std::move(client_info_))
+        , header(std::move(header_))
+    {
+    }
+
+    bool operator==(const BatchHeader & other) const
+    {
+        return std::tie(settings, query, client_info.query_kind) ==
+               std::tie(other.settings, other.query, other.client_info.query_kind) &&
+               blocksHaveEqualStructure(header, other.header);
+    }
+
+    struct Hash
+    {
+        size_t operator()(const BatchHeader & batch_header) const
+        {
+            SipHash hash_state;
+            hash_state.update(batch_header.query.data(), batch_header.query.size());
+            batch_header.header.updateHash(hash_state);
+            return hash_state.get64();
+        }
+    };
+};
+
+bool DistributedAsyncInsertDirectoryQueue::addFileAndSchedule(const std::string & file_path, size_t file_size, size_t ms)
+{
+    /// NOTE: It is better not to throw in this case, since the file is already
+    /// on disk (see DistributedSink), and it will be processed next time.
+    if (pending_files.isFinished())
+    {
+        LOG_DEBUG(log, "File {} had not been scheduled, since the table had been detached", file_path);
+        return false;
+    }
+
+    addFile(file_path);
+
+    {
+        std::lock_guard lock(status_mutex);
+        metric_pending_files.add();
+        status.bytes_count += file_size;
+        ++status.files_count;
+    }
+
+    return task_handle->scheduleAfter(ms, false);
+}
+
+DistributedAsyncInsertDirectoryQueue::Status DistributedAsyncInsertDirectoryQueue::getStatus()
+{
+    std::lock_guard status_lock(status_mutex);
+    Status current_status{status, path, monitor_blocker.isCancelled()};
+    return current_status;
+}
+
+void DistributedAsyncInsertDirectoryQueue::processFilesWithBatching()
+{
+    /// Possibly, we failed to send a batch on the previous iteration. Try to send exactly the same batch.
+    if (fs::exists(current_batch_file_path))
+    {
+        LOG_DEBUG(log, "Restoring the batch");
+
+        DistributedAsyncInsertBatch batch(*this);
+        batch.deserialize();
+        batch.send();
+
+        auto dir_sync_guard = getDirectorySyncGuard(relative_path);
+        fs::remove(current_batch_file_path);
+    }
+
+    std::unordered_map<BatchHeader, DistributedAsyncInsertBatch, BatchHeader::Hash> header_to_batch;
+
+    std::string file_path;
+
+    try
+    {
+        while (pending_files.tryPop(file_path))
+        {
+            if (!fs::exists(file_path))
+            {
+                LOG_WARNING(log, "File {} does not exists, likely due to current_batch.txt processing", file_path);
+                continue;
+            }
+
+            size_t total_rows = 0;
+            size_t total_bytes = 0;
+            Block header;
+            DistributedAsyncInsertHeader distributed_header;
+            try
+            {
+                /// Determine metadata of the current file and check if it is not broken.
+                ReadBufferFromFile in{file_path};
+                distributed_header = DistributedAsyncInsertHeader::read(in, log);
+
+                if (distributed_header.rows)
+                {
+                    total_rows += distributed_header.rows;
+                    total_bytes += distributed_header.bytes;
+                }
+
+                if (distributed_header.block_header)
+                    header = distributed_header.block_header;
+
+                if (!total_rows || !header)
+                {
+                    LOG_DEBUG(log, "Processing batch {} with old format (no header/rows)", in.getFileName());
+
+                    CompressedReadBuffer decompressing_in(in);
+                    NativeReader block_in(decompressing_in, distributed_header.revision);
+
+                    while (Block block = block_in.read())
+                    {
+                        total_rows += block.rows();
+                        total_bytes += block.bytes();
+
+                        if (!header)
+                            header = block.cloneEmpty();
+                    }
+                }
+            }
+            catch (const Exception & e)
+            {
+                if (isDistributedSendBroken(e.code(), e.isRemoteException()))
+                {
+                    markAsBroken(file_path);
+                    tryLogCurrentException(log, "File is marked broken due to");
+                    continue;
+                }
+                else
+                    throw;
+            }
+
+            BatchHeader batch_header(
+                std::move(distributed_header.insert_settings),
+                std::move(distributed_header.insert_query),
+                std::move(distributed_header.client_info),
+                std::move(header)
+            );
+            DistributedAsyncInsertBatch & batch = header_to_batch.try_emplace(batch_header, *this).first->second;
+
+            batch.files.push_back(file_path);
+            batch.total_rows += total_rows;
+            batch.total_bytes += total_bytes;
+
+            if (batch.isEnoughSize())
+            {
+                batch.send();
+            }
+        }
+
+        for (auto & kv : header_to_batch)
+        {
+            DistributedAsyncInsertBatch & batch = kv.second;
+            batch.send();
+        }
+    }
+    catch (...)
+    {
+        /// Revert uncommitted files.
+        for (const auto & [_, batch] : header_to_batch)
+        {
+            for (const auto & file : batch.files)
+            {
+                if (!pending_files.pushFront(file))
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot re-schedule a file '{}'", file);
+            }
+        }
+        /// Rethrow exception
+        throw;
+    }
+
+    {
+        auto dir_sync_guard = getDirectorySyncGuard(relative_path);
+
+        /// current_batch.txt will not exist if there was no send
+        /// (this is the case when all batches that was pending has been marked as pending)
+        if (fs::exists(current_batch_file_path))
+            fs::remove(current_batch_file_path);
+    }
+}
+
+void DistributedAsyncInsertDirectoryQueue::markAsBroken(const std::string & file_path)
+{
+    const String & broken_file_path = fs::path(broken_path) / fs::path(file_path).filename();
+
+    auto dir_sync_guard = getDirectorySyncGuard(relative_path);
+    auto broken_dir_sync_guard = getDirectorySyncGuard(broken_relative_path);
+
+    {
+        std::lock_guard status_lock(status_mutex);
+
+        size_t file_size = fs::file_size(file_path);
+
+        --status.files_count;
+        status.bytes_count -= file_size;
+
+        ++status.broken_files_count;
+        status.broken_bytes_count += file_size;
+
+        metric_broken_files.add();
+    }
+
+    fs::rename(file_path, broken_file_path);
+    LOG_ERROR(log, "Renamed `{}` to `{}`", file_path, broken_file_path);
+}
+
+void DistributedAsyncInsertDirectoryQueue::markAsSend(const std::string & file_path)
+{
+    size_t file_size = fs::file_size(file_path);
+
+    {
+        std::lock_guard status_lock(status_mutex);
+        metric_pending_files.sub();
+        --status.files_count;
+        status.bytes_count -= file_size;
+    }
+
+    fs::remove(file_path);
+}
+
+SyncGuardPtr DistributedAsyncInsertDirectoryQueue::getDirectorySyncGuard(const std::string & dir_path)
+{
+    if (dir_fsync)
+        return disk->getDirectorySyncGuard(dir_path);
+    return nullptr;
+}
+
+std::string DistributedAsyncInsertDirectoryQueue::getLoggerName() const
+{
+    return storage.getStorageID().getFullTableName() + ".DirectoryMonitor." + disk->getName();
+}
+
+void DistributedAsyncInsertDirectoryQueue::updatePath(const std::string & new_relative_path)
+{
+    task_handle->deactivate();
+    std::lock_guard lock{mutex};
+
+    {
+        std::lock_guard status_lock(status_mutex);
+        relative_path = new_relative_path;
+        path = fs::path(disk->getPath()) / relative_path / "";
+    }
+    current_batch_file_path = path + "current_batch.txt";
+
+    task_handle->activateAndSchedule();
+}
+
+}
diff --git a/src/Storages/Distributed/DirectoryMonitor.h b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h
similarity index 63%
rename from src/Storages/Distributed/DirectoryMonitor.h
rename to src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h
index 030d6acf6e2..de8bb813824 100644
--- a/src/Storages/Distributed/DirectoryMonitor.h
+++ b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h
@@ -1,12 +1,13 @@
 #pragma once
 
 #include <Core/BackgroundSchedulePool.h>
+#include <Common/ConcurrentBoundedQueue.h>
 #include <Client/ConnectionPool.h>
-
+#include <IO/ReadBufferFromFile.h>
+#include <Disks/IDisk.h>
 #include <atomic>
 #include <mutex>
 #include <condition_variable>
-#include <IO/ReadBufferFromFile.h>
 
 
 namespace CurrentMetrics { class Increment; }
@@ -26,13 +27,28 @@ using ProcessorPtr = std::shared_ptr<IProcessor>;
 
 class ISource;
 
-/** Details of StorageDistributed.
-  * This type is not designed for standalone use.
-  */
-class StorageDistributedDirectoryMonitor
+/** Queue for async INSERT Into Distributed engine (insert_distributed_sync=0).
+ *
+ * Files are added from two places:
+ * - from filesystem at startup (StorageDistributed::startup())
+ * - on INSERT via DistributedSink
+ *
+ * Later, in background, those files will be send to the remote nodes.
+ *
+ * The behaviour of this queue can be configured via the following settings:
+ * - distributed_directory_monitor_batch_inserts
+ * - distributed_directory_monitor_split_batch_on_failure
+ * - distributed_directory_monitor_sleep_time_ms
+ * - distributed_directory_monitor_max_sleep_time_ms
+ * NOTE: It worth to rename the settings too
+ * ("directory_monitor" in settings looks too internal).
+ */
+class DistributedAsyncInsertDirectoryQueue
 {
+    friend class DistributedAsyncInsertBatch;
+
 public:
-    StorageDistributedDirectoryMonitor(
+    DistributedAsyncInsertDirectoryQueue(
         StorageDistributed & storage_,
         const DiskPtr & disk_,
         const std::string & relative_path_,
@@ -40,7 +56,7 @@ public:
         ActionBlocker & monitor_blocker_,
         BackgroundSchedulePool & bg_pool);
 
-    ~StorageDistributedDirectoryMonitor();
+    ~DistributedAsyncInsertDirectoryQueue();
 
     static ConnectionPoolPtr createPool(const std::string & name, const StorageDistributed & storage);
 
@@ -53,7 +69,7 @@ public:
     static std::shared_ptr<ISource> createSourceFromFile(const String & file_name);
 
     /// For scheduling via DistributedSink.
-    bool addAndSchedule(size_t file_size, size_t ms);
+    bool addFileAndSchedule(const std::string & file_path, size_t file_size, size_t ms);
 
     struct InternalStatus
     {
@@ -79,14 +95,18 @@ public:
 private:
     void run();
 
-    std::map<UInt64, std::string> getFiles();
-    bool processFiles(const std::map<UInt64, std::string> & files);
+    bool hasPendingFiles() const;
+
+    void addFile(const std::string & file_path);
+    void initializeFilesFromDisk();
+    void processFiles();
     void processFile(const std::string & file_path);
-    void processFilesWithBatching(const std::map<UInt64, std::string> & files);
+    void processFilesWithBatching();
 
     void markAsBroken(const std::string & file_path);
     void markAsSend(const std::string & file_path);
-    bool maybeMarkAsBroken(const std::string & file_path, const Exception & e);
+
+    SyncGuardPtr getDirectorySyncGuard(const std::string & path);
 
     std::string getLoggerName() const;
 
@@ -96,25 +116,33 @@ private:
     DiskPtr disk;
     std::string relative_path;
     std::string path;
+    std::string broken_relative_path;
+    std::string broken_path;
 
     const bool should_batch_inserts = false;
     const bool split_batch_on_failure = true;
     const bool dir_fsync = false;
     const size_t min_batched_block_size_rows = 0;
     const size_t min_batched_block_size_bytes = 0;
-    String current_batch_file_path;
+
+    /// This is pending data (due to some error) for should_batch_inserts==true
+    std::string current_batch_file_path;
+    /// This is pending data (due to some error) for should_batch_inserts==false
+    std::string current_file;
 
     struct BatchHeader;
     struct Batch;
 
     std::mutex status_mutex;
+
     InternalStatus status;
 
+    ConcurrentBoundedQueue<std::string> pending_files;
+
     const std::chrono::milliseconds default_sleep_time;
     std::chrono::milliseconds sleep_time;
     const std::chrono::milliseconds max_sleep_time;
     std::chrono::time_point<std::chrono::system_clock> last_decrease_time {std::chrono::system_clock::now()};
-    std::atomic<bool> quit {false};
     std::mutex mutex;
     Poco::Logger * log;
     ActionBlocker & monitor_blocker;
diff --git a/src/Storages/Distributed/DistributedAsyncInsertHeader.cpp b/src/Storages/Distributed/DistributedAsyncInsertHeader.cpp
new file mode 100644
index 00000000000..018c1d863bb
--- /dev/null
+++ b/src/Storages/Distributed/DistributedAsyncInsertHeader.cpp
@@ -0,0 +1,125 @@
+#include <Storages/Distributed/DistributedAsyncInsertHeader.h>
+#include <Storages/Distributed/Defines.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <Formats/NativeReader.h>
+#include <Core/ProtocolDefines.h>
+#include <Common/OpenTelemetryTraceContext.h>
+#include <Common/logger_useful.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_READ_ALL_DATA;
+    extern const int CHECKSUM_DOESNT_MATCH;
+}
+
+DistributedAsyncInsertHeader DistributedAsyncInsertHeader::read(ReadBufferFromFile & in, Poco::Logger * log)
+{
+    DistributedAsyncInsertHeader distributed_header;
+
+    UInt64 query_size;
+    readVarUInt(query_size, in);
+
+    if (query_size == DBMS_DISTRIBUTED_SIGNATURE_HEADER)
+    {
+        /// Read the header as a string.
+        String header_data;
+        readStringBinary(header_data, in);
+
+        /// Check the checksum of the header.
+        CityHash_v1_0_2::uint128 expected_checksum;
+        readPODBinary(expected_checksum, in);
+        CityHash_v1_0_2::uint128 calculated_checksum =
+            CityHash_v1_0_2::CityHash128(header_data.data(), header_data.size());
+        if (expected_checksum != calculated_checksum)
+        {
+            throw Exception(ErrorCodes::CHECKSUM_DOESNT_MATCH,
+                            "Checksum of extra info doesn't match: corrupted data. Reference: {}{}. Actual: {}{}.",
+                            getHexUIntLowercase(expected_checksum.first), getHexUIntLowercase(expected_checksum.second),
+                            getHexUIntLowercase(calculated_checksum.first), getHexUIntLowercase(calculated_checksum.second));
+        }
+
+        /// Read the parts of the header.
+        ReadBufferFromString header_buf(header_data);
+
+        readVarUInt(distributed_header.revision, header_buf);
+        if (DBMS_TCP_PROTOCOL_VERSION < distributed_header.revision)
+        {
+            LOG_WARNING(log, "ClickHouse shard version is older than ClickHouse initiator version. It may lack support for new features.");
+        }
+
+        readStringBinary(distributed_header.insert_query, header_buf);
+        distributed_header.insert_settings.read(header_buf);
+
+        if (header_buf.hasPendingData())
+            distributed_header.client_info.read(header_buf, distributed_header.revision);
+
+        if (header_buf.hasPendingData())
+        {
+            readVarUInt(distributed_header.rows, header_buf);
+            readVarUInt(distributed_header.bytes, header_buf);
+            readStringBinary(distributed_header.block_header_string, header_buf);
+        }
+
+        if (header_buf.hasPendingData())
+        {
+            NativeReader header_block_in(header_buf, distributed_header.revision);
+            distributed_header.block_header = header_block_in.read();
+            if (!distributed_header.block_header)
+                throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA,
+                    "Cannot read header from the {} batch. Data was written with protocol version {}, current version: {}",
+                        in.getFileName(), distributed_header.revision, DBMS_TCP_PROTOCOL_VERSION);
+        }
+
+        if (header_buf.hasPendingData())
+        {
+            readVarUInt(distributed_header.shard_num, header_buf);
+            readStringBinary(distributed_header.cluster, header_buf);
+            readStringBinary(distributed_header.distributed_table, header_buf);
+            readStringBinary(distributed_header.remote_table, header_buf);
+        }
+
+        /// Add handling new data here, for example:
+        ///
+        /// if (header_buf.hasPendingData())
+        ///     readVarUInt(my_new_data, header_buf);
+        ///
+        /// And note that it is safe, because we have checksum and size for header.
+
+        return distributed_header;
+    }
+
+    if (query_size == DBMS_DISTRIBUTED_SIGNATURE_HEADER_OLD_FORMAT)
+    {
+        distributed_header.insert_settings.read(in, SettingsWriteFormat::BINARY);
+        readStringBinary(distributed_header.insert_query, in);
+        return distributed_header;
+    }
+
+    distributed_header.insert_query.resize(query_size);
+    in.readStrict(distributed_header.insert_query.data(), query_size);
+
+    return distributed_header;
+}
+
+OpenTelemetry::TracingContextHolderPtr DistributedAsyncInsertHeader::createTracingContextHolder(const char * function, std::shared_ptr<OpenTelemetrySpanLog> open_telemetry_span_log) const
+{
+    OpenTelemetry::TracingContextHolderPtr trace_context = std::make_unique<OpenTelemetry::TracingContextHolder>(
+        function,
+        client_info.client_trace_context,
+        std::move(open_telemetry_span_log));
+    trace_context->root_span.addAttribute("clickhouse.shard_num", shard_num);
+    trace_context->root_span.addAttribute("clickhouse.cluster", cluster);
+    trace_context->root_span.addAttribute("clickhouse.distributed", distributed_table);
+    trace_context->root_span.addAttribute("clickhouse.remote", remote_table);
+    trace_context->root_span.addAttribute("clickhouse.rows", rows);
+    trace_context->root_span.addAttribute("clickhouse.bytes", bytes);
+    return trace_context;
+}
+
+}
diff --git a/src/Storages/Distributed/DistributedAsyncInsertHeader.h b/src/Storages/Distributed/DistributedAsyncInsertHeader.h
new file mode 100644
index 00000000000..a7330fa5ef1
--- /dev/null
+++ b/src/Storages/Distributed/DistributedAsyncInsertHeader.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include <Core/Settings.h>
+#include <Core/Block.h>
+#include <Interpreters/ClientInfo.h>
+#include <base/types.h>
+#include <string>
+
+namespace DB
+{
+
+class ReadBufferFromFile;
+
+namespace OpenTelemetry
+{
+struct TracingContextHolder;
+using TracingContextHolderPtr = std::unique_ptr<TracingContextHolder>;
+}
+
+/// Header for the binary files that are stored on disk for async INSERT into Distributed.
+struct DistributedAsyncInsertHeader
+{
+    UInt64 revision = 0;
+    Settings insert_settings;
+    std::string insert_query;
+    ClientInfo client_info;
+
+    /// .bin file cannot have zero rows/bytes.
+    size_t rows = 0;
+    size_t bytes = 0;
+
+    UInt32 shard_num = 0;
+    std::string cluster;
+    std::string distributed_table;
+    std::string remote_table;
+
+    /// dumpStructure() of the header -- obsolete
+    std::string block_header_string;
+    Block block_header;
+
+    static DistributedAsyncInsertHeader read(ReadBufferFromFile & in, Poco::Logger * log);
+    OpenTelemetry::TracingContextHolderPtr createTracingContextHolder(const char * function, std::shared_ptr<OpenTelemetrySpanLog> open_telemetry_span_log) const;
+};
+
+}
diff --git a/src/Storages/Distributed/DistributedAsyncInsertHelpers.cpp b/src/Storages/Distributed/DistributedAsyncInsertHelpers.cpp
new file mode 100644
index 00000000000..98073ba1e08
--- /dev/null
+++ b/src/Storages/Distributed/DistributedAsyncInsertHelpers.cpp
@@ -0,0 +1,124 @@
+#include <Storages/Distributed/DistributedAsyncInsertHelpers.h>
+#include <Storages/Distributed/DistributedAsyncInsertHeader.h>
+#include <Interpreters/ActionsDAG.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Compression/CompressedReadBuffer.h>
+#include <Compression/CheckingCompressedReadBuffer.h>
+#include <IO/ReadBufferFromFile.h>
+#include <QueryPipeline/RemoteInserter.h>
+#include <Formats/NativeReader.h>
+#include <Common/logger_useful.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_READ_ALL_DATA;
+    extern const int UNKNOWN_CODEC;
+    extern const int CANNOT_DECOMPRESS;
+    extern const int CHECKSUM_DOESNT_MATCH;
+    extern const int TOO_LARGE_SIZE_COMPRESSED;
+    extern const int ATTEMPT_TO_READ_AFTER_EOF;
+    extern const int EMPTY_DATA_PASSED;
+    extern const int DISTRIBUTED_BROKEN_BATCH_INFO;
+    extern const int DISTRIBUTED_BROKEN_BATCH_FILES;
+}
+
+/// 'remote_error' argument is used to decide whether some errors should be
+/// ignored or not, in particular:
+///
+/// - ATTEMPT_TO_READ_AFTER_EOF should not be ignored
+///   if we receive it from remote (receiver), since:
+///   - the sender will got ATTEMPT_TO_READ_AFTER_EOF when the client just go away,
+///     i.e. server had been restarted
+///   - since #18853 the file will be checked on the sender locally, and
+///     if there is something wrong with the file itself, we will receive
+///     ATTEMPT_TO_READ_AFTER_EOF not from the remote at first
+///     and mark batch as broken.
+bool isDistributedSendBroken(int code, bool remote_error)
+{
+    return code == ErrorCodes::CHECKSUM_DOESNT_MATCH
+        || code == ErrorCodes::EMPTY_DATA_PASSED
+        || code == ErrorCodes::TOO_LARGE_SIZE_COMPRESSED
+        || code == ErrorCodes::CANNOT_READ_ALL_DATA
+        || code == ErrorCodes::UNKNOWN_CODEC
+        || code == ErrorCodes::CANNOT_DECOMPRESS
+        || code == ErrorCodes::DISTRIBUTED_BROKEN_BATCH_INFO
+        || code == ErrorCodes::DISTRIBUTED_BROKEN_BATCH_FILES
+        || (!remote_error && code == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF);
+}
+
+void writeAndConvert(RemoteInserter & remote, const DistributedAsyncInsertHeader & distributed_header, ReadBufferFromFile & in)
+{
+    CompressedReadBuffer decompressing_in(in);
+    NativeReader block_in(decompressing_in, distributed_header.revision);
+
+    while (Block block = block_in.read())
+    {
+        auto converting_dag = ActionsDAG::makeConvertingActions(
+            block.cloneEmpty().getColumnsWithTypeAndName(),
+            remote.getHeader().getColumnsWithTypeAndName(),
+            ActionsDAG::MatchColumnsMode::Name);
+
+        auto converting_actions = std::make_shared<ExpressionActions>(std::move(converting_dag));
+        converting_actions->execute(block);
+        remote.write(block);
+    }
+}
+
+void writeRemoteConvert(
+    const DistributedAsyncInsertHeader & distributed_header,
+    RemoteInserter & remote,
+    bool compression_expected,
+    ReadBufferFromFile & in,
+    Poco::Logger * log)
+{
+    if (!remote.getHeader())
+    {
+        CheckingCompressedReadBuffer checking_in(in);
+        remote.writePrepared(checking_in);
+        return;
+    }
+
+    /// This is old format, that does not have header for the block in the file header,
+    /// applying ConvertingTransform in this case is not a big overhead.
+    ///
+    /// Anyway we can get header only from the first block, which contain all rows anyway.
+    if (!distributed_header.block_header)
+    {
+        LOG_TRACE(log, "Processing batch {} with old format (no header)", in.getFileName());
+
+        writeAndConvert(remote, distributed_header, in);
+        return;
+    }
+
+    if (!blocksHaveEqualStructure(distributed_header.block_header, remote.getHeader()))
+    {
+        LOG_WARNING(log,
+            "Structure does not match (remote: {}, local: {}), implicit conversion will be done",
+            remote.getHeader().dumpStructure(), distributed_header.block_header.dumpStructure());
+
+        writeAndConvert(remote, distributed_header, in);
+        return;
+    }
+
+    /// If connection does not use compression, we have to uncompress the data.
+    if (!compression_expected)
+    {
+        writeAndConvert(remote, distributed_header, in);
+        return;
+    }
+
+    if (distributed_header.revision != remote.getServerRevision())
+    {
+        writeAndConvert(remote, distributed_header, in);
+        return;
+    }
+
+    /// Otherwise write data as it was already prepared (more efficient path).
+    CheckingCompressedReadBuffer checking_in(in);
+    remote.writePrepared(checking_in);
+}
+
+}
diff --git a/src/Storages/Distributed/DistributedAsyncInsertHelpers.h b/src/Storages/Distributed/DistributedAsyncInsertHelpers.h
new file mode 100644
index 00000000000..9543450418c
--- /dev/null
+++ b/src/Storages/Distributed/DistributedAsyncInsertHelpers.h
@@ -0,0 +1,35 @@
+#pragma once
+
+namespace Poco
+{
+class Logger;
+}
+
+namespace DB
+{
+
+struct DistributedAsyncInsertHeader;
+class ReadBufferFromFile;
+class RemoteInserter;
+
+/// 'remote_error' argument is used to decide whether some errors should be
+/// ignored or not, in particular:
+///
+/// - ATTEMPT_TO_READ_AFTER_EOF should not be ignored
+///   if we receive it from remote (receiver), since:
+///   - the sender will got ATTEMPT_TO_READ_AFTER_EOF when the client just go away,
+///     i.e. server had been restarted
+///   - since #18853 the file will be checked on the sender locally, and
+///     if there is something wrong with the file itself, we will receive
+///     ATTEMPT_TO_READ_AFTER_EOF not from the remote at first
+///     and mark batch as broken.
+bool isDistributedSendBroken(int code, bool remote_error);
+
+void writeRemoteConvert(
+    const DistributedAsyncInsertHeader & distributed_header,
+    RemoteInserter & remote,
+    bool compression_expected,
+    ReadBufferFromFile & in,
+    Poco::Logger * log);
+
+}
diff --git a/src/Storages/Distributed/DistributedAsyncInsertSource.cpp b/src/Storages/Distributed/DistributedAsyncInsertSource.cpp
new file mode 100644
index 00000000000..7992636ac11
--- /dev/null
+++ b/src/Storages/Distributed/DistributedAsyncInsertSource.cpp
@@ -0,0 +1,62 @@
+#include <Storages/Distributed/DistributedAsyncInsertSource.h>
+#include <Storages/Distributed/DistributedAsyncInsertHeader.h>
+#include <IO/ReadBufferFromFile.h>
+#include <Compression/CompressedReadBuffer.h>
+#include <Formats/NativeReader.h>
+#include <Poco/Logger.h>
+
+namespace DB
+{
+
+struct DistributedAsyncInsertSource::Data
+{
+    Poco::Logger * log = nullptr;
+
+    ReadBufferFromFile in;
+    CompressedReadBuffer decompressing_in;
+    NativeReader block_in;
+
+    Block first_block;
+
+    explicit Data(const String & file_name)
+        : log(&Poco::Logger::get("DistributedAsyncInsertSource"))
+        , in(file_name)
+        , decompressing_in(in)
+        , block_in(decompressing_in, DistributedAsyncInsertHeader::read(in, log).revision)
+        , first_block(block_in.read())
+    {
+    }
+};
+
+DistributedAsyncInsertSource::DistributedAsyncInsertSource(const String & file_name)
+    : DistributedAsyncInsertSource(std::make_unique<Data>(file_name))
+{
+}
+
+DistributedAsyncInsertSource::DistributedAsyncInsertSource(std::unique_ptr<Data> data_)
+    : ISource(data_->first_block.cloneEmpty())
+    , data(std::move(data_))
+{
+}
+
+DistributedAsyncInsertSource::~DistributedAsyncInsertSource() = default;
+
+Chunk DistributedAsyncInsertSource::generate()
+{
+    if (data->first_block)
+    {
+        size_t num_rows = data->first_block.rows();
+        Chunk res(data->first_block.getColumns(), num_rows);
+        data->first_block.clear();
+        return res;
+    }
+
+    auto block = data->block_in.read();
+    if (!block)
+        return {};
+
+    size_t num_rows = block.rows();
+    return Chunk(block.getColumns(), num_rows);
+}
+
+}
diff --git a/src/Storages/Distributed/DistributedAsyncInsertSource.h b/src/Storages/Distributed/DistributedAsyncInsertSource.h
new file mode 100644
index 00000000000..35f846151dc
--- /dev/null
+++ b/src/Storages/Distributed/DistributedAsyncInsertSource.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Processors/ISource.h>
+#include <base/types.h>
+#include <memory>
+
+namespace DB
+{
+
+/// Source for the Distributed engine on-disk file for async INSERT.
+class DistributedAsyncInsertSource : public ISource
+{
+    struct Data;
+    explicit DistributedAsyncInsertSource(std::unique_ptr<Data> data);
+
+public:
+    explicit DistributedAsyncInsertSource(const String & file_name);
+    ~DistributedAsyncInsertSource() override;
+    String getName() const override { return "DistributedAsyncInsertSource"; }
+
+protected:
+    Chunk generate() override;
+
+private:
+    std::unique_ptr<Data> data;
+};
+
+}
diff --git a/src/Storages/Distributed/DistributedSink.cpp b/src/Storages/Distributed/DistributedSink.cpp
index bac13ea37cf..720a951299a 100644
--- a/src/Storages/Distributed/DistributedSink.cpp
+++ b/src/Storages/Distributed/DistributedSink.cpp
@@ -1,5 +1,5 @@
 #include <Storages/Distributed/DistributedSink.h>
-#include <Storages/Distributed/DirectoryMonitor.h>
+#include <Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h>
 #include <Storages/Distributed/Defines.h>
 #include <Storages/StorageDistributed.h>
 #include <Disks/StoragePolicy.h>
@@ -41,6 +41,8 @@
 namespace CurrentMetrics
 {
     extern const Metric DistributedSend;
+    extern const Metric DistributedInsertThreads;
+    extern const Metric DistributedInsertThreadsActive;
 }
 
 namespace ProfileEvents
@@ -58,6 +60,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int TIMEOUT_EXCEEDED;
     extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
+    extern const int ABORTED;
 }
 
 static Block adoptBlock(const Block & header, const Block & block, Poco::Logger * log)
@@ -210,6 +213,10 @@ std::string DistributedSink::getCurrentStateDescription()
 }
 
 
+DistributedSink::JobReplica::JobReplica(size_t shard_index_, size_t replica_index_, bool is_local_job_, const Block & sample_block)
+    : shard_index(shard_index_), replica_index(replica_index_), is_local_job(is_local_job_), current_shard_block(sample_block.cloneEmpty()) {}
+
+
 void DistributedSink::initWritingJobs(const Block & first_block, size_t start, size_t end)
 {
     const Settings & settings = context->getSettingsRef();
@@ -291,14 +298,18 @@ DistributedSink::runWritingJob(JobReplica & job, const Block & current_block, si
     auto thread_group = CurrentThread::getGroup();
     return [this, thread_group, &job, &current_block, num_shards]()
     {
+        /// Avoid Logical error: 'Pipeline for PushingPipelineExecutor was finished before all data was inserted' (whatever it means)
+        if (isCancelled())
+            throw Exception(ErrorCodes::ABORTED, "Writing job was cancelled");
+
         SCOPE_EXIT_SAFE(
             if (thread_group)
-                CurrentThread::detachQueryIfNotDetached();
+                CurrentThread::detachFromGroupIfNotDetached();
         );
         OpenTelemetry::SpanHolder span(__PRETTY_FUNCTION__);
 
         if (thread_group)
-            CurrentThread::attachToIfDetached(thread_group);
+            CurrentThread::attachToGroupIfDetached(thread_group);
         setThreadName("DistrOutStrProc");
 
         ++job.blocks_started;
@@ -340,9 +351,9 @@ DistributedSink::runWritingJob(JobReplica & job, const Block & current_block, si
         size_t rows = shard_block.rows();
 
         span.addAttribute("clickhouse.shard_num", shard_info.shard_num);
-        span.addAttribute("clickhouse.cluster", this->storage.cluster_name);
-        span.addAttribute("clickhouse.distributed", this->storage.getStorageID().getFullNameNotQuoted());
-        span.addAttribute("clickhouse.remote", [this]() { return storage.remote_database + "." + storage.remote_table; });
+        span.addAttribute("clickhouse.cluster", storage.cluster_name);
+        span.addAttribute("clickhouse.distributed", storage.getStorageID().getFullNameNotQuoted());
+        span.addAttribute("clickhouse.remote", [this]() { return storage.getRemoteDatabaseName() + "." + storage.getRemoteTableName(); });
         span.addAttribute("clickhouse.rows", rows);
         span.addAttribute("clickhouse.bytes", [&shard_block]() { return toString(shard_block.bytes()); });
 
@@ -451,9 +462,10 @@ void DistributedSink::writeSync(const Block & block)
 
         size_t jobs_count = random_shard_insert ? 1 : (remote_jobs_count + local_jobs_count);
         size_t max_threads = std::min<size_t>(settings.max_distributed_connections, jobs_count);
-        pool.emplace(/* max_threads_= */ max_threads,
-                     /* max_free_threads_= */ max_threads,
-                     /* queue_size_= */ jobs_count);
+        pool.emplace(
+            CurrentMetrics::DistributedInsertThreads,
+            CurrentMetrics::DistributedInsertThreadsActive,
+            max_threads, max_threads, jobs_count);
 
         if (!throttler && (settings.max_network_bandwidth || settings.max_network_bytes))
         {
@@ -476,7 +488,7 @@ void DistributedSink::writeSync(const Block & block)
 
     span.addAttribute("clickhouse.start_shard", start);
     span.addAttribute("clickhouse.end_shard", end);
-    span.addAttribute("db.statement", this->query_string);
+    span.addAttribute("db.statement", query_string);
 
     if (num_shards > 1)
     {
@@ -569,6 +581,26 @@ void DistributedSink::onFinish()
     }
 }
 
+void DistributedSink::onCancel()
+{
+    if (pool && !pool->finished())
+    {
+        try
+        {
+            pool->wait();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(storage.log);
+        }
+    }
+
+    for (auto & shard_jobs : per_shard_jobs)
+        for (JobReplica & job : shard_jobs.replicas_jobs)
+            if (job.executor)
+                job.executor->cancel();
+}
+
 
 IColumn::Selector DistributedSink::createSelector(const Block & source_block) const
 {
@@ -659,9 +691,9 @@ void DistributedSink::writeToLocal(const Cluster::ShardInfo & shard_info, const
 {
     OpenTelemetry::SpanHolder span(__PRETTY_FUNCTION__);
     span.addAttribute("clickhouse.shard_num", shard_info.shard_num);
-    span.addAttribute("clickhouse.cluster", this->storage.cluster_name);
-    span.addAttribute("clickhouse.distributed", this->storage.getStorageID().getFullNameNotQuoted());
-    span.addAttribute("clickhouse.remote", [this]() { return storage.remote_database + "." + storage.remote_table; });
+    span.addAttribute("clickhouse.cluster", storage.cluster_name);
+    span.addAttribute("clickhouse.distributed", storage.getStorageID().getFullNameNotQuoted());
+    span.addAttribute("clickhouse.remote", [this]() { return storage.getRemoteDatabaseName() + "." + storage.getRemoteTableName(); });
     span.addAttribute("clickhouse.rows", [&block]() { return toString(block.rows()); });
     span.addAttribute("clickhouse.bytes", [&block]() { return toString(block.bytes()); });
 
@@ -705,7 +737,7 @@ void DistributedSink::writeToShard(const Cluster::ShardInfo & shard_info, const
     CompressionCodecPtr compression_codec = CompressionCodecFactory::instance().get(compression_method, compression_level);
 
     /// tmp directory is used to ensure atomicity of transactions
-    /// and keep monitor thread out from reading incomplete data
+    /// and keep directory queue thread out from reading incomplete data
     std::string first_file_tmp_path;
 
     auto reservation = storage.getStoragePolicy()->reserveAndCheck(block.bytes());
@@ -724,6 +756,9 @@ void DistributedSink::writeToShard(const Cluster::ShardInfo & shard_info, const
         return guard;
     };
 
+    auto sleep_ms = context->getSettingsRef().distributed_directory_monitor_sleep_time_ms.totalMilliseconds();
+    size_t file_size;
+
     auto it = dir_names.begin();
     /// on first iteration write block to a temporary directory for subsequent
     /// hardlinking to ensure the inode is not freed until we're done
@@ -779,9 +814,9 @@ void DistributedSink::writeToShard(const Cluster::ShardInfo & shard_info, const
             }
 
             writeVarUInt(shard_info.shard_num, header_buf);
-            writeStringBinary(this->storage.cluster_name, header_buf);
-            writeStringBinary(this->storage.getStorageID().getFullNameNotQuoted(), header_buf);
-            writeStringBinary(this->storage.remote_database + "." + this->storage.remote_table, header_buf);
+            writeStringBinary(storage.cluster_name, header_buf);
+            writeStringBinary(storage.getStorageID().getFullNameNotQuoted(), header_buf);
+            writeStringBinary(storage.getRemoteDatabaseName() + "." + storage.getRemoteTableName(), header_buf);
 
             /// Add new fields here, for example:
             /// writeVarUInt(my_new_data, header_buf);
@@ -801,10 +836,16 @@ void DistributedSink::writeToShard(const Cluster::ShardInfo & shard_info, const
                 out.sync();
         }
 
+        file_size = fs::file_size(first_file_tmp_path);
+
         // Create hardlink here to reuse increment number
-        const std::string block_file_path(fs::path(path) / file_name);
-        createHardLink(first_file_tmp_path, block_file_path);
-        auto dir_sync_guard = make_directory_sync_guard(*it);
+        auto bin_file = (fs::path(path) / file_name).string();
+        auto & directory_queue = storage.getDirectoryQueue(disk, *it);
+        {
+            createHardLink(first_file_tmp_path, bin_file);
+            auto dir_sync_guard = make_directory_sync_guard(*it);
+        }
+        directory_queue.addFileAndSchedule(bin_file, file_size, sleep_ms);
     }
     ++it;
 
@@ -814,23 +855,18 @@ void DistributedSink::writeToShard(const Cluster::ShardInfo & shard_info, const
         const std::string path(fs::path(disk_path) / (data_path + *it));
         fs::create_directory(path);
 
-        const std::string block_file_path(fs::path(path) / (toString(storage.file_names_increment.get()) + ".bin"));
-        createHardLink(first_file_tmp_path, block_file_path);
-        auto dir_sync_guard = make_directory_sync_guard(*it);
+        auto bin_file = (fs::path(path) / (toString(storage.file_names_increment.get()) + ".bin")).string();
+        auto & directory_queue = storage.getDirectoryQueue(disk, *it);
+        {
+            createHardLink(first_file_tmp_path, bin_file);
+            auto dir_sync_guard = make_directory_sync_guard(*it);
+        }
+        directory_queue.addFileAndSchedule(bin_file, file_size, sleep_ms);
     }
 
-    auto file_size = fs::file_size(first_file_tmp_path);
     /// remove the temporary file, enabling the OS to reclaim inode after all threads
     /// have removed their corresponding files
     fs::remove(first_file_tmp_path);
-
-    /// Notify
-    auto sleep_ms = context->getSettingsRef().distributed_directory_monitor_sleep_time_ms;
-    for (const auto & dir_name : dir_names)
-    {
-        auto & directory_monitor = storage.requireDirectoryMonitor(disk, dir_name);
-        directory_monitor.addAndSchedule(file_size, sleep_ms.totalMilliseconds());
-    }
 }
 
 }
diff --git a/src/Storages/Distributed/DistributedSink.h b/src/Storages/Distributed/DistributedSink.h
index af0c64cbd78..1bb4419e1a5 100644
--- a/src/Storages/Distributed/DistributedSink.h
+++ b/src/Storages/Distributed/DistributedSink.h
@@ -54,6 +54,8 @@ public:
     void onFinish() override;
 
 private:
+    void onCancel() override;
+
     IColumn::Selector createSelector(const Block & source_block) const;
 
     void writeAsync(const Block & block);
@@ -116,8 +118,7 @@ private:
     struct JobReplica
     {
         JobReplica() = default;
-        JobReplica(size_t shard_index_, size_t replica_index_, bool is_local_job_, const Block & sample_block)
-            : shard_index(shard_index_), replica_index(replica_index_), is_local_job(is_local_job_), current_shard_block(sample_block.cloneEmpty()) {}
+        JobReplica(size_t shard_index_, size_t replica_index_, bool is_local_job_, const Block & sample_block);
 
         size_t shard_index = 0;
         size_t replica_index = 0;
diff --git a/src/Storages/ExternalDataSourceConfiguration.cpp b/src/Storages/ExternalDataSourceConfiguration.cpp
index d7c3fe44f38..e503c5edaab 100644
--- a/src/Storages/ExternalDataSourceConfiguration.cpp
+++ b/src/Storages/ExternalDataSourceConfiguration.cpp
@@ -9,20 +9,6 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <IO/WriteBufferFromString.h>
 
-#if USE_AMQPCPP
-#include <Storages/RabbitMQ/RabbitMQSettings.h>
-#endif
-#if USE_RDKAFKA
-#include <Storages/Kafka/KafkaSettings.h>
-#endif
-#if USE_MYSQL
-#include <Storages/MySQL/MySQLSettings.h>
-#include <Databases/MySQL/ConnectionMySQLSettings.h>
-#endif
-#if USE_NATSIO
-#include <Storages/NATS/NATSSettings.h>
-#endif
-
 #include <re2/re2.h>
 
 namespace DB
@@ -94,116 +80,6 @@ void ExternalDataSourceConfiguration::set(const ExternalDataSourceConfiguration
 }
 
 
-template <typename T>
-std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
-    const ASTs & args, ContextPtr context, bool is_database_engine, bool throw_on_no_collection, const BaseSettings<T> & storage_settings)
-{
-    if (args.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "External data source must have arguments");
-
-    ExternalDataSourceConfiguration configuration;
-    StorageSpecificArgs non_common_args;
-
-    if (const auto * collection = typeid_cast<const ASTIdentifier *>(args[0].get()))
-    {
-        const auto & config = context->getConfigRef();
-        const auto & collection_prefix = fmt::format("named_collections.{}", collection->name());
-
-        if (!config.has(collection_prefix))
-        {
-            /// For table function remote we do not throw on no collection, because then we consider first arg
-            /// as cluster definition from config.
-            if (!throw_on_no_collection)
-                return std::nullopt;
-
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", collection->name());
-        }
-
-        SettingsChanges config_settings = getSettingsChangesFromConfig(storage_settings, config, collection_prefix);
-
-        configuration.host = config.getString(collection_prefix + ".host", "");
-        configuration.port = config.getInt(collection_prefix + ".port", 0);
-        configuration.username = config.getString(collection_prefix + ".user", "");
-        configuration.password = config.getString(collection_prefix + ".password", "");
-        configuration.quota_key = config.getString(collection_prefix + ".quota_key", "");
-        configuration.database = config.getString(collection_prefix + ".database", "");
-        configuration.table = config.getString(collection_prefix + ".table", config.getString(collection_prefix + ".collection", ""));
-        configuration.schema = config.getString(collection_prefix + ".schema", "");
-        configuration.addresses_expr = config.getString(collection_prefix + ".addresses_expr", "");
-
-        if (!configuration.addresses_expr.empty() && !configuration.host.empty())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot have `addresses_expr` and `host`, `port` in configuration at the same time");
-
-        if ((args.size() == 1) && ((configuration.addresses_expr.empty() && (configuration.host.empty() || configuration.port == 0))
-            || configuration.database.empty() || (configuration.table.empty() && !is_database_engine)))
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                            "Named collection of connection parameters is missing some "
-                            "of the parameters and no key-value arguments are added");
-        }
-
-        /// Check key-value arguments.
-        for (size_t i = 1; i < args.size(); ++i)
-        {
-            if (const auto * ast_function = typeid_cast<const ASTFunction *>(args[i].get()))
-            {
-                const auto * args_expr = assert_cast<const ASTExpressionList *>(ast_function->arguments.get());
-                auto function_args = args_expr->children;
-                if (function_args.size() != 2)
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
-
-                auto arg_name = function_args[0]->as<ASTIdentifier>()->name();
-                if (function_args[1]->as<ASTFunction>())
-                {
-                    non_common_args.emplace_back(std::make_pair(arg_name, function_args[1]));
-                    continue;
-                }
-
-                auto arg_value_ast = evaluateConstantExpressionOrIdentifierAsLiteral(function_args[1], context);
-                auto * arg_value_literal = arg_value_ast->as<ASTLiteral>();
-                if (arg_value_literal)
-                {
-                    auto arg_value = arg_value_literal->value;
-
-                    if (arg_name == "host")
-                        configuration.host = arg_value.safeGet<String>();
-                    else if (arg_name == "port")
-                        configuration.port = arg_value.safeGet<UInt64>();
-                    else if (arg_name == "user")
-                        configuration.username = arg_value.safeGet<String>();
-                    else if (arg_name == "password")
-                        configuration.password = arg_value.safeGet<String>();
-                    else if (arg_name == "quota_key")
-                        configuration.quota_key = arg_value.safeGet<String>();
-                    else if (arg_name == "database")
-                        configuration.database = arg_value.safeGet<String>();
-                    else if (arg_name == "table")
-                        configuration.table = arg_value.safeGet<String>();
-                    else if (arg_name == "schema")
-                        configuration.schema = arg_value.safeGet<String>();
-                    else if (arg_name == "addresses_expr")
-                        configuration.addresses_expr = arg_value.safeGet<String>();
-                    else if (storage_settings.has(arg_name))
-                        config_settings.emplace_back(arg_name, arg_value);
-                    else
-                        non_common_args.emplace_back(std::make_pair(arg_name, arg_value_ast));
-                }
-                else
-                {
-                    non_common_args.emplace_back(std::make_pair(arg_name, arg_value_ast));
-                }
-            }
-            else
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
-            }
-        }
-
-        return ExternalDataSourceInfo{ .configuration = configuration, .specific_args = non_common_args, .settings_changes = config_settings };
-    }
-    return std::nullopt;
-}
-
 static void validateConfigKeys(
     const Poco::Util::AbstractConfiguration & dict_config, const String & config_prefix, HasConfigKeyFunc has_config_key_func)
 {
@@ -402,68 +278,6 @@ void URLBasedDataSourceConfiguration::set(const URLBasedDataSourceConfiguration
     headers = conf.headers;
 }
 
-template<typename T>
-bool getExternalDataSourceConfiguration(const ASTs & args, BaseSettings<T> & settings, ContextPtr context)
-{
-    if (args.empty())
-        return false;
-
-    if (const auto * collection = typeid_cast<const ASTIdentifier *>(args[0].get()))
-    {
-        const auto & config = context->getConfigRef();
-        const auto & config_prefix = fmt::format("named_collections.{}", collection->name());
-
-        if (!config.has(config_prefix))
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", collection->name());
-
-        auto config_settings = getSettingsChangesFromConfig(settings, config, config_prefix);
-
-        /// Check key-value arguments.
-        for (size_t i = 1; i < args.size(); ++i)
-        {
-            if (const auto * ast_function = typeid_cast<const ASTFunction *>(args[i].get()))
-            {
-                const auto * args_expr = assert_cast<const ASTExpressionList *>(ast_function->arguments.get());
-                auto function_args = args_expr->children;
-                if (function_args.size() != 2)
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
-
-                auto arg_name = function_args[0]->as<ASTIdentifier>()->name();
-                auto arg_value_ast = evaluateConstantExpressionOrIdentifierAsLiteral(function_args[1], context);
-                auto arg_value = arg_value_ast->as<ASTLiteral>()->value;
-                config_settings.emplace_back(arg_name, arg_value);
-            }
-            else
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
-            }
-        }
-
-        settings.applyChanges(config_settings);
-        return true;
-    }
-    return false;
-}
-
-#if USE_AMQPCPP
-template
-bool getExternalDataSourceConfiguration(const ASTs & args, BaseSettings<RabbitMQSettingsTraits> & settings, ContextPtr context);
-#endif
-
-#if USE_RDKAFKA
-template
-bool getExternalDataSourceConfiguration(const ASTs & args, BaseSettings<KafkaSettingsTraits> & settings, ContextPtr context);
-#endif
-
-#if USE_NATSIO
-template
-bool getExternalDataSourceConfiguration(const ASTs & args, BaseSettings<NATSSettingsTraits> & settings, ContextPtr context);
-#endif
-
-template
-std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
-    const ASTs & args, ContextPtr context, bool is_database_engine, bool throw_on_no_collection, const BaseSettings<EmptySettingsTraits> & storage_settings);
-
 template
 std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
     const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix,
@@ -473,23 +287,4 @@ template
 SettingsChanges getSettingsChangesFromConfig(
     const BaseSettings<EmptySettingsTraits> & settings, const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
 
-#if USE_MYSQL
-template
-std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
-    const ASTs & args, ContextPtr context, bool is_database_engine, bool throw_on_no_collection, const BaseSettings<MySQLSettingsTraits> & storage_settings);
-
-template
-std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
-    const ASTs & args, ContextPtr context, bool is_database_engine, bool throw_on_no_collection, const BaseSettings<ConnectionMySQLSettingsTraits> & storage_settings);
-
-template
-std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
-    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix,
-    ContextPtr context, HasConfigKeyFunc has_config_key, const BaseSettings<MySQLSettingsTraits> & settings);
-
-template
-SettingsChanges getSettingsChangesFromConfig(
-    const BaseSettings<MySQLSettingsTraits> & settings, const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
-
-#endif
 }
diff --git a/src/Storages/ExternalDataSourceConfiguration.h b/src/Storages/ExternalDataSourceConfiguration.h
index d042f763b11..b825548debe 100644
--- a/src/Storages/ExternalDataSourceConfiguration.h
+++ b/src/Storages/ExternalDataSourceConfiguration.h
@@ -34,18 +34,6 @@ struct ExternalDataSourceConfiguration
 };
 
 
-struct StoragePostgreSQLConfiguration : ExternalDataSourceConfiguration
-{
-    String on_conflict;
-};
-
-
-struct StorageMySQLConfiguration : ExternalDataSourceConfiguration
-{
-    bool replace_query = false;
-    String on_duplicate_clause;
-};
-
 using StorageSpecificArgs = std::vector<std::pair<String, ASTPtr>>;
 
 struct ExternalDataSourceInfo
@@ -55,20 +43,6 @@ struct ExternalDataSourceInfo
     SettingsChanges settings_changes;
 };
 
-/* If there is a storage engine's configuration specified in the named_collections,
- * this function returns valid for usage ExternalDataSourceConfiguration struct
- * otherwise std::nullopt is returned.
- *
- * If any configuration options are provided as key-value engine arguments, they will override
- * configuration values, i.e. ENGINE = PostgreSQL(postgresql_configuration, database = 'postgres_database');
- *
- * Any key-value engine argument except common (`host`, `port`, `username`, `password`, `database`)
- * is returned in EngineArgs struct.
- */
-template <typename T = EmptySettingsTraits>
-std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
-    const ASTs & args, ContextPtr context, bool is_database_engine = false, bool throw_on_no_collection = true, const BaseSettings<T> & storage_settings = {});
-
 using HasConfigKeyFunc = std::function<bool(const String &)>;
 
 template <typename T = EmptySettingsTraits>
@@ -91,7 +65,6 @@ struct ExternalDataSourcesByPriority
 ExternalDataSourcesByPriority
 getExternalDataSourceConfigurationByPriority(const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context, HasConfigKeyFunc has_config_key);
 
-
 struct URLBasedDataSourceConfiguration
 {
     String url;
@@ -118,7 +91,4 @@ struct URLBasedDataSourceConfig
 std::optional<URLBasedDataSourceConfig> getURLBasedDataSourceConfiguration(
     const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context);
 
-template<typename T>
-bool getExternalDataSourceConfiguration(const ASTs & args, BaseSettings<T> & settings, ContextPtr context);
-
 }
diff --git a/src/Storages/FileLog/FileLogDirectoryWatcher.cpp b/src/Storages/FileLog/FileLogDirectoryWatcher.cpp
index 3c5342a1e83..9d488616e85 100644
--- a/src/Storages/FileLog/FileLogDirectoryWatcher.cpp
+++ b/src/Storages/FileLog/FileLogDirectoryWatcher.cpp
@@ -1,4 +1,5 @@
 #include <Storages/FileLog/FileLogDirectoryWatcher.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Storages/FileLog/FileLogDirectoryWatcher.h b/src/Storages/FileLog/FileLogDirectoryWatcher.h
index 4368f284c9d..9b7afcf8e12 100644
--- a/src/Storages/FileLog/FileLogDirectoryWatcher.h
+++ b/src/Storages/FileLog/FileLogDirectoryWatcher.h
@@ -2,7 +2,6 @@
 
 #include <Storages/FileLog/DirectoryWatcherBase.h>
 
-#include <Common/logger_useful.h>
 
 #include <memory>
 #include <mutex>
diff --git a/src/Storages/FileLog/FileLogSource.cpp b/src/Storages/FileLog/FileLogSource.cpp
index c461f4b8160..be97cd58de9 100644
--- a/src/Storages/FileLog/FileLogSource.cpp
+++ b/src/Storages/FileLog/FileLogSource.cpp
@@ -77,8 +77,8 @@ Chunk FileLogSource::generate()
 
     MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
 
-    auto input_format
-        = FormatFactory::instance().getInputFormat(storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size);
+    auto input_format = FormatFactory::instance().getInput(
+        storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size, std::nullopt, 1);
 
     StreamingFormatExecutor executor(non_virtual_header, input_format);
 
diff --git a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
index c683d59579b..b490c5cac63 100644
--- a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
@@ -64,19 +64,19 @@ bool AsynchronousReadBufferFromHDFS::hasPendingDataToRead()
     return true;
 }
 
-std::future<IAsynchronousReader::Result> AsynchronousReadBufferFromHDFS::asyncReadInto(char * data, size_t size, int64_t priority)
+std::future<IAsynchronousReader::Result> AsynchronousReadBufferFromHDFS::asyncReadInto(char * data, size_t size, Priority priority)
 {
     IAsynchronousReader::Request request;
-    request.descriptor = std::make_shared<RemoteFSFileDescriptor>(*impl);
+    request.descriptor = std::make_shared<RemoteFSFileDescriptor>(*impl, nullptr);
     request.buf = data;
     request.size = size;
     request.offset = file_offset_of_buffer_end;
-    request.priority = base_priority + priority;
+    request.priority = Priority{base_priority.value + priority.value};
     request.ignore = 0;
     return reader.submit(request);
 }
 
-void AsynchronousReadBufferFromHDFS::prefetch(int64_t priority)
+void AsynchronousReadBufferFromHDFS::prefetch(Priority priority)
 {
     interval_watch.restart();
 
diff --git a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h
index 07d32194a93..d89aa60ab71 100644
--- a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h
+++ b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h
@@ -33,7 +33,7 @@ public:
 
     off_t seek(off_t offset_, int whence) override;
 
-    void prefetch(int64_t priority) override;
+    void prefetch(Priority priority) override;
 
     size_t getFileSize() override;
 
@@ -50,10 +50,10 @@ private:
 
     bool hasPendingDataToRead();
 
-    std::future<IAsynchronousReader::Result> asyncReadInto(char * data, size_t size, int64_t priority);
+    std::future<IAsynchronousReader::Result> asyncReadInto(char * data, size_t size, Priority priority);
 
     IAsynchronousReader & reader;
-    int64_t base_priority;
+    Priority base_priority;
     std::shared_ptr<ReadBufferFromHDFS> impl;
     std::future<IAsynchronousReader::Result> prefetch_future;
     Memory<> prefetch_buffer;
diff --git a/src/Storages/HDFS/ReadBufferFromHDFS.cpp b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
index 3e7c27fe4f2..ee8e0764db0 100644
--- a/src/Storages/HDFS/ReadBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
@@ -29,8 +29,6 @@ namespace ErrorCodes
 }
 
 
-ReadBufferFromHDFS::~ReadBufferFromHDFS() = default;
-
 struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl : public BufferWithOwnMemory<SeekableReadBuffer>
 {
     String hdfs_uri;
@@ -166,6 +164,8 @@ ReadBufferFromHDFS::ReadBufferFromHDFS(
 {
 }
 
+ReadBufferFromHDFS::~ReadBufferFromHDFS() = default;
+
 size_t ReadBufferFromHDFS::getFileSize()
 {
     return impl->getFileSize();
diff --git a/src/Storages/HDFS/StorageHDFS.cpp b/src/Storages/HDFS/StorageHDFS.cpp
index c915213f4ac..19c0840149b 100644
--- a/src/Storages/HDFS/StorageHDFS.cpp
+++ b/src/Storages/HDFS/StorageHDFS.cpp
@@ -211,12 +211,12 @@ ColumnsDescription StorageHDFS::getTableStructureFromData(
     if (ctx->getSettingsRef().schema_inference_use_cache_for_hdfs)
         columns_from_cache = tryGetColumnsFromCache(paths, path_from_uri, last_mod_time, format, ctx);
 
-    ReadBufferIterator read_buffer_iterator = [&, uri_without_path = uri_without_path, it = paths.begin()](ColumnsDescription &) mutable -> std::unique_ptr<ReadBuffer>
+    ReadBufferIterator read_buffer_iterator = [&, my_uri_without_path = uri_without_path, it = paths.begin()](ColumnsDescription &) mutable -> std::unique_ptr<ReadBuffer>
     {
         if (it == paths.end())
             return nullptr;
         auto compression = chooseCompressionMethod(*it, compression_method);
-        auto impl = std::make_unique<ReadBufferFromHDFS>(uri_without_path, *it++, ctx->getGlobalContext()->getConfigRef(), ctx->getReadSettings());
+        auto impl = std::make_unique<ReadBufferFromHDFS>(my_uri_without_path, *it++, ctx->getGlobalContext()->getConfigRef(), ctx->getReadSettings());
         const Int64 zstd_window_log_max = ctx->getSettingsRef().zstd_window_log_max;
         return wrapReadBufferWithCompressionMethod(std::move(impl), compression, static_cast<int>(zstd_window_log_max));
     };
diff --git a/src/Storages/HDFS/StorageHDFS.h b/src/Storages/HDFS/StorageHDFS.h
index 585f5df6ceb..b123834e981 100644
--- a/src/Storages/HDFS/StorageHDFS.h
+++ b/src/Storages/HDFS/StorageHDFS.h
@@ -8,7 +8,6 @@
 #include <Storages/IStorage.h>
 #include <Storages/Cache/SchemaCache.h>
 #include <Poco/URI.h>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Storages/HDFS/StorageHDFSCluster.cpp b/src/Storages/HDFS/StorageHDFSCluster.cpp
index 8dbaa0796e9..46e67b623e2 100644
--- a/src/Storages/HDFS/StorageHDFSCluster.cpp
+++ b/src/Storages/HDFS/StorageHDFSCluster.cpp
@@ -5,39 +5,38 @@
 
 #include <Storages/HDFS/StorageHDFSCluster.h>
 
-#include <Client/Connection.h>
 #include <Core/QueryProcessingStage.h>
 #include <DataTypes/DataTypeString.h>
-#include <IO/ConnectionTimeouts.h>
-#include <Interpreters/Context.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
-#include <Interpreters/SelectQueryOptions.h>
 #include <Interpreters/InterpreterSelectQuery.h>
-#include <QueryPipeline/narrowPipe.h>
-#include <QueryPipeline/Pipe.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
 
 #include <Processors/Transforms/AddingDefaultsTransform.h>
 
 #include <Processors/Sources/RemoteSource.h>
-#include <Parsers/queryToString.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/queryToString.h>
 
+#include <Storages/HDFS/HDFSCommon.h>
 #include <Storages/IStorage.h>
 #include <Storages/SelectQueryInfo.h>
-#include <Storages/HDFS/HDFSCommon.h>
-#include <Storages/StorageDictionary.h>
-#include <Storages/addColumnsStructureToQueryWithClusterEngine.h>
+#include <Storages/extractTableFunctionArgumentsFromSelectQuery.h>
 
+#include <TableFunctions/TableFunctionHDFSCluster.h>
 #include <memory>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 StorageHDFSCluster::StorageHDFSCluster(
     ContextPtr context_,
-    String cluster_name_,
+    const String & cluster_name_,
     const String & uri_,
     const StorageID & table_id_,
     const String & format_name_,
@@ -45,12 +44,10 @@ StorageHDFSCluster::StorageHDFSCluster(
     const ConstraintsDescription & constraints_,
     const String & compression_method_,
     bool structure_argument_was_provided_)
-    : IStorageCluster(table_id_)
-    , cluster_name(cluster_name_)
+    : IStorageCluster(cluster_name_, table_id_, &Poco::Logger::get("StorageHDFSCluster (" + table_id_.table_name + ")"), structure_argument_was_provided_)
     , uri(uri_)
     , format_name(format_name_)
     , compression_method(compression_method_)
-    , structure_argument_was_provided(structure_argument_was_provided_)
 {
     checkHDFSURL(uri_);
     context_->getRemoteHostFilter().checkURL(Poco::URI(uri_));
@@ -69,80 +66,17 @@ StorageHDFSCluster::StorageHDFSCluster(
     setInMemoryMetadata(storage_metadata);
 }
 
-/// The code executes on initiator
-Pipe StorageHDFSCluster::read(
-    const Names & column_names,
-    const StorageSnapshotPtr & storage_snapshot,
-    SelectQueryInfo & query_info,
-    ContextPtr context,
-    QueryProcessingStage::Enum processed_stage,
-    size_t /*max_block_size*/,
-    size_t /*num_streams*/)
+void StorageHDFSCluster::addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context)
 {
-    auto cluster = getCluster(context);
-    auto extension = getTaskIteratorExtension(query_info.query, context);
+    ASTExpressionList * expression_list = extractTableFunctionArgumentsFromSelectQuery(query);
+    if (!expression_list)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected SELECT query from table function hdfsCluster, got '{}'", queryToString(query));
 
-    /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
-    Block header =
-        InterpreterSelectQuery(query_info.query, context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
-
-    const Scalars & scalars = context->hasQueryContext() ? context->getQueryContext()->getScalars() : Scalars{};
-
-    Pipes pipes;
-
-    const bool add_agg_info = processed_stage == QueryProcessingStage::WithMergeableState;
-
-    auto query_to_send = query_info.original_query->clone();
-    if (!structure_argument_was_provided)
-        addColumnsStructureToQueryWithClusterEngine(
-            query_to_send, StorageDictionary::generateNamesAndTypesDescription(storage_snapshot->metadata->getColumns().getAll()), 3, getName());
-
-    const auto & current_settings = context->getSettingsRef();
-    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
-    for (const auto & shard_info : cluster->getShardsInfo())
-    {
-        auto try_results = shard_info.pool->getMany(timeouts, &current_settings, PoolMode::GET_MANY);
-        for (auto & try_result : try_results)
-        {
-            auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
-                shard_info.pool,
-                std::vector<IConnectionPool::Entry>{try_result},
-                queryToString(query_to_send),
-                header,
-                context,
-                /*throttler=*/nullptr,
-                scalars,
-                Tables(),
-                processed_stage,
-                extension);
-
-            pipes.emplace_back(std::make_shared<RemoteSource>(remote_query_executor, add_agg_info, false));
-        }
-    }
-
-    storage_snapshot->check(column_names);
-    return Pipe::unitePipes(std::move(pipes));
-}
-
-QueryProcessingStage::Enum StorageHDFSCluster::getQueryProcessingStage(
-    ContextPtr context, QueryProcessingStage::Enum to_stage, const StorageSnapshotPtr &, SelectQueryInfo &) const
-{
-    /// Initiator executes query on remote node.
-    if (context->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
-        if (to_stage >= QueryProcessingStage::Enum::WithMergeableState)
-            return QueryProcessingStage::Enum::WithMergeableState;
-
-    /// Follower just reads the data.
-    return QueryProcessingStage::Enum::FetchColumns;
+    TableFunctionHDFSCluster::addColumnsStructureToArguments(expression_list->children, structure, context);
 }
 
 
-ClusterPtr StorageHDFSCluster::getCluster(ContextPtr context) const
-{
-    return context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
-}
-
-RemoteQueryExecutor::Extension StorageHDFSCluster::getTaskIteratorExtension(ASTPtr, ContextPtr context) const
+RemoteQueryExecutor::Extension StorageHDFSCluster::getTaskIteratorExtension(ASTPtr, const ContextPtr & context) const
 {
     auto iterator = std::make_shared<HDFSSource::DisclosedGlobIterator>(context, uri);
     auto callback = std::make_shared<HDFSSource::IteratorWrapper>([iter = std::move(iterator)]() mutable -> String { return iter->next(); });
@@ -156,7 +90,6 @@ NamesAndTypesList StorageHDFSCluster::getVirtuals() const
         {"_file", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())}};
 }
 
-
 }
 
 #endif
diff --git a/src/Storages/HDFS/StorageHDFSCluster.h b/src/Storages/HDFS/StorageHDFSCluster.h
index 4d6548a6b78..350051ab089 100644
--- a/src/Storages/HDFS/StorageHDFSCluster.h
+++ b/src/Storages/HDFS/StorageHDFSCluster.h
@@ -22,7 +22,7 @@ class StorageHDFSCluster : public IStorageCluster
 public:
     StorageHDFSCluster(
         ContextPtr context_,
-        String cluster_name_,
+        const String & cluster_name_,
         const String & uri_,
         const StorageID & table_id_,
         const String & format_name_,
@@ -33,23 +33,16 @@ public:
 
     std::string getName() const override { return "HDFSCluster"; }
 
-    Pipe read(const Names &, const StorageSnapshotPtr &, SelectQueryInfo &,
-        ContextPtr, QueryProcessingStage::Enum, size_t /*max_block_size*/, size_t /*num_streams*/) override;
-
-    QueryProcessingStage::Enum
-    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageSnapshotPtr &, SelectQueryInfo &) const override;
-
     NamesAndTypesList getVirtuals() const override;
 
-    ClusterPtr getCluster(ContextPtr context) const override;
-    RemoteQueryExecutor::Extension getTaskIteratorExtension(ASTPtr query, ContextPtr context) const override;
+    RemoteQueryExecutor::Extension getTaskIteratorExtension(ASTPtr query, const ContextPtr & context) const override;
 
 private:
-    String cluster_name;
+    void addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context) override;
+
     String uri;
     String format_name;
     String compression_method;
-    bool structure_argument_was_provided;
 };
 
 
diff --git a/src/Storages/HDFS/WriteBufferFromHDFS.cpp b/src/Storages/HDFS/WriteBufferFromHDFS.cpp
index 293f5d31836..fad0447d2cf 100644
--- a/src/Storages/HDFS/WriteBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/WriteBufferFromHDFS.cpp
@@ -107,8 +107,9 @@ WriteBufferFromHDFS::WriteBufferFromHDFS(
         const WriteSettings & write_settings_,
         size_t buf_size_,
         int flags_)
-    : BufferWithOwnMemory<WriteBuffer>(buf_size_)
+    : WriteBufferFromFileBase(buf_size_, nullptr, 0)
     , impl(std::make_unique<WriteBufferFromHDFSImpl>(hdfs_name_, config_, replication_, write_settings_, flags_))
+    , filename(hdfs_name_)
 {
 }
 
diff --git a/src/Storages/HDFS/WriteBufferFromHDFS.h b/src/Storages/HDFS/WriteBufferFromHDFS.h
index ec54348c174..71e6e55addc 100644
--- a/src/Storages/HDFS/WriteBufferFromHDFS.h
+++ b/src/Storages/HDFS/WriteBufferFromHDFS.h
@@ -5,7 +5,7 @@
 #if USE_HDFS
 #include <IO/WriteBuffer.h>
 #include <IO/WriteSettings.h>
-#include <IO/BufferWithOwnMemory.h>
+#include <IO/WriteBufferFromFileBase.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <fcntl.h>
 #include <string>
@@ -17,7 +17,7 @@ namespace DB
 /** Accepts HDFS path to file and opens it.
  * Closes file by himself (thus "owns" a file descriptor).
  */
-class WriteBufferFromHDFS final : public BufferWithOwnMemory<WriteBuffer>
+class WriteBufferFromHDFS final : public WriteBufferFromFileBase
 {
 
 public:
@@ -29,19 +29,20 @@ public:
         size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE,
         int flags = O_WRONLY);
 
-    WriteBufferFromHDFS(WriteBufferFromHDFS &&) = default;
-
     ~WriteBufferFromHDFS() override;
 
     void nextImpl() override;
 
     void sync() override;
 
+    std::string getFileName() const override { return filename; }
+
 private:
     void finalizeImpl() override;
 
     struct WriteBufferFromHDFSImpl;
     std::unique_ptr<WriteBufferFromHDFSImpl> impl;
+    const std::string filename;
 };
 
 }
diff --git a/src/Storages/Hive/StorageHive.cpp b/src/Storages/Hive/StorageHive.cpp
index 85e6341eb5a..f554a14ec75 100644
--- a/src/Storages/Hive/StorageHive.cpp
+++ b/src/Storages/Hive/StorageHive.cpp
@@ -7,6 +7,7 @@
 #include <fmt/core.h>
 #include <Poco/URI.h>
 #include <Common/logger_useful.h>
+#include <Common/CurrentMetrics.h>
 
 #include <Columns/IColumn.h>
 #include <Core/Block.h>
@@ -20,6 +21,7 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 #include <IO/ReadBufferFromString.h>
+#include <Disks/IO/getThreadPoolReader.h>
 #include <Storages/Cache/ExternalDataSourceCache.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTCreateQuery.h>
@@ -40,6 +42,11 @@
 #include <Storages/StorageFactory.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 
+namespace CurrentMetrics
+{
+    extern const Metric StorageHiveThreads;
+    extern const Metric StorageHiveThreadsActive;
+}
 
 namespace DB
 {
@@ -226,7 +233,7 @@ public:
                         if (thread_pool_read)
                         {
                             return std::make_unique<AsynchronousReadBufferFromHDFS>(
-                                IObjectStorage::getThreadPoolReader(), read_settings, std::move(buf));
+                                getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER), read_settings, std::move(buf));
                         }
                         else
                         {
@@ -269,8 +276,8 @@ public:
                 else
                     read_buf = std::move(remote_read_buf);
 
-                auto input_format = FormatFactory::instance().getInputFormat(
-                    format, *read_buf, to_read_block, getContext(), max_block_size, updateFormatSettings(current_file));
+                auto input_format = FormatFactory::instance().getInput(
+                    format, *read_buf, to_read_block, getContext(), max_block_size, updateFormatSettings(current_file), /* max_parsing_threads */ 1);
 
                 Pipe pipe(input_format);
                 if (columns_description.hasDefaults())
@@ -601,8 +608,14 @@ HiveFiles StorageHive::collectHiveFilesFromPartition(
     writeString("\n", wb);
 
     ReadBufferFromString buffer(wb.str());
-    auto format = FormatFactory::instance().getInputFormat(
-        "CSV", buffer, partition_key_expr->getSampleBlock(), getContext(), getContext()->getSettingsRef().max_block_size);
+    auto format = FormatFactory::instance().getInput(
+        "CSV",
+        buffer,
+        partition_key_expr->getSampleBlock(),
+        getContext(),
+        getContext()->getSettingsRef().max_block_size,
+        std::nullopt,
+        /* max_parsing_threads */ 1);
     auto pipeline = QueryPipeline(std::move(format));
     auto reader = std::make_unique<PullingPipelineExecutor>(pipeline);
     Block block;
@@ -844,7 +857,7 @@ HiveFiles StorageHive::collectHiveFiles(
     Int64 hive_max_query_partitions = context_->getSettings().max_partitions_to_read;
     /// Mutext to protect hive_files, which maybe appended in multiple threads
     std::mutex hive_files_mutex;
-    ThreadPool pool{max_threads};
+    ThreadPool pool{CurrentMetrics::StorageHiveThreads, CurrentMetrics::StorageHiveThreadsActive, max_threads};
     if (!partitions.empty())
     {
         for (const auto & partition : partitions)
diff --git a/src/Storages/Hive/StorageHive.h b/src/Storages/Hive/StorageHive.h
index 363042621c7..b4afb2421b1 100644
--- a/src/Storages/Hive/StorageHive.h
+++ b/src/Storages/Hive/StorageHive.h
@@ -7,7 +7,6 @@
 #include <Poco/URI.h>
 #include <ThriftHiveMetastore.h>
 
-#include <Common/logger_useful.h>
 #include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
 #include <Storages/HDFS/HDFSCommon.h>
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index 9bcfff65c95..8cf708acd8b 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -40,7 +40,7 @@ RWLockImpl::LockHolder IStorage::tryLockTimed(
     {
         const String type_str = type == RWLockImpl::Type::Read ? "READ" : "WRITE";
         throw Exception(ErrorCodes::DEADLOCK_AVOIDED,
-            "{} locking attempt on \"{}\" has timed out! ({}ms) Possible deadlock avoided. Client should retry.",
+            "{} locking attempt on \"{}\" has timed out! ({}ms) Possible deadlock avoided. Client should retry",
             type_str, getStorageID(), acquire_timeout.count());
     }
     return lock_holder;
@@ -133,6 +133,13 @@ void IStorage::read(
     size_t num_streams)
 {
     auto pipe = read(column_names, storage_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+
+    /// parallelize processing if not yet
+    const size_t output_ports = pipe.numOutputPorts();
+    const bool parallelize_output = context->getSettingsRef().parallelize_output_from_storages;
+    if (parallelize_output && parallelizeOutputAfterReading(context) && output_ports > 0 && output_ports < num_streams)
+        pipe.resize(num_streams);
+
     readFromPipe(query_plan, std::move(pipe), column_names, storage_snapshot, query_info, context, getName());
 }
 
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 426d64f41ee..c163e8107ac 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -146,6 +146,8 @@ public:
     virtual bool supportsReplication() const { return false; }
 
     /// Returns true if the storage supports parallel insert.
+    /// If false, each INSERT query will call write() only once.
+    /// Different INSERT queries may write in parallel regardless of this value.
     virtual bool supportsParallelInsert() const { return false; }
 
     /// Returns true if the storage supports deduplication of inserted data blocks.
@@ -178,6 +180,8 @@ public:
     /// Returns true if the storage is for system, which cannot be target of SHOW CREATE TABLE.
     virtual bool isSystemStorage() const { return false; }
 
+    /// Returns true if asynchronous inserts are enabled for table.
+    virtual bool areAsynchronousInsertsEnabled() const { return false; }
 
     /// Optional size information of each physical column.
     /// Currently it's only used by the MergeTree family for query optimizations.
@@ -275,7 +279,7 @@ public:
     /// acquiring the lock instead of raising a TABLE_IS_DROPPED exception
     TableLockHolder tryLockForShare(const String & query_id, const std::chrono::milliseconds & acquire_timeout);
 
-    /// Lock table for alter. This lock must be acuqired in ALTER queries to be
+    /// Lock table for alter. This lock must be acquired in ALTER queries to be
     /// sure, that we execute only one simultaneous alter. Doesn't affect share lock.
     using AlterLockHolder = std::unique_lock<std::timed_mutex>;
     AlterLockHolder lockForAlter(const std::chrono::milliseconds & acquire_timeout);
@@ -368,6 +372,15 @@ private:
         size_t /*max_block_size*/,
         size_t /*num_streams*/);
 
+    /// Should we process blocks of data returned by the storage in parallel
+    /// even when the storage returned only one stream of data for reading?
+    /// It is beneficial, for example, when you read from a file quickly,
+    /// but then do heavy computations on returned blocks.
+    /// This is enabled by default, but in some cases shouldn't be done.
+    /// For example, when you read from system.numbers instead of system.numbers_mt,
+    /// you still expect the data to be processed sequentially.
+    virtual bool parallelizeOutputAfterReading(ContextPtr) const { return true; }
+
 public:
     /// Other version of read which adds reading step to query plan.
     /// Default implementation creates ReadFromStorageStep and uses usual read.
@@ -503,7 +516,7 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Mutations are not supported by storage {}", getName());
     }
 
-    virtual void waitForMutation(const String & /*mutation_id*/)
+    virtual void waitForMutation(const String & /*mutation_id*/, bool /*wait_for_another_mutation*/)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Mutations are not supported by storage {}", getName());
     }
@@ -648,6 +661,12 @@ public:
         return getStorageSnapshot(metadata_snapshot, query_context);
     }
 
+    /// Creates a storage snapshot but without holding a data specific to storage.
+    virtual StorageSnapshotPtr getStorageSnapshotWithoutData(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const
+    {
+        return getStorageSnapshot(metadata_snapshot, query_context);
+    }
+
     /// A helper to implement read()
     static void readFromPipe(
         QueryPlan & query_plan,
diff --git a/src/Storages/IStorageCluster.cpp b/src/Storages/IStorageCluster.cpp
new file mode 100644
index 00000000000..9eeed18e788
--- /dev/null
+++ b/src/Storages/IStorageCluster.cpp
@@ -0,0 +1,149 @@
+#include "Storages/IStorageCluster.h"
+
+#include "Common/Exception.h"
+#include "Core/QueryProcessingStage.h"
+#include <DataTypes/DataTypeString.h>
+#include <IO/ConnectionTimeouts.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/getHeaderForProcessingStage.h>
+#include <Interpreters/SelectQueryOptions.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/AddDefaultDatabaseVisitor.h>
+#include <Interpreters/TranslateQualifiedNamesVisitor.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
+#include <QueryPipeline/narrowPipe.h>
+#include <QueryPipeline/Pipe.h>
+#include <Processors/Sources/RemoteSource.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
+#include <Parsers/queryToString.h>
+#include <Storages/IStorage.h>
+#include <Storages/SelectQueryInfo.h>
+#include <Storages/StorageDictionary.h>
+
+#include <memory>
+#include <string>
+
+namespace DB
+{
+
+IStorageCluster::IStorageCluster(
+    const String & cluster_name_,
+    const StorageID & table_id_,
+    Poco::Logger * log_,
+    bool structure_argument_was_provided_)
+    : IStorage(table_id_)
+    , log(log_)
+    , cluster_name(cluster_name_)
+    , structure_argument_was_provided(structure_argument_was_provided_)
+{
+}
+
+
+/// The code executes on initiator
+Pipe IStorageCluster::read(
+    const Names & column_names,
+    const StorageSnapshotPtr & storage_snapshot,
+    SelectQueryInfo & query_info,
+    ContextPtr context,
+    QueryProcessingStage::Enum processed_stage,
+    size_t /*max_block_size*/,
+    size_t /*num_streams*/)
+{
+    updateBeforeRead(context);
+
+    auto cluster = getCluster(context);
+    auto extension = getTaskIteratorExtension(query_info.query, context);
+
+    /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
+
+    Block sample_block;
+    ASTPtr query_to_send = query_info.query;
+
+    if (context->getSettingsRef().allow_experimental_analyzer)
+    {
+        sample_block = InterpreterSelectQueryAnalyzer::getSampleBlock(query_info.query, context, SelectQueryOptions(processed_stage));
+    }
+    else
+    {
+        auto interpreter = InterpreterSelectQuery(query_info.query, context, SelectQueryOptions(processed_stage).analyze());
+        sample_block = interpreter.getSampleBlock();
+        query_to_send = interpreter.getQueryInfo().query->clone();
+    }
+
+    const Scalars & scalars = context->hasQueryContext() ? context->getQueryContext()->getScalars() : Scalars{};
+
+    Pipes pipes;
+
+    const bool add_agg_info = processed_stage == QueryProcessingStage::WithMergeableState;
+
+    if (!structure_argument_was_provided)
+        addColumnsStructureToQuery(query_to_send, StorageDictionary::generateNamesAndTypesDescription(storage_snapshot->metadata->getColumns().getAll()), context);
+
+    RestoreQualifiedNamesVisitor::Data data;
+    data.distributed_table = DatabaseAndTableWithAlias(*getTableExpression(query_info.query->as<ASTSelectQuery &>(), 0));
+    data.remote_table.database = context->getCurrentDatabase();
+    data.remote_table.table = getName();
+    RestoreQualifiedNamesVisitor(data).visit(query_to_send);
+    AddDefaultDatabaseVisitor visitor(context, context->getCurrentDatabase(),
+                                      /* only_replace_current_database_function_= */false,
+                                      /* only_replace_in_join_= */true);
+    visitor.visit(query_to_send);
+
+    auto new_context = updateSettings(context, context->getSettingsRef());
+    const auto & current_settings = new_context->getSettingsRef();
+    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
+    for (const auto & shard_info : cluster->getShardsInfo())
+    {
+        auto try_results = shard_info.pool->getMany(timeouts, &current_settings, PoolMode::GET_MANY);
+        for (auto & try_result : try_results)
+        {
+            auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
+                std::vector<IConnectionPool::Entry>{try_result},
+                queryToString(query_to_send),
+                sample_block,
+                new_context,
+                /*throttler=*/nullptr,
+                scalars,
+                Tables(),
+                processed_stage,
+                extension);
+
+            remote_query_executor->setLogger(log);
+            pipes.emplace_back(std::make_shared<RemoteSource>(remote_query_executor, add_agg_info, false, false));
+        }
+    }
+
+    storage_snapshot->check(column_names);
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+QueryProcessingStage::Enum IStorageCluster::getQueryProcessingStage(
+    ContextPtr context, QueryProcessingStage::Enum to_stage, const StorageSnapshotPtr &, SelectQueryInfo &) const
+{
+    /// Initiator executes query on remote node.
+    if (context->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+        if (to_stage >= QueryProcessingStage::Enum::WithMergeableState)
+            return QueryProcessingStage::Enum::WithMergeableState;
+
+    /// Follower just reads the data.
+    return QueryProcessingStage::Enum::FetchColumns;
+}
+
+ContextPtr IStorageCluster::updateSettings(ContextPtr context, const Settings & settings)
+{
+    Settings new_settings = settings;
+
+    /// Cluster table functions should always skip unavailable shards.
+    new_settings.skip_unavailable_shards = true;
+
+    auto new_context = Context::createCopy(context);
+    new_context->setSettings(new_settings);
+    return new_context;
+}
+
+ClusterPtr IStorageCluster::getCluster(ContextPtr context) const
+{
+    return context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
+}
+
+}
diff --git a/src/Storages/IStorageCluster.h b/src/Storages/IStorageCluster.h
index 35d297428ba..b15ed37202a 100644
--- a/src/Storages/IStorageCluster.h
+++ b/src/Storages/IStorageCluster.h
@@ -3,6 +3,7 @@
 #include <Storages/IStorage.h>
 #include <Interpreters/Cluster.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
+#include <Parsers/ASTExpressionList.h>
 
 namespace DB
 {
@@ -15,14 +16,40 @@ namespace DB
 class IStorageCluster : public IStorage
 {
 public:
+    IStorageCluster(
+        const String & cluster_name_,
+        const StorageID & table_id_,
+        Poco::Logger * log_,
+        bool structure_argument_was_provided_);
 
-    explicit IStorageCluster(const StorageID & table_id_) : IStorage(table_id_) {}
+    Pipe read(
+        const Names & column_names,
+        const StorageSnapshotPtr & storage_snapshot,
+        SelectQueryInfo & query_info,
+        ContextPtr context,
+        QueryProcessingStage::Enum processed_stage,
+        size_t /*max_block_size*/,
+        size_t /*num_streams*/) override;
 
-    virtual ClusterPtr getCluster(ContextPtr context) const = 0;
+    ClusterPtr getCluster(ContextPtr context) const;
     /// Query is needed for pruning by virtual columns (_file, _path)
-    virtual RemoteQueryExecutor::Extension getTaskIteratorExtension(ASTPtr query, ContextPtr context) const = 0;
+    virtual RemoteQueryExecutor::Extension getTaskIteratorExtension(ASTPtr query, const ContextPtr & context) const = 0;
+
+    QueryProcessingStage::Enum getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageSnapshotPtr &, SelectQueryInfo &) const override;
 
     bool isRemote() const override { return true; }
+
+protected:
+    virtual void updateBeforeRead(const ContextPtr &) {}
+
+    virtual void addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context) = 0;
+
+private:
+    ContextPtr updateSettings(ContextPtr context, const Settings & settings);
+
+    Poco::Logger * log;
+    String cluster_name;
+    bool structure_argument_was_provided;
 };
 
 
diff --git a/src/Storages/IStorageDataLake.h b/src/Storages/IStorageDataLake.h
deleted file mode 100644
index 9e322377fbd..00000000000
--- a/src/Storages/IStorageDataLake.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma once
-
-#include "config.h"
-
-#if USE_AWS_S3
-
-#    include <Common/logger_useful.h>
-#    include <Storages/IStorage.h>
-
-#    include <filesystem>
-
-#    include <fmt/format.h>
-
-#    include <IO/S3/URI.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-template <typename Storage, typename Name, typename MetadataParser>
-class IStorageDataLake : public Storage
-{
-public:
-    using Configuration = typename Storage::Configuration;
-    // 1. Parses internal file structure of table
-    // 2. Finds out parts with latest version
-    // 3. Creates url for underlying StorageS3 enigne to handle reads
-    IStorageDataLake(
-        const Configuration & configuration_,
-        const StorageID & table_id_,
-        ColumnsDescription columns_,
-        const ConstraintsDescription & constraints_,
-        const String & comment,
-        ContextPtr context_,
-        std::optional<FormatSettings> format_settings_)
-        : Storage(
-            getAdjustedConfiguration(
-                context_, Storage::updateConfiguration(context_, configuration_), &Poco::Logger::get("Storage" + String(name))),
-            table_id_,
-            columns_,
-            constraints_,
-            comment,
-            context_,
-            format_settings_)
-    {
-    }
-
-    static constexpr auto name = Name::name;
-    String getName() const override { return name; }
-
-    static ColumnsDescription getTableStructureFromData(
-        Configuration & configuration, const std::optional<FormatSettings> & format_settings, ContextPtr ctx)
-    {
-        Storage::updateConfiguration(ctx, configuration);
-
-        auto new_configuration = getAdjustedConfiguration(ctx, configuration, &Poco::Logger::get("Storage" + String(name)));
-
-        return Storage::getTableStructureFromData(new_configuration, format_settings, ctx, /*object_infos*/ nullptr);
-    }
-
-    static Configuration
-    getAdjustedConfiguration(const ContextPtr & context, const Configuration & configuration, Poco::Logger * log)
-    {
-        MetadataParser parser{configuration, context};
-
-        auto keys = parser.getFiles();
-
-        Configuration new_configuration(configuration);
-
-        new_configuration.appendToPath(
-            std::filesystem::path(Name::data_directory_prefix) / MetadataParser::generateQueryFromKeys(keys, configuration.format));
-
-        LOG_DEBUG(log, "Table path: {}, new uri: {}", configuration.url.key, configuration.getPath());
-
-        return new_configuration;
-    }
-
-    static Configuration getConfiguration(ASTs & engine_args, ContextPtr local_context)
-    {
-        auto configuration = Storage::getConfiguration(engine_args, local_context, false /* get_format_from_file */);
-
-        if (configuration.format == "auto")
-            configuration.format = "Parquet";
-
-        return configuration;
-    }
-
-    SinkToStoragePtr write(const ASTPtr & /*query*/, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr /*context*/) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method write is not supported by storage {}", getName());
-    }
-
-    void truncate(
-        const ASTPtr & /*query*/,
-        const StorageMetadataPtr & /*metadata_snapshot*/,
-        ContextPtr /*local_context*/,
-        TableExclusiveLockHolder &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Truncate is not supported by storage {}", getName());
-    }
-
-    NamesAndTypesList getVirtuals() const override { return {}; }
-};
-
-}
-
-#endif
diff --git a/src/Storages/IndicesDescription.cpp b/src/Storages/IndicesDescription.cpp
index 2e07aceeaa9..a93ac248c98 100644
--- a/src/Storages/IndicesDescription.cpp
+++ b/src/Storages/IndicesDescription.cpp
@@ -94,14 +94,15 @@ IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast
 
     auto syntax = TreeRewriter(context).analyze(expr_list, columns.getAllPhysical());
     result.expression = ExpressionAnalyzer(expr_list, syntax, context).getActions(true);
-    Block block_without_columns = result.expression->getSampleBlock();
+    result.sample_block = result.expression->getSampleBlock();
 
-    for (size_t i = 0; i < block_without_columns.columns(); ++i)
+    for (auto & elem : result.sample_block)
     {
-        const auto & column = block_without_columns.getByPosition(i);
-        result.column_names.emplace_back(column.name);
-        result.data_types.emplace_back(column.type);
-        result.sample_block.insert(ColumnWithTypeAndName(column.type->createColumn(), column.type, column.name));
+        if (!elem.column)
+            elem.column = elem.type->createColumn();
+
+        result.column_names.push_back(elem.name);
+        result.data_types.push_back(elem.type);
     }
 
     const auto & definition_arguments = index_definition->type->arguments;
diff --git a/src/Storages/KVStorageUtils.h b/src/Storages/KVStorageUtils.h
index 0574539f4c7..c3bb2aefa62 100644
--- a/src/Storages/KVStorageUtils.h
+++ b/src/Storages/KVStorageUtils.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 #include <Storages/SelectQueryInfo.h>
 
 #include <Interpreters/PreparedSets.h>
diff --git a/src/Storages/Kafka/KafkaConsumer.cpp b/src/Storages/Kafka/KafkaConsumer.cpp
index 4a14e1292fa..b2e6129c61c 100644
--- a/src/Storages/Kafka/KafkaConsumer.cpp
+++ b/src/Storages/Kafka/KafkaConsumer.cpp
@@ -489,7 +489,7 @@ size_t KafkaConsumer::filterMessageErrors()
 {
     assert(current == messages.begin());
 
-    auto new_end = std::remove_if(messages.begin(), messages.end(), [this](auto & message)
+    size_t skipped = std::erase_if(messages, [this](auto & message)
     {
         if (auto error = message.get_error())
         {
@@ -500,12 +500,8 @@ size_t KafkaConsumer::filterMessageErrors()
         return false;
     });
 
-    size_t skipped = std::distance(new_end, messages.end());
     if (skipped)
-    {
         LOG_ERROR(log, "There were {} messages with an error", skipped);
-        messages.erase(new_end, messages.end());
-    }
 
     return skipped;
 }
diff --git a/src/Storages/Kafka/KafkaProducer.cpp b/src/Storages/Kafka/KafkaProducer.cpp
index 5ef5d080ddf..c36f9b48315 100644
--- a/src/Storages/Kafka/KafkaProducer.cpp
+++ b/src/Storages/Kafka/KafkaProducer.cpp
@@ -52,8 +52,8 @@ void KafkaProducer::produce(const String & message, size_t rows_in_message, cons
     if (key_column_index)
     {
         const auto & key_column = assert_cast<const ColumnString &>(*columns[key_column_index.value()]);
-        const auto key_data = key_column.getDataAt(last_row).toString();
-        builder.key(cppkafka::Buffer(key_data.data(), key_data.size()));
+        const auto key_data = key_column.getDataAt(last_row);
+        builder.key(cppkafka::Buffer(key_data.data, key_data.size));
     }
 
     if (timestamp_column_index)
diff --git a/src/Storages/Kafka/KafkaSource.cpp b/src/Storages/Kafka/KafkaSource.cpp
index 3c5253f7640..ba242417058 100644
--- a/src/Storages/Kafka/KafkaSource.cpp
+++ b/src/Storages/Kafka/KafkaSource.cpp
@@ -101,8 +101,8 @@ Chunk KafkaSource::generateImpl()
     auto put_error_to_stream = handle_error_mode == HandleKafkaErrorMode::STREAM;
 
     EmptyReadBuffer empty_buf;
-    auto input_format = FormatFactory::instance().getInputFormat(
-        storage.getFormatName(), empty_buf, non_virtual_header, context, max_block_size);
+    auto input_format = FormatFactory::instance().getInput(
+        storage.getFormatName(), empty_buf, non_virtual_header, context, max_block_size, std::nullopt, 1);
 
     std::optional<std::string> exception_message;
     size_t total_rows = 0;
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index 7b97273d8af..7d504833a0a 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -19,13 +19,13 @@
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <QueryPipeline/QueryPipeline.h>
 #include <QueryPipeline/Pipe.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/MessageQueueSink.h>
 #include <Storages/Kafka/KafkaProducer.h>
 #include <Storages/Kafka/KafkaSettings.h>
 #include <Storages/Kafka/KafkaSource.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMaterializedView.h>
+#include <Storages/NamedCollectionsHelpers.h>
 #include <base/getFQDNOrHostName.h>
 #include <Common/logger_useful.h>
 #include <boost/algorithm/string/replace.hpp>
@@ -41,6 +41,7 @@
 #include <Common/setThreadName.h>
 #include <Formats/FormatFactory.h>
 
+#include "Storages/ColumnDefault.h"
 #include "config_version.h"
 
 #include <Common/CurrentMetrics.h>
@@ -834,10 +835,21 @@ void registerStorageKafka(StorageFactory & factory)
     {
         ASTs & engine_args = args.engine_args;
         size_t args_count = engine_args.size();
-        bool has_settings = args.storage_def->settings;
+        const bool has_settings = args.storage_def->settings;
 
         auto kafka_settings = std::make_unique<KafkaSettings>();
-        auto named_collection = getExternalDataSourceConfiguration(args.engine_args, *kafka_settings, args.getLocalContext());
+        String collection_name;
+        if (auto named_collection = tryGetNamedCollectionWithOverrides(args.engine_args, args.getLocalContext()))
+        {
+            for (const auto & setting : kafka_settings->all())
+            {
+                const auto & setting_name = setting.getName();
+                if (named_collection->has(setting_name))
+                    kafka_settings->set(setting_name, named_collection->get<String>(setting_name));
+            }
+            collection_name = assert_cast<const ASTIdentifier *>(args.engine_args[0].get())->name();
+        }
+
         if (has_settings)
         {
             kafka_settings->loadFromQuery(*args.storage_def);
@@ -901,14 +913,10 @@ void registerStorageKafka(StorageFactory & factory)
           * - Do intermediate commits when the batch consumed and handled
           */
 
-        String collection_name;
-        if (named_collection)
+        /* 0 = raw, 1 = evaluateConstantExpressionAsLiteral, 2=evaluateConstantExpressionOrIdentifierAsLiteral */
+        /// In case of named collection we already validated the arguments.
+        if (collection_name.empty())
         {
-            collection_name = assert_cast<const ASTIdentifier *>(args.engine_args[0].get())->name();
-        }
-        else
-        {
-            /* 0 = raw, 1 = evaluateConstantExpressionAsLiteral, 2=evaluateConstantExpressionOrIdentifierAsLiteral */
             CHECK_KAFKA_STORAGE_ARGUMENT(1, kafka_broker_list, 0)
             CHECK_KAFKA_STORAGE_ARGUMENT(2, kafka_topic_list, 1)
             CHECK_KAFKA_STORAGE_ARGUMENT(3, kafka_group_name, 2)
@@ -959,6 +967,20 @@ void registerStorageKafka(StorageFactory & factory)
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "kafka_poll_max_batch_size can not be lower than 1");
         }
+        NamesAndTypesList supported_columns;
+        for (const auto & column : args.columns)
+        {
+            if (column.default_desc.kind == ColumnDefaultKind::Alias)
+                supported_columns.emplace_back(column.name, column.type);
+            if (column.default_desc.kind == ColumnDefaultKind::Default && !column.default_desc.expression)
+                supported_columns.emplace_back(column.name, column.type);
+        }
+        // Kafka engine allows only ordinary columns without default expression or alias columns.
+        if (args.columns.getAll() != supported_columns)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "KafkaEngine doesn't support DEFAULT/MATERIALIZED/EPHEMERAL expressions for columns. "
+                                                       "See https://clickhouse.com/docs/en/engines/table-engines/integrations/kafka/#configuration");
+        }
 
         return std::make_shared<StorageKafka>(args.table_id, args.getContext(), args.columns, std::move(kafka_settings), collection_name);
     };
diff --git a/src/Storages/LiveView/LiveViewSink.h b/src/Storages/LiveView/LiveViewSink.h
index 1d90e35618f..e163400f2af 100644
--- a/src/Storages/LiveView/LiveViewSink.h
+++ b/src/Storages/LiveView/LiveViewSink.h
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Storages/LiveView/StorageLiveView.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 
 namespace DB
diff --git a/src/Storages/LiveView/StorageLiveView.cpp b/src/Storages/LiveView/StorageLiveView.cpp
index 547becf3837..173bb128c4a 100644
--- a/src/Storages/LiveView/StorageLiveView.cpp
+++ b/src/Storages/LiveView/StorageLiveView.cpp
@@ -27,7 +27,7 @@ limitations under the License. */
 #include <Common/logger_useful.h>
 #include <Common/typeid_cast.h>
 #include <Common/SipHash.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 #include <Storages/LiveView/StorageLiveView.h>
 #include <Storages/LiveView/LiveViewSource.h>
@@ -78,7 +78,6 @@ SelectQueryDescription buildSelectQueryDescription(const ASTPtr & select_query,
 {
     ASTPtr inner_query = select_query;
     std::optional<StorageID> dependent_table_storage_id;
-    bool allow_experimental_analyzer = context->getSettingsRef().allow_experimental_analyzer;
 
     while (true)
     {
@@ -100,10 +99,6 @@ SelectQueryDescription buildSelectQueryDescription(const ASTPtr & select_query,
 
         if (auto db_and_table = getDatabaseAndTable(*inner_select_query, 0))
         {
-            const auto * table_expression = getTableExpression(*inner_select_query, 0);
-            if (allow_experimental_analyzer && table_expression->database_and_table_name->tryGetAlias().empty())
-                table_expression->database_and_table_name->setAlias("__dependent_table");
-
             String select_database_name = db_and_table->database;
             String select_table_name = db_and_table->table;
 
@@ -241,7 +236,18 @@ StorageLiveView::StorageLiveView(
     blocks_metadata_ptr = std::make_shared<BlocksMetadataPtr>();
     active_ptr = std::make_shared<bool>(true);
 
-    periodic_refresh_task = getContext()->getSchedulePool().createTask("LiveViewPeriodicRefreshTask", [this]{ periodicRefreshTaskFunc(); });
+    periodic_refresh_task = getContext()->getSchedulePool().createTask("LiveViewPeriodicRefreshTask",
+        [this]
+        {
+            try
+            {
+                periodicRefreshTaskFunc();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(log, "Exception in LiveView periodic refresh task in BackgroundSchedulePool");
+            }
+        });
     periodic_refresh_task->deactivate();
 }
 
@@ -641,9 +647,9 @@ QueryPipelineBuilder StorageLiveView::completeQuery(Pipes pipes)
     }
     else
     {
-        auto inner_blocks_query = getInnerBlocksQuery();
+        auto inner_blocks_query_ = getInnerBlocksQuery();
         block_context->addExternalTable(getBlocksTableName(), std::move(blocks_storage_table_holder));
-        InterpreterSelectQuery interpreter(inner_blocks_query,
+        InterpreterSelectQuery interpreter(inner_blocks_query_,
             block_context,
             StoragePtr(),
             nullptr,
diff --git a/src/Storages/MarkCache.h b/src/Storages/MarkCache.h
index 9095bf6bb35..0f4af57fc8e 100644
--- a/src/Storages/MarkCache.h
+++ b/src/Storages/MarkCache.h
@@ -5,6 +5,7 @@
 #include <Common/CacheBase.h>
 #include <Common/ProfileEvents.h>
 #include <Common/SipHash.h>
+#include <Common/HashTable/Hash.h>
 #include <Interpreters/AggregationCommon.h>
 #include <Formats/MarkInCompressedFile.h>
 
@@ -26,7 +27,7 @@ struct MarksWeightFunction
 
     size_t operator()(const MarksInCompressedFile & marks) const
     {
-        return marks.size() * sizeof(MarkInCompressedFile) + MARK_CACHE_OVERHEAD;
+        return marks.approximateMemoryUsage() + MARK_CACHE_OVERHEAD;
     }
 };
 
@@ -40,8 +41,11 @@ private:
     using Base = CacheBase<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>;
 
 public:
-    explicit MarkCache(size_t max_size_in_bytes, const String & mark_cache_policy = "")
-        : Base(max_size_in_bytes, 0, mark_cache_policy) {}
+    explicit MarkCache(size_t max_size_in_bytes)
+        : Base(max_size_in_bytes) {}
+
+    MarkCache(const String & mark_cache_policy, size_t max_size_in_bytes)
+        : Base(mark_cache_policy, max_size_in_bytes) {}
 
     /// Calculate key from path to file and offset.
     static UInt128 hash(const String & path_to_file)
diff --git a/src/Storages/MeiliSearch/StorageMeiliSearch.cpp b/src/Storages/MeiliSearch/StorageMeiliSearch.cpp
index 56dad2a0d13..e7350d38a20 100644
--- a/src/Storages/MeiliSearch/StorageMeiliSearch.cpp
+++ b/src/Storages/MeiliSearch/StorageMeiliSearch.cpp
@@ -18,6 +18,7 @@
 #include <Common/logger_useful.h>
 #include <Common/parseAddress.h>
 #include <Common/NamedCollections/NamedCollections.h>
+#include <Storages/MeiliSearch/MeiliSearchColumnDescriptionFetcher.h>
 
 namespace DB
 {
@@ -37,12 +38,27 @@ StorageMeiliSearch::StorageMeiliSearch(
     : IStorage(table_id), config{config_}, log(&Poco::Logger::get("StorageMeiliSearch (" + table_id.table_name + ")"))
 {
     StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(columns_);
+
+    if (columns_.empty())
+    {
+        auto columns = getTableStructureFromData(config);
+        storage_metadata.setColumns(columns);
+    }
+    else
+        storage_metadata.setColumns(columns_);
+
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
+ColumnsDescription StorageMeiliSearch::getTableStructureFromData(const MeiliSearchConfiguration & config_)
+{
+    MeiliSearchColumnDescriptionFetcher fetcher(config_);
+    fetcher.addParam(doubleQuoteString("limit"), "1");
+    return fetcher.fetchColumnsDescription();
+}
+
 String convertASTtoStr(ASTPtr ptr)
 {
     WriteBufferFromOwnString out;
@@ -99,7 +115,7 @@ Pipe StorageMeiliSearch::read(
         for (const auto & el : query_params->children)
         {
             auto str = el->getColumnName();
-            auto it = find(str.begin(), str.end(), '=');
+            auto it = std::find(str.begin(), str.end(), '=');
             if (it == str.end())
                 throw Exception(ErrorCodes::BAD_QUERY_PARAMETER, "meiliMatch function must have parameters of the form \'key=value\'");
 
@@ -129,7 +145,7 @@ SinkToStoragePtr StorageMeiliSearch::write(const ASTPtr & /*query*/, const Stora
 
 MeiliSearchConfiguration StorageMeiliSearch::getConfiguration(ASTs engine_args, ContextPtr context)
 {
-    if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args))
+    if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args, context))
     {
         validateNamedCollection(*named_collection, {"url", "index"}, {"key"});
 
@@ -175,6 +191,7 @@ void registerStorageMeiliSearch(StorageFactory & factory)
             return std::make_shared<StorageMeiliSearch>(args.table_id, config, args.columns, args.constraints, args.comment);
         },
         {
+            .supports_schema_inference = true,
             .source_access_type = AccessType::MEILISEARCH,
         });
 }
diff --git a/src/Storages/MeiliSearch/StorageMeiliSearch.h b/src/Storages/MeiliSearch/StorageMeiliSearch.h
index 5fa7ac2c0e3..41c1db53437 100644
--- a/src/Storages/MeiliSearch/StorageMeiliSearch.h
+++ b/src/Storages/MeiliSearch/StorageMeiliSearch.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/IStorage.h>
 #include <Storages/MeiliSearch/MeiliSearchConnection.h>
 
@@ -29,7 +28,9 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context) override;
 
-    MeiliSearchConfiguration static getConfiguration(ASTs engine_args, ContextPtr context);
+    static MeiliSearchConfiguration getConfiguration(ASTs engine_args, ContextPtr context);
+
+    static ColumnsDescription getTableStructureFromData(const MeiliSearchConfiguration & config_);
 
 private:
     MeiliSearchConfiguration config;
diff --git a/src/Storages/MergeTree/AlterConversions.cpp b/src/Storages/MergeTree/AlterConversions.cpp
new file mode 100644
index 00000000000..a98cd6d99f9
--- /dev/null
+++ b/src/Storages/MergeTree/AlterConversions.cpp
@@ -0,0 +1,62 @@
+#include <Storages/MergeTree/AlterConversions.h>
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+void AlterConversions::addMutationCommand(const MutationCommand & command)
+{
+    /// Currently only RENAME_COLUMN is applied on-fly.
+    if (command.type == MutationCommand::Type::RENAME_COLUMN)
+        rename_map.emplace_back(RenamePair{command.rename_to, command.column_name});
+}
+
+bool AlterConversions::columnHasNewName(const std::string & old_name) const
+{
+    for (const auto & [new_name, prev_name] : rename_map)
+    {
+        if (old_name == prev_name)
+            return true;
+    }
+
+    return false;
+}
+
+std::string AlterConversions::getColumnNewName(const std::string & old_name) const
+{
+    for (const auto & [new_name, prev_name] : rename_map)
+    {
+        if (old_name == prev_name)
+            return new_name;
+    }
+
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Column {} was not renamed", old_name);
+}
+
+bool AlterConversions::isColumnRenamed(const std::string & new_name) const
+{
+    for (const auto & [name_to, name_from] : rename_map)
+    {
+        if (name_to == new_name)
+            return true;
+    }
+    return false;
+}
+
+/// Get column old name before rename (lookup by key in rename_map)
+std::string AlterConversions::getColumnOldName(const std::string & new_name) const
+{
+    for (const auto & [name_to, name_from] : rename_map)
+    {
+        if (name_to == new_name)
+            return name_from;
+    }
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Column {} was not renamed", new_name);
+}
+
+}
diff --git a/src/Storages/MergeTree/AlterConversions.h b/src/Storages/MergeTree/AlterConversions.h
index 0d58499d424..4410b9c56e2 100644
--- a/src/Storages/MergeTree/AlterConversions.h
+++ b/src/Storages/MergeTree/AlterConversions.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Storages/MutationCommands.h>
 #include <string>
 #include <unordered_map>
 
@@ -7,18 +8,38 @@
 namespace DB
 {
 
-/// Alter conversions which should be applied on-fly for part. Build from of
-/// the most recent mutation commands for part. Now we have only rename_map
-/// here (from ALTER_RENAME) command, because for all other type of alters
-/// we can deduce conversions for part from difference between
-/// part->getColumns() and storage->getColumns().
-struct AlterConversions
-{
-    /// Rename map new_name -> old_name
-    std::unordered_map<std::string, std::string> rename_map;
 
-    bool isColumnRenamed(const std::string & new_name) const { return rename_map.count(new_name) > 0; }
-    std::string getColumnOldName(const std::string & new_name) const { return rename_map.at(new_name); }
+/// Alter conversions which should be applied on-fly for part.
+/// Built from of the most recent mutation commands for part.
+/// Now only ALTER RENAME COLUMN is applied.
+class AlterConversions : private boost::noncopyable
+{
+public:
+    AlterConversions() = default;
+
+    struct RenamePair
+    {
+        std::string rename_to;
+        std::string rename_from;
+    };
+
+    void addMutationCommand(const MutationCommand & command);
+    const std::vector<RenamePair> & getRenameMap() const { return rename_map; }
+
+    /// Column was renamed (lookup by value in rename_map)
+    bool columnHasNewName(const std::string & old_name) const;
+    /// Get new name for column (lookup by value in rename_map)
+    std::string getColumnNewName(const std::string & old_name) const;
+    /// Is this name is new name of column (lookup by key in rename_map)
+    bool isColumnRenamed(const std::string & new_name) const;
+    /// Get column old name before rename (lookup by key in rename_map)
+    std::string getColumnOldName(const std::string & new_name) const;
+
+private:
+    /// Rename map new_name -> old_name.
+    std::vector<RenamePair> rename_map;
 };
 
+using AlterConversionsPtr = std::shared_ptr<const AlterConversions>;
+
 }
diff --git a/src/Storages/MergeTree/AsyncBlockIDsCache.cpp b/src/Storages/MergeTree/AsyncBlockIDsCache.cpp
index 7a8a4cd4347..23b6668c8d8 100644
--- a/src/Storages/MergeTree/AsyncBlockIDsCache.cpp
+++ b/src/Storages/MergeTree/AsyncBlockIDsCache.cpp
@@ -32,17 +32,17 @@ std::vector<String> AsyncBlockIDsCache::getChildren()
     auto zookeeper = storage.getZooKeeper();
 
     auto watch_callback = [last_time = this->last_updatetime.load()
-                           , update_min_interval = this->update_min_interval
-                           , task = task->shared_from_this()](const Coordination::WatchResponse &)
+                           , my_update_min_interval = this->update_min_interval
+                           , my_task = task->shared_from_this()](const Coordination::WatchResponse &)
     {
         auto now = std::chrono::steady_clock::now();
-        if (now - last_time < update_min_interval)
+        if (now - last_time < my_update_min_interval)
         {
-            std::chrono::milliseconds sleep_time = std::chrono::duration_cast<std::chrono::milliseconds>(update_min_interval - (now - last_time));
-            task->scheduleAfter(sleep_time.count());
+            std::chrono::milliseconds sleep_time = std::chrono::duration_cast<std::chrono::milliseconds>(my_update_min_interval - (now - last_time));
+            my_task->scheduleAfter(sleep_time.count());
         }
         else
-            task->schedule();
+            my_task->schedule();
     };
     std::vector<String> children;
     Coordination::Stat stat;
diff --git a/src/Storages/MergeTree/AsyncBlockIDsCache.h b/src/Storages/MergeTree/AsyncBlockIDsCache.h
index a661d00f8a6..91d549a0501 100644
--- a/src/Storages/MergeTree/AsyncBlockIDsCache.h
+++ b/src/Storages/MergeTree/AsyncBlockIDsCache.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/logger_useful.h>
 #include <Core/BackgroundSchedulePool.h>
 
 #include <chrono>
diff --git a/src/Storages/MergeTree/BackgroundJobsAssignee.h b/src/Storages/MergeTree/BackgroundJobsAssignee.h
index db93b5f710b..27e75a79b97 100644
--- a/src/Storages/MergeTree/BackgroundJobsAssignee.h
+++ b/src/Storages/MergeTree/BackgroundJobsAssignee.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
-#include <Common/ThreadPool.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <pcg_random.hpp>
 
diff --git a/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp b/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
index 175df9b6e28..cfc3ff58f81 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
+++ b/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
@@ -5,10 +5,14 @@
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <Common/logger_useful.h>
+#include <Interpreters/Context.h>
 #include <Storages/MergeTree/localBackup.h>
 #include <Backups/BackupEntryFromSmallFile.h>
 #include <Backups/BackupEntryFromImmutableFile.h>
+#include <Backups/BackupEntryWrappedWith.h>
+#include <Backups/BackupSettings.h>
 #include <Disks/SingleDiskVolume.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
 
 namespace DB
 {
@@ -213,6 +217,11 @@ bool DataPartStorageOnDiskBase::isBroken() const
     return volume->getDisk()->isBroken();
 }
 
+bool DataPartStorageOnDiskBase::isReadonly() const
+{
+    return volume->getDisk()->isReadOnly();
+}
+
 void DataPartStorageOnDiskBase::syncRevision(UInt64 revision) const
 {
     volume->getDisk()->syncRevision(revision);
@@ -314,8 +323,9 @@ void DataPartStorageOnDiskBase::backup(
     const MergeTreeDataPartChecksums & checksums,
     const NameSet & files_without_checksums,
     const String & path_in_backup,
-    BackupEntries & backup_entries,
+    const BackupSettings & backup_settings,
     bool make_temporary_hard_links,
+    BackupEntries & backup_entries,
     TemporaryFilesOnDisks * temp_dirs) const
 {
     fs::path part_path_on_disk = fs::path{root_path} / part_dir;
@@ -356,6 +366,8 @@ void DataPartStorageOnDiskBase::backup(
 
     files_to_backup = getActualFileNamesOnDisk(files_to_backup);
 
+    bool copy_encrypted = !backup_settings.decrypt_files_from_encrypted_disks;
+
     for (const auto & filepath : files_to_backup)
     {
         auto filepath_on_disk = part_path_on_disk / filepath;
@@ -363,7 +375,7 @@ void DataPartStorageOnDiskBase::backup(
 
         if (files_without_checksums.contains(filepath))
         {
-            backup_entries.emplace_back(filepath_in_backup, std::make_unique<BackupEntryFromSmallFile>(disk, filepath_on_disk));
+            backup_entries.emplace_back(filepath_in_backup, std::make_unique<BackupEntryFromSmallFile>(disk, filepath_on_disk, copy_encrypted));
             continue;
         }
 
@@ -384,9 +396,12 @@ void DataPartStorageOnDiskBase::backup(
             file_hash = {it->second.file_hash.first, it->second.file_hash.second};
         }
 
-        backup_entries.emplace_back(
-            filepath_in_backup,
-            std::make_unique<BackupEntryFromImmutableFile>(disk, filepath_on_disk, file_size, file_hash, temp_dir_owner));
+        BackupEntryPtr backup_entry = std::make_unique<BackupEntryFromImmutableFile>(disk, filepath_on_disk, copy_encrypted, file_size, file_hash);
+
+        if (temp_dir_owner)
+            backup_entry = wrapBackupEntryWith(std::move(backup_entry), temp_dir_owner);
+
+        backup_entries.emplace_back(filepath_in_backup, std::move(backup_entry));
     }
 }
 
@@ -396,24 +411,38 @@ MutableDataPartStoragePtr DataPartStorageOnDiskBase::freeze(
     bool make_source_readonly,
     std::function<void(const DiskPtr &)> save_metadata_callback,
     bool copy_instead_of_hardlink,
-    const NameSet & files_to_copy_instead_of_hardlinks) const
+    const NameSet & files_to_copy_instead_of_hardlinks,
+    DiskTransactionPtr external_transaction) const
 {
     auto disk = volume->getDisk();
-    disk->createDirectories(to);
+    if (external_transaction)
+        external_transaction->createDirectories(to);
+    else
+        disk->createDirectories(to);
 
-    localBackup(disk, getRelativePath(), fs::path(to) / dir_path, make_source_readonly, {}, copy_instead_of_hardlink, files_to_copy_instead_of_hardlinks);
+    localBackup(disk, getRelativePath(), fs::path(to) / dir_path, make_source_readonly, {}, copy_instead_of_hardlink, files_to_copy_instead_of_hardlinks, external_transaction);
 
     if (save_metadata_callback)
         save_metadata_callback(disk);
 
-    disk->removeFileIfExists(fs::path(to) / dir_path / "delete-on-destroy.txt");
-    disk->removeFileIfExists(fs::path(to) / dir_path / "txn_version.txt");
+    if (external_transaction)
+    {
+        external_transaction->removeFileIfExists(fs::path(to) / dir_path / "delete-on-destroy.txt");
+        external_transaction->removeFileIfExists(fs::path(to) / dir_path / "txn_version.txt");
+        external_transaction->removeFileIfExists(fs::path(to) / dir_path / IMergeTreeDataPart::METADATA_VERSION_FILE_NAME);
+    }
+    else
+    {
+        disk->removeFileIfExists(fs::path(to) / dir_path / "delete-on-destroy.txt");
+        disk->removeFileIfExists(fs::path(to) / dir_path / "txn_version.txt");
+        disk->removeFileIfExists(fs::path(to) / dir_path / IMergeTreeDataPart::METADATA_VERSION_FILE_NAME);
+    }
 
     auto single_disk_volume = std::make_shared<SingleDiskVolume>(disk->getName(), disk, 0);
 
     /// Do not initialize storage in case of DETACH because part may be broken.
     bool to_detached = dir_path.starts_with("detached/");
-    return create(single_disk_volume, to, dir_path, /*initialize=*/ !to_detached);
+    return create(single_disk_volume, to, dir_path, /*initialize=*/ !to_detached && !external_transaction);
 }
 
 MutableDataPartStoragePtr DataPartStorageOnDiskBase::clonePart(
@@ -454,6 +483,7 @@ void DataPartStorageOnDiskBase::rename(
 
     if (volume->getDisk()->exists(to))
     {
+        /// FIXME it should be logical error
         if (remove_new_dir_if_exists)
         {
             Names files;
@@ -464,7 +494,8 @@ void DataPartStorageOnDiskBase::rename(
                     "Part directory {} already exists and contains {} files. Removing it.",
                     fullPath(volume->getDisk(), to), files.size());
 
-            executeWriteOperation([&](auto & disk) { disk.removeRecursive(to); });
+            /// Do not remove blobs if they exist
+            executeWriteOperation([&](auto & disk) { disk.removeSharedRecursive(to, true, {}); });
         }
         else
         {
@@ -567,6 +598,9 @@ void DataPartStorageOnDiskBase::remove(
             if (e.code() == ErrorCodes::FILE_DOESNT_EXIST)
             {
                 LOG_ERROR(log, "Directory {} (part to remove) doesn't exist or one of nested files has gone. Most likely this is due to manual removing. This should be discouraged. Ignoring.", fullPath(disk, from));
+                /// We will never touch this part again, so unlocking it from zero-copy
+                if (!can_remove_description)
+                    can_remove_description.emplace(can_remove_callback());
                 return;
             }
             throw;
@@ -577,6 +611,10 @@ void DataPartStorageOnDiskBase::remove(
             {
                 LOG_ERROR(log, "Directory {} (part to remove) doesn't exist or one of nested files has gone. "
                           "Most likely this is due to manual removing. This should be discouraged. Ignoring.", fullPath(disk, from));
+                /// We will never touch this part again, so unlocking it from zero-copy
+                if (!can_remove_description)
+                    can_remove_description.emplace(can_remove_callback());
+
                 return;
             }
             throw;
@@ -683,6 +721,7 @@ void DataPartStorageOnDiskBase::clearDirectory(
         request.emplace_back(fs::path(dir) / "default_compression_codec.txt", true);
         request.emplace_back(fs::path(dir) / "delete-on-destroy.txt", true);
         request.emplace_back(fs::path(dir) / "txn_version.txt", true);
+        request.emplace_back(fs::path(dir) / "metadata_version.txt", true);
 
         disk->removeSharedFiles(request, !can_remove_shared_data, names_not_to_remove);
         disk->removeDirectory(dir);
diff --git a/src/Storages/MergeTree/DataPartStorageOnDiskBase.h b/src/Storages/MergeTree/DataPartStorageOnDiskBase.h
index 7c408dcf381..6b27b7296fc 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDiskBase.h
+++ b/src/Storages/MergeTree/DataPartStorageOnDiskBase.h
@@ -39,6 +39,7 @@ public:
     bool supportZeroCopyReplication() const override;
     bool supportParallelWrite() const override;
     bool isBroken() const override;
+    bool isReadonly() const override;
     void syncRevision(UInt64 revision) const override;
     UInt64 getRevision() const override;
     std::string getDiskPath() const override;
@@ -52,8 +53,9 @@ public:
         const MergeTreeDataPartChecksums & checksums,
         const NameSet & files_without_checksums,
         const String & path_in_backup,
-        BackupEntries & backup_entries,
+        const BackupSettings & backup_settings,
         bool make_temporary_hard_links,
+        BackupEntries & backup_entries,
         TemporaryFilesOnDisks * temp_dirs) const override;
 
     MutableDataPartStoragePtr freeze(
@@ -62,7 +64,8 @@ public:
         bool make_source_readonly,
         std::function<void(const DiskPtr &)> save_metadata_callback,
         bool copy_instead_of_hardlink,
-        const NameSet & files_to_copy_instead_of_hardlinks) const override;
+        const NameSet & files_to_copy_instead_of_hardlinks,
+        DiskTransactionPtr external_transaction) const override;
 
     MutableDataPartStoragePtr clonePart(
         const std::string & to,
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index c6efe9c9589..21fdda28767 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -5,6 +5,7 @@
 #include <Formats/NativeWriter.h>
 #include <Disks/SingleDiskVolume.h>
 #include <Disks/createVolume.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/HTTPCommon.h>
 #include <IO/S3Common.h>
 #include <Server/HTTP/HTMLForm.h>
@@ -63,8 +64,9 @@ constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_DEFAULT_COMPRESSION = 4;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID = 5;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_ZERO_COPY = 6;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION = 7;
+constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_METADATA_VERSION = 8;
 // Reserved for ALTER PRIMARY KEY
-// constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PRIMARY_KEY = 8;
+// constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PRIMARY_KEY = 9;
 
 std::string getEndpointId(const std::string & node_id)
 {
@@ -120,7 +122,7 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
     MergeTreePartInfo::fromPartName(part_name, data.format_version);
 
     /// We pretend to work as older server version, to be sure that client will correctly process our version
-    response.addCookie({"server_protocol_version", toString(std::min(client_protocol_version, REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION))});
+    response.addCookie({"server_protocol_version", toString(std::min(client_protocol_version, REPLICATION_PROTOCOL_VERSION_WITH_METADATA_VERSION))});
 
     LOG_TRACE(log, "Sending part {}", part_name);
 
@@ -128,12 +130,7 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
 
     auto report_broken_part = [&]()
     {
-        if (part && part->isProjectionPart())
-        {
-            auto parent_part = part->getParentPart()->shared_from_this();
-            data.reportBrokenPart(parent_part);
-        }
-        else if (part)
+        if (part)
             data.reportBrokenPart(part);
         else
             LOG_TRACE(log, "Part {} was not found, do not report it as broken", part_name);
@@ -281,6 +278,10 @@ MergeTreeData::DataPart::Checksums Service::sendPartFromDisk(
             && name == IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME)
             continue;
 
+        if (client_protocol_version < REPLICATION_PROTOCOL_VERSION_WITH_METADATA_VERSION
+            && name == IMergeTreeDataPart::METADATA_VERSION_FILE_NAME)
+            continue;
+
         files_to_replicate.insert(name);
     }
 
@@ -349,10 +350,10 @@ MergeTreeData::DataPart::Checksums Service::sendPartFromDisk(
 
 MergeTreeData::DataPartPtr Service::findPart(const String & name)
 {
-    /// It is important to include PreActive and Outdated parts here because remote replicas cannot reliably
+    /// It is important to include Outdated parts here because remote replicas cannot reliably
     /// determine the local state of the part, so queries for the parts in these states are completely normal.
     auto part = data.getPartIfExists(
-        name, {MergeTreeDataPartState::PreActive, MergeTreeDataPartState::Active, MergeTreeDataPartState::Outdated});
+        name, {MergeTreeDataPartState::Active, MergeTreeDataPartState::Outdated});
     if (part)
         return part;
 
@@ -368,6 +369,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchSelectedPart(
     const StorageMetadataPtr & metadata_snapshot,
     ContextPtr context,
     const String & part_name,
+    const String & zookeeper_name,
     const String & replica_path,
     const String & host,
     int port,
@@ -400,15 +402,20 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchSelectedPart(
     /// Validation of the input that may come from malicious replica.
     auto part_info = MergeTreePartInfo::fromPartName(part_name, data.format_version);
 
+    String endpoint_id = getEndpointId(
+        data_settings->enable_the_endpoint_id_with_zookeeper_name_prefix ?
+        zookeeper_name + ":" + replica_path :
+        replica_path);
+
     Poco::URI uri;
     uri.setScheme(interserver_scheme);
     uri.setHost(host);
     uri.setPort(port);
     uri.setQueryParameters(
     {
-        {"endpoint",                getEndpointId(replica_path)},
+        {"endpoint",                endpoint_id},
         {"part",                    part_name},
-        {"client_protocol_version", toString(REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION)},
+        {"client_protocol_version", toString(REPLICATION_PROTOCOL_VERSION_WITH_METADATA_VERSION)},
         {"compress",                "false"}
     });
 
@@ -629,7 +636,15 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchSelectedPart(
             temporary_directory_lock = {};
 
             /// Try again but without zero-copy
-            return fetchSelectedPart(metadata_snapshot, context, part_name, replica_path, host, port, timeouts,
+            return fetchSelectedPart(
+                metadata_snapshot,
+                context,
+                part_name,
+                zookeeper_name,
+                replica_path,
+                host,
+                port,
+                timeouts,
                 user, password, interserver_scheme, throttler, to_detached, tmp_prefix, nullptr, false, disk);
         }
     }
@@ -708,7 +723,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
     auto block = block_in.read();
     throttler->add(block.bytes());
 
-    new_data_part->setColumns(block.getNamesAndTypesList(), {});
+    new_data_part->setColumns(block.getNamesAndTypesList(), {}, metadata_snapshot->getMetadataVersion());
 
     if (!is_projection)
     {
@@ -784,7 +799,8 @@ void Fetcher::downloadBaseOrProjectionPartToDisk(
 
         if (file_name != "checksums.txt" &&
             file_name != "columns.txt" &&
-            file_name != IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME)
+            file_name != IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME &&
+            file_name != IMergeTreeDataPart::METADATA_VERSION_FILE_NAME)
             checksums.addFile(file_name, file_size, expected_hash);
     }
 
@@ -814,6 +830,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     const auto data_settings = data.getSettings();
     MergeTreeData::DataPart::Checksums data_checksums;
 
+    zkutil::EphemeralNodeHolderPtr zero_copy_temporary_lock_holder;
     if (to_remote_disk)
     {
         readStringBinary(part_id, in);
@@ -822,7 +839,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
             throw Exception(ErrorCodes::ZERO_COPY_REPLICATION_ERROR, "Part {} unique id {} doesn't exist on {} (with type {}).", part_name, part_id, disk->getName(), toString(disk->getDataSourceDescription().type));
 
         LOG_DEBUG(log, "Downloading part {} unique id {} metadata onto disk {}.", part_name, part_id, disk->getName());
-        data.lockSharedDataTemporary(part_name, part_id, disk);
+        zero_copy_temporary_lock_holder = data.lockSharedDataTemporary(part_name, part_id, disk);
     }
     else
     {
@@ -911,6 +928,10 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
 
         new_data_part->version.setCreationTID(Tx::PrehistoricTID, nullptr);
         new_data_part->is_temp = true;
+        /// In case of replicated merge tree with zero copy replication
+        /// Here Clickhouse claims that this new part can be deleted in temporary state without unlocking the blobs
+        /// The blobs have to stay intact, this temporary part does not own them and does not share them yet.
+        new_data_part->remove_tmp_policy = IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::PRESERVE_BLOBS;
         new_data_part->modification_time = time(nullptr);
         new_data_part->loadColumnsChecksumsIndexes(true, false);
     }
@@ -931,7 +952,6 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
 
     if (to_remote_disk)
     {
-        data.lockSharedData(*new_data_part, /* replace_existing_lock = */ true, {});
         LOG_DEBUG(log, "Download of part {} unique id {} metadata onto disk {} finished.", part_name, part_id, disk->getName());
     }
     else
@@ -941,6 +961,9 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
         LOG_DEBUG(log, "Download of part {} onto disk {} finished.", part_name, disk->getName());
     }
 
+    if (zero_copy_temporary_lock_holder)
+        zero_copy_temporary_lock_holder->setAlreadyRemoved();
+
     return new_data_part;
 }
 
diff --git a/src/Storages/MergeTree/DataPartsExchange.h b/src/Storages/MergeTree/DataPartsExchange.h
index 20c15039a2d..704c1b0a226 100644
--- a/src/Storages/MergeTree/DataPartsExchange.h
+++ b/src/Storages/MergeTree/DataPartsExchange.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include "Storages/MergeTree/MergeTreePartInfo.h"
+#include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <Interpreters/InterserverIOHandler.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/IStorage_fwd.h>
 #include <IO/HashingWriteBuffer.h>
 #include <IO/copyData.h>
 #include <IO/ConnectionTimeouts.h>
-#include <IO/ReadWriteBufferFromHTTP.h>
 #include <Common/Throttler.h>
 
 
@@ -21,6 +20,7 @@ namespace DB
 {
 
 class StorageReplicatedMergeTree;
+class PooledReadWriteBufferFromHTTP;
 
 namespace DataPartsExchange
 {
@@ -70,6 +70,7 @@ public:
         const StorageMetadataPtr & metadata_snapshot,
         ContextPtr context,
         const String & part_name,
+        const String & zookeeper_name,
         const String & replica_path,
         const String & host,
         int port,
diff --git a/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp b/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
index 996d2bc46a5..5741e11aa22 100644
--- a/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
+++ b/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
@@ -24,7 +24,7 @@ template <typename T>
 std::optional<EphemeralLockInZooKeeper> createEphemeralLockInZooKeeper(
     const String & path_prefix_, const String & temp_path, const ZooKeeperWithFaultInjectionPtr & zookeeper_, const T & deduplication_path)
 {
-    constexpr bool async_insert = std::is_same_v<T, std::vector<String>>;
+    static constexpr bool async_insert = std::is_same_v<T, std::vector<String>>;
 
     String path;
 
@@ -42,16 +42,15 @@ std::optional<EphemeralLockInZooKeeper> createEphemeralLockInZooKeeper(
         if constexpr (async_insert)
         {
             for (const auto & single_dedup_path : deduplication_path)
-            {
-                ops.emplace_back(zkutil::makeCreateRequest(single_dedup_path, "", zkutil::CreateMode::Persistent));
-                ops.emplace_back(zkutil::makeRemoveRequest(single_dedup_path, -1));
-            }
+                zkutil::addCheckNotExistsRequest(ops, *zookeeper_, single_dedup_path);
         }
         else
         {
-            ops.emplace_back(zkutil::makeCreateRequest(deduplication_path, "", zkutil::CreateMode::Persistent));
-            ops.emplace_back(zkutil::makeRemoveRequest(deduplication_path, -1));
+            zkutil::addCheckNotExistsRequest(ops, *zookeeper_, deduplication_path);
         }
+
+        auto deduplication_path_ops_size = ops.size();
+
         ops.emplace_back(zkutil::makeCreateRequest(path_prefix_, holder_path, zkutil::CreateMode::EphemeralSequential));
         Coordination::Responses responses;
         Coordination::Error e = zookeeper_->tryMulti(ops, responses);
@@ -60,9 +59,10 @@ std::optional<EphemeralLockInZooKeeper> createEphemeralLockInZooKeeper(
             if constexpr (async_insert)
             {
                 auto failed_idx = zkutil::getFailedOpIndex(Coordination::Error::ZNODEEXISTS, responses);
-                if (failed_idx < deduplication_path.size() * 2)
+
+                if (failed_idx < deduplication_path_ops_size)
                 {
-                    const String & failed_op_path = deduplication_path[failed_idx / 2];
+                    const String & failed_op_path = ops[failed_idx]->getPath();
                     LOG_DEBUG(
                         &Poco::Logger::get("createEphemeralLockInZooKeeper"),
                         "Deduplication path already exists: deduplication_path={}",
diff --git a/src/Storages/MergeTree/IDataPartStorage.h b/src/Storages/MergeTree/IDataPartStorage.h
index f92784cb0da..f160254350d 100644
--- a/src/Storages/MergeTree/IDataPartStorage.h
+++ b/src/Storages/MergeTree/IDataPartStorage.h
@@ -11,7 +11,7 @@
 #include <memory>
 #include <optional>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/ZooKeeper/ZooKeeperWithFaultInjection.h>
+#include <Disks/IDiskTransaction.h>
 
 namespace DB
 {
@@ -66,6 +66,7 @@ using SyncGuardPtr = std::unique_ptr<ISyncGuard>;
 class IBackupEntry;
 using BackupEntryPtr = std::shared_ptr<const IBackupEntry>;
 using BackupEntries = std::vector<std::pair<String, BackupEntryPtr>>;
+struct BackupSettings;
 
 struct WriteSettings;
 
@@ -151,6 +152,7 @@ public:
     virtual bool supportZeroCopyReplication() const { return false; }
     virtual bool supportParallelWrite() const = 0;
     virtual bool isBroken() const = 0;
+    virtual bool isReadonly() const = 0;
 
     /// TODO: remove or at least remove const.
     virtual void syncRevision(UInt64 revision) const = 0;
@@ -200,8 +202,9 @@ public:
         const MergeTreeDataPartChecksums & checksums,
         const NameSet & files_without_checksums,
         const String & path_in_backup,
-        BackupEntries & backup_entries,
+        const BackupSettings & backup_settings,
         bool make_temporary_hard_links,
+        BackupEntries & backup_entries,
         TemporaryFilesOnDisks * temp_dirs) const = 0;
 
     /// Creates hardlinks into 'to/dir_path' for every file in data part.
@@ -210,13 +213,18 @@ public:
     /// implementation which relies on paths of some blobs in S3. For example if we want to hardlink
     /// the whole part during mutation we shouldn't hardlink checksums.txt, because otherwise
     /// zero-copy locks for different parts will be on the same path in zookeeper.
+    ///
+    /// If `external_transaction` is provided, the disk operations (creating directories, hardlinking,
+    /// etc) won't be applied immediately; instead, they'll be added to external_transaction, which the
+    /// caller then needs to commit.
     virtual std::shared_ptr<IDataPartStorage> freeze(
         const std::string & to,
         const std::string & dir_path,
         bool make_source_readonly,
         std::function<void(const DiskPtr &)> save_metadata_callback,
         bool copy_instead_of_hardlink,
-        const NameSet & files_to_copy_instead_of_hardlinks) const = 0;
+        const NameSet & files_to_copy_instead_of_hardlinks,
+        DiskTransactionPtr external_transaction = nullptr) const = 0;
 
     /// Make a full copy of a data part into 'to/dir_path' (possibly to a different disk).
     virtual std::shared_ptr<IDataPartStorage> clonePart(
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 85420cabb8d..d27b03fff44 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -34,6 +34,8 @@
 #include <Interpreters/MergeTreeTransaction.h>
 #include <Interpreters/TransactionLog.h>
 
+#include <Disks/IO/CachedOnDiskReadBufferFromFile.h>
+
 
 namespace CurrentMetrics
 {
@@ -416,10 +418,11 @@ std::pair<time_t, time_t> IMergeTreeDataPart::getMinMaxTime() const
 }
 
 
-void IMergeTreeDataPart::setColumns(const NamesAndTypesList & new_columns, const SerializationInfoByName & new_infos)
+void IMergeTreeDataPart::setColumns(const NamesAndTypesList & new_columns, const SerializationInfoByName & new_infos, int32_t metadata_version_)
 {
     columns = new_columns;
     serialization_infos = new_infos;
+    metadata_version = metadata_version_;
 
     column_name_to_position.clear();
     column_name_to_position.reserve(new_columns.size());
@@ -660,6 +663,7 @@ void IMergeTreeDataPart::appendFilesOfColumnsChecksumsIndexes(Strings & files, b
         appendFilesOfPartitionAndMinMaxIndex(files);
         appendFilesOfTTLInfos(files);
         appendFilesOfDefaultCompressionCodec(files);
+        appendFilesOfMetadataVersion(files);
     }
 
     if (!parent_part && include_projection)
@@ -798,6 +802,9 @@ NameSet IMergeTreeDataPart::getFileNamesWithoutChecksums() const
     if (getDataPartStorage().exists(TXN_VERSION_METADATA_FILE_NAME))
         result.emplace(TXN_VERSION_METADATA_FILE_NAME);
 
+    if (getDataPartStorage().exists(METADATA_VERSION_FILE_NAME))
+        result.emplace(METADATA_VERSION_FILE_NAME);
+
     return result;
 }
 
@@ -971,11 +978,22 @@ void IMergeTreeDataPart::removeVersionMetadata()
     getDataPartStorage().removeFileIfExists("txn_version.txt");
 }
 
+
+void IMergeTreeDataPart::removeMetadataVersion()
+{
+    getDataPartStorage().removeFileIfExists(METADATA_VERSION_FILE_NAME);
+}
+
 void IMergeTreeDataPart::appendFilesOfDefaultCompressionCodec(Strings & files)
 {
     files.push_back(DEFAULT_COMPRESSION_CODEC_FILE_NAME);
 }
 
+void IMergeTreeDataPart::appendFilesOfMetadataVersion(Strings & files)
+{
+    files.push_back(METADATA_VERSION_FILE_NAME);
+}
+
 CompressionCodecPtr IMergeTreeDataPart::detectDefaultCompressionCodec() const
 {
     /// In memory parts doesn't have any compression
@@ -1288,8 +1306,9 @@ void IMergeTreeDataPart::loadColumns(bool require)
         metadata_snapshot = metadata_snapshot->projections.get(name).metadata;
     NamesAndTypesList loaded_columns;
 
-    bool exists = metadata_manager->exists("columns.txt");
-    if (!exists)
+    bool is_readonly_storage = getDataPartStorage().isReadonly();
+
+    if (!metadata_manager->exists("columns.txt"))
     {
         /// We can get list of columns only from columns.txt in compact parts.
         if (require || part_type == Type::Compact)
@@ -1304,7 +1323,8 @@ void IMergeTreeDataPart::loadColumns(bool require)
         if (columns.empty())
             throw Exception(ErrorCodes::NO_FILE_IN_DATA_PART, "No columns in part {}", name);
 
-        writeColumns(loaded_columns, {});
+        if (!is_readonly_storage)
+            writeColumns(loaded_columns, {});
     }
     else
     {
@@ -1321,17 +1341,28 @@ void IMergeTreeDataPart::loadColumns(bool require)
         .choose_kind = false,
     };
 
-    SerializationInfoByName infos(loaded_columns, settings);
-    exists =  metadata_manager->exists(SERIALIZATION_FILE_NAME);
-    if (exists)
+    SerializationInfoByName infos;
+    if (metadata_manager->exists(SERIALIZATION_FILE_NAME))
     {
         auto in = metadata_manager->read(SERIALIZATION_FILE_NAME);
-        infos.readJSON(*in);
+        infos = SerializationInfoByName::readJSON(loaded_columns, settings, *in);
     }
 
-    setColumns(loaded_columns, infos);
+    int32_t loaded_metadata_version;
+    if (metadata_manager->exists(METADATA_VERSION_FILE_NAME))
+    {
+        auto in = metadata_manager->read(METADATA_VERSION_FILE_NAME);
+        readIntText(loaded_metadata_version, *in);
+    }
+    else
+    {
+        loaded_metadata_version = metadata_snapshot->getMetadataVersion();
+    }
+
+    setColumns(loaded_columns, infos, loaded_metadata_version);
 }
 
+
 /// Project part / part with project parts / compact part doesn't support LWD.
 bool IMergeTreeDataPart::supportLightweightDeleteMutate() const
 {
@@ -1525,6 +1556,10 @@ bool IMergeTreeDataPart::assertHasValidVersionMetadata() const
         size_t file_size = getDataPartStorage().getFileSize(TXN_VERSION_METADATA_FILE_NAME);
         auto buf = getDataPartStorage().readFile(TXN_VERSION_METADATA_FILE_NAME, ReadSettings().adjustBufferSize(file_size), file_size, std::nullopt);
 
+        /// FIXME https://github.com/ClickHouse/ClickHouse/issues/48465
+        if (dynamic_cast<CachedOnDiskReadBufferFromFile *>(buf.get()))
+            return true;
+
         readStringUntilEOF(content, *buf);
         ReadBufferFromString str_buf{content};
         VersionMetadata file;
@@ -1649,12 +1684,6 @@ void IMergeTreeDataPart::remove()
             return CanRemoveDescription{.can_remove_anything = true, .files_not_to_remove = {} };
         }
 
-        if (getState() == MergeTreeDataPartState::Temporary)
-        {
-            LOG_TRACE(storage.log, "Part {} in temporary state can be removed without unlocking shared state", name);
-            return CanRemoveDescription{.can_remove_anything = false, .files_not_to_remove = {} };
-        }
-
         auto [can_remove, files_not_to_remove] = canRemovePart();
         if (!can_remove)
             LOG_TRACE(storage.log, "Blobs of part {} cannot be removed", name);
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index ea1fd209a20..411de3af982 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -6,6 +6,7 @@
 #include <Core/NamesAndTypes.h>
 #include <Storages/IStorage.h>
 #include <Storages/LightweightDeleteDescription.h>
+#include <Storages/MergeTree/AlterConversions.h>
 #include <Storages/MergeTree/IDataPartStorage.h>
 #include <Storages/MergeTree/MergeTreeDataPartState.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularity.h>
@@ -92,6 +93,7 @@ public:
         const MarkRanges & mark_ranges,
         UncompressedCache * uncompressed_cache,
         MarkCache * mark_cache,
+        const AlterConversionsPtr & alter_conversions,
         const MergeTreeReaderSettings & reader_settings_,
         const ValueSizeMap & avg_value_size_hints_,
         const ReadBufferFromFileBase::ProfileCallback & profile_callback_) const = 0;
@@ -137,7 +139,11 @@ public:
 
     String getTypeName() const { return getType().toString(); }
 
-    void setColumns(const NamesAndTypesList & new_columns, const SerializationInfoByName & new_infos);
+    /// We could have separate method like setMetadata, but it's much more convenient to set it up with columns
+    void setColumns(const NamesAndTypesList & new_columns, const SerializationInfoByName & new_infos, int32_t metadata_version_);
+
+    /// Version of metadata for part (columns, pk and so on)
+    int32_t getMetadataVersion() const { return metadata_version; }
 
     const NamesAndTypesList & getColumns() const { return columns; }
     const ColumnsDescription & getColumnsDescription() const { return columns_description; }
@@ -157,7 +163,7 @@ public:
     void remove();
 
     /// Initialize columns (from columns.txt if exists, or create from column files if not).
-    /// Load checksums from checksums.txt if exists. Load index if required.
+    /// Load various metadata into memory: checksums from checksums.txt, index if required, etc.
     void loadColumnsChecksumsIndexes(bool require_columns_checksums, bool check_consistency);
     void appendFilesOfColumnsChecksumsIndexes(Strings & files, bool include_projection = false) const;
 
@@ -214,12 +220,32 @@ public:
     /// FIXME Why do we need this flag? What's difference from Temporary and DeleteOnDestroy state? Can we get rid of this?
     bool is_temp = false;
 
+    /// This type and the field remove_tmp_policy is used as a hint
+    /// to help avoid communication with keeper when temporary part is deleting.
+    /// The common procedure is to ask the keeper with unlock request to release a references to the blobs.
+    /// And then follow the keeper answer decide remove or preserve the blobs in that part from s3.
+    /// However in some special cases Clickhouse can make a decision without asking keeper.
+    enum class BlobsRemovalPolicyForTemporaryParts
+    {
+        /// decision about removing blobs is determined by keeper, the common case
+        ASK_KEEPER,
+        /// is set when Clickhouse is sure that the blobs in the part are belong only to it, other replicas have not seen them yet
+        REMOVE_BLOBS,
+        /// is set when Clickhouse is sure that the blobs belong to other replica and current replica has not locked them on s3 yet
+        PRESERVE_BLOBS,
+    };
+    BlobsRemovalPolicyForTemporaryParts remove_tmp_policy = BlobsRemovalPolicyForTemporaryParts::ASK_KEEPER;
+
     /// If true it means that there are no ZooKeeper node for this part, so it should be deleted only from filesystem
     bool is_duplicate = false;
 
     /// Frozen by ALTER TABLE ... FREEZE ... It is used for information purposes in system.parts table.
     mutable std::atomic<bool> is_frozen {false};
 
+    /// Indicated that the part was marked Outdated because it's broken, not because it's actually outdated
+    /// See outdateBrokenPartAndCloneToDetached(...)
+    mutable bool outdated_because_broken = false;
+
     /// Flag for keep S3 data when zero-copy replication over S3 turned on.
     mutable bool force_keep_shared_data = false;
 
@@ -308,6 +334,9 @@ public:
 
     mutable VersionMetadata version;
 
+    /// Version of part metadata (columns, pk and so on). Managed properly only for replicated merge tree.
+    int32_t metadata_version;
+
     /// For data in RAM ('index')
     UInt64 getIndexSizeInBytes() const;
     UInt64 getIndexSizeInAllocatedBytes() const;
@@ -379,8 +408,12 @@ public:
     /// (number of rows, number of rows with default values, etc).
     static inline constexpr auto SERIALIZATION_FILE_NAME = "serialization.json";
 
+    /// Version used for transactions.
     static inline constexpr auto TXN_VERSION_METADATA_FILE_NAME = "txn_version.txt";
 
+
+    static inline constexpr auto METADATA_VERSION_FILE_NAME = "metadata_version.txt";
+
     /// One of part files which is used to check how many references (I'd like
     /// to say hardlinks, but it will confuse even more) we have for the part
     /// for zero copy replication. Sadly it's very complex.
@@ -443,7 +476,11 @@ public:
 
     void writeDeleteOnDestroyMarker();
     void removeDeleteOnDestroyMarker();
+    /// It may look like a stupid joke. but these two methods are absolutely unrelated.
+    /// This one is about removing file with metadata about part version (for transactions)
     void removeVersionMetadata();
+    /// This one is about removing file with version of part's metadata (columns, pk and so on)
+    void removeMetadataVersion();
 
     mutable std::atomic<DataPartRemovalState> removal_state = DataPartRemovalState::NOT_ATTEMPTED;
 
@@ -582,6 +619,8 @@ private:
 
     static void appendFilesOfDefaultCompressionCodec(Strings & files);
 
+    static void appendFilesOfMetadataVersion(Strings & files);
+
     /// Found column without specific compression and return codec
     /// for this column with default parameters.
     CompressionCodecPtr detectDefaultCompressionCodec() const;
diff --git a/src/Storages/MergeTree/IMergeTreeDataPartInfoForReader.h b/src/Storages/MergeTree/IMergeTreeDataPartInfoForReader.h
index 648c3cfbb6b..55a9c7b1509 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPartInfoForReader.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPartInfoForReader.h
@@ -52,7 +52,7 @@ public:
 
     virtual const MergeTreeDataPartChecksums & getChecksums() const = 0;
 
-    virtual AlterConversions getAlterConversions() const = 0;
+    virtual AlterConversionsPtr getAlterConversions() const = 0;
 
     virtual size_t getMarksCount() const = 0;
 
diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index d3b623d656e..dc9e9001439 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -1,3 +1,4 @@
+#include <Storages/MergeTree/IMergeTreeReader.h>
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Common/escapeForFileName.h>
@@ -5,8 +6,6 @@
 #include <Columns/ColumnArray.h>
 #include <Interpreters/inplaceBlockConversions.h>
 #include <Interpreters/Context.h>
-#include <Storages/MergeTree/IMergeTreeReader.h>
-#include <Common/typeid_cast.h>
 
 
 namespace DB
@@ -133,9 +132,9 @@ void IMergeTreeReader::evaluateMissingDefaults(Block additional_columns, Columns
 String IMergeTreeReader::getColumnNameInPart(const NameAndTypePair & required_column) const
 {
     auto name_in_storage = required_column.getNameInStorage();
-    if (alter_conversions.isColumnRenamed(name_in_storage))
+    if (alter_conversions->isColumnRenamed(name_in_storage))
     {
-        name_in_storage = alter_conversions.getColumnOldName(name_in_storage);
+        name_in_storage = alter_conversions->getColumnOldName(name_in_storage);
         return Nested::concatenateName(name_in_storage, required_column.getSubcolumnName());
     }
 
diff --git a/src/Storages/MergeTree/IMergeTreeReader.h b/src/Storages/MergeTree/IMergeTreeReader.h
index c7396e882fa..a72d83a55e4 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.h
+++ b/src/Storages/MergeTree/IMergeTreeReader.h
@@ -50,8 +50,8 @@ public:
     /// Evaluate defaulted columns if necessary.
     void evaluateMissingDefaults(Block additional_columns, Columns & res_columns) const;
 
-    /// If part metadata is not equal to storage metadata, than
-    /// try to perform conversions of columns.
+    /// If part metadata is not equal to storage metadata,
+    /// then try to perform conversions of columns.
     void performRequiredConversions(Columns & res_columns) const;
 
     const NamesAndTypesList & getColumns() const { return requested_columns; }
@@ -61,7 +61,7 @@ public:
 
     MergeTreeDataPartInfoForReaderPtr data_part_info_for_read;
 
-    virtual void prefetchBeginOfRange(int64_t /* priority */) {}
+    virtual void prefetchBeginOfRange(Priority) {}
 
 protected:
     /// Returns actual column name in part, which can differ from table metadata.
@@ -104,7 +104,7 @@ protected:
 
 private:
     /// Alter conversions, which must be applied on fly if required
-    AlterConversions alter_conversions;
+    AlterConversionsPtr alter_conversions;
 
     /// Columns that are requested to read.
     NamesAndTypesList requested_columns;
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
index 37da6014d1b..21bead2864a 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
@@ -1,6 +1,7 @@
 #include <Storages/MergeTree/IMergedBlockOutputStream.h>
 #include <Storages/MergeTree/MergeTreeIOSettings.h>
 #include <Storages/MergeTree/IMergeTreeDataPartWriter.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index 5c71804ef27..b8ef2152a99 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -743,9 +743,16 @@ KeyCondition::KeyCondition(
     , single_point(single_point_)
     , strict(strict_)
 {
+    size_t key_index = 0;
     for (const auto & name : key_column_names)
+    {
         if (!key_columns.contains(name))
+        {
             key_columns[name] = key_columns.size();
+            key_indices.push_back(key_index);
+        }
+        ++key_index;
+    }
 
     auto filter_node = buildFilterNode(query, additional_filter_asts);
 
@@ -808,9 +815,16 @@ KeyCondition::KeyCondition(
     , single_point(single_point_)
     , strict(strict_)
 {
+    size_t key_index = 0;
     for (const auto & name : key_column_names)
+    {
         if (!key_columns.contains(name))
+        {
             key_columns[name] = key_columns.size();
+            key_indices.push_back(key_index);
+        }
+        ++key_index;
+    }
 
     if (!filter_dag)
     {
@@ -1169,7 +1183,7 @@ bool KeyCondition::tryPrepareSetIndex(
         /// Note: in case of ActionsDAG, tuple may be a constant.
         /// In this case, there is no keys in tuple. So, we don't have to check it.
         auto left_arg_tuple = left_arg.toFunctionNode();
-        if (left_arg_tuple.getFunctionName() == "tuple")
+        if (left_arg_tuple.getFunctionName() == "tuple" && left_arg_tuple.getArgumentsSize() > 1)
         {
             left_args_count = left_arg_tuple.getArgumentsSize();
             for (size_t i = 0; i < left_args_count; ++i)
@@ -1985,9 +1999,9 @@ static BoolMask forAnyHyperrectangle(
         if (left_bounded && right_bounded)
             hyperrectangle[prefix_size] = Range(left_keys[prefix_size], true, right_keys[prefix_size], true);
         else if (left_bounded)
-            hyperrectangle[prefix_size] = Range::createLeftBounded(left_keys[prefix_size], true);
+            hyperrectangle[prefix_size] = Range::createLeftBounded(left_keys[prefix_size], true, data_types[prefix_size]->isNullable());
         else if (right_bounded)
-            hyperrectangle[prefix_size] = Range::createRightBounded(right_keys[prefix_size], true);
+            hyperrectangle[prefix_size] = Range::createRightBounded(right_keys[prefix_size], true, data_types[prefix_size]->isNullable());
 
         return callback(hyperrectangle);
     }
@@ -2561,25 +2575,6 @@ bool KeyCondition::alwaysFalse() const
     return rpn_stack[0] == 0;
 }
 
-size_t KeyCondition::getMaxKeyColumn() const
-{
-    size_t res = 0;
-    for (const auto & element : rpn)
-    {
-        if (element.function == RPNElement::FUNCTION_NOT_IN_RANGE
-            || element.function == RPNElement::FUNCTION_IN_RANGE
-            || element.function == RPNElement::FUNCTION_IS_NULL
-            || element.function == RPNElement::FUNCTION_IS_NOT_NULL
-            || element.function == RPNElement::FUNCTION_IN_SET
-            || element.function == RPNElement::FUNCTION_NOT_IN_SET)
-        {
-            if (element.key_column > res)
-                res = element.key_column;
-        }
-    }
-    return res;
-}
-
 bool KeyCondition::hasMonotonicFunctionsChain() const
 {
     for (const auto & element : rpn)
diff --git a/src/Storages/MergeTree/KeyCondition.h b/src/Storages/MergeTree/KeyCondition.h
index 0a4ac93b082..f29ace57e32 100644
--- a/src/Storages/MergeTree/KeyCondition.h
+++ b/src/Storages/MergeTree/KeyCondition.h
@@ -286,9 +286,6 @@ public:
 
     bool alwaysFalse() const;
 
-    /// Get the maximum number of the key element used in the condition.
-    size_t getMaxKeyColumn() const;
-
     bool hasMonotonicFunctionsChain() const;
 
     /// Impose an additional condition: the value in the column `column` must be in the range `range`.
@@ -297,6 +294,9 @@ public:
 
     String toString() const;
 
+    /// Get the key indices of key names used in the condition.
+    const std::vector<size_t> & getKeyIndices() const { return key_indices; }
+
     /// Condition description for EXPLAIN query.
     struct Description
     {
@@ -478,6 +478,8 @@ private:
     RPN rpn;
 
     ColumnIndices key_columns;
+    std::vector<size_t> key_indices;
+
     /// Expression which is used for key condition.
     const ExpressionActionsPtr key_expr;
     /// All intermediate columns are used to calculate key_expr.
diff --git a/src/Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h b/src/Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h
index 3363c75dd6f..aec102f3f7d 100644
--- a/src/Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h
+++ b/src/Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <Storages/MergeTree/AlterConversions.h>
 #include <Storages/MergeTree/IMergeTreeDataPartInfoForReader.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 
@@ -9,9 +10,11 @@ namespace DB
 class LoadedMergeTreeDataPartInfoForReader final : public IMergeTreeDataPartInfoForReader
 {
 public:
-    explicit LoadedMergeTreeDataPartInfoForReader(MergeTreeData::DataPartPtr data_part_)
+    LoadedMergeTreeDataPartInfoForReader(
+        MergeTreeData::DataPartPtr data_part_, AlterConversionsPtr alter_conversions_)
         : IMergeTreeDataPartInfoForReader(data_part_->storage.getContext())
-        , data_part(data_part_)
+        , data_part(std::move(data_part_))
+        , alter_conversions(std::move(alter_conversions_))
     {
     }
 
@@ -33,7 +36,7 @@ public:
 
     std::optional<size_t> getColumnPosition(const String & column_name) const override { return data_part->getColumnPosition(column_name); }
 
-    AlterConversions getAlterConversions() const override { return data_part->storage.getAlterConversionsForPart(data_part); }
+    AlterConversionsPtr getAlterConversions() const override { return alter_conversions; }
 
     String getColumnNameWithMinimumCompressedSize(bool with_subcolumns) const override { return data_part->getColumnNameWithMinimumCompressedSize(with_subcolumns); }
 
@@ -53,8 +56,11 @@ public:
 
     SerializationPtr getSerialization(const NameAndTypePair & column) const override { return data_part->getSerialization(column.name); }
 
+    MergeTreeData::DataPartPtr getDataPart() const { return data_part; }
+
 private:
     MergeTreeData::DataPartPtr data_part;
+    AlterConversionsPtr alter_conversions;
 };
 
 }
diff --git a/src/Storages/MergeTree/MarkRange.h b/src/Storages/MergeTree/MarkRange.h
index d1f4e1a4b45..f31d6a2a73b 100644
--- a/src/Storages/MergeTree/MarkRange.h
+++ b/src/Storages/MergeTree/MarkRange.h
@@ -63,7 +63,7 @@ struct fmt::formatter<DB::MarkRange>
 
         /// Only support {}.
         if (it != end && *it != '}')
-            throw format_error("invalid format");
+            throw fmt::format_error("invalid format");
 
         return it;
     }
@@ -71,6 +71,6 @@ struct fmt::formatter<DB::MarkRange>
     template <typename FormatContext>
     auto format(const DB::MarkRange & range, FormatContext & ctx)
     {
-        return format_to(ctx.out(), "{}", fmt::format("({}, {})", range.begin, range.end));
+        return fmt::format_to(ctx.out(), "{}", fmt::format("({}, {})", range.begin, range.end));
     }
 };
diff --git a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
index e017c9681e8..a5b4a29cb18 100644
--- a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
@@ -218,9 +218,10 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
 
             zero_copy_lock = storage.tryCreateZeroCopyExclusiveLock(entry.new_part_name, disk);
 
-            if (!zero_copy_lock)
+            if (!zero_copy_lock || !zero_copy_lock->isLocked())
             {
                 LOG_DEBUG(log, "Merge of part {} started by some other replica, will wait it and fetch merged part", entry.new_part_name);
+                storage.watchZeroCopyLock(entry.new_part_name, disk);
                 /// Don't check for missing part -- it's missing because other replica still not
                 /// finished merge.
                 return PrepareResult{
@@ -259,12 +260,15 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
 
     auto table_id = storage.getStorageID();
 
+    task_context = Context::createCopy(storage.getContext());
+    task_context->makeQueryContext();
+    task_context->setCurrentQueryId("");
+
     /// Add merge to list
-    const Settings & settings = storage.getContext()->getSettingsRef();
     merge_mutate_entry = storage.getContext()->getMergeList().insert(
         storage.getStorageID(),
         future_merged_part,
-        settings);
+        task_context);
 
     transaction_ptr = std::make_unique<MergeTreeData::Transaction>(storage, NO_TRANSACTION_RAW);
     stopwatch_ptr = std::make_unique<Stopwatch>();
diff --git a/src/Storages/MergeTree/MergeList.cpp b/src/Storages/MergeTree/MergeList.cpp
index 76d69cc6b7d..1cd2d11da50 100644
--- a/src/Storages/MergeTree/MergeList.cpp
+++ b/src/Storages/MergeTree/MergeList.cpp
@@ -11,56 +11,19 @@ namespace DB
 {
 
 
-MemoryTrackerThreadSwitcher::MemoryTrackerThreadSwitcher(MergeListEntry & merge_list_entry_)
-    : merge_list_entry(merge_list_entry_)
-{
-    // Each merge is executed into separate background processing pool thread
-    background_thread_memory_tracker = CurrentThread::getMemoryTracker();
-    background_thread_memory_tracker_prev_parent = background_thread_memory_tracker->getParent();
-    background_thread_memory_tracker->setParent(&merge_list_entry->memory_tracker);
-
-    prev_untracked_memory_limit = current_thread->untracked_memory_limit;
-    current_thread->untracked_memory_limit = merge_list_entry->max_untracked_memory;
-
-    /// Avoid accounting memory from another mutation/merge
-    /// (NOTE: consider moving such code to ThreadFromGlobalPool and related places)
-    prev_untracked_memory = current_thread->untracked_memory;
-    current_thread->untracked_memory = merge_list_entry->untracked_memory;
-
-    prev_query_id = std::string(current_thread->getQueryId());
-    current_thread->setQueryId(merge_list_entry->query_id);
-}
-
-
-MemoryTrackerThreadSwitcher::~MemoryTrackerThreadSwitcher()
-{
-    // Unplug memory_tracker from current background processing pool thread
-    background_thread_memory_tracker->setParent(background_thread_memory_tracker_prev_parent);
-
-    current_thread->untracked_memory_limit = prev_untracked_memory_limit;
-
-    merge_list_entry->untracked_memory = current_thread->untracked_memory;
-    current_thread->untracked_memory = prev_untracked_memory;
-
-    current_thread->setQueryId(prev_query_id);
-}
-
 MergeListElement::MergeListElement(
     const StorageID & table_id_,
     FutureMergedMutatedPartPtr future_part,
-    const Settings & settings)
+    const ContextPtr & context)
     : table_id{table_id_}
     , partition_id{future_part->part_info.partition_id}
     , result_part_name{future_part->name}
     , result_part_path{future_part->path}
     , result_part_info{future_part->part_info}
     , num_parts{future_part->parts.size()}
-    , max_untracked_memory(settings.max_untracked_memory)
-    , query_id(table_id.getShortName() + "::" + result_part_name)
     , thread_id{getThreadId()}
     , merge_type{future_part->merge_type}
     , merge_algorithm{MergeAlgorithm::Undecided}
-    , description{"to apply mutate/merge in " + query_id}
 {
     for (const auto & source_part : future_part->parts)
     {
@@ -68,6 +31,7 @@ MergeListElement::MergeListElement(
         source_part_paths.emplace_back(source_part->getDataPartStorage().getFullPath());
 
         total_size_bytes_compressed += source_part->getBytesOnDisk();
+        total_size_bytes_uncompressed += source_part->getTotalColumnsSize().data_uncompressed;
         total_size_marks += source_part->getMarksCount();
         total_rows_count += source_part->index_granularity.getTotalRows();
     }
@@ -78,34 +42,7 @@ MergeListElement::MergeListElement(
         is_mutation = (result_part_info.getDataVersion() != source_data_version);
     }
 
-    memory_tracker.setDescription(description.c_str());
-    /// MemoryTracker settings should be set here, because
-    /// later (see MemoryTrackerThreadSwitcher)
-    /// parent memory tracker will be changed, and if merge executed from the
-    /// query (OPTIMIZE TABLE), all settings will be lost (since
-    /// current_thread::memory_tracker will have Thread level MemoryTracker,
-    /// which does not have any settings itself, it relies on the settings of the
-    /// thread_group::memory_tracker, but MemoryTrackerThreadSwitcher will reset parent).
-    memory_tracker.setProfilerStep(settings.memory_profiler_step);
-    memory_tracker.setSampleProbability(settings.memory_profiler_sample_probability);
-    memory_tracker.setSoftLimit(settings.memory_overcommit_ratio_denominator);
-    if (settings.memory_tracker_fault_probability > 0.0)
-        memory_tracker.setFaultProbability(settings.memory_tracker_fault_probability);
-
-    /// Let's try to copy memory related settings from the query,
-    /// since settings that we have here is not from query, but global, from the table.
-    ///
-    /// NOTE: Remember, that Thread level MemoryTracker does not have any settings,
-    /// so it's parent is required.
-    MemoryTracker * query_memory_tracker = CurrentThread::getMemoryTracker();
-    MemoryTracker * parent_query_memory_tracker;
-    if (query_memory_tracker->level == VariableContext::Thread &&
-        (parent_query_memory_tracker = query_memory_tracker->getParent()) &&
-        parent_query_memory_tracker != &total_memory_tracker)
-    {
-        memory_tracker.setOrRaiseHardLimit(parent_query_memory_tracker->getHardLimit());
-    }
-
+    thread_group = ThreadGroup::createForBackgroundProcess(context);
 }
 
 MergeInfo MergeListElement::getInfo() const
@@ -121,6 +58,7 @@ MergeInfo MergeListElement::getInfo() const
     res.progress = progress.load(std::memory_order_relaxed);
     res.num_parts = num_parts;
     res.total_size_bytes_compressed = total_size_bytes_compressed;
+    res.total_size_bytes_uncompressed = total_size_bytes_uncompressed;
     res.total_size_marks = total_size_marks;
     res.total_rows_count = total_rows_count;
     res.bytes_read_uncompressed = bytes_read_uncompressed.load(std::memory_order_relaxed);
@@ -128,7 +66,7 @@ MergeInfo MergeListElement::getInfo() const
     res.rows_read = rows_read.load(std::memory_order_relaxed);
     res.rows_written = rows_written.load(std::memory_order_relaxed);
     res.columns_written = columns_written.load(std::memory_order_relaxed);
-    res.memory_usage = memory_tracker.get();
+    res.memory_usage = getMemoryTracker().get();
     res.thread_id = thread_id;
     res.merge_type = toString(merge_type);
     res.merge_algorithm = toString(merge_algorithm.load(std::memory_order_relaxed));
@@ -144,9 +82,7 @@ MergeInfo MergeListElement::getInfo() const
 
 MergeListElement::~MergeListElement()
 {
-    CurrentThread::getMemoryTracker()->adjustWithUntrackedMemory(untracked_memory);
-    untracked_memory = 0;
+    background_memory_tracker.adjustOnBackgroundTaskEnd(&getMemoryTracker());
 }
 
-
 }
diff --git a/src/Storages/MergeTree/MergeList.h b/src/Storages/MergeTree/MergeList.h
index 17a56272a57..ffa87e75505 100644
--- a/src/Storages/MergeTree/MergeList.h
+++ b/src/Storages/MergeTree/MergeList.h
@@ -5,6 +5,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/MemoryTracker.h>
+#include <Common/ThreadStatus.h>
 #include <Storages/MergeTree/MergeType.h>
 #include <Storages/MergeTree/MergeAlgorithm.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
@@ -39,6 +40,7 @@ struct MergeInfo
     Float64 progress;
     UInt64 num_parts;
     UInt64 total_size_bytes_compressed;
+    UInt64 total_size_bytes_uncompressed;
     UInt64 total_size_marks;
     UInt64 total_rows_count;
     UInt64 bytes_read_uncompressed;
@@ -61,26 +63,6 @@ using MergeListEntry = BackgroundProcessListEntry<MergeListElement, MergeInfo>;
 struct Settings;
 
 
-/**
- * Since merge is executed with multiple threads, this class
- * switches the parent MemoryTracker to account all the memory used.
- */
-class MemoryTrackerThreadSwitcher : boost::noncopyable
-{
-public:
-    explicit MemoryTrackerThreadSwitcher(MergeListEntry & merge_list_entry_);
-    ~MemoryTrackerThreadSwitcher();
-private:
-    MergeListEntry & merge_list_entry;
-    MemoryTracker * background_thread_memory_tracker;
-    MemoryTracker * background_thread_memory_tracker_prev_parent = nullptr;
-    Int64 prev_untracked_memory_limit;
-    Int64 prev_untracked_memory;
-    String prev_query_id;
-};
-
-using MemoryTrackerThreadSwitcherPtr = std::unique_ptr<MemoryTrackerThreadSwitcher>;
-
 struct MergeListElement : boost::noncopyable
 {
     const StorageID table_id;
@@ -101,6 +83,7 @@ struct MergeListElement : boost::noncopyable
     std::atomic<bool> is_cancelled{};
 
     UInt64 total_size_bytes_compressed{};
+    UInt64 total_size_bytes_uncompressed{};
     UInt64 total_size_marks{};
     UInt64 total_rows_count{};
     std::atomic<UInt64> bytes_read_uncompressed{};
@@ -113,35 +96,27 @@ struct MergeListElement : boost::noncopyable
     /// Updated only for Vertical algorithm
     std::atomic<UInt64> columns_written{};
 
-    /// Used to adjust ThreadStatus::untracked_memory_limit
-    UInt64 max_untracked_memory;
-    /// Used to avoid losing any allocation context
-    UInt64 untracked_memory = 0;
-    /// Used for identifying mutations/merges in trace_log
-    std::string query_id;
-
     UInt64 thread_id;
     MergeType merge_type;
     /// Detected after merge already started
     std::atomic<MergeAlgorithm> merge_algorithm;
 
-    /// Description used for logging
-    /// Needs to outlive memory_tracker since it's used in its destructor
-    const String description{"Mutate/Merge"};
-    MemoryTracker memory_tracker{VariableContext::Process};
+    ThreadGroupPtr thread_group;
 
     MergeListElement(
         const StorageID & table_id_,
         FutureMergedMutatedPartPtr future_part,
-        const Settings & settings);
+        const ContextPtr & context);
 
     MergeInfo getInfo() const;
 
+    const MemoryTracker & getMemoryTracker() const { return thread_group->memory_tracker; }
+
     MergeListElement * ptr() { return this; }
 
-    ~MergeListElement();
-
     MergeListElement & ref() { return *this; }
+
+    ~MergeListElement();
 };
 
 /** Maintains a list of currently running merges.
diff --git a/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
index 1ccdefd2b6a..871672c442b 100644
--- a/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
+++ b/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
@@ -4,6 +4,8 @@
 #include <Storages/StorageMergeTree.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
 #include <Common/ProfileEventsScope.h>
+#include <Common/ProfileEvents.h>
+
 
 namespace DB
 {
@@ -28,13 +30,17 @@ void MergePlainMergeTreeTask::onCompleted()
 
 bool MergePlainMergeTreeTask::executeStep()
 {
-    /// Metrics will be saved in the thread_group.
+    /// All metrics will be saved in the thread_group, including all scheduled tasks.
+    /// In profile_counters only metrics from this thread will be saved.
     ProfileEventsScope profile_events_scope(&profile_counters);
 
     /// Make out memory tracker a parent of current thread memory tracker
-    MemoryTrackerThreadSwitcherPtr switcher;
+    std::optional<ThreadGroupSwitcher> switcher;
     if (merge_list_entry)
-        switcher = std::make_unique<MemoryTrackerThreadSwitcher>(*merge_list_entry);
+    {
+        switcher.emplace((*merge_list_entry)->thread_group);
+
+    }
 
     switch (state)
     {
@@ -81,11 +87,11 @@ void MergePlainMergeTreeTask::prepare()
     future_part = merge_mutate_entry->future_part;
     stopwatch_ptr = std::make_unique<Stopwatch>();
 
-    const Settings & settings = storage.getContext()->getSettingsRef();
+    task_context = createTaskContext();
     merge_list_entry = storage.getContext()->getMergeList().insert(
         storage.getStorageID(),
         future_part,
-        settings);
+        task_context);
 
     write_part_log = [this] (const ExecutionStatus & execution_status)
     {
@@ -102,6 +108,19 @@ void MergePlainMergeTreeTask::prepare()
             std::move(profile_counters_snapshot));
     };
 
+    transfer_profile_counters_to_initial_query = [this, query_thread_group = CurrentThread::getGroup()] ()
+    {
+        if (query_thread_group)
+        {
+            auto task_thread_group = (*merge_list_entry)->thread_group;
+            auto task_counters_snapshot = task_thread_group->performance_counters.getPartiallyAtomicSnapshot();
+
+            auto & query_counters = query_thread_group->performance_counters;
+            for (ProfileEvents::Event i = ProfileEvents::Event(0); i < ProfileEvents::end(); ++i)
+                query_counters.incrementNoTrace(i, task_counters_snapshot[i]);
+        }
+    };
+
     merge_task = storage.merger_mutator.mergePartsToTemporaryPart(
             future_part,
             metadata_snapshot,
@@ -109,7 +128,7 @@ void MergePlainMergeTreeTask::prepare()
             {} /* projection_merge_list_element */,
             table_lock_holder,
             time(nullptr),
-            storage.getContext(),
+            task_context,
             merge_mutate_entry->tagger->reserved_space,
             deduplicate,
             deduplicate_by_columns,
@@ -129,6 +148,16 @@ void MergePlainMergeTreeTask::finish()
 
     write_part_log({});
     storage.incrementMergedPartsProfileEvent(new_part->getType());
+    transfer_profile_counters_to_initial_query();
+}
+
+ContextMutablePtr MergePlainMergeTreeTask::createTaskContext() const
+{
+    auto context = Context::createCopy(storage.getContext());
+    context->makeQueryContext();
+    auto queryId = storage.getStorageID().getShortName() + "::" + future_part->name;
+    context->setCurrentQueryId(queryId);
+    return context;
 }
 
 }
diff --git a/src/Storages/MergeTree/MergePlainMergeTreeTask.h b/src/Storages/MergeTree/MergePlainMergeTreeTask.h
index 583ea2e11ae..369b4390da7 100644
--- a/src/Storages/MergeTree/MergePlainMergeTreeTask.h
+++ b/src/Storages/MergeTree/MergePlainMergeTreeTask.h
@@ -80,6 +80,7 @@ private:
     UInt64 priority{0};
 
     std::function<void(const ExecutionStatus &)> write_part_log;
+    std::function<void()> transfer_profile_counters_to_initial_query;
     IExecutableTask::TaskResultCallback task_result_callback;
     MergeTaskPtr merge_task{nullptr};
 
@@ -87,6 +88,10 @@ private:
     MergeTreeTransactionPtr txn;
 
     ProfileEvents::Counters profile_counters;
+
+    ContextMutablePtr task_context;
+
+    ContextMutablePtr createTaskContext() const;
 };
 
 
diff --git a/src/Storages/MergeTree/MergeSelector.h b/src/Storages/MergeTree/MergeSelector.h
index c55f738f879..2f17e1e9654 100644
--- a/src/Storages/MergeTree/MergeSelector.h
+++ b/src/Storages/MergeTree/MergeSelector.h
@@ -11,6 +11,8 @@
 namespace DB
 {
 
+class IMergeTreeDataPart;
+
 /** Interface of algorithm to select data parts to merge
  *   (merge is also known as "compaction").
   * Following properties depend on it:
@@ -26,6 +28,7 @@ namespace DB
   */
 class IMergeSelector
 {
+    using DataPartPtr = std::shared_ptr<const IMergeTreeDataPart>;
 public:
     /// Information about data part relevant to merge selecting strategy.
     struct Part
@@ -50,6 +53,11 @@ public:
         ASTPtr compression_codec_desc;
 
         bool shall_participate_in_merges = true;
+
+        const DataPartPtr & getDataPartPtr() const
+        {
+            return *static_cast<const DataPartPtr *>(data);
+        }
     };
 
     /// Parts are belong to partitions. Only parts within same partition could be merged.
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
index b961b70428e..8f39c31eae0 100644
--- a/src/Storages/MergeTree/MergeTask.cpp
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -96,6 +96,32 @@ static void extractMergingAndGatheringColumns(
     }
 }
 
+static void addMissedColumnsToSerializationInfos(
+    size_t num_rows_in_parts,
+    const Names & part_columns,
+    const ColumnsDescription & storage_columns,
+    const SerializationInfo::Settings & info_settings,
+    SerializationInfoByName & new_infos)
+{
+    NameSet part_columns_set(part_columns.begin(), part_columns.end());
+
+    for (const auto & column : storage_columns)
+    {
+        if (part_columns_set.contains(column.name))
+            continue;
+
+        if (column.default_desc.kind != ColumnDefaultKind::Default)
+            continue;
+
+        if (column.default_desc.expression)
+            continue;
+
+        auto new_info = column.type->createSerializationInfo(info_settings);
+        new_info->addDefaults(num_rows_in_parts);
+        new_infos.emplace(column.name, std::move(new_info));
+    }
+}
+
 
 bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
 {
@@ -167,8 +193,9 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
     global_ctx->storage_columns = global_ctx->metadata_snapshot->getColumns().getAllPhysical();
 
     auto object_columns = MergeTreeData::getConcreteObjectColumns(global_ctx->future_part->parts, global_ctx->metadata_snapshot->getColumns());
-    global_ctx->storage_snapshot = std::make_shared<StorageSnapshot>(*global_ctx->data, global_ctx->metadata_snapshot, object_columns);
+
     extendObjectColumns(global_ctx->storage_columns, object_columns, false);
+    global_ctx->storage_snapshot = std::make_shared<StorageSnapshot>(*global_ctx->data, global_ctx->metadata_snapshot, std::move(object_columns));
 
     extractMergingAndGatheringColumns(
         global_ctx->storage_columns,
@@ -183,6 +210,10 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
     global_ctx->new_data_part->uuid = global_ctx->future_part->uuid;
     global_ctx->new_data_part->partition.assign(global_ctx->future_part->getPartition());
     global_ctx->new_data_part->is_temp = global_ctx->parent_part == nullptr;
+    /// In case of replicated merge tree with zero copy replication
+    /// Here Clickhouse claims that this new part can be deleted in temporary state without unlocking the blobs
+    /// The blobs have to be removed along with the part, this temporary part owns them and does not share them yet.
+    global_ctx->new_data_part->remove_tmp_policy = IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::REMOVE_BLOBS;
 
     ctx->need_remove_expired_values = false;
     ctx->force_ttl = false;
@@ -205,10 +236,22 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
             ctx->force_ttl = true;
         }
 
-        infos.add(part->getSerializationInfos());
+        if (!info_settings.isAlwaysDefault())
+        {
+            auto part_infos = part->getSerializationInfos();
+
+            addMissedColumnsToSerializationInfos(
+                part->rows_count,
+                part->getColumns().getNames(),
+                global_ctx->metadata_snapshot->getColumns(),
+                info_settings,
+                part_infos);
+
+            infos.add(part_infos);
+        }
     }
 
-    global_ctx->new_data_part->setColumns(global_ctx->storage_columns, infos);
+    global_ctx->new_data_part->setColumns(global_ctx->storage_columns, infos, global_ctx->metadata_snapshot->getMetadataVersion());
 
     const auto & local_part_min_ttl = global_ctx->new_data_part->ttl_infos.part_min_ttl;
     if (local_part_min_ttl && local_part_min_ttl <= global_ctx->time_of_merge)
@@ -235,7 +278,7 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
     ctx->compression_codec = global_ctx->data->getCompressionCodecForPart(
         global_ctx->merge_list_element_ptr->total_size_bytes_compressed, global_ctx->new_data_part->ttl_infos, global_ctx->time_of_merge);
 
-    ctx->tmp_disk = global_ctx->context->getTemporaryVolume()->getDisk();
+    ctx->tmp_disk = global_ctx->context->getGlobalTemporaryVolume()->getDisk();
 
     switch (global_ctx->chosen_merge_algorithm)
     {
@@ -288,6 +331,7 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
     if (!ctx->need_remove_expired_values)
     {
         size_t expired_columns = 0;
+        auto part_serialization_infos = global_ctx->new_data_part->getSerializationInfos();
 
         for (auto & [column_name, ttl] : global_ctx->new_data_part->ttl_infos.columns_ttl)
         {
@@ -297,6 +341,8 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
                 LOG_TRACE(ctx->log, "Adding expired column {} for part {}", column_name, global_ctx->new_data_part->name);
                 std::erase(global_ctx->gathering_column_names, column_name);
                 std::erase(global_ctx->merging_column_names, column_name);
+                std::erase(global_ctx->all_column_names, column_name);
+                part_serialization_infos.erase(column_name);
                 ++expired_columns;
             }
         }
@@ -305,6 +351,12 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
         {
             global_ctx->gathering_columns = global_ctx->gathering_columns.filter(global_ctx->gathering_column_names);
             global_ctx->merging_columns = global_ctx->merging_columns.filter(global_ctx->merging_column_names);
+            global_ctx->storage_columns = global_ctx->storage_columns.filter(global_ctx->all_column_names);
+
+            global_ctx->new_data_part->setColumns(
+                global_ctx->storage_columns,
+                part_serialization_infos,
+                global_ctx->metadata_snapshot->getMetadataVersion());
         }
     }
 
@@ -493,8 +545,8 @@ void MergeTask::VerticalMergeStage::prepareVerticalMergeForOneColumn() const
             global_ctx->future_part->parts[part_num],
             column_names,
             ctx->read_with_direct_io,
-            true,
-            false,
+            /*take_column_types_from_storage=*/ true,
+            /*quiet=*/ false,
             global_ctx->input_rows_filtered);
 
         pipes.emplace_back(std::move(pipe));
@@ -664,13 +716,11 @@ bool MergeTask::MergeProjectionsStage::mergeMinMaxIndexAndPrepareProjections() c
         if (projection.type == ProjectionDescription::Type::Aggregate)
             projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
 
-        const Settings & settings = global_ctx->context->getSettingsRef();
-
         ctx->tasks_for_projections.emplace_back(std::make_shared<MergeTask>(
             projection_future_part,
             projection.metadata,
             global_ctx->merge_entry,
-            std::make_unique<MergeListElement>((*global_ctx->merge_entry)->table_id, projection_future_part, settings),
+            std::make_unique<MergeListElement>((*global_ctx->merge_entry)->table_id, projection_future_part, global_ctx->context),
             global_ctx->time_of_merge,
             global_ctx->context,
             global_ctx->space_reservation,
@@ -847,8 +897,8 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
             part,
             global_ctx->merging_column_names,
             ctx->read_with_direct_io,
-            true,
-            false,
+            /*take_column_types_from_storage=*/ true,
+            /*quiet=*/ false,
             global_ctx->input_rows_filtered);
 
         if (global_ctx->metadata_snapshot->hasSortingKey())
@@ -885,47 +935,59 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
     /// If merge is vertical we cannot calculate it
     ctx->blocks_are_granules_size = (global_ctx->chosen_merge_algorithm == MergeAlgorithm::Vertical);
 
-    UInt64 merge_block_size = data_settings->merge_max_block_size;
+    /// There is no sense to have the block size bigger than one granule for merge operations.
+    const UInt64 merge_block_size_rows = data_settings->merge_max_block_size;
+    const UInt64 merge_block_size_bytes = data_settings->merge_max_block_size_bytes;
 
     switch (ctx->merging_params.mode)
     {
         case MergeTreeData::MergingParams::Ordinary:
             merged_transform = std::make_shared<MergingSortedTransform>(
-                header, pipes.size(), sort_description, merge_block_size, SortingQueueStrategy::Default, 0, ctx->rows_sources_write_buf.get(), true, ctx->blocks_are_granules_size);
+                header,
+                pipes.size(),
+                sort_description,
+                merge_block_size_rows,
+                merge_block_size_bytes,
+                SortingQueueStrategy::Default,
+                /* limit_= */0,
+                /* always_read_till_end_= */false,
+                ctx->rows_sources_write_buf.get(),
+                true,
+                ctx->blocks_are_granules_size);
             break;
 
         case MergeTreeData::MergingParams::Collapsing:
             merged_transform = std::make_shared<CollapsingSortedTransform>(
                 header, pipes.size(), sort_description, ctx->merging_params.sign_column, false,
-                merge_block_size, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
+                merge_block_size_rows, merge_block_size_bytes, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
             break;
 
         case MergeTreeData::MergingParams::Summing:
             merged_transform = std::make_shared<SummingSortedTransform>(
-                header, pipes.size(), sort_description, ctx->merging_params.columns_to_sum, partition_key_columns, merge_block_size);
+                header, pipes.size(), sort_description, ctx->merging_params.columns_to_sum, partition_key_columns, merge_block_size_rows, merge_block_size_bytes);
             break;
 
         case MergeTreeData::MergingParams::Aggregating:
-            merged_transform = std::make_shared<AggregatingSortedTransform>(header, pipes.size(), sort_description, merge_block_size);
+            merged_transform = std::make_shared<AggregatingSortedTransform>(header, pipes.size(), sort_description, merge_block_size_rows, merge_block_size_bytes);
             break;
 
         case MergeTreeData::MergingParams::Replacing:
             merged_transform = std::make_shared<ReplacingSortedTransform>(
                 header, pipes.size(), sort_description, ctx->merging_params.is_deleted_column, ctx->merging_params.version_column,
-                merge_block_size, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size,
+                merge_block_size_rows, merge_block_size_bytes, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size,
                 (data_settings->clean_deleted_rows != CleanDeletedRows::Never) || global_ctx->cleanup);
             break;
 
         case MergeTreeData::MergingParams::Graphite:
             merged_transform = std::make_shared<GraphiteRollupSortedTransform>(
-                header, pipes.size(), sort_description, merge_block_size,
+                header, pipes.size(), sort_description, merge_block_size_rows, merge_block_size_bytes,
                 ctx->merging_params.graphite_params, global_ctx->time_of_merge);
             break;
 
         case MergeTreeData::MergingParams::VersionedCollapsing:
             merged_transform = std::make_shared<VersionedCollapsingTransform>(
                 header, pipes.size(), sort_description, ctx->merging_params.sign_column,
-                merge_block_size, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
+                merge_block_size_rows, merge_block_size_bytes, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
             break;
     }
 
@@ -966,7 +1028,8 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
 
 MergeAlgorithm MergeTask::ExecuteAndFinalizeHorizontalPart::chooseMergeAlgorithm() const
 {
-    const size_t sum_rows_upper_bound = global_ctx->merge_list_element_ptr->total_rows_count;
+    const size_t total_rows_count = global_ctx->merge_list_element_ptr->total_rows_count;
+    const size_t total_size_bytes_uncompressed = global_ctx->merge_list_element_ptr->total_size_bytes_uncompressed;
     const auto data_settings = global_ctx->data->getSettings();
 
     if (global_ctx->deduplicate)
@@ -997,11 +1060,13 @@ MergeAlgorithm MergeTask::ExecuteAndFinalizeHorizontalPart::chooseMergeAlgorithm
 
     bool enough_ordinary_cols = global_ctx->gathering_columns.size() >= data_settings->vertical_merge_algorithm_min_columns_to_activate;
 
-    bool enough_total_rows = sum_rows_upper_bound >= data_settings->vertical_merge_algorithm_min_rows_to_activate;
+    bool enough_total_rows = total_rows_count >= data_settings->vertical_merge_algorithm_min_rows_to_activate;
+
+    bool enough_total_bytes = total_size_bytes_uncompressed >= data_settings->vertical_merge_algorithm_min_bytes_to_activate;
 
     bool no_parts_overflow = global_ctx->future_part->parts.size() <= RowSourcePart::MAX_PARTS;
 
-    auto merge_alg = (is_supported_storage && enough_total_rows && enough_ordinary_cols && no_parts_overflow) ?
+    auto merge_alg = (is_supported_storage && enough_total_rows && enough_total_bytes && enough_ordinary_cols && no_parts_overflow) ?
                         MergeAlgorithm::Vertical : MergeAlgorithm::Horizontal;
 
     return merge_alg;
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
index d0469c35cef..6512aad9260 100644
--- a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
@@ -1,22 +1,70 @@
 #include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
 
 #include <algorithm>
 
+#include <Common/ThreadPool.h>
 #include <Common/setThreadName.h>
 #include <Common/Exception.h>
-#include <Storages/MergeTree/BackgroundJobsAssignee.h>
 #include <Common/noexcept_scope.h>
+#include <Common/logger_useful.h>
 
 
+namespace CurrentMetrics
+{
+    extern const Metric MergeTreeBackgroundExecutorThreads;
+    extern const Metric MergeTreeBackgroundExecutorThreadsActive;
+}
+
 namespace DB
 {
 
 namespace ErrorCodes
 {
     extern const int ABORTED;
+    extern const int INVALID_CONFIG_PARAMETER;
 }
 
 
+template <class Queue>
+MergeTreeBackgroundExecutor<Queue>::MergeTreeBackgroundExecutor(
+    String name_,
+    size_t threads_count_,
+    size_t max_tasks_count_,
+    CurrentMetrics::Metric metric_,
+    CurrentMetrics::Metric max_tasks_metric_,
+    std::string_view policy)
+    : name(name_)
+    , threads_count(threads_count_)
+    , max_tasks_count(max_tasks_count_)
+    , metric(metric_)
+    , max_tasks_metric(max_tasks_metric_, 2 * max_tasks_count) // active + pending
+    , pool(std::make_unique<ThreadPool>(
+          CurrentMetrics::MergeTreeBackgroundExecutorThreads, CurrentMetrics::MergeTreeBackgroundExecutorThreadsActive))
+{
+    if (max_tasks_count == 0)
+        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Task count for MergeTreeBackgroundExecutor must not be zero");
+
+    pending.setCapacity(max_tasks_count);
+    active.set_capacity(max_tasks_count);
+
+    pool->setMaxThreads(std::max(1UL, threads_count));
+    pool->setMaxFreeThreads(std::max(1UL, threads_count));
+    pool->setQueueSize(std::max(1UL, threads_count));
+
+    for (size_t number = 0; number < threads_count; ++number)
+        pool->scheduleOrThrowOnError([this] { threadFunction(); });
+
+    if (!policy.empty())
+        pending.updatePolicy(policy);
+}
+
+template <class Queue>
+MergeTreeBackgroundExecutor<Queue>::~MergeTreeBackgroundExecutor()
+{
+    wait();
+}
+
 template <class Queue>
 void MergeTreeBackgroundExecutor<Queue>::wait()
 {
@@ -26,7 +74,7 @@ void MergeTreeBackgroundExecutor<Queue>::wait()
         has_tasks.notify_all();
     }
 
-    pool.wait();
+    pool->wait();
 }
 
 template <class Queue>
@@ -52,13 +100,14 @@ void MergeTreeBackgroundExecutor<Queue>::increaseThreadsAndMaxTasksCount(size_t
     pending.setCapacity(new_max_tasks_count);
     active.set_capacity(new_max_tasks_count);
 
-    pool.setMaxThreads(std::max(1UL, new_threads_count));
-    pool.setMaxFreeThreads(std::max(1UL, new_threads_count));
-    pool.setQueueSize(std::max(1UL, new_threads_count));
+    pool->setMaxThreads(std::max(1UL, new_threads_count));
+    pool->setMaxFreeThreads(std::max(1UL, new_threads_count));
+    pool->setQueueSize(std::max(1UL, new_threads_count));
 
     for (size_t number = threads_count; number < new_threads_count; ++number)
-        pool.scheduleOrThrowOnError([this] { threadFunction(); });
+        pool->scheduleOrThrowOnError([this] { threadFunction(); });
 
+    max_tasks_metric.changeTo(2 * new_max_tasks_count); // pending + active
     max_tasks_count.store(new_max_tasks_count, std::memory_order_relaxed);
     threads_count = new_threads_count;
 }
@@ -160,13 +209,10 @@ void MergeTreeBackgroundExecutor<Queue>::routine(TaskRuntimeDataPtr item)
 
         if (item->is_currently_deleting)
         {
-            /// This is significant to order the destructors.
-            {
-                NOEXCEPT_SCOPE({
-                    ALLOW_ALLOCATIONS_IN_SCOPE;
-                    item->task.reset();
-                });
-            }
+            NOEXCEPT_SCOPE({
+                ALLOW_ALLOCATIONS_IN_SCOPE;
+                item->task.reset();
+            });
             item->is_done.set();
             item = nullptr;
             return;
@@ -271,5 +317,4 @@ void MergeTreeBackgroundExecutor<Queue>::threadFunction()
 template class MergeTreeBackgroundExecutor<RoundRobinRuntimeQueue>;
 template class MergeTreeBackgroundExecutor<PriorityRuntimeQueue>;
 template class MergeTreeBackgroundExecutor<DynamicRuntimeQueue>;
-
 }
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
index 9305f36feb5..8142e383d0c 100644
--- a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
@@ -9,22 +9,24 @@
 #include <variant>
 #include <utility>
 
-
 #include <boost/circular_buffer.hpp>
 #include <boost/noncopyable.hpp>
+#include <Poco/Event.h>
 
-#include <Common/logger_useful.h>
-#include <Common/ThreadPool.h>
-#include <Common/Stopwatch.h>
-#include <base/defines.h>
 #include <Storages/MergeTree/IExecutableTask.h>
+#include <base/defines.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/Exception.h>
+#include <Common/Stopwatch.h>
+#include <Common/ThreadPool_fwd.h>
 
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
-    extern const int INVALID_CONFIG_PARAMETER;
+    extern const int NOT_IMPLEMENTED;
 }
 
 struct TaskRuntimeData;
@@ -96,6 +98,11 @@ public:
     void setCapacity(size_t count) { queue.set_capacity(count); }
     bool empty() { return queue.empty(); }
 
+    [[noreturn]] void updatePolicy(std::string_view)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method updatePolicy() is not implemented");
+    }
+
     static constexpr std::string_view name = "round_robin";
 
 private:
@@ -130,6 +137,11 @@ public:
     void setCapacity(size_t count) { buffer.reserve(count); }
     bool empty() { return buffer.empty(); }
 
+    [[noreturn]] void updatePolicy(std::string_view)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method updatePolicy() is not implemented");
+    }
+
     static constexpr std::string_view name = "shortest_task_first";
 
 private:
@@ -243,46 +255,15 @@ template <class Queue>
 class MergeTreeBackgroundExecutor final : boost::noncopyable
 {
 public:
-    MergeTreeBackgroundExecutor(
-        String name_,
-        size_t threads_count_,
-        size_t max_tasks_count_,
-        CurrentMetrics::Metric metric_)
-        : name(name_)
-        , threads_count(threads_count_)
-        , max_tasks_count(max_tasks_count_)
-        , metric(metric_)
-    {
-        if (max_tasks_count == 0)
-            throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Task count for MergeTreeBackgroundExecutor must not be zero");
-
-        pending.setCapacity(max_tasks_count);
-        active.set_capacity(max_tasks_count);
-
-        pool.setMaxThreads(std::max(1UL, threads_count));
-        pool.setMaxFreeThreads(std::max(1UL, threads_count));
-        pool.setQueueSize(std::max(1UL, threads_count));
-
-        for (size_t number = 0; number < threads_count; ++number)
-            pool.scheduleOrThrowOnError([this] { threadFunction(); });
-    }
-
     MergeTreeBackgroundExecutor(
         String name_,
         size_t threads_count_,
         size_t max_tasks_count_,
         CurrentMetrics::Metric metric_,
-        std::string_view policy)
-        requires requires(Queue queue) { queue.updatePolicy(policy); } // Because we use explicit template instantiation
-        : MergeTreeBackgroundExecutor(name_, threads_count_, max_tasks_count_, metric_)
-    {
-        pending.updatePolicy(policy);
-    }
+        CurrentMetrics::Metric max_tasks_metric_,
+        std::string_view policy = {});
 
-    ~MergeTreeBackgroundExecutor()
-    {
-        wait();
-    }
+    ~MergeTreeBackgroundExecutor();
 
     /// Handler for hot-reloading
     /// Supports only increasing the number of threads and tasks, because
@@ -300,7 +281,6 @@ public:
 
     /// Update scheduling policy for pending tasks. It does nothing if `new_policy` is the same or unknown.
     void updateSchedulingPolicy(std::string_view new_policy)
-        requires requires(Queue queue) { queue.updatePolicy(new_policy); } // Because we use explicit template instantiation
     {
         std::lock_guard lock(mutex);
         pending.updatePolicy(new_policy);
@@ -311,6 +291,7 @@ private:
     size_t threads_count TSA_GUARDED_BY(mutex) = 0;
     std::atomic<size_t> max_tasks_count = 0;
     CurrentMetrics::Metric metric;
+    CurrentMetrics::Increment max_tasks_metric;
 
     void routine(TaskRuntimeDataPtr item);
 
@@ -323,7 +304,7 @@ private:
     mutable std::mutex mutex;
     std::condition_variable has_tasks TSA_GUARDED_BY(mutex);
     bool shutdown TSA_GUARDED_BY(mutex) = false;
-    ThreadPool pool;
+    std::unique_ptr<ThreadPool> pool;
     Poco::Logger * log = &Poco::Logger::get("MergeTreeBackgroundExecutor");
 };
 
diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
index 0ad91d84d29..48adf36e678 100644
--- a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
@@ -6,6 +6,7 @@
 #include <Storages/MergeTree/RequestResponse.h>
 #include <Columns/FilterDescription.h>
 #include <Common/ElapsedTimeProfileEventIncrement.h>
+#include <Common/logger_useful.h>
 #include <Common/typeid_cast.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -79,49 +80,51 @@ IMergeTreeSelectAlgorithm::IMergeTreeSelectAlgorithm(
     result_header = header_without_const_virtual_columns;
     injectPartConstVirtualColumns(0, result_header, nullptr, partition_value_type, virt_column_names);
 
-    if (prewhere_actions)
-        LOG_TRACE(log, "PREWHERE condition was split into {} steps: {}", prewhere_actions->steps.size(), prewhere_actions->dumpConditions());
+    if (!prewhere_actions.steps.empty())
+        LOG_TRACE(log, "PREWHERE condition was split into {} steps: {}", prewhere_actions.steps.size(), prewhere_actions.dumpConditions());
 
     if (prewhere_info)
         LOG_TEST(log, "Original PREWHERE DAG:\n{}\nPREWHERE actions:\n{}",
             (prewhere_info->prewhere_actions ? prewhere_info->prewhere_actions->dumpDAG(): std::string("<nullptr>")),
-            (prewhere_actions ? prewhere_actions->dump() : std::string("<nullptr>")));
+            (!prewhere_actions.steps.empty() ? prewhere_actions.dump() : std::string("<nullptr>")));
 }
 
 bool tryBuildPrewhereSteps(PrewhereInfoPtr prewhere_info, const ExpressionActionsSettings & actions_settings, PrewhereExprInfo & prewhere);
 
-std::unique_ptr<PrewhereExprInfo> IMergeTreeSelectAlgorithm::getPrewhereActions(PrewhereInfoPtr prewhere_info, const ExpressionActionsSettings & actions_settings, bool enable_multiple_prewhere_read_steps)
+PrewhereExprInfo IMergeTreeSelectAlgorithm::getPrewhereActions(PrewhereInfoPtr prewhere_info, const ExpressionActionsSettings & actions_settings, bool enable_multiple_prewhere_read_steps)
 {
-    std::unique_ptr<PrewhereExprInfo> prewhere_actions;
+    PrewhereExprInfo prewhere_actions;
     if (prewhere_info)
     {
-        prewhere_actions = std::make_unique<PrewhereExprInfo>();
-
         if (prewhere_info->row_level_filter)
         {
             PrewhereExprStep row_level_filter_step
             {
+                .type = PrewhereExprStep::Filter,
                 .actions = std::make_shared<ExpressionActions>(prewhere_info->row_level_filter, actions_settings),
-                .column_name = prewhere_info->row_level_column_name,
-                .remove_column = true,
-                .need_filter = true
+                .filter_column_name = prewhere_info->row_level_column_name,
+                .remove_filter_column = true,
+                .need_filter = true,
+                .perform_alter_conversions = true,
             };
 
-            prewhere_actions->steps.emplace_back(std::move(row_level_filter_step));
+            prewhere_actions.steps.emplace_back(std::make_shared<PrewhereExprStep>(std::move(row_level_filter_step)));
         }
 
         if (!enable_multiple_prewhere_read_steps ||
-            !tryBuildPrewhereSteps(prewhere_info, actions_settings, *prewhere_actions))
+            !tryBuildPrewhereSteps(prewhere_info, actions_settings, prewhere_actions))
         {
             PrewhereExprStep prewhere_step
             {
+                .type = PrewhereExprStep::Filter,
                 .actions = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions, actions_settings),
-                .column_name = prewhere_info->prewhere_column_name,
-                .remove_column = prewhere_info->remove_prewhere_column,
-                .need_filter = prewhere_info->need_filter
+                .filter_column_name = prewhere_info->prewhere_column_name,
+                .remove_filter_column = prewhere_info->remove_prewhere_column,
+                .need_filter = prewhere_info->need_filter,
+                .perform_alter_conversions = true,
             };
 
-            prewhere_actions->steps.emplace_back(std::move(prewhere_step));
+            prewhere_actions.steps.emplace_back(std::make_shared<PrewhereExprStep>(std::move(prewhere_step)));
         }
     }
 
@@ -212,7 +215,7 @@ void IMergeTreeSelectAlgorithm::initializeMergeTreeReadersForCurrentTask(
         reader = task->data_part->getReader(
             task->task_columns.columns, metadata_snapshot, task->mark_ranges,
             owned_uncompressed_cache.get(), owned_mark_cache.get(),
-            reader_settings, value_size_map, profile_callback);
+            task->alter_conversions, reader_settings, value_size_map, profile_callback);
     }
 
     if (!task->pre_reader_for_step.empty())
@@ -225,13 +228,15 @@ void IMergeTreeSelectAlgorithm::initializeMergeTreeReadersForCurrentTask(
     else
     {
         initializeMergeTreePreReadersForPart(
-            task->data_part, task->task_columns, metadata_snapshot,
+            task->data_part, task->alter_conversions,
+            task->task_columns, metadata_snapshot,
             task->mark_ranges, value_size_map, profile_callback);
     }
 }
 
 void IMergeTreeSelectAlgorithm::initializeMergeTreeReadersForPart(
-    MergeTreeData::DataPartPtr & data_part,
+    const MergeTreeData::DataPartPtr & data_part,
+    const AlterConversionsPtr & alter_conversions,
     const MergeTreeReadTaskColumns & task_columns,
     const StorageMetadataPtr & metadata_snapshot,
     const MarkRanges & mark_ranges,
@@ -241,15 +246,16 @@ void IMergeTreeSelectAlgorithm::initializeMergeTreeReadersForPart(
     reader = data_part->getReader(
         task_columns.columns, metadata_snapshot, mark_ranges,
         owned_uncompressed_cache.get(), owned_mark_cache.get(),
-        reader_settings, value_size_map, profile_callback);
+        alter_conversions, reader_settings, value_size_map, profile_callback);
 
     initializeMergeTreePreReadersForPart(
-        data_part, task_columns, metadata_snapshot,
+        data_part, alter_conversions, task_columns, metadata_snapshot,
         mark_ranges, value_size_map, profile_callback);
 }
 
 void IMergeTreeSelectAlgorithm::initializeMergeTreePreReadersForPart(
-    MergeTreeData::DataPartPtr & data_part,
+    const MergeTreeData::DataPartPtr & data_part,
+    const AlterConversionsPtr & alter_conversions,
     const MergeTreeReadTaskColumns & task_columns,
     const StorageMetadataPtr & metadata_snapshot,
     const MarkRanges & mark_ranges,
@@ -265,36 +271,37 @@ void IMergeTreeSelectAlgorithm::initializeMergeTreePreReadersForPart(
             data_part->getReader(
                 {LightweightDeleteDescription::FILTER_COLUMN}, metadata_snapshot,
                 mark_ranges, owned_uncompressed_cache.get(), owned_mark_cache.get(),
-                reader_settings, value_size_map, profile_callback));
+                alter_conversions, reader_settings, value_size_map, profile_callback));
     }
 
-    if (prewhere_info)
+    for (const auto & pre_columns_per_step : task_columns.pre_columns)
     {
-        for (const auto & pre_columns_per_step : task_columns.pre_columns)
-        {
-            pre_reader_for_step.push_back(
-                data_part->getReader(
-                    pre_columns_per_step, metadata_snapshot, mark_ranges,
-                    owned_uncompressed_cache.get(), owned_mark_cache.get(),
-                    reader_settings, value_size_map, profile_callback));
-        }
+        pre_reader_for_step.push_back(
+            data_part->getReader(
+                pre_columns_per_step, metadata_snapshot, mark_ranges,
+                owned_uncompressed_cache.get(), owned_mark_cache.get(),
+                alter_conversions, reader_settings, value_size_map, profile_callback));
     }
 }
 
 void IMergeTreeSelectAlgorithm::initializeRangeReaders(MergeTreeReadTask & current_task)
 {
     return initializeRangeReadersImpl(
-        current_task.range_reader, current_task.pre_range_readers, prewhere_info, prewhere_actions.get(),
+        current_task.range_reader, current_task.pre_range_readers, prewhere_actions,
         reader.get(), current_task.data_part->hasLightweightDelete(), reader_settings,
         pre_reader_for_step, lightweight_delete_filter_step, non_const_virtual_column_names);
 }
 
 void IMergeTreeSelectAlgorithm::initializeRangeReadersImpl(
-    MergeTreeRangeReader & range_reader, std::deque<MergeTreeRangeReader> & pre_range_readers,
-    PrewhereInfoPtr prewhere_info, const PrewhereExprInfo * prewhere_actions,
-    IMergeTreeReader * reader, bool has_lightweight_delete, const MergeTreeReaderSettings & reader_settings,
+    MergeTreeRangeReader & range_reader,
+    std::deque<MergeTreeRangeReader> & pre_range_readers,
+    const PrewhereExprInfo & prewhere_actions,
+    IMergeTreeReader * reader,
+    bool has_lightweight_delete,
+    const MergeTreeReaderSettings & reader_settings,
     const std::vector<std::unique_ptr<IMergeTreeReader>> & pre_reader_for_step,
-    const PrewhereExprStep & lightweight_delete_filter_step, const Names & non_const_virtual_column_names)
+    const PrewhereExprStep & lightweight_delete_filter_step,
+    const Names & non_const_virtual_column_names)
 {
     MergeTreeRangeReader * prev_reader = nullptr;
     bool last_reader = false;
@@ -309,25 +316,25 @@ void IMergeTreeSelectAlgorithm::initializeRangeReadersImpl(
         pre_readers_shift++;
     }
 
-    if (prewhere_info)
+    if (prewhere_actions.steps.size() + pre_readers_shift != pre_reader_for_step.size())
     {
-        if (prewhere_actions->steps.size() + pre_readers_shift != pre_reader_for_step.size())
-        {
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "PREWHERE steps count mismatch, actions: {}, readers: {}",
-                prewhere_actions->steps.size(), pre_reader_for_step.size());
-        }
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "PREWHERE steps count mismatch, actions: {}, readers: {}",
+            prewhere_actions.steps.size(), pre_reader_for_step.size());
+    }
 
-        for (size_t i = 0; i < prewhere_actions->steps.size(); ++i)
-        {
-            last_reader = reader->getColumns().empty() && (i + 1 == prewhere_actions->steps.size());
+    for (size_t i = 0; i < prewhere_actions.steps.size(); ++i)
+    {
+        last_reader = reader->getColumns().empty() && (i + 1 == prewhere_actions.steps.size());
 
-            MergeTreeRangeReader current_reader(pre_reader_for_step[i + pre_readers_shift].get(), prev_reader, &prewhere_actions->steps[i], last_reader, non_const_virtual_column_names);
+        MergeTreeRangeReader current_reader(
+            pre_reader_for_step[i + pre_readers_shift].get(),
+            prev_reader, prewhere_actions.steps[i].get(),
+            last_reader, non_const_virtual_column_names);
 
-            pre_range_readers.push_back(std::move(current_reader));
-            prev_reader = &pre_range_readers.back();
-        }
+        pre_range_readers.push_back(std::move(current_reader));
+        prev_reader = &pre_range_readers.back();
     }
 
     if (!last_reader)
@@ -635,28 +642,33 @@ Block IMergeTreeSelectAlgorithm::applyPrewhereActions(Block block, const Prewher
         }
 
         if (prewhere_info->prewhere_actions)
+        {
             block = prewhere_info->prewhere_actions->updateHeader(std::move(block));
 
-        auto & prewhere_column = block.getByName(prewhere_info->prewhere_column_name);
-        if (!prewhere_column.type->canBeUsedInBooleanContext())
-        {
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER, "Invalid type for filter in PREWHERE: {}",
-                prewhere_column.type->getName());
-        }
+            auto & prewhere_column = block.getByName(prewhere_info->prewhere_column_name);
+            if (!prewhere_column.type->canBeUsedInBooleanContext())
+            {
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER, "Invalid type for filter in PREWHERE: {}",
+                    prewhere_column.type->getName());
+            }
 
-        if (prewhere_info->remove_prewhere_column)
-            block.erase(prewhere_info->prewhere_column_name);
-        else
-        {
-            WhichDataType which(removeNullable(recursiveRemoveLowCardinality(prewhere_column.type)));
-            if (which.isNativeInt() || which.isNativeUInt())
-                prewhere_column.column = prewhere_column.type->createColumnConst(block.rows(), 1u)->convertToFullColumnIfConst();
-            else if (which.isFloat())
-                prewhere_column.column = prewhere_column.type->createColumnConst(block.rows(), 1.0f)->convertToFullColumnIfConst();
-            else
-                throw Exception(
-                                ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER,
-                                "Illegal type {} of column for filter", prewhere_column.type->getName());
+            if (prewhere_info->remove_prewhere_column)
+            {
+                block.erase(prewhere_info->prewhere_column_name);
+            }
+            else if (prewhere_info->need_filter)
+            {
+                WhichDataType which(removeNullable(recursiveRemoveLowCardinality(prewhere_column.type)));
+
+                if (which.isNativeInt() || which.isNativeUInt())
+                    prewhere_column.column = prewhere_column.type->createColumnConst(block.rows(), 1u)->convertToFullColumnIfConst();
+                else if (which.isFloat())
+                    prewhere_column.column = prewhere_column.type->createColumnConst(block.rows(), 1.0f)->convertToFullColumnIfConst();
+                else
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER,
+                        "Illegal type {} of column for filter",
+                        prewhere_column.type->getName());
+            }
         }
     }
 
diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h
index a9ade25646d..7b6dc50060a 100644
--- a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h
+++ b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h
@@ -34,7 +34,7 @@ struct ParallelReadingExtension
     /// This is needed to estimate the number of bytes
     /// between a pair of marks to perform one request
     /// over the network for a 1Gb of data.
-    Names colums_to_read;
+    Names columns_to_read;
 };
 
 /// Base class for MergeTreeThreadSelectAlgorithm and MergeTreeSelectAlgorithm
@@ -74,7 +74,7 @@ public:
 
     virtual std::string getName() const = 0;
 
-    static std::unique_ptr<PrewhereExprInfo> getPrewhereActions(PrewhereInfoPtr prewhere_info, const ExpressionActionsSettings & actions_settings, bool enable_multiple_prewhere_read_steps);
+    static PrewhereExprInfo getPrewhereActions(PrewhereInfoPtr prewhere_info, const ExpressionActionsSettings & actions_settings, bool enable_multiple_prewhere_read_steps);
 
 protected:
     /// This struct allow to return block with no columns but with non-zero number of rows similar to Chunk
@@ -110,8 +110,7 @@ protected:
     static void initializeRangeReadersImpl(
          MergeTreeRangeReader & range_reader,
          std::deque<MergeTreeRangeReader> & pre_range_readers,
-         PrewhereInfoPtr prewhere_info,
-         const PrewhereExprInfo * prewhere_actions,
+         const PrewhereExprInfo & prewhere_actions,
          IMergeTreeReader * reader,
          bool has_lightweight_delete,
          const MergeTreeReaderSettings & reader_settings,
@@ -126,7 +125,8 @@ protected:
         const ReadBufferFromFileBase::ProfileCallback & profile_callback);
 
     void initializeMergeTreeReadersForPart(
-        MergeTreeData::DataPartPtr & data_part,
+        const MergeTreeData::DataPartPtr & data_part,
+        const AlterConversionsPtr & alter_conversions,
         const MergeTreeReadTaskColumns & task_columns,
         const StorageMetadataPtr & metadata_snapshot,
         const MarkRanges & mark_ranges,
@@ -140,10 +140,19 @@ protected:
     StorageSnapshotPtr storage_snapshot;
 
     /// This step is added when the part has lightweight delete mask
-    const PrewhereExprStep lightweight_delete_filter_step { nullptr, LightweightDeleteDescription::FILTER_COLUMN.name, true, true };
+    const PrewhereExprStep lightweight_delete_filter_step
+    {
+        .type = PrewhereExprStep::Filter,
+        .actions = nullptr,
+        .filter_column_name = LightweightDeleteDescription::FILTER_COLUMN.name,
+        .remove_filter_column = true,
+        .need_filter = true,
+        .perform_alter_conversions = true,
+    };
+
     PrewhereInfoPtr prewhere_info;
     ExpressionActionsSettings actions_settings;
-    std::unique_ptr<PrewhereExprInfo> prewhere_actions;
+    PrewhereExprInfo prewhere_actions;
 
     UInt64 max_block_size_rows;
     UInt64 preferred_block_size_bytes;
@@ -195,7 +204,8 @@ private:
 
     /// Initialize pre readers.
     void initializeMergeTreePreReadersForPart(
-        MergeTreeData::DataPartPtr & data_part,
+        const MergeTreeData::DataPartPtr & data_part,
+        const AlterConversionsPtr & alter_conversions,
         const MergeTreeReadTaskColumns & task_columns,
         const StorageMetadataPtr & metadata_snapshot,
         const MarkRanges & mark_ranges,
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
index 4c3d4bc8aa0..c7434eab05d 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
@@ -1,6 +1,7 @@
 #include <Storages/MergeTree/MergeTreeBlockReadUtils.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/IMergeTreeDataPartInfoForReader.h>
+#include <Storages/MergeTree/MergeTreeRangeReader.h>
 #include <DataTypes/NestedUtils.h>
 #include <Core/NamesAndTypes.h>
 #include <Common/checkStackSize.h>
@@ -30,7 +31,7 @@ namespace
 bool injectRequiredColumnsRecursively(
     const String & column_name,
     const StorageSnapshotPtr & storage_snapshot,
-    const AlterConversions & alter_conversions,
+    const AlterConversionsPtr & alter_conversions,
     const IMergeTreeDataPartInfoForReader & data_part_info_for_reader,
     const GetColumnsOptions & options,
     Names & columns,
@@ -46,8 +47,8 @@ bool injectRequiredColumnsRecursively(
     if (column_in_storage)
     {
         auto column_name_in_part = column_in_storage->getNameInStorage();
-        if (alter_conversions.isColumnRenamed(column_name_in_part))
-            column_name_in_part = alter_conversions.getColumnOldName(column_name_in_part);
+        if (alter_conversions && alter_conversions->isColumnRenamed(column_name_in_part))
+            column_name_in_part = alter_conversions->getColumnOldName(column_name_in_part);
 
         auto column_in_part = data_part_info_for_reader.getColumns().tryGetByName(column_name_in_part);
 
@@ -98,13 +99,14 @@ NameSet injectRequiredColumns(
     NameSet injected_columns;
 
     bool have_at_least_one_physical_column = false;
-    AlterConversions alter_conversions;
+    AlterConversionsPtr alter_conversions;
     if (!data_part_info_for_reader.isProjectionPart())
         alter_conversions = data_part_info_for_reader.getAlterConversions();
 
     auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical)
         .withExtendedObjects()
         .withSystemColumns();
+
     if (with_subcolumns)
         options.withSubcolumns();
 
@@ -137,15 +139,17 @@ NameSet injectRequiredColumns(
 
 MergeTreeReadTask::MergeTreeReadTask(
     const DataPartPtr & data_part_,
+    const AlterConversionsPtr & alter_conversions_,
     const MarkRanges & mark_ranges_,
     size_t part_index_in_query_,
     const NameSet & column_name_set_,
     const MergeTreeReadTaskColumns & task_columns_,
     MergeTreeBlockSizePredictorPtr size_predictor_,
-    int64_t priority_,
+    Priority priority_,
     std::future<MergeTreeReaderPtr> reader_,
     std::vector<std::future<MergeTreeReaderPtr>> && pre_reader_for_step_)
     : data_part{data_part_}
+    , alter_conversions{alter_conversions_}
     , mark_ranges{mark_ranges_}
     , part_index_in_query{part_index_in_query_}
     , column_name_set{column_name_set_}
@@ -306,10 +310,8 @@ MergeTreeReadTaskColumns getReadTaskColumns(
 
     /// Read system columns such as lightweight delete mask "_row_exists" if it is persisted in the part
     for (const auto & name : system_columns)
-    {
         if (data_part_info_for_reader.getColumns().contains(name))
             column_to_read_after_prewhere.push_back(name);
-    }
 
     /// Inject columns required for defaults evaluation
     injectRequiredColumns(
@@ -319,44 +321,50 @@ MergeTreeReadTaskColumns getReadTaskColumns(
     auto options = GetColumnsOptions(GetColumnsOptions::All)
         .withExtendedObjects()
         .withSystemColumns();
+
     if (with_subcolumns)
         options.withSubcolumns();
 
+    NameSet columns_from_previous_steps;
+    auto add_step = [&](const PrewhereExprStep & step)
+    {
+        Names step_column_names = step.actions->getActionsDAG().getRequiredColumnsNames();
+
+        injectRequiredColumns(
+            data_part_info_for_reader, storage_snapshot, with_subcolumns, step_column_names);
+
+        Names columns_to_read_in_step;
+        for (const auto & name : step_column_names)
+        {
+            if (columns_from_previous_steps.contains(name))
+                continue;
+
+            columns_to_read_in_step.push_back(name);
+            columns_from_previous_steps.insert(name);
+        }
+
+        result.pre_columns.push_back(storage_snapshot->getColumnsByNames(options, columns_to_read_in_step));
+    };
+
     if (prewhere_info)
     {
         auto prewhere_actions = IMergeTreeSelectAlgorithm::getPrewhereActions(
-            prewhere_info, actions_settings, reader_settings.enable_multiple_prewhere_read_steps);
+            prewhere_info,
+            actions_settings,
+            reader_settings.enable_multiple_prewhere_read_steps);
 
-        NameSet columns_from_previous_steps;
-
-        for (const auto & step : prewhere_actions->steps)
-        {
-            Names step_column_names = step.actions->getActionsDAG().getRequiredColumnsNames();
-
-            injectRequiredColumns(
-                data_part_info_for_reader, storage_snapshot, with_subcolumns, step_column_names);
-
-            Names columns_to_read_in_step;
-            for (const auto & name : step_column_names)
-            {
-                if (columns_from_previous_steps.contains(name))
-                    continue;
-                columns_to_read_in_step.push_back(name);
-                columns_from_previous_steps.insert(name);
-            }
-
-            result.pre_columns.push_back(storage_snapshot->getColumnsByNames(options, columns_to_read_in_step));
-        }
-
-        /// Remove columns read in prewehere from the list of columns to read
-        Names post_column_names;
-        for (const auto & name : column_to_read_after_prewhere)
-            if (!columns_from_previous_steps.contains(name))
-                post_column_names.push_back(name);
-
-        column_to_read_after_prewhere = std::move(post_column_names);
+        for (const auto & step : prewhere_actions.steps)
+            add_step(*step);
     }
 
+    /// Remove columns read in prewehere from the list of columns to read
+    Names post_column_names;
+    for (const auto & name : column_to_read_after_prewhere)
+        if (!columns_from_previous_steps.contains(name))
+            post_column_names.push_back(name);
+
+    column_to_read_after_prewhere = std::move(post_column_names);
+
     /// Rest of the requested columns
     result.columns = storage_snapshot->getColumnsByNames(options, column_to_read_after_prewhere);
     return result;
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.h b/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
index e7dad5173ff..5df3e600a1a 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
@@ -6,6 +6,7 @@
 #include <Storages/MergeTree/RangesInDataPart.h>
 #include <Storages/MergeTree/MergeTreeRangeReader.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
+#include <Storages/MergeTree/AlterConversions.h>
 
 
 namespace DB
@@ -35,7 +36,6 @@ NameSet injectRequiredColumns(
     bool with_subcolumns,
     Names & columns);
 
-
 struct MergeTreeReadTaskColumns
 {
     /// column names to read during WHERE
@@ -49,8 +49,10 @@ struct MergeTreeReadTaskColumns
 /// A batch of work for MergeTreeThreadSelectProcessor
 struct MergeTreeReadTask
 {
-    /// data part which should be read while performing this task
+    /// Data part which should be read while performing this task
     DataPartPtr data_part;
+    /// Alter converversionss that should be applied on-fly for part.
+    AlterConversionsPtr alter_conversions;
     /// Ranges to read from `data_part`.
     MarkRanges mark_ranges;
     /// for virtual `part_index` virtual column
@@ -64,29 +66,26 @@ struct MergeTreeReadTask
     /// Used to save current range processing status
     MergeTreeRangeReader range_reader;
     /// Range readers for multiple filtering steps: row level security, PREWHERE etc.
-    /// NOTE: we take references to elements and push_back new elements, that's why it is a deque but noit a vector
+    /// NOTE: we take references to elements and push_back new elements, that's why it is a deque but not a vector
     std::deque<MergeTreeRangeReader> pre_range_readers;
 
     using MergeTreeReaderPtr = std::unique_ptr<IMergeTreeReader>;
     std::future<MergeTreeReaderPtr> reader;
     std::vector<std::future<MergeTreeReaderPtr>> pre_reader_for_step;
 
-    int64_t priority = 0; /// Priority of the task. Bigger value, bigger priority.
-    bool operator <(const MergeTreeReadTask & rhs) const
-    {
-        return priority < rhs.priority;
-    }
+    Priority priority;
 
     bool isFinished() const { return mark_ranges.empty() && range_reader.isCurrentRangeFinished(); }
 
     MergeTreeReadTask(
         const DataPartPtr & data_part_,
+        const AlterConversionsPtr & alter_conversions_,
         const MarkRanges & mark_ranges_,
         size_t part_index_in_query_,
         const NameSet & column_name_set_,
         const MergeTreeReadTaskColumns & task_columns_,
         MergeTreeBlockSizePredictorPtr size_predictor_,
-        int64_t priority_ = 0,
+        Priority priority_ = {},
         std::future<MergeTreeReaderPtr> reader_ = {},
         std::vector<std::future<MergeTreeReaderPtr>> && pre_reader_for_step_ = {});
 
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 1da99cb4117..338a221e45e 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -1,4 +1,3 @@
-#include "Storages/MergeTree/MergeTreeDataPartBuilder.h"
 #include <Storages/MergeTree/MergeTreeData.h>
 
 #include <AggregateFunctions/AggregateFunctionCount.h>
@@ -17,6 +16,9 @@
 #include <Common/Stopwatch.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/typeid_cast.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/ThreadFuzzer.h>
+#include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Core/QueryProcessingStage.h>
 #include <DataTypes/DataTypeEnum.h>
@@ -41,9 +43,14 @@
 #include <Interpreters/PartLog.h>
 #include <Interpreters/TransactionLog.h>
 #include <Interpreters/TreeRewriter.h>
+#include <Interpreters/Context_fwd.h>
 #include <IO/S3Common.h>
+#include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
+#include <IO/SharedThreadPools.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTNameTypePair.h>
@@ -53,6 +60,7 @@
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
+#include <Parsers/ASTAlterQuery.h>
 #include <Processors/Formats/IInputFormat.h>
 #include <Processors/QueryPlan/QueryIdHolder.h>
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
@@ -67,6 +75,8 @@
 #include <Storages/StorageMergeTree.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/VirtualColumnUtils.h>
+#include <Storages/MergeTree/MergeTreeDataPartBuilder.h>
+#include <Storages/MutationCommands.h>
 
 #include <boost/range/algorithm_ext/erase.hpp>
 #include <boost/algorithm/string/join.hpp>
@@ -75,6 +85,8 @@
 
 #include <algorithm>
 #include <atomic>
+#include <cmath>
+#include <chrono>
 #include <iomanip>
 #include <limits>
 #include <optional>
@@ -108,15 +120,20 @@ namespace ProfileEvents
     extern const Event DelayedInsertsMilliseconds;
     extern const Event InsertedWideParts;
     extern const Event InsertedCompactParts;
-    extern const Event InsertedInMemoryParts;
     extern const Event MergedIntoWideParts;
     extern const Event MergedIntoCompactParts;
-    extern const Event MergedIntoInMemoryParts;
+    extern const Event RejectedMutations;
+    extern const Event DelayedMutations;
+    extern const Event DelayedMutationsMilliseconds;
 }
 
 namespace CurrentMetrics
 {
     extern const Metric DelayedInserts;
+    extern const Metric MergeTreePartsLoaderThreads;
+    extern const Metric MergeTreePartsLoaderThreadsActive;
+    extern const Metric MergeTreePartsCleanerThreads;
+    extern const Metric MergeTreePartsCleanerThreadsActive;
 }
 
 
@@ -165,8 +182,22 @@ namespace ErrorCodes
     extern const int SERIALIZATION_ERROR;
     extern const int NETWORK_ERROR;
     extern const int SOCKET_TIMEOUT;
+    extern const int TOO_MANY_MUTATIONS;
 }
 
+static void checkSuspiciousIndices(const ASTFunction * index_function)
+{
+    std::unordered_set<UInt64> unique_index_expression_hashes;
+    for (const auto & child : index_function->arguments->children)
+    {
+        IAST::Hash hash = child->getTreeHash();
+        UInt64 first_half_of_hash = hash.first;
+
+        if (!unique_index_expression_hashes.emplace(first_half_of_hash).second)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Primary key or secondary index contains a duplicate expression. To suppress this exception, rerun the command with setting 'allow_suspicious_indices = 1'");
+    }
+}
 
 static void checkSampleExpression(const StorageInMemoryMetadata & metadata, bool allow_sampling_expression_not_in_primary_key, bool check_sample_column_is_correct)
 {
@@ -261,6 +292,7 @@ void MergeTreeData::initializeDirectoriesAndFormatVersion(const std::string & re
             {
                 auto buf = disk->writeFile(format_version_path, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite, getContext()->getWriteSettings());
                 writeIntText(format_version.toUnderType(), *buf);
+                buf->finalize();
                 if (getContext()->getSettingsRef().fsync_metadata)
                     buf->sync();
             }
@@ -354,8 +386,7 @@ MergeTreeData::MergeTreeData(
 
     String reason;
     if (!canUsePolymorphicParts(*settings, &reason) && !reason.empty())
-        LOG_WARNING(log, "{} Settings 'min_rows_for_wide_part', 'min_bytes_for_wide_part', "
-            "'min_rows_for_compact_part' and 'min_bytes_for_compact_part' will be ignored.", reason);
+        LOG_WARNING(log, "{} Settings 'min_rows_for_wide_part'and 'min_bytes_for_wide_part' will be ignored.", reason);
 
 #if !USE_ROCKSDB
     if (use_metadata_cache)
@@ -434,7 +465,10 @@ static void checkKeyExpression(const ExpressionActions & expr, const Block & sam
 }
 
 void MergeTreeData::checkProperties(
-    const StorageInMemoryMetadata & new_metadata, const StorageInMemoryMetadata & old_metadata, bool attach) const
+    const StorageInMemoryMetadata & new_metadata,
+    const StorageInMemoryMetadata & old_metadata,
+    bool attach,
+    ContextPtr local_context) const
 {
     if (!new_metadata.sorting_key.definition_ast)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "ORDER BY cannot be empty");
@@ -448,7 +482,13 @@ void MergeTreeData::checkProperties(
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Primary key must be a prefix of the sorting key, but its length: "
             "{} is greater than the sorting key length: {}", primary_key_size, sorting_key_size);
 
-    NameSet primary_key_columns_set;
+    bool allow_suspicious_indices = getSettings()->allow_suspicious_indices;
+    if (local_context)
+        allow_suspicious_indices = local_context->getSettingsRef().allow_suspicious_indices;
+
+    if (!allow_suspicious_indices && !attach)
+        if (const auto * index_function = typeid_cast<ASTFunction *>(new_sorting_key.definition_ast.get()))
+            checkSuspiciousIndices(index_function);
 
     for (size_t i = 0; i < sorting_key_size; ++i)
     {
@@ -462,60 +502,53 @@ void MergeTreeData::checkProperties(
                                 "Primary key must be a prefix of the sorting key, "
                                 "but the column in the position {} is {}", i, sorting_key_column +", not " + pk_column);
 
-            if (!primary_key_columns_set.emplace(pk_column).second)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Primary key contains duplicate columns");
-
         }
     }
 
     auto all_columns = new_metadata.columns.getAllPhysical();
 
-    /// Order by check AST
-    if (old_metadata.hasSortingKey())
+    /// This is ALTER, not CREATE/ATTACH TABLE. Let us check that all new columns used in the sorting key
+    /// expression have just been added (so that the sorting order is guaranteed to be valid with the new key).
+
+    Names new_primary_key_columns = new_primary_key.column_names;
+    Names new_sorting_key_columns = new_sorting_key.column_names;
+
+    ASTPtr added_key_column_expr_list = std::make_shared<ASTExpressionList>();
+    const auto & old_sorting_key_columns = old_metadata.getSortingKeyColumns();
+    for (size_t new_i = 0, old_i = 0; new_i < sorting_key_size; ++new_i)
     {
-        /// This is ALTER, not CREATE/ATTACH TABLE. Let us check that all new columns used in the sorting key
-        /// expression have just been added (so that the sorting order is guaranteed to be valid with the new key).
-
-        Names new_primary_key_columns = new_primary_key.column_names;
-        Names new_sorting_key_columns = new_sorting_key.column_names;
-
-        ASTPtr added_key_column_expr_list = std::make_shared<ASTExpressionList>();
-        const auto & old_sorting_key_columns = old_metadata.getSortingKeyColumns();
-        for (size_t new_i = 0, old_i = 0; new_i < sorting_key_size; ++new_i)
+        if (old_i < old_sorting_key_columns.size())
         {
-            if (old_i < old_sorting_key_columns.size())
-            {
-                if (new_sorting_key_columns[new_i] != old_sorting_key_columns[old_i])
-                    added_key_column_expr_list->children.push_back(new_sorting_key.expression_list_ast->children[new_i]);
-                else
-                    ++old_i;
-            }
-            else
+            if (new_sorting_key_columns[new_i] != old_sorting_key_columns[old_i])
                 added_key_column_expr_list->children.push_back(new_sorting_key.expression_list_ast->children[new_i]);
+            else
+                ++old_i;
         }
+        else
+            added_key_column_expr_list->children.push_back(new_sorting_key.expression_list_ast->children[new_i]);
+    }
 
-        if (!added_key_column_expr_list->children.empty())
+    if (!added_key_column_expr_list->children.empty())
+    {
+        auto syntax = TreeRewriter(getContext()).analyze(added_key_column_expr_list, all_columns);
+        Names used_columns = syntax->requiredSourceColumns();
+
+        NamesAndTypesList deleted_columns;
+        NamesAndTypesList added_columns;
+        old_metadata.getColumns().getAllPhysical().getDifference(all_columns, deleted_columns, added_columns);
+
+        for (const String & col : used_columns)
         {
-            auto syntax = TreeRewriter(getContext()).analyze(added_key_column_expr_list, all_columns);
-            Names used_columns = syntax->requiredSourceColumns();
+            if (!added_columns.contains(col) || deleted_columns.contains(col))
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "Existing column {} is used in the expression that was added to the sorting key. "
+                                "You can add expressions that use only the newly added columns",
+                                backQuoteIfNeed(col));
 
-            NamesAndTypesList deleted_columns;
-            NamesAndTypesList added_columns;
-            old_metadata.getColumns().getAllPhysical().getDifference(all_columns, deleted_columns, added_columns);
-
-            for (const String & col : used_columns)
-            {
-                if (!added_columns.contains(col) || deleted_columns.contains(col))
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                    "Existing column {} is used in the expression that was added to the sorting key. "
-                                    "You can add expressions that use only the newly added columns",
-                                    backQuoteIfNeed(col));
-
-                if (new_metadata.columns.getDefaults().contains(col))
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                    "Newly added column {} has a default expression, so adding expressions that use "
-                                    "it to the sorting key is forbidden", backQuoteIfNeed(col));
-            }
+            if (new_metadata.columns.getDefaults().contains(col))
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "Newly added column {} has a default expression, so adding expressions that use "
+                                "it to the sorting key is forbidden", backQuoteIfNeed(col));
         }
     }
 
@@ -525,6 +558,12 @@ void MergeTreeData::checkProperties(
 
         for (const auto & index : new_metadata.secondary_indices)
         {
+            if (!allow_suspicious_indices && !attach)
+            {
+                const auto * index_ast = typeid_cast<const ASTIndexDeclaration *>(index.definition_ast.get());
+                if (const auto * index_function = typeid_cast<const ASTFunction *>(index_ast->expr))
+                    checkSuspiciousIndices(index_function);
+            }
 
             MergeTreeIndexFactory::instance().validate(index, attach);
 
@@ -551,9 +590,13 @@ void MergeTreeData::checkProperties(
     checkKeyExpression(*new_sorting_key.expression, new_sorting_key.sample_block, "Sorting", allow_nullable_key);
 }
 
-void MergeTreeData::setProperties(const StorageInMemoryMetadata & new_metadata, const StorageInMemoryMetadata & old_metadata, bool attach)
+void MergeTreeData::setProperties(
+    const StorageInMemoryMetadata & new_metadata,
+    const StorageInMemoryMetadata & old_metadata,
+    bool attach,
+    ContextPtr local_context)
 {
-    checkProperties(new_metadata, old_metadata, attach);
+    checkProperties(new_metadata, old_metadata, attach, local_context);
     setInMemoryMetadata(new_metadata);
 }
 
@@ -985,7 +1028,6 @@ std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
     return res;
 }
 
-
 String MergeTreeData::MergingParams::getModeName() const
 {
     switch (mode)
@@ -1036,7 +1078,7 @@ void MergeTreeData::PartLoadingTree::add(const MergeTreePartInfo & info, const S
             else if (!prev_info.isDisjoint(info))
             {
                 throw Exception(ErrorCodes::LOGICAL_ERROR,
-                    "Part {} intersects previous part {}. It is a bug!",
+                    "Part {} intersects previous part {}. It is a bug or a result of manual intervention in the server or ZooKeeper data",
                     name, prev->second->name);
             }
         }
@@ -1053,7 +1095,7 @@ void MergeTreeData::PartLoadingTree::add(const MergeTreePartInfo & info, const S
             else if (!next_info.isDisjoint(info))
             {
                 throw Exception(ErrorCodes::LOGICAL_ERROR,
-                    "Part {} intersects next part {}. It is a bug!",
+                    "Part {} intersects next part {}.  It is a bug or a result of manual intervention in the server or ZooKeeper data",
                     name, it->second->name);
             }
         }
@@ -1150,6 +1192,10 @@ static bool isRetryableException(const Exception & e)
     return false;
 }
 
+static constexpr size_t loading_parts_initial_backoff_ms = 100;
+static constexpr size_t loading_parts_max_backoff_ms = 5000;
+static constexpr size_t loading_parts_max_tries = 3;
+
 MergeTreeData::LoadPartResult MergeTreeData::loadDataPart(
     const MergeTreePartInfo & part_info,
     const String & part_name,
@@ -1163,14 +1209,59 @@ MergeTreeData::LoadPartResult MergeTreeData::loadDataPart(
     auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, part_disk_ptr, 0);
     auto data_part_storage = std::make_shared<DataPartStorageOnDiskFull>(single_disk_volume, relative_data_path, part_name);
 
-    res.part = getDataPartBuilder(part_name, single_disk_volume, part_name)
-        .withPartInfo(part_info)
-        .withPartFormatFromDisk()
-        .build();
-
     String part_path = fs::path(relative_data_path) / part_name;
     String marker_path = fs::path(part_path) / IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME;
 
+    /// Ignore broken parts that can appear as a result of hard server restart.
+    auto mark_broken = [&]
+    {
+        if (!res.part)
+        {
+            /// Build a fake part and mark it as broken in case of filesystem error.
+            /// If the error impacts part directory instead of single files,
+            /// an exception will be thrown during detach and silently ignored.
+            res.part = getDataPartBuilder(part_name, single_disk_volume, part_name)
+                .withPartStorageType(MergeTreeDataPartStorageType::Full)
+                .withPartType(MergeTreeDataPartType::Wide)
+                .build();
+        }
+
+        res.is_broken = true;
+        tryLogCurrentException(log, fmt::format("while loading part {} on path {}", part_name, part_path));
+
+        res.size_of_part = calculatePartSizeSafe(res.part, log);
+        auto part_size_str = res.size_of_part ? formatReadableSizeWithBinarySuffix(*res.size_of_part) : "failed to calculate size";
+
+        LOG_ERROR(log,
+            "Detaching broken part {}{} (size: {}). "
+            "If it happened after update, it is likely because of backward incompatibility. "
+            "You need to resolve this manually",
+            getFullPathOnDisk(part_disk_ptr), part_name, part_size_str);
+    };
+
+    try
+    {
+        res.part = getDataPartBuilder(part_name, single_disk_volume, part_name)
+            .withPartInfo(part_info)
+            .withPartFormatFromDisk()
+            .build();
+    }
+    catch (const Exception & e)
+    {
+        /// Don't count the part as broken if there was a retryalbe error
+        /// during loading, such as "not enough memory" or network error.
+        if (isRetryableException(e))
+            throw;
+
+        mark_broken();
+        return res;
+    }
+    catch (...)
+    {
+        mark_broken();
+        return res;
+    }
+
     if (part_disk_ptr->exists(marker_path))
     {
         /// NOTE: getBytesOnDisk() cannot be used here, since it may be zero if checksums.txt does not exist.
@@ -1198,27 +1289,12 @@ MergeTreeData::LoadPartResult MergeTreeData::loadDataPart(
         if (isRetryableException(e))
             throw;
 
-        res.is_broken = true;
-        tryLogCurrentException(log, fmt::format("while loading part {} on path {}", res.part->name, part_path));
+        mark_broken();
+        return res;
     }
     catch (...)
     {
-        res.is_broken = true;
-        tryLogCurrentException(log, fmt::format("while loading part {} on path {}", res.part->name, part_path));
-    }
-
-    /// Ignore broken parts that can appear as a result of hard server restart.
-    if (res.is_broken)
-    {
-        res.size_of_part = calculatePartSizeSafe(res.part, log);
-        auto part_size_str = res.size_of_part ? formatReadableSizeWithBinarySuffix(*res.size_of_part) : "failed to calculate size";
-
-        LOG_ERROR(log,
-            "Detaching broken part {}{} (size: {}). "
-            "If it happened after update, it is likely because of backward incompatibility. "
-            "You need to resolve this manually",
-            getFullPathOnDisk(part_disk_ptr), part_name, part_size_str);
-
+        mark_broken();
         return res;
     }
 
@@ -1294,6 +1370,7 @@ MergeTreeData::LoadPartResult MergeTreeData::loadDataPart(
 
     {
         std::lock_guard lock(part_loading_mutex);
+        LOG_TEST(log, "loadDataPart: inserting {} into data_parts_indexes", res.part->getNameWithState());
         std::tie(it, inserted) = data_parts_indexes.insert(res.part);
     }
 
@@ -1317,6 +1394,37 @@ MergeTreeData::LoadPartResult MergeTreeData::loadDataPart(
     return res;
 }
 
+MergeTreeData::LoadPartResult MergeTreeData::loadDataPartWithRetries(
+    const MergeTreePartInfo & part_info,
+    const String & part_name,
+    const DiskPtr & part_disk_ptr,
+    MergeTreeDataPartState to_state,
+    std::mutex & part_loading_mutex,
+    size_t initial_backoff_ms,
+    size_t max_backoff_ms,
+    size_t max_tries)
+{
+    for (size_t try_no = 0; try_no < max_tries; ++try_no)
+    {
+        try
+        {
+            return loadDataPart(part_info, part_name, part_disk_ptr, to_state, part_loading_mutex);
+        }
+        catch (const Exception & e)
+        {
+            if (!isRetryableException(e) || try_no + 1 == max_tries)
+                throw;
+
+            LOG_DEBUG(log, "Failed to load data part {} at try {} with retryable error: {}. Will retry in {} ms",
+                part_name, try_no, e.message(), initial_backoff_ms);
+
+            std::this_thread::sleep_for(std::chrono::milliseconds(initial_backoff_ms));
+            initial_backoff_ms = std::min(initial_backoff_ms * 2, max_backoff_ms);
+        }
+    }
+    UNREACHABLE();
+}
+
 std::vector<MergeTreeData::LoadPartResult> MergeTreeData::loadDataPartsFromDisk(
     ThreadPool & pool,
     size_t num_parts,
@@ -1396,10 +1504,10 @@ std::vector<MergeTreeData::LoadPartResult> MergeTreeData::loadDataPartsFromDisk(
             {
                 SCOPE_EXIT_SAFE(
                     if (thread_group)
-                        CurrentThread::detachQueryIfNotDetached();
+                        CurrentThread::detachFromGroupIfNotDetached();
                 );
                 if (thread_group)
-                    CurrentThread::attachToIfDetached(thread_group);
+                    CurrentThread::attachToGroupIfDetached(thread_group);
 
                 while (true)
                 {
@@ -1431,10 +1539,14 @@ std::vector<MergeTreeData::LoadPartResult> MergeTreeData::loadDataPartsFromDisk(
 
                     /// Pass a separate mutex to guard the set of parts, because this lambda
                     /// is called concurrently but with already locked @data_parts_mutex.
-                    auto res = loadDataPart(thread_part->info, thread_part->name, thread_part->disk, DataPartState::Active, part_loading_mutex);
-                    thread_part->is_loaded = true;
+                    auto res = loadDataPartWithRetries(
+                        thread_part->info, thread_part->name, thread_part->disk,
+                        DataPartState::Active, part_loading_mutex, loading_parts_initial_backoff_ms,
+                        loading_parts_max_backoff_ms, loading_parts_max_tries);
 
+                    thread_part->is_loaded = true;
                     bool is_active_part = res.part->getState() == DataPartState::Active;
+
                     /// If part is broken or duplicate or should be removed according to transaction
                     /// and it has any covered parts then try to load them to replace this part.
                     if (!is_active_part && !thread_part->children.empty())
@@ -1484,6 +1596,7 @@ void MergeTreeData::loadDataPartsFromWAL(MutableDataPartsVector & parts_from_wal
             continue;
 
         part->setState(DataPartState::Active);
+        LOG_TEST(log, "loadDataPartsFromWAL: inserting {} into data_parts_indexes", part->getNameWithState());
         auto [it, inserted] = data_parts_indexes.insert(part);
 
         if (!inserted)
@@ -1516,24 +1629,32 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     {
         /// Check extra parts at different disks, in order to not allow to miss data parts at undefined disks.
         std::unordered_set<String> defined_disk_names;
-        /// If disk is wrapped into cached disk, it will not be defined in storage policy.
-        std::unordered_set<String> disk_names_wrapped_in_cache;
 
         for (const auto & disk_ptr : disks)
-            defined_disk_names.insert(disk_ptr->getName());
-
-        for (const auto & [disk_name, disk_ptr] : getContext()->getDisksMap())
         {
-            /// In composable cache with the underlying source disk there might the following structure:
-            /// DiskObjectStorage(CachedObjectStorage(...(CachedObjectStored(ObjectStorage)...)))
-            /// In configuration file each of these layers has a different name, but data path
-            /// (getPath() result) is the same. We need to take it into account here.
-            if (disk_ptr->supportsCache() && defined_disk_names.contains(disk_ptr->getName()))
+            defined_disk_names.insert(disk_ptr->getName());
+        }
+
+        /// In case of delegate disks it is not enough to traverse `disks`,
+        /// because for example cache or encrypted disk which wrap s3 disk and s3 disk itself can be put into different storage policies.
+        /// But disk->exists returns the same thing for both disks.
+        for (const auto & [disk_name, disk] : getContext()->getDisksMap())
+        {
+            /// As encrypted disk can use the same path of its nested disk,
+            /// we need to take it into account here.
+            const auto & delegate = disk->getDelegateDiskIfExists();
+            if (delegate && disk->getPath() == delegate->getPath())
+                defined_disk_names.insert(delegate->getName());
+
+            if (disk->supportsCache())
             {
-                auto caches = disk_ptr->getCacheLayersNames();
-                disk_names_wrapped_in_cache.insert(caches.begin(), caches.end());
-                LOG_TEST(log, "Cache layers for cache disk `{}`, inner disk `{}`: {}",
-                         disk_name, disk_ptr->getName(), fmt::join(caches, ", "));
+                /// As cache is implemented on object storage layer, not on disk level, e.g.
+                /// we have such structure:
+                /// DiskObjectStorage(CachedObjectStorage(...(CachedObjectStored(ObjectStorage)...)))
+                /// and disk_ptr->getName() here is the name of last delegate - ObjectStorage.
+                /// So now we need to add cache layers to defined disk names.
+                auto caches = disk->getCacheLayersNames();
+                defined_disk_names.insert(caches.begin(), caches.end());
             }
         }
 
@@ -1542,9 +1663,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
             if (disk->isBroken() || disk->isCustomDisk())
                 continue;
 
-            if (!defined_disk_names.contains(disk_name)
-                && disk->exists(relative_data_path)
-                && !disk_names_wrapped_in_cache.contains(disk_name))
+            if (!defined_disk_names.contains(disk_name) && disk->exists(relative_data_path))
             {
                 for (const auto it = disk->iterateDirectory(relative_data_path); it->isValid(); it->next())
                 {
@@ -1552,16 +1671,15 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
                     {
                         throw Exception(
                             ErrorCodes::UNKNOWN_DISK,
-                            "Part {} ({}) was found on disk {} which is not defined in the storage policy (defined disks: {}, wrapped disks: {})",
-                            backQuote(it->name()), backQuote(it->path()), backQuote(disk_name),
-                            fmt::join(defined_disk_names, ", "), fmt::join(disk_names_wrapped_in_cache, ", "));
+                            "Part {} ({}) was found on disk {} which is not defined in the storage policy (defined disks: {})",
+                            backQuote(it->name()), backQuote(it->path()), backQuote(disk_name), fmt::join(defined_disk_names, ", "));
                     }
                 }
             }
         }
     }
 
-    ThreadPool pool(disks.size());
+    ThreadPool pool(CurrentMetrics::MergeTreePartsLoaderThreads, CurrentMetrics::MergeTreePartsLoaderThreadsActive, disks.size());
     std::vector<PartLoadingTree::PartLoadingInfos> parts_to_load_by_disk(disks.size());
 
     for (size_t i = 0; i < disks.size(); ++i)
@@ -1619,6 +1737,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     }
 
     auto part_lock = lockParts();
+    LOG_TEST(log, "loadDataParts: clearing data_parts_indexes (had {} parts)", data_parts_indexes.size());
     data_parts_indexes.clear();
 
     MutableDataPartsVector broken_parts_to_detach;
@@ -1770,6 +1889,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
         {
             std::lock_guard lock(outdated_data_parts_mutex);
             outdated_unloaded_data_parts = std::move(unloaded_parts);
+            outdated_data_parts_loading_finished = false;
         }
 
         outdated_data_parts_loading_task = getContext()->getSchedulePool().createTask(
@@ -1787,7 +1907,11 @@ try
     {
         std::lock_guard lock(outdated_data_parts_mutex);
         if (outdated_unloaded_data_parts.empty())
+        {
+            outdated_data_parts_loading_finished = true;
+            outdated_data_parts_cv.notify_all();
             return;
+        }
 
         LOG_DEBUG(log, "Loading {} outdated data parts {}",
             outdated_unloaded_data_parts.size(),
@@ -1799,7 +1923,11 @@ try
     if (is_async)
         shared_lock = lockForShare(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
 
-    size_t num_loaded_parts = 0;
+    std::atomic_size_t num_loaded_parts = 0;
+
+    auto runner = threadPoolCallbackRunner<void>(OutdatedPartsLoadingThreadPool::get(), "OutdatedParts");
+    std::vector<std::future<void>> parts_futures;
+
     while (true)
     {
         PartLoadingTree::NodePtr part;
@@ -1809,6 +1937,10 @@ try
 
             if (is_async && outdated_data_parts_loading_canceled)
             {
+                /// Wait for every scheduled task
+                for (auto & future : parts_futures)
+                    future.wait();
+
                 LOG_DEBUG(log,
                     "Stopped loading outdated data parts because task was canceled. "
                     "Loaded {} parts, {} left unloaded", num_loaded_parts, outdated_unloaded_data_parts.size());
@@ -1818,24 +1950,39 @@ try
             if (outdated_unloaded_data_parts.empty())
                 break;
 
-            part = std::move(outdated_unloaded_data_parts.back());
+            part = outdated_unloaded_data_parts.back();
             outdated_unloaded_data_parts.pop_back();
         }
 
-        auto res = loadDataPart(part->info, part->name, part->disk, MergeTreeDataPartState::Outdated, data_parts_mutex);
-        ++num_loaded_parts;
+        parts_futures.push_back(runner([&, my_part = part]()
+        {
+            auto res = loadDataPartWithRetries(
+            my_part->info, my_part->name, my_part->disk,
+            DataPartState::Outdated, data_parts_mutex, loading_parts_initial_backoff_ms,
+            loading_parts_max_backoff_ms, loading_parts_max_tries);
 
-        if (res.is_broken)
-            res.part->renameToDetached("broken-on-start"); /// detached parts must not have '_' in prefixes
-        else if (res.part->is_duplicate)
-            res.part->remove();
-        else
-            preparePartForRemoval(res.part);
+            ++num_loaded_parts;
+            if (res.is_broken)
+                res.part->renameToDetached("broken-on-start"); /// detached parts must not have '_' in prefixes
+            else if (res.part->is_duplicate)
+                res.part->remove();
+            else
+                preparePartForRemoval(res.part);
+        }, Priority{}));
     }
 
+    /// Wait for every scheduled task
+    for (auto & future : parts_futures)
+        future.wait();
+
     LOG_DEBUG(log, "Loaded {} outdated data parts {}",
         num_loaded_parts, is_async ? "asynchronously" : "synchronously");
-    outdated_data_parts_cv.notify_all();
+
+    {
+        std::lock_guard lock(outdated_data_parts_mutex);
+        outdated_data_parts_loading_finished = true;
+        outdated_data_parts_cv.notify_all();
+    }
 }
 catch (...)
 {
@@ -1852,15 +1999,13 @@ void MergeTreeData::waitForOutdatedPartsToBeLoaded() const TSA_NO_THREAD_SAFETY_
     if (isStaticStorage())
         return;
 
-    std::unique_lock lock(outdated_data_parts_mutex);
-    if (outdated_unloaded_data_parts.empty())
-        return;
-
     LOG_TRACE(log, "Will wait for outdated data parts to be loaded");
 
+    std::unique_lock lock(outdated_data_parts_mutex);
+
     outdated_data_parts_cv.wait(lock, [this]() TSA_NO_THREAD_SAFETY_ANALYSIS
     {
-        return outdated_unloaded_data_parts.empty() || outdated_data_parts_loading_canceled;
+        return outdated_data_parts_loading_finished || outdated_data_parts_loading_canceled;
     });
 
     if (outdated_data_parts_loading_canceled)
@@ -1946,11 +2091,19 @@ size_t MergeTreeData::clearOldTemporaryDirectories(size_t custom_directories_lif
             {
                 if (isOldPartDirectory(disk, it->path(), deadline))
                 {
+                    ThreadFuzzer::maybeInjectSleep();
                     if (temporary_parts.contains(basename))
                     {
-                        /// Actually we don't rely on temporary_directories_lifetime when removing old temporaries directoties,
+                        /// Actually we don't rely on temporary_directories_lifetime when removing old temporaries directories,
                         /// it's just an extra level of protection just in case we have a bug.
-                        LOG_INFO(log, "{} is in use (by merge/mutation/INSERT) (consider increasing temporary_directories_lifetime setting)", full_path);
+                        LOG_INFO(LogFrequencyLimiter(log, 10), "{} is in use (by merge/mutation/INSERT) (consider increasing temporary_directories_lifetime setting)", full_path);
+                        continue;
+                    }
+                    else if (!disk->exists(it->path()))
+                    {
+                        /// We should recheck that the dir exists, otherwise we can get "No such file or directory"
+                        /// due to a race condition with "Renaming temporary part" (temporary part holder could be already released, so the check above is not enough)
+                        LOG_WARNING(log, "Temporary directory {} suddenly disappeared while iterating, assuming it was concurrently renamed to persistent", it->path());
                         continue;
                     }
                     else
@@ -2157,6 +2310,7 @@ void MergeTreeData::removePartsFinally(const MergeTreeData::DataPartsVector & pa
 
             (*it)->assertState({DataPartState::Deleting});
 
+            LOG_TEST(log, "removePartsFinally: removing {} from data_parts_indexes", (*it)->getNameWithState());
             data_parts_indexes.erase(it);
         }
     }
@@ -2196,22 +2350,6 @@ void MergeTreeData::removePartsFinally(const MergeTreeData::DataPartsVector & pa
     }
 }
 
-void MergeTreeData::flushAllInMemoryPartsIfNeeded()
-{
-    if (getSettings()->in_memory_parts_enable_wal)
-        return;
-
-    auto metadata_snapshot = getInMemoryMetadataPtr();
-    DataPartsVector parts = getDataPartsVectorForInternalUsage();
-    for (const auto & part : parts)
-    {
-        if (auto part_in_memory = asInMemoryPart(part))
-        {
-            part_in_memory->flushToDisk(part_in_memory->getDataPartStorage().getPartDirectory(), metadata_snapshot);
-        }
-    }
-}
-
 size_t MergeTreeData::clearOldPartsFromFilesystem(bool force)
 {
     DataPartsVector parts_to_remove = grabOldParts(force);
@@ -2289,21 +2427,27 @@ void MergeTreeData::clearPartsFromFilesystemImpl(const DataPartsVector & parts_t
     }
 
     /// Parallel parts removal.
-    size_t num_threads = std::min<size_t>(settings->max_part_removal_threads, parts_to_remove.size());
+    size_t num_threads = settings->max_part_removal_threads;
+    if (!num_threads)
+        num_threads = getNumberOfPhysicalCPUCores() * 2;
+    num_threads = std::min<size_t>(num_threads, parts_to_remove.size());
     std::mutex part_names_mutex;
-    ThreadPool pool(num_threads);
+    ThreadPool pool(CurrentMetrics::MergeTreePartsCleanerThreads, CurrentMetrics::MergeTreePartsCleanerThreadsActive,
+                    num_threads, num_threads, /* unlimited queue size */ 0);
 
-    bool has_zero_copy_parts = false;
+    /// This flag disallow straightforward concurrent parts removal. It's required only in case
+    /// when we have parts on zero-copy disk + at least some of them were mutated.
+    bool remove_parts_in_order = false;
     if (settings->allow_remote_fs_zero_copy_replication && dynamic_cast<StorageReplicatedMergeTree *>(this) != nullptr)
     {
-        has_zero_copy_parts = std::any_of(
+        remove_parts_in_order = std::any_of(
             parts_to_remove.begin(), parts_to_remove.end(),
-            [] (const auto & data_part) { return data_part->isStoredOnRemoteDiskWithZeroCopySupport(); }
+            [] (const auto & data_part) { return data_part->isStoredOnRemoteDiskWithZeroCopySupport() && data_part->info.getMutationVersion() > 0; }
         );
     }
 
 
-    if (!has_zero_copy_parts)
+    if (!remove_parts_in_order)
     {
         /// NOTE: Under heavy system load you may get "Cannot schedule a task" from ThreadPool.
         LOG_DEBUG(
@@ -2315,10 +2459,10 @@ void MergeTreeData::clearPartsFromFilesystemImpl(const DataPartsVector & parts_t
             {
                 SCOPE_EXIT_SAFE(
                     if (thread_group)
-                        CurrentThread::detachQueryIfNotDetached();
+                        CurrentThread::detachFromGroupIfNotDetached();
                 );
                 if (thread_group)
-                    CurrentThread::attachToIfDetached(thread_group);
+                    CurrentThread::attachToGroupIfDetached(thread_group);
 
                 asMutableDeletingPart(part)->remove();
                 if (part_names_succeed)
@@ -2348,38 +2492,71 @@ void MergeTreeData::clearPartsFromFilesystemImpl(const DataPartsVector & parts_t
     /// We remove disjoint subsets of parts in parallel.
     /// The problem is that it's not trivial to divide Outdated parts into disjoint subsets,
     /// because Outdated parts legally can be intersecting (but intersecting parts must be separated by a DROP_RANGE).
-    /// So we ignore level and version and use block numbers only.
-    ActiveDataPartSet independent_ranges_set(format_version);
-    for (const auto & part : parts_to_remove)
+    /// So we ignore level and version and use block numbers only (they cannot intersect by block numbers unless we have a bug).
+
+    struct RemovalRanges
     {
-        MergeTreePartInfo range_info = part->info;
-        range_info.level = static_cast<UInt32>(range_info.max_block - range_info.min_block);
-        range_info.mutation = 0;
-        independent_ranges_set.add(range_info, range_info.getPartNameV1());
-    }
+        std::vector<MergeTreePartInfo> infos;
+        std::vector<DataPartsVector> parts;
+        std::vector<UInt64> split_times;
+    };
 
-    auto independent_ranges_infos = independent_ranges_set.getPartInfos();
-    size_t sum_of_ranges = 0;
-    for (auto range : independent_ranges_infos)
+    auto split_into_independent_ranges = [this](const DataPartsVector & parts_to_remove_, size_t split_times) -> RemovalRanges
     {
-        range.level = MergeTreePartInfo::MAX_LEVEL;
-        range.mutation = MergeTreePartInfo::MAX_BLOCK_NUMBER;
+        if (parts_to_remove_.empty())
+            return {};
 
-        DataPartsVector parts_in_range;
-        for (const auto & part : parts_to_remove)
-            if (range.contains(part->info))
-                parts_in_range.push_back(part);
-        sum_of_ranges += parts_in_range.size();
+        ActiveDataPartSet independent_ranges_set(format_version);
+        for (const auto & part : parts_to_remove_)
+        {
+            MergeTreePartInfo range_info = part->info;
+            range_info.level = static_cast<UInt32>(range_info.max_block - range_info.min_block);
+            range_info.mutation = 0;
+            independent_ranges_set.add(range_info, range_info.getPartNameV1());
+        }
 
+        RemovalRanges independent_ranges;
+        independent_ranges.infos = independent_ranges_set.getPartInfos();
+        size_t num_ranges = independent_ranges.infos.size();
+        independent_ranges.parts.resize(num_ranges);
+        independent_ranges.split_times.resize(num_ranges, split_times);
+        size_t avg_range_size = parts_to_remove_.size() / num_ranges;
+
+        size_t sum_of_ranges = 0;
+        for (size_t i = 0; i < num_ranges; ++i)
+        {
+            MergeTreePartInfo & range = independent_ranges.infos[i];
+            DataPartsVector & parts_in_range = independent_ranges.parts[i];
+            range.level = MergeTreePartInfo::MAX_LEVEL;
+            range.mutation = MergeTreePartInfo::MAX_BLOCK_NUMBER;
+
+            parts_in_range.reserve(avg_range_size * 2);
+            for (const auto & part : parts_to_remove_)
+                if (range.contains(part->info))
+                    parts_in_range.push_back(part);
+            sum_of_ranges += parts_in_range.size();
+        }
+
+        if (parts_to_remove_.size() != sum_of_ranges)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Number of removed parts is not equal to number of parts in independent ranges "
+                                                       "({} != {}), it's a bug", parts_to_remove_.size(), sum_of_ranges);
+
+        return independent_ranges;
+    };
+
+    auto schedule_parts_removal = [this, &pool, &part_names_mutex, part_names_succeed](
+        const MergeTreePartInfo & range, DataPartsVector && parts_in_range)
+    {
+        /// Below, range should be captured by copy to avoid use-after-scope on exception from pool
         pool.scheduleOrThrowOnError(
             [this, range, &part_names_mutex, part_names_succeed, thread_group = CurrentThread::getGroup(), batch = std::move(parts_in_range)]
         {
             SCOPE_EXIT_SAFE(
                 if (thread_group)
-                    CurrentThread::detachQueryIfNotDetached();
+                    CurrentThread::detachFromGroupIfNotDetached();
             );
             if (thread_group)
-                CurrentThread::attachToIfDetached(thread_group);
+                CurrentThread::attachToGroupIfDetached(thread_group);
 
             LOG_TRACE(log, "Removing {} parts in blocks range {}", batch.size(), range.getPartNameForLogs());
 
@@ -2393,13 +2570,83 @@ void MergeTreeData::clearPartsFromFilesystemImpl(const DataPartsVector & parts_t
                 }
             }
         });
+    };
+
+    RemovalRanges independent_ranges = split_into_independent_ranges(parts_to_remove, /* split_times */ 0);
+    DataPartsVector excluded_parts;
+    size_t num_ranges = independent_ranges.infos.size();
+    size_t sum_of_ranges = 0;
+    for (size_t i = 0; i < num_ranges; ++i)
+    {
+        MergeTreePartInfo & range = independent_ranges.infos[i];
+        DataPartsVector & parts_in_range = independent_ranges.parts[i];
+        UInt64 split_times = independent_ranges.split_times[i];
+
+        /// It may happen that we have a huge part covering thousands small parts.
+        /// In this case, we will get a huge range that will be process by only one thread causing really long tail latency.
+        /// Let's try to exclude such parts in order to get smaller tasks for thread pool and more uniform distribution.
+        if (settings->concurrent_part_removal_threshold < parts_in_range.size() &&
+            split_times < settings->zero_copy_concurrent_part_removal_max_split_times)
+        {
+            auto smaller_parts_pred = [&range](const DataPartPtr & part)
+            {
+                return !(part->info.min_block == range.min_block && part->info.max_block == range.max_block);
+            };
+
+            size_t covered_parts_count = std::count_if(parts_in_range.begin(), parts_in_range.end(), smaller_parts_pred);
+            size_t top_level_count = parts_in_range.size() - covered_parts_count;
+            chassert(top_level_count);
+            Float32 parts_to_exclude_ratio = static_cast<Float32>(top_level_count) / parts_in_range.size();
+            if (settings->zero_copy_concurrent_part_removal_max_postpone_ratio < parts_to_exclude_ratio)
+            {
+                /// Most likely we have a long mutations chain here
+                LOG_DEBUG(log, "Block range {} contains {} parts including {} top-level parts, will not try to split it",
+                          range.getPartNameForLogs(), parts_in_range.size(), top_level_count);
+            }
+            else
+            {
+                auto new_end_it = std::partition(parts_in_range.begin(), parts_in_range.end(), smaller_parts_pred);
+                std::move(new_end_it, parts_in_range.end(), std::back_inserter(excluded_parts));
+                parts_in_range.erase(new_end_it, parts_in_range.end());
+
+                RemovalRanges subranges = split_into_independent_ranges(parts_in_range, split_times + 1);
+
+                LOG_DEBUG(log, "Block range {} contained {} parts, it was split into {} independent subranges after excluding {} top-level parts",
+                          range.getPartNameForLogs(), parts_in_range.size() + top_level_count, subranges.infos.size(), top_level_count);
+
+                std::move(subranges.infos.begin(), subranges.infos.end(), std::back_inserter(independent_ranges.infos));
+                std::move(subranges.parts.begin(), subranges.parts.end(), std::back_inserter(independent_ranges.parts));
+                std::move(subranges.split_times.begin(), subranges.split_times.end(), std::back_inserter(independent_ranges.split_times));
+                num_ranges += subranges.infos.size();
+                continue;
+            }
+        }
+
+        sum_of_ranges += parts_in_range.size();
+
+        schedule_parts_removal(range, std::move(parts_in_range));
+    }
+
+    /// Remove excluded parts as well. They were reordered, so sort them again
+    std::sort(excluded_parts.begin(), excluded_parts.end(), [](const auto & x, const auto & y) { return x->info < y->info; });
+    LOG_TRACE(log, "Will remove {} big parts separately: {}", excluded_parts.size(), fmt::join(excluded_parts, ", "));
+
+    independent_ranges = split_into_independent_ranges(excluded_parts, /* split_times */ 0);
+    pool.wait();
+
+    for (size_t i = 0; i < independent_ranges.infos.size(); ++i)
+    {
+        MergeTreePartInfo & range = independent_ranges.infos[i];
+        DataPartsVector & parts_in_range = independent_ranges.parts[i];
+        schedule_parts_removal(range, std::move(parts_in_range));
     }
 
     pool.wait();
 
-    if (parts_to_remove.size() != sum_of_ranges)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Number of removed parts is not equal to number of parts in independent ranges "
-                                                   "({} != {}), it's a bug", parts_to_remove.size(), sum_of_ranges);
+    if (parts_to_remove.size() != sum_of_ranges + excluded_parts.size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Number of parts to remove was not equal to number of parts in independent ranges and excluded parts"
+                        "({} != {} + {}), it's a bug", parts_to_remove.size(), sum_of_ranges, excluded_parts.size());
 }
 
 size_t MergeTreeData::clearOldBrokenPartsFromDetachedDirectory()
@@ -2927,7 +3174,8 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
         old_types.emplace(column.name, column.type.get());
 
     NamesAndTypesList columns_to_check_conversion;
-    auto name_deps = getDependentViewsByColumn(local_context);
+
+    std::optional<NameDependencies> name_deps{};
     for (const AlterCommand & command : commands)
     {
         /// Just validate partition expression
@@ -3009,7 +3257,9 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
 
             if (!command.clear)
             {
-                const auto & deps_mv = name_deps[command.column_name];
+                if (!name_deps)
+                    name_deps = getDependentViewsByColumn(local_context);
+                const auto & deps_mv = name_deps.value()[command.column_name];
                 if (!deps_mv.empty())
                 {
                     throw Exception(ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN,
@@ -3084,7 +3334,7 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
         }
     }
 
-    checkProperties(new_metadata, old_metadata);
+    checkProperties(new_metadata, old_metadata, false, local_context);
     checkTTLExpressions(new_metadata, old_metadata);
 
     if (!columns_to_check_conversion.empty())
@@ -3179,7 +3429,7 @@ void MergeTreeData::checkMutationIsPossible(const MutationCommands & /*commands*
     /// Some validation will be added
 }
 
-MergeTreeDataPartFormat MergeTreeData::choosePartFormat(size_t bytes_uncompressed, size_t rows_count, bool only_on_disk) const
+MergeTreeDataPartFormat MergeTreeData::choosePartFormat(size_t bytes_uncompressed, size_t rows_count) const
 {
     using PartType = MergeTreeDataPartType;
     using PartStorageType = MergeTreeDataPartStorageType;
@@ -3193,9 +3443,6 @@ MergeTreeDataPartFormat MergeTreeData::choosePartFormat(size_t bytes_uncompresse
         return bytes_uncompressed < min_bytes_for || rows_count < min_rows_for;
     };
 
-    if (!only_on_disk && satisfies(settings->min_bytes_for_compact_part, settings->min_rows_for_compact_part))
-        return {PartType::InMemory, PartStorageType::Full};
-
     auto part_type = PartType::Wide;
     if (satisfies(settings->min_bytes_for_wide_part, settings->min_rows_for_wide_part))
         part_type = PartType::Compact;
@@ -3205,7 +3452,7 @@ MergeTreeDataPartFormat MergeTreeData::choosePartFormat(size_t bytes_uncompresse
 
 MergeTreeDataPartFormat MergeTreeData::choosePartFormatOnDisk(size_t bytes_uncompressed, size_t rows_count) const
 {
-    return choosePartFormat(bytes_uncompressed, rows_count, true);
+    return choosePartFormat(bytes_uncompressed, rows_count);
 }
 
 MergeTreeDataPartBuilder MergeTreeData::getDataPartBuilder(
@@ -3467,6 +3714,9 @@ void MergeTreeData::checkPartDynamicColumns(MutableDataPartPtr & part, DataParts
     const auto & part_columns = part->getColumns();
     for (const auto & part_column : part_columns)
     {
+        if (part_column.name == LightweightDeleteDescription::FILTER_COLUMN.name)
+            continue;
+
         auto storage_column = columns.getPhysical(part_column.name);
         if (!storage_column.type->hasDynamicSubcolumns())
             continue;
@@ -3493,6 +3743,7 @@ void MergeTreeData::preparePartForCommit(MutableDataPartPtr & part, Transaction
     if (need_rename)
         part->renameTo(part->name, true);
 
+    LOG_TEST(log, "preparePartForCommit: inserting {} into data_parts_indexes", part->getNameWithState());
     data_parts_indexes.insert(part);
     out_transaction.addPart(part);
 }
@@ -3673,6 +3924,7 @@ void MergeTreeData::removePartsFromWorkingSetImmediatelyAndSetTemporaryState(con
 
         modifyPartState(part, MergeTreeDataPartState::Temporary);
         /// Erase immediately
+        LOG_TEST(log, "removePartsFromWorkingSetImmediatelyAndSetTemporaryState: removing {} from data_parts_indexes", part->getNameWithState());
         data_parts_indexes.erase(it_part);
     }
 }
@@ -3831,7 +4083,10 @@ void MergeTreeData::outdateBrokenPartAndCloneToDetached(const DataPartPtr & part
 
     DataPartsLock lock = lockParts();
     if (part_to_detach->getState() == DataPartState::Active)
+    {
+        part_to_detach->outdated_because_broken = true;
         removePartsFromWorkingSet(NO_TRANSACTION_RAW, {part_to_detach}, true, &lock);
+    }
 }
 
 void MergeTreeData::forcefullyMovePartToDetachedAndRemoveFromMemory(const MergeTreeData::DataPartPtr & part_to_detach, const String & prefix, bool restore_covered)
@@ -3841,6 +4096,9 @@ void MergeTreeData::forcefullyMovePartToDetachedAndRemoveFromMemory(const MergeT
     else
         LOG_INFO(log, "Renaming {} to {}_{} and forgetting it.", part_to_detach->getDataPartStorage().getPartDirectory(), prefix, part_to_detach->name);
 
+    if (restore_covered)
+        waitForOutdatedPartsToBeLoaded();
+
     auto lock = lockParts();
     bool removed_active_part = false;
     bool restored_active_part = false;
@@ -3863,6 +4121,7 @@ void MergeTreeData::forcefullyMovePartToDetachedAndRemoveFromMemory(const MergeT
 
     modifyPartState(it_part, DataPartState::Deleting);
     asMutableDeletingPart(part)->renameToDetached(prefix);
+    LOG_TEST(log, "forcefullyMovePartToDetachedAndRemoveFromMemory: removing {} from data_parts_indexes", part->getNameWithState());
     data_parts_indexes.erase(it_part);
 
     if (restore_covered && part->info.level == 0)
@@ -4122,9 +4381,9 @@ void MergeTreeData::delayInsertOrThrowIfNeeded(Poco::Event * until, const Contex
         ProfileEvents::increment(ProfileEvents::RejectedInserts);
         throw Exception(
             ErrorCodes::TOO_MANY_PARTS,
-            "Too many parts ({}) in all partitions in total. This indicates wrong choice of partition key. The threshold can be modified "
+            "Too many parts ({}) in all partitions in total in table '{}'. This indicates wrong choice of partition key. The threshold can be modified "
             "with 'max_parts_in_total' setting in <merge_tree> element in config.xml or with per-table setting.",
-            parts_count_in_total);
+            parts_count_in_total, getLogName());
     }
 
     size_t outdated_parts_over_threshold = 0;
@@ -4138,8 +4397,8 @@ void MergeTreeData::delayInsertOrThrowIfNeeded(Poco::Event * until, const Contex
             ProfileEvents::increment(ProfileEvents::RejectedInserts);
             throw Exception(
                 ErrorCodes::TOO_MANY_PARTS,
-                "Too many inactive parts ({}). Parts cleaning are processing significantly slower than inserts",
-                outdated_parts_count_in_partition);
+                "Too many inactive parts ({}) in table '{}'. Parts cleaning are processing significantly slower than inserts",
+                outdated_parts_count_in_partition, getLogName());
         }
         if (settings->inactive_parts_to_delay_insert > 0 && outdated_parts_count_in_partition >= settings->inactive_parts_to_delay_insert)
             outdated_parts_over_threshold = outdated_parts_count_in_partition - settings->inactive_parts_to_delay_insert + 1;
@@ -4152,6 +4411,7 @@ void MergeTreeData::delayInsertOrThrowIfNeeded(Poco::Event * until, const Contex
     const auto active_parts_to_throw_insert
         = query_settings.parts_to_throw_insert ? query_settings.parts_to_throw_insert : settings->parts_to_throw_insert;
     size_t active_parts_over_threshold = 0;
+
     {
         bool parts_are_large_enough_in_average
             = settings->max_avg_part_size_for_too_many_parts && average_part_size > settings->max_avg_part_size_for_too_many_parts;
@@ -4161,9 +4421,10 @@ void MergeTreeData::delayInsertOrThrowIfNeeded(Poco::Event * until, const Contex
             ProfileEvents::increment(ProfileEvents::RejectedInserts);
             throw Exception(
                 ErrorCodes::TOO_MANY_PARTS,
-                "Too many parts ({} with average size of {}). Merges are processing significantly slower than inserts",
+                "Too many parts ({} with average size of {}) in table '{}'. Merges are processing significantly slower than inserts",
                 parts_count_in_partition,
-                ReadableSize(average_part_size));
+                ReadableSize(average_part_size),
+                getLogName());
         }
         if (active_parts_to_delay_insert > 0 && parts_count_in_partition >= active_parts_to_delay_insert
             && !parts_are_large_enough_in_average)
@@ -4221,6 +4482,51 @@ void MergeTreeData::delayInsertOrThrowIfNeeded(Poco::Event * until, const Contex
         std::this_thread::sleep_for(std::chrono::milliseconds(static_cast<size_t>(delay_milliseconds)));
 }
 
+void MergeTreeData::delayMutationOrThrowIfNeeded(Poco::Event * until, const ContextPtr & query_context) const
+{
+    const auto settings = getSettings();
+    const auto & query_settings = query_context->getSettingsRef();
+
+    size_t num_mutations_to_delay = query_settings.number_of_mutations_to_delay
+        ? query_settings.number_of_mutations_to_delay
+        : settings->number_of_mutations_to_delay;
+
+    size_t num_mutations_to_throw = query_settings.number_of_mutations_to_throw
+        ? query_settings.number_of_mutations_to_throw
+        : settings->number_of_mutations_to_throw;
+
+    if (!num_mutations_to_delay && !num_mutations_to_throw)
+        return;
+
+    size_t num_unfinished_mutations = getNumberOfUnfinishedMutations();
+    if (num_mutations_to_throw && num_unfinished_mutations >= num_mutations_to_throw)
+    {
+        ProfileEvents::increment(ProfileEvents::RejectedMutations);
+        throw Exception(ErrorCodes::TOO_MANY_MUTATIONS,
+            "Too many unfinished mutations ({}) in table {}",
+            num_unfinished_mutations, getLogName());
+    }
+
+    if (num_mutations_to_delay && num_unfinished_mutations >= num_mutations_to_delay)
+    {
+        if (!num_mutations_to_throw)
+            num_mutations_to_throw = num_mutations_to_delay * 2;
+
+        size_t mutations_over_threshold = num_unfinished_mutations - num_mutations_to_delay;
+        size_t allowed_mutations_over_threshold = num_mutations_to_throw - num_mutations_to_delay;
+
+        double delay_factor = std::min(static_cast<double>(mutations_over_threshold) / allowed_mutations_over_threshold, 1.0);
+        size_t delay_milliseconds = static_cast<size_t>(std::lerp(settings->min_delay_to_mutate_ms, settings->max_delay_to_mutate_ms, delay_factor));
+
+        ProfileEvents::increment(ProfileEvents::DelayedMutations);
+        ProfileEvents::increment(ProfileEvents::DelayedMutationsMilliseconds, delay_milliseconds);
+
+        if (until)
+            until->tryWait(delay_milliseconds);
+        else
+            std::this_thread::sleep_for(std::chrono::milliseconds(delay_milliseconds));
+    }
+}
 
 MergeTreeData::DataPartPtr MergeTreeData::getActiveContainingPart(
     const MergeTreePartInfo & part_info, MergeTreeData::DataPartState state, DataPartsLock & /*lock*/) const
@@ -4273,8 +4579,10 @@ void MergeTreeData::swapActivePart(MergeTreeData::DataPartPtr part_copy)
             }
 
             modifyPartState(original_active_part, DataPartState::DeleteOnDestroy);
+            LOG_TEST(log, "swapActivePart: removing {} from data_parts_indexes", (*active_part_it)->getNameWithState());
             data_parts_indexes.erase(active_part_it);
 
+            LOG_TEST(log, "swapActivePart: inserting {} into data_parts_indexes", part_copy->getNameWithState());
             auto part_it = data_parts_indexes.insert(part_copy).first;
             modifyPartState(part_it, DataPartState::Active);
 
@@ -4428,6 +4736,11 @@ MergeTreeData::DataPartPtr MergeTreeData::getPartIfExistsUnlocked(const MergeTre
 
 static void loadPartAndFixMetadataImpl(MergeTreeData::MutableDataPartPtr part)
 {
+    /// Remove metadata version file and take it from table.
+    /// Currently we cannot attach parts with different schema, so
+    /// we can assume that it's equal to table's current schema.
+    part->removeMetadataVersion();
+
     part->loadColumnsChecksumsIndexes(false, true);
     part->modification_time = part->getDataPartStorage().getLastModified().epochTime();
     part->removeDeleteOnDestroyMarker();
@@ -4781,8 +5094,8 @@ Pipe MergeTreeData::alterPartition(
                 if (command.replace)
                     checkPartitionCanBeDropped(command.partition, query_context);
 
-                String from_database = query_context->resolveDatabase(command.from_database);
-                auto from_storage = DatabaseCatalog::instance().getTable({from_database, command.from_table}, query_context);
+                auto resolved = query_context->resolveStorageID({command.from_database, command.from_table});
+                auto from_storage = DatabaseCatalog::instance().getTable(resolved, query_context);
 
                 auto * from_storage_merge_tree = dynamic_cast<MergeTreeData *>(from_storage.get());
                 if (!from_storage_merge_tree)
@@ -4843,24 +5156,16 @@ Pipe MergeTreeData::alterPartition(
 }
 
 
-void MergeTreeData::backupData(BackupEntriesCollector & backup_entries_collector, const String & data_path_in_backup, const std::optional<ASTs> & partitions)
-{
-    auto local_context = backup_entries_collector.getContext();
-
-    DataPartsVector data_parts;
-    if (partitions)
-        data_parts = getVisibleDataPartsVectorInPartitions(local_context, getPartitionIDsFromQuery(*partitions, local_context));
-    else
-        data_parts = getVisibleDataPartsVector(local_context);
-
-    backup_entries_collector.addBackupEntries(backupParts(data_parts, data_path_in_backup, local_context));
-}
-
-BackupEntries MergeTreeData::backupParts(const DataPartsVector & data_parts, const String & data_path_in_backup, const ContextPtr & local_context)
+BackupEntries MergeTreeData::backupParts(
+    const DataPartsVector & data_parts,
+    const String & data_path_in_backup,
+    const BackupSettings & backup_settings,
+    const ContextPtr & local_context)
 {
     BackupEntries backup_entries;
     std::map<DiskPtr, std::shared_ptr<TemporaryFileOnDisk>> temp_dirs;
     TableLockHolder table_lock;
+    ReadSettings read_settings = local_context->getBackupReadSettings();
 
     for (const auto & part : data_parts)
     {
@@ -4893,8 +5198,9 @@ BackupEntries MergeTreeData::backupParts(const DataPartsVector & data_parts, con
             part->checksums,
             part->getFileNamesWithoutChecksums(),
             data_path_in_backup,
-            backup_entries_from_part,
+            backup_settings,
             make_temporary_hard_links,
+            backup_entries_from_part,
             &temp_dirs);
 
         auto projection_parts = part->getProjectionParts();
@@ -4904,8 +5210,9 @@ BackupEntries MergeTreeData::backupParts(const DataPartsVector & data_parts, con
                 projection_part->checksums,
                 projection_part->getFileNamesWithoutChecksums(),
                 fs::path{data_path_in_backup} / part->name,
-                backup_entries_from_part,
+                backup_settings,
                 make_temporary_hard_links,
+                backup_entries_from_part,
                 &temp_dirs);
         }
 
@@ -5029,9 +5336,9 @@ void MergeTreeData::restorePartsFromBackup(RestorerFromBackup & restorer, const
             [storage = std::static_pointer_cast<MergeTreeData>(shared_from_this()),
              backup,
              part_path_in_backup = data_path_in_backup_fs / part_name,
-             part_info=*part_info,
+             my_part_info = *part_info,
              restored_parts_holder]
-            { storage->restorePartFromBackup(restored_parts_holder, part_info, part_path_in_backup); });
+            { storage->restorePartFromBackup(restored_parts_holder, my_part_info, part_path_in_backup); });
 
         ++num_parts;
     }
@@ -5081,12 +5388,8 @@ void MergeTreeData::restorePartFromBackup(std::shared_ptr<RestoredPartsHolder> r
         if (filename.ends_with(IMergeTreeDataPart::TXN_VERSION_METADATA_FILE_NAME))
             continue;
 
-        auto backup_entry = backup->readFile(part_path_in_backup_fs / filename);
-        auto read_buffer = backup_entry->getReadBuffer();
-        auto write_buffer = disk->writeFile(temp_part_dir / filename);
-        copyData(*read_buffer, *write_buffer);
-        write_buffer->finalize();
-        reservation->update(reservation->getSize() - backup_entry->getSize());
+        size_t file_size = backup->copyFileToDisk(part_path_in_backup_fs / filename, disk, temp_part_dir / filename);
+        reservation->update(reservation->getSize() - file_size);
     }
 
     auto single_disk_volume = std::make_shared<SingleDiskVolume>(disk->getName(), disk, 0);
@@ -5514,11 +5817,10 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
         ActiveDataPartSet active_parts(format_version);
 
         auto detached_parts = getDetachedParts();
-        auto new_end_it = std::remove_if(detached_parts.begin(), detached_parts.end(), [&partition_id](const DetachedPartInfo & part_info)
+        std::erase_if(detached_parts, [&partition_id](const DetachedPartInfo & part_info)
         {
             return !part_info.valid_name || !part_info.prefix.empty() || part_info.partition_id != partition_id;
         });
-        detached_parts.resize(std::distance(detached_parts.begin(), new_end_it));
 
         for (const auto & part_info : detached_parts)
         {
@@ -5934,19 +6236,6 @@ MergeTreeData::DataPartsVector MergeTreeData::Transaction::commit(MergeTreeData:
             }
         }
 
-        MergeTreeData::WriteAheadLogPtr wal;
-        auto get_inited_wal = [&] ()
-        {
-            if (!wal)
-                wal = data.getWriteAheadLog();
-            return wal;
-        };
-
-        if (settings->in_memory_parts_enable_wal)
-            for (const auto & part : precommitted_parts)
-                if (auto part_in_memory = asInMemoryPart(part))
-                    get_inited_wal()->addPart(part_in_memory);
-
         NOEXCEPT_SCOPE({
             auto current_time = time(nullptr);
 
@@ -5990,10 +6279,6 @@ MergeTreeData::DataPartsVector MergeTreeData::Transaction::commit(MergeTreeData:
 
                         data.modifyPartState(covered_part, DataPartState::Outdated);
                         data.removePartContributionToColumnAndSecondaryIndexSizes(covered_part);
-
-                        if (settings->in_memory_parts_enable_wal)
-                            if (isInMemoryPart(covered_part))
-                                get_inited_wal()->dropPart(covered_part->name);
                     }
 
                     reduce_parts += covered_parts.size();
@@ -6048,51 +6333,48 @@ bool MergeTreeData::isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(
 }
 
 bool MergeTreeData::mayBenefitFromIndexForIn(
-    const ASTPtr & left_in_operand, ContextPtr, const StorageMetadataPtr & metadata_snapshot) const
+    const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const
 {
     /// Make sure that the left side of the IN operator contain part of the key.
     /// If there is a tuple on the left side of the IN operator, at least one item of the tuple
-    ///  must be part of the key (probably wrapped by a chain of some acceptable functions).
+    /// must be part of the key (probably wrapped by a chain of some acceptable functions).
     const auto * left_in_operand_tuple = left_in_operand->as<ASTFunction>();
-    const auto & index_wrapper_factory = MergeTreeIndexFactory::instance();
+    const auto & index_factory = MergeTreeIndexFactory::instance();
+    const auto & query_settings = query_context->getSettingsRef();
+
+    auto check_for_one_argument = [&](const auto & ast)
+    {
+        if (isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(ast, metadata_snapshot))
+            return true;
+
+        if (query_settings.use_skip_indexes)
+        {
+            for (const auto & index : metadata_snapshot->getSecondaryIndices())
+                if (index_factory.get(index)->mayBenefitFromIndexForIn(ast))
+                    return true;
+        }
+
+        if (query_settings.optimize_use_projections)
+        {
+            for (const auto & projection : metadata_snapshot->getProjections())
+                if (projection.isPrimaryKeyColumnPossiblyWrappedInFunctions(ast))
+                    return true;
+        }
+
+        return false;
+    };
+
     if (left_in_operand_tuple && left_in_operand_tuple->name == "tuple")
     {
         for (const auto & item : left_in_operand_tuple->arguments->children)
-        {
-            if (isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(item, metadata_snapshot))
-                return true;
-            for (const auto & index : metadata_snapshot->getSecondaryIndices())
-                if (index_wrapper_factory.get(index)->mayBenefitFromIndexForIn(item))
-                    return true;
-            for (const auto & projection : metadata_snapshot->getProjections())
-            {
-                if (projection.isPrimaryKeyColumnPossiblyWrappedInFunctions(item))
-                    return true;
-            }
-        }
-        /// The tuple itself may be part of the primary key, so check that as a last resort.
-        if (isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(left_in_operand, metadata_snapshot))
-            return true;
-        for (const auto & projection : metadata_snapshot->getProjections())
-        {
-            if (projection.isPrimaryKeyColumnPossiblyWrappedInFunctions(left_in_operand))
-                return true;
-        }
-        return false;
-    }
-    else
-    {
-        for (const auto & index : metadata_snapshot->getSecondaryIndices())
-            if (index_wrapper_factory.get(index)->mayBenefitFromIndexForIn(left_in_operand))
+            if (check_for_one_argument(item))
                 return true;
 
-        for (const auto & projection : metadata_snapshot->getProjections())
-        {
-            if (projection.isPrimaryKeyColumnPossiblyWrappedInFunctions(left_in_operand))
-                return true;
-        }
-        return isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(left_in_operand, metadata_snapshot);
+        /// The tuple itself may be part of the primary key
+        /// or skip index, so check that as a last resort.
     }
+
+    return check_for_one_argument(left_in_operand);
 }
 
 using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
@@ -6229,7 +6511,7 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
             agg_count->set(place, value.get<UInt64>());
         else
         {
-            auto value_column = func->getResultType()->createColumnConst(1, value)->convertToFullColumnIfConst();
+            auto value_column = func->getArgumentTypes().front()->createColumnConst(1, value)->convertToFullColumnIfConst();
             const auto * value_column_ptr = value_column.get();
             func->add(place, &value_column_ptr, 0, &arena);
         }
@@ -6436,11 +6718,14 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
     const auto & metadata_snapshot = storage_snapshot->metadata;
     const auto & settings = query_context->getSettingsRef();
 
+    if (settings.query_plan_optimize_projection)
+        return std::nullopt;
+
     /// TODO: Analyzer syntax analyzer result
     if (!query_info.syntax_analyzer_result)
         return std::nullopt;
 
-    if (!settings.allow_experimental_projection_optimization || query_info.ignore_projections || query_info.is_projection_query
+    if (!settings.optimize_use_projections || query_info.ignore_projections || query_info.is_projection_query
         || settings.aggregate_functions_null_for_empty /* projections don't work correctly with this setting */)
         return std::nullopt;
 
@@ -6914,10 +7199,17 @@ QueryProcessingStage::Enum MergeTreeData::getQueryProcessingStage(
     if (query_context->getClientInfo().collaborate_with_initiator)
         return QueryProcessingStage::Enum::FetchColumns;
 
-    if (query_context->getSettingsRef().allow_experimental_parallel_reading_from_replicas
-        && !query_context->getClientInfo().collaborate_with_initiator
-        && to_stage >= QueryProcessingStage::WithMergeableState)
-        return QueryProcessingStage::Enum::WithMergeableState;
+    /// Parallel replicas
+    if (query_context->canUseParallelReplicasOnInitiator() && to_stage >= QueryProcessingStage::WithMergeableState)
+    {
+        /// ReplicatedMergeTree
+        if (supportsReplication())
+            return QueryProcessingStage::Enum::WithMergeableState;
+
+        /// For non-replicated MergeTree we allow them only if parallel_replicas_for_non_replicated_merge_tree is enabled
+        if (query_context->getSettingsRef().parallel_replicas_for_non_replicated_merge_tree)
+            return QueryProcessingStage::Enum::WithMergeableState;
+    }
 
     if (to_stage >= QueryProcessingStage::Enum::WithMergeableState)
     {
@@ -7042,8 +7334,8 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAn
         copy_instead_of_hardlink,
         files_to_copy_instead_of_hardlinks);
 
-    LOG_DEBUG(log, "Clone {} part {} to {}{}",
-              src_flushed_tmp_part ? "flushed" : "",
+    LOG_DEBUG(log, "Clone{} part {} to {}{}",
+              src_flushed_tmp_part ? " flushed" : "",
               src_part_storage->getFullPath(),
               std::string(fs::path(dst_part_storage->getFullRootPath()) / tmp_dst_part_name),
               with_copy);
@@ -7132,8 +7424,14 @@ Strings MergeTreeData::getDataPaths() const
 }
 
 
-void MergeTreeData::reportBrokenPart(MergeTreeData::DataPartPtr & data_part) const
+void MergeTreeData::reportBrokenPart(MergeTreeData::DataPartPtr data_part) const
 {
+    if (!data_part)
+        return;
+
+    if (data_part->isProjectionPart())
+        data_part = data_part->getParentPart()->shared_from_this();
+
     if (data_part->getDataPartStorage().isBroken())
     {
         auto parts = getDataPartsForInternalUsage();
@@ -7145,7 +7443,7 @@ void MergeTreeData::reportBrokenPart(MergeTreeData::DataPartPtr & data_part) con
                 broken_part_callback(part->name);
         }
     }
-    else if (data_part && data_part->getState() == MergeTreeDataPartState::Active)
+    else if (data_part->getState() == MergeTreeDataPartState::Active)
         broken_part_callback(data_part->name);
     else
         LOG_DEBUG(log, "Will not check potentially broken part {} because it's not active", data_part->getNameWithState());
@@ -7406,7 +7704,7 @@ try
 
         part_log_elem.rows = (*merge_entry)->rows_written;
         part_log_elem.bytes_uncompressed = (*merge_entry)->bytes_written_uncompressed;
-        part_log_elem.peak_memory_usage = (*merge_entry)->memory_tracker.getPeak();
+        part_log_elem.peak_memory_usage = (*merge_entry)->getMemoryTracker().getPeak();
     }
 
     if (profile_counters)
@@ -7487,7 +7785,7 @@ MovePartsOutcome MergeTreeData::movePartsToSpace(const DataPartsVector & parts,
     if (moving_tagger->parts_to_move.empty())
         return MovePartsOutcome::NothingToMove;
 
-    return moveParts(moving_tagger);
+    return moveParts(moving_tagger, true);
 }
 
 MergeTreeData::CurrentlyMovingPartsTaggerPtr MergeTreeData::selectPartsForMove()
@@ -7542,7 +7840,7 @@ MergeTreeData::CurrentlyMovingPartsTaggerPtr MergeTreeData::checkPartsForMove(co
     return std::make_shared<CurrentlyMovingPartsTagger>(std::move(parts_to_move), *this);
 }
 
-MovePartsOutcome MergeTreeData::moveParts(const CurrentlyMovingPartsTaggerPtr & moving_tagger)
+MovePartsOutcome MergeTreeData::moveParts(const CurrentlyMovingPartsTaggerPtr & moving_tagger, bool wait_for_move_if_zero_copy)
 {
     LOG_INFO(log, "Got {} parts to move.", moving_tagger->parts_to_move.size());
 
@@ -7591,21 +7889,41 @@ MovePartsOutcome MergeTreeData::moveParts(const CurrentlyMovingPartsTaggerPtr &
             auto disk = moving_part.reserved_space->getDisk();
             if (supportsReplication() && disk->supportZeroCopyReplication() && settings->allow_remote_fs_zero_copy_replication)
             {
-                /// If we acquired lock than let's try to move. After one
-                /// replica will actually move the part from disk to some
-                /// zero-copy storage other replicas will just fetch
-                /// metainformation.
-                if (auto lock = tryCreateZeroCopyExclusiveLock(moving_part.part->name, disk); lock)
+                /// This loop is not endless, if shutdown called/connection failed/replica became readonly
+                /// we will return true from waitZeroCopyLock and createZeroCopyLock will return nullopt.
+                while (true)
                 {
-                    cloned_part = parts_mover.clonePart(moving_part);
-                    parts_mover.swapClonedPart(cloned_part);
-                }
-                else
-                {
-                    /// Move will be retried but with backoff.
-                    LOG_DEBUG(log, "Move of part {} postponed, because zero copy mode enabled and someone other moving this part right now", moving_part.part->name);
-                    result = MovePartsOutcome::MoveWasPostponedBecauseOfZeroCopy;
-                    continue;
+                    /// If we acquired lock than let's try to move. After one
+                    /// replica will actually move the part from disk to some
+                    /// zero-copy storage other replicas will just fetch
+                    /// metainformation.
+                    if (auto lock = tryCreateZeroCopyExclusiveLock(moving_part.part->name, disk); lock)
+                    {
+                        if (lock->isLocked())
+                        {
+                            cloned_part = parts_mover.clonePart(moving_part);
+                            parts_mover.swapClonedPart(cloned_part);
+                            break;
+                        }
+                        else if (wait_for_move_if_zero_copy)
+                        {
+                            LOG_DEBUG(log, "Other replica is working on move of {}, will wait until lock disappear", moving_part.part->name);
+                            /// Wait and checks not only for timeout but also for shutdown and so on.
+                            while (!waitZeroCopyLockToDisappear(*lock, 3000))
+                            {
+                                LOG_DEBUG(log, "Waiting until some replica will move {} and zero copy lock disappear", moving_part.part->name);
+                            }
+                        }
+                        else
+                            break;
+                    }
+                    else
+                    {
+                        /// Move will be retried but with backoff.
+                        LOG_DEBUG(log, "Move of part {} postponed, because zero copy mode enabled and someone other moving this part right now", moving_part.part->name);
+                        result = MovePartsOutcome::MoveWasPostponedBecauseOfZeroCopy;
+                        break;
+                    }
                 }
             }
             else /// Ordinary move as it should be
@@ -7655,11 +7973,8 @@ bool MergeTreeData::canUsePolymorphicParts(const MergeTreeSettings & settings, S
                     "Table can't create parts with adaptive granularity, but settings"
                     " min_rows_for_wide_part = {}"
                     ", min_bytes_for_wide_part = {}"
-                    ", min_rows_for_compact_part = {}"
-                    ", min_bytes_for_compact_part = {}"
                     ". Parts with non-adaptive granularity can be stored only in Wide (default) format.",
-                    settings.min_rows_for_wide_part,    settings.min_bytes_for_wide_part,
-                    settings.min_rows_for_compact_part, settings.min_bytes_for_compact_part);
+                    settings.min_rows_for_wide_part, settings.min_bytes_for_wide_part);
         }
 
         return false;
@@ -7668,17 +7983,14 @@ bool MergeTreeData::canUsePolymorphicParts(const MergeTreeSettings & settings, S
     return true;
 }
 
-AlterConversions MergeTreeData::getAlterConversionsForPart(const MergeTreeDataPartPtr part) const
+AlterConversionsPtr MergeTreeData::getAlterConversionsForPart(MergeTreeDataPartPtr part) const
 {
-    MutationCommands commands = getFirstAlterMutationCommandsForPart(part);
+    auto commands_map = getAlterMutationCommandsForPart(part);
 
-    AlterConversions result{};
-    for (const auto & command : commands)
-        /// Currently we need explicit conversions only for RENAME alter
-        /// all other conversions can be deduced from diff between part columns
-        /// and columns in storage.
-        if (command.type == MutationCommand::Type::RENAME_COLUMN)
-            result.rename_map[command.rename_to] = command.column_name;
+    auto result = std::make_shared<AlterConversions>();
+    for (const auto & [_, commands] : commands_map)
+        for (const auto & command : commands)
+            result->addMutationCommand(command);
 
     return result;
 }
@@ -8009,13 +8321,22 @@ void MergeTreeData::updateObjectColumns(const DataPartPtr & part, const DataPart
 StorageSnapshotPtr MergeTreeData::getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const
 {
     auto snapshot_data = std::make_unique<SnapshotData>();
+    ColumnsDescription object_columns_copy;
 
-    auto lock = lockParts();
-    snapshot_data->parts = getVisibleDataPartsVectorUnlocked(query_context, lock);
-    return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, object_columns, std::move(snapshot_data));
+    {
+        auto lock = lockParts();
+        snapshot_data->parts = getVisibleDataPartsVectorUnlocked(query_context, lock);
+        object_columns_copy = object_columns;
+    }
+
+    snapshot_data->alter_conversions.reserve(snapshot_data->parts.size());
+    for (const auto & part : snapshot_data->parts)
+        snapshot_data->alter_conversions.push_back(getAlterConversionsForPart(part));
+
+    return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, std::move(object_columns_copy), std::move(snapshot_data));
 }
 
-StorageSnapshotPtr MergeTreeData::getStorageSnapshotWithoutParts(const StorageMetadataPtr & metadata_snapshot) const
+StorageSnapshotPtr MergeTreeData::getStorageSnapshotWithoutData(const StorageMetadataPtr & metadata_snapshot, ContextPtr) const
 {
     auto lock = lockParts();
     return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, object_columns, std::make_unique<SnapshotData>());
@@ -8031,9 +8352,6 @@ void MergeTreeData::incrementInsertedPartsProfileEvent(MergeTreeDataPartType typ
         case MergeTreeDataPartType::Compact:
             ProfileEvents::increment(ProfileEvents::InsertedCompactParts);
             break;
-        case MergeTreeDataPartType::InMemory:
-            ProfileEvents::increment(ProfileEvents::InsertedInMemoryParts);
-            break;
         default:
             break;
     }
@@ -8049,9 +8367,6 @@ void MergeTreeData::incrementMergedPartsProfileEvent(MergeTreeDataPartType type)
         case MergeTreeDataPartType::Compact:
             ProfileEvents::increment(ProfileEvents::MergedIntoCompactParts);
             break;
-        case MergeTreeDataPartType::InMemory:
-            ProfileEvents::increment(ProfileEvents::MergedIntoInMemoryParts);
-            break;
         default:
             break;
     }
@@ -8084,13 +8399,17 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::createEmptyPart(
     if (settings->assign_part_uuids)
         new_data_part->uuid = UUIDHelpers::generateV4();
 
-    new_data_part->setColumns(columns, {});
+    new_data_part->setColumns(columns, {}, metadata_snapshot->getMetadataVersion());
     new_data_part->rows_count = block.rows();
 
     new_data_part->partition = partition;
 
     new_data_part->minmax_idx = std::move(minmax_idx);
     new_data_part->is_temp = true;
+    /// In case of replicated merge tree with zero copy replication
+    /// Here Clickhouse claims that this new part can be deleted in temporary state without unlocking the blobs
+    /// The blobs have to be removed along with the part, this temporary part owns them and does not share them yet.
+    new_data_part->remove_tmp_policy = IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::REMOVE_BLOBS;
 
     auto new_data_part_storage = new_data_part->getDataPartStoragePtr();
     new_data_part_storage->beginTransaction();
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 4a1aafe20b6..fce7d989a2f 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -32,6 +32,7 @@
 #include <Storages/extractKeyExpressionList.h>
 #include <Storages/PartitionCommands.h>
 #include <Interpreters/PartLog.h>
+#include <Interpreters/threadPoolCallbackRunner.h>
 
 
 #include <boost/multi_index_container.hpp>
@@ -225,7 +226,7 @@ public:
     using OperationDataPartsLock = std::unique_lock<std::mutex>;
     OperationDataPartsLock lockOperationsWithParts() const { return OperationDataPartsLock(operation_with_data_parts_mutex); }
 
-    MergeTreeDataPartFormat choosePartFormat(size_t bytes_uncompressed, size_t rows_count, bool only_on_disk = false) const;
+    MergeTreeDataPartFormat choosePartFormat(size_t bytes_uncompressed, size_t rows_count) const;
     MergeTreeDataPartFormat choosePartFormatOnDisk(size_t bytes_uncompressed, size_t rows_count) const;
     MergeTreeDataPartBuilder getDataPartBuilder(const String & name, const VolumePtr & volume, const String & part_dir) const;
 
@@ -431,6 +432,8 @@ public:
 
     bool supportsLightweightDelete() const override;
 
+    bool areAsynchronousInsertsEnabled() const override { return getSettings()->async_insert; }
+
     NamesAndTypesList getVirtuals() const override;
 
     bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr, const StorageMetadataPtr & metadata_snapshot) const override;
@@ -440,12 +443,13 @@ public:
     struct SnapshotData : public StorageSnapshot::Data
     {
         DataPartsVector parts;
+        std::vector<AlterConversionsPtr> alter_conversions;
     };
 
     StorageSnapshotPtr getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const override;
 
     /// The same as above but does not hold vector of data parts.
-    StorageSnapshotPtr getStorageSnapshotWithoutParts(const StorageMetadataPtr & metadata_snapshot) const;
+    StorageSnapshotPtr getStorageSnapshotWithoutData(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const override;
 
     /// Load the set of data parts from disk. Call once - immediately after the object is created.
     void loadDataParts(bool skip_sanity_checks);
@@ -540,7 +544,6 @@ public:
     /// Makes sense only for ordinary MergeTree engines because for them block numbering doesn't depend on partition.
     std::optional<Int64> getMinPartDataVersion() const;
 
-
     /// Returns all detached parts
     DetachedPartsInfo getDetachedParts() const;
 
@@ -551,11 +554,19 @@ public:
     MutableDataPartsVector tryLoadPartsToAttach(const ASTPtr & partition, bool attach_part,
                                                 ContextPtr context, PartsTemporaryRename & renamed_parts);
 
-
     /// If the table contains too many active parts, sleep for a while to give them time to merge.
     /// If until is non-null, wake up from the sleep earlier if the event happened.
+    /// The decision to delay or throw is made according to settings 'parts_to_delay_insert' and 'parts_to_throw_insert'.
     void delayInsertOrThrowIfNeeded(Poco::Event * until, const ContextPtr & query_context) const;
 
+    /// If the table contains too many unfinished mutations, sleep for a while to give them time to execute.
+    /// If until is non-null, wake up from the sleep earlier if the event happened.
+    /// The decision to delay or throw is made according to settings 'number_of_mutations_to_delay' and 'number_of_mutations_to_throw'.
+    void delayMutationOrThrowIfNeeded(Poco::Event * until, const ContextPtr & query_context) const;
+
+    /// Returns number of unfinished mutations (is_done = 0).
+    virtual size_t getNumberOfUnfinishedMutations() const = 0;
+
     /// Renames temporary part to a permanent part and adds it to the parts set.
     /// It is assumed that the part does not intersect with existing parts.
     /// Adds the part in the PreActive state (the part will be added to the active set later with out_transaction->commit()).
@@ -651,9 +662,6 @@ public:
     /// Removes parts from data_parts, they should be in Deleting state
     void removePartsFinally(const DataPartsVector & parts);
 
-    /// When WAL is not enabled, the InMemoryParts need to be persistent.
-    void flushAllInMemoryPartsIfNeeded();
-
     /// Delete irrelevant parts from memory and disk.
     /// If 'force' - don't wait for old_parts_lifetime.
     size_t clearOldPartsFromFilesystem(bool force = false);
@@ -711,7 +719,7 @@ public:
     /// Should be called if part data is suspected to be corrupted.
     /// Has the ability to check all other parts
     /// which reside on the same disk of the suspicious part.
-    void reportBrokenPart(MergeTreeData::DataPartPtr & data_part) const;
+    void reportBrokenPart(MergeTreeData::DataPartPtr data_part) const;
 
     /// TODO (alesap) Duplicate method required for compatibility.
     /// Must be removed.
@@ -751,9 +759,6 @@ public:
         ContextPtr context,
         TableLockHolder & table_lock_holder);
 
-    /// Makes backup entries to backup the data of the storage.
-    void backupData(BackupEntriesCollector & backup_entries_collector, const String & data_path_in_backup, const std::optional<ASTs> & partitions) override;
-
     /// Extract data from the backup and put it to the storage.
     void restoreDataFromBackup(RestorerFromBackup & restorer, const String & data_path_in_backup, const std::optional<ASTs> & partitions) override;
 
@@ -910,7 +915,7 @@ public:
     Disks getDisks() const { return getStoragePolicy()->getDisks(); }
 
     /// Return alter conversions for part which must be applied on fly.
-    AlterConversions getAlterConversionsForPart(MergeTreeDataPartPtr part) const;
+    AlterConversionsPtr getAlterConversionsForPart(MergeTreeDataPartPtr part) const;
 
     /// Returns destination disk or volume for the TTL rule according to current storage policy.
     SpacePtr getDestinationForMoveTTL(const TTLDescription & move_ttl) const;
@@ -1210,7 +1215,7 @@ protected:
     {
         auto it = data_parts_by_info.find(part->info);
         if (it == data_parts_by_info.end() || (*it).get() != part.get())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} doesn't exist", part->name);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} doesn't exist (info: {})", part->name, part->info.getPartNameForLogs());
 
         if (!data_parts_by_state_and_info.modify(data_parts_indexes.project<TagByStateAndInfo>(it), getStateModifier(state)))
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't modify {}", (*it)->getNameWithState());
@@ -1221,9 +1226,9 @@ protected:
     /// The same for clearOldTemporaryDirectories.
     std::mutex clear_old_temporary_directories_mutex;
 
-    void checkProperties(const StorageInMemoryMetadata & new_metadata, const StorageInMemoryMetadata & old_metadata, bool attach = false) const;
+    void checkProperties(const StorageInMemoryMetadata & new_metadata, const StorageInMemoryMetadata & old_metadata, bool attach = false, ContextPtr local_context = nullptr) const;
 
-    void setProperties(const StorageInMemoryMetadata & new_metadata, const StorageInMemoryMetadata & old_metadata, bool attach = false);
+    void setProperties(const StorageInMemoryMetadata & new_metadata, const StorageInMemoryMetadata & old_metadata, bool attach = false, ContextPtr local_context = nullptr);
 
     void checkPartitionKeyAndInitMinMax(const KeyDescription & new_partition_key);
 
@@ -1313,12 +1318,12 @@ protected:
     /// Used to receive AlterConversions for part and apply them on fly. This
     /// method has different implementations for replicated and non replicated
     /// MergeTree because they store mutations in different way.
-    virtual MutationCommands getFirstAlterMutationCommandsForPart(const DataPartPtr & part) const = 0;
+    virtual std::map<int64_t, MutationCommands> getAlterMutationCommandsForPart(const DataPartPtr & part) const = 0;
     /// Moves part to specified space, used in ALTER ... MOVE ... queries
     MovePartsOutcome movePartsToSpace(const DataPartsVector & parts, SpacePtr space);
 
     /// Makes backup entries to backup the parts of this table.
-    BackupEntries backupParts(const DataPartsVector & data_parts, const String & data_path_in_backup, const ContextPtr & local_context);
+    BackupEntries backupParts(const DataPartsVector & data_parts, const String & data_path_in_backup, const BackupSettings & backup_settings, const ContextPtr & local_context);
 
     class RestoredPartsHolder;
 
@@ -1410,6 +1415,10 @@ protected:
     PartLoadingTreeNodes outdated_unloaded_data_parts TSA_GUARDED_BY(outdated_data_parts_mutex);
     bool outdated_data_parts_loading_canceled TSA_GUARDED_BY(outdated_data_parts_mutex) = false;
 
+    /// This has to be "true" by default, because in case of empty table or absence of Outdated parts
+    /// it is automatically finished.
+    bool outdated_data_parts_loading_finished TSA_GUARDED_BY(outdated_data_parts_mutex) = true;
+
     void loadOutdatedDataParts(bool is_async);
     void startOutdatedDataPartsLoadingTask();
     void stopOutdatedDataPartsLoadingTask();
@@ -1456,7 +1465,7 @@ private:
     using CurrentlyMovingPartsTaggerPtr = std::shared_ptr<CurrentlyMovingPartsTagger>;
 
     /// Move selected parts to corresponding disks
-    MovePartsOutcome moveParts(const CurrentlyMovingPartsTaggerPtr & moving_tagger);
+    MovePartsOutcome moveParts(const CurrentlyMovingPartsTaggerPtr & moving_tagger, bool wait_for_move_if_zero_copy=false);
 
     /// Select parts for move and disks for them. Used in background moving processes.
     CurrentlyMovingPartsTaggerPtr selectPartsForMove();
@@ -1500,6 +1509,16 @@ private:
         MergeTreeDataPartState to_state,
         std::mutex & part_loading_mutex);
 
+    LoadPartResult loadDataPartWithRetries(
+        const MergeTreePartInfo & part_info,
+        const String & part_name,
+        const DiskPtr & part_disk_ptr,
+        MergeTreeDataPartState to_state,
+        std::mutex & part_loading_mutex,
+        size_t backoff_ms,
+        size_t max_backoff_ms,
+        size_t max_tries);
+
     std::vector<LoadPartResult> loadDataPartsFromDisk(
         ThreadPool & pool,
         size_t num_parts,
@@ -1511,6 +1530,7 @@ private:
     /// Create zero-copy exclusive lock for part and disk. Useful for coordination of
     /// distributed operations which can lead to data duplication. Implemented only in ReplicatedMergeTree.
     virtual std::optional<ZeroCopyLock> tryCreateZeroCopyExclusiveLock(const String &, const DiskPtr &) { return std::nullopt; }
+    virtual bool waitZeroCopyLockToDisappear(const ZeroCopyLock &, size_t) { return false; }
 
     /// Remove parts from disk calling part->remove(). Can do it in parallel in case of big set of parts and enabled settings.
     /// If we fail to remove some part and throw_on_error equal to `true` will throw an exception on the first failed part.
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 0d123623f05..29a1574b66e 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -31,7 +31,7 @@
 #include <Interpreters/MutationsInterpreter.h>
 #include <Interpreters/MergeTreeTransaction.h>
 #include <Interpreters/Context.h>
-#include <Common/interpolate.h>
+#include <base/interpolate.h>
 #include <Common/typeid_cast.h>
 #include <Common/escapeForFileName.h>
 #include <Parsers/queryToString.h>
@@ -113,9 +113,14 @@ UInt64 MergeTreeDataMergerMutator::getMaxSourcePartSizeForMutation() const
     const auto data_settings = data.getSettings();
     size_t occupied = CurrentMetrics::values[CurrentMetrics::BackgroundMergesAndMutationsPoolTask].load(std::memory_order_relaxed);
 
+    if (data_settings->max_number_of_mutations_for_replica > 0 &&
+        occupied >= data_settings->max_number_of_mutations_for_replica)
+        return 0;
+
     /// DataPart can be store only at one disk. Get maximum reservable free space at all disks.
     UInt64 disk_space = data.getStoragePolicy()->getMaxUnreservedFreeSpace();
     auto max_tasks_count = data.getContext()->getMergeMutateExecutor()->getMaxTasksCount();
+
     /// Allow mutations only if there are enough threads, leave free threads for merges else
     if (occupied <= 1
         || max_tasks_count - occupied >= data_settings->number_of_free_entries_in_pool_to_execute_mutation)
@@ -131,68 +136,11 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
     const AllowedMergingPredicate & can_merge_callback,
     bool merge_with_ttl_allowed,
     const MergeTreeTransactionPtr & txn,
-    String * out_disable_reason)
+    String * out_disable_reason,
+    const PartitionIdsHint * partitions_hint)
 {
-    MergeTreeData::DataPartsVector data_parts;
-    if (txn)
-    {
-        /// Merge predicate (for simple MergeTree) allows to merge two parts only if both parts are visible for merge transaction.
-        /// So at the first glance we could just get all active parts.
-        /// Active parts include uncommitted parts, but it's ok and merge predicate handles it.
-        /// However, it's possible that some transaction is trying to remove a part in the middle, for example, all_2_2_0.
-        /// If parts all_1_1_0 and all_3_3_0 are active and visible for merge transaction, then we would try to merge them.
-        /// But it's wrong, because all_2_2_0 may become active again if transaction will roll back.
-        /// That's why we must include some outdated parts into `data_part`, more precisely, such parts that removal is not committed.
-        MergeTreeData::DataPartsVector active_parts;
-        MergeTreeData::DataPartsVector outdated_parts;
+    MergeTreeData::DataPartsVector data_parts = getDataPartsToSelectMergeFrom(txn, partitions_hint);
 
-        {
-            auto lock = data.lockParts();
-            active_parts = data.getDataPartsVectorForInternalUsage({MergeTreeData::DataPartState::Active}, lock);
-            outdated_parts = data.getDataPartsVectorForInternalUsage({MergeTreeData::DataPartState::Outdated}, lock);
-        }
-
-        ActiveDataPartSet active_parts_set{data.format_version};
-        for (const auto & part : active_parts)
-            active_parts_set.add(part->name);
-
-        for (const auto & part : outdated_parts)
-        {
-            /// We don't need rolled back parts.
-            /// NOTE When rolling back a transaction we set creation_csn to RolledBackCSN at first
-            /// and then remove part from working set, so there's no race condition
-            if (part->version.creation_csn == Tx::RolledBackCSN)
-                continue;
-
-            /// We don't need parts that are finally removed.
-            /// NOTE There's a minor race condition: we may get UnknownCSN if a transaction has been just committed concurrently.
-            /// But it's not a problem if we will add such part to `data_parts`.
-            if (part->version.removal_csn != Tx::UnknownCSN)
-                continue;
-
-            active_parts_set.add(part->name);
-        }
-
-        /// Restore "active" parts set from selected active and outdated parts
-        auto remove_pred = [&](const MergeTreeData::DataPartPtr & part) -> bool
-        {
-            return active_parts_set.getContainingPart(part->info) != part->name;
-        };
-
-        std::erase_if(active_parts, remove_pred);
-
-        std::erase_if(outdated_parts, remove_pred);
-
-        std::merge(active_parts.begin(), active_parts.end(),
-                   outdated_parts.begin(), outdated_parts.end(),
-                   std::back_inserter(data_parts), MergeTreeData::LessDataPart());
-    }
-    else
-    {
-        /// Simply get all active parts
-        data_parts = data.getDataPartsVectorForInternalUsage();
-    }
-    const auto data_settings = data.getSettings();
     auto metadata_snapshot = data.getInMemoryMetadataPtr();
 
     if (data_parts.empty())
@@ -202,9 +150,193 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
         return SelectPartsDecision::CANNOT_SELECT;
     }
 
-    time_t current_time = std::time(nullptr);
+    MergeSelectingInfo info = getPossibleMergeRanges(data_parts, can_merge_callback, txn, out_disable_reason);
 
-    IMergeSelector::PartsRanges parts_ranges;
+    if (info.parts_selected_precondition == 0)
+    {
+        if (out_disable_reason)
+            *out_disable_reason = "No parts satisfy preconditions for merge";
+        return SelectPartsDecision::CANNOT_SELECT;
+    }
+
+    auto res = selectPartsToMergeFromRanges(future_part, aggressive, max_total_size_to_merge, merge_with_ttl_allowed,
+                                            metadata_snapshot, info.parts_ranges, info.current_time, out_disable_reason);
+
+    if (res == SelectPartsDecision::SELECTED)
+        return res;
+
+    String best_partition_id_to_optimize = getBestPartitionToOptimizeEntire(info.partitions_info);
+    if (!best_partition_id_to_optimize.empty())
+    {
+            return selectAllPartsToMergeWithinPartition(
+                future_part,
+                can_merge_callback,
+                best_partition_id_to_optimize,
+                /*final=*/true,
+                metadata_snapshot,
+                txn,
+                out_disable_reason,
+                /*optimize_skip_merged_partitions=*/true);
+    }
+
+    if (out_disable_reason)
+        *out_disable_reason = "There is no need to merge parts according to merge selector algorithm";
+    return SelectPartsDecision::CANNOT_SELECT;
+}
+
+MergeTreeDataMergerMutator::PartitionIdsHint MergeTreeDataMergerMutator::getPartitionsThatMayBeMerged(
+    size_t max_total_size_to_merge,
+    const AllowedMergingPredicate & can_merge_callback,
+    bool merge_with_ttl_allowed,
+    const MergeTreeTransactionPtr & txn) const
+{
+    PartitionIdsHint res;
+    MergeTreeData::DataPartsVector data_parts = getDataPartsToSelectMergeFrom(txn);
+    if (data_parts.empty())
+        return res;
+
+    auto metadata_snapshot = data.getInMemoryMetadataPtr();
+
+    MergeSelectingInfo info = getPossibleMergeRanges(data_parts, can_merge_callback, txn);
+
+    if (info.parts_selected_precondition == 0)
+        return res;
+
+    Strings all_partition_ids;
+    std::vector<IMergeSelector::PartsRanges> ranges_per_partition;
+
+    String curr_partition;
+    for (auto & range : info.parts_ranges)
+    {
+        if (range.empty())
+            continue;
+        const String & partition_id = range.front().getDataPartPtr()->info.partition_id;
+        if (partition_id != curr_partition)
+        {
+            curr_partition = partition_id;
+            all_partition_ids.push_back(curr_partition);
+            ranges_per_partition.emplace_back();
+        }
+        ranges_per_partition.back().emplace_back(std::move(range));
+    }
+
+    for (size_t i = 0; i < all_partition_ids.size(); ++i)
+    {
+        auto future_part = std::make_shared<FutureMergedMutatedPart>();
+        String out_disable_reason;
+        /// This method should have been const, but something went wrong... it's const with dry_run = true
+        auto status = const_cast<MergeTreeDataMergerMutator *>(this)->selectPartsToMergeFromRanges(
+                future_part, /*aggressive*/ false, max_total_size_to_merge, merge_with_ttl_allowed,
+                metadata_snapshot, ranges_per_partition[i], info.current_time, &out_disable_reason,
+                /* dry_run */ true);
+        if (status == SelectPartsDecision::SELECTED)
+            res.insert(all_partition_ids[i]);
+        else
+            LOG_TEST(log, "Nothing to merge in partition {}: {}", all_partition_ids[i], out_disable_reason);
+    }
+
+    String best_partition_id_to_optimize = getBestPartitionToOptimizeEntire(info.partitions_info);
+    if (!best_partition_id_to_optimize.empty())
+        res.emplace(std::move(best_partition_id_to_optimize));
+
+    LOG_TRACE(log, "Checked {} partitions, found {} partitions with parts that may be merged: {}",
+              all_partition_ids.size(), res.size(), fmt::join(res, ", "));
+    return res;
+}
+
+MergeTreeData::DataPartsVector MergeTreeDataMergerMutator::getDataPartsToSelectMergeFrom(
+    const MergeTreeTransactionPtr & txn, const PartitionIdsHint * partitions_hint) const
+{
+    auto res = getDataPartsToSelectMergeFrom(txn);
+    if (!partitions_hint)
+        return res;
+
+    std::erase_if(res, [partitions_hint](const auto & part)
+    {
+        return !partitions_hint->contains(part->info.partition_id);
+    });
+    return res;
+}
+
+MergeTreeData::DataPartsVector MergeTreeDataMergerMutator::getDataPartsToSelectMergeFrom(const MergeTreeTransactionPtr & txn) const
+{
+    MergeTreeData::DataPartsVector res;
+    if (!txn)
+    {
+        /// Simply get all active parts
+        return data.getDataPartsVectorForInternalUsage();
+    }
+
+    /// Merge predicate (for simple MergeTree) allows to merge two parts only if both parts are visible for merge transaction.
+    /// So at the first glance we could just get all active parts.
+    /// Active parts include uncommitted parts, but it's ok and merge predicate handles it.
+    /// However, it's possible that some transaction is trying to remove a part in the middle, for example, all_2_2_0.
+    /// If parts all_1_1_0 and all_3_3_0 are active and visible for merge transaction, then we would try to merge them.
+    /// But it's wrong, because all_2_2_0 may become active again if transaction will roll back.
+    /// That's why we must include some outdated parts into `data_part`, more precisely, such parts that removal is not committed.
+    MergeTreeData::DataPartsVector active_parts;
+    MergeTreeData::DataPartsVector outdated_parts;
+
+    {
+        auto lock = data.lockParts();
+        active_parts = data.getDataPartsVectorForInternalUsage({MergeTreeData::DataPartState::Active}, lock);
+        outdated_parts = data.getDataPartsVectorForInternalUsage({MergeTreeData::DataPartState::Outdated}, lock);
+    }
+
+    ActiveDataPartSet active_parts_set{data.format_version};
+    for (const auto & part : active_parts)
+        active_parts_set.add(part->name);
+
+    for (const auto & part : outdated_parts)
+    {
+        /// We don't need rolled back parts.
+        /// NOTE When rolling back a transaction we set creation_csn to RolledBackCSN at first
+        /// and then remove part from working set, so there's no race condition
+        if (part->version.creation_csn == Tx::RolledBackCSN)
+            continue;
+
+        /// We don't need parts that are finally removed.
+        /// NOTE There's a minor race condition: we may get UnknownCSN if a transaction has been just committed concurrently.
+        /// But it's not a problem if we will add such part to `data_parts`.
+        if (part->version.removal_csn != Tx::UnknownCSN)
+            continue;
+
+        active_parts_set.add(part->name);
+    }
+
+    /// Restore "active" parts set from selected active and outdated parts
+    auto remove_pred = [&](const MergeTreeData::DataPartPtr & part) -> bool
+    {
+        return active_parts_set.getContainingPart(part->info) != part->name;
+    };
+
+    std::erase_if(active_parts, remove_pred);
+
+    std::erase_if(outdated_parts, remove_pred);
+
+    MergeTreeData::DataPartsVector data_parts;
+    std::merge(
+        active_parts.begin(),
+        active_parts.end(),
+        outdated_parts.begin(),
+        outdated_parts.end(),
+        std::back_inserter(data_parts),
+        MergeTreeData::LessDataPart());
+
+    return data_parts;
+}
+
+MergeTreeDataMergerMutator::MergeSelectingInfo MergeTreeDataMergerMutator::getPossibleMergeRanges(
+    const MergeTreeData::DataPartsVector & data_parts,
+    const AllowedMergingPredicate & can_merge_callback,
+    const MergeTreeTransactionPtr & txn,
+    String * out_disable_reason) const
+{
+    MergeSelectingInfo res;
+
+    res.current_time = std::time(nullptr);
+
+    IMergeSelector::PartsRanges & parts_ranges = res.parts_ranges;
 
     StoragePolicyPtr storage_policy = data.getStoragePolicy();
     /// Volumes with stopped merges are extremely rare situation.
@@ -216,14 +348,8 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
     const MergeTreeData::DataPartPtr * prev_part = nullptr;
 
     /// collect min_age for each partition while iterating parts
-    struct PartitionInfo
-    {
-        time_t min_age{std::numeric_limits<time_t>::max()};
-    };
+    PartitionsInfo & partitions_info = res.partitions_info;
 
-    std::unordered_map<std::string, PartitionInfo> partitions_info;
-
-    size_t parts_selected_precondition = 0;
     for (const MergeTreeData::DataPartPtr & part : data_parts)
     {
         const String & partition_id = part->info.partition_id;
@@ -279,7 +405,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
 
         IMergeSelector::Part part_info;
         part_info.size = part->getBytesOnDisk();
-        part_info.age = current_time - part->modification_time;
+        part_info.age = res.current_time - part->modification_time;
         part_info.level = part->info.level;
         part_info.data = &part;
         part_info.ttl_infos = &part->ttl_infos;
@@ -289,7 +415,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
         auto & partition_info = partitions_info[partition_id];
         partition_info.min_age = std::min(partition_info.min_age, part_info.age);
 
-        ++parts_selected_precondition;
+        ++res.parts_selected_precondition;
 
         parts_ranges.back().emplace_back(part_info);
 
@@ -306,13 +432,21 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
         prev_part = &part;
     }
 
-    if (parts_selected_precondition == 0)
-    {
-        if (out_disable_reason)
-            *out_disable_reason = "No parts satisfy preconditions for merge";
-        return SelectPartsDecision::CANNOT_SELECT;
-    }
+    return res;
+}
 
+SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMergeFromRanges(
+    FutureMergedMutatedPartPtr future_part,
+    bool aggressive,
+    size_t max_total_size_to_merge,
+    bool merge_with_ttl_allowed,
+    const StorageMetadataPtr & metadata_snapshot,
+    const IMergeSelector::PartsRanges & parts_ranges,
+    const time_t & current_time,
+    String * out_disable_reason,
+    bool dry_run)
+{
+    const auto data_settings = data.getSettings();
     IMergeSelector::PartsRange parts_to_merge;
 
     if (metadata_snapshot->hasAnyTTL() && merge_with_ttl_allowed && !ttl_merges_blocker.isCancelled())
@@ -322,7 +456,8 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
                 next_delete_ttl_merge_times_by_partition,
                 current_time,
                 data_settings->merge_with_ttl_timeout,
-                true);
+                /*only_drop_parts*/ true,
+                dry_run);
 
         /// The size of the completely expired part of TTL drop is not affected by the merge pressure and the size of the storage space
         parts_to_merge = drop_ttl_selector.select(parts_ranges, data_settings->max_bytes_to_merge_at_max_space_in_pool);
@@ -336,7 +471,8 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
                 next_delete_ttl_merge_times_by_partition,
                 current_time,
                 data_settings->merge_with_ttl_timeout,
-                false);
+                /*only_drop_parts*/ false,
+                dry_run);
 
             parts_to_merge = delete_ttl_selector.select(parts_ranges, max_total_size_to_merge);
             if (!parts_to_merge.empty())
@@ -349,7 +485,8 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
                     next_recompress_ttl_merge_times_by_partition,
                     current_time,
                     data_settings->merge_with_recompression_ttl_timeout,
-                    metadata_snapshot->getRecompressionTTLs());
+                    metadata_snapshot->getRecompressionTTLs(),
+                    dry_run);
 
             parts_to_merge = recompress_ttl_selector.select(parts_ranges, max_total_size_to_merge);
             if (!parts_to_merge.empty())
@@ -377,22 +514,8 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
 
         if (parts_to_merge.empty())
         {
-            if (data_settings->min_age_to_force_merge_on_partition_only && data_settings->min_age_to_force_merge_seconds)
-            {
-                auto best_partition_it = std::max_element(
-                    partitions_info.begin(),
-                    partitions_info.end(),
-                    [](const auto & e1, const auto & e2) { return e1.second.min_age < e2.second.min_age; });
-
-                assert(best_partition_it != partitions_info.end());
-
-                if (static_cast<size_t>(best_partition_it->second.min_age) >= data_settings->min_age_to_force_merge_seconds)
-                    return selectAllPartsToMergeWithinPartition(
-                        future_part, can_merge_callback, best_partition_it->first, true, metadata_snapshot, txn, out_disable_reason);
-            }
-
             if (out_disable_reason)
-                *out_disable_reason = "There is no need to merge parts according to merge selector algorithm";
+                *out_disable_reason = "Did not find any parts to merge (with usual merge selectors)";
             return SelectPartsDecision::CANNOT_SELECT;
         }
     }
@@ -401,7 +524,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
     parts.reserve(parts_to_merge.size());
     for (IMergeSelector::Part & part_info : parts_to_merge)
     {
-        const MergeTreeData::DataPartPtr & part = *static_cast<const MergeTreeData::DataPartPtr *>(part_info.data);
+        const MergeTreeData::DataPartPtr & part = part_info.getDataPartPtr();
         parts.push_back(part);
     }
 
@@ -410,6 +533,28 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
     return SelectPartsDecision::SELECTED;
 }
 
+String MergeTreeDataMergerMutator::getBestPartitionToOptimizeEntire(
+    const PartitionsInfo & partitions_info) const
+{
+    const auto data_settings = data.getSettings();
+    if (!data_settings->min_age_to_force_merge_on_partition_only)
+        return {};
+    if (!data_settings->min_age_to_force_merge_seconds)
+        return {};
+
+    auto best_partition_it = std::max_element(
+        partitions_info.begin(),
+        partitions_info.end(),
+        [](const auto & e1, const auto & e2) { return e1.second.min_age < e2.second.min_age; });
+
+    assert(best_partition_it != partitions_info.end());
+
+    if (static_cast<size_t>(best_partition_it->second.min_age) < data_settings->min_age_to_force_merge_seconds)
+        return {};
+
+    return best_partition_it->first;
+}
+
 SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinPartition(
     FutureMergedMutatedPartPtr future_part,
     const AllowedMergingPredicate & can_merge,
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
index 7c96fcfaeb3..428161ea71e 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
@@ -62,6 +62,59 @@ public:
       */
     UInt64 getMaxSourcePartSizeForMutation() const;
 
+    struct PartitionInfo
+    {
+        time_t min_age{std::numeric_limits<time_t>::max()};
+    };
+    using PartitionsInfo = std::unordered_map<std::string, PartitionInfo>;
+
+    using PartitionIdsHint = std::unordered_set<String>;
+
+    /// The first step of selecting parts to merge: returns a list of all active/visible parts
+    MergeTreeData::DataPartsVector getDataPartsToSelectMergeFrom(const MergeTreeTransactionPtr & txn) const;
+
+    /// Same as above, but filters partitions according to partitions_hint
+    MergeTreeData::DataPartsVector getDataPartsToSelectMergeFrom(
+        const MergeTreeTransactionPtr & txn,
+        const PartitionIdsHint * partitions_hint) const;
+
+    struct MergeSelectingInfo
+    {
+        time_t current_time;
+        PartitionsInfo partitions_info;
+        IMergeSelector::PartsRanges parts_ranges;
+        size_t parts_selected_precondition = 0;
+    };
+
+    /// The second step of selecting parts to merge: splits parts list into a set of ranges according to can_merge_callback.
+    /// All parts within a range can be merged without violating some invariants.
+    MergeSelectingInfo getPossibleMergeRanges(
+        const MergeTreeData::DataPartsVector & data_parts,
+        const AllowedMergingPredicate & can_merge_callback,
+        const MergeTreeTransactionPtr & txn,
+        String * out_disable_reason = nullptr) const;
+
+    /// The third step of selecting parts to merge: takes ranges that we can merge, and selects parts that we want to merge
+    SelectPartsDecision selectPartsToMergeFromRanges(
+        FutureMergedMutatedPartPtr future_part,
+        bool aggressive,
+        size_t max_total_size_to_merge,
+        bool merge_with_ttl_allowed,
+        const StorageMetadataPtr & metadata_snapshot,
+        const IMergeSelector::PartsRanges & parts_ranges,
+        const time_t & current_time,
+        String * out_disable_reason = nullptr,
+        bool dry_run = false);
+
+    String getBestPartitionToOptimizeEntire(const PartitionsInfo & partitions_info) const;
+
+    /// Useful to quickly get a list of partitions that contain parts that we may want to merge
+    PartitionIdsHint getPartitionsThatMayBeMerged(
+        size_t max_total_size_to_merge,
+        const AllowedMergingPredicate & can_merge_callback,
+        bool merge_with_ttl_allowed,
+        const MergeTreeTransactionPtr & txn) const;
+
     /** Selects which parts to merge. Uses a lot of heuristics.
       *
       * can_merge - a function that determines if it is possible to merge a pair of adjacent parts.
@@ -76,7 +129,8 @@ public:
         const AllowedMergingPredicate & can_merge,
         bool merge_with_ttl_allowed,
         const MergeTreeTransactionPtr & txn,
-        String * out_disable_reason = nullptr);
+        String * out_disable_reason = nullptr,
+        const PartitionIdsHint * partitions_hint = nullptr);
 
     /** Select all the parts in the specified partition for merge, if possible.
       * final - choose to merge even a single part - that is, allow to merge one part "with itself",
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp b/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
index 8f4d066baa3..78f68ea72fe 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
@@ -1,6 +1,6 @@
 #include "MergeTreeDataPartChecksum.h"
 #include <Common/SipHash.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromString.h>
@@ -46,6 +46,10 @@ void MergeTreeDataPartChecksum::checkEqual(const MergeTreeDataPartChecksum & rhs
 
 void MergeTreeDataPartChecksum::checkSize(const IDataPartStorage & storage, const String & name) const
 {
+    /// Skip inverted index files, these have a default MergeTreeDataPartChecksum with file_size == 0
+    if (name.ends_with(".gin_dict") || name.ends_with(".gin_post") || name.ends_with(".gin_seg") || name.ends_with(".gin_sid"))
+        return;
+
     if (!storage.exists(name))
         throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "{} doesn't exist", fs::path(storage.getRelativePath()) / name);
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
index a5fb11244c7..07e20f16a9f 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
@@ -34,11 +34,12 @@ IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartCompact::getReader(
     const MarkRanges & mark_ranges,
     UncompressedCache * uncompressed_cache,
     MarkCache * mark_cache,
+    const AlterConversionsPtr & alter_conversions,
     const MergeTreeReaderSettings & reader_settings,
     const ValueSizeMap & avg_value_size_hints,
     const ReadBufferFromFileBase::ProfileCallback & profile_callback) const
 {
-    auto read_info = std::make_shared<LoadedMergeTreeDataPartInfoForReader>(shared_from_this());
+    auto read_info = std::make_shared<LoadedMergeTreeDataPartInfoForReader>(shared_from_this(), alter_conversions);
     auto * load_marks_threadpool = reader_settings.read_settings.load_marks_asynchronously ? &read_info->getContext()->getLoadMarksThreadpool() : nullptr;
 
     return std::make_unique<MergeTreeReaderCompact>(
diff --git a/src/Storages/MergeTree/MergeTreeDataPartCompact.h b/src/Storages/MergeTree/MergeTreeDataPartCompact.h
index ef553d290f7..b115692a7cf 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartCompact.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartCompact.h
@@ -34,6 +34,7 @@ public:
         const MarkRanges & mark_ranges,
         UncompressedCache * uncompressed_cache,
         MarkCache * mark_cache,
+        const AlterConversionsPtr & alter_conversions,
         const MergeTreeReaderSettings & reader_settings_,
         const ValueSizeMap & avg_value_size_hints,
         const ReadBufferFromFileBase::ProfileCallback & profile_callback) const override;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
index 20049976acf..468747a6c36 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
@@ -36,12 +36,14 @@ IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartInMemory::getReader(
     const MarkRanges & mark_ranges,
     UncompressedCache * /* uncompressed_cache */,
     MarkCache * /* mark_cache */,
+    const AlterConversionsPtr & alter_conversions,
     const MergeTreeReaderSettings & reader_settings,
     const ValueSizeMap & /* avg_value_size_hints */,
     const ReadBufferFromFileBase::ProfileCallback & /* profile_callback */) const
 {
-    auto read_info = std::make_shared<LoadedMergeTreeDataPartInfoForReader>(shared_from_this());
+    auto read_info = std::make_shared<LoadedMergeTreeDataPartInfoForReader>(shared_from_this(), alter_conversions);
     auto ptr = std::static_pointer_cast<const MergeTreeDataPartInMemory>(shared_from_this());
+
     return std::make_unique<MergeTreeReaderInMemory>(
         read_info, ptr, columns_to_read, metadata_snapshot, mark_ranges, reader_settings);
 }
@@ -73,7 +75,7 @@ MutableDataPartStoragePtr MergeTreeDataPartInMemory::flushToDisk(const String &
     new_data_part_storage->beginTransaction();
 
     new_data_part->uuid = uuid;
-    new_data_part->setColumns(columns, {});
+    new_data_part->setColumns(columns, {}, metadata_snapshot->getMetadataVersion());
     new_data_part->partition.value = partition.value;
     new_data_part->minmax_idx = minmax_idx;
 
@@ -104,7 +106,7 @@ MutableDataPartStoragePtr MergeTreeDataPartInMemory::flushToDisk(const String &
                 .build();
 
             new_projection_part->is_temp = false; // clean up will be done on parent part
-            new_projection_part->setColumns(projection->getColumns(), {});
+            new_projection_part->setColumns(projection->getColumns(), {}, metadata_snapshot->getMetadataVersion());
 
             auto new_projection_part_storage = new_projection_part->getDataPartStoragePtr();
             if (new_projection_part_storage->exists())
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.h b/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
index 525c966476b..db7244d8e99 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
@@ -23,6 +23,7 @@ public:
         const MarkRanges & mark_ranges,
         UncompressedCache * uncompressed_cache,
         MarkCache * mark_cache,
+        const AlterConversionsPtr & alter_conversions,
         const MergeTreeReaderSettings & reader_settings_,
         const ValueSizeMap & avg_value_size_hints,
         const ReadBufferFromFileBase::ProfileCallback & profile_callback) const override;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartType.h b/src/Storages/MergeTree/MergeTreeDataPartType.h
index bd2acb9ef65..8b06da5167e 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartType.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartType.h
@@ -44,7 +44,7 @@ public:
         /// Data of all columns is stored in one file. Marks are also stored in single file.
         Compact,
 
-        /// Format with buffering data in RAM.
+        /// Format with buffering data in RAM. Obsolete - new parts cannot be created in this format.
         InMemory,
 
         Unknown,
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
index 016aa2b7984..f44cbdd8628 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
@@ -33,11 +33,12 @@ IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartWide::getReader(
     const MarkRanges & mark_ranges,
     UncompressedCache * uncompressed_cache,
     MarkCache * mark_cache,
+    const AlterConversionsPtr & alter_conversions,
     const MergeTreeReaderSettings & reader_settings,
     const ValueSizeMap & avg_value_size_hints,
     const ReadBufferFromFileBase::ProfileCallback & profile_callback) const
 {
-    auto read_info = std::make_shared<LoadedMergeTreeDataPartInfoForReader>(shared_from_this());
+    auto read_info = std::make_shared<LoadedMergeTreeDataPartInfoForReader>(shared_from_this(), alter_conversions);
     return std::make_unique<MergeTreeReaderWide>(
         read_info, columns_to_read,
         metadata_snapshot, uncompressed_cache,
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.h b/src/Storages/MergeTree/MergeTreeDataPartWide.h
index 3f0d52d831e..5ee497b9b21 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.h
@@ -29,6 +29,7 @@ public:
         const MarkRanges & mark_ranges,
         UncompressedCache * uncompressed_cache,
         MarkCache * mark_cache,
+        const AlterConversionsPtr & alter_conversions,
         const MergeTreeReaderSettings & reader_settings_,
         const ValueSizeMap & avg_value_size_hints,
         const ReadBufferFromFileBase::ProfileCallback & profile_callback) const override;
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index db358e1b6a9..2b16ea43179 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -35,6 +35,7 @@
 #include <Processors/Transforms/AggregatingTransform.h>
 
 #include <Core/UUID.h>
+#include <Common/CurrentMetrics.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeUUID.h>
@@ -46,6 +47,12 @@
 
 #include <Storages/MergeTree/CommonANNIndexes.h>
 
+namespace CurrentMetrics
+{
+    extern const Metric MergeTreeDataSelectExecutorThreads;
+    extern const Metric MergeTreeDataSelectExecutorThreadsActive;
+}
+
 namespace DB
 {
 
@@ -56,7 +63,6 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
     extern const int ILLEGAL_COLUMN;
     extern const int ARGUMENT_OUT_OF_BOUND;
-    extern const int TOO_MANY_ROWS;
     extern const int CANNOT_PARSE_TEXT;
     extern const int TOO_MANY_PARTITIONS;
     extern const int DUPLICATED_PART_UUIDS;
@@ -154,11 +160,13 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
     const auto & snapshot_data = assert_cast<const MergeTreeData::SnapshotData &>(*storage_snapshot->data);
 
     const auto & parts = snapshot_data.parts;
+    const auto & alter_conversions = snapshot_data.alter_conversions;
 
     if (!query_info.projection)
     {
-        auto plan = readFromParts(
+        auto step = readFromParts(
             query_info.merge_tree_select_result_ptr ? MergeTreeData::DataPartsVector{} : parts,
+            query_info.merge_tree_select_result_ptr ? std::vector<AlterConversionsPtr>{} : alter_conversions,
             column_names_to_return,
             storage_snapshot,
             query_info,
@@ -169,11 +177,14 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
             query_info.merge_tree_select_result_ptr,
             enable_parallel_reading);
 
-        if (plan->isInitialized() && settings.allow_experimental_projection_optimization && settings.force_optimize_projection
-            && !metadata_for_reading->projections.empty())
+        if (!step && settings.optimize_use_projections && settings.force_optimize_projection
+            && !metadata_for_reading->projections.empty() && !settings.query_plan_optimize_projection)
             throw Exception(ErrorCodes::PROJECTION_NOT_USED,
-                            "No projection is used when allow_experimental_projection_optimization = 1 and force_optimize_projection = 1");
+                            "No projection is used when optimize_use_projections = 1 and force_optimize_projection = 1");
 
+        auto plan = std::make_unique<QueryPlan>();
+        if (step)
+            plan->addStep(std::move(step));
         return plan;
     }
 
@@ -197,8 +208,9 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
     else if (query_info.projection->merge_tree_projection_select_result_ptr)
     {
         LOG_DEBUG(log, "projection required columns: {}", fmt::join(query_info.projection->required_columns, ", "));
-        projection_plan = readFromParts(
-            {},
+        projection_plan->addStep(readFromParts(
+            /*parts=*/ {},
+            /*alter_conversions=*/ {},
             query_info.projection->required_columns,
             storage_snapshot,
             query_info,
@@ -207,7 +219,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
             num_streams,
             max_block_numbers_to_read,
             query_info.projection->merge_tree_projection_select_result_ptr,
-            enable_parallel_reading);
+            enable_parallel_reading));
     }
 
     if (projection_plan->isInitialized())
@@ -588,18 +600,24 @@ MergeTreeDataSelectSamplingData MergeTreeDataSelectExecutor::getSampling(
         * It is also important that the entire universe can be covered using SAMPLE 0.1 OFFSET 0, ... OFFSET 0.9 and similar decimals.
         */
 
+    auto parallel_replicas_mode = context->getParallelReplicasMode();
     /// Parallel replicas has been requested but there is no way to sample data.
     /// Select all data from first replica and no data from other replicas.
-    if (settings.parallel_replicas_count > 1 && !data.supportsSampling() && settings.parallel_replica_offset > 0)
+    if (settings.parallel_replicas_count > 1 && parallel_replicas_mode == Context::ParallelReplicasMode::SAMPLE_KEY
+        && !data.supportsSampling() && settings.parallel_replica_offset > 0)
     {
-        LOG_DEBUG(log, "Will use no data on this replica because parallel replicas processing has been requested"
+        LOG_DEBUG(
+            log,
+            "Will use no data on this replica because parallel replicas processing has been requested"
             " (the setting 'max_parallel_replicas') but the table does not support sampling and this replica is not the first.");
         sampling.read_nothing = true;
         return sampling;
     }
 
-    sampling.use_sampling = relative_sample_size > 0 || (settings.parallel_replicas_count > 1 && data.supportsSampling());
-    bool no_data = false;   /// There is nothing left after sampling.
+    sampling.use_sampling = relative_sample_size > 0
+        || (settings.parallel_replicas_count > 1 && parallel_replicas_mode == Context::ParallelReplicasMode::SAMPLE_KEY
+            && data.supportsSampling());
+    bool no_data = false; /// There is nothing left after sampling.
 
     if (sampling.use_sampling)
     {
@@ -779,6 +797,7 @@ std::optional<std::unordered_set<String>> MergeTreeDataSelectExecutor::filterPar
 
 void MergeTreeDataSelectExecutor::filterPartsByPartition(
     MergeTreeData::DataPartsVector & parts,
+    std::vector<AlterConversionsPtr> & alter_conversions,
     const std::optional<std::unordered_set<String>> & part_values,
     const StorageMetadataPtr & metadata_snapshot,
     const MergeTreeData & data,
@@ -788,6 +807,8 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
     Poco::Logger * log,
     ReadFromMergeTree::IndexStats & index_stats)
 {
+    chassert(alter_conversions.empty() || parts.size() == alter_conversions.size());
+
     const Settings & settings = context->getSettingsRef();
 
     std::optional<PartitionPruner> partition_pruner;
@@ -821,6 +842,7 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
     if (query_context->getSettingsRef().allow_experimental_query_deduplication)
         selectPartsToReadWithUUIDFilter(
             parts,
+            alter_conversions,
             part_values,
             data.getPinnedPartUUIDs(),
             minmax_idx_condition,
@@ -833,6 +855,7 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
     else
         selectPartsToRead(
             parts,
+            alter_conversions,
             part_values,
             minmax_idx_condition,
             minmax_columns_types,
@@ -871,6 +894,7 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
 
 RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipIndexes(
     MergeTreeData::DataPartsVector && parts,
+    std::vector<AlterConversionsPtr> && alter_conversions,
     StorageMetadataPtr metadata_snapshot,
     const SelectQueryInfo & query_info,
     const ContextPtr & context,
@@ -881,6 +905,8 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
     ReadFromMergeTree::IndexStats & index_stats,
     bool use_skip_indexes)
 {
+    chassert(alter_conversions.empty() || parts.size() == alter_conversions.size());
+
     RangesInDataParts parts_with_ranges;
     parts_with_ranges.resize(parts.size());
     const Settings & settings = context->getSettingsRef();
@@ -982,35 +1008,17 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
 
     /// Let's find what range to read from each part.
     {
-        std::atomic<size_t> total_rows{0};
-
-        /// Do not check number of read rows if we have reading
-        /// in order of sorting key with limit.
-        /// In general case, when there exists WHERE clause
-        /// it's impossible to estimate number of rows precisely,
-        /// because we can stop reading at any time.
-
-        SizeLimits limits;
-        if (settings.read_overflow_mode == OverflowMode::THROW
-            && settings.max_rows_to_read
-            && !query_info.input_order_info)
-            limits = SizeLimits(settings.max_rows_to_read, 0, settings.read_overflow_mode);
-
-        SizeLimits leaf_limits;
-        if (settings.read_overflow_mode_leaf == OverflowMode::THROW
-            && settings.max_rows_to_read_leaf
-            && !query_info.input_order_info)
-            leaf_limits = SizeLimits(settings.max_rows_to_read_leaf, 0, settings.read_overflow_mode_leaf);
-
         auto mark_cache = context->getIndexMarkCache();
         auto uncompressed_cache = context->getIndexUncompressedCache();
 
         auto process_part = [&](size_t part_index)
         {
             auto & part = parts[part_index];
+            auto alter_conversions_for_part = !alter_conversions.empty()
+                ? alter_conversions[part_index]
+                : std::make_shared<AlterConversions>();
 
-            RangesInDataPart ranges(part, part_index);
-
+            RangesInDataPart ranges(part, alter_conversions_for_part, part_index);
             size_t total_marks_count = part->index_granularity.getMarksCountWithoutFinal();
 
             if (metadata_snapshot->hasPrimaryKey())
@@ -1029,8 +1037,8 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
                     break;
 
                 index_and_condition.stat.total_parts.fetch_add(1, std::memory_order_relaxed);
+                index_and_condition.stat.total_granules.fetch_add(ranges.ranges.getNumberOfMarks(), std::memory_order_relaxed);
 
-                size_t total_granules = 0;
                 size_t granules_dropped = 0;
                 ranges.ranges = filterMarksUsingIndex(
                     index_and_condition.index,
@@ -1039,15 +1047,12 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
                     ranges.ranges,
                     settings,
                     reader_settings,
-                    total_granules,
                     granules_dropped,
                     mark_cache.get(),
                     uncompressed_cache.get(),
                     log);
 
-                index_and_condition.stat.total_granules.fetch_add(total_granules, std::memory_order_relaxed);
                 index_and_condition.stat.granules_dropped.fetch_add(granules_dropped, std::memory_order_relaxed);
-
                 if (ranges.ranges.empty())
                     index_and_condition.stat.parts_dropped.fetch_add(1, std::memory_order_relaxed);
             }
@@ -1076,24 +1081,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
             }
 
             if (!ranges.ranges.empty())
-            {
-                if (limits.max_rows || leaf_limits.max_rows)
-                {
-                    /// Fail fast if estimated number of rows to read exceeds the limit
-                    auto current_rows_estimate = ranges.getRowsCount();
-                    size_t prev_total_rows_estimate = total_rows.fetch_add(current_rows_estimate);
-                    size_t total_rows_estimate = current_rows_estimate + prev_total_rows_estimate;
-                    if (query_info.limit > 0 && total_rows_estimate > query_info.limit)
-                    {
-                        total_rows_estimate = query_info.limit;
-                    }
-                    limits.check(total_rows_estimate, 0, "rows (controlled by 'max_rows_to_read' setting)", ErrorCodes::TOO_MANY_ROWS);
-                    leaf_limits.check(
-                        total_rows_estimate, 0, "rows (controlled by 'max_rows_to_read_leaf' setting)", ErrorCodes::TOO_MANY_ROWS);
-                }
-
                 parts_with_ranges[part_index] = std::move(ranges);
-            }
         };
 
         size_t num_threads = std::min<size_t>(num_streams, parts.size());
@@ -1106,17 +1094,20 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
         else
         {
             /// Parallel loading of data parts.
-            ThreadPool pool(num_threads);
+            ThreadPool pool(
+                CurrentMetrics::MergeTreeDataSelectExecutorThreads,
+                CurrentMetrics::MergeTreeDataSelectExecutorThreadsActive,
+                num_threads);
 
             for (size_t part_index = 0; part_index < parts.size(); ++part_index)
                 pool.scheduleOrThrowOnError([&, part_index, thread_group = CurrentThread::getGroup()]
                 {
                     SCOPE_EXIT_SAFE(
                         if (thread_group)
-                            CurrentThread::detachQueryIfNotDetached();
+                            CurrentThread::detachFromGroupIfNotDetached();
                     );
                     if (thread_group)
-                        CurrentThread::attachToIfDetached(thread_group);
+                        CurrentThread::attachToGroupIfDetached(thread_group);
 
                     process_part(part_index);
                 });
@@ -1312,6 +1303,7 @@ MergeTreeDataSelectAnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMar
 
     return ReadFromMergeTree::selectRangesToRead(
         std::move(parts),
+        /*alter_conversions=*/ {},
         prewhere_info,
         added_filter_nodes,
         metadata_snapshot_base,
@@ -1326,8 +1318,9 @@ MergeTreeDataSelectAnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMar
         log);
 }
 
-QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
+QueryPlanStepPtr MergeTreeDataSelectExecutor::readFromParts(
     MergeTreeData::DataPartsVector parts,
+    std::vector<AlterConversionsPtr> alter_conversions,
     const Names & column_names_to_return,
     const StorageSnapshotPtr & storage_snapshot,
     const SelectQueryInfo & query_info,
@@ -1342,10 +1335,10 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     if (merge_tree_select_result_ptr)
     {
         if (merge_tree_select_result_ptr->marks() == 0)
-            return std::make_unique<QueryPlan>();
+            return {};
     }
     else if (parts.empty())
-        return std::make_unique<QueryPlan>();
+        return {};
 
     Names real_column_names;
     Names virt_column_names;
@@ -1355,8 +1348,9 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
 
     selectColumnNames(column_names_to_return, data, real_column_names, virt_column_names, sample_factor_column_queried);
 
-    auto read_from_merge_tree = std::make_unique<ReadFromMergeTree>(
+    return std::make_unique<ReadFromMergeTree>(
         std::move(parts),
+        std::move(alter_conversions),
         real_column_names,
         virt_column_names,
         data,
@@ -1371,10 +1365,6 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
         merge_tree_select_result_ptr,
         enable_parallel_reading
     );
-
-    QueryPlanPtr plan = std::make_unique<QueryPlan>();
-    plan->addStep(std::move(read_from_merge_tree));
-    return plan;
 }
 
 
@@ -1453,18 +1443,21 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
         return res;
     }
 
-    size_t used_key_size = key_condition.getMaxKeyColumn() + 1;
-    const String & part_name = part->isProjectionPart() ? fmt::format("{}.{}", part->name, part->getParentPart()->name) : part->name;
+    const auto & primary_key = metadata_snapshot->getPrimaryKey();
+    auto index_columns = std::make_shared<ColumnsWithTypeAndName>();
+    const auto & key_indices = key_condition.getKeyIndices();
+    DataTypes key_types;
+    for (size_t i : key_indices)
+    {
+        index_columns->emplace_back(ColumnWithTypeAndName{index[i], primary_key.data_types[i], primary_key.column_names[i]});
+        key_types.emplace_back(primary_key.data_types[i]);
+    }
 
-    std::function<void(size_t, size_t, FieldRef &)> create_field_ref;
     /// If there are no monotonic functions, there is no need to save block reference.
     /// Passing explicit field to FieldRef allows to optimize ranges and shows better performance.
-    const auto & primary_key = metadata_snapshot->getPrimaryKey();
+    std::function<void(size_t, size_t, FieldRef &)> create_field_ref;
     if (key_condition.hasMonotonicFunctionsChain())
     {
-        auto index_columns = std::make_shared<ColumnsWithTypeAndName>();
-        for (size_t i = 0; i < used_key_size; ++i)
-            index_columns->emplace_back(ColumnWithTypeAndName{index[i], primary_key.data_types[i], primary_key.column_names[i]});
 
         create_field_ref = [index_columns](size_t row, size_t column, FieldRef & field)
         {
@@ -1476,9 +1469,9 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
     }
     else
     {
-        create_field_ref = [&index](size_t row, size_t column, FieldRef & field)
+        create_field_ref = [index_columns](size_t row, size_t column, FieldRef & field)
         {
-            index[column]->get(row, field);
+            (*index_columns)[column].column->get(row, field);
             // NULL_LAST
             if (field.isNull())
                 field = POSITIVE_INFINITY;
@@ -1486,6 +1479,7 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
     }
 
     /// NOTE Creating temporary Field objects to pass to KeyCondition.
+    size_t used_key_size = key_indices.size();
     std::vector<FieldRef> index_left(used_key_size);
     std::vector<FieldRef> index_right(used_key_size);
 
@@ -1510,10 +1504,10 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
                 create_field_ref(range.end, i, index_right[i]);
             }
         }
-        return key_condition.mayBeTrueInRange(
-            used_key_size, index_left.data(), index_right.data(), primary_key.data_types);
+        return key_condition.mayBeTrueInRange(used_key_size, index_left.data(), index_right.data(), key_types);
     };
 
+    const String & part_name = part->isProjectionPart() ? fmt::format("{}.{}", part->name, part->getParentPart()->name) : part->name;
     if (!key_condition.matchesExactContinuousRange())
     {
         // Do exclusion search, where we drop ranges that do not match
@@ -1628,7 +1622,6 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
     const MarkRanges & ranges,
     const Settings & settings,
     const MergeTreeReaderSettings & reader_settings,
-    size_t & total_granules,
     size_t & granules_dropped,
     MarkCache * mark_cache,
     UncompressedCache * uncompressed_cache,
@@ -1689,8 +1682,6 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
         if (last_index_mark != index_range.begin || !granule)
             reader.seek(index_range.begin);
 
-        total_granules += index_range.end - index_range.begin;
-
         for (size_t index_mark = index_range.begin; index_mark < index_range.end; ++index_mark)
         {
             if (index_mark != index_range.begin || !granule || last_index_mark != index_range.begin)
@@ -1852,6 +1843,7 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingMergedIndex(
 
 void MergeTreeDataSelectExecutor::selectPartsToRead(
     MergeTreeData::DataPartsVector & parts,
+    std::vector<AlterConversionsPtr> & alter_conversions,
     const std::optional<std::unordered_set<String>> & part_values,
     const std::optional<KeyCondition> & minmax_idx_condition,
     const DataTypes & minmax_columns_types,
@@ -1860,10 +1852,14 @@ void MergeTreeDataSelectExecutor::selectPartsToRead(
     PartFilterCounters & counters)
 {
     MergeTreeData::DataPartsVector prev_parts;
+    std::vector<AlterConversionsPtr> prev_conversions;
+
     std::swap(prev_parts, parts);
-    for (const auto & part_or_projection : prev_parts)
+    std::swap(prev_conversions, alter_conversions);
+
+    for (size_t i = 0; i < prev_parts.size(); ++i)
     {
-        const auto * part = part_or_projection->isProjectionPart() ? part_or_projection->getParentPart() : part_or_projection.get();
+        const auto * part = prev_parts[i]->isProjectionPart() ? prev_parts[i]->getParentPart() : prev_parts[i].get();
         if (part_values && part_values->find(part->name) == part_values->end())
             continue;
 
@@ -1900,12 +1896,15 @@ void MergeTreeDataSelectExecutor::selectPartsToRead(
         counters.num_parts_after_partition_pruner += 1;
         counters.num_granules_after_partition_pruner += num_granules;
 
-        parts.push_back(part_or_projection);
+        parts.push_back(prev_parts[i]);
+        if (!prev_conversions.empty())
+            alter_conversions.push_back(prev_conversions[i]);
     }
 }
 
 void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
     MergeTreeData::DataPartsVector & parts,
+    std::vector<AlterConversionsPtr> & alter_conversions,
     const std::optional<std::unordered_set<String>> & part_values,
     MergeTreeData::PinnedPartUUIDsPtr pinned_part_uuids,
     const std::optional<KeyCondition> & minmax_idx_condition,
@@ -1918,16 +1917,22 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
 {
     /// process_parts prepare parts that have to be read for the query,
     /// returns false if duplicated parts' UUID have been met
-    auto select_parts = [&] (MergeTreeData::DataPartsVector & selected_parts) -> bool
+    auto select_parts = [&] (
+        MergeTreeData::DataPartsVector & selected_parts,
+        std::vector<AlterConversionsPtr> & selected_conversions) -> bool
     {
         auto ignored_part_uuids = query_context->getIgnoredPartUUIDs();
         std::unordered_set<UUID> temp_part_uuids;
 
         MergeTreeData::DataPartsVector prev_parts;
+        std::vector<AlterConversionsPtr> prev_conversions;
+
         std::swap(prev_parts, selected_parts);
-        for (const auto & part_or_projection : prev_parts)
+        std::swap(prev_conversions, selected_conversions);
+
+        for (size_t i = 0; i < prev_parts.size(); ++i)
         {
-            const auto * part = part_or_projection->isProjectionPart() ? part_or_projection->getParentPart() : part_or_projection.get();
+            const auto * part = prev_parts[i]->isProjectionPart() ? prev_parts[i]->getParentPart() : prev_parts[i].get();
             if (part_values && part_values->find(part->name) == part_values->end())
                 continue;
 
@@ -1977,7 +1982,9 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Found a part with the same UUID on the same replica.");
             }
 
-            selected_parts.push_back(part_or_projection);
+            selected_parts.push_back(prev_parts[i]);
+            if (!prev_conversions.empty())
+                selected_conversions.push_back(prev_conversions[i]);
         }
 
         if (!temp_part_uuids.empty())
@@ -1996,7 +2003,7 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
     };
 
     /// Process parts that have to be read for a query.
-    auto needs_retry = !select_parts(parts);
+    auto needs_retry = !select_parts(parts, alter_conversions);
 
     /// If any duplicated part UUIDs met during the first step, try to ignore them in second pass.
     /// This may happen when `prefer_localhost_replica` is set and "distributed" stage runs in the same process with "remote" stage.
@@ -2007,7 +2014,7 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
         counters = PartFilterCounters();
 
         /// Second attempt didn't help, throw an exception
-        if (!select_parts(parts))
+        if (!select_parts(parts, alter_conversions))
             throw Exception(ErrorCodes::DUPLICATED_PART_UUIDS, "Found duplicate UUIDs while processing query.");
     }
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
index 30d09312245..18fe312598c 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
@@ -39,8 +39,9 @@ public:
         bool enable_parallel_reading = false) const;
 
     /// The same as read, but with specified set of parts.
-    QueryPlanPtr readFromParts(
+    QueryPlanStepPtr readFromParts(
         MergeTreeData::DataPartsVector parts,
+        std::vector<AlterConversionsPtr> alter_conversions,
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         const SelectQueryInfo & query_info,
@@ -92,7 +93,6 @@ private:
         const MarkRanges & ranges,
         const Settings & settings,
         const MergeTreeReaderSettings & reader_settings,
-        size_t & total_granules,
         size_t & granules_dropped,
         MarkCache * mark_cache,
         UncompressedCache * uncompressed_cache,
@@ -125,6 +125,7 @@ private:
     ///  as well as `max_block_number_to_read`.
     static void selectPartsToRead(
         MergeTreeData::DataPartsVector & parts,
+        std::vector<AlterConversionsPtr> & alter_conversions,
         const std::optional<std::unordered_set<String>> & part_values,
         const std::optional<KeyCondition> & minmax_idx_condition,
         const DataTypes & minmax_columns_types,
@@ -135,6 +136,7 @@ private:
     /// Same as previous but also skip parts uuids if any to the query context, or skip parts which uuids marked as excluded.
     static void selectPartsToReadWithUUIDFilter(
         MergeTreeData::DataPartsVector & parts,
+        std::vector<AlterConversionsPtr> & alter_conversions,
         const std::optional<std::unordered_set<String>> & part_values,
         MergeTreeData::PinnedPartUUIDsPtr pinned_part_uuids,
         const std::optional<KeyCondition> & minmax_idx_condition,
@@ -174,6 +176,7 @@ public:
     /// Filter parts using minmax index and partition key.
     static void filterPartsByPartition(
         MergeTreeData::DataPartsVector & parts,
+        std::vector<AlterConversionsPtr> & alter_conversions,
         const std::optional<std::unordered_set<String>> & part_values,
         const StorageMetadataPtr & metadata_snapshot,
         const MergeTreeData & data,
@@ -188,6 +191,7 @@ public:
     /// If 'check_limits = true' it will throw exception if the amount of data exceed the limits from settings.
     static RangesInDataParts filterPartsByPrimaryKeyAndSkipIndexes(
         MergeTreeData::DataPartsVector && parts,
+        std::vector<AlterConversionsPtr> && alter_conversions,
         StorageMetadataPtr metadata_snapshot,
         const SelectQueryInfo & query_info,
         const ContextPtr & context,
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 37cfe4d065e..db486b163eb 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -280,23 +280,23 @@ Block MergeTreeDataWriter::mergeBlock(
                 return nullptr;
             case MergeTreeData::MergingParams::Replacing:
                 return std::make_shared<ReplacingSortedAlgorithm>(
-                    block, 1, sort_description, merging_params.is_deleted_column, merging_params.version_column, block_size + 1);
+                    block, 1, sort_description, merging_params.is_deleted_column, merging_params.version_column, block_size + 1, /*block_size_bytes=*/0);
             case MergeTreeData::MergingParams::Collapsing:
                 return std::make_shared<CollapsingSortedAlgorithm>(
                     block, 1, sort_description, merging_params.sign_column,
-                    false, block_size + 1, &Poco::Logger::get("MergeTreeDataWriter"));
+                    false, block_size + 1, /*block_size_bytes=*/0, &Poco::Logger::get("MergeTreeDataWriter"));
             case MergeTreeData::MergingParams::Summing:
                 return std::make_shared<SummingSortedAlgorithm>(
                     block, 1, sort_description, merging_params.columns_to_sum,
-                    partition_key_columns, block_size + 1);
+                    partition_key_columns, block_size + 1, /*block_size_bytes=*/0);
             case MergeTreeData::MergingParams::Aggregating:
-                return std::make_shared<AggregatingSortedAlgorithm>(block, 1, sort_description, block_size + 1);
+                return std::make_shared<AggregatingSortedAlgorithm>(block, 1, sort_description, block_size + 1, /*block_size_bytes=*/0);
             case MergeTreeData::MergingParams::VersionedCollapsing:
                 return std::make_shared<VersionedCollapsingAlgorithm>(
-                    block, 1, sort_description, merging_params.sign_column, block_size + 1);
+                    block, 1, sort_description, merging_params.sign_column, block_size + 1, /*block_size_bytes=*/0);
             case MergeTreeData::MergingParams::Graphite:
                 return std::make_shared<GraphiteRollupSortedAlgorithm>(
-                    block, 1, sort_description, block_size + 1, merging_params.graphite_params, time(nullptr));
+                    block, 1, sort_description, block_size + 1, /*block_size_bytes=*/0, merging_params.graphite_params, time(nullptr));
         }
 
         UNREACHABLE();
@@ -464,11 +464,15 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
     SerializationInfoByName infos(columns, settings);
     infos.add(block);
 
-    new_data_part->setColumns(columns, infos);
+    new_data_part->setColumns(columns, infos, metadata_snapshot->getMetadataVersion());
     new_data_part->rows_count = block.rows();
     new_data_part->partition = std::move(partition);
     new_data_part->minmax_idx = std::move(minmax_idx);
     new_data_part->is_temp = true;
+    /// In case of replicated merge tree with zero copy replication
+    /// Here Clickhouse claims that this new part can be deleted in temporary state without unlocking the blobs
+    /// The blobs have to be removed along with the part, this temporary part owns them and does not share them yet.
+    new_data_part->remove_tmp_policy = IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::REMOVE_BLOBS;
 
     SyncGuardPtr sync_guard;
     if (new_data_part->isStoredOnDisk())
@@ -586,7 +590,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeProjectionPartImpl(
     SerializationInfoByName infos(columns, settings);
     infos.add(block);
 
-    new_data_part->setColumns(columns, infos);
+    new_data_part->setColumns(columns, infos, metadata_snapshot->getMetadataVersion());
 
     if (new_data_part->isStoredOnDisk())
     {
diff --git a/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp b/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
index b843ce6a078..09a04f13fc7 100644
--- a/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
@@ -5,6 +5,7 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromFileBase.h>
 #include <IO/WriteBufferFromFileBase.h>
 #include <Disks/WriteMode.h>
 #include <Disks/IDisk.h>
@@ -160,7 +161,10 @@ void MergeTreeDeduplicationLog::rotate()
     existing_logs.emplace(current_log_number, log_description);
 
     if (current_writer)
+    {
+        current_writer->finalize();
         current_writer->sync();
+    }
 
     current_writer = disk->writeFile(log_description.path, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
 }
@@ -227,7 +231,7 @@ std::pair<MergeTreePartInfo, bool> MergeTreeDeduplicationLog::addPart(const std:
         return std::make_pair(info, false);
     }
 
-    assert(current_writer != nullptr);
+    chassert(current_writer != nullptr);
 
     /// Create new record
     MergeTreeDeduplicationLogRecord record;
@@ -257,7 +261,7 @@ void MergeTreeDeduplicationLog::dropPart(const MergeTreePartInfo & drop_part_inf
     if (deduplication_window == 0)
         return;
 
-    assert(current_writer != nullptr);
+    chassert(current_writer != nullptr);
 
     for (auto itr = deduplication_map.begin(); itr != deduplication_map.end(); /* no increment here, we erasing from map */)
     {
diff --git a/src/Storages/MergeTree/MergeTreeInOrderSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeInOrderSelectProcessor.cpp
index 813f144ee98..2676adfac2d 100644
--- a/src/Storages/MergeTree/MergeTreeInOrderSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeInOrderSelectProcessor.cpp
@@ -55,7 +55,12 @@ try
         : getSizePredictor(data_part, task_columns, sample_block);
 
     task = std::make_unique<MergeTreeReadTask>(
-        data_part, mark_ranges_for_task, part_index_in_query, column_name_set, task_columns,
+        data_part,
+        alter_conversions,
+        mark_ranges_for_task,
+        part_index_in_query,
+        column_name_set,
+        task_columns,
         std::move(size_predictor));
 
     return true;
diff --git a/src/Storages/MergeTree/MergeTreeInOrderSelectProcessor.h b/src/Storages/MergeTree/MergeTreeInOrderSelectProcessor.h
index f7c3f294658..da332c64232 100644
--- a/src/Storages/MergeTree/MergeTreeInOrderSelectProcessor.h
+++ b/src/Storages/MergeTree/MergeTreeInOrderSelectProcessor.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <Storages/MergeTree/MergeTreeSelectProcessor.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
index 80c4c201c3f..06fddd51cb8 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
@@ -322,14 +322,10 @@ bool MergeTreeConditionFullText::mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx
     return rpn_stack[0].can_be_true;
 }
 
-bool MergeTreeConditionFullText::getKey(const std::string & key_column_name, size_t & key_column_num)
+std::optional<size_t> MergeTreeConditionFullText::getKeyIndex(const std::string & key_column_name)
 {
-    auto it = std::find(index_columns.begin(), index_columns.end(), key_column_name);
-    if (it == index_columns.end())
-        return false;
-
-    key_column_num = static_cast<size_t>(it - index_columns.begin());
-    return true;
+    const auto it = std::ranges::find(index_columns, key_column_name);
+    return it == index_columns.end() ? std::nullopt : std::make_optional<size_t>(std::ranges::distance(index_columns.cbegin(), it));
 }
 
 bool MergeTreeConditionFullText::extractAtomFromTree(const RPNBuilderTreeNode & node, RPNElement & out)
@@ -389,7 +385,7 @@ bool MergeTreeConditionFullText::extractAtomFromTree(const RPNBuilderTreeNode &
                  function_name == "mapContains" ||
                  function_name == "like" ||
                  function_name == "notLike" ||
-                 function_name == "hasToken" ||
+                 function_name.starts_with("hasToken") ||
                  function_name == "startsWith" ||
                  function_name == "endsWith" ||
                  function_name == "multiSearchAny")
@@ -426,10 +422,9 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
 
     Field const_value = value_field;
 
-    auto column_name = key_node.getColumnName();
-    size_t key_column_num = 0;
-    bool key_exists = getKey(column_name, key_column_num);
-    bool map_key_exists = getKey(fmt::format("mapKeys({})", column_name), key_column_num);
+    const auto column_name = key_node.getColumnName();
+    auto key_index = getKeyIndex(column_name);
+    const auto map_key_index = getKeyIndex(fmt::format("mapKeys({})", column_name));
 
     if (key_node.isFunction())
     {
@@ -450,24 +445,14 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
 
             auto first_argument = key_function_node.getArgumentAt(0);
             const auto map_column_name = first_argument.getColumnName();
-
-            size_t map_keys_key_column_num = 0;
-            auto map_keys_index_column_name = fmt::format("mapKeys({})", map_column_name);
-            bool map_keys_exists = getKey(map_keys_index_column_name, map_keys_key_column_num);
-
-            size_t map_values_key_column_num = 0;
-            auto map_values_index_column_name = fmt::format("mapValues({})", map_column_name);
-            bool map_values_exists = getKey(map_values_index_column_name, map_values_key_column_num);
-
-            if (map_keys_exists)
+            if (const auto map_keys_index = getKeyIndex(fmt::format("mapKeys({})", map_column_name)))
             {
                 auto second_argument = key_function_node.getArgumentAt(1);
                 DataTypePtr const_type;
 
                 if (second_argument.tryGetConstant(const_value, const_type))
                 {
-                    key_column_num = map_keys_key_column_num;
-                    key_exists = true;
+                    key_index = map_keys_index;
 
                     auto const_data_type = WhichDataType(const_type);
                     if (!const_data_type.isStringOrFixedString() && !const_data_type.isArray())
@@ -478,10 +463,9 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
                     return false;
                 }
             }
-            else if (map_values_exists)
+            else if (const auto map_values_exists = getKeyIndex(fmt::format("mapValues({})", map_column_name)))
             {
-                key_column_num = map_values_key_column_num;
-                key_exists = true;
+                key_index = map_values_exists;
             }
             else
             {
@@ -490,12 +474,29 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
         }
     }
 
-    if (!key_exists && !map_key_exists)
+    const auto lowercase_key_index = getKeyIndex(fmt::format("lower({})", column_name));
+    const auto is_has_token_case_insensitive = function_name.starts_with("hasTokenCaseInsensitive");
+    if (const auto is_case_insensitive_scenario = is_has_token_case_insensitive && lowercase_key_index;
+        function_name.starts_with("hasToken") && ((!is_has_token_case_insensitive && key_index) || is_case_insensitive_scenario))
+    {
+        out.key_column = is_case_insensitive_scenario ? *lowercase_key_index : *key_index;
+        out.function = RPNElement::FUNCTION_EQUALS;
+        out.bloom_filter = std::make_unique<BloomFilter>(params);
+
+        auto value = const_value.get<String>();
+        if (is_case_insensitive_scenario)
+            std::ranges::transform(value, value.begin(), [](const auto & c) { return static_cast<char>(std::tolower(c)); });
+
+        token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
+        return true;
+    }
+
+    if (!key_index && !map_key_index)
         return false;
 
-    if (map_key_exists && (function_name == "has" || function_name == "mapContains"))
+    if (map_key_index && (function_name == "has" || function_name == "mapContains"))
     {
-        out.key_column = key_column_num;
+        out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_HAS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
         auto & value = const_value.get<String>();
@@ -504,7 +505,7 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
     }
     else if (function_name == "has")
     {
-        out.key_column = key_column_num;
+        out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_HAS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
         auto & value = const_value.get<String>();
@@ -514,7 +515,7 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
 
     if (function_name == "notEquals")
     {
-        out.key_column = key_column_num;
+        out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_NOT_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
         const auto & value = const_value.get<String>();
@@ -523,7 +524,7 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
     }
     else if (function_name == "equals")
     {
-        out.key_column = key_column_num;
+        out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
         const auto & value = const_value.get<String>();
@@ -532,7 +533,7 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
     }
     else if (function_name == "like")
     {
-        out.key_column = key_column_num;
+        out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
         const auto & value = const_value.get<String>();
@@ -541,25 +542,16 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
     }
     else if (function_name == "notLike")
     {
-        out.key_column = key_column_num;
+        out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_NOT_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
         const auto & value = const_value.get<String>();
         token_extractor->stringLikeToBloomFilter(value.data(), value.size(), *out.bloom_filter);
         return true;
     }
-    else if (function_name == "hasToken")
-    {
-        out.key_column = key_column_num;
-        out.function = RPNElement::FUNCTION_EQUALS;
-        out.bloom_filter = std::make_unique<BloomFilter>(params);
-        const auto & value = const_value.get<String>();
-        token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
-        return true;
-    }
     else if (function_name == "startsWith")
     {
-        out.key_column = key_column_num;
+        out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
         const auto & value = const_value.get<String>();
@@ -568,7 +560,7 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
     }
     else if (function_name == "endsWith")
     {
-        out.key_column = key_column_num;
+        out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
         const auto & value = const_value.get<String>();
@@ -577,7 +569,7 @@ bool MergeTreeConditionFullText::traverseTreeEquals(
     }
     else if (function_name == "multiSearchAny")
     {
-        out.key_column = key_column_num;
+        out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_MULTI_SEARCH;
 
         /// 2d vector is not needed here but is used because already exists for FUNCTION_IN
@@ -616,22 +608,17 @@ bool MergeTreeConditionFullText::tryPrepareSetBloomFilter(
 
         for (size_t i = 0; i < left_argument_function_node_arguments_size; ++i)
         {
-            size_t key = 0;
-            if (getKey(left_argument_function_node.getArgumentAt(i).getColumnName(), key))
+            if (const auto key = getKeyIndex(left_argument_function_node.getArgumentAt(i).getColumnName()))
             {
-                key_tuple_mapping.emplace_back(i, key);
-                data_types.push_back(index_data_types[key]);
+                key_tuple_mapping.emplace_back(i, *key);
+                data_types.push_back(index_data_types[*key]);
             }
         }
     }
-    else
+    else if (const auto key = getKeyIndex(left_argument.getColumnName()))
     {
-        size_t key = 0;
-        if (getKey(left_argument.getColumnName(), key))
-        {
-            key_tuple_mapping.emplace_back(0, key);
-            data_types.push_back(index_data_types[key]);
-        }
+        key_tuple_mapping.emplace_back(0, *key);
+        data_types.push_back(index_data_types[*key]);
     }
 
     if (key_tuple_mapping.empty())
@@ -748,9 +735,7 @@ void bloomFilterIndexValidator(const IndexDescription & index, bool /*attach*/)
 
         if (!data_type.isString() && !data_type.isFixedString())
             throw Exception(ErrorCodes::INCORRECT_QUERY,
-                            "Bloom filter index can be used only with `String`, `FixedString`, "
-                            "`LowCardinality(String)`, `LowCardinality(FixedString)` column "
-                            "or Array with `String` or `FixedString` values column.");
+                "Ngram and token bloom filter indexes can only be used with column types `String`, `FixedString`, `LowCardinality(String)`, `LowCardinality(FixedString)`, `Array(String)` or `Array(FixedString)`");
     }
 
     if (index.type == NgramTokenExtractor::getName())
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.h b/src/Storages/MergeTree/MergeTreeIndexFullText.h
index ad487816aef..c9b24f7086b 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.h
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.h
@@ -131,7 +131,7 @@ private:
         const Field & value_field,
         RPNElement & out);
 
-    bool getKey(const std::string & key_column_name, size_t & key_column_num);
+    std::optional<size_t> getKeyIndex(const std::string & key_column_name);
     bool tryPrepareSetBloomFilter(const RPNBuilderTreeNode & left_argument, const RPNBuilderTreeNode & right_argument, RPNElement & out);
 
     static bool createFunctionEqualsCondition(
diff --git a/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.cpp b/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.cpp
index 1ab64fc84c7..4227ffc6873 100644
--- a/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.cpp
@@ -108,7 +108,7 @@ bool MergeTreeIndexhypothesisMergedCondition::alwaysUnknownOrTrue() const
             func->name = "greaterOrEquals";
     }
 
-    const auto weak_graph = std::make_unique<ComparisonGraph>(active_atomic_formulas);
+    const auto weak_graph = std::make_unique<ComparisonGraph<ASTPtr>>(active_atomic_formulas);
 
     bool useless = true;
     expression_cnf->iterateGroups(
@@ -146,7 +146,7 @@ bool MergeTreeIndexhypothesisMergedCondition::mayBeTrueOnGranule(const MergeTree
         values.push_back(granule->met);
     }
 
-    const ComparisonGraph * graph = nullptr;
+    const ComparisonGraph<ASTPtr> * graph = nullptr;
 
     {
         std::lock_guard lock(cache_mutex);
@@ -170,7 +170,7 @@ bool MergeTreeIndexhypothesisMergedCondition::mayBeTrueOnGranule(const MergeTree
                 const auto * func = atom.ast->as<ASTFunction>();
                 if (func && func->arguments->children.size() == 2)
                 {
-                    const auto expected = ComparisonGraph::atomToCompareResult(atom);
+                    const auto expected = ComparisonGraph<ASTPtr>::atomToCompareResult(atom);
                     if (graph->isPossibleCompare(expected, func->arguments->children[0], func->arguments->children[1]))
                     {
                         /// If graph failed use matching.
@@ -188,7 +188,7 @@ bool MergeTreeIndexhypothesisMergedCondition::mayBeTrueOnGranule(const MergeTree
     return !always_false;
 }
 
-std::unique_ptr<ComparisonGraph> MergeTreeIndexhypothesisMergedCondition::buildGraph(const std::vector<bool> & values) const
+std::unique_ptr<ComparisonGraph<ASTPtr>> MergeTreeIndexhypothesisMergedCondition::buildGraph(const std::vector<bool> & values) const
 {
     ASTs active_atomic_formulas(atomic_constraints);
     for (size_t i = 0; i < values.size(); ++i)
@@ -199,10 +199,10 @@ std::unique_ptr<ComparisonGraph> MergeTreeIndexhypothesisMergedCondition::buildG
                 std::begin(index_to_compare_atomic_hypotheses[i]),
                 std::end(index_to_compare_atomic_hypotheses[i]));
     }
-    return std::make_unique<ComparisonGraph>(active_atomic_formulas);
+    return std::make_unique<ComparisonGraph<ASTPtr>>(active_atomic_formulas);
 }
 
-const ComparisonGraph * MergeTreeIndexhypothesisMergedCondition::getGraph(const std::vector<bool> & values) const
+const ComparisonGraph<ASTPtr> * MergeTreeIndexhypothesisMergedCondition::getGraph(const std::vector<bool> & values) const
 {
     auto [it, inserted] = graph_cache.try_emplace(values);
     if (inserted)
diff --git a/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.h b/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.h
index 6153c214898..3ab82f4d3ee 100644
--- a/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.h
+++ b/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.h
@@ -20,8 +20,8 @@ public:
 
 private:
     void addConstraints(const ConstraintsDescription & constraints_description);
-    std::unique_ptr<ComparisonGraph> buildGraph(const std::vector<bool> & values) const;
-    const ComparisonGraph * getGraph(const std::vector<bool> & values) const;
+    std::unique_ptr<ComparisonGraph<ASTPtr>> buildGraph(const std::vector<bool> & values) const;
+    const ComparisonGraph<ASTPtr> * getGraph(const std::vector<bool> & values) const;
 
     ASTPtr expression_ast;
     std::unique_ptr<CNFQuery> expression_cnf;
@@ -29,7 +29,7 @@ private:
     /// Part analysis can be done in parallel.
     /// So, we have shared answer and graph cache.
     mutable std::mutex cache_mutex;
-    mutable std::unordered_map<std::vector<bool>, std::unique_ptr<ComparisonGraph>> graph_cache;
+    mutable std::unordered_map<std::vector<bool>, std::unique_ptr<ComparisonGraph<ASTPtr>>> graph_cache;
     mutable std::unordered_map<std::vector<bool>, bool> answer_cache;
 
     std::vector<std::vector<ASTPtr>> index_to_compare_atomic_hypotheses;
diff --git a/src/Storages/MergeTree/MergeTreeIndexInverted.cpp b/src/Storages/MergeTree/MergeTreeIndexInverted.cpp
index e7d86f2a635..baa11368c8b 100644
--- a/src/Storages/MergeTree/MergeTreeIndexInverted.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexInverted.cpp
@@ -201,6 +201,7 @@ MergeTreeConditionInverted::MergeTreeConditionInverted(
             rpn.push_back(RPNElement::FUNCTION_UNKNOWN);
             return;
         }
+
         rpn = std::move(
                 RPNBuilder<RPNElement>(
                         query_info.filter_actions_dag->getOutputs().at(0), context_,
@@ -208,10 +209,10 @@ MergeTreeConditionInverted::MergeTreeConditionInverted(
                         {
                             return this->traverseAtomAST(node, out);
                         }).extractRPN());
+        return;
     }
 
     ASTPtr filter_node = buildFilterNode(query_info.query);
-
     if (!filter_node)
     {
         rpn.push_back(RPNElement::FUNCTION_UNKNOWN);
@@ -226,7 +227,6 @@ MergeTreeConditionInverted::MergeTreeConditionInverted(
         query_info.prepared_sets,
         [&](const RPNBuilderTreeNode & node, RPNElement & out) { return traverseAtomAST(node, out); });
     rpn = std::move(builder).extractRPN();
-
 }
 
 /// Keep in-sync with MergeTreeConditionFullText::alwaysUnknownOrTrue
@@ -426,6 +426,7 @@ bool MergeTreeConditionInverted::traverseAtomAST(const RPNBuilderTreeNode & node
                  function_name == "like" ||
                  function_name == "notLike" ||
                  function_name == "hasToken" ||
+                 function_name == "hasTokenOrNull" ||
                  function_name == "startsWith" ||
                  function_name == "endsWith" ||
                  function_name == "multiSearchAny")
@@ -568,7 +569,7 @@ bool MergeTreeConditionInverted::traverseASTEquals(
         token_extractor->stringLikeToGinFilter(value.data(), value.size(), *out.gin_filter);
         return true;
     }
-    else if (function_name == "hasToken")
+    else if (function_name == "hasToken" || function_name == "hasTokenOrNull")
     {
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_EQUALS;
diff --git a/src/Storages/MergeTree/MergeTreeIndexReader.cpp b/src/Storages/MergeTree/MergeTreeIndexReader.cpp
index 7d7024a8ac2..ab1fd8dfa74 100644
--- a/src/Storages/MergeTree/MergeTreeIndexReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexReader.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/MergeTreeIndexReader.h>
 #include <Interpreters/Context.h>
+#include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
 
 namespace
 {
@@ -20,7 +21,7 @@ std::unique_ptr<MergeTreeReaderStream> makeIndexReader(
     auto * load_marks_threadpool = settings.read_settings.load_marks_asynchronously ? &context->getLoadMarksThreadpool() : nullptr;
 
     return std::make_unique<MergeTreeReaderStream>(
-        part->getDataPartStoragePtr(),
+        std::make_shared<LoadedMergeTreeDataPartInfoForReader>(part, std::make_shared<AlterConversions>()),
         index->getFileName(), extension, marks_count,
         all_mark_ranges,
         std::move(settings), mark_cache, uncompressed_cache,
diff --git a/src/Storages/MergeTree/MergeTreeIndices.cpp b/src/Storages/MergeTree/MergeTreeIndices.cpp
index 2be9ecd8de3..6ae96d00171 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndices.cpp
@@ -35,6 +35,7 @@ MergeTreeIndexPtr MergeTreeIndexFactory::get(
 {
     auto it = creators.find(index.type);
     if (it == creators.end())
+    {
         throw Exception(ErrorCodes::INCORRECT_QUERY,
                 "Unknown Index type '{}'. Available index types: {}", index.type,
                 std::accumulate(creators.cbegin(), creators.cend(), std::string{},
@@ -46,6 +47,7 @@ MergeTreeIndexPtr MergeTreeIndexFactory::get(
                                 return left + ", " + right.first;
                         })
                 );
+    }
 
     return it->second(index);
 }
@@ -61,8 +63,31 @@ MergeTreeIndices MergeTreeIndexFactory::getMany(const std::vector<IndexDescripti
 
 void MergeTreeIndexFactory::validate(const IndexDescription & index, bool attach) const
 {
+    /// Do not allow constant and non-deterministic expressions.
+    /// Do not throw on attach for compatibility.
+    if (!attach)
+    {
+        if (index.expression->hasArrayJoin())
+            throw Exception(ErrorCodes::INCORRECT_QUERY, "Secondary index '{}' cannot contain array joins", index.name);
+
+        try
+        {
+            index.expression->assertDeterministic();
+        }
+        catch (Exception & e)
+        {
+            e.addMessage(fmt::format("for secondary index '{}'", index.name));
+            throw;
+        }
+
+        for (const auto & elem : index.sample_block)
+            if (elem.column && (isColumnConst(*elem.column) || elem.column->isDummy()))
+                throw Exception(ErrorCodes::INCORRECT_QUERY, "Secondary index '{}' cannot contain constants", index.name);
+    }
+
     auto it = validators.find(index.type);
     if (it == validators.end())
+    {
         throw Exception(ErrorCodes::INCORRECT_QUERY,
             "Unknown Index type '{}'. Available index types: {}", index.type,
                 std::accumulate(
@@ -77,6 +102,7 @@ void MergeTreeIndexFactory::validate(const IndexDescription & index, bool attach
                             return left + ", " + right.first;
                     })
             );
+    }
 
     it->second(index, attach);
 }
diff --git a/src/Storages/MergeTree/MergeTreeMarksLoader.cpp b/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
index 3fc7ff54c35..9a5576f0ad2 100644
--- a/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
+++ b/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
@@ -1,13 +1,13 @@
-#include <Storages/MergeTree/MergeTreeMarksLoader.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Common/MemoryTrackerBlockerInThread.h>
+#include <Compression/CompressedReadBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
-#include <Compression/CompressedReadBufferFromFile.h>
-#include <Common/setThreadName.h>
-#include <Common/scope_guard_safe.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeMarksLoader.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/MemoryTrackerBlockerInThread.h>
 #include <Common/ThreadPool.h>
+#include <Common/scope_guard_safe.h>
+#include <Common/setThreadName.h>
 
 #include <utility>
 
@@ -15,6 +15,8 @@ namespace ProfileEvents
 {
     extern const Event WaitMarksLoadMicroseconds;
     extern const Event BackgroundLoadingMarksTasks;
+    extern const Event LoadedMarksCount;
+    extern const Event LoadedMarksMemoryBytes;
 }
 
 namespace DB
@@ -28,7 +30,7 @@ namespace ErrorCodes
 }
 
 MergeTreeMarksLoader::MergeTreeMarksLoader(
-    DataPartStoragePtr data_part_storage_,
+    MergeTreeDataPartInfoForReaderPtr data_part_reader_,
     MarkCache * mark_cache_,
     const String & mrk_path_,
     size_t marks_count_,
@@ -37,7 +39,7 @@ MergeTreeMarksLoader::MergeTreeMarksLoader(
     const ReadSettings & read_settings_,
     ThreadPool * load_marks_threadpool_,
     size_t columns_in_mark_)
-    : data_part_storage(std::move(data_part_storage_))
+    : data_part_reader(data_part_reader_)
     , mark_cache(mark_cache_)
     , mrk_path(mrk_path_)
     , marks_count(marks_count_)
@@ -62,7 +64,7 @@ MergeTreeMarksLoader::~MergeTreeMarksLoader()
 }
 
 
-const MarkInCompressedFile & MergeTreeMarksLoader::getMark(size_t row_index, size_t column_index)
+MarkInCompressedFile MergeTreeMarksLoader::getMark(size_t row_index, size_t column_index)
 {
     if (!marks)
     {
@@ -87,7 +89,7 @@ const MarkInCompressedFile & MergeTreeMarksLoader::getMark(size_t row_index, siz
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Column index: {} is out of range [0, {})", column_index, columns_in_mark);
 #endif
 
-    return (*marks)[row_index * columns_in_mark + column_index];
+    return marks->get(row_index * columns_in_mark + column_index);
 }
 
 
@@ -96,18 +98,32 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
     /// Memory for marks must not be accounted as memory usage for query, because they are stored in shared cache.
     MemoryTrackerBlockerInThread temporarily_disable_memory_tracker;
 
+    auto data_part_storage = data_part_reader->getDataPartStorage();
+
     size_t file_size = data_part_storage->getFileSize(mrk_path);
     size_t mark_size = index_granularity_info.getMarkSizeInBytes(columns_in_mark);
     size_t expected_uncompressed_size = mark_size * marks_count;
 
-    auto res = std::make_shared<MarksInCompressedFile>(marks_count * columns_in_mark);
+    // We first read the marks into a temporary simple array, then compress them into a more compact
+    // representation.
+    PODArray<MarkInCompressedFile> plain_marks(marks_count * columns_in_mark); // temporary
+
+    if (file_size == 0 && marks_count != 0)
+    {
+        throw Exception(
+            ErrorCodes::CORRUPTED_DATA,
+            "Empty marks file '{}': {}, must be: {}",
+            std::string(fs::path(data_part_storage->getFullPath()) / mrk_path),
+            file_size, expected_uncompressed_size);
+    }
 
     if (!index_granularity_info.mark_type.compressed && expected_uncompressed_size != file_size)
         throw Exception(
             ErrorCodes::CORRUPTED_DATA,
             "Bad size of marks file '{}': {}, must be: {}",
             std::string(fs::path(data_part_storage->getFullPath()) / mrk_path),
-            file_size, expected_uncompressed_size);
+            file_size,
+            expected_uncompressed_size);
 
     auto buffer = data_part_storage->readFile(mrk_path, read_settings.adjustBufferSize(file_size), file_size, std::nullopt);
     std::unique_ptr<ReadBuffer> reader;
@@ -119,12 +135,16 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
     if (!index_granularity_info.mark_type.adaptive)
     {
         /// Read directly to marks.
-        reader->readStrict(reinterpret_cast<char *>(res->data()), expected_uncompressed_size);
+        reader->readStrict(reinterpret_cast<char *>(plain_marks.data()), expected_uncompressed_size);
 
         if (!reader->eof())
-            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA,
+            throw Exception(
+                ErrorCodes::CANNOT_READ_ALL_DATA,
                 "Cannot read all marks from file {}, is eof: {}, buffer size: {}, file size: {}",
-                mrk_path, reader->eof(), reader->buffer().size(), file_size);
+                mrk_path,
+                reader->eof(),
+                reader->buffer().size(),
+                file_size);
     }
     else
     {
@@ -132,16 +152,26 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
         size_t granularity;
         while (!reader->eof())
         {
-            res->read(*reader, i * columns_in_mark, columns_in_mark);
+            reader->readStrict(
+                reinterpret_cast<char *>(plain_marks.data() + i * columns_in_mark), columns_in_mark * sizeof(MarkInCompressedFile));
             readIntBinary(granularity, *reader);
             ++i;
         }
 
         if (i * mark_size != expected_uncompressed_size)
-            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read all marks from file {}", mrk_path);
+        {
+            throw Exception(
+                ErrorCodes::CANNOT_READ_ALL_DATA,
+                "Cannot read all marks from file {}, marks expected {} (bytes size {}), marks read {} (bytes size {})",
+                mrk_path, marks_count, expected_uncompressed_size, i, reader->count());
+        }
     }
 
-    res->protect();
+    auto res = std::make_shared<MarksInCompressedFile>(plain_marks);
+
+    ProfileEvents::increment(ProfileEvents::LoadedMarksCount, marks_count * columns_in_mark);
+    ProfileEvents::increment(ProfileEvents::LoadedMarksMemoryBytes, res->approximateMemoryUsage());
+
     return res;
 }
 
@@ -149,12 +179,14 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarks()
 {
     MarkCache::MappedPtr loaded_marks;
 
+    auto data_part_storage = data_part_reader->getDataPartStorage();
+
     if (mark_cache)
     {
         auto key = mark_cache->hash(fs::path(data_part_storage->getFullPath()) / mrk_path);
         if (save_marks_in_cache)
         {
-            auto callback = [this]{ return loadMarksImpl(); };
+            auto callback = [this] { return loadMarksImpl(); };
             loaded_marks = mark_cache->getOrSet(key, callback);
         }
         else
@@ -170,8 +202,7 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarks()
     if (!loaded_marks)
     {
         throw Exception(
-            ErrorCodes::LOGICAL_ERROR, "Failed to load marks: {}",
-            (fs::path(data_part_storage->getFullPath()) / mrk_path).string());
+            ErrorCodes::LOGICAL_ERROR, "Failed to load marks: {}", (fs::path(data_part_storage->getFullPath()) / mrk_path).string());
     }
 
     return loaded_marks;
@@ -179,11 +210,14 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarks()
 
 std::future<MarkCache::MappedPtr> MergeTreeMarksLoader::loadMarksAsync()
 {
-    return scheduleFromThreadPool<MarkCache::MappedPtr>([this]() -> MarkCache::MappedPtr
-     {
-         ProfileEvents::increment(ProfileEvents::BackgroundLoadingMarksTasks);
-         return loadMarks();
-     }, *load_marks_threadpool, "LoadMarksThread");
+    return scheduleFromThreadPool<MarkCache::MappedPtr>(
+        [this]() -> MarkCache::MappedPtr
+        {
+            ProfileEvents::increment(ProfileEvents::BackgroundLoadingMarksTasks);
+            return loadMarks();
+        },
+        *load_marks_threadpool,
+        "LoadMarksThread");
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeMarksLoader.h b/src/Storages/MergeTree/MergeTreeMarksLoader.h
index 4497339d767..0889da0cb85 100644
--- a/src/Storages/MergeTree/MergeTreeMarksLoader.h
+++ b/src/Storages/MergeTree/MergeTreeMarksLoader.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <Storages/MergeTree/IDataPartStorage.h>
 #include <Storages/MarkCache.h>
 #include <IO/ReadSettings.h>
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
+#include <Storages/MergeTree/IMergeTreeDataPartInfoForReader.h>
 
 
 namespace DB
@@ -18,7 +18,7 @@ public:
     using MarksPtr = MarkCache::MappedPtr;
 
     MergeTreeMarksLoader(
-        DataPartStoragePtr data_part_storage_,
+        MergeTreeDataPartInfoForReaderPtr data_part_reader_,
         MarkCache * mark_cache_,
         const String & mrk_path,
         size_t marks_count_,
@@ -30,10 +30,10 @@ public:
 
     ~MergeTreeMarksLoader();
 
-    const MarkInCompressedFile & getMark(size_t row_index, size_t column_index = 0);
+    MarkInCompressedFile getMark(size_t row_index, size_t column_index = 0);
 
 private:
-    DataPartStoragePtr data_part_storage;
+    MergeTreeDataPartInfoForReaderPtr data_part_reader;
     MarkCache * mark_cache = nullptr;
     String mrk_path;
     size_t marks_count;
diff --git a/src/Storages/MergeTree/MergeTreeMutationEntry.cpp b/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
index 2e30a3f3986..feffffb57ea 100644
--- a/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
+++ b/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
@@ -75,6 +75,7 @@ MergeTreeMutationEntry::MergeTreeMutationEntry(MutationCommands commands_, DiskP
             TransactionID::write(tid, *out);
             *out << "\n";
         }
+        out->finalize();
         out->sync();
     }
     catch (...)
diff --git a/src/Storages/MergeTree/MergeTreePartition.cpp b/src/Storages/MergeTree/MergeTreePartition.cpp
index 3a6908ef32d..1626018f1c1 100644
--- a/src/Storages/MergeTree/MergeTreePartition.cpp
+++ b/src/Storages/MergeTree/MergeTreePartition.cpp
@@ -12,7 +12,7 @@
 #include <Common/FieldVisitorToString.h>
 #include <Common/FieldVisitorHash.h>
 #include <Common/typeid_cast.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Core/Block.h>
 
 
@@ -84,7 +84,15 @@ namespace
         }
         void operator() (const UUID & x) const
         {
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+            auto tmp_x = x.toUnderType();
+            char * start = reinterpret_cast<char *>(&tmp_x);
+            char * end = start + sizeof(tmp_x);
+            std::reverse(start, end);
+            operator()(tmp_x);
+#else
             operator()(x.toUnderType());
+#endif
         }
         void operator() (const IPv4 & x) const
         {
@@ -261,8 +269,11 @@ String MergeTreePartition::getID(const Block & partition_key_sample) const
     hash.get128(hash_data);
     result.resize(32);
     for (size_t i = 0; i < 16; ++i)
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+        writeHexByteLowercase(hash_data[16 - 1 - i], &result[2 * i]);
+#else
         writeHexByteLowercase(hash_data[i], &result[2 * i]);
-
+#endif
     return result;
 }
 
diff --git a/src/Storages/MergeTree/MergeTreePartsMover.cpp b/src/Storages/MergeTree/MergeTreePartsMover.cpp
index 6f83a82e4e6..e1da57744b3 100644
--- a/src/Storages/MergeTree/MergeTreePartsMover.cpp
+++ b/src/Storages/MergeTree/MergeTreePartsMover.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/MergeTreePartsMover.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Common/logger_useful.h>
 
 #include <set>
 #include <boost/algorithm/string/join.hpp>
diff --git a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
index d76b8522f42..63a205a1a61 100644
--- a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
+++ b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
@@ -5,8 +5,12 @@
 #include <Storages/MergeTree/MarkRange.h>
 #include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
+#include <Storages/MergeTree/AlterConversions.h>
+#include <Storages/MergeTree/MergeTreeRangeReader.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
+#include <Interpreters/Context.h>
 #include <Common/ElapsedTimeProfileEventIncrement.h>
+#include <Common/logger_useful.h>
 #include <IO/Operators.h>
 #include <base/getThreadId.h>
 
@@ -22,6 +26,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
 }
 
 MergeTreePrefetchedReadPool::MergeTreePrefetchedReadPool(
@@ -68,6 +73,7 @@ MergeTreePrefetchedReadPool::MergeTreePrefetchedReadPool(
 struct MergeTreePrefetchedReadPool::PartInfo
 {
     MergeTreeData::DataPartPtr data_part;
+    AlterConversionsPtr alter_conversions;
     size_t part_index_in_query;
     size_t sum_marks = 0;
     MarkRanges ranges;
@@ -78,17 +84,21 @@ struct MergeTreePrefetchedReadPool::PartInfo
 
     size_t approx_size_of_mark = 0;
     size_t prefetch_step_marks = 0;
+
+    size_t estimated_memory_usage_for_single_prefetch = 0;
+    size_t required_readers_num = 0;
 };
 
 std::future<MergeTreeReaderPtr> MergeTreePrefetchedReadPool::createPrefetchedReader(
     const IMergeTreeDataPart & data_part,
     const NamesAndTypesList & columns,
+    const AlterConversionsPtr & alter_conversions,
     const MarkRanges & required_ranges,
-    int64_t priority) const
+    Priority priority) const
 {
     auto reader = data_part.getReader(
         columns, storage_snapshot->metadata, required_ranges,
-        uncompressed_cache, mark_cache, reader_settings,
+        uncompressed_cache, mark_cache, alter_conversions, reader_settings,
         IMergeTreeReader::ValueSizeMap{}, profile_callback);
 
     /// In order to make a prefetch we need to wait for marks to be loaded. But we just created
@@ -98,13 +108,13 @@ std::future<MergeTreeReaderPtr> MergeTreePrefetchedReadPool::createPrefetchedRea
     /// and we cannot block either, therefore make prefetch inside the pool and put the future
     /// into the read task (MergeTreeReadTask). When a thread calls getTask(), it will wait for
     /// it (if not yet ready) after getting the task.
-    auto task = [=, reader = std::move(reader), context = getContext()]() mutable -> MergeTreeReaderPtr &&
+    auto task = [=, my_reader = std::move(reader), context = getContext()]() mutable -> MergeTreeReaderPtr &&
     {
         /// For async read metrics in system.query_log.
         PrefetchIncrement watch(context->getAsyncReadCounters());
 
-        reader->prefetchBeginOfRange(priority);
-        return std::move(reader);
+        my_reader->prefetchBeginOfRange(priority);
+        return std::move(my_reader);
     };
     return scheduleFromThreadPool<IMergeTreeDataPart::MergeTreeReaderPtr>(std::move(task), prefetch_threadpool, "ReadPrepare", priority);
 }
@@ -114,34 +124,54 @@ void MergeTreePrefetchedReadPool::createPrefetchedReaderForTask(MergeTreeReadTas
     if (task.reader.valid())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Task already has a reader");
 
-    task.reader = createPrefetchedReader(*task.data_part, task.task_columns.columns, task.mark_ranges, task.priority);
+    task.reader = createPrefetchedReader(*task.data_part, task.task_columns.columns, task.alter_conversions, task.mark_ranges, task.priority);
 
     if (reader_settings.apply_deleted_mask && task.data_part->hasLightweightDelete())
     {
-        auto pre_reader = createPrefetchedReader(*task.data_part, {LightweightDeleteDescription::FILTER_COLUMN}, task.mark_ranges, task.priority);
+        auto pre_reader = createPrefetchedReader(*task.data_part, {LightweightDeleteDescription::FILTER_COLUMN}, task.alter_conversions, task.mark_ranges, task.priority);
         task.pre_reader_for_step.push_back(std::move(pre_reader));
     }
 
-    if (prewhere_info)
+    for (const auto & pre_columns_per_step : task.task_columns.pre_columns)
     {
-        for (const auto & pre_columns_per_step : task.task_columns.pre_columns)
-        {
-            auto pre_reader = createPrefetchedReader(*task.data_part, pre_columns_per_step, task.mark_ranges, task.priority);
-            task.pre_reader_for_step.push_back(std::move(pre_reader));
-        }
+        auto pre_reader = createPrefetchedReader(*task.data_part, pre_columns_per_step, task.alter_conversions, task.mark_ranges, task.priority);
+        task.pre_reader_for_step.push_back(std::move(pre_reader));
     }
 }
 
 bool MergeTreePrefetchedReadPool::TaskHolder::operator <(const TaskHolder & other) const
 {
-    return task->priority < other.task->priority;
+    chassert(task->priority >= 0);
+    chassert(other.task->priority >= 0);
+    return task->priority > other.task->priority; /// Less is better.
+    /// With default std::priority_queue, top() returns largest element.
+    /// So closest to 0 will be on top with this comparator.
 }
 
 void MergeTreePrefetchedReadPool::startPrefetches() const
 {
-    for (const auto & task : prefetch_queue)
+    if (prefetch_queue.empty())
+        return;
+
+    [[maybe_unused]] TaskHolder prev(nullptr, 0);
+    [[maybe_unused]] const Priority highest_priority{reader_settings.read_settings.priority.value + 1};
+    assert(prefetch_queue.top().task->priority == highest_priority);
+    while (!prefetch_queue.empty())
     {
-        createPrefetchedReaderForTask(*task.task);
+        const auto & top = prefetch_queue.top();
+        createPrefetchedReaderForTask(*top.task);
+#ifndef NDEBUG
+        if (prev.task)
+        {
+            assert(top.task->priority >= highest_priority);
+            if (prev.thread_id == top.thread_id)
+            {
+                assert(prev.task->priority < top.task->priority);
+            }
+        }
+        prev = top;
+#endif
+        prefetch_queue.pop();
     }
 }
 
@@ -154,8 +184,8 @@ MergeTreeReadTaskPtr MergeTreePrefetchedReadPool::getTask(size_t thread)
 
     if (!started_prefetches)
     {
-        startPrefetches();
         started_prefetches = true;
+        startPrefetches();
     }
 
     auto it = threads_tasks.find(thread);
@@ -298,6 +328,7 @@ MergeTreePrefetchedReadPool::PartsInfos MergeTreePrefetchedReadPool::getPartsInf
 {
     PartsInfos result;
     Block sample_block = storage_snapshot->metadata->getSampleBlock();
+    const auto & settings = getContext()->getSettingsRef();
     const bool predict_block_size_bytes = preferred_block_size_bytes > 0;
 
     for (const auto & part : parts)
@@ -305,27 +336,28 @@ MergeTreePrefetchedReadPool::PartsInfos MergeTreePrefetchedReadPool::getPartsInf
         auto part_info = std::make_unique<PartInfo>();
 
         part_info->data_part = part.data_part;
+        part_info->alter_conversions = part.alter_conversions;
         part_info->part_index_in_query = part.part_index_in_query;
         part_info->ranges = part.ranges;
         std::sort(part_info->ranges.begin(), part_info->ranges.end());
 
+        LoadedMergeTreeDataPartInfoForReader part_reader_info(part.data_part, part_info->alter_conversions);
+
         /// Sum up total size of all mark ranges in a data part.
         for (const auto & range : part.ranges)
-        {
             part_info->sum_marks += range.end - range.begin;
-        }
 
         part_info->approx_size_of_mark = getApproxSizeOfGranule(*part_info->data_part);
 
         const auto task_columns = getReadTaskColumns(
-            LoadedMergeTreeDataPartInfoForReader(part.data_part),
+            part_reader_info,
             storage_snapshot,
             column_names,
             virtual_column_names,
             prewhere_info,
             actions_settings,
             reader_settings,
-            /* with_subcolumns */true);
+            /*with_subcolumns=*/ true);
 
         part_info->size_predictor = !predict_block_size_bytes
             ? nullptr
@@ -336,6 +368,37 @@ MergeTreePrefetchedReadPool::PartsInfos MergeTreePrefetchedReadPool::getPartsInf
         part_info->column_name_set = {required_column_names.begin(), required_column_names.end()};
         part_info->task_columns = task_columns;
 
+        /// adjustBufferSize(), which is done in MergeTreeReaderStream and MergeTreeReaderCompact,
+        /// lowers buffer size if file size (or required read range) is less. So we know that the
+        /// settings.prefetch_buffer_size will be lowered there, therefore we account it here as well.
+        /// But here we make a more approximate lowering (because we do not have loaded marks yet),
+        /// while in adjustBufferSize it will be presize.
+        for (const auto & col : task_columns.columns)
+        {
+            const auto col_size = part.data_part->getColumnSize(col.name).data_compressed;
+            part_info->estimated_memory_usage_for_single_prefetch += std::min<size_t>(col_size, settings.prefetch_buffer_size);
+            ++part_info->required_readers_num;
+        }
+        if (reader_settings.apply_deleted_mask && part.data_part->hasLightweightDelete())
+        {
+            const auto col_size = part.data_part->getColumnSize(
+                LightweightDeleteDescription::FILTER_COLUMN.name).data_compressed;
+            part_info->estimated_memory_usage_for_single_prefetch += std::min<size_t>(col_size, settings.prefetch_buffer_size);
+            ++part_info->required_readers_num;
+        }
+        if (prewhere_info)
+        {
+            for (const auto & columns : task_columns.pre_columns)
+            {
+                for (const auto & col : columns)
+                {
+                    const size_t col_size = part.data_part->getColumnSize(col.name).data_compressed;
+                    part_info->estimated_memory_usage_for_single_prefetch += std::min<size_t>(col_size, settings.prefetch_buffer_size);
+                    ++part_info->required_readers_num;
+                }
+            }
+        }
+
         result.push_back(std::move(part_info));
     }
 
@@ -363,7 +426,6 @@ MergeTreePrefetchedReadPool::ThreadsTasks MergeTreePrefetchedReadPool::createThr
         min_prefetch_step_marks = static_cast<size_t>(std::round(static_cast<double>(sum_marks) / settings.filesystem_prefetches_limit));
     }
 
-    size_t total_prefetches_approx = 0;
     for (const auto & part : parts_infos)
     {
         if (settings.filesystem_prefetch_step_marks)
@@ -422,21 +484,24 @@ MergeTreePrefetchedReadPool::ThreadsTasks MergeTreePrefetchedReadPool::createThr
         "Sum marks: {}, threads: {}, min_marks_per_thread: {}, result prefetch step marks: {}, prefetches limit: {}, total_size_approx: {}",
         sum_marks, threads, min_marks_per_thread, settings.filesystem_prefetch_step_bytes, settings.filesystem_prefetches_limit, total_size_approx);
 
-    size_t current_prefetches_count = 0;
-    prefetch_queue.reserve(total_prefetches_approx);
+    size_t allowed_memory_usage = settings.filesystem_prefetch_max_memory_usage;
+    if (!allowed_memory_usage)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Setting `filesystem_prefetch_max_memory_usage` must be non-zero");
+    std::optional<size_t> allowed_prefetches_num = settings.filesystem_prefetches_limit
+        ? std::optional<size_t>(settings.filesystem_prefetches_limit)
+        : std::nullopt;
 
     ThreadsTasks result_threads_tasks;
-    size_t memory_usage_approx = 0;
     for (size_t i = 0, part_idx = 0; i < threads && part_idx < parts_infos.size(); ++i)
     {
         auto need_marks = min_marks_per_thread;
 
         /// Priority is given according to the prefetch number for each thread,
-        /// e.g. the first task of each thread has the same priority and is bigger
-        /// than second task of each thread, and so on.
+        /// e.g. the first task of each thread has the same priority and is greater
+        /// than the second task of each thread, and so on.
         /// Add 1 to query read priority because higher priority should be given to
         /// reads from pool which are from reader.
-        int64_t priority = reader_settings.read_settings.priority + 1;
+        Priority priority{reader_settings.read_settings.priority.value + 1};
 
         while (need_marks > 0 && part_idx < parts_infos.size())
         {
@@ -508,30 +573,37 @@ MergeTreePrefetchedReadPool::ThreadsTasks MergeTreePrefetchedReadPool::createThr
                 : std::make_unique<MergeTreeBlockSizePredictor>(*part.size_predictor); /// make a copy
 
             auto read_task = std::make_unique<MergeTreeReadTask>(
-                part.data_part, ranges_to_get_from_part, part.part_index_in_query,
-                part.column_name_set, part.task_columns,
+                part.data_part,
+                part.alter_conversions,
+                ranges_to_get_from_part,
+                part.part_index_in_query,
+                part.column_name_set,
+                part.task_columns,
                 std::move(curr_task_size_predictor));
 
             read_task->priority = priority;
 
-            bool allow_prefetch = !settings.filesystem_prefetches_limit || current_prefetches_count + 1 <= settings.filesystem_prefetches_limit;
-            if (allow_prefetch && settings.filesystem_prefetch_max_memory_usage)
+            bool allow_prefetch = false;
+            if (allowed_memory_usage
+                && (allowed_prefetches_num.has_value() == false || allowed_prefetches_num.value() > 0))
             {
-                size_t num_readers = 1;
-                if (reader_settings.apply_deleted_mask && part.data_part->hasLightweightDelete())
-                    ++num_readers;
-                if (prewhere_info)
-                    num_readers += part.task_columns.pre_columns.size();
-                memory_usage_approx += settings.max_read_buffer_size * num_readers;
+                allow_prefetch = part.estimated_memory_usage_for_single_prefetch <= allowed_memory_usage
+                    && (allowed_prefetches_num.has_value() == false
+                        || part.required_readers_num <= allowed_prefetches_num.value());
 
-                allow_prefetch = memory_usage_approx <= settings.filesystem_prefetch_max_memory_usage;
+                if (allow_prefetch)
+                {
+                    allowed_memory_usage -= part.estimated_memory_usage_for_single_prefetch;
+                    if (allowed_prefetches_num.has_value())
+                        *allowed_prefetches_num -= part.required_readers_num;
+                }
             }
+
             if (allow_prefetch)
             {
-                prefetch_queue.emplace(TaskHolder(read_task.get()));
-                ++current_prefetches_count;
+                prefetch_queue.emplace(TaskHolder(read_task.get(), i));
             }
-            ++priority;
+            ++priority.value;
 
             result_threads_tasks[i].push_back(std::move(read_task));
         }
diff --git a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h
index 98cfe28c563..ae97b32c7f9 100644
--- a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h
+++ b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <Common/ThreadPool.h>
+#include <Common/ThreadPool_fwd.h>
 #include <Interpreters/ExpressionActionsSettings.h>
 #include <Storages/MergeTree/MergeTreeReadPool.h>
 #include <Storages/MergeTree/MergeTreeIOSettings.h>
 #include <IO/AsyncReadCounters.h>
+#include <boost/heap/priority_queue.hpp>
 #include <queue>
 
 namespace DB
@@ -52,12 +53,12 @@ private:
     using ThreadTasks = std::deque<MergeTreeReadTaskPtr>;
     using ThreadsTasks = std::map<size_t, ThreadTasks>;
 
-    /// smaller `priority` means more priority
     std::future<MergeTreeReaderPtr> createPrefetchedReader(
         const IMergeTreeDataPart & data_part,
         const NamesAndTypesList & columns,
+        const AlterConversionsPtr & alter_conversions,
         const MarkRanges & required_ranges,
-        int64_t priority) const;
+        Priority priority) const;
 
     void createPrefetchedReaderForTask(MergeTreeReadTask & task) const;
 
@@ -101,11 +102,12 @@ private:
 
     struct TaskHolder
     {
-        explicit TaskHolder(MergeTreeReadTask * task_) : task(task_) {}
+        explicit TaskHolder(MergeTreeReadTask * task_, size_t thread_id_) : task(task_), thread_id(thread_id_) {}
         MergeTreeReadTask * task;
+        size_t thread_id;
         bool operator <(const TaskHolder & other) const;
     };
-    mutable boost::heap::priority_queue<TaskHolder> prefetch_queue;
+    mutable std::priority_queue<TaskHolder> prefetch_queue; /// the smallest on top
     bool started_prefetches = false;
 
     /// A struct which allows to track max number of tasks which were in the
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.cpp b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
index e3b87d48ce6..586d7aa918a 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
@@ -1,8 +1,10 @@
+#include <Storages/MergeTree/MergeTreeRangeReader.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
 #include <Columns/FilterDescription.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnsCommon.h>
 #include <Common/TargetSpecific.h>
+#include <Common/logger_useful.h>
 #include <Core/UUID.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
@@ -18,9 +20,7 @@
 
 #if defined(__aarch64__) && defined(__ARM_NEON)
 #    include <arm_neon.h>
-#    ifdef HAS_RESERVED_IDENTIFIER
-#        pragma clang diagnostic ignored "-Wreserved-identifier"
-#    endif
+#      pragma clang diagnostic ignored "-Wreserved-identifier"
 #endif
 
 namespace DB
@@ -843,8 +843,8 @@ MergeTreeRangeReader::MergeTreeRangeReader(
         if (step.actions)
             step.actions->execute(result_sample_block, true);
 
-        if (step.remove_column)
-            result_sample_block.erase(step.column_name);
+        if (step.remove_filter_column)
+            result_sample_block.erase(step.filter_column_name);
     }
 }
 
@@ -982,12 +982,9 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::read(size_t max_rows, Mar
         /// Calculate and update read bytes
         size_t total_bytes = 0;
         for (auto & column : columns)
-        {
             if (column)
-            {
                 total_bytes += column->byteSize();
-            }
-        }
+
         read_result.addNumBytesRead(total_bytes);
 
         if (!columns.empty())
@@ -1001,8 +998,7 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::read(size_t max_rows, Mar
             /// some columns (e.g. arrays) might be only partially filled and thus not be valid and
             /// fillMissingColumns() fixes this.
             bool should_evaluate_missing_defaults;
-            merge_tree_reader->fillMissingColumns(columns, should_evaluate_missing_defaults,
-                                                    num_read_rows);
+            merge_tree_reader->fillMissingColumns(columns, should_evaluate_missing_defaults, num_read_rows);
 
             if (read_result.total_rows_per_granule == num_read_rows && read_result.num_rows != num_read_rows)
             {
@@ -1027,7 +1023,8 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::read(size_t max_rows, Mar
             }
 
             /// If columns not empty, then apply on-fly alter conversions if any required
-            merge_tree_reader->performRequiredConversions(columns);
+            if (!prewhere_info || prewhere_info->perform_alter_conversions)
+                merge_tree_reader->performRequiredConversions(columns);
         }
 
         read_result.columns.reserve(read_result.columns.size() + columns.size());
@@ -1051,15 +1048,15 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::read(size_t max_rows, Mar
             Columns physical_columns(read_result.columns.begin(), read_result.columns.begin() + physical_columns_count);
 
             bool should_evaluate_missing_defaults;
-            merge_tree_reader->fillMissingColumns(physical_columns, should_evaluate_missing_defaults,
-                                                  read_result.num_rows);
+            merge_tree_reader->fillMissingColumns(physical_columns, should_evaluate_missing_defaults, read_result.num_rows);
 
             /// If some columns absent in part, then evaluate default values
             if (should_evaluate_missing_defaults)
                 merge_tree_reader->evaluateMissingDefaults({}, physical_columns);
 
             /// If result not empty, then apply on-fly alter conversions if any required
-            merge_tree_reader->performRequiredConversions(physical_columns);
+            if (!prewhere_info || prewhere_info->perform_alter_conversions)
+                merge_tree_reader->performRequiredConversions(physical_columns);
 
             for (size_t i = 0; i < physical_columns.size(); ++i)
                 read_result.columns[i] = std::move(physical_columns[i]);
@@ -1318,91 +1315,87 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
                         "Invalid number of columns passed to MergeTreeRangeReader. Expected {}, got {}",
                         num_columns, result.columns.size());
 
-    /// Filter computed at the current step. Its size is equal to num_rows which is <= total_rows_per_granule
-    ColumnPtr current_step_filter;
-    size_t prewhere_column_pos;
+    /// Restore block from columns list.
+    Block block;
+    size_t pos = 0;
 
+    if (prev_reader)
     {
-        /// Restore block from columns list.
-        Block block;
-        size_t pos = 0;
-
-        if (prev_reader)
+        for (const auto & col : prev_reader->getSampleBlock())
         {
-            for (const auto & col : prev_reader->getSampleBlock())
-            {
-                block.insert({result.columns[pos], col.type, col.name});
-                ++pos;
-            }
+            block.insert({result.columns[pos], col.type, col.name});
+            ++pos;
         }
-
-        for (auto name_and_type = header.begin(); name_and_type != header.end() && pos < result.columns.size(); ++pos, ++name_and_type)
-            block.insert({result.columns[pos], name_and_type->type, name_and_type->name});
-
-        {
-            /// Columns might be projected out. We need to store them here so that default columns can be evaluated later.
-            Block additional_columns = block;
-
-            if (prewhere_info->actions)
-            {
-                const String dummy_column = addDummyColumnWithRowCount(block, result.num_rows);
-
-                LOG_TEST(log, "Executing prewhere actions on block: {}", block.dumpStructure());
-
-                prewhere_info->actions->execute(block);
-
-                if (!dummy_column.empty())
-                    block.erase(dummy_column);
-            }
-
-            result.additional_columns.clear();
-            /// Additional columns might only be needed if there are more steps in the chain.
-            if (!last_reader_in_chain)
-            {
-                for (auto & col : additional_columns)
-                {
-                    /// Exclude columns that are present in the result block to avoid storing them and filtering twice.
-                    /// TODO: also need to exclude the columns that are not needed for the next steps.
-                    if (block.has(col.name))
-                        continue;
-                    result.additional_columns.insert(col);
-                }
-            }
-        }
-
-        prewhere_column_pos = block.getPositionByName(prewhere_info->column_name);
-
-        result.columns.clear();
-        result.columns.reserve(block.columns());
-        for (auto & col : block)
-            result.columns.emplace_back(std::move(col.column));
-
-        current_step_filter = result.columns[prewhere_column_pos];
     }
 
-    /// In case when we are returning prewhere column the caller expects it to serve as a final filter:
-    /// it must contain 0s not only from the current step but also from all the previous steps.
-    /// One way to achieve this is to apply the final_filter if we know that the final_filter was not applied at
-    /// several previous steps but was accumulated instead.
-    result.can_return_prewhere_column_without_filtering = result.filterWasApplied();
+    for (auto name_and_type = header.begin(); name_and_type != header.end() && pos < result.columns.size(); ++pos, ++name_and_type)
+        block.insert({result.columns[pos], name_and_type->type, name_and_type->name});
 
-    if (prewhere_info->remove_column)
-        result.columns.erase(result.columns.begin() + prewhere_column_pos);
-
-    FilterWithCachedCount current_filter(current_step_filter);
-
-    result.optimize(current_filter, merge_tree_reader->canReadIncompleteGranules());
-
-    if (prewhere_info->need_filter && !result.filterWasApplied())
     {
-        /// Depending on whether the final filter was applied at the previous step or not we need to apply either
-        /// just the current step filter   or the accumulated filter.
-        FilterWithCachedCount filter_to_apply =
-            current_filter.size() == result.total_rows_per_granule ?
-                result.final_filter :
-                current_filter;
+        /// Columns might be projected out. We need to store them here so that default columns can be evaluated later.
+        Block additional_columns = block;
+
+        if (prewhere_info->actions)
+        {
+            const String dummy_column = addDummyColumnWithRowCount(block, result.num_rows);
+
+            LOG_TEST(log, "Executing prewhere actions on block: {}", block.dumpStructure());
+
+            prewhere_info->actions->execute(block);
+
+            if (!dummy_column.empty())
+                block.erase(dummy_column);
+        }
+
+        result.additional_columns.clear();
+        /// Additional columns might only be needed if there are more steps in the chain.
+        if (!last_reader_in_chain)
+        {
+            for (auto & col : additional_columns)
+            {
+                /// Exclude columns that are present in the result block to avoid storing them and filtering twice.
+                /// TODO: also need to exclude the columns that are not needed for the next steps.
+                if (block.has(col.name))
+                    continue;
+                result.additional_columns.insert(col);
+            }
+        }
+    }
+
+    result.columns.clear();
+    result.columns.reserve(block.columns());
+    for (auto & col : block)
+        result.columns.emplace_back(std::move(col.column));
+
+    if (prewhere_info->type == PrewhereExprStep::Filter)
+    {
+        /// Filter computed at the current step. Its size is equal to num_rows which is <= total_rows_per_granule
+        size_t filter_column_pos = block.getPositionByName(prewhere_info->filter_column_name);
+        auto current_step_filter = result.columns[filter_column_pos];
+
+        /// In case when we are returning prewhere column the caller expects it to serve as a final filter:
+        /// it must contain 0s not only from the current step but also from all the previous steps.
+        /// One way to achieve this is to apply the final_filter if we know that the final_filter was not applied at
+        /// several previous steps but was accumulated instead.
+        result.can_return_prewhere_column_without_filtering = result.filterWasApplied();
+
+        if (prewhere_info->remove_filter_column)
+            result.columns.erase(result.columns.begin() + filter_column_pos);
+
+        FilterWithCachedCount current_filter(current_step_filter);
+        result.optimize(current_filter, merge_tree_reader->canReadIncompleteGranules());
+
+        if (prewhere_info->need_filter && !result.filterWasApplied())
+        {
+            /// Depending on whether the final filter was applied at the previous step or not we need to apply either
+            /// just the current step filter or the accumulated filter.
+            FilterWithCachedCount filter_to_apply =
+                current_filter.size() == result.total_rows_per_granule
+                    ? result.final_filter
+                    : current_filter;
 
             result.applyFilter(filter_to_apply);
+        }
     }
 
     LOG_TEST(log, "After execute prewhere {}", result.dumpInfo());
@@ -1416,12 +1409,12 @@ std::string PrewhereExprInfo::dump() const
     for (size_t i = 0; i < steps.size(); ++i)
     {
         s << "STEP " << i << ":\n"
-            << "  ACTIONS: " << (steps[i].actions ?
-                (indent + boost::replace_all_copy(steps[i].actions->dumpActions(), "\n", indent)) :
+            << "  ACTIONS: " << (steps[i]->actions ?
+                (indent + boost::replace_all_copy(steps[i]->actions->dumpActions(), "\n", indent)) :
                 "nullptr") << "\n"
-            << "  COLUMN: " << steps[i].column_name << "\n"
-            << "  REMOVE_COLUMN: " << steps[i].remove_column << "\n"
-            << "  NEED_FILTER: " << steps[i].need_filter << "\n\n";
+            << "  COLUMN: " << steps[i]->filter_column_name << "\n"
+            << "  REMOVE_COLUMN: " << steps[i]->remove_filter_column << "\n"
+            << "  NEED_FILTER: " << steps[i]->need_filter << "\n\n";
     }
 
     return s.str();
@@ -1432,7 +1425,7 @@ std::string PrewhereExprInfo::dumpConditions() const
     WriteBufferFromOwnString s;
 
     for (size_t i = 0; i < steps.size(); ++i)
-        s << (i == 0 ? "\"" : ", \"") << steps[i].column_name << "\"";
+        s << (i == 0 ? "\"" : ", \"") << steps[i]->filter_column_name << "\"";
 
     return s.str();
 }
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.h b/src/Storages/MergeTree/MergeTreeRangeReader.h
index 5ffd464cfe2..04d42138963 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.h
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.h
@@ -1,6 +1,5 @@
 #pragma once
 #include <Core/Block.h>
-#include <Common/logger_useful.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/FilterDescription.h>
@@ -23,19 +22,33 @@ using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 
 struct PrewhereExprStep
 {
+    enum Type
+    {
+        Filter,
+        Expression,
+    };
+
+    Type type = Type::Filter;
     ExpressionActionsPtr actions;
-    String column_name;
-    bool remove_column = false;
+    String filter_column_name;
+
+    bool remove_filter_column = false;
     bool need_filter = false;
+
+    /// Some PREWHERE steps should be executed without conversions.
+    /// A step without alter conversion cannot be executed after step with alter conversions.
+    bool perform_alter_conversions = false;
 };
 
+using PrewhereExprStepPtr = std::shared_ptr<PrewhereExprStep>;
+using PrewhereExprSteps = std::vector<PrewhereExprStepPtr>;
+
 /// The same as PrewhereInfo, but with ExpressionActions instead of ActionsDAG
 struct PrewhereExprInfo
 {
-    std::vector<PrewhereExprStep> steps;
+    PrewhereExprSteps steps;
 
     std::string dump() const;
-
     std::string dumpConditions() const;
 };
 
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.cpp b/src/Storages/MergeTree/MergeTreeReadPool.cpp
index 54a040724fc..0ffc91aca57 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPool.cpp
@@ -1,8 +1,10 @@
 #include <Storages/MergeTree/MergeTreeReadPool.h>
 #include <Storages/MergeTree/MergeTreeBaseSelectProcessor.h>
 #include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
-#include "Common/Stopwatch.h"
+#include <Interpreters/Context_fwd.h>
+#include <Common/Stopwatch.h>
 #include <Common/formatReadable.h>
+#include <Common/logger_useful.h>
 #include <base/range.h>
 
 
@@ -91,16 +93,18 @@ std::vector<size_t> MergeTreeReadPool::fillPerPartInfo(
 
         per_part_sum_marks.push_back(sum_marks);
 
+        auto & per_part = per_part_params.emplace_back();
+        per_part.data_part = part;
+
+        LoadedMergeTreeDataPartInfoForReader part_info(part.data_part, part.alter_conversions);
         auto task_columns = getReadTaskColumns(
-            LoadedMergeTreeDataPartInfoForReader(part.data_part), storage_snapshot,
-            column_names, virtual_column_names, prewhere_info, actions_settings, reader_settings, /*with_subcolumns=*/ true);
+            part_info, storage_snapshot, column_names, virtual_column_names,
+            prewhere_info, actions_settings,
+            reader_settings, /*with_subcolumns=*/ true);
 
         auto size_predictor = !predict_block_size_bytes ? nullptr
             : IMergeTreeSelectAlgorithm::getSizePredictor(part.data_part, task_columns, sample_block);
 
-        auto & per_part = per_part_params.emplace_back();
-
-        per_part.data_part = part;
         per_part.size_predictor = std::move(size_predictor);
 
         /// will be used to distinguish between PREWHERE and WHERE columns when applying filter
@@ -201,13 +205,16 @@ MergeTreeReadTaskPtr MergeTreeReadPool::getTask(size_t thread)
     }
 
     const auto & per_part = per_part_params[part_idx];
-
     auto curr_task_size_predictor = !per_part.size_predictor ? nullptr
         : std::make_unique<MergeTreeBlockSizePredictor>(*per_part.size_predictor); /// make a copy
 
     return std::make_unique<MergeTreeReadTask>(
-        part.data_part, ranges_to_get_from_part, part.part_index_in_query,
-        per_part.column_name_set, per_part.task_columns,
+        part.data_part,
+        part.alter_conversions,
+        ranges_to_get_from_part,
+        part.part_index_in_query,
+        per_part.column_name_set,
+        per_part.task_columns,
         std::move(curr_task_size_predictor));
 }
 
@@ -377,7 +384,7 @@ MergeTreeReadPoolParallelReplicas::~MergeTreeReadPoolParallelReplicas() = defaul
 
 Block MergeTreeReadPoolParallelReplicas::getHeader() const
 {
-    return storage_snapshot->getSampleBlockForColumns(extension.colums_to_read);
+    return storage_snapshot->getSampleBlockForColumns(extension.columns_to_read);
 }
 
 MergeTreeReadTaskPtr MergeTreeReadPoolParallelReplicas::getTask(size_t thread)
@@ -455,6 +462,7 @@ MergeTreeReadTaskPtr MergeTreeReadPoolParallelReplicas::getTask(size_t thread)
 
     return std::make_unique<MergeTreeReadTask>(
         part.data_part,
+        part.alter_conversions,
         ranges_to_read,
         part.part_index_in_query,
         per_part.column_name_set,
@@ -514,5 +522,4 @@ MarkRanges MergeTreeInOrderReadPoolParallelReplicas::getNewTask(RangesInDataPart
     return {};
 }
 
-
 }
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.h b/src/Storages/MergeTree/MergeTreeReadPool.h
index b3356ec3351..e621a02a9d6 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.h
+++ b/src/Storages/MergeTree/MergeTreeReadPool.h
@@ -8,6 +8,8 @@
 #include <Storages/MergeTree/RequestResponse.h>
 #include <Storages/MergeTree/IMergeTreeReadPool.h>
 #include <Storages/SelectQueryInfo.h>
+#include <Storages/MergeTree/AlterConversions.h>
+#include <Interpreters/Context_fwd.h>
 
 #include <mutex>
 
@@ -164,7 +166,6 @@ private:
 class MergeTreeReadPoolParallelReplicas : public IMergeTreeReadPool
 {
 public:
-
     MergeTreeReadPoolParallelReplicas(
         StorageSnapshotPtr storage_snapshot_,
         size_t threads_,
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index d1796dac6cc..d22684eaa9d 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -36,7 +36,7 @@ MergeTreeReaderCompact::MergeTreeReaderCompact(
         settings_,
         avg_value_size_hints_)
     , marks_loader(
-          data_part_info_for_read_->getDataPartStorage(),
+          data_part_info_for_read_,
           mark_cache,
           data_part_info_for_read_->getIndexGranularityInfo().getMarksFilePath(MergeTreeDataPartCompact::DATA_FILE_NAME),
           data_part_info_for_read_->getMarksCount(),
@@ -314,7 +314,7 @@ void MergeTreeReaderCompact::readData(
         last_read_granule.emplace(from_mark, column_position);
 }
 
-void MergeTreeReaderCompact::prefetchBeginOfRange(int64_t priority)
+void MergeTreeReaderCompact::prefetchBeginOfRange(Priority priority)
 {
     if (!initialized)
     {
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.h b/src/Storages/MergeTree/MergeTreeReaderCompact.h
index a994e72d3ff..f180d7508f7 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.h
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.h
@@ -38,7 +38,7 @@ public:
 
     bool canReadIncompleteGranules() const override { return false; }
 
-    void prefetchBeginOfRange(int64_t priority) override;
+    void prefetchBeginOfRange(Priority priority) override;
 
 private:
     bool isContinuousReading(size_t mark, size_t column_position);
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.cpp b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
index cdca5aa1247..8e460630d5e 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
@@ -2,6 +2,7 @@
 #include <Compression/CachedCompressedReadBuffer.h>
 
 #include <base/getThreadId.h>
+#include <base/range.h>
 #include <utility>
 
 
@@ -15,7 +16,7 @@ namespace ErrorCodes
 }
 
 MergeTreeReaderStream::MergeTreeReaderStream(
-        DataPartStoragePtr data_part_storage_,
+        MergeTreeDataPartInfoForReaderPtr data_part_reader_,
         const String & path_prefix_,
         const String & data_file_extension_,
         size_t marks_count_,
@@ -35,7 +36,7 @@ MergeTreeReaderStream::MergeTreeReaderStream(
     , all_mark_ranges(all_mark_ranges_)
     , file_size(file_size_)
     , uncompressed_cache(uncompressed_cache_)
-    , data_part_storage(std::move(data_part_storage_))
+    , data_part_storage(data_part_reader_->getDataPartStorage())
     , path_prefix(path_prefix_)
     , data_file_extension(data_file_extension_)
     , is_low_cardinality_dictionary(is_low_cardinality_dictionary_)
@@ -44,7 +45,7 @@ MergeTreeReaderStream::MergeTreeReaderStream(
     , save_marks_in_cache(settings.save_marks_in_cache)
     , index_granularity_info(index_granularity_info_)
     , marks_loader(
-        data_part_storage,
+        data_part_reader_,
         mark_cache,
         index_granularity_info->getMarksFilePath(path_prefix),
         marks_count,
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.h b/src/Storages/MergeTree/MergeTreeReaderStream.h
index f3785e175df..baf8ec713f9 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.h
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.h
@@ -9,6 +9,7 @@
 #include <Compression/CompressedReadBufferFromFile.h>
 #include <Storages/MergeTree/MergeTreeIOSettings.h>
 #include <Storages/MergeTree/MergeTreeMarksLoader.h>
+#include <Storages/MergeTree/IMergeTreeDataPartInfoForReader.h>
 
 
 namespace DB
@@ -19,7 +20,7 @@ class MergeTreeReaderStream
 {
 public:
     MergeTreeReaderStream(
-        DataPartStoragePtr data_part_storage_,
+        MergeTreeDataPartInfoForReaderPtr data_part_reader_,
         const String & path_prefix_,
         const String & data_file_extension_,
         size_t marks_count_,
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.cpp b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
index 05af33da20a..baacfa55c94 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
@@ -58,7 +58,7 @@ MergeTreeReaderWide::MergeTreeReaderWide(
     }
 }
 
-void MergeTreeReaderWide::prefetchBeginOfRange(int64_t priority)
+void MergeTreeReaderWide::prefetchBeginOfRange(Priority priority)
 {
     prefetched_streams.clear();
 
@@ -90,7 +90,7 @@ void MergeTreeReaderWide::prefetchBeginOfRange(int64_t priority)
 }
 
 void MergeTreeReaderWide::prefetchForAllColumns(
-    int64_t priority, size_t num_columns, size_t from_mark, size_t current_task_last_mark, bool continue_reading)
+    Priority priority, size_t num_columns, size_t from_mark, size_t current_task_last_mark, bool continue_reading)
 {
     bool do_prefetch = data_part_info_for_read->getDataPartStorage()->isStoredOnRemoteDisk()
         ? settings.read_settings.remote_fs_prefetch
@@ -137,7 +137,7 @@ size_t MergeTreeReaderWide::readRows(
         if (num_columns == 0)
             return max_rows_to_read;
 
-        prefetchForAllColumns(/* priority */0, num_columns, from_mark, current_task_last_mark, continue_reading);
+        prefetchForAllColumns(Priority{}, num_columns, from_mark, current_task_last_mark, continue_reading);
 
         for (size_t pos = 0; pos < num_columns; ++pos)
         {
@@ -242,7 +242,7 @@ void MergeTreeReaderWide::addStreams(
         auto * load_marks_threadpool = settings.read_settings.load_marks_asynchronously ? &context->getLoadMarksThreadpool() : nullptr;
 
         streams.emplace(stream_name, std::make_unique<MergeTreeReaderStream>(
-            data_part_info_for_read->getDataPartStorage(), stream_name, DATA_FILE_EXTENSION,
+            data_part_info_for_read, stream_name, DATA_FILE_EXTENSION,
             data_part_info_for_read->getMarksCount(), all_mark_ranges, settings, mark_cache,
             uncompressed_cache, data_part_info_for_read->getFileSizeOrZero(stream_name + DATA_FILE_EXTENSION),
             &data_part_info_for_read->getIndexGranularityInfo(),
@@ -305,7 +305,7 @@ void MergeTreeReaderWide::deserializePrefix(
 }
 
 void MergeTreeReaderWide::prefetchForColumn(
-    int64_t priority,
+    Priority priority,
     const NameAndTypePair & name_and_type,
     const SerializationPtr & serialization,
     size_t from_mark,
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.h b/src/Storages/MergeTree/MergeTreeReaderWide.h
index 08bb17c5d56..c31b1baf32e 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.h
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.h
@@ -33,14 +33,14 @@ public:
 
     bool canReadIncompleteGranules() const override { return true; }
 
-    void prefetchBeginOfRange(int64_t priority) override;
+    void prefetchBeginOfRange(Priority priority) override;
 
     using FileStreams = std::map<std::string, std::unique_ptr<MergeTreeReaderStream>>;
 
 private:
     FileStreams streams;
 
-    void prefetchForAllColumns(int64_t priority, size_t num_columns, size_t from_mark, size_t current_task_last_mark, bool continue_reading);
+    void prefetchForAllColumns(Priority priority, size_t num_columns, size_t from_mark, size_t current_task_last_mark, bool continue_reading);
 
     void addStreams(
         const NameAndTypePair & name_and_type,
@@ -55,7 +55,7 @@ private:
 
     /// Make next readData more simple by calling 'prefetch' of all related ReadBuffers (column streams).
     void prefetchForColumn(
-        int64_t priority,
+        Priority priority,
         const NameAndTypePair & name_and_type,
         const SerializationPtr & serialization,
         size_t from_mark,
diff --git a/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp
index da2d0b0ae4a..bb515bcd10f 100644
--- a/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp
@@ -48,8 +48,13 @@ bool MergeTreeReverseSelectAlgorithm::getNewTaskOrdinaryReading()
         : getSizePredictor(data_part, task_columns, sample_block);
 
     task = std::make_unique<MergeTreeReadTask>(
-        data_part, mark_ranges_for_task, part_index_in_query, column_name_set,
-        task_columns, std::move(size_predictor));
+        data_part,
+        alter_conversions,
+        mark_ranges_for_task,
+        part_index_in_query,
+        column_name_set,
+        task_columns,
+        std::move(size_predictor));
 
     return true;
 
@@ -86,8 +91,13 @@ bool MergeTreeReverseSelectAlgorithm::getNewTaskParallelReplicas()
         : getSizePredictor(data_part, task_columns, sample_block);
 
     task = std::make_unique<MergeTreeReadTask>(
-        data_part, mark_ranges_for_task, part_index_in_query, column_name_set,
-        task_columns, std::move(size_predictor));
+        data_part,
+        alter_conversions,
+        mark_ranges_for_task,
+        part_index_in_query,
+        column_name_set,
+        task_columns,
+        std::move(size_predictor));
 
     return true;
 }
diff --git a/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.h b/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.h
index fd25748050a..618f2855695 100644
--- a/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.h
+++ b/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <Storages/MergeTree/MergeTreeSelectProcessor.h>
+#include <Common/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
index 83e9cc90547..ce4ba69c08c 100644
--- a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
@@ -12,6 +12,7 @@ MergeTreeSelectAlgorithm::MergeTreeSelectAlgorithm(
     const MergeTreeData & storage_,
     const StorageSnapshotPtr & storage_snapshot_,
     const MergeTreeData::DataPartPtr & owned_data_part_,
+    const AlterConversionsPtr & alter_conversions_,
     UInt64 max_block_size_rows_,
     size_t preferred_block_size_bytes_,
     size_t preferred_max_column_in_block_size_bytes_,
@@ -32,6 +33,7 @@ MergeTreeSelectAlgorithm::MergeTreeSelectAlgorithm(
         reader_settings_, use_uncompressed_cache_, virt_column_names_},
     required_columns{std::move(required_columns_)},
     data_part{owned_data_part_},
+    alter_conversions(alter_conversions_),
     sample_block(storage_snapshot_->metadata->getSampleBlock()),
     all_mark_ranges(std::move(mark_ranges_)),
     part_index_in_query(part_index_in_query_),
@@ -44,9 +46,13 @@ MergeTreeSelectAlgorithm::MergeTreeSelectAlgorithm(
 
 void MergeTreeSelectAlgorithm::initializeReaders()
 {
+    LoadedMergeTreeDataPartInfoForReader part_info(data_part, alter_conversions);
+
     task_columns = getReadTaskColumns(
-        LoadedMergeTreeDataPartInfoForReader(data_part), storage_snapshot,
-        required_columns, virt_column_names, prewhere_info, actions_settings, reader_settings, /*with_subcolumns=*/ true);
+        part_info, storage_snapshot,
+        required_columns, virt_column_names,
+        prewhere_info,
+        actions_settings, reader_settings, /*with_subcolumns=*/ true);
 
     /// Will be used to distinguish between PREWHERE and WHERE columns when applying filter
     const auto & column_names = task_columns.columns.getNames();
@@ -58,7 +64,8 @@ void MergeTreeSelectAlgorithm::initializeReaders()
     owned_mark_cache = storage.getContext()->getMarkCache();
 
     initializeMergeTreeReadersForPart(
-        data_part, task_columns, storage_snapshot->getMetadataForQuery(), all_mark_ranges, {}, {});
+        data_part, alter_conversions, task_columns,
+        storage_snapshot->getMetadataForQuery(), all_mark_ranges, {}, {});
 }
 
 
diff --git a/src/Storages/MergeTree/MergeTreeSelectProcessor.h b/src/Storages/MergeTree/MergeTreeSelectProcessor.h
index 981c42574e0..5f4f49bf075 100644
--- a/src/Storages/MergeTree/MergeTreeSelectProcessor.h
+++ b/src/Storages/MergeTree/MergeTreeSelectProcessor.h
@@ -20,7 +20,8 @@ public:
     MergeTreeSelectAlgorithm(
         const MergeTreeData & storage,
         const StorageSnapshotPtr & storage_snapshot_,
-        const MergeTreeData::DataPartPtr & owned_data_part,
+        const MergeTreeData::DataPartPtr & owned_data_part_,
+        const AlterConversionsPtr & alter_conversions_,
         UInt64 max_block_size_rows,
         size_t preferred_block_size_bytes,
         size_t preferred_max_column_in_block_size_bytes,
@@ -54,6 +55,9 @@ protected:
     /// Data part will not be removed if the pointer owns it
     MergeTreeData::DataPartPtr data_part;
 
+    /// Alter converversionss that should be applied on-fly for part.
+    AlterConversionsPtr alter_conversions;
+
     /// Cache getSampleBlock call, which might be heavy.
     Block sample_block;
 
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
index 4539e0b36c5..e27354f9d16 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
@@ -9,6 +9,7 @@
 #include <Interpreters/Context.h>
 #include <Processors/Sources/NullSource.h>
 #include <Processors/QueryPlan/FilterStep.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -110,12 +111,14 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
                 data_part->getMarksCount(), data_part->name, data_part->rows_count);
     }
 
+    auto alter_conversions = storage.getAlterConversionsForPart(data_part);
+
     /// Note, that we don't check setting collaborate_with_coordinator presence, because this source
     /// is only used in background merges.
     addTotalRowsApprox(data_part->rows_count);
 
     /// Add columns because we don't want to read empty blocks
-    injectRequiredColumns(LoadedMergeTreeDataPartInfoForReader(data_part), storage_snapshot, /*with_subcolumns=*/ false, columns_to_read);
+    injectRequiredColumns(LoadedMergeTreeDataPartInfoForReader(data_part, alter_conversions), storage_snapshot, /*with_subcolumns=*/ false, columns_to_read);
 
     NamesAndTypesList columns_for_reader;
     if (take_column_types_from_storage)
@@ -145,9 +148,10 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
     if (!mark_ranges)
         mark_ranges.emplace(MarkRanges{MarkRange(0, data_part->getMarksCount())});
 
-    reader = data_part->getReader(columns_for_reader, storage_snapshot->metadata,
-        *mark_ranges,
-        /* uncompressed_cache = */ nullptr, mark_cache.get(), reader_settings, {}, {});
+    reader = data_part->getReader(
+        columns_for_reader, storage_snapshot->metadata,
+        *mark_ranges, /* uncompressed_cache = */ nullptr,
+        mark_cache.get(), alter_conversions, reader_settings, {}, {});
 }
 
 Chunk MergeTreeSequentialSource::generate()
@@ -240,10 +244,9 @@ Pipe createMergeTreeSequentialSource(
     if (need_to_filter_deleted_rows)
         columns.emplace_back(LightweightDeleteDescription::FILTER_COLUMN.name);
 
-    bool apply_deleted_mask = false;
-
     auto column_part_source = std::make_shared<MergeTreeSequentialSource>(
-        storage, storage_snapshot, data_part, columns, std::optional<MarkRanges>{}, apply_deleted_mask, read_with_direct_io, take_column_types_from_storage, quiet);
+        storage, storage_snapshot, data_part, columns, std::optional<MarkRanges>{},
+        /*apply_deleted_mask=*/ false, read_with_direct_io, take_column_types_from_storage, quiet);
 
     Pipe pipe(std::move(column_part_source));
 
@@ -315,7 +318,8 @@ public:
         }
 
         auto source = std::make_unique<MergeTreeSequentialSource>(
-            storage, storage_snapshot, data_part, columns_to_read, std::move(mark_ranges), apply_deleted_mask, false, true);
+            storage, storage_snapshot, data_part, columns_to_read,
+            std::move(mark_ranges), apply_deleted_mask, false, true);
 
         pipeline.init(Pipe(std::move(source)));
     }
@@ -343,7 +347,9 @@ void createMergeTreeSequentialSource(
     Poco::Logger * log)
 {
     auto reading = std::make_unique<ReadFromPart>(
-        storage, storage_snapshot, std::move(data_part), std::move(columns_to_read), apply_deleted_mask, filter, std::move(context), log);
+        storage, storage_snapshot, std::move(data_part),
+        std::move(columns_to_read), apply_deleted_mask,
+        filter, std::move(context), log);
 
     plan.addStep(std::move(reading));
 }
diff --git a/src/Storages/MergeTree/MergeTreeSettings.cpp b/src/Storages/MergeTree/MergeTreeSettings.cpp
index e951b8f54cf..479e50fdebb 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.cpp
+++ b/src/Storages/MergeTree/MergeTreeSettings.cpp
@@ -64,8 +64,7 @@ void MergeTreeSettings::loadFromQuery(ASTStorage & storage_def, ContextPtr conte
                         auto ast = dynamic_cast<const FieldFromASTImpl &>(custom.getImpl()).ast;
                         if (ast && isDiskFunction(ast))
                         {
-                            const auto & ast_function = assert_cast<const ASTFunction &>(*ast);
-                            auto disk_name = getOrCreateDiskFromDiskAST(ast_function, context);
+                            auto disk_name = getOrCreateDiskFromDiskAST(ast, context);
                             LOG_TRACE(&Poco::Logger::get("MergeTreeSettings"), "Created custom disk {}", disk_name);
                             value = disk_name;
                         }
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index 6d280f3aaec..5ea99009756 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -33,14 +33,11 @@ struct Settings;
     /** Data storing format settings. */ \
     M(UInt64, min_bytes_for_wide_part, 10485760, "Minimal uncompressed size in bytes to create part in wide format instead of compact", 0) \
     M(UInt64, min_rows_for_wide_part, 0, "Minimal number of rows to create part in wide format instead of compact", 0) \
-    M(UInt64, min_bytes_for_compact_part, 0, "Experimental. Minimal uncompressed size in bytes to create part in compact format instead of saving it in RAM", 0) \
-    M(UInt64, min_rows_for_compact_part, 0, "Experimental. Minimal number of rows to create part in compact format instead of saving it in RAM", 0) \
-    M(Bool, in_memory_parts_enable_wal, true, "Whether to write blocks in Native format to write-ahead-log before creation in-memory part", 0) \
-    M(UInt64, write_ahead_log_max_bytes, 1024 * 1024 * 1024, "Rotate WAL, if it exceeds that amount of bytes", 0) \
     M(Float, ratio_of_defaults_for_sparse_serialization, 1.0, "Minimal ratio of number of default values to number of all values in column to store it in sparse serializations. If >= 1, columns will be always written in full serialization.", 0) \
     \
     /** Merge settings. */ \
-    M(UInt64, merge_max_block_size, DEFAULT_MERGE_BLOCK_SIZE, "How many rows in blocks should be formed for merge operations.", 0) \
+    M(UInt64, merge_max_block_size, 8192, "How many rows in blocks should be formed for merge operations. By default has the same value as `index_granularity`.", 0) \
+    M(UInt64, merge_max_block_size_bytes, 10 * 1024 * 1024, "How many bytes in blocks should be formed for merge operations. By default has the same value as `index_granularity_bytes`.", 0) \
     M(UInt64, max_bytes_to_merge_at_max_space_in_pool, 150ULL * 1024 * 1024 * 1024, "Maximum in total size of parts to merge, when there are maximum free threads in background pool (or entries in replication queue).", 0) \
     M(UInt64, max_bytes_to_merge_at_min_space_in_pool, 1024 * 1024, "Maximum in total size of parts to merge, when there are minimum free threads in background pool (or entries in replication queue).", 0) \
     M(UInt64, max_replicated_merges_in_queue, 1000, "How many tasks of merging and mutating parts are allowed simultaneously in ReplicatedMergeTree queue.", 0) \
@@ -48,6 +45,7 @@ struct Settings;
     M(UInt64, max_replicated_merges_with_ttl_in_queue, 1, "How many tasks of merging parts with TTL are allowed simultaneously in ReplicatedMergeTree queue.", 0) \
     M(UInt64, number_of_free_entries_in_pool_to_lower_max_size_of_merge, 8, "When there is less than specified number of free entries in pool (or replicated queue), start to lower maximum size of merge to process (or to put in queue). This is to allow small merges to process - not filling the pool with long running merges.", 0) \
     M(UInt64, number_of_free_entries_in_pool_to_execute_mutation, 20, "When there is less than specified number of free entries in pool, do not execute part mutations. This is to leave free threads for regular merges and avoid \"Too many parts\"", 0) \
+    M(UInt64, max_number_of_mutations_for_replica, 0, "Limit the number of part mutations per replica to the specified amount. Zero means no limit on the number of mutations per replica (the execution can still be constrained by other settings).", 0) \
     M(UInt64, max_number_of_merges_with_ttl_in_pool, 2, "When there is more than specified number of merges with TTL entries in pool, do not assign new merge with TTL. This is to leave free threads for regular merges and avoid \"Too many parts\"", 0) \
     M(Seconds, old_parts_lifetime, 8 * 60, "How many seconds to keep obsolete parts.", 0) \
     M(Seconds, temporary_directories_lifetime, 86400, "How many seconds to keep tmp_-directories. You should not lower this value because merges and mutations may not be able to work with low value of this setting.", 0) \
@@ -57,9 +55,6 @@ struct Settings;
     M(UInt64, min_compressed_bytes_to_fsync_after_fetch, 0, "Minimal number of compressed bytes to do fsync for part after fetch (0 - disabled)", 0) \
     M(Bool, fsync_after_insert, false, "Do fsync for every inserted part. Significantly decreases performance of inserts, not recommended to use with wide parts.", 0) \
     M(Bool, fsync_part_directory, false, "Do fsync for part directory after all part operations (writes, renames, etc.).", 0) \
-    M(UInt64, write_ahead_log_bytes_to_fsync, 100ULL * 1024 * 1024, "Amount of bytes, accumulated in WAL to do fsync.", 0) \
-    M(UInt64, write_ahead_log_interval_ms_to_fsync, 100, "Interval in milliseconds after which fsync for WAL is being done.", 0) \
-    M(Bool, in_memory_parts_insert_sync, false, "If true insert of part with in-memory format will wait for fsync of WAL", 0) \
     M(UInt64, non_replicated_deduplication_window, 0, "How many last blocks of hashes should be kept on disk (0 - disabled).", 0) \
     M(UInt64, max_parts_to_merge_at_once, 100, "Max amount of parts which can be merged at once (0 - disabled). Doesn't affect OPTIMIZE FINAL query.", 0) \
     M(UInt64, merge_selecting_sleep_ms, 5000, "Sleep time for merge selecting when no part selected, a lower setting will trigger selecting tasks in background_schedule_pool frequently which result in large amount of requests to zookeeper in large-scale clusters", 0) \
@@ -71,6 +66,11 @@ struct Settings;
     M(UInt64, merge_tree_enable_clear_old_broken_detached, false, "Enable clearing old broken detached parts operation in background.", 0) \
     M(Bool, remove_rolled_back_parts_immediately, 1, "Setting for an incomplete experimental feature.", 0) \
     M(CleanDeletedRows, clean_deleted_rows, CleanDeletedRows::Never, "Is the Replicated Merge cleanup has to be done automatically at each merge or manually (possible values are 'Always'/'Never' (default))", 0) \
+    M(UInt64, replicated_max_mutations_in_one_entry, 10000, "Max number of mutation commands that can be merged together and executed in one MUTATE_PART entry (0 means unlimited)", 0) \
+    M(UInt64, number_of_mutations_to_delay, 0, "If table has at least that many unfinished mutations, artificially slow down mutations of table. Disabled if set to 0", 0) \
+    M(UInt64, number_of_mutations_to_throw, 0, "If table has at least that many unfinished mutations, throw 'Too many mutations' exception. Disabled if set to 0", 0) \
+    M(UInt64, min_delay_to_mutate_ms, 10, "Min delay of mutating MergeTree table in milliseconds, if there are a lot of unfinished mutations", 0) \
+    M(UInt64, max_delay_to_mutate_ms, 1000, "Max delay of mutating MergeTree table in milliseconds, if there are a lot of unfinished mutations", 0) \
     \
     /** Inserts settings. */ \
     M(UInt64, parts_to_delay_insert, 150, "If table contains at least that many active parts in single partition, artificially slow down insert into table. Disabled if set to 0", 0) \
@@ -81,6 +81,7 @@ struct Settings;
     M(UInt64, max_delay_to_insert, 1, "Max delay of inserting data into MergeTree table in seconds, if there are a lot of unmerged parts in single partition.", 0) \
     M(UInt64, min_delay_to_insert_ms, 10, "Min delay of inserting data into MergeTree table in milliseconds, if there are a lot of unmerged parts in single partition.", 0) \
     M(UInt64, max_parts_in_total, 100000, "If more than this number active parts in all partitions in total, throw 'Too many parts ...' exception.", 0) \
+    M(Bool, async_insert, false, "If true, data from INSERT query is stored in queue and later flushed to table in background.", 0) \
     \
     /* Part removal settings. */ \
     M(UInt64, simultaneous_parts_removal_limit, 0, "Maximum number of parts to remove during one CleanupThread iteration (0 means unlimited).", 0) \
@@ -124,10 +125,12 @@ struct Settings;
     M(UInt64, min_relative_delay_to_close, 300, "Minimal delay from other replicas to close, stop serving requests and not return Ok during status check.", 0) \
     M(UInt64, min_absolute_delay_to_close, 0, "Minimal absolute delay to close, stop serving requests and not return Ok during status check.", 0) \
     M(UInt64, enable_vertical_merge_algorithm, 1, "Enable usage of Vertical merge algorithm.", 0) \
-    M(UInt64, vertical_merge_algorithm_min_rows_to_activate, 16 * DEFAULT_MERGE_BLOCK_SIZE, "Minimal (approximate) sum of rows in merging parts to activate Vertical merge algorithm.", 0) \
+    M(UInt64, vertical_merge_algorithm_min_rows_to_activate, 16 * 8192, "Minimal (approximate) sum of rows in merging parts to activate Vertical merge algorithm.", 0) \
+    M(UInt64, vertical_merge_algorithm_min_bytes_to_activate, 0, "Minimal (approximate) uncompressed size in bytes in merging parts to activate Vertical merge algorithm.", 0) \
     M(UInt64, vertical_merge_algorithm_min_columns_to_activate, 11, "Minimal amount of non-PK columns to activate Vertical merge algorithm.", 0) \
     \
     /** Compatibility settings */ \
+    M(Bool, allow_suspicious_indices, false, "Reject primary/secondary indexes and sorting keys with identical expressions", 0) \
     M(Bool, compatibility_allow_sampling_expression_not_in_primary_key, false, "Allow to create a table with sampling expression not in primary key. This is needed only to temporarily allow to run the server with wrong tables for backward compatibility.", 0) \
     M(Bool, use_minimalistic_checksums_in_zookeeper, true, "Use small format (dozens bytes) for part checksums in ZooKeeper instead of ordinary ones (dozens KB). Before enabling check that all replicas support new format.", 0) \
     M(Bool, use_minimalistic_part_header_in_zookeeper, true, "Store part header (checksums and columns) in a compact format and a single part znode instead of separate znodes (<part>/columns and <part>/checksums). This can dramatically reduce snapshot size in ZooKeeper. Before enabling check that all replicas support new format.", 0) \
@@ -143,6 +146,8 @@ struct Settings;
     M(MaxThreads, max_part_loading_threads, 0, "The number of threads to load data parts at startup.", 0) \
     M(MaxThreads, max_part_removal_threads, 0, "The number of threads for concurrent removal of inactive data parts. One is usually enough, but in 'Google Compute Environment SSD Persistent Disks' file removal (unlink) operation is extraordinarily slow and you probably have to increase this number (recommended is up to 16).", 0) \
     M(UInt64, concurrent_part_removal_threshold, 100, "Activate concurrent part removal (see 'max_part_removal_threads') only if the number of inactive data parts is at least this.", 0) \
+    M(UInt64, zero_copy_concurrent_part_removal_max_split_times, 5, "Max recursion depth for splitting independent Outdated parts ranges into smaller subranges (highly not recommended to change)", 0) \
+    M(Float, zero_copy_concurrent_part_removal_max_postpone_ratio, static_cast<Float32>(0.05), "Max percentage of top level parts to postpone removal in order to get smaller independent ranges (highly not recommended to change)", 0) \
     M(String, storage_policy, "default", "Name of storage disk policy", 0) \
     M(String, disk, "", "Name of storage disk. Can be specified instead of storage policy.", 0) \
     M(Bool, allow_nullable_key, false, "Allow Nullable types as primary keys.", 0) \
@@ -154,6 +159,7 @@ struct Settings;
     M(UInt64, min_bytes_to_rebalance_partition_over_jbod, 0, "Minimal amount of bytes to enable part rebalance over JBOD array (0 - disabled).", 0) \
     M(Bool, check_sample_column_is_correct, true, "Check columns or columns by hash for sampling are unsigned integer.", 0) \
     M(Bool, allow_vertical_merges_from_compact_to_wide_parts, false, "Allows vertical merges from compact to wide parts. This settings must have the same value on all replicas", 0) \
+    M(Bool, enable_the_endpoint_id_with_zookeeper_name_prefix, false, "Enable the endpoint id with zookeeper name prefix for the replicated merge tree table", 0) \
     \
     /** Experimental/work in progress feature. Unsafe for production. */ \
     M(UInt64, part_moves_between_shards_enable, 0, "Experimental/Incomplete feature to move parts between shards. Does not take into account sharding expressions.", 0) \
@@ -163,8 +169,8 @@ struct Settings;
     M(String, remote_fs_zero_copy_zookeeper_path, "/clickhouse/zero_copy", "ZooKeeper path for Zero-copy table-independet info.", 0) \
     M(Bool, remote_fs_zero_copy_path_compatible_mode, false, "Run zero-copy in compatible mode during conversion process.", 0) \
     /** Compress marks and primary key. */ \
-    M(Bool, compress_marks, false, "Marks support compression, reduce mark file size and speed up network transmission.", 0) \
-    M(Bool, compress_primary_key, false, "Primary key support compression, reduce primary key file size and speed up network transmission.", 0) \
+    M(Bool, compress_marks, true, "Marks support compression, reduce mark file size and speed up network transmission.", 0) \
+    M(Bool, compress_primary_key, true, "Primary key support compression, reduce primary key file size and speed up network transmission.", 0) \
     M(String, marks_compression_codec, "ZSTD(3)", "Compression encoding used by marks, marks are small enough and cached, so the default compression is ZSTD(3).", 0) \
     M(String, primary_key_compression_codec, "ZSTD(3)", "Compression encoding used by primary, primary key is small enough and cached, so the default compression is ZSTD(3).", 0) \
     M(UInt64, marks_compress_block_size, 65536, "Mark compress block size, the actual size of the block to compress.", 0) \
@@ -178,7 +184,14 @@ struct Settings;
     M(UInt64, replicated_max_parallel_sends_for_table, 0, "Obsolete setting, does nothing.", 0) \
     M(UInt64, replicated_max_parallel_fetches, 0, "Obsolete setting, does nothing.", 0) \
     M(UInt64, replicated_max_parallel_fetches_for_table, 0, "Obsolete setting, does nothing.", 0) \
-    M(Bool, write_final_mark, true, "Obsolete setting, does nothing.", 0) \
+    M(Bool, write_final_mark, true, "Obsolete setting, does nothing.", 0)                                                                                                                                                                                            \
+    M(UInt64, min_bytes_for_compact_part, 0, "Obsolete setting, does nothing.", 0) \
+    M(UInt64, min_rows_for_compact_part, 0, "Obsolete setting, does nothing.", 0) \
+    M(Bool, in_memory_parts_enable_wal, true, "Obsolete setting, does nothing.", 0) \
+    M(UInt64, write_ahead_log_max_bytes, 1024 * 1024 * 1024, "Obsolete setting, does nothing.", 0) \
+    M(UInt64, write_ahead_log_bytes_to_fsync, 100ULL * 1024 * 1024, "Obsolete setting, does nothing.", 0) \
+    M(UInt64, write_ahead_log_interval_ms_to_fsync, 100, "Obsolete setting, does nothing.", 0) \
+    M(Bool, in_memory_parts_insert_sync, false, "Obsolete setting, does nothing.", 0) \
     /// Settings that should not change after the creation of a table.
     /// NOLINTNEXTLINE
 #define APPLY_FOR_IMMUTABLE_MERGE_TREE_SETTINGS(M) \
@@ -206,8 +219,7 @@ struct MergeTreeSettings : public BaseSettings<MergeTreeSettingsTraits>
 
     static bool isPartFormatSetting(const String & name)
     {
-        return name == "min_bytes_for_wide_part" || name == "min_rows_for_wide_part"
-            || name == "min_bytes_for_compact_part" || name == "min_rows_for_compact_part";
+        return name == "min_bytes_for_wide_part" || name == "min_rows_for_wide_part";
     }
 
     /// Check that the values are sane taking also query-level settings into account.
diff --git a/src/Storages/MergeTree/MergeTreeSink.cpp b/src/Storages/MergeTree/MergeTreeSink.cpp
index 1e607767f86..d62fe5024f4 100644
--- a/src/Storages/MergeTree/MergeTreeSink.cpp
+++ b/src/Storages/MergeTree/MergeTreeSink.cpp
@@ -13,6 +13,20 @@ namespace ProfileEvents
 namespace DB
 {
 
+struct MergeTreeSink::DelayedChunk
+{
+    struct Partition
+    {
+        MergeTreeDataWriter::TemporaryPart temp_part;
+        UInt64 elapsed_ns;
+        String block_dedup_token;
+        ProfileEvents::Counters part_counters;
+    };
+
+    std::vector<Partition> partitions;
+};
+
+
 MergeTreeSink::~MergeTreeSink() = default;
 
 MergeTreeSink::MergeTreeSink(
@@ -25,7 +39,7 @@ MergeTreeSink::MergeTreeSink(
     , metadata_snapshot(metadata_snapshot_)
     , max_parts_per_block(max_parts_per_block_)
     , context(context_)
-    , storage_snapshot(storage.getStorageSnapshotWithoutParts(metadata_snapshot))
+    , storage_snapshot(storage.getStorageSnapshotWithoutData(metadata_snapshot, context_))
 {
 }
 
@@ -41,20 +55,6 @@ void MergeTreeSink::onFinish()
     finishDelayedChunk();
 }
 
-struct MergeTreeSink::DelayedChunk
-{
-    struct Partition
-    {
-        MergeTreeDataWriter::TemporaryPart temp_part;
-        UInt64 elapsed_ns;
-        String block_dedup_token;
-        ProfileEvents::Counters part_counters;
-    };
-
-    std::vector<Partition> partitions;
-};
-
-
 void MergeTreeSink::consume(Chunk chunk)
 {
     auto block = getHeader().cloneWithColumns(chunk.detachColumns());
diff --git a/src/Storages/MergeTree/MergeTreeSource.cpp b/src/Storages/MergeTree/MergeTreeSource.cpp
index a37d1d3ec2c..53695639769 100644
--- a/src/Storages/MergeTree/MergeTreeSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSource.cpp
@@ -1,34 +1,12 @@
 #include <Storages/MergeTree/MergeTreeSource.h>
 #include <Storages/MergeTree/MergeTreeBaseSelectProcessor.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
-#include <IO/IOThreadPool.h>
+#include <IO/SharedThreadPools.h>
 #include <Common/EventFD.h>
 
 namespace DB
 {
 
-MergeTreeSource::MergeTreeSource(MergeTreeSelectAlgorithmPtr algorithm_)
-    : ISource(algorithm_->getHeader())
-    , algorithm(std::move(algorithm_))
-{
-#if defined(OS_LINUX)
-    if (algorithm->getSettings().use_asynchronous_read_from_pool)
-        async_reading_state = std::make_unique<AsyncReadingState>();
-#endif
-}
-
-MergeTreeSource::~MergeTreeSource() = default;
-
-std::string MergeTreeSource::getName() const
-{
-    return algorithm->getName();
-}
-
-void MergeTreeSource::onCancel()
-{
-    algorithm->cancel();
-}
-
 #if defined(OS_LINUX)
 struct MergeTreeSource::AsyncReadingState
 {
@@ -106,7 +84,7 @@ struct MergeTreeSource::AsyncReadingState
     {
         try
         {
-            callback_runner(std::move(job), 0);
+            callback_runner(std::move(job), Priority{});
         }
         catch (...)
         {
@@ -155,6 +133,28 @@ private:
 };
 #endif
 
+MergeTreeSource::MergeTreeSource(MergeTreeSelectAlgorithmPtr algorithm_)
+    : ISource(algorithm_->getHeader())
+    , algorithm(std::move(algorithm_))
+{
+#if defined(OS_LINUX)
+    if (algorithm->getSettings().use_asynchronous_read_from_pool)
+        async_reading_state = std::make_unique<AsyncReadingState>();
+#endif
+}
+
+MergeTreeSource::~MergeTreeSource() = default;
+
+std::string MergeTreeSource::getName() const
+{
+    return algorithm->getName();
+}
+
+void MergeTreeSource::onCancel()
+{
+    algorithm->cancel();
+}
+
 ISource::Status MergeTreeSource::prepare()
 {
 #if defined(OS_LINUX)
diff --git a/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp b/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp
index 533875d80cd..7ca8983bfda 100644
--- a/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp
+++ b/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp
@@ -93,7 +93,13 @@ const ActionsDAG::Node & addClonedDAGToDAG(const ActionsDAG::Node * original_dag
         return new_node;
     }
 
-    /// TODO: Do we need to handle ALIAS nodes in cloning?
+    if (original_dag_node->type == ActionsDAG::ActionType::ALIAS)
+    {
+        const auto & alias_child = addClonedDAGToDAG(original_dag_node->children[0], new_dag, node_remap);
+        const auto & new_node = new_dag->addAlias(alias_child, original_dag_node->result_name);
+        node_remap[node_name] = {new_dag, &new_node};
+        return new_node;
+    }
 
     /// If the node is a function, add it as a function and add its children
     if (original_dag_node->type == ActionsDAG::ActionType::FUNCTION)
@@ -324,15 +330,20 @@ bool tryBuildPrewhereSteps(PrewhereInfoPtr prewhere_info, const ExpressionAction
     {
         for (const auto & step : steps)
         {
-            prewhere.steps.push_back(
+            PrewhereExprStep new_step
             {
+                .type = PrewhereExprStep::Filter,
                 .actions = std::make_shared<ExpressionActions>(step.actions, actions_settings),
-                .column_name = step.column_name,
-                .remove_column = !all_output_names.contains(step.column_name), /// Don't remove if it's in the list of original outputs
+                .filter_column_name = step.column_name,
+                .remove_filter_column = !all_output_names.contains(step.column_name), /// Don't remove if it's in the list of original outputs
                 .need_filter = false,
-            });
+                .perform_alter_conversions = true,
+            };
+
+            prewhere.steps.push_back(std::make_shared<PrewhereExprStep>(std::move(new_step)));
         }
-        prewhere.steps.back().need_filter = prewhere_info->need_filter;
+
+        prewhere.steps.back()->need_filter = prewhere_info->need_filter;
     }
 
     return true;
diff --git a/src/Storages/MergeTree/MergeTreeThreadSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeThreadSelectProcessor.cpp
index 5c46c906b31..01094d65ac5 100644
--- a/src/Storages/MergeTree/MergeTreeThreadSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeThreadSelectProcessor.cpp
@@ -57,9 +57,7 @@ void MergeTreeThreadSelectAlgorithm::finalizeNewTask()
     /// task->reader.valid() means there is a prefetched reader in this test, use it.
     const bool init_new_readers = !reader || task->reader.valid() || part_name != last_read_part_name;
     if (init_new_readers)
-    {
         initializeMergeTreeReadersForCurrentTask(metadata_snapshot, value_size_map, profile_callback);
-    }
 
     last_read_part_name = part_name;
 }
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index 3a866cc8934..25a4579c73e 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -12,36 +12,31 @@
 #include <Interpreters/misc.h>
 #include <Common/typeid_cast.h>
 #include <DataTypes/NestedUtils.h>
+#include <Interpreters/ActionsDAG.h>
 #include <base/map.h>
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-}
-
 /// Conditions like "x = N" are considered good if abs(N) > threshold.
 /// This is used to assume that condition is likely to have good selectivity.
 static constexpr auto threshold = 2;
 
 
 MergeTreeWhereOptimizer::MergeTreeWhereOptimizer(
-    SelectQueryInfo & query_info,
-    ContextPtr context,
     std::unordered_map<std::string, UInt64> column_sizes_,
     const StorageMetadataPtr & metadata_snapshot,
     const Names & queried_columns_,
+    const std::optional<NameSet> & supported_columns_,
     Poco::Logger * log_)
     : table_columns{collections::map<std::unordered_set>(
         metadata_snapshot->getColumns().getAllPhysical(), [](const NameAndTypePair & col) { return col.name; })}
     , queried_columns{queried_columns_}
+    , supported_columns{supported_columns_}
     , sorting_key_names{NameSet(
           metadata_snapshot->getSortingKey().column_names.begin(), metadata_snapshot->getSortingKey().column_names.end())}
-    , block_with_constants{KeyCondition::getBlockWithConstants(query_info.query->clone(), query_info.syntax_analyzer_result, context)}
     , log{log_}
     , column_sizes{std::move(column_sizes_)}
-    , move_all_conditions_to_prewhere(context->getSettingsRef().move_all_conditions_to_prewhere)
 {
     for (const auto & name : queried_columns)
     {
@@ -49,178 +44,214 @@ MergeTreeWhereOptimizer::MergeTreeWhereOptimizer(
         if (it != column_sizes.end())
             total_size_of_queried_columns += it->second;
     }
-
-    determineArrayJoinedNames(query_info.query->as<ASTSelectQuery &>());
-    optimize(query_info.query->as<ASTSelectQuery &>());
 }
 
-
-static void collectIdentifiersNoSubqueries(const ASTPtr & ast, NameSet & set)
+void MergeTreeWhereOptimizer::optimize(SelectQueryInfo & select_query_info, const ContextPtr & context) const
 {
-    if (auto opt_name = tryGetIdentifierName(ast))
-        return (void)set.insert(*opt_name);
-
-    if (ast->as<ASTSubquery>())
+    auto & select = select_query_info.query->as<ASTSelectQuery &>();
+    if (!select.where() || select.prewhere())
         return;
 
-    for (const auto & child : ast->children)
-        collectIdentifiersNoSubqueries(child, set);
+    auto block_with_constants = KeyCondition::getBlockWithConstants(select_query_info.query->clone(),
+        select_query_info.syntax_analyzer_result,
+        context);
+
+    WhereOptimizerContext where_optimizer_context;
+    where_optimizer_context.context = context;
+    where_optimizer_context.array_joined_names = determineArrayJoinedNames(select);
+    where_optimizer_context.move_all_conditions_to_prewhere = context->getSettingsRef().move_all_conditions_to_prewhere;
+    where_optimizer_context.is_final = select.final();
+
+    RPNBuilderTreeContext tree_context(context, std::move(block_with_constants), {} /*prepared_sets*/);
+    RPNBuilderTreeNode node(select.where().get(), tree_context);
+    auto optimize_result = optimizeImpl(node, where_optimizer_context);
+    if (!optimize_result)
+        return;
+
+    /// Rewrite the SELECT query.
+
+    auto where_filter_ast = reconstructAST(optimize_result->where_conditions);
+    auto prewhere_filter_ast = reconstructAST(optimize_result->prewhere_conditions);
+
+    select.setExpression(ASTSelectQuery::Expression::WHERE, std::move(where_filter_ast));
+    select.setExpression(ASTSelectQuery::Expression::PREWHERE, std::move(prewhere_filter_ast));
+
+    UInt64 log_queries_cut_to_length = context->getSettingsRef().log_queries_cut_to_length;
+    LOG_DEBUG(log, "MergeTreeWhereOptimizer: condition \"{}\" moved to PREWHERE", select.prewhere()->formatForLogging(log_queries_cut_to_length));
 }
 
-static bool isConditionGood(const ASTPtr & condition)
+std::optional<MergeTreeWhereOptimizer::FilterActionsOptimizeResult> MergeTreeWhereOptimizer::optimize(const ActionsDAGPtr & filter_dag,
+    const std::string & filter_column_name,
+    const ContextPtr & context,
+    bool is_final)
 {
-    const auto * function = condition->as<ASTFunction>();
-    if (!function)
-        return false;
+    WhereOptimizerContext where_optimizer_context;
+    where_optimizer_context.context = context;
+    where_optimizer_context.array_joined_names = {};
+    where_optimizer_context.move_all_conditions_to_prewhere = context->getSettingsRef().move_all_conditions_to_prewhere;
+    where_optimizer_context.is_final = is_final;
 
-    /** we are only considering conditions of form `equals(one, another)` or `one = another`,
-        * especially if either `one` or `another` is ASTIdentifier */
-    if (function->name != "equals")
-        return false;
+    RPNBuilderTreeContext tree_context(context);
+    RPNBuilderTreeNode node(&filter_dag->findInOutputs(filter_column_name), tree_context);
 
-    auto * left_arg = function->arguments->children.front().get();
-    auto * right_arg = function->arguments->children.back().get();
+    auto optimize_result = optimizeImpl(node, where_optimizer_context);
+    if (!optimize_result)
+        return {};
 
-    /// try to ensure left_arg points to ASTIdentifier
-    if (!left_arg->as<ASTIdentifier>() && right_arg->as<ASTIdentifier>())
-        std::swap(left_arg, right_arg);
+    auto filter_actions = reconstructDAG(optimize_result->where_conditions, context);
+    auto prewhere_filter_actions = reconstructDAG(optimize_result->prewhere_conditions, context);
 
-    if (left_arg->as<ASTIdentifier>())
+    FilterActionsOptimizeResult result = { std::move(filter_actions), std::move(prewhere_filter_actions) };
+    return result;
+}
+
+static void collectColumns(const RPNBuilderTreeNode & node, const NameSet & columns_names, NameSet & result_set, bool & has_invalid_column)
+{
+    if (node.isConstant())
+        return;
+
+    if (!node.isFunction())
     {
-        /// condition may be "good" if only right_arg is a constant and its value is outside the threshold
-        if (const auto * literal = right_arg->as<ASTLiteral>())
+        auto column_name = node.getColumnName();
+        if (!columns_names.contains(column_name))
         {
-            const auto & field = literal->value;
-            const auto type = field.getType();
-
-            /// check the value with respect to threshold
-            if (type == Field::Types::UInt64)
-            {
-                const auto value = field.get<UInt64>();
-                return value > threshold;
-            }
-            else if (type == Field::Types::Int64)
-            {
-                const auto value = field.get<Int64>();
-                return value < -threshold || threshold < value;
-            }
-            else if (type == Field::Types::Float64)
-            {
-                const auto value = field.get<Float64>();
-                return value < threshold || threshold < value;
-            }
+            has_invalid_column = true;
+            return;
         }
+
+        result_set.insert(column_name);
+        return;
+    }
+
+    auto function_node = node.toFunctionNode();
+    size_t arguments_size = function_node.getArgumentsSize();
+    for (size_t i = 0; i < arguments_size; ++i)
+    {
+        auto function_argument = function_node.getArgumentAt(i);
+        collectColumns(function_argument, columns_names, result_set, has_invalid_column);
+    }
+}
+
+static bool isConditionGood(const RPNBuilderTreeNode & condition, const NameSet & columns_names)
+{
+    if (!condition.isFunction())
+        return false;
+
+    auto function_node = condition.toFunctionNode();
+
+    /** We are only considering conditions of form `equals(one, another)` or `one = another`,
+      * especially if either `one` or `another` is ASTIdentifier
+      */
+    if (function_node.getFunctionName() != "equals" || function_node.getArgumentsSize() != 2)
+        return false;
+
+    auto lhs_argument = function_node.getArgumentAt(0);
+    auto rhs_argument = function_node.getArgumentAt(1);
+
+    auto lhs_argument_column_name = lhs_argument.getColumnName();
+    auto rhs_argument_column_name = rhs_argument.getColumnName();
+
+    bool lhs_argument_is_column = columns_names.contains(lhs_argument_column_name);
+    bool rhs_argument_is_column = columns_names.contains(rhs_argument_column_name);
+
+    bool lhs_argument_is_constant = lhs_argument.isConstant();
+    bool rhs_argument_is_constant = rhs_argument.isConstant();
+
+    RPNBuilderTreeNode * constant_node = nullptr;
+
+    if (lhs_argument_is_column && rhs_argument_is_constant)
+        constant_node = &rhs_argument;
+    else if (lhs_argument_is_constant && rhs_argument_is_column)
+        constant_node = &lhs_argument;
+    else
+        return false;
+
+    Field output_value;
+    DataTypePtr output_type;
+    if (!constant_node->tryGetConstant(output_value, output_type))
+        return false;
+
+    const auto type = output_value.getType();
+
+    /// check the value with respect to threshold
+    if (type == Field::Types::UInt64)
+    {
+        const auto value = output_value.get<UInt64>();
+        return value > threshold;
+    }
+    else if (type == Field::Types::Int64)
+    {
+        const auto value = output_value.get<Int64>();
+        return value < -threshold || threshold < value;
+    }
+    else if (type == Field::Types::Float64)
+    {
+        const auto value = output_value.get<Float64>();
+        return value < threshold || threshold < value;
     }
 
     return false;
 }
 
-static const ASTFunction * getAsTuple(const ASTPtr & node)
+void MergeTreeWhereOptimizer::analyzeImpl(Conditions & res, const RPNBuilderTreeNode & node, const WhereOptimizerContext & where_optimizer_context) const
 {
-    if (const auto * func = node->as<ASTFunction>(); func && func->name == "tuple")
-        return func;
-    return {};
-}
+    auto function_node_optional = node.toFunctionNodeOrNull();
 
-static bool getAsTupleLiteral(const ASTPtr & node, Tuple & tuple)
-{
-    if (const auto * value_tuple = node->as<ASTLiteral>())
-        return value_tuple && value_tuple->value.tryGet<Tuple>(tuple);
-    return false;
-}
-
-bool MergeTreeWhereOptimizer::tryAnalyzeTuple(Conditions & res, const ASTFunction * func, bool is_final) const
-{
-    if (!func || func->name != "equals" || func->arguments->children.size() != 2)
-        return false;
-
-    Tuple tuple_lit;
-    const ASTFunction * tuple_other = nullptr;
-    if (getAsTupleLiteral(func->arguments->children[0], tuple_lit))
-        tuple_other = getAsTuple(func->arguments->children[1]);
-    else if (getAsTupleLiteral(func->arguments->children[1], tuple_lit))
-        tuple_other = getAsTuple(func->arguments->children[0]);
-
-    if (!tuple_other || tuple_lit.size() != tuple_other->arguments->children.size())
-        return false;
-
-    for (size_t i = 0; i < tuple_lit.size(); ++i)
+    if (function_node_optional.has_value() && function_node_optional->getFunctionName() == "and")
     {
-        const auto & child = tuple_other->arguments->children[i];
-        std::shared_ptr<IAST> fetch_sign_column = nullptr;
-        /// tuple in tuple like (a, (b, c)) = (1, (2, 3))
-        if (const auto * child_func = getAsTuple(child))
-            fetch_sign_column = std::make_shared<ASTFunction>(*child_func);
-        else if (const auto * child_ident = child->as<ASTIdentifier>())
-            fetch_sign_column = std::make_shared<ASTIdentifier>(child_ident->name());
-        else
-            return false;
+        size_t arguments_size = function_node_optional->getArgumentsSize();
 
-        ASTPtr fetch_sign_value = std::make_shared<ASTLiteral>(tuple_lit.at(i));
-        ASTPtr func_node = makeASTFunction("equals", fetch_sign_column, fetch_sign_value);
-        analyzeImpl(res, func_node, is_final);
-    }
-
-    return true;
-}
-
-void MergeTreeWhereOptimizer::analyzeImpl(Conditions & res, const ASTPtr & node, bool is_final) const
-{
-    const auto * func = node->as<ASTFunction>();
-
-    if (func && func->name == "and")
-    {
-        for (const auto & elem : func->arguments->children)
-            analyzeImpl(res, elem, is_final);
-    }
-    else if (tryAnalyzeTuple(res, func, is_final))
-    {
-        /// analyzed
+        for (size_t i = 0; i < arguments_size; ++i)
+        {
+            auto argument = function_node_optional->getArgumentAt(i);
+            analyzeImpl(res, argument, where_optimizer_context);
+        }
     }
     else
     {
-        Condition cond;
-        cond.node = node;
+        Condition cond(node);
+        bool has_invalid_column = false;
+        collectColumns(node, table_columns, cond.table_columns, has_invalid_column);
 
-        collectIdentifiersNoSubqueries(node, cond.identifiers);
-
-        cond.columns_size = getIdentifiersColumnSize(cond.identifiers);
+        cond.columns_size = getColumnsSize(cond.table_columns);
 
         cond.viable =
+            !has_invalid_column &&
             /// Condition depend on some column. Constant expressions are not moved.
-            !cond.identifiers.empty()
-            && !cannotBeMoved(node, is_final)
+            !cond.table_columns.empty()
+            && !cannotBeMoved(node, where_optimizer_context)
             /// When use final, do not take into consideration the conditions with non-sorting keys. Because final select
             /// need to use all sorting keys, it will cause correctness issues if we filter other columns before final merge.
-            && (!is_final || isExpressionOverSortingKey(node))
-            /// Only table columns are considered. Not array joined columns. NOTE We're assuming that aliases was expanded.
-            && isSubsetOfTableColumns(cond.identifiers)
+            && (!where_optimizer_context.is_final || isExpressionOverSortingKey(node))
+            /// Some identifiers can unable to support PREWHERE (usually because of different types in Merge engine)
+            && columnsSupportPrewhere(cond.table_columns)
             /// Do not move conditions involving all queried columns.
-            && cond.identifiers.size() < queried_columns.size();
+            && cond.table_columns.size() < queried_columns.size();
 
         if (cond.viable)
-            cond.good = isConditionGood(node);
+            cond.good = isConditionGood(node, table_columns);
 
         res.emplace_back(std::move(cond));
     }
 }
 
 /// Transform conjunctions chain in WHERE expression to Conditions list.
-MergeTreeWhereOptimizer::Conditions MergeTreeWhereOptimizer::analyze(const ASTPtr & expression, bool is_final) const
+MergeTreeWhereOptimizer::Conditions MergeTreeWhereOptimizer::analyze(const RPNBuilderTreeNode & node,
+    const WhereOptimizerContext & where_optimizer_context) const
 {
     Conditions res;
-    analyzeImpl(res, expression, is_final);
+    analyzeImpl(res, node, where_optimizer_context);
     return res;
 }
 
 /// Transform Conditions list to WHERE or PREWHERE expression.
-ASTPtr MergeTreeWhereOptimizer::reconstruct(const Conditions & conditions)
+ASTPtr MergeTreeWhereOptimizer::reconstructAST(const Conditions & conditions)
 {
     if (conditions.empty())
         return {};
 
     if (conditions.size() == 1)
-        return conditions.front().node;
+        return conditions.front().node.getASTNode()->clone();
 
     const auto function = std::make_shared<ASTFunction>();
 
@@ -229,18 +260,29 @@ ASTPtr MergeTreeWhereOptimizer::reconstruct(const Conditions & conditions)
     function->children.push_back(function->arguments);
 
     for (const auto & elem : conditions)
-        function->arguments->children.push_back(elem.node);
+        function->arguments->children.push_back(elem.node.getASTNode()->clone());
 
     return function;
 }
 
-
-void MergeTreeWhereOptimizer::optimize(ASTSelectQuery & select) const
+ActionsDAGPtr MergeTreeWhereOptimizer::reconstructDAG(const Conditions & conditions, const ContextPtr & context)
 {
-    if (!select.where() || select.prewhere())
-        return;
+    if (conditions.empty())
+        return {};
 
-    Conditions where_conditions = analyze(select.where(), select.final());
+    ActionsDAG::NodeRawConstPtrs filter_nodes;
+    filter_nodes.reserve(conditions.size());
+
+    for (const auto & condition : conditions)
+        filter_nodes.push_back(condition.node.getDAGNode());
+
+    return ActionsDAG::buildFilterActionsDAG(filter_nodes, {} /*node_name_to_input_node_column*/, context);
+}
+
+std::optional<MergeTreeWhereOptimizer::OptimizeResult> MergeTreeWhereOptimizer::optimizeImpl(const RPNBuilderTreeNode & node,
+    const WhereOptimizerContext & where_optimizer_context) const
+{
+    Conditions where_conditions = analyze(node, where_optimizer_context);
     Conditions prewhere_conditions;
 
     UInt64 total_size_of_moved_conditions = 0;
@@ -251,12 +293,12 @@ void MergeTreeWhereOptimizer::optimize(ASTSelectQuery & select) const
     {
         prewhere_conditions.splice(prewhere_conditions.end(), where_conditions, cond_it);
         total_size_of_moved_conditions += cond_it->columns_size;
-        total_number_of_moved_columns += cond_it->identifiers.size();
+        total_number_of_moved_columns += cond_it->table_columns.size();
 
         /// Move all other viable conditions that depend on the same set of columns.
         for (auto jt = where_conditions.begin(); jt != where_conditions.end();)
         {
-            if (jt->viable && jt->columns_size == cond_it->columns_size && jt->identifiers == cond_it->identifiers)
+            if (jt->viable && jt->columns_size == cond_it->columns_size && jt->table_columns == cond_it->table_columns)
                 prewhere_conditions.splice(prewhere_conditions.end(), where_conditions, jt++);
             else
                 ++jt;
@@ -273,7 +315,7 @@ void MergeTreeWhereOptimizer::optimize(ASTSelectQuery & select) const
         if (!it->viable)
             break;
 
-        if (!move_all_conditions_to_prewhere)
+        if (!where_optimizer_context.move_all_conditions_to_prewhere)
         {
             bool moved_enough = false;
             if (total_size_of_queried_columns > 0)
@@ -287,7 +329,7 @@ void MergeTreeWhereOptimizer::optimize(ASTSelectQuery & select) const
                 /// Otherwise, use number of moved columns as a fallback.
                 /// It can happen, if table has only compact parts. 25% ratio is just a guess.
                 moved_enough = total_number_of_moved_columns > 0
-                    && (total_number_of_moved_columns + it->identifiers.size()) * 4 > queried_columns.size();
+                    && (total_number_of_moved_columns + it->table_columns.size()) * 4 > queried_columns.size();
             }
 
             if (moved_enough)
@@ -299,117 +341,130 @@ void MergeTreeWhereOptimizer::optimize(ASTSelectQuery & select) const
 
     /// Nothing was moved.
     if (prewhere_conditions.empty())
-        return;
+        return {};
 
-    /// Rewrite the SELECT query.
-
-    select.setExpression(ASTSelectQuery::Expression::WHERE, reconstruct(where_conditions));
-    select.setExpression(ASTSelectQuery::Expression::PREWHERE, reconstruct(prewhere_conditions));
-
-    LOG_DEBUG(log, "MergeTreeWhereOptimizer: condition \"{}\" moved to PREWHERE", select.prewhere());
+    OptimizeResult result = {std::move(where_conditions), std::move(prewhere_conditions)};
+    return result;
 }
 
 
-UInt64 MergeTreeWhereOptimizer::getIdentifiersColumnSize(const NameSet & identifiers) const
+UInt64 MergeTreeWhereOptimizer::getColumnsSize(const NameSet & columns) const
 {
     UInt64 size = 0;
 
-    for (const auto & identifier : identifiers)
-        if (column_sizes.contains(identifier))
-            size += column_sizes.at(identifier);
+    for (const auto & column : columns)
+        if (column_sizes.contains(column))
+            size += column_sizes.at(column);
 
     return size;
 }
 
-bool MergeTreeWhereOptimizer::isExpressionOverSortingKey(const ASTPtr & ast) const
+bool MergeTreeWhereOptimizer::columnsSupportPrewhere(const NameSet & columns) const
 {
-    if (const auto * func = ast->as<ASTFunction>())
+    if (!supported_columns.has_value())
+        return true;
+
+    for (const auto & column : columns)
+        if (!supported_columns->contains(column))
+            return false;
+
+    return true;
+}
+
+bool MergeTreeWhereOptimizer::isExpressionOverSortingKey(const RPNBuilderTreeNode & node) const
+{
+    if (node.isFunction())
     {
-        const auto & args = func->arguments->children;
-        for (const auto & arg : args)
+        auto function_node = node.toFunctionNode();
+        size_t arguments_size = function_node.getArgumentsSize();
+
+        for (size_t i = 0; i < arguments_size; ++i)
         {
-            if (isConstant(ast) || sorting_key_names.contains(arg->getColumnName()))
+            auto argument = function_node.getArgumentAt(i);
+            auto argument_column_name = argument.getColumnName();
+
+            if (argument.isConstant() || sorting_key_names.contains(argument_column_name))
                 continue;
-            if (!isExpressionOverSortingKey(arg))
+
+            if (!isExpressionOverSortingKey(argument))
                 return false;
         }
+
         return true;
     }
 
-    return isConstant(ast) || sorting_key_names.contains(ast->getColumnName());
+    return node.isConstant() || sorting_key_names.contains(node.getColumnName());
 }
 
-
 bool MergeTreeWhereOptimizer::isSortingKey(const String & column_name) const
 {
     return sorting_key_names.contains(column_name);
 }
 
-
-bool MergeTreeWhereOptimizer::isConstant(const ASTPtr & expr) const
+bool MergeTreeWhereOptimizer::isSubsetOfTableColumns(const NameSet & columns) const
 {
-    const auto column_name = expr->getColumnName();
-
-    return expr->as<ASTLiteral>()
-        || (block_with_constants.has(column_name) && isColumnConst(*block_with_constants.getByName(column_name).column));
-}
-
-
-bool MergeTreeWhereOptimizer::isSubsetOfTableColumns(const NameSet & identifiers) const
-{
-    for (const auto & identifier : identifiers)
-        if (!table_columns.contains(identifier))
+    for (const auto & column : columns)
+        if (!table_columns.contains(column))
             return false;
 
     return true;
 }
 
-
-bool MergeTreeWhereOptimizer::cannotBeMoved(const ASTPtr & ptr, bool is_final) const
+bool MergeTreeWhereOptimizer::cannotBeMoved(const RPNBuilderTreeNode & node, const WhereOptimizerContext & where_optimizer_context) const
 {
-    if (const auto * function_ptr = ptr->as<ASTFunction>())
+    if (node.isFunction())
     {
+        auto function_node = node.toFunctionNode();
+        auto function_name = function_node.getFunctionName();
+
         /// disallow arrayJoin expressions to be moved to PREWHERE for now
-        if ("arrayJoin" == function_ptr->name)
+        if (function_name == "arrayJoin")
             return true;
 
         /// disallow GLOBAL IN, GLOBAL NOT IN
         /// TODO why?
-        if ("globalIn" == function_ptr->name
-            || "globalNotIn" == function_ptr->name)
+        if (function_name == "globalIn" || function_name == "globalNotIn")
             return true;
 
         /// indexHint is a special function that it does not make sense to transfer to PREWHERE
-        if ("indexHint" == function_ptr->name)
+        if (function_name == "indexHint")
             return true;
-    }
-    else if (auto opt_name = IdentifierSemantic::getColumnName(ptr))
-    {
-        /// disallow moving result of ARRAY JOIN to PREWHERE
-        if (array_joined_names.contains(*opt_name) ||
-            array_joined_names.contains(Nested::extractTableName(*opt_name)) ||
-            (is_final && !isSortingKey(*opt_name)))
-            return true;
-    }
 
-    for (const auto & child : ptr->children)
-        if (cannotBeMoved(child, is_final))
+        size_t arguments_size = function_node.getArgumentsSize();
+        for (size_t i = 0; i < arguments_size; ++i)
+        {
+            auto argument = function_node.getArgumentAt(i);
+            if (cannotBeMoved(argument, where_optimizer_context))
+                return true;
+        }
+    }
+    else
+    {
+        auto column_name = node.getColumnName();
+
+        /// disallow moving result of ARRAY JOIN to PREWHERE
+        if (where_optimizer_context.array_joined_names.contains(column_name) ||
+            where_optimizer_context.array_joined_names.contains(Nested::extractTableName(column_name)) ||
+            (table_columns.contains(column_name) && where_optimizer_context.is_final && !isSortingKey(column_name)))
             return true;
+    }
 
     return false;
 }
 
-
-void MergeTreeWhereOptimizer::determineArrayJoinedNames(ASTSelectQuery & select)
+NameSet MergeTreeWhereOptimizer::determineArrayJoinedNames(const ASTSelectQuery & select)
 {
     auto [array_join_expression_list, _] = select.arrayJoinExpressionList();
 
     /// much simplified code from ExpressionAnalyzer::getArrayJoinedColumns()
     if (!array_join_expression_list)
-        return;
+        return {};
 
+    NameSet array_joined_names;
     for (const auto & ast : array_join_expression_list->children)
         array_joined_names.emplace(ast->getAliasOrColumnName());
+
+    return array_joined_names;
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
index f37255bdbee..18555a72db1 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
@@ -3,6 +3,7 @@
 #include <Core/Block.h>
 #include <Interpreters/Context_fwd.h>
 #include <Storages/SelectQueryInfo.h>
+#include <Storages/MergeTree/RPNBuilder.h>
 
 #include <boost/noncopyable.hpp>
 
@@ -34,21 +35,36 @@ class MergeTreeWhereOptimizer : private boost::noncopyable
 {
 public:
     MergeTreeWhereOptimizer(
-        SelectQueryInfo & query_info,
-        ContextPtr context,
         std::unordered_map<std::string, UInt64> column_sizes_,
         const StorageMetadataPtr & metadata_snapshot,
         const Names & queried_columns_,
+        const std::optional<NameSet> & supported_columns_,
         Poco::Logger * log_);
 
-private:
-    void optimize(ASTSelectQuery & select) const;
+    void optimize(SelectQueryInfo & select_query_info, const ContextPtr & context) const;
 
+    struct FilterActionsOptimizeResult
+    {
+        ActionsDAGPtr filter_actions;
+        ActionsDAGPtr prewhere_filter_actions;
+    };
+
+    std::optional<FilterActionsOptimizeResult> optimize(const ActionsDAGPtr & filter_dag,
+        const std::string & filter_column_name,
+        const ContextPtr & context,
+        bool is_final);
+
+private:
     struct Condition
     {
-        ASTPtr node;
+        explicit Condition(RPNBuilderTreeNode node_)
+            : node(std::move(node_))
+        {}
+
+        RPNBuilderTreeNode node;
+
         UInt64 columns_size = 0;
-        NameSet identifiers;
+        NameSet table_columns;
 
         /// Can condition be moved to prewhere?
         bool viable = false;
@@ -58,7 +74,7 @@ private:
 
         auto tuple() const
         {
-            return std::make_tuple(!viable, !good, columns_size, identifiers.size());
+            return std::make_tuple(!viable, !good, columns_size, table_columns.size());
         }
 
         /// Is condition a better candidate for moving to PREWHERE?
@@ -70,26 +86,46 @@ private:
 
     using Conditions = std::list<Condition>;
 
-    bool tryAnalyzeTuple(Conditions & res, const ASTFunction * func, bool is_final) const;
-    void analyzeImpl(Conditions & res, const ASTPtr & node, bool is_final) const;
+    struct WhereOptimizerContext
+    {
+        ContextPtr context;
+        NameSet array_joined_names;
+        bool move_all_conditions_to_prewhere = false;
+        bool is_final = false;
+    };
+
+    struct OptimizeResult
+    {
+        Conditions where_conditions;
+        Conditions prewhere_conditions;
+    };
+
+    std::optional<OptimizeResult> optimizeImpl(const RPNBuilderTreeNode & node, const WhereOptimizerContext & where_optimizer_context) const;
+
+    void analyzeImpl(Conditions & res, const RPNBuilderTreeNode & node, const WhereOptimizerContext & where_optimizer_context) const;
 
     /// Transform conjunctions chain in WHERE expression to Conditions list.
-    Conditions analyze(const ASTPtr & expression, bool is_final) const;
+    Conditions analyze(const RPNBuilderTreeNode & node, const WhereOptimizerContext & where_optimizer_context) const;
 
-    /// Transform Conditions list to WHERE or PREWHERE expression.
-    static ASTPtr reconstruct(const Conditions & conditions);
+    /// Reconstruct AST from conditions
+    static ASTPtr reconstructAST(const Conditions & conditions);
+
+    /// Reconstruct DAG from conditions
+    static ActionsDAGPtr reconstructDAG(const Conditions & conditions, const ContextPtr & context);
 
     void optimizeArbitrary(ASTSelectQuery & select) const;
 
-    UInt64 getIdentifiersColumnSize(const NameSet & identifiers) const;
+    UInt64 getColumnsSize(const NameSet & columns) const;
 
-    bool isExpressionOverSortingKey(const ASTPtr & ast) const;
+    bool columnsSupportPrewhere(const NameSet & columns) const;
+
+    bool isExpressionOverSortingKey(const RPNBuilderTreeNode & node) const;
 
     bool isSortingKey(const String & column_name) const;
 
     bool isConstant(const ASTPtr & expr) const;
 
-    bool isSubsetOfTableColumns(const NameSet & identifiers) const;
+    bool isSubsetOfTableColumns(const NameSet & columns) const;
 
     /** ARRAY JOIN'ed columns as well as arrayJoin() result cannot be used in PREWHERE, therefore expressions
       *    containing said columns should not be moved to PREWHERE at all.
@@ -97,21 +133,17 @@ private:
       *
       * Also, disallow moving expressions with GLOBAL [NOT] IN.
       */
-    bool cannotBeMoved(const ASTPtr & ptr, bool is_final) const;
+    bool cannotBeMoved(const RPNBuilderTreeNode & node, const WhereOptimizerContext & where_optimizer_context) const;
 
-    void determineArrayJoinedNames(ASTSelectQuery & select);
+    static NameSet determineArrayJoinedNames(const ASTSelectQuery & select);
 
-    using StringSet = std::unordered_set<std::string>;
-
-    const StringSet table_columns;
+    const NameSet table_columns;
     const Names queried_columns;
+    const std::optional<NameSet> supported_columns;
     const NameSet sorting_key_names;
-    const Block block_with_constants;
     Poco::Logger * log;
     std::unordered_map<std::string, UInt64> column_sizes;
     UInt64 total_size_of_queried_columns = 0;
-    NameSet array_joined_names;
-    const bool move_all_conditions_to_prewhere = false;
 };
 
 
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index fabf2acdad3..39c4157a42e 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -4,15 +4,16 @@
 #include <Storages/MergeTree/MergeTreeDataWriter.h>
 #include <Storages/MergeTree/MergedBlockOutputStream.h>
 #include <Storages/MergeTree/MergeTreeDataPartState.h>
+#include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <IO/MemoryReadWriteBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/copyData.h>
 #include <Interpreters/Context.h>
+#include <Common/logger_useful.h>
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Stringifier.h>
 #include <Poco/JSON/Parser.h>
-#include "Storages/MergeTree/DataPartStorageOnDiskFull.h"
 #include <sys/time.h>
 
 namespace DB
@@ -83,31 +84,6 @@ void MergeTreeWriteAheadLog::init()
     bytes_at_last_sync = 0;
 }
 
-void MergeTreeWriteAheadLog::addPart(DataPartInMemoryPtr & part)
-{
-    std::unique_lock lock(write_mutex);
-
-    auto part_info = MergeTreePartInfo::fromPartName(part->name, storage.format_version);
-    min_block_number = std::min(min_block_number, part_info.min_block);
-    max_block_number = std::max(max_block_number, part_info.max_block);
-
-    writeIntBinary(WAL_VERSION, *out);
-
-    ActionMetadata metadata{};
-    metadata.part_uuid = part->uuid;
-    metadata.write(*out);
-
-    writeIntBinary(static_cast<UInt8>(ActionType::ADD_PART), *out);
-    writeStringBinary(part->name, *out);
-    block_out->write(part->block);
-    block_out->flush();
-    sync(lock);
-
-    auto max_wal_bytes = storage.getSettings()->write_ahead_log_max_bytes;
-    if (out->count() > max_wal_bytes)
-        rotate(lock);
-}
-
 void MergeTreeWriteAheadLog::dropPart(const String & part_name)
 {
     std::unique_lock lock(write_mutex);
@@ -120,7 +96,6 @@ void MergeTreeWriteAheadLog::dropPart(const String & part_name)
     writeIntBinary(static_cast<UInt8>(ActionType::DROP_PART), *out);
     writeStringBinary(part_name, *out);
     out->next();
-    sync(lock);
 }
 
 void MergeTreeWriteAheadLog::rotate(const std::unique_lock<std::mutex> &)
@@ -229,7 +204,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(
 
             part->minmax_idx->update(block, storage.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
             part->partition.create(metadata_snapshot, block, 0, context);
-            part->setColumns(block.getNamesAndTypesList(), {});
+            part->setColumns(block.getNamesAndTypesList(), {}, metadata_snapshot->getMetadataVersion());
             if (metadata_snapshot->hasSortingKey())
                 metadata_snapshot->getSortingKey().expression->execute(block);
 
@@ -268,27 +243,6 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(
     return result;
 }
 
-void MergeTreeWriteAheadLog::sync(std::unique_lock<std::mutex> & lock)
-{
-    size_t bytes_to_sync = storage.getSettings()->write_ahead_log_bytes_to_fsync;
-    time_t time_to_sync = storage.getSettings()->write_ahead_log_interval_ms_to_fsync;
-    size_t current_bytes = out->count();
-
-    if (bytes_to_sync && current_bytes - bytes_at_last_sync > bytes_to_sync)
-    {
-        sync_task->schedule();
-        bytes_at_last_sync = current_bytes;
-    }
-    else if (time_to_sync && !sync_scheduled)
-    {
-        sync_task->scheduleAfter(time_to_sync);
-        sync_scheduled = true;
-    }
-
-    if (storage.getSettings()->in_memory_parts_insert_sync)
-        sync_cv.wait(lock, [this] { return !sync_scheduled; });
-}
-
 void MergeTreeWriteAheadLog::shutdown()
 {
     {
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
index eba7698b9f9..f5398a24e7d 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
@@ -60,7 +60,6 @@ public:
 
     ~MergeTreeWriteAheadLog();
 
-    void addPart(DataPartInMemoryPtr & part);
     void dropPart(const String & part_name);
     std::vector<MergeTreeMutableDataPartPtr> restore(
         const StorageMetadataPtr & metadata_snapshot,
@@ -77,7 +76,6 @@ public:
 private:
     void init();
     void rotate(const std::unique_lock<std::mutex> & lock);
-    void sync(std::unique_lock<std::mutex> & lock);
 
     const MergeTreeData & storage;
     DiskPtr disk;
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index ced43ae25b0..d97da5a0b50 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -2,6 +2,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/MergeTreeTransaction.h>
 #include <Parsers/queryToString.h>
+#include <Common/logger_useful.h>
 
 
 namespace DB
@@ -175,7 +176,7 @@ MergedBlockOutputStream::Finalizer MergedBlockOutputStream::finalizePartAsync(
         serialization_infos.replaceData(new_serialization_infos);
         files_to_remove_after_sync = removeEmptyColumnsFromPart(new_part, part_columns, serialization_infos, checksums);
 
-        new_part->setColumns(part_columns, serialization_infos);
+        new_part->setColumns(part_columns, serialization_infos, metadata_snapshot->getMetadataVersion());
     }
 
     auto finalizer = std::make_unique<Finalizer::Impl>(*writer, new_part, files_to_remove_after_sync, sync);
@@ -289,6 +290,14 @@ MergedBlockOutputStream::WrittenFiles MergedBlockOutputStream::finalizePartOnDis
         written_files.emplace_back(std::move(out));
     }
 
+    {
+        /// Write a file with a description of columns.
+        auto out = new_part->getDataPartStorage().writeFile(IMergeTreeDataPart::METADATA_VERSION_FILE_NAME, 4096, write_settings);
+        DB::writeIntText(new_part->getMetadataVersion(), *out);
+        out->preFinalize();
+        written_files.emplace_back(std::move(out));
+    }
+
     if (default_codec != nullptr)
     {
         auto out = new_part->getDataPartStorage().writeFile(IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME, 4096, write_settings);
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
index 03829f1daf9..3b2eb96f2d4 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
@@ -85,8 +85,7 @@ MergedColumnOnlyOutputStream::fillChecksums(
             all_checksums.files.erase(removed_file);
     }
 
-    new_part->setColumns(columns, serialization_infos);
-
+    new_part->setColumns(columns, serialization_infos, metadata_snapshot->getMetadataVersion());
     return checksums;
 }
 
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
index 4428f6c2bce..d0b85ee65b8 100644
--- a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
@@ -90,7 +90,10 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
     }
 
     new_part_info = MergeTreePartInfo::fromPartName(entry.new_part_name, storage.format_version);
-    commands = std::make_shared<MutationCommands>(storage.queue.getMutationCommands(source_part, new_part_info.mutation));
+    Strings mutation_ids;
+    commands = std::make_shared<MutationCommands>(storage.queue.getMutationCommands(source_part, new_part_info.mutation, mutation_ids));
+    LOG_TRACE(log, "Mutating part {} with mutation commands from {} mutations ({}): {}",
+              entry.new_part_name, commands->size(), fmt::join(mutation_ids, ", "), commands->toString());
 
     /// Once we mutate part, we must reserve space on the same disk, because mutations can possibly create hardlinks.
     /// Can throw an exception.
@@ -127,9 +130,11 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
 
             zero_copy_lock = storage.tryCreateZeroCopyExclusiveLock(entry.new_part_name, disk);
 
-            if (!zero_copy_lock)
+            if (!zero_copy_lock || !zero_copy_lock->isLocked())
             {
+                storage.watchZeroCopyLock(entry.new_part_name, disk);
                 LOG_DEBUG(log, "Mutation of part {} started by some other replica, will wait it and mutated merged part", entry.new_part_name);
+
                 return PrepareResult{
                     .prepared_successfully = false,
                     .need_to_check_missing_part_in_fetch = false,
@@ -162,21 +167,20 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
         }
     }
 
-    const Settings & settings = storage.getContext()->getSettingsRef();
+    task_context = Context::createCopy(storage.getContext());
+    task_context->makeQueryContext();
+    task_context->setCurrentQueryId("");
+
     merge_mutate_entry = storage.getContext()->getMergeList().insert(
         storage.getStorageID(),
         future_mutated_part,
-        settings);
+        task_context);
 
     stopwatch_ptr = std::make_unique<Stopwatch>();
 
-    fake_query_context = Context::createCopy(storage.getContext());
-    fake_query_context->makeQueryContext();
-    fake_query_context->setCurrentQueryId("");
-
     mutate_task = storage.merger_mutator.mutatePartToTemporaryPart(
             future_mutated_part, metadata_snapshot, commands, merge_mutate_entry.get(),
-            entry.create_time, fake_query_context, NO_TRANSACTION_PTR, reserved_space, table_lock_holder);
+            entry.create_time, task_context, NO_TRANSACTION_PTR, reserved_space, table_lock_holder);
 
     /// Adjust priority
     for (auto & item : future_mutated_part->parts)
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.h b/src/Storages/MergeTree/MutateFromLogEntryTask.h
index 23c9428faa9..2a2cc308f85 100644
--- a/src/Storages/MergeTree/MutateFromLogEntryTask.h
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.h
@@ -30,7 +30,9 @@ public:
     UInt64 getPriority() override { return priority; }
 
 private:
+
     ReplicatedMergeMutateTaskBase::PrepareResult prepare() override;
+
     bool finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log) override;
 
     bool executeInnerTask() override
@@ -53,7 +55,6 @@ private:
     MergeTreeData::MutableDataPartPtr new_part{nullptr};
     FutureMergedMutatedPartPtr future_mutated_part{nullptr};
 
-    ContextMutablePtr fake_query_context;
     MutateTaskPtr mutate_task;
 };
 
diff --git a/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
index 9bd0f148d6c..04effdb8894 100644
--- a/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
+++ b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
@@ -29,11 +29,11 @@ void MutatePlainMergeTreeTask::prepare()
 {
     future_part = merge_mutate_entry->future_part;
 
-    const Settings & settings = storage.getContext()->getSettingsRef();
+    task_context = createTaskContext();
     merge_list_entry = storage.getContext()->getMergeList().insert(
         storage.getStorageID(),
         future_part,
-        settings);
+        task_context);
 
     stopwatch = std::make_unique<Stopwatch>();
 
@@ -52,13 +52,17 @@ void MutatePlainMergeTreeTask::prepare()
             std::move(profile_counters_snapshot));
     };
 
-    fake_query_context = Context::createCopy(storage.getContext());
-    fake_query_context->makeQueryContext();
-    fake_query_context->setCurrentQueryId("");
+    if (task_context->getSettingsRef().enable_sharing_sets_for_mutations)
+    {
+        /// If we have a prepared sets cache for this mutations, we will use it.
+        auto mutation_id = future_part->part_info.mutation;
+        auto prepared_sets_cache_for_mutation = storage.getPreparedSetsCache(mutation_id);
+        task_context->setPreparedSetsCache(prepared_sets_cache_for_mutation);
+    }
 
     mutate_task = storage.merger_mutator.mutatePartToTemporaryPart(
             future_part, metadata_snapshot, merge_mutate_entry->commands, merge_list_entry.get(),
-            time(nullptr), fake_query_context, merge_mutate_entry->txn, merge_mutate_entry->tagger->reserved_space, table_lock_holder);
+            time(nullptr), task_context, merge_mutate_entry->txn, merge_mutate_entry->tagger->reserved_space, table_lock_holder);
 }
 
 
@@ -68,9 +72,9 @@ bool MutatePlainMergeTreeTask::executeStep()
     ProfileEventsScope profile_events_scope(&profile_counters);
 
     /// Make out memory tracker a parent of current thread memory tracker
-    MemoryTrackerThreadSwitcherPtr switcher;
+    std::optional<ThreadGroupSwitcher> switcher;
     if (merge_list_entry)
-        switcher = std::make_unique<MemoryTrackerThreadSwitcher>(*merge_list_entry);
+        switcher.emplace((*merge_list_entry)->thread_group);
 
     switch (state)
     {
@@ -130,4 +134,13 @@ bool MutatePlainMergeTreeTask::executeStep()
     return false;
 }
 
+ContextMutablePtr MutatePlainMergeTreeTask::createTaskContext() const
+{
+    auto context = Context::createCopy(storage.getContext());
+    context->makeQueryContext();
+    auto queryId = storage.getStorageID().getShortName() + "::" + future_part->name;
+    context->setCurrentQueryId(queryId);
+    return context;
+}
+
 }
diff --git a/src/Storages/MergeTree/MutatePlainMergeTreeTask.h b/src/Storages/MergeTree/MutatePlainMergeTreeTask.h
index ae2ac039543..823ea6d7a0f 100644
--- a/src/Storages/MergeTree/MutatePlainMergeTreeTask.h
+++ b/src/Storages/MergeTree/MutatePlainMergeTreeTask.h
@@ -74,11 +74,13 @@ private:
     std::function<void(const ExecutionStatus & execution_status)> write_part_log;
 
     IExecutableTask::TaskResultCallback task_result_callback;
-
-    ContextMutablePtr fake_query_context;
     MutateTaskPtr mutate_task;
 
     ProfileEvents::Counters profile_counters;
+
+    ContextMutablePtr task_context;
+
+    ContextMutablePtr createTaskContext() const;
 };
 
 
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
index bcb1d5d2c28..76096d00641 100644
--- a/src/Storages/MergeTree/MutateTask.cpp
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -19,6 +19,7 @@
 #include <Storages/MergeTree/MergeTreeDataWriter.h>
 #include <Storages/MutationCommands.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <boost/algorithm/string/replace.hpp>
 #include <Common/ProfileEventsScope.h>
 
@@ -53,17 +54,19 @@ static bool checkOperationIsNotCanceled(ActionBlocker & merges_blocker, MergeLis
 *   First part should be executed by mutations interpreter.
 *   Other is just simple drop/renames, so they can be executed without interpreter.
 */
-static void splitMutationCommands(
+static void splitAndModifyMutationCommands(
     MergeTreeData::DataPartPtr part,
+    StorageMetadataPtr metadata_snapshot,
     const MutationCommands & commands,
     MutationCommands & for_interpreter,
-    MutationCommands & for_file_renames)
+    MutationCommands & for_file_renames,
+    Poco::Logger * log)
 {
     auto part_columns = part->getColumnsDescription();
 
     if (!isWidePart(part) || !isFullPartStorage(part->getDataPartStorage()))
     {
-        NameSet mutated_columns;
+        NameSet mutated_columns, dropped_columns;
         for (const auto & command : commands)
         {
             if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
@@ -97,26 +100,87 @@ static void splitMutationCommands(
                     }
                     else
                         mutated_columns.emplace(command.column_name);
-                }
 
-                if (command.type == MutationCommand::Type::RENAME_COLUMN)
-                {
-                    for_interpreter.push_back(
-                    {
-                        .type = MutationCommand::Type::READ_COLUMN,
-                        .column_name = command.rename_to,
-                    });
-                    part_columns.rename(command.column_name, command.rename_to);
+                    if (command.type == MutationCommand::Type::DROP_COLUMN)
+                        dropped_columns.emplace(command.column_name);
                 }
             }
+
         }
+
+        auto alter_conversions = part->storage.getAlterConversionsForPart(part);
+
+        /// We don't add renames from commands, instead we take them from rename_map.
+        /// It's important because required renames depend not only on part's data version (i.e. mutation version)
+        /// but also on part's metadata version. Why we have such logic only for renames? Because all other types of alter
+        /// can be deduced based on difference between part's schema and table schema.
+        for (const auto & [rename_to, rename_from] : alter_conversions->getRenameMap())
+        {
+            if (part_columns.has(rename_from))
+            {
+                /// Actual rename
+                for_interpreter.push_back(
+                {
+                    .type = MutationCommand::Type::READ_COLUMN,
+                    .column_name = rename_to,
+                });
+
+                /// Not needed for compact parts (not executed), added here only to produce correct
+                /// set of columns for new part and their serializations
+                for_file_renames.push_back(
+                {
+                     .type = MutationCommand::Type::RENAME_COLUMN,
+                     .column_name = rename_from,
+                     .rename_to = rename_to
+                });
+
+                part_columns.rename(rename_from, rename_to);
+            }
+        }
+
         /// If it's compact part, then we don't need to actually remove files
         /// from disk we just don't read dropped columns
-        for (const auto & column : part->getColumns())
+        for (const auto & column : part_columns)
         {
             if (!mutated_columns.contains(column.name))
+            {
+                if (!metadata_snapshot->getColumns().has(column.name) && !part->storage.getVirtuals().contains(column.name))
+                {
+                    /// We cannot add the column because there's no such column in table.
+                    /// It's okay if the column was dropped. It may also absent in dropped_columns
+                    /// if the corresponding MUTATE_PART entry was not created yet or was created separately from current MUTATE_PART.
+                    /// But we don't know for sure what happened.
+                    auto part_metadata_version = part->getMetadataVersion();
+                    auto table_metadata_version = metadata_snapshot->getMetadataVersion();
+                    /// StorageMergeTree does not have metadata version
+                    if (table_metadata_version <= part_metadata_version && part->storage.supportsReplication())
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} with metadata version {} contains column {} that is absent "
+                                        "in table {} with metadata version {}",
+                                        part->name, part_metadata_version, column.name,
+                                        part->storage.getStorageID().getNameForLogs(), table_metadata_version);
+
+                    if (part_metadata_version < table_metadata_version)
+                    {
+                        LOG_WARNING(log, "Ignoring column {} from part {} with metadata version {} because there is no such column "
+                                         "in table {} with metadata version {}. Assuming the column was dropped", column.name, part->name,
+                                    part_metadata_version, part->storage.getStorageID().getNameForLogs(), table_metadata_version);
+                        continue;
+                    }
+                }
+
                 for_interpreter.emplace_back(
                     MutationCommand{.type = MutationCommand::Type::READ_COLUMN, .column_name = column.name, .data_type = column.type});
+            }
+            else if (dropped_columns.contains(column.name))
+            {
+                /// Not needed for compact parts (not executed), added here only to produce correct
+                /// set of columns for new part and their serializations
+                for_file_renames.push_back(
+                {
+                     .type = MutationCommand::Type::DROP_COLUMN,
+                     .column_name = column.name,
+                });
+            }
         }
     }
     else
@@ -148,9 +212,21 @@ static void splitMutationCommands(
                 for_file_renames.push_back(command);
             }
         }
+
+        auto alter_conversions = part->storage.getAlterConversionsForPart(part);
+        /// We don't add renames from commands, instead we take them from rename_map.
+        /// It's important because required renames depend not only on part's data version (i.e. mutation version)
+        /// but also on part's metadata version. Why we have such logic only for renames? Because all other types of alter
+        /// can be deduced based on difference between part's schema and table schema.
+
+        for (const auto & [rename_to, rename_from] : alter_conversions->getRenameMap())
+        {
+            for_file_renames.push_back({.type = MutationCommand::Type::RENAME_COLUMN, .column_name = rename_from, .rename_to = rename_to});
+        }
     }
 }
 
+
 /// Get the columns list of the resulting part in the same order as storage_columns.
 static std::pair<NamesAndTypesList, SerializationInfoByName>
 getColumnsForNewDataPart(
@@ -158,8 +234,13 @@ getColumnsForNewDataPart(
     const Block & updated_header,
     NamesAndTypesList storage_columns,
     const SerializationInfoByName & serialization_infos,
+    const MutationCommands & commands_for_interpreter,
     const MutationCommands & commands_for_removes)
 {
+    MutationCommands all_commands;
+    all_commands.insert(all_commands.end(), commands_for_interpreter.begin(), commands_for_interpreter.end());
+    all_commands.insert(all_commands.end(), commands_for_removes.begin(), commands_for_removes.end());
+
     NameSet removed_columns;
     NameToNameMap renamed_columns_to_from;
     NameToNameMap renamed_columns_from_to;
@@ -175,8 +256,7 @@ getColumnsForNewDataPart(
             storage_columns.emplace_back(column);
     }
 
-    /// All commands are validated in AlterCommand so we don't care about order
-    for (const auto & command : commands_for_removes)
+    for (const auto & command : all_commands)
     {
         if (command.type == MutationCommand::UPDATE)
         {
@@ -191,10 +271,14 @@ getColumnsForNewDataPart(
 
         /// If we don't have this column in source part, than we don't need to materialize it
         if (!part_columns.has(command.column_name))
+        {
             continue;
+        }
 
         if (command.type == MutationCommand::DROP_COLUMN)
+        {
             removed_columns.insert(command.column_name);
+        }
 
         if (command.type == MutationCommand::RENAME_COLUMN)
         {
@@ -204,20 +288,44 @@ getColumnsForNewDataPart(
     }
 
     SerializationInfoByName new_serialization_infos;
-    for (const auto & [name, info] : serialization_infos)
+    for (const auto & [name, old_info] : serialization_infos)
     {
         if (removed_columns.contains(name))
             continue;
 
         auto it = renamed_columns_from_to.find(name);
-        if (it != renamed_columns_from_to.end())
-            new_serialization_infos.emplace(it->second, info);
-        else
-            new_serialization_infos.emplace(name, info);
+        auto new_name = it == renamed_columns_from_to.end() ? name : it->second;
+
+        if (!updated_header.has(new_name))
+        {
+            new_serialization_infos.emplace(new_name, old_info);
+            continue;
+        }
+
+        auto old_type = part_columns.getPhysical(name).type;
+        auto new_type = updated_header.getByName(new_name).type;
+
+        SerializationInfo::Settings settings
+        {
+            .ratio_of_defaults_for_sparse = source_part->storage.getSettings()->ratio_of_defaults_for_sparse_serialization,
+            .choose_kind = false
+        };
+
+        if (!new_type->supportsSparseSerialization() || settings.isAlwaysDefault())
+            continue;
+
+        auto new_info = new_type->createSerializationInfo(settings);
+        if (!old_info->structureEquals(*new_info))
+        {
+            new_serialization_infos.emplace(new_name, std::move(new_info));
+            continue;
+        }
+
+        new_info = old_info->createWithType(*old_type, *new_type, settings);
+        new_serialization_infos.emplace(new_name, std::move(new_info));
     }
 
-    /// In compact parts we read all columns, because they all stored in a
-    /// single file
+    /// In compact parts we read all columns, because they all stored in a single file
     if (!isWidePart(source_part) || !isFullPartStorage(source_part->getDataPartStorage()))
         return {updated_header.getNamesAndTypesList(), new_serialization_infos};
 
@@ -269,20 +377,38 @@ getColumnsForNewDataPart(
                 /// should it's previous version should be dropped or removed
                 if (renamed_columns_to_from.contains(it->name) && !was_renamed && !was_removed)
                     throw Exception(
-                                    ErrorCodes::LOGICAL_ERROR,
-                                    "Incorrect mutation commands, trying to rename column {} to {}, "
-                                    "but part {} already has column {}",
-                                    renamed_columns_to_from[it->name], it->name, source_part->name, it->name);
+                        ErrorCodes::LOGICAL_ERROR,
+                        "Incorrect mutation commands, trying to rename column {} to {}, "
+                        "but part {} already has column {}",
+                        renamed_columns_to_from[it->name], it->name, source_part->name, it->name);
 
                 /// Column was renamed and no other column renamed to it's name
                 /// or column is dropped.
                 if (!renamed_columns_to_from.contains(it->name) && (was_renamed || was_removed))
+                {
                     it = storage_columns.erase(it);
+                }
                 else
                 {
-                    /// Take a type from source part column.
-                    /// It may differ from column type in storage.
-                    it->type = source_col->second;
+
+                    if (was_removed)
+                    { /// DROP COLUMN xxx, RENAME COLUMN yyy TO xxx
+                        auto renamed_from = renamed_columns_to_from.at(it->name);
+                        auto maybe_name_and_type = source_columns.tryGetByName(renamed_from);
+                        if (!maybe_name_and_type)
+                            throw Exception(
+                                ErrorCodes::LOGICAL_ERROR,
+                                "Got incorrect mutation commands, column {} was renamed from {}, but it doesn't exist in source columns {}",
+                                it->name, renamed_from, source_columns.toString());
+
+                        it->type = maybe_name_and_type->type;
+                    }
+                    else
+                    {
+                        /// Take a type from source part column.
+                        /// It may differ from column type in storage.
+                        it->type = source_col->second;
+                    }
                     ++it;
                 }
             }
@@ -364,10 +490,8 @@ static std::set<MergeTreeIndexPtr> getIndicesToRecalculate(
     ASTPtr indices_recalc_expr_list = std::make_shared<ASTExpressionList>();
     const auto & indices = metadata_snapshot->getSecondaryIndices();
 
-    for (size_t i = 0; i < indices.size(); ++i)
+    for (const auto & index : indices)
     {
-        const auto & index = indices[i];
-
         bool has_index =
             source_part->checksums.has(INDEX_FILE_PREFIX + index.name + ".idx") ||
             source_part->checksums.has(INDEX_FILE_PREFIX + index.name + ".idx2");
@@ -548,6 +672,13 @@ static NameToNameVector collectFilesForRenames(
     /// Collect counts for shared streams of different columns. As an example, Nested columns have shared stream with array sizes.
     auto stream_counts = getStreamCounts(source_part, source_part->getColumns().getNames());
     NameToNameVector rename_vector;
+    NameSet collected_names;
+
+    auto add_rename = [&rename_vector, &collected_names] (const std::string & file_rename_from, const std::string & file_rename_to)
+    {
+        if (collected_names.emplace(file_rename_from).second)
+            rename_vector.emplace_back(file_rename_from, file_rename_to);
+    };
 
     /// Remove old data
     for (const auto & command : commands_for_removes)
@@ -556,19 +687,19 @@ static NameToNameVector collectFilesForRenames(
         {
             if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx2"))
             {
-                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + ".idx2", "");
-                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
+                add_rename(INDEX_FILE_PREFIX + command.column_name + ".idx2", "");
+                add_rename(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
             }
             else if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx"))
             {
-                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + ".idx", "");
-                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
+                add_rename(INDEX_FILE_PREFIX + command.column_name + ".idx", "");
+                add_rename(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
             }
         }
         else if (command.type == MutationCommand::Type::DROP_PROJECTION)
         {
             if (source_part->checksums.has(command.column_name + ".proj"))
-                rename_vector.emplace_back(command.column_name + ".proj", "");
+                add_rename(command.column_name + ".proj", "");
         }
         else if (command.type == MutationCommand::Type::DROP_COLUMN)
         {
@@ -578,8 +709,8 @@ static NameToNameVector collectFilesForRenames(
                 /// Delete files if they are no longer shared with another column.
                 if (--stream_counts[stream_name] == 0)
                 {
-                    rename_vector.emplace_back(stream_name + ".bin", "");
-                    rename_vector.emplace_back(stream_name + mrk_extension, "");
+                    add_rename(stream_name + ".bin", "");
+                    add_rename(stream_name + mrk_extension, "");
                 }
             };
 
@@ -598,8 +729,8 @@ static NameToNameVector collectFilesForRenames(
 
                 if (stream_from != stream_to)
                 {
-                    rename_vector.emplace_back(stream_from + ".bin", stream_to + ".bin");
-                    rename_vector.emplace_back(stream_from + mrk_extension, stream_to + mrk_extension);
+                    add_rename(stream_from + ".bin", stream_to + ".bin");
+                    add_rename(stream_from + mrk_extension, stream_to + mrk_extension);
                 }
             };
 
@@ -619,13 +750,19 @@ static NameToNameVector collectFilesForRenames(
             {
                 if (!new_streams.contains(old_stream) && --stream_counts[old_stream] == 0)
                 {
-                    rename_vector.emplace_back(old_stream + ".bin", "");
-                    rename_vector.emplace_back(old_stream + mrk_extension, "");
+                    add_rename(old_stream + ".bin", "");
+                    add_rename(old_stream + mrk_extension, "");
                 }
             }
         }
     }
 
+    if (!source_part->getSerializationInfos().empty()
+        && new_part->getSerializationInfos().empty())
+    {
+        rename_vector.emplace_back(IMergeTreeDataPart::SERIALIZATION_FILE_NAME, "");
+    }
+
     return rename_vector;
 }
 
@@ -637,6 +774,7 @@ void finalizeMutatedPart(
     ExecuteTTLType execute_ttl_type,
     const CompressionCodecPtr & codec,
     ContextPtr context,
+    StorageMetadataPtr metadata_snapshot,
     bool sync)
 {
     std::vector<std::unique_ptr<WriteBufferFromFileBase>> written_files;
@@ -685,6 +823,12 @@ void finalizeMutatedPart(
         written_files.push_back(std::move(out_comp));
     }
 
+    {
+        auto out_metadata = new_data_part->getDataPartStorage().writeFile(IMergeTreeDataPart::METADATA_VERSION_FILE_NAME, 4096, context->getWriteSettings());
+        DB::writeText(metadata_snapshot->getMetadataVersion(), *out_metadata);
+        written_files.push_back(std::move(out_metadata));
+    }
+
     {
         /// Write a file with a description of columns.
         auto out_columns = new_data_part->getDataPartStorage().writeFile("columns.txt", 4096, context->getWriteSettings());
@@ -764,8 +908,6 @@ struct MutationContext
     NamesAndTypesList storage_columns;
     NameSet materialized_indices;
     NameSet materialized_projections;
-    MutationsInterpreter::MutationKind::MutationKindEnum mutation_kind
-        = MutationsInterpreter::MutationKind::MutationKindEnum::MUTATE_UNKNOWN;
 
     MergeTreeData::MutableDataPartPtr new_data_part;
     IMergedBlockOutputStreamPtr out{nullptr};
@@ -880,14 +1022,12 @@ public:
             if (projection.type == ProjectionDescription::Type::Aggregate)
                 projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
 
-            const Settings & settings = ctx->context->getSettingsRef();
-
             LOG_DEBUG(log, "Merged {} parts in level {} to {}", selected_parts.size(), current_level, projection_future_part->name);
             auto tmp_part_merge_task = ctx->mutator->mergePartsToTemporaryPart(
                 projection_future_part,
                 projection.metadata,
                 ctx->mutate_entry,
-                std::make_unique<MergeListElement>((*ctx->mutate_entry)->table_id, projection_future_part, settings),
+                std::make_unique<MergeListElement>((*ctx->mutate_entry)->table_id, projection_future_part, ctx->context),
                 *ctx->holder,
                 ctx->time_of_mutation,
                 ctx->context,
@@ -1224,8 +1364,8 @@ private:
             skip_part_indices,
             ctx->compression_codec,
             ctx->txn,
-            false,
-            false,
+            /*reset_columns=*/ true,
+            /*blocks_are_granules_size=*/ false,
             ctx->context->getWriteSettings());
 
         ctx->mutating_pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
@@ -1324,13 +1464,27 @@ private:
         ctx->new_data_part->storeVersionMetadata();
 
         NameSet hardlinked_files;
+
+        /// NOTE: Renames must be done in order
+        for (const auto & [rename_from, rename_to] : ctx->files_to_rename)
+        {
+            if (rename_to.empty()) /// It's DROP COLUMN
+            {
+                /// pass
+            }
+            else
+            {
+                ctx->new_data_part->getDataPartStorage().createHardLinkFrom(
+                    ctx->source_part->getDataPartStorage(), rename_from, rename_to);
+                hardlinked_files.insert(rename_from);
+            }
+        }
         /// Create hardlinks for unchanged files
         for (auto it = ctx->source_part->getDataPartStorage().iterate(); it->isValid(); it->next())
         {
             if (ctx->files_to_skip.contains(it->name()))
                 continue;
 
-            String destination;
             String file_name = it->name();
 
             auto rename_it = std::find_if(ctx->files_to_rename.begin(), ctx->files_to_rename.end(), [&file_name](const auto & rename_pair)
@@ -1340,20 +1494,17 @@ private:
 
             if (rename_it != ctx->files_to_rename.end())
             {
-                if (rename_it->second.empty())
-                    continue;
-                destination = rename_it->second;
-            }
-            else
-            {
-                destination = it->name();
+                /// RENAMEs and DROPs already processed
+                continue;
             }
 
+            String destination = it->name();
+
             if (it->isFile())
             {
                 ctx->new_data_part->getDataPartStorage().createHardLinkFrom(
-                    ctx->source_part->getDataPartStorage(), it->name(), destination);
-                hardlinked_files.insert(it->name());
+                    ctx->source_part->getDataPartStorage(), file_name, destination);
+                hardlinked_files.insert(file_name);
             }
             else if (!endsWith(it->name(), ".tmp_proj")) // ignore projection tmp merge dir
             {
@@ -1449,7 +1600,7 @@ private:
             }
         }
 
-        MutationHelpers::finalizeMutatedPart(ctx->source_part, ctx->new_data_part, ctx->execute_ttl_type, ctx->compression_codec, ctx->context, ctx->need_sync);
+        MutationHelpers::finalizeMutatedPart(ctx->source_part, ctx->new_data_part, ctx->execute_ttl_type, ctx->compression_codec, ctx->context, ctx->metadata_snapshot, ctx->need_sync);
     }
 
 
@@ -1502,7 +1653,7 @@ MutateTask::MutateTask(
     ctx->source_part = ctx->future_part->parts[0];
     ctx->need_prefix = need_prefix_;
 
-    auto storage_snapshot = ctx->data->getStorageSnapshot(ctx->metadata_snapshot, context_);
+    auto storage_snapshot = ctx->data->getStorageSnapshotWithoutData(ctx->metadata_snapshot, context_);
     extendObjectColumns(ctx->storage_columns, storage_snapshot->object_columns, /*with_subcolumns=*/ false);
 }
 
@@ -1542,6 +1693,45 @@ bool MutateTask::execute()
     return false;
 }
 
+static bool canSkipConversionToNullable(const MergeTreeDataPartPtr & part, const MutationCommand & command)
+{
+    if (command.type != MutationCommand::READ_COLUMN)
+        return false;
+
+    auto part_column = part->tryGetColumn(command.column_name);
+    if (!part_column)
+        return false;
+
+    /// For ALTER MODIFY COLUMN from 'Type' to 'Nullable(Type)' we can skip mutatation and
+    /// apply only metadata conversion. But it doesn't work for custom serialization.
+    const auto * to_nullable = typeid_cast<const DataTypeNullable *>(command.data_type.get());
+    if (!to_nullable)
+        return false;
+
+    if (!part_column->type->equals(*to_nullable->getNestedType()))
+        return false;
+
+    auto serialization = part->getSerialization(command.column_name);
+    if (serialization->getKind() != ISerialization::Kind::DEFAULT)
+        return false;
+
+    return true;
+}
+
+static bool canSkipMutationCommandForPart(const MergeTreeDataPartPtr & part, const MutationCommand & command, const ContextPtr & context)
+{
+    if (command.partition)
+    {
+        auto command_partition_id = part->storage.getPartitionIDFromQuery(command.partition, context);
+        if (part->info.partition_id != command_partition_id)
+            return true;
+    }
+
+    if (canSkipConversionToNullable(part, command))
+        return true;
+
+    return false;
+}
 
 bool MutateTask::prepare()
 {
@@ -1558,13 +1748,13 @@ bool MutateTask::prepare()
     /// Allow mutations to work when force_index_by_date or force_primary_key is on.
     context_for_reading->setSetting("force_index_by_date", false);
     context_for_reading->setSetting("force_primary_key", false);
+    context_for_reading->setSetting("apply_mutations_on_fly", false);
+    /// Skip using large sets in KeyCondition
+    context_for_reading->setSetting("use_index_for_in_with_subqueries_max_values", 100000);
 
     for (const auto & command : *ctx->commands)
-    {
-        if (command.partition == nullptr || ctx->source_part->info.partition_id == ctx->data->getPartitionIDFromQuery(
-                command.partition, context_for_reading))
+        if (!canSkipMutationCommandForPart(ctx->source_part, command, context_for_reading))
             ctx->commands_for_part.emplace_back(command);
-    }
 
     if (ctx->source_part->isStoredOnDisk() && !isStorageTouchedByMutations(
         *ctx->data, ctx->source_part, ctx->metadata_snapshot, ctx->commands_for_part, context_for_reading))
@@ -1611,28 +1801,31 @@ bool MutateTask::prepare()
     context_for_reading->setSetting("allow_asynchronous_read_from_io_pool_for_merge_tree", false);
     context_for_reading->setSetting("max_streams_for_merge_tree_reading", Field(0));
 
-    MutationHelpers::splitMutationCommands(ctx->source_part, ctx->commands_for_part, ctx->for_interpreter, ctx->for_file_renames);
+    MutationHelpers::splitAndModifyMutationCommands(
+        ctx->source_part, ctx->metadata_snapshot,
+        ctx->commands_for_part, ctx->for_interpreter, ctx->for_file_renames, ctx->log);
 
     ctx->stage_progress = std::make_unique<MergeStageProgress>(1.0);
 
     if (!ctx->for_interpreter.empty())
     {
+        /// Always disable filtering in mutations: we want to read and write all rows because for updates we rewrite only some of the
+        /// columns and preserve the columns that are not affected, but after the update all columns must have the same number of row
+        MutationsInterpreter::Settings settings(true);
+        settings.apply_deleted_mask = false;
+
         ctx->interpreter = std::make_unique<MutationsInterpreter>(
-            *ctx->data, ctx->source_part, ctx->metadata_snapshot, ctx->for_interpreter, context_for_reading, true);
+            *ctx->data, ctx->source_part, ctx->metadata_snapshot, ctx->for_interpreter,
+            ctx->metadata_snapshot->getColumns().getNamesOfPhysical(), context_for_reading, settings);
+
         ctx->materialized_indices = ctx->interpreter->grabMaterializedIndices();
         ctx->materialized_projections = ctx->interpreter->grabMaterializedProjections();
-        ctx->mutation_kind = ctx->interpreter->getMutationKind();
-        /// Always disable filtering in mutations: we want to read and write all rows because for updates we rewrite only some of the
-        /// columns and preserve the columns that are not affected, but after the update all columns must have the same number of rows.
-        ctx->interpreter->setApplyDeletedMask(false);
         ctx->mutating_pipeline_builder = ctx->interpreter->execute();
         ctx->updated_header = ctx->interpreter->getUpdatedHeader();
         ctx->progress_callback = MergeProgressCallback((*ctx->mutate_entry)->ptr(), ctx->watch_prev_elapsed, *ctx->stage_progress);
     }
 
     auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + ctx->future_part->name, ctx->space_reservation->getDisk(), 0);
-    /// FIXME new_data_part is not used in the case when we clone part with cloneAndLoadDataPartOnSameDisk and return false
-    /// Is it possible to handle this case earlier?
 
     std::string prefix;
     if (ctx->need_prefix)
@@ -1656,9 +1849,9 @@ bool MutateTask::prepare()
 
     auto [new_columns, new_infos] = MutationHelpers::getColumnsForNewDataPart(
         ctx->source_part, ctx->updated_header, ctx->storage_columns,
-        ctx->source_part->getSerializationInfos(), ctx->commands_for_part);
+        ctx->source_part->getSerializationInfos(), ctx->for_interpreter, ctx->for_file_renames);
 
-    ctx->new_data_part->setColumns(new_columns, new_infos);
+    ctx->new_data_part->setColumns(new_columns, new_infos, ctx->metadata_snapshot->getMetadataVersion());
     ctx->new_data_part->partition.assign(ctx->source_part->partition);
 
     /// Don't change granularity type while mutating subset of columns
@@ -1674,8 +1867,13 @@ bool MutateTask::prepare()
     /// All columns from part are changed and may be some more that were missing before in part
     /// TODO We can materialize compact part without copying data
     if (!isWidePart(ctx->source_part) || !isFullPartStorage(ctx->source_part->getDataPartStorage())
-        || (ctx->mutation_kind == MutationsInterpreter::MutationKind::MUTATE_OTHER && ctx->interpreter && ctx->interpreter->isAffectingAllColumns()))
+        || (ctx->interpreter && ctx->interpreter->isAffectingAllColumns()))
     {
+        /// In case of replicated merge tree with zero copy replication
+        /// Here Clickhouse claims that this new part can be deleted in temporary state without unlocking the blobs
+        /// The blobs have to be removed along with the part, this temporary part owns them and does not share them yet.
+        ctx->new_data_part->remove_tmp_policy = IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::REMOVE_BLOBS;
+
         task = std::make_unique<MutateAllPartColumnsTask>(ctx);
     }
     else /// TODO: check that we modify only non-key columns in this case.
@@ -1703,38 +1901,11 @@ bool MutateTask::prepare()
             ctx->for_file_renames,
             ctx->mrk_extension);
 
-        if (ctx->indices_to_recalc.empty() &&
-            ctx->projections_to_recalc.empty() &&
-            ctx->mutation_kind != MutationsInterpreter::MutationKind::MUTATE_OTHER
-            && ctx->files_to_rename.empty())
-        {
-            LOG_TRACE(ctx->log, "Part {} doesn't change up to mutation version {} (optimized)", ctx->source_part->name, ctx->future_part->part_info.mutation);
-            /// new_data_part is not used here, another part is created instead (see the comment above)
-            ctx->temporary_directory_lock = {};
-
-            /// In zero-copy replication checksums file path in s3 (blob path) is used for zero copy locks in ZooKeeper. If we will hardlink checksums file, we will have the same blob path
-            /// and two different parts (source and new mutated part) will use the same locks in ZooKeeper. To avoid this we copy checksums.txt to generate new blob path.
-            /// Example:
-            ///     part: all_0_0_0/checksums.txt -> /s3/blobs/shjfgsaasdasdasdasdasdas
-            ///     locks path in zk: /zero_copy/tbl_id/s3_blobs_shjfgsaasdasdasdasdasdas/replica_name
-            ///                                         ^ part name don't participate in lock path
-            /// In case of full hardlink we will have:
-            ///     part: all_0_0_0_1/checksums.txt -> /s3/blobs/shjfgsaasdasdasdasdasdas
-            ///     locks path in zk: /zero_copy/tbl_id/s3_blobs_shjfgsaasdasdasdasdasdas/replica_name
-            /// So we need to copy to have a new name
-            NameSet files_to_copy_instead_of_hardlinks;
-            auto settings_ptr = ctx->data->getSettings();
-            bool copy_checksumns = ctx->data->supportsReplication() && settings_ptr->allow_remote_fs_zero_copy_replication && ctx->source_part->isStoredOnRemoteDiskWithZeroCopySupport();
-            if (copy_checksumns)
-                files_to_copy_instead_of_hardlinks.insert(IMergeTreeDataPart::FILE_FOR_REFERENCES_CHECK);
-
-            auto [part, lock] = ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, prefix, ctx->future_part->part_info, ctx->metadata_snapshot, ctx->txn, &ctx->hardlinked_files, false, files_to_copy_instead_of_hardlinks);
-            part->getDataPartStorage().beginTransaction();
-
-            ctx->temporary_directory_lock = std::move(lock);
-            promise.set_value(std::move(part));
-            return false;
-        }
+        /// In case of replicated merge tree with zero copy replication
+        /// Here Clickhouse has to follow the common procedure when deleting new part in temporary state
+        /// Some of the files within the blobs are shared with source part, some belongs only to the part
+        /// Keeper has to be asked with unlock request to release the references to the blobs
+        ctx->new_data_part->remove_tmp_policy = IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::ASK_KEEPER;
 
         task = std::make_unique<MutateSomePartColumnsTask>(ctx);
     }
diff --git a/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp b/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp
index 3ef064ff743..ee38cecb9c4 100644
--- a/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp
+++ b/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp
@@ -9,6 +9,7 @@
 
 #include <consistent_hashing.h>
 
+#include "Common/Exception.h"
 #include <Common/logger_useful.h>
 #include <Common/SipHash.h>
 #include <Common/thread_local_rng.h>
@@ -20,6 +21,30 @@
 #include <Storages/MergeTree/IntersectionsIndexes.h>
 #include <fmt/format.h>
 
+namespace DB
+{
+struct Part
+{
+    mutable RangesInDataPartDescription description;
+    // FIXME: This is needed to put this struct in set
+    // and modify through iterator
+    mutable std::set<size_t> replicas;
+
+    bool operator<(const Part & rhs) const { return description.info < rhs.description.info; }
+};
+}
+
+template <>
+struct fmt::formatter<DB::Part>
+{
+    static constexpr auto parse(format_parse_context & ctx) { return ctx.begin(); }
+
+    template <typename FormatContext>
+    auto format(const DB::Part & part, FormatContext & ctx)
+    {
+        return format_to(ctx.out(), "{} in replicas [{}]", part.description.describe(), fmt::join(part.replicas, ", "));
+    }
+};
 
 namespace DB
 {
@@ -47,7 +72,6 @@ public:
     }
 
     Stats stats;
-    std::mutex mutex;
     size_t replicas_count;
 
     explicit ImplInterface(size_t replicas_count_)
@@ -60,17 +84,6 @@ public:
     virtual void handleInitialAllRangesAnnouncement(InitialAllRangesAnnouncement announcement) = 0;
 };
 
-
-struct Part
-{
-    mutable RangesInDataPartDescription description;
-    // FIXME: This is needed to put this struct in set
-    // and modify through iterator
-    mutable std::set<size_t> replicas;
-
-    bool operator<(const Part & rhs) const { return description.info < rhs.description.info; }
-};
-
 using Parts = std::set<Part>;
 using PartRefs = std::deque<Parts::iterator>;
 
@@ -131,7 +144,7 @@ public:
 
 DefaultCoordinator::~DefaultCoordinator()
 {
-    LOG_INFO(log, "Coordination done: {}", toString(stats));
+    LOG_DEBUG(log, "Coordination done: {}", toString(stats));
 }
 
 void DefaultCoordinator::updateReadingState(const InitialAllRangesAnnouncement & announcement)
@@ -207,26 +220,21 @@ void DefaultCoordinator::finalizeReadingState()
         delayed_parts.pop_front();
     }
 
-    String description;
-    for (const auto & part : all_parts_to_read)
-    {
-        description += part.description.describe();
-        description += fmt::format("Replicas: ({}) --- ", fmt::join(part.replicas, ","));
-    }
-
-    LOG_INFO(log, "Reading state is fully initialized: {}", description);
+    LOG_DEBUG(log, "Reading state is fully initialized: {}", fmt::join(all_parts_to_read, "; "));
 }
 
 
 void DefaultCoordinator::handleInitialAllRangesAnnouncement(InitialAllRangesAnnouncement announcement)
 {
-    std::lock_guard lock(mutex);
-
     updateReadingState(announcement);
+
+    if (announcement.replica_num >= stats.size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Replica number ({}) is bigger than total replicas count ({})", announcement.replica_num, stats.size());
+
     stats[announcement.replica_num].number_of_requests +=1;
 
     ++sent_initial_requests;
-    LOG_INFO(log, "{} {}", sent_initial_requests, replicas_count);
+    LOG_DEBUG(log, "Sent initial requests: {} Replicas count: {}", sent_initial_requests, replicas_count);
     if (sent_initial_requests == replicas_count)
         finalizeReadingState();
 }
@@ -282,8 +290,6 @@ void DefaultCoordinator::selectPartsAndRanges(const PartRefs & container, size_t
 
 ParallelReadResponse DefaultCoordinator::handleRequest(ParallelReadRequest request)
 {
-    std::lock_guard lock(mutex);
-
     LOG_TRACE(log, "Handling request from replica {}, minimal marks size is {}", request.replica_num, request.min_number_of_marks);
 
     size_t current_mark_size = 0;
@@ -334,7 +340,7 @@ public:
     {}
     ~InOrderCoordinator() override
     {
-        LOG_INFO(log, "Coordination done: {}", toString(stats));
+        LOG_DEBUG(log, "Coordination done: {}", toString(stats));
     }
 
     ParallelReadResponse handleRequest([[ maybe_unused ]]  ParallelReadRequest request) override;
@@ -349,8 +355,7 @@ public:
 template <CoordinationMode mode>
 void InOrderCoordinator<mode>::handleInitialAllRangesAnnouncement(InitialAllRangesAnnouncement announcement)
 {
-    std::lock_guard lock(mutex);
-    LOG_TRACE(log, "Received an announecement {}", announcement.describe());
+    LOG_TRACE(log, "Received an announcement {}", announcement.describe());
 
     /// To get rid of duplicates
     for (const auto & part: announcement.description)
@@ -387,8 +392,6 @@ void InOrderCoordinator<mode>::handleInitialAllRangesAnnouncement(InitialAllRang
 template <CoordinationMode mode>
 ParallelReadResponse InOrderCoordinator<mode>::handleRequest(ParallelReadRequest request)
 {
-    std::lock_guard lock(mutex);
-
     if (request.mode != mode)
         throw Exception(ErrorCodes::LOGICAL_ERROR,
             "Replica {} decided to read in {} mode, not in {}. This is a bug",
@@ -479,16 +482,27 @@ ParallelReadResponse InOrderCoordinator<mode>::handleRequest(ParallelReadRequest
 
 void ParallelReplicasReadingCoordinator::handleInitialAllRangesAnnouncement(InitialAllRangesAnnouncement announcement)
 {
+    std::lock_guard lock(mutex);
+
     if (!pimpl)
+    {
+        setMode(announcement.mode);
         initialize();
+    }
+
 
     return pimpl->handleInitialAllRangesAnnouncement(announcement);
 }
 
 ParallelReadResponse ParallelReplicasReadingCoordinator::handleRequest(ParallelReadRequest request)
 {
+    std::lock_guard lock(mutex);
+
     if (!pimpl)
+    {
+        setMode(request.mode);
         initialize();
+    }
 
     return pimpl->handleRequest(std::move(request));
 }
diff --git a/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.h b/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.h
index 0656a128884..0f41d24a9c6 100644
--- a/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.h
+++ b/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.h
@@ -25,8 +25,9 @@ public:
 private:
     void initialize();
 
-    CoordinationMode mode{CoordinationMode::Default};
+    std::mutex mutex;
     size_t replicas_count{0};
+    CoordinationMode mode{CoordinationMode::Default};
     std::atomic<bool> initialized{false};
     std::unique_ptr<ImplInterface> pimpl;
 };
diff --git a/src/Storages/MergeTree/PartMetadataManagerWithCache.cpp b/src/Storages/MergeTree/PartMetadataManagerWithCache.cpp
index b6260d5edb6..7c0aedf699b 100644
--- a/src/Storages/MergeTree/PartMetadataManagerWithCache.cpp
+++ b/src/Storages/MergeTree/PartMetadataManagerWithCache.cpp
@@ -1,7 +1,7 @@
 #include "PartMetadataManagerWithCache.h"
 
 #if USE_ROCKSDB
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Common/ErrorCodes.h>
 #include <IO/HashingReadBuffer.h>
 #include <IO/ReadBufferFromString.h>
@@ -117,30 +117,47 @@ void PartMetadataManagerWithCache::updateAll(bool include_projection)
 
     String value;
     String read_value;
-    for (const auto & file_name : file_names)
+
+    /// This is used to remove the keys in case of any exception while caching other keys
+    Strings keys_added_to_cache;
+    keys_added_to_cache.reserve(file_names.size());
+
+    try
     {
-        String file_path = fs::path(part->getDataPartStorage().getRelativePath()) / file_name;
-        if (!part->getDataPartStorage().exists(file_name))
-            continue;
-        auto in = part->getDataPartStorage().readFile(file_name, {}, std::nullopt, std::nullopt);
-        readStringUntilEOF(value, *in);
-
-        String key = getKeyFromFilePath(file_path);
-        auto status = cache->put(key, value);
-        if (!status.ok())
+        for (const auto & file_name : file_names)
         {
-            status = cache->get(key, read_value);
-            if (status.IsNotFound() || read_value == value)
+            String file_path = fs::path(part->getDataPartStorage().getRelativePath()) / file_name;
+            if (!part->getDataPartStorage().exists(file_name))
                 continue;
+            auto in = part->getDataPartStorage().readFile(file_name, {}, std::nullopt, std::nullopt);
+            readStringUntilEOF(value, *in);
 
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "updateAll failed include_projection:{} status:{}, file_path:{}",
-                include_projection,
-                status.ToString(),
-                file_path);
+            String key = getKeyFromFilePath(file_path);
+            auto status = cache->put(key, value);
+            if (!status.ok())
+            {
+                status = cache->get(key, read_value);
+                if (status.IsNotFound() || read_value == value)
+                    continue;
+
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "updateAll failed include_projection:{} status:{}, file_path:{}",
+                    include_projection,
+                    status.ToString(),
+                    file_path);
+            }
+            keys_added_to_cache.emplace_back(key);
         }
     }
+    catch (...)
+    {
+        for (const auto & key : keys_added_to_cache)
+        {
+            cache->del(key);
+        }
+        throw;
+    }
 }
 
 void PartMetadataManagerWithCache::assertAllDeleted(bool include_projection) const
diff --git a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
index 24454b897af..af21022953c 100644
--- a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
+++ b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vector>
-#include <Common/logger_useful.h>
 #include <base/types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Core/UUID.h>
diff --git a/src/Storages/MergeTree/PartitionPruner.cpp b/src/Storages/MergeTree/PartitionPruner.cpp
index 61293888f10..35b2d5db3b5 100644
--- a/src/Storages/MergeTree/PartitionPruner.cpp
+++ b/src/Storages/MergeTree/PartitionPruner.cpp
@@ -1,4 +1,5 @@
 #include <Storages/MergeTree/PartitionPruner.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/RPNBuilder.cpp b/src/Storages/MergeTree/RPNBuilder.cpp
index cee5038ed21..e49459d3d17 100644
--- a/src/Storages/MergeTree/RPNBuilder.cpp
+++ b/src/Storages/MergeTree/RPNBuilder.cpp
@@ -59,7 +59,7 @@ void appendColumnNameWithoutAlias(const ActionsDAG::Node & node, WriteBuffer & o
         {
             auto name = node.function_base->getName();
             if (legacy && name == "modulo")
-                writeCString("moduleLegacy", out);
+                writeCString("moduloLegacy", out);
             else
                 writeString(name, out);
 
@@ -86,6 +86,16 @@ String getColumnNameWithoutAlias(const ActionsDAG::Node & node, bool allow_exper
     return std::move(out.str());
 }
 
+const ActionsDAG::Node * getNodeWithoutAlias(const ActionsDAG::Node * node)
+{
+    const ActionsDAG::Node * result = node;
+
+    while (result->type == ActionsDAG::ActionType::ALIAS)
+        result = result->children[0];
+
+    return result;
+}
+
 }
 
 RPNBuilderTreeContext::RPNBuilderTreeContext(ContextPtr query_context_)
@@ -137,9 +147,14 @@ std::string RPNBuilderTreeNode::getColumnNameWithModuloLegacy() const
 bool RPNBuilderTreeNode::isFunction() const
 {
     if (ast_node)
+    {
         return typeid_cast<const ASTFunction *>(ast_node);
+    }
     else
-        return dag_node->type == ActionsDAG::ActionType::FUNCTION;
+    {
+        const auto * node_without_alias = getNodeWithoutAlias(dag_node);
+        return node_without_alias->type == ActionsDAG::ActionType::FUNCTION;
+    }
 }
 
 bool RPNBuilderTreeNode::isConstant() const
@@ -160,7 +175,8 @@ bool RPNBuilderTreeNode::isConstant() const
     }
     else
     {
-        return dag_node->column && isColumnConst(*dag_node->column);
+        const auto * node_without_alias = getNodeWithoutAlias(dag_node);
+        return node_without_alias->column && isColumnConst(*node_without_alias->column);
     }
 }
 
@@ -189,8 +205,9 @@ ColumnWithTypeAndName RPNBuilderTreeNode::getConstantColumn() const
     }
     else
     {
-        result.type = dag_node->result_type;
-        result.column = dag_node->column;
+        const auto * node_without_alias = getNodeWithoutAlias(dag_node);
+        result.type = node_without_alias->result_type;
+        result.column = node_without_alias->column;
     }
 
     return result;
@@ -238,10 +255,12 @@ bool RPNBuilderTreeNode::tryGetConstant(Field & output_value, DataTypePtr & outp
     }
     else
     {
-        if (dag_node->column && isColumnConst(*dag_node->column))
+        const auto * node_without_alias = getNodeWithoutAlias(dag_node);
+
+        if (node_without_alias->column && isColumnConst(*node_without_alias->column))
         {
-            output_value = (*dag_node->column)[0];
-            output_type = dag_node->result_type;
+            output_value = (*node_without_alias->column)[0];
+            output_type = node_without_alias->result_type;
 
             if (!output_value.isNull())
                 output_type = removeNullable(output_type);
@@ -269,7 +288,7 @@ ConstSetPtr tryGetSetFromDAGNode(const ActionsDAG::Node * dag_node)
     {
         auto set = column_set->getData();
 
-        if (set->isCreated())
+        if (set && set->isCreated())
             return set;
     }
 
@@ -286,12 +305,13 @@ ConstSetPtr RPNBuilderTreeNode::tryGetPreparedSet() const
     {
         auto prepared_sets_with_same_hash = prepared_sets->getByTreeHash(ast_node->getTreeHash());
         for (auto & set : prepared_sets_with_same_hash)
-            if (set->isCreated())
-                return set;
+            if (set.isCreated())
+                return set.get();
     }
     else if (dag_node)
     {
-        return tryGetSetFromDAGNode(dag_node);
+        const auto * node_without_alias = getNodeWithoutAlias(dag_node);
+        return tryGetSetFromDAGNode(node_without_alias);
     }
 
     return {};
@@ -310,7 +330,8 @@ ConstSetPtr RPNBuilderTreeNode::tryGetPreparedSet(const DataTypes & data_types)
     }
     else if (dag_node)
     {
-        return tryGetSetFromDAGNode(dag_node);
+        const auto * node_without_alias = getNodeWithoutAlias(dag_node);
+        return tryGetSetFromDAGNode(node_without_alias);
     }
 
     return nullptr;
@@ -347,13 +368,15 @@ ConstSetPtr RPNBuilderTreeNode::tryGetPreparedSet(
         auto tree_hash = ast_node->getTreeHash();
         for (const auto & set : prepared_sets->getByTreeHash(tree_hash))
         {
-            if (types_match(set))
-                return set;
+            if (set.isCreated() && types_match(set.get()))
+                return set.get();
         }
     }
-    else if (dag_node->column)
+    else
     {
-        return tryGetSetFromDAGNode(dag_node);
+        const auto * node_without_alias = getNodeWithoutAlias(dag_node);
+        if (node_without_alias->column)
+            return tryGetSetFromDAGNode(node_without_alias);
     }
 
     return nullptr;
@@ -364,10 +387,10 @@ RPNBuilderFunctionTreeNode RPNBuilderTreeNode::toFunctionNode() const
     if (!isFunction())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "RPNBuilderTree node is not a function");
 
-    if (this->ast_node)
-        return RPNBuilderFunctionTreeNode(this->ast_node, tree_context);
+    if (ast_node)
+        return RPNBuilderFunctionTreeNode(ast_node, tree_context);
     else
-        return RPNBuilderFunctionTreeNode(this->dag_node, tree_context);
+        return RPNBuilderFunctionTreeNode(getNodeWithoutAlias(dag_node), tree_context);
 }
 
 std::optional<RPNBuilderFunctionTreeNode> RPNBuilderTreeNode::toFunctionNodeOrNull() const
@@ -375,10 +398,10 @@ std::optional<RPNBuilderFunctionTreeNode> RPNBuilderTreeNode::toFunctionNodeOrNu
     if (!isFunction())
         return {};
 
-    if (this->ast_node)
+    if (ast_node)
         return RPNBuilderFunctionTreeNode(this->ast_node, tree_context);
     else
-        return RPNBuilderFunctionTreeNode(this->dag_node, tree_context);
+        return RPNBuilderFunctionTreeNode(getNodeWithoutAlias(dag_node), tree_context);
 }
 
 std::string RPNBuilderFunctionTreeNode::getFunctionName() const
diff --git a/src/Storages/MergeTree/RPNBuilder.h b/src/Storages/MergeTree/RPNBuilder.h
index 741821f75fb..626eb288493 100644
--- a/src/Storages/MergeTree/RPNBuilder.h
+++ b/src/Storages/MergeTree/RPNBuilder.h
@@ -78,6 +78,12 @@ public:
     /// Construct RPNBuilderTreeNode with non null ast node and tree context
     explicit RPNBuilderTreeNode(const IAST * ast_node_, RPNBuilderTreeContext & tree_context_);
 
+    /// Get AST node
+    const IAST * getASTNode() const { return ast_node; }
+
+    /// Get DAG node
+    const ActionsDAG::Node * getDAGNode() const { return dag_node; }
+
     /// Get column name
     std::string getColumnName() const;
 
diff --git a/src/Storages/MergeTree/RangesInDataPart.cpp b/src/Storages/MergeTree/RangesInDataPart.cpp
index 29a236c9865..6203f9f7483 100644
--- a/src/Storages/MergeTree/RangesInDataPart.cpp
+++ b/src/Storages/MergeTree/RangesInDataPart.cpp
@@ -1,16 +1,33 @@
 #include <Storages/MergeTree/RangesInDataPart.h>
 
-#include <Storages/MergeTree/IMergeTreeDataPart.h>
-
-#include "IO/VarInt.h"
+#include <fmt/format.h>
 
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include "IO/VarInt.h"
 
+template <>
+struct fmt::formatter<DB::RangesInDataPartDescription>
+{
+    static constexpr auto parse(format_parse_context & ctx) { return ctx.begin(); }
+
+    template <typename FormatContext>
+    auto format(const DB::RangesInDataPartDescription & range, FormatContext & ctx)
+    {
+        return format_to(ctx.out(), "{}", range.describe());
+    }
+};
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int TOO_LARGE_ARRAY_SIZE;
+}
+
+
 void RangesInDataPartDescription::serialize(WriteBuffer & out) const
 {
     info.serialize(out);
@@ -20,8 +37,7 @@ void RangesInDataPartDescription::serialize(WriteBuffer & out) const
 String RangesInDataPartDescription::describe() const
 {
     String result;
-    result += fmt::format("Part: {}, ", info.getPartNameV1());
-    result += fmt::format("Ranges: [{}], ", fmt::join(ranges, ","));
+    result += fmt::format("part {} with ranges [{}]", info.getPartNameV1(), fmt::join(ranges, ","));
     return result;
 }
 
@@ -40,16 +56,15 @@ void RangesInDataPartsDescription::serialize(WriteBuffer & out) const
 
 String RangesInDataPartsDescription::describe() const
 {
-    String result;
-    for (const auto & desc : *this)
-        result += desc.describe() + ",";
-    return result;
+    return fmt::format("{} parts: [{}]", this->size(), fmt::join(*this, ", "));
 }
 
 void RangesInDataPartsDescription::deserialize(ReadBuffer & in)
 {
     size_t new_size = 0;
     readVarUInt(new_size, in);
+    if (new_size > 100'000'000'000)
+        throw DB::Exception(DB::ErrorCodes::TOO_LARGE_ARRAY_SIZE, "The size of serialized hash table is suspiciously large: {}", new_size);
 
     this->resize(new_size);
     for (auto & desc : *this)
diff --git a/src/Storages/MergeTree/RangesInDataPart.h b/src/Storages/MergeTree/RangesInDataPart.h
index 9c8ab4859a0..afb3ad33762 100644
--- a/src/Storages/MergeTree/RangesInDataPart.h
+++ b/src/Storages/MergeTree/RangesInDataPart.h
@@ -5,6 +5,7 @@
 #include <IO/WriteBuffer.h>
 #include <IO/ReadBuffer.h>
 #include <Storages/MergeTree/MarkRange.h>
+#include "Storages/MergeTree/AlterConversions.h"
 #include "Storages/MergeTree/MergeTreePartInfo.h"
 
 
@@ -40,6 +41,7 @@ struct RangesInDataPartsDescription: public std::deque<RangesInDataPartDescripti
 struct RangesInDataPart
 {
     DataPartPtr data_part;
+    AlterConversionsPtr alter_conversions;
     size_t part_index_in_query;
     MarkRanges ranges;
 
@@ -47,9 +49,11 @@ struct RangesInDataPart
 
     RangesInDataPart(
         const DataPartPtr & data_part_,
+        const AlterConversionsPtr & alter_conversions_,
         const size_t part_index_in_query_,
         const MarkRanges & ranges_ = MarkRanges{})
         : data_part{data_part_}
+        , alter_conversions{alter_conversions_}
         , part_index_in_query{part_index_in_query_}
         , ranges{ranges_}
     {}
diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
index 9ce7eb42666..3b361abfc1a 100644
--- a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
@@ -128,9 +128,9 @@ bool ReplicatedMergeMutateTaskBase::executeStep()
 
 bool ReplicatedMergeMutateTaskBase::executeImpl()
 {
-    MemoryTrackerThreadSwitcherPtr switcher;
+    std::optional<ThreadGroupSwitcher> switcher;
     if (merge_mutate_entry)
-        switcher = std::make_unique<MemoryTrackerThreadSwitcher>(*merge_mutate_entry);
+        switcher.emplace((*merge_mutate_entry)->thread_group);
 
     auto remove_processed_entry = [&] () -> bool
     {
diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
index d9a1cbff166..a7bf1290274 100644
--- a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
+++ b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 
 #include <Storages/MergeTree/IExecutableTask.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
@@ -62,6 +61,7 @@ protected:
     StorageReplicatedMergeTree & storage;
     /// ProfileEvents for current part will be stored here
     ProfileEvents::Counters profile_counters;
+    ContextMutablePtr task_context;
 
 private:
     enum class CheckExistingPartResult
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp
index 557123ddae2..65cf8bbce72 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp
@@ -60,11 +60,11 @@ void ReplicatedMergeTreeAttachThread::run()
 
         if (needs_retry)
         {
-            LOG_ERROR(log, "Initialization failed. Error: {}", e.message());
+            LOG_ERROR(log, "Initialization failed. Error: {}", getCurrentExceptionMessage(/* with_stacktrace */ true));
         }
         else
         {
-            LOG_ERROR(log, "Initialization failed, table will remain readonly. Error: {}", e.message());
+            LOG_ERROR(log, "Initialization failed, table will remain readonly. Error: {}", getCurrentExceptionMessage(/* with_stacktrace */ true));
             storage.initialization_done = true;
         }
     }
@@ -149,7 +149,7 @@ void ReplicatedMergeTreeAttachThread::runImpl()
     const bool replica_metadata_version_exists = zookeeper->tryGet(replica_path + "/metadata_version", replica_metadata_version);
     if (replica_metadata_version_exists)
     {
-        storage.metadata_version = parse<int>(replica_metadata_version);
+        storage.setInMemoryMetadata(metadata_snapshot->withMetadataVersion(parse<int>(replica_metadata_version)));
     }
     else
     {
@@ -179,8 +179,6 @@ void ReplicatedMergeTreeAttachThread::runImpl()
     /// don't allow to reinitialize them, delete each of them immediately.
     storage.clearOldTemporaryDirectories(0, {"tmp_", "delete_tmp_", "tmp-fetch_"});
     storage.clearOldWriteAheadLogs();
-    if (storage.getSettings()->merge_tree_enable_clear_old_broken_detached)
-        storage.clearOldBrokenPartsFromDetachedDirectory();
 
     storage.createNewZooKeeperNodes();
     storage.syncPinnedPartUUIDs();
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.h
index a491a06d6a5..222b30b519b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.h
@@ -3,7 +3,6 @@
 #include <thread>
 #include <Core/BackgroundSchedulePool.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
index 35838625bbe..76b9ee4a575 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
@@ -3,7 +3,6 @@
 #include <base/types.h>
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/logger_useful.h>
 #include <Common/randomSeed.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <thread>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.cpp
index 1efb3f6826b..5e01cd96f6b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.cpp
@@ -99,4 +99,13 @@ std::shared_ptr<const IBackupEntry> ReplicatedMergeTreeMutationEntry::backup() c
     return std::make_shared<BackupEntryFromMemory>(out.str());
 }
 
+
+String ReplicatedMergeTreeMutationEntry::getBlockNumbersForLogs() const
+{
+    WriteBufferFromOwnString out;
+    for (const auto & kv : block_numbers)
+        out << kv.first << " = " << kv.second << "; ";
+    return out.str();
+}
+
 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h
index 8c359a57279..3c7c9097a2d 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h
@@ -41,6 +41,9 @@ struct ReplicatedMergeTreeMutationEntry
     using BlockNumbersType = std::map<String, Int64>;
     BlockNumbersType block_numbers;
 
+    /// List of partitions that do not have relevant uncommitted blocks to mutate
+    mutable std::unordered_set<String> checked_partitions_cache;
+
     /// Mutation commands which will give to MUTATE_PART entries
     MutationCommands commands;
 
@@ -51,6 +54,8 @@ struct ReplicatedMergeTreeMutationEntry
     bool isAlterMutation() const { return alter_version != -1; }
 
     std::shared_ptr<const IBackupEntry> backup() const;
+
+    String getBlockNumbersForLogs() const;
 };
 
 using ReplicatedMergeTreeMutationEntryPtr = std::shared_ptr<const ReplicatedMergeTreeMutationEntry>;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
index 85933dbafad..0882ff5a0bc 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
@@ -2,6 +2,7 @@
 #include <Storages/MergeTree/checkDataPart.h>
 #include <Storages/MergeTree/ReplicatedMergeTreePartHeader.h>
 #include <Storages/StorageReplicatedMergeTree.h>
+#include <Common/ThreadFuzzer.h>
 #include <Interpreters/Context.h>
 
 
@@ -75,21 +76,52 @@ std::unique_lock<std::mutex> ReplicatedMergeTreePartCheckThread::pausePartsCheck
 
 void ReplicatedMergeTreePartCheckThread::cancelRemovedPartsCheck(const MergeTreePartInfo & drop_range_info)
 {
-    std::lock_guard lock(parts_mutex);
-    for (auto it = parts_queue.begin(); it != parts_queue.end();)
+    Strings parts_to_remove;
     {
-        if (drop_range_info.contains(MergeTreePartInfo::fromPartName(it->first, storage.format_version)))
-        {
-            /// Remove part from the queue to avoid part resurrection
-            /// if we will check it and enqueue fetch after DROP/REPLACE execution.
-            parts_set.erase(it->first);
-            it = parts_queue.erase(it);
-        }
-        else
-        {
-            ++it;
-        }
+        std::lock_guard lock(parts_mutex);
+        for (const auto & elem : parts_queue)
+            if (drop_range_info.contains(MergeTreePartInfo::fromPartName(elem.first, storage.format_version)))
+                parts_to_remove.push_back(elem.first);
     }
+
+    /// We have to remove parts that were not removed by removePartAndEnqueueFetch
+    LOG_INFO(log, "Removing broken parts from ZooKeeper: {}", fmt::join(parts_to_remove, ", "));
+    storage.removePartsFromZooKeeperWithRetries(parts_to_remove);   /// May throw
+
+    /// Now we can remove parts from the check queue.
+    /// It's not atomic (because it's bad idea to hold the mutex while removing something from zk with retries),
+    /// but the check thread is currently paused, and no new parts in drop_range_info can by enqueued
+    /// while the corresponding DROP_RANGE/REPLACE_RANGE exists, so it should be okay. We will recheck it just in case.
+
+    StringSet removed_parts;
+    for (auto & part : parts_to_remove)
+        removed_parts.emplace(std::move(part));
+    size_t count = 0;
+
+    std::lock_guard lock(parts_mutex);
+    for (const auto & elem : parts_queue)
+    {
+        bool is_removed = removed_parts.contains(elem.first);
+        bool should_have_been_removed = drop_range_info.contains(MergeTreePartInfo::fromPartName(elem.first, storage.format_version));
+        if (is_removed != should_have_been_removed)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Inconsistent parts_queue: name={}, is_removed={}, should_have_been_removed={}",
+                            elem.first, is_removed, should_have_been_removed);
+        count += is_removed;
+    }
+
+    if (count != parts_to_remove.size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected number of parts to remove from parts_queue: should be {}, got {}",
+                        parts_to_remove.size(), count);
+
+    auto new_end = std::remove_if(parts_queue.begin(), parts_queue.end(), [&removed_parts] (const auto & elem)
+    {
+        return removed_parts.contains(elem.first);
+    });
+
+    parts_queue.erase(new_end, parts_queue.end());
+
+    for (const auto & elem : removed_parts)
+        parts_set.erase(elem);
 }
 
 size_t ReplicatedMergeTreePartCheckThread::size() const
@@ -263,6 +295,8 @@ void ReplicatedMergeTreePartCheckThread::searchForMissingPartAndFetchIfPossible(
             }
         }
 
+        ThreadFuzzer::maybeInjectSleep();
+
         if (storage.createEmptyPartInsteadOfLost(zookeeper, part_name))
         {
             /** This situation is possible if on all the replicas where the part was, it deteriorated.
@@ -383,6 +417,9 @@ CheckResult ReplicatedMergeTreePartCheckThread::checkPart(const String & part_na
                 /// Delete part locally.
                 storage.outdateBrokenPartAndCloneToDetached(part, "broken");
 
+                ThreadFuzzer::maybeInjectMemoryLimitException();
+                ThreadFuzzer::maybeInjectSleep();
+
                 /// Part is broken, let's try to find it and fetch.
                 searchForMissingPartAndFetchIfPossible(part_name, exists_in_zookeeper);
 
@@ -399,6 +436,7 @@ CheckResult ReplicatedMergeTreePartCheckThread::checkPart(const String & part_na
             String message = fmt::format(fmt_string, part_name);
             LOG_ERROR(log, fmt_string, part_name);
             storage.outdateBrokenPartAndCloneToDetached(part, "unexpected");
+            ThreadFuzzer::maybeInjectSleep();
             return {part_name, false, message};
         }
         else
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
index 170b2ca1f60..b86191dbf50 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
@@ -9,7 +9,6 @@
 #include <boost/noncopyable.hpp>
 #include <Poco/Event.h>
 #include <base/types.h>
-#include <Common/logger_useful.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Storages/CheckResults.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
@@ -37,30 +36,6 @@ public:
     void start();
     void stop();
 
-    /// Don't create more than one instance of this object simultaneously.
-    struct TemporarilyStop : private boost::noncopyable
-    {
-        ReplicatedMergeTreePartCheckThread * parent;
-
-        explicit TemporarilyStop(ReplicatedMergeTreePartCheckThread * parent_) : parent(parent_)
-        {
-            parent->stop();
-        }
-
-        TemporarilyStop(TemporarilyStop && old) noexcept : parent(old.parent)
-        {
-            old.parent = nullptr;
-        }
-
-        ~TemporarilyStop()
-        {
-            if (parent)
-                parent->start();
-        }
-    };
-
-    TemporarilyStop temporarilyStop() { return TemporarilyStop(this); }
-
     /// Add a part (for which there are suspicions that it is missing, damaged or not needed) in the queue for check.
     /// delay_to_check_seconds - check no sooner than the specified number of seconds.
     void enqueuePart(const String & name, time_t delay_to_check_seconds = 0);
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 20dbaa73812..03ded2ef260 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -11,6 +11,7 @@
 #include <Parsers/formatAST.h>
 #include <base/sort.h>
 
+#include <ranges>
 
 namespace DB
 {
@@ -159,14 +160,13 @@ bool ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
 
         Strings children = zookeeper->getChildren(queue_path);
 
-        auto to_remove_it = std::remove_if(
-            children.begin(), children.end(), [&](const String & path)
+        size_t removed_entries = std::erase_if(children,
+            [&](const String & path)
             {
                 return already_loaded_paths.count(path);
             });
 
-        LOG_DEBUG(log, "Having {} queue entries to load, {} entries already loaded.", (to_remove_it - children.begin()), (children.end() - to_remove_it));
-        children.erase(to_remove_it, children.end());
+        LOG_DEBUG(log, "Having {} queue entries to load, {} entries already loaded.", children.size(), removed_entries);
 
         ::sort(children.begin(), children.end());
 
@@ -544,7 +544,7 @@ void ReplicatedMergeTreeQueue::removeProcessedEntry(zkutil::ZooKeeperPtr zookeep
     if (!found && need_remove_from_zk)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't find {} in the memory queue. It is a bug. Entry: {}",
                                                       entry->znode_name, entry->toString());
-    notifySubscribers(queue_size, entry->znode_name);
+    notifySubscribers(queue_size, &(entry->znode_name));
 
     if (!need_remove_from_zk)
         return;
@@ -807,13 +807,15 @@ QueueRepresentation getQueueRepresentation(const std::list<ReplicatedMergeTreeLo
 ///
 /// From the first glance it can sound that these two sets should be enough to understand which parts we have to mutate
 /// to finish mutation but it's not true:
-/// 1) Obviously we cannot rely on current_parts because we can have stale state (some parts are absent, some merges not finished). We also have to account parts which we will
-///    get after queue execution.
-/// 2) But we cannot rely on virtual_parts for this, because they contain parts which we will get after we have executed our queue. So if we need to execute mutation 0000000001 for part all_0_0_0
-///    and we have already pulled entry to mutate this part into own queue our virtual parts will contain part all_0_0_0_1, not part all_0_0_0.
+/// 1) Obviously we cannot rely on current_parts because we can have stale state (some parts are absent, some merges not finished).
+///    We also have to account parts which we will get after queue execution.
+/// 2) But we cannot rely on virtual_parts for this, because they contain parts which we will get after we have executed our queue.
+///    So if we need to execute mutation 0000000001 for part all_0_0_0 and we have already pulled entry
+///    to mutate this part into own queue our virtual parts will contain part all_0_0_0_1, not part all_0_0_0.
 ///
-/// To avoid such issues we simply traverse all entries in queue in order and applying diff (add parts/remove parts) to current parts if they could be affected by mutation. Such approach is expensive
-/// but we do it only once since we get the mutation. After that we just update parts_to_do for each mutation when pulling entries into our queue (addPartToMutations, removePartFromMutations).
+/// To avoid such issues we simply traverse all entries in queue in order and applying diff (add parts/remove parts) to current parts
+/// if they could be affected by mutation. Such approach is expensive but we do it only once since we get the mutation.
+/// After that we just update parts_to_do for each mutation when pulling entries into our queue (addPartToMutations, removePartFromMutations).
 ActiveDataPartSet getPartNamesToMutate(
     const ReplicatedMergeTreeMutationEntry & mutation, const ActiveDataPartSet & current_parts,
     const QueueRepresentation & queue_representation, MergeTreeDataFormatVersion format_version)
@@ -954,13 +956,14 @@ void ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper, C
                     const String & partition_id = pair.first;
                     Int64 block_num = pair.second;
                     mutations_by_partition[partition_id].emplace(block_num, &mutation);
-                    LOG_TRACE(log, "Adding mutation {} for partition {} for all block numbers less than {}", entry->znode_name, partition_id, block_num);
                 }
+                LOG_TRACE(log, "Adding mutation {} for {} partitions (data versions: {})",
+                          entry->znode_name, entry->block_numbers.size(), entry->getBlockNumbersForLogs());
 
                 /// Initialize `mutation.parts_to_do`. We cannot use only current_parts + virtual_parts here so we
                 /// traverse all the queue and build correct state of parts_to_do.
                 auto queue_representation = getQueueRepresentation(queue, format_version);
-                mutation.parts_to_do = getPartNamesToMutate(*entry, virtual_parts, queue_representation, format_version);
+                mutation.parts_to_do = getPartNamesToMutate(*entry, current_parts, queue_representation, format_version);
 
                 if (mutation.parts_to_do.size() == 0)
                     some_mutations_are_probably_done = true;
@@ -1134,19 +1137,23 @@ void ReplicatedMergeTreeQueue::removePartProducingOpsInRange(
         bool replace_range_covered = covering_entry && checkReplaceRangeCanBeRemoved(part_info, *it, *covering_entry);
         if (simple_op_covered || replace_range_covered)
         {
+            const String & znode_name = (*it)->znode_name;
+
             if ((*it)->currently_executing)
                 to_wait.push_back(*it);
 
-            auto code = zookeeper->tryRemove(fs::path(replica_path) / "queue" / (*it)->znode_name);
+            auto code = zookeeper->tryRemove(fs::path(replica_path) / "queue" / znode_name);
             if (code != Coordination::Error::ZOK)
-                LOG_INFO(log, "Couldn't remove {}: {}", (fs::path(replica_path) / "queue" / (*it)->znode_name).string(), Coordination::errorMessage(code));
+                LOG_INFO(log, "Couldn't remove {}: {}", (fs::path(replica_path) / "queue" / znode_name).string(), Coordination::errorMessage(code));
 
             updateStateOnQueueEntryRemoval(
                 *it, /* is_successful = */ false,
                 min_unprocessed_insert_time_changed, max_processed_insert_time_changed, lock);
 
-            (*it)->removed_by_other_entry = true;
+            LogEntryPtr removing_entry = std::move(*it);   /// Make it live a bit longer
+            removing_entry->removed_by_other_entry = true;
             it = queue.erase(it);
+            notifySubscribers(queue.size(), &znode_name);
             ++removed_entries;
         }
         else
@@ -1231,8 +1238,7 @@ bool ReplicatedMergeTreeQueue::isCoveredByFuturePartsImpl(const LogEntry & entry
                                     "because it is not disjoint with part {} that is currently executing.";
 
         /// This message can be too noisy, do not print it more than once per second
-        if (!(entry.last_postpone_time == time(nullptr) && entry.postpone_reason.ends_with("that is currently executing.")))
-            LOG_TEST(LogToStr(out_reason, log), fmt_string, entry.znode_name, new_part_name, future_part_elem.first);
+        LOG_TEST(LogToStr(out_reason, LogFrequencyLimiter(log, 5)), fmt_string, entry.znode_name, new_part_name, future_part_elem.first);
         return true;
     }
 
@@ -1371,6 +1377,7 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
             {
                 constexpr auto fmt_string = "Not executing merge/mutation for the part {}, waiting for {} to execute it and will fetch after.";
                 out_postpone_reason = fmt::format(fmt_string, entry.new_part_name, replica_to_execute_merge);
+                LOG_TEST(log, fmt_string, entry.new_part_name, replica_to_execute_merge);
                 return false;
             }
         }
@@ -1423,7 +1430,7 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
         {
             constexpr auto fmt_string = "Not executing log entry {} of type {} for part {}"
                                         " because source parts size ({}) is greater than the current maximum ({}).";
-            LOG_DEBUG(LogToStr(out_postpone_reason, log), fmt_string, entry.znode_name, entry.typeToString(), entry.new_part_name,
+            LOG_DEBUG(LogToStr(out_postpone_reason, LogFrequencyLimiter(log, 5)), fmt_string, entry.znode_name, entry.typeToString(), entry.new_part_name,
                       ReadableSize(sum_parts_size_in_bytes), ReadableSize(max_source_parts_size));
 
             return false;
@@ -1522,7 +1529,7 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
 }
 
 
-Int64 ReplicatedMergeTreeQueue::getCurrentMutationVersionImpl(
+Int64 ReplicatedMergeTreeQueue::getCurrentMutationVersion(
     const String & partition_id, Int64 data_version, std::lock_guard<std::mutex> & /* state_lock */) const
 {
     auto in_partition = mutations_by_partition.find(partition_id);
@@ -1538,13 +1545,6 @@ Int64 ReplicatedMergeTreeQueue::getCurrentMutationVersionImpl(
 }
 
 
-Int64 ReplicatedMergeTreeQueue::getCurrentMutationVersion(const String & partition_id, Int64 data_version) const
-{
-    std::lock_guard lock(state_mutex);
-    return getCurrentMutationVersionImpl(partition_id, data_version, lock);
-}
-
-
 ReplicatedMergeTreeQueue::CurrentlyExecuting::CurrentlyExecuting(
     const ReplicatedMergeTreeQueue::LogEntryPtr & entry_, ReplicatedMergeTreeQueue & queue_, std::unique_lock<std::mutex> & /* state_lock */)
     : entry(entry_), queue(queue_)
@@ -1729,18 +1729,30 @@ size_t ReplicatedMergeTreeQueue::countMutations() const
     return mutations_by_znode.size();
 }
 
-
 size_t ReplicatedMergeTreeQueue::countFinishedMutations() const
 {
     std::lock_guard lock(state_mutex);
 
     size_t count = 0;
-    for (const auto & pair : mutations_by_znode)
+    for (const auto & [_, status] : mutations_by_znode)
     {
-        const auto & mutation = pair.second;
-        if (!mutation.is_done)
+        if (!status.is_done)
             break;
+        ++count;
+    }
 
+    return count;
+}
+
+size_t ReplicatedMergeTreeQueue::countUnfinishedMutations() const
+{
+    std::lock_guard lock(state_mutex);
+
+    size_t count = 0;
+    for (const auto & [_, status] : mutations_by_znode | std::views::reverse)
+    {
+        if (status.is_done)
+            break;
         ++count;
     }
 
@@ -1748,29 +1760,55 @@ size_t ReplicatedMergeTreeQueue::countFinishedMutations() const
 }
 
 
-ReplicatedMergeTreeMergePredicate ReplicatedMergeTreeQueue::getMergePredicate(zkutil::ZooKeeperPtr & zookeeper, PartitionIdsHint && partition_ids_hint)
+ReplicatedMergeTreeMergePredicate ReplicatedMergeTreeQueue::getMergePredicate(zkutil::ZooKeeperPtr & zookeeper,
+                                                                              std::optional<PartitionIdsHint> && partition_ids_hint)
 {
     return ReplicatedMergeTreeMergePredicate(*this, zookeeper, std::move(partition_ids_hint));
 }
 
 
-MutationCommands ReplicatedMergeTreeQueue::getFirstAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const
+std::map<int64_t, MutationCommands> ReplicatedMergeTreeQueue::getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const
 {
-    std::lock_guard lock(state_mutex);
+    std::unique_lock lock(state_mutex);
+
     auto in_partition = mutations_by_partition.find(part->info.partition_id);
     if (in_partition == mutations_by_partition.end())
-        return MutationCommands{};
+        return {};
 
-    Int64 part_version = part->info.getDataVersion();
-    for (auto [mutation_version, mutation_status] : in_partition->second)
-        if (mutation_version > part_version && mutation_status->entry->alter_version != -1)
-            return mutation_status->entry->commands;
+    Int64 part_data_version = part->info.getDataVersion();
+    Int64 part_metadata_version = part->getMetadataVersion();
+    LOG_DEBUG(log, "Looking for mutations for part {} (part data version {}, part metadata version {})", part->name, part_data_version, part_metadata_version);
 
-    return MutationCommands{};
+    std::map<int64_t, MutationCommands> result;
+    /// Here we return mutation commands for part which has bigger alter version than part metadata version.
+    /// Please note, we don't use getDataVersion(). It's because these alter commands are used for in-fly conversions
+    /// of part's metadata.
+    for (const auto & [mutation_version, mutation_status] : in_partition->second | std::views::reverse)
+    {
+        auto alter_version = mutation_status->entry->alter_version;
+        if (alter_version != -1)
+        {
+            if (alter_version > storage.getInMemoryMetadataPtr()->getMetadataVersion())
+                continue;
+
+            /// We take commands with bigger metadata version
+            if (alter_version > part_metadata_version)
+                result[mutation_version] = mutation_status->entry->commands;
+        }
+        else if (mutation_version > part_data_version)
+        {
+            result[mutation_version] = mutation_status->entry->commands;
+        }
+    }
+
+    LOG_TRACE(log, "Got {} commands for part {} (part data version {}, part metadata version {})",
+        result.size(), part->name, part_data_version, part_metadata_version);
+
+    return result;
 }
 
 MutationCommands ReplicatedMergeTreeQueue::getMutationCommands(
-    const MergeTreeData::DataPartPtr & part, Int64 desired_mutation_version) const
+    const MergeTreeData::DataPartPtr & part, Int64 desired_mutation_version, Strings & mutation_ids) const
 {
     /// NOTE: If the corresponding mutation is not found, the error is logged (and not thrown as an exception)
     /// to allow recovering from a mutation that cannot be executed. This way you can delete the mutation entry
@@ -1808,7 +1846,13 @@ MutationCommands ReplicatedMergeTreeQueue::getMutationCommands(
 
     MutationCommands commands;
     for (auto it = begin; it != end; ++it)
-        commands.insert(commands.end(), it->second->entry->commands.begin(), it->second->entry->commands.end());
+    {
+        /// FIXME uncomment this assertion after relesing 23.5 (currently it fails in Upgrade check)
+        /// chassert(mutation_pointer < it->second->entry->znode_name);
+        mutation_ids.push_back(it->second->entry->znode_name);
+        const auto & commands_from_entry = it->second->entry->commands;
+        commands.insert(commands.end(), commands_from_entry.begin(), commands_from_entry.end());
+    }
 
     return commands;
 }
@@ -1836,7 +1880,9 @@ bool ReplicatedMergeTreeQueue::tryFinalizeMutations(zkutil::ZooKeeperPtr zookeep
                 alter_sequence.finishDataAlter(mutation.entry->alter_version, lock);
                 if (mutation.parts_to_do.size() != 0)
                 {
-                    LOG_INFO(log, "Seems like we jumped over mutation {} when downloaded part with bigger mutation number.{}", znode, " It's OK, tasks for rest parts will be skipped, but probably a lot of mutations were executed concurrently on different replicas.");
+                    LOG_INFO(log, "Seems like we jumped over mutation {} when downloaded part with bigger mutation number. "
+                                  "It's OK, tasks for rest parts will be skipped, but probably a lot of mutations "
+                                  "were executed concurrently on different replicas.", znode);
                     mutation.parts_to_do.clear();
                 }
             }
@@ -1862,14 +1908,15 @@ bool ReplicatedMergeTreeQueue::tryFinalizeMutations(zkutil::ZooKeeperPtr zookeep
     PartitionIdsHint partition_ids_hint;
     for (const auto & candidate : candidates)
         for (const auto & partitions : candidate->block_numbers)
-            partition_ids_hint.insert(partitions.first);
+            if (!candidate->checked_partitions_cache.contains(partitions.first))
+                partition_ids_hint.insert(partitions.first);
 
     auto merge_pred = getMergePredicate(zookeeper, std::move(partition_ids_hint));
 
     std::vector<const ReplicatedMergeTreeMutationEntry *> finished;
     for (const auto & candidate : candidates)
     {
-        if (merge_pred.isMutationFinished(candidate->znode_name, candidate->block_numbers))
+        if (merge_pred.isMutationFinished(candidate->znode_name, candidate->block_numbers, candidate->checked_partitions_cache))
             finished.push_back(candidate.get());
     }
 
@@ -2060,9 +2107,15 @@ ReplicatedMergeTreeQueue::QueueLocks ReplicatedMergeTreeQueue::lockQueue()
     return QueueLocks(state_mutex, pull_logs_to_queue_mutex, update_mutations_mutex);
 }
 
-ReplicatedMergeTreeMergePredicate::ReplicatedMergeTreeMergePredicate(
-    ReplicatedMergeTreeQueue & queue_, zkutil::ZooKeeperPtr & zookeeper, PartitionIdsHint && partition_ids_hint_)
+LocalMergePredicate::LocalMergePredicate(ReplicatedMergeTreeQueue & queue_)
     : queue(queue_)
+{
+}
+
+ReplicatedMergeTreeMergePredicate::ReplicatedMergeTreeMergePredicate(
+    ReplicatedMergeTreeQueue & queue_, zkutil::ZooKeeperPtr & zookeeper, std::optional<PartitionIdsHint> && partition_ids_hint_)
+    : nested_pred(queue_)
+    , queue(queue_)
     , partition_ids_hint(std::move(partition_ids_hint_))
     , prev_virtual_parts(queue.format_version)
 {
@@ -2079,21 +2132,33 @@ ReplicatedMergeTreeMergePredicate::ReplicatedMergeTreeMergePredicate(
     /// Dropped (or cleaned up by TTL) partitions are never removed from ZK,
     /// so without hint it can do a few thousands requests (if not using MultiRead).
     Strings partitions;
-    if (partition_ids_hint.empty())
+    if (!partition_ids_hint)
         partitions = zookeeper->getChildren(fs::path(queue.zookeeper_path) / "block_numbers");
     else
-        std::copy(partition_ids_hint.begin(), partition_ids_hint.end(), std::back_inserter(partitions));
+        std::copy(partition_ids_hint->begin(), partition_ids_hint->end(), std::back_inserter(partitions));
 
     std::vector<std::string> paths;
     paths.reserve(partitions.size());
     for (const String & partition : partitions)
         paths.push_back(fs::path(queue.zookeeper_path) / "block_numbers" / partition);
 
-    auto locks_children = zookeeper->getChildren(paths);
+    auto locks_children = zookeeper->tryGetChildren(paths);
 
     for (size_t i = 0; i < partitions.size(); ++i)
     {
-        Strings partition_block_numbers = locks_children[i].names;
+        auto & response = locks_children[i];
+        if (response.error != Coordination::Error::ZOK && !partition_ids_hint)
+            throw Coordination::Exception(response.error, paths[i]);
+
+        if (response.error != Coordination::Error::ZOK)
+        {
+            /// Probably a wrong hint was provided (it's ok if a user passed non-existing partition to OPTIMIZE)
+            LOG_WARNING(queue.log, "Partition id '{}' was provided as a hint, but there's not such partition in ZooKeeper", partitions[i]);
+            partition_ids_hint->erase(partitions[i]);
+            continue;
+        }
+
+        Strings partition_block_numbers = response.names;
         for (const String & entry : partition_block_numbers)
         {
             if (!startsWith(entry, "block-"))
@@ -2128,6 +2193,18 @@ ReplicatedMergeTreeMergePredicate::ReplicatedMergeTreeMergePredicate(
         inprogress_quorum_part.clear();
 }
 
+bool LocalMergePredicate::operator()(
+    const MergeTreeData::DataPartPtr & left,
+    const MergeTreeData::DataPartPtr & right,
+    const MergeTreeTransaction *,
+    String * out_reason) const
+{
+    if (left)
+        return canMergeTwoParts(left, right, out_reason);
+    else
+        return canMergeSinglePart(right, out_reason);
+}
+
 bool ReplicatedMergeTreeMergePredicate::operator()(
     const MergeTreeData::DataPartPtr & left,
     const MergeTreeData::DataPartPtr & right,
@@ -2215,7 +2292,7 @@ bool ReplicatedMergeTreeMergePredicate::canMergeTwoParts(
 
     if (left_max_block + 1 < right_min_block)
     {
-        if (!partition_ids_hint.empty() && !partition_ids_hint.contains(left->info.partition_id))
+        if (partition_ids_hint && !partition_ids_hint->contains(left->info.partition_id))
         {
             if (out_reason)
                 *out_reason = fmt::format("Uncommitted block were not loaded for unexpected partition {}", left->info.partition_id);
@@ -2239,6 +2316,17 @@ bool ReplicatedMergeTreeMergePredicate::canMergeTwoParts(
         }
     }
 
+    return nested_pred.canMergeTwoParts(left, right, out_reason);
+}
+
+bool LocalMergePredicate::canMergeTwoParts(
+    const MergeTreeData::DataPartPtr & left,
+    const MergeTreeData::DataPartPtr & right,
+    String * out_reason) const
+{
+    Int64 left_max_block = left->info.max_block;
+    Int64 right_min_block = right->info.min_block;
+
     std::lock_guard lock(queue.state_mutex);
 
     for (const MergeTreeData::DataPartPtr & part : {left, right})
@@ -2274,10 +2362,10 @@ bool ReplicatedMergeTreeMergePredicate::canMergeTwoParts(
         }
     }
 
-    Int64 left_mutation_ver = queue.getCurrentMutationVersionImpl(
+    Int64 left_mutation_ver = queue.getCurrentMutationVersion(
         left->info.partition_id, left->info.getDataVersion(), lock);
 
-    Int64 right_mutation_ver = queue.getCurrentMutationVersionImpl(
+    Int64 right_mutation_ver = queue.getCurrentMutationVersion(
         left->info.partition_id, right->info.getDataVersion(), lock);
 
     if (left_mutation_ver != right_mutation_ver)
@@ -2316,6 +2404,11 @@ bool ReplicatedMergeTreeMergePredicate::canMergeSinglePart(
         return false;
     }
 
+    return nested_pred.canMergeSinglePart(part, out_reason);
+}
+
+bool LocalMergePredicate::canMergeSinglePart(const MergeTreeData::DataPartPtr & part, String * out_reason) const
+{
     std::lock_guard lock(queue.state_mutex);
 
     /// We look for containing parts in queue.virtual_parts (and not in prev_virtual_parts) because queue.virtual_parts is newer
@@ -2378,13 +2471,32 @@ std::optional<std::pair<Int64, int>> ReplicatedMergeTreeMergePredicate::getDesir
     if (in_partition == queue.mutations_by_partition.end())
         return {};
 
-    Int64 current_version = queue.getCurrentMutationVersionImpl(part->info.partition_id, part->info.getDataVersion(), lock);
-    Int64 max_version = in_partition->second.rbegin()->first;
+    UInt64 mutations_limit = queue.storage.getSettings()->replicated_max_mutations_in_one_entry;
+    UInt64 mutations_count = 0;
+
+    Int64 current_version = queue.getCurrentMutationVersion(part->info.partition_id, part->info.getDataVersion(), lock);
+    Int64 max_version = in_partition->second.begin()->first;
 
     int alter_version = -1;
+    bool barrier_found = false;
     for (auto [mutation_version, mutation_status] : in_partition->second)
     {
+        /// Some commands cannot stick together with other commands
+        if (mutation_status->entry->commands.containBarrierCommand())
+        {
+            /// We already collected some mutation, we don't want to stick it with barrier
+            if (max_version != mutation_version && max_version > current_version)
+                break;
+
+            /// This mutations is fresh, but it's barrier, let's execute only it
+            if (mutation_version > current_version)
+                barrier_found = true;
+        }
+
         max_version = mutation_version;
+        if (current_version < max_version)
+            ++mutations_count;
+
         if (mutation_status->entry->isAlterMutation())
         {
             /// We want to assign mutations for part which version is bigger
@@ -2397,16 +2509,30 @@ std::optional<std::pair<Int64, int>> ReplicatedMergeTreeMergePredicate::getDesir
                 break;
             }
         }
+
+        if (mutations_limit && mutations_count == mutations_limit)
+        {
+            LOG_WARNING(queue.log, "Will apply only {} of {} mutations and mutate part {} to version {} (the last version is {})",
+                        mutations_count, in_partition->second.size(), part->name, max_version, in_partition->second.rbegin()->first);
+            break;
+        }
+
+        if (barrier_found == true)
+            break;
     }
 
     if (current_version >= max_version)
         return {};
 
+    LOG_TRACE(queue.log, "Will apply {} mutations and mutate part {} to version {} (the last version is {})",
+              mutations_count, part->name, max_version, in_partition->second.rbegin()->first);
+
     return std::make_pair(max_version, alter_version);
 }
 
 
-bool ReplicatedMergeTreeMergePredicate::isMutationFinished(const std::string & znode_name, const std::map<String, int64_t> & block_numbers) const
+bool ReplicatedMergeTreeMergePredicate::isMutationFinished(const std::string & znode_name, const std::map<String, int64_t> & block_numbers,
+                                                           std::unordered_set<String> & checked_partitions_cache) const
 {
     /// Check committing block numbers, maybe some affected inserts
     /// still not written to disk and committed to ZK.
@@ -2415,7 +2541,11 @@ bool ReplicatedMergeTreeMergePredicate::isMutationFinished(const std::string & z
         const String & partition_id = kv.first;
         Int64 block_num = kv.second;
 
-        if (!partition_ids_hint.empty() && !partition_ids_hint.contains(partition_id))
+        /// Maybe we already know that there are no relevant uncommitted blocks
+        if (checked_partitions_cache.contains(partition_id))
+            continue;
+
+        if (partition_ids_hint && !partition_ids_hint->contains(partition_id))
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Partition id {} was not provided as hint, it's a bug", partition_id);
 
         auto partition_it = committing_blocks.find(partition_id);
@@ -2429,6 +2559,10 @@ bool ReplicatedMergeTreeMergePredicate::isMutationFinished(const std::string & z
                 return false;
             }
         }
+
+        /// There are no committing blocks less than block_num in that partition and there's no way they can appear
+        /// TODO Why not to get committing blocks when pulling a mutation? We could get rid of finalization task or simplify it
+        checked_partitions_cache.insert(partition_id);
     }
 
     std::lock_guard lock(queue.state_mutex);
@@ -2463,40 +2597,65 @@ String ReplicatedMergeTreeMergePredicate::getCoveringVirtualPart(const String &
 
 
 ReplicatedMergeTreeQueue::SubscriberHandler
-ReplicatedMergeTreeQueue::addSubscriber(ReplicatedMergeTreeQueue::SubscriberCallBack && callback)
+ReplicatedMergeTreeQueue::addSubscriber(ReplicatedMergeTreeQueue::SubscriberCallBack && callback,
+                                        std::unordered_set<String> & out_entry_names, SyncReplicaMode sync_mode)
 {
-    std::lock_guard lock(state_mutex);
-    std::unordered_set<String> result;
-    result.reserve(queue.size());
-    for (const auto & entry : queue)
-        result.insert(entry->znode_name);
-
+    std::lock_guard<std::mutex> lock(state_mutex);
     std::lock_guard lock_subscribers(subscribers_mutex);
 
+    if (sync_mode != SyncReplicaMode::PULL)
+    {
+        /// We must get the list of entries to wait atomically with adding the callback
+        bool lightweight_entries_only = sync_mode == SyncReplicaMode::LIGHTWEIGHT;
+        static constexpr std::array lightweight_entries =
+        {
+            LogEntry::GET_PART,
+            LogEntry::ATTACH_PART,
+            LogEntry::DROP_RANGE,
+            LogEntry::REPLACE_RANGE,
+            LogEntry::DROP_PART
+        };
+        out_entry_names.reserve(queue.size());
+        for (const auto & entry : queue)
+        {
+            if (!lightweight_entries_only
+                || std::find(lightweight_entries.begin(), lightweight_entries.end(), entry->type) != lightweight_entries.end())
+                out_entry_names.insert(entry->znode_name);
+        }
+        LOG_TEST(log, "Waiting for {} entries to be processed: {}", out_entry_names.size(), fmt::join(out_entry_names, ", "));
+    }
+
     auto it = subscribers.emplace(subscribers.end(), std::move(callback));
 
-    /// Notify queue size & log entry ids to avoid waiting for removed entries
-    (*it)(result.size(), result, std::nullopt);
+    /// Atomically notify about current size
+    (*it)(queue.size(), nullptr);
 
     return SubscriberHandler(it, *this);
 }
 
+void ReplicatedMergeTreeQueue::notifySubscribersOnPartialShutdown()
+{
+    size_t queue_size;
+    {
+        std::lock_guard<std::mutex> lock(state_mutex);
+        queue_size = queue.size();
+    }
+    std::lock_guard lock_subscribers(subscribers_mutex);
+    for (auto & subscriber_callback : subscribers)
+        subscriber_callback(queue_size, nullptr);
+}
+
 ReplicatedMergeTreeQueue::SubscriberHandler::~SubscriberHandler()
 {
     std::lock_guard lock(queue.subscribers_mutex);
     queue.subscribers.erase(it);
 }
 
-void ReplicatedMergeTreeQueue::notifySubscribers(size_t new_queue_size, std::optional<String> removed_log_entry_id)
+void ReplicatedMergeTreeQueue::notifySubscribers(size_t new_queue_size, const String * removed_log_entry_id)
 {
     std::lock_guard lock_subscribers(subscribers_mutex);
     for (auto & subscriber_callback : subscribers)
-        subscriber_callback(new_queue_size, {}, removed_log_entry_id);
-}
-
-ReplicatedMergeTreeQueue::~ReplicatedMergeTreeQueue()
-{
-    notifySubscribers(0, std::nullopt);
+        subscriber_callback(new_queue_size, removed_log_entry_id);
 }
 
 String padIndex(Int64 index)
@@ -2509,7 +2668,7 @@ void ReplicatedMergeTreeQueue::removeCurrentPartsFromMutations()
 {
     std::lock_guard state_lock(state_mutex);
     for (const auto & part_name : current_parts.getParts())
-        removeCoveredPartsFromMutations(part_name, /*remove_part = */ true, /*remove_covered_parts = */ true);
+        removeCoveredPartsFromMutations(part_name, /*remove_part = */ false, /*remove_covered_parts = */ true);
 }
 
 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
index 36552129690..79572e13963 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
@@ -3,6 +3,7 @@
 #include <optional>
 
 #include <Common/ActionBlocker.h>
+#include <Parsers/SyncReplicaMode.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h>
 #include <Storages/MergeTree/ActiveDataPartSet.h>
@@ -31,6 +32,7 @@ class ReplicatedMergeTreeQueue
 {
 private:
     friend class CurrentlyExecuting;
+    friend class LocalMergePredicate;
     friend class ReplicatedMergeTreeMergePredicate;
     friend class MergeFromLogEntryTask;
     friend class ReplicatedMergeMutateTaskBase;
@@ -164,7 +166,7 @@ private:
     /// A subscriber callback is called when an entry queue is deleted
     mutable std::mutex subscribers_mutex;
 
-    using SubscriberCallBack = std::function<void(size_t /* queue_size */, std::unordered_set<String> /*wait_for_ids*/, std::optional<String> /* removed_log_entry_id */)>;
+    using SubscriberCallBack = std::function<void(size_t /* queue_size */, const String * /* removed_log_entry_id */)>;
     using Subscribers = std::list<SubscriberCallBack>;
     using SubscriberIterator = Subscribers::iterator;
 
@@ -182,7 +184,7 @@ private:
     Subscribers subscribers;
 
     /// Notify subscribers about queue change (new queue size and entry that was removed)
-    void notifySubscribers(size_t new_queue_size, std::optional<String> removed_log_entry_id);
+    void notifySubscribers(size_t new_queue_size, const String * removed_log_entry_id);
 
     /// Check that entry_ptr is REPLACE_RANGE entry and can be removed from queue because current entry covers it
     bool checkReplaceRangeCanBeRemoved(
@@ -206,7 +208,11 @@ private:
         MergeTreeDataMergerMutator & merger_mutator, MergeTreeData & data,
         std::unique_lock<std::mutex> & state_lock) const;
 
-    Int64 getCurrentMutationVersionImpl(const String & partition_id, Int64 data_version, std::lock_guard<std::mutex> & /* state_lock */) const;
+    /// Return the version (block number) of the last mutation that we don't need to apply to the part
+    /// with getDataVersion() == data_version. (Either this mutation was already applied or the part
+    /// was created after the mutation).
+    /// If there is no such mutation or it has already been executed and deleted, return 0.
+    Int64 getCurrentMutationVersion(const String & partition_id, Int64 data_version, std::lock_guard<std::mutex> & /* state_lock */) const;
 
     /** Check that part isn't in currently generating parts and isn't covered by them.
       * Should be called under state_mutex.
@@ -287,7 +293,7 @@ private:
 
 public:
     ReplicatedMergeTreeQueue(StorageReplicatedMergeTree & storage_, ReplicatedMergeTreeMergeStrategyPicker & merge_strategy_picker_);
-    ~ReplicatedMergeTreeQueue();
+    ~ReplicatedMergeTreeQueue() = default;
 
     /// Clears queue state
     void clear();
@@ -381,22 +387,20 @@ public:
 
     /// Count the total number of active mutations that are finished (is_done = true).
     size_t countFinishedMutations() const;
+    /// Count the total number of active mutations that are not finished (is_done = false).
+    size_t countUnfinishedMutations() const;
 
     /// Returns functor which used by MergeTreeMergerMutator to select parts for merge
-    ReplicatedMergeTreeMergePredicate getMergePredicate(zkutil::ZooKeeperPtr & zookeeper, PartitionIdsHint && partition_ids_hint);
+    ReplicatedMergeTreeMergePredicate getMergePredicate(zkutil::ZooKeeperPtr & zookeeper,
+                                                        std::optional<PartitionIdsHint> && partition_ids_hint);
 
-    /// Return the version (block number) of the last mutation that we don't need to apply to the part
-    /// with getDataVersion() == data_version. (Either this mutation was already applied or the part
-    /// was created after the mutation).
-    /// If there is no such mutation or it has already been executed and deleted, return 0.
-    Int64 getCurrentMutationVersion(const String & partition_id, Int64 data_version) const;
+    MutationCommands getMutationCommands(const MergeTreeData::DataPartPtr & part, Int64 desired_mutation_version,
+                                         Strings & mutation_ids) const;
 
-    MutationCommands getMutationCommands(const MergeTreeData::DataPartPtr & part, Int64 desired_mutation_version) const;
-
-    /// Return mutation commands for part with smallest mutation version bigger
-    /// than data part version. Used when we apply alter commands on fly,
+    /// Return mutation commands for part which could be not applied to
+    /// it according to part mutation version. Used when we apply alter commands on fly,
     /// without actual data modification on disk.
-    MutationCommands getFirstAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const;
+    std::map<int64_t, MutationCommands> getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const;
 
     /// Mark finished mutations as done. If the function needs to be called again at some later time
     /// (because some mutations are probably done but we are not sure yet), returns true.
@@ -425,7 +429,9 @@ public:
     ActionBlocker pull_log_blocker;
 
     /// Adds a subscriber
-    SubscriberHandler addSubscriber(SubscriberCallBack && callback);
+    SubscriberHandler addSubscriber(SubscriberCallBack && callback, std::unordered_set<String> & out_entry_names, SyncReplicaMode sync_mode);
+
+    void notifySubscribersOnPartialShutdown();
 
     struct Status
     {
@@ -485,10 +491,33 @@ public:
     void createLogEntriesToFetchBrokenParts();
 };
 
+/// Lightweight version of ReplicatedMergeTreeMergePredicate that do not make any ZooKeeper requests,
+/// but may return false-positive results. Checks only a subset of required conditions.
+class LocalMergePredicate
+{
+public:
+    LocalMergePredicate(ReplicatedMergeTreeQueue & queue_);
+
+    bool operator()(const MergeTreeData::DataPartPtr & left,
+                    const MergeTreeData::DataPartPtr & right,
+                    const MergeTreeTransaction * txn,
+                    String * out_reason = nullptr) const;
+
+    bool canMergeTwoParts(const MergeTreeData::DataPartPtr & left,
+                          const MergeTreeData::DataPartPtr & right,
+                          String * out_reason = nullptr) const;
+
+    bool canMergeSinglePart(const MergeTreeData::DataPartPtr & part, String * out_reason) const;
+
+private:
+    const ReplicatedMergeTreeQueue & queue;
+};
+
 class ReplicatedMergeTreeMergePredicate
 {
 public:
-    ReplicatedMergeTreeMergePredicate(ReplicatedMergeTreeQueue & queue_, zkutil::ZooKeeperPtr & zookeeper, PartitionIdsHint && partition_ids_hint_);
+    ReplicatedMergeTreeMergePredicate(ReplicatedMergeTreeQueue & queue_, zkutil::ZooKeeperPtr & zookeeper,
+                                      std::optional<PartitionIdsHint> && partition_ids_hint_);
 
     /// Depending on the existence of left part checks a merge predicate for two parts or for single part.
     bool operator()(const MergeTreeData::DataPartPtr & left,
@@ -519,7 +548,8 @@ public:
     /// don't glue them together. Alter is rare operation, so it shouldn't affect performance.
     std::optional<std::pair<Int64, int>> getDesiredMutationVersion(const MergeTreeData::DataPartPtr & part) const;
 
-    bool isMutationFinished(const std::string & znode_name, const std::map<String, int64_t> & block_numbers) const;
+    bool isMutationFinished(const std::string & znode_name, const std::map<String, int64_t> & block_numbers,
+                            std::unordered_set<String> & checked_partitions_cache) const;
 
     /// The version of "log" node that is used to check that no new merges have appeared.
     int32_t getVersion() const { return merges_version; }
@@ -531,9 +561,11 @@ public:
     String getCoveringVirtualPart(const String & part_name) const;
 
 private:
+    LocalMergePredicate nested_pred;
+
     const ReplicatedMergeTreeQueue & queue;
 
-    PartitionIdsHint partition_ids_hint;
+    std::optional<PartitionIdsHint> partition_ids_hint;
 
     /// A snapshot of active parts that would appear if the replica executes all log entries in its queue.
     ActiveDataPartSet prev_virtual_parts;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index 357b9e0125a..d7166b4a3b9 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -365,6 +365,12 @@ void ReplicatedMergeTreeRestartingThread::setReadonly(bool on_shutdown)
         CurrentMetrics::sub(CurrentMetrics::ReadonlyReplica);
         assert(CurrentMetrics::get(CurrentMetrics::ReadonlyReplica) >= 0);
     }
+
+    if (storage.since_metadata_err_incr_readonly_metric)
+    {
+        CurrentMetrics::sub(CurrentMetrics::ReadonlyReplica);
+        assert(CurrentMetrics::get(CurrentMetrics::ReadonlyReplica) >= 0);
+    }
 }
 
 void ReplicatedMergeTreeRestartingThread::setNotReadonly()
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
index b5314de9dcc..9e99baab4c3 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Poco/Event.h>
-#include <Common/logger_useful.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <base/types.h>
 #include <thread>
@@ -24,12 +23,19 @@ class ReplicatedMergeTreeRestartingThread
 public:
     explicit ReplicatedMergeTreeRestartingThread(StorageReplicatedMergeTree & storage_);
 
-    void start() { task->activateAndSchedule(); }
+    void start(bool schedule = true)
+    {
+        if (schedule)
+            task->activateAndSchedule();
+        else
+            task->activate();
+    }
 
     void wakeup() { task->schedule(); }
 
     void shutdown(bool part_of_full_shutdown);
 
+    void run();
 private:
     StorageReplicatedMergeTree & storage;
     String log_name;
@@ -44,8 +50,6 @@ private:
     UInt32 consecutive_check_failures = 0;  /// How many consecutive checks have failed
     bool first_time = true;                 /// Activate replica for the first time.
 
-    void run();
-
     /// Restarts table if needed, returns false if it failed to restart replica.
     bool runImpl();
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
index 035cbdac55e..a38e9eba844 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -2,6 +2,7 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeSink.h>
 #include <Interpreters/PartLog.h>
+#include <Common/FailPoint.h>
 #include <Common/ProfileEventsScope.h>
 #include <Common/SipHash.h>
 #include <Common/ZooKeeper/KeeperException.h>
@@ -20,6 +21,11 @@ namespace ProfileEvents
 namespace DB
 {
 
+namespace FailPoints
+{
+    extern const char replicated_merge_tree_commit_zk_fail_after_op[];
+}
+
 namespace ErrorCodes
 {
     extern const int TOO_FEW_LIVE_REPLICAS;
@@ -269,7 +275,7 @@ ReplicatedMergeTreeSinkImpl<async_insert>::ReplicatedMergeTreeSinkImpl(
     , deduplicate(deduplicate_)
     , log(&Poco::Logger::get(storage.getLogName() + " (Replicated OutputStream)"))
     , context(context_)
-    , storage_snapshot(storage.getStorageSnapshotWithoutParts(metadata_snapshot))
+    , storage_snapshot(storage.getStorageSnapshotWithoutData(metadata_snapshot, context_))
 {
     /// The quorum value `1` has the same meaning as if it is disabled.
     if (required_quorum_size == 1)
@@ -384,7 +390,7 @@ void ReplicatedMergeTreeSinkImpl<async_insert>::consume(Chunk chunk)
       * TODO Too complex logic, you can do better.
       */
     size_t replicas_num = 0;
-    ZooKeeperRetriesControl quorum_retries_ctl("checkQuorumPrecondition", zookeeper_retries_info);
+    ZooKeeperRetriesControl quorum_retries_ctl("checkQuorumPrecondition", zookeeper_retries_info, context->getProcessListElement());
     quorum_retries_ctl.retryLoop(
         [&]()
         {
@@ -641,7 +647,7 @@ std::vector<String> ReplicatedMergeTreeSinkImpl<async_insert>::commitPart(
     Coordination::Error write_part_info_keeper_error = Coordination::Error::ZOK;
     std::vector<String> conflict_block_ids;
 
-    ZooKeeperRetriesControl retries_ctl("commitPart", zookeeper_retries_info);
+    ZooKeeperRetriesControl retries_ctl("commitPart", zookeeper_retries_info, context->getProcessListElement());
     retries_ctl.retryLoop([&]()
     {
         zookeeper->setKeeper(storage.getZooKeeper());
@@ -940,6 +946,16 @@ std::vector<String> ReplicatedMergeTreeSinkImpl<async_insert>::commitPart(
 
         ThreadFuzzer::maybeInjectSleep();
 
+        fiu_do_on(FailPoints::replicated_merge_tree_commit_zk_fail_after_op,
+        {
+            if (!zookeeper->fault_policy)
+            {
+                zookeeper->logger = log;
+                zookeeper->fault_policy = std::make_unique<RandomFaultInjection>(0, 0);
+            }
+            zookeeper->fault_policy->must_fail_after_op = true;
+        });
+
         Coordination::Responses responses;
         Coordination::Error multi_code = zookeeper->tryMultiNoThrow(ops, responses); /// 1 RTT
         if (multi_code == Coordination::Error::ZOK)
@@ -973,8 +989,10 @@ std::vector<String> ReplicatedMergeTreeSinkImpl<async_insert>::commitPart(
             /// here lambda capture part name, it's ok since we'll not generate new one for this insert,
             /// see comments around 'part_committed_locally_but_zookeeper' flag
             retries_ctl.actionAfterLastFailedRetry(
-                [&storage = storage, part_name = part->name]()
-                { storage.enqueuePartForCheck(part_name, MAX_AGE_OF_LOCAL_PART_THAT_WASNT_ADDED_TO_ZOOKEEPER); });
+                [&my_storage = storage, part_name = part->name]
+                {
+                    my_storage.enqueuePartForCheck(part_name, MAX_AGE_OF_LOCAL_PART_THAT_WASNT_ADDED_TO_ZOOKEEPER);
+                });
 
             /// We do not know whether or not data has been inserted.
             retries_ctl.setUserError(
@@ -1073,13 +1091,26 @@ std::vector<String> ReplicatedMergeTreeSinkImpl<async_insert>::commitPart(
         }
     },
     [&zookeeper]() { zookeeper->cleanupEphemeralNodes(); });
+
     if (!conflict_block_ids.empty())
         return conflict_block_ids;
+
     if (isQuorumEnabled())
     {
-        ZooKeeperRetriesControl quorum_retries_ctl("waitForQuorum", zookeeper_retries_info);
+        ZooKeeperRetriesControl quorum_retries_ctl("waitForQuorum", zookeeper_retries_info, context->getProcessListElement());
         quorum_retries_ctl.retryLoop([&]()
         {
+            if (storage.is_readonly)
+            {
+                /// stop retries if in shutdown
+                if (storage.shutdown_called)
+                    throw Exception(
+                        ErrorCodes::TABLE_IS_READ_ONLY, "Table is in readonly mode due to shutdown: replica_path={}", storage.replica_path);
+
+                quorum_retries_ctl.setUserError(ErrorCodes::TABLE_IS_READ_ONLY, "Table is in readonly mode: replica_path={}", storage.replica_path);
+                return;
+            }
+
             zookeeper->setKeeper(storage.getZooKeeper());
 
             if (is_already_existing_part)
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
index f06ce725daa..41ff93e28f7 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
@@ -456,6 +456,14 @@ StorageInMemoryMetadata ReplicatedMergeTreeTableMetadata::Diff::getNewMetadata(c
         new_metadata.table_ttl = TTLTableDescription::getTTLForTableFromAST(
             new_metadata.table_ttl.definition_ast, new_metadata.columns, context, new_metadata.primary_key);
 
+    if (!projections_changed)
+    {
+        ProjectionsDescription recalculated_projections;
+        for (const auto & projection : new_metadata.projections)
+            recalculated_projections.add(ProjectionDescription::getProjectionFromAST(projection.definition_ast, new_metadata.columns, context));
+        new_metadata.projections = std::move(recalculated_projections);
+    }
+
     return new_metadata;
 }
 
diff --git a/src/Storages/MergeTree/ReplicatedTableStatus.h b/src/Storages/MergeTree/ReplicatedTableStatus.h
index b9f84091e9b..ce9ad3640f4 100644
--- a/src/Storages/MergeTree/ReplicatedTableStatus.h
+++ b/src/Storages/MergeTree/ReplicatedTableStatus.h
@@ -16,6 +16,7 @@ struct ReplicatedTableStatus
 
     ReplicatedMergeTreeQueue::Status queue;
     UInt32 parts_to_check;
+    String zookeeper_name;
     String zookeeper_path;
     String replica_name;
     String replica_path;
@@ -25,6 +26,7 @@ struct ReplicatedTableStatus
     UInt64 absolute_delay;
     UInt8 total_replicas;
     UInt8 active_replicas;
+    UInt64 lost_part_count;
     String last_queue_update_exception;
     /// If the error has happened fetching the info from ZooKeeper, this field will be set.
     String zookeeper_exception;
diff --git a/src/Storages/MergeTree/RequestResponse.cpp b/src/Storages/MergeTree/RequestResponse.cpp
index 5249128590f..05930d5a4c4 100644
--- a/src/Storages/MergeTree/RequestResponse.cpp
+++ b/src/Storages/MergeTree/RequestResponse.cpp
@@ -3,7 +3,7 @@
 
 #include <Core/ProtocolDefines.h>
 #include <Common/SipHash.h>
-#include "IO/VarInt.h"
+#include <IO/VarInt.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 
@@ -15,6 +15,18 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int UNKNOWN_PROTOCOL;
+    extern const int UNKNOWN_ELEMENT_OF_ENUM;
+}
+
+namespace
+{
+     CoordinationMode validateAndGet(uint8_t candidate)
+    {
+        if (candidate <= static_cast<uint8_t>(CoordinationMode::MAX))
+            return static_cast<CoordinationMode>(candidate);
+
+        throw Exception(ErrorCodes::UNKNOWN_ELEMENT_OF_ENUM, "Unknown reading mode: {}", candidate);
+    }
 }
 
 void ParallelReadRequest::serialize(WriteBuffer & out) const
@@ -48,7 +60,9 @@ void ParallelReadRequest::deserialize(ReadBuffer & in)
             "from replicas differ. Got: {}, supported version: {}",
             version, DBMS_PARALLEL_REPLICAS_PROTOCOL_VERSION);
 
-    readIntBinary(mode, in);
+    uint8_t mode_candidate;
+    readIntBinary(mode_candidate, in);
+    mode = validateAndGet(mode_candidate);
     readIntBinary(replica_num, in);
     readIntBinary(min_number_of_marks, in);
     description.deserialize(in);
@@ -74,10 +88,7 @@ void ParallelReadResponse::serialize(WriteBuffer & out) const
 
 String ParallelReadResponse::describe() const
 {
-    String result;
-    result += fmt::format("finish: {} \n", finish);
-    result += description.describe();
-    return result;
+    return fmt::format("{}. Finish: {}", description.describe(), finish);
 }
 
 void ParallelReadResponse::deserialize(ReadBuffer & in)
@@ -100,6 +111,7 @@ void InitialAllRangesAnnouncement::serialize(WriteBuffer & out) const
     /// Must be the first
     writeIntBinary(version, out);
 
+    writeIntBinary(mode, out);
     description.serialize(out);
     writeIntBinary(replica_num, out);
 }
@@ -122,6 +134,9 @@ void InitialAllRangesAnnouncement::deserialize(ReadBuffer & in)
             "from replicas differ. Got: {}, supported version: {}",
             version, DBMS_PARALLEL_REPLICAS_PROTOCOL_VERSION);
 
+    uint8_t mode_candidate;
+    readIntBinary(mode_candidate, in);
+    mode = validateAndGet(mode_candidate);
     description.deserialize(in);
     readIntBinary(replica_num, in);
 }
diff --git a/src/Storages/MergeTree/RequestResponse.h b/src/Storages/MergeTree/RequestResponse.h
index 8cdb9e49be5..7e5563c0553 100644
--- a/src/Storages/MergeTree/RequestResponse.h
+++ b/src/Storages/MergeTree/RequestResponse.h
@@ -16,12 +16,16 @@
 namespace DB
 {
 
-enum class CoordinationMode
+/// This enum is being serialized and transferred over a network
+/// You can't reorder it or add another value in the middle
+enum class CoordinationMode : uint8_t
 {
-    Default,
+    Default = 0,
     /// For reading in order
-    WithOrder,
-    ReverseOrder
+    WithOrder = 1,
+    ReverseOrder = 2,
+
+    MAX = ReverseOrder,
 };
 
 /// Represents a segment [left; right]
@@ -64,6 +68,7 @@ struct ParallelReadResponse
 
 struct InitialAllRangesAnnouncement
 {
+    CoordinationMode mode;
     RangesInDataPartsDescription description;
     size_t replica_num;
 
diff --git a/src/Storages/MergeTree/SimpleMergeSelector.cpp b/src/Storages/MergeTree/SimpleMergeSelector.cpp
index 15291622a2a..af3373fd175 100644
--- a/src/Storages/MergeTree/SimpleMergeSelector.cpp
+++ b/src/Storages/MergeTree/SimpleMergeSelector.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/SimpleMergeSelector.h>
 
-#include <Common/interpolate.h>
+#include <base/interpolate.h>
 
 #include <cmath>
 #include <cassert>
@@ -28,7 +28,7 @@ struct Estimator
         {
             double difference = std::abs(log2(static_cast<double>(sum_size) / size_prev_at_left));
             if (difference < settings.heuristic_to_align_parts_max_absolute_difference_in_powers_of_two)
-                current_score *= interpolateLinear(settings.heuristic_to_align_parts_max_score_adjustment, 1,
+                current_score *= std::lerp(settings.heuristic_to_align_parts_max_score_adjustment, 1,
                     difference / settings.heuristic_to_align_parts_max_absolute_difference_in_powers_of_two);
         }
 
@@ -115,8 +115,8 @@ bool allow(
 //    std::cerr << "size_normalized: " << size_normalized << "\n";
 
     /// Calculate boundaries for age
-    double min_age_to_lower_base = interpolateLinear(settings.min_age_to_lower_base_at_min_size, settings.min_age_to_lower_base_at_max_size, size_normalized);
-    double max_age_to_lower_base = interpolateLinear(settings.max_age_to_lower_base_at_min_size, settings.max_age_to_lower_base_at_max_size, size_normalized);
+    double min_age_to_lower_base = std::lerp(settings.min_age_to_lower_base_at_min_size, settings.min_age_to_lower_base_at_max_size, size_normalized);
+    double max_age_to_lower_base = std::lerp(settings.max_age_to_lower_base_at_min_size, settings.max_age_to_lower_base_at_max_size, size_normalized);
 
 //    std::cerr << "min_age_to_lower_base: " << min_age_to_lower_base << "\n";
 //    std::cerr << "max_age_to_lower_base: " << max_age_to_lower_base << "\n";
@@ -137,7 +137,7 @@ bool allow(
 
 //    std::cerr << "combined_ratio: " << combined_ratio << "\n";
 
-    double lowered_base = interpolateLinear(settings.base, 2.0, combined_ratio);
+    double lowered_base = std::lerp(settings.base, 2.0, combined_ratio);
 
 //    std::cerr << "------- lowered_base: " << lowered_base << "\n";
 
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
index 7bad9947a88..17078d3e73b 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
@@ -3,6 +3,7 @@
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+#include <Storages/MergeTree/AlterConversions.h>
 #include <DataTypes/ObjectUtils.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
@@ -28,6 +29,7 @@ public:
     explicit StorageFromMergeTreeDataPart(const MergeTreeData::DataPartPtr & part_)
         : IStorage(getIDFromPart(part_))
         , parts({part_})
+        , alter_conversions({part_->storage.getAlterConversionsForPart(part_)})
         , storage(part_->storage)
         , partition_id(part_->info.partition_id)
     {
@@ -54,7 +56,7 @@ public:
             parts.begin(), parts.end(),
             storage_columns, [](const auto & part) -> const auto & { return part->getColumns(); });
 
-        return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, object_columns);
+        return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, std::move(object_columns));
     }
 
     void read(
@@ -67,9 +69,10 @@ public:
         size_t max_block_size,
         size_t num_streams) override
     {
-        query_plan = std::move(*MergeTreeDataSelectExecutor(storage)
+        query_plan.addStep(MergeTreeDataSelectExecutor(storage)
                                               .readFromParts(
                                                   parts,
+                                                  alter_conversions,
                                                   column_names,
                                                   storage_snapshot,
                                                   query_info,
@@ -126,6 +129,7 @@ public:
 
 private:
     const MergeTreeData::DataPartsVector parts;
+    const std::vector<AlterConversionsPtr> alter_conversions;
     const MergeTreeData & storage;
     const String partition_id;
     const MergeTreeDataSelectAnalysisResultPtr analysis_result_ptr;
diff --git a/src/Storages/MergeTree/TTLMergeSelector.cpp b/src/Storages/MergeTree/TTLMergeSelector.cpp
index d5657aa680d..f4c698d76d7 100644
--- a/src/Storages/MergeTree/TTLMergeSelector.cpp
+++ b/src/Storages/MergeTree/TTLMergeSelector.cpp
@@ -11,7 +11,7 @@ namespace DB
 
 const String & getPartitionIdForPart(const ITTLMergeSelector::Part & part_info)
 {
-    const MergeTreeData::DataPartPtr & part = *static_cast<const MergeTreeData::DataPartPtr *>(part_info.data);
+    const MergeTreeData::DataPartPtr & part = part_info.getDataPartPtr();
     return part->info.partition_id;
 }
 
@@ -90,8 +90,11 @@ IMergeSelector::PartsRange ITTLMergeSelector::select(
         ++best_end;
     }
 
-    const auto & best_partition_id = getPartitionIdForPart(best_partition.front());
-    merge_due_times[best_partition_id] = current_time + merge_cooldown_time;
+    if (!dry_run)
+    {
+        const auto & best_partition_id = getPartitionIdForPart(best_partition.front());
+        merge_due_times[best_partition_id] = current_time + merge_cooldown_time;
+    }
 
     return PartsRange(best_begin, best_end);
 }
diff --git a/src/Storages/MergeTree/TTLMergeSelector.h b/src/Storages/MergeTree/TTLMergeSelector.h
index 88dc1fffee2..8c82e284a45 100644
--- a/src/Storages/MergeTree/TTLMergeSelector.h
+++ b/src/Storages/MergeTree/TTLMergeSelector.h
@@ -21,10 +21,11 @@ class ITTLMergeSelector : public IMergeSelector
 public:
     using PartitionIdToTTLs = std::map<String, time_t>;
 
-    ITTLMergeSelector(PartitionIdToTTLs & merge_due_times_, time_t current_time_, Int64 merge_cooldown_time_)
+    ITTLMergeSelector(PartitionIdToTTLs & merge_due_times_, time_t current_time_, Int64 merge_cooldown_time_, bool dry_run_)
         : current_time(current_time_)
         , merge_due_times(merge_due_times_)
         , merge_cooldown_time(merge_cooldown_time_)
+        , dry_run(dry_run_)
     {
     }
 
@@ -46,6 +47,7 @@ protected:
 private:
     PartitionIdToTTLs & merge_due_times;
     Int64 merge_cooldown_time;
+    bool dry_run;
 };
 
 
@@ -56,8 +58,9 @@ class TTLDeleteMergeSelector : public ITTLMergeSelector
 public:
     using PartitionIdToTTLs = std::map<String, time_t>;
 
-    TTLDeleteMergeSelector(PartitionIdToTTLs & merge_due_times_, time_t current_time_, Int64 merge_cooldown_time_, bool only_drop_parts_)
-        : ITTLMergeSelector(merge_due_times_, current_time_, merge_cooldown_time_)
+    TTLDeleteMergeSelector(PartitionIdToTTLs & merge_due_times_, time_t current_time_, Int64 merge_cooldown_time_,
+                           bool only_drop_parts_, bool dry_run_)
+        : ITTLMergeSelector(merge_due_times_, current_time_, merge_cooldown_time_, dry_run_)
         , only_drop_parts(only_drop_parts_) {}
 
     time_t getTTLForPart(const IMergeSelector::Part & part) const override;
@@ -75,8 +78,9 @@ private:
 class TTLRecompressMergeSelector : public ITTLMergeSelector
 {
 public:
-    TTLRecompressMergeSelector(PartitionIdToTTLs & merge_due_times_, time_t current_time_, Int64 merge_cooldown_time_, const TTLDescriptions & recompression_ttls_)
-        : ITTLMergeSelector(merge_due_times_, current_time_, merge_cooldown_time_)
+    TTLRecompressMergeSelector(PartitionIdToTTLs & merge_due_times_, time_t current_time_, Int64 merge_cooldown_time_,
+                               const TTLDescriptions & recompression_ttls_, bool dry_run_)
+        : ITTLMergeSelector(merge_due_times_, current_time_, merge_cooldown_time_, dry_run_)
         , recompression_ttls(recompression_ttls_)
     {}
 
diff --git a/src/Storages/MergeTree/ZeroCopyLock.cpp b/src/Storages/MergeTree/ZeroCopyLock.cpp
index 53dfe0c769f..cca005dd7c0 100644
--- a/src/Storages/MergeTree/ZeroCopyLock.cpp
+++ b/src/Storages/MergeTree/ZeroCopyLock.cpp
@@ -3,7 +3,7 @@
 namespace DB
 {
     ZeroCopyLock::ZeroCopyLock(const zkutil::ZooKeeperPtr & zookeeper, const std::string & lock_path, const std::string & lock_message)
-        : lock(zkutil::createSimpleZooKeeperLock(zookeeper, lock_path, "part_exclusive_lock", lock_message))
+        : lock(zkutil::createSimpleZooKeeperLock(zookeeper, lock_path, ZERO_COPY_LOCK_NAME, lock_message))
     {
     }
 }
diff --git a/src/Storages/MergeTree/ZeroCopyLock.h b/src/Storages/MergeTree/ZeroCopyLock.h
index 4e73b27804c..d4c829a3652 100644
--- a/src/Storages/MergeTree/ZeroCopyLock.h
+++ b/src/Storages/MergeTree/ZeroCopyLock.h
@@ -12,8 +12,11 @@ namespace DB
 /// because due to bad abstraction we use it in MergeTreeData.
 struct ZeroCopyLock
 {
+    static inline const auto ZERO_COPY_LOCK_NAME = "part_exclusive_lock";
+
     ZeroCopyLock(const zkutil::ZooKeeperPtr & zookeeper, const std::string & lock_path, const std::string & lock_message);
 
+    bool isLocked() const { return lock->isLocked(); }
     /// Actual lock
     std::unique_ptr<zkutil::ZooKeeperLock> lock;
 };
diff --git a/src/Storages/MergeTree/ZooKeeperRetries.h b/src/Storages/MergeTree/ZooKeeperRetries.h
index cddde4673f1..e55b04c27b3 100644
--- a/src/Storages/MergeTree/ZooKeeperRetries.h
+++ b/src/Storages/MergeTree/ZooKeeperRetries.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <Interpreters/ProcessList.h>
 #include <base/sleep.h>
 #include <Common/Exception.h>
 #include <Common/ZooKeeper/KeeperException.h>
@@ -35,7 +36,8 @@ struct ZooKeeperRetriesInfo
 class ZooKeeperRetriesControl
 {
 public:
-    ZooKeeperRetriesControl(std::string name_, ZooKeeperRetriesInfo & retries_info_) : name(std::move(name_)), retries_info(retries_info_)
+    ZooKeeperRetriesControl(std::string name_, ZooKeeperRetriesInfo & retries_info_, QueryStatusPtr elem)
+        : name(std::move(name_)), retries_info(retries_info_), process_list_element(elem)
     {
     }
 
@@ -44,6 +46,16 @@ public:
         retryLoop(f, []() {});
     }
 
+    /// retryLoop() executes f() until it succeeds/max_retries is reached/non-retrialable error is encountered
+    ///
+    /// the callable f() can provide feedback in terms of errors in two ways:
+    /// 1. throw KeeperException exception:
+    ///     in such case, retries are done only on hardware keeper errors
+    ///     because non-hardware error codes are semantically not really errors, just a response
+    /// 2. set an error code in the ZooKeeperRetriesControl object (setUserError/setKeeperError)
+    ///     The idea is that if the caller has some semantics on top of non-hardware keeper errors,
+    ///     then it can provide feedback to retries controller via user errors
+    ///
     void retryLoop(auto && f, auto && iteration_cleanup)
     {
         while (canTry())
@@ -126,6 +138,12 @@ public:
         user_error = UserError{};
     }
 
+    template <typename... Args>
+    void setKeeperError(Coordination::Error code, fmt::format_string<Args...> fmt, Args &&... args)
+    {
+        setKeeperError(code, fmt::format(fmt, std::forward<Args>(args)...));
+    }
+
     void stopRetries() { stop_retries = true; }
 
     void requestUnconditionalRetry() { unconditional_retry = true; }
@@ -160,6 +178,9 @@ private:
         if (0 == iteration_count)
             return true;
 
+        if (process_list_element && !process_list_element->checkTimeLimitSoft())
+            return false;
+
         if (unconditional_retry)
         {
             unconditional_retry = false;
@@ -215,7 +236,7 @@ private:
             throw Exception::createDeprecated(user_error.message, user_error.code);
 
         if (keeper_error.code != KeeperError::Code::ZOK)
-            throw zkutil::KeeperException(keeper_error.code, keeper_error.message);
+            throw zkutil::KeeperException(keeper_error.message, keeper_error.code);
     }
 
     void logLastError(std::string_view header)
@@ -260,6 +281,7 @@ private:
     bool unconditional_retry = false;
     bool iteration_succeeded = true;
     bool stop_retries = false;
+    QueryStatusPtr process_list_element;
 };
 
 }
diff --git a/src/Storages/MergeTree/checkDataPart.cpp b/src/Storages/MergeTree/checkDataPart.cpp
index de31258b2f9..00710ed3ed6 100644
--- a/src/Storages/MergeTree/checkDataPart.cpp
+++ b/src/Storages/MergeTree/checkDataPart.cpp
@@ -94,12 +94,13 @@ IMergeTreeDataPart::Checksums checkDataPart(
     };
 
     auto ratio_of_defaults = data_part->storage.getSettings()->ratio_of_defaults_for_sparse_serialization;
-    SerializationInfoByName serialization_infos(columns_txt, SerializationInfo::Settings{ratio_of_defaults, false});
+    SerializationInfoByName serialization_infos;
 
     if (data_part_storage.exists(IMergeTreeDataPart::SERIALIZATION_FILE_NAME))
     {
         auto serialization_file = data_part_storage.readFile(IMergeTreeDataPart::SERIALIZATION_FILE_NAME, {}, std::nullopt, std::nullopt);
-        serialization_infos.readJSON(*serialization_file);
+        SerializationInfo::Settings settings{ratio_of_defaults, false};
+        serialization_infos = SerializationInfoByName::readJSON(columns_txt, settings, *serialization_file);
     }
 
     auto get_serialization = [&serialization_infos](const auto & column)
diff --git a/src/Storages/MergeTree/localBackup.cpp b/src/Storages/MergeTree/localBackup.cpp
index 3b05e3df8d3..6faacf3c066 100644
--- a/src/Storages/MergeTree/localBackup.cpp
+++ b/src/Storages/MergeTree/localBackup.cpp
@@ -17,9 +17,10 @@ namespace
 {
 
 void localBackupImpl(
-    const DiskPtr & disk, const String & source_path,
+    const DiskPtr & disk, IDiskTransaction * transaction, const String & source_path,
     const String & destination_path, bool make_source_readonly, size_t level,
-    std::optional<size_t> max_level, const NameSet & files_to_copy_instead_of_hardlinks)
+    std::optional<size_t> max_level, bool copy_instead_of_hardlinks,
+    const NameSet & files_to_copy_instead_of_hardlinks)
 {
     if (max_level && level > *max_level)
         return;
@@ -27,7 +28,10 @@ void localBackupImpl(
     if (level >= 1000)
         throw DB::Exception(DB::ErrorCodes::TOO_DEEP_RECURSION, "Too deep recursion");
 
-    disk->createDirectories(destination_path);
+    if (transaction)
+        transaction->createDirectories(destination_path);
+    else
+        disk->createDirectories(destination_path);
 
     for (auto it = disk->iterateDirectory(source_path); it->isValid(); it->next())
     {
@@ -37,15 +41,36 @@ void localBackupImpl(
         if (!disk->isDirectory(source))
         {
             if (make_source_readonly)
-                disk->setReadOnly(source);
-            if (files_to_copy_instead_of_hardlinks.contains(it->name()))
-                disk->copyFile(source, *disk, destination);
+            {
+                if (transaction)
+                    transaction->setReadOnly(source);
+                else
+                    disk->setReadOnly(source);
+            }
+            if (copy_instead_of_hardlinks || files_to_copy_instead_of_hardlinks.contains(it->name()))
+            {
+                if (transaction)
+                {
+                    transaction->copyFile(source, destination);
+                }
+                else
+                {
+                    disk->copyFile(source, *disk, destination);
+                }
+            }
             else
-                disk->createHardLink(source, destination);
+            {
+                if (transaction)
+                    transaction->createHardLink(source, destination);
+                else
+                    disk->createHardLink(source, destination);
+            }
         }
         else
         {
-            localBackupImpl(disk, source, destination, make_source_readonly, level + 1, max_level, files_to_copy_instead_of_hardlinks);
+            localBackupImpl(
+                disk, transaction, source, destination, make_source_readonly, level + 1, max_level,
+                copy_instead_of_hardlinks, files_to_copy_instead_of_hardlinks);
         }
     }
 }
@@ -89,7 +114,7 @@ private:
 void localBackup(
     const DiskPtr & disk, const String & source_path,
     const String & destination_path, bool make_source_readonly,
-    std::optional<size_t> max_level, bool copy_instead_of_hardlinks, const NameSet & files_to_copy_intead_of_hardlinks)
+    std::optional<size_t> max_level, bool copy_instead_of_hardlinks, const NameSet & files_to_copy_intead_of_hardlinks, DiskTransactionPtr disk_transaction)
 {
     if (disk->exists(destination_path) && !disk->isDirectoryEmpty(destination_path))
     {
@@ -100,7 +125,8 @@ void localBackup(
     size_t try_no = 0;
     const size_t max_tries = 10;
 
-    CleanupOnFail cleanup([disk, destination_path]() { disk->removeRecursive(destination_path); });
+    CleanupOnFail cleanup(disk_transaction ? std::function<void()>([]{}) :
+                          [disk, destination_path]() { disk->removeRecursive(destination_path); });
 
     /** Files in the directory can be permanently added and deleted.
       * If some file is deleted during an attempt to make a backup, then try again,
@@ -110,10 +136,10 @@ void localBackup(
     {
         try
         {
-            if (copy_instead_of_hardlinks)
+            if (copy_instead_of_hardlinks && !disk_transaction)
                 disk->copyDirectoryContent(source_path, disk, destination_path);
             else
-                localBackupImpl(disk, source_path, destination_path, make_source_readonly, 0, max_level, files_to_copy_intead_of_hardlinks);
+                localBackupImpl(disk, disk_transaction.get(), source_path, destination_path, make_source_readonly, 0, max_level, copy_instead_of_hardlinks, files_to_copy_intead_of_hardlinks);
         }
         catch (const DB::ErrnoException & e)
         {
diff --git a/src/Storages/MergeTree/localBackup.h b/src/Storages/MergeTree/localBackup.h
index 74b188daff6..89906bf1d75 100644
--- a/src/Storages/MergeTree/localBackup.h
+++ b/src/Storages/MergeTree/localBackup.h
@@ -9,7 +9,7 @@ namespace DB
 
 /** Creates a local (at the same mount point) backup (snapshot) directory.
   *
-  * In the specified destination directory, it creates a hard links on all source-directory files
+  * In the specified destination directory, it creates hard links on all source-directory files
   *  and in all nested directories, with saving (creating) all relative paths;
   *  and also `chown`, removing the write permission.
   *
@@ -17,9 +17,11 @@ namespace DB
   *  and is intended to be used as a simple means of protection against a human or program error,
   *  but not from a hardware failure.
   *
-  *  If max_level is specified, than only files which depth relative source_path less or equal max_level will be copied.
+  * If max_level is specified, than only files with depth relative source_path less or equal max_level will be copied.
   *  So, if max_level=0 than only direct file child are copied.
+  *
+  * If `transaction` is provided, the changes will be added to it instead of performend on disk.
   */
-    void localBackup(const DiskPtr & disk, const String & source_path, const String & destination_path, bool make_source_readonly = true, std::optional<size_t> max_level = {}, bool copy_instead_of_hardlinks = false, const NameSet & files_to_copy_intead_of_hardlinks = {});
+    void localBackup(const DiskPtr & disk, const String & source_path, const String & destination_path, bool make_source_readonly = true, std::optional<size_t> max_level = {}, bool copy_instead_of_hardlinks = false, const NameSet & files_to_copy_intead_of_hardlinks = {}, DiskTransactionPtr disk_transaction = nullptr);
 
 }
diff --git a/src/Storages/MergeTree/registerStorageMergeTree.cpp b/src/Storages/MergeTree/registerStorageMergeTree.cpp
index 00478dea9d3..027cd1af7c9 100644
--- a/src/Storages/MergeTree/registerStorageMergeTree.cpp
+++ b/src/Storages/MergeTree/registerStorageMergeTree.cpp
@@ -70,8 +70,8 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
     name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
     name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
     ...
-    INDEX index_name1 expr1 TYPE type1(...) GRANULARITY value1,
-    INDEX index_name2 expr2 TYPE type2(...) GRANULARITY value2
+    INDEX index_name1 expr1 TYPE type1(...) [GRANULARITY value1],
+    INDEX index_name2 expr2 TYPE type2(...) [GRANULARITY value2]
 ) ENGINE = MergeTree()
 ORDER BY expr
 [PARTITION BY expr]
@@ -535,7 +535,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         if (!args.storage_def->order_by)
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                             "You must provide an ORDER BY or PRIMARY KEY expression in the table definition. "
-                            "If you don't want this table to be sorted, use ORDER BY/PRIMARY KEY tuple()");
+                            "If you don't want this table to be sorted, use ORDER BY/PRIMARY KEY ()");
 
         /// Get sorting key from engine arguments.
         ///
diff --git a/src/Storages/MergeTree/tests/gtest_executor.cpp b/src/Storages/MergeTree/tests/gtest_executor.cpp
index e45887da7ef..3a4f147b456 100644
--- a/src/Storages/MergeTree/tests/gtest_executor.cpp
+++ b/src/Storages/MergeTree/tests/gtest_executor.cpp
@@ -15,6 +15,7 @@ using namespace DB;
 namespace CurrentMetrics
 {
     extern const Metric BackgroundMergesAndMutationsPoolTask;
+    extern const Metric BackgroundMergesAndMutationsPoolSize;
 }
 
 std::random_device device;
@@ -102,7 +103,8 @@ TEST(Executor, Simple)
         "GTest",
         1, // threads
         100, // max_tasks
-        CurrentMetrics::BackgroundMergesAndMutationsPoolTask
+        CurrentMetrics::BackgroundMergesAndMutationsPoolTask,
+        CurrentMetrics::BackgroundMergesAndMutationsPoolSize
     );
 
     String schedule; // mutex is not required because we have a single worker
@@ -144,7 +146,8 @@ TEST(Executor, RemoveTasks)
         "GTest",
         tasks_kinds,
         tasks_kinds * batch,
-        CurrentMetrics::BackgroundMergesAndMutationsPoolTask
+        CurrentMetrics::BackgroundMergesAndMutationsPoolTask,
+        CurrentMetrics::BackgroundMergesAndMutationsPoolSize
     );
 
     for (size_t i = 0; i < batch; ++i)
@@ -184,7 +187,8 @@ TEST(Executor, RemoveTasksStress)
         "GTest",
         tasks_kinds,
         tasks_kinds * batch * (schedulers_count + removers_count),
-        CurrentMetrics::BackgroundMergesAndMutationsPoolTask
+        CurrentMetrics::BackgroundMergesAndMutationsPoolTask,
+        CurrentMetrics::BackgroundMergesAndMutationsPoolSize
     );
 
     std::barrier barrier(schedulers_count + removers_count);
@@ -234,7 +238,8 @@ TEST(Executor, UpdatePolicy)
         "GTest",
         1, // threads
         100, // max_tasks
-        CurrentMetrics::BackgroundMergesAndMutationsPoolTask
+        CurrentMetrics::BackgroundMergesAndMutationsPoolTask,
+        CurrentMetrics::BackgroundMergesAndMutationsPoolSize
     );
 
     String schedule; // mutex is not required because we have a single worker
diff --git a/src/Storages/MutationCommands.cpp b/src/Storages/MutationCommands.cpp
index 0c9e9223929..6eb345b449e 100644
--- a/src/Storages/MutationCommands.cpp
+++ b/src/Storages/MutationCommands.cpp
@@ -23,6 +23,12 @@ namespace ErrorCodes
     extern const int MULTIPLE_ASSIGNMENTS_TO_COLUMN;
 }
 
+
+bool MutationCommand::isBarrierCommand() const
+{
+    return type == RENAME_COLUMN;
+}
+
 std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command, bool parse_alter_commands)
 {
     if (command->type == ASTAlterCommand::DELETE)
@@ -179,7 +185,6 @@ void MutationCommands::readText(ReadBuffer & in)
     String commands_str;
     readEscapedString(commands_str, in);
 
-
     ParserAlterCommandList p_alter_commands;
     auto commands_ast = parseQuery(
         p_alter_commands, commands_str.data(), commands_str.data() + commands_str.length(), "mutation commands list", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
@@ -212,4 +217,14 @@ bool MutationCommands::hasNonEmptyMutationCommands() const
     return false;
 }
 
+bool MutationCommands::containBarrierCommand() const
+{
+    for (const auto & command : *this)
+    {
+        if (command.isBarrierCommand())
+            return true;
+    }
+    return false;
+}
+
 }
diff --git a/src/Storages/MutationCommands.h b/src/Storages/MutationCommands.h
index aca91c16e85..5ef0cfda1be 100644
--- a/src/Storages/MutationCommands.h
+++ b/src/Storages/MutationCommands.h
@@ -67,6 +67,9 @@ struct MutationCommand
 
     /// If parse_alter_commands, than consider more Alter commands as mutation commands
     static std::optional<MutationCommand> parse(ASTAlterCommand * command, bool parse_alter_commands = false);
+
+    /// This command shouldn't stick with other commands
+    bool isBarrierCommand() const;
 };
 
 /// Multiple mutation commands, possible from different ALTER queries
@@ -79,6 +82,11 @@ public:
     void readText(ReadBuffer & in);
     std::string toString() const;
     bool hasNonEmptyMutationCommands() const;
+
+    /// These set of commands contain barrier command and shouldn't
+    /// stick with other commands. Commands from one set have already been validated
+    /// to be executed without issues on the creation state.
+    bool containBarrierCommand() const;
 };
 
 using MutationCommandsConstPtr = std::shared_ptr<MutationCommands>;
diff --git a/src/Storages/MySQL/MySQLHelpers.cpp b/src/Storages/MySQL/MySQLHelpers.cpp
index 127bdb96eaf..e9ad18ee3ac 100644
--- a/src/Storages/MySQL/MySQLHelpers.cpp
+++ b/src/Storages/MySQL/MySQLHelpers.cpp
@@ -2,9 +2,7 @@
 
 #if USE_MYSQL
 #include <mysqlxx/PoolWithFailover.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/MySQL/MySQLSettings.h>
-#include <Databases/MySQL/ConnectionMySQLSettings.h>
 
 namespace DB
 {
@@ -14,14 +12,25 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-template <typename T> mysqlxx::PoolWithFailover
-createMySQLPoolWithFailover(const StorageMySQLConfiguration & configuration, const T & mysql_settings)
+mysqlxx::PoolWithFailover createMySQLPoolWithFailover(const StorageMySQL::Configuration & configuration, const MySQLSettings & mysql_settings)
+{
+    return createMySQLPoolWithFailover(
+        configuration.database, configuration.addresses,
+        configuration.username, configuration.password, mysql_settings);
+}
+
+mysqlxx::PoolWithFailover createMySQLPoolWithFailover(
+    const std::string & database,
+    const StorageMySQL::Configuration::Addresses & addresses,
+    const std::string & username,
+    const std::string & password,
+    const MySQLSettings & mysql_settings)
 {
     if (!mysql_settings.connection_pool_size)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Connection pool cannot have zero size");
 
     return mysqlxx::PoolWithFailover(
-        configuration.database, configuration.addresses, configuration.username, configuration.password,
+        database, addresses, username, password,
         MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
         static_cast<unsigned>(mysql_settings.connection_pool_size),
         mysql_settings.connection_max_tries,
@@ -30,11 +39,6 @@ createMySQLPoolWithFailover(const StorageMySQLConfiguration & configuration, con
         mysql_settings.read_write_timeout);
 }
 
-template
-mysqlxx::PoolWithFailover createMySQLPoolWithFailover(const StorageMySQLConfiguration & configuration, const MySQLSettings & mysql_settings);
-template
-mysqlxx::PoolWithFailover createMySQLPoolWithFailover(const StorageMySQLConfiguration & configuration, const ConnectionMySQLSettings & mysql_settings);
-
 }
 
 #endif
diff --git a/src/Storages/MySQL/MySQLHelpers.h b/src/Storages/MySQL/MySQLHelpers.h
index 57b564c360c..ebe00bd4cd1 100644
--- a/src/Storages/MySQL/MySQLHelpers.h
+++ b/src/Storages/MySQL/MySQLHelpers.h
@@ -3,16 +3,22 @@
 
 #if USE_MYSQL
 #include <Interpreters/Context_fwd.h>
+#include <Storages/StorageMySQL.h>
 
 namespace mysqlxx { class PoolWithFailover; }
 
 namespace DB
 {
-struct StorageMySQLConfiguration;
 
-template <typename T> mysqlxx::PoolWithFailover
-createMySQLPoolWithFailover(const StorageMySQLConfiguration & configuration, const T & mysql_settings);
+mysqlxx::PoolWithFailover createMySQLPoolWithFailover(
+    const StorageMySQL::Configuration & configuration, const MySQLSettings & mysql_settings);
 
+mysqlxx::PoolWithFailover createMySQLPoolWithFailover(
+    const std::string & database,
+    const StorageMySQL::Configuration::Addresses & addresses,
+    const std::string & username,
+    const std::string & password,
+    const MySQLSettings & mysql_settings);
 }
 
 #endif
diff --git a/src/Storages/MySQL/MySQLSettings.cpp b/src/Storages/MySQL/MySQLSettings.cpp
index 5c1a2246ae9..fd53174f4f6 100644
--- a/src/Storages/MySQL/MySQLSettings.cpp
+++ b/src/Storages/MySQL/MySQLSettings.cpp
@@ -3,6 +3,9 @@
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Parsers/formatAST.h>
+#include <Core/Field.h>
 
 
 namespace DB
@@ -43,4 +46,33 @@ void MySQLSettings::loadFromQuery(ASTStorage & storage_def)
     }
 }
 
+void MySQLSettings::loadFromQueryContext(ContextPtr context, ASTStorage & storage_def)
+{
+    if (!context->hasQueryContext())
+        return;
+
+    const Settings & settings = context->getQueryContext()->getSettingsRef();
+
+    if (settings.mysql_datatypes_support_level.value != mysql_datatypes_support_level.value)
+    {
+        static constexpr auto setting_name = "mysql_datatypes_support_level";
+        set(setting_name, settings.mysql_datatypes_support_level.toString());
+
+        if (!storage_def.settings)
+        {
+            auto settings_ast = std::make_shared<ASTSetQuery>();
+            settings_ast->is_standalone = false;
+            storage_def.set(storage_def.settings, settings_ast);
+        }
+
+        auto & changes = storage_def.settings->changes;
+        if (changes.end() == std::find_if(
+                changes.begin(), changes.end(),
+                [](const SettingChange & c) { return c.name == setting_name; }))
+        {
+            changes.push_back(SettingChange{setting_name, settings.mysql_datatypes_support_level.toString()});
+        }
+    }
+}
+
 }
diff --git a/src/Storages/MySQL/MySQLSettings.h b/src/Storages/MySQL/MySQLSettings.h
index 603b477b856..850ac432aa1 100644
--- a/src/Storages/MySQL/MySQLSettings.h
+++ b/src/Storages/MySQL/MySQLSettings.h
@@ -2,6 +2,8 @@
 
 #include <Core/Defines.h>
 #include <Core/BaseSettings.h>
+#include <Core/SettingsEnums.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace Poco::Util
@@ -22,6 +24,7 @@ class ASTSetQuery;
     M(Bool, connection_auto_close, true, "Auto-close connection after query execution, i.e. disable connection reuse.", 0) \
     M(UInt64, connect_timeout, DBMS_DEFAULT_CONNECT_TIMEOUT_SEC, "Connect timeout (in seconds)", 0) \
     M(UInt64, read_write_timeout, DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC, "Read/write timeout (in seconds)", 0) \
+    M(MySQLDataTypesSupport, mysql_datatypes_support_level, 0, "Which MySQL types should be converted to corresponding ClickHouse types (rather than being represented as String). Can be empty or any combination of 'decimal' or 'datetime64'. When empty MySQL's DECIMAL and DATETIME/TIMESTAMP with non-zero precision are seen as String on ClickHouse's side.", 0) \
 
 DECLARE_SETTINGS_TRAITS(MySQLSettingsTraits, LIST_OF_MYSQL_SETTINGS)
 
@@ -34,6 +37,7 @@ struct MySQLSettings : public MySQLBaseSettings
 {
     void loadFromQuery(ASTStorage & storage_def);
     void loadFromQuery(const ASTSetQuery & settings_def);
+    void loadFromQueryContext(ContextPtr context, ASTStorage & storage_def);
 };
 
 
diff --git a/src/Storages/NATS/NATSSource.cpp b/src/Storages/NATS/NATSSource.cpp
index 793b69e7e46..89af173533d 100644
--- a/src/Storages/NATS/NATSSource.cpp
+++ b/src/Storages/NATS/NATSSource.cpp
@@ -95,8 +95,8 @@ Chunk NATSSource::generate()
 
     MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
     EmptyReadBuffer empty_buf;
-    auto input_format
-        = FormatFactory::instance().getInputFormat(storage.getFormatName(), empty_buf, non_virtual_header, context, max_block_size);
+    auto input_format = FormatFactory::instance().getInput(
+        storage.getFormatName(), empty_buf, non_virtual_header, context, max_block_size, std::nullopt, 1);
 
     StreamingFormatExecutor executor(non_virtual_header, input_format);
 
diff --git a/src/Storages/NATS/StorageNATS.cpp b/src/Storages/NATS/StorageNATS.cpp
index f1724b8c14c..aa4ec77b0d8 100644
--- a/src/Storages/NATS/StorageNATS.cpp
+++ b/src/Storages/NATS/StorageNATS.cpp
@@ -10,13 +10,13 @@
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/QueryPlan/QueryPlan.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/NATS/NATSSource.h>
 #include <Storages/NATS/StorageNATS.h>
 #include <Storages/NATS/NATSProducer.h>
 #include <Storages/MessageQueueSink.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMaterializedView.h>
+#include <Storages/NamedCollectionsHelpers.h>
 #include <QueryPipeline/Pipe.h>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
@@ -711,8 +711,16 @@ void registerStorageNATS(StorageFactory & factory)
     auto creator_fn = [](const StorageFactory::Arguments & args)
     {
         auto nats_settings = std::make_unique<NATSSettings>();
-        bool with_named_collection = getExternalDataSourceConfiguration(args.engine_args, *nats_settings, args.getLocalContext());
-        if (!with_named_collection && !args.storage_def->settings)
+        if (auto named_collection = tryGetNamedCollectionWithOverrides(args.engine_args, args.getLocalContext()))
+        {
+            for (const auto & setting : nats_settings->all())
+            {
+                const auto & setting_name = setting.getName();
+                if (named_collection->has(setting_name))
+                    nats_settings->set(setting_name, named_collection->get<String>(setting_name));
+            }
+        }
+        else if (!args.storage_def->settings)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "NATS engine must have settings");
 
         nats_settings->loadFromQuery(*args.storage_def);
diff --git a/src/Storages/NamedCollectionsHelpers.cpp b/src/Storages/NamedCollectionsHelpers.cpp
index 6c783beaecb..83128ab025a 100644
--- a/src/Storages/NamedCollectionsHelpers.cpp
+++ b/src/Storages/NamedCollectionsHelpers.cpp
@@ -15,7 +15,7 @@ namespace ErrorCodes
 
 namespace
 {
-    NamedCollectionPtr tryGetNamedCollectionFromASTs(ASTs asts)
+    NamedCollectionPtr tryGetNamedCollectionFromASTs(ASTs asts, bool throw_unknown_collection)
     {
         if (asts.empty())
             return nullptr;
@@ -25,10 +25,12 @@ namespace
             return nullptr;
 
         const auto & collection_name = identifier->name();
-        return NamedCollectionFactory::instance().get(collection_name);
+        if (throw_unknown_collection)
+            return NamedCollectionFactory::instance().get(collection_name);
+        return NamedCollectionFactory::instance().tryGet(collection_name);
     }
 
-    std::optional<std::pair<std::string, Field>> getKeyValueFromAST(ASTPtr ast)
+    std::optional<std::pair<std::string, std::variant<Field, ASTPtr>>> getKeyValueFromAST(ASTPtr ast, bool fallback_to_ast_value, ContextPtr context)
     {
         const auto * function = ast->as<ASTFunction>();
         if (!function || function->name != "equals")
@@ -40,50 +42,87 @@ namespace
         if (function_args.size() != 2)
             return std::nullopt;
 
-        auto literal_key = evaluateConstantExpressionOrIdentifierAsLiteral(
-            function_args[0], Context::getGlobalContextInstance());
+        auto literal_key = evaluateConstantExpressionOrIdentifierAsLiteral(function_args[0], context);
         auto key = checkAndGetLiteralArgument<String>(literal_key, "key");
 
-        auto literal_value = evaluateConstantExpressionOrIdentifierAsLiteral(
-            function_args[1], Context::getGlobalContextInstance());
-        auto value = literal_value->as<ASTLiteral>()->value;
+        ASTPtr literal_value;
+        try
+        {
+            if (key == "database" || key == "db")
+                literal_value = evaluateConstantExpressionForDatabaseName(function_args[1], context);
+            else
+                literal_value = evaluateConstantExpressionOrIdentifierAsLiteral(function_args[1], context);
+        }
+        catch (...)
+        {
+            if (fallback_to_ast_value)
+                return std::pair{key, function_args[1]};
+            throw;
+        }
 
-        return std::pair{key, value};
+        auto value = literal_value->as<ASTLiteral>()->value;
+        return std::pair{key, Field(value)};
     }
 }
 
 
-NamedCollectionPtr tryGetNamedCollectionWithOverrides(ASTs asts)
+MutableNamedCollectionPtr tryGetNamedCollectionWithOverrides(
+    ASTs asts, ContextPtr context, bool throw_unknown_collection, std::vector<std::pair<std::string, ASTPtr>> * complex_args)
 {
     if (asts.empty())
         return nullptr;
 
     NamedCollectionUtils::loadIfNot();
 
-    auto collection = tryGetNamedCollectionFromASTs(asts);
+    auto collection = tryGetNamedCollectionFromASTs(asts, throw_unknown_collection);
     if (!collection)
         return nullptr;
 
-    if (asts.size() == 1)
-        return collection;
-
     auto collection_copy = collection->duplicate();
 
+    if (asts.size() == 1)
+        return collection_copy;
+
     for (auto * it = std::next(asts.begin()); it != asts.end(); ++it)
     {
-        auto value_override = getKeyValueFromAST(*it);
+        auto value_override = getKeyValueFromAST(*it, /* fallback_to_ast_value */complex_args != nullptr, context);
+
         if (!value_override && !(*it)->as<ASTFunction>())
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value argument or function");
         if (!value_override)
             continue;
 
+        if (const ASTPtr * value = std::get_if<ASTPtr>(&value_override->second))
+        {
+            complex_args->emplace_back(value_override->first, *value);
+            continue;
+        }
+
         const auto & [key, value] = *value_override;
-        collection_copy->setOrUpdate<String>(key, toString(value));
+        collection_copy->setOrUpdate<String>(key, toString(std::get<Field>(value_override->second)));
     }
 
     return collection_copy;
 }
 
+MutableNamedCollectionPtr tryGetNamedCollectionWithOverrides(
+    const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix)
+{
+    auto collection_name = config.getString(config_prefix + ".name", "");
+    if (collection_name.empty())
+        return nullptr;
+
+    const auto & collection = NamedCollectionFactory::instance().get(collection_name);
+    auto collection_copy = collection->duplicate();
+
+    Poco::Util::AbstractConfiguration::Keys keys;
+    config.keys(config_prefix, keys);
+    for (const auto & key : keys)
+        collection_copy->setOrUpdate<String>(key, config.getString(config_prefix + '.' + key));
+
+    return collection_copy;
+}
+
 HTTPHeaderEntries getHeadersFromNamedCollection(const NamedCollection & collection)
 {
     HTTPHeaderEntries headers;
diff --git a/src/Storages/NamedCollectionsHelpers.h b/src/Storages/NamedCollectionsHelpers.h
index 9c70a46d755..1473a3fbe48 100644
--- a/src/Storages/NamedCollectionsHelpers.h
+++ b/src/Storages/NamedCollectionsHelpers.h
@@ -16,16 +16,82 @@ namespace ErrorCodes
 namespace DB
 {
 
-NamedCollectionPtr tryGetNamedCollectionWithOverrides(ASTs asts);
+/// Helper function to get named collection for table engine.
+/// Table engines have collection name as first argument of ast and other arguments are key-value overrides.
+MutableNamedCollectionPtr tryGetNamedCollectionWithOverrides(
+    ASTs asts, ContextPtr context, bool throw_unknown_collection = true, std::vector<std::pair<std::string, ASTPtr>> * complex_args = nullptr);
+/// Helper function to get named collection for dictionary source.
+/// Dictionaries have collection name as name argument of dict configuration and other arguments are overrides.
+MutableNamedCollectionPtr tryGetNamedCollectionWithOverrides(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
 
 HTTPHeaderEntries getHeadersFromNamedCollection(const NamedCollection & collection);
 
-template <typename RequiredKeys = std::unordered_set<std::string>,
-          typename OptionalKeys = std::unordered_set<std::string>>
+struct ExternalDatabaseEqualKeysSet
+{
+    static constexpr std::array<std::pair<std::string_view, std::string_view>, 5> equal_keys{
+        std::pair{"username", "user"}, std::pair{"database", "db"}, std::pair{"hostname", "host"}, std::pair{"addresses_expr", "host"}, std::pair{"addresses_expr", "hostname"}};
+};
+struct MongoDBEqualKeysSet
+{
+    static constexpr std::array<std::pair<std::string_view, std::string_view>, 4> equal_keys{
+        std::pair{"username", "user"}, std::pair{"database", "db"}, std::pair{"hostname", "host"}, std::pair{"table", "collection"}};
+};
+
+template <typename EqualKeys> struct NamedCollectionValidateKey
+{
+    NamedCollectionValidateKey() = default;
+    NamedCollectionValidateKey(const char * value_) : value(value_) {}
+    NamedCollectionValidateKey(std::string_view value_) : value(value_) {}
+    NamedCollectionValidateKey(const String & value_) : value(value_) {}
+
+    std::string_view value;
+
+    bool operator==(const auto & other) const
+    {
+        if (value == other.value)
+            return true;
+
+        for (const auto & equal : EqualKeys::equal_keys)
+        {
+            if (((equal.first == value) && (equal.second == other.value)) || ((equal.first == other.value) && (equal.second == value)))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    bool operator<(const auto & other) const
+    {
+        std::string_view canonical_self = value;
+        std::string_view canonical_other = other.value;
+        for (const auto & equal : EqualKeys::equal_keys)
+        {
+            if ((equal.first == value) || (equal.second == value))
+                canonical_self = std::max(canonical_self, std::max(equal.first, equal.second));
+            if ((equal.first == other.value) || (equal.second == other.value))
+                canonical_other = std::max(canonical_other, std::max(equal.first, equal.second));
+        }
+
+        return canonical_self < canonical_other;
+    }
+};
+
+template <typename T>
+std::ostream & operator << (std::ostream & ostr, const NamedCollectionValidateKey<T> & key)
+{
+    ostr << key.value;
+    return ostr;
+}
+
+template <class keys_cmp> using ValidateKeysMultiset = std::multiset<NamedCollectionValidateKey<keys_cmp>, std::less<NamedCollectionValidateKey<keys_cmp>>>;
+using ValidateKeysSet = std::multiset<std::string_view>;
+
+template <typename Keys = ValidateKeysSet>
 void validateNamedCollection(
     const NamedCollection & collection,
-    const RequiredKeys & required_keys,
-    const OptionalKeys & optional_keys,
+    const Keys & required_keys,
+    const Keys & optional_keys,
     const std::vector<std::regex> & optional_regex_keys = {})
 {
     NamedCollection::Keys keys = collection.getKeys();
@@ -40,7 +106,12 @@ void validateNamedCollection(
         }
 
         if (optional_keys.contains(key))
+        {
             continue;
+        }
+
+        if (required_keys.contains(key))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Duplicate key {} in named collection", key);
 
         auto match = std::find_if(
             optional_regex_keys.begin(), optional_regex_keys.end(),
@@ -49,10 +120,10 @@ void validateNamedCollection(
 
         if (!match)
         {
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS,
-                "Unexpected key {} in named collection. Required keys: {}, optional keys: {}",
-                backQuoteIfNeed(key), fmt::join(required_keys, ", "), fmt::join(optional_keys, ", "));
+             throw Exception(
+                 ErrorCodes::BAD_ARGUMENTS,
+                 "Unexpected key {} in named collection. Required keys: {}, optional keys: {}",
+                 backQuoteIfNeed(key), fmt::join(required_keys, ", "), fmt::join(optional_keys, ", "));
         }
     }
 
@@ -66,3 +137,18 @@ void validateNamedCollection(
 }
 
 }
+
+template <typename T>
+struct fmt::formatter<DB::NamedCollectionValidateKey<T>>
+{
+    constexpr static auto parse(format_parse_context & context)
+    {
+        return context.begin();
+    }
+
+    template <typename FormatContext>
+    auto format(const DB::NamedCollectionValidateKey<T> & elem, FormatContext & context)
+    {
+        return fmt::format_to(context.out(), "{}", elem.value);
+    }
+};
diff --git a/src/Storages/PartitionedSink.h b/src/Storages/PartitionedSink.h
index 652d8a4c046..c4bf9c0622c 100644
--- a/src/Storages/PartitionedSink.h
+++ b/src/Storages/PartitionedSink.h
@@ -45,7 +45,6 @@ private:
     Arena partition_keys_arena;
 
     SinkPtr getSinkForPartitionKey(StringRef partition_key);
-
 };
 
 }
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
index 9c6eeceb605..d048c94ac75 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
@@ -2,7 +2,7 @@
 
 #include "StorageMaterializedPostgreSQL.h"
 #include <Columns/ColumnNullable.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterInsertQuery.h>
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
index 3412e6e422f..02cbedb4dd5 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
@@ -5,7 +5,6 @@
 
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/Names.h>
-#include <Common/logger_useful.h>
 #include <Storages/IStorage.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
index f9bfe1d174a..998db4ea79e 100644
--- a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
+++ b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
@@ -354,7 +354,7 @@ StorageInfo PostgreSQLReplicationHandler::loadFromSnapshot(postgres::Connection
     /// Load from snapshot, which will show table state before creation of replication slot.
     /// Already connected to needed database, no need to add it to query.
     auto quoted_name = doubleQuoteWithSchema(table_name);
-    query_str = fmt::format("SELECT * FROM {}", quoted_name);
+    query_str = fmt::format("SELECT * FROM ONLY {}", quoted_name);
     LOG_DEBUG(log, "Loading PostgreSQL table {}.{}", postgres_database, quoted_name);
 
     auto table_structure = fetchTableStructure(*tx, table_name);
@@ -417,7 +417,15 @@ void PostgreSQLReplicationHandler::consumerFunc()
 {
     assertInitialized();
 
-    bool schedule_now = getConsumer()->consume();
+    bool schedule_now = true;
+    try
+    {
+        schedule_now = getConsumer()->consume();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
 
     if (stop_synchronization)
     {
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
index d194c8b8201..e6389da32fd 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
@@ -143,7 +143,7 @@ StoragePtr StorageMaterializedPostgreSQL::createTemporary() const
     if (tmp_storage)
     {
         LOG_TRACE(&Poco::Logger::get("MaterializedPostgreSQLStorage"), "Temporary table {} already exists, dropping", tmp_table_id.getNameForLogs());
-        InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), getContext(), tmp_table_id, /* no delay */true);
+        InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), getContext(), tmp_table_id, /* sync */true);
     }
 
     auto new_context = Context::createCopy(context);
@@ -250,7 +250,7 @@ void StorageMaterializedPostgreSQL::dropInnerTableIfAny(bool sync, ContextPtr lo
 
     auto nested_table = tryGetNested() != nullptr;
     if (nested_table)
-        InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), local_context, getNestedStorageID(), sync);
+        InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), local_context, getNestedStorageID(), sync, /* ignore_sync_setting */ true);
 }
 
 
diff --git a/src/Storages/RabbitMQ/RabbitMQConsumer.cpp b/src/Storages/RabbitMQ/RabbitMQConsumer.cpp
index 9b66b9b1d7c..f6facc04212 100644
--- a/src/Storages/RabbitMQ/RabbitMQConsumer.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQConsumer.cpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <Storages/RabbitMQ/RabbitMQConsumer.h>
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
+#include <Storages/RabbitMQ/RabbitMQConnection.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <Common/logger_useful.h>
 #include "Poco/Timer.h"
@@ -24,20 +25,23 @@ RabbitMQConsumer::RabbitMQConsumer(
         size_t channel_id_base_,
         const String & channel_base_,
         Poco::Logger * log_,
-        uint32_t queue_size_,
-        const std::atomic<bool> & stopped_)
+        uint32_t queue_size_)
         : event_handler(event_handler_)
         , queues(queues_)
         , channel_base(channel_base_)
         , channel_id_base(channel_id_base_)
         , log(log_)
-        , stopped(stopped_)
         , received(queue_size_)
 {
 }
 
+void RabbitMQConsumer::stop()
+{
+    stopped = true;
+    cv.notify_one();
+}
 
-void RabbitMQConsumer::closeChannel()
+void RabbitMQConsumer::closeConnections()
 {
     if (consumer_channel)
         consumer_channel->close();
@@ -50,10 +54,9 @@ void RabbitMQConsumer::subscribe()
         consumer_channel->consume(queue_name)
         .onSuccess([&](const std::string & /* consumer_tag */)
         {
-            LOG_TRACE(log, "Consumer on channel {} is subscribed to queue {}", channel_id, queue_name);
-
-            if (++subscribed == queues.size())
-                wait_subscription.store(false);
+            LOG_TRACE(
+                log, "Consumer on channel {} ({}/{}) is subscribed to queue {}",
+                channel_id, subscriptions_num, queues.size(), queue_name);
         })
         .onReceived([&](const AMQP::Message & message, uint64_t delivery_tag, bool redelivered)
         {
@@ -61,106 +64,116 @@ void RabbitMQConsumer::subscribe()
             {
                 String message_received = std::string(message.body(), message.body() + message.bodySize());
 
-                if (!received.push({message_received, message.hasMessageID() ? message.messageID() : "",
-                        message.hasTimestamp() ? message.timestamp() : 0,
-                        redelivered, AckTracker(delivery_tag, channel_id)}))
+                MessageData result{
+                    .message = message_received,
+                    .message_id = message.hasMessageID() ? message.messageID() : "",
+                    .timestamp = message.hasTimestamp() ? message.timestamp() : 0,
+                    .redelivered = redelivered,
+                    .delivery_tag = delivery_tag,
+                    .channel_id = channel_id};
+
+                if (!received.push(std::move(result)))
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not push to received queue");
+
+                cv.notify_one();
             }
         })
         .onError([&](const char * message)
         {
-            /* End up here either if channel ends up in an error state (then there will be resubscription) or consume call error, which
-             * arises from queue settings mismatch or queue level error, which should not happen as no one else is supposed to touch them
+            /* End up here either if channel ends up in an error state (then there will be resubscription)
+             * or consume call error, which arises from queue settings mismatch or queue level error,
+             * which should not happen as no one else is supposed to touch them
              */
             LOG_ERROR(log, "Consumer failed on channel {}. Reason: {}", channel_id, message);
-            wait_subscription.store(false);
+            state = State::ERROR;
         });
     }
 }
 
 
-bool RabbitMQConsumer::ackMessages()
+bool RabbitMQConsumer::ackMessages(const CommitInfo & commit_info)
 {
-    AckTracker record_info = last_inserted_record_info;
+    if (state != State::OK)
+        return false;
 
-    /* Do not send ack to server if message's channel is not the same as current running channel because delivery tags are scoped per
-     * channel, so if channel fails, all previous delivery tags become invalid
-     */
-    if (record_info.channel_id == channel_id && record_info.delivery_tag && record_info.delivery_tag > prev_tag)
+    /// Nothing to ack.
+    if (!commit_info.delivery_tag)
+        return false;
+
+    /// Do not send ack to server if message's channel is not the same as
+    /// current running channel because delivery tags are scoped per channel,
+    /// so if channel fails, all previous delivery tags become invalid.
+    if (commit_info.channel_id != channel_id)
+        return false;
+
+    /// Duplicate ack?
+    if (commit_info.delivery_tag > last_commited_delivery_tag
+        && consumer_channel->ack(commit_info.delivery_tag, AMQP::multiple))
     {
-        /// Commit all received messages with delivery tags from last committed to last inserted
-        if (!consumer_channel->ack(record_info.delivery_tag, AMQP::multiple))
-        {
-            LOG_ERROR(log, "Failed to commit messages with delivery tags from last committed to {} on channel {}",
-                     record_info.delivery_tag, channel_id);
-            return false;
-        }
+        last_commited_delivery_tag = commit_info.delivery_tag;
 
-        prev_tag = record_info.delivery_tag;
-        LOG_TRACE(log, "Consumer committed messages with deliveryTags up to {} on channel {}", record_info.delivery_tag, channel_id);
+        LOG_TRACE(
+            log, "Consumer committed messages with deliveryTags up to {} on channel {}",
+            last_commited_delivery_tag, channel_id);
+
+        return true;
     }
 
-    return true;
+    LOG_ERROR(
+        log,
+        "Did not commit messages for {}:{}, (current commit point {}:{})",
+        commit_info.channel_id, commit_info.delivery_tag,
+        channel_id, last_commited_delivery_tag);
+
+    return false;
 }
 
 
-void RabbitMQConsumer::updateAckTracker(AckTracker record_info)
+void RabbitMQConsumer::updateChannel(RabbitMQConnection & connection)
 {
-    if (record_info.delivery_tag && channel_error.load())
-        return;
-
-    if (!record_info.delivery_tag)
-        prev_tag = 0;
-
-    last_inserted_record_info = record_info;
-}
-
-
-void RabbitMQConsumer::setupChannel()
-{
-    if (!consumer_channel)
-        return;
-
-    wait_subscription.store(true);
+    state = State::INITIALIZING;
+    last_commited_delivery_tag = 0;
 
+    consumer_channel = connection.createChannel();
     consumer_channel->onReady([&]()
     {
-        /* First number indicates current consumer buffer; second number indicates serial number of created channel for current buffer,
-         * i.e. if channel fails - another one is created and its serial number is incremented; channel_base is to guarantee that
-         * channel_id is unique for each table
-         */
-        channel_id = std::to_string(channel_id_base) + "_" + std::to_string(channel_id_counter++) + "_" + channel_base;
-        LOG_TRACE(log, "Channel {} is created", channel_id);
+        try
+        {
+            /// 1. channel_id_base - indicates current consumer buffer.
+            /// 2. channel_id_couner - indicates serial number of created channel for current buffer
+            ///    (incremented on each channel update).
+            /// 3. channel_base is to guarantee that channel_id is unique for each table.
+            channel_id = fmt::format("{}_{}_{}", channel_id_base, channel_id_counter++, channel_base);
 
-        subscribed = 0;
-        subscribe();
-        channel_error.store(false);
+            LOG_TRACE(log, "Channel {} is successfully created", channel_id);
+
+            subscriptions_num = 0;
+            subscribe();
+
+            state = State::OK;
+        }
+        catch (...)
+        {
+            state = State::ERROR;
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
     });
 
     consumer_channel->onError([&](const char * message)
     {
-        LOG_ERROR(log, "Channel {} error: {}", channel_id, message);
-
-        channel_error.store(true);
-        wait_subscription.store(false);
+        LOG_ERROR(log, "Channel {} in an error state: {}", channel_id, message);
+        state = State::ERROR;
     });
 }
 
 
 bool RabbitMQConsumer::needChannelUpdate()
 {
-    if (wait_subscription)
-        return false;
-
-    return channel_error || !consumer_channel || !consumer_channel->usable();
+    chassert(consumer_channel);
+    return state == State::ERROR;
 }
 
 
-void RabbitMQConsumer::iterateEventLoop()
-{
-    event_handler.iterateLoop();
-}
-
 ReadBufferPtr RabbitMQConsumer::consume()
 {
     if (stopped || !received.tryPop(current))
diff --git a/src/Storages/RabbitMQ/RabbitMQConsumer.h b/src/Storages/RabbitMQ/RabbitMQConsumer.h
index b5f51aba294..89dfa060eec 100644
--- a/src/Storages/RabbitMQ/RabbitMQConsumer.h
+++ b/src/Storages/RabbitMQ/RabbitMQConsumer.h
@@ -19,83 +19,98 @@ namespace DB
 {
 
 class RabbitMQHandler;
+class RabbitMQConnection;
 using ChannelPtr = std::unique_ptr<AMQP::TcpChannel>;
+static constexpr auto SANITY_TIMEOUT = 1000 * 60 * 10; /// 10min.
 
 class RabbitMQConsumer
 {
 
 public:
     RabbitMQConsumer(
-            RabbitMQHandler & event_handler_,
-            std::vector<String> & queues_,
-            size_t channel_id_base_,
-            const String & channel_base_,
-            Poco::Logger * log_,
-            uint32_t queue_size_,
-            const std::atomic<bool> & stopped_);
+        RabbitMQHandler & event_handler_,
+        std::vector<String> & queues_,
+        size_t channel_id_base_,
+        const String & channel_base_,
+        Poco::Logger * log_,
+        uint32_t queue_size_);
 
-    struct AckTracker
+    struct CommitInfo
     {
-        UInt64 delivery_tag;
+        UInt64 delivery_tag = 0;
         String channel_id;
-
-        AckTracker() = default;
-        AckTracker(UInt64 tag, String id) : delivery_tag(tag), channel_id(id) {}
     };
 
     struct MessageData
     {
         String message;
         String message_id;
-        uint64_t timestamp = 0;
+        UInt64 timestamp = 0;
         bool redelivered = false;
-        AckTracker track{};
+        UInt64 delivery_tag = 0;
+        String channel_id;
     };
+    const MessageData & currentMessage() { return current; }
 
     /// Return read buffer containing next available message
     /// or nullptr if there are no messages to process.
     ReadBufferPtr consume();
 
-    ChannelPtr & getChannel() { return consumer_channel; }
-    void setupChannel();
     bool needChannelUpdate();
-    void closeChannel();
+    void updateChannel(RabbitMQConnection & connection);
 
-    void updateQueues(std::vector<String> & queues_) { queues = queues_; }
-    size_t queuesCount() { return queues.size(); }
+    void stop();
+    bool isConsumerStopped() const { return stopped.load(); }
 
-    bool isConsumerStopped() { return stopped; }
-    bool ackMessages();
-    void updateAckTracker(AckTracker record = AckTracker());
+    bool ackMessages(const CommitInfo & commit_info);
 
-    bool hasPendingMessages() { return received.empty(); }
+    bool hasPendingMessages() { return !received.empty(); }
 
-    auto getChannelID() const { return current.track.channel_id; }
-    auto getDeliveryTag() const { return current.track.delivery_tag; }
-    auto getRedelivered() const { return current.redelivered; }
-    auto getMessageID() const { return current.message_id; }
-    auto getTimestamp() const { return current.timestamp; }
+    void waitForMessages(std::optional<uint64_t> timeout_ms = std::nullopt)
+    {
+        std::unique_lock lock(mutex);
+        if (!timeout_ms)
+            timeout_ms = SANITY_TIMEOUT;
+        cv.wait_for(lock, std::chrono::milliseconds(*timeout_ms), [this]{ return !received.empty() || isConsumerStopped(); });
+    }
+
+    void closeConnections();
 
 private:
     void subscribe();
-    void iterateEventLoop();
+    bool isChannelUsable();
+    void updateCommitInfo(CommitInfo record);
 
     ChannelPtr consumer_channel;
     RabbitMQHandler & event_handler; /// Used concurrently, but is thread safe.
-    std::vector<String> queues;
+
+    const std::vector<String> queues;
     const String channel_base;
     const size_t channel_id_base;
+
     Poco::Logger * log;
-    const std::atomic<bool> & stopped;
+    std::atomic<bool> stopped;
 
     String channel_id;
-    std::atomic<bool> channel_error = true, wait_subscription = false;
+    UInt64 channel_id_counter = 0;
+
+    enum class State
+    {
+        NONE,
+        INITIALIZING,
+        OK,
+        ERROR,
+    };
+    std::atomic<State> state = State::NONE;
+    size_t subscriptions_num = 0;
+
     ConcurrentBoundedQueue<MessageData> received;
     MessageData current;
-    size_t subscribed = 0;
 
-    AckTracker last_inserted_record_info;
-    UInt64 prev_tag = 0, channel_id_counter = 0;
+    UInt64 last_commited_delivery_tag;
+
+    std::condition_variable cv;
+    std::mutex mutex;
 };
 
 }
diff --git a/src/Storages/RabbitMQ/RabbitMQSettings.h b/src/Storages/RabbitMQ/RabbitMQSettings.h
index d6938a67256..58d80c6ec9d 100644
--- a/src/Storages/RabbitMQ/RabbitMQSettings.h
+++ b/src/Storages/RabbitMQ/RabbitMQSettings.h
@@ -29,7 +29,7 @@ namespace DB
     M(String, rabbitmq_queue_settings_list, "", "A list of rabbitmq queue settings", 0) \
     M(UInt64, rabbitmq_empty_queue_backoff_start_ms, 10, "A minimum backoff point to reschedule read if the rabbitmq queue is empty", 0) \
     M(UInt64, rabbitmq_empty_queue_backoff_end_ms, 10000, "A maximum backoff point to reschedule read if the rabbitmq queue is empty", 0) \
-    M(UInt64, rabbitmq_empty_queue_backoff_step_ms, 100, "A maximum backoff point to reschedule read if the rabbitmq queue is empty", 0) \
+    M(UInt64, rabbitmq_empty_queue_backoff_step_ms, 100, "A backoff step to reschedule read if the rabbitmq queue is empty", 0) \
     M(Bool, rabbitmq_queue_consume, false, "Use user-defined queues and do not make any RabbitMQ setup: declaring exchanges, queues, bindings", 0) \
     M(String, rabbitmq_username, "", "RabbitMQ username", 0) \
     M(String, rabbitmq_password, "", "RabbitMQ password", 0) \
diff --git a/src/Storages/RabbitMQ/RabbitMQSource.cpp b/src/Storages/RabbitMQ/RabbitMQSource.cpp
index c11a518b338..879c0e1e975 100644
--- a/src/Storages/RabbitMQ/RabbitMQSource.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQSource.cpp
@@ -6,6 +6,7 @@
 #include <Storages/RabbitMQ/RabbitMQConsumer.h>
 #include <Common/logger_useful.h>
 #include <IO/EmptyReadBuffer.h>
+#include <base/sleep.h>
 
 namespace DB
 {
@@ -34,6 +35,7 @@ RabbitMQSource::RabbitMQSource(
     ContextPtr context_,
     const Names & columns,
     size_t max_block_size_,
+    UInt64 max_execution_time_,
     bool ack_in_suffix_)
     : RabbitMQSource(
         storage_,
@@ -42,6 +44,7 @@ RabbitMQSource::RabbitMQSource(
         context_,
         columns,
         max_block_size_,
+        max_execution_time_,
         ack_in_suffix_)
 {
 }
@@ -53,6 +56,7 @@ RabbitMQSource::RabbitMQSource(
     ContextPtr context_,
     const Names & columns,
     size_t max_block_size_,
+    UInt64 max_execution_time_,
     bool ack_in_suffix_)
     : ISource(getSampleBlock(headers.first, headers.second))
     , storage(storage_)
@@ -64,6 +68,7 @@ RabbitMQSource::RabbitMQSource(
     , non_virtual_header(std::move(headers.first))
     , virtual_header(std::move(headers.second))
     , log(&Poco::Logger::get("RabbitMQSource"))
+    , max_execution_time_ms(max_execution_time_)
 {
     storage.incrementReader();
 }
@@ -94,10 +99,7 @@ void RabbitMQSource::updateChannel()
     if (!consumer)
         return;
 
-    consumer->updateAckTracker();
-
-    if (storage.updateChannel(consumer->getChannel()))
-        consumer->setupChannel();
+    consumer->updateChannel(storage.getConnection());
 }
 
 Chunk RabbitMQSource::generate()
@@ -109,17 +111,6 @@ Chunk RabbitMQSource::generate()
     return chunk;
 }
 
-bool RabbitMQSource::isTimeLimitExceeded() const
-{
-    if (max_execution_time_ms != 0)
-    {
-        uint64_t elapsed_time_ms = total_stopwatch.elapsedMilliseconds();
-        return max_execution_time_ms <= elapsed_time_ms;
-    }
-
-    return false;
-}
-
 Chunk RabbitMQSource::generateImpl()
 {
     if (!consumer)
@@ -137,17 +128,18 @@ Chunk RabbitMQSource::generateImpl()
 
     MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
     EmptyReadBuffer empty_buf;
-    auto input_format = FormatFactory::instance().getInputFormat(
-            storage.getFormatName(), empty_buf, non_virtual_header, context, max_block_size);
+    auto input_format = FormatFactory::instance().getInput(
+        storage.getFormatName(), empty_buf, non_virtual_header, context, max_block_size, std::nullopt, 1);
 
     StreamingFormatExecutor executor(non_virtual_header, input_format);
     size_t total_rows = 0;
 
+    RabbitMQConsumer::CommitInfo current_commit_info;
     while (true)
     {
         size_t new_rows = 0;
 
-        if (!consumer->hasPendingMessages())
+        if (consumer->hasPendingMessages())
         {
             if (auto buf = consumer->consume())
                 new_rows = executor.execute(*buf);
@@ -155,30 +147,48 @@ Chunk RabbitMQSource::generateImpl()
 
         if (new_rows)
         {
-            auto exchange_name = storage.getExchange();
-            auto channel_id = consumer->getChannelID();
-            auto delivery_tag = consumer->getDeliveryTag();
-            auto redelivered = consumer->getRedelivered();
-            auto message_id = consumer->getMessageID();
-            auto timestamp = consumer->getTimestamp();
-
-            consumer->updateAckTracker({delivery_tag, channel_id});
+            const auto exchange_name = storage.getExchange();
+            const auto & message = consumer->currentMessage();
 
             for (size_t i = 0; i < new_rows; ++i)
             {
                 virtual_columns[0]->insert(exchange_name);
-                virtual_columns[1]->insert(channel_id);
-                virtual_columns[2]->insert(delivery_tag);
-                virtual_columns[3]->insert(redelivered);
-                virtual_columns[4]->insert(message_id);
-                virtual_columns[5]->insert(timestamp);
+                virtual_columns[1]->insert(message.channel_id);
+                virtual_columns[2]->insert(message.delivery_tag);
+                virtual_columns[3]->insert(message.redelivered);
+                virtual_columns[4]->insert(message.message_id);
+                virtual_columns[5]->insert(message.timestamp);
             }
 
             total_rows += new_rows;
+            current_commit_info = {message.delivery_tag, message.channel_id};
+        }
+        else if (total_rows == 0)
+        {
+            break;
         }
 
-        if (total_rows >= max_block_size || consumer->isConsumerStopped() || isTimeLimitExceeded())
+        bool is_time_limit_exceeded = false;
+        UInt64 remaining_execution_time = 0;
+        if (max_execution_time_ms)
+        {
+            uint64_t elapsed_time_ms = total_stopwatch.elapsedMilliseconds();
+            is_time_limit_exceeded = max_execution_time_ms <= elapsed_time_ms;
+            if (!is_time_limit_exceeded)
+                remaining_execution_time = max_execution_time_ms - elapsed_time_ms;
+        }
+
+        if (total_rows >= max_block_size || consumer->isConsumerStopped() || is_time_limit_exceeded)
+        {
             break;
+        }
+        else if (new_rows == 0)
+        {
+            if (remaining_execution_time)
+                consumer->waitForMessages(remaining_execution_time);
+            else
+                consumer->waitForMessages();
+        }
     }
 
     LOG_TEST(
@@ -193,6 +203,7 @@ Chunk RabbitMQSource::generateImpl()
     for (auto & column : virtual_columns)
         result_columns.push_back(std::move(column));
 
+    commit_info = current_commit_info;
     return Chunk(std::move(result_columns), total_rows);
 }
 
@@ -202,7 +213,7 @@ bool RabbitMQSource::sendAck()
     if (!consumer)
         return false;
 
-    if (!consumer->ackMessages())
+    if (!consumer->ackMessages(commit_info))
         return false;
 
     return true;
diff --git a/src/Storages/RabbitMQ/RabbitMQSource.h b/src/Storages/RabbitMQ/RabbitMQSource.h
index 6d06927fc79..4a7f4578190 100644
--- a/src/Storages/RabbitMQ/RabbitMQSource.h
+++ b/src/Storages/RabbitMQ/RabbitMQSource.h
@@ -18,22 +18,21 @@ public:
             ContextPtr context_,
             const Names & columns,
             size_t max_block_size_,
+            UInt64 max_execution_time_,
             bool ack_in_suffix = false);
 
     ~RabbitMQSource() override;
 
     String getName() const override { return storage.getName(); }
-    RabbitMQConsumerPtr getBuffer() { return consumer; }
+    void updateChannel(RabbitMQConnection & connection) { consumer->updateChannel(connection); }
 
     Chunk generate() override;
 
-    bool queueEmpty() const { return !consumer || consumer->hasPendingMessages(); }
+    bool hasPendingMessages() const { return consumer && consumer->hasPendingMessages(); }
     bool needChannelUpdate();
     void updateChannel();
     bool sendAck();
 
-    void setTimeLimit(uint64_t max_execution_time_ms_) { max_execution_time_ms = max_execution_time_ms_; }
-
 private:
     StorageRabbitMQ & storage;
     StorageSnapshotPtr storage_snapshot;
@@ -52,7 +51,7 @@ private:
     uint64_t max_execution_time_ms = 0;
     Stopwatch total_stopwatch {CLOCK_MONOTONIC_COARSE};
 
-    bool isTimeLimitExceeded() const;
+    RabbitMQConsumer::CommitInfo commit_info;
 
     RabbitMQSource(
         StorageRabbitMQ & storage_,
@@ -61,6 +60,7 @@ private:
         ContextPtr context_,
         const Names & columns,
         size_t max_block_size_,
+        UInt64 max_execution_time_,
         bool ack_in_suffix);
 
     Chunk generateImpl();
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index f10a60419d1..e84f5c963a8 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -18,7 +18,7 @@
 #include <Storages/RabbitMQ/RabbitMQSource.h>
 #include <Storages/RabbitMQ/StorageRabbitMQ.h>
 #include <Storages/RabbitMQ/RabbitMQProducer.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
+#include <Storages/NamedCollectionsHelpers.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMaterializedView.h>
 #include <boost/algorithm/string/split.hpp>
@@ -187,8 +187,8 @@ StorageRabbitMQ::StorageRabbitMQ(
     streaming_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQStreamingTask", [this]{ streamingToViewsFunc(); });
     streaming_task->deactivate();
 
-    connection_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQConnectionTask", [this]{ connectionFunc(); });
-    connection_task->deactivate();
+    init_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQConnectionTask", [this]{ connectionFunc(); });
+    init_task->deactivate();
 }
 
 
@@ -287,7 +287,7 @@ void StorageRabbitMQ::stopLoopIfNoReaders()
 
 void StorageRabbitMQ::startLoop()
 {
-    assert(rabbit_is_ready);
+    chassert(initialized);
     connection->getHandler().updateLoopState(Loop::RUN);
     looping_task->activateAndSchedule();
 }
@@ -307,13 +307,23 @@ void StorageRabbitMQ::decrementReader()
 
 void StorageRabbitMQ::connectionFunc()
 {
-    if (rabbit_is_ready)
+    if (initialized)
         return;
 
-    if (connection->reconnect())
-        initRabbitMQ();
-    else
-        connection_task->scheduleAfter(RESCHEDULE_MS);
+    try
+    {
+        if (connection->reconnect())
+            initRabbitMQ();
+
+        streaming_task->scheduleAfter(RESCHEDULE_MS);
+        return;
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+
+    init_task->scheduleAfter(RESCHEDULE_MS);
 }
 
 
@@ -349,38 +359,70 @@ size_t StorageRabbitMQ::getMaxBlockSize() const
 
 void StorageRabbitMQ::initRabbitMQ()
 {
-    if (shutdown_called || rabbit_is_ready)
+    if (shutdown_called || initialized)
         return;
 
     if (use_user_setup)
     {
         queues.emplace_back(queue_base);
-        rabbit_is_ready = true;
-        return;
     }
-
-    try
+    else
     {
-        auto rabbit_channel = connection->createChannel();
+        try
+        {
+            auto rabbit_channel = connection->createChannel();
 
-        /// Main exchange -> Bridge exchange -> ( Sharding exchange ) -> Queues -> Consumers
+            /// Main exchange -> Bridge exchange -> ( Sharding exchange ) -> Queues -> Consumers
 
-        initExchange(*rabbit_channel);
-        bindExchange(*rabbit_channel);
+            initExchange(*rabbit_channel);
+            bindExchange(*rabbit_channel);
 
-        for (const auto i : collections::range(0, num_queues))
-            bindQueue(i + 1, *rabbit_channel);
+            for (const auto i : collections::range(0, num_queues))
+                bindQueue(i + 1, *rabbit_channel);
 
-        LOG_TRACE(log, "RabbitMQ setup completed");
-        rabbit_is_ready = true;
-        rabbit_channel->close();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log);
-        if (!is_attach)
+            if (queues.size() != num_queues)
+            {
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Expected all queues to be initialized (but having {}/{})",
+                    queues.size(), num_queues);
+            }
+
+            LOG_TRACE(log, "RabbitMQ setup completed");
+            rabbit_channel->close();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log);
+            if (is_attach)
+                return; /// A user will have to reattach the table.
             throw;
+        }
     }
+
+    LOG_TRACE(log, "Registering {} conumers", num_consumers);
+
+    for (size_t i = 0; i < num_consumers; ++i)
+    {
+        try
+        {
+            auto consumer = createConsumer();
+            consumer->updateChannel(*connection);
+            consumers_ref.push_back(consumer);
+            pushConsumer(consumer);
+            ++num_created_consumers;
+        }
+        catch (...)
+        {
+            if (!is_attach)
+                throw;
+
+            tryLogCurrentException(log);
+        }
+    }
+
+    LOG_TRACE(log, "Registered {}/{} conumers", num_created_consumers, num_consumers);
+    initialized = true;
 }
 
 
@@ -593,35 +635,6 @@ void StorageRabbitMQ::bindQueue(size_t queue_id, AMQP::TcpChannel & rabbit_chann
 }
 
 
-bool StorageRabbitMQ::updateChannel(ChannelPtr & channel)
-{
-    try
-    {
-        channel = connection->createChannel();
-        return true;
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log);
-        return false;
-    }
-}
-
-
-void StorageRabbitMQ::prepareChannelForConsumer(RabbitMQConsumerPtr consumer)
-{
-    if (!consumer)
-        return;
-
-    if (consumer->queuesCount() != queues.size())
-        consumer->updateQueues(queues);
-
-    consumer->updateAckTracker();
-
-    if (updateChannel(consumer->getChannel()))
-        consumer->setupChannel();
-}
-
 void StorageRabbitMQ::unbindExchange()
 {
     /* This is needed because with RabbitMQ (without special adjustments) can't, for example, properly make mv if there was insert query
@@ -676,7 +689,7 @@ void StorageRabbitMQ::read(
         size_t /* max_block_size */,
         size_t /* num_streams */)
 {
-    if (!rabbit_is_ready)
+    if (!initialized)
         throw Exception(ErrorCodes::CANNOT_CONNECT_RABBITMQ, "RabbitMQ setup not finished. Connection might be lost");
 
     if (num_created_consumers == 0)
@@ -706,21 +719,18 @@ void StorageRabbitMQ::read(
             throw Exception(ErrorCodes::CANNOT_CONNECT_RABBITMQ, "No connection to {}", connection->connectionInfoForLog());
     }
 
-    initializeBuffers();
-
     Pipes pipes;
     pipes.reserve(num_created_consumers);
 
+    uint64_t max_execution_time_ms = rabbitmq_settings->rabbitmq_flush_interval_ms.changed
+        ? rabbitmq_settings->rabbitmq_flush_interval_ms
+        : static_cast<UInt64>(getContext()->getSettingsRef().stream_flush_interval_ms.totalMilliseconds());
+
     for (size_t i = 0; i < num_created_consumers; ++i)
     {
         auto rabbit_source = std::make_shared<RabbitMQSource>(
-            *this, storage_snapshot, modified_context, column_names, 1, rabbitmq_settings->rabbitmq_commit_on_select);
-
-        uint64_t max_execution_time_ms = rabbitmq_settings->rabbitmq_flush_interval_ms.changed
-                                          ? rabbitmq_settings->rabbitmq_flush_interval_ms
-                                          : (static_cast<UInt64>(getContext()->getSettingsRef().stream_flush_interval_ms) * 1000);
-
-        rabbit_source->setTimeLimit(max_execution_time_ms);
+            *this, storage_snapshot, modified_context, column_names, 1,
+            max_execution_time_ms, rabbitmq_settings->rabbitmq_commit_on_select);
 
         auto converting_dag = ActionsDAG::makeConvertingActions(
             rabbit_source->getPort().getHeader().getColumnsWithTypeAndName(),
@@ -774,44 +784,15 @@ SinkToStoragePtr StorageRabbitMQ::write(const ASTPtr &, const StorageMetadataPtr
 
 void StorageRabbitMQ::startup()
 {
-    if (!rabbit_is_ready)
+    if (initialized)
     {
-        if (connection->isConnected())
-        {
-            try
-            {
-                initRabbitMQ();
-            }
-            catch (...)
-            {
-                if (!is_attach)
-                    throw;
-                tryLogCurrentException(log);
-            }
-        }
-        else
-        {
-            connection_task->activateAndSchedule();
-        }
+        streaming_task->activateAndSchedule();
     }
-
-    for (size_t i = 0; i < num_consumers; ++i)
+    else
     {
-        try
-        {
-            auto consumer = createConsumer();
-            pushConsumer(std::move(consumer));
-            ++num_created_consumers;
-        }
-        catch (...)
-        {
-            if (!is_attach)
-                throw;
-            tryLogCurrentException(log);
-        }
+        streaming_task->activate();
+        init_task->activateAndSchedule();
     }
-
-    streaming_task->activateAndSchedule();
 }
 
 
@@ -819,10 +800,13 @@ void StorageRabbitMQ::shutdown()
 {
     shutdown_called = true;
 
+    for (auto & consumer : consumers_ref)
+        consumer.lock()->stop();
+
     LOG_TRACE(log, "Deactivating background tasks");
 
     /// In case it has not yet been able to setup connection;
-    deactivateTask(connection_task, true, false);
+    deactivateTask(init_task, true, false);
 
     /// The order of deactivating tasks is important: wait for streamingToViews() func to finish and
     /// then wait for background event loop to finish.
@@ -834,13 +818,11 @@ void StorageRabbitMQ::shutdown()
     /// Just a paranoid try catch, it is not actually needed.
     try
     {
-        if (drop_table)
-        {
-            for (auto & consumer : consumers)
-                consumer->closeChannel();
+        for (auto & consumer : consumers_ref)
+            consumer.lock()->closeConnections();
 
+        if (drop_table)
             cleanupRabbitMQ();
-        }
 
         /// It is important to close connection here - before removing consumers, because
         /// it will finish and clean callbacks, which might use those consumers data.
@@ -946,16 +928,17 @@ RabbitMQConsumerPtr StorageRabbitMQ::popConsumer(std::chrono::milliseconds timeo
 RabbitMQConsumerPtr StorageRabbitMQ::createConsumer()
 {
     return std::make_shared<RabbitMQConsumer>(
-        connection->getHandler(), queues, ++consumer_id,
-        unique_strbase, log, queue_size, shutdown_called);
+        connection->getHandler(), queues, ++consumer_id, unique_strbase, log, queue_size);
 }
 
-bool StorageRabbitMQ::checkDependencies(const StorageID & table_id)
+bool StorageRabbitMQ::hasDependencies(const StorageID & table_id)
 {
     // Check if all dependencies are attached
     auto view_ids = DatabaseCatalog::instance().getDependentViews(table_id);
+    LOG_TEST(log, "Number of attached views {} for {}", view_ids.size(), table_id.getNameForLogs());
+
     if (view_ids.empty())
-        return true;
+        return false;
 
     // Check the dependencies are ready?
     for (const auto & view_id : view_ids)
@@ -968,31 +951,16 @@ bool StorageRabbitMQ::checkDependencies(const StorageID & table_id)
         auto * materialized_view = dynamic_cast<StorageMaterializedView *>(view.get());
         if (materialized_view && !materialized_view->tryGetTargetTable())
             return false;
-
-        // Check all its dependencies
-        if (!checkDependencies(view_id))
-            return false;
     }
 
     return true;
 }
 
 
-void StorageRabbitMQ::initializeBuffers()
-{
-    assert(rabbit_is_ready);
-    if (!initialized)
-    {
-        for (const auto & consumer : consumers)
-            prepareChannelForConsumer(consumer);
-        initialized = true;
-    }
-}
-
-
 void StorageRabbitMQ::streamingToViewsFunc()
 {
-    if (rabbit_is_ready)
+    chassert(initialized);
+    if (initialized)
     {
         try
         {
@@ -1004,7 +972,6 @@ void StorageRabbitMQ::streamingToViewsFunc()
 
             if (num_views && rabbit_connected)
             {
-                initializeBuffers();
                 auto start_time = std::chrono::steady_clock::now();
 
                 mv_attached.store(true);
@@ -1012,32 +979,24 @@ void StorageRabbitMQ::streamingToViewsFunc()
                 // Keep streaming as long as there are attached views and streaming is not cancelled
                 while (!shutdown_called && num_created_consumers > 0)
                 {
-                    if (!checkDependencies(table_id))
+                    if (!hasDependencies(table_id))
                         break;
 
                     LOG_DEBUG(log, "Started streaming to {} attached views", num_views);
 
-                    if (streamToViews())
-                    {
-                        /// Reschedule with backoff.
-                        if (milliseconds_to_wait < rabbitmq_settings->rabbitmq_empty_queue_backoff_end_ms)
-                            milliseconds_to_wait += rabbitmq_settings->rabbitmq_empty_queue_backoff_step_ms;
-                        stopLoopIfNoReaders();
+                    bool continue_reading = tryStreamToViews();
+                    if (!continue_reading)
                         break;
-                    }
-                    else
-                    {
-                        milliseconds_to_wait = rabbitmq_settings->rabbitmq_empty_queue_backoff_start_ms;
-                    }
 
                     auto end_time = std::chrono::steady_clock::now();
                     auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time);
                     if (duration.count() > MAX_THREAD_WORK_DURATION_MS)
                     {
-                        stopLoopIfNoReaders();
                         LOG_TRACE(log, "Reschedule streaming. Thread work duration limit exceeded.");
                         break;
                     }
+
+                    milliseconds_to_wait = rabbitmq_settings->rabbitmq_empty_queue_backoff_start_ms;
                 }
             }
         }
@@ -1055,11 +1014,17 @@ void StorageRabbitMQ::streamingToViewsFunc()
         stopLoopIfNoReaders();
 
     if (!shutdown_called)
+    {
+        /// Reschedule with backoff.
+        if (milliseconds_to_wait < rabbitmq_settings->rabbitmq_empty_queue_backoff_end_ms)
+            milliseconds_to_wait += rabbitmq_settings->rabbitmq_empty_queue_backoff_step_ms;
+
         streaming_task->scheduleAfter(milliseconds_to_wait);
+    }
 }
 
 
-bool StorageRabbitMQ::streamToViews()
+bool StorageRabbitMQ::tryStreamToViews()
 {
     auto table_id = getStorageID();
     auto table = DatabaseCatalog::instance().getTable(table_id, getContext());
@@ -1086,16 +1051,14 @@ bool StorageRabbitMQ::streamToViews()
     sources.reserve(num_created_consumers);
     pipes.reserve(num_created_consumers);
 
+    uint64_t max_execution_time_ms = rabbitmq_settings->rabbitmq_flush_interval_ms.changed
+        ? rabbitmq_settings->rabbitmq_flush_interval_ms
+        : static_cast<UInt64>(getContext()->getSettingsRef().stream_flush_interval_ms.totalMilliseconds());
+
     for (size_t i = 0; i < num_created_consumers; ++i)
     {
         auto source = std::make_shared<RabbitMQSource>(
-            *this, storage_snapshot, rabbitmq_context, column_names, block_size, false);
-
-        uint64_t max_execution_time_ms = rabbitmq_settings->rabbitmq_flush_interval_ms.changed
-                                          ? rabbitmq_settings->rabbitmq_flush_interval_ms
-                                          : (static_cast<UInt64>(getContext()->getSettingsRef().stream_flush_interval_ms) * 1000);
-
-        source->setTimeLimit(max_execution_time_ms);
+            *this, storage_snapshot, rabbitmq_context, column_names, block_size, max_execution_time_ms, false);
 
         sources.emplace_back(source);
         pipes.emplace_back(source);
@@ -1117,10 +1080,17 @@ bool StorageRabbitMQ::streamToViews()
     deactivateTask(looping_task, false, true);
     size_t queue_empty = 0;
 
+    if (!hasDependencies(getStorageID()))
+    {
+        /// Do not commit to rabbitmq if the dependency was removed.
+        LOG_TRACE(log, "No dependencies, reschedule");
+        return false;
+    }
+
     if (!connection->isConnected())
     {
         if (shutdown_called)
-            return true;
+            return false;
 
         if (connection->reconnect())
         {
@@ -1131,7 +1101,7 @@ bool StorageRabbitMQ::streamToViews()
         else
         {
             LOG_TRACE(log, "Reschedule streaming. Unable to restore connection.");
-            return true;
+            return false;
         }
     }
     else
@@ -1139,14 +1109,11 @@ bool StorageRabbitMQ::streamToViews()
         /// Commit
         for (auto & source : sources)
         {
-            if (source->queueEmpty())
+            if (!source->hasPendingMessages())
                 ++queue_empty;
 
             if (source->needChannelUpdate())
-            {
-                auto consumer = source->getBuffer();
-                prepareChannelForConsumer(consumer);
-            }
+                source->updateChannel(*connection);
 
             /* false is returned by the sendAck function in only two cases:
              * 1) if connection failed. In this case all channels will be closed and will be unable to send ack. Also ack is made based on
@@ -1177,7 +1144,7 @@ bool StorageRabbitMQ::streamToViews()
         connection->heartbeat();
         read_attempts = 0;
         LOG_TRACE(log, "Reschedule streaming. Queues are empty.");
-        return true;
+        return false;
     }
     else
     {
@@ -1185,7 +1152,7 @@ bool StorageRabbitMQ::streamToViews()
     }
 
     /// Do not reschedule, do not stop event loop.
-    return false;
+    return true;
 }
 
 
@@ -1194,8 +1161,17 @@ void registerStorageRabbitMQ(StorageFactory & factory)
     auto creator_fn = [](const StorageFactory::Arguments & args)
     {
         auto rabbitmq_settings = std::make_unique<RabbitMQSettings>();
-        bool with_named_collection = getExternalDataSourceConfiguration(args.engine_args, *rabbitmq_settings, args.getLocalContext());
-        if (!with_named_collection && !args.storage_def->settings)
+
+        if (auto named_collection = tryGetNamedCollectionWithOverrides(args.engine_args, args.getLocalContext()))
+        {
+            for (const auto & setting : rabbitmq_settings->all())
+            {
+                const auto & setting_name = setting.getName();
+                if (named_collection->has(setting_name))
+                    rabbitmq_settings->set(setting_name, named_collection->get<String>(setting_name));
+            }
+        }
+        else if (!args.storage_def->settings)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "RabbitMQ engine must have settings");
 
         if (args.storage_def->settings)
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.h b/src/Storages/RabbitMQ/StorageRabbitMQ.h
index a3f51e43baa..c531026d83a 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.h
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.h
@@ -72,9 +72,7 @@ public:
     String getExchange() const { return exchange_name; }
     void unbindExchange();
 
-    bool updateChannel(ChannelPtr & channel);
-    void updateQueues(std::vector<String> & queues_) { queues_ = queues; }
-    void prepareChannelForConsumer(RabbitMQConsumerPtr consumer);
+    RabbitMQConnection & getConnection() { return *connection; }
 
     void incrementReader();
     void decrementReader();
@@ -112,6 +110,7 @@ private:
     Poco::Semaphore semaphore;
     std::mutex consumers_mutex;
     std::vector<RabbitMQConsumerPtr> consumers; /// available RabbitMQ consumers
+    std::vector<std::weak_ptr<RabbitMQConsumer>> consumers_ref;
 
     String unique_strbase; /// to make unique consumer channel id
 
@@ -128,7 +127,7 @@ private:
     std::mutex task_mutex;
     BackgroundSchedulePool::TaskHolder streaming_task;
     BackgroundSchedulePool::TaskHolder looping_task;
-    BackgroundSchedulePool::TaskHolder connection_task;
+    BackgroundSchedulePool::TaskHolder init_task;
 
     uint64_t milliseconds_to_wait;
 
@@ -141,9 +140,6 @@ private:
     /// Counter for producers, needed for channel id.
     /// Needed to generate unique producer identifiers.
     std::atomic<size_t> producer_id = 1;
-    /// Has connection background task completed successfully?
-    /// It is started only once -- in constructor.
-    std::atomic<bool> rabbit_is_ready = false;
     /// Allow to remove exchange only once.
     std::atomic<bool> exchange_removed = false;
     /// For select query we must be aware of the end of streaming
@@ -164,7 +160,6 @@ private:
     bool is_attach;
 
     RabbitMQConsumerPtr createConsumer();
-    void initializeBuffers();
     bool initialized = false;
 
     /// Functions working in the background
@@ -191,8 +186,9 @@ private:
     void bindExchange(AMQP::TcpChannel & rabbit_channel);
     void bindQueue(size_t queue_id, AMQP::TcpChannel & rabbit_channel);
 
-    bool streamToViews();
-    bool checkDependencies(const StorageID & table_id);
+    /// Return true on successful stream attempt.
+    bool tryStreamToViews();
+    bool hasDependencies(const StorageID & table_id);
 
     static String getRandomName()
     {
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index 9ff0c152399..d1195a9132e 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -230,14 +230,17 @@ void StorageEmbeddedRocksDB::mutate(const MutationCommands & commands, ContextPt
 
     if (commands.front().type == MutationCommand::Type::DELETE)
     {
+        MutationsInterpreter::Settings settings(true);
+        settings.return_all_columns = true;
+        settings.return_mutated_rows = true;
+
         auto interpreter = std::make_unique<MutationsInterpreter>(
             storage_ptr,
             metadata_snapshot,
             commands,
             context_,
-            /*can_execute_*/ true,
-            /*return_all_columns_*/ true,
-            /*return_deleted_rows_*/ true);
+            settings);
+
         auto pipeline = QueryPipelineBuilder::getPipeline(interpreter->execute());
         PullingPipelineExecutor executor(pipeline);
 
@@ -276,10 +279,19 @@ void StorageEmbeddedRocksDB::mutate(const MutationCommands & commands, ContextPt
 
     assert(commands.front().type == MutationCommand::Type::UPDATE);
     if (commands.front().column_to_update_expression.contains(primary_key))
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Primary key cannot be updated");
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Primary key cannot be updated (cannot update column {})", primary_key);
+
+    MutationsInterpreter::Settings settings(true);
+    settings.return_all_columns = true;
+    settings.return_mutated_rows = true;
 
     auto interpreter = std::make_unique<MutationsInterpreter>(
-        storage_ptr, metadata_snapshot, commands, context_, /*can_execute_*/ true, /*return_all_columns*/ true);
+        storage_ptr,
+        metadata_snapshot,
+        commands,
+        context_,
+        settings);
+
     auto pipeline = QueryPipelineBuilder::getPipeline(interpreter->execute());
     PullingPipelineExecutor executor(pipeline);
 
diff --git a/src/Storages/S3DataLakeMetadataReadHelper.h b/src/Storages/S3DataLakeMetadataReadHelper.h
deleted file mode 100644
index 2187ffa3eda..00000000000
--- a/src/Storages/S3DataLakeMetadataReadHelper.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <config.h>
-
-#if USE_AWS_S3
-
-#    include <Storages/StorageS3.h>
-
-class ReadBuffer;
-
-namespace DB
-{
-
-struct S3DataLakeMetadataReadHelper
-{
-    static std::shared_ptr<ReadBuffer>
-    createReadBuffer(const String & key, ContextPtr context, const StorageS3::Configuration & base_configuration);
-
-    static std::vector<String>
-    listFilesMatchSuffix(const StorageS3::Configuration & base_configuration, const String & directory, const String & suffix);
-
-    static std::vector<String> listFiles(const StorageS3::Configuration & configuration);
-};
-}
-
-#endif
diff --git a/src/Storages/SelectQueryInfo.h b/src/Storages/SelectQueryInfo.h
index 40ea84ec68b..b3dfd44b2ad 100644
--- a/src/Storages/SelectQueryInfo.h
+++ b/src/Storages/SelectQueryInfo.h
@@ -190,6 +190,7 @@ struct SelectQueryInfo
     PlannerContextPtr planner_context;
 
     /// Storage table expression
+    /// It's guaranteed to be present in JOIN TREE of `query_tree`
     QueryTreeNodePtr table_expression;
 
     /// Table expression modifiers for storage
@@ -207,6 +208,8 @@ struct SelectQueryInfo
     ///
     /// Configured in StorageDistributed::getQueryProcessingStage()
     ClusterPtr optimized_cluster;
+    /// should we use custom key with the cluster
+    bool use_custom_key = false;
 
     mutable ParallelReplicasReadingCoordinatorPtr coordinator;
 
@@ -218,6 +221,8 @@ struct SelectQueryInfo
     /// It is needed for PK analysis based on row_level_policy and additional_filters.
     ASTs filter_asts;
 
+    ASTPtr parallel_replica_custom_key_ast;
+
     /// Filter actions dag for current storage
     ActionsDAGPtr filter_actions_dag;
 
@@ -246,10 +251,12 @@ struct SelectQueryInfo
     bool is_projection_query = false;
     bool merge_tree_empty_result = false;
     bool settings_limit_offset_done = false;
+    bool is_internal = false;
     Block minmax_count_projection_block;
     MergeTreeDataSelectAnalysisResultPtr merge_tree_select_result_ptr;
 
     bool is_parameterized_view = false;
+    NameToNameMap parameterized_view_values;
 
     // If limit is not 0, that means it's a trivial limit query.
     UInt64 limit = 0;
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index a69f26203e9..a4cb15d5711 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -1016,7 +1016,7 @@ void StorageBuffer::reschedule()
 
 void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
-    auto name_deps = getDependentViewsByColumn(local_context);
+    std::optional<NameDependencies> name_deps{};
     for (const auto & command : commands)
     {
         if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
@@ -1027,7 +1027,9 @@ void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, Context
 
         if (command.type == AlterCommand::Type::DROP_COLUMN && !command.clear)
         {
-            const auto & deps_mv = name_deps[command.column_name];
+            if (!name_deps)
+                name_deps = getDependentViewsByColumn(local_context);
+            const auto & deps_mv = name_deps.value()[command.column_name];
             if (!deps_mv.empty())
             {
                 throw Exception(ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN,
diff --git a/src/Storages/StorageDeltaLake.cpp b/src/Storages/StorageDeltaLake.cpp
deleted file mode 100644
index ac3730d5c45..00000000000
--- a/src/Storages/StorageDeltaLake.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-#include "config.h"
-#if USE_AWS_S3
-
-#include <Storages/StorageDeltaLake.h>
-#include <Common/logger_useful.h>
-
-#include <Storages/StorageFactory.h>
-
-#include <Formats/FormatFactory.h>
-
-#include <QueryPipeline/Pipe.h>
-
-#include <fmt/format.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int S3_ERROR;
-    extern const int INCORRECT_DATA;
-}
-
-void DeltaLakeMetadata::setLastModifiedTime(const String & filename, uint64_t timestamp)
-{
-    file_update_time[filename] = timestamp;
-}
-
-void DeltaLakeMetadata::remove(const String & filename, uint64_t /*timestamp */)
-{
-    bool erase = file_update_time.erase(filename);
-    if (!erase)
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid table metadata, tried to remove {} before adding it", filename);
-}
-
-std::vector<String> DeltaLakeMetadata::listCurrentFiles() &&
-{
-    std::vector<String> keys;
-    keys.reserve(file_update_time.size());
-
-    for (auto && [k, _] : file_update_time)
-        keys.push_back(k);
-
-    return keys;
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-DeltaLakeMetadataParser<Configuration, MetadataReadHelper>::DeltaLakeMetadataParser(const Configuration & configuration_, ContextPtr context)
-    : base_configuration(configuration_)
-{
-    init(context);
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-void DeltaLakeMetadataParser<Configuration, MetadataReadHelper>::init(ContextPtr context)
-{
-    auto keys = getJsonLogFiles();
-
-    // read data from every json log file
-    for (const String & key : keys)
-    {
-        auto buf = MetadataReadHelper::createReadBuffer(key, context, base_configuration);
-
-        char c;
-        while (!buf->eof())
-        {
-            /// May be some invalid characters before json.
-            while (buf->peek(c) && c != '{')
-                buf->ignore();
-
-            if (buf->eof())
-                break;
-
-            String json_str;
-            readJSONObjectPossiblyInvalid(json_str, *buf);
-
-            if (json_str.empty())
-                continue;
-
-            const JSON json(json_str);
-            handleJSON(json);
-        }
-    }
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-std::vector<String> DeltaLakeMetadataParser<Configuration, MetadataReadHelper>::getJsonLogFiles() const
-{
-
-    /// DeltaLake format stores all metadata json files in _delta_log directory
-    static constexpr auto deltalake_metadata_directory = "_delta_log";
-    static constexpr auto meta_file_suffix = ".json";
-
-    return MetadataReadHelper::listFilesMatchSuffix(base_configuration, deltalake_metadata_directory, meta_file_suffix);
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-void DeltaLakeMetadataParser<Configuration, MetadataReadHelper>::handleJSON(const JSON & json)
-{
-    if (json.has("add"))
-    {
-        auto path = json["add"]["path"].getString();
-        auto timestamp = json["add"]["modificationTime"].getInt();
-
-        metadata.setLastModifiedTime(path, timestamp);
-    }
-    else if (json.has("remove"))
-    {
-        auto path = json["remove"]["path"].getString();
-        auto timestamp = json["remove"]["deletionTimestamp"].getInt();
-
-        metadata.remove(path, timestamp);
-    }
-}
-
-
-// DeltaLake stores data in parts in different files
-// keys is vector of parts with latest version
-// generateQueryFromKeys constructs query from parts filenames for
-// underlying StorageS3 engine
-template <typename Configuration, typename MetadataReadHelper>
-String DeltaLakeMetadataParser<Configuration, MetadataReadHelper>::generateQueryFromKeys(const std::vector<String> & keys, const String &)
-{
-    std::string new_query = fmt::format("{{{}}}", fmt::join(keys, ","));
-    return new_query;
-}
-
-template DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::DeltaLakeMetadataParser(
-    const StorageS3::Configuration & configuration_, ContextPtr context);
-
-template std::vector<String> DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::getFiles();
-
-template String DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::generateQueryFromKeys(
-    const std::vector<String> & keys, const String & format);
-
-template void DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::init(ContextPtr context);
-
-template std::vector<String> DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::getJsonLogFiles() const;
-
-template void DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::handleJSON(const JSON & json);
-
-void registerStorageDeltaLake(StorageFactory & factory)
-{
-    factory.registerStorage(
-        "DeltaLake",
-        [](const StorageFactory::Arguments & args)
-        {
-            StorageS3::Configuration configuration = StorageDeltaLake::getConfiguration(args.engine_args, args.getLocalContext());
-
-            auto format_settings = getFormatSettings(args.getContext());
-
-            return std::make_shared<StorageDeltaLake>(
-                configuration, args.table_id, args.columns, args.constraints, args.comment, args.getContext(), format_settings);
-        },
-        {
-            .supports_settings = false,
-            .supports_schema_inference = true,
-            .source_access_type = AccessType::S3,
-        });
-}
-
-}
-
-#endif
diff --git a/src/Storages/StorageDeltaLake.h b/src/Storages/StorageDeltaLake.h
deleted file mode 100644
index 19225638aa7..00000000000
--- a/src/Storages/StorageDeltaLake.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include "config.h"
-
-#if USE_AWS_S3
-
-#    include <Storages/IStorageDataLake.h>
-#    include <Storages/S3DataLakeMetadataReadHelper.h>
-#    include <Storages/StorageS3.h>
-
-#    include <base/JSON.h>
-
-namespace DB
-{
-
-// class to parse json deltalake metadata and find files needed for query in table
-class DeltaLakeMetadata
-{
-public:
-    DeltaLakeMetadata() = default;
-
-    void setLastModifiedTime(const String & filename, uint64_t timestamp);
-    void remove(const String & filename, uint64_t timestamp);
-
-    std::vector<String> listCurrentFiles() &&;
-
-private:
-    std::unordered_map<String, uint64_t> file_update_time;
-};
-
-// class to get deltalake log json files and read json from them
-template <typename Configuration, typename MetadataReadHelper>
-class DeltaLakeMetadataParser
-{
-public:
-    DeltaLakeMetadataParser(const Configuration & configuration_, ContextPtr context);
-
-    std::vector<String> getFiles() { return std::move(metadata).listCurrentFiles(); }
-
-    static String generateQueryFromKeys(const std::vector<String> & keys, const String & format);
-
-private:
-    void init(ContextPtr context);
-
-    std::vector<String> getJsonLogFiles() const;
-
-    void handleJSON(const JSON & json);
-
-    Configuration base_configuration;
-    DeltaLakeMetadata metadata;
-};
-
-struct StorageDeltaLakeName
-{
-    static constexpr auto name = "DeltaLake";
-    static constexpr auto data_directory_prefix = "";
-};
-
-using StorageDeltaLake
-    = IStorageDataLake<StorageS3, StorageDeltaLakeName, DeltaLakeMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>>;
-}
-
-#endif
diff --git a/src/Storages/StorageDictionary.h b/src/Storages/StorageDictionary.h
index b3442ec2f99..48230dcfa9f 100644
--- a/src/Storages/StorageDictionary.h
+++ b/src/Storages/StorageDictionary.h
@@ -4,6 +4,7 @@
 
 #include <Storages/IStorage.h>
 #include <Interpreters/IExternalLoaderConfigRepository.h>
+#include <base/scope_guard.h>
 
 
 namespace DB
@@ -73,6 +74,10 @@ public:
         size_t max_block_size,
         size_t threads) override;
 
+    /// FIXME: processing after reading from dictionaries are not parallelized due to some bug:
+    /// count() can return wrong result, see test_dictionaries_redis/test_long.py::test_redis_dict_long
+    bool parallelizeOutputAfterReading(ContextPtr) const override { return false; }
+
     std::shared_ptr<const IDictionary> getDictionary() const;
 
     static NamesAndTypesList getNamesAndTypes(const DictionaryStructure & dictionary_structure);
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index 5516d6cadf0..fc552a5ab6d 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -17,6 +17,8 @@
 #include <Storages/AlterCommands.h>
 #include <Storages/getStructureOfRemoteTable.h>
 #include <Storages/checkAndGetLiteralArgument.h>
+#include <Storages/StorageDummy.h>
+#include <Storages/removeGroupingFunctionSpecializations.h>
 
 #include <Columns/ColumnConst.h>
 
@@ -27,6 +29,7 @@
 #include <Common/quoteString.h>
 #include <Common/randomSeed.h>
 #include <Common/formatReadable.h>
+#include <Common/CurrentMetrics.h>
 
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
@@ -38,11 +41,16 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/IAST.h>
 
+#include <Analyzer/Utils.h>
+#include <Analyzer/ColumnNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/TableNode.h>
 #include <Analyzer/TableFunctionNode.h>
+#include <Analyzer/QueryNode.h>
+#include <Analyzer/JoinNode.h>
 #include <Analyzer/QueryTreeBuilder.h>
 #include <Analyzer/Passes/QueryAnalysisPass.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
 
 #include <Planner/Planner.h>
 #include <Planner/Utils.h>
@@ -50,9 +58,11 @@
 #include <Interpreters/ClusterProxy/SelectStreamFactory.h>
 #include <Interpreters/ClusterProxy/executeQuery.h>
 #include <Interpreters/Cluster.h>
+#include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/InterpreterDescribeQuery.h>
 #include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/JoinedTables.h>
 #include <Interpreters/TranslateQualifiedNamesVisitor.h>
@@ -64,13 +74,17 @@
 #include <Interpreters/getClusterName.h>
 #include <Interpreters/getTableExpressions.h>
 #include <Interpreters/RequiredSourceColumnsVisitor.h>
+#include <Interpreters/getCustomKeyFilterForParallelReplicas.h>
+
 #include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
 #include <TableFunctions/TableFunctionView.h>
 #include <TableFunctions/TableFunctionFactory.h>
 
 #include <Storages/IStorageCluster.h>
 
 #include <Processors/Executors/PushingPipelineExecutor.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
@@ -81,6 +95,7 @@
 #include <Processors/Sinks/EmptySink.h>
 
 #include <Core/Settings.h>
+#include <Core/SettingsEnums.h>
 
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
@@ -112,6 +127,12 @@ namespace ProfileEvents
     extern const Event DistributedDelayedInsertsMilliseconds;
 }
 
+namespace CurrentMetrics
+{
+    extern const Metric StorageDistributedThreads;
+    extern const Metric StorageDistributedThreadsActive;
+}
+
 namespace DB
 {
 
@@ -124,7 +145,6 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int INCORRECT_NUMBER_OF_COLUMNS;
     extern const int INFINITE_LOOP;
-    extern const int ILLEGAL_FINAL;
     extern const int TYPE_MISMATCH;
     extern const int TOO_MANY_ROWS;
     extern const int UNABLE_TO_SKIP_UNUSED_SHARDS;
@@ -133,7 +153,7 @@ namespace ErrorCodes
     extern const int DISTRIBUTED_TOO_MANY_PENDING_BYTES;
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
-    extern const int UNSUPPORTED_METHOD;
+    extern const int DISTRIBUTED_IN_JOIN_SUBQUERY_DENIED;
 }
 
 namespace ActionLocks
@@ -262,7 +282,6 @@ size_t getClusterQueriedNodes(const Settings & settings, const ClusterPtr & clus
 
 }
 
-
 /// For destruction of std::unique_ptr of type that is incomplete in class definition.
 StorageDistributed::~StorageDistributed() = default;
 
@@ -400,29 +419,38 @@ QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
     const auto & settings = local_context->getSettingsRef();
 
     ClusterPtr cluster = getCluster();
-    query_info.cluster = cluster;
 
     size_t nodes = getClusterQueriedNodes(settings, cluster);
 
-    /// Always calculate optimized cluster here, to avoid conditions during read()
-    /// (Anyway it will be calculated in the read())
-    if (nodes > 1 && settings.optimize_skip_unused_shards)
+    if (query_info.use_custom_key)
     {
-        ClusterPtr optimized_cluster = getOptimizedCluster(local_context, storage_snapshot, query_info.query);
-        if (optimized_cluster)
-        {
-            LOG_DEBUG(log, "Skipping irrelevant shards - the query will be sent to the following shards of the cluster (shard numbers): {}",
-                    makeFormattedListOfShards(optimized_cluster));
+        LOG_INFO(log, "Single shard cluster used with custom_key, transforming replicas into virtual shards");
+        query_info.cluster = cluster->getClusterWithReplicasAsShards(settings, settings.max_parallel_replicas);
+    }
+    else
+    {
+        query_info.cluster = cluster;
 
-            cluster = optimized_cluster;
-            query_info.optimized_cluster = cluster;
-
-            nodes = getClusterQueriedNodes(settings, cluster);
-        }
-        else
+        if (nodes > 1 && settings.optimize_skip_unused_shards)
         {
-            LOG_DEBUG(log, "Unable to figure out irrelevant shards from WHERE/PREWHERE clauses - the query will be sent to all shards of the cluster{}",
-                    has_sharding_key ? "" : " (no sharding key)");
+            /// Always calculate optimized cluster here, to avoid conditions during read()
+            /// (Anyway it will be calculated in the read())
+            ClusterPtr optimized_cluster = getOptimizedCluster(local_context, storage_snapshot, query_info.query);
+            if (optimized_cluster)
+            {
+                LOG_DEBUG(log, "Skipping irrelevant shards - the query will be sent to the following shards of the cluster (shard numbers): {}",
+                        makeFormattedListOfShards(optimized_cluster));
+
+                cluster = optimized_cluster;
+                query_info.optimized_cluster = cluster;
+
+                nodes = getClusterQueriedNodes(settings, cluster);
+            }
+            else
+            {
+                LOG_DEBUG(log, "Unable to figure out irrelevant shards from WHERE/PREWHERE clauses - the query will be sent to all shards of the cluster{}",
+                        has_sharding_key ? "" : " (no sharding key)");
+            }
         }
     }
 
@@ -616,56 +644,284 @@ StorageSnapshotPtr StorageDistributed::getStorageSnapshotForQuery(
         metadata_snapshot->getColumns(),
         [](const auto & shard_num_and_columns) -> const auto & { return shard_num_and_columns.second; });
 
-    return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, object_columns, std::move(snapshot_data));
+    return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, std::move(object_columns), std::move(snapshot_data));
 }
 
 namespace
 {
 
-class StorageDistributedLocal : public IStorage
+/// Visitor that collect column source to columns mapping from query and all subqueries
+class CollectColumnSourceToColumnsVisitor : public InDepthQueryTreeVisitor<CollectColumnSourceToColumnsVisitor>
 {
 public:
-    StorageDistributedLocal(const StorageID & table_id_, const ColumnsDescription & columns_)
-        : IStorage(table_id_)
+    struct Columns
     {
-        StorageInMemoryMetadata storage_metadata;
-        storage_metadata.setColumns(columns_);
-        setInMemoryMetadata(storage_metadata);
+        NameSet column_names;
+        NamesAndTypes columns;
+
+        void addColumn(NameAndTypePair column)
+        {
+            if (column_names.contains(column.name))
+                return;
+
+            column_names.insert(column.name);
+            columns.push_back(std::move(column));
+        }
+    };
+
+    const std::unordered_map<QueryTreeNodePtr, Columns> & getColumnSourceToColumns() const
+    {
+        return column_source_to_columns;
     }
 
-    std::string getName() const override { return "StorageDistributedLocal"; }
-
-    bool supportsSampling() const override { return true; }
-    bool supportsFinal() const override { return true; }
-    bool supportsPrewhere() const override { return true; }
-    bool supportsSubcolumns() const override { return true; }
-    bool supportsDynamicSubcolumns() const override { return true; }
-    bool canMoveConditionsToPrewhere() const override { return false; }
-
-    QueryProcessingStage::Enum
-    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageSnapshotPtr &, SelectQueryInfo &) const override
+    void visitImpl(QueryTreeNodePtr & node)
     {
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "StorageDistributedLocal does not support getQueryProcessingStage method");
+        auto * column_node = node->as<ColumnNode>();
+        if (!column_node)
+            return;
+
+        auto column_source = column_node->getColumnSourceOrNull();
+        if (!column_source)
+            return;
+
+        auto it = column_source_to_columns.find(column_source);
+        if (it == column_source_to_columns.end())
+        {
+            auto [insert_it, _] = column_source_to_columns.emplace(column_source, Columns());
+            it = insert_it;
+        }
+
+        it->second.addColumn(column_node->getColumn());
     }
 
-    Pipe read(const Names & /*column_names*/,
-        const StorageSnapshotPtr & /*storage_snapshot*/,
-        SelectQueryInfo & /*query_info*/,
-        ContextPtr /*context*/,
-        QueryProcessingStage::Enum /*processed_stage*/,
-        size_t /*max_block_size*/,
-        size_t /*num_streams*/) override
-    {
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "StorageDistributedLocal does not support read method");
-    }
+private:
+    std::unordered_map<QueryTreeNodePtr, Columns> column_source_to_columns;
 };
 
-QueryTreeNodePtr buildQueryTreeDistributedTableReplacedWithLocalTable(const SelectQueryInfo & query_info,
+/** Visitor that rewrites IN and JOINs in query and all subqueries according to distributed_product_mode and
+  * prefer_global_in_and_join settings.
+  *
+  * Additionally collects GLOBAL JOIN and GLOBAL IN query nodes.
+  *
+  * If distributed_product_mode = deny, then visitor throws exception if there are multiple distributed tables.
+  * If distributed_product_mode = local, then visitor collects replacement map for tables that must be replaced
+  * with local tables.
+  * If distributed_product_mode = global or prefer_global_in_and_join setting is true, then visitor rewrites JOINs and IN functions that
+  * contain distributed tables to GLOBAL JOINs and GLOBAL IN functions.
+  * If distributed_product_mode = allow, then visitor does not rewrite query if there are multiple distributed tables.
+  */
+class DistributedProductModeRewriteInJoinVisitor : public InDepthQueryTreeVisitorWithContext<DistributedProductModeRewriteInJoinVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<DistributedProductModeRewriteInJoinVisitor>;
+    using Base::Base;
+
+    explicit DistributedProductModeRewriteInJoinVisitor(const ContextPtr & context_)
+        : Base(context_)
+    {}
+
+    struct InFunctionOrJoin
+    {
+        QueryTreeNodePtr query_node;
+        size_t subquery_depth = 0;
+    };
+
+    const std::unordered_map<const IQueryTreeNode *, QueryTreeNodePtr> & getReplacementMap() const
+    {
+        return replacement_map;
+    }
+
+    const std::vector<InFunctionOrJoin> & getGlobalInOrJoinNodes() const
+    {
+        return global_in_or_join_nodes;
+    }
+
+    static bool needChildVisit(QueryTreeNodePtr & parent, QueryTreeNodePtr & child)
+    {
+        auto * function_node = parent->as<FunctionNode>();
+        if (function_node && isNameOfGlobalInFunction(function_node->getFunctionName()))
+            return false;
+
+        auto * join_node = parent->as<JoinNode>();
+        if (join_node && join_node->getLocality() == JoinLocality::Global && join_node->getRightTableExpression() == child)
+            return false;
+
+        return true;
+    }
+
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        auto * function_node = node->as<FunctionNode>();
+        auto * join_node = node->as<JoinNode>();
+
+        if ((function_node && isNameOfGlobalInFunction(function_node->getFunctionName())) ||
+            (join_node && join_node->getLocality() == JoinLocality::Global))
+        {
+            InFunctionOrJoin in_function_or_join_entry;
+            in_function_or_join_entry.query_node = node;
+            in_function_or_join_entry.subquery_depth = getSubqueryDepth();
+            global_in_or_join_nodes.push_back(std::move(in_function_or_join_entry));
+            return;
+        }
+
+        if ((function_node && isNameOfLocalInFunction(function_node->getFunctionName())) ||
+            (join_node && join_node->getLocality() != JoinLocality::Global))
+        {
+            InFunctionOrJoin in_function_or_join_entry;
+            in_function_or_join_entry.query_node = node;
+            in_function_or_join_entry.subquery_depth = getSubqueryDepth();
+            in_function_or_join_stack.push_back(in_function_or_join_entry);
+            return;
+        }
+
+        if (node->getNodeType() == QueryTreeNodeType::TABLE)
+            tryRewriteTableNodeIfNeeded(node);
+    }
+
+    void leaveImpl(QueryTreeNodePtr & node)
+    {
+        if (!in_function_or_join_stack.empty() && node.get() == in_function_or_join_stack.back().query_node.get())
+            in_function_or_join_stack.pop_back();
+    }
+
+private:
+    void tryRewriteTableNodeIfNeeded(const QueryTreeNodePtr & table_node)
+    {
+        const auto & table_node_typed = table_node->as<TableNode &>();
+        const auto * distributed_storage = typeid_cast<const StorageDistributed *>(table_node_typed.getStorage().get());
+        if (!distributed_storage)
+            return;
+
+        bool distributed_valid_for_rewrite = distributed_storage->getShardCount() >= 2;
+        if (!distributed_valid_for_rewrite)
+            return;
+
+        auto distributed_product_mode = getSettings().distributed_product_mode;
+
+        if (distributed_product_mode == DistributedProductMode::LOCAL)
+        {
+            StorageID remote_storage_id = StorageID{distributed_storage->getRemoteDatabaseName(),
+                distributed_storage->getRemoteTableName()};
+            auto resolved_remote_storage_id = getContext()->resolveStorageID(remote_storage_id);
+            const auto & distributed_storage_columns = table_node_typed.getStorageSnapshot()->metadata->getColumns();
+            auto storage = std::make_shared<StorageDummy>(resolved_remote_storage_id, distributed_storage_columns);
+            auto replacement_table_expression = std::make_shared<TableNode>(std::move(storage), getContext());
+            replacement_map.emplace(table_node.get(), std::move(replacement_table_expression));
+        }
+        else if ((distributed_product_mode == DistributedProductMode::GLOBAL || getSettings().prefer_global_in_and_join) &&
+            !in_function_or_join_stack.empty())
+        {
+            auto * in_or_join_node_to_modify = in_function_or_join_stack.back().query_node.get();
+
+            if (auto * in_function_to_modify = in_or_join_node_to_modify->as<FunctionNode>())
+            {
+                auto global_in_function_name = getGlobalInFunctionNameForLocalInFunctionName(in_function_to_modify->getFunctionName());
+                auto global_in_function_resolver = FunctionFactory::instance().get(global_in_function_name, getContext());
+                in_function_to_modify->resolveAsFunction(global_in_function_resolver->build(in_function_to_modify->getArgumentColumns()));
+            }
+            else if (auto * join_node_to_modify = in_or_join_node_to_modify->as<JoinNode>())
+            {
+                join_node_to_modify->setLocality(JoinLocality::Global);
+            }
+
+            global_in_or_join_nodes.push_back(in_function_or_join_stack.back());
+        }
+        else if (distributed_product_mode == DistributedProductMode::ALLOW)
+        {
+            return;
+        }
+        else if (distributed_product_mode == DistributedProductMode::DENY)
+        {
+            throw Exception(ErrorCodes::DISTRIBUTED_IN_JOIN_SUBQUERY_DENIED,
+                "Double-distributed IN/JOIN subqueries is denied (distributed_product_mode = 'deny'). "
+                "You may rewrite query to use local tables "
+                "in subqueries, or use GLOBAL keyword, or set distributed_product_mode to suitable value.");
+        }
+    }
+
+    std::vector<InFunctionOrJoin> in_function_or_join_stack;
+    std::unordered_map<const IQueryTreeNode *, QueryTreeNodePtr> replacement_map;
+    std::vector<InFunctionOrJoin> global_in_or_join_nodes;
+};
+
+/** Execute subquery node and put result in mutable context temporary table.
+  * Returns table node that is initialized with temporary table storage.
+  */
+QueryTreeNodePtr executeSubqueryNode(const QueryTreeNodePtr & subquery_node,
+    ContextMutablePtr & mutable_context,
+    size_t subquery_depth)
+{
+    auto subquery_hash = subquery_node->getTreeHash();
+    String temporary_table_name = fmt::format("_data_{}_{}", subquery_hash.first, subquery_hash.second);
+
+    const auto & external_tables = mutable_context->getExternalTables();
+    auto external_table_it = external_tables.find(temporary_table_name);
+    if (external_table_it != external_tables.end())
+    {
+        auto temporary_table_expression_node = std::make_shared<TableNode>(external_table_it->second, mutable_context);
+        temporary_table_expression_node->setTemporaryTableName(temporary_table_name);
+        return temporary_table_expression_node;
+    }
+
+    auto subquery_options = SelectQueryOptions(QueryProcessingStage::Complete, subquery_depth, true /*is_subquery*/);
+    auto context_copy = Context::createCopy(mutable_context);
+    updateContextForSubqueryExecution(context_copy);
+
+    InterpreterSelectQueryAnalyzer interpreter(subquery_node, context_copy, subquery_options);
+    auto & query_plan = interpreter.getQueryPlan();
+
+    auto sample_block_with_unique_names = query_plan.getCurrentDataStream().header;
+    makeUniqueColumnNamesInBlock(sample_block_with_unique_names);
+
+    if (!blocksHaveEqualStructure(sample_block_with_unique_names, query_plan.getCurrentDataStream().header))
+    {
+        auto actions_dag = ActionsDAG::makeConvertingActions(
+            query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName(),
+            sample_block_with_unique_names.getColumnsWithTypeAndName(),
+            ActionsDAG::MatchColumnsMode::Position);
+        auto converting_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(actions_dag));
+        query_plan.addStep(std::move(converting_step));
+    }
+
+    Block sample = interpreter.getSampleBlock();
+    NamesAndTypesList columns = sample.getNamesAndTypesList();
+
+    auto external_storage_holder = TemporaryTableHolder(
+        mutable_context,
+        ColumnsDescription{columns},
+        ConstraintsDescription{},
+        nullptr /*query*/,
+        true /*create_for_global_subquery*/);
+
+    StoragePtr external_storage = external_storage_holder.getTable();
+    auto temporary_table_expression_node = std::make_shared<TableNode>(external_storage, mutable_context);
+    temporary_table_expression_node->setTemporaryTableName(temporary_table_name);
+
+    auto table_out = external_storage->write({}, external_storage->getInMemoryMetadataPtr(), mutable_context);
+    auto io = interpreter.execute();
+    io.pipeline.complete(std::move(table_out));
+    CompletedPipelineExecutor executor(io.pipeline);
+    executor.execute();
+
+    mutable_context->addExternalTable(temporary_table_name, std::move(external_storage_holder));
+
+    return temporary_table_expression_node;
+}
+
+QueryTreeNodePtr buildQueryTreeDistributed(SelectQueryInfo & query_info,
     const StorageSnapshotPtr & distributed_storage_snapshot,
     const StorageID & remote_storage_id,
     const ASTPtr & remote_table_function)
 {
-    const auto & query_context = query_info.planner_context->getQueryContext();
+    auto & planner_context = query_info.planner_context;
+    const auto & query_context = planner_context->getQueryContext();
+
+    std::optional<TableExpressionModifiers> table_expression_modifiers;
+
+    if (auto * query_info_table_node = query_info.table_expression->as<TableNode>())
+        table_expression_modifiers = query_info_table_node->getTableExpressionModifiers();
+    else if (auto * query_info_table_function_node = query_info.table_expression->as<TableFunctionNode>())
+        table_expression_modifiers = query_info_table_function_node->getTableExpressionModifiers();
 
     QueryTreeNodePtr replacement_table_expression;
 
@@ -677,6 +933,9 @@ QueryTreeNodePtr buildQueryTreeDistributedTableReplacedWithLocalTable(const Sele
         auto table_function_node = std::make_shared<TableFunctionNode>(remote_table_function_node.getFunctionName());
         table_function_node->getArgumentsNode() = remote_table_function_node.getArgumentsNode();
 
+        if (table_expression_modifiers)
+            table_function_node->setTableExpressionModifiers(*table_expression_modifiers);
+
         QueryAnalysisPass query_analysis_pass;
         query_analysis_pass.run(table_function_node, query_context);
 
@@ -685,16 +944,92 @@ QueryTreeNodePtr buildQueryTreeDistributedTableReplacedWithLocalTable(const Sele
     else
     {
         auto resolved_remote_storage_id = query_context->resolveStorageID(remote_storage_id);
-        auto storage = DatabaseCatalog::instance().tryGetTable(resolved_remote_storage_id, query_context);
-        if (!storage)
-            storage = std::make_shared<StorageDistributedLocal>(resolved_remote_storage_id, distributed_storage_snapshot->metadata->getColumns());
+        auto storage = std::make_shared<StorageDummy>(resolved_remote_storage_id, distributed_storage_snapshot->metadata->getColumns());
+        auto table_node = std::make_shared<TableNode>(std::move(storage), query_context);
 
-        replacement_table_expression = std::make_shared<TableNode>(std::move(storage), query_context);
+        if (table_expression_modifiers)
+            table_node->setTableExpressionModifiers(*table_expression_modifiers);
+
+        replacement_table_expression = std::move(table_node);
     }
 
     replacement_table_expression->setAlias(query_info.table_expression->getAlias());
 
-    return query_info.query_tree->cloneAndReplace(query_info.table_expression, std::move(replacement_table_expression));
+    auto query_tree_to_modify = query_info.query_tree->cloneAndReplace(query_info.table_expression, std::move(replacement_table_expression));
+
+    CollectColumnSourceToColumnsVisitor collect_column_source_to_columns_visitor;
+    collect_column_source_to_columns_visitor.visit(query_tree_to_modify);
+
+    const auto & column_source_to_columns = collect_column_source_to_columns_visitor.getColumnSourceToColumns();
+
+    DistributedProductModeRewriteInJoinVisitor visitor(query_info.planner_context->getQueryContext());
+    visitor.visit(query_tree_to_modify);
+
+    auto replacement_map = visitor.getReplacementMap();
+    const auto & global_in_or_join_nodes = visitor.getGlobalInOrJoinNodes();
+
+    for (const auto & global_in_or_join_node : global_in_or_join_nodes)
+    {
+        if (auto * join_node = global_in_or_join_node.query_node->as<JoinNode>())
+        {
+            auto join_right_table_expression = join_node->getRightTableExpression();
+            auto join_right_table_expression_node_type = join_right_table_expression->getNodeType();
+
+            QueryTreeNodePtr subquery_node;
+
+            if (join_right_table_expression_node_type == QueryTreeNodeType::QUERY ||
+                join_right_table_expression_node_type == QueryTreeNodeType::UNION)
+            {
+                subquery_node = join_right_table_expression;
+            }
+            else if (join_right_table_expression_node_type == QueryTreeNodeType::TABLE ||
+                join_right_table_expression_node_type == QueryTreeNodeType::TABLE_FUNCTION)
+            {
+                const auto & columns = column_source_to_columns.at(join_right_table_expression).columns;
+                subquery_node = buildSubqueryToReadColumnsFromTableExpression(columns,
+                    join_right_table_expression,
+                    planner_context->getQueryContext());
+            }
+            else
+            {
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "Expected JOIN right table expression to be table, table function, query or union node. Actual {}",
+                    join_right_table_expression->formatASTForErrorMessage());
+            }
+
+            auto temporary_table_expression_node = executeSubqueryNode(subquery_node,
+                planner_context->getMutableQueryContext(),
+                global_in_or_join_node.subquery_depth);
+            temporary_table_expression_node->setAlias(join_right_table_expression->getAlias());
+            replacement_map.emplace(join_right_table_expression.get(), std::move(temporary_table_expression_node));
+            continue;
+        }
+        else if (auto * in_function_node = global_in_or_join_node.query_node->as<FunctionNode>())
+        {
+            auto & in_function_subquery_node = in_function_node->getArguments().getNodes().at(1);
+            auto in_function_node_type = in_function_subquery_node->getNodeType();
+            if (in_function_node_type != QueryTreeNodeType::QUERY && in_function_node_type != QueryTreeNodeType::UNION)
+                continue;
+
+            auto temporary_table_expression_node = executeSubqueryNode(in_function_subquery_node,
+                planner_context->getMutableQueryContext(),
+                global_in_or_join_node.subquery_depth);
+            in_function_subquery_node = std::move(temporary_table_expression_node);
+        }
+        else
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Expected global IN or JOIN query node. Actual {}",
+                global_in_or_join_node.query_node->formatASTForErrorMessage());
+        }
+    }
+
+    if (!replacement_map.empty())
+        query_tree_to_modify = query_tree_to_modify->cloneAndReplace(replacement_map);
+
+    removeGroupingFunctionSpecializations(query_tree_to_modify);
+
+    return query_tree_to_modify;
 }
 
 }
@@ -709,10 +1044,6 @@ void StorageDistributed::read(
     const size_t /*max_block_size*/,
     const size_t /*num_streams*/)
 {
-    const auto * select_query = query_info.query->as<ASTSelectQuery>();
-    if (select_query->final() && local_context->getSettingsRef().allow_experimental_parallel_reading_from_replicas)
-        throw Exception(ErrorCodes::ILLEGAL_FINAL, "Final modifier is not allowed together with parallel reading from replicas feature");
-
     Block header;
     ASTPtr query_ast;
 
@@ -722,17 +1053,13 @@ void StorageDistributed::read(
         if (!remote_table_function_ptr)
             remote_storage_id = StorageID{remote_database, remote_table};
 
-        auto query_tree_with_replaced_distributed_table = buildQueryTreeDistributedTableReplacedWithLocalTable(query_info,
+        auto query_tree_distributed = buildQueryTreeDistributed(query_info,
             storage_snapshot,
             remote_storage_id,
             remote_table_function_ptr);
 
-        query_ast = queryNodeToSelectQuery(query_tree_with_replaced_distributed_table);
-
-        Planner planner(query_tree_with_replaced_distributed_table, SelectQueryOptions(processed_stage).analyze());
-        planner.buildQueryPlanIfNeeded();
-
-        header = planner.getQueryPlan().getCurrentDataStream().header;
+        query_ast = queryNodeToSelectQuery(query_tree_distributed);
+        header = InterpreterSelectQueryAnalyzer::getSampleBlock(query_ast, local_context, SelectQueryOptions(processed_stage).analyze());
     }
     else
     {
@@ -768,13 +1095,36 @@ void StorageDistributed::read(
             storage_snapshot,
             processed_stage);
 
+    auto settings = local_context->getSettingsRef();
+
+    ClusterProxy::AdditionalShardFilterGenerator additional_shard_filter_generator;
+    if (query_info.use_custom_key)
+    {
+        if (auto custom_key_ast = parseCustomKeyForTable(settings.parallel_replicas_custom_key, *local_context))
+        {
+            if (query_info.getCluster()->getShardCount() == 1)
+            {
+                // we are reading from single shard with multiple replicas but didn't transform replicas
+                // into virtual shards with custom_key set
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Replicas weren't transformed into virtual shards");
+            }
+
+            additional_shard_filter_generator =
+                [&, my_custom_key_ast = std::move(custom_key_ast), shard_count = query_info.cluster->getShardCount()](uint64_t shard_num) -> ASTPtr
+            {
+                return getCustomKeyFilterForParallelReplica(
+                    shard_count, shard_num - 1, my_custom_key_ast, settings.parallel_replicas_custom_key_filter_type, *this, local_context);
+            };
+        }
+    }
+
     ClusterProxy::executeQuery(
         query_plan, header, processed_stage,
         main_table, remote_table_function_ptr,
         select_stream_factory, log, modified_query_ast,
         local_context, query_info,
         sharding_key_expr, sharding_key_column_name,
-        query_info.cluster);
+        query_info.cluster, additional_shard_filter_generator);
 
     /// This is a bug, it is possible only when there is no shards to query, and this is handled earlier.
     if (!query_plan.isInitialized())
@@ -917,8 +1267,8 @@ std::optional<QueryPipeline> StorageDistributed::distributedWriteBetweenDistribu
 
             ///  INSERT SELECT query returns empty block
             auto remote_query_executor
-                = std::make_shared<RemoteQueryExecutor>(shard_info.pool, std::move(connections), new_query_str, Block{}, query_context);
-            QueryPipeline remote_pipeline(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote));
+                = std::make_shared<RemoteQueryExecutor>(std::move(connections), new_query_str, Block{}, query_context);
+            QueryPipeline remote_pipeline(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote, settings.async_query_sending_for_remote));
             remote_pipeline.complete(std::make_shared<EmptySink>(remote_query_executor->getHeader()));
 
             pipeline.addCompletedPipeline(std::move(remote_pipeline));
@@ -986,7 +1336,7 @@ std::optional<QueryPipeline> StorageDistributed::distributedWriteFromClusterStor
                 QueryProcessingStage::Complete,
                 extension);
 
-            QueryPipeline remote_pipeline(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote));
+            QueryPipeline remote_pipeline(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote, settings.async_query_sending_for_remote));
             remote_pipeline.complete(std::make_shared<EmptySink>(remote_query_executor->getHeader()));
 
             pipeline.addCompletedPipeline(std::move(remote_pipeline));
@@ -1046,7 +1396,7 @@ std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInser
 
 void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
-    auto name_deps = getDependentViewsByColumn(local_context);
+    std::optional<NameDependencies> name_deps{};
     for (const auto & command : commands)
     {
         if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
@@ -1058,7 +1408,9 @@ void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, Co
 
         if (command.type == AlterCommand::DROP_COLUMN && !command.clear)
         {
-            const auto & deps_mv = name_deps[command.column_name];
+            if (!name_deps)
+                name_deps = getDependentViewsByColumn(local_context);
+            const auto & deps_mv = name_deps.value()[command.column_name];
             if (!deps_mv.empty())
             {
                 throw Exception(ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN,
@@ -1088,13 +1440,13 @@ void StorageDistributed::initializeFromDisk()
     const auto & disks = data_volume->getDisks();
 
     /// Make initialization for large number of disks parallel.
-    ThreadPool pool(disks.size());
+    ThreadPool pool(CurrentMetrics::StorageDistributedThreads, CurrentMetrics::StorageDistributedThreadsActive, disks.size());
 
     for (const DiskPtr & disk : disks)
     {
         pool.scheduleOrThrowOnError([&]()
         {
-            createDirectoryMonitors(disk);
+            initializeDirectoryQueuesForDisk(disk);
         });
     }
     pool.wait();
@@ -1133,7 +1485,7 @@ void StorageDistributed::shutdown()
 void StorageDistributed::drop()
 {
     // Some INSERT in-between shutdown() and drop() can call
-    // requireDirectoryMonitor() again, so call shutdown() to clear them, but
+    // getDirectoryQueue() again, so call shutdown() to clear them, but
     // when the drop() (this function) executed none of INSERT is allowed in
     // parallel.
     //
@@ -1196,7 +1548,7 @@ StoragePolicyPtr StorageDistributed::getStoragePolicy() const
     return storage_policy;
 }
 
-void StorageDistributed::createDirectoryMonitors(const DiskPtr & disk)
+void StorageDistributed::initializeDirectoryQueuesForDisk(const DiskPtr & disk)
 {
     const std::string path(disk->getPath() + relative_data_path);
     fs::create_directories(path);
@@ -1208,12 +1560,15 @@ void StorageDistributed::createDirectoryMonitors(const DiskPtr & disk)
         const auto & dir_path = it->path();
         if (std::filesystem::is_directory(dir_path))
         {
+            /// Created by DistributedSink
             const auto & tmp_path = dir_path / "tmp";
-
-            /// "tmp" created by DistributedSink
             if (std::filesystem::is_directory(tmp_path) && std::filesystem::is_empty(tmp_path))
                 std::filesystem::remove(tmp_path);
 
+            const auto & broken_path = dir_path / "broken";
+            if (std::filesystem::is_directory(broken_path) && std::filesystem::is_empty(broken_path))
+                std::filesystem::remove(broken_path);
+
             if (std::filesystem::is_empty(dir_path))
             {
                 LOG_DEBUG(log, "Removing {} (used for async INSERT into Distributed)", dir_path.string());
@@ -1222,14 +1577,14 @@ void StorageDistributed::createDirectoryMonitors(const DiskPtr & disk)
             }
             else
             {
-                requireDirectoryMonitor(disk, dir_path.filename().string());
+                getDirectoryQueue(disk, dir_path.filename().string());
             }
         }
     }
 }
 
 
-StorageDistributedDirectoryMonitor& StorageDistributed::requireDirectoryMonitor(const DiskPtr & disk, const std::string & name)
+DistributedAsyncInsertDirectoryQueue & StorageDistributed::getDirectoryQueue(const DiskPtr & disk, const std::string & name)
 {
     const std::string & disk_path = disk->getPath();
     const std::string key(disk_path + name);
@@ -1238,8 +1593,8 @@ StorageDistributedDirectoryMonitor& StorageDistributed::requireDirectoryMonitor(
     auto & node_data = cluster_nodes_data[key];
     if (!node_data.directory_monitor)
     {
-        node_data.connection_pool = StorageDistributedDirectoryMonitor::createPool(name, *this);
-        node_data.directory_monitor = std::make_unique<StorageDistributedDirectoryMonitor>(
+        node_data.connection_pool = DistributedAsyncInsertDirectoryQueue::createPool(name, *this);
+        node_data.directory_monitor = std::make_unique<DistributedAsyncInsertDirectoryQueue>(
             *this, disk, relative_data_path + name,
             node_data.connection_pool,
             monitors_blocker,
@@ -1248,9 +1603,9 @@ StorageDistributedDirectoryMonitor& StorageDistributed::requireDirectoryMonitor(
     return *node_data.directory_monitor;
 }
 
-std::vector<StorageDistributedDirectoryMonitor::Status> StorageDistributed::getDirectoryMonitorsStatuses() const
+std::vector<DistributedAsyncInsertDirectoryQueue::Status> StorageDistributed::getDirectoryQueueStatuses() const
 {
-    std::vector<StorageDistributedDirectoryMonitor::Status> statuses;
+    std::vector<DistributedAsyncInsertDirectoryQueue::Status> statuses;
     std::lock_guard lock(cluster_nodes_mutex);
     statuses.reserve(cluster_nodes_data.size());
     for (const auto & node : cluster_nodes_data)
@@ -1261,7 +1616,7 @@ std::vector<StorageDistributedDirectoryMonitor::Status> StorageDistributed::getD
 std::optional<UInt64> StorageDistributed::totalBytes(const Settings &) const
 {
     UInt64 total_bytes = 0;
-    for (const auto & status : getDirectoryMonitorsStatuses())
+    for (const auto & status : getDirectoryQueueStatuses())
         total_bytes += status.bytes_count;
     return total_bytes;
 }
@@ -1422,7 +1777,7 @@ void StorageDistributed::flushClusterNodesAllData(ContextPtr local_context)
     /// Sync SYSTEM FLUSH DISTRIBUTED with TRUNCATE
     auto table_lock = lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
-    std::vector<std::shared_ptr<StorageDistributedDirectoryMonitor>> directory_monitors;
+    std::vector<std::shared_ptr<DistributedAsyncInsertDirectoryQueue>> directory_monitors;
 
     {
         std::lock_guard lock(cluster_nodes_mutex);
@@ -1626,9 +1981,9 @@ void registerStorageDistributed(StorageFactory & factory)
         if (!distributed_settings.monitor_split_batch_on_failure.changed)
             distributed_settings.monitor_split_batch_on_failure = context->getSettingsRef().distributed_directory_monitor_split_batch_on_failure;
         if (!distributed_settings.monitor_sleep_time_ms.changed)
-            distributed_settings.monitor_sleep_time_ms = Poco::Timespan(context->getSettingsRef().distributed_directory_monitor_sleep_time_ms);
+            distributed_settings.monitor_sleep_time_ms = context->getSettingsRef().distributed_directory_monitor_sleep_time_ms;
         if (!distributed_settings.monitor_max_sleep_time_ms.changed)
-            distributed_settings.monitor_max_sleep_time_ms = Poco::Timespan(context->getSettingsRef().distributed_directory_monitor_max_sleep_time_ms);
+            distributed_settings.monitor_max_sleep_time_ms = context->getSettingsRef().distributed_directory_monitor_max_sleep_time_ms;
 
         return std::make_shared<StorageDistributed>(
             args.table_id,
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 66fd7b77889..417fb6447bf 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -2,13 +2,12 @@
 
 #include <Storages/IStorage.h>
 #include <Storages/IStorageCluster.h>
-#include <Storages/Distributed/DirectoryMonitor.h>
+#include <Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h>
 #include <Storages/Distributed/DistributedSettings.h>
 #include <Storages/getStructureOfRemoteTable.h>
 #include <Common/SimpleIncrement.h>
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
-#include <Common/logger_useful.h>
 #include <Common/ActionBlocker.h>
 #include <Interpreters/Cluster.h>
 
@@ -38,7 +37,8 @@ using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 class StorageDistributed final : public IStorage, WithContext
 {
     friend class DistributedSink;
-    friend class StorageDistributedDirectoryMonitor;
+    friend class DistributedAsyncInsertBatch;
+    friend class DistributedAsyncInsertDirectoryQueue;
     friend class StorageSystemDistributionQueue;
 
 public:
@@ -164,15 +164,19 @@ private:
     const String & getRelativeDataPath() const { return relative_data_path; }
 
     /// create directory monitors for each existing subdirectory
-    void createDirectoryMonitors(const DiskPtr & disk);
-    /// ensure directory monitor thread and connectoin pool creation by disk and subdirectory name
-    StorageDistributedDirectoryMonitor & requireDirectoryMonitor(const DiskPtr & disk, const std::string & name);
+    void initializeDirectoryQueuesForDisk(const DiskPtr & disk);
+
+    /// Get directory queue thread and connection pool created by disk and subdirectory name
+    ///
+    /// Used for the INSERT into Distributed in case of insert_distributed_sync==1, from DistributedSink.
+    DistributedAsyncInsertDirectoryQueue & getDirectoryQueue(const DiskPtr & disk, const std::string & name);
+
 
     /// Return list of metrics for all created monitors
     /// (note that monitors are created lazily, i.e. until at least one INSERT executed)
     ///
     /// Used by StorageSystemDistributionQueue
-    std::vector<StorageDistributedDirectoryMonitor::Status> getDirectoryMonitorsStatuses() const;
+    std::vector<DistributedAsyncInsertDirectoryQueue::Status> getDirectoryQueueStatuses() const;
 
     static IColumn::Selector createSelector(ClusterPtr cluster, const ColumnWithTypeAndName & result);
     /// Apply the following settings:
@@ -247,7 +251,7 @@ private:
 
     struct ClusterNodeData
     {
-        std::shared_ptr<StorageDistributedDirectoryMonitor> directory_monitor;
+        std::shared_ptr<DistributedAsyncInsertDirectoryQueue> directory_monitor;
         ConnectionPoolPtr connection_pool;
     };
     std::unordered_map<std::string, ClusterNodeData> cluster_nodes_data;
diff --git a/src/Storages/StorageDummy.cpp b/src/Storages/StorageDummy.cpp
new file mode 100644
index 00000000000..e5f3b0b4d8e
--- /dev/null
+++ b/src/Storages/StorageDummy.cpp
@@ -0,0 +1,56 @@
+#include <Storages/StorageDummy.h>
+
+#include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+
+#include <Processors/Chunk.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+
+namespace DB
+{
+
+StorageDummy::StorageDummy(const StorageID & table_id_, const ColumnsDescription & columns_)
+    : IStorage(table_id_)
+{
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns_);
+    setInMemoryMetadata(storage_metadata);
+}
+
+QueryProcessingStage::Enum StorageDummy::getQueryProcessingStage(
+    ContextPtr,
+    QueryProcessingStage::Enum,
+    const StorageSnapshotPtr &,
+    SelectQueryInfo &) const
+{
+    return QueryProcessingStage::FetchColumns;
+}
+
+void StorageDummy::read(QueryPlan & query_plan,
+    const Names & column_names,
+    const StorageSnapshotPtr & storage_snapshot,
+    SelectQueryInfo &,
+    ContextPtr,
+    QueryProcessingStage::Enum,
+    size_t,
+    size_t)
+{
+    query_plan.addStep(std::make_unique<ReadFromDummy>(*this, storage_snapshot, column_names));
+}
+
+ReadFromDummy::ReadFromDummy(const StorageDummy & storage_,
+    StorageSnapshotPtr storage_snapshot_,
+    Names column_names_)
+    : SourceStepWithFilter(DataStream{.header = storage_snapshot_->getSampleBlockForColumns(column_names_)})
+    , storage(storage_)
+    , storage_snapshot(std::move(storage_snapshot_))
+    , column_names(std::move(column_names_))
+{}
+
+void ReadFromDummy::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    Pipe pipe(std::make_shared<SourceFromSingleChunk>(getOutputStream().header));
+    pipeline.init(std::move(pipe));
+}
+
+}
diff --git a/src/Storages/StorageDummy.h b/src/Storages/StorageDummy.h
new file mode 100644
index 00000000000..a7beef9d531
--- /dev/null
+++ b/src/Storages/StorageDummy.h
@@ -0,0 +1,74 @@
+#pragma once
+
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
+
+#include <Storages/SelectQueryInfo.h>
+#include <Storages/IStorage.h>
+
+namespace DB
+{
+
+class StorageDummy : public IStorage
+{
+public:
+    StorageDummy(const StorageID & table_id_, const ColumnsDescription & columns_);
+
+    std::string getName() const override { return "StorageDummy"; }
+
+    bool supportsSampling() const override { return true; }
+    bool supportsFinal() const override { return true; }
+    bool supportsPrewhere() const override { return true; }
+    bool supportsSubcolumns() const override { return true; }
+    bool supportsDynamicSubcolumns() const override { return true; }
+    bool canMoveConditionsToPrewhere() const override { return false; }
+
+    QueryProcessingStage::Enum getQueryProcessingStage(
+        ContextPtr local_context,
+        QueryProcessingStage::Enum to_stage,
+        const StorageSnapshotPtr & storage_snapshot,
+        SelectQueryInfo & query_info) const override;
+
+    void read(
+        QueryPlan & query_plan,
+        const Names & column_names,
+        const StorageSnapshotPtr & storage_snapshot,
+        SelectQueryInfo & query_info,
+        ContextPtr local_context,
+        QueryProcessingStage::Enum processed_stage,
+        size_t max_block_size,
+        size_t num_streams) override;
+};
+
+class ReadFromDummy : public SourceStepWithFilter
+{
+public:
+    explicit ReadFromDummy(const StorageDummy & storage_,
+        StorageSnapshotPtr storage_snapshot_,
+        Names column_names_);
+
+    const StorageDummy & getStorage() const
+    {
+        return storage;
+    }
+
+    const StorageSnapshotPtr & getStorageSnapshot() const
+    {
+        return storage_snapshot;
+    }
+
+    const Names & getColumnNames() const
+    {
+        return column_names;
+    }
+
+    String getName() const override { return "ReadFromDummy"; }
+
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) override;
+
+private:
+    const StorageDummy & storage;
+    StorageSnapshotPtr storage_snapshot;
+    Names column_names;
+};
+
+}
diff --git a/src/Storages/StorageExecutable.h b/src/Storages/StorageExecutable.h
index 2393920fa3c..37455385675 100644
--- a/src/Storages/StorageExecutable.h
+++ b/src/Storages/StorageExecutable.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/logger_useful.h>
 #include <Storages/IStorage.h>
 #include <Processors/Sources/ShellCommandSource.h>
 #include <Storages/ExecutableSettings.h>
diff --git a/src/Storages/StorageExternalDistributed.cpp b/src/Storages/StorageExternalDistributed.cpp
index 9eeb619b899..d493fead993 100644
--- a/src/Storages/StorageExternalDistributed.cpp
+++ b/src/Storages/StorageExternalDistributed.cpp
@@ -13,7 +13,7 @@
 #include <Storages/MySQL/MySQLSettings.h>
 #include <Storages/StoragePostgreSQL.h>
 #include <Storages/StorageURL.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
+#include <Storages/MySQL/MySQLHelpers.h>
 #include <Storages/NamedCollectionsHelpers.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Common/logger_useful.h>
@@ -25,160 +25,25 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int BAD_ARGUMENTS;
 }
 
 StorageExternalDistributed::StorageExternalDistributed(
     const StorageID & table_id_,
-    ExternalStorageEngine table_engine,
-    const String & cluster_description,
-    const ExternalDataSourceConfiguration & configuration,
+    std::unordered_set<StoragePtr> && shards_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const String & comment,
-    ContextPtr context)
+    const String & comment)
     : IStorage(table_id_)
+    , shards(shards_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
-
-    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
-    std::vector<String> shards_descriptions = parseRemoteDescription(cluster_description, 0, cluster_description.size(), ',', max_addresses);
-    std::vector<std::pair<std::string, UInt16>> addresses;
-
-#if USE_MYSQL || USE_LIBPQXX
-
-    /// For each shard pass replicas description into storage, replicas are managed by storage's PoolWithFailover.
-    for (const auto & shard_description : shards_descriptions)
-    {
-        StoragePtr shard;
-
-        switch (table_engine)
-        {
-#if USE_MYSQL
-            case ExternalStorageEngine::MySQL:
-            {
-                addresses = parseRemoteDescriptionForExternalDatabase(shard_description, max_addresses, 3306);
-
-                mysqlxx::PoolWithFailover pool(
-                    configuration.database,
-                    addresses,
-                    configuration.username,
-                    configuration.password);
-
-                shard = std::make_shared<StorageMySQL>(
-                    table_id_,
-                    std::move(pool),
-                    configuration.database,
-                    configuration.table,
-                    /* replace_query = */ false,
-                    /* on_duplicate_clause = */ "",
-                    columns_,
-                    constraints_,
-                    String{},
-                    context,
-                    MySQLSettings{});
-                break;
-            }
-#endif
-#if USE_LIBPQXX
-
-            case ExternalStorageEngine::PostgreSQL:
-            {
-                addresses = parseRemoteDescriptionForExternalDatabase(shard_description, max_addresses, 5432);
-                StoragePostgreSQL::Configuration postgres_conf;
-                postgres_conf.addresses = addresses;
-                postgres_conf.username = configuration.username;
-                postgres_conf.password = configuration.password;
-                postgres_conf.database = configuration.database;
-                postgres_conf.table = configuration.table;
-                postgres_conf.schema = configuration.schema;
-
-                const auto & settings = context->getSettingsRef();
-                auto pool = std::make_shared<postgres::PoolWithFailover>(
-                    postgres_conf,
-                    settings.postgresql_connection_pool_size,
-                    settings.postgresql_connection_pool_wait_timeout,
-                    POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES,
-                    settings.postgresql_connection_pool_auto_close_connection);
-
-                shard = std::make_shared<StoragePostgreSQL>(table_id_, std::move(pool), configuration.table, columns_, constraints_, String{});
-                break;
-            }
-#endif
-            default:
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "Unsupported table engine. Supported engines are: MySQL, PostgreSQL, URL");
-            }
-        }
-
-        shards.emplace(std::move(shard));
-    }
-
-#else
-    (void)configuration;
-    (void)cluster_description;
-    (void)addresses;
-    (void)table_engine;
-#endif
 }
 
-
-StorageExternalDistributed::StorageExternalDistributed(
-            const String & addresses_description,
-            const StorageID & table_id,
-            const String & format_name,
-            const std::optional<FormatSettings> & format_settings,
-            const String & compression_method,
-            const ColumnsDescription & columns,
-            const ConstraintsDescription & constraints,
-            ContextPtr context)
-        : IStorage(table_id)
-{
-    StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(columns);
-    storage_metadata.setConstraints(constraints);
-    setInMemoryMetadata(storage_metadata);
-
-    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
-    /// Generate addresses without splitting for failover options
-    std::vector<String> url_descriptions = parseRemoteDescription(addresses_description, 0, addresses_description.size(), ',', max_addresses);
-    std::vector<String> uri_options;
-
-    for (const auto & url_description : url_descriptions)
-    {
-        /// For each uri (which acts like shard) check if it has failover options
-        uri_options = parseRemoteDescription(url_description, 0, url_description.size(), '|', max_addresses);
-        StoragePtr shard;
-
-        if (uri_options.size() > 1)
-        {
-            shard = std::make_shared<StorageURLWithFailover>(
-                uri_options,
-                table_id,
-                format_name,
-                format_settings,
-                columns, constraints, context,
-                compression_method);
-        }
-        else
-        {
-            shard = std::make_shared<StorageURL>(
-                url_description, table_id, format_name, format_settings, columns, constraints, String{}, context, compression_method);
-
-            LOG_DEBUG(&Poco::Logger::get("StorageURLDistributed"), "Adding URL: {}", url_description);
-        }
-
-        shards.emplace(std::move(shard));
-    }
-}
-
-
 void StorageExternalDistributed::read(
     QueryPlan & query_plan,
     const Names & column_names,
@@ -226,7 +91,6 @@ void StorageExternalDistributed::read(
     query_plan.unitePlans(std::move(union_step), std::move(plans));
 }
 
-
 void registerStorageExternalDistributed(StorageFactory & factory)
 {
     factory.registerStorage("ExternalDistributed", [](const StorageFactory::Arguments & args)
@@ -237,102 +101,94 @@ void registerStorageExternalDistributed(StorageFactory & factory)
                             "Engine ExternalDistributed must have at least 2 arguments: "
                             "engine_name, named_collection and/or description");
 
-        auto engine_name = checkAndGetLiteralArgument<String>(engine_args[0], "engine_name");
-        StorageExternalDistributed::ExternalStorageEngine table_engine;
-        if (engine_name == "URL")
-            table_engine = StorageExternalDistributed::ExternalStorageEngine::URL;
-        else if (engine_name == "MySQL")
-            table_engine = StorageExternalDistributed::ExternalStorageEngine::MySQL;
-        else if (engine_name == "PostgreSQL")
-            table_engine = StorageExternalDistributed::ExternalStorageEngine::PostgreSQL;
-        else
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                            "External storage engine {} is not supported for StorageExternalDistributed. "
-                            "Supported engines are: MySQL, PostgreSQL, URL",
-                            engine_name);
+        auto context = args.getLocalContext();
+        const auto & settings = context->getSettingsRef();
+        size_t max_addresses = settings.glob_expansion_max_elements;
+        auto get_addresses = [&](const std::string addresses_expr)
+        {
+            return parseRemoteDescription(addresses_expr, 0, addresses_expr.size(), ',', max_addresses);
+        };
 
+        std::unordered_set<StoragePtr> shards;
         ASTs inner_engine_args(engine_args.begin() + 1, engine_args.end());
-        String cluster_description;
 
+        auto engine_name = checkAndGetLiteralArgument<String>(engine_args[0], "engine_name");
         if (engine_name == "URL")
         {
-            StorageURL::Configuration configuration;
-            if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args))
-            {
-                StorageURL::processNamedCollectionResult(configuration, *named_collection);
-                StorageURL::collectHeaders(engine_args, configuration.headers, args.getLocalContext());
-            }
-            else
-            {
-                for (auto & engine_arg : engine_args)
-                    engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
-
-                cluster_description = checkAndGetLiteralArgument<String>(engine_args[1], "cluster_description");
-                configuration.format = checkAndGetLiteralArgument<String>(engine_args[2], "format");
-                configuration.compression_method = "auto";
-                if (engine_args.size() == 4)
-                    configuration.compression_method = checkAndGetLiteralArgument<String>(engine_args[3], "compression_method");
-            }
-
-
+            auto configuration = StorageURL::getConfiguration(inner_engine_args, context);
+            auto shards_addresses = get_addresses(configuration.addresses_expr);
             auto format_settings = StorageURL::getFormatSettingsFromArgs(args);
-
-            return std::make_shared<StorageExternalDistributed>(
-                cluster_description,
-                args.table_id,
-                configuration.format,
-                format_settings,
-                configuration.compression_method,
-                args.columns,
-                args.constraints,
-                args.getContext());
+            for (const auto & shard_address : shards_addresses)
+            {
+                auto uri_options = parseRemoteDescription(shard_address, 0, shard_address.size(), '|', max_addresses);
+                if (uri_options.size() > 1)
+                {
+                    shards.insert(
+                        std::make_shared<StorageURLWithFailover>(
+                            uri_options, args.table_id, configuration.format, format_settings,
+                            args.columns, args.constraints, context, configuration.compression_method));
+                }
+                else
+                {
+                    shards.insert(std::make_shared<StorageURL>(
+                        shard_address, args.table_id, configuration.format, format_settings,
+                        args.columns, args.constraints, String{}, context, configuration.compression_method));
+                }
+            }
         }
+#if USE_MYSQL
+        else if (engine_name == "MySQL")
+        {
+            MySQLSettings mysql_settings;
+            auto configuration = StorageMySQL::getConfiguration(inner_engine_args, context, mysql_settings);
+            auto shards_addresses = get_addresses(configuration.addresses_expr);
+            for (const auto & shard_address : shards_addresses)
+            {
+                auto current_configuration{configuration};
+                current_configuration.addresses = parseRemoteDescriptionForExternalDatabase(shard_address, max_addresses, 3306);
+                auto pool = createMySQLPoolWithFailover(current_configuration, mysql_settings);
+                shards.insert(std::make_shared<StorageMySQL>(
+                    args.table_id, std::move(pool), configuration.database, configuration.table,
+                    /* replace_query = */ false, /* on_duplicate_clause = */ "",
+                    args.columns, args.constraints, String{}, context, mysql_settings));
+            }
+        }
+#endif
+#if USE_LIBPQXX
+        else if (engine_name == "PostgreSQL")
+        {
+            auto configuration = StoragePostgreSQL::getConfiguration(inner_engine_args, context);
+            auto shards_addresses = get_addresses(configuration.addresses_expr);
+            for (const auto & shard_address : shards_addresses)
+            {
+                auto current_configuration{configuration};
+                current_configuration.addresses = parseRemoteDescriptionForExternalDatabase(shard_address, max_addresses, 5432);
+                auto pool = std::make_shared<postgres::PoolWithFailover>(
+                    current_configuration,
+                    settings.postgresql_connection_pool_size,
+                    settings.postgresql_connection_pool_wait_timeout,
+                    POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES,
+                    settings.postgresql_connection_pool_auto_close_connection);
+                shards.insert(std::make_shared<StoragePostgreSQL>(
+                    args.table_id, std::move(pool), configuration.table, args.columns, args.constraints, String{}, context));
+            }
+        }
+#endif
         else
         {
-            ExternalDataSourceConfiguration configuration;
-            if (auto named_collection = getExternalDataSourceConfiguration(inner_engine_args, args.getLocalContext()))
-            {
-                auto [common_configuration, storage_specific_args, _] = named_collection.value();
-                configuration.set(common_configuration);
-
-                for (const auto & [name, value] : storage_specific_args)
-                {
-                    if (name == "description")
-                        cluster_description = checkAndGetLiteralArgument<String>(value, "cluster_description");
-                    else
-                        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                        "Unknown key-value argument {} for table function URL", name);
-                }
-
-                if (cluster_description.empty())
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                    "Engine ExternalDistribued must have `description` key-value argument or named collection parameter");
-            }
-            else
-            {
-                if (engine_args.size() != 6)
-                    throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                                    "Storage ExternalDistributed requires 5 parameters: "
-                                    "ExternalDistributed('engine_name', 'cluster_description', 'database', 'table', 'user', 'password').");
-
-                cluster_description = checkAndGetLiteralArgument<String>(engine_args[1], "cluster_description");
-                configuration.database = checkAndGetLiteralArgument<String>(engine_args[2], "database");
-                configuration.table = checkAndGetLiteralArgument<String>(engine_args[3], "table");
-                configuration.username = checkAndGetLiteralArgument<String>(engine_args[4], "username");
-                configuration.password = checkAndGetLiteralArgument<String>(engine_args[5], "password");
-            }
-
-
-            return std::make_shared<StorageExternalDistributed>(
-                args.table_id,
-                table_engine,
-                cluster_description,
-                configuration,
-                args.columns,
-                args.constraints,
-                args.comment,
-                args.getContext());
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "External storage engine {} is not supported for StorageExternalDistributed. "
+                "Supported engines are: MySQL, PostgreSQL, URL",
+                engine_name);
         }
+
+        return std::make_shared<StorageExternalDistributed>(
+            args.table_id,
+            std::move(shards),
+            args.columns,
+            args.constraints,
+            args.comment);
     },
     {
         .source_access_type = AccessType::SOURCES,
diff --git a/src/Storages/StorageExternalDistributed.h b/src/Storages/StorageExternalDistributed.h
index a1bdb41dded..c4d37c3e5cc 100644
--- a/src/Storages/StorageExternalDistributed.h
+++ b/src/Storages/StorageExternalDistributed.h
@@ -18,32 +18,12 @@ struct ExternalDataSourceConfiguration;
 class StorageExternalDistributed final : public DB::IStorage
 {
 public:
-    enum class ExternalStorageEngine
-    {
-        MySQL,
-        PostgreSQL,
-        URL
-    };
-
     StorageExternalDistributed(
         const StorageID & table_id_,
-        ExternalStorageEngine table_engine,
-        const String & cluster_description,
-        const ExternalDataSourceConfiguration & configuration,
+        std::unordered_set<StoragePtr> && shards_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const String & comment,
-        ContextPtr context_);
-
-    StorageExternalDistributed(
-        const String & addresses_description,
-        const StorageID & table_id,
-        const String & format_name,
-        const std::optional<FormatSettings> & format_settings,
-        const String & compression_method,
-        const ColumnsDescription & columns,
-        const ConstraintsDescription & constraints,
-        ContextPtr context);
+        const String & comment);
 
     std::string getName() const override { return "ExternalDistributed"; }
 
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index e2a2f84bc72..647f9511052 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -3,7 +3,7 @@
 #include <Storages/ColumnsDescription.h>
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/PartitionedSink.h>
-#include <Storages/Distributed/DirectoryMonitor.h>
+#include <Storages/Distributed/DistributedAsyncInsertSource.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/ReadFromStorageProgress.h>
 
@@ -34,6 +34,7 @@
 #include <Processors/Formats/ISchemaReader.h>
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/ResizeProcessor.h>
 
 #include <Common/escapeForFileName.h>
 #include <Common/typeid_cast.h>
@@ -50,6 +51,8 @@
 #include <re2/re2.h>
 #include <filesystem>
 #include <shared_mutex>
+#include <cmath>
+#include <algorithm>
 
 
 namespace ProfileEvents
@@ -200,7 +203,19 @@ std::unique_ptr<ReadBuffer> selectReadBuffer(
 {
     auto read_method = context->getSettingsRef().storage_file_read_method;
 
-    if (S_ISREG(file_stat.st_mode) && read_method == LocalFSReadMethod::mmap)
+    /** But using mmap on server-side is unsafe for the following reasons:
+      * - concurrent modifications of a file will result in SIGBUS;
+      * - IO error from the device will result in SIGBUS;
+      * - recovery from this signal is not feasible even with the usage of siglongjmp,
+      *   as it might require stack unwinding from arbitrary place;
+      * - arbitrary slowdown due to page fault in arbitrary place in the code is difficult to debug.
+      *
+      * But we keep this mode for clickhouse-local as it is not so bad for a command line tool.
+      */
+
+    if (S_ISREG(file_stat.st_mode)
+        && context->getApplicationType() != Context::ApplicationType::SERVER
+        && read_method == LocalFSReadMethod::mmap)
     {
         try
         {
@@ -368,8 +383,7 @@ ColumnsDescription StorageFile::getTableStructureFromFile(
         if (paths.empty())
             throw Exception(ErrorCodes::INCORRECT_FILE_NAME, "Cannot get table structure from file, because no files match specified name");
 
-        auto source = StorageDistributedDirectoryMonitor::createSourceFromFile(paths[0]);
-        return ColumnsDescription(source->getOutputs().front().getHeader().getNamesAndTypesList());
+        return ColumnsDescription(DistributedAsyncInsertSource(paths[0]).getOutputs().front().getHeader().getNamesAndTypesList());
     }
 
     if (paths.empty() && !FormatFactory::instance().checkIfFormatHasExternalSchemaReader(format))
@@ -407,6 +421,16 @@ bool StorageFile::supportsSubsetOfColumns() const
     return format_name != "Distributed" && FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(format_name);
 }
 
+bool StorageFile::prefersLargeBlocks() const
+{
+    return FormatFactory::instance().checkIfOutputFormatPrefersLargeBlocks(format_name);
+}
+
+bool StorageFile::parallelizeOutputAfterReading(ContextPtr context) const
+{
+    return FormatFactory::instance().checkParallelizeOutputAfterReading(format_name, context);
+}
+
 StorageFile::StorageFile(int table_fd_, CommonArguments args)
     : StorageFile(args)
 {
@@ -597,7 +621,7 @@ public:
                     /// Special case for distributed format. Defaults are not needed here.
                     if (storage->format_name == "Distributed")
                     {
-                        pipeline = std::make_unique<QueryPipeline>(StorageDistributedDirectoryMonitor::createSourceFromFile(current_path));
+                        pipeline = std::make_unique<QueryPipeline>(std::make_shared<DistributedAsyncInsertSource>(current_path));
                         reader = std::make_unique<PullingPipelineExecutor>(*pipeline);
                         continue;
                     }
@@ -606,8 +630,11 @@ public:
                 if (!read_buf)
                     read_buf = createReadBuffer(current_path, storage->use_table_fd, storage->getName(), storage->table_fd, storage->compression_method, context);
 
+                const Settings & settings = context->getSettingsRef();
+                chassert(!storage->paths.empty());
+                const auto max_parsing_threads = std::max<size_t>(settings.max_threads/ storage->paths.size(), 1UL);
                 auto format
-                    = context->getInputFormat(storage->format_name, *read_buf, block_for_format, max_block_size, storage->format_settings);
+                    = context->getInputFormat(storage->format_name, *read_buf, block_for_format, max_block_size, storage->format_settings, max_parsing_threads);
 
                 QueryPipelineBuilder builder;
                 builder.init(Pipe(format));
@@ -701,7 +728,7 @@ Pipe StorageFile::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    size_t num_streams)
+    const size_t max_num_streams)
 {
     if (use_table_fd)
     {
@@ -732,7 +759,8 @@ Pipe StorageFile::read(
 
     auto this_ptr = std::static_pointer_cast<StorageFile>(shared_from_this());
 
-    if (num_streams > paths.size())
+    size_t num_streams = max_num_streams;
+    if (max_num_streams > paths.size())
         num_streams = paths.size();
 
     Pipes pipes;
diff --git a/src/Storages/StorageFile.h b/src/Storages/StorageFile.h
index 03b3aacb67f..53ce7eeaaf6 100644
--- a/src/Storages/StorageFile.h
+++ b/src/Storages/StorageFile.h
@@ -3,7 +3,6 @@
 #include <Storages/IStorage.h>
 #include <Storages/Cache/SchemaCache.h>
 
-#include <Common/logger_useful.h>
 
 #include <atomic>
 #include <shared_mutex>
@@ -14,8 +13,6 @@ namespace DB
 
 class StorageFile final : public IStorage
 {
-friend class partitionedstoragefilesink;
-
 public:
     struct CommonArguments : public WithContext
     {
@@ -76,6 +73,10 @@ public:
     /// format to read only them. Note: this hack cannot be done with ordinary formats like TSV.
     bool supportsSubsetOfColumns() const override;
 
+    bool prefersLargeBlocks() const override;
+
+    bool parallelizeOutputAfterReading(ContextPtr context) const override;
+
     bool supportsPartitionBy() const override { return true; }
 
     ColumnsDescription getTableStructureFromFileDescriptor(ContextPtr context);
diff --git a/src/Storages/StorageGenerateRandom.cpp b/src/Storages/StorageGenerateRandom.cpp
index 601306bd1bf..567c674ded9 100644
--- a/src/Storages/StorageGenerateRandom.cpp
+++ b/src/Storages/StorageGenerateRandom.cpp
@@ -24,6 +24,7 @@
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/NestedUtils.h>
 
 #include <Common/SipHash.h>
@@ -50,16 +51,33 @@ namespace ErrorCodes
 namespace
 {
 
-void fillBufferWithRandomData(char * __restrict data, size_t size, pcg64 & rng)
+void fillBufferWithRandomData(char * __restrict data, size_t limit, size_t size_of_type, pcg64 & rng, [[maybe_unused]] bool flip_bytes = false)
 {
+    size_t size = limit * size_of_type;
     char * __restrict end = data + size;
     while (data < end)
     {
         /// The loop can be further optimized.
         UInt64 number = rng();
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+        unalignedStoreLittleEndian<UInt64>(data, number);
+#else
         unalignedStore<UInt64>(data, number);
+#endif
         data += sizeof(UInt64); /// We assume that data has at least 7-byte padding (see PaddedPODArray)
     }
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+    if (flip_bytes)
+    {
+        data = end - size;
+        while (data < end)
+        {
+            char * rev_end = data + size_of_type;
+            std::reverse(data, rev_end);
+            data += size_of_type;
+        }
+    }
+#endif
 }
 
 
@@ -215,8 +233,17 @@ ColumnPtr fillColumnWithRandomData(
         case TypeIndex::UInt8:
         {
             auto column = ColumnUInt8::create();
-            column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UInt8), rng);
+            auto & data = column->getData();
+            data.resize(limit);
+            if (isBool(type))
+            {
+                for (size_t i = 0; i < limit; ++i)
+                    data[i] = rng() % 2;
+            }
+            else
+            {
+                fillBufferWithRandomData(reinterpret_cast<char *>(data.data()), limit, sizeof(UInt8), rng);
+            }
             return column;
         }
         case TypeIndex::UInt16: [[fallthrough]];
@@ -224,7 +251,7 @@ ColumnPtr fillColumnWithRandomData(
         {
             auto column = ColumnUInt16::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UInt16), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(UInt16), rng, true);
             return column;
         }
         case TypeIndex::Date32:
@@ -242,28 +269,28 @@ ColumnPtr fillColumnWithRandomData(
         {
             auto column = ColumnUInt32::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UInt32), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(UInt32), rng, true);
             return column;
         }
         case TypeIndex::UInt64:
         {
             auto column = ColumnUInt64::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UInt64), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(UInt64), rng, true);
             return column;
         }
         case TypeIndex::UInt128:
         {
             auto column = ColumnUInt128::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UInt128), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(UInt128), rng, true);
             return column;
         }
         case TypeIndex::UInt256:
         {
             auto column = ColumnUInt256::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UInt256), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(UInt256), rng);
             return column;
         }
         case TypeIndex::UUID:
@@ -271,95 +298,116 @@ ColumnPtr fillColumnWithRandomData(
             auto column = ColumnUUID::create();
             column->getData().resize(limit);
             /// NOTE This is slightly incorrect as random UUIDs should have fixed version 4.
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UUID), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(UUID), rng);
             return column;
         }
         case TypeIndex::Int8:
         {
             auto column = ColumnInt8::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int8), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(Int8), rng);
             return column;
         }
         case TypeIndex::Int16:
         {
             auto column = ColumnInt16::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int16), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(Int16), rng, true);
             return column;
         }
         case TypeIndex::Int32:
         {
             auto column = ColumnInt32::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int32), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(Int32), rng, true);
             return column;
         }
         case TypeIndex::Int64:
         {
             auto column = ColumnInt64::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int64), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(Int64), rng, true);
             return column;
         }
         case TypeIndex::Int128:
         {
             auto column = ColumnInt128::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int128), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(Int128), rng, true);
             return column;
         }
         case TypeIndex::Int256:
         {
             auto column = ColumnInt256::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int256), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(Int256), rng, true);
             return column;
         }
         case TypeIndex::Float32:
         {
             auto column = ColumnFloat32::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Float32), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(Float32), rng, true);
             return column;
         }
         case TypeIndex::Float64:
         {
             auto column = ColumnFloat64::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Float64), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(Float64), rng, true);
             return column;
         }
         case TypeIndex::Decimal32:
         {
-            auto column = type->createColumn();
+            const auto & decimal_type = assert_cast<const DataTypeDecimal<Decimal32> &>(*type);
+            auto column = decimal_type.createColumn();
             auto & column_concrete = typeid_cast<ColumnDecimal<Decimal32> &>(*column);
-            column_concrete.getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column_concrete.getData().data()), limit * sizeof(Decimal32), rng);
+            auto & data = column_concrete.getData();
+            data.resize(limit);
+            /// Generate numbers from range [-10^P + 1, 10^P - 1]
+            Int32 range = common::exp10_i32(decimal_type.getPrecision());
+            for (size_t i = 0; i != limit; ++i)
+                data[i] = static_cast<Int32>(rng()) % range;
             return column;
         }
-        case TypeIndex::Decimal64:  /// TODO Decimal may be generated out of range.
+        case TypeIndex::Decimal64:
         {
+            const auto & decimal_type = assert_cast<const DataTypeDecimal<Decimal64> &>(*type);
             auto column = type->createColumn();
             auto & column_concrete = typeid_cast<ColumnDecimal<Decimal64> &>(*column);
-            column_concrete.getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column_concrete.getData().data()), limit * sizeof(Decimal64), rng);
+            auto & data = column_concrete.getData();
+            data.resize(limit);
+            /// Generate numbers from range [-10^P + 1, 10^P - 1]
+            Int64 range = common::exp10_i64(decimal_type.getPrecision());
+            for (size_t i = 0; i != limit; ++i)
+                data[i] = static_cast<Int64>(rng()) % range;
+
             return column;
         }
         case TypeIndex::Decimal128:
         {
+            const auto & decimal_type = assert_cast<const DataTypeDecimal<Decimal128> &>(*type);
             auto column = type->createColumn();
             auto & column_concrete = typeid_cast<ColumnDecimal<Decimal128> &>(*column);
-            column_concrete.getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column_concrete.getData().data()), limit * sizeof(Decimal128), rng);
+            auto & data = column_concrete.getData();
+            data.resize(limit);
+            /// Generate numbers from range [-10^P + 1, 10^P - 1]
+            Int128 range = common::exp10_i128(decimal_type.getPrecision());
+            for (size_t i = 0; i != limit; ++i)
+                data[i] = Int128({rng(), rng()}) % range;
             return column;
         }
         case TypeIndex::Decimal256:
         {
+            const auto & decimal_type = assert_cast<const DataTypeDecimal<Decimal256> &>(*type);
             auto column = type->createColumn();
             auto & column_concrete = typeid_cast<ColumnDecimal<Decimal256> &>(*column);
-            column_concrete.getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column_concrete.getData().data()), limit * sizeof(Decimal256), rng);
+            auto & data = column_concrete.getData();
+            data.resize(limit);
+            /// Generate numbers from range [-10^P + 1, 10^P - 1]
+            Int256 range = common::exp10_i256(decimal_type.getPrecision());
+            for (size_t i = 0; i != limit; ++i)
+                data[i] = Int256({rng(), rng(), rng(), rng()}) % range;
             return column;
         }
         case TypeIndex::FixedString:
@@ -367,7 +415,7 @@ ColumnPtr fillColumnWithRandomData(
             size_t n = typeid_cast<const DataTypeFixedString &>(*type).getN();
             auto column = ColumnFixedString::create(n);
             column->getChars().resize(limit * n);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getChars().data()), limit * n, rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getChars().data()), limit, n, rng);
             return column;
         }
         case TypeIndex::DateTime64:
@@ -401,14 +449,14 @@ ColumnPtr fillColumnWithRandomData(
         {
             auto column = ColumnIPv4::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(IPv4), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(IPv4), rng);
             return column;
         }
         case TypeIndex::IPv6:
         {
             auto column = ColumnIPv6::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(IPv6), rng);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit, sizeof(IPv6), rng);
             return column;
         }
 
@@ -473,7 +521,7 @@ StorageGenerateRandom::StorageGenerateRandom(
     const String & comment,
     UInt64 max_array_length_,
     UInt64 max_string_length_,
-    std::optional<UInt64> random_seed_)
+    const std::optional<UInt64> & random_seed_)
     : IStorage(table_id_), max_array_length(max_array_length_), max_string_length(max_string_length_)
 {
     static constexpr size_t MAX_ARRAY_SIZE = 1 << 30;
diff --git a/src/Storages/StorageGenerateRandom.h b/src/Storages/StorageGenerateRandom.h
index 6b050c07e52..e59e2250c82 100644
--- a/src/Storages/StorageGenerateRandom.h
+++ b/src/Storages/StorageGenerateRandom.h
@@ -17,7 +17,7 @@ public:
         const String & comment,
         UInt64 max_array_length,
         UInt64 max_string_length,
-        std::optional<UInt64> random_seed);
+        const std::optional<UInt64> & random_seed);
 
     std::string getName() const override { return "GenerateRandom"; }
 
diff --git a/src/Storages/StorageHudi.cpp b/src/Storages/StorageHudi.cpp
deleted file mode 100644
index 1dd2684d59b..00000000000
--- a/src/Storages/StorageHudi.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "config.h"
-
-#if USE_AWS_S3
-
-#include <Storages/StorageHudi.h>
-#include <Common/logger_useful.h>
-
-#include <Formats/FormatFactory.h>
-#include <Storages/StorageFactory.h>
-
-#include <QueryPipeline/Pipe.h>
-
-#include <ranges>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int S3_ERROR;
-    extern const int LOGICAL_ERROR;
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-HudiMetadataParser<Configuration, MetadataReadHelper>::HudiMetadataParser(const Configuration & configuration_, ContextPtr context_)
-    : configuration(configuration_), context(context_), log(&Poco::Logger::get("StorageHudi"))
-{
-}
-
-/// Apache Hudi store parts of data in different files.
-/// Every part file has timestamp in it.
-/// Every partition(directory) in Apache Hudi has different versions of part.
-/// To find needed parts we need to find out latest part file for every partition.
-/// Part format is usually parquet, but can differ.
-template <typename Configuration, typename MetadataReadHelper>
-String HudiMetadataParser<Configuration, MetadataReadHelper>::generateQueryFromKeys(const std::vector<std::string> & keys, const String & format)
-{
-    /// For each partition path take only latest file.
-    struct FileInfo
-    {
-        String filename;
-        UInt64 timestamp;
-    };
-    std::unordered_map<String, FileInfo> latest_parts; /// Partition path (directory) -> latest part file info.
-
-    /// Make format lowercase.
-    const auto expected_extension= "." + Poco::toLower(format);
-    /// Filter only files with specific format.
-    auto keys_filter = [&](const String & key) { return std::filesystem::path(key).extension() == expected_extension; };
-
-    for (const auto & key : keys | std::views::filter(keys_filter))
-    {
-        const auto key_path = fs::path(key);
-        const String filename = key_path.filename();
-        const String partition_path = key_path.parent_path();
-
-        /// Every filename contains metadata split by "_", timestamp is after last "_".
-        const auto delim = key.find_last_of('_') + 1;
-        if (delim == std::string::npos)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected format of metadata files");
-        const auto timestamp = parse<UInt64>(key.substr(delim + 1));
-
-        auto it = latest_parts.find(partition_path);
-        if (it == latest_parts.end())
-        {
-            latest_parts.emplace(partition_path, FileInfo{filename, timestamp});
-        }
-        else if (it->second.timestamp < timestamp)
-        {
-            it->second = {filename, timestamp};
-        }
-    }
-
-    std::string list_of_keys;
-
-    for (const auto & [directory, file_info] : latest_parts)
-    {
-        if (!list_of_keys.empty())
-            list_of_keys += ",";
-
-        list_of_keys += std::filesystem::path(directory) / file_info.filename;
-    }
-
-    return "{" + list_of_keys + "}";
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-std::vector<std::string> HudiMetadataParser<Configuration, MetadataReadHelper>::getFiles() const
-{
-    return MetadataReadHelper::listFiles(configuration);
-}
-
-template HudiMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::HudiMetadataParser(
-    const StorageS3::Configuration & configuration_, ContextPtr context_);
-
-template std::vector<String> HudiMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::getFiles() const;
-
-template String HudiMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::generateQueryFromKeys(
-    const std::vector<String> & keys, const String & format);
-
-void registerStorageHudi(StorageFactory & factory)
-{
-    factory.registerStorage(
-        "Hudi",
-        [](const StorageFactory::Arguments & args)
-        {
-            StorageS3::Configuration configuration = StorageHudi::getConfiguration(args.engine_args, args.getLocalContext());
-
-            auto format_settings = getFormatSettings(args.getContext());
-
-            return std::make_shared<StorageHudi>(
-                configuration, args.table_id, args.columns, args.constraints, args.comment, args.getContext(), format_settings);
-        },
-        {
-            .supports_settings = false,
-            .supports_schema_inference = true,
-            .source_access_type = AccessType::S3,
-        });
-}
-
-}
-
-#endif
diff --git a/src/Storages/StorageHudi.h b/src/Storages/StorageHudi.h
deleted file mode 100644
index 2bdd5126dc3..00000000000
--- a/src/Storages/StorageHudi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "config.h"
-
-#if USE_AWS_S3
-
-#    include <Storages/IStorage.h>
-#    include <Storages/IStorageDataLake.h>
-#    include <Storages/S3DataLakeMetadataReadHelper.h>
-#    include <Storages/StorageS3.h>
-
-namespace DB
-{
-
-
-template <typename Configuration, typename MetadataReadHelper>
-class HudiMetadataParser
-{
-public:
-    HudiMetadataParser(const Configuration & configuration_, ContextPtr context_);
-
-    std::vector<String> getFiles() const;
-
-    static String generateQueryFromKeys(const std::vector<String> & keys, const String & format);
-
-private:
-    Configuration configuration;
-    ContextPtr context;
-    Poco::Logger * log;
-};
-
-struct StorageHudiName
-{
-    static constexpr auto name = "Hudi";
-    static constexpr auto data_directory_prefix = "";
-};
-
-using StorageHudi
-    = IStorageDataLake<StorageS3, StorageHudiName, HudiMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>>;
-}
-
-#endif
diff --git a/src/Storages/StorageIceberg.cpp b/src/Storages/StorageIceberg.cpp
deleted file mode 100644
index dd7923fa76a..00000000000
--- a/src/Storages/StorageIceberg.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-#include "config.h"
-
-#if USE_AWS_S3 && USE_AVRO
-
-#    include <Storages/StorageIceberg.h>
-#    include <Common/logger_useful.h>
-
-#    include <Columns/ColumnString.h>
-#    include <Columns/ColumnTuple.h>
-#    include <Columns/IColumn.h>
-
-#    include <Storages/StorageFactory.h>
-
-#    include <Formats/FormatFactory.h>
-
-#    include <fmt/format.h>
-
-#    include <Processors/Formats/Impl/AvroRowInputFormat.h>
-
-#    include <Poco/JSON/Array.h>
-#    include <Poco/JSON/Object.h>
-#    include <Poco/JSON/Parser.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int S3_ERROR;
-    extern const int FILE_DOESNT_EXIST;
-    extern const int ILLEGAL_COLUMN;
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-IcebergMetadataParser<Configuration, MetadataReadHelper>::IcebergMetadataParser(const Configuration & configuration_, ContextPtr context_)
-    : base_configuration(configuration_), context(context_)
-{
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-std::vector<String> IcebergMetadataParser<Configuration, MetadataReadHelper>::getFiles() const
-{
-    auto metadata = fetchMetadataFile();
-    auto manifest_list = getManifestList(metadata);
-
-    /// When table first created and does not have any data
-    if (manifest_list.empty())
-    {
-        return {};
-    }
-
-    auto manifest_files = getManifestFiles(manifest_list);
-    return getFilesForRead(manifest_files);
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-String IcebergMetadataParser<Configuration, MetadataReadHelper>::fetchMetadataFile() const
-{
-    /// Iceberg stores all the metadata.json in metadata directory, and the
-    /// newest version has the max version name, so we should list all of them,
-    /// then find the newest metadata.
-    static constexpr auto meta_file_suffix = ".json";
-    auto metadata_files = MetadataReadHelper::listFilesMatchSuffix(base_configuration, metadata_directory, meta_file_suffix);
-
-    if (metadata_files.empty())
-        throw Exception(
-            ErrorCodes::FILE_DOESNT_EXIST, "The metadata file for Iceberg table with path {} doesn't exist", base_configuration.url.key);
-
-    /// See comment above
-    auto it = std::max_element(metadata_files.begin(), metadata_files.end());
-    return *it;
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-String IcebergMetadataParser<Configuration, MetadataReadHelper>::getManifestList(const String & metadata_name) const
-{
-    auto buffer = MetadataReadHelper::createReadBuffer(metadata_name, context, base_configuration);
-    String json_str;
-    readJSONObjectPossiblyInvalid(json_str, *buffer);
-
-    /// Looks like base/base/JSON.h can not parse this json file
-    Poco::JSON::Parser parser;
-    Poco::Dynamic::Var json = parser.parse(json_str);
-    Poco::JSON::Object::Ptr object = json.extract<Poco::JSON::Object::Ptr>();
-
-    auto current_snapshot_id = object->getValue<Int64>("current-snapshot-id");
-
-    auto snapshots = object->get("snapshots").extract<Poco::JSON::Array::Ptr>();
-
-    for (size_t i = 0; i < snapshots->size(); ++i)
-    {
-        auto snapshot = snapshots->getObject(static_cast<UInt32>(i));
-        if (snapshot->getValue<Int64>("snapshot-id") == current_snapshot_id)
-        {
-            auto path = snapshot->getValue<String>("manifest-list");
-            return std::filesystem::path(base_configuration.url.key) / metadata_directory / std::filesystem::path(path).filename();
-        }
-    }
-
-    return {};
-}
-
-static MutableColumns
-parseAvro(const std::unique_ptr<avro::DataFileReaderBase> & file_reader, const DataTypePtr & data_type, const String & field_name)
-{
-    auto deserializer = std::make_unique<AvroDeserializer>(
-        Block{{data_type->createColumn(), data_type, field_name}}, file_reader->dataSchema(), true, true);
-    file_reader->init();
-    MutableColumns columns;
-    columns.emplace_back(data_type->createColumn());
-
-    RowReadExtension ext;
-    while (file_reader->hasMore())
-    {
-        file_reader->decr();
-        deserializer->deserializeRow(columns, file_reader->decoder(), ext);
-    }
-    return columns;
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-std::vector<String> IcebergMetadataParser<Configuration, MetadataReadHelper>::getManifestFiles(const String & manifest_list) const
-{
-    auto buffer = MetadataReadHelper::createReadBuffer(manifest_list, context, base_configuration);
-
-    auto file_reader = std::make_unique<avro::DataFileReaderBase>(std::make_unique<AvroInputStreamReadBufferAdapter>(*buffer));
-
-    static constexpr auto manifest_path = "manifest_path";
-
-    /// The manifest_path is the first field in manifest list file,
-    /// And its have String data type
-    /// {'manifest_path': 'xxx', ...}
-    auto data_type = AvroSchemaReader::avroNodeToDataType(file_reader->dataSchema().root()->leafAt(0));
-    auto columns = parseAvro(file_reader, data_type, manifest_path);
-    auto & col = columns.at(0);
-
-    std::vector<String> res;
-    if (col->getDataType() == TypeIndex::String)
-    {
-        const auto * col_str = typeid_cast<ColumnString *>(col.get());
-        size_t col_size = col_str->size();
-        for (size_t i = 0; i < col_size; ++i)
-        {
-            auto file_path = col_str->getDataAt(i).toView();
-            /// We just need obtain the file name
-            std::filesystem::path path(file_path);
-            res.emplace_back(std::filesystem::path(base_configuration.url.key) / metadata_directory / path.filename());
-        }
-
-        return res;
-    }
-    throw Exception(
-        ErrorCodes::ILLEGAL_COLUMN,
-        "The parsed column from Avro file of `manifest_path` field should be String type, got {}",
-        col->getFamilyName());
-}
-
-template <typename Configuration, typename MetadataReadHelper>
-std::vector<String> IcebergMetadataParser<Configuration, MetadataReadHelper>::getFilesForRead(const std::vector<String> & manifest_files) const
-{
-    std::vector<String> keys;
-    for (const auto & manifest_file : manifest_files)
-    {
-        auto buffer = MetadataReadHelper::createReadBuffer(manifest_file, context, base_configuration);
-
-        auto file_reader = std::make_unique<avro::DataFileReaderBase>(std::make_unique<AvroInputStreamReadBufferAdapter>(*buffer));
-
-        static constexpr auto manifest_path = "data_file";
-
-        /// The data_file filed at the 3rd position of the manifest file:
-        /// {'status': xx, 'snapshot_id': xx, 'data_file': {'file_path': 'xxx', ...}, ...}
-        /// and it's also a nested record, so its result type is a nested Tuple
-        auto data_type = AvroSchemaReader::avroNodeToDataType(file_reader->dataSchema().root()->leafAt(2));
-        auto columns = parseAvro(file_reader, data_type, manifest_path);
-        auto & col = columns.at(0);
-
-        if (col->getDataType() == TypeIndex::Tuple)
-        {
-            auto * col_tuple = typeid_cast<ColumnTuple *>(col.get());
-            auto & col_str = col_tuple->getColumnPtr(0);
-            if (col_str->getDataType() == TypeIndex::String)
-            {
-                const auto * str_col = typeid_cast<const ColumnString *>(col_str.get());
-                size_t col_size = str_col->size();
-                for (size_t i = 0; i < col_size; ++i)
-                {
-                    auto file_path = str_col->getDataAt(i).toView();
-                    /// We just obtain the partition/file name
-                    std::filesystem::path path(file_path);
-                    keys.emplace_back(path.parent_path().filename() / path.filename());
-                }
-            }
-            else
-            {
-                throw Exception(
-                    ErrorCodes::ILLEGAL_COLUMN,
-                    "The parsed column from Avro file of `file_path` field should be String type, got {}",
-                    col_str->getFamilyName());
-            }
-        }
-        else
-        {
-            throw Exception(
-                ErrorCodes::ILLEGAL_COLUMN,
-                "The parsed column from Avro file of `data_file` field should be Tuple type, got {}",
-                col->getFamilyName());
-        }
-    }
-
-    return keys;
-}
-
-// generateQueryFromKeys constructs query from all parquet filenames
-// for underlying StorageS3 engine
-template <typename Configuration, typename MetadataReadHelper>
-String IcebergMetadataParser<Configuration, MetadataReadHelper>::generateQueryFromKeys(const std::vector<String> & keys, const String &)
-{
-    std::string new_query = fmt::format("{{{}}}", fmt::join(keys, ","));
-    return new_query;
-}
-
-template IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::IcebergMetadataParser(
-    const StorageS3::Configuration & configuration_, ContextPtr context_);
-
-template std::vector<String> IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::getFiles() const;
-
-template String IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::generateQueryFromKeys(
-    const std::vector<String> & keys, const String & format);
-
-template String IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::fetchMetadataFile() const;
-
-template String IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::getManifestList(const String & metadata_name) const;
-
-template std::vector<String>
-IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::getManifestFiles(const String & manifest_list) const;
-
-template std::vector<String>
-IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>::getFilesForRead(const std::vector<String> & manifest_files) const;
-
-void registerStorageIceberg(StorageFactory & factory)
-{
-    factory.registerStorage(
-        "Iceberg",
-        [](const StorageFactory::Arguments & args)
-        {
-            auto & engine_args = args.engine_args;
-            StorageS3::Configuration configuration = StorageIceberg::getConfiguration(engine_args, args.getLocalContext());
-
-            auto format_settings = getFormatSettings(args.getContext());
-
-            return std::make_shared<StorageIceberg>(
-                configuration, args.table_id, args.columns, args.constraints, args.comment, args.getContext(), format_settings);
-        },
-        {
-            .supports_settings = false,
-            .supports_schema_inference = true,
-            .source_access_type = AccessType::S3,
-        });
-}
-
-}
-
-#endif
diff --git a/src/Storages/StorageIceberg.h b/src/Storages/StorageIceberg.h
deleted file mode 100644
index d4906d472b2..00000000000
--- a/src/Storages/StorageIceberg.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#include "config.h"
-
-// StorageIceberg depending on Avro to parse metadata with Avro format.
-#if USE_AWS_S3 && USE_AVRO
-
-#    include <Storages/IStorageDataLake.h>
-#    include <Storages/S3DataLakeMetadataReadHelper.h>
-#    include <Storages/StorageS3.h>
-
-namespace DB
-{
-
-// Class to parse iceberg metadata and find files needed for query in table
-// Iceberg table directory outlook:
-// table/
-//      data/
-//      metadata/
-// The metadata has three layers: metadata -> manifest list -> manifest files
-template <typename Configuration, typename MetadataReadHelper>
-class IcebergMetadataParser
-{
-public:
-    IcebergMetadataParser(const Configuration & configuration_, ContextPtr context_);
-
-    std::vector<String> getFiles() const;
-
-    static String generateQueryFromKeys(const std::vector<String> & keys, const String & format);
-
-private:
-    static constexpr auto metadata_directory = "metadata";
-    Configuration base_configuration;
-    ContextPtr context;
-
-    String fetchMetadataFile() const;
-    String getManifestList(const String & metadata_name) const;
-    std::vector<String> getManifestFiles(const String & manifest_list) const;
-    std::vector<String> getFilesForRead(const std::vector<String> & manifest_files) const;
-};
-
-struct StorageIcebergName
-{
-    static constexpr auto name = "Iceberg";
-    static constexpr auto data_directory_prefix = "data";
-};
-
-using StorageIceberg
-    = IStorageDataLake<StorageS3, StorageIcebergName, IcebergMetadataParser<StorageS3::Configuration, S3DataLakeMetadataReadHelper>>;
-}
-
-#endif
diff --git a/src/Storages/StorageInMemoryMetadata.cpp b/src/Storages/StorageInMemoryMetadata.cpp
index f6550c6cd5d..45abd4bebef 100644
--- a/src/Storages/StorageInMemoryMetadata.cpp
+++ b/src/Storages/StorageInMemoryMetadata.cpp
@@ -41,6 +41,7 @@ StorageInMemoryMetadata::StorageInMemoryMetadata(const StorageInMemoryMetadata &
     , settings_changes(other.settings_changes ? other.settings_changes->clone() : nullptr)
     , select(other.select)
     , comment(other.comment)
+    , metadata_version(other.metadata_version)
 {
 }
 
@@ -69,6 +70,7 @@ StorageInMemoryMetadata & StorageInMemoryMetadata::operator=(const StorageInMemo
         settings_changes.reset();
     select = other.select;
     comment = other.comment;
+    metadata_version = other.metadata_version;
     return *this;
 }
 
@@ -122,6 +124,18 @@ void StorageInMemoryMetadata::setSelectQuery(const SelectQueryDescription & sele
     select = select_;
 }
 
+void StorageInMemoryMetadata::setMetadataVersion(int32_t metadata_version_)
+{
+    metadata_version = metadata_version_;
+}
+
+StorageInMemoryMetadata StorageInMemoryMetadata::withMetadataVersion(int32_t metadata_version_) const
+{
+    StorageInMemoryMetadata copy(*this);
+    copy.setMetadataVersion(metadata_version_);
+    return copy;
+}
+
 const ColumnsDescription & StorageInMemoryMetadata::getColumns() const
 {
     return columns;
diff --git a/src/Storages/StorageInMemoryMetadata.h b/src/Storages/StorageInMemoryMetadata.h
index eadce581334..25618c5b03f 100644
--- a/src/Storages/StorageInMemoryMetadata.h
+++ b/src/Storages/StorageInMemoryMetadata.h
@@ -50,6 +50,10 @@ struct StorageInMemoryMetadata
 
     String comment;
 
+    /// Version of metadata. Managed properly by ReplicatedMergeTree only
+    /// (zero-initialization is important)
+    int32_t metadata_version = 0;
+
     StorageInMemoryMetadata() = default;
 
     StorageInMemoryMetadata(const StorageInMemoryMetadata & other);
@@ -58,7 +62,7 @@ struct StorageInMemoryMetadata
     StorageInMemoryMetadata(StorageInMemoryMetadata && other) = default;
     StorageInMemoryMetadata & operator=(StorageInMemoryMetadata && other) = default;
 
-    /// NOTE: Thread unsafe part. You should modify same StorageInMemoryMetadata
+    /// NOTE: Thread unsafe part. You should not modify same StorageInMemoryMetadata
     /// structure from different threads. It should be used as MultiVersion
     /// object. See example in IStorage.
 
@@ -90,6 +94,11 @@ struct StorageInMemoryMetadata
     /// Set SELECT query for (Materialized)View
     void setSelectQuery(const SelectQueryDescription & select_);
 
+    /// Set version of metadata.
+    void setMetadataVersion(int32_t metadata_version_);
+    /// Get copy of current metadata with metadata_version_
+    StorageInMemoryMetadata withMetadataVersion(int32_t metadata_version_) const;
+
     /// Returns combined set of columns
     const ColumnsDescription & getColumns() const;
 
@@ -218,6 +227,9 @@ struct StorageInMemoryMetadata
     const SelectQueryDescription & getSelectQuery() const;
     bool hasSelectQuery() const;
 
+    /// Get version of metadata
+    int32_t getMetadataVersion() const { return metadata_version; }
+
     /// Check that all the requested names are in the table and have the correct types.
     void check(const NamesAndTypesList & columns) const;
 
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index ab1406f9bd6..5113320548d 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -21,21 +21,24 @@
 #include <QueryPipeline/Pipe.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
-#include <Poco/String.h> /// toLower
+#include <Poco/String.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int NOT_IMPLEMENTED;
-    extern const int LOGICAL_ERROR;
-    extern const int UNSUPPORTED_JOIN_KEYS;
-    extern const int NO_SUCH_COLUMN_IN_TABLE;
-    extern const int INCOMPATIBLE_TYPE_OF_JOIN;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int BAD_ARGUMENTS;
+    extern const int DEADLOCK_AVOIDED;
+    extern const int INCOMPATIBLE_TYPE_OF_JOIN;
+    extern const int LOGICAL_ERROR;
+    extern const int NO_SUCH_COLUMN_IN_TABLE;
+    extern const int NOT_IMPLEMENTED;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int UNSUPPORTED_JOIN_KEYS;
 }
 
 StorageJoin::StorageJoin(
@@ -78,6 +81,14 @@ RWLockImpl::LockHolder StorageJoin::tryLockTimedWithContext(const RWLock & lock,
     return tryLockTimed(lock, type, query_id, acquire_timeout);
 }
 
+RWLockImpl::LockHolder StorageJoin::tryLockForCurrentQueryTimedWithContext(const RWLock & lock, RWLockImpl::Type type, ContextPtr context)
+{
+    const String query_id = context ? context->getInitialQueryId() : RWLockImpl::NO_QUERY;
+    const std::chrono::milliseconds acquire_timeout
+        = context ? context->getSettingsRef().lock_acquire_timeout : std::chrono::seconds(DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC);
+    return lock->getLock(type, query_id, acquire_timeout, false);
+}
+
 SinkToStoragePtr StorageJoin::write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     std::lock_guard mutate_lock(mutate_mutex);
@@ -95,7 +106,7 @@ void StorageJoin::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPt
         LOG_INFO(&Poco::Logger::get("StorageJoin"), "Path {} is already removed from disk {}", path, disk->getName());
 
     disk->createDirectories(path);
-    disk->createDirectories(path + "tmp/");
+    disk->createDirectories(fs::path(path) / "tmp/");
 
     increment = 0;
     join = std::make_shared<HashJoin>(table_join, getRightSampleBlock(), overwrite);
@@ -127,7 +138,8 @@ void StorageJoin::mutate(const MutationCommands & commands, ContextPtr context)
     // New scope controls lifetime of pipeline.
     {
         auto storage_ptr = DatabaseCatalog::instance().getTable(getStorageID(), context);
-        auto interpreter = std::make_unique<MutationsInterpreter>(storage_ptr, metadata_snapshot, commands, context, true);
+        MutationsInterpreter::Settings settings(true);
+        auto interpreter = std::make_unique<MutationsInterpreter>(storage_ptr, metadata_snapshot, commands, context, settings);
         auto pipeline = QueryPipelineBuilder::getPipeline(interpreter->execute());
         PullingPipelineExecutor executor(pipeline);
 
@@ -209,12 +221,13 @@ HashJoinPtr StorageJoin::getJoinLocked(std::shared_ptr<TableJoin> analyzed_join,
     Names left_key_names_resorted;
     for (const auto & key_name : key_names)
     {
-        const auto & renamed_key = analyzed_join->renamedRightColumnName(key_name);
+        const auto & renamed_key = analyzed_join->renamedRightColumnNameWithAlias(key_name);
         /// find position of renamed_key in key_names_right
         auto it = std::find(key_names_right.begin(), key_names_right.end(), renamed_key);
         if (it == key_names_right.end())
             throw Exception(ErrorCodes::INCOMPATIBLE_TYPE_OF_JOIN,
-                "Key '{}' not found in JOIN ON section. All Join engine keys '{}' have to be used", key_name, fmt::join(key_names, ", "));
+                "Key '{}' not found in JOIN ON section. Join engine key{} '{}' have to be used",
+                key_name, key_names.size() > 1 ? "s" : "", fmt::join(key_names, ", "));
         const size_t key_position = std::distance(key_names_right.begin(), it);
         left_key_names_resorted.push_back(key_names_left[key_position]);
     }
@@ -238,8 +251,12 @@ void StorageJoin::insertBlock(const Block & block, ContextPtr context)
 {
     Block block_to_insert = block;
     convertRightBlock(block_to_insert);
+    TableLockHolder holder = tryLockForCurrentQueryTimedWithContext(rwlock, RWLockImpl::Write, context);
+
+    /// Protection from `INSERT INTO test_table_join SELECT * FROM test_table_join`
+    if (!holder)
+        throw Exception(ErrorCodes::DEADLOCK_AVOIDED, "StorageJoin: cannot insert data because current query tries to read from this storage");
 
-    TableLockHolder holder = tryLockTimedWithContext(rwlock, RWLockImpl::Write, context);
     join->addJoinedBlock(block_to_insert, true);
 }
 
diff --git a/src/Storages/StorageJoin.h b/src/Storages/StorageJoin.h
index 61ea743c841..a5e85d8788a 100644
--- a/src/Storages/StorageJoin.h
+++ b/src/Storages/StorageJoin.h
@@ -100,12 +100,15 @@ private:
     /// Protect state for concurrent use in insertFromBlock and joinBlock.
     /// Lock is stored in HashJoin instance during query and blocks concurrent insertions.
     mutable RWLock rwlock = RWLockImpl::create();
+
     mutable std::mutex mutate_mutex;
 
     void insertBlock(const Block & block, ContextPtr context) override;
     void finishInsert() override {}
     size_t getSize(ContextPtr context) const override;
     RWLockImpl::LockHolder tryLockTimedWithContext(const RWLock & lock, RWLockImpl::Type type, ContextPtr context) const;
+    /// Same as tryLockTimedWithContext, but returns `nullptr` if lock is already acquired by current query.
+    static RWLockImpl::LockHolder tryLockForCurrentQueryTimedWithContext(const RWLock & lock, RWLockImpl::Type type, ContextPtr context);
 
     void convertRightBlock(Block & block) const;
 };
diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index f570f132463..deebb9e0096 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -59,6 +59,8 @@ namespace ErrorCodes
 namespace
 {
 
+constexpr std::string_view version_column_name = "_version";
+
 std::string formattedAST(const ASTPtr & ast)
 {
     if (!ast)
@@ -77,7 +79,6 @@ void verifyTableId(const StorageID & table_id)
             table_id.getDatabaseName(),
             database->getEngineName());
     }
-
 }
 
 }
@@ -86,11 +87,13 @@ class StorageKeeperMapSink : public SinkToStorage
 {
     StorageKeeperMap & storage;
     std::unordered_map<std::string, std::string> new_values;
+    std::unordered_map<std::string, int32_t> versions;
     size_t primary_key_pos;
+    ContextPtr context;
 
 public:
-    StorageKeeperMapSink(StorageKeeperMap & storage_, const StorageMetadataPtr & metadata_snapshot)
-        : SinkToStorage(metadata_snapshot->getSampleBlock()), storage(storage_)
+    StorageKeeperMapSink(StorageKeeperMap & storage_, Block header, ContextPtr context_)
+        : SinkToStorage(header), storage(storage_), context(std::move(context_))
     {
         auto primary_key = storage.getPrimaryKey();
         assert(primary_key.size() == 1);
@@ -113,18 +116,36 @@ public:
             wb_value.restart();
 
             size_t idx = 0;
+
+            int32_t version = -1;
             for (const auto & elem : block)
             {
+                if (elem.name == version_column_name)
+                {
+                    version = assert_cast<const ColumnVector<Int32> &>(*elem.column).getData()[i];
+                    continue;
+                }
+
                 elem.type->getDefaultSerialization()->serializeBinary(*elem.column, i, idx == primary_key_pos ? wb_key : wb_value, {});
                 ++idx;
             }
 
             auto key = base64Encode(wb_key.str(), /* url_encoding */ true);
+
+            if (version != -1)
+                versions[key] = version;
+
             new_values[std::move(key)] = std::move(wb_value.str());
         }
     }
 
     void onFinish() override
+    {
+        finalize<false>(/*strict*/ context->getSettingsRef().keeper_map_strict_mode);
+    }
+
+    template <bool for_update>
+    void finalize(bool strict)
     {
         auto zookeeper = storage.getClient();
 
@@ -147,21 +168,39 @@ public:
         for (const auto & [key, _] : new_values)
             key_paths.push_back(storage.fullPathForKey(key));
 
-        auto results = zookeeper->exists(key_paths);
+        zkutil::ZooKeeper::MultiExistsResponse results;
+
+        if constexpr (!for_update)
+        {
+            if (!strict)
+                results = zookeeper->exists(key_paths);
+        }
 
         Coordination::Requests requests;
         requests.reserve(key_paths.size());
         for (size_t i = 0; i < key_paths.size(); ++i)
         {
             auto key = fs::path(key_paths[i]).filename();
-            if (results[i].error == Coordination::Error::ZOK)
+
+            if constexpr (for_update)
             {
-                requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], -1));
+                int32_t version = -1;
+                if (strict)
+                    version = versions.at(key);
+
+                requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], version));
             }
             else
             {
-                requests.push_back(zkutil::makeCreateRequest(key_paths[i], new_values[key], zkutil::CreateMode::Persistent));
-                ++new_keys_num;
+                if (!strict && results[i].error == Coordination::Error::ZOK)
+                {
+                    requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], -1));
+                }
+                else
+                {
+                    requests.push_back(zkutil::makeCreateRequest(key_paths[i], new_values[key], zkutil::CreateMode::Persistent));
+                    ++new_keys_num;
+                }
             }
         }
 
@@ -193,6 +232,18 @@ class StorageKeeperMapSource : public ISource
     KeyContainerIter it;
     KeyContainerIter end;
 
+    bool with_version_column = false;
+
+    static Block getHeader(Block header, bool with_version_column)
+    {
+        if (with_version_column)
+            header.insert(
+                    {DataTypeInt32{}.createColumn(),
+                    std::make_shared<DataTypeInt32>(), std::string{version_column_name}});
+
+        return header;
+    }
+
 public:
     StorageKeeperMapSource(
         const StorageKeeperMap & storage_,
@@ -200,8 +251,10 @@ public:
         size_t max_block_size_,
         KeyContainerPtr container_,
         KeyContainerIter begin_,
-        KeyContainerIter end_)
-        : ISource(header), storage(storage_), max_block_size(max_block_size_), container(std::move(container_)), it(begin_), end(end_)
+        KeyContainerIter end_,
+        bool with_version_column_)
+        : ISource(getHeader(header, with_version_column_)), storage(storage_), max_block_size(max_block_size_), container(std::move(container_)), it(begin_), end(end_)
+        , with_version_column(with_version_column_)
     {
     }
 
@@ -225,12 +278,12 @@ public:
             for (auto & raw_key : raw_keys)
                 raw_key = base64Encode(raw_key, /* url_encoding */ true);
 
-            return storage.getBySerializedKeys(raw_keys, nullptr);
+            return storage.getBySerializedKeys(raw_keys, nullptr, with_version_column);
         }
         else
         {
             size_t elem_num = std::min(max_block_size, static_cast<size_t>(end - it));
-            auto chunk = storage.getBySerializedKeys(std::span{it, it + elem_num}, nullptr);
+            auto chunk = storage.getBySerializedKeys(std::span{it, it + elem_num}, nullptr, with_version_column);
             it += elem_num;
             return chunk;
         }
@@ -426,6 +479,16 @@ Pipe StorageKeeperMap::read(
     auto primary_key_type = sample_block.getByName(primary_key).type;
     std::tie(filtered_keys, all_scan) = getFilterKeys(primary_key, primary_key_type, query_info, context_);
 
+    bool with_version_column = false;
+    for (const auto & column : column_names)
+    {
+        if (column == version_column_name)
+        {
+            with_version_column = true;
+            break;
+        }
+    }
+
     const auto process_keys = [&]<typename KeyContainerPtr>(KeyContainerPtr keys) -> Pipe
     {
         if (keys->empty())
@@ -449,7 +512,7 @@ Pipe StorageKeeperMap::read(
 
             using KeyContainer = typename KeyContainerPtr::element_type;
             pipes.emplace_back(std::make_shared<StorageKeeperMapSource<KeyContainer>>(
-                *this, sample_block, max_block_size, keys, keys->begin() + begin, keys->begin() + end));
+                *this, sample_block, max_block_size, keys, keys->begin() + begin, keys->begin() + end, with_version_column));
         }
         return Pipe::unitePipes(std::move(pipes));
     };
@@ -461,10 +524,10 @@ Pipe StorageKeeperMap::read(
     return process_keys(std::move(filtered_keys));
 }
 
-SinkToStoragePtr StorageKeeperMap::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
+SinkToStoragePtr StorageKeeperMap::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
     checkTable<true>();
-    return std::make_shared<StorageKeeperMapSink>(*this, metadata_snapshot);
+    return std::make_shared<StorageKeeperMapSink>(*this, metadata_snapshot->getSampleBlock(), local_context);
 }
 
 void StorageKeeperMap::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
@@ -554,6 +617,12 @@ void StorageKeeperMap::drop()
     dropTable(client, metadata_drop_lock);
 }
 
+NamesAndTypesList StorageKeeperMap::getVirtuals() const
+{
+    return NamesAndTypesList{
+        {std::string{version_column_name}, std::make_shared<DataTypeInt32>()}};
+}
+
 zkutil::ZooKeeperPtr StorageKeeperMap::getClient() const
 {
     std::lock_guard lock{zookeeper_mutex};
@@ -670,13 +739,18 @@ Chunk StorageKeeperMap::getByKeys(const ColumnsWithTypeAndName & keys, PaddedPOD
     if (raw_keys.size() != keys[0].column->size())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Assertion failed: {} != {}", raw_keys.size(), keys[0].column->size());
 
-    return getBySerializedKeys(raw_keys, &null_map);
+    return getBySerializedKeys(raw_keys, &null_map, /* version_column */ false);
 }
 
-Chunk StorageKeeperMap::getBySerializedKeys(const std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map) const
+Chunk StorageKeeperMap::getBySerializedKeys(const std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map, bool with_version) const
 {
     Block sample_block = getInMemoryMetadataPtr()->getSampleBlock();
     MutableColumns columns = sample_block.cloneEmptyColumns();
+    MutableColumnPtr version_column = nullptr;
+
+    if (with_version)
+        version_column = ColumnVector<Int32>::create();
+
     size_t primary_key_pos = getPrimaryKeyPos(sample_block, getPrimaryKey());
 
     if (null_map)
@@ -706,6 +780,9 @@ Chunk StorageKeeperMap::getBySerializedKeys(const std::span<const std::string> k
         if (code == Coordination::Error::ZOK)
         {
             fillColumns(base64Decode(keys[i], true), response.data, primary_key_pos, sample_block, columns);
+
+            if (version_column)
+                version_column->insert(response.stat.version);
         }
         else if (code == Coordination::Error::ZNONODE)
         {
@@ -714,6 +791,9 @@ Chunk StorageKeeperMap::getBySerializedKeys(const std::span<const std::string> k
                 (*null_map)[i] = 0;
                 for (size_t col_idx = 0; col_idx < sample_block.columns(); ++col_idx)
                     columns[col_idx]->insert(sample_block.getByPosition(col_idx).type->getDefault());
+
+                if (version_column)
+                    version_column->insert(-1);
             }
         }
         else
@@ -723,6 +803,10 @@ Chunk StorageKeeperMap::getBySerializedKeys(const std::span<const std::string> k
     }
 
     size_t num_rows = columns.at(0)->size();
+
+    if (version_column)
+        columns.push_back(std::move(version_column));
+
     return Chunk(std::move(columns), num_rows);
 }
 
@@ -763,6 +847,8 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
     if (commands.empty())
         return;
 
+    bool strict = local_context->getSettingsRef().keeper_map_strict_mode;
+
     assert(commands.size() == 1);
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
@@ -771,21 +857,26 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
 
     if (commands.front().type == MutationCommand::Type::DELETE)
     {
+        MutationsInterpreter::Settings settings(true);
+        settings.return_all_columns = true;
+        settings.return_mutated_rows = true;
+
         auto interpreter = std::make_unique<MutationsInterpreter>(
             storage_ptr,
             metadata_snapshot,
             commands,
             local_context,
-            /*can_execute_*/ true,
-            /*return_all_columns_*/ true,
-            /*return_deleted_rows_*/ true);
+            settings);
+
         auto pipeline = QueryPipelineBuilder::getPipeline(interpreter->execute());
         PullingPipelineExecutor executor(pipeline);
 
         auto header = interpreter->getUpdatedHeader();
         auto primary_key_pos = header.getPositionByName(primary_key);
+        auto version_position = header.getPositionByName(std::string{version_column_name});
 
         auto client = getClient();
+
         Block block;
         while (executor.pull(block))
         {
@@ -793,14 +884,23 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
             auto column = column_type_name.column;
             auto size = column->size();
 
+
             WriteBufferFromOwnString wb_key;
             Coordination::Requests delete_requests;
+
             for (size_t i = 0; i < size; ++i)
             {
+                int32_t version = -1;
+                if (strict)
+                {
+                    const auto & version_column = block.getByPosition(version_position).column;
+                    version = assert_cast<const ColumnVector<Int32> &>(*version_column).getData()[i];
+                }
+
                 wb_key.restart();
 
                 column_type_name.type->getDefaultSerialization()->serializeBinary(*column, i, wb_key, {});
-                delete_requests.emplace_back(zkutil::makeRemoveRequest(fullPathForKey(base64Encode(wb_key.str(), true)), -1));
+                delete_requests.emplace_back(zkutil::makeRemoveRequest(fullPathForKey(base64Encode(wb_key.str(), true)), version));
             }
 
             Coordination::Responses responses;
@@ -827,19 +927,29 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
 
     assert(commands.front().type == MutationCommand::Type::UPDATE);
     if (commands.front().column_to_update_expression.contains(primary_key))
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Primary key cannot be updated");
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Primary key cannot be updated (cannot update column {})", primary_key);
+
+    MutationsInterpreter::Settings settings(true);
+    settings.return_all_columns = true;
+    settings.return_mutated_rows = true;
 
     auto interpreter = std::make_unique<MutationsInterpreter>(
-        storage_ptr, metadata_snapshot, commands, local_context, /*can_execute_*/ true, /*return_all_columns*/ true);
+        storage_ptr,
+        metadata_snapshot,
+        commands,
+        local_context,
+        settings);
+
     auto pipeline = QueryPipelineBuilder::getPipeline(interpreter->execute());
     PullingPipelineExecutor executor(pipeline);
 
-    auto sink = std::make_shared<StorageKeeperMapSink>(*this, metadata_snapshot);
+    auto sink = std::make_shared<StorageKeeperMapSink>(*this, executor.getHeader(), local_context);
 
     Block block;
     while (executor.pull(block))
         sink->consume(Chunk{block.getColumns(), block.rows()});
-    sink->onFinish();
+
+    sink->finalize<true>(strict);
 }
 
 namespace
diff --git a/src/Storages/StorageKeeperMap.h b/src/Storages/StorageKeeperMap.h
index a16c662e547..552e6b35fe8 100644
--- a/src/Storages/StorageKeeperMap.h
+++ b/src/Storages/StorageKeeperMap.h
@@ -7,6 +7,7 @@
 #include <Storages/IStorage.h>
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Common/PODArray_fwd.h>
+#include <Common/logger_useful.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 
 #include <span>
@@ -46,11 +47,13 @@ public:
     void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
     void drop() override;
 
+    NamesAndTypesList getVirtuals() const override;
+
     std::string getName() const override { return "KeeperMap"; }
     Names getPrimaryKey() const override { return {primary_key}; }
 
     Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & null_map, const Names &) const override;
-    Chunk getBySerializedKeys(std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map) const;
+    Chunk getBySerializedKeys(std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map, bool with_version) const;
 
     Block getSampleBlock(const Names &) const override;
 
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index 338fb54c7e5..f698f1881fa 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -27,7 +27,9 @@
 
 #include <Backups/BackupEntriesCollector.h>
 #include <Backups/BackupEntryFromAppendOnlyFile.h>
+#include <Backups/BackupEntryFromMemory.h>
 #include <Backups/BackupEntryFromSmallFile.h>
+#include <Backups/BackupEntryWrappedWith.h>
 #include <Backups/IBackup.h>
 #include <Backups/RestorerFromBackup.h>
 #include <Disks/TemporaryFileOnDisk.h>
@@ -118,7 +120,7 @@ private:
 
             if (limited_by_file_size)
             {
-                limited.emplace(*plain, file_size - offset, false);
+                limited.emplace(*plain, file_size - offset, /* trow_exception */ false, /* exact_limit */ std::optional<size_t>());
                 compressed.emplace(*limited);
             }
             else
@@ -927,6 +929,7 @@ std::optional<UInt64> StorageLog::totalBytes(const Settings &) const
 void StorageLog::backupData(BackupEntriesCollector & backup_entries_collector, const String & data_path_in_backup, const std::optional<ASTs> & /* partitions */)
 {
     auto lock_timeout = getLockTimeout(backup_entries_collector.getContext());
+
     loadMarks(lock_timeout);
 
     ReadLock lock{rwlock, lock_timeout};
@@ -941,6 +944,8 @@ void StorageLog::backupData(BackupEntriesCollector & backup_entries_collector, c
     fs::path temp_dir = temp_dir_owner->getPath();
     disk->createDirectories(temp_dir);
 
+    bool copy_encrypted = !backup_entries_collector.getBackupSettings().decrypt_files_from_encrypted_disks;
+
     /// *.bin
     for (const auto & data_file : data_files)
     {
@@ -948,10 +953,10 @@ void StorageLog::backupData(BackupEntriesCollector & backup_entries_collector, c
         String data_file_name = fileName(data_file.path);
         String hardlink_file_path = temp_dir / data_file_name;
         disk->createHardLink(data_file.path, hardlink_file_path);
-        backup_entries_collector.addBackupEntry(
-            data_path_in_backup_fs / data_file_name,
-            std::make_unique<BackupEntryFromAppendOnlyFile>(
-                disk, hardlink_file_path, file_checker.getFileSize(data_file.path), std::nullopt, temp_dir_owner));
+        BackupEntryPtr backup_entry = std::make_unique<BackupEntryFromAppendOnlyFile>(
+            disk, hardlink_file_path, copy_encrypted, file_checker.getFileSize(data_file.path));
+        backup_entry = wrapBackupEntryWith(std::move(backup_entry), temp_dir_owner);
+        backup_entries_collector.addBackupEntry(data_path_in_backup_fs / data_file_name, std::move(backup_entry));
     }
 
     /// __marks.mrk
@@ -961,16 +966,16 @@ void StorageLog::backupData(BackupEntriesCollector & backup_entries_collector, c
         String marks_file_name = fileName(marks_file_path);
         String hardlink_file_path = temp_dir / marks_file_name;
         disk->createHardLink(marks_file_path, hardlink_file_path);
-        backup_entries_collector.addBackupEntry(
-            data_path_in_backup_fs / marks_file_name,
-            std::make_unique<BackupEntryFromAppendOnlyFile>(
-                disk, hardlink_file_path, file_checker.getFileSize(marks_file_path), std::nullopt, temp_dir_owner));
+        BackupEntryPtr backup_entry = std::make_unique<BackupEntryFromAppendOnlyFile>(
+            disk, hardlink_file_path, copy_encrypted, file_checker.getFileSize(marks_file_path));
+        backup_entry = wrapBackupEntryWith(std::move(backup_entry), temp_dir_owner);
+        backup_entries_collector.addBackupEntry(data_path_in_backup_fs / marks_file_name, std::move(backup_entry));
     }
 
     /// sizes.json
     String files_info_path = file_checker.getPath();
     backup_entries_collector.addBackupEntry(
-        data_path_in_backup_fs / fileName(files_info_path), std::make_unique<BackupEntryFromSmallFile>(disk, files_info_path));
+        data_path_in_backup_fs / fileName(files_info_path), std::make_unique<BackupEntryFromSmallFile>(disk, files_info_path, copy_encrypted));
 
     /// columns.txt
     backup_entries_collector.addBackupEntry(
@@ -1027,11 +1032,7 @@ void StorageLog::restoreDataImpl(const BackupPtr & backup, const String & data_p
             if (!backup->fileExists(file_path_in_backup))
                 throw Exception(ErrorCodes::CANNOT_RESTORE_TABLE, "File {} in backup is required to restore table", file_path_in_backup);
 
-            auto backup_entry = backup->readFile(file_path_in_backup);
-            auto in = backup_entry->getReadBuffer();
-            auto out = disk->writeFile(data_file.path, max_compress_block_size, WriteMode::Append);
-            copyData(*in, *out);
-            out->finalize();
+            backup->copyFileToDisk(file_path_in_backup, disk, data_file.path, WriteMode::Append);
         }
 
         if (use_marks_file)
@@ -1062,8 +1063,7 @@ void StorageLog::restoreDataImpl(const BackupPtr & backup, const String & data_p
                 old_num_rows[i] = num_marks ? data_files[i].marks[num_marks - 1].rows : 0;
             }
 
-            auto backup_entry = backup->readFile(file_path_in_backup);
-            auto marks_rb = backup_entry->getReadBuffer();
+            auto marks_rb = backup->readFile(file_path_in_backup);
 
             for (size_t i = 0; i != num_extra_marks; ++i)
             {
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index ae3fa62b38c..b96c132d601 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -212,13 +212,26 @@ void StorageMaterializedView::drop()
     if (!select_query.select_table_id.empty())
         DatabaseCatalog::instance().removeViewDependency(select_query.select_table_id, table_id);
 
-    dropInnerTableIfAny(true, getContext());
+    /// Sync flag and the setting make sense for Atomic databases only.
+    /// However, with Atomic databases, IStorage::drop() can be called only from a background task in DatabaseCatalog.
+    /// Running synchronous DROP from that task leads to deadlock.
+    /// Usually dropInnerTableIfAny is no-op, because the inner table is dropped before enqueueing a drop task for the MV itself.
+    /// But there's a race condition with SYSTEM RESTART REPLICA: the inner table might be detached due to RESTART.
+    /// In this case, dropInnerTableIfAny will not find the inner table and will not drop it during executions of DROP query for the MV itself.
+    /// DDLGuard does not protect from that, because RESTART REPLICA acquires DDLGuard for the inner table name,
+    /// but DROP acquires DDLGuard for the name of MV. And we cannot acquire second DDLGuard for the inner name in DROP,
+    /// because it may lead to lock-order-inversion (DDLGuards must be acquired in lexicographical order).
+    dropInnerTableIfAny(/* sync */ false, getContext());
 }
 
 void StorageMaterializedView::dropInnerTableIfAny(bool sync, ContextPtr local_context)
 {
+    /// We will use `sync` argument wneh this function is called from a DROP query
+    /// and will ignore database_atomic_wait_for_drop_and_detach_synchronously when it's called from drop task.
+    /// See the comment in StorageMaterializedView::drop
     if (has_inner_table && tryGetTargetTable())
-        InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), local_context, target_table_id, sync);
+        InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), local_context, target_table_id,
+                                               sync, /* ignore_sync_setting */ true);
 }
 
 void StorageMaterializedView::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr local_context, TableExclusiveLockHolder &)
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index 881cbc18b10..caeefa5d96d 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -9,14 +9,13 @@
 #include <Storages/StorageMemory.h>
 #include <Storages/MemorySettings.h>
 #include <DataTypes/ObjectUtils.h>
-#include <Columns/ColumnObject.h>
 
 #include <IO/WriteHelpers.h>
-#include <Processors/ISource.h>
 #include <QueryPipeline/Pipe.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/QueryPlan/ReadFromMemoryStorageStep.h>
 #include <Parsers/ASTCreateQuery.h>
 
 #include <Common/FileChecker.h>
@@ -24,7 +23,8 @@
 #include <Compression/CompressedReadBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Backups/BackupEntriesCollector.h>
-#include <Backups/BackupEntryFromImmutableFile.h>
+#include <Backups/BackupEntryFromAppendOnlyFile.h>
+#include <Backups/BackupEntryFromMemory.h>
 #include <Backups/BackupEntryFromSmallFile.h>
 #include <Backups/IBackup.h>
 #include <Backups/IBackupEntriesLazyBatch.h>
@@ -43,85 +43,6 @@ namespace ErrorCodes
     extern const int CANNOT_RESTORE_TABLE;
 }
 
-
-class MemorySource : public ISource
-{
-    using InitializerFunc = std::function<void(std::shared_ptr<const Blocks> &)>;
-public:
-
-    MemorySource(
-        Names column_names_,
-        const StorageSnapshotPtr & storage_snapshot,
-        std::shared_ptr<const Blocks> data_,
-        std::shared_ptr<std::atomic<size_t>> parallel_execution_index_,
-        InitializerFunc initializer_func_ = {})
-        : ISource(storage_snapshot->getSampleBlockForColumns(column_names_))
-        , column_names_and_types(storage_snapshot->getColumnsByNames(
-            GetColumnsOptions(GetColumnsOptions::All).withSubcolumns().withExtendedObjects(), column_names_))
-        , data(data_)
-        , parallel_execution_index(parallel_execution_index_)
-        , initializer_func(std::move(initializer_func_))
-    {
-    }
-
-    String getName() const override { return "Memory"; }
-
-protected:
-    Chunk generate() override
-    {
-        if (initializer_func)
-        {
-            initializer_func(data);
-            initializer_func = {};
-        }
-
-        size_t current_index = getAndIncrementExecutionIndex();
-
-        if (!data || current_index >= data->size())
-        {
-            return {};
-        }
-
-        const Block & src = (*data)[current_index];
-
-        Columns columns;
-        size_t num_columns = column_names_and_types.size();
-        columns.reserve(num_columns);
-
-        auto name_and_type = column_names_and_types.begin();
-        for (size_t i = 0; i < num_columns; ++i)
-        {
-            columns.emplace_back(tryGetColumnFromBlock(src, *name_and_type));
-            ++name_and_type;
-        }
-
-        fillMissingColumns(columns, src.rows(), column_names_and_types, column_names_and_types, {}, nullptr);
-        assert(std::all_of(columns.begin(), columns.end(), [](const auto & column) { return column != nullptr; }));
-
-        return Chunk(std::move(columns), src.rows());
-    }
-
-private:
-    size_t getAndIncrementExecutionIndex()
-    {
-        if (parallel_execution_index)
-        {
-            return (*parallel_execution_index)++;
-        }
-        else
-        {
-            return execution_index++;
-        }
-    }
-
-    const NamesAndTypesList column_names_and_types;
-    size_t execution_index = 0;
-    std::shared_ptr<const Blocks> data;
-    std::shared_ptr<std::atomic<size_t>> parallel_execution_index;
-    InitializerFunc initializer_func;
-};
-
-
 class MemorySink : public SinkToStorage
 {
 public:
@@ -221,10 +142,11 @@ StorageSnapshotPtr StorageMemory::getStorageSnapshot(const StorageMetadataPtr &
         metadata_snapshot->getColumns(),
         [](const auto & block) -> const auto & { return block.getColumnsWithTypeAndName(); });
 
-    return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, object_columns, std::move(snapshot_data));
+    return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, std::move(object_columns), std::move(snapshot_data));
 }
 
-Pipe StorageMemory::read(
+void StorageMemory::read(
+    QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
     SelectQueryInfo & /*query_info*/,
@@ -233,47 +155,7 @@ Pipe StorageMemory::read(
     size_t /*max_block_size*/,
     size_t num_streams)
 {
-    storage_snapshot->check(column_names);
-
-    const auto & snapshot_data = assert_cast<const SnapshotData &>(*storage_snapshot->data);
-    auto current_data = snapshot_data.blocks;
-
-    if (delay_read_for_global_subqueries)
-    {
-        /// Note: for global subquery we use single source.
-        /// Mainly, the reason is that at this point table is empty,
-        /// and we don't know the number of blocks are going to be inserted into it.
-        ///
-        /// It may seem to be not optimal, but actually data from such table is used to fill
-        /// set for IN or hash table for JOIN, which can't be done concurrently.
-        /// Since no other manipulation with data is done, multiple sources shouldn't give any profit.
-
-        return Pipe(std::make_shared<MemorySource>(
-            column_names,
-            storage_snapshot,
-            nullptr /* data */,
-            nullptr /* parallel execution index */,
-            [current_data](std::shared_ptr<const Blocks> & data_to_initialize)
-            {
-                data_to_initialize = current_data;
-            }));
-    }
-
-    size_t size = current_data->size();
-
-    if (num_streams > size)
-        num_streams = size;
-
-    Pipes pipes;
-
-    auto parallel_execution_index = std::make_shared<std::atomic<size_t>>(0);
-
-    for (size_t stream = 0; stream < num_streams; ++stream)
-    {
-        pipes.emplace_back(std::make_shared<MemorySource>(column_names, storage_snapshot, current_data, parallel_execution_index));
-    }
-
-    return Pipe::unitePipes(std::move(pipes));
+    query_plan.addStep(std::make_unique<ReadFromMemoryStorageStep>(column_names, storage_snapshot, num_streams, delay_read_for_global_subqueries));
 }
 
 
@@ -318,7 +200,8 @@ void StorageMemory::mutate(const MutationCommands & commands, ContextPtr context
     new_context->setSetting("max_streams_to_max_threads_ratio", 1);
     new_context->setSetting("max_threads", 1);
 
-    auto interpreter = std::make_unique<MutationsInterpreter>(storage_ptr, metadata_snapshot, commands, new_context, true);
+    MutationsInterpreter::Settings settings(true);
+    auto interpreter = std::make_unique<MutationsInterpreter>(storage_ptr, metadata_snapshot, commands, new_context, settings);
     auto pipeline = QueryPipelineBuilder::getPipeline(interpreter->execute());
     PullingPipelineExecutor executor(pipeline);
 
@@ -388,12 +271,14 @@ namespace
     {
     public:
         MemoryBackup(
+            ContextPtr context_,
             const StorageMetadataPtr & metadata_snapshot_,
             const std::shared_ptr<const Blocks> blocks_,
             const String & data_path_in_backup,
             const DiskPtr & temp_disk_,
             UInt64 max_compress_block_size_)
-            : metadata_snapshot(metadata_snapshot_)
+            : context(context_)
+            , metadata_snapshot(metadata_snapshot_)
             , blocks(blocks_)
             , temp_disk(temp_disk_)
             , max_compress_block_size(max_compress_block_size_)
@@ -436,20 +321,28 @@ namespace
             {
                 auto data_file_path = temp_dir / fs::path{file_paths[data_bin_pos]}.filename();
                 auto data_out_compressed = temp_disk->writeFile(data_file_path);
-                CompressedWriteBuffer data_out{*data_out_compressed, CompressionCodecFactory::instance().getDefaultCodec(), max_compress_block_size};
-                NativeWriter block_out{data_out, 0, metadata_snapshot->getSampleBlock(), false, &index};
+                auto data_out = std::make_unique<CompressedWriteBuffer>(*data_out_compressed, CompressionCodecFactory::instance().getDefaultCodec(), max_compress_block_size);
+                NativeWriter block_out{*data_out, 0, metadata_snapshot->getSampleBlock(), false, &index};
                 for (const auto & block : *blocks)
                     block_out.write(block);
-                backup_entries[data_bin_pos] = {file_paths[data_bin_pos], std::make_shared<BackupEntryFromImmutableFile>(temp_disk, data_file_path)};
+                data_out->finalize();
+                data_out.reset();
+                data_out_compressed->finalize();
+                data_out_compressed.reset();
+                backup_entries[data_bin_pos] = {file_paths[data_bin_pos], std::make_shared<BackupEntryFromAppendOnlyFile>(temp_disk, data_file_path)};
             }
 
             /// Writing index.mrk
             {
                 auto index_mrk_path = temp_dir / fs::path{file_paths[index_mrk_pos]}.filename();
                 auto index_mrk_out_compressed = temp_disk->writeFile(index_mrk_path);
-                CompressedWriteBuffer index_mrk_out{*index_mrk_out_compressed};
-                index.write(index_mrk_out);
-                backup_entries[index_mrk_pos] = {file_paths[index_mrk_pos], std::make_shared<BackupEntryFromImmutableFile>(temp_disk, index_mrk_path)};
+                auto index_mrk_out = std::make_unique<CompressedWriteBuffer>(*index_mrk_out_compressed);
+                index.write(*index_mrk_out);
+                index_mrk_out->finalize();
+                index_mrk_out.reset();
+                index_mrk_out_compressed->finalize();
+                index_mrk_out_compressed.reset();
+                backup_entries[index_mrk_pos] = {file_paths[index_mrk_pos], std::make_shared<BackupEntryFromAppendOnlyFile>(temp_disk, index_mrk_path)};
             }
 
             /// Writing columns.txt
@@ -487,6 +380,7 @@ namespace
             return backup_entries;
         }
 
+        ContextPtr context;
         StorageMetadataPtr metadata_snapshot;
         std::shared_ptr<const Blocks> blocks;
         DiskPtr temp_disk;
@@ -499,11 +393,15 @@ namespace
 
 void StorageMemory::backupData(BackupEntriesCollector & backup_entries_collector, const String & data_path_in_backup, const std::optional<ASTs> & /* partitions */)
 {
-    auto temp_disk = backup_entries_collector.getContext()->getTemporaryVolume()->getDisk(0);
+    auto temp_disk = backup_entries_collector.getContext()->getGlobalTemporaryVolume()->getDisk(0);
     auto max_compress_block_size = backup_entries_collector.getContext()->getSettingsRef().max_compress_block_size;
-    backup_entries_collector.addBackupEntries(
-        std::make_shared<MemoryBackup>(getInMemoryMetadataPtr(), data.get(), data_path_in_backup, temp_disk, max_compress_block_size)
-            ->getBackupEntries());
+    backup_entries_collector.addBackupEntries(std::make_shared<MemoryBackup>(
+        backup_entries_collector.getContext(),
+        getInMemoryMetadataPtr(),
+        data.get(),
+        data_path_in_backup,
+        temp_disk,
+        max_compress_block_size)->getBackupEntries());
 }
 
 void StorageMemory::restoreDataFromBackup(RestorerFromBackup & restorer, const String & data_path_in_backup, const std::optional<ASTs> & /* partitions */)
@@ -515,7 +413,7 @@ void StorageMemory::restoreDataFromBackup(RestorerFromBackup & restorer, const S
     if (!restorer.isNonEmptyTableAllowed() && total_size_bytes)
         RestorerFromBackup::throwTableIsNotEmpty(getStorageID());
 
-    auto temp_disk = restorer.getContext()->getTemporaryVolume()->getDisk(0);
+    auto temp_disk = restorer.getContext()->getGlobalTemporaryVolume()->getDisk(0);
 
     restorer.addDataRestoreTask(
         [storage = std::static_pointer_cast<StorageMemory>(shared_from_this()), backup, data_path_in_backup, temp_disk]
@@ -535,8 +433,7 @@ void StorageMemory::restoreDataImpl(const BackupPtr & backup, const String & dat
         if (!backup->fileExists(index_file_path))
             throw Exception(ErrorCodes::CANNOT_RESTORE_TABLE, "File {} in backup is required to restore table", index_file_path);
 
-        auto backup_entry = backup->readFile(index_file_path);
-        auto in = backup_entry->getReadBuffer();
+        auto in = backup->readFile(index_file_path);
         CompressedReadBuffer compressed_in{*in};
         index.read(compressed_in);
     }
@@ -550,8 +447,7 @@ void StorageMemory::restoreDataImpl(const BackupPtr & backup, const String & dat
         if (!backup->fileExists(data_file_path))
             throw Exception(ErrorCodes::CANNOT_RESTORE_TABLE, "File {} in backup is required to restore table", data_file_path);
 
-        auto backup_entry = backup->readFile(data_file_path);
-        std::unique_ptr<ReadBuffer> in = backup_entry->getReadBuffer();
+        auto in = backup->readFile(data_file_path);
         std::optional<TemporaryFileOnDisk> temp_data_file;
         if (!dynamic_cast<ReadBufferFromFileBase *>(in.get()))
         {
diff --git a/src/Storages/StorageMemory.h b/src/Storages/StorageMemory.h
index c739088dbe4..ce8a59b8bcd 100644
--- a/src/Storages/StorageMemory.h
+++ b/src/Storages/StorageMemory.h
@@ -5,6 +5,7 @@
 #include <mutex>
 
 #include <Core/NamesAndTypes.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Storages/IStorage.h>
 
 #include <Common/MultiVersion.h>
@@ -44,7 +45,8 @@ public:
 
     StorageSnapshotPtr getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const override;
 
-    Pipe read(
+    void read(
+        QueryPlan & query_plan,
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         SelectQueryInfo & query_info,
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 0ca29e2826a..b0ed242d14d 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -384,7 +384,7 @@ ReadFromMerge::ReadFromMerge(
     const SelectQueryInfo & query_info_,
     ContextMutablePtr context_,
     QueryProcessingStage::Enum processed_stage)
-    : ISourceStep(DataStream{.header = common_header_})
+    : SourceStepWithFilter(DataStream{.header = common_header_})
     , required_max_block_size(max_block_size)
     , requested_num_streams(num_streams)
     , common_header(std::move(common_header_))
@@ -448,7 +448,7 @@ void ReadFromMerge::initializePipeline(QueryPipelineBuilder & pipeline, const Bu
         size_t current_need_streams = tables_count >= num_streams ? 1 : (num_streams / tables_count);
         size_t current_streams = std::min(current_need_streams, remaining_streams);
         remaining_streams -= current_streams;
-        current_streams = std::max(static_cast<size_t>(1), current_streams);
+        current_streams = std::max(1uz, current_streams);
 
         const auto & storage = std::get<1>(table);
 
@@ -633,10 +633,7 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
     auto & modified_select = modified_query_info.query->as<ASTSelectQuery &>();
 
     QueryPipelineBuilderPtr builder;
-
-    bool final = isFinal(modified_query_info);
-
-    if (!final && storage->needRewriteQueryWithFinal(real_column_names))
+    if (!InterpreterSelectQuery::isQueryWithFinal(modified_query_info) && storage->needRewriteQueryWithFinal(real_column_names))
     {
         /// NOTE: It may not work correctly in some cases, because query was analyzed without final.
         /// However, it's needed for MaterializedMySQL and it's unlikely that someone will use it with Merge tables.
@@ -649,13 +646,14 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
         QueryProcessingStage::Complete,
         storage_snapshot,
         modified_query_info);
+
     if (processed_stage <= storage_stage || (allow_experimental_analyzer && processed_stage == QueryProcessingStage::FetchColumns))
     {
         /// If there are only virtual columns in query, you must request at least one other column.
         if (real_column_names.empty())
             real_column_names.push_back(ExpressionActions::getSmallestColumn(storage_snapshot->metadata->getColumns().getAllPhysical()).name);
 
-        QueryPlan plan;
+        QueryPlan & plan = child_plans.emplace_back();
 
         StorageView * view = dynamic_cast<StorageView *>(storage.get());
         if (!view || allow_experimental_analyzer)
@@ -691,7 +689,11 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
             return {};
 
         if (auto * read_from_merge_tree = typeid_cast<ReadFromMergeTree *>(plan.getRootNode()->step.get()))
-            read_from_merge_tree->addFilterNodes(added_filter_nodes);
+        {
+            size_t filters_dags_size = filter_dags.size();
+            for (size_t i = 0; i < filters_dags_size; ++i)
+                read_from_merge_tree->addFilter(filter_dags[i], filter_nodes.nodes[i]);
+        }
 
         builder = plan.buildQueryPipeline(
             QueryPlanOptimizationSettings::fromContext(modified_context),
@@ -703,12 +705,15 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
         modified_context->setSetting("max_threads", streams_num);
         modified_context->setSetting("max_streams_to_max_threads_ratio", 1);
 
+        QueryPlan & plan = child_plans.emplace_back();
+
         if (allow_experimental_analyzer)
         {
             InterpreterSelectQueryAnalyzer interpreter(modified_query_info.query_tree,
                 modified_context,
                 SelectQueryOptions(processed_stage).ignoreProjections());
             builder = std::make_unique<QueryPipelineBuilder>(interpreter.buildQueryPipeline());
+            plan = std::move(interpreter.getPlanner()).extractQueryPlan();
         }
         else
         {
@@ -717,7 +722,7 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
             InterpreterSelectQuery interpreter{modified_query_info.query,
                 modified_context,
                 SelectQueryOptions(processed_stage).ignoreProjections()};
-            builder = std::make_unique<QueryPipelineBuilder>(interpreter.buildQueryPipeline());
+            builder = std::make_unique<QueryPipelineBuilder>(interpreter.buildQueryPipeline(plan));
         }
 
         /** Materialization is needed, since from distributed storage the constants come materialized.
@@ -915,7 +920,7 @@ StorageMerge::DatabaseTablesIterators StorageMerge::getDatabaseIterators(Context
 
 void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
-    auto name_deps = getDependentViewsByColumn(local_context);
+    std::optional<NameDependencies> name_deps{};
     for (const auto & command : commands)
     {
         if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
@@ -926,7 +931,9 @@ void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, ContextP
 
         if (command.type == AlterCommand::Type::DROP_COLUMN && !command.clear)
         {
-            const auto & deps_mv = name_deps[command.column_name];
+            if (!name_deps)
+                name_deps = getDependentViewsByColumn(local_context);
+            const auto & deps_mv = name_deps.value()[command.column_name];
             if (!deps_mv.empty())
             {
                 throw Exception(ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN,
@@ -1000,21 +1007,13 @@ bool ReadFromMerge::requestReadingInOrder(InputOrderInfoPtr order_info_)
 {
     /// Disable read-in-order optimization for reverse order with final.
     /// Otherwise, it can lead to incorrect final behavior because the implementation may rely on the reading in direct order).
-    if (order_info_->direction != 1 && isFinal(query_info))
+    if (order_info_->direction != 1 && InterpreterSelectQuery::isQueryWithFinal(query_info))
         return false;
 
     order_info = order_info_;
     return true;
 }
 
-bool ReadFromMerge::isFinal(const SelectQueryInfo & query_info)
-{
-    if (query_info.table_expression_modifiers)
-        return query_info.table_expression_modifiers->hasFinal();
-    const auto & select_query = query_info.query->as<ASTSelectQuery &>();
-    return select_query.final();
-}
-
 IStorage::ColumnSizeByName StorageMerge::getColumnSizes() const
 {
     ColumnSizeByName column_sizes;
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index 03c1719dfef..babf0dd92e8 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -3,7 +3,7 @@
 #include <Common/OptimizedRegularExpression.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/IStorage.h>
-#include <Processors/QueryPlan/ISourceStep.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
 
 
 namespace DB
@@ -115,7 +115,7 @@ private:
     friend class ReadFromMerge;
 };
 
-class ReadFromMerge final : public ISourceStep
+class ReadFromMerge final : public SourceStepWithFilter
 {
 public:
     static constexpr auto name = "ReadFromMerge";
@@ -141,17 +141,10 @@ public:
 
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
-    void addFilter(ActionsDAGPtr expression, std::string column_name)
-    {
-        added_filter_dags.push_back(expression);
-        added_filter_nodes.nodes.push_back(&expression->findInOutputs(column_name));
-    }
-
     const StorageListWithLocks & getSelectedTables() const { return selected_tables; }
 
     /// Returns `false` if requested reading cannot be performed.
     bool requestReadingInOrder(InputOrderInfoPtr order_info_);
-    static bool isFinal(const SelectQueryInfo & query_info);
 
 private:
     const size_t required_max_block_size;
@@ -165,15 +158,14 @@ private:
     StoragePtr storage_merge;
     StorageSnapshotPtr merge_storage_snapshot;
 
+    /// Store read plan for each child table.
+    /// It's needed to guarantee lifetime for child steps to be the same as for this step (mainly for EXPLAIN PIPELINE).
+    std::vector<QueryPlan> child_plans;
+
     SelectQueryInfo query_info;
     ContextMutablePtr context;
     QueryProcessingStage::Enum common_processed_stage;
 
-    std::vector<ActionsDAGPtr> added_filter_dags;
-    ActionDAGNodes added_filter_nodes;
-
-    std::string added_filter_column_name;
-
     InputOrderInfoPtr order_info;
 
     struct AliasData
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index aadd7b8c20a..a721dd30cd7 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -3,10 +3,12 @@
 #include "Storages/MergeTree/IMergeTreeDataPart.h"
 
 #include <optional>
+#include <ranges>
 
 #include <base/sort.h>
 #include <Backups/BackupEntriesCollector.h>
 #include <Databases/IDatabase.h>
+#include <Common/MemoryTracker.h>
 #include <Common/escapeForFileName.h>
 #include <Common/ProfileEventsScope.h>
 #include <Common/typeid_cast.h>
@@ -18,6 +20,7 @@
 #include <Interpreters/TransactionLog.h>
 #include <Interpreters/ClusterProxy/executeQuery.h>
 #include <Interpreters/ClusterProxy/SelectStreamFactory.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <IO/copyData.h>
 #include <Parsers/ASTCheckQuery.h>
 #include <Parsers/ASTFunction.h>
@@ -40,6 +43,7 @@
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <fmt/core.h>
 
 namespace DB
 {
@@ -166,14 +170,6 @@ void StorageMergeTree::startup()
     }
 }
 
-void StorageMergeTree::flush()
-{
-    if (flush_called.exchange(true))
-        return;
-
-    flushAllInMemoryPartsIfNeeded();
-}
-
 void StorageMergeTree::shutdown()
 {
     if (shutdown_called.exchange(true))
@@ -213,7 +209,7 @@ void StorageMergeTree::read(
     size_t max_block_size,
     size_t num_streams)
 {
-    if (local_context->canUseParallelReplicasOnInitiator())
+    if (local_context->canUseParallelReplicasOnInitiator() && local_context->getSettingsRef().parallel_replicas_for_non_replicated_merge_tree)
     {
         auto table_id = getStorageID();
 
@@ -223,8 +219,12 @@ void StorageMergeTree::read(
 
         auto cluster = local_context->getCluster(local_context->getSettingsRef().cluster_for_parallel_replicas);
 
-        Block header =
-            InterpreterSelectQuery(modified_query_ast, local_context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
+        Block header;
+
+        if (local_context->getSettingsRef().allow_experimental_analyzer)
+            header = InterpreterSelectQueryAnalyzer::getSampleBlock(modified_query_ast, local_context, SelectQueryOptions(processed_stage).analyze());
+        else
+            header = InterpreterSelectQuery(modified_query_ast, local_context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
 
         ClusterProxy::SelectStreamFactory select_stream_factory =
             ClusterProxy::SelectStreamFactory(
@@ -240,10 +240,12 @@ void StorageMergeTree::read(
     }
     else
     {
+        const bool enable_parallel_reading = local_context->canUseParallelReplicasOnFollower() && local_context->getSettingsRef().parallel_replicas_for_non_replicated_merge_tree;
+
         if (auto plan = reader.read(
             column_names, storage_snapshot, query_info,
             local_context, max_block_size, num_streams,
-            processed_stage, nullptr, /*enable_parallel_reading*/local_context->canUseParallelReplicasOnFollower()))
+            processed_stage, nullptr, enable_parallel_reading))
             query_plan = std::move(*plan);
     }
 
@@ -252,6 +254,7 @@ void StorageMergeTree::read(
     /// reset them to avoid holding them.
     auto & snapshot_data = assert_cast<MergeTreeData::SnapshotData &>(*storage_snapshot->data);
     snapshot_data.parts = {};
+    snapshot_data.alter_conversions = {};
 }
 
 std::optional<UInt64> StorageMergeTree::totalRows(const Settings &) const
@@ -306,7 +309,11 @@ void StorageMergeTree::alter(
 
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
+
     auto maybe_mutation_commands = commands.getMutationCommands(new_metadata, local_context->getSettingsRef().materialize_ttl_after_modify, local_context);
+    if (!maybe_mutation_commands.empty())
+        delayMutationOrThrowIfNeeded(nullptr, local_context);
+
     Int64 mutation_version = -1;
     commands.apply(new_metadata, local_context);
 
@@ -314,16 +321,33 @@ void StorageMergeTree::alter(
     if (commands.isSettingsAlter())
     {
         changeSettings(new_metadata.settings_changes, table_lock_holder);
-
         DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     }
     else
     {
+        if (!maybe_mutation_commands.empty() && maybe_mutation_commands.containBarrierCommand())
+        {
+            int64_t prev_mutation = 0;
+            {
+                std::lock_guard lock(currently_processing_in_background_mutex);
+                auto it = current_mutations_by_version.rbegin();
+                if (it != current_mutations_by_version.rend())
+                    prev_mutation = it->first;
+            }
+
+            if (prev_mutation != 0)
+            {
+                LOG_DEBUG(log, "Cannot change metadata with barrier alter query, will wait for mutation {}", prev_mutation);
+                waitForMutation(prev_mutation, /* from_another_mutation */ true);
+                LOG_DEBUG(log, "Mutation {} finished", prev_mutation);
+            }
+        }
+
         {
             changeSettings(new_metadata.settings_changes, table_lock_holder);
             checkTTLExpressions(new_metadata, old_metadata);
             /// Reinitialize primary key because primary key column types might have changed.
-            setProperties(new_metadata, old_metadata);
+            setProperties(new_metadata, old_metadata, false, local_context);
 
             DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
 
@@ -510,27 +534,27 @@ void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPartPtr re
     mutation_wait_event.notify_all();
 }
 
-void StorageMergeTree::waitForMutation(Int64 version)
+void StorageMergeTree::waitForMutation(Int64 version, bool wait_for_another_mutation)
 {
     String mutation_id = MergeTreeMutationEntry::versionToFileName(version);
-    waitForMutation(version, mutation_id);
+    waitForMutation(version, mutation_id, wait_for_another_mutation);
 }
 
-void StorageMergeTree::waitForMutation(const String & mutation_id)
+void StorageMergeTree::waitForMutation(const String & mutation_id, bool wait_for_another_mutation)
 {
     Int64 version = MergeTreeMutationEntry::parseFileName(mutation_id);
-    waitForMutation(version, mutation_id);
+    waitForMutation(version, mutation_id, wait_for_another_mutation);
 }
 
-void StorageMergeTree::waitForMutation(Int64 version, const String & mutation_id)
+void StorageMergeTree::waitForMutation(Int64 version, const String & mutation_id, bool wait_for_another_mutation)
 {
     LOG_INFO(log, "Waiting mutation: {}", mutation_id);
     {
-        auto check = [version, this]()
+        auto check = [version, wait_for_another_mutation, this]()
         {
             if (shutdown_called)
                 return true;
-            auto mutation_status = getIncompleteMutationsStatus(version);
+            auto mutation_status = getIncompleteMutationsStatus(version, nullptr, wait_for_another_mutation);
             return !mutation_status || mutation_status->is_done || !mutation_status->latest_fail_reason.empty();
         };
 
@@ -542,7 +566,7 @@ void StorageMergeTree::waitForMutation(Int64 version, const String & mutation_id
     std::set<String> mutation_ids;
     mutation_ids.insert(mutation_id);
 
-    auto mutation_status = getIncompleteMutationsStatus(version, &mutation_ids);
+    auto mutation_status = getIncompleteMutationsStatus(version, &mutation_ids, wait_for_another_mutation);
     checkMutationStatus(mutation_status, mutation_ids);
 
     LOG_INFO(log, "Mutation {} done", mutation_id);
@@ -562,11 +586,12 @@ void StorageMergeTree::setMutationCSN(const String & mutation_id, CSN csn)
 
 void StorageMergeTree::mutate(const MutationCommands & commands, ContextPtr query_context)
 {
+    delayMutationOrThrowIfNeeded(nullptr, query_context);
+
     /// Validate partition IDs (if any) before starting mutation
     getPartitionIdsAffectedByCommands(commands, query_context);
 
     Int64 version = startMutation(commands, query_context);
-
     if (query_context->getSettingsRef().mutations_sync > 0 || query_context->getCurrentTransaction())
         waitForMutation(version);
 }
@@ -592,10 +617,16 @@ bool comparator(const PartVersionWithName & f, const PartVersionWithName & s)
 
 }
 
-std::optional<MergeTreeMutationStatus> StorageMergeTree::getIncompleteMutationsStatus(Int64 mutation_version, std::set<String> * mutation_ids) const
+std::optional<MergeTreeMutationStatus> StorageMergeTree::getIncompleteMutationsStatus(
+    Int64 mutation_version, std::set<String> * mutation_ids, bool from_another_mutation) const
 {
-    std::lock_guard lock(currently_processing_in_background_mutex);
+    std::unique_lock lock(currently_processing_in_background_mutex);
+    return getIncompleteMutationsStatusUnlocked(mutation_version, lock, mutation_ids, from_another_mutation);
+}
 
+std::optional<MergeTreeMutationStatus> StorageMergeTree::getIncompleteMutationsStatusUnlocked(
+    Int64 mutation_version, std::unique_lock<std::mutex> & /*lock*/, std::set<String> * mutation_ids, bool from_another_mutation) const
+{
     auto current_mutation_it = current_mutations_by_version.find(mutation_version);
     /// Killed
     if (current_mutation_it == current_mutations_by_version.end())
@@ -606,7 +637,9 @@ std::optional<MergeTreeMutationStatus> StorageMergeTree::getIncompleteMutationsS
     const auto & mutation_entry = current_mutation_it->second;
 
     auto txn = tryGetTransactionForMutation(mutation_entry, log);
-    assert(txn || mutation_entry.tid.isPrehistoric());
+    /// There's no way a transaction may finish before a mutation that was started by the transaction.
+    /// But sometimes we need to check status of an unrelated mutation, in this case we don't care about transactions.
+    assert(txn || mutation_entry.tid.isPrehistoric() || from_another_mutation);
     auto data_parts = getVisibleDataPartsVector(txn);
     for (const auto & data_part : data_parts)
     {
@@ -631,7 +664,7 @@ std::optional<MergeTreeMutationStatus> StorageMergeTree::getIncompleteMutationsS
                             mutation_ids->insert(it->second.file_name);
                 }
             }
-            else if (txn)
+            else if (txn && !from_another_mutation)
             {
                 /// Part is locked by concurrent transaction, most likely it will never be mutated
                 TIDHash part_locked = data_part->version.removal_tid_lock.load();
@@ -893,7 +926,14 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
 
     SelectPartsDecision select_decision = SelectPartsDecision::CANNOT_SELECT;
 
-    if (partition_id.empty())
+    if (!canEnqueueBackgroundTask())
+    {
+        if (out_disable_reason)
+            *out_disable_reason = fmt::format("Current background tasks memory usage ({}) is more than the limit ({})",
+                formatReadableSizeWithBinarySuffix(background_memory_tracker.get()),
+                formatReadableSizeWithBinarySuffix(background_memory_tracker.getSoftLimit()));
+    }
+    else if (partition_id.empty())
     {
         UInt64 max_source_parts_size = merger_mutator.getMaxSourcePartsSizeForMerge();
         bool merge_with_ttl_allowed = getTotalMergesWithTTLInMergeList() < data_settings->max_number_of_merges_with_ttl_in_pool;
@@ -1125,8 +1165,9 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMutate(
                     auto fake_query_context = Context::createCopy(getContext());
                     fake_query_context->makeQueryContext();
                     fake_query_context->setCurrentQueryId("");
+                    MutationsInterpreter::Settings settings(false);
                     MutationsInterpreter interpreter(
-                        shared_from_this(), metadata_snapshot, commands_for_size_validation, fake_query_context, false);
+                        shared_from_this(), metadata_snapshot, commands_for_size_validation, fake_query_context, settings);
                     commands_size += interpreter.evaluateCommandsSize();
                 }
                 catch (...)
@@ -1143,9 +1184,24 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMutate(
             if (current_ast_elements + commands_size >= max_ast_elements)
                 break;
 
-            current_ast_elements += commands_size;
-            commands->insert(commands->end(), it->second.commands.begin(), it->second.commands.end());
-            last_mutation_to_apply = it;
+            const auto & single_mutation_commands = it->second.commands;
+
+            if (single_mutation_commands.containBarrierCommand())
+            {
+                if (commands->empty())
+                {
+                    commands->insert(commands->end(), single_mutation_commands.begin(), single_mutation_commands.end());
+                    last_mutation_to_apply = it;
+                }
+                break;
+            }
+            else
+            {
+                current_ast_elements += commands_size;
+                commands->insert(commands->end(), single_mutation_commands.begin(), single_mutation_commands.end());
+                last_mutation_to_apply = it;
+            }
+
         }
 
         assert(commands->empty() == (last_mutation_to_apply == mutations_end_it));
@@ -1240,7 +1296,10 @@ bool StorageMergeTree::scheduleDataProcessingJob(BackgroundJobsAssignee & assign
     }
     if (mutate_entry)
     {
-        auto task = std::make_shared<MutatePlainMergeTreeTask>(*this, metadata_snapshot, mutate_entry, shared_lock, common_assignee_trigger);
+        /// We take new metadata snapshot here. It's because mutation commands can be executed only with metadata snapshot
+        /// which is equal or more fresh than commands themselves. In extremely rare case it can happen that we will have alter
+        /// in between we took snapshot above and selected commands. That is why we take new snapshot here.
+        auto task = std::make_shared<MutatePlainMergeTreeTask>(*this, getInMemoryMetadataPtr(), mutate_entry, shared_lock, common_assignee_trigger);
         assignee.scheduleMergeMutateTask(task);
         return true;
     }
@@ -1289,6 +1348,26 @@ bool StorageMergeTree::scheduleDataProcessingJob(BackgroundJobsAssignee & assign
     return scheduled;
 }
 
+size_t StorageMergeTree::getNumberOfUnfinishedMutations() const
+{
+    std::unique_lock lock(currently_processing_in_background_mutex);
+
+    size_t count = 0;
+    for (const auto & [version, _] : current_mutations_by_version | std::views::reverse)
+    {
+        auto status = getIncompleteMutationsStatusUnlocked(version, lock);
+        if (!status)
+            continue;
+
+        if (status->is_done)
+            break;
+
+        ++count;
+    }
+
+    return count;
+}
+
 UInt64 StorageMergeTree::getCurrentMutationVersion(
     const DataPartPtr & part,
     std::unique_lock<std::mutex> & /*currently_processing_in_background_mutex_lock*/) const
@@ -2065,6 +2144,7 @@ CheckResults StorageMergeTree::checkData(const ASTPtr & query, ContextPtr local_
 
 void StorageMergeTree::backupData(BackupEntriesCollector & backup_entries_collector, const String & data_path_in_backup, const std::optional<ASTs> & partitions)
 {
+    const auto & backup_settings = backup_entries_collector.getBackupSettings();
     auto local_context = backup_entries_collector.getContext();
 
     DataPartsVector data_parts;
@@ -2075,15 +2155,17 @@ void StorageMergeTree::backupData(BackupEntriesCollector & backup_entries_collec
 
     Int64 min_data_version = std::numeric_limits<Int64>::max();
     for (const auto & data_part : data_parts)
-        min_data_version = std::min(min_data_version, data_part->info.getDataVersion());
+        min_data_version = std::min(min_data_version, data_part->info.getDataVersion() + 1);
 
-    backup_entries_collector.addBackupEntries(backupParts(data_parts, data_path_in_backup, local_context));
-    backup_entries_collector.addBackupEntries(backupMutations(min_data_version + 1, data_path_in_backup));
+    backup_entries_collector.addBackupEntries(backupParts(data_parts, data_path_in_backup, backup_settings, local_context));
+    backup_entries_collector.addBackupEntries(backupMutations(min_data_version, data_path_in_backup));
 }
 
 
 BackupEntries StorageMergeTree::backupMutations(UInt64 version, const String & data_path_in_backup) const
 {
+    std::lock_guard lock(currently_processing_in_background_mutex);
+
     fs::path mutations_path_in_backup = fs::path{data_path_in_backup} / "mutations";
     BackupEntries backup_entries;
     for (auto it = current_mutations_by_version.lower_bound(version); it != current_mutations_by_version.end(); ++it)
@@ -2109,14 +2191,22 @@ void StorageMergeTree::attachRestoredParts(MutableDataPartsVector && parts)
 }
 
 
-MutationCommands StorageMergeTree::getFirstAlterMutationCommandsForPart(const DataPartPtr & part) const
+std::map<int64_t, MutationCommands> StorageMergeTree::getAlterMutationCommandsForPart(const DataPartPtr & part) const
 {
     std::lock_guard lock(currently_processing_in_background_mutex);
 
-    auto it = current_mutations_by_version.upper_bound(part->info.getDataVersion());
-    if (it == current_mutations_by_version.end())
-        return {};
-    return it->second.commands;
+    UInt64 part_data_version = part->info.getDataVersion();
+    std::map<int64_t, MutationCommands> result;
+
+    for (const auto & [mutation_version, entry] : current_mutations_by_version | std::views::reverse)
+    {
+        if (mutation_version > part_data_version)
+            result[mutation_version] = entry.commands;
+        else
+            break;
+    }
+
+    return result;
 }
 
 void StorageMergeTree::startBackgroundMovesIfNeeded()
@@ -2130,6 +2220,35 @@ std::unique_ptr<MergeTreeSettings> StorageMergeTree::getDefaultSettings() const
     return std::make_unique<MergeTreeSettings>(getContext()->getMergeTreeSettings());
 }
 
+PreparedSetsCachePtr StorageMergeTree::getPreparedSetsCache(Int64 mutation_id)
+{
+    auto l = std::lock_guard(mutation_prepared_sets_cache_mutex);
+
+    /// Cleanup stale entries where the shared_ptr is expired.
+    while (!mutation_prepared_sets_cache.empty())
+    {
+        auto it = mutation_prepared_sets_cache.begin();
+        if (it->second.lock())
+            break;
+        mutation_prepared_sets_cache.erase(it);
+    }
+
+    /// Look up an existing entry.
+    auto it = mutation_prepared_sets_cache.find(mutation_id);
+    if (it != mutation_prepared_sets_cache.end())
+    {
+        /// If the entry is still alive, return it.
+        auto existing_set_cache = it->second.lock();
+        if (existing_set_cache)
+            return existing_set_cache;
+    }
+
+    /// Create new entry.
+    auto cache = std::make_shared<PreparedSetsCache>();
+    mutation_prepared_sets_cache[mutation_id] = cache;
+    return cache;
+}
+
 void StorageMergeTree::fillNewPartName(MutableDataPartPtr & part, DataPartsLock &)
 {
     part->info.min_block = part->info.max_block = increment.get();
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index 052a672a187..be9f5426bbd 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -45,7 +45,6 @@ public:
         bool has_force_restore_data_flag);
 
     void startup() override;
-    void flush() override;
     void shutdown() override;
 
     ~StorageMergeTree() override;
@@ -113,6 +112,8 @@ public:
 
     bool scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) override;
 
+    size_t getNumberOfUnfinishedMutations() const override;
+
     MergeTreeDeduplicationLog * getDeduplicationLog() { return deduplication_log.get(); }
 
 private:
@@ -151,6 +152,13 @@ private:
     std::atomic<bool> shutdown_called {false};
     std::atomic<bool> flush_called {false};
 
+    /// PreparedSets cache for one executing mutation.
+    /// NOTE: we only store weak_ptr to PreparedSetsCache, so that the cache is shared between mutation tasks that are executed in parallel.
+    /// The goal is to avoiding consuming a lot of memory when the same big sets are used by multiple tasks at the same time.
+    /// If the tasks are executed without time overlap, we will destroy the cache to free memory, and the next task might rebuild the same sets.
+    std::mutex mutation_prepared_sets_cache_mutex;
+    std::map<Int64, PreparedSetsCachePtr::weak_type> mutation_prepared_sets_cache;
+
     void loadMutations();
 
     /// Load and initialize deduplication logs. Even if deduplication setting
@@ -183,12 +191,11 @@ private:
     /// and into in-memory structures. Wake up merge-mutation task.
     Int64 startMutation(const MutationCommands & commands, ContextPtr query_context);
     /// Wait until mutation with version will finish mutation for all parts
-    void waitForMutation(Int64 version);
-    void waitForMutation(const String & mutation_id) override;
-    void waitForMutation(Int64 version, const String & mutation_id);
+    void waitForMutation(Int64 version, bool wait_for_another_mutation = false);
+    void waitForMutation(const String & mutation_id, bool wait_for_another_mutation) override;
+    void waitForMutation(Int64 version, const String & mutation_id, bool wait_for_another_mutation = false);
     void setMutationCSN(const String & mutation_id, CSN csn) override;
 
-
     friend struct CurrentlyMergingPartsTagger;
 
     MergeMutateSelectedEntryPtr selectPartsToMerge(
@@ -246,7 +253,11 @@ private:
     /// because we can execute several mutations at once. Order is important for
     /// better readability of exception message. If mutation was killed doesn't
     /// return any ids.
-    std::optional<MergeTreeMutationStatus> getIncompleteMutationsStatus(Int64 mutation_version, std::set<String> * mutation_ids = nullptr) const;
+    std::optional<MergeTreeMutationStatus> getIncompleteMutationsStatus(Int64 mutation_version, std::set<String> * mutation_ids = nullptr,
+                                                                        bool from_another_mutation = false) const;
+
+    std::optional<MergeTreeMutationStatus> getIncompleteMutationsStatusUnlocked(Int64 mutation_version, std::unique_lock<std::mutex> & lock,
+                                                                        std::set<String> * mutation_ids = nullptr, bool from_another_mutation = false) const;
 
     void fillNewPartName(MutableDataPartPtr & part, DataPartsLock & lock);
 
@@ -259,6 +270,8 @@ private:
 
     std::unique_ptr<MergeTreeSettings> getDefaultSettings() const override;
 
+    PreparedSetsCachePtr getPreparedSetsCache(Int64 mutation_id);
+
     friend class MergeTreeSink;
     friend class MergeTreeData;
     friend class MergePlainMergeTreeTask;
@@ -266,8 +279,7 @@ private:
 
 
 protected:
-
-    MutationCommands getFirstAlterMutationCommandsForPart(const DataPartPtr & part) const override;
+    std::map<int64_t, MutationCommands> getAlterMutationCommandsForPart(const DataPartPtr & part) const override;
 };
 
 }
diff --git a/src/Storages/StorageMongoDB.cpp b/src/Storages/StorageMongoDB.cpp
index 2cb85878000..63b8c2d00a1 100644
--- a/src/Storages/StorageMongoDB.cpp
+++ b/src/Storages/StorageMongoDB.cpp
@@ -7,7 +7,6 @@
 #include <Poco/MongoDB/Connection.h>
 #include <Poco/MongoDB/Cursor.h>
 #include <Poco/MongoDB/Database.h>
-#include <Poco/Version.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
@@ -18,6 +17,7 @@
 #include <QueryPipeline/Pipe.h>
 #include <Processors/Sources/MongoDBSource.h>
 #include <Processors/Sinks/SinkToStorage.h>
+#include <unordered_set>
 
 namespace DB
 {
@@ -171,30 +171,23 @@ SinkToStoragePtr StorageMongoDB::write(const ASTPtr & /* query */, const Storage
     return std::make_shared<StorageMongoDBSink>(collection_name, database_name, metadata_snapshot, connection);
 }
 
-struct KeysCmp
-{
-    constexpr bool operator()(const auto & lhs, const auto & rhs) const
-    {
-        return lhs == rhs || ((lhs == "table") && (rhs == "collection")) || ((rhs == "table") && (lhs == "collection"));
-    }
-};
 StorageMongoDB::Configuration StorageMongoDB::getConfiguration(ASTs engine_args, ContextPtr context)
 {
     Configuration configuration;
 
-    if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args))
+    if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args, context))
     {
         validateNamedCollection(
             *named_collection,
-            std::unordered_multiset<std::string_view, std::hash<std::string_view>, KeysCmp>{"host", "port", "user", "password", "database", "collection", "table"},
+            ValidateKeysMultiset<MongoDBEqualKeysSet>{"host", "port", "user", "username", "password", "database", "db", "collection", "table"},
             {"options"});
 
-        configuration.host = named_collection->get<String>("host");
+        configuration.host = named_collection->getAny<String>({"host", "hostname"});
         configuration.port = static_cast<UInt16>(named_collection->get<UInt64>("port"));
-        configuration.username = named_collection->get<String>("user");
+        configuration.username = named_collection->getAny<String>({"user", "username"});
         configuration.password = named_collection->get<String>("password");
-        configuration.database = named_collection->get<String>("database");
-        configuration.table = named_collection->getOrDefault<String>("collection", named_collection->getOrDefault<String>("table", ""));
+        configuration.database = named_collection->getAny<String>({"database", "db"});
+        configuration.table = named_collection->getAny<String>({"collection", "table"});
         configuration.options = named_collection->getOrDefault<String>("options", "");
     }
     else
diff --git a/src/Storages/StorageMongoDB.h b/src/Storages/StorageMongoDB.h
index 941e9fcf4b0..2b77f076e7e 100644
--- a/src/Storages/StorageMongoDB.h
+++ b/src/Storages/StorageMongoDB.h
@@ -3,12 +3,11 @@
 #include <Poco/MongoDB/Connection.h>
 
 #include <Storages/IStorage.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 
 namespace DB
 {
 /* Implements storage in the MongoDB database.
- * Use ENGINE = mysql(host_port, database_name, table_name, user_name, password)
+ * Use ENGINE = MongoDB(host:port, database, collection, user, password [, options]);
  * Read only.
  */
 
diff --git a/src/Storages/StorageMySQL.cpp b/src/Storages/StorageMySQL.cpp
index ee647043407..2a96581d591 100644
--- a/src/Storages/StorageMySQL.cpp
+++ b/src/Storages/StorageMySQL.cpp
@@ -20,6 +20,8 @@
 #include <QueryPipeline/Pipe.h>
 #include <Common/parseRemoteDescription.h>
 #include <Common/logger_useful.h>
+#include <Storages/NamedCollectionsHelpers.h>
+#include <Databases/MySQL/FetchTablesColumnsList.h>
 
 
 namespace DB
@@ -29,6 +31,7 @@ namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int BAD_ARGUMENTS;
+    extern const int UNKNOWN_TABLE;
 }
 
 static String backQuoteMySQL(const String & x)
@@ -64,12 +67,36 @@ StorageMySQL::StorageMySQL(
     , log(&Poco::Logger::get("StorageMySQL (" + table_id_.table_name + ")"))
 {
     StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(columns_);
+
+    if (columns_.empty())
+    {
+        auto columns = getTableStructureFromData(*pool, remote_database_name, remote_table_name, context_);
+        storage_metadata.setColumns(columns);
+    }
+    else
+        storage_metadata.setColumns(columns_);
+
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
+ColumnsDescription StorageMySQL::getTableStructureFromData(
+    mysqlxx::PoolWithFailover & pool_,
+    const String & database,
+    const String & table,
+    const ContextPtr & context_)
+{
+    const auto & settings = context_->getSettingsRef();
+    const auto tables_and_columns = fetchTablesColumnsList(pool_, database, {table}, settings, settings.mysql_datatypes_support_level);
+
+    const auto columns = tables_and_columns.find(table);
+    if (columns == tables_and_columns.end())
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "MySQL table {} doesn't exist.",
+                        (database.empty() ? "" : (backQuote(database) + "." + backQuote(table))));
+
+    return columns->second;
+}
 
 Pipe StorageMySQL::read(
     const Names & column_names_,
@@ -83,6 +110,7 @@ Pipe StorageMySQL::read(
     storage_snapshot->check(column_names_);
     String query = transformQueryForExternalDatabase(
         query_info_,
+        column_names_,
         storage_snapshot->metadata->getColumns().getOrdinary(),
         IdentifierQuotingStyle::BackticksMySQL,
         remote_database_name,
@@ -235,31 +263,59 @@ SinkToStoragePtr StorageMySQL::write(const ASTPtr & /*query*/, const StorageMeta
         local_context->getSettingsRef().mysql_max_rows_to_insert);
 }
 
-
-StorageMySQLConfiguration StorageMySQL::getConfiguration(ASTs engine_args, ContextPtr context_, MySQLBaseSettings & storage_settings)
+StorageMySQL::Configuration StorageMySQL::processNamedCollectionResult(
+    const NamedCollection & named_collection, MySQLSettings & storage_settings, ContextPtr context_, bool require_table)
 {
-    StorageMySQLConfiguration configuration;
+    StorageMySQL::Configuration configuration;
 
-    if (auto named_collection = getExternalDataSourceConfiguration(
-            engine_args, context_, /* is_database_engine */false, /* throw_on_no_collection */true, storage_settings))
+    ValidateKeysMultiset<ExternalDatabaseEqualKeysSet> optional_arguments = {"replace_query", "on_duplicate_clause", "addresses_expr", "host", "hostname", "port"};
+    auto mysql_settings = storage_settings.all();
+    for (const auto & setting : mysql_settings)
+        optional_arguments.insert(setting.getName());
+
+    ValidateKeysMultiset<ExternalDatabaseEqualKeysSet> required_arguments = {"user", "username", "password", "database", "db"};
+    if (require_table)
+        required_arguments.insert("table");
+    validateNamedCollection<ValidateKeysMultiset<ExternalDatabaseEqualKeysSet>>(named_collection, required_arguments, optional_arguments);
+
+    configuration.addresses_expr = named_collection.getOrDefault<String>("addresses_expr", "");
+    if (configuration.addresses_expr.empty())
     {
-        auto [common_configuration, storage_specific_args, settings_changes] = named_collection.value();
-        configuration.set(common_configuration);
+        configuration.host = named_collection.getAnyOrDefault<String>({"host", "hostname"}, "");
+        configuration.port = static_cast<UInt16>(named_collection.get<UInt64>("port"));
         configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
-        storage_settings.applyChanges(settings_changes);
+    }
+    else
+    {
+        size_t max_addresses = context_->getSettingsRef().glob_expansion_max_elements;
+        configuration.addresses = parseRemoteDescriptionForExternalDatabase(
+            configuration.addresses_expr, max_addresses, 3306);
+    }
 
-        for (const auto & [arg_name, arg_value] : storage_specific_args)
-        {
-            if (arg_name == "replace_query")
-                configuration.replace_query = checkAndGetLiteralArgument<bool>(arg_value, "replace_query");
-            else if (arg_name == "on_duplicate_clause")
-                configuration.on_duplicate_clause = checkAndGetLiteralArgument<String>(arg_value, "on_duplicate_clause");
-            else
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Unexpected key-value argument."
-                        "Got: {}, but expected one of:"
-                        "host, port, username, password, database, table, replace_query, on_duplicate_clause.", arg_name);
-        }
+    configuration.username = named_collection.getAny<String>({"username", "user"});
+    configuration.password = named_collection.get<String>("password");
+    configuration.database = named_collection.getAny<String>({"db", "database"});
+    if (require_table)
+        configuration.table = named_collection.get<String>("table");
+    configuration.replace_query = named_collection.getOrDefault<UInt64>("replace_query", false);
+    configuration.on_duplicate_clause = named_collection.getOrDefault<String>("on_duplicate_clause", "");
+
+    for (const auto & setting : mysql_settings)
+    {
+        const auto & setting_name = setting.getName();
+        if (named_collection.has(setting_name))
+            storage_settings.set(setting_name, named_collection.get<String>(setting_name));
+    }
+
+    return configuration;
+}
+
+StorageMySQL::Configuration StorageMySQL::getConfiguration(ASTs engine_args, ContextPtr context_, MySQLSettings & storage_settings)
+{
+    StorageMySQL::Configuration configuration;
+    if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args, context_))
+    {
+        configuration = StorageMySQL::processNamedCollectionResult(*named_collection, storage_settings, context_);
     }
     else
     {
@@ -271,10 +327,10 @@ StorageMySQLConfiguration StorageMySQL::getConfiguration(ASTs engine_args, Conte
         for (auto & engine_arg : engine_args)
             engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context_);
 
-        const auto & host_port = checkAndGetLiteralArgument<String>(engine_args[0], "host:port");
+        configuration.addresses_expr = checkAndGetLiteralArgument<String>(engine_args[0], "host:port");
         size_t max_addresses = context_->getSettingsRef().glob_expansion_max_elements;
 
-        configuration.addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
+        configuration.addresses = parseRemoteDescriptionForExternalDatabase(configuration.addresses_expr, max_addresses, 3306);
         configuration.database = checkAndGetLiteralArgument<String>(engine_args[1], "database");
         configuration.table = checkAndGetLiteralArgument<String>(engine_args[2], "table");
         configuration.username = checkAndGetLiteralArgument<String>(engine_args[3], "username");
@@ -324,6 +380,7 @@ void registerStorageMySQL(StorageFactory & factory)
     },
     {
         .supports_settings = true,
+        .supports_schema_inference = true,
         .source_access_type = AccessType::MYSQL,
     });
 }
diff --git a/src/Storages/StorageMySQL.h b/src/Storages/StorageMySQL.h
index bf9a24c9bfe..9f47f9925d5 100644
--- a/src/Storages/StorageMySQL.h
+++ b/src/Storages/StorageMySQL.h
@@ -6,7 +6,6 @@
 
 #include <Storages/IStorage.h>
 #include <Storages/MySQL/MySQLSettings.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 #include <mysqlxx/PoolWithFailover.h>
 
 namespace Poco
@@ -17,6 +16,8 @@ class Logger;
 namespace DB
 {
 
+class NamedCollection;
+
 /** Implements storage in the MySQL database.
   * Use ENGINE = mysql(host_port, database_name, table_name, user_name, password)
   * Read only.
@@ -50,7 +51,35 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
-    static StorageMySQLConfiguration getConfiguration(ASTs engine_args, ContextPtr context_, MySQLBaseSettings & storage_settings);
+    struct Configuration
+    {
+        using Addresses = std::vector<std::pair<String, UInt16>>;
+
+        String host;
+        UInt16 port = 0;
+        String username = "default";
+        String password;
+        String database;
+        String table;
+
+        bool replace_query = false;
+        String on_duplicate_clause;
+
+        Addresses addresses; /// Failover replicas.
+        String addresses_expr;
+    };
+
+    static Configuration getConfiguration(ASTs engine_args, ContextPtr context_, MySQLSettings & storage_settings);
+
+    static Configuration processNamedCollectionResult(
+        const NamedCollection & named_collection, MySQLSettings & storage_settings,
+        ContextPtr context_, bool require_table = true);
+
+    static ColumnsDescription getTableStructureFromData(
+        mysqlxx::PoolWithFailover & pool_,
+        const String & database,
+        const String & table,
+        const ContextPtr & context_);
 
 private:
     friend class StorageMySQLSink;
diff --git a/src/Storages/StorageNull.cpp b/src/Storages/StorageNull.cpp
index aa462e1a40c..0ced128c8ef 100644
--- a/src/Storages/StorageNull.cpp
+++ b/src/Storages/StorageNull.cpp
@@ -37,7 +37,7 @@ void registerStorageNull(StorageFactory & factory)
 
 void StorageNull::checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const
 {
-    auto name_deps = getDependentViewsByColumn(context);
+    std::optional<NameDependencies> name_deps{};
     for (const auto & command : commands)
     {
         if (command.type != AlterCommand::Type::ADD_COLUMN
@@ -50,7 +50,9 @@ void StorageNull::checkAlterIsPossible(const AlterCommands & commands, ContextPt
 
         if (command.type == AlterCommand::DROP_COLUMN && !command.clear)
         {
-            const auto & deps_mv = name_deps[command.column_name];
+            if (!name_deps)
+                name_deps = getDependentViewsByColumn(context);
+            const auto & deps_mv = name_deps.value()[command.column_name];
             if (!deps_mv.empty())
             {
                 throw Exception(ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN,
diff --git a/src/Storages/StorageNull.h b/src/Storages/StorageNull.h
index 2270731c0e3..d35c6a0b8b5 100644
--- a/src/Storages/StorageNull.h
+++ b/src/Storages/StorageNull.h
@@ -42,6 +42,8 @@ public:
             std::make_shared<NullSource>(storage_snapshot->getSampleBlockForColumns(column_names)));
     }
 
+    bool parallelizeOutputAfterReading(ContextPtr) const override { return false; }
+
     bool supportsParallelInsert() const override { return true; }
 
     SinkToStoragePtr write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr) override
diff --git a/src/Storages/StoragePostgreSQL.cpp b/src/Storages/StoragePostgreSQL.cpp
index 400430b9ea2..6ef3fe04e38 100644
--- a/src/Storages/StoragePostgreSQL.cpp
+++ b/src/Storages/StoragePostgreSQL.cpp
@@ -43,6 +43,8 @@
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/NamedCollectionsHelpers.h>
 
+#include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
+
 
 namespace DB
 {
@@ -51,6 +53,7 @@ namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
 }
 
 StoragePostgreSQL::StoragePostgreSQL(
@@ -60,6 +63,7 @@ StoragePostgreSQL::StoragePostgreSQL(
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
+    ContextPtr context_,
     const String & remote_table_schema_,
     const String & on_conflict_)
     : IStorage(table_id_)
@@ -70,12 +74,36 @@ StoragePostgreSQL::StoragePostgreSQL(
     , log(&Poco::Logger::get("StoragePostgreSQL (" + table_id_.table_name + ")"))
 {
     StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(columns_);
+
+    if (columns_.empty())
+    {
+        auto columns = getTableStructureFromData(pool, remote_table_name, remote_table_schema, context_);
+        storage_metadata.setColumns(columns);
+    }
+    else
+        storage_metadata.setColumns(columns_);
+
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
+ColumnsDescription StoragePostgreSQL::getTableStructureFromData(
+    const postgres::PoolWithFailoverPtr & pool_,
+    const String & table,
+    const String & schema,
+    const ContextPtr & context_)
+{
+    const bool use_nulls = context_->getSettingsRef().external_table_functions_use_nulls;
+    auto connection_holder = pool_->get();
+    auto columns_info = fetchPostgreSQLTableStructure(
+            connection_holder->get(), table, schema, use_nulls).physical_columns;
+
+    if (!columns_info)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table structure not returned");
+
+    return ColumnsDescription{columns_info->columns};
+}
 
 Pipe StoragePostgreSQL::read(
     const Names & column_names_,
@@ -91,7 +119,9 @@ Pipe StoragePostgreSQL::read(
     /// Connection is already made to the needed database, so it should not be present in the query;
     /// remote_table_schema is empty if it is not specified, will access only table_name.
     String query = transformQueryForExternalDatabase(
-        query_info_, storage_snapshot->metadata->getColumns().getOrdinary(),
+        query_info_,
+        column_names_,
+        storage_snapshot->metadata->getColumns().getOrdinary(),
         IdentifierQuotingStyle::DoubleQuotes, remote_table_schema, remote_table_name, context_);
     LOG_TRACE(log, "Query: {}", query);
 
@@ -343,6 +373,7 @@ private:
         PreparedInsert(pqxx::connection & connection_, const String & table, const String & schema,
                        const ColumnsWithTypeAndName & columns, const String & on_conflict_)
             : Inserter(connection_)
+            , statement_name("insert_" + getHexUIntLowercase(thread_local_rng()))
         {
             WriteBufferFromOwnString buf;
             buf << getInsertQuery(schema, table, columns, IdentifierQuotingStyle::DoubleQuotes);
@@ -355,12 +386,14 @@ private:
             }
             buf << ") ";
             buf << on_conflict_;
-            connection.prepare("insert", buf.str());
+            connection.prepare(statement_name, buf.str());
+            prepared = true;
         }
 
         void complete() override
         {
-            connection.unprepare("insert");
+            connection.unprepare(statement_name);
+            prepared = false;
             tx.commit();
         }
 
@@ -369,8 +402,24 @@ private:
             pqxx::params params;
             params.reserve(row.size());
             params.append_multi(row);
-            tx.exec_prepared("insert", params);
+            tx.exec_prepared(statement_name, params);
         }
+
+        ~PreparedInsert() override
+        {
+            try
+            {
+                if (prepared)
+                    connection.unprepare(statement_name);
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+
+        const String statement_name;
+        bool prepared = false;
     };
 
     StorageMetadataPtr metadata_snapshot;
@@ -387,31 +436,41 @@ SinkToStoragePtr StoragePostgreSQL::write(
     return std::make_shared<PostgreSQLSink>(metadata_snapshot, pool->get(), remote_table_name, remote_table_schema, on_conflict);
 }
 
+StoragePostgreSQL::Configuration StoragePostgreSQL::processNamedCollectionResult(const NamedCollection & named_collection, bool require_table)
+{
+    StoragePostgreSQL::Configuration configuration;
+    ValidateKeysMultiset<ExternalDatabaseEqualKeysSet> required_arguments = {"user", "username", "password", "database", "db"};
+    if (require_table)
+        required_arguments.insert("table");
+
+    validateNamedCollection<ValidateKeysMultiset<ExternalDatabaseEqualKeysSet>>(
+        named_collection, required_arguments, {"schema", "on_conflict", "addresses_expr", "host", "hostname", "port", "use_table_cache"});
+
+    configuration.addresses_expr = named_collection.getOrDefault<String>("addresses_expr", "");
+    if (configuration.addresses_expr.empty())
+    {
+        configuration.host = named_collection.getAny<String>({"host", "hostname"});
+        configuration.port = static_cast<UInt16>(named_collection.get<UInt64>("port"));
+        configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
+    }
+
+    configuration.username = named_collection.getAny<String>({"username", "user"});
+    configuration.password = named_collection.get<String>("password");
+    configuration.database = named_collection.getAny<String>({"db", "database"});
+    if (require_table)
+        configuration.table = named_collection.get<String>("table");
+    configuration.schema = named_collection.getOrDefault<String>("schema", "");
+    configuration.on_conflict = named_collection.getOrDefault<String>("on_conflict", "");
+
+    return configuration;
+}
 
 StoragePostgreSQL::Configuration StoragePostgreSQL::getConfiguration(ASTs engine_args, ContextPtr context)
 {
     StoragePostgreSQL::Configuration configuration;
-    if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args))
+    if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args, context))
     {
-        validateNamedCollection(
-            *named_collection,
-            {"user", "password", "database", "table"},
-            {"schema", "on_conflict", "addresses_expr", "host", "port"});
-
-        configuration.addresses_expr = named_collection->getOrDefault<String>("addresses_expr", "");
-        if (configuration.addresses_expr.empty())
-        {
-            configuration.host = named_collection->get<String>("host");
-            configuration.port = static_cast<UInt16>(named_collection->get<UInt64>("port"));
-            configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
-        }
-
-        configuration.username = named_collection->get<String>("user");
-        configuration.password = named_collection->get<String>("password");
-        configuration.database = named_collection->get<String>("database");
-        configuration.table = named_collection->get<String>("table");
-        configuration.schema = named_collection->getOrDefault<String>("schema", "");
-        configuration.on_conflict = named_collection->getOrDefault<String>("on_conflict", "");
+        configuration = StoragePostgreSQL::processNamedCollectionResult(*named_collection);
     }
     else
     {
@@ -428,10 +487,10 @@ StoragePostgreSQL::Configuration StoragePostgreSQL::getConfiguration(ASTs engine
         for (auto & engine_arg : engine_args)
             engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
 
-        const auto & host_port = checkAndGetLiteralArgument<String>(engine_args[0], "host:port");
+        configuration.addresses_expr = checkAndGetLiteralArgument<String>(engine_args[0], "host:port");
         size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
 
-        configuration.addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
+        configuration.addresses = parseRemoteDescriptionForExternalDatabase(configuration.addresses_expr, max_addresses, 5432);
         if (configuration.addresses.size() == 1)
         {
             configuration.host = configuration.addresses[0].first;
@@ -473,10 +532,12 @@ void registerStoragePostgreSQL(StorageFactory & factory)
             args.columns,
             args.constraints,
             args.comment,
+            args.getContext(),
             configuration.schema,
             configuration.on_conflict);
     },
     {
+        .supports_schema_inference = true,
         .source_access_type = AccessType::POSTGRES,
     });
 }
diff --git a/src/Storages/StoragePostgreSQL.h b/src/Storages/StoragePostgreSQL.h
index f3df24ebd35..be6bbc5ec63 100644
--- a/src/Storages/StoragePostgreSQL.h
+++ b/src/Storages/StoragePostgreSQL.h
@@ -5,7 +5,6 @@
 #if USE_LIBPQXX
 #include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 
 namespace Poco
 {
@@ -20,6 +19,7 @@ using PoolWithFailoverPtr = std::shared_ptr<PoolWithFailover>;
 
 namespace DB
 {
+class NamedCollection;
 
 class StoragePostgreSQL final : public IStorage
 {
@@ -31,6 +31,7 @@ public:
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
+        ContextPtr context_,
         const String & remote_table_schema_ = "",
         const String & on_conflict = "");
 
@@ -64,6 +65,14 @@ public:
 
     static Configuration getConfiguration(ASTs engine_args, ContextPtr context);
 
+    static Configuration processNamedCollectionResult(const NamedCollection & named_collection, bool require_table = true);
+
+    static ColumnsDescription getTableStructureFromData(
+        const postgres::PoolWithFailoverPtr & pool_,
+        const String & table,
+        const String & schema,
+        const ContextPtr & context_);
+
 private:
     String remote_table_name;
     String remote_table_schema;
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 429339386b4..0f79e9f8f19 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -3,8 +3,9 @@
 #include <cstddef>
 #include <ranges>
 
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Common/Macros.h>
+#include <Common/MemoryTracker.h>
 #include <Common/ProfileEventsScope.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/ZooKeeper/KeeperException.h>
@@ -13,37 +14,41 @@
 #include <Common/formatReadable.h>
 #include <Common/thread_local_rng.h>
 #include <Common/typeid_cast.h>
-#include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
+#include <Common/ThreadFuzzer.h>
 
 #include <Disks/ObjectStorages/IMetadataStorage.h>
 
 #include <base/sort.h>
 
 #include <Storages/AlterCommands.h>
-#include <Storages/PartitionCommands.h>
 #include <Storages/ColumnsDescription.h>
-#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/Freeze.h>
+#include <Storages/MergeTree/AsyncBlockIDsCache.h>
+#include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
+#include <Storages/MergeTree/extractZkPathFromCreateQuery.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include <Storages/MergeTree/LeaderElection.h>
+#include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <Storages/MergeTree/MergeFromLogEntryTask.h>
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
-#include <Storages/MergeTree/MergedBlockOutputStream.h>
-#include <Storages/MergeTree/PinnedPartUUIDs.h>
-#include <Storages/MergeTree/ReplicatedMergeTreeAttachThread.h>
-#include <Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h>
-#include <Storages/MergeTree/ReplicatedMergeTreeSink.h>
-#include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
-#include <Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h>
-#include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
-#include <Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h>
-#include <Storages/MergeTree/ReplicatedMergeTreePartHeader.h>
-#include <Storages/MergeTree/MergeFromLogEntryTask.h>
-#include <Storages/MergeTree/MutateFromLogEntryTask.h>
-#include <Storages/VirtualColumnUtils.h>
+#include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
+#include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <Storages/MergeTree/MergeTreeReaderCompact.h>
-#include <Storages/MergeTree/LeaderElection.h>
+#include <Storages/MergeTree/MutateFromLogEntryTask.h>
+#include <Storages/MergeTree/PinnedPartUUIDs.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeAttachThread.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h>
+#include <Storages/MergeTree/ReplicatedMergeTreePartHeader.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeSink.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h>
 #include <Storages/MergeTree/ZeroCopyLock.h>
-#include <Storages/MergeTree/extractZkPathFromCreateQuery.h>
-#include <Storages/Freeze.h>
+#include <Storages/PartitionCommands.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/VirtualColumnUtils.h>
 
 #include <Databases/DatabaseOnDisk.h>
 #include <Databases/DatabaseReplicated.h>
@@ -95,7 +100,6 @@
 
 #include <base/scope_guard.h>
 #include <Common/scope_guard_safe.h>
-#include <Storages/MergeTree/AsyncBlockIDsCache.h>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/replace.hpp>
@@ -128,6 +132,7 @@ namespace ProfileEvents
 namespace CurrentMetrics
 {
     extern const Metric BackgroundFetchesPoolTask;
+    extern const Metric ReadonlyReplica;
 }
 
 namespace DB
@@ -148,6 +153,7 @@ namespace ErrorCodes
     extern const int REPLICA_IS_NOT_IN_QUORUM;
     extern const int TABLE_IS_READ_ONLY;
     extern const int NOT_FOUND_NODE;
+    extern const int BAD_DATA_PART_NAME;
     extern const int NO_ACTIVE_REPLICAS;
     extern const int NOT_A_LEADER;
     extern const int TABLE_WAS_NOT_DROPPED;
@@ -234,6 +240,15 @@ zkutil::ZooKeeperPtr StorageReplicatedMergeTree::getZooKeeperAndAssertNotReadonl
     return res;
 }
 
+String StorageReplicatedMergeTree::getEndpointName() const
+{
+    const MergeTreeSettings & settings = getContext()->getReplicatedMergeTreeSettings();
+    if (settings.enable_the_endpoint_id_with_zookeeper_name_prefix)
+        return zookeeper_name + ":" + replica_path;
+
+    return replica_path;
+}
+
 static ConnectionTimeouts getHTTPTimeouts(ContextPtr context)
 {
     return ConnectionTimeouts::getHTTPTimeouts(context->getSettingsRef(), {context->getConfigRef().getUInt("keep_alive_timeout", DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT), 0});
@@ -461,7 +476,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
 
             Coordination::Stat metadata_stat;
             current_zookeeper->get(zookeeper_path + "/metadata", &metadata_stat);
-            metadata_version = metadata_stat.version;
+            setInMemoryMetadata(metadata_snapshot->withMetadataVersion(metadata_stat.version));
         }
         catch (Coordination::Exception & e)
         {
@@ -651,6 +666,8 @@ void StorageReplicatedMergeTree::createNewZooKeeperNodes()
     futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/alter_partition_version", String(), zkutil::CreateMode::Persistent));
     /// For deduplication of async inserts
     futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/async_blocks", String(), zkutil::CreateMode::Persistent));
+    /// To track "lost forever" parts count, just for `system.replicas` table
+    futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/lost_part_count", String(), zkutil::CreateMode::Persistent));
 
     /// As for now, "/temp" node must exist, but we want to be able to remove it in future
     if (zookeeper->exists(zookeeper_path + "/temp"))
@@ -781,7 +798,7 @@ bool StorageReplicatedMergeTree::createTableIfNotExists(const StorageMetadataPtr
             zkutil::CreateMode::Persistent));
         ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/columns", metadata_snapshot->getColumns().toString(),
             zkutil::CreateMode::Persistent));
-        ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/metadata_version", std::to_string(metadata_version),
+        ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/metadata_version", toString(metadata_snapshot->getMetadataVersion()),
             zkutil::CreateMode::Persistent));
 
         /// The following 3 nodes were added in version 1.1.xxx, so we create them here, not in createNewZooKeeperNodes()
@@ -796,7 +813,7 @@ bool StorageReplicatedMergeTree::createTableIfNotExists(const StorageMetadataPtr
         auto code = zookeeper->tryMulti(ops, responses);
         if (code == Coordination::Error::ZNODEEXISTS)
         {
-            LOG_WARNING(log, "It looks like the table {} was created by another server at the same moment, will retry", zookeeper_path);
+            LOG_INFO(log, "It looks like the table {} was created by another server at the same moment, will retry", zookeeper_path);
             continue;
         }
         else if (code != Coordination::Error::ZOK)
@@ -854,7 +871,7 @@ void StorageReplicatedMergeTree::createReplica(const StorageMetadataPtr & metada
             zkutil::CreateMode::Persistent));
         ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/columns", metadata_snapshot->getColumns().toString(),
             zkutil::CreateMode::Persistent));
-        ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/metadata_version", std::to_string(metadata_version),
+        ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/metadata_version", toString(metadata_snapshot->getMetadataVersion()),
             zkutil::CreateMode::Persistent));
 
         /// The following 3 nodes were added in version 1.1.xxx, so we create them here, not in createNewZooKeeperNodes()
@@ -876,7 +893,7 @@ void StorageReplicatedMergeTree::createReplica(const StorageMetadataPtr & metada
             case Coordination::Error::ZNODEEXISTS:
                 throw Exception(ErrorCodes::REPLICA_ALREADY_EXISTS, "Replica {} already exists", replica_path);
             case Coordination::Error::ZBADVERSION:
-                LOG_ERROR(log, "Retrying createReplica(), because some other replicas were created at the same time");
+                LOG_INFO(log, "Retrying createReplica(), because some other replicas were created at the same time");
                 break;
             case Coordination::Error::ZNONODE:
                 throw Exception(ErrorCodes::ALL_REPLICAS_LOST, "Table {} was suddenly removed", zookeeper_path);
@@ -1056,6 +1073,20 @@ void StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, con
     }
 }
 
+void StorageReplicatedMergeTree::dropReplica(const String & drop_zookeeper_path, const String & drop_replica, Poco::Logger * logger)
+{
+    zkutil::ZooKeeperPtr zookeeper = getZooKeeperIfTableShutDown();
+
+    /// NOTE it's not atomic: replica may become active after this check, but before dropReplica(...)
+    /// However, the main use case is to drop dead replica, which cannot become active.
+    /// This check prevents only from accidental drop of some other replica.
+    if (zookeeper->exists(drop_zookeeper_path + "/replicas/" + drop_replica + "/is_active"))
+        throw Exception(ErrorCodes::TABLE_WAS_NOT_DROPPED, "Can't drop replica: {}, because it's active", drop_replica);
+
+    dropReplica(zookeeper, drop_zookeeper_path, drop_replica, logger);
+}
+
+
 bool StorageReplicatedMergeTree::removeTableNodesFromZooKeeper(zkutil::ZooKeeperPtr zookeeper,
         const String & zookeeper_path, const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, Poco::Logger * logger)
 {
@@ -1159,16 +1190,19 @@ void StorageReplicatedMergeTree::checkTableStructure(const String & zookeeper_pr
 }
 
 void StorageReplicatedMergeTree::setTableStructure(const StorageID & table_id, const ContextPtr & local_context,
-    ColumnsDescription new_columns, const ReplicatedMergeTreeTableMetadata::Diff & metadata_diff)
+    ColumnsDescription new_columns, const ReplicatedMergeTreeTableMetadata::Diff & metadata_diff, int32_t new_metadata_version)
 {
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
+
     StorageInMemoryMetadata new_metadata = metadata_diff.getNewMetadata(new_columns, local_context, old_metadata);
+    new_metadata.setMetadataVersion(new_metadata_version);
 
     /// Even if the primary/sorting/partition keys didn't change we must reinitialize it
     /// because primary/partition key column types might have changed.
     checkTTLExpressions(new_metadata, old_metadata);
     setProperties(new_metadata, old_metadata);
 
+
     DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
 }
 
@@ -1321,6 +1355,11 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
                     uncovered_unexpected_parts.size(), uncovered_unexpected_parts_rows, unexpected_parts_nonnew, unexpected_parts_nonnew_rows,
                     parts_to_fetch.size(), parts_to_fetch_blocks, covered_unexpected_parts.size(), unexpected_parts_rows - uncovered_unexpected_parts_rows);
     }
+    else
+    {
+        if (!parts_to_fetch.empty())
+            LOG_DEBUG(log, "Found parts to fetch (exist in zookeeper, but not locally): [{}]", fmt::join(parts_to_fetch, ", "));
+    }
 
     /// Add to the queue jobs to pick up the missing parts from other replicas and remove from ZK the information that we have them.
     queue.setBrokenPartsToEnqueueFetchesOnLoading(std::move(parts_to_fetch));
@@ -1459,16 +1498,18 @@ void StorageReplicatedMergeTree::checkPartChecksumsAndAddCommitOps(const zkutil:
 }
 
 MergeTreeData::DataPartsVector StorageReplicatedMergeTree::checkPartChecksumsAndCommit(Transaction & transaction,
-    const MutableDataPartPtr & part, std::optional<MergeTreeData::HardlinkedFiles> hardlinked_files)
+    const MutableDataPartPtr & part, std::optional<MergeTreeData::HardlinkedFiles> hardlinked_files, bool replace_zero_copy_lock)
 {
     auto zookeeper = getZooKeeper();
 
     while (true)
     {
+        LOG_DEBUG(log, "Committing part {} to zookeeper", part->name);
         Coordination::Requests ops;
         NameSet absent_part_paths_on_replicas;
 
-        lockSharedData(*part, false, hardlinked_files);
+        getLockSharedDataOps(*part, std::make_shared<ZooKeeperWithFaultInjection>(zookeeper), replace_zero_copy_lock, hardlinked_files, ops);
+        size_t zero_copy_lock_ops_size = ops.size();
 
         /// Checksums are checked here and `ops` is filled. In fact, the part is added to ZK just below, when executing `multi`.
         checkPartChecksumsAndAddCommitOps(zookeeper, part, ops, part->name, &absent_part_paths_on_replicas);
@@ -1496,11 +1537,14 @@ MergeTreeData::DataPartsVector StorageReplicatedMergeTree::checkPartChecksumsAnd
         Coordination::Responses responses;
         Coordination::Error e = zookeeper->tryMulti(ops, responses);
         if (e == Coordination::Error::ZOK)
+        {
+            LOG_DEBUG(log, "Part {} committed to zookeeper", part->name);
             return transaction.commit();
+        }
 
         if (e == Coordination::Error::ZNODEEXISTS)
         {
-            size_t num_check_ops = 2 * absent_part_paths_on_replicas.size();
+            size_t num_check_ops = 2 * absent_part_paths_on_replicas.size() + zero_copy_lock_ops_size;
             size_t failed_op_index = zkutil::getFailedOpIndex(e, responses);
             if (failed_op_index < num_check_ops)
             {
@@ -1806,6 +1850,7 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry, bool need_to_che
             String source_replica_path = fs::path(zookeeper_path) / "replicas" / replica;
             if (!fetchPart(part_name,
                 metadata_snapshot,
+                zookeeper_name,
                 source_replica_path,
                 /* to_detached= */ false,
                 entry.quorum,
@@ -2208,35 +2253,43 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
     /// Check that we could cover whole range
     for (PartDescriptionPtr & part_desc : parts_to_add)
     {
-        if (adding_parts_active_set.getContainingPart(part_desc->new_part_info).empty())
+        if (!adding_parts_active_set.getContainingPart(part_desc->new_part_info).empty())
+            continue;
+
+        MergeTreePartInfo covering_drop_range;
+        if (queue.isGoingToBeDropped(part_desc->new_part_info, &covering_drop_range))
         {
-            /// We should enqueue missing part for check, so it will be replaced with empty one (if needed)
-            /// and we will be able to execute this REPLACE_RANGE.
-            /// However, it's quite dangerous, because part may appear in source table.
-            /// So we enqueue it for check only if no replicas of source table have part either.
-            bool need_check = true;
-            if (auto * replicated_src_table = typeid_cast<StorageReplicatedMergeTree *>(source_table.get()))
-            {
-                String src_replica = replicated_src_table->findReplicaHavingPart(part_desc->src_part_name, false);
-                if (!src_replica.empty())
-                {
-                    LOG_DEBUG(log, "Found part {} on replica {} of source table, will not check part {} required for {}",
-                              part_desc->src_part_name, src_replica, part_desc->new_part_name, entry.znode_name);
-                    need_check = false;
-                }
-            }
-
-            if (need_check)
-            {
-                LOG_DEBUG(log, "Will check part {} required for {}, because no replicas have it (including replicas of source table)",
-                          part_desc->new_part_name, entry.znode_name);
-                enqueuePartForCheck(part_desc->new_part_name);
-            }
-
-            throw Exception(ErrorCodes::NO_REPLICA_HAS_PART,
-                            "Not found part {} (or part covering it) neither source table neither remote replicas",
-                            part_desc->new_part_name);
+            LOG_WARNING(log, "Will not add part {} (while replacing {}) because it's going to be dropped (DROP_RANGE: {})",
+                        part_desc->new_part_name, entry_replace.drop_range_part_name, covering_drop_range.getPartNameForLogs());
+            continue;
         }
+
+        /// We should enqueue missing part for check, so it will be replaced with empty one (if needed)
+        /// and we will be able to execute this REPLACE_RANGE.
+        /// However, it's quite dangerous, because part may appear in source table.
+        /// So we enqueue it for check only if no replicas of source table have part either.
+        bool need_check = true;
+        if (auto * replicated_src_table = typeid_cast<StorageReplicatedMergeTree *>(source_table.get()))
+        {
+            String src_replica = replicated_src_table->findReplicaHavingPart(part_desc->src_part_name, false);
+            if (!src_replica.empty())
+            {
+                LOG_DEBUG(log, "Found part {} on replica {} of source table, will not check part {} required for {}",
+                          part_desc->src_part_name, src_replica, part_desc->new_part_name, entry.znode_name);
+                need_check = false;
+            }
+        }
+
+        if (need_check)
+        {
+            LOG_DEBUG(log, "Will check part {} required for {}, because no replicas have it (including replicas of source table)",
+                      part_desc->new_part_name, entry.znode_name);
+            enqueuePartForCheck(part_desc->new_part_name);
+        }
+
+        throw Exception(ErrorCodes::NO_REPLICA_HAS_PART,
+                        "Not found part {} (or part covering it) neither source table neither remote replicas",
+                        part_desc->new_part_name);
     }
 
     /// Filter covered parts
@@ -2298,7 +2351,7 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
                                 interserver_scheme, address.scheme, address.host);
 
             part_desc->res_part = fetcher.fetchSelectedPart(
-                metadata_snapshot, getContext(), part_desc->found_new_part_name, source_replica_path,
+                metadata_snapshot, getContext(), part_desc->found_new_part_name, zookeeper_name, source_replica_path,
                 address.host, address.replication_port, timeouts, credentials->getUser(), credentials->getPassword(),
                 interserver_scheme, replicated_fetches_throttler, false, TMP_PREFIX + "fetch_");
 
@@ -2415,7 +2468,7 @@ void StorageReplicatedMergeTree::executeClonePartFromShard(const LogEntry & entr
                                 interserver_scheme, address.scheme, address.host);
 
             return fetcher.fetchSelectedPart(
-                metadata_snapshot, getContext(), entry.new_part_name, source_replica_path,
+                metadata_snapshot, getContext(), entry.new_part_name, zookeeper_name, source_replica_path,
                 address.host, address.replication_port,
                 timeouts, credentials->getUser(), credentials->getPassword(), interserver_scheme,
                 replicated_fetches_throttler, true);
@@ -2453,8 +2506,7 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
         {
             /// We check that it was not suddenly upgraded to new version.
             /// Otherwise it can be upgraded and instantly become lost, but we cannot notice that.
-            ops.push_back(zkutil::makeCreateRequest(fs::path(source_path) / "is_lost", "0", zkutil::CreateMode::Persistent));
-            ops.push_back(zkutil::makeRemoveRequest(fs::path(source_path) / "is_lost", -1));
+            zkutil::addCheckNotExistsRequest(ops, *zookeeper, fs::path(source_path) / "is_lost");
         }
         else /// The replica we clone should not suddenly become lost.
             ops.push_back(zkutil::makeCheckRequest(fs::path(source_path) / "is_lost", source_is_lost_stat.version));
@@ -2751,7 +2803,7 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
             const String & entry_name = entry_info.parsed_entry->znode_name;
             const auto & entry_type = entry_info.parsed_entry->type;
 
-            if (should_ignore_log_entry(created_get_parts, part_name, fmt::format("Not copying {} {} ", entry_name, entry_type)))
+            if (should_ignore_log_entry(created_get_parts, part_name, fmt::format("Not copying {} {}", entry_name, entry_type)))
                 continue;
 
             if (entry_info.parsed_entry->type == LogEntry::GET_PART)
@@ -2782,8 +2834,9 @@ void StorageReplicatedMergeTree::cloneMetadataIfNeeded(const String & source_rep
         return;
     }
 
+    auto metadata_snapshot = getInMemoryMetadataPtr();
     Int32 source_metadata_version = parse<Int32>(source_metadata_version_str);
-    if (metadata_version == source_metadata_version)
+    if (metadata_snapshot->getMetadataVersion() == source_metadata_version)
         return;
 
     /// Our metadata it not up to date with source replica metadata.
@@ -2801,7 +2854,7 @@ void StorageReplicatedMergeTree::cloneMetadataIfNeeded(const String & source_rep
     /// if all such entries were cleaned up from the log and source_queue.
 
     LOG_WARNING(log, "Metadata version ({}) on replica is not up to date with metadata ({}) on source replica {}",
-                metadata_version, source_metadata_version, source_replica);
+                metadata_snapshot->getMetadataVersion(), source_metadata_version, source_replica);
 
     String source_metadata;
     String source_columns;
@@ -2951,7 +3004,8 @@ void StorageReplicatedMergeTree::cloneReplicaIfNeeded(zkutil::ZooKeeperPtr zooke
     }
 
     if (source_replica.empty())
-        throw Exception(ErrorCodes::ALL_REPLICAS_LOST, "All replicas are lost");
+        throw Exception(ErrorCodes::ALL_REPLICAS_LOST, "All replicas are lost. "
+                        "See SYSTEM DROP REPLICA and SYSTEM RESTORE REPLICA queries, they may help");
 
     if (is_new_replica)
         LOG_INFO(log, "Will mimic {}", source_replica);
@@ -3199,7 +3253,7 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
 
         auto zookeeper = getZooKeeperAndAssertNotReadonly();
 
-        ReplicatedMergeTreeMergePredicate merge_pred = queue.getMergePredicate(zookeeper, getAllPartitionIds());
+        std::optional<ReplicatedMergeTreeMergePredicate> merge_pred;
 
         /// If many merges is already queued, then will queue only small enough merges.
         /// Otherwise merge queue could be filled with only large merges,
@@ -3207,7 +3261,14 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
 
         auto merges_and_mutations_queued = queue.countMergesAndPartMutations();
         size_t merges_and_mutations_sum = merges_and_mutations_queued.merges + merges_and_mutations_queued.mutations;
-        if (merges_and_mutations_sum >= storage_settings_ptr->max_replicated_merges_in_queue)
+        if (!canEnqueueBackgroundTask())
+        {
+            LOG_TRACE(log, "Reached memory limit for the background tasks ({}), so won't select new parts to merge or mutate."
+                "Current background tasks memory usage: {}.",
+                formatReadableSizeWithBinarySuffix(background_memory_tracker.getSoftLimit()),
+                formatReadableSizeWithBinarySuffix(background_memory_tracker.get()));
+        }
+        else if (merges_and_mutations_sum >= storage_settings_ptr->max_replicated_merges_in_queue)
         {
             LOG_TRACE(log, "Number of queued merges ({}) and part mutations ({})"
                 " is greater than max_replicated_merges_in_queue ({}), so won't select new parts to merge or mutate.",
@@ -3229,8 +3290,22 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
             if (storage_settings.get()->assign_part_uuids)
                 future_merged_part->uuid = UUIDHelpers::generateV4();
 
-            if (max_source_parts_size_for_merge > 0 &&
-                merger_mutator.selectPartsToMerge(future_merged_part, false, max_source_parts_size_for_merge, merge_pred, merge_with_ttl_allowed, NO_TRANSACTION_PTR, nullptr) == SelectPartsDecision::SELECTED)
+            bool can_assign_merge = max_source_parts_size_for_merge > 0;
+            PartitionIdsHint partitions_to_merge_in;
+            if (can_assign_merge)
+            {
+                auto lightweight_merge_pred = LocalMergePredicate(queue);
+                partitions_to_merge_in = merger_mutator.getPartitionsThatMayBeMerged(
+                    max_source_parts_size_for_merge, lightweight_merge_pred, merge_with_ttl_allowed, NO_TRANSACTION_PTR);
+                if (partitions_to_merge_in.empty())
+                    can_assign_merge = false;
+                else
+                    merge_pred.emplace(queue.getMergePredicate(zookeeper, partitions_to_merge_in));
+            }
+
+            if (can_assign_merge &&
+                merger_mutator.selectPartsToMerge(future_merged_part, false, max_source_parts_size_for_merge, *merge_pred,
+                                                  merge_with_ttl_allowed, NO_TRANSACTION_PTR, nullptr, &partitions_to_merge_in) == SelectPartsDecision::SELECTED)
             {
                 create_result = createLogEntryToMergeParts(
                     zookeeper,
@@ -3242,13 +3317,17 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
                     deduplicate_by_columns,
                     cleanup,
                     nullptr,
-                    merge_pred.getVersion(),
+                    merge_pred->getVersion(),
                     future_merged_part->merge_type);
             }
             /// If there are many mutations in queue, it may happen, that we cannot enqueue enough merges to merge all new parts
             else if (max_source_part_size_for_mutation > 0 && queue.countMutations() > 0
                      && merges_and_mutations_queued.mutations < storage_settings_ptr->max_replicated_mutations_in_queue)
             {
+                /// We don't need the list of committing blocks to choose a part to mutate
+                if (!merge_pred)
+                    merge_pred.emplace(queue.getMergePredicate(zookeeper, PartitionIdsHint{}));
+
                 /// Choose a part to mutate.
                 DataPartsVector data_parts = getDataPartsVectorForInternalUsage();
                 for (const auto & part : data_parts)
@@ -3256,7 +3335,7 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
                     if (part->getBytesOnDisk() > max_source_part_size_for_mutation)
                         continue;
 
-                    std::optional<std::pair<Int64, int>> desired_mutation_version = merge_pred.getDesiredMutationVersion(part);
+                    std::optional<std::pair<Int64, int>> desired_mutation_version = merge_pred->getDesiredMutationVersion(part);
                     if (!desired_mutation_version)
                         continue;
 
@@ -3265,7 +3344,7 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
                         future_merged_part->uuid,
                         desired_mutation_version->first,
                         desired_mutation_version->second,
-                        merge_pred.getVersion());
+                        merge_pred->getVersion());
 
                     if (create_result == CreateMergeEntryResult::Ok ||
                         create_result == CreateMergeEntryResult::LogUpdated)
@@ -3487,22 +3566,6 @@ void StorageReplicatedMergeTree::getRemovePartFromZooKeeperOps(const String & pa
     ops.emplace_back(zkutil::makeRemoveRequest(part_path, -1));
 }
 
-void StorageReplicatedMergeTree::removePartFromZooKeeper(const String & part_name)
-{
-    auto zookeeper = getZooKeeper();
-    String part_path = fs::path(replica_path) / "parts" / part_name;
-    Coordination::Stat stat;
-
-    /// Part doesn't exist, nothing to remove
-    if (!zookeeper->exists(part_path, &stat))
-        return;
-
-    Coordination::Requests ops;
-
-    getRemovePartFromZooKeeperOps(part_name, ops, stat.numChildren > 0);
-    zookeeper->multi(ops);
-}
-
 void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_name, bool storage_init)
 {
     auto zookeeper = getZooKeeper();
@@ -3523,6 +3586,8 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
         part->makeCloneInDetached("covered-by-broken", getInMemoryMetadataPtr());
     }
 
+    ThreadFuzzer::maybeInjectSleep();
+
     /// It's possible that queue contains entries covered by part_name.
     /// For example, we had GET_PART all_1_42_5 and MUTATE_PART all_1_42_5_63,
     /// then all_1_42_5_63 was executed by fetching, but part was written to disk incorrectly.
@@ -3535,6 +3600,8 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
     ///       because we may have some covered parts (more precisely, parts with the same min and max blocks)
     queue.removePartProducingOpsInRange(zookeeper, broken_part_info, /* covering_entry= */ {});
 
+    ThreadFuzzer::maybeInjectSleep();
+
     String part_path = fs::path(replica_path) / "parts" / part_name;
 
     while (true)
@@ -3544,7 +3611,8 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
 
         time_t part_create_time = 0;
         Coordination::Stat stat;
-        if (zookeeper->exists(part_path, &stat))
+        bool exists_in_zookeeper = zookeeper->exists(part_path, &stat);
+        if (exists_in_zookeeper)
         {
             /// Update version of /is_lost node to avoid race condition with cloneReplica(...).
             /// cloneReplica(...) expects that if some entry was executed, then its new_part_name is added to /parts,
@@ -3558,13 +3626,6 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
             getRemovePartFromZooKeeperOps(part_name, ops, stat.numChildren > 0);
         }
 
-
-        LogEntryPtr log_entry = std::make_shared<LogEntry>();
-        log_entry->type = LogEntry::GET_PART;
-        log_entry->create_time = part_create_time;
-        log_entry->source_replica = "";
-        log_entry->new_part_name = part_name;
-
         if (!storage_init)
         {
             /// We use merge predicate + version check here, because DROP RANGE update log version and we are trying to avoid race with it. We must be sure, that our part
@@ -3580,13 +3641,25 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
             ReplicatedMergeTreeMergePredicate merge_pred = queue.getMergePredicate(zookeeper, PartitionIdsHint{broken_part_info.partition_id});
             if (merge_pred.isGoingToBeDropped(broken_part_info))
             {
-                LOG_INFO(log, "Broken part {} is covered by drop range, don't need to fetch it", part_name);
+                LOG_INFO(log, "Broken part {} is covered by drop range, don't need to fetch it, removing it from ZooKeeper", part_name);
+
+                /// But we have to remove it from ZooKeeper because broken parts are not removed from ZK during Outdated parts cleanup
+                /// There's a chance that DROP_RANGE will remove it, but only if it was not already removed by cleanup thread
+                if (exists_in_zookeeper)
+                    removePartsFromZooKeeperWithRetries({part_name});
                 return;
             }
+
             /// Check that our version of log (and queue) is the most fresh. Otherwise don't create new entry fetch entry.
             ops.emplace_back(zkutil::makeCheckRequest(fs::path(zookeeper_path) / "log", merge_pred.getVersion()));
         }
 
+        LogEntryPtr log_entry = std::make_shared<LogEntry>();
+        log_entry->type = LogEntry::GET_PART;
+        log_entry->create_time = part_create_time;
+        log_entry->source_replica = "";
+        log_entry->new_part_name = part_name;
+
         ops.emplace_back(zkutil::makeCreateRequest(
             fs::path(replica_path) / "queue/queue-", log_entry->toString(),
             zkutil::CreateMode::PersistentSequential));
@@ -3979,6 +4052,7 @@ bool StorageReplicatedMergeTree::partIsLastQuorumPart(const MergeTreePartInfo &
 bool StorageReplicatedMergeTree::fetchPart(
     const String & part_name,
     const StorageMetadataPtr & metadata_snapshot,
+    const String & source_zookeeper_name,
     const String & source_replica_path,
     bool to_detached,
     size_t quorum,
@@ -4014,7 +4088,7 @@ bool StorageReplicatedMergeTree::fetchPart(
         currently_fetching_parts.erase(part_name);
     });
 
-    LOG_DEBUG(log, "Fetching part {} from {}", part_name, source_replica_path);
+    LOG_DEBUG(log, "Fetching part {} from {}:{}", part_name, source_zookeeper_name, source_replica_path);
 
     auto settings_ptr = getSettings();
     TableLockHolder table_lock_holder;
@@ -4071,7 +4145,8 @@ bool StorageReplicatedMergeTree::fetchPart(
                 }
                 else
                 {
-                    LOG_INFO(log, "Not checking checksums of part {} with replica {} because part was removed from ZooKeeper", part_name, source_replica_path);
+                    LOG_INFO(log, "Not checking checksums of part {} with replica {}:{} because part was removed from ZooKeeper",
+                        part_name, source_zookeeper_name, source_replica_path);
                 }
             }
 
@@ -4124,6 +4199,7 @@ bool StorageReplicatedMergeTree::fetchPart(
                 metadata_snapshot,
                 getContext(),
                 part_name,
+                source_zookeeper_name,
                 source_replica_path,
                 address.host,
                 address.replication_port,
@@ -4148,7 +4224,7 @@ bool StorageReplicatedMergeTree::fetchPart(
             Transaction transaction(*this, NO_TRANSACTION_RAW);
             renameTempPartAndReplace(part, transaction);
 
-            replaced_parts = checkPartChecksumsAndCommit(transaction, part, hardlinked_files);
+            replaced_parts = checkPartChecksumsAndCommit(transaction, part, hardlinked_files, !part_to_clone);
 
             /** If a quorum is tracked for this part, you must update it.
               * If you do not have time, in case of losing the session, when you restart the server - see the `ReplicatedMergeTreeRestartingThread::updateQuorumIfWeHavePart` method.
@@ -4216,7 +4292,7 @@ bool StorageReplicatedMergeTree::fetchPart(
     if (part_to_clone)
         LOG_DEBUG(log, "Cloned part {} from {}{}", part_name, part_to_clone->name, to_detached ? " (to 'detached' directory)" : "");
     else
-        LOG_DEBUG(log, "Fetched part {} from {}{}", part_name, source_replica_path, to_detached ? " (to 'detached' directory)" : "");
+        LOG_DEBUG(log, "Fetched part {} from {}:{}{}", part_name, source_zookeeper_name, source_replica_path, to_detached ? " (to 'detached' directory)" : "");
 
     return true;
 }
@@ -4255,7 +4331,7 @@ MutableDataPartStoragePtr StorageReplicatedMergeTree::fetchExistsPart(
         currently_fetching_parts.erase(part_name);
     });
 
-    LOG_DEBUG(log, "Fetching already known part {} from {}", part_name, source_replica_path);
+    LOG_DEBUG(log, "Fetching already known part {} from {}:{}", part_name, zookeeper_name, source_replica_path);
 
     TableLockHolder table_lock_holder = lockForShare(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
 
@@ -4287,7 +4363,7 @@ MutableDataPartStoragePtr StorageReplicatedMergeTree::fetchExistsPart(
                 "'{}' != '{}', can't fetch part from {}", interserver_scheme, address.scheme, address.host);
 
         return fetcher.fetchSelectedPart(
-            metadata_snapshot, getContext(), part_name, source_replica_path,
+            metadata_snapshot, getContext(), part_name, zookeeper_name, source_replica_path,
             address.host, address.replication_port,
             timeouts, credentials->getUser(), credentials->getPassword(),
             interserver_scheme, replicated_fetches_throttler, false, "", nullptr, true,
@@ -4324,7 +4400,7 @@ MutableDataPartStoragePtr StorageReplicatedMergeTree::fetchExistsPart(
 
     ProfileEvents::increment(ProfileEvents::ReplicatedPartFetches);
 
-    LOG_DEBUG(log, "Fetched part {} from {}", part_name, source_replica_path);
+    LOG_DEBUG(log, "Fetched part {} from {}:{}", part_name, zookeeper_name, source_replica_path);
     return part->getDataPartStoragePtr();
 }
 
@@ -4345,7 +4421,21 @@ void StorageReplicatedMergeTree::startupImpl(bool from_attach_thread)
 {
     /// Do not start replication if ZooKeeper is not configured or there is no metadata in zookeeper
     if (!has_metadata_in_zookeeper.has_value() || !*has_metadata_in_zookeeper)
+    {
+        if (!since_metadata_err_incr_readonly_metric)
+        {
+            since_metadata_err_incr_readonly_metric = true;
+            CurrentMetrics::add(CurrentMetrics::ReadonlyReplica);
+        }
         return;
+    }
+
+    if (since_metadata_err_incr_readonly_metric)
+    {
+        since_metadata_err_incr_readonly_metric = false;
+        CurrentMetrics::sub(CurrentMetrics::ReadonlyReplica);
+        assert(CurrentMetrics::get(CurrentMetrics::ReadonlyReplica) >= 0);
+    }
 
     try
     {
@@ -4353,12 +4443,36 @@ void StorageReplicatedMergeTree::startupImpl(bool from_attach_thread)
         InterserverIOEndpointPtr data_parts_exchange_ptr = std::make_shared<DataPartsExchange::Service>(*this);
         [[maybe_unused]] auto prev_ptr = std::atomic_exchange(&data_parts_exchange_endpoint, data_parts_exchange_ptr);
         assert(prev_ptr == nullptr);
-        getContext()->getInterserverIOHandler().addEndpoint(data_parts_exchange_ptr->getId(replica_path), data_parts_exchange_ptr);
+
+        /// The endpoint id:
+        ///     old format: DataPartsExchange:/clickhouse/tables/default/t1/{shard}/{replica}
+        ///     new format: DataPartsExchange:{zookeeper_name}:/clickhouse/tables/default/t1/{shard}/{replica}
+        /// Notice:
+        ///     They are incompatible and the default is the old format.
+        ///     If you want to use the new format, please ensure that 'enable_the_endpoint_id_with_zookeeper_name_prefix' of all nodes is true .
+        ///
+        getContext()->getInterserverIOHandler().addEndpoint(
+            data_parts_exchange_ptr->getId(getEndpointName()), data_parts_exchange_ptr);
 
         startBeingLeader();
 
-        /// In this thread replica will be activated.
-        restarting_thread.start();
+        /// Activate replica in a separate thread if we are not calling from attach thread
+        restarting_thread.start(/*schedule=*/!from_attach_thread);
+
+        if (from_attach_thread)
+        {
+            /// Try activating replica in current thread.
+            restarting_thread.run();
+        }
+        else
+        {
+            /// Wait while restarting_thread finishing initialization.
+            /// NOTE It does not mean that replication is actually started after receiving this event.
+            /// It only means that an attempt to startup replication was made.
+            /// Table may be still in readonly mode if this attempt failed for any reason.
+            startup_event.wait();
+        }
+
         /// And this is just a callback
         session_expired_callback_handler = EventNotifier::instance().subscribe(Coordination::Error::ZSESSIONEXPIRED, [this]()
         {
@@ -4366,12 +4480,6 @@ void StorageReplicatedMergeTree::startupImpl(bool from_attach_thread)
             restarting_thread.start();
         });
 
-        /// Wait while restarting_thread finishing initialization.
-        /// NOTE It does not mean that replication is actually started after receiving this event.
-        /// It only means that an attempt to startup replication was made.
-        /// Table may be still in readonly mode if this attempt failed for any reason.
-        startup_event.wait();
-
         startBackgroundMovesIfNeeded();
 
         part_moves_between_shards_orchestrator.start();
@@ -4404,14 +4512,6 @@ void StorageReplicatedMergeTree::startupImpl(bool from_attach_thread)
     }
 }
 
-void StorageReplicatedMergeTree::flush()
-{
-    if (flush_called.exchange(true))
-        return;
-
-    flushAllInMemoryPartsIfNeeded();
-}
-
 
 void StorageReplicatedMergeTree::partialShutdown()
 {
@@ -4419,6 +4519,7 @@ void StorageReplicatedMergeTree::partialShutdown()
 
     partial_shutdown_called = true;
     partial_shutdown_event.set();
+    queue.notifySubscribersOnPartialShutdown();
     replica_is_active_node = nullptr;
 
     LOG_TRACE(log, "Waiting for threads to finish");
@@ -4476,7 +4577,7 @@ void StorageReplicatedMergeTree::shutdown()
     auto data_parts_exchange_ptr = std::atomic_exchange(&data_parts_exchange_endpoint, InterserverIOEndpointPtr{});
     if (data_parts_exchange_ptr)
     {
-        getContext()->getInterserverIOHandler().removeEndpointIfExists(data_parts_exchange_ptr->getId(replica_path));
+        getContext()->getInterserverIOHandler().removeEndpointIfExists(data_parts_exchange_ptr->getId(getEndpointName()));
         /// Ask all parts exchange handlers to finish asap. New ones will fail to start
         data_parts_exchange_ptr->blocker.cancelForever();
         /// Wait for all of them
@@ -4567,6 +4668,7 @@ void StorageReplicatedMergeTree::read(
         /// reset them to avoid holding them.
         auto & snapshot_data = assert_cast<MergeTreeData::SnapshotData &>(*storage_snapshot->data);
         snapshot_data.parts = {};
+        snapshot_data.alter_conversions = {};
     });
 
     /** The `select_sequential_consistency` setting has two meanings:
@@ -4763,7 +4865,7 @@ std::optional<QueryPipeline> StorageReplicatedMergeTree::distributedWriteFromClu
                 QueryProcessingStage::Complete,
                 extension);
 
-            QueryPipeline remote_pipeline(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote));
+            QueryPipeline remote_pipeline(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote, settings.async_query_sending_for_remote));
             remote_pipeline.complete(std::make_shared<EmptySink>(remote_query_executor->getHeader()));
 
             pipeline.addCompletedPipeline(std::move(remote_pipeline));
@@ -4980,14 +5082,15 @@ bool StorageReplicatedMergeTree::optimize(
 
 bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMergeTree::LogEntry & entry)
 {
-    if (entry.alter_version < metadata_version)
+    auto current_metadata = getInMemoryMetadataPtr();
+    if (entry.alter_version < current_metadata->getMetadataVersion())
     {
         /// TODO Can we replace it with LOGICAL_ERROR?
         /// As for now, it may rarely happen due to reordering of ALTER_METADATA entries in the queue of
         /// non-initial replica and also may happen after stale replica recovery.
         LOG_WARNING(log, "Attempt to update metadata of version {} "
                          "to older version {} when processing log entry {}: {}",
-                         metadata_version, entry.alter_version, entry.znode_name, entry.toString());
+                         current_metadata->getMetadataVersion(), entry.alter_version, entry.znode_name, entry.toString());
         return true;
     }
 
@@ -5035,10 +5138,10 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
         LOG_INFO(log, "Metadata changed in ZooKeeper. Applying changes locally.");
 
         auto metadata_diff = ReplicatedMergeTreeTableMetadata(*this, getInMemoryMetadataPtr()).checkAndFindDiff(metadata_from_entry, getInMemoryMetadataPtr()->getColumns(), getContext());
-        setTableStructure(table_id, alter_context, std::move(columns_from_entry), metadata_diff);
-        metadata_version = entry.alter_version;
+        setTableStructure(table_id, alter_context, std::move(columns_from_entry), metadata_diff, entry.alter_version);
 
-        LOG_INFO(log, "Applied changes to the metadata of the table. Current metadata version: {}", metadata_version);
+        current_metadata = getInMemoryMetadataPtr();
+        LOG_INFO(log, "Applied changes to the metadata of the table. Current metadata version: {}", current_metadata->getMetadataVersion());
     }
 
     {
@@ -5050,7 +5153,7 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
 
     /// This transaction may not happen, but it's OK, because on the next retry we will eventually create/update this node
     /// TODO Maybe do in in one transaction for Replicated database?
-    zookeeper->createOrUpdate(fs::path(replica_path) / "metadata_version", std::to_string(metadata_version), zkutil::CreateMode::Persistent);
+    zookeeper->createOrUpdate(fs::path(replica_path) / "metadata_version", std::to_string(current_metadata->getMetadataVersion()), zkutil::CreateMode::Persistent);
 
     return true;
 }
@@ -5174,7 +5277,7 @@ void StorageReplicatedMergeTree::alter(
         size_t mutation_path_idx = std::numeric_limits<size_t>::max();
 
         String new_metadata_str = future_metadata_in_zk.toString();
-        ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "metadata", new_metadata_str, metadata_version));
+        ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "metadata", new_metadata_str, current_metadata->getMetadataVersion()));
 
         String new_columns_str = future_metadata.columns.toString();
         ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "columns", new_columns_str, -1));
@@ -5190,7 +5293,7 @@ void StorageReplicatedMergeTree::alter(
 
         /// We can be sure, that in case of successful commit in zookeeper our
         /// version will increments by 1. Because we update with version check.
-        int new_metadata_version = metadata_version + 1;
+        int new_metadata_version = current_metadata->getMetadataVersion() + 1;
 
         alter_entry->type = LogEntry::ALTER_METADATA;
         alter_entry->source_replica = replica_name;
@@ -5200,7 +5303,10 @@ void StorageReplicatedMergeTree::alter(
         alter_entry->create_time = time(nullptr);
 
         auto maybe_mutation_commands = commands.getMutationCommands(
-            *current_metadata, query_context->getSettingsRef().materialize_ttl_after_modify, query_context);
+            *current_metadata,
+            query_context->getSettingsRef().materialize_ttl_after_modify,
+            query_context);
+
         bool have_mutation = !maybe_mutation_commands.empty();
         alter_entry->have_mutation = have_mutation;
 
@@ -5209,11 +5315,12 @@ void StorageReplicatedMergeTree::alter(
             fs::path(zookeeper_path) / "log/log-", alter_entry->toString(), zkutil::CreateMode::PersistentSequential));
 
         PartitionBlockNumbersHolder partition_block_numbers_holder;
+        ReplicatedMergeTreeMutationEntry mutation_entry;
         if (have_mutation)
         {
+            delayMutationOrThrowIfNeeded(&partial_shutdown_event, query_context);
             const String mutations_path(fs::path(zookeeper_path) / "mutations");
 
-            ReplicatedMergeTreeMutationEntry mutation_entry;
             mutation_entry.alter_version = new_metadata_version;
             mutation_entry.source_replica = replica_name;
             mutation_entry.commands = std::move(maybe_mutation_commands);
@@ -5265,12 +5372,16 @@ void StorageReplicatedMergeTree::alter(
                 /// ReplicatedMergeTreeMutationEntry record in /mutations
                 String mutation_path = dynamic_cast<const Coordination::CreateResponse &>(*results[mutation_path_idx]).path_created;
                 mutation_znode = mutation_path.substr(mutation_path.find_last_of('/') + 1);
+                LOG_DEBUG(log, "Created log entry {} to update table metadata to version {}, created a mutation {} (data versions: {})",
+                          alter_entry->znode_name, alter_entry->alter_version, *mutation_znode, mutation_entry.getBlockNumbersForLogs());
             }
             else
             {
                 /// ALTER_METADATA record in replication /log
                 String alter_path = dynamic_cast<const Coordination::CreateResponse &>(*results[alter_path_idx]).path_created;
                 alter_entry->znode_name = alter_path.substr(alter_path.find_last_of('/') + 1);
+                LOG_DEBUG(log, "Created log entry {} to update table metadata to version {}",
+                          alter_entry->znode_name, alter_entry->alter_version);
             }
             break;
         }
@@ -5954,6 +6065,7 @@ void StorageReplicatedMergeTree::getStatus(ReplicatedTableStatus & res, bool wit
     /// NOTE: consider convert to UInt64
     res.parts_to_check = static_cast<UInt32>(part_check_thread.size());
 
+    res.zookeeper_name = zookeeper_name;
     res.zookeeper_path = zookeeper_path;
     res.replica_name = replica_name;
     res.replica_path = replica_path;
@@ -5963,6 +6075,7 @@ void StorageReplicatedMergeTree::getStatus(ReplicatedTableStatus & res, bool wit
     res.log_pointer = 0;
     res.total_replicas = 0;
     res.active_replicas = 0;
+    res.lost_part_count = 0;
     res.last_queue_update_exception = getLastQueueUpdateException();
 
     if (with_zk_fields && !res.is_session_expired)
@@ -5979,6 +6092,7 @@ void StorageReplicatedMergeTree::getStatus(ReplicatedTableStatus & res, bool wit
 
             paths.clear();
             paths.push_back(fs::path(replica_path) / "log_pointer");
+            paths.push_back(fs::path(zookeeper_path) / "lost_part_count");
             for (const String & replica : all_replicas)
                 paths.push_back(fs::path(zookeeper_path) / "replicas" / replica / "is_active");
 
@@ -5996,10 +6110,14 @@ void StorageReplicatedMergeTree::getStatus(ReplicatedTableStatus & res, bool wit
 
             res.log_pointer = log_pointer_str.empty() ? 0 : parse<UInt64>(log_pointer_str);
             res.total_replicas = all_replicas.size();
+            if (get_result[1].error == Coordination::Error::ZNONODE)
+                res.lost_part_count = 0;
+            else
+                res.lost_part_count = get_result[1].data.empty() ? 0 : parse<UInt64>(get_result[1].data);
 
             for (size_t i = 0, size = all_replicas.size(); i < size; ++i)
             {
-                bool is_replica_active = get_result[i + 1].error != Coordination::Error::ZNONODE;
+                bool is_replica_active = get_result[i + 2].error != Coordination::Error::ZNONODE;
                 res.active_replicas += static_cast<UInt8>(is_replica_active);
                 res.replica_is_active.emplace(all_replicas[i], is_replica_active);
             }
@@ -6142,14 +6260,14 @@ void StorageReplicatedMergeTree::fetchPartition(
     info.table_id = getStorageID();
     info.table_id.uuid = UUIDHelpers::Nil;
     auto expand_from = query_context->getMacros()->expand(from_, info);
-    String auxiliary_zookeeper_name = zkutil::extractZooKeeperName(expand_from);
+    String from_zookeeper_name = zkutil::extractZooKeeperName(expand_from);
     String from = zkutil::extractZooKeeperPath(expand_from, /* check_starts_with_slash */ true);
     if (from.empty())
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "ZooKeeper path should not be empty");
 
     zkutil::ZooKeeperPtr zookeeper;
-    if (auxiliary_zookeeper_name != default_zookeeper_name)
-        zookeeper = getContext()->getAuxiliaryZooKeeper(auxiliary_zookeeper_name);
+    if (from_zookeeper_name != default_zookeeper_name)
+        zookeeper = getContext()->getAuxiliaryZooKeeper(from_zookeeper_name);
     else
         zookeeper = getZooKeeper();
 
@@ -6168,12 +6286,12 @@ void StorageReplicatedMergeTree::fetchPartition(
           */
         if (checkIfDetachedPartExists(part_name))
             throw Exception(ErrorCodes::DUPLICATE_DATA_PART, "Detached part {} already exists.", part_name);
-        LOG_INFO(log, "Will fetch part {} from shard {} (zookeeper '{}')", part_name, from_, auxiliary_zookeeper_name);
+        LOG_INFO(log, "Will fetch part {} from shard {}", part_name, from_);
 
         try
         {
             /// part name , metadata, part_path , true, 0, zookeeper
-            if (!fetchPart(part_name, metadata_snapshot, part_path, true, 0, zookeeper, /* try_fetch_shared = */ false))
+            if (!fetchPart(part_name, metadata_snapshot, from_zookeeper_name, part_path, true, 0, zookeeper, /* try_fetch_shared = */ false))
                 throw Exception(ErrorCodes::UNFINISHED, "Failed to fetch part {} from {}", part_name, from_);
         }
         catch (const DB::Exception & e)
@@ -6188,7 +6306,7 @@ void StorageReplicatedMergeTree::fetchPartition(
     }
 
     String partition_id = getPartitionIDFromQuery(partition, query_context);
-    LOG_INFO(log, "Will fetch partition {} from shard {} (zookeeper '{}')", partition_id, from_, auxiliary_zookeeper_name);
+    LOG_INFO(log, "Will fetch partition {} from shard {}", partition_id, from_);
 
     /** Let's check that there is no such partition in the `detached` directory (where we will write the downloaded parts).
       * Unreliable (there is a race condition) - such a partition may appear a little later.
@@ -6212,7 +6330,7 @@ void StorageReplicatedMergeTree::fetchPartition(
                 active_replicas.push_back(replica);
 
         if (active_replicas.empty())
-            throw Exception(ErrorCodes::NO_ACTIVE_REPLICAS, "No active replicas for shard {}", from);
+            throw Exception(ErrorCodes::NO_ACTIVE_REPLICAS, "No active replicas for shard {}", from_);
 
         /** You must select the best (most relevant) replica.
         * This is a replica with the maximum `log_pointer`, then with the minimum `queue` size.
@@ -6266,7 +6384,8 @@ void StorageReplicatedMergeTree::fetchPartition(
             LOG_INFO(log, "Some of parts ({}) are missing. Will try to fetch covering parts.", missing_parts.size());
 
         if (try_no >= query_context->getSettings().max_fetch_partition_retries_count)
-            throw Exception(ErrorCodes::TOO_MANY_RETRIES_TO_FETCH_PARTS, "Too many retries to fetch parts from {}", best_replica_path);
+            throw Exception(ErrorCodes::TOO_MANY_RETRIES_TO_FETCH_PARTS,
+                "Too many retries to fetch parts from {}:{}", from_zookeeper_name, best_replica_path);
 
         Strings parts = zookeeper->getChildren(fs::path(best_replica_path) / "parts");
         ActiveDataPartSet active_parts_set(format_version, parts);
@@ -6287,7 +6406,8 @@ void StorageReplicatedMergeTree::fetchPartition(
             parts_to_fetch = std::move(parts_to_fetch_partition);
 
             if (parts_to_fetch.empty())
-                throw Exception(ErrorCodes::PARTITION_DOESNT_EXIST, "Partition {} on {} doesn't exist", partition_id, best_replica_path);
+                throw Exception(ErrorCodes::PARTITION_DOESNT_EXIST,
+                    "Partition {} on {}:{} doesn't exist", partition_id, from_zookeeper_name, best_replica_path);
         }
         else
         {
@@ -6297,7 +6417,7 @@ void StorageReplicatedMergeTree::fetchPartition(
                 if (!containing_part.empty())
                     parts_to_fetch.push_back(containing_part);
                 else
-                    LOG_WARNING(log, "Part {} on replica {} has been vanished.", missing_part, best_replica_path);
+                    LOG_WARNING(log, "Part {} on replica {}:{} has been vanished.", missing_part, from_zookeeper_name, best_replica_path);
             }
         }
 
@@ -6310,7 +6430,7 @@ void StorageReplicatedMergeTree::fetchPartition(
 
             try
             {
-                fetched = fetchPart(part, metadata_snapshot, best_replica_path, true, 0, zookeeper, /* try_fetch_shared = */ false);
+                fetched = fetchPart(part, metadata_snapshot, from_zookeeper_name, best_replica_path, true, 0, zookeeper, /* try_fetch_shared = */ false);
             }
             catch (const DB::Exception & e)
             {
@@ -6385,6 +6505,8 @@ void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, Conte
     /// After all needed parts are mutated (i.e. all active parts have the mutation version greater than
     /// the version of this mutation), the mutation is considered done and can be deleted.
 
+    delayMutationOrThrowIfNeeded(&partial_shutdown_event, query_context);
+
     ReplicatedMergeTreeMutationEntry mutation_entry;
     mutation_entry.source_replica = replica_name;
     mutation_entry.commands = commands;
@@ -6427,7 +6549,8 @@ void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, Conte
             const String & path_created =
                 dynamic_cast<const Coordination::CreateResponse *>(responses[1].get())->path_created;
             mutation_entry.znode_name = path_created.substr(path_created.find_last_of('/') + 1);
-            LOG_TRACE(log, "Created mutation with ID {}", mutation_entry.znode_name);
+            LOG_TRACE(log, "Created mutation with ID {} (data versions: {})",
+                      mutation_entry.znode_name, mutation_entry.getBlockNumbersForLogs());
             break;
         }
         else if (rc == Coordination::Error::ZBADVERSION)
@@ -6528,10 +6651,12 @@ void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
 
     for (const auto & part : parts)
     {
-        if (!part->is_duplicate)
-            parts_to_delete_completely.emplace_back(part);
-        else
+        /// Broken part can be removed from zk by removePartAndEnqueueFetch(...) only.
+        /// Removal without enqueueing a fetch leads to intersecting parts.
+        if (part->is_duplicate || part->outdated_because_broken)
             parts_to_delete_only_from_filesystem.emplace_back(part);
+        else
+            parts_to_delete_completely.emplace_back(part);
     }
     parts.clear();
 
@@ -7580,44 +7705,54 @@ void StorageReplicatedMergeTree::onActionLockRemove(StorageActionBlockType actio
         background_moves_assignee.trigger();
 }
 
-bool StorageReplicatedMergeTree::waitForProcessingQueue(UInt64 max_wait_milliseconds)
+bool StorageReplicatedMergeTree::waitForProcessingQueue(UInt64 max_wait_milliseconds, SyncReplicaMode sync_mode)
 {
-    Stopwatch watch;
-
     /// Let's fetch new log entries firstly
     queue.pullLogsToQueue(getZooKeeperAndAssertNotReadonly(), {}, ReplicatedMergeTreeQueue::SYNC);
+
+    if (sync_mode == SyncReplicaMode::PULL)
+        return true;
+
     /// This is significant, because the execution of this task could be delayed at BackgroundPool.
     /// And we force it to be executed.
     background_operations_assignee.trigger();
 
     std::unordered_set<String> wait_for_ids;
-    bool set_ids_to_wait = true;
+    std::atomic_bool was_interrupted = false;
 
     Poco::Event target_entry_event;
-    auto callback = [&target_entry_event, &wait_for_ids, &set_ids_to_wait](size_t new_queue_size, std::unordered_set<String> log_entry_ids, std::optional<String> removed_log_entry_id)
+    auto callback = [this, &target_entry_event, &wait_for_ids, &was_interrupted, sync_mode]
+        (size_t new_queue_size, const String * removed_log_entry_id)
     {
-        if (set_ids_to_wait)
+        if (partial_shutdown_called)
         {
-            wait_for_ids = log_entry_ids;
-            set_ids_to_wait = false;
+            was_interrupted = true;
+            target_entry_event.set();
+            return;
         }
 
-        if (removed_log_entry_id.has_value())
-            wait_for_ids.erase(removed_log_entry_id.value());
+        if (sync_mode == SyncReplicaMode::STRICT)
+        {
+            /// Wait for queue to become empty
+            if (new_queue_size == 0)
+                target_entry_event.set();
+            return;
+        }
 
-        if (wait_for_ids.empty() || new_queue_size == 0)
+        if (removed_log_entry_id)
+            wait_for_ids.erase(*removed_log_entry_id);
+
+        if (wait_for_ids.empty())
             target_entry_event.set();
     };
-    const auto handler = queue.addSubscriber(std::move(callback));
+    const auto handler = queue.addSubscriber(std::move(callback), wait_for_ids, sync_mode);
 
-    while (!target_entry_event.tryWait(50))
-    {
-        if (max_wait_milliseconds && watch.elapsedMilliseconds() > max_wait_milliseconds)
-            return false;
+    if (!target_entry_event.tryWait(max_wait_milliseconds))
+        return false;
+
+    if (was_interrupted)
+        throw Exception(ErrorCodes::ABORTED, "Shutdown is called for table");
 
-        if (partial_shutdown_called)
-            throw Exception(ErrorCodes::ABORTED, "Shutdown is called for table");
-    }
     return true;
 }
 
@@ -7964,9 +8099,9 @@ bool StorageReplicatedMergeTree::canUseAdaptiveGranularity() const
 }
 
 
-MutationCommands StorageReplicatedMergeTree::getFirstAlterMutationCommandsForPart(const DataPartPtr & part) const
+std::map<int64_t, MutationCommands> StorageReplicatedMergeTree::getAlterMutationCommandsForPart(const DataPartPtr & part) const
 {
-    return queue.getFirstAlterMutationCommandsForPart(part);
+    return queue.getAlterMutationCommandsForPart(part);
 }
 
 
@@ -7982,7 +8117,6 @@ std::unique_ptr<MergeTreeSettings> StorageReplicatedMergeTree::getDefaultSetting
     return std::make_unique<MergeTreeSettings>(getContext()->getReplicatedMergeTreeSettings());
 }
 
-
 String StorageReplicatedMergeTree::getTableSharedID() const
 {
     std::lock_guard lock(table_shared_id_mutex);
@@ -8003,6 +8137,10 @@ String StorageReplicatedMergeTree::getTableSharedID() const
     return toString(table_shared_id);
 }
 
+size_t StorageReplicatedMergeTree::getNumberOfUnfinishedMutations() const
+{
+    return queue.countUnfinishedMutations();
+}
 
 void StorageReplicatedMergeTree::createTableSharedID() const
 {
@@ -8078,31 +8216,31 @@ std::optional<String> StorageReplicatedMergeTree::tryGetTableSharedIDFromCreateQ
 }
 
 
-void StorageReplicatedMergeTree::lockSharedDataTemporary(const String & part_name, const String & part_id, const DiskPtr & disk) const
+zkutil::EphemeralNodeHolderPtr StorageReplicatedMergeTree::lockSharedDataTemporary(const String & part_name, const String & part_id, const DiskPtr & disk) const
 {
     auto settings = getSettings();
 
     if (!disk || !disk->supportZeroCopyReplication() || !settings->allow_remote_fs_zero_copy_replication)
-        return;
+        return {};
 
     zkutil::ZooKeeperPtr zookeeper = tryGetZooKeeper();
     if (!zookeeper)
-        return;
+        return {};
 
     String id = part_id;
     boost::replace_all(id, "/", "_");
 
-    Strings zc_zookeeper_paths = getZeroCopyPartPath(*getSettings(), toString(disk->getDataSourceDescription().type), getTableSharedID(),
-        part_name, zookeeper_path);
+    String zc_zookeeper_path = getZeroCopyPartPath(*getSettings(), toString(disk->getDataSourceDescription().type), getTableSharedID(),
+        part_name, zookeeper_path)[0];
 
-    for (const auto & zc_zookeeper_path : zc_zookeeper_paths)
-    {
-        String zookeeper_node = fs::path(zc_zookeeper_path) / id / replica_name;
+    String zookeeper_node = fs::path(zc_zookeeper_path) / id / replica_name;
 
-        LOG_TRACE(log, "Set zookeeper temporary ephemeral lock {}", zookeeper_node);
-        createZeroCopyLockNode(
-            std::make_shared<ZooKeeperWithFaultInjection>(zookeeper), zookeeper_node, zkutil::CreateMode::Ephemeral, false);
-    }
+    LOG_TRACE(log, "Set zookeeper temporary ephemeral lock {}", zookeeper_node);
+    createZeroCopyLockNode(
+        std::make_shared<ZooKeeperWithFaultInjection>(zookeeper), zookeeper_node, zkutil::CreateMode::Ephemeral, false);
+
+    LOG_TRACE(log, "Zookeeper temporary ephemeral lock {} created", zookeeper_node);
+    return zkutil::EphemeralNodeHolder::existing(zookeeper_node, *zookeeper);
 }
 
 void StorageReplicatedMergeTree::lockSharedData(
@@ -8110,6 +8248,7 @@ void StorageReplicatedMergeTree::lockSharedData(
     bool replace_existing_lock,
     std::optional<HardlinkedFiles> hardlinked_files) const
 {
+    LOG_DEBUG(log, "Trying to create zero-copy lock for part {}", part.name);
     auto zookeeper = tryGetZooKeeper();
     if (zookeeper)
         return lockSharedData(part, std::make_shared<ZooKeeperWithFaultInjection>(zookeeper), replace_existing_lock, hardlinked_files);
@@ -8117,6 +8256,54 @@ void StorageReplicatedMergeTree::lockSharedData(
         return lockSharedData(part, std::make_shared<ZooKeeperWithFaultInjection>(nullptr), replace_existing_lock, hardlinked_files);
 }
 
+void StorageReplicatedMergeTree::getLockSharedDataOps(
+    const IMergeTreeDataPart & part,
+    const ZooKeeperWithFaultInjectionPtr & zookeeper,
+    bool replace_existing_lock,
+    std::optional<HardlinkedFiles> hardlinked_files,
+    Coordination::Requests & requests) const
+{
+    auto settings = getSettings();
+
+    if (!part.isStoredOnDisk() || !settings->allow_remote_fs_zero_copy_replication)
+        return;
+
+    if (!part.getDataPartStorage().supportZeroCopyReplication())
+        return;
+
+    if (zookeeper->isNull())
+        return;
+
+    String id = part.getUniqueId();
+    boost::replace_all(id, "/", "_");
+
+    Strings zc_zookeeper_paths = getZeroCopyPartPath(
+        *getSettings(), part.getDataPartStorage().getDiskType(), getTableSharedID(),
+        part.name, zookeeper_path);
+
+    String path_to_set_hardlinked_files;
+    NameSet hardlinks;
+
+    if (hardlinked_files.has_value() && !hardlinked_files->hardlinks_from_source_part.empty())
+    {
+        path_to_set_hardlinked_files = getZeroCopyPartPath(
+            *getSettings(), part.getDataPartStorage().getDiskType(), hardlinked_files->source_table_shared_id,
+            hardlinked_files->source_part_name, zookeeper_path)[0];
+
+        hardlinks = hardlinked_files->hardlinks_from_source_part;
+    }
+
+    for (const auto & zc_zookeeper_path : zc_zookeeper_paths)
+    {
+        String zookeeper_node = fs::path(zc_zookeeper_path) / id / replica_name;
+
+        getZeroCopyLockNodeCreateOps(
+            zookeeper, zookeeper_node, requests, zkutil::CreateMode::Persistent,
+            replace_existing_lock, path_to_set_hardlinked_files, hardlinks);
+    }
+}
+
+
 void StorageReplicatedMergeTree::lockSharedData(
     const IMergeTreeDataPart & part,
     const ZooKeeperWithFaultInjectionPtr & zookeeper,
@@ -8157,11 +8344,13 @@ void StorageReplicatedMergeTree::lockSharedData(
     {
         String zookeeper_node = fs::path(zc_zookeeper_path) / id / replica_name;
 
-        LOG_TRACE(log, "Set zookeeper persistent lock {}", zookeeper_node);
+        LOG_TRACE(log, "Trying to create zookeeper persistent lock {} with hardlinks [{}]", zookeeper_node, fmt::join(hardlinks, ", "));
 
         createZeroCopyLockNode(
             zookeeper, zookeeper_node, zkutil::CreateMode::Persistent,
             replace_existing_lock, path_to_set_hardlinked_files, hardlinks);
+
+        LOG_TRACE(log, "Zookeeper persistent lock {} created", zookeeper_node);
     }
 }
 
@@ -8224,6 +8413,33 @@ StorageReplicatedMergeTree::unlockSharedData(const IMergeTreeDataPart & part, co
         return std::make_pair(true, NameSet{});
     }
 
+    if (part.getState() == MergeTreeDataPartState::Temporary && part.is_temp)
+    {
+        /// Part {} is in temporary state and has it_temp flag. it means that it is under construction.
+        /// That path hasn't been added to active set, no commit procedure has begun.
+        /// The metadata files is about to delete now. Clichouse has to make a decision remove or preserve blobs on remote FS.
+        /// In general remote data might be shared and has to be unlocked in the keeper before removing.
+        /// However there are some cases when decision is clear without asking keeper:
+        /// When the part has been fetched then remote data has to be preserved, part doesn't own it.
+        /// When the part has been merged then remote data can be removed, part owns it.
+        /// In opposition, when the part has been mutated in generally it hardlinks the files from source part.
+        /// Therefore remote data could be shared, it has to be unlocked in the keeper.
+        /// In order to track all that cases remove_tmp_policy is used.
+        /// Clickhouse set that field as REMOVE_BLOBS or PRESERVE_BLOBS when it sure about the decision without asking keeper.
+
+        if (part.remove_tmp_policy == IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::REMOVE_BLOBS
+            || part.remove_tmp_policy == IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::PRESERVE_BLOBS)
+        {
+            bool can_remove_blobs = part.remove_tmp_policy == IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::REMOVE_BLOBS;
+            LOG_INFO(log, "Looks like CH knows the origin of that part. "
+                          "Part {} can be deleted without unlocking shared data in zookeeper. "
+                          "Part blobs {}.",
+                     part.name,
+                     can_remove_blobs ? "will be removed" : "have to be preserved");
+            return std::make_pair(can_remove_blobs, NameSet{});
+        }
+    }
+
     if (has_metadata_in_zookeeper.has_value() && !has_metadata_in_zookeeper)
     {
         if (zookeeper->exists(zookeeper_path))
@@ -8251,7 +8467,7 @@ StorageReplicatedMergeTree::unlockSharedData(const IMergeTreeDataPart & part, co
         return std::make_pair(true, NameSet{});
 
     return unlockSharedDataByID(
-        part.getUniqueId(), shared_id, part.name, replica_name,
+        part.getUniqueId(), shared_id, part.info, replica_name,
         part.getDataPartStorage().getDiskType(), zookeeper, *getSettings(), log, zookeeper_path, format_version);
 }
 
@@ -8268,11 +8484,10 @@ namespace
 /// But sometimes we need an opposite. When we deleting all_0_0_0_1 it can be non replicated to other replicas, so we are the only owner of this part.
 /// In this case when we will drop all_0_0_0_1 we will drop blobs for all_0_0_0. But it will lead to dataloss. For such case we need to check that other replicas
 /// still need parent part.
-std::pair<bool, NameSet> getParentLockedBlobs(const ZooKeeperWithFaultInjectionPtr & zookeeper_ptr, const std::string & zero_copy_part_path_prefix, const std::string & part_info_str, MergeTreeDataFormatVersion format_version, Poco::Logger * log)
+std::pair<bool, std::optional<NameSet>> getParentLockedBlobs(const ZooKeeperWithFaultInjectionPtr & zookeeper_ptr, const std::string & zero_copy_part_path_prefix, const MergeTreePartInfo & part_info, MergeTreeDataFormatVersion format_version, Poco::Logger * log)
 {
     NameSet files_not_to_remove;
 
-    MergeTreePartInfo part_info = MergeTreePartInfo::fromPartName(part_info_str, format_version);
     /// No mutations -- no hardlinks -- no issues
     if (part_info.mutation == 0)
         return {false, files_not_to_remove};
@@ -8296,6 +8511,7 @@ std::pair<bool, NameSet> getParentLockedBlobs(const ZooKeeperWithFaultInjectionP
     /// all_0_0_0_1
     /// all_0_0_0
     std::sort(parts_infos.begin(), parts_infos.end());
+    std::string part_info_str = part_info.getPartNameV1();
 
     /// In reverse order to process from bigger to smaller
     for (const auto & [parent_candidate_info, part_candidate_info_str] : parts_infos | std::views::reverse)
@@ -8312,29 +8528,57 @@ std::pair<bool, NameSet> getParentLockedBlobs(const ZooKeeperWithFaultInjectionP
             Coordination::Error code;
             zookeeper_ptr->tryGet(fs::path(zero_copy_part_path_prefix) / part_candidate_info_str, files_not_to_remove_str, nullptr, nullptr, &code);
             if (code != Coordination::Error::ZOK)
+            {
                 LOG_TRACE(log, "Cannot get parent files from ZooKeeper on path ({}), error {}", (fs::path(zero_copy_part_path_prefix) / part_candidate_info_str).string(), errorMessage(code));
+                return {true, std::nullopt};
+            }
 
             if (!files_not_to_remove_str.empty())
             {
                 boost::split(files_not_to_remove, files_not_to_remove_str, boost::is_any_of("\n "));
                 LOG_TRACE(log, "Found files not to remove from parent part {}: [{}]", part_candidate_info_str, fmt::join(files_not_to_remove, ", "));
             }
+            else
+            {
+                std::vector<std::string> children;
+                code = zookeeper_ptr->tryGetChildren(fs::path(zero_copy_part_path_prefix) / part_candidate_info_str, children);
+                if (code != Coordination::Error::ZOK)
+                {
+                    LOG_TRACE(log, "Cannot get parent locks in ZooKeeper on path ({}), error {}", (fs::path(zero_copy_part_path_prefix) / part_candidate_info_str).string(), errorMessage(code));
+                    return {true, std::nullopt};
+                }
+
+                if (children.size() > 1 || (children.size() == 1 && children[0] != ZeroCopyLock::ZERO_COPY_LOCK_NAME))
+                {
+                    LOG_TRACE(log, "No files not to remove found for part {} from parent {}", part_info_str, part_candidate_info_str);
+                }
+                else
+                {
+                    /// The case when part is actually removed, but some stale replica trying to execute merge/mutation.
+                    /// We shouldn't use the part to check hardlinked blobs, it just doesn't exist.
+                    LOG_TRACE(log, "Part {} is not parent (only merge/mutation locks exist), refusing to use as parent", part_candidate_info_str);
+                    continue;
+                }
+            }
 
             return {true, files_not_to_remove};
         }
     }
+    LOG_TRACE(log, "No mutation parent found for part {}", part_info_str);
     return {false, files_not_to_remove};
 }
 
 }
 
 std::pair<bool, NameSet> StorageReplicatedMergeTree::unlockSharedDataByID(
-        String part_id, const String & table_uuid, const String & part_name,
+        String part_id, const String & table_uuid, const MergeTreePartInfo & part_info,
         const String & replica_name_, const std::string & disk_type, const ZooKeeperWithFaultInjectionPtr & zookeeper_ptr, const MergeTreeSettings & settings,
         Poco::Logger * logger, const String & zookeeper_path_old, MergeTreeDataFormatVersion data_format_version)
 {
     boost::replace_all(part_id, "/", "_");
 
+    auto part_name = part_info.getPartNameV1();
+
     Strings zc_zookeeper_paths = getZeroCopyPartPath(settings, disk_type, table_uuid, part_name, zookeeper_path_old);
 
     bool part_has_no_more_locks = true;
@@ -8349,15 +8593,24 @@ std::pair<bool, NameSet> StorageReplicatedMergeTree::unlockSharedDataByID(
         if (!files_not_to_remove_str.empty())
             boost::split(files_not_to_remove, files_not_to_remove_str, boost::is_any_of("\n "));
 
-        auto [has_parent, parent_not_to_remove] = getParentLockedBlobs(
-            zookeeper_ptr, fs::path(zc_zookeeper_path).parent_path(), part_name, data_format_version, logger);
-        files_not_to_remove.insert(parent_not_to_remove.begin(), parent_not_to_remove.end());
-
         String zookeeper_part_uniq_node = fs::path(zc_zookeeper_path) / part_id;
 
         /// Delete our replica node for part from zookeeper (we are not interested in it anymore)
         String zookeeper_part_replica_node = fs::path(zookeeper_part_uniq_node) / replica_name_;
 
+        auto [has_parent, parent_not_to_remove] = getParentLockedBlobs(
+            zookeeper_ptr, fs::path(zc_zookeeper_path).parent_path(), part_info, data_format_version, logger);
+
+        // parent_not_to_remove == std::nullopt means that we were unable to retrieve parts set
+        if (has_parent || parent_not_to_remove == std::nullopt)
+        {
+            LOG_TRACE(logger, "Failed to get mutation parent on {} for part {}, refusing to remove blobs", zookeeper_part_replica_node, part_name);
+            return {false, {}};
+        }
+
+        files_not_to_remove.insert(parent_not_to_remove->begin(), parent_not_to_remove->end());
+
+
         LOG_TRACE(logger, "Remove zookeeper lock {} for part {}", zookeeper_part_replica_node, part_name);
 
         if (auto ec = zookeeper_ptr->tryRemove(zookeeper_part_replica_node); ec != Coordination::Error::ZOK)
@@ -8372,6 +8625,10 @@ std::pair<bool, NameSet> StorageReplicatedMergeTree::unlockSharedDataByID(
                     LOG_INFO(logger, "Lock on path {} for part {} doesn't exist, refuse to remove blobs", zookeeper_part_replica_node, part_name);
                     return {false, {}};
                 }
+                else
+                {
+                    LOG_INFO(logger, "Lock on path {} for part {} doesn't exist, but we don't have mutation parent, can remove blobs", zookeeper_part_replica_node, part_name);
+                }
             }
             else
             {
@@ -8426,7 +8683,7 @@ std::pair<bool, NameSet> StorageReplicatedMergeTree::unlockSharedDataByID(
 
             if (error_code == Coordination::Error::ZOK)
             {
-                LOG_TRACE(logger, "Removed last parent zookeeper lock {} for part {} (part is finally unlocked)", zookeeper_part_uniq_node, part_name);
+                LOG_TRACE(logger, "Removed last parent zookeeper lock {} for part {} (part is finally unlocked)", zookeeper_part_node, part_name);
             }
             else if (error_code == Coordination::Error::ZNOTEMPTY)
             {
@@ -8434,7 +8691,11 @@ std::pair<bool, NameSet> StorageReplicatedMergeTree::unlockSharedDataByID(
             }
             else if (error_code == Coordination::Error::ZNONODE)
             {
-                LOG_TRACE(logger, "Node with parent zookeeper lock {} for part {} doesn't exist (part was unlocked before)", zookeeper_part_uniq_node, part_name);
+                /// We don't know what to do, because this part can be mutation part
+                /// with hardlinked columns. Since we don't have this information (about blobs not to remove)
+                /// we refuse to remove blobs.
+                LOG_WARNING(logger, "Node with parent zookeeper lock {} for part {} doesn't exist (part was unlocked before), refuse to remove blobs", zookeeper_part_uniq_node, part_name);
+                return {false, {}};
             }
             else
             {
@@ -8550,7 +8811,6 @@ String StorageReplicatedMergeTree::getSharedDataReplica(
     return best_replica;
 }
 
-
 Strings StorageReplicatedMergeTree::getZeroCopyPartPath(
     const MergeTreeSettings & settings, const std::string & disk_type, const String & table_uuid,
     const String & part_name, const String & zookeeper_path_old)
@@ -8570,18 +8830,65 @@ Strings StorageReplicatedMergeTree::getZeroCopyPartPath(
     return res;
 }
 
-bool StorageReplicatedMergeTree::checkZeroCopyLockExists(const String & part_name, const DiskPtr & disk, String & lock_replica)
+void StorageReplicatedMergeTree::watchZeroCopyLock(const String & part_name, const DiskPtr & disk)
 {
     auto path = getZeroCopyPartPath(part_name, disk);
     if (path)
     {
-        /// FIXME
+        auto zookeeper = getZooKeeper();
         auto lock_path = fs::path(*path) / "part_exclusive_lock";
-        if (getZooKeeper()->tryGet(lock_path, lock_replica))
+        LOG_TEST(log, "Adding zero-copy lock on {}", lock_path);
+        /// Looks ugly, but we cannot touch any storage fields inside Watch callback
+        /// because it could lead to use-after-free (storage dropped and watch triggered)
+        std::shared_ptr<std::atomic<bool>> flag = std::make_shared<std::atomic<bool>>(true);
+        std::string replica;
+        bool exists = zookeeper->tryGetWatch(lock_path, replica, nullptr, [flag] (const Coordination::WatchResponse &)
         {
-            return true;
+            *flag = false;
+        });
+
+        if (exists)
+        {
+            std::lock_guard lock(existing_zero_copy_locks_mutex);
+            existing_zero_copy_locks[lock_path] = ZeroCopyLockDescription{replica, flag};
         }
     }
+}
+
+bool StorageReplicatedMergeTree::checkZeroCopyLockExists(const String & part_name, const DiskPtr & disk, String & lock_replica)
+{
+    auto path = getZeroCopyPartPath(part_name, disk);
+
+    std::lock_guard lock(existing_zero_copy_locks_mutex);
+    /// Cleanup abandoned locks during each check. The set of locks is small and this is quite fast loop.
+    /// Also it's hard to properly remove locks because we can execute replication queue
+    /// in arbitrary order and some parts can be replaced by covering parts without merges.
+    for (auto it = existing_zero_copy_locks.begin(); it != existing_zero_copy_locks.end();)
+    {
+        if (*it->second.exists)
+            ++it;
+        else
+        {
+            LOG_TEST(log, "Removing zero-copy lock on {}", it->first);
+            it = existing_zero_copy_locks.erase(it);
+        }
+    }
+
+    if (path)
+    {
+        auto lock_path = fs::path(*path) / "part_exclusive_lock";
+        if (auto it = existing_zero_copy_locks.find(lock_path); it != existing_zero_copy_locks.end())
+        {
+            lock_replica = it->second.replica;
+            if (*it->second.exists)
+            {
+                LOG_TEST(log, "Zero-copy lock on path {} exists", it->first);
+                return true;
+            }
+        }
+
+        LOG_TEST(log, "Zero-copy lock on path {} doesn't exist", lock_path);
+    }
 
     return false;
 }
@@ -8594,11 +8901,37 @@ std::optional<String> StorageReplicatedMergeTree::getZeroCopyPartPath(const Stri
     return getZeroCopyPartPath(*getSettings(), toString(disk->getDataSourceDescription().type), getTableSharedID(), part_name, zookeeper_path)[0];
 }
 
+bool StorageReplicatedMergeTree::waitZeroCopyLockToDisappear(const ZeroCopyLock & lock, size_t milliseconds_to_wait)
+{
+    if (lock.isLocked())
+        return true;
+
+    if (partial_shutdown_called.load(std::memory_order_relaxed))
+        return true;
+
+    auto lock_path = lock.lock->getLockPath();
+    zkutil::ZooKeeperPtr zookeeper = tryGetZooKeeper();
+    if (!zookeeper)
+        return true;
+
+    Stopwatch time_waiting;
+    const auto & stop_waiting = [&]()
+    {
+        bool timeout_exceeded = milliseconds_to_wait < time_waiting.elapsedMilliseconds();
+        return partial_shutdown_called.load(std::memory_order_relaxed) || is_readonly.load(std::memory_order_relaxed) || timeout_exceeded;
+    };
+
+    return zookeeper->waitForDisappear(lock_path, stop_waiting);
+}
+
 std::optional<ZeroCopyLock> StorageReplicatedMergeTree::tryCreateZeroCopyExclusiveLock(const String & part_name, const DiskPtr & disk)
 {
     if (!disk || !disk->supportZeroCopyReplication())
         return std::nullopt;
 
+    if (partial_shutdown_called.load(std::memory_order_relaxed) || is_readonly.load(std::memory_order_relaxed))
+        return std::nullopt;
+
     zkutil::ZooKeeperPtr zookeeper = tryGetZooKeeper();
     if (!zookeeper)
         return std::nullopt;
@@ -8611,10 +8944,8 @@ std::optional<ZeroCopyLock> StorageReplicatedMergeTree::tryCreateZeroCopyExclusi
 
     /// Create actual lock
     ZeroCopyLock lock(zookeeper, zc_zookeeper_path, replica_name);
-    if (lock.lock->tryLock())
-        return lock;
-    else
-        return std::nullopt;
+    lock.lock->tryLock();
+    return lock;
 }
 
 String StorageReplicatedMergeTree::findReplicaHavingPart(
@@ -8765,8 +9096,7 @@ bool StorageReplicatedMergeTree::createEmptyPartInsteadOfLost(zkutil::ZooKeeperP
                 /// We must be sure that this part doesn't exist on other replicas
                 if (!zookeeper->exists(current_part_path))
                 {
-                    ops.emplace_back(zkutil::makeCreateRequest(current_part_path, "", zkutil::CreateMode::Persistent));
-                    ops.emplace_back(zkutil::makeRemoveRequest(current_part_path, -1));
+                    zkutil::addCheckNotExistsRequest(ops, *zookeeper, current_part_path);
                 }
                 else
                 {
@@ -8778,6 +9108,20 @@ bool StorageReplicatedMergeTree::createEmptyPartInsteadOfLost(zkutil::ZooKeeperP
 
             getCommitPartOps(ops, new_data_part);
 
+            /// Increment lost_part_count
+            auto lost_part_count_path = fs::path(zookeeper_path) / "lost_part_count";
+            Coordination::Stat lost_part_count_stat;
+            String lost_part_count_str;
+            if (zookeeper->tryGet(lost_part_count_path, lost_part_count_str, &lost_part_count_stat))
+            {
+                UInt64 lost_part_count = lost_part_count_str.empty() ? 0 : parse<UInt64>(lost_part_count_str);
+                ops.emplace_back(zkutil::makeSetRequest(lost_part_count_path, toString(lost_part_count + 1), lost_part_count_stat.version));
+            }
+            else
+            {
+                ops.emplace_back(zkutil::makeCreateRequest(lost_part_count_path, "1", zkutil::CreateMode::Persistent));
+            }
+
             Coordination::Responses responses;
             if (auto code = zookeeper->tryMulti(ops, responses); code == Coordination::Error::ZOK)
             {
@@ -8805,6 +9149,46 @@ bool StorageReplicatedMergeTree::createEmptyPartInsteadOfLost(zkutil::ZooKeeperP
     return true;
 }
 
+void StorageReplicatedMergeTree::getZeroCopyLockNodeCreateOps(
+    const ZooKeeperWithFaultInjectionPtr & zookeeper, const String & zookeeper_node, Coordination::Requests & requests,
+    int32_t mode, bool replace_existing_lock,
+    const String & path_to_set_hardlinked_files, const NameSet & hardlinked_files)
+{
+
+    /// Ephemeral locks can be created only when we fetch shared data.
+    /// So it never require to create ancestors. If we create them
+    /// race condition with source replica drop is possible.
+    if (mode == zkutil::CreateMode::Persistent)
+        zookeeper->checkExistsAndGetCreateAncestorsOps(zookeeper_node, requests);
+
+    if (replace_existing_lock && zookeeper->exists(zookeeper_node))
+    {
+        requests.emplace_back(zkutil::makeRemoveRequest(zookeeper_node, -1));
+        requests.emplace_back(zkutil::makeCreateRequest(zookeeper_node, "", mode));
+        if (!path_to_set_hardlinked_files.empty() && !hardlinked_files.empty())
+        {
+            std::string data = boost::algorithm::join(hardlinked_files, "\n");
+            /// List of files used to detect hardlinks. path_to_set_hardlinked_files --
+            /// is a path to source part zero copy node. During part removal hardlinked
+            /// files will be left for source part.
+            requests.emplace_back(zkutil::makeSetRequest(path_to_set_hardlinked_files, data, -1));
+        }
+    }
+    else
+    {
+        Coordination::Requests ops;
+        if (!path_to_set_hardlinked_files.empty() && !hardlinked_files.empty())
+        {
+            std::string data = boost::algorithm::join(hardlinked_files, "\n");
+            /// List of files used to detect hardlinks. path_to_set_hardlinked_files --
+            /// is a path to source part zero copy node. During part removal hardlinked
+            /// files will be left for source part.
+            requests.emplace_back(zkutil::makeSetRequest(path_to_set_hardlinked_files, data, -1));
+        }
+        requests.emplace_back(zkutil::makeCreateRequest(zookeeper_node, "", mode));
+    }
+}
+
 
 void StorageReplicatedMergeTree::createZeroCopyLockNode(
     const ZooKeeperWithFaultInjectionPtr & zookeeper, const String & zookeeper_node, int32_t mode,
@@ -8816,75 +9200,49 @@ void StorageReplicatedMergeTree::createZeroCopyLockNode(
     bool created = false;
     for (int attempts = 5; attempts > 0; --attempts)
     {
-        try
+        Coordination::Requests ops;
+        Coordination::Responses responses;
+        getZeroCopyLockNodeCreateOps(zookeeper, zookeeper_node, ops, mode, replace_existing_lock, path_to_set_hardlinked_files, hardlinked_files);
+        auto error = zookeeper->tryMulti(ops, responses);
+        if (error == Coordination::Error::ZOK)
         {
-            /// Ephemeral locks can be created only when we fetch shared data.
-            /// So it never require to create ancestors. If we create them
-            /// race condition with source replica drop is possible.
-            if (mode == zkutil::CreateMode::Persistent)
-                zookeeper->createAncestors(zookeeper_node);
-
-            if (replace_existing_lock && zookeeper->exists(zookeeper_node))
-            {
-                Coordination::Requests ops;
-                ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_node, -1));
-                ops.emplace_back(zkutil::makeCreateRequest(zookeeper_node, "", mode));
-                if (!path_to_set_hardlinked_files.empty() && !hardlinked_files.empty())
-                {
-                    std::string data = boost::algorithm::join(hardlinked_files, "\n");
-                    /// List of files used to detect hardlinks. path_to_set_hardlinked_files --
-                    /// is a path to source part zero copy node. During part removal hardlinked
-                    /// files will be left for source part.
-                    ops.emplace_back(zkutil::makeSetRequest(path_to_set_hardlinked_files, data, -1));
-                }
-                Coordination::Responses responses;
-                auto error = zookeeper->tryMulti(ops, responses);
-                if (error == Coordination::Error::ZOK)
-                {
-                    created = true;
-                    break;
-                }
-                else if (error == Coordination::Error::ZNONODE && mode != zkutil::CreateMode::Persistent)
-                {
-                    throw Exception(ErrorCodes::NOT_FOUND_NODE,
-                                    "Cannot create ephemeral zero copy lock {} because part was unlocked from zookeeper", zookeeper_node);
-                }
-            }
-            else
-            {
-                Coordination::Requests ops;
-                if (!path_to_set_hardlinked_files.empty() && !hardlinked_files.empty())
-                {
-                    std::string data = boost::algorithm::join(hardlinked_files, "\n");
-                    /// List of files used to detect hardlinks. path_to_set_hardlinked_files --
-                    /// is a path to source part zero copy node. During part removal hardlinked
-                    /// files will be left for source part.
-                    ops.emplace_back(zkutil::makeSetRequest(path_to_set_hardlinked_files, data, -1));
-                }
-                ops.emplace_back(zkutil::makeCreateRequest(zookeeper_node, "", mode));
-
-                Coordination::Responses responses;
-                auto error = zookeeper->tryMulti(ops, responses);
-                if (error == Coordination::Error::ZOK || error == Coordination::Error::ZNODEEXISTS)
-                {
-                    created = true;
-                    break;
-                }
-                else if (error == Coordination::Error::ZNONODE && mode != zkutil::CreateMode::Persistent)
-                {
-                    /// Ephemeral locks used during fetches so if parent node was removed we cannot do anything
-                    throw Exception(ErrorCodes::NOT_FOUND_NODE,
-                                    "Cannot create ephemeral zero copy lock {} because part was unlocked from zookeeper", zookeeper_node);
-                }
-            }
+            created = true;
+            break;
         }
-        catch (const zkutil::KeeperException & e)
+        else if (mode == zkutil::CreateMode::Persistent)
         {
-            if (e.code == Coordination::Error::ZNONODE)
+            if (error == Coordination::Error::ZNONODE)
                 continue;
 
-            throw;
+            if (error == Coordination::Error::ZNODEEXISTS)
+            {
+                size_t failed_op = zkutil::getFailedOpIndex(error, responses);
+                /// Part was locked before, unfortunately it's possible during moves
+                if (ops[failed_op]->getPath() == zookeeper_node)
+                {
+                    created = true;
+                    break;
+                }
+                continue;
+            }
         }
+        else if (mode == zkutil::CreateMode::Ephemeral)
+        {
+            /// It is super rare case when we had part, but it was lost and we were unable to unlock it from keeper.
+            /// Now we are trying to fetch it from other replica and unlocking.
+            if (error == Coordination::Error::ZNODEEXISTS)
+            {
+                size_t failed_op = zkutil::getFailedOpIndex(error, responses);
+                if (ops[failed_op]->getPath() == zookeeper_node)
+                {
+                    LOG_WARNING(&Poco::Logger::get("ZeroCopyLocks"), "Replacing persistent lock with ephemeral for path {}. It can happen only in case of local part loss", zookeeper_node);
+                    replace_existing_lock = true;
+                    continue;
+                }
+            }
+        }
+
+        zkutil::KeeperMultiException::check(error, ops, responses);
     }
 
     if (!created)
@@ -8917,6 +9275,11 @@ bool StorageReplicatedMergeTree::removeSharedDetachedPart(DiskPtr disk, const St
 
     NameSet files_not_to_remove;
 
+    // zero copy replication is only available since format version 1 so we can safely use it here
+    auto part_info = DetachedPartInfo::parseDetachedPartName(disk, part_name, MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING);
+    if (!part_info.valid_name)
+        throw Exception(ErrorCodes::BAD_DATA_PART_NAME, "Invalid detached part name {} on disk {}", path, disk->getName());
+
     fs::path checksums = fs::path(path) / IMergeTreeDataPart::FILE_FOR_REFERENCES_CHECK;
     if (disk->exists(checksums))
     {
@@ -8925,7 +9288,7 @@ bool StorageReplicatedMergeTree::removeSharedDetachedPart(DiskPtr disk, const St
             String id = disk->getUniqueId(checksums);
             bool can_remove = false;
             std::tie(can_remove, files_not_to_remove) = StorageReplicatedMergeTree::unlockSharedDataByID(
-                id, table_uuid, part_name,
+                id, table_uuid, part_info,
                 detached_replica_name,
                 toString(disk->getDataSourceDescription().type),
                 std::make_shared<ZooKeeperWithFaultInjection>(zookeeper), local_context->getReplicatedMergeTreeSettings(),
@@ -8979,6 +9342,8 @@ void StorageReplicatedMergeTree::backupData(
     /// First we generate backup entries in the same way as an ordinary MergeTree does.
     /// But then we don't add them to the BackupEntriesCollector right away,
     /// because we need to coordinate them with other replicas (other replicas can have better parts).
+
+    const auto & backup_settings = backup_entries_collector.getBackupSettings();
     auto local_context = backup_entries_collector.getContext();
 
     DataPartsVector data_parts;
@@ -8987,7 +9352,7 @@ void StorageReplicatedMergeTree::backupData(
     else
         data_parts = getVisibleDataPartsVector(local_context);
 
-    auto backup_entries = backupParts(data_parts, /* data_path_in_backup */ "", local_context);
+    auto backup_entries = backupParts(data_parts, /* data_path_in_backup */ "", backup_settings, local_context);
 
     auto coordination = backup_entries_collector.getBackupCoordination();
     String shared_id = getTableSharedID();
@@ -9005,10 +9370,9 @@ void StorageReplicatedMergeTree::backupData(
                 auto & hash = part_names_with_hashes_calculating[part_name];
                 if (relative_path.ends_with(".bin"))
                 {
-                    auto checksum = backup_entry->getChecksum();
                     hash.update(relative_path);
                     hash.update(backup_entry->getSize());
-                    hash.update(*checksum);
+                    hash.update(backup_entry->getChecksum());
                 }
                 continue;
             }
@@ -9052,9 +9416,9 @@ void StorageReplicatedMergeTree::backupData(
     /// This task will be executed after all replicas have collected their parts and the coordination is ready to
     /// give us the final list of parts to add to the BackupEntriesCollector.
     auto post_collecting_task = [shared_id,
-                                 replica_name = getReplicaName(),
+                                 my_replica_name = getReplicaName(),
                                  coordination,
-                                 backup_entries = std::move(backup_entries),
+                                 my_backup_entries = std::move(backup_entries),
                                  &backup_entries_collector]()
     {
         Strings data_paths = coordination->getReplicatedDataPaths(shared_id);
@@ -9063,10 +9427,10 @@ void StorageReplicatedMergeTree::backupData(
         for (const auto & data_path : data_paths)
             data_paths_fs.push_back(data_path);
 
-        Strings part_names = coordination->getReplicatedPartNames(shared_id, replica_name);
+        Strings part_names = coordination->getReplicatedPartNames(shared_id, my_replica_name);
         std::unordered_set<std::string_view> part_names_set{part_names.begin(), part_names.end()};
 
-        for (const auto & [relative_path, backup_entry] : backup_entries)
+        for (const auto & [relative_path, backup_entry] : my_backup_entries)
         {
             size_t slash_pos = relative_path.find('/');
             String part_name = relative_path.substr(0, slash_pos);
@@ -9076,7 +9440,7 @@ void StorageReplicatedMergeTree::backupData(
                 backup_entries_collector.addBackupEntry(data_path / relative_path, backup_entry);
         }
 
-        auto mutation_infos = coordination->getReplicatedMutations(shared_id, replica_name);
+        auto mutation_infos = coordination->getReplicatedMutations(shared_id, my_replica_name);
         for (const auto & mutation_info : mutation_infos)
         {
             auto backup_entry = ReplicatedMergeTreeMutationEntry::parse(mutation_info.entry, mutation_info.id).backup();
@@ -9138,30 +9502,4 @@ template std::optional<EphemeralLockInZooKeeper> StorageReplicatedMergeTree::all
     const std::vector<String> & zookeeper_block_id_path,
     const String & zookeeper_path_prefix) const;
 
-#if 0
-PartsTemporaryRename renamed_parts(*this, "detached/");
-MutableDataPartsVector loaded_parts = tryLoadPartsToAttach(partition, attach_part, query_context, renamed_parts);
-
-/// TODO Allow to use quorum here.
-ReplicatedMergeTreeSink output(*this, metadata_snapshot, 0, 0, 0, false, false, query_context,
-    /*is_attach*/true);
-
-for (size_t i = 0; i < loaded_parts.size(); ++i)
-{
-    const String old_name = loaded_parts[i]->name;
-
-    output.writeExistingPart(loaded_parts[i]);
-
-    renamed_parts.old_and_new_names[i].old_name.clear();
-
-    LOG_DEBUG(log, "Attached part {} as {}", old_name, loaded_parts[i]->name);
-
-    results.push_back(PartitionCommandResultInfo{
-        .partition_id = loaded_parts[i]->info.partition_id,
-        .part_name = loaded_parts[i]->name,
-        .old_part_name = old_name,
-    });
-}
-#endif
-
 }
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index 46c78e9064a..cb93dd0b5e3 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -38,6 +38,7 @@
 #include <Core/BackgroundSchedulePool.h>
 #include <QueryPipeline/Pipe.h>
 #include <Storages/MergeTree/BackgroundJobsAssignee.h>
+#include <Parsers/SyncReplicaMode.h>
 
 
 namespace DB
@@ -112,7 +113,6 @@ public:
     void startup() override;
     void shutdown() override;
     void partialShutdown();
-    void flush() override;
     ~StorageReplicatedMergeTree() override;
 
     static String getDefaultZooKeeperPath(const Poco::Util::AbstractConfiguration & config);
@@ -181,7 +181,7 @@ public:
 
     /// Wait till replication queue's current last entry is processed or till size becomes 0
     /// If timeout is exceeded returns false
-    bool waitForProcessingQueue(UInt64 max_wait_milliseconds = 0);
+    bool waitForProcessingQueue(UInt64 max_wait_milliseconds, SyncReplicaMode sync_mode);
 
     /// Get the status of the table. If with_zk_fields = false - do not fill in the fields that require queries to ZK.
     void getStatus(ReplicatedTableStatus & res, bool with_zk_fields = true);
@@ -215,8 +215,6 @@ public:
     /// It's used if not set in engine's arguments while creating a replicated table.
     static String getDefaultReplicaName(const ContextPtr & context_);
 
-    int getMetadataVersion() const { return metadata_version; }
-
     /// Modify a CREATE TABLE query to make a variant which must be written to a backup.
     void adjustCreateQueryForBackup(ASTPtr & create_query) const override;
 
@@ -231,6 +229,8 @@ public:
     static void dropReplica(zkutil::ZooKeeperPtr zookeeper, const String & zookeeper_path, const String & replica,
                             Poco::Logger * logger, MergeTreeSettingsPtr table_settings = nullptr, std::optional<bool> * has_metadata_out = nullptr);
 
+    void dropReplica(const String & drop_zookeeper_path, const String & drop_replica, Poco::Logger * logger);
+
     /// Removes table from ZooKeeper after the last replica was dropped
     static bool removeTableNodesFromZooKeeper(zkutil::ZooKeeperPtr zookeeper, const String & zookeeper_path,
                                               const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, Poco::Logger * logger);
@@ -253,7 +253,14 @@ public:
         bool replace_existing_lock,
         std::optional<HardlinkedFiles> hardlinked_files) const;
 
-    void lockSharedDataTemporary(const String & part_name, const String & part_id, const DiskPtr & disk) const;
+    void getLockSharedDataOps(
+        const IMergeTreeDataPart & part,
+        const ZooKeeperWithFaultInjectionPtr & zookeeper,
+        bool replace_existing_lock,
+        std::optional<HardlinkedFiles> hardlinked_files,
+        Coordination::Requests & requests) const;
+
+    zkutil::EphemeralNodeHolderPtr lockSharedDataTemporary(const String & part_name, const String & part_id, const DiskPtr & disk) const;
 
     /// Unlock shared data part in zookeeper
     /// Return true if data unlocked
@@ -268,7 +275,7 @@ public:
     static std::pair<bool, NameSet> unlockSharedDataByID(
         String part_id,
         const String & table_uuid,
-        const String & part_name,
+        const MergeTreePartInfo & part_info,
         const String & replica_name_,
         const std::string & disk_type,
         const ZooKeeperWithFaultInjectionPtr & zookeeper_,
@@ -312,6 +319,8 @@ public:
     // Return table id, common for different replicas
     String getTableSharedID() const override;
 
+    size_t getNumberOfUnfinishedMutations() const override;
+
     /// Returns the same as getTableSharedID(), but extracts it from a create query.
     static std::optional<String> tryGetTableSharedIDFromCreateQuery(const IAST & create_query, const ContextPtr & global_context);
 
@@ -326,12 +335,13 @@ public:
     bool canUseZeroCopyReplication() const;
 
     bool isTableReadOnly () { return is_readonly; }
-private:
-    std::atomic_bool are_restoring_replica {false};
 
     /// Get a sequential consistent view of current parts.
     ReplicatedMergeTreeQuorumAddedParts::PartitionIdToMaxBlock getMaxAddedBlocks() const;
 
+private:
+    std::atomic_bool are_restoring_replica {false};
+
     /// Delete old parts from disk and from ZooKeeper.
     void clearOldPartsAndRemoveFromZK();
 
@@ -372,6 +382,7 @@ private:
     zkutil::ZooKeeperPtr getZooKeeperIfTableShutDown() const;
     zkutil::ZooKeeperPtr getZooKeeperAndAssertNotReadonly() const;
     void setZooKeeper();
+    String getEndpointName() const;
 
     /// If true, the table is offline and can not be written to it.
     /// This flag is managed by RestartingThread.
@@ -380,6 +391,11 @@ private:
     /// If false - ZooKeeper is available, but there is no table metadata. It's safe to drop table in this case.
     std::optional<bool> has_metadata_in_zookeeper;
 
+    /// during server restart or attach table process, set since_metadata_err_incr_readonly_metric = true and increase readonly metric if has_metadata_in_zookeeper = false.
+    /// during detach or drop table process, decrease readonly metric if since_metadata_err_incr_readonly_metric = true.
+    /// during restore replica process, set since_metadata_err_incr_readonly_metric = false and decrease readonly metric if since_metadata_err_incr_readonly_metric = true.
+    bool since_metadata_err_incr_readonly_metric = false;
+
     static const String default_zookeeper_name;
     const String zookeeper_name;
     const String zookeeper_path;
@@ -428,7 +444,6 @@ private:
     std::atomic<bool> shutdown_called {false};
     std::atomic<bool> flush_called {false};
 
-    int metadata_version = 0;
     /// Threads.
 
     /// A task that keeps track of the updates in the logs of all replicas and loads them into the queue.
@@ -482,6 +497,16 @@ private:
     std::mutex last_broken_disks_mutex;
     std::set<String> last_broken_disks;
 
+    std::mutex existing_zero_copy_locks_mutex;
+
+    struct ZeroCopyLockDescription
+    {
+        std::string replica;
+        std::shared_ptr<std::atomic<bool>> exists;
+    };
+
+    std::unordered_map<String, ZeroCopyLockDescription> existing_zero_copy_locks;
+
     static std::optional<QueryPipeline> distributedWriteFromClusterStorage(const std::shared_ptr<IStorageCluster> & src_storage_cluster, const ASTInsertQuery & query, ContextPtr context);
 
     template <class Func>
@@ -505,8 +530,10 @@ private:
 
     /// A part of ALTER: apply metadata changes only (data parts are altered separately).
     /// Must be called under IStorage::lockForAlter() lock.
-    void setTableStructure(const StorageID & table_id, const ContextPtr & local_context,
-                           ColumnsDescription new_columns, const ReplicatedMergeTreeTableMetadata::Diff & metadata_diff);
+    void setTableStructure(
+        const StorageID & table_id, const ContextPtr & local_context,
+        ColumnsDescription new_columns, const ReplicatedMergeTreeTableMetadata::Diff & metadata_diff,
+        int32_t new_metadata_version);
 
     /** Check that the set of parts corresponds to that in ZK (/replicas/me/parts/).
       * If any parts described in ZK are not locally, throw an exception.
@@ -531,7 +558,7 @@ private:
     String getChecksumsForZooKeeper(const MergeTreeDataPartChecksums & checksums) const;
 
     /// Accepts a PreActive part, atomically checks its checksums with ones on other replicas and commit the part
-    DataPartsVector checkPartChecksumsAndCommit(Transaction & transaction, const MutableDataPartPtr & part, std::optional<HardlinkedFiles> hardlinked_files = {});
+    DataPartsVector checkPartChecksumsAndCommit(Transaction & transaction, const MutableDataPartPtr & part, std::optional<HardlinkedFiles> hardlinked_files = {}, bool replace_zero_copy_lock=false);
 
     bool partIsAssignedToBackgroundOperation(const DataPartPtr & part) const override;
 
@@ -543,9 +570,6 @@ private:
     /// Set has_children to true for "old-style" parts (those with /columns and /checksums child znodes).
     void getRemovePartFromZooKeeperOps(const String & part_name, Coordination::Requests & ops, bool has_children);
 
-    /// Just removes part from ZooKeeper using previous method
-    void removePartFromZooKeeper(const String & part_name);
-
     /// Quickly removes big set of parts from ZooKeeper (using async multi queries)
     void removePartsFromZooKeeper(zkutil::ZooKeeperPtr & zookeeper, const Strings & part_names,
                                   NameSet * parts_should_be_retried = nullptr);
@@ -676,6 +700,7 @@ private:
     bool fetchPart(
         const String & part_name,
         const StorageMetadataPtr & metadata_snapshot,
+        const String & source_zookeeper_name,
         const String & source_replica_path,
         bool to_detached,
         size_t quorum,
@@ -833,7 +858,7 @@ private:
     void waitMutationToFinishOnReplicas(
         const Strings & replicas, const String & mutation_id) const;
 
-    MutationCommands getFirstAlterMutationCommandsForPart(const DataPartPtr & part) const override;
+    std::map<int64_t, MutationCommands> getAlterMutationCommandsForPart(const DataPartPtr & part) const override;
 
     void startBackgroundMovesIfNeeded() override;
 
@@ -853,6 +878,12 @@ private:
         int32_t mode = zkutil::CreateMode::Persistent, bool replace_existing_lock = false,
         const String & path_to_set_hardlinked_files = "", const NameSet & hardlinked_files = {});
 
+    static void getZeroCopyLockNodeCreateOps(
+        const ZooKeeperWithFaultInjectionPtr & zookeeper, const String & zookeeper_node, Coordination::Requests & requests,
+        int32_t mode = zkutil::CreateMode::Persistent, bool replace_existing_lock = false,
+        const String & path_to_set_hardlinked_files = "", const NameSet & hardlinked_files = {});
+
+
     bool removeDetachedPart(DiskPtr disk, const String & path, const String & part_name) override;
 
     /// Create freeze metadata for table and save in zookeeper. Required only if zero-copy replication enabled.
@@ -862,13 +893,19 @@ private:
     void createTableSharedID() const;
 
     bool checkZeroCopyLockExists(const String & part_name, const DiskPtr & disk, String & lock_replica);
+    void watchZeroCopyLock(const String & part_name, const DiskPtr & disk);
 
     std::optional<String> getZeroCopyPartPath(const String & part_name, const DiskPtr & disk);
 
     /// Create ephemeral lock in zookeeper for part and disk which support zero copy replication.
-    /// If somebody already holding the lock -- return std::nullopt.
+    /// If no connection to zookeeper, shutdown, readonly -- return std::nullopt.
+    /// If somebody already holding the lock -- return unlocked ZeroCopyLock object (not std::nullopt).
     std::optional<ZeroCopyLock> tryCreateZeroCopyExclusiveLock(const String & part_name, const DiskPtr & disk) override;
 
+    /// Wait for ephemral lock to disappear. Return true if table shutdown/readonly/timeout exceeded, etc.
+    /// Or if node actually disappeared.
+    bool waitZeroCopyLockToDisappear(const ZeroCopyLock & lock, size_t milliseconds_to_wait) override;
+
     void startupImpl(bool from_attach_thread);
 };
 
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index ed290c38c1f..2a2192d9cfe 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -1,7 +1,5 @@
 #include "config.h"
 #include <Common/ProfileEvents.h>
-#include "IO/ParallelReadBuffer.h"
-#include "IO/IOThreadPool.h"
 #include "Parsers/ASTCreateQuery.h"
 
 #if USE_AWS_S3
@@ -12,6 +10,8 @@
 
 #include <IO/S3Common.h>
 #include <IO/S3/Requests.h>
+#include <IO/ParallelReadBuffer.h>
+#include <IO/SharedThreadPools.h>
 
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/evaluateConstantExpression.h>
@@ -29,10 +29,9 @@
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/StorageURL.h>
 #include <Storages/NamedCollectionsHelpers.h>
-#include <Common/NamedCollections/NamedCollections.h>
 #include <Storages/ReadFromStorageProgress.h>
 
-#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/AsynchronousBoundedReadBuffer.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 #include <Disks/ObjectStorages/StoredObject.h>
 
@@ -45,7 +44,6 @@
 #include <Processors/Transforms/AddingDefaultsTransform.h>
 #include <Processors/Formats/IOutputFormat.h>
 #include <Processors/Formats/IInputFormat.h>
-#include <QueryPipeline/narrowPipe.h>
 
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
@@ -53,8 +51,10 @@
 
 #include <aws/core/auth/AWSCredentials.h>
 
+#include <Common/NamedCollections/NamedCollections.h>
 #include <Common/parseGlobs.h>
 #include <Common/quoteString.h>
+#include <Common/CurrentMetrics.h>
 #include <re2/re2.h>
 
 #include <Processors/ISource.h>
@@ -62,9 +62,17 @@
 #include <QueryPipeline/Pipe.h>
 #include <filesystem>
 
+#include <boost/algorithm/string.hpp>
+
 namespace fs = std::filesystem;
 
 
+namespace CurrentMetrics
+{
+    extern const Metric StorageS3Threads;
+    extern const Metric StorageS3ThreadsActive;
+}
+
 namespace ProfileEvents
 {
     extern const Event S3DeleteObjects;
@@ -74,8 +82,6 @@ namespace ProfileEvents
 namespace DB
 {
 
-static const String PARTITION_ID_WILDCARD = "{_partition_id}";
-
 static const std::unordered_set<std::string_view> required_configuration_keys = {
     "url",
 };
@@ -94,6 +100,8 @@ static const std::unordered_set<std::string_view> optional_configuration_keys =
     "upload_part_size_multiply_parts_count_threshold",
     "max_single_part_upload_size",
     "max_connections",
+    "expiration_window_seconds",
+    "no_sign_request"
 };
 
 namespace ErrorCodes
@@ -139,18 +147,16 @@ public:
         ASTPtr & query_,
         const Block & virtual_header_,
         ContextPtr context_,
-        ObjectInfos * object_infos_,
-        Strings * read_keys_,
+        KeysWithInfo * read_keys_,
         const S3Settings::RequestSettings & request_settings_)
         : WithContext(context_)
         , client(S3::Client::create(client_))
         , globbed_uri(globbed_uri_)
         , query(query_)
         , virtual_header(virtual_header_)
-        , object_infos(object_infos_)
         , read_keys(read_keys_)
         , request_settings(request_settings_)
-        , list_objects_pool(1)
+        , list_objects_pool(CurrentMetrics::StorageS3Threads, CurrentMetrics::StorageS3ThreadsActive, 1)
         , list_objects_scheduler(threadPoolCallbackRunner<ListObjectsOutcome>(list_objects_pool, "ListObjects"))
     {
         if (globbed_uri.bucket.find_first_of("*?{") != globbed_uri.bucket.npos)
@@ -278,9 +284,6 @@ private:
                     .last_modification_time = row.GetLastModified().Millis() / 1000,
                 };
 
-                if (object_infos)
-                    (*object_infos)[fs::path(globbed_uri.bucket) / key] = info;
-
                 temp_buffer.emplace_back(std::move(key), std::move(info));
             }
         }
@@ -324,11 +327,7 @@ private:
         buffer_iter = buffer.begin();
 
         if (read_keys)
-        {
-            read_keys->reserve(read_keys->size() + buffer.size());
-            for (const auto & [key, _] : buffer)
-                read_keys->push_back(key);
-        }
+            read_keys->insert(read_keys->end(), buffer.begin(), buffer.end());
     }
 
     void createFilterAST(const String & any_key)
@@ -357,7 +356,7 @@ private:
                 request.SetContinuationToken(outcome.GetResult().GetNextContinuationToken());
 
             return outcome;
-        }, 0);
+        }, Priority{});
     }
 
     std::mutex mutex;
@@ -374,8 +373,7 @@ private:
     std::unique_ptr<re2::RE2> matcher;
     bool recursive{false};
     bool is_finished{false};
-    ObjectInfos * object_infos;
-    Strings * read_keys;
+    KeysWithInfo * read_keys;
 
     S3::ListObjectsV2Request request;
     S3Settings::RequestSettings request_settings;
@@ -392,10 +390,9 @@ StorageS3Source::DisclosedGlobIterator::DisclosedGlobIterator(
     ASTPtr query,
     const Block & virtual_header,
     ContextPtr context,
-    ObjectInfos * object_infos_,
-    Strings * read_keys_,
+    KeysWithInfo * read_keys_,
     const S3Settings::RequestSettings & request_settings_)
-    : pimpl(std::make_shared<StorageS3Source::DisclosedGlobIterator::Impl>(client_, globbed_uri_, query, virtual_header, context, object_infos_, read_keys_, request_settings_))
+    : pimpl(std::make_shared<StorageS3Source::DisclosedGlobIterator::Impl>(client_, globbed_uri_, query, virtual_header, context, read_keys_, request_settings_))
 {
 }
 
@@ -421,8 +418,7 @@ public:
         ASTPtr query_,
         const Block & virtual_header_,
         ContextPtr context_,
-        ObjectInfos * object_infos_,
-        Strings * read_keys_)
+        KeysWithInfo * read_keys_)
         : WithContext(context_)
         , bucket(bucket_)
         , query(query_)
@@ -460,26 +456,15 @@ public:
             }
         }
 
-        if (read_keys_)
-            *read_keys_ = all_keys;
-
         for (auto && key : all_keys)
         {
-            std::optional<S3::ObjectInfo> info;
-
-            /// To avoid extra requests update total_size only if object_infos != nullptr
-            /// (which means we eventually need this info anyway, so it should be ok to do it now)
-            if (object_infos_)
-            {
-                info = S3::getObjectInfo(client_, bucket, key, version_id_, request_settings_);
-                total_size += info->size;
-
-                String path = fs::path(bucket) / key;
-                (*object_infos_)[std::move(path)] = *info;
-            }
-
+            auto info = S3::getObjectInfo(client_, bucket, key, version_id_, request_settings_);
+            total_size += info.size;
             keys.emplace_back(std::move(key), std::move(info));
         }
+
+        if (read_keys_)
+            *read_keys_ = keys;
     }
 
     KeyWithInfo next()
@@ -516,11 +501,10 @@ StorageS3Source::KeysIterator::KeysIterator(
     ASTPtr query,
     const Block & virtual_header,
     ContextPtr context,
-    ObjectInfos * object_infos,
-    Strings * read_keys)
+    KeysWithInfo * read_keys)
     : pimpl(std::make_shared<StorageS3Source::KeysIterator::Impl>(
         client_, version_id_, keys_, bucket_, request_settings_,
-        query, virtual_header, context, object_infos, read_keys))
+        query, virtual_header, context, read_keys))
 {
 }
 
@@ -574,7 +558,7 @@ StorageS3Source::StorageS3Source(
     , requested_virtual_columns(requested_virtual_columns_)
     , file_iterator(file_iterator_)
     , download_thread_num(download_thread_num_)
-    , create_reader_pool(1)
+    , create_reader_pool(CurrentMetrics::StorageS3Threads, CurrentMetrics::StorageS3ThreadsActive, 1)
     , create_reader_scheduler(threadPoolCallbackRunner<ReaderHolder>(create_reader_pool, "CreateS3Reader"))
 {
     reader = createReader();
@@ -589,14 +573,34 @@ StorageS3Source::ReaderHolder StorageS3Source::createReader()
         return {};
 
     size_t object_size = info ? info->size : S3::getObjectSize(*client, bucket, current_key, version_id, request_settings);
+    auto compression_method = chooseCompressionMethod(current_key, compression_hint);
 
-    int zstd_window_log_max = static_cast<int>(getContext()->getSettingsRef().zstd_window_log_max);
-    auto read_buf = wrapReadBufferWithCompressionMethod(
-        createS3ReadBuffer(current_key, object_size),
-        chooseCompressionMethod(current_key, compression_hint),
-        zstd_window_log_max);
+    InputFormatPtr input_format;
+    std::unique_ptr<ReadBuffer> owned_read_buf;
+
+    auto read_buf_or_factory = createS3ReadBuffer(current_key, object_size);
+    if (read_buf_or_factory.buf_factory)
+    {
+        input_format = FormatFactory::instance().getInputRandomAccess(
+            format,
+            std::move(read_buf_or_factory.buf_factory),
+            sample_block,
+            getContext(),
+            max_block_size,
+            /* is_remote_fs */ true,
+            compression_method,
+            format_settings);
+    }
+    else
+    {
+        owned_read_buf = wrapReadBufferWithCompressionMethod(
+            std::move(read_buf_or_factory.buf),
+            compression_method,
+            static_cast<int>(getContext()->getSettingsRef().zstd_window_log_max));
+        input_format = FormatFactory::instance().getInput(
+            format, *owned_read_buf, sample_block, getContext(), max_block_size, format_settings);
+    }
 
-    auto input_format = getContext()->getInputFormat(format, *read_buf, sample_block, max_block_size, format_settings);
     QueryPipelineBuilder builder;
     builder.init(Pipe(input_format));
 
@@ -610,57 +614,44 @@ StorageS3Source::ReaderHolder StorageS3Source::createReader()
     auto pipeline = std::make_unique<QueryPipeline>(QueryPipelineBuilder::getPipeline(std::move(builder)));
     auto current_reader = std::make_unique<PullingPipelineExecutor>(*pipeline);
 
-    return ReaderHolder{fs::path(bucket) / current_key, std::move(read_buf), std::move(pipeline), std::move(current_reader)};
+    return ReaderHolder{fs::path(bucket) / current_key, std::move(owned_read_buf), std::move(pipeline), std::move(current_reader)};
 }
 
 std::future<StorageS3Source::ReaderHolder> StorageS3Source::createReaderAsync()
 {
-    return create_reader_scheduler([this] { return createReader(); }, 0);
+    return create_reader_scheduler([this] { return createReader(); }, Priority{});
 }
 
-std::unique_ptr<ReadBuffer> StorageS3Source::createS3ReadBuffer(const String & key, size_t object_size)
+StorageS3Source::ReadBufferOrFactory StorageS3Source::createS3ReadBuffer(const String & key, size_t object_size)
 {
     auto read_settings = getContext()->getReadSettings().adjustBufferSize(object_size);
     read_settings.enable_filesystem_cache = false;
-
     auto download_buffer_size = getContext()->getSettings().max_download_buffer_size;
-    const bool use_parallel_download = download_buffer_size > 0 && download_thread_num > 1;
-    const bool object_too_small = object_size < download_thread_num * download_buffer_size;
+    const bool object_too_small = object_size <= 2 * download_buffer_size;
 
-    if (!use_parallel_download || object_too_small)
+    // Create a read buffer that will prefetch the first ~1 MB of the file.
+    // When reading lots of tiny files, this prefetching almost doubles the throughput.
+    // For bigger files, parallel reading is more useful.
+    if (object_too_small && read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
     {
-        LOG_TRACE(log, "Downloading object of size {} from S3 in single thread", object_size);
-        if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
-            return createAsyncS3ReadBuffer(key, read_settings, object_size);
-
-        return std::make_unique<ReadBufferFromS3>(client, bucket, key, version_id, request_settings, read_settings);
-    }
-
-    assert(object_size > 0);
-    if (download_buffer_size < DBMS_DEFAULT_BUFFER_SIZE)
-    {
-        LOG_WARNING(log, "Downloading buffer {} bytes too small, set at least {} bytes", download_buffer_size, DBMS_DEFAULT_BUFFER_SIZE);
-        download_buffer_size = DBMS_DEFAULT_BUFFER_SIZE;
+        LOG_TRACE(log, "Downloading object of size {} from S3 with initial prefetch", object_size);
+        return {.buf = createAsyncS3ReadBuffer(key, read_settings, object_size)};
     }
 
     auto factory = std::make_unique<ReadBufferS3Factory>(
-        client, bucket, key, version_id, download_buffer_size, object_size, request_settings, read_settings);
-
-    LOG_TRACE(log,
-        "Downloading from S3 in {} threads. Object size: {}, Range size: {}.",
-        download_thread_num, object_size, download_buffer_size);
-
-    return std::make_unique<ParallelReadBuffer>(std::move(factory), threadPoolCallbackRunner<void>(IOThreadPool::get(), "S3ParallelRead"), download_thread_num);
+        client, bucket, key, version_id, object_size, request_settings, read_settings);
+    return {.buf_factory = std::move(factory)};
 }
 
 std::unique_ptr<ReadBuffer> StorageS3Source::createAsyncS3ReadBuffer(
     const String & key, const ReadSettings & read_settings, size_t object_size)
 {
+    auto context = getContext();
     auto read_buffer_creator =
-        [this, read_settings]
-        (const std::string & path, size_t read_until_position) -> std::shared_ptr<ReadBufferFromFileBase>
+        [this, read_settings, object_size]
+        (const std::string & path, size_t read_until_position) -> std::unique_ptr<ReadBufferFromFileBase>
     {
-        return std::make_shared<ReadBufferFromS3>(
+        return std::make_unique<ReadBufferFromS3>(
             client,
             bucket,
             path,
@@ -670,16 +661,24 @@ std::unique_ptr<ReadBuffer> StorageS3Source::createAsyncS3ReadBuffer(
             /* use_external_buffer */true,
             /* offset */0,
             read_until_position,
-            /* restricted_seek */true);
+            /* restricted_seek */true,
+            object_size);
     };
 
     auto s3_impl = std::make_unique<ReadBufferFromRemoteFSGather>(
         std::move(read_buffer_creator),
         StoredObjects{StoredObject{key, object_size}},
-        read_settings);
+        read_settings,
+        /* cache_log */nullptr);
 
-    auto & pool_reader = getContext()->getThreadPoolReader(Context::FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
-    auto async_reader = std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(pool_reader, read_settings, std::move(s3_impl));
+    auto modified_settings{read_settings};
+    /// FIXME: Changing this setting to default value breaks something around parquet reading
+    modified_settings.remote_read_min_bytes_for_seek = modified_settings.remote_fs_buffer_size;
+
+    auto & pool_reader = context->getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
+    auto async_reader = std::make_unique<AsynchronousBoundedReadBuffer>(
+        std::move(s3_impl), pool_reader, modified_settings,
+        context->getAsyncReadCounters(), context->getFilesystemReadPrefetchesLog());
 
     async_reader->setReadUntilEnd();
     if (read_settings.remote_fs_prefetch)
@@ -764,7 +763,7 @@ public:
         ContextPtr context,
         std::optional<FormatSettings> format_settings_,
         const CompressionMethod compression_method,
-        const StorageS3::Configuration & s3_configuration_,
+        const StorageS3::Configuration & configuration_,
         const String & bucket,
         const String & key)
         : SinkToStorage(sample_block_)
@@ -773,13 +772,13 @@ public:
     {
         write_buf = wrapWriteBufferWithCompressionMethod(
             std::make_unique<WriteBufferFromS3>(
-                s3_configuration_.client,
+                configuration_.client,
                 bucket,
                 key,
-                s3_configuration_.request_settings,
-                std::nullopt,
                 DBMS_DEFAULT_BUFFER_SIZE,
-                threadPoolCallbackRunner<void>(IOThreadPool::get(), "S3ParallelRead"),
+                configuration_.request_settings,
+                std::nullopt,
+                threadPoolCallbackRunner<void>(IOThreadPool::get(), "S3ParallelWrite"),
                 context->getWriteSettings()),
             compression_method,
             3);
@@ -855,7 +854,7 @@ public:
         ContextPtr context_,
         std::optional<FormatSettings> format_settings_,
         const CompressionMethod compression_method_,
-        const StorageS3::Configuration & s3_configuration_,
+        const StorageS3::Configuration & configuration_,
         const String & bucket_,
         const String & key_)
         : PartitionedSink(partition_by, context_, sample_block_)
@@ -863,7 +862,7 @@ public:
         , sample_block(sample_block_)
         , context(context_)
         , compression_method(compression_method_)
-        , s3_configuration(s3_configuration_)
+        , configuration(configuration_)
         , bucket(bucket_)
         , key(key_)
         , format_settings(format_settings_)
@@ -884,7 +883,7 @@ public:
             context,
             format_settings,
             compression_method,
-            s3_configuration,
+            configuration,
             partition_bucket,
             partition_key
         );
@@ -893,12 +892,12 @@ public:
 private:
     const String format;
     const Block sample_block;
-    ContextPtr context;
+    const ContextPtr context;
     const CompressionMethod compression_method;
-    const StorageS3::Configuration & s3_configuration;
+    const StorageS3::Configuration configuration;
     const String bucket;
     const String key;
-    std::optional<FormatSettings> format_settings;
+    const std::optional<FormatSettings> format_settings;
 
     ExpressionActionsPtr partition_by_expr;
 
@@ -930,42 +929,31 @@ private:
 
 
 StorageS3::StorageS3(
-    const StorageS3::Configuration & configuration_,
+    const Configuration & configuration_,
+    ContextPtr context_,
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
-    ContextPtr context_,
     std::optional<FormatSettings> format_settings_,
     bool distributed_processing_,
     ASTPtr partition_by_)
     : IStorage(table_id_)
-    , s3_configuration{configuration_}
-    , keys({s3_configuration.url.key})
-    , format_name(configuration_.format)
-    , compression_method(configuration_.compression_method)
-    , name(s3_configuration.url.storage_name)
+    , configuration(configuration_)
+    , name(configuration.url.storage_name)
     , distributed_processing(distributed_processing_)
     , format_settings(format_settings_)
     , partition_by(partition_by_)
-    , is_key_with_globs(s3_configuration.url.key.find_first_of("*?{") != std::string::npos)
 {
-    FormatFactory::instance().checkFormatName(format_name);
-    context_->getGlobalContext()->getRemoteHostFilter().checkURL(s3_configuration.url.uri);
-    StorageInMemoryMetadata storage_metadata;
+    updateConfiguration(context_);
 
-    updateConfiguration(context_, s3_configuration);
+    FormatFactory::instance().checkFormatName(configuration.format);
+    context_->getGlobalContext()->getRemoteHostFilter().checkURL(configuration.url.uri);
+
+    StorageInMemoryMetadata storage_metadata;
     if (columns_.empty())
     {
-        auto columns = getTableStructureFromDataImpl(
-            format_name,
-            s3_configuration,
-            compression_method,
-            is_key_with_globs,
-            format_settings,
-            context_,
-            &object_infos);
-
+        auto columns = getTableStructureFromDataImpl(configuration, format_settings, context_);
         storage_metadata.setColumns(columns);
     }
     else
@@ -986,44 +974,51 @@ StorageS3::StorageS3(
 }
 
 std::shared_ptr<StorageS3Source::IIterator> StorageS3::createFileIterator(
-    const Configuration & s3_configuration,
-    const std::vector<String> & keys,
-    bool is_key_with_globs,
+    const Configuration & configuration,
     bool distributed_processing,
     ContextPtr local_context,
     ASTPtr query,
     const Block & virtual_block,
-    ObjectInfos * object_infos,
-    Strings * read_keys)
+    KeysWithInfo * read_keys)
 {
     if (distributed_processing)
     {
         return std::make_shared<StorageS3Source::ReadTaskIterator>(local_context->getReadTaskCallback());
     }
-    else if (is_key_with_globs)
+    else if (configuration.withGlobs())
     {
         /// Iterate through disclosed globs and make a source for each file
         return std::make_shared<StorageS3Source::DisclosedGlobIterator>(
-            *s3_configuration.client, s3_configuration.url, query, virtual_block,
-            local_context, object_infos, read_keys, s3_configuration.request_settings);
+            *configuration.client, configuration.url, query, virtual_block,
+            local_context, read_keys, configuration.request_settings);
     }
     else
     {
         return std::make_shared<StorageS3Source::KeysIterator>(
-            *s3_configuration.client, s3_configuration.url.version_id, keys,
-            s3_configuration.url.bucket, s3_configuration.request_settings, query, virtual_block, local_context,
-            object_infos, read_keys);
+            *configuration.client, configuration.url.version_id, configuration.keys,
+            configuration.url.bucket, configuration.request_settings, query,
+            virtual_block, local_context, read_keys);
     }
 }
 
 bool StorageS3::supportsSubcolumns() const
 {
-    return FormatFactory::instance().checkIfFormatSupportsSubcolumns(format_name);
+    return FormatFactory::instance().checkIfFormatSupportsSubcolumns(configuration.format);
 }
 
 bool StorageS3::supportsSubsetOfColumns() const
 {
-    return FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(format_name);
+    return FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(configuration.format);
+}
+
+bool StorageS3::prefersLargeBlocks() const
+{
+    return FormatFactory::instance().checkIfOutputFormatPrefersLargeBlocks(configuration.format);
+}
+
+bool StorageS3::parallelizeOutputAfterReading(ContextPtr context) const
+{
+    return FormatFactory::instance().checkParallelizeOutputAfterReading(configuration.format, context);
 }
 
 Pipe StorageS3::read(
@@ -1035,12 +1030,10 @@ Pipe StorageS3::read(
     size_t max_block_size,
     size_t num_streams)
 {
-    bool has_wildcards = s3_configuration.url.bucket.find(PARTITION_ID_WILDCARD) != String::npos
-        || keys.back().find(PARTITION_ID_WILDCARD) != String::npos;
-    if (partition_by && has_wildcards)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Reading from a partitioned S3 storage is not implemented yet");
+    auto query_configuration = updateConfigurationAndGetCopy(local_context);
 
-    updateConfiguration(local_context, s3_configuration);
+    if (partition_by && query_configuration.withWildcard())
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Reading from a partitioned S3 storage is not implemented yet");
 
     Pipes pipes;
 
@@ -1054,14 +1047,7 @@ Pipe StorageS3::read(
     }
 
     std::shared_ptr<StorageS3Source::IIterator> iterator_wrapper = createFileIterator(
-        s3_configuration,
-        keys,
-        is_key_with_globs,
-        distributed_processing,
-        local_context,
-        query_info.query,
-        virtual_block,
-        &object_infos);
+        query_configuration, distributed_processing, local_context, query_info.query, virtual_block);
 
     ColumnsDescription columns_description;
     Block block_for_format;
@@ -1091,109 +1077,113 @@ Pipe StorageS3::read(
     {
         pipes.emplace_back(std::make_shared<StorageS3Source>(
             requested_virtual_columns,
-            format_name,
+            query_configuration.format,
             getName(),
             block_for_format,
             local_context,
             format_settings,
             columns_description,
             max_block_size,
-            s3_configuration.request_settings,
-            compression_method,
-            s3_configuration.client,
-            s3_configuration.url.bucket,
-            s3_configuration.url.version_id,
+            query_configuration.request_settings,
+            query_configuration.compression_method,
+            query_configuration.client,
+            query_configuration.url.bucket,
+            query_configuration.url.version_id,
             iterator_wrapper,
             max_download_threads));
     }
 
-    auto pipe = Pipe::unitePipes(std::move(pipes));
-
-    narrowPipe(pipe, num_streams);
-    return pipe;
+    return Pipe::unitePipes(std::move(pipes));
 }
 
 SinkToStoragePtr StorageS3::write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
-    updateConfiguration(local_context, s3_configuration);
+    auto query_configuration = updateConfigurationAndGetCopy(local_context);
 
     auto sample_block = metadata_snapshot->getSampleBlock();
-    auto chosen_compression_method = chooseCompressionMethod(keys.back(), compression_method);
-    bool has_wildcards = s3_configuration.url.bucket.find(PARTITION_ID_WILDCARD) != String::npos || keys.back().find(PARTITION_ID_WILDCARD) != String::npos;
+    auto chosen_compression_method = chooseCompressionMethod(query_configuration.keys.back(), query_configuration.compression_method);
     auto insert_query = std::dynamic_pointer_cast<ASTInsertQuery>(query);
 
     auto partition_by_ast = insert_query ? (insert_query->partition_by ? insert_query->partition_by : partition_by) : nullptr;
-    bool is_partitioned_implementation = partition_by_ast && has_wildcards;
+    bool is_partitioned_implementation = partition_by_ast && query_configuration.withWildcard();
 
     if (is_partitioned_implementation)
     {
         return std::make_shared<PartitionedStorageS3Sink>(
             partition_by_ast,
-            format_name,
+            query_configuration.format,
             sample_block,
             local_context,
             format_settings,
             chosen_compression_method,
-            s3_configuration,
-            s3_configuration.url.bucket,
-            keys.back());
+            query_configuration,
+            query_configuration.url.bucket,
+            query_configuration.keys.back());
     }
     else
     {
-        if (is_key_with_globs)
+        if (query_configuration.withGlobs())
             throw Exception(ErrorCodes::DATABASE_ACCESS_DENIED,
-                            "S3 key '{}' contains globs, so the table is in readonly mode", s3_configuration.url.key);
+                            "S3 key '{}' contains globs, so the table is in readonly mode", query_configuration.url.key);
 
         bool truncate_in_insert = local_context->getSettingsRef().s3_truncate_on_insert;
 
-        if (!truncate_in_insert && S3::objectExists(*s3_configuration.client, s3_configuration.url.bucket, keys.back(), s3_configuration.url.version_id, s3_configuration.request_settings))
+        if (!truncate_in_insert && S3::objectExists(*query_configuration.client, query_configuration.url.bucket, query_configuration.keys.back(), query_configuration.url.version_id, query_configuration.request_settings))
         {
             if (local_context->getSettingsRef().s3_create_new_file_on_insert)
             {
-                size_t index = keys.size();
-                auto pos = keys[0].find_first_of('.');
+                size_t index = query_configuration.keys.size();
+                const auto & first_key = query_configuration.keys[0];
+                auto pos = first_key.find_first_of('.');
                 String new_key;
                 do
                 {
-                    new_key = keys[0].substr(0, pos) + "." + std::to_string(index) + (pos == std::string::npos ? "" : keys[0].substr(pos));
+                    new_key = first_key.substr(0, pos) + "." + std::to_string(index) + (pos == std::string::npos ? "" : first_key.substr(pos));
                     ++index;
                 }
-                while (S3::objectExists(*s3_configuration.client, s3_configuration.url.bucket, new_key, s3_configuration.url.version_id, s3_configuration.request_settings));
-                keys.push_back(new_key);
+                while (S3::objectExists(*query_configuration.client, query_configuration.url.bucket, new_key, query_configuration.url.version_id, query_configuration.request_settings));
+
+                query_configuration.keys.push_back(new_key);
+                configuration.keys.push_back(new_key);
             }
             else
+            {
                 throw Exception(
-                                ErrorCodes::BAD_ARGUMENTS,
-                                "Object in bucket {} with key {} already exists. "
-                                "If you want to overwrite it, enable setting s3_truncate_on_insert, if you "
-                                "want to create a new file on each insert, enable setting s3_create_new_file_on_insert",
-                                s3_configuration.url.bucket,
-                                keys.back());
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Object in bucket {} with key {} already exists. "
+                    "If you want to overwrite it, enable setting s3_truncate_on_insert, if you "
+                    "want to create a new file on each insert, enable setting s3_create_new_file_on_insert",
+                    query_configuration.url.bucket, query_configuration.keys.back());
+            }
         }
 
         return std::make_shared<StorageS3Sink>(
-            format_name,
+            query_configuration.format,
             sample_block,
             local_context,
             format_settings,
             chosen_compression_method,
-            s3_configuration,
-            s3_configuration.url.bucket,
-            keys.back());
+            query_configuration,
+            query_configuration.url.bucket,
+            query_configuration.keys.back());
     }
 }
 
 void StorageS3::truncate(const ASTPtr & /* query */, const StorageMetadataPtr &, ContextPtr local_context, TableExclusiveLockHolder &)
 {
-    updateConfiguration(local_context, s3_configuration);
+    auto query_configuration = updateConfigurationAndGetCopy(local_context);
 
-    if (is_key_with_globs)
-        throw Exception(ErrorCodes::DATABASE_ACCESS_DENIED,
-                            "S3 key '{}' contains globs, so the table is in readonly mode", s3_configuration.url.key);
+    if (query_configuration.withGlobs())
+    {
+        throw Exception(
+            ErrorCodes::DATABASE_ACCESS_DENIED,
+            "S3 key '{}' contains globs, so the table is in readonly mode",
+            query_configuration.url.key);
+    }
 
     Aws::S3::Model::Delete delkeys;
 
-    for (const auto & key : keys)
+    for (const auto & key : query_configuration.keys)
     {
         Aws::S3::Model::ObjectIdentifier obj;
         obj.SetKey(key);
@@ -1202,10 +1192,10 @@ void StorageS3::truncate(const ASTPtr & /* query */, const StorageMetadataPtr &,
 
     ProfileEvents::increment(ProfileEvents::S3DeleteObjects);
     S3::DeleteObjectsRequest request;
-    request.SetBucket(s3_configuration.url.bucket);
+    request.SetBucket(query_configuration.url.bucket);
     request.SetDelete(delkeys);
 
-    auto response = s3_configuration.client->DeleteObjects(request);
+    auto response = query_configuration.client->DeleteObjects(request);
     if (!response.IsSuccess())
     {
         const auto & err = response.GetError();
@@ -1216,57 +1206,84 @@ void StorageS3::truncate(const ASTPtr & /* query */, const StorageMetadataPtr &,
         LOG_WARNING(&Poco::Logger::get("StorageS3"), "Failed to delete {}, error: {}", error.GetKey(), error.GetMessage());
 }
 
-
-StorageS3::Configuration StorageS3::updateConfiguration(ContextPtr local_context, const StorageS3::Configuration & configuration)
+StorageS3::Configuration StorageS3::updateConfigurationAndGetCopy(ContextPtr local_context)
 {
-    StorageS3::Configuration new_configuration(configuration);
-    updateConfiguration(local_context, new_configuration);
-    return new_configuration;
+    std::lock_guard lock(configuration_update_mutex);
+    configuration.update(local_context);
+    return configuration;
 }
 
-void StorageS3::updateConfiguration(ContextPtr ctx, StorageS3::Configuration & upd)
+void StorageS3::updateConfiguration(ContextPtr local_context)
 {
-    auto settings = ctx->getStorageS3Settings().getSettings(upd.url.uri.toString());
-    upd.request_settings = settings.request_settings;
-    upd.request_settings.updateFromSettings(ctx->getSettings());
+    std::lock_guard lock(configuration_update_mutex);
+    configuration.update(local_context);
+}
 
-    if (upd.client)
-    {
-        if (upd.static_configuration)
-            return;
+void StorageS3::useConfiguration(const Configuration & new_configuration)
+{
+    std::lock_guard lock(configuration_update_mutex);
+    configuration = new_configuration;
+}
 
-        if (settings.auth_settings == upd.auth_settings)
-            return;
-    }
+const StorageS3::Configuration & StorageS3::getConfiguration()
+{
+    std::lock_guard lock(configuration_update_mutex);
+    return configuration;
+}
 
-    upd.auth_settings.updateFrom(settings.auth_settings);
+bool StorageS3::Configuration::update(ContextPtr context)
+{
+    auto s3_settings = context->getStorageS3Settings().getSettings(url.uri.toString());
+    request_settings = s3_settings.request_settings;
+    request_settings.updateFromSettings(context->getSettings());
 
+    if (client && (static_configuration || s3_settings.auth_settings == auth_settings))
+        return false;
+
+    auth_settings.updateFrom(s3_settings.auth_settings);
+    keys[0] = url.key;
+    connect(context);
+    return true;
+}
+
+void StorageS3::Configuration::connect(ContextPtr context)
+{
     S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
-        upd.auth_settings.region,
-        ctx->getRemoteHostFilter(),
-        static_cast<unsigned>(ctx->getGlobalContext()->getSettingsRef().s3_max_redirects),
-        ctx->getGlobalContext()->getSettingsRef().enable_s3_requests_logging,
+        auth_settings.region,
+        context->getRemoteHostFilter(),
+        static_cast<unsigned>(context->getGlobalContext()->getSettingsRef().s3_max_redirects),
+        context->getGlobalContext()->getSettingsRef().enable_s3_requests_logging,
         /* for_disk_s3 = */ false,
-        upd.request_settings.get_request_throttler,
-        upd.request_settings.put_request_throttler);
+        request_settings.get_request_throttler,
+        request_settings.put_request_throttler);
 
-    client_configuration.endpointOverride = upd.url.endpoint;
-    client_configuration.maxConnections = static_cast<unsigned>(upd.request_settings.max_connections);
+    client_configuration.endpointOverride = url.endpoint;
+    client_configuration.maxConnections = static_cast<unsigned>(request_settings.max_connections);
+    auto headers = auth_settings.headers;
+    if (!headers_from_ast.empty())
+        headers.insert(headers.end(), headers_from_ast.begin(), headers_from_ast.end());
 
-    auto credentials = Aws::Auth::AWSCredentials(upd.auth_settings.access_key_id, upd.auth_settings.secret_access_key);
-    auto headers = upd.auth_settings.headers;
-    if (!upd.headers_from_ast.empty())
-        headers.insert(headers.end(), upd.headers_from_ast.begin(), upd.headers_from_ast.end());
+    client_configuration.requestTimeoutMs = request_settings.request_timeout_ms;
 
-    upd.client = S3::ClientFactory::instance().create(
+    client_configuration.retryStrategy
+        = std::make_shared<Aws::Client::DefaultRetryStrategy>(request_settings.retry_attempts);
+
+    auto credentials = Aws::Auth::AWSCredentials(auth_settings.access_key_id, auth_settings.secret_access_key);
+    client = S3::ClientFactory::instance().create(
         client_configuration,
-        upd.url.is_virtual_hosted_style,
+        url.is_virtual_hosted_style,
         credentials.GetAWSAccessKeyId(),
         credentials.GetAWSSecretKey(),
-        upd.auth_settings.server_side_encryption_customer_key_base64,
+        auth_settings.server_side_encryption_customer_key_base64,
+        auth_settings.server_side_encryption_kms_config,
         std::move(headers),
-        upd.auth_settings.use_environment_credentials.value_or(ctx->getConfigRef().getBool("s3.use_environment_credentials", false)),
-        upd.auth_settings.use_insecure_imds_request.value_or(ctx->getConfigRef().getBool("s3.use_insecure_imds_request", false)));
+        S3::CredentialsConfiguration{
+            auth_settings.use_environment_credentials.value_or(context->getConfigRef().getBool("s3.use_environment_credentials", true)),
+            auth_settings.use_insecure_imds_request.value_or(context->getConfigRef().getBool("s3.use_insecure_imds_request", false)),
+            auth_settings.expiration_window_seconds.value_or(
+                context->getConfigRef().getUInt64("s3.expiration_window_seconds", S3::DEFAULT_EXPIRATION_WINDOW_SECONDS)),
+                auth_settings.no_sign_request.value_or(context->getConfigRef().getBool("s3.no_sign_request", false)),
+        });
 }
 
 void StorageS3::processNamedCollectionResult(StorageS3::Configuration & configuration, const NamedCollection & collection)
@@ -1281,9 +1298,11 @@ void StorageS3::processNamedCollectionResult(StorageS3::Configuration & configur
 
     configuration.auth_settings.access_key_id = collection.getOrDefault<String>("access_key_id", "");
     configuration.auth_settings.secret_access_key = collection.getOrDefault<String>("secret_access_key", "");
-    configuration.auth_settings.use_environment_credentials = collection.getOrDefault<UInt64>("use_environment_credentials", 0);
+    configuration.auth_settings.use_environment_credentials = collection.getOrDefault<UInt64>("use_environment_credentials", 1);
+    configuration.auth_settings.no_sign_request = collection.getOrDefault<bool>("no_sign_request", false);
+    configuration.auth_settings.expiration_window_seconds = collection.getOrDefault<UInt64>("expiration_window_seconds", S3::DEFAULT_EXPIRATION_WINDOW_SECONDS);
 
-    configuration.format = collection.getOrDefault<String>("format", "auto");
+    configuration.format = collection.getOrDefault<String>("format", configuration.format);
     configuration.compression_method = collection.getOrDefault<String>("compression_method", collection.getOrDefault<String>("compression", "auto"));
     configuration.structure = collection.getOrDefault<String>("structure", "auto");
 
@@ -1294,7 +1313,7 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
 {
     StorageS3::Configuration configuration;
 
-    if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args))
+    if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args, local_context))
     {
         processNamedCollectionResult(configuration, *named_collection);
     }
@@ -1305,6 +1324,9 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
         /// S3('url')
         /// S3('url', 'format')
         /// S3('url', 'format', 'compression')
+        /// S3('url', NOSIGN)
+        /// S3('url', NOSIGN, 'format')
+        /// S3('url', NOSIGN, 'format', 'compression')
         /// S3('url', 'aws_access_key_id', 'aws_secret_access_key')
         /// S3('url', 'aws_access_key_id', 'aws_secret_access_key', 'format')
         /// S3('url', 'aws_access_key_id', 'aws_secret_access_key', 'format', 'compression')
@@ -1313,7 +1335,7 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
         if (engine_args.empty() || engine_args.size() > 5)
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
                             "Storage S3 requires 1 to 5 arguments: "
-                            "url, [access_key_id, secret_access_key], name of used format and [compression_method]");
+                            "url, [NOSIGN | access_key_id, secret_access_key], name of used format and [compression_method]");
 
         auto * header_it = StorageURL::collectHeaders(engine_args, configuration.headers_from_ast, local_context);
         if (header_it != engine_args.end())
@@ -1326,24 +1348,57 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
         static std::unordered_map<size_t, std::unordered_map<std::string_view, size_t>> size_to_engine_args
         {
             {1, {{}}},
-            {2, {{"format", 1}}},
-            {4, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}}},
             {5, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"compression_method", 4}}}
         };
 
         std::unordered_map<std::string_view, size_t> engine_args_to_idx;
-        /// For 3 arguments we support 2 possible variants:
-        /// s3(source, format, compression_method) and s3(source, access_key_id, access_key_id)
-        /// We can distinguish them by looking at the 2-nd argument: check if it's a format name or not.
-        if (engine_args.size() == 3)
-        {
-            auto second_arg = checkAndGetLiteralArgument<String>(engine_args[1], "format/access_key_id");
-            if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
-                engine_args_to_idx = {{"format", 1}, {"compression_method", 2}};
+        bool no_sign_request = false;
 
+        /// For 2 arguments we support 2 possible variants:
+        /// - s3(source, format)
+        /// - s3(source, NOSIGN)
+        /// We can distinguish them by looking at the 2-nd argument: check if it's NOSIGN or not.
+        if (engine_args.size() == 2)
+        {
+            auto second_arg = checkAndGetLiteralArgument<String>(engine_args[1], "format/NOSIGN");
+            if (boost::iequals(second_arg, "NOSIGN"))
+                no_sign_request = true;
+            else
+                engine_args_to_idx = {{"format", 1}};
+        }
+        /// For 3 arguments we support 2 possible variants:
+        /// - s3(source, format, compression_method)
+        /// - s3(source, access_key_id, access_key_id)
+        /// - s3(source, NOSIGN, format)
+        /// We can distinguish them by looking at the 2-nd argument: check if it's NOSIGN or format name.
+        else if (engine_args.size() == 3)
+        {
+            auto second_arg = checkAndGetLiteralArgument<String>(engine_args[1], "format/access_key_id/NOSIGN");
+            if (boost::iequals(second_arg, "NOSIGN"))
+            {
+                no_sign_request = true;
+                engine_args_to_idx = {{"format", 2}};
+            }
+            else if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
+                engine_args_to_idx = {{"format", 1}, {"compression_method", 2}};
             else
                 engine_args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}};
         }
+        /// For 4 arguments we support 2 possible variants:
+        /// - s3(source, access_key_id, secret_access_key, format)
+        /// - s3(source, NOSIGN, format, compression_method)
+        /// We can distinguish them by looking at the 2-nd argument: check if it's a NOSIGN or not.
+        else if (engine_args.size() == 4)
+        {
+            auto second_arg = checkAndGetLiteralArgument<String>(engine_args[1], "access_key_id/NOSIGN");
+            if (boost::iequals(second_arg, "NOSIGN"))
+            {
+                no_sign_request = true;
+                engine_args_to_idx = {{"format", 2}, {"compression_method", 3}};
+            }
+            else
+                engine_args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}};
+        }
         else
         {
             engine_args_to_idx = size_to_engine_args[engine_args.size()];
@@ -1363,10 +1418,14 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
 
         if (engine_args_to_idx.contains("secret_access_key"))
             configuration.auth_settings.secret_access_key = checkAndGetLiteralArgument<String>(engine_args[engine_args_to_idx["secret_access_key"]], "secret_access_key");
+
+        configuration.auth_settings.no_sign_request = no_sign_request;
     }
 
     configuration.static_configuration = !configuration.auth_settings.access_key_id.empty();
 
+    configuration.keys = {configuration.url.key};
+
     if (configuration.format == "auto" && get_format_from_file)
         configuration.format = FormatFactory::instance().getFormatFromFileName(configuration.url.key, true);
 
@@ -1374,40 +1433,26 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
 }
 
 ColumnsDescription StorageS3::getTableStructureFromData(
-    StorageS3::Configuration & configuration,
+    const StorageS3::Configuration & configuration,
     const std::optional<FormatSettings> & format_settings,
-    ContextPtr ctx,
-    ObjectInfos * object_infos)
+    ContextPtr ctx)
 {
-    updateConfiguration(ctx, configuration);
-    return getTableStructureFromDataImpl(
-        configuration.format, configuration, configuration.compression_method,
-        configuration.url.key.find_first_of("*?{") != std::string::npos, format_settings, ctx, object_infos);
+    return getTableStructureFromDataImpl(configuration, format_settings, ctx);
 }
 
 ColumnsDescription StorageS3::getTableStructureFromDataImpl(
-    const String & format,
-    const Configuration & s3_configuration,
-    const String & compression_method,
-    bool is_key_with_globs,
+    const Configuration & configuration,
     const std::optional<FormatSettings> & format_settings,
-    ContextPtr ctx,
-    ObjectInfos * object_infos)
+    ContextPtr ctx)
 {
-    std::vector<String> read_keys;
+    KeysWithInfo read_keys;
 
-    auto file_iterator = createFileIterator(
-        s3_configuration,
-        {s3_configuration.url.key},
-        is_key_with_globs,
-        false,
-        ctx, nullptr,
-        {}, object_infos, &read_keys);
+    auto file_iterator = createFileIterator(configuration, false, ctx, nullptr, {}, &read_keys);
 
     std::optional<ColumnsDescription> columns_from_cache;
     size_t prev_read_keys_size = read_keys.size();
     if (ctx->getSettingsRef().schema_inference_use_cache_for_s3)
-        columns_from_cache = tryGetColumnsFromCache(read_keys.begin(), read_keys.end(), s3_configuration, object_infos, format, format_settings, ctx);
+        columns_from_cache = tryGetColumnsFromCache(read_keys.begin(), read_keys.end(), configuration, format_settings, ctx);
 
     ReadBufferIterator read_buffer_iterator = [&, first = true](ColumnsDescription & cached_columns) mutable -> std::unique_ptr<ReadBuffer>
     {
@@ -1419,7 +1464,7 @@ ColumnsDescription StorageS3::getTableStructureFromDataImpl(
                 throw Exception(
                     ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
                     "Cannot extract table structure from {} format file, because there are no files with provided path "
-                    "in S3. You must specify table structure manually", format);
+                    "in S3. You must specify table structure manually", configuration.format);
 
             return nullptr;
         }
@@ -1427,7 +1472,7 @@ ColumnsDescription StorageS3::getTableStructureFromDataImpl(
         /// S3 file iterator could get new keys after new iteration, check them in schema cache.
         if (ctx->getSettingsRef().schema_inference_use_cache_for_s3 && read_keys.size() > prev_read_keys_size)
         {
-            columns_from_cache = tryGetColumnsFromCache(read_keys.begin() + prev_read_keys_size, read_keys.end(), s3_configuration, object_infos, format, format_settings, ctx);
+            columns_from_cache = tryGetColumnsFromCache(read_keys.begin() + prev_read_keys_size, read_keys.end(), configuration, format_settings, ctx);
             prev_read_keys_size = read_keys.size();
             if (columns_from_cache)
             {
@@ -1440,8 +1485,8 @@ ColumnsDescription StorageS3::getTableStructureFromDataImpl(
         int zstd_window_log_max = static_cast<int>(ctx->getSettingsRef().zstd_window_log_max);
         return wrapReadBufferWithCompressionMethod(
             std::make_unique<ReadBufferFromS3>(
-                s3_configuration.client, s3_configuration.url.bucket, key, s3_configuration.url.version_id, s3_configuration.request_settings, ctx->getReadSettings()),
-            chooseCompressionMethod(key, compression_method),
+                configuration.client, configuration.url.bucket, key, configuration.url.version_id, configuration.request_settings, ctx->getReadSettings()),
+            chooseCompressionMethod(key, configuration.compression_method),
             zstd_window_log_max);
     };
 
@@ -1449,10 +1494,10 @@ ColumnsDescription StorageS3::getTableStructureFromDataImpl(
     if (columns_from_cache)
         columns = *columns_from_cache;
     else
-        columns = readSchemaFromFormat(format, format_settings, read_buffer_iterator, is_key_with_globs, ctx);
+        columns = readSchemaFromFormat(configuration.format, format_settings, read_buffer_iterator, configuration.withGlobs(), ctx);
 
     if (ctx->getSettingsRef().schema_inference_use_cache_for_s3)
-        addColumnsToCache(read_keys, s3_configuration, columns, format, format_settings, ctx);
+        addColumnsToCache(read_keys, configuration, columns, configuration.format, format_settings, ctx);
 
     return columns;
 }
@@ -1498,12 +1543,12 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
             partition_by = args.storage_def->partition_by->clone();
 
         return std::make_shared<StorageS3>(
-            configuration,
+            std::move(configuration),
+            args.getContext(),
             args.table_id,
             args.columns,
             args.constraints,
             args.comment,
-            args.getContext(),
             format_settings,
             /* distributed_processing_ */false,
             partition_by);
@@ -1548,44 +1593,44 @@ SchemaCache & StorageS3::getSchemaCache(const ContextPtr & ctx)
 }
 
 std::optional<ColumnsDescription> StorageS3::tryGetColumnsFromCache(
-    const Strings::const_iterator & begin,
-    const Strings::const_iterator & end,
-    const Configuration & s3_configuration,
-    ObjectInfos * object_infos,
-    const String & format_name,
+    const KeysWithInfo::const_iterator & begin,
+    const KeysWithInfo::const_iterator & end,
+    const Configuration & configuration,
     const std::optional<FormatSettings> & format_settings,
     const ContextPtr & ctx)
 {
     auto & schema_cache = getSchemaCache(ctx);
     for (auto it = begin; it < end; ++it)
     {
-        String path = fs::path(s3_configuration.url.bucket) / *it;
-        auto get_last_mod_time = [&]() -> std::optional<time_t>
+        auto get_last_mod_time = [&]
         {
-            S3::ObjectInfo info;
-            /// Check if we already have information about this object.
-            /// If no, request it and remember for possible future usage.
-            if (object_infos && object_infos->contains(path))
-                info = (*object_infos)[path];
+            time_t last_modification_time = 0;
+            if (it->info)
+            {
+                last_modification_time = it->info->last_modification_time;
+            }
             else
             {
                 /// Note that in case of exception in getObjectInfo returned info will be empty,
                 /// but schema cache will handle this case and won't return columns from cache
                 /// because we can't say that it's valid without last modification time.
-                info = S3::getObjectInfo(*s3_configuration.client, s3_configuration.url.bucket, *it, s3_configuration.url.version_id, s3_configuration.request_settings,
-                                         {}, {}, /* throw_on_error= */ false);
-                if (object_infos)
-                    (*object_infos)[path] = info;
+                last_modification_time = S3::getObjectInfo(
+                    *configuration.client,
+                    configuration.url.bucket,
+                    it->key,
+                    configuration.url.version_id,
+                    configuration.request_settings,
+                    /*with_metadata=*/ false,
+                    /*for_disk_s3=*/ false,
+                    /*throw_on_error= */ false).last_modification_time;
             }
 
-            if (info.last_modification_time)
-                return info.last_modification_time;
-
-            return std::nullopt;
+            return last_modification_time ? std::make_optional(last_modification_time) : std::nullopt;
         };
 
-        String source = fs::path(s3_configuration.url.uri.getHost() + std::to_string(s3_configuration.url.uri.getPort())) / path;
-        auto cache_key = getKeyForSchemaCache(source, format_name, format_settings, ctx);
+        String path = fs::path(configuration.url.bucket) / it->key;
+        String source = fs::path(configuration.url.uri.getHost() + std::to_string(configuration.url.uri.getPort())) / path;
+        auto cache_key = getKeyForSchemaCache(source, configuration.format, format_settings, ctx);
         auto columns = schema_cache.tryGet(cache_key, get_last_mod_time);
         if (columns)
             return columns;
@@ -1595,17 +1640,17 @@ std::optional<ColumnsDescription> StorageS3::tryGetColumnsFromCache(
 }
 
 void StorageS3::addColumnsToCache(
-    const Strings & keys,
-    const Configuration & s3_configuration,
+    const KeysWithInfo & keys,
+    const Configuration & configuration,
     const ColumnsDescription & columns,
     const String & format_name,
     const std::optional<FormatSettings> & format_settings,
     const ContextPtr & ctx)
 {
-    auto host_and_bucket = fs::path(s3_configuration.url.uri.getHost() + std::to_string(s3_configuration.url.uri.getPort())) / s3_configuration.url.bucket;
+    auto host_and_bucket = fs::path(configuration.url.uri.getHost() + std::to_string(configuration.url.uri.getPort())) / configuration.url.bucket;
     Strings sources;
     sources.reserve(keys.size());
-    std::transform(keys.begin(), keys.end(), std::back_inserter(sources), [&](const String & key){ return host_and_bucket / key; });
+    std::transform(keys.begin(), keys.end(), std::back_inserter(sources), [&](const auto & elem){ return host_and_bucket / elem.key; });
     auto cache_keys = getKeysForSchemaCache(sources, format_name, format_settings, ctx);
     auto & schema_cache = getSchemaCache(ctx);
     schema_cache.addMany(cache_keys, columns);
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index b4f95d8d10d..12573ab513f 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -14,9 +14,9 @@
 #include <Processors/ISource.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Poco/URI.h>
-#include <Common/logger_useful.h>
 #include <IO/S3/getObjectInfo.h>
 #include <IO/CompressionMethod.h>
+#include <IO/SeekableReadBuffer.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
 #include <Storages/Cache/SchemaCache.h>
@@ -51,7 +51,7 @@ public:
     };
 
     using KeysWithInfo = std::vector<KeyWithInfo>;
-    using ObjectInfos = std::unordered_map<String, S3::ObjectInfo>;
+
     class IIterator
     {
     public:
@@ -71,8 +71,7 @@ public:
             ASTPtr query,
             const Block & virtual_header,
             ContextPtr context,
-            ObjectInfos * object_infos = nullptr,
-            Strings * read_keys_ = nullptr,
+            KeysWithInfo * read_keys_ = nullptr,
             const S3Settings::RequestSettings & request_settings_ = {});
 
         KeyWithInfo next() override;
@@ -96,8 +95,7 @@ public:
             ASTPtr query,
             const Block & virtual_header,
             ContextPtr context,
-            ObjectInfos * object_infos = nullptr,
-            Strings * read_keys = nullptr);
+            KeysWithInfo * read_keys = nullptr);
 
         KeyWithInfo next() override;
         size_t getTotalSize() const override;
@@ -206,6 +204,12 @@ private:
         std::unique_ptr<PullingPipelineExecutor> reader;
     };
 
+    struct ReadBufferOrFactory
+    {
+        std::unique_ptr<ReadBuffer> buf;
+        SeekableReadBufferFactoryPtr buf_factory;
+    };
+
     ReaderHolder reader;
 
     std::vector<NameAndTypePair> requested_virtual_columns;
@@ -226,7 +230,7 @@ private:
     ReaderHolder createReader();
     std::future<ReaderHolder> createReaderAsync();
 
-    std::unique_ptr<ReadBuffer> createS3ReadBuffer(const String & key, size_t object_size);
+    ReadBufferOrFactory createS3ReadBuffer(const String & key, size_t object_size);
     std::unique_ptr<ReadBuffer> createAsyncS3ReadBuffer(const String & key, const ReadSettings & read_settings, size_t object_size);
 };
 
@@ -235,13 +239,34 @@ private:
  * It sends HTTP GET to server when select is called and
  * HTTP PUT when insert is called.
  */
-class StorageS3 : public IStorage, WithContext
+class StorageS3 : public IStorage
 {
 public:
     struct Configuration : public StatelessTableEngineConfiguration
     {
+        Configuration() = default;
+
+        String getPath() const { return url.key; }
+
+        void appendToPath(const String & suffix)
+        {
+            url = S3::URI{std::filesystem::path(url.uri.toString()) / suffix};
+        }
+
+        bool update(ContextPtr context);
+
+        void connect(ContextPtr context);
+
+        bool withGlobs() const { return url.key.find_first_of("*?{") != std::string::npos; }
+
+        bool withWildcard() const
+        {
+            static const String PARTITION_ID_WILDCARD = "{_partition_id}";
+            return url.bucket.find(PARTITION_ID_WILDCARD) != String::npos
+                || keys.back().find(PARTITION_ID_WILDCARD) != String::npos;
+        }
+
         S3::URI url;
-        std::shared_ptr<const S3::Client> client;
         S3::AuthSettings auth_settings;
         S3Settings::RequestSettings request_settings;
         /// If s3 configuration was passed from ast, then it is static.
@@ -250,18 +275,17 @@ public:
         /// Headers from ast is a part of static configuration.
         HTTPHeaderEntries headers_from_ast;
 
-        void appendToPath(const String & suffix) { url = S3::URI{std::filesystem::path(url.uri.toString()) / suffix}; }
-
-        String getPath() const { return url.uri.toString(); } /// For logging
+        std::shared_ptr<const S3::Client> client;
+        std::vector<String> keys;
     };
 
     StorageS3(
-        const StorageS3::Configuration & configuration_,
+        const Configuration & configuration_,
+        ContextPtr context_,
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
-        ContextPtr context_,
         std::optional<FormatSettings> format_settings_,
         bool distributed_processing_ = false,
         ASTPtr partition_by_ = nullptr);
@@ -288,8 +312,6 @@ public:
 
     bool supportsPartitionBy() const override;
 
-    using ObjectInfos = StorageS3Source::ObjectInfos;
-
     static void processNamedCollectionResult(StorageS3::Configuration & configuration, const NamedCollection & collection);
 
     static SchemaCache & getSchemaCache(const ContextPtr & ctx);
@@ -297,70 +319,66 @@ public:
     static StorageS3::Configuration getConfiguration(ASTs & engine_args, ContextPtr local_context, bool get_format_from_file = true);
 
     static ColumnsDescription getTableStructureFromData(
-        StorageS3::Configuration & configuration,
+        const StorageS3::Configuration & configuration,
         const std::optional<FormatSettings> & format_settings,
-        ContextPtr ctx,
-        ObjectInfos * object_infos = nullptr);
+        ContextPtr ctx);
 
 protected:
-    static StorageS3::Configuration updateConfiguration(ContextPtr local_context, const Configuration & configuration);
-    static void updateConfiguration(ContextPtr, Configuration &);
+    virtual Configuration updateConfigurationAndGetCopy(ContextPtr local_context);
+
+    virtual void updateConfiguration(ContextPtr local_context);
+
+    void useConfiguration(const Configuration & new_configuration);
+
+    const Configuration & getConfiguration();
 
 private:
     friend class StorageS3Cluster;
     friend class TableFunctionS3Cluster;
 
-    Configuration s3_configuration;
-    std::vector<String> keys;
+    Configuration configuration;
+    std::mutex configuration_update_mutex;
     NamesAndTypesList virtual_columns;
     Block virtual_block;
 
-    String format_name;
-    String compression_method;
     String name;
     const bool distributed_processing;
     std::optional<FormatSettings> format_settings;
     ASTPtr partition_by;
-    bool is_key_with_globs = false;
 
-    ObjectInfos object_infos;
+    using KeysWithInfo = StorageS3Source::KeysWithInfo;
 
     static std::shared_ptr<StorageS3Source::IIterator> createFileIterator(
-        const Configuration & s3_configuration,
-        const std::vector<String> & keys,
-        bool is_key_with_globs,
+        const Configuration & configuration,
         bool distributed_processing,
         ContextPtr local_context,
         ASTPtr query,
         const Block & virtual_block,
-        ObjectInfos * object_infos = nullptr,
-        Strings * read_keys = nullptr);
+        KeysWithInfo * read_keys = nullptr);
 
     static ColumnsDescription getTableStructureFromDataImpl(
-        const String & format,
-        const Configuration & s3_configuration,
-        const String & compression_method,
-        bool is_key_with_globs,
+        const Configuration & configuration,
         const std::optional<FormatSettings> & format_settings,
-        ContextPtr ctx,
-        ObjectInfos * object_infos = nullptr);
+        ContextPtr ctx);
 
     bool supportsSubcolumns() const override;
 
     bool supportsSubsetOfColumns() const override;
 
+    bool prefersLargeBlocks() const override;
+
+    bool parallelizeOutputAfterReading(ContextPtr context) const override;
+
     static std::optional<ColumnsDescription> tryGetColumnsFromCache(
-        const Strings::const_iterator & begin,
-        const Strings::const_iterator & end,
-        const Configuration & s3_configuration,
-        ObjectInfos * object_infos,
-        const String & format_name,
+        const KeysWithInfo::const_iterator & begin,
+        const KeysWithInfo::const_iterator & end,
+        const Configuration & configuration,
         const std::optional<FormatSettings> & format_settings,
         const ContextPtr & ctx);
 
     static void addColumnsToCache(
-        const Strings & keys,
-        const Configuration & s3_configuration,
+        const KeysWithInfo & keys,
+        const Configuration & configuration,
         const ColumnsDescription & columns,
         const String & format_name,
         const std::optional<FormatSettings> & format_settings,
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index c7535bb4550..153a3b7f11b 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -4,35 +4,22 @@
 
 #if USE_AWS_S3
 
-#include "Common/Exception.h"
-#include "Client/Connection.h"
-#include "Core/QueryProcessingStage.h"
 #include <DataTypes/DataTypeString.h>
 #include <IO/ConnectionTimeouts.h>
-#include <IO/WriteBufferFromS3.h>
-#include <IO/WriteHelpers.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/getHeaderForProcessingStage.h>
-#include <Interpreters/SelectQueryOptions.h>
-#include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
-#include <Interpreters/TranslateQualifiedNamesVisitor.h>
-#include <Processors/Transforms/AddingDefaultsTransform.h>
-#include <QueryPipeline/narrowPipe.h>
-#include <QueryPipeline/Pipe.h>
+#include <Interpreters/InterpreterSelectQuery.h>
 #include <Processors/Sources/RemoteSource.h>
+#include <Processors/Transforms/AddingDefaultsTransform.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
-#include <Parsers/queryToString.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTLiteral.h>
 #include <Storages/IStorage.h>
+#include <Storages/StorageURL.h>
 #include <Storages/SelectQueryInfo.h>
-#include <Storages/getVirtualsForStorage.h>
 #include <Storages/StorageDictionary.h>
-#include <Storages/addColumnsStructureToQueryWithClusterEngine.h>
-#include <Common/logger_useful.h>
-
-#include <aws/core/auth/AWSCredentials.h>
+#include <Storages/extractTableFunctionArgumentsFromSelectQuery.h>
+#include <Storages/getVirtualsForStorage.h>
+#include <Common/Exception.h>
+#include <Parsers/queryToString.h>
+#include <TableFunctions/TableFunctionS3Cluster.h>
 
 #include <memory>
 #include <string>
@@ -40,34 +27,30 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 StorageS3Cluster::StorageS3Cluster(
-    const Configuration & configuration_,
+    const String & cluster_name_,
+    const StorageS3::Configuration & configuration_,
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     ContextPtr context_,
     bool structure_argument_was_provided_)
-    : IStorageCluster(table_id_)
+    : IStorageCluster(cluster_name_, table_id_, &Poco::Logger::get("StorageS3Cluster (" + table_id_.table_name + ")"), structure_argument_was_provided_)
     , s3_configuration{configuration_}
-    , cluster_name(configuration_.cluster_name)
-    , format_name(configuration_.format)
-    , compression_method(configuration_.compression_method)
-    , structure_argument_was_provided(structure_argument_was_provided_)
 {
     context_->getGlobalContext()->getRemoteHostFilter().checkURL(configuration_.url.uri);
     StorageInMemoryMetadata storage_metadata;
-    StorageS3::updateConfiguration(context_, s3_configuration);
+    updateConfigurationIfChanged(context_);
 
     if (columns_.empty())
     {
-        const auto & filename = configuration_.url.uri.getPath();
-        const bool is_key_with_globs = filename.find_first_of("*?{") != std::string::npos;
-
-        /// `distributed_processing` is set to false, because this code is executed on the initiator, so there is no callback set
-        /// for asking for the next tasks.
         /// `format_settings` is set to std::nullopt, because StorageS3Cluster is used only as table function
-        auto columns = StorageS3::getTableStructureFromDataImpl(
-            format_name, s3_configuration, compression_method, is_key_with_globs, /*format_settings=*/std::nullopt, context_);
+        auto columns = StorageS3::getTableStructureFromDataImpl(s3_configuration, /*format_settings=*/std::nullopt, context_);
         storage_metadata.setColumns(columns);
     }
     else
@@ -86,91 +69,21 @@ StorageS3Cluster::StorageS3Cluster(
         virtual_block.insert({column.type->createColumn(), column.type, column.name});
 }
 
-/// The code executes on initiator
-Pipe StorageS3Cluster::read(
-    const Names & column_names,
-    const StorageSnapshotPtr & storage_snapshot,
-    SelectQueryInfo & query_info,
-    ContextPtr context,
-    QueryProcessingStage::Enum processed_stage,
-    size_t /*max_block_size*/,
-    size_t /*num_streams*/)
+void StorageS3Cluster::addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context)
 {
-    StorageS3::updateConfiguration(context, s3_configuration);
+    ASTExpressionList * expression_list = extractTableFunctionArgumentsFromSelectQuery(query);
+    if (!expression_list)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected SELECT query from table function s3Cluster, got '{}'", queryToString(query));
 
-    auto cluster = getCluster(context);
-    auto extension = getTaskIteratorExtension(query_info.query, context);
-
-    /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
-    auto interpreter = InterpreterSelectQuery(query_info.query, context, SelectQueryOptions(processed_stage).analyze());
-
-    const Scalars & scalars = context->hasQueryContext() ? context->getQueryContext()->getScalars() : Scalars{};
-
-    Pipes pipes;
-
-    const bool add_agg_info = processed_stage == QueryProcessingStage::WithMergeableState;
-
-    ASTPtr query_to_send = interpreter.getQueryInfo().query->clone();
-    if (!structure_argument_was_provided)
-        addColumnsStructureToQueryWithClusterEngine(
-            query_to_send, StorageDictionary::generateNamesAndTypesDescription(storage_snapshot->metadata->getColumns().getAll()), 5, getName());
-
-    RestoreQualifiedNamesVisitor::Data data;
-    data.distributed_table = DatabaseAndTableWithAlias(*getTableExpression(query_info.query->as<ASTSelectQuery &>(), 0));
-    data.remote_table.database = context->getCurrentDatabase();
-    data.remote_table.table = getName();
-    RestoreQualifiedNamesVisitor(data).visit(query_to_send);
-    AddDefaultDatabaseVisitor visitor(context, context->getCurrentDatabase(),
-        /* only_replace_current_database_function_= */false,
-        /* only_replace_in_join_= */true);
-    visitor.visit(query_to_send);
-
-    const auto & current_settings = context->getSettingsRef();
-    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
-    for (const auto & shard_info : cluster->getShardsInfo())
-    {
-        auto try_results = shard_info.pool->getMany(timeouts, &current_settings, PoolMode::GET_MANY);
-        for (auto & try_result : try_results)
-        {
-            auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
-                    shard_info.pool,
-                    std::vector<IConnectionPool::Entry>{try_result},
-                    queryToString(query_to_send),
-                    interpreter.getSampleBlock(),
-                    context,
-                    /*throttler=*/nullptr,
-                    scalars,
-                    Tables(),
-                    processed_stage,
-                    extension);
-
-            pipes.emplace_back(std::make_shared<RemoteSource>(remote_query_executor, add_agg_info, false));
-        }
-    }
-
-    storage_snapshot->check(column_names);
-    return Pipe::unitePipes(std::move(pipes));
+    TableFunctionS3Cluster::addColumnsStructureToArguments(expression_list->children, structure, context);
 }
 
-QueryProcessingStage::Enum StorageS3Cluster::getQueryProcessingStage(
-    ContextPtr context, QueryProcessingStage::Enum to_stage, const StorageSnapshotPtr &, SelectQueryInfo &) const
+void StorageS3Cluster::updateConfigurationIfChanged(ContextPtr local_context)
 {
-    /// Initiator executes query on remote node.
-    if (context->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
-        if (to_stage >= QueryProcessingStage::Enum::WithMergeableState)
-            return QueryProcessingStage::Enum::WithMergeableState;
-
-    /// Follower just reads the data.
-    return QueryProcessingStage::Enum::FetchColumns;
+    s3_configuration.update(local_context);
 }
 
-
-ClusterPtr StorageS3Cluster::getCluster(ContextPtr context) const
-{
-    return context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
-}
-
-RemoteQueryExecutor::Extension StorageS3Cluster::getTaskIteratorExtension(ASTPtr query, ContextPtr context) const
+RemoteQueryExecutor::Extension StorageS3Cluster::getTaskIteratorExtension(ASTPtr query, const ContextPtr & context) const
 {
     auto iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(
         *s3_configuration.client, s3_configuration.url, query, virtual_block, context);
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
index e55382c66b2..5c2229875e5 100644
--- a/src/Storages/StorageS3Cluster.h
+++ b/src/Storages/StorageS3Cluster.h
@@ -21,13 +21,9 @@ class Context;
 class StorageS3Cluster : public IStorageCluster
 {
 public:
-    struct Configuration : public StorageS3::Configuration
-    {
-        std::string cluster_name;
-    };
-
     StorageS3Cluster(
-        const Configuration & configuration_,
+        const String & cluster_name_,
+        const StorageS3::Configuration & configuration_,
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
@@ -36,25 +32,21 @@ public:
 
     std::string getName() const override { return "S3Cluster"; }
 
-    Pipe read(const Names &, const StorageSnapshotPtr &, SelectQueryInfo &,
-        ContextPtr, QueryProcessingStage::Enum, size_t /*max_block_size*/, size_t /*num_streams*/) override;
-
-    QueryProcessingStage::Enum
-    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageSnapshotPtr &, SelectQueryInfo &) const override;
-
     NamesAndTypesList getVirtuals() const override;
 
-    RemoteQueryExecutor::Extension getTaskIteratorExtension(ASTPtr query, ContextPtr context) const override;
-    ClusterPtr getCluster(ContextPtr context) const override;
+    RemoteQueryExecutor::Extension getTaskIteratorExtension(ASTPtr query, const ContextPtr & context) const override;
+
+protected:
+    void updateConfigurationIfChanged(ContextPtr local_context);
 
 private:
+    void updateBeforeRead(const ContextPtr & context) override { updateConfigurationIfChanged(context); }
+
+    void addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context) override;
+
     StorageS3::Configuration s3_configuration;
-    String cluster_name;
-    String format_name;
-    String compression_method;
     NamesAndTypesList virtual_columns;
     Block virtual_block;
-    bool structure_argument_was_provided;
 };
 
 
diff --git a/src/Storages/StorageS3Settings.cpp b/src/Storages/StorageS3Settings.cpp
index 17a11ba9848..23b4630707c 100644
--- a/src/Storages/StorageS3Settings.cpp
+++ b/src/Storages/StorageS3Settings.cpp
@@ -32,10 +32,12 @@ S3Settings::RequestSettings::PartUploadSettings::PartUploadSettings(
     : PartUploadSettings(settings)
 {
     String key = config_prefix + "." + setting_name_prefix;
+    strict_upload_part_size = config.getUInt64(key + "strict_upload_part_size", strict_upload_part_size);
     min_upload_part_size = config.getUInt64(key + "min_upload_part_size", min_upload_part_size);
     max_upload_part_size = config.getUInt64(key + "max_upload_part_size", max_upload_part_size);
     upload_part_size_multiply_factor = config.getUInt64(key + "upload_part_size_multiply_factor", upload_part_size_multiply_factor);
     upload_part_size_multiply_parts_count_threshold = config.getUInt64(key + "upload_part_size_multiply_parts_count_threshold", upload_part_size_multiply_parts_count_threshold);
+    max_inflight_parts_for_one_file = config.getUInt64(key + "max_inflight_parts_for_one_file", max_inflight_parts_for_one_file);
     max_part_number = config.getUInt64(key + "max_part_number", max_part_number);
     max_single_part_upload_size = config.getUInt64(key + "max_single_part_upload_size", max_single_part_upload_size);
     max_single_operation_copy_size = config.getUInt64(key + "max_single_operation_copy_size", max_single_operation_copy_size);
@@ -49,10 +51,12 @@ S3Settings::RequestSettings::PartUploadSettings::PartUploadSettings(
 
 S3Settings::RequestSettings::PartUploadSettings::PartUploadSettings(const NamedCollection & collection)
 {
+    strict_upload_part_size = collection.getOrDefault<UInt64>("strict_upload_part_size", strict_upload_part_size);
     min_upload_part_size = collection.getOrDefault<UInt64>("min_upload_part_size", min_upload_part_size);
+    max_single_part_upload_size = collection.getOrDefault<UInt64>("max_single_part_upload_size", max_single_part_upload_size);
     upload_part_size_multiply_factor = collection.getOrDefault<UInt64>("upload_part_size_multiply_factor", upload_part_size_multiply_factor);
     upload_part_size_multiply_parts_count_threshold = collection.getOrDefault<UInt64>("upload_part_size_multiply_parts_count_threshold", upload_part_size_multiply_parts_count_threshold);
-    max_single_part_upload_size = collection.getOrDefault<UInt64>("max_single_part_upload_size", max_single_part_upload_size);
+    max_inflight_parts_for_one_file = collection.getOrDefault<UInt64>("max_inflight_parts_for_one_file", max_inflight_parts_for_one_file);
 
     /// This configuration is only applicable to s3. Other types of object storage are not applicable or have different meanings.
     storage_class_name = collection.getOrDefault<String>("s3_storage_class", storage_class_name);
@@ -63,6 +67,9 @@ S3Settings::RequestSettings::PartUploadSettings::PartUploadSettings(const NamedC
 
 void S3Settings::RequestSettings::PartUploadSettings::updateFromSettingsImpl(const Settings & settings, bool if_changed)
 {
+    if (!if_changed || settings.s3_strict_upload_part_size.changed)
+        strict_upload_part_size = settings.s3_strict_upload_part_size;
+
     if (!if_changed || settings.s3_min_upload_part_size.changed)
         min_upload_part_size = settings.s3_min_upload_part_size;
 
@@ -75,6 +82,9 @@ void S3Settings::RequestSettings::PartUploadSettings::updateFromSettingsImpl(con
     if (!if_changed || settings.s3_upload_part_size_multiply_parts_count_threshold.changed)
         upload_part_size_multiply_parts_count_threshold = settings.s3_upload_part_size_multiply_parts_count_threshold;
 
+    if (!if_changed || settings.s3_max_inflight_parts_for_one_file.changed)
+        max_inflight_parts_for_one_file = settings.s3_max_inflight_parts_for_one_file;
+
     if (!if_changed || settings.s3_max_single_part_upload_size.changed)
         max_single_part_upload_size = settings.s3_max_single_part_upload_size;
 }
@@ -82,6 +92,12 @@ void S3Settings::RequestSettings::PartUploadSettings::updateFromSettingsImpl(con
 void S3Settings::RequestSettings::PartUploadSettings::validate()
 {
     static constexpr size_t min_upload_part_size_limit = 5 * 1024 * 1024;
+    if (strict_upload_part_size && strict_upload_part_size < min_upload_part_size_limit)
+        throw Exception(
+            ErrorCodes::INVALID_SETTING_VALUE,
+            "Setting strict_upload_part_size has invalid value {} which is less than the s3 API limit {}",
+            ReadableSize(strict_upload_part_size), ReadableSize(min_upload_part_size_limit));
+
     if (min_upload_part_size < min_upload_part_size_limit)
         throw Exception(
             ErrorCodes::INVALID_SETTING_VALUE,
@@ -182,6 +198,8 @@ S3Settings::RequestSettings::RequestSettings(
     check_objects_after_upload = config.getBool(key + "check_objects_after_upload", settings.s3_check_objects_after_upload);
     list_object_keys_size = config.getUInt64(key + "list_object_keys_size", settings.s3_list_object_keys_size);
     throw_on_zero_files_match = config.getBool(key + "throw_on_zero_files_match", settings.s3_throw_on_zero_files_match);
+    retry_attempts = config.getUInt64(key + "retry_attempts", settings.s3_retry_attempts);
+    request_timeout_ms = config.getUInt64(key + "request_timeout_ms", request_timeout_ms);
 
     /// NOTE: it would be better to reuse old throttlers to avoid losing token bucket state on every config reload,
     /// which could lead to exceeding limit for short time. But it is good enough unless very high `burst` values are used.
@@ -232,8 +250,11 @@ void S3Settings::RequestSettings::updateFromSettingsImpl(const Settings & settin
         put_request_throttler = std::make_shared<Throttler>(
             settings.s3_max_put_rps, settings.s3_max_put_burst ? settings.s3_max_put_burst : Throttler::default_burst_seconds * settings.s3_max_put_rps);
 
-    if (!if_changed || settings.s3_throw_on_zero_files_match)
+    if (!if_changed || settings.s3_throw_on_zero_files_match.changed)
         throw_on_zero_files_match = settings.s3_throw_on_zero_files_match;
+
+    if (!if_changed || settings.s3_retry_attempts.changed)
+        retry_attempts = settings.s3_retry_attempts;
 }
 
 void S3Settings::RequestSettings::updateFromSettings(const Settings & settings)
diff --git a/src/Storages/StorageS3Settings.h b/src/Storages/StorageS3Settings.h
index 49cb481626d..41489927e7f 100644
--- a/src/Storages/StorageS3Settings.h
+++ b/src/Storages/StorageS3Settings.h
@@ -28,10 +28,12 @@ struct S3Settings
     {
         struct PartUploadSettings
         {
+            size_t strict_upload_part_size = 0;
             size_t min_upload_part_size = 16 * 1024 * 1024;
             size_t max_upload_part_size = 5ULL * 1024 * 1024 * 1024;
             size_t upload_part_size_multiply_factor = 2;
             size_t upload_part_size_multiply_parts_count_threshold = 500;
+            size_t max_inflight_parts_for_one_file = 20;
             size_t max_part_number = 10000;
             size_t max_single_part_upload_size = 32 * 1024 * 1024;
             size_t max_single_operation_copy_size = 5ULL * 1024 * 1024 * 1024;
@@ -66,6 +68,8 @@ struct S3Settings
         size_t list_object_keys_size = 1000;
         ThrottlerPtr get_request_throttler;
         ThrottlerPtr put_request_throttler;
+        size_t retry_attempts = 10;
+        size_t request_timeout_ms = 30000;
 
         bool throw_on_zero_files_match = false;
 
diff --git a/src/Storages/StorageSQLite.cpp b/src/Storages/StorageSQLite.cpp
index 706bc31122c..bd445217979 100644
--- a/src/Storages/StorageSQLite.cpp
+++ b/src/Storages/StorageSQLite.cpp
@@ -4,6 +4,7 @@
 #include <Common/logger_useful.h>
 #include <Processors/Sources/SQLiteSource.h>
 #include <Databases/SQLite/SQLiteUtils.h>
+#include <Databases/SQLite/fetchSQLiteTableStructure.h>
 #include <DataTypes/DataTypeString.h>
 #include <Formats/FormatFactory.h>
 #include <Processors/Formats/IOutputFormat.h>
@@ -44,12 +45,33 @@ StorageSQLite::StorageSQLite(
     , log(&Poco::Logger::get("StorageSQLite (" + table_id_.table_name + ")"))
 {
     StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(columns_);
+
+    if (columns_.empty())
+    {
+        auto columns = getTableStructureFromData(sqlite_db, remote_table_name);
+        storage_metadata.setColumns(columns);
+    }
+    else
+        storage_metadata.setColumns(columns_);
+
     storage_metadata.setConstraints(constraints_);
     setInMemoryMetadata(storage_metadata);
 }
 
 
+ColumnsDescription StorageSQLite::getTableStructureFromData(
+    const SQLitePtr & sqlite_db_,
+    const String & table)
+{
+    auto columns = fetchSQLiteTableStructure(sqlite_db_.get(), table);
+
+    if (!columns)
+        throw Exception(ErrorCodes::SQLITE_ENGINE_ERROR, "Failed to fetch table structure for {}", table);
+
+    return ColumnsDescription{*columns};
+}
+
+
 Pipe StorageSQLite::read(
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
@@ -66,6 +88,7 @@ Pipe StorageSQLite::read(
 
     String query = transformQueryForExternalDatabase(
         query_info,
+        column_names,
         storage_snapshot->metadata->getColumns().getOrdinary(),
         IdentifierQuotingStyle::DoubleQuotes,
         "",
@@ -175,6 +198,7 @@ void registerStorageSQLite(StorageFactory & factory)
                                      table_name, args.columns, args.constraints, args.getContext());
     },
     {
+        .supports_schema_inference = true,
         .source_access_type = AccessType::SQLITE,
     });
 }
diff --git a/src/Storages/StorageSQLite.h b/src/Storages/StorageSQLite.h
index a021c00f627..323c29ac8bb 100644
--- a/src/Storages/StorageSQLite.h
+++ b/src/Storages/StorageSQLite.h
@@ -42,6 +42,10 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
+    static ColumnsDescription getTableStructureFromData(
+        const SQLitePtr & sqlite_db_,
+        const String & table);
+
 private:
     String remote_table_name;
     String database_path;
diff --git a/src/Storages/StorageSet.cpp b/src/Storages/StorageSet.cpp
index 7c5ba497ec9..00b5dbfc5e3 100644
--- a/src/Storages/StorageSet.cpp
+++ b/src/Storages/StorageSet.cpp
@@ -9,6 +9,9 @@
 #include <Disks/IDisk.h>
 #include <Common/formatReadable.h>
 #include <Common/StringUtils/StringUtils.h>
+#include <Interpreters/Context.h>
+#include <IO/ReadBufferFromFileBase.h>
+#include <Common/logger_useful.h>
 #include <Interpreters/Set.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Parsers/ASTCreateQuery.h>
diff --git a/src/Storages/StorageSet.h b/src/Storages/StorageSet.h
index 23932658b77..ccd1eb9912b 100644
--- a/src/Storages/StorageSet.h
+++ b/src/Storages/StorageSet.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Interpreters/Context.h>
+#include <Interpreters/Context_fwd.h>
 #include <Storages/IStorage.h>
 #include <Storages/SetSettings.h>
 
@@ -8,6 +8,9 @@
 namespace DB
 {
 
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+
 class Set;
 using SetPtr = std::shared_ptr<Set>;
 
diff --git a/src/Storages/StorageSnapshot.h b/src/Storages/StorageSnapshot.h
index 723b30e49e6..946e8a98cf2 100644
--- a/src/Storages/StorageSnapshot.h
+++ b/src/Storages/StorageSnapshot.h
@@ -30,27 +30,32 @@ struct StorageSnapshot
 
     StorageSnapshot(
         const IStorage & storage_,
-        const StorageMetadataPtr & metadata_)
-        : storage(storage_), metadata(metadata_)
+        StorageMetadataPtr metadata_)
+        : storage(storage_), metadata(std::move(metadata_))
     {
         init();
     }
 
     StorageSnapshot(
         const IStorage & storage_,
-        const StorageMetadataPtr & metadata_,
-        const ColumnsDescription & object_columns_)
-        : storage(storage_), metadata(metadata_), object_columns(object_columns_)
+        StorageMetadataPtr metadata_,
+        ColumnsDescription object_columns_)
+        : storage(storage_)
+        , metadata(std::move(metadata_))
+        , object_columns(std::move(object_columns_))
     {
         init();
     }
 
     StorageSnapshot(
         const IStorage & storage_,
-        const StorageMetadataPtr & metadata_,
-        const ColumnsDescription & object_columns_,
+        StorageMetadataPtr metadata_,
+        ColumnsDescription object_columns_,
         DataPtr data_)
-        : storage(storage_), metadata(metadata_), object_columns(object_columns_), data(std::move(data_))
+        : storage(storage_)
+        , metadata(std::move(metadata_))
+        , object_columns(std::move(object_columns_))
+        , data(std::move(data_))
     {
         init();
     }
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index 870f6b96ae6..b2e7c202800 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -31,7 +31,9 @@
 
 #include <Backups/BackupEntriesCollector.h>
 #include <Backups/BackupEntryFromAppendOnlyFile.h>
+#include <Backups/BackupEntryFromMemory.h>
 #include <Backups/BackupEntryFromSmallFile.h>
+#include <Backups/BackupEntryWrappedWith.h>
 #include <Backups/IBackup.h>
 #include <Backups/RestorerFromBackup.h>
 #include <Disks/TemporaryFileOnDisk.h>
@@ -528,6 +530,7 @@ std::optional<UInt64> StorageStripeLog::totalBytes(const Settings &) const
 void StorageStripeLog::backupData(BackupEntriesCollector & backup_entries_collector, const String & data_path_in_backup, const std::optional<ASTs> & /* partitions */)
 {
     auto lock_timeout = getLockTimeout(backup_entries_collector.getContext());
+
     loadIndices(lock_timeout);
 
     ReadLock lock{rwlock, lock_timeout};
@@ -542,16 +545,18 @@ void StorageStripeLog::backupData(BackupEntriesCollector & backup_entries_collec
     fs::path temp_dir = temp_dir_owner->getPath();
     disk->createDirectories(temp_dir);
 
+    bool copy_encrypted = !backup_entries_collector.getBackupSettings().decrypt_files_from_encrypted_disks;
+
     /// data.bin
     {
         /// We make a copy of the data file because it can be changed later in write() or in truncate().
         String data_file_name = fileName(data_file_path);
         String hardlink_file_path = temp_dir / data_file_name;
         disk->createHardLink(data_file_path, hardlink_file_path);
-        backup_entries_collector.addBackupEntry(
-            data_path_in_backup_fs / data_file_name,
-            std::make_unique<BackupEntryFromAppendOnlyFile>(
-                disk, hardlink_file_path, file_checker.getFileSize(data_file_path), std::nullopt, temp_dir_owner));
+        BackupEntryPtr backup_entry = std::make_unique<BackupEntryFromAppendOnlyFile>(
+            disk, hardlink_file_path, copy_encrypted, file_checker.getFileSize(data_file_path));
+        backup_entry = wrapBackupEntryWith(std::move(backup_entry), temp_dir_owner);
+        backup_entries_collector.addBackupEntry(data_path_in_backup_fs / data_file_name, std::move(backup_entry));
     }
 
     /// index.mrk
@@ -560,16 +565,16 @@ void StorageStripeLog::backupData(BackupEntriesCollector & backup_entries_collec
         String index_file_name = fileName(index_file_path);
         String hardlink_file_path = temp_dir / index_file_name;
         disk->createHardLink(index_file_path, hardlink_file_path);
-        backup_entries_collector.addBackupEntry(
-            data_path_in_backup_fs / index_file_name,
-            std::make_unique<BackupEntryFromAppendOnlyFile>(
-                disk, hardlink_file_path, file_checker.getFileSize(index_file_path), std::nullopt, temp_dir_owner));
+        BackupEntryPtr backup_entry = std::make_unique<BackupEntryFromAppendOnlyFile>(
+            disk, hardlink_file_path, copy_encrypted, file_checker.getFileSize(index_file_path));
+        backup_entry = wrapBackupEntryWith(std::move(backup_entry), temp_dir_owner);
+        backup_entries_collector.addBackupEntry(data_path_in_backup_fs / index_file_name, std::move(backup_entry));
     }
 
     /// sizes.json
     String files_info_path = file_checker.getPath();
     backup_entries_collector.addBackupEntry(
-        data_path_in_backup_fs / fileName(files_info_path), std::make_unique<BackupEntryFromSmallFile>(disk, files_info_path));
+        data_path_in_backup_fs / fileName(files_info_path), std::make_unique<BackupEntryFromSmallFile>(disk, files_info_path, copy_encrypted));
 
     /// columns.txt
     backup_entries_collector.addBackupEntry(
@@ -622,11 +627,7 @@ void StorageStripeLog::restoreDataImpl(const BackupPtr & backup, const String &
             if (!backup->fileExists(file_path_in_backup))
                 throw Exception(ErrorCodes::CANNOT_RESTORE_TABLE, "File {} in backup is required to restore table", file_path_in_backup);
 
-            auto backup_entry = backup->readFile(file_path_in_backup);
-            auto in = backup_entry->getReadBuffer();
-            auto out = disk->writeFile(data_file_path, max_compress_block_size, WriteMode::Append);
-            copyData(*in, *out);
-            out->finalize();
+            backup->copyFileToDisk(file_path_in_backup, disk, data_file_path, WriteMode::Append);
         }
 
         /// Append the index.
@@ -636,8 +637,7 @@ void StorageStripeLog::restoreDataImpl(const BackupPtr & backup, const String &
             if (!backup->fileExists(index_path_in_backup))
                 throw Exception(ErrorCodes::CANNOT_RESTORE_TABLE, "File {} in backup is required to restore table", index_path_in_backup);
 
-            auto backup_entry = backup->readFile(index_path_in_backup);
-            auto index_in = backup_entry->getReadBuffer();
+            auto index_in = backup->readFile(index_path_in_backup);
             CompressedReadBuffer index_compressed_in{*index_in};
             extra_indices.read(index_compressed_in);
 
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 152dda8f360..da8f6a151b2 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -3,6 +3,7 @@
 #include <Storages/PartitionedSink.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/NamedCollectionsHelpers.h>
+#include <Storages/ReadFromStorageProgress.h>
 
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
@@ -13,10 +14,10 @@
 #include <Parsers/ASTIdentifier.h>
 
 #include <IO/ConnectionTimeouts.h>
-#include <IO/IOThreadPool.h>
 #include <IO/ParallelReadBuffer.h>
 #include <IO/WriteBufferFromHTTP.h>
 #include <IO/WriteHelpers.h>
+#include <IO/WithFileSize.h>
 
 #include <Formats/FormatFactory.h>
 #include <Formats/ReadSchemaUtils.h>
@@ -30,12 +31,14 @@
 #include <Common/NamedCollections/NamedCollections.h>
 #include <IO/HTTPCommon.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
+#include <IO/HTTPHeaderEntries.h>
 
 #include <algorithm>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Common/logger_useful.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <regex>
+#include <DataTypes/DataTypeString.h>
 
 
 namespace DB
@@ -49,8 +52,8 @@ namespace ErrorCodes
 }
 
 static constexpr auto bad_arguments_error_message = "Storage URL requires 1-4 arguments: "
-    "url, name of used format (taken from file extension by default), "
-    "optional compression method, optional headers (specified as `headers('name'='value', 'name2'='value2')`)";
+                                                    "url, name of used format (taken from file extension by default), "
+                                                    "optional compression method, optional headers (specified as `headers('name'='value', 'name2'='value2')`)";
 
 static const std::unordered_set<std::string_view> required_configuration_keys = {
     "url",
@@ -98,7 +101,8 @@ IStorageURLBase::IStorageURLBase(
     const String & compression_method_,
     const HTTPHeaderEntries & headers_,
     const String & http_method_,
-    ASTPtr partition_by_)
+    ASTPtr partition_by_,
+    bool distributed_processing_)
     : IStorage(table_id_)
     , uri(uri_)
     , compression_method(chooseCompressionMethod(Poco::URI(uri_).getPath(), compression_method_))
@@ -107,6 +111,7 @@ IStorageURLBase::IStorageURLBase(
     , headers(headers_)
     , http_method(http_method_)
     , partition_by(partition_by_)
+    , distributed_processing(distributed_processing_)
 {
     FormatFactory::instance().checkFormatName(format_name);
     StorageInMemoryMetadata storage_metadata;
@@ -132,7 +137,7 @@ namespace
         HTTPHeaderEntries headers(headers_.begin(), headers_.end());
 
         // Propagate OpenTelemetry trace context, if any, downstream.
-        const auto &current_trace_context = OpenTelemetry::CurrentContext();
+        const auto & current_trace_context = OpenTelemetry::CurrentContext();
         if (current_trace_context.isTraceEnabled())
         {
             headers.emplace_back("traceparent", current_trace_context.composeTraceparentHeader());
@@ -146,308 +151,268 @@ namespace
         return headers;
     }
 
-
-    class StorageURLSource : public ISource
+    StorageURLSource::FailoverOptions getFailoverOptions(const String & uri, size_t max_addresses)
     {
-        using URIParams = std::vector<std::pair<String, String>>;
+        return parseRemoteDescription(uri, 0, uri.size(), '|', max_addresses);
+    }
+}
 
-    public:
-        struct URIInfo
-        {
-            using FailoverOptions = std::vector<String>;
-            std::vector<FailoverOptions> uri_list_to_read;
-            std::atomic<size_t> next_uri_to_read = 0;
-        };
-        using URIInfoPtr = std::shared_ptr<URIInfo>;
+class StorageURLSource::DisclosedGlobIterator::Impl
+{
+public:
+    Impl(const String & uri, size_t max_addresses)
+    {
+        uris = parseRemoteDescription(uri, 0, uri.size(), ',', max_addresses);
+    }
 
-        static void setCredentials(Poco::Net::HTTPBasicCredentials & credentials, const Poco::URI & request_uri)
-        {
-            const auto & user_info = request_uri.getUserInfo();
-            if (!user_info.empty())
-            {
-                std::size_t n = user_info.find(':');
-                if (n != std::string::npos)
-                {
-                    credentials.setUsername(user_info.substr(0, n));
-                    credentials.setPassword(user_info.substr(n + 1));
-                }
-            }
-        }
-
-        StorageURLSource(
-            URIInfoPtr uri_info_,
-            const std::string & http_method,
-            std::function<void(std::ostream &)> callback,
-            const String & format,
-            const std::optional<FormatSettings> & format_settings,
-            String name_,
-            const Block & sample_block,
-            ContextPtr context,
-            const ColumnsDescription & columns,
-            UInt64 max_block_size,
-            const ConnectionTimeouts & timeouts,
-            CompressionMethod compression_method,
-            size_t download_threads,
-            const HTTPHeaderEntries & headers_ = {},
-            const URIParams & params = {},
-            bool glob_url = false)
-            : ISource(sample_block), name(std::move(name_)), uri_info(uri_info_)
-        {
-            auto headers = getHeaders(headers_);
-
-            /// Lazy initialization. We should not perform requests in constructor, because we need to do it in query pipeline.
-            initialize = [=, this](const URIInfo::FailoverOptions & uri_options)
-            {
-                if (uri_options.empty())
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty url list");
-
-                auto first_option = uri_options.begin();
-                read_buf = getFirstAvailableURLReadBuffer(
-                    first_option,
-                    uri_options.end(),
-                    context,
-                    params,
-                    http_method,
-                    callback,
-                    timeouts,
-                    compression_method,
-                    credentials,
-                    headers,
-                    glob_url,
-                    uri_options.size() == 1,
-                    download_threads);
-
-                auto input_format
-                    = FormatFactory::instance().getInput(format, *read_buf, sample_block, context, max_block_size, format_settings);
-                QueryPipelineBuilder builder;
-                builder.init(Pipe(input_format));
-
-                builder.addSimpleTransform(
-                    [&](const Block & cur_header)
-                    { return std::make_shared<AddingDefaultsTransform>(cur_header, columns, *input_format, context); });
-
-                pipeline = std::make_unique<QueryPipeline>(QueryPipelineBuilder::getPipeline(std::move(builder)));
-                reader = std::make_unique<PullingPipelineExecutor>(*pipeline);
-            };
-        }
-
-        String getName() const override { return name; }
-
-        Chunk generate() override
-        {
-            while (true)
-            {
-                if (isCancelled())
-                {
-                    if (reader)
-                        reader->cancel();
-                    break;
-                }
-
-                if (!reader)
-                {
-                    auto current_uri_pos = uri_info->next_uri_to_read.fetch_add(1);
-                    if (current_uri_pos >= uri_info->uri_list_to_read.size())
-                        return {};
-
-                    auto current_uri = uri_info->uri_list_to_read[current_uri_pos];
-
-                    initialize(current_uri);
-                }
-
-                Chunk chunk;
-                if (reader->pull(chunk))
-                    return chunk;
-
-                pipeline->reset();
-                reader.reset();
-            }
+    String next()
+    {
+        size_t current_index = index.fetch_add(1, std::memory_order_relaxed);
+        if (current_index >= uris.size())
             return {};
+
+        return uris[current_index];
+    }
+
+    size_t size()
+    {
+        return uris.size();
+    }
+
+private:
+    Strings uris;
+    std::atomic_size_t index = 0;
+};
+
+StorageURLSource::DisclosedGlobIterator::DisclosedGlobIterator(const String & uri, size_t max_addresses)
+    : pimpl(std::make_shared<StorageURLSource::DisclosedGlobIterator::Impl>(uri, max_addresses)) {}
+
+String StorageURLSource::DisclosedGlobIterator::next()
+{
+    return pimpl->next();
+}
+
+size_t StorageURLSource::DisclosedGlobIterator::size()
+{
+    return pimpl->size();
+}
+
+void StorageURLSource::setCredentials(Poco::Net::HTTPBasicCredentials & credentials, const Poco::URI & request_uri)
+{
+    const auto & user_info = request_uri.getUserInfo();
+    if (!user_info.empty())
+    {
+        std::size_t n = user_info.find(':');
+        if (n != std::string::npos)
+        {
+            credentials.setUsername(user_info.substr(0, n));
+            credentials.setPassword(user_info.substr(n + 1));
+        }
+    }
+}
+
+Block StorageURLSource::getHeader(Block sample_block, const std::vector<NameAndTypePair> & requested_virtual_columns)
+{
+    for (const auto & virtual_column : requested_virtual_columns)
+        sample_block.insert({virtual_column.type->createColumn(), virtual_column.type, virtual_column.name});
+
+    return sample_block;
+}
+
+StorageURLSource::StorageURLSource(
+    const std::vector<NameAndTypePair> & requested_virtual_columns_,
+    std::shared_ptr<IteratorWrapper> uri_iterator_,
+    const std::string & http_method,
+    std::function<void(std::ostream &)> callback,
+    const String & format,
+    const std::optional<FormatSettings> & format_settings,
+    String name_,
+    const Block & sample_block,
+    ContextPtr context,
+    const ColumnsDescription & columns,
+    UInt64 max_block_size,
+    const ConnectionTimeouts & timeouts,
+    CompressionMethod compression_method,
+    size_t download_threads,
+    const HTTPHeaderEntries & headers_,
+    const URIParams & params,
+    bool glob_url)
+    : ISource(getHeader(sample_block, requested_virtual_columns_)), name(std::move(name_)), requested_virtual_columns(requested_virtual_columns_), uri_iterator(uri_iterator_)
+{
+    auto headers = getHeaders(headers_);
+
+    /// Lazy initialization. We should not perform requests in constructor, because we need to do it in query pipeline.
+    initialize = [=, this](const FailoverOptions & uri_options)
+    {
+        if (uri_options.empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty url list");
+
+        auto first_option = uri_options.begin();
+        auto [actual_uri, buf_factory] = getFirstAvailableURIAndReadBuffer(
+            first_option,
+            uri_options.end(),
+            context,
+            params,
+            http_method,
+            callback,
+            timeouts,
+            credentials,
+            headers,
+            glob_url,
+            uri_options.size() == 1);
+
+        curr_uri = actual_uri;
+
+        try
+        {
+            total_size += buf_factory->getFileSize();
+        }
+        catch (...)
+        {
+            // we simply continue without total_size
         }
 
-        static std::unique_ptr<ReadBuffer> getFirstAvailableURLReadBuffer(
-            std::vector<String>::const_iterator & option,
-            const std::vector<String>::const_iterator & end,
-            ContextPtr context,
-            const URIParams & params,
-            const String & http_method,
-            std::function<void(std::ostream &)> callback,
-            const ConnectionTimeouts & timeouts,
-            CompressionMethod compression_method,
-            Poco::Net::HTTPBasicCredentials & credentials,
-            const HTTPHeaderEntries & headers,
-            bool glob_url,
-            bool delay_initialization,
-            size_t download_threads)
+        // TODO: Pass max_parsing_threads and max_download_threads adjusted for num_streams.
+        auto input_format = FormatFactory::instance().getInputRandomAccess(
+            format,
+            std::move(buf_factory),
+            sample_block,
+            context,
+            max_block_size,
+            /* is_remote_fs */ true,
+            compression_method,
+            format_settings,
+            download_threads);
+
+        QueryPipelineBuilder builder;
+        builder.init(Pipe(input_format));
+
+        builder.addSimpleTransform([&](const Block & cur_header)
+                                   { return std::make_shared<AddingDefaultsTransform>(cur_header, columns, *input_format, context); });
+
+        pipeline = std::make_unique<QueryPipeline>(QueryPipelineBuilder::getPipeline(std::move(builder)));
+        reader = std::make_unique<PullingPipelineExecutor>(*pipeline);
+    };
+}
+
+Chunk StorageURLSource::generate()
+{
+    while (true)
+    {
+        if (isCancelled())
         {
-            String first_exception_message;
-            ReadSettings read_settings = context->getReadSettings();
+            if (reader)
+                reader->cancel();
+            break;
+        }
 
-            size_t options = std::distance(option, end);
-            for (; option != end; ++option)
+        if (!reader)
+        {
+            auto current_uri = (*uri_iterator)();
+            if (current_uri.empty())
+                return {};
+
+            initialize(current_uri);
+        }
+
+        Chunk chunk;
+        if (reader->pull(chunk))
+        {
+            UInt64 num_rows = chunk.getNumRows();
+            if (num_rows && total_size)
+                updateRowsProgressApprox(
+                    *this, chunk, total_size, total_rows_approx_accumulated, total_rows_count_times, total_rows_approx_max);
+
+            const String & path{curr_uri.getPath()};
+
+            for (const auto & virtual_column : requested_virtual_columns)
             {
-                bool skip_url_not_found_error = glob_url && read_settings.http_skip_not_found_url_for_globs && option == std::prev(end);
-                auto request_uri = Poco::URI(*option);
-
-                for (const auto & [param, value] : params)
-                    request_uri.addQueryParameter(param, value);
-
-                setCredentials(credentials, request_uri);
-
-                const auto settings = context->getSettings();
-                int zstd_window_log_max = static_cast<int>(settings.zstd_window_log_max);
-                try
+                if (virtual_column.name == "_path")
                 {
-                    if (download_threads > 1)
-                    {
-                        try
-                        {
-                            ReadWriteBufferFromHTTP buffer(
-                                request_uri,
-                                Poco::Net::HTTPRequest::HTTP_HEAD,
-                                callback,
-                                timeouts,
-                                credentials,
-                                settings.max_http_get_redirects,
-                                settings.max_read_buffer_size,
-                                read_settings,
-                                headers,
-                                ReadWriteBufferFromHTTP::Range{0, std::nullopt},
-                                &context->getRemoteHostFilter(),
-                                true,
-                                /* use_external_buffer */ false,
-                                /* skip_url_not_found_error */ skip_url_not_found_error);
-
-                            Poco::Net::HTTPResponse res;
-
-                            for (size_t i = 0; i < settings.http_max_tries; ++i)
-                            {
-                                try
-                                {
-                                    buffer.callWithRedirects(res, Poco::Net::HTTPRequest::HTTP_HEAD, true);
-                                    break;
-                                }
-                                catch (const Poco::Exception & e)
-                                {
-                                    LOG_TRACE(
-                                        &Poco::Logger::get("StorageURLSource"),
-                                        "HTTP HEAD request to `{}` failed at try {}/{}. "
-                                        "Error: {}.",
-                                        request_uri.toString(),
-                                        i + 1,
-                                        settings.http_max_tries,
-                                        e.displayText());
-                                    if (!ReadWriteBufferFromHTTP::isRetriableError(res.getStatus()))
-                                    {
-                                        throw;
-                                    }
-                                }
-                            }
-
-                            // to check if Range header is supported, we need to send a request with it set
-                            const bool supports_ranges = (res.has("Accept-Ranges") && res.get("Accept-Ranges") == "bytes")
-                                || (res.has("Content-Range") && res.get("Content-Range").starts_with("bytes"));
-
-                            if (supports_ranges)
-                                LOG_TRACE(&Poco::Logger::get("StorageURLSource"), "HTTP Range is supported");
-                            else
-                                LOG_TRACE(&Poco::Logger::get("StorageURLSource"), "HTTP Range is not supported");
-
-
-                            if (supports_ranges && res.getStatus() == Poco::Net::HTTPResponse::HTTP_PARTIAL_CONTENT
-                                && res.hasContentLength())
-                            {
-                                LOG_TRACE(
-                                    &Poco::Logger::get("StorageURLSource"),
-                                    "Using ParallelReadBuffer with {} workers with chunks of {} bytes",
-                                    download_threads,
-                                    settings.max_download_buffer_size);
-
-                                auto read_buffer_factory = std::make_unique<RangedReadWriteBufferFromHTTPFactory>(
-                                    res.getContentLength(),
-                                    settings.max_download_buffer_size,
-                                    request_uri,
-                                    http_method,
-                                    callback,
-                                    timeouts,
-                                    credentials,
-                                    settings.max_http_get_redirects,
-                                    settings.max_read_buffer_size,
-                                    read_settings,
-                                    headers,
-                                    &context->getRemoteHostFilter(),
-                                    delay_initialization,
-                                    /* use_external_buffer */ false,
-                                    /* skip_url_not_found_error */ skip_url_not_found_error);
-
-                                return wrapReadBufferWithCompressionMethod(
-                                    std::make_unique<ParallelReadBuffer>(
-                                        std::move(read_buffer_factory),
-                                        threadPoolCallbackRunner<void>(IOThreadPool::get(), "URLParallelRead"),
-                                        download_threads),
-                                    compression_method,
-                                    zstd_window_log_max);
-                            }
-                        }
-                        catch (const Poco::Exception & e)
-                        {
-                            LOG_TRACE(
-                                &Poco::Logger::get("StorageURLSource"),
-                                "Failed to setup ParallelReadBuffer because of an exception:\n{}.\nFalling back to the single-threaded "
-                                "buffer",
-                                e.displayText());
-                        }
-                    }
-
-                    LOG_TRACE(&Poco::Logger::get("StorageURLSource"), "Using single-threaded read buffer");
-
-                    return wrapReadBufferWithCompressionMethod(
-                        std::make_unique<ReadWriteBufferFromHTTP>(
-                            request_uri,
-                            http_method,
-                            callback,
-                            timeouts,
-                            credentials,
-                            settings.max_http_get_redirects,
-                            settings.max_read_buffer_size,
-                            read_settings,
-                            headers,
-                            ReadWriteBufferFromHTTP::Range{},
-                            &context->getRemoteHostFilter(),
-                            delay_initialization,
-                            /* use_external_buffer */ false,
-                            /* skip_url_not_found_error */ skip_url_not_found_error),
-                            compression_method,
-                        zstd_window_log_max);
+                    chunk.addColumn(virtual_column.type->createColumnConst(num_rows, path)->convertToFullColumnIfConst());
                 }
-                catch (...)
+                else if (virtual_column.name == "_file")
                 {
-                    if (first_exception_message.empty())
-                        first_exception_message = getCurrentExceptionMessage(false);
-
-                    if (options == 1)
-                        throw;
-
-                    tryLogCurrentException(__PRETTY_FUNCTION__);
+                    size_t last_slash_pos = path.find_last_of('/');
+                    auto column = virtual_column.type->createColumnConst(num_rows, path.substr(last_slash_pos + 1));
+                    chunk.addColumn(column->convertToFullColumnIfConst());
                 }
             }
 
-            throw Exception(ErrorCodes::NETWORK_ERROR, "All uri ({}) options are unreachable: {}", options, first_exception_message);
+            return chunk;
         }
 
-    private:
-        using InitializeFunc = std::function<void(const URIInfo::FailoverOptions &)>;
-        InitializeFunc initialize;
+        pipeline->reset();
+        reader.reset();
+    }
+    return {};
+}
 
-        String name;
-        URIInfoPtr uri_info;
+std::tuple<Poco::URI, SeekableReadBufferFactoryPtr> StorageURLSource::getFirstAvailableURIAndReadBuffer(
+    std::vector<String>::const_iterator & option,
+    const std::vector<String>::const_iterator & end,
+    ContextPtr context,
+    const URIParams & params,
+    const String & http_method,
+    std::function<void(std::ostream &)> callback,
+    const ConnectionTimeouts & timeouts,
+    Poco::Net::HTTPBasicCredentials & credentials,
+    const HTTPHeaderEntries & headers,
+    bool glob_url,
+    bool delay_initialization)
+{
+    String first_exception_message;
+    ReadSettings read_settings = context->getReadSettings();
 
-        std::unique_ptr<ReadBuffer> read_buf;
-        std::unique_ptr<QueryPipeline> pipeline;
-        std::unique_ptr<PullingPipelineExecutor> reader;
+    size_t options = std::distance(option, end);
+    for (; option != end; ++option)
+    {
+        bool skip_url_not_found_error = glob_url && read_settings.http_skip_not_found_url_for_globs && option == std::prev(end);
+        auto request_uri = Poco::URI(*option);
 
-        Poco::Net::HTTPBasicCredentials credentials;
-    };
+        for (const auto & [param, value] : params)
+            request_uri.addQueryParameter(param, value);
+
+        setCredentials(credentials, request_uri);
+
+        const auto settings = context->getSettings();
+        auto res = std::make_unique<RangedReadWriteBufferFromHTTPFactory>(
+            request_uri,
+            http_method,
+            callback,
+            timeouts,
+            credentials,
+            settings.max_http_get_redirects,
+            settings.max_read_buffer_size,
+            read_settings,
+            headers,
+            &context->getRemoteHostFilter(),
+            delay_initialization,
+            /* use_external_buffer */ false,
+            /* skip_url_not_found_error */ skip_url_not_found_error);
+
+        if (options > 1)
+        {
+            // Send a HEAD request to check availability.
+            try
+            {
+                res->getFileInfo();
+            }
+            catch (...)
+            {
+                if (first_exception_message.empty())
+                    first_exception_message = getCurrentExceptionMessage(false);
+
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+
+                continue;
+            }
+        }
+
+        return std::make_tuple(request_uri, std::move(res));
+    }
+
+    throw Exception(ErrorCodes::NETWORK_ERROR, "All uri ({}) options are unreachable: {}", options, first_exception_message);
 }
 
 StorageURLSink::StorageURLSink(
@@ -458,6 +423,7 @@ StorageURLSink::StorageURLSink(
     ContextPtr context,
     const ConnectionTimeouts & timeouts,
     const CompressionMethod compression_method,
+    const HTTPHeaderEntries & headers,
     const String & http_method)
     : SinkToStorage(sample_block)
 {
@@ -465,7 +431,7 @@ StorageURLSink::StorageURLSink(
     std::string content_encoding = toContentEncodingName(compression_method);
 
     write_buf = wrapWriteBufferWithCompressionMethod(
-        std::make_unique<WriteBufferFromHTTP>(Poco::URI(uri), http_method, content_type, content_encoding, timeouts),
+        std::make_unique<WriteBufferFromHTTP>(Poco::URI(uri), http_method, content_type, content_encoding, headers, timeouts),
         compression_method,
         3);
     writer = FormatFactory::instance().getOutputFormat(format, *write_buf, sample_block, context, format_settings);
@@ -530,6 +496,7 @@ public:
         ContextPtr context_,
         const ConnectionTimeouts & timeouts_,
         const CompressionMethod compression_method_,
+        const HTTPHeaderEntries & headers_,
         const String & http_method_)
         : PartitionedSink(partition_by, context_, sample_block_)
         , uri(uri_)
@@ -539,6 +506,7 @@ public:
         , context(context_)
         , timeouts(timeouts_)
         , compression_method(compression_method_)
+        , headers(headers_)
         , http_method(http_method_)
     {
     }
@@ -548,7 +516,7 @@ public:
         auto partition_path = PartitionedSink::replaceWildcards(uri, partition_id);
         context->getRemoteHostFilter().checkURL(Poco::URI(partition_path));
         return std::make_shared<StorageURLSink>(
-            partition_path, format, format_settings, sample_block, context, timeouts, compression_method, http_method);
+            partition_path, format, format_settings, sample_block, context, timeouts, compression_method, headers, http_method);
     }
 
 private:
@@ -560,6 +528,7 @@ private:
     const ConnectionTimeouts timeouts;
 
     const CompressionMethod compression_method;
+    const HTTPHeaderEntries headers;
     const String http_method;
 };
 
@@ -607,10 +576,10 @@ ColumnsDescription IStorageURLBase::getTableStructureFromData(
     if (urlWithGlobs(uri))
     {
         size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
-        auto uri_descriptions = parseRemoteDescription(uri, 0, uri.size(), ',', max_addresses);
+        auto uri_descriptions = parseRemoteDescription(uri, 0, uri.size(), ',', max_addresses, "url");
         for (const auto & description : uri_descriptions)
         {
-            auto options = parseRemoteDescription(description, 0, description.size(), '|', max_addresses);
+            auto options = parseRemoteDescription(description, 0, description.size(), '|', max_addresses, "url");
             urls_to_check.insert(urls_to_check.end(), options.begin(), options.end());
         }
     }
@@ -628,7 +597,7 @@ ColumnsDescription IStorageURLBase::getTableStructureFromData(
         if (it == urls_to_check.cend())
             return nullptr;
 
-        auto buf = StorageURLSource::getFirstAvailableURLReadBuffer(
+        auto [_, buf_factory] = StorageURLSource::getFirstAvailableURIAndReadBuffer(
             it,
             urls_to_check.cend(),
             context,
@@ -636,14 +605,15 @@ ColumnsDescription IStorageURLBase::getTableStructureFromData(
             Poco::Net::HTTPRequest::HTTP_GET,
             {},
             getHTTPTimeouts(context),
-            compression_method,
             credentials,
             headers,
             false,
-            false,
-            context->getSettingsRef().max_download_threads);\
+            false);
         ++it;
-        return buf;
+        return wrapReadBufferWithCompressionMethod(
+            buf_factory->getReader(),
+            compression_method,
+            static_cast<int>(context->getSettingsRef().zstd_window_log_max));
     };
 
     ColumnsDescription columns;
@@ -663,6 +633,16 @@ bool IStorageURLBase::supportsSubsetOfColumns() const
     return FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(format_name);
 }
 
+bool IStorageURLBase::prefersLargeBlocks() const
+{
+    return FormatFactory::instance().checkIfOutputFormatPrefersLargeBlocks(format_name);
+}
+
+bool IStorageURLBase::parallelizeOutputAfterReading(ContextPtr context) const
+{
+    return FormatFactory::instance().checkParallelizeOutputAfterReading(format_name, context);
+}
+
 Pipe IStorageURLBase::read(
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
@@ -687,53 +667,66 @@ Pipe IStorageURLBase::read(
         block_for_format = storage_snapshot->metadata->getSampleBlock();
     }
 
+    std::unordered_set<String> column_names_set(column_names.begin(), column_names.end());
+    std::vector<NameAndTypePair> requested_virtual_columns;
+    for (const auto & virtual_column : getVirtuals())
+    {
+        if (column_names_set.contains(virtual_column.name))
+            requested_virtual_columns.push_back(virtual_column);
+    }
+
     size_t max_download_threads = local_context->getSettingsRef().max_download_threads;
 
-    if (urlWithGlobs(uri))
+    std::shared_ptr<StorageURLSource::IteratorWrapper> iterator_wrapper{nullptr};
+    bool is_url_with_globs = urlWithGlobs(uri);
+    size_t max_addresses = local_context->getSettingsRef().glob_expansion_max_elements;
+    if (distributed_processing)
     {
-        size_t max_addresses = local_context->getSettingsRef().glob_expansion_max_elements;
-        auto uri_descriptions = parseRemoteDescription(uri, 0, uri.size(), ',', max_addresses);
-
-        if (num_streams > uri_descriptions.size())
-            num_streams = uri_descriptions.size();
-
-        /// For each uri (which acts like shard) check if it has failover options
-        auto uri_info = std::make_shared<StorageURLSource::URIInfo>();
-        for (const auto & description : uri_descriptions)
-            uri_info->uri_list_to_read.emplace_back(parseRemoteDescription(description, 0, description.size(), '|', max_addresses));
-
-        Pipes pipes;
-        pipes.reserve(num_streams);
-
-        size_t download_threads = num_streams >= max_download_threads ? 1 : (max_download_threads / num_streams);
-        for (size_t i = 0; i < num_streams; ++i)
+        iterator_wrapper = std::make_shared<StorageURLSource::IteratorWrapper>(
+            [callback = local_context->getReadTaskCallback(), max_addresses]()
+            {
+                String next_uri = callback();
+                if (next_uri.empty())
+                    return StorageURLSource::FailoverOptions{};
+                return getFailoverOptions(next_uri, max_addresses);
+            });
+    }
+    else if (is_url_with_globs)
+    {
+        /// Iterate through disclosed globs and make a source for each file
+        auto glob_iterator = std::make_shared<StorageURLSource::DisclosedGlobIterator>(uri, max_addresses);
+        iterator_wrapper = std::make_shared<StorageURLSource::IteratorWrapper>([glob_iterator, max_addresses]()
         {
-            pipes.emplace_back(std::make_shared<StorageURLSource>(
-                uri_info,
-                getReadMethod(),
-                getReadPOSTDataCallback(column_names, columns_description, query_info, local_context, processed_stage, max_block_size),
-                format_name,
-                format_settings,
-                getName(),
-                block_for_format,
-                local_context,
-                columns_description,
-                max_block_size,
-                getHTTPTimeouts(local_context),
-                compression_method,
-                download_threads,
-                headers,
-                params,
-                /* glob_url */ true));
-        }
-        return Pipe::unitePipes(std::move(pipes));
+            String next_uri = glob_iterator->next();
+            if (next_uri.empty())
+                return StorageURLSource::FailoverOptions{};
+            return getFailoverOptions(next_uri, max_addresses);
+        });
+
+        if (num_streams > glob_iterator->size())
+            num_streams = glob_iterator->size();
     }
     else
     {
-        auto uri_info = std::make_shared<StorageURLSource::URIInfo>();
-        uri_info->uri_list_to_read.emplace_back(std::vector<String>{uri});
-        return Pipe(std::make_shared<StorageURLSource>(
-            uri_info,
+        iterator_wrapper = std::make_shared<StorageURLSource::IteratorWrapper>([&, max_addresses, done = false]() mutable
+        {
+            if (done)
+                return StorageURLSource::FailoverOptions{};
+            done = true;
+            return getFailoverOptions(uri, max_addresses);
+        });
+        num_streams = 1;
+    }
+
+    Pipes pipes;
+    pipes.reserve(num_streams);
+
+    size_t download_threads = num_streams >= max_download_threads ? 1 : (max_download_threads / num_streams);
+    for (size_t i = 0; i < num_streams; ++i)
+    {
+        pipes.emplace_back(std::make_shared<StorageURLSource>(
+            requested_virtual_columns,
+            iterator_wrapper,
             getReadMethod(),
             getReadPOSTDataCallback(column_names, columns_description, query_info, local_context, processed_stage, max_block_size),
             format_name,
@@ -745,10 +738,13 @@ Pipe IStorageURLBase::read(
             max_block_size,
             getHTTPTimeouts(local_context),
             compression_method,
-            max_download_threads,
+            download_threads,
             headers,
-            params));
+            params,
+            is_url_with_globs));
     }
+
+    return Pipe::unitePipes(std::move(pipes));
 }
 
 
@@ -776,11 +772,17 @@ Pipe StorageURLWithFailover::read(
 
     auto params = getReadURIParams(column_names, storage_snapshot, query_info, local_context, processed_stage, max_block_size);
 
-    auto uri_info = std::make_shared<StorageURLSource::URIInfo>();
-    uri_info->uri_list_to_read.emplace_back(uri_options);
+    auto iterator_wrapper = std::make_shared<StorageURLSource::IteratorWrapper>([&, done = false]() mutable
+    {
+        if (done)
+            return StorageURLSource::FailoverOptions{};
+        done = true;
+        return uri_options;
+    });
 
     auto pipe = Pipe(std::make_shared<StorageURLSource>(
-        uri_info,
+        std::vector<NameAndTypePair>{},
+        iterator_wrapper,
         getReadMethod(),
         getReadPOSTDataCallback(column_names, columns_description, query_info, local_context, processed_stage, max_block_size),
         format_name,
@@ -821,6 +823,7 @@ SinkToStoragePtr IStorageURLBase::write(const ASTPtr & query, const StorageMetad
             context,
             getHTTPTimeouts(context),
             compression_method,
+            headers,
             http_method);
     }
     else
@@ -833,10 +836,18 @@ SinkToStoragePtr IStorageURLBase::write(const ASTPtr & query, const StorageMetad
             context,
             getHTTPTimeouts(context),
             compression_method,
+            headers,
             http_method);
     }
 }
 
+NamesAndTypesList IStorageURLBase::getVirtuals() const
+{
+    return NamesAndTypesList{
+        {"_path", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
+        {"_file", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())}};
+}
+
 SchemaCache & IStorageURLBase::getSchemaCache(const ContextPtr & context)
 {
     static SchemaCache schema_cache(context->getConfigRef().getUInt("schema_inference_cache_max_elements_for_url", DEFAULT_SCHEMA_CACHE_ELEMENTS));
@@ -906,7 +917,6 @@ std::optional<time_t> IStorageURLBase::getLastModificationTime(
             settings.max_read_buffer_size,
             context->getReadSettings(),
             headers,
-            ReadWriteBufferFromHTTP::Range{},
             &context->getRemoteHostFilter(),
             true,
             false,
@@ -932,7 +942,8 @@ StorageURL::StorageURL(
     const String & compression_method_,
     const HTTPHeaderEntries & headers_,
     const String & http_method_,
-    ASTPtr partition_by_)
+    ASTPtr partition_by_,
+    bool distributed_processing_)
     : IStorageURLBase(
         uri_,
         context_,
@@ -945,7 +956,8 @@ StorageURL::StorageURL(
         compression_method_,
         headers_,
         http_method_,
-        partition_by_)
+        partition_by_,
+        distributed_processing_)
 {
     context_->getRemoteHostFilter().checkURL(Poco::URI(uri));
 }
@@ -1091,7 +1103,7 @@ StorageURL::Configuration StorageURL::getConfiguration(ASTs & args, ContextPtr l
 {
     StorageURL::Configuration configuration;
 
-    if (auto named_collection = tryGetNamedCollectionWithOverrides(args))
+    if (auto named_collection = tryGetNamedCollectionWithOverrides(args, local_context))
     {
         StorageURL::processNamedCollectionResult(configuration, *named_collection);
         collectHeaders(args, configuration.headers, local_context);
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index acf49f3cb71..d53b72105e4 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -2,13 +2,13 @@
 
 #include <Poco/URI.h>
 #include <Processors/Sinks/SinkToStorage.h>
+#include <Processors/ISource.h>
 #include <Formats/FormatSettings.h>
 #include <IO/CompressionMethod.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/HTTPHeaderEntries.h>
 #include <Storages/IStorage.h>
 #include <Storages/StorageFactory.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/Cache/SchemaCache.h>
 #include <Storages/StorageConfiguration.h>
 
@@ -21,6 +21,7 @@ using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
 
 struct ConnectionTimeouts;
 class NamedCollection;
+class PullingPipelineExecutor;
 
 /**
  * This class represents table engine for external urls.
@@ -44,6 +45,8 @@ public:
 
     bool supportsPartitionBy() const override { return true; }
 
+    NamesAndTypesList getVirtuals() const override;
+
     static ColumnsDescription getTableStructureFromData(
         const String & format,
         const String & uri,
@@ -67,7 +70,8 @@ protected:
         const String & compression_method_,
         const HTTPHeaderEntries & headers_ = {},
         const String & method_ = "",
-        ASTPtr partition_by = nullptr);
+        ASTPtr partition_by = nullptr,
+        bool distributed_processing_ = false);
 
     String uri;
     CompressionMethod compression_method;
@@ -80,6 +84,7 @@ protected:
     HTTPHeaderEntries headers;
     String http_method; /// For insert can choose Put instead of default Post.
     ASTPtr partition_by;
+    bool distributed_processing;
 
     virtual std::string getReadMethod() const;
 
@@ -101,6 +106,10 @@ protected:
 
     bool supportsSubsetOfColumns() const override;
 
+    bool prefersLargeBlocks() const override;
+
+    bool parallelizeOutputAfterReading(ContextPtr context) const override;
+
 private:
     virtual Block getHeaderBlock(const Names & column_names, const StorageSnapshotPtr & storage_snapshot) const = 0;
 
@@ -126,6 +135,87 @@ private:
         const ContextPtr & context);
 };
 
+
+class StorageURLSource : public ISource
+{
+    using URIParams = std::vector<std::pair<String, String>>;
+
+public:
+    class DisclosedGlobIterator
+    {
+    public:
+        DisclosedGlobIterator(const String & uri_, size_t max_addresses);
+        String next();
+        size_t size();
+    private:
+        class Impl;
+        /// shared_ptr to have copy constructor
+        std::shared_ptr<Impl> pimpl;
+    };
+
+    using FailoverOptions = std::vector<String>;
+    using IteratorWrapper = std::function<FailoverOptions()>;
+
+    StorageURLSource(
+        const std::vector<NameAndTypePair> & requested_virtual_columns_,
+        std::shared_ptr<IteratorWrapper> uri_iterator_,
+        const std::string & http_method,
+        std::function<void(std::ostream &)> callback,
+        const String & format,
+        const std::optional<FormatSettings> & format_settings,
+        String name_,
+        const Block & sample_block,
+        ContextPtr context,
+        const ColumnsDescription & columns,
+        UInt64 max_block_size,
+        const ConnectionTimeouts & timeouts,
+        CompressionMethod compression_method,
+        size_t download_threads,
+        const HTTPHeaderEntries & headers_ = {},
+        const URIParams & params = {},
+        bool glob_url = false);
+
+    String getName() const override { return name; }
+
+    Chunk generate() override;
+
+    static void setCredentials(Poco::Net::HTTPBasicCredentials & credentials, const Poco::URI & request_uri);
+
+    static Block getHeader(Block sample_block, const std::vector<NameAndTypePair> & requested_virtual_columns);
+
+    static std::tuple<Poco::URI, SeekableReadBufferFactoryPtr> getFirstAvailableURIAndReadBuffer(
+        std::vector<String>::const_iterator & option,
+        const std::vector<String>::const_iterator & end,
+        ContextPtr context,
+        const URIParams & params,
+        const String & http_method,
+        std::function<void(std::ostream &)> callback,
+        const ConnectionTimeouts & timeouts,
+        Poco::Net::HTTPBasicCredentials & credentials,
+        const HTTPHeaderEntries & headers,
+        bool glob_url,
+        bool delay_initialization);
+
+private:
+    using InitializeFunc = std::function<void(const FailoverOptions &)>;
+    InitializeFunc initialize;
+
+    String name;
+    std::vector<NameAndTypePair> requested_virtual_columns;
+    std::shared_ptr<IteratorWrapper> uri_iterator;
+    Poco::URI curr_uri;
+
+    std::unique_ptr<QueryPipeline> pipeline;
+    std::unique_ptr<PullingPipelineExecutor> reader;
+
+    Poco::Net::HTTPBasicCredentials credentials;
+
+    size_t total_size = 0;
+    UInt64 total_rows_approx_max = 0;
+    size_t total_rows_count_times = 0;
+    UInt64 total_rows_approx_accumulated = 0;
+};
+
 class StorageURLSink : public SinkToStorage
 {
 public:
@@ -137,6 +227,7 @@ public:
         ContextPtr context,
         const ConnectionTimeouts & timeouts,
         CompressionMethod compression_method,
+        const HTTPHeaderEntries & headers = {},
         const String & method = Poco::Net::HTTPRequest::HTTP_POST);
 
     std::string getName() const override { return "StorageURLSink"; }
@@ -168,7 +259,8 @@ public:
         const String & compression_method_,
         const HTTPHeaderEntries & headers_ = {},
         const String & method_ = "",
-        ASTPtr partition_by_ = nullptr);
+        ASTPtr partition_by_ = nullptr,
+        bool distributed_processing_ = false);
 
     String getName() const override
     {
@@ -187,6 +279,7 @@ public:
         std::string url;
         std::string http_method;
         HTTPHeaderEntries headers;
+        std::string addresses_expr;
     };
 
     static Configuration getConfiguration(ASTs & args, ContextPtr context);
@@ -202,14 +295,14 @@ class StorageURLWithFailover final : public StorageURL
 {
 public:
     StorageURLWithFailover(
-            const std::vector<String> & uri_options_,
-            const StorageID & table_id_,
-            const String & format_name_,
-            const std::optional<FormatSettings> & format_settings_,
-            const ColumnsDescription & columns_,
-            const ConstraintsDescription & constraints_,
-            ContextPtr context_,
-            const String & compression_method_);
+        const std::vector<String> & uri_options_,
+        const StorageID & table_id_,
+        const String & format_name_,
+        const std::optional<FormatSettings> & format_settings_,
+        const ColumnsDescription & columns_,
+        const ConstraintsDescription & constraints_,
+        ContextPtr context_,
+        const String & compression_method_);
 
     Pipe read(
         const Names & column_names,
@@ -220,13 +313,6 @@ public:
         size_t max_block_size,
         size_t num_streams) override;
 
-    struct Configuration
-    {
-        String url;
-        String compression_method = "auto";
-        std::vector<std::pair<String, String>> headers;
-    };
-
 private:
     std::vector<String> uri_options;
 };
diff --git a/src/Storages/StorageURLCluster.cpp b/src/Storages/StorageURLCluster.cpp
new file mode 100644
index 00000000000..f652a40a561
--- /dev/null
+++ b/src/Storages/StorageURLCluster.cpp
@@ -0,0 +1,94 @@
+#include "Interpreters/Context_fwd.h"
+
+#include <Storages/StorageURLCluster.h>
+
+#include <Core/QueryProcessingStage.h>
+#include <DataTypes/DataTypeString.h>
+#include <Interpreters/getHeaderForProcessingStage.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/TranslateQualifiedNamesVisitor.h>
+#include <Interpreters/AddDefaultDatabaseVisitor.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
+
+#include <Processors/Transforms/AddingDefaultsTransform.h>
+
+#include <Processors/Sources/RemoteSource.h>
+#include <Parsers/queryToString.h>
+
+#include <Storages/IStorage.h>
+#include <Storages/SelectQueryInfo.h>
+#include <Storages/StorageURL.h>
+#include <Storages/extractTableFunctionArgumentsFromSelectQuery.h>
+
+#include <TableFunctions/TableFunctionURLCluster.h>
+
+#include <memory>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+StorageURLCluster::StorageURLCluster(
+    ContextPtr context_,
+    const String & cluster_name_,
+    const String & uri_,
+    const String & format_,
+    const String & compression_method_,
+    const StorageID & table_id_,
+    const ColumnsDescription & columns_,
+    const ConstraintsDescription & constraints_,
+    const StorageURL::Configuration & configuration_,
+    bool structure_argument_was_provided_)
+    : IStorageCluster(cluster_name_, table_id_, &Poco::Logger::get("StorageURLCluster (" + table_id_.table_name + ")"), structure_argument_was_provided_)
+    , uri(uri_)
+{
+    context_->getRemoteHostFilter().checkURL(Poco::URI(uri));
+
+    StorageInMemoryMetadata storage_metadata;
+
+    if (columns_.empty())
+    {
+        auto columns = StorageURL::getTableStructureFromData(format_,
+            uri,
+            chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method_),
+            configuration_.headers,
+            std::nullopt,
+            context_);
+        storage_metadata.setColumns(columns);
+    }
+    else
+        storage_metadata.setColumns(columns_);
+
+    storage_metadata.setConstraints(constraints_);
+    setInMemoryMetadata(storage_metadata);
+}
+
+void StorageURLCluster::addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context)
+{
+    ASTExpressionList * expression_list = extractTableFunctionArgumentsFromSelectQuery(query);
+    if (!expression_list)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected SELECT query from table function urlCluster, got '{}'", queryToString(query));
+
+    TableFunctionURLCluster::addColumnsStructureToArguments(expression_list->children, structure, context);
+}
+
+RemoteQueryExecutor::Extension StorageURLCluster::getTaskIteratorExtension(ASTPtr, const ContextPtr & context) const
+{
+    auto iterator = std::make_shared<StorageURLSource::DisclosedGlobIterator>(uri, context->getSettingsRef().glob_expansion_max_elements);
+    auto callback = std::make_shared<TaskIterator>([iter = std::move(iterator)]() mutable -> String { return iter->next(); });
+    return RemoteQueryExecutor::Extension{.task_iterator = std::move(callback)};
+}
+
+NamesAndTypesList StorageURLCluster::getVirtuals() const
+{
+    return NamesAndTypesList{
+        {"_path", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
+        {"_file", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())}};
+}
+
+}
diff --git a/src/Storages/StorageURLCluster.h b/src/Storages/StorageURLCluster.h
new file mode 100644
index 00000000000..67771416771
--- /dev/null
+++ b/src/Storages/StorageURLCluster.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "config.h"
+
+#include <memory>
+#include <optional>
+
+#include <Client/Connection.h>
+#include <Interpreters/Cluster.h>
+#include <Storages/IStorageCluster.h>
+#include <Storages/StorageURL.h>
+
+namespace DB
+{
+
+class Context;
+
+class StorageURLCluster : public IStorageCluster
+{
+public:
+    StorageURLCluster(
+        ContextPtr context_,
+        const String & cluster_name_,
+        const String & uri_,
+        const String & format_,
+        const String & compression_method_,
+        const StorageID & table_id_,
+        const ColumnsDescription & columns_,
+        const ConstraintsDescription & constraints_,
+        const StorageURL::Configuration & configuration_,
+        bool structure_argument_was_provided_);
+
+    std::string getName() const override { return "URLCluster"; }
+
+    NamesAndTypesList getVirtuals() const override;
+
+    RemoteQueryExecutor::Extension getTaskIteratorExtension(ASTPtr query, const ContextPtr & context) const override;
+
+private:
+    void addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context) override;
+
+    String uri;
+    String format_name;
+    String compression_method;
+};
+
+
+}
+
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index 1a7050b4dff..470def7e197 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -1,6 +1,7 @@
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
+#include <Interpreters/NormalizeSelectWithUnionQueryVisitor.h>
 #include <Interpreters/Context.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 
@@ -36,6 +37,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+
 namespace
 {
 
@@ -117,8 +119,12 @@ StorageView::StorageView(
     SelectQueryDescription description;
 
     description.inner_query = query.select->ptr();
+
+    NormalizeSelectWithUnionQueryVisitor::Data data{SetOperationMode::Unspecified};
+    NormalizeSelectWithUnionQueryVisitor{data}.visit(description.inner_query);
+
     is_parameterized_view = query.isParameterizedView();
-    parameter_types = analyzeReceiveQueryParamsWithType(description.inner_query);
+    view_parameter_types = analyzeReceiveQueryParamsWithType(description.inner_query);
     storage_metadata.setSelectQuery(description);
     setInMemoryMetadata(storage_metadata);
 }
@@ -167,7 +173,7 @@ void StorageView::read(
     query_plan.addStep(std::move(materializing));
 
     /// And also convert to expected structure.
-    const auto & expected_header = storage_snapshot->getSampleBlockForColumns(column_names,parameter_values);
+    const auto & expected_header = storage_snapshot->getSampleBlockForColumns(column_names, query_info.parameterized_view_values);
     const auto & header = query_plan.getCurrentDataStream().header;
 
     const auto * select_with_union = current_inner_query->as<ASTSelectWithUnionQuery>();
@@ -203,7 +209,7 @@ static ASTTableExpression * getFirstTableExpression(ASTSelectQuery & select_quer
     return select_element->table_expression->as<ASTTableExpression>();
 }
 
-void StorageView::replaceQueryParametersIfParametrizedView(ASTPtr & outer_query)
+void StorageView::replaceQueryParametersIfParametrizedView(ASTPtr & outer_query, const NameToNameMap & parameter_values)
 {
     ReplaceQueryParameterVisitor visitor(parameter_values);
     visitor.visit(outer_query);
@@ -261,7 +267,8 @@ String StorageView::replaceQueryParameterWithValue(const String & column_name, c
         if ((pos = name.find(parameter.first)) != std::string::npos)
         {
             auto parameter_datatype_iterator = parameter_types.find(parameter.first);
-            if (parameter_datatype_iterator != parameter_types.end())
+            size_t parameter_end = pos + parameter.first.size();
+            if (parameter_datatype_iterator != parameter_types.end() && name.size() >= parameter_end && (name[parameter_end] == ',' || name[parameter_end] == ')'))
             {
                 String parameter_name("_CAST(" + parameter.second + ", '" + parameter_datatype_iterator->second + "')");
                 name.replace(pos, parameter.first.size(), parameter_name);
diff --git a/src/Storages/StorageView.h b/src/Storages/StorageView.h
index 6cd4bb171f5..bebecb79ec0 100644
--- a/src/Storages/StorageView.h
+++ b/src/Storages/StorageView.h
@@ -35,7 +35,7 @@ public:
         size_t max_block_size,
         size_t num_streams) override;
 
-    void replaceQueryParametersIfParametrizedView(ASTPtr & outer_query);
+    static void replaceQueryParametersIfParametrizedView(ASTPtr & outer_query, const NameToNameMap & parameter_values);
 
     static void replaceWithSubquery(ASTSelectQuery & select_query, ASTPtr & view_name, const StorageMetadataPtr & metadata_snapshot, const bool parameterized_view)
     {
@@ -47,20 +47,14 @@ public:
     static String replaceQueryParameterWithValue (const String & column_name, const NameToNameMap & parameter_values, const NameToNameMap & parameter_types);
     static String replaceValueWithQueryParameter (const String & column_name, const NameToNameMap & parameter_values);
 
-    void setParameterValues (NameToNameMap parameter_values_)
+    const NameToNameMap & getParameterTypes() const
     {
-        parameter_values = parameter_values_;
-    }
-
-    NameToNameMap getParameterValues() const
-    {
-        return parameter_types;
+        return view_parameter_types;
     }
 
 protected:
     bool is_parameterized_view;
-    NameToNameMap parameter_values;
-    NameToNameMap parameter_types;
+    NameToNameMap view_parameter_types;
 };
 
 }
diff --git a/src/Storages/StorageXDBC.cpp b/src/Storages/StorageXDBC.cpp
index cb5532e91ac..9b3e203e337 100644
--- a/src/Storages/StorageXDBC.cpp
+++ b/src/Storages/StorageXDBC.cpp
@@ -74,7 +74,9 @@ std::function<void(std::ostream &)> StorageXDBC::getReadPOSTDataCallback(
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/) const
 {
-    String query = transformQueryForExternalDatabase(query_info,
+    String query = transformQueryForExternalDatabase(
+        query_info,
+        column_names,
         columns_description.getOrdinary(),
         bridge_helper->getIdentifierQuotingStyle(),
         remote_database_name,
diff --git a/src/Storages/System/StorageSystemBackups.cpp b/src/Storages/System/StorageSystemBackups.cpp
index 1f448bcbdbc..8e968f8f7c0 100644
--- a/src/Storages/System/StorageSystemBackups.cpp
+++ b/src/Storages/System/StorageSystemBackups.cpp
@@ -1,5 +1,6 @@
 #include <Storages/System/StorageSystemBackups.h>
 #include <Backups/BackupsWorker.h>
+#include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/Storages/System/StorageSystemCertificates.cpp b/src/Storages/System/StorageSystemCertificates.cpp
index c4d262f2f44..e1767e4c03a 100644
--- a/src/Storages/System/StorageSystemCertificates.cpp
+++ b/src/Storages/System/StorageSystemCertificates.cpp
@@ -6,7 +6,8 @@
 #include <re2/re2.h>
 #include <boost/algorithm/string.hpp>
 #include <filesystem>
-#include "Poco/File.h"
+#include <base/scope_guard.h>
+#include <Poco/File.h>
 #if USE_SSL
     #include <openssl/x509v3.h>
     #include "Poco/Net/SSLManager.h"
diff --git a/src/Storages/System/StorageSystemClusters.cpp b/src/Storages/System/StorageSystemClusters.cpp
index 096e2aa206d..f4ef52d7605 100644
--- a/src/Storages/System/StorageSystemClusters.cpp
+++ b/src/Storages/System/StorageSystemClusters.cpp
@@ -1,5 +1,6 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/Context.h>
 #include <Storages/System/StorageSystemClusters.h>
@@ -24,34 +25,41 @@ NamesAndTypesList StorageSystemClusters::getNamesAndTypes()
         {"default_database", std::make_shared<DataTypeString>()},
         {"errors_count", std::make_shared<DataTypeUInt32>()},
         {"slowdowns_count", std::make_shared<DataTypeUInt32>()},
-        {"estimated_recovery_time", std::make_shared<DataTypeUInt32>()}
+        {"estimated_recovery_time", std::make_shared<DataTypeUInt32>()},
+        {"database_shard_name", std::make_shared<DataTypeString>()},
+        {"database_replica_name", std::make_shared<DataTypeString>()},
+        {"is_active", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt8>())},
     };
 }
 
 
 void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    for (const auto & name_and_cluster : context->getClusters()->getContainer())
-        writeCluster(res_columns, name_and_cluster);
+    for (const auto & name_and_cluster : context->getClusters())
+        writeCluster(res_columns, name_and_cluster, {});
 
     const auto databases = DatabaseCatalog::instance().getDatabases();
     for (const auto & name_and_database : databases)
     {
         if (const auto * replicated = typeid_cast<const DatabaseReplicated *>(name_and_database.second.get()))
         {
+
             if (auto database_cluster = replicated->tryGetCluster())
-                writeCluster(res_columns, {name_and_database.first, database_cluster});
+                writeCluster(res_columns, {name_and_database.first, database_cluster},
+                             replicated->tryGetAreReplicasActive(database_cluster));
         }
     }
 }
 
-void StorageSystemClusters::writeCluster(MutableColumns & res_columns, const NameAndCluster & name_and_cluster)
+void StorageSystemClusters::writeCluster(MutableColumns & res_columns, const NameAndCluster & name_and_cluster,
+                                         const std::vector<UInt8> & is_active)
 {
     const String & cluster_name = name_and_cluster.first;
     const ClusterPtr & cluster = name_and_cluster.second;
     const auto & shards_info = cluster->getShardsInfo();
     const auto & addresses_with_failover = cluster->getShardsAddresses();
 
+    size_t replica_idx = 0;
     for (size_t shard_index = 0; shard_index < shards_info.size(); ++shard_index)
     {
         const auto & shard_info = shards_info[shard_index];
@@ -77,6 +85,12 @@ void StorageSystemClusters::writeCluster(MutableColumns & res_columns, const Nam
             res_columns[i++]->insert(pool_status[replica_index].error_count);
             res_columns[i++]->insert(pool_status[replica_index].slowdown_count);
             res_columns[i++]->insert(pool_status[replica_index].estimated_recovery_time.count());
+            res_columns[i++]->insert(address.database_shard_name);
+            res_columns[i++]->insert(address.database_replica_name);
+            if (is_active.empty())
+                res_columns[i++]->insertDefault();
+            else
+                res_columns[i++]->insert(is_active[replica_idx++]);
         }
     }
 }
diff --git a/src/Storages/System/StorageSystemClusters.h b/src/Storages/System/StorageSystemClusters.h
index f14446bf4d3..9aa1a6a5183 100644
--- a/src/Storages/System/StorageSystemClusters.h
+++ b/src/Storages/System/StorageSystemClusters.h
@@ -27,7 +27,7 @@ protected:
     using NameAndCluster = std::pair<String, std::shared_ptr<Cluster>>;
 
     void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
-    static void writeCluster(MutableColumns & res_columns, const NameAndCluster & name_and_cluster);
+    static void writeCluster(MutableColumns & res_columns, const NameAndCluster & name_and_cluster, const std::vector<UInt8> & is_active);
 };
 
 }
diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp
index ca19687918c..0f307650c9c 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -33,8 +33,10 @@ const char * auto_contributors[] {
     "Aleksandra (Ася)",
     "Aleksandrov Vladimir",
     "Aleksei Filatov",
+    "Aleksei Golub",
     "Aleksei Levushkin",
     "Aleksei Semiglazov",
+    "Aleksei Tikhomirov",
     "Aleksey",
     "Aleksey Akulovich",
     "Alex",
@@ -84,6 +86,7 @@ const char * auto_contributors[] {
     "Alexey Gusev",
     "Alexey Ilyukhov",
     "Alexey Ivanov",
+    "Alexey Korepanov",
     "Alexey Milovidov",
     "Alexey Perevyshin",
     "Alexey Tronov",
@@ -135,6 +138,7 @@ const char * auto_contributors[] {
     "Andrii R",
     "Andy Liang",
     "Andy Yang",
+    "AndyB",
     "Anish Bhanwala",
     "Anmol Arora",
     "Anna",
@@ -155,6 +159,8 @@ const char * auto_contributors[] {
     "Anton Yuzhaninov",
     "Anton Zhabolenko",
     "Antonio Andelic",
+    "Antonio Bonuccelli",
+    "Aram Peres",
     "Ariel Robaldo",
     "Arsen Hakobyan",
     "Arslan G",
@@ -163,6 +169,7 @@ const char * auto_contributors[] {
     "Artem Gavrilov",
     "Artem Hnilov",
     "Artem Konovalov",
+    "Artem Pershin",
     "Artem Streltsov",
     "Artem Zuikov",
     "Artemeey",
@@ -227,6 +234,7 @@ const char * auto_contributors[] {
     "Christoph Wurm",
     "Chun-Sheng, Li",
     "Ciprian Hacman",
+    "Clayton McClure",
     "Clement Rodriguez",
     "ClickHouse Admin",
     "Clément Rodriguez",
@@ -256,6 +264,7 @@ const char * auto_contributors[] {
     "Dario",
     "DarkWanderer",
     "Darío",
+    "Dave Lahn",
     "Denis Burlaka",
     "Denis Glazachev",
     "Denis Krivak",
@@ -311,6 +320,7 @@ const char * auto_contributors[] {
     "Enrique Herreros",
     "Eric",
     "Eric Daniel",
+    "Eric Thomas",
     "Erixonich",
     "Ernest Poletaev",
     "Eugene Galkin",
@@ -347,6 +357,7 @@ const char * auto_contributors[] {
     "Frank Zhao",
     "François Violette",
     "Fred Wulff",
+    "FriendLey",
     "Fruit of Eden",
     "Fu Zhe",
     "Fullstop000",
@@ -391,6 +402,7 @@ const char * auto_contributors[] {
     "HeenaBansal2009",
     "Hiroaki Nakamura",
     "Hongbin",
+    "Hosun Lee",
     "HuFuwang",
     "Hui Wang",
     "ILya Limarenko",
@@ -448,6 +460,7 @@ const char * auto_contributors[] {
     "Jason Keirstead",
     "Javi Santana",
     "Javi santana bot",
+    "JaySon",
     "JaySon-Huang",
     "Jean Baptiste Favre",
     "Jeffrey Dang",
@@ -457,12 +470,15 @@ const char * auto_contributors[] {
     "Jiebin Sun",
     "Joanna Hulboj",
     "Jochen Schalanda",
+    "Joey",
+    "Johannes Visintini",
     "John",
     "John Hummel",
     "John Skopis",
     "Jonatas Freitas",
     "Jonathan-Ackerman",
     "Jordi Villar",
+    "Joris Giovannangeli",
     "Jose",
     "Josh Taylor",
     "João Figueiredo",
@@ -472,6 +488,7 @@ const char * auto_contributors[] {
     "Junfu Wu",
     "Jus",
     "Justin Hilliard",
+    "Justin de Guzman",
     "Kang Liu",
     "Karl Pietrzak",
     "Keiji Yoshida",
@@ -481,6 +498,7 @@ const char * auto_contributors[] {
     "Kevin Chiang",
     "Kevin Michel",
     "Kevin Zhang",
+    "KevinyhZou",
     "KinderRiven",
     "Kiran",
     "Kirill Danshin",
@@ -525,6 +543,7 @@ const char * auto_contributors[] {
     "Li Yin",
     "Liu Cong",
     "LiuCong",
+    "LiuNeng",
     "LiuYangkuan",
     "Lloyd-Pottiger",
     "Lopatin Konstantin",
@@ -544,6 +563,7 @@ const char * auto_contributors[] {
     "Maksim Buren",
     "Maksim Fedotov",
     "Maksim Kita",
+    "Maksym Sobolyev",
     "Mallik Hassan",
     "Malte",
     "Manuel de la Peña",
@@ -625,6 +645,7 @@ const char * auto_contributors[] {
     "Mikhail Salosin",
     "Mikhail Surin",
     "Mikhail f. Shiryaev",
+    "MikhailBurdukov",
     "MikuSugar",
     "Milad Arabi",
     "Mingliang Pan",
@@ -647,6 +668,7 @@ const char * auto_contributors[] {
     "Neeke Gao",
     "Neng Liu",
     "NengLiu",
+    "Nick-71",
     "Nickita",
     "Nickita Taranov",
     "Nickolay Yastrebov",
@@ -694,6 +716,7 @@ const char * auto_contributors[] {
     "OmarBazaraa",
     "OnePiece",
     "Onehr7",
+    "Ongkong",
     "Orivej Desh",
     "Orkhan Zeynalli",
     "Oskar Wojciski",
@@ -701,6 +724,7 @@ const char * auto_contributors[] {
     "PHO",
     "Pablo Alegre",
     "Pablo Marcos",
+    "Palash Goel",
     "Paramtamtam",
     "Patrick Zippenfenig",
     "Paul Loyd",
@@ -795,6 +819,7 @@ const char * auto_contributors[] {
     "Sergei Bocharov",
     "Sergei Semin",
     "Sergei Shtykov",
+    "Sergei Solomatov",
     "Sergei Trifonov",
     "Sergei Tsetlin (rekub)",
     "Sergey Demurin",
@@ -817,6 +842,7 @@ const char * auto_contributors[] {
     "Seyed Mehrshad Hosseini",
     "Sherry Wang",
     "Shoh Jahon",
+    "Sichen Zhao",
     "SiderZhang",
     "Sidorov Pavel",
     "Silviu Caragea",
@@ -844,6 +870,7 @@ const char * auto_contributors[] {
     "Stupnikov Andrey",
     "SuperBot",
     "SuperDJY",
+    "SupunKavinda",
     "Suzy Wang",
     "SuzyWangIBMer",
     "Sébastien",
@@ -865,6 +892,7 @@ const char * auto_contributors[] {
     "The-Alchemist",
     "Thom O'Connor",
     "Thomas Berdy",
+    "Thomas Casteleyn",
     "Tian Xinhui",
     "Tiaonmmn",
     "Tigran Khudaverdyan",
@@ -891,6 +919,7 @@ const char * auto_contributors[] {
     "Vadim Skipin",
     "Vadim Volodin",
     "VadimPE",
+    "Vadym Chekan",
     "Vage Ogannisian",
     "Val",
     "Valera Ryaboshapko",
@@ -996,6 +1025,7 @@ const char * auto_contributors[] {
     "Zhipeng",
     "Zijie Lu",
     "Zoran Pandovski",
+    "[데이터플랫폼팀] 이호선",
     "a.palagashvili",
     "aaapetrenko",
     "abdrakhmanov",
@@ -1010,7 +1040,9 @@ const char * auto_contributors[] {
     "akonyaev",
     "akuzm",
     "alekseik1",
+    "alekseygolub",
     "alesapin",
+    "alex filatov",
     "alex-zaitsev",
     "alex.lvxin",
     "alexX512",
@@ -1035,12 +1067,14 @@ const char * auto_contributors[] {
     "anton",
     "ap11",
     "aprudaev",
+    "artem-yadr",
     "artpaul",
     "asiana21",
     "atereh",
     "attack204",
     "avasiliev",
     "avogar",
+    "avoiderboi",
     "avsharapov",
     "awakeljw",
     "awesomeleo",
@@ -1057,6 +1091,7 @@ const char * auto_contributors[] {
     "bobrovskij artemij",
     "booknouse",
     "bseng",
+    "caipengxiang",
     "candiduslynx",
     "canenoneko",
     "caspian",
@@ -1079,7 +1114,10 @@ const char * auto_contributors[] {
     "chou.fan",
     "christophe.kalenzaga",
     "clarkcaoliu",
+    "clickhouse-adrianfraguela",
     "clickhouse-robot-curie",
+    "clundro",
+    "cluster",
     "cms",
     "cmsxbc",
     "cn-ds",
@@ -1111,6 +1149,7 @@ const char * auto_contributors[] {
     "dmitriy",
     "dmitry kuzmin",
     "dongyifeng",
+    "ducle.canh",
     "eaxdev",
     "eejoin",
     "egatov",
@@ -1123,6 +1162,8 @@ const char * auto_contributors[] {
     "erikbaan",
     "ermaotech",
     "evtan",
+    "exX512",
+    "exmy",
     "exprmntr",
     "ezhaka",
     "f1yegor",
@@ -1152,6 +1193,7 @@ const char * auto_contributors[] {
     "fuwhu",
     "fuzhe1989",
     "fuzzERot",
+    "fyu",
     "g-arslan",
     "ggerogery",
     "giordyb",
@@ -1178,9 +1220,11 @@ const char * auto_contributors[] {
     "hhell",
     "homeward",
     "hotid",
+    "houbaron",
     "huangzhaowei",
     "hustnn",
     "huzhichengdd",
+    "iammagicc",
     "ianton-ru",
     "ice1x",
     "idfer",
@@ -1212,6 +1256,7 @@ const char * auto_contributors[] {
     "jinjunzh",
     "jkuklis",
     "jthmath",
+    "jun won",
     "jus1096",
     "jyz0309",
     "karnevil13",
@@ -1223,6 +1268,7 @@ const char * auto_contributors[] {
     "kigerzhang",
     "kirillikoff",
     "kmeaw",
+    "kolechenkov",
     "koloshmet",
     "kolsys",
     "konnectr",
@@ -1231,6 +1277,7 @@ const char * auto_contributors[] {
     "ks1322",
     "kshvakov",
     "kssenii",
+    "kst-morozov",
     "l",
     "l1tsolaiki",
     "lalex",
@@ -1252,6 +1299,7 @@ const char * auto_contributors[] {
     "liangqian",
     "libenwang",
     "lichengxiang",
+    "liding1992",
     "linceyou",
     "lincion",
     "lingo-xp",
@@ -1269,6 +1317,7 @@ const char * auto_contributors[] {
     "lixuchun",
     "liyang",
     "liyang830",
+    "lizhuoyu5",
     "lokax",
     "lomberts",
     "loneylee",
@@ -1326,10 +1375,12 @@ const char * auto_contributors[] {
     "mwish",
     "myrrc",
     "nagorny",
+    "natasha",
     "nathanbegbie",
     "nauta",
     "nautaa",
     "ndchikin",
+    "nellicus",
     "neng.liu",
     "never lee",
     "ni1l",
@@ -1354,6 +1405,7 @@ const char * auto_contributors[] {
     "pawelsz-rb",
     "pdai",
     "pdv-ru",
+    "pengxiangcai",
     "peshkurov",
     "peter279k",
     "philip.han",
@@ -1482,6 +1534,7 @@ const char * auto_contributors[] {
     "wzl",
     "xPoSx",
     "xiedeyantu",
+    "xieyichen",
     "xinhuitian",
     "xlwh",
     "yakkomajuri",
@@ -1545,6 +1598,7 @@ const char * auto_contributors[] {
     "Дмитрий Канатников",
     "Иванов Евгений",
     "Илья Исаев",
+    "Коренберг Марк",
     "Коренберг ☢️  Марк",
     "Павел Литвиненко",
     "Смитюх Вячеслав",
@@ -1552,6 +1606,7 @@ const char * auto_contributors[] {
     "万康",
     "何李夫",
     "凌涛",
+    "刘浩林",
     "刘陶峰",
     "吴健",
     "小蝌蚪",
diff --git a/src/Storages/System/StorageSystemDatabases.cpp b/src/Storages/System/StorageSystemDatabases.cpp
index 4d1f6c171db..a3d05281b28 100644
--- a/src/Storages/System/StorageSystemDatabases.cpp
+++ b/src/Storages/System/StorageSystemDatabases.cpp
@@ -2,6 +2,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeUUID.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/formatWithPossiblyHidingSecrets.h>
 #include <Access/ContextAccess.h>
 #include <Storages/System/StorageSystemDatabases.h>
 #include <Parsers/ASTCreateQuery.h>
@@ -31,7 +32,7 @@ NamesAndAliases StorageSystemDatabases::getNamesAndAliases()
     };
 }
 
-static String getEngineFull(const DatabasePtr & database)
+static String getEngineFull(const ContextPtr & ctx, const DatabasePtr & database)
 {
     DDLGuardPtr guard;
     while (true)
@@ -59,7 +60,7 @@ static String getEngineFull(const DatabasePtr & database)
     if (!ast_create || !ast_create->storage)
         return {};
 
-    String engine_full = ast_create->storage->formatWithSecretsHidden();
+    String engine_full = format({ctx, *ast_create->storage});
     static const char * const extra_head = " ENGINE = ";
 
     if (startsWith(engine_full, extra_head))
@@ -87,7 +88,7 @@ void StorageSystemDatabases::fillData(MutableColumns & res_columns, ContextPtr c
         res_columns[2]->insert(context->getPath() + database->getDataPath());
         res_columns[3]->insert(database->getMetadataPath());
         res_columns[4]->insert(database->getUUID());
-        res_columns[5]->insert(getEngineFull(database));
+        res_columns[5]->insert(getEngineFull(context, database));
         res_columns[6]->insert(database->getDatabaseComment());
    }
 }
diff --git a/src/Storages/System/StorageSystemDetachedParts.cpp b/src/Storages/System/StorageSystemDetachedParts.cpp
index 66e610ca653..9f80b994051 100644
--- a/src/Storages/System/StorageSystemDetachedParts.cpp
+++ b/src/Storages/System/StorageSystemDetachedParts.cpp
@@ -8,7 +8,7 @@
 #include <Storages/System/StorageSystemPartsBase.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <QueryPipeline/Pipe.h>
-#include <IO/IOThreadPool.h>
+#include <IO/SharedThreadPools.h>
 #include <Interpreters/threadPoolCallbackRunner.h>
 
 #include <mutex>
diff --git a/src/Storages/System/StorageSystemDisks.cpp b/src/Storages/System/StorageSystemDisks.cpp
index 3ba40cb76a5..002da7abd14 100644
--- a/src/Storages/System/StorageSystemDisks.cpp
+++ b/src/Storages/System/StorageSystemDisks.cpp
@@ -2,6 +2,7 @@
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <QueryPipeline/Pipe.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/Cache/FileCacheFactory.h>
 
 namespace DB
 {
@@ -77,7 +78,7 @@ Pipe StorageSystemDisks::read(
 
         String cache_path;
         if (disk_ptr->supportsCache())
-            cache_path = disk_ptr->getCacheBasePath();
+            cache_path = FileCacheFactory::instance().getByName(disk_ptr->getCacheName()).settings.base_path;
 
         col_cache_path->insert(cache_path);
     }
diff --git a/src/Storages/System/StorageSystemDistributionQueue.cpp b/src/Storages/System/StorageSystemDistributionQueue.cpp
index 34cff7df65d..33de723b6d4 100644
--- a/src/Storages/System/StorageSystemDistributionQueue.cpp
+++ b/src/Storages/System/StorageSystemDistributionQueue.cpp
@@ -1,9 +1,9 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/StorageSystemDistributionQueue.h>
-#include <Storages/Distributed/DirectoryMonitor.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageDistributed.h>
 #include <Storages/VirtualColumnUtils.h>
@@ -174,7 +174,7 @@ void StorageSystemDistributionQueue::fillData(MutableColumns & res_columns, Cont
 
         auto & distributed_table = dynamic_cast<StorageDistributed &>(*tables[database][table]);
 
-        for (const auto & status : distributed_table.getDirectoryMonitorsStatuses())
+        for (const auto & status : distributed_table.getDirectoryQueueStatuses())
         {
             size_t col_num = 0;
             res_columns[col_num++]->insert(database);
diff --git a/src/Storages/System/StorageSystemDroppedTables.cpp b/src/Storages/System/StorageSystemDroppedTables.cpp
new file mode 100644
index 00000000000..bd239199c96
--- /dev/null
+++ b/src/Storages/System/StorageSystemDroppedTables.cpp
@@ -0,0 +1,65 @@
+#include <Storages/System/StorageSystemDroppedTables.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <base/types.h>
+
+
+namespace DB
+{
+
+NamesAndTypesList StorageSystemDroppedTables::getNamesAndTypes()
+{
+    NamesAndTypesList names_and_types{
+        {"index", std::make_shared<DataTypeUInt32>()},
+        {"database", std::make_shared<DataTypeString>()},
+        {"table", std::make_shared<DataTypeString>()},
+        {"uuid", std::make_shared<DataTypeUUID>()},
+        {"engine", std::make_shared<DataTypeString>()},
+        {"metadata_dropped_path", std::make_shared<DataTypeString>()},
+        {"table_dropped_time", std::make_shared<DataTypeDateTime>()},
+    };
+    return names_and_types;
+}
+
+
+void StorageSystemDroppedTables::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+{
+    auto tables_mark_dropped = DatabaseCatalog::instance().getTablesMarkedDropped();
+
+    size_t index = 0;
+
+    auto & column_index = assert_cast<ColumnUInt32 &>(*res_columns[index++]);
+    auto & column_database = assert_cast<ColumnString &>(*res_columns[index++]);
+    auto & column_table = assert_cast<ColumnString &>(*res_columns[index++]);
+    auto & column_uuid = assert_cast<ColumnUUID &>(*res_columns[index++]).getData();
+    auto & column_engine = assert_cast<ColumnString &>(*res_columns[index++]);
+    auto & column_metadata_dropped_path = assert_cast<ColumnString &>(*res_columns[index++]);
+    auto & column_table_dropped_time = assert_cast<ColumnUInt32 &>(*res_columns[index++]);
+
+    auto add_row = [&](UInt32 idx, const DatabaseCatalog::TableMarkedAsDropped & table_mark_dropped)
+    {
+        column_index.insertValue(idx);
+        column_database.insertData(table_mark_dropped.table_id.getDatabaseName().data(), table_mark_dropped.table_id.getDatabaseName().size());
+        column_table.insertData(table_mark_dropped.table_id.getTableName().data(), table_mark_dropped.table_id.getTableName().size());
+        column_uuid.push_back(table_mark_dropped.table_id.uuid.toUnderType());
+        if (table_mark_dropped.table)
+            column_engine.insertData(table_mark_dropped.table->getName().data(), table_mark_dropped.table->getName().size());
+        else
+            column_engine.insertData({}, 0);
+        column_metadata_dropped_path.insertData(table_mark_dropped.metadata_path.data(), table_mark_dropped.metadata_path.size());
+        column_table_dropped_time.insertValue(static_cast<UInt32>(table_mark_dropped.drop_time));
+    };
+
+    UInt32 idx = 0;
+    for (const auto & table_mark_dropped : tables_mark_dropped)
+        add_row(idx++, table_mark_dropped);
+}
+
+}
diff --git a/src/Storages/System/StorageSystemDroppedTables.h b/src/Storages/System/StorageSystemDroppedTables.h
new file mode 100644
index 00000000000..44cc8122603
--- /dev/null
+++ b/src/Storages/System/StorageSystemDroppedTables.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <Storages/System/IStorageSystemOneBlock.h>
+
+
+namespace DB
+{
+
+class StorageSystemDroppedTables final : public IStorageSystemOneBlock<StorageSystemDroppedTables>
+{
+public:
+    std::string getName() const override { return "SystemMarkedDroppedTables"; }
+    static NamesAndTypesList getNamesAndTypes();
+
+protected:
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+};
+
+}
diff --git a/src/Storages/System/StorageSystemEvents.cpp b/src/Storages/System/StorageSystemEvents.cpp
index be2d3f8d49e..b9b07cfe0ac 100644
--- a/src/Storages/System/StorageSystemEvents.cpp
+++ b/src/Storages/System/StorageSystemEvents.cpp
@@ -18,7 +18,7 @@ NamesAndTypesList StorageSystemEvents::getNamesAndTypes()
 
 void StorageSystemEvents::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    for (size_t i = 0, end = ProfileEvents::end(); i < end; ++i)
+    for (ProfileEvents::Event i = ProfileEvents::Event(0), end = ProfileEvents::end(); i < end; ++i)
     {
         UInt64 value = ProfileEvents::global_counters[i];
 
diff --git a/src/Storages/System/StorageSystemFilesystemCache.cpp b/src/Storages/System/StorageSystemFilesystemCache.cpp
index bec92a60436..8e9ad2ac501 100644
--- a/src/Storages/System/StorageSystemFilesystemCache.cpp
+++ b/src/Storages/System/StorageSystemFilesystemCache.cpp
@@ -15,8 +15,10 @@ namespace DB
 NamesAndTypesList StorageSystemFilesystemCache::getNamesAndTypes()
 {
     return {
+        {"cache_name", std::make_shared<DataTypeString>()},
         {"cache_base_path", std::make_shared<DataTypeString>()},
         {"cache_path", std::make_shared<DataTypeString>()},
+        {"key", std::make_shared<DataTypeString>()},
         {"file_segment_range_begin", std::make_shared<DataTypeUInt64>()},
         {"file_segment_range_end", std::make_shared<DataTypeUInt64>()},
         {"size", std::make_shared<DataTypeUInt64>()},
@@ -26,6 +28,7 @@ NamesAndTypesList StorageSystemFilesystemCache::getNamesAndTypes()
         {"downloaded_size", std::make_shared<DataTypeUInt64>()},
         {"persistent", std::make_shared<DataTypeNumber<UInt8>>()},
         {"kind", std::make_shared<DataTypeString>()},
+        {"unbound", std::make_shared<DataTypeNumber<UInt8>>()},
     };
 }
 
@@ -38,30 +41,32 @@ void StorageSystemFilesystemCache::fillData(MutableColumns & res_columns, Contex
 {
     auto caches = FileCacheFactory::instance().getAll();
 
-    for (const auto & [cache_base_path, cache_data] : caches)
+    for (const auto & [cache_name, cache_data] : caches)
     {
         const auto & cache = cache_data->cache;
         auto file_segments = cache->getSnapshot();
 
-        for (const auto & file_segment : file_segments)
+        for (const auto & file_segment : *file_segments)
         {
-            res_columns[0]->insert(cache_base_path);
+            res_columns[0]->insert(cache_name);
+            res_columns[1]->insert(cache->getBasePath());
 
             /// Do not use `file_segment->getPathInLocalCache` here because it will lead to nullptr dereference
             /// (because file_segments in getSnapshot doesn't have `cache` field set)
-            res_columns[1]->insert(
-                cache->getPathInLocalCache(file_segment->key(), file_segment->offset(), file_segment->getKind()));
+            res_columns[2]->insert(cache->getPathInLocalCache(file_segment->key(), file_segment->offset(), file_segment->getKind()));
+            res_columns[3]->insert(file_segment->key().toString());
 
             const auto & range = file_segment->range();
-            res_columns[2]->insert(range.left);
-            res_columns[3]->insert(range.right);
-            res_columns[4]->insert(range.size());
-            res_columns[5]->insert(FileSegment::stateToString(file_segment->state()));
-            res_columns[6]->insert(file_segment->getHitsCount());
-            res_columns[7]->insert(file_segment->getRefCount());
-            res_columns[8]->insert(file_segment->getDownloadedSize());
-            res_columns[9]->insert(file_segment->isPersistent());
-            res_columns[10]->insert(toString(file_segment->getKind()));
+            res_columns[4]->insert(range.left);
+            res_columns[5]->insert(range.right);
+            res_columns[6]->insert(range.size());
+            res_columns[7]->insert(FileSegment::stateToString(file_segment->state()));
+            res_columns[8]->insert(file_segment->getHitsCount());
+            res_columns[9]->insert(file_segment->getRefCount());
+            res_columns[10]->insert(file_segment->getDownloadedSize(false));
+            res_columns[11]->insert(file_segment->isPersistent());
+            res_columns[12]->insert(toString(file_segment->getKind()));
+            res_columns[13]->insert(file_segment->isUnbound());
         }
     }
 }
diff --git a/src/Storages/System/StorageSystemFormats.cpp b/src/Storages/System/StorageSystemFormats.cpp
index d8a49880257..b005b725a99 100644
--- a/src/Storages/System/StorageSystemFormats.cpp
+++ b/src/Storages/System/StorageSystemFormats.cpp
@@ -23,9 +23,9 @@ void StorageSystemFormats::fillData(MutableColumns & res_columns, ContextPtr, co
     for (const auto & pair : formats)
     {
         const auto & [format_name, creators] = pair;
-        UInt64 has_input_format(creators.input_creator != nullptr);
+        UInt64 has_input_format(creators.input_creator != nullptr || creators.random_access_input_creator != nullptr);
         UInt64 has_output_format(creators.output_creator != nullptr);
-        UInt64 supports_parallel_parsing(creators.file_segmentation_engine != nullptr);
+        UInt64 supports_parallel_parsing(creators.file_segmentation_engine != nullptr || creators.random_access_input_creator != nullptr);
         UInt64 supports_parallel_formatting(creators.supports_parallel_formatting);
 
         res_columns[0]->insert(format_name);
diff --git a/src/Storages/System/StorageSystemFunctions.cpp b/src/Storages/System/StorageSystemFunctions.cpp
index a0a406a974c..0c609d84da3 100644
--- a/src/Storages/System/StorageSystemFunctions.cpp
+++ b/src/Storages/System/StorageSystemFunctions.cpp
@@ -1,4 +1,5 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeEnum.h>
@@ -55,15 +56,38 @@ namespace
         if constexpr (std::is_same_v<Factory, FunctionFactory>)
         {
             if (factory.isAlias(name))
+            {
                 res_columns[6]->insertDefault();
+                res_columns[7]->insertDefault();
+                res_columns[8]->insertDefault();
+                res_columns[9]->insertDefault();
+                res_columns[10]->insertDefault();
+                res_columns[11]->insertDefault();
+            }
             else
-                res_columns[6]->insert(factory.getDocumentation(name).description);
+            {
+                auto documentation = factory.getDocumentation(name);
+                res_columns[6]->insert(documentation.description);
+                res_columns[7]->insert(documentation.syntax);
+                res_columns[8]->insert(documentation.argumentsAsString());
+                res_columns[9]->insert(documentation.returned_value);
+                res_columns[10]->insert(documentation.examplesAsString());
+                res_columns[11]->insert(documentation.categoriesAsString());
+            }
         }
         else
+        {
             res_columns[6]->insertDefault();
+            res_columns[7]->insertDefault();
+            res_columns[8]->insertDefault();
+            res_columns[9]->insertDefault();
+            res_columns[10]->insertDefault();
+            res_columns[11]->insertDefault();
+        }
     }
 }
 
+
 std::vector<std::pair<String, Int8>> getOriginEnumsAndValues()
 {
     return std::vector<std::pair<String, Int8>>{
@@ -83,6 +107,11 @@ NamesAndTypesList StorageSystemFunctions::getNamesAndTypes()
         {"create_query", std::make_shared<DataTypeString>()},
         {"origin", std::make_shared<DataTypeEnum8>(getOriginEnumsAndValues())},
         {"description", std::make_shared<DataTypeString>()},
+        {"syntax", std::make_shared<DataTypeString>()},
+        {"arguments", std::make_shared<DataTypeString>()},
+        {"returned_value", std::make_shared<DataTypeString>()},
+        {"examples", std::make_shared<DataTypeString>()},
+        {"categories", std::make_shared<DataTypeString>()}
     };
 }
 
diff --git a/src/Storages/System/StorageSystemMerges.cpp b/src/Storages/System/StorageSystemMerges.cpp
index b29836206d0..1f32a0ff700 100644
--- a/src/Storages/System/StorageSystemMerges.cpp
+++ b/src/Storages/System/StorageSystemMerges.cpp
@@ -22,6 +22,7 @@ NamesAndTypesList StorageSystemMerges::getNamesAndTypes()
         {"partition_id", std::make_shared<DataTypeString>()},
         {"is_mutation", std::make_shared<DataTypeUInt8>()},
         {"total_size_bytes_compressed", std::make_shared<DataTypeUInt64>()},
+        {"total_size_bytes_uncompressed", std::make_shared<DataTypeUInt64>()},
         {"total_size_marks", std::make_shared<DataTypeUInt64>()},
         {"bytes_read_uncompressed", std::make_shared<DataTypeUInt64>()},
         {"rows_read", std::make_shared<DataTypeUInt64>()},
@@ -59,6 +60,7 @@ void StorageSystemMerges::fillData(MutableColumns & res_columns, ContextPtr cont
         res_columns[i++]->insert(merge.partition_id);
         res_columns[i++]->insert(merge.is_mutation);
         res_columns[i++]->insert(merge.total_size_bytes_compressed);
+        res_columns[i++]->insert(merge.total_size_bytes_uncompressed);
         res_columns[i++]->insert(merge.total_size_marks);
         res_columns[i++]->insert(merge.bytes_read_uncompressed);
         res_columns[i++]->insert(merge.rows_read);
diff --git a/src/Storages/System/StorageSystemNamedCollections.cpp b/src/Storages/System/StorageSystemNamedCollections.cpp
index 2851b3ac55e..1d94b0afd1b 100644
--- a/src/Storages/System/StorageSystemNamedCollections.cpp
+++ b/src/Storages/System/StorageSystemNamedCollections.cpp
@@ -7,9 +7,9 @@
 #include <Interpreters/ProfileEventsExt.h>
 #include <Access/Common/AccessType.h>
 #include <Access/Common/AccessFlags.h>
+#include <Access/ContextAccess.h>
 #include <Columns/ColumnMap.h>
 #include <Common/NamedCollections/NamedCollections.h>
-#include <Access/ContextAccess.h>
 
 
 namespace DB
@@ -30,7 +30,6 @@ StorageSystemNamedCollections::StorageSystemNamedCollections(const StorageID & t
 
 void StorageSystemNamedCollections::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context->checkAccess(AccessType::SHOW_NAMED_COLLECTIONS);
     const auto & access = context->getAccess();
 
     NamedCollectionUtils::loadIfNot();
@@ -38,6 +37,9 @@ void StorageSystemNamedCollections::fillData(MutableColumns & res_columns, Conte
     auto collections = NamedCollectionFactory::instance().getAll();
     for (const auto & [name, collection] : collections)
     {
+        if (!access->isGranted(AccessType::SHOW_NAMED_COLLECTIONS, name))
+            continue;
+
         res_columns[0]->insert(name);
 
         auto * column_map = typeid_cast<ColumnMap *>(res_columns[1].get());
diff --git a/src/Storages/System/StorageSystemNumbers.cpp b/src/Storages/System/StorageSystemNumbers.cpp
index 70c0c64305d..6b5fd46fe1e 100644
--- a/src/Storages/System/StorageSystemNumbers.cpp
+++ b/src/Storages/System/StorageSystemNumbers.cpp
@@ -79,7 +79,7 @@ protected:
         if (block_size == 0)
             return {};
 
-        UInt64 curr = state->counter.fetch_add(block_size, std::memory_order_acquire);
+        UInt64 curr = state->counter.fetch_add(block_size, std::memory_order_relaxed);
 
         if (curr >= max_counter)
             return {};
diff --git a/src/Storages/System/StorageSystemNumbers.h b/src/Storages/System/StorageSystemNumbers.h
index acddac681ef..80590718d03 100644
--- a/src/Storages/System/StorageSystemNumbers.h
+++ b/src/Storages/System/StorageSystemNumbers.h
@@ -40,6 +40,8 @@ public:
         size_t max_block_size,
         size_t num_streams) override;
 
+    bool parallelizeOutputAfterReading(ContextPtr) const override { return false; }
+
     bool hasEvenlyDistributedRead() const override { return true; }
     bool isSystemStorage() const override { return true; }
     bool supportsTransactions() const override { return true; }
diff --git a/src/Storages/System/StorageSystemOne.h b/src/Storages/System/StorageSystemOne.h
index d8a26f1def4..e3b6e1d5f78 100644
--- a/src/Storages/System/StorageSystemOne.h
+++ b/src/Storages/System/StorageSystemOne.h
@@ -30,6 +30,8 @@ public:
         size_t max_block_size,
         size_t num_streams) override;
 
+    bool parallelizeOutputAfterReading(ContextPtr) const override { return false; }
+
     bool isSystemStorage() const override { return true; }
 
     bool supportsTransactions() const override { return true; }
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index f6854e7d5d0..86ecb336b51 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -14,7 +14,7 @@
 #include <Storages/VirtualColumnUtils.h>
 #include <Databases/IDatabase.h>
 #include <Parsers/queryToString.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <Interpreters/TransactionVersionMetadata.h>
 #include <Interpreters/Context.h>
 
diff --git a/src/Storages/System/StorageSystemPartsBase.cpp b/src/Storages/System/StorageSystemPartsBase.cpp
index fb7f4f9066a..0979b9d9371 100644
--- a/src/Storages/System/StorageSystemPartsBase.cpp
+++ b/src/Storages/System/StorageSystemPartsBase.cpp
@@ -304,6 +304,7 @@ StorageSystemPartsBase::StorageSystemPartsBase(const StorageID & table_id_, Name
     /// Add aliases for old column names for backwards compatibility.
     add_alias("bytes", "bytes_on_disk");
     add_alias("marks_size", "marks_bytes");
+    add_alias("part_name", "name");
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(tmp_columns);
diff --git a/src/Storages/System/StorageSystemPrivileges.cpp b/src/Storages/System/StorageSystemPrivileges.cpp
index 70163979f72..ee412d0e648 100644
--- a/src/Storages/System/StorageSystemPrivileges.cpp
+++ b/src/Storages/System/StorageSystemPrivileges.cpp
@@ -28,6 +28,7 @@ namespace
         DICTIONARY,
         VIEW,
         COLUMN,
+        NAMED_COLLECTION,
     };
 
     DataTypeEnum8::Values getLevelEnumValues()
@@ -39,6 +40,7 @@ namespace
         enum_values.emplace_back("DICTIONARY", static_cast<Int8>(DICTIONARY));
         enum_values.emplace_back("VIEW", static_cast<Int8>(VIEW));
         enum_values.emplace_back("COLUMN", static_cast<Int8>(COLUMN));
+        enum_values.emplace_back("NAMED_COLLECTION", static_cast<Int8>(NAMED_COLLECTION));
         return enum_values;
     }
 }
diff --git a/src/Storages/System/StorageSystemProjectionParts.cpp b/src/Storages/System/StorageSystemProjectionParts.cpp
index 37c62ba5eb0..d2c6c3ef287 100644
--- a/src/Storages/System/StorageSystemProjectionParts.cpp
+++ b/src/Storages/System/StorageSystemProjectionParts.cpp
@@ -11,7 +11,7 @@
 #include <Storages/VirtualColumnUtils.h>
 #include <Databases/IDatabase.h>
 #include <Parsers/queryToString.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemQueryCache.cpp b/src/Storages/System/StorageSystemQueryCache.cpp
index 2de8e4594b9..245f4b7fd26 100644
--- a/src/Storages/System/StorageSystemQueryCache.cpp
+++ b/src/Storages/System/StorageSystemQueryCache.cpp
@@ -13,11 +13,12 @@ NamesAndTypesList StorageSystemQueryCache::getNamesAndTypes()
 {
     return {
         {"query", std::make_shared<DataTypeString>()},
-        {"key_hash", std::make_shared<DataTypeUInt64>()},
-        {"expires_at", std::make_shared<DataTypeDateTime>()},
+        {"result_size", std::make_shared<DataTypeUInt64>()},
         {"stale", std::make_shared<DataTypeUInt8>()},
         {"shared", std::make_shared<DataTypeUInt8>()},
-        {"result_size", std::make_shared<DataTypeUInt64>()}
+        {"compressed", std::make_shared<DataTypeUInt8>()},
+        {"expires_at", std::make_shared<DataTypeDateTime>()},
+        {"key_hash", std::make_shared<DataTypeUInt64>()}
     };
 }
 
@@ -33,22 +34,23 @@ void StorageSystemQueryCache::fillData(MutableColumns & res_columns, ContextPtr
     if (!query_cache)
         return;
 
-    const String & username = context->getUserName();
+    std::vector<QueryCache::Cache::KeyMapped> content = query_cache->dump();
 
-    std::lock_guard lock(query_cache->mutex);
+    const String & user_name = context->getUserName();
 
-    for (const auto & [key, result] : query_cache->cache)
+    for (const auto & [key, query_result] : content)
     {
         /// Showing other user's queries is considered a security risk
-        if (key.username.has_value() && key.username != username)
+        if (!key.is_shared && key.user_name != user_name)
             continue;
 
         res_columns[0]->insert(key.queryStringFromAst()); /// approximates the original query string
-        res_columns[1]->insert(key.ast->getTreeHash().first);
-        res_columns[2]->insert(std::chrono::system_clock::to_time_t(key.expires_at));
-        res_columns[3]->insert(key.expires_at < std::chrono::system_clock::now());
-        res_columns[4]->insert(!key.username.has_value());
-        res_columns[5]->insert(result.sizeInBytes());
+        res_columns[1]->insert(QueryCache::QueryCacheEntryWeight()(*query_result));
+        res_columns[2]->insert(key.expires_at < std::chrono::system_clock::now());
+        res_columns[3]->insert(!key.is_shared);
+        res_columns[4]->insert(key.is_compressed);
+        res_columns[5]->insert(std::chrono::system_clock::to_time_t(key.expires_at));
+        res_columns[6]->insert(key.ast->getTreeHash().first);
     }
 }
 
diff --git a/src/Storages/System/StorageSystemRemoteDataPaths.cpp b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
index 20076603522..eb514d3b3f4 100644
--- a/src/Storages/System/StorageSystemRemoteDataPaths.cpp
+++ b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
@@ -61,10 +61,9 @@ Pipe StorageSystemRemoteDataPaths::read(
             disk->getRemotePathsRecursive("data", remote_paths_by_local_path);
 
             FileCachePtr cache;
-            auto cache_base_path = disk->supportsCache() ? disk->getCacheBasePath() : "";
 
-            if (!cache_base_path.empty())
-                cache = FileCacheFactory::instance().get(cache_base_path);
+            if (disk->supportsCache())
+                cache = FileCacheFactory::instance().getByName(disk->getCacheName()).cache;
 
             for (const auto & [local_path, common_prefox_for_objects, storage_objects] : remote_paths_by_local_path)
             {
@@ -72,15 +71,18 @@ Pipe StorageSystemRemoteDataPaths::read(
                 {
                     col_disk_name->insert(disk_name);
                     col_base_path->insert(disk->getPath());
-                    col_cache_base_path->insert(cache_base_path);
+                    if (cache)
+                        col_cache_base_path->insert(cache->getBasePath());
+                    else
+                        col_cache_base_path->insertDefault();
                     col_local_path->insert(local_path);
-                    col_remote_path->insert(object.absolute_path);
+                    col_remote_path->insert(object.remote_path);
                     col_size->insert(object.bytes_size);
                     col_namespace->insert(common_prefox_for_objects);
 
                     if (cache)
                     {
-                        auto cache_paths = cache->tryGetCachePaths(cache->hash(object.getPathKeyForCache()));
+                        auto cache_paths = cache->tryGetCachePaths(cache->createKeyForPath(object.remote_path));
                         col_cache_paths->insert(Array(cache_paths.begin(), cache_paths.end()));
                     }
                     else
diff --git a/src/Storages/System/StorageSystemReplicas.cpp b/src/Storages/System/StorageSystemReplicas.cpp
index 65878d356f4..1b87382c222 100644
--- a/src/Storages/System/StorageSystemReplicas.cpp
+++ b/src/Storages/System/StorageSystemReplicas.cpp
@@ -7,12 +7,20 @@
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Access/ContextAccess.h>
-#include <Common/typeid_cast.h>
 #include <Databases/IDatabase.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Common/typeid_cast.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/ThreadPool.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 
 
+namespace CurrentMetrics
+{
+    extern const Metric SystemReplicasThreads;
+    extern const Metric SystemReplicasThreadsActive;
+}
+
 namespace DB
 {
 
@@ -31,6 +39,7 @@ StorageSystemReplicas::StorageSystemReplicas(const StorageID & table_id_)
         { "is_session_expired",                   std::make_shared<DataTypeUInt8>()    },
         { "future_parts",                         std::make_shared<DataTypeUInt32>()   },
         { "parts_to_check",                       std::make_shared<DataTypeUInt32>()   },
+        { "zookeeper_name",                       std::make_shared<DataTypeString>()   },
         { "zookeeper_path",                       std::make_shared<DataTypeString>()   },
         { "replica_name",                         std::make_shared<DataTypeString>()   },
         { "replica_path",                         std::make_shared<DataTypeString>()   },
@@ -52,6 +61,7 @@ StorageSystemReplicas::StorageSystemReplicas(const StorageID & table_id_)
         { "absolute_delay",                       std::make_shared<DataTypeUInt64>()   },
         { "total_replicas",                       std::make_shared<DataTypeUInt8>()    },
         { "active_replicas",                      std::make_shared<DataTypeUInt8>()    },
+        { "lost_part_count",                      std::make_shared<DataTypeUInt64>()   },
         { "last_queue_update_exception",          std::make_shared<DataTypeString>()   },
         { "zookeeper_exception",                  std::make_shared<DataTypeString>()   },
         { "replica_is_active",                    std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt8>()) }
@@ -105,6 +115,7 @@ Pipe StorageSystemReplicas::read(
             || column_name == "log_pointer"
             || column_name == "total_replicas"
             || column_name == "active_replicas"
+            || column_name == "lost_part_count"
             || column_name == "zookeeper_exception"
             || column_name == "replica_is_active")
         {
@@ -160,16 +171,16 @@ Pipe StorageSystemReplicas::read(
     if (settings.max_threads != 0)
         thread_pool_size = std::min(thread_pool_size, static_cast<size_t>(settings.max_threads));
 
-    ThreadPool thread_pool(thread_pool_size);
+    ThreadPool thread_pool(CurrentMetrics::SystemReplicasThreads, CurrentMetrics::SystemReplicasThreadsActive, thread_pool_size);
 
     for (size_t i = 0; i < tables_size; ++i)
     {
-        thread_pool.scheduleOrThrowOnError([&, i=i]
+        thread_pool.scheduleOrThrowOnError([&, my_i = i]
         {
             dynamic_cast<StorageReplicatedMergeTree &>(
             *replicated_tables
-                [(*col_database)[i].safeGet<const String &>()]
-                [(*col_table)[i].safeGet<const String &>()]).getStatus(statuses[i], with_zk_fields);
+                [(*col_database)[my_i].safeGet<const String &>()]
+                [(*col_table)[my_i].safeGet<const String &>()]).getStatus(statuses[my_i], with_zk_fields);
         });
     }
 
@@ -184,6 +195,7 @@ Pipe StorageSystemReplicas::read(
         res_columns[col_num++]->insert(status.is_session_expired);
         res_columns[col_num++]->insert(status.queue.future_parts);
         res_columns[col_num++]->insert(status.parts_to_check);
+        res_columns[col_num++]->insert(status.zookeeper_name);
         res_columns[col_num++]->insert(status.zookeeper_path);
         res_columns[col_num++]->insert(status.replica_name);
         res_columns[col_num++]->insert(status.replica_path);
@@ -205,6 +217,7 @@ Pipe StorageSystemReplicas::read(
         res_columns[col_num++]->insert(status.absolute_delay);
         res_columns[col_num++]->insert(status.total_replicas);
         res_columns[col_num++]->insert(status.active_replicas);
+        res_columns[col_num++]->insert(status.lost_part_count);
         res_columns[col_num++]->insert(status.last_queue_update_exception);
         res_columns[col_num++]->insert(status.zookeeper_exception);
 
diff --git a/src/Storages/System/StorageSystemSettings.cpp b/src/Storages/System/StorageSystemSettings.cpp
index e13f6c308c4..c54f7eef25f 100644
--- a/src/Storages/System/StorageSystemSettings.cpp
+++ b/src/Storages/System/StorageSystemSettings.cpp
@@ -24,10 +24,6 @@ NamesAndTypesList StorageSystemSettings::getNamesAndTypes()
     };
 }
 
-#ifndef __clang__
-#pragma GCC optimize("-fno-var-tracking-assignments")
-#endif
-
 void StorageSystemSettings::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     const Settings & settings = context->getSettingsRef();
diff --git a/src/Storages/System/StorageSystemSettingsProfileElements.cpp b/src/Storages/System/StorageSystemSettingsProfileElements.cpp
index 6785a4392e1..e01d3cb0ace 100644
--- a/src/Storages/System/StorageSystemSettingsProfileElements.cpp
+++ b/src/Storages/System/StorageSystemSettingsProfileElements.cpp
@@ -87,27 +87,27 @@ void StorageSystemSettingsProfileElements::fillData(MutableColumns & res_columns
         size_t current_index = index++;
 
         bool inserted_value = false;
-        if (!element.value.isNull() && !element.setting_name.empty())
+        if (element.value && !element.setting_name.empty())
         {
-            String str = Settings::valueToStringUtil(element.setting_name, element.value);
+            String str = Settings::valueToStringUtil(element.setting_name, *element.value);
             column_value.insertData(str.data(), str.length());
             column_value_null_map.push_back(false);
             inserted_value = true;
         }
 
         bool inserted_min = false;
-        if (!element.min_value.isNull() && !element.setting_name.empty())
+        if (element.min_value && !element.setting_name.empty())
         {
-            String str = Settings::valueToStringUtil(element.setting_name, element.min_value);
+            String str = Settings::valueToStringUtil(element.setting_name, *element.min_value);
             column_min.insertData(str.data(), str.length());
             column_min_null_map.push_back(false);
             inserted_min = true;
         }
 
         bool inserted_max = false;
-        if (!element.max_value.isNull() && !element.setting_name.empty())
+        if (element.max_value && !element.setting_name.empty())
         {
-            String str = Settings::valueToStringUtil(element.setting_name, element.max_value);
+            String str = Settings::valueToStringUtil(element.setting_name, *element.max_value);
             column_max.insertData(str.data(), str.length());
             column_max_null_map.push_back(false);
             inserted_max = true;
diff --git a/src/Storages/System/StorageSystemStackTrace.cpp b/src/Storages/System/StorageSystemStackTrace.cpp
index da3d6b98dc5..887d7f2a5d4 100644
--- a/src/Storages/System/StorageSystemStackTrace.cpp
+++ b/src/Storages/System/StorageSystemStackTrace.cpp
@@ -22,6 +22,7 @@
 #include <Common/CurrentThread.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/logger_useful.h>
+#include <Interpreters/Context.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <QueryPipeline/Pipe.h>
 #include <base/getThreadId.h>
@@ -90,7 +91,7 @@ namespace
         const ucontext_t signal_context = *reinterpret_cast<ucontext_t *>(context);
         stack_trace = StackTrace(signal_context);
 
-        std::string_view query_id = CurrentThread::getQueryId();
+        auto query_id = CurrentThread::getQueryId();
         query_id_size = std::min(query_id.size(), max_query_id_size);
         if (!query_id.empty())
             memcpy(query_id_data, query_id.data(), query_id_size);
@@ -262,6 +263,9 @@ Pipe StorageSystemStackTrace::read(
 {
     storage_snapshot->check(column_names);
 
+    int pipe_read_timeout_ms = static_cast<int>(
+        context->getSettingsRef().storage_system_stack_trace_pipe_read_timeout_ms.totalMilliseconds());
+
     /// It shouldn't be possible to do concurrent reads from this table.
     std::lock_guard lock(mutex);
 
@@ -334,7 +338,7 @@ Pipe StorageSystemStackTrace::read(
             }
 
             /// Just in case we will wait for pipe with timeout. In case signal didn't get processed.
-            if (send_signal && wait(100) && sig_value.sival_int == data_ready_num.load(std::memory_order_acquire))
+            if (send_signal && wait(pipe_read_timeout_ms) && sig_value.sival_int == data_ready_num.load(std::memory_order_acquire))
             {
                 size_t stack_trace_size = stack_trace.getSize();
                 size_t stack_trace_offset = stack_trace.getOffset();
diff --git a/src/Storages/System/StorageSystemStoragePolicies.cpp b/src/Storages/System/StorageSystemStoragePolicies.cpp
index b42bd7859dd..39e99884e1d 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.cpp
+++ b/src/Storages/System/StorageSystemStoragePolicies.cpp
@@ -3,6 +3,7 @@
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnNullable.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Interpreters/Context.h>
@@ -17,6 +18,18 @@ namespace ErrorCodes
 {
 }
 
+namespace
+{
+    template <typename Type>
+    DataTypeEnum8::Values getTypeEnumValues()
+    {
+        DataTypeEnum8::Values enum_values;
+        for (auto value : magic_enum::enum_values<Type>())
+            enum_values.emplace_back(magic_enum::enum_name(value), magic_enum::enum_integer(value));
+        return enum_values;
+    }
+}
+
 
 StorageSystemStoragePolicies::StorageSystemStoragePolicies(const StorageID & table_id_)
         : IStorage(table_id_)
@@ -28,10 +41,12 @@ StorageSystemStoragePolicies::StorageSystemStoragePolicies(const StorageID & tab
              {"volume_name", std::make_shared<DataTypeString>()},
              {"volume_priority", std::make_shared<DataTypeUInt64>()},
              {"disks", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-             {"volume_type", std::make_shared<DataTypeString>()},
+             {"volume_type", std::make_shared<DataTypeEnum8>(getTypeEnumValues<VolumeType>())},
              {"max_data_part_size", std::make_shared<DataTypeUInt64>()},
              {"move_factor", std::make_shared<DataTypeFloat32>()},
-             {"prefer_not_to_merge", std::make_shared<DataTypeUInt8>()}
+             {"prefer_not_to_merge", std::make_shared<DataTypeUInt8>()},
+             {"perform_ttl_move_on_insert", std::make_shared<DataTypeUInt8>()},
+             {"load_balancing", std::make_shared<DataTypeEnum8>(getTypeEnumValues<VolumeLoadBalancing>())}
     }));
     // TODO: Add string column with custom volume-type-specific options
     setInMemoryMetadata(storage_metadata);
@@ -52,10 +67,12 @@ Pipe StorageSystemStoragePolicies::read(
     MutableColumnPtr col_volume_name = ColumnString::create();
     MutableColumnPtr col_priority = ColumnUInt64::create();
     MutableColumnPtr col_disks = ColumnArray::create(ColumnString::create());
-    MutableColumnPtr col_volume_type = ColumnString::create();
+    MutableColumnPtr col_volume_type = ColumnInt8::create();
     MutableColumnPtr col_max_part_size = ColumnUInt64::create();
     MutableColumnPtr col_move_factor = ColumnFloat32::create();
     MutableColumnPtr col_prefer_not_to_merge = ColumnUInt8::create();
+    MutableColumnPtr col_perform_ttl_move_on_insert = ColumnUInt8::create();
+    MutableColumnPtr col_load_balancing = ColumnInt8::create();
 
     for (const auto & [policy_name, policy_ptr] : context->getPoliciesMap())
     {
@@ -70,10 +87,12 @@ Pipe StorageSystemStoragePolicies::read(
             for (const auto & disk_ptr : volumes[i]->getDisks())
                 disks.push_back(disk_ptr->getName());
             col_disks->insert(disks);
-            col_volume_type->insert(magic_enum::enum_name(volumes[i]->getType()));
+            col_volume_type->insert(static_cast<Int8>(volumes[i]->getType()));
             col_max_part_size->insert(volumes[i]->max_data_part_size);
             col_move_factor->insert(policy_ptr->getMoveFactor());
             col_prefer_not_to_merge->insert(volumes[i]->areMergesAvoided() ? 1 : 0);
+            col_perform_ttl_move_on_insert->insert(volumes[i]->perform_ttl_move_on_insert);
+            col_load_balancing->insert(static_cast<Int8>(volumes[i]->load_balancing));
         }
     }
 
@@ -86,6 +105,8 @@ Pipe StorageSystemStoragePolicies::read(
     res_columns.emplace_back(std::move(col_max_part_size));
     res_columns.emplace_back(std::move(col_move_factor));
     res_columns.emplace_back(std::move(col_prefer_not_to_merge));
+    res_columns.emplace_back(std::move(col_perform_ttl_move_on_insert));
+    res_columns.emplace_back(std::move(col_load_balancing));
 
     UInt64 num_rows = res_columns.at(0)->size();
     Chunk chunk(std::move(res_columns), num_rows);
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
index e94d3710a64..e00d2d95568 100644
--- a/src/Storages/System/StorageSystemTables.cpp
+++ b/src/Storages/System/StorageSystemTables.cpp
@@ -9,6 +9,7 @@
 #include <Databases/IDatabase.h>
 #include <Access/ContextAccess.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/formatWithPossiblyHidingSecrets.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Common/typeid_cast.h>
@@ -220,7 +221,7 @@ protected:
                         {
                             auto temp_db = DatabaseCatalog::instance().getDatabaseForTemporaryTables();
                             ASTPtr ast = temp_db ? temp_db->tryGetCreateTableQuery(table.second->getStorageID().getTableName(), context) : nullptr;
-                            res_columns[res_index++]->insert(ast ? ast->formatWithSecretsHidden() : "");
+                            res_columns[res_index++]->insert(ast ? format({context, *ast}) : "");
                         }
 
                         // engine_full
@@ -366,7 +367,7 @@ protected:
                     }
 
                     if (columns_mask[src_index++])
-                        res_columns[res_index++]->insert(ast ? ast->formatWithSecretsHidden() : "");
+                        res_columns[res_index++]->insert(ast ? format({context, *ast}) : "");
 
                     if (columns_mask[src_index++])
                     {
@@ -374,7 +375,7 @@ protected:
 
                         if (ast_create && ast_create->storage)
                         {
-                            engine_full = ast_create->storage->formatWithSecretsHidden();
+                            engine_full = format({context, *ast_create->storage});
 
                             static const char * const extra_head = " ENGINE = ";
                             if (startsWith(engine_full, extra_head))
@@ -388,7 +389,7 @@ protected:
                     {
                         String as_select;
                         if (ast_create && ast_create->select)
-                            as_select = ast_create->select->formatWithSecretsHidden();
+                            as_select = format({context, *ast_create->select});
                         res_columns[res_index++]->insert(as_select);
                     }
                 }
@@ -401,7 +402,7 @@ protected:
                 if (columns_mask[src_index++])
                 {
                     if (metadata_snapshot && (expression_ptr = metadata_snapshot->getPartitionKeyAST()))
-                        res_columns[res_index++]->insert(expression_ptr->formatWithSecretsHidden());
+                        res_columns[res_index++]->insert(format({context, *expression_ptr}));
                     else
                         res_columns[res_index++]->insertDefault();
                 }
@@ -409,7 +410,7 @@ protected:
                 if (columns_mask[src_index++])
                 {
                     if (metadata_snapshot && (expression_ptr = metadata_snapshot->getSortingKey().expression_list_ast))
-                        res_columns[res_index++]->insert(expression_ptr->formatWithSecretsHidden());
+                        res_columns[res_index++]->insert(format({context, *expression_ptr}));
                     else
                         res_columns[res_index++]->insertDefault();
                 }
@@ -417,7 +418,7 @@ protected:
                 if (columns_mask[src_index++])
                 {
                     if (metadata_snapshot && (expression_ptr = metadata_snapshot->getPrimaryKey().expression_list_ast))
-                        res_columns[res_index++]->insert(expression_ptr->formatWithSecretsHidden());
+                        res_columns[res_index++]->insert(format({context, *expression_ptr}));
                     else
                         res_columns[res_index++]->insertDefault();
                 }
@@ -425,7 +426,7 @@ protected:
                 if (columns_mask[src_index++])
                 {
                     if (metadata_snapshot && (expression_ptr = metadata_snapshot->getSamplingKeyAST()))
-                        res_columns[res_index++]->insert(expression_ptr->formatWithSecretsHidden());
+                        res_columns[res_index++]->insert(format({context, *expression_ptr}));
                     else
                         res_columns[res_index++]->insertDefault();
                 }
diff --git a/src/Storages/System/StorageSystemZeros.h b/src/Storages/System/StorageSystemZeros.h
index 64443a3cfd6..84b4b752aae 100644
--- a/src/Storages/System/StorageSystemZeros.h
+++ b/src/Storages/System/StorageSystemZeros.h
@@ -31,6 +31,8 @@ public:
         size_t max_block_size,
         size_t num_streams) override;
 
+    bool parallelizeOutputAfterReading(ContextPtr) const override { return false; }
+
     bool hasEvenlyDistributedRead() const override { return true; }
     bool isSystemStorage() const override { return true; }
     bool supportsTransactions() const override { return true; }
diff --git a/src/Storages/System/StorageSystemZooKeeper.cpp b/src/Storages/System/StorageSystemZooKeeper.cpp
index 9663c76a5c3..6ca74406b17 100644
--- a/src/Storages/System/StorageSystemZooKeeper.cpp
+++ b/src/Storages/System/StorageSystemZooKeeper.cpp
@@ -12,11 +12,17 @@
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/typeid_cast.h>
+#include <Columns/ColumnSet.h>
+#include <Columns/ColumnConst.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Functions/IFunction.h>
 #include <Parsers/ASTSubquery.h>
 #include <Interpreters/Set.h>
 #include <Interpreters/interpretSubquery.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Processors/Sinks/SinkToStorage.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
@@ -155,8 +161,24 @@ public:
     }
 };
 
+class ReadFromSystemZooKeeper final : public SourceStepWithFilter
+{
+public:
+    ReadFromSystemZooKeeper(const Block & header, SelectQueryInfo & query_info_, ContextPtr context_);
+
+    String getName() const override { return "ReadFromSystemZooKeeper"; }
+
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) override;
+
+private:
+    void fillData(MutableColumns & res_columns) const;
+
+    std::shared_ptr<const StorageLimitsList> storage_limits;
+    ContextPtr context;
+};
+
 StorageSystemZooKeeper::StorageSystemZooKeeper(const StorageID & table_id_)
-        : IStorageSystemOneBlock<StorageSystemZooKeeper>(table_id_)
+        : IStorage(table_id_)
 {
         StorageInMemoryMetadata storage_metadata;
         ColumnsDescription desc;
@@ -173,6 +195,26 @@ StorageSystemZooKeeper::StorageSystemZooKeeper(const StorageID & table_id_)
         setInMemoryMetadata(storage_metadata);
 }
 
+bool StorageSystemZooKeeper::mayBenefitFromIndexForIn(const ASTPtr & node, ContextPtr, const StorageMetadataPtr &) const
+{
+    return node->as<ASTIdentifier>() && node->getColumnName() == "path";
+}
+
+void StorageSystemZooKeeper::read(
+    QueryPlan & query_plan,
+    const Names & /*column_names*/,
+    const StorageSnapshotPtr & storage_snapshot,
+    SelectQueryInfo & query_info,
+    ContextPtr context,
+    QueryProcessingStage::Enum /*processed_stage*/,
+    size_t /*max_block_size*/,
+    size_t /*num_streams*/)
+{
+    auto header = storage_snapshot->metadata->getSampleBlockWithVirtuals(getVirtuals());
+    auto read_step = std::make_unique<ReadFromSystemZooKeeper>(header, query_info, context);
+    query_plan.addStep(std::move(read_step));
+}
+
 SinkToStoragePtr StorageSystemZooKeeper::write(const ASTPtr &, const StorageMetadataPtr &, ContextPtr context)
 {
     if (!context->getConfigRef().getBool("allow_zookeeper_write", false))
@@ -229,125 +271,102 @@ static String pathCorrected(const String & path)
     return path_corrected;
 }
 
-
-static bool extractPathImpl(const IAST & elem, Paths & res, ContextPtr context, bool allow_unrestricted)
+static bool isPathNode(const ActionsDAG::Node * node)
 {
-    const auto * function = elem.as<ASTFunction>();
-    if (!function)
-        return false;
+    while (node->type == ActionsDAG::ActionType::ALIAS)
+        node = node->children.at(0);
 
-    if (function->name == "and")
+    return node->result_name == "path";
+}
+
+static void extractPathImpl(const ActionsDAG::Node & node, Paths & res, ContextPtr context, bool allow_unrestricted)
+{
+    if (node.type != ActionsDAG::ActionType::FUNCTION)
+        return;
+
+    auto function_name = node.function_base->getName();
+    if (function_name == "and")
     {
-        for (const auto & child : function->arguments->children)
-            if (extractPathImpl(*child, res, context, allow_unrestricted))
-                return true;
+        for (const auto * child : node.children)
+            extractPathImpl(*child, res, context, allow_unrestricted);
 
-        return false;
+        return;
     }
 
-    const auto & args = function->arguments->as<ASTExpressionList &>();
-    if (args.children.size() != 2)
-        return false;
+    if (node.children.size() != 2)
+        return;
 
-    if (function->name == "in")
+    if (function_name == "in")
     {
-        const ASTIdentifier * ident = args.children.at(0)->as<ASTIdentifier>();
-        if (!ident || ident->name() != "path")
-            return false;
+        if (!isPathNode(node.children.at(0)))
+            return;
 
-        ASTPtr value = args.children.at(1);
+        auto value = node.children.at(1)->column;
+        if (!value)
+            return;
 
-        if (value->as<ASTSubquery>())
-        {
-            auto interpreter_subquery = interpretSubquery(value, context, {}, {});
-            auto pipeline = interpreter_subquery->execute().pipeline;
-            SizeLimits limites(context->getSettingsRef().max_rows_in_set, context->getSettingsRef().max_bytes_in_set, OverflowMode::THROW);
-            Set set(limites, true, context->getSettingsRef().transform_null_in);
-            set.setHeader(pipeline.getHeader().getColumnsWithTypeAndName());
+        const IColumn * column = value.get();
+        if (const auto * column_const = typeid_cast<const ColumnConst *>(column))
+            column = &column_const->getDataColumn();
 
-            PullingPipelineExecutor executor(pipeline);
-            Block block;
-            while (executor.pull(block))
-            {
-                set.insertFromBlock(block.getColumnsWithTypeAndName());
-            }
-            set.finishInsert();
+        const ColumnSet * column_set = typeid_cast<const ColumnSet *>(column);
+        if (!column_set)
+            return;
 
-            set.checkColumnsNumber(1);
-            const auto & set_column = *set.getSetElements()[0];
-            for (size_t row = 0; row < set_column.size(); ++row)
-                res.emplace_back(set_column[row].safeGet<String>(), ZkPathType::Exact);
-        }
-        else
-        {
-            auto evaluated = evaluateConstantExpressionAsLiteral(value, context);
-            const auto * literal = evaluated->as<ASTLiteral>();
-            if (!literal)
-                return false;
+        auto set = column_set->getData();
+        if (!set || !set->isCreated())
+            return;
 
-            if (String str; literal->value.tryGet(str))
-            {
-                res.emplace_back(str, ZkPathType::Exact);
-            }
-            else if (Tuple tuple; literal->value.tryGet(tuple))
-            {
-                for (auto element : tuple)
-                    res.emplace_back(element.safeGet<String>(), ZkPathType::Exact);
-            }
-            else
-                return false;
-        }
+        if (!set->hasExplicitSetElements())
+            return;
 
-        return true;
+        set->checkColumnsNumber(1);
+        auto type = set->getElementsTypes()[0];
+        if (!isString(removeNullable(removeLowCardinality(type))))
+            return;
+
+        auto values = set->getSetElements()[0];
+        size_t size = values->size();
+
+        for (size_t row = 0; row < size; ++row)
+            res.emplace_back(values->getDataAt(row).toString(), ZkPathType::Exact);
     }
-    else if (function->name == "equals")
+    else if (function_name == "equals")
     {
-        const ASTIdentifier * ident;
-        ASTPtr value;
-        if ((ident = args.children.at(0)->as<ASTIdentifier>()))
-            value = args.children.at(1);
-        else if ((ident = args.children.at(1)->as<ASTIdentifier>()))
-            value = args.children.at(0);
-        else
-            return false;
+        const ActionsDAG::Node * value = nullptr;
 
-        if (ident->name() != "path")
-            return false;
+        if (isPathNode(node.children.at(0)))
+            value = node.children.at(1);
+        else if (isPathNode(node.children.at(1)))
+            value = node.children.at(0);
 
-        auto evaluated = evaluateConstantExpressionAsLiteral(value, context);
-        const auto * literal = evaluated->as<ASTLiteral>();
-        if (!literal)
-            return false;
+        if (!value || !value->column)
+            return;
 
-        if (literal->value.getType() != Field::Types::String)
-            return false;
+        if (!isString(removeNullable(removeLowCardinality(value->result_type))))
+            return;
 
-        res.emplace_back(literal->value.safeGet<String>(), ZkPathType::Exact);
-        return true;
+        if (value->column->size() != 1)
+            return;
+
+        res.emplace_back(value->column->getDataAt(0).toString(), ZkPathType::Exact);
     }
-    else if (allow_unrestricted && function->name == "like")
+    else if (allow_unrestricted && function_name == "like")
     {
-        const ASTIdentifier * ident;
-        ASTPtr value;
-        if ((ident = args.children.at(0)->as<ASTIdentifier>()))
-            value = args.children.at(1);
-        else if ((ident = args.children.at(1)->as<ASTIdentifier>()))
-            value = args.children.at(0);
-        else
-            return false;
+        if (!isPathNode(node.children.at(0)))
+            return;
 
-        if (ident->name() != "path")
-            return false;
+        const auto * value = node.children.at(1);
+        if (!value->column)
+            return;
 
-        auto evaluated = evaluateConstantExpressionAsLiteral(value, context);
-        const auto * literal = evaluated->as<ASTLiteral>();
-        if (!literal)
-            return false;
+        if (!isString(removeNullable(removeLowCardinality(value->result_type))))
+            return;
 
-        if (literal->value.getType() != Field::Types::String)
-            return false;
+        if (value->column->size() != 1)
+            return;
 
-        String pattern = literal->value.safeGet<String>();
+        String pattern = value->column->getDataAt(0).toString();
         bool has_metasymbol = false;
         String prefix; // pattern prefix before the first metasymbol occurrence
         for (size_t i = 0; i < pattern.size(); i++)
@@ -376,30 +395,28 @@ static bool extractPathImpl(const IAST & elem, Paths & res, ContextPtr context,
         }
 
         res.emplace_back(prefix, has_metasymbol ? ZkPathType::Prefix : ZkPathType::Exact);
-
-        return true;
     }
-
-    return false;
 }
 
 
 /** Retrieve from the query a condition of the form `path = 'path'`, from conjunctions in the WHERE clause.
   */
-static Paths extractPath(const ASTPtr & query, ContextPtr context, bool allow_unrestricted)
+static Paths extractPath(const ActionsDAG::NodeRawConstPtrs & filter_nodes, ContextPtr context, bool allow_unrestricted)
 {
-    const auto & select = query->as<ASTSelectQuery &>();
-    if (!select.where())
-        return allow_unrestricted ? Paths{{"/", ZkPathType::Recurse}} : Paths();
-
     Paths res;
-    return extractPathImpl(*select.where(), res, context, allow_unrestricted) ? res : Paths();
+    for (const auto * node : filter_nodes)
+        extractPathImpl(*node, res, context, allow_unrestricted);
+
+    if (filter_nodes.empty() && allow_unrestricted)
+        res.emplace_back("/", ZkPathType::Recurse);
+
+    return res;
 }
 
 
-void StorageSystemZooKeeper::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
+void ReadFromSystemZooKeeper::fillData(MutableColumns & res_columns) const
 {
-    Paths paths = extractPath(query_info.query, context, context->getSettingsRef().allow_unrestricted_reads_from_keeper);
+    Paths paths = extractPath(getFilterNodes().nodes, context, context->getSettingsRef().allow_unrestricted_reads_from_keeper);
 
     zkutil::ZooKeeperPtr zookeeper = context->getZooKeeper();
 
@@ -486,5 +503,26 @@ void StorageSystemZooKeeper::fillData(MutableColumns & res_columns, ContextPtr c
     }
 }
 
+ReadFromSystemZooKeeper::ReadFromSystemZooKeeper(const Block & header, SelectQueryInfo & query_info, ContextPtr context_)
+    : SourceStepWithFilter({.header = header})
+    , storage_limits(query_info.storage_limits)
+    , context(std::move(context_))
+{
+}
+
+void ReadFromSystemZooKeeper::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    const auto & header = getOutputStream().header;
+    MutableColumns res_columns = header.cloneEmptyColumns();
+    fillData(res_columns);
+
+    UInt64 num_rows = res_columns.at(0)->size();
+    Chunk chunk(std::move(res_columns), num_rows);
+
+    auto source = std::make_shared<SourceFromSingleChunk>(header, std::move(chunk));
+    source->setStorageLimits(storage_limits);
+    processors.emplace_back(source);
+    pipeline.init(Pipe(std::move(source)));
+}
 
 }
diff --git a/src/Storages/System/StorageSystemZooKeeper.h b/src/Storages/System/StorageSystemZooKeeper.h
index 20ad29af481..c8988d787a0 100644
--- a/src/Storages/System/StorageSystemZooKeeper.h
+++ b/src/Storages/System/StorageSystemZooKeeper.h
@@ -11,7 +11,7 @@ class Context;
 
 /** Implements `zookeeper` system table, which allows you to view the data in ZooKeeper for debugging purposes.
   */
-class StorageSystemZooKeeper final : public IStorageSystemOneBlock<StorageSystemZooKeeper>
+class StorageSystemZooKeeper final : public IStorage
 {
 public:
     explicit StorageSystemZooKeeper(const StorageID & table_id_);
@@ -22,10 +22,19 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & /*query*/, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr /*context*/) override;
 
-protected:
-    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+    void read(
+        QueryPlan & query_plan,
+        const Names & /*column_names*/,
+        const StorageSnapshotPtr & storage_snapshot,
+        SelectQueryInfo & query_info,
+        ContextPtr context,
+        QueryProcessingStage::Enum /*processed_stage*/,
+        size_t /*max_block_size*/,
+        size_t /*num_streams*/) override;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    bool isSystemStorage() const override { return true; }
+    bool supportsIndexForIn() const override { return true; }
+    bool mayBenefitFromIndexForIn(const ASTPtr & node, ContextPtr, const StorageMetadataPtr &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemZooKeeperConnection.cpp b/src/Storages/System/StorageSystemZooKeeperConnection.cpp
new file mode 100644
index 00000000000..559e12ad5ee
--- /dev/null
+++ b/src/Storages/System/StorageSystemZooKeeperConnection.cpp
@@ -0,0 +1,51 @@
+#include <Interpreters/Context.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Storages/System/StorageSystemZooKeeperConnection.h>
+
+namespace DB
+{
+
+NamesAndTypesList StorageSystemZooKeeperConnection::getNamesAndTypes()
+{
+    return {
+        {"name", std::make_shared<DataTypeString>()},
+        {"host", std::make_shared<DataTypeString>()},
+        {"port", std::make_shared<DataTypeUInt16>()},
+        {"index", std::make_shared<DataTypeUInt8>()},
+        {"connected_time", std::make_shared<DataTypeDateTime>()},
+        {"is_expired", std::make_shared<DataTypeUInt8>()},
+        {"keeper_api_version", std::make_shared<DataTypeUInt8>()},
+        {"client_id", std::make_shared<DataTypeInt64>()}
+    };
+}
+
+void StorageSystemZooKeeperConnection::fillData(MutableColumns & res_columns, ContextPtr context,
+    const SelectQueryInfo &) const
+{
+    res_columns[0]->insert("default");
+    res_columns[1]->insert(context->getZooKeeper()->getConnectedZooKeeperHost());
+    res_columns[2]->insert(context->getZooKeeper()->getConnectedZooKeeperPort());
+    res_columns[3]->insert(context->getZooKeeper()->getConnectedZooKeeperIndex());
+    res_columns[4]->insert(context->getZooKeeperSessionUptime());
+    res_columns[5]->insert(context->getZooKeeper()->expired());
+    res_columns[6]->insert(context->getZooKeeper()->getApiVersion());
+    res_columns[7]->insert(context->getZooKeeper()->getClientID());
+
+    for (const auto & elem : context->getAuxiliaryZooKeepers())
+    {
+        res_columns[0]->insert(elem.first);
+        res_columns[1]->insert(elem.second->getConnectedZooKeeperHost());
+        res_columns[2]->insert(elem.second->getConnectedZooKeeperPort());
+        res_columns[3]->insert(elem.second->getConnectedZooKeeperIndex());
+        res_columns[4]->insert(elem.second->getSessionUptime());
+        res_columns[5]->insert(elem.second->expired());
+        res_columns[6]->insert(elem.second->getApiVersion());
+        res_columns[7]->insert(elem.second->getClientID());
+    }
+
+}
+
+}
diff --git a/src/Storages/System/StorageSystemZooKeeperConnection.h b/src/Storages/System/StorageSystemZooKeeperConnection.h
new file mode 100644
index 00000000000..dd4c293c112
--- /dev/null
+++ b/src/Storages/System/StorageSystemZooKeeperConnection.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Storages/System/IStorageSystemOneBlock.h>
+
+
+namespace DB
+{
+
+class Context;
+
+
+/** Implements `zookeeper_connection` system table, which allows you to get information about the connected zookeeper info.
+  */
+class StorageSystemZooKeeperConnection final : public IStorageSystemOneBlock<StorageSystemZooKeeperConnection>
+{
+public:
+    std::string getName() const override { return "SystemZooKeeperConnection"; }
+
+    static NamesAndTypesList getNamesAndTypes();
+
+protected:
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+};
+
+}
+
diff --git a/src/Storages/System/attachSystemTables.cpp b/src/Storages/System/attachSystemTables.cpp
index 61329ab834b..424c74662ec 100644
--- a/src/Storages/System/attachSystemTables.cpp
+++ b/src/Storages/System/attachSystemTables.cpp
@@ -79,6 +79,8 @@
 #include <Storages/System/StorageSystemRemoteDataPaths.h>
 #include <Storages/System/StorageSystemCertificates.h>
 #include <Storages/System/StorageSystemSchemaInferenceCache.h>
+#include <Storages/System/StorageSystemDroppedTables.h>
+#include <Storages/System/StorageSystemZooKeeperConnection.h>
 
 #ifdef OS_LINUX
 #include <Storages/System/StorageSystemStackTrace.h>
@@ -140,6 +142,7 @@ void attachSystemTablesLocal(ContextPtr context, IDatabase & system_database)
     attach<StorageSystemTimeZones>(context, system_database, "time_zones");
     attach<StorageSystemBackups>(context, system_database, "backups");
     attach<StorageSystemSchemaInferenceCache>(context, system_database, "schema_inference_cache");
+    attach<StorageSystemDroppedTables>(context, system_database, "dropped_tables");
 #ifdef OS_LINUX
     attach<StorageSystemStackTrace>(context, system_database, "stack_trace");
 #endif
@@ -184,7 +187,10 @@ void attachSystemTablesServer(ContextPtr context, IDatabase & system_database, b
     attach<StorageSystemNamedCollections>(context, system_database, "named_collections");
 
     if (has_zookeeper)
+    {
         attach<StorageSystemZooKeeper>(context, system_database, "zookeeper");
+        attach<StorageSystemZooKeeperConnection>(context, system_database, "zookeeper_connection");
+    }
 
     if (context->getConfigRef().getInt("allow_experimental_transactions", 0))
         attach<StorageSystemTransactions>(context, system_database, "transactions");
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
index 4ff00facfdc..c38a2b4ed42 100644
--- a/src/Storages/VirtualColumnUtils.cpp
+++ b/src/Storages/VirtualColumnUtils.cpp
@@ -162,7 +162,7 @@ bool prepareFilterBlockWithQuery(const ASTPtr & query, ContextPtr context, Block
         const ColumnNumbersList grouping_set_keys;
 
         ActionsVisitor::Data visitor_data(
-            context, SizeLimits{}, 1, source_columns, std::move(actions), prepared_sets, true, true, true, false,
+            context, SizeLimits{}, 1, source_columns, std::move(actions), prepared_sets, true, true, true,
             { aggregation_keys, grouping_set_keys, GroupByKind::NONE });
 
         ActionsVisitor(visitor_data).visit(node);
diff --git a/src/Storages/WindowView/StorageWindowView.cpp b/src/Storages/WindowView/StorageWindowView.cpp
index 3a74fd5fc75..94d5db170a8 100644
--- a/src/Storages/WindowView/StorageWindowView.cpp
+++ b/src/Storages/WindowView/StorageWindowView.cpp
@@ -78,6 +78,7 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
     extern const int TABLE_WAS_NOT_DROPPED;
     extern const int NOT_IMPLEMENTED;
+    extern const int UNSUPPORTED_METHOD;
 }
 
 namespace
@@ -188,6 +189,11 @@ namespace
 
     using ReplaceFunctionNowVisitor = InDepthNodeVisitor<OneTypeMatcher<ReplaceFunctionNowData>, true>;
 
+    inline UInt32 now()
+    {
+        return static_cast<UInt32>(Poco::Timestamp().epochMicroseconds() / 1000000);
+    }
+
     class ToIdentifierMatcher
     {
     public:
@@ -724,12 +730,12 @@ ASTPtr StorageWindowView::getSourceTableSelectQuery()
 
     if (!is_time_column_func_now)
     {
-        auto query = select_query->clone();
+        auto query_ = select_query->clone();
         DropTableIdentifierMatcher::Data drop_table_identifier_data;
-        DropTableIdentifierMatcher::Visitor(drop_table_identifier_data).visit(query);
+        DropTableIdentifierMatcher::Visitor(drop_table_identifier_data).visit(query_);
 
         WindowFunctionMatcher::Data query_info_data;
-        WindowFunctionMatcher::Visitor(query_info_data).visit(query);
+        WindowFunctionMatcher::Visitor(query_info_data).visit(query_);
 
         auto order_by = std::make_shared<ASTExpressionList>();
         auto order_by_elem = std::make_shared<ASTOrderByElement>();
@@ -748,12 +754,12 @@ ASTPtr StorageWindowView::getSourceTableSelectQuery()
     return select_with_union_query;
 }
 
-ASTPtr StorageWindowView::getInnerTableCreateQuery(const ASTPtr & inner_query, const StorageID & inner_table_id)
+ASTPtr StorageWindowView::getInnerTableCreateQuery(const ASTPtr & inner_query, const StorageID & inner_table_id_)
 {
     /// We will create a query to create an internal table.
     auto inner_create_query = std::make_shared<ASTCreateQuery>();
-    inner_create_query->setDatabase(inner_table_id.getDatabaseName());
-    inner_create_query->setTable(inner_table_id.getTableName());
+    inner_create_query->setDatabase(inner_table_id_.getDatabaseName());
+    inner_create_query->setTable(inner_table_id_.getTableName());
 
     Aliases aliases;
     QueryAliasesVisitor(aliases).visit(inner_query);
@@ -1019,7 +1025,7 @@ void StorageWindowView::threadFuncFireProc()
 
     std::lock_guard lock(fire_signal_mutex);
     /// TODO: consider using time_t instead (for every timestamp in this class)
-    UInt32 timestamp_now = static_cast<UInt32>(std::time(nullptr));
+    UInt32 timestamp_now = now();
 
     while (next_fire_signal <= timestamp_now)
     {
@@ -1158,6 +1164,10 @@ StorageWindowView::StorageWindowView(
     , fire_signal_timeout_s(context_->getSettingsRef().wait_for_window_view_fire_signal_timeout.totalSeconds())
     , clean_interval_usec(context_->getSettingsRef().window_view_clean_interval.totalMicroseconds())
 {
+    if (context_->getSettingsRef().allow_experimental_analyzer)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+            "Experimental WINDOW VIEW feature is not supported with new infrastructure for query analysis (the setting 'allow_experimental_analyzer')");
+
     if (!query.select)
         throw Exception(ErrorCodes::INCORRECT_QUERY, "SELECT query is not specified for {}", getName());
 
@@ -1190,7 +1200,7 @@ StorageWindowView::StorageWindowView(
     target_table_id = has_inner_target_table ? StorageID(table_id_.database_name, generateTargetTableName(table_id_)) : query.to_table_id;
 
     if (is_proctime)
-        next_fire_signal = getWindowUpperBound(static_cast<UInt32>(std::time(nullptr)));
+        next_fire_signal = getWindowUpperBound(now());
 
     std::exchange(has_inner_table, true);
     if (!attach_)
@@ -1203,7 +1213,7 @@ StorageWindowView::StorageWindowView(
         if (has_inner_target_table)
         {
             /// create inner target table
-            auto create_context = Context::createCopy(context_);
+            auto create_context_ = Context::createCopy(context_);
             auto target_create_query = std::make_shared<ASTCreateQuery>();
             target_create_query->setDatabase(table_id_.database_name);
             target_create_query->setTable(generateTargetTableName(table_id_));
@@ -1214,9 +1224,9 @@ StorageWindowView::StorageWindowView(
             target_create_query->set(target_create_query->columns_list, new_columns_list);
             target_create_query->set(target_create_query->storage, query.storage->ptr());
 
-            InterpreterCreateQuery create_interpreter(target_create_query, create_context);
-            create_interpreter.setInternal(true);
-            create_interpreter.execute();
+            InterpreterCreateQuery create_interpreter_(target_create_query, create_context_);
+            create_interpreter_.setInternal(true);
+            create_interpreter_.execute();
         }
     }
 
@@ -1459,7 +1469,7 @@ void StorageWindowView::writeIntoWindowView(
                 column.type = std::make_shared<DataTypeDateTime>();
             else
                 column.type = std::make_shared<DataTypeDateTime>(timezone);
-            column.column = column.type->createColumnConst(0, Field(std::time(nullptr)));
+            column.column = column.type->createColumnConst(0, Field(now()));
 
             auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
             auto adding_column_actions = std::make_shared<ExpressionActions>(
@@ -1604,7 +1614,7 @@ void StorageWindowView::drop()
 {
     /// Must be guaranteed at this point for database engine Atomic that has_inner_table == false,
     /// because otherwise will be a deadlock.
-    dropInnerTableIfAny(true, getContext());
+    dropInnerTableIfAny(false, getContext());
 }
 
 void StorageWindowView::dropInnerTableIfAny(bool sync, ContextPtr local_context)
@@ -1618,7 +1628,7 @@ void StorageWindowView::dropInnerTableIfAny(bool sync, ContextPtr local_context)
             ASTDropQuery::Kind::Drop, getContext(), local_context, inner_table_id, sync);
 
         if (has_inner_target_table)
-            InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), local_context, target_table_id, sync);
+            InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), local_context, target_table_id, sync, /* ignore_sync_setting */ true);
     }
     catch (...)
     {
diff --git a/src/Storages/addColumnsStructureToQueryWithClusterEngine.cpp b/src/Storages/addColumnsStructureToQueryWithClusterEngine.cpp
deleted file mode 100644
index 75c5bebb901..00000000000
--- a/src/Storages/addColumnsStructureToQueryWithClusterEngine.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <Storages/addColumnsStructureToQueryWithClusterEngine.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/queryToString.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-static ASTExpressionList * extractTableFunctionArgumentsFromSelectQuery(ASTPtr & query)
-{
-    auto * select_query = query->as<ASTSelectQuery>();
-    if (!select_query || !select_query->tables())
-        return nullptr;
-
-    auto * tables = select_query->tables()->as<ASTTablesInSelectQuery>();
-    auto * table_expression = tables->children[0]->as<ASTTablesInSelectQueryElement>()->table_expression->as<ASTTableExpression>();
-    if (!table_expression->table_function)
-        return nullptr;
-
-    auto * table_function = table_expression->table_function->as<ASTFunction>();
-    return table_function->arguments->as<ASTExpressionList>();
-}
-
-void addColumnsStructureToQueryWithClusterEngine(ASTPtr & query, const String & structure, size_t max_arguments, const String & function_name)
-{
-    ASTExpressionList * expression_list = extractTableFunctionArgumentsFromSelectQuery(query);
-    if (!expression_list)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected SELECT query from table function {}, got '{}'", function_name, queryToString(query));
-    auto structure_literal = std::make_shared<ASTLiteral>(structure);
-
-    if (expression_list->children.size() < 2 || expression_list->children.size() > max_arguments)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected 2 to {} arguments in {} table functions, got {}",
-                        function_name, max_arguments, expression_list->children.size());
-
-    if (expression_list->children.size() == 2 || expression_list->children.size() == max_arguments - 1)
-    {
-        auto format_literal = std::make_shared<ASTLiteral>("auto");
-        expression_list->children.push_back(format_literal);
-    }
-
-    expression_list->children.push_back(structure_literal);
-}
-
-}
diff --git a/src/Storages/addColumnsStructureToQueryWithClusterEngine.h b/src/Storages/addColumnsStructureToQueryWithClusterEngine.h
deleted file mode 100644
index f39f3a31630..00000000000
--- a/src/Storages/addColumnsStructureToQueryWithClusterEngine.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include <Parsers/IAST.h>
-
-namespace DB
-{
-
-/// Add structure argument for queries with s3Cluster/hdfsCluster table function.
-void addColumnsStructureToQueryWithClusterEngine(ASTPtr & query, const String & structure, size_t max_arguments, const String & function_name);
-
-}
diff --git a/src/Storages/examples/async_read_buffer_from_hdfs.cpp b/src/Storages/examples/async_read_buffer_from_hdfs.cpp
index 17aa5479de5..4f6aed8ef65 100644
--- a/src/Storages/examples/async_read_buffer_from_hdfs.cpp
+++ b/src/Storages/examples/async_read_buffer_from_hdfs.cpp
@@ -6,6 +6,7 @@
 #include <IO/copyData.h>
 #include <IO/WriteBufferFromString.h>
 #include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Disks/IO/getThreadPoolReader.h>
 #include <Interpreters/Context.h>
 #include <Common/Config/ConfigProcessor.h>
 #include <Storages/HDFS/AsynchronousReadBufferFromHDFS.h>
@@ -25,7 +26,7 @@ int main()
     String path = "/path/to/hdfs/file";
     ReadSettings settings = {};
     auto in = std::make_unique<ReadBufferFromHDFS>(hdfs_namenode_url, path, *config, settings);
-    auto & reader = IObjectStorage::getThreadPoolReader();
+    auto & reader = getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
     AsynchronousReadBufferFromHDFS buf(reader, {}, std::move(in));
 
     String output;
diff --git a/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp b/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
index e2145f5afb0..9e2b2a83b98 100644
--- a/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
+++ b/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
@@ -26,7 +26,7 @@ try
     auto config = processor.loadConfig().configuration;
     String root_path = argv[2];
 
-    zkutil::ZooKeeper zk(*config, "zookeeper", nullptr);
+    zkutil::ZooKeeper zk(*config, zkutil::getZooKeeperConfigName(*config), nullptr);
 
     String temp_path = root_path + "/temp";
     String blocks_path = root_path + "/block_numbers";
diff --git a/src/Storages/examples/get_current_inserts_in_replicated.cpp b/src/Storages/examples/get_current_inserts_in_replicated.cpp
index 0d04cbd260e..d77b0f5177d 100644
--- a/src/Storages/examples/get_current_inserts_in_replicated.cpp
+++ b/src/Storages/examples/get_current_inserts_in_replicated.cpp
@@ -29,7 +29,7 @@ try
     auto config = processor.loadConfig().configuration;
     String zookeeper_path = argv[2];
 
-    auto zookeeper = std::make_shared<zkutil::ZooKeeper>(*config, "zookeeper", nullptr);
+    auto zookeeper = std::make_shared<zkutil::ZooKeeper>(*config, zkutil::getZooKeeperConfigName(*config), nullptr);
 
     std::unordered_map<String, std::set<Int64>> current_inserts;
 
diff --git a/src/Storages/extractTableFunctionArgumentsFromSelectQuery.cpp b/src/Storages/extractTableFunctionArgumentsFromSelectQuery.cpp
new file mode 100644
index 00000000000..382964d9fe1
--- /dev/null
+++ b/src/Storages/extractTableFunctionArgumentsFromSelectQuery.cpp
@@ -0,0 +1,29 @@
+#include <Storages/extractTableFunctionArgumentsFromSelectQuery.h>
+
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/queryToString.h>
+
+
+namespace DB
+{
+
+ASTExpressionList * extractTableFunctionArgumentsFromSelectQuery(ASTPtr & query)
+{
+    auto * select_query = query->as<ASTSelectQuery>();
+    if (!select_query || !select_query->tables())
+        return nullptr;
+
+    auto * tables = select_query->tables()->as<ASTTablesInSelectQuery>();
+    auto * table_expression = tables->children[0]->as<ASTTablesInSelectQueryElement>()->table_expression->as<ASTTableExpression>();
+    if (!table_expression->table_function)
+        return nullptr;
+
+    auto * table_function = table_expression->table_function->as<ASTFunction>();
+    return table_function->arguments->as<ASTExpressionList>();
+}
+
+}
diff --git a/src/Storages/extractTableFunctionArgumentsFromSelectQuery.h b/src/Storages/extractTableFunctionArgumentsFromSelectQuery.h
new file mode 100644
index 00000000000..8bf5d95a42c
--- /dev/null
+++ b/src/Storages/extractTableFunctionArgumentsFromSelectQuery.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <Parsers/IAST.h>
+#include <Parsers/ASTExpressionList.h>
+
+namespace DB
+{
+
+ASTExpressionList * extractTableFunctionArgumentsFromSelectQuery(ASTPtr & query);
+
+}
diff --git a/src/Storages/registerStorages.cpp b/src/Storages/registerStorages.cpp
index e690189c365..8be176a5375 100644
--- a/src/Storages/registerStorages.cpp
+++ b/src/Storages/registerStorages.cpp
@@ -34,7 +34,9 @@ void registerStorageS3(StorageFactory & factory);
 void registerStorageCOS(StorageFactory & factory);
 void registerStorageOSS(StorageFactory & factory);
 void registerStorageHudi(StorageFactory & factory);
+#if USE_PARQUET
 void registerStorageDeltaLake(StorageFactory & factory);
+#endif
 #if USE_AVRO
 void registerStorageIceberg(StorageFactory & factory);
 #endif
@@ -126,7 +128,10 @@ void registerStorages()
     registerStorageCOS(factory);
     registerStorageOSS(factory);
     registerStorageHudi(factory);
+
+    #if USE_PARQUET
     registerStorageDeltaLake(factory);
+    #endif
 
     #if USE_AVRO
     registerStorageIceberg(factory);
diff --git a/src/Storages/removeGroupingFunctionSpecializations.cpp b/src/Storages/removeGroupingFunctionSpecializations.cpp
new file mode 100644
index 00000000000..668596756a1
--- /dev/null
+++ b/src/Storages/removeGroupingFunctionSpecializations.cpp
@@ -0,0 +1,65 @@
+#include <Storages/removeGroupingFunctionSpecializations.h>
+
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/ColumnNode.h>
+#include <Analyzer/FunctionNode.h>
+#include <Common/Exception.h>
+#include <Functions/grouping.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+class GeneralizeGroupingFunctionForDistributedVisitor : public InDepthQueryTreeVisitor<GeneralizeGroupingFunctionForDistributedVisitor>
+{
+public:
+    static void visitImpl(QueryTreeNodePtr & node)
+    {
+        auto * function = node->as<FunctionNode>();
+        if (!function)
+            return;
+
+        const auto & function_name = function->getFunctionName();
+        bool ordinary_grouping = function_name == "groupingOrdinary";
+
+        if (!ordinary_grouping
+            && function_name != "groupingForRollup"
+            && function_name != "groupingForCube"
+            && function_name != "groupingForGroupingSets")
+            return;
+
+
+        if (!ordinary_grouping)
+        {
+            auto & arguments = function->getArguments().getNodes();
+
+            if (arguments.empty())
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Grouping function specialization must have arguments");
+            auto * grouping_set_arg = arguments[0]->as<ColumnNode>();
+            if (!grouping_set_arg || grouping_set_arg->getColumnName() != "__grouping_set")
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "The first argument of Grouping function specialization must be '__grouping_set' column but {} found",
+                arguments[0]->dumpTree());
+            arguments.erase(arguments.begin());
+        }
+
+        // This node will be only converted to AST, so we don't need
+        // to pass the correct force_compatibility flag to FunctionGrouping.
+        auto function_adaptor = std::make_shared<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionGrouping>(false)
+        );
+        function->resolveAsFunction(function_adaptor);
+    }
+};
+
+void removeGroupingFunctionSpecializations(QueryTreeNodePtr & node)
+{
+    GeneralizeGroupingFunctionForDistributedVisitor visitor;
+    visitor.visit(node);
+}
+
+}
diff --git a/src/Storages/removeGroupingFunctionSpecializations.h b/src/Storages/removeGroupingFunctionSpecializations.h
new file mode 100644
index 00000000000..878b87abce7
--- /dev/null
+++ b/src/Storages/removeGroupingFunctionSpecializations.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <Analyzer/IQueryTreeNode.h>
+
+namespace DB
+{
+
+void removeGroupingFunctionSpecializations(QueryTreeNodePtr & node);
+
+}
diff --git a/src/Storages/tests/gtest_transform_query_for_external_database.cpp b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
index 131bc2b85e3..5c1442ece11 100644
--- a/src/Storages/tests/gtest_transform_query_for_external_database.cpp
+++ b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
@@ -9,16 +9,22 @@
 #include <DataTypes/DataTypeString.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/TreeRewriter.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Databases/DatabaseMemory.h>
 #include <Storages/StorageMemory.h>
 #include <Common/tests/gtest_global_context.h>
 #include <Common/tests/gtest_global_register.h>
 
+#include <Analyzer/QueryNode.h>
+#include <Analyzer/TableNode.h>
+#include <Analyzer/JoinNode.h>
+#include <Analyzer/QueryTreeBuilder.h>
+#include <Planner/Utils.h>
 
 using namespace DB;
 
 
-/// NOTE How to do better?
+/// TODO: use gtest fixture
 struct State
 {
     State(const State&) = delete;
@@ -31,9 +37,9 @@ struct State
         return state;
     }
 
-    const NamesAndTypesList & getColumns() const
+    const NamesAndTypesList & getColumns(size_t idx = 0) const
     {
-        return tables[0].columns;
+        return tables[idx].columns;
     }
 
     std::vector<TableWithColumnNamesAndTypes> getTables(size_t num = 0) const
@@ -46,10 +52,10 @@ struct State
 
 private:
 
-    static DatabaseAndTableWithAlias createDBAndTable(String table_name)
+    static DatabaseAndTableWithAlias createDBAndTable(String table_name, String database_name = "test")
     {
         DatabaseAndTableWithAlias res;
-        res.database = "test";
+        res.database = database_name;
         res.table = table_name;
         return res;
     }
@@ -75,12 +81,18 @@ private:
                 {"num", std::make_shared<DataTypeUInt8>()},
                 {"attr", std::make_shared<DataTypeString>()},
             }),
+        TableWithColumnNamesAndTypes(
+            createDBAndTable("external_table"),
+            {
+                {"ttt", std::make_shared<DataTypeUInt8>()},
+            }),
     };
 
     explicit State()
         : context(Context::createCopy(getContext().context))
     {
         tryRegisterFunctions();
+        tryRegisterAggregateFunctions();
         DatabasePtr database = std::make_shared<DatabaseMemory>("test", context);
 
         for (const auto & tab : tables)
@@ -91,14 +103,15 @@ private:
                 context,
                 table_name,
                 std::make_shared<StorageMemory>(
-                    StorageID(db_name, table_name), ColumnsDescription{getColumns()}, ConstraintsDescription{}, String{}));
+                    StorageID(db_name, table_name), ColumnsDescription{tab.columns}, ConstraintsDescription{}, String{}));
         }
         DatabaseCatalog::instance().attachDatabase(database->getDatabaseName(), database);
+
         context->setCurrentDatabase("test");
     }
 };
 
-static void check(
+static void checkOld(
     const State & state,
     size_t table_num,
     const std::string & query,
@@ -109,38 +122,114 @@ static void check(
     SelectQueryInfo query_info;
     SelectQueryOptions select_options;
     query_info.syntax_analyzer_result
-        = TreeRewriter(state.context).analyzeSelect(ast, DB::TreeRewriterResult(state.getColumns()), select_options, state.getTables(table_num));
+        = TreeRewriter(state.context).analyzeSelect(ast, DB::TreeRewriterResult(state.getColumns(0)), select_options, state.getTables(table_num));
     query_info.query = ast;
     std::string transformed_query = transformQueryForExternalDatabase(
-        query_info, state.getColumns(), IdentifierQuotingStyle::DoubleQuotes, "test", "table", state.context);
+        query_info,
+        query_info.syntax_analyzer_result->requiredSourceColumns(),
+        state.getColumns(0), IdentifierQuotingStyle::DoubleQuotes, "test", "table", state.context);
 
     EXPECT_EQ(transformed_query, expected) << query;
 }
 
+/// Required for transformQueryForExternalDatabase. In real life table expression is calculated via planner.
+/// But in tests we can just find it in JOIN TREE.
+static QueryTreeNodePtr findTableExpression(const QueryTreeNodePtr & node, const String & table_name)
+{
+    if (node->getNodeType() == QueryTreeNodeType::TABLE)
+    {
+        if (node->as<TableNode>()->getStorageID().table_name == table_name)
+            return node;
+    }
+
+    if (node->getNodeType() == QueryTreeNodeType::JOIN)
+    {
+        if (auto res = findTableExpression(node->as<JoinNode>()->getLeftTableExpression(), table_name))
+            return res;
+        if (auto res = findTableExpression(node->as<JoinNode>()->getRightTableExpression(), table_name))
+            return res;
+    }
+    return nullptr;
+}
+
+/// `column_names` - Normally it's passed to query plan step. But in test we do it manually.
+static void checkNewAnalyzer(
+    const State & state,
+    const Names & column_names,
+    const std::string & query,
+    const std::string & expected)
+{
+    ParserSelectQuery parser;
+    ASTPtr ast = parseQuery(parser, query, 1000, 1000);
+
+    SelectQueryOptions select_query_options;
+    auto query_tree = buildQueryTree(ast, state.context);
+    QueryTreePassManager query_tree_pass_manager(state.context);
+    addQueryTreePasses(query_tree_pass_manager);
+    query_tree_pass_manager.run(query_tree);
+
+    InterpreterSelectQueryAnalyzer interpreter(query_tree, state.context, select_query_options);
+    interpreter.getQueryPlan();
+
+    auto planner_context = interpreter.getPlanner().getPlannerContext();
+    SelectQueryInfo query_info = buildSelectQueryInfo(query_tree, planner_context);
+    const auto * query_node = query_info.query_tree->as<QueryNode>();
+    if (!query_node)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "QueryNode expected");
+
+    query_info.table_expression = findTableExpression(query_node->getJoinTree(), "table");
+
+    std::string transformed_query = transformQueryForExternalDatabase(
+        query_info, column_names, state.getColumns(0), IdentifierQuotingStyle::DoubleQuotes, "test", "table", state.context);
+
+    EXPECT_EQ(transformed_query, expected) << query;
+}
+
+static void check(
+    const State & state,
+    size_t table_num,
+    const Names & column_names,
+    const std::string & query,
+    const std::string & expected,
+    const std::string & expected_new = "")
+{
+    {
+        SCOPED_TRACE("Old analyzer");
+        checkOld(state, table_num, query, expected);
+    }
+    {
+        SCOPED_TRACE("New analyzer");
+        checkNewAnalyzer(state, column_names, query, expected_new.empty() ? expected : expected_new);
+    }
+}
 
 TEST(TransformQueryForExternalDatabase, InWithSingleElement)
 {
     const State & state = State::instance();
 
-    check(state, 1,
+    check(state, 1, {"column"},
           "SELECT column FROM test.table WHERE 1 IN (1)",
-          R"(SELECT "column" FROM "test"."table" WHERE 1 = 1)");
-    check(state, 1,
+          R"(SELECT "column" FROM "test"."table" WHERE 1 = 1)",
+          R"(SELECT "column" FROM "test"."table")");
+
+    check(state, 1, {"column"},
           "SELECT column FROM test.table WHERE column IN (1, 2)",
           R"(SELECT "column" FROM "test"."table" WHERE "column" IN (1, 2))");
-    check(state, 1,
-          "SELECT column FROM test.table WHERE column NOT IN ('hello', 'world')",
-          R"(SELECT "column" FROM "test"."table" WHERE "column" NOT IN ('hello', 'world'))");
+
+    check(state, 1, {"field"},
+          "SELECT field FROM test.table WHERE field NOT IN ('hello', 'world')",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" NOT IN ('hello', 'world'))");
 }
 
 TEST(TransformQueryForExternalDatabase, InWithMultipleColumns)
 {
     const State & state = State::instance();
 
-    check(state, 1,
+    check(state, 1, {"column"},
           "SELECT column FROM test.table WHERE (1,1) IN ((1,1))",
-          R"(SELECT "column" FROM "test"."table" WHERE 1 = 1)");
-    check(state, 1,
+          R"(SELECT "column" FROM "test"."table" WHERE 1 = 1)",
+          R"(SELECT "column" FROM "test"."table")");
+    check(state, 1, {"field", "value"},
           "SELECT field, value FROM test.table WHERE (field, value) IN (('foo', 'bar'))",
           R"(SELECT "field", "value" FROM "test"."table" WHERE ("field", "value") IN (('foo', 'bar')))");
 }
@@ -149,17 +238,17 @@ TEST(TransformQueryForExternalDatabase, InWithTable)
 {
     const State & state = State::instance();
 
-    check(state, 1,
+    check(state, 1, {"column"},
           "SELECT column FROM test.table WHERE 1 IN external_table",
           R"(SELECT "column" FROM "test"."table")");
-    check(state, 1,
-          "SELECT column FROM test.table WHERE 1 IN (x)",
+    check(state, 1, {"column"},
+          "WITH x as (SELECT * FROM external_table) SELECT column FROM test.table WHERE 1 IN (x)",
           R"(SELECT "column" FROM "test"."table")");
-    check(state, 1,
-          "SELECT column, field, value FROM test.table WHERE column IN (field, value)",
-          R"(SELECT "column", "field", "value" FROM "test"."table" WHERE "column" IN ("field", "value"))");
-    check(state, 1,
-          "SELECT column FROM test.table WHERE column NOT IN hello AND column = 123",
+    check(state, 1, {"column", "field", "value"},
+          "SELECT column, field, value FROM test.table WHERE column IN (1, 2)",
+          R"(SELECT "column", "field", "value" FROM "test"."table" WHERE "column" IN (1, 2))");
+    check(state, 1, {"column"},
+          "SELECT column FROM test.table WHERE column NOT IN external_table AND column = 123",
           R"(SELECT "column" FROM "test"."table" WHERE "column" = 123)");
 }
 
@@ -167,32 +256,32 @@ TEST(TransformQueryForExternalDatabase, Like)
 {
     const State & state = State::instance();
 
-    check(state, 1,
-          "SELECT column FROM test.table WHERE column LIKE '%hello%'",
-          R"(SELECT "column" FROM "test"."table" WHERE "column" LIKE '%hello%')");
-    check(state, 1,
-          "SELECT column FROM test.table WHERE column NOT LIKE 'w%rld'",
-          R"(SELECT "column" FROM "test"."table" WHERE "column" NOT LIKE 'w%rld')");
+    check(state, 1, {"field"},
+          "SELECT field FROM test.table WHERE field LIKE '%hello%'",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" LIKE '%hello%')");
+    check(state, 1, {"field"},
+          "SELECT field FROM test.table WHERE field NOT LIKE 'w%rld'",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" NOT LIKE 'w%rld')");
 }
 
 TEST(TransformQueryForExternalDatabase, Substring)
 {
     const State & state = State::instance();
 
-    check(state, 1,
-          "SELECT column FROM test.table WHERE left(column, 10) = RIGHT(column, 10) AND SUBSTRING(column FROM 1 FOR 2) = 'Hello'",
-          R"(SELECT "column" FROM "test"."table")");
+    check(state, 1, {"field"},
+          "SELECT field FROM test.table WHERE left(field, 10) = RIGHT(field, 10) AND SUBSTRING(field FROM 1 FOR 2) = 'Hello'",
+          R"(SELECT "field" FROM "test"."table")");
 }
 
 TEST(TransformQueryForExternalDatabase, MultipleAndSubqueries)
 {
     const State & state = State::instance();
 
-    check(state, 1,
-          "SELECT column FROM test.table WHERE 1 = 1 AND toString(column) = '42' AND column = 42 AND left(column, 10) = RIGHT(column, 10) AND column IN (1, 42) AND SUBSTRING(column FROM 1 FOR 2) = 'Hello' AND column != 4",
+    check(state, 1, {"column"},
+          "SELECT column FROM test.table WHERE 1 = 1 AND toString(column) = '42' AND column = 42 AND left(toString(column), 10) = RIGHT(toString(column), 10) AND column IN (1, 42) AND SUBSTRING(toString(column) FROM 1 FOR 2) = 'Hello' AND column != 4",
           R"(SELECT "column" FROM "test"."table" WHERE 1 AND ("column" = 42) AND ("column" IN (1, 42)) AND ("column" != 4))");
-    check(state, 1,
-          "SELECT column FROM test.table WHERE toString(column) = '42' AND left(column, 10) = RIGHT(column, 10) AND column = 42",
+    check(state, 1, {"column"},
+          "SELECT column FROM test.table WHERE toString(column) = '42' AND left(toString(column), 10) = RIGHT(toString(column), 10) AND column = 42",
           R"(SELECT "column" FROM "test"."table" WHERE "column" = 42)");
 }
 
@@ -200,7 +289,7 @@ TEST(TransformQueryForExternalDatabase, Issue7245)
 {
     const State & state = State::instance();
 
-    check(state, 1,
+    check(state, 1, {"apply_id", "apply_type", "apply_status", "create_time"},
           "SELECT apply_id FROM test.table WHERE apply_type = 2 AND create_time > addDays(toDateTime('2019-01-01 01:02:03'),-7) AND apply_status IN (3,4)",
           R"(SELECT "apply_id", "apply_type", "apply_status", "create_time" FROM "test"."table" WHERE ("apply_type" = 2) AND ("create_time" > '2018-12-25 01:02:03') AND ("apply_status" IN (3, 4)))");
 }
@@ -209,8 +298,8 @@ TEST(TransformQueryForExternalDatabase, Aliases)
 {
     const State & state = State::instance();
 
-    check(state, 1,
-          "SELECT field AS value, field AS display WHERE field NOT IN ('') AND display LIKE '%test%'",
+    check(state, 1, {"field"},
+          "SELECT field AS value, field AS display FROM table WHERE field NOT IN ('') AND display LIKE '%test%'",
           R"(SELECT "field" FROM "test"."table" WHERE ("field" NOT IN ('')) AND ("field" LIKE '%test%'))");
 }
 
@@ -218,10 +307,10 @@ TEST(TransformQueryForExternalDatabase, ForeignColumnInWhere)
 {
     const State & state = State::instance();
 
-    check(state, 2,
+    check(state, 2, {"column", "apply_id"},
           "SELECT column FROM test.table "
           "JOIN test.table2 AS table2 ON (test.table.apply_id = table2.num) "
-          "WHERE column > 2 AND (apply_id = 1 OR table2.num = 1) AND table2.attr != ''",
+          "WHERE column > 2 AND apply_id = 1 AND table2.num = 1 AND table2.attr != ''",
           R"(SELECT "column", "apply_id" FROM "test"."table" WHERE ("column" > 2) AND ("apply_id" = 1))");
 }
 
@@ -229,7 +318,7 @@ TEST(TransformQueryForExternalDatabase, NoStrict)
 {
     const State & state = State::instance();
 
-    check(state, 1,
+    check(state, 1, {"field"},
           "SELECT field FROM table WHERE field IN (SELECT attr FROM table2)",
           R"(SELECT "field" FROM "test"."table")");
 }
@@ -239,37 +328,37 @@ TEST(TransformQueryForExternalDatabase, Strict)
     const State & state = State::instance();
     state.context->setSetting("external_table_strict_query", true);
 
-    check(state, 1,
+    check(state, 1, {"field"},
           "SELECT field FROM table WHERE field = '1'",
           R"(SELECT "field" FROM "test"."table" WHERE "field" = '1')");
-    check(state, 1,
+    check(state, 1, {"field"},
           "SELECT field FROM table WHERE field IN ('1', '2')",
           R"(SELECT "field" FROM "test"."table" WHERE "field" IN ('1', '2'))");
-    check(state, 1,
+    check(state, 1, {"field"},
           "SELECT field FROM table WHERE field LIKE '%test%'",
           R"(SELECT "field" FROM "test"."table" WHERE "field" LIKE '%test%')");
 
     /// removeUnknownSubexpressionsFromWhere() takes place
-    EXPECT_THROW(check(state, 1, "SELECT field FROM table WHERE field IN (SELECT attr FROM table2)", ""), Exception);
+    EXPECT_THROW(check(state, 1, {"field"}, "SELECT field FROM table WHERE field IN (SELECT attr FROM table2)", ""), Exception);
     /// !isCompatible() takes place
-    EXPECT_THROW(check(state, 1, "SELECT column FROM test.table WHERE left(column, 10) = RIGHT(column, 10) AND SUBSTRING(column FROM 1 FOR 2) = 'Hello'", ""), Exception);
+    EXPECT_THROW(check(state, 1, {"column"}, "SELECT column FROM test.table WHERE left(column, 10) = RIGHT(column, 10) AND SUBSTRING(column FROM 1 FOR 2) = 'Hello'", ""), Exception);
 }
 
 TEST(TransformQueryForExternalDatabase, Null)
 {
     const State & state = State::instance();
 
-    check(state, 1,
+    check(state, 1, {"field"},
           "SELECT field FROM table WHERE field IS NULL",
           R"(SELECT "field" FROM "test"."table" WHERE "field" IS NULL)");
-    check(state, 1,
+    check(state, 1, {"field"},
           "SELECT field FROM table WHERE field IS NOT NULL",
           R"(SELECT "field" FROM "test"."table" WHERE "field" IS NOT NULL)");
 
-    check(state, 1,
+    check(state, 1, {"field"},
           "SELECT field FROM table WHERE isNull(field)",
           R"(SELECT "field" FROM "test"."table" WHERE "field" IS NULL)");
-    check(state, 1,
+    check(state, 1, {"field"},
           "SELECT field FROM table WHERE isNotNull(field)",
           R"(SELECT "field" FROM "test"."table" WHERE "field" IS NOT NULL)");
 }
@@ -278,7 +367,28 @@ TEST(TransformQueryForExternalDatabase, ToDate)
 {
     const State & state = State::instance();
 
-    check(state, 1,
+    check(state, 1, {"a", "b", "foo"},
         "SELECT foo FROM table WHERE a=10 AND b=toDate('2019-10-05')",
         R"(SELECT "a", "b", "foo" FROM "test"."table" WHERE ("a" = 10) AND ("b" = '2019-10-05'))");
 }
+
+TEST(TransformQueryForExternalDatabase, Analyzer)
+{
+    const State & state = State::instance();
+
+    check(state, 1, {"field"},
+        "SELECT count() FROM table WHERE field LIKE '%name_%'",
+        R"(SELECT "field" FROM "test"."table" WHERE "field" LIKE '%name_%')");
+
+    check(state, 1, {"column"},
+        "SELECT 1 FROM table",
+        R"(SELECT "column" FROM "test"."table")");
+
+    check(state, 1, {"column"},
+        "SELECT sleepEachRow(1) FROM table",
+        R"(SELECT "column" FROM "test"."table")");
+
+    check(state, 1, {"column", "apply_id", "apply_type", "apply_status", "create_time", "field", "value", "a", "b", "foo"},
+        "SELECT * FROM table WHERE (column) IN (1)",
+        R"(SELECT "column", "apply_id", "apply_type", "apply_status", "create_time", "field", "value", "a", "b", "foo" FROM "test"."table" WHERE "column" IN (1))");
+}
diff --git a/src/Storages/transformQueryForExternalDatabase.cpp b/src/Storages/transformQueryForExternalDatabase.cpp
index 1ff310c3fac..548b55749d7 100644
--- a/src/Storages/transformQueryForExternalDatabase.cpp
+++ b/src/Storages/transformQueryForExternalDatabase.cpp
@@ -14,6 +14,8 @@
 #include <Storages/transformQueryForExternalDatabase.h>
 #include <Storages/MergeTree/KeyCondition.h>
 
+#include <Storages/transformQueryForExternalDatabaseAnalyzer.h>
+
 
 namespace DB
 {
@@ -108,9 +110,9 @@ void dropAliases(ASTPtr & node)
 }
 
 
-bool isCompatible(IAST & node)
+bool isCompatible(ASTPtr & node)
 {
-    if (auto * function = node.as<ASTFunction>())
+    if (auto * function = node->as<ASTFunction>())
     {
         if (function->parameters)   /// Parametric aggregate functions
             return false;
@@ -154,20 +156,30 @@ bool isCompatible(IAST & node)
             && (function->arguments->children.size() != 2 || function->arguments->children[1]->as<ASTTableIdentifier>()))
             return false;
 
-        for (const auto & expr : function->arguments->children)
-            if (!isCompatible(*expr))
+        for (auto & expr : function->arguments->children)
+            if (!isCompatible(expr))
                 return false;
 
         return true;
     }
 
-    if (const auto * literal = node.as<ASTLiteral>())
+    if (const auto * literal = node->as<ASTLiteral>())
     {
+        if (literal->value.getType() == Field::Types::Tuple)
+        {
+            /// Represent a tuple with zero or one elements as (x) instead of tuple(x).
+            auto tuple_value = literal->value.safeGet<Tuple>();
+            if (tuple_value.size() == 1)
+            {
+                node = makeASTFunction("", std::make_shared<ASTLiteral>(tuple_value[0]));
+                return true;
+            }
+        }
         /// Foreign databases often have no support for Array. But Tuple literals are passed to support IN clause.
         return literal->value.getType() != Field::Types::Array;
     }
 
-    return node.as<ASTIdentifier>();
+    return node->as<ASTIdentifier>();
 }
 
 bool removeUnknownSubexpressions(ASTPtr & node, const NameSet & known_names);
@@ -241,23 +253,15 @@ bool removeUnknownSubexpressionsFromWhere(ASTPtr & node, const NamesAndTypesList
     return removeUnknownSubexpressions(node, known_names);
 }
 
-}
-
-String transformQueryForExternalDatabase(
-    const SelectQueryInfo & query_info,
+String transformQueryForExternalDatabaseImpl(
+    ASTPtr clone_query,
+    Names used_columns,
     const NamesAndTypesList & available_columns,
     IdentifierQuotingStyle identifier_quoting_style,
     const String & database,
     const String & table,
     ContextPtr context)
 {
-    auto clone_query = query_info.query->clone();
-
-    /// TODO: Analyzer syntax analyzer result
-    if (!query_info.syntax_analyzer_result)
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "transform query for external database is unsupported");
-
-    const Names used_columns = query_info.syntax_analyzer_result->requiredSourceColumns();
     bool strict = context->getSettingsRef().external_table_strict_query;
 
     auto select = std::make_shared<ASTSelectQuery>();
@@ -278,11 +282,12 @@ String transformQueryForExternalDatabase(
 
     ASTPtr original_where = clone_query->as<ASTSelectQuery &>().where();
     bool where_has_known_columns = removeUnknownSubexpressionsFromWhere(original_where, available_columns);
+
     if (original_where && where_has_known_columns)
     {
         replaceConstantExpressions(original_where, context, available_columns);
 
-        if (isCompatible(*original_where))
+        if (isCompatible(original_where))
         {
             select->setExpression(ASTSelectQuery::Expression::WHERE, std::move(original_where));
         }
@@ -290,14 +295,14 @@ String transformQueryForExternalDatabase(
         {
             throw Exception(ErrorCodes::INCORRECT_QUERY, "Query contains non-compatible expressions (and external_table_strict_query=true)");
         }
-        else if (const auto * function = original_where->as<ASTFunction>())
+        else if (auto * function = original_where->as<ASTFunction>())
         {
             if (function->name == "and")
             {
                 auto new_function_and = makeASTFunction("and");
-                for (const auto & elem : function->arguments->children)
+                for (auto & elem : function->arguments->children)
                 {
-                    if (isCompatible(*elem))
+                    if (isCompatible(elem))
                         new_function_and->arguments->children.push_back(elem);
                 }
                 if (new_function_and->arguments->children.size() == 1)
@@ -309,7 +314,8 @@ String transformQueryForExternalDatabase(
     }
     else if (strict && original_where)
     {
-        throw Exception(ErrorCodes::INCORRECT_QUERY, "Query contains non-compatible expressions (and external_table_strict_query=true)");
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "Query contains non-compatible expressions '{}' (and external_table_strict_query=true)",
+                        original_where->formatForErrorMessage());
     }
 
     auto * literal_expr = typeid_cast<ASTLiteral *>(original_where.get());
@@ -338,3 +344,50 @@ String transformQueryForExternalDatabase(
 }
 
 }
+
+String transformQueryForExternalDatabase(
+    const SelectQueryInfo & query_info,
+    const Names & column_names,
+    const NamesAndTypesList & available_columns,
+    IdentifierQuotingStyle identifier_quoting_style,
+    const String & database,
+    const String & table,
+    ContextPtr context)
+{
+    if (!query_info.syntax_analyzer_result)
+    {
+        if (!query_info.query_tree)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Query is not analyzed: no query tree");
+        if (!query_info.planner_context)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Query is not analyzed: no planner context");
+        if (!query_info.table_expression)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Query is not analyzed: no table expression");
+
+        if (column_names.empty())
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "No column names for query '{}' to external table '{}.{}'",
+                            query_info.query_tree->formatASTForErrorMessage(), database, table);
+
+        auto clone_query = getASTForExternalDatabaseFromQueryTree(query_info.query_tree);
+
+        return transformQueryForExternalDatabaseImpl(
+            clone_query,
+            column_names,
+            available_columns,
+            identifier_quoting_style,
+            database,
+            table,
+            context);
+    }
+
+    auto clone_query = query_info.query->clone();
+    return transformQueryForExternalDatabaseImpl(
+        clone_query,
+        query_info.syntax_analyzer_result->requiredSourceColumns(),
+        available_columns,
+        identifier_quoting_style,
+        database,
+        table,
+        context);
+}
+
+}
diff --git a/src/Storages/transformQueryForExternalDatabase.h b/src/Storages/transformQueryForExternalDatabase.h
index 3756dd97feb..0f2b0a5822f 100644
--- a/src/Storages/transformQueryForExternalDatabase.h
+++ b/src/Storages/transformQueryForExternalDatabase.h
@@ -28,6 +28,7 @@ class IAST;
   */
 String transformQueryForExternalDatabase(
     const SelectQueryInfo & query_info,
+    const Names & column_names,
     const NamesAndTypesList & available_columns,
     IdentifierQuotingStyle identifier_quoting_style,
     const String & database,
diff --git a/src/Storages/transformQueryForExternalDatabaseAnalyzer.cpp b/src/Storages/transformQueryForExternalDatabaseAnalyzer.cpp
new file mode 100644
index 00000000000..513ec510d23
--- /dev/null
+++ b/src/Storages/transformQueryForExternalDatabaseAnalyzer.cpp
@@ -0,0 +1,76 @@
+#include <Storages/transformQueryForExternalDatabaseAnalyzer.h>
+
+#include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+
+#include <Columns/ColumnConst.h>
+
+#include <Analyzer/QueryNode.h>
+#include <Analyzer/ConstantNode.h>
+#include <Analyzer/ConstantValue.h>
+
+
+#include <DataTypes/DataTypesNumber.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNSUPPORTED_METHOD;
+}
+
+namespace
+{
+
+class PrepareForExternalDatabaseVisitor : public InDepthQueryTreeVisitor<PrepareForExternalDatabaseVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitor<PrepareForExternalDatabaseVisitor>;
+    using Base::Base;
+
+    static void visitImpl(QueryTreeNodePtr & node)
+    {
+        auto * constant_node = node->as<ConstantNode>();
+        if (constant_node)
+        {
+            auto result_type = constant_node->getResultType();
+            if (isDate(result_type) || isDateTime(result_type) || isDateTime64(result_type))
+            {
+                /// Use string representation of constant date and time values
+                /// The code is ugly - how to convert artbitrary Field to proper string representation?
+                /// (maybe we can just consider numbers as unix timestamps?)
+                auto result_column = result_type->createColumnConst(1, constant_node->getValue());
+                const IColumn & inner_column = assert_cast<const ColumnConst &>(*result_column).getDataColumn();
+
+                WriteBufferFromOwnString out;
+                result_type->getDefaultSerialization()->serializeText(inner_column, 0, out, FormatSettings());
+                node = std::make_shared<ConstantNode>(std::make_shared<ConstantValue>(out.str(), result_type));
+            }
+        }
+    }
+};
+
+}
+
+ASTPtr getASTForExternalDatabaseFromQueryTree(const QueryTreeNodePtr & query_tree)
+{
+    auto new_tree = query_tree->clone();
+
+    PrepareForExternalDatabaseVisitor visitor;
+    visitor.visit(new_tree);
+    const auto * query_node = new_tree->as<QueryNode>();
+
+    const auto & query_node_ast = query_node->toAST({ .add_cast_for_constants = false, .fully_qualified_identifiers = false });
+
+    const auto * union_ast = query_node_ast->as<ASTSelectWithUnionQuery>();
+    if (!union_ast)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "QueryNode AST is not a ASTSelectWithUnionQuery");
+
+    if (union_ast->list_of_selects->children.size() != 1)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "QueryNode AST is not a single ASTSelectQuery, got {}", union_ast->list_of_selects->children.size());
+
+    return union_ast->list_of_selects->children.at(0);
+}
+
+}
diff --git a/src/Storages/transformQueryForExternalDatabaseAnalyzer.h b/src/Storages/transformQueryForExternalDatabaseAnalyzer.h
new file mode 100644
index 00000000000..f8983619d1f
--- /dev/null
+++ b/src/Storages/transformQueryForExternalDatabaseAnalyzer.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <Analyzer/IQueryTreeNode.h>
+
+
+namespace DB
+{
+
+ASTPtr getASTForExternalDatabaseFromQueryTree(const QueryTreeNodePtr & query_tree);
+
+}
diff --git a/src/TableFunctions/ITableFunction.h b/src/TableFunctions/ITableFunction.h
index f59092acf69..fe71005cb9c 100644
--- a/src/TableFunctions/ITableFunction.h
+++ b/src/TableFunctions/ITableFunction.h
@@ -4,7 +4,7 @@
 #include <Storages/IStorage_fwd.h>
 #include <Storages/ColumnsDescription.h>
 #include <Access/Common/AccessType.h>
-#include <Common/Documentation.h>
+#include <Common/FunctionDocumentation.h>
 #include <Analyzer/IQueryTreeNode.h>
 
 #include <memory>
@@ -97,7 +97,7 @@ private:
 /// Properties of table function that are independent of argument types and parameters.
 struct TableFunctionProperties
 {
-    Documentation documentation;
+    FunctionDocumentation documentation;
 
     /** It is determined by the possibility of modifying any data or making requests to arbitrary hostnames.
       *
diff --git a/src/TableFunctions/ITableFunctionCluster.h b/src/TableFunctions/ITableFunctionCluster.h
new file mode 100644
index 00000000000..ad88d7b54f0
--- /dev/null
+++ b/src/TableFunctions/ITableFunctionCluster.h
@@ -0,0 +1,72 @@
+#pragma once
+
+#include "config.h"
+
+#include <TableFunctions/ITableFunction.h>
+#include <TableFunctions/TableFunctionS3.h>
+#include <Storages/StorageS3Cluster.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/Context.h>
+#include <Storages/checkAndGetLiteralArgument.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_GET;
+    extern const int LOGICAL_ERROR;
+}
+
+/// Base class for *Cluster table functions that require cluster_name for the first argument.
+template <typename Base>
+class ITableFunctionCluster : public Base
+{
+public:
+    String getName() const override = 0;
+    String getSignature() const override = 0;
+
+    static void addColumnsStructureToArguments(ASTs & args, const String & desired_structure, const ContextPtr & context)
+    {
+        if (args.empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected empty list of arguments for {}Cluster table function", Base::name);
+
+        ASTPtr cluster_name_arg = args.front();
+        args.erase(args.begin());
+        Base::addColumnsStructureToArguments(args, desired_structure, context);
+        args.insert(args.begin(), cluster_name_arg);
+    }
+
+protected:
+    void parseArguments(const ASTPtr & ast, ContextPtr context) override
+    {
+        /// Clone ast function, because we can modify its arguments like removing cluster_name
+        Base::parseArguments(ast->clone(), context);
+    }
+
+    void parseArgumentsImpl(ASTs & args, const ContextPtr & context) override
+    {
+        if (args.empty())
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "The signature of table function {} shall be the following:\n{}", getName(), getSignature());
+
+        /// Evaluate only first argument, everything else will be done Base class
+        args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(args[0], context);
+
+        /// Cluster name is always the first
+        cluster_name = checkAndGetLiteralArgument<String>(args[0], "cluster_name");
+
+        if (!context->tryGetCluster(cluster_name))
+            throw Exception(ErrorCodes::BAD_GET, "Requested cluster '{}' not found", cluster_name);
+
+        /// Just cut the first arg (cluster_name) and try to parse other table function arguments as is
+        args.erase(args.begin());
+
+        Base::parseArgumentsImpl(args, context);
+    }
+
+    String cluster_name;
+};
+
+}
diff --git a/src/TableFunctions/ITableFunctionDataLake.h b/src/TableFunctions/ITableFunctionDataLake.h
index 6f8e8dce121..f87838cfb56 100644
--- a/src/TableFunctions/ITableFunctionDataLake.h
+++ b/src/TableFunctions/ITableFunctionDataLake.h
@@ -13,35 +13,30 @@
 
 namespace DB
 {
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
 
 template <typename Name, typename Storage, typename TableFunction>
-class ITableFunctionDataLake : public ITableFunction
+class ITableFunctionDataLake : public TableFunction
 {
 public:
     static constexpr auto name = Name::name;
-    std::string getName() const override
-    {
-        return name;
-    }
+    std::string getName() const override { return name; }
 
 protected:
-    StoragePtr
-    executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/)
-        const override
+    StoragePtr executeImpl(
+        const ASTPtr & /*ast_function*/,
+        ContextPtr context,
+        const std::string & table_name,
+        ColumnsDescription /*cached_columns*/) const override
     {
         ColumnsDescription columns;
-        if (configuration.structure != "auto")
-            columns = parseColumnsListFromString(configuration.structure, context);
+        if (TableFunction::configuration.structure != "auto")
+            columns = parseColumnsListFromString(TableFunction::configuration.structure, context);
 
         StoragePtr storage = std::make_shared<Storage>(
-            configuration, StorageID(getDatabaseName(), table_name), columns, ConstraintsDescription{}, String{}, context, std::nullopt);
+            TableFunction::configuration, context, StorageID(TableFunction::getDatabaseName(), table_name),
+            columns, ConstraintsDescription{}, String{}, std::nullopt);
 
         storage->startup();
-
         return storage;
     }
 
@@ -49,35 +44,21 @@ protected:
 
     ColumnsDescription getActualTableStructure(ContextPtr context) const override
     {
-        if (configuration.structure == "auto")
+        if (TableFunction::configuration.structure == "auto")
         {
-            context->checkAccess(getSourceAccessType());
-            return Storage::getTableStructureFromData(configuration, std::nullopt, context);
+            context->checkAccess(TableFunction::getSourceAccessType());
+            return Storage::getTableStructureFromData(TableFunction::configuration, std::nullopt, context);
         }
 
-        return parseColumnsListFromString(configuration.structure, context);
+        return parseColumnsListFromString(TableFunction::configuration.structure, context);
     }
 
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override
     {
-        /// Parse args
-        ASTs & args_func = ast_function->children;
-
-        const auto message
-            = fmt::format("The signature of table function '{}' could be the following:\n{}", getName(), TableFunction::signature);
-
-        if (args_func.size() != 1)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' must have arguments", getName());
-
-        auto & args = args_func.at(0)->children;
-
-        TableFunction::parseArgumentsImpl(message, args, context, configuration, false);
-
-        if (configuration.format == "auto")
-            configuration.format = "Parquet";
+        /// Set default format to Parquet if it's not specified in arguments.
+        TableFunction::configuration.format = "Parquet";
+        TableFunction::parseArguments(ast_function, context);
     }
-
-    mutable typename Storage::Configuration configuration;
 };
 }
 
diff --git a/src/TableFunctions/ITableFunctionFileLike.cpp b/src/TableFunctions/ITableFunctionFileLike.cpp
index 8cbffc10e5a..a60ab70d570 100644
--- a/src/TableFunctions/ITableFunctionFileLike.cpp
+++ b/src/TableFunctions/ITableFunctionFileLike.cpp
@@ -2,12 +2,10 @@
 #include <Interpreters/parseColumnsListForTableFunction.h>
 
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
 
 #include <Common/Exception.h>
 
 #include <Storages/StorageFile.h>
-#include <Storages/Distributed/DirectoryMonitor.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 
 #include <Interpreters/evaluateConstantExpression.h>
@@ -20,8 +18,8 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int BAD_ARGUMENTS;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
 void ITableFunctionFileLike::parseFirstArguments(const ASTPtr & arg, const ContextPtr &)
@@ -48,9 +46,13 @@ void ITableFunctionFileLike::parseArguments(const ASTPtr & ast_function, Context
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Table function '{}' must have arguments.", getName());
 
     ASTs & args = args_func.at(0)->children;
+    parseArgumentsImpl(args, context);
+}
 
-    if (args.empty())
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' requires at least 1 argument", getName());
+void ITableFunctionFileLike::parseArgumentsImpl(ASTs & args, const ContextPtr & context)
+{
+    if (args.empty() || args.size() > 4)
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "The signature of table function {} shall be the following:\n{}", getName(), getSignature());
 
     for (auto & arg : args)
         arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
@@ -63,26 +65,51 @@ void ITableFunctionFileLike::parseArguments(const ASTPtr & ast_function, Context
     if (format == "auto")
         format = getFormatFromFirstArgument();
 
-    if (args.size() <= 2)
-        return;
+    if (args.size() > 2)
+    {
+        structure = checkAndGetLiteralArgument<String>(args[2], "structure");
+        if (structure.empty())
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Table structure is empty for table function '{}'. If you want to use automatic schema inference, use 'auto'",
+                getName());
+    }
 
-    if (args.size() != 3 && args.size() != 4)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-            "Table function '{}' requires 1, 2, 3 or 4 arguments: "
-            "filename, format (default auto), structure (default auto) and compression method (default auto)",
-            getName());
-
-    structure = checkAndGetLiteralArgument<String>(args[2], "structure");
-
-    if (structure.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "Table structure is empty for table function '{}'. If you want to use automatic schema inference, use 'auto'",
-            ast_function->formatForErrorMessage());
-
-    if (args.size() == 4)
+    if (args.size() > 3)
         compression_method = checkAndGetLiteralArgument<String>(args[3], "compression_method");
 }
 
+void ITableFunctionFileLike::addColumnsStructureToArguments(ASTs & args, const String & structure, const ContextPtr &)
+{
+    if (args.empty() || args.size() > getMaxNumberOfArguments())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected 1 to {} arguments in table function, got {}", getMaxNumberOfArguments(), args.size());
+
+    auto structure_literal = std::make_shared<ASTLiteral>(structure);
+
+    /// f(filename)
+    if (args.size() == 1)
+    {
+        /// Add format=auto before structure argument.
+        args.push_back(std::make_shared<ASTLiteral>("auto"));
+        args.push_back(structure_literal);
+    }
+    /// f(filename, format)
+    else if (args.size() == 2)
+    {
+        args.push_back(structure_literal);
+    }
+    /// f(filename, format, 'auto')
+    else if (args.size() == 3)
+    {
+        args.back() = structure_literal;
+    }
+    /// f(filename, format, 'auto', compression)
+    else if (args.size() == 4)
+    {
+        args[args.size() - 2] = structure_literal;
+    }
+}
+
 StoragePtr ITableFunctionFileLike::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     ColumnsDescription columns;
diff --git a/src/TableFunctions/ITableFunctionFileLike.h b/src/TableFunctions/ITableFunctionFileLike.h
index 589fce67638..8300cc27591 100644
--- a/src/TableFunctions/ITableFunctionFileLike.h
+++ b/src/TableFunctions/ITableFunctionFileLike.h
@@ -9,19 +9,35 @@ class ColumnsDescription;
 class Context;
 
 /*
- * function(source, format, structure[, compression_method]) - creates a temporary storage from formatted source
+ * function(source, [format, structure, compression_method]) - creates a temporary storage from formatted source
  */
 class ITableFunctionFileLike : public ITableFunction
 {
 public:
+    static constexpr auto signature = " - filename\n"
+                                      " - filename, format\n"
+                                      " - filename, format, structure\n"
+                                      " - filename, format, structure, compression_method\n";
+    virtual String getSignature() const
+    {
+        return signature;
+    }
+
     bool needStructureHint() const override { return structure == "auto"; }
 
     void setStructureHint(const ColumnsDescription & structure_hint_) override { structure_hint = structure_hint_; }
 
     bool supportsReadingSubsetOfColumns() override;
 
+    static size_t getMaxNumberOfArguments() { return 4; }
+
+    static void addColumnsStructureToArguments(ASTs & args, const String & structure, const ContextPtr &);
+
 protected:
+
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+    virtual void parseArgumentsImpl(ASTs & args, const ContextPtr & context);
+
     virtual void parseFirstArguments(const ASTPtr & arg, const ContextPtr & context);
     virtual String getFormatFromFirstArgument();
 
diff --git a/src/TableFunctions/TableFunctionDeltaLake.cpp b/src/TableFunctions/TableFunctionDeltaLake.cpp
index 97726025365..b8bf810f6fa 100644
--- a/src/TableFunctions/TableFunctionDeltaLake.cpp
+++ b/src/TableFunctions/TableFunctionDeltaLake.cpp
@@ -1,12 +1,12 @@
 #include "config.h"
 
-#if USE_AWS_S3
+#if USE_AWS_S3 && USE_PARQUET
 
-#    include <Storages/StorageDeltaLake.h>
-#    include <TableFunctions/ITableFunctionDataLake.h>
-#    include <TableFunctions/TableFunctionFactory.h>
-#    include <TableFunctions/TableFunctionS3.h>
-#    include "registerTableFunctions.h"
+#include <Storages/DataLakes/StorageDeltaLake.h>
+#include <TableFunctions/ITableFunctionDataLake.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/TableFunctionS3.h>
+#include "registerTableFunctions.h"
 
 namespace DB
 {
@@ -16,15 +16,15 @@ struct TableFunctionDeltaLakeName
     static constexpr auto name = "deltaLake";
 };
 
-using TableFunctionDeltaLake = ITableFunctionDataLake<TableFunctionDeltaLakeName, StorageDeltaLake, TableFunctionS3>;
+using TableFunctionDeltaLake = ITableFunctionDataLake<TableFunctionDeltaLakeName, StorageDeltaLakeS3, TableFunctionS3>;
 
 void registerTableFunctionDeltaLake(TableFunctionFactory & factory)
 {
     factory.registerFunction<TableFunctionDeltaLake>(
-        {.documentation
-         = {R"(The table function can be used to read the DeltaLake table stored on object store.)",
-            Documentation::Examples{{"deltaLake", "SELECT * FROM deltaLake(url, access_key_id, secret_access_key)"}},
-            Documentation::Categories{"DataLake"}},
+        {.documentation = {
+            .description=R"(The table function can be used to read the DeltaLake table stored on object store.)",
+            .examples{{"deltaLake", "SELECT * FROM deltaLake(url, access_key_id, secret_access_key)", ""}},
+            .categories{"DataLake"}},
          .allow_readonly = false});
 }
 
diff --git a/src/TableFunctions/TableFunctionDictionary.cpp b/src/TableFunctions/TableFunctionDictionary.cpp
index 54c23cfb64b..90db9550a72 100644
--- a/src/TableFunctions/TableFunctionDictionary.cpp
+++ b/src/TableFunctions/TableFunctionDictionary.cpp
@@ -2,6 +2,10 @@
 
 #include <Parsers/ASTLiteral.h>
 
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+
 #include <Interpreters/Context.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Interpreters/evaluateConstantExpression.h>
@@ -42,10 +46,33 @@ void TableFunctionDictionary::parseArguments(const ASTPtr & ast_function, Contex
 ColumnsDescription TableFunctionDictionary::getActualTableStructure(ContextPtr context) const
 {
     const ExternalDictionariesLoader & external_loader = context->getExternalDictionariesLoader();
-    auto dictionary_structure = external_loader.getDictionaryStructure(dictionary_name, context);
-    auto result = ColumnsDescription(StorageDictionary::getNamesAndTypes(dictionary_structure));
+    std::string resolved_name = external_loader.resolveDictionaryName(dictionary_name, context->getCurrentDatabase());
+    auto load_result = external_loader.load(resolved_name);
+    if (load_result)
+    {
+        /// for regexp tree dictionary, the table structure will be different with dictionary structure. it is:
+        /// - id. identifier of the tree node
+        /// - parent_id.
+        /// - regexp. the regular expression
+        /// - keys. the names of attributions of dictionary structure
+        /// - values. the values of each attribution
+        const auto dictionary = std::static_pointer_cast<const IDictionary>(load_result);
+        if (dictionary->getTypeName() == "RegExpTree")
+        {
+            return ColumnsDescription(NamesAndTypesList({
+                {"id", std::make_shared<DataTypeUInt64>()},
+                {"parent_id", std::make_shared<DataTypeUInt64>()},
+                {"regexp", std::make_shared<DataTypeString>()},
+                {"keys", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+                {"values", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}
+            }));
+        }
+    }
+
+    /// otherwise, we get table structure by dictionary structure.
+    auto dictionary_structure = external_loader.getDictionaryStructure(dictionary_name, context);
+    return ColumnsDescription(StorageDictionary::getNamesAndTypes(dictionary_structure));
 
-    return result;
 }
 
 StoragePtr TableFunctionDictionary::executeImpl(
diff --git a/src/TableFunctions/TableFunctionExecutable.cpp b/src/TableFunctions/TableFunctionExecutable.cpp
index ae0946f8a50..66e7ce7592c 100644
--- a/src/TableFunctions/TableFunctionExecutable.cpp
+++ b/src/TableFunctions/TableFunctionExecutable.cpp
@@ -8,6 +8,7 @@
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTSubquery.h>
 #include <Parsers/parseQuery.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/StorageExecutable.h>
@@ -25,7 +26,8 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int UNSUPPORTED_METHOD;
+    extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
 std::vector<size_t> TableFunctionExecutable::skipAnalysisForArguments(const QueryTreeNodePtr & query_node_table_function, ContextPtr) const
@@ -61,6 +63,21 @@ void TableFunctionExecutable::parseArguments(const ASTPtr & ast_function, Contex
             "Table function '{}' requires minimum 3 arguments: script_name, format, structure, [input_query...]",
             getName());
 
+    auto check_argument = [&](size_t i, const std::string & argument_name)
+    {
+        if (!args[i]->as<ASTIdentifier>() &&
+            !args[i]->as<ASTLiteral>() &&
+            !args[i]->as<ASTQueryParameter>() &&
+            !args[i]->as<ASTSubquery>())
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of argument '{}' for table function '{}': must be an identifier or string literal",
+                argument_name, getName());
+    };
+
+    check_argument(0, "script_name");
+    check_argument(1, "format");
+    check_argument(2, "structure");
+
     for (size_t i = 0; i <= 2; ++i)
         args[i] = evaluateConstantExpressionOrIdentifierAsLiteral(args[i], context);
 
@@ -83,15 +100,18 @@ void TableFunctionExecutable::parseArguments(const ASTPtr & ast_function, Contex
         }
         else
         {
-            ASTPtr query = args[i]->children.at(0);
-            if (query->as<ASTSelectWithUnionQuery>())
+            ASTPtr query;
+            if (!args[i]->children.empty())
+                query = args[i]->children.at(0);
+
+            if (query && query->as<ASTSelectWithUnionQuery>())
             {
                 input_queries.emplace_back(std::move(query));
             }
             else
             {
                 throw Exception(
-                    ErrorCodes::UNSUPPORTED_METHOD,
+                    ErrorCodes::BAD_ARGUMENTS,
                     "Table function '{}' argument is invalid {}",
                     getName(),
                     args[i]->formatForErrorMessage());
diff --git a/src/TableFunctions/TableFunctionExplain.cpp b/src/TableFunctions/TableFunctionExplain.cpp
index 081aa4fc1dc..aae93c8b596 100644
--- a/src/TableFunctions/TableFunctionExplain.cpp
+++ b/src/TableFunctions/TableFunctionExplain.cpp
@@ -11,6 +11,8 @@
 #include <TableFunctions/registerTableFunctions.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Analyzer/TableFunctionNode.h>
+#include <Interpreters/InterpreterSetQuery.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -123,7 +125,10 @@ static Block executeMonoBlock(QueryPipeline & pipeline)
 StoragePtr TableFunctionExplain::executeImpl(
     const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
-    BlockIO blockio = getInterpreter(context).execute();
+    /// To support settings inside explain subquery.
+    auto mutable_context = Context::createCopy(context);
+    InterpreterSetQuery::applySettingsFromQuery(query, mutable_context);
+    BlockIO blockio = getInterpreter(mutable_context).execute();
     Block block = executeMonoBlock(blockio.pipeline);
 
     StorageID storage_id(getDatabaseName(), table_name);
@@ -142,20 +147,16 @@ InterpreterExplainQuery TableFunctionExplain::getInterpreter(ContextPtr context)
 
 void registerTableFunctionExplain(TableFunctionFactory & factory)
 {
-    factory.registerFunction<TableFunctionExplain>({.documentation = {R"(
-Returns result of EXPLAIN query.
-
-The function should not be called directly but can be invoked via `SELECT * FROM (EXPLAIN <query>)`.
-
-You can use this query to process the result of EXPLAIN further using SQL (e.g., in tests).
-
-Example:
-[example:1]
-
-)",
-{{"1", "SELECT explain FROM (EXPLAIN AST SELECT * FROM system.numbers) WHERE explain LIKE '%Asterisk%'"}}
-}});
-
+    factory.registerFunction<TableFunctionExplain>({.documentation = {
+            .description=R"(
+                Returns result of EXPLAIN query.
+                The function should not be called directly but can be invoked via `SELECT * FROM (EXPLAIN <query>)`.
+                You can use this query to process the result of EXPLAIN further using SQL (e.g., in tests).
+                Example:
+                [example:1]
+                )",
+            .examples={{"1", "SELECT explain FROM (EXPLAIN AST SELECT * FROM system.numbers) WHERE explain LIKE '%Asterisk%'", ""}}
+        }});
 }
 
 }
diff --git a/src/TableFunctions/TableFunctionFormat.cpp b/src/TableFunctions/TableFunctionFormat.cpp
index 1e37775f574..f5aff4bd098 100644
--- a/src/TableFunctions/TableFunctionFormat.cpp
+++ b/src/TableFunctions/TableFunctionFormat.cpp
@@ -96,9 +96,9 @@ StoragePtr TableFunctionFormat::executeImpl(const ASTPtr & /*ast_function*/, Con
     return res;
 }
 
-static const Documentation format_table_function_documentation =
+static const FunctionDocumentation format_table_function_documentation =
 {
-    R"(
+    .description=R"(
 Extracts table structure from data and parses it according to specified input format.
 Syntax: `format(format_name, data)`.
 Parameters:
@@ -106,7 +106,7 @@ Parameters:
     - `data ` - String literal or constant expression that returns a string containing data in specified format.
 Returned value: A table with data parsed from `data` argument according specified format and extracted schema.
 )",
-    Documentation::Examples
+    .examples
     {
         {
             "First example",
@@ -131,7 +131,7 @@ Result:
 │ 124 │ World │
 └─────┴───────┘
 ```
-)"
+)", ""
         },
         {
             "Second example",
@@ -154,10 +154,10 @@ Result:
 │ a    │ Nullable(String)  │              │                    │         │                  │                │
 └──────┴───────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
-)"
+)", ""
         },
     },
-    Documentation::Categories{"format", "table-functions"}
+    .categories{"format", "table-functions"}
 };
 
 void registerTableFunctionFormat(TableFunctionFactory & factory)
diff --git a/src/TableFunctions/TableFunctionHDFS.h b/src/TableFunctions/TableFunctionHDFS.h
index c4c111de6e5..eec0a05fe8d 100644
--- a/src/TableFunctions/TableFunctionHDFS.h
+++ b/src/TableFunctions/TableFunctionHDFS.h
@@ -12,18 +12,28 @@ namespace DB
 
 class Context;
 
-/* hdfs(URI, format[, structure, compression]) - creates a temporary storage from hdfs files
+/* hdfs(URI, [format, structure, compression]) - creates a temporary storage from hdfs files
  *
  */
 class TableFunctionHDFS : public ITableFunctionFileLike
 {
 public:
     static constexpr auto name = "hdfs";
-    std::string getName() const override
+    static constexpr auto signature = " - uri\n"
+                                      " - uri, format\n"
+                                      " - uri, format, structure\n"
+                                      " - uri, format, structure, compression_method\n";
+
+    String getName() const override
     {
         return name;
     }
 
+    String getSignature() const override
+    {
+        return signature;
+    }
+
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
     std::unordered_set<String> getVirtualsToCheckBeforeUsingStructureHint() const override
diff --git a/src/TableFunctions/TableFunctionHDFSCluster.cpp b/src/TableFunctions/TableFunctionHDFSCluster.cpp
index 7c84a281673..6fb7ed0fce5 100644
--- a/src/TableFunctions/TableFunctionHDFSCluster.cpp
+++ b/src/TableFunctions/TableFunctionHDFSCluster.cpp
@@ -2,86 +2,19 @@
 
 #if USE_HDFS
 
-#include <Storages/HDFS/StorageHDFSCluster.h>
-
-#include <DataTypes/DataTypeString.h>
-#include <Storages/HDFS/StorageHDFS.h>
-#include <Storages/checkAndGetLiteralArgument.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/ClientInfo.h>
-#include <TableFunctions/TableFunctionFactory.h>
-#include <TableFunctions/TableFunctionHDFS.h>
 #include <TableFunctions/TableFunctionHDFSCluster.h>
-#include <Interpreters/parseColumnsListForTableFunction.h>
-#include <Access/Common/AccessFlags.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/IAST_fwd.h>
+#include <TableFunctions/TableFunctionFactory.h>
 
+#include <Storages/HDFS/StorageHDFSCluster.h>
+#include <Storages/HDFS/StorageHDFS.h>
 #include "registerTableFunctions.h"
 
 #include <memory>
-#include <thread>
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int BAD_GET;
-}
-
-
-void TableFunctionHDFSCluster::parseArguments(const ASTPtr & ast_function, ContextPtr context)
-{
-    auto ast_copy = ast_function->clone();
-    /// Parse args
-    ASTs & args_func = ast_copy->children;
-
-    if (args_func.size() != 1)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' must have arguments.", getName());
-
-    ASTs & args = args_func.at(0)->children;
-
-    if (args.size() < 2 || args.size() > 5)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                        "The signature of table function {} shall be the following:\n"
-                        " - cluster, uri\n"
-                        " - cluster, uri, format\n"
-                        " - cluster, uri, format, structure\n"
-                        " - cluster, uri, format, structure, compression_method",
-                        getName());
-
-    for (auto & arg : args)
-        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
-
-    /// This argument is always the first
-    cluster_name = checkAndGetLiteralArgument<String>(args[0], "cluster_name");
-
-    if (!context->tryGetCluster(cluster_name))
-        throw Exception(ErrorCodes::BAD_GET, "Requested cluster '{}' not found", cluster_name);
-
-     /// Just cut the first arg (cluster_name) and try to parse other table function arguments as is
-    args.erase(args.begin());
-
-    ITableFunctionFileLike::parseArguments(ast_copy, context);
-}
-
-
-ColumnsDescription TableFunctionHDFSCluster::getActualTableStructure(ContextPtr context) const
-{
-    if (structure == "auto")
-    {
-        context->checkAccess(getSourceAccessType());
-        return StorageHDFS::getTableStructureFromData(format, filename, compression_method, context);
-    }
-
-    return parseColumnsListFromString(structure, context);
-}
-
-
 StoragePtr TableFunctionHDFSCluster::getStorage(
     const String & /*source*/, const String & /*format_*/, const ColumnsDescription & columns, ContextPtr context,
     const std::string & table_name, const String & /*compression_method_*/) const
@@ -106,9 +39,14 @@ StoragePtr TableFunctionHDFSCluster::getStorage(
     {
         storage = std::make_shared<StorageHDFSCluster>(
             context,
-            cluster_name, filename, StorageID(getDatabaseName(), table_name),
-            format, columns, ConstraintsDescription{},
-            compression_method, structure != "auto");
+            cluster_name,
+            filename,
+            StorageID(getDatabaseName(), table_name),
+            format,
+            columns,
+            ConstraintsDescription{},
+            compression_method,
+            structure != "auto");
     }
     return storage;
 }
@@ -118,7 +56,6 @@ void registerTableFunctionHDFSCluster(TableFunctionFactory & factory)
     factory.registerFunction<TableFunctionHDFSCluster>();
 }
 
-
 }
 
 #endif
diff --git a/src/TableFunctions/TableFunctionHDFSCluster.h b/src/TableFunctions/TableFunctionHDFSCluster.h
index 9641b71c5e3..0253217feb7 100644
--- a/src/TableFunctions/TableFunctionHDFSCluster.h
+++ b/src/TableFunctions/TableFunctionHDFSCluster.h
@@ -5,6 +5,8 @@
 #if USE_HDFS
 
 #include <TableFunctions/ITableFunctionFileLike.h>
+#include <TableFunctions/TableFunctionHDFS.h>
+#include <TableFunctions/ITableFunctionCluster.h>
 
 
 namespace DB
@@ -15,33 +17,36 @@ class Context;
 /**
  * hdfsCluster(cluster, URI, format, structure, compression_method)
  * A table function, which allows to process many files from HDFS on a specific cluster
- * On initiator it creates a connection to _all_ nodes in cluster, discloses asterics
+ * On initiator it creates a connection to _all_ nodes in cluster, discloses asterisks
  * in HDFS file path and dispatch each file dynamically.
  * On worker node it asks initiator about next task to process, processes it.
  * This is repeated until the tasks are finished.
  */
-class TableFunctionHDFSCluster : public ITableFunctionFileLike
+class TableFunctionHDFSCluster : public ITableFunctionCluster<TableFunctionHDFS>
 {
 public:
     static constexpr auto name = "hdfsCluster";
-    std::string getName() const override
+    static constexpr auto signature = " - cluster_name, uri\n"
+                                      " - cluster_name, uri, format\n"
+                                      " - cluster_name, uri, format, structure\n"
+                                      " - cluster_name, uri, format, structure, compression_method\n";
+
+    String getName() const override
     {
         return name;
     }
 
+    String getSignature() const override
+    {
+        return signature;
+    }
+
 protected:
     StoragePtr getStorage(
         const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
         const std::string & table_name, const String & compression_method_) const override;
 
     const char * getStorageTypeName() const override { return "HDFSCluster"; }
-
-    AccessType getSourceAccessType() const override { return AccessType::HDFS; }
-
-    ColumnsDescription getActualTableStructure(ContextPtr) const override;
-    void parseArguments(const ASTPtr &, ContextPtr) override;
-
-    String cluster_name;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionHudi.cpp b/src/TableFunctions/TableFunctionHudi.cpp
index c8f18df16f7..436e708b72d 100644
--- a/src/TableFunctions/TableFunctionHudi.cpp
+++ b/src/TableFunctions/TableFunctionHudi.cpp
@@ -2,11 +2,11 @@
 
 #if USE_AWS_S3
 
-#    include <Storages/StorageHudi.h>
-#    include <TableFunctions/ITableFunctionDataLake.h>
-#    include <TableFunctions/TableFunctionFactory.h>
-#    include <TableFunctions/TableFunctionS3.h>
-#    include "registerTableFunctions.h"
+#include <Storages/DataLakes/StorageHudi.h>
+#include <TableFunctions/ITableFunctionDataLake.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/TableFunctionS3.h>
+#include "registerTableFunctions.h"
 
 namespace DB
 {
@@ -15,15 +15,15 @@ struct TableFunctionHudiName
 {
     static constexpr auto name = "hudi";
 };
-using TableFunctionHudi = ITableFunctionDataLake<TableFunctionHudiName, StorageHudi, TableFunctionS3>;
+using TableFunctionHudi = ITableFunctionDataLake<TableFunctionHudiName, StorageHudiS3, TableFunctionS3>;
 
 void registerTableFunctionHudi(TableFunctionFactory & factory)
 {
     factory.registerFunction<TableFunctionHudi>(
         {.documentation
-         = {R"(The table function can be used to read the Hudi table stored on object store.)",
-            Documentation::Examples{{"hudi", "SELECT * FROM hudi(url, access_key_id, secret_access_key)"}},
-            Documentation::Categories{"DataLake"}},
+         = {.description=R"(The table function can be used to read the Hudi table stored on object store.)",
+            .examples{{"hudi", "SELECT * FROM hudi(url, access_key_id, secret_access_key)", ""}},
+            .categories{"DataLake"}},
          .allow_readonly = false});
 }
 }
diff --git a/src/TableFunctions/TableFunctionIceberg.cpp b/src/TableFunctions/TableFunctionIceberg.cpp
index 5600e028527..5407d647f0f 100644
--- a/src/TableFunctions/TableFunctionIceberg.cpp
+++ b/src/TableFunctions/TableFunctionIceberg.cpp
@@ -2,11 +2,11 @@
 
 #if USE_AWS_S3 && USE_AVRO
 
-#    include <Storages/StorageIceberg.h>
-#    include <TableFunctions/ITableFunctionDataLake.h>
-#    include <TableFunctions/TableFunctionFactory.h>
-#    include <TableFunctions/TableFunctionS3.h>
-#    include "registerTableFunctions.h"
+#include <Storages/DataLakes/StorageIceberg.h>
+#include <TableFunctions/ITableFunctionDataLake.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/TableFunctionS3.h>
+#include "registerTableFunctions.h"
 
 
 namespace DB
@@ -17,15 +17,15 @@ struct TableFunctionIcebergName
     static constexpr auto name = "iceberg";
 };
 
-using TableFunctionIceberg = ITableFunctionDataLake<TableFunctionIcebergName, StorageIceberg, TableFunctionS3>;
+using TableFunctionIceberg = ITableFunctionDataLake<TableFunctionIcebergName, StorageIcebergS3, TableFunctionS3>;
 
 void registerTableFunctionIceberg(TableFunctionFactory & factory)
 {
     factory.registerFunction<TableFunctionIceberg>(
         {.documentation
-         = {R"(The table function can be used to read the Iceberg table stored on object store.)",
-            Documentation::Examples{{"iceberg", "SELECT * FROM iceberg(url, access_key_id, secret_access_key)"}},
-            Documentation::Categories{"DataLake"}},
+         = {.description=R"(The table function can be used to read the Iceberg table stored on object store.)",
+            .examples{{"iceberg", "SELECT * FROM iceberg(url, access_key_id, secret_access_key)", ""}},
+            .categories{"DataLake"}},
          .allow_readonly = false});
 }
 
diff --git a/src/TableFunctions/TableFunctionMeiliSearch.cpp b/src/TableFunctions/TableFunctionMeiliSearch.cpp
index 32dd73a37a1..41ae5bb9ee2 100644
--- a/src/TableFunctions/TableFunctionMeiliSearch.cpp
+++ b/src/TableFunctions/TableFunctionMeiliSearch.cpp
@@ -1,6 +1,5 @@
 #include <memory>
 #include <Parsers/ASTFunction.h>
-#include <Storages/MeiliSearch/MeiliSearchColumnDescriptionFetcher.h>
 #include <Storages/MeiliSearch/StorageMeiliSearch.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/TableFunctionMeiliSearch.h>
@@ -9,19 +8,15 @@
 namespace DB
 {
 StoragePtr TableFunctionMeiliSearch::executeImpl(
-    const ASTPtr & /* ast_function */, ContextPtr context, const String & table_name, ColumnsDescription /*cached_columns*/) const
+    const ASTPtr & /* ast_function */, ContextPtr /*context*/, const String & table_name, ColumnsDescription /*cached_columns*/) const
 {
-    auto columns = getActualTableStructure(context);
-
     return std::make_shared<StorageMeiliSearch>(
-        StorageID(getDatabaseName(), table_name), configuration.value(), columns, ConstraintsDescription{}, String{});
+        StorageID(getDatabaseName(), table_name), configuration.value(), ColumnsDescription{}, ConstraintsDescription{}, String{});
 }
 
 ColumnsDescription TableFunctionMeiliSearch::getActualTableStructure(ContextPtr /* context */) const
 {
-    MeiliSearchColumnDescriptionFetcher fetcher(configuration.value());
-    fetcher.addParam(doubleQuoteString("limit"), "1");
-    return fetcher.fetchColumnsDescription();
+    return StorageMeiliSearch::getTableStructureFromData(configuration.value());
 }
 
 
diff --git a/src/TableFunctions/TableFunctionMerge.cpp b/src/TableFunctions/TableFunctionMerge.cpp
index 742cc7f366b..586cee54085 100644
--- a/src/TableFunctions/TableFunctionMerge.cpp
+++ b/src/TableFunctions/TableFunctionMerge.cpp
@@ -5,6 +5,8 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
 #include <TableFunctions/ITableFunction.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/TableFunctionNode.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/Context.h>
 #include <Access/ContextAccess.h>
@@ -36,6 +38,23 @@ namespace
     }
 }
 
+std::vector<size_t> TableFunctionMerge::skipAnalysisForArguments(const QueryTreeNodePtr & query_node_table_function, ContextPtr) const
+{
+    auto & table_function_node = query_node_table_function->as<TableFunctionNode &>();
+    auto & table_function_arguments_nodes = table_function_node.getArguments().getNodes();
+    size_t table_function_arguments_size = table_function_arguments_nodes.size();
+
+    std::vector<size_t> result;
+
+    for (size_t i = 0; i < table_function_arguments_size; ++i)
+    {
+        auto * function_node = table_function_arguments_nodes[i]->as<FunctionNode>();
+        if (function_node && function_node->getFunctionName() == "REGEXP")
+            result.push_back(i);
+    }
+
+    return result;
+}
 
 void TableFunctionMerge::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
diff --git a/src/TableFunctions/TableFunctionMerge.h b/src/TableFunctions/TableFunctionMerge.h
index 10221c8c72c..3439056deda 100644
--- a/src/TableFunctions/TableFunctionMerge.h
+++ b/src/TableFunctions/TableFunctionMerge.h
@@ -24,6 +24,7 @@ private:
     using DBToTableSetMap = std::map<String, TableSet>;
     const DBToTableSetMap & getSourceDatabasesAndTables(ContextPtr context) const;
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    std::vector<size_t> skipAnalysisForArguments(const QueryTreeNodePtr & query_node_table_function, ContextPtr context) const override;
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
     static TableSet getMatchedTablesWithAccess(const String & database_name, const String & table_regexp, const ContextPtr & context);
 
diff --git a/src/TableFunctions/TableFunctionMySQL.cpp b/src/TableFunctions/TableFunctionMySQL.cpp
index 0cbad7bd9fd..1705dfcbfa5 100644
--- a/src/TableFunctions/TableFunctionMySQL.cpp
+++ b/src/TableFunctions/TableFunctionMySQL.cpp
@@ -1,12 +1,10 @@
 #include "config.h"
 
 #if USE_MYSQL
-#include <Databases/MySQL/FetchTablesColumnsList.h>
 #include <Processors/Sources/MySQLSource.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTFunction.h>
-#include <Storages/StorageMySQL.h>
 #include <Storages/MySQL/MySQLSettings.h>
 #include <Storages/MySQL/MySQLHelpers.h>
 #include <TableFunctions/ITableFunction.h>
@@ -17,7 +15,7 @@
 #include <Common/quoteString.h>
 #include "registerTableFunctions.h"
 
-#include <Databases/MySQL/DatabaseMySQL.h> // for fetchTablesColumnsList
+#include <Databases/MySQL/DatabaseMySQL.h>
 #include <Common/parseRemoteDescription.h>
 
 
@@ -27,7 +25,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int UNKNOWN_TABLE;
 }
 
 void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, ContextPtr context)
@@ -62,15 +59,7 @@ void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, ContextPtr
 
 ColumnsDescription TableFunctionMySQL::getActualTableStructure(ContextPtr context) const
 {
-    const auto & settings = context->getSettingsRef();
-    const auto tables_and_columns = fetchTablesColumnsList(*pool, configuration->database, {configuration->table}, settings, settings.mysql_datatypes_support_level);
-
-    const auto columns = tables_and_columns.find(configuration->table);
-    if (columns == tables_and_columns.end())
-        throw Exception(ErrorCodes::UNKNOWN_TABLE, "MySQL table {} doesn't exist.",
-                        (configuration->database.empty() ? "" : (backQuote(configuration->database) + "." + backQuote(configuration->table))));
-
-    return columns->second;
+    return StorageMySQL::getTableStructureFromData(*pool, configuration->database, configuration->table, context);
 }
 
 StoragePtr TableFunctionMySQL::executeImpl(
@@ -79,8 +68,6 @@ StoragePtr TableFunctionMySQL::executeImpl(
     const std::string & table_name,
     ColumnsDescription /*cached_columns*/) const
 {
-    auto columns = getActualTableStructure(context);
-
     auto res = std::make_shared<StorageMySQL>(
         StorageID(getDatabaseName(), table_name),
         std::move(*pool),
@@ -88,7 +75,7 @@ StoragePtr TableFunctionMySQL::executeImpl(
         configuration->table,
         configuration->replace_query,
         configuration->on_duplicate_clause,
-        columns,
+        ColumnsDescription{},
         ConstraintsDescription{},
         String{},
         context,
diff --git a/src/TableFunctions/TableFunctionMySQL.h b/src/TableFunctions/TableFunctionMySQL.h
index 794e8632ae2..5a230530bc4 100644
--- a/src/TableFunctions/TableFunctionMySQL.h
+++ b/src/TableFunctions/TableFunctionMySQL.h
@@ -3,7 +3,7 @@
 
 #if USE_MYSQL
 #include <TableFunctions/ITableFunction.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
+#include <Storages/StorageMySQL.h>
 #include <mysqlxx/Pool.h>
 
 
@@ -30,7 +30,7 @@ private:
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     mutable std::optional<mysqlxx::PoolWithFailover> pool;
-    std::optional<StorageMySQLConfiguration> configuration;
+    std::optional<StorageMySQL::Configuration> configuration;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.cpp b/src/TableFunctions/TableFunctionPostgreSQL.cpp
index ab6212d0e30..2b17a1b2c2b 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.cpp
+++ b/src/TableFunctions/TableFunctionPostgreSQL.cpp
@@ -1,8 +1,6 @@
 #include <TableFunctions/TableFunctionPostgreSQL.h>
 
 #if USE_LIBPQXX
-#include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
-
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTFunction.h>
 #include <TableFunctions/ITableFunction.h>
@@ -24,14 +22,14 @@ namespace ErrorCodes
 StoragePtr TableFunctionPostgreSQL::executeImpl(const ASTPtr & /*ast_function*/,
         ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
-    auto columns = getActualTableStructure(context);
     auto result = std::make_shared<StoragePostgreSQL>(
         StorageID(getDatabaseName(), table_name),
         connection_pool,
         configuration->table,
-        columns,
+        ColumnsDescription{},
         ConstraintsDescription{},
         String{},
+        context,
         configuration->schema,
         configuration->on_conflict);
 
@@ -42,15 +40,7 @@ StoragePtr TableFunctionPostgreSQL::executeImpl(const ASTPtr & /*ast_function*/,
 
 ColumnsDescription TableFunctionPostgreSQL::getActualTableStructure(ContextPtr context) const
 {
-    const bool use_nulls = context->getSettingsRef().external_table_functions_use_nulls;
-    auto connection_holder = connection_pool->get();
-    auto columns_info = fetchPostgreSQLTableStructure(
-            connection_holder->get(), configuration->table, configuration->schema, use_nulls).physical_columns;
-
-    if (!columns_info)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table structure not returned");
-
-    return ColumnsDescription{columns_info->columns};
+    return StoragePostgreSQL::getTableStructureFromData(connection_pool, configuration->table, configuration->schema, context);
 }
 
 
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index 1877c9fe65b..b2f09adf773 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -2,8 +2,8 @@
 
 #include <Storages/getStructureOfRemoteTable.h>
 #include <Storages/StorageDistributed.h>
-#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/checkAndGetLiteralArgument.h>
+#include <Storages/NamedCollectionsHelpers.h>
 #include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
@@ -34,10 +34,10 @@ namespace ErrorCodes
 void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     ASTs & args_func = ast_function->children;
-    ExternalDataSourceConfiguration configuration;
 
     String cluster_name;
     String cluster_description;
+    String database, table, username = "default", password;
 
     if (args_func.size() != 1)
         throw Exception(help_message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
@@ -50,47 +50,38 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr
      * For now named collection can be used only for remote as cluster does not require credentials.
      */
     size_t max_args = is_cluster_function ? 4 : 6;
-    auto named_collection = getExternalDataSourceConfiguration(args, context, false, false);
-    if (named_collection)
+    NamedCollectionPtr named_collection;
+    std::vector<std::pair<std::string, ASTPtr>> complex_args;
+    if (!is_cluster_function && (named_collection = tryGetNamedCollectionWithOverrides(args, context, false, &complex_args)))
     {
-        if (is_cluster_function)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Named collection cannot be used for table function cluster");
+        validateNamedCollection<ValidateKeysMultiset<ExternalDatabaseEqualKeysSet>>(
+            *named_collection,
+            {"addresses_expr", "host", "hostname", "table"},
+            {"username", "user", "password", "sharding_key", "port", "database", "db"});
 
-        /**
-         * Common arguments: database, table, username, password, addresses_expr.
-         * Specific args (remote): sharding_key, or database (in case it is not ASTLiteral).
-         * None of the common arguments is empty at this point, it is checked in getExternalDataSourceConfiguration.
-         */
-        auto [common_configuration, storage_specific_args, _] = named_collection.value();
-        configuration.set(common_configuration);
-
-        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        if (!complex_args.empty())
         {
-            if (arg_name == "sharding_key")
+            for (const auto & [arg_name, arg_ast] : complex_args)
             {
-                sharding_key = arg_value;
-            }
-            else if (arg_name == "database")
-            {
-                const auto * function = arg_value->as<ASTFunction>();
-                if (function && TableFunctionFactory::instance().isTableFunctionName(function->name))
-                {
-                    remote_table_function_ptr = arg_value;
-                }
+                if (arg_name == "database" || arg_name == "db")
+                    remote_table_function_ptr = arg_ast;
+                else if (arg_name == "sharding_key")
+                    sharding_key = arg_ast;
                 else
-                {
-                    auto database_literal = evaluateConstantExpressionOrIdentifierAsLiteral(arg_value, context);
-                    configuration.database = checkAndGetLiteralArgument<String>(database_literal, "database");
-                }
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected argument representation for {}", arg_name);
             }
-            else
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Unexpected key-value argument."
-                        "Got: {}, but expected: sharding_key", arg_name);
         }
-        cluster_description = configuration.addresses_expr;
-        if (cluster_description.empty())
-            cluster_description = configuration.port ? configuration.host + ':' + toString(configuration.port) : configuration.host;
+        else
+            database = named_collection->getAnyOrDefault<String>({"db", "database"}, "default");
+
+        cluster_description = named_collection->getOrDefault<String>("addresses_expr", "");
+        if (cluster_description.empty() && named_collection->hasAny({"host", "hostname"}))
+            cluster_description = named_collection->has("port")
+                ? named_collection->getAny<String>({"host", "hostname"}) + ':' + toString(named_collection->get<UInt64>("port"))
+                : named_collection->getAny<String>({"host", "hostname"});
+        table = named_collection->get<String>("table");
+        username = named_collection->getAnyOrDefault<String>({"username", "user"}, "default");
+        password = named_collection->getOrDefault<String>("password", "");
     }
     else
     {
@@ -159,11 +150,11 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr
         else
         {
             args[arg_num] = evaluateConstantExpressionForDatabaseName(args[arg_num], context);
-            configuration.database = checkAndGetLiteralArgument<String>(args[arg_num], "database");
+            database = checkAndGetLiteralArgument<String>(args[arg_num], "database");
 
             ++arg_num;
 
-            auto qualified_name = QualifiedTableName::parseFromString(configuration.database);
+            auto qualified_name = QualifiedTableName::parseFromString(database);
             if (qualified_name.database.empty())
             {
                 if (arg_num >= args.size())
@@ -179,8 +170,8 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr
                 }
             }
 
-            configuration.database = std::move(qualified_name.database);
-            configuration.table = std::move(qualified_name.table);
+            database = std::move(qualified_name.database);
+            table = std::move(qualified_name.table);
 
             /// Cluster function may have sharding key for insert
             if (is_cluster_function && arg_num < args.size())
@@ -195,9 +186,9 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr
         {
             if (arg_num < args.size())
             {
-                if (!get_string_literal(*args[arg_num], configuration.username))
+                if (!get_string_literal(*args[arg_num], username))
                 {
-                    configuration.username = "default";
+                    username = "default";
                     sharding_key = args[arg_num];
                 }
                 ++arg_num;
@@ -205,7 +196,7 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr
 
             if (arg_num < args.size() && !sharding_key)
             {
-                if (!get_string_literal(*args[arg_num], configuration.password))
+                if (!get_string_literal(*args[arg_num], password))
                 {
                     sharding_key = args[arg_num];
                 }
@@ -264,22 +255,25 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr
 
         bool treat_local_as_remote = false;
         bool treat_local_port_as_remote = context->getApplicationType() == Context::ApplicationType::LOCAL;
-        cluster = std::make_shared<Cluster>(
-            context->getSettingsRef(),
-            names,
-            configuration.username,
-            configuration.password,
-            (secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context->getTCPPort()),
+        ClusterConnectionParameters params{
+            username,
+            password,
+            static_cast<UInt16>(secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context->getTCPPort()),
             treat_local_as_remote,
             treat_local_port_as_remote,
-            secure);
+            secure,
+            /* priority= */ 1,
+            /* cluster_name= */ "",
+            /* password= */ ""
+        };
+        cluster = std::make_shared<Cluster>(context->getSettingsRef(), names, params);
     }
 
-    if (!remote_table_function_ptr && configuration.table.empty())
+    if (!remote_table_function_ptr && table.empty())
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "The name of remote table cannot be empty");
 
-    remote_table_id.database_name = configuration.database;
-    remote_table_id.table_name = configuration.table;
+    remote_table_id.database_name = database;
+    remote_table_id.table_name = table;
 }
 
 StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const
diff --git a/src/TableFunctions/TableFunctionS3.cpp b/src/TableFunctions/TableFunctionS3.cpp
index 1994787f831..c8cc0cddd30 100644
--- a/src/TableFunctions/TableFunctionS3.cpp
+++ b/src/TableFunctions/TableFunctionS3.cpp
@@ -10,13 +10,16 @@
 #include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Access/Common/AccessFlags.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/StorageS3.h>
 #include <Storages/StorageURL.h>
 #include <Storages/NamedCollectionsHelpers.h>
 #include <Formats/FormatFactory.h>
 #include "registerTableFunctions.h"
-#include <filesystem>
+
+#include <boost/algorithm/string.hpp>
 
 
 namespace DB
@@ -25,23 +28,23 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int LOGICAL_ERROR;
 }
 
 
 /// This is needed to avoid copy-pase. Because s3Cluster arguments only differ in additional argument (first) - cluster name
-void TableFunctionS3::parseArgumentsImpl(
-    const String & error_message, ASTs & args, ContextPtr context, StorageS3::Configuration & s3_configuration, bool get_format_from_file)
+void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context)
 {
-    if (auto named_collection = tryGetNamedCollectionWithOverrides(args))
+    if (auto named_collection = tryGetNamedCollectionWithOverrides(args, context))
     {
-        StorageS3::processNamedCollectionResult(s3_configuration, *named_collection);
+        StorageS3::processNamedCollectionResult(configuration, *named_collection);
     }
     else
     {
         if (args.empty() || args.size() > 6)
-            throw Exception::createDeprecated(error_message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "The signature of table function {} shall be the following:\n{}", getName(), getSignature());
 
-        auto * header_it = StorageURL::collectHeaders(args, s3_configuration.headers_from_ast, context);
+        auto * header_it = StorageURL::collectHeaders(args, configuration.headers_from_ast, context);
         if (header_it != args.end())
             args.erase(header_it);
 
@@ -52,78 +55,241 @@ void TableFunctionS3::parseArgumentsImpl(
         static std::unordered_map<size_t, std::unordered_map<std::string_view, size_t>> size_to_args
         {
             {1, {{}}},
-            {2, {{"format", 1}}},
-            {5, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}}},
             {6, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}, {"compression_method", 5}}}
         };
 
         std::unordered_map<std::string_view, size_t> args_to_idx;
-        /// For 4 arguments we support 2 possible variants:
-        /// s3(source, format, structure, compression_method) and s3(source, access_key_id, access_key_id, format)
-        /// We can distinguish them by looking at the 2-nd argument: check if it's a format name or not.
-        if (args.size() == 4)
-        {
-            auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/access_key_id");
-            if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
-                args_to_idx = {{"format", 1}, {"structure", 2}, {"compression_method", 3}};
 
+        bool no_sign_request = false;
+
+        /// For 2 arguments we support 2 possible variants:
+        /// - s3(source, format)
+        /// - s3(source, NOSIGN)
+        /// We can distinguish them by looking at the 2-nd argument: check if it's NOSIGN or not.
+        if (args.size() == 2)
+        {
+            auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/NOSIGN");
+            if (boost::iequals(second_arg, "NOSIGN"))
+                no_sign_request = true;
             else
-                args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}};
+                args_to_idx = {{"format", 1}};
         }
-        /// For 3 arguments we support 2 possible variants:
-        /// s3(source, format, structure) and s3(source, access_key_id, access_key_id)
+        /// For 3 arguments we support 3 possible variants:
+        /// - s3(source, format, structure)
+        /// - s3(source, access_key_id, access_key_id)
+        /// - s3(source, NOSIGN, format)
         /// We can distinguish them by looking at the 2-nd argument: check if it's a format name or not.
         else if (args.size() == 3)
         {
-
-            auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/access_key_id");
-            if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
+            auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/access_key_id/NOSIGN");
+            if (boost::iequals(second_arg, "NOSIGN"))
+            {
+                no_sign_request = true;
+                args_to_idx = {{"format", 2}};
+            }
+            else if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
                 args_to_idx = {{"format", 1}, {"structure", 2}};
             else
                 args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}};
         }
+        /// For 4 arguments we support 3 possible variants:
+        /// - s3(source, format, structure, compression_method),
+        /// - s3(source, access_key_id, access_key_id, format)
+        /// - s3(source, NOSIGN, format, structure)
+        /// We can distinguish them by looking at the 2-nd argument: check if it's a format name or not.
+        else if (args.size() == 4)
+        {
+            auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/access_key_id/NOSIGN");
+            if (boost::iequals(second_arg, "NOSIGN"))
+            {
+                no_sign_request = true;
+                args_to_idx = {{"format", 2}, {"structure", 3}};
+            }
+            else if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
+                args_to_idx = {{"format", 1}, {"structure", 2}, {"compression_method", 3}};
+            else
+                args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}};
+        }
+        /// For 5 arguments we support 2 possible variants:
+        /// - s3(source, access_key_id, access_key_id, format, structure)
+        /// - s3(source, NOSIGN, format, structure, compression_method)
+        /// We can distinguish them by looking at the 2-nd argument: check if it's a NOSIGN keyword name or not.
+        else if (args.size() == 5)
+        {
+            auto second_arg = checkAndGetLiteralArgument<String>(args[1], "NOSIGN/access_key_id");
+            if (boost::iequals(second_arg, "NOSIGN"))
+            {
+                no_sign_request = true;
+                args_to_idx = {{"format", 2}, {"structure", 3}, {"compression_method", 4}};
+            }
+            else
+                args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}};
+        }
         else
         {
             args_to_idx = size_to_args[args.size()];
         }
 
         /// This argument is always the first
-        s3_configuration.url = S3::URI(checkAndGetLiteralArgument<String>(args[0], "url"));
+        configuration.url = S3::URI(checkAndGetLiteralArgument<String>(args[0], "url"));
 
         if (args_to_idx.contains("format"))
-            s3_configuration.format = checkAndGetLiteralArgument<String>(args[args_to_idx["format"]], "format");
+        {
+            auto format = checkAndGetLiteralArgument<String>(args[args_to_idx["format"]], "format");
+            /// Set format to configuration only of it's not 'auto',
+            /// because we can have default format set in configuration.
+            if (format != "auto")
+                configuration.format = format;
+        }
 
         if (args_to_idx.contains("structure"))
-            s3_configuration.structure = checkAndGetLiteralArgument<String>(args[args_to_idx["structure"]], "structure");
+            configuration.structure = checkAndGetLiteralArgument<String>(args[args_to_idx["structure"]], "structure");
 
         if (args_to_idx.contains("compression_method"))
-            s3_configuration.compression_method = checkAndGetLiteralArgument<String>(args[args_to_idx["compression_method"]], "compression_method");
+            configuration.compression_method = checkAndGetLiteralArgument<String>(args[args_to_idx["compression_method"]], "compression_method");
 
         if (args_to_idx.contains("access_key_id"))
-            s3_configuration.auth_settings.access_key_id = checkAndGetLiteralArgument<String>(args[args_to_idx["access_key_id"]], "access_key_id");
+            configuration.auth_settings.access_key_id = checkAndGetLiteralArgument<String>(args[args_to_idx["access_key_id"]], "access_key_id");
 
         if (args_to_idx.contains("secret_access_key"))
-            s3_configuration.auth_settings.secret_access_key = checkAndGetLiteralArgument<String>(args[args_to_idx["secret_access_key"]], "secret_access_key");
+            configuration.auth_settings.secret_access_key = checkAndGetLiteralArgument<String>(args[args_to_idx["secret_access_key"]], "secret_access_key");
+
+        configuration.auth_settings.no_sign_request = no_sign_request;
     }
 
-    /// For DataLake table functions, we should specify default format.
-    if (s3_configuration.format == "auto" && get_format_from_file)
-        s3_configuration.format = FormatFactory::instance().getFormatFromFileName(s3_configuration.url.uri.getPath(), true);
+    configuration.keys = {configuration.url.key};
+
+    if (configuration.format == "auto")
+        configuration.format = FormatFactory::instance().getFormatFromFileName(configuration.url.uri.getPath(), true);
 }
 
 void TableFunctionS3::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
+    /// Clone ast function, because we can modify its arguments like removing headers.
+    auto ast_copy = ast_function->clone();
+
     /// Parse args
     ASTs & args_func = ast_function->children;
 
-    const auto message = fmt::format("The signature of table function '{}' could be the following:\n{}", getName(), signature);
-
     if (args_func.size() != 1)
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' must have arguments.", getName());
 
     auto & args = args_func.at(0)->children;
 
-    parseArgumentsImpl(message, args, context, configuration);
+    parseArgumentsImpl(args, context);
+}
+
+void TableFunctionS3::addColumnsStructureToArguments(ASTs & args, const String & structure, const ContextPtr & context)
+{
+    if (tryGetNamedCollectionWithOverrides(args, context))
+    {
+        /// In case of named collection, just add key-value pair "structure='...'"
+        /// at the end of arguments to override existed structure.
+        ASTs equal_func_args = {std::make_shared<ASTIdentifier>("structure"), std::make_shared<ASTLiteral>(structure)};
+        auto equal_func = makeASTFunction("equals", std::move(equal_func_args));
+        args.push_back(equal_func);
+    }
+    else
+    {
+        /// If arguments contain headers, just remove it and add to the end of arguments later
+        /// (header argument can be at any position).
+        HTTPHeaderEntries tmp_headers;
+        auto * headers_it = StorageURL::collectHeaders(args, tmp_headers, context);
+        ASTPtr headers_ast;
+        if (headers_it != args.end())
+        {
+            headers_ast = *headers_it;
+            args.erase(headers_it);
+        }
+
+        if (args.empty() || args.size() > getMaxNumberOfArguments())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected 1 to {} arguments in table function, got {}", getMaxNumberOfArguments(), args.size());
+
+        auto structure_literal = std::make_shared<ASTLiteral>(structure);
+
+        /// s3(s3_url)
+        if (args.size() == 1)
+        {
+            /// Add format=auto before structure argument.
+            args.push_back(std::make_shared<ASTLiteral>("auto"));
+            args.push_back(structure_literal);
+        }
+        /// s3(s3_url, format) or s3(s3_url, NOSIGN)
+        /// We can distinguish them by looking at the 2-nd argument: check if it's NOSIGN or not.
+        else if (args.size() == 2)
+        {
+            auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/NOSIGN");
+            /// If there is NOSIGN, add format=auto before structure.
+            if (boost::iequals(second_arg, "NOSIGN"))
+                args.push_back(std::make_shared<ASTLiteral>("auto"));
+            args.push_back(structure_literal);
+        }
+        /// s3(source, format, structure) or
+        /// s3(source, access_key_id, access_key_id) or
+        /// s3(source, NOSIGN, format)
+        /// We can distinguish them by looking at the 2-nd argument: check if it's NOSIGN, format name or neither.
+        else if (args.size() == 3)
+        {
+            auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/NOSIGN");
+            if (boost::iequals(second_arg, "NOSIGN"))
+            {
+                args.push_back(structure_literal);
+            }
+            else if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
+            {
+                args.back() = structure_literal;
+            }
+            else
+            {
+                /// Add format=auto before structure argument.
+                args.push_back(std::make_shared<ASTLiteral>("auto"));
+                args.push_back(structure_literal);
+            }
+        }
+        /// s3(source, format, structure, compression_method) or
+        /// s3(source, access_key_id, access_key_id, format) or
+        /// s3(source, NOSIGN, format, structure)
+        /// We can distinguish them by looking at the 2-nd argument: check if it's NOSIGN, format name or neither.
+        else if (args.size() == 4)
+        {
+            auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/NOSIGN");
+            if (boost::iequals(second_arg, "NOSIGN"))
+            {
+                args.back() = structure_literal;
+            }
+            else if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
+            {
+                args[args.size() - 2] = structure_literal;
+            }
+            else
+            {
+                args.push_back(structure_literal);
+            }
+        }
+        /// s3(source, access_key_id, access_key_id, format, structure) or
+        /// s3(source, NOSIGN, format, structure, compression_method)
+        /// We can distinguish them by looking at the 2-nd argument: check if it's a NOSIGN keyword name or not.
+        else if (args.size() == 5)
+        {
+            auto sedond_arg = checkAndGetLiteralArgument<String>(args[1], "format/NOSIGN");
+            if (boost::iequals(sedond_arg, "NOSIGN"))
+            {
+                args[args.size() - 2] = structure_literal;
+            }
+            else
+            {
+                args.back() = structure_literal;
+            }
+        }
+        /// s3(source, access_key_id, access_key_id, format, structure, compression)
+        else if (args.size() == 6)
+        {
+            args[args.size() - 2] = structure_literal;
+        }
+
+        if (headers_ast)
+            args.push_back(headers_ast);
+    }
 }
 
 ColumnsDescription TableFunctionS3::getActualTableStructure(ContextPtr context) const
@@ -131,6 +297,7 @@ ColumnsDescription TableFunctionS3::getActualTableStructure(ContextPtr context)
     if (configuration.structure == "auto")
     {
         context->checkAccess(getSourceAccessType());
+        configuration.update(context);
         return StorageS3::getTableStructureFromData(configuration, std::nullopt, context);
     }
 
@@ -154,11 +321,11 @@ StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, Context
 
     StoragePtr storage = std::make_shared<StorageS3>(
         configuration,
+        context,
         StorageID(getDatabaseName(), table_name),
         columns,
         ConstraintsDescription{},
         String{},
-        context,
         /// No format_settings for table function S3
         std::nullopt);
 
@@ -168,11 +335,64 @@ StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, Context
 }
 
 
+class TableFunctionGCS : public TableFunctionS3
+{
+public:
+    static constexpr auto name = "gcs";
+    std::string getName() const override
+    {
+        return name;
+    }
+private:
+    const char * getStorageTypeName() const override { return "GCS"; }
+};
+
+class TableFunctionCOS : public TableFunctionS3
+{
+public:
+    static constexpr auto name = "cosn";
+    std::string getName() const override
+    {
+        return name;
+    }
+private:
+    const char * getStorageTypeName() const override { return "COSN"; }
+};
+
+class TableFunctionOSS : public TableFunctionS3
+{
+public:
+    static constexpr auto name = "oss";
+    std::string getName() const override
+    {
+        return name;
+    }
+private:
+    const char * getStorageTypeName() const override { return "OSS"; }
+};
+
+
+void registerTableFunctionGCS(TableFunctionFactory & factory)
+{
+    factory.registerFunction<TableFunctionGCS>(
+        {.documentation
+         = {.description=R"(The table function can be used to read the data stored on Google Cloud Storage.)",
+            .examples{{"gcs", "SELECT * FROM gcs(url, hmac_key, hmac_secret)", ""}},
+            .categories{"DataLake"}},
+         .allow_readonly = false});
+}
+
 void registerTableFunctionS3(TableFunctionFactory & factory)
 {
-    factory.registerFunction<TableFunctionS3>();
+    factory.registerFunction<TableFunctionS3>(
+        {.documentation
+         = {.description=R"(The table function can be used to read the data stored on AWS S3.)",
+            .examples{{"s3", "SELECT * FROM s3(url, access_key_id, secret_access_key)", ""}},
+            .categories{"DataLake"}},
+         .allow_readonly = false});
 }
 
+
 void registerTableFunctionCOS(TableFunctionFactory & factory)
 {
     factory.registerFunction<TableFunctionCOS>();
diff --git a/src/TableFunctions/TableFunctionS3.h b/src/TableFunctions/TableFunctionS3.h
index 859da9e9201..c983bec9bf4 100644
--- a/src/TableFunctions/TableFunctionS3.h
+++ b/src/TableFunctions/TableFunctionS3.h
@@ -13,7 +13,7 @@ namespace DB
 
 class Context;
 
-/* s3(source, [access_key_id, secret_access_key,] format, structure[, compression]) - creates a temporary storage for a file in S3.
+/* s3(source, [access_key_id, secret_access_key,] [format, structure, compression]) - creates a temporary storage for a file in S3.
  */
 class TableFunctionS3 : public ITableFunction
 {
@@ -26,11 +26,21 @@ public:
                                       " - url, format, structure, compression_method\n"
                                       " - url, access_key_id, secret_access_key, format\n"
                                       " - url, access_key_id, secret_access_key, format, structure\n"
-                                      " - url, access_key_id, secret_access_key, format, structure, compression_method";
-    std::string getName() const override
+                                      " - url, access_key_id, secret_access_key, format, structure, compression_method\n"
+                                      "All signatures supports optional headers (specified as `headers('name'='value', 'name2'='value2')`)";
+
+    static size_t getMaxNumberOfArguments() { return 6; }
+
+    String getName() const override
     {
         return name;
     }
+
+    virtual String getSignature() const
+    {
+        return signature;
+    }
+
     bool hasStaticStructure() const override { return configuration.structure != "auto"; }
 
     bool needStructureHint() const override { return configuration.structure == "auto"; }
@@ -43,12 +53,10 @@ public:
     {
         return {"_path", "_file"};
     }
-    static void parseArgumentsImpl(
-        const String & error_message,
-        ASTs & args,
-        ContextPtr context,
-        StorageS3::Configuration & configuration,
-        bool get_format_from_file = true);
+
+    virtual void parseArgumentsImpl(ASTs & args, const ContextPtr & context);
+
+    static void addColumnsStructureToArguments(ASTs & args, const String & structure, const ContextPtr & context);
 
 protected:
 
@@ -67,30 +75,6 @@ protected:
     ColumnsDescription structure_hint;
 };
 
-class TableFunctionCOS : public TableFunctionS3
-{
-public:
-    static constexpr auto name = "cosn";
-    std::string getName() const override
-    {
-        return name;
-    }
-private:
-    const char * getStorageTypeName() const override { return "COSN"; }
-};
-
-class TableFunctionOSS : public TableFunctionS3
-{
-public:
-    static constexpr auto name = "oss";
-    std::string getName() const override
-    {
-        return name;
-    }
-private:
-    const char * getStorageTypeName() const override { return "OSS"; }
-};
-
 }
 
 #endif
diff --git a/src/TableFunctions/TableFunctionS3Cluster.cpp b/src/TableFunctions/TableFunctionS3Cluster.cpp
index 4e9a4c0c5f9..1d93132c411 100644
--- a/src/TableFunctions/TableFunctionS3Cluster.cpp
+++ b/src/TableFunctions/TableFunctionS3Cluster.cpp
@@ -2,91 +2,19 @@
 
 #if USE_AWS_S3
 
-#include <Storages/StorageS3.h>
-#include <Storages/checkAndGetLiteralArgument.h>
-
-#include <DataTypes/DataTypeString.h>
-#include <IO/S3Common.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/ClientInfo.h>
-#include <TableFunctions/TableFunctionFactory.h>
-#include <TableFunctions/TableFunctionS3.h>
 #include <TableFunctions/TableFunctionS3Cluster.h>
+#include <TableFunctions/TableFunctionFactory.h>
 #include <Interpreters/parseColumnsListForTableFunction.h>
-#include <Access/Common/AccessFlags.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/IAST_fwd.h>
+#include <Storages/StorageS3.h>
 
 #include "registerTableFunctions.h"
 
 #include <memory>
-#include <thread>
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int BAD_GET;
-}
-
-
-void TableFunctionS3Cluster::parseArguments(const ASTPtr & ast_function, ContextPtr context)
-{
-    /// Parse args
-    ASTs & args_func = ast_function->children;
-
-    if (args_func.size() != 1)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' must have arguments.", getName());
-
-    ASTs & args = args_func.at(0)->children;
-
-    for (auto & arg : args)
-        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
-
-    constexpr auto fmt_string = "The signature of table function {} could be the following:\n"
-                                " - cluster, url\n"
-                                " - cluster, url, format\n"
-                                " - cluster, url, format, structure\n"
-                                " - cluster, url, access_key_id, secret_access_key\n"
-                                " - cluster, url, format, structure, compression_method\n"
-                                " - cluster, url, access_key_id, secret_access_key, format\n"
-                                " - cluster, url, access_key_id, secret_access_key, format, structure\n"
-                                " - cluster, url, access_key_id, secret_access_key, format, structure, compression_method";
-    auto message = PreformattedMessage{fmt::format(fmt_string, getName()), fmt_string};
-    if (args.size() < 2 || args.size() > 7)
-        throw Exception::createDeprecated(message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-    /// This arguments are always the first
-    configuration.cluster_name = checkAndGetLiteralArgument<String>(args[0], "cluster_name");
-
-    if (!context->tryGetCluster(configuration.cluster_name))
-        throw Exception(ErrorCodes::BAD_GET, "Requested cluster '{}' not found", configuration.cluster_name);
-
-    /// Just cut the first arg (cluster_name) and try to parse s3 table function arguments as is
-    ASTs clipped_args;
-    clipped_args.reserve(args.size());
-    std::copy(args.begin() + 1, args.end(), std::back_inserter(clipped_args));
-
-    /// StorageS3ClusterConfiguration inherints from StorageS3::Configuration, so it is safe to upcast it.
-    TableFunctionS3::parseArgumentsImpl(message.text, clipped_args, context, static_cast<StorageS3::Configuration &>(configuration));
-}
-
-
-ColumnsDescription TableFunctionS3Cluster::getActualTableStructure(ContextPtr context) const
-{
-    context->checkAccess(getSourceAccessType());
-
-    if (configuration.structure == "auto")
-        return StorageS3::getTableStructureFromData(configuration, std::nullopt, context);
-
-    return parseColumnsListFromString(configuration.structure, context);
-}
-
 StoragePtr TableFunctionS3Cluster::executeImpl(
     const ASTPtr & /*function*/, ContextPtr context,
     const std::string & table_name, ColumnsDescription /*cached_columns*/) const
@@ -109,17 +37,18 @@ StoragePtr TableFunctionS3Cluster::executeImpl(
         /// On worker node this filename won't contains globs
         storage = std::make_shared<StorageS3>(
             configuration,
+            context,
             StorageID(getDatabaseName(), table_name),
             columns,
             ConstraintsDescription{},
             /* comment */String{},
-            context,
             /* format_settings */std::nullopt, /// No format_settings for S3Cluster
             /*distributed_processing=*/true);
     }
     else
     {
         storage = std::make_shared<StorageS3Cluster>(
+            cluster_name,
             configuration,
             StorageID(getDatabaseName(), table_name),
             columns,
diff --git a/src/TableFunctions/TableFunctionS3Cluster.h b/src/TableFunctions/TableFunctionS3Cluster.h
index 17df8999470..459ff144f02 100644
--- a/src/TableFunctions/TableFunctionS3Cluster.h
+++ b/src/TableFunctions/TableFunctionS3Cluster.h
@@ -5,6 +5,8 @@
 #if USE_AWS_S3
 
 #include <TableFunctions/ITableFunction.h>
+#include <TableFunctions/TableFunctionS3.h>
+#include <TableFunctions/ITableFunctionCluster.h>
 #include <Storages/StorageS3Cluster.h>
 
 
@@ -14,27 +16,36 @@ namespace DB
 class Context;
 
 /**
- * s3cluster(cluster_name, source, [access_key_id, secret_access_key,] format, structure)
+ * s3cluster(cluster_name, source, [access_key_id, secret_access_key,] format, structure, compression_method)
  * A table function, which allows to process many files from S3 on a specific cluster
- * On initiator it creates a connection to _all_ nodes in cluster, discloses asterics
+ * On initiator it creates a connection to _all_ nodes in cluster, discloses asterisks
  * in S3 file path and dispatch each file dynamically.
  * On worker node it asks initiator about next task to process, processes it.
  * This is repeated until the tasks are finished.
  */
-class TableFunctionS3Cluster : public ITableFunction
+class TableFunctionS3Cluster : public ITableFunctionCluster<TableFunctionS3>
 {
 public:
     static constexpr auto name = "s3Cluster";
-    std::string getName() const override
+    static constexpr auto signature = " - cluster, url\n"
+                                      " - cluster, url, format\n"
+                                      " - cluster, url, format, structure\n"
+                                      " - cluster, url, access_key_id, secret_access_key\n"
+                                      " - cluster, url, format, structure, compression_method\n"
+                                      " - cluster, url, access_key_id, secret_access_key, format\n"
+                                      " - cluster, url, access_key_id, secret_access_key, format, structure\n"
+                                      " - cluster, url, access_key_id, secret_access_key, format, structure, compression_method\n"
+                                      "All signatures supports optional headers (specified as `headers('name'='value', 'name2'='value2')`)";
+
+    String getName() const override
     {
         return name;
     }
 
-    bool hasStaticStructure() const override { return configuration.structure != "auto"; }
-
-    bool needStructureHint() const override { return configuration.structure == "auto"; }
-
-    void setStructureHint(const ColumnsDescription & structure_hint_) override { structure_hint = structure_hint_; }
+    String getSignature() const override
+    {
+        return signature;
+    }
 
 protected:
     StoragePtr executeImpl(
@@ -44,14 +55,6 @@ protected:
         ColumnsDescription cached_columns) const override;
 
     const char * getStorageTypeName() const override { return "S3Cluster"; }
-
-    AccessType getSourceAccessType() const override { return AccessType::S3; }
-
-    ColumnsDescription getActualTableStructure(ContextPtr) const override;
-    void parseArguments(const ASTPtr &, ContextPtr) override;
-
-    mutable StorageS3Cluster::Configuration configuration;
-    ColumnsDescription structure_hint;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionSQLite.cpp b/src/TableFunctions/TableFunctionSQLite.cpp
index 13c6fcea60c..a9831363bd9 100644
--- a/src/TableFunctions/TableFunctionSQLite.cpp
+++ b/src/TableFunctions/TableFunctionSQLite.cpp
@@ -5,7 +5,6 @@
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
 
-#include <Databases/SQLite/fetchSQLiteTableStructure.h>
 #include <Databases/SQLite/SQLiteUtils.h>
 #include "registerTableFunctions.h"
 
@@ -26,20 +25,17 @@ namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int BAD_ARGUMENTS;
-    extern const int SQLITE_ENGINE_ERROR;
 }
 
 
 StoragePtr TableFunctionSQLite::executeImpl(const ASTPtr & /*ast_function*/,
         ContextPtr context, const String & table_name, ColumnsDescription /*cached_columns*/) const
 {
-    auto columns = getActualTableStructure(context);
-
     auto storage = std::make_shared<StorageSQLite>(StorageID(getDatabaseName(), table_name),
                                          sqlite_db,
                                          database_path,
                                          remote_table_name,
-                                         columns, ConstraintsDescription{}, context);
+                                         ColumnsDescription{}, ConstraintsDescription{}, context);
 
     storage->startup();
     return storage;
@@ -48,12 +44,7 @@ StoragePtr TableFunctionSQLite::executeImpl(const ASTPtr & /*ast_function*/,
 
 ColumnsDescription TableFunctionSQLite::getActualTableStructure(ContextPtr /* context */) const
 {
-    auto columns = fetchSQLiteTableStructure(sqlite_db.get(), remote_table_name);
-
-    if (!columns)
-        throw Exception(ErrorCodes::SQLITE_ENGINE_ERROR, "Failed to fetch table structure for {}", remote_table_name);
-
-    return ColumnsDescription{*columns};
+    return StorageSQLite::getTableStructureFromData(sqlite_db, remote_table_name);
 }
 
 
diff --git a/src/TableFunctions/TableFunctionURL.cpp b/src/TableFunctions/TableFunctionURL.cpp
index 5de6c6b4ccc..4ed204a2af3 100644
--- a/src/TableFunctions/TableFunctionURL.cpp
+++ b/src/TableFunctions/TableFunctionURL.cpp
@@ -9,34 +9,43 @@
 #include <Storages/StorageExternalDistributed.h>
 #include <Storages/NamedCollectionsHelpers.h>
 #include <TableFunctions/TableFunctionFactory.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/TableFunctionNode.h>
 #include <Interpreters/parseColumnsListForTableFunction.h>
-#include <Interpreters/Context.h>
 #include <Formats/FormatFactory.h>
 
-
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferFromVector.h>
 namespace DB
 {
-static const String bad_arguments_error_message = "Table function URL can have the following arguments: "
-    "url, name of used format (taken from file extension by default), "
-    "optional table structure, optional compression method, "
-    "optional headers (specified as `headers('name'='value', 'name2'='value2')`)";
 
-namespace ErrorCodes
+std::vector<size_t> TableFunctionURL::skipAnalysisForArguments(const QueryTreeNodePtr & query_node_table_function, ContextPtr) const
 {
-    extern const int BAD_ARGUMENTS;
+    auto & table_function_node = query_node_table_function->as<TableFunctionNode &>();
+    auto & table_function_arguments_nodes = table_function_node.getArguments().getNodes();
+    size_t table_function_arguments_size = table_function_arguments_nodes.size();
+
+    std::vector<size_t> result;
+
+    for (size_t i = 0; i < table_function_arguments_size; ++i)
+    {
+        auto * function_node = table_function_arguments_nodes[i]->as<FunctionNode>();
+        if (function_node && function_node->getFunctionName() == "headers")
+            result.push_back(i);
+    }
+
+    return result;
 }
 
 void TableFunctionURL::parseArguments(const ASTPtr & ast, ContextPtr context)
 {
-    const auto & ast_function = assert_cast<const ASTFunction *>(ast.get());
+    /// Clone ast function, because we can modify it's arguments like removing headers.
+    ITableFunctionFileLike::parseArguments(ast->clone(), context);
+}
 
-    const auto & args = ast_function->children;
-    if (args.empty())
-        throw Exception::createDeprecated(bad_arguments_error_message, ErrorCodes::BAD_ARGUMENTS);
-
-    auto & url_function_args = assert_cast<ASTExpressionList *>(args[0].get())->children;
-
-    if (auto named_collection = tryGetNamedCollectionWithOverrides(url_function_args))
+void TableFunctionURL::parseArgumentsImpl(ASTs & args, const ContextPtr & context)
+{
+    if (auto named_collection = tryGetNamedCollectionWithOverrides(args, context))
     {
         StorageURL::processNamedCollectionResult(configuration, *named_collection);
 
@@ -48,16 +57,46 @@ void TableFunctionURL::parseArguments(const ASTPtr & ast, ContextPtr context)
         if (format == "auto")
             format = FormatFactory::instance().getFormatFromFileName(Poco::URI(filename).getPath(), true);
 
-        StorageURL::collectHeaders(url_function_args, configuration.headers, context);
+        StorageURL::collectHeaders(args, configuration.headers, context);
     }
     else
     {
-        auto * headers_it = StorageURL::collectHeaders(url_function_args, configuration.headers, context);
+        auto * headers_it = StorageURL::collectHeaders(args, configuration.headers, context);
         /// ITableFunctionFileLike cannot parse headers argument, so remove it.
-        if (headers_it != url_function_args.end())
-            url_function_args.erase(headers_it);
+        if (headers_it != args.end())
+            args.erase(headers_it);
 
-        ITableFunctionFileLike::parseArguments(ast, context);
+        ITableFunctionFileLike::parseArgumentsImpl(args, context);
+    }
+}
+
+void TableFunctionURL::addColumnsStructureToArguments(ASTs & args, const String & desired_structure, const ContextPtr & context)
+{
+    if (tryGetNamedCollectionWithOverrides(args, context))
+    {
+        /// In case of named collection, just add key-value pair "structure='...'"
+        /// at the end of arguments to override existed structure.
+        ASTs equal_func_args = {std::make_shared<ASTIdentifier>("structure"), std::make_shared<ASTLiteral>(desired_structure)};
+        auto equal_func = makeASTFunction("equals", std::move(equal_func_args));
+        args.push_back(equal_func);
+    }
+    else
+    {
+        /// If arguments contain headers, just remove it and add to the end of arguments later
+        /// (header argument can be at any position).
+        HTTPHeaderEntries tmp_headers;
+        auto * headers_it = StorageURL::collectHeaders(args, tmp_headers, context);
+        ASTPtr headers_ast;
+        if (headers_it != args.end())
+        {
+            headers_ast = *headers_it;
+            args.erase(headers_it);
+        }
+
+        ITableFunctionFileLike::addColumnsStructureToArguments(args, desired_structure, context);
+
+        if (headers_ast)
+            args.push_back(headers_ast);
     }
 }
 
diff --git a/src/TableFunctions/TableFunctionURL.h b/src/TableFunctions/TableFunctionURL.h
index a670bdc0682..021eb71df53 100644
--- a/src/TableFunctions/TableFunctionURL.h
+++ b/src/TableFunctions/TableFunctionURL.h
@@ -10,23 +10,41 @@ namespace DB
 
 class Context;
 
-/* url(source, format[, structure, compression]) - creates a temporary storage from url.
+/* url(source, [format, structure, compression]) - creates a temporary storage from url.
  */
 class TableFunctionURL : public ITableFunctionFileLike
 {
 public:
     static constexpr auto name = "url";
-    std::string getName() const override
+    static constexpr auto signature = " - uri\n"
+                                      " - uri, format\n"
+                                      " - uri, format, structure\n"
+                                      " - uri, format, structure, compression_method\n"
+                                      "All signatures supports optional headers (specified as `headers('name'='value', 'name2'='value2')`)";
+
+    String getName() const override
     {
         return name;
     }
 
+    String getSignature() const override
+    {
+        return signature;
+    }
+
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
+    static void addColumnsStructureToArguments(ASTs & args, const String & desired_structure, const ContextPtr & context);
+
 protected:
     void parseArguments(const ASTPtr & ast, ContextPtr context) override;
+    void parseArgumentsImpl(ASTs & args, const ContextPtr & context) override;
+
+    StorageURL::Configuration configuration;
 
 private:
+    std::vector<size_t> skipAnalysisForArguments(const QueryTreeNodePtr & query_node_table_function, ContextPtr context) const override;
+
     StoragePtr getStorage(
         const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
         const std::string & table_name, const String & compression_method_) const override;
@@ -35,7 +53,6 @@ private:
 
     String getFormatFromFirstArgument() override;
 
-    StorageURL::Configuration configuration;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionURLCluster.cpp b/src/TableFunctions/TableFunctionURLCluster.cpp
new file mode 100644
index 00000000000..c94943db758
--- /dev/null
+++ b/src/TableFunctions/TableFunctionURLCluster.cpp
@@ -0,0 +1,54 @@
+#include <TableFunctions/TableFunctionURLCluster.h>
+#include <TableFunctions/TableFunctionFactory.h>
+
+#include "registerTableFunctions.h"
+
+namespace DB
+{
+
+StoragePtr TableFunctionURLCluster::getStorage(
+    const String & /*source*/, const String & /*format_*/, const ColumnsDescription & columns, ContextPtr context,
+    const std::string & table_name, const String & /*compression_method_*/) const
+{
+    StoragePtr storage;
+    if (context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY)
+    {
+        //On worker node this uri won't contain globs
+        storage = std::make_shared<StorageURL>(
+            filename,
+            StorageID(getDatabaseName(), table_name),
+            format,
+            std::nullopt /*format settings*/,
+            columns,
+            ConstraintsDescription{},
+            String{},
+            context,
+            compression_method,
+            configuration.headers,
+            configuration.http_method,
+            nullptr,
+            /*distributed_processing=*/ true);
+    }
+    else
+    {
+        storage = std::make_shared<StorageURLCluster>(
+            context,
+            cluster_name,
+            filename,
+            format,
+            compression_method,
+            StorageID(getDatabaseName(), table_name),
+            getActualTableStructure(context),
+            ConstraintsDescription{},
+            configuration,
+            structure != "auto");
+    }
+    return storage;
+}
+
+void registerTableFunctionURLCluster(TableFunctionFactory & factory)
+{
+    factory.registerFunction<TableFunctionURLCluster>();
+}
+
+}
diff --git a/src/TableFunctions/TableFunctionURLCluster.h b/src/TableFunctions/TableFunctionURLCluster.h
new file mode 100644
index 00000000000..be6992fcaaf
--- /dev/null
+++ b/src/TableFunctions/TableFunctionURLCluster.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <TableFunctions/ITableFunctionFileLike.h>
+#include <TableFunctions/TableFunctionURL.h>
+#include <TableFunctions/ITableFunctionCluster.h>
+#include <Storages/StorageURL.h>
+#include <Storages/StorageURLCluster.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
+
+
+namespace DB
+{
+
+class Context;
+
+/**
+ * urlCluster(cluster, URI, format, structure, compression_method)
+ * A table function, which allows to process many files from url on a specific cluster
+ * On initiator it creates a connection to _all_ nodes in cluster, discloses asterics
+ * in url file path and dispatch each file dynamically.
+ * On worker node it asks initiator about next task to process, processes it.
+ * This is repeated until the tasks are finished.
+ */
+class TableFunctionURLCluster : public ITableFunctionCluster<TableFunctionURL>
+{
+public:
+    static constexpr auto name = "urlCluster";
+    static constexpr auto signature = " - cluster, uri\n"
+                                      " - cluster, uri, format\n"
+                                      " - cluster, uri, format, structure\n"
+                                      " - cluster, uri, format, structure, compression_method\n"
+                                      "All signatures supports optional headers (specified as `headers('name'='value', 'name2'='value2')`)";
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    String getSignature() const override
+    {
+        return signature;
+    }
+
+protected:
+    StoragePtr getStorage(
+        const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
+        const std::string & table_name, const String & compression_method_) const override;
+
+    const char * getStorageTypeName() const override { return "URLCluster"; }
+};
+
+}
diff --git a/src/TableFunctions/TableFunctionZeros.cpp b/src/TableFunctions/TableFunctionZeros.cpp
index d1c67659f56..3c487362e1f 100644
--- a/src/TableFunctions/TableFunctionZeros.cpp
+++ b/src/TableFunctions/TableFunctionZeros.cpp
@@ -48,36 +48,29 @@ StoragePtr TableFunctionZeros<multithreaded>::executeImpl(const ASTPtr & ast_fun
 
 void registerTableFunctionZeros(TableFunctionFactory & factory)
 {
-    factory.registerFunction<TableFunctionZeros<true>>({.documentation = {R"(
-Generates a stream of zeros (a table with one column 'zero' of type 'UInt8') of specified size.
+    factory.registerFunction<TableFunctionZeros<true>>({.documentation = {
+            .description=R"(
+                Generates a stream of zeros (a table with one column 'zero' of type 'UInt8') of specified size.
+                This table function is used in performance tests, where you want to spend as little time as possible to data generation while testing some other parts of queries.
+                In contrast to the `zeros_mt`, this table function is using single thread for data generation.
+                Example:
+                [example:1]
+                This query will test the speed of `randomPrintableASCII` function using single thread.
+                See also the `system.zeros` table.)",
+            .examples={{"1", "SELECT count() FROM zeros(100000000) WHERE NOT ignore(randomPrintableASCII(10))", ""}}
+    }});
 
-This table function is used in performance tests, where you want to spend as little time as possible to data generation while testing some other parts of queries.
-
-In contrast to the `zeros_mt`, this table function is using single thread for data generation.
-
-Example:
-[example:1]
-This query will test the speed of `randomPrintableASCII` function using single thread.
-
-See also the `system.zeros` table.
-)",
-{{"1", "SELECT count() FROM zeros(100000000) WHERE NOT ignore(randomPrintableASCII(10))"}}
-}});
-
-    factory.registerFunction<TableFunctionZeros<false>>({.documentation = {R"(
-Generates a stream of zeros (a table with one column 'zero' of type 'UInt8') of specified size.
-
-This table function is used in performance tests, where you want to spend as little time as possible to data generation while testing some other parts of queries.
-
-In contrast to the `zeros`, this table function is using multiple threads for data generation, according to the `max_threads` setting.
-
-Example:
-[example:1]
-This query will test the speed of `randomPrintableASCII` function using multiple threads.
-
-See also the `system.zeros` table.
-)",
-{{"1", "SELECT count() FROM zeros_mt(1000000000) WHERE NOT ignore(randomPrintableASCII(10))"}}
+    factory.registerFunction<TableFunctionZeros<false>>({.documentation = {
+            .description=R"(
+                Generates a stream of zeros (a table with one column 'zero' of type 'UInt8') of specified size.
+                This table function is used in performance tests, where you want to spend as little time as possible to data generation while testing some other parts of queries.
+                In contrast to the `zeros`, this table function is using multiple threads for data generation, according to the `max_threads` setting.
+                Example:
+                [example:1]
+                This query will test the speed of `randomPrintableASCII` function using multiple threads.
+                See also the `system.zeros` table.
+                )",
+            .examples={{"1", "SELECT count() FROM zeros_mt(1000000000) WHERE NOT ignore(randomPrintableASCII(10))", ""}}
 }});
 }
 
diff --git a/src/TableFunctions/registerTableFunctions.cpp b/src/TableFunctions/registerTableFunctions.cpp
index 7b2b989e724..4f3411df4c5 100644
--- a/src/TableFunctions/registerTableFunctions.cpp
+++ b/src/TableFunctions/registerTableFunctions.cpp
@@ -16,6 +16,7 @@ void registerTableFunctions()
     registerTableFunctionExecutable(factory);
     registerTableFunctionFile(factory);
     registerTableFunctionURL(factory);
+    registerTableFunctionURLCluster(factory);
     registerTableFunctionValues(factory);
     registerTableFunctionInput(factory);
     registerTableFunctionGenerate(factory);
@@ -28,8 +29,11 @@ void registerTableFunctions()
     registerTableFunctionS3Cluster(factory);
     registerTableFunctionCOS(factory);
     registerTableFunctionOSS(factory);
+    registerTableFunctionGCS(factory);
     registerTableFunctionHudi(factory);
+#if USE_PARQUET
     registerTableFunctionDeltaLake(factory);
+#endif
 #if USE_AVRO
     registerTableFunctionIceberg(factory);
 #endif
diff --git a/src/TableFunctions/registerTableFunctions.h b/src/TableFunctions/registerTableFunctions.h
index 911aae199e2..c51522a5e99 100644
--- a/src/TableFunctions/registerTableFunctions.h
+++ b/src/TableFunctions/registerTableFunctions.h
@@ -13,6 +13,7 @@ void registerTableFunctionZeros(TableFunctionFactory & factory);
 void registerTableFunctionExecutable(TableFunctionFactory & factory);
 void registerTableFunctionFile(TableFunctionFactory & factory);
 void registerTableFunctionURL(TableFunctionFactory & factory);
+void registerTableFunctionURLCluster(TableFunctionFactory & factory);
 void registerTableFunctionValues(TableFunctionFactory & factory);
 void registerTableFunctionInput(TableFunctionFactory & factory);
 void registerTableFunctionGenerate(TableFunctionFactory & factory);
@@ -25,8 +26,11 @@ void registerTableFunctionS3(TableFunctionFactory & factory);
 void registerTableFunctionS3Cluster(TableFunctionFactory & factory);
 void registerTableFunctionCOS(TableFunctionFactory & factory);
 void registerTableFunctionOSS(TableFunctionFactory & factory);
+void registerTableFunctionGCS(TableFunctionFactory & factory);
 void registerTableFunctionHudi(TableFunctionFactory & factory);
+#if USE_PARQUET
 void registerTableFunctionDeltaLake(TableFunctionFactory & factory);
+#endif
 #if USE_AVRO
 void registerTableFunctionIceberg(TableFunctionFactory & factory);
 #endif
diff --git a/src/configure_config.cmake b/src/configure_config.cmake
index 9cb0d0efb39..c11a19b36ea 100644
--- a/src/configure_config.cmake
+++ b/src/configure_config.cmake
@@ -147,9 +147,15 @@ endif()
 if (TARGET ch_contrib::capnp)
     set(USE_CAPNP 1)
 endif()
+if (TARGET ch_contrib::bcrypt)
+    set(USE_BCRYPT 1)
+endif()
 if (NOT (ENABLE_OPENSSL OR ENABLE_OPENSSL_DYNAMIC))
     set(USE_BORINGSSL 1)
 endif ()
 if (ENABLE_OPENSSL)
     set(USE_OPENSSL_INTREE 1)
 endif ()
+if (TARGET ch_contrib::fiu)
+    set(FIU_ENABLE 1)
+endif()
diff --git a/tests/broken_tests.txt b/tests/broken_tests.txt
new file mode 100644
index 00000000000..faee1c5b295
--- /dev/null
+++ b/tests/broken_tests.txt
@@ -0,0 +1,144 @@
+00223_shard_distributed_aggregation_memory_efficient
+00562_in_subquery_merge_tree
+00593_union_all_assert_columns_removed
+00673_subquery_prepared_set_performance
+00700_decimal_compare
+00717_merge_and_distributed
+00725_memory_tracking
+00754_distributed_optimize_skip_select_on_unused_shards
+00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere
+00838_unique_index
+00927_asof_joins
+00940_order_by_read_in_order_query_plan
+00945_bloom_filter_index
+00952_input_function
+00979_set_index_not
+00981_in_subquery_with_tuple
+01049_join_low_card_bug_long
+01062_pm_all_join_with_block_continuation
+01064_incremental_streaming_from_2_src_with_feedback
+01071_force_optimize_skip_unused_shards
+01072_optimize_skip_unused_shards_const_expr_eval
+01083_expressions_in_engine_arguments
+01086_odbc_roundtrip
+01142_join_lc_and_nullable_in_key
+01142_merge_join_lc_and_nullable_in_key
+01152_cross_replication
+01155_rename_move_materialized_view
+01173_transaction_control_queries
+01211_optimize_skip_unused_shards_type_mismatch
+01213_optimize_skip_unused_shards_DISTINCT
+01214_test_storage_merge_aliases_with_where
+01231_distributed_aggregation_memory_efficient_mix_levels
+01232_extremes
+01244_optimize_distributed_group_by_sharding_key
+01247_optimize_distributed_group_by_sharding_key_dist_on_dist
+01268_mv_scalars
+01268_shard_avgweighted
+01270_optimize_skip_unused_shards_low_cardinality
+01319_optimize_skip_unused_shards_nesting
+01353_low_cardinality_join_types
+01455_shard_leaf_max_rows_bytes_to_read
+01476_right_full_join_switch
+01477_lc_in_merge_join_left_key
+01487_distributed_in_not_default_db
+01495_subqueries_in_with_statement
+01504_rocksdb
+01527_dist_sharding_key_dictGet_reload
+01528_allow_nondeterministic_optimize_skip_unused_shards
+01540_verbatim_partition_pruning
+01560_merge_distributed_join
+01563_distributed_query_finish
+01576_alias_column_rewrite
+01583_const_column_in_set_index
+01584_distributed_buffer_cannot_find_column
+01585_use_index_for_global_in
+01585_use_index_for_global_in_with_null
+01586_columns_pruning
+01615_random_one_shard_insertion
+01624_soft_constraints
+01651_bugs_from_15889
+01655_plan_optimizations
+01656_test_query_log_factories_info
+01681_bloom_filter_nullable_column
+01700_system_zookeeper_path_in
+01710_projection_additional_filters
+01721_join_implicit_cast_long
+01739_index_hint
+01747_join_view_filter_dictionary
+01748_partition_id_pruning
+01756_optimize_skip_unused_shards_rewrite_in
+01757_optimize_skip_unused_shards_limit
+01758_optimize_skip_unused_shards_once
+01759_optimize_skip_unused_shards_zero_shards
+01761_cast_to_enum_nullable
+01786_explain_merge_tree
+01889_key_condition_function_chains
+01890_materialized_distributed_join
+01901_in_literal_shard_prune
+01925_join_materialized_columns
+01925_test_storage_merge_aliases
+01930_optimize_skip_unused_shards_rewrite_in
+01947_mv_subquery
+01951_distributed_push_down_limit
+01952_optimize_distributed_group_by_sharding_key
+02000_join_on_const
+02001_shard_num_shard_count
+02024_join_on_or_long
+02131_used_row_policies_in_query_log
+02139_MV_with_scalar_subquery
+02174_cte_scalar_cache_mv
+02242_join_rocksdb
+02267_join_dup_columns_issue36199
+02302_s3_file_pruning
+02317_distinct_in_order_optimization_explain
+02341_global_join_cte
+02343_aggregation_pipeline
+02345_implicit_transaction
+02346_additional_filters_distr
+02352_grouby_shadows_arg
+02354_annoy
+02366_union_decimal_conversion
+02375_rocksdb_with_filters
+02377_optimize_sorting_by_input_stream_properties_explain
+02382_join_and_filtering_set
+02402_merge_engine_with_view
+02404_memory_bound_merging
+02421_decimal_in_precision_issue_41125
+02426_orc_bug
+02428_decimal_in_floating_point_literal
+02428_parameterized_view
+02458_use_structure_from_insertion_table
+02479_race_condition_between_insert_and_droppin_mv
+02493_inconsistent_hex_and_binary_number
+02494_optimize_group_by_function_keys_and_alias_columns
+02521_aggregation_by_partitions
+02554_fix_grouping_sets_predicate_push_down
+02575_merge_prewhere_different_default_kind
+02713_array_low_cardinality_string
+02707_skip_index_with_in
+02324_map_combinator_bug
+02241_join_rocksdb_bs
+02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET
+01115_join_with_dictionary
+01009_global_array_join_names
+00917_multiple_joins_denny_crane
+00725_join_on_bug_1
+00636_partition_key_parts_pruning
+00261_storage_aliases_and_array_join
+01825_type_json_multiple_files
+01281_group_by_limit_memory_tracking
+02723_zookeeper_name
+00002_log_and_exception_messages_formatting
+01646_rewrite_sum_if_bug
+02725_agg_projection_resprect_PK
+01019_alter_materialized_view_consistent
+01600_parts_states_metrics_long
+01600_parts_types_metrics_long
+01287_max_execution_speed
+02703_row_policy_for_database
+02721_url_cluster
+02534_s3_cluster_insert_select_schema_inference
+02764_parallel_replicas_plain_merge_tree
+02765_parallel_replicas_final_modifier
+
diff --git a/tests/ci/ast_fuzzer_check.py b/tests/ci/ast_fuzzer_check.py
index 3c2fa05016f..514aaf7e2ac 100644
--- a/tests/ci/ast_fuzzer_check.py
+++ b/tests/ci/ast_fuzzer_check.py
@@ -9,19 +9,21 @@ from github import Github
 
 from build_download_helper import get_build_name_for_check, read_build_urls
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
-from commit_status_helper import format_description, post_commit_status
+from commit_status_helper import (
+    RerunHelper,
+    format_description,
+    get_commit,
+    post_commit_status,
+)
 from docker_pull_helper import get_image_with_version
 from env_helper import (
-    GITHUB_REPOSITORY,
     GITHUB_RUN_URL,
     REPORTS_PATH,
-    REPO_COPY,
     TEMP_PATH,
 )
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
 from report import TestResult
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 
@@ -41,19 +43,12 @@ def get_run_command(pr_number, sha, download_url, workspace_path, image):
     )
 
 
-def get_commit(gh, commit_sha):
-    repo = gh.get_repo(GITHUB_REPOSITORY)
-    commit = repo.get_commit(commit_sha)
-    return commit
-
-
-if __name__ == "__main__":
+def main():
     logging.basicConfig(level=logging.INFO)
 
     stopwatch = Stopwatch()
 
     temp_path = TEMP_PATH
-    repo_path = REPO_COPY
     reports_path = REPORTS_PATH
 
     check_name = sys.argv[1]
@@ -64,8 +59,9 @@ if __name__ == "__main__":
     pr_info = PRInfo()
 
     gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
 
-    rerun_helper = RerunHelper(gh, pr_info, check_name)
+    rerun_helper = RerunHelper(commit, check_name)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
@@ -172,4 +168,8 @@ if __name__ == "__main__":
 
     logging.info("Result: '%s', '%s', '%s'", status, description, report_url)
     print(f"::notice ::Report url: {report_url}")
-    post_commit_status(gh, pr_info.sha, check_name, description, status, report_url)
+    post_commit_status(commit, status, report_url, description, check_name, pr_info)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/ci/autoscale_runners_lambda/app.py b/tests/ci/autoscale_runners_lambda/app.py
new file mode 100644
index 00000000000..cbc9f4f8901
--- /dev/null
+++ b/tests/ci/autoscale_runners_lambda/app.py
@@ -0,0 +1,248 @@
+#!/usr/bin/env python3
+
+"""The lambda to decrease/increase ASG desired capacity based on current queue"""
+
+import json
+import logging
+import time
+from dataclasses import dataclass
+from pprint import pformat
+from typing import Any, List, Literal, Optional, Tuple
+
+import boto3  # type: ignore
+import requests  # type: ignore
+
+RUNNER_TYPE_LABELS = [
+    "builder",
+    "func-tester",
+    "func-tester-aarch64",
+    "fuzzer-unit-tester",
+    "stress-tester",
+    "style-checker",
+    "style-checker-aarch64",
+]
+
+# 4 HOUR - is a balance to get the most precise values
+#   - Our longest possible running check is around 5h on the worst scenario
+#   - The long queue won't be wiped out and replaced, so the measurmenet is fine
+#   - If the data is spoiled by something, we are from the bills perspective
+QUEUE_QUERY = f"""SELECT
+    last_status AS status,
+    toUInt32(count()) AS length,
+    labels
+FROM
+(
+    SELECT
+        arraySort(groupArray(status))[-1] AS last_status,
+        labels,
+        id,
+        html_url
+    FROM default.workflow_jobs
+    WHERE has(labels, 'self-hosted')
+        AND hasAny({RUNNER_TYPE_LABELS}, labels)
+        AND started_at > now() - INTERVAL 4 HOUR
+    GROUP BY ALL
+    HAVING last_status IN ('in_progress', 'queued')
+)
+GROUP BY ALL
+ORDER BY labels, last_status"""
+
+
+@dataclass
+class Queue:
+    status: Literal["in_progress", "queued"]
+    lentgh: int
+    label: str
+
+
+def get_scales(runner_type: str) -> Tuple[int, int]:
+    "returns the multipliers for scaling down and up ASG by types"
+    # Scaling down is quicker on the lack of running jobs than scaling up on
+    # queue
+    scale_down = 2
+    scale_up = 5
+    if runner_type == "style-checker":
+        # the style checkers have so many noise, so it scales up too quickly
+        scale_down = 1
+        # The 5 was too quick, there are complainings regarding too slow with
+        # 10. I am trying 7 now.
+        # UPDATE THE COMMENT ON CHANGES
+        scale_up = 7
+    return scale_down, scale_up
+
+
+### VENDORING
+def get_parameter_from_ssm(name, decrypt=True, client=None):
+    if not client:
+        client = boto3.client("ssm", region_name="us-east-1")
+    return client.get_parameter(Name=name, WithDecryption=decrypt)["Parameter"]["Value"]
+
+
+class CHException(Exception):
+    pass
+
+
+class ClickHouseHelper:
+    def __init__(
+        self,
+        url: Optional[str] = None,
+        user: Optional[str] = None,
+        password: Optional[str] = None,
+    ):
+        self.url = url
+        self.auth = {}
+        if user:
+            self.auth["X-ClickHouse-User"] = user
+        if password:
+            self.auth["X-ClickHouse-Key"] = password
+
+    def _select_and_get_json_each_row(self, db, query):
+        params = {
+            "database": db,
+            "query": query,
+            "default_format": "JSONEachRow",
+        }
+        for i in range(5):
+            response = None
+            try:
+                response = requests.get(self.url, params=params, headers=self.auth)
+                response.raise_for_status()
+                return response.text
+            except Exception as ex:
+                logging.warning("Cannot fetch data with exception %s", str(ex))
+                if response:
+                    logging.warning("Reponse text %s", response.text)
+                time.sleep(0.1 * i)
+
+        raise CHException("Cannot fetch data from clickhouse")
+
+    def select_json_each_row(self, db, query):
+        text = self._select_and_get_json_each_row(db, query)
+        result = []
+        for line in text.split("\n"):
+            if line:
+                result.append(json.loads(line))
+        return result
+
+
+CH_CLIENT = ClickHouseHelper(get_parameter_from_ssm("clickhouse-test-stat-url"), "play")
+
+
+def set_capacity(
+    runner_type: str, queues: List[Queue], client: Any, dry_run: bool = True
+) -> None:
+    assert len(queues) in (1, 2)
+    assert all(q.label == runner_type for q in queues)
+    as_groups = client.describe_auto_scaling_groups(
+        Filters=[
+            {"Name": "tag-key", "Values": ["github:runner-type"]},
+            {"Name": "tag-value", "Values": [runner_type]},
+        ]
+    )["AutoScalingGroups"]
+    assert len(as_groups) == 1
+    asg = as_groups[0]
+    running = 0
+    queued = 0
+    for q in queues:
+        if q.status == "in_progress":
+            running = q.lentgh
+            continue
+        if q.status == "queued":
+            queued = q.lentgh
+            continue
+        raise ValueError("Queue status is not in ['in_progress', 'queued']")
+
+    scale_down, scale_up = get_scales(runner_type)
+    # How much nodes are free (positive) or need to be added (negative)
+    capacity_reserve = asg["DesiredCapacity"] - running - queued
+    stop = False
+    if capacity_reserve < 0:
+        # This part is about scaling up
+        capacity_deficit = -capacity_reserve
+        # It looks that we are still OK, since no queued jobs exist
+        stop = stop or queued == 0
+        # Are we already at the capacity limits
+        stop = stop or asg["MaxSize"] <= asg["DesiredCapacity"]
+        # Let's calculate a new desired capacity
+        desired_capacity = asg["DesiredCapacity"] + (capacity_deficit // scale_up)
+        desired_capacity = max(desired_capacity, asg["MinSize"])
+        desired_capacity = min(desired_capacity, asg["MaxSize"])
+        # Finally, should the capacity be even changed
+        stop = stop or asg["DesiredCapacity"] == desired_capacity
+        if stop:
+            return
+        logging.info(
+            "The ASG %s capacity will be increased to %s, current capacity=%s, "
+            "maximum capacity=%s, running jobs=%s, queue size=%s",
+            asg["AutoScalingGroupName"],
+            desired_capacity,
+            asg["DesiredCapacity"],
+            asg["MaxSize"],
+            running,
+            queued,
+        )
+        if not dry_run:
+            client.set_desired_capacity(
+                AutoScalingGroupName=asg["AutoScalingGroupName"],
+                DesiredCapacity=desired_capacity,
+            )
+        return
+
+    # Now we will calculate if we need to scale down
+    stop = stop or asg["DesiredCapacity"] == asg["MinSize"]
+    desired_capacity = asg["DesiredCapacity"] - (capacity_reserve // scale_down)
+    desired_capacity = max(desired_capacity, asg["MinSize"])
+    desired_capacity = min(desired_capacity, asg["MaxSize"])
+    stop = stop or asg["DesiredCapacity"] == desired_capacity
+    if stop:
+        return
+
+    logging.info(
+        "The ASG %s capacity will be decreased to %s, current capacity=%s, "
+        "minimum capacity=%s, running jobs=%s, queue size=%s",
+        asg["AutoScalingGroupName"],
+        desired_capacity,
+        asg["DesiredCapacity"],
+        asg["MinSize"],
+        running,
+        queued,
+    )
+    if not dry_run:
+        client.set_desired_capacity(
+            AutoScalingGroupName=asg["AutoScalingGroupName"],
+            DesiredCapacity=desired_capacity,
+        )
+
+
+def main(dry_run: bool = True) -> None:
+    logging.getLogger().setLevel(logging.INFO)
+    asg_client = boto3.client("autoscaling")
+    try:
+        global CH_CLIENT
+        queues = CH_CLIENT.select_json_each_row("default", QUEUE_QUERY)
+    except CHException as ex:
+        logging.exception(
+            "Got an exception on insert, tryuing to update the client "
+            "credentials and repeat",
+            exc_info=ex,
+        )
+        CH_CLIENT = ClickHouseHelper(
+            get_parameter_from_ssm("clickhouse-test-stat-url"), "play"
+        )
+        queues = CH_CLIENT.select_json_each_row("default", QUEUE_QUERY)
+
+    logging.info("Received queue data:\n%s", pformat(queues, width=120))
+    for runner_type in RUNNER_TYPE_LABELS:
+        runner_queues = [
+            Queue(queue["status"], queue["length"], runner_type)
+            for queue in queues
+            if runner_type in queue["labels"]
+        ]
+        runner_queues = runner_queues or [Queue("in_progress", 0, runner_type)]
+        set_capacity(runner_type, runner_queues, asg_client, dry_run)
+
+
+def handler(event: dict, context: Any) -> None:
+    _ = event
+    _ = context
+    return main(False)
diff --git a/tests/ci/autoscale_runners_lambda/build_and_deploy_archive.sh b/tests/ci/autoscale_runners_lambda/build_and_deploy_archive.sh
new file mode 120000
index 00000000000..96ba3fa024e
--- /dev/null
+++ b/tests/ci/autoscale_runners_lambda/build_and_deploy_archive.sh
@@ -0,0 +1 @@
+../team_keys_lambda/build_and_deploy_archive.sh
\ No newline at end of file
diff --git a/tests/ci/autoscale_runners_lambda/requirements.txt b/tests/ci/autoscale_runners_lambda/requirements.txt
new file mode 100644
index 00000000000..3bcbe2dfd07
--- /dev/null
+++ b/tests/ci/autoscale_runners_lambda/requirements.txt
@@ -0,0 +1 @@
+requests<2.30
diff --git a/tests/ci/autoscale_runners_lambda_test.py b/tests/ci/autoscale_runners_lambda_test.py
new file mode 100644
index 00000000000..8e3828f51c0
--- /dev/null
+++ b/tests/ci/autoscale_runners_lambda_test.py
@@ -0,0 +1,145 @@
+#!/usr/bin/env python
+
+import unittest
+from dataclasses import dataclass
+from typing import Any, List
+
+from autoscale_runners_lambda.app import set_capacity, Queue
+
+
+@dataclass
+class TestCase:
+    name: str
+    min_size: int
+    desired_capacity: int
+    max_size: int
+    queues: List[Queue]
+    expected_capacity: int
+
+
+class TestSetCapacity(unittest.TestCase):
+    class FakeClient:
+        def __init__(self):
+            self._expected_data = {}  # type: dict
+            self._expected_capacity = -1
+
+        @property
+        def expected_data(self) -> dict:
+            """a one-time property"""
+            data, self._expected_data = self._expected_data, {}
+            return data
+
+        @expected_data.setter
+        def expected_data(self, value: dict) -> None:
+            self._expected_data = value
+
+        @property
+        def expected_capacity(self) -> int:
+            """one-time property"""
+            capacity, self._expected_capacity = self._expected_capacity, -1
+            return capacity
+
+        def describe_auto_scaling_groups(self, **kwargs: Any) -> dict:
+            _ = kwargs
+            return self.expected_data
+
+        def set_desired_capacity(self, **kwargs: Any) -> None:
+            self._expected_capacity = kwargs["DesiredCapacity"]
+
+        def data_helper(
+            self, name: str, min_size: int, desired_capacity: int, max_size: int
+        ) -> None:
+            self.expected_data = {
+                "AutoScalingGroups": [
+                    {
+                        "AutoScalingGroupName": name,
+                        "DesiredCapacity": desired_capacity,
+                        "MinSize": min_size,
+                        "MaxSize": max_size,
+                    }
+                ]
+            }
+
+    def setUp(self):
+        self.client = self.FakeClient()
+
+    def test_normal_cases(self):
+        test_cases = (
+            # Do not change capacity
+            TestCase("noqueue", 1, 13, 20, [Queue("in_progress", 155, "noqueue")], -1),
+            TestCase("w/reserve", 1, 13, 20, [Queue("queued", 17, "w/reserve")], -1),
+            # Increase capacity
+            TestCase("increase", 1, 13, 20, [Queue("queued", 23, "increase")], 15),
+            TestCase(
+                "style-checker", 1, 13, 20, [Queue("queued", 33, "style-checker")], 15
+            ),
+            TestCase("increase", 1, 13, 20, [Queue("queued", 18, "increase")], 14),
+            TestCase("increase", 1, 13, 20, [Queue("queued", 183, "increase")], 20),
+            TestCase(
+                "increase-w/o reserve",
+                1,
+                13,
+                20,
+                [
+                    Queue("in_progress", 11, "increase-w/o reserve"),
+                    Queue("queued", 12, "increase-w/o reserve"),
+                ],
+                15,
+            ),
+            TestCase("lower-min", 10, 5, 20, [Queue("queued", 5, "lower-min")], 10),
+            # Decrease capacity
+            TestCase("w/reserve", 1, 13, 20, [Queue("queued", 5, "w/reserve")], 9),
+            TestCase(
+                "style-checker", 1, 13, 20, [Queue("queued", 5, "style-checker")], 5
+            ),
+            TestCase("w/reserve", 1, 23, 20, [Queue("queued", 17, "w/reserve")], 20),
+            TestCase("decrease", 1, 13, 20, [Queue("in_progress", 3, "decrease")], 8),
+            TestCase(
+                "style-checker",
+                1,
+                13,
+                20,
+                [Queue("in_progress", 5, "style-checker")],
+                5,
+            ),
+        )
+        for t in test_cases:
+            self.client.data_helper(t.name, t.min_size, t.desired_capacity, t.max_size)
+            set_capacity(t.name, t.queues, self.client, False)
+            self.assertEqual(t.expected_capacity, self.client.expected_capacity, t.name)
+
+    def test_exceptions(self):
+        test_cases = (
+            (
+                TestCase(
+                    "different names",
+                    1,
+                    1,
+                    1,
+                    [Queue("queued", 5, "another name")],
+                    -1,
+                ),
+                AssertionError,
+            ),
+            (TestCase("wrong queue len", 1, 1, 1, [], -1), AssertionError),
+            (
+                TestCase(
+                    "wrong queue", 1, 1, 1, [Queue("wrong", 1, "wrong queue")], -1  # type: ignore
+                ),
+                ValueError,
+            ),
+        )
+        for t, error in test_cases:
+            with self.assertRaises(error):
+                self.client.data_helper(
+                    t.name, t.min_size, t.desired_capacity, t.max_size
+                )
+                set_capacity(t.name, t.queues, self.client, False)
+
+        with self.assertRaises(AssertionError):
+            self.client.expected_data = {"AutoScalingGroups": [1, 2]}
+            set_capacity(
+                "wrong number of ASGs",
+                [Queue("queued", 1, "wrong number of ASGs")],
+                self.client,
+            )
diff --git a/tests/ci/bugfix_validate_check.py b/tests/ci/bugfix_validate_check.py
index 14ea58500bc..e5ce655bdde 100644
--- a/tests/ci/bugfix_validate_check.py
+++ b/tests/ci/bugfix_validate_check.py
@@ -8,7 +8,7 @@ import os
 
 from github import Github
 
-from commit_status_helper import post_commit_status
+from commit_status_helper import get_commit, post_commit_status
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
 from report import TestResults, TestResult
@@ -81,13 +81,14 @@ def main(args):
     )
 
     gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
     post_commit_status(
-        gh,
-        pr_info.sha,
-        check_name_with_group,
-        "" if is_ok else "Changed tests don't reproduce the bug",
+        commit,
         "success" if is_ok else "error",
         report_url,
+        "" if is_ok else "Changed tests don't reproduce the bug",
+        check_name_with_group,
+        pr_info,
     )
 
 
diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
index ecc36b1c4e3..4bc61c79fc0 100644
--- a/tests/ci/build_check.py
+++ b/tests/ci/build_check.py
@@ -6,15 +6,17 @@ import json
 import os
 import sys
 import time
-from shutil import rmtree
 from typing import List, Tuple
 
-from ccache_utils import get_ccache_if_not_exists, upload_ccache
 from ci_config import CI_CONFIG, BuildConfig
-from commit_status_helper import get_commit_filtered_statuses, get_commit
+from commit_status_helper import (
+    NotSet,
+    get_commit_filtered_statuses,
+    get_commit,
+    post_commit_status,
+)
 from docker_pull_helper import get_image_with_version
 from env_helper import (
-    CACHES_PATH,
     GITHUB_JOB,
     IMAGES_PATH,
     REPO_COPY,
@@ -54,7 +56,6 @@ def get_packager_cmd(
     output_path: str,
     build_version: str,
     image_version: str,
-    ccache_path: str,
     official: bool,
 ) -> str:
     package_type = build_config["package_type"]
@@ -72,8 +73,9 @@ def get_packager_cmd(
     if build_config["tidy"] == "enable":
         cmd += " --clang-tidy"
 
-    cmd += " --cache=ccache"
-    cmd += f" --ccache_dir={ccache_path}"
+    cmd += " --cache=sccache"
+    cmd += " --s3-rw-access"
+    cmd += f" --s3-bucket={S3_BUILDS_BUCKET}"
 
     if "additional_pkgs" in build_config and build_config["additional_pkgs"]:
         cmd += " --additional-pkgs"
@@ -196,19 +198,21 @@ def create_json_artifact(
 
 
 def get_release_or_pr(pr_info: PRInfo, version: ClickHouseVersion) -> Tuple[str, str]:
+    "Return prefixes for S3 artifacts paths"
     # FIXME performance
     # performance builds are havily relies on a fixed path for artifacts, that's why
     # we need to preserve 0 for anything but PR number
     # It should be fixed in performance-comparison image eventually
-    performance_pr = "0"
+    # For performance tests we always set PRs prefix
+    performance_pr = "PRs/0"
     if "release" in pr_info.labels or "release-lts" in pr_info.labels:
         # for release pull requests we use branch names prefixes, not pr numbers
         return pr_info.head_ref, performance_pr
-    elif pr_info.number == 0:
+    if pr_info.number == 0:
         # for pushes to master - major version
         return f"{version.major}.{version.minor}", performance_pr
     # PR number for anything else
-    pr_number = str(pr_info.number)
+    pr_number = f"PRs/{pr_info.number}"
     return pr_number, pr_number
 
 
@@ -233,10 +237,10 @@ def upload_master_static_binaries(
     print(f"::notice ::Binary static URL: {url}")
 
 
-def mark_failed_reports_pending(build_name: str, sha: str) -> None:
+def mark_failed_reports_pending(build_name: str, pr_info: PRInfo) -> None:
     try:
         gh = GitHub(get_best_robot_token())
-        commit = get_commit(gh, sha)
+        commit = get_commit(gh, pr_info.sha)
         statuses = get_commit_filtered_statuses(commit)
         report_status = [
             name
@@ -249,8 +253,13 @@ def mark_failed_reports_pending(build_name: str, sha: str) -> None:
                     "Commit already have failed status for '%s', setting it to 'pending'",
                     report_status,
                 )
-                commit.create_status(
-                    "pending", status.url, "Set to pending on rerun", report_status
+                post_commit_status(
+                    commit,
+                    "pending",
+                    status.target_url or NotSet,
+                    "Set to pending on rerun",
+                    report_status,
+                    pr_info,
                 )
     except:  # we do not care about any exception here
         logging.info("Failed to get or mark the reports status as pending, continue")
@@ -286,7 +295,7 @@ def main():
     check_for_success_run(s3_helper, s3_path_prefix, build_name, build_config)
 
     # If it's a latter running, we need to mark possible failed status
-    mark_failed_reports_pending(build_name, pr_info.sha)
+    mark_failed_reports_pending(build_name, pr_info)
 
     docker_image = get_image_with_version(IMAGES_PATH, IMAGE_NAME)
     image_version = docker_image.version
@@ -312,29 +321,12 @@ def main():
     if not os.path.exists(build_output_path):
         os.makedirs(build_output_path)
 
-    ccache_path = os.path.join(CACHES_PATH, build_name + "_ccache")
-
-    logging.info("Will try to fetch cache for our build")
-    try:
-        get_ccache_if_not_exists(
-            ccache_path, s3_helper, pr_info.number, TEMP_PATH, pr_info.release_pr
-        )
-    except Exception as e:
-        # In case there are issues with ccache, remove the path and do not fail a build
-        logging.info("Failed to get ccache, building without it. Error: %s", e)
-        rmtree(ccache_path, ignore_errors=True)
-
-    if not os.path.exists(ccache_path):
-        logging.info("cache was not fetched, will create empty dir")
-        os.makedirs(ccache_path)
-
     packager_cmd = get_packager_cmd(
         build_config,
         os.path.join(REPO_COPY, "docker/packager"),
         build_output_path,
         version.string,
         image_version,
-        ccache_path,
         official_flag,
     )
 
@@ -350,13 +342,8 @@ def main():
     subprocess.check_call(
         f"sudo chown -R ubuntu:ubuntu {build_output_path}", shell=True
     )
-    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {ccache_path}", shell=True)
     logging.info("Build finished with %s, log path %s", success, log_path)
 
-    # Upload the ccache first to have the least build time in case of problems
-    logging.info("Will upload cache")
-    upload_ccache(ccache_path, s3_helper, pr_info.number, TEMP_PATH)
-
     # FIXME performance
     performance_urls = []
     performance_path = os.path.join(build_output_path, "performance.tar.zst")
diff --git a/tests/ci/build_download_helper.py b/tests/ci/build_download_helper.py
index c6136015316..47c11ee0911 100644
--- a/tests/ci/build_download_helper.py
+++ b/tests/ci/build_download_helper.py
@@ -6,10 +6,11 @@ import os
 import sys
 import time
 from pathlib import Path
-from typing import Any, Callable, List, Optional
+from typing import Any, Callable, List
 
 import requests  # type: ignore
 
+import get_robot_token as grt  # we need an updated ROBOT_TOKEN
 from ci_config import CI_CONFIG
 
 DOWNLOAD_RETRIES_COUNT = 5
@@ -24,22 +25,69 @@ def get_with_retries(
     logging.info(
         "Getting URL with %i tries and sleep %i in between: %s", retries, sleep, url
     )
-    exc = None  # type: Optional[Exception]
+    exc = Exception("A placeholder to satisfy typing and avoid nesting")
     for i in range(retries):
         try:
             response = requests.get(url, **kwargs)
             response.raise_for_status()
-            break
+            return response
         except Exception as e:
             if i + 1 < retries:
                 logging.info("Exception '%s' while getting, retry %i", e, i + 1)
                 time.sleep(sleep)
 
             exc = e
-    else:
-        raise Exception(exc)
 
-    return response
+    raise exc
+
+
+def get_gh_api(
+    url: str,
+    retries: int = DOWNLOAD_RETRIES_COUNT,
+    sleep: int = 3,
+    **kwargs: Any,
+) -> requests.Response:
+    """It's a wrapper around get_with_retries that requests GH api w/o auth by
+    default, and falls back to the get_best_robot_token in case of receiving
+    "403 rate limit exceeded" error
+    It sets auth automatically when ROBOT_TOKEN is already set by get_best_robot_token
+    """
+
+    def set_auth_header():
+        if "headers" in kwargs:
+            if "Authorization" not in kwargs["headers"]:
+                kwargs["headers"][
+                    "Authorization"
+                ] = f"Bearer {grt.get_best_robot_token()}"
+        else:
+            kwargs["headers"] = {
+                "Authorization": f"Bearer {grt.get_best_robot_token()}"
+            }
+
+    if grt.ROBOT_TOKEN is not None:
+        set_auth_header()
+
+    need_retry = False
+    for _ in range(retries):
+        try:
+            response = get_with_retries(url, 1, sleep, **kwargs)
+            response.raise_for_status()
+            return response
+        except requests.HTTPError as exc:
+            if (
+                exc.response.status_code == 403
+                and b"rate limit exceeded"
+                in exc.response._content  # pylint:disable=protected-access
+            ):
+                logging.warning(
+                    "Received rate limit exception, setting the auth header and retry"
+                )
+                set_auth_header()
+                need_retry = True
+                break
+
+    if need_retry:
+        return get_with_retries(url, retries, sleep, **kwargs)
 
 
 def get_build_name_for_check(check_name: str) -> str:
diff --git a/tests/ci/build_report_check.py b/tests/ci/build_report_check.py
index 520051bd425..82c04ce82c5 100644
--- a/tests/ci/build_report_check.py
+++ b/tests/ci/build_report_check.py
@@ -22,11 +22,12 @@ from s3_helper import S3Helper
 from get_robot_token import get_best_robot_token
 from pr_info import NeedsDataType, PRInfo
 from commit_status_helper import (
+    RerunHelper,
     get_commit,
+    post_commit_status,
     update_mergeable_check,
 )
 from ci_config import CI_CONFIG
-from rerun_helper import RerunHelper
 
 
 NEEDS_DATA_PATH = os.getenv("NEEDS_DATA_PATH", "")
@@ -72,6 +73,7 @@ def get_failed_report(
         sanitizer="unknown",
         status=message,
         elapsed_seconds=0,
+        comment="",
     )
     return [build_result], [[""]], [GITHUB_RUN_URL]
 
@@ -86,6 +88,7 @@ def process_report(
         sanitizer=build_config["sanitizer"],
         status="success" if build_report["status"] else "failure",
         elapsed_seconds=build_report["elapsed_seconds"],
+        comment=build_config["comment"],
     )
     build_results = []
     build_urls = []
@@ -136,10 +139,11 @@ def main():
 
     gh = Github(get_best_robot_token(), per_page=100)
     pr_info = PRInfo()
+    commit = get_commit(gh, pr_info.sha)
 
     atexit.register(update_mergeable_check, gh, pr_info, build_check_name)
 
-    rerun_helper = RerunHelper(gh, pr_info, build_check_name)
+    rerun_helper = RerunHelper(commit, build_check_name)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
@@ -247,7 +251,7 @@ def main():
         str(pr_info.number) + "/" + pr_info.sha + "/" + context_name_for_path
     )
 
-    url = s3_helper.upload_build_file_to_s3(
+    url = s3_helper.upload_test_report_to_s3(
         report_path, s3_path_prefix + "/report.html"
     )
     logging.info("Report url %s", url)
@@ -274,12 +278,8 @@ def main():
 
     description = f"{ok_groups}/{total_groups} artifact groups are OK {addition}"
 
-    commit = get_commit(gh, pr_info.sha)
-    commit.create_status(
-        context=build_check_name,
-        description=description,
-        state=summary_status,
-        target_url=url,
+    post_commit_status(
+        commit, summary_status, url, description, build_check_name, pr_info
     )
 
     if summary_status == "error":
diff --git a/tests/ci/cancel_and_rerun_workflow_lambda/app.py b/tests/ci/cancel_and_rerun_workflow_lambda/app.py
index 047b630e241..54c87fbcfa5 100644
--- a/tests/ci/cancel_and_rerun_workflow_lambda/app.py
+++ b/tests/ci/cancel_and_rerun_workflow_lambda/app.py
@@ -2,11 +2,11 @@
 
 from base64 import b64decode
 from collections import namedtuple
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional, Tuple
 from threading import Thread
 from queue import Queue
 import json
-import os
+import re
 import time
 
 import jwt
@@ -27,6 +27,123 @@ MAX_RETRY = 5
 
 DEBUG_INFO = {}  # type: Dict[str, Any]
 
+# Descriptions are used in .github/PULL_REQUEST_TEMPLATE.md, keep comments there
+# updated accordingly
+# The following lists are append only, try to avoid editing them
+# They still could be cleaned out after the decent time though.
+LABELS = {
+    "pr-backward-incompatible": ["Backward Incompatible Change"],
+    "pr-bugfix": [
+        "Bug Fix",
+        "Bug Fix (user-visible misbehavior in an official stable release)",
+        "Bug Fix (user-visible misbehaviour in official stable or prestable release)",
+        "Bug Fix (user-visible misbehavior in official stable or prestable release)",
+    ],
+    "pr-build": [
+        "Build/Testing/Packaging Improvement",
+        "Build Improvement",
+        "Build/Testing Improvement",
+        "Build",
+        "Packaging Improvement",
+    ],
+    "pr-documentation": [
+        "Documentation (changelog entry is not required)",
+        "Documentation",
+    ],
+    "pr-feature": ["New Feature"],
+    "pr-improvement": ["Improvement"],
+    "pr-not-for-changelog": [
+        "Not for changelog (changelog entry is not required)",
+        "Not for changelog",
+    ],
+    "pr-performance": ["Performance Improvement"],
+}
+
+CATEGORY_TO_LABEL = {c: lb for lb, categories in LABELS.items() for c in categories}
+
+
+def check_pr_description(pr_body: str) -> Tuple[str, str]:
+    """The function checks the body to being properly formatted according to
+    .github/PULL_REQUEST_TEMPLATE.md, if the first returned string is not empty,
+    then there is an error."""
+    lines = list(map(lambda x: x.strip(), pr_body.split("\n") if pr_body else []))
+    lines = [re.sub(r"\s+", " ", line) for line in lines]
+
+    # Check if body contains "Reverts ClickHouse/ClickHouse#36337"
+    if [
+        True
+        for line in lines
+        if re.match(r"\AReverts {GITHUB_REPOSITORY}#[\d]+\Z", line)
+    ]:
+        return "", LABELS["pr-not-for-changelog"][0]
+
+    category = ""
+    entry = ""
+    description_error = ""
+
+    i = 0
+    while i < len(lines):
+        if re.match(r"(?i)^[#>*_ ]*change\s*log\s*category", lines[i]):
+            i += 1
+            if i >= len(lines):
+                break
+            # Can have one empty line between header and the category
+            # itself. Filter it out.
+            if not lines[i]:
+                i += 1
+                if i >= len(lines):
+                    break
+            category = re.sub(r"^[-*\s]*", "", lines[i])
+            i += 1
+
+            # Should not have more than one category. Require empty line
+            # after the first found category.
+            if i >= len(lines):
+                break
+            if lines[i]:
+                second_category = re.sub(r"^[-*\s]*", "", lines[i])
+                description_error = (
+                    "More than one changelog category specified: "
+                    f"'{category}', '{second_category}'"
+                )
+                return description_error, category
+
+        elif re.match(
+            r"(?i)^[#>*_ ]*(short\s*description|change\s*log\s*entry)", lines[i]
+        ):
+            i += 1
+            # Can have one empty line between header and the entry itself.
+            # Filter it out.
+            if i < len(lines) and not lines[i]:
+                i += 1
+            # All following lines until empty one are the changelog entry.
+            entry_lines = []
+            while i < len(lines) and lines[i]:
+                entry_lines.append(lines[i])
+                i += 1
+            entry = " ".join(entry_lines)
+            # Don't accept changelog entries like '...'.
+            entry = re.sub(r"[#>*_.\- ]", "", entry)
+            # Don't accept changelog entries like 'Close #12345'.
+            entry = re.sub(r"^[\w\-\s]{0,10}#?\d{5,6}\.?$", "", entry)
+        else:
+            i += 1
+
+    if not category:
+        description_error = "Changelog category is empty"
+    # Filter out the PR categories that are not for changelog.
+    elif re.match(
+        r"(?i)doc|((non|in|not|un)[-\s]*significant)|(not[ ]*for[ ]*changelog)",
+        category,
+    ):
+        pass  # to not check the rest of the conditions
+    elif category not in CATEGORY_TO_LABEL:
+        description_error, category = f"Category '{category}' is not valid", ""
+    elif not entry:
+        description_error = f"Changelog entry required for category '{category}'"
+
+    return description_error, category
+
 
 class Worker(Thread):
     def __init__(
@@ -268,11 +385,11 @@ def get_workflow_description(workflow_url: str, token: str) -> WorkflowDescripti
     )
 
 
-def _exec_post_with_retry(url, token):
+def _exec_post_with_retry(url: str, token: str, json: Optional[Any] = None) -> Any:
     headers = {"Authorization": f"token {token}"}
     for i in range(MAX_RETRY):
         try:
-            response = requests.post(url, headers=headers)
+            response = requests.post(url, headers=headers, json=json)
             response.raise_for_status()
             return response.json()
         except Exception as ex:
@@ -373,27 +490,20 @@ def main(event):
         return
 
     if action == "edited":
-        print("PR is edited, check if it needs to rerun")
-        workflow_descriptions = get_workflows_description_for_pull_request(
-            pull_request, token
-        )
-        workflow_descriptions = (
-            workflow_descriptions
-            or get_workflow_description_fallback(pull_request, token)
-        )
-        workflow_descriptions.sort(key=lambda x: x.run_id)  # type: ignore
-        most_recent_workflow = workflow_descriptions[-1]
-        if (
-            most_recent_workflow.status == "completed"
-            and most_recent_workflow.name in NEED_RERUN_ON_EDITED
-        ):
+        print("PR is edited, check if the body is correct")
+        error, category = check_pr_description(pull_request["body"])
+        if error:
             print(
-                "The PR's body is changed and workflow is finished. "
-                "Rerun to check the description"
+                f"The PR's body is wrong, is going to comment it. The error is: {error}"
             )
-            exec_workflow_url([most_recent_workflow.rerun_url], token)
-            print("Rerun finished, exiting")
-            return
+            post_json = {
+                "body": "This is an automatic comment. The PR descriptions does not "
+                f"match the [template]({pull_request['base']['repo']['html_url']}/"
+                "blob/master/.github/PULL_REQUEST_TEMPLATE.md?plain=1).\n\n"
+                f"Please, edit it accordingly.\n\nThe error is: {error}"
+            }
+            _exec_post_with_retry(pull_request["comments_url"], token, json=post_json)
+        return
 
     if action == "synchronize":
         print("PR is synchronized, going to stop old actions")
diff --git a/tests/ci/cancel_and_rerun_workflow_lambda/requirements.txt b/tests/ci/cancel_and_rerun_workflow_lambda/requirements.txt
index e607f1a9f39..98be09ab232 100644
--- a/tests/ci/cancel_and_rerun_workflow_lambda/requirements.txt
+++ b/tests/ci/cancel_and_rerun_workflow_lambda/requirements.txt
@@ -1,3 +1,3 @@
-requests
+requests<2.30
 PyJWT
-cryptography==37.0.4
+cryptography<38
diff --git a/tests/ci/cherry_pick.py b/tests/ci/cherry_pick.py
index 585cfd52e87..2fa562a1386 100644
--- a/tests/ci/cherry_pick.py
+++ b/tests/ci/cherry_pick.py
@@ -27,7 +27,7 @@ import argparse
 import logging
 import os
 from contextlib import contextmanager
-from datetime import date, timedelta
+from datetime import date, datetime, timedelta
 from subprocess import CalledProcessError
 from typing import List, Optional
 
@@ -45,25 +45,34 @@ from ssh import SSHKey
 
 class Labels:
     MUST_BACKPORT = "pr-must-backport"
+    MUST_BACKPORT_CLOUD = "pr-must-backport-cloud"
     BACKPORT = "pr-backport"
     BACKPORTS_CREATED = "pr-backports-created"
+    BACKPORTS_CREATED_CLOUD = "pr-backports-created-cloud"
     CHERRYPICK = "pr-cherrypick"
     DO_NOT_TEST = "do not test"
 
 
 class ReleaseBranch:
-    CHERRYPICK_DESCRIPTION = f"""This pull-request is a first step of an automated \
-    backporting.
+    CHERRYPICK_DESCRIPTION = """Original pull-request #{pr_number}
+
+This pull-request is a first step of an automated backporting.
 It contains changes like after calling a local command `git cherry-pick`.
 If you intend to continue backporting this changes, then resolve all conflicts if any.
 Otherwise, if you do not want to backport them, then just close this pull-request.
 
 The check results does not matter at this step - you can safely ignore them.
-Also this pull-request will be merged automatically as it reaches the mergeable state, \
+
+### Note
+
+This pull-request will be merged automatically as it reaches the mergeable state, \
 **do not merge it manually**.
 
-If it stuck, check the original PR for `{Labels.BACKPORTS_CREATED}` and delete it if \
-necessary.
+### If the PR was closed and then reopened
+
+If it stuck, check {pr_url} for `{label_backports_created}` and delete it if \
+necessary. Manually merging will do nothing, since `{label_backports_created}` \
+prevents the original PR {pr_url} from being processed.
 """
     BACKPORT_DESCRIPTION = """This pull-request is a last step of an automated \
 backporting.
@@ -73,14 +82,17 @@ close it.
 """
     REMOTE = ""
 
-    def __init__(self, name: str, pr: PullRequest):
+    def __init__(self, name: str, pr: PullRequest, repo: Repository):
         self.name = name
         self.pr = pr
+        self.repo = repo
+
         self.cherrypick_branch = f"cherrypick/{name}/{pr.merge_commit_sha}"
         self.backport_branch = f"backport/{name}/{pr.number}"
         self.cherrypick_pr = None  # type: Optional[PullRequest]
         self.backport_pr = None  # type: Optional[PullRequest]
-        self._backported = None  # type: Optional[bool]
+        self._backported = False
+
         self.git_prefix = (  # All commits to cherrypick are done as robot-clickhouse
             "git -c user.email=robot-clickhouse@users.noreply.github.com "
             "-c user.name=robot-clickhouse -c commit.gpgsign=false"
@@ -116,7 +128,9 @@ close it.
             # Going from the tail to keep the order and pop greater index first
             prs.pop(i)
 
-    def process(self, dry_run: bool) -> None:
+    def process(  # pylint: disable=too-many-return-statements
+        self, dry_run: bool
+    ) -> None:
         if self.backported:
             return
         if not self.cherrypick_pr:
@@ -131,6 +145,11 @@ close it.
         if self.cherrypick_pr is not None:
             # Try to merge cherrypick instantly
             if self.cherrypick_pr.mergeable and self.cherrypick_pr.state != "closed":
+                if dry_run:
+                    logging.info(
+                        "DRY RUN: Would merge cherry-pick PR for #%s", self.pr.number
+                    )
+                    return
                 self.cherrypick_pr.merge()
                 # The PR needs update, since PR.merge doesn't update the object
                 self.cherrypick_pr.update()
@@ -142,7 +161,7 @@ close it.
                     return
                 self.create_backport()
                 return
-            elif self.cherrypick_pr.state == "closed":
+            if self.cherrypick_pr.state == "closed":
                 logging.info(
                     "The cherrypick PR #%s for PR #%s is discarded",
                     self.cherrypick_pr.number,
@@ -155,6 +174,7 @@ close it.
                 self.cherrypick_pr.number,
                 self.pr.number,
             )
+            self.ping_cherry_pick_assignees(dry_run)
 
     def create_cherrypick(self):
         # First, create backport branch:
@@ -173,7 +193,7 @@ close it.
             f"{self.cherrypick_branch} {self.pr.merge_commit_sha}"
         )
 
-        # Check if there actually any changes between branches. If no, then no
+        # Check if there are actually any changes between branches. If no, then no
         # other actions are required. It's possible when changes are backported
         # manually to the release branch already
         try:
@@ -201,10 +221,13 @@ close it.
         for branch in [self.cherrypick_branch, self.backport_branch]:
             git_runner(f"{self.git_prefix} push -f {self.REMOTE} {branch}:{branch}")
 
-        self.cherrypick_pr = self.pr.base.repo.create_pull(
+        self.cherrypick_pr = self.repo.create_pull(
             title=f"Cherry pick #{self.pr.number} to {self.name}: {self.pr.title}",
-            body=f"Original pull-request #{self.pr.number}\n\n"
-            f"{self.CHERRYPICK_DESCRIPTION}",
+            body=self.CHERRYPICK_DESCRIPTION.format(
+                pr_number=self.pr.number,
+                pr_url=self.pr.html_url,
+                label_backports_created=Labels.BACKPORTS_CREATED,
+            ),
             base=self.backport_branch,
             head=self.cherrypick_branch,
         )
@@ -218,6 +241,7 @@ close it.
         assert self.cherrypick_pr is not None
         # Checkout the backport branch from the remote and make all changes to
         # apply like they are only one cherry-pick commit on top of release
+        logging.info("Creating backport for PR #%s", self.pr.number)
         git_runner(f"{self.git_prefix} checkout -f {self.backport_branch}")
         git_runner(
             f"{self.git_prefix} pull --ff-only {self.REMOTE} {self.backport_branch}"
@@ -235,9 +259,9 @@ close it.
             f"{self.git_prefix} push -f {self.REMOTE} "
             f"{self.backport_branch}:{self.backport_branch}"
         )
-        self.backport_pr = self.pr.base.repo.create_pull(
+        self.backport_pr = self.repo.create_pull(
             title=title,
-            body=f"Original pull-request #{self.pr.number}\n"
+            body=f"Original pull-request {self.pr.html_url}\n"
             f"Cherry-pick pull-request #{self.cherrypick_pr.number}\n\n"
             f"{self.BACKPORT_DESCRIPTION}",
             base=self.name,
@@ -246,6 +270,40 @@ close it.
         self.backport_pr.add_to_labels(Labels.BACKPORT)
         self._assign_new_pr(self.backport_pr)
 
+    def ping_cherry_pick_assignees(self, dry_run: bool) -> None:
+        assert self.cherrypick_pr is not None
+        logging.info(
+            "Checking if cherry-pick PR #%s needs to be pinged",
+            self.cherrypick_pr.number,
+        )
+        since_updated = datetime.now() - self.cherrypick_pr.updated_at
+        since_updated_str = (
+            f"{since_updated.days}d{since_updated.seconds // 3600}"
+            f"h{since_updated.seconds // 60 % 60}m{since_updated.seconds % 60}s"
+        )
+        if since_updated < timedelta(days=1):
+            logging.info(
+                "The cherry-pick PR was updated at %s %s ago, "
+                "waiting for the next running",
+                self.cherrypick_pr.updated_at.isoformat(),
+                since_updated_str,
+            )
+            return
+        assignees = ", ".join(f"@{user.login}" for user in self.cherrypick_pr.assignees)
+        comment_body = (
+            f"Dear {assignees}, the PR is not updated for {since_updated_str}. "
+            "Please, either resolve the conflicts, or close it to finish "
+            f"the backport process of #{self.pr.number}"
+        )
+        if dry_run:
+            logging.info(
+                "DRY RUN: would comment the cherry-pick PR #%s:\n",
+                self.cherrypick_pr.number,
+            )
+            return
+
+        self.cherrypick_pr.create_issue_comment(comment_body)
+
     def _assign_new_pr(self, new_pr: PullRequest) -> None:
         """Assign `new_pr` to author, merger and assignees of an original PR"""
         # It looks there some race when multiple .add_to_assignees are executed,
@@ -262,22 +320,33 @@ close it.
 
     @property
     def backported(self) -> bool:
-        if self._backported is not None:
-            return self._backported
-        return self.backport_pr is not None
+        return self._backported or self.backport_pr is not None
 
     def __repr__(self):
         return self.name
 
 
 class Backport:
-    def __init__(self, gh: GitHub, repo: str, dry_run: bool):
+    def __init__(
+        self,
+        gh: GitHub,
+        repo: str,
+        fetch_from: Optional[str],
+        dry_run: bool,
+        must_create_backport_label: str,
+        backport_created_label: str,
+    ):
         self.gh = gh
         self._repo_name = repo
+        self._fetch_from = fetch_from
         self.dry_run = dry_run
 
-        self._query = f"type:pr repo:{repo}"
+        self.must_create_backport_label = must_create_backport_label
+        self.backport_created_label = backport_created_label
+
         self._remote = ""
+        self._remote_line = ""
+
         self._repo = None  # type: Optional[Repository]
         self.release_prs = []  # type: PullRequests
         self.release_branches = []  # type: List[str]
@@ -286,25 +355,38 @@ class Backport:
         self.error = None  # type: Optional[Exception]
 
     @property
-    def remote(self) -> str:
-        if not self._remote:
+    def remote_line(self) -> str:
+        if not self._remote_line:
             # lines of "origin	git@github.com:ClickHouse/ClickHouse.git (fetch)"
             remotes = git_runner("git remote -v").split("\n")
             # We need the first word from the first matching result
-            self._remote = tuple(
-                remote.split(maxsplit=1)[0]
-                for remote in remotes
-                if f"github.com/{self._repo_name}" in remote  # https
-                or f"github.com:{self._repo_name}" in remote  # ssh
-            )[0]
+            self._remote_line = next(
+                iter(
+                    remote
+                    for remote in remotes
+                    if f"github.com/{self._repo_name}" in remote  # https
+                    or f"github.com:{self._repo_name}" in remote  # ssh
+                )
+            )
+
+        return self._remote_line
+
+    @property
+    def remote(self) -> str:
+        if not self._remote:
+            self._remote = self.remote_line.split(maxsplit=1)[0]
             git_runner(f"git fetch {self._remote}")
             ReleaseBranch.REMOTE = self._remote
         return self._remote
 
+    @property
+    def is_remote_ssh(self) -> bool:
+        return "github.com:" in self.remote_line
+
     def receive_release_prs(self):
         logging.info("Getting release PRs")
         self.release_prs = self.gh.get_pulls_from_search(
-            query=f"{self._query} is:open",
+            query=f"type:pr repo:{self._repo_name} is:open",
             sort="created",
             order="asc",
             label="release",
@@ -313,6 +395,14 @@ class Backport:
         self.labels_to_backport = [
             f"v{branch}-must-backport" for branch in self.release_branches
         ]
+
+        if self._fetch_from:
+            logging.info("Fetching from %s", self._fetch_from)
+            fetch_from_repo = self.gh.get_repo(self._fetch_from)
+            git_runner(
+                f"git fetch {fetch_from_repo.ssh_url if self.is_remote_ssh else fetch_from_repo.clone_url} {fetch_from_repo.default_branch} --no-tags"
+            )
+
         logging.info("Active releases: %s", ", ".join(self.release_branches))
 
     def update_local_release_branches(self):
@@ -344,9 +434,10 @@ class Backport:
         # To not have a possible TZ issues
         tomorrow = date.today() + timedelta(days=1)
         logging.info("Receive PRs suppose to be backported")
+
         self.prs_for_backport = self.gh.get_pulls_from_search(
-            query=f"{self._query} -label:{Labels.BACKPORTS_CREATED}",
-            label=",".join(self.labels_to_backport + [Labels.MUST_BACKPORT]),
+            query=f"type:pr repo:{self._fetch_from} -label:{self.backport_created_label}",
+            label=",".join(self.labels_to_backport + [self.must_create_backport_label]),
             merged=[since_date, tomorrow],
         )
         logging.info(
@@ -366,13 +457,13 @@ class Backport:
 
     def process_pr(self, pr: PullRequest) -> None:
         pr_labels = [label.name for label in pr.labels]
-        if Labels.MUST_BACKPORT in pr_labels:
+        if self.must_create_backport_label in pr_labels:
             branches = [
-                ReleaseBranch(br, pr) for br in self.release_branches
+                ReleaseBranch(br, pr, self.repo) for br in self.release_branches
             ]  # type: List[ReleaseBranch]
         else:
             branches = [
-                ReleaseBranch(br, pr)
+                ReleaseBranch(br, pr, self.repo)
                 for br in [
                     label.split("-", 1)[0][1:]  # v21.8-must-backport
                     for label in pr_labels
@@ -400,14 +491,14 @@ class Backport:
             ]
         )
         bp_cp_prs = self.gh.get_pulls_from_search(
-            query=f"{self._query} {query_suffix}",
+            query=f"type:pr repo:{self._repo_name} {query_suffix}",
         )
         for br in branches:
             br.pop_prs(bp_cp_prs)
 
         if bp_cp_prs:
             # This is definitely some error. All prs must be consumed by
-            # branches with ReleaseBranch.pop_prs. It also make the whole
+            # branches with ReleaseBranch.pop_prs. It also makes the whole
             # program exit code non-zero
             self.error = Exception(
                 "The following PRs are not filtered by release branches:\n"
@@ -431,22 +522,17 @@ class Backport:
         if self.dry_run:
             logging.info("DRY RUN: would mark PR #%s as done", pr.number)
             return
-        pr.add_to_labels(Labels.BACKPORTS_CREATED)
+        pr.add_to_labels(self.backport_created_label)
         logging.info(
             "PR #%s is successfully labeled with `%s`",
             pr.number,
-            Labels.BACKPORTS_CREATED,
+            self.backport_created_label,
         )
 
     @property
     def repo(self) -> Repository:
         if self._repo is None:
-            try:
-                self._repo = self.release_prs[0].base.repo
-            except IndexError as exc:
-                raise Exception(
-                    "`repo` is available only after the `receive_release_prs`"
-                ) from exc
+            self._repo = self.gh.get_repo(self._repo_name)
         return self._repo
 
     @property
@@ -460,7 +546,27 @@ def parse_args():
     parser.add_argument(
         "--repo", default="ClickHouse/ClickHouse", help="repo owner/name"
     )
+    parser.add_argument(
+        "--from-repo",
+        default="ClickHouse/ClickHouse",
+        help="if set, the commits will be taken from this repo, but PRs will be created in the main repo",
+    )
     parser.add_argument("--dry-run", action="store_true", help="do not create anything")
+
+    parser.add_argument(
+        "--must-create-backport-label",
+        default=Labels.MUST_BACKPORT,
+        choices=(Labels.MUST_BACKPORT, Labels.MUST_BACKPORT_CLOUD),
+        help="label to filter PRs to backport",
+    )
+
+    parser.add_argument(
+        "--backport-created-label",
+        default=Labels.BACKPORTS_CREATED,
+        choices=(Labels.BACKPORTS_CREATED, Labels.BACKPORTS_CREATED_CLOUD),
+        help="label to mark PRs as backported",
+    )
+
     parser.add_argument(
         "--debug-helpers",
         action="store_true",
@@ -512,7 +618,14 @@ def main():
     token = args.token or get_best_robot_token()
 
     gh = GitHub(token, create_cache_dir=False)
-    bp = Backport(gh, args.repo, args.dry_run)
+    bp = Backport(
+        gh,
+        args.repo,
+        args.from_repo,
+        args.dry_run,
+        args.must_create_backport_label,
+        args.backport_created_label,
+    )
     # https://github.com/python/mypy/issues/3004
     bp.gh.cache_path = f"{TEMP_PATH}/gh_cache"  # type: ignore
     bp.receive_release_prs()
@@ -525,7 +638,7 @@ def main():
 
 
 if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO)
+    logging.getLogger().setLevel(level=logging.INFO)
 
     assert not is_shallow()
     with stash():
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index 08cd2d466d0..d829115cfe1 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
-from typing import Dict, TypeVar
+from dataclasses import dataclass
+from typing import Callable, Dict, TypeVar
 
 ConfValue = TypeVar("ConfValue", str, bool)
 BuildConfig = Dict[str, ConfValue]
@@ -8,7 +9,7 @@ BuildConfig = Dict[str, ConfValue]
 CI_CONFIG = {
     "build_config": {
         "package_release": {
-            "compiler": "clang-15",
+            "compiler": "clang-16",
             "build_type": "",
             "sanitizer": "",
             "package_type": "deb",
@@ -16,18 +17,20 @@ CI_CONFIG = {
             "additional_pkgs": True,
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "coverity": {
-            "compiler": "clang-15",
+            "compiler": "clang-16",
             "build_type": "",
             "sanitizer": "",
             "package_type": "coverity",
             "tidy": "disable",
             "with_coverage": False,
             "official": False,
+            "comment": "A special build for coverity",
         },
         "package_aarch64": {
-            "compiler": "clang-15-aarch64",
+            "compiler": "clang-16-aarch64",
             "build_type": "",
             "sanitizer": "",
             "package_type": "deb",
@@ -35,125 +38,140 @@ CI_CONFIG = {
             "additional_pkgs": True,
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "package_asan": {
-            "compiler": "clang-15",
+            "compiler": "clang-16",
             "build_type": "",
             "sanitizer": "address",
             "package_type": "deb",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "package_ubsan": {
-            "compiler": "clang-15",
+            "compiler": "clang-16",
             "build_type": "",
             "sanitizer": "undefined",
             "package_type": "deb",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "package_tsan": {
-            "compiler": "clang-15",
+            "compiler": "clang-16",
             "build_type": "",
             "sanitizer": "thread",
             "package_type": "deb",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "package_msan": {
-            "compiler": "clang-15",
+            "compiler": "clang-16",
             "build_type": "",
             "sanitizer": "memory",
             "package_type": "deb",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "package_debug": {
-            "compiler": "clang-15",
+            "compiler": "clang-16",
             "build_type": "debug",
             "sanitizer": "",
             "package_type": "deb",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "Note: sparse checkout was used",
         },
         "binary_release": {
-            "compiler": "clang-15",
+            "compiler": "clang-16",
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "binary_tidy": {
-            "compiler": "clang-15",
+            "compiler": "clang-16",
             "build_type": "debug",
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "debug-amd64",
             "tidy": "enable",
             "with_coverage": False,
+            "comment": "clang-tidy is used for static analysis",
         },
         "binary_darwin": {
-            "compiler": "clang-15-darwin",
+            "compiler": "clang-16-darwin",
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "macos",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "binary_aarch64": {
-            "compiler": "clang-15-aarch64",
+            "compiler": "clang-16-aarch64",
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "binary_aarch64_v80compat": {
-            "compiler": "clang-15-aarch64-v80compat",
+            "compiler": "clang-16-aarch64-v80compat",
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "aarch64v80compat",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "For ARMv8.1 and older",
         },
         "binary_freebsd": {
-            "compiler": "clang-15-freebsd",
+            "compiler": "clang-16-freebsd",
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "freebsd",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "binary_darwin_aarch64": {
-            "compiler": "clang-15-darwin-aarch64",
+            "compiler": "clang-16-darwin-aarch64",
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "macos-aarch64",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "binary_ppc64le": {
-            "compiler": "clang-15-ppc64le",
+            "compiler": "clang-16-ppc64le",
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "powerpc64le",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "",
         },
         "binary_amd64_compat": {
-            "compiler": "clang-15-amd64-compat",
+            "compiler": "clang-16-amd64-compat",
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "amd64compat",
             "tidy": "disable",
             "with_coverage": False,
+            "comment": "SSE2-only build",
         },
     },
     "builds_report_config": {
@@ -259,6 +277,9 @@ CI_CONFIG = {
         "Stateless tests (release, wide parts enabled)": {
             "required_build": "package_release",
         },
+        "Stateless tests (release, analyzer)": {
+            "required_build": "package_release",
+        },
         "Stateless tests (release, DatabaseOrdinary)": {
             "required_build": "package_release",
         },
@@ -316,9 +337,12 @@ CI_CONFIG = {
         "Integration tests flaky check (asan)": {
             "required_build": "package_asan",
         },
-        "Compatibility check": {
+        "Compatibility check (amd64)": {
             "required_build": "package_release",
         },
+        "Compatibility check (aarch64)": {
+            "required_build": "package_aarch64",
+        },
         "Unit tests (release-clang)": {
             "required_build": "binary_release",
         },
@@ -372,20 +396,188 @@ CI_CONFIG = {
         "SQLancer (debug)": {
             "required_build": "package_debug",
         },
+        "Sqllogic test (release)": {
+            "required_build": "package_release",
+        },
     },
 }  # type: dict
 
 # checks required by Mergeable Check
 REQUIRED_CHECKS = [
-    "Fast test",
-    "Style Check",
     "ClickHouse build check",
     "ClickHouse special build check",
+    "Docs Check",
+    "Fast test",
     "Stateful tests (release)",
     "Stateless tests (release)",
-    "Unit tests (release-clang)",
+    "Style Check",
     "Unit tests (asan)",
     "Unit tests (msan)",
+    "Unit tests (release-clang)",
     "Unit tests (tsan)",
     "Unit tests (ubsan)",
 ]
+
+
+@dataclass
+class CheckDescription:
+    name: str
+    description: str  # the check descriptions, will be put into the status table
+    match_func: Callable[[str], bool]  # the function to check vs the commit status
+
+    def __hash__(self) -> int:
+        return hash(self.name + self.description)
+
+
+CHECK_DESCRIPTIONS = [
+    CheckDescription(
+        "AST fuzzer",
+        "Runs randomly generated queries to catch program errors. "
+        "The build type is optionally given in parenthesis. "
+        "If it fails, ask a maintainer for help",
+        lambda x: x.startswith("AST fuzzer"),
+    ),
+    CheckDescription(
+        "Bugfix validate check",
+        "Checks that either a new test (functional or integration) or there "
+        "some changed tests that fail with the binary built on master branch",
+        lambda x: x == "Bugfix validate check",
+    ),
+    CheckDescription(
+        "CI running",
+        "A meta-check that indicates the running CI. Normally, it's in <b>success</b> or "
+        "<b>pending</b> state. The failed status indicates some problems with the PR",
+        lambda x: x == "CI running",
+    ),
+    CheckDescription(
+        "ClickHouse build check",
+        "Builds ClickHouse in various configurations for use in further steps. "
+        "You have to fix the builds that fail. Build logs often has enough "
+        "information to fix the error, but you might have to reproduce the failure "
+        "locally. The <b>cmake</b> options can be found in the build log, grepping for "
+        '<b>cmake</b>. Use these options and follow the <a href="'
+        'https://clickhouse.com/docs/en/development/build">general build process</a>',
+        lambda x: x.startswith("ClickHouse") and x.endswith("build check"),
+    ),
+    CheckDescription(
+        "Compatibility check",
+        "Checks that <b>clickhouse</b> binary runs on distributions with old libc "
+        "versions. If it fails, ask a maintainer for help",
+        lambda x: x.startswith("Compatibility check"),
+    ),
+    CheckDescription(
+        "Docker image for servers",
+        "The check to build and optionally push the mentioned image to docker hub",
+        lambda x: x.startswith("Docker image")
+        and (x.endswith("building check") or x.endswith("build and push")),
+    ),
+    CheckDescription(
+        "Docs Check", "Builds and tests the documentation", lambda x: x == "Docs Check"
+    ),
+    CheckDescription(
+        "Fast test",
+        "Normally this is the first check that is ran for a PR. It builds ClickHouse "
+        'and runs most of <a href="https://clickhouse.com/docs/en/development/tests'
+        '#functional-tests">stateless functional tests</a>, '
+        "omitting some. If it fails, further checks are not started until it is fixed. "
+        "Look at the report to see which tests fail, then reproduce the failure "
+        'locally as described <a href="https://clickhouse.com/docs/en/development/'
+        'tests#functional-test-locally">here</a>',
+        lambda x: x == "Fast test",
+    ),
+    CheckDescription(
+        "Flaky tests",
+        "Checks if new added or modified tests are flaky by running them repeatedly, "
+        "in parallel, with more randomization. Functional tests are run 100 times "
+        "with address sanitizer, and additional randomization of thread scheduling. "
+        "Integrational tests are run up to 10 times. If at least once a new test has "
+        "failed, or was too long, this check will be red. We don't allow flaky tests, "
+        'read <a href="https://clickhouse.com/blog/decorating-a-christmas-tree-with-'
+        'the-help-of-flaky-tests/">the doc</a>',
+        lambda x: "tests flaky check" in x,
+    ),
+    CheckDescription(
+        "Install packages",
+        "Checks that the built packages are installable in a clear environment",
+        lambda x: x.startswith("Install packages ("),
+    ),
+    CheckDescription(
+        "Integration tests",
+        "The integration tests report. In parenthesis the package type is given, "
+        "and in square brackets are the optional part/total tests",
+        lambda x: x.startswith("Integration tests ("),
+    ),
+    CheckDescription(
+        "Mergeable Check",
+        "Checks if all other necessary checks are successful",
+        lambda x: x == "Mergeable Check",
+    ),
+    CheckDescription(
+        "Performance Comparison",
+        "Measure changes in query performance. The performance test report is "
+        'described in detail <a href="https://github.com/ClickHouse/ClickHouse/tree'
+        '/master/docker/test/performance-comparison#how-to-read-the-report">here</a>. '
+        "In square brackets are the optional part/total tests",
+        lambda x: x.startswith("Performance Comparison"),
+    ),
+    CheckDescription(
+        "Push to Dockerhub",
+        "The check for building and pushing the CI related docker images to docker hub",
+        lambda x: x.startswith("Push") and "to Dockerhub" in x,
+    ),
+    CheckDescription(
+        "Sqllogic",
+        "Run clickhouse on the "
+        '<a href="https://www.sqlite.org/sqllogictest">sqllogic</a> '
+        "test set against sqlite and checks that all statements are passed",
+        lambda x: x.startswith("Sqllogic test"),
+    ),
+    CheckDescription(
+        "SQLancer",
+        "Fuzzing tests that detect logical bugs with "
+        '<a href="https://github.com/sqlancer/sqlancer">SQLancer</a> tool',
+        lambda x: x.startswith("SQLancer"),
+    ),
+    CheckDescription(
+        "Stateful tests",
+        "Runs stateful functional tests for ClickHouse binaries built in various "
+        "configurations -- release, debug, with sanitizers, etc",
+        lambda x: x.startswith("Stateful tests ("),
+    ),
+    CheckDescription(
+        "Stateless tests",
+        "Runs stateless functional tests for ClickHouse binaries built in various "
+        "configurations -- release, debug, with sanitizers, etc",
+        lambda x: x.startswith("Stateless tests ("),
+    ),
+    CheckDescription(
+        "Stress test",
+        "Runs stateless functional tests concurrently from several clients to detect "
+        "concurrency-related errors",
+        lambda x: x.startswith("Stress test ("),
+    ),
+    CheckDescription(
+        "Style Check",
+        "Runs a set of checks to keep the code style clean. If some of tests failed, "
+        "see the related log from the report",
+        lambda x: x == "Style Check",
+    ),
+    CheckDescription(
+        "Unit tests",
+        "Runs the unit tests for different release types",
+        lambda x: x.startswith("Unit tests ("),
+    ),
+    CheckDescription(
+        "Upgrade check",
+        "Runs stress tests on server version from last release and then tries to "
+        "upgrade it to the version from the PR. It checks if the new server can "
+        "successfully startup without any errors, crashes or sanitizer asserts",
+        lambda x: x.startswith("Upgrade check ("),
+    ),
+    CheckDescription(
+        "Falback for unknown",
+        "There's no description for the check yet, please add it to "
+        "tests/ci/ci_config.py:CHECK_DESCRIPTIONS",
+        lambda x: True,
+    ),
+]
diff --git a/tests/ci/ci_runners_metrics_lambda/app.py b/tests/ci/ci_runners_metrics_lambda/app.py
index 44cae9221f5..341e1b674ec 100644
--- a/tests/ci/ci_runners_metrics_lambda/app.py
+++ b/tests/ci/ci_runners_metrics_lambda/app.py
@@ -37,15 +37,17 @@ RunnerDescriptions = List[RunnerDescription]
 
 
 def get_dead_runners_in_ec2(runners: RunnerDescriptions) -> RunnerDescriptions:
+    """Returns instances that are offline/dead in EC2, or not found in EC2"""
     ids = {
         runner.name: runner
         for runner in runners
         # Only `i-deadbead123` are valid names for an instance ID
-        if runner.offline and not runner.busy and runner.name.startswith("i-")
+        if runner.name.startswith("i-") and runner.offline and not runner.busy
     }
     if not ids:
         return []
 
+    # Delete all offline runners with wrong name
     result_to_delete = [
         runner
         for runner in runners
@@ -57,7 +59,7 @@ def get_dead_runners_in_ec2(runners: RunnerDescriptions) -> RunnerDescriptions:
     i = 0
     inc = 100
 
-    print("Checking ids", ids.keys())
+    print("Checking ids: ", " ".join(ids.keys()))
     instances_statuses = []
     while i < len(ids.keys()):
         try:
@@ -106,6 +108,9 @@ def get_lost_ec2_instances(runners: RunnerDescriptions) -> List[dict]:
         Filters=[{"Name": "tag-key", "Values": ["github:runner-type"]}]
     )["Reservations"]
     lost_instances = []
+    offline_runners = [
+        runner.name for runner in runners if runner.offline and not runner.busy
+    ]
     # Here we refresh the runners to get the most recent state
     now = datetime.now().timestamp()
 
@@ -126,6 +131,10 @@ def get_lost_ec2_instances(runners: RunnerDescriptions) -> List[dict]:
             ):
                 continue
 
+            if instance["InstanceId"] in offline_runners:
+                lost_instances.append(instance)
+                continue
+
             if instance["State"]["Name"] == "running" and (
                 not [
                     runner
diff --git a/tests/ci/ci_runners_metrics_lambda/requirements.txt b/tests/ci/ci_runners_metrics_lambda/requirements.txt
index e607f1a9f39..98be09ab232 100644
--- a/tests/ci/ci_runners_metrics_lambda/requirements.txt
+++ b/tests/ci/ci_runners_metrics_lambda/requirements.txt
@@ -1,3 +1,3 @@
-requests
+requests<2.30
 PyJWT
-cryptography==37.0.4
+cryptography<38
diff --git a/tests/ci/clickhouse_helper.py b/tests/ci/clickhouse_helper.py
index d60a9e6afd1..64b64896f66 100644
--- a/tests/ci/clickhouse_helper.py
+++ b/tests/ci/clickhouse_helper.py
@@ -141,7 +141,6 @@ def prepare_tests_results_for_clickhouse(
     report_url: str,
     check_name: str,
 ) -> List[dict]:
-
     pull_request_url = "https://github.com/ClickHouse/ClickHouse/commits/master"
     base_ref = "master"
     head_ref = "master"
diff --git a/tests/ci/codebrowser_check.py b/tests/ci/codebrowser_check.py
index 9fa202a357c..2dba5176c8b 100644
--- a/tests/ci/codebrowser_check.py
+++ b/tests/ci/codebrowser_check.py
@@ -1,18 +1,19 @@
 #!/usr/bin/env python3
 
 
-import os
-import subprocess
 import logging
+import os
+from pathlib import Path
 
 from github import Github
 
-from commit_status_helper import post_commit_status
-from docker_pull_helper import get_image_with_version
+from commit_status_helper import get_commit, post_commit_status
+from docker_pull_helper import get_image_with_version, DockerImage
 from env_helper import (
     IMAGES_PATH,
     REPO_COPY,
     S3_DOWNLOAD,
+    S3_BUILDS_BUCKET,
     S3_TEST_REPORTS_BUCKET,
     TEMP_PATH,
 )
@@ -27,64 +28,111 @@ from upload_result_helper import upload_results
 NAME = "Woboq Build"
 
 
-def get_run_command(repo_path, output_path, image):
+def get_run_command(
+    repo_path: Path, output_path: Path, image: DockerImage, sha: str
+) -> str:
+    user = f"{os.geteuid()}:{os.getegid()}"
     cmd = (
-        "docker run " + f"--volume={repo_path}:/repo_folder "
-        f"--volume={output_path}:/test_output "
-        f"-e 'DATA={S3_DOWNLOAD}/{S3_TEST_REPORTS_BUCKET}/codebrowser/data' {image}"
+        f"docker run --rm --user={user} --volume={repo_path}:/build "
+        f"--volume={output_path}:/workdir/output --network=host "
+        # use sccache, https://github.com/KDAB/codebrowser/issues/111
+        f"-e SCCACHE_BUCKET='{S3_BUILDS_BUCKET}' "
+        "-e SCCACHE_S3_KEY_PREFIX=ccache/sccache "
+        '-e CMAKE_FLAGS="$CMAKE_FLAGS -DCOMPILER_CACHE=sccache" '
+        f"-e 'DATA={S3_DOWNLOAD}/{S3_TEST_REPORTS_BUCKET}/codebrowser/data' "
+        f"-e SHA={sha} {image}"
     )
     return cmd
 
 
-if __name__ == "__main__":
+def main():
     logging.basicConfig(level=logging.INFO)
 
     stopwatch = Stopwatch()
 
     gh = Github(get_best_robot_token(), per_page=100)
     pr_info = PRInfo()
+    commit = get_commit(gh, pr_info.sha)
+    temp_path = Path(TEMP_PATH)
 
-    if not os.path.exists(TEMP_PATH):
-        os.makedirs(TEMP_PATH)
+    if not temp_path.exists():
+        os.makedirs(temp_path)
 
     docker_image = get_image_with_version(IMAGES_PATH, "clickhouse/codebrowser")
+    # FIXME: the codebrowser is broken with clang-16, workaround with clang-15
+    # See https://github.com/ClickHouse/ClickHouse/issues/50077
+    docker_image.version = "49701-4dcdcf4c11b5604f1c5d3121c9c6fea3e957b605"
     s3_helper = S3Helper()
 
-    result_path = os.path.join(TEMP_PATH, "result_path")
-    if not os.path.exists(result_path):
+    result_path = temp_path / "result_path"
+    if not result_path.exists():
         os.makedirs(result_path)
 
-    run_command = get_run_command(REPO_COPY, result_path, docker_image)
+    run_command = get_run_command(
+        Path(REPO_COPY), result_path, docker_image, pr_info.sha[:12]
+    )
 
     logging.info("Going to run codebrowser: %s", run_command)
 
-    run_log_path = os.path.join(TEMP_PATH, "run.log")
+    run_log_path = result_path / "run.log"
 
+    state = "success"
     with TeePopen(run_command, run_log_path) as process:
         retcode = process.wait()
         if retcode == 0:
             logging.info("Run successfully")
         else:
             logging.info("Run failed")
+            state = "failure"
 
-    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {TEMP_PATH}", shell=True)
-
-    report_path = os.path.join(result_path, "html_report")
+    report_path = result_path / "html_report"
     logging.info("Report path %s", report_path)
     s3_path_prefix = "codebrowser"
-    html_urls = s3_helper.fast_parallel_upload_dir(
-        report_path, s3_path_prefix, "clickhouse-test-reports"
-    )
+    if state == "success":
+        _ = s3_helper.fast_parallel_upload_dir(
+            report_path, s3_path_prefix, S3_TEST_REPORTS_BUCKET
+        )
 
     index_html = (
-        '<a href="{S3_DOWNLOAD}/{S3_TEST_REPORTS_BUCKET}/codebrowser/index.html">'
-        "HTML report</a>"
+        f'<a href="{S3_DOWNLOAD}/{S3_TEST_REPORTS_BUCKET}/codebrowser/index.html">'
+        "Generate codebrowser site</a>"
     )
 
-    test_result = TestResult(index_html, "Look at the report")
+    additional_logs = [path.absolute() for path in result_path.glob("*.log")]
 
-    report_url = upload_results(s3_helper, 0, pr_info.sha, [test_result], [], NAME)
+    test_results = [
+        TestResult(index_html, state, stopwatch.duration_seconds, additional_logs)
+    ]
+
+    # Check if the run log contains `FATAL Error:`, that means the code problem
+    stopwatch = Stopwatch()
+    fatal_error = "FATAL Error:"
+    logging.info("Search for '%s' in %s", fatal_error, run_log_path)
+    with open(run_log_path, "r", encoding="utf-8") as rlfd:
+        for line in rlfd.readlines():
+            if "FATAL Error:" in line:
+                logging.warning(
+                    "The line '%s' found, mark the run as failure", fatal_error
+                )
+                state = "failure"
+                test_results.append(
+                    TestResult(
+                        "Indexing error",
+                        state,
+                        stopwatch.duration_seconds,
+                        additional_logs,
+                    )
+                )
+                break
+
+    report_url = upload_results(
+        s3_helper, pr_info.number, pr_info.sha, test_results, [], NAME
+    )
 
     print(f"::notice ::Report url: {report_url}")
 
-    post_commit_status(gh, pr_info.sha, NAME, "Report built", "success", report_url)
+    post_commit_status(commit, state, report_url, "Report built", NAME, pr_info)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/ci/commit_status_helper.py b/tests/ci/commit_status_helper.py
index 9b2b9e4bcd9..8731f8280e2 100644
--- a/tests/ci/commit_status_helper.py
+++ b/tests/ci/commit_status_helper.py
@@ -3,20 +3,51 @@
 import csv
 import os
 import time
-from typing import List, Literal
+from typing import Dict, List, Literal, Optional, Union
 import logging
 
 from github import Github
+from github.GithubObject import _NotSetType, NotSet as NotSet  # type: ignore
 from github.Commit import Commit
 from github.CommitStatus import CommitStatus
+from github.IssueComment import IssueComment
+from github.Repository import Repository
 
-from ci_config import CI_CONFIG, REQUIRED_CHECKS
+from ci_config import CI_CONFIG, REQUIRED_CHECKS, CHECK_DESCRIPTIONS, CheckDescription
 from env_helper import GITHUB_REPOSITORY, GITHUB_RUN_URL
 from pr_info import PRInfo, SKIP_MERGEABLE_CHECK_LABEL
+from report import TestResult, TestResults
+from s3_helper import S3Helper
+from upload_result_helper import upload_results
 
 RETRY = 5
 CommitStatuses = List[CommitStatus]
 MERGEABLE_NAME = "Mergeable Check"
+GH_REPO = None  # type: Optional[Repository]
+CI_STATUS_NAME = "CI running"
+
+
+class RerunHelper:
+    def __init__(self, commit: Commit, check_name: str):
+        self.check_name = check_name
+        self.commit = commit
+        self.statuses = get_commit_filtered_statuses(commit)
+
+    def is_already_finished_by_status(self) -> bool:
+        # currently we agree even for failed statuses
+        for status in self.statuses:
+            if self.check_name in status.context and status.state in (
+                "success",
+                "failure",
+            ):
+                return True
+        return False
+
+    def get_finished_status(self) -> Optional[CommitStatus]:
+        for status in self.statuses:
+            if self.check_name in status.context:
+                return status
+        return None
 
 
 def override_status(status: str, check_name: str, invert: bool = False) -> str:
@@ -34,7 +65,7 @@ def override_status(status: str, check_name: str, invert: bool = False) -> str:
 def get_commit(gh: Github, commit_sha: str, retry_count: int = RETRY) -> Commit:
     for i in range(retry_count):
         try:
-            repo = gh.get_repo(GITHUB_REPOSITORY)
+            repo = get_repo(gh)
             commit = repo.get_commit(commit_sha)
             break
         except Exception as ex:
@@ -46,22 +77,191 @@ def get_commit(gh: Github, commit_sha: str, retry_count: int = RETRY) -> Commit:
 
 
 def post_commit_status(
-    gh: Github, sha: str, check_name: str, description: str, state: str, report_url: str
+    commit: Commit,
+    state: str,
+    report_url: Union[_NotSetType, str] = NotSet,
+    description: Union[_NotSetType, str] = NotSet,
+    check_name: Union[_NotSetType, str] = NotSet,
+    pr_info: Optional[PRInfo] = None,
 ) -> None:
+    """The parameters are given in the same order as for commit.create_status,
+    if an optional parameter `pr_info` is given, the `set_status_comment` functions
+    is invoked to add or update the comment with statuses overview"""
     for i in range(RETRY):
         try:
-            commit = get_commit(gh, sha, 1)
             commit.create_status(
-                context=check_name,
-                description=description,
                 state=state,
                 target_url=report_url,
+                description=description,
+                context=check_name,
             )
             break
         except Exception as ex:
             if i == RETRY - 1:
                 raise ex
             time.sleep(i)
+    if pr_info:
+        status_updated = False
+        for i in range(RETRY):
+            try:
+                set_status_comment(commit, pr_info)
+                status_updated = True
+                break
+            except Exception as ex:
+                logging.warning(
+                    "Failed to update the status commit, will retry %s times: %s",
+                    RETRY - i - 1,
+                    ex,
+                )
+
+        if not status_updated:
+            logging.error("Failed to update the status comment, continue anyway")
+
+
+def set_status_comment(commit: Commit, pr_info: PRInfo) -> None:
+    """It adds or updates the comment status to all Pull Requests but for release
+    one, so the method does nothing for simple pushes and pull requests with
+    `release`/`release-lts` labels"""
+    # to reduce number of parameters, the Github is constructed on the fly
+    gh = Github()
+    gh.__requester = commit._requester  # type:ignore #pylint:disable=protected-access
+    repo = get_repo(gh)
+    statuses = sorted(get_commit_filtered_statuses(commit), key=lambda x: x.context)
+    if not statuses:
+        return
+
+    if not [status for status in statuses if status.context == CI_STATUS_NAME]:
+        # This is the case, when some statuses already exist for the check,
+        # but not the CI_STATUS_NAME. We should create it as pending.
+        # W/o pr_info to avoid recursion, and yes, one extra create_ci_report
+        post_commit_status(
+            commit,
+            "pending",
+            create_ci_report(pr_info, statuses),
+            "The report for running CI",
+            CI_STATUS_NAME,
+        )
+
+    # We update the report in generate_status_comment function, so do it each
+    # run, even in the release PRs and normal pushes
+    comment_body = generate_status_comment(pr_info, statuses)
+    # We post the comment only to normal and backport PRs
+    if pr_info.number == 0 or pr_info.labels.intersection({"release", "release-lts"}):
+        return
+
+    comment_service_header = comment_body.split("\n", 1)[0]
+    comment = None  # type: Optional[IssueComment]
+    pr = repo.get_pull(pr_info.number)
+    for ic in pr.get_issue_comments():
+        if ic.body.startswith(comment_service_header):
+            comment = ic
+            break
+
+    if comment is None:
+        pr.create_issue_comment(comment_body)
+        return
+
+    if comment.body == comment_body:
+        logging.info("The status comment is already updated, no needs to change it")
+        return
+    comment.edit(comment_body)
+
+
+def generate_status_comment(pr_info: PRInfo, statuses: CommitStatuses) -> str:
+    """The method generates the comment body, as well it updates the CI report"""
+
+    def beauty_state(state: str) -> str:
+        if state == "success":
+            return f"🟢 {state}"
+        if state == "pending":
+            return f"🟡 {state}"
+        if state in ["error", "failure"]:
+            return f"🔴 {state}"
+        return state
+
+    report_url = create_ci_report(pr_info, statuses)
+    worst_state = get_worst_state(statuses)
+    if not worst_state:
+        # Theoretically possible, although
+        # the function should not be used on empty statuses
+        worst_state = "The commit doesn't have the statuses yet"
+    else:
+        worst_state = f"The overall status of the commit is {beauty_state(worst_state)}"
+
+    comment_body = (
+        f"<!-- automatic status comment for PR #{pr_info.number} "
+        f"from {pr_info.head_name}:{pr_info.head_ref} -->\n"
+        f"This is an automated comment for commit {pr_info.sha} with "
+        f"description of existing statuses. It's updated for the latest CI running\n"
+        f"The full report is available [here]({report_url})\n"
+        f"{worst_state}\n\n<table>"
+        "<thead><tr><th>Check name</th><th>Description</th><th>Status</th></tr></thead>\n"
+        "<tbody>"
+    )
+    # group checks by the name to get the worst one per each
+    grouped_statuses = {}  # type: Dict[CheckDescription, CommitStatuses]
+    for status in statuses:
+        cd = None
+        for c in CHECK_DESCRIPTIONS:
+            if c.match_func(status.context):
+                cd = c
+                break
+
+        if cd is None or cd == CHECK_DESCRIPTIONS[-1]:
+            # This is the case for either non-found description or a fallback
+            cd = CheckDescription(
+                status.context,
+                CHECK_DESCRIPTIONS[-1].description,
+                CHECK_DESCRIPTIONS[-1].match_func,
+            )
+
+        if cd in grouped_statuses:
+            grouped_statuses[cd].append(status)
+        else:
+            grouped_statuses[cd] = [status]
+
+    table_rows = []  # type: List[str]
+    for desc, gs in grouped_statuses.items():
+        table_rows.append(
+            f"<tr><td>{desc.name}</td><td>{desc.description}</td>"
+            f"<td>{beauty_state(get_worst_state(gs))}</td></tr>\n"
+        )
+
+    table_rows.sort()
+
+    comment_footer = "</table>"
+    return "".join([comment_body, *table_rows, comment_footer])
+
+
+def get_worst_state(statuses: CommitStatuses) -> str:
+    worst_status = None
+    states = {"error": 0, "failure": 1, "pending": 2, "success": 3}
+    for status in statuses:
+        if worst_status is None:
+            worst_status = status
+            continue
+        if states[status.state] < states[worst_status.state]:
+            worst_status = status
+        if worst_status.state == "error":
+            break
+
+    if worst_status is None:
+        return ""
+    return worst_status.state
+
+
+def create_ci_report(pr_info: PRInfo, statuses: CommitStatuses) -> str:
+    """The function converst the statuses to TestResults and uploads the report
+    to S3 tests bucket. Then it returns the URL"""
+    test_results = []  # type: TestResults
+    for status in statuses:
+        log_urls = None
+        if status.target_url is not None:
+            log_urls = [status.target_url]
+        test_results.append(TestResult(status.context, status.state, log_urls=log_urls))
+    return upload_results(
+        S3Helper(), pr_info.number, pr_info.sha, test_results, [], CI_STATUS_NAME
+    )
 
 
 def post_commit_status_to_file(
@@ -90,18 +290,28 @@ def get_commit_filtered_statuses(commit: Commit) -> CommitStatuses:
     return list(filtered.values())
 
 
+def get_repo(gh: Github) -> Repository:
+    global GH_REPO
+    if GH_REPO is not None:
+        return GH_REPO
+    GH_REPO = gh.get_repo(GITHUB_REPOSITORY)
+    return GH_REPO
+
+
 def remove_labels(gh: Github, pr_info: PRInfo, labels_names: List[str]) -> None:
-    repo = gh.get_repo(GITHUB_REPOSITORY)
+    repo = get_repo(gh)
     pull_request = repo.get_pull(pr_info.number)
     for label in labels_names:
         pull_request.remove_from_labels(label)
+        pr_info.labels.remove(label)
 
 
 def post_labels(gh: Github, pr_info: PRInfo, labels_names: List[str]) -> None:
-    repo = gh.get_repo(GITHUB_REPOSITORY)
+    repo = get_repo(gh)
     pull_request = repo.get_pull(pr_info.number)
     for label in labels_names:
         pull_request.add_to_labels(label)
+        pr_info.labels.add(label)
 
 
 def format_description(description: str) -> str:
diff --git a/tests/ci/compatibility_check.py b/tests/ci/compatibility_check.py
index 0bdcf1ba3b4..04203617dca 100644
--- a/tests/ci/compatibility_check.py
+++ b/tests/ci/compatibility_check.py
@@ -2,6 +2,7 @@
 
 from distutils.version import StrictVersion
 from typing import List, Tuple
+import argparse
 import logging
 import os
 import subprocess
@@ -15,22 +16,19 @@ from clickhouse_helper import (
     mark_flaky_tests,
     prepare_tests_results_for_clickhouse,
 )
-from commit_status_helper import post_commit_status
+from commit_status_helper import RerunHelper, get_commit, post_commit_status
 from docker_pull_helper import get_images_with_versions
 from env_helper import TEMP_PATH, REPORTS_PATH
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
 from report import TestResults, TestResult
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 from upload_result_helper import upload_results
 
 IMAGE_UBUNTU = "clickhouse/test-old-ubuntu"
 IMAGE_CENTOS = "clickhouse/test-old-centos"
-MAX_GLIBC_VERSION = "2.4"
 DOWNLOAD_RETRIES_COUNT = 5
-CHECK_NAME = "Compatibility check"
 
 
 def process_os_check(log_path: str) -> TestResult:
@@ -43,7 +41,7 @@ def process_os_check(log_path: str) -> TestResult:
             return TestResult(name, "OK")
 
 
-def process_glibc_check(log_path: str) -> TestResults:
+def process_glibc_check(log_path: str, max_glibc_version: str) -> TestResults:
     test_results = []  # type: TestResults
     with open(log_path, "r") as log:
         for line in log:
@@ -53,7 +51,7 @@ def process_glibc_check(log_path: str) -> TestResults:
                 _, version = symbol_with_glibc.split("@GLIBC_")
                 if version == "PRIVATE":
                     test_results.append(TestResult(symbol_with_glibc, "FAIL"))
-                elif StrictVersion(version) > MAX_GLIBC_VERSION:
+                elif StrictVersion(version) > max_glibc_version:
                     test_results.append(TestResult(symbol_with_glibc, "FAIL"))
     if not test_results:
         test_results.append(TestResult("glibc check", "OK"))
@@ -61,18 +59,24 @@ def process_glibc_check(log_path: str) -> TestResults:
 
 
 def process_result(
-    result_folder: str, server_log_folder: str
+    result_folder: str,
+    server_log_folder: str,
+    check_glibc: bool,
+    check_distributions: bool,
+    max_glibc_version: str,
 ) -> Tuple[str, str, TestResults, List[str]]:
     glibc_log_path = os.path.join(result_folder, "glibc.log")
-    test_results = process_glibc_check(glibc_log_path)
+    test_results = process_glibc_check(glibc_log_path, max_glibc_version)
 
     status = "success"
     description = "Compatibility check passed"
-    if len(test_results) > 1 or test_results[0].status != "OK":
-        status = "failure"
-        description = "glibc check failed"
 
-    if status == "success":
+    if check_glibc:
+        if len(test_results) > 1 or test_results[0].status != "OK":
+            status = "failure"
+            description = "glibc check failed"
+
+    if status == "success" and check_distributions:
         for operating_system in ("ubuntu:12.04", "centos:5"):
             test_result = process_os_check(
                 os.path.join(result_folder, operating_system)
@@ -101,13 +105,18 @@ def process_result(
     return status, description, test_results, result_logs
 
 
-def get_run_commands(
-    build_path, result_folder, server_log_folder, image_centos, image_ubuntu
-):
+def get_run_commands_glibc(build_path, result_folder):
     return [
         f"readelf -s --wide {build_path}/usr/bin/clickhouse | grep '@GLIBC_' > {result_folder}/glibc.log",
         f"readelf -s --wide {build_path}/usr/bin/clickhouse-odbc-bridge | grep '@GLIBC_' >> {result_folder}/glibc.log",
         f"readelf -s --wide {build_path}/usr/bin/clickhouse-library-bridge | grep '@GLIBC_' >> {result_folder}/glibc.log",
+    ]
+
+
+def get_run_commands_distributions(
+    build_path, result_folder, server_log_folder, image_centos, image_ubuntu
+):
+    return [
         f"docker run --network=host --volume={build_path}/usr/bin/clickhouse:/clickhouse "
         f"--volume={build_path}/etc/clickhouse-server:/config "
         f"--volume={server_log_folder}:/var/log/clickhouse-server {image_ubuntu} > {result_folder}/ubuntu:12.04",
@@ -117,9 +126,21 @@ def get_run_commands(
     ]
 
 
+def parse_args():
+    parser = argparse.ArgumentParser("Check compatibility with old distributions")
+    parser.add_argument("--check-name", required=True)
+    parser.add_argument("--check-glibc", action="store_true")
+    parser.add_argument(
+        "--check-distributions", action="store_true"
+    )  # currently hardcoded to x86, don't enable for ARM
+    return parser.parse_args()
+
+
 def main():
     logging.basicConfig(level=logging.INFO)
 
+    args = parse_args()
+
     stopwatch = Stopwatch()
 
     temp_path = TEMP_PATH
@@ -128,14 +149,13 @@ def main():
     pr_info = PRInfo()
 
     gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
 
-    rerun_helper = RerunHelper(gh, pr_info, CHECK_NAME)
+    rerun_helper = RerunHelper(commit, args.check_name)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
 
-    docker_images = get_images_with_versions(reports_path, [IMAGE_CENTOS, IMAGE_UBUNTU])
-
     packages_path = os.path.join(temp_path, "packages")
     if not os.path.exists(packages_path):
         os.makedirs(packages_path)
@@ -145,7 +165,7 @@ def main():
             "clickhouse-common-static_" in url or "clickhouse-server_" in url
         )
 
-    download_builds_filter(CHECK_NAME, reports_path, packages_path, url_filter)
+    download_builds_filter(args.check_name, reports_path, packages_path, url_filter)
 
     for f in os.listdir(packages_path):
         if ".deb" in f:
@@ -162,9 +182,24 @@ def main():
     if not os.path.exists(result_path):
         os.makedirs(result_path)
 
-    run_commands = get_run_commands(
-        packages_path, result_path, server_log_path, docker_images[0], docker_images[1]
-    )
+    run_commands = []
+
+    if args.check_glibc:
+        check_glibc_commands = get_run_commands_glibc(packages_path, result_path)
+        run_commands.extend(check_glibc_commands)
+
+    if args.check_distributions:
+        docker_images = get_images_with_versions(
+            reports_path, [IMAGE_CENTOS, IMAGE_UBUNTU]
+        )
+        check_distributions_commands = get_run_commands_distributions(
+            packages_path,
+            result_path,
+            server_log_path,
+            docker_images[0],
+            docker_images[1],
+        )
+        run_commands.extend(check_distributions_commands)
 
     state = "success"
     for run_command in run_commands:
@@ -177,13 +212,26 @@ def main():
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
+    # See https://sourceware.org/glibc/wiki/Glibc%20Timeline
+    max_glibc_version = ""
+    if "amd64" in args.check_name:
+        max_glibc_version = "2.4"
+    elif "aarch64" in args.check_name:
+        max_glibc_version = "2.18"  # because of build with newer sysroot?
+    else:
+        raise Exception("Can't determine max glibc version")
+
     s3_helper = S3Helper()
     state, description, test_results, additional_logs = process_result(
-        result_path, server_log_path
+        result_path,
+        server_log_path,
+        args.check_glibc,
+        args.check_distributions,
+        max_glibc_version,
     )
 
     ch_helper = ClickHouseHelper()
-    mark_flaky_tests(ch_helper, CHECK_NAME, test_results)
+    mark_flaky_tests(ch_helper, args.check_name, test_results)
 
     report_url = upload_results(
         s3_helper,
@@ -191,10 +239,10 @@ def main():
         pr_info.sha,
         test_results,
         additional_logs,
-        CHECK_NAME,
+        args.check_name,
     )
     print(f"::notice ::Report url: {report_url}")
-    post_commit_status(gh, pr_info.sha, CHECK_NAME, description, state, report_url)
+    post_commit_status(commit, state, report_url, description, args.check_name, pr_info)
 
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
@@ -203,7 +251,7 @@ def main():
         stopwatch.duration_seconds,
         stopwatch.start_time_str,
         report_url,
-        CHECK_NAME,
+        args.check_name,
     )
 
     ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
diff --git a/tests/ci/docker_images_check.py b/tests/ci/docker_images_check.py
index 192d216614e..16a58a90dcf 100644
--- a/tests/ci/docker_images_check.py
+++ b/tests/ci/docker_images_check.py
@@ -14,7 +14,7 @@ from typing import Any, Dict, List, Optional, Set, Tuple, Union
 from github import Github
 
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
-from commit_status_helper import format_description, post_commit_status
+from commit_status_helper import format_description, get_commit, post_commit_status
 from env_helper import GITHUB_WORKSPACE, RUNNER_TEMP, GITHUB_RUN_URL
 from get_robot_token import get_best_robot_token, get_parameter_from_ssm
 from pr_info import PRInfo
@@ -96,7 +96,6 @@ def get_images_dict(repo_path: str, image_file_path: str) -> ImagesDict:
 def get_changed_docker_images(
     pr_info: PRInfo, images_dict: ImagesDict
 ) -> Set[DockerImage]:
-
     if not images_dict:
         return set()
 
@@ -475,7 +474,8 @@ def main():
         return
 
     gh = Github(get_best_robot_token(), per_page=100)
-    post_commit_status(gh, pr_info.sha, NAME, description, status, url)
+    commit = get_commit(gh, pr_info.sha)
+    post_commit_status(commit, status, url, description, NAME, pr_info)
 
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
diff --git a/tests/ci/docker_manifests_merge.py b/tests/ci/docker_manifests_merge.py
index 0484ea8f641..d89708b9277 100644
--- a/tests/ci/docker_manifests_merge.py
+++ b/tests/ci/docker_manifests_merge.py
@@ -10,7 +10,7 @@ from typing import List, Dict, Tuple
 from github import Github
 
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
-from commit_status_helper import format_description, post_commit_status
+from commit_status_helper import format_description, get_commit, post_commit_status
 from env_helper import RUNNER_TEMP
 from get_robot_token import get_best_robot_token, get_parameter_from_ssm
 from pr_info import PRInfo
@@ -221,7 +221,8 @@ def main():
     description = format_description(description)
 
     gh = Github(get_best_robot_token(), per_page=100)
-    post_commit_status(gh, pr_info.sha, NAME, description, status, url)
+    commit = get_commit(gh, pr_info.sha)
+    post_commit_status(commit, status, url, description, NAME, pr_info)
 
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
diff --git a/tests/ci/docker_server.py b/tests/ci/docker_server.py
index c6854c5aa78..a434d3cc841 100644
--- a/tests/ci/docker_server.py
+++ b/tests/ci/docker_server.py
@@ -15,7 +15,7 @@ from github import Github
 
 from build_check import get_release_or_pr
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
-from commit_status_helper import format_description, post_commit_status
+from commit_status_helper import format_description, get_commit, post_commit_status
 from docker_images_check import DockerImage
 from env_helper import CI, GITHUB_RUN_URL, RUNNER_TEMP, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from get_robot_token import get_best_robot_token, get_parameter_from_ssm
@@ -372,7 +372,8 @@ def main():
     description = format_description(description)
 
     gh = Github(get_best_robot_token(), per_page=100)
-    post_commit_status(gh, pr_info.sha, NAME, description, status, url)
+    commit = get_commit(gh, pr_info.sha)
+    post_commit_status(commit, status, url, description, NAME, pr_info)
 
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
diff --git a/tests/ci/docs_check.py b/tests/ci/docs_check.py
index 4378c857afe..e3930a20bd9 100644
--- a/tests/ci/docs_check.py
+++ b/tests/ci/docs_check.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import argparse
+import atexit
 import logging
 import subprocess
 import os
@@ -8,13 +9,18 @@ import sys
 from github import Github
 
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
-from commit_status_helper import post_commit_status, get_commit
+from commit_status_helper import (
+    NotSet,
+    RerunHelper,
+    get_commit,
+    post_commit_status,
+    update_mergeable_check,
+)
 from docker_pull_helper import get_image_with_version
 from env_helper import TEMP_PATH, REPO_COPY
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
 from report import TestResults, TestResult
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
@@ -51,17 +57,18 @@ def main():
     pr_info = PRInfo(need_changed_files=True)
 
     gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
 
-    rerun_helper = RerunHelper(gh, pr_info, NAME)
+    rerun_helper = RerunHelper(commit, NAME)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
+    atexit.register(update_mergeable_check, gh, pr_info, NAME)
 
     if not pr_info.has_changes_in_documentation() and not args.force:
         logging.info("No changes in documentation")
-        commit = get_commit(gh, pr_info.sha)
-        commit.create_status(
-            context=NAME, description="No changes in docs", state="success"
+        post_commit_status(
+            commit, "success", NotSet, "No changes in docs", NAME, pr_info
         )
         sys.exit(0)
 
@@ -130,7 +137,7 @@ def main():
         s3_helper, pr_info.number, pr_info.sha, test_results, additional_files, NAME
     )
     print("::notice ::Report url: {report_url}")
-    post_commit_status(gh, pr_info.sha, NAME, description, status, report_url)
+    post_commit_status(commit, status, report_url, description, NAME, pr_info)
 
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
diff --git a/tests/ci/env_helper.py b/tests/ci/env_helper.py
index a5a4913be0b..9303f9ae293 100644
--- a/tests/ci/env_helper.py
+++ b/tests/ci/env_helper.py
@@ -1,7 +1,8 @@
+import logging
 import os
 from os import path as p
 
-from build_download_helper import get_with_retries
+from build_download_helper import get_gh_api
 
 module_dir = p.abspath(p.dirname(__file__))
 git_root = p.abspath(p.join(module_dir, "..", ".."))
@@ -46,7 +47,7 @@ def GITHUB_JOB_ID() -> str:
     jobs = []
     page = 1
     while not _GITHUB_JOB_ID:
-        response = get_with_retries(
+        response = get_gh_api(
             f"https://api.github.com/repos/{GITHUB_REPOSITORY}/"
             f"actions/runs/{GITHUB_RUN_ID}/jobs?per_page=100&page={page}"
         )
@@ -65,6 +66,32 @@ def GITHUB_JOB_ID() -> str:
         ):
             _GITHUB_JOB_ID = "0"
 
+    # FIXME: until it's here, we can't move to reusable workflows
+    if not _GITHUB_JOB_URL:
+        # This is a terrible workaround for the case of another broken part of
+        # GitHub actions. For nested workflows it doesn't provide a proper GITHUB_JOB
+        # value, but only the final one. So, for `OriginalJob / NestedJob / FinalJob`
+        # full name, GITHUB_JOB contains only FinalJob
+        matched_jobs = []
+        for job in jobs:
+            nested_parts = job["name"].split(" / ")
+            if len(nested_parts) <= 1:
+                continue
+            if nested_parts[-1] == GITHUB_JOB:
+                matched_jobs.append(job)
+        if len(matched_jobs) == 1:
+            # The best case scenario
+            _GITHUB_JOB_ID = matched_jobs[0]["id"]
+            _GITHUB_JOB_URL = matched_jobs[0]["html_url"]
+            return _GITHUB_JOB_ID
+        if matched_jobs:
+            logging.error(
+                "We could not get the ID and URL for the current job name %s, there "
+                "are more than one jobs match it for the nested workflows. Please, "
+                "refer to https://github.com/actions/runner/issues/2577",
+                GITHUB_JOB,
+            )
+
     return _GITHUB_JOB_ID
 
 
diff --git a/tests/ci/fast_test_check.py b/tests/ci/fast_test_check.py
index a5bb64889d1..89066ade2cb 100644
--- a/tests/ci/fast_test_check.py
+++ b/tests/ci/fast_test_check.py
@@ -11,22 +11,22 @@ from typing import List, Tuple
 
 from github import Github
 
-from ccache_utils import get_ccache_if_not_exists, upload_ccache
 from clickhouse_helper import (
     ClickHouseHelper,
     mark_flaky_tests,
     prepare_tests_results_for_clickhouse,
 )
 from commit_status_helper import (
+    RerunHelper,
+    get_commit,
     post_commit_status,
     update_mergeable_check,
 )
 from docker_pull_helper import get_image_with_version
-from env_helper import CACHES_PATH, TEMP_PATH
+from env_helper import S3_BUILDS_BUCKET, TEMP_PATH
 from get_robot_token import get_best_robot_token
 from pr_info import FORCE_TESTS_LABEL, PRInfo
 from report import TestResults, read_test_results
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
@@ -38,24 +38,22 @@ NAME = "Fast test"
 csv.field_size_limit(sys.maxsize)
 
 
-def get_fasttest_cmd(
-    workspace, output_path, ccache_path, repo_path, pr_number, commit_sha, image
-):
+def get_fasttest_cmd(workspace, output_path, repo_path, pr_number, commit_sha, image):
     return (
         f"docker run --cap-add=SYS_PTRACE "
+        "--network=host "  # required to get access to IAM credentials
         f"-e FASTTEST_WORKSPACE=/fasttest-workspace -e FASTTEST_OUTPUT=/test_output "
         f"-e FASTTEST_SOURCE=/ClickHouse --cap-add=SYS_PTRACE "
+        f"-e FASTTEST_CMAKE_FLAGS='-DCOMPILER_CACHE=sccache' "
         f"-e PULL_REQUEST_NUMBER={pr_number} -e COMMIT_SHA={commit_sha} "
         f"-e COPY_CLICKHOUSE_BINARY_TO_OUTPUT=1 "
+        f"-e SCCACHE_BUCKET={S3_BUILDS_BUCKET} -e SCCACHE_S3_KEY_PREFIX=ccache/sccache "
         f"--volume={workspace}:/fasttest-workspace --volume={repo_path}:/ClickHouse "
-        f"--volume={output_path}:/test_output "
-        f"--volume={ccache_path}:/fasttest-workspace/ccache {image}"
+        f"--volume={output_path}:/test_output {image}"
     )
 
 
-def process_results(
-    result_folder: str,
-) -> Tuple[str, str, TestResults, List[str]]:
+def process_results(result_folder: str) -> Tuple[str, str, TestResults, List[str]]:
     test_results = []  # type: TestResults
     additional_files = []
     # Just upload all files from result_folder.
@@ -109,12 +107,16 @@ def main():
     pr_info = PRInfo()
 
     gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
 
     atexit.register(update_mergeable_check, gh, pr_info, NAME)
 
-    rerun_helper = RerunHelper(gh, pr_info, NAME)
+    rerun_helper = RerunHelper(commit, NAME)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
+        status = rerun_helper.get_finished_status()
+        if status is not None and status.state != "success":
+            sys.exit(1)
         sys.exit(0)
 
     docker_image = get_image_with_version(temp_path, "clickhouse/fasttest")
@@ -129,21 +131,6 @@ def main():
     if not os.path.exists(output_path):
         os.makedirs(output_path)
 
-    if not os.path.exists(CACHES_PATH):
-        os.makedirs(CACHES_PATH)
-    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {CACHES_PATH}", shell=True)
-    cache_path = os.path.join(CACHES_PATH, "fasttest")
-
-    logging.info("Will try to fetch cache for our build")
-    ccache_for_pr = get_ccache_if_not_exists(
-        cache_path, s3_helper, pr_info.number, temp_path, pr_info.release_pr
-    )
-    upload_master_ccache = ccache_for_pr in (-1, 0)
-
-    if not os.path.exists(cache_path):
-        logging.info("cache was not fetched, will create empty dir")
-        os.makedirs(cache_path)
-
     repo_path = os.path.join(temp_path, "fasttest-repo")
     if not os.path.exists(repo_path):
         os.makedirs(repo_path)
@@ -151,7 +138,6 @@ def main():
     run_cmd = get_fasttest_cmd(
         workspace,
         output_path,
-        cache_path,
         repo_path,
         pr_info.number,
         pr_info.sha,
@@ -172,7 +158,6 @@ def main():
             logging.info("Run failed")
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
-    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {cache_path}", shell=True)
 
     test_output_files = os.listdir(output_path)
     additional_logs = []
@@ -202,12 +187,6 @@ def main():
     else:
         state, description, test_results, additional_logs = process_results(output_path)
 
-    logging.info("Will upload cache")
-    upload_ccache(cache_path, s3_helper, pr_info.number, temp_path)
-    if upload_master_ccache:
-        logging.info("Will upload a fallback cache for master")
-        upload_ccache(cache_path, s3_helper, 0, temp_path)
-
     ch_helper = ClickHouseHelper()
     mark_flaky_tests(ch_helper, NAME, test_results)
 
@@ -220,7 +199,7 @@ def main():
         NAME,
     )
     print(f"::notice ::Report url: {report_url}")
-    post_commit_status(gh, pr_info.sha, NAME, description, state, report_url)
+    post_commit_status(commit, state, report_url, description, NAME, pr_info)
 
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
diff --git a/tests/ci/finish_check.py b/tests/ci/finish_check.py
index ea2f5eb3136..aa8a0cf9553 100644
--- a/tests/ci/finish_check.py
+++ b/tests/ci/finish_check.py
@@ -2,32 +2,42 @@
 import logging
 from github import Github
 
-from env_helper import GITHUB_RUN_URL
-from pr_info import PRInfo
+from commit_status_helper import (
+    CI_STATUS_NAME,
+    NotSet,
+    get_commit,
+    get_commit_filtered_statuses,
+    post_commit_status,
+)
 from get_robot_token import get_best_robot_token
-from commit_status_helper import get_commit, get_commit_filtered_statuses
-
-NAME = "Run Check"
+from pr_info import PRInfo
 
 
-if __name__ == "__main__":
+def main():
     logging.basicConfig(level=logging.INFO)
 
     pr_info = PRInfo(need_orgs=True)
     gh = Github(get_best_robot_token(), per_page=100)
     commit = get_commit(gh, pr_info.sha)
 
-    url = GITHUB_RUN_URL
-    statuses = get_commit_filtered_statuses(commit)
-    pending_status = any(  # find NAME status in pending state
-        True
-        for status in statuses
-        if status.context == NAME and status.state == "pending"
-    )
-    if pending_status:
-        commit.create_status(
-            context=NAME,
-            description="All checks finished",
-            state="success",
-            target_url=url,
+    statuses = [
+        status
+        for status in get_commit_filtered_statuses(commit)
+        if status.context == CI_STATUS_NAME
+    ]
+    if not statuses:
+        return
+    status = statuses[0]
+    if status.state == "pending":
+        post_commit_status(
+            commit,
+            "success",
+            status.target_url or NotSet,
+            "All checks finished",
+            CI_STATUS_NAME,
+            pr_info,
         )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py
index 8e55c084f21..037bb13f1f8 100644
--- a/tests/ci/functional_test_check.py
+++ b/tests/ci/functional_test_check.py
@@ -20,9 +20,11 @@ from clickhouse_helper import (
     prepare_tests_results_for_clickhouse,
 )
 from commit_status_helper import (
-    post_commit_status,
+    NotSet,
+    RerunHelper,
     get_commit,
     override_status,
+    post_commit_status,
     post_commit_status_to_file,
     update_mergeable_check,
 )
@@ -32,7 +34,6 @@ from env_helper import TEMP_PATH, REPO_COPY, REPORTS_PATH
 from get_robot_token import get_best_robot_token
 from pr_info import FORCE_TESTS_LABEL, PRInfo
 from report import TestResults, read_test_results
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
@@ -53,6 +54,8 @@ def get_additional_envs(check_name, run_by_hash_num, run_by_hash_total):
         result.append("USE_PARALLEL_REPLICAS=1")
     if "s3 storage" in check_name:
         result.append("USE_S3_STORAGE_FOR_MERGE_TREE=1")
+    if "analyzer" in check_name:
+        result.append("USE_NEW_ANALYZER=1")
 
     if run_by_hash_total != 0:
         result.append(f"RUN_BY_HASH_NUM={run_by_hash_num}")
@@ -71,6 +74,7 @@ def get_image_name(check_name):
 
 
 def get_run_command(
+    check_name,
     builds_path,
     repo_tests_path,
     result_path,
@@ -103,10 +107,16 @@ def get_run_command(
     envs += [f"-e {e}" for e in additional_envs]
 
     env_str = " ".join(envs)
+    volume_with_broken_test = (
+        f"--volume={repo_tests_path}/broken_tests.txt:/broken_tests.txt"
+        if "analyzer" in check_name
+        else ""
+    )
 
     return (
         f"docker run --volume={builds_path}:/package_folder "
         f"--volume={repo_tests_path}:/usr/share/clickhouse-test "
+        f"{volume_with_broken_test} "
         f"--volume={result_path}:/test_output --volume={server_log_path}:/var/log/clickhouse-server "
         f"--cap-add=SYS_PTRACE {env_str} {additional_options_str} {image}"
     )
@@ -238,6 +248,7 @@ def main():
         need_changed_files=run_changed_tests, pr_event_from_api=validate_bugfix_check
     )
 
+    commit = get_commit(gh, pr_info.sha)
     atexit.register(update_mergeable_check, gh, pr_info, check_name)
 
     if not os.path.exists(temp_path):
@@ -265,7 +276,7 @@ def main():
         run_by_hash_total = 0
         check_name_with_group = check_name
 
-    rerun_helper = RerunHelper(gh, pr_info, check_name_with_group)
+    rerun_helper = RerunHelper(commit, check_name_with_group)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
@@ -274,13 +285,15 @@ def main():
     if run_changed_tests:
         tests_to_run = get_tests_to_run(pr_info)
         if not tests_to_run:
-            commit = get_commit(gh, pr_info.sha)
             state = override_status("success", check_name, validate_bugfix_check)
             if args.post_commit_status == "commit_status":
-                commit.create_status(
-                    context=check_name_with_group,
-                    description=NO_CHANGES_MSG,
-                    state=state,
+                post_commit_status(
+                    commit,
+                    state,
+                    NotSet,
+                    NO_CHANGES_MSG,
+                    check_name_with_group,
+                    pr_info,
                 )
             elif args.post_commit_status == "file":
                 post_commit_status_to_file(
@@ -322,6 +335,7 @@ def main():
         additional_envs.append("GLOBAL_TAGS=no-random-settings")
 
     run_command = get_run_command(
+        check_name,
         packages_path,
         repo_tests_path,
         result_path,
@@ -366,16 +380,16 @@ def main():
     if args.post_commit_status == "commit_status":
         if "parallelreplicas" in check_name.lower():
             post_commit_status(
-                gh,
-                pr_info.sha,
-                check_name_with_group,
-                description,
+                commit,
                 "success",
                 report_url,
+                description,
+                check_name_with_group,
+                pr_info,
             )
         else:
             post_commit_status(
-                gh, pr_info.sha, check_name_with_group, description, state, report_url
+                commit, state, report_url, description, check_name_with_group, pr_info
             )
     elif args.post_commit_status == "file":
         if "parallelreplicas" in check_name.lower():
diff --git a/tests/ci/get_previous_release_tag.py b/tests/ci/get_previous_release_tag.py
index c6fe6cd5fb5..c2d279f7fec 100755
--- a/tests/ci/get_previous_release_tag.py
+++ b/tests/ci/get_previous_release_tag.py
@@ -51,7 +51,6 @@ def find_previous_release(
 
     for release in releases:
         if release.version < server_version:
-
             # Check if the artifact exists on GitHub.
             # It can be not true for a short period of time
             # after creating a tag for a new release before uploading the packages.
diff --git a/tests/ci/get_robot_token.py b/tests/ci/get_robot_token.py
index 6ecaf468ed1..b41eba49cc3 100644
--- a/tests/ci/get_robot_token.py
+++ b/tests/ci/get_robot_token.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import logging
 from dataclasses import dataclass
+from typing import Optional
 
 import boto3  # type: ignore
 from github import Github
@@ -20,7 +21,13 @@ def get_parameter_from_ssm(name, decrypt=True, client=None):
     return client.get_parameter(Name=name, WithDecryption=decrypt)["Parameter"]["Value"]
 
 
+ROBOT_TOKEN = None  # type: Optional[Token]
+
+
 def get_best_robot_token(token_prefix_env_name="github_robot_token_"):
+    global ROBOT_TOKEN
+    if ROBOT_TOKEN is not None:
+        return ROBOT_TOKEN.value
     client = boto3.client("ssm", region_name="us-east-1")
     parameters = client.describe_parameters(
         ParameterFilters=[
@@ -28,7 +35,6 @@ def get_best_robot_token(token_prefix_env_name="github_robot_token_"):
         ]
     )["Parameters"]
     assert parameters
-    token = None
 
     for token_name in [p["Name"] for p in parameters]:
         value = get_parameter_from_ssm(token_name, True, client)
@@ -38,15 +44,17 @@ def get_best_robot_token(token_prefix_env_name="github_robot_token_"):
         user = gh.get_user()
         rest, _ = gh.rate_limiting
         logging.info("Get token with %s remaining requests", rest)
-        if token is None:
-            token = Token(user, value, rest)
+        if ROBOT_TOKEN is None:
+            ROBOT_TOKEN = Token(user, value, rest)
             continue
-        if token.rest < rest:
-            token.user, token.value, token.rest = user, value, rest
+        if ROBOT_TOKEN.rest < rest:
+            ROBOT_TOKEN.user, ROBOT_TOKEN.value, ROBOT_TOKEN.rest = user, value, rest
 
-    assert token
+    assert ROBOT_TOKEN
     logging.info(
-        "User %s with %s remaining requests is used", token.user.login, token.rest
+        "User %s with %s remaining requests is used",
+        ROBOT_TOKEN.user.login,
+        ROBOT_TOKEN.rest,
     )
 
-    return token.value
+    return ROBOT_TOKEN.value
diff --git a/tests/ci/install_check.py b/tests/ci/install_check.py
index 54245670b26..d619ce96cee 100644
--- a/tests/ci/install_check.py
+++ b/tests/ci/install_check.py
@@ -19,7 +19,9 @@ from clickhouse_helper import (
     prepare_tests_results_for_clickhouse,
 )
 from commit_status_helper import (
+    RerunHelper,
     format_description,
+    get_commit,
     post_commit_status,
     update_mergeable_check,
 )
@@ -29,7 +31,6 @@ from env_helper import CI, TEMP_PATH as TEMP, REPORTS_PATH
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
 from report import TestResults, TestResult
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
@@ -268,9 +269,10 @@ def main():
 
     if CI:
         gh = Github(get_best_robot_token(), per_page=100)
+        commit = get_commit(gh, pr_info.sha)
         atexit.register(update_mergeable_check, gh, pr_info, args.check_name)
 
-        rerun_helper = RerunHelper(gh, pr_info, args.check_name)
+        rerun_helper = RerunHelper(commit, args.check_name)
         if rerun_helper.is_already_finished_by_status():
             logging.info(
                 "Check is already finished according to github status, exiting"
@@ -347,7 +349,7 @@ def main():
 
     description = format_description(description)
 
-    post_commit_status(gh, pr_info.sha, args.check_name, description, state, report_url)
+    post_commit_status(commit, state, report_url, description, args.check_name, pr_info)
 
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
diff --git a/tests/ci/integration_test_check.py b/tests/ci/integration_test_check.py
index f864751e830..8ef6244a1c5 100644
--- a/tests/ci/integration_test_check.py
+++ b/tests/ci/integration_test_check.py
@@ -19,8 +19,10 @@ from clickhouse_helper import (
     prepare_tests_results_for_clickhouse,
 )
 from commit_status_helper import (
-    post_commit_status,
+    RerunHelper,
+    get_commit,
     override_status,
+    post_commit_status,
     post_commit_status_to_file,
 )
 from docker_pull_helper import get_images_with_versions
@@ -29,7 +31,6 @@ from env_helper import TEMP_PATH, REPO_COPY, REPORTS_PATH
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
 from report import TestResults, read_test_results
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
@@ -198,8 +199,9 @@ def main():
         sys.exit(0)
 
     gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
 
-    rerun_helper = RerunHelper(gh, pr_info, check_name_with_group)
+    rerun_helper = RerunHelper(commit, check_name_with_group)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
@@ -284,15 +286,10 @@ def main():
     print(f"::notice:: {check_name} Report url: {report_url}")
     if args.post_commit_status == "commit_status":
         post_commit_status(
-            gh, pr_info.sha, check_name_with_group, description, state, report_url
+            commit, state, report_url, description, check_name_with_group, pr_info
         )
     elif args.post_commit_status == "file":
-        post_commit_status_to_file(
-            post_commit_path,
-            description,
-            state,
-            report_url,
-        )
+        post_commit_status_to_file(post_commit_path, description, state, report_url)
     else:
         raise Exception(
             f'Unknown post_commit_status option "{args.post_commit_status}"'
diff --git a/tests/ci/jepsen_check.py b/tests/ci/jepsen_check.py
index ffa9e45373f..9d35d2d6e35 100644
--- a/tests/ci/jepsen_check.py
+++ b/tests/ci/jepsen_check.py
@@ -13,13 +13,12 @@ from github import Github
 
 from build_download_helper import get_build_name_for_check
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
-from commit_status_helper import post_commit_status
+from commit_status_helper import RerunHelper, get_commit, post_commit_status
 from compress_files import compress_fast
 from env_helper import REPO_COPY, TEMP_PATH, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from get_robot_token import get_best_robot_token, get_parameter_from_ssm
 from pr_info import PRInfo
 from report import TestResults, TestResult
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from ssh import SSHKey
 from stopwatch import Stopwatch
@@ -181,10 +180,11 @@ if __name__ == "__main__":
         sys.exit(0)
 
     gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
 
     check_name = KEEPER_CHECK_NAME if args.program == "keeper" else SERVER_CHECK_NAME
 
-    rerun_helper = RerunHelper(gh, pr_info, check_name)
+    rerun_helper = RerunHelper(commit, check_name)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
@@ -293,7 +293,7 @@ if __name__ == "__main__":
     )
 
     print(f"::notice ::Report url: {report_url}")
-    post_commit_status(gh, pr_info.sha, check_name, description, status, report_url)
+    post_commit_status(commit, status, report_url, description, check_name, pr_info)
 
     ch_helper = ClickHouseHelper()
     prepared_events = prepare_tests_results_for_clickhouse(
diff --git a/tests/ci/mark_release_ready.py b/tests/ci/mark_release_ready.py
index b103dd053bb..4501d40e4d3 100755
--- a/tests/ci/mark_release_ready.py
+++ b/tests/ci/mark_release_ready.py
@@ -4,7 +4,7 @@ import argparse
 import logging
 import os
 
-from commit_status_helper import get_commit
+from commit_status_helper import NotSet, get_commit, post_commit_status
 from env_helper import GITHUB_JOB_URL
 from get_robot_token import get_best_robot_token
 from github_helper import GitHub
@@ -34,6 +34,7 @@ def main():
     args = parser.parse_args()
     url = ""
     description = "the release can be created from the commit, manually set"
+    pr_info = None
     if not args.commit:
         pr_info = PRInfo()
         if pr_info.event == pr_info.default_event:
@@ -45,14 +46,10 @@ def main():
 
     gh = GitHub(args.token, create_cache_dir=False)
     # Get the rate limits for a quick fail
-    gh.get_rate_limit()
     commit = get_commit(gh, args.commit)
-
-    commit.create_status(
-        context=RELEASE_READY_STATUS,
-        description=description,
-        state="success",
-        target_url=url,
+    gh.get_rate_limit()
+    post_commit_status(
+        commit, "success", url or NotSet, description, RELEASE_READY_STATUS, pr_info
     )
 
 
diff --git a/tests/ci/merge_pr.py b/tests/ci/merge_pr.py
index fedac48f24d..2d6d81a152a 100644
--- a/tests/ci/merge_pr.py
+++ b/tests/ci/merge_pr.py
@@ -47,7 +47,18 @@ class Reviews:
                 self.reviews[user] = r
                 continue
 
-            if r.submitted_at < self.reviews[user].submitted_at:
+            # Do not process other statuses than STATES for existing user keys
+            if r.state not in self.STATES:
+                continue
+
+            # If the user has a status other than STATES, we overwrite it by a
+            # review w/ a proper state w/o checking the date
+            if self.reviews[user].state not in self.STATES:
+                self.reviews[user] = r
+                continue
+
+            # Keep the latest review per user
+            if self.reviews[user].submitted_at < r.submitted_at:
                 self.reviews[user] = r
 
     def is_approved(self, team: List[NamedUser]) -> bool:
@@ -89,55 +100,52 @@ class Reviews:
             if review.state == "APPROVED"
         }
 
-        if approved:
+        if not approved:
             logging.info(
-                "The following users from %s team approved the PR: %s",
+                "The PR #%s is not approved by any of %s team member",
+                self.pr.number,
                 TEAM_NAME,
-                ", ".join(user.login for user in approved.keys()),
             )
-            # The only reliable place to get the 100% accurate last_modified
-            # info is when the commit was pushed to GitHub. The info is
-            # available as a header 'last-modified' of /{org}/{repo}/commits/{sha}.
-            # Unfortunately, it's formatted as 'Wed, 04 Jan 2023 11:05:13 GMT'
-
-            commit = self.pr.head.repo.get_commit(self.pr.head.sha)
-            if commit.stats.last_modified is None:
-                logging.warning(
-                    "Unable to get info about the commit %s", self.pr.head.sha
-                )
-                return False
-
-            last_changed = datetime.strptime(
-                commit.stats.last_modified, "%a, %d %b %Y %H:%M:%S GMT"
-            )
-
-            approved_at = max(review.submitted_at for review in approved.values())
-            if approved_at == datetime.fromtimestamp(0):
-                logging.info(
-                    "Unable to get `datetime.fromtimestamp(0)`, "
-                    "here's debug info about reviews: %s",
-                    "\n".join(pformat(review) for review in self.reviews.values()),
-                )
-            else:
-                logging.info(
-                    "The PR is approved at %s",
-                    approved_at.isoformat(),
-                )
-
-            if approved_at < last_changed:
-                logging.info(
-                    "There are changes after approve at %s",
-                    approved_at.isoformat(),
-                )
-                return False
-            return True
+            return False
 
         logging.info(
-            "The PR #%s is not approved by any of %s team member",
-            self.pr.number,
+            "The following users from %s team approved the PR: %s",
             TEAM_NAME,
+            ", ".join(user.login for user in approved.keys()),
         )
-        return False
+
+        # The only reliable place to get the 100% accurate last_modified
+        # info is when the commit was pushed to GitHub. The info is
+        # available as a header 'last-modified' of /{org}/{repo}/commits/{sha}.
+        # Unfortunately, it's formatted as 'Wed, 04 Jan 2023 11:05:13 GMT'
+        commit = self.pr.head.repo.get_commit(self.pr.head.sha)
+        if commit.stats.last_modified is None:
+            logging.warning("Unable to get info about the commit %s", self.pr.head.sha)
+            return False
+
+        last_changed = datetime.strptime(
+            commit.stats.last_modified, "%a, %d %b %Y %H:%M:%S GMT"
+        )
+        logging.info("The PR is changed at %s", last_changed.isoformat())
+
+        approved_at = max(review.submitted_at for review in approved.values())
+        if approved_at == datetime.fromtimestamp(0):
+            logging.info(
+                "Unable to get `datetime.fromtimestamp(0)`, "
+                "here's debug info about reviews: %s",
+                "\n".join(pformat(review) for review in self.reviews.values()),
+            )
+        else:
+            logging.info("The PR is approved at %s", approved_at.isoformat())
+
+        if approved_at < last_changed:
+            logging.info(
+                "There are changes done at %s after approval at %s",
+                last_changed.isoformat(),
+                approved_at.isoformat(),
+            )
+            return False
+        return True
 
 
 def get_workflows_for_head(repo: Repository, head_sha: str) -> List[WorkflowRun]:
diff --git a/tests/ci/performance_comparison_check.py b/tests/ci/performance_comparison_check.py
index d0c84d56496..bf5704f31bd 100644
--- a/tests/ci/performance_comparison_check.py
+++ b/tests/ci/performance_comparison_check.py
@@ -12,13 +12,12 @@ from typing import Dict
 
 from github import Github
 
-from commit_status_helper import get_commit, post_commit_status
+from commit_status_helper import RerunHelper, get_commit, post_commit_status
 from ci_config import CI_CONFIG
 from docker_pull_helper import get_image_with_version
 from env_helper import GITHUB_EVENT_PATH, GITHUB_RUN_URL, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from get_robot_token import get_best_robot_token, get_parameter_from_ssm
 from pr_info import PRInfo
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from tee_popen import TeePopen
 
@@ -118,7 +117,7 @@ if __name__ == "__main__":
         message = "Skipped, not labeled with 'pr-performance'"
         report_url = GITHUB_RUN_URL
         post_commit_status(
-            gh, pr_info.sha, check_name_with_group, message, status, report_url
+            commit, status, report_url, message, check_name_with_group, pr_info
         )
         sys.exit(0)
 
@@ -131,7 +130,7 @@ if __name__ == "__main__":
             "Fill fliter our performance tests by grep -v %s", test_grep_exclude_filter
         )
 
-    rerun_helper = RerunHelper(gh, pr_info, check_name_with_group)
+    rerun_helper = RerunHelper(commit, check_name_with_group)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
@@ -142,6 +141,7 @@ if __name__ == "__main__":
         .replace("(", "_")
         .replace(")", "_")
         .replace(",", "_")
+        .replace("/", "_")
     )
 
     docker_image = get_image_with_version(reports_path, IMAGE_NAME)
@@ -266,7 +266,7 @@ if __name__ == "__main__":
         report_url = uploaded["report.html"]
 
     post_commit_status(
-        gh, pr_info.sha, check_name_with_group, message, status, report_url
+        commit, status, report_url, message, check_name_with_group, pr_info
     )
 
     if status == "error":
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index ddeb070b2b9..86d4985c6b2 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -6,7 +6,7 @@ from typing import Dict, List, Set, Union
 
 from unidiff import PatchSet  # type: ignore
 
-from build_download_helper import get_with_retries
+from build_download_helper import get_gh_api
 from env_helper import (
     GITHUB_REPOSITORY,
     GITHUB_SERVER_URL,
@@ -45,7 +45,7 @@ def get_pr_for_commit(sha, ref):
         f"https://api.github.com/repos/{GITHUB_REPOSITORY}/commits/{sha}/pulls"
     )
     try:
-        response = get_with_retries(try_get_pr_url, sleep=RETRY_SLEEP)
+        response = get_gh_api(try_get_pr_url, sleep=RETRY_SLEEP)
         data = response.json()
         our_prs = []  # type: List[Dict]
         if len(data) > 1:
@@ -105,7 +105,7 @@ class PRInfo:
         # workflow completed event, used for PRs only
         if "action" in github_event and github_event["action"] == "completed":
             self.sha = github_event["workflow_run"]["head_sha"]
-            prs_for_sha = get_with_retries(
+            prs_for_sha = get_gh_api(
                 f"https://api.github.com/repos/{GITHUB_REPOSITORY}/commits/{self.sha}"
                 "/pulls",
                 sleep=RETRY_SLEEP,
@@ -117,7 +117,7 @@ class PRInfo:
             self.number = github_event["pull_request"]["number"]
             if pr_event_from_api:
                 try:
-                    response = get_with_retries(
+                    response = get_gh_api(
                         f"https://api.github.com/repos/{GITHUB_REPOSITORY}"
                         f"/pulls/{self.number}",
                         sleep=RETRY_SLEEP,
@@ -159,7 +159,7 @@ class PRInfo:
             self.user_login = github_event["pull_request"]["user"]["login"]
             self.user_orgs = set([])
             if need_orgs:
-                user_orgs_response = get_with_retries(
+                user_orgs_response = get_gh_api(
                     github_event["pull_request"]["user"]["organizations_url"],
                     sleep=RETRY_SLEEP,
                 )
@@ -255,7 +255,7 @@ class PRInfo:
             raise TypeError("The event does not have diff URLs")
 
         for diff_url in self.diff_urls:
-            response = get_with_retries(
+            response = get_gh_api(
                 diff_url,
                 sleep=RETRY_SLEEP,
             )
diff --git a/tests/ci/report.py b/tests/ci/report.py
index 947fb33d905..a9014acec12 100644
--- a/tests/ci/report.py
+++ b/tests/ci/report.py
@@ -196,7 +196,7 @@ class TestResult:
             )
         for log_path in log_paths:
             file = Path(log_path)
-            assert file.exists()
+            assert file.exists(), file
             self.log_files.append(file)
 
 
@@ -243,6 +243,7 @@ class BuildResult:
     sanitizer: str
     status: str
     elapsed_seconds: int
+    comment: str
 
 
 BuildResults = List[BuildResult]
@@ -262,23 +263,26 @@ class ReportColorTheme:
 ColorTheme = Tuple[str, str, str]
 
 
-def _format_header(header, branch_name, branch_url=None):
-    result = " ".join([w.capitalize() for w in header.split(" ")])
+def _format_header(
+    header: str, branch_name: str, branch_url: Optional[str] = None
+) -> str:
+    # Following line does not lower CI->Ci and SQLancer->Sqlancer. It only
+    # capitalizes the first letter and doesn't touch the rest of the word
+    result = " ".join([w[0].upper() + w[1:] for w in header.split(" ") if w])
     result = result.replace("Clickhouse", "ClickHouse")
     result = result.replace("clickhouse", "ClickHouse")
     if "ClickHouse" not in result:
-        result = "ClickHouse " + result
-    result += " for "
+        result = f"ClickHouse {result}"
     if branch_url:
-        result += f'<a href="{branch_url}">{branch_name}</a>'
+        result = f'{result} for <a href="{branch_url}">{branch_name}</a>'
     else:
-        result += branch_name
+        result = f"{result} for {branch_name}"
     return result
 
 
 def _get_status_style(status: str, colortheme: Optional[ColorTheme] = None) -> str:
     ok_statuses = ("OK", "success", "PASSED")
-    fail_statuses = ("FAIL", "failure", "error", "FAILED", "Timeout")
+    fail_statuses = ("FAIL", "failure", "error", "FAILED", "Timeout", "NOT_FAILED")
 
     if colortheme is None:
         colortheme = ReportColorTheme.default
@@ -345,8 +349,8 @@ def create_test_html_report(
                 has_log_urls = True
 
             row = "<tr>"
-            is_fail = test_result.status in ("FAIL", "FLAKY")
-            if is_fail and test_result.raw_logs is not None:
+            has_error = test_result.status in ("FAIL", "FLAKY", "NOT_FAILED")
+            if has_error and test_result.raw_logs is not None:
                 row = '<tr class="failed">'
             row += "<td>" + test_result.name + "</td>"
             colspan += 1
@@ -354,7 +358,7 @@ def create_test_html_report(
 
             # Allow to quickly scroll to the first failure.
             fail_id = ""
-            if is_fail:
+            if has_error:
                 num_fails = num_fails + 1
                 fail_id = f'id="fail{num_fails}" '
 
@@ -367,6 +371,7 @@ def create_test_html_report(
                 colspan += 1
 
             if test_result.log_urls is not None:
+                has_log_urls = True
                 test_logs_html = "<br>".join(
                     [_get_html_url(url) for url in test_result.log_urls]
                 )
@@ -448,6 +453,7 @@ tr:hover td {{filter: brightness(95%);}}
 <th>Build log</th>
 <th>Build time</th>
 <th class="artifacts">Artifacts</th>
+<th>Comment</th>
 </tr>
 {rows}
 </table>
@@ -473,7 +479,7 @@ def create_build_html_report(
     commit_url: str,
 ) -> str:
     rows = ""
-    for (build_result, build_log_url, artifact_urls) in zip(
+    for build_result, build_log_url, artifact_urls in zip(
         build_results, build_logs_urls, artifact_urls_list
     ):
         row = "<tr>"
@@ -515,6 +521,8 @@ def create_build_html_report(
                 links = links[: -len(link_separator)]
             row += f"<td>{links}</td>"
 
+        row += f"<td>{build_result.comment}</td>"
+
         row += "</tr>"
         rows += row
     return HTML_BASE_BUILD_TEMPLATE.format(
diff --git a/tests/ci/rerun_helper.py b/tests/ci/rerun_helper.py
deleted file mode 100644
index fa73256d759..00000000000
--- a/tests/ci/rerun_helper.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-from typing import Optional
-
-from commit_status_helper import get_commit, get_commit_filtered_statuses
-from github import Github
-from github.CommitStatus import CommitStatus
-from pr_info import PRInfo
-
-
-# TODO: move it to commit_status_helper
-class RerunHelper:
-    def __init__(self, gh: Github, pr_info: PRInfo, check_name: str):
-        self.gh = gh
-        self.pr_info = pr_info
-        self.check_name = check_name
-        commit = get_commit(gh, self.pr_info.sha)
-        if commit is None:
-            raise ValueError(f"unable to receive commit for {pr_info.sha}")
-        self.pygh_commit = commit
-        self.statuses = get_commit_filtered_statuses(commit)
-
-    def is_already_finished_by_status(self) -> bool:
-        # currently we agree even for failed statuses
-        for status in self.statuses:
-            if self.check_name in status.context and status.state in (
-                "success",
-                "failure",
-            ):
-                return True
-        return False
-
-    def get_finished_status(self) -> Optional[CommitStatus]:
-        for status in self.statuses:
-            if self.check_name in status.context:
-                return status
-        return None
diff --git a/tests/ci/run_check.py b/tests/ci/run_check.py
index c6810173f7a..9849f19a1e4 100644
--- a/tests/ci/run_check.py
+++ b/tests/ci/run_check.py
@@ -1,24 +1,28 @@
 #!/usr/bin/env python3
 import sys
 import logging
-import re
 from typing import Tuple
 
 from github import Github
 
 from commit_status_helper import (
+    CI_STATUS_NAME,
+    NotSet,
+    create_ci_report,
     format_description,
     get_commit,
+    post_commit_status,
     post_labels,
     remove_labels,
     set_mergeable_check,
 )
-from env_helper import GITHUB_RUN_URL, GITHUB_REPOSITORY, GITHUB_SERVER_URL
+from docs_check import NAME as DOCS_NAME
+from env_helper import GITHUB_REPOSITORY, GITHUB_SERVER_URL
 from get_robot_token import get_best_robot_token
 from pr_info import FORCE_TESTS_LABEL, PRInfo
-from workflow_approve_rerun_lambda.app import TRUSTED_CONTRIBUTORS
 
-NAME = "Run Check"
+from cancel_and_rerun_workflow_lambda.app import CATEGORY_TO_LABEL, check_pr_description
+from workflow_approve_rerun_lambda.app import TRUSTED_CONTRIBUTORS
 
 TRUSTED_ORG_IDS = {
     54801242,  # clickhouse
@@ -27,39 +31,9 @@ TRUSTED_ORG_IDS = {
 OK_SKIP_LABELS = {"release", "pr-backport", "pr-cherrypick"}
 CAN_BE_TESTED_LABEL = "can be tested"
 DO_NOT_TEST_LABEL = "do not test"
+FEATURE_LABEL = "pr-feature"
 SUBMODULE_CHANGED_LABEL = "submodule changed"
 
-# They are used in .github/PULL_REQUEST_TEMPLATE.md, keep comments there
-# updated accordingly
-LABELS = {
-    "pr-backward-incompatible": ["Backward Incompatible Change"],
-    "pr-bugfix": [
-        "Bug Fix",
-        "Bug Fix (user-visible misbehaviour in official stable or prestable release)",
-        "Bug Fix (user-visible misbehavior in official stable or prestable release)",
-    ],
-    "pr-build": [
-        "Build/Testing/Packaging Improvement",
-        "Build Improvement",
-        "Build/Testing Improvement",
-        "Build",
-        "Packaging Improvement",
-    ],
-    "pr-documentation": [
-        "Documentation (changelog entry is not required)",
-        "Documentation",
-    ],
-    "pr-feature": ["New Feature"],
-    "pr-improvement": ["Improvement"],
-    "pr-not-for-changelog": [
-        "Not for changelog (changelog entry is not required)",
-        "Not for changelog",
-    ],
-    "pr-performance": ["Performance Improvement"],
-}
-
-CATEGORY_TO_LABEL = {c: lb for lb, categories in LABELS.items() for c in categories}
-
 
 def pr_is_by_trusted_user(pr_user_login, pr_user_orgs):
     if pr_user_login.lower() in TRUSTED_CONTRIBUTORS:
@@ -84,7 +58,7 @@ def pr_is_by_trusted_user(pr_user_login, pr_user_orgs):
 # Returns whether we should look into individual checks for this PR. If not, it
 # can be skipped entirely.
 # Returns can_run, description, labels_state
-def should_run_checks_for_pr(pr_info: PRInfo) -> Tuple[bool, str, str]:
+def should_run_ci_for_pr(pr_info: PRInfo) -> Tuple[bool, str, str]:
     # Consider the labels and whether the user is trusted.
     print("Got labels", pr_info.labels)
     if FORCE_TESTS_LABEL in pr_info.labels:
@@ -95,6 +69,13 @@ def should_run_checks_for_pr(pr_info: PRInfo) -> Tuple[bool, str, str]:
         print(f"Label '{DO_NOT_TEST_LABEL}' set, skipping remaining checks")
         return False, f"Labeled '{DO_NOT_TEST_LABEL}'", "success"
 
+    if OK_SKIP_LABELS.intersection(pr_info.labels):
+        return (
+            True,
+            "Don't try new checks for release/backports/cherry-picks",
+            "success",
+        )
+
     if CAN_BE_TESTED_LABEL not in pr_info.labels and not pr_is_by_trusted_user(
         pr_info.user_login, pr_info.user_orgs
     ):
@@ -103,108 +84,29 @@ def should_run_checks_for_pr(pr_info: PRInfo) -> Tuple[bool, str, str]:
         )
         return False, "Needs 'can be tested' label", "failure"
 
-    if OK_SKIP_LABELS.intersection(pr_info.labels):
-        return (
-            False,
-            "Don't try new checks for release/backports/cherry-picks",
-            "success",
-        )
-
     return True, "No special conditions apply", "pending"
 
 
-def check_pr_description(pr_info: PRInfo) -> Tuple[str, str]:
-    lines = list(
-        map(lambda x: x.strip(), pr_info.body.split("\n") if pr_info.body else [])
-    )
-    lines = [re.sub(r"\s+", " ", line) for line in lines]
-
-    # Check if body contains "Reverts ClickHouse/ClickHouse#36337"
-    if [
-        True
-        for line in lines
-        if re.match(rf"\AReverts {GITHUB_REPOSITORY}#[\d]+\Z", line)
-    ]:
-        return "", LABELS["pr-not-for-changelog"][0]
-
-    category = ""
-    entry = ""
-
-    i = 0
-    while i < len(lines):
-        if re.match(r"(?i)^[#>*_ ]*change\s*log\s*category", lines[i]):
-            i += 1
-            if i >= len(lines):
-                break
-            # Can have one empty line between header and the category
-            # itself. Filter it out.
-            if not lines[i]:
-                i += 1
-                if i >= len(lines):
-                    break
-            category = re.sub(r"^[-*\s]*", "", lines[i])
-            i += 1
-
-            # Should not have more than one category. Require empty line
-            # after the first found category.
-            if i >= len(lines):
-                break
-            if lines[i]:
-                second_category = re.sub(r"^[-*\s]*", "", lines[i])
-                result_status = (
-                    "More than one changelog category specified: '"
-                    + category
-                    + "', '"
-                    + second_category
-                    + "'"
-                )
-                return result_status, category
-
-        elif re.match(
-            r"(?i)^[#>*_ ]*(short\s*description|change\s*log\s*entry)", lines[i]
-        ):
-            i += 1
-            # Can have one empty line between header and the entry itself.
-            # Filter it out.
-            if i < len(lines) and not lines[i]:
-                i += 1
-            # All following lines until empty one are the changelog entry.
-            entry_lines = []
-            while i < len(lines) and lines[i]:
-                entry_lines.append(lines[i])
-                i += 1
-            entry = " ".join(entry_lines)
-            # Don't accept changelog entries like '...'.
-            entry = re.sub(r"[#>*_.\- ]", "", entry)
-        else:
-            i += 1
-
-    if not category:
-        return "Changelog category is empty", category
-
-    # Filter out the PR categories that are not for changelog.
-    if re.match(
-        r"(?i)doc|((non|in|not|un)[-\s]*significant)|(not[ ]*for[ ]*changelog)",
-        category,
-    ):
-        return "", category
-
-    if not entry:
-        return f"Changelog entry required for category '{category}'", category
-
-    return "", category
-
-
-if __name__ == "__main__":
+def main():
     logging.basicConfig(level=logging.INFO)
 
     pr_info = PRInfo(need_orgs=True, pr_event_from_api=True, need_changed_files=True)
-    can_run, description, labels_state = should_run_checks_for_pr(pr_info)
+    # The case for special branches like backports and releases without created
+    # PRs, like merged backport branches that are reset immediately after merge
+    if pr_info.number == 0:
+        print("::notice ::Cannot run, no PR exists for the commit")
+        sys.exit(1)
+
+    can_run, description, labels_state = should_run_ci_for_pr(pr_info)
+    if can_run and OK_SKIP_LABELS.intersection(pr_info.labels):
+        print("::notice :: Early finish the check, running in a special PR")
+        sys.exit(0)
+
     description = format_description(description)
     gh = Github(get_best_robot_token(), per_page=100)
     commit = get_commit(gh, pr_info.sha)
 
-    description_error, category = check_pr_description(pr_info)
+    description_error, category = check_pr_description(pr_info.body)
     pr_labels_to_add = []
     pr_labels_to_remove = []
     if (
@@ -233,7 +135,17 @@ if __name__ == "__main__":
     if pr_labels_to_remove:
         remove_labels(gh, pr_info, pr_labels_to_remove)
 
-    set_mergeable_check(commit, "skipped")
+    if FEATURE_LABEL in pr_info.labels:
+        print(f"The '{FEATURE_LABEL}' in the labels, expect the 'Docs Check' status")
+        post_commit_status(  # do not pass pr_info here intentionally
+            commit,
+            "pending",
+            NotSet,
+            f"expect adding docs for {FEATURE_LABEL}",
+            DOCS_NAME,
+        )
+    elif not description_error:
+        set_mergeable_check(commit, "skipped")
 
     if description_error:
         print(
@@ -241,7 +153,7 @@ if __name__ == "__main__":
             f"{description_error}"
         )
         logging.info(
-            "PR body doesn't match the template: (start)\n%s\n(end)\n" "Reason: %s",
+            "PR body doesn't match the template: (start)\n%s\n(end)\nReason: %s",
             pr_info.body,
             description_error,
         )
@@ -249,23 +161,29 @@ if __name__ == "__main__":
             f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/"
             "blob/master/.github/PULL_REQUEST_TEMPLATE.md?plain=1"
         )
-        commit.create_status(
-            context=NAME,
-            description=format_description(description_error),
-            state="failure",
-            target_url=url,
+        post_commit_status(
+            commit,
+            "failure",
+            url,
+            format_description(description_error),
+            CI_STATUS_NAME,
+            pr_info,
         )
         sys.exit(1)
 
-    url = GITHUB_RUN_URL
+    ci_report_url = create_ci_report(pr_info, [])
     if not can_run:
         print("::notice ::Cannot run")
-        commit.create_status(
-            context=NAME, description=description, state=labels_state, target_url=url
+        post_commit_status(
+            commit, labels_state, ci_report_url, description, CI_STATUS_NAME, pr_info
         )
         sys.exit(1)
     else:
         print("::notice ::Can run")
-        commit.create_status(
-            context=NAME, description=description, state="pending", target_url=url
+        post_commit_status(
+            commit, "pending", ci_report_url, description, CI_STATUS_NAME, pr_info
         )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/ci/runner_token_rotation_lambda/requirements.txt b/tests/ci/runner_token_rotation_lambda/requirements.txt
index e607f1a9f39..98be09ab232 100644
--- a/tests/ci/runner_token_rotation_lambda/requirements.txt
+++ b/tests/ci/runner_token_rotation_lambda/requirements.txt
@@ -1,3 +1,3 @@
-requests
+requests<2.30
 PyJWT
-cryptography==37.0.4
+cryptography<38
diff --git a/tests/ci/s3_helper.py b/tests/ci/s3_helper.py
index fbe9f33b49b..9ee0a431294 100644
--- a/tests/ci/s3_helper.py
+++ b/tests/ci/s3_helper.py
@@ -6,8 +6,11 @@ import re
 import shutil
 import time
 from multiprocessing.dummy import Pool
+from pathlib import Path
+from typing import List, Union
 
 import boto3  # type: ignore
+import botocore  # type: ignore
 
 from env_helper import (
     S3_TEST_REPORTS_BUCKET,
@@ -40,11 +43,14 @@ def _flatten_list(lst):
 
 
 class S3Helper:
-    def __init__(self, host=S3_URL, download_host=S3_DOWNLOAD):
+    max_pool_size = 100
+
+    def __init__(self):
+        config = botocore.config.Config(max_pool_connections=self.max_pool_size)
         self.session = boto3.session.Session(region_name="us-east-1")
-        self.client = self.session.client("s3", endpoint_url=host)
-        self.host = host
-        self.download_host = download_host
+        self.client = self.session.client("s3", endpoint_url=S3_URL, config=config)
+        self.host = S3_URL
+        self.download_host = S3_DOWNLOAD
 
     def _upload_file_to_s3(self, bucket_name: str, file_path: str, s3_path: str) -> str:
         logging.debug(
@@ -124,7 +130,9 @@ class S3Helper:
         else:
             return S3Helper.copy_file_to_local(S3_BUILDS_BUCKET, file_path, s3_path)
 
-    def fast_parallel_upload_dir(self, dir_path, s3_dir_path, bucket_name):
+    def fast_parallel_upload_dir(
+        self, dir_path: Union[str, Path], s3_dir_path: str, bucket_name: str
+    ) -> List[str]:
         all_files = []
 
         for root, _, files in os.walk(dir_path):
@@ -137,12 +145,12 @@ class S3Helper:
         t = time.time()
         sum_time = 0
 
-        def upload_task(file_path):
+        def upload_task(file_path: str) -> str:
             nonlocal counter
             nonlocal t
             nonlocal sum_time
             try:
-                s3_path = file_path.replace(dir_path, s3_dir_path)
+                s3_path = file_path.replace(str(dir_path), s3_dir_path)
                 metadata = {}
                 if s3_path.endswith("html"):
                     metadata["ContentType"] = "text/html; charset=utf-8"
@@ -167,25 +175,20 @@ class S3Helper:
                 if counter % 1000 == 0:
                     sum_time += int(time.time() - t)
                     print(
-                        "Uploaded",
-                        counter,
-                        "-",
-                        int(time.time() - t),
-                        "s",
-                        "sum time",
-                        sum_time,
-                        "s",
+                        f"Uploaded {counter}, {int(time.time()-t)}s, "
+                        f"sum time {sum_time}s",
                     )
                     t = time.time()
             except Exception as ex:
                 logging.critical("Failed to upload file, expcetion %s", ex)
             return f"{self.download_host}/{bucket_name}/{s3_path}"
 
-        p = Pool(256)
+        p = Pool(self.max_pool_size)
 
+        original_level = logging.root.level
         logging.basicConfig(level=logging.CRITICAL)
         result = sorted(_flatten_list(p.map(upload_task, all_files)))
-        logging.basicConfig(level=logging.INFO)
+        logging.basicConfig(level=original_level)
         return result
 
     def _upload_folder_to_s3(
diff --git a/tests/ci/sqlancer_check.py b/tests/ci/sqlancer_check.py
index 1a6c4d14616..144dea54133 100644
--- a/tests/ci/sqlancer_check.py
+++ b/tests/ci/sqlancer_check.py
@@ -10,10 +10,14 @@ from github import Github
 
 from build_download_helper import get_build_name_for_check, read_build_urls
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
-from commit_status_helper import format_description, post_commit_status
+from commit_status_helper import (
+    RerunHelper,
+    format_description,
+    get_commit,
+    post_commit_status,
+)
 from docker_pull_helper import get_image_with_version
 from env_helper import (
-    GITHUB_REPOSITORY,
     GITHUB_RUN_URL,
     REPORTS_PATH,
     TEMP_PATH,
@@ -21,7 +25,6 @@ from env_helper import (
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
 from report import TestResults, TestResult
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 from upload_result_helper import upload_results
@@ -46,12 +49,6 @@ def get_run_command(download_url, workspace_path, image):
     )
 
 
-def get_commit(gh, commit_sha):
-    repo = gh.get_repo(GITHUB_REPOSITORY)
-    commit = repo.get_commit(commit_sha)
-    return commit
-
-
 def main():
     logging.basicConfig(level=logging.INFO)
 
@@ -68,8 +65,9 @@ def main():
     pr_info = PRInfo()
 
     gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
 
-    rerun_helper = RerunHelper(gh, pr_info, check_name)
+    rerun_helper = RerunHelper(commit, check_name)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
@@ -187,12 +185,10 @@ def main():
         check_name,
     )
 
-    post_commit_status(gh, pr_info.sha, check_name, description, status, report_url)
-
+    post_commit_status(commit, status, report_url, description, check_name, pr_info)
     print(f"::notice:: {check_name} Report url: {report_url}")
 
     ch_helper = ClickHouseHelper()
-
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
         test_results,
@@ -202,12 +198,8 @@ def main():
         report_url,
         check_name,
     )
-
     ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
 
-    print(f"::notice Result: '{status}', '{description}', '{report_url}'")
-    post_commit_status(gh, pr_info.sha, check_name, description, status, report_url)
-
 
 if __name__ == "__main__":
     main()
diff --git a/tests/ci/sqllogic_test.py b/tests/ci/sqllogic_test.py
new file mode 100755
index 00000000000..942c9c60ee8
--- /dev/null
+++ b/tests/ci/sqllogic_test.py
@@ -0,0 +1,217 @@
+#!/usr/bin/env python3
+
+import argparse
+import csv
+import logging
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+from github import Github
+
+from env_helper import TEMP_PATH, REPO_COPY, REPORTS_PATH
+from s3_helper import S3Helper
+from get_robot_token import get_best_robot_token
+from pr_info import FORCE_TESTS_LABEL, PRInfo
+from build_download_helper import download_all_deb_packages
+from upload_result_helper import upload_results
+from docker_pull_helper import get_image_with_version
+from commit_status_helper import (
+    RerunHelper,
+    get_commit,
+    override_status,
+    post_commit_status,
+)
+from report import TestResults, read_test_results
+
+from stopwatch import Stopwatch
+from tee_popen import TeePopen
+
+
+NO_CHANGES_MSG = "Nothing to run"
+IMAGE_NAME = "clickhouse/sqllogic-test"
+
+
+def get_run_command(
+    builds_path,
+    repo_tests_path,
+    result_path,
+    server_log_path,
+    kill_timeout,
+    additional_envs,
+    image,
+):
+    envs = [
+        f"-e MAX_RUN_TIME={int(0.9 * kill_timeout)}",
+    ]
+    envs += [f"-e {e}" for e in additional_envs]
+
+    env_str = " ".join(envs)
+
+    return (
+        f"docker run "
+        f"--volume={builds_path}:/package_folder "
+        f"--volume={repo_tests_path}:/clickhouse-tests "
+        f"--volume={result_path}:/test_output "
+        f"--volume={server_log_path}:/var/log/clickhouse-server "
+        f"--cap-add=SYS_PTRACE {env_str} {image}"
+    )
+
+
+def __files_in_dir(dir_path):
+    return [
+        os.path.join(dir_path, f)
+        for f in os.listdir(dir_path)
+        if os.path.isfile(os.path.join(dir_path, f))
+    ]
+
+
+def read_check_status(result_folder):
+    status_path = os.path.join(result_folder, "check_status.tsv")
+    if not os.path.exists(status_path):
+        return "error", "Not found check_status.tsv"
+
+    logging.info("Found check_status.tsv")
+    with open(status_path, "r", encoding="utf-8") as status_file:
+        status_rows = list(csv.reader(status_file, delimiter="\t"))
+
+    for row in status_rows:
+        if len(row) != 2:
+            return "error", "Invalid check_status.tsv"
+        if row[0] != "success":
+            return row[0], row[1]
+
+    return status_rows[-1][0], status_rows[-1][1]
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("check_name")
+    parser.add_argument("kill_timeout", type=int)
+    return parser.parse_args()
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+
+    stopwatch = Stopwatch()
+
+    temp_path = TEMP_PATH
+    repo_path = REPO_COPY
+    reports_path = REPORTS_PATH
+
+    args = parse_args()
+    check_name = args.check_name
+    kill_timeout = args.kill_timeout
+
+    pr_info = PRInfo()
+    gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
+
+    rerun_helper = RerunHelper(commit, check_name)
+    if rerun_helper.is_already_finished_by_status():
+        logging.info("Check is already finished according to github status, exiting")
+        sys.exit(0)
+
+    if not os.path.exists(temp_path):
+        os.makedirs(temp_path)
+
+    docker_image = get_image_with_version(reports_path, IMAGE_NAME)
+
+    repo_tests_path = os.path.join(repo_path, "tests")
+
+    packages_path = os.path.join(temp_path, "packages")
+    if not os.path.exists(packages_path):
+        os.makedirs(packages_path)
+
+    download_all_deb_packages(check_name, reports_path, packages_path)
+
+    server_log_path = os.path.join(temp_path, "server_log")
+    if not os.path.exists(server_log_path):
+        os.makedirs(server_log_path)
+
+    result_path = os.path.join(temp_path, "result_path")
+    if not os.path.exists(result_path):
+        os.makedirs(result_path)
+
+    run_log_path = os.path.join(result_path, "runlog.log")
+
+    additional_envs = []  # type: ignore
+
+    run_command = get_run_command(  # run script inside docker
+        packages_path,
+        repo_tests_path,
+        result_path,
+        server_log_path,
+        kill_timeout,
+        additional_envs,
+        docker_image,
+    )
+    logging.info("Going to run func tests: %s", run_command)
+
+    with TeePopen(run_command, run_log_path) as process:
+        retcode = process.wait()
+        if retcode == 0:
+            logging.info("Run successfully")
+        else:
+            logging.info("Run failed")
+
+    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
+
+    logging.info("Files in result folder %s", os.listdir(result_path))
+
+    s3_helper = S3Helper()
+
+    status = None
+    description = None
+
+    additional_logs = []
+    if os.path.exists(result_path):
+        additional_logs.extend(__files_in_dir(result_path))
+
+    if os.path.exists(server_log_path):
+        additional_logs.extend(__files_in_dir(server_log_path))
+
+    status, description = read_check_status(result_path)
+
+    test_results = []  # type: TestResults
+    test_results_path = Path(result_path) / "test_results.tsv"
+    if test_results_path.exists():
+        logging.info("Found test_results.tsv")
+        test_results = read_test_results(test_results_path)
+
+    if len(test_results) > 1000:
+        test_results = test_results[:1000]
+
+    if len(test_results) == 0:
+        status, description = "error", "Empty test_results.tsv"
+
+    assert status is not None
+    status = override_status(status, check_name)
+
+    report_url = upload_results(
+        s3_helper,
+        pr_info.number,
+        pr_info.sha,
+        test_results,
+        [run_log_path] + additional_logs,
+        check_name,
+    )
+
+    print(
+        f"::notice:: {check_name}"
+        f", Result: '{status}'"
+        f", Description: '{description}'"
+        f", Report url: '{report_url}'"
+    )
+
+    # Until it pass all tests, do not block CI, report "success"
+    assert description is not None
+    post_commit_status(commit, "success", report_url, description, check_name, pr_info)
+
+    if status != "success":
+        if FORCE_TESTS_LABEL in pr_info.labels:
+            print(f"'{FORCE_TESTS_LABEL}' enabled, will report success")
+        else:
+            sys.exit(1)
diff --git a/tests/ci/stress.py b/tests/ci/stress.py
index 4f723dba101..b9044874071 100755
--- a/tests/ci/stress.py
+++ b/tests/ci/stress.py
@@ -6,6 +6,7 @@ import os
 import argparse
 import logging
 import time
+import random
 
 
 def get_options(i, upgrade_check):
@@ -30,16 +31,22 @@ def get_options(i, upgrade_check):
 
     if i % 2 == 1:
         join_alg_num = i // 2
-        if join_alg_num % 4 == 0:
+        if join_alg_num % 5 == 0:
             client_options.append("join_algorithm='parallel_hash'")
-        if join_alg_num % 4 == 1:
+        if join_alg_num % 5 == 1:
             client_options.append("join_algorithm='partial_merge'")
-        if join_alg_num % 4 == 2:
+        if join_alg_num % 5 == 2:
             client_options.append("join_algorithm='full_sorting_merge'")
-        if join_alg_num % 4 == 3:
+        if join_alg_num % 5 == 3 and not upgrade_check:
+            # Some crashes are not fixed in 23.2 yet, so ignore the setting in Upgrade check
+            client_options.append("join_algorithm='grace_hash'")
+        if join_alg_num % 5 == 4:
             client_options.append("join_algorithm='auto'")
             client_options.append("max_rows_in_join=1000")
 
+    if i > 0 and random.random() < 1 / 3:
+        client_options.append("use_query_cache=1")
+
     if i % 5 == 1:
         client_options.append("memory_tracker_fault_probability=0.001")
 
@@ -222,6 +229,20 @@ def prepare_for_hung_check(drop_databases):
     return True
 
 
+def is_ubsan_build():
+    try:
+        query = """clickhouse client -q "SELECT value FROM system.build_options WHERE name = 'CXX_FLAGS'" """
+        output = (
+            check_output(query, shell=True, stderr=STDOUT, timeout=30)
+            .decode("utf-8")
+            .strip()
+        )
+        return "-fsanitize=undefined" in output
+    except Exception as e:
+        logging.info("Failed to get build flags: %s", str(e))
+        return False
+
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO, format="%(asctime)s %(message)s")
     parser = argparse.ArgumentParser(
@@ -241,6 +262,10 @@ if __name__ == "__main__":
     args = parser.parse_args()
     if args.drop_databases and not args.hung_check:
         raise Exception("--drop-databases only used in hung check (--hung-check)")
+
+    # FIXME Hung check with ubsan is temporarily disabled due to https://github.com/ClickHouse/ClickHouse/issues/45372
+    suppress_hung_check = is_ubsan_build()
+
     func_pipes = []
     func_pipes = run_func_test(
         args.test_cmd,
@@ -305,7 +330,7 @@ if __name__ == "__main__":
         res = call(cmd, shell=True, stdout=tee.stdin, stderr=STDOUT)
         if tee.stdin is not None:
             tee.stdin.close()
-        if res != 0 and have_long_running_queries:
+        if res != 0 and have_long_running_queries and not suppress_hung_check:
             logging.info("Hung check failed with exit code %d", res)
         else:
             hung_check_status = "No queries hung\tOK\t\\N\t\n"
diff --git a/tests/ci/stress_check.py b/tests/ci/stress_check.py
index 7596a81ebc9..ac280916a2f 100644
--- a/tests/ci/stress_check.py
+++ b/tests/ci/stress_check.py
@@ -16,13 +16,12 @@ from clickhouse_helper import (
     mark_flaky_tests,
     prepare_tests_results_for_clickhouse,
 )
-from commit_status_helper import post_commit_status
+from commit_status_helper import RerunHelper, get_commit, post_commit_status
 from docker_pull_helper import get_image_with_version
 from env_helper import TEMP_PATH, REPO_COPY, REPORTS_PATH
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
 from report import TestResults, read_test_results
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
@@ -125,8 +124,9 @@ def run_stress_test(docker_image_name):
     pr_info = PRInfo()
 
     gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
 
-    rerun_helper = RerunHelper(gh, pr_info, check_name)
+    rerun_helper = RerunHelper(commit, check_name)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
@@ -180,7 +180,7 @@ def run_stress_test(docker_image_name):
     )
     print(f"::notice ::Report url: {report_url}")
 
-    post_commit_status(gh, pr_info.sha, check_name, description, state, report_url)
+    post_commit_status(commit, state, report_url, description, check_name, pr_info)
 
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
diff --git a/tests/ci/stress_tests.lib b/tests/ci/stress_tests.lib
index 75195baaeeb..04df50b3248 100644
--- a/tests/ci/stress_tests.lib
+++ b/tests/ci/stress_tests.lib
@@ -149,9 +149,14 @@ function stop()
     if [ $check_hang == true ]
     then
       # We failed to stop the server with SIGTERM. Maybe it hang, let's collect stacktraces.
-      echo -e "Possible deadlock on shutdown (see gdb.log)$FAIL" >> /test_output/test_results.tsv
+      # Add a special status just in case, so it will be possible to find in the CI DB
+      echo -e "Warning: server did not stop yet$OK" >> /test_output/test_results.tsv
       kill -TERM "$(pidof gdb)" ||:
       sleep 5
+
+      # The server could finally stop while we were terminating gdb, let's recheck if it's still running
+      kill -s 0 $pid || return
+      echo -e "Possible deadlock on shutdown (see gdb.log)$FAIL" >> /test_output/test_results.tsv
       echo "thread apply all backtrace (on stop)" >> /test_output/gdb.log
       timeout 30m gdb -batch -ex 'thread apply all backtrace' -p "$pid" | ts '%Y-%m-%d %H:%M:%S' >> /test_output/gdb.log
       clickhouse stop --force
diff --git a/tests/ci/style_check.py b/tests/ci/style_check.py
index 89878990c2c..33a5cd21f39 100644
--- a/tests/ci/style_check.py
+++ b/tests/ci/style_check.py
@@ -15,7 +15,12 @@ from clickhouse_helper import (
     mark_flaky_tests,
     prepare_tests_results_for_clickhouse,
 )
-from commit_status_helper import post_commit_status, update_mergeable_check
+from commit_status_helper import (
+    RerunHelper,
+    get_commit,
+    post_commit_status,
+    update_mergeable_check,
+)
 from docker_pull_helper import get_image_with_version
 from env_helper import GITHUB_WORKSPACE, RUNNER_TEMP
 from get_robot_token import get_best_robot_token
@@ -23,7 +28,6 @@ from github_helper import GitHub
 from git_helper import git_runner
 from pr_info import PRInfo
 from report import TestResults, read_test_results
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from ssh import SSHKey
 from stopwatch import Stopwatch
@@ -149,10 +153,11 @@ def main():
         checkout_head(pr_info)
 
     gh = GitHub(get_best_robot_token(), create_cache_dir=False)
+    commit = get_commit(gh, pr_info.sha)
 
     atexit.register(update_mergeable_check, gh, pr_info, NAME)
 
-    rerun_helper = RerunHelper(gh, pr_info, NAME)
+    rerun_helper = RerunHelper(commit, NAME)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         # Finish with the same code as previous
@@ -190,7 +195,7 @@ def main():
         s3_helper, pr_info.number, pr_info.sha, test_results, additional_files, NAME
     )
     print(f"::notice ::Report url: {report_url}")
-    post_commit_status(gh, pr_info.sha, NAME, description, state, report_url)
+    post_commit_status(commit, state, report_url, description, NAME, pr_info)
 
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
diff --git a/tests/ci/team_keys_lambda/build_and_deploy_archive.sh b/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
index 1ea2935c445..4aee85c588a 100644
--- a/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
+++ b/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
@@ -5,7 +5,7 @@ WORKDIR=$(dirname "$0")
 WORKDIR=$(readlink -f "${WORKDIR}")
 cd "$WORKDIR"
 
-PY_VERSION=3.9
+PY_VERSION=3.10
 PY_EXEC="python${PY_VERSION}"
 DOCKER_IMAGE="python:${PY_VERSION}-slim"
 LAMBDA_NAME=$(basename "$WORKDIR")
diff --git a/tests/ci/team_keys_lambda/requirements.txt b/tests/ci/team_keys_lambda/requirements.txt
index f2293605cf1..3bcbe2dfd07 100644
--- a/tests/ci/team_keys_lambda/requirements.txt
+++ b/tests/ci/team_keys_lambda/requirements.txt
@@ -1 +1 @@
-requests
+requests<2.30
diff --git a/tests/ci/terminate_runner_lambda/app.py b/tests/ci/terminate_runner_lambda/app.py
index ee9aadc488d..c9192417575 100644
--- a/tests/ci/terminate_runner_lambda/app.py
+++ b/tests/ci/terminate_runner_lambda/app.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 
 import argparse
-import sys
 import json
+import sys
 import time
 from collections import namedtuple
+from dataclasses import dataclass
 from typing import Any, Dict, List, Tuple
 
 import boto3  # type: ignore
@@ -53,6 +54,32 @@ def get_access_token(jwt_token: str, installation_id: int) -> str:
     return data["token"]  # type: ignore
 
 
+@dataclass
+class CachedToken:
+    time: int
+    value: str
+
+
+cached_token = CachedToken(0, "")
+
+
+def get_cached_access_token() -> str:
+    if time.time() - 500 < cached_token.time:
+        return cached_token.value
+    private_key, app_id = get_key_and_app_from_aws()
+    payload = {
+        "iat": int(time.time()) - 60,
+        "exp": int(time.time()) + (10 * 60),
+        "iss": app_id,
+    }
+
+    encoded_jwt = jwt.encode(payload, private_key, algorithm="RS256")
+    installation_id = get_installation_id(encoded_jwt)
+    cached_token.time = int(time.time())
+    cached_token.value = get_access_token(encoded_jwt, installation_id)
+    return cached_token.value
+
+
 RunnerDescription = namedtuple(
     "RunnerDescription", ["id", "name", "tags", "offline", "busy"]
 )
@@ -64,19 +91,25 @@ def list_runners(access_token: str) -> RunnerDescriptions:
         "Authorization": f"token {access_token}",
         "Accept": "application/vnd.github.v3+json",
     }
+    per_page = 100
     response = requests.get(
-        "https://api.github.com/orgs/ClickHouse/actions/runners?per_page=100",
+        f"https://api.github.com/orgs/ClickHouse/actions/runners?per_page={per_page}",
         headers=headers,
     )
     response.raise_for_status()
     data = response.json()
     total_runners = data["total_count"]
+    print("Expected total runners", total_runners)
     runners = data["runners"]
 
-    total_pages = int(total_runners / 100 + 1)
+    # round to 0 for 0, 1 for 1..100, but to 2 for 101..200
+    total_pages = (total_runners - 1) // per_page + 1
+
+    print("Total pages", total_pages)
     for i in range(2, total_pages + 1):
         response = requests.get(
-            f"https://api.github.com/orgs/ClickHouse/actions/runners?page={i}&per_page=100",
+            "https://api.github.com/orgs/ClickHouse/actions/runners"
+            f"?page={i}&per_page={per_page}",
             headers=headers,
         )
         response.raise_for_status()
@@ -95,6 +128,7 @@ def list_runners(access_token: str) -> RunnerDescriptions:
             busy=runner["busy"],
         )
         result.append(desc)
+
     return result
 
 
@@ -125,23 +159,11 @@ def get_candidates_to_be_killed(event_data: dict) -> Dict[str, List[str]]:
     return instances_by_zone
 
 
-def main(
-    github_secret_key: str, github_app_id: int, event: dict
-) -> Dict[str, List[str]]:
+def main(access_token: str, event: dict) -> Dict[str, List[str]]:
     print("Got event", json.dumps(event, sort_keys=True, indent=4))
     to_kill_by_zone = how_many_instances_to_kill(event)
     instances_by_zone = get_candidates_to_be_killed(event)
 
-    payload = {
-        "iat": int(time.time()) - 60,
-        "exp": int(time.time()) + (10 * 60),
-        "iss": github_app_id,
-    }
-
-    encoded_jwt = jwt.encode(payload, github_secret_key, algorithm="RS256")
-    installation_id = get_installation_id(encoded_jwt)
-    access_token = get_access_token(encoded_jwt, installation_id)
-
     runners = list_runners(access_token)
     # We used to delete potential hosts to terminate from GitHub runners pool,
     # but the documentation states:
@@ -149,8 +171,10 @@ def main(
     # so they will be cleaned out by ci_runners_metrics_lambda eventually
 
     instances_to_kill = []
+    total_to_kill = 0
     for zone, num_to_kill in to_kill_by_zone.items():
         candidates = instances_by_zone[zone]
+        total_to_kill += num_to_kill
         if num_to_kill > len(candidates):
             raise Exception(
                 f"Required to kill {num_to_kill}, but have only {len(candidates)} candidates in AV {zone}"
@@ -188,16 +212,32 @@ def main(
 
         instances_to_kill += [runner.name for runner in delete_for_av]
 
-    print("Got instances to kill: ", ", ".join(instances_to_kill))
+    if len(instances_to_kill) < total_to_kill:
+        print(f"Check other hosts from the same ASG {event['AutoScalingGroupName']}")
+        client = boto3.client("autoscaling")
+        as_groups = client.describe_auto_scaling_groups(
+            AutoScalingGroupNames=[event["AutoScalingGroupName"]]
+        )
+        assert len(as_groups["AutoScalingGroups"]) == 1
+        asg = as_groups["AutoScalingGroups"][0]
+        for instance in asg["Instances"]:
+            for runner in runners:
+                if runner.name == instance["InstanceId"] and not runner.busy:
+                    print(f"Runner {runner.name} is not busy and can be deleted")
+                    instances_to_kill.append(runner.name)
 
+            if total_to_kill <= len(instances_to_kill):
+                print("Got enough instances to kill")
+                break
+
+    print("Got instances to kill: ", ", ".join(instances_to_kill))
     response = {"InstanceIDs": instances_to_kill}
     print(response)
     return response
 
 
 def handler(event: dict, context: Any) -> Dict[str, List[str]]:
-    private_key, app_id = get_key_and_app_from_aws()
-    return main(private_key, app_id, event)
+    return main(get_cached_access_token(), event)
 
 
 if __name__ == "__main__":
@@ -274,4 +314,14 @@ if __name__ == "__main__":
         "Cause": "SCALE_IN",
     }
 
-    main(private_key, args.app_id, sample_event)
+    payload = {
+        "iat": int(time.time()) - 60,
+        "exp": int(time.time()) + (10 * 60),
+        "iss": args.app_id,
+    }
+
+    encoded_jwt = jwt.encode(payload, private_key, algorithm="RS256")
+    installation_id = get_installation_id(encoded_jwt)
+    access_token = get_access_token(encoded_jwt, args.app_id)
+
+    main(access_token, sample_event)
diff --git a/tests/ci/terminate_runner_lambda/requirements.txt b/tests/ci/terminate_runner_lambda/requirements.txt
index e607f1a9f39..98be09ab232 100644
--- a/tests/ci/terminate_runner_lambda/requirements.txt
+++ b/tests/ci/terminate_runner_lambda/requirements.txt
@@ -1,3 +1,3 @@
-requests
+requests<2.30
 PyJWT
-cryptography==37.0.4
+cryptography<38
diff --git a/tests/ci/tests/docker_images.json b/tests/ci/tests/docker_images.json
index 30fa1416f9e..0d40d43c33f 100644
--- a/tests/ci/tests/docker_images.json
+++ b/tests/ci/tests/docker_images.json
@@ -149,5 +149,9 @@
     "docker/docs/release": {
         "name": "clickhouse/docs-release",
         "dependent": []
+    },
+    "docker/test/sqllogic": {
+        "name": "clickhouse/sqllogic-test",
+        "dependent": []
     }
 }
diff --git a/tests/ci/unit_tests_check.py b/tests/ci/unit_tests_check.py
index edc096908f4..5279ccde492 100644
--- a/tests/ci/unit_tests_check.py
+++ b/tests/ci/unit_tests_check.py
@@ -15,13 +15,17 @@ from clickhouse_helper import (
     mark_flaky_tests,
     prepare_tests_results_for_clickhouse,
 )
-from commit_status_helper import post_commit_status, update_mergeable_check
+from commit_status_helper import (
+    RerunHelper,
+    get_commit,
+    post_commit_status,
+    update_mergeable_check,
+)
 from docker_pull_helper import get_image_with_version
 from env_helper import TEMP_PATH, REPORTS_PATH
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
 from report import TestResults, TestResult
-from rerun_helper import RerunHelper
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
@@ -116,10 +120,11 @@ def main():
     pr_info = PRInfo()
 
     gh = Github(get_best_robot_token(), per_page=100)
+    commit = get_commit(gh, pr_info.sha)
 
     atexit.register(update_mergeable_check, gh, pr_info, check_name)
 
-    rerun_helper = RerunHelper(gh, pr_info, check_name)
+    rerun_helper = RerunHelper(commit, check_name)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
@@ -165,7 +170,7 @@ def main():
         check_name,
     )
     print(f"::notice ::Report url: {report_url}")
-    post_commit_status(gh, pr_info.sha, check_name, description, state, report_url)
+    post_commit_status(commit, state, report_url, description, check_name, pr_info)
 
     prepared_events = prepare_tests_results_for_clickhouse(
         pr_info,
diff --git a/tests/ci/upload_result_helper.py b/tests/ci/upload_result_helper.py
index b988e240b0e..150af7aff4a 100644
--- a/tests/ci/upload_result_helper.py
+++ b/tests/ci/upload_result_helper.py
@@ -59,9 +59,10 @@ def upload_results(
     additional_files: List[str],
     check_name: str,
 ) -> str:
-    s3_path_prefix = f"{pr_number}/{commit_sha}/" + check_name.lower().replace(
-        " ", "_"
-    ).replace("(", "_").replace(")", "_").replace(",", "_")
+    normalized_check_name = check_name.lower()
+    for r in ((" ", "_"), ("(", "_"), (")", "_"), (",", "_"), ("/", "_")):
+        normalized_check_name = normalized_check_name.replace(*r)
+    s3_path_prefix = f"{pr_number}/{commit_sha}/{normalized_check_name}"
     additional_urls = process_logs(
         s3_client, additional_files, s3_path_prefix, test_results
     )
diff --git a/tests/ci/workflow_approve_rerun_lambda/app.py b/tests/ci/workflow_approve_rerun_lambda/app.py
index decf6ce0393..2cdbdecca6e 100644
--- a/tests/ci/workflow_approve_rerun_lambda/app.py
+++ b/tests/ci/workflow_approve_rerun_lambda/app.py
@@ -12,12 +12,11 @@ import boto3  # type: ignore
 SUSPICIOUS_CHANGED_FILES_NUMBER = 200
 
 SUSPICIOUS_PATTERNS = [
-    "tests/ci/*",
-    "docs/tools/*",
     ".github/*",
-    "utils/release/*",
     "docker/*",
-    "release",
+    "docs/tools/*",
+    "packages/*",
+    "tests/ci/*",
 ]
 
 # Number of retries for API calls.
@@ -124,6 +123,9 @@ TRUSTED_CONTRIBUTORS = {
         "tylerhannan",  # ClickHouse Employee
         "myrrc",  # Mike Kot, DoubleCloud
         "thevar1able",  # ClickHouse Employee
+        "aalexfvk",
+        "MikhailBurdukov",
+        "tsolodov",  # ClickHouse Employee
     ]
 }
 
@@ -311,11 +313,12 @@ def check_suspicious_changed_files(changed_files):
                 )
                 return True
 
-    print("No changed files match suspicious patterns, run will be approved")
+    print("No changed files match suspicious patterns, run could be approved")
     return False
 
 
 def approve_run(workflow_description: WorkflowDescription, token: str) -> None:
+    print("Approving run")
     url = f"{workflow_description.api_url}/approve"
     _exec_post_with_retry(url, token)
 
@@ -478,6 +481,11 @@ def main(event):
         approve_run(workflow_description, token)
         return
 
+    labels = {label["name"] for label in pull_request["labels"]}
+    if "can be tested" not in labels:
+        print("Label 'can be tested' is required for untrusted users")
+        return
+
     changed_files = get_changed_files_for_pull_request(pull_request, token)
     print(f"Totally have {len(changed_files)} changed files in PR:", changed_files)
     if check_suspicious_changed_files(changed_files):
diff --git a/tests/ci/workflow_approve_rerun_lambda/requirements.txt b/tests/ci/workflow_approve_rerun_lambda/requirements.txt
index e607f1a9f39..98be09ab232 100644
--- a/tests/ci/workflow_approve_rerun_lambda/requirements.txt
+++ b/tests/ci/workflow_approve_rerun_lambda/requirements.txt
@@ -1,3 +1,3 @@
-requests
+requests<2.30
 PyJWT
-cryptography==37.0.4
+cryptography<38
diff --git a/tests/ci/workflow_jobs_lambda/app.py b/tests/ci/workflow_jobs_lambda/app.py
index f6589576806..bc8e1212be5 100644
--- a/tests/ci/workflow_jobs_lambda/app.py
+++ b/tests/ci/workflow_jobs_lambda/app.py
@@ -213,7 +213,7 @@ def send_event_workflow_job(workflow_job: WorkflowJob) -> None:
     #     `head_sha` String,
     #     `url` String,
     #     `html_url` String,
-    #     `status` Enum8('queued' = 1, 'in_progress' = 2, 'completed' = 3, 'waiting' = 4),
+    #     `status` Enum8('waiting' = 1, 'queued' = 2, 'in_progress' = 3, 'completed' = 4),
     #     `conclusion` LowCardinality(String),
     #     `started_at` DateTime,
     #     `completed_at` DateTime,
@@ -251,14 +251,20 @@ def send_event_workflow_job(workflow_job: WorkflowJob) -> None:
         clickhouse_client.insert_event_into(**kwargs)
 
 
-def handler(event: dict, _: Any) -> dict:
+def handler(event: dict, context: Any) -> dict:
     if event["isBase64Encoded"]:
         event_data = json.loads(b64decode(event["body"]))
     else:
         event_data = json.loads(event["body"])
 
     repo = event_data["repository"]
-    wf_job = event_data["workflow_job"]
+    try:
+        wf_job = event_data["workflow_job"]
+    except KeyError:
+        logging.error("The event does not contain valid workflow_jobs data")
+        logging.error("The event data: %s", event)
+        logging.error("The context data: %s", context)
+
     workflow_job = WorkflowJob(
         wf_job["id"],
         wf_job["run_id"],
@@ -284,10 +290,12 @@ def handler(event: dict, _: Any) -> dict:
         wf_job["runner_group_name"] or "",  # nullable
         repo["full_name"],
     )
+    logging.info(
+        "Got the next event (private_repo=%s): %s", repo["private"], workflow_job
+    )
     if repo["private"]:
         workflow_job.anonimyze()
 
-    logging.info("Got the next event: %s", workflow_job)
     send_event_workflow_job(workflow_job)
 
     return {
diff --git a/tests/ci/workflow_jobs_lambda/requirements.txt b/tests/ci/workflow_jobs_lambda/requirements.txt
index f2293605cf1..3bcbe2dfd07 100644
--- a/tests/ci/workflow_jobs_lambda/requirements.txt
+++ b/tests/ci/workflow_jobs_lambda/requirements.txt
@@ -1 +1 @@
-requests
+requests<2.30
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 68bca93c55c..d8fad77b95c 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -11,6 +11,7 @@ import shutil
 import sys
 import os
 import os.path
+import platform
 import signal
 import re
 import copy
@@ -76,8 +77,9 @@ def trim_for_log(s):
     if not s:
         return s
     lines = s.splitlines()
-    if len(lines) > 100:
-        return "\n".join(lines[:50] + ["#" * 100] + lines[-50:])
+    if len(lines) > 10000:
+        separator = "-" * 40 + str(len(lines) - 10000) + " lines are hidden" + "-" * 40
+        return "\n".join(lines[:5000] + [] + [separator] + [] + lines[-5000:])
     else:
         return "\n".join(lines)
 
@@ -94,7 +96,13 @@ class HTTPError(Exception):
 
 # Helpers to execute queries via HTTP interface.
 def clickhouse_execute_http(
-    base_args, query, timeout=30, settings=None, default_format=None, max_http_retries=5
+    base_args,
+    query,
+    timeout=30,
+    settings=None,
+    default_format=None,
+    max_http_retries=5,
+    retry_error_codes=False,
 ):
     if args.secure:
         client = http.client.HTTPSConnection(
@@ -117,6 +125,7 @@ def clickhouse_execute_http(
         "http_connection_timeout": timeout,
         "http_receive_timeout": timeout,
         "http_send_timeout": timeout,
+        "output_format_parallel_formatting": 0,
     }
     if settings is not None:
         params.update(settings)
@@ -131,11 +140,12 @@ def clickhouse_execute_http(
             )
             res = client.getresponse()
             data = res.read()
-            break
+            if res.status == 200 or (not retry_error_codes):
+                break
         except Exception as ex:
             if i == max_http_retries - 1:
                 raise ex
-
+            client.close()
             sleep(i + 1)
 
     if res.status != 200:
@@ -143,12 +153,36 @@ def clickhouse_execute_http(
 
     return data
 
-def clickhouse_execute(base_args, query, timeout=30, settings=None, max_http_retries=5):
-    return clickhouse_execute_http(base_args, query, timeout, settings, max_http_retries=max_http_retries).strip()
+
+def clickhouse_execute(
+    base_args,
+    query,
+    timeout=30,
+    settings=None,
+    max_http_retries=5,
+    retry_error_codes=False,
+):
+    return clickhouse_execute_http(
+        base_args,
+        query,
+        timeout,
+        settings,
+        max_http_retries=max_http_retries,
+        retry_error_codes=retry_error_codes,
+    ).strip()
 
 
-def clickhouse_execute_json(base_args, query, timeout=60, settings=None, max_http_retries=5):
-    data = clickhouse_execute_http(base_args, query, timeout, settings, "JSONEachRow", max_http_retries=max_http_retries)
+def clickhouse_execute_json(
+    base_args, query, timeout=60, settings=None, max_http_retries=5
+):
+    data = clickhouse_execute_http(
+        base_args,
+        query,
+        timeout,
+        settings,
+        "JSONEachRow",
+        max_http_retries=max_http_retries,
+    )
     if not data:
         return None
     rows = []
@@ -245,44 +279,44 @@ def need_retry(args, stdout, stderr, total_time):
 def get_processlist_with_stacktraces(args):
     try:
         if args.replicated_database:
-            return clickhouse_execute_json(
+            return clickhouse_execute(
                 args,
                 """
             SELECT materialize(hostName() || '::' || tcpPort()::String) as host_port, *
             -- NOTE: view() here to do JOIN on shards, instead of initiator
             FROM clusterAllReplicas('test_cluster_database_replicated', view(
                 SELECT
+                    p.*,
                     arrayStringConcat(groupArray('Thread ID ' || toString(s.thread_id) || '\n' || arrayStringConcat(arrayMap(
                         x -> concat(addressToLine(x), '::', demangle(addressToSymbol(x))),
                         s.trace), '\n') AS stacktrace
-                    )) AS stacktraces,
-                    p.*
+                    )) AS stacktraces
                 FROM system.processes p
                 JOIN system.stack_trace s USING (query_id)
                 WHERE query NOT LIKE '%system.processes%'
                 GROUP BY p.*
             ))
-            ORDER BY elapsed DESC
+            ORDER BY elapsed DESC FORMAT Vertical
             """,
                 settings={
                     "allow_introspection_functions": 1,
                 },
             )
         else:
-            return clickhouse_execute_json(
+            return clickhouse_execute(
                 args,
                 """
             SELECT
+                p.*,
                 arrayStringConcat(groupArray('Thread ID ' || toString(s.thread_id) || '\n' || arrayStringConcat(arrayMap(
                     x -> concat(addressToLine(x), '::', demangle(addressToSymbol(x))),
                     s.trace), '\n') AS stacktrace
-                )) AS stacktraces,
-                p.*
+                )) AS stacktraces
             FROM system.processes p
             JOIN system.stack_trace s USING (query_id)
             WHERE query NOT LIKE '%system.processes%'
             GROUP BY p.*
-            ORDER BY elapsed DESC
+            ORDER BY elapsed DESC FORMAT Vertical
             """,
                 settings={
                     "allow_introspection_functions": 1,
@@ -434,7 +468,7 @@ class FailureReason(enum.Enum):
     SERVER_DIED = "server died"
     EXIT_CODE = "return code: "
     STDERR = "having stderror: "
-    EXCEPTION = "having having exception in stdout: "
+    EXCEPTION = "having exception in stdout: "
     RESULT_DIFF = "result differs with reference: "
     TOO_LONG = "Test runs too long (> 60s). Make it faster."
     INTERNAL_QUERY_FAIL = "Internal query (CREATE/DROP DATABASE) failed:"
@@ -496,6 +530,7 @@ class SettingsRandomizer:
         "max_threads": lambda: random.randint(1, 64),
         "optimize_or_like_chain": lambda: random.randint(0, 1),
         "optimize_read_in_order": lambda: random.randint(0, 1),
+        "enable_multiple_prewhere_read_steps": lambda: random.randint(0, 1),
         "read_in_order_two_level_merge_threshold": lambda: random.randint(0, 100),
         "optimize_aggregation_in_order": lambda: random.randint(0, 1),
         "aggregation_in_order_max_block_bytes": lambda: random.randint(0, 50000000),
@@ -509,34 +544,65 @@ class SettingsRandomizer:
             0.2, 0.5, 1, 10 * 1024 * 1024 * 1024
         ),
         "local_filesystem_read_method": lambda: random.choice(
+            # Allow to use uring only when running on Linux
             ["read", "pread", "mmap", "pread_threadpool", "io_uring"]
+            if platform.system().lower() == "linux"
+            else ["read", "pread", "mmap", "pread_threadpool"]
         ),
         "remote_filesystem_read_method": lambda: random.choice(["read", "threadpool"]),
         "local_filesystem_read_prefetch": lambda: random.randint(0, 1),
         "remote_filesystem_read_prefetch": lambda: random.randint(0, 1),
+        "allow_prefetched_read_pool_for_remote_filesystem": lambda: random.randint(
+            0, 1
+        ),
+        "filesystem_prefetch_max_memory_usage": lambda: random.choice(
+            ["32Mi", "64Mi", "128Mi"]
+        ),
+        "filesystem_prefetches_limit": lambda: random.choice(
+            [0, 10]
+        ),  # 0 means unlimited (but anyway limited by prefetch_max_memory_usage)
+        "filesystem_prefetch_min_bytes_for_single_read_task": lambda: random.choice(
+            ["1Mi", "8Mi", "16Mi"]
+        ),
+        "filesystem_prefetch_step_marks": lambda: random.choice(
+            [0, 50]
+        ),  # 0 means 'auto'
+        "filesystem_prefetch_step_bytes": lambda: random.choice(
+            [0, "100Mi"]
+        ),  # 0 means 'auto'
         "compile_expressions": lambda: random.randint(0, 1),
         "compile_aggregate_expressions": lambda: random.randint(0, 1),
         "compile_sort_description": lambda: random.randint(0, 1),
         "merge_tree_coarse_index_granularity": lambda: random.randint(2, 32),
         "optimize_distinct_in_order": lambda: random.randint(0, 1),
         "optimize_sorting_by_input_stream_properties": lambda: random.randint(0, 1),
-        "enable_memory_bound_merging_of_aggregation_results": lambda: random.randint(0, 1),
+        "http_response_buffer_size": lambda: random.randint(0, 10 * 1048576),
+        "http_wait_end_of_query": lambda: random.random() > 0.5,
+        "enable_memory_bound_merging_of_aggregation_results": lambda: random.randint(
+            0, 1
+        ),
     }
 
     @staticmethod
-    def get_random_settings():
+    def get_random_settings(args):
         random_settings = []
+        is_debug = BuildFlags.DEBUG in args.build_flags
         for setting, generator in SettingsRandomizer.settings.items():
-            random_settings.append(f"{setting}={generator()}")
+            if (
+                is_debug
+                and setting == "allow_prefetched_read_pool_for_remote_filesystem"
+            ):
+                random_settings.append(f"{setting}=0")
+            else:
+                random_settings.append(f"{setting}={generator()}")
         return random_settings
 
 
 class MergeTreeSettingsRandomizer:
     settings = {
-        # Temporary disable due to large number of failures. TODO: fix.
-        # "ratio_of_defaults_for_sparse_serialization": threshold_generator(
-        #     0.1, 0.6, 0.0, 1.0
-        # ),
+        "ratio_of_defaults_for_sparse_serialization": threshold_generator(
+            0.3, 0.5, 0.0, 1.0
+        ),
         "prefer_fetch_merged_part_size_threshold": threshold_generator(
             0.2, 0.5, 1, 10 * 1024 * 1024 * 1024
         ),
@@ -546,6 +612,9 @@ class MergeTreeSettingsRandomizer:
         "vertical_merge_algorithm_min_columns_to_activate": threshold_generator(
             0.4, 0.4, 1, 100
         ),
+        "allow_vertical_merges_from_compact_to_wide_parts": lambda: random.randint(
+            0, 1
+        ),
         "min_merge_bytes_to_use_direct_io": threshold_generator(
             0.25, 0.25, 1, 10 * 1024 * 1024 * 1024
         ),
@@ -553,6 +622,10 @@ class MergeTreeSettingsRandomizer:
         "merge_max_block_size": lambda: random.randint(1, 8192 * 3),
         "index_granularity": lambda: random.randint(1, 65536),
         "min_bytes_for_wide_part": threshold_generator(0.3, 0.3, 0, 1024 * 1024 * 1024),
+        "compress_marks": lambda: random.randint(0, 1),
+        "compress_primary_key": lambda: random.randint(0, 1),
+        "marks_compress_block_size": lambda: random.randint(8000, 100000),
+        "primary_key_compress_block_size": lambda: random.randint(8000, 100000),
     }
 
     @staticmethod
@@ -642,7 +715,9 @@ class TestCase:
 
             clickhouse_execute(
                 args,
-                "CREATE DATABASE IF NOT EXISTS " + database + get_db_engine(testcase_args, database),
+                "CREATE DATABASE IF NOT EXISTS "
+                + database
+                + get_db_engine(testcase_args, database),
                 settings=get_create_database_settings(args, testcase_args),
             )
 
@@ -754,7 +829,7 @@ class TestCase:
         )
 
         if self.randomize_settings:
-            self.random_settings = SettingsRandomizer.get_random_settings()
+            self.random_settings = SettingsRandomizer.get_random_settings(args)
 
         if self.randomize_merge_tree_settings:
             self.merge_tree_random_settings = (
@@ -825,7 +900,8 @@ class TestCase:
 
         # TODO: remove checking "no-upgrade-check" after 23.1
         elif args.upgrade_check and (
-                "no-upgrade-check" in tags or "no-upgrade-check" in tags):
+            "no-upgrade-check" in tags or "no-upgrade-check" in tags
+        ):
             return FailureReason.NO_UPGRADE_CHECK
 
         elif tags and ("no-s3-storage" in tags) and args.s3_storage:
@@ -972,12 +1048,13 @@ class TestCase:
                     self.reference_file,
                     self.stdout_file,
                 ],
+                encoding="latin-1",
                 stdout=PIPE,
                 universal_newlines=True,
             ).communicate()[0]
             if diff.startswith("Binary files "):
                 diff += "Content of stdout:\n===================\n"
-                file = open(self.stdout_file, "r")
+                file = open(self.stdout_file, "rb")
                 diff += str(file.read())
                 file.close()
                 diff += "==================="
@@ -1045,7 +1122,11 @@ class TestCase:
     @staticmethod
     def send_test_name_failed(suite: str, case: str):
         pid = os.getpid()
-        clickhouse_execute(args, f"SELECT 'Running test {suite}/{case} from pid={pid}'")
+        clickhouse_execute(
+            args,
+            f"SELECT 'Running test {suite}/{case} from pid={pid}'",
+            retry_error_codes=True,
+        )
 
     def run_single_test(
         self, server_logs_level, client_options
@@ -1070,10 +1151,7 @@ class TestCase:
 
         # >> append to stderr (but not stdout since it is not used there),
         # because there are also output of per test database creation
-        if not args.database:
-            pattern = "{test} > {stdout} 2> {stderr}"
-        else:
-            pattern = "{test} > {stdout} 2> {stderr}"
+        pattern = "{test} > {stdout} 2> {stderr}"
 
         if self.ext == ".sql":
             pattern = (
@@ -1202,7 +1280,7 @@ class TestCase:
             )
             result.check_if_need_retry(args, stdout, stderr, self.runs_count)
             # to avoid breaking CSV parser
-            result.description = result.description.replace('\0', '')
+            result.description = result.description.replace("\0", "")
 
             if result.status == TestStatus.FAIL:
                 result.description = self.add_info_about_settings(result.description)
@@ -1658,7 +1736,12 @@ def check_server_started(args):
             print("\nConnection timeout, will not retry")
             break
         except Exception as e:
-            print("\nUexpected exception, will not retry: ", type(e).__name__, ": ", str(e))
+            print(
+                "\nUexpected exception, will not retry: ",
+                type(e).__name__,
+                ": ",
+                str(e),
+            )
             break
 
     print("\nAll connection tries failed")
@@ -1935,10 +2018,13 @@ def reportCoverage(args):
         )
     )
 
+
 def reportLogStats(args):
+    clickhouse_execute(args, "SYSTEM FLUSH LOGS")
+
     query = """
         WITH
-            120 AS mins,
+            240 AS mins,
             (
                 SELECT (count(), sum(length(message)))
                 FROM system.text_log
@@ -1968,7 +2054,7 @@ def reportLogStats(args):
 
     query = """
         WITH
-            120 AS mins
+            240 AS mins
         SELECT
             count() AS count,
             substr(replaceRegexpAll(message, '[^A-Za-z]+', ''), 1, 32) AS pattern,
@@ -1989,7 +2075,7 @@ def reportLogStats(args):
     query = """
         SELECT message_format_string, count(), substr(any(message), 1, 120) AS any_message
         FROM system.text_log
-        WHERE (now() - toIntervalMinute(120)) < event_time
+        WHERE (now() - toIntervalMinute(240)) < event_time
         AND (message NOT LIKE (replaceRegexpAll(message_format_string, '{[:.0-9dfx]*}', '%') AS s))
         AND (message NOT LIKE concat('%Exception: ', s, '%'))
         GROUP BY message_format_string ORDER BY count() DESC LIMIT 20 FORMAT TSVWithNamesAndTypes
@@ -2000,19 +2086,36 @@ def reportLogStats(args):
     print("\n")
 
     query = """
-        WITH ('', '({}) Keys: {}', '({}) {}', 'Aggregating', 'Became leader', 'Cleaning queue', 'Creating set.',
-              'Cyclic aliases', 'Detaching {}', 'Executing {}', 'Fire events: {}', 'Found part {}', 'Loaded queue',
-              'No sharding key', 'No tables', 'Query: {}', 'Removed', 'Removed part {}', 'Removing parts.',
-              'Request URI: {}', 'Sending part {}', 'Sent handshake', 'Starting {}', 'Will mimic {}', 'Writing to {}',
-              'dropIfEmpty', 'loadAll {}', '{} ({}:{})', '{} -> {}', '{} {}', '{}: {}'
+        WITH ('', '({}) Keys: {}', '({}) {}', 'Aggregating', 'Became leader', 'Cleaning queue',
+              'Creating set.', 'Cyclic aliases', 'Detaching {}', 'Executing {}', 'Fire events: {}',
+              'Found part {}', 'Loaded queue', 'No sharding key', 'No tables', 'Query: {}',
+              'Removed', 'Removed part {}', 'Removing parts.', 'Request URI: {}', 'Sending part {}',
+              'Sent handshake', 'Starting {}', 'Will mimic {}', 'Writing to {}', 'dropIfEmpty',
+              'loadAll {}', '{} ({}:{})', '{} -> {}', '{} {}', '{}: {}', '{}%', 'Read object: {}',
+              'New segment: {}', 'Convert overflow', 'Division by zero', 'Files set to {}',
+              'Bytes set to {}', 'Numeric overflow', 'Invalid mode: {}',
+              'Write file: {}', 'Unable to parse JSONPath', 'Host is empty in S3 URI.', 'Expected end of line',
+              'inflate failed: {}{}', 'Center is not valid', 'Column ''{}'' is ambiguous', 'Cannot parse object', 'Invalid date: {}',
+              'There is no cache by name: {}', 'No part {} in table', '`{}` should be a String', 'There are duplicate id {}',
+              'Invalid replica name: {}', 'Unexpected value {} in enum', 'Unknown BSON type: {}', 'Point is not valid',
+              'Invalid qualified name: {}', 'INTO OUTFILE is not allowed', 'Arguments must not be NaN', 'Cell is not valid',
+              'brotli decode error{}', 'Invalid H3 index: {}', 'Too large node state size', 'No additional keys found.',
+              'Attempt to read after EOF.', 'Replication was stopped', '{}	building file infos', 'Cannot parse uuid {}',
+              'Query was cancelled', 'Cancelled merging parts', 'Cancelled mutating parts', 'Log pulling is cancelled',
+              'Transaction was cancelled', 'Could not find table: {}', 'Table {} doesn''t exist',
+              'Database {} doesn''t exist', 'Dictionary ({}) not found', 'Unknown table function {}',
+              'Unknown format {}', 'Unknown explain kind ''{}''', 'Unknown setting {}', 'Unknown input format {}',
+              'Unknown identifier: ''{}''', 'User name is empty', 'Expected function, got: {}',
+              'Attempt to read after eof', 'String size is too big ({}), maximum: {}'
         ) AS known_short_messages
-        SELECT count() AS c, message_format_string, substr(any(message), 1, 120)
+        SELECT count() AS c, message_format_string, substr(any(message), 1, 120),
+            min(if(length(regexpExtract(message, '(.*)\\([A-Z0-9_]+\\)')) as pref > 0, pref, length(message)) - 26 AS length_without_exception_boilerplate) AS min_length_without_exception_boilerplate
         FROM system.text_log
-        WHERE (now() - toIntervalMinute(120)) < event_time
+        WHERE (now() - toIntervalMinute(240)) < event_time
             AND (length(message_format_string) < 16
-                OR (length(message_format_string) < 30 AND message ilike '%DB::Exception%'))
+                OR (message ilike '%DB::Exception%' AND length_without_exception_boilerplate < 30))
             AND message_format_string NOT IN known_short_messages
-        GROUP BY message_format_string ORDER BY c DESC LIMIT 30 FORMAT TSVWithNamesAndTypes
+        GROUP BY message_format_string ORDER BY c DESC LIMIT 50 FORMAT TSVWithNamesAndTypes
     """
     value = clickhouse_execute(args, query).decode(errors="replace")
     print("\nTop short messages:\n")
@@ -2022,7 +2125,7 @@ def reportLogStats(args):
     query = """
         SELECT max((freq, message_format_string)), level
         FROM (SELECT count() / (SELECT count() FROM system.text_log
-              WHERE (now() - toIntervalMinute(120)) < event_time) AS freq,
+              WHERE (now() - toIntervalMinute(240)) < event_time) AS freq,
               min(level) AS level, message_format_string FROM system.text_log
               WHERE (now() - toIntervalMinute(120)) < event_time
               GROUP BY message_format_string ORDER BY freq DESC)
@@ -2143,7 +2246,7 @@ def main(args):
                     "\nFound hung queries in processlist:", args, "red", attrs=["bold"]
                 )
             )
-            print(json.dumps(processlist, indent=4))
+            print(processlist.decode())
             print(get_transactions_list(args))
 
             print_stacktraces()
@@ -2200,6 +2303,7 @@ def find_binary(name):
 
     raise Exception(f"{name} was not found in PATH")
 
+
 def find_clickhouse_command(binary, command):
     symlink = binary + "-" + command
     if os.access(symlink, os.X_OK):
@@ -2208,6 +2312,7 @@ def find_clickhouse_command(binary, command):
     # To avoid requiring symlinks (in case you download binary from CI)
     return binary + " " + command
 
+
 def get_additional_client_options(args):
     if args.client_option:
         return " ".join("--" + option for option in args.client_option)
@@ -2228,7 +2333,8 @@ def parse_args():
     parser.add_argument(
         "-b",
         "--binary",
-        default=find_binary("clickhouse"),
+        default="clickhouse",
+        type=find_binary,
         help="Path to clickhouse binary or name of binary in PATH",
     )
     parser.add_argument(
@@ -2548,7 +2654,9 @@ if __name__ == "__main__":
             "WARNING: --extract_from_config option is deprecated and will be removed the the future",
             file=sys.stderr,
         )
-    args.extract_from_config = find_clickhouse_command(args.binary, "extract-from-config")
+    args.extract_from_config = find_clickhouse_command(
+        args.binary, "extract-from-config"
+    )
 
     if args.configclient:
         args.client += " --config-file=" + args.configclient
diff --git a/tests/config/config.d/backups.xml b/tests/config/config.d/backups.xml
new file mode 100644
index 00000000000..48f7a256233
--- /dev/null
+++ b/tests/config/config.d/backups.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <backups>
+        <allowed_disk>default</allowed_disk>
+        <allowed_path>/backups</allowed_path>
+    </backups>
+</clickhouse>
diff --git a/tests/config/config.d/custom_settings_prefixes.xml b/tests/config/config.d/custom_settings_prefixes.xml
index ec66c1a930e..9baaa4e09f3 100644
--- a/tests/config/config.d/custom_settings_prefixes.xml
+++ b/tests/config/config.d/custom_settings_prefixes.xml
@@ -1,4 +1,4 @@
 <clickhouse>
     <!-- Comma-separated list of prefixes for user-defined settings. -->
-    <custom_settings_prefixes>custom_</custom_settings_prefixes>
+    <custom_settings_prefixes>SQL_,custom_</custom_settings_prefixes>
 </clickhouse>
diff --git a/tests/config/config.d/database_replicated.xml b/tests/config/config.d/database_replicated.xml
index 3fea87c4fd1..9a405f85908 100644
--- a/tests/config/config.d/database_replicated.xml
+++ b/tests/config/config.d/database_replicated.xml
@@ -14,6 +14,24 @@
         </node>
     </zookeeper>
 
+    <auxiliary_zookeepers>
+        <zookeeper2>
+            <node index="1">
+                <host>localhost</host>
+                <port>9181</port>
+            </node>
+            <node index="2">
+                <host>localhost</host>
+                <port>19181</port>
+            </node>
+            <node index="3">
+                <host>localhost</host>
+                <port>29181</port>
+            </node>
+            <root>/test/chroot/auxiliary_zookeeper2</root>
+        </zookeeper2>
+    </auxiliary_zookeepers>
+
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
diff --git a/tests/config/config.d/disable_s3_env_credentials.xml b/tests/config/config.d/disable_s3_env_credentials.xml
new file mode 100644
index 00000000000..24a7e0f2f35
--- /dev/null
+++ b/tests/config/config.d/disable_s3_env_credentials.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <s3>
+        <use_environment_credentials>0</use_environment_credentials>
+    </s3>
+</clickhouse>
diff --git a/tests/config/config.d/keeper_port.xml b/tests/config/config.d/keeper_port.xml
index 2066dedfa56..cffd325e968 100644
--- a/tests/config/config.d/keeper_port.xml
+++ b/tests/config/config.d/keeper_port.xml
@@ -9,8 +9,7 @@
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>100000</session_timeout_ms>
             <min_session_timeout_ms>10000</min_session_timeout_ms>
-            <!-- FIXME enable force_sync because of suspicious rollback without it -->
-            <force_sync>true</force_sync>
+            <force_sync>false</force_sync>
             <startup_timeout>240000</startup_timeout>
             <!-- we want all logs for complex problems investigation -->
             <reserved_log_items>1000000000000000</reserved_log_items>
diff --git a/tests/config/config.d/merge_tree.xml b/tests/config/config.d/merge_tree.xml
index 43bdb6aa07b..bf2da9b09a2 100644
--- a/tests/config/config.d/merge_tree.xml
+++ b/tests/config/config.d/merge_tree.xml
@@ -1,5 +1,6 @@
 <clickhouse>
     <merge_tree>
+        <enable_the_endpoint_id_with_zookeeper_name_prefix>1</enable_the_endpoint_id_with_zookeeper_name_prefix>
         <number_of_free_entries_in_pool_to_execute_mutation>8</number_of_free_entries_in_pool_to_execute_mutation>
     </merge_tree>
 </clickhouse>
diff --git a/tests/config/config.d/merge_tree_old_dirs_cleanup.xml b/tests/config/config.d/merge_tree_old_dirs_cleanup.xml
index 41932cb6d61..2b8ea63b63d 100644
--- a/tests/config/config.d/merge_tree_old_dirs_cleanup.xml
+++ b/tests/config/config.d/merge_tree_old_dirs_cleanup.xml
@@ -3,6 +3,6 @@
         <!-- Default is 86400 (1 day), but we have protection from removal of tmp dirs that are currently in use -->
         <temporary_directories_lifetime>1</temporary_directories_lifetime>
         <!-- Default is 60 seconds, but let's make tests more aggressive -->
-        <merge_tree_clear_old_temporary_directories_interval_seconds>10</merge_tree_clear_old_temporary_directories_interval_seconds>
+        <merge_tree_clear_old_temporary_directories_interval_seconds>5</merge_tree_clear_old_temporary_directories_interval_seconds>
     </merge_tree>
 </clickhouse>
diff --git a/tests/config/config.d/storage_conf.xml b/tests/config/config.d/storage_conf.xml
index bc9269e6ec1..dee03307177 100644
--- a/tests/config/config.d/storage_conf.xml
+++ b/tests/config/config.d/storage_conf.xml
@@ -55,52 +55,58 @@
                 <type>cache</type>
                 <disk>s3_disk</disk>
                 <path>s3_cache/</path>
-                <max_size>2147483648</max_size>
+                <max_size>128Mi</max_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </s3_cache>
             <s3_cache_2>
                 <type>cache</type>
                 <disk>s3_disk_2</disk>
                 <path>s3_cache_2/</path>
-                <max_size>2Gi</max_size>
+                <max_size>128Mi</max_size>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
                 <max_file_segment_size>100Mi</max_file_segment_size>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </s3_cache_2>
             <s3_cache_3>
                 <type>cache</type>
                 <disk>s3_disk_3</disk>
                 <path>s3_disk_3_cache/</path>
-                <max_size>22548578304</max_size>
+                <max_size>128Mi</max_size>
                 <data_cache_max_size>22548578304</data_cache_max_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
                 <enable_cache_hits_threshold>1</enable_cache_hits_threshold>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </s3_cache_3>
             <s3_cache_4>
                 <type>cache</type>
                 <disk>s3_disk_4</disk>
                 <path>s3_cache_4/</path>
-                <max_size>22548578304</max_size>
+                <max_size>128Mi</max_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
                 <enable_filesystem_query_cache_limit>1</enable_filesystem_query_cache_limit>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </s3_cache_4>
             <s3_cache_5>
                 <type>cache</type>
                 <disk>s3_disk_5</disk>
                 <path>s3_cache_5/</path>
-                <max_size>22548578304</max_size>
+                <max_size>128Mi</max_size>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </s3_cache_5>
             <s3_cache_6>
                 <type>cache</type>
                 <disk>s3_disk_6</disk>
                 <path>s3_cache_6/</path>
-                <max_size>22548578304</max_size>
+                <max_size>128Mi</max_size>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
                 <enable_bypass_cache_with_threashold>1</enable_bypass_cache_with_threashold>
                 <bypass_cache_threashold>100</bypass_cache_threashold>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </s3_cache_6>
             <s3_cache_small>
                 <type>cache</type>
@@ -108,27 +114,29 @@
                 <path>s3_cache_small/</path>
                 <max_size>1000</max_size>
                 <do_not_evict_index_and_mark_files>1</do_not_evict_index_and_mark_files>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </s3_cache_small>
             <s3_cache_small_segment_size>
                 <type>cache</type>
                 <disk>s3_disk_6</disk>
                 <path>s3_cache_small_segment_size/</path>
-                <max_size>22548578304</max_size>
+                <max_size>128Mi</max_size>
                 <max_file_segment_size>10Ki</max_file_segment_size>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
                 <cache_on_write_operations>1</cache_on_write_operations>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </s3_cache_small_segment_size>
             <!-- local disks -->
             <local_disk>
-                <type>local</type>
+                <type>local_blob_storage</type>
                 <path>local_disk/</path>
             </local_disk>
             <local_disk_2>
-                <type>local</type>
+                <type>local_blob_storage</type>
                 <path>local_disk_2/</path>
             </local_disk_2>
             <local_disk_3>
-                <type>local</type>
+                <type>local_blob_storage</type>
                 <path>local_disk_3/</path>
             </local_disk_3>
             <!-- cache for local disks -->
@@ -139,6 +147,7 @@
                 <max_size>22548578304</max_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </local_cache>
             <local_cache_2>
                 <type>cache</type>
@@ -146,6 +155,7 @@
                 <path>local_cache_2/</path>
                 <max_size>22548578304</max_size>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </local_cache_2>
             <local_cache_3>
                 <type>cache</type>
@@ -155,6 +165,7 @@
                 <cache_on_write_operations>1</cache_on_write_operations>
                 <enable_cache_hits_threshold>1</enable_cache_hits_threshold>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </local_cache_3>
             <!-- multi layer cache -->
             <s3_cache_multi>
@@ -163,6 +174,7 @@
                 <path>s3_cache_multi/</path>
                 <max_size>22548578304</max_size>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </s3_cache_multi>
             <s3_cache_multi_2>
                 <type>cache</type>
@@ -170,6 +182,7 @@
                 <path>s3_cache_multi_2/</path>
                 <max_size>22548578304</max_size>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+                <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
             </s3_cache_multi_2>
         </disks>
         <policies>
diff --git a/tests/config/config.d/zookeeper.xml b/tests/config/config.d/zookeeper.xml
index 63057224ef9..75b4a00fe67 100644
--- a/tests/config/config.d/zookeeper.xml
+++ b/tests/config/config.d/zookeeper.xml
@@ -7,4 +7,13 @@
             <port>9181</port>
         </node>
     </zookeeper>
+    <auxiliary_zookeepers>
+        <zookeeper2>
+            <node index="1">
+                <host>localhost</host>
+                <port>9181</port>
+            </node>
+            <root>/test/chroot/auxiliary_zookeeper2</root>
+        </zookeeper2>
+    </auxiliary_zookeepers>
 </clickhouse>
diff --git a/tests/config/config.d/zookeeper_fault_injection.xml b/tests/config/config.d/zookeeper_fault_injection.xml
index 1f13155a130..a339e1f0fba 100644
--- a/tests/config/config.d/zookeeper_fault_injection.xml
+++ b/tests/config/config.d/zookeeper_fault_injection.xml
@@ -12,7 +12,11 @@
           In other words, session will expire 4 times per 99996 successful requests
           or approximately each 25000 requests (on average).
         -->
+        <enable_fault_injections_during_startup>0</enable_fault_injections_during_startup>
         <send_fault_probability>0.00002</send_fault_probability>
         <recv_fault_probability>0.00002</recv_fault_probability>
+
+        <send_sleep_probability>0.00001</send_sleep_probability>
+        <send_sleep_ms>10000</send_sleep_ms>
     </zookeeper>
 </clickhouse>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index a6391f6f43f..efa5a9c086e 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -55,6 +55,8 @@ ln -sf $SRC_PATH/config.d/custom_disks_base_path.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/display_name.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/reverse_dns_query_function.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/compressed_marks_and_index.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/disable_s3_env_credentials.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/backups.xml $DEST_SERVER_PATH/config.d/
 
 # Not supported with fasttest.
 if [ "${DEST_SERVER_PATH}" = "/etc/clickhouse-server" ]
@@ -77,6 +79,10 @@ ln -sf $SRC_PATH/users.d/marks.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/insert_keeper_retries.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/prefetch_settings.xml $DEST_SERVER_PATH/users.d/
 
+if [[ -n "$USE_NEW_ANALYZER" ]] && [[ "$USE_NEW_ANALYZER" -eq 1 ]]; then
+    ln -sf $SRC_PATH/users.d/analyzer.xml $DEST_SERVER_PATH/users.d/
+fi
+
 # FIXME DataPartsExchange may hang for http_send_timeout seconds
 # when nobody is going to read from the other side of socket (due to "Fetching of part was cancelled"),
 # but socket is owned by HTTPSessionPool, so it's not closed.
diff --git a/tests/config/users.d/access_management.xml b/tests/config/users.d/access_management.xml
index f7963cdb7f2..45e7c23227e 100644
--- a/tests/config/users.d/access_management.xml
+++ b/tests/config/users.d/access_management.xml
@@ -2,7 +2,7 @@
     <users>
         <default>
             <access_management>1</access_management>
-            <show_named_collections>1</show_named_collections>
+            <named_collection_control>1</named_collection_control>
             <show_named_collections_secrets>1</show_named_collections_secrets>
         </default>
     </users>
diff --git a/tests/config/users.d/analyzer.xml b/tests/config/users.d/analyzer.xml
new file mode 100644
index 00000000000..aa374364ef0
--- /dev/null
+++ b/tests/config/users.d/analyzer.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <allow_experimental_analyzer>1</allow_experimental_analyzer>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/helpers/0_common_instance_config.xml b/tests/integration/helpers/0_common_instance_config.xml
index 27563e47c35..535cf252274 100644
--- a/tests/integration/helpers/0_common_instance_config.xml
+++ b/tests/integration/helpers/0_common_instance_config.xml
@@ -25,5 +25,6 @@
         <select_from_system_db_requires_grant>true</select_from_system_db_requires_grant>
         <select_from_information_schema_requires_grant>true</select_from_information_schema_requires_grant>
         <settings_constraints_replace_previous>true</settings_constraints_replace_previous>
+        <role_cache_expiration_time_seconds>2</role_cache_expiration_time_seconds>
     </access_control_improvements>
 </clickhouse>
diff --git a/tests/integration/helpers/client.py b/tests/integration/helpers/client.py
index ab1cc65e9a9..c2676ac08a6 100644
--- a/tests/integration/helpers/client.py
+++ b/tests/integration/helpers/client.py
@@ -202,6 +202,16 @@ class CommandRequest:
             self.timer = Timer(timeout, kill_process)
             self.timer.start()
 
+    def remove_trash_from_stderr(self, stderr):
+        # FIXME https://github.com/ClickHouse/ClickHouse/issues/48181
+        if not stderr:
+            return stderr
+        lines = stderr.split("\n")
+        lines = [
+            x for x in lines if ("completion_queue" not in x and "Kick failed" not in x)
+        ]
+        return "\n".join(lines)
+
     def get_answer(self):
         self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
         self.stdout_file.seek(0)
@@ -218,7 +228,9 @@ class CommandRequest:
             logging.debug(f"Timed out. Last stdout:{stdout}, stderr:{stderr}")
             raise QueryTimeoutExceedException("Client timed out!")
 
-        if (self.process.returncode != 0 or stderr) and not self.ignore_error:
+        if (
+            self.process.returncode != 0 or self.remove_trash_from_stderr(stderr)
+        ) and not self.ignore_error:
             raise QueryRuntimeException(
                 "Client failed! Return code: {}, stderr: {}".format(
                     self.process.returncode, stderr
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index dc5ada81995..950663cb429 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -32,6 +32,7 @@ try:
     import nats
     import ssl
     import meilisearch
+    import pyspark
     from confluent_kafka.avro.cached_schema_registry_client import (
         CachedSchemaRegistryClient,
     )
@@ -63,6 +64,7 @@ DEFAULT_ENV_NAME = ".env"
 
 SANITIZER_SIGN = "=================="
 
+
 # to create docker-compose env file
 def _create_env_file(path, variables):
     logging.debug(f"Env {variables} stored in {path}")
@@ -114,14 +116,11 @@ def run_and_check(
     return out
 
 
-# Based on https://stackoverflow.com/questions/2838244/get-open-tcp-port-in-python/2838309#2838309
+# Based on https://stackoverflow.com/a/1365284/3706827
 def get_free_port():
-    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    s.bind(("", 0))
-    s.listen(1)
-    port = s.getsockname()[1]
-    s.close()
-    return port
+    with socket.socket() as s:
+        s.bind(("", 0))
+        return s.getsockname()[1]
 
 
 def retry_exception(num, delay, func, exception=Exception, *args, **kwargs):
@@ -330,6 +329,7 @@ class ClickHouseCluster:
         custom_dockerd_host=None,
         zookeeper_keyfile=None,
         zookeeper_certfile=None,
+        with_spark=False,
     ):
         for param in list(os.environ.keys()):
             logging.debug("ENV %40s %s" % (param, os.environ[param]))
@@ -372,8 +372,11 @@ class ClickHouseCluster:
         self.docker_logs_path = p.join(self.instances_dir, "docker.log")
         self.env_file = p.join(self.instances_dir, DEFAULT_ENV_NAME)
         self.env_variables = {}
-        self.env_variables["TSAN_OPTIONS"] = "second_deadlock_stack=1"
+        # Problems with glibc 2.36+ [1]
+        #
+        #    [1]: https://github.com/ClickHouse/ClickHouse/issues/43426#issuecomment-1368512678
         self.env_variables["ASAN_OPTIONS"] = "use_sigaltstack=0"
+        self.env_variables["TSAN_OPTIONS"] = "use_sigaltstack=0"
         self.env_variables["CLICKHOUSE_WATCHDOG_ENABLE"] = "0"
         self.env_variables["CLICKHOUSE_NATS_TLS_SECURE"] = "0"
         self.up_called = False
@@ -445,6 +448,8 @@ class ClickHouseCluster:
         self.minio_redirect_ip = None
         self.minio_redirect_port = 8080
 
+        self.spark_session = None
+
         self.with_azurite = False
 
         # available when with_hdfs == True
@@ -469,10 +474,10 @@ class ClickHouseCluster:
         # available when with_kafka == True
         self.kafka_host = "kafka1"
         self.kafka_dir = os.path.join(self.instances_dir, "kafka")
-        self.kafka_port = get_free_port()
+        self._kafka_port = 0
         self.kafka_docker_id = None
         self.schema_registry_host = "schema-registry"
-        self.schema_registry_port = get_free_port()
+        self._schema_registry_port = 0
         self.kafka_docker_id = self.get_instance_docker_id(self.kafka_host)
 
         self.coredns_host = "coredns"
@@ -480,7 +485,7 @@ class ClickHouseCluster:
         # available when with_kerberozed_kafka == True
         # reuses kafka_dir
         self.kerberized_kafka_host = "kerberized_kafka1"
-        self.kerberized_kafka_port = get_free_port()
+        self._kerberized_kafka_port = 0
         self.kerberized_kafka_docker_id = self.get_instance_docker_id(
             self.kerberized_kafka_host
         )
@@ -491,15 +496,15 @@ class ClickHouseCluster:
 
         # available when with_mongo == True
         self.mongo_host = "mongo1"
-        self.mongo_port = get_free_port()
+        self._mongo_port = 0
         self.mongo_no_cred_host = "mongo2"
-        self.mongo_no_cred_port = get_free_port()
+        self._mongo_no_cred_port = 0
 
         # available when with_meili == True
         self.meili_host = "meili1"
-        self.meili_port = get_free_port()
+        self._meili_port = 0
         self.meili_secure_host = "meili_secure"
-        self.meili_secure_port = get_free_port()
+        self._meili_secure_port = 0
 
         # available when with_cassandra == True
         self.cassandra_host = "cassandra1"
@@ -529,7 +534,7 @@ class ClickHouseCluster:
 
         # available when with_redis == True
         self.redis_host = "redis1"
-        self.redis_port = get_free_port()
+        self._redis_port = 0
 
         # available when with_postgres == True
         self.postgres_host = "postgres1"
@@ -615,6 +620,75 @@ class ClickHouseCluster:
             shutil.rmtree(self.instances_dir, ignore_errors=True)
             logging.debug(f"Removed :{self.instances_dir}")
 
+        if with_spark:
+            # if you change packages, don't forget to update them in docker/test/integration/runner/dockerd-entrypoint.sh
+            (
+                pyspark.sql.SparkSession.builder.appName("spark_test")
+                .config(
+                    "spark.jars.packages",
+                    "org.apache.hudi:hudi-spark3.3-bundle_2.12:0.13.0,io.delta:delta-core_2.12:2.2.0,org.apache.iceberg:iceberg-spark-runtime-3.3_2.12:1.1.0",
+                )
+                .master("local")
+                .getOrCreate()
+                .stop()
+            )
+
+    @property
+    def kafka_port(self):
+        if self._kafka_port:
+            return self._kafka_port
+        self._kafka_port = get_free_port()
+        return self._kafka_port
+
+    @property
+    def schema_registry_port(self):
+        if self._schema_registry_port:
+            return self._schema_registry_port
+        self._schema_registry_port = get_free_port()
+        return self._schema_registry_port
+
+    @property
+    def kerberized_kafka_port(self):
+        if self._kerberized_kafka_port:
+            return self._kerberized_kafka_port
+        self._kerberized_kafka_port = get_free_port()
+        return self._kerberized_kafka_port
+
+    @property
+    def mongo_port(self):
+        if self._mongo_port:
+            return self._mongo_port
+        self._mongo_port = get_free_port()
+        return self._mongo_port
+
+    @property
+    def mongo_no_cred_port(self):
+        if self._mongo_no_cred_port:
+            return self._mongo_no_cred_port
+        self._mongo_no_cred_port = get_free_port()
+        return self._mongo_no_cred_port
+
+    @property
+    def meili_port(self):
+        if self._meili_port:
+            return self._meili_port
+        self._meili_port = get_free_port()
+        return self._meili_port
+
+    @property
+    def meili_secure_port(self):
+        if self._meili_secure_port:
+            return self._meili_secure_port
+        self._meili_secure_port = get_free_port()
+        return self._meili_secure_port
+
+    @property
+    def redis_port(self):
+        if self._redis_port:
+            return self._redis_port
+        self._redis_port = get_free_port()
+        return self._redis_port
+
     def print_all_docker_pieces(self):
         res_networks = subprocess.check_output(
             f"docker network ls --filter name='{self.project_name}*'",
@@ -1454,7 +1528,6 @@ class ClickHouseCluster:
         config_root_name="clickhouse",
         extra_configs=[],
     ) -> "ClickHouseInstance":
-
         """Add an instance to the cluster.
 
         name - the name of the instance directory and the value of the 'instance' macro in ClickHouse.
@@ -3089,7 +3162,6 @@ class ClickHouseInstance:
         config_root_name="clickhouse",
         extra_configs=[],
     ):
-
         self.name = name
         self.base_cmd = cluster.base_cmd
         self.docker_id = cluster.get_instance_docker_id(self.name)
@@ -4109,9 +4181,10 @@ class ClickHouseInstance:
         logging.debug("Copy common configuration from helpers")
         # The file is named with 0_ prefix to be processed before other configuration overloads.
         if self.copy_common_configs:
-            need_fix_log_level = self.tag != "latest"
             write_embedded_config(
-                "0_common_instance_config.xml", self.config_d_dir, need_fix_log_level
+                "0_common_instance_config.xml",
+                self.config_d_dir,
+                self.with_installed_binary,
             )
 
         write_embedded_config("0_common_instance_users.xml", users_d_dir)
diff --git a/tests/integration/helpers/external_sources.py b/tests/integration/helpers/external_sources.py
index fd086fc4526..afb91083d57 100644
--- a/tests/integration/helpers/external_sources.py
+++ b/tests/integration/helpers/external_sources.py
@@ -161,6 +161,29 @@ class SourceMySQL(ExternalSource):
 
 
 class SourceMongo(ExternalSource):
+    def __init__(
+        self,
+        name,
+        internal_hostname,
+        internal_port,
+        docker_hostname,
+        docker_port,
+        user,
+        password,
+        secure=False,
+    ):
+        ExternalSource.__init__(
+            self,
+            name,
+            internal_hostname,
+            internal_port,
+            docker_hostname,
+            docker_port,
+            user,
+            password,
+        )
+        self.secure = secure
+
     def get_source_str(self, table_name):
         return """
             <mongodb>
@@ -170,6 +193,7 @@ class SourceMongo(ExternalSource):
                 <password>{password}</password>
                 <db>test</db>
                 <collection>{tbl}</collection>
+                {options}
             </mongodb>
         """.format(
             host=self.docker_hostname,
@@ -177,6 +201,7 @@ class SourceMongo(ExternalSource):
             user=self.user,
             password=self.password,
             tbl=table_name,
+            options="<options>ssl=true</options>" if self.secure else "",
         )
 
     def prepare(self, structure, table_name, cluster):
@@ -186,6 +211,8 @@ class SourceMongo(ExternalSource):
             user=self.user,
             password=self.password,
         )
+        if self.secure:
+            connection_str += "/?tls=true&tlsAllowInvalidCertificates=true"
         self.connection = pymongo.MongoClient(connection_str)
         self.converters = {}
         for field in structure.get_all_fields():
@@ -228,7 +255,7 @@ class SourceMongoURI(SourceMongo):
     def get_source_str(self, table_name):
         return """
             <mongodb>
-                <uri>mongodb://{user}:{password}@{host}:{port}/test</uri>
+                <uri>mongodb://{user}:{password}@{host}:{port}/test{options}</uri>
                 <collection>{tbl}</collection>
             </mongodb>
         """.format(
@@ -237,6 +264,7 @@ class SourceMongoURI(SourceMongo):
             user=self.user,
             password=self.password,
             tbl=table_name,
+            options="?ssl=true" if self.secure else "",
         )
 
 
diff --git a/tests/integration/helpers/network.py b/tests/integration/helpers/network.py
index e408c9beec1..471aa2bdc2e 100644
--- a/tests/integration/helpers/network.py
+++ b/tests/integration/helpers/network.py
@@ -216,7 +216,6 @@ class _NetworkManager:
         container_exit_timeout=60,
         docker_api_version=os.environ.get("DOCKER_API_VERSION"),
     ):
-
         self.container_expire_timeout = container_expire_timeout
         self.container_exit_timeout = container_exit_timeout
 
@@ -232,7 +231,6 @@ class _NetworkManager:
 
     def _ensure_container(self):
         if self._container is None or self._container_expire_time <= time.time():
-
             for i in range(5):
                 if self._container is not None:
                     try:
diff --git a/tests/integration/helpers/postgres_utility.py b/tests/integration/helpers/postgres_utility.py
index 838c22c8a7c..dfae37af434 100644
--- a/tests/integration/helpers/postgres_utility.py
+++ b/tests/integration/helpers/postgres_utility.py
@@ -204,7 +204,7 @@ class PostgresManager:
         assert materialized_database in self.instance.query("SHOW DATABASES")
 
     def drop_materialized_db(self, materialized_database="test_database"):
-        self.instance.query(f"DROP DATABASE IF EXISTS {materialized_database} NO DELAY")
+        self.instance.query(f"DROP DATABASE IF EXISTS {materialized_database} SYNC")
         if materialized_database in self.created_materialized_postgres_db_list:
             self.created_materialized_postgres_db_list.remove(materialized_database)
         assert materialized_database not in self.instance.query("SHOW DATABASES")
diff --git a/tests/integration/helpers/pytest_xdist_logging_to_separate_files.py b/tests/integration/helpers/pytest_xdist_logging_to_separate_files.py
index d424ad58fa4..370aa23a014 100644
--- a/tests/integration/helpers/pytest_xdist_logging_to_separate_files.py
+++ b/tests/integration/helpers/pytest_xdist_logging_to_separate_files.py
@@ -1,6 +1,7 @@
 import logging
 import os.path
 
+
 # Makes the parallel workers of pytest-xdist to log to separate files.
 # Without this function all workers will log to the same log file
 # and mix everything together making it much more difficult for troubleshooting.
diff --git a/tests/integration/helpers/s3_tools.py b/tests/integration/helpers/s3_tools.py
new file mode 100644
index 00000000000..777b3394dc1
--- /dev/null
+++ b/tests/integration/helpers/s3_tools.py
@@ -0,0 +1,87 @@
+from minio import Minio
+import glob
+import os
+import json
+
+
+def upload_directory(minio_client, bucket_name, local_path, s3_path):
+    result_files = []
+    for local_file in glob.glob(local_path + "/**"):
+        if os.path.isfile(local_file):
+            result_local_path = os.path.join(local_path, local_file)
+            result_s3_path = os.path.join(s3_path, local_file)
+            print(f"Putting file {result_local_path} to {result_s3_path}")
+            minio_client.fput_object(
+                bucket_name=bucket_name,
+                object_name=result_s3_path,
+                file_path=result_local_path,
+            )
+            result_files.append(result_s3_path)
+        else:
+            files = upload_directory(
+                minio_client,
+                bucket_name,
+                os.path.join(local_path, local_file),
+                os.path.join(s3_path, local_file),
+            )
+            result_files.extend(files)
+    return result_files
+
+
+def get_file_contents(minio_client, bucket, s3_path):
+    data = minio_client.get_object(bucket, s3_path)
+    data_str = b""
+    for chunk in data.stream():
+        data_str += chunk
+    return data_str.decode()
+
+
+# Creates S3 bucket for tests and allows anonymous read-write access to it.
+def prepare_s3_bucket(started_cluster):
+    # Allows read-write access for bucket without authorization.
+    bucket_read_write_policy = {
+        "Version": "2012-10-17",
+        "Statement": [
+            {
+                "Sid": "",
+                "Effect": "Allow",
+                "Principal": {"AWS": "*"},
+                "Action": "s3:GetBucketLocation",
+                "Resource": "arn:aws:s3:::root",
+            },
+            {
+                "Sid": "",
+                "Effect": "Allow",
+                "Principal": {"AWS": "*"},
+                "Action": "s3:ListBucket",
+                "Resource": "arn:aws:s3:::root",
+            },
+            {
+                "Sid": "",
+                "Effect": "Allow",
+                "Principal": {"AWS": "*"},
+                "Action": "s3:GetObject",
+                "Resource": "arn:aws:s3:::root/*",
+            },
+            {
+                "Sid": "",
+                "Effect": "Allow",
+                "Principal": {"AWS": "*"},
+                "Action": "s3:PutObject",
+                "Resource": "arn:aws:s3:::root/*",
+            },
+        ],
+    }
+
+    minio_client = started_cluster.minio_client
+    minio_client.set_bucket_policy(
+        started_cluster.minio_bucket, json.dumps(bucket_read_write_policy)
+    )
+
+    started_cluster.minio_restricted_bucket = "{}-with-auth".format(
+        started_cluster.minio_bucket
+    )
+    if minio_client.bucket_exists(started_cluster.minio_restricted_bucket):
+        minio_client.remove_bucket(started_cluster.minio_restricted_bucket)
+
+    minio_client.make_bucket(started_cluster.minio_restricted_bucket)
diff --git a/tests/integration/helpers/wait_for_helpers.py b/tests/integration/helpers/wait_for_helpers.py
index b041de99282..d240c71bc86 100644
--- a/tests/integration/helpers/wait_for_helpers.py
+++ b/tests/integration/helpers/wait_for_helpers.py
@@ -28,3 +28,12 @@ def wait_for_delete_empty_parts(node, table, database=None, **kwargs):
         f"WHERE active AND rows = 0 AND table = '{table}' AND database = '{database}'"
     )
     assert_eq_with_retry(node, empty_parts_query, "0\n", **kwargs)
+
+
+def wait_for_merges(node, table, database=None, **kwargs):
+    table, database = _parse_table_database(table, database)
+    merges_count_query = (
+        f"SELECT count() > 0 FROM system.merges "
+        f"WHERE table = '{table}' AND database = '{database}'"
+    )
+    assert_eq_with_retry(node, merges_count_query, "1\n", **kwargs)
diff --git a/tests/integration/parallel.json b/tests/integration/parallel.json
deleted file mode 100644
index 6a630bf251f..00000000000
--- a/tests/integration/parallel.json
+++ /dev/null
@@ -1,264 +0,0 @@
-[
-  "test_atomic_drop_table/test.py::test_atomic_delete_with_stopped_zookeeper",
-  "test_attach_without_fetching/test.py::test_attach_without_fetching",
-  "test_broken_part_during_merge/test.py::test_merge_and_part_corruption",
-  "test_cleanup_dir_after_bad_zk_conn/test.py::test_attach_without_zk",
-  "test_cleanup_dir_after_bad_zk_conn/test.py::test_cleanup_dir_after_bad_zk_conn",
-  "test_cleanup_dir_after_bad_zk_conn/test.py::test_cleanup_dir_after_wrong_replica_name",
-  "test_cleanup_dir_after_bad_zk_conn/test.py::test_cleanup_dir_after_wrong_zk_path",
-  "test_consistent_parts_after_clone_replica/test.py::test_inconsistent_parts_if_drop_while_replica_not_active",
-  "test_cross_replication/test.py::test",
-  "test_ddl_worker_non_leader/test.py::test_non_leader_replica",
-  "test_delayed_replica_failover/test.py::test",
-  "test_dictionaries_update_field/test.py::test_update_field[complex_key_hashed_update_field_dictionary-HASHED]",
-  "test_dictionaries_update_field/test.py::test_update_field[flat_update_field_dictionary-FLAT]",
-  "test_dictionaries_update_field/test.py::test_update_field[simple_key_hashed_update_field_dictionary-HASHED]",
-  "test_dictionary_allow_read_expired_keys/test_default_reading.py::test_default_reading",
-  "test_dictionary_allow_read_expired_keys/test_default_string.py::test_return_real_values",
-  "test_dictionary_allow_read_expired_keys/test_dict_get_or_default.py::test_simple_dict_get_or_default",
-  "test_dictionary_allow_read_expired_keys/test_dict_get.py::test_simple_dict_get",
-  "test_disabled_mysql_server/test.py::test_disabled_mysql_server",
-  "test_distributed_ddl_on_cross_replication/test.py::test_alter_ddl",
-  "test_distributed_ddl_on_cross_replication/test.py::test_atomic_database",
-  "test_distributed_ddl_parallel/test.py::test_all_in_parallel",
-  "test_distributed_ddl_parallel/test.py::test_slow_dict_load_7",
-  "test_distributed_ddl_parallel/test.py::test_smoke",
-  "test_distributed_ddl_parallel/test.py::test_smoke_parallel",
-  "test_distributed_ddl_parallel/test.py::test_smoke_parallel_dict_reload",
-  "test_distributed_ddl_parallel/test.py::test_two_in_parallel_two_queued",
-  "test_distributed_ddl_password/test.py::test_alter",
-  "test_distributed_ddl_password/test.py::test_truncate",
-  "test_distributed_ddl/test.py::test_allowed_databases[configs]",
-  "test_distributed_ddl/test.py::test_allowed_databases[configs_secure]",
-  "test_distributed_ddl/test.py::test_create_as_select[configs]",
-  "test_distributed_ddl/test.py::test_create_as_select[configs_secure]",
-  "test_distributed_ddl/test.py::test_create_reserved[configs]",
-  "test_distributed_ddl/test.py::test_create_reserved[configs_secure]",
-  "test_distributed_ddl/test.py::test_create_view[configs]",
-  "test_distributed_ddl/test.py::test_create_view[configs_secure]",
-  "test_distributed_ddl/test.py::test_default_database[configs]",
-  "test_distributed_ddl/test.py::test_default_database[configs_secure]",
-  "test_distributed_ddl/test.py::test_detach_query[configs]",
-  "test_distributed_ddl/test.py::test_detach_query[configs_secure]",
-  "test_distributed_ddl/test.py::test_implicit_macros[configs]",
-  "test_distributed_ddl/test.py::test_implicit_macros[configs_secure]",
-  "test_distributed_ddl/test.py::test_kill_query[configs]",
-  "test_distributed_ddl/test.py::test_kill_query[configs_secure]",
-  "test_distributed_ddl/test.py::test_macro[configs]",
-  "test_distributed_ddl/test.py::test_macro[configs_secure]",
-  "test_distributed_ddl/test.py::test_on_connection_loss[configs]",
-  "test_distributed_ddl/test.py::test_on_connection_loss[configs_secure]",
-  "test_distributed_ddl/test.py::test_on_server_fail[configs]",
-  "test_distributed_ddl/test.py::test_on_server_fail[configs_secure]",
-  "test_distributed_ddl/test.py::test_on_session_expired[configs]",
-  "test_distributed_ddl/test.py::test_on_session_expired[configs_secure]",
-  "test_distributed_ddl/test.py::test_optimize_query[configs]",
-  "test_distributed_ddl/test.py::test_optimize_query[configs_secure]",
-  "test_distributed_ddl/test.py::test_rename[configs]",
-  "test_distributed_ddl/test.py::test_rename[configs_secure]",
-  "test_distributed_ddl/test.py::test_replicated_without_arguments[configs]",
-  "test_distributed_ddl/test.py::test_replicated_without_arguments[configs_secure]",
-  "test_distributed_ddl/test.py::test_simple_alters[configs]",
-  "test_distributed_ddl/test.py::test_simple_alters[configs_secure]",
-  "test_distributed_ddl/test.py::test_socket_timeout[configs]",
-  "test_distributed_ddl/test.py::test_socket_timeout[configs_secure]",
-  "test_distributed_ddl/test_replicated_alter.py::test_replicated_alters[configs]",
-  "test_distributed_ddl/test_replicated_alter.py::test_replicated_alters[configs_secure]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs-default-node1-distributed]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs-default-node1-remote]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs-default-node2-distributed]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs-default-node2-remote]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs-ready_to_wait-node1-distributed]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs-ready_to_wait-node1-remote]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs-ready_to_wait-node2-distributed]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs-ready_to_wait-node2-remote]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs_secure-default-node1-distributed]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs_secure-default-node1-remote]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs_secure-default-node2-distributed]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs_secure-default-node2-remote]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs_secure-ready_to_wait-node1-distributed]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs_secure-ready_to_wait-node1-remote]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs_secure-ready_to_wait-node2-distributed]",
-  "test_distributed_respect_user_timeouts/test.py::test_reconnect[configs_secure-ready_to_wait-node2-remote]",
-  "test_drop_replica/test.py::test_drop_replica",
-  "test_hedged_requests_parallel/test.py::test_combination1",
-  "test_hedged_requests_parallel/test.py::test_combination2",
-  "test_hedged_requests_parallel/test.py::test_query_with_no_data_to_sample",
-  "test_hedged_requests_parallel/test.py::test_send_data",
-  "test_hedged_requests_parallel/test.py::test_send_table_status_sleep",
-  "test_hedged_requests/test.py::test_combination1",
-  "test_hedged_requests/test.py::test_combination2",
-  "test_hedged_requests/test.py::test_combination3",
-  "test_hedged_requests/test.py::test_combination4",
-  "test_hedged_requests/test.py::test_long_query",
-  "test_hedged_requests/test.py::test_receive_timeout1",
-  "test_hedged_requests/test.py::test_receive_timeout2",
-  "test_hedged_requests/test.py::test_send_data",
-  "test_hedged_requests/test.py::test_send_data2",
-  "test_hedged_requests/test.py::test_send_table_status_sleep",
-  "test_hedged_requests/test.py::test_send_table_status_sleep2",
-  "test_hedged_requests/test.py::test_stuck_replica",
-  "test_https_replication/test.py::test_both_http",
-  "test_https_replication/test.py::test_both_https",
-  "test_https_replication/test.py::test_mixed_protocol",
-  "test_https_replication/test.py::test_replication_after_partition",
-  "test_insert_into_distributed_sync_async/test.py::test_async_inserts_into_local_shard",
-  "test_insert_into_distributed_sync_async/test.py::test_insertion_sync",
-  "test_insert_into_distributed_sync_async/test.py::test_insertion_sync_fails_with_timeout",
-  "test_insert_into_distributed_sync_async/test.py::test_insertion_sync_with_disabled_timeout",
-  "test_insert_into_distributed_sync_async/test.py::test_insertion_without_sync_ignores_timeout",
-  "test_insert_into_distributed/test.py::test_inserts_batching",
-  "test_insert_into_distributed/test.py::test_inserts_local",
-  "test_insert_into_distributed/test.py::test_inserts_low_cardinality",
-  "test_insert_into_distributed/test.py::test_inserts_single_replica_internal_replication",
-  "test_insert_into_distributed/test.py::test_inserts_single_replica_local_internal_replication",
-  "test_insert_into_distributed/test.py::test_inserts_single_replica_no_internal_replication",
-  "test_insert_into_distributed/test.py::test_prefer_localhost_replica",
-  "test_insert_into_distributed/test.py::test_reconnect",
-  "test_insert_into_distributed/test.py::test_table_function",
-  "test_insert_into_distributed_through_materialized_view/test.py::test_inserts_batching SKIPPED",
-  "test_insert_into_distributed_through_materialized_view/test.py::test_inserts_local",
-  "test_insert_into_distributed_through_materialized_view/test.py::test_reconnect",
-  "test_keeper_multinode_blocade_leader/test.py::test_blocade_leader",
-  "test_keeper_multinode_blocade_leader/test.py::test_blocade_leader_twice",
-  "test_keeper_multinode_simple/test.py::test_follower_restart",
-  "test_keeper_multinode_simple/test.py::test_read_write_multinode",
-  "test_keeper_multinode_simple/test.py::test_session_expiration",
-  "test_keeper_multinode_simple/test.py::test_simple_replicated_table",
-  "test_keeper_multinode_simple/test.py::test_watch_on_follower",
-  "test_limited_replicated_fetches/test.py::test_limited_fetches",
-  "test_materialized_mysql_database/test.py::test_clickhouse_killed_while_insert_5_7[atomic]",
-  "test_materialized_mysql_database/test.py::test_clickhouse_killed_while_insert_5_7[ordinary]",
-  "test_materialized_mysql_database/test.py::test_clickhouse_killed_while_insert_8_0[atomic]",
-  "test_materialized_mysql_database/test.py::test_clickhouse_killed_while_insert_8_0[ordinary]",
-  "test_materialized_mysql_database/test.py::test_insert_with_modify_binlog_checksum_5_7[atomic]",
-  "test_materialized_mysql_database/test.py::test_insert_with_modify_binlog_checksum_5_7[ordinary]",
-  "test_materialized_mysql_database/test.py::test_insert_with_modify_binlog_checksum_8_0[atomic]",
-  "test_materialized_mysql_database/test.py::test_insert_with_modify_binlog_checksum_8_0[ordinary]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_ddl_with_empty_transaction_5_7[atomic]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_ddl_with_empty_transaction_5_7[ordinary]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_ddl_with_empty_transaction_8_0[atomic]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_ddl_with_empty_transaction_8_0[ordinary]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_ddl_with_mysql_5_7[atomic]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_ddl_with_mysql_5_7[ordinary]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_ddl_with_mysql_8_0[atomic]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_ddl_with_mysql_8_0[ordinary]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_dml_with_mysql_5_7[atomic]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_dml_with_mysql_5_7[ordinary]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_dml_with_mysql_8_0[atomic]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_dml_with_mysql_8_0[ordinary]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_err_sync_user_privs_5_7[atomic]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_err_sync_user_privs_5_7[ordinary]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_err_sync_user_privs_8_0[atomic]",
-  "test_materialized_mysql_database/test.py::test_materialize_database_err_sync_user_privs_8_0[ordinary]",
-  "test_materialized_mysql_database/test.py::test_multi_table_update[clickhouse_node0]",
-  "test_materialized_mysql_database/test.py::test_multi_table_update[clickhouse_node1]",
-  "test_materialized_mysql_database/test.py::test_mysql_killed_while_insert_5_7[atomic]",
-  "test_materialized_mysql_database/test.py::test_mysql_killed_while_insert_5_7[ordinary]",
-  "test_materialized_mysql_database/test.py::test_mysql_killed_while_insert_8_0[atomic]",
-  "test_materialized_mysql_database/test.py::test_mysql_killed_while_insert_8_0[ordinary]",
-  "test_materialized_mysql_database/test.py::test_mysql_kill_sync_thread_restore_5_7[atomic]",
-  "test_materialized_mysql_database/test.py::test_mysql_kill_sync_thread_restore_5_7[ordinary]",
-  "test_materialized_mysql_database/test.py::test_mysql_kill_sync_thread_restore_8_0[atomic]",
-  "test_materialized_mysql_database/test.py::test_mysql_kill_sync_thread_restore_8_0[ordinary]",
-  "test_materialized_mysql_database/test.py::test_mysql_settings[clickhouse_node0]",
-  "test_materialized_mysql_database/test.py::test_mysql_settings[clickhouse_node1]",
-  "test_materialized_mysql_database/test.py::test_network_partition_5_7[atomic]",
-  "test_materialized_mysql_database/test.py::test_network_partition_5_7[ordinary]",
-  "test_materialized_mysql_database/test.py::test_network_partition_8_0[atomic]",
-  "test_materialized_mysql_database/test.py::test_network_partition_8_0[ordinary]",
-  "test_materialized_mysql_database/test.py::test_select_without_columns_5_7[atomic]",
-  "test_materialized_mysql_database/test.py::test_select_without_columns_5_7[ordinary]",
-  "test_materialized_mysql_database/test.py::test_select_without_columns_8_0[atomic]",
-  "test_materialized_mysql_database/test.py::test_select_without_columns_8_0[ordinary]",
-  "test_materialized_mysql_database/test.py::test_system_parts_table[clickhouse_node0]",
-  "test_materialized_mysql_database/test.py::test_system_parts_table[clickhouse_node1]",
-  "test_materialized_mysql_database/test.py::test_system_tables_table[clickhouse_node0]",
-  "test_materialized_mysql_database/test.py::test_system_tables_table[clickhouse_node1]",
-  "test_materialized_mysql_database/test.py::test_materialize_with_column_comments[clickhouse_node0]",
-  "test_materialized_mysql_database/test.py::test_materialize_with_column_comments[clickhouse_node1]",
-  "test_materialized_mysql_database/test.py::test_materialize_with_enum[clickhouse_node0]",
-  "test_materialized_mysql_database/test.py::test_materialize_with_enum[clickhouse_node1]",
-  "test_materialized_mysql_database/test.py::test_utf8mb4[clickhouse_node0]",
-  "test_materialized_mysql_database/test.py::test_utf8mb4[clickhouse_node1]",
-  "test_parts_delete_zookeeper/test.py::test_merge_doesnt_work_without_zookeeper",
-  "test_polymorphic_parts/test.py::test_compact_parts_only",
-  "test_polymorphic_parts/test.py::test_different_part_types_on_replicas[polymorphic_table_compact-Compact]",
-  "test_polymorphic_parts/test.py::test_different_part_types_on_replicas[polymorphic_table_wide-Wide]",
-  "test_polymorphic_parts/test.py::test_in_memory",
-  "test_polymorphic_parts/test.py::test_in_memory_alters",
-  "test_polymorphic_parts/test.py::test_in_memory_deduplication",
-  "test_polymorphic_parts/test.py::test_in_memory_wal_rotate",
-  "test_polymorphic_parts/test.py::test_polymorphic_parts_basics[first_node0-second_node0]",
-  "test_polymorphic_parts/test.py::test_polymorphic_parts_basics[first_node1-second_node1]",
-  "test_polymorphic_parts/test.py::test_polymorphic_parts_diff_versions_2 SKIPPED",
-  "test_polymorphic_parts/test.py::test_polymorphic_parts_diff_versions SKIPPED",
-  "test_polymorphic_parts/test.py::test_polymorphic_parts_index",
-  "test_polymorphic_parts/test.py::test_polymorphic_parts_non_adaptive",
-  "test_quorum_inserts_parallel/test.py::test_parallel_quorum_actually_parallel",
-  "test_quorum_inserts_parallel/test.py::test_parallel_quorum_actually_quorum",
-  "test_random_inserts/test.py::test_insert_multithreaded",
-  "test_random_inserts/test.py::test_random_inserts",
-  "test_reload_clusters_config/test.py::test_add_cluster",
-  "test_reload_clusters_config/test.py::test_delete_cluster",
-  "test_reload_clusters_config/test.py::test_simple_reload",
-  "test_reload_clusters_config/test.py::test_update_one_cluster",
-  "test_replace_partition/test.py::test_drop_failover",
-  "test_replace_partition/test.py::test_normal_work",
-  "test_replace_partition/test.py::test_replace_after_replace_failover",
-  "test_replicated_database/test.py::test_alters_from_different_replicas",
-  "test_replicated_database/test.py::test_create_replicated_table",
-  "test_replicated_database/test.py::test_recover_staled_replica",
-  "test_replicated_database/test.py::test_simple_alter_table[MergeTree]",
-  "test_replicated_database/test.py::test_simple_alter_table[ReplicatedMergeTree]",
-  "test_replicated_database/test.py::test_startup_without_zk",
-  "test_replicated_fetches_timeouts/test.py::test_no_stall",
-  "test_storage_kafka/test.py::test_bad_reschedule",
-  "test_storage_kafka/test.py::test_commits_of_unprocessed_messages_on_drop",
-  "test_storage_kafka/test.py::test_exception_from_destructor",
-  "test_storage_kafka/test.py::test_kafka_commit_on_block_write",
-  "test_storage_kafka/test.py::test_kafka_consumer_hang",
-  "test_storage_kafka/test.py::test_kafka_consumer_hang2",
-  "test_storage_kafka/test.py::test_kafka_csv_with_delimiter",
-  "test_storage_kafka/test.py::test_kafka_csv_with_thread_per_consumer",
-  "test_storage_kafka/test.py::test_kafka_duplicates_when_commit_failed",
-  "test_storage_kafka/test.py::test_kafka_engine_put_errors_to_stream",
-  "test_storage_kafka/test.py::test_kafka_engine_put_errors_to_stream_with_random_malformed_json",
-  "test_storage_kafka/test.py::test_kafka_flush_by_block_size",
-  "test_storage_kafka/test.py::test_kafka_flush_by_time",
-  "test_storage_kafka/test.py::test_kafka_flush_on_big_message",
-  "test_storage_kafka/test.py::test_kafka_formats",
-  "test_storage_kafka/test.py::test_kafka_formats_with_broken_message",
-  "test_storage_kafka/test.py::test_kafka_insert",
-  "test_storage_kafka/test.py::test_kafka_issue11308",
-  "test_storage_kafka/test.py::test_kafka_issue14202",
-  "test_storage_kafka/test.py::test_kafka_issue4116",
-  "test_storage_kafka/test.py::test_kafka_json_as_string",
-  "test_storage_kafka/test.py::test_kafka_json_without_delimiter",
-  "test_storage_kafka/test.py::test_kafka_lot_of_partitions_partial_commit_of_bulk",
-  "test_storage_kafka/test.py::test_kafka_many_materialized_views",
-  "test_storage_kafka/test.py::test_kafka_materialized_view",
-  "test_storage_kafka/test.py::test_kafka_materialized_view_with_subquery",
-  "test_storage_kafka/test.py::test_kafka_no_holes_when_write_suffix_failed",
-  "test_storage_kafka/test.py::test_kafka_produce_consume",
-  "test_storage_kafka/test.py::test_kafka_produce_key_timestamp",
-  "test_storage_kafka/test.py::test_kafka_protobuf",
-  "test_storage_kafka/test.py::test_kafka_protobuf_no_delimiter",
-  "test_storage_kafka/test.py::test_kafka_rebalance",
-  "test_storage_kafka/test.py::test_kafka_select_empty",
-  "test_storage_kafka/test.py::test_kafka_settings_new_syntax",
-  "test_storage_kafka/test.py::test_kafka_settings_old_syntax",
-  "test_storage_kafka/test.py::test_kafka_string_field_on_first_position_in_protobuf",
-  "test_storage_kafka/test.py::test_kafka_tsv_with_delimiter",
-  "test_storage_kafka/test.py::test_kafka_unavailable",
-  "test_storage_kafka/test.py::test_kafka_virtual_columns",
-  "test_storage_kafka/test.py::test_kafka_virtual_columns2",
-  "test_storage_kafka/test.py::test_kafka_virtual_columns_with_materialized_view",
-  "test_storage_kafka/test.py::test_librdkafka_compression",
-  "test_storage_kafka/test.py::test_premature_flush_on_eof",
-  "test_storage_kerberized_kafka/test.py::test_kafka_json_as_string",
-  "test_storage_kerberized_kafka/test.py::test_kafka_json_as_string_no_kdc",
-  "test_system_clusters_actual_information/test.py::test",
-  "test_system_metrics/test.py::test_readonly_metrics",
-  "test_system_replicated_fetches/test.py::test_system_replicated_fetches"
-]
diff --git a/tests/integration/parallel_skip.json b/tests/integration/parallel_skip.json
index ba593b76bbf..e9089fcde73 100644
--- a/tests/integration/parallel_skip.json
+++ b/tests/integration/parallel_skip.json
@@ -31,6 +31,7 @@
   "test_limited_replicated_fetches/test.py::test_limited_fetches",
   "test_materialized_mysql_database/test.py::test_network_partition_5_7",
   "test_materialized_mysql_database/test.py::test_network_partition_8_0",
+  "test_merge_tree_s3/test.py::test_store_cleanup_disk_s3",
   "test_mysql_database_engine/test.py::test_restart_server",
   "test_parts_delete_zookeeper/test.py::test_merge_doesnt_work_without_zookeeper",
   "test_quorum_inserts_parallel/test.py::test_parallel_quorum_actually_quorum",
@@ -51,5 +52,19 @@
   "test_global_overcommit_tracker/test.py::test_global_overcommit",
 
   "test_user_ip_restrictions/test.py::test_ipv4",
-  "test_user_ip_restrictions/test.py::test_ipv6"
+  "test_user_ip_restrictions/test.py::test_ipv6",
+
+  "test_server_reload/test.py::test_change_grpc_port",
+  "test_server_reload/test.py::test_change_http_handlers",
+  "test_server_reload/test.py::test_change_http_port",
+  "test_server_reload/test.py::test_change_listen_host",
+  "test_server_reload/test.py::test_change_mysql_port",
+  "test_server_reload/test.py::test_change_postgresql_port",
+  "test_server_reload/test.py::test_change_tcp_port",
+  "test_server_reload/test.py::test_reload_via_client",
+  "test_server_reload/test.py::test_remove_grpc_port",
+  "test_server_reload/test.py::test_remove_http_port",
+  "test_server_reload/test.py::test_remove_mysql_port",
+  "test_server_reload/test.py::test_remove_postgresql_port",
+  "test_server_reload/test.py::test_remove_tcp_port"
 ]
diff --git a/tests/integration/runner b/tests/integration/runner
index c1b3178faa4..f658bac412b 100755
--- a/tests/integration/runner
+++ b/tests/integration/runner
@@ -243,11 +243,18 @@ if __name__ == "__main__":
     )
 
     parser.add_argument(
-        "--no-random", action="store", dest="no_random", help="Disable tests order randomization"
+        "--no-random",
+        action="store",
+        dest="no_random",
+        help="Disable tests order randomization",
     )
 
     parser.add_argument(
-        "--pre-pull", action="store_true", default=False, dest="pre_pull", help="Pull images for docker_compose before all other actions"
+        "--pre-pull",
+        action="store_true",
+        default=False,
+        dest="pre_pull",
+        help="Pull images for docker_compose before all other actions",
     )
 
     parser.add_argument(
@@ -306,7 +313,6 @@ if __name__ == "__main__":
     # if not args.no_random:
     #     rand_args += f"--random-seed={os.getpid()}"
 
-
     net = ""
     if args.network:
         net = "--net={}".format(args.network)
@@ -416,8 +422,11 @@ if __name__ == "__main__":
         name=CONTAINER_NAME,
     )
 
-    cmd = cmd_base + " " +  args.command
-    cmd_pre_pull = cmd_base + " find /compose -name docker_compose_*.yml -exec docker-compose -f '{}' pull \;"
+    cmd = cmd_base + " " + args.command
+    cmd_pre_pull = (
+        cmd_base
+        + " find /compose -name docker_compose_*.yml -exec docker-compose -f '{}' pull \;"
+    )
 
     containers = subprocess.check_output(
         f"docker ps --all --quiet --filter name={CONTAINER_NAME} --format={{{{.ID}}}}",
diff --git a/tests/integration/test_access_control_on_cluster/configs/users.d/users.xml b/tests/integration/test_access_control_on_cluster/configs/users.d/users.xml
index 8556e73c82f..1c5f4d5a21f 100644
--- a/tests/integration/test_access_control_on_cluster/configs/users.d/users.xml
+++ b/tests/integration/test_access_control_on_cluster/configs/users.d/users.xml
@@ -4,7 +4,7 @@
             <password></password>
             <profile>default</profile>
             <quota>default</quota>
-            <show_named_collections>1</show_named_collections>
+            <named_collection_control>1</named_collection_control>
             <show_named_collections_secrets>1</show_named_collections_secrets>
         </default>
     </users>
diff --git a/tests/integration/test_async_drain_connection/__init__.py b/tests/integration/test_alternative_keeper_config/__init__.py
similarity index 100%
rename from tests/integration/test_async_drain_connection/__init__.py
rename to tests/integration/test_alternative_keeper_config/__init__.py
diff --git a/tests/integration/test_alternative_keeper_config/configs/enable_keeper1.xml b/tests/integration/test_alternative_keeper_config/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..fbdece06085
--- /dev/null
+++ b/tests/integration/test_alternative_keeper_config/configs/enable_keeper1.xml
@@ -0,0 +1,41 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>3</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_alternative_keeper_config/configs/enable_keeper2.xml b/tests/integration/test_alternative_keeper_config/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..dc3ce6c30c4
--- /dev/null
+++ b/tests/integration/test_alternative_keeper_config/configs/enable_keeper2.xml
@@ -0,0 +1,41 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>3</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_alternative_keeper_config/configs/enable_keeper3.xml b/tests/integration/test_alternative_keeper_config/configs/enable_keeper3.xml
new file mode 100644
index 00000000000..af2566565e4
--- /dev/null
+++ b/tests/integration/test_alternative_keeper_config/configs/enable_keeper3.xml
@@ -0,0 +1,41 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>3</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_alternative_keeper_config/configs/keeper_config.xml b/tests/integration/test_alternative_keeper_config/configs/keeper_config.xml
new file mode 100644
index 00000000000..b62e2728085
--- /dev/null
+++ b/tests/integration/test_alternative_keeper_config/configs/keeper_config.xml
@@ -0,0 +1,17 @@
+<clickhouse>
+    <keeper>
+        <node index="1">
+            <host>node1</host>
+            <port>9181</port>
+        </node>
+        <node index="2">
+            <host>node2</host>
+            <port>9181</port>
+        </node>
+        <node index="3">
+            <host>node3</host>
+            <port>9181</port>
+        </node>
+        <session_timeout_ms>3000</session_timeout_ms>
+    </keeper>
+</clickhouse>
diff --git a/tests/integration/test_part_moves_between_shards/configs/remote_servers.xml b/tests/integration/test_alternative_keeper_config/configs/remote_servers.xml
similarity index 60%
rename from tests/integration/test_part_moves_between_shards/configs/remote_servers.xml
rename to tests/integration/test_alternative_keeper_config/configs/remote_servers.xml
index d0734608aa9..5b453fdeb67 100644
--- a/tests/integration/test_part_moves_between_shards/configs/remote_servers.xml
+++ b/tests/integration/test_alternative_keeper_config/configs/remote_servers.xml
@@ -3,21 +3,15 @@
         <test_cluster>
             <shard>
                 <replica>
-                    <host>s0r0</host>
+                    <host>node1</host>
                     <port>9000</port>
                 </replica>
                 <replica>
-                    <host>s0r1</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>s1r0</host>
+                    <host>node2</host>
                     <port>9000</port>
                 </replica>
                 <replica>
-                    <host>s1r1</host>
+                    <host>node3</host>
                     <port>9000</port>
                 </replica>
             </shard>
diff --git a/tests/integration/test_alternative_keeper_config/configs/zookeeper_config.xml b/tests/integration/test_alternative_keeper_config/configs/zookeeper_config.xml
new file mode 100644
index 00000000000..31913bb6e2c
--- /dev/null
+++ b/tests/integration/test_alternative_keeper_config/configs/zookeeper_config.xml
@@ -0,0 +1,17 @@
+<clickhouse>
+    <zookeeper>
+        <node index="1">
+            <host>node1</host>
+            <port>9181</port>
+        </node>
+        <node index="2">
+            <host>node2</host>
+            <port>9181</port>
+        </node>
+        <node index="3">
+            <host>node3</host>
+            <port>9181</port>
+        </node>
+        <session_timeout_ms>3000</session_timeout_ms>
+    </zookeeper>
+</clickhouse>
diff --git a/tests/integration/test_alternative_keeper_config/test.py b/tests/integration/test_alternative_keeper_config/test.py
new file mode 100644
index 00000000000..f1016ee1ae3
--- /dev/null
+++ b/tests/integration/test_alternative_keeper_config/test.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=[
+        "configs/remote_servers.xml",
+        "configs/keeper_config.xml",
+        "configs/enable_keeper1.xml",
+    ],
+    macros={"replica": "node1"},
+)
+
+node2 = cluster.add_instance(
+    "node2",
+    main_configs=[
+        "configs/remote_servers.xml",
+        "configs/zookeeper_config.xml",
+        "configs/enable_keeper2.xml",
+    ],
+    macros={"replica": "node2"},
+)
+
+node3 = cluster.add_instance(
+    "node3",
+    main_configs=["configs/remote_servers.xml", "configs/enable_keeper3.xml"],
+    macros={"replica": "node3"},
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_create_insert(started_cluster):
+    node1.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'test_cluster' SYNC")
+    node1.query(
+        """
+        CREATE TABLE tbl ON CLUSTER 'test_cluster' (
+            id Int64,
+            str String
+        ) ENGINE=ReplicatedMergeTree('/clickhouse/tables/tbl/', '{replica}')
+        ORDER BY id
+        """
+    )
+
+    node1.query("INSERT INTO tbl VALUES (1, 'str1')")
+    node2.query("INSERT INTO tbl VALUES (1, 'str1')")  # Test deduplication
+    node3.query("INSERT INTO tbl VALUES (2, 'str2')")
+
+    node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'test_cluster' tbl")
+
+    for node in [node1, node2, node3]:
+        expected = [[1, "str1"], [2, "str2"]]
+        assert node.query("SELECT * FROM tbl ORDER BY id") == TSV(expected)
+        assert node.query("CHECK TABLE tbl") == "1\n"
diff --git a/tests/integration/test_async_drain_connection/configs/config.xml b/tests/integration/test_async_drain_connection/configs/config.xml
deleted file mode 100644
index 88862a3001e..00000000000
--- a/tests/integration/test_async_drain_connection/configs/config.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<clickhouse>
-  <max_concurrent_queries>10000</max_concurrent_queries>
-</clickhouse>
diff --git a/tests/integration/test_async_drain_connection/test.py b/tests/integration/test_async_drain_connection/test.py
deleted file mode 100644
index 66786f4a8f9..00000000000
--- a/tests/integration/test_async_drain_connection/test.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# pylint: disable=redefined-outer-name
-# pylint: disable=unused-argument
-
-import pytest
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-node = cluster.add_instance("node", main_configs=["configs/config.xml"])
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    try:
-        cluster.start()
-        node.query(
-            """
-        create table t (number UInt64)
-        engine = Distributed(test_cluster_two_shards, system, numbers)
-        """
-        )
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-def test_filled_async_drain_connection_pool(started_cluster):
-    def execute_queries(_):
-        for _ in range(100):
-            node.query(
-                "select * from t where number = 0 limit 2",
-                settings={
-                    "sleep_in_receive_cancel_ms": int(10e6),
-                    "max_execution_time": 5,
-                    # decrease drain_timeout to make test more stable
-                    # (another way is to increase max_execution_time, but this will make test slower)
-                    "drain_timeout": 1,
-                },
-            )
-
-    any(map(execute_queries, range(10)))
diff --git a/tests/integration/test_async_insert_memory/configs/users.xml b/tests/integration/test_async_insert_memory/configs/users.xml
new file mode 100644
index 00000000000..1c5f4d5a21f
--- /dev/null
+++ b/tests/integration/test_async_insert_memory/configs/users.xml
@@ -0,0 +1,11 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <quota>default</quota>
+            <named_collection_control>1</named_collection_control>
+            <show_named_collections_secrets>1</show_named_collections_secrets>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_async_insert_memory/test.py b/tests/integration/test_async_insert_memory/test.py
index 279542f087c..5d2e5503680 100644
--- a/tests/integration/test_async_insert_memory/test.py
+++ b/tests/integration/test_async_insert_memory/test.py
@@ -1,10 +1,17 @@
+import time
+
 import pytest
 
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
 
-node = cluster.add_instance("node")
+node = cluster.add_instance(
+    "node",
+    user_configs=[
+        "configs/users.xml",
+    ],
+)
 
 
 @pytest.fixture(scope="module", autouse=True)
@@ -17,24 +24,32 @@ def start_cluster():
 
 
 def test_memory_usage():
+    node.query("CREATE USER IF NOT EXISTS A")
+    node.query("GRANT ALL ON *.* TO A")
+
     node.query(
         "CREATE TABLE async_table(data Array(UInt64)) ENGINE=MergeTree() ORDER BY data"
     )
 
-    node.get_query_request("SELECT count() FROM system.numbers")
+    node.get_query_request("SELECT count() FROM system.numbers", user="A")
 
-    INSERT_QUERY = "INSERT INTO async_table SETTINGS async_insert=1, wait_for_async_insert=1 VALUES ({})"
+    INSERT_QUERY = "INSERT INTO async_table SETTINGS async_insert=1, wait_for_async_insert=1,async_insert_max_data_size=150000000 VALUES ({})"
     for iter in range(10):
         values = list(range(iter * 5000000, (iter + 1) * 5000000))
-        node.query(INSERT_QUERY.format(values))
+        node.query(INSERT_QUERY.format(values), user="A")
+
+    # Wait until buffers are freed
+    time.sleep(5)
 
     response = node.get_query_request(
         "SELECT groupArray(number) FROM numbers(1000000) SETTINGS max_memory_usage_for_user={}".format(
             30 * (2**23)
-        )
+        ),
+        user="A",
     )
 
     _, err = response.get_answer_and_error()
     assert err == "", "Query failed with error {}".format(err)
 
     node.query("DROP TABLE async_table")
+    node.query("DROP USER IF EXISTS A")
diff --git a/tests/integration/test_backup_restore/test.py b/tests/integration/test_backup_restore/test.py
index 193e638186c..b91a7cfe1c8 100644
--- a/tests/integration/test_backup_restore/test.py
+++ b/tests/integration/test_backup_restore/test.py
@@ -171,39 +171,3 @@ def test_replace_partition(started_cluster):
     assert TSV(res) == expected
 
     instance.query("DROP TABLE IF EXISTS test.tbl3")
-
-
-def test_freeze_in_memory(started_cluster):
-    instance.query(
-        "CREATE TABLE test.t_in_memory(a UInt32, s String) ENGINE = MergeTree ORDER BY a SETTINGS min_rows_for_compact_part = 1000"
-    )
-    instance.query("INSERT INTO test.t_in_memory VALUES (1, 'a')")
-    instance.query("ALTER TABLE test.t_in_memory FREEZE")
-
-    fp_backup = get_last_backup_path(
-        started_cluster.instances["node"], "test", "t_in_memory"
-    )
-    part_path = fp_backup + "/all_1_1_0/"
-
-    assert TSV(
-        instance.query(
-            "SELECT part_type, is_frozen FROM system.parts WHERE database = 'test' AND table = 't_in_memory'"
-        )
-    ) == TSV("InMemory\t1\n")
-    instance.exec_in_container(["test", "-f", part_path + "/data.bin"])
-    assert instance.exec_in_container(["cat", part_path + "/count.txt"]).strip() == "1"
-
-    instance.query(
-        "CREATE TABLE test.t_in_memory_2(a UInt32, s String) ENGINE = MergeTree ORDER BY a"
-    )
-    copy_backup_to_detached(
-        started_cluster.instances["node"], "test", "t_in_memory", "t_in_memory_2"
-    )
-
-    instance.query("ALTER TABLE test.t_in_memory_2 ATTACH PARTITION ID 'all'")
-    assert TSV(
-        instance.query(
-            "SELECT part_type FROM system.parts WHERE database = 'test' AND table = 't_in_memory_2'"
-        )
-    ) == TSV("Compact\n")
-    assert TSV(instance.query("SELECT a, s FROM test.t_in_memory_2")) == TSV("1\ta\n")
diff --git a/tests/integration/test_backup_restore_new/configs/zookeeper_retries.xml b/tests/integration/test_backup_restore_new/configs/zookeeper_retries.xml
new file mode 100644
index 00000000000..1283f28a8cb
--- /dev/null
+++ b/tests/integration/test_backup_restore_new/configs/zookeeper_retries.xml
@@ -0,0 +1,11 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <backup_restore_keeper_max_retries>1000</backup_restore_keeper_max_retries>
+            <backup_restore_keeper_retry_initial_backoff_ms>1</backup_restore_keeper_retry_initial_backoff_ms>
+            <backup_restore_keeper_retry_max_backoff_ms>1</backup_restore_keeper_retry_max_backoff_ms>
+            <backup_restore_keeper_fault_injection_seed>42</backup_restore_keeper_fault_injection_seed>
+            <backup_restore_keeper_fault_injection_probability>0.002</backup_restore_keeper_fault_injection_probability>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/test_backup_restore_new/test.py b/tests/integration/test_backup_restore_new/test.py
index 3f67fe8e5f7..c19cca4126a 100644
--- a/tests/integration/test_backup_restore_new/test.py
+++ b/tests/integration/test_backup_restore_new/test.py
@@ -13,6 +13,7 @@ cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance(
     "instance",
     main_configs=["configs/backups_disk.xml"],
+    user_configs=["configs/zookeeper_retries.xml"],
     external_dirs=["/backups/"],
 )
 
@@ -157,8 +158,6 @@ def test_restore_table(engine):
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
     instance.query(f"BACKUP TABLE test.table TO {backup_name}")
 
-    assert instance.contains_in_log("using native copy")
-
     instance.query("DROP TABLE test.table")
     assert instance.query("EXISTS test.table") == "0\n"
 
@@ -199,8 +198,6 @@ def test_restore_table_under_another_name():
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
     instance.query(f"BACKUP TABLE test.table TO {backup_name}")
 
-    assert instance.contains_in_log("using native copy")
-
     assert instance.query("EXISTS test.table2") == "0\n"
 
     instance.query(f"RESTORE TABLE test.table AS test.table2 FROM {backup_name}")
@@ -214,8 +211,6 @@ def test_backup_table_under_another_name():
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
     instance.query(f"BACKUP TABLE test.table AS test.table2 TO {backup_name}")
 
-    assert instance.contains_in_log("using native copy")
-
     assert instance.query("EXISTS test.table2") == "0\n"
 
     instance.query(f"RESTORE TABLE test.table2 FROM {backup_name}")
@@ -244,8 +239,6 @@ def test_incremental_backup():
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
     instance.query(f"BACKUP TABLE test.table TO {backup_name}")
 
-    assert instance.contains_in_log("using native copy")
-
     instance.query("INSERT INTO test.table VALUES (65, 'a'), (66, 'b')")
 
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "102\t5081\n"
@@ -472,6 +465,29 @@ def test_incremental_backup_for_log_family():
     assert instance.query("SELECT count(), sum(x) FROM test.table2") == "102\t5081\n"
 
 
+def test_incremental_backup_append_table_def():
+    backup_name = new_backup_name()
+    create_and_fill_table()
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+    instance.query(f"BACKUP TABLE test.table TO {backup_name}")
+
+    instance.query("ALTER TABLE test.table MODIFY SETTING parts_to_throw_insert=100")
+
+    incremental_backup_name = new_backup_name()
+    instance.query(
+        f"BACKUP TABLE test.table TO {incremental_backup_name} SETTINGS base_backup = {backup_name}"
+    )
+
+    instance.query("DROP TABLE test.table")
+    instance.query(f"RESTORE TABLE test.table FROM {incremental_backup_name}")
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+    assert "parts_to_throw_insert = 100" in instance.query(
+        "SHOW CREATE TABLE test.table"
+    )
+
+
 def test_backup_not_found_or_already_exists():
     backup_name = new_backup_name()
 
@@ -500,8 +516,6 @@ def test_file_engine():
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
     instance.query(f"BACKUP TABLE test.table TO {backup_name}")
 
-    assert instance.contains_in_log("using native copy")
-
     instance.query("DROP TABLE test.table")
     assert instance.query("EXISTS test.table") == "0\n"
 
@@ -516,8 +530,6 @@ def test_database():
 
     instance.query(f"BACKUP DATABASE test TO {backup_name}")
 
-    assert instance.contains_in_log("using native copy")
-
     instance.query("DROP DATABASE test")
     instance.query(f"RESTORE DATABASE test FROM {backup_name}")
 
@@ -1184,6 +1196,85 @@ def test_restore_partition():
     )
 
 
+@pytest.mark.parametrize("exclude_system_log_tables", [False, True])
+def test_backup_all(exclude_system_log_tables):
+    create_and_fill_table()
+
+    session_id = new_session_id()
+    instance.http_query(
+        "CREATE TEMPORARY TABLE temp_tbl(s String)", params={"session_id": session_id}
+    )
+    instance.http_query(
+        "INSERT INTO temp_tbl VALUES ('q'), ('w'), ('e')",
+        params={"session_id": session_id},
+    )
+
+    instance.query("CREATE FUNCTION two_and_half AS (x) -> x * 2.5")
+
+    instance.query("CREATE USER u1 IDENTIFIED BY 'qwe123' SETTINGS custom_a = 1")
+
+    backup_name = new_backup_name()
+
+    exclude_from_backup = []
+    if exclude_system_log_tables:
+        # See the list of log tables in src/Interpreters/SystemLog.cpp
+        log_tables = [
+            "query_log",
+            "query_thread_log",
+            "part_log",
+            "trace_log",
+            "crash_log",
+            "text_log",
+            "metric_log",
+            "filesystem_cache_log",
+            "filesystem_read_prefetches_log",
+            "asynchronous_metric_log",
+            "opentelemetry_span_log",
+            "query_views_log",
+            "zookeeper_log",
+            "session_log",
+            "transactions_info_log",
+            "processors_profile_log",
+            "asynchronous_insert_log",
+        ]
+        exclude_from_backup += ["system." + table_name for table_name in log_tables]
+
+    backup_command = f"BACKUP ALL {'EXCEPT TABLES ' + ','.join(exclude_from_backup) if exclude_from_backup else ''} TO {backup_name}"
+
+    instance.http_query(backup_command, params={"session_id": session_id})
+
+    instance.query("DROP TABLE test.table")
+    instance.query("DROP FUNCTION two_and_half")
+    instance.query("DROP USER u1")
+
+    restore_settings = []
+    if not exclude_system_log_tables:
+        restore_settings.append("allow_non_empty_tables=true")
+    restore_command = f"RESTORE ALL FROM {backup_name} {'SETTINGS '+ ', '.join(restore_settings) if restore_settings else ''}"
+
+    session_id = new_session_id()
+    instance.http_query(
+        restore_command, params={"session_id": session_id}, method="POST"
+    )
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+
+    assert instance.http_query(
+        "SELECT * FROM temp_tbl ORDER BY s", params={"session_id": session_id}
+    ) == TSV([["e"], ["q"], ["w"]])
+
+    assert instance.query("SELECT two_and_half(6)") == "15\n"
+
+    assert (
+        instance.query("SHOW CREATE USER u1")
+        == "CREATE USER u1 IDENTIFIED WITH sha256_password SETTINGS custom_a = 1\n"
+    )
+
+    instance.query("DROP TABLE test.table")
+    instance.query("DROP FUNCTION two_and_half")
+    instance.query("DROP USER u1")
+
+
 def test_operation_id():
     create_and_fill_table(n=30)
 
@@ -1402,23 +1493,23 @@ def test_tables_dependency():
 
     # Drop everything in reversive order.
     def drop():
-        instance.query(f"DROP TABLE {t15} NO DELAY")
-        instance.query(f"DROP TABLE {t14} NO DELAY")
-        instance.query(f"DROP TABLE {t13} NO DELAY")
-        instance.query(f"DROP TABLE {t12} NO DELAY")
-        instance.query(f"DROP TABLE {t11} NO DELAY")
-        instance.query(f"DROP TABLE {t10} NO DELAY")
-        instance.query(f"DROP TABLE {t9} NO DELAY")
+        instance.query(f"DROP TABLE {t15} SYNC")
+        instance.query(f"DROP TABLE {t14} SYNC")
+        instance.query(f"DROP TABLE {t13} SYNC")
+        instance.query(f"DROP TABLE {t12} SYNC")
+        instance.query(f"DROP TABLE {t11} SYNC")
+        instance.query(f"DROP TABLE {t10} SYNC")
+        instance.query(f"DROP TABLE {t9} SYNC")
         instance.query(f"DROP DICTIONARY {t8}")
-        instance.query(f"DROP TABLE {t7} NO DELAY")
-        instance.query(f"DROP TABLE {t6} NO DELAY")
-        instance.query(f"DROP TABLE {t5} NO DELAY")
+        instance.query(f"DROP TABLE {t7} SYNC")
+        instance.query(f"DROP TABLE {t6} SYNC")
+        instance.query(f"DROP TABLE {t5} SYNC")
         instance.query(f"DROP DICTIONARY {t4}")
-        instance.query(f"DROP TABLE {t3} NO DELAY")
-        instance.query(f"DROP TABLE {t2} NO DELAY")
-        instance.query(f"DROP TABLE {t1} NO DELAY")
-        instance.query("DROP DATABASE test NO DELAY")
-        instance.query("DROP DATABASE test2 NO DELAY")
+        instance.query(f"DROP TABLE {t3} SYNC")
+        instance.query(f"DROP TABLE {t2} SYNC")
+        instance.query(f"DROP TABLE {t1} SYNC")
+        instance.query("DROP DATABASE test SYNC")
+        instance.query("DROP DATABASE test2 SYNC")
 
     drop()
 
diff --git a/tests/integration/test_backup_restore_on_cluster/_gen/cluster_for_concurrency_test.xml b/tests/integration/test_backup_restore_on_cluster/_gen/cluster_for_concurrency_test.xml
deleted file mode 100644
index 08684e34e45..00000000000
--- a/tests/integration/test_backup_restore_on_cluster/_gen/cluster_for_concurrency_test.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<clickhouse>
-	<remote_servers>
-		<cluster>
-			<shard>
-				<replica>
-					<host>node0</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>node1</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>node2</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>node3</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>node4</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>node5</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>node6</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>node7</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>node8</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>node9</host>
-					<port>9000</port>
-				</replica>
-			</shard>
-		</cluster>
-	</remote_servers>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_backup_restore_on_cluster/configs/replicated_user_defined_sql_objects.xml b/tests/integration/test_backup_restore_on_cluster/configs/replicated_user_defined_sql_objects.xml
new file mode 100644
index 00000000000..8fd34feea46
--- /dev/null
+++ b/tests/integration/test_backup_restore_on_cluster/configs/replicated_user_defined_sql_objects.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <user_defined_zookeeper_path>/clickhouse/udf</user_defined_zookeeper_path>
+</clickhouse>
diff --git a/tests/integration/test_backup_restore_on_cluster/configs/zookeeper_retries.xml b/tests/integration/test_backup_restore_on_cluster/configs/zookeeper_retries.xml
new file mode 100644
index 00000000000..1283f28a8cb
--- /dev/null
+++ b/tests/integration/test_backup_restore_on_cluster/configs/zookeeper_retries.xml
@@ -0,0 +1,11 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <backup_restore_keeper_max_retries>1000</backup_restore_keeper_max_retries>
+            <backup_restore_keeper_retry_initial_backoff_ms>1</backup_restore_keeper_retry_initial_backoff_ms>
+            <backup_restore_keeper_retry_max_backoff_ms>1</backup_restore_keeper_retry_max_backoff_ms>
+            <backup_restore_keeper_fault_injection_seed>42</backup_restore_keeper_fault_injection_seed>
+            <backup_restore_keeper_fault_injection_probability>0.002</backup_restore_keeper_fault_injection_probability>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/test_backup_restore_on_cluster/test.py b/tests/integration/test_backup_restore_on_cluster/test.py
index 27448b95b51..5542eac856d 100644
--- a/tests/integration/test_backup_restore_on_cluster/test.py
+++ b/tests/integration/test_backup_restore_on_cluster/test.py
@@ -11,12 +11,14 @@ cluster = ClickHouseCluster(__file__)
 main_configs = [
     "configs/remote_servers.xml",
     "configs/replicated_access_storage.xml",
+    "configs/replicated_user_defined_sql_objects.xml",
     "configs/backups_disk.xml",
     "configs/lesser_timeouts.xml",  # Default timeouts are quite big (a few minutes), the tests don't need them to be that big.
 ]
 
 user_configs = [
     "configs/allow_database_types.xml",
+    "configs/zookeeper_retries.xml",
 ]
 
 node1 = cluster.add_instance(
@@ -63,9 +65,9 @@ def drop_after_test():
     try:
         yield
     finally:
-        node1.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster3' NO DELAY")
-        node1.query("DROP TABLE IF EXISTS tbl2 ON CLUSTER 'cluster3' NO DELAY")
-        node1.query("DROP DATABASE IF EXISTS mydb ON CLUSTER 'cluster3' NO DELAY")
+        node1.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster3' SYNC")
+        node1.query("DROP TABLE IF EXISTS tbl2 ON CLUSTER 'cluster3' SYNC")
+        node1.query("DROP DATABASE IF EXISTS mydb ON CLUSTER 'cluster3' SYNC")
         node1.query("DROP USER IF EXISTS u1, u2 ON CLUSTER 'cluster3'")
 
 
@@ -105,7 +107,7 @@ def test_replicated_table():
     )
 
     # Drop table on both nodes.
-    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     # Restore from backup on node2.
     node2.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
@@ -136,7 +138,7 @@ def test_empty_replicated_table():
     )
 
     # Drop table on both nodes.
-    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     # Restore from backup on node2.
     node1.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
@@ -170,7 +172,7 @@ def test_replicated_database():
     )
 
     # Drop table on both nodes.
-    node1.query("DROP DATABASE mydb ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP DATABASE mydb ON CLUSTER 'cluster' SYNC")
 
     # Restore from backup on node2.
     node1.query(f"RESTORE DATABASE mydb ON CLUSTER 'cluster' FROM {backup_name}")
@@ -199,7 +201,7 @@ def test_different_tables_on_nodes():
     backup_name = new_backup_name()
     node1.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
-    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     node2.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
 
@@ -222,7 +224,7 @@ def test_backup_restore_on_single_replica():
     backup_name = new_backup_name()
     node1.query(f"BACKUP DATABASE mydb TO {backup_name}")
 
-    node1.query("DROP DATABASE mydb NO DELAY")
+    node1.query("DROP DATABASE mydb SYNC")
 
     # Cannot restore table because it already contains data on other replicas.
     expected_error = "already contains some data"
@@ -241,7 +243,7 @@ def test_backup_restore_on_single_replica():
     )
 
     # Can restore table with allow_non_empty_tables=true.
-    node1.query("DROP DATABASE mydb NO DELAY")
+    node1.query("DROP DATABASE mydb SYNC")
     node1.query(
         f"RESTORE DATABASE mydb FROM {backup_name} SETTINGS allow_non_empty_tables=true"
     )
@@ -264,7 +266,7 @@ def test_table_with_parts_in_queue_considered_non_empty():
     backup_name = new_backup_name()
     node1.query(f"BACKUP DATABASE mydb TO {backup_name}")
 
-    node1.query("DROP DATABASE mydb NO DELAY")
+    node1.query("DROP DATABASE mydb SYNC")
 
     # Cannot restore table because it already contains data on other replicas.
     expected_error = "already contains some data"
@@ -293,7 +295,7 @@ def test_replicated_table_with_not_synced_insert():
     backup_name = new_backup_name()
     node1.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
-    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     node1.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
     node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' tbl")
@@ -323,7 +325,7 @@ def test_replicated_table_with_not_synced_merge():
     backup_name = new_backup_name()
     node1.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
-    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     node1.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
     node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' tbl")
@@ -346,7 +348,7 @@ def test_replicated_table_restored_into_bigger_cluster():
     backup_name = new_backup_name()
     node1.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
-    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     node1.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster3' FROM {backup_name}")
     node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster3' tbl")
@@ -370,7 +372,7 @@ def test_replicated_table_restored_into_smaller_cluster():
     backup_name = new_backup_name()
     node1.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
-    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     node1.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster1' FROM {backup_name}")
     assert node1.query("SELECT * FROM tbl ORDER BY x") == TSV([111, 222])
@@ -408,7 +410,7 @@ def test_replicated_database_async():
         TSV([["BACKUP_CREATED", ""]]),
     )
 
-    node1.query("DROP DATABASE mydb ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP DATABASE mydb ON CLUSTER 'cluster' SYNC")
 
     [id, status] = node1.query(
         f"RESTORE DATABASE mydb ON CLUSTER 'cluster' FROM {backup_name} ASYNC"
@@ -428,6 +430,39 @@ def test_replicated_database_async():
     assert node2.query("SELECT * FROM mydb.tbl2 ORDER BY y") == TSV(["a", "bb"])
 
 
+# By default `backup_restore_keeper_value_max_size` is 1 MB, but in this test we'll set it to 50 bytes just to check it works.
+def test_keeper_value_max_size():
+    node1.query(
+        "CREATE TABLE tbl ON CLUSTER 'cluster' ("
+        "x UInt32"
+        ") ENGINE=ReplicatedMergeTree('/clickhouse/tables/tbl/', '{replica}')"
+        "ORDER BY x"
+    )
+
+    node1.query("INSERT INTO tbl VALUES (111)")
+    node2.query("INSERT INTO tbl VALUES (222)")
+
+    node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' tbl")
+    node1.query("SYSTEM STOP REPLICATED SENDS ON CLUSTER 'cluster' tbl")
+
+    node1.query("INSERT INTO tbl VALUES (333)")
+    node2.query("INSERT INTO tbl VALUES (444)")
+
+    backup_name = new_backup_name()
+    node1.query(
+        f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}",
+        settings={"backup_restore_keeper_value_max_size": 50},
+    )
+
+    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
+
+    node1.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
+    node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' tbl")
+
+    assert node1.query("SELECT * FROM tbl ORDER BY x") == TSV([111, 222, 333, 444])
+    assert node2.query("SELECT * FROM tbl ORDER BY x") == TSV([111, 222, 333, 444])
+
+
 @pytest.mark.parametrize(
     "interface, on_cluster", [("native", True), ("http", True), ("http", False)]
 )
@@ -506,7 +541,7 @@ def test_async_backups_to_same_destination(interface, on_cluster):
     assert num_failed_backups == len(ids) - 1
 
     # Check that the succeeded backup is all right.
-    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
     node1.query(f"RESTORE TABLE tbl FROM {backup_name}")
     assert node1.query("SELECT * FROM tbl") == "1\n"
 
@@ -533,7 +568,7 @@ def test_required_privileges():
     node1.query("GRANT BACKUP ON tbl TO u1")
     node1.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}", user="u1")
 
-    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     expected_error = "necessary to have grant INSERT, CREATE TABLE ON default.tbl2"
     assert expected_error in node1.query_and_get_error(
@@ -547,7 +582,7 @@ def test_required_privileges():
 
     assert node2.query("SELECT * FROM tbl2") == "100\n"
 
-    node1.query(f"DROP TABLE tbl2 ON CLUSTER 'cluster' NO DELAY")
+    node1.query(f"DROP TABLE tbl2 ON CLUSTER 'cluster' SYNC")
     node1.query("REVOKE ALL FROM u1")
 
     expected_error = "necessary to have grant INSERT, CREATE TABLE ON default.tbl"
@@ -604,6 +639,50 @@ def test_system_users():
     assert node1.query("SHOW GRANTS FOR u1") == "GRANT SELECT ON default.tbl TO u1\n"
 
 
+def test_system_functions():
+    node1.query("CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;")
+
+    node1.query("CREATE FUNCTION parity_str AS (n) -> if(n % 2, 'odd', 'even');")
+
+    backup_name = new_backup_name()
+    node1.query(f"BACKUP TABLE system.functions ON CLUSTER 'cluster' TO {backup_name}")
+
+    node1.query("DROP FUNCTION linear_equation")
+    node1.query("DROP FUNCTION parity_str")
+    assert_eq_with_retry(
+        node2, "SELECT name FROM system.functions WHERE name='parity_str'", ""
+    )
+
+    node1.query(
+        f"RESTORE TABLE system.functions ON CLUSTER 'cluster' FROM {backup_name}"
+    )
+
+    assert node1.query(
+        "SELECT number, linear_equation(number, 2, 1) FROM numbers(3)"
+    ) == TSV([[0, 1], [1, 3], [2, 5]])
+
+    assert node1.query("SELECT number, parity_str(number) FROM numbers(3)") == TSV(
+        [[0, "even"], [1, "odd"], [2, "even"]]
+    )
+
+    assert node2.query(
+        "SELECT number, linear_equation(number, 2, 1) FROM numbers(3)"
+    ) == TSV([[0, 1], [1, 3], [2, 5]])
+
+    assert node2.query("SELECT number, parity_str(number) FROM numbers(3)") == TSV(
+        [[0, "even"], [1, "odd"], [2, "even"]]
+    )
+
+    assert_eq_with_retry(
+        node2,
+        "SELECT name FROM system.functions WHERE name='parity_str'",
+        "parity_str\n",
+    )
+    assert node2.query("SELECT number, parity_str(number) FROM numbers(3)") == TSV(
+        [[0, "even"], [1, "odd"], [2, "even"]]
+    )
+
+
 def test_projection():
     node1.query(
         "CREATE TABLE tbl ON CLUSTER 'cluster' (x UInt32, y String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/tbl/', '{replica}') "
@@ -624,7 +703,7 @@ def test_projection():
     backup_name = new_backup_name()
     node1.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
-    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     assert (
         node1.query(
@@ -676,7 +755,7 @@ def test_replicated_table_with_not_synced_def():
     backup_name = new_backup_name()
     node2.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
-    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     # But synced after RESTORE anyway
     node1.query(
@@ -689,7 +768,7 @@ def test_replicated_table_with_not_synced_def():
         "SELECT name, type FROM system.columns WHERE database='default' AND table='tbl'"
     ) == TSV([["x", "String"], ["y", "String"]])
 
-    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     node2.query(
         f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name} SETTINGS replica_num_in_backup=2"
@@ -716,7 +795,7 @@ def test_table_in_replicated_database_with_not_synced_def():
     backup_name = new_backup_name()
     node2.query(f"BACKUP DATABASE mydb ON CLUSTER 'cluster' TO {backup_name}")
 
-    node1.query("DROP DATABASE mydb ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP DATABASE mydb ON CLUSTER 'cluster' SYNC")
 
     # But synced after RESTORE anyway
     node1.query(
@@ -729,7 +808,7 @@ def test_table_in_replicated_database_with_not_synced_def():
         "SELECT name, type FROM system.columns WHERE database='mydb' AND table='tbl'"
     ) == TSV([["x", "String"], ["y", "String"]])
 
-    node1.query("DROP DATABASE mydb ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP DATABASE mydb ON CLUSTER 'cluster' SYNC")
 
     node2.query(
         f"RESTORE DATABASE mydb ON CLUSTER 'cluster' FROM {backup_name} SETTINGS replica_num_in_backup=2"
@@ -791,7 +870,7 @@ def test_mutation():
     assert has_mutation_in_backup("0000000002", backup_name, "default", "tbl")
     assert not has_mutation_in_backup("0000000003", backup_name, "default", "tbl")
 
-    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
 
     node1.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
 
@@ -927,7 +1006,7 @@ def test_stop_other_host_during_backup(kill):
     node2.start_clickhouse()
 
     if status == "BACKUP_CREATED":
-        node1.query("DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+        node1.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
         node1.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
         assert node1.query("SELECT * FROM tbl ORDER BY x") == TSV([3, 5])
     elif status == "BACKUP_FAILED":
diff --git a/tests/integration/test_backup_restore_on_cluster/test_concurrency.py b/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
index 570a3c01ec0..aea82c6b559 100644
--- a/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
+++ b/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
@@ -29,6 +29,7 @@ def generate_cluster_def():
 
 
 main_configs = ["configs/backups_disk.xml", generate_cluster_def()]
+# No [Zoo]Keeper retries for tests with concurrency
 user_configs = ["configs/allow_database_types.xml"]
 
 nodes = []
@@ -61,8 +62,8 @@ def drop_after_test():
     try:
         yield
     finally:
-        node0.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' NO DELAY")
-        node0.query("DROP DATABASE IF EXISTS mydb ON CLUSTER 'cluster' NO DELAY")
+        node0.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' SYNC")
+        node0.query("DROP DATABASE IF EXISTS mydb ON CLUSTER 'cluster' SYNC")
 
 
 backup_id_counter = 0
@@ -94,7 +95,7 @@ def test_replicated_table():
     backup_name = new_backup_name()
     node0.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
-    node0.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+    node0.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
     node0.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
     node0.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' tbl")
 
@@ -130,7 +131,7 @@ def test_concurrent_backups_on_same_node():
     ) == TSV([["BACKUP_CREATED", ""]] * num_concurrent_backups)
 
     for backup_name in backup_names:
-        node0.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+        node0.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
         node0.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
         node0.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' tbl")
         for i in range(num_nodes):
@@ -165,7 +166,7 @@ def test_concurrent_backups_on_different_nodes():
         ) == TSV([["BACKUP_CREATED", ""]])
 
     for i in range(num_concurrent_backups):
-        nodes[i].query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+        nodes[i].query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
         nodes[i].query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_names[i]}")
         nodes[i].query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' tbl")
         for j in range(num_nodes):
@@ -213,7 +214,7 @@ def test_create_or_drop_tables_during_backup(db_engine, table_engine):
         while time.time() < end_time:
             table_name = f"mydb.tbl{randint(1, num_nodes)}"
             node = nodes[randint(0, num_nodes - 1)]
-            node.query(f"DROP TABLE IF EXISTS {table_name} NO DELAY")
+            node.query(f"DROP TABLE IF EXISTS {table_name} SYNC")
 
     def rename_tables():
         while time.time() < end_time:
@@ -228,7 +229,7 @@ def test_create_or_drop_tables_during_backup(db_engine, table_engine):
         while time.time() < end_time:
             table_name = f"mydb.tbl{randint(1, num_nodes)}"
             node = nodes[randint(0, num_nodes - 1)]
-            node.query(f"TRUNCATE TABLE IF EXISTS {table_name} NO DELAY")
+            node.query(f"TRUNCATE TABLE IF EXISTS {table_name} SYNC")
 
     def make_backups():
         ids = []
@@ -319,8 +320,8 @@ def test_kill_mutation_during_backup():
             TSV([["BACKUP_CREATED", ""]]),
         )
 
-        node0.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+        node0.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
         node0.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
 
         if n != repeat_count - 1:
-            node0.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
+            node0.query(f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
diff --git a/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py b/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py
index 43c8adda65a..d0ce2e03016 100644
--- a/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py
+++ b/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py
@@ -6,7 +6,6 @@ import concurrent
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import TSV, assert_eq_with_retry
 
-
 cluster = ClickHouseCluster(__file__)
 
 num_nodes = 10
@@ -50,6 +49,7 @@ def generate_cluster_def():
 
 
 main_configs = ["configs/disallow_concurrency.xml", generate_cluster_def()]
+# No [Zoo]Keeper retries for tests with concurrency
 user_configs = ["configs/allow_database_types.xml"]
 
 nodes = []
@@ -83,7 +83,7 @@ def drop_after_test():
         yield
     finally:
         node0.query(
-            "DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' NO DELAY",
+            "DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' SYNC",
             settings={
                 "distributed_ddl_task_timeout": 360,
             },
@@ -125,31 +125,40 @@ def test_concurrent_backups_on_same_node():
         .query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name} ASYNC")
         .split("\t")[0]
     )
-    assert_eq_with_retry(
-        nodes[0],
-        f"SELECT status FROM system.backups WHERE status == 'CREATING_BACKUP' AND id = '{id}'",
-        "CREATING_BACKUP",
+
+    status = (
+        nodes[0]
+        .query(f"SELECT status FROM system.backups WHERE id == '{id}'")
+        .rstrip("\n")
     )
-    assert "Concurrent backups not supported" in nodes[0].query_and_get_error(
+    assert status in ["CREATING_BACKUP", "BACKUP_CREATED"]
+
+    error = nodes[0].query_and_get_error(
         f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}"
     )
+    expected_errors = [
+        "Concurrent backups not supported",
+        f"Backup {backup_name} already exists",
+    ]
+    assert any([expected_error in error for expected_error in expected_errors])
 
     assert_eq_with_retry(
         nodes[0],
-        f"SELECT status FROM system.backups WHERE status == 'BACKUP_CREATED' AND id = '{id}'",
+        f"SELECT status FROM system.backups WHERE id = '{id}'",
         "BACKUP_CREATED",
+        sleep_time=2,
+        retry_count=50,
     )
 
     # This restore part is added to confirm creating an internal backup & restore work
     # even when a concurrent backup is stopped
     nodes[0].query(
-        f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY",
+        f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC",
         settings={
             "distributed_ddl_task_timeout": 360,
         },
     )
     nodes[0].query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
-    nodes[0].query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' tbl")
 
 
 def test_concurrent_backups_on_different_nodes():
@@ -162,18 +171,29 @@ def test_concurrent_backups_on_different_nodes():
         .query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name} ASYNC")
         .split("\t")[0]
     )
-    assert_eq_with_retry(
-        nodes[1],
-        f"SELECT status FROM system.backups WHERE status == 'CREATING_BACKUP' AND id = '{id}'",
-        "CREATING_BACKUP",
+
+    status = (
+        nodes[1]
+        .query(f"SELECT status FROM system.backups WHERE id == '{id}'")
+        .rstrip("\n")
     )
-    assert "Concurrent backups not supported" in nodes[0].query_and_get_error(
+    assert status in ["CREATING_BACKUP", "BACKUP_CREATED"]
+
+    error = nodes[0].query_and_get_error(
         f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}"
     )
+    expected_errors = [
+        "Concurrent backups not supported",
+        f"Backup {backup_name} already exists",
+    ]
+    assert any([expected_error in error for expected_error in expected_errors])
+
     assert_eq_with_retry(
         nodes[1],
-        f"SELECT status FROM system.backups WHERE status == 'BACKUP_CREATED' AND id = '{id}'",
+        f"SELECT status FROM system.backups WHERE id = '{id}'",
         "BACKUP_CREATED",
+        sleep_time=2,
+        retry_count=50,
     )
 
 
@@ -182,41 +202,43 @@ def test_concurrent_restores_on_same_node():
 
     backup_name = new_backup_name()
 
-    id = (
-        nodes[0]
-        .query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name} ASYNC")
-        .split("\t")[0]
-    )
-    assert_eq_with_retry(
-        nodes[0],
-        f"SELECT status FROM system.backups WHERE status == 'CREATING_BACKUP' AND id = '{id}'",
-        "CREATING_BACKUP",
-    )
-
-    assert_eq_with_retry(
-        nodes[0],
-        f"SELECT status FROM system.backups WHERE status == 'BACKUP_CREATED' AND id = '{id}'",
-        "BACKUP_CREATED",
-    )
+    nodes[0].query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
     nodes[0].query(
-        f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY",
+        f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC",
         settings={
             "distributed_ddl_task_timeout": 360,
         },
     )
+
     restore_id = (
         nodes[0]
         .query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name} ASYNC")
         .split("\t")[0]
     )
+
+    status = (
+        nodes[0]
+        .query(f"SELECT status FROM system.backups WHERE id == '{restore_id}'")
+        .rstrip("\n")
+    )
+    assert status in ["RESTORING", "RESTORED"]
+
+    error = nodes[0].query_and_get_error(
+        f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}"
+    )
+    expected_errors = [
+        "Concurrent restores not supported",
+        "Cannot restore the table default.tbl because it already contains some data",
+    ]
+    assert any([expected_error in error for expected_error in expected_errors])
+
     assert_eq_with_retry(
         nodes[0],
-        f"SELECT status FROM system.backups WHERE status == 'RESTORING' AND id == '{restore_id}'",
-        "RESTORING",
-    )
-    assert "Concurrent restores not supported" in nodes[0].query_and_get_error(
-        f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}"
+        f"SELECT status FROM system.backups WHERE id == '{restore_id}'",
+        "RESTORED",
+        sleep_time=2,
+        retry_count=50,
     )
 
 
@@ -225,45 +247,41 @@ def test_concurrent_restores_on_different_node():
 
     backup_name = new_backup_name()
 
-    id = (
-        nodes[0]
-        .query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name} ASYNC")
-        .split("\t")[0]
-    )
-    assert_eq_with_retry(
-        nodes[0],
-        f"SELECT status FROM system.backups WHERE status == 'CREATING_BACKUP' AND id = '{id}'",
-        "CREATING_BACKUP",
-    )
-
-    assert_eq_with_retry(
-        nodes[0],
-        f"SELECT status FROM system.backups WHERE status == 'BACKUP_CREATED' AND id = '{id}'",
-        "BACKUP_CREATED",
-    )
+    nodes[0].query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
     nodes[0].query(
-        f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY",
+        f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC",
         settings={
             "distributed_ddl_task_timeout": 360,
         },
     )
+
     restore_id = (
         nodes[0]
         .query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name} ASYNC")
         .split("\t")[0]
     )
-    assert_eq_with_retry(
-        nodes[0],
-        f"SELECT status FROM system.backups WHERE status == 'RESTORING'",
-        "RESTORING",
+
+    status = (
+        nodes[0]
+        .query(f"SELECT status FROM system.backups WHERE id == '{restore_id}'")
+        .rstrip("\n")
     )
-    assert "Concurrent restores not supported" in nodes[1].query_and_get_error(
+    assert status in ["RESTORING", "RESTORED"]
+
+    error = nodes[1].query_and_get_error(
         f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}"
     )
+    expected_errors = [
+        "Concurrent restores not supported",
+        "Cannot restore the table default.tbl because it already contains some data",
+    ]
+    assert any([expected_error in error for expected_error in expected_errors])
 
     assert_eq_with_retry(
         nodes[0],
-        f"SELECT status FROM system.backups WHERE status == 'RESTORED' AND id == '{restore_id}'",
+        f"SELECT status FROM system.backups WHERE id == '{restore_id}'",
         "RESTORED",
+        sleep_time=2,
+        retry_count=50,
     )
diff --git a/tests/integration/test_backup_restore_s3/configs/zookeeper_retries.xml b/tests/integration/test_backup_restore_s3/configs/zookeeper_retries.xml
new file mode 100644
index 00000000000..1283f28a8cb
--- /dev/null
+++ b/tests/integration/test_backup_restore_s3/configs/zookeeper_retries.xml
@@ -0,0 +1,11 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <backup_restore_keeper_max_retries>1000</backup_restore_keeper_max_retries>
+            <backup_restore_keeper_retry_initial_backoff_ms>1</backup_restore_keeper_retry_initial_backoff_ms>
+            <backup_restore_keeper_retry_max_backoff_ms>1</backup_restore_keeper_retry_max_backoff_ms>
+            <backup_restore_keeper_fault_injection_seed>42</backup_restore_keeper_fault_injection_seed>
+            <backup_restore_keeper_fault_injection_probability>0.002</backup_restore_keeper_fault_injection_probability>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/test_backup_restore_s3/test.py b/tests/integration/test_backup_restore_s3/test.py
index d5a7579df51..0285500d044 100644
--- a/tests/integration/test_backup_restore_s3/test.py
+++ b/tests/integration/test_backup_restore_s3/test.py
@@ -1,5 +1,8 @@
+from typing import Dict, Iterable
 import pytest
 from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
 
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
@@ -9,6 +12,9 @@ node = cluster.add_instance(
         "configs/named_collection_s3_backups.xml",
         "configs/s3_settings.xml",
     ],
+    user_configs=[
+        "configs/zookeeper_retries.xml",
+    ],
     with_minio=True,
 )
 
@@ -31,23 +37,116 @@ def new_backup_name():
     return f"backup{backup_id_counter}"
 
 
-def check_backup_and_restore(storage_policy, backup_destination, size=1000):
+def get_events(events_names: Iterable[str]) -> Dict[str, int]:
+    _events = TSV(
+        node.query(
+            f"SELECT event, value FROM system.events WHERE event in {events_names} SETTINGS system_events_show_zero_values = 1;"
+        )
+    )
+    return {
+        event: int(value)
+        for event, value in [line.split("\t") for line in _events.lines]
+    }
+
+
+def check_backup_and_restore(
+    storage_policy, backup_destination, size=1000, backup_name=None, check_events=False
+):
+    s3_backup_events = (
+        "WriteBufferFromS3Microseconds",
+        "WriteBufferFromS3Bytes",
+        "WriteBufferFromS3RequestsErrors",
+    )
+    s3_restore_events = (
+        "ReadBufferFromS3Microseconds",
+        "ReadBufferFromS3Bytes",
+        "ReadBufferFromS3RequestsErrors",
+    )
+
     node.query(
         f"""
-    DROP TABLE IF EXISTS data NO DELAY;
+    DROP TABLE IF EXISTS data SYNC;
     CREATE TABLE data (key Int, value String, array Array(String)) Engine=MergeTree() ORDER BY tuple() SETTINGS storage_policy='{storage_policy}';
     INSERT INTO data SELECT * FROM generateRandom('key Int, value String, array Array(String)') LIMIT {size};
-    BACKUP TABLE data TO {backup_destination};
-    RESTORE TABLE data AS data_restored FROM {backup_destination};
-    SELECT throwIf(
-        (SELECT count(), sum(sipHash64(*)) FROM data) !=
-        (SELECT count(), sum(sipHash64(*)) FROM data_restored),
-        'Data does not matched after BACKUP/RESTORE'
-    );
-    DROP TABLE data NO DELAY;
-    DROP TABLE data_restored NO DELAY;
+    OPTIMIZE TABLE data FINAL;
     """
     )
+    try:
+        events_before_backups = get_events(s3_backup_events)
+        node.query(f"BACKUP TABLE data TO {backup_destination}")
+        events_after_backups = get_events(s3_backup_events)
+        events_before_restore = get_events(s3_restore_events)
+        node.query(
+            f"""
+            RESTORE TABLE data AS data_restored FROM {backup_destination};
+            """
+        )
+        events_after_restore = get_events(s3_restore_events)
+        node.query(
+            """
+            SELECT throwIf(
+                (SELECT count(), sum(sipHash64(*)) FROM data) !=
+                (SELECT count(), sum(sipHash64(*)) FROM data_restored),
+                'Data does not matched after BACKUP/RESTORE'
+        );
+        """
+        )
+        if check_events and backup_name:
+            objects = node.cluster.minio_client.list_objects(
+                "root", f"data/backups/multipart/{backup_name}/"
+            )
+            backup_meta_size = 0
+            for obj in objects:
+                if ".backup" in obj.object_name:
+                    backup_meta_size = obj.size
+                    break
+            backup_total_size = int(
+                node.query(
+                    f"SELECT sum(total_size) FROM system.backups WHERE status = 'BACKUP_CREATED' AND name like '%{backup_name}%'"
+                ).strip()
+            )
+            restore_total_size = int(
+                node.query(
+                    f"SELECT sum(total_size) FROM system.backups WHERE status = 'RESTORED' AND name like '%{backup_name}%'"
+                ).strip()
+            )
+            # backup
+            # NOTE: ~35 bytes is used by .lock file, so set up 100 bytes to avoid flaky test
+            assert (
+                abs(
+                    backup_total_size
+                    - (
+                        events_after_backups["WriteBufferFromS3Bytes"]
+                        - events_before_backups["WriteBufferFromS3Bytes"]
+                        - backup_meta_size
+                    )
+                )
+                < 100
+            )
+            assert (
+                events_after_backups["WriteBufferFromS3Microseconds"]
+                > events_before_backups["WriteBufferFromS3Microseconds"]
+            )
+            assert events_after_backups["WriteBufferFromS3RequestsErrors"] == 0
+            # restore
+            assert (
+                events_after_restore["ReadBufferFromS3Bytes"]
+                - events_before_restore["ReadBufferFromS3Bytes"]
+                - backup_meta_size
+                == restore_total_size
+            )
+            assert (
+                events_after_restore["ReadBufferFromS3Microseconds"]
+                > events_before_restore["ReadBufferFromS3Microseconds"]
+            )
+            assert events_after_restore["ReadBufferFromS3RequestsErrors"] == 0
+    finally:
+        node.query(
+            """
+            DROP TABLE data SYNC;
+            DROP TABLE IF EXISTS data_restored SYNC;
+            """
+        )
 
 
 def check_system_tables():
@@ -125,7 +224,13 @@ def test_backup_to_s3_multipart():
     storage_policy = "default"
     backup_name = new_backup_name()
     backup_destination = f"S3('http://minio1:9001/root/data/backups/multipart/{backup_name}', 'minio', 'minio123')"
-    check_backup_and_restore(storage_policy, backup_destination, size=1000000)
+    check_backup_and_restore(
+        storage_policy,
+        backup_destination,
+        size=1000000,
+        backup_name=backup_name,
+        check_events=True,
+    )
     assert node.contains_in_log(
         f"copyDataToS3File: Multipart upload has completed. Bucket: root, Key: data/backups/multipart/{backup_name}"
     )
@@ -138,7 +243,8 @@ def test_backup_to_s3_native_copy():
         f"S3('http://minio1:9001/root/data/backups/{backup_name}', 'minio', 'minio123')"
     )
     check_backup_and_restore(storage_policy, backup_destination)
-    assert node.contains_in_log("using native copy")
+    assert node.contains_in_log("BackupWriterS3.*using native copy")
+    assert node.contains_in_log("BackupReaderS3.*using native copy")
     assert node.contains_in_log(
         f"copyS3File: Single operation copy has completed. Bucket: root, Key: data/backups/{backup_name}"
     )
@@ -151,7 +257,8 @@ def test_backup_to_s3_native_copy_other_bucket():
         f"S3('http://minio1:9001/root/data/backups/{backup_name}', 'minio', 'minio123')"
     )
     check_backup_and_restore(storage_policy, backup_destination)
-    assert node.contains_in_log("using native copy")
+    assert node.contains_in_log("BackupWriterS3.*using native copy")
+    assert node.contains_in_log("BackupReaderS3.*using native copy")
     assert node.contains_in_log(
         f"copyS3File: Single operation copy has completed. Bucket: root, Key: data/backups/{backup_name}"
     )
@@ -162,7 +269,35 @@ def test_backup_to_s3_native_copy_multipart():
     backup_name = new_backup_name()
     backup_destination = f"S3('http://minio1:9001/root/data/backups/multipart/{backup_name}', 'minio', 'minio123')"
     check_backup_and_restore(storage_policy, backup_destination, size=1000000)
-    assert node.contains_in_log("using native copy")
+    assert node.contains_in_log("BackupWriterS3.*using native copy")
+    assert node.contains_in_log("BackupReaderS3.*using native copy")
     assert node.contains_in_log(
         f"copyS3File: Multipart upload has completed. Bucket: root, Key: data/backups/multipart/{backup_name}/"
     )
+
+
+def test_incremental_backup_append_table_def():
+    backup_name = f"S3('http://minio1:9001/root/data/backups/{new_backup_name()}', 'minio', 'minio123')"
+
+    node.query(
+        "CREATE TABLE data (x UInt32, y String) Engine=MergeTree() ORDER BY y PARTITION BY x%10 SETTINGS storage_policy='policy_s3'"
+    )
+
+    node.query("INSERT INTO data SELECT number, toString(number) FROM numbers(100)")
+    assert node.query("SELECT count(), sum(x) FROM data") == "100\t4950\n"
+
+    node.query(f"BACKUP TABLE data TO {backup_name}")
+
+    node.query("ALTER TABLE data MODIFY SETTING parts_to_throw_insert=100")
+
+    incremental_backup_name = f"S3('http://minio1:9001/root/data/backups/{new_backup_name()}', 'minio', 'minio123')"
+
+    node.query(
+        f"BACKUP TABLE data TO {incremental_backup_name} SETTINGS base_backup = {backup_name}"
+    )
+
+    node.query("DROP TABLE data")
+    node.query(f"RESTORE TABLE data FROM {incremental_backup_name}")
+
+    assert node.query("SELECT count(), sum(x) FROM data") == "100\t4950\n"
+    assert "parts_to_throw_insert = 100" in node.query("SHOW CREATE TABLE data")
diff --git a/tests/integration/test_backup_with_other_granularity/test.py b/tests/integration/test_backup_with_other_granularity/test.py
deleted file mode 100644
index 2a82fc71951..00000000000
--- a/tests/integration/test_backup_with_other_granularity/test.py
+++ /dev/null
@@ -1,243 +0,0 @@
-import pytest
-
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-
-node1 = cluster.add_instance(
-    "node1",
-    with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="19.4.5.35",
-    stay_alive=True,
-    with_installed_binary=True,
-)
-node2 = cluster.add_instance(
-    "node2",
-    with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="19.4.5.35",
-    stay_alive=True,
-    with_installed_binary=True,
-)
-node3 = cluster.add_instance(
-    "node3",
-    with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="19.4.5.35",
-    stay_alive=True,
-    with_installed_binary=True,
-)
-node4 = cluster.add_instance("node4")
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    try:
-        cluster.start()
-
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def test_backup_from_old_version(started_cluster):
-    node1.query(
-        "CREATE TABLE source_table(A Int64, B String) Engine = MergeTree order by tuple()"
-    )
-
-    node1.query("INSERT INTO source_table VALUES(1, '1')")
-
-    assert node1.query("SELECT COUNT() FROM source_table") == "1\n"
-
-    node1.query("ALTER TABLE source_table ADD COLUMN Y String")
-
-    node1.query("ALTER TABLE source_table FREEZE PARTITION tuple();")
-
-    # We don't want to wait old outdated version to finish properly, just terminate it
-    node1.restart_with_latest_version(fix_metadata=True, signal=9)
-
-    node1.query(
-        "CREATE TABLE dest_table (A Int64,  B String,  Y String) ENGINE = ReplicatedMergeTree('/test/dest_table1', '1')  ORDER BY tuple()"
-    )
-
-    node1.query("INSERT INTO dest_table VALUES(2, '2', 'Hello')")
-
-    assert node1.query("SELECT COUNT() FROM dest_table") == "1\n"
-
-    node1.exec_in_container(
-        ["find", "/var/lib/clickhouse/shadow/1/data/default/source_table"]
-    )
-    node1.exec_in_container(
-        [
-            "cp",
-            "-r",
-            "/var/lib/clickhouse/shadow/1/data/default/source_table/all_1_1_0/",
-            "/var/lib/clickhouse/data/default/dest_table/detached",
-        ]
-    )
-
-    assert node1.query("SELECT COUNT() FROM dest_table") == "1\n"
-
-    node1.query("ALTER TABLE dest_table ATTACH PARTITION tuple()")
-
-    assert node1.query("SELECT sum(A) FROM dest_table") == "3\n"
-
-    node1.query("ALTER TABLE dest_table DETACH PARTITION tuple()")
-
-    node1.query("ALTER TABLE dest_table ATTACH PARTITION tuple()")
-
-    assert node1.query("SELECT sum(A) FROM dest_table") == "3\n"
-
-    assert node1.query("CHECK TABLE dest_table") == "1\n"
-
-    node1.query("DROP TABLE source_table")
-    node1.query("DROP TABLE dest_table")
-
-
-def test_backup_from_old_version_setting(started_cluster):
-    node2.query(
-        "CREATE TABLE source_table(A Int64, B String) Engine = MergeTree order by tuple()"
-    )
-
-    node2.query("INSERT INTO source_table VALUES(1, '1')")
-
-    assert node2.query("SELECT COUNT() FROM source_table") == "1\n"
-
-    node2.query("ALTER TABLE source_table ADD COLUMN Y String")
-
-    node2.query("ALTER TABLE source_table FREEZE PARTITION tuple();")
-
-    # We don't want to wait old outdated version to finish properly, just terminate it
-    node2.restart_with_latest_version(fix_metadata=True, signal=9)
-
-    node2.query(
-        "CREATE TABLE dest_table (A Int64,  B String,  Y String) ENGINE = ReplicatedMergeTree('/test/dest_table2', '1')  ORDER BY tuple() SETTINGS enable_mixed_granularity_parts = 1"
-    )
-
-    node2.query("INSERT INTO dest_table VALUES(2, '2', 'Hello')")
-
-    assert node2.query("SELECT COUNT() FROM dest_table") == "1\n"
-
-    node2.exec_in_container(
-        [
-            "cp",
-            "-r",
-            "/var/lib/clickhouse/shadow/1/data/default/source_table/all_1_1_0/",
-            "/var/lib/clickhouse/data/default/dest_table/detached",
-        ]
-    )
-
-    assert node2.query("SELECT COUNT() FROM dest_table") == "1\n"
-
-    node2.query("ALTER TABLE dest_table ATTACH PARTITION tuple()")
-
-    assert node2.query("SELECT sum(A) FROM dest_table") == "3\n"
-
-    node2.query("ALTER TABLE dest_table DETACH PARTITION tuple()")
-
-    node2.query("ALTER TABLE dest_table ATTACH PARTITION tuple()")
-
-    assert node2.query("SELECT sum(A) FROM dest_table") == "3\n"
-
-    assert node2.query("CHECK TABLE dest_table") == "1\n"
-
-    node2.query("DROP TABLE source_table")
-    node2.query("DROP TABLE dest_table")
-
-
-def test_backup_from_old_version_config(started_cluster):
-    node3.query(
-        "CREATE TABLE source_table(A Int64, B String) Engine = MergeTree order by tuple()"
-    )
-
-    node3.query("INSERT INTO source_table VALUES(1, '1')")
-
-    assert node3.query("SELECT COUNT() FROM source_table") == "1\n"
-
-    node3.query("ALTER TABLE source_table ADD COLUMN Y String")
-
-    node3.query("ALTER TABLE source_table FREEZE PARTITION tuple();")
-
-    def callback(n):
-        n.replace_config(
-            "/etc/clickhouse-server/merge_tree_settings.xml",
-            "<clickhouse><merge_tree><enable_mixed_granularity_parts>1</enable_mixed_granularity_parts></merge_tree></clickhouse>",
-        )
-
-    # We don't want to wait old outdated version to finish properly, just terminate it
-    node3.restart_with_latest_version(
-        callback_onstop=callback, fix_metadata=True, signal=9
-    )
-
-    node3.query(
-        "CREATE TABLE dest_table (A Int64,  B String,  Y String) ENGINE = ReplicatedMergeTree('/test/dest_table3', '1')  ORDER BY tuple() SETTINGS enable_mixed_granularity_parts = 1"
-    )
-
-    node3.query("INSERT INTO dest_table VALUES(2, '2', 'Hello')")
-
-    assert node3.query("SELECT COUNT() FROM dest_table") == "1\n"
-
-    node3.exec_in_container(
-        [
-            "cp",
-            "-r",
-            "/var/lib/clickhouse/shadow/1/data/default/source_table/all_1_1_0/",
-            "/var/lib/clickhouse/data/default/dest_table/detached",
-        ]
-    )
-
-    assert node3.query("SELECT COUNT() FROM dest_table") == "1\n"
-
-    node3.query("ALTER TABLE dest_table ATTACH PARTITION tuple()")
-
-    assert node3.query("SELECT sum(A) FROM dest_table") == "3\n"
-
-    node3.query("ALTER TABLE dest_table DETACH PARTITION tuple()")
-
-    node3.query("ALTER TABLE dest_table ATTACH PARTITION tuple()")
-
-    assert node3.query("SELECT sum(A) FROM dest_table") == "3\n"
-
-    assert node3.query("CHECK TABLE dest_table") == "1\n"
-
-    node3.query("DROP TABLE source_table")
-    node3.query("DROP TABLE dest_table")
-
-
-def test_backup_and_alter(started_cluster):
-    node4.query(
-        "CREATE DATABASE test ENGINE=Ordinary",
-        settings={"allow_deprecated_database_ordinary": 1},
-    )  # Different path in shadow/ with Atomic
-
-    node4.query(
-        "CREATE TABLE test.backup_table(A Int64, B String, C Date) Engine = MergeTree order by tuple()"
-    )
-
-    node4.query("INSERT INTO test.backup_table VALUES(2, '2', toDate('2019-10-01'))")
-
-    node4.query("ALTER TABLE test.backup_table FREEZE PARTITION tuple();")
-
-    node4.query("ALTER TABLE test.backup_table DROP COLUMN C")
-
-    node4.query("ALTER TABLE test.backup_table MODIFY COLUMN B UInt64")
-
-    node4.query("ALTER TABLE test.backup_table DROP PARTITION tuple()")
-
-    node4.exec_in_container(
-        [
-            "cp",
-            "-r",
-            "/var/lib/clickhouse/shadow/1/data/test/backup_table/all_1_1_0/",
-            "/var/lib/clickhouse/data/test/backup_table/detached",
-        ]
-    )
-
-    node4.query("ALTER TABLE test.backup_table ATTACH PARTITION tuple()")
-
-    assert node4.query("SELECT sum(A) FROM test.backup_table") == "2\n"
-    assert node4.query("SELECT B + 2 FROM test.backup_table") == "4\n"
-
-    node4.query("DROP TABLE test.backup_table")
-    node4.query("DROP DATABASE test")
diff --git a/tests/integration/test_backward_compatibility/configs/no_compress_marks.xml b/tests/integration/test_backward_compatibility/configs/no_compress_marks.xml
new file mode 100644
index 00000000000..cc968525bbb
--- /dev/null
+++ b/tests/integration/test_backward_compatibility/configs/no_compress_marks.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <merge_tree>
+        <compress_marks>0</compress_marks>
+        <compress_primary_key>0</compress_primary_key>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/integration/test_backward_compatibility/configs/wide_parts_only.xml b/tests/integration/test_backward_compatibility/configs/wide_parts_only.xml
index c823dd02d5a..e9cf053f1c5 100644
--- a/tests/integration/test_backward_compatibility/configs/wide_parts_only.xml
+++ b/tests/integration/test_backward_compatibility/configs/wide_parts_only.xml
@@ -1,7 +1,5 @@
 <clickhouse>
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-        <compress_marks>0</compress_marks>
-        <compress_primary_key>0</compress_primary_key>
-    </merge_tree>    
+    </merge_tree>
 </clickhouse>
diff --git a/tests/integration/test_backward_compatibility/test.py b/tests/integration/test_backward_compatibility/test.py
index 01ed02720f8..ea1d3ab9c07 100644
--- a/tests/integration/test_backward_compatibility/test.py
+++ b/tests/integration/test_backward_compatibility/test.py
@@ -12,7 +12,9 @@ node1 = cluster.add_instance(
     with_installed_binary=True,
 )
 node2 = cluster.add_instance(
-    "node2", main_configs=["configs/wide_parts_only.xml"], with_zookeeper=True
+    "node2",
+    main_configs=["configs/wide_parts_only.xml", "configs/no_compress_marks.xml"],
+    with_zookeeper=True,
 )
 
 
diff --git a/tests/integration/test_backward_compatibility/test_convert_ordinary.py b/tests/integration/test_backward_compatibility/test_convert_ordinary.py
index afc44c91fc4..8b1afd358eb 100644
--- a/tests/integration/test_backward_compatibility/test_convert_ordinary.py
+++ b/tests/integration/test_backward_compatibility/test_convert_ordinary.py
@@ -188,7 +188,18 @@ def check_convert_all_dbs_to_atomic():
     node.exec_in_container(
         ["bash", "-c", f"touch /var/lib/clickhouse/flags/convert_ordinary_to_atomic"]
     )
-    node.restart_clickhouse()
+    node.stop_clickhouse()
+    cannot_start = False
+    try:
+        node.start_clickhouse()
+    except:
+        cannot_start = True
+    assert cannot_start
+
+    node.exec_in_container(
+        ["bash", "-c", f"rm /var/lib/clickhouse/flags/convert_ordinary_to_atomic"]
+    )
+    node.start_clickhouse()
 
     assert "Ordinary\n" == node.query(
         "SELECT engine FROM system.databases where name='ordinary'"
diff --git a/tests/integration/test_backward_compatibility/test_detach_part_wrong_partition_id.py b/tests/integration/test_backward_compatibility/test_detach_part_wrong_partition_id.py
deleted file mode 100644
index 02fccfae4e5..00000000000
--- a/tests/integration/test_backward_compatibility/test_detach_part_wrong_partition_id.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import pytest
-
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-# Version 21.6.3.14 has incompatible partition id for tables with UUID in partition key.
-node_21_6 = cluster.add_instance(
-    "node_21_6",
-    image="yandex/clickhouse-server",
-    tag="21.6.3.14",
-    stay_alive=True,
-    with_installed_binary=True,
-)
-
-
-@pytest.fixture(scope="module")
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-def test_detach_part_wrong_partition_id(start_cluster):
-
-    # Here we create table with partition by UUID.
-    node_21_6.query(
-        "create table tab (id UUID, value UInt32) engine = MergeTree PARTITION BY (id) order by tuple()"
-    )
-    node_21_6.query(
-        "insert into tab values ('61f0c404-5cb3-11e7-907b-a6006ad3dba0', 2)"
-    )
-
-    # After restart, partition id will be different.
-    # There is a single 0-level part, which will become broken.
-    # We expect that it will not be removed (as usual for 0-level broken parts),
-    # but moved to /detached
-    node_21_6.restart_with_latest_version()
-
-    num_detached = node_21_6.query("select count() from  system.detached_parts")
-    assert num_detached == "1\n"
-
-    node_21_6.restart_with_original_version()
-
-    node_21_6.query("drop table tab SYNC")
diff --git a/tests/integration/test_backward_compatibility/test_in_memory_parts_still_read.py b/tests/integration/test_backward_compatibility/test_in_memory_parts_still_read.py
new file mode 100644
index 00000000000..d55f155918e
--- /dev/null
+++ b/tests/integration/test_backward_compatibility/test_in_memory_parts_still_read.py
@@ -0,0 +1,44 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+
+cluster = ClickHouseCluster(__file__)
+
+# Version 23.4 is the latest version to support writing in-memory parts.
+node = cluster.add_instance(
+    "node_old",
+    image="clickhouse/clickhouse-server",
+    tag="23.4",
+    stay_alive=True,
+    with_installed_binary=True,
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_in_memory_parts_still_read(start_cluster):
+    node.query(
+        "CREATE TABLE t (x UInt64, s String, a Array(Tuple(Map(String, LowCardinality(String)), Date32, DateTime64(3)))) ENGINE = MergeTree ORDER BY s SETTINGS min_rows_for_compact_part = 1000000, min_bytes_for_compact_part = '1G', in_memory_parts_enable_wal = 1"
+    )
+    node.query("INSERT INTO t SELECT * FROM generateRandom() LIMIT 100")
+
+    assert node.query("SELECT count() FROM t WHERE NOT ignore(*)") == "100\n"
+
+    node.restart_with_latest_version()
+    assert node.query("SELECT count() FROM t WHERE NOT ignore(*)") == "100\n"
+
+    node.query("INSERT INTO t SELECT * FROM generateRandom() LIMIT 100")
+
+    assert node.query("SELECT count() FROM t WHERE NOT ignore(*)") == "200\n"
+
+    node.restart_with_original_version()
+    assert node.query("SELECT count() FROM t WHERE NOT ignore(*)") == "200\n"
diff --git a/tests/integration/test_backward_compatibility/test_vertical_merges_from_compact_parts.py b/tests/integration/test_backward_compatibility/test_vertical_merges_from_compact_parts.py
index 1781ed7c976..3d006caad0d 100644
--- a/tests/integration/test_backward_compatibility/test_vertical_merges_from_compact_parts.py
+++ b/tests/integration/test_backward_compatibility/test_vertical_merges_from_compact_parts.py
@@ -14,6 +14,7 @@ node_old = cluster.add_instance(
 )
 node_new = cluster.add_instance(
     "node2",
+    main_configs=["configs/no_compress_marks.xml"],
     with_zookeeper=True,
     stay_alive=True,
 )
@@ -29,7 +30,7 @@ def start_cluster():
         cluster.shutdown()
 
 
-def test_vertical_merges_from_comapact_parts(start_cluster):
+def test_vertical_merges_from_compact_parts(start_cluster):
     for i, node in enumerate([node_old, node_new]):
         node.query(
             """
@@ -41,7 +42,7 @@ def test_vertical_merges_from_comapact_parts(start_cluster):
                 vertical_merge_algorithm_min_rows_to_activate = 1,
                 vertical_merge_algorithm_min_columns_to_activate = 1,
                 min_bytes_for_wide_part = 0,
-                min_rows_for_wide_part = 100;
+                min_rows_for_wide_part = 100
         """.format(
                 i
             )
@@ -104,8 +105,16 @@ def test_vertical_merges_from_comapact_parts(start_cluster):
     node_old.query("SYSTEM FLUSH LOGS")
 
     assert not (
-        node_old.contains_in_log("CHECKSUM_DOESNT_MATCH")
-        or node_new.contains_in_log("CHECKSUM_DOESNT_MATCH")
+        # Now the old node is restarted as a new, and its config allows compressed indices, and it merged the data into compressed indices,
+        # that's why the error about different number of compressed files is expected and ok.
+        (
+            node_old.contains_in_log("CHECKSUM_DOESNT_MATCH")
+            and not node_old.contains_in_log("Different number of files")
+        )
+        or (
+            node_new.contains_in_log("CHECKSUM_DOESNT_MATCH")
+            and not node_new.contains_in_log("Different number of files")
+        )
     )
 
     assert node_new.query(check_query.format("all_0_3_3")) == "Vertical\tWide\n"
diff --git a/tests/integration/test_catboost_evaluate/test.py b/tests/integration/test_catboost_evaluate/test.py
index a0915977ab6..7412d34dd40 100644
--- a/tests/integration/test_catboost_evaluate/test.py
+++ b/tests/integration/test_catboost_evaluate/test.py
@@ -279,7 +279,7 @@ def testAmazonModelManyRows(ch_cluster):
     )
 
     result = instance.query(
-        "insert into amazon select number % 256, number, number, number, number, number, number, number, number, number from numbers(7500)"
+        "insert into amazon select number % 256, number, number, number, number, number, number, number, number, number from numbers(750000)"
     )
 
     # First compute prediction, then as a very crude way to fingerprint and compare the result: sum and floor
@@ -288,7 +288,7 @@ def testAmazonModelManyRows(ch_cluster):
         "SELECT floor(sum(catboostEvaluate('/etc/clickhouse-server/model/amazon_model.bin', RESOURCE, MGR_ID, ROLE_ROLLUP_1, ROLE_ROLLUP_2, ROLE_DEPTNAME, ROLE_TITLE, ROLE_FAMILY_DESC, ROLE_FAMILY, ROLE_CODE))) FROM amazon"
     )
 
-    expected = "5834\n"
+    expected = "583092\n"
     assert result == expected
 
     result = instance.query("drop table if exists amazon")
diff --git a/tests/integration/test_cluster_copier/test_three_nodes.py b/tests/integration/test_cluster_copier/test_three_nodes.py
index 31d6c0448f4..e7d07757adb 100644
--- a/tests/integration/test_cluster_copier/test_three_nodes.py
+++ b/tests/integration/test_cluster_copier/test_three_nodes.py
@@ -19,7 +19,6 @@ cluster = ClickHouseCluster(__file__)
 def started_cluster():
     global cluster
     try:
-
         for name in ["first", "second", "third"]:
             cluster.add_instance(
                 name,
diff --git a/tests/integration/test_cluster_copier/test_two_nodes.py b/tests/integration/test_cluster_copier/test_two_nodes.py
index 10ab7d03b00..2b6fcf6cac2 100644
--- a/tests/integration/test_cluster_copier/test_two_nodes.py
+++ b/tests/integration/test_cluster_copier/test_two_nodes.py
@@ -19,7 +19,6 @@ cluster = ClickHouseCluster(__file__)
 def started_cluster():
     global cluster
     try:
-
         for name in ["first_of_two", "second_of_two"]:
             instance = cluster.add_instance(
                 name,
diff --git a/tests/integration/test_cluster_discovery/test.py b/tests/integration/test_cluster_discovery/test.py
index 4dd892553c4..ad3deb5b142 100644
--- a/tests/integration/test_cluster_discovery/test.py
+++ b/tests/integration/test_cluster_discovery/test.py
@@ -95,6 +95,33 @@ def test_cluster_discovery_startup_and_stop(start_cluster):
         [nodes["node0"], nodes["node2"], nodes["node_observer"]], total_shards
     )
 
+    # test ON CLUSTER query
+    nodes["node0"].query(
+        "CREATE TABLE tbl ON CLUSTER 'test_auto_cluster' (x UInt64) ENGINE = MergeTree ORDER BY x"
+    )
+    nodes["node0"].query("INSERT INTO tbl VALUES (1)")
+    nodes["node1"].query("INSERT INTO tbl VALUES (2)")
+
+    assert (
+        int(
+            nodes["node_observer"]
+            .query(
+                "SELECT sum(x) FROM clusterAllReplicas(test_auto_cluster, default.tbl)"
+            )
+            .strip()
+        )
+        == 3
+    )
+
+    # Query SYSTEM DROP DNS CACHE may reload cluster configuration
+    # check that it does not affect cluster discovery
+    nodes["node1"].query("SYSTEM DROP DNS CACHE")
+    nodes["node0"].query("SYSTEM DROP DNS CACHE")
+
+    check_shard_num(
+        [nodes["node0"], nodes["node2"], nodes["node_observer"]], total_shards
+    )
+
     nodes["node1"].stop_clickhouse(kill=True)
     check_nodes_count(
         [nodes["node0"], nodes["node2"], nodes["node_observer"]], total_nodes - 1
diff --git a/tests/integration/test_composable_protocols/test.py b/tests/integration/test_composable_protocols/test.py
index bc87fea5296..df74cfffa54 100644
--- a/tests/integration/test_composable_protocols/test.py
+++ b/tests/integration/test_composable_protocols/test.py
@@ -63,7 +63,6 @@ def netcat(hostname, port, content):
 
 
 def test_connections():
-
     client = Client(server.ip_address, 9000, command=cluster.client_bin_path)
     assert client.query("SELECT 1") == "1\n"
 
diff --git a/tests/integration/test_concurrent_backups_s3/test.py b/tests/integration/test_concurrent_backups_s3/test.py
index 73692e52cce..b29058865c0 100644
--- a/tests/integration/test_concurrent_backups_s3/test.py
+++ b/tests/integration/test_concurrent_backups_s3/test.py
@@ -25,7 +25,7 @@ def start_cluster():
 
 
 def test_concurrent_backups(start_cluster):
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
     columns = [f"column_{i} UInt64" for i in range(1000)]
     columns_str = ", ".join(columns)
     node.query(
diff --git a/tests/integration/test_create_query_constraints/configs/users.xml b/tests/integration/test_create_query_constraints/configs/users.xml
index 8556e73c82f..1c5f4d5a21f 100644
--- a/tests/integration/test_create_query_constraints/configs/users.xml
+++ b/tests/integration/test_create_query_constraints/configs/users.xml
@@ -4,7 +4,7 @@
             <password></password>
             <profile>default</profile>
             <quota>default</quota>
-            <show_named_collections>1</show_named_collections>
+            <named_collection_control>1</named_collection_control>
             <show_named_collections_secrets>1</show_named_collections_secrets>
         </default>
     </users>
diff --git a/tests/integration/test_create_query_constraints/test.py b/tests/integration/test_create_query_constraints/test.py
index 8df043fd24b..33c41b4f161 100644
--- a/tests/integration/test_create_query_constraints/test.py
+++ b/tests/integration/test_create_query_constraints/test.py
@@ -25,7 +25,6 @@ def start_cluster():
 
 
 def test_create_query_const_constraints():
-
     instance.query("CREATE USER u_const SETTINGS max_threads = 1 CONST")
     instance.query("GRANT ALL ON *.* TO u_const")
 
@@ -57,7 +56,6 @@ def test_create_query_const_constraints():
 
 
 def test_create_query_minmax_constraints():
-
     instance.query("CREATE USER u_minmax SETTINGS max_threads = 4 MIN 2 MAX 6")
     instance.query("GRANT ALL ON *.* TO u_minmax")
 
diff --git a/tests/integration/test_default_compression_codec/test.py b/tests/integration/test_default_compression_codec/test.py
index 5d033ac8f7e..c7c30f5eea4 100644
--- a/tests/integration/test_default_compression_codec/test.py
+++ b/tests/integration/test_default_compression_codec/test.py
@@ -262,6 +262,8 @@ def test_default_codec_multiple(start_cluster):
         )
     )
 
+    node2.query("SYSTEM SYNC REPLICA compression_table_multiple", timeout=15)
+
     # Same codec for all
     assert (
         get_compression_codec_byte(node1, "compression_table_multiple", "1_0_0_0")
@@ -330,6 +332,8 @@ def test_default_codec_multiple(start_cluster):
 
     node1.query("OPTIMIZE TABLE compression_table_multiple FINAL")
 
+    node2.query("SYSTEM SYNC REPLICA compression_table_multiple", timeout=15)
+
     assert (
         get_compression_codec_byte(node1, "compression_table_multiple", "1_0_0_1")
         == CODECS_MAPPING["Multiple"]
diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/common.py b/tests/integration/test_dictionaries_all_layouts_separate_sources/common.py
index b38e81b0227..01addae2542 100644
--- a/tests/integration/test_dictionaries_all_layouts_separate_sources/common.py
+++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/common.py
@@ -348,7 +348,6 @@ class RangedLayoutTester(BaseLayoutTester):
         self.layouts = LAYOUTS_RANGED
 
     def execute(self, layout_name, node):
-
         if layout_name not in self.layout_to_dictionary:
             raise RuntimeError("Source doesn't support layout: {}".format(layout_name))
 
diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/ssl_verification.xml b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/ssl_verification.xml
new file mode 100644
index 00000000000..3efe98e7045
--- /dev/null
+++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/ssl_verification.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <openSSL>
+        <client>
+            <!-- For self-signed certificate -->
+            <verificationMode>none</verificationMode>
+        </client>
+    </openSSL>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mongo.py b/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mongo.py
index 55639877ba0..973dbfc0429 100644
--- a/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mongo.py
+++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mongo.py
@@ -17,14 +17,71 @@ ranged_tester = None
 test_name = "mongo"
 
 
-def setup_module(module):
-    global cluster
-    global node
-    global simple_tester
-    global complex_tester
-    global ranged_tester
+@pytest.fixture(scope="module")
+def secure_connection(request):
+    return request.param
 
-    cluster = ClickHouseCluster(__file__)
+
+@pytest.fixture(scope="module")
+def cluster(secure_connection):
+    return ClickHouseCluster(__file__)
+
+
+@pytest.fixture(scope="module")
+def source(secure_connection, cluster):
+    return SourceMongo(
+        "MongoDB",
+        "localhost",
+        cluster.mongo_port,
+        cluster.mongo_host,
+        "27017",
+        "root",
+        "clickhouse",
+        secure=secure_connection,
+    )
+
+
+@pytest.fixture(scope="module")
+def simple_tester(source):
+    tester = SimpleLayoutTester(test_name)
+    tester.cleanup()
+    tester.create_dictionaries(source)
+    return tester
+
+
+@pytest.fixture(scope="module")
+def complex_tester(source):
+    tester = ComplexLayoutTester(test_name)
+    tester.create_dictionaries(source)
+    return tester
+
+
+@pytest.fixture(scope="module")
+def ranged_tester(source):
+    tester = RangedLayoutTester(test_name)
+    tester.create_dictionaries(source)
+    return tester
+
+
+@pytest.fixture(scope="module")
+def main_config(secure_connection):
+    main_config = []
+    if secure_connection:
+        main_config.append(os.path.join("configs", "disable_ssl_verification.xml"))
+    else:
+        main_config.append(os.path.join("configs", "ssl_verification.xml"))
+    return main_config
+
+
+@pytest.fixture(scope="module")
+def started_cluster(
+    secure_connection,
+    cluster,
+    main_config,
+    simple_tester,
+    ranged_tester,
+    complex_tester,
+):
     SOURCE = SourceMongo(
         "MongoDB",
         "localhost",
@@ -33,35 +90,18 @@ def setup_module(module):
         "27017",
         "root",
         "clickhouse",
+        secure=secure_connection,
     )
-
-    simple_tester = SimpleLayoutTester(test_name)
-    simple_tester.cleanup()
-    simple_tester.create_dictionaries(SOURCE)
-
-    complex_tester = ComplexLayoutTester(test_name)
-    complex_tester.create_dictionaries(SOURCE)
-
-    ranged_tester = RangedLayoutTester(test_name)
-    ranged_tester.create_dictionaries(SOURCE)
-    # Since that all .xml configs were created
-
-    main_configs = []
-    main_configs.append(os.path.join("configs", "disable_ssl_verification.xml"))
-
     dictionaries = simple_tester.list_dictionaries()
 
     node = cluster.add_instance(
-        "node", main_configs=main_configs, dictionaries=dictionaries, with_mongo=True
+        "node",
+        main_configs=main_config,
+        dictionaries=dictionaries,
+        with_mongo=True,
+        with_mongo_secure=secure_connection,
     )
 
-
-def teardown_module(module):
-    simple_tester.cleanup()
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
     try:
         cluster.start()
 
@@ -75,16 +115,25 @@ def started_cluster():
         cluster.shutdown()
 
 
+@pytest.mark.parametrize("secure_connection", [False], indirect=["secure_connection"])
 @pytest.mark.parametrize("layout_name", sorted(LAYOUTS_SIMPLE))
-def test_simple(started_cluster, layout_name):
-    simple_tester.execute(layout_name, node)
+def test_simple(secure_connection, started_cluster, layout_name, simple_tester):
+    simple_tester.execute(layout_name, started_cluster.instances["node"])
 
 
+@pytest.mark.parametrize("secure_connection", [False], indirect=["secure_connection"])
 @pytest.mark.parametrize("layout_name", sorted(LAYOUTS_COMPLEX))
-def test_complex(started_cluster, layout_name):
-    complex_tester.execute(layout_name, node)
+def test_complex(secure_connection, started_cluster, layout_name, complex_tester):
+    complex_tester.execute(layout_name, started_cluster.instances["node"])
 
 
+@pytest.mark.parametrize("secure_connection", [False], indirect=["secure_connection"])
 @pytest.mark.parametrize("layout_name", sorted(LAYOUTS_RANGED))
-def test_ranged(started_cluster, layout_name):
-    ranged_tester.execute(layout_name, node)
+def test_ranged(secure_connection, started_cluster, layout_name, ranged_tester):
+    ranged_tester.execute(layout_name, started_cluster.instances["node"])
+
+
+@pytest.mark.parametrize("secure_connection", [True], indirect=["secure_connection"])
+@pytest.mark.parametrize("layout_name", sorted(LAYOUTS_SIMPLE))
+def test_simple_ssl(secure_connection, started_cluster, layout_name, simple_tester):
+    simple_tester.execute(layout_name, started_cluster.instances["node"])
diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mongo_uri.py b/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mongo_uri.py
index 84c547b7a6b..22541432259 100644
--- a/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mongo_uri.py
+++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mongo_uri.py
@@ -8,25 +8,22 @@ from helpers.cluster import ClickHouseCluster
 from helpers.dictionary import Field, Row, Dictionary, DictionaryStructure, Layout
 from helpers.external_sources import SourceMongoURI
 
-SOURCE = None
-cluster = None
-node = None
-simple_tester = None
-complex_tester = None
-ranged_tester = None
 test_name = "mongo_uri"
 
 
-def setup_module(module):
-    global cluster
-    global node
-    global simple_tester
-    global complex_tester
-    global ranged_tester
+@pytest.fixture(scope="module")
+def secure_connection(request):
+    return request.param
 
-    cluster = ClickHouseCluster(__file__)
 
-    SOURCE = SourceMongoURI(
+@pytest.fixture(scope="module")
+def cluster(secure_connection):
+    return ClickHouseCluster(__file__)
+
+
+@pytest.fixture(scope="module")
+def source(secure_connection, cluster):
+    return SourceMongoURI(
         "MongoDB",
         "localhost",
         cluster.mongo_port,
@@ -34,52 +31,55 @@ def setup_module(module):
         "27017",
         "root",
         "clickhouse",
+        secure=secure_connection,
     )
 
-    simple_tester = SimpleLayoutTester(test_name)
-    simple_tester.cleanup()
-    simple_tester.create_dictionaries(SOURCE)
 
-    complex_tester = ComplexLayoutTester(test_name)
-    complex_tester.create_dictionaries(SOURCE)
+@pytest.fixture(scope="module")
+def simple_tester(source):
+    tester = SimpleLayoutTester(test_name)
+    tester.cleanup()
+    tester.create_dictionaries(source)
+    return tester
 
-    ranged_tester = RangedLayoutTester(test_name)
-    ranged_tester.create_dictionaries(SOURCE)
-    # Since that all .xml configs were created
 
-    main_configs = []
-    main_configs.append(os.path.join("configs", "disable_ssl_verification.xml"))
+@pytest.fixture(scope="module")
+def main_config(secure_connection):
+    main_config = []
+    if secure_connection:
+        main_config.append(os.path.join("configs", "disable_ssl_verification.xml"))
+    else:
+        main_config.append(os.path.join("configs", "ssl_verification.xml"))
+    return main_config
 
+
+@pytest.fixture(scope="module")
+def started_cluster(secure_connection, cluster, main_config, simple_tester):
     dictionaries = simple_tester.list_dictionaries()
 
     node = cluster.add_instance(
         "uri_node",
-        main_configs=main_configs,
+        main_configs=main_config,
         dictionaries=dictionaries,
         with_mongo=True,
+        with_mongo_secure=secure_connection,
     )
-
-
-def teardown_module(module):
-    simple_tester.cleanup()
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
     try:
         cluster.start()
-
         simple_tester.prepare(cluster)
-        complex_tester.prepare(cluster)
-        ranged_tester.prepare(cluster)
-
         yield cluster
-
     finally:
         cluster.shutdown()
 
 
 # See comment in SourceMongoURI
+@pytest.mark.parametrize("secure_connection", [False], indirect=["secure_connection"])
 @pytest.mark.parametrize("layout_name", ["flat"])
-def test_simple(started_cluster, layout_name):
-    simple_tester.execute(layout_name, node)
+def test_simple(secure_connection, started_cluster, simple_tester, layout_name):
+    simple_tester.execute(layout_name, started_cluster.instances["uri_node"])
+
+
+@pytest.mark.parametrize("secure_connection", [True], indirect=["secure_connection"])
+@pytest.mark.parametrize("layout_name", ["flat"])
+def test_simple_ssl(secure_connection, started_cluster, simple_tester, layout_name):
+    simple_tester.execute(layout_name, started_cluster.instances["uri_node"])
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.xml b/tests/integration/test_dictionaries_ddl/configs/client.xml
similarity index 52%
rename from tests/integration/test_merge_tree_s3_restore/configs/config.xml
rename to tests/integration/test_dictionaries_ddl/configs/client.xml
index feb537ebbce..15d83a7b1ab 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/client.xml
@@ -1,18 +1,10 @@
 <clickhouse>
-    <tcp_port>9000</tcp_port>
-    <listen_host>127.0.0.1</listen_host>
-
     <openSSL>
         <client>
-            <cacheSessions>true</cacheSessions>
             <verificationMode>none</verificationMode>
             <invalidCertificateHandler>
                 <name>AcceptCertificateHandler</name>
             </invalidCertificateHandler>
         </client>
     </openSSL>
-
-    <max_concurrent_queries>500</max_concurrent_queries>
-    <path>./clickhouse/</path>
-    <users_config>users.xml</users_config>
 </clickhouse>
diff --git a/tests/integration/test_dictionaries_ddl/configs/named_coll.xml b/tests/integration/test_dictionaries_ddl/configs/named_coll.xml
new file mode 100644
index 00000000000..ba450ae014f
--- /dev/null
+++ b/tests/integration/test_dictionaries_ddl/configs/named_coll.xml
@@ -0,0 +1,29 @@
+<clickhouse>
+    <named_collections>
+        <nc_secure_0>
+            <host>localhost</host>
+            <user>default</user>
+            <port>9440</port>
+            <secure>0</secure>
+        </nc_secure_0>
+        <nc_secure_1>
+            <host>localhost</host>
+            <user>default</user>
+            <port>9440</port>
+            <secure>1</secure>
+        </nc_secure_1>
+        <nc_no_secure>
+            <host>localhost</host>
+            <user>default</user>
+            <port>9440</port>
+        </nc_no_secure>
+        <click1>
+            <host>localhost</host>
+            <port>9000</port>
+            <db>test</db>
+            <username>default</username>
+            <password></password>
+            <query>select id, SomeValue1 from test.xml_dictionary_table</query>
+        </click1>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_ddl/configs/server.crt b/tests/integration/test_dictionaries_ddl/configs/server.crt
new file mode 100644
index 00000000000..6f4deca038f
--- /dev/null
+++ b/tests/integration/test_dictionaries_ddl/configs/server.crt
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC+zCCAeOgAwIBAgIJAIhI9ozZJ+TWMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAeFw0xOTA0MjIwNDMyNTJaFw0yMDA0MjEwNDMyNTJaMBQx
+EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAK+wVUEdqF2uXvN0MJBgnAHyXi6JTi4p/F6igsrCjSNjJWzHH0vQmK8ujfcF
+CkifW88i+W5eHctuEtQqNHK+t9x9YiZtXrj6m/XkOXs20mYgENSmbbbHbriTPnZB
+zZrq6UqMlwIHNNAa+I3NMORQxVRaI0ybXnGVO5elr70xHpk03xL0JWKHpEqYp4db
+2aBQgF6y3Ww4khxjIYqpUYXWXGFnVIRU7FKVEAM1xyKqvQzXjQ5sVM/wyHknveEF
+3b/X4ggN+KNl5KOc0cWDh1/XaatJAPaUUPqZcq76tynLbP64Xm3dxHcj+gtRkO67
+ef6MSg6l63m3XQP6Qb+MIkd06OsCAwEAAaNQME4wHQYDVR0OBBYEFDmODTO8QLDN
+ykR3x0LIOnjNhrKhMB8GA1UdIwQYMBaAFDmODTO8QLDNykR3x0LIOnjNhrKhMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAwaiJc7uqEpnH3aukbftDwX
+m8GfEnj1HVdgg+9GGNq+9rvUYBF6gdPmjRCX9dO0cclLFx8jc2org0rTSq9WoOhX
+E6qL4Eqrmc5SE3Y9jZM0h6GRD4oXK014FmtZ3T6ddZU3dQLj3BS2r1XrvmubTvGN
+ZuTJNY8nx8Hh6H5XINmsEjUF9E5hog+PwCE03xt2adIdYL+gsbxASeNYyeUFpZv5
+zcXR3VoakBWnAaOVgCHq2qh96QAnL7ZKzFkGf/MdwV10KU3dmb+ICbQUUdf9Gc17
+aaDCIRws312F433FdXBkGs2UkB7ZZme9dfn6O1QbeTNvex2VLMqYx/CTkfFbOQA=
+-----END CERTIFICATE-----
diff --git a/tests/integration/test_dictionaries_ddl/configs/server.key b/tests/integration/test_dictionaries_ddl/configs/server.key
new file mode 100644
index 00000000000..6eddb3295db
--- /dev/null
+++ b/tests/integration/test_dictionaries_ddl/configs/server.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvsFVBHahdrl7z
+dDCQYJwB8l4uiU4uKfxeooLKwo0jYyVsxx9L0JivLo33BQpIn1vPIvluXh3LbhLU
+KjRyvrfcfWImbV64+pv15Dl7NtJmIBDUpm22x264kz52Qc2a6ulKjJcCBzTQGviN
+zTDkUMVUWiNMm15xlTuXpa+9MR6ZNN8S9CVih6RKmKeHW9mgUIBest1sOJIcYyGK
+qVGF1lxhZ1SEVOxSlRADNcciqr0M140ObFTP8Mh5J73hBd2/1+IIDfijZeSjnNHF
+g4df12mrSQD2lFD6mXKu+rcpy2z+uF5t3cR3I/oLUZDuu3n+jEoOpet5t10D+kG/
+jCJHdOjrAgMBAAECggEARF66zrxb6RkSmmt8+rKeA6PuQu3sHsr4C1vyyjUr97l9
+tvdGlpp20LWtSZQMjHZ3pARYTTsTHTeY3DgQcRcHNicVKx8k3ZepWeeW9vw+pL+V
+zSt3RsoVrH6gsCSrfr4sS3aqzX9AbjwQvh48CJ3mLQ1m70kHV+xbZIh1+4pB/hyP
+1wKyUE18ZkOptXvO/TtoHzLQCecpkXtWzmry1Eh2isvXA+NMrAtLibGsyM1mtm7i
+5ozevzHabvvCDBEe+KgZdONgVhhhvm2eOd+/s4w3rw4ETud4fI/ZAJyWXhiIKFnA
+VJbElWruSAoVBW7p2bsF5PbmVzvo8vXL+VylxYD+AQKBgQDhLoRKTVhNkn/QjKxq
+sdOh+QZra0LzjVpAmkQzu7wZMSHEz9qePQciDQQrYKrmRF1vNcIRCVUTqWYheJ/1
+lKRrCGa0ab6k96zkWMqLHD5u+UeJV7r1dJIx08ME9kNJ+x/XtB8klRIji16NiQUS
+qc6p8z0M2AnbJzsRfWZRH8FeYwKBgQDHu8dzdtVGI7MtxfPOE/bfajiopDg8BdTC
+pdug2T8XofRHRq7Q+0vYjTAZFT/slib91Pk6VvvPdo9VBZiL4omv4dAq6mOOdX/c
+U14mJe1X5GCrr8ExZ8BfNJ3t/6sV1fcxyJwAw7iBguqxA2JqdM/wFk10K8XqvzVn
+CD6O9yGt2QKBgFX1BMi8N538809vs41S7l9hCQNOQZNo/O+2M5yv6ECRkbtoQKKw
+1x03bMUGNJaLuELweXE5Z8GGo5bZTe5X3F+DKHlr+DtO1C+ieUaa9HY2MAmMdLCn
+2/qrREGLo+oEs4YKmuzC/taUp/ZNPKOAMISNdluFyFVg51pozPrgrVbTAoGBAKkE
+LBl3O67o0t0vH8sJdeVFG8EJhlS0koBMnfgVHqC++dm+5HwPyvTrNQJkyv1HaqNt
+r6FArkG3ED9gRuBIyT6+lctbIPgSUip9mbQqcBfqOCvQxGksZMur2ODncz09HLtS
+CUFUXjOqNzOnq4ZuZu/Bz7U4vXiSaXxQq6+LTUKxAoGAFZU/qrI06XxnrE9A1X0W
+l7DSkpZaDcu11NrZ473yONih/xOZNh4SSBpX8a7F6Pmh9BdtGqphML8NFPvQKcfP
+b9H2iid2tc292uyrUEb5uTMmv61zoTwtitqLzO0+tS6PT3fXobX+eyeEWKzPBljL
+HFtxG5CCXpkdnWRmaJnhTzA=
+-----END PRIVATE KEY-----
diff --git a/tests/integration/test_dictionaries_ddl/configs/ssl_conf.xml b/tests/integration/test_dictionaries_ddl/configs/ssl_conf.xml
new file mode 100644
index 00000000000..e1b06aeb44b
--- /dev/null
+++ b/tests/integration/test_dictionaries_ddl/configs/ssl_conf.xml
@@ -0,0 +1,16 @@
+<clickhouse>
+    <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
+    <openSSL>
+        <server> <!-- Used for https server AND secure tcp port -->
+            <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
+            <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/config.d/server.key</privateKeyFile>
+            <verificationMode>none</verificationMode>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+    </openSSL>
+    <tcp_port_secure>9440</tcp_port_secure>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_ddl/test.py b/tests/integration/test_dictionaries_ddl/test.py
index cb70deef72b..7dda6fc245a 100644
--- a/tests/integration/test_dictionaries_ddl/test.py
+++ b/tests/integration/test_dictionaries_ddl/test.py
@@ -15,6 +15,13 @@ node1 = cluster.add_instance(
     "node1",
     with_mysql=True,
     dictionaries=["configs/dictionaries/simple_dictionary.xml"],
+    main_configs=[
+        "configs/ssl_conf.xml",
+        "configs/client.xml",
+        "configs/named_coll.xml",
+        "configs/server.crt",
+        "configs/server.key",
+    ],
     user_configs=["configs/user_admin.xml", "configs/user_default.xml"],
 )
 node2 = cluster.add_instance(
@@ -463,3 +470,144 @@ def test_clickhouse_remote(started_cluster):
     node3.query(
         "select dictGetUInt8('test.clickhouse_remote', 'SomeValue1', toUInt64(17))"
     ) == "17\n"
+
+
+# https://github.com/ClickHouse/ClickHouse/issues/38450
+#  suggests placing 'secure' in named_collections
+def test_secure(started_cluster):
+    node1.query("DROP TABLE IF EXISTS test.foo_dict")
+    node1.query("CREATE TABLE test.foo_dict(`id` UInt64, `value` String) ENGINE = Log")
+    node1.query("INSERT INTO test.foo_dict values (1, 'value1')")
+
+    # No named collection, secure is set in DDL
+    node1.query("DROP DICTIONARY IF EXISTS test.clickhouse_secure")
+    node1.query(
+        """
+        CREATE DICTIONARY test.clickhouse_secure(
+            id UInt64,
+            value String
+        )
+        PRIMARY KEY id
+        LAYOUT(FLAT())
+        SOURCE(CLICKHOUSE(
+            HOST 'localhost'
+            PORT 9440 USER 'default'
+            TABLE 'foo_dict' DB 'test'
+            SECURE 1
+            ))
+        LIFETIME(MIN 1 MAX 10)
+            """
+    )
+    value = node1.query(
+        "SELECT dictGet('test.clickhouse_secure', 'value', toUInt64(1))"
+    )
+    assert value == "value1\n"
+
+    # Secure set in named collection
+    node1.query("DROP DICTIONARY IF EXISTS test.clickhouse_secure")
+    node1.query(
+        """
+        CREATE DICTIONARY test.clickhouse_secure(
+            id UInt64,
+            value String
+        )
+        PRIMARY KEY id
+        LAYOUT(FLAT())
+        SOURCE(CLICKHOUSE(
+            NAME 'nc_secure_1'
+            TABLE 'foo_dict' DB 'test'
+            ))
+        LIFETIME(MIN 1 MAX 10)
+            """
+    )
+    value = node1.query(
+        "SELECT dictGet('test.clickhouse_secure', 'value', toUInt64(1))"
+    )
+    assert value == "value1\n"
+
+    # Secure is not set
+    node1.query("DROP DICTIONARY IF EXISTS test.clickhouse_secure")
+    node1.query(
+        """
+        CREATE DICTIONARY test.clickhouse_secure(
+            id UInt64,
+            value String
+        )
+        PRIMARY KEY id
+        LAYOUT(FLAT())
+        SOURCE(CLICKHOUSE(
+            NAME 'nc_no_secure'
+            TABLE 'foo_dict' DB 'test'
+            ))
+        LIFETIME(MIN 1 MAX 10)
+            """
+    )
+    with pytest.raises(QueryRuntimeException) as excinfo:
+        node1.query("SELECT dictGet('test.clickhouse_secure', 'value', toUInt64(1))")
+    assert "Unexpected packet from server localhost:9440" in str(excinfo.value)
+
+    # Secure is set to 0 in named collection
+    node1.query("DROP DICTIONARY IF EXISTS test.clickhouse_secure")
+    node1.query(
+        """
+        CREATE DICTIONARY test.clickhouse_secure(
+            id UInt64,
+            value String
+        )
+        PRIMARY KEY id
+        LAYOUT(FLAT())
+        SOURCE(CLICKHOUSE(
+            NAME 'nc_secure_0'
+            TABLE 'foo_dict' DB 'test'
+            ))
+        LIFETIME(MIN 1 MAX 10)
+            """
+    )
+    with pytest.raises(QueryRuntimeException) as excinfo:
+        node1.query("SELECT dictGet('test.clickhouse_secure', 'value', toUInt64(1))")
+    assert "Unexpected packet from server localhost:9440" in str(excinfo.value)
+
+    # Secure is set to 0 in named collection and in 1 in DDL
+    node1.query("DROP DICTIONARY IF EXISTS test.clickhouse_secure")
+    node1.query(
+        """
+        CREATE DICTIONARY test.clickhouse_secure(
+            id UInt64,
+            value String
+        )
+        PRIMARY KEY id
+        LAYOUT(FLAT())
+        SOURCE(CLICKHOUSE(
+            NAME 'nc_secure_0'
+            TABLE 'foo_dict' DB 'test'
+            SECURE 1
+            ))
+        LIFETIME(MIN 1 MAX 10)
+            """
+    )
+    value = node1.query(
+        "SELECT dictGet('test.clickhouse_secure', 'value', toUInt64(1))"
+    )
+    assert value == "value1\n"
+
+    node1.query("DROP DICTIONARY test.clickhouse_secure")
+    node1.query("DROP TABLE test.foo_dict")
+
+
+def test_named_collection(started_cluster):
+    node1.query(
+        """
+        CREATE DICTIONARY test.clickhouse_named_collection(
+            id UInt64,
+            SomeValue1 UInt8
+        )
+        PRIMARY KEY id
+        LAYOUT(FLAT())
+        SOURCE(CLICKHOUSE(NAME click1))
+        LIFETIME(MIN 1 MAX 10)
+        """
+    )
+
+    node1.query(
+        "select dictGetUInt8('test.clickhouse_named_collection', 'SomeValue1', toUInt64(23))"
+    ) == "0\n"
diff --git a/tests/integration/test_dictionaries_dependency/test.py b/tests/integration/test_dictionaries_dependency/test.py
index 2042db69fa2..d262738af60 100644
--- a/tests/integration/test_dictionaries_dependency/test.py
+++ b/tests/integration/test_dictionaries_dependency/test.py
@@ -154,3 +154,64 @@ def test_dependency_via_dictionary_database(node):
         node.query(f"DROP DICTIONARY IF EXISTS {d_name} SYNC")
     node.query("DROP DATABASE dict_db SYNC")
     node.restart_clickhouse()
+
+
+@pytest.mark.parametrize("node", nodes)
+def test_dependent_dict_table_distr(node):
+    query = node.query
+    query("CREATE DATABASE test_db;")
+    query(
+        "CREATE TABLE test_db.test(id UInt32,data UInt32,key1 UInt8,key2 UInt8) ENGINE=MergeTree  ORDER BY id;"
+    )
+    query(
+        "INSERT INTO test_db.test SELECT  abs(rand32())%100, rand32()%1000, abs(rand32())%1, abs(rand32())%1  FROM numbers(100);"
+    )
+    query(
+        "CREATE TABLE test_db.dictback (key1 UInt8,key2 UInt8, value UInt8) ENGINE=MergeTree  ORDER BY key1;"
+    )
+    query("INSERT INTO test_db.dictback VALUES (0,0,0);")
+
+    query(
+        "CREATE DICTIONARY test_db.mdict (key1 UInt8,key2 UInt8, value UInt8) PRIMARY KEY key1,key2"
+        " SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() DB 'test_db' TABLE 'dictback'))"
+        " LIFETIME(MIN 100 MAX 100)  LAYOUT(COMPLEX_KEY_CACHE(SIZE_IN_CELLS 1000));"
+    )
+
+    query(
+        "CREATE TABLE test_db.distr (id UInt32, data UInt32, key1 UInt8, key2 UInt8)"
+        " ENGINE = Distributed('test_shard_localhost', test_db, test, dictGetOrDefault('test_db.mdict','value',(key1,key2),0));"
+    )
+
+    # Tables should load in the correct order.
+    node.restart_clickhouse()
+
+    query("DETACH TABLE test_db.distr;")
+    query("ATTACH TABLE test_db.distr;")
+
+    node.restart_clickhouse()
+
+    query("DROP DATABASE IF EXISTS test_db;")
+
+
+def test_no_lazy_load():
+    node2.query("create database no_lazy")
+    node2.query(
+        "create table no_lazy.src (n int, m int) engine=MergeTree order by n partition by n % 100"
+    )
+    node2.query("insert into no_lazy.src select number, number from numbers(0, 99)")
+    node2.query("insert into no_lazy.src select number, number from numbers(100, 99)")
+    node2.query(
+        "create dictionary no_lazy.dict (n int, mm int) primary key n "
+        "source(clickhouse(query 'select n, m + sleepEachRow(0.1) as mm from no_lazy.src')) "
+        "lifetime(min 0 max 0) layout(complex_key_hashed_array(shards 10))"
+    )
+
+    node2.restart_clickhouse()
+
+    assert "42\n" == node2.query("select dictGet('no_lazy.dict', 'mm', 42)")
+
+    assert "some tables depend on it" in node2.query_and_get_error(
+        "drop table no_lazy.src", settings={"check_referential_table_dependencies": 1}
+    )
+
+    node2.query("drop database no_lazy")
diff --git a/tests/integration/test_dictionaries_mysql/test.py b/tests/integration/test_dictionaries_mysql/test.py
index 5c67a4c434a..a12139a0bea 100644
--- a/tests/integration/test_dictionaries_mysql/test.py
+++ b/tests/integration/test_dictionaries_mysql/test.py
@@ -309,6 +309,19 @@ def test_predefined_connection_configuration(started_cluster):
     result = instance.query("SELECT dictGetUInt32(dict, 'value', toUInt64(100))")
     assert int(result) == 200
 
+    instance.query(
+        """
+    DROP DICTIONARY IF EXISTS dict;
+    CREATE DICTIONARY dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(MYSQL(NAME mysql4 connection_pool_size 1 close_connection 1 share_connection 1))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    """
+    )
+    result = instance.query("SELECT dictGetUInt32(dict, 'value', toUInt64(100))")
+    assert int(result) == 200
+
 
 def create_mysql_db(mysql_connection, name):
     with mysql_connection.cursor() as cursor:
diff --git a/tests/integration/test_disk_configuration/test.py b/tests/integration/test_disk_configuration/test.py
index 34f8bea219f..3fe8286fa43 100644
--- a/tests/integration/test_disk_configuration/test.py
+++ b/tests/integration/test_disk_configuration/test.py
@@ -294,6 +294,65 @@ def test_merge_tree_custom_disk_setting(start_cluster):
         ).strip()
     )
 
+    node1.query(f"DROP TABLE {TABLE_NAME} SYNC")
+    node1.query(f"DROP TABLE {TABLE_NAME}_2 SYNC")
+    node1.query(f"DROP TABLE {TABLE_NAME}_3 SYNC")
+    node1.query(f"DROP TABLE {TABLE_NAME}_4 SYNC")
+    node2.query(f"DROP TABLE {TABLE_NAME}_4 SYNC")
+
+
+def test_merge_tree_nested_custom_disk_setting(start_cluster):
+    node = cluster.instances["node1"]
+
+    minio = cluster.minio_client
+    for obj in list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)):
+        minio.remove_object(cluster.minio_bucket, obj.object_name)
+    assert (
+        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        == 0
+    )
+
+    node.query(
+        f"""
+        DROP TABLE IF EXISTS {TABLE_NAME} SYNC;
+        CREATE TABLE {TABLE_NAME} (a Int32)
+        ENGINE = MergeTree() order by tuple()
+        SETTINGS disk = disk(
+                type=cache,
+                max_size='1Gi',
+                path='/var/lib/clickhouse/custom_disk_cache/',
+                disk=disk(
+                    type=s3,
+                    endpoint='http://minio1:9001/root/data/',
+                    access_key_id='minio',
+                    secret_access_key='minio123'));
+    """
+    )
+
+    node.query(f"INSERT INTO {TABLE_NAME} SELECT number FROM numbers(100)")
+    node.query("SYSTEM DROP FILESYSTEM CACHE")
+
+    # Check cache is filled
+    assert 0 == int(node.query("SELECT count() FROM system.filesystem_cache"))
+    assert 100 == int(node.query(f"SELECT count() FROM {TABLE_NAME}"))
+    node.query(f"SELECT * FROM {TABLE_NAME}")
+    assert 0 < int(node.query("SELECT count() FROM system.filesystem_cache"))
+
+    # Check s3 is filled
+    assert (
+        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True))) > 0
+    )
+
+    node.restart_clickhouse()
+
+    assert 100 == int(node.query(f"SELECT count() FROM {TABLE_NAME}"))
+
+    expected = """
+        SETTINGS disk = disk(type = cache, max_size = \\'[HIDDEN]\\', path = \\'[HIDDEN]\\', disk = disk(type = s3, endpoint = \\'[HIDDEN]\\'
+    """
+    assert expected.strip() in node.query(f"SHOW CREATE TABLE {TABLE_NAME}").strip()
+    node.query(f"DROP TABLE {TABLE_NAME} SYNC")
+
 
 def test_merge_tree_setting_override(start_cluster):
     node = cluster.instances["node3"]
@@ -331,7 +390,7 @@ def test_merge_tree_setting_override(start_cluster):
 
     node.query(
         f"""
-        DROP TABLE IF EXISTS {TABLE_NAME} NO DELAY;
+        DROP TABLE IF EXISTS {TABLE_NAME} SYNC;
         CREATE TABLE {TABLE_NAME} (a Int32)
         ENGINE = MergeTree()
         ORDER BY tuple()
@@ -353,7 +412,7 @@ def test_merge_tree_setting_override(start_cluster):
 
     node.query(
         f"""
-        DROP TABLE IF EXISTS {TABLE_NAME} NO DELAY;
+        DROP TABLE IF EXISTS {TABLE_NAME} SYNC;
         CREATE TABLE {TABLE_NAME} (a Int32)
         ENGINE = MergeTree()
         ORDER BY tuple()
@@ -367,3 +426,4 @@ def test_merge_tree_setting_override(start_cluster):
     assert (
         len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True))) > 0
     )
+    node.query(f"DROP TABLE {TABLE_NAME} SYNC")
diff --git a/tests/integration/test_disk_over_web_server/test.py b/tests/integration/test_disk_over_web_server/test.py
index 363df4595b2..fd71389f71a 100644
--- a/tests/integration/test_disk_over_web_server/test.py
+++ b/tests/integration/test_disk_over_web_server/test.py
@@ -21,23 +21,31 @@ def cluster():
         cluster.add_instance(
             "node3", main_configs=["configs/storage_conf_web.xml"], with_nginx=True
         )
+
+        cluster.add_instance(
+            "node4",
+            main_configs=["configs/storage_conf.xml"],
+            with_nginx=True,
+            stay_alive=True,
+            with_installed_binary=True,
+            image="clickhouse/clickhouse-server",
+            tag="22.8.14.53",
+        )
+
         cluster.start()
 
-        node1 = cluster.instances["node1"]
-        expected = ""
-        global uuids
-        for i in range(3):
-            node1.query(
+        def create_table_and_upload_data(node, i):
+            node.query(
                 f"CREATE TABLE data{i} (id Int32) ENGINE = MergeTree() ORDER BY id SETTINGS storage_policy = 'def', min_bytes_for_wide_part=1;"
             )
 
             for _ in range(10):
-                node1.query(
+                node.query(
                     f"INSERT INTO data{i} SELECT number FROM numbers(500000 * {i+1})"
                 )
-            expected = node1.query(f"SELECT * FROM data{i} ORDER BY id")
+            node.query(f"SELECT * FROM data{i} ORDER BY id")
 
-            metadata_path = node1.query(
+            metadata_path = node.query(
                 f"SELECT data_paths FROM system.tables WHERE name='data{i}'"
             )
             metadata_path = metadata_path[
@@ -45,7 +53,7 @@ def cluster():
             ]
             print(f"Metadata: {metadata_path}")
 
-            node1.exec_in_container(
+            node.exec_in_container(
                 [
                     "bash",
                     "-c",
@@ -56,8 +64,20 @@ def cluster():
                 user="root",
             )
             parts = metadata_path.split("/")
-            uuids.append(parts[3])
             print(f"UUID: {parts[3]}")
+            return parts[3]
+
+        node1 = cluster.instances["node1"]
+
+        global uuids
+        for i in range(2):
+            uuid = create_table_and_upload_data(node1, i)
+            uuids.append(uuid)
+
+        node4 = cluster.instances["node4"]
+
+        uuid = create_table_and_upload_data(node4, 2)
+        uuids.append(uuid)
 
         yield cluster
 
@@ -68,6 +88,7 @@ def cluster():
 @pytest.mark.parametrize("node_name", ["node2"])
 def test_usage(cluster, node_name):
     node1 = cluster.instances["node1"]
+    node4 = cluster.instances["node4"]
     node2 = cluster.instances[node_name]
     global uuids
     assert len(uuids) == 3
@@ -90,7 +111,11 @@ def test_usage(cluster, node_name):
         result = node2.query(
             "SELECT id FROM test{} WHERE id % 56 = 3 ORDER BY id".format(i)
         )
-        assert result == node1.query(
+        node = node1
+        if i == 2:
+            node = node4
+
+        assert result == node.query(
             "SELECT id FROM data{} WHERE id % 56 = 3 ORDER BY id".format(i)
         )
 
@@ -99,7 +124,7 @@ def test_usage(cluster, node_name):
                 i
             )
         )
-        assert result == node1.query(
+        assert result == node.query(
             "SELECT id FROM data{} WHERE id > 789999 AND id < 999999 ORDER BY id".format(
                 i
             )
@@ -141,6 +166,7 @@ def test_incorrect_usage(cluster):
 @pytest.mark.parametrize("node_name", ["node2"])
 def test_cache(cluster, node_name):
     node1 = cluster.instances["node1"]
+    node4 = cluster.instances["node4"]
     node2 = cluster.instances[node_name]
     global uuids
     assert len(uuids) == 3
@@ -178,7 +204,12 @@ def test_cache(cluster, node_name):
         result = node2.query(
             "SELECT id FROM test{} WHERE id % 56 = 3 ORDER BY id".format(i)
         )
-        assert result == node1.query(
+
+        node = node1
+        if i == 2:
+            node = node4
+
+        assert result == node.query(
             "SELECT id FROM data{} WHERE id % 56 = 3 ORDER BY id".format(i)
         )
 
@@ -187,7 +218,7 @@ def test_cache(cluster, node_name):
                 i
             )
         )
-        assert result == node1.query(
+        assert result == node.query(
             "SELECT id FROM data{} WHERE id > 789999 AND id < 999999 ORDER BY id".format(
                 i
             )
diff --git a/tests/integration/test_disks_app_func/test.py b/tests/integration/test_disks_app_func/test.py
index 027ef8feed0..2428c53854e 100644
--- a/tests/integration/test_disks_app_func/test.py
+++ b/tests/integration/test_disks_app_func/test.py
@@ -7,7 +7,6 @@ import pytest
 def started_cluster():
     global cluster
     try:
-
         cluster = ClickHouseCluster(__file__)
         cluster.add_instance(
             "disks_app_test", main_configs=["config.xml"], with_minio=True
diff --git a/tests/integration/test_distributed_ddl/configs/config.d/clusters.xml b/tests/integration/test_distributed_ddl/configs/config.d/clusters.xml
index b353f88f4cd..159d578bb9d 100644
--- a/tests/integration/test_distributed_ddl/configs/config.d/clusters.xml
+++ b/tests/integration/test_distributed_ddl/configs/config.d/clusters.xml
@@ -89,5 +89,16 @@
         </shard>
     </cluster_no_replicas>
 
+    <!-- Cluster with disabled distributed DDL queries -->
+    <cluster_disabled_ddl>
+        <allow_distributed_ddl_queries>false</allow_distributed_ddl_queries>
+        <shard>
+            <replica>
+                <host>ch1</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </cluster_disabled_ddl>
+
 </remote_servers>
-</clickhouse>
\ No newline at end of file
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl/configs_secure/config.d/clusters.xml b/tests/integration/test_distributed_ddl/configs_secure/config.d/clusters.xml
index 6c462ea6087..e5ec8161e00 100644
--- a/tests/integration/test_distributed_ddl/configs_secure/config.d/clusters.xml
+++ b/tests/integration/test_distributed_ddl/configs_secure/config.d/clusters.xml
@@ -102,5 +102,16 @@
         </shard>
     </cluster_no_replicas>
 
+    <!-- Cluster with disabled distributed DDL queries -->
+    <cluster_disabled_ddl>
+        <allow_distributed_ddl_queries>false</allow_distributed_ddl_queries>
+        <shard>
+            <replica>
+                <host>ch1</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </cluster_disabled_ddl>
+
 </remote_servers>
 </clickhouse>
diff --git a/tests/integration/test_distributed_ddl/test.py b/tests/integration/test_distributed_ddl/test.py
index 8c2caf59a35..7cee60a7f35 100755
--- a/tests/integration/test_distributed_ddl/test.py
+++ b/tests/integration/test_distributed_ddl/test.py
@@ -585,6 +585,17 @@ def test_replicated_without_arguments(test_cluster):
     test_cluster.pm_random_drops.push_rules(rules)
 
 
+def test_disabled_distributed_ddl(test_cluster):
+    instance = test_cluster.instances["ch1"]
+
+    assert (
+        "Distributed DDL queries are prohibited for the cluster"
+        in instance.query_and_get_error(
+            "CREATE DATABASE IF NOT EXISTS test ON CLUSTER 'cluster_disabled_ddl'"
+        )
+    )
+
+
 if __name__ == "__main__":
     with contextmanager(test_cluster)() as ctx_cluster:
         for name, instance in list(ctx_cluster.instances.items()):
diff --git a/tests/integration/test_distributed_ddl_parallel/test.py b/tests/integration/test_distributed_ddl_parallel/test.py
index 6ebfe472e09..eb98dd3e230 100644
--- a/tests/integration/test_distributed_ddl_parallel/test.py
+++ b/tests/integration/test_distributed_ddl_parallel/test.py
@@ -10,6 +10,7 @@ from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
 
+
 # By default the exceptions that was throwed in threads will be ignored
 # (they will not mark the test as failed, only printed to stderr).
 #
diff --git a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_1.xml b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_1.xml
index 397e05e7a60..a79ce3de1fc 100644
--- a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_1.xml
+++ b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_1.xml
@@ -3,8 +3,6 @@
         <default>
             <!-- always send via network -->
             <prefer_localhost_replica>0</prefer_localhost_replica>
-            <!-- enable batching to check splitting -->
-            <distributed_directory_monitor_batch_inserts>1</distributed_directory_monitor_batch_inserts>
             <!-- override defaults just in case they will be changed -->
             <distributed_directory_monitor_split_batch_on_failure>1</distributed_directory_monitor_split_batch_on_failure>
             <!-- wait for explicit flush -->
diff --git a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_2.xml b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_2.xml
index 2ffd5beaf8d..8279fcdbe6d 100644
--- a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_2.xml
+++ b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_2.xml
@@ -3,8 +3,6 @@
         <default>
             <!-- always send via network -->
             <prefer_localhost_replica>0</prefer_localhost_replica>
-            <!-- enable batching to check splitting -->
-            <distributed_directory_monitor_batch_inserts>1</distributed_directory_monitor_batch_inserts>
             <!-- disable -->
             <distributed_directory_monitor_split_batch_on_failure>0</distributed_directory_monitor_split_batch_on_failure>
             <!-- wait for explicit flush -->
diff --git a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/test.py b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/test.py
index a47268b06fd..faa38af6533 100644
--- a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/test.py
+++ b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/test.py
@@ -18,61 +18,86 @@ node2 = cluster.add_instance(
 )
 
 
+def get_test_settings():
+    settings = {"monitor_batch_inserts": [0, 1]}
+    return [(k, v) for k, values in settings.items() for v in values]
+
+
+def drop_tables():
+    tables = ["null_", "dist", "data", "mv", "dist_data"]
+    query = "\n".join([f"drop table if exists {table};" for table in tables])
+    for _, node in cluster.instances.items():
+        node.query(query)
+
+
+def create_tables(**dist_settings):
+    drop_tables()
+    _settings_values = ",".join([f"{k}={v}" for k, v in dist_settings.items()])
+    _settings = f"settings {_settings_values}" if _settings_values else ""
+    for _, node in cluster.instances.items():
+        node.query(
+            f"""
+                create table null_ (key Int, value Int) engine=Null();
+                create table dist as null_ engine=Distributed(test_cluster, currentDatabase(), null_, key) {_settings};
+                create table data (key Int, uniq_values Int) engine=Memory();
+                create materialized view mv to data as select key, uniqExact(value) uniq_values from null_ group by key;
+                system stop distributed sends dist;
+
+                create table dist_data as data engine=Distributed(test_cluster, currentDatabase(), data);
+                """
+        )
+
+
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
         cluster.start()
-
-        for _, node in cluster.instances.items():
-            node.query(
-                """
-            create table null_ (key Int, value Int) engine=Null();
-            create table dist as null_ engine=Distributed(test_cluster, currentDatabase(), null_, key);
-            create table data (key Int, uniq_values Int) engine=Memory();
-            create materialized view mv to data as select key, uniqExact(value) uniq_values from null_ group by key;
-            system stop distributed sends dist;
-
-            create table dist_data as data engine=Distributed(test_cluster, currentDatabase(), data);
-            """
-            )
-
         yield cluster
     finally:
+        drop_tables()
         cluster.shutdown()
 
 
 def test_distributed_directory_monitor_split_batch_on_failure_OFF(started_cluster):
-    for i in range(0, 100):
-        limit = 100e3
-        node2.query(
-            f"insert into dist select number/100, number from system.numbers limit {limit} offset {limit*i}",
-            settings={
-                # max_memory_usage is the limit for the batch on the remote node
-                # (local query should not be affected since 30MB is enough for 100K rows)
-                "max_memory_usage": "30Mi",
-                "max_untracked_memory": "0",
-            },
-        )
-    # "Received from" is mandatory, since the exception should be thrown on the remote node.
-    with pytest.raises(
-        QueryRuntimeException,
-        match=r"DB::Exception: Received from.*Memory limit \(for query\) exceeded: .*while pushing to view default\.mv",
-    ):
+    for setting, setting_value in get_test_settings():
+        create_tables(**{setting: setting_value})
+        for i in range(0, 100):
+            limit = 100e3
+            node2.query(
+                f"insert into dist select number/100, number from system.numbers limit {limit} offset {limit*i}",
+                settings={
+                    # max_memory_usage is the limit for the batch on the remote node
+                    # (local query should not be affected since 30MB is enough for 100K rows)
+                    "max_memory_usage": "30Mi",
+                    "max_untracked_memory": "0",
+                },
+            )
+        # "Received from" is mandatory, since the exception should be thrown on the remote node.
+        if setting == "monitor_batch_inserts" and setting_value == 1:
+            with pytest.raises(
+                QueryRuntimeException,
+                match=r"DB::Exception: Received from.*Memory limit \(for query\) exceeded: .*while pushing to view default\.mv",
+            ):
+                node2.query("system flush distributed dist")
+            assert int(node2.query("select count() from dist_data")) == 0
+            continue
         node2.query("system flush distributed dist")
-    assert int(node2.query("select count() from dist_data")) == 0
+        assert int(node2.query("select count() from dist_data")) == 100000
 
 
 def test_distributed_directory_monitor_split_batch_on_failure_ON(started_cluster):
-    for i in range(0, 100):
-        limit = 100e3
-        node1.query(
-            f"insert into dist select number/100, number from system.numbers limit {limit} offset {limit*i}",
-            settings={
-                # max_memory_usage is the limit for the batch on the remote node
-                # (local query should not be affected since 30MB is enough for 100K rows)
-                "max_memory_usage": "30Mi",
-                "max_untracked_memory": "0",
-            },
-        )
-    node1.query("system flush distributed dist")
-    assert int(node1.query("select count() from dist_data")) == 100000
+    for setting, setting_value in get_test_settings():
+        create_tables(**{setting: setting_value})
+        for i in range(0, 100):
+            limit = 100e3
+            node1.query(
+                f"insert into dist select number/100, number from system.numbers limit {limit} offset {limit*i}",
+                settings={
+                    # max_memory_usage is the limit for the batch on the remote node
+                    # (local query should not be affected since 30MB is enough for 100K rows)
+                    "max_memory_usage": "30Mi",
+                    "max_untracked_memory": "0",
+                },
+            )
+        node1.query("system flush distributed dist")
+        assert int(node1.query("select count() from dist_data")) == 100000
diff --git a/tests/integration/test_distributed_inter_server_secret/configs/remote_servers.xml b/tests/integration/test_distributed_inter_server_secret/configs/remote_servers.xml
index f5888a974f1..163850c6f2d 100644
--- a/tests/integration/test_distributed_inter_server_secret/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_inter_server_secret/configs/remote_servers.xml
@@ -24,5 +24,17 @@
                 <priority>1</priority>
             </node>
         </secure>
+
+        <secure_backward>
+            <secret>foo_backward</secret>
+            <node>
+                <host>n1</host>
+                <port>9000</port>
+            </node>
+            <node>
+                <host>backward</host>
+                <port>9000</port>
+            </node>
+        </secure_backward>
     </remote_servers>
 </clickhouse>
diff --git a/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_backward.xml b/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_backward.xml
new file mode 100644
index 00000000000..3636b402145
--- /dev/null
+++ b/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_backward.xml
@@ -0,0 +1,15 @@
+<clickhouse>
+    <remote_servers>
+        <secure_disagree>
+            <secret>backward</secret>
+            <node>
+                <host>n1</host>
+                <port>9000</port>
+            </node>
+            <node>
+                <host>backward</host>
+                <port>9000</port>
+            </node>
+        </secure_disagree>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_distributed_inter_server_secret/test.py b/tests/integration/test_distributed_inter_server_secret/test.py
index 4f1c4b9b749..6dd25789f36 100644
--- a/tests/integration/test_distributed_inter_server_secret/test.py
+++ b/tests/integration/test_distributed_inter_server_secret/test.py
@@ -12,18 +12,28 @@ from helpers.cluster import ClickHouseCluster
 cluster = ClickHouseCluster(__file__)
 
 
-def make_instance(name, cfg):
+def make_instance(name, cfg, *args, **kwargs):
     return cluster.add_instance(
         name,
         with_zookeeper=True,
         main_configs=["configs/remote_servers.xml", cfg],
         user_configs=["configs/users.xml"],
+        *args,
+        **kwargs,
     )
 
 
 # _n1/_n2 contains cluster with different <secret> -- should fail
 n1 = make_instance("n1", "configs/remote_servers_n1.xml")
 n2 = make_instance("n2", "configs/remote_servers_n2.xml")
+backward = make_instance(
+    "backward",
+    "configs/remote_servers_backward.xml",
+    image="clickhouse/clickhouse-server",
+    # version without DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2
+    tag="23.2.3",
+    with_installed_binary=True,
+)
 
 users = pytest.mark.parametrize(
     "user,password",
@@ -54,6 +64,12 @@ def bootstrap():
         Engine=Distributed(secure, currentDatabase(), data, key)
         """
         )
+        n.query(
+            """
+        CREATE TABLE dist_secure_backward AS data
+        Engine=Distributed(secure_backward, currentDatabase(), data, key)
+        """
+        )
         n.query(
             """
         CREATE TABLE dist_secure_from_buffer AS data_from_buffer
@@ -409,3 +425,31 @@ def test_per_user_protocol_settings_secure_cluster(user, password):
     assert int(get_query_setting_on_shard(n1, id_, "max_memory_usage_for_user")) == int(
         1e9
     )
+
+
+@users
+def test_user_secure_cluster_with_backward(user, password):
+    id_ = "with-backward-query-dist_secure-" + user
+    query_with_id(
+        n1, id_, "SELECT * FROM dist_secure_backward", user=user, password=password
+    )
+    assert get_query_user_info(n1, id_) == [user, user]
+    assert get_query_user_info(backward, id_) == [user, user]
+
+
+@users
+def test_user_secure_cluster_from_backward(user, password):
+    id_ = "from-backward-query-dist_secure-" + user
+    query_with_id(
+        backward,
+        id_,
+        "SELECT * FROM dist_secure_backward",
+        user=user,
+        password=password,
+    )
+    assert get_query_user_info(n1, id_) == [user, user]
+    assert get_query_user_info(backward, id_) == [user, user]
+
+    assert n1.contains_in_log(
+        "Using deprecated interserver protocol because the client is too old. Consider upgrading all nodes in cluster."
+    )
diff --git a/tests/integration/test_distributed_load_balancing/test.py b/tests/integration/test_distributed_load_balancing/test.py
index 90771c027dc..e879f09ccc1 100644
--- a/tests/integration/test_distributed_load_balancing/test.py
+++ b/tests/integration/test_distributed_load_balancing/test.py
@@ -9,31 +9,39 @@ from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
 
-n1 = cluster.add_instance("n1", main_configs=["configs/remote_servers.xml"])
-n2 = cluster.add_instance("n2", main_configs=["configs/remote_servers.xml"])
-n3 = cluster.add_instance("n3", main_configs=["configs/remote_servers.xml"])
+n1 = cluster.add_instance(
+    "n1",
+    main_configs=["configs/remote_servers.xml"],
+    user_configs=["configs/users.xml"],
+)
+n2 = cluster.add_instance(
+    "n2",
+    main_configs=["configs/remote_servers.xml"],
+    user_configs=["configs/users.xml"],
+)
+n3 = cluster.add_instance(
+    "n3",
+    main_configs=["configs/remote_servers.xml"],
+    user_configs=["configs/users.xml"],
+)
 
 nodes = len(cluster.instances)
 queries = nodes * 10
 
 
+# SYSTEM RELOAD CONFIG will reset some attributes of the nodes in cluster
+# - error_count
+# - last_used (round_robing)
+#
+# This is required to avoid interference results of one test to another
+@pytest.fixture(scope="function", autouse=True)
+def test_setup():
+    for n in list(cluster.instances.values()):
+        n.query("SYSTEM RELOAD CONFIG")
+
+
 def bootstrap():
     for n in list(cluster.instances.values()):
-        # At startup, server loads configuration files.
-        #
-        # However ConfigReloader does not know about already loaded files
-        # (files is empty()), hence it will always reload the configuration
-        # just after server starts (+ 2 seconds, reload timeout).
-        #
-        # And on configuration reload the clusters will be re-created, so some
-        # internal stuff will be reset:
-        # - error_count
-        # - last_used (round_robing)
-        #
-        # And if the reload will happen during round_robin test it will start
-        # querying from the beginning, so let's issue config reload just after
-        # start to avoid reload in the middle of the test execution.
-        n.query("SYSTEM RELOAD CONFIG")
         n.query("DROP TABLE IF EXISTS data")
         n.query("DROP TABLE IF EXISTS dist")
         n.query("CREATE TABLE data (key Int) Engine=Memory()")
@@ -101,19 +109,14 @@ def get_node(query_node, table="dist", *args, **kwargs):
 
     rows = query_node.query(
         """
-    SELECT c.host_name
-    FROM (
-        SELECT _shard_num
-        FROM cluster(shards_cluster, system.query_log)
-        WHERE
-            initial_query_id = '{query_id}' AND
-            is_initial_query = 0 AND
-            type = 'QueryFinish'
-        ORDER BY event_date DESC, event_time DESC
-        LIMIT 1
-    ) a
-    JOIN system.clusters c
-    ON a._shard_num = c.shard_num WHERE cluster = 'shards_cluster'
+    SELECT hostName()
+    FROM cluster(shards_cluster, system.query_log)
+    WHERE
+        initial_query_id = '{query_id}' AND
+        is_initial_query = 0 AND
+        type = 'QueryFinish'
+    ORDER BY event_date DESC, event_time DESC
+    LIMIT 1
     """.format(
             query_id=query_id
         )
diff --git a/tests/integration/test_distributed_respect_user_timeouts/test.py b/tests/integration/test_distributed_respect_user_timeouts/test.py
index 593843b4e4a..906ffb03fc0 100644
--- a/tests/integration/test_distributed_respect_user_timeouts/test.py
+++ b/tests/integration/test_distributed_respect_user_timeouts/test.py
@@ -37,7 +37,7 @@ SELECTS_SQL = {
 
 EXCEPTION_NETWORK = "DB::NetException: "
 EXCEPTION_TIMEOUT = "Timeout exceeded while reading from socket ("
-EXCEPTION_CONNECT = "Timeout: connect timed out: "
+EXCEPTION_CONNECT_TIMEOUT = "Timeout exceeded while connecting to socket ("
 
 TIMEOUT_MEASUREMENT_EPS = 0.01
 
@@ -79,7 +79,7 @@ def _check_exception(exception, expected_tries=3):
     for i, line in enumerate(lines[3 : 3 + expected_tries]):
         expected_lines = (
             "Code: 209. " + EXCEPTION_NETWORK + EXCEPTION_TIMEOUT,
-            "Code: 209. " + EXCEPTION_NETWORK + EXCEPTION_CONNECT,
+            EXCEPTION_CONNECT_TIMEOUT,
             EXCEPTION_TIMEOUT,
         )
 
diff --git a/tests/integration/test_drop_replica/test.py b/tests/integration/test_drop_replica/test.py
index f16a5b729f6..e87edb0a578 100644
--- a/tests/integration/test_drop_replica/test.py
+++ b/tests/integration/test_drop_replica/test.py
@@ -90,6 +90,11 @@ def start_cluster():
         cluster.shutdown()
 
 
+def check_exists(zk, path):
+    zk.sync(path)
+    return zk.exists(path)
+
+
 def test_drop_replica(start_cluster):
     node_1_1.query(
         "INSERT INTO test.test_table SELECT number, toString(number) FROM numbers(100)"
@@ -158,10 +163,11 @@ def test_drop_replica(start_cluster):
     )
 
     node_1_3.query("SYSTEM DROP REPLICA 'node_1_1'")
-    exists_replica_1_1 = zk.exists(
+    exists_replica_1_1 = check_exists(
+        zk,
         "/clickhouse/tables/test3/{shard}/replicated/test_table/replicas/{replica}".format(
             shard=1, replica="node_1_1"
-        )
+        ),
     )
     assert exists_replica_1_1 != None
 
@@ -171,26 +177,29 @@ def test_drop_replica(start_cluster):
             shard=1
         )
     )
-    exists_replica_1_1 = zk.exists(
+    exists_replica_1_1 = check_exists(
+        zk,
         "/clickhouse/tables/test2/{shard}/replicated/test_table/replicas/{replica}".format(
             shard=1, replica="node_1_1"
-        )
+        ),
     )
     assert exists_replica_1_1 == None
 
     node_1_2.query("SYSTEM DROP REPLICA 'node_1_1' FROM TABLE test.test_table")
-    exists_replica_1_1 = zk.exists(
+    exists_replica_1_1 = check_exists(
+        zk,
         "/clickhouse/tables/test/{shard}/replicated/test_table/replicas/{replica}".format(
             shard=1, replica="node_1_1"
-        )
+        ),
     )
     assert exists_replica_1_1 == None
 
     node_1_2.query("SYSTEM DROP REPLICA 'node_1_1' FROM DATABASE test1")
-    exists_replica_1_1 = zk.exists(
+    exists_replica_1_1 = check_exists(
+        zk,
         "/clickhouse/tables/test1/{shard}/replicated/test_table/replicas/{replica}".format(
             shard=1, replica="node_1_1"
-        )
+        ),
     )
     assert exists_replica_1_1 == None
 
@@ -199,17 +208,19 @@ def test_drop_replica(start_cluster):
             shard=1
         )
     )
-    exists_replica_1_1 = zk.exists(
+    exists_replica_1_1 = check_exists(
+        zk,
         "/clickhouse/tables/test3/{shard}/replicated/test_table/replicas/{replica}".format(
             shard=1, replica="node_1_1"
-        )
+        ),
     )
     assert exists_replica_1_1 == None
 
     node_1_2.query("SYSTEM DROP REPLICA 'node_1_1'")
-    exists_replica_1_1 = zk.exists(
+    exists_replica_1_1 = check_exists(
+        zk,
         "/clickhouse/tables/test4/{shard}/replicated/test_table/replicas/{replica}".format(
             shard=1, replica="node_1_1"
-        )
+        ),
     )
     assert exists_replica_1_1 == None
diff --git a/tests/integration/test_backup_with_other_granularity/__init__.py b/tests/integration/test_drop_replica_with_auxiliary_zookeepers/__init__.py
similarity index 100%
rename from tests/integration/test_backup_with_other_granularity/__init__.py
rename to tests/integration/test_drop_replica_with_auxiliary_zookeepers/__init__.py
diff --git a/tests/integration/test_drop_replica_with_auxiliary_zookeepers/configs/remote_servers.xml b/tests/integration/test_drop_replica_with_auxiliary_zookeepers/configs/remote_servers.xml
new file mode 100644
index 00000000000..45713eaed59
--- /dev/null
+++ b/tests/integration/test_drop_replica_with_auxiliary_zookeepers/configs/remote_servers.xml
@@ -0,0 +1,16 @@
+<clickhouse>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_drop_replica_with_auxiliary_zookeepers/configs/zookeeper_config.xml b/tests/integration/test_drop_replica_with_auxiliary_zookeepers/configs/zookeeper_config.xml
new file mode 100644
index 00000000000..3e8cc741bd5
--- /dev/null
+++ b/tests/integration/test_drop_replica_with_auxiliary_zookeepers/configs/zookeeper_config.xml
@@ -0,0 +1,28 @@
+<clickhouse>
+    <zookeeper>
+        <node index="1">
+            <host>zoo1</host>
+            <port>2181</port>
+        </node>
+        <node index="2">
+            <host>zoo2</host>
+            <port>2181</port>
+        </node>
+        <node index="3">
+            <host>zoo3</host>
+            <port>2181</port>
+        </node>
+    </zookeeper>
+    <auxiliary_zookeepers>
+        <zookeeper2>
+            <node index="1">
+                <host>zoo1</host>
+                <port>2181</port>
+            </node>
+            <node index="2">
+                <host>zoo2</host>
+                <port>2181</port>
+            </node>
+        </zookeeper2>
+    </auxiliary_zookeepers>
+</clickhouse>
diff --git a/tests/integration/test_drop_replica_with_auxiliary_zookeepers/test.py b/tests/integration/test_drop_replica_with_auxiliary_zookeepers/test.py
new file mode 100644
index 00000000000..e21449b93a8
--- /dev/null
+++ b/tests/integration/test_drop_replica_with_auxiliary_zookeepers/test.py
@@ -0,0 +1,87 @@
+import time
+
+import helpers.client as client
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.client import QueryRuntimeException
+from helpers.test_tools import TSV
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=["configs/zookeeper_config.xml", "configs/remote_servers.xml"],
+    with_zookeeper=True,
+    use_keeper=False,
+    stay_alive=True,
+)
+node2 = cluster.add_instance(
+    "node2",
+    main_configs=["configs/zookeeper_config.xml", "configs/remote_servers.xml"],
+    with_zookeeper=True,
+    use_keeper=False,
+    stay_alive=True,
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    except Exception as ex:
+        print(ex)
+
+    finally:
+        cluster.shutdown()
+
+
+def drop_table(nodes, table_name):
+    for node in nodes:
+        node.query("DROP TABLE IF EXISTS {} NO DELAY".format(table_name))
+
+
+def test_drop_replica_in_auxiliary_zookeeper(started_cluster):
+    drop_table([node1, node2], "test_auxiliary_zookeeper")
+    for node in [node1, node2]:
+        node.query(
+            """
+                CREATE TABLE test_auxiliary_zookeeper(a Int32)
+                ENGINE = ReplicatedMergeTree('zookeeper2:/clickhouse/tables/test/test_auxiliary_zookeeper', '{replica}')
+                ORDER BY a;
+            """.format(
+                replica=node.name
+            )
+        )
+
+    # stop node2 server
+    node2.stop_clickhouse()
+    time.sleep(5)
+
+    # check is_active
+    retries = 0
+    max_retries = 5
+    zk = cluster.get_kazoo_client("zoo1")
+    while True:
+        if (
+            zk.exists(
+                "/clickhouse/tables/test/test_auxiliary_zookeeper/replicas/node2/is_active"
+            )
+            is None
+        ):
+            break
+        else:
+            retries += 1
+            if retries > max_retries:
+                raise Exception("Failed to stop server.")
+            time.sleep(1)
+
+    # drop replica node2
+    node1.query("SYSTEM DROP REPLICA 'node2'")
+
+    assert zk.exists("/clickhouse/tables/test/test_auxiliary_zookeeper")
+    assert (
+        zk.exists("/clickhouse/tables/test/test_auxiliary_zookeeper/replicas/node2")
+        is None
+    )
diff --git a/tests/integration/test_encrypted_disk/configs/allow_backup_path.xml b/tests/integration/test_encrypted_disk/configs/allow_backup_path.xml
new file mode 100644
index 00000000000..eade3bfb744
--- /dev/null
+++ b/tests/integration/test_encrypted_disk/configs/allow_backup_path.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <backups>
+        <allowed_path>/backups/</allowed_path>
+    </backups>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_encrypted_disk/configs/storage.xml b/tests/integration/test_encrypted_disk/configs/storage.xml
index 5cba95a89a0..1e48c80d50f 100644
--- a/tests/integration/test_encrypted_disk/configs/storage.xml
+++ b/tests/integration/test_encrypted_disk/configs/storage.xml
@@ -14,9 +14,24 @@
             <disk_s3_encrypted>
                 <type>encrypted</type>
                 <disk>disk_s3</disk>
-                <path>encrypted/</path>
                 <key>1234567812345678</key>
+                <path>encrypted/</path>
             </disk_s3_encrypted>
+            <disk_s3_encrypted_default_path>
+                <type>encrypted</type>
+                <disk>disk_s3</disk>
+                <key>1234567812345678</key>
+            </disk_s3_encrypted_default_path>
+            <s3_cache>
+                <disk>disk_s3</disk>
+                <path>s3_cache/</path>
+                <max_size>1Gi</max_size>
+            </s3_cache>
+            <encrypted_s3_cache>
+                <type>encrypted</type>
+                <disk>s3_cache</disk>
+                <key>1234567812345678</key>
+            </encrypted_s3_cache>
             <disk_local_encrypted>
                 <type>encrypted</type>
                 <disk>disk_local</disk>
@@ -74,6 +89,20 @@
                     </external>
                 </volumes>
             </s3_policy>
+            <s3_encrypted_default_path>
+                <volumes>
+                    <main>
+                        <disk>disk_s3_encrypted_default_path</disk>
+                    </main>
+                </volumes>
+            </s3_encrypted_default_path>_
+            <s3_encrypted_cache_policy>
+                <volumes>
+                    <main>
+                        <disk>encrypted_s3_cache</disk>
+                    </main>
+                </volumes>
+            </s3_encrypted_cache_policy>
          </policies>
     </storage_configuration>
 </clickhouse>
diff --git a/tests/integration/test_encrypted_disk/test.py b/tests/integration/test_encrypted_disk/test.py
index 42ce7aab906..66ff073f02b 100644
--- a/tests/integration/test_encrypted_disk/test.py
+++ b/tests/integration/test_encrypted_disk/test.py
@@ -1,6 +1,7 @@
 import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.client import QueryRuntimeException
+import os.path
 from helpers.test_tools import assert_eq_with_retry
 
 
@@ -9,9 +10,11 @@ FIRST_PART_NAME = "all_1_1_0"
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
-    main_configs=["configs/storage.xml"],
+    main_configs=["configs/storage.xml", "configs/allow_backup_path.xml"],
     tmpfs=["/disk:size=100M"],
+    external_dirs=["/backups/"],
     with_minio=True,
+    stay_alive=True,
 )
 
 
@@ -29,7 +32,16 @@ def cleanup_after_test():
     try:
         yield
     finally:
-        node.query("DROP TABLE IF EXISTS encrypted_test NO DELAY")
+        node.query("DROP TABLE IF EXISTS encrypted_test SYNC")
+
+
+backup_id_counter = 0
+
+
+def new_backup_name():
+    global backup_id_counter
+    backup_id_counter += 1
+    return f"backup{backup_id_counter}"
 
 
 @pytest.mark.parametrize(
@@ -269,3 +281,130 @@ def test_read_in_order():
     node.query(
         "SELECT * FROM encrypted_test ORDER BY a, b SETTINGS optimize_read_in_order=0 FORMAT Null"
     )
+
+
+def test_restart():
+    for policy in ["disk_s3_encrypted_default_path", "encrypted_s3_cache"]:
+        node.query(
+            f"""
+            DROP TABLE IF EXISTS encrypted_test;
+            CREATE TABLE encrypted_test (
+                id Int64,
+                data String
+            ) ENGINE=MergeTree()
+            ORDER BY id
+            SETTINGS disk='{policy}'
+            """
+        )
+
+        node.query("INSERT INTO encrypted_test VALUES (0,'data'),(1,'data')")
+        select_query = "SELECT * FROM encrypted_test ORDER BY id FORMAT Values"
+        assert node.query(select_query) == "(0,'data'),(1,'data')"
+
+        node.restart_clickhouse()
+
+        assert node.query(select_query) == "(0,'data'),(1,'data')"
+
+        node.query("DROP TABLE encrypted_test SYNC;")
+
+
+@pytest.mark.parametrize(
+    "backup_type,old_storage_policy,new_storage_policy,decrypt_files_from_encrypted_disks",
+    [
+        ("S3", "encrypted_policy", "encrypted_policy", False),
+        ("S3", "encrypted_policy", "s3_encrypted_default_path", False),
+        ("S3", "s3_encrypted_default_path", "s3_encrypted_default_path", False),
+        ("S3", "s3_encrypted_default_path", "encrypted_policy", False),
+        ("File", "s3_encrypted_default_path", "encrypted_policy", False),
+        ("File", "local_policy", "encrypted_policy", False),
+        ("File", "encrypted_policy", "local_policy", False),
+        ("File", "encrypted_policy", "local_policy", True),
+    ],
+)
+def test_backup_restore(
+    backup_type,
+    old_storage_policy,
+    new_storage_policy,
+    decrypt_files_from_encrypted_disks,
+):
+    node.query(
+        f"""
+        CREATE TABLE encrypted_test (
+            id Int64,
+            data String
+        ) ENGINE=MergeTree()
+        ORDER BY id
+        SETTINGS storage_policy='{old_storage_policy}'
+        """
+    )
+
+    node.query("INSERT INTO encrypted_test VALUES (0,'data'),(1,'data')")
+    select_query = "SELECT * FROM encrypted_test ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data')"
+
+    backup_name = new_backup_name()
+    if backup_type == "S3":
+        backup_destination = (
+            f"S3('http://minio1:9001/root/backups/{backup_name}', 'minio', 'minio123')"
+        )
+    elif backup_type == "File":
+        backup_destination = f"File('/backups/{backup_name}/')"
+
+    node.query(
+        f"BACKUP TABLE encrypted_test TO {backup_destination} SETTINGS decrypt_files_from_encrypted_disks={int(decrypt_files_from_encrypted_disks)}"
+    )
+
+    storage_policy_changed = old_storage_policy != new_storage_policy
+    old_disk_encrypted = old_storage_policy.find("encrypted") != -1
+    new_disk_encrypted = new_storage_policy.find("encrypted") != -1
+
+    if backup_type == "File":
+        root_path = os.path.join(node.cluster.instances_dir, "backups", backup_name)
+        expect_encrypted_in_backup = (
+            old_disk_encrypted and not decrypt_files_from_encrypted_disks
+        )
+
+        with open(f"{root_path}/metadata/default/encrypted_test.sql") as file:
+            assert file.read().startswith("CREATE TABLE default.encrypted_test")
+
+        with open(f"{root_path}/.backup") as file:
+            found_encrypted_in_backup = (
+                file.read().find("<encrypted_by_disk>true</encrypted_by_disk>") != -1
+            )
+            assert found_encrypted_in_backup == expect_encrypted_in_backup
+
+        with open(
+            f"{root_path}/data/default/encrypted_test/all_1_1_0/data.bin", "rb"
+        ) as file:
+            found_encrypted_in_backup = file.read().startswith(b"ENC")
+            assert found_encrypted_in_backup == expect_encrypted_in_backup
+
+    node.query(f"DROP TABLE encrypted_test SYNC")
+
+    if storage_policy_changed:
+        node.query(
+            f"""
+            CREATE TABLE encrypted_test (
+                id Int64,
+                data String
+            ) ENGINE=MergeTree()
+            ORDER BY id
+            SETTINGS storage_policy='{new_storage_policy}'
+            """
+        )
+
+    restore_command = f"RESTORE TABLE encrypted_test FROM {backup_destination} SETTINGS allow_different_table_def={int(storage_policy_changed)}"
+
+    expect_error = None
+    if (
+        old_disk_encrypted
+        and not new_disk_encrypted
+        and not decrypt_files_from_encrypted_disks
+    ):
+        expect_error = "can be restored only to an encrypted disk"
+
+    if expect_error:
+        assert expect_error in node.query_and_get_error(restore_command)
+    else:
+        node.query(restore_command)
+        assert node.query(select_query) == "(0,'data'),(1,'data')"
diff --git a/tests/integration/test_merge_tree_s3_restore/__init__.py b/tests/integration/test_encrypted_disk_replication/__init__.py
similarity index 100%
rename from tests/integration/test_merge_tree_s3_restore/__init__.py
rename to tests/integration/test_encrypted_disk_replication/__init__.py
diff --git a/tests/integration/test_encrypted_disk_replication/configs/cluster.xml b/tests/integration/test_encrypted_disk_replication/configs/cluster.xml
new file mode 100644
index 00000000000..84d16206080
--- /dev/null
+++ b/tests/integration/test_encrypted_disk_replication/configs/cluster.xml
@@ -0,0 +1,16 @@
+<clickhouse>
+    <remote_servers>
+        <cluster>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_encrypted_disk_replication/configs/disk_s3_encrypted.xml b/tests/integration/test_encrypted_disk_replication/configs/disk_s3_encrypted.xml
new file mode 100644
index 00000000000..01720d6f9cb
--- /dev/null
+++ b/tests/integration/test_encrypted_disk_replication/configs/disk_s3_encrypted.xml
@@ -0,0 +1,49 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <disk_s3>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+            </disk_s3>
+            <disk_s3_encrypted>
+                <type>encrypted</type>
+                <disk>disk_s3</disk>
+                <key>1234567812345678</key>
+                <path>encrypted/</path>
+            </disk_s3_encrypted>
+            <disk_s3_encrypted_with_diff_keys>
+                <type>encrypted</type>
+                <disk>disk_s3</disk>
+                <path>encrypted_with_diff_keys/</path>
+            </disk_s3_encrypted_with_diff_keys>
+        </disks>
+        <policies>
+            <s3_policy>
+                <volumes>
+                    <main>
+                        <disk>disk_s3</disk>
+                    </main>
+                    <external>
+                        <disk>disk_s3_encrypted</disk>
+                    </external>
+                </volumes>
+            </s3_policy>
+            <s3_encrypted_policy>
+                <volumes>
+                    <main>
+                        <disk>disk_s3_encrypted</disk>
+                    </main>
+                </volumes>
+            </s3_encrypted_policy>
+            <s3_encrypted_policy_with_diff_keys>
+                <volumes>
+                    <main>
+                        <disk>disk_s3_encrypted_with_diff_keys</disk>
+                    </main>
+                </volumes>
+            </s3_encrypted_policy_with_diff_keys>
+         </policies>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/integration/test_encrypted_disk_replication/configs/disk_s3_encrypted_node1.xml b/tests/integration/test_encrypted_disk_replication/configs/disk_s3_encrypted_node1.xml
new file mode 100644
index 00000000000..ee7ae5d719b
--- /dev/null
+++ b/tests/integration/test_encrypted_disk_replication/configs/disk_s3_encrypted_node1.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <disk_s3_encrypted_with_diff_keys>
+                <key>1111111111111111</key>
+            </disk_s3_encrypted_with_diff_keys>
+        </disks>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/integration/test_encrypted_disk_replication/configs/disk_s3_encrypted_node2.xml b/tests/integration/test_encrypted_disk_replication/configs/disk_s3_encrypted_node2.xml
new file mode 100644
index 00000000000..c0b3ceebc25
--- /dev/null
+++ b/tests/integration/test_encrypted_disk_replication/configs/disk_s3_encrypted_node2.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <disk_s3_encrypted_with_diff_keys>
+                <key>2222222222222222</key>
+            </disk_s3_encrypted_with_diff_keys>
+        </disks>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/integration/test_encrypted_disk_replication/test.py b/tests/integration/test_encrypted_disk_replication/test.py
new file mode 100644
index 00000000000..c2aa710ba91
--- /dev/null
+++ b/tests/integration/test_encrypted_disk_replication/test.py
@@ -0,0 +1,90 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=[
+        "configs/cluster.xml",
+        "configs/disk_s3_encrypted.xml",
+        "configs/disk_s3_encrypted_node1.xml",
+    ],
+    macros={"replica": "node1"},
+    with_zookeeper=True,
+    with_minio=True,
+)
+
+node2 = cluster.add_instance(
+    "node2",
+    main_configs=[
+        "configs/cluster.xml",
+        "configs/disk_s3_encrypted.xml",
+        "configs/disk_s3_encrypted_node2.xml",
+    ],
+    macros={"replica": "node2"},
+    with_zookeeper=True,
+    with_minio=True,
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def cleanup_after_test():
+    try:
+        yield
+    finally:
+        node1.query("DROP TABLE IF EXISTS encrypted_test ON CLUSTER 'cluster' SYNC")
+
+
+def create_table(
+    zero_copy_replication=False, storage_policy="s3_encrypted_policy_with_diff_keys"
+):
+    engine = "ReplicatedMergeTree('/clickhouse/tables/encrypted_test/', '{replica}')"
+
+    settings = f"storage_policy='{storage_policy}', allow_remote_fs_zero_copy_replication={int(zero_copy_replication)}"
+
+    node1.query(
+        f"""
+        CREATE TABLE encrypted_test ON CLUSTER 'cluster' (
+            id Int64,
+            data String
+        ) ENGINE={engine}
+        ORDER BY id
+        SETTINGS {settings}
+    """
+    )
+
+
+def check_replication():
+    node1.query("INSERT INTO encrypted_test VALUES (0, 'a'), (1, 'b')")
+    node2.query("INSERT INTO encrypted_test VALUES (2, 'c'), (3, 'd')")
+
+    node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' encrypted_test")
+
+    select_query = "SELECT * FROM encrypted_test ORDER BY id"
+
+    assert node1.query(select_query) == TSV([[0, "a"], [1, "b"], [2, "c"], [3, "d"]])
+    assert node2.query(select_query) == TSV([[0, "a"], [1, "b"], [2, "c"], [3, "d"]])
+
+
+def test_replication():
+    create_table(
+        zero_copy_replication=False, storage_policy="s3_encrypted_policy_with_diff_keys"
+    )
+    check_replication()
+
+
+def test_zero_copy_replication():
+    create_table(zero_copy_replication=True, storage_policy="s3_encrypted_policy")
+    check_replication()
diff --git a/tests/integration/test_failed_async_inserts/test.py b/tests/integration/test_failed_async_inserts/test.py
index 6d66ac97006..ecb506c36bc 100644
--- a/tests/integration/test_failed_async_inserts/test.py
+++ b/tests/integration/test_failed_async_inserts/test.py
@@ -51,4 +51,4 @@ def test_failed_async_inserts(started_cluster):
 
     assert node.query(select_query) == "4\n"
 
-    node.query("DROP TABLE IF EXISTS async_insert_30_10_2022 NO DELAY")
+    node.query("DROP TABLE IF EXISTS async_insert_30_10_2022 SYNC")
diff --git a/tests/integration/test_fetch_memory_usage/test.py b/tests/integration/test_fetch_memory_usage/test.py
index a4371140150..7591cc0e8a9 100644
--- a/tests/integration/test_fetch_memory_usage/test.py
+++ b/tests/integration/test_fetch_memory_usage/test.py
@@ -18,7 +18,6 @@ def started_cluster():
 
 
 def test_huge_column(started_cluster):
-
     if (
         node.is_built_with_thread_sanitizer()
         or node.is_built_with_memory_sanitizer()
diff --git a/tests/integration/test_filesystem_layout/test.py b/tests/integration/test_filesystem_layout/test.py
index 898bbc40eb9..2be478f95d0 100644
--- a/tests/integration/test_filesystem_layout/test.py
+++ b/tests/integration/test_filesystem_layout/test.py
@@ -44,8 +44,6 @@ def test_file_path_escaping(started_cluster):
         ]
     )
 
-
-def test_file_path_escaping_atomic_db(started_cluster):
     node.query("CREATE DATABASE IF NOT EXISTS `test 2` ENGINE = Atomic")
     node.query(
         """
diff --git a/tests/integration/test_global_overcommit_tracker/configs/users.xml b/tests/integration/test_global_overcommit_tracker/configs/users.xml
index 8556e73c82f..1c5f4d5a21f 100644
--- a/tests/integration/test_global_overcommit_tracker/configs/users.xml
+++ b/tests/integration/test_global_overcommit_tracker/configs/users.xml
@@ -4,7 +4,7 @@
             <password></password>
             <profile>default</profile>
             <quota>default</quota>
-            <show_named_collections>1</show_named_collections>
+            <named_collection_control>1</named_collection_control>
             <show_named_collections_secrets>1</show_named_collections_secrets>
         </default>
     </users>
diff --git a/tests/integration/test_grant_and_revoke/configs/users.d/users.xml b/tests/integration/test_grant_and_revoke/configs/users.d/users.xml
index 8556e73c82f..1c5f4d5a21f 100644
--- a/tests/integration/test_grant_and_revoke/configs/users.d/users.xml
+++ b/tests/integration/test_grant_and_revoke/configs/users.d/users.xml
@@ -4,7 +4,7 @@
             <password></password>
             <profile>default</profile>
             <quota>default</quota>
-            <show_named_collections>1</show_named_collections>
+            <named_collection_control>1</named_collection_control>
             <show_named_collections_secrets>1</show_named_collections_secrets>
         </default>
     </users>
diff --git a/tests/integration/test_grant_and_revoke/test.py b/tests/integration/test_grant_and_revoke/test.py
index 8d48f7449e4..ee5d4b5df93 100644
--- a/tests/integration/test_grant_and_revoke/test.py
+++ b/tests/integration/test_grant_and_revoke/test.py
@@ -20,6 +20,9 @@ def start_cluster():
         instance.query(
             "CREATE TABLE test.table(x UInt32, y UInt32) ENGINE = MergeTree ORDER BY tuple()"
         )
+        instance.query(
+            "CREATE TABLE test.table2(x UInt32, y UInt32) ENGINE = MergeTree ORDER BY tuple()"
+        )
         instance.query("INSERT INTO test.table VALUES (1,5), (2,10)")
 
         yield cluster
@@ -184,7 +187,7 @@ def test_grant_all_on_table():
     assert (
         instance.query("SHOW GRANTS FOR B")
         == "GRANT SHOW TABLES, SHOW COLUMNS, SHOW DICTIONARIES, SELECT, INSERT, ALTER TABLE, ALTER VIEW, CREATE TABLE, CREATE VIEW, CREATE DICTIONARY, "
-        "DROP TABLE, DROP VIEW, DROP DICTIONARY, TRUNCATE, OPTIMIZE, BACKUP, CREATE ROW POLICY, ALTER ROW POLICY, DROP ROW POLICY, SHOW ROW POLICIES, "
+        "DROP TABLE, DROP VIEW, DROP DICTIONARY, UNDROP TABLE, TRUNCATE, OPTIMIZE, BACKUP, CREATE ROW POLICY, ALTER ROW POLICY, DROP ROW POLICY, SHOW ROW POLICIES, "
         "SYSTEM MERGES, SYSTEM TTL MERGES, SYSTEM FETCHES, SYSTEM MOVES, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, SYSTEM DROP REPLICA, SYSTEM SYNC REPLICA, "
         "SYSTEM RESTART REPLICA, SYSTEM RESTORE REPLICA, SYSTEM WAIT LOADING PARTS, SYSTEM FLUSH DISTRIBUTED, dictGet ON test.table TO B\n"
     )
@@ -402,6 +405,9 @@ def test_introspection():
     assert instance.query("SHOW GRANTS FOR B") == TSV(
         ["GRANT CREATE ON *.* TO B WITH GRANT OPTION"]
     )
+    assert instance.query("SHOW GRANTS FOR default") == TSV(
+        ["GRANT ALL ON *.* TO default WITH GRANT OPTION"]
+    )
     assert instance.query("SHOW GRANTS FOR A,B") == TSV(
         [
             "GRANT SELECT ON test.table TO A",
@@ -582,3 +588,134 @@ def test_grant_with_replace_option():
     assert instance.query("SHOW GRANTS FOR B") == TSV(
         ["GRANT INSERT ON test.table TO B"]
     )
+
+
+def test_grant_current_grants():
+    instance.query("CREATE USER A")
+    instance.query(
+        "GRANT SELECT, CREATE TABLE, CREATE VIEW ON test.* TO A WITH GRANT OPTION"
+    )
+    assert instance.query("SHOW GRANTS FOR A") == TSV(
+        ["GRANT SELECT, CREATE TABLE, CREATE VIEW ON test.* TO A WITH GRANT OPTION"]
+    )
+
+    instance.query("CREATE USER B")
+    instance.query("GRANT CURRENT GRANTS ON *.* TO B", user="A")
+    assert instance.query("SHOW GRANTS FOR B") == TSV(
+        ["GRANT SELECT, CREATE TABLE, CREATE VIEW ON test.* TO B"]
+    )
+
+    instance.query("CREATE USER C")
+    instance.query("GRANT CURRENT GRANTS(CREATE ON test.*) TO C", user="A")
+    assert instance.query("SHOW GRANTS FOR C") == TSV(
+        ["GRANT CREATE TABLE, CREATE VIEW ON test.* TO C"]
+    )
+
+    instance.query("DROP USER IF EXISTS C")
+    instance.query("CREATE USER C")
+    instance.query("GRANT CURRENT GRANTS(NONE ON *.*) TO C", user="A")
+    assert instance.query("SHOW GRANTS FOR C") == TSV([])
+
+
+def test_grant_current_grants_with_partial_revoke():
+    instance.query("CREATE USER A")
+    instance.query("GRANT CREATE TABLE ON *.* TO A")
+    instance.query("REVOKE CREATE TABLE ON test.* FROM A")
+    instance.query("GRANT CREATE TABLE ON test.table TO A WITH GRANT OPTION")
+    instance.query("GRANT SELECT ON *.* TO A WITH GRANT OPTION")
+    instance.query("REVOKE SELECT ON test.* FROM A")
+    instance.query("GRANT SELECT ON test.table TO A WITH GRANT OPTION")
+    instance.query("GRANT SELECT ON test.table2 TO A")
+
+    assert instance.query("SHOW GRANTS FOR A") == TSV(
+        [
+            "GRANT CREATE TABLE ON *.* TO A",
+            "GRANT SELECT ON *.* TO A WITH GRANT OPTION",
+            "REVOKE SELECT, CREATE TABLE ON test.* FROM A",
+            "GRANT SELECT, CREATE TABLE ON test.table TO A WITH GRANT OPTION",
+            "GRANT SELECT ON test.table2 TO A",
+        ]
+    )
+
+    instance.query("CREATE USER B")
+    instance.query("GRANT CURRENT GRANTS ON *.* TO B", user="A")
+    assert instance.query("SHOW GRANTS FOR B") == TSV(
+        [
+            "GRANT SELECT ON *.* TO B",
+            "REVOKE SELECT ON test.* FROM B",
+            "GRANT SELECT, CREATE TABLE ON test.table TO B",
+        ]
+    )
+
+    instance.query("DROP USER IF EXISTS B")
+    instance.query("CREATE USER B")
+    instance.query("GRANT CURRENT GRANTS ON *.* TO B WITH GRANT OPTION", user="A")
+    assert instance.query("SHOW GRANTS FOR B") == TSV(
+        [
+            "GRANT SELECT ON *.* TO B WITH GRANT OPTION",
+            "REVOKE SELECT ON test.* FROM B",
+            "GRANT SELECT, CREATE TABLE ON test.table TO B WITH GRANT OPTION",
+        ]
+    )
+
+    instance.query("DROP USER IF EXISTS C")
+    instance.query("CREATE USER C")
+    instance.query("GRANT SELECT ON test.* TO B")
+    instance.query("GRANT CURRENT GRANTS ON *.* TO C", user="B")
+    assert instance.query("SHOW GRANTS FOR C") == TSV(
+        [
+            "GRANT SELECT ON *.* TO C",
+            "GRANT CREATE TABLE ON test.table TO C",
+        ]
+    )
+
+    instance.query("DROP USER IF EXISTS B")
+    instance.query("CREATE USER B")
+    instance.query("GRANT CURRENT GRANTS ON test.* TO B WITH GRANT OPTION", user="A")
+    assert instance.query("SHOW GRANTS FOR B") == TSV(
+        [
+            "GRANT SELECT, CREATE TABLE ON test.table TO B WITH GRANT OPTION",
+        ]
+    )
+
+
+def test_current_grants_override():
+    instance.query("CREATE USER A")
+    instance.query("GRANT SELECT ON *.* TO A WITH GRANT OPTION")
+    instance.query("REVOKE SELECT ON test.* FROM A")
+    assert instance.query("SHOW GRANTS FOR A") == TSV(
+        [
+            "GRANT SELECT ON *.* TO A WITH GRANT OPTION",
+            "REVOKE SELECT ON test.* FROM A",
+        ]
+    )
+
+    instance.query("CREATE USER B")
+    instance.query("GRANT SELECT ON test.table TO B")
+    assert instance.query("SHOW GRANTS FOR B") == TSV(
+        ["GRANT SELECT ON test.table TO B"]
+    )
+
+    instance.query("GRANT CURRENT GRANTS ON *.* TO B", user="A")
+    assert instance.query("SHOW GRANTS FOR B") == TSV(
+        [
+            "GRANT SELECT ON *.* TO B",
+            "REVOKE SELECT ON test.* FROM B",
+            "GRANT SELECT ON test.table TO B",
+        ]
+    )
+
+    instance.query("DROP USER IF EXISTS B")
+    instance.query("CREATE USER B")
+    instance.query("GRANT SELECT ON test.table TO B")
+    assert instance.query("SHOW GRANTS FOR B") == TSV(
+        ["GRANT SELECT ON test.table TO B"]
+    )
+
+    instance.query("GRANT CURRENT GRANTS ON *.* TO B WITH REPLACE OPTION", user="A")
+    assert instance.query("SHOW GRANTS FOR B") == TSV(
+        [
+            "GRANT SELECT ON *.* TO B",
+            "REVOKE SELECT ON test.* FROM B",
+        ]
+    )
diff --git a/tests/integration/test_grpc_protocol/test.py b/tests/integration/test_grpc_protocol/test.py
index a1bc0d42a46..dead4d447ec 100644
--- a/tests/integration/test_grpc_protocol/test.py
+++ b/tests/integration/test_grpc_protocol/test.py
@@ -41,8 +41,9 @@ node = cluster.add_instance(
     "node",
     main_configs=["configs/grpc_config.xml"],
     # Bug in TSAN reproduces in this test https://github.com/grpc/grpc/issues/29550#issuecomment-1188085387
-    # second_deadlock_stack -- just ordinary option we use everywhere, don't want to overwrite it
-    env_variables={"TSAN_OPTIONS": "report_atomic_races=0 second_deadlock_stack=1"},
+    env_variables={
+        "TSAN_OPTIONS": "report_atomic_races=0 " + os.getenv("TSAN_OPTIONS", default="")
+    },
 )
 main_channel = None
 
@@ -594,8 +595,6 @@ def test_cancel_while_processing_input():
     stub = clickhouse_grpc_pb2_grpc.ClickHouseStub(main_channel)
     result = stub.ExecuteQueryWithStreamInput(send_query_info())
     assert result.cancelled == True
-    assert result.progress.written_rows == 6
-    assert query("SELECT a FROM t ORDER BY a") == "1\n2\n3\n4\n5\n6\n"
 
 
 def test_cancel_while_generating_output():
diff --git a/tests/integration/test_grpc_protocol_ssl/test.py b/tests/integration/test_grpc_protocol_ssl/test.py
index 2c2a7f6c61e..4c7fe99f49d 100644
--- a/tests/integration/test_grpc_protocol_ssl/test.py
+++ b/tests/integration/test_grpc_protocol_ssl/test.py
@@ -43,8 +43,9 @@ node = cluster.add_instance(
         "configs/ca-cert.pem",
     ],
     # Bug in TSAN reproduces in this test https://github.com/grpc/grpc/issues/29550#issuecomment-1188085387
-    # second_deadlock_stack -- just ordinary option we use everywhere, don't want to overwrite it
-    env_variables={"TSAN_OPTIONS": "report_atomic_races=0 second_deadlock_stack=1"},
+    env_variables={
+        "TSAN_OPTIONS": "report_atomic_races=0 " + os.getenv("TSAN_OPTIONS", default="")
+    },
 )
 
 
diff --git a/tests/integration/test_hedged_requests/configs/remote_servers.xml b/tests/integration/test_hedged_requests/configs/remote_servers.xml
index 3728b0d6c4d..ba359169eec 100644
--- a/tests/integration/test_hedged_requests/configs/remote_servers.xml
+++ b/tests/integration/test_hedged_requests/configs/remote_servers.xml
@@ -17,6 +17,51 @@
                 </replica>
             </shard>
         </test_cluster>
+        <test_cluster_three_shards>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>node_3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster_three_shards>
+        <test_cluster_connect>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>129.0.0.1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>129.0.0.2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster_connect>
     </remote_servers>
 </clickhouse>
 
diff --git a/tests/integration/test_hedged_requests/test.py b/tests/integration/test_hedged_requests/test.py
index 7a226e849ad..2ca37fbb7ee 100644
--- a/tests/integration/test_hedged_requests/test.py
+++ b/tests/integration/test_hedged_requests/test.py
@@ -128,6 +128,22 @@ def check_changing_replica_events(expected_count):
     assert int(result) >= expected_count
 
 
+def check_if_query_sending_was_suspended():
+    result = NODES["node"].query(
+        "SELECT value FROM system.events WHERE event='SuspendSendingQueryToShard'"
+    )
+
+    assert int(result) >= 1
+
+
+def check_if_query_sending_was_not_suspended():
+    result = NODES["node"].query(
+        "SELECT value FROM system.events WHERE event='SuspendSendingQueryToShard'"
+    )
+
+    assert result == ""
+
+
 def update_configs(
     node_1_sleep_in_send_tables_status=0,
     node_1_sleep_in_send_data=0,
@@ -341,3 +357,68 @@ def test_initial_receive_timeout(started_cluster):
     )
 
     assert "SOCKET_TIMEOUT" in result
+
+
+def test_async_connect(started_cluster):
+    update_configs()
+
+    NODES["node"].restart_clickhouse()
+
+    NODES["node"].query("DROP TABLE IF EXISTS distributed_connect")
+
+    NODES["node"].query(
+        """CREATE TABLE distributed_connect (id UInt32, date Date) ENGINE =
+        Distributed('test_cluster_connect', 'default', 'test_hedged')"""
+    )
+
+    NODES["node"].query(
+        "SELECT hostName(), id FROM distributed_connect ORDER BY id LIMIT 1 SETTINGS prefer_localhost_replica = 0, connect_timeout_with_failover_ms=5000, async_query_sending_for_remote=0, max_threads=1"
+    )
+    check_changing_replica_events(2)
+    check_if_query_sending_was_not_suspended()
+
+    NODES["node"].query(
+        "SELECT hostName(), id FROM distributed_connect ORDER BY id LIMIT 1 SETTINGS prefer_localhost_replica = 0, connect_timeout_with_failover_ms=5000, async_query_sending_for_remote=1, max_threads=1"
+    )
+    check_changing_replica_events(2)
+    check_if_query_sending_was_suspended()
+
+    NODES["node"].query("DROP TABLE distributed_connect")
+
+
+def test_async_query_sending(started_cluster):
+    update_configs(
+        node_1_sleep_after_receiving_query=5000,
+        node_2_sleep_after_receiving_query=5000,
+        node_3_sleep_after_receiving_query=5000,
+    )
+
+    NODES["node"].restart_clickhouse()
+
+    NODES["node"].query("DROP TABLE IF EXISTS distributed_query_sending")
+
+    NODES["node"].query(
+        """CREATE TABLE distributed_query_sending (id UInt32, date Date) ENGINE =
+        Distributed('test_cluster_three_shards', 'default', 'test_hedged')"""
+    )
+
+    # Create big enough temporary table
+    NODES["node"].query("DROP TABLE IF EXISTS tmp")
+    NODES["node"].query(
+        "CREATE TEMPORARY TABLE tmp (number UInt64, s String) "
+        "as select number, randomString(number % 1000) from numbers(10000000)"
+    )
+
+    NODES["node"].query(
+        "SELECT hostName(), id FROM distributed_query_sending ORDER BY id LIMIT 1 SETTINGS"
+        " prefer_localhost_replica = 0, async_query_sending_for_remote=0, max_threads = 1"
+    )
+    check_if_query_sending_was_not_suspended()
+
+    NODES["node"].query(
+        "SELECT hostName(), id FROM distributed_query_sending ORDER BY id LIMIT 1 SETTINGS"
+        " prefer_localhost_replica = 0, async_query_sending_for_remote=1, max_threads = 1"
+    )
+    check_if_query_sending_was_suspended()
+
+    NODES["node"].query("DROP TABLE distributed_query_sending")
diff --git a/tests/integration/test_host_regexp_multiple_ptr_records_concurrent/scripts/stress_test.py b/tests/integration/test_host_regexp_multiple_ptr_records_concurrent/scripts/stress_test.py
index b8bafb3d0c1..fe69d72c1c7 100644
--- a/tests/integration/test_host_regexp_multiple_ptr_records_concurrent/scripts/stress_test.py
+++ b/tests/integration/test_host_regexp_multiple_ptr_records_concurrent/scripts/stress_test.py
@@ -13,7 +13,6 @@ number_of_iterations = 100
 
 
 def perform_request():
-
     buffer = BytesIO()
     crl = pycurl.Curl()
     crl.setopt(pycurl.INTERFACE, client_ip)
diff --git a/tests/integration/test_http_handlers_config/test.py b/tests/integration/test_http_handlers_config/test.py
index 9c64bd41b23..1b347f6271f 100644
--- a/tests/integration/test_http_handlers_config/test.py
+++ b/tests/integration/test_http_handlers_config/test.py
@@ -147,6 +147,18 @@ def test_predefined_query_handler():
         assert b"max_final_threads\t1\nmax_threads\t1\n" == res2.content
         assert "application/generic+one" == res2.headers["content-type"]
 
+        cluster.instance.query(
+            "CREATE TABLE test_table (id UInt32, data String) Engine=TinyLog"
+        )
+        res3 = cluster.instance.http_request(
+            "test_predefined_handler_post_body?id=100",
+            method="POST",
+            data="TEST".encode("utf8"),
+        )
+        assert res3.status_code == 200
+        assert cluster.instance.query("SELECT * FROM test_table") == "100\tTEST\n"
+        cluster.instance.query("DROP TABLE test_table")
+
 
 def test_fixed_static_handler():
     with contextlib.closing(
diff --git a/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml b/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml
index 5b5de63356e..1b8ddfab323 100644
--- a/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml
+++ b/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml
@@ -21,5 +21,13 @@
                 <content_type>application/generic+one</content_type>
             </handler>
         </rule>
+        <rule>
+            <methods>POST</methods>
+            <url>/test_predefined_handler_post_body</url>
+            <handler>
+                <type>predefined_query_handler</type>
+                <query>INSERT INTO test_table(id, data) SELECT {id:UInt32}, {_request_body:String}</query>
+            </handler>
+        </rule>
     </http_handlers>
 </clickhouse>
diff --git a/tests/integration/test_insert_into_distributed/test.py b/tests/integration/test_insert_into_distributed/test.py
index a52809f817c..3bee2149387 100644
--- a/tests/integration/test_insert_into_distributed/test.py
+++ b/tests/integration/test_insert_into_distributed/test.py
@@ -288,7 +288,7 @@ def test_inserts_single_replica_no_internal_replication(started_cluster):
                     "prefer_localhost_replica": "0",
                 },
             )
-        assert node2.query("SELECT count(*) FROM single_replicated").strip() == "1"
+        assert node2.query("SELECT count(*) FROM single_replicated").strip() == "0"
     finally:
         node2.query("TRUNCATE TABLE single_replicated")
 
diff --git a/tests/integration/test_inserts_with_keeper_retries/test.py b/tests/integration/test_inserts_with_keeper_retries/test.py
index dbf18365053..3937823a37b 100644
--- a/tests/integration/test_inserts_with_keeper_retries/test.py
+++ b/tests/integration/test_inserts_with_keeper_retries/test.py
@@ -98,3 +98,23 @@ def test_replica_inserts_with_keeper_disconnect(started_cluster):
 
     finally:
         node1.query("DROP TABLE IF EXISTS r SYNC")
+
+
+def test_query_timeout_with_zk_down(started_cluster):
+    try:
+        node1.query(
+            "CREATE TABLE zk_down (a UInt64, b String) ENGINE=ReplicatedMergeTree('/test/zk_down', '0') ORDER BY tuple()"
+        )
+
+        cluster.stop_zookeeper_nodes(["zoo1", "zoo2", "zoo3"])
+
+        start_time = time.time()
+        with pytest.raises(QueryRuntimeException):
+            node1.query(
+                "INSERT INTO zk_down SELECT number, toString(number) FROM numbers(10) SETTINGS insert_keeper_max_retries=10000, insert_keeper_retry_max_backoff_ms=1000, max_execution_time=1"
+            )
+        finish_time = time.time()
+        assert finish_time - start_time < 10
+    finally:
+        cluster.start_zookeeper_nodes(["zoo1", "zoo2", "zoo3"])
+        node1.query("DROP TABLE IF EXISTS zk_down SYNC")
diff --git a/tests/integration/test_jbod_balancer/test.py b/tests/integration/test_jbod_balancer/test.py
index e746698611a..df34a075d5a 100644
--- a/tests/integration/test_jbod_balancer/test.py
+++ b/tests/integration/test_jbod_balancer/test.py
@@ -45,7 +45,6 @@ def start_cluster():
 
 
 def check_balance(node, table):
-
     partitions = node.query(
         """
         WITH
diff --git a/tests/integration/test_keeper_and_access_storage/test.py b/tests/integration/test_keeper_and_access_storage/test.py
index 6ec307f7082..0314825b6b7 100644
--- a/tests/integration/test_keeper_and_access_storage/test.py
+++ b/tests/integration/test_keeper_and_access_storage/test.py
@@ -10,6 +10,7 @@ node1 = cluster.add_instance(
     "node1", main_configs=["configs/keeper.xml"], stay_alive=True
 )
 
+
 # test that server is able to start
 @pytest.fixture(scope="module")
 def started_cluster():
diff --git a/tests/integration/test_keeper_back_to_back/test.py b/tests/integration/test_keeper_back_to_back/test.py
index 73fface02b4..b737ac284d2 100644
--- a/tests/integration/test_keeper_back_to_back/test.py
+++ b/tests/integration/test_keeper_back_to_back/test.py
@@ -546,7 +546,6 @@ def test_random_requests(started_cluster):
 
 
 def test_end_of_session(started_cluster):
-
     fake_zk1 = None
     fake_zk2 = None
     genuine_zk1 = None
@@ -685,6 +684,7 @@ def test_concurrent_watches(started_cluster):
             nonlocal watches_created
             nonlocal all_paths_created
             fake_zk.ensure_path(global_path + "/" + str(i))
+
             # new function each time
             def dumb_watch(event):
                 nonlocal dumb_watch_triggered_counter
diff --git a/tests/integration/test_keeper_four_word_command/configs/enable_keeper1.xml b/tests/integration/test_keeper_four_word_command/configs/enable_keeper1.xml
index a686c96e426..0ec413ac2ec 100644
--- a/tests/integration/test_keeper_four_word_command/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/enable_keeper1.xml
@@ -1,5 +1,7 @@
-<yandex>
+<clickhouse>
     <keeper_server>
+        <use_cluster>false</use_cluster>
+
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@@ -39,4 +41,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_four_word_command/configs/enable_keeper2.xml b/tests/integration/test_keeper_four_word_command/configs/enable_keeper2.xml
index 9818d32a74a..fde345f67b3 100644
--- a/tests/integration/test_keeper_four_word_command/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/enable_keeper2.xml
@@ -1,5 +1,7 @@
-<yandex>
+<clickhouse>
     <keeper_server>
+        <use_cluster>false</use_cluster>
+
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@@ -39,4 +41,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_four_word_command/configs/enable_keeper3.xml b/tests/integration/test_keeper_four_word_command/configs/enable_keeper3.xml
index 5a883fac3f6..84a8a402b46 100644
--- a/tests/integration/test_keeper_four_word_command/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/enable_keeper3.xml
@@ -1,5 +1,7 @@
-<yandex>
+<clickhouse>
     <keeper_server>
+        <use_cluster>false</use_cluster>
+
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@@ -39,4 +41,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_allow_list.xml b/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_allow_list.xml
index feafd3f6b44..b06f845ecf7 100644
--- a/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_allow_list.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_allow_list.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -21,4 +21,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_allow_list_all.xml b/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_allow_list_all.xml
index 523e6b2fa27..46c2681c581 100644
--- a/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_allow_list_all.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_allow_list_all.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
@@ -21,4 +21,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_four_word_command/configs/keeper_config_without_allow_list.xml b/tests/integration/test_keeper_four_word_command/configs/keeper_config_without_allow_list.xml
index 891f8a2ec12..cd5dea882af 100644
--- a/tests/integration/test_keeper_four_word_command/configs/keeper_config_without_allow_list.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/keeper_config_without_allow_list.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
@@ -20,4 +20,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_four_word_command/test.py b/tests/integration/test_keeper_four_word_command/test.py
index 04f6800b92b..2098daea5fe 100644
--- a/tests/integration/test_keeper_four_word_command/test.py
+++ b/tests/integration/test_keeper_four_word_command/test.py
@@ -1,14 +1,7 @@
-import socket
 import pytest
 from helpers.cluster import ClickHouseCluster
 import helpers.keeper_utils as keeper_utils
-import random
-import string
-import os
 import time
-from multiprocessing.dummy import Pool
-from helpers.test_tools import assert_eq_with_retry
-from io import StringIO
 import csv
 import re
 
@@ -23,7 +16,7 @@ node3 = cluster.add_instance(
     "node3", main_configs=["configs/enable_keeper3.xml"], stay_alive=True
 )
 
-from kazoo.client import KazooClient, KazooState
+from kazoo.client import KazooClient
 
 
 def wait_nodes():
@@ -285,8 +278,9 @@ def test_cmd_conf(started_cluster):
         assert result["fresh_log_gap"] == "200"
 
         assert result["max_requests_batch_size"] == "100"
+        assert result["max_requests_batch_bytes_size"] == "102400"
         assert result["max_request_queue_size"] == "100000"
-        assert result["max_requests_quick_batch_size"] == "10"
+        assert result["max_requests_quick_batch_size"] == "100"
         assert result["quorum_reads"] == "false"
         assert result["force_sync"] == "true"
 
@@ -679,3 +673,44 @@ def test_cmd_rqld(started_cluster):
                     + " does not become leader after 30s, maybe there is something wrong."
                 )
         assert keeper_utils.is_leader(cluster, node)
+
+
+def test_cmd_clrs(started_cluster):
+    if node1.is_built_with_sanitizer():
+        return
+
+    def get_memory_purges():
+        return node1.query(
+            "SELECT value FROM system.events WHERE event = 'MemoryAllocatorPurge' SETTINGS system_events_show_zero_values = 1"
+        )
+
+    zk = None
+    try:
+        wait_nodes()
+
+        zk = get_fake_zk(node1.name, timeout=30.0)
+
+        paths = [f"/clrs_{i}" for i in range(10000)]
+
+        # we only count the events because we cannot reliably test memory usage of Keeper
+        # but let's create and delete nodes so the first purge needs to release some memory
+        create_transaction = zk.transaction()
+        for path in paths:
+            create_transaction.create(path)
+        create_transaction.commit()
+
+        delete_transaction = zk.transaction()
+        for path in paths:
+            delete_transaction.delete(path)
+        delete_transaction.commit()
+
+        # repeat multiple times to make sure MemoryAllocatorPurge isn't increased because of other reasons
+        for _ in range(5):
+            prev_purges = int(get_memory_purges())
+            keeper_utils.send_4lw_cmd(cluster, node1, cmd="clrs")
+            current_purges = int(get_memory_purges())
+            assert current_purges > prev_purges
+            prev_purges = current_purges
+
+    finally:
+        destroy_zk_client(zk)
diff --git a/tests/integration/test_keeper_map/test.py b/tests/integration/test_keeper_map/test.py
index 3809f046d55..c6ec7103056 100644
--- a/tests/integration/test_keeper_map/test.py
+++ b/tests/integration/test_keeper_map/test.py
@@ -1,14 +1,6 @@
-import multiprocessing
 import pytest
-from time import sleep
-import random
-from itertools import count
-from sys import stdout
-
-from multiprocessing.dummy import Pool
 
 from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import assert_eq_with_retry, assert_logs_contain
 from helpers.network import PartitionManager
 
 test_recover_staled_replica_run = 1
@@ -46,108 +38,6 @@ def remove_children(client, path):
         client.delete(child_path)
 
 
-def test_create_keeper_map(started_cluster):
-    node.query(
-        "CREATE TABLE test_keeper_map (key UInt64, value UInt64) ENGINE = KeeperMap('/test1') PRIMARY KEY(key);"
-    )
-    zk_client = get_genuine_zk()
-
-    def assert_children_size(path, expected_size):
-        children_size = 0
-        # 4 secs should be more than enough for replica to sync
-        for _ in range(10):
-            children_size = len(zk_client.get_children(path))
-            if children_size == expected_size:
-                return
-            sleep(0.4)
-        assert (
-            False
-        ), f"Invalid number of children for '{path}': actual {children_size}, expected {expected_size}"
-
-    def assert_root_children_size(expected_size):
-        assert_children_size("/test_keeper_map/test1", expected_size)
-
-    def assert_data_children_size(expected_size):
-        assert_children_size("/test_keeper_map/test1/data", expected_size)
-
-    assert_root_children_size(2)
-    assert_data_children_size(0)
-
-    node.query("INSERT INTO test_keeper_map VALUES (1, 11)")
-    assert_data_children_size(1)
-
-    node.query(
-        "CREATE TABLE test_keeper_map_another (key UInt64, value UInt64) ENGINE = KeeperMap('/test1') PRIMARY KEY(key);"
-    )
-    assert_root_children_size(2)
-    assert_data_children_size(1)
-
-    node.query("INSERT INTO test_keeper_map_another VALUES (1, 11)")
-    assert_root_children_size(2)
-    assert_data_children_size(1)
-
-    node.query("INSERT INTO test_keeper_map_another VALUES (2, 22)")
-    assert_root_children_size(2)
-    assert_data_children_size(2)
-
-    node.query("DROP TABLE test_keeper_map SYNC")
-    assert_root_children_size(2)
-    assert_data_children_size(2)
-
-    node.query("DROP TABLE test_keeper_map_another SYNC")
-    assert_root_children_size(0)
-
-    zk_client.stop()
-
-
-def create_drop_loop(index, stop_event):
-    table_name = f"test_keeper_map_{index}"
-
-    for i in count(0, 1):
-        if stop_event.is_set():
-            return
-
-        node.query_with_retry(
-            f"CREATE TABLE IF NOT EXISTS {table_name} (key UInt64, value UInt64) ENGINE = KeeperMap('/test') PRIMARY KEY(key);"
-        )
-        node.query_with_retry(f"INSERT INTO {table_name} VALUES ({index}, {i})")
-        result = node.query_with_retry(
-            f"SELECT value FROM {table_name} WHERE key = {index}"
-        )
-        assert result.strip() == str(i)
-        node.query_with_retry(f"DROP TABLE IF EXISTS {table_name} SYNC")
-
-
-def test_create_drop_keeper_map_concurrent(started_cluster):
-    pool = Pool()
-    manager = multiprocessing.Manager()
-    stop_event = manager.Event()
-    results = []
-    for i in range(multiprocessing.cpu_count()):
-        sleep(0.2)
-        results.append(
-            pool.apply_async(
-                create_drop_loop,
-                args=(
-                    i,
-                    stop_event,
-                ),
-            )
-        )
-
-    sleep(60)
-    stop_event.set()
-
-    for result in results:
-        result.get()
-
-    pool.close()
-
-    client = get_genuine_zk()
-    assert len(client.get_children("/test_keeper_map/test")) == 0
-    client.stop()
-
-
 def test_keeper_map_without_zk(started_cluster):
     def assert_keeper_exception_after_partition(query):
         with PartitionManager() as pm:
diff --git a/tests/integration/test_part_moves_between_shards/__init__.py b/tests/integration/test_keeper_mntr_data_size/__init__.py
similarity index 100%
rename from tests/integration/test_part_moves_between_shards/__init__.py
rename to tests/integration/test_keeper_mntr_data_size/__init__.py
diff --git a/tests/integration/test_keeper_mntr_data_size/configs/enable_keeper.xml b/tests/integration/test_keeper_mntr_data_size/configs/enable_keeper.xml
new file mode 100644
index 00000000000..519154e835b
--- /dev/null
+++ b/tests/integration/test_keeper_mntr_data_size/configs/enable_keeper.xml
@@ -0,0 +1,30 @@
+<clickhouse>
+    <keeper_server>
+        <use_cluster>false</use_cluster>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <snapshot_distance>10</snapshot_distance>
+            <reserved_log_items>5</reserved_log_items>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+
+            <!-- For instant start in single node configuration -->
+            <heart_beat_interval_ms>0</heart_beat_interval_ms>
+            <election_timeout_lower_bound_ms>0</election_timeout_lower_bound_ms>
+            <election_timeout_upper_bound_ms>0</election_timeout_upper_bound_ms>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>9234</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_mntr_data_size/test.py b/tests/integration/test_keeper_mntr_data_size/test.py
new file mode 100644
index 00000000000..68fb25f0cbe
--- /dev/null
+++ b/tests/integration/test_keeper_mntr_data_size/test.py
@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+import helpers.keeper_utils as keeper_utils
+import random
+import string
+from kazoo.client import KazooClient, KazooState
+
+
+cluster = ClickHouseCluster(__file__)
+
+# clickhouse itself will use external zookeeper
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/enable_keeper.xml"],
+    stay_alive=True,
+)
+
+
+def random_string(length):
+    return "".join(random.choices(string.ascii_lowercase + string.digits, k=length))
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def get_connection_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(
+        hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout
+    )
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+
+def restart_clickhouse():
+    node.restart_clickhouse()
+    keeper_utils.wait_until_connected(cluster, node)
+
+
+def test_mntr_data_size_after_restart(started_cluster):
+    try:
+        node_zk = None
+        node_zk = get_connection_zk("node")
+
+        node_zk.create("/test_mntr_data_size", b"somevalue")
+        for i in range(100):
+            node_zk.create(
+                "/test_mntr_data_size/node" + str(i), random_string(123).encode()
+            )
+
+        node_zk.stop()
+        node_zk.close()
+        node_zk = None
+
+        def get_line_from_mntr(mntr_str, key):
+            return next(
+                filter(
+                    lambda line: key in line,
+                    mntr_str.split("\n"),
+                ),
+                None,
+            )
+
+        mntr_result = keeper_utils.send_4lw_cmd(started_cluster, node, "mntr")
+        line_size_before = get_line_from_mntr(mntr_result, "zk_approximate_data_size")
+        node_count_before = get_line_from_mntr(mntr_result, "zk_znode_count")
+        assert (
+            get_line_from_mntr(mntr_result, "zk_ephemerals_count")
+            == "zk_ephemerals_count\t0"
+        )
+        assert line_size_before != None
+
+        restart_clickhouse()
+
+        def assert_mntr_stats():
+            mntr_result = keeper_utils.send_4lw_cmd(started_cluster, node, "mntr")
+            assert (
+                get_line_from_mntr(mntr_result, "zk_ephemerals_count")
+                == "zk_ephemerals_count\t0"
+            )
+            assert (
+                get_line_from_mntr(mntr_result, "zk_znode_count") == node_count_before
+            )
+            assert (
+                get_line_from_mntr(mntr_result, "zk_approximate_data_size")
+                == line_size_before
+            )
+
+        assert_mntr_stats()
+        keeper_utils.send_4lw_cmd(started_cluster, node, "rclc")
+        assert_mntr_stats()
+    finally:
+        try:
+            if node_zk is not None:
+                node_zk.stop()
+                node_zk.close()
+        except:
+            pass
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml
index c1d38a1de52..03307e912f6 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml
@@ -1,5 +1,7 @@
 <clickhouse>
     <keeper_server>
+        <use_cluster>false</use_cluster>
+
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml
index d2717283a8d..39a60afffec 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml
@@ -1,5 +1,7 @@
 <clickhouse>
     <keeper_server>
+        <use_cluster>false</use_cluster>
+
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml
index 5924ee1c2dc..0f2d5ff912b 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml
@@ -1,5 +1,7 @@
 <clickhouse>
     <keeper_server>
+        <use_cluster>false</use_cluster>
+
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml
index d261e4f67f3..f5061fe0f36 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml
@@ -1,5 +1,7 @@
 <clickhouse>
     <keeper_server>
+        <use_cluster>false</use_cluster>
+
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml
index 697986638d7..57585080e0f 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml
@@ -1,5 +1,7 @@
 <clickhouse>
     <keeper_server>
+        <use_cluster>false</use_cluster>
+
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml
index 967940e1e2b..35493e22270 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml
@@ -1,5 +1,7 @@
 <clickhouse>
     <keeper_server>
+        <use_cluster>false</use_cluster>
+
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
diff --git a/tests/integration/test_keeper_persistent_log/test.py b/tests/integration/test_keeper_persistent_log/test.py
index 70cc14fe26d..4164ffb33d3 100644
--- a/tests/integration/test_keeper_persistent_log/test.py
+++ b/tests/integration/test_keeper_persistent_log/test.py
@@ -163,7 +163,6 @@ def test_state_duplicate_restart(started_cluster):
 
 # http://zookeeper-user.578899.n2.nabble.com/Why-are-ephemeral-nodes-written-to-disk-tp7583403p7583418.html
 def test_ephemeral_after_restart(started_cluster):
-
     try:
         node_zk = None
         node_zk2 = None
diff --git a/tests/integration/test_keeper_session/test.py b/tests/integration/test_keeper_session/test.py
index 72a162c1765..e57057a8258 100644
--- a/tests/integration/test_keeper_session/test.py
+++ b/tests/integration/test_keeper_session/test.py
@@ -167,6 +167,7 @@ def test_session_close_shutdown(started_cluster):
 
     eph_node = "/test_node"
     node2_zk.create(eph_node, ephemeral=True)
+    node1_zk.sync(eph_node)
     assert node1_zk.exists(eph_node) != None
 
     # shutdown while session is active
diff --git a/tests/integration/test_keeper_snapshots/test.py b/tests/integration/test_keeper_snapshots/test.py
index ce57a852dca..2e126ed1152 100644
--- a/tests/integration/test_keeper_snapshots/test.py
+++ b/tests/integration/test_keeper_snapshots/test.py
@@ -57,9 +57,10 @@ def restart_clickhouse():
 
 
 def test_state_after_restart(started_cluster):
+    keeper_utils.wait_until_connected(started_cluster, node)
+    node_zk = None
+    node_zk2 = None
     try:
-        node_zk = None
-        node_zk2 = None
         node_zk = get_connection_zk("node")
 
         node_zk.create("/test_state_after_restart", b"somevalue")
@@ -108,9 +109,10 @@ def test_state_after_restart(started_cluster):
 
 
 def test_ephemeral_after_restart(started_cluster):
+    keeper_utils.wait_until_connected(started_cluster, node)
+    node_zk = None
+    node_zk2 = None
     try:
-        node_zk = None
-        node_zk2 = None
         node_zk = get_connection_zk("node")
 
         session_id = node_zk._session_id
diff --git a/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml b/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml
index 9b50f2c6c41..38ef4295b01 100644
--- a/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml
+++ b/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml
@@ -1,5 +1,7 @@
 <clickhouse>
     <keeper_server>
+        <use_cluster>false</use_cluster>
+
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/logs</log_storage_path>
diff --git a/tests/integration/test_keeper_zookeeper_converter/test.py b/tests/integration/test_keeper_zookeeper_converter/test.py
index 063421bf922..de5a9416119 100644
--- a/tests/integration/test_keeper_zookeeper_converter/test.py
+++ b/tests/integration/test_keeper_zookeeper_converter/test.py
@@ -114,7 +114,6 @@ def start_clickhouse():
 
 
 def copy_zookeeper_data(make_zk_snapshots):
-
     if make_zk_snapshots:  # force zookeeper to create snapshot
         generate_zk_snapshot()
     else:
diff --git a/tests/integration/test_log_levels_update/test.py b/tests/integration/test_log_levels_update/test.py
index 176733cd7cb..4b83b6431fc 100644
--- a/tests/integration/test_log_levels_update/test.py
+++ b/tests/integration/test_log_levels_update/test.py
@@ -10,7 +10,7 @@ node = cluster.add_instance(
 
 config = """<clickhouse>
     <logger>
-        <level>information</level>
+        <level>debug</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
     </logger>
 </clickhouse>"""
@@ -63,4 +63,4 @@ def test_log_levels_update(start_cluster):
 
     log = get_log(node)
     assert len(log) > 0
-    assert not re.search("(<Trace>|<Debug>)", log)
+    assert not re.search("<Trace>", log)
diff --git a/tests/integration/test_mask_sensitive_info/configs/named_collections.xml b/tests/integration/test_mask_sensitive_info/configs/named_collections.xml
index ee923a90171..3d294874d68 100644
--- a/tests/integration/test_mask_sensitive_info/configs/named_collections.xml
+++ b/tests/integration/test_mask_sensitive_info/configs/named_collections.xml
@@ -1,10 +1,18 @@
 <clickhouse>
+    <display_secrets_in_show_and_select>1</display_secrets_in_show_and_select>
     <named_collections>
         <named_collection_1/>
         <named_collection_2/>
-        <named_collection_3/>
-        <named_collection_4/>
-        <named_collection_5/>
+        <named_collection_3>
+            <user>user</user>
+            <password>pass</password>
+        </named_collection_3>
+        <named_collection_4>
+            <host></host>
+        </named_collection_4>
+        <named_collection_5>
+            <host></host>
+        </named_collection_5>
         <named_collection_6/>
     </named_collections>
 </clickhouse>
diff --git a/tests/integration/test_mask_sensitive_info/test.py b/tests/integration/test_mask_sensitive_info/test.py
index 3f71b047213..2131a76b5be 100644
--- a/tests/integration/test_mask_sensitive_info/test.py
+++ b/tests/integration/test_mask_sensitive_info/test.py
@@ -65,14 +65,15 @@ def system_query_log_contains_search_pattern(search_pattern):
     )
 
 
-# Generates a random string.
 def new_password(len=16):
     return "".join(
         random.choice(string.ascii_uppercase + string.digits) for _ in range(len)
     )
 
 
-# Passwords in CREATE/ALTER queries must be hidden in logs.
+show_secrets = "SETTINGS format_display_secrets_in_show_and_select"
+
+
 def test_create_alter_user():
     password = new_password()
 
@@ -95,21 +96,37 @@ def test_create_alter_user():
 
     check_logs(
         must_contain=[
-            "CREATE USER u1 IDENTIFIED WITH sha256_password",
-            "ALTER USER u1 IDENTIFIED WITH sha256_password",
+            "CREATE USER u1 IDENTIFIED",
+            "ALTER USER u1 IDENTIFIED",
             "CREATE USER u2 IDENTIFIED WITH plaintext_password",
         ],
         must_not_contain=[
             password,
-            "IDENTIFIED WITH sha256_password BY",
-            "IDENTIFIED WITH sha256_hash BY",
+            "IDENTIFIED BY",
+            "IDENTIFIED BY",
             "IDENTIFIED WITH plaintext_password BY",
         ],
     )
 
+    assert "BY" in node.query(f"SHOW CREATE USER u1 {show_secrets}=1")
+    assert "BY" in node.query(f"SHOW CREATE USER u2 {show_secrets}=1")
+
     node.query("DROP USER u1, u2")
 
 
+def check_secrets_for_tables(tables, table_name_prefix, password):
+    for i, table in enumerate(tables):
+        table_name = table_name_prefix + str(i)
+        if password in table:
+            assert password in node.query(
+                f"SHOW CREATE TABLE {table_name} {show_secrets}=1"
+            )
+            assert password in node.query(
+                f"SELECT create_table_query, engine_full FROM system.tables WHERE name = '{table_name}' "
+                f"{show_secrets}=1"
+            )
+
+
 def test_create_table():
     password = new_password()
 
@@ -126,28 +143,32 @@ def test_create_table():
         f"MySQL(named_collection_2, database = 'mysql_db', host = 'mysql57', port = 3306, password = '{password}', table = 'mysql_table', user = 'mysql_user')",
         f"MySQL(named_collection_3, database = 'mysql_db', host = 'mysql57', port = 3306, table = 'mysql_table')",
         f"PostgreSQL(named_collection_4, host = 'postgres1', port = 5432, database = 'postgres_db', table = 'postgres_table', user = 'postgres_user', password = '{password}')",
-        f"MongoDB(named_collection_5, host = 'mongo1', port = 5432, database = 'mongo_db', collection = 'mongo_col', user = 'mongo_user', password = '{password}')",
+        f"MongoDB(named_collection_5, host = 'mongo1', port = 5432, db = 'mongo_db', collection = 'mongo_col', user = 'mongo_user', password = '{password}')",
         f"S3(named_collection_6, url = 'http://minio1:9001/root/data/test8.csv', access_key_id = 'minio', secret_access_key = '{password}', format = 'CSV')",
     ]
 
     for i, table_engine in enumerate(table_engines):
         node.query(f"CREATE TABLE table{i} (x int) ENGINE = {table_engine}")
 
-    assert (
-        node.query("SHOW CREATE TABLE table0")
-        == "CREATE TABLE default.table0\\n(\\n    `x` Int32\\n)\\nENGINE = MySQL(\\'mysql57:3306\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'[HIDDEN]\\')\n"
-    )
+    for toggle, secret in enumerate(["[HIDDEN]", password]):
+        assert (
+            node.query(f"SHOW CREATE TABLE table0 {show_secrets}={toggle}")
+            == "CREATE TABLE default.table0\\n(\\n    `x` Int32\\n)\\n"
+            "ENGINE = MySQL(\\'mysql57:3306\\', \\'mysql_db\\', "
+            f"\\'mysql_table\\', \\'mysql_user\\', \\'{secret}\\')\n"
+        )
 
-    assert node.query(
-        "SELECT create_table_query, engine_full FROM system.tables WHERE name = 'table0'"
-    ) == TSV(
-        [
+        assert node.query(
+            f"SELECT create_table_query, engine_full FROM system.tables WHERE name = 'table0' {show_secrets}={toggle}"
+        ) == TSV(
             [
-                "CREATE TABLE default.table0 (`x` Int32) ENGINE = MySQL(\\'mysql57:3306\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'[HIDDEN]\\')",
-                "MySQL(\\'mysql57:3306\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'[HIDDEN]\\')",
-            ],
-        ]
-    )
+                [
+                    "CREATE TABLE default.table0 (`x` Int32) ENGINE = MySQL(\\'mysql57:3306\\', \\'mysql_db\\', "
+                    f"\\'mysql_table\\', \\'mysql_user\\', \\'{secret}\\')",
+                    f"MySQL(\\'mysql57:3306\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'{secret}\\')",
+                ],
+            ]
+        )
 
     check_logs(
         must_contain=[
@@ -163,13 +184,15 @@ def test_create_table():
             "CREATE TABLE table9 (`x` int) ENGINE = MySQL(named_collection_2, database = 'mysql_db', host = 'mysql57', port = 3306, password = '[HIDDEN]', table = 'mysql_table', user = 'mysql_user')",
             "CREATE TABLE table10 (x int) ENGINE = MySQL(named_collection_3, database = 'mysql_db', host = 'mysql57', port = 3306, table = 'mysql_table')",
             "CREATE TABLE table11 (`x` int) ENGINE = PostgreSQL(named_collection_4, host = 'postgres1', port = 5432, database = 'postgres_db', table = 'postgres_table', user = 'postgres_user', password = '[HIDDEN]')",
-            "CREATE TABLE table12 (`x` int) ENGINE = MongoDB(named_collection_5, host = 'mongo1', port = 5432, database = 'mongo_db', collection = 'mongo_col', user = 'mongo_user', password = '[HIDDEN]'",
+            "CREATE TABLE table12 (`x` int) ENGINE = MongoDB(named_collection_5, host = 'mongo1', port = 5432, db = 'mongo_db', collection = 'mongo_col', user = 'mongo_user', password = '[HIDDEN]'",
             "CREATE TABLE table13 (`x` int) ENGINE = S3(named_collection_6, url = 'http://minio1:9001/root/data/test8.csv', access_key_id = 'minio', secret_access_key = '[HIDDEN]', format = 'CSV')",
         ],
         must_not_contain=[password],
     )
 
-    for i in range(0, len(table_engines)):
+    check_secrets_for_tables(table_engines, "table", password)
+
+    for i in range(len(table_engines)):
         node.query(f"DROP TABLE table{i}")
 
 
@@ -198,7 +221,7 @@ def test_create_database():
         must_not_contain=[password],
     )
 
-    for i in range(0, len(database_engines)):
+    for i in range(len(database_engines)):
         node.query(f"DROP DATABASE IF EXISTS database{i}")
 
 
@@ -233,29 +256,34 @@ def test_table_functions():
         f"remoteSecure('127.{{2..11}}', 'default', 'remote_table', 'remote_user', rand())",
         f"mysql(named_collection_1, host = 'mysql57', port = 3306, database = 'mysql_db', table = 'mysql_table', user = 'mysql_user', password = '{password}')",
         f"postgresql(named_collection_2, password = '{password}', host = 'postgres1', port = 5432, database = 'postgres_db', table = 'postgres_table', user = 'postgres_user')",
-        f"s3(named_collection_3, url = 'http://minio1:9001/root/data/test4.csv', access_key_id = 'minio', secret_access_key = '{password}')",
-        f"remote(named_collection_4, addresses_expr = '127.{{2..11}}', database = 'default', table = 'remote_table', user = 'remote_user', password = '{password}', sharding_key = rand())",
-        f"remoteSecure(named_collection_5, addresses_expr = '127.{{2..11}}', database = 'default', table = 'remote_table', user = 'remote_user', password = '{password}')",
+        f"s3(named_collection_2, url = 'http://minio1:9001/root/data/test4.csv', access_key_id = 'minio', secret_access_key = '{password}')",
+        f"remote(named_collection_6, addresses_expr = '127.{{2..11}}', database = 'default', table = 'remote_table', user = 'remote_user', password = '{password}', sharding_key = rand())",
+        f"remoteSecure(named_collection_6, addresses_expr = '127.{{2..11}}', database = 'default', table = 'remote_table', user = 'remote_user', password = '{password}')",
     ]
 
     for i, table_function in enumerate(table_functions):
         node.query(f"CREATE TABLE tablefunc{i} (x int) AS {table_function}")
 
-    assert (
-        node.query("SHOW CREATE TABLE tablefunc0")
-        == "CREATE TABLE default.tablefunc0\\n(\\n    `x` Int32\\n) AS mysql(\\'mysql57:3306\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'[HIDDEN]\\')\n"
-    )
+    for toggle, secret in enumerate(["[HIDDEN]", password]):
+        assert (
+            node.query(f"SHOW CREATE TABLE tablefunc0 {show_secrets}={toggle}")
+            == "CREATE TABLE default.tablefunc0\\n(\\n    `x` Int32\\n) AS "
+            "mysql(\\'mysql57:3306\\', \\'mysql_db\\', \\'mysql_table\\', "
+            f"\\'mysql_user\\', \\'{secret}\\')\n"
+        )
 
-    assert node.query(
-        "SELECT create_table_query, engine_full FROM system.tables WHERE name = 'tablefunc0'"
-    ) == TSV(
-        [
+        assert node.query(
+            "SELECT create_table_query, engine_full FROM system.tables WHERE name = 'tablefunc0' "
+            f"{show_secrets}={toggle}"
+        ) == TSV(
             [
-                "CREATE TABLE default.tablefunc0 (`x` Int32) AS mysql(\\'mysql57:3306\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'[HIDDEN]\\')",
-                "",
-            ],
-        ]
-    )
+                [
+                    "CREATE TABLE default.tablefunc0 (`x` Int32) AS mysql(\\'mysql57:3306\\', "
+                    f"\\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'{secret}\\')",
+                    "",
+                ],
+            ]
+        )
 
     check_logs(
         must_contain=[
@@ -286,14 +314,16 @@ def test_table_functions():
             "CREATE TABLE tablefunc24 (x int) AS remoteSecure('127.{2..11}', 'default', 'remote_table', 'remote_user', rand())",
             "CREATE TABLE tablefunc25 (`x` int) AS mysql(named_collection_1, host = 'mysql57', port = 3306, database = 'mysql_db', table = 'mysql_table', user = 'mysql_user', password = '[HIDDEN]')",
             "CREATE TABLE tablefunc26 (`x` int) AS postgresql(named_collection_2, password = '[HIDDEN]', host = 'postgres1', port = 5432, database = 'postgres_db', table = 'postgres_table', user = 'postgres_user')",
-            "CREATE TABLE tablefunc27 (`x` int) AS s3(named_collection_3, url = 'http://minio1:9001/root/data/test4.csv', access_key_id = 'minio', secret_access_key = '[HIDDEN]')",
-            "CREATE TABLE tablefunc28 (`x` int) AS remote(named_collection_4, addresses_expr = '127.{2..11}', database = 'default', table = 'remote_table', user = 'remote_user', password = '[HIDDEN]', sharding_key = rand())",
-            "CREATE TABLE tablefunc29 (`x` int) AS remoteSecure(named_collection_5, addresses_expr = '127.{2..11}', database = 'default', table = 'remote_table', user = 'remote_user', password = '[HIDDEN]')",
+            "CREATE TABLE tablefunc27 (`x` int) AS s3(named_collection_2, url = 'http://minio1:9001/root/data/test4.csv', access_key_id = 'minio', secret_access_key = '[HIDDEN]')",
+            "CREATE TABLE tablefunc28 (`x` int) AS remote(named_collection_6, addresses_expr = '127.{2..11}', database = 'default', table = 'remote_table', user = 'remote_user', password = '[HIDDEN]', sharding_key = rand())",
+            "CREATE TABLE tablefunc29 (`x` int) AS remoteSecure(named_collection_6, addresses_expr = '127.{2..11}', database = 'default', table = 'remote_table', user = 'remote_user', password = '[HIDDEN]')",
         ],
         must_not_contain=[password],
     )
 
-    for i in range(0, len(table_functions)):
+    check_secrets_for_tables(table_functions, "tablefunc", password)
+
+    for i in range(len(table_functions)):
         node.query(f"DROP TABLE tablefunc{i}")
 
 
@@ -369,15 +399,18 @@ def test_create_dictionary():
         f"LIFETIME(MIN 0 MAX 10) LAYOUT(FLAT())"
     )
 
-    assert (
-        node.query("SHOW CREATE TABLE dict1")
-        == "CREATE DICTIONARY default.dict1\\n(\\n    `n` int DEFAULT 0,\\n    `m` int DEFAULT 1\\n)\\nPRIMARY KEY n\\nSOURCE(CLICKHOUSE(HOST \\'localhost\\' PORT 9000 USER \\'user1\\' TABLE \\'test\\' PASSWORD \\'[HIDDEN]\\' DB \\'default\\'))\\nLIFETIME(MIN 0 MAX 10)\\nLAYOUT(FLAT())\n"
-    )
+    for toggle, secret in enumerate(["[HIDDEN]", password]):
+        assert (
+            node.query(f"SHOW CREATE TABLE dict1 {show_secrets}={toggle}")
+            == f"CREATE DICTIONARY default.dict1\\n(\\n    `n` int DEFAULT 0,\\n    `m` int DEFAULT 1\\n)\\nPRIMARY KEY n\\nSOURCE(CLICKHOUSE(HOST \\'localhost\\' PORT 9000 USER \\'user1\\' TABLE \\'test\\' PASSWORD \\'{secret}\\' DB \\'default\\'))\\nLIFETIME(MIN 0 MAX 10)\\nLAYOUT(FLAT())\n"
+        )
 
-    assert (
-        node.query("SELECT create_table_query FROM system.tables WHERE name = 'dict1'")
-        == "CREATE DICTIONARY default.dict1 (`n` int DEFAULT 0, `m` int DEFAULT 1) PRIMARY KEY n SOURCE(CLICKHOUSE(HOST \\'localhost\\' PORT 9000 USER \\'user1\\' TABLE \\'test\\' PASSWORD \\'[HIDDEN]\\' DB \\'default\\')) LIFETIME(MIN 0 MAX 10) LAYOUT(FLAT())\n"
-    )
+        assert (
+            node.query(
+                f"SELECT create_table_query FROM system.tables WHERE name = 'dict1' {show_secrets}={toggle}"
+            )
+            == f"CREATE DICTIONARY default.dict1 (`n` int DEFAULT 0, `m` int DEFAULT 1) PRIMARY KEY n SOURCE(CLICKHOUSE(HOST \\'localhost\\' PORT 9000 USER \\'user1\\' TABLE \\'test\\' PASSWORD \\'{secret}\\' DB \\'default\\')) LIFETIME(MIN 0 MAX 10) LAYOUT(FLAT())\n"
+        )
 
     check_logs(
         must_contain=[
@@ -448,4 +481,4 @@ def test_on_cluster():
         "%CREATE TABLE default.table_oncl UUID \\'%\\' (`x` Int32) ENGINE = MySQL(\\'mysql57:3307\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'[HIDDEN]\\')"
     )
 
-    node.query(f"DROP TABLE table_oncl")
+    node.query("DROP TABLE table_oncl")
diff --git a/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py b/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
index 5b75b0dfc38..97e2de49ceb 100644
--- a/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
@@ -2063,7 +2063,7 @@ def materialized_database_support_all_kinds_of_mysql_datatype(
     # increment synchronization check
     check_query(
         clickhouse_node,
-        "SELECT v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, hex(v25), v26, v28, v29, v30, v32 FROM test_database_datatype.t1 FORMAT TSV",
+        "SELECT v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, hex(v25), v26, v28, v29, v30, v32 FROM test_database_datatype.t1 ORDER BY v1 FORMAT TSV",
         "1\t1\t11\t9223372036854775807\t-1\t1\t11\t18446744073709551615\t-1.1\t1.1\t-1.111\t1.111\t1.1111\t2021-10-06\ttext\tvarchar\tBLOB\t2021-10-06 18:32:57\t2021-10-06 18:32:57.482786\t2021-10-06 18:32:57\t2021-10-06 18:32:57.482786"
         + "\t2021\t3020399000000\t3020399000000\t00000000010100000000000000000000000000000000000000\t10\t1\t11\tvarbinary\tRED\n"
         + "2\t2\t22\t9223372036854775807\t-2\t2\t22\t18446744073709551615\t-2.2\t2.2\t-2.22\t2.222\t2.2222\t2021-10-07\ttext\tvarchar\tBLOB\t2021-10-07 18:32:57\t2021-10-07 18:32:57.482786\t2021-10-07 18:32:57\t2021-10-07 18:32:57.482786"
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/__init__.py b/tests/integration/test_max_rows_to_read_leaf_with_view/__init__.py
similarity index 100%
rename from tests/integration/test_replicated_merge_tree_s3_restore/__init__.py
rename to tests/integration/test_max_rows_to_read_leaf_with_view/__init__.py
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml b/tests/integration/test_max_rows_to_read_leaf_with_view/configs/remote_servers.xml
similarity index 51%
rename from tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml
rename to tests/integration/test_max_rows_to_read_leaf_with_view/configs/remote_servers.xml
index d02d5ab0bf5..9ce90edb727 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml
+++ b/tests/integration/test_max_rows_to_read_leaf_with_view/configs/remote_servers.xml
@@ -1,22 +1,18 @@
 <clickhouse>
     <remote_servers>
-        <node>
+        <two_shards>
             <shard>
-                <internal_replication>true</internal_replication>
                 <replica>
-                    <host>node</host>
+                    <host>node1</host>
                     <port>9000</port>
                 </replica>
             </shard>
-        </node>
-        <node_another_bucket>
             <shard>
-                <internal_replication>true</internal_replication>
                 <replica>
-                    <host>node_another_bucket</host>
+                    <host>node2</host>
                     <port>9000</port>
                 </replica>
             </shard>
-        </node_another_bucket>
+        </two_shards>
     </remote_servers>
 </clickhouse>
diff --git a/tests/integration/test_max_rows_to_read_leaf_with_view/test.py b/tests/integration/test_max_rows_to_read_leaf_with_view/test.py
new file mode 100755
index 00000000000..6957534ce0d
--- /dev/null
+++ b/tests/integration/test_max_rows_to_read_leaf_with_view/test.py
@@ -0,0 +1,76 @@
+from contextlib import contextmanager
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.client import QueryRuntimeException
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=["configs/remote_servers.xml"],
+    with_zookeeper=True,
+)
+
+node2 = cluster.add_instance(
+    "node2",
+    main_configs=["configs/remote_servers.xml"],
+    with_zookeeper=True,
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        for node in (node1, node2):
+            node.query(
+                f"""
+                CREATE TABLE local_table(id UInt32, d DateTime) ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/max_rows_read_leaf', '{node}') PARTITION BY toYYYYMM(d) ORDER BY d;
+
+                CREATE TABLE distributed_table(id UInt32, d DateTime) ENGINE = Distributed(two_shards, default, local_table);
+
+                CREATE OR REPLACE VIEW test_view AS select id from distributed_table;
+"""
+            )
+        node1.query(
+            "INSERT INTO local_table (id) select * from system.numbers limit 200"
+        )
+        node2.query(
+            "INSERT INTO local_table (id) select * from system.numbers limit 200"
+        )
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_max_rows_to_read_leaf_via_view(started_cluster):
+    """
+    Asserts the expected behaviour that we should be able to select
+    the total amount of rows (400 -  200 from each shard) from a
+    view that selects from a distributed table.
+    """
+    assert (
+        node1.query(
+            "SELECT count() from test_view SETTINGS max_rows_to_read_leaf=200"
+        ).rstrip()
+        == "400"
+    )
+    with pytest.raises(
+        QueryRuntimeException, match="controlled by 'max_rows_to_read_leaf'"
+    ):
+        # insert some more data and ensure we get a legitimate failure
+        node2.query(
+            "INSERT INTO local_table (id) select * from system.numbers limit 10"
+        )
+        node2.query("SELECT count() from test_view SETTINGS max_rows_to_read_leaf=200")
+
+
+if __name__ == "__main__":
+    with contextmanager(started_cluster)() as cluster:
+        for name, instance in list(cluster.instances.items()):
+            print(name, instance.ip_address)
+        input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_merge_tree_azure_blob_storage/test.py b/tests/integration/test_merge_tree_azure_blob_storage/test.py
index d1b7b64b56f..8bf4df17c39 100644
--- a/tests/integration/test_merge_tree_azure_blob_storage/test.py
+++ b/tests/integration/test_merge_tree_azure_blob_storage/test.py
@@ -203,7 +203,7 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical):
     node.query(f"SYSTEM START MERGES {TABLE_NAME}")
 
     # Wait for merges and old parts deletion
-    for attempt in range(0, 10):
+    for attempt in range(0, 60):
         parts_count = azure_query(
             node,
             f"SELECT COUNT(*) FROM system.parts WHERE table = '{TABLE_NAME}' FORMAT Values",
@@ -211,7 +211,7 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical):
         if parts_count == "(1)":
             break
 
-        if attempt == 9:
+        if attempt == 59:
             assert parts_count == "(1)"
 
         time.sleep(1)
@@ -461,7 +461,7 @@ def test_move_replace_partition_to_another_table(cluster):
         == "(512)"
     )
 
-    azure_query(node, f"DROP TABLE {table_clone_name} NO DELAY")
+    azure_query(node, f"DROP TABLE {table_clone_name} SYNC")
     assert azure_query(node, f"SELECT sum(id) FROM {TABLE_NAME} FORMAT Values") == "(0)"
     assert (
         azure_query(node, f"SELECT count(*) FROM {TABLE_NAME} FORMAT Values")
@@ -470,7 +470,7 @@ def test_move_replace_partition_to_another_table(cluster):
 
     azure_query(node, f"ALTER TABLE {TABLE_NAME} FREEZE")
 
-    azure_query(node, f"DROP TABLE {TABLE_NAME} NO DELAY")
+    azure_query(node, f"DROP TABLE {TABLE_NAME} SYNC")
 
 
 def test_freeze_unfreeze(cluster):
diff --git a/tests/integration/test_merge_tree_hdfs/test.py b/tests/integration/test_merge_tree_hdfs/test.py
index 3950077e619..c79986c34f0 100644
--- a/tests/integration/test_merge_tree_hdfs/test.py
+++ b/tests/integration/test_merge_tree_hdfs/test.py
@@ -43,8 +43,18 @@ def create_table(cluster, table_name, additional_settings=None):
 
 FILES_OVERHEAD = 1
 FILES_OVERHEAD_PER_COLUMN = 2  # Data and mark files
-FILES_OVERHEAD_PER_PART_WIDE = FILES_OVERHEAD_PER_COLUMN * 3 + 2 + 6 + 1
-FILES_OVERHEAD_PER_PART_COMPACT = 10 + 1
+FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC = 1
+FILES_OVERHEAD_METADATA_VERSION = 1
+FILES_OVERHEAD_PER_PART_WIDE = (
+    FILES_OVERHEAD_PER_COLUMN * 3
+    + 2
+    + 6
+    + FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC
+    + FILES_OVERHEAD_METADATA_VERSION
+)
+FILES_OVERHEAD_PER_PART_COMPACT = (
+    10 + FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC + FILES_OVERHEAD_METADATA_VERSION
+)
 
 
 @pytest.fixture(scope="module")
@@ -214,14 +224,22 @@ def test_attach_detach_partition(cluster):
     wait_for_delete_empty_parts(node, "hdfs_test")
     wait_for_delete_inactive_parts(node, "hdfs_test")
     wait_for_delete_hdfs_objects(
-        cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+        cluster,
+        FILES_OVERHEAD
+        + FILES_OVERHEAD_PER_PART_WIDE * 2
+        - FILES_OVERHEAD_METADATA_VERSION,
     )
 
     node.query("ALTER TABLE hdfs_test ATTACH PARTITION '2020-01-03'")
     assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(8192)"
 
     hdfs_objects = fs.listdir("/clickhouse")
-    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+    assert (
+        len(hdfs_objects)
+        == FILES_OVERHEAD
+        + FILES_OVERHEAD_PER_PART_WIDE * 2
+        - FILES_OVERHEAD_METADATA_VERSION
+    )
 
     node.query("ALTER TABLE hdfs_test DROP PARTITION '2020-01-03'")
     assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(4096)"
@@ -345,7 +363,14 @@ def test_move_replace_partition_to_another_table(cluster):
 
     # Number of objects in HDFS should be unchanged.
     hdfs_objects = fs.listdir("/clickhouse")
-    assert len(hdfs_objects) == FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 4
+    for obj in hdfs_objects:
+        print("Object in HDFS after move", obj)
+    wait_for_delete_hdfs_objects(
+        cluster,
+        FILES_OVERHEAD * 2
+        + FILES_OVERHEAD_PER_PART_WIDE * 4
+        - FILES_OVERHEAD_METADATA_VERSION * 2,
+    )
 
     # Add new partitions to source table, but with different values and replace them from copied table.
     node.query(
@@ -360,7 +385,15 @@ def test_move_replace_partition_to_another_table(cluster):
     assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(16384)"
 
     hdfs_objects = fs.listdir("/clickhouse")
-    assert len(hdfs_objects) == FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 6
+    for obj in hdfs_objects:
+        print("Object in HDFS after insert", obj)
+
+    wait_for_delete_hdfs_objects(
+        cluster,
+        FILES_OVERHEAD * 2
+        + FILES_OVERHEAD_PER_PART_WIDE * 6
+        - FILES_OVERHEAD_METADATA_VERSION * 2,
+    )
 
     node.query("ALTER TABLE hdfs_test REPLACE PARTITION '2020-01-03' FROM hdfs_clone")
     node.query("ALTER TABLE hdfs_test REPLACE PARTITION '2020-01-05' FROM hdfs_clone")
@@ -371,13 +404,25 @@ def test_move_replace_partition_to_another_table(cluster):
 
     # Wait for outdated partitions deletion.
     wait_for_delete_hdfs_objects(
-        cluster, FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 4
+        cluster,
+        FILES_OVERHEAD * 2
+        + FILES_OVERHEAD_PER_PART_WIDE * 4
+        - FILES_OVERHEAD_METADATA_VERSION * 2,
     )
 
-    node.query("DROP TABLE hdfs_clone NO DELAY")
+    node.query("DROP TABLE hdfs_clone SYNC")
     assert node.query("SELECT sum(id) FROM hdfs_test FORMAT Values") == "(0)"
     assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(16384)"
 
     # Data should remain in hdfs
     hdfs_objects = fs.listdir("/clickhouse")
-    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 4
+
+    for obj in hdfs_objects:
+        print("Object in HDFS after drop", obj)
+
+    wait_for_delete_hdfs_objects(
+        cluster,
+        FILES_OVERHEAD
+        + FILES_OVERHEAD_PER_PART_WIDE * 4
+        - FILES_OVERHEAD_METADATA_VERSION * 2,
+    )
diff --git a/tests/integration/test_merge_tree_load_parts/test.py b/tests/integration/test_merge_tree_load_parts/test.py
index 777b6f14fc6..118c31ea864 100644
--- a/tests/integration/test_merge_tree_load_parts/test.py
+++ b/tests/integration/test_merge_tree_load_parts/test.py
@@ -6,12 +6,14 @@ from helpers.corrupt_part_data_on_disk import corrupt_part_data_on_disk
 
 
 cluster = helpers.cluster.ClickHouseCluster(__file__)
+
 node1 = cluster.add_instance(
     "node1",
     main_configs=["configs/fast_background_pool.xml"],
     with_zookeeper=True,
     stay_alive=True,
 )
+
 node2 = cluster.add_instance(
     "node2",
     main_configs=["configs/fast_background_pool.xml"],
@@ -19,6 +21,12 @@ node2 = cluster.add_instance(
     stay_alive=True,
 )
 
+node3 = cluster.add_instance(
+    "node3",
+    with_zookeeper=True,
+    stay_alive=True,
+)
+
 
 @pytest.fixture(scope="module")
 def started_cluster():
@@ -148,17 +156,17 @@ def test_merge_tree_load_parts_corrupted(started_cluster):
     node1.query("SYSTEM WAIT LOADING PARTS mt_load_parts_2")
 
     def check_parts_loading(node, partition, loaded, failed, skipped):
-        for (min_block, max_block) in loaded:
+        for min_block, max_block in loaded:
             part_name = f"{partition}_{min_block}_{max_block}"
             assert node.contains_in_log(f"Loading Active part {part_name}")
             assert node.contains_in_log(f"Finished loading Active part {part_name}")
 
-        for (min_block, max_block) in failed:
+        for min_block, max_block in failed:
             part_name = f"{partition}_{min_block}_{max_block}"
             assert node.contains_in_log(f"Loading Active part {part_name}")
             assert not node.contains_in_log(f"Finished loading Active part {part_name}")
 
-        for (min_block, max_block) in skipped:
+        for min_block, max_block in skipped:
             part_name = f"{partition}_{min_block}_{max_block}"
             assert not node.contains_in_log(f"Loading Active part {part_name}")
             assert not node.contains_in_log(f"Finished loading Active part {part_name}")
@@ -194,3 +202,55 @@ def test_merge_tree_load_parts_corrupted(started_cluster):
         )
         == "111\t1\n222\t1\n333\t1\n"
     )
+
+
+def test_merge_tree_load_parts_filesystem_error(started_cluster):
+    if node3.is_built_with_sanitizer() or node3.is_debug_build():
+        pytest.skip(
+            "Skip with debug build and sanitizers. \
+            This test intentionally triggers LOGICAL_ERROR which leads to crash with those builds"
+        )
+
+    node3.query(
+        """
+        CREATE TABLE mt_load_parts (id UInt32)
+        ENGINE = MergeTree ORDER BY id
+        SETTINGS index_granularity_bytes = 0"""
+    )
+
+    node3.query("SYSTEM STOP MERGES mt_load_parts")
+
+    for i in range(2):
+        node3.query(f"INSERT INTO mt_load_parts VALUES ({i})")
+
+    # We want to somehow check that exception thrown on part creation is handled during part loading.
+    # It can be a filesystem exception triggered at initialization of part storage but it hard
+    # to trigger it because it should be an exception on stat/listDirectory.
+    # The most easy way to trigger such exception is to use chmod but clickhouse server
+    # is run with root user in integration test and this won't work. So let's do
+    # some stupid things: create a table without adaptive granularity and change mark
+    # extensions of data files in part to make clickhouse think that it's a compact part which
+    # cannot be created in such table. This will trigger a LOGICAL_ERROR on part creation.
+
+    def corrupt_part(table, part_name):
+        part_path = node3.query(
+            "SELECT path FROM system.parts WHERE table = '{}' and name = '{}'".format(
+                table, part_name
+            )
+        ).strip()
+
+        node3.exec_in_container(
+            ["bash", "-c", f"mv {part_path}id.cmrk {part_path}id.cmrk3"],
+            privileged=True,
+        )
+
+    corrupt_part("mt_load_parts", "all_1_1_0")
+    node3.restart_clickhouse(kill=True)
+
+    assert node3.query("SELECT * FROM mt_load_parts") == "1\n"
+    assert (
+        node3.query(
+            "SELECT name FROM system.detached_parts WHERE table = 'mt_load_parts'"
+        )
+        == "broken-on-start_all_1_1_0\n"
+    )
diff --git a/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml b/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml
index f3505f53339..cca80143548 100644
--- a/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml
@@ -22,6 +22,17 @@
                 <secret_access_key>minio123</secret_access_key>
                 <s3_max_single_read_retries>10</s3_max_single_read_retries>
             </no_delete_objects_s3>
+            <broken_s3>
+                <type>s3</type>
+                <endpoint>http://resolver:8083/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+                <skip_access_check>true</skip_access_check>
+                <retry_attempts>0</retry_attempts>
+                <connect_timeout_ms>20000</connect_timeout_ms>
+                <request_timeout_ms>20000</request_timeout_ms>
+                <s3_max_inflight_parts_for_one_file>1</s3_max_inflight_parts_for_one_file>
+            </broken_s3>
             <hdd>
                 <type>local</type>
                 <path>/</path>
@@ -37,6 +48,7 @@
                 <disk>s3</disk>
                 <path>/jbod1/</path>
                 <max_size>1000000000</max_size>
+                <max_file_segment_size>1Gi</max_file_segment_size>
             </s3_with_cache_and_jbod>
             <s3_r>
                 <type>s3</type>
@@ -99,6 +111,23 @@
                     </main>
                 </volumes>
             </s3_cache_r>
+            <external_broken_s3>
+                 <volumes>
+                    <main>
+                        <disk>hdd</disk>
+                    </main>
+                    <external>
+                        <disk>broken_s3</disk>
+                    </external>
+                </volumes>
+            </external_broken_s3>
+            <broken_s3>
+                 <volumes>
+                    <main>
+                        <disk>broken_s3</disk>
+                    </main>
+                </volumes>
+            </broken_s3>
         </policies>
     </storage_configuration>
 
diff --git a/tests/integration/test_merge_tree_s3/configs/config.d/users.xml b/tests/integration/test_merge_tree_s3/configs/config.d/users.xml
new file mode 100644
index 00000000000..3daa6f06a78
--- /dev/null
+++ b/tests/integration/test_merge_tree_s3/configs/config.d/users.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <enable_s3_requests_logging>1</enable_s3_requests_logging>
+            <s3_max_inflight_parts_for_one_file>20</s3_max_inflight_parts_for_one_file>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3/configs/config.xml b/tests/integration/test_merge_tree_s3/configs/config.xml
index 8055a5dd0a5..314f23f5788 100644
--- a/tests/integration/test_merge_tree_s3/configs/config.xml
+++ b/tests/integration/test_merge_tree_s3/configs/config.xml
@@ -1,3 +1,11 @@
 <clickhouse>
+    <s3>
+        <broken_s3>
+            <endpoint>http://resolver:8083/root/data/</endpoint>
+            <retry_attempts>0</retry_attempts>
+            <request_timeout_ms>20000</request_timeout_ms>
+        </broken_s3>
+    </s3>
+
     <enable_system_unfreeze>true</enable_system_unfreeze>
 </clickhouse>
diff --git a/tests/integration/test_merge_tree_s3/s3_mocks/broken_s3.py b/tests/integration/test_merge_tree_s3/s3_mocks/broken_s3.py
new file mode 100644
index 00000000000..3adf3ba0047
--- /dev/null
+++ b/tests/integration/test_merge_tree_s3/s3_mocks/broken_s3.py
@@ -0,0 +1,243 @@
+import logging
+import sys
+import threading
+import random
+import time
+import urllib.parse
+import http.server
+import socketserver
+
+
+UPSTREAM_HOST = "minio1"
+UPSTREAM_PORT = 9001
+
+
+class ServerRuntime:
+    class SlowPut:
+        def __init__(
+            self, probability_=None, timeout_=None, minimal_length_=None, count_=None
+        ):
+            self.probability = probability_ if probability_ is not None else 1
+            self.timeout = timeout_ if timeout_ is not None else 0.1
+            self.minimal_length = minimal_length_ if minimal_length_ is not None else 0
+            self.count = count_ if count_ is not None else 2**32
+
+        def __str__(self):
+            return (
+                f"probability:{self.probability}"
+                f" timeout:{self.timeout}"
+                f" minimal_length:{self.minimal_length}"
+                f" count:{self.count}"
+            )
+
+        def get_timeout(self, content_length):
+            if content_length > self.minimal_length:
+                if self.count > 0:
+                    if (
+                        runtime.slow_put.probability == 1
+                        or random.random() <= runtime.slow_put.probability
+                    ):
+                        self.count -= 1
+                        return runtime.slow_put.timeout
+            return None
+
+    def __init__(self):
+        self.lock = threading.Lock()
+        self.error_at_put_when_length_bigger = None
+        self.fake_put_when_length_bigger = None
+        self.fake_uploads = dict()
+        self.slow_put = None
+
+    def register_fake_upload(self, upload_id, key):
+        with self.lock:
+            self.fake_uploads[upload_id] = key
+
+    def is_fake_upload(self, upload_id, key):
+        with self.lock:
+            if upload_id in self.fake_uploads:
+                return self.fake_uploads[upload_id] == key
+        return False
+
+    def reset(self):
+        self.error_at_put_when_length_bigger = None
+        self.fake_put_when_length_bigger = None
+        self.fake_uploads = dict()
+        self.slow_put = None
+
+
+runtime = ServerRuntime()
+
+
+def and_then(value, func):
+    assert callable(func)
+    return None if value is None else func(value)
+
+
+class RequestHandler(http.server.BaseHTTPRequestHandler):
+    def _ok(self):
+        self.send_response(200)
+        self.send_header("Content-Type", "text/plain")
+        self.end_headers()
+        self.wfile.write(b"OK")
+
+    def _ping(self):
+        self._ok()
+
+    def _read_out(self):
+        content_length = int(self.headers.get("Content-Length", 0))
+        to_read = content_length
+        while to_read > 0:
+            # read content in order to avoid error on client
+            # Poco::Exception. Code: 1000, e.code() = 32, I/O error: Broken pipe
+            # do it piece by piece in order to avoid big allocation
+            size = min(to_read, 1024)
+            str(self.rfile.read(size))
+            to_read -= size
+
+    def _redirect(self):
+        self._read_out()
+
+        self.send_response(307)
+        url = f"http://{UPSTREAM_HOST}:{UPSTREAM_PORT}{self.path}"
+        self.send_header("Location", url)
+        self.end_headers()
+        self.wfile.write(b"Redirected")
+
+    def _error(self, data):
+        self._read_out()
+
+        self.send_response(500)
+        self.send_header("Content-Type", "text/xml")
+        self.end_headers()
+        self.wfile.write(bytes(data, "UTF-8"))
+
+    def _fake_put_ok(self):
+        self._read_out()
+
+        self.send_response(200)
+        self.send_header("Content-Type", "text/xml")
+        self.send_header("ETag", "b54357faf0632cce46e942fa68356b38")
+        self.send_header("Content-Length", 0)
+        self.end_headers()
+
+    def _fake_post_ok(self, path):
+        self._read_out()
+
+        parts = [x for x in path.split("/") if x]
+        bucket = parts[0]
+        key = "/".join(parts[1:])
+        location = "http://Example-Bucket.s3.Region.amazonaws.com/" + path
+        data = (
+            '<?xml version="1.0" encoding="UTF-8"?>\n'
+            "<CompleteMultipartUploadResult>\n"
+            f"<Location>{location}</Location>\n"
+            f"<Bucket>{bucket}</Bucket>\n"
+            f"<Key>{key}</Key>\n"
+            f'<ETag>"3858f62230ac3c915f300c664312c11f-9"</ETag>\n'
+            f"</CompleteMultipartUploadResult>\n"
+        )
+
+        self.send_response(200)
+        self.send_header("Content-Type", "text/xml")
+        self.send_header("Content-Length", len(data))
+        self.end_headers()
+
+        self.wfile.write(bytes(data, "UTF-8"))
+
+    def _mock_settings(self):
+        parts = urllib.parse.urlsplit(self.path)
+        path = [x for x in parts.path.split("/") if x]
+        assert path[0] == "mock_settings", path
+        if len(path) < 2:
+            return self._error("_mock_settings: wrong command")
+
+        if path[1] == "error_at_put":
+            params = urllib.parse.parse_qs(parts.query, keep_blank_values=False)
+            runtime.error_at_put_when_length_bigger = int(
+                params.get("when_length_bigger", [1024 * 1024])[0]
+            )
+            return self._ok()
+        if path[1] == "fake_put":
+            params = urllib.parse.parse_qs(parts.query, keep_blank_values=False)
+            runtime.fake_put_when_length_bigger = int(
+                params.get("when_length_bigger", [1024 * 1024])[0]
+            )
+            return self._ok()
+        if path[1] == "slow_put":
+            params = urllib.parse.parse_qs(parts.query, keep_blank_values=False)
+            runtime.slow_put = ServerRuntime.SlowPut(
+                minimal_length_=and_then(params.get("minimal_length", [None])[0], int),
+                probability_=and_then(params.get("probability", [None])[0], float),
+                timeout_=and_then(params.get("timeout", [None])[0], float),
+                count_=and_then(params.get("count", [None])[0], int),
+            )
+            self.log_message("set slow put %s", runtime.slow_put)
+            return self._ok()
+        if path[1] == "reset":
+            runtime.reset()
+            return self._ok()
+
+        return self._error("_mock_settings: wrong command")
+
+    def do_GET(self):
+        if self.path == "/":
+            return self._ping()
+
+        if self.path.startswith("/mock_settings"):
+            return self._mock_settings()
+
+        return self._redirect()
+
+    def do_PUT(self):
+        content_length = int(self.headers.get("Content-Length", 0))
+
+        if runtime.slow_put is not None:
+            timeout = runtime.slow_put.get_timeout(content_length)
+            if timeout is not None:
+                self.log_message("slow put %s", timeout)
+                time.sleep(timeout)
+
+        if runtime.error_at_put_when_length_bigger is not None:
+            if content_length > runtime.error_at_put_when_length_bigger:
+                return self._error(
+                    '<?xml version="1.0" encoding="UTF-8"?>'
+                    "<Error>"
+                    "<Code>ExpectedError</Code>"
+                    "<Message>mock s3 injected error</Message>"
+                    "<RequestId>txfbd566d03042474888193-00608d7537</RequestId>"
+                    "</Error>"
+                )
+
+        parts = urllib.parse.urlsplit(self.path)
+        params = urllib.parse.parse_qs(parts.query, keep_blank_values=False)
+        upload_id = params.get("uploadId", [None])[0]
+        if runtime.fake_put_when_length_bigger is not None and upload_id is not None:
+            if content_length > runtime.fake_put_when_length_bigger:
+                runtime.register_fake_upload(upload_id, parts.path)
+                return self._fake_put_ok()
+
+        return self._redirect()
+
+    def do_POST(self):
+        parts = urllib.parse.urlsplit(self.path)
+        params = urllib.parse.parse_qs(parts.query, keep_blank_values=False)
+        upload_id = params.get("uploadId", [None])[0]
+
+        if runtime.is_fake_upload(upload_id, parts.path):
+            return self._fake_post_ok(parts.path)
+
+        return self._redirect()
+
+    def do_HEAD(self):
+        self._redirect()
+
+    def do_DELETE(self):
+        self._redirect()
+
+
+class ThreadedHTTPServer(socketserver.ThreadingMixIn, http.server.HTTPServer):
+    """Handle requests in a separate thread."""
+
+
+httpd = ThreadedHTTPServer(("0.0.0.0", int(sys.argv[1])), RequestHandler)
+httpd.serve_forever()
diff --git a/tests/integration/test_merge_tree_s3/test.py b/tests/integration/test_merge_tree_s3/test.py
index f0f81100320..f87644a6876 100644
--- a/tests/integration/test_merge_tree_s3/test.py
+++ b/tests/integration/test_merge_tree_s3/test.py
@@ -8,6 +8,8 @@ from helpers.mock_servers import start_mock_servers
 from helpers.utility import generate_values, replace_config, SafeThread
 from helpers.wait_for_helpers import wait_for_delete_inactive_parts
 from helpers.wait_for_helpers import wait_for_delete_empty_parts
+from helpers.wait_for_helpers import wait_for_merges
+from helpers.test_tools import assert_eq_with_retry
 
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -24,6 +26,9 @@ def cluster():
                 "configs/config.d/storage_conf.xml",
                 "configs/config.d/bg_processing_pool_conf.xml",
             ],
+            user_configs=[
+                "configs/config.d/users.xml",
+            ],
             stay_alive=True,
             with_minio=True,
         )
@@ -52,8 +57,18 @@ def cluster():
 
 FILES_OVERHEAD = 1
 FILES_OVERHEAD_PER_COLUMN = 2  # Data and mark files
-FILES_OVERHEAD_PER_PART_WIDE = FILES_OVERHEAD_PER_COLUMN * 3 + 2 + 6 + 1
-FILES_OVERHEAD_PER_PART_COMPACT = 10 + 1
+FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC = 1
+FILES_OVERHEAD_METADATA_VERSION = 1
+FILES_OVERHEAD_PER_PART_WIDE = (
+    FILES_OVERHEAD_PER_COLUMN * 3
+    + 2
+    + 6
+    + FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC
+    + FILES_OVERHEAD_METADATA_VERSION
+)
+FILES_OVERHEAD_PER_PART_COMPACT = (
+    10 + FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC + FILES_OVERHEAD_METADATA_VERSION
+)
 
 
 def create_table(node, table_name, **additional_settings):
@@ -87,43 +102,124 @@ def run_s3_mocks(cluster):
         [
             ("unstable_proxy.py", "resolver", "8081"),
             ("no_delete_objects.py", "resolver", "8082"),
+            ("broken_s3.py", "resolver", "8083"),
         ],
     )
 
 
-def wait_for_delete_s3_objects(cluster, expected, timeout=30):
+def list_objects(cluster, path="data/", hint="list_objects"):
     minio = cluster.minio_client
+    objects = list(minio.list_objects(cluster.minio_bucket, path, recursive=True))
+    logging.info(f"{hint} ({len(objects)}): {[x.object_name for x in objects]}")
+    return objects
+
+
+def wait_for_delete_s3_objects(cluster, expected, timeout=30):
     while timeout > 0:
-        if (
-            len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-            == expected
-        ):
+        if len(list_objects(cluster, "data/")) == expected:
             return
         timeout -= 1
         time.sleep(1)
-    assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == expected
-    )
+    assert len(list_objects(cluster, "data/")) == expected
 
 
-@pytest.fixture(autouse=True)
-@pytest.mark.parametrize("node_name", ["node"])
-def drop_table(cluster, node_name):
-    yield
-    node = cluster.instances[node_name]
+def remove_all_s3_objects(cluster):
     minio = cluster.minio_client
+    for obj in list_objects(cluster, "data/"):
+        minio.remove_object(cluster.minio_bucket, obj.object_name)
 
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
 
+@pytest.fixture(autouse=True, scope="function")
+def clear_minio(cluster):
     try:
-        wait_for_delete_s3_objects(cluster, 0)
-    finally:
+        # CH do some writes to the S3 at start. For example, file data/clickhouse_access_check_{server_uuid}.
+        # Set the timeout there as 10 sec in order to resolve the race with that file exists.
+        wait_for_delete_s3_objects(cluster, 0, timeout=10)
+    except:
         # Remove extra objects to prevent tests cascade failing
-        for obj in list(
-            minio.list_objects(cluster.minio_bucket, "data/", recursive=True)
-        ):
-            minio.remove_object(cluster.minio_bucket, obj.object_name)
+        remove_all_s3_objects(cluster)
+
+    yield
+
+
+class BrokenS3:
+    @staticmethod
+    def reset(cluster):
+        response = cluster.exec_in_container(
+            cluster.get_container_id("resolver"),
+            [
+                "curl",
+                "-s",
+                f"http://localhost:8083/mock_settings/reset",
+            ],
+            nothrow=True,
+        )
+        assert response == "OK"
+
+    @staticmethod
+    def setup_fail_upload(cluster, part_length):
+        response = cluster.exec_in_container(
+            cluster.get_container_id("resolver"),
+            [
+                "curl",
+                "-s",
+                f"http://localhost:8083/mock_settings/error_at_put?when_length_bigger={part_length}",
+            ],
+            nothrow=True,
+        )
+        assert response == "OK"
+
+    @staticmethod
+    def setup_fake_upload(cluster, part_length):
+        response = cluster.exec_in_container(
+            cluster.get_container_id("resolver"),
+            [
+                "curl",
+                "-s",
+                f"http://localhost:8083/mock_settings/fake_put?when_length_bigger={part_length}",
+            ],
+            nothrow=True,
+        )
+        assert response == "OK"
+
+    @staticmethod
+    def setup_slow_answers(
+        cluster, minimal_length=0, timeout=None, probability=None, count=None
+    ):
+        url = (
+            f"http://localhost:8083/"
+            f"mock_settings/slow_put"
+            f"?minimal_length={minimal_length}"
+        )
+
+        if timeout is not None:
+            url += f"&timeout={timeout}"
+
+        if probability is not None:
+            url += f"&probability={probability}"
+
+        if count is not None:
+            url += f"&count={count}"
+
+        response = cluster.exec_in_container(
+            cluster.get_container_id("resolver"),
+            ["curl", "-s", url],
+            nothrow=True,
+        )
+        assert response == "OK"
+
+
+@pytest.fixture(autouse=True, scope="function")
+def reset_broken_s3(cluster):
+    BrokenS3.reset(cluster)
+
+    yield
+
+
+def check_no_objects_after_drop(cluster, table_name="s3_test", node_name="node"):
+    node = cluster.instances[node_name]
+    node.query(f"DROP TABLE IF EXISTS {table_name} SYNC")
+    wait_for_delete_s3_objects(cluster, 0, timeout=0)
 
 
 @pytest.mark.parametrize(
@@ -143,10 +239,7 @@ def test_simple_insert_select(
     values1 = generate_values("2020-01-03", 4096)
     node.query("INSERT INTO s3_test VALUES {}".format(values1))
     assert node.query("SELECT * FROM s3_test order by dt, id FORMAT Values") == values1
-    assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD + files_per_part
-    )
+    assert len(list_objects(cluster, "data/")) == FILES_OVERHEAD + files_per_part
 
     values2 = generate_values("2020-01-04", 4096)
     node.query("INSERT INTO s3_test VALUES {}".format(values2))
@@ -154,15 +247,14 @@ def test_simple_insert_select(
         node.query("SELECT * FROM s3_test ORDER BY dt, id FORMAT Values")
         == values1 + "," + values2
     )
-    assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD + files_per_part * 2
-    )
+    assert len(list_objects(cluster, "data/")) == FILES_OVERHEAD + files_per_part * 2
 
     assert (
         node.query("SELECT count(*) FROM s3_test where id = 1 FORMAT Values") == "(2)"
     )
 
+    check_no_objects_after_drop(cluster)
+
 
 @pytest.mark.parametrize("merge_vertical,node_name", [(True, "node"), (False, "node")])
 def test_insert_same_partition_and_merge(cluster, merge_vertical, node_name):
@@ -173,7 +265,6 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical, node_name):
 
     node = cluster.instances[node_name]
     create_table(node, "s3_test", **settings)
-    minio = cluster.minio_client
 
     node.query("SYSTEM STOP MERGES s3_test")
     node.query(
@@ -199,14 +290,14 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical, node_name):
         node.query("SELECT count(distinct(id)) FROM s3_test FORMAT Values") == "(8192)"
     )
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        len(list_objects(cluster, "data/"))
         == FILES_OVERHEAD_PER_PART_WIDE * 6 + FILES_OVERHEAD
     )
 
     node.query("SYSTEM START MERGES s3_test")
 
     # Wait for merges and old parts deletion
-    for attempt in range(0, 10):
+    for attempt in range(0, 60):
         parts_count = node.query(
             "SELECT COUNT(*) FROM system.parts WHERE table = 's3_test' and active = 1 FORMAT Values"
         )
@@ -214,7 +305,7 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical, node_name):
         if parts_count == "(1)":
             break
 
-        if attempt == 9:
+        if attempt == 59:
             assert parts_count == "(1)"
 
         time.sleep(1)
@@ -227,12 +318,13 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical, node_name):
         cluster, FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD, timeout=45
     )
 
+    check_no_objects_after_drop(cluster)
+
 
 @pytest.mark.parametrize("node_name", ["node"])
 def test_alter_table_columns(cluster, node_name):
     node = cluster.instances[node_name]
     create_table(node, "s3_test")
-    minio = cluster.minio_client
 
     node.query(
         "INSERT INTO s3_test VALUES {}".format(generate_values("2020-01-03", 4096))
@@ -273,12 +365,13 @@ def test_alter_table_columns(cluster, node_name):
         cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + 2
     )
 
+    check_no_objects_after_drop(cluster)
+
 
 @pytest.mark.parametrize("node_name", ["node"])
 def test_attach_detach_partition(cluster, node_name):
     node = cluster.instances[node_name]
     create_table(node, "s3_test")
-    minio = cluster.minio_client
 
     node.query(
         "INSERT INTO s3_test VALUES {}".format(generate_values("2020-01-03", 4096))
@@ -288,7 +381,7 @@ def test_attach_detach_partition(cluster, node_name):
     )
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(8192)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        len(list_objects(cluster, "data/"))
         == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
     )
 
@@ -297,15 +390,19 @@ def test_attach_detach_partition(cluster, node_name):
     wait_for_delete_inactive_parts(node, "s3_test")
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(4096)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+        len(list_objects(cluster, "data/"))
+        == FILES_OVERHEAD
+        + FILES_OVERHEAD_PER_PART_WIDE * 2
+        - FILES_OVERHEAD_METADATA_VERSION
     )
 
     node.query("ALTER TABLE s3_test ATTACH PARTITION '2020-01-03'")
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(8192)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+        len(list_objects(cluster, "data/"))
+        == FILES_OVERHEAD
+        + FILES_OVERHEAD_PER_PART_WIDE * 2
+        - FILES_OVERHEAD_METADATA_VERSION
     )
 
     node.query("ALTER TABLE s3_test DROP PARTITION '2020-01-03'")
@@ -313,7 +410,7 @@ def test_attach_detach_partition(cluster, node_name):
     wait_for_delete_inactive_parts(node, "s3_test")
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(4096)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        len(list_objects(cluster, "data/"))
         == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 1
     )
 
@@ -322,8 +419,10 @@ def test_attach_detach_partition(cluster, node_name):
     wait_for_delete_inactive_parts(node, "s3_test")
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(0)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/")))
-        == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 1
+        len(list_objects(cluster, "data/"))
+        == FILES_OVERHEAD
+        + FILES_OVERHEAD_PER_PART_WIDE * 1
+        - FILES_OVERHEAD_METADATA_VERSION
     )
     node.query(
         "ALTER TABLE s3_test DROP DETACHED PARTITION '2020-01-04'",
@@ -331,16 +430,17 @@ def test_attach_detach_partition(cluster, node_name):
     )
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(0)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        len(list_objects(cluster, "data/"))
         == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 0
     )
 
+    check_no_objects_after_drop(cluster)
+
 
 @pytest.mark.parametrize("node_name", ["node"])
 def test_move_partition_to_another_disk(cluster, node_name):
     node = cluster.instances[node_name]
     create_table(node, "s3_test")
-    minio = cluster.minio_client
 
     node.query(
         "INSERT INTO s3_test VALUES {}".format(generate_values("2020-01-03", 4096))
@@ -350,30 +450,31 @@ def test_move_partition_to_another_disk(cluster, node_name):
     )
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(8192)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        len(list_objects(cluster, "data/"))
         == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
     )
 
     node.query("ALTER TABLE s3_test MOVE PARTITION '2020-01-04' TO DISK 'hdd'")
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(8192)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        len(list_objects(cluster, "data/"))
         == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE
     )
 
     node.query("ALTER TABLE s3_test MOVE PARTITION '2020-01-04' TO DISK 's3'")
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(8192)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        len(list_objects(cluster, "data/"))
         == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
     )
 
+    check_no_objects_after_drop(cluster)
+
 
 @pytest.mark.parametrize("node_name", ["node"])
 def test_table_manipulations(cluster, node_name):
     node = cluster.instances[node_name]
     create_table(node, "s3_test")
-    minio = cluster.minio_client
 
     node.query(
         "INSERT INTO s3_test VALUES {}".format(generate_values("2020-01-03", 4096))
@@ -385,9 +486,10 @@ def test_table_manipulations(cluster, node_name):
     node.query("RENAME TABLE s3_test TO s3_renamed")
     assert node.query("SELECT count(*) FROM s3_renamed FORMAT Values") == "(8192)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        len(list_objects(cluster, "data/"))
         == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
     )
+
     node.query("RENAME TABLE s3_renamed TO s3_test")
 
     assert node.query("CHECK TABLE s3_test FORMAT Values") == "(1)"
@@ -396,7 +498,7 @@ def test_table_manipulations(cluster, node_name):
     node.query("ATTACH TABLE s3_test")
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(8192)"
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        len(list_objects(cluster, "data/"))
         == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
     )
 
@@ -404,17 +506,15 @@ def test_table_manipulations(cluster, node_name):
     wait_for_delete_empty_parts(node, "s3_test")
     wait_for_delete_inactive_parts(node, "s3_test")
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(0)"
-    assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD
-    )
+    assert len(list_objects(cluster, "data/")) == FILES_OVERHEAD
+
+    check_no_objects_after_drop(cluster)
 
 
 @pytest.mark.parametrize("node_name", ["node"])
 def test_move_replace_partition_to_another_table(cluster, node_name):
     node = cluster.instances[node_name]
     create_table(node, "s3_test")
-    minio = cluster.minio_client
 
     node.query(
         "INSERT INTO s3_test VALUES {}".format(generate_values("2020-01-03", 4096))
@@ -430,11 +530,11 @@ def test_move_replace_partition_to_another_table(cluster, node_name):
     )
     assert node.query("SELECT sum(id) FROM s3_test FORMAT Values") == "(0)"
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(16384)"
+
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
+        len(list_objects(cluster, "data/", "Objects at start"))
         == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 4
     )
-
     create_table(node, "s3_clone")
 
     node.query("ALTER TABLE s3_test MOVE PARTITION '2020-01-03' TO TABLE s3_clone")
@@ -443,10 +543,14 @@ def test_move_replace_partition_to_another_table(cluster, node_name):
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(8192)"
     assert node.query("SELECT sum(id) FROM s3_clone FORMAT Values") == "(0)"
     assert node.query("SELECT count(*) FROM s3_clone FORMAT Values") == "(8192)"
+
+    list_objects(cluster, "data/", "Object after move partition")
     # Number of objects in S3 should be unchanged.
-    assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 4
+    wait_for_delete_s3_objects(
+        cluster,
+        FILES_OVERHEAD * 2
+        + FILES_OVERHEAD_PER_PART_WIDE * 4
+        - FILES_OVERHEAD_METADATA_VERSION * 2,
     )
 
     # Add new partitions to source table, but with different values and replace them from copied table.
@@ -458,9 +562,13 @@ def test_move_replace_partition_to_another_table(cluster, node_name):
     )
     assert node.query("SELECT sum(id) FROM s3_test FORMAT Values") == "(0)"
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(16384)"
-    assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 6
+
+    list_objects(cluster, "data/", "Object after insert")
+    wait_for_delete_s3_objects(
+        cluster,
+        FILES_OVERHEAD * 2
+        + FILES_OVERHEAD_PER_PART_WIDE * 6
+        - FILES_OVERHEAD_METADATA_VERSION * 2,
     )
 
     node.query("ALTER TABLE s3_test REPLACE PARTITION '2020-01-03' FROM s3_clone")
@@ -472,39 +580,48 @@ def test_move_replace_partition_to_another_table(cluster, node_name):
 
     # Wait for outdated partitions deletion.
     wait_for_delete_s3_objects(
-        cluster, FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 4
+        cluster,
+        FILES_OVERHEAD * 2
+        + FILES_OVERHEAD_PER_PART_WIDE * 4
+        - FILES_OVERHEAD_METADATA_VERSION * 2,
     )
 
-    node.query("DROP TABLE s3_clone NO DELAY")
+    node.query("DROP TABLE s3_clone SYNC")
     assert node.query("SELECT sum(id) FROM s3_test FORMAT Values") == "(0)"
     assert node.query("SELECT count(*) FROM s3_test FORMAT Values") == "(16384)"
-    # Data should remain in S3
-    assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 4
+
+    list_objects(cluster, "data/", "Object after drop")
+    wait_for_delete_s3_objects(
+        cluster,
+        FILES_OVERHEAD
+        + FILES_OVERHEAD_PER_PART_WIDE * 4
+        - FILES_OVERHEAD_METADATA_VERSION * 2,
     )
 
     node.query("ALTER TABLE s3_test FREEZE")
     # Number S3 objects should be unchanged.
-    assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 4
+    list_objects(cluster, "data/", "Object after freeze")
+    wait_for_delete_s3_objects(
+        cluster,
+        FILES_OVERHEAD
+        + FILES_OVERHEAD_PER_PART_WIDE * 4
+        - FILES_OVERHEAD_METADATA_VERSION * 2,
     )
 
-    node.query("DROP TABLE s3_test NO DELAY")
+    node.query("DROP TABLE s3_test SYNC")
     # Backup data should remain in S3.
 
-    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD_PER_PART_WIDE * 4)
+    wait_for_delete_s3_objects(
+        cluster, FILES_OVERHEAD_PER_PART_WIDE * 4 - FILES_OVERHEAD_METADATA_VERSION * 4
+    )
 
-    for obj in list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)):
-        minio.remove_object(cluster.minio_bucket, obj.object_name)
+    remove_all_s3_objects(cluster)
 
 
 @pytest.mark.parametrize("node_name", ["node"])
 def test_freeze_unfreeze(cluster, node_name):
     node = cluster.instances[node_name]
     create_table(node, "s3_test")
-    minio = cluster.minio_client
 
     node.query(
         "INSERT INTO s3_test VALUES {}".format(generate_values("2020-01-03", 4096))
@@ -519,8 +636,9 @@ def test_freeze_unfreeze(cluster, node_name):
     wait_for_delete_empty_parts(node, "s3_test")
     wait_for_delete_inactive_parts(node, "s3_test")
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+        len(list_objects(cluster, "data/"))
+        == FILES_OVERHEAD
+        + (FILES_OVERHEAD_PER_PART_WIDE - FILES_OVERHEAD_METADATA_VERSION) * 2
     )
 
     # Unfreeze single partition from backup1.
@@ -530,13 +648,10 @@ def test_freeze_unfreeze(cluster, node_name):
     # Unfreeze all partitions from backup2.
     node.query("ALTER TABLE s3_test UNFREEZE WITH NAME 'backup2'")
 
+    # Data should be removed from S3.
     wait_for_delete_s3_objects(cluster, FILES_OVERHEAD)
 
-    # Data should be removed from S3.
-    assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD
-    )
+    check_no_objects_after_drop(cluster)
 
 
 @pytest.mark.parametrize("node_name", ["node"])
@@ -544,7 +659,6 @@ def test_freeze_system_unfreeze(cluster, node_name):
     node = cluster.instances[node_name]
     create_table(node, "s3_test")
     create_table(node, "s3_test_removed")
-    minio = cluster.minio_client
 
     node.query(
         "INSERT INTO s3_test VALUES {}".format(generate_values("2020-01-04", 4096))
@@ -558,22 +672,20 @@ def test_freeze_system_unfreeze(cluster, node_name):
     node.query("TRUNCATE TABLE s3_test")
     wait_for_delete_empty_parts(node, "s3_test")
     wait_for_delete_inactive_parts(node, "s3_test")
-    node.query("DROP TABLE s3_test_removed NO DELAY")
+    node.query("DROP TABLE s3_test_removed SYNC")
     assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+        len(list_objects(cluster, "data/"))
+        == FILES_OVERHEAD
+        + (FILES_OVERHEAD_PER_PART_WIDE - FILES_OVERHEAD_METADATA_VERSION) * 2
     )
 
     # Unfreeze all data from backup3.
     node.query("SYSTEM UNFREEZE WITH NAME 'backup3'")
 
+    # Data should be removed from S3.
     wait_for_delete_s3_objects(cluster, FILES_OVERHEAD)
 
-    # Data should be removed from S3.
-    assert (
-        len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)))
-        == FILES_OVERHEAD
-    )
+    check_no_objects_after_drop(cluster)
 
 
 @pytest.mark.parametrize("node_name", ["node"])
@@ -619,6 +731,8 @@ def test_s3_disk_apply_new_settings(cluster, node_name):
     # There should be 3 times more S3 requests because multi-part upload mode uses 3 requests to upload object.
     assert get_s3_requests() - s3_requests_before == s3_requests_to_write_partition * 3
 
+    check_no_objects_after_drop(cluster)
+
 
 @pytest.mark.parametrize("node_name", ["node"])
 def test_s3_no_delete_objects(cluster, node_name):
@@ -627,6 +741,7 @@ def test_s3_no_delete_objects(cluster, node_name):
         node, "s3_test_no_delete_objects", storage_policy="no_delete_objects_s3"
     )
     node.query("DROP TABLE s3_test_no_delete_objects SYNC")
+    remove_all_s3_objects(cluster)
 
 
 @pytest.mark.parametrize("node_name", ["node"])
@@ -641,42 +756,52 @@ def test_s3_disk_reads_on_unstable_connection(cluster, node_name):
         assert node.query("SELECT sum(id) FROM s3_test").splitlines() == [
             "40499995500000"
         ]
+    check_no_objects_after_drop(cluster)
 
 
 @pytest.mark.parametrize("node_name", ["node"])
 def test_lazy_seek_optimization_for_async_read(cluster, node_name):
     node = cluster.instances[node_name]
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
     node.query(
         "CREATE TABLE s3_test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3';"
     )
+    node.query("SYSTEM STOP MERGES s3_test")
     node.query(
         "INSERT INTO s3_test SELECT * FROM generateRandom('key UInt32, value String') LIMIT 10000000"
     )
     node.query("SELECT * FROM s3_test WHERE value LIKE '%abc%' ORDER BY value LIMIT 10")
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
-    minio = cluster.minio_client
-    for obj in list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True)):
-        minio.remove_object(cluster.minio_bucket, obj.object_name)
+
+    check_no_objects_after_drop(cluster)
 
 
 @pytest.mark.parametrize("node_name", ["node_with_limited_disk"])
 def test_cache_with_full_disk_space(cluster, node_name):
     node = cluster.instances[node_name]
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
     node.query(
-        "CREATE TABLE s3_test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_with_cache_and_jbod';"
+        "CREATE TABLE s3_test (key UInt32, value String) Engine=MergeTree() ORDER BY value SETTINGS storage_policy='s3_with_cache_and_jbod';"
     )
+    node.query("SYSTEM STOP MERGES s3_test")
     node.query(
-        "INSERT INTO s3_test SELECT * FROM generateRandom('key UInt32, value String') LIMIT 500000"
+        "INSERT INTO s3_test SELECT number, toString(number) FROM numbers(100000000)"
     )
-    node.query(
-        "SELECT * FROM s3_test WHERE value LIKE '%abc%' ORDER BY value FORMAT Null"
+    out = node.exec_in_container(
+        [
+            "/usr/bin/clickhouse",
+            "benchmark",
+            "--iterations",
+            "10",
+            "--max_threads",
+            "100",
+            "--query",
+            "SELECT count() FROM s3_test WHERE key < 40000000 or key > 80000000 SETTINGS max_read_buffer_size='44Ki'",
+        ]
     )
     assert node.contains_in_log(
         "Insert into cache is skipped due to insufficient disk space"
     )
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    check_no_objects_after_drop(cluster, node_name=node_name)
 
 
 @pytest.mark.parametrize("node_name", ["node"])
@@ -701,13 +826,14 @@ def test_store_cleanup_disk_s3(cluster, node_name):
         "CREATE TABLE s3_test UUID '00000000-1000-4000-8000-000000000001' (n UInt64) Engine=MergeTree() ORDER BY n SETTINGS storage_policy='s3';"
     )
     node.query("INSERT INTO s3_test SELECT 1")
+    check_no_objects_after_drop(cluster)
 
 
 @pytest.mark.parametrize("node_name", ["node"])
 def test_cache_setting_compatibility(cluster, node_name):
     node = cluster.instances[node_name]
 
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
 
     node.query(
         "CREATE TABLE s3_test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_r', compress_marks=false, compress_primary_key=false;"
@@ -777,3 +903,200 @@ def test_cache_setting_compatibility(cluster, node_name):
     node.query("SELECT * FROM s3_test FORMAT Null")
 
     assert not node.contains_in_log("No such file or directory: Cache info:")
+
+    check_no_objects_after_drop(cluster)
+
+
+@pytest.mark.parametrize("node_name", ["node"])
+def test_merge_canceled_by_drop(cluster, node_name):
+    node = cluster.instances[node_name]
+    node.query("DROP TABLE IF EXISTS test_merge_canceled_by_drop NO DELAY")
+    node.query(
+        "CREATE TABLE test_merge_canceled_by_drop "
+        " (key UInt32, value String)"
+        " Engine=MergeTree() "
+        " ORDER BY value "
+        " SETTINGS storage_policy='s3'"
+    )
+    node.query("SYSTEM STOP MERGES test_merge_canceled_by_drop")
+    node.query(
+        "INSERT INTO test_merge_canceled_by_drop SELECT number, toString(number) FROM numbers(100000000)"
+    )
+    node.query("SYSTEM START MERGES test_merge_canceled_by_drop")
+
+    wait_for_merges(node, "test_merge_canceled_by_drop")
+    check_no_objects_after_drop(
+        cluster, table_name="test_merge_canceled_by_drop", node_name=node_name
+    )
+
+
+@pytest.mark.parametrize("node_name", ["node"])
+def test_merge_canceled_by_s3_errors(cluster, node_name):
+    node = cluster.instances[node_name]
+    node.query("DROP TABLE IF EXISTS test_merge_canceled_by_s3_errors NO DELAY")
+    node.query(
+        "CREATE TABLE test_merge_canceled_by_s3_errors "
+        " (key UInt32, value String)"
+        " Engine=MergeTree() "
+        " ORDER BY value "
+        " SETTINGS storage_policy='broken_s3'"
+    )
+    node.query("SYSTEM STOP MERGES test_merge_canceled_by_s3_errors")
+    node.query(
+        "INSERT INTO test_merge_canceled_by_s3_errors SELECT number, toString(number) FROM numbers(10000)"
+    )
+    node.query(
+        "INSERT INTO test_merge_canceled_by_s3_errors SELECT 2*number, toString(number) FROM numbers(10000)"
+    )
+    min_key = node.query("SELECT min(key) FROM test_merge_canceled_by_s3_errors")
+    assert int(min_key) == 0, min_key
+
+    BrokenS3.setup_fail_upload(cluster, 50000)
+
+    node.query("SYSTEM START MERGES test_merge_canceled_by_s3_errors")
+
+    error = node.query_and_get_error(
+        "OPTIMIZE TABLE test_merge_canceled_by_s3_errors FINAL",
+    )
+    assert "ExpectedError Message: mock s3 injected error" in error, error
+
+    node.wait_for_log_line("ExpectedError Message: mock s3 injected error")
+
+    check_no_objects_after_drop(
+        cluster, table_name="test_merge_canceled_by_s3_errors", node_name=node_name
+    )
+
+
+@pytest.mark.parametrize("node_name", ["node"])
+def test_merge_canceled_by_s3_errors_when_move(cluster, node_name):
+    node = cluster.instances[node_name]
+    settings = {
+        "storage_policy": "external_broken_s3",
+        "merge_with_ttl_timeout": 1,
+    }
+    create_table(node, "merge_canceled_by_s3_errors_when_move", **settings)
+
+    node.query("SYSTEM STOP MERGES merge_canceled_by_s3_errors_when_move")
+    node.query(
+        "INSERT INTO merge_canceled_by_s3_errors_when_move"
+        " VALUES {}".format(generate_values("2020-01-03", 1000))
+    )
+    node.query(
+        "INSERT INTO merge_canceled_by_s3_errors_when_move"
+        " VALUES {}".format(generate_values("2020-01-03", 1000, -1))
+    )
+
+    node.query(
+        "ALTER TABLE merge_canceled_by_s3_errors_when_move"
+        "    MODIFY TTL"
+        "        dt + INTERVAL 1 DAY "
+        "        TO VOLUME 'external'",
+        settings={"materialize_ttl_after_modify": 0},
+    )
+
+    BrokenS3.setup_fail_upload(cluster, 10000)
+
+    node.query("SYSTEM START MERGES merge_canceled_by_s3_errors_when_move")
+
+    node.query("OPTIMIZE TABLE merge_canceled_by_s3_errors_when_move FINAL")
+
+    node.wait_for_log_line("ExpectedError Message: mock s3 injected error")
+
+    count = node.query("SELECT count() FROM merge_canceled_by_s3_errors_when_move")
+    assert int(count) == 2000, count
+
+    check_no_objects_after_drop(
+        cluster, table_name="merge_canceled_by_s3_errors_when_move", node_name=node_name
+    )
+
+
+@pytest.mark.parametrize("node_name", ["node"])
+@pytest.mark.parametrize(
+    "in_flight_memory", [(10, 245918115), (5, 156786752), (1, 106426187)]
+)
+def test_s3_engine_heavy_write_check_mem(cluster, node_name, in_flight_memory):
+    in_flight = in_flight_memory[0]
+    memory = in_flight_memory[1]
+
+    node = cluster.instances[node_name]
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
+    node.query(
+        "CREATE TABLE s3_test"
+        " ("
+        "   key UInt32 CODEC(NONE), value String CODEC(NONE)"
+        " )"
+        " ENGINE S3('http://resolver:8083/root/data/test-upload.csv', 'minio', 'minio123', 'CSV')",
+    )
+
+    BrokenS3.setup_fake_upload(cluster, 1000)
+    BrokenS3.setup_slow_answers(cluster, 10 * 1024 * 1024, timeout=15, count=10)
+
+    query_id = f"INSERT_INTO_S3_ENGINE_QUERY_ID_{in_flight}"
+    node.query(
+        "INSERT INTO s3_test SELECT number, toString(number) FROM numbers(50000000)"
+        f" SETTINGS max_memory_usage={2*memory}"
+        f", s3_max_inflight_parts_for_one_file={in_flight}",
+        query_id=query_id,
+    )
+
+    node.query("SYSTEM FLUSH LOGS")
+
+    memory_usage, wait_inflight = node.query(
+        "SELECT memory_usage, ProfileEvents['WriteBufferFromS3WaitInflightLimitMicroseconds']"
+        " FROM system.query_log"
+        f" WHERE query_id='{query_id}'"
+        "   AND type!='QueryStart'"
+    ).split()
+
+    assert int(memory_usage) < 1.1 * memory
+    assert int(memory_usage) > 0.9 * memory
+
+    assert int(wait_inflight) > 10 * 1000 * 1000
+
+    check_no_objects_after_drop(cluster, node_name=node_name)
+
+
+@pytest.mark.parametrize("node_name", ["node"])
+def test_s3_disk_heavy_write_check_mem(cluster, node_name):
+    memory = 2279055040
+
+    node = cluster.instances[node_name]
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
+    node.query(
+        "CREATE TABLE s3_test"
+        " ("
+        "   key UInt32, value String"
+        " )"
+        " ENGINE=MergeTree()"
+        " ORDER BY key"
+        " SETTINGS"
+        " storage_policy='broken_s3'",
+    )
+    node.query("SYSTEM STOP MERGES s3_test")
+
+    BrokenS3.setup_fake_upload(cluster, 1000)
+    BrokenS3.setup_slow_answers(cluster, 10 * 1024 * 1024, timeout=10, count=50)
+
+    query_id = f"INSERT_INTO_S3_DISK_QUERY_ID"
+    node.query(
+        "INSERT INTO s3_test SELECT number, toString(number) FROM numbers(50000000)"
+        f" SETTINGS max_memory_usage={2*memory}"
+        f", max_insert_block_size=50000000"
+        f", min_insert_block_size_rows=50000000"
+        f", min_insert_block_size_bytes=1000000000000",
+        query_id=query_id,
+    )
+
+    node.query("SYSTEM FLUSH LOGS")
+
+    result = node.query(
+        "SELECT memory_usage"
+        " FROM system.query_log"
+        f" WHERE query_id='{query_id}'"
+        "   AND type!='QueryStart'"
+    )
+
+    assert int(result) < 1.1 * memory
+    assert int(result) > 0.9 * memory
+
+    check_no_objects_after_drop(cluster, node_name=node_name)
diff --git a/tests/integration/test_merge_tree_s3_failover/configs/config.d/storage_conf.xml b/tests/integration/test_merge_tree_s3_failover/configs/config.d/storage_conf.xml
index 32d78468a71..4480327c4b5 100644
--- a/tests/integration/test_merge_tree_s3_failover/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_merge_tree_s3_failover/configs/config.d/storage_conf.xml
@@ -11,6 +11,7 @@
                 <skip_access_check>true</skip_access_check>
                 <!-- Avoid extra retries to speed up tests -->
                 <retry_attempts>0</retry_attempts>
+                <connect_timeout_ms>20000</connect_timeout_ms>
             </s3>
             <s3_retryable>
                 <type>s3</type>
@@ -20,7 +21,21 @@
                 <secret_access_key>minio123</secret_access_key>
                 <!-- ClickHouse starts earlier than custom S3 endpoint. Skip access check to avoid fail on start-up -->
                 <skip_access_check>true</skip_access_check>
+                <connect_timeout_ms>20000</connect_timeout_ms>
             </s3_retryable>
+            <s3_no_retries>
+                <type>s3</type>
+                <!-- Use custom S3 endpoint -->
+                <endpoint>http://resolver:8080/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+                <!-- ClickHouse starts earlier than custom S3 endpoint. Skip access check to avoid fail on start-up -->
+                <skip_access_check>true</skip_access_check>
+                <!-- Avoid extra retries to speed up tests -->
+                <retry_attempts>1</retry_attempts>
+                <s3_max_single_read_retries>1</s3_max_single_read_retries>
+                <connect_timeout_ms>20000</connect_timeout_ms>
+            </s3_no_retries>
             <default/>
         </disks>
         <policies>
@@ -48,6 +63,13 @@
                     </main>
                 </volumes>
             </s3_retryable>
+            <s3_no_retries>
+                <volumes>
+                    <main>
+                        <disk>s3_no_retries</disk>
+                    </main>
+                </volumes>
+            </s3_no_retries>
         </policies>
     </storage_configuration>
 </clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_failover/s3_endpoint/endpoint.py b/tests/integration/test_merge_tree_s3_failover/s3_endpoint/endpoint.py
index b6567dfebc5..4613fdb850b 100644
--- a/tests/integration/test_merge_tree_s3_failover/s3_endpoint/endpoint.py
+++ b/tests/integration/test_merge_tree_s3_failover/s3_endpoint/endpoint.py
@@ -42,7 +42,6 @@ def delete(_bucket):
 
 @route("/<_bucket>/<_path:path>", ["GET", "POST", "PUT", "DELETE"])
 def server(_bucket, _path):
-
     # It's delete query for failed part
     if _path.endswith("delete"):
         response.set_header("Location", "http://minio1:9001/" + _bucket + "/" + _path)
diff --git a/tests/integration/test_merge_tree_s3_failover/test.py b/tests/integration/test_merge_tree_s3_failover/test.py
index c61cacc9d8c..05aeeff2ec1 100644
--- a/tests/integration/test_merge_tree_s3_failover/test.py
+++ b/tests/integration/test_merge_tree_s3_failover/test.py
@@ -85,11 +85,11 @@ def cluster():
 def drop_table(cluster):
     yield
     node = cluster.instances["node"]
-    node.query("DROP TABLE IF EXISTS s3_failover_test NO DELAY")
+    node.query("DROP TABLE IF EXISTS s3_failover_test SYNC")
 
 
 # S3 request will be failed for an appropriate part file write.
-FILES_PER_PART_BASE = 5  # partition.dat, default_compression_codec.txt, count.txt, columns.txt, checksums.txt
+FILES_PER_PART_BASE = 6  # partition.dat, metadata_version.txt, default_compression_codec.txt, count.txt, columns.txt, checksums.txt
 FILES_PER_PART_WIDE = (
     FILES_PER_PART_BASE + 1 + 1 + 3 * 2
 )  # Primary index, MinMax, Mark and data file for column(s)
@@ -270,3 +270,29 @@ def test_throttle_retry(cluster):
         )
         == "42\n"
     )
+
+
+# Check that loading of parts is retried.
+def test_retry_loading_parts(cluster):
+    node = cluster.instances["node"]
+
+    node.query(
+        """
+        CREATE TABLE s3_retry_loading_parts (
+            id Int64
+        ) ENGINE=MergeTree()
+        ORDER BY id
+        SETTINGS storage_policy='s3_no_retries'
+        """
+    )
+
+    node.query("INSERT INTO s3_retry_loading_parts VALUES (42)")
+    node.query("DETACH TABLE s3_retry_loading_parts")
+
+    fail_request(cluster, 5)
+    node.query("ATTACH TABLE s3_retry_loading_parts")
+
+    assert node.contains_in_log(
+        "Failed to load data part all_1_1_0 at try 0 with retryable error"
+    )
+    assert node.query("SELECT * FROM s3_retry_loading_parts") == "42\n"
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/bg_processing_pool_conf.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/bg_processing_pool_conf.xml
deleted file mode 100644
index e45b647fd24..00000000000
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/bg_processing_pool_conf.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<clickhouse>
-    <background_processing_pool_thread_sleep_seconds>0.5</background_processing_pool_thread_sleep_seconds>
-    <background_processing_pool_task_sleep_seconds_when_no_work_min>0.5</background_processing_pool_task_sleep_seconds_when_no_work_min>
-    <background_processing_pool_task_sleep_seconds_when_no_work_max>0.5</background_processing_pool_task_sleep_seconds_when_no_work_max>
-</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml
deleted file mode 100644
index 920db2c9edd..00000000000
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <s3>
-                <type>s3</type>
-                <endpoint>http://minio1:9001/root2/data/</endpoint>
-                <access_key_id>minio</access_key_id>
-                <secret_access_key>minio123</secret_access_key>
-                <send_metadata>true</send_metadata>
-                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
-            </s3>
-            <hdd>
-                <type>local</type>
-                <path>/</path>
-            </hdd>
-        </disks>
-        <policies>
-            <s3>
-                <volumes>
-                    <main>
-                        <disk>s3</disk>
-                    </main>
-                    <external>
-                        <disk>hdd</disk>
-                    </external>
-                </volumes>
-            </s3>
-        </policies>
-    </storage_configuration>
-
-    <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-    </merge_tree>
-</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket_path.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket_path.xml
deleted file mode 100644
index 40cdf0f3402..00000000000
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket_path.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <s3>
-                <type>s3</type>
-                <endpoint>http://minio1:9001/root2/another_data/</endpoint>
-                <access_key_id>minio</access_key_id>
-                <secret_access_key>minio123</secret_access_key>
-                <send_metadata>true</send_metadata>
-                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
-            </s3>
-            <hdd>
-                <type>local</type>
-                <path>/</path>
-            </hdd>
-        </disks>
-        <policies>
-            <s3>
-                <volumes>
-                    <main>
-                        <disk>s3</disk>
-                    </main>
-                    <external>
-                        <disk>hdd</disk>
-                    </external>
-                </volumes>
-            </s3>
-        </policies>
-    </storage_configuration>
-
-    <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-    </merge_tree>
-</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_not_restorable.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_not_restorable.xml
deleted file mode 100644
index 4f21fa93381..00000000000
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_not_restorable.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <s3>
-                <type>s3</type>
-                <endpoint>http://minio1:9001/root/another_data/</endpoint>
-                <access_key_id>minio</access_key_id>
-                <secret_access_key>minio123</secret_access_key>
-                <send_metadata>false</send_metadata>
-                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
-                <retry_attempts>0</retry_attempts>
-            </s3>
-            <hdd>
-                <type>local</type>
-                <path>/</path>
-            </hdd>
-        </disks>
-        <policies>
-            <s3>
-                <volumes>
-                    <main>
-                        <disk>s3</disk>
-                    </main>
-                    <external>
-                        <disk>hdd</disk>
-                    </external>
-                </volumes>
-            </s3>
-        </policies>
-    </storage_configuration>
-
-    <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-    </merge_tree>
-</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/users.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/users.xml
deleted file mode 100644
index 0011583a68c..00000000000
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/users.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<clickhouse>
-    <profiles>
-        <default/>
-    </profiles>
-</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/test.py b/tests/integration/test_merge_tree_s3_restore/test.py
deleted file mode 100644
index ffb0d9477cf..00000000000
--- a/tests/integration/test_merge_tree_s3_restore/test.py
+++ /dev/null
@@ -1,696 +0,0 @@
-import os
-import logging
-import random
-import string
-import time
-
-import pytest
-from helpers.cluster import ClickHouseCluster
-from helpers.wait_for_helpers import wait_for_delete_empty_parts
-from helpers.wait_for_helpers import wait_for_delete_inactive_parts
-
-
-SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-COMMON_CONFIGS = [
-    "configs/config.d/bg_processing_pool_conf.xml",
-    "configs/config.d/clusters.xml",
-]
-
-
-def replace_config(path, old, new):
-    config = open(path, "r")
-    config_lines = config.readlines()
-    config.close()
-    config_lines = [line.replace(old, new) for line in config_lines]
-    config = open(path, "w")
-    config.writelines(config_lines)
-    config.close()
-
-
-@pytest.fixture(scope="module")
-def cluster():
-    try:
-        cluster = ClickHouseCluster(__file__)
-
-        cluster.add_instance(
-            "node",
-            main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf.xml"],
-            macros={"cluster": "node", "replica": "0"},
-            with_minio=True,
-            with_zookeeper=True,
-            stay_alive=True,
-        )
-        cluster.add_instance(
-            "node_another_bucket",
-            main_configs=COMMON_CONFIGS
-            + ["configs/config.d/storage_conf_another_bucket.xml"],
-            macros={"cluster": "node_another_bucket", "replica": "0"},
-            with_zookeeper=True,
-            stay_alive=True,
-        )
-        cluster.add_instance(
-            "node_another_bucket_path",
-            main_configs=COMMON_CONFIGS
-            + ["configs/config.d/storage_conf_another_bucket_path.xml"],
-            stay_alive=True,
-        )
-        cluster.add_instance(
-            "node_not_restorable",
-            main_configs=COMMON_CONFIGS
-            + ["configs/config.d/storage_conf_not_restorable.xml"],
-            stay_alive=True,
-        )
-
-        logging.info("Starting cluster...")
-        cluster.start()
-        logging.info("Cluster started")
-
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def random_string(length):
-    letters = string.ascii_letters
-    return "".join(random.choice(letters) for i in range(length))
-
-
-def generate_values(date_str, count, sign=1):
-    data = [[date_str, sign * (i + 1), random_string(10)] for i in range(count)]
-    data.sort(key=lambda tup: tup[1])
-    return ",".join(["('{}',{},'{}',{})".format(x, y, z, 0) for x, y, z in data])
-
-
-def create_table(
-    node, table_name, attach=False, replicated=False, db_atomic=False, uuid=""
-):
-    node.query("DROP DATABASE IF EXISTS s3")
-
-    node.query(
-        "CREATE DATABASE IF NOT EXISTS s3 ENGINE = {engine}".format(
-            engine="Atomic" if db_atomic else "Ordinary"
-        ),
-        settings={"allow_deprecated_database_ordinary": 1},
-    )
-
-    create_table_statement = """
-        {create} TABLE s3.{table_name} {uuid} {on_cluster} (
-            dt Date,
-            id Int64,
-            data String,
-            counter Int64,
-            INDEX min_max (id) TYPE minmax GRANULARITY 3
-        ) ENGINE={engine}
-        PARTITION BY dt
-        ORDER BY (dt, id)
-        SETTINGS
-            storage_policy='s3',
-            index_granularity=512,
-            old_parts_lifetime=1
-        """.format(
-        create="ATTACH" if attach else "CREATE",
-        table_name=table_name,
-        uuid="UUID '{uuid}'".format(uuid=uuid) if db_atomic and uuid else "",
-        on_cluster="ON CLUSTER '{}'".format(node.name) if replicated else "",
-        engine="ReplicatedMergeTree('/clickhouse/tables/{cluster}/test', '{replica}')"
-        if replicated
-        else "MergeTree()",
-    )
-
-    node.query(create_table_statement)
-
-
-def purge_s3(cluster, bucket):
-    minio = cluster.minio_client
-    for obj in list(minio.list_objects(bucket, recursive=True)):
-        if str(obj.object_name).find(".SCHEMA_VERSION") != -1:
-            continue
-        minio.remove_object(bucket, obj.object_name)
-
-
-def drop_s3_metadata(node):
-    node.exec_in_container(
-        ["bash", "-c", "rm -rf /var/lib/clickhouse/disks/s3/*"], user="root"
-    )
-
-
-def drop_shadow_information(node):
-    node.exec_in_container(
-        ["bash", "-c", "rm -rf /var/lib/clickhouse/shadow/*"], user="root"
-    )
-
-
-def create_restore_file(node, revision=None, bucket=None, path=None, detached=None):
-    node.exec_in_container(
-        ["bash", "-c", "mkdir -p /var/lib/clickhouse/disks/s3/"], user="root"
-    )
-
-    node.exec_in_container(
-        ["bash", "-c", "touch /var/lib/clickhouse/disks/s3/restore"], user="root"
-    )
-
-    add_restore_option = 'echo -en "{}={}\n" >> /var/lib/clickhouse/disks/s3/restore'
-    if revision:
-        node.exec_in_container(
-            ["bash", "-c", add_restore_option.format("revision", revision)], user="root"
-        )
-    if bucket:
-        node.exec_in_container(
-            ["bash", "-c", add_restore_option.format("source_bucket", bucket)],
-            user="root",
-        )
-    if path:
-        node.exec_in_container(
-            ["bash", "-c", add_restore_option.format("source_path", path)], user="root"
-        )
-    if detached:
-        node.exec_in_container(
-            ["bash", "-c", add_restore_option.format("detached", "true")], user="root"
-        )
-
-
-def get_revision_counter(node, backup_number):
-    return int(
-        node.exec_in_container(
-            [
-                "bash",
-                "-c",
-                "cat /var/lib/clickhouse/disks/s3/shadow/{}/revision.txt".format(
-                    backup_number
-                ),
-            ],
-            user="root",
-        )
-    )
-
-
-def get_table_uuid(node, db_atomic, table):
-    uuid = ""
-    if db_atomic:
-        uuid = node.query(
-            "SELECT uuid FROM system.tables WHERE database='s3' AND table='{}' FORMAT TabSeparated".format(
-                table
-            )
-        ).strip()
-    return uuid
-
-
-@pytest.fixture(autouse=True)
-def drop_table(cluster):
-    yield
-
-    node_names = [
-        "node",
-        "node_another_bucket",
-        "node_another_bucket_path",
-        "node_not_restorable",
-    ]
-
-    for node_name in node_names:
-        node = cluster.instances[node_name]
-        node.query("DROP TABLE IF EXISTS s3.test SYNC")
-        node.query("DROP DATABASE IF EXISTS s3 SYNC")
-
-        drop_s3_metadata(node)
-        drop_shadow_information(node)
-
-    buckets = [cluster.minio_bucket, cluster.minio_bucket_2]
-    for bucket in buckets:
-        purge_s3(cluster, bucket)
-
-
-@pytest.mark.parametrize("replicated", [False, True])
-@pytest.mark.parametrize("db_atomic", [False, True])
-def test_full_restore(cluster, replicated, db_atomic):
-    node = cluster.instances["node"]
-
-    create_table(node, "test", attach=False, replicated=replicated, db_atomic=db_atomic)
-
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-03", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-04", 4096, -1))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-05", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-05", 4096, -1))
-    )
-
-    node.query("DETACH TABLE s3.test")
-    drop_s3_metadata(node)
-    create_restore_file(node)
-    node.restart_clickhouse()
-
-    assert node.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(
-        4096 * 4
-    )
-    assert node.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
-
-
-@pytest.mark.parametrize("db_atomic", [False, True])
-def test_restore_another_bucket_path(cluster, db_atomic):
-    node = cluster.instances["node"]
-
-    create_table(node, "test", db_atomic=db_atomic)
-    uuid = get_table_uuid(node, db_atomic, "test")
-
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-03", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-04", 4096, -1))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-05", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-05", 4096, -1))
-    )
-
-    # To ensure parts have merged
-    node.query("OPTIMIZE TABLE s3.test")
-    wait_for_delete_inactive_parts(node, "s3.test", retry_count=120)
-
-    assert node.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(
-        4096 * 4
-    )
-    assert node.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
-
-    node_another_bucket = cluster.instances["node_another_bucket"]
-
-    create_restore_file(node_another_bucket, bucket="root")
-    node_another_bucket.restart_clickhouse()
-    create_table(
-        node_another_bucket, "test", attach=True, db_atomic=db_atomic, uuid=uuid
-    )
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 4)
-    assert node_another_bucket.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-
-    node_another_bucket_path = cluster.instances["node_another_bucket_path"]
-
-    create_restore_file(node_another_bucket_path, bucket="root2", path="data")
-    node_another_bucket_path.restart_clickhouse()
-    create_table(
-        node_another_bucket_path, "test", attach=True, db_atomic=db_atomic, uuid=uuid
-    )
-
-    assert node_another_bucket_path.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 4)
-    assert node_another_bucket_path.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-
-
-@pytest.mark.parametrize("db_atomic", [False, True])
-def test_restore_different_revisions(cluster, db_atomic):
-    node = cluster.instances["node"]
-
-    create_table(node, "test", db_atomic=db_atomic)
-    uuid = get_table_uuid(node, db_atomic, "test")
-
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-03", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-04", 4096, -1))
-    )
-
-    node.query("ALTER TABLE s3.test FREEZE")
-    revision1 = get_revision_counter(node, 1)
-
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-05", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-05", 4096, -1))
-    )
-
-    node.query("ALTER TABLE s3.test FREEZE")
-    revision2 = get_revision_counter(node, 2)
-
-    # To ensure parts have merged
-    node.query("OPTIMIZE TABLE s3.test")
-    wait_for_delete_inactive_parts(node, "s3.test", retry_count=120)
-
-    assert node.query("SELECT count(*) from system.parts where table = 'test'") == "3\n"
-
-    node.query("ALTER TABLE s3.test FREEZE")
-    revision3 = get_revision_counter(node, 3)
-
-    assert node.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(
-        4096 * 4
-    )
-    assert node.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
-    assert node.query("SELECT count(*) from system.parts where table = 'test'") == "3\n"
-
-    node_another_bucket = cluster.instances["node_another_bucket"]
-
-    # Restore to revision 1 (2 parts).
-    create_restore_file(node_another_bucket, revision=revision1, bucket="root")
-    node_another_bucket.restart_clickhouse()
-    create_table(
-        node_another_bucket, "test", attach=True, db_atomic=db_atomic, uuid=uuid
-    )
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 2)
-    assert node_another_bucket.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-    assert (
-        node_another_bucket.query(
-            "SELECT count(*) from system.parts where table = 'test'"
-        )
-        == "2\n"
-    )
-
-    # Restore to revision 2 (4 parts).
-    node_another_bucket.query("DETACH TABLE s3.test")
-    create_restore_file(node_another_bucket, revision=revision2, bucket="root")
-    node_another_bucket.restart_clickhouse()
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 4)
-    assert node_another_bucket.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-    assert (
-        node_another_bucket.query(
-            "SELECT count(*) from system.parts where table = 'test'"
-        )
-        == "4\n"
-    )
-
-    # Restore to revision 3 (4 parts + 1 merged).
-    node_another_bucket.query("DETACH TABLE s3.test")
-    create_restore_file(node_another_bucket, revision=revision3, bucket="root")
-    node_another_bucket.restart_clickhouse()
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 4)
-    assert node_another_bucket.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-    assert (
-        node_another_bucket.query(
-            "SELECT count(*) from system.parts where table = 'test'"
-        )
-        == "3\n"
-    )
-
-
-@pytest.mark.parametrize("db_atomic", [False, True])
-def test_restore_mutations(cluster, db_atomic):
-    node = cluster.instances["node"]
-
-    create_table(node, "test", db_atomic=db_atomic)
-    uuid = get_table_uuid(node, db_atomic, "test")
-
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-03", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-03", 4096, -1))
-    )
-
-    node.query("ALTER TABLE s3.test FREEZE")
-    revision_before_mutation = get_revision_counter(node, 1)
-
-    node.query(
-        "ALTER TABLE s3.test UPDATE counter = 1 WHERE 1", settings={"mutations_sync": 2}
-    )
-
-    node.query("ALTER TABLE s3.test FREEZE")
-    revision_after_mutation = get_revision_counter(node, 2)
-
-    node_another_bucket = cluster.instances["node_another_bucket"]
-
-    # Restore to revision before mutation.
-    create_restore_file(
-        node_another_bucket, revision=revision_before_mutation, bucket="root"
-    )
-    node_another_bucket.restart_clickhouse()
-    create_table(
-        node_another_bucket, "test", attach=True, db_atomic=db_atomic, uuid=uuid
-    )
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 2)
-    assert node_another_bucket.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-    assert node_another_bucket.query(
-        "SELECT sum(counter) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-
-    # Restore to revision after mutation.
-    node_another_bucket.query("DETACH TABLE s3.test")
-    create_restore_file(
-        node_another_bucket, revision=revision_after_mutation, bucket="root"
-    )
-    node_another_bucket.restart_clickhouse()
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 2)
-    assert node_another_bucket.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-    assert node_another_bucket.query(
-        "SELECT sum(counter) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 2)
-    assert node_another_bucket.query(
-        "SELECT sum(counter) FROM s3.test WHERE id > 0 FORMAT Values"
-    ) == "({})".format(4096)
-
-    # Restore to revision in the middle of mutation.
-    # Unfinished mutation should be completed after table startup.
-    node_another_bucket.query("DETACH TABLE s3.test")
-    revision = (revision_before_mutation + revision_after_mutation) // 2
-    create_restore_file(node_another_bucket, revision=revision, bucket="root")
-    node_another_bucket.restart_clickhouse()
-
-    # Wait for unfinished mutation completion.
-    time.sleep(3)
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 2)
-    assert node_another_bucket.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-    assert node_another_bucket.query(
-        "SELECT sum(counter) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 2)
-    assert node_another_bucket.query(
-        "SELECT sum(counter) FROM s3.test WHERE id > 0 FORMAT Values"
-    ) == "({})".format(4096)
-
-
-def test_migrate_to_restorable_schema(cluster):
-    db_atomic = True
-    node = cluster.instances["node_not_restorable"]
-    config_path = os.path.join(
-        SCRIPT_DIR,
-        "./{}/node_not_restorable/configs/config.d/storage_conf_not_restorable.xml".format(
-            cluster.instances_dir_name
-        ),
-    )
-
-    create_table(node, "test", db_atomic=db_atomic)
-    uuid = get_table_uuid(node, db_atomic, "test")
-
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-03", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-04", 4096, -1))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-05", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-05", 4096, -1))
-    )
-
-    replace_config(
-        config_path,
-        "<send_metadata>false</send_metadata>",
-        "<send_metadata>true</send_metadata>",
-    )
-    node.restart_clickhouse()
-
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-06", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-06", 4096, -1))
-    )
-
-    node.query("ALTER TABLE s3.test FREEZE")
-    revision = get_revision_counter(node, 1)
-
-    assert revision != 0
-
-    node_another_bucket = cluster.instances["node_another_bucket"]
-
-    # Restore to revision before mutation.
-    create_restore_file(
-        node_another_bucket, revision=revision, bucket="root", path="another_data"
-    )
-    node_another_bucket.restart_clickhouse()
-    create_table(
-        node_another_bucket, "test", attach=True, db_atomic=db_atomic, uuid=uuid
-    )
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 6)
-    assert node_another_bucket.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-
-
-@pytest.mark.parametrize("replicated", [False, True])
-@pytest.mark.parametrize("db_atomic", [False, True])
-def test_restore_to_detached(cluster, replicated, db_atomic):
-    node = cluster.instances["node"]
-
-    create_table(node, "test", attach=False, replicated=replicated, db_atomic=db_atomic)
-    uuid = get_table_uuid(node, db_atomic, "test")
-
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-03", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-04", 4096, -1))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-05", 4096))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-06", 4096, -1))
-    )
-    node.query(
-        "INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-07", 4096, 0))
-    )
-
-    # Add some mutation.
-    node.query(
-        "ALTER TABLE s3.test UPDATE counter = 1 WHERE 1", settings={"mutations_sync": 2}
-    )
-
-    # Detach some partition.
-    node.query("ALTER TABLE s3.test DETACH PARTITION '2020-01-07'")
-    wait_for_delete_empty_parts(node, "s3.test", retry_count=120)
-    wait_for_delete_inactive_parts(node, "s3.test", retry_count=120)
-
-    node.query("ALTER TABLE s3.test FREEZE")
-    revision = get_revision_counter(node, 1)
-
-    node_another_bucket = cluster.instances["node_another_bucket"]
-
-    create_restore_file(
-        node_another_bucket,
-        revision=revision,
-        bucket="root",
-        path="data",
-        detached=True,
-    )
-    node_another_bucket.restart_clickhouse()
-    create_table(
-        node_another_bucket,
-        "test",
-        replicated=replicated,
-        db_atomic=db_atomic,
-        uuid=uuid,
-    )
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-
-    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-03'")
-    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-04'")
-    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-05'")
-    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-06'")
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 4)
-
-    assert node_another_bucket.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-    assert node_another_bucket.query(
-        "SELECT sum(counter) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 4)
-
-    # Attach partition that was already detached before backup-restore.
-    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-07'")
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 5)
-    assert node_another_bucket.query(
-        "SELECT sum(id) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-    assert node_another_bucket.query(
-        "SELECT sum(counter) FROM s3.test FORMAT Values"
-    ) == "({})".format(4096 * 5)
-
-
-@pytest.mark.parametrize("replicated", [False, True])
-@pytest.mark.parametrize("db_atomic", [False, True])
-def test_restore_without_detached(cluster, replicated, db_atomic):
-    node = cluster.instances["node"]
-
-    create_table(node, "test", attach=False, replicated=replicated, db_atomic=db_atomic)
-    uuid = get_table_uuid(node, db_atomic, "test")
-
-    node.query("INSERT INTO s3.test VALUES {}".format(generate_values("2020-01-03", 1)))
-
-    assert node.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(1)
-
-    node.query("ALTER TABLE s3.test FREEZE")
-    revision = get_revision_counter(node, 1)
-
-    node_another_bucket = cluster.instances["node_another_bucket"]
-
-    create_restore_file(
-        node_another_bucket,
-        revision=revision,
-        bucket="root",
-        path="data",
-        detached=True,
-    )
-    node_another_bucket.restart_clickhouse()
-    create_table(
-        node_another_bucket,
-        "test",
-        replicated=replicated,
-        db_atomic=db_atomic,
-        uuid=uuid,
-    )
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(0)
-
-    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-03'")
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(1)
diff --git a/tests/integration/test_merge_tree_s3_with_cache/test.py b/tests/integration/test_merge_tree_s3_with_cache/test.py
index 89b5a400b1b..067ed4f9679 100644
--- a/tests/integration/test_merge_tree_s3_with_cache/test.py
+++ b/tests/integration/test_merge_tree_s3_with_cache/test.py
@@ -77,7 +77,7 @@ def test_write_is_cached(cluster, min_rows_for_wide_part, read_requests):
     # stat = get_query_stat(node, select_query)
     # assert stat["S3ReadRequestsCount"] == read_requests  # Only .bin files should be accessed from S3.
 
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
 
 
 @pytest.mark.parametrize(
@@ -126,4 +126,4 @@ def test_read_after_cache_is_wiped(
     # stat = get_query_stat(node, select_query)
     # assert stat["S3ReadRequestsCount"] == bin_files
 
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
diff --git a/tests/integration/test_merge_tree_settings_constraints/test.py b/tests/integration/test_merge_tree_settings_constraints/test.py
index 0bb0179108d..be6e2a31873 100644
--- a/tests/integration/test_merge_tree_settings_constraints/test.py
+++ b/tests/integration/test_merge_tree_settings_constraints/test.py
@@ -20,7 +20,6 @@ def start_cluster():
 
 
 def test_merge_tree_settings_constraints():
-
     assert "Setting storage_policy should not be changed" in instance.query_and_get_error(
         f"CREATE TABLE wrong_table (number Int64) engine = MergeTree() ORDER BY number SETTINGS storage_policy = 'secret_policy'"
     )
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/20220830083647456.commit.requested b/tests/integration/test_merges_memory_limit/__init__.py
similarity index 100%
rename from tests/integration/test_storage_hudi/test_table/.hoodie/20220830083647456.commit.requested
rename to tests/integration/test_merges_memory_limit/__init__.py
diff --git a/tests/integration/test_merges_memory_limit/test.py b/tests/integration/test_merges_memory_limit/test.py
new file mode 100644
index 00000000000..e663f3280cc
--- /dev/null
+++ b/tests/integration/test_merges_memory_limit/test.py
@@ -0,0 +1,39 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance("node")
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_memory_limit_success():
+    node.query(
+        "CREATE TABLE test_merge_oom ENGINE=AggregatingMergeTree ORDER BY id EMPTY AS SELECT number%1024 AS id, arrayReduce( 'groupArrayState', arrayMap( x-> randomPrintableASCII(100), range(8192))) fat_state FROM numbers(20000)"
+    )
+    node.query("SYSTEM STOP MERGES test_merge_oom")
+    node.query(
+        "INSERT INTO test_merge_oom SELECT number%1024 AS id, arrayReduce( 'groupArrayState', arrayMap( x-> randomPrintableASCII(100), range(8192))) fat_state FROM numbers(3000)"
+    )
+    node.query(
+        "INSERT INTO test_merge_oom SELECT number%1024 AS id, arrayReduce( 'groupArrayState', arrayMap( x-> randomPrintableASCII(100), range(8192))) fat_state FROM numbers(3000)"
+    )
+    node.query(
+        "INSERT INTO test_merge_oom SELECT number%1024 AS id, arrayReduce( 'groupArrayState', arrayMap( x-> randomPrintableASCII(100), range(8192))) fat_state FROM numbers(3000)"
+    )
+
+    _, error = node.query_and_get_answer_with_error(
+        "SYSTEM START MERGES test_merge_oom;SET optimize_throw_if_noop=1;OPTIMIZE TABLE test_merge_oom FINAL"
+    )
+
+    assert not error
+    node.query("DROP TABLE test_merge_oom")
diff --git a/tests/integration/test_multiple_disks/test.py b/tests/integration/test_multiple_disks/test.py
index 221d830f62e..0e51df017b2 100644
--- a/tests/integration/test_multiple_disks/test.py
+++ b/tests/integration/test_multiple_disks/test.py
@@ -90,6 +90,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "small_jbod_with_external",
@@ -100,6 +102,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "small_jbod_with_external_no_merges",
@@ -110,6 +114,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "small_jbod_with_external_no_merges",
@@ -120,6 +126,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.1,
             "prefer_not_to_merge": 1,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "one_more_small_jbod_with_external",
@@ -130,6 +138,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "one_more_small_jbod_with_external",
@@ -140,6 +150,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "jbods_with_external",
@@ -150,6 +162,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "10485760",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "jbods_with_external",
@@ -160,6 +174,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "moving_jbod_with_external",
@@ -170,6 +186,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.7,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "moving_jbod_with_external",
@@ -180,6 +198,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.7,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "default_disk_with_external",
@@ -190,6 +210,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "2097152",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "default_disk_with_external",
@@ -200,6 +222,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "20971520",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "special_warning_policy",
@@ -210,6 +234,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "special_warning_policy",
@@ -220,6 +246,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "0",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "special_warning_policy",
@@ -230,6 +258,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "1024",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
         {
             "policy_name": "special_warning_policy",
@@ -240,6 +270,8 @@ def test_system_tables(start_cluster):
             "max_data_part_size": "1024000000",
             "move_factor": 0.1,
             "prefer_not_to_merge": 0,
+            "perform_ttl_move_on_insert": 1,
+            "load_balancing": "ROUND_ROBIN",
         },
     ]
 
@@ -1262,13 +1294,13 @@ def test_concurrent_alter_move_and_drop(start_cluster, name, engine):
                     else:
                         raise e
 
-        insert(100)
+        insert(20)
         p = Pool(15)
         tasks = []
         for i in range(5):
-            tasks.append(p.apply_async(insert, (100,)))
-            tasks.append(p.apply_async(alter_move, (100,)))
-            tasks.append(p.apply_async(alter_drop, (100,)))
+            tasks.append(p.apply_async(insert, (20,)))
+            tasks.append(p.apply_async(alter_move, (20,)))
+            tasks.append(p.apply_async(alter_drop, (20,)))
 
         for task in tasks:
             task.get(timeout=120)
diff --git a/tests/integration/test_mysql_database_engine/configs/named_collections.xml b/tests/integration/test_mysql_database_engine/configs/named_collections.xml
index fd18dfa6202..3b65536f20f 100644
--- a/tests/integration/test_mysql_database_engine/configs/named_collections.xml
+++ b/tests/integration/test_mysql_database_engine/configs/named_collections.xml
@@ -6,7 +6,6 @@
             <host>mysql57</host>
             <port>3306</port>
             <database>test_database</database>
-            <table>test_table</table>
         </mysql1>
         <mysql2>
             <user>postgres</user>
@@ -19,7 +18,6 @@
             <host>mysql57</host>
             <port>1111</port>
             <database>clickhouse</database>
-            <table>test_table</table>
         </mysql3>
     </named_collections>
 </clickhouse>
diff --git a/tests/integration/test_mysql_database_engine/test.py b/tests/integration/test_mysql_database_engine/test.py
index 65fd54c7f34..52a7b319551 100644
--- a/tests/integration/test_mysql_database_engine/test.py
+++ b/tests/integration/test_mysql_database_engine/test.py
@@ -396,7 +396,7 @@ def arryToString(expected_clickhouse_values):
 
 #  if expected_clickhouse_values is "", compare MySQL and ClickHouse query results directly
 @pytest.mark.parametrize(
-    "case_name, mysql_type, expected_ch_type, mysql_values, expected_clickhouse_values , setting_mysql_datatypes_support_level",
+    "case_name, mysql_type, expected_ch_type, mysql_values, expected_clickhouse_values, setting_mysql_datatypes_support_level",
     [
         pytest.param(
             "common_types",
@@ -725,11 +725,10 @@ def arryToString(expected_clickhouse_values):
             "decimal,datetime64",
             id="datetime_6_1",
         ),
-        # right now precision bigger than 39 is not supported by ClickHouse's Decimal, hence fall back to String
         pytest.param(
             "decimal_40_6",
             "decimal(40, 6) NOT NULL",
-            "String",
+            "Decimal(40, 6)",
             decimal_values,
             "",
             "decimal,datetime64",
@@ -999,3 +998,25 @@ def test_restart_server(started_cluster):
             clickhouse_node.restart_clickhouse()
             clickhouse_node.query_and_get_error("SHOW TABLES FROM test_restart")
         assert "test_table" in clickhouse_node.query("SHOW TABLES FROM test_restart")
+
+
+def test_memory_leak(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+        )
+    ) as mysql_node:
+        mysql_node.query("DROP DATABASE IF EXISTS test_database")
+        mysql_node.query("CREATE DATABASE test_database DEFAULT CHARACTER SET 'utf8'")
+        mysql_node.query(
+            "CREATE TABLE `test_database`.`test_table` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB;"
+        )
+
+        clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
+        clickhouse_node.query(
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql57:3306', 'test_database', 'root', 'clickhouse') SETTINGS connection_auto_close = 1"
+        )
+        clickhouse_node.query("SELECT count() FROM `test_database`.`test_table`")
+
+        clickhouse_node.query("DROP DATABASE test_database")
+        clickhouse_node.restart_clickhouse()
diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index 2cfb1d41ce0..5e03c4883b4 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -1,6 +1,7 @@
 # coding: utf-8
 
 import datetime
+import fnmatch
 import math
 import os
 import time
@@ -149,7 +150,7 @@ def java_container():
 
 
 def test_mysql_client(started_cluster):
-    # type: (Container, str) -> None
+    # type: (ClickHouseCluster) -> None
     code, (stdout, stderr) = started_cluster.mysql_client_container.exec_run(
         """
         mysql --protocol tcp -h {host} -P {port} default -u user_with_double_sha1 --password=abacaba
@@ -365,7 +366,10 @@ def test_mysql_replacement_query(started_cluster):
         demux=True,
     )
     assert code == 0
-    assert stdout.decode() == "currentDatabase()\ndefault\n"
+    assert stdout.decode().lower() in [
+        "currentdatabase()\ndefault\n",
+        "database()\ndefault\n",
+    ]
 
     code, (stdout, stderr) = started_cluster.mysql_client_container.exec_run(
         """
@@ -377,7 +381,10 @@ def test_mysql_replacement_query(started_cluster):
         demux=True,
     )
     assert code == 0
-    assert stdout.decode() == "currentDatabase()\ndefault\n"
+    assert stdout.decode().lower() in [
+        "currentdatabase()\ndefault\n",
+        "database()\ndefault\n",
+    ]
 
 
 def test_mysql_select_user(started_cluster):
@@ -391,7 +398,7 @@ def test_mysql_select_user(started_cluster):
         demux=True,
     )
     assert code == 0
-    assert stdout.decode() == "currentUser()\ndefault\n"
+    assert stdout.decode() in ["currentUser()\ndefault\n", "user()\ndefault\n"]
 
 
 def test_mysql_explain(started_cluster):
@@ -568,9 +575,8 @@ def test_python_client(started_cluster):
     with pytest.raises(pymysql.InternalError) as exc_info:
         client.query("select name from tables")
 
-    assert exc_info.value.args[1].startswith(
-        "Code: 60. DB::Exception: Table default.tables doesn't exist"
-    ), exc_info.value.args[1]
+    resp = exc_info.value.args[1]
+    assert fnmatch.fnmatch(resp, "*DB::Exception:*tables*UNKNOWN_TABLE*"), resp
 
     cursor = client.cursor(pymysql.cursors.DictCursor)
     cursor.execute("select 1 as a, 'тест' as b")
@@ -602,9 +608,8 @@ def test_python_client(started_cluster):
     with pytest.raises(pymysql.InternalError) as exc_info:
         client.query("select name from tables")
 
-    assert exc_info.value.args[1].startswith(
-        "Code: 60. DB::Exception: Table default.tables doesn't exist"
-    ), exc_info.value.args[1]
+    resp = exc_info.value.args[1]
+    assert fnmatch.fnmatch(resp, "*DB::Exception:*tables*UNKNOWN_TABLE*"), resp
 
     cursor = client.cursor(pymysql.cursors.DictCursor)
     cursor.execute("select 1 as a, 'тест' as b")
diff --git a/tests/integration/test_named_collections/configs/users.d/users.xml b/tests/integration/test_named_collections/configs/users.d/users.xml
index 8556e73c82f..15da914f666 100644
--- a/tests/integration/test_named_collections/configs/users.d/users.xml
+++ b/tests/integration/test_named_collections/configs/users.d/users.xml
@@ -4,6 +4,7 @@
             <password></password>
             <profile>default</profile>
             <quota>default</quota>
+            <named_collection_control>1</named_collection_control>
             <show_named_collections>1</show_named_collections>
             <show_named_collections_secrets>1</show_named_collections_secrets>
         </default>
diff --git a/tests/integration/test_named_collections/configs/users.d/users_no_default_access_with_access_management.xml b/tests/integration/test_named_collections/configs/users.d/users_only_named_collection_control.xml
similarity index 74%
rename from tests/integration/test_named_collections/configs/users.d/users_no_default_access_with_access_management.xml
rename to tests/integration/test_named_collections/configs/users.d/users_only_named_collection_control.xml
index 83dc04f03aa..775c63350b0 100644
--- a/tests/integration/test_named_collections/configs/users.d/users_no_default_access_with_access_management.xml
+++ b/tests/integration/test_named_collections/configs/users.d/users_only_named_collection_control.xml
@@ -4,7 +4,7 @@
             <password></password>
             <profile>default</profile>
             <quota>default</quota>
-            <access_management>1</access_management>
+            <named_collection_control>1</named_collection_control>
         </default>
     </users>
 </clickhouse>
diff --git a/tests/integration/test_named_collections/test.py b/tests/integration/test_named_collections/test.py
index ba62880e9de..5f5657fad54 100644
--- a/tests/integration/test_named_collections/test.py
+++ b/tests/integration/test_named_collections/test.py
@@ -24,6 +24,16 @@ def cluster():
             ],
             stay_alive=True,
         )
+        cluster.add_instance(
+            "node_only_named_collection_control",
+            main_configs=[
+                "configs/config.d/named_collections.xml",
+            ],
+            user_configs=[
+                "configs/users.d/users_only_named_collection_control.xml",
+            ],
+            stay_alive=True,
+        )
         cluster.add_instance(
             "node_no_default_access",
             main_configs=[
@@ -34,16 +44,6 @@ def cluster():
             ],
             stay_alive=True,
         )
-        cluster.add_instance(
-            "node_no_default_access_but_with_access_management",
-            main_configs=[
-                "configs/config.d/named_collections.xml",
-            ],
-            user_configs=[
-                "configs/users.d/users_no_default_access_with_access_management.xml",
-            ],
-            stay_alive=True,
-        )
 
         logging.info("Starting cluster...")
         cluster.start()
@@ -70,40 +70,39 @@ def replace_in_users_config(node, old, new):
     )
 
 
-def test_access(cluster):
+def test_default_access(cluster):
     node = cluster.instances["node_no_default_access"]
+    assert 0 == int(node.query("select count() from system.named_collections"))
+    node = cluster.instances["node_only_named_collection_control"]
+    assert 1 == int(node.query("select count() from system.named_collections"))
     assert (
-        "DB::Exception: default: Not enough privileges. To execute this query it's necessary to have grant SHOW NAMED COLLECTIONS ON *.*"
-        in node.query_and_get_error("select count() from system.named_collections")
-    )
-    node = cluster.instances["node_no_default_access_but_with_access_management"]
-    assert (
-        "DB::Exception: default: Not enough privileges. To execute this query it's necessary to have grant SHOW NAMED COLLECTIONS ON *.*"
-        in node.query_and_get_error("select count() from system.named_collections")
+        node.query("select collection['key1'] from system.named_collections").strip()
+        == "[HIDDEN]"
     )
 
     node = cluster.instances["node"]
     assert int(node.query("select count() from system.named_collections")) > 0
+
     replace_in_users_config(
-        node, "show_named_collections>1", "show_named_collections>0"
+        node, "named_collection_control>1", "named_collection_control>0"
     )
-    assert "show_named_collections>0" in node.exec_in_container(
+    assert "named_collection_control>0" in node.exec_in_container(
+        ["bash", "-c", f"cat /etc/clickhouse-server/users.d/users.xml"]
+    )
+    node.restart_clickhouse()
+    assert 0 == int(node.query("select count() from system.named_collections"))
+
+    replace_in_users_config(
+        node, "named_collection_control>0", "named_collection_control>1"
+    )
+    assert "named_collection_control>1" in node.exec_in_container(
         ["bash", "-c", f"cat /etc/clickhouse-server/users.d/users.xml"]
     )
     node.restart_clickhouse()
     assert (
-        "DB::Exception: default: Not enough privileges. To execute this query it's necessary to have grant SHOW NAMED COLLECTIONS ON *.*"
-        in node.query_and_get_error("select count() from system.named_collections")
-    )
-    replace_in_users_config(
-        node, "show_named_collections>0", "show_named_collections>1"
-    )
-    assert "show_named_collections>1" in node.exec_in_container(
-        ["bash", "-c", f"cat /etc/clickhouse-server/users.d/users.xml"]
-    )
-    node.restart_clickhouse()
-    assert (
-        node.query("select collection['key1'] from system.named_collections").strip()
+        node.query(
+            "select collection['key1'] from system.named_collections where name = 'collection1'"
+        ).strip()
         == "value1"
     )
     replace_in_users_config(
@@ -114,7 +113,9 @@ def test_access(cluster):
     )
     node.restart_clickhouse()
     assert (
-        node.query("select collection['key1'] from system.named_collections").strip()
+        node.query(
+            "select collection['key1'] from system.named_collections where name = 'collection1'"
+        ).strip()
         == "[HIDDEN]"
     )
     replace_in_users_config(
@@ -125,11 +126,282 @@ def test_access(cluster):
     )
     node.restart_clickhouse()
     assert (
-        node.query("select collection['key1'] from system.named_collections").strip()
+        node.query(
+            "select collection['key1'] from system.named_collections where name = 'collection1'"
+        ).strip()
         == "value1"
     )
 
 
+def test_granular_access_show_query(cluster):
+    node = cluster.instances["node"]
+    assert (
+        "GRANT ALL ON *.* TO default WITH GRANT OPTION"
+        == node.query("SHOW GRANTS FOR default").strip()
+    )  # includes named collections control
+    assert 1 == int(node.query("SELECT count() FROM system.named_collections"))
+    assert (
+        "collection1" == node.query("SELECT name FROM system.named_collections").strip()
+    )
+
+    node.query("DROP USER IF EXISTS kek")
+    node.query("CREATE USER kek")
+    node.query("GRANT select ON *.* TO kek")
+    assert 0 == int(
+        node.query("SELECT count() FROM system.named_collections", user="kek")
+    )
+
+    node.query("GRANT show named collections ON collection1 TO kek")
+    assert 1 == int(
+        node.query("SELECT count() FROM system.named_collections", user="kek")
+    )
+    assert (
+        "collection1"
+        == node.query("SELECT name FROM system.named_collections", user="kek").strip()
+    )
+
+    node.query("CREATE NAMED COLLECTION collection2 AS key1=1, key2='value2'")
+    assert 2 == int(node.query("SELECT count() FROM system.named_collections"))
+    assert (
+        "collection1\ncollection2"
+        == node.query("select name from system.named_collections").strip()
+    )
+
+    assert 1 == int(
+        node.query("SELECT count() FROM system.named_collections", user="kek")
+    )
+    assert (
+        "collection1"
+        == node.query("select name from system.named_collections", user="kek").strip()
+    )
+
+    node.query("GRANT show named collections ON collection2 TO kek")
+    assert 2 == int(
+        node.query("SELECT count() FROM system.named_collections", user="kek")
+    )
+    assert (
+        "collection1\ncollection2"
+        == node.query("select name from system.named_collections", user="kek").strip()
+    )
+    node.restart_clickhouse()
+    assert (
+        "collection1\ncollection2"
+        == node.query("select name from system.named_collections", user="kek").strip()
+    )
+
+    # check:
+    # GRANT show named collections ON *
+    # REVOKE show named collections ON collection
+
+    node.query("DROP USER IF EXISTS koko")
+    node.query("CREATE USER koko")
+    node.query("GRANT select ON *.* TO koko")
+    assert 0 == int(
+        node.query("SELECT count() FROM system.named_collections", user="koko")
+    )
+    assert "GRANT SELECT ON *.* TO koko" == node.query("SHOW GRANTS FOR koko;").strip()
+    node.query("GRANT show named collections ON * TO koko")
+    assert (
+        "GRANT SELECT ON *.* TO koko\nGRANT SHOW NAMED COLLECTIONS ON * TO koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+    assert (
+        "collection1\ncollection2"
+        == node.query("select name from system.named_collections", user="koko").strip()
+    )
+    node.restart_clickhouse()
+    assert (
+        "GRANT SELECT ON *.* TO koko\nGRANT SHOW NAMED COLLECTIONS ON * TO koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+    assert (
+        "collection1\ncollection2"
+        == node.query("select name from system.named_collections", user="koko").strip()
+    )
+
+    node.query("REVOKE show named collections ON collection1 FROM koko;")
+    assert (
+        "GRANT SELECT ON *.* TO koko\nGRANT SHOW NAMED COLLECTIONS ON * TO koko\nREVOKE SHOW NAMED COLLECTIONS ON collection1 FROM koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+    assert (
+        "collection2"
+        == node.query("select name from system.named_collections", user="koko").strip()
+    )
+    node.restart_clickhouse()
+    assert (
+        "GRANT SELECT ON *.* TO koko\nGRANT SHOW NAMED COLLECTIONS ON * TO koko\nREVOKE SHOW NAMED COLLECTIONS ON collection1 FROM koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+    assert (
+        "collection2"
+        == node.query("select name from system.named_collections", user="koko").strip()
+    )
+    node.query("REVOKE show named collections ON collection2 FROM koko;")
+    assert (
+        "" == node.query("select * from system.named_collections", user="koko").strip()
+    )
+    assert (
+        "GRANT SELECT ON *.* TO koko\nGRANT SHOW NAMED COLLECTIONS ON * TO koko\nREVOKE SHOW NAMED COLLECTIONS ON collection1 FROM koko\nREVOKE SHOW NAMED COLLECTIONS ON collection2 FROM koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+
+    # check:
+    # GRANT show named collections ON collection
+    # REVOKE show named collections ON *
+
+    node.query("GRANT show named collections ON collection2 TO koko")
+    assert (
+        "GRANT SELECT ON *.* TO koko\nGRANT SHOW NAMED COLLECTIONS ON * TO koko\nREVOKE SHOW NAMED COLLECTIONS ON collection1 FROM koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+    assert (
+        "collection2"
+        == node.query("select name from system.named_collections", user="koko").strip()
+    )
+    node.query("REVOKE show named collections ON * FROM koko;")
+    assert "GRANT SELECT ON *.* TO koko" == node.query("SHOW GRANTS FOR koko;").strip()
+    assert (
+        "" == node.query("select * from system.named_collections", user="koko").strip()
+    )
+
+    node.query("DROP NAMED COLLECTION collection2")
+
+
+def test_show_grants(cluster):
+    node = cluster.instances["node"]
+    node.query("DROP USER IF EXISTS koko")
+    node.query("CREATE USER koko")
+    node.query("GRANT CREATE NAMED COLLECTION ON name1 TO koko")
+    node.query("GRANT select ON name1.* TO koko")
+    assert (
+        "GRANT SELECT ON name1.* TO koko\nGRANT CREATE NAMED COLLECTION ON name1 TO koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+
+    node.query("DROP USER IF EXISTS koko")
+    node.query("CREATE USER koko")
+    node.query("GRANT CREATE NAMED COLLECTION ON name1 TO koko")
+    node.query("GRANT select ON name1 TO koko")
+    assert (
+        "GRANT SELECT ON default.name1 TO koko\nGRANT CREATE NAMED COLLECTION ON name1 TO koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+
+    node.query("DROP USER IF EXISTS koko")
+    node.query("CREATE USER koko")
+    node.query("GRANT select ON name1 TO koko")
+    node.query("GRANT CREATE NAMED COLLECTION ON name1 TO koko")
+    assert (
+        "GRANT SELECT ON default.name1 TO koko\nGRANT CREATE NAMED COLLECTION ON name1 TO koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+
+    node.query("DROP USER IF EXISTS koko")
+    node.query("CREATE USER koko")
+    node.query("GRANT select ON *.* TO koko")
+    node.query("GRANT CREATE NAMED COLLECTION ON * TO koko")
+    assert (
+        "GRANT SELECT ON *.* TO koko\nGRANT CREATE NAMED COLLECTION ON * TO koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+
+    node.query("DROP USER IF EXISTS koko")
+    node.query("CREATE USER koko")
+    node.query("GRANT CREATE NAMED COLLECTION ON * TO koko")
+    node.query("GRANT select ON *.* TO koko")
+    assert (
+        "GRANT SELECT ON *.* TO koko\nGRANT CREATE NAMED COLLECTION ON * TO koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+
+    node.query("DROP USER IF EXISTS koko")
+    node.query("CREATE USER koko")
+    node.query("GRANT CREATE NAMED COLLECTION ON * TO koko")
+    node.query("GRANT select ON * TO koko")
+    assert (
+        "GRANT CREATE NAMED COLLECTION ON * TO koko\nGRANT SELECT ON default.* TO koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+
+    node.query("DROP USER IF EXISTS koko")
+    node.query("CREATE USER koko")
+    node.query("GRANT select ON * TO koko")
+    node.query("GRANT CREATE NAMED COLLECTION ON * TO koko")
+    assert (
+        "GRANT CREATE NAMED COLLECTION ON * TO koko\nGRANT SELECT ON default.* TO koko"
+        == node.query("SHOW GRANTS FOR koko;").strip()
+    )
+
+
+def test_granular_access_create_alter_drop_query(cluster):
+    node = cluster.instances["node"]
+    node.query("DROP USER IF EXISTS kek")
+    node.query("CREATE USER kek")
+    node.query("GRANT select ON *.* TO kek")
+    assert 0 == int(
+        node.query("SELECT count() FROM system.named_collections", user="kek")
+    )
+
+    assert (
+        "DB::Exception: kek: Not enough privileges. To execute this query it's necessary to have grant CREATE NAMED COLLECTION"
+        in node.query_and_get_error(
+            "CREATE NAMED COLLECTION collection2 AS key1=1, key2='value2'", user="kek"
+        )
+    )
+    node.query("GRANT create named collection ON collection2 TO kek")
+    node.query(
+        "CREATE NAMED COLLECTION collection2 AS key1=1, key2='value2'", user="kek"
+    )
+    assert 0 == int(
+        node.query("select count() from system.named_collections", user="kek")
+    )
+
+    node.query("GRANT show named collections ON collection2 TO kek")
+    assert (
+        "collection2"
+        == node.query("select name from system.named_collections", user="kek").strip()
+    )
+    assert (
+        "1"
+        == node.query(
+            "select collection['key1'] from system.named_collections where name = 'collection2'"
+        ).strip()
+    )
+
+    assert (
+        "DB::Exception: kek: Not enough privileges. To execute this query it's necessary to have grant ALTER NAMED COLLECTION"
+        in node.query_and_get_error(
+            "ALTER NAMED COLLECTION collection2 SET key1=2", user="kek"
+        )
+    )
+    node.query("GRANT alter named collection ON collection2 TO kek")
+    node.query("ALTER NAMED COLLECTION collection2 SET key1=2", user="kek")
+    assert (
+        "2"
+        == node.query(
+            "select collection['key1'] from system.named_collections where name = 'collection2'"
+        ).strip()
+    )
+    node.query("REVOKE alter named collection ON collection2 FROM kek")
+    assert (
+        "DB::Exception: kek: Not enough privileges. To execute this query it's necessary to have grant ALTER NAMED COLLECTION"
+        in node.query_and_get_error(
+            "ALTER NAMED COLLECTION collection2 SET key1=3", user="kek"
+        )
+    )
+
+    assert (
+        "DB::Exception: kek: Not enough privileges. To execute this query it's necessary to have grant DROP NAMED COLLECTION"
+        in node.query_and_get_error("DROP NAMED COLLECTION collection2", user="kek")
+    )
+    node.query("GRANT drop named collection ON collection2 TO kek")
+    node.query("DROP NAMED COLLECTION collection2", user="kek")
+    assert 0 == int(
+        node.query("select count() from system.named_collections", user="kek")
+    )
+
+
 def test_config_reload(cluster):
     node = cluster.instances["node"]
     assert (
@@ -164,6 +436,16 @@ def test_config_reload(cluster):
         ).strip()
     )
 
+    replace_in_server_config(node, "value2", "value1")
+    node.query("SYSTEM RELOAD CONFIG")
+
+    assert (
+        "value1"
+        == node.query(
+            "select collection['key1'] from system.named_collections where name = 'collection1'"
+        ).strip()
+    )
+
 
 def test_sql_commands(cluster):
     node = cluster.instances["node"]
diff --git a/tests/integration/test_old_parts_finally_removed/test.py b/tests/integration/test_old_parts_finally_removed/test.py
index 108b72c5ccd..5347d433419 100644
--- a/tests/integration/test_old_parts_finally_removed/test.py
+++ b/tests/integration/test_old_parts_finally_removed/test.py
@@ -63,7 +63,6 @@ def test_part_finally_removed(started_cluster):
     )
 
     for i in range(60):
-
         if (
             node1.query(
                 "SELECT count() from system.parts WHERE table = 'drop_outdated_part'"
diff --git a/tests/integration/test_overcommit_tracker/configs/users.d/users.xml b/tests/integration/test_overcommit_tracker/configs/users.d/users.xml
index 8556e73c82f..1c5f4d5a21f 100644
--- a/tests/integration/test_overcommit_tracker/configs/users.d/users.xml
+++ b/tests/integration/test_overcommit_tracker/configs/users.d/users.xml
@@ -4,7 +4,7 @@
             <password></password>
             <profile>default</profile>
             <quota>default</quota>
-            <show_named_collections>1</show_named_collections>
+            <named_collection_control>1</named_collection_control>
             <show_named_collections_secrets>1</show_named_collections_secrets>
         </default>
     </users>
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/00000000000000.deltacommit.requested b/tests/integration/test_parallel_replicas_custom_key/__init__.py
similarity index 100%
rename from tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/00000000000000.deltacommit.requested
rename to tests/integration/test_parallel_replicas_custom_key/__init__.py
diff --git a/tests/integration/test_parallel_replicas_custom_key/configs/remote_servers.xml b/tests/integration/test_parallel_replicas_custom_key/configs/remote_servers.xml
new file mode 100644
index 00000000000..308db461498
--- /dev/null
+++ b/tests/integration/test_parallel_replicas_custom_key/configs/remote_servers.xml
@@ -0,0 +1,50 @@
+<clickhouse>
+    <remote_servers>
+        <test_multiple_shards_multiple_replicas>
+            <shard>
+                <internal_replication>false</internal_replication>
+                <replica>
+                    <host>n1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>n2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <internal_replication>false</internal_replication>
+                <replica>
+                    <host>n3</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>n4</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_multiple_shards_multiple_replicas>
+        <test_single_shard_multiple_replicas>
+            <shard>
+                <internal_replication>false</internal_replication>
+                <replica>
+                    <host>n1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>n2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>n3</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>n4</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_single_shard_multiple_replicas>
+    </remote_servers>
+</clickhouse>
+
diff --git a/tests/integration/test_parallel_replicas_custom_key/test.py b/tests/integration/test_parallel_replicas_custom_key/test.py
new file mode 100644
index 00000000000..baac2661506
--- /dev/null
+++ b/tests/integration/test_parallel_replicas_custom_key/test.py
@@ -0,0 +1,94 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+nodes = [
+    cluster.add_instance(
+        f"n{i}", main_configs=["configs/remote_servers.xml"], with_zookeeper=True
+    )
+    for i in range(1, 5)
+]
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def create_tables(cluster):
+    n1 = nodes[0]
+    n1.query("DROP TABLE IF EXISTS dist_table")
+    n1.query(f"DROP TABLE IF EXISTS test_table ON CLUSTER {cluster}")
+
+    n1.query(
+        f"CREATE TABLE test_table ON CLUSTER {cluster} (key Int32, value String) Engine=MergeTree ORDER BY (key, sipHash64(value))"
+    )
+    n1.query(
+        f"""
+            CREATE TABLE dist_table AS test_table
+            Engine=Distributed(
+                {cluster},
+                currentDatabase(),
+                test_table,
+                rand()
+            )
+            """
+    )
+
+
+def insert_data(cluster, row_num):
+    create_tables(cluster)
+    n1 = nodes[0]
+    n1.query(
+        f"INSERT INTO dist_table SELECT number % 4, number FROM numbers({row_num})"
+    )
+    n1.query("SYSTEM FLUSH DISTRIBUTED dist_table")
+
+
+@pytest.mark.parametrize("custom_key", ["sipHash64(key)", "key"])
+@pytest.mark.parametrize("filter_type", ["default", "range"])
+@pytest.mark.parametrize(
+    "cluster",
+    ["test_multiple_shards_multiple_replicas", "test_single_shard_multiple_replicas"],
+)
+def test_parallel_replicas_custom_key(start_cluster, cluster, custom_key, filter_type):
+    for node in nodes:
+        node.rotate_logs()
+
+    row_num = 1000
+    insert_data(cluster, row_num)
+
+    expected_result = ""
+    for i in range(4):
+        expected_result += f"{i}\t250\n"
+
+    n1 = nodes[0]
+    assert (
+        n1.query(
+            "SELECT key, count() FROM dist_table GROUP BY key ORDER BY key",
+            settings={
+                "prefer_localhost_replica": 0,
+                "max_parallel_replicas": 4,
+                "parallel_replicas_custom_key": custom_key,
+                "parallel_replicas_custom_key_filter_type": filter_type,
+            },
+        )
+        == expected_result
+    )
+
+    if cluster == "test_multiple_shards_multiple_replicas":
+        # we simply process query on all replicas for each shard by appending the filter on replica
+        assert all(
+            node.contains_in_log("Processing query on a replica using custom_key")
+            for node in nodes
+        )
+    else:
+        # we first transform all replicas into shards and then append for each shard filter
+        assert n1.contains_in_log(
+            "Single shard cluster used with custom_key, transforming replicas into virtual shards"
+        )
diff --git a/tests/integration/test_part_log_table/test.py b/tests/integration/test_part_log_table/test.py
index d81990a9d47..ea4499d5877 100644
--- a/tests/integration/test_part_log_table/test.py
+++ b/tests/integration/test_part_log_table/test.py
@@ -1,4 +1,5 @@
 import pytest
+import fnmatch
 
 from helpers.cluster import ClickHouseCluster
 
@@ -27,20 +28,20 @@ def start_cluster():
 
 
 def test_config_without_part_log(start_cluster):
-    assert "Table system.part_log doesn't exist" in node1.query_and_get_error(
-        "SELECT * FROM system.part_log"
-    )
+    resp = node1.query_and_get_error("SELECT * FROM system.part_log")
+    assert fnmatch.fnmatch(resp, "*DB::Exception:*system.part_log*UNKNOWN_TABLE*"), resp
+
     node1.query(
         "CREATE TABLE test_table(word String, value UInt64) ENGINE=MergeTree() ORDER BY value"
     )
-    assert "Table system.part_log doesn't exist" in node1.query_and_get_error(
-        "SELECT * FROM system.part_log"
-    )
+    resp = node1.query_and_get_error("SELECT * FROM system.part_log")
+    assert fnmatch.fnmatch(resp, "*DB::Exception:*system.part_log*UNKNOWN_TABLE*"), resp
+
     node1.query("INSERT INTO test_table VALUES ('name', 1)")
     node1.query("SYSTEM FLUSH LOGS")
-    assert "Table system.part_log doesn't exist" in node1.query_and_get_error(
-        "SELECT * FROM system.part_log"
-    )
+
+    resp = node1.query_and_get_error("SELECT * FROM system.part_log")
+    assert fnmatch.fnmatch(resp, "*DB::Exception:*system.part_log*UNKNOWN_TABLE*"), resp
 
 
 # Note: if part_log is defined, we cannot say when the table will be created - because of metric_log, trace_log, text_log, query_log...
diff --git a/tests/integration/test_part_moves_between_shards/configs/merge_tree.xml b/tests/integration/test_part_moves_between_shards/configs/merge_tree.xml
deleted file mode 100644
index cf54b8be04d..00000000000
--- a/tests/integration/test_part_moves_between_shards/configs/merge_tree.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<clickhouse>
-    <merge_tree>
-        <assign_part_uuids>1</assign_part_uuids>
-        <part_moves_between_shards_enable>1</part_moves_between_shards_enable>
-        <part_moves_between_shards_delay_seconds>3</part_moves_between_shards_delay_seconds>
-    </merge_tree>
-</clickhouse>
diff --git a/tests/integration/test_part_moves_between_shards/test.py b/tests/integration/test_part_moves_between_shards/test.py
deleted file mode 100644
index 8fef44305ea..00000000000
--- a/tests/integration/test_part_moves_between_shards/test.py
+++ /dev/null
@@ -1,647 +0,0 @@
-import pytest
-import random
-import threading
-import time
-
-from helpers.client import QueryRuntimeException
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV
-
-transient_ch_errors = [23, 32, 210]
-
-cluster = ClickHouseCluster(__file__)
-
-s0r0 = cluster.add_instance(
-    "s0r0",
-    main_configs=["configs/remote_servers.xml", "configs/merge_tree.xml"],
-    stay_alive=True,
-    with_zookeeper=True,
-)
-
-s0r1 = cluster.add_instance(
-    "s0r1",
-    main_configs=["configs/remote_servers.xml", "configs/merge_tree.xml"],
-    stay_alive=True,
-    with_zookeeper=True,
-)
-
-s1r0 = cluster.add_instance(
-    "s1r0",
-    main_configs=["configs/remote_servers.xml", "configs/merge_tree.xml"],
-    stay_alive=True,
-    with_zookeeper=True,
-)
-
-s1r1 = cluster.add_instance(
-    "s1r1",
-    main_configs=["configs/remote_servers.xml", "configs/merge_tree.xml"],
-    stay_alive=True,
-    with_zookeeper=True,
-)
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    try:
-        cluster.start()
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def test_move(started_cluster):
-    for shard_ix, rs in enumerate([[s0r0, s0r1], [s1r0, s1r1]]):
-        for replica_ix, r in enumerate(rs):
-            r.query(
-                """
-            DROP TABLE IF EXISTS test_move;
-            CREATE TABLE test_move(v UInt64)
-            ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/test_move', '{}')
-            ORDER BY tuple()
-            """.format(
-                    shard_ix, r.name
-                )
-            )
-
-    s0r0.query("SYSTEM STOP MERGES test_move")
-    s0r1.query("SYSTEM STOP MERGES test_move")
-
-    s0r0.query("INSERT INTO test_move VALUES (1)")
-    s0r0.query("INSERT INTO test_move VALUES (2)")
-
-    assert "2" == s0r0.query("SELECT count() FROM test_move").strip()
-    assert "0" == s1r0.query("SELECT count() FROM test_move").strip()
-
-    s0r0.query(
-        "ALTER TABLE test_move MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/test_move'"
-    )
-
-    print(s0r0.query("SELECT * FROM system.part_moves_between_shards"))
-
-    s0r0.query("SYSTEM START MERGES test_move")
-    s0r0.query("OPTIMIZE TABLE test_move FINAL")
-
-    wait_for_state("DONE", s0r0, "test_move")
-
-    for n in [s0r0, s0r1]:
-        assert "1" == n.query("SELECT count() FROM test_move").strip()
-
-    for n in [s1r0, s1r1]:
-        assert "1" == n.query("SELECT count() FROM test_move").strip()
-
-    # Move part back
-    s1r0.query(
-        "ALTER TABLE test_move MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_0/tables/test_move'"
-    )
-
-    wait_for_state("DONE", s1r0, "test_move")
-
-    for n in [s0r0, s0r1]:
-        assert "2" == n.query("SELECT count() FROM test_move").strip()
-
-    for n in [s1r0, s1r1]:
-        assert "0" == n.query("SELECT count() FROM test_move").strip()
-
-
-def test_deduplication_while_move(started_cluster):
-    for shard_ix, rs in enumerate([[s0r0, s0r1], [s1r0, s1r1]]):
-        for replica_ix, r in enumerate(rs):
-            r.query(
-                """
-            DROP TABLE IF EXISTS test_deduplication;
-            CREATE TABLE test_deduplication(v UInt64)
-            ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/test_deduplication', '{}')
-            ORDER BY tuple()
-            """.format(
-                    shard_ix, r.name
-                )
-            )
-
-            r.query(
-                """
-            DROP TABLE IF EXISTS test_deduplication_d;
-            CREATE TABLE test_deduplication_d AS test_deduplication
-            ENGINE Distributed('test_cluster', '', test_deduplication)
-            """
-            )
-
-    s0r0.query("SYSTEM STOP MERGES test_deduplication")
-    s0r1.query("SYSTEM STOP MERGES test_deduplication")
-
-    s0r0.query("INSERT INTO test_deduplication VALUES (1)")
-    s0r0.query("INSERT INTO test_deduplication VALUES (2)")
-    s0r1.query("SYSTEM SYNC REPLICA test_deduplication", timeout=20)
-
-    assert "2" == s0r0.query("SELECT count() FROM test_deduplication").strip()
-    assert "0" == s1r0.query("SELECT count() FROM test_deduplication").strip()
-
-    s0r0.query(
-        "ALTER TABLE test_deduplication MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/test_deduplication'"
-    )
-    s0r0.query("SYSTEM START MERGES test_deduplication")
-
-    expected = """
-1
-2
-"""
-
-    def deduplication_invariant_test():
-        n = random.choice(list(started_cluster.instances.values()))
-        assert TSV(
-            n.query(
-                "SELECT * FROM test_deduplication_d ORDER BY v",
-                settings={"allow_experimental_query_deduplication": 1},
-            )
-        ) == TSV(expected)
-
-        # https://github.com/ClickHouse/ClickHouse/issues/34089
-        assert TSV(
-            n.query(
-                "SELECT count() FROM test_deduplication_d",
-                settings={"allow_experimental_query_deduplication": 1},
-            )
-        ) == TSV("2")
-
-        assert TSV(
-            n.query(
-                "SELECT count() FROM test_deduplication_d",
-                settings={"allow_experimental_query_deduplication": 1},
-            )
-        ) == TSV("2")
-
-    deduplication_invariant = ConcurrentInvariant(deduplication_invariant_test)
-    deduplication_invariant.start()
-
-    wait_for_state("DONE", s0r0, "test_deduplication")
-
-    deduplication_invariant.stop_and_assert_no_exception()
-
-
-def test_part_move_step_by_step(started_cluster):
-    for shard_ix, rs in enumerate([[s0r0, s0r1], [s1r0, s1r1]]):
-        for replica_ix, r in enumerate(rs):
-            r.query(
-                """
-            DROP TABLE IF EXISTS test_part_move_step_by_step;
-            CREATE TABLE test_part_move_step_by_step(v UInt64)
-            ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/test_part_move_step_by_step', '{}')
-            ORDER BY tuple()
-            """.format(
-                    shard_ix, r.name
-                )
-            )
-
-            r.query(
-                """
-            DROP TABLE IF EXISTS test_part_move_step_by_step_d;
-            CREATE TABLE test_part_move_step_by_step_d AS test_part_move_step_by_step
-            ENGINE Distributed('test_cluster', currentDatabase(), test_part_move_step_by_step)
-            """
-            )
-
-    s0r0.query("SYSTEM STOP MERGES test_part_move_step_by_step")
-    s0r1.query("SYSTEM STOP MERGES test_part_move_step_by_step")
-
-    s0r0.query("INSERT INTO test_part_move_step_by_step VALUES (1)")
-    s0r0.query("INSERT INTO test_part_move_step_by_step VALUES (2)")
-    s0r1.query("SYSTEM SYNC REPLICA test_part_move_step_by_step", timeout=20)
-
-    assert "2" == s0r0.query("SELECT count() FROM test_part_move_step_by_step").strip()
-    assert "0" == s1r0.query("SELECT count() FROM test_part_move_step_by_step").strip()
-
-    expected = """
-1
-2
-"""
-
-    def deduplication_invariant_test():
-        n = random.choice(list(started_cluster.instances.values()))
-        try:
-            assert TSV(
-                n.query(
-                    "SELECT * FROM test_part_move_step_by_step_d ORDER BY v",
-                    settings={"allow_experimental_query_deduplication": 1},
-                )
-            ) == TSV(expected)
-        except QueryRuntimeException as e:
-            # ignore transient errors that are caused by us restarting nodes
-            if e.returncode not in transient_ch_errors:
-                raise e
-
-    deduplication_invariant = ConcurrentInvariant(deduplication_invariant_test)
-    deduplication_invariant.start()
-
-    # Stop a source replica to prevent SYNC_SOURCE succeeding.
-    s0r1.stop_clickhouse()
-
-    s0r0.query(
-        "ALTER TABLE test_part_move_step_by_step MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/test_part_move_step_by_step'"
-    )
-
-    # Should hang on SYNC_SOURCE until all source replicas acknowledge new pinned UUIDs.
-    wait_for_state(
-        "SYNC_SOURCE",
-        s0r0,
-        "test_part_move_step_by_step",
-        "Some replicas haven\\'t processed event",
-    )
-    deduplication_invariant.assert_no_exception()
-
-    # Start all replicas in source shard but stop a replica in destination shard
-    # to prevent SYNC_DESTINATION succeeding.
-    s1r1.stop_clickhouse()
-    s0r1.start_clickhouse()
-
-    # After SYNC_SOURCE step no merges will be assigned.
-    s0r0.query(
-        "SYSTEM START MERGES test_part_move_step_by_step; OPTIMIZE TABLE test_part_move_step_by_step;"
-    )
-    s0r1.query(
-        "SYSTEM START MERGES test_part_move_step_by_step; OPTIMIZE TABLE test_part_move_step_by_step;"
-    )
-
-    wait_for_state(
-        "SYNC_DESTINATION",
-        s0r0,
-        "test_part_move_step_by_step",
-        "Some replicas haven\\'t processed event",
-    )
-    deduplication_invariant.assert_no_exception()
-
-    # Start previously stopped replica in destination shard to let SYNC_DESTINATION
-    # succeed.
-    # Stop the other replica in destination shard to prevent DESTINATION_FETCH succeed.
-    s1r0.stop_clickhouse()
-    s1r1.start_clickhouse()
-    wait_for_state(
-        "DESTINATION_FETCH",
-        s0r0,
-        "test_part_move_step_by_step",
-        "Some replicas haven\\'t processed event",
-    )
-    deduplication_invariant.assert_no_exception()
-
-    # Start previously stopped replica in destination shard to let DESTINATION_FETCH
-    # succeed.
-    # Stop the other replica in destination shard to prevent DESTINATION_ATTACH succeed.
-    s1r1.stop_clickhouse()
-    s1r0.start_clickhouse()
-    wait_for_state(
-        "DESTINATION_ATTACH",
-        s0r0,
-        "test_part_move_step_by_step",
-        "Some replicas haven\\'t processed event",
-    )
-    deduplication_invariant.assert_no_exception()
-
-    # Start all replicas in destination shard to let DESTINATION_ATTACH succeed.
-    # Stop a source replica to prevent SOURCE_DROP succeeding.
-    s0r0.stop_clickhouse()
-    s1r1.start_clickhouse()
-    wait_for_state(
-        "SOURCE_DROP",
-        s0r1,
-        "test_part_move_step_by_step",
-        "Some replicas haven\\'t processed event",
-    )
-    deduplication_invariant.assert_no_exception()
-
-    s0r0.start_clickhouse()
-    wait_for_state("DONE", s0r1, "test_part_move_step_by_step")
-    deduplication_invariant.assert_no_exception()
-
-    # No hung tasks in replication queue. Would timeout otherwise.
-    for instance in started_cluster.instances.values():
-        instance.query("SYSTEM SYNC REPLICA test_part_move_step_by_step")
-
-    assert "1" == s0r0.query("SELECT count() FROM test_part_move_step_by_step").strip()
-    assert "1" == s1r0.query("SELECT count() FROM test_part_move_step_by_step").strip()
-
-    deduplication_invariant.stop_and_assert_no_exception()
-
-
-def test_part_move_step_by_step_kill(started_cluster):
-    for shard_ix, rs in enumerate([[s0r0, s0r1], [s1r0, s1r1]]):
-        for replica_ix, r in enumerate(rs):
-            r.query(
-                """
-            DROP TABLE IF EXISTS test_part_move_step_by_step_kill;
-            CREATE TABLE test_part_move_step_by_step_kill(v UInt64)
-            ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/test_part_move_step_by_step_kill', '{}')
-            ORDER BY tuple()
-            """.format(
-                    shard_ix, r.name
-                )
-            )
-
-            r.query(
-                """
-            DROP TABLE IF EXISTS test_part_move_step_by_step_kill_d;
-            CREATE TABLE test_part_move_step_by_step_kill_d AS test_part_move_step_by_step_kill
-            ENGINE Distributed('test_cluster', currentDatabase(), test_part_move_step_by_step_kill)
-            """
-            )
-
-    s0r0.query("SYSTEM STOP MERGES test_part_move_step_by_step_kill")
-    s0r1.query("SYSTEM STOP MERGES test_part_move_step_by_step_kill")
-
-    s0r0.query("INSERT INTO test_part_move_step_by_step_kill VALUES (1)")
-    s0r0.query("INSERT INTO test_part_move_step_by_step_kill VALUES (2)")
-    s0r1.query("SYSTEM SYNC REPLICA test_part_move_step_by_step_kill", timeout=20)
-
-    assert (
-        "2"
-        == s0r0.query("SELECT count() FROM test_part_move_step_by_step_kill").strip()
-    )
-    assert (
-        "0"
-        == s1r0.query("SELECT count() FROM test_part_move_step_by_step_kill").strip()
-    )
-
-    expected = """
-1
-2
-"""
-
-    def deduplication_invariant_test():
-        n = random.choice(list(started_cluster.instances.values()))
-        try:
-            assert TSV(
-                n.query(
-                    "SELECT * FROM test_part_move_step_by_step_kill_d ORDER BY v",
-                    settings={"allow_experimental_query_deduplication": 1},
-                )
-            ) == TSV(expected)
-        except QueryRuntimeException as e:
-            # ignore transient errors that are caused by us restarting nodes
-            if e.returncode not in transient_ch_errors:
-                raise e
-
-    deduplication_invariant = ConcurrentInvariant(deduplication_invariant_test)
-    deduplication_invariant.start()
-
-    # Stop a source replica to prevent SYNC_SOURCE succeeding.
-    s0r1.stop_clickhouse()
-
-    s0r0.query(
-        "ALTER TABLE test_part_move_step_by_step_kill MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/test_part_move_step_by_step_kill'"
-    )
-
-    # Should hang on SYNC_SOURCE until all source replicas acknowledge new pinned UUIDs.
-    wait_for_state(
-        "SYNC_SOURCE",
-        s0r0,
-        "test_part_move_step_by_step_kill",
-        "Some replicas haven\\'t processed event",
-    )
-    deduplication_invariant.assert_no_exception()
-
-    # Start all replicas in source shard but stop a replica in destination shard
-    # to prevent SYNC_DESTINATION succeeding.
-    s1r1.stop_clickhouse()
-    s0r1.start_clickhouse()
-
-    # After SYNC_SOURCE step no merges will be assigned.
-    s0r0.query(
-        "SYSTEM START MERGES test_part_move_step_by_step_kill; OPTIMIZE TABLE test_part_move_step_by_step_kill;"
-    )
-    s0r1.query(
-        "SYSTEM START MERGES test_part_move_step_by_step_kill; OPTIMIZE TABLE test_part_move_step_by_step_kill;"
-    )
-
-    wait_for_state(
-        "SYNC_DESTINATION",
-        s0r0,
-        "test_part_move_step_by_step_kill",
-        "Some replicas haven\\'t processed event",
-    )
-    deduplication_invariant.assert_no_exception()
-
-    # Start previously stopped replica in destination shard to let SYNC_DESTINATION
-    # succeed.
-    # Stop the other replica in destination shard to prevent DESTINATION_FETCH succeed.
-    s1r0.stop_clickhouse()
-    s1r1.start_clickhouse()
-    wait_for_state(
-        "DESTINATION_FETCH",
-        s0r0,
-        "test_part_move_step_by_step_kill",
-        "Some replicas haven\\'t processed event",
-    )
-
-    # Start previously stopped replica in destination shard to let DESTINATION_FETCH
-    # succeed.
-    # Stop the other replica in destination shard to prevent DESTINATION_ATTACH succeed.
-    s1r1.stop_clickhouse()
-    s1r0.start_clickhouse()
-    wait_for_state(
-        "DESTINATION_ATTACH",
-        s0r0,
-        "test_part_move_step_by_step_kill",
-        "Some replicas haven\\'t processed event",
-    )
-    deduplication_invariant.assert_no_exception()
-
-    # Rollback here.
-    s0r0.query(
-        """
-        KILL PART_MOVE_TO_SHARD
-        WHERE task_uuid = (SELECT task_uuid FROM system.part_moves_between_shards WHERE table = 'test_part_move_step_by_step_kill')
-    """
-    )
-
-    wait_for_state(
-        "DESTINATION_ATTACH",
-        s0r0,
-        "test_part_move_step_by_step_kill",
-        assert_exception_msg="Some replicas haven\\'t processed event",
-        assert_rollback=True,
-    )
-
-    s1r1.start_clickhouse()
-
-    wait_for_state(
-        "CANCELLED", s0r0, "test_part_move_step_by_step_kill", assert_rollback=True
-    )
-    deduplication_invariant.assert_no_exception()
-
-    # No hung tasks in replication queue. Would timeout otherwise.
-    for instance in started_cluster.instances.values():
-        instance.query("SYSTEM SYNC REPLICA test_part_move_step_by_step_kill")
-
-    assert (
-        "2"
-        == s0r0.query("SELECT count() FROM test_part_move_step_by_step_kill").strip()
-    )
-    assert (
-        "0"
-        == s1r0.query("SELECT count() FROM test_part_move_step_by_step_kill").strip()
-    )
-
-    deduplication_invariant.stop_and_assert_no_exception()
-
-
-def test_move_not_permitted(started_cluster):
-    # Verify that invariants for part compatibility are checked.
-
-    # Tests are executed in order. Make sure cluster is up if previous test
-    # failed.
-    s0r0.start_clickhouse()
-    s1r0.start_clickhouse()
-
-    for ix, n in enumerate([s0r0, s1r0]):
-        n.query(
-            """
-        DROP TABLE IF EXISTS not_permitted_columns;
-        
-        CREATE TABLE not_permitted_columns(v_{ix} UInt64)
-        ENGINE ReplicatedMergeTree('/clickhouse/shard_{ix}/tables/not_permitted_columns', 'r')
-        ORDER BY tuple();
-        """.format(
-                ix=ix
-            )
-        )
-
-        partition = "date"
-        if ix > 0:
-            partition = "v"
-
-        n.query(
-            """
-        DROP TABLE IF EXISTS not_permitted_partition;
-        CREATE TABLE not_permitted_partition(date Date, v UInt64)
-        ENGINE ReplicatedMergeTree('/clickhouse/shard_{ix}/tables/not_permitted_partition', 'r')
-        PARTITION BY ({partition})
-        ORDER BY tuple();
-        """.format(
-                ix=ix, partition=partition
-            )
-        )
-
-    s0r0.query("INSERT INTO not_permitted_columns VALUES (1)")
-    s0r0.query("INSERT INTO not_permitted_partition VALUES ('2021-09-03', 1)")
-
-    with pytest.raises(
-        QueryRuntimeException,
-        match="DB::Exception: Source and destination are the same",
-    ):
-        s0r0.query(
-            "ALTER TABLE not_permitted_columns MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_0/tables/not_permitted_columns'"
-        )
-
-    with pytest.raises(
-        QueryRuntimeException,
-        match="DB::Exception: Table columns structure in ZooKeeper is different from local table structure.",
-    ):
-        s0r0.query(
-            "ALTER TABLE not_permitted_columns MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/not_permitted_columns'"
-        )
-
-    with pytest.raises(
-        QueryRuntimeException,
-        match="DB::Exception: Existing table metadata in ZooKeeper differs in partition key expression.",
-    ):
-        s0r0.query(
-            "ALTER TABLE not_permitted_partition MOVE PART '20210903_0_0_0' TO SHARD '/clickhouse/shard_1/tables/not_permitted_partition'"
-        )
-
-
-def wait_for_state(
-    desired_state,
-    instance,
-    test_table,
-    assert_exception_msg=None,
-    assert_rollback=False,
-):
-    last_debug_print_time = time.time()
-
-    print("Waiting to reach state: {}".format(desired_state))
-    if assert_exception_msg:
-        print("  with exception contents: {}".format(assert_exception_msg))
-    if assert_rollback:
-        print("     and rollback: {}".format(assert_rollback))
-
-    while True:
-        tasks = TSV.toMat(
-            instance.query(
-                "SELECT state, num_tries, last_exception, rollback FROM system.part_moves_between_shards WHERE table = '{}'".format(
-                    test_table
-                )
-            )
-        )
-        assert len(tasks) == 1, "only one task expected in this test"
-
-        if time.time() - last_debug_print_time > 30:
-            last_debug_print_time = time.time()
-            print("Current state: ", tasks)
-
-        [state, num_tries, last_exception, rollback] = tasks[0]
-
-        if state == desired_state:
-            if assert_exception_msg and int(num_tries) < 3:
-                # Let the task be retried a few times when expecting an exception
-                # to make sure the exception is persistent and the code doesn't
-                # accidentally continue to run when we expect it not to.
-                continue
-
-            if assert_exception_msg:
-                assert assert_exception_msg in last_exception
-
-            if assert_rollback:
-                assert int(rollback) == 1, "rollback bit isn't set"
-
-            break
-        elif state in ["DONE", "CANCELLED"]:
-            raise Exception(
-                "Reached terminal state {}, but was waiting for {}".format(
-                    state, desired_state
-                )
-            )
-
-        time.sleep(0.1)
-
-
-class ConcurrentInvariant:
-    def __init__(self, invariant_test, loop_sleep=0.1):
-        self.invariant_test = invariant_test
-        self.loop_sleep = loop_sleep
-
-        self.started = False
-        self.exiting = False
-        self.exception = None
-        self.thread = threading.Thread(target=self._loop)
-
-    def start(self):
-        if self.started:
-            raise Exception("invariant thread already started")
-
-        self.started = True
-        self.thread.start()
-
-    def stop_and_assert_no_exception(self):
-        self._assert_started()
-
-        self.exiting = True
-        self.thread.join()
-
-        if self.exception:
-            raise self.exception
-
-    def assert_no_exception(self):
-        self._assert_started()
-
-        if self.exception:
-            raise self.exception
-
-    def _loop(self):
-        try:
-            while not self.exiting:
-                self.invariant_test()
-                time.sleep(self.loop_sleep)
-        except Exception as e:
-            self.exiting = True
-            self.exception = e
-
-    def _assert_started(self):
-        if not self.started:
-            raise Exception("invariant thread not started, forgot to call start?")
diff --git a/tests/integration/test_part_uuid/test.py b/tests/integration/test_part_uuid/test.py
index b30dd884427..b1eb1280d56 100644
--- a/tests/integration/test_part_uuid/test.py
+++ b/tests/integration/test_part_uuid/test.py
@@ -108,48 +108,3 @@ def test_part_uuid(started_cluster):
         uuids.add(part_merge_uuid)
         assert part_mutate_uuid not in [uuid_zero, part_merge_uuid]
     assert len(uuids) == 1, "expect the same uuid on all the replicas"
-
-
-def test_part_uuid_wal(started_cluster):
-    uuid_zero = uuid.UUID(bytes=b"\x00" * 16)
-
-    for ix, n in enumerate([node1, node2]):
-        n.query(
-            """
-        CREATE TABLE t_wal(key UInt64, value UInt64)
-        ENGINE ReplicatedMergeTree('/clickhouse/tables/t_wal', '{}')
-        ORDER BY tuple()
-        """.format(
-                ix
-            )
-        )
-
-    node2.query("INSERT INTO t_wal VALUES (1, 1)")
-
-    uuids = set()
-    for node in [node1, node2]:
-        node.query("SYSTEM SYNC REPLICA t_wal")
-        part_initial_uuid = uuid.UUID(
-            node.query(
-                "SELECT uuid FROM system.parts WHERE table = 't_wal' AND active ORDER BY name"
-            ).strip()
-        )
-        assert (
-            "InMemory"
-            == node.query(
-                "SELECT part_type FROM system.parts WHERE table = 't_wal' AND active ORDER BY name"
-            ).strip()
-        )
-        uuids.add(part_initial_uuid)
-        assert uuid_zero != part_initial_uuid
-    assert len(uuids) == 1, "expect the same uuid on all the replicas"
-
-    # Test detach / attach table to trigger WAL processing.
-    for node in [node1, node2]:
-        node.query("DETACH TABLE t_wal; ATTACH TABLE t_wal")
-        part_reattach_uuid = uuid.UUID(
-            node.query(
-                "SELECT uuid FROM system.parts WHERE table = 't_wal' AND active ORDER BY name"
-            ).strip()
-        )
-        assert part_initial_uuid == part_reattach_uuid
diff --git a/tests/integration/test_partition/test.py b/tests/integration/test_partition/test.py
index ae4393fc6f6..93f03f4420e 100644
--- a/tests/integration/test_partition/test.py
+++ b/tests/integration/test_partition/test.py
@@ -70,7 +70,7 @@ def partition_complex_assert_columns_txt():
         )
 
 
-def partition_complex_assert_checksums():
+def partition_complex_assert_checksums(after_detach=False):
     # Do not check increment.txt - it can be changed by other tests with FREEZE
     cmd = [
         "bash",
@@ -80,34 +80,67 @@ def partition_complex_assert_checksums():
         " | sed 's shadow/[0-9]*/data/[a-z0-9_-]*/ shadow/1/data/test/ g' | sort | uniq",
     ]
 
-    checksums = (
-        "082814b5aa5109160d5c0c5aff10d4df\tshadow/1/data/test/partition_complex/19700102_2_2_0/k.bin\n"
-        "082814b5aa5109160d5c0c5aff10d4df\tshadow/1/data/test/partition_complex/19700201_1_1_0/v1.bin\n"
-        "13cae8e658e0ca4f75c56b1fc424e150\tshadow/1/data/test/partition_complex/19700102_2_2_0/minmax_p.idx\n"
-        "25daad3d9e60b45043a70c4ab7d3b1c6\tshadow/1/data/test/partition_complex/19700102_2_2_0/partition.dat\n"
-        "3726312af62aec86b64a7708d5751787\tshadow/1/data/test/partition_complex/19700201_1_1_0/partition.dat\n"
-        "37855b06a39b79a67ea4e86e4a3299aa\tshadow/1/data/test/partition_complex/19700102_2_2_0/checksums.txt\n"
-        "38e62ff37e1e5064e9a3f605dfe09d13\tshadow/1/data/test/partition_complex/19700102_2_2_0/v1.bin\n"
-        "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700102_2_2_0/k.mrk\n"
-        "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700102_2_2_0/p.mrk\n"
-        "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700102_2_2_0/v1.mrk\n"
-        "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700201_1_1_0/k.mrk\n"
-        "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700201_1_1_0/p.mrk\n"
-        "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700201_1_1_0/v1.mrk\n"
-        "55a54008ad1ba589aa210d2629c1df41\tshadow/1/data/test/partition_complex/19700201_1_1_0/primary.idx\n"
-        "5f087cb3e7071bf9407e095821e2af8f\tshadow/1/data/test/partition_complex/19700201_1_1_0/checksums.txt\n"
-        "77d5af402ada101574f4da114f242e02\tshadow/1/data/test/partition_complex/19700102_2_2_0/columns.txt\n"
-        "77d5af402ada101574f4da114f242e02\tshadow/1/data/test/partition_complex/19700201_1_1_0/columns.txt\n"
-        "88cdc31ded355e7572d68d8cde525d3a\tshadow/1/data/test/partition_complex/19700201_1_1_0/p.bin\n"
-        "9e688c58a5487b8eaf69c9e1005ad0bf\tshadow/1/data/test/partition_complex/19700102_2_2_0/primary.idx\n"
-        "c0904274faa8f3f06f35666cc9c5bd2f\tshadow/1/data/test/partition_complex/19700102_2_2_0/default_compression_codec.txt\n"
-        "c0904274faa8f3f06f35666cc9c5bd2f\tshadow/1/data/test/partition_complex/19700201_1_1_0/default_compression_codec.txt\n"
-        "c4ca4238a0b923820dcc509a6f75849b\tshadow/1/data/test/partition_complex/19700102_2_2_0/count.txt\n"
-        "c4ca4238a0b923820dcc509a6f75849b\tshadow/1/data/test/partition_complex/19700201_1_1_0/count.txt\n"
-        "cfcb770c3ecd0990dcceb1bde129e6c6\tshadow/1/data/test/partition_complex/19700102_2_2_0/p.bin\n"
-        "e2af3bef1fd129aea73a890ede1e7a30\tshadow/1/data/test/partition_complex/19700201_1_1_0/k.bin\n"
-        "f2312862cc01adf34a93151377be2ddf\tshadow/1/data/test/partition_complex/19700201_1_1_0/minmax_p.idx\n"
-    )
+    # no metadata version
+    if after_detach:
+        checksums = (
+            "082814b5aa5109160d5c0c5aff10d4df\tshadow/1/data/test/partition_complex/19700102_2_2_0/k.bin\n"
+            "082814b5aa5109160d5c0c5aff10d4df\tshadow/1/data/test/partition_complex/19700201_1_1_0/v1.bin\n"
+            "13cae8e658e0ca4f75c56b1fc424e150\tshadow/1/data/test/partition_complex/19700102_2_2_0/minmax_p.idx\n"
+            "25daad3d9e60b45043a70c4ab7d3b1c6\tshadow/1/data/test/partition_complex/19700102_2_2_0/partition.dat\n"
+            "3726312af62aec86b64a7708d5751787\tshadow/1/data/test/partition_complex/19700201_1_1_0/partition.dat\n"
+            "37855b06a39b79a67ea4e86e4a3299aa\tshadow/1/data/test/partition_complex/19700102_2_2_0/checksums.txt\n"
+            "38e62ff37e1e5064e9a3f605dfe09d13\tshadow/1/data/test/partition_complex/19700102_2_2_0/v1.bin\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700102_2_2_0/k.mrk\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700102_2_2_0/p.mrk\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700102_2_2_0/v1.mrk\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700201_1_1_0/k.mrk\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700201_1_1_0/p.mrk\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700201_1_1_0/v1.mrk\n"
+            "55a54008ad1ba589aa210d2629c1df41\tshadow/1/data/test/partition_complex/19700201_1_1_0/primary.idx\n"
+            "5f087cb3e7071bf9407e095821e2af8f\tshadow/1/data/test/partition_complex/19700201_1_1_0/checksums.txt\n"
+            "77d5af402ada101574f4da114f242e02\tshadow/1/data/test/partition_complex/19700102_2_2_0/columns.txt\n"
+            "77d5af402ada101574f4da114f242e02\tshadow/1/data/test/partition_complex/19700201_1_1_0/columns.txt\n"
+            "88cdc31ded355e7572d68d8cde525d3a\tshadow/1/data/test/partition_complex/19700201_1_1_0/p.bin\n"
+            "9e688c58a5487b8eaf69c9e1005ad0bf\tshadow/1/data/test/partition_complex/19700102_2_2_0/primary.idx\n"
+            "c0904274faa8f3f06f35666cc9c5bd2f\tshadow/1/data/test/partition_complex/19700102_2_2_0/default_compression_codec.txt\n"
+            "c0904274faa8f3f06f35666cc9c5bd2f\tshadow/1/data/test/partition_complex/19700201_1_1_0/default_compression_codec.txt\n"
+            "c4ca4238a0b923820dcc509a6f75849b\tshadow/1/data/test/partition_complex/19700102_2_2_0/count.txt\n"
+            "c4ca4238a0b923820dcc509a6f75849b\tshadow/1/data/test/partition_complex/19700201_1_1_0/count.txt\n"
+            "cfcb770c3ecd0990dcceb1bde129e6c6\tshadow/1/data/test/partition_complex/19700102_2_2_0/p.bin\n"
+            "e2af3bef1fd129aea73a890ede1e7a30\tshadow/1/data/test/partition_complex/19700201_1_1_0/k.bin\n"
+            "f2312862cc01adf34a93151377be2ddf\tshadow/1/data/test/partition_complex/19700201_1_1_0/minmax_p.idx\n"
+        )
+    else:
+        checksums = (
+            "082814b5aa5109160d5c0c5aff10d4df\tshadow/1/data/test/partition_complex/19700102_2_2_0/k.bin\n"
+            "082814b5aa5109160d5c0c5aff10d4df\tshadow/1/data/test/partition_complex/19700201_1_1_0/v1.bin\n"
+            "13cae8e658e0ca4f75c56b1fc424e150\tshadow/1/data/test/partition_complex/19700102_2_2_0/minmax_p.idx\n"
+            "25daad3d9e60b45043a70c4ab7d3b1c6\tshadow/1/data/test/partition_complex/19700102_2_2_0/partition.dat\n"
+            "3726312af62aec86b64a7708d5751787\tshadow/1/data/test/partition_complex/19700201_1_1_0/partition.dat\n"
+            "37855b06a39b79a67ea4e86e4a3299aa\tshadow/1/data/test/partition_complex/19700102_2_2_0/checksums.txt\n"
+            "38e62ff37e1e5064e9a3f605dfe09d13\tshadow/1/data/test/partition_complex/19700102_2_2_0/v1.bin\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700102_2_2_0/k.mrk\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700102_2_2_0/p.mrk\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700102_2_2_0/v1.mrk\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700201_1_1_0/k.mrk\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700201_1_1_0/p.mrk\n"
+            "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition_complex/19700201_1_1_0/v1.mrk\n"
+            "55a54008ad1ba589aa210d2629c1df41\tshadow/1/data/test/partition_complex/19700201_1_1_0/primary.idx\n"
+            "5f087cb3e7071bf9407e095821e2af8f\tshadow/1/data/test/partition_complex/19700201_1_1_0/checksums.txt\n"
+            "77d5af402ada101574f4da114f242e02\tshadow/1/data/test/partition_complex/19700102_2_2_0/columns.txt\n"
+            "77d5af402ada101574f4da114f242e02\tshadow/1/data/test/partition_complex/19700201_1_1_0/columns.txt\n"
+            "88cdc31ded355e7572d68d8cde525d3a\tshadow/1/data/test/partition_complex/19700201_1_1_0/p.bin\n"
+            "9e688c58a5487b8eaf69c9e1005ad0bf\tshadow/1/data/test/partition_complex/19700102_2_2_0/primary.idx\n"
+            "c0904274faa8f3f06f35666cc9c5bd2f\tshadow/1/data/test/partition_complex/19700102_2_2_0/default_compression_codec.txt\n"
+            "c0904274faa8f3f06f35666cc9c5bd2f\tshadow/1/data/test/partition_complex/19700201_1_1_0/default_compression_codec.txt\n"
+            "c4ca4238a0b923820dcc509a6f75849b\tshadow/1/data/test/partition_complex/19700102_2_2_0/count.txt\n"
+            "c4ca4238a0b923820dcc509a6f75849b\tshadow/1/data/test/partition_complex/19700201_1_1_0/count.txt\n"
+            "cfcb770c3ecd0990dcceb1bde129e6c6\tshadow/1/data/test/partition_complex/19700102_2_2_0/p.bin\n"
+            "cfcd208495d565ef66e7dff9f98764da\tshadow/1/data/test/partition_complex/19700102_2_2_0/metadata_version.txt\n"
+            "cfcd208495d565ef66e7dff9f98764da\tshadow/1/data/test/partition_complex/19700201_1_1_0/metadata_version.txt\n"
+            "e2af3bef1fd129aea73a890ede1e7a30\tshadow/1/data/test/partition_complex/19700201_1_1_0/k.bin\n"
+            "f2312862cc01adf34a93151377be2ddf\tshadow/1/data/test/partition_complex/19700201_1_1_0/minmax_p.idx\n"
+        )
 
     assert TSV(instance.exec_in_container(cmd).replace("  ", "\t")) == TSV(checksums)
 
@@ -132,7 +165,7 @@ def test_partition_complex(partition_table_complex):
 
     q("ALTER TABLE test.partition_complex FREEZE")
 
-    partition_complex_assert_checksums()
+    partition_complex_assert_checksums(True)
 
     q("ALTER TABLE test.partition_complex DETACH PARTITION 197001")
     q("ALTER TABLE test.partition_complex ATTACH PARTITION 197001")
@@ -142,7 +175,7 @@ def test_partition_complex(partition_table_complex):
     q("ALTER TABLE test.partition_complex MODIFY COLUMN v1 Int8")
 
     # Check the backup hasn't changed
-    partition_complex_assert_checksums()
+    partition_complex_assert_checksums(True)
 
     q("OPTIMIZE TABLE test.partition_complex")
 
@@ -528,7 +561,9 @@ def test_make_clone_in_detached(started_cluster):
         ["cp", "-r", path + "all_0_0_0", path + "detached/broken_all_0_0_0"]
     )
     assert_eq_with_retry(instance, "select * from clone_in_detached", "\n")
-    assert ["broken_all_0_0_0",] == sorted(
+    assert [
+        "broken_all_0_0_0",
+    ] == sorted(
         instance.exec_in_container(["ls", path + "detached/"]).strip().split("\n")
     )
 
diff --git a/tests/integration/test_password_constraints/configs/default_password_type.xml b/tests/integration/test_password_constraints/configs/default_password_type.xml
new file mode 100644
index 00000000000..4b23ea31df0
--- /dev/null
+++ b/tests/integration/test_password_constraints/configs/default_password_type.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <default_password_type>double_sha1_password</default_password_type>
+</clickhouse>
diff --git a/tests/integration/test_password_constraints/test.py b/tests/integration/test_password_constraints/test.py
index e3628861b28..94e10ed5f9e 100644
--- a/tests/integration/test_password_constraints/test.py
+++ b/tests/integration/test_password_constraints/test.py
@@ -5,6 +5,9 @@ from helpers.cluster import ClickHouseCluster
 cluster = ClickHouseCluster(__file__)
 
 node = cluster.add_instance("node", main_configs=["configs/complexity_rules.xml"])
+node2 = cluster.add_instance(
+    "node2", main_configs=["configs/default_password_type.xml"]
+)
 
 
 @pytest.fixture(scope="module")
@@ -17,7 +20,6 @@ def start_cluster():
 
 
 def test_complexity_rules(start_cluster):
-
     error_message = "DB::Exception: Invalid password. The password should: be at least 12 characters long, contain at least 1 numeric character, contain at least 1 lowercase character, contain at least 1 uppercase character, contain at least 1 special character"
     assert error_message in node.query_and_get_error(
         "CREATE USER u_1 IDENTIFIED WITH plaintext_password BY ''"
@@ -40,3 +42,10 @@ def test_complexity_rules(start_cluster):
 
     node.query("CREATE USER u_5 IDENTIFIED WITH plaintext_password BY 'aA!000000000'")
     node.query("DROP USER u_5")
+
+
+def test_default_password_type(start_cluster):
+    node2.query("CREATE USER u1 IDENTIFIED BY 'pwd'")
+
+    required_type = "double_sha1_password"
+    assert required_type in node2.query("SHOW CREATE USER u1")
diff --git a/tests/integration/test_polymorphic_parts/test.py b/tests/integration/test_polymorphic_parts/test.py
index 361b4855747..fb1f363b825 100644
--- a/tests/integration/test_polymorphic_parts/test.py
+++ b/tests/integration/test_polymorphic_parts/test.py
@@ -49,9 +49,8 @@ def create_tables(name, nodes, node_settings, shard):
             PARTITION BY toYYYYMM(date)
             ORDER BY id
             SETTINGS index_granularity = 64, index_granularity_bytes = {index_granularity_bytes},
-            min_rows_for_wide_part = {min_rows_for_wide_part}, min_rows_for_compact_part = {min_rows_for_compact_part},
-            min_bytes_for_wide_part = 0, min_bytes_for_compact_part = 0,
-            in_memory_parts_enable_wal = 1
+            min_rows_for_wide_part = {min_rows_for_wide_part},
+            min_bytes_for_wide_part = 0
             """.format(
                 name=name, shard=shard, repl=i, **settings
             )
@@ -87,17 +86,14 @@ node2 = cluster.add_instance(
 settings_default = {
     "index_granularity_bytes": 10485760,
     "min_rows_for_wide_part": 512,
-    "min_rows_for_compact_part": 0,
 }
 settings_compact_only = {
     "index_granularity_bytes": 10485760,
     "min_rows_for_wide_part": 1000000,
-    "min_rows_for_compact_part": 0,
 }
 settings_not_adaptive = {
     "index_granularity_bytes": 0,
     "min_rows_for_wide_part": 512,
-    "min_rows_for_compact_part": 0,
 }
 
 node3 = cluster.add_instance(
@@ -116,12 +112,10 @@ node4 = cluster.add_instance(
 settings_compact = {
     "index_granularity_bytes": 10485760,
     "min_rows_for_wide_part": 512,
-    "min_rows_for_compact_part": 0,
 }
 settings_wide = {
     "index_granularity_bytes": 10485760,
     "min_rows_for_wide_part": 0,
-    "min_rows_for_compact_part": 0,
 }
 
 node5 = cluster.add_instance(
@@ -131,12 +125,6 @@ node6 = cluster.add_instance(
     "node6", main_configs=["configs/compact_parts.xml"], with_zookeeper=True
 )
 
-settings_in_memory = {
-    "index_granularity_bytes": 10485760,
-    "min_rows_for_wide_part": 512,
-    "min_rows_for_compact_part": 256,
-}
-
 node9 = cluster.add_instance("node9", with_zookeeper=True, stay_alive=True)
 node10 = cluster.add_instance("node10", with_zookeeper=True)
 
@@ -190,42 +178,6 @@ def start_cluster():
             "shard2",
         )
         create_tables_old_format("polymorphic_table", [node5, node6], "shard3")
-        create_tables(
-            "in_memory_table",
-            [node9, node10],
-            [settings_in_memory, settings_in_memory],
-            "shard4",
-        )
-        create_tables(
-            "wal_table",
-            [node11, node12],
-            [settings_in_memory, settings_in_memory],
-            "shard4",
-        )
-        create_tables(
-            "restore_table",
-            [node11, node12],
-            [settings_in_memory, settings_in_memory],
-            "shard5",
-        )
-        create_tables(
-            "deduplication_table",
-            [node9, node10],
-            [settings_in_memory, settings_in_memory],
-            "shard5",
-        )
-        create_tables(
-            "sync_table",
-            [node9, node10],
-            [settings_in_memory, settings_in_memory],
-            "shard5",
-        )
-        create_tables(
-            "alters_table",
-            [node9, node10],
-            [settings_in_memory, settings_in_memory],
-            "shard5",
-        )
 
         yield cluster
 
@@ -422,7 +374,6 @@ settings7 = {"index_granularity_bytes": 10485760}
 settings8 = {
     "index_granularity_bytes": 10485760,
     "min_rows_for_wide_part": 512,
-    "min_rows_for_compact_part": 0,
 }
 
 
@@ -538,187 +489,6 @@ def test_polymorphic_parts_non_adaptive(start_cluster):
     )
 
 
-def test_in_memory(start_cluster):
-    node9.query("SYSTEM STOP MERGES")
-    node10.query("SYSTEM STOP MERGES")
-
-    for size in [200, 200, 300, 600]:
-        insert_random_data("in_memory_table", node9, size)
-    node10.query("SYSTEM SYNC REPLICA in_memory_table", timeout=20)
-
-    assert node9.query("SELECT count() FROM in_memory_table") == "1300\n"
-    assert node10.query("SELECT count() FROM in_memory_table") == "1300\n"
-
-    expected = "Compact\t1\nInMemory\t2\nWide\t1\n"
-
-    assert TSV(
-        node9.query(
-            "SELECT part_type, count() FROM system.parts "
-            "WHERE table = 'in_memory_table' AND active GROUP BY part_type ORDER BY part_type"
-        )
-    ) == TSV(expected)
-    assert TSV(
-        node10.query(
-            "SELECT part_type, count() FROM system.parts "
-            "WHERE table = 'in_memory_table' AND active GROUP BY part_type ORDER BY part_type"
-        )
-    ) == TSV(expected)
-
-    node9.query("SYSTEM START MERGES")
-    node10.query("SYSTEM START MERGES")
-
-    assert_eq_with_retry(
-        node9,
-        "OPTIMIZE TABLE in_memory_table FINAL SETTINGS optimize_throw_if_noop = 1",
-        "",
-    )
-    node10.query("SYSTEM SYNC REPLICA in_memory_table", timeout=20)
-
-    assert node9.query("SELECT count() FROM in_memory_table") == "1300\n"
-    assert node10.query("SELECT count() FROM in_memory_table") == "1300\n"
-
-    assert TSV(
-        node9.query(
-            "SELECT part_type, count() FROM system.parts "
-            "WHERE table = 'in_memory_table' AND active GROUP BY part_type ORDER BY part_type"
-        )
-    ) == TSV("Wide\t1\n")
-    assert TSV(
-        node10.query(
-            "SELECT part_type, count() FROM system.parts "
-            "WHERE table = 'in_memory_table' AND active GROUP BY part_type ORDER BY part_type"
-        )
-    ) == TSV("Wide\t1\n")
-
-
-def test_in_memory_wal_rotate(start_cluster):
-    # Write every part to single wal
-    node11.query(
-        "ALTER TABLE restore_table MODIFY SETTING write_ahead_log_max_bytes = 10"
-    )
-    for i in range(5):
-        insert_random_data("restore_table", node11, 50)
-
-    for i in range(5):
-        # Check file exists
-        node11.exec_in_container(
-            [
-                "bash",
-                "-c",
-                "test -f /var/lib/clickhouse/data/default/restore_table/wal_{0}_{0}.bin".format(
-                    i
-                ),
-            ]
-        )
-
-    for node in [node11, node12]:
-        node.query(
-            "ALTER TABLE restore_table MODIFY SETTING number_of_free_entries_in_pool_to_lower_max_size_of_merge = 0"
-        )
-        node.query(
-            "ALTER TABLE restore_table MODIFY SETTING max_bytes_to_merge_at_max_space_in_pool = 10000000"
-        )
-
-    assert_eq_with_retry(
-        node11,
-        "OPTIMIZE TABLE restore_table FINAL SETTINGS optimize_throw_if_noop = 1",
-        "",
-    )
-    # Restart to be sure, that clearing stale logs task was ran
-    node11.restart_clickhouse(kill=True)
-
-    for i in range(5):
-        # check file doesn't exist
-        node11.exec_in_container(
-            [
-                "bash",
-                "-c",
-                "test ! -e /var/lib/clickhouse/data/default/restore_table/wal_{0}_{0}.bin".format(
-                    i
-                ),
-            ]
-        )
-
-    # New wal file was created and ready to write part to it
-    # Check file exists
-    node11.exec_in_container(
-        ["bash", "-c", "test -f /var/lib/clickhouse/data/default/restore_table/wal.bin"]
-    )
-    # Chech file empty
-    node11.exec_in_container(
-        [
-            "bash",
-            "-c",
-            "test ! -s /var/lib/clickhouse/data/default/restore_table/wal.bin",
-        ]
-    )
-
-
-def test_in_memory_deduplication(start_cluster):
-    for i in range(3):
-        # table can be in readonly node
-        exec_query_with_retry(
-            node9,
-            "INSERT INTO deduplication_table (date, id, s) VALUES (toDate('2020-03-03'), 1, 'foo')",
-        )
-        exec_query_with_retry(
-            node10,
-            "INSERT INTO deduplication_table (date, id, s) VALUES (toDate('2020-03-03'), 1, 'foo')",
-        )
-
-    node9.query("SYSTEM SYNC REPLICA deduplication_table", timeout=20)
-    node10.query("SYSTEM SYNC REPLICA deduplication_table", timeout=20)
-
-    assert (
-        node9.query("SELECT date, id, s FROM deduplication_table")
-        == "2020-03-03\t1\tfoo\n"
-    )
-    assert (
-        node10.query("SELECT date, id, s FROM deduplication_table")
-        == "2020-03-03\t1\tfoo\n"
-    )
-
-
-# Checks that restoring from WAL works after table schema changed
-def test_in_memory_alters(start_cluster):
-    def check_parts_type(parts_num):
-        assert (
-            node9.query(
-                "SELECT part_type, count() FROM system.parts WHERE table = 'alters_table' \
-             AND active GROUP BY part_type"
-            )
-            == "InMemory\t{}\n".format(parts_num)
-        )
-
-    node9.query(
-        "INSERT INTO alters_table (date, id, s) VALUES (toDate('2020-10-10'), 1, 'ab'), (toDate('2020-10-10'), 2, 'cd')"
-    )
-    node9.query("ALTER TABLE alters_table ADD COLUMN col1 UInt32")
-    node9.restart_clickhouse(kill=True)
-
-    expected = "1\tab\t0\n2\tcd\t0\n"
-    assert node9.query("SELECT id, s, col1 FROM alters_table ORDER BY id") == expected
-    check_parts_type(1)
-    node9.query(
-        "INSERT INTO alters_table (date, id, col1) VALUES (toDate('2020-10-10'), 3, 100)"
-    )
-    node9.query("ALTER TABLE alters_table MODIFY COLUMN col1 String")
-    node9.query("ALTER TABLE alters_table DROP COLUMN s")
-    node9.restart_clickhouse(kill=True)
-
-    check_parts_type(2)
-    with pytest.raises(Exception):
-        node9.query("SELECT id, s, col1 FROM alters_table")
-
-    # Values of col1 was not materialized as integers, so they have
-    # default string values after alter
-    expected = "1\t_foo\n2\t_foo\n3\t100_foo\n"
-    assert (
-        node9.query("SELECT id, col1 || '_foo' FROM alters_table ORDER BY id")
-        == expected
-    )
-
-
 def test_polymorphic_parts_index(start_cluster):
     node1.query(
         "CREATE DATABASE test_index ENGINE=Ordinary",
diff --git a/tests/integration/test_postgresql_database_engine/test.py b/tests/integration/test_postgresql_database_engine/test.py
index de6c9ad2cf9..d9f06f0295b 100644
--- a/tests/integration/test_postgresql_database_engine/test.py
+++ b/tests/integration/test_postgresql_database_engine/test.py
@@ -327,6 +327,17 @@ def test_predefined_connection_configuration(started_cluster):
         node1.query(f"SELECT count() FROM postgres_database.test_table").rstrip()
         == "100"
     )
+    node1.query(
+        """
+        DROP DATABASE postgres_database;
+        CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres1, use_table_cache=1);
+        """
+    )
+    assert (
+        node1.query(f"SELECT count() FROM postgres_database.test_table").rstrip()
+        == "100"
+    )
+    assert node1.contains_in_log("Cached table `test_table`")
 
     node1.query("DROP DATABASE postgres_database")
     cursor.execute(f"DROP TABLE test_table ")
diff --git a/tests/integration/test_postgresql_replica_database_engine_2/test.py b/tests/integration/test_postgresql_replica_database_engine_2/test.py
index 33796336550..90d19e9532c 100644
--- a/tests/integration/test_postgresql_replica_database_engine_2/test.py
+++ b/tests/integration/test_postgresql_replica_database_engine_2/test.py
@@ -203,7 +203,7 @@ def test_remove_table_from_replication(started_cluster):
     table_name = "postgresql_replica_4"
     instance.query(f"DETACH TABLE test_database.{table_name} PERMANENTLY")
     result = instance.query_and_get_error(f"SELECT * FROM test_database.{table_name}")
-    assert "doesn't exist" in result
+    assert "UNKNOWN_TABLE" in result
 
     result = instance.query("SHOW TABLES FROM test_database")
     assert (
@@ -624,7 +624,7 @@ def test_table_override(started_cluster):
     time.sleep(5)
     query = f"select * from {materialized_database}.{table_name} order by key"
     expected = instance.query(f"select * from {table_name} order by key")
-    instance.query(f"drop table {table_name} no delay")
+    instance.query(f"drop table {table_name} sync")
     assert_eq_with_retry(instance, query, expected)
 
 
diff --git a/tests/integration/test_profile_events_s3/test.py b/tests/integration/test_profile_events_s3/test.py
index b5e095514cb..5c56b5c05cb 100644
--- a/tests/integration/test_profile_events_s3/test.py
+++ b/tests/integration/test_profile_events_s3/test.py
@@ -37,6 +37,8 @@ init_list = {
     "ReadBufferFromS3InitMicroseconds": 0,
     "ReadBufferFromS3RequestsErrors": 0,
     "WriteBufferFromS3Bytes": 0,
+    "WriteBufferFromS3Microseconds": 0,
+    "WriteBufferFromS3RequestsErrors": 0,
     "S3ReadMicroseconds": 0,
     "S3ReadRequestsCount": 0,
     "S3ReadRequestsErrorsTotal": 0,
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/20220830083647456.deltacommit.requested b/tests/integration/test_projection_report_broken_part/__init__.py
similarity index 100%
rename from tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/20220830083647456.deltacommit.requested
rename to tests/integration/test_projection_report_broken_part/__init__.py
diff --git a/tests/integration/test_projection_report_broken_part/configs/testkeeper.xml b/tests/integration/test_projection_report_broken_part/configs/testkeeper.xml
new file mode 100644
index 00000000000..617371b13fa
--- /dev/null
+++ b/tests/integration/test_projection_report_broken_part/configs/testkeeper.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <zookeeper>
+        <!-- Don't need real [Zoo]Keeper for this test -->
+        <implementation>testkeeper</implementation>
+    </zookeeper>
+</clickhouse>
diff --git a/tests/integration/test_projection_report_broken_part/test.py b/tests/integration/test_projection_report_broken_part/test.py
new file mode 100644
index 00000000000..f376adf4f1a
--- /dev/null
+++ b/tests/integration/test_projection_report_broken_part/test.py
@@ -0,0 +1,65 @@
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+# pylint: disable=line-too-long
+
+import pytest
+import time
+
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    main_configs=[
+        "configs/testkeeper.xml",
+    ],
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_projection_broken_part():
+    node.query(
+        """
+        create table test_projection_broken_parts_1 (a int, b int, projection ab (select a, sum(b) group by a))
+        engine = ReplicatedMergeTree('/clickhouse-tables/test_projection_broken_parts', 'r1')
+        order by a settings index_granularity = 1;
+
+        create table test_projection_broken_parts_2 (a int, b int, projection ab (select a, sum(b) group by a))
+        engine ReplicatedMergeTree('/clickhouse-tables/test_projection_broken_parts', 'r2')
+        order by a settings index_granularity = 1;
+
+        insert into test_projection_broken_parts_1 values (1, 1), (1, 2), (1, 3);
+
+        system sync replica test_projection_broken_parts_2;
+    """
+    )
+
+    # break projection part
+    node.exec_in_container(
+        [
+            "bash",
+            "-c",
+            "rm /var/lib/clickhouse/data/default/test_projection_broken_parts_1/all_0_0_0/ab.proj/data.bin",
+        ]
+    )
+
+    expected_error = "No such file or directory"
+    assert expected_error in node.query_and_get_error(
+        "select sum(b) from test_projection_broken_parts_1 group by a"
+    )
+
+    time.sleep(2)
+
+    assert (
+        int(node.query("select sum(b) from test_projection_broken_parts_1 group by a"))
+        == 6
+    )
diff --git a/tests/integration/test_quorum_inserts/test.py b/tests/integration/test_quorum_inserts/test.py
index 779d1a69dcc..4dbd530dd17 100644
--- a/tests/integration/test_quorum_inserts/test.py
+++ b/tests/integration/test_quorum_inserts/test.py
@@ -144,25 +144,6 @@ def test_drop_replica_and_achieve_quorum(started_cluster):
         )
     )
 
-    print("Now we can insert some other data.")
-    zero.query(
-        "INSERT INTO test_drop_replica_and_achieve_quorum(a,d) VALUES (2, '2012-02-02')"
-    )
-
-    assert TSV("1\t2011-01-01\n2\t2012-02-02\n") == TSV(
-        zero.query("SELECT * FROM test_drop_replica_and_achieve_quorum ORDER BY a")
-    )
-    assert TSV("1\t2011-01-01\n2\t2012-02-02\n") == TSV(
-        first.query("SELECT * FROM test_drop_replica_and_achieve_quorum ORDER BY a")
-    )
-    assert TSV("1\t2011-01-01\n2\t2012-02-02\n") == TSV(
-        second.query("SELECT * FROM test_drop_replica_and_achieve_quorum ORDER BY a")
-    )
-
-    zero.query(
-        "DROP TABLE IF EXISTS test_drop_replica_and_achieve_quorum ON CLUSTER cluster"
-    )
-
 
 @pytest.mark.parametrize(("add_new_data"), [False, True])
 def test_insert_quorum_with_drop_partition(started_cluster, add_new_data):
diff --git a/tests/integration/test_read_only_table/test.py b/tests/integration/test_read_only_table/test.py
index 914c6a99508..df084f9dbbd 100644
--- a/tests/integration/test_read_only_table/test.py
+++ b/tests/integration/test_read_only_table/test.py
@@ -49,7 +49,6 @@ def start_cluster():
 
 
 def test_restart_zookeeper(start_cluster):
-
     for table_id in range(NUM_TABLES):
         node1.query(
             f"INSERT INTO test_table_{table_id} VALUES (1), (2), (3), (4), (5);"
diff --git a/tests/integration/test_reload_auxiliary_zookeepers/test.py b/tests/integration/test_reload_auxiliary_zookeepers/test.py
index bb1455333fc..476c5dee99e 100644
--- a/tests/integration/test_reload_auxiliary_zookeepers/test.py
+++ b/tests/integration/test_reload_auxiliary_zookeepers/test.py
@@ -20,7 +20,6 @@ def start_cluster():
 
 
 def test_reload_auxiliary_zookeepers(start_cluster):
-
     node.query(
         "CREATE TABLE simple (date Date, id UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/simple', 'node') ORDER BY tuple() PARTITION BY date;"
     )
diff --git a/tests/integration/test_rename_column/test.py b/tests/integration/test_rename_column/test.py
index 33343da8f6d..8dc57cf08ff 100644
--- a/tests/integration/test_rename_column/test.py
+++ b/tests/integration/test_rename_column/test.py
@@ -40,7 +40,7 @@ def started_cluster():
 
 def drop_table(nodes, table_name):
     for node in nodes:
-        node.query("DROP TABLE IF EXISTS {} NO DELAY".format(table_name))
+        node.query("DROP TABLE IF EXISTS {} SYNC".format(table_name))
 
 
 def create_table(
@@ -225,7 +225,9 @@ def select(
 def rename_column(
     node, table_name, name, new_name, iterations=1, ignore_exception=False
 ):
-    for i in range(iterations):
+    i = 0
+    while True:
+        i += 1
         try:
             node.query(
                 "ALTER TABLE {table_name} RENAME COLUMN {name} to {new_name}".format(
@@ -233,14 +235,22 @@ def rename_column(
                 )
             )
         except QueryRuntimeException as ex:
+            if "Coordination::Exception" in str(ex):
+                continue
+
             if not ignore_exception:
                 raise
 
+        if i >= iterations:
+            break
+
 
 def rename_column_on_cluster(
     node, table_name, name, new_name, iterations=1, ignore_exception=False
 ):
-    for i in range(iterations):
+    i = 0
+    while True:
+        i += 1
         try:
             node.query(
                 "ALTER TABLE {table_name} ON CLUSTER test_cluster RENAME COLUMN {name} to {new_name}".format(
@@ -248,12 +258,20 @@ def rename_column_on_cluster(
                 )
             )
         except QueryRuntimeException as ex:
+            if "Coordination::Exception" in str(ex):
+                continue
+
             if not ignore_exception:
                 raise
 
+        if i >= iterations:
+            break
+
 
 def alter_move(node, table_name, iterations=1, ignore_exception=False):
-    for i in range(iterations):
+    i = 0
+    while True:
+        i += 1
         move_part = random.randint(0, 99)
         move_volume = "external"
         try:
@@ -263,9 +281,15 @@ def alter_move(node, table_name, iterations=1, ignore_exception=False):
                 )
             )
         except QueryRuntimeException as ex:
+            if "Coordination::Exception" in str(ex):
+                continue
+
             if not ignore_exception:
                 raise
 
+        if i >= iterations:
+            break
+
 
 def test_rename_parallel_same_node(started_cluster):
     table_name = "test_rename_parallel_same_node"
diff --git a/tests/integration/test_replicated_database/test.py b/tests/integration/test_replicated_database/test.py
index ead9a762b1b..2ab2fe499ff 100644
--- a/tests/integration/test_replicated_database/test.py
+++ b/tests/integration/test_replicated_database/test.py
@@ -80,15 +80,15 @@ def started_cluster():
 
 def test_create_replicated_table(started_cluster):
     main_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica' || '1');"
+        "CREATE DATABASE create_replicated_table ENGINE = Replicated('/test/create_replicated_table', 'shard1', 'replica' || '1');"
     )
     dummy_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica2');"
+        "CREATE DATABASE create_replicated_table ENGINE = Replicated('/test/create_replicated_table', 'shard1', 'replica2');"
     )
     assert (
         "Explicit zookeeper_path and replica_name are specified"
         in main_node.query_and_get_error(
-            "CREATE TABLE testdb.replicated_table (d Date, k UInt64, i32 Int32) "
+            "CREATE TABLE create_replicated_table.replicated_table (d Date, k UInt64, i32 Int32) "
             "ENGINE=ReplicatedMergeTree('/test/tmp', 'r') ORDER BY k PARTITION BY toYYYYMM(d);"
         )
     )
@@ -96,7 +96,7 @@ def test_create_replicated_table(started_cluster):
     assert (
         "Explicit zookeeper_path and replica_name are specified"
         in main_node.query_and_get_error(
-            "CREATE TABLE testdb.replicated_table (d Date, k UInt64, i32 Int32) "
+            "CREATE TABLE create_replicated_table.replicated_table (d Date, k UInt64, i32 Int32) "
             "ENGINE=ReplicatedMergeTree('/test/tmp', 'r') ORDER BY k PARTITION BY toYYYYMM(d);"
         )
     )
@@ -104,39 +104,41 @@ def test_create_replicated_table(started_cluster):
     assert (
         "This syntax for *MergeTree engine is deprecated"
         in main_node.query_and_get_error(
-            "CREATE TABLE testdb.replicated_table (d Date, k UInt64, i32 Int32) "
+            "CREATE TABLE create_replicated_table.replicated_table (d Date, k UInt64, i32 Int32) "
             "ENGINE=ReplicatedMergeTree('/test/tmp/{shard}', '{replica}', d, k, 8192);"
         )
     )
 
     main_node.query(
-        "CREATE TABLE testdb.replicated_table (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree ORDER BY k PARTITION BY toYYYYMM(d);"
+        "CREATE TABLE create_replicated_table.replicated_table (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree ORDER BY k PARTITION BY toYYYYMM(d);"
     )
 
     expected = (
-        "CREATE TABLE testdb.replicated_table\\n(\\n    `d` Date,\\n    `k` UInt64,\\n    `i32` Int32\\n)\\n"
+        "CREATE TABLE create_replicated_table.replicated_table\\n(\\n    `d` Date,\\n    `k` UInt64,\\n    `i32` Int32\\n)\\n"
         "ENGINE = ReplicatedMergeTree(\\'/clickhouse/tables/{uuid}/{shard}\\', \\'{replica}\\')\\n"
         "PARTITION BY toYYYYMM(d)\\nORDER BY k\\nSETTINGS index_granularity = 8192"
     )
-    assert_create_query([main_node, dummy_node], "testdb.replicated_table", expected)
-    # assert without replacing uuid
-    assert main_node.query("show create testdb.replicated_table") == dummy_node.query(
-        "show create testdb.replicated_table"
+    assert_create_query(
+        [main_node, dummy_node], "create_replicated_table.replicated_table", expected
     )
-    main_node.query("DROP DATABASE testdb SYNC")
-    dummy_node.query("DROP DATABASE testdb SYNC")
+    # assert without replacing uuid
+    assert main_node.query(
+        "show create create_replicated_table.replicated_table"
+    ) == dummy_node.query("show create create_replicated_table.replicated_table")
+    main_node.query("DROP DATABASE create_replicated_table SYNC")
+    dummy_node.query("DROP DATABASE create_replicated_table SYNC")
 
 
 @pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
 def test_simple_alter_table(started_cluster, engine):
     main_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica1');"
+        "CREATE DATABASE test_simple_alter_table ENGINE = Replicated('/test/simple_alter_table', 'shard1', 'replica1');"
     )
     dummy_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica2');"
+        "CREATE DATABASE test_simple_alter_table ENGINE = Replicated('/test/simple_alter_table', 'shard1', 'replica2');"
     )
     # test_simple_alter_table
-    name = "testdb.alter_test_{}".format(engine)
+    name = "test_simple_alter_table.alter_test_{}".format(engine)
     main_node.query(
         "CREATE TABLE {} "
         "(CounterID UInt32, StartDate Date, UserID UInt32, VisitID UInt32, NestedColumn Nested(A UInt8, S String), ToDrop UInt32) "
@@ -184,10 +186,10 @@ def test_simple_alter_table(started_cluster, engine):
 
     # test_create_replica_after_delay
     competing_node.query(
-        "CREATE DATABASE IF NOT EXISTS testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica3');"
+        "CREATE DATABASE IF NOT EXISTS test_simple_alter_table ENGINE = Replicated('/test/simple_alter_table', 'shard1', 'replica3');"
     )
 
-    name = "testdb.alter_test_{}".format(engine)
+    name = "test_simple_alter_table.alter_test_{}".format(engine)
     main_node.query("ALTER TABLE {} ADD COLUMN Added3 UInt32;".format(name))
     main_node.query("ALTER TABLE {} DROP COLUMN AddedNested1;".format(name))
     main_node.query("ALTER TABLE {} RENAME COLUMN Added1 TO AddedNested1;".format(name))
@@ -207,21 +209,21 @@ def test_simple_alter_table(started_cluster, engine):
     )
 
     assert_create_query([main_node, dummy_node, competing_node], name, expected)
-    main_node.query("DROP DATABASE testdb SYNC")
-    dummy_node.query("DROP DATABASE testdb SYNC")
-    competing_node.query("DROP DATABASE testdb SYNC")
+    main_node.query("DROP DATABASE test_simple_alter_table SYNC")
+    dummy_node.query("DROP DATABASE test_simple_alter_table SYNC")
+    competing_node.query("DROP DATABASE test_simple_alter_table SYNC")
 
 
 @pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
 def test_delete_from_table(started_cluster, engine):
     main_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica1');"
+        "CREATE DATABASE delete_from_table ENGINE = Replicated('/test/simple_alter_table', 'shard1', 'replica1');"
     )
     dummy_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard2', 'replica1');"
+        "CREATE DATABASE delete_from_table ENGINE = Replicated('/test/simple_alter_table', 'shard2', 'replica1');"
     )
 
-    name = "testdb.delete_test_{}".format(engine)
+    name = "delete_from_table.delete_test_{}".format(engine)
     main_node.query(
         "CREATE TABLE {} "
         "(id UInt64, value String) "
@@ -238,7 +240,7 @@ def test_delete_from_table(started_cluster, engine):
 
     table_for_select = name
     if not "Replicated" in engine:
-        table_for_select = "cluster('testdb', {})".format(name)
+        table_for_select = "cluster('delete_from_table', {})".format(name)
     for node in [main_node, dummy_node]:
         assert_eq_with_retry(
             node,
@@ -246,8 +248,8 @@ def test_delete_from_table(started_cluster, engine):
             expected,
         )
 
-    main_node.query("DROP DATABASE testdb SYNC")
-    dummy_node.query("DROP DATABASE testdb SYNC")
+    main_node.query("DROP DATABASE delete_from_table SYNC")
+    dummy_node.query("DROP DATABASE delete_from_table SYNC")
 
 
 def get_table_uuid(database, name):
@@ -276,17 +278,17 @@ def fixture_attachable_part(started_cluster):
 @pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
 def test_alter_attach(started_cluster, attachable_part, engine):
     main_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica1');"
+        "CREATE DATABASE alter_attach ENGINE = Replicated('/test/alter_attach', 'shard1', 'replica1');"
     )
     dummy_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica2');"
+        "CREATE DATABASE alter_attach ENGINE = Replicated('/test/alter_attach', 'shard1', 'replica2');"
     )
 
     name = "alter_attach_test_{}".format(engine)
     main_node.query(
-        f"CREATE TABLE testdb.{name} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)"
+        f"CREATE TABLE alter_attach.{name} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)"
     )
-    table_uuid = get_table_uuid("testdb", name)
+    table_uuid = get_table_uuid("alter_attach", name)
     # Provide and attach a part to the main node
     shutil.copytree(
         attachable_part,
@@ -295,113 +297,122 @@ def test_alter_attach(started_cluster, attachable_part, engine):
             f"database/store/{table_uuid[:3]}/{table_uuid}/detached/all_1_1_0",
         ),
     )
-    main_node.query(f"ALTER TABLE testdb.{name} ATTACH PART 'all_1_1_0'")
+    main_node.query(f"ALTER TABLE alter_attach.{name} ATTACH PART 'all_1_1_0'")
     # On the main node, data is attached
-    assert main_node.query(f"SELECT CounterID FROM testdb.{name}") == "123\n"
+    assert main_node.query(f"SELECT CounterID FROM alter_attach.{name}") == "123\n"
     # On the other node, data is replicated only if using a Replicated table engine
     if engine == "ReplicatedMergeTree":
-        assert dummy_node.query(f"SELECT CounterID FROM testdb.{name}") == "123\n"
+        assert dummy_node.query(f"SELECT CounterID FROM alter_attach.{name}") == "123\n"
     else:
-        assert dummy_node.query(f"SELECT CounterID FROM testdb.{name}") == ""
-    main_node.query("DROP DATABASE testdb SYNC")
-    dummy_node.query("DROP DATABASE testdb SYNC")
+        assert dummy_node.query(f"SELECT CounterID FROM alter_attach.{name}") == ""
+    main_node.query("DROP DATABASE alter_attach SYNC")
+    dummy_node.query("DROP DATABASE alter_attach SYNC")
 
 
 @pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
 def test_alter_drop_part(started_cluster, engine):
     main_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica1');"
+        "CREATE DATABASE alter_drop_part ENGINE = Replicated('/test/alter_drop_part', 'shard1', 'replica1');"
     )
     dummy_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica2');"
+        "CREATE DATABASE alter_drop_part ENGINE = Replicated('/test/alter_drop_part', 'shard1', 'replica2');"
     )
 
     table = f"alter_drop_{engine}"
     part_name = "all_0_0_0" if engine == "ReplicatedMergeTree" else "all_1_1_0"
     main_node.query(
-        f"CREATE TABLE testdb.{table} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)"
+        f"CREATE TABLE alter_drop_part.{table} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)"
     )
-    main_node.query(f"INSERT INTO testdb.{table} VALUES (123)")
+    main_node.query(f"INSERT INTO alter_drop_part.{table} VALUES (123)")
     if engine == "MergeTree":
-        dummy_node.query(f"INSERT INTO testdb.{table} VALUES (456)")
-    main_node.query(f"ALTER TABLE testdb.{table} DROP PART '{part_name}'")
-    assert main_node.query(f"SELECT CounterID FROM testdb.{table}") == ""
+        dummy_node.query(f"INSERT INTO alter_drop_part.{table} VALUES (456)")
+    main_node.query(f"ALTER TABLE alter_drop_part.{table} DROP PART '{part_name}'")
+    assert main_node.query(f"SELECT CounterID FROM alter_drop_part.{table}") == ""
     if engine == "ReplicatedMergeTree":
         # The DROP operation is still replicated at the table engine level
-        assert dummy_node.query(f"SELECT CounterID FROM testdb.{table}") == ""
+        assert dummy_node.query(f"SELECT CounterID FROM alter_drop_part.{table}") == ""
     else:
-        assert dummy_node.query(f"SELECT CounterID FROM testdb.{table}") == "456\n"
-    main_node.query("DROP DATABASE testdb SYNC")
-    dummy_node.query("DROP DATABASE testdb SYNC")
+        assert (
+            dummy_node.query(f"SELECT CounterID FROM alter_drop_part.{table}")
+            == "456\n"
+        )
+    main_node.query("DROP DATABASE alter_drop_part SYNC")
+    dummy_node.query("DROP DATABASE alter_drop_part SYNC")
 
 
 @pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
 def test_alter_detach_part(started_cluster, engine):
     main_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica1');"
+        "CREATE DATABASE alter_detach_part ENGINE = Replicated('/test/alter_detach_part', 'shard1', 'replica1');"
     )
     dummy_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica2');"
+        "CREATE DATABASE alter_detach_part ENGINE = Replicated('/test/alter_detach_part', 'shard1', 'replica2');"
     )
 
     table = f"alter_detach_{engine}"
     part_name = "all_0_0_0" if engine == "ReplicatedMergeTree" else "all_1_1_0"
     main_node.query(
-        f"CREATE TABLE testdb.{table} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)"
+        f"CREATE TABLE alter_detach_part.{table} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)"
     )
-    main_node.query(f"INSERT INTO testdb.{table} VALUES (123)")
+    main_node.query(f"INSERT INTO alter_detach_part.{table} VALUES (123)")
     if engine == "MergeTree":
-        dummy_node.query(f"INSERT INTO testdb.{table} VALUES (456)")
-    main_node.query(f"ALTER TABLE testdb.{table} DETACH PART '{part_name}'")
-    detached_parts_query = f"SELECT name FROM system.detached_parts WHERE database='testdb' AND table='{table}'"
+        dummy_node.query(f"INSERT INTO alter_detach_part.{table} VALUES (456)")
+    main_node.query(f"ALTER TABLE alter_detach_part.{table} DETACH PART '{part_name}'")
+    detached_parts_query = f"SELECT name FROM system.detached_parts WHERE database='alter_detach_part' AND table='{table}'"
     assert main_node.query(detached_parts_query) == f"{part_name}\n"
     if engine == "ReplicatedMergeTree":
         # The detach operation is still replicated at the table engine level
         assert dummy_node.query(detached_parts_query) == f"{part_name}\n"
     else:
         assert dummy_node.query(detached_parts_query) == ""
-    main_node.query("DROP DATABASE testdb SYNC")
-    dummy_node.query("DROP DATABASE testdb SYNC")
+    main_node.query("DROP DATABASE alter_detach_part SYNC")
+    dummy_node.query("DROP DATABASE alter_detach_part SYNC")
 
 
 @pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
 def test_alter_drop_detached_part(started_cluster, engine):
     main_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica1');"
+        "CREATE DATABASE alter_drop_detached_part ENGINE = Replicated('/test/alter_drop_detached_part', 'shard1', 'replica1');"
     )
     dummy_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica2');"
+        "CREATE DATABASE alter_drop_detached_part ENGINE = Replicated('/test/alter_drop_detached_part', 'shard1', 'replica2');"
     )
 
     table = f"alter_drop_detached_{engine}"
     part_name = "all_0_0_0" if engine == "ReplicatedMergeTree" else "all_1_1_0"
     main_node.query(
-        f"CREATE TABLE testdb.{table} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)"
+        f"CREATE TABLE alter_drop_detached_part.{table} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)"
+    )
+    main_node.query(f"INSERT INTO alter_drop_detached_part.{table} VALUES (123)")
+    main_node.query(
+        f"ALTER TABLE alter_drop_detached_part.{table} DETACH PART '{part_name}'"
     )
-    main_node.query(f"INSERT INTO testdb.{table} VALUES (123)")
-    main_node.query(f"ALTER TABLE testdb.{table} DETACH PART '{part_name}'")
     if engine == "MergeTree":
-        dummy_node.query(f"INSERT INTO testdb.{table} VALUES (456)")
-        dummy_node.query(f"ALTER TABLE testdb.{table} DETACH PART '{part_name}'")
-    main_node.query(f"ALTER TABLE testdb.{table} DROP DETACHED PART '{part_name}'")
-    detached_parts_query = f"SELECT name FROM system.detached_parts WHERE database='testdb' AND table='{table}'"
+        dummy_node.query(f"INSERT INTO alter_drop_detached_part.{table} VALUES (456)")
+        dummy_node.query(
+            f"ALTER TABLE alter_drop_detached_part.{table} DETACH PART '{part_name}'"
+        )
+    main_node.query(
+        f"ALTER TABLE alter_drop_detached_part.{table} DROP DETACHED PART '{part_name}'"
+    )
+    detached_parts_query = f"SELECT name FROM system.detached_parts WHERE database='alter_drop_detached_part' AND table='{table}'"
     assert main_node.query(detached_parts_query) == ""
     assert dummy_node.query(detached_parts_query) == f"{part_name}\n"
 
-    main_node.query("DROP DATABASE testdb SYNC")
-    dummy_node.query("DROP DATABASE testdb SYNC")
+    main_node.query("DROP DATABASE alter_drop_detached_part SYNC")
+    dummy_node.query("DROP DATABASE alter_drop_detached_part SYNC")
 
 
 @pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
 def test_alter_drop_partition(started_cluster, engine):
     main_node.query(
-        "CREATE DATABASE alter_drop_partition ENGINE = Replicated('/clickhouse/databases/test_alter_drop_partition', 'shard1', 'replica1');"
+        "CREATE DATABASE alter_drop_partition ENGINE = Replicated('/test/alter_drop_partition', 'shard1', 'replica1');"
     )
     dummy_node.query(
-        "CREATE DATABASE alter_drop_partition ENGINE = Replicated('/clickhouse/databases/test_alter_drop_partition', 'shard1', 'replica2');"
+        "CREATE DATABASE alter_drop_partition ENGINE = Replicated('/test/alter_drop_partition', 'shard1', 'replica2');"
     )
     snapshotting_node.query(
-        "CREATE DATABASE alter_drop_partition ENGINE = Replicated('/clickhouse/databases/test_alter_drop_partition', 'shard2', 'replica1');"
+        "CREATE DATABASE alter_drop_partition ENGINE = Replicated('/test/alter_drop_partition', 'shard2', 'replica1');"
     )
 
     table = f"alter_drop_partition.alter_drop_{engine}"
@@ -430,52 +441,52 @@ def test_alter_drop_partition(started_cluster, engine):
 
 def test_alter_fetch(started_cluster):
     main_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica1');"
+        "CREATE DATABASE alter_fetch ENGINE = Replicated('/test/alter_fetch', 'shard1', 'replica1');"
     )
     dummy_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica2');"
+        "CREATE DATABASE alter_fetch ENGINE = Replicated('/test/alter_fetch', 'shard1', 'replica2');"
     )
 
     main_node.query(
-        "CREATE TABLE testdb.fetch_source (CounterID UInt32) ENGINE = ReplicatedMergeTree ORDER BY (CounterID)"
+        "CREATE TABLE alter_fetch.fetch_source (CounterID UInt32) ENGINE = ReplicatedMergeTree ORDER BY (CounterID)"
     )
     main_node.query(
-        "CREATE TABLE testdb.fetch_target (CounterID UInt32) ENGINE = ReplicatedMergeTree ORDER BY (CounterID)"
+        "CREATE TABLE alter_fetch.fetch_target (CounterID UInt32) ENGINE = ReplicatedMergeTree ORDER BY (CounterID)"
     )
-    main_node.query("INSERT INTO testdb.fetch_source VALUES (123)")
-    table_uuid = get_table_uuid("testdb", "fetch_source")
+    main_node.query("INSERT INTO alter_fetch.fetch_source VALUES (123)")
+    table_uuid = get_table_uuid("alter_fetch", "fetch_source")
     main_node.query(
-        f"ALTER TABLE testdb.fetch_target FETCH PART 'all_0_0_0' FROM '/clickhouse/tables/{table_uuid}/{{shard}}' "
+        f"ALTER TABLE alter_fetch.fetch_target FETCH PART 'all_0_0_0' FROM '/clickhouse/tables/{table_uuid}/{{shard}}' "
     )
-    detached_parts_query = "SELECT name FROM system.detached_parts WHERE database='testdb' AND table='fetch_target'"
+    detached_parts_query = "SELECT name FROM system.detached_parts WHERE database='alter_fetch' AND table='fetch_target'"
     assert main_node.query(detached_parts_query) == "all_0_0_0\n"
     assert dummy_node.query(detached_parts_query) == ""
 
-    main_node.query("DROP DATABASE testdb SYNC")
-    dummy_node.query("DROP DATABASE testdb SYNC")
+    main_node.query("DROP DATABASE alter_fetch SYNC")
+    dummy_node.query("DROP DATABASE alter_fetch SYNC")
 
 
 def test_alters_from_different_replicas(started_cluster):
     main_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica1');"
+        "CREATE DATABASE alters_from_different_replicas ENGINE = Replicated('/test/alters_from_different_replicas', 'shard1', 'replica1');"
     )
     dummy_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica2');"
+        "CREATE DATABASE alters_from_different_replicas ENGINE = Replicated('/test/alters_from_different_replicas', 'shard1', 'replica2');"
     )
 
     # test_alters_from_different_replicas
     competing_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica3');"
+        "CREATE DATABASE alters_from_different_replicas ENGINE = Replicated('/test/alters_from_different_replicas', 'shard1', 'replica3');"
     )
 
     main_node.query(
-        "CREATE TABLE testdb.concurrent_test "
+        "CREATE TABLE alters_from_different_replicas.concurrent_test "
         "(CounterID UInt32, StartDate Date, UserID UInt32, VisitID UInt32, NestedColumn Nested(A UInt8, S String), ToDrop UInt32) "
         "ENGINE = MergeTree PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID);"
     )
 
     main_node.query(
-        "CREATE TABLE testdb.dist AS testdb.concurrent_test ENGINE = Distributed(testdb, testdb, concurrent_test, CounterID)"
+        "CREATE TABLE alters_from_different_replicas.dist AS alters_from_different_replicas.concurrent_test ENGINE = Distributed(alters_from_different_replicas, alters_from_different_replicas, concurrent_test, CounterID)"
     )
 
     dummy_node.stop_clickhouse(kill=True)
@@ -484,7 +495,7 @@ def test_alters_from_different_replicas(started_cluster):
     assert (
         "There are 1 unfinished hosts (0 of them are currently active)"
         in competing_node.query_and_get_error(
-            "ALTER TABLE testdb.concurrent_test ADD COLUMN Added0 UInt32;",
+            "ALTER TABLE alters_from_different_replicas.concurrent_test ADD COLUMN Added0 UInt32;",
             settings=settings,
         )
     )
@@ -493,7 +504,7 @@ def test_alters_from_different_replicas(started_cluster):
         "distributed_ddl_output_mode": "null_status_on_timeout",
     }
     assert "shard1\treplica2\tQUEUED\t" in main_node.query(
-        "ALTER TABLE testdb.concurrent_test ADD COLUMN Added2 UInt32;",
+        "ALTER TABLE alters_from_different_replicas.concurrent_test ADD COLUMN Added2 UInt32;",
         settings=settings,
     )
     settings = {
@@ -501,22 +512,22 @@ def test_alters_from_different_replicas(started_cluster):
         "distributed_ddl_output_mode": "never_throw",
     }
     assert "shard1\treplica2\tQUEUED\t" in competing_node.query(
-        "ALTER TABLE testdb.concurrent_test ADD COLUMN Added1 UInt32 AFTER Added0;",
+        "ALTER TABLE alters_from_different_replicas.concurrent_test ADD COLUMN Added1 UInt32 AFTER Added0;",
         settings=settings,
     )
     dummy_node.start_clickhouse()
     main_node.query(
-        "ALTER TABLE testdb.concurrent_test ADD COLUMN AddedNested1 Nested(A UInt32, B UInt64) AFTER Added2;"
+        "ALTER TABLE alters_from_different_replicas.concurrent_test ADD COLUMN AddedNested1 Nested(A UInt32, B UInt64) AFTER Added2;"
     )
     competing_node.query(
-        "ALTER TABLE testdb.concurrent_test ADD COLUMN AddedNested1.C Array(String) AFTER AddedNested1.B;"
+        "ALTER TABLE alters_from_different_replicas.concurrent_test ADD COLUMN AddedNested1.C Array(String) AFTER AddedNested1.B;"
     )
     main_node.query(
-        "ALTER TABLE testdb.concurrent_test ADD COLUMN AddedNested2 Nested(A UInt32, B UInt64) AFTER AddedNested1;"
+        "ALTER TABLE alters_from_different_replicas.concurrent_test ADD COLUMN AddedNested2 Nested(A UInt32, B UInt64) AFTER AddedNested1;"
     )
 
     expected = (
-        "CREATE TABLE testdb.concurrent_test\\n(\\n    `CounterID` UInt32,\\n    `StartDate` Date,\\n    `UserID` UInt32,\\n"
+        "CREATE TABLE alters_from_different_replicas.concurrent_test\\n(\\n    `CounterID` UInt32,\\n    `StartDate` Date,\\n    `UserID` UInt32,\\n"
         "    `VisitID` UInt32,\\n    `NestedColumn.A` Array(UInt8),\\n    `NestedColumn.S` Array(String),\\n    `ToDrop` UInt32,\\n"
         "    `Added0` UInt32,\\n    `Added1` UInt32,\\n    `Added2` UInt32,\\n    `AddedNested1.A` Array(UInt32),\\n"
         "    `AddedNested1.B` Array(UInt64),\\n    `AddedNested1.C` Array(String),\\n    `AddedNested2.A` Array(UInt32),\\n"
@@ -524,51 +535,63 @@ def test_alters_from_different_replicas(started_cluster):
         "ENGINE = MergeTree\\nPARTITION BY toYYYYMM(StartDate)\\nORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)\\nSETTINGS index_granularity = 8192"
     )
 
-    assert_create_query([main_node, competing_node], "testdb.concurrent_test", expected)
+    assert_create_query(
+        [main_node, competing_node],
+        "alters_from_different_replicas.concurrent_test",
+        expected,
+    )
 
     # test_create_replica_after_delay
-    main_node.query("DROP TABLE testdb.concurrent_test SYNC")
+    main_node.query("DROP TABLE alters_from_different_replicas.concurrent_test SYNC")
     main_node.query(
-        "CREATE TABLE testdb.concurrent_test "
+        "CREATE TABLE alters_from_different_replicas.concurrent_test "
         "(CounterID UInt32, StartDate Date, UserID UInt32, VisitID UInt32, NestedColumn Nested(A UInt8, S String), ToDrop UInt32) "
         "ENGINE = ReplicatedMergeTree ORDER BY CounterID;"
     )
 
     expected = (
-        "CREATE TABLE testdb.concurrent_test\\n(\\n    `CounterID` UInt32,\\n    `StartDate` Date,\\n    `UserID` UInt32,\\n"
+        "CREATE TABLE alters_from_different_replicas.concurrent_test\\n(\\n    `CounterID` UInt32,\\n    `StartDate` Date,\\n    `UserID` UInt32,\\n"
         "    `VisitID` UInt32,\\n    `NestedColumn.A` Array(UInt8),\\n    `NestedColumn.S` Array(String),\\n    `ToDrop` UInt32\\n)\\n"
         "ENGINE = ReplicatedMergeTree(\\'/clickhouse/tables/{uuid}/{shard}\\', \\'{replica}\\')\\nORDER BY CounterID\\nSETTINGS index_granularity = 8192"
     )
 
-    assert_create_query([main_node, competing_node], "testdb.concurrent_test", expected)
+    assert_create_query(
+        [main_node, competing_node],
+        "alters_from_different_replicas.concurrent_test",
+        expected,
+    )
 
     main_node.query(
-        "INSERT INTO testdb.dist (CounterID, StartDate, UserID) SELECT number, addDays(toDate('2020-02-02'), number), intHash32(number) FROM numbers(10)"
+        "INSERT INTO alters_from_different_replicas.dist (CounterID, StartDate, UserID) SELECT number, addDays(toDate('2020-02-02'), number), intHash32(number) FROM numbers(10)"
     )
 
     # test_replica_restart
     main_node.restart_clickhouse()
 
     expected = (
-        "CREATE TABLE testdb.concurrent_test\\n(\\n    `CounterID` UInt32,\\n    `StartDate` Date,\\n    `UserID` UInt32,\\n"
+        "CREATE TABLE alters_from_different_replicas.concurrent_test\\n(\\n    `CounterID` UInt32,\\n    `StartDate` Date,\\n    `UserID` UInt32,\\n"
         "    `VisitID` UInt32,\\n    `NestedColumn.A` Array(UInt8),\\n    `NestedColumn.S` Array(String),\\n    `ToDrop` UInt32\\n)\\n"
         "ENGINE = ReplicatedMergeTree(\\'/clickhouse/tables/{uuid}/{shard}\\', \\'{replica}\\')\\nORDER BY CounterID\\nSETTINGS index_granularity = 8192"
     )
 
     # test_snapshot_and_snapshot_recover
     snapshotting_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard2', 'replica1');"
+        "CREATE DATABASE alters_from_different_replicas ENGINE = Replicated('/test/alters_from_different_replicas', 'shard2', 'replica1');"
     )
     snapshot_recovering_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard2', 'replica2');"
+        "CREATE DATABASE alters_from_different_replicas ENGINE = Replicated('/test/alters_from_different_replicas', 'shard2', 'replica2');"
+    )
+    assert_create_query(
+        all_nodes, "alters_from_different_replicas.concurrent_test", expected
     )
-    assert_create_query(all_nodes, "testdb.concurrent_test", expected)
 
-    main_node.query("SYSTEM FLUSH DISTRIBUTED testdb.dist")
+    main_node.query("SYSTEM FLUSH DISTRIBUTED alters_from_different_replicas.dist")
     main_node.query(
-        "ALTER TABLE testdb.concurrent_test UPDATE StartDate = addYears(StartDate, 1) WHERE 1"
+        "ALTER TABLE alters_from_different_replicas.concurrent_test UPDATE StartDate = addYears(StartDate, 1) WHERE 1"
+    )
+    res = main_node.query(
+        "ALTER TABLE alters_from_different_replicas.concurrent_test DELETE WHERE UserID % 2"
     )
-    res = main_node.query("ALTER TABLE testdb.concurrent_test DELETE WHERE UserID % 2")
     assert (
         "shard1\treplica1\tOK" in res
         and "shard1\treplica2\tOK" in res
@@ -585,28 +608,34 @@ def test_alters_from_different_replicas(started_cluster):
     )
     assert (
         main_node.query(
-            "SELECT shard_num, replica_num, host_name FROM system.clusters WHERE cluster='testdb'"
+            "SELECT shard_num, replica_num, host_name FROM system.clusters WHERE cluster='alters_from_different_replicas'"
         )
         == expected
     )
 
     # test_drop_and_create_replica
-    main_node.query("DROP DATABASE testdb SYNC")
+    main_node.query("DROP DATABASE alters_from_different_replicas SYNC")
     main_node.query(
-        "CREATE DATABASE testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica1');"
+        "CREATE DATABASE alters_from_different_replicas ENGINE = Replicated('/test/alters_from_different_replicas', 'shard1', 'replica1');"
     )
 
     expected = (
-        "CREATE TABLE testdb.concurrent_test\\n(\\n    `CounterID` UInt32,\\n    `StartDate` Date,\\n    `UserID` UInt32,\\n"
+        "CREATE TABLE alters_from_different_replicas.concurrent_test\\n(\\n    `CounterID` UInt32,\\n    `StartDate` Date,\\n    `UserID` UInt32,\\n"
         "    `VisitID` UInt32,\\n    `NestedColumn.A` Array(UInt8),\\n    `NestedColumn.S` Array(String),\\n    `ToDrop` UInt32\\n)\\n"
         "ENGINE = ReplicatedMergeTree(\\'/clickhouse/tables/{uuid}/{shard}\\', \\'{replica}\\')\\nORDER BY CounterID\\nSETTINGS index_granularity = 8192"
     )
 
-    assert_create_query([main_node, competing_node], "testdb.concurrent_test", expected)
-    assert_create_query(all_nodes, "testdb.concurrent_test", expected)
+    assert_create_query(
+        [main_node, competing_node],
+        "alters_from_different_replicas.concurrent_test",
+        expected,
+    )
+    assert_create_query(
+        all_nodes, "alters_from_different_replicas.concurrent_test", expected
+    )
 
     for node in all_nodes:
-        node.query("SYSTEM SYNC REPLICA testdb.concurrent_test")
+        node.query("SYSTEM SYNC REPLICA alters_from_different_replicas.concurrent_test")
 
     expected = (
         "0\t2021-02-02\t4249604106\n"
@@ -618,14 +647,14 @@ def test_alters_from_different_replicas(started_cluster):
 
     assert_eq_with_retry(
         dummy_node,
-        "SELECT CounterID, StartDate, UserID FROM testdb.dist ORDER BY CounterID",
+        "SELECT CounterID, StartDate, UserID FROM alters_from_different_replicas.dist ORDER BY CounterID",
         expected,
     )
-    main_node.query("DROP DATABASE testdb SYNC")
-    dummy_node.query("DROP DATABASE testdb SYNC")
-    competing_node.query("DROP DATABASE testdb SYNC")
-    snapshotting_node.query("DROP DATABASE testdb SYNC")
-    snapshot_recovering_node.query("DROP DATABASE testdb SYNC")
+    main_node.query("DROP DATABASE alters_from_different_replicas SYNC")
+    dummy_node.query("DROP DATABASE alters_from_different_replicas SYNC")
+    competing_node.query("DROP DATABASE alters_from_different_replicas SYNC")
+    snapshotting_node.query("DROP DATABASE alters_from_different_replicas SYNC")
+    snapshot_recovering_node.query("DROP DATABASE alters_from_different_replicas SYNC")
 
 
 def create_some_tables(db):
@@ -1063,10 +1092,10 @@ def test_server_uuid(started_cluster):
 
 def test_sync_replica(started_cluster):
     main_node.query(
-        "CREATE DATABASE test_sync_database ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica1');"
+        "CREATE DATABASE test_sync_database ENGINE = Replicated('/test/sync_replica', 'shard1', 'replica1');"
     )
     dummy_node.query(
-        "CREATE DATABASE test_sync_database ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica2');"
+        "CREATE DATABASE test_sync_database ENGINE = Replicated('/test/sync_replica', 'shard1', 'replica2');"
     )
 
     number_of_tables = 1000
@@ -1113,17 +1142,20 @@ def test_sync_replica(started_cluster):
     )
 
     lp1 = main_node.query(
-        "select value from system.zookeeper where path='/clickhouse/databases/test1/replicas/shard1|replica1' and name='log_ptr'"
+        "select value from system.zookeeper where path='/test/sync_replica/replicas/shard1|replica1' and name='log_ptr'"
     )
     lp2 = main_node.query(
-        "select value from system.zookeeper where path='/clickhouse/databases/test1/replicas/shard1|replica2' and name='log_ptr'"
+        "select value from system.zookeeper where path='/test/sync_replica/replicas/shard1|replica2' and name='log_ptr'"
     )
     max_lp = main_node.query(
-        "select value from system.zookeeper where path='/clickhouse/databases/test1/' and name='max_log_ptr'"
+        "select value from system.zookeeper where path='/test/sync_replica/' and name='max_log_ptr'"
     )
     assert lp1 == max_lp
     assert lp2 == max_lp
 
+    main_node.query("DROP DATABASE test_sync_database SYNC")
+    dummy_node.query("DROP DATABASE test_sync_database SYNC")
+
 
 def test_force_synchronous_settings(started_cluster):
     main_node.query(
diff --git a/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml b/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml
index b18f0fbc93f..2a7b47e3560 100644
--- a/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml
+++ b/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml
@@ -1,8 +1,4 @@
 <clickhouse>
-    <profiles>
-        <default>
-          <max_replicated_fetches_network_bandwidth_for_server>5242880</max_replicated_fetches_network_bandwidth_for_server>
-          <max_replicated_sends_network_bandwidth_for_server>10485760</max_replicated_sends_network_bandwidth_for_server>
-        </default>
-    </profiles>
+    <max_replicated_fetches_network_bandwidth_for_server>5242880</max_replicated_fetches_network_bandwidth_for_server>
+    <max_replicated_sends_network_bandwidth_for_server>10485760</max_replicated_sends_network_bandwidth_for_server>
 </clickhouse>
diff --git a/tests/integration/test_replicated_fetches_bandwidth/test.py b/tests/integration/test_replicated_fetches_bandwidth/test.py
index 059102f8683..cd969746c31 100644
--- a/tests/integration/test_replicated_fetches_bandwidth/test.py
+++ b/tests/integration/test_replicated_fetches_bandwidth/test.py
@@ -12,7 +12,7 @@ cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance("node1", with_zookeeper=True)
 node2 = cluster.add_instance("node2", with_zookeeper=True)
 node3 = cluster.add_instance(
-    "node3", user_configs=["configs/limit_replication_config.xml"], with_zookeeper=True
+    "node3", main_configs=["configs/limit_replication_config.xml"], with_zookeeper=True
 )
 
 
diff --git a/tests/integration/test_replicated_merge_tree_encrypted_disk/test.py b/tests/integration/test_replicated_merge_tree_encrypted_disk/test.py
index aea41fc0684..05d7bbb7282 100644
--- a/tests/integration/test_replicated_merge_tree_encrypted_disk/test.py
+++ b/tests/integration/test_replicated_merge_tree_encrypted_disk/test.py
@@ -42,7 +42,7 @@ def copy_keys(instance, keys_file_name):
 
 
 def create_table():
-    node1.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' SYNC")
     node1.query(
         """
         CREATE TABLE tbl ON CLUSTER 'cluster' (
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/test.py b/tests/integration/test_replicated_merge_tree_encryption_codec/test.py
index 6f08daae4cf..a50f8341ee7 100644
--- a/tests/integration/test_replicated_merge_tree_encryption_codec/test.py
+++ b/tests/integration/test_replicated_merge_tree_encryption_codec/test.py
@@ -40,7 +40,7 @@ def copy_keys(instance, keys_file_name):
 
 
 def create_table():
-    node1.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' SYNC")
     node1.query(
         """
         CREATE TABLE tbl ON CLUSTER 'cluster' (
@@ -64,6 +64,7 @@ def optimize_table():
 
 def check_table():
     expected = [[1, "str1"], [2, "str2"]]
+    node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' tbl")
     assert node1.query("SELECT * FROM tbl ORDER BY id") == TSV(expected)
     assert node2.query("SELECT * FROM tbl ORDER BY id") == TSV(expected)
     assert node1.query("CHECK TABLE tbl") == "1\n"
diff --git a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py
index 1f81421f93c..bd1c890950a 100644
--- a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py
+++ b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py
@@ -111,8 +111,8 @@ def test_hdfs_zero_copy_replication_insert(cluster):
             SHARDS * FILES_OVERHEAD_PER_TABLE + FILES_OVERHEAD_PER_PART_COMPACT,
         )
     finally:
-        node1.query("DROP TABLE IF EXISTS hdfs_test NO DELAY")
-        node2.query("DROP TABLE IF EXISTS hdfs_test NO DELAY")
+        node1.query("DROP TABLE IF EXISTS hdfs_test SYNC")
+        node2.query("DROP TABLE IF EXISTS hdfs_test SYNC")
 
 
 @pytest.mark.parametrize(
@@ -173,7 +173,7 @@ def test_hdfs_zero_copy_replication_single_move(cluster, storage_policy, init_ob
             == "(10),(11)"
         )
     finally:
-        node1.query("DROP TABLE IF EXISTS single_node_move_test NO DELAY")
+        node1.query("DROP TABLE IF EXISTS single_node_move_test SYNC")
 
 
 @pytest.mark.parametrize(
@@ -244,8 +244,8 @@ def test_hdfs_zero_copy_replication_move(cluster, storage_policy, init_objects):
             cluster, "/clickhouse1", init_objects + FILES_OVERHEAD_PER_PART_COMPACT
         )
     finally:
-        node1.query("DROP TABLE IF EXISTS move_test NO DELAY")
-        node2.query("DROP TABLE IF EXISTS move_test NO DELAY")
+        node1.query("DROP TABLE IF EXISTS move_test SYNC")
+        node2.query("DROP TABLE IF EXISTS move_test SYNC")
 
 
 @pytest.mark.parametrize(("storage_policy"), ["hybrid", "tiered", "tiered_copy"])
@@ -282,8 +282,8 @@ def test_hdfs_zero_copy_with_ttl_move(cluster, storage_policy):
             == "(10),(11)"
         )
     finally:
-        node1.query("DROP TABLE IF EXISTS ttl_move_test NO DELAY")
-        node2.query("DROP TABLE IF EXISTS ttl_move_test NO DELAY")
+        node1.query("DROP TABLE IF EXISTS ttl_move_test SYNC")
+        node2.query("DROP TABLE IF EXISTS ttl_move_test SYNC")
 
 
 def test_hdfs_zero_copy_with_ttl_delete(cluster):
@@ -318,5 +318,5 @@ def test_hdfs_zero_copy_with_ttl_delete(cluster):
             == "(11)"
         )
     finally:
-        node1.query("DROP TABLE IF EXISTS ttl_delete_test NO DELAY")
-        node2.query("DROP TABLE IF EXISTS ttl_delete_test NO DELAY")
+        node1.query("DROP TABLE IF EXISTS ttl_delete_test SYNC")
+        node2.query("DROP TABLE IF EXISTS ttl_delete_test SYNC")
diff --git a/tests/integration/test_replicated_merge_tree_s3/test.py b/tests/integration/test_replicated_merge_tree_s3/test.py
index 0d978bb6967..b90e28dfdb2 100644
--- a/tests/integration/test_replicated_merge_tree_s3/test.py
+++ b/tests/integration/test_replicated_merge_tree_s3/test.py
@@ -44,8 +44,18 @@ def cluster():
 
 FILES_OVERHEAD = 1
 FILES_OVERHEAD_PER_COLUMN = 2  # Data and mark files
-FILES_OVERHEAD_PER_PART_WIDE = FILES_OVERHEAD_PER_COLUMN * 3 + 2 + 6 + 1
-FILES_OVERHEAD_PER_PART_COMPACT = 10 + 1
+FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC = 1
+FILES_OVERHEAD_METADATA_VERSION = 1
+FILES_OVERHEAD_PER_PART_WIDE = (
+    FILES_OVERHEAD_PER_COLUMN * 3
+    + 2
+    + 6
+    + FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC
+    + FILES_OVERHEAD_METADATA_VERSION
+)
+FILES_OVERHEAD_PER_PART_COMPACT = (
+    10 + FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC + FILES_OVERHEAD_METADATA_VERSION
+)
 
 
 def random_string(length):
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/clusters.xml b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/clusters.xml
deleted file mode 100644
index e0b94f46d83..00000000000
--- a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/clusters.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<clickhouse>
-    <remote_servers>
-        <node_zero_copy>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>node1z</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>node2z</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </node_zero_copy>
-        <node_no_zero_copy>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>node1n</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>node2n</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </node_no_zero_copy>
-        <node_another_bucket>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>node_another_bucket</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </node_another_bucket>
-    </remote_servers>
-</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf.xml
deleted file mode 100644
index 63fe7ac1769..00000000000
--- a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <s3>
-                <type>s3</type>
-                <endpoint>http://minio1:9001/root/data/</endpoint>
-                <access_key_id>minio</access_key_id>
-                <secret_access_key>minio123</secret_access_key>
-                <send_metadata>true</send_metadata>
-                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
-            </s3>
-            <hdd>
-                <type>local</type>
-                <path>/</path>
-            </hdd>
-        </disks>
-        <policies>
-            <s3>
-                <volumes>
-                    <main>
-                        <disk>s3</disk>
-                    </main>
-                    <external>
-                        <disk>hdd</disk>
-                    </external>
-                </volumes>
-            </s3>
-        </policies>
-    </storage_configuration>
-
-    <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-        <allow_remote_fs_zero_copy_replication>1</allow_remote_fs_zero_copy_replication>
-    </merge_tree>
-</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml
deleted file mode 100644
index 920db2c9edd..00000000000
--- a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <s3>
-                <type>s3</type>
-                <endpoint>http://minio1:9001/root2/data/</endpoint>
-                <access_key_id>minio</access_key_id>
-                <secret_access_key>minio123</secret_access_key>
-                <send_metadata>true</send_metadata>
-                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
-            </s3>
-            <hdd>
-                <type>local</type>
-                <path>/</path>
-            </hdd>
-        </disks>
-        <policies>
-            <s3>
-                <volumes>
-                    <main>
-                        <disk>s3</disk>
-                    </main>
-                    <external>
-                        <disk>hdd</disk>
-                    </external>
-                </volumes>
-            </s3>
-        </policies>
-    </storage_configuration>
-
-    <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-    </merge_tree>
-</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/test.py b/tests/integration/test_replicated_merge_tree_s3_restore/test.py
deleted file mode 100644
index 20a7668982b..00000000000
--- a/tests/integration/test_replicated_merge_tree_s3_restore/test.py
+++ /dev/null
@@ -1,263 +0,0 @@
-import os
-import logging
-import random
-import string
-import time
-
-import pytest
-from helpers.cluster import ClickHouseCluster
-
-
-COMMON_CONFIGS = ["configs/config.d/clusters.xml"]
-
-
-@pytest.fixture(scope="module")
-def cluster():
-    try:
-        cluster = ClickHouseCluster(__file__)
-
-        cluster.add_instance(
-            "node1z",
-            main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf.xml"],
-            macros={"cluster": "node_zero_copy", "replica": "0"},
-            with_minio=True,
-            with_zookeeper=True,
-            stay_alive=True,
-        )
-        cluster.add_instance(
-            "node2z",
-            main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf.xml"],
-            macros={"cluster": "node_zero_copy", "replica": "1"},
-            with_zookeeper=True,
-            stay_alive=True,
-        )
-        cluster.add_instance(
-            "node1n",
-            main_configs=COMMON_CONFIGS
-            + ["configs/config.d/storage_conf_without_zero_copy.xml"],
-            macros={"cluster": "node_no_zero_copy", "replica": "2"},
-            with_minio=True,
-            with_zookeeper=True,
-            stay_alive=True,
-        )
-        cluster.add_instance(
-            "node2n",
-            main_configs=COMMON_CONFIGS
-            + ["configs/config.d/storage_conf_without_zero_copy.xml"],
-            macros={"cluster": "node_no_zero_copy", "replica": "3"},
-            with_zookeeper=True,
-            stay_alive=True,
-        )
-        cluster.add_instance(
-            "node_another_bucket",
-            main_configs=COMMON_CONFIGS
-            + ["configs/config.d/storage_conf_another_bucket.xml"],
-            macros={"cluster": "node_another_bucket", "replica": "0"},
-            with_zookeeper=True,
-            stay_alive=True,
-        )
-
-        logging.info("Starting cluster...")
-        cluster.start()
-        logging.info("Cluster started")
-
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def random_string(length):
-    letters = string.ascii_letters
-    return "".join(random.choice(letters) for i in range(length))
-
-
-def create_table(node, table_name, schema, attach=False, db_atomic=False, uuid=""):
-    node.query(
-        "CREATE DATABASE IF NOT EXISTS s3 {on_cluster} ENGINE = {engine}".format(
-            engine="Atomic" if db_atomic else "Ordinary",
-            on_cluster="ON CLUSTER '{cluster}'",
-        ),
-        settings={"allow_deprecated_database_ordinary": 1},
-    )
-
-    create_table_statement = """
-        {create} TABLE s3.{table_name} {uuid} {on_cluster} (
-            key UInt32,
-            {schema}
-        ) ENGINE={engine}
-        PARTITION BY key
-        ORDER BY key
-        SETTINGS
-            storage_policy='s3',
-            old_parts_lifetime=600,
-            index_granularity=512
-        """.format(
-        create="ATTACH" if attach else "CREATE",
-        table_name=table_name,
-        uuid="UUID '{uuid}'".format(uuid=uuid) if db_atomic and uuid else "",
-        on_cluster="ON CLUSTER '{cluster}'",
-        schema=schema,
-        engine="ReplicatedMergeTree('/clickhouse/tables/{cluster}/test', '{replica}')",
-    )
-
-    node.query(create_table_statement)
-
-
-def purge_s3(cluster, bucket):
-    minio = cluster.minio_client
-    for obj in list(minio.list_objects(bucket, recursive=True)):
-        if str(obj.object_name).find(".SCHEMA_VERSION") != -1:
-            continue
-        minio.remove_object(bucket, obj.object_name)
-
-
-def drop_s3_metadata(node):
-    node.exec_in_container(
-        ["bash", "-c", "rm -rf /var/lib/clickhouse/disks/s3/*"], user="root"
-    )
-
-
-def drop_shadow_information(node):
-    node.exec_in_container(
-        ["bash", "-c", "rm -rf /var/lib/clickhouse/shadow/*"], user="root"
-    )
-
-
-def create_restore_file(node, revision=None, bucket=None, path=None, detached=None):
-    node.exec_in_container(
-        ["bash", "-c", "mkdir -p /var/lib/clickhouse/disks/s3/"], user="root"
-    )
-    node.exec_in_container(
-        ["bash", "-c", "touch /var/lib/clickhouse/disks/s3/restore"], user="root"
-    )
-
-    num_restore_options = 0
-
-    def add_restore_option(key, value):
-        nonlocal num_restore_options
-        to = ">>" if num_restore_options else ">"
-        node.exec_in_container(
-            [
-                "bash",
-                "-c",
-                f'echo -en "{key}={value}\n" {to} /var/lib/clickhouse/disks/s3/restore',
-            ],
-            user="root",
-        )
-        num_restore_options += 1
-
-    if revision:
-        add_restore_option("revision", revision)
-    if bucket:
-        add_restore_option("source_bucket", bucket)
-    if path:
-        add_restore_option("source_path", path)
-    if detached:
-        add_restore_option("detached", "true")
-
-
-def get_revision_counter(node, backup_number):
-    return int(
-        node.exec_in_container(
-            [
-                "bash",
-                "-c",
-                "cat /var/lib/clickhouse/disks/s3/shadow/{}/revision.txt".format(
-                    backup_number
-                ),
-            ],
-            user="root",
-        )
-    )
-
-
-def get_table_uuid(node, db_atomic, table):
-    uuid = ""
-    if db_atomic:
-        uuid = node.query(
-            "SELECT uuid FROM system.tables WHERE database='s3' AND table='{}' FORMAT TabSeparated".format(
-                table
-            )
-        ).strip()
-    return uuid
-
-
-def drop_table(cluster):
-    node_names = ["node1z", "node2z", "node1n", "node2n", "node_another_bucket"]
-
-    for node_name in node_names:
-        node = cluster.instances[node_name]
-        node.query("DROP TABLE IF EXISTS s3.test SYNC")
-        node.query("DROP DATABASE IF EXISTS s3 SYNC")
-
-        drop_s3_metadata(node)
-        drop_shadow_information(node)
-
-    buckets = [cluster.minio_bucket, cluster.minio_bucket_2]
-    for bucket in buckets:
-        purge_s3(cluster, bucket)
-
-
-@pytest.mark.parametrize("db_atomic", [False, True])
-@pytest.mark.parametrize("zero_copy", [False, True])
-def test_restore_another_bucket_path(cluster, db_atomic, zero_copy):
-    suffix = "z" if zero_copy else "n"
-    nodes = [cluster.instances[f"node1{suffix}"], cluster.instances[f"node2{suffix}"]]
-
-    keys = 100
-    data_columns = 10
-    size = 1
-
-    columns = []
-    for c in range(0, data_columns):
-        columns.append("data{c} String".format(c=c))
-    schema = ", ".join(columns)
-
-    create_table(nodes[0], "test", schema, db_atomic=db_atomic)
-    uuid = get_table_uuid(nodes[0], db_atomic, "test")
-
-    dropped_keys = 0
-
-    for key in range(0, keys):
-        node = nodes[key % 2]
-        node.query(
-            "INSERT INTO s3.test SELECT {key}, * FROM generateRandom('{schema}') LIMIT {size}".format(
-                key=key, schema=schema, size=size
-            )
-        )
-        if not (key % 3):
-            dropped_keys += 1
-            node.query("ALTER TABLE s3.test DROP PARTITION '{key}'".format(key=key))
-
-    for key in range(0, keys):
-        if not ((key + 1) % 3):
-            dropped_keys += 1
-            node.query("ALTER TABLE s3.test DROP PARTITION '{key}'".format(key=key))
-
-    nodes[0].query("SYSTEM SYNC REPLICA s3.test")
-    nodes[1].query("SYSTEM SYNC REPLICA s3.test")
-
-    # To ensure parts have merged
-    nodes[0].query("OPTIMIZE TABLE s3.test")
-    nodes[1].query("OPTIMIZE TABLE s3.test")
-
-    assert nodes[0].query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(size * (keys - dropped_keys))
-    assert nodes[1].query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(size * (keys - dropped_keys))
-
-    node_another_bucket = cluster.instances["node_another_bucket"]
-
-    create_restore_file(node_another_bucket, bucket="root")
-    node_another_bucket.restart_clickhouse(stop_start_wait_sec=120)
-    create_table(
-        node_another_bucket, "test", schema, attach=True, db_atomic=db_atomic, uuid=uuid
-    )
-
-    assert node_another_bucket.query(
-        "SELECT count(*) FROM s3.test FORMAT Values"
-    ) == "({})".format(size * (keys - dropped_keys))
-
-    drop_table(cluster)
diff --git a/tests/integration/test_replicated_merge_tree_s3_zero_copy/test.py b/tests/integration/test_replicated_merge_tree_s3_zero_copy/test.py
index f0bc12e3125..eca18820016 100644
--- a/tests/integration/test_replicated_merge_tree_s3_zero_copy/test.py
+++ b/tests/integration/test_replicated_merge_tree_s3_zero_copy/test.py
@@ -47,8 +47,18 @@ def cluster():
 
 FILES_OVERHEAD = 1
 FILES_OVERHEAD_PER_COLUMN = 2  # Data and mark files
-FILES_OVERHEAD_PER_PART_WIDE = FILES_OVERHEAD_PER_COLUMN * 3 + 2 + 6 + 1
-FILES_OVERHEAD_PER_PART_COMPACT = 10 + 1
+FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC = 1
+FILES_OVERHEAD_METADATA_VERSION = 1
+FILES_OVERHEAD_PER_PART_WIDE = (
+    FILES_OVERHEAD_PER_COLUMN * 3
+    + 2
+    + 6
+    + FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC
+    + FILES_OVERHEAD_METADATA_VERSION
+)
+FILES_OVERHEAD_PER_PART_COMPACT = (
+    10 + FILES_OVERHEAD_DEFAULT_COMPRESSION_CODEC + FILES_OVERHEAD_METADATA_VERSION
+)
 
 
 def random_string(length):
@@ -192,12 +202,19 @@ def test_drop_table(cluster):
         "create table if not exists test_drop_table (n int) engine=ReplicatedMergeTree('/test/drop_table', '1') "
         "order by n partition by n % 99 settings storage_policy='s3'"
     )
+
+    # A table may get stuck in readonly mode if zk connection was lost during CREATE
+    node.query("detach table test_drop_table sync")
+    node.query("attach table test_drop_table")
+
     node.query_with_retry(
         "system sync replica test_drop_table",
-        settings={"receive_timeout": 10},
-        retry_count=5,
+        settings={"receive_timeout": 5},
+        sleep_time=5,
+        retry_count=10,
     )
-    node2.query("drop table test_drop_table")
+    node2.query("drop table test_drop_table sync")
     assert "1000\t499500\n" == node.query(
         "select count(n), sum(n) from test_drop_table"
     )
+    node.query("drop table test_drop_table sync")
diff --git a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
index cf76d47157a..5a514be58dd 100644
--- a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
+++ b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
@@ -37,7 +37,7 @@ def started_cluster():
 
 def drop_table(nodes, table_name):
     for node in nodes:
-        node.query("DROP TABLE IF EXISTS {} NO DELAY".format(table_name))
+        node.query("DROP TABLE IF EXISTS {} SYNC".format(table_name))
 
 
 # Create table with default zookeeper.
diff --git a/tests/queries/0_stateless/00960_live_view_watch_events_live.reference b/tests/integration/test_replicated_table_attach/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00960_live_view_watch_events_live.reference
rename to tests/integration/test_replicated_table_attach/__init__.py
diff --git a/tests/integration/test_replicated_table_attach/configs/config.xml b/tests/integration/test_replicated_table_attach/configs/config.xml
new file mode 100644
index 00000000000..fea3eab4126
--- /dev/null
+++ b/tests/integration/test_replicated_table_attach/configs/config.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <background_schedule_pool_size>1</background_schedule_pool_size>
+    <merge_tree>
+        <initialization_retry_period>5</initialization_retry_period>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/integration/test_replicated_table_attach/test.py b/tests/integration/test_replicated_table_attach/test.py
new file mode 100644
index 00000000000..2d209ddaf79
--- /dev/null
+++ b/tests/integration/test_replicated_table_attach/test.py
@@ -0,0 +1,63 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/config.xml"],
+    with_zookeeper=True,
+    stay_alive=True,
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_startup_with_small_bg_pool(started_cluster):
+    node.query(
+        "CREATE TABLE replicated_table (k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/replicated_table', 'r1') ORDER BY k"
+    )
+
+    node.query("INSERT INTO replicated_table VALUES(20, 30)")
+
+    def assert_values():
+        assert node.query("SELECT * FROM replicated_table") == "20\t30\n"
+
+    assert_values()
+    node.restart_clickhouse(stop_start_wait_sec=10)
+    assert_values()
+
+    node.query("DROP TABLE replicated_table SYNC")
+
+
+def test_startup_with_small_bg_pool_partitioned(started_cluster):
+    node.query(
+        "CREATE TABLE replicated_table_partitioned (k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/replicated_table_partitioned', 'r1') ORDER BY k"
+    )
+
+    node.query("INSERT INTO replicated_table_partitioned VALUES(20, 30)")
+
+    def assert_values():
+        assert node.query("SELECT * FROM replicated_table_partitioned") == "20\t30\n"
+
+    assert_values()
+    with PartitionManager() as pm:
+        pm.drop_instance_zk_connections(node)
+        node.restart_clickhouse(stop_start_wait_sec=20)
+        assert_values()
+
+    # check that we activate it in the end
+    node.query_with_retry("INSERT INTO replicated_table_partitioned VALUES(20, 30)")
+
+    node.query("DROP TABLE replicated_table_partitioned SYNC")
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh.reference b/tests/integration/test_replicated_user_defined_functions/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00962_live_view_periodic_refresh.reference
rename to tests/integration/test_replicated_user_defined_functions/__init__.py
diff --git a/tests/integration/test_replicated_user_defined_functions/configs/config.xml b/tests/integration/test_replicated_user_defined_functions/configs/config.xml
new file mode 100644
index 00000000000..01553dec179
--- /dev/null
+++ b/tests/integration/test_replicated_user_defined_functions/configs/config.xml
@@ -0,0 +1,17 @@
+<clickhouse>
+    <user_defined_zookeeper_path>/clickhouse/udf</user_defined_zookeeper_path>
+    <remote_servers>
+        <default>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </default>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_replicated_user_defined_functions/configs/zookeeper.xml b/tests/integration/test_replicated_user_defined_functions/configs/zookeeper.xml
new file mode 100644
index 00000000000..f8302e667ba
--- /dev/null
+++ b/tests/integration/test_replicated_user_defined_functions/configs/zookeeper.xml
@@ -0,0 +1,17 @@
+<clickhouse>
+    <zookeeper>
+        <node index="1">
+            <host>zoo1</host>
+            <port>2181</port>
+        </node>
+        <node index="2">
+            <host>zoo2</host>
+            <port>2181</port>
+        </node>
+        <node index="3">
+            <host>zoo3</host>
+            <port>2181</port>
+        </node>
+        <session_timeout_ms>20000</session_timeout_ms>
+    </zookeeper>
+</clickhouse>
diff --git a/tests/integration/test_replicated_user_defined_functions/test.py b/tests/integration/test_replicated_user_defined_functions/test.py
new file mode 100644
index 00000000000..c0990819bf4
--- /dev/null
+++ b/tests/integration/test_replicated_user_defined_functions/test.py
@@ -0,0 +1,280 @@
+import inspect
+
+import pytest
+import time
+import os.path
+
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import assert_eq_with_retry, TSV
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+cluster = ClickHouseCluster(__file__, zookeeper_config_path="configs/zookeeper.xml")
+
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=["configs/config.xml"],
+    with_zookeeper=True,
+    stay_alive=True,
+)
+
+node2 = cluster.add_instance(
+    "node2",
+    main_configs=["configs/config.xml"],
+    with_zookeeper=True,
+    stay_alive=True,
+)
+
+all_nodes = [node1, node2]
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def wait_zookeeper_node_to_start(zk_nodes, timeout=60):
+    start = time.time()
+    while time.time() - start < timeout:
+        try:
+            for instance in zk_nodes:
+                conn = cluster.get_kazoo_client(instance)
+                conn.get_children("/")
+            print("All instances of ZooKeeper started")
+            return
+        except Exception as ex:
+            print(("Can't connect to ZooKeeper " + str(ex)))
+            time.sleep(0.5)
+
+
+def replace_zookeeper_config(new_config):
+    node1.replace_config("/etc/clickhouse-server/conf.d/zookeeper.xml", new_config)
+    node2.replace_config("/etc/clickhouse-server/conf.d/zookeeper.xml", new_config)
+    node1.query("SYSTEM RELOAD CONFIG")
+    node2.query("SYSTEM RELOAD CONFIG")
+
+
+def revert_zookeeper_config():
+    with open(os.path.join(SCRIPT_DIR, "configs/zookeeper.xml"), "r") as f:
+        replace_zookeeper_config(f.read())
+
+
+def get_active_zk_connections():
+    return str(
+        node1.exec_in_container(
+            [
+                "bash",
+                "-c",
+                "lsof -a -i4 -i6 -itcp -w | grep 2181 | grep ESTABLISHED | wc -l",
+            ],
+            privileged=True,
+            user="root",
+        )
+    ).strip()
+
+
+def test_create_and_drop():
+    node1.query("CREATE FUNCTION f1 AS (x, y) -> x + y")
+    assert node1.query("SELECT f1(12, 3)") == "15\n"
+    node1.query("DROP FUNCTION f1")
+
+
+def test_create_and_replace():
+    node1.query("CREATE FUNCTION f1 AS (x, y) -> x + y")
+    assert node1.query("SELECT f1(12, 3)") == "15\n"
+
+    expected_error = "User-defined function 'f1' already exists"
+    assert expected_error in node1.query_and_get_error(
+        "CREATE FUNCTION f1 AS (x, y) -> x + 2 * y"
+    )
+
+    node1.query("CREATE FUNCTION IF NOT EXISTS f1 AS (x, y) -> x + 3 * y")
+    assert node1.query("SELECT f1(12, 3)") == "15\n"
+
+    node1.query("CREATE OR REPLACE FUNCTION f1 AS (x, y) -> x + 4 * y")
+    assert node1.query("SELECT f1(12, 3)") == "24\n"
+
+    node1.query("DROP FUNCTION f1")
+
+
+def test_drop_if_exists():
+    node1.query("CREATE FUNCTION f1 AS (x, y) -> x + y")
+    node1.query("DROP FUNCTION IF EXISTS f1")
+    node1.query("DROP FUNCTION IF EXISTS f1")
+
+    expected_error = "User-defined function 'f1' doesn't exist"
+    assert expected_error in node1.query_and_get_error("DROP FUNCTION f1")
+
+
+def test_replication():
+    node1.query("CREATE FUNCTION f2 AS (x, y) -> x - y")
+
+    assert (
+        node1.query("SELECT create_query FROM system.functions WHERE name='f2'")
+        == "CREATE FUNCTION f2 AS (x, y) -> (x - y)\n"
+    )
+    assert_eq_with_retry(
+        node2,
+        "SELECT create_query FROM system.functions WHERE name='f2'",
+        "CREATE FUNCTION f2 AS (x, y) -> (x - y)\n",
+    )
+    assert node1.query("SELECT f2(12,3)") == "9\n"
+    assert node2.query("SELECT f2(12,3)") == "9\n"
+
+    node1.query("DROP FUNCTION f2")
+    assert (
+        node1.query("SELECT create_query FROM system.functions WHERE name='f2'") == ""
+    )
+    assert_eq_with_retry(
+        node2, "SELECT create_query FROM system.functions WHERE name='f2'", ""
+    )
+
+
+def test_replication_replace_by_another_node_after_creation():
+    node1.query("CREATE FUNCTION f2 AS (x, y) -> x - y")
+
+    assert_eq_with_retry(
+        node2,
+        "SELECT create_query FROM system.functions WHERE name='f2'",
+        "CREATE FUNCTION f2 AS (x, y) -> (x - y)\n",
+    )
+
+    node2.query("CREATE OR REPLACE FUNCTION f2 AS (x, y) -> x + y")
+
+    assert_eq_with_retry(
+        node1,
+        "SELECT create_query FROM system.functions WHERE name='f2'",
+        "CREATE FUNCTION f2 AS (x, y) -> (x + y)\n",
+    )
+
+    node1.query("DROP FUNCTION f2")
+    assert_eq_with_retry(
+        node1, "SELECT create_query FROM system.functions WHERE name='f2'", ""
+    )
+    assert_eq_with_retry(
+        node2, "SELECT create_query FROM system.functions WHERE name='f2'", ""
+    )
+
+
+# UserDefinedSQLObjectsLoaderFromZooKeeper must be able to continue working after reloading ZooKeeper.
+def test_reload_zookeeper():
+    node1.query("CREATE FUNCTION f1 AS (x, y) -> x + y")
+    assert_eq_with_retry(
+        node2, "SELECT name FROM system.functions WHERE name ='f1'", "f1\n"
+    )
+
+    # remove zoo2, zoo3 from configs
+    replace_zookeeper_config(
+        inspect.cleandoc(
+            """
+            <clickhouse>
+                <zookeeper>
+                    <node index="1">
+                        <host>zoo1</host>
+                        <port>2181</port>
+                    </node>
+                    <session_timeout_ms>2000</session_timeout_ms>
+                </zookeeper>
+            </clickhouse>
+            """
+        )
+    )
+
+    # config reloads, but can still work
+    node1.query("CREATE FUNCTION f2 AS (x, y) -> x - y")
+    assert_eq_with_retry(
+        node2,
+        "SELECT name FROM system.functions WHERE name IN ['f1', 'f2'] ORDER BY name",
+        TSV(["f1", "f2"]),
+    )
+
+    # stop all zookeepers, user-defined functions will be readonly
+    cluster.stop_zookeeper_nodes(["zoo1", "zoo2", "zoo3"])
+    assert node2.query(
+        "SELECT name FROM system.functions WHERE name IN ['f1', 'f2'] ORDER BY name"
+    ) == TSV(["f1", "f2"])
+    assert "ZooKeeper" in node1.query_and_get_error(
+        "CREATE FUNCTION f3 AS (x, y) -> x * y"
+    )
+
+    # start zoo2, zoo3, user-defined functions will be readonly too, because it only connect to zoo1
+    cluster.start_zookeeper_nodes(["zoo2", "zoo3"])
+    wait_zookeeper_node_to_start(["zoo2", "zoo3"])
+    assert node2.query(
+        "SELECT name FROM system.functions WHERE name IN ['f1', 'f2', 'f3'] ORDER BY name"
+    ) == TSV(["f1", "f2"])
+    assert "ZooKeeper" in node1.query_and_get_error(
+        "CREATE FUNCTION f3 AS (x, y) -> x * y"
+    )
+
+    # set config to zoo2, server will be normal
+    replace_zookeeper_config(
+        inspect.cleandoc(
+            """
+            <clickhouse>
+                <zookeeper>
+                    <node index="1">
+                        <host>zoo2</host>
+                        <port>2181</port>
+                    </node>
+                    <session_timeout_ms>2000</session_timeout_ms>
+                </zookeeper>
+            </clickhouse>
+            """
+        )
+    )
+
+    active_zk_connections = get_active_zk_connections()
+    assert (
+        active_zk_connections == "1"
+    ), "Total connections to ZooKeeper not equal to 1, {}".format(active_zk_connections)
+
+    node1.query("CREATE FUNCTION f3 AS (x, y) -> x / y")
+    assert_eq_with_retry(
+        node2,
+        "SELECT name FROM system.functions WHERE name IN ['f1', 'f2', 'f3'] ORDER BY name",
+        TSV(["f1", "f2", "f3"]),
+    )
+
+    assert node2.query("SELECT f1(12, 3), f2(12, 3), f3(12, 3)") == TSV([[15, 9, 4]])
+
+    active_zk_connections = get_active_zk_connections()
+    assert (
+        active_zk_connections == "1"
+    ), "Total connections to ZooKeeper not equal to 1, {}".format(active_zk_connections)
+
+    node1.query("DROP FUNCTION f1")
+    node1.query("DROP FUNCTION f2")
+    node1.query("DROP FUNCTION f3")
+
+    # switch to the original version of zookeeper config
+    cluster.start_zookeeper_nodes(["zoo1", "zoo2", "zoo3"])
+    revert_zookeeper_config()
+
+
+# Start without ZooKeeper must be possible, user-defined functions will be loaded after connecting to ZooKeeper.
+def test_start_without_zookeeper():
+    node2.stop_clickhouse()
+
+    node1.query("CREATE FUNCTION f1 AS (x, y) -> x + y")
+
+    cluster.stop_zookeeper_nodes(["zoo1", "zoo2", "zoo3"])
+    node2.start_clickhouse()
+
+    assert (
+        node2.query("SELECT create_query FROM system.functions WHERE name='f1'") == ""
+    )
+
+    cluster.start_zookeeper_nodes(["zoo1", "zoo2", "zoo3"])
+    wait_zookeeper_node_to_start(["zoo1", "zoo2", "zoo3"])
+
+    assert_eq_with_retry(
+        node2,
+        "SELECT create_query FROM system.functions WHERE name='f1'",
+        "CREATE FUNCTION f1 AS (x, y) -> (x + y)\n",
+    )
+    node1.query("DROP FUNCTION f1")
diff --git a/tests/integration/test_role/test.py b/tests/integration/test_role/test.py
index 8e94b1620b5..9a352f43eab 100644
--- a/tests/integration/test_role/test.py
+++ b/tests/integration/test_role/test.py
@@ -1,3 +1,4 @@
+import time
 import pytest
 from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster
@@ -412,3 +413,74 @@ def test_function_current_roles():
         )
         == "['R1']\t['R1']\t['R1']\n"
     )
+
+
+def test_role_expiration():
+    instance.query("CREATE USER ure")
+    instance.query("CREATE ROLE rre")
+    instance.query("GRANT rre TO ure")
+
+    instance.query("CREATE TABLE IF NOT EXISTS tre (id Int) Engine=Log")
+    instance.query("INSERT INTO tre VALUES (0)")
+
+    assert "Not enough privileges" in instance.query_and_get_error(
+        "SELECT * FROM tre", user="ure"
+    )
+
+    instance.query("GRANT SELECT ON tre TO rre")
+
+    assert instance.query("SELECT * FROM tre", user="ure") == "0\n"
+
+    # access_control_improvements/role_cache_expiration_time_seconds value is 2 for the test
+    # so we wait >2 seconds until the role is expired
+    time.sleep(5)
+
+    instance.query("CREATE TABLE IF NOT EXISTS tre1 (id Int) Engine=Log")
+    instance.query("INSERT INTO tre1 VALUES (0)")
+    instance.query("GRANT SELECT ON tre1 TO rre")
+
+    assert instance.query("SELECT * from tre1", user="ure") == "0\n"
+
+    instance.query("DROP USER ure")
+    instance.query("DROP ROLE rre")
+    instance.query("DROP TABLE tre")
+    instance.query("DROP TABLE tre1")
+
+
+def test_two_roles_expiration():
+    instance.query("CREATE USER ure")
+    instance.query("CREATE ROLE rre")
+    instance.query("GRANT rre TO ure")
+
+    instance.query("CREATE ROLE rre_second")
+
+    instance.query("CREATE TABLE IF NOT EXISTS tre (id Int) Engine=Log")
+    instance.query("INSERT INTO tre VALUES (0)")
+
+    assert "Not enough privileges" in instance.query_and_get_error(
+        "SELECT * FROM tre", user="ure"
+    )
+
+    instance.query("GRANT SELECT ON tre TO rre")
+
+    assert instance.query("SELECT * FROM tre", user="ure") == "0\n"
+
+    # access_control_improvements/role_cache_expiration_time_seconds value is 2 for the test
+    # so we wait >2 seconds until the roles are expired
+    time.sleep(5)
+
+    instance.query(
+        "GRANT SELECT ON tre1 TO rre_second"
+    )  # we expect that both rre and rre_second are gone from cache upon this operation
+
+    instance.query("CREATE TABLE IF NOT EXISTS tre1 (id Int) Engine=Log")
+    instance.query("INSERT INTO tre1 VALUES (0)")
+    instance.query("GRANT SELECT ON tre1 TO rre")
+
+    assert instance.query("SELECT * from tre1", user="ure") == "0\n"
+
+    instance.query("DROP USER ure")
+    instance.query("DROP ROLE rre")
+    instance.query("DROP ROLE rre_second")
+    instance.query("DROP TABLE tre")
+    instance.query("DROP TABLE tre1")
diff --git a/tests/integration/test_s3_aws_sdk_has_slightly_unreliable_behaviour/s3_endpoint/endpoint.py b/tests/integration/test_s3_aws_sdk_has_slightly_unreliable_behaviour/s3_endpoint/endpoint.py
index d6a732cc681..1d33ca02f86 100644
--- a/tests/integration/test_s3_aws_sdk_has_slightly_unreliable_behaviour/s3_endpoint/endpoint.py
+++ b/tests/integration/test_s3_aws_sdk_has_slightly_unreliable_behaviour/s3_endpoint/endpoint.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 from bottle import request, route, run, response
 
+
 # Handle for MultipleObjectsDelete.
 @route("/<_bucket>", ["POST"])
 def delete(_bucket):
diff --git a/tests/integration/test_s3_cluster/configs/named_collections.xml b/tests/integration/test_s3_cluster/configs/named_collections.xml
new file mode 100644
index 00000000000..64d1bd98df2
--- /dev/null
+++ b/tests/integration/test_s3_cluster/configs/named_collections.xml
@@ -0,0 +1,10 @@
+<clickhouse>
+    <named_collections>
+        <test_s3>
+            <url>http://minio1:9001/root/data/{clickhouse,database}/*</url>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>minio123</secret_access_key>
+            <format>CSV</format>>
+        </test_s3>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_s3_cluster/s3_mocks/s3_mock.py b/tests/integration/test_s3_cluster/s3_mocks/s3_mock.py
new file mode 100644
index 00000000000..a8578196653
--- /dev/null
+++ b/tests/integration/test_s3_cluster/s3_mocks/s3_mock.py
@@ -0,0 +1,25 @@
+import sys
+
+from bottle import route, run, request, response
+
+
+@route("/<_bucket>/<_path:path>")
+def server(_bucket, _path):
+    result = (
+        request.headers["MyCustomHeader"]
+        if "MyCustomHeader" in request.headers
+        else "unknown"
+    )
+    response.content_type = "text/plain"
+    response.set_header("Content-Length", len(result))
+    return result
+
+
+@route("/")
+def ping():
+    response.content_type = "text/plain"
+    response.set_header("Content-Length", 2)
+    return "OK"
+
+
+run(host="0.0.0.0", port=int(sys.argv[1]))
diff --git a/tests/integration/test_s3_cluster/test.py b/tests/integration/test_s3_cluster/test.py
index 241b90cac3f..41f19cdd12d 100644
--- a/tests/integration/test_s3_cluster/test.py
+++ b/tests/integration/test_s3_cluster/test.py
@@ -8,6 +8,7 @@ import time
 import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import TSV
+from helpers.mock_servers import start_mock_servers
 
 logging.getLogger().setLevel(logging.INFO)
 logging.getLogger().addHandler(logging.StreamHandler())
@@ -49,26 +50,37 @@ def create_buckets_s3(cluster):
         print(obj.object_name)
 
 
+def run_s3_mocks(started_cluster):
+    script_dir = os.path.join(os.path.dirname(__file__), "s3_mocks")
+    start_mock_servers(
+        started_cluster,
+        script_dir,
+        [
+            ("s3_mock.py", "resolver", "8080"),
+        ],
+    )
+
+
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
         cluster = ClickHouseCluster(__file__)
         cluster.add_instance(
             "s0_0_0",
-            main_configs=["configs/cluster.xml"],
+            main_configs=["configs/cluster.xml", "configs/named_collections.xml"],
             macros={"replica": "node1", "shard": "shard1"},
             with_minio=True,
             with_zookeeper=True,
         )
         cluster.add_instance(
             "s0_0_1",
-            main_configs=["configs/cluster.xml"],
+            main_configs=["configs/cluster.xml", "configs/named_collections.xml"],
             macros={"replica": "replica2", "shard": "shard1"},
             with_zookeeper=True,
         )
         cluster.add_instance(
             "s0_1_0",
-            main_configs=["configs/cluster.xml"],
+            main_configs=["configs/cluster.xml", "configs/named_collections.xml"],
             macros={"replica": "replica1", "shard": "shard2"},
             with_zookeeper=True,
         )
@@ -79,6 +91,8 @@ def started_cluster():
 
         create_buckets_s3(cluster)
 
+        run_s3_mocks(cluster)
+
         yield cluster
     finally:
         shutil.rmtree(os.path.join(SCRIPT_DIR, "data/generated/"))
@@ -96,16 +110,16 @@ def test_select_all(started_cluster):
     ORDER BY (name, value, polygon)"""
     )
     # print(pure_s3)
-    s3_distibuted = node.query(
+    s3_distributed = node.query(
         """
     SELECT * from s3Cluster(
         'cluster_simple',
         'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)"""
     )
-    # print(s3_distibuted)
+    # print(s3_distributed)
 
-    assert TSV(pure_s3) == TSV(s3_distibuted)
+    assert TSV(pure_s3) == TSV(s3_distributed)
 
 
 def test_count(started_cluster):
@@ -118,16 +132,16 @@ def test_count(started_cluster):
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')"""
     )
     # print(pure_s3)
-    s3_distibuted = node.query(
+    s3_distributed = node.query(
         """
     SELECT count(*) from s3Cluster(
         'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*',
         'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')"""
     )
-    # print(s3_distibuted)
+    # print(s3_distributed)
 
-    assert TSV(pure_s3) == TSV(s3_distibuted)
+    assert TSV(pure_s3) == TSV(s3_distributed)
 
 
 def test_count_macro(started_cluster):
@@ -140,17 +154,17 @@ def test_count_macro(started_cluster):
         'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')"""
     )
-    # print(s3_distibuted)
-    s3_distibuted = node.query(
+    # print(s3_distributed)
+    s3_distributed = node.query(
         """
     SELECT count(*) from s3Cluster(
         'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*',
         'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')"""
     )
-    # print(s3_distibuted)
+    # print(s3_distributed)
 
-    assert TSV(s3_macro) == TSV(s3_distibuted)
+    assert TSV(s3_macro) == TSV(s3_distributed)
 
 
 def test_union_all(started_cluster):
@@ -173,7 +187,7 @@ def test_union_all(started_cluster):
     """
     )
     # print(pure_s3)
-    s3_distibuted = node.query(
+    s3_distributed = node.query(
         """
     SELECT * FROM
     (
@@ -190,9 +204,9 @@ def test_union_all(started_cluster):
     ORDER BY (name, value, polygon)
     """
     )
-    # print(s3_distibuted)
+    # print(s3_distributed)
 
-    assert TSV(pure_s3) == TSV(s3_distibuted)
+    assert TSV(pure_s3) == TSV(s3_distributed)
 
 
 def test_wrong_cluster(started_cluster):
@@ -247,9 +261,10 @@ def test_skip_unavailable_shards(started_cluster):
     assert result == "10\n"
 
 
-def test_unskip_unavailable_shards(started_cluster):
+def test_unset_skip_unavailable_shards(started_cluster):
+    # Although skip_unavailable_shards is not set, cluster table functions should always skip unavailable shards.
     node = started_cluster.instances["s0_0_0"]
-    error = node.query_and_get_error(
+    result = node.query(
         """
     SELECT count(*) from s3Cluster(
         'cluster_non_existent_port',
@@ -258,7 +273,7 @@ def test_unskip_unavailable_shards(started_cluster):
     """
     )
 
-    assert "NETWORK_ERROR" in error
+    assert result == "10\n"
 
 
 def test_distributed_insert_select_with_replicated(started_cluster):
@@ -363,3 +378,49 @@ def test_parallel_distributed_insert_select_with_schema_inference(started_cluste
 
     count = int(node.query("SELECT count() FROM parallel_insert_select"))
     assert count == actual_count
+
+
+def test_cluster_with_header(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+    assert (
+        node.query(
+            "SELECT * from s3('http://resolver:8080/bucket/key.csv', headers(MyCustomHeader = 'SomeValue'))"
+        )
+        == "SomeValue\n"
+    )
+    assert (
+        node.query(
+            "SELECT * from s3('http://resolver:8080/bucket/key.csv', headers(MyCustomHeader = 'SomeValue'), 'CSV')"
+        )
+        == "SomeValue\n"
+    )
+    assert (
+        node.query(
+            "SELECT * from s3Cluster('cluster_simple', 'http://resolver:8080/bucket/key.csv', headers(MyCustomHeader = 'SomeValue'))"
+        )
+        == "SomeValue\n"
+    )
+    assert (
+        node.query(
+            "SELECT * from s3Cluster('cluster_simple', 'http://resolver:8080/bucket/key.csv', headers(MyCustomHeader = 'SomeValue'), 'CSV')"
+        )
+        == "SomeValue\n"
+    )
+
+
+def test_cluster_with_named_collection(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+
+    pure_s3 = node.query("""SELECT * from s3(test_s3) ORDER BY (c1, c2, c3)""")
+
+    s3_cluster = node.query(
+        """SELECT * from s3Cluster(cluster_simple, test_s3) ORDER BY (c1, c2, c3)"""
+    )
+
+    assert TSV(pure_s3) == TSV(s3_cluster)
+
+    s3_cluster = node.query(
+        """SELECT * from s3Cluster(cluster_simple, test_s3, structure='auto') ORDER BY (c1, c2, c3)"""
+    )
+
+    assert TSV(pure_s3) == TSV(s3_cluster)
diff --git a/tests/integration/test_s3_with_https/test.py b/tests/integration/test_s3_with_https/test.py
index 46e281251a0..6db5b7da930 100644
--- a/tests/integration/test_s3_with_https/test.py
+++ b/tests/integration/test_s3_with_https/test.py
@@ -56,7 +56,7 @@ def test_s3_with_https(cluster, policy):
         == "(0,'data'),(1,'data')"
     )
 
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
 
     if policy.find("proxy") != -1:
         check_proxy_logs(cluster, "proxy1")
diff --git a/tests/integration/test_s3_with_proxy/test.py b/tests/integration/test_s3_with_proxy/test.py
index 1102d190a87..e5624d4e056 100644
--- a/tests/integration/test_s3_with_proxy/test.py
+++ b/tests/integration/test_s3_with_proxy/test.py
@@ -5,6 +5,7 @@ import time
 import pytest
 from helpers.cluster import ClickHouseCluster
 
+
 # Runs simple proxy resolver in python env container.
 def run_resolver(cluster):
     container_id = cluster.get_container_id("resolver")
@@ -71,7 +72,7 @@ def test_s3_with_proxy_list(cluster, policy):
         == "(0,'data'),(1,'data')"
     )
 
-    node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
 
     for proxy in ["proxy1", "proxy2"]:
         check_proxy_logs(cluster, proxy, ["PUT", "GET"])
diff --git a/tests/integration/test_s3_zero_copy_replication/test.py b/tests/integration/test_s3_zero_copy_replication/test.py
index 1c559312105..100f062de2f 100644
--- a/tests/integration/test_s3_zero_copy_replication/test.py
+++ b/tests/integration/test_s3_zero_copy_replication/test.py
@@ -149,8 +149,8 @@ def test_s3_zero_copy_replication(started_cluster, policy):
     # Based on version 21.x - after cleanup - only one merged part
     wait_for_large_objects_count(cluster, 1, timeout=60)
 
-    node1.query("DROP TABLE IF EXISTS s3_test NO DELAY")
-    node2.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    node1.query("DROP TABLE IF EXISTS s3_test SYNC")
+    node2.query("DROP TABLE IF EXISTS s3_test SYNC")
 
 
 @pytest.mark.skip(reason="Test is flaky (and never was stable)")
@@ -239,8 +239,8 @@ def test_s3_zero_copy_on_hybrid_storage(started_cluster):
         == "(0,'data'),(1,'data')"
     )
 
-    node1.query("DROP TABLE IF EXISTS hybrid_test NO DELAY")
-    node2.query("DROP TABLE IF EXISTS hybrid_test NO DELAY")
+    node1.query("DROP TABLE IF EXISTS hybrid_test SYNC")
+    node2.query("DROP TABLE IF EXISTS hybrid_test SYNC")
 
 
 def insert_data_time(node, table, number_of_mb, time, start=0):
@@ -275,8 +275,8 @@ def test_s3_zero_copy_with_ttl_move(
     node1 = cluster.instances["node1"]
     node2 = cluster.instances["node2"]
 
-    node1.query("DROP TABLE IF EXISTS ttl_move_test NO DELAY")
-    node2.query("DROP TABLE IF EXISTS ttl_move_test NO DELAY")
+    node1.query("DROP TABLE IF EXISTS ttl_move_test SYNC")
+    node2.query("DROP TABLE IF EXISTS ttl_move_test SYNC")
 
     for i in range(iterations):
         node1.query(
@@ -325,8 +325,8 @@ def test_s3_zero_copy_with_ttl_move(
                 == "(10),(11)"
             )
 
-        node1.query("DROP TABLE IF EXISTS ttl_move_test NO DELAY")
-        node2.query("DROP TABLE IF EXISTS ttl_move_test NO DELAY")
+        node1.query("DROP TABLE IF EXISTS ttl_move_test SYNC")
+        node2.query("DROP TABLE IF EXISTS ttl_move_test SYNC")
 
 
 @pytest.mark.parametrize(
@@ -340,8 +340,8 @@ def test_s3_zero_copy_with_ttl_delete(started_cluster, large_data, iterations):
     node1 = cluster.instances["node1"]
     node2 = cluster.instances["node2"]
 
-    node1.query("DROP TABLE IF EXISTS ttl_delete_test NO DELAY")
-    node2.query("DROP TABLE IF EXISTS ttl_delete_test NO DELAY")
+    node1.query("DROP TABLE IF EXISTS ttl_delete_test SYNC")
+    node2.query("DROP TABLE IF EXISTS ttl_delete_test SYNC")
 
     for i in range(iterations):
         node1.query(
@@ -398,8 +398,8 @@ def test_s3_zero_copy_with_ttl_delete(started_cluster, large_data, iterations):
                 == "(11)"
             )
 
-        node1.query("DROP TABLE IF EXISTS ttl_delete_test NO DELAY")
-        node2.query("DROP TABLE IF EXISTS ttl_delete_test NO DELAY")
+        node1.query("DROP TABLE IF EXISTS ttl_delete_test SYNC")
+        node2.query("DROP TABLE IF EXISTS ttl_delete_test SYNC")
 
 
 def wait_mutations(node, table, seconds):
@@ -438,8 +438,8 @@ def s3_zero_copy_unfreeze_base(cluster, unfreeze_query_template):
     node1 = cluster.instances["node1"]
     node2 = cluster.instances["node2"]
 
-    node1.query("DROP TABLE IF EXISTS unfreeze_test NO DELAY")
-    node2.query("DROP TABLE IF EXISTS unfreeze_test NO DELAY")
+    node1.query("DROP TABLE IF EXISTS unfreeze_test SYNC")
+    node2.query("DROP TABLE IF EXISTS unfreeze_test SYNC")
 
     node1.query(
         """
@@ -489,8 +489,8 @@ def s3_zero_copy_unfreeze_base(cluster, unfreeze_query_template):
 
     check_objects_not_exisis(cluster, objects12)
 
-    node1.query("DROP TABLE IF EXISTS unfreeze_test NO DELAY")
-    node2.query("DROP TABLE IF EXISTS unfreeze_test NO DELAY")
+    node1.query("DROP TABLE IF EXISTS unfreeze_test SYNC")
+    node2.query("DROP TABLE IF EXISTS unfreeze_test SYNC")
 
 
 def test_s3_zero_copy_unfreeze_alter(started_cluster):
@@ -505,8 +505,8 @@ def s3_zero_copy_drop_detached(cluster, unfreeze_query_template):
     node1 = cluster.instances["node1"]
     node2 = cluster.instances["node2"]
 
-    node1.query("DROP TABLE IF EXISTS drop_detached_test NO DELAY")
-    node2.query("DROP TABLE IF EXISTS drop_detached_test NO DELAY")
+    node1.query("DROP TABLE IF EXISTS drop_detached_test SYNC")
+    node2.query("DROP TABLE IF EXISTS drop_detached_test SYNC")
 
     node1.query(
         """
@@ -600,8 +600,8 @@ def test_s3_zero_copy_concurrent_merge(started_cluster):
     node1 = cluster.instances["node1"]
     node2 = cluster.instances["node2"]
 
-    node1.query("DROP TABLE IF EXISTS concurrent_merge NO DELAY")
-    node2.query("DROP TABLE IF EXISTS concurrent_merge NO DELAY")
+    node1.query("DROP TABLE IF EXISTS concurrent_merge SYNC")
+    node2.query("DROP TABLE IF EXISTS concurrent_merge SYNC")
 
     for node in (node1, node2):
         node.query(
@@ -647,8 +647,8 @@ def test_s3_zero_copy_keeps_data_after_mutation(started_cluster):
     node1 = cluster.instances["node1"]
     node2 = cluster.instances["node2"]
 
-    node1.query("DROP TABLE IF EXISTS zero_copy_mutation NO DELAY")
-    node2.query("DROP TABLE IF EXISTS zero_copy_mutation NO DELAY")
+    node1.query("DROP TABLE IF EXISTS zero_copy_mutation SYNC")
+    node2.query("DROP TABLE IF EXISTS zero_copy_mutation SYNC")
 
     node1.query(
         """
diff --git a/tests/integration/test_s3_zero_copy_ttl/test.py b/tests/integration/test_s3_zero_copy_ttl/test.py
index 9a782aacef6..7dcf3734653 100644
--- a/tests/integration/test_s3_zero_copy_ttl/test.py
+++ b/tests/integration/test_s3_zero_copy_ttl/test.py
@@ -86,9 +86,9 @@ def test_ttl_move_and_s3(started_cluster):
 
         print(f"Total objects: {counter}")
 
-        if counter == 300:
+        if counter == 330:
             break
 
         print(f"Attempts remaining: {attempt}")
 
-    assert counter == 300
+    assert counter == 330
diff --git a/tests/integration/test_server_initialization/test.py b/tests/integration/test_server_initialization/test.py
index 1b57e14a51b..867dddeb8e2 100644
--- a/tests/integration/test_server_initialization/test.py
+++ b/tests/integration/test_server_initialization/test.py
@@ -50,17 +50,3 @@ def test_partially_dropped_tables(started_cluster):
         )
         == "0\n"
     )
-
-
-def test_live_view_dependency(started_cluster):
-    instance = started_cluster.instances["dummy"]
-    instance.query("CREATE DATABASE a_load_first")
-    instance.query("CREATE DATABASE b_load_second")
-    instance.query(
-        "CREATE TABLE b_load_second.mt (a Int32) Engine=MergeTree order by tuple()"
-    )
-    instance.query(
-        "CREATE LIVE VIEW a_load_first.lv AS SELECT sum(a) FROM b_load_second.mt",
-        settings={"allow_experimental_live_view": 1},
-    )
-    instance.restart_clickhouse()
diff --git a/tests/integration/test_server_reload/test.py b/tests/integration/test_server_reload/test.py
index b06d424ee1c..da5208799ac 100644
--- a/tests/integration/test_server_reload/test.py
+++ b/tests/integration/test_server_reload/test.py
@@ -12,6 +12,7 @@ import pymysql.connections
 import pymysql.err
 import pytest
 import sys
+import os
 import time
 import logging
 from helpers.cluster import ClickHouseCluster, run_and_check
@@ -34,8 +35,9 @@ instance = cluster.add_instance(
     user_configs=["configs/default_passwd.xml"],
     with_zookeeper=True,
     # Bug in TSAN reproduces in this test https://github.com/grpc/grpc/issues/29550#issuecomment-1188085387
-    # second_deadlock_stack -- just ordinary option we use everywhere, don't want to overwrite it
-    env_variables={"TSAN_OPTIONS": "report_atomic_races=0 second_deadlock_stack=1"},
+    env_variables={
+        "TSAN_OPTIONS": "report_atomic_races=0 " + os.getenv("TSAN_OPTIONS", default="")
+    },
 )
 
 
diff --git a/tests/integration/test_settings_constraints_distributed/configs/users.d/users.xml b/tests/integration/test_settings_constraints_distributed/configs/users.d/users.xml
index 8556e73c82f..1c5f4d5a21f 100644
--- a/tests/integration/test_settings_constraints_distributed/configs/users.d/users.xml
+++ b/tests/integration/test_settings_constraints_distributed/configs/users.d/users.xml
@@ -4,7 +4,7 @@
             <password></password>
             <profile>default</profile>
             <quota>default</quota>
-            <show_named_collections>1</show_named_collections>
+            <named_collection_control>1</named_collection_control>
             <show_named_collections_secrets>1</show_named_collections_secrets>
         </default>
     </users>
diff --git a/tests/integration/test_sharding_key_from_default_column/test.py b/tests/integration/test_sharding_key_from_default_column/test.py
index 1ecf96305a4..5bce3ee4169 100644
--- a/tests/integration/test_sharding_key_from_default_column/test.py
+++ b/tests/integration/test_sharding_key_from_default_column/test.py
@@ -49,14 +49,14 @@ def test_default_column():
             "INSERT INTO TABLE dist (x) VALUES (1), (2), (3), (4)", settings=settings
         )
         node1.query("SYSTEM FLUSH DISTRIBUTED dist")
-        assert node1.query("SELECT x, y, z FROM local") == TSV(
+        assert node1.query("SELECT x, y, z FROM local ORDER BY x") == TSV(
             [[2, 102, 104], [4, 104, 108]]
         )
-        assert node2.query("SELECT x, y, z FROM local") == TSV(
+        assert node2.query("SELECT x, y, z FROM local ORDER BY x") == TSV(
             [[1, 101, 102], [3, 103, 106]]
         )
-        assert node1.query("SELECT x, y, z FROM dist") == TSV(
-            [[2, 102, 104], [4, 104, 108], [1, 101, 102], [3, 103, 106]]
+        assert node1.query("SELECT x, y, z FROM dist ORDER BY x") == TSV(
+            [[1, 101, 102], [2, 102, 104], [3, 103, 106], [4, 104, 108]]
         )
 
         # INSERT INTO TABLE dist (x, y)
@@ -66,12 +66,12 @@ def test_default_column():
             settings=settings,
         )
         node1.query("SYSTEM FLUSH DISTRIBUTED dist")
-        assert node1.query("SELECT x, y, z FROM local") == TSV([[2, 22, 24]])
-        assert node2.query("SELECT x, y, z FROM local") == TSV(
+        assert node1.query("SELECT x, y, z FROM local ORDER BY x") == TSV([[2, 22, 24]])
+        assert node2.query("SELECT x, y, z FROM local ORDER BY x") == TSV(
             [[1, 11, 12], [3, 33, 36]]
         )
-        assert node1.query("SELECT x, y, z FROM dist") == TSV(
-            [[2, 22, 24], [1, 11, 12], [3, 33, 36]]
+        assert node1.query("SELECT x, y, z FROM dist ORDER BY x") == TSV(
+            [[1, 11, 12], [2, 22, 24], [3, 33, 36]]
         )
 
 
@@ -96,14 +96,14 @@ def test_materialized_column_allow_insert_materialized():
             "INSERT INTO TABLE dist (x) VALUES (1), (2), (3), (4)", settings=settings
         )
         node1.query("SYSTEM FLUSH DISTRIBUTED dist")
-        assert node1.query("SELECT x, y, z FROM local") == TSV(
+        assert node1.query("SELECT x, y, z FROM local ORDER BY x") == TSV(
             [[2, 102, 104], [4, 104, 108]]
         )
-        assert node2.query("SELECT x, y, z FROM local") == TSV(
+        assert node2.query("SELECT x, y, z FROM local ORDER BY x") == TSV(
             [[1, 101, 102], [3, 103, 106]]
         )
-        assert node1.query("SELECT x, y, z FROM dist") == TSV(
-            [[2, 102, 104], [4, 104, 108], [1, 101, 102], [3, 103, 106]]
+        assert node1.query("SELECT x, y, z FROM dist ORDER BY x") == TSV(
+            [[1, 101, 102], [2, 102, 104], [3, 103, 106], [4, 104, 108]]
         )
 
         # INSERT INTO TABLE dist (x, y)
@@ -113,12 +113,12 @@ def test_materialized_column_allow_insert_materialized():
             settings=settings,
         )
         node1.query("SYSTEM FLUSH DISTRIBUTED dist")
-        assert node1.query("SELECT x, y, z FROM local") == TSV([[2, 22, 24]])
-        assert node2.query("SELECT x, y, z FROM local") == TSV(
+        assert node1.query("SELECT x, y, z FROM local ORDER BY x") == TSV([[2, 22, 24]])
+        assert node2.query("SELECT x, y, z FROM local ORDER BY x") == TSV(
             [[1, 11, 12], [3, 33, 36]]
         )
-        assert node1.query("SELECT x, y, z FROM dist") == TSV(
-            [[2, 22, 24], [1, 11, 12], [3, 33, 36]]
+        assert node1.query("SELECT x, y, z FROM dist ORDER BY x") == TSV(
+            [[1, 11, 12], [2, 22, 24], [3, 33, 36]]
         )
 
 
@@ -143,14 +143,14 @@ def test_materialized_column_disallow_insert_materialized():
             "INSERT INTO TABLE dist (x) VALUES (1), (2), (3), (4)", settings=settings
         )
         node1.query("SYSTEM FLUSH DISTRIBUTED dist")
-        assert node1.query("SELECT x, y, z FROM local") == TSV(
+        assert node1.query("SELECT x, y, z FROM local ORDER BY x") == TSV(
             [[2, 202, -200], [4, 204, -200]]
         )
-        assert node2.query("SELECT x, y, z FROM local") == TSV(
+        assert node2.query("SELECT x, y, z FROM local ORDER BY x") == TSV(
             [[1, 201, -200], [3, 203, -200]]
         )
-        assert node1.query("SELECT x, y, z FROM dist") == TSV(
-            [[2, 202, -200], [4, 204, -200], [1, 201, -200], [3, 203, -200]]
+        assert node1.query("SELECT x, y, z FROM dist ORDER BY x") == TSV(
+            [[1, 201, -200], [2, 202, -200], [3, 203, -200], [4, 204, -200]]
         )
 
         # INSERT INTO TABLE dist (x, y)
@@ -183,12 +183,12 @@ def test_materialized_column_disallow_insert_materialized_different_shards():
             "INSERT INTO TABLE dist (x) VALUES (1), (2), (3), (4)", settings=settings
         )
         node1.query("SYSTEM FLUSH DISTRIBUTED dist")
-        assert node1.query("SELECT x, y, z FROM local") == TSV(
+        assert node1.query("SELECT x, y, z FROM local ORDER BY x") == TSV(
             [[1, 201, -200], [3, 203, -200]]
         )
-        assert node2.query("SELECT x, y, z FROM local") == TSV(
+        assert node2.query("SELECT x, y, z FROM local ORDER BY x") == TSV(
             [[2, 202, -200], [4, 204, -200]]
         )
-        assert node1.query("SELECT x, y, z FROM dist") == TSV(
-            [[1, 201, -200], [3, 203, -200], [2, 202, -200], [4, 204, -200]]
+        assert node1.query("SELECT x, y, z FROM dist ORDER BY x") == TSV(
+            [[1, 201, -200], [2, 202, -200], [3, 203, -200], [4, 204, -200]]
         )
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.reference b/tests/integration/test_shutdown_wait_unfinished_queries/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.reference
rename to tests/integration/test_shutdown_wait_unfinished_queries/__init__.py
diff --git a/tests/integration/test_shutdown_wait_unfinished_queries/configs/config_kill.xml b/tests/integration/test_shutdown_wait_unfinished_queries/configs/config_kill.xml
new file mode 100644
index 00000000000..9708c93b5f2
--- /dev/null
+++ b/tests/integration/test_shutdown_wait_unfinished_queries/configs/config_kill.xml
@@ -0,0 +1,4 @@
+<clickhouse>
+    <shutdown_wait_unfinished>30</shutdown_wait_unfinished>
+    <shutdown_wait_unfinished_queries>0</shutdown_wait_unfinished_queries>
+</clickhouse>
diff --git a/tests/integration/test_shutdown_wait_unfinished_queries/configs/config_wait.xml b/tests/integration/test_shutdown_wait_unfinished_queries/configs/config_wait.xml
new file mode 100644
index 00000000000..f8e21c2684e
--- /dev/null
+++ b/tests/integration/test_shutdown_wait_unfinished_queries/configs/config_wait.xml
@@ -0,0 +1,4 @@
+<clickhouse>
+    <shutdown_wait_unfinished>30</shutdown_wait_unfinished>
+    <shutdown_wait_unfinished_queries>1</shutdown_wait_unfinished_queries>
+</clickhouse>
diff --git a/tests/integration/test_shutdown_wait_unfinished_queries/test.py b/tests/integration/test_shutdown_wait_unfinished_queries/test.py
new file mode 100644
index 00000000000..ae0710149de
--- /dev/null
+++ b/tests/integration/test_shutdown_wait_unfinished_queries/test.py
@@ -0,0 +1,56 @@
+import pytest
+
+import threading
+import time
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node_wait_queries = cluster.add_instance(
+    "node_wait_queries", main_configs=["configs/config_wait.xml"], stay_alive=True
+)
+node_kill_queries = cluster.add_instance(
+    "node_kill_queries", main_configs=["configs/config_kill.xml"], stay_alive=True
+)
+
+global result
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def do_long_query(node):
+    global result
+
+    result = node.query_and_get_answer_with_error(
+        "SELECT sleepEachRow(1) FROM system.numbers LIMIT 10",
+        settings={"send_logs_level": "trace"},
+    )
+
+
+def test_shutdown_wait_unfinished_queries(start_cluster):
+    global result
+
+    long_query = threading.Thread(target=do_long_query, args=(node_wait_queries,))
+    long_query.start()
+
+    time.sleep(1)
+    node_wait_queries.stop_clickhouse(kill=False)
+
+    long_query.join()
+
+    assert result[0].count("0") == 10
+
+    long_query = threading.Thread(target=do_long_query, args=(node_kill_queries,))
+    long_query.start()
+
+    time.sleep(1)
+    node_kill_queries.stop_clickhouse(kill=False)
+
+    long_query.join()
+    assert "QUERY_WAS_CANCELLED" in result[1]
diff --git a/tests/integration/test_ssl_cert_authentication/configs/ssl_config.xml b/tests/integration/test_ssl_cert_authentication/configs/ssl_config.xml
index 163449872be..ed3b2b595db 100644
--- a/tests/integration/test_ssl_cert_authentication/configs/ssl_config.xml
+++ b/tests/integration/test_ssl_cert_authentication/configs/ssl_config.xml
@@ -9,7 +9,7 @@
          You have to configure certificate to enable this interface.
          See the openSSL section below.
     -->
-    <!-- <tcp_port_secure>9440</tcp_port_secure> -->
+    <tcp_port_secure>9440</tcp_port_secure>
 
     <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
     <openSSL replace="replace">
diff --git a/tests/integration/test_ssl_cert_authentication/test.py b/tests/integration/test_ssl_cert_authentication/test.py
index 0246b835fd5..b05a6acc16b 100644
--- a/tests/integration/test_ssl_cert_authentication/test.py
+++ b/tests/integration/test_ssl_cert_authentication/test.py
@@ -1,9 +1,12 @@
 import pytest
+from helpers.client import Client
 from helpers.cluster import ClickHouseCluster
 from helpers.ssl_context import WrapSSLContextWithSNI
-import urllib.request, urllib.parse
 import ssl
 import os.path
+from os import remove
+import urllib3
+
 
 # The test cluster is configured with certificate for that host name, see 'server-ext.cnf'.
 # The client have to verify server certificate against that name. Client uses SNI
@@ -35,6 +38,116 @@ def started_cluster():
         cluster.shutdown()
 
 
+config = """<clickhouse>
+    <openSSL>
+        <client>
+            <verificationMode>none</verificationMode>
+
+            <certificateFile>{certificateFile}</certificateFile>
+            <privateKeyFile>{privateKeyFile}</privateKeyFile>
+            <caConfig>{caConfig}</caConfig>
+
+            <invalidCertificateHandler>
+                <name>AcceptCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+</clickhouse>"""
+
+
+def execute_query_native(node, query, user, cert_name, password=None):
+    config_path = f"{SCRIPT_DIR}/configs/client.xml"
+
+    formatted = config.format(
+        certificateFile=f"{SCRIPT_DIR}/certs/{cert_name}-cert.pem",
+        privateKeyFile=f"{SCRIPT_DIR}/certs/{cert_name}-key.pem",
+        caConfig=f"{SCRIPT_DIR}/certs/ca-cert.pem",
+    )
+
+    file = open(config_path, "w")
+    file.write(formatted)
+    file.close()
+
+    client = Client(
+        node.ip_address,
+        9440,
+        command=cluster.client_bin_path,
+        secure=True,
+        config=config_path,
+    )
+
+    try:
+        result = client.query(query, user=user, password=password)
+        remove(config_path)
+        return result
+    except:
+        remove(config_path)
+        raise
+
+
+def test_native():
+    assert (
+        execute_query_native(
+            instance, "SELECT currentUser()", user="john", cert_name="client1"
+        )
+        == "john\n"
+    )
+    assert (
+        execute_query_native(
+            instance, "SELECT currentUser()", user="lucy", cert_name="client2"
+        )
+        == "lucy\n"
+    )
+    assert (
+        execute_query_native(
+            instance, "SELECT currentUser()", user="lucy", cert_name="client3"
+        )
+        == "lucy\n"
+    )
+
+
+def test_native_wrong_cert():
+    # Wrong certificate: different user's certificate
+    with pytest.raises(Exception) as err:
+        execute_query_native(
+            instance, "SELECT currentUser()", user="john", cert_name="client2"
+        )
+    assert "AUTHENTICATION_FAILED" in str(err.value)
+
+    # Wrong certificate: self-signed certificate.
+    # In this case clickhouse-client itself will throw an error
+    with pytest.raises(Exception) as err:
+        execute_query_native(
+            instance, "SELECT currentUser()", user="john", cert_name="wrong"
+        )
+    assert "UNKNOWN_CA" in str(err.value)
+
+
+def test_native_fallback_to_password():
+    # Unrelated certificate, correct password
+    assert (
+        execute_query_native(
+            instance,
+            "SELECT currentUser()",
+            user="jane",
+            cert_name="client2",
+            password="qwe123",
+        )
+        == "jane\n"
+    )
+
+    # Unrelated certificate, wrong password
+    with pytest.raises(Exception) as err:
+        execute_query_native(
+            instance,
+            "SELECT currentUser()",
+            user="jane",
+            cert_name="client2",
+            password="wrong",
+        )
+    assert "AUTHENTICATION_FAILED" in str(err.value)
+
+
 def get_ssl_context(cert_name):
     context = WrapSSLContextWithSNI(SSL_HOST, ssl.PROTOCOL_TLS_CLIENT)
     context.load_verify_locations(cafile=f"{SCRIPT_DIR}/certs/ca-cert.pem")
@@ -51,19 +164,17 @@ def get_ssl_context(cert_name):
 def execute_query_https(
     query, user, enable_ssl_auth=True, cert_name=None, password=None
 ):
-    url = (
-        f"https://{instance.ip_address}:{HTTPS_PORT}/?query={urllib.parse.quote(query)}"
-    )
-    request = urllib.request.Request(url)
-    request.add_header("X-ClickHouse-User", user)
+    url = f"https://{instance.ip_address}:{HTTPS_PORT}/?query={query}"
+    headers = {"X-ClickHouse-User": user}
     if enable_ssl_auth:
-        request.add_header("X-ClickHouse-SSL-Certificate-Auth", "on")
+        headers["X-ClickHouse-SSL-Certificate-Auth"] = "on"
     if password:
-        request.add_header("X-ClickHouse-Key", password)
-    response = urllib.request.urlopen(
-        request, context=get_ssl_context(cert_name)
-    ).read()
-    return response.decode("utf-8")
+        headers["X-ClickHouse-Key"] = password
+    http_client = urllib3.PoolManager(ssl_context=get_ssl_context(cert_name))
+    response = http_client.request("GET", url, headers=headers)
+    if response.status != 200:
+        raise Exception(response.status)
+    return response.data.decode("utf-8")
 
 
 def test_https():
@@ -85,7 +196,7 @@ def test_https_wrong_cert():
     # Wrong certificate: different user's certificate
     with pytest.raises(Exception) as err:
         execute_query_https("SELECT currentUser()", user="john", cert_name="client2")
-    assert "HTTP Error 403" in str(err.value)
+    assert "403" in str(err.value)
 
     # Wrong certificate: self-signed certificate.
     with pytest.raises(Exception) as err:
@@ -95,7 +206,7 @@ def test_https_wrong_cert():
     # No certificate.
     with pytest.raises(Exception) as err:
         execute_query_https("SELECT currentUser()", user="john")
-    assert "HTTP Error 403" in str(err.value)
+    assert "403" in str(err.value)
 
     # No header enabling SSL authentication.
     with pytest.raises(Exception) as err:
@@ -223,7 +334,7 @@ def test_create_user():
 
     with pytest.raises(Exception) as err:
         execute_query_https("SELECT currentUser()", user="emma", cert_name="client3")
-    assert "HTTP Error 403" in str(err.value)
+    assert "403" in str(err.value)
 
     assert (
         instance.query("SHOW CREATE USER lucy")
diff --git a/tests/integration/test_storage_delta/configs/config.d/named_collections.xml b/tests/integration/test_storage_delta/configs/config.d/named_collections.xml
new file mode 100644
index 00000000000..d4c54e2d13d
--- /dev/null
+++ b/tests/integration/test_storage_delta/configs/config.d/named_collections.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+  <named_collections>
+    <s3>
+        <url>http://minio1:9001/root/</url>
+        <access_key_id>minio</access_key_id>
+        <secret_access_key>minio123</secret_access_key>
+    </s3>
+  </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_storage_delta/test.py b/tests/integration/test_storage_delta/test.py
index 3f9da071281..9477b66dab8 100644
--- a/tests/integration/test_storage_delta/test.py
+++ b/tests/integration/test_storage_delta/test.py
@@ -1,83 +1,67 @@
+import helpers.client
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+import pytest
 import logging
 import os
 import json
-import helpers.client
-import pytest
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV
+import time
+import glob
+
+import pyspark
+import delta
+from delta import *
+from pyspark.sql.types import (
+    StructType,
+    StructField,
+    StringType,
+    IntegerType,
+    DateType,
+    TimestampType,
+    BooleanType,
+    ArrayType,
+)
+from pyspark.sql.functions import current_timestamp
+from datetime import datetime
+from pyspark.sql.functions import monotonically_increasing_id, row_number
+from pyspark.sql.window import Window
+
+from helpers.s3_tools import prepare_s3_bucket, upload_directory, get_file_contents
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 
-def prepare_s3_bucket(started_cluster):
-    bucket_read_write_policy = {
-        "Version": "2012-10-17",
-        "Statement": [
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:GetBucketLocation",
-                "Resource": "arn:aws:s3:::root",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:ListBucket",
-                "Resource": "arn:aws:s3:::root",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:GetObject",
-                "Resource": "arn:aws:s3:::root/*",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:PutObject",
-                "Resource": "arn:aws:s3:::root/*",
-            },
-        ],
-    }
-
-    minio_client = started_cluster.minio_client
-    minio_client.set_bucket_policy(
-        started_cluster.minio_bucket, json.dumps(bucket_read_write_policy)
+def get_spark():
+    builder = (
+        pyspark.sql.SparkSession.builder.appName("spark_test")
+        .config("spark.sql.extensions", "io.delta.sql.DeltaSparkSessionExtension")
+        .config(
+            "spark.sql.catalog.spark_catalog",
+            "org.apache.spark.sql.delta.catalog.DeltaCatalog",
+        )
+        .master("local")
     )
 
-
-def upload_test_table(started_cluster):
-    bucket = started_cluster.minio_bucket
-
-    for address, dirs, files in os.walk(SCRIPT_DIR + "/test_table"):
-        address_without_prefix = address[len(SCRIPT_DIR) :]
-
-        for name in files:
-            started_cluster.minio_client.fput_object(
-                bucket,
-                os.path.join(address_without_prefix, name),
-                os.path.join(address, name),
-            )
+    return builder.master("local").getOrCreate()
 
 
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
-        cluster = ClickHouseCluster(__file__)
-        cluster.add_instance("main_server", with_minio=True)
+        cluster = ClickHouseCluster(__file__, with_spark=True)
+        cluster.add_instance(
+            "node1",
+            main_configs=["configs/config.d/named_collections.xml"],
+            with_minio=True,
+        )
 
         logging.info("Starting cluster...")
         cluster.start()
 
         prepare_s3_bucket(cluster)
-        logging.info("S3 bucket created")
 
-        upload_test_table(cluster)
-        logging.info("Test table uploaded")
+        cluster.spark_session = get_spark()
 
         yield cluster
 
@@ -85,82 +69,334 @@ def started_cluster():
         cluster.shutdown()
 
 
-def run_query(instance, query, stdin=None, settings=None):
-    # type: (ClickHouseInstance, str, object, dict) -> str
-
-    logging.info("Running query '{}'...".format(query))
-    result = instance.query(query, stdin=stdin, settings=settings)
-    logging.info("Query finished")
-
-    return result
+def write_delta_from_file(spark, path, result_path, mode="overwrite"):
+    spark.read.load(path).write.mode(mode).option("compression", "none").format(
+        "delta"
+    ).option("delta.columnMapping.mode", "name").save(result_path)
 
 
-def test_create_query(started_cluster):
-    instance = started_cluster.instances["main_server"]
+def write_delta_from_df(spark, df, result_path, mode="overwrite", partition_by=None):
+    if partition_by is None:
+        df.write.mode(mode).option("compression", "none").format("delta").option(
+            "delta.columnMapping.mode", "name"
+        ).save(result_path)
+    else:
+        df.write.mode(mode).option("compression", "none").format("delta").option(
+            "delta.columnMapping.mode", "name"
+        ).partitionBy("a").save(result_path)
+
+
+def generate_data(spark, start, end):
+    a = spark.range(start, end, 1).toDF("a")
+    b = spark.range(start + 1, end + 1, 1).toDF("b")
+    b = b.withColumn("b", b["b"].cast(StringType()))
+
+    a = a.withColumn(
+        "row_index", row_number().over(Window.orderBy(monotonically_increasing_id()))
+    )
+    b = b.withColumn(
+        "row_index", row_number().over(Window.orderBy(monotonically_increasing_id()))
+    )
+
+    df = a.join(b, on=["row_index"]).drop("row_index")
+    return df
+
+
+def get_delta_metadata(delta_metadata_file):
+    jsons = [json.loads(x) for x in delta_metadata_file.splitlines()]
+    combined_json = {}
+    for d in jsons:
+        combined_json.update(d)
+    return combined_json
+
+
+def create_delta_table(node, table_name):
+    node.query(
+        f"""
+        DROP TABLE IF EXISTS {table_name};
+        CREATE TABLE {table_name}
+        ENGINE=DeltaLake(s3, filename = '{table_name}/')"""
+    )
+
+
+def create_initial_data_file(
+    cluster, node, query, table_name, compression_method="none"
+):
+    node.query(
+        f"""
+        INSERT INTO TABLE FUNCTION
+            file('{table_name}.parquet')
+        SETTINGS
+            output_format_parquet_compression_method='{compression_method}',
+            s3_truncate_on_insert=1 {query}
+        FORMAT Parquet"""
+    )
+    user_files_path = os.path.join(
+        SCRIPT_DIR, f"{cluster.instances_dir_name}/node1/database/user_files"
+    )
+    result_path = f"{user_files_path}/{table_name}.parquet"
+    return result_path
+
+
+def test_single_log_file(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_single_log_file"
 
-    create_query = f"""CREATE TABLE deltalake ENGINE=DeltaLake('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/test_table/', 'minio', 'minio123')"""
+    inserted_data = "SELECT number, toString(number + 1) FROM numbers(100)"
+    parquet_data_path = create_initial_data_file(
+        started_cluster, instance, inserted_data, TABLE_NAME
+    )
 
-    run_query(instance, create_query)
+    write_delta_from_file(spark, parquet_data_path, f"/{TABLE_NAME}")
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert len(files) == 2  # 1 metadata files + 1 data file
+
+    create_delta_table(instance, TABLE_NAME)
+
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
+    assert instance.query(f"SELECT * FROM {TABLE_NAME}") == instance.query(
+        inserted_data
+    )
 
 
-def test_select_query(started_cluster):
-    instance = started_cluster.instances["main_server"]
+def test_partition_by(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    columns = [
-        "begin_lat",
-        "begin_lon",
-        "driver",
-        "end_lat",
-        "end_lon",
-        "fare",
-        "rider",
-        "ts",
-        "uuid",
+    TABLE_NAME = "test_partition_by"
+
+    write_delta_from_df(
+        spark,
+        generate_data(spark, 0, 10),
+        f"/{TABLE_NAME}",
+        mode="overwrite",
+        partition_by="a",
+    )
+
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert len(files) == 11  # 10 partitions and 1 metadata file
+
+    create_delta_table(instance, TABLE_NAME)
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 10
+
+
+def test_checkpoint(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_checkpoint"
+
+    write_delta_from_df(
+        spark,
+        generate_data(spark, 0, 1),
+        f"/{TABLE_NAME}",
+        mode="overwrite",
+    )
+    for i in range(1, 25):
+        write_delta_from_df(
+            spark,
+            generate_data(spark, i, i + 1),
+            f"/{TABLE_NAME}",
+            mode="append",
+        )
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    # 25 data files
+    # 25 metadata files
+    # 1 last_metadata file
+    # 2 checkpoints
+    assert len(files) == 25 * 2 + 3
+
+    ok = False
+    for file in files:
+        if file.endswith("last_checkpoint"):
+            ok = True
+    assert ok
+
+    create_delta_table(instance, TABLE_NAME)
+    assert (
+        int(
+            instance.query(
+                f"SELECT count() FROM {TABLE_NAME} SETTINGS input_format_parquet_allow_missing_columns=1"
+            )
+        )
+        == 25
+    )
+
+    table = DeltaTable.forPath(spark, f"/{TABLE_NAME}")
+    table.delete("a < 10")
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 15
+
+    for i in range(0, 5):
+        write_delta_from_df(
+            spark,
+            generate_data(spark, i, i + 1),
+            f"/{TABLE_NAME}",
+            mode="append",
+        )
+    # + 1 metadata files (for delete)
+    # + 5 data files
+    # + 5 metadata files
+    # + 1 checkpoint file
+    # + 1 ?
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert len(files) == 53 + 1 + 5 * 2 + 1 + 1
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 20
+
+    assert (
+        instance.query(f"SELECT * FROM {TABLE_NAME} ORDER BY 1").strip()
+        == instance.query(
+            "SELECT * FROM ("
+            "SELECT number, toString(number + 1) FROM numbers(5) "
+            "UNION ALL SELECT number, toString(number + 1) FROM numbers(10, 15) "
+            ") ORDER BY 1"
+        ).strip()
+    )
+
+
+def test_multiple_log_files(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_multiple_log_files"
+
+    write_delta_from_df(
+        spark, generate_data(spark, 0, 100), f"/{TABLE_NAME}", mode="overwrite"
+    )
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert len(files) == 2  # 1 metadata files + 1 data file
+
+    s3_objects = list(
+        minio_client.list_objects(bucket, f"/{TABLE_NAME}/_delta_log/", recursive=True)
+    )
+    assert len(s3_objects) == 1
+
+    create_delta_table(instance, TABLE_NAME)
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
+
+    write_delta_from_df(
+        spark, generate_data(spark, 100, 200), f"/{TABLE_NAME}", mode="append"
+    )
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert len(files) == 4  # 2 metadata files + 2 data files
+
+    s3_objects = list(
+        minio_client.list_objects(bucket, f"/{TABLE_NAME}/_delta_log/", recursive=True)
+    )
+    assert len(s3_objects) == 2
+
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 200
+    assert instance.query(f"SELECT * FROM {TABLE_NAME} ORDER BY 1") == instance.query(
+        "SELECT number, toString(number + 1) FROM numbers(200)"
+    )
+
+
+def test_metadata(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_metadata"
+
+    parquet_data_path = create_initial_data_file(
+        started_cluster,
+        instance,
+        "SELECT number, toString(number) FROM numbers(100)",
+        TABLE_NAME,
+    )
+
+    write_delta_from_file(spark, parquet_data_path, f"/{TABLE_NAME}")
+    upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+
+    data = get_file_contents(
+        minio_client,
+        bucket,
+        f"/{TABLE_NAME}/_delta_log/00000000000000000000.json",
+    )
+    delta_metadata = get_delta_metadata(data)
+
+    stats = json.loads(delta_metadata["add"]["stats"])
+    assert stats["numRecords"] == 100
+    assert next(iter(stats["minValues"].values())) == 0
+    assert next(iter(stats["maxValues"].values())) == 99
+
+    create_delta_table(instance, TABLE_NAME)
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
+
+
+def test_types(started_cluster):
+    TABLE_NAME = "test_types"
+    spark = started_cluster.spark_session
+    result_file = f"{TABLE_NAME}_result_2"
+
+    delta_table = (
+        DeltaTable.create(spark)
+        .tableName(TABLE_NAME)
+        .location(f"/{result_file}")
+        .addColumn("a", "INT")
+        .addColumn("b", "STRING")
+        .addColumn("c", "DATE")
+        .addColumn("d", "ARRAY<STRING>")
+        .addColumn("e", "BOOLEAN")
+        .execute()
+    )
+    data = [
+        (
+            123,
+            "string",
+            datetime.strptime("2000-01-01", "%Y-%m-%d"),
+            ["str1", "str2"],
+            True,
+        )
     ]
 
-    # create query in case table doesn't exist
-    create_query = f"""CREATE TABLE IF NOT EXISTS deltalake ENGINE=DeltaLake('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/test_table/', 'minio', 'minio123')"""
-
-    run_query(instance, create_query)
-
-    select_query = "SELECT {} FROM deltalake FORMAT TSV"
-    select_table_function_query = "SELECT {col} FROM deltaLake('http://{ip}:{port}/{bucket}/test_table/', 'minio', 'minio123') FORMAT TSV"
-
-    for column_name in columns:
-        result = run_query(instance, select_query.format(column_name)).splitlines()
-        assert len(result) > 0
-
-    for column_name in columns:
-        result = run_query(
-            instance,
-            select_table_function_query.format(
-                col=column_name,
-                ip=started_cluster.minio_ip,
-                port=started_cluster.minio_port,
-                bucket=bucket,
-            ),
-        ).splitlines()
-        assert len(result) > 0
-
-
-def test_describe_query(started_cluster):
-    instance = started_cluster.instances["main_server"]
-    bucket = started_cluster.minio_bucket
-    result = instance.query(
-        f"DESCRIBE deltaLake('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/test_table/', 'minio', 'minio123') FORMAT TSV",
-    )
-
-    assert result == TSV(
+    schema = StructType(
         [
-            ["begin_lat", "Nullable(Float64)"],
-            ["begin_lon", "Nullable(Float64)"],
-            ["driver", "Nullable(String)"],
-            ["end_lat", "Nullable(Float64)"],
-            ["end_lon", "Nullable(Float64)"],
-            ["fare", "Nullable(Float64)"],
-            ["rider", "Nullable(String)"],
-            ["ts", "Nullable(Int64)"],
-            ["uuid", "Nullable(String)"],
+            StructField("a", IntegerType()),
+            StructField("b", StringType()),
+            StructField("c", DateType()),
+            StructField("d", ArrayType(StringType())),
+            StructField("e", BooleanType()),
+        ]
+    )
+    df = spark.createDataFrame(data=data, schema=schema)
+    df.printSchema()
+    df.write.mode("append").format("delta").saveAsTable(TABLE_NAME)
+
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    upload_directory(minio_client, bucket, f"/{result_file}", "")
+
+    instance = started_cluster.instances["node1"]
+    instance.query(
+        f"""
+        DROP TABLE IF EXISTS {TABLE_NAME};
+        CREATE TABLE {TABLE_NAME} ENGINE=DeltaLake('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/{result_file}/', 'minio', 'minio123')"""
+    )
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 1
+    assert (
+        instance.query(f"SELECT * FROM {TABLE_NAME}").strip()
+        == "123\tstring\t2000-01-01\t['str1','str2']\ttrue"
+    )
+
+    table_function = f"deltaLake('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/{result_file}/', 'minio', 'minio123')"
+    assert (
+        instance.query(f"SELECT * FROM {table_function}").strip()
+        == "123\tstring\t2000-01-01\t['str1','str2']\ttrue"
+    )
+
+    assert instance.query(f"DESCRIBE {table_function} FORMAT TSV") == TSV(
+        [
+            ["a", "Nullable(Int32)"],
+            ["b", "Nullable(String)"],
+            ["c", "Nullable(Date32)"],
+            ["d", "Array(Nullable(String))"],
+            ["e", "Nullable(Bool)"],
         ]
     )
diff --git a/tests/integration/test_storage_delta/test_table/_delta_log/.00000000000000000000.json.crc b/tests/integration/test_storage_delta/test_table/_delta_log/.00000000000000000000.json.crc
deleted file mode 100644
index 327e2898336..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/_delta_log/.00000000000000000000.json.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/_delta_log/.00000000000000000001.json.crc b/tests/integration/test_storage_delta/test_table/_delta_log/.00000000000000000001.json.crc
deleted file mode 100644
index fd48c979576..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/_delta_log/.00000000000000000001.json.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/_delta_log/00000000000000000000.json b/tests/integration/test_storage_delta/test_table/_delta_log/00000000000000000000.json
deleted file mode 100644
index 45fd233fd48..00000000000
--- a/tests/integration/test_storage_delta/test_table/_delta_log/00000000000000000000.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"protocol":{"minReaderVersion":1,"minWriterVersion":2}}
-{"metaData":{"id":"6eae6736-e014-439d-8301-070bfa5fc358","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"begin_lat\",\"type\":\"double\",\"nullable\":true,\"metadata\":{}},{\"name\":\"begin_lon\",\"type\":\"double\",\"nullable\":true,\"metadata\":{}},{\"name\":\"driver\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}},{\"name\":\"end_lat\",\"type\":\"double\",\"nullable\":true,\"metadata\":{}},{\"name\":\"end_lon\",\"type\":\"double\",\"nullable\":true,\"metadata\":{}},{\"name\":\"fare\",\"type\":\"double\",\"nullable\":true,\"metadata\":{}},{\"name\":\"partitionpath\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}},{\"name\":\"rider\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}},{\"name\":\"ts\",\"type\":\"long\",\"nullable\":true,\"metadata\":{}},{\"name\":\"uuid\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":["partitionpath"],"configuration":{},"createdTime":1661963201495}}
-{"add":{"path":"partitionpath=americas%252Fbrazil%252Fsao_paulo/part-00000-7212b9be-df70-42ca-831e-2ab223e7c176.c000.snappy.parquet","partitionValues":{"partitionpath":"americas/brazil/sao_paulo"},"size":2795,"modificationTime":1661963202988,"dataChange":true}}
-{"add":{"path":"partitionpath=americas%252Funited_states%252Fsan_francisco/part-00000-8dcd9986-b57d-41e5-afe4-658c02e1aeb5.c000.snappy.parquet","partitionValues":{"partitionpath":"americas/united_states/san_francisco"},"size":2966,"modificationTime":1661963203028,"dataChange":true}}
-{"add":{"path":"partitionpath=asia%252Findia%252Fchennai/part-00000-714ed689-3609-424f-acd2-d2bab8e66748.c000.snappy.parquet","partitionValues":{"partitionpath":"asia/india/chennai"},"size":2795,"modificationTime":1661963203056,"dataChange":true}}
-{"add":{"path":"partitionpath=americas%252Fbrazil%252Fsao_paulo/part-00001-3fd0374b-5fcf-42de-b929-a68f54aa1e6b.c000.snappy.parquet","partitionValues":{"partitionpath":"americas/brazil/sao_paulo"},"size":2878,"modificationTime":1661963202988,"dataChange":true}}
-{"add":{"path":"partitionpath=americas%252Funited_states%252Fsan_francisco/part-00001-7e34b80c-8fe9-466b-b8e2-817f80097b3b.c000.snappy.parquet","partitionValues":{"partitionpath":"americas/united_states/san_francisco"},"size":2878,"modificationTime":1661963203044,"dataChange":true}}
-{"add":{"path":"partitionpath=asia%252Findia%252Fchennai/part-00001-a3499b25-46da-463a-9527-a3dcd269f99e.c000.snappy.parquet","partitionValues":{"partitionpath":"asia/india/chennai"},"size":2795,"modificationTime":1661963203072,"dataChange":true}}
-{"commitInfo":{"timestamp":1661963203129,"operation":"WRITE","operationParameters":{"mode":"ErrorIfExists","partitionBy":"[\"partitionpath\"]"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"6","numOutputRows":"10","numOutputBytes":"17107"},"engineInfo":"Apache-Spark/3.2.2 Delta-Lake/1.1.0"}}
diff --git a/tests/integration/test_storage_delta/test_table/_delta_log/00000000000000000001.json b/tests/integration/test_storage_delta/test_table/_delta_log/00000000000000000001.json
deleted file mode 100644
index 408d5e1ded7..00000000000
--- a/tests/integration/test_storage_delta/test_table/_delta_log/00000000000000000001.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{"add":{"path":"partitionpath=americas%252Fbrazil%252Fsao_paulo/part-00000-df1117a8-d568-4514-b556-cd6ebe7630c9.c000.snappy.parquet","partitionValues":{"partitionpath":"americas/brazil/sao_paulo"},"size":2795,"modificationTime":1661964654518,"dataChange":true}}
-{"add":{"path":"partitionpath=americas%252Funited_states%252Fsan_francisco/part-00000-a8bac363-ee42-47f5-a37c-1539c1bb57b1.c000.snappy.parquet","partitionValues":{"partitionpath":"americas/united_states/san_francisco"},"size":2966,"modificationTime":1661964654558,"dataChange":true}}
-{"add":{"path":"partitionpath=asia%252Findia%252Fchennai/part-00000-db7e2844-bba1-41e9-841b-22762fcfc509.c000.snappy.parquet","partitionValues":{"partitionpath":"asia/india/chennai"},"size":2794,"modificationTime":1661964654586,"dataChange":true}}
-{"add":{"path":"partitionpath=americas%252Fbrazil%252Fsao_paulo/part-00001-d0760f2d-45e8-493a-8144-d0d9d0ff572c.c000.snappy.parquet","partitionValues":{"partitionpath":"americas/brazil/sao_paulo"},"size":2878,"modificationTime":1661964654518,"dataChange":true}}
-{"add":{"path":"partitionpath=americas%252Funited_states%252Fsan_francisco/part-00001-cebe56e9-0e6f-4fe8-8135-23184ffdc617.c000.snappy.parquet","partitionValues":{"partitionpath":"americas/united_states/san_francisco"},"size":2879,"modificationTime":1661964654558,"dataChange":true}}
-{"add":{"path":"partitionpath=asia%252Findia%252Fchennai/part-00001-cbd68744-0f7d-45c7-8ca0-7594340b2c66.c000.snappy.parquet","partitionValues":{"partitionpath":"asia/india/chennai"},"size":2795,"modificationTime":1661964654582,"dataChange":true}}
-{"remove":{"path":"partitionpath=americas%252Fbrazil%252Fsao_paulo/part-00000-7212b9be-df70-42ca-831e-2ab223e7c176.c000.snappy.parquet","deletionTimestamp":1661964655238,"dataChange":true,"extendedFileMetadata":true,"partitionValues":{"partitionpath":"americas/brazil/sao_paulo"},"size":2795}}
-{"remove":{"path":"partitionpath=americas%252Funited_states%252Fsan_francisco/part-00000-8dcd9986-b57d-41e5-afe4-658c02e1aeb5.c000.snappy.parquet","deletionTimestamp":1661964655238,"dataChange":true,"extendedFileMetadata":true,"partitionValues":{"partitionpath":"americas/united_states/san_francisco"},"size":2966}}
-{"remove":{"path":"partitionpath=americas%252Funited_states%252Fsan_francisco/part-00001-7e34b80c-8fe9-466b-b8e2-817f80097b3b.c000.snappy.parquet","deletionTimestamp":1661964655238,"dataChange":true,"extendedFileMetadata":true,"partitionValues":{"partitionpath":"americas/united_states/san_francisco"},"size":2878}}
-{"remove":{"path":"partitionpath=asia%252Findia%252Fchennai/part-00000-714ed689-3609-424f-acd2-d2bab8e66748.c000.snappy.parquet","deletionTimestamp":1661964655238,"dataChange":true,"extendedFileMetadata":true,"partitionValues":{"partitionpath":"asia/india/chennai"},"size":2795}}
-{"remove":{"path":"partitionpath=americas%252Fbrazil%252Fsao_paulo/part-00001-3fd0374b-5fcf-42de-b929-a68f54aa1e6b.c000.snappy.parquet","deletionTimestamp":1661964655238,"dataChange":true,"extendedFileMetadata":true,"partitionValues":{"partitionpath":"americas/brazil/sao_paulo"},"size":2878}}
-{"remove":{"path":"partitionpath=asia%252Findia%252Fchennai/part-00001-a3499b25-46da-463a-9527-a3dcd269f99e.c000.snappy.parquet","deletionTimestamp":1661964655238,"dataChange":true,"extendedFileMetadata":true,"partitionValues":{"partitionpath":"asia/india/chennai"},"size":2795}}
-{"commitInfo":{"timestamp":1661964655251,"operation":"WRITE","operationParameters":{"mode":"Overwrite","partitionBy":"[\"partitionpath\"]"},"readVersion":0,"isolationLevel":"Serializable","isBlindAppend":false,"operationMetrics":{"numFiles":"6","numOutputRows":"10","numOutputBytes":"17107"},"engineInfo":"Apache-Spark/3.2.2 Delta-Lake/1.1.0"}}
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00000-7212b9be-df70-42ca-831e-2ab223e7c176.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00000-7212b9be-df70-42ca-831e-2ab223e7c176.c000.snappy.parquet.crc
deleted file mode 100644
index 0d07fe9805f..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00000-7212b9be-df70-42ca-831e-2ab223e7c176.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00000-df1117a8-d568-4514-b556-cd6ebe7630c9.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00000-df1117a8-d568-4514-b556-cd6ebe7630c9.c000.snappy.parquet.crc
deleted file mode 100644
index 1b17a91ca75..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00000-df1117a8-d568-4514-b556-cd6ebe7630c9.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00001-3fd0374b-5fcf-42de-b929-a68f54aa1e6b.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00001-3fd0374b-5fcf-42de-b929-a68f54aa1e6b.c000.snappy.parquet.crc
deleted file mode 100644
index f7f1df8479d..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00001-3fd0374b-5fcf-42de-b929-a68f54aa1e6b.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00001-d0760f2d-45e8-493a-8144-d0d9d0ff572c.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00001-d0760f2d-45e8-493a-8144-d0d9d0ff572c.c000.snappy.parquet.crc
deleted file mode 100644
index 88414b442d1..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/.part-00001-d0760f2d-45e8-493a-8144-d0d9d0ff572c.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00000-7212b9be-df70-42ca-831e-2ab223e7c176.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00000-7212b9be-df70-42ca-831e-2ab223e7c176.c000.snappy.parquet
deleted file mode 100644
index 9be4fc88758..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00000-7212b9be-df70-42ca-831e-2ab223e7c176.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00000-df1117a8-d568-4514-b556-cd6ebe7630c9.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00000-df1117a8-d568-4514-b556-cd6ebe7630c9.c000.snappy.parquet
deleted file mode 100644
index a9652efacb0..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00000-df1117a8-d568-4514-b556-cd6ebe7630c9.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00001-3fd0374b-5fcf-42de-b929-a68f54aa1e6b.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00001-3fd0374b-5fcf-42de-b929-a68f54aa1e6b.c000.snappy.parquet
deleted file mode 100644
index fad00b6c557..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00001-3fd0374b-5fcf-42de-b929-a68f54aa1e6b.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00001-d0760f2d-45e8-493a-8144-d0d9d0ff572c.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00001-d0760f2d-45e8-493a-8144-d0d9d0ff572c.c000.snappy.parquet
deleted file mode 100644
index 1e79eb2d238..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Fbrazil%2Fsao_paulo/part-00001-d0760f2d-45e8-493a-8144-d0d9d0ff572c.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00000-8dcd9986-b57d-41e5-afe4-658c02e1aeb5.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00000-8dcd9986-b57d-41e5-afe4-658c02e1aeb5.c000.snappy.parquet.crc
deleted file mode 100644
index ded74b8da6d..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00000-8dcd9986-b57d-41e5-afe4-658c02e1aeb5.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00000-a8bac363-ee42-47f5-a37c-1539c1bb57b1.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00000-a8bac363-ee42-47f5-a37c-1539c1bb57b1.c000.snappy.parquet.crc
deleted file mode 100644
index e0123ca128f..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00000-a8bac363-ee42-47f5-a37c-1539c1bb57b1.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00001-7e34b80c-8fe9-466b-b8e2-817f80097b3b.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00001-7e34b80c-8fe9-466b-b8e2-817f80097b3b.c000.snappy.parquet.crc
deleted file mode 100644
index 065f09eab7a..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00001-7e34b80c-8fe9-466b-b8e2-817f80097b3b.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00001-cebe56e9-0e6f-4fe8-8135-23184ffdc617.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00001-cebe56e9-0e6f-4fe8-8135-23184ffdc617.c000.snappy.parquet.crc
deleted file mode 100644
index 8688bc7218d..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/.part-00001-cebe56e9-0e6f-4fe8-8135-23184ffdc617.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00000-8dcd9986-b57d-41e5-afe4-658c02e1aeb5.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00000-8dcd9986-b57d-41e5-afe4-658c02e1aeb5.c000.snappy.parquet
deleted file mode 100644
index 83d3695feb6..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00000-8dcd9986-b57d-41e5-afe4-658c02e1aeb5.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00000-a8bac363-ee42-47f5-a37c-1539c1bb57b1.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00000-a8bac363-ee42-47f5-a37c-1539c1bb57b1.c000.snappy.parquet
deleted file mode 100644
index 53b9a8b10aa..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00000-a8bac363-ee42-47f5-a37c-1539c1bb57b1.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00001-7e34b80c-8fe9-466b-b8e2-817f80097b3b.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00001-7e34b80c-8fe9-466b-b8e2-817f80097b3b.c000.snappy.parquet
deleted file mode 100644
index 0fe5f31b711..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00001-7e34b80c-8fe9-466b-b8e2-817f80097b3b.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00001-cebe56e9-0e6f-4fe8-8135-23184ffdc617.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00001-cebe56e9-0e6f-4fe8-8135-23184ffdc617.c000.snappy.parquet
deleted file mode 100644
index b43afdfcd30..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=americas%2Funited_states%2Fsan_francisco/part-00001-cebe56e9-0e6f-4fe8-8135-23184ffdc617.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00000-714ed689-3609-424f-acd2-d2bab8e66748.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00000-714ed689-3609-424f-acd2-d2bab8e66748.c000.snappy.parquet.crc
deleted file mode 100644
index 6756a13f94b..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00000-714ed689-3609-424f-acd2-d2bab8e66748.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00000-db7e2844-bba1-41e9-841b-22762fcfc509.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00000-db7e2844-bba1-41e9-841b-22762fcfc509.c000.snappy.parquet.crc
deleted file mode 100644
index c099f0af8e4..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00000-db7e2844-bba1-41e9-841b-22762fcfc509.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00001-a3499b25-46da-463a-9527-a3dcd269f99e.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00001-a3499b25-46da-463a-9527-a3dcd269f99e.c000.snappy.parquet.crc
deleted file mode 100644
index 73d821f134b..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00001-a3499b25-46da-463a-9527-a3dcd269f99e.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00001-cbd68744-0f7d-45c7-8ca0-7594340b2c66.c000.snappy.parquet.crc b/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00001-cbd68744-0f7d-45c7-8ca0-7594340b2c66.c000.snappy.parquet.crc
deleted file mode 100644
index 48b7b139c7a..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/.part-00001-cbd68744-0f7d-45c7-8ca0-7594340b2c66.c000.snappy.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00000-714ed689-3609-424f-acd2-d2bab8e66748.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00000-714ed689-3609-424f-acd2-d2bab8e66748.c000.snappy.parquet
deleted file mode 100644
index 4fde2de24ac..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00000-714ed689-3609-424f-acd2-d2bab8e66748.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00000-db7e2844-bba1-41e9-841b-22762fcfc509.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00000-db7e2844-bba1-41e9-841b-22762fcfc509.c000.snappy.parquet
deleted file mode 100644
index d936d431527..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00000-db7e2844-bba1-41e9-841b-22762fcfc509.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00001-a3499b25-46da-463a-9527-a3dcd269f99e.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00001-a3499b25-46da-463a-9527-a3dcd269f99e.c000.snappy.parquet
deleted file mode 100644
index 8f9e97a5287..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00001-a3499b25-46da-463a-9527-a3dcd269f99e.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00001-cbd68744-0f7d-45c7-8ca0-7594340b2c66.c000.snappy.parquet b/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00001-cbd68744-0f7d-45c7-8ca0-7594340b2c66.c000.snappy.parquet
deleted file mode 100644
index 6c82903dc90..00000000000
Binary files a/tests/integration/test_storage_delta/test_table/partitionpath=asia%2Findia%2Fchennai/part-00001-cbd68744-0f7d-45c7-8ca0-7594340b2c66.c000.snappy.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index d4752d6cf2e..edf5344e887 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -788,6 +788,7 @@ def test_schema_inference_cache(started_cluster):
 
 
 def test_hdfsCluster_skip_unavailable_shards(started_cluster):
+    # Although skip_unavailable_shards is not set, cluster table functions should always skip unavailable shards.
     hdfs_api = started_cluster.hdfs_api
     node = started_cluster.instances["node1"]
     data = "1\tSerialize\t555.222\n2\tData\t777.333\n"
@@ -801,16 +802,18 @@ def test_hdfsCluster_skip_unavailable_shards(started_cluster):
     )
 
 
-def test_hdfsCluster_unskip_unavailable_shards(started_cluster):
+def test_hdfsCluster_unset_skip_unavailable_shards(started_cluster):
     hdfs_api = started_cluster.hdfs_api
     node = started_cluster.instances["node1"]
     data = "1\tSerialize\t555.222\n2\tData\t777.333\n"
     hdfs_api.write_data("/unskip_unavailable_shards", data)
-    error = node.query_and_get_error(
-        "select * from hdfsCluster('cluster_non_existent_port', 'hdfs://hdfs1:9000/unskip_unavailable_shards', 'TSV', 'id UInt64, text String, number Float64')"
-    )
 
-    assert "NETWORK_ERROR" in error
+    assert (
+        node1.query(
+            "select * from hdfsCluster('cluster_non_existent_port', 'hdfs://hdfs1:9000/skip_unavailable_shards', 'TSV', 'id UInt64, text String, number Float64')"
+        )
+        == data
+    )
 
 
 if __name__ == "__main__":
diff --git a/tests/integration/test_storage_hudi/configs/config.d/named_collections.xml b/tests/integration/test_storage_hudi/configs/config.d/named_collections.xml
new file mode 100644
index 00000000000..d4c54e2d13d
--- /dev/null
+++ b/tests/integration/test_storage_hudi/configs/config.d/named_collections.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+  <named_collections>
+    <s3>
+        <url>http://minio1:9001/root/</url>
+        <access_key_id>minio</access_key_id>
+        <secret_access_key>minio123</secret_access_key>
+    </s3>
+  </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_storage_hudi/test.py b/tests/integration/test_storage_hudi/test.py
index 3328f859406..de9cde43609 100644
--- a/tests/integration/test_storage_hudi/test.py
+++ b/tests/integration/test_storage_hudi/test.py
@@ -1,75 +1,58 @@
 import logging
+import pytest
 import os
 import json
 
 import helpers.client
-import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import TSV
+from helpers.s3_tools import prepare_s3_bucket, upload_directory, get_file_contents
+
+import pyspark
+from pyspark.sql.types import (
+    StructType,
+    StructField,
+    StringType,
+    IntegerType,
+    DateType,
+    TimestampType,
+    BooleanType,
+    ArrayType,
+)
+from pyspark.sql.functions import current_timestamp
+from datetime import datetime
+from pyspark.sql.functions import monotonically_increasing_id, row_number
+from pyspark.sql.window import Window
+
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 
-def prepare_s3_bucket(started_cluster):
-    bucket_read_write_policy = {
-        "Version": "2012-10-17",
-        "Statement": [
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:GetBucketLocation",
-                "Resource": "arn:aws:s3:::root",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:ListBucket",
-                "Resource": "arn:aws:s3:::root",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:GetObject",
-                "Resource": "arn:aws:s3:::root/*",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:PutObject",
-                "Resource": "arn:aws:s3:::root/*",
-            },
-        ],
-    }
-
-    minio_client = started_cluster.minio_client
-    minio_client.set_bucket_policy(
-        started_cluster.minio_bucket, json.dumps(bucket_read_write_policy)
+def get_spark():
+    builder = (
+        pyspark.sql.SparkSession.builder.appName("spark_test")
+        .config(
+            "org.apache.spark.sql.hudi.catalog.HoodieCatalog",
+        )
+        .config("spark.serializer", "org.apache.spark.serializer.KryoSerializer")
+        .config(
+            "spark.sql.catalog.local", "org.apache.spark.sql.hudi.catalog.HoodieCatalog"
+        )
+        .config("spark.driver.memory", "20g")
+        .master("local")
     )
-
-
-def upload_test_table(started_cluster):
-    bucket = started_cluster.minio_bucket
-
-    for address, dirs, files in os.walk(SCRIPT_DIR + "/test_table"):
-        address_without_prefix = address[len(SCRIPT_DIR) :]
-
-        for name in files:
-            started_cluster.minio_client.fput_object(
-                bucket,
-                os.path.join(address_without_prefix, name),
-                os.path.join(address, name),
-            )
+    return builder.getOrCreate()
 
 
 @pytest.fixture(scope="module")
 def started_cluster():
+    cluster = ClickHouseCluster(__file__, with_spark=True)
     try:
-        cluster = ClickHouseCluster(__file__)
-        cluster.add_instance("main_server", with_minio=True)
+        cluster.add_instance(
+            "node1",
+            main_configs=["configs/config.d/named_collections.xml"],
+            with_minio=True,
+        )
 
         logging.info("Starting cluster...")
         cluster.start()
@@ -77,8 +60,7 @@ def started_cluster():
         prepare_s3_bucket(cluster)
         logging.info("S3 bucket created")
 
-        upload_test_table(cluster)
-        logging.info("Test table uploaded")
+        cluster.spark_session = get_spark()
 
         yield cluster
 
@@ -96,108 +78,237 @@ def run_query(instance, query, stdin=None, settings=None):
     return result
 
 
-def test_create_query(started_cluster):
-    instance = started_cluster.instances["main_server"]
+def write_hudi_from_df(spark, table_name, df, result_path, mode="overwrite"):
+    if mode is "overwrite":
+        hudi_write_mode = "insert_overwrite"
+    else:
+        hudi_write_mode = "upsert"
+
+    df.write.mode(mode).option("compression", "none").option(
+        "compression", "none"
+    ).format("hudi").option("hoodie.table.name", table_name).option(
+        "hoodie.datasource.write.partitionpath.field", "partitionpath"
+    ).option(
+        "hoodie.datasource.write.table.name", table_name
+    ).option(
+        "hoodie.datasource.write.operation", hudi_write_mode
+    ).option(
+        "hoodie.datasource.compaction.async.enable", "true"
+    ).option(
+        "hoodie.compact.inline", "false"
+    ).option(
+        "hoodie.compact.inline.max.delta.commits", "10"
+    ).option(
+        "hoodie.parquet.compression.codec", "snappy"
+    ).option(
+        "hoodie.hfile.compression.algorithm", "uncompressed"
+    ).option(
+        "hoodie.datasource.write.recordkey.field", "a"
+    ).option(
+        "hoodie.datasource.write.precombine.field", "a"
+    ).save(
+        result_path
+    )
+
+
+def write_hudi_from_file(spark, table_name, path, result_path):
+    spark.conf.set("spark.sql.debug.maxToStringFields", 100000)
+    df = spark.read.load(f"file://{path}")
+    write_hudi_from_df(spark, table_name, df, result_path)
+
+
+def generate_data(spark, start, end, append=1):
+    a = spark.range(start, end, 1).toDF("a")
+    b = spark.range(start + append, end + append, 1).toDF("b")
+    b = b.withColumn("b", b["b"].cast(StringType()))
+
+    a = a.withColumn(
+        "row_index", row_number().over(Window.orderBy(monotonically_increasing_id()))
+    )
+    b = b.withColumn(
+        "row_index", row_number().over(Window.orderBy(monotonically_increasing_id()))
+    )
+
+    df = a.join(b, on=["row_index"]).drop("row_index")
+    return df
+
+
+def create_hudi_table(node, table_name):
+    node.query(
+        f"""
+        DROP TABLE IF EXISTS {table_name};
+        CREATE TABLE {table_name}
+        ENGINE=Hudi(s3, filename = '{table_name}/')"""
+    )
+
+
+def create_initial_data_file(
+    cluster, node, query, table_name, compression_method="none"
+):
+    node.query(
+        f"""
+        INSERT INTO TABLE FUNCTION
+            file('{table_name}.parquet')
+        SETTINGS
+            output_format_parquet_compression_method='{compression_method}',
+            s3_truncate_on_insert=1 {query}
+        FORMAT Parquet"""
+    )
+    user_files_path = os.path.join(
+        SCRIPT_DIR, f"{cluster.instances_dir_name}/node1/database/user_files"
+    )
+    result_path = f"{user_files_path}/{table_name}.parquet"
+    return result_path
+
+
+def test_single_hudi_file(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_single_hudi_file"
 
-    create_query = f"""CREATE TABLE hudi ENGINE=Hudi('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/test_table/', 'minio', 'minio123')"""
+    inserted_data = "SELECT number as a, toString(number) as b FROM numbers(100)"
+    parquet_data_path = create_initial_data_file(
+        started_cluster, instance, inserted_data, TABLE_NAME
+    )
 
-    run_query(instance, create_query)
+    write_hudi_from_file(spark, TABLE_NAME, parquet_data_path, f"/{TABLE_NAME}")
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert len(files) == 1
+    assert files[0].endswith(".parquet")
+
+    create_hudi_table(instance, TABLE_NAME)
+    assert instance.query(f"SELECT a, b FROM {TABLE_NAME}") == instance.query(
+        inserted_data
+    )
 
 
-def test_select_query(started_cluster):
-    instance = started_cluster.instances["main_server"]
+def test_multiple_hudi_files(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    columns = [
-        "_hoodie_commit_time",
-        "_hoodie_commit_seqno",
-        "_hoodie_record_key",
-        "_hoodie_partition_path",
-        "_hoodie_file_name",
-        "begin_lat",
-        "begin_lon",
-        "driver",
-        "end_lat",
-        "end_lon",
-        "fare",
-        "partitionpath",
-        "rider",
-        "ts",
-        "uuid",
+    TABLE_NAME = "test_multiple_hudi_files"
+
+    write_hudi_from_df(
+        spark, TABLE_NAME, generate_data(spark, 0, 100), f"/{TABLE_NAME}"
+    )
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert len(files) == 1
+
+    create_hudi_table(instance, TABLE_NAME)
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
+
+    write_hudi_from_df(
+        spark,
+        TABLE_NAME,
+        generate_data(spark, 100, 200),
+        f"/{TABLE_NAME}",
+        mode="append",
+    )
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert len(files) == 2
+
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 200
+    assert instance.query(
+        f"SELECT a, b FROM {TABLE_NAME} ORDER BY 1"
+    ) == instance.query("SELECT number, toString(number + 1) FROM numbers(200)")
+
+    write_hudi_from_df(
+        spark,
+        TABLE_NAME,
+        generate_data(spark, 100, 300),
+        f"/{TABLE_NAME}",
+        mode="append",
+    )
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert len(files) == 3
+
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 300
+    assert instance.query(
+        f"SELECT a, b FROM {TABLE_NAME} ORDER BY 1"
+    ) == instance.query("SELECT number, toString(number + 1) FROM numbers(300)")
+
+    assert int(instance.query(f"SELECT b FROM {TABLE_NAME} WHERE a = 100")) == 101
+    write_hudi_from_df(
+        spark,
+        TABLE_NAME,
+        generate_data(spark, 100, 101, append=0),
+        f"/{TABLE_NAME}",
+        mode="append",
+    )
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 300
+    assert int(instance.query(f"SELECT b FROM {TABLE_NAME} WHERE a = 100")) == 100
+
+    write_hudi_from_df(
+        spark,
+        TABLE_NAME,
+        generate_data(spark, 100, 1000000, append=0),
+        f"/{TABLE_NAME}",
+        mode="append",
+    )
+    files = upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 1000000
+
+
+def test_types(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_types"
+
+    data = [
+        (
+            123,
+            "string",
+            datetime.strptime("2000-01-01", "%Y-%m-%d"),
+            ["str1", "str2"],
+            True,
+        )
     ]
+    schema = StructType(
+        [
+            StructField("a", IntegerType()),
+            StructField("b", StringType()),
+            StructField("c", DateType()),
+            StructField("d", ArrayType(StringType())),
+            StructField("e", BooleanType()),
+        ]
+    )
+    df = spark.createDataFrame(data=data, schema=schema)
+    df.printSchema()
+    write_hudi_from_df(spark, TABLE_NAME, df, f"/{TABLE_NAME}", mode="overwrite")
 
-    # create query in case table doesn't exist
-    create_query = f"""CREATE TABLE IF NOT EXISTS hudi ENGINE=Hudi('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/test_table/', 'minio', 'minio123')"""
+    upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
 
-    run_query(instance, create_query)
-
-    select_query = "SELECT {} FROM hudi FORMAT TSV"
-
-    select_table_function_query = "SELECT {col} FROM hudi('http://{ip}:{port}/{bucket}/test_table/', 'minio', 'minio123') FORMAT TSV"
-
-    for column_name in columns:
-        result = run_query(instance, select_query.format(column_name)).splitlines()
-        assert len(result) > 0
-
-    for column_name in columns:
-        result = run_query(
-            instance,
-            select_table_function_query.format(
-                col=column_name,
-                ip=started_cluster.minio_ip,
-                port=started_cluster.minio_port,
-                bucket=bucket,
-            ),
-        ).splitlines()
-        assert len(result) > 0
-
-    # test if all partition paths is presented in result
-    distinct_select_query = (
-        "SELECT DISTINCT partitionpath FROM hudi ORDER BY partitionpath FORMAT TSV"
+    create_hudi_table(instance, TABLE_NAME)
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 1
+    assert (
+        instance.query(f"SELECT a, b, c, d, e FROM {TABLE_NAME}").strip()
+        == "123\tstring\t2000-01-01\t['str1','str2']\ttrue"
     )
 
-    distinct_select_table_function_query = "SELECT DISTINCT partitionpath FROM hudi('http://{ip}:{port}/{bucket}/test_table/', 'minio', 'minio123') ORDER BY partitionpath FORMAT TSV"
-
-    result = run_query(instance, distinct_select_query)
-    result_table_function = run_query(
-        instance,
-        distinct_select_table_function_query.format(
-            ip=started_cluster.minio_ip, port=started_cluster.minio_port, bucket=bucket
-        ),
-    )
-    expected = [
-        "americas/brazil/sao_paulo",
-        "americas/united_states/san_francisco",
-        "asia/india/chennai",
-    ]
-
-    assert TSV(result) == TSV(expected)
-    assert TSV(result_table_function) == TSV(expected)
-
-
-def test_describe_query(started_cluster):
-    instance = started_cluster.instances["main_server"]
-    bucket = started_cluster.minio_bucket
-    result = instance.query(
-        f"DESCRIBE hudi('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/test_table/', 'minio', 'minio123') FORMAT TSV",
+    table_function = f"hudi(s3, filename='{TABLE_NAME}/')"
+    assert (
+        instance.query(f"SELECT a, b, c, d, e FROM {table_function}").strip()
+        == "123\tstring\t2000-01-01\t['str1','str2']\ttrue"
     )
 
-    assert result == TSV(
+    assert instance.query(f"DESCRIBE {table_function} FORMAT TSV") == TSV(
         [
             ["_hoodie_commit_time", "Nullable(String)"],
             ["_hoodie_commit_seqno", "Nullable(String)"],
             ["_hoodie_record_key", "Nullable(String)"],
             ["_hoodie_partition_path", "Nullable(String)"],
             ["_hoodie_file_name", "Nullable(String)"],
-            ["begin_lat", "Nullable(Float64)"],
-            ["begin_lon", "Nullable(Float64)"],
-            ["driver", "Nullable(String)"],
-            ["end_lat", "Nullable(Float64)"],
-            ["end_lon", "Nullable(Float64)"],
-            ["fare", "Nullable(Float64)"],
-            ["partitionpath", "Nullable(String)"],
-            ["rider", "Nullable(String)"],
-            ["ts", "Nullable(Int64)"],
-            ["uuid", "Nullable(String)"],
+            ["a", "Nullable(Int32)"],
+            ["b", "Nullable(String)"],
+            ["c", "Nullable(Date32)"],
+            ["d", "Array(Nullable(String))"],
+            ["e", "Nullable(Bool)"],
         ]
     )
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/.20220830083647456.commit.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/.20220830083647456.commit.crc
deleted file mode 100644
index 4bba97b9515..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/.20220830083647456.commit.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/.20220830083647456.commit.requested.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/.20220830083647456.commit.requested.crc
deleted file mode 100644
index 3b7b044936a..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/.20220830083647456.commit.requested.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/.20220830083647456.inflight.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/.20220830083647456.inflight.crc
deleted file mode 100644
index 21984c840bc..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/.20220830083647456.inflight.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/.hoodie.properties.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/.hoodie.properties.crc
deleted file mode 100644
index f67f76b7101..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/.hoodie.properties.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/20220830083647456.commit b/tests/integration/test_storage_hudi/test_table/.hoodie/20220830083647456.commit
deleted file mode 100644
index f8d6c248f49..00000000000
--- a/tests/integration/test_storage_hudi/test_table/.hoodie/20220830083647456.commit
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "partitionToWriteStats" : {
-    "americas/brazil/sao_paulo" : [ {
-      "fileId" : "8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0",
-      "path" : "americas/brazil/sao_paulo/8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0_0-73-83_20220830083647456.parquet",
-      "prevCommit" : "null",
-      "numWrites" : 3,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 0,
-      "numInserts" : 3,
-      "totalWriteBytes" : 437831,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : "americas/brazil/sao_paulo",
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 437831,
-      "minEventTime" : null,
-      "maxEventTime" : null
-    } ],
-    "americas/united_states/san_francisco" : [ {
-      "fileId" : "34b1b177-f0af-467b-9214-473ead268e55-0",
-      "path" : "americas/united_states/san_francisco/34b1b177-f0af-467b-9214-473ead268e55-0_1-73-84_20220830083647456.parquet",
-      "prevCommit" : "null",
-      "numWrites" : 5,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 0,
-      "numInserts" : 5,
-      "totalWriteBytes" : 438186,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : "americas/united_states/san_francisco",
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 438186,
-      "minEventTime" : null,
-      "maxEventTime" : null
-    } ],
-    "asia/india/chennai" : [ {
-      "fileId" : "92aa634e-d83f-4057-a385-ea3b22e5d6e1-0",
-      "path" : "asia/india/chennai/92aa634e-d83f-4057-a385-ea3b22e5d6e1-0_2-73-85_20220830083647456.parquet",
-      "prevCommit" : "null",
-      "numWrites" : 2,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 0,
-      "numInserts" : 2,
-      "totalWriteBytes" : 437623,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : "asia/india/chennai",
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 437623,
-      "minEventTime" : null,
-      "maxEventTime" : null
-    } ]
-  },
-  "compacted" : false,
-  "extraMetadata" : {
-    "schema" : "{\"type\":\"record\",\"name\":\"test_table_record\",\"namespace\":\"hoodie.test_table\",\"fields\":[{\"name\":\"begin_lat\",\"type\":[\"null\",\"double\"],\"default\":null},{\"name\":\"begin_lon\",\"type\":[\"null\",\"double\"],\"default\":null},{\"name\":\"driver\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"end_lat\",\"type\":[\"null\",\"double\"],\"default\":null},{\"name\":\"end_lon\",\"type\":[\"null\",\"double\"],\"default\":null},{\"name\":\"fare\",\"type\":[\"null\",\"double\"],\"default\":null},{\"name\":\"partitionpath\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"rider\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"ts\",\"type\":[\"null\",\"long\"],\"default\":null},{\"name\":\"uuid\",\"type\":[\"null\",\"string\"],\"default\":null}]}"
-  },
-  "operationType" : "UPSERT",
-  "writeStats" : [ {
-    "fileId" : "8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0",
-    "path" : "americas/brazil/sao_paulo/8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0_0-73-83_20220830083647456.parquet",
-    "prevCommit" : "null",
-    "numWrites" : 3,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 0,
-    "numInserts" : 3,
-    "totalWriteBytes" : 437831,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : "americas/brazil/sao_paulo",
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 437831,
-    "minEventTime" : null,
-    "maxEventTime" : null
-  }, {
-    "fileId" : "34b1b177-f0af-467b-9214-473ead268e55-0",
-    "path" : "americas/united_states/san_francisco/34b1b177-f0af-467b-9214-473ead268e55-0_1-73-84_20220830083647456.parquet",
-    "prevCommit" : "null",
-    "numWrites" : 5,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 0,
-    "numInserts" : 5,
-    "totalWriteBytes" : 438186,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : "americas/united_states/san_francisco",
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 438186,
-    "minEventTime" : null,
-    "maxEventTime" : null
-  }, {
-    "fileId" : "92aa634e-d83f-4057-a385-ea3b22e5d6e1-0",
-    "path" : "asia/india/chennai/92aa634e-d83f-4057-a385-ea3b22e5d6e1-0_2-73-85_20220830083647456.parquet",
-    "prevCommit" : "null",
-    "numWrites" : 2,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 0,
-    "numInserts" : 2,
-    "totalWriteBytes" : 437623,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : "asia/india/chennai",
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 437623,
-    "minEventTime" : null,
-    "maxEventTime" : null
-  } ],
-  "totalRecordsDeleted" : 0,
-  "totalLogRecordsCompacted" : 0,
-  "totalLogFilesCompacted" : 0,
-  "totalCompactedRecordsUpdated" : 0,
-  "totalLogFilesSize" : 0,
-  "totalScanTime" : 0,
-  "totalCreateTime" : 563,
-  "totalUpsertTime" : 0,
-  "minAndMaxEventTime" : {
-    "Optional.empty" : {
-      "val" : null,
-      "present" : false
-    }
-  },
-  "writePartitionPaths" : [ "americas/brazil/sao_paulo", "americas/united_states/san_francisco", "asia/india/chennai" ],
-  "fileIdAndRelativePaths" : {
-    "92aa634e-d83f-4057-a385-ea3b22e5d6e1-0" : "asia/india/chennai/92aa634e-d83f-4057-a385-ea3b22e5d6e1-0_2-73-85_20220830083647456.parquet",
-    "34b1b177-f0af-467b-9214-473ead268e55-0" : "americas/united_states/san_francisco/34b1b177-f0af-467b-9214-473ead268e55-0_1-73-84_20220830083647456.parquet",
-    "8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0" : "americas/brazil/sao_paulo/8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0_0-73-83_20220830083647456.parquet"
-  }
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/20220830083647456.inflight b/tests/integration/test_storage_hudi/test_table/.hoodie/20220830083647456.inflight
deleted file mode 100644
index f5ef5c92c2b..00000000000
--- a/tests/integration/test_storage_hudi/test_table/.hoodie/20220830083647456.inflight
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "partitionToWriteStats" : {
-    "americas/brazil/sao_paulo" : [ {
-      "fileId" : "",
-      "path" : null,
-      "prevCommit" : "null",
-      "numWrites" : 0,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 0,
-      "numInserts" : 3,
-      "totalWriteBytes" : 0,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : null,
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 0,
-      "minEventTime" : null,
-      "maxEventTime" : null
-    } ],
-    "americas/united_states/san_francisco" : [ {
-      "fileId" : "",
-      "path" : null,
-      "prevCommit" : "null",
-      "numWrites" : 0,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 0,
-      "numInserts" : 5,
-      "totalWriteBytes" : 0,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : null,
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 0,
-      "minEventTime" : null,
-      "maxEventTime" : null
-    } ],
-    "asia/india/chennai" : [ {
-      "fileId" : "",
-      "path" : null,
-      "prevCommit" : "null",
-      "numWrites" : 0,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 0,
-      "numInserts" : 2,
-      "totalWriteBytes" : 0,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : null,
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 0,
-      "minEventTime" : null,
-      "maxEventTime" : null
-    } ]
-  },
-  "compacted" : false,
-  "extraMetadata" : { },
-  "operationType" : "UPSERT",
-  "writeStats" : [ {
-    "fileId" : "",
-    "path" : null,
-    "prevCommit" : "null",
-    "numWrites" : 0,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 0,
-    "numInserts" : 3,
-    "totalWriteBytes" : 0,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : null,
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 0,
-    "minEventTime" : null,
-    "maxEventTime" : null
-  }, {
-    "fileId" : "",
-    "path" : null,
-    "prevCommit" : "null",
-    "numWrites" : 0,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 0,
-    "numInserts" : 5,
-    "totalWriteBytes" : 0,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : null,
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 0,
-    "minEventTime" : null,
-    "maxEventTime" : null
-  }, {
-    "fileId" : "",
-    "path" : null,
-    "prevCommit" : "null",
-    "numWrites" : 0,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 0,
-    "numInserts" : 2,
-    "totalWriteBytes" : 0,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : null,
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 0,
-    "minEventTime" : null,
-    "maxEventTime" : null
-  } ],
-  "totalRecordsDeleted" : 0,
-  "totalLogRecordsCompacted" : 0,
-  "totalLogFilesCompacted" : 0,
-  "totalCompactedRecordsUpdated" : 0,
-  "totalLogFilesSize" : 0,
-  "totalScanTime" : 0,
-  "totalCreateTime" : 0,
-  "totalUpsertTime" : 0,
-  "minAndMaxEventTime" : {
-    "Optional.empty" : {
-      "val" : null,
-      "present" : false
-    }
-  },
-  "writePartitionPaths" : [ "americas/brazil/sao_paulo", "americas/united_states/san_francisco", "asia/india/chennai" ],
-  "fileIdAndRelativePaths" : {
-    "" : null
-  }
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/hoodie.properties b/tests/integration/test_storage_hudi/test_table/.hoodie/hoodie.properties
deleted file mode 100644
index 9ae364baf33..00000000000
--- a/tests/integration/test_storage_hudi/test_table/.hoodie/hoodie.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#Updated at 2022-08-30T08:36:49.089844Z
-#Tue Aug 30 08:36:49 UTC 2022
-hoodie.table.type=COPY_ON_WRITE
-hoodie.table.metadata.partitions=files
-hoodie.table.precombine.field=ts
-hoodie.table.partition.fields=partitionpath
-hoodie.archivelog.folder=archived
-hoodie.timeline.layout.version=1
-hoodie.table.checksum=2702201862
-hoodie.datasource.write.drop.partition.columns=false
-hoodie.table.timeline.timezone=LOCAL
-hoodie.table.recordkey.fields=uuid
-hoodie.table.name=test_table
-hoodie.partition.metafile.use.base.format=false
-hoodie.datasource.write.hive_style_partitioning=false
-hoodie.populate.meta.fields=true
-hoodie.table.keygenerator.class=org.apache.hudi.keygen.SimpleKeyGenerator
-hoodie.table.base.file.format=PARQUET
-hoodie.database.name=
-hoodie.datasource.write.partitionpath.urlencode=false
-hoodie.table.version=5
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.00000000000000.deltacommit.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.00000000000000.deltacommit.crc
deleted file mode 100644
index 352b882ec5a..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.00000000000000.deltacommit.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.00000000000000.deltacommit.inflight.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.00000000000000.deltacommit.inflight.crc
deleted file mode 100644
index b6b8f7fc1a3..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.00000000000000.deltacommit.inflight.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.00000000000000.deltacommit.requested.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.00000000000000.deltacommit.requested.crc
deleted file mode 100644
index 3b7b044936a..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.00000000000000.deltacommit.requested.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.20220830083647456.deltacommit.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.20220830083647456.deltacommit.crc
deleted file mode 100644
index 54abc5e9b72..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.20220830083647456.deltacommit.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.20220830083647456.deltacommit.inflight.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.20220830083647456.deltacommit.inflight.crc
deleted file mode 100644
index ec7cb5faf56..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.20220830083647456.deltacommit.inflight.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.20220830083647456.deltacommit.requested.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.20220830083647456.deltacommit.requested.crc
deleted file mode 100644
index 3b7b044936a..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.20220830083647456.deltacommit.requested.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.hoodie.properties.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.hoodie.properties.crc
deleted file mode 100644
index 509ae4501ee..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/.hoodie.properties.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/00000000000000.deltacommit b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/00000000000000.deltacommit
deleted file mode 100644
index 6d22af6dd2e..00000000000
--- a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/00000000000000.deltacommit
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "partitionToWriteStats" : {
-    "files" : [ {
-      "fileId" : "files-0000",
-      "path" : "files/.files-0000_00000000000000.log.1_0-52-57",
-      "prevCommit" : "00000000000000",
-      "numWrites" : 1,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 1,
-      "numInserts" : 0,
-      "totalWriteBytes" : 10928,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : "files",
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 10928,
-      "minEventTime" : null,
-      "maxEventTime" : null,
-      "logVersion" : 1,
-      "logOffset" : 0,
-      "baseFile" : "",
-      "logFiles" : [ ".files-0000_00000000000000.log.1_0-52-57" ],
-      "recordsStats" : {
-        "val" : null,
-        "present" : false
-      },
-      "columnStats" : {
-        "val" : null,
-        "present" : false
-      }
-    } ]
-  },
-  "compacted" : false,
-  "extraMetadata" : {
-    "schema" : "{\"type\":\"record\",\"name\":\"HoodieMetadataRecord\",\"namespace\":\"org.apache.hudi.avro.model\",\"doc\":\"A record saved within the Metadata Table\",\"fields\":[{\"name\":\"key\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"type\",\"type\":\"int\",\"doc\":\"Type of the metadata record\"},{\"name\":\"filesystemMetadata\",\"type\":[\"null\",{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"HoodieMetadataFileInfo\",\"fields\":[{\"name\":\"size\",\"type\":\"long\",\"doc\":\"Size of the file\"},{\"name\":\"isDeleted\",\"type\":\"boolean\",\"doc\":\"True if this file has been deleted\"}]},\"avro.java.string\":\"String\"}],\"doc\":\"Contains information about partitions and files within the dataset\"},{\"name\":\"BloomFilterMetadata\",\"type\":[\"null\",{\"type\":\"record\",\"name\":\"HoodieMetadataBloomFilter\",\"doc\":\"Data file bloom filter details\",\"fields\":[{\"name\":\"type\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"Bloom filter type code\"},{\"name\":\"timestamp\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"Instant timestamp when this metadata was created/updated\"},{\"name\":\"bloomFilter\",\"type\":\"bytes\",\"doc\":\"Bloom filter binary byte array\"},{\"name\":\"isDeleted\",\"type\":\"boolean\",\"doc\":\"Bloom filter entry valid/deleted flag\"}]}],\"doc\":\"Metadata Index of bloom filters for all data files in the user table\",\"default\":null},{\"name\":\"ColumnStatsMetadata\",\"type\":[\"null\",{\"type\":\"record\",\"name\":\"HoodieMetadataColumnStats\",\"doc\":\"Data file column statistics\",\"fields\":[{\"name\":\"fileName\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"doc\":\"File name for which this column statistics applies\",\"default\":null},{\"name\":\"columnName\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"doc\":\"Column name for which this column statistics applies\",\"default\":null},{\"name\":\"minValue\",\"type\":[\"null\",{\"type\":\"record\",\"name\":\"BooleanWrapper\",\"doc\":\"A record wrapping boolean type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"boolean\"}]},{\"type\":\"record\",\"name\":\"IntWrapper\",\"doc\":\"A record wrapping int type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"int\"}]},{\"type\":\"record\",\"name\":\"LongWrapper\",\"doc\":\"A record wrapping long type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"long\"}]},{\"type\":\"record\",\"name\":\"FloatWrapper\",\"doc\":\"A record wrapping float type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"float\"}]},{\"type\":\"record\",\"name\":\"DoubleWrapper\",\"doc\":\"A record wrapping double type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"double\"}]},{\"type\":\"record\",\"name\":\"BytesWrapper\",\"doc\":\"A record wrapping bytes type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"bytes\"}]},{\"type\":\"record\",\"name\":\"StringWrapper\",\"doc\":\"A record wrapping string type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}}]},{\"type\":\"record\",\"name\":\"DateWrapper\",\"doc\":\"A record wrapping Date logical type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"int\"}]},{\"type\":\"record\",\"name\":\"DecimalWrapper\",\"doc\":\"A record wrapping Decimal logical type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":{\"type\":\"bytes\",\"logicalType\":\"decimal\",\"precision\":30,\"scale\":15}}]},{\"type\":\"record\",\"name\":\"TimeMicrosWrapper\",\"doc\":\"A record wrapping Time-micros logical type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":{\"type\":\"long\",\"logicalType\":\"time-micros\"}}]},{\"type\":\"record\",\"name\":\"TimestampMicrosWrapper\",\"doc\":\"A record wrapping Timestamp-micros logical type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"long\"}]}],\"doc\":\"Minimum value in the range. Based on user data table schema, we can convert this to appropriate type\",\"default\":null},{\"name\":\"maxValue\",\"type\":[\"null\",\"BooleanWrapper\",\"IntWrapper\",\"LongWrapper\",\"FloatWrapper\",\"DoubleWrapper\",\"BytesWrapper\",\"StringWrapper\",\"DateWrapper\",\"DecimalWrapper\",\"TimeMicrosWrapper\",\"TimestampMicrosWrapper\"],\"doc\":\"Maximum value in the range. Based on user data table schema, we can convert it to appropriate type\",\"default\":null},{\"name\":\"valueCount\",\"type\":[\"null\",\"long\"],\"doc\":\"Total count of values\",\"default\":null},{\"name\":\"nullCount\",\"type\":[\"null\",\"long\"],\"doc\":\"Total count of null values\",\"default\":null},{\"name\":\"totalSize\",\"type\":[\"null\",\"long\"],\"doc\":\"Total storage size on disk\",\"default\":null},{\"name\":\"totalUncompressedSize\",\"type\":[\"null\",\"long\"],\"doc\":\"Total uncompressed storage size on disk\",\"default\":null},{\"name\":\"isDeleted\",\"type\":\"boolean\",\"doc\":\"Column range entry valid/deleted flag\"}]}],\"doc\":\"Metadata Index of column statistics for all data files in the user table\",\"default\":null}]}"
-  },
-  "operationType" : "UPSERT_PREPPED",
-  "writeStats" : [ {
-    "fileId" : "files-0000",
-    "path" : "files/.files-0000_00000000000000.log.1_0-52-57",
-    "prevCommit" : "00000000000000",
-    "numWrites" : 1,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 1,
-    "numInserts" : 0,
-    "totalWriteBytes" : 10928,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : "files",
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 10928,
-    "minEventTime" : null,
-    "maxEventTime" : null,
-    "logVersion" : 1,
-    "logOffset" : 0,
-    "baseFile" : "",
-    "logFiles" : [ ".files-0000_00000000000000.log.1_0-52-57" ],
-    "recordsStats" : {
-      "val" : null,
-      "present" : false
-    },
-    "columnStats" : {
-      "val" : null,
-      "present" : false
-    }
-  } ],
-  "totalRecordsDeleted" : 0,
-  "totalLogRecordsCompacted" : 0,
-  "totalLogFilesCompacted" : 0,
-  "totalCompactedRecordsUpdated" : 0,
-  "totalLogFilesSize" : 0,
-  "totalScanTime" : 0,
-  "totalCreateTime" : 0,
-  "totalUpsertTime" : 67,
-  "minAndMaxEventTime" : {
-    "Optional.empty" : {
-      "val" : null,
-      "present" : false
-    }
-  },
-  "writePartitionPaths" : [ "files" ],
-  "fileIdAndRelativePaths" : {
-    "files-0000" : "files/.files-0000_00000000000000.log.1_0-52-57"
-  }
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/00000000000000.deltacommit.inflight b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/00000000000000.deltacommit.inflight
deleted file mode 100644
index bb2542e0186..00000000000
--- a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/00000000000000.deltacommit.inflight
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "partitionToWriteStats" : {
-    "files" : [ {
-      "fileId" : "",
-      "path" : null,
-      "prevCommit" : "null",
-      "numWrites" : 0,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 0,
-      "numInserts" : 0,
-      "totalWriteBytes" : 0,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : null,
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 0,
-      "minEventTime" : null,
-      "maxEventTime" : null
-    }, {
-      "fileId" : "files-0000",
-      "path" : null,
-      "prevCommit" : "00000000000000",
-      "numWrites" : 0,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 1,
-      "numInserts" : 0,
-      "totalWriteBytes" : 0,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : null,
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 0,
-      "minEventTime" : null,
-      "maxEventTime" : null
-    } ]
-  },
-  "compacted" : false,
-  "extraMetadata" : { },
-  "operationType" : "UPSERT_PREPPED",
-  "writeStats" : [ {
-    "fileId" : "",
-    "path" : null,
-    "prevCommit" : "null",
-    "numWrites" : 0,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 0,
-    "numInserts" : 0,
-    "totalWriteBytes" : 0,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : null,
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 0,
-    "minEventTime" : null,
-    "maxEventTime" : null
-  }, {
-    "fileId" : "files-0000",
-    "path" : null,
-    "prevCommit" : "00000000000000",
-    "numWrites" : 0,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 1,
-    "numInserts" : 0,
-    "totalWriteBytes" : 0,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : null,
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 0,
-    "minEventTime" : null,
-    "maxEventTime" : null
-  } ],
-  "totalRecordsDeleted" : 0,
-  "totalLogRecordsCompacted" : 0,
-  "totalLogFilesCompacted" : 0,
-  "totalCompactedRecordsUpdated" : 0,
-  "totalLogFilesSize" : 0,
-  "totalScanTime" : 0,
-  "totalCreateTime" : 0,
-  "totalUpsertTime" : 0,
-  "minAndMaxEventTime" : {
-    "Optional.empty" : {
-      "val" : null,
-      "present" : false
-    }
-  },
-  "writePartitionPaths" : [ "files" ],
-  "fileIdAndRelativePaths" : {
-    "" : null,
-    "files-0000" : null
-  }
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/20220830083647456.deltacommit b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/20220830083647456.deltacommit
deleted file mode 100644
index 210201f7135..00000000000
--- a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/20220830083647456.deltacommit
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "partitionToWriteStats" : {
-    "files" : [ {
-      "fileId" : "files-0000",
-      "path" : "files/.files-0000_00000000000000.log.2_0-83-93",
-      "prevCommit" : "00000000000000",
-      "numWrites" : 4,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 4,
-      "numInserts" : 0,
-      "totalWriteBytes" : 11180,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : "files",
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 11180,
-      "minEventTime" : null,
-      "maxEventTime" : null,
-      "logVersion" : 2,
-      "logOffset" : 0,
-      "baseFile" : "",
-      "logFiles" : [ ".files-0000_00000000000000.log.1_0-52-57", ".files-0000_00000000000000.log.1_0-0-0", ".files-0000_00000000000000.log.2_0-83-93" ],
-      "recordsStats" : {
-        "val" : null,
-        "present" : false
-      },
-      "columnStats" : {
-        "val" : null,
-        "present" : false
-      }
-    } ]
-  },
-  "compacted" : false,
-  "extraMetadata" : {
-    "schema" : "{\"type\":\"record\",\"name\":\"HoodieMetadataRecord\",\"namespace\":\"org.apache.hudi.avro.model\",\"doc\":\"A record saved within the Metadata Table\",\"fields\":[{\"name\":\"key\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"type\",\"type\":\"int\",\"doc\":\"Type of the metadata record\"},{\"name\":\"filesystemMetadata\",\"type\":[\"null\",{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"HoodieMetadataFileInfo\",\"fields\":[{\"name\":\"size\",\"type\":\"long\",\"doc\":\"Size of the file\"},{\"name\":\"isDeleted\",\"type\":\"boolean\",\"doc\":\"True if this file has been deleted\"}]},\"avro.java.string\":\"String\"}],\"doc\":\"Contains information about partitions and files within the dataset\"},{\"name\":\"BloomFilterMetadata\",\"type\":[\"null\",{\"type\":\"record\",\"name\":\"HoodieMetadataBloomFilter\",\"doc\":\"Data file bloom filter details\",\"fields\":[{\"name\":\"type\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"Bloom filter type code\"},{\"name\":\"timestamp\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"Instant timestamp when this metadata was created/updated\"},{\"name\":\"bloomFilter\",\"type\":\"bytes\",\"doc\":\"Bloom filter binary byte array\"},{\"name\":\"isDeleted\",\"type\":\"boolean\",\"doc\":\"Bloom filter entry valid/deleted flag\"}]}],\"doc\":\"Metadata Index of bloom filters for all data files in the user table\",\"default\":null},{\"name\":\"ColumnStatsMetadata\",\"type\":[\"null\",{\"type\":\"record\",\"name\":\"HoodieMetadataColumnStats\",\"doc\":\"Data file column statistics\",\"fields\":[{\"name\":\"fileName\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"doc\":\"File name for which this column statistics applies\",\"default\":null},{\"name\":\"columnName\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"doc\":\"Column name for which this column statistics applies\",\"default\":null},{\"name\":\"minValue\",\"type\":[\"null\",{\"type\":\"record\",\"name\":\"BooleanWrapper\",\"doc\":\"A record wrapping boolean type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"boolean\"}]},{\"type\":\"record\",\"name\":\"IntWrapper\",\"doc\":\"A record wrapping int type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"int\"}]},{\"type\":\"record\",\"name\":\"LongWrapper\",\"doc\":\"A record wrapping long type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"long\"}]},{\"type\":\"record\",\"name\":\"FloatWrapper\",\"doc\":\"A record wrapping float type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"float\"}]},{\"type\":\"record\",\"name\":\"DoubleWrapper\",\"doc\":\"A record wrapping double type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"double\"}]},{\"type\":\"record\",\"name\":\"BytesWrapper\",\"doc\":\"A record wrapping bytes type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"bytes\"}]},{\"type\":\"record\",\"name\":\"StringWrapper\",\"doc\":\"A record wrapping string type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}}]},{\"type\":\"record\",\"name\":\"DateWrapper\",\"doc\":\"A record wrapping Date logical type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"int\"}]},{\"type\":\"record\",\"name\":\"DecimalWrapper\",\"doc\":\"A record wrapping Decimal logical type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":{\"type\":\"bytes\",\"logicalType\":\"decimal\",\"precision\":30,\"scale\":15}}]},{\"type\":\"record\",\"name\":\"TimeMicrosWrapper\",\"doc\":\"A record wrapping Time-micros logical type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":{\"type\":\"long\",\"logicalType\":\"time-micros\"}}]},{\"type\":\"record\",\"name\":\"TimestampMicrosWrapper\",\"doc\":\"A record wrapping Timestamp-micros logical type to be able to be used it w/in Avro's Union\",\"fields\":[{\"name\":\"value\",\"type\":\"long\"}]}],\"doc\":\"Minimum value in the range. Based on user data table schema, we can convert this to appropriate type\",\"default\":null},{\"name\":\"maxValue\",\"type\":[\"null\",\"BooleanWrapper\",\"IntWrapper\",\"LongWrapper\",\"FloatWrapper\",\"DoubleWrapper\",\"BytesWrapper\",\"StringWrapper\",\"DateWrapper\",\"DecimalWrapper\",\"TimeMicrosWrapper\",\"TimestampMicrosWrapper\"],\"doc\":\"Maximum value in the range. Based on user data table schema, we can convert it to appropriate type\",\"default\":null},{\"name\":\"valueCount\",\"type\":[\"null\",\"long\"],\"doc\":\"Total count of values\",\"default\":null},{\"name\":\"nullCount\",\"type\":[\"null\",\"long\"],\"doc\":\"Total count of null values\",\"default\":null},{\"name\":\"totalSize\",\"type\":[\"null\",\"long\"],\"doc\":\"Total storage size on disk\",\"default\":null},{\"name\":\"totalUncompressedSize\",\"type\":[\"null\",\"long\"],\"doc\":\"Total uncompressed storage size on disk\",\"default\":null},{\"name\":\"isDeleted\",\"type\":\"boolean\",\"doc\":\"Column range entry valid/deleted flag\"}]}],\"doc\":\"Metadata Index of column statistics for all data files in the user table\",\"default\":null}]}"
-  },
-  "operationType" : "UPSERT_PREPPED",
-  "writeStats" : [ {
-    "fileId" : "files-0000",
-    "path" : "files/.files-0000_00000000000000.log.2_0-83-93",
-    "prevCommit" : "00000000000000",
-    "numWrites" : 4,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 4,
-    "numInserts" : 0,
-    "totalWriteBytes" : 11180,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : "files",
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 11180,
-    "minEventTime" : null,
-    "maxEventTime" : null,
-    "logVersion" : 2,
-    "logOffset" : 0,
-    "baseFile" : "",
-    "logFiles" : [ ".files-0000_00000000000000.log.1_0-52-57", ".files-0000_00000000000000.log.1_0-0-0", ".files-0000_00000000000000.log.2_0-83-93" ],
-    "recordsStats" : {
-      "val" : null,
-      "present" : false
-    },
-    "columnStats" : {
-      "val" : null,
-      "present" : false
-    }
-  } ],
-  "totalRecordsDeleted" : 0,
-  "totalLogRecordsCompacted" : 0,
-  "totalLogFilesCompacted" : 0,
-  "totalCompactedRecordsUpdated" : 0,
-  "totalLogFilesSize" : 0,
-  "totalScanTime" : 0,
-  "totalCreateTime" : 0,
-  "totalUpsertTime" : 39,
-  "minAndMaxEventTime" : {
-    "Optional.empty" : {
-      "val" : null,
-      "present" : false
-    }
-  },
-  "writePartitionPaths" : [ "files" ],
-  "fileIdAndRelativePaths" : {
-    "files-0000" : "files/.files-0000_00000000000000.log.2_0-83-93"
-  }
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/20220830083647456.deltacommit.inflight b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/20220830083647456.deltacommit.inflight
deleted file mode 100644
index ea1b6a10c13..00000000000
--- a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/20220830083647456.deltacommit.inflight
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "partitionToWriteStats" : {
-    "files" : [ {
-      "fileId" : "",
-      "path" : null,
-      "prevCommit" : "null",
-      "numWrites" : 0,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 0,
-      "numInserts" : 0,
-      "totalWriteBytes" : 0,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : null,
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 0,
-      "minEventTime" : null,
-      "maxEventTime" : null
-    }, {
-      "fileId" : "files-0000",
-      "path" : null,
-      "prevCommit" : "00000000000000",
-      "numWrites" : 0,
-      "numDeletes" : 0,
-      "numUpdateWrites" : 4,
-      "numInserts" : 0,
-      "totalWriteBytes" : 0,
-      "totalWriteErrors" : 0,
-      "tempPath" : null,
-      "partitionPath" : null,
-      "totalLogRecords" : 0,
-      "totalLogFilesCompacted" : 0,
-      "totalLogSizeCompacted" : 0,
-      "totalUpdatedRecordsCompacted" : 0,
-      "totalLogBlocks" : 0,
-      "totalCorruptLogBlock" : 0,
-      "totalRollbackBlocks" : 0,
-      "fileSizeInBytes" : 0,
-      "minEventTime" : null,
-      "maxEventTime" : null
-    } ]
-  },
-  "compacted" : false,
-  "extraMetadata" : { },
-  "operationType" : "UPSERT_PREPPED",
-  "writeStats" : [ {
-    "fileId" : "",
-    "path" : null,
-    "prevCommit" : "null",
-    "numWrites" : 0,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 0,
-    "numInserts" : 0,
-    "totalWriteBytes" : 0,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : null,
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 0,
-    "minEventTime" : null,
-    "maxEventTime" : null
-  }, {
-    "fileId" : "files-0000",
-    "path" : null,
-    "prevCommit" : "00000000000000",
-    "numWrites" : 0,
-    "numDeletes" : 0,
-    "numUpdateWrites" : 4,
-    "numInserts" : 0,
-    "totalWriteBytes" : 0,
-    "totalWriteErrors" : 0,
-    "tempPath" : null,
-    "partitionPath" : null,
-    "totalLogRecords" : 0,
-    "totalLogFilesCompacted" : 0,
-    "totalLogSizeCompacted" : 0,
-    "totalUpdatedRecordsCompacted" : 0,
-    "totalLogBlocks" : 0,
-    "totalCorruptLogBlock" : 0,
-    "totalRollbackBlocks" : 0,
-    "fileSizeInBytes" : 0,
-    "minEventTime" : null,
-    "maxEventTime" : null
-  } ],
-  "totalRecordsDeleted" : 0,
-  "totalLogRecordsCompacted" : 0,
-  "totalLogFilesCompacted" : 0,
-  "totalCompactedRecordsUpdated" : 0,
-  "totalLogFilesSize" : 0,
-  "totalScanTime" : 0,
-  "totalCreateTime" : 0,
-  "totalUpsertTime" : 0,
-  "minAndMaxEventTime" : {
-    "Optional.empty" : {
-      "val" : null,
-      "present" : false
-    }
-  },
-  "writePartitionPaths" : [ "files" ],
-  "fileIdAndRelativePaths" : {
-    "" : null,
-    "files-0000" : null
-  }
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/hoodie.properties b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/hoodie.properties
deleted file mode 100644
index 845df718f6d..00000000000
--- a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/.hoodie/hoodie.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#Properties saved on 2022-08-30T08:36:47.657528Z
-#Tue Aug 30 08:36:47 UTC 2022
-hoodie.compaction.payload.class=org.apache.hudi.metadata.HoodieMetadataPayload
-hoodie.table.type=MERGE_ON_READ
-hoodie.archivelog.folder=archived
-hoodie.timeline.layout.version=1
-hoodie.table.checksum=1983687495
-hoodie.datasource.write.drop.partition.columns=false
-hoodie.table.recordkey.fields=key
-hoodie.table.name=test_table_metadata
-hoodie.populate.meta.fields=false
-hoodie.table.keygenerator.class=org.apache.hudi.metadata.HoodieTableMetadataKeyGenerator
-hoodie.table.base.file.format=HFILE
-hoodie.table.version=5
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..files-0000_00000000000000.log.1_0-0-0.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..files-0000_00000000000000.log.1_0-0-0.crc
deleted file mode 100644
index e016a7f5262..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..files-0000_00000000000000.log.1_0-0-0.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..files-0000_00000000000000.log.1_0-52-57.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..files-0000_00000000000000.log.1_0-52-57.crc
deleted file mode 100644
index c1136be0c0e..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..files-0000_00000000000000.log.1_0-52-57.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..files-0000_00000000000000.log.2_0-83-93.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..files-0000_00000000000000.log.2_0-83-93.crc
deleted file mode 100644
index 0aaf9e50256..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..files-0000_00000000000000.log.2_0-83-93.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..hoodie_partition_metadata.crc b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..hoodie_partition_metadata.crc
deleted file mode 100644
index 1b5364eed34..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/..hoodie_partition_metadata.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.files-0000_00000000000000.log.1_0-0-0 b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.files-0000_00000000000000.log.1_0-0-0
deleted file mode 100644
index 9bf687c1a4b..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.files-0000_00000000000000.log.1_0-0-0 and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.files-0000_00000000000000.log.1_0-52-57 b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.files-0000_00000000000000.log.1_0-52-57
deleted file mode 100644
index b7e40917ace..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.files-0000_00000000000000.log.1_0-52-57 and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.files-0000_00000000000000.log.2_0-83-93 b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.files-0000_00000000000000.log.2_0-83-93
deleted file mode 100644
index 13a41e55cb2..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.files-0000_00000000000000.log.2_0-83-93 and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.hoodie_partition_metadata b/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.hoodie_partition_metadata
deleted file mode 100644
index abeb826f8a4..00000000000
--- a/tests/integration/test_storage_hudi/test_table/.hoodie/metadata/files/.hoodie_partition_metadata
+++ /dev/null
@@ -1,4 +0,0 @@
-#partition metadata
-#Tue Aug 30 08:36:48 UTC 2022
-commitTime=00000000000000
-partitionDepth=1
diff --git a/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/..hoodie_partition_metadata.crc b/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/..hoodie_partition_metadata.crc
deleted file mode 100644
index 901b972aff0..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/..hoodie_partition_metadata.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/.8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0_0-73-83_20220830083647456.parquet.crc b/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/.8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0_0-73-83_20220830083647456.parquet.crc
deleted file mode 100644
index eaff8b6a2b1..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/.8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0_0-73-83_20220830083647456.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/.hoodie_partition_metadata b/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/.hoodie_partition_metadata
deleted file mode 100644
index a8c28b02044..00000000000
--- a/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/.hoodie_partition_metadata
+++ /dev/null
@@ -1,4 +0,0 @@
-#partition metadata
-#Tue Aug 30 08:36:50 UTC 2022
-commitTime=20220830083647456
-partitionDepth=3
diff --git a/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0_0-73-83_20220830083647456.parquet b/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0_0-73-83_20220830083647456.parquet
deleted file mode 100644
index d929431ccd3..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/americas/brazil/sao_paulo/8a9a08bb-8cbc-4ec9-a2d4-8a6cdcaebbad-0_0-73-83_20220830083647456.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/..hoodie_partition_metadata.crc b/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/..hoodie_partition_metadata.crc
deleted file mode 100644
index 901b972aff0..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/..hoodie_partition_metadata.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/.34b1b177-f0af-467b-9214-473ead268e55-0_1-73-84_20220830083647456.parquet.crc b/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/.34b1b177-f0af-467b-9214-473ead268e55-0_1-73-84_20220830083647456.parquet.crc
deleted file mode 100644
index d0e239fd35b..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/.34b1b177-f0af-467b-9214-473ead268e55-0_1-73-84_20220830083647456.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/.hoodie_partition_metadata b/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/.hoodie_partition_metadata
deleted file mode 100644
index a8c28b02044..00000000000
--- a/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/.hoodie_partition_metadata
+++ /dev/null
@@ -1,4 +0,0 @@
-#partition metadata
-#Tue Aug 30 08:36:50 UTC 2022
-commitTime=20220830083647456
-partitionDepth=3
diff --git a/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/34b1b177-f0af-467b-9214-473ead268e55-0_1-73-84_20220830083647456.parquet b/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/34b1b177-f0af-467b-9214-473ead268e55-0_1-73-84_20220830083647456.parquet
deleted file mode 100644
index 053841a0b91..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/americas/united_states/san_francisco/34b1b177-f0af-467b-9214-473ead268e55-0_1-73-84_20220830083647456.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/asia/india/chennai/..hoodie_partition_metadata.crc b/tests/integration/test_storage_hudi/test_table/asia/india/chennai/..hoodie_partition_metadata.crc
deleted file mode 100644
index 901b972aff0..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/asia/india/chennai/..hoodie_partition_metadata.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/asia/india/chennai/.92aa634e-d83f-4057-a385-ea3b22e5d6e1-0_2-73-85_20220830083647456.parquet.crc b/tests/integration/test_storage_hudi/test_table/asia/india/chennai/.92aa634e-d83f-4057-a385-ea3b22e5d6e1-0_2-73-85_20220830083647456.parquet.crc
deleted file mode 100644
index 9fae4a53043..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/asia/india/chennai/.92aa634e-d83f-4057-a385-ea3b22e5d6e1-0_2-73-85_20220830083647456.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_hudi/test_table/asia/india/chennai/.hoodie_partition_metadata b/tests/integration/test_storage_hudi/test_table/asia/india/chennai/.hoodie_partition_metadata
deleted file mode 100644
index a8c28b02044..00000000000
--- a/tests/integration/test_storage_hudi/test_table/asia/india/chennai/.hoodie_partition_metadata
+++ /dev/null
@@ -1,4 +0,0 @@
-#partition metadata
-#Tue Aug 30 08:36:50 UTC 2022
-commitTime=20220830083647456
-partitionDepth=3
diff --git a/tests/integration/test_storage_hudi/test_table/asia/india/chennai/92aa634e-d83f-4057-a385-ea3b22e5d6e1-0_2-73-85_20220830083647456.parquet b/tests/integration/test_storage_hudi/test_table/asia/india/chennai/92aa634e-d83f-4057-a385-ea3b22e5d6e1-0_2-73-85_20220830083647456.parquet
deleted file mode 100644
index c1ba250ed09..00000000000
Binary files a/tests/integration/test_storage_hudi/test_table/asia/india/chennai/92aa634e-d83f-4057-a385-ea3b22e5d6e1-0_2-73-85_20220830083647456.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml b/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml
new file mode 100644
index 00000000000..d4c54e2d13d
--- /dev/null
+++ b/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+  <named_collections>
+    <s3>
+        <url>http://minio1:9001/root/</url>
+        <access_key_id>minio</access_key_id>
+        <secret_access_key>minio123</secret_access_key>
+    </s3>
+  </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00001.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00001.parquet.crc
deleted file mode 100644
index 4702362b4af..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00001.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00001.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00001.parquet.crc
deleted file mode 100644
index eb1117c22b1..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00001.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00001.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00001.parquet.crc
deleted file mode 100644
index 7b202ac11c3..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00001.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00001.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00001.parquet.crc
deleted file mode 100644
index b5ac1ae17d9..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00001.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00001.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00001.parquet
deleted file mode 100644
index 08cc624f30c..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00001.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00001.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00001.parquet
deleted file mode 100644
index 984f59f9b0a..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00001.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00001.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00001.parquet
deleted file mode 100644
index c6585dd2b46..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00001.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00001.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00001.parquet
deleted file mode 100644
index 7445b893e16..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=1/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00001.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00002.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00002.parquet.crc
deleted file mode 100644
index 32777a2ffb0..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00002.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00001.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00001.parquet.crc
deleted file mode 100644
index c296368d003..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00001.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00002.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00002.parquet.crc
deleted file mode 100644
index cad98b13e6a..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00002.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00002.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00002.parquet.crc
deleted file mode 100644
index ec7202189fa..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00002.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00002.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00002.parquet.crc
deleted file mode 100644
index c954f55eb8e..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00002.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00002.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00002.parquet
deleted file mode 100644
index 41f8581757e..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-0-c070e655-dc44-43d2-a01a-484f107210cb-00002.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00001.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00001.parquet
deleted file mode 100644
index 176c0ab5f65..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00001.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00002.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00002.parquet
deleted file mode 100644
index 8ae414f7258..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00002.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00002.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00002.parquet
deleted file mode 100644
index bbd7c8ec41f..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00002.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00002.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00002.parquet
deleted file mode 100644
index 31bd1f3cfaa..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=2/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00002.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00002.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00002.parquet.crc
deleted file mode 100644
index a40afa7bc7d..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00002.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00003.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00003.parquet.crc
deleted file mode 100644
index bbf46240d19..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00003.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00003.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00003.parquet.crc
deleted file mode 100644
index ac23a974243..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00003.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00003.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00003.parquet.crc
deleted file mode 100644
index c9eba737524..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00003.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00002.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00002.parquet
deleted file mode 100644
index 5933e48d243..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00002.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00003.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00003.parquet
deleted file mode 100644
index ea769ff0f22..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00003.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00003.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00003.parquet
deleted file mode 100644
index 756cbc903ff..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00003.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00003.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00003.parquet
deleted file mode 100644
index f5673831144..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=3/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00003.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00003.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00003.parquet.crc
deleted file mode 100644
index 8aead16947e..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00003.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00004.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00004.parquet.crc
deleted file mode 100644
index 054f4b77466..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00004.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00004.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00004.parquet.crc
deleted file mode 100644
index f01abccb82e..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00004.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00004.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00004.parquet.crc
deleted file mode 100644
index 913fc56465a..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00004.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00003.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00003.parquet
deleted file mode 100644
index 9887f3ca5db..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00003.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00004.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00004.parquet
deleted file mode 100644
index 420c11a3d86..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00004.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00004.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00004.parquet
deleted file mode 100644
index a947586bac7..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00004.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00004.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00004.parquet
deleted file mode 100644
index 7471ddfd1d0..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=4/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00004.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00004.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00004.parquet.crc
deleted file mode 100644
index e19f70c59e7..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-1-3a214094-2325-48e0-b560-d28fc767f054-00004.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00001.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00001.parquet.crc
deleted file mode 100644
index 7a5149d3de1..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00001.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00005.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00005.parquet.crc
deleted file mode 100644
index bca3a983560..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00005.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00005.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00005.parquet.crc
deleted file mode 100644
index d4ec50e35e1..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00005.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00005.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00005.parquet.crc
deleted file mode 100644
index 3c8e61e22fc..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00005.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00004.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00004.parquet
deleted file mode 100644
index ae416be428e..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-1-3a214094-2325-48e0-b560-d28fc767f054-00004.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00001.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00001.parquet
deleted file mode 100644
index e276734d087..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00001.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00005.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00005.parquet
deleted file mode 100644
index 021294db1fb..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00005.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00005.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00005.parquet
deleted file mode 100644
index d9d03829c05..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00005.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00005.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00005.parquet
deleted file mode 100644
index 0d704e74178..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=5/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00005.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00002.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00002.parquet.crc
deleted file mode 100644
index ebc2fe0a310..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00002.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00006.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00006.parquet.crc
deleted file mode 100644
index bf4b3e7540c..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00006.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00006.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00006.parquet.crc
deleted file mode 100644
index 22746a11d3b..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00006.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00006.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00006.parquet.crc
deleted file mode 100644
index 6b9711dfe42..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00006.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00002.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00002.parquet
deleted file mode 100644
index a6545d948a6..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00002.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00006.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00006.parquet
deleted file mode 100644
index c652d5a2ba3..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00006.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00006.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00006.parquet
deleted file mode 100644
index 8441ab330ef..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00006.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00006.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00006.parquet
deleted file mode 100644
index 8e5e58149ee..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=6/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00006.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00003.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00003.parquet.crc
deleted file mode 100644
index 2bdd962b61d..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00003.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00007.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00007.parquet.crc
deleted file mode 100644
index 587a807e34d..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00007.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00007.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00007.parquet.crc
deleted file mode 100644
index ba2feb4c7dd..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00007.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00007.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00007.parquet.crc
deleted file mode 100644
index 35040228aa0..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00007.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00003.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00003.parquet
deleted file mode 100644
index 52bfeb30334..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00003.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00007.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00007.parquet
deleted file mode 100644
index d77b2da6589..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00007.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00007.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00007.parquet
deleted file mode 100644
index c21ece7eaf5..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00007.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00007.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00007.parquet
deleted file mode 100644
index bc1912c1301..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=7/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00007.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00004.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00004.parquet.crc
deleted file mode 100644
index 19e0cebe34e..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00004.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00008.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00008.parquet.crc
deleted file mode 100644
index 365ebbf04bb..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00008.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00008.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00008.parquet.crc
deleted file mode 100644
index a24b34e3784..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00008.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00008.parquet.crc b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00008.parquet.crc
deleted file mode 100644
index cff7baa4f7e..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/.00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00008.parquet.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00004.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00004.parquet
deleted file mode 100644
index 8549ca63292..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-2-cbd5000d-366b-4dbc-9825-61a5b85c6dba-00004.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00008.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00008.parquet
deleted file mode 100644
index 239ac0a4f92..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-3-eea1ad05-da93-4b49-aa8d-3ebbb5c69379-00008.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00008.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00008.parquet
deleted file mode 100644
index ef788a375ff..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-4-c4940e8e-116f-436e-96ae-5c639106aec0-00008.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00008.parquet b/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00008.parquet
deleted file mode 100644
index 881936e1844..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/data/vendor_id=8/00000-5-f80715f7-5243-45ea-bc9f-f087ab7c2a69-00008.parquet and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json.crc
deleted file mode 100644
index 66266ce1ee8..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json.crc
deleted file mode 100644
index 3afa2c7aead..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.00002-c55cb6e3-46c4-480b-86e8-8483b4343fdf.metadata.json.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.00002-c55cb6e3-46c4-480b-86e8-8483b4343fdf.metadata.json.crc
deleted file mode 100644
index 53fa3d8a7d3..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.00002-c55cb6e3-46c4-480b-86e8-8483b4343fdf.metadata.json.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.00003-c1ceebf1-9bae-432b-9b40-a50d081f5691.metadata.json.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.00003-c1ceebf1-9bae-432b-9b40-a50d081f5691.metadata.json.crc
deleted file mode 100644
index d99f0b5a7b6..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.00003-c1ceebf1-9bae-432b-9b40-a50d081f5691.metadata.json.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.00004-0af373c4-8841-4596-a87b-9265403d2052.metadata.json.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.00004-0af373c4-8841-4596-a87b-9265403d2052.metadata.json.crc
deleted file mode 100644
index b6496e19628..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.00004-0af373c4-8841-4596-a87b-9265403d2052.metadata.json.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.00005-d0b691c7-70b3-4eba-ac85-7a8b10a00ca1.metadata.json.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.00005-d0b691c7-70b3-4eba-ac85-7a8b10a00ca1.metadata.json.crc
deleted file mode 100644
index 203440f6f4f..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.00005-d0b691c7-70b3-4eba-ac85-7a8b10a00ca1.metadata.json.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.00006-366f138d-535b-4fca-be66-0fca929084ea.metadata.json.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.00006-366f138d-535b-4fca-be66-0fca929084ea.metadata.json.crc
deleted file mode 100644
index 16ccc3379c1..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.00006-366f138d-535b-4fca-be66-0fca929084ea.metadata.json.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.08acf54b-b53c-41d4-a71e-06bf618bad7b-m0.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.08acf54b-b53c-41d4-a71e-06bf618bad7b-m0.avro.crc
deleted file mode 100644
index 2cbb5940c9f..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.08acf54b-b53c-41d4-a71e-06bf618bad7b-m0.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.5e3c62a9-1537-455f-98e5-0a067af5752a-m0.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.5e3c62a9-1537-455f-98e5-0a067af5752a-m0.avro.crc
deleted file mode 100644
index 9871430eb7c..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.5e3c62a9-1537-455f-98e5-0a067af5752a-m0.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.7ae325bd-fe20-4a55-917c-36cb8f6a488c-m0.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.7ae325bd-fe20-4a55-917c-36cb8f6a488c-m0.avro.crc
deleted file mode 100644
index 078f749127e..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.7ae325bd-fe20-4a55-917c-36cb8f6a488c-m0.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.a51dd31d-ea86-42dd-82d1-1981332a0f6d-m0.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.a51dd31d-ea86-42dd-82d1-1981332a0f6d-m0.avro.crc
deleted file mode 100644
index 401a08ad44d..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.a51dd31d-ea86-42dd-82d1-1981332a0f6d-m0.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.e25db3dd-c8eb-4a35-a17f-75b68ee25005-m0.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.e25db3dd-c8eb-4a35-a17f-75b68ee25005-m0.avro.crc
deleted file mode 100644
index b1aaf9e23dd..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.e25db3dd-c8eb-4a35-a17f-75b68ee25005-m0.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.f9e891e9-fbd3-4411-a5c6-0cc14a2f1392-m0.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.f9e891e9-fbd3-4411-a5c6-0cc14a2f1392-m0.avro.crc
deleted file mode 100644
index 039ec44364c..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.f9e891e9-fbd3-4411-a5c6-0cc14a2f1392-m0.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-1793608066486471262-1-f9e891e9-fbd3-4411-a5c6-0cc14a2f1392.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.snap-1793608066486471262-1-f9e891e9-fbd3-4411-a5c6-0cc14a2f1392.avro.crc
deleted file mode 100644
index 47e4757266d..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-1793608066486471262-1-f9e891e9-fbd3-4411-a5c6-0cc14a2f1392.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-5277285803176961576-1-e25db3dd-c8eb-4a35-a17f-75b68ee25005.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.snap-5277285803176961576-1-e25db3dd-c8eb-4a35-a17f-75b68ee25005.avro.crc
deleted file mode 100644
index 83b6ea3ee02..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-5277285803176961576-1-e25db3dd-c8eb-4a35-a17f-75b68ee25005.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-5735460159761889536-1-a51dd31d-ea86-42dd-82d1-1981332a0f6d.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.snap-5735460159761889536-1-a51dd31d-ea86-42dd-82d1-1981332a0f6d.avro.crc
deleted file mode 100644
index f5f9b510b42..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-5735460159761889536-1-a51dd31d-ea86-42dd-82d1-1981332a0f6d.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-608017560956539142-1-08acf54b-b53c-41d4-a71e-06bf618bad7b.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.snap-608017560956539142-1-08acf54b-b53c-41d4-a71e-06bf618bad7b.avro.crc
deleted file mode 100644
index 77df2778166..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-608017560956539142-1-08acf54b-b53c-41d4-a71e-06bf618bad7b.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro.crc
deleted file mode 100644
index c4f991dc7db..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro.crc b/tests/integration/test_storage_iceberg/taxis/metadata/.snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro.crc
deleted file mode 100644
index c9367fa6361..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/.snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro.crc and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json b/tests/integration/test_storage_iceberg/taxis/metadata/00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json
deleted file mode 100644
index a89dfb754df..00000000000
--- a/tests/integration/test_storage_iceberg/taxis/metadata/00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "format-version" : 1,
-  "table-uuid" : "48ae5fb7-baac-4c67-a2bb-f72793184d50",
-  "location" : "file:/warehouse/nyc.db/taxis",
-  "last-updated-ms" : 1673426098862,
-  "last-column-id" : 5,
-  "schema" : {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  },
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  } ],
-  "partition-spec" : [ {
-    "name" : "vendor_id",
-    "transform" : "identity",
-    "source-id" : 1,
-    "field-id" : 1000
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ {
-      "name" : "vendor_id",
-      "transform" : "identity",
-      "source-id" : 1,
-      "field-id" : 1000
-    } ]
-  } ],
-  "last-partition-id" : 1000,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "format_version" : "2"
-  },
-  "current-snapshot-id" : -1,
-  "refs" : { },
-  "snapshots" : [ ],
-  "snapshot-log" : [ ],
-  "metadata-log" : [ ]
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json b/tests/integration/test_storage_iceberg/taxis/metadata/00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json
deleted file mode 100644
index 8360329eed0..00000000000
--- a/tests/integration/test_storage_iceberg/taxis/metadata/00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "format-version" : 1,
-  "table-uuid" : "48ae5fb7-baac-4c67-a2bb-f72793184d50",
-  "location" : "file:/warehouse/nyc.db/taxis",
-  "last-updated-ms" : 1673426110340,
-  "last-column-id" : 5,
-  "schema" : {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  },
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  } ],
-  "partition-spec" : [ {
-    "name" : "vendor_id",
-    "transform" : "identity",
-    "source-id" : 1,
-    "field-id" : 1000
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ {
-      "name" : "vendor_id",
-      "transform" : "identity",
-      "source-id" : 1,
-      "field-id" : 1000
-    } ]
-  } ],
-  "last-partition-id" : 1000,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "format_version" : "2"
-  },
-  "current-snapshot-id" : 6850377589038341628,
-  "refs" : {
-    "main" : {
-      "snapshot-id" : 6850377589038341628,
-      "type" : "branch"
-    }
-  },
-  "snapshots" : [ {
-    "snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426110340,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "2",
-      "added-records" : "4",
-      "added-files-size" : "3185",
-      "changed-partition-count" : "2",
-      "total-records" : "4",
-      "total-files-size" : "3185",
-      "total-data-files" : "2",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro",
-    "schema-id" : 0
-  } ],
-  "snapshot-log" : [ {
-    "timestamp-ms" : 1673426110340,
-    "snapshot-id" : 6850377589038341628
-  } ],
-  "metadata-log" : [ {
-    "timestamp-ms" : 1673426098862,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json"
-  } ]
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/00002-c55cb6e3-46c4-480b-86e8-8483b4343fdf.metadata.json b/tests/integration/test_storage_iceberg/taxis/metadata/00002-c55cb6e3-46c4-480b-86e8-8483b4343fdf.metadata.json
deleted file mode 100644
index 76b27058000..00000000000
--- a/tests/integration/test_storage_iceberg/taxis/metadata/00002-c55cb6e3-46c4-480b-86e8-8483b4343fdf.metadata.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-  "format-version" : 1,
-  "table-uuid" : "48ae5fb7-baac-4c67-a2bb-f72793184d50",
-  "location" : "file:/warehouse/nyc.db/taxis",
-  "last-updated-ms" : 1673426112824,
-  "last-column-id" : 5,
-  "schema" : {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  },
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  } ],
-  "partition-spec" : [ {
-    "name" : "vendor_id",
-    "transform" : "identity",
-    "source-id" : 1,
-    "field-id" : 1000
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ {
-      "name" : "vendor_id",
-      "transform" : "identity",
-      "source-id" : 1,
-      "field-id" : 1000
-    } ]
-  } ],
-  "last-partition-id" : 1000,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "format_version" : "2"
-  },
-  "current-snapshot-id" : 7171740521400098346,
-  "refs" : {
-    "main" : {
-      "snapshot-id" : 7171740521400098346,
-      "type" : "branch"
-    }
-  },
-  "snapshots" : [ {
-    "snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426110340,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "2",
-      "added-records" : "4",
-      "added-files-size" : "3185",
-      "changed-partition-count" : "2",
-      "total-records" : "4",
-      "total-files-size" : "3185",
-      "total-data-files" : "2",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 7171740521400098346,
-    "parent-snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426112824,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "4",
-      "added-records" : "4",
-      "added-files-size" : "6000",
-      "changed-partition-count" : "4",
-      "total-records" : "8",
-      "total-files-size" : "9185",
-      "total-data-files" : "6",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro",
-    "schema-id" : 0
-  } ],
-  "snapshot-log" : [ {
-    "timestamp-ms" : 1673426110340,
-    "snapshot-id" : 6850377589038341628
-  }, {
-    "timestamp-ms" : 1673426112824,
-    "snapshot-id" : 7171740521400098346
-  } ],
-  "metadata-log" : [ {
-    "timestamp-ms" : 1673426098862,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426110340,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json"
-  } ]
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/00003-c1ceebf1-9bae-432b-9b40-a50d081f5691.metadata.json b/tests/integration/test_storage_iceberg/taxis/metadata/00003-c1ceebf1-9bae-432b-9b40-a50d081f5691.metadata.json
deleted file mode 100644
index 897a4513abb..00000000000
--- a/tests/integration/test_storage_iceberg/taxis/metadata/00003-c1ceebf1-9bae-432b-9b40-a50d081f5691.metadata.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "format-version" : 1,
-  "table-uuid" : "48ae5fb7-baac-4c67-a2bb-f72793184d50",
-  "location" : "file:/warehouse/nyc.db/taxis",
-  "last-updated-ms" : 1673426118186,
-  "last-column-id" : 5,
-  "schema" : {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  },
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  } ],
-  "partition-spec" : [ {
-    "name" : "vendor_id",
-    "transform" : "identity",
-    "source-id" : 1,
-    "field-id" : 1000
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ {
-      "name" : "vendor_id",
-      "transform" : "identity",
-      "source-id" : 1,
-      "field-id" : 1000
-    } ]
-  } ],
-  "last-partition-id" : 1000,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "format_version" : "2"
-  },
-  "current-snapshot-id" : 5735460159761889536,
-  "refs" : {
-    "main" : {
-      "snapshot-id" : 5735460159761889536,
-      "type" : "branch"
-    }
-  },
-  "snapshots" : [ {
-    "snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426110340,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "2",
-      "added-records" : "4",
-      "added-files-size" : "3185",
-      "changed-partition-count" : "2",
-      "total-records" : "4",
-      "total-files-size" : "3185",
-      "total-data-files" : "2",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 7171740521400098346,
-    "parent-snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426112824,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "4",
-      "added-records" : "4",
-      "added-files-size" : "6000",
-      "changed-partition-count" : "4",
-      "total-records" : "8",
-      "total-files-size" : "9185",
-      "total-data-files" : "6",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 5735460159761889536,
-    "parent-snapshot-id" : 7171740521400098346,
-    "timestamp-ms" : 1673426118186,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "4",
-      "added-records" : "4",
-      "added-files-size" : "6001",
-      "changed-partition-count" : "4",
-      "total-records" : "12",
-      "total-files-size" : "15186",
-      "total-data-files" : "10",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-5735460159761889536-1-a51dd31d-ea86-42dd-82d1-1981332a0f6d.avro",
-    "schema-id" : 0
-  } ],
-  "snapshot-log" : [ {
-    "timestamp-ms" : 1673426110340,
-    "snapshot-id" : 6850377589038341628
-  }, {
-    "timestamp-ms" : 1673426112824,
-    "snapshot-id" : 7171740521400098346
-  }, {
-    "timestamp-ms" : 1673426118186,
-    "snapshot-id" : 5735460159761889536
-  } ],
-  "metadata-log" : [ {
-    "timestamp-ms" : 1673426098862,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426110340,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426112824,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00002-c55cb6e3-46c4-480b-86e8-8483b4343fdf.metadata.json"
-  } ]
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/00004-0af373c4-8841-4596-a87b-9265403d2052.metadata.json b/tests/integration/test_storage_iceberg/taxis/metadata/00004-0af373c4-8841-4596-a87b-9265403d2052.metadata.json
deleted file mode 100644
index 150ede93f3b..00000000000
--- a/tests/integration/test_storage_iceberg/taxis/metadata/00004-0af373c4-8841-4596-a87b-9265403d2052.metadata.json
+++ /dev/null
@@ -1,207 +0,0 @@
-{
-  "format-version" : 1,
-  "table-uuid" : "48ae5fb7-baac-4c67-a2bb-f72793184d50",
-  "location" : "file:/warehouse/nyc.db/taxis",
-  "last-updated-ms" : 1673426124951,
-  "last-column-id" : 5,
-  "schema" : {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  },
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  } ],
-  "partition-spec" : [ {
-    "name" : "vendor_id",
-    "transform" : "identity",
-    "source-id" : 1,
-    "field-id" : 1000
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ {
-      "name" : "vendor_id",
-      "transform" : "identity",
-      "source-id" : 1,
-      "field-id" : 1000
-    } ]
-  } ],
-  "last-partition-id" : 1000,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "format_version" : "2"
-  },
-  "current-snapshot-id" : 1793608066486471262,
-  "refs" : {
-    "main" : {
-      "snapshot-id" : 1793608066486471262,
-      "type" : "branch"
-    }
-  },
-  "snapshots" : [ {
-    "snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426110340,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "2",
-      "added-records" : "4",
-      "added-files-size" : "3185",
-      "changed-partition-count" : "2",
-      "total-records" : "4",
-      "total-files-size" : "3185",
-      "total-data-files" : "2",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 7171740521400098346,
-    "parent-snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426112824,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "4",
-      "added-records" : "4",
-      "added-files-size" : "6000",
-      "changed-partition-count" : "4",
-      "total-records" : "8",
-      "total-files-size" : "9185",
-      "total-data-files" : "6",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 5735460159761889536,
-    "parent-snapshot-id" : 7171740521400098346,
-    "timestamp-ms" : 1673426118186,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "4",
-      "added-records" : "4",
-      "added-files-size" : "6001",
-      "changed-partition-count" : "4",
-      "total-records" : "12",
-      "total-files-size" : "15186",
-      "total-data-files" : "10",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-5735460159761889536-1-a51dd31d-ea86-42dd-82d1-1981332a0f6d.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 1793608066486471262,
-    "parent-snapshot-id" : 5735460159761889536,
-    "timestamp-ms" : 1673426124951,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "8",
-      "added-records" : "12",
-      "added-files-size" : "12570",
-      "changed-partition-count" : "8",
-      "total-records" : "24",
-      "total-files-size" : "27756",
-      "total-data-files" : "18",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-1793608066486471262-1-f9e891e9-fbd3-4411-a5c6-0cc14a2f1392.avro",
-    "schema-id" : 0
-  } ],
-  "snapshot-log" : [ {
-    "timestamp-ms" : 1673426110340,
-    "snapshot-id" : 6850377589038341628
-  }, {
-    "timestamp-ms" : 1673426112824,
-    "snapshot-id" : 7171740521400098346
-  }, {
-    "timestamp-ms" : 1673426118186,
-    "snapshot-id" : 5735460159761889536
-  }, {
-    "timestamp-ms" : 1673426124951,
-    "snapshot-id" : 1793608066486471262
-  } ],
-  "metadata-log" : [ {
-    "timestamp-ms" : 1673426098862,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426110340,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426112824,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00002-c55cb6e3-46c4-480b-86e8-8483b4343fdf.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426118186,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00003-c1ceebf1-9bae-432b-9b40-a50d081f5691.metadata.json"
-  } ]
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/00005-d0b691c7-70b3-4eba-ac85-7a8b10a00ca1.metadata.json b/tests/integration/test_storage_iceberg/taxis/metadata/00005-d0b691c7-70b3-4eba-ac85-7a8b10a00ca1.metadata.json
deleted file mode 100644
index b55fd35abaf..00000000000
--- a/tests/integration/test_storage_iceberg/taxis/metadata/00005-d0b691c7-70b3-4eba-ac85-7a8b10a00ca1.metadata.json
+++ /dev/null
@@ -1,233 +0,0 @@
-{
-  "format-version" : 1,
-  "table-uuid" : "48ae5fb7-baac-4c67-a2bb-f72793184d50",
-  "location" : "file:/warehouse/nyc.db/taxis",
-  "last-updated-ms" : 1673426130693,
-  "last-column-id" : 5,
-  "schema" : {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  },
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  } ],
-  "partition-spec" : [ {
-    "name" : "vendor_id",
-    "transform" : "identity",
-    "source-id" : 1,
-    "field-id" : 1000
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ {
-      "name" : "vendor_id",
-      "transform" : "identity",
-      "source-id" : 1,
-      "field-id" : 1000
-    } ]
-  } ],
-  "last-partition-id" : 1000,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "format_version" : "2"
-  },
-  "current-snapshot-id" : 608017560956539142,
-  "refs" : {
-    "main" : {
-      "snapshot-id" : 608017560956539142,
-      "type" : "branch"
-    }
-  },
-  "snapshots" : [ {
-    "snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426110340,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "2",
-      "added-records" : "4",
-      "added-files-size" : "3185",
-      "changed-partition-count" : "2",
-      "total-records" : "4",
-      "total-files-size" : "3185",
-      "total-data-files" : "2",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 7171740521400098346,
-    "parent-snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426112824,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "4",
-      "added-records" : "4",
-      "added-files-size" : "6000",
-      "changed-partition-count" : "4",
-      "total-records" : "8",
-      "total-files-size" : "9185",
-      "total-data-files" : "6",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 5735460159761889536,
-    "parent-snapshot-id" : 7171740521400098346,
-    "timestamp-ms" : 1673426118186,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "4",
-      "added-records" : "4",
-      "added-files-size" : "6001",
-      "changed-partition-count" : "4",
-      "total-records" : "12",
-      "total-files-size" : "15186",
-      "total-data-files" : "10",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-5735460159761889536-1-a51dd31d-ea86-42dd-82d1-1981332a0f6d.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 1793608066486471262,
-    "parent-snapshot-id" : 5735460159761889536,
-    "timestamp-ms" : 1673426124951,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "8",
-      "added-records" : "12",
-      "added-files-size" : "12570",
-      "changed-partition-count" : "8",
-      "total-records" : "24",
-      "total-files-size" : "27756",
-      "total-data-files" : "18",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-1793608066486471262-1-f9e891e9-fbd3-4411-a5c6-0cc14a2f1392.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 608017560956539142,
-    "parent-snapshot-id" : 1793608066486471262,
-    "timestamp-ms" : 1673426130693,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "8",
-      "added-records" : "24",
-      "added-files-size" : "14487",
-      "changed-partition-count" : "8",
-      "total-records" : "48",
-      "total-files-size" : "42243",
-      "total-data-files" : "26",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-608017560956539142-1-08acf54b-b53c-41d4-a71e-06bf618bad7b.avro",
-    "schema-id" : 0
-  } ],
-  "snapshot-log" : [ {
-    "timestamp-ms" : 1673426110340,
-    "snapshot-id" : 6850377589038341628
-  }, {
-    "timestamp-ms" : 1673426112824,
-    "snapshot-id" : 7171740521400098346
-  }, {
-    "timestamp-ms" : 1673426118186,
-    "snapshot-id" : 5735460159761889536
-  }, {
-    "timestamp-ms" : 1673426124951,
-    "snapshot-id" : 1793608066486471262
-  }, {
-    "timestamp-ms" : 1673426130693,
-    "snapshot-id" : 608017560956539142
-  } ],
-  "metadata-log" : [ {
-    "timestamp-ms" : 1673426098862,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426110340,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426112824,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00002-c55cb6e3-46c4-480b-86e8-8483b4343fdf.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426118186,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00003-c1ceebf1-9bae-432b-9b40-a50d081f5691.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426124951,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00004-0af373c4-8841-4596-a87b-9265403d2052.metadata.json"
-  } ]
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/00006-366f138d-535b-4fca-be66-0fca929084ea.metadata.json b/tests/integration/test_storage_iceberg/taxis/metadata/00006-366f138d-535b-4fca-be66-0fca929084ea.metadata.json
deleted file mode 100644
index af77ff1282b..00000000000
--- a/tests/integration/test_storage_iceberg/taxis/metadata/00006-366f138d-535b-4fca-be66-0fca929084ea.metadata.json
+++ /dev/null
@@ -1,259 +0,0 @@
-{
-  "format-version" : 1,
-  "table-uuid" : "48ae5fb7-baac-4c67-a2bb-f72793184d50",
-  "location" : "file:/warehouse/nyc.db/taxis",
-  "last-updated-ms" : 1673426135361,
-  "last-column-id" : 5,
-  "schema" : {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  },
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "vendor_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 2,
-      "name" : "trip_id",
-      "required" : false,
-      "type" : "long"
-    }, {
-      "id" : 3,
-      "name" : "trip_distance",
-      "required" : false,
-      "type" : "float"
-    }, {
-      "id" : 4,
-      "name" : "fare_amount",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "store_and_fwd_flag",
-      "required" : false,
-      "type" : "string"
-    } ]
-  } ],
-  "partition-spec" : [ {
-    "name" : "vendor_id",
-    "transform" : "identity",
-    "source-id" : 1,
-    "field-id" : 1000
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ {
-      "name" : "vendor_id",
-      "transform" : "identity",
-      "source-id" : 1,
-      "field-id" : 1000
-    } ]
-  } ],
-  "last-partition-id" : 1000,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "format_version" : "2"
-  },
-  "current-snapshot-id" : 5277285803176961576,
-  "refs" : {
-    "main" : {
-      "snapshot-id" : 5277285803176961576,
-      "type" : "branch"
-    }
-  },
-  "snapshots" : [ {
-    "snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426110340,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "2",
-      "added-records" : "4",
-      "added-files-size" : "3185",
-      "changed-partition-count" : "2",
-      "total-records" : "4",
-      "total-files-size" : "3185",
-      "total-data-files" : "2",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 7171740521400098346,
-    "parent-snapshot-id" : 6850377589038341628,
-    "timestamp-ms" : 1673426112824,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "4",
-      "added-records" : "4",
-      "added-files-size" : "6000",
-      "changed-partition-count" : "4",
-      "total-records" : "8",
-      "total-files-size" : "9185",
-      "total-data-files" : "6",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 5735460159761889536,
-    "parent-snapshot-id" : 7171740521400098346,
-    "timestamp-ms" : 1673426118186,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "4",
-      "added-records" : "4",
-      "added-files-size" : "6001",
-      "changed-partition-count" : "4",
-      "total-records" : "12",
-      "total-files-size" : "15186",
-      "total-data-files" : "10",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-5735460159761889536-1-a51dd31d-ea86-42dd-82d1-1981332a0f6d.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 1793608066486471262,
-    "parent-snapshot-id" : 5735460159761889536,
-    "timestamp-ms" : 1673426124951,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "8",
-      "added-records" : "12",
-      "added-files-size" : "12570",
-      "changed-partition-count" : "8",
-      "total-records" : "24",
-      "total-files-size" : "27756",
-      "total-data-files" : "18",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-1793608066486471262-1-f9e891e9-fbd3-4411-a5c6-0cc14a2f1392.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 608017560956539142,
-    "parent-snapshot-id" : 1793608066486471262,
-    "timestamp-ms" : 1673426130693,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "8",
-      "added-records" : "24",
-      "added-files-size" : "14487",
-      "changed-partition-count" : "8",
-      "total-records" : "48",
-      "total-files-size" : "42243",
-      "total-data-files" : "26",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-608017560956539142-1-08acf54b-b53c-41d4-a71e-06bf618bad7b.avro",
-    "schema-id" : 0
-  }, {
-    "snapshot-id" : 5277285803176961576,
-    "parent-snapshot-id" : 608017560956539142,
-    "timestamp-ms" : 1673426135361,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1673426025385",
-      "added-data-files" : "8",
-      "added-records" : "48",
-      "added-files-size" : "14492",
-      "changed-partition-count" : "8",
-      "total-records" : "96",
-      "total-files-size" : "56735",
-      "total-data-files" : "34",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "file:/warehouse/nyc.db/taxis/metadata/snap-5277285803176961576-1-e25db3dd-c8eb-4a35-a17f-75b68ee25005.avro",
-    "schema-id" : 0
-  } ],
-  "snapshot-log" : [ {
-    "timestamp-ms" : 1673426110340,
-    "snapshot-id" : 6850377589038341628
-  }, {
-    "timestamp-ms" : 1673426112824,
-    "snapshot-id" : 7171740521400098346
-  }, {
-    "timestamp-ms" : 1673426118186,
-    "snapshot-id" : 5735460159761889536
-  }, {
-    "timestamp-ms" : 1673426124951,
-    "snapshot-id" : 1793608066486471262
-  }, {
-    "timestamp-ms" : 1673426130693,
-    "snapshot-id" : 608017560956539142
-  }, {
-    "timestamp-ms" : 1673426135361,
-    "snapshot-id" : 5277285803176961576
-  } ],
-  "metadata-log" : [ {
-    "timestamp-ms" : 1673426098862,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00000-8908cc23-26f2-480e-9a05-6f8ec703e52b.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426110340,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00001-8fffa3b5-2209-404a-907a-9e33b85a3eee.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426112824,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00002-c55cb6e3-46c4-480b-86e8-8483b4343fdf.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426118186,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00003-c1ceebf1-9bae-432b-9b40-a50d081f5691.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426124951,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00004-0af373c4-8841-4596-a87b-9265403d2052.metadata.json"
-  }, {
-    "timestamp-ms" : 1673426130693,
-    "metadata-file" : "file:/warehouse/nyc.db/taxis/metadata/00005-d0b691c7-70b3-4eba-ac85-7a8b10a00ca1.metadata.json"
-  } ]
-}
\ No newline at end of file
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/08acf54b-b53c-41d4-a71e-06bf618bad7b-m0.avro b/tests/integration/test_storage_iceberg/taxis/metadata/08acf54b-b53c-41d4-a71e-06bf618bad7b-m0.avro
deleted file mode 100644
index f737afbe188..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/08acf54b-b53c-41d4-a71e-06bf618bad7b-m0.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/5e3c62a9-1537-455f-98e5-0a067af5752a-m0.avro b/tests/integration/test_storage_iceberg/taxis/metadata/5e3c62a9-1537-455f-98e5-0a067af5752a-m0.avro
deleted file mode 100644
index a3385f4b23b..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/5e3c62a9-1537-455f-98e5-0a067af5752a-m0.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/7ae325bd-fe20-4a55-917c-36cb8f6a488c-m0.avro b/tests/integration/test_storage_iceberg/taxis/metadata/7ae325bd-fe20-4a55-917c-36cb8f6a488c-m0.avro
deleted file mode 100644
index 27e5d89ff46..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/7ae325bd-fe20-4a55-917c-36cb8f6a488c-m0.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/a51dd31d-ea86-42dd-82d1-1981332a0f6d-m0.avro b/tests/integration/test_storage_iceberg/taxis/metadata/a51dd31d-ea86-42dd-82d1-1981332a0f6d-m0.avro
deleted file mode 100644
index 790e8a66bd9..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/a51dd31d-ea86-42dd-82d1-1981332a0f6d-m0.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/e25db3dd-c8eb-4a35-a17f-75b68ee25005-m0.avro b/tests/integration/test_storage_iceberg/taxis/metadata/e25db3dd-c8eb-4a35-a17f-75b68ee25005-m0.avro
deleted file mode 100644
index 4b55eabcd68..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/e25db3dd-c8eb-4a35-a17f-75b68ee25005-m0.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/f9e891e9-fbd3-4411-a5c6-0cc14a2f1392-m0.avro b/tests/integration/test_storage_iceberg/taxis/metadata/f9e891e9-fbd3-4411-a5c6-0cc14a2f1392-m0.avro
deleted file mode 100644
index e86aa1c913e..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/f9e891e9-fbd3-4411-a5c6-0cc14a2f1392-m0.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/snap-1793608066486471262-1-f9e891e9-fbd3-4411-a5c6-0cc14a2f1392.avro b/tests/integration/test_storage_iceberg/taxis/metadata/snap-1793608066486471262-1-f9e891e9-fbd3-4411-a5c6-0cc14a2f1392.avro
deleted file mode 100644
index c5246c3dd64..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/snap-1793608066486471262-1-f9e891e9-fbd3-4411-a5c6-0cc14a2f1392.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/snap-5277285803176961576-1-e25db3dd-c8eb-4a35-a17f-75b68ee25005.avro b/tests/integration/test_storage_iceberg/taxis/metadata/snap-5277285803176961576-1-e25db3dd-c8eb-4a35-a17f-75b68ee25005.avro
deleted file mode 100644
index ada0e6cd324..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/snap-5277285803176961576-1-e25db3dd-c8eb-4a35-a17f-75b68ee25005.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/snap-5735460159761889536-1-a51dd31d-ea86-42dd-82d1-1981332a0f6d.avro b/tests/integration/test_storage_iceberg/taxis/metadata/snap-5735460159761889536-1-a51dd31d-ea86-42dd-82d1-1981332a0f6d.avro
deleted file mode 100644
index fa16717c3a8..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/snap-5735460159761889536-1-a51dd31d-ea86-42dd-82d1-1981332a0f6d.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/snap-608017560956539142-1-08acf54b-b53c-41d4-a71e-06bf618bad7b.avro b/tests/integration/test_storage_iceberg/taxis/metadata/snap-608017560956539142-1-08acf54b-b53c-41d4-a71e-06bf618bad7b.avro
deleted file mode 100644
index 9af6977d28b..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/snap-608017560956539142-1-08acf54b-b53c-41d4-a71e-06bf618bad7b.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro b/tests/integration/test_storage_iceberg/taxis/metadata/snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro
deleted file mode 100644
index 0125125051b..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/snap-6850377589038341628-1-5e3c62a9-1537-455f-98e5-0a067af5752a.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/taxis/metadata/snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro b/tests/integration/test_storage_iceberg/taxis/metadata/snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro
deleted file mode 100644
index a0a165961f4..00000000000
Binary files a/tests/integration/test_storage_iceberg/taxis/metadata/snap-7171740521400098346-1-7ae325bd-fe20-4a55-917c-36cb8f6a488c.avro and /dev/null differ
diff --git a/tests/integration/test_storage_iceberg/test.py b/tests/integration/test_storage_iceberg/test.py
index c610bdc49d6..b3b2f160740 100644
--- a/tests/integration/test_storage_iceberg/test.py
+++ b/tests/integration/test_storage_iceberg/test.py
@@ -1,74 +1,60 @@
+import helpers.client
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+import pyspark
 import logging
 import os
 import json
-import helpers.client
 import pytest
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV
+import time
+import glob
+
+from pyspark.sql.types import (
+    StructType,
+    StructField,
+    StringType,
+    IntegerType,
+    DateType,
+    TimestampType,
+    BooleanType,
+    ArrayType,
+)
+from pyspark.sql.functions import current_timestamp
+from datetime import datetime
+from pyspark.sql.functions import monotonically_increasing_id, row_number
+from pyspark.sql.window import Window
+from pyspark.sql.readwriter import DataFrameWriter, DataFrameWriterV2
+
+from helpers.s3_tools import prepare_s3_bucket, upload_directory, get_file_contents
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 
-def prepare_s3_bucket(started_cluster):
-    bucket_read_write_policy = {
-        "Version": "2012-10-17",
-        "Statement": [
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:GetBucketLocation",
-                "Resource": "arn:aws:s3:::root",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:ListBucket",
-                "Resource": "arn:aws:s3:::root",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:GetObject",
-                "Resource": "arn:aws:s3:::root/*",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:PutObject",
-                "Resource": "arn:aws:s3:::root/*",
-            },
-        ],
-    }
-
-    minio_client = started_cluster.minio_client
-    minio_client.set_bucket_policy(
-        started_cluster.minio_bucket, json.dumps(bucket_read_write_policy)
+def get_spark():
+    builder = (
+        pyspark.sql.SparkSession.builder.appName("spark_test")
+        .config(
+            "spark.sql.catalog.spark_catalog",
+            "org.apache.iceberg.spark.SparkSessionCatalog",
+        )
+        .config("spark.sql.catalog.local", "org.apache.iceberg.spark.SparkCatalog")
+        .config("spark.sql.catalog.spark_catalog.type", "hadoop")
+        .config("spark.sql.catalog.spark_catalog.warehouse", "/iceberg_data")
+        .master("local")
     )
-
-
-def upload_test_table(started_cluster):
-    bucket = started_cluster.minio_bucket
-
-    for address, dirs, files in os.walk(SCRIPT_DIR + "/taxis"):
-        address_without_prefix = address[len(SCRIPT_DIR) :]
-
-        for name in files:
-            started_cluster.minio_client.fput_object(
-                bucket,
-                os.path.join(address_without_prefix, name),
-                os.path.join(address, name),
-            )
+    return builder.master("local").getOrCreate()
 
 
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
-        cluster = ClickHouseCluster(__file__)
-        cluster.add_instance("main_server", with_minio=True)
+        cluster = ClickHouseCluster(__file__, with_spark=True)
+        cluster.add_instance(
+            "node1",
+            main_configs=["configs/config.d/named_collections.xml"],
+            with_minio=True,
+        )
 
         logging.info("Starting cluster...")
         cluster.start()
@@ -76,8 +62,7 @@ def started_cluster():
         prepare_s3_bucket(cluster)
         logging.info("S3 bucket created")
 
-        upload_test_table(cluster)
-        logging.info("Test table uploaded")
+        cluster.spark_session = get_spark()
 
         yield cluster
 
@@ -95,64 +80,235 @@ def run_query(instance, query, stdin=None, settings=None):
     return result
 
 
-def test_create_query(started_cluster):
-    instance = started_cluster.instances["main_server"]
-    bucket = started_cluster.minio_bucket
-
-    create_query = f"""CREATE TABLE iceberg ENGINE=Iceberg('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/taxis/', 'minio', 'minio123')"""
-
-    run_query(instance, create_query)
+def write_iceberg_from_file(
+    spark, path, table_name, mode="overwrite", format_version="1", partition_by=None
+):
+    if mode == "overwrite":
+        if partition_by is None:
+            spark.read.load(f"file://{path}").writeTo(table_name).tableProperty(
+                "format-version", format_version
+            ).using("iceberg").create()
+        else:
+            spark.read.load(f"file://{path}").writeTo(table_name).partitionedBy(
+                partition_by
+            ).tableProperty("format-version", format_version).using("iceberg").create()
+    else:
+        spark.read.load(f"file://{path}").writeTo(table_name).append()
 
 
-def test_select_query(started_cluster):
-    instance = started_cluster.instances["main_server"]
-    bucket = started_cluster.minio_bucket
-    columns = [
-        "vendor_id",
-        "trip_id",
-        "trip_distance",
-        "fare_amount",
-        "store_and_fwd_flag",
-    ]
-
-    # create query in case table doesn't exist
-    create_query = f"""CREATE TABLE IF NOT EXISTS iceberg ENGINE=Iceberg('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/taxis/', 'minio', 'minio123')"""
-
-    run_query(instance, create_query)
-
-    select_query = "SELECT {} FROM iceberg FORMAT TSV"
-    select_table_function_query = "SELECT {col} FROM iceberg('http://{ip}:{port}/{bucket}/taxis/', 'minio', 'minio123') FORMAT TSV"
-
-    for column_name in columns:
-        result = run_query(instance, select_query.format(column_name)).splitlines()
-        assert len(result) > 0
-
-    for column_name in columns:
-        result = run_query(
-            instance,
-            select_table_function_query.format(
-                col=column_name,
-                ip=started_cluster.minio_ip,
-                port=started_cluster.minio_port,
-                bucket=bucket,
-            ),
-        ).splitlines()
-        assert len(result) > 0
+def write_iceberg_from_df(
+    spark, df, table_name, mode="overwrite", format_version="1", partition_by=None
+):
+    if mode == "overwrite":
+        if partition_by is None:
+            df.writeTo(table_name).tableProperty(
+                "format-version", format_version
+            ).using("iceberg").create()
+        else:
+            df.writeTo(table_name).tableProperty(
+                "format-version", format_version
+            ).partitionedBy(partition_by).using("iceberg").create()
+    else:
+        df.writeTo(table_name).append()
 
 
-def test_describe_query(started_cluster):
-    instance = started_cluster.instances["main_server"]
-    bucket = started_cluster.minio_bucket
-    result = instance.query(
-        f"DESCRIBE iceberg('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/taxis/', 'minio', 'minio123') FORMAT TSV",
+def generate_data(spark, start, end):
+    a = spark.range(start, end, 1).toDF("a")
+    b = spark.range(start + 1, end + 1, 1).toDF("b")
+    b = b.withColumn("b", b["b"].cast(StringType()))
+
+    a = a.withColumn(
+        "row_index", row_number().over(Window.orderBy(monotonically_increasing_id()))
+    )
+    b = b.withColumn(
+        "row_index", row_number().over(Window.orderBy(monotonically_increasing_id()))
     )
 
-    assert result == TSV(
+    df = a.join(b, on=["row_index"]).drop("row_index")
+    return df
+
+
+def create_iceberg_table(node, table_name):
+    node.query(
+        f"""
+        DROP TABLE IF EXISTS {table_name};
+        CREATE TABLE {table_name}
+        ENGINE=Iceberg(s3, filename = 'iceberg_data/default/{table_name}/')"""
+    )
+
+
+def create_initial_data_file(
+    cluster, node, query, table_name, compression_method="none"
+):
+    node.query(
+        f"""
+        INSERT INTO TABLE FUNCTION
+            file('{table_name}.parquet')
+        SETTINGS
+            output_format_parquet_compression_method='{compression_method}',
+            s3_truncate_on_insert=1 {query}
+        FORMAT Parquet"""
+    )
+    user_files_path = os.path.join(
+        SCRIPT_DIR, f"{cluster.instances_dir_name}/node1/database/user_files"
+    )
+    result_path = f"{user_files_path}/{table_name}.parquet"
+    return result_path
+
+
+@pytest.mark.parametrize("format_version", ["1", "2"])
+def test_single_iceberg_file(started_cluster, format_version):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_single_iceberg_file_" + format_version
+
+    inserted_data = "SELECT number, toString(number) FROM numbers(100)"
+    parquet_data_path = create_initial_data_file(
+        started_cluster, instance, inserted_data, TABLE_NAME
+    )
+
+    write_iceberg_from_file(
+        spark, parquet_data_path, TABLE_NAME, format_version=format_version
+    )
+
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
+    )
+
+    create_iceberg_table(instance, TABLE_NAME)
+    assert instance.query(f"SELECT * FROM {TABLE_NAME}") == instance.query(
+        inserted_data
+    )
+
+
+@pytest.mark.parametrize("format_version", ["1", "2"])
+def test_partition_by(started_cluster, format_version):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_partition_by_" + format_version
+
+    write_iceberg_from_df(
+        spark,
+        generate_data(spark, 0, 10),
+        TABLE_NAME,
+        mode="overwrite",
+        format_version=format_version,
+        partition_by="a",
+    )
+
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
+    )
+    assert len(files) == 14  # 10 partitiions + 4 metadata files
+
+    create_iceberg_table(instance, TABLE_NAME)
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 10
+
+
+@pytest.mark.parametrize("format_version", ["1", "2"])
+def test_multiple_iceberg_files(started_cluster, format_version):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_multiple_iceberg_files_" + format_version
+
+    write_iceberg_from_df(
+        spark,
+        generate_data(spark, 0, 100),
+        TABLE_NAME,
+        mode="overwrite",
+        format_version=format_version,
+    )
+
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}", ""
+    )
+    # ['/iceberg_data/default/test_multiple_iceberg_files/data/00000-1-35302d56-f1ed-494e-a85b-fbf85c05ab39-00001.parquet',
+    # '/iceberg_data/default/test_multiple_iceberg_files/metadata/version-hint.text',
+    # '/iceberg_data/default/test_multiple_iceberg_files/metadata/3127466b-299d-48ca-a367-6b9b1df1e78c-m0.avro',
+    # '/iceberg_data/default/test_multiple_iceberg_files/metadata/snap-5220855582621066285-1-3127466b-299d-48ca-a367-6b9b1df1e78c.avro',
+    # '/iceberg_data/default/test_multiple_iceberg_files/metadata/v1.metadata.json']
+    assert len(files) == 5
+
+    create_iceberg_table(instance, TABLE_NAME)
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
+
+    write_iceberg_from_df(
+        spark,
+        generate_data(spark, 100, 200),
+        TABLE_NAME,
+        mode="append",
+        format_version=format_version,
+    )
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}", ""
+    )
+    assert len(files) == 9
+
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 200
+    assert instance.query(f"SELECT * FROM {TABLE_NAME} ORDER BY 1") == instance.query(
+        "SELECT number, toString(number + 1) FROM numbers(200)"
+    )
+
+
+@pytest.mark.parametrize("format_version", ["1", "2"])
+def test_types(started_cluster, format_version):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_types_" + format_version
+
+    data = [
+        (
+            123,
+            "string",
+            datetime.strptime("2000-01-01", "%Y-%m-%d"),
+            ["str1", "str2"],
+            True,
+        )
+    ]
+    schema = StructType(
         [
-            ["vendor_id", "Nullable(Int64)"],
-            ["trip_id", "Nullable(Int64)"],
-            ["trip_distance", "Nullable(Float32)"],
-            ["fare_amount", "Nullable(Float64)"],
-            ["store_and_fwd_flag", "Nullable(String)"],
+            StructField("a", IntegerType()),
+            StructField("b", StringType()),
+            StructField("c", DateType()),
+            StructField("d", ArrayType(StringType())),
+            StructField("e", BooleanType()),
+        ]
+    )
+    df = spark.createDataFrame(data=data, schema=schema)
+    df.printSchema()
+    write_iceberg_from_df(
+        spark, df, TABLE_NAME, mode="overwrite", format_version=format_version
+    )
+
+    upload_directory(minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}", "")
+
+    create_iceberg_table(instance, TABLE_NAME)
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 1
+    assert (
+        instance.query(f"SELECT a, b, c, d, e FROM {TABLE_NAME}").strip()
+        == "123\tstring\t2000-01-01\t['str1','str2']\ttrue"
+    )
+
+    table_function = f"iceberg(s3, filename='iceberg_data/default/{TABLE_NAME}/')"
+    assert (
+        instance.query(f"SELECT a, b, c, d, e FROM {table_function}").strip()
+        == "123\tstring\t2000-01-01\t['str1','str2']\ttrue"
+    )
+
+    assert instance.query(f"DESCRIBE {table_function} FORMAT TSV") == TSV(
+        [
+            ["a", "Nullable(Int32)"],
+            ["b", "Nullable(String)"],
+            ["c", "Nullable(Date32)"],
+            ["d", "Array(Nullable(String))"],
+            ["e", "Nullable(Bool)"],
         ]
     )
diff --git a/tests/integration/test_storage_kafka/kafka_pb2.py b/tests/integration/test_storage_kafka/kafka_pb2.py
index 7de1363bbf1..3e47af6c1e0 100644
--- a/tests/integration/test_storage_kafka/kafka_pb2.py
+++ b/tests/integration/test_storage_kafka/kafka_pb2.py
@@ -21,7 +21,6 @@ _builder.BuildTopDescriptorsAndMessages(
     DESCRIPTOR, "clickhouse_path.format_schemas.kafka_pb2", globals()
 )
 if _descriptor._USE_C_DESCRIPTORS == False:
-
     DESCRIPTOR._options = None
     _KEYVALUEPAIR._serialized_start = 46
     _KEYVALUEPAIR._serialized_end = 88
diff --git a/tests/integration/test_storage_kafka/message_with_repeated_pb2.py b/tests/integration/test_storage_kafka/message_with_repeated_pb2.py
index 4d1a23c0b43..3715a9bea04 100644
--- a/tests/integration/test_storage_kafka/message_with_repeated_pb2.py
+++ b/tests/integration/test_storage_kafka/message_with_repeated_pb2.py
@@ -21,7 +21,6 @@ _builder.BuildTopDescriptorsAndMessages(
     DESCRIPTOR, "clickhouse_path.format_schemas.message_with_repeated_pb2", globals()
 )
 if _descriptor._USE_C_DESCRIPTORS == False:
-
     DESCRIPTOR._options = None
     DESCRIPTOR._serialized_options = b"H\001"
     _MESSAGE._serialized_start = 62
diff --git a/tests/integration/test_storage_kafka/social_pb2.py b/tests/integration/test_storage_kafka/social_pb2.py
index 830ade81d33..f91a7bd0539 100644
--- a/tests/integration/test_storage_kafka/social_pb2.py
+++ b/tests/integration/test_storage_kafka/social_pb2.py
@@ -21,7 +21,6 @@ _builder.BuildTopDescriptorsAndMessages(
     DESCRIPTOR, "clickhouse_path.format_schemas.social_pb2", globals()
 )
 if _descriptor._USE_C_DESCRIPTORS == False:
-
     DESCRIPTOR._options = None
     _USER._serialized_start = 47
     _USER._serialized_end = 90
diff --git a/tests/integration/test_storage_kafka/test.py b/tests/integration/test_storage_kafka/test.py
index 9f617369859..9a6d3e0513c 100644
--- a/tests/integration/test_storage_kafka/test.py
+++ b/tests/integration/test_storage_kafka/test.py
@@ -121,7 +121,7 @@ def kafka_create_topic(
 
 def kafka_delete_topic(admin_client, topic, max_retries=50):
     result = admin_client.delete_topics([topic])
-    for (topic, e) in result.topic_error_codes:
+    for topic, e in result.topic_error_codes:
         if e == 0:
             logging.debug(f"Topic {topic} deleted")
         else:
@@ -285,6 +285,78 @@ def avro_confluent_message(schema_registry_client, value):
 # Tests
 
 
+def test_kafka_column_types(kafka_cluster):
+    def assert_returned_exception(e):
+        assert e.value.returncode == 36
+        assert (
+            "KafkaEngine doesn't support DEFAULT/MATERIALIZED/EPHEMERAL expressions for columns."
+            in str(e.value)
+        )
+
+    # check column with DEFAULT expression
+    with pytest.raises(QueryRuntimeException) as exception:
+        instance.query(
+            """
+                CREATE TABLE test.kafka (a Int, b Int DEFAULT 0)
+                ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_new}', '{kafka_group_name_new}', '{kafka_format_json_each_row}', '\\n')
+                """
+        )
+    assert_returned_exception(exception)
+
+    # check EPHEMERAL
+    with pytest.raises(QueryRuntimeException) as exception:
+        instance.query(
+            """
+                CREATE TABLE test.kafka (a Int, b Int EPHEMERAL)
+                ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_new}', '{kafka_group_name_new}', '{kafka_format_json_each_row}', '\\n')
+                """
+        )
+    assert_returned_exception(exception)
+
+    # check ALIAS
+    instance.query(
+        """
+                CREATE TABLE test.kafka (a Int, b String Alias toString(a))
+                ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_new}', '{kafka_group_name_new}', '{kafka_format_json_each_row}', '\\n')
+                SETTINGS kafka_commit_on_select = 1;
+                """
+    )
+    messages = []
+    for i in range(5):
+        messages.append(json.dumps({"a": i}))
+    kafka_produce(kafka_cluster, "new", messages)
+    result = ""
+    expected = TSV(
+        """
+0\t0
+1\t1
+2\t2
+3\t3
+4\t4
+                              """
+    )
+    retries = 50
+    while retries > 0:
+        result += instance.query("SELECT a, b FROM test.kafka", ignore_error=True)
+        if TSV(result) == expected:
+            break
+        retries -= 1
+
+    assert TSV(result) == expected
+
+    instance.query("DROP TABLE test.kafka SYNC")
+
+    # check MATERIALIZED
+    with pytest.raises(QueryRuntimeException) as exception:
+        instance.query(
+            """
+                CREATE TABLE test.kafka (a Int, b String MATERIALIZED toString(a))
+                ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_new}', '{kafka_group_name_new}', '{kafka_format_json_each_row}', '\\n')
+                """
+        )
+    assert_returned_exception(exception)
+
+
 def test_kafka_settings_old_syntax(kafka_cluster):
     assert TSV(
         instance.query(
@@ -867,9 +939,7 @@ def describe_consumer_group(kafka_cluster, name):
         member_info["client_id"] = client_id
         member_info["client_host"] = client_host
         member_topics_assignment = []
-        for (topic, partitions) in MemberAssignment.decode(
-            member_assignment
-        ).assignment:
+        for topic, partitions in MemberAssignment.decode(member_assignment).assignment:
             member_topics_assignment.append({"topic": topic, "partitions": partitions})
         member_info["assignment"] = member_topics_assignment
         res.append(member_info)
@@ -1487,7 +1557,6 @@ def test_kafka_protobuf_no_delimiter(kafka_cluster):
 
 
 def test_kafka_materialized_view(kafka_cluster):
-
     instance.query(
         """
         DROP TABLE IF EXISTS test.view;
@@ -2265,7 +2334,6 @@ def test_kafka_virtual_columns2(kafka_cluster):
 
 
 def test_kafka_produce_key_timestamp(kafka_cluster):
-
     admin_client = KafkaAdminClient(
         bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
     )
@@ -2394,7 +2462,6 @@ def test_kafka_insert_avro(kafka_cluster):
 
 
 def test_kafka_produce_consume_avro(kafka_cluster):
-
     admin_client = KafkaAdminClient(
         bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
     )
@@ -3981,7 +4048,6 @@ def test_kafka_predefined_configuration(kafka_cluster):
 
 # https://github.com/ClickHouse/ClickHouse/issues/26643
 def test_issue26643(kafka_cluster):
-
     # for backporting:
     # admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
     admin_client = KafkaAdminClient(
@@ -4263,7 +4329,6 @@ def test_row_based_formats(kafka_cluster):
         "RowBinaryWithNamesAndTypes",
         "MsgPack",
     ]:
-
         print(format_name)
 
         kafka_create_topic(admin_client, format_name)
@@ -4388,7 +4453,6 @@ def test_block_based_formats_2(kafka_cluster):
         "ORC",
         "JSONCompactColumns",
     ]:
-
         kafka_create_topic(admin_client, format_name)
 
         instance.query(
diff --git a/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf b/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf
index b43a54b4dc5..dffdcaebe81 100644
--- a/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf
+++ b/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf
@@ -9,6 +9,7 @@
  dns_lookup_kdc = false
  ticket_lifetime = 5s
  forwardable = true
+ rdns = false
  default_tgs_enctypes = des3-hmac-sha1
  default_tkt_enctypes = des3-hmac-sha1
  permitted_enctypes = des3-hmac-sha1
diff --git a/tests/integration/test_storage_kerberized_kafka/secrets/krb.conf b/tests/integration/test_storage_kerberized_kafka/secrets/krb.conf
index 1efdf510f22..bda73a285cf 100644
--- a/tests/integration/test_storage_kerberized_kafka/secrets/krb.conf
+++ b/tests/integration/test_storage_kerberized_kafka/secrets/krb.conf
@@ -10,6 +10,7 @@
  ticket_lifetime = 15s
  renew_lifetime = 15s
  forwardable = true
+ rdns = false
 
 [realms]
  TEST.CLICKHOUSE.TECH = {
diff --git a/tests/integration/test_storage_meilisearch/test.py b/tests/integration/test_storage_meilisearch/test.py
index 66c32459251..ddcd7154154 100644
--- a/tests/integration/test_storage_meilisearch/test.py
+++ b/tests/integration/test_storage_meilisearch/test.py
@@ -57,10 +57,12 @@ def test_simple_select(started_cluster):
 
     push_data(client, table, data)
 
+    parameters = "'http://meili1:7700', 'new_table', ''"
+
     node = started_cluster.instances["meili"]
     node.query("DROP TABLE IF EXISTS simple_meili_table")
     node.query(
-        "CREATE TABLE simple_meili_table(id UInt64, data String) ENGINE = MeiliSearch('http://meili1:7700', 'new_table', '')"
+        f"CREATE TABLE simple_meili_table(id UInt64, data String) ENGINE = MeiliSearch({parameters})"
     )
 
     assert node.query("SELECT COUNT() FROM simple_meili_table") == "100\n"
@@ -73,7 +75,25 @@ def test_simple_select(started_cluster):
         node.query("SELECT data FROM simple_meili_table WHERE id = 42")
         == hex(42 * 42) + "\n"
     )
+    node.query(
+        f"CREATE TABLE simple_meili_table_auto_schema_engine ENGINE=MeiliSearch({parameters})"
+    )
+    node.query(
+        f"CREATE TABLE simple_meili_table_auto_schema_function AS meilisearch({parameters})"
+    )
+
+    expected = "id\tInt64\t\t\t\t\t\ndata\tString\t\t\t\t\t\n"
+    assert (
+        node.query("DESCRIBE TABLE simple_meili_table_auto_schema_engine") == expected
+    )
+    assert (
+        node.query("DESCRIBE TABLE simple_meili_table_auto_schema_function") == expected
+    )
+
     node.query("DROP TABLE simple_meili_table")
+    node.query("DROP TABLE simple_meili_table_auto_schema_engine")
+    node.query("DROP TABLE simple_meili_table_auto_schema_function")
+
     table.delete()
 
 
diff --git a/tests/integration/test_storage_mongodb/test.py b/tests/integration/test_storage_mongodb/test.py
index 74b2b15fda0..6ba5520704d 100644
--- a/tests/integration/test_storage_mongodb/test.py
+++ b/tests/integration/test_storage_mongodb/test.py
@@ -4,6 +4,7 @@ import pytest
 from helpers.client import QueryRuntimeException
 
 from helpers.cluster import ClickHouseCluster
+import datetime
 
 
 @pytest.fixture(scope="module")
@@ -70,6 +71,149 @@ def test_simple_select(started_cluster):
     simple_mongo_table.drop()
 
 
+@pytest.mark.parametrize("started_cluster", [False], indirect=["started_cluster"])
+def test_arrays(started_cluster):
+    mongo_connection = get_mongo_connection(started_cluster)
+    db = mongo_connection["test"]
+    db.add_user("root", "clickhouse")
+    arrays_mongo_table = db["arrays_table"]
+    data = []
+    for i in range(0, 100):
+        data.append(
+            {
+                "key": i,
+                "arr_int64": [-(i + 1), -(i + 2), -(i + 3)],
+                "arr_int32": [-(i + 1), -(i + 2), -(i + 3)],
+                "arr_int16": [-(i + 1), -(i + 2), -(i + 3)],
+                "arr_int8": [-(i + 1), -(i + 2), -(i + 3)],
+                "arr_uint64": [i + 1, i + 2, i + 3],
+                "arr_uint32": [i + 1, i + 2, i + 3],
+                "arr_uint16": [i + 1, i + 2, i + 3],
+                "arr_uint8": [i + 1, i + 2, i + 3],
+                "arr_float32": [i + 1.125, i + 2.5, i + 3.750],
+                "arr_float64": [i + 1.125, i + 2.5, i + 3.750],
+                "arr_date": [
+                    datetime.datetime(2002, 10, 27),
+                    datetime.datetime(2024, 1, 8),
+                ],
+                "arr_datetime": [
+                    datetime.datetime(2023, 3, 31, 6, 3, 12),
+                    datetime.datetime(1999, 2, 28, 12, 46, 34),
+                ],
+                "arr_string": [str(i + 1), str(i + 2), str(i + 3)],
+                "arr_uuid": [
+                    "f0e77736-91d1-48ce-8f01-15123ca1c7ed",
+                    "93376a07-c044-4281-a76e-ad27cf6973c5",
+                ],
+                "arr_arr_bool": [
+                    [True, False, True],
+                    [True],
+                    [],
+                    None,
+                    [False],
+                    [None],
+                ],
+                "arr_empty": [],
+                "arr_null": None,
+                "arr_nullable": None,
+            }
+        )
+
+    arrays_mongo_table.insert_many(data)
+
+    node = started_cluster.instances["node"]
+    node.query(
+        "CREATE TABLE arrays_mongo_table("
+        "key UInt64,"
+        "arr_int64 Array(Int64),"
+        "arr_int32 Array(Int32),"
+        "arr_int16 Array(Int16),"
+        "arr_int8 Array(Int8),"
+        "arr_uint64 Array(UInt64),"
+        "arr_uint32 Array(UInt32),"
+        "arr_uint16 Array(UInt16),"
+        "arr_uint8 Array(UInt8),"
+        "arr_float32 Array(Float32),"
+        "arr_float64 Array(Float64),"
+        "arr_date Array(Date),"
+        "arr_datetime Array(DateTime),"
+        "arr_string Array(String),"
+        "arr_uuid Array(UUID),"
+        "arr_arr_bool Array(Array(Bool)),"
+        "arr_empty Array(UInt64),"
+        "arr_null Array(UInt64),"
+        "arr_arr_null Array(Array(UInt64)),"
+        "arr_nullable Array(Nullable(UInt64))"
+        ") ENGINE = MongoDB('mongo1:27017', 'test', 'arrays_table', 'root', 'clickhouse')"
+    )
+
+    assert node.query("SELECT COUNT() FROM arrays_mongo_table") == "100\n"
+
+    for column_name in ["arr_int64", "arr_int32", "arr_int16", "arr_int8"]:
+        assert (
+            node.query(f"SELECT {column_name} FROM arrays_mongo_table WHERE key = 42")
+            == "[-43,-44,-45]\n"
+        )
+
+    for column_name in ["arr_uint64", "arr_uint32", "arr_uint16", "arr_uint8"]:
+        assert (
+            node.query(f"SELECT {column_name} FROM arrays_mongo_table WHERE key = 42")
+            == "[43,44,45]\n"
+        )
+
+    for column_name in ["arr_float32", "arr_float64"]:
+        assert (
+            node.query(f"SELECT {column_name} FROM arrays_mongo_table WHERE key = 42")
+            == "[43.125,44.5,45.75]\n"
+        )
+
+    assert (
+        node.query(f"SELECT arr_date FROM arrays_mongo_table WHERE key = 42")
+        == "['2002-10-27','2024-01-08']\n"
+    )
+
+    assert (
+        node.query(f"SELECT arr_datetime FROM arrays_mongo_table WHERE key = 42")
+        == "['2023-03-31 06:03:12','1999-02-28 12:46:34']\n"
+    )
+
+    assert (
+        node.query(f"SELECT arr_string FROM arrays_mongo_table WHERE key = 42")
+        == "['43','44','45']\n"
+    )
+
+    assert (
+        node.query(f"SELECT arr_uuid FROM arrays_mongo_table WHERE key = 42")
+        == "['f0e77736-91d1-48ce-8f01-15123ca1c7ed','93376a07-c044-4281-a76e-ad27cf6973c5']\n"
+    )
+
+    assert (
+        node.query(f"SELECT arr_arr_bool FROM arrays_mongo_table WHERE key = 42")
+        == "[[true,false,true],[true],[],[],[false],[false]]\n"
+    )
+
+    assert (
+        node.query(f"SELECT arr_empty FROM arrays_mongo_table WHERE key = 42") == "[]\n"
+    )
+
+    assert (
+        node.query(f"SELECT arr_null FROM arrays_mongo_table WHERE key = 42") == "[]\n"
+    )
+
+    assert (
+        node.query(f"SELECT arr_arr_null FROM arrays_mongo_table WHERE key = 42")
+        == "[]\n"
+    )
+
+    assert (
+        node.query(f"SELECT arr_nullable FROM arrays_mongo_table WHERE key = 42")
+        == "[]\n"
+    )
+
+    node.query("DROP TABLE arrays_mongo_table")
+    arrays_mongo_table.drop()
+
+
 @pytest.mark.parametrize("started_cluster", [False], indirect=["started_cluster"])
 def test_complex_data_type(started_cluster):
     mongo_connection = get_mongo_connection(started_cluster)
diff --git a/tests/integration/test_storage_mysql/configs/named_collections.xml b/tests/integration/test_storage_mysql/configs/named_collections.xml
index 4d3fbf6085c..04117f32d4b 100644
--- a/tests/integration/test_storage_mysql/configs/named_collections.xml
+++ b/tests/integration/test_storage_mysql/configs/named_collections.xml
@@ -36,7 +36,6 @@
             <host>mysql57</host>
             <port>3306</port>
             <database>clickhouse</database>
-            <table>test_settings</table>
             <connection_pool_size>1</connection_pool_size>
             <read_write_timeout>20123001</read_write_timeout>
             <connect_timeout>20123002</connect_timeout>
diff --git a/tests/integration/test_storage_mysql/test.py b/tests/integration/test_storage_mysql/test.py
index 50f0c5519b5..49629575ec7 100644
--- a/tests/integration/test_storage_mysql/test.py
+++ b/tests/integration/test_storage_mysql/test.py
@@ -307,6 +307,32 @@ def test_table_function(started_cluster):
     conn.close()
 
 
+def test_schema_inference(started_cluster):
+    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    drop_mysql_table(conn, "inference_table")
+
+    with conn.cursor() as cursor:
+        cursor.execute(
+            "CREATE TABLE clickhouse.inference_table (id INT PRIMARY KEY, data BINARY(16) NOT NULL)"
+        )
+
+    parameters = "'mysql57:3306', 'clickhouse', 'inference_table', 'root', 'clickhouse'"
+
+    node1.query(
+        f"CREATE TABLE mysql_schema_inference_engine ENGINE=MySQL({parameters})"
+    )
+    node1.query(f"CREATE TABLE mysql_schema_inference_function AS mysql({parameters})")
+
+    expected = "id\tInt32\t\t\t\t\t\ndata\tFixedString(16)\t\t\t\t\t\n"
+    assert node1.query("DESCRIBE TABLE mysql_schema_inference_engine") == expected
+    assert node1.query("DESCRIBE TABLE mysql_schema_inference_function") == expected
+
+    node1.query("DROP TABLE mysql_schema_inference_engine")
+    node1.query("DROP TABLE mysql_schema_inference_function")
+
+    drop_mysql_table(conn, "inference_table")
+
+
 def test_binary_type(started_cluster):
     conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
     drop_mysql_table(conn, "binary_type")
@@ -329,6 +355,7 @@ def test_binary_type(started_cluster):
         node1.query("SELECT * FROM {}".format(table_function))
         == "42\tclickhouse\\0\\0\\0\\0\\0\\0\n"
     )
+    drop_mysql_table(conn, "binary_type")
 
 
 def test_enum_type(started_cluster):
@@ -519,13 +546,21 @@ def test_settings_connection_wait_timeout(started_cluster):
         )
     )
 
+    worker_started_event = threading.Event()
+
     def worker():
-        node1.query("SELECT sleepEachRow(1) FROM {}".format(table_name))
+        worker_started_event.set()
+        node1.query(
+            "SELECT 1, sleepEachRow(1) FROM {} SETTINGS max_threads=1".format(
+                table_name
+            )
+        )
 
     worker_thread = threading.Thread(target=worker)
     worker_thread.start()
 
     # ensure that first query started in worker_thread
+    assert worker_started_event.wait(10)
     time.sleep(1)
 
     started = time.time()
@@ -533,7 +568,11 @@ def test_settings_connection_wait_timeout(started_cluster):
         QueryRuntimeException,
         match=r"Exception: mysqlxx::Pool is full \(connection_wait_timeout is exceeded\)",
     ):
-        node1.query("SELECT sleepEachRow(1) FROM {}".format(table_name))
+        node1.query(
+            "SELECT 2, sleepEachRow(1) FROM {} SETTINGS max_threads=1".format(
+                table_name
+            )
+        )
     ended = time.time()
     assert (ended - started) >= wait_timeout
 
@@ -765,7 +804,7 @@ def test_settings(started_cluster):
 
     rw_timeout = 20123001
     connect_timeout = 20123002
-    node1.query(f"SELECT * FROM mysql(mysql_with_settings)")
+    node1.query(f"SELECT * FROM mysql(mysql_with_settings, table='test_settings')")
     assert node1.contains_in_log(
         f"with settings: connect_timeout={connect_timeout}, read_write_timeout={rw_timeout}"
     )
diff --git a/tests/integration/test_storage_nats/nats_pb2.py b/tests/integration/test_storage_nats/nats_pb2.py
index 4330ff57950..e9e5cb72363 100644
--- a/tests/integration/test_storage_nats/nats_pb2.py
+++ b/tests/integration/test_storage_nats/nats_pb2.py
@@ -31,7 +31,6 @@ ProtoKeyValue = _reflection.GeneratedProtocolMessageType(
 _sym_db.RegisterMessage(ProtoKeyValue)
 
 if _descriptor._USE_C_DESCRIPTORS == False:
-
     DESCRIPTOR._options = None
     _PROTOKEYVALUE._serialized_start = 45
     _PROTOKEYVALUE._serialized_end = 88
diff --git a/tests/integration/test_storage_nats/test.py b/tests/integration/test_storage_nats/test.py
index 2988c67bf63..1d7e046864b 100644
--- a/tests/integration/test_storage_nats/test.py
+++ b/tests/integration/test_storage_nats/test.py
@@ -94,7 +94,7 @@ def nats_cluster():
 def nats_setup_teardown():
     print("NATS is available - running test")
     yield  # run test
-    instance.query("DROP DATABASE test NO DELAY")
+    instance.query("DROP DATABASE test SYNC")
     instance.query("CREATE DATABASE test")
 
 
diff --git a/tests/integration/test_storage_postgresql/test.py b/tests/integration/test_storage_postgresql/test.py
index a3ebbe97451..e9ddb0f73a5 100644
--- a/tests/integration/test_storage_postgresql/test.py
+++ b/tests/integration/test_storage_postgresql/test.py
@@ -62,6 +62,16 @@ def test_postgres_select_insert(started_cluster):
     # for i in range(1, 1000):
     #     assert (node1.query(check1)).rstrip() == '10000', f"Failed on {i}"
 
+    result = node1.query(
+        f"""
+        INSERT INTO TABLE FUNCTION {table}
+        SELECT number, concat('name_', toString(number)), 3 from numbers(1000000)"""
+    )
+    check1 = f"SELECT count() FROM {table}"
+    check2 = f"SELECT count() FROM (SELECT * FROM {table} LIMIT 10)"
+    assert (node1.query(check1)).rstrip() == "1010000"
+    assert (node1.query(check2)).rstrip() == "10"
+
     cursor.execute(f"DROP TABLE {table_name} ")
 
 
@@ -173,7 +183,7 @@ def test_postgres_conversions(started_cluster):
     cursor.execute(f"DROP TABLE test_array_dimensions")
 
 
-def test_non_default_scema(started_cluster):
+def test_non_default_schema(started_cluster):
     node1.query("DROP TABLE IF EXISTS test_pg_table_schema")
     node1.query("DROP TABLE IF EXISTS test_pg_table_schema_with_dots")
 
@@ -198,7 +208,9 @@ def test_non_default_scema(started_cluster):
     expected = node1.query("SELECT number FROM numbers(100)")
     assert result == expected
 
-    table_function = """postgresql('postgres1:5432', 'postgres', 'test_table', 'postgres', 'mysecretpassword', 'test_schema')"""
+    parameters = "'postgres1:5432', 'postgres', 'test_table', 'postgres', 'mysecretpassword', 'test_schema'"
+    table_function = f"postgresql({parameters})"
+    table_engine = f"PostgreSQL({parameters})"
     result = node1.query(f"SELECT * FROM {table_function}")
     assert result == expected
 
@@ -224,10 +236,19 @@ def test_non_default_scema(started_cluster):
     expected = node1.query("SELECT number FROM numbers(200)")
     assert result == expected
 
+    node1.query(f"CREATE TABLE test.test_pg_auto_schema_engine ENGINE={table_engine}")
+    node1.query(f"CREATE TABLE test.test_pg_auto_schema_function AS {table_function}")
+
+    expected = "a\tNullable(Int32)\t\t\t\t\t\n"
+    assert node1.query("DESCRIBE TABLE test.test_pg_auto_schema_engine") == expected
+    assert node1.query("DESCRIBE TABLE test.test_pg_auto_schema_function") == expected
+
     cursor.execute("DROP SCHEMA test_schema CASCADE")
     cursor.execute('DROP SCHEMA "test.nice.schema" CASCADE')
     node1.query("DROP TABLE test.test_pg_table_schema")
     node1.query("DROP TABLE test.test_pg_table_schema_with_dots")
+    node1.query("DROP TABLE test.test_pg_auto_schema_engine")
+    node1.query("DROP TABLE test.test_pg_auto_schema_function")
 
 
 def test_concurrent_queries(started_cluster):
@@ -382,7 +403,7 @@ def test_postgres_distributed(started_cluster):
         """
         CREATE TABLE test_shards2
         (id UInt32, name String, age UInt32, money UInt32)
-        ENGINE = ExternalDistributed('PostgreSQL', postgres4, description='postgres{1|2}:5432,postgres{3|4}:5432'); """
+        ENGINE = ExternalDistributed('PostgreSQL', postgres4, addresses_expr='postgres{1|2}:5432,postgres{3|4}:5432'); """
     )
 
     result = node2.query("SELECT DISTINCT(name) FROM test_shards2 ORDER BY name")
diff --git a/tests/integration/test_storage_postgresql_replica/test.py b/tests/integration/test_storage_postgresql_replica/test.py
index 5df8b9029e6..66495700102 100644
--- a/tests/integration/test_storage_postgresql_replica/test.py
+++ b/tests/integration/test_storage_postgresql_replica/test.py
@@ -179,7 +179,7 @@ def test_initial_load_from_snapshot(started_cluster):
 
     cursor.execute("DROP TABLE postgresql_replica;")
     postgresql_replica_check_result(result, True)
-    instance.query(f"DROP TABLE test.postgresql_replica NO DELAY")
+    instance.query(f"DROP TABLE test.postgresql_replica SYNC")
 
 
 @pytest.mark.timeout(320)
@@ -216,7 +216,7 @@ def test_no_connection_at_startup(started_cluster):
     result = instance.query("SELECT * FROM test.postgresql_replica ORDER BY key;")
     cursor.execute("DROP TABLE postgresql_replica;")
     postgresql_replica_check_result(result, True)
-    instance.query(f"DROP TABLE test.postgresql_replica NO DELAY")
+    instance.query(f"DROP TABLE test.postgresql_replica SYNC")
 
 
 @pytest.mark.timeout(320)
@@ -255,7 +255,7 @@ def test_detach_attach_is_ok(started_cluster):
 
     cursor.execute("DROP TABLE postgresql_replica;")
     postgresql_replica_check_result(result, True)
-    instance.query(f"DROP TABLE test.postgresql_replica NO DELAY")
+    instance.query(f"DROP TABLE test.postgresql_replica SYNC")
 
 
 @pytest.mark.timeout(320)
@@ -309,7 +309,7 @@ def test_replicating_insert_queries(started_cluster):
     result = instance.query("SELECT * FROM test.postgresql_replica ORDER BY key;")
     cursor.execute("DROP TABLE postgresql_replica;")
     postgresql_replica_check_result(result, True)
-    instance.query(f"DROP TABLE test.postgresql_replica NO DELAY")
+    instance.query(f"DROP TABLE test.postgresql_replica SYNC")
 
 
 @pytest.mark.timeout(320)
@@ -661,13 +661,13 @@ def test_virtual_columns(started_cluster):
         time.sleep(0.5)
         result = instance.query("SELECT count() FROM test.postgresql_replica;")
 
-    # just check that it works, no check with `expected` becuase _version is taken as LSN, which will be different each time.
+    # just check that it works, no check with `expected` because _version is taken as LSN, which will be different each time.
     result = instance.query(
         "SELECT key, value, _sign, _version FROM test.postgresql_replica;"
     )
     print(result)
     cursor.execute("DROP TABLE postgresql_replica;")
-    instance.query(f"DROP TABLE test.postgresql_replica NO DELAY")
+    instance.query(f"DROP TABLE test.postgresql_replica SYNC")
 
 
 def test_abrupt_connection_loss_while_heavy_replication(started_cluster):
@@ -702,11 +702,10 @@ def test_abrupt_connection_loss_while_heavy_replication(started_cluster):
 
     result = instance.query("SELECT count() FROM test.postgresql_replica")
     print(result)  # Just debug
-    instance.query(f"DROP TABLE test.postgresql_replica NO DELAY")
+    instance.query(f"DROP TABLE test.postgresql_replica SYNC")
 
 
 def test_abrupt_server_restart_while_heavy_replication(started_cluster):
-
     # FIXME (kssenii) temporary disabled
     if instance.is_built_with_sanitizer():
         pytest.skip("Temporary disabled (FIXME)")
@@ -721,7 +720,7 @@ def test_abrupt_server_restart_while_heavy_replication(started_cluster):
     create_postgres_table(cursor, table_name)
 
     instance.query(f"INSERT INTO postgres_database.{table_name} SELECT -1, 1")
-    instance.query(f"DROP TABLE IF EXISTS test.{table_name} NO DELAY")
+    instance.query(f"DROP TABLE IF EXISTS test.{table_name} SYNC")
     create_materialized_table(
         ip=started_cluster.postgres_ip,
         port=started_cluster.postgres_port,
@@ -748,7 +747,7 @@ def test_abrupt_server_restart_while_heavy_replication(started_cluster):
 
     result = instance.query(f"SELECT count() FROM test.{table_name}")
     print(result)  # Just debug
-    instance.query(f"DROP TABLE test.{table_name} NO DELAY")
+    instance.query(f"DROP TABLE test.{table_name} SYNC")
 
 
 def test_drop_table_immediately(started_cluster):
@@ -772,7 +771,7 @@ def test_drop_table_immediately(started_cluster):
         ip=started_cluster.postgres_ip, port=started_cluster.postgres_port
     )
     check_tables_are_synchronized("postgresql_replica")
-    instance.query(f"DROP TABLE test.postgresql_replica NO DELAY")
+    instance.query(f"DROP TABLE test.postgresql_replica SYNC")
 
 
 if __name__ == "__main__":
diff --git a/tests/integration/test_storage_rabbitmq/rabbitmq_pb2.py b/tests/integration/test_storage_rabbitmq/rabbitmq_pb2.py
index e017b4e66c2..a5845652eef 100644
--- a/tests/integration/test_storage_rabbitmq/rabbitmq_pb2.py
+++ b/tests/integration/test_storage_rabbitmq/rabbitmq_pb2.py
@@ -21,7 +21,6 @@ _builder.BuildTopDescriptorsAndMessages(
     DESCRIPTOR, "clickhouse_path.format_schemas.rabbitmq_pb2", globals()
 )
 if _descriptor._USE_C_DESCRIPTORS == False:
-
     DESCRIPTOR._options = None
     _KEYVALUEPROTO._serialized_start = 49
     _KEYVALUEPROTO._serialized_end = 92
diff --git a/tests/integration/test_storage_rabbitmq/test.py b/tests/integration/test_storage_rabbitmq/test.py
index 2e54f21787a..4e1e28373e3 100644
--- a/tests/integration/test_storage_rabbitmq/test.py
+++ b/tests/integration/test_storage_rabbitmq/test.py
@@ -95,7 +95,7 @@ def rabbitmq_cluster():
 def rabbitmq_setup_teardown():
     print("RabbitMQ is available - running test")
     yield  # run test
-    instance.query("DROP DATABASE test NO DELAY")
+    instance.query("DROP DATABASE test SYNC")
     instance.query("CREATE DATABASE test")
 
 
@@ -1097,10 +1097,10 @@ def test_rabbitmq_overloaded_insert(rabbitmq_cluster):
 
     instance.query(
         """
-        DROP TABLE test.consumer_overload NO DELAY;
-        DROP TABLE test.view_overload NO DELAY;
-        DROP TABLE test.rabbitmq_consume NO DELAY;
-        DROP TABLE test.rabbitmq_overload NO DELAY;
+        DROP TABLE test.consumer_overload SYNC;
+        DROP TABLE test.view_overload SYNC;
+        DROP TABLE test.rabbitmq_consume SYNC;
+        DROP TABLE test.rabbitmq_overload SYNC;
     """
     )
 
@@ -2674,7 +2674,7 @@ def test_rabbitmq_issue_30691(rabbitmq_cluster):
 def test_rabbitmq_drop_mv(rabbitmq_cluster):
     instance.query(
         """
-        CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
+        CREATE TABLE test.drop_mv (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
                      rabbitmq_exchange_name = 'mv',
@@ -2693,7 +2693,7 @@ def test_rabbitmq_drop_mv(rabbitmq_cluster):
     instance.query(
         """
         CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-            SELECT * FROM test.rabbitmq;
+            SELECT * FROM test.drop_mv;
     """
     )
 
@@ -2710,15 +2710,15 @@ def test_rabbitmq_drop_mv(rabbitmq_cluster):
             exchange="mv", routing_key="", body=json.dumps({"key": i, "value": i})
         )
 
-    start = time.time()
-    while time.time() - start < 30:
+    while True:
         res = instance.query("SELECT COUNT(*) FROM test.view")
-        if "20" == res:
+        print(f"Current count (1): {res}")
+        if int(res) == 20:
             break
         else:
             logging.debug(f"Number of rows in test.view: {res}")
 
-    instance.query("DROP VIEW test.consumer")
+    instance.query("DROP VIEW test.consumer SYNC")
     for i in range(20, 40):
         channel.basic_publish(
             exchange="mv", routing_key="", body=json.dumps({"key": i, "value": i})
@@ -2727,7 +2727,7 @@ def test_rabbitmq_drop_mv(rabbitmq_cluster):
     instance.query(
         """
         CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-            SELECT * FROM test.rabbitmq;
+            SELECT * FROM test.drop_mv;
     """
     )
     for i in range(40, 50):
@@ -2736,14 +2736,16 @@ def test_rabbitmq_drop_mv(rabbitmq_cluster):
         )
 
     while True:
-        result = instance.query("SELECT * FROM test.view ORDER BY key")
-        if rabbitmq_check_result(result):
+        result = instance.query("SELECT count() FROM test.view")
+        print(f"Current count (2): {result}")
+        if int(result) == 50:
             break
         time.sleep(1)
 
+    result = instance.query("SELECT * FROM test.view ORDER BY key")
     rabbitmq_check_result(result, True)
 
-    instance.query("DROP VIEW test.consumer NO DELAY")
+    instance.query("DROP VIEW test.consumer SYNC")
     time.sleep(10)
     for i in range(50, 60):
         channel.basic_publish(
@@ -2754,10 +2756,11 @@ def test_rabbitmq_drop_mv(rabbitmq_cluster):
     count = 0
     start = time.time()
     while time.time() - start < 30:
-        count = int(instance.query("SELECT count() FROM test.rabbitmq"))
+        count = int(instance.query("SELECT count() FROM test.drop_mv"))
         if count:
             break
 
+    instance.query("DROP TABLE test.drop_mv")
     assert count > 0
 
 
@@ -2864,7 +2867,6 @@ def test_rabbitmq_predefined_configuration(rabbitmq_cluster):
 
 
 def test_rabbitmq_msgpack(rabbitmq_cluster):
-
     instance.query(
         """
         drop table if exists rabbit_in;
@@ -2908,7 +2910,6 @@ def test_rabbitmq_msgpack(rabbitmq_cluster):
 
 
 def test_rabbitmq_address(rabbitmq_cluster):
-
     instance2.query(
         """
         drop table if exists rabbit_in;
@@ -3243,7 +3244,6 @@ def test_block_based_formats_2(rabbitmq_cluster):
         "ORC",
         "JSONCompactColumns",
     ]:
-
         print(format_name)
 
         instance.query(
diff --git a/tests/integration/test_storage_s3/configs/named_collections.xml b/tests/integration/test_storage_s3/configs/named_collections.xml
index fcc8bcac555..64674e2a3e3 100644
--- a/tests/integration/test_storage_s3/configs/named_collections.xml
+++ b/tests/integration/test_storage_s3/configs/named_collections.xml
@@ -35,5 +35,9 @@
             <access_key_id>minio</access_key_id>
             <secret_access_key>minio123</secret_access_key>
         </s3_parquet2>
+        <s3_json_no_sign>
+            <url>http://minio1:9001/root/test_cache4.jsonl</url>
+            <no_sign_request>true</no_sign_request>
+        </s3_json_no_sign>
     </named_collections>
 </clickhouse>
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index 54944b56919..d9ac70f51ad 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -13,61 +13,12 @@ from helpers.cluster import ClickHouseCluster, ClickHouseInstance
 from helpers.network import PartitionManager
 from helpers.mock_servers import start_mock_servers
 from helpers.test_tools import exec_query_with_retry
+from helpers.s3_tools import prepare_s3_bucket
 
 MINIO_INTERNAL_PORT = 9001
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
-# Creates S3 bucket for tests and allows anonymous read-write access to it.
-def prepare_s3_bucket(started_cluster):
-    # Allows read-write access for bucket without authorization.
-    bucket_read_write_policy = {
-        "Version": "2012-10-17",
-        "Statement": [
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:GetBucketLocation",
-                "Resource": "arn:aws:s3:::root",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:ListBucket",
-                "Resource": "arn:aws:s3:::root",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:GetObject",
-                "Resource": "arn:aws:s3:::root/*",
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:PutObject",
-                "Resource": "arn:aws:s3:::root/*",
-            },
-        ],
-    }
-
-    minio_client = started_cluster.minio_client
-    minio_client.set_bucket_policy(
-        started_cluster.minio_bucket, json.dumps(bucket_read_write_policy)
-    )
-
-    started_cluster.minio_restricted_bucket = "{}-with-auth".format(
-        started_cluster.minio_bucket
-    )
-    if minio_client.bucket_exists(started_cluster.minio_restricted_bucket):
-        minio_client.remove_bucket(started_cluster.minio_restricted_bucket)
-
-    minio_client.make_bucket(started_cluster.minio_restricted_bucket)
-
 
 def put_s3_file_content(started_cluster, bucket, filename, data):
     buf = io.BytesIO(data)
@@ -1056,13 +1007,13 @@ def test_seekable_formats(started_cluster):
     table_function = f"s3(s3_orc, structure='a Int32, b String', format='ORC')"
     exec_query_with_retry(
         instance,
-        f"insert into table function {table_function} SELECT number, randomString(100) FROM numbers(1000000) settings s3_truncate_on_insert=1",
+        f"insert into table function {table_function} SELECT number, randomString(100) FROM numbers(1500000) settings s3_truncate_on_insert=1",
     )
 
     result = instance.query(
-        f"SELECT count() FROM {table_function} SETTINGS max_memory_usage='50M'"
+        f"SELECT count() FROM {table_function} SETTINGS max_memory_usage='60M'"
     )
-    assert int(result) == 1000000
+    assert int(result) == 1500000
 
     instance.query(f"SELECT * FROM {table_function} FORMAT Null")
 
@@ -1073,7 +1024,7 @@ def test_seekable_formats(started_cluster):
     result = result.strip()
     assert result.endswith("MiB")
     result = result[: result.index(".")]
-    assert int(result) > 80
+    assert int(result) > 150
 
 
 def test_seekable_formats_url(started_cluster):
@@ -1083,23 +1034,23 @@ def test_seekable_formats_url(started_cluster):
     table_function = f"s3(s3_parquet, structure='a Int32, b String', format='Parquet')"
     exec_query_with_retry(
         instance,
-        f"insert into table function {table_function} SELECT number, randomString(100) FROM numbers(1000000) settings s3_truncate_on_insert=1",
+        f"insert into table function {table_function} SELECT number, randomString(100) FROM numbers(1500000) settings s3_truncate_on_insert=1",
     )
 
     result = instance.query(f"SELECT count() FROM {table_function}")
-    assert int(result) == 1000000
+    assert int(result) == 1500000
 
     table_function = f"s3(s3_orc, structure='a Int32, b String', format='ORC')"
     exec_query_with_retry(
         instance,
-        f"insert into table function {table_function} SELECT number, randomString(100) FROM numbers(1000000) settings s3_truncate_on_insert=1",
+        f"insert into table function {table_function} SELECT number, randomString(100) FROM numbers(1500000) settings s3_truncate_on_insert=1",
     )
 
     table_function = f"url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_parquet', 'Parquet', 'a Int32, b String')"
     result = instance.query(
-        f"SELECT count() FROM {table_function} SETTINGS max_memory_usage='50M'"
+        f"SELECT count() FROM {table_function} SETTINGS max_memory_usage='60M'"
     )
-    assert int(result) == 1000000
+    assert int(result) == 1500000
 
 
 def test_empty_file(started_cluster):
diff --git a/tests/integration/test_storage_s3/test_invalid_env_credentials.py b/tests/integration/test_storage_s3/test_invalid_env_credentials.py
index 2f5d9349904..0ee679014b1 100644
--- a/tests/integration/test_storage_s3/test_invalid_env_credentials.py
+++ b/tests/integration/test_storage_s3/test_invalid_env_credentials.py
@@ -11,6 +11,7 @@ MINIO_INTERNAL_PORT = 9001
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
+
 # Creates S3 bucket for tests and allows anonymous read-write access to it.
 def prepare_s3_bucket(started_cluster):
     # Allows read-write access for bucket without authorization.
@@ -87,7 +88,10 @@ def started_cluster():
                 "AWS_ACCESS_KEY_ID": "aws",
                 "AWS_SECRET_ACCESS_KEY": "aws123",
             },
-            main_configs=["configs/use_environment_credentials.xml"],
+            main_configs=[
+                "configs/use_environment_credentials.xml",
+                "configs/named_collections.xml",
+            ],
         )
 
         logging.info("Starting cluster...")
@@ -104,12 +108,39 @@ def started_cluster():
 
 
 def test_with_invalid_environment_credentials(started_cluster):
-    auth = "'minio','minio123'"
-    bucket = started_cluster.minio_restricted_bucket
-
     instance = started_cluster.instances["s3_with_invalid_environment_credentials"]
+
+    for bucket, auth in [
+        (started_cluster.minio_restricted_bucket, "'minio', 'minio123'"),
+        (started_cluster.minio_bucket, "NOSIGN"),
+    ]:
+        instance.query(
+            f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_cache4.jsonl', {auth}) select * from numbers(100) settings s3_truncate_on_insert=1"
+        )
+
+        with pytest.raises(helpers.client.QueryRuntimeException) as ei:
+            instance.query(
+                f"select count() from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_cache4.jsonl')"
+            )
+
+            assert ei.value.returncode == 243
+            assert "HTTP response code: 403" in ei.value.stderr
+
+        assert (
+            "100"
+            == instance.query(
+                f"select count() from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_cache4.jsonl', {auth})"
+            ).strip()
+        )
+
+
+def test_no_sign_named_collections(started_cluster):
+    instance = started_cluster.instances["s3_with_invalid_environment_credentials"]
+
+    bucket = started_cluster.minio_bucket
+
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_cache4.jsonl', {auth}) select * from numbers(100) settings s3_truncate_on_insert=1"
+        f"insert into function s3(s3_json_no_sign) select * from numbers(100) settings s3_truncate_on_insert=1"
     )
 
     with pytest.raises(helpers.client.QueryRuntimeException) as ei:
@@ -120,9 +151,4 @@ def test_with_invalid_environment_credentials(started_cluster):
         assert ei.value.returncode == 243
         assert "HTTP response code: 403" in ei.value.stderr
 
-    assert (
-        "100"
-        == instance.query(
-            f"select count() from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_cache4.jsonl', {auth})"
-        ).strip()
-    )
+    assert "100" == instance.query(f"select count() from s3(s3_json_no_sign)").strip()
diff --git a/tests/integration/test_storage_url/configs/conf.xml b/tests/integration/test_storage_url/configs/conf.xml
index 790752c5c04..a9a78f9de71 100644
--- a/tests/integration/test_storage_url/configs/conf.xml
+++ b/tests/integration/test_storage_url/configs/conf.xml
@@ -6,5 +6,9 @@
             <format>TSV</format>
             <structure>column1 UInt32, column2 UInt32, column3 UInt32</structure>
         </url1>
+        <url_file>
+            <method>PUT</method>
+            <structure>column1 UInt32, column2 UInt32, column3 UInt32</structure>
+        </url_file>
     </named_collections>
 </clickhouse>
diff --git a/tests/integration/test_storage_url/configs/named_collections.xml b/tests/integration/test_storage_url/configs/named_collections.xml
new file mode 100644
index 00000000000..e8b0aa91f53
--- /dev/null
+++ b/tests/integration/test_storage_url/configs/named_collections.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <named_collections>
+        <test_url>
+            <url>http://nginx:80/test_1</url>
+            <format>TSV</format>>
+        </test_url>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_storage_url/test.py b/tests/integration/test_storage_url/test.py
index 5591e63400c..f360ec105ec 100644
--- a/tests/integration/test_storage_url/test.py
+++ b/tests/integration/test_storage_url/test.py
@@ -4,7 +4,9 @@ from helpers.test_tools import TSV
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
-    "node1", main_configs=["configs/conf.xml"], with_nginx=True
+    "node1",
+    main_configs=["configs/conf.xml", "configs/named_collections.xml"],
+    with_nginx=True,
 )
 
 
@@ -35,6 +37,33 @@ def test_partition_by():
     assert result.strip() == "1\t2\t3"
 
 
+def test_url_cluster():
+    result = node1.query(
+        f"select * from urlCluster('test_cluster_two_shards', 'http://nginx:80/test_1', 'TSV', 'column1 UInt32, column2 UInt32, column3 UInt32')"
+    )
+    assert result.strip() == "3\t2\t1"
+    result = node1.query(
+        f"select * from urlCluster('test_cluster_two_shards', 'http://nginx:80/test_2', 'TSV', 'column1 UInt32, column2 UInt32, column3 UInt32')"
+    )
+    assert result.strip() == "1\t3\t2"
+    result = node1.query(
+        f"select * from urlCluster('test_cluster_two_shards', 'http://nginx:80/test_3', 'TSV', 'column1 UInt32, column2 UInt32, column3 UInt32')"
+    )
+    assert result.strip() == "1\t2\t3"
+
+
+def test_url_cluster_with_named_collection():
+    result = node1.query(
+        f"select * from urlCluster(test_cluster_one_shard_three_replicas_localhost, test_url)"
+    )
+    assert result.strip() == "3\t2\t1"
+
+    result = node1.query(
+        f"select * from urlCluster(test_cluster_one_shard_three_replicas_localhost, test_url, structure='auto')"
+    )
+    assert result.strip() == "3\t2\t1"
+
+
 def test_table_function_url_access_rights():
     node1.query("CREATE USER OR REPLACE u1")
 
@@ -75,3 +104,30 @@ def test_table_function_url_access_rights():
             ["c3", "Nullable(Int64)"],
         ]
     )
+
+
+@pytest.mark.parametrize("file_format", ["Parquet", "CSV", "TSV", "JSONEachRow"])
+def test_file_formats(file_format):
+    url = f"http://nginx:80/{file_format}_file"
+
+    values = ", ".join([f"({i}, {i + 1}, {i + 2})" for i in range(100)])
+    node1.query(
+        f"insert into table function url(url_file, url = '{url}', format = '{file_format}') values",
+        stdin=values,
+    )
+
+    for download_threads in [1, 4, 16]:
+        result = node1.query(
+            f"""
+SELECT *
+FROM url('{url}', '{file_format}')
+LIMIT 10
+SETTINGS remote_read_min_bytes_for_seek = 1, max_read_buffer_size = 1, max_download_buffer_size = 1, max_download_threads = {download_threads}
+"""
+        )
+
+        expected_result = ""
+        for i in range(10):
+            expected_result += f"{i}\t{i + 1}\t{i + 2}\n"
+
+        assert result == expected_result
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.reference b/tests/integration/test_storage_url_http_headers/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.reference
rename to tests/integration/test_storage_url_http_headers/__init__.py
diff --git a/tests/integration/test_storage_url_http_headers/http_headers_echo_server.py b/tests/integration/test_storage_url_http_headers/http_headers_echo_server.py
new file mode 100644
index 00000000000..b1a3f6777b1
--- /dev/null
+++ b/tests/integration/test_storage_url_http_headers/http_headers_echo_server.py
@@ -0,0 +1,31 @@
+import http.server
+
+RESULT_PATH = "/headers.txt"
+
+
+class RequestHandler(http.server.BaseHTTPRequestHandler):
+    def log_message(self, *args):
+        with open(RESULT_PATH, "w") as f:
+            f.write(self.headers.as_string())
+
+    def do_POST(self):
+        self.rfile.read1()
+        self.send_response(200)
+        self.end_headers()
+        self.wfile.write(b'{"status":"ok"}')
+
+
+if __name__ == "__main__":
+    with open(RESULT_PATH, "w") as f:
+        f.write("")
+    httpd = http.server.HTTPServer(
+        (
+            "localhost",
+            8000,
+        ),
+        RequestHandler,
+    )
+    try:
+        httpd.serve_forever()
+    finally:
+        httpd.server_close()
diff --git a/tests/integration/test_storage_url_http_headers/test.py b/tests/integration/test_storage_url_http_headers/test.py
new file mode 100644
index 00000000000..3bbf5ec81c9
--- /dev/null
+++ b/tests/integration/test_storage_url_http_headers/test.py
@@ -0,0 +1,66 @@
+import pytest
+import os
+import time
+
+from . import http_headers_echo_server
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+server = cluster.add_instance("node")
+
+
+def run_echo_server():
+    script_dir = os.path.dirname(os.path.realpath(__file__))
+
+    server.copy_file_to_container(
+        os.path.join(script_dir, "http_headers_echo_server.py"),
+        "/http_headers_echo_server.py",
+    )
+
+    server.exec_in_container(
+        [
+            "bash",
+            "-c",
+            "python3 /http_headers_echo_server.py > /http_headers_echo.server.log 2>&1",
+        ],
+        detach=True,
+        user="root",
+    )
+
+    for _ in range(0, 10):
+        ping_response = server.exec_in_container(
+            ["curl", "-s", f"http://localhost:8000/"],
+            nothrow=True,
+        )
+
+        if "html" in ping_response:
+            return
+
+        print(ping_response)
+
+    raise Exception("Echo server is not responding")
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        run_echo_server()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_storage_url_http_headers(started_cluster):
+    query = "INSERT INTO TABLE FUNCTION url('http://localhost:8000/', JSON, 'a UInt64', headers('X-My-Custom-Header'='test-header')) VALUES (1)"
+
+    server.query(query)
+
+    result = server.exec_in_container(
+        ["cat", http_headers_echo_server.RESULT_PATH], user="root"
+    )
+
+    print(result)
+
+    assert "X-My-Custom-Header: test-header" in result
diff --git a/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.reference b/tests/integration/test_system_logs/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.reference
rename to tests/integration/test_system_logs/__init__.py
diff --git a/tests/integration/test_system_logs/configs/config.d/disks.xml b/tests/integration/test_system_logs/configs/config.d/disks.xml
new file mode 100644
index 00000000000..90a1b110326
--- /dev/null
+++ b/tests/integration/test_system_logs/configs/config.d/disks.xml
@@ -0,0 +1,28 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <disk1>
+                <path>/var/lib/clickhouse1/</path>
+            </disk1>
+            <disk2>
+                <path>/var/lib/clickhouse2/</path>
+            </disk2>
+        </disks>
+        <policies>
+            <policy1>
+                <volumes>
+                    <volume1>
+                        <disk>disk1</disk>
+                    </volume1>
+                </volumes>
+            </policy1>
+            <policy2>
+                <volumes>
+                    <volume1>
+                        <disk>disk2</disk>
+                    </volume1>
+                </volumes>
+            </policy2>
+        </policies>
+    </storage_configuration>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_system_logs/configs/config.d/system_logs_engine.xml b/tests/integration/test_system_logs/configs/config.d/system_logs_engine.xml
new file mode 100644
index 00000000000..8afb2b84c63
--- /dev/null
+++ b/tests/integration/test_system_logs/configs/config.d/system_logs_engine.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <query_log>
+        <engine>Engine = MergeTree PARTITION BY event_date ORDER BY event_time TTL event_date + INTERVAL 30 day SETTINGS storage_policy='policy2', ttl_only_drop_parts=1</engine>
+    </query_log>
+</clickhouse>
diff --git a/tests/integration/test_system_logs/configs/config.d/system_logs_order_by.xml b/tests/integration/test_system_logs/configs/config.d/system_logs_order_by.xml
new file mode 100644
index 00000000000..1015f53c06c
--- /dev/null
+++ b/tests/integration/test_system_logs/configs/config.d/system_logs_order_by.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <query_log>
+        <order_by>event_date, event_time, initial_query_id</order_by>
+    </query_log>
+    <query_thread_log>
+        <order_by>event_date, event_time, query_id</order_by>
+    </query_thread_log>
+</clickhouse>
diff --git a/tests/integration/test_system_logs/configs/config.d/system_logs_settings.xml b/tests/integration/test_system_logs/configs/config.d/system_logs_settings.xml
new file mode 100644
index 00000000000..a219f8b2fee
--- /dev/null
+++ b/tests/integration/test_system_logs/configs/config.d/system_logs_settings.xml
@@ -0,0 +1,10 @@
+<clickhouse>
+    <query_log>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <ttl>event_date + INTERVAL 30 DAY DELETE</ttl>
+        <order_by>event_date, event_time, initial_query_id</order_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <storage_policy>policy1</storage_policy>
+        <settings>storage_policy='policy2', ttl_only_drop_parts=1</settings>
+    </query_log>
+</clickhouse>
diff --git a/tests/integration/test_system_logs/configs/config.xml b/tests/integration/test_system_logs/configs/config.xml
new file mode 100644
index 00000000000..e972f199568
--- /dev/null
+++ b/tests/integration/test_system_logs/configs/config.xml
@@ -0,0 +1,15 @@
+<clickhouse>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+    </logger>
+
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <listen_host>127.0.0.1</listen_host>
+    <interserver_http_port>9009</interserver_http_port>
+    <interserver_http_host>127.0.0.1</interserver_http_host>
+</clickhouse>
diff --git a/tests/integration/test_system_logs/configs/users.xml b/tests/integration/test_system_logs/configs/users.xml
new file mode 100644
index 00000000000..1c6cd38a05c
--- /dev/null
+++ b/tests/integration/test_system_logs/configs/users.xml
@@ -0,0 +1,38 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <max_memory_usage>10000000000</max_memory_usage>
+            <max_block_size>64999</max_block_size>
+            <load_balancing>random</load_balancing>
+        </default>
+
+        <readonly>
+            <readonly>1</readonly>
+        </readonly>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+
+            <quota>default</quota>
+        </default>
+    </users>
+
+    <quotas>
+        <default>
+            <interval>
+                <duration>3600</duration>
+                <queries>0</queries>
+                <errors>0</errors>
+                <result_rows>0</result_rows>
+                <read_rows>0</read_rows>
+                <execution_time>0</execution_time>
+            </interval>
+        </default>
+    </quotas>
+</clickhouse>
diff --git a/tests/integration/test_system_logs/test_system_logs.py b/tests/integration/test_system_logs/test_system_logs.py
new file mode 100644
index 00000000000..aac5ee53819
--- /dev/null
+++ b/tests/integration/test_system_logs/test_system_logs.py
@@ -0,0 +1,90 @@
+# pylint: disable=line-too-long
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance(
+    "node1",
+    base_config_dir="configs",
+    main_configs=["configs/config.d/system_logs_order_by.xml"],
+    stay_alive=True,
+)
+
+node2 = cluster.add_instance(
+    "node2",
+    base_config_dir="configs",
+    main_configs=[
+        "configs/config.d/system_logs_engine.xml",
+        "configs/config.d/disks.xml",
+    ],
+    stay_alive=True,
+)
+
+node3 = cluster.add_instance(
+    "node3",
+    base_config_dir="configs",
+    main_configs=[
+        "configs/config.d/system_logs_settings.xml",
+        "configs/config.d/disks.xml",
+    ],
+    stay_alive=True,
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_system_logs_order_by_expr(start_cluster):
+    node1.query("SET log_query_threads = 1")
+    node1.query("SELECT count() FROM system.tables")
+    node1.query("SYSTEM FLUSH LOGS")
+
+    # Check 'sorting_key' of system.query_log.
+    assert (
+        node1.query(
+            "SELECT sorting_key FROM system.tables WHERE database='system' and name='query_log'"
+        )
+        == "event_date, event_time, initial_query_id\n"
+    )
+
+    # Check 'sorting_key' of  system.query_thread_log.
+    assert (
+        node1.query(
+            "SELECT sorting_key FROM system.tables WHERE database='system' and name='query_thread_log'"
+        )
+        == "event_date, event_time, query_id\n"
+    )
+
+
+def test_system_logs_engine_expr(start_cluster):
+    node2.query("SET log_query_threads = 1")
+    node2.query("SELECT count() FROM system.tables")
+    node2.query("SYSTEM FLUSH LOGS")
+
+    # Check 'engine_full' of system.query_log.
+    expected = "MergeTree PARTITION BY event_date ORDER BY event_time TTL event_date + toIntervalDay(30) SETTINGS storage_policy = \\'policy2\\', ttl_only_drop_parts = 1"
+    assert expected in node2.query(
+        "SELECT engine_full FROM system.tables WHERE database='system' and name='query_log'"
+    )
+
+
+def test_system_logs_settings_expr(start_cluster):
+    node3.query("SET log_query_threads = 1")
+    node3.query("SELECT count() FROM system.tables")
+    node3.query("SYSTEM FLUSH LOGS")
+
+    # Check 'engine_full' of system.query_log.
+    expected = "MergeTree PARTITION BY toYYYYMM(event_date) ORDER BY (event_date, event_time, initial_query_id) TTL event_date + toIntervalDay(30) SETTINGS storage_policy = \\'policy1\\', storage_policy = \\'policy2\\', ttl_only_drop_parts = 1"
+    assert expected in node3.query(
+        "SELECT engine_full FROM system.tables WHERE database='system' and name='query_log'"
+    )
diff --git a/tests/integration/test_system_merges/test.py b/tests/integration/test_system_merges/test.py
index 0a469bd7bbd..ff303afe19e 100644
--- a/tests/integration/test_system_merges/test.py
+++ b/tests/integration/test_system_merges/test.py
@@ -171,7 +171,6 @@ def test_mutation_simple(started_cluster, replicated):
     starting_block = 0 if replicated else 1
 
     try:
-
         for node in nodes:
             node.query(
                 f"create table {name} (a Int64) engine={engine} order by tuple()"
diff --git a/tests/integration/test_system_metrics/test.py b/tests/integration/test_system_metrics/test.py
index 439e8b66db1..9ebe198a109 100644
--- a/tests/integration/test_system_metrics/test.py
+++ b/tests/integration/test_system_metrics/test.py
@@ -122,11 +122,12 @@ def test_metrics_storage_buffer_size(start_cluster):
         )
         == "1\n"
     )
+    # By the way, this metric does not count the LowCardinality's dictionary size.
     assert (
         node1.query(
             "SELECT value FROM system.metrics WHERE metric = 'StorageBufferBytes'"
         )
-        == "24\n"
+        == "1\n"
     )
 
     node1.query("INSERT INTO test.buffer_table VALUES('hello');")
@@ -140,7 +141,7 @@ def test_metrics_storage_buffer_size(start_cluster):
         node1.query(
             "SELECT value FROM system.metrics WHERE metric = 'StorageBufferBytes'"
         )
-        == "25\n"
+        == "2\n"
     )
 
     # flush
@@ -157,3 +158,57 @@ def test_metrics_storage_buffer_size(start_cluster):
         )
         == "0\n"
     )
+
+
+def test_attach_without_zk_incr_readonly_metric(start_cluster):
+    assert (
+        node1.query("SELECT value FROM system.metrics WHERE metric = 'ReadonlyReplica'")
+        == "0\n"
+    )
+
+    node1.query(
+        "ATTACH TABLE test.test_no_zk UUID 'a50b7933-59b2-49ce-8db6-59da3c9b4413' (i Int8, d Date) ENGINE = ReplicatedMergeTree('no_zk', 'replica') ORDER BY tuple()"
+    )
+    assert_eq_with_retry(
+        node1,
+        "SELECT value FROM system.metrics WHERE metric = 'ReadonlyReplica'",
+        "1\n",
+        retry_count=300,
+        sleep_time=1,
+    )
+
+    node1.query("DETACH TABLE test.test_no_zk")
+    assert_eq_with_retry(
+        node1,
+        "SELECT value FROM system.metrics WHERE metric = 'ReadonlyReplica'",
+        "0\n",
+        retry_count=300,
+        sleep_time=1,
+    )
+
+    node1.query("ATTACH TABLE test.test_no_zk")
+    assert_eq_with_retry(
+        node1,
+        "SELECT value FROM system.metrics WHERE metric = 'ReadonlyReplica'",
+        "1\n",
+        retry_count=300,
+        sleep_time=1,
+    )
+
+    node1.query("SYSTEM RESTORE REPLICA test.test_no_zk")
+    assert_eq_with_retry(
+        node1,
+        "SELECT value FROM system.metrics WHERE metric = 'ReadonlyReplica'",
+        "0\n",
+        retry_count=300,
+        sleep_time=1,
+    )
+
+    node1.query("DROP TABLE test.test_no_zk")
+    assert_eq_with_retry(
+        node1,
+        "SELECT value FROM system.metrics WHERE metric = 'ReadonlyReplica'",
+        "0\n",
+        retry_count=300,
+        sleep_time=1,
+    )
diff --git a/tests/integration/test_system_replicated_fetches/test.py b/tests/integration/test_system_replicated_fetches/test.py
index 2b516ebf69b..ab6808dca89 100644
--- a/tests/integration/test_system_replicated_fetches/test.py
+++ b/tests/integration/test_system_replicated_fetches/test.py
@@ -90,16 +90,17 @@ def test_system_replicated_fetches(started_cluster):
     )
 
     for elem in fetches_result:
-        assert (
-            elem["bytes_read_compressed"] <= elem["total_size_bytes_compressed"]
-        ), "Bytes read ({}) more than total bytes ({}). It's a bug".format(
-            elem["bytes_read_compressed"], elem["total_size_bytes_compressed"]
-        )
-        assert (
-            0.0 <= elem["progress"] <= 1.0
-        ), "Progress shouldn't less than 0 and bigger than 1, got {}".format(
-            elem["progress"]
-        )
+        # FIXME https://github.com/ClickHouse/ClickHouse/issues/45435
+        # assert (
+        #     elem["bytes_read_compressed"] <= elem["total_size_bytes_compressed"]
+        # ), "Bytes read ({}) more than total bytes ({}). It's a bug".format(
+        #     elem["bytes_read_compressed"], elem["total_size_bytes_compressed"]
+        # )
+        # assert (
+        #     0.0 <= elem["progress"] <= 1.0
+        # ), "Progress shouldn't less than 0 and bigger than 1, got {}".format(
+        #     elem["progress"]
+        # )
         assert (
             0.0 <= elem["elapsed"]
         ), "Elapsed time must be greater than 0, got {}".format(elem["elapsed"])
diff --git a/tests/integration/test_temporary_data_in_cache/configs/config.d/storage_configuration.xml b/tests/integration/test_temporary_data_in_cache/configs/config.d/storage_configuration.xml
index acf0f765c6c..b527c74e8de 100644
--- a/tests/integration/test_temporary_data_in_cache/configs/config.d/storage_configuration.xml
+++ b/tests/integration/test_temporary_data_in_cache/configs/config.d/storage_configuration.xml
@@ -2,7 +2,7 @@
     <storage_configuration>
         <disks>
             <local_disk>
-                <type>local</type>
+                <type>local_blob_storage</type>
                 <path>/local_disk/</path>
             </local_disk>
 
diff --git a/tests/integration/test_temporary_data_in_cache/test.py b/tests/integration/test_temporary_data_in_cache/test.py
index 0e8c7305405..e6142c7eef1 100644
--- a/tests/integration/test_temporary_data_in_cache/test.py
+++ b/tests/integration/test_temporary_data_in_cache/test.py
@@ -26,20 +26,24 @@ def start_cluster():
 
 def test_cache_evicted_by_temporary_data(start_cluster):
     q = node.query
-    qi = lambda query: int(node.query(query).strip())
-
-    cache_size_initial = qi("SELECT sum(size) FROM system.filesystem_cache")
-    assert cache_size_initial == 0
-
-    free_space_initial = qi(
-        "SELECT free_space FROM system.disks WHERE name = 'tiny_local_cache_local_disk'"
+    get_free_space = lambda: int(
+        q(
+            "SELECT free_space FROM system.disks WHERE name = 'tiny_local_cache_local_disk'"
+        ).strip()
+    )
+    get_cache_size = lambda: int(
+        q("SELECT sum(size) FROM system.filesystem_cache").strip()
     )
-    assert free_space_initial > 8 * 1024 * 1024
 
+    assert get_cache_size() == 0
+
+    assert get_free_space() > 8 * 1024 * 1024
+
+    # Codec is NONE to make cache size predictable
     q(
-        "CREATE TABLE t1 (x UInt64) ENGINE = MergeTree ORDER BY x SETTINGS storage_policy = 'tiny_local_cache'"
+        "CREATE TABLE t1 (x UInt64 CODEC(NONE), y UInt64 CODEC(NONE)) ENGINE = MergeTree ORDER BY x SETTINGS storage_policy = 'tiny_local_cache'"
     )
-    q("INSERT INTO t1 SELECT number FROM numbers(1024 * 1024)")
+    q("INSERT INTO t1 SELECT number, number FROM numbers(1024 * 1024)")
 
     # To be sure that nothing is reading the cache and entries for t1 can be evited
     q("OPTIMIZE TABLE t1 FINAL")
@@ -48,13 +52,11 @@ def test_cache_evicted_by_temporary_data(start_cluster):
     # Read some data to fill the cache
     q("SELECT sum(x) FROM t1")
 
-    cache_size_with_t1 = qi("SELECT sum(size) FROM system.filesystem_cache")
+    cache_size_with_t1 = get_cache_size()
     assert cache_size_with_t1 > 8 * 1024 * 1024
 
     # Almost all disk space is occupied by t1 cache
-    free_space_with_t1 = qi(
-        "SELECT free_space FROM system.disks WHERE name = 'tiny_local_cache_local_disk'"
-    )
+    free_space_with_t1 = get_free_space()
     assert free_space_with_t1 < 4 * 1024 * 1024
 
     # Try to sort the table, but fail because of lack of disk space
@@ -69,13 +71,39 @@ def test_cache_evicted_by_temporary_data(start_cluster):
     assert "Failed to reserve space for the file cache" in str(exc.value)
 
     # Some data evicted from cache by temporary data
-    cache_size_after_eviction = qi("SELECT sum(size) FROM system.filesystem_cache")
+    cache_size_after_eviction = get_cache_size()
     assert cache_size_after_eviction < cache_size_with_t1
 
     # Disk space freed, at least 3 MB, because temporary data tried to write 4 MB
-    free_space_after_eviction = qi(
-        "SELECT free_space FROM system.disks WHERE name = 'tiny_local_cache_local_disk'"
+    assert get_free_space() > free_space_with_t1 + 3 * 1024 * 1024
+
+    # Read some data to fill the cache again
+    q("SELECT avg(y) FROM t1")
+
+    cache_size_with_t1 = get_cache_size()
+    assert cache_size_with_t1 > 8 * 1024 * 1024, q(
+        "SELECT * FROM system.filesystem_cache FORMAT Vertical"
     )
-    assert free_space_after_eviction > free_space_with_t1 + 3 * 1024 * 1024
+
+    # Almost all disk space is occupied by t1 cache
+    free_space_with_t1 = get_free_space()
+    assert free_space_with_t1 < 4 * 1024 * 1024, q(
+        "SELECT * FROM system.disks WHERE name = 'tiny_local_cache_local_disk' FORMAT Vertical"
+    )
+
+    node.http_query(
+        "SELECT randomPrintableASCII(1024) FROM numbers(8 * 1024) FORMAT TSV",
+        params={"buffer_size": 0, "wait_end_of_query": 1},
+    )
+
+    assert get_free_space() > free_space_with_t1 + 3 * 1024 * 1024
+
+    # not enough space for buffering 32 MB
+    with pytest.raises(Exception) as exc:
+        node.http_query(
+            "SELECT randomPrintableASCII(1024) FROM numbers(32 * 1024) FORMAT TSV",
+            params={"buffer_size": 0, "wait_end_of_query": 1},
+        )
+    assert "Failed to reserve space for the file cache" in str(exc.value)
 
     q("DROP TABLE IF EXISTS t1")
diff --git a/tests/queries/0_stateless/00965_live_view_watch_heartbeat.reference b/tests/integration/test_throttling/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00965_live_view_watch_heartbeat.reference
rename to tests/integration/test_throttling/__init__.py
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_without_zero_copy.xml b/tests/integration/test_throttling/configs/server_backups.xml
similarity index 51%
rename from tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_without_zero_copy.xml
rename to tests/integration/test_throttling/configs/server_backups.xml
index 9194d779d16..d25c67a779c 100644
--- a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_without_zero_copy.xml
+++ b/tests/integration/test_throttling/configs/server_backups.xml
@@ -6,13 +6,7 @@
                 <endpoint>http://minio1:9001/root/data/</endpoint>
                 <access_key_id>minio</access_key_id>
                 <secret_access_key>minio123</secret_access_key>
-                <send_metadata>true</send_metadata>
-                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
             </s3>
-            <hdd>
-                <type>local</type>
-                <path>/</path>
-            </hdd>
         </disks>
         <policies>
             <s3>
@@ -20,16 +14,21 @@
                     <main>
                         <disk>s3</disk>
                     </main>
-                    <external>
-                        <disk>hdd</disk>
-                    </external>
                 </volumes>
             </s3>
         </policies>
     </storage_configuration>
 
-    <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-        <allow_remote_fs_zero_copy_replication>0</allow_remote_fs_zero_copy_replication>
-    </merge_tree>
+    <named_collections>
+        <s3>
+            <url>http://minio1:9001/root/data/</url>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>minio123</secret_access_key>
+        </s3>
+    </named_collections>
+
+    <backups>
+        <allowed_disk>default</allowed_disk>
+        <allowed_path>/backups/</allowed_path>
+    </backups>
 </clickhouse>
diff --git a/tests/integration/test_throttling/configs/server_overrides.xml b/tests/integration/test_throttling/configs/server_overrides.xml
new file mode 100644
index 00000000000..197bf660500
--- /dev/null
+++ b/tests/integration/test_throttling/configs/server_overrides.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <!-- Will be overwritten by the test -->
+</clickhouse>
diff --git a/tests/integration/test_throttling/configs/users_overrides.xml b/tests/integration/test_throttling/configs/users_overrides.xml
new file mode 100644
index 00000000000..197bf660500
--- /dev/null
+++ b/tests/integration/test_throttling/configs/users_overrides.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <!-- Will be overwritten by the test -->
+</clickhouse>
diff --git a/tests/integration/test_throttling/test.py b/tests/integration/test_throttling/test.py
new file mode 100644
index 00000000000..ff8e7154d0d
--- /dev/null
+++ b/tests/integration/test_throttling/test.py
@@ -0,0 +1,413 @@
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+# pylint: disable=line-too-long
+
+# This test covers the following options:
+# - max_backup_bandwidth
+# - max_backup_bandwidth_for_server
+# - max_local_read_bandwidth
+# - max_local_read_bandwidth_for_server
+# - max_local_write_bandwidth
+# - max_local_write_bandwidth_for_server
+# - max_remote_read_network_bandwidth
+# - max_remote_read_network_bandwidth_for_server
+# - max_remote_write_network_bandwidth
+# - max_remote_write_network_bandwidth_for_server
+# - and that max_backup_bandwidth from the query will override setting from the user profile
+
+import time
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+
+def elapsed(func, *args, **kwargs):
+    start = time.time()
+    ret = func(*args, **kwargs)
+    end = time.time()
+    return ret, end - start
+
+
+node = cluster.add_instance(
+    "node",
+    stay_alive=True,
+    main_configs=["configs/server_backups.xml", "configs/server_overrides.xml"],
+    user_configs=["configs/users_overrides.xml"],
+    with_minio=True,
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(scope="function", autouse=True)
+def revert_config():
+    # Revert configs after the test, not before
+    yield
+    node.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"echo '<clickhouse></clickhouse>' > /etc/clickhouse-server/config.d/server_overrides.xml",
+        ]
+    )
+    node.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"echo '<clickhouse></clickhouse>' > /etc/clickhouse-server/users.d/users_overrides.xml",
+        ]
+    )
+    node.restart_clickhouse()
+
+
+backup_id_counter = 0
+
+
+def next_backup_name(storage):
+    global backup_id_counter
+    if storage == "local":
+        backup_id_counter += 1
+        return f"Disk('default', '{backup_id_counter}/')"
+    elif storage == "remote":
+        backup_id_counter += 1
+        return f"S3(s3, '{backup_id_counter}/')"
+    else:
+        raise Exception(storage)
+
+
+def node_update_config(mode, setting, value=None):
+    if mode is None:
+        return
+    if mode == "server":
+        config_path = "/etc/clickhouse-server/config.d/server_overrides.xml"
+        config_content = f"""
+        <clickhouse><{setting}>{value}</{setting}></clickhouse>
+        """
+    else:
+        config_path = "/etc/clickhouse-server/users.d/users_overrides.xml"
+        config_content = f"""
+        <clickhouse>
+            <profiles>
+                <default>
+                    <{setting}>{value}</{setting}>
+                </default>
+            </profiles>
+        </clickhouse>
+        """
+    node.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"echo '{config_content}' > {config_path}",
+        ]
+    )
+    node.restart_clickhouse()
+
+
+def assert_took(took, should_took):
+    assert took >= should_took[0] * 0.9 and took < should_took[1]
+
+
+@pytest.mark.parametrize(
+    "policy,backup_name,mode,setting,value,should_took",
+    [
+        #
+        # Local -> Local
+        #
+        pytest.param(
+            "default",
+            next_backup_name("local"),
+            None,
+            None,
+            None,
+            (0, 3),
+            id="no_local_throttling",
+        ),
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
+        pytest.param(
+            "default",
+            next_backup_name("local"),
+            "user",
+            "max_backup_bandwidth",
+            "1M",
+            (7, 14),
+            id="user_local_throttling",
+        ),
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
+        pytest.param(
+            "default",
+            next_backup_name("local"),
+            "server",
+            "max_backup_bandwidth_for_server",
+            "2M",
+            (3, 7),
+            id="server_local_throttling",
+        ),
+        #
+        # Remote -> Local
+        #
+        pytest.param(
+            "s3",
+            next_backup_name("local"),
+            None,
+            None,
+            None,
+            (0, 3),
+            id="no_remote_to_local_throttling",
+        ),
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
+        pytest.param(
+            "s3",
+            next_backup_name("local"),
+            "user",
+            "max_backup_bandwidth",
+            "1M",
+            (7, 14),
+            id="user_remote_to_local_throttling",
+        ),
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
+        pytest.param(
+            "s3",
+            next_backup_name("local"),
+            "server",
+            "max_backup_bandwidth_for_server",
+            "2M",
+            (3, 7),
+            id="server_remote_to_local_throttling",
+        ),
+        #
+        # Remote -> Remote
+        #
+        pytest.param(
+            "s3",
+            next_backup_name("remote"),
+            None,
+            None,
+            None,
+            (0, 3),
+            id="no_remote_to_remote_throttling",
+        ),
+        # No throttling for S3-to-S3, uses native copy
+        pytest.param(
+            "s3",
+            next_backup_name("remote"),
+            "user",
+            "max_backup_bandwidth",
+            "1M",
+            (0, 3),
+            id="user_remote_to_remote_throttling",
+        ),
+        # No throttling for S3-to-S3, uses native copy
+        pytest.param(
+            "s3",
+            next_backup_name("remote"),
+            "server",
+            "max_backup_bandwidth_for_server",
+            "2M",
+            (0, 3),
+            id="server_remote_to_remote_throttling",
+        ),
+        #
+        # Local -> Remote
+        #
+        # NOTE: S3 is complex, it will read file 3 times:
+        # - first for calculating the checksum
+        # - second for calculating the signature
+        # - and finally to write the payload to S3
+        # Hence the value should be multipled by 3.
+        pytest.param(
+            "default",
+            next_backup_name("remote"),
+            None,
+            None,
+            None,
+            (0, 3),
+            id="no_local_to_remote_throttling",
+        ),
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds, but for S3Client it is 2x more
+        pytest.param(
+            "default",
+            next_backup_name("remote"),
+            "user",
+            "max_backup_bandwidth",
+            "1M",
+            (7 * 3, 7 * 4 - 1),
+            id="user_local_to_remote_throttling",
+        ),
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds, but for S3Client it is 2x more
+        pytest.param(
+            "default",
+            next_backup_name("remote"),
+            "server",
+            "max_backup_bandwidth_for_server",
+            "2M",
+            (3 * 3, 3 * 5),
+            id="server_local_to_remote_throttling",
+        ),
+    ],
+)
+def test_backup_throttling(policy, backup_name, mode, setting, value, should_took):
+    node_update_config(mode, setting, value)
+    node.query(
+        f"""
+        drop table if exists data;
+        create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9, storage_policy='{policy}';
+        insert into data select * from numbers(1e6);
+    """
+    )
+    _, took = elapsed(node.query, f"backup table data to {backup_name}")
+    assert_took(took, should_took)
+
+
+def test_backup_throttling_override():
+    node_update_config("user", "max_backup_bandwidth", "1M")
+    node.query(
+        """
+        drop table if exists data;
+        create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9;
+        insert into data select * from numbers(1e6);
+    """
+    )
+
+    backup_name = next_backup_name("local")
+    _, took = elapsed(
+        node.query,
+        f"backup table data to {backup_name}",
+        settings={
+            "max_backup_bandwidth": "500K",
+        },
+    )
+    # reading 1e6*8 bytes with 500Ki default bandwith should take (8-0.5)/0.5=15 seconds
+    assert_took(took, (15, 20))
+
+
+@pytest.mark.parametrize(
+    "policy,mode,setting,value,should_took",
+    [
+        #
+        # Local
+        #
+        pytest.param("default", None, None, None, (0, 3), id="no_local_throttling"),
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
+        pytest.param(
+            "default",
+            "user",
+            "max_local_read_bandwidth",
+            "1M",
+            (7, 14),
+            id="user_local_throttling",
+        ),
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
+        pytest.param(
+            "default",
+            "server",
+            "max_local_read_bandwidth_for_server",
+            "2M",
+            (3, 7),
+            id="server_local_throttling",
+        ),
+        #
+        # Remote
+        #
+        pytest.param("s3", None, None, None, (0, 3), id="no_remote_throttling"),
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
+        pytest.param(
+            "s3",
+            "user",
+            "max_remote_read_network_bandwidth",
+            "1M",
+            (7, 14),
+            id="user_remote_throttling",
+        ),
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
+        pytest.param(
+            "s3",
+            "server",
+            "max_remote_read_network_bandwidth_for_server",
+            "2M",
+            (3, 7),
+            id="server_remote_throttling",
+        ),
+    ],
+)
+def test_read_throttling(policy, mode, setting, value, should_took):
+    node_update_config(mode, setting, value)
+    node.query(
+        f"""
+        drop table if exists data;
+        create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9, storage_policy='{policy}';
+        insert into data select * from numbers(1e6);
+    """
+    )
+    _, took = elapsed(node.query, f"select * from data")
+    assert_took(took, should_took)
+
+
+@pytest.mark.parametrize(
+    "policy,mode,setting,value,should_took",
+    [
+        #
+        # Local
+        #
+        pytest.param("default", None, None, None, (0, 3), id="no_local_throttling"),
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
+        pytest.param(
+            "default",
+            "user",
+            "max_local_write_bandwidth",
+            "1M",
+            (7, 14),
+            id="local_user_throttling",
+        ),
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
+        pytest.param(
+            "default",
+            "server",
+            "max_local_write_bandwidth_for_server",
+            "2M",
+            (3, 7),
+            id="local_server_throttling",
+        ),
+        #
+        # Remote
+        #
+        pytest.param("s3", None, None, None, (0, 3), id="no_remote_throttling"),
+        # writeing 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
+        pytest.param(
+            "s3",
+            "user",
+            "max_remote_write_network_bandwidth",
+            "1M",
+            (7, 14),
+            id="user_remote_throttling",
+        ),
+        # writeing 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
+        pytest.param(
+            "s3",
+            "server",
+            "max_remote_write_network_bandwidth_for_server",
+            "2M",
+            (3, 7),
+            id="server_remote_throttling",
+        ),
+    ],
+)
+def test_write_throttling(policy, mode, setting, value, should_took):
+    node_update_config(mode, setting, value)
+    node.query(
+        f"""
+        drop table if exists data;
+        create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9, storage_policy='{policy}';
+    """
+    )
+    _, took = elapsed(node.query, f"insert into data select * from numbers(1e6)")
+    assert_took(took, should_took)
diff --git a/tests/integration/test_ttl_move/test.py b/tests/integration/test_ttl_move/test.py
index 99978cbf6dc..7635d784fef 100644
--- a/tests/integration/test_ttl_move/test.py
+++ b/tests/integration/test_ttl_move/test.py
@@ -151,7 +151,7 @@ def test_rule_with_invalid_destination(started_cluster, name, engine, alter):
                 get_command("TTL d1 TO DISK 'unknown'", "small_jbod_with_external")
             )
 
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
         if alter:
             node1.query(get_command(None, "small_jbod_with_external"))
@@ -161,7 +161,7 @@ def test_rule_with_invalid_destination(started_cluster, name, engine, alter):
                 get_command("TTL d1 TO VOLUME 'unknown'", "small_jbod_with_external")
             )
 
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
         if alter:
             node1.query(get_command(None, "only_jbod2"))
@@ -169,7 +169,7 @@ def test_rule_with_invalid_destination(started_cluster, name, engine, alter):
         with pytest.raises(QueryRuntimeException):
             node1.query(get_command("TTL d1 TO DISK 'jbod1'", "only_jbod2"))
 
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
         if alter:
             node1.query(get_command(None, "only_jbod2"))
@@ -178,7 +178,7 @@ def test_rule_with_invalid_destination(started_cluster, name, engine, alter):
             node1.query(get_command("TTL d1 TO VOLUME 'external'", "only_jbod2"))
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 @pytest.mark.parametrize(
@@ -253,7 +253,7 @@ def test_inserts_to_disk_work(started_cluster, name, engine, positive):
 
     finally:
         try:
-            node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+            node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
         except:
             pass
 
@@ -330,7 +330,7 @@ def test_moves_work_after_storage_policy_change(started_cluster, name, engine):
         )
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 @pytest.mark.parametrize(
@@ -418,7 +418,7 @@ def test_moves_to_disk_work(started_cluster, name, engine, positive):
         )
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 @pytest.mark.parametrize(
@@ -489,7 +489,7 @@ def test_moves_to_volume_work(started_cluster, name, engine):
         )
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 @pytest.mark.parametrize(
@@ -570,7 +570,7 @@ def test_inserts_to_volume_work(started_cluster, name, engine, positive):
         )
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 @pytest.mark.parametrize(
@@ -649,7 +649,7 @@ def test_moves_to_disk_eventually_work(started_cluster, name, engine):
         used_disks = get_used_disks_for_table(node1, name)
         assert set(used_disks) == {"jbod1"}
 
-        node1.query("DROP TABLE {} NO DELAY".format(name_temp))
+        node1.query("DROP TABLE {} SYNC".format(name_temp))
 
         wait_parts_mover(node1, name)
 
@@ -661,8 +661,8 @@ def test_moves_to_disk_eventually_work(started_cluster, name, engine):
         )
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name_temp))
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name_temp))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 def test_replicated_download_ttl_info(started_cluster):
@@ -702,7 +702,7 @@ def test_replicated_download_ttl_info(started_cluster):
     finally:
         for node in (node1, node2):
             try:
-                node.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+                node.query("DROP TABLE IF EXISTS {} SYNC".format(name))
             except:
                 continue
 
@@ -818,7 +818,7 @@ def test_merges_to_disk_work(started_cluster, name, engine, positive):
         )
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 @pytest.mark.parametrize(
@@ -932,8 +932,8 @@ def test_merges_with_full_disk_work(started_cluster, name, engine):
         )
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name_temp))
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name_temp))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 @pytest.mark.parametrize(
@@ -1035,7 +1035,7 @@ def test_moves_after_merges_work(started_cluster, name, engine, positive):
         )
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 @pytest.mark.parametrize(
@@ -1150,7 +1150,7 @@ def test_ttls_do_not_work_after_alter(started_cluster, name, engine, positive, b
         )
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 @pytest.mark.parametrize(
@@ -1255,7 +1255,7 @@ def test_materialize_ttl_in_partition(started_cluster, name, engine):
         ).strip() == str(len(data))
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+        node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
 
 
 @pytest.mark.parametrize(
@@ -1378,7 +1378,7 @@ def test_alter_multiple_ttls(started_cluster, name, engine, positive):
             assert rows_count == 3
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {name} NO DELAY".format(name=name))
+        node1.query("DROP TABLE IF EXISTS {name} SYNC".format(name=name))
 
 
 @pytest.mark.parametrize(
@@ -1526,7 +1526,7 @@ def test_concurrent_alter_with_ttl_move(started_cluster, name, engine):
         assert node1.query("SELECT 1") == "1\n"
         assert node1.query("SELECT COUNT() FROM {}".format(name)) == "150\n"
     finally:
-        node1.query("DROP TABLE IF EXISTS {name} NO DELAY".format(name=name))
+        node1.query("DROP TABLE IF EXISTS {name} SYNC".format(name=name))
 
 
 @pytest.mark.skip(reason="Flacky test")
@@ -1626,7 +1626,7 @@ def test_double_move_while_select(started_cluster, name, positive):
         ).splitlines() == ["1", "2", "3", "4"]
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {name} NO DELAY".format(name=name))
+        node1.query("DROP TABLE IF EXISTS {name} SYNC".format(name=name))
 
 
 @pytest.mark.parametrize(
@@ -1745,7 +1745,7 @@ def test_alter_with_merge_work(started_cluster, name, engine, positive):
             assert node1.query("SELECT count() FROM {name}".format(name=name)) == "6\n"
 
     finally:
-        node1.query("DROP TABLE IF EXISTS {name} NO DELAY".format(name=name))
+        node1.query("DROP TABLE IF EXISTS {name} SYNC".format(name=name))
 
 
 @pytest.mark.parametrize(
@@ -1826,7 +1826,7 @@ def test_disabled_ttl_move_on_insert(started_cluster, name, dest_type, engine):
 
     finally:
         try:
-            node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+            node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
         except:
             pass
 
@@ -1863,7 +1863,7 @@ def test_ttl_move_if_exists(started_cluster, name, dest_type):
                 )
             )
 
-        for (node, policy) in zip(
+        for node, policy in zip(
             [node1, node2], ["only_jbod_1", "small_jbod_with_external"]
         ):
             node.query(
@@ -1909,7 +1909,7 @@ def test_ttl_move_if_exists(started_cluster, name, dest_type):
 
     finally:
         try:
-            node1.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
-            node2.query("DROP TABLE IF EXISTS {} NO DELAY".format(name))
+            node1.query("DROP TABLE IF EXISTS {} SYNC".format(name))
+            node2.query("DROP TABLE IF EXISTS {} SYNC".format(name))
         except:
             pass
diff --git a/tests/integration/test_ttl_replicated/test.py b/tests/integration/test_ttl_replicated/test.py
index 13fea0455d0..a3e7d6e4b8b 100644
--- a/tests/integration/test_ttl_replicated/test.py
+++ b/tests/integration/test_ttl_replicated/test.py
@@ -55,7 +55,7 @@ def started_cluster():
 
 def drop_table(nodes, table_name):
     for node in nodes:
-        node.query("DROP TABLE IF EXISTS {} NO DELAY".format(table_name))
+        node.query("DROP TABLE IF EXISTS {} SYNC".format(table_name))
 
 
 # Column TTL works only with wide parts, because it's very expensive to apply it for compact parts
diff --git a/tests/queries/0_stateless/00966_live_view_watch_events_http.reference b/tests/integration/test_undrop_query/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00966_live_view_watch_events_http.reference
rename to tests/integration/test_undrop_query/__init__.py
diff --git a/tests/integration/test_undrop_query/configs/with_delay_config.xml b/tests/integration/test_undrop_query/configs/with_delay_config.xml
new file mode 100644
index 00000000000..c672b187b01
--- /dev/null
+++ b/tests/integration/test_undrop_query/configs/with_delay_config.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <database_atomic_delay_before_drop_table_sec>5</database_atomic_delay_before_drop_table_sec>
+</clickhouse>
diff --git a/tests/integration/test_undrop_query/test.py b/tests/integration/test_undrop_query/test.py
new file mode 100644
index 00000000000..63d92d84541
--- /dev/null
+++ b/tests/integration/test_undrop_query/test.py
@@ -0,0 +1,59 @@
+import pytest
+import uuid
+import random
+import logging
+import time
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance("node", main_configs=["configs/with_delay_config.xml"])
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_undrop_drop_and_undrop_loop(started_cluster):
+    count = 0
+    node.query("set allow_experimental_undrop_table_query = 1;")
+    while count < 10:
+        random_sec = random.randint(0, 10)
+        table_uuid = uuid.uuid1().__str__()
+        logging.info(
+            "random_sec: " + random_sec.__str__() + ", table_uuid: " + table_uuid
+        )
+        node.query(
+            "create table test_undrop_loop"
+            + count.__str__()
+            + " UUID '"
+            + table_uuid
+            + "' (id Int32) Engine=MergeTree() order by id;"
+        )
+        node.query("drop table test_undrop_loop" + count.__str__() + ";")
+        time.sleep(random_sec)
+        if random_sec >= 5:
+            error = node.query_and_get_error(
+                "undrop table test_undrop_loop"
+                + count.__str__()
+                + " uuid '"
+                + table_uuid
+                + "' settings allow_experimental_undrop_table_query = 1;"
+            )
+            assert "UNKNOWN_TABLE" in error
+        else:
+            node.query(
+                "undrop table test_undrop_loop"
+                + count.__str__()
+                + " uuid '"
+                + table_uuid
+                + "' settings allow_experimental_undrop_table_query = 1;"
+            )
+            count = count + 1
diff --git a/tests/queries/0_stateless/00967_live_view_watch_http.reference b/tests/integration/test_user_grants_from_config/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00967_live_view_watch_http.reference
rename to tests/integration/test_user_grants_from_config/__init__.py
diff --git a/tests/integration/test_user_grants_from_config/configs/another_user.xml b/tests/integration/test_user_grants_from_config/configs/another_user.xml
new file mode 100644
index 00000000000..16c026e81d0
--- /dev/null
+++ b/tests/integration/test_user_grants_from_config/configs/another_user.xml
@@ -0,0 +1,18 @@
+<clickhouse>
+    <users>
+        <another>
+            <password/>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+            <grants>
+                <query>GRANT SHOW ON *.*</query>
+                <query>GRANT CREATE ON *.* WITH GRANT OPTION</query>
+                <query>GRANT SELECT ON system.*</query>
+                <query>REVOKE CREATE ON system.*</query>
+            </grants>
+        </another>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_user_grants_from_config/test.py b/tests/integration/test_user_grants_from_config/test.py
new file mode 100644
index 00000000000..a4d5c0c904b
--- /dev/null
+++ b/tests/integration/test_user_grants_from_config/test.py
@@ -0,0 +1,53 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    user_configs=[
+        "configs/another_user.xml",
+    ],
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+        node.query("CREATE DATABASE mydb")
+        node.query("CREATE TABLE mydb.table1(x UInt32) ENGINE=Log")
+        node.query("CREATE TABLE mydb.table2(x UInt32) ENGINE=Log")
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_allow_read_from_system_tables():
+    assert node.query("SELECT name FROM system.tables WHERE database = 'mydb'") == TSV(
+        [
+            "table1",
+            "table2",
+        ]
+    )
+
+    assert node.query(
+        "SELECT name FROM system.tables WHERE database = 'mydb'", user="another"
+    ) == TSV(
+        [
+            "table1",
+            "table2",
+        ]
+    )
+
+
+def test_grants_from_config():
+    assert node.query("SHOW GRANTS FOR another") == TSV(
+        [
+            "GRANT SHOW ON *.* TO another",
+            "GRANT CREATE ON *.* TO another WITH GRANT OPTION",
+            "GRANT SELECT ON system.* TO another",
+            "REVOKE CREATE DATABASE, CREATE TABLE, CREATE VIEW, CREATE DICTIONARY ON system.* FROM another",
+        ]
+    )
diff --git a/tests/integration/test_version_update_after_mutation/test.py b/tests/integration/test_version_update_after_mutation/test.py
index 6b27c69462a..17b70ba7c84 100644
--- a/tests/integration/test_version_update_after_mutation/test.py
+++ b/tests/integration/test_version_update_after_mutation/test.py
@@ -91,8 +91,8 @@ def test_mutate_and_upgrade(start_cluster):
 
     node2.query("OPTIMIZE TABLE mt FINAL")
 
-    assert node1.query("SELECT id FROM mt") == "1\n4\n"
-    assert node2.query("SELECT id FROM mt") == "1\n4\n"
+    assert node1.query("SELECT id FROM mt ORDER BY id") == "1\n4\n"
+    assert node2.query("SELECT id FROM mt ORDER BY id") == "1\n4\n"
 
     for node in [node1, node2]:
         node.query("DROP TABLE mt")
@@ -111,6 +111,10 @@ def test_upgrade_while_mutation(start_cluster):
     node3.query("ALTER TABLE mt1 DELETE WHERE id % 2 == 0")
 
     node3.query("DETACH TABLE mt1")  # stop being leader
+    # Flush logs before restart to avoid trash from system tables which are on database ordindary
+    # (We could be in process of creating some system table, which will leave empty directory on restart,
+    # so when we start moving system tables from ordinary to atomic db, it will complain about some undeleted files)
+    node3.query("SYSTEM FLUSH LOGS")
     node3.restart_with_latest_version(signal=9, fix_metadata=True)
 
     # checks for readonly
diff --git a/tests/integration/test_zero_copy_fetch/configs/storage_conf.xml b/tests/integration/test_zero_copy_fetch/configs/storage_conf.xml
index 257ae0a355c..b3ce0735a3c 100644
--- a/tests/integration/test_zero_copy_fetch/configs/storage_conf.xml
+++ b/tests/integration/test_zero_copy_fetch/configs/storage_conf.xml
@@ -1,4 +1,8 @@
 <clickhouse>
+    <logger>
+        <level>test</level>
+    </logger>
+
     <storage_configuration>
         <disks>
             <s3>
@@ -21,6 +25,13 @@
                     </main>
                 </volumes>
             </s3>
+            <s3_only>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                </volumes>
+            </s3_only>
         </policies>
     </storage_configuration>
 
diff --git a/tests/integration/test_zero_copy_fetch/test.py b/tests/integration/test_zero_copy_fetch/test.py
index f13eac5e9d1..9b9aa5e0da7 100644
--- a/tests/integration/test_zero_copy_fetch/test.py
+++ b/tests/integration/test_zero_copy_fetch/test.py
@@ -5,6 +5,7 @@ import random
 import string
 import time
 
+from multiprocessing.dummy import Pool
 import pytest
 from helpers.cluster import ClickHouseCluster
 
@@ -15,7 +16,6 @@ cluster = ClickHouseCluster(__file__)
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
-
         cluster.add_instance(
             "node1",
             main_configs=["configs/storage_conf.xml"],
@@ -102,3 +102,133 @@ SETTINGS index_granularity = 8192, storage_policy = 's3'"""
     assert part_to_disk["20230102_0_0_0"] == "s3"
     assert part_to_disk["20230109_0_0_0"] == "s3"
     assert part_to_disk["20230116_0_0_0"] == "default"
+
+
+def test_concurrent_move_to_s3(started_cluster):
+    node1 = cluster.instances["node1"]
+    node2 = cluster.instances["node2"]
+
+    node1.query(
+        """
+CREATE TABLE test_concurrent_move (EventDate Date, CounterID UInt32)
+ENGINE = ReplicatedMergeTree('/clickhouse-tables/test_concurrent_move', 'r1')
+PARTITION BY CounterID
+ORDER BY (CounterID, EventDate)
+SETTINGS index_granularity = 8192, storage_policy = 's3'"""
+    )
+
+    node2.query(
+        """
+CREATE TABLE test_concurrent_move (EventDate Date, CounterID UInt32)
+ENGINE = ReplicatedMergeTree('/clickhouse-tables/test_concurrent_move', 'r2')
+PARTITION BY CounterID
+ORDER BY (CounterID, EventDate)
+SETTINGS index_granularity = 8192, storage_policy = 's3'"""
+    )
+    partitions = range(10)
+
+    for i in partitions:
+        node1.query(
+            f"INSERT INTO test_concurrent_move SELECT toDate('2023-01-01') + toIntervalDay(number), {i} from system.numbers limit 20"
+        )
+        node1.query(
+            f"INSERT INTO test_concurrent_move SELECT toDate('2023-01-01') + toIntervalDay(number) + rand(), {i} from system.numbers limit 20"
+        )
+        node1.query(
+            f"INSERT INTO test_concurrent_move SELECT toDate('2023-01-01') + toIntervalDay(number) + rand(), {i} from system.numbers limit 20"
+        )
+        node1.query(
+            f"INSERT INTO test_concurrent_move SELECT toDate('2023-01-01') + toIntervalDay(number) + rand(), {i} from system.numbers limit 20"
+        )
+
+    node2.query("SYSTEM SYNC REPLICA test_concurrent_move")
+
+    # check that we can move parts concurrently without exceptions
+    p = Pool(3)
+    for i in partitions:
+
+        def move_partition_to_s3(node):
+            node.query(
+                f"ALTER TABLE test_concurrent_move MOVE PARTITION '{i}' TO DISK 's3'"
+            )
+
+        j1 = p.apply_async(move_partition_to_s3, (node1,))
+        j2 = p.apply_async(move_partition_to_s3, (node2,))
+        j1.get()
+        j2.get()
+
+    def get_part_to_disk(query_result):
+        part_to_disk = {}
+        for row in query_result.strip().split("\n"):
+            disk, part = row.split("\t")
+            part_to_disk[part] = disk
+        return part_to_disk
+
+    part_to_disk = get_part_to_disk(
+        node1.query(
+            "SELECT disk_name, name FROM system.parts where table = 'test_concurrent_move' and active"
+        )
+    )
+
+    assert all([value == "s3" for value in part_to_disk.values()])
+
+    part_to_disk = get_part_to_disk(
+        node2.query(
+            "SELECT disk_name, name FROM system.parts where table = 'test_concurrent_move' and active"
+        )
+    )
+    assert all([value == "s3" for value in part_to_disk.values()])
+
+
+def test_zero_copy_mutation(started_cluster):
+    node1 = cluster.instances["node1"]
+    node2 = cluster.instances["node2"]
+
+    node1.query(
+        """
+CREATE TABLE test_zero_copy_mutation (EventDate Date, CounterID UInt32)
+ENGINE = ReplicatedMergeTree('/clickhouse-tables/test_zero_copy_mutation', 'r1')
+ORDER BY (CounterID, EventDate)
+SETTINGS index_granularity = 8192, storage_policy = 's3_only'"""
+    )
+
+    node2.query(
+        """
+CREATE TABLE test_zero_copy_mutation (EventDate Date, CounterID UInt32)
+ENGINE = ReplicatedMergeTree('/clickhouse-tables/test_zero_copy_mutation', 'r2')
+ORDER BY (CounterID, EventDate)
+SETTINGS index_granularity = 8192, storage_policy = 's3_only'"""
+    )
+
+    node1.query(
+        "INSERT INTO test_zero_copy_mutation SELECT toDate('2023-01-01') + toIntervalDay(number) + rand(), number * number from system.numbers limit 10"
+    )
+
+    node2.query("SYSTEM STOP REPLICATION QUEUES test_zero_copy_mutation")
+    p = Pool(3)
+
+    def run_long_mutation(node):
+        node1.query(
+            "ALTER TABLE test_zero_copy_mutation DELETE WHERE sleepEachRow(1) == 1"
+        )
+
+    job = p.apply_async(run_long_mutation, (node1,))
+
+    for i in range(30):
+        count = node1.query(
+            "SELECT count() FROM system.replication_queue WHERE type = 'MUTATE_PART'"
+        ).strip()
+        if int(count) > 0:
+            break
+        else:
+            time.sleep(0.1)
+
+    node2.query("SYSTEM START REPLICATION QUEUES test_zero_copy_mutation")
+
+    node2.query("SYSTEM SYNC REPLICA test_zero_copy_mutation")
+
+    job.get()
+
+    assert node2.contains_in_log("all_0_0_0_1/part_exclusive_lock exists")
+    assert node2.contains_in_log("Removing zero-copy lock on")
+    assert node2.contains_in_log("all_0_0_0_1/part_exclusive_lock doesn't exist")
diff --git a/tests/integration/test_zero_copy_replication_drop_detached_part/__init__.py b/tests/integration/test_zero_copy_replication_drop_detached_part/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_zero_copy_replication_drop_detached_part/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf.xml b/tests/integration/test_zero_copy_replication_drop_detached_part/configs/storage_conf.xml
similarity index 59%
rename from tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf.xml
rename to tests/integration/test_zero_copy_replication_drop_detached_part/configs/storage_conf.xml
index 9dfcf1e2f9b..b08721c44e2 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_zero_copy_replication_drop_detached_part/configs/storage_conf.xml
@@ -1,4 +1,8 @@
 <clickhouse>
+    <logger>
+        <level>test</level>
+    </logger>
+
     <storage_configuration>
         <disks>
             <s3>
@@ -6,13 +10,7 @@
                 <endpoint>http://minio1:9001/root/data/</endpoint>
                 <access_key_id>minio</access_key_id>
                 <secret_access_key>minio123</secret_access_key>
-                <send_metadata>true</send_metadata>
-                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
             </s3>
-            <hdd>
-                <type>local</type>
-                <path>/</path>
-            </hdd>
         </disks>
         <policies>
             <s3>
@@ -20,15 +18,13 @@
                     <main>
                         <disk>s3</disk>
                     </main>
-                    <external>
-                        <disk>hdd</disk>
-                    </external>
                 </volumes>
             </s3>
         </policies>
     </storage_configuration>
 
     <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+        <storage_policy>s3</storage_policy>
+        <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
     </merge_tree>
 </clickhouse>
diff --git a/tests/integration/test_zero_copy_replication_drop_detached_part/test.py b/tests/integration/test_zero_copy_replication_drop_detached_part/test.py
new file mode 100644
index 00000000000..2ecf026d9fb
--- /dev/null
+++ b/tests/integration/test_zero_copy_replication_drop_detached_part/test.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+
+import logging
+import random
+import string
+import time
+import os
+
+from multiprocessing.dummy import Pool
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+
+cluster = ClickHouseCluster(__file__)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.add_instance(
+            "node1",
+            main_configs=["configs/storage_conf.xml"],
+            with_minio=True,
+            with_zookeeper=True,
+        )
+        cluster.start()
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_drop_detached_part(started_cluster):
+    node1 = cluster.instances["node1"]
+
+    node1.query(
+        """
+CREATE TABLE test1 (EventDate Date, CounterID UInt32)
+ENGINE = ReplicatedMergeTree('/clickhouse-tables/test1', 'r1')
+ORDER BY (CounterID, EventDate)"""
+    )
+
+    node1.query(
+        "INSERT INTO test1 SELECT toDate('2023-01-01') + toIntervalDay(number), number + 1000 from system.numbers limit 20"
+    )
+    node1.query("ALTER TABLE test1 DETACH PART 'all_0_0_0'")
+
+    def get_path_to_detached_part(query_result):
+        part_to_disk = {}
+        for row in query_result.strip().split("\n"):
+            print(row)
+            return row
+
+    path_to_detached_part = get_path_to_detached_part(
+        node1.query("SELECT path FROM system.detached_parts where table = 'test1'")
+    )
+
+    new_part_name = "ignored_" + os.path.basename(path_to_detached_part)
+    new_path_to_detached_part_name = (
+        os.path.dirname(path_to_detached_part) + os.sep + new_part_name
+    )
+
+    node1.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"mv {path_to_detached_part} {new_path_to_detached_part_name}",
+        ],
+        privileged=True,
+        user="root",
+    )
+
+    assert (
+        node1.query(
+            "SELECT path FROM system.detached_parts where table = 'test1'"
+        ).strip()
+        == new_path_to_detached_part_name
+    )
+
+    node1.query(
+        f"ALTER TABLE test1 DROP DETACHED PART '{new_part_name}'",
+        settings={"allow_drop_detached": 1},
+    )
+
+    assert (
+        node1.query(
+            "SELECT path FROM system.detached_parts where table = 'test1'"
+        ).strip()
+        == ""
+    )
diff --git a/tests/msan_suppressions.txt b/tests/msan_suppressions.txt
deleted file mode 100644
index cf468b0be96..00000000000
--- a/tests/msan_suppressions.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# https://github.com/google/oss-fuzz/issues/1099
-fun:__gxx_personality_*
-
-# We apply std::tolower to uninitialized padding, but don't use the result, so
-# it is OK. Reproduce with "select ngramDistanceCaseInsensitive(materialize(''), '')"
-fun:tolower
-
-# Suppress some failures in contrib so that we can enable MSan in CI.
-# Ideally, we should report these upstream.
-
-# Hyperscan
-fun:roseRunProgram
diff --git a/tests/performance/asof.xml b/tests/performance/asof.xml
index d9f119fae40..d00afaa26b5 100644
--- a/tests/performance/asof.xml
+++ b/tests/performance/asof.xml
@@ -41,4 +41,34 @@
         ON (visits.fingerprint = origins.fingerprint AND visits.date &gt;= origins.date)
         FORMAT Null
     </query>
+
+    <substitutions>
+        <substitution>
+            <name>num_rows</name>
+            <values>
+                <value>1000000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <query>
+        SELECT COUNT(*) AS count
+        FROM
+        (
+            SELECT
+                number AS id,
+                number AS visitor_id
+            FROM system.numbers
+            LIMIT {num_rows}
+        ) AS sessions
+        ASOF LEFT JOIN
+        (
+            SELECT
+                number AS visitor_id,
+                number AS starting_session_id
+            FROM system.numbers
+            LIMIT {num_rows}
+        ) AS visitors
+        ON visitors.visitor_id = sessions.visitor_id AND visitors.starting_session_id &lt; sessions.id
+    </query>
 </test>
diff --git a/tests/performance/group_by_sundy_li.xml b/tests/performance/group_by_sundy_li.xml
index 07c5aa5cd7f..694fafcbbcd 100644
--- a/tests/performance/group_by_sundy_li.xml
+++ b/tests/performance/group_by_sundy_li.xml
@@ -1,7 +1,7 @@
 <test>
     <settings>
         <max_insert_threads>8</max_insert_threads>
-        <allow_experimental_projection_optimization>0</allow_experimental_projection_optimization>
+        <optimize_use_projections>0</optimize_use_projections>
     </settings>
 
     <create_query>
diff --git a/tests/performance/groupby_onekey_nullable.xml b/tests/performance/groupby_onekey_nullable.xml
new file mode 100644
index 00000000000..9072538039b
--- /dev/null
+++ b/tests/performance/groupby_onekey_nullable.xml
@@ -0,0 +1,49 @@
+<test>
+    <settings>
+        <max_insert_threads>8</max_insert_threads>
+        <optimize_use_projections>0</optimize_use_projections>
+    </settings>
+
+    <substitutions>
+        <substitution>
+            <name>key_type</name>
+            <values>
+                <value>key_string</value>
+                <value>key_string_two_level</value>
+                <value>key_fixed_string</value>
+                <value>key_int64</value>
+                <value>key_int64_two_level</value>
+                <value>key_int32</value>
+                <value>key_int32_two_level</value>
+                <value>Key_int16</value>
+                <value>key_int8</value>
+            </values>
+        </substitution>
+    </substitutions>
+    <create_query>
+        CREATE TABLE t_nullable
+        (
+        key_string Nullable(String),
+        key_string_two_level Nullable(String),
+        key_fixed_string Nullable(FixedString(3)),
+        key_int64 Nullable(Int64),
+        key_int64_two_level Nullable(Int64),
+        key_int32 Nullable(Int32),
+        key_int32_two_level Nullable(Int32),
+        Key_int16 Nullable(Int16),
+        key_int8 Nullable(Int8),
+        i1 Nullable(Int64),
+        i2 Nullable(Int64),
+        )
+        ENGINE = MergeTree
+        ORDER BY tuple()
+    </create_query>
+    <fill_query>insert into t_nullable select ['aa','bb','cc','dd'][number % 10000 + 1], ['aa','bb','cc','dd'][number % 200000 + 1], ['aa','bb','cc','dd'][number % 4 + 1], toInt64(number%10000), toInt64(number%200000), toInt32(number%10000), toInt32(number%200000), toInt16(number%10000), toInt8(number%100), number%6000+1, number%5000+2 from numbers_mt(20000000)</fill_query>
+    <fill_query>insert into t_nullable select ['aa','bb','cc','dd'][number % 10000 + 1], ['aa','bb','cc','dd'][number % 200000 + 1], ['aa','bb','cc','dd'][number % 4 + 1], toInt64(number%10000), toInt64(number%200000), toInt32(number%10000), toInt32(number%200000), toInt16(number%10000), toInt8(number%100), number%6000+1, number%5000+2 from numbers_mt(20000000)</fill_query>
+    <fill_query>insert into t_nullable select ['aa','bb','cc','dd'][number % 10000 + 1], ['aa','bb','cc','dd'][number % 200000 + 1], ['aa','bb','cc','dd'][number % 4 + 1], toInt64(number%10000), toInt64(number%200000), toInt32(number%10000), toInt32(number%200000), toInt16(number%10000), toInt8(number%100), number%6000+1, number%5000+2 from numbers_mt(20000000)</fill_query>
+    <fill_query>insert into t_nullable select ['aa','bb','cc','dd'][number % 10000 + 1], ['aa','bb','cc','dd'][number % 200000 + 1], ['aa','bb','cc','dd'][number % 4 + 1], toInt64(number%10000), toInt64(number%200000), toInt32(number%10000), toInt32(number%200000), toInt16(number%10000), toInt8(number%100), number%6000+1, number%5000+2 from numbers_mt(20000000)</fill_query>
+    <fill_query>OPTIMIZE TABLE t_nullable FINAL</fill_query>
+    <query>select min(i1), min(i2) from t_nullable group by {key_type} format Null</query>
+
+    <drop_query>drop table if exists t_nullable</drop_query>
+</test>
diff --git a/tests/performance/hashed_dictionary_load_factor.xml b/tests/performance/hashed_dictionary_load_factor.xml
new file mode 100644
index 00000000000..dfc5c64b133
--- /dev/null
+++ b/tests/performance/hashed_dictionary_load_factor.xml
@@ -0,0 +1,92 @@
+<test>
+    <substitutions>
+        <substitution>
+            <name>layout_suffix</name>
+            <values>
+                <value>HASHED</value>
+                <value>SPARSE_HASHED</value>
+            </values>
+        </substitution>
+
+        <substitution>
+            <name>load_factor</name>
+            <values>
+                <!-- 0. will be prepended -->
+                <value>5</value>
+                <value>7</value>
+                <value>99</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <create_query>
+        CREATE TABLE simple_key_dictionary_source_table
+        (
+            id UInt64,
+            value_int UInt16
+        ) ENGINE = Memory
+    </create_query>
+
+    <create_query>
+        CREATE TABLE complex_key_dictionary_source_table
+        (
+            id UInt64,
+            id_key String,
+            value_int UInt64
+        ) ENGINE = Memory
+    </create_query>
+
+    <create_query>
+        CREATE DICTIONARY IF NOT EXISTS simple_key_{layout_suffix}_dictionary_l0_{load_factor}
+        (
+            id UInt64,
+            value_int UInt64
+        )
+        PRIMARY KEY id
+        SOURCE(CLICKHOUSE(TABLE 'simple_key_dictionary_source_table'))
+        LAYOUT({layout_suffix}(MAX_LOAD_FACTOR 0.{load_factor}))
+        LIFETIME(0)
+    </create_query>
+
+    <create_query>
+        CREATE DICTIONARY IF NOT EXISTS complex_key_{layout_suffix}_dictionary_l0_{load_factor}
+        (
+            id UInt64,
+            id_key String,
+            value_int UInt64
+        )
+        PRIMARY KEY id, id_key
+        SOURCE(CLICKHOUSE(TABLE 'complex_key_dictionary_source_table'))
+        LAYOUT(COMPLEX_KEY_{layout_suffix}(MAX_LOAD_FACTOR 0.{load_factor}))
+        LIFETIME(0)
+    </create_query>
+
+    <fill_query>INSERT INTO simple_key_dictionary_source_table SELECT number, number FROM numbers(3_000_000)</fill_query>
+    <fill_query>INSERT INTO complex_key_dictionary_source_table SELECT number, toString(number), number FROM numbers(2_000_000)</fill_query>
+
+    <fill_query>SYSTEM RELOAD DICTIONARY simple_key_{layout_suffix}_dictionary_l0_{load_factor}</fill_query>
+    <fill_query>SYSTEM RELOAD DICTIONARY complex_key_{layout_suffix}_dictionary_l0_{load_factor}</fill_query>
+
+    <query>SYSTEM RELOAD DICTIONARY simple_key_{layout_suffix}_dictionary_l0_{load_factor}</query>
+    <query>SYSTEM RELOAD DICTIONARY complex_key_{layout_suffix}_dictionary_l0_{load_factor}</query>
+
+    <query>
+        WITH rand64() % 3_000_000 as key
+        SELECT dictHas('default.simple_key_{layout_suffix}_dictionary_l0_{load_factor}', key)
+        FROM numbers(3_000_000)
+        FORMAT Null
+    </query>
+
+    <query>
+        WITH (rand64() % 2_000_000, toString(rand64() % 2_000_000)) as key
+        SELECT dictHas('default.complex_key_{layout_suffix}_dictionary_l0_{load_factor}', key)
+        FROM numbers(2_000_000)
+        FORMAT Null
+    </query>
+
+    <drop_query>DROP DICTIONARY simple_key_{layout_suffix}_dictionary_l0_{load_factor}</drop_query>
+    <drop_query>DROP DICTIONARY complex_key_{layout_suffix}_dictionary_l0_{load_factor}</drop_query>
+
+    <drop_query>DROP TABLE simple_key_dictionary_source_table</drop_query>
+    <drop_query>DROP TABLE complex_key_dictionary_source_table</drop_query>
+</test>
diff --git a/tests/performance/hashed_dictionary_sharded.xml b/tests/performance/hashed_dictionary_sharded.xml
index 98c65fc49ea..d229ce02c49 100644
--- a/tests/performance/hashed_dictionary_sharded.xml
+++ b/tests/performance/hashed_dictionary_sharded.xml
@@ -22,7 +22,7 @@
         CREATE TABLE simple_key_dictionary_source_table
         (
             id UInt64,
-            value_int UInt64
+            value_int UInt16
         ) ENGINE = Memory
     </create_query>
 
diff --git a/tests/performance/join_used_flags.xml b/tests/performance/join_used_flags.xml
new file mode 100644
index 00000000000..cd2073ee106
--- /dev/null
+++ b/tests/performance/join_used_flags.xml
@@ -0,0 +1,6 @@
+<test>
+    <create_query>CREATE TABLE test_join_used_flags (i64 Int64, i32 Int32) ENGINE = Memory</create_query>
+    <fill_query>INSERT INTO test_join_used_flags SELECT number AS i64, rand32() AS i32 FROM numbers(20000000)</fill_query>
+    <query>SELECT l.i64, r.i64, l.i32, r.i32 FROM test_join_used_flags l RIGHT JOIN test_join_used_flags r USING i64 format Null</query>
+    <drop_query>DROP TABLE IF EXISTS test_join_used_flags</drop_query>
+</test>
diff --git a/tests/performance/map_update.xml b/tests/performance/map_update.xml
new file mode 100644
index 00000000000..2c5417ffe28
--- /dev/null
+++ b/tests/performance/map_update.xml
@@ -0,0 +1,22 @@
+<test>
+    <query>
+        WITH (range(10), range(10))::Map(String, UInt64) AS m1, (range(3), range(3))::Map(String, UInt64) AS m2
+        SELECT count() FROM numbers(500000)
+        WHERE NOT ignore(mapUpdate(materialize(m1), materialize(m2)))
+    </query>
+    <query>
+        WITH (range(10), range(10))::Map(String, UInt64) AS m1, (range(3), range(3))::Map(String, UInt64) AS m2
+        SELECT count() FROM numbers(500000)
+        WHERE NOT ignore(mapUpdate(materialize(m1), m2))
+    </query>
+    <query>
+        WITH (range(100), range(100))::Map(String, UInt64) AS m1, (range(30), range(30))::Map(String, UInt64) AS m2
+        SELECT count() FROM numbers(50000)
+        WHERE NOT ignore(mapUpdate(materialize(m1), materialize(m2)))
+    </query>
+    <query>
+        WITH (range(100), range(100))::Map(String, UInt64) AS m1, (range(30), range(30))::Map(String, UInt64) AS m2
+        SELECT count() FROM numbers(50000)
+        WHERE NOT ignore(mapUpdate(materialize(m1), m2))
+    </query>
+</test>
diff --git a/tests/performance/polymorphic_parts_s.xml b/tests/performance/polymorphic_parts_s.xml
index 5021e135bb9..b4dd87a7ae3 100644
--- a/tests/performance/polymorphic_parts_s.xml
+++ b/tests/performance/polymorphic_parts_s.xml
@@ -13,13 +13,6 @@
         SAMPLE BY intHash32(UserID)
         SETTINGS min_bytes_for_wide_part = '10M'
     </create_query>
-    <create_query>
-        CREATE TABLE hits_memory AS hits_10m_single ENGINE = MergeTree()
-        PARTITION BY toYYYYMM(EventDate)
-        ORDER BY (CounterID, EventDate, intHash32(UserID))
-        SAMPLE BY intHash32(UserID)
-        SETTINGS min_bytes_for_compact_part = '1M', min_bytes_for_wide_part = '10M', in_memory_parts_enable_wal = 1
-    </create_query>
     <create_query>
        CREATE TABLE hits_buffer AS hits_10m_single 
        ENGINE = Buffer(default, hits_wide, 1, 0, 0, 10000, 10000, 0, 0)
@@ -38,6 +31,5 @@
 
     <drop_query>DROP TABLE IF EXISTS hits_wide</drop_query>
     <drop_query>DROP TABLE IF EXISTS hits_compact</drop_query>
-    <drop_query>DROP TABLE IF EXISTS hits_memory</drop_query>
     <drop_query>DROP TABLE IF EXISTS hits_buffer</drop_query>
 </test>
diff --git a/tests/performance/reading_from_file.xml b/tests/performance/reading_from_file.xml
new file mode 100644
index 00000000000..992f1e8acae
--- /dev/null
+++ b/tests/performance/reading_from_file.xml
@@ -0,0 +1,9 @@
+<test>
+
+<fill_query>INSERT INTO function file(reading_from_file.parquet) SELECT URL FROM test.hits LIMIT 100000 SETTINGS engine_file_truncate_on_insert=1</fill_query>
+
+<query>SELECT sum(length(base58Encode(URL))) FROM file(reading_from_file.parquet) FORMAT Null</query>
+
+<drop_query>INSERT INTO FUNCTION file(reading_from_file.parquet) SELECT * FROM numbers(0) SETTINGS engine_file_truncate_on_insert=1</drop_query>
+
+</test>
diff --git a/tests/performance/set_disable_skip_index.xml b/tests/performance/set_disable_skip_index.xml
new file mode 100644
index 00000000000..5769f30eac9
--- /dev/null
+++ b/tests/performance/set_disable_skip_index.xml
@@ -0,0 +1,17 @@
+<test>
+    <create_query>
+        CREATE TABLE test_in_skip_idx
+        (
+            a UInt64,
+            s String,
+            INDEX idx s TYPE bloom_filter GRANULARITY 1
+        )
+        ENGINE = MergeTree() ORDER BY a
+    </create_query>
+
+    <fill_query>INSERT INTO test_in_skip_idx SELECT number, number FROM numbers(10000000)</fill_query>
+    <fill_query>OPTIMIZE TABLE test_in_skip_idx FINAL</fill_query>
+
+    <query>SELECT count() FROM test_in_skip_idx WHERE s IN (SELECT toString(number + 10000000) FROM numbers(100000)) SETTINGS use_skip_indexes = 0</query>
+    <drop_query>DROP TABLE IF EXISTS test_in_skip_idx</drop_query>
+</test>
diff --git a/tests/performance/uniqExactIf.xml b/tests/performance/uniqExactIf.xml
new file mode 100644
index 00000000000..409be257737
--- /dev/null
+++ b/tests/performance/uniqExactIf.xml
@@ -0,0 +1,3 @@
+<test>
+    <query>SELECT uniqExactIf(number, 1) FROM numbers_mt(1e6)</query>
+</test>
diff --git a/tests/queries/0_stateless/00002_log_and_exception_messages_formatting.reference b/tests/queries/0_stateless/00002_log_and_exception_messages_formatting.reference
index 032d7e396ff..11b660b54a3 100644
--- a/tests/queries/0_stateless/00002_log_and_exception_messages_formatting.reference
+++ b/tests/queries/0_stateless/00002_log_and_exception_messages_formatting.reference
@@ -1,8 +1,8 @@
 runtime messages	0.001
 runtime exceptions	0.05
-messages shorter than 10	10
-messages shorter than 16	40
-exceptions shorter than 30	125
+messages shorter than 10	1
+messages shorter than 16	3
+exceptions shorter than 30	3
 noisy messages	0.3
 noisy Trace messages	0.16
 noisy Debug messages	0.09
diff --git a/tests/queries/0_stateless/00002_log_and_exception_messages_formatting.sql b/tests/queries/0_stateless/00002_log_and_exception_messages_formatting.sql
index bb2a8ce8b98..acb6117f937 100644
--- a/tests/queries/0_stateless/00002_log_and_exception_messages_formatting.sql
+++ b/tests/queries/0_stateless/00002_log_and_exception_messages_formatting.sql
@@ -14,14 +14,45 @@ select 'runtime messages', max2(coalesce(sum(length(message_format_string) = 0)
 -- Check the same for exceptions. The value was 0.03
 select 'runtime exceptions', max2(coalesce(sum(length(message_format_string) = 0) / countOrNull(), 0), 0.05) from logs where message like '%DB::Exception%';
 
+-- FIXME some of the following messages are not informative and it has to be fixed
+create temporary table known_short_messages (s String) as select * from (select
+['', '({}) Keys: {}', '({}) {}', 'Aggregating', 'Became leader', 'Cleaning queue',
+'Creating set.', 'Cyclic aliases', 'Detaching {}', 'Executing {}', 'Fire events: {}',
+'Found part {}', 'Loaded queue', 'No sharding key', 'No tables', 'Query: {}', 'Removed',
+'Removed part {}', 'Removing parts.', 'Request URI: {}', 'Sending part {}',
+'Sent handshake', 'Starting {}', 'Will mimic {}', 'Writing to {}', 'dropIfEmpty',
+'loadAll {}', '{} ({}:{})', '{} -> {}', '{} {}', '{}: {}', '{}%', 'Read object: {}',
+'New segment: {}', 'Convert overflow', 'Division by zero', 'Files set to {}',
+'Bytes set to {}', 'Numeric overflow', 'Invalid mode: {}',
+'Write file: {}', 'Unable to parse JSONPath', 'Host is empty in S3 URI.', 'Expected end of line',
+'inflate failed: {}{}', 'Center is not valid', 'Column ''{}'' is ambiguous', 'Cannot parse object', 'Invalid date: {}',
+'There is no cache by name: {}', 'No part {} in table', '`{}` should be a String', 'There are duplicate id {}',
+'Invalid replica name: {}', 'Unexpected value {} in enum', 'Unknown BSON type: {}', 'Point is not valid',
+'Invalid qualified name: {}', 'INTO OUTFILE is not allowed', 'Arguments must not be NaN', 'Cell is not valid',
+'brotli decode error{}', 'Invalid H3 index: {}', 'Too large node state size', 'No additional keys found.',
+'Attempt to read after EOF.', 'Replication was stopped', '{}	building file infos', 'Cannot parse uuid {}',
+'Query was cancelled', 'Cancelled merging parts', 'Cancelled mutating parts', 'Log pulling is cancelled',
+'Transaction was cancelled', 'Could not find table: {}', 'Table {} doesn''t exist',
+'Database {} doesn''t exist', 'Dictionary ({}) not found', 'Unknown table function {}',
+'Unknown format {}', 'Unknown explain kind ''{}''', 'Unknown setting {}', 'Unknown input format {}',
+'Unknown identifier: ''{}''', 'User name is empty', 'Expected function, got: {}',
+'Attempt to read after eof', 'String size is too big ({}), maximum: {}'
+] as arr) array join arr;
+
 -- Check that we don't have too many short meaningless message patterns.
-select 'messages shorter than 10', max2(countDistinctOrDefault(message_format_string), 10) from logs where length(message_format_string) < 10;
+select 'messages shorter than 10', max2(countDistinctOrDefault(message_format_string), 1) from logs where length(message_format_string) < 10 and message_format_string not in known_short_messages;
 
 -- Same as above. Feel free to update the threshold or remove this query if really necessary
-select 'messages shorter than 16', max2(countDistinctOrDefault(message_format_string), 40) from logs where length(message_format_string) < 16;
+select 'messages shorter than 16', max2(countDistinctOrDefault(message_format_string), 3) from logs where length(message_format_string) < 16 and message_format_string not in known_short_messages;
 
--- Same as above, but exceptions must be more informative. Feel free to update the threshold or remove this query if really necessary
-select 'exceptions shorter than 30', max2(countDistinctOrDefault(message_format_string), 125) from logs where length(message_format_string) < 30 and message ilike '%DB::Exception%';
+-- Unlike above, here we look at length of the formatted message, not format string. Most short format strings are fine because they end up decorated with context from outer or inner exceptions, e.g.:
+-- "Expected end of line" -> "Code: 117. DB::Exception: Expected end of line: (in file/uri /var/lib/clickhouse/user_files/data_02118): (at row 1)"
+-- But we have to cut out the boilerplate, e.g.:
+-- "Code: 60. DB::Exception: Table default.a doesn't exist. (UNKNOWN_TABLE), Stack trace" -> "Table default.a doesn't exist."
+-- This table currently doesn't have enough information to do this reliably, so we just regex search for " (ERROR_NAME_IN_CAPS)" and hope that's good enough.
+-- For the "Code: 123. DB::Exception: " part, we just subtract 26 instead of searching for it. Because sometimes it's not at the start, e.g.:
+-- "Unexpected error, will try to restart main thread: Code: 341. DB::Exception: Unexpected error: Code: 57. DB::Exception:[...]"
+select 'exceptions shorter than 30', max2(countDistinctOrDefault(message_format_string), 3) from logs where message ilike '%DB::Exception%' and if(length(regexpExtract(message, '(.*)\\([A-Z0-9_]+\\)')) as pref > 0, pref, length(message)) < 30 + 26 and message_format_string not in known_short_messages;
 
 
 -- Avoid too noisy messages: top 1 message frequency must be less than 30%. We should reduce the threshold
@@ -40,11 +71,11 @@ select 'noisy Info messages', max2((select count() from logs where level <= 'Inf
 
 -- Same as above for Warning
 with ('Not enabled four letter command {}') as frequent_in_tests
-select 'noisy Warning messages', max2((select countOrDefault() from logs where level = 'Warning' and message_format_string not in frequent_in_tests
-    group by message_format_string order by count() desc limit 1) / (select count() from logs), 0.01);
+select 'noisy Warning messages', max2(coalesce((select countOrDefault() from logs where level = 'Warning' and message_format_string not in frequent_in_tests
+    group by message_format_string order by count() desc limit 1), 0) / (select count() from logs), 0.01);
 
 -- Same as above for Error
-select 'noisy Error messages', max2((select countOrDefault() from logs where level = 'Error' group by message_format_string order by count() desc limit 1) / (select count() from logs), 0.02);
+select 'noisy Error messages', max2(coalesce((select countOrDefault() from logs where level = 'Error' group by message_format_string order by count() desc limit 1), 0) / (select count() from logs), 0.02);
 
 select 'no Fatal messages', count() from logs where level = 'Fatal';
 
@@ -57,8 +88,12 @@ select 'number of noisy messages', max2(count(), 10) from (select count() / (sel
 -- FIXME maybe we should make it stricter ('Code:%Exception: '||s||'%'), but it's not easy because of addMessage
 select 'incorrect patterns', max2(countDistinct(message_format_string), 15) from (
     select message_format_string, any(message) as any_message from logs
-    where message not like (replaceRegexpAll(message_format_string, '{[:.0-9dfx]*}', '%') as s)
-    and message not like ('%Exception: '||s||'%') group by message_format_string
+    where ((rand() % 8) = 0)
+    and message not like (replaceRegexpAll(message_format_string, '{[:.0-9dfx]*}', '%') as s)
+    and message not like (s || ' (skipped % similar messages)')
+    and message not like ('%Exception: '||s||'%')
+    and message not like ('%(skipped % similar messages)%')
+    group by message_format_string
 ) where any_message not like '%Poco::Exception%';
 
 drop table logs;
diff --git a/tests/queries/0_stateless/00002_system_numbers.sql b/tests/queries/0_stateless/00002_system_numbers.sql
index 95f75573201..d5934c7d387 100644
--- a/tests/queries/0_stateless/00002_system_numbers.sql
+++ b/tests/queries/0_stateless/00002_system_numbers.sql
@@ -6,7 +6,7 @@ SELECT number FROM system.numbers WHERE number >= 5 LIMIT 2;
 SELECT * FROM system.numbers WHERE number == 7 LIMIT 1;
 SELECT number AS n FROM system.numbers WHERE number IN(8, 9) LIMIT 2;
 select number from system.numbers limit 0;
-select x from system.numbers limit 1; -- { clientError 0 serverError 47 }
+select x from system.numbers limit 1; -- { serverError UNKNOWN_IDENTIFIER }
 SELECT x, number FROM system.numbers LIMIT 1; -- { serverError 47 }
 SELECT * FROM system.number LIMIT 1; -- { serverError 60 }
 SELECT * FROM system LIMIT 1; -- { serverError 60 }
diff --git a/tests/queries/0_stateless/00057_join_aliases.sql b/tests/queries/0_stateless/00057_join_aliases.sql
index b994e26a747..6f283094396 100644
--- a/tests/queries/0_stateless/00057_join_aliases.sql
+++ b/tests/queries/0_stateless/00057_join_aliases.sql
@@ -1,6 +1,6 @@
 SELECT * FROM (
-    SELECT number, number / 2 AS n, j1, j2
-    FROM system.numbers
+    SELECT number, n, j1, j2
+    FROM (SELECT number, number / 2 AS n FROM system.numbers) js1
     ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 10) js2
     USING n LIMIT 10
 ) ORDER BY n
diff --git a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
index 30be591dac3..2ed4b049a37 100644
--- a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
@@ -1,6 +1,5 @@
--- Tags: long, zookeeper, no-replicated-database, no-parallel
+-- Tags: long, zookeeper, no-replicated-database
 -- Tag no-replicated-database: Old syntax is not allowed
--- Tag no-parallel: leftovers
 
 SET optimize_on_insert = 0;
 
diff --git a/tests/queries/0_stateless/00099_join_many_blocks_segfault.sql b/tests/queries/0_stateless/00099_join_many_blocks_segfault.sql
index 7219bcecf55..31dec093e61 100644
--- a/tests/queries/0_stateless/00099_join_many_blocks_segfault.sql
+++ b/tests/queries/0_stateless/00099_join_many_blocks_segfault.sql
@@ -1,7 +1,10 @@
 SELECT
-    1 AS DomainID,
+    DomainID,
     Domain
-FROM system.one
+FROM
+(
+    SELECT 1 AS DomainID FROM system.one
+) js1
 ANY LEFT JOIN
 (
     SELECT
diff --git a/tests/queries/0_stateless/00109_shard_totals_after_having.sql b/tests/queries/0_stateless/00109_shard_totals_after_having.sql
index 2a616b4a39d..b17accc0dae 100644
--- a/tests/queries/0_stateless/00109_shard_totals_after_having.sql
+++ b/tests/queries/0_stateless/00109_shard_totals_after_having.sql
@@ -1,4 +1,4 @@
--- Tags: shard, no-parallel, no-fasttest
+-- Tags: shard, no-fasttest
 
 SET max_rows_to_group_by = 100000;
 SET max_block_size = 100001;
@@ -10,15 +10,15 @@ CREATE TABLE  numbers500k (number UInt32) ENGINE = TinyLog;
 INSERT INTO numbers500k SELECT number FROM system.numbers LIMIT 500000;
 
 SET totals_mode = 'after_having_auto';
-SELECT intDiv(number, 2) AS k, count(), argMax(toString(number), number) FROM remote('127.0.0.{2,3}', currentDatabase(), numbers500k) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
+SELECT intDiv(number, 2) AS k, count(), argMax(toString(number), number) FROM (SELECT * FROM remote('127.0.0.{2,3}', currentDatabase(), numbers500k) ORDER BY number) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
 
 SET totals_mode = 'after_having_inclusive';
-SELECT intDiv(number, 2) AS k, count(), argMax(toString(number), number) FROM remote('127.0.0.{2,3}', currentDatabase(), numbers500k) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
+SELECT intDiv(number, 2) AS k, count(), argMax(toString(number), number) FROM (SELECT * FROM remote('127.0.0.{2,3}', currentDatabase(), numbers500k) ORDER BY number) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
 
 SET totals_mode = 'after_having_exclusive';
-SELECT intDiv(number, 2) AS k, count(), argMax(toString(number), number) FROM remote('127.0.0.{2,3}', currentDatabase(), numbers500k) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
+SELECT intDiv(number, 2) AS k, count(), argMax(toString(number), number) FROM (SELECT * FROM remote('127.0.0.{2,3}', currentDatabase(), numbers500k) ORDER BY number) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
 
 SET totals_mode = 'before_having';
-SELECT intDiv(number, 2) AS k, count(), argMax(toString(number), number) FROM remote('127.0.0.{2,3}', currentDatabase(), numbers500k) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
+SELECT intDiv(number, 2) AS k, count(), argMax(toString(number), number) FROM (SELECT * FROM remote('127.0.0.{2,3}', currentDatabase(), numbers500k) ORDER BY number) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
 
 DROP TABLE numbers500k;
diff --git a/tests/queries/0_stateless/00116_storage_set.sql b/tests/queries/0_stateless/00116_storage_set.sql
index b06ee254c69..0eeed7e859a 100644
--- a/tests/queries/0_stateless/00116_storage_set.sql
+++ b/tests/queries/0_stateless/00116_storage_set.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 DROP TABLE IF EXISTS set;
 DROP TABLE IF EXISTS set2;
 
diff --git a/tests/queries/0_stateless/00118_storage_join.sql b/tests/queries/0_stateless/00118_storage_join.sql
index 17cfe437448..552e62afa9c 100644
--- a/tests/queries/0_stateless/00118_storage_join.sql
+++ b/tests/queries/0_stateless/00118_storage_join.sql
@@ -1,5 +1,3 @@
-SET allow_experimental_analyzer = 1;
-
 DROP TABLE IF EXISTS t2;
 
 CREATE TABLE t2 (k UInt64, s String) ENGINE = Join(ANY, LEFT, k);
@@ -18,6 +16,6 @@ SELECT k, js1.s, t2.s FROM (SELECT toUInt64(number / 3) AS k, sum(number) as s F
 SELECT k, js1.s, t2.s FROM (SELECT number AS k, number AS s FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 ON js1.k == t2.k ORDER BY k;
 SELECT k, t2.k, js1.s, t2.s FROM (SELECT number AS k, number AS s FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 ON js1.k == t2.k ORDER BY k;
 
-SELECT k, js1.s, t2.s FROM (SELECT number AS k, number AS s FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 ON js1.k == t2.k OR js1.s == t2.k ORDER BY k; -- { serverError 264 }
+SELECT k, js1.s, t2.s FROM (SELECT number AS k, number AS s FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 ON js1.k == t2.k OR js1.s == t2.k ORDER BY k; -- { serverError 48, 264 }
 
 DROP TABLE t2;
diff --git a/tests/queries/0_stateless/00122_join_with_subquery_with_subquery.sql b/tests/queries/0_stateless/00122_join_with_subquery_with_subquery.sql
index 0cb3de94a55..add31112579 100644
--- a/tests/queries/0_stateless/00122_join_with_subquery_with_subquery.sql
+++ b/tests/queries/0_stateless/00122_join_with_subquery_with_subquery.sql
@@ -1 +1 @@
-SELECT 1 AS k FROM system.one ANY LEFT JOIN (SELECT k FROM (SELECT 1 AS k, 2 AS x)) js2 USING k;
+SELECT k FROM (SELECT 1 AS k FROM system.one) js1 ANY LEFT JOIN (SELECT k FROM (SELECT 1 AS k, 2 AS x)) js2 USING k;
diff --git a/tests/queries/0_stateless/00138_table_aliases.sql b/tests/queries/0_stateless/00138_table_aliases.sql
index 58fe2ac65e9..1d168250266 100644
--- a/tests/queries/0_stateless/00138_table_aliases.sql
+++ b/tests/queries/0_stateless/00138_table_aliases.sql
@@ -1,2 +1,2 @@
 SELECT * FROM `system`.`one` AS `xxx`;
-SELECT 1 AS k, s FROM `system`.`one` AS `xxx` ANY LEFT JOIN (SELECT 1 AS k, 'Hello' AS s) AS `yyy` USING k;
+SELECT k, s FROM (SELECT 1 AS k FROM `system`.`one`) AS `xxx` ANY LEFT JOIN (SELECT 1 AS k, 'Hello' AS s) AS `yyy` USING k;
diff --git a/tests/queries/0_stateless/00155_long_merges.sh b/tests/queries/0_stateless/00155_long_merges.sh
index 83d89c57cfa..9ed0f2c6de1 100755
--- a/tests/queries/0_stateless/00155_long_merges.sh
+++ b/tests/queries/0_stateless/00155_long_merges.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long
+# Tags: long, no-debug
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00162_shard_global_join.sql b/tests/queries/0_stateless/00162_shard_global_join.sql
index 040eb0e7c03..0bf80e70dda 100644
--- a/tests/queries/0_stateless/00162_shard_global_join.sql
+++ b/tests/queries/0_stateless/00162_shard_global_join.sql
@@ -1,3 +1,4 @@
 -- Tags: shard
 
-SELECT toFloat64(dummy + 2) AS n, j1, j2 FROM remote('127.0.0.{2,3}', system.one) jr1 GLOBAL ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 10) jr2 USING n LIMIT 10;
+SELECT n, j1, j2 FROM (SELECT toFloat64(dummy + 2) AS n FROM remote('127.0.0.{2,3}', system.one)) jr1
+GLOBAL ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 10) jr2 USING n LIMIT 10;
diff --git a/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql b/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
index 777b2443416..07242f7a8d4 100644
--- a/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
+++ b/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
@@ -4,29 +4,29 @@ SET any_join_distinct_right_table_keys = 1;
 SET joined_subquery_requires_alias = 0;
 
 SELECT * FROM (
-    SELECT number, number / 2 AS n, j1, j2
-    FROM remote('127.0.0.{2,3}', system.numbers)
+    SELECT number, n, j1, j2
+    FROM (SELECT number, number / 2 AS n FROM remote('127.0.0.{2,3}', system.numbers))
     ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 0)
     USING n LIMIT 10
 ) ORDER BY number;
 
 SELECT * FROM (
-    SELECT dummy + 2 AS number, number / 2 AS n, j1, j2
-    FROM remote('127.0.0.{2,3}', system.one)
+    SELECT number, n, j1, j2
+    FROM (SELECT dummy + 2 AS number, number / 2 AS n FROM remote('127.0.0.{2,3}', system.one))
     ANY INNER JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 0)
     USING n LIMIT 10
 ) ORDER BY number;
 
 SELECT * FROM (
-    SELECT number, number / 2 AS n, j1, j2
-    FROM remote('127.0.0.{2,3}', system.numbers)
+    SELECT number, n, j1, j2
+    FROM (SELECT number, number / 2 AS n FROM remote('127.0.0.{2,3}', system.numbers))
     GLOBAL ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 0)
     USING n LIMIT 10
 ) ORDER BY number;
 
 SELECT * FROM (
-    SELECT dummy + 2 AS number, number / 2 AS n, j1, j2
-    FROM remote('127.0.0.{2,3}', system.one)
+    SELECT number, n, j1, j2
+    FROM (SELECT dummy + 2 AS number, number / 2 AS n FROM remote('127.0.0.{2,3}', system.one))
     GLOBAL ANY INNER JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 0)
     USING n LIMIT 10
 ) ORDER BY number;
diff --git a/tests/queries/0_stateless/00180_attach_materialized_view.sql b/tests/queries/0_stateless/00180_attach_materialized_view.sql
index 9bebd46da84..d674c0bd277 100644
--- a/tests/queries/0_stateless/00180_attach_materialized_view.sql
+++ b/tests/queries/0_stateless/00180_attach_materialized_view.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 DROP TABLE IF EXISTS t_00180;
 DROP TABLE IF EXISTS mv_00180;
 DROP TABLE IF EXISTS `.inner.mv_00180`;
diff --git a/tests/queries/0_stateless/00189_time_zones_long.reference b/tests/queries/0_stateless/00189_time_zones_long.reference
index 8717a662771..d41c925bbe5 100644
--- a/tests/queries/0_stateless/00189_time_zones_long.reference
+++ b/tests/queries/0_stateless/00189_time_zones_long.reference
@@ -246,18 +246,18 @@ toUnixTimestamp
 1426415400
 1426415400
 date_trunc
-2019-01-01
-2020-01-01
-2020-01-01
-2019-10-01
-2020-01-01
-2020-01-01
-2019-12-01
-2020-01-01
-2020-01-01
-2019-12-30
-2019-12-30
-2019-12-30
+2019-01-01 00:00:00
+2020-01-01 00:00:00
+2020-01-01 00:00:00
+2019-10-01 00:00:00
+2020-01-01 00:00:00
+2020-01-01 00:00:00
+2019-12-01 00:00:00
+2020-01-01 00:00:00
+2020-01-01 00:00:00
+2019-12-30 00:00:00
+2019-12-30 00:00:00
+2019-12-30 00:00:00
 2019-12-31 00:00:00
 2020-01-01 00:00:00
 2020-01-02 00:00:00
@@ -270,18 +270,18 @@ date_trunc
 2019-12-31 20:11:22
 2020-01-01 12:11:22
 2020-01-02 05:11:22
-2019-01-01
-2020-01-01
-2020-01-01
-2019-10-01
-2020-01-01
-2020-01-01
-2019-12-01
-2020-01-01
-2020-01-01
-2019-12-30
-2019-12-30
-2019-12-30
+2019-01-01 00:00:00
+2020-01-01 00:00:00
+2020-01-01 00:00:00
+2019-10-01 00:00:00
+2020-01-01 00:00:00
+2020-01-01 00:00:00
+2019-12-01 00:00:00
+2020-01-01 00:00:00
+2020-01-01 00:00:00
+2019-12-30 00:00:00
+2019-12-30 00:00:00
+2019-12-30 00:00:00
 2019-12-31 00:00:00
 2020-01-01 00:00:00
 2020-01-02 00:00:00
@@ -294,8 +294,8 @@ date_trunc
 2019-12-31 20:11:22
 2020-01-01 12:11:22
 2020-01-02 05:11:22
-2020-01-01
-2020-01-01
-2020-01-01
-2019-12-30
+2020-01-01 00:00:00
+2020-01-01 00:00:00
+2020-01-01 00:00:00
+2019-12-30 00:00:00
 2020-01-01 00:00:00
diff --git a/tests/queries/0_stateless/00202_cross_join.reference b/tests/queries/0_stateless/00202_cross_join.reference
index 122cf0a6e06..a8db281730a 100644
--- a/tests/queries/0_stateless/00202_cross_join.reference
+++ b/tests/queries/0_stateless/00202_cross_join.reference
@@ -13,3 +13,33 @@
 2	2
 2	3
 2	4
+0	0
+0	1
+0	2
+0	3
+0	4
+1	0
+1	1
+1	2
+1	3
+1	4
+2	0
+2	1
+2	2
+2	3
+2	4
+0	0
+0	1
+0	2
+0	3
+0	4
+1	0
+1	1
+1	2
+1	3
+1	4
+2	0
+2	1
+2	2
+2	3
+2	4
diff --git a/tests/queries/0_stateless/00202_cross_join.sql b/tests/queries/0_stateless/00202_cross_join.sql
index ed435d90021..8d62c56b3f1 100644
--- a/tests/queries/0_stateless/00202_cross_join.sql
+++ b/tests/queries/0_stateless/00202_cross_join.sql
@@ -1 +1,7 @@
 SELECT x, y FROM (SELECT number AS x FROM system.numbers LIMIT 3) js1 CROSS JOIN (SELECT number AS y FROM system.numbers LIMIT 5) js2;
+
+SET join_algorithm = 'auto';
+SELECT x, y FROM (SELECT number AS x FROM system.numbers LIMIT 3) js1 CROSS JOIN (SELECT number AS y FROM system.numbers LIMIT 5) js2;
+
+SET allow_experimental_analyzer = 1;
+SELECT x, y FROM (SELECT number AS x FROM system.numbers LIMIT 3) js1 CROSS JOIN (SELECT number AS y FROM system.numbers LIMIT 5) js2;
diff --git a/tests/queries/0_stateless/00203_full_join.sql b/tests/queries/0_stateless/00203_full_join.sql
index 9b07e9c84e7..43ce4c6da7d 100644
--- a/tests/queries/0_stateless/00203_full_join.sql
+++ b/tests/queries/0_stateless/00203_full_join.sql
@@ -17,17 +17,17 @@ DROP TABLE IF EXISTS t1_00203;
 DROP TABLE IF EXISTS t2_00203;
 
 CREATE TABLE t1_00203 (k1 UInt32, k2 UInt32, k3 UInt32, val_t1 String) ENGINE=TinyLog;
-CREATE TABLE t2_00203 (val_t2 String, k3 UInt32, k2_alias UInt32, k1 UInt32) ENGINE=TinyLog;
+CREATE TABLE t2_00203 (val_t2 String, k3 UInt32, k2 UInt32, k1 UInt32) ENGINE=TinyLog;
 
 INSERT INTO t1_00203 VALUES (1, 2, 3, 'aaa'), (2, 3, 4, 'bbb');
 INSERT INTO t2_00203 VALUES ('ccc', 4, 3, 2), ('ddd', 7, 6, 5);
 
-SELECT k1, k2, k3, val_t1, val_t2 FROM t1_00203 ANY FULL JOIN t2_00203 USING (k3, k1, k2 AS k2_alias) ORDER BY k1, k2, k3;
-SELECT k1, k2, k3, val_t1, val_t2 FROM t1_00203 ANY RIGHT JOIN t2_00203 USING (k3, k1, k2 AS k2_alias) ORDER BY k1, k2, k3;
+SELECT k1, k2, k3, val_t1, val_t2 FROM t1_00203 ANY FULL JOIN t2_00203 USING (k3, k1, k2) ORDER BY k1, k2, k3;
+SELECT k1, k2, k3, val_t1, val_t2 FROM t1_00203 ANY RIGHT JOIN t2_00203 USING (k3, k1, k2) ORDER BY k1, k2, k3;
 
 SET any_join_distinct_right_table_keys = 0;
-SELECT k1, k2, k3, val_t1, val_t2 FROM t1_00203 ANY FULL JOIN t2_00203 USING (k3, k1, k2 AS k2_alias) ORDER BY k1, k2, k3; -- { serverError 48 }
-SELECT k1, k2, k3, val_t1, val_t2 FROM t1_00203 ANY RIGHT JOIN t2_00203 USING (k3, k1, k2 AS k2_alias) ORDER BY k1, k2, k3;
+SELECT k1, k2, k3, val_t1, val_t2 FROM t1_00203 ANY FULL JOIN t2_00203 USING (k3, k1, k2) ORDER BY k1, k2, k3; -- { serverError 48 }
+SELECT k1, k2, k3, val_t1, val_t2 FROM t1_00203 ANY RIGHT JOIN t2_00203 USING (k3, k1, k2) ORDER BY k1, k2, k3;
 
 DROP TABLE t1_00203;
 DROP TABLE t2_00203;
diff --git a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.reference b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.reference
index fc77ed8a241..866dc4f1894 100644
--- a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.reference
+++ b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.reference
@@ -5,16 +5,16 @@
 11
 40
 
-40
+0
 41
 
-41
+0
 2	42
 
 2	42
 43
 
-43
+0
 11
 
 11
diff --git a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
index 93fa1f440b1..5cc06a41132 100644
--- a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
+++ b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
@@ -1,6 +1,7 @@
 -- Tags: shard
 
-set enable_positional_arguments=0;
+set allow_experimental_analyzer = 1;
+set enable_positional_arguments = 0;
 
 select 40 as z from (select * from system.numbers limit 3) group by z;
 select 41 as z from remote('127.0.0.{2,3}', system.one) group by z;
diff --git a/tests/queries/0_stateless/00305_http_and_readonly.sh b/tests/queries/0_stateless/00305_http_and_readonly.sh
index c630f8c87ee..dd9f116be7a 100755
--- a/tests/queries/0_stateless/00305_http_and_readonly.sh
+++ b/tests/queries/0_stateless/00305_http_and_readonly.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00311_array_primary_key.sql b/tests/queries/0_stateless/00311_array_primary_key.sql
index 348ef2d1c6f..c09d8020bfc 100644
--- a/tests/queries/0_stateless/00311_array_primary_key.sql
+++ b/tests/queries/0_stateless/00311_array_primary_key.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 set allow_deprecated_syntax_for_merge_tree=1;
 DROP TABLE IF EXISTS array_pk;
 CREATE TABLE array_pk (key Array(UInt8), s String, n UInt64, d Date MATERIALIZED '2000-01-01') ENGINE = MergeTree(d, (key, s, n), 1);
diff --git a/tests/queries/0_stateless/00313_const_totals_extremes.reference b/tests/queries/0_stateless/00313_const_totals_extremes.reference
index fcb39b8080c..02ed40bc027 100644
--- a/tests/queries/0_stateless/00313_const_totals_extremes.reference
+++ b/tests/queries/0_stateless/00313_const_totals_extremes.reference
@@ -86,7 +86,7 @@
 	[
 		{
 			"name": "k",
-			"type": "DateTime"
+			"type": "DateTime('UTC')"
 		},
 		{
 			"name": "count()",
diff --git a/tests/queries/0_stateless/00313_const_totals_extremes.sh b/tests/queries/0_stateless/00313_const_totals_extremes.sh
index 0c51d80abe8..539a19817e2 100755
--- a/tests/queries/0_stateless/00313_const_totals_extremes.sh
+++ b/tests/queries/0_stateless/00313_const_totals_extremes.sh
@@ -4,10 +4,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1 AS k, count() GROUP BY k WITH TOTALS";
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1234567890123 AS k, count() GROUP BY k WITH TOTALS FORMAT JSON";
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toFloat32(1.23) AS k, count() GROUP BY k WITH TOTALS FORMAT JSONCompact";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1 AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1234567890123 AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1 FORMAT JSON";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toFloat32(1.23) AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1 FORMAT JSONCompact";
 
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toDate('2010-01-01') AS k, count() GROUP BY k WITH TOTALS";
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toDateTime('2010-01-01 01:02:03') AS k, count() GROUP BY k WITH TOTALS FORMAT JSON";
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1.1 AS k, count() GROUP BY k WITH TOTALS FORMAT JSONCompact";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toDate('2010-01-01') AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toDateTime('2010-01-01 01:02:03', 'UTC') AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1 FORMAT JSON";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1.1 AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1 FORMAT JSONCompact";
diff --git a/tests/queries/0_stateless/00322_disable_checksumming.sh b/tests/queries/0_stateless/00322_disable_checksumming.sh
index c044a5c6650..e04ec076f80 100755
--- a/tests/queries/0_stateless/00322_disable_checksumming.sh
+++ b/tests/queries/0_stateless/00322_disable_checksumming.sh
@@ -4,10 +4,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# use big-endian version of binary data for s390x
-if [[ $(uname -a | grep s390x) ]]; then
-echo -ne '\xdb\x8a\xe9\x59\xf2\x32\x74\x50\x39\xc4\x22\xfb\xa7\x4a\xc6\x37''\x82\x13\x00\x00\x00\x09\x00\x00\x00''\x90SELECT 1\n' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&decompress=1" --data-binary @-
-else
 echo -ne '\x50\x74\x32\xf2\x59\xe9\x8a\xdb\x37\xc6\x4a\xa7\xfb\x22\xc4\x39''\x82\x13\x00\x00\x00\x09\x00\x00\x00''\x90SELECT 1\n' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&decompress=1" --data-binary @-
-fi
 echo -ne 'xxxxxxxxxxxxxxxx''\x82\x13\x00\x00\x00\x09\x00\x00\x00''\x90SELECT 1\n' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&decompress=1&http_native_compression_disable_checksumming_on_decompress=1" --data-binary @-
diff --git a/tests/queries/0_stateless/00341_squashing_insert_select2.sql b/tests/queries/0_stateless/00341_squashing_insert_select2.sql
index 3eb5a2682e0..e973a146d5b 100644
--- a/tests/queries/0_stateless/00341_squashing_insert_select2.sql
+++ b/tests/queries/0_stateless/00341_squashing_insert_select2.sql
@@ -3,6 +3,7 @@ CREATE TABLE numbers_squashed (number UInt8) ENGINE = StripeLog;
 
 SET min_insert_block_size_rows = 100;
 SET min_insert_block_size_bytes = 0;
+SET max_insert_threads = 1;
 SET max_threads = 1;
 
 INSERT INTO numbers_squashed
diff --git a/tests/queries/0_stateless/00378_json_quote_64bit_integers.reference b/tests/queries/0_stateless/00378_json_quote_64bit_integers.reference
index 5174c13a9e0..b8d51e5d078 100644
--- a/tests/queries/0_stateless/00378_json_quote_64bit_integers.reference
+++ b/tests/queries/0_stateless/00378_json_quote_64bit_integers.reference
@@ -48,10 +48,10 @@
 	{
 		"i0": "0",
 		"u0": "0",
-		"ip": "9223372036854775807",
-		"in": "-9223372036854775808",
-		"up": "18446744073709551615",
-		"arr": ["0"],
+		"ip": "0",
+		"in": "0",
+		"up": "0",
+		"arr": [],
 		"tuple": ["0","0"]
 	},
 
@@ -119,7 +119,7 @@
 		["0", "0", "9223372036854775807", "-9223372036854775808", "18446744073709551615", ["0"], ["0","0"]]
 	],
 
-	"totals": ["0", "0", "9223372036854775807", "-9223372036854775808", "18446744073709551615", ["0"], ["0","0"]],
+	"totals": ["0", "0", "0", "0", "0", [], ["0","0"]],
 
 	"extremes":
 	{
@@ -180,10 +180,10 @@
 	{
 		"i0": 0,
 		"u0": 0,
-		"ip": 9223372036854775807,
-		"in": -9223372036854775808,
-		"up": 18446744073709551615,
-		"arr": [0],
+		"ip": 0,
+		"in": 0,
+		"up": 0,
+		"arr": [],
 		"tuple": [0,0]
 	},
 
@@ -251,7 +251,7 @@
 		[0, 0, 9223372036854775807, -9223372036854775808, 18446744073709551615, [0], [0,0]]
 	],
 
-	"totals": [0, 0, 9223372036854775807, -9223372036854775808, 18446744073709551615, [0], [0,0]],
+	"totals": [0, 0, 0, 0, 0, [], [0,0]],
 
 	"extremes":
 	{
diff --git a/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql b/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
index 3a70b64bc86..e7b59bc3f7f 100644
--- a/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
+++ b/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
@@ -2,6 +2,7 @@
 
 SET output_format_write_statistics = 0;
 SET extremes = 1;
+SET allow_experimental_analyzer = 1;
 
 SET output_format_json_quote_64bit_integers = 1;
 SELECT toInt64(0) as i0, toUInt64(0) as u0, toInt64(9223372036854775807) as ip, toInt64(-9223372036854775808) as in, toUInt64(18446744073709551615) as up, [toInt64(0)] as arr, (toUInt64(0), toUInt64(0)) as tuple GROUP BY i0, u0, ip, in, up, arr, tuple WITH TOTALS FORMAT JSON;
diff --git a/tests/queries/0_stateless/00386_has_column_in_table.sql b/tests/queries/0_stateless/00386_has_column_in_table.sql
index d543bb42ca7..7347293e05b 100644
--- a/tests/queries/0_stateless/00386_has_column_in_table.sql
+++ b/tests/queries/0_stateless/00386_has_column_in_table.sql
@@ -21,11 +21,11 @@ SELECT hasColumnInTable('localhost', currentDatabase(), 'has_column_in_table', '
 SELECT hasColumnInTable('system', 'one', '');
 
 /* bad queries */
-SELECT hasColumnInTable('', '', '');  -- { serverError 60; }
-SELECT hasColumnInTable('', 't', 'c');  -- { serverError 81; }
-SELECT hasColumnInTable(currentDatabase(), '', 'c'); -- { serverError 60; }
-SELECT hasColumnInTable('d', 't', 's');  -- { serverError 81; }
-SELECT hasColumnInTable(currentDatabase(), 't', 's');  -- { serverError 60; }
+SELECT hasColumnInTable('', '', '');  -- { serverError 60 }
+SELECT hasColumnInTable('', 't', 'c');  -- { serverError 81 }
+SELECT hasColumnInTable(currentDatabase(), '', 'c'); -- { serverError 60 }
+SELECT hasColumnInTable('d', 't', 's');  -- { serverError 81 }
+SELECT hasColumnInTable(currentDatabase(), 't', 's');  -- { serverError 60 }
 
 
 DROP TABLE has_column_in_table;
diff --git a/tests/queries/0_stateless/00386_long_in_pk.python b/tests/queries/0_stateless/00386_long_in_pk.python
index e33bb254c60..c7b04102dc5 100644
--- a/tests/queries/0_stateless/00386_long_in_pk.python
+++ b/tests/queries/0_stateless/00386_long_in_pk.python
@@ -1,57 +1,72 @@
 #!/usr/bin/env python3
 
+
 def gen_queries():
-    create_template = 'create table tab_00386 (a Int8, b String, c Tuple(Int8), d Tuple(Tuple(Int8)), e Tuple(Int8, String), f Tuple(Tuple(Int8, String))) engine = MergeTree order by ({}) partition by {}'
-    drop_query = 'drop table if exists tab_00386'
-    values = ('1', "'a'", 'tuple(1)', 'tuple(tuple(1))', "(1, 'a')", "tuple((1, 'a'))")
+    create_template = "create table tab_00386 (a Int8, b String, c Tuple(Int8), d Tuple(Tuple(Int8)), e Tuple(Int8, String), f Tuple(Tuple(Int8, String))) engine = MergeTree order by ({}) partition by {}"
+    drop_query = "drop table if exists tab_00386"
+    values = ("1", "'a'", "tuple(1)", "tuple(tuple(1))", "(1, 'a')", "tuple((1, 'a'))")
     insert_query = "insert into tab_00386 values (1, 'a', tuple(1), tuple(tuple(1)), (1, 'a'), tuple((1, 'a')))"
-    columns = tuple('a b c d'.split())
-    order_by_columns = tuple('a b c'.split())
-    partition_by_columns = tuple(' tuple() a'.split())
+    columns = tuple("a b c d".split())
+    order_by_columns = tuple("a b c".split())
+    partition_by_columns = tuple(" tuple() a".split())
 
     for partition in partition_by_columns:
         for key_mask in range(1, 1 << len(order_by_columns)):
-            key = ','.join(order_by_columns[i] for i in range(len(order_by_columns)) if (1 << i) & key_mask != 0)
+            key = ",".join(
+                order_by_columns[i]
+                for i in range(len(order_by_columns))
+                if (1 << i) & key_mask != 0
+            )
             create_query = create_template.format(key, partition)
             for q in (drop_query, create_query, insert_query):
                 yield q
 
             for column, value in zip(columns, values):
-                yield 'select {} in {} from tab_00386'.format(column, value)
-                yield 'select {} in tuple({}) from tab_00386'.format(column, value)
-                yield 'select {} in (select {} from tab_00386) from tab_00386'.format(column, column)
+                yield "select {} in {} from tab_00386".format(column, value)
+                yield "select {} in tuple({}) from tab_00386".format(column, value)
+                yield "select {} in (select {} from tab_00386) from tab_00386".format(
+                    column, column
+                )
 
             for i in range(len(columns)):
                 for j in range(i, len(columns)):
-                    yield 'select ({}, {}) in tuple({}, {}) from tab_00386'.format(columns[i], columns[j], values[i], values[j])
-                    yield 'select ({}, {}) in (select {}, {} from tab_00386) from tab_00386'.format(columns[i], columns[j], columns[i], columns[j])
-                    yield 'select ({}, {}) in (select ({}, {}) from tab_00386) from tab_00386'.format(columns[i], columns[j], columns[i], columns[j])
+                    yield "select ({}, {}) in tuple({}, {}) from tab_00386".format(
+                        columns[i], columns[j], values[i], values[j]
+                    )
+                    yield "select ({}, {}) in (select {}, {} from tab_00386) from tab_00386".format(
+                        columns[i], columns[j], columns[i], columns[j]
+                    )
+                    yield "select ({}, {}) in (select ({}, {}) from tab_00386) from tab_00386".format(
+                        columns[i], columns[j], columns[i], columns[j]
+                    )
 
             yield "select e in (1, 'a') from tab_00386"
             yield "select f in tuple((1, 'a')) from tab_00386"
             yield "select f in tuple(tuple((1, 'a'))) from tab_00386"
 
-            yield 'select e in (select a, b from tab_00386) from tab_00386'
-            yield 'select e in (select (a, b) from tab_00386) from tab_00386'
-            yield 'select f in (select tuple((a, b)) from tab_00386) from tab_00386'
-            yield 'select tuple(f) in (select tuple(tuple((a, b))) from tab_00386) from tab_00386'
+            yield "select e in (select a, b from tab_00386) from tab_00386"
+            yield "select e in (select (a, b) from tab_00386) from tab_00386"
+            yield "select f in (select tuple((a, b)) from tab_00386) from tab_00386"
+            yield "select tuple(f) in (select tuple(tuple((a, b))) from tab_00386) from tab_00386"
+
 
 import requests
 import os
 
+
 def main():
-    url = os.environ['CLICKHOUSE_URL']
+    url = os.environ["CLICKHOUSE_URL"]
 
     for q in gen_queries():
         resp = requests.post(url, data=q)
-        if resp.status_code != 200 or resp.text.strip() not in ('1', ''):
-            print('Query:', q)
-            print('Code:', resp.status_code)
+        if resp.status_code != 200 or resp.text.strip() not in ("1", ""):
+            print("Query:", q)
+            print("Code:", resp.status_code)
             print(resp.text)
             break
 
-    requests.post(url, data='drop table tab_00386')
+    requests.post(url, data="drop table tab_00386")
+
 
 if __name__ == "__main__":
     main()
-
diff --git a/tests/queries/0_stateless/00390_array_sort.sql b/tests/queries/0_stateless/00390_array_sort.sql
index 8c2307eb3bd..bead64ff551 100644
--- a/tests/queries/0_stateless/00390_array_sort.sql
+++ b/tests/queries/0_stateless/00390_array_sort.sql
@@ -51,4 +51,4 @@ SELECT arrayPartialSort(2, [1,2,3], [1]); -- { serverError ILLEGAL_TYPE_OF_ARGUM
 SELECT arrayPartialSort(2, [1,2,3], 3); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT arrayPartialSort(arraySort([1,2,3]), [1,2,3]); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT arrayMap(x -> range(x), [4, 1, 2, 3]) AS arr, 100 AS lim, arrayResize(arrayPartialSort(arrayPartialSort(lim, arr), arr), lim), arrayResize(arrayPartialReverseSort(lim, arr), lim), arrayResize(arrayPartialSort(x -> (-length(x)), lim, arr), lim); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT arrayPartialReverseSort(arraySort((x, y) -> y, [NULL, NULL], [NULL, NULL]), arr), arrayMap(x -> toString(x), [257, -9223372036854775807, 2, -2147483648, 2147483648, NULL, 65536, -2147483648, 2, 65535]) AS arr, NULL, 100 AS lim, 65536, arrayResize(arrayPartialSort(x -> reverse(x), lim, arr), lim) GROUP BY [NULL, 1023, -2, NULL, 255, '0', NULL, 9223372036854775806] WITH ROLLUP; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT arrayPartialReverseSort(arraySort((x, y) -> y, [NULL, NULL], [NULL, NULL]), arr), arrayMap(x -> toString(x), [257, -9223372036854775807, 2, -2147483648, 2147483648, NULL, 65536, -2147483648, 2, 65535]) AS arr, NULL, 100 AS lim, 65536, arrayResize(arrayPartialSort(x -> reverse(x), lim, arr), lim) GROUP BY [NULL, 1023, -2, NULL, 255, '0', NULL, 9223372036854775806] WITH ROLLUP; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT, NO_COMMON_TYPE }
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison.python b/tests/queries/0_stateless/00411_long_accurate_number_comparison.python
index 3c8a8f2ea25..183a2637d36 100644
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison.python
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison.python
@@ -2,8 +2,20 @@
 
 import os, itertools, urllib.request, urllib.parse, urllib.error, urllib.request, urllib.error, urllib.parse, sys
 
+
 def get_ch_answer(query):
-    return urllib.request.urlopen(os.environ.get('CLICKHOUSE_URL', 'http://localhost:' + os.environ.get('CLICKHOUSE_PORT_HTTP', '8123') ), data=query.encode()).read().decode()
+    return (
+        urllib.request.urlopen(
+            os.environ.get(
+                "CLICKHOUSE_URL",
+                "http://localhost:" + os.environ.get("CLICKHOUSE_PORT_HTTP", "8123"),
+            ),
+            data=query.encode(),
+        )
+        .read()
+        .decode()
+    )
+
 
 def check_answers(query, answer):
     ch_answer = get_ch_answer(query)
@@ -13,36 +25,34 @@ def check_answers(query, answer):
         print("Fetched answer :", ch_answer)
         exit(-1)
 
+
 def get_values():
     values = [0, 1, -1]
     for bits in [8, 16, 32, 64]:
         values += [2**bits, 2**bits - 1]
-        values += [2**(bits-1) - 1, 2**(bits-1), 2**(bits-1) + 1]
-        values += [-2**(bits-1) - 1, -2**(bits-1), -2**(bits-1) + 1]
+        values += [2 ** (bits - 1) - 1, 2 ** (bits - 1), 2 ** (bits - 1) + 1]
+        values += [-(2 ** (bits - 1)) - 1, -(2 ** (bits - 1)), -(2 ** (bits - 1)) + 1]
     return values
 
+
 def is_valid_integer(x):
-    return -2**63 <= x and x <= 2**64-1
+    return -(2**63) <= x and x <= 2**64 - 1
 
 
-TEST_WITH_CASTING=True
-GENERATE_TEST_FILES=False
+TEST_WITH_CASTING = True
+GENERATE_TEST_FILES = False
 
 TYPES = {
-    "UInt8"    : { "bits" : 8, "sign" : False, "float" : False },
-    "Int8"     : { "bits" : 8, "sign" : True, "float" : False },
-
-    "UInt16": { "bits" : 16, "sign" : False, "float" : False },
-    "Int16" : { "bits" : 16, "sign" : True, "float" : False },
-
-    "UInt32": { "bits" : 32, "sign" : False, "float" : False },
-    "Int32" : { "bits" : 32, "sign" : True, "float" : False },
-
-    "UInt64": { "bits" : 64, "sign" : False, "float" : False },
-    "Int64" : { "bits" : 64, "sign" : True, "float" : False }
-
-    #"Float32" : { "bits" : 32, "sign" : True, "float" : True },
-    #"Float64" : { "bits" : 64, "sign" : True, "float" : True }
+    "UInt8": {"bits": 8, "sign": False, "float": False},
+    "Int8": {"bits": 8, "sign": True, "float": False},
+    "UInt16": {"bits": 16, "sign": False, "float": False},
+    "Int16": {"bits": 16, "sign": True, "float": False},
+    "UInt32": {"bits": 32, "sign": False, "float": False},
+    "Int32": {"bits": 32, "sign": True, "float": False},
+    "UInt64": {"bits": 64, "sign": False, "float": False},
+    "Int64": {"bits": 64, "sign": True, "float": False}
+    # "Float32" : { "bits" : 32, "sign" : True, "float" : True },
+    # "Float64" : { "bits" : 64, "sign" : True, "float" : True }
 }
 
 
@@ -55,14 +65,18 @@ def inside_range(value, type_name):
         return True
 
     if signed:
-        return -2**(bits-1) <= value and value <= 2**(bits-1) - 1
+        return -(2 ** (bits - 1)) <= value and value <= 2 ** (bits - 1) - 1
     else:
         return 0 <= value and value <= 2**bits - 1
 
 
 def test_operators(v1, v2, v1_passed, v2_passed):
-    query_str = "{v1} = {v2}, {v1} != {v2}, {v1} < {v2}, {v1} <= {v2}, {v1} > {v2}, {v1} >= {v2},\t".format(v1=v1_passed, v2=v2_passed)
-    query_str += "{v1} = {v2}, {v1} != {v2}, {v1} < {v2}, {v1} <= {v2}, {v1} > {v2}, {v1} >= {v2} ".format(v1=v2_passed, v2=v1_passed)
+    query_str = "{v1} = {v2}, {v1} != {v2}, {v1} < {v2}, {v1} <= {v2}, {v1} > {v2}, {v1} >= {v2},\t".format(
+        v1=v1_passed, v2=v2_passed
+    )
+    query_str += "{v1} = {v2}, {v1} != {v2}, {v1} < {v2}, {v1} <= {v2}, {v1} > {v2}, {v1} >= {v2} ".format(
+        v1=v2_passed, v2=v1_passed
+    )
 
     answers = [v1 == v2, v1 != v2, v1 < v2, v1 <= v2, v1 > v2, v1 >= v2]
     answers += [v2 == v1, v2 != v1, v2 < v1, v2 <= v1, v2 > v1, v2 >= v1]
@@ -74,6 +88,7 @@ def test_operators(v1, v2, v1_passed, v2_passed):
 
 VALUES = [x for x in get_values() if is_valid_integer(x)]
 
+
 def test_pair(v1, v2):
     query = "SELECT {}, {}, ".format(v1, v2)
     answers = "{}\t{}\t".format(v1, v2)
@@ -87,19 +102,58 @@ def test_pair(v1, v2):
             if inside_range(v1, t1):
                 for t2 in TYPES.keys():
                     if inside_range(v2, t2):
-                        q, a = test_operators(v1, v2, 'to{}({})'.format(t1, v1), 'to{}({})'.format(t2, v2))
-                        query += ', ' + q
+                        q, a = test_operators(
+                            v1, v2, "to{}({})".format(t1, v1), "to{}({})".format(t2, v2)
+                        )
+                        query += ", " + q
                         answers += "\t" + a
 
     check_answers(query, answers)
     return query, answers
 
 
-VALUES_INT = [0, -1, 1, 2**64-1, 2**63, -2**63, 2**63-1, 2**51, 2**52, 2**53-1, 2**53, 2**53+1, 2**53+2, -2**53+1, -2**53, -2**53-1, -2**53-2, 2*52, -2**52]
-VALUES_FLOAT = [float(x) for x in VALUES_INT + [-0.5, 0.5, -1.5, 1.5, 2**53, 2**51 - 0.5, 2**51 + 0.5, 2**60, -2**60, -2**63 - 10000, 2**63 + 10000]]
+VALUES_INT = [
+    0,
+    -1,
+    1,
+    2**64 - 1,
+    2**63,
+    -(2**63),
+    2**63 - 1,
+    2**51,
+    2**52,
+    2**53 - 1,
+    2**53,
+    2**53 + 1,
+    2**53 + 2,
+    -(2**53) + 1,
+    -(2**53),
+    -(2**53) - 1,
+    -(2**53) - 2,
+    2 * 52,
+    -(2**52),
+]
+VALUES_FLOAT = [
+    float(x)
+    for x in VALUES_INT
+    + [
+        -0.5,
+        0.5,
+        -1.5,
+        1.5,
+        2**53,
+        2**51 - 0.5,
+        2**51 + 0.5,
+        2**60,
+        -(2**60),
+        -(2**63) - 10000,
+        2**63 + 10000,
+    ]
+]
+
 
 def test_float_pair(i, f):
-    f_str = ("%.9f" % f)
+    f_str = "%.9f" % f
     query = "SELECT '{}', '{}', ".format(i, f_str)
     answers = "{}\t{}\t".format(i, f_str)
 
@@ -110,8 +164,8 @@ def test_float_pair(i, f):
     if TEST_WITH_CASTING:
         for t1 in TYPES.keys():
             if inside_range(i, t1):
-                q, a = test_operators(i, f, 'to{}({})'.format(t1, i), f_str)
-                query += ', ' + q
+                q, a = test_operators(i, f, "to{}({})".format(t1, i), f_str)
+                query += ", " + q
                 answers += "\t" + a
 
     check_answers(query, answers)
@@ -120,23 +174,27 @@ def test_float_pair(i, f):
 
 def main():
     if GENERATE_TEST_FILES:
-        base_name = '00411_accurate_number_comparison'
-        sql_file = open(base_name + '.sql', 'wt')
-        ref_file = open(base_name + '.reference', 'wt')
+        base_name = "00411_accurate_number_comparison"
+        sql_file = open(base_name + ".sql", "wt")
+        ref_file = open(base_name + ".reference", "wt")
 
     num_int_tests = len(list(itertools.combinations(VALUES, 2)))
 
     num_parts = 4
     for part in range(0, num_parts):
-        if 'int' + str(part + 1) in sys.argv[1:]:
-            for (v1, v2) in itertools.islice(itertools.combinations(VALUES, 2), part * num_int_tests // num_parts, (part + 1) * num_int_tests // num_parts):
+        if "int" + str(part + 1) in sys.argv[1:]:
+            for v1, v2 in itertools.islice(
+                itertools.combinations(VALUES, 2),
+                part * num_int_tests // num_parts,
+                (part + 1) * num_int_tests // num_parts,
+            ):
                 q, a = test_pair(v1, v2)
                 if GENERATE_TEST_FILES:
                     sql_file.write(q + ";\n")
                     ref_file.write(a + "\n")
 
-    if 'float' in sys.argv[1:]:
-        for (i, f) in itertools.product(VALUES_INT, VALUES_FLOAT):
+    if "float" in sys.argv[1:]:
+        for i, f in itertools.product(VALUES_INT, VALUES_FLOAT):
             q, a = test_float_pair(i, f)
             if GENERATE_TEST_FILES:
                 sql_file.write(q + ";\n")
diff --git a/tests/queries/0_stateless/00417_kill_query.sh b/tests/queries/0_stateless/00417_kill_query.sh
index c3b57b8ef3f..dc690caca39 100755
--- a/tests/queries/0_stateless/00417_kill_query.sh
+++ b/tests/queries/0_stateless/00417_kill_query.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-parallel, no-fasttest
+# Tags: no-fasttest
 
 set -e
 
@@ -11,11 +11,11 @@ QUERY_FIELND_NUM=4
 
 $CLICKHOUSE_CLIENT --max_block_size=1 -q "SELECT sleep(1) FROM system.numbers LIMIT 4" &>/dev/null &
 sleep 1
-$CLICKHOUSE_CLIENT -q "KILL QUERY WHERE query LIKE 'SELECT sleep(%' AND (elapsed >= 0.) SYNC" | cut -f $QUERY_FIELND_NUM
+$CLICKHOUSE_CLIENT -q "KILL QUERY WHERE current_database = '${CLICKHOUSE_DATABASE}' and query LIKE 'SELECT sleep(%' AND (elapsed >= 0.) SYNC" | cut -f $QUERY_FIELND_NUM
 
 $CLICKHOUSE_CLIENT --max_block_size=1 -q "SELECT sleep(1) FROM system.numbers LIMIT 5" &>/dev/null &
 sleep 1
-$CLICKHOUSE_CLIENT -q "KILL QUERY WHERE query = 'SELECT sleep(1) FROM system.numbers LIMIT 5' ASYNC" | cut -f $QUERY_FIELND_NUM
+$CLICKHOUSE_CLIENT -q "KILL QUERY WHERE current_database = '${CLICKHOUSE_DATABASE}' and query = 'SELECT sleep(1) FROM system.numbers LIMIT 5' ASYNC" | cut -f $QUERY_FIELND_NUM
 
 $CLICKHOUSE_CLIENT -q "KILL QUERY WHERE 0 ASYNC"
 $CLICKHOUSE_CLIENT -q "KILL QUERY WHERE 0 FORMAT TabSeparated"
diff --git a/tests/queries/0_stateless/00423_storage_log_single_thread.sql b/tests/queries/0_stateless/00423_storage_log_single_thread.sql
index 5d359c7f94d..8eff9323564 100644
--- a/tests/queries/0_stateless/00423_storage_log_single_thread.sql
+++ b/tests/queries/0_stateless/00423_storage_log_single_thread.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 DROP TABLE IF EXISTS log;
 CREATE TABLE log (s String) ENGINE = Log;
 
diff --git a/tests/queries/0_stateless/00445_join_nullable_keys.reference b/tests/queries/0_stateless/00445_join_nullable_keys.reference
index afc8003910c..cc1c06d593b 100644
--- a/tests/queries/0_stateless/00445_join_nullable_keys.reference
+++ b/tests/queries/0_stateless/00445_join_nullable_keys.reference
@@ -22,13 +22,13 @@
 13		13
 14		14
 \N		8
-0	0
-0	2
-0	4
-0	6
-0	8
 1	1
 3	3
 5	5
 7	7
 9	9
+\N	0
+\N	2
+\N	4
+\N	6
+\N	8
diff --git a/tests/queries/0_stateless/00445_join_nullable_keys.sql b/tests/queries/0_stateless/00445_join_nullable_keys.sql
index a0453356e98..774594f90f3 100644
--- a/tests/queries/0_stateless/00445_join_nullable_keys.sql
+++ b/tests/queries/0_stateless/00445_join_nullable_keys.sql
@@ -1,3 +1,4 @@
+SET allow_experimental_analyzer = 1;
 SET join_use_nulls = 0;
 SET any_join_distinct_right_table_keys = 1;
 
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
index 2f79365f756..eee84aa7754 100755
--- a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
+++ b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: zookeeper, no-replicated-database, no-parallel
+# Tags: zookeeper, no-replicated-database
 # Tag no-replicated-database: Old syntax is not allowed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00453_cast_enum.sql b/tests/queries/0_stateless/00453_cast_enum.sql
index 384db50c7c4..023e7233acf 100644
--- a/tests/queries/0_stateless/00453_cast_enum.sql
+++ b/tests/queries/0_stateless/00453_cast_enum.sql
@@ -12,6 +12,6 @@ INSERT INTO cast_enums SELECT 2 AS type, toDate('2017-01-01') AS date, number AS
 
 SELECT type, date, id FROM cast_enums ORDER BY type, id;
 
-INSERT INTO cast_enums VALUES ('wrong_value', '2017-01-02', 7); -- { clientError 36 }
+INSERT INTO cast_enums VALUES ('wrong_value', '2017-01-02', 7); -- { clientError 691 }
 
 DROP TABLE IF EXISTS cast_enums;
diff --git a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
index 89da84a5bdd..d41d6409315 100755
--- a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
+++ b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 
 echo "Using non-existent session with the 'session_check' flag will throw exception:"
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=nonexistent&session_check=1" --data-binary "SELECT 1" | grep -c -F 'Session not found'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=nonexistent&session_check=1" --data-binary "SELECT 1" | grep -c -F 'SESSION_NOT_FOUND'
 
 echo "Using non-existent session without the 'session_check' flag will create a new session:"
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_1" --data-binary "SELECT 1"
@@ -30,7 +30,7 @@ ${CLICKHOUSE_CLIENT} --multiquery --query "DROP USER IF EXISTS test_00463; CREAT
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6&session_timeout=600" --data-binary "CREATE TEMPORARY TABLE t (s String)"
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "INSERT INTO t VALUES ('Hello')"
 
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6&session_check=1" --data-binary "SELECT 1" | grep -c -F 'Session not found'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6&session_check=1" --data-binary "SELECT 1" | grep -c -F 'SESSION_NOT_FOUND'
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6&session_timeout=600" --data-binary "CREATE TEMPORARY TABLE t (s String)"
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "INSERT INTO t VALUES ('World')"
 
@@ -53,7 +53,7 @@ do
         ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_7&session_timeout=1" --data-binary "SELECT 1"
         ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_7&session_check=1" --data-binary "SELECT 1"
         sleep 3
-        ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_7&session_check=1" --data-binary "SELECT 1" | grep -c -F 'Session not found'
+        ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_7&session_check=1" --data-binary "SELECT 1" | grep -c -F 'SESSION_NOT_FOUND'
     ) | tr -d '\n' | grep -F '111' && break || sleep 1
 done
 
@@ -82,6 +82,6 @@ do
     ${CLICKHOUSE_CLIENT} --query "SELECT count() > 0 FROM system.processes WHERE query_id = '${CLICKHOUSE_DATABASE}_9'" | grep -F '1' && break || sleep 1
 done
 
-${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_9" --data-binary "SELECT 1" | grep -c -F 'Session is locked'
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_9" --data-binary "SELECT 1" | grep -c -F 'SESSION_IS_LOCKED'
 ${CLICKHOUSE_CLIENT} --multiquery --query "KILL QUERY WHERE query_id = '${CLICKHOUSE_DATABASE}_9' SYNC FORMAT Null";
 wait
diff --git a/tests/queries/0_stateless/00498_bitwise_aggregate_functions.reference b/tests/queries/0_stateless/00498_bitwise_aggregate_functions.reference
index fb5cfb57d39..b5ca25ed0b0 100644
--- a/tests/queries/0_stateless/00498_bitwise_aggregate_functions.reference
+++ b/tests/queries/0_stateless/00498_bitwise_aggregate_functions.reference
@@ -2,3 +2,11 @@
 1	[1,5,9,13,17]	29	1	17
 2	[2,6,10,14,18]	30	2	18
 3	[3,7,11,15,19]	31	3	19
+0	[0,-4,-8,-12,-16]	-4	0	0
+1	[-1,-5,-9,-13,-17]	-1	-29	-17
+2	[-2,-6,-10,-14,-18]	-2	-30	-18
+3	[-3,-7,-11,-15,-19]	-3	-31	-19
+0	[-10,-6,-2,2,6]	-2	2	-10
+1	[-9,-5,-1,3,7]	-1	3	-9
+2	[-8,-4,0,4,8]	-4	0	8
+3	[-7,-3,1,5,9]	-3	1	9
diff --git a/tests/queries/0_stateless/00498_bitwise_aggregate_functions.sql b/tests/queries/0_stateless/00498_bitwise_aggregate_functions.sql
index 07cd0b3630f..2c4610e6c4a 100644
--- a/tests/queries/0_stateless/00498_bitwise_aggregate_functions.sql
+++ b/tests/queries/0_stateless/00498_bitwise_aggregate_functions.sql
@@ -1 +1,3 @@
 SELECT number % 4 AS k, groupArray(number), groupBitOr(number), groupBitAnd(number), groupBitXor(number) FROM (SELECT * FROM system.numbers LIMIT 20) GROUP BY k ORDER BY k;
+SELECT number % 4 AS k, groupArray(-number), groupBitOr(-number), groupBitAnd(-number), groupBitXor(-number) FROM (SELECT * FROM system.numbers LIMIT 20) GROUP BY k ORDER BY k;
+SELECT number % 4 AS k, groupArray(number-10), groupBitOr(number-10), groupBitAnd(number-10), groupBitXor(number-10) FROM (SELECT * FROM system.numbers LIMIT 20) GROUP BY k ORDER BY k;
diff --git a/tests/queries/0_stateless/00505_shard_secure.sh b/tests/queries/0_stateless/00505_shard_secure.sh
index 7f80b54e2f3..b332005b64a 100755
--- a/tests/queries/0_stateless/00505_shard_secure.sh
+++ b/tests/queries/0_stateless/00505_shard_secure.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: shard, no-parallel, no-fasttest
+# Tags: shard, no-fasttest
 
 # set -x
 
diff --git a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
index 0aa692d9667..3f322c8ce18 100644
--- a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
+++ b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
@@ -1,5 +1,4 @@
--- Tags: zookeeper, no-parallel
--- Tag no-parallel: leftovers
+-- Tags: zookeeper
 
 SET optimize_on_insert = 0;
 
@@ -44,7 +43,7 @@ CREATE TABLE replicated_collapsing(d Date, x UInt32, sign Int8)
 INSERT INTO replicated_collapsing VALUES ('2017-10-23', 1, 1);
 INSERT INTO replicated_collapsing VALUES ('2017-10-23', 1, -1), ('2017-10-23', 2, 1);
 
-SYSTEM SYNC REPLICA replicated_collapsing;
+SYSTEM SYNC REPLICA replicated_collapsing PULL;
 OPTIMIZE TABLE replicated_collapsing PARTITION 201710 FINAL;
 
 SELECT * FROM replicated_collapsing;
diff --git a/tests/queries/0_stateless/00515_enhanced_time_zones.sql b/tests/queries/0_stateless/00515_enhanced_time_zones.sql
index e555b6b87bc..f719ff70d7a 100644
--- a/tests/queries/0_stateless/00515_enhanced_time_zones.sql
+++ b/tests/queries/0_stateless/00515_enhanced_time_zones.sql
@@ -20,3 +20,17 @@ SELECT toTimeZone(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'), 'Asia/Kolk
 SELECT toString(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'));
 SELECT toString(toTimeZone(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'), 'Asia/Kolkata'));
 SELECT toString(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'), 'Asia/Kolkata');
+
+SELECT toTimeZone(dt, tz) FROM (
+    SELECT toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul') AS dt, arrayJoin(['Asia/Kolkata', 'UTC']) AS tz
+); -- { serverError ILLEGAL_COLUMN }
+SELECT materialize('Asia/Kolkata') t, toTimeZone(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'), t); -- { serverError ILLEGAL_COLUMN }
+
+CREATE TEMPORARY TABLE tmp AS SELECT arrayJoin(['Europe/Istanbul', 'Asia/Istanbul']);
+SELECT toTimeZone(now(), (*,).1) FROM tmp; -- { serverError ILLEGAL_COLUMN }
+SELECT now((*,).1) FROM tmp; -- { serverError ILLEGAL_COLUMN }
+SELECT now64(1, (*,).1) FROM tmp; -- { serverError ILLEGAL_COLUMN }
+SELECT toStartOfInterval(now(), INTERVAL 3 HOUR, (*,).1) FROM tmp; -- { serverError ILLEGAL_COLUMN }
+SELECT snowflakeToDateTime(toInt64(123), (*,).1) FROM tmp; -- { serverError ILLEGAL_COLUMN }
+SELECT toUnixTimestamp(now(), (*,).1) FROM tmp; -- { serverError ILLEGAL_COLUMN }
+SELECT toDateTimeOrDefault('2023-04-12 16:43:32', (*,).1, now()) FROM tmp; -- { serverError ILLEGAL_COLUMN }
diff --git a/tests/queries/0_stateless/00534_filimonov.data b/tests/queries/0_stateless/00534_filimonov.data
index 911a8e4d1f3..eb4500877e5 100644
--- a/tests/queries/0_stateless/00534_filimonov.data
+++ b/tests/queries/0_stateless/00534_filimonov.data
@@ -276,10 +276,14 @@ SELECT runningDifference(CAST( 0  AS Nullable(Int8)));
 SELECT runningDifference(CAST( 0  AS Nullable(Int16)));
 SELECT runningDifference(CAST( 0  AS Nullable(Int32)));
 SELECT runningDifference(CAST( 0  AS Nullable(Int64)));
+SELECT runningDifference(CAST( 0  AS Nullable(Int128)));
+SELECT runningDifference(CAST( 0  AS Nullable(Int256)));
 SELECT runningDifference(CAST( 0  AS Nullable(UInt8)));
 SELECT runningDifference(CAST( 0  AS Nullable(UInt16)));
 SELECT runningDifference(CAST( 0  AS Nullable(UInt32)));
 SELECT runningDifference(CAST( 0  AS Nullable(UInt64)));
+SELECT runningDifference(CAST( 0  AS Nullable(UInt128)));
+SELECT runningDifference(CAST( 0  AS Nullable(UInt256)));
 SELECT runningDifference(CAST( 0  AS Nullable(Float32)));
 SELECT runningDifference(CAST( 0  AS Nullable(Float64)));
 SELECT runningDifference(CAST( 0  AS Nullable(Date)));
@@ -288,10 +292,14 @@ SELECT runningDifference(CAST(NULL AS Nullable(Int8)));
 SELECT runningDifference(CAST(NULL AS Nullable(Int16)));
 SELECT runningDifference(CAST(NULL AS Nullable(Int32)));
 SELECT runningDifference(CAST(NULL AS Nullable(Int64)));
+SELECT runningDifference(CAST(NULL AS Nullable(Int128)));
+SELECT runningDifference(CAST(NULL AS Nullable(Int256)));
 SELECT runningDifference(CAST(NULL AS Nullable(UInt8)));
 SELECT runningDifference(CAST(NULL AS Nullable(UInt16)));
 SELECT runningDifference(CAST(NULL AS Nullable(UInt32)));
 SELECT runningDifference(CAST(NULL AS Nullable(UInt64)));
+SELECT runningDifference(CAST(NULL AS Nullable(UInt128)));
+SELECT runningDifference(CAST(NULL AS Nullable(UInt256));
 SELECT runningDifference(CAST(NULL AS Nullable(Float32)));
 SELECT runningDifference(CAST(NULL AS Nullable(Float64)));
 SELECT runningDifference(CAST(NULL AS Nullable(Date)));
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments10.sh b/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
index 3c5d1b1a0f7..8525b63a989 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-tsan, no-parallel, no-debug
+# Tags: no-tsan, no-debug
 # Tag no-tsan: Too long for TSan
 
 # shellcheck disable=SC2016
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments5.sh b/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
index 7b180870443..a8b0ce77677 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-tsan, no-debug
+# Tags: no-tsan, no-debug, no-fasttest
 # Tag no-tsan: Too long for TSan
 
 # shellcheck disable=SC2016
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments7.sh b/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
index 8358d2b80d4..383e5a1b434 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-tsan, no-debug
+# Tags: no-tsan, no-debug, no-fasttest
 # Tag no-tsan: Too long for TSan
 
 # shellcheck disable=SC2016
diff --git a/tests/queries/0_stateless/00552_or_nullable.sql b/tests/queries/0_stateless/00552_or_nullable.sql
index 5639a7f65cc..ebec2db842d 100644
--- a/tests/queries/0_stateless/00552_or_nullable.sql
+++ b/tests/queries/0_stateless/00552_or_nullable.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 SELECT
     0 OR NULL,
     1 OR NULL,
diff --git a/tests/queries/0_stateless/00561_storage_join.sql b/tests/queries/0_stateless/00561_storage_join.sql
index ebdbe4dbc0a..6411628bbde 100644
--- a/tests/queries/0_stateless/00561_storage_join.sql
+++ b/tests/queries/0_stateless/00561_storage_join.sql
@@ -1,5 +1,3 @@
-SET allow_experimental_analyzer = 1;
-
 drop table IF EXISTS joinbug;
 
 set allow_deprecated_syntax_for_merge_tree=1;
@@ -38,7 +36,7 @@ SEMI LEFT JOIN joinbug_join using id2;
 SELECT * FROM ( SELECT toUInt32(11) AS id2 ) AS js1 SEMI LEFT JOIN joinbug_join USING (id2);
 
 -- can't convert right side in case on storage join
-SELECT * FROM ( SELECT toInt64(11) AS id2 ) AS js1 SEMI LEFT JOIN joinbug_join USING (id2); -- { serverError 386 }
+SELECT * FROM ( SELECT toInt64(11) AS id2 ) AS js1 SEMI LEFT JOIN joinbug_join USING (id2); -- { serverError 53, 386 }
 
 DROP TABLE joinbug;
 DROP TABLE joinbug_join;
diff --git a/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql b/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
index 6e2db3e6996..22f6da71247 100644
--- a/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
+++ b/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel, no-random-merge-tree-settings
+-- Tags: no-random-merge-tree-settings
 
 set allow_deprecated_syntax_for_merge_tree=1;
 set optimize_on_insert = 0;
diff --git a/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh b/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
index 706c0819125..c2addd4c9c8 100755
--- a/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
+++ b/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00597_push_down_predicate_long.reference b/tests/queries/0_stateless/00597_push_down_predicate_long.reference
index b8fce2a59d7..4ac88edd40e 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate_long.reference
+++ b/tests/queries/0_stateless/00597_push_down_predicate_long.reference
@@ -390,6 +390,8 @@ ANY LEFT JOIN
 ) USING (id)
 WHERE id = 1
 2000-01-01	1	test string 1	1	2000-01-01	test string 1	1
+------- allow_experimental_analyzer=1 -------
+1	2000-01-01	test string 1	1	2000-01-01	test string 1	1
 SELECT
     id,
     date,
@@ -452,6 +454,8 @@ FROM
 )
 WHERE id = 1
 2000-01-01	1	test string 1	1
+------- allow_experimental_analyzer=1 -------
+1	2000-01-01	test string 1	1	2000-01-01	test string 1	1
 SELECT
     date,
     id,
@@ -480,6 +484,8 @@ ANY LEFT JOIN
 ) AS b USING (id)
 WHERE b.id = 1
 2000-01-01	1	test string 1	1	2000-01-01	test string 1	1
+------- allow_experimental_analyzer=1 -------
+1	2000-01-01	test string 1	1	2000-01-01	test string 1	1
 SELECT
     id,
     date,
@@ -504,6 +510,8 @@ ANY LEFT JOIN
 ) AS b USING (date, id)
 WHERE b.date = toDate(\'2000-01-01\')
 1	2000-01-01	test string 1	1
+------- allow_experimental_analyzer=1 -------
+2000-01-01	1	test string 1	1
 SELECT
     date,
     id,
@@ -585,6 +593,8 @@ SEMI LEFT JOIN
 ) AS r USING (id)
 WHERE r.id = 1
 2000-01-01	1	test string 1	1	2000-01-01	test string 1	1
+------- allow_experimental_analyzer=1 -------
+1	2000-01-01	test string 1	1	2000-01-01	test string 1	1
 SELECT value + t1.value AS expr
 FROM
 (
diff --git a/tests/queries/0_stateless/00597_push_down_predicate_long.sql b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
index a77f3730ac2..caf6edd7372 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate_long.sql
+++ b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
@@ -110,7 +110,9 @@ SELECT * FROM (SELECT * FROM test_00597 UNION ALL SELECT * FROM test_00597) WHER
 
 -- Optimize predicate expression with join query
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id WHERE id = 1;
-SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id WHERE id = 1;
+SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id WHERE id = 1 SETTINGS allow_experimental_analyzer=0;
+SELECT '------- allow_experimental_analyzer=1 -------';
+SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id WHERE id = 1 SETTINGS allow_experimental_analyzer=1;
 
 EXPLAIN SYNTAX SELECT * FROM (SELECT toInt8(1) AS id) ANY LEFT JOIN test_00597 USING id WHERE value = 1;
 SELECT * FROM (SELECT toInt8(1) AS id) ANY LEFT JOIN test_00597 USING id WHERE value = 1;
@@ -121,22 +123,30 @@ SELECT b.value FROM (SELECT toInt8(1) AS id) ANY LEFT JOIN test_00597 AS b USING
 
 -- Optimize predicate expression with join and nested subquery
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id) WHERE id = 1;
-SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id) WHERE id = 1;
+SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id) WHERE id = 1 SETTINGS allow_experimental_analyzer=0;
+SELECT '------- allow_experimental_analyzer=1 -------';
+SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id) WHERE id = 1 SETTINGS allow_experimental_analyzer=1;
 
 -- Optimize predicate expression with join query and qualified
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING id WHERE b.id = 1;
-SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING id WHERE b.id = 1;
+SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING id WHERE b.id = 1 SETTINGS allow_experimental_analyzer=0;
+SELECT '------- allow_experimental_analyzer=1 -------';
+SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING id WHERE b.id = 1 SETTINGS allow_experimental_analyzer=1;
 
 -- Compatibility test
 EXPLAIN SYNTAX SELECT * FROM (SELECT toInt8(1) AS id, toDate('2000-01-01') AS date FROM system.numbers LIMIT 1) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING date, id WHERE b.date = toDate('2000-01-01');
-SELECT * FROM (SELECT toInt8(1) AS id, toDate('2000-01-01') AS date FROM system.numbers LIMIT 1) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING date, id WHERE b.date = toDate('2000-01-01');
+SELECT * FROM (SELECT toInt8(1) AS id, toDate('2000-01-01') AS date FROM system.numbers LIMIT 1) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING date, id WHERE b.date = toDate('2000-01-01') SETTINGS allow_experimental_analyzer=0;
+SELECT '------- allow_experimental_analyzer=1 -------';
+SELECT * FROM (SELECT toInt8(1) AS id, toDate('2000-01-01') AS date FROM system.numbers LIMIT 1) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING date, id WHERE b.date = toDate('2000-01-01') SETTINGS allow_experimental_analyzer=1;
 
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) AS a ANY LEFT JOIN (SELECT * FROM test_00597) AS b  ON  a.id = b.id) WHERE id = 1;
 SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) AS a ANY LEFT JOIN (SELECT * FROM test_00597) AS b  ON  a.id = b.id) WHERE id = 1;
 
 -- Explain with join subquery
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1;
-SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1;
+SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1 SETTINGS allow_experimental_analyzer=0;
+SELECT '------- allow_experimental_analyzer=1 -------';
+SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1 SETTINGS allow_experimental_analyzer=1;
 
 -- issue 20497
 EXPLAIN SYNTAX SELECT value + t1.value AS expr FROM (SELECT t0.value, t1.value FROM test_00597 AS t0 FULL JOIN test_00597 AS t1 USING date) WHERE expr < 3;
diff --git a/tests/queries/0_stateless/00599_create_view_with_subquery.sql b/tests/queries/0_stateless/00599_create_view_with_subquery.sql
index 6d086ed07f5..9fcc993886b 100644
--- a/tests/queries/0_stateless/00599_create_view_with_subquery.sql
+++ b/tests/queries/0_stateless/00599_create_view_with_subquery.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 DROP TABLE IF EXISTS test_00599;
 DROP TABLE IF EXISTS test_view_00599;
 
diff --git a/tests/queries/0_stateless/00619_union_highlite.sql b/tests/queries/0_stateless/00619_union_highlite.sql
index 4f9ed7c60c9..9a41a132661 100644
--- a/tests/queries/0_stateless/00619_union_highlite.sql
+++ b/tests/queries/0_stateless/00619_union_highlite.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 DROP TABLE IF EXISTS union;
 
 create view union as select 1 as test union all select 2;
diff --git a/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql b/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
index f6c4287b9fc..6c5eb6556ea 100644
--- a/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
+++ b/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
@@ -12,7 +12,7 @@ CREATE TABLE rename2 (p Int64, i Int64, v UInt64) ENGINE = ReplicatedReplacingMe
 INSERT INTO rename1 VALUES (0, 1, 0);
 INSERT INTO rename1 VALUES (0, 1, 1);
 
-SYSTEM SYNC REPLICA rename1; -- Avoid "Cannot select parts for optimization: Entry for part 0_1_1_0 hasn't been read from the replication log yet"
+SYSTEM SYNC REPLICA rename1 PULL; -- Avoid "Cannot select parts for optimization: Entry for part 0_1_1_0 hasn't been read from the replication log yet"
 SYSTEM SYNC REPLICA rename2;
 OPTIMIZE TABLE rename1 FINAL;
 OPTIMIZE TABLE rename2 FINAL;
diff --git a/tests/queries/0_stateless/00621_regression_for_in_operator.reference b/tests/queries/0_stateless/00621_regression_for_in_operator.reference
index 90f0a70449a..ab8bcf307eb 100644
--- a/tests/queries/0_stateless/00621_regression_for_in_operator.reference
+++ b/tests/queries/0_stateless/00621_regression_for_in_operator.reference
@@ -3,3 +3,43 @@
 2
 2
 2
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.regression_for_in_operator_view
+  WHERE
+    FUNCTION id: 4, function_name: in, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 5, nodes: 2
+          COLUMN id: 6, column_name: g, result_type: String, source_id: 3
+          CONSTANT id: 7, constant_value: Tuple_(\'5\', \'6\'), constant_value_type: Tuple(String, String)
+  SETTINGS allow_experimental_analyzer=1
+2
+2
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.regression_for_in_operator_view
+  WHERE
+    FUNCTION id: 4, function_name: or, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 5, nodes: 2
+          FUNCTION id: 6, function_name: equals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 7, nodes: 2
+                COLUMN id: 8, column_name: g, result_type: String, source_id: 3
+                CONSTANT id: 9, constant_value: \'5\', constant_value_type: String
+          FUNCTION id: 10, function_name: equals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 11, nodes: 2
+                COLUMN id: 8, column_name: g, result_type: String, source_id: 3
+                CONSTANT id: 12, constant_value: \'6\', constant_value_type: String
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/00621_regression_for_in_operator.sql b/tests/queries/0_stateless/00621_regression_for_in_operator.sql
index 273f930a90f..db1bcb4a39a 100644
--- a/tests/queries/0_stateless/00621_regression_for_in_operator.sql
+++ b/tests/queries/0_stateless/00621_regression_for_in_operator.sql
@@ -12,9 +12,13 @@ SELECT count() FROM regression_for_in_operator_view WHERE g IN ('5','6');
 
 SET optimize_min_equality_disjunction_chain_length = 1;
 SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6';
+SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS allow_experimental_analyzer = 1;
+EXPLAIN QUERY TREE SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS allow_experimental_analyzer = 1;
 
 SET optimize_min_equality_disjunction_chain_length = 3;
 SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6';
+SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS allow_experimental_analyzer = 1;
+EXPLAIN QUERY TREE SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE regression_for_in_operator_view;
 DROP TABLE regression_for_in_operator;
diff --git a/tests/queries/0_stateless/00623_truncate_table.sql b/tests/queries/0_stateless/00623_truncate_table.sql
index 16bc87ea213..4a67e49acda 100644
--- a/tests/queries/0_stateless/00623_truncate_table.sql
+++ b/tests/queries/0_stateless/00623_truncate_table.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 set allow_deprecated_syntax_for_merge_tree=1;
 
 DROP DATABASE IF EXISTS truncate_test;
diff --git a/tests/queries/0_stateless/00625_arrays_in_nested.sql b/tests/queries/0_stateless/00625_arrays_in_nested.sql
index 78819ac683f..3b418731c8f 100644
--- a/tests/queries/0_stateless/00625_arrays_in_nested.sql
+++ b/tests/queries/0_stateless/00625_arrays_in_nested.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 DROP TABLE IF EXISTS nested;
 CREATE TABLE nested
 (
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table.sql b/tests/queries/0_stateless/00626_replace_partition_from_table.sql
index 958d2184c46..7224224334e 100644
--- a/tests/queries/0_stateless/00626_replace_partition_from_table.sql
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS dst;
 
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
index 8b07d9abe35..a0a3416e406 100755
--- a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: zookeeper, no-parallel, no-s3-storage, no-upgrade-check
+# Tags: zookeeper, no-s3-storage, no-upgrade-check
 
 # Because REPLACE PARTITION does not forces immediate removal of replaced data parts from local filesystem
 # (it tries to do it as quick as possible, but it still performed in separate thread asynchronously)
diff --git a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
index 472dad59710..1fb219108da 100755
--- a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
+++ b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: zookeeper, no-parallel
+# Tags: zookeeper
 
 set -e
 
diff --git a/tests/queries/0_stateless/00636_partition_key_parts_pruning.sh b/tests/queries/0_stateless/00636_partition_key_parts_pruning.sh
index fdaecd87f53..7ec4d99f028 100755
--- a/tests/queries/0_stateless/00636_partition_key_parts_pruning.sh
+++ b/tests/queries/0_stateless/00636_partition_key_parts_pruning.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ${CLICKHOUSE_CLIENT} --query="SELECT '*** Single column partition key ***'"
 
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS single_col_partition_key"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE single_col_partition_key(x UInt32) ENGINE MergeTree ORDER BY x PARTITION BY intDiv(x, 10)"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE single_col_partition_key(x UInt32) ENGINE MergeTree ORDER BY x PARTITION BY intDiv(x, 10) SETTINGS index_granularity=4"
 
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO single_col_partition_key VALUES (1), (2), (3), (4), (11), (12), (20)"
 
diff --git a/tests/queries/0_stateless/00646_url_engine.python b/tests/queries/0_stateless/00646_url_engine.python
index c955eaff643..dc0fdd1a71d 100644
--- a/tests/queries/0_stateless/00646_url_engine.python
+++ b/tests/queries/0_stateless/00646_url_engine.python
@@ -7,11 +7,13 @@ import tempfile
 import threading
 import os
 import traceback
+from urllib.parse import urljoin
 import urllib.request
 import subprocess
 from io import StringIO
 from http.server import BaseHTTPRequestHandler, HTTPServer
 
+
 def is_ipv6(host):
     try:
         socket.inet_aton(host)
@@ -19,6 +21,7 @@ def is_ipv6(host):
     except:
         return True
 
+
 def get_local_port(host, ipv6):
     if ipv6:
         family = socket.AF_INET6
@@ -29,8 +32,9 @@ def get_local_port(host, ipv6):
         fd.bind((host, 0))
         return fd.getsockname()[1]
 
-CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', '127.0.0.1')
-CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
+
+CLICKHOUSE_HOST = os.environ.get("CLICKHOUSE_HOST", "127.0.0.1")
+CLICKHOUSE_PORT_HTTP = os.environ.get("CLICKHOUSE_PORT_HTTP", "8123")
 
 #####################################################################################
 # This test starts an HTTP server and serves data to clickhouse url-engine based table.
@@ -39,27 +43,42 @@ CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
 #####################################################################################
 
 # IP-address of this host accessible from the outside world. Get the first one
-HTTP_SERVER_HOST = subprocess.check_output(['hostname', '-i']).decode('utf-8').strip().split()[0]
+HTTP_SERVER_HOST = (
+    subprocess.check_output(["hostname", "-i"]).decode("utf-8").strip().split()[0]
+)
 IS_IPV6 = is_ipv6(HTTP_SERVER_HOST)
 HTTP_SERVER_PORT = get_local_port(HTTP_SERVER_HOST, IS_IPV6)
 
 # IP address and port of the HTTP server started from this script.
 HTTP_SERVER_ADDRESS = (HTTP_SERVER_HOST, HTTP_SERVER_PORT)
 if IS_IPV6:
-    HTTP_SERVER_URL_STR = 'http://' + f'[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+    HTTP_SERVER_URL_STR = (
+        "http://"
+        + f"[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}"
+        + "/"
+    )
 else:
-    HTTP_SERVER_URL_STR = 'http://' + f'{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+    HTTP_SERVER_URL_STR = (
+        "http://" + f"{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}" + "/"
+    )
+
+CSV_DATA = os.path.join(
+    tempfile._get_default_tempdir(), next(tempfile._get_candidate_names())
+)
 
-CSV_DATA = os.path.join(tempfile._get_default_tempdir(), next(tempfile._get_candidate_names()))
 
 def get_ch_answer(query):
     host = CLICKHOUSE_HOST
     if IS_IPV6:
-        host = f'[{host}]'
+        host = f"[{host}]"
 
-    url = os.environ.get('CLICKHOUSE_URL', 'http://{host}:{port}'.format(host=CLICKHOUSE_HOST, port=CLICKHOUSE_PORT_HTTP))
+    url = os.environ.get(
+        "CLICKHOUSE_URL",
+        "http://{host}:{port}".format(host=CLICKHOUSE_HOST, port=CLICKHOUSE_PORT_HTTP),
+    )
     return urllib.request.urlopen(url, data=query.encode()).read().decode()
 
+
 def check_answers(query, answer):
     ch_answer = get_ch_answer(query)
     if ch_answer.strip() != answer.strip():
@@ -68,48 +87,53 @@ def check_answers(query, answer):
         print("Fetched answer :", ch_answer, file=sys.stderr)
         raise Exception("Fail on query")
 
+
 class CSVHTTPServer(BaseHTTPRequestHandler):
     def _set_headers(self):
         self.send_response(200)
-        self.send_header('Content-type', 'text/csv')
+        self.send_header("Content-type", "text/csv")
         self.end_headers()
 
     def do_GET(self):
         self._set_headers()
-        with open(CSV_DATA, 'r') as fl:
-            reader = csv.reader(fl, delimiter=',')
+        with open(CSV_DATA, "r") as fl:
+            reader = csv.reader(fl, delimiter=",")
             for row in reader:
-                self.wfile.write((', '.join(row) + '\n').encode())
+                self.wfile.write((", ".join(row) + "\n").encode())
+        return
+
+    def do_HEAD(self):
+        self._set_headers()
         return
 
     def read_chunk(self):
-        msg = ''
+        msg = ""
         while True:
             sym = self.rfile.read(1)
-            if sym == '':
+            if sym == "":
                 break
-            msg += sym.decode('utf-8')
-            if msg.endswith('\r\n'):
+            msg += sym.decode("utf-8")
+            if msg.endswith("\r\n"):
                 break
         length = int(msg[:-2], 16)
         if length == 0:
-            return ''
+            return ""
         content = self.rfile.read(length)
-        self.rfile.read(2) # read sep \r\n
-        return content.decode('utf-8')
+        self.rfile.read(2)  # read sep \r\n
+        return content.decode("utf-8")
 
     def do_POST(self):
-        data = ''
+        data = ""
         while True:
             chunk = self.read_chunk()
             if not chunk:
                 break
             data += chunk
         with StringIO(data) as fl:
-            reader = csv.reader(fl, delimiter=',')
-            with open(CSV_DATA, 'a') as d:
+            reader = csv.reader(fl, delimiter=",")
+            with open(CSV_DATA, "a") as d:
                 for row in reader:
-                    d.write(','.join(row) + '\n')
+                    d.write(",".join(row) + "\n")
         self._set_headers()
         self.wfile.write(b"ok")
 
@@ -120,6 +144,7 @@ class CSVHTTPServer(BaseHTTPRequestHandler):
 class HTTPServerV6(HTTPServer):
     address_family = socket.AF_INET6
 
+
 def start_server():
     if IS_IPV6:
         httpd = HTTPServerV6(HTTP_SERVER_ADDRESS, CSVHTTPServer)
@@ -129,49 +154,77 @@ def start_server():
     t = threading.Thread(target=httpd.serve_forever)
     return t, httpd
 
+
 # test section
 
-def test_select(table_name="", schema="str String,numuint UInt32,numint Int32,double Float64", requests=[], answers=[], test_data=""):
-    with open(CSV_DATA, 'w') as f: # clear file
-        f.write('')
+
+def test_select(
+    table_name="",
+    schema="str String,numuint UInt32,numint Int32,double Float64",
+    requests=[],
+    answers=[],
+    test_data="",
+    res_path="",
+):
+    with open(CSV_DATA, "w") as f:  # clear file
+        f.write("")
 
     if test_data:
-        with open(CSV_DATA, 'w') as f:
+        with open(CSV_DATA, "w") as f:
             f.write(test_data + "\n")
 
     if table_name:
         get_ch_answer("drop table if exists {}".format(table_name))
-        get_ch_answer("create table {} ({}) engine=URL('{}', 'CSV')".format(table_name, schema, HTTP_SERVER_URL_STR))
+        get_ch_answer(
+            "create table {} ({}) engine=URL('{}', 'CSV')".format(
+                table_name, schema, HTTP_SERVER_URL_STR
+            )
+        )
 
     for i in range(len(requests)):
         tbl = table_name
         if not tbl:
-            tbl = "url('{addr}', 'CSV', '{schema}')".format(addr=HTTP_SERVER_URL_STR, schema=schema)
+            tbl = "url('{addr}', 'CSV', '{schema}')".format(
+                addr=urljoin(HTTP_SERVER_URL_STR, res_path), schema=schema
+            )
         check_answers(requests[i].format(tbl=tbl), answers[i])
 
     if table_name:
         get_ch_answer("drop table if exists {}".format(table_name))
 
 
-def test_insert(table_name="", schema="str String,numuint UInt32,numint Int32,double Float64", requests_insert=[], requests_select=[], answers=[]):
-    with open(CSV_DATA, 'w') as f: # flush test file
-        f.write('')
+def test_insert(
+    table_name="",
+    schema="str String,numuint UInt32,numint Int32,double Float64",
+    requests_insert=[],
+    requests_select=[],
+    answers=[],
+):
+    with open(CSV_DATA, "w") as f:  # flush test file
+        f.write("")
 
     if table_name:
         get_ch_answer("drop table if exists {}".format(table_name))
-        get_ch_answer("create table {} ({}) engine=URL('{}', 'CSV')".format(table_name, schema, HTTP_SERVER_URL_STR))
+        get_ch_answer(
+            "create table {} ({}) engine=URL('{}', 'CSV')".format(
+                table_name, schema, HTTP_SERVER_URL_STR
+            )
+        )
 
     for req in requests_insert:
         tbl = table_name
         if not tbl:
-            tbl = "table function url('{addr}', 'CSV', '{schema}')".format(addr=HTTP_SERVER_URL_STR, schema=schema)
+            tbl = "table function url('{addr}', 'CSV', '{schema}')".format(
+                addr=HTTP_SERVER_URL_STR, schema=schema
+            )
         get_ch_answer(req.format(tbl=tbl))
 
-
     for i in range(len(requests_select)):
         tbl = table_name
         if not tbl:
-            tbl = "url('{addr}', 'CSV', '{schema}')".format(addr=HTTP_SERVER_URL_STR, schema=schema)
+            tbl = "url('{addr}', 'CSV', '{schema}')".format(
+                addr=HTTP_SERVER_URL_STR, schema=schema
+            )
         check_answers(requests_select[i].format(tbl=tbl), answers[i])
 
     if table_name:
@@ -181,9 +234,11 @@ def test_insert(table_name="", schema="str String,numuint UInt32,numint Int32,do
 def main():
     test_data = "Hello,2,-2,7.7\nWorld,2,-5,8.8"
     select_only_requests = {
-        "select str,numuint,numint,double from {tbl}" : test_data.replace(',', '\t'),
-        "select numuint, count(*) from {tbl} group by numuint" : "2\t2",
-        "select str,numuint,numint,double from {tbl} limit 1": test_data.split("\n")[0].replace(',', '\t'),
+        "select str,numuint,numint,double from {tbl}": test_data.replace(",", "\t"),
+        "select numuint, count(*) from {tbl} group by numuint": "2\t2",
+        "select str,numuint,numint,double from {tbl} limit 1": test_data.split("\n")[
+            0
+        ].replace(",", "\t"),
     }
 
     insert_requests = [
@@ -192,21 +247,63 @@ def main():
     ]
 
     select_requests = {
-        "select distinct numuint from {tbl} order by numuint": '\n'.join([str(i) for i in range(11)]),
-        "select count(*) from {tbl}": '12',
-        'select double, count(*) from {tbl} group by double order by double': "7.7\t2\n9.9\t10"
+        "select distinct numuint from {tbl} order by numuint": "\n".join(
+            [str(i) for i in range(11)]
+        ),
+        "select count(*) from {tbl}": "12",
+        "select double, count(*) from {tbl} group by double order by double": "7.7\t2\n9.9\t10",
+    }
+
+    pathname = CSV_DATA
+    filename = os.path.basename(CSV_DATA)
+    select_virtual_requests = {
+        "select _path from {tbl}": "\n".join(pathname for _ in range(2)),
+        "select _file from {tbl}": "\n".join(filename for _ in range(2)),
+        "select _file, from {tbl} order by _path": "\n".join(
+            filename for _ in range(2)
+        ),
+        "select _path, _file from {tbl}": "\n".join(
+            f"{pathname}\t{filename}" for _ in range(2)
+        ),
+        "select _path, count(*) from {tbl} group by _path": f"{pathname}\t2",
     }
 
     t, httpd = start_server()
     t.start()
     # test table with url engine
-    test_select(table_name="test_table_select", requests=list(select_only_requests.keys()), answers=list(select_only_requests.values()), test_data=test_data)
+    test_select(
+        table_name="test_table_select",
+        requests=list(select_only_requests.keys()),
+        answers=list(select_only_requests.values()),
+        test_data=test_data,
+    )
     # test table function url
-    test_select(requests=list(select_only_requests.keys()), answers=list(select_only_requests.values()), test_data=test_data)
-    #test insert into table with url engine
-    test_insert(table_name="test_table_insert", requests_insert=insert_requests, requests_select=list(select_requests.keys()), answers=list(select_requests.values()))
-    #test insert into table function url
-    test_insert(requests_insert=insert_requests, requests_select=list(select_requests.keys()), answers=list(select_requests.values()))
+    test_select(
+        requests=list(select_only_requests.keys()),
+        answers=list(select_only_requests.values()),
+        test_data=test_data,
+    )
+    # test table function url for virtual column
+    test_select(
+        requests=list(select_virtual_requests.keys()),
+        answers=list(select_virtual_requests.values()),
+        test_data=test_data,
+        res_path=CSV_DATA,
+    )
+
+    # test insert into table with url engine
+    test_insert(
+        table_name="test_table_insert",
+        requests_insert=insert_requests,
+        requests_select=list(select_requests.keys()),
+        answers=list(select_requests.values()),
+    )
+    # test insert into table function url
+    test_insert(
+        requests_insert=insert_requests,
+        requests_select=list(select_requests.keys()),
+        answers=list(select_requests.values()),
+    )
 
     httpd.shutdown()
     t.join()
diff --git a/tests/queries/0_stateless/00652_mergetree_mutations.sh b/tests/queries/0_stateless/00652_mergetree_mutations.sh
index 535cbe99dfe..a9d7908a1af 100755
--- a/tests/queries/0_stateless/00652_mergetree_mutations.sh
+++ b/tests/queries/0_stateless/00652_mergetree_mutations.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
index a1e7d8727c7..1f5bcbdc0d0 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: replica, no-replicated-database, no-parallel, no-fasttest
+# Tags: replica, no-replicated-database, no-fasttest
 # Tag no-replicated-database: Old syntax is not allowed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00653_running_difference.reference b/tests/queries/0_stateless/00653_running_difference.reference
index e2833e0bb3e..624ce92ce0f 100644
--- a/tests/queries/0_stateless/00653_running_difference.reference
+++ b/tests/queries/0_stateless/00653_running_difference.reference
@@ -19,6 +19,30 @@
 \N
 \N
 2
+-
+0
+1
+4
+5
+170141183460469231731687303715884105717
+-
+0
+1
+4
+5
+170141183460469231731687303715884105718
+-
+0
+1
+4
+5
+170141183460469231731687303715884105717
+-
+0
+1
+4
+5
+170141183460469231731687303715884105718
 --Date Difference--
 \N
 \N
diff --git a/tests/queries/0_stateless/00653_running_difference.sql b/tests/queries/0_stateless/00653_running_difference.sql
index f2b4a7300b2..1f18cfc42a7 100644
--- a/tests/queries/0_stateless/00653_running_difference.sql
+++ b/tests/queries/0_stateless/00653_running_difference.sql
@@ -5,6 +5,14 @@ select '-';
 select runningDifference(x) from (select arrayJoin([Null, 1]) as x);
 select '-';
 select runningDifference(x) from (select arrayJoin([Null, Null, 1, 3, Null, Null, 5]) as x);
+select '-';
+select runningDifference(x) from (select arrayJoin([0, 1, 5, 10, 170141183460469231731687303715884105727]::Array(UInt128)) as x);
+select '-';
+select runningDifference(x) from (select arrayJoin([0, 1, 5, 10, 170141183460469231731687303715884105728]::Array(UInt256)) as x);
+select '-';
+select runningDifference(x) from (select arrayJoin([0, 1, 5, 10, 170141183460469231731687303715884105727]::Array(Int128)) as x);
+select '-';
+select runningDifference(x) from (select arrayJoin([0, 1, 5, 10, 170141183460469231731687303715884105728]::Array(Int256)) as x);
 select '--Date Difference--';
 select runningDifference(x) from (select arrayJoin([Null, Null, toDate('1970-1-1'), toDate('1970-12-31'), Null, Null,  toDate('2010-8-9')]) as x);
 select '-';
diff --git a/tests/queries/0_stateless/00674_join_on_syntax.reference b/tests/queries/0_stateless/00674_join_on_syntax.reference
index 10c31e56fe8..7bad0431b8f 100644
--- a/tests/queries/0_stateless/00674_join_on_syntax.reference
+++ b/tests/queries/0_stateless/00674_join_on_syntax.reference
@@ -49,8 +49,8 @@ duplicate column names
 {"a1":1,"tab1_copy.a1":2}
 {"a1":1,"tab1_copy.a1":2}
 {"a1":1,"copy.a1":2}
-{"a1":1,"copy.a1":2}
-{"a1":1,"copy.a1":2}
+{"a1":1,"tab1_copy.a1":2}
+{"a1":1,"tab1_copy.a1":2}
 subquery
 1
 1
diff --git a/tests/queries/0_stateless/00674_join_on_syntax.sql b/tests/queries/0_stateless/00674_join_on_syntax.sql
index cdca4e27a71..9ff26db1536 100644
--- a/tests/queries/0_stateless/00674_join_on_syntax.sql
+++ b/tests/queries/0_stateless/00674_join_on_syntax.sql
@@ -1,4 +1,5 @@
 SET joined_subquery_requires_alias = 0;
+SET allow_experimental_analyzer = 1;
 
 drop table if exists tab1;
 drop table if exists tab2;
diff --git a/tests/queries/0_stateless/00678_murmurhash.reference b/tests/queries/0_stateless/00678_murmurhash.reference
index 988c022f1bf..fb4a00ba046 100644
--- a/tests/queries/0_stateless/00678_murmurhash.reference
+++ b/tests/queries/0_stateless/00678_murmurhash.reference
@@ -25,5 +25,5 @@
 9631199822919835226
 4334672815104069193
 4334672815104069193
-6145F501578671E2877DBA2BE487AF7E
-16FE7483905CCE7A85670E43E4678877
+1
+1
diff --git a/tests/queries/0_stateless/00678_murmurhash.sql b/tests/queries/0_stateless/00678_murmurhash.sql
index 705c62480a0..eda29fd17cd 100644
--- a/tests/queries/0_stateless/00678_murmurhash.sql
+++ b/tests/queries/0_stateless/00678_murmurhash.sql
@@ -32,5 +32,7 @@ SELECT gccMurmurHash('foo');
 SELECT gccMurmurHash('\x01');
 SELECT gccMurmurHash(1);
 
-SELECT hex(murmurHash3_128('foo'));
-SELECT hex(murmurHash3_128('\x01'));
+-- Comparison with reverse for big endian
+SELECT hex(murmurHash3_128('foo')) = hex(reverse(unhex('6145F501578671E2877DBA2BE487AF7E'))) or hex(murmurHash3_128('foo')) = '6145F501578671E2877DBA2BE487AF7E';
+-- Comparison with reverse for big endian
+SELECT hex(murmurHash3_128('\x01')) = hex(reverse(unhex('16FE7483905CCE7A85670E43E4678877'))) or hex(murmurHash3_128('\x01')) = '16FE7483905CCE7A85670E43E4678877';
diff --git a/tests/queries/0_stateless/00682_empty_parts_merge.sh b/tests/queries/0_stateless/00682_empty_parts_merge.sh
index 64aa1cc7452..31892542cab 100755
--- a/tests/queries/0_stateless/00682_empty_parts_merge.sh
+++ b/tests/queries/0_stateless/00682_empty_parts_merge.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-parallel, no-fasttest
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql b/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
index c6f54ea389b..5a169403872 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 drop table if exists lc_dict_reading;
 create table lc_dict_reading (val UInt64, str StringWithDictionary, pat String) engine = MergeTree order by val;
 insert into lc_dict_reading select number, if(number < 8192 * 4, number % 100, number) as s, s from system.numbers limit 1000000;
diff --git a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
index 34353286118..3c0e64a9637 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 select 'NativeReader';
 select toTypeName(dict), dict, lowCardinalityIndices(dict), lowCardinalityKeys(dict) from (select '123_' || toLowCardinality(v) as dict from (select arrayJoin(['a', 'bb', '', 'a', 'ccc', 'a', 'bb', '', 'dddd']) as v));
 select '-';
diff --git a/tests/queries/0_stateless/00699_materialized_view_mutations.sh b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
index f66d079e307..a0f7db536dc 100755
--- a/tests/queries/0_stateless/00699_materialized_view_mutations.sh
+++ b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/00700_decimal_aggregates.reference b/tests/queries/0_stateless/00700_decimal_aggregates.reference
index 159091d867e..79195312867 100644
--- a/tests/queries/0_stateless/00700_decimal_aggregates.reference
+++ b/tests/queries/0_stateless/00700_decimal_aggregates.reference
@@ -5,7 +5,7 @@
 -1275	-424.99999983	-255	-1275	-424.99999983	-255
 101	101	101	101	101	101
 -101	-101	-101	-101	-101	-101
-(101,101,101)	(101,101,101)	(101,101,101)	(101,101,101)	(102,100,101)
+(101,101,101)	(101,101,101)	(101,101,101)	(101,101,101)	(1,1,1,1,1,1)
 5	5	5
 10	10	10
 -50	-50	-16.66666666	-16.66666666	-10	-10
@@ -67,9 +67,9 @@
 [-50,-40,-30,-20,-10,0,10,20,30,40,50]
 [-16.66666666,-13.33333333,-10,-6.66666666,-3.33333333,0,3.33333333,6.66666666,10,13.33333333,16.66666666]
 [-10,-8,-6,-4,-2,0,2,4,6,8,10]
-850	94.44444438684269	34	Float64	Float64	Float64
+850	94.4444443868427	34.00000000000001	Float64	Float64	Float64
 850	94.4444443868427	34.00000000000001
-858.5	95.38888883071111	34.34	Float64	Float64	Float64
+858.5	95.38888883071112	34.34	Float64	Float64	Float64
 858.5	95.38888883071112	34.34
 29.154759474226502	9.718253155111915	5.830951894845301	Float64	Float64	Float64
 29.154759474226502	9.718253155111915	5.830951894845301
diff --git a/tests/queries/0_stateless/00700_decimal_aggregates.sql b/tests/queries/0_stateless/00700_decimal_aggregates.sql
index a1814fc866f..6ca37e06918 100644
--- a/tests/queries/0_stateless/00700_decimal_aggregates.sql
+++ b/tests/queries/0_stateless/00700_decimal_aggregates.sql
@@ -24,7 +24,7 @@ SELECT (uniq(a), uniq(b), uniq(c)),
     (uniqCombined(a), uniqCombined(b), uniqCombined(c)),
     (uniqCombined(17)(a), uniqCombined(17)(b), uniqCombined(17)(c)),
     (uniqExact(a), uniqExact(b), uniqExact(c)),
-    (uniqHLL12(a), uniqHLL12(b), uniqHLL12(c))
+    (102 - uniqHLL12(a) >= 0, 102 - uniqHLL12(b) >= 0, 102 - uniqHLL12(c) >= 0, uniqHLL12(a) - 99 >= 0, uniqHLL12(b) - 99 >= 0, uniqHLL12(c) - 99 >= 0)
 FROM (SELECT * FROM decimal ORDER BY a);
 
 SELECT uniqUpTo(10)(a), uniqUpTo(10)(b), uniqUpTo(10)(c) FROM decimal WHERE a >= 0 AND a < 5;
diff --git a/tests/queries/0_stateless/00700_decimal_empty_aggregates.reference b/tests/queries/0_stateless/00700_decimal_empty_aggregates.reference
index 2c29b72f50c..20098e638d5 100644
--- a/tests/queries/0_stateless/00700_decimal_empty_aggregates.reference
+++ b/tests/queries/0_stateless/00700_decimal_empty_aggregates.reference
@@ -45,11 +45,11 @@
 [0,0,0,0,0,0,0,0,0,0,0]
 [0,0,0,0,0,0,0,0,0,0,0]
 [0,0,0,0,0,0,0,0,0,0,0]
-inf	inf	inf	Float64	Float64	Float64
+nan	nan	nan	Float64	Float64	Float64
 nan	nan	nan
 nan	nan	nan	Float64	Float64	Float64
 nan	nan	nan
-inf	inf	inf	Float64	Float64	Float64
+nan	nan	nan	Float64	Float64	Float64
 nan	nan	nan
 nan	nan	nan	Float64	Float64	Float64
 nan	nan	nan
diff --git a/tests/queries/0_stateless/00700_to_decimal_or_something_1.reference.j2 b/tests/queries/0_stateless/00700_to_decimal_or_something_1.reference.j2
new file mode 100644
index 00000000000..fdc7dafa24e
--- /dev/null
+++ b/tests/queries/0_stateless/00700_to_decimal_or_something_1.reference.j2
@@ -0,0 +1,120 @@
+----  toDecimal32 ----
+54.1234
+1.1111
+----  toDecimal64 ----
+54.1234
+1.1111
+----  toDecimal128 ----
+54.1234
+1.1111
+----  toDecimal256 ----
+54.1234
+1.1111
+----  toDecimal32OrDefault ----
+54.1234
+1.1111
+0
+0
+0
+0
+0
+0
+----  toDecimal32OrNull ----
+54.1234
+1.1111
+\N
+\N
+\N
+\N
+\N
+\N
+----  toDecimal32OrZero ----
+54.1234
+1.1111
+0
+0
+0
+0
+0
+0
+----  toDecimal64OrDefault ----
+54.1234
+1.1111
+0
+0
+0
+0
+0
+0
+----  toDecimal64OrZero ----
+54.1234
+1.1111
+0
+0
+0
+0
+0
+0
+----  toDecimal64OrNull ----
+54.1234
+1.1111
+\N
+\N
+\N
+\N
+\N
+\N
+----  toDecimal128OrDefault ----
+54.1234
+1.1111
+0
+0
+0
+0
+0
+0
+----  toDecimal128OrNull ----
+54.1234
+1.1111
+\N
+\N
+\N
+\N
+\N
+\N
+----  toDecimal128OrZero ----
+54.1234
+1.1111
+0
+0
+0
+0
+0
+0
+----  toDecimal256OrDefault ----
+54.1234
+1.1111
+0
+0
+0
+0
+0
+0
+----  toDecimal256OrNull ----
+54.1234
+1.1111
+\N
+\N
+\N
+\N
+\N
+\N
+----  toDecimal256OrZero ----
+54.1234
+1.1111
+0
+0
+0
+0
+0
+0
diff --git a/tests/queries/0_stateless/00700_to_decimal_or_something_1.sql.j2 b/tests/queries/0_stateless/00700_to_decimal_or_something_1.sql.j2
new file mode 100644
index 00000000000..03ae16778bc
--- /dev/null
+++ b/tests/queries/0_stateless/00700_to_decimal_or_something_1.sql.j2
@@ -0,0 +1,32 @@
+{% for func in [ "toDecimal32", "toDecimal64", "toDecimal128", "toDecimal256" ] -%}
+
+SELECT '----  {{ func }} ----';
+SELECT {{ func }} ('54.1234567', 4);
+SELECT {{ func }} ('1.1111111111111111111111111111111111111', 4);
+SELECT {{ func }} ('x123', 4); -- { serverError CANNOT_PARSE_TEXT }
+SELECT {{ func }} ('', 4); -- { serverError ATTEMPT_TO_READ_AFTER_EOF }
+SELECT {{ func }} ('\0', 4); -- { serverError CANNOT_PARSE_TEXT }
+SELECT {{ func }} ('\0\0\0\0\0', 4); -- { serverError CANNOT_PARSE_TEXT }
+SELECT {{ func }} ('\n\t\r', 4); -- { serverError CANNOT_PARSE_TEXT }
+SELECT {{ func }} ('\'', 4); -- { serverError CANNOT_PARSE_TEXT }
+
+{% endfor -%}
+
+{% for func in [ "toDecimal32OrDefault", "toDecimal32OrNull", "toDecimal32OrZero",
+                 "toDecimal64OrDefault", "toDecimal64OrZero", "toDecimal64OrNull",
+                 "toDecimal128OrDefault", "toDecimal128OrNull", "toDecimal128OrZero",
+                 "toDecimal256OrDefault", "toDecimal256OrNull", "toDecimal256OrZero" ] -%}
+
+SELECT '----  {{ func }} ----';
+SELECT {{ func }} ('54.1234567', 4);
+SELECT {{ func }} ('1.1111111111111111111111111111111111111', 4);
+SELECT {{ func }} ('x123', 4);
+SELECT {{ func }} ('', 4);
+SELECT {{ func }} ('\0', 4);
+SELECT {{ func }} ('\0\0\0\0\0', 4);
+SELECT {{ func }} ('\n\t\r', 4);
+SELECT {{ func }} ('\'', 4);
+
+{% endfor -%}
+
+
diff --git a/tests/queries/0_stateless/00701_rollup.sql b/tests/queries/0_stateless/00701_rollup.sql
index 3637a5fae2f..4679b123cdc 100644
--- a/tests/queries/0_stateless/00701_rollup.sql
+++ b/tests/queries/0_stateless/00701_rollup.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel, no-fasttest
+-- Tags: no-fasttest
 
 DROP TABLE IF EXISTS rollup;
 CREATE TABLE rollup(a String, b Int32, s Int32) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/00702_join_with_using.sql b/tests/queries/0_stateless/00702_join_with_using.sql
index 4f81e757dfc..462524e1922 100644
--- a/tests/queries/0_stateless/00702_join_with_using.sql
+++ b/tests/queries/0_stateless/00702_join_with_using.sql
@@ -7,7 +7,7 @@ CREATE TABLE using2(a UInt8, b UInt8) ENGINE=Memory;
 INSERT INTO using1 VALUES (1, 1) (2, 2) (3, 3);
 INSERT INTO using2 VALUES (4, 4) (2, 2) (3, 3);
 
-SELECT * FROM using1 ALL LEFT JOIN (SELECT * FROM using2) js2 USING (a, a, a, b, b, b, a, a) ORDER BY a;
+SELECT * FROM using1 ALL LEFT JOIN (SELECT * FROM using2) js2 USING (a, b) ORDER BY a;
 
 DROP TABLE using1;
 DROP TABLE using2;
diff --git a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
index 3f384380f9b..96d5764780f 100755
--- a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
+++ b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: zookeeper, no-parallel
+# Tags: zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00716_allow_ddl.sql b/tests/queries/0_stateless/00716_allow_ddl.sql
index bc0fa20eb0a..d33d8b7eec5 100644
--- a/tests/queries/0_stateless/00716_allow_ddl.sql
+++ b/tests/queries/0_stateless/00716_allow_ddl.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 SET send_logs_level = 'fatal';
 SET allow_ddl = 0;
 
diff --git a/tests/queries/0_stateless/00718_format_datetime.reference b/tests/queries/0_stateless/00718_format_datetime.reference
index e35484d4b0b..50874ac9b2e 100644
--- a/tests/queries/0_stateless/00718_format_datetime.reference
+++ b/tests/queries/0_stateless/00718_format_datetime.reference
@@ -5,6 +5,7 @@ Jan	Jan
 02	02
 01/02/18	01/02/18
  2	 2
+000000	000000
 2018-01-02	2018-01-02
 10	12
 22	00
@@ -17,6 +18,7 @@ Jan	Jan
 366	366
 00	00
 01	01
+January	January
 33	00
 \n	\n
 AM	AM
@@ -42,11 +44,23 @@ no formatting pattern	no formatting pattern
 -1100
 +0300
 +0530
-1234560
-000340
+000000
+000000
+000000
+000000
+123
+123456
+123456789
+0
+0
+0
+0
+123
+123456
+123456789
 2022-12-08 18:11:29.123400000
 2022-12-08 18:11:29.1
-2022-12-08 18:11:29.0
-2022-12-08 18:11:29.0
-2022-12-08 00:00:00.0
-2022-12-08 00:00:00.0
+2022-12-08 18:11:29.000000
+2022-12-08 18:11:29.000000
+2022-12-08 00:00:00.000000
+2022-12-08 00:00:00.000000
diff --git a/tests/queries/0_stateless/00718_format_datetime.sql b/tests/queries/0_stateless/00718_format_datetime.sql
index 74ec03d83d3..c0db6a4f64e 100644
--- a/tests/queries/0_stateless/00718_format_datetime.sql
+++ b/tests/queries/0_stateless/00718_format_datetime.sql
@@ -1,14 +1,14 @@
 SET send_logs_level = 'fatal';
 
-SELECT formatDateTime(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH (42) }
-SELECT formatDateTime('not a datetime', 'IGNORED'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT (43) }
-SELECT formatDateTime(now(), now()); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT (43) }
-SELECT formatDateTime(now(), 'good format pattern', now()); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT (43) }
-SELECT formatDateTime(now(), 'unescaped %'); -- { serverError BAD_ARGUMENTS (36) }
-SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%U'); -- { serverError NOT_IMPLEMENTED (48) }
-SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%v'); -- { serverError NOT_IMPLEMENTED (48) }
-SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%x'); -- { serverError NOT_IMPLEMENTED (48) }
-SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%X'); -- { serverError NOT_IMPLEMENTED (48) }
+SELECT formatDateTime(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT formatDateTime('not a datetime', 'IGNORED'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT formatDateTime(now(), now()); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT formatDateTime(now(), 'good format pattern', now()); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT formatDateTime(now(), 'unescaped %'); -- { serverError BAD_ARGUMENTS }
+SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%U'); -- { serverError NOT_IMPLEMENTED }
+SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%v'); -- { serverError NOT_IMPLEMENTED }
+SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%x'); -- { serverError NOT_IMPLEMENTED }
+SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%X'); -- { serverError NOT_IMPLEMENTED }
 
 SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%a'), formatDateTime(toDate32('2018-01-02'), '%a');
 SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%b'), formatDateTime(toDate32('2018-01-02'), '%b');
@@ -17,6 +17,7 @@ SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%C'), formatDateTime(t
 SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%d'), formatDateTime(toDate32('2018-01-02'), '%d');
 SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%D'), formatDateTime(toDate32('2018-01-02'), '%D');
 SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%e'), formatDateTime(toDate32('2018-01-02'), '%e');
+SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%f'), formatDateTime(toDate32('2018-01-02'), '%f');
 SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%F'), formatDateTime(toDate32('2018-01-02'), '%F');
 SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%h'), formatDateTime(toDate32('2018-01-02'), '%h');
 SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%H'), formatDateTime(toDate32('2018-01-02'), '%H');
@@ -29,7 +30,8 @@ SELECT formatDateTime(toDateTime('2018-01-01 00:33:44'), '%j'), formatDateTime(t
 SELECT formatDateTime(toDateTime('2000-12-31 00:33:44'), '%j'), formatDateTime(toDate32('2000-12-31'), '%j');
 SELECT formatDateTime(toDateTime('2000-12-31 00:33:44'), '%k'), formatDateTime(toDate32('2000-12-31'), '%k');
 SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%m'), formatDateTime(toDate32('2018-01-02'), '%m');
-SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%M'), formatDateTime(toDate32('2018-01-02'), '%M');
+SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%M'), formatDateTime(toDate32('2018-01-02'), '%M') SETTINGS formatdatetime_parsedatetime_m_is_month_name = 1;
+SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%M'), formatDateTime(toDate32('2018-01-02'), '%M') SETTINGS formatdatetime_parsedatetime_m_is_month_name = 0;
 SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), '%n'), formatDateTime(toDate32('2018-01-02'), '%n');
 SELECT formatDateTime(toDateTime('2018-01-02 00:33:44'), '%p'), formatDateTime(toDateTime('2018-01-02'), '%p');
 SELECT formatDateTime(toDateTime('2018-01-02 11:33:44'), '%p');
@@ -65,8 +67,22 @@ SELECT formatDateTime(toDateTime('2020-01-01 01:00:00', 'US/Samoa'), '%z');
 SELECT formatDateTime(toDateTime('2020-01-01 01:00:00', 'Europe/Moscow'), '%z');
 SELECT formatDateTime(toDateTime('1970-01-01 00:00:00', 'Asia/Kolkata'), '%z');
 
-select formatDateTime(toDateTime64('2010-01-04 12:34:56.123456', 7), '%f');
-select formatDateTime(toDateTime64('2022-12-08 18:11:29.00034', 6, 'UTC'), '%f');
+-- %f (default settings)
+select formatDateTime(toDate('2010-01-04'), '%f') SETTINGS formatdatetime_f_prints_single_zero = 0;
+select formatDateTime(toDate32('2010-01-04'), '%f') SETTINGS formatdatetime_f_prints_single_zero = 0;
+select formatDateTime(toDateTime('2010-01-04 12:34:56'), '%f') SETTINGS formatdatetime_f_prints_single_zero = 0;
+select formatDateTime(toDateTime64('2010-01-04 12:34:56', 0), '%f') SETTINGS formatdatetime_f_prints_single_zero = 0;
+select formatDateTime(toDateTime64('2010-01-04 12:34:56.123', 3), '%f') SETTINGS formatdatetime_f_prints_single_zero = 0;
+select formatDateTime(toDateTime64('2010-01-04 12:34:56.123456', 6), '%f') SETTINGS formatdatetime_f_prints_single_zero = 0;
+select formatDateTime(toDateTime64('2010-01-04 12:34:56.123456789', 9), '%f') SETTINGS formatdatetime_f_prints_single_zero = 0;
+-- %f (legacy settings)
+select formatDateTime(toDate('2010-01-04'), '%f') SETTINGS formatdatetime_f_prints_single_zero = 1;
+select formatDateTime(toDate32('2010-01-04'), '%f') SETTINGS formatdatetime_f_prints_single_zero = 1;
+select formatDateTime(toDateTime('2010-01-04 12:34:56'), '%f') SETTINGS formatdatetime_f_prints_single_zero = 1;
+select formatDateTime(toDateTime64('2010-01-04 12:34:56', 0), '%f') SETTINGS formatdatetime_f_prints_single_zero = 1;
+select formatDateTime(toDateTime64('2010-01-04 12:34:56.123', 3), '%f') SETTINGS formatdatetime_f_prints_single_zero = 1;
+select formatDateTime(toDateTime64('2010-01-04 12:34:56.123456', 6), '%f') SETTINGS formatdatetime_f_prints_single_zero = 0;
+select formatDateTime(toDateTime64('2010-01-04 12:34:56.123456789', 9), '%f') SETTINGS formatdatetime_f_prints_single_zero = 1;
 
 select formatDateTime(toDateTime64('2022-12-08 18:11:29.1234', 9, 'UTC'), '%F %T.%f');
 select formatDateTime(toDateTime64('2022-12-08 18:11:29.1234', 1, 'UTC'), '%F %T.%f');
diff --git a/tests/queries/0_stateless/00719_parallel_ddl_table.sh b/tests/queries/0_stateless/00719_parallel_ddl_table.sh
index 2a542ea21f6..fdc994aec33 100755
--- a/tests/queries/0_stateless/00719_parallel_ddl_table.sh
+++ b/tests/queries/0_stateless/00719_parallel_ddl_table.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00722_inner_join.sql b/tests/queries/0_stateless/00722_inner_join.sql
index eee164ed1e1..0d5a543b99d 100644
--- a/tests/queries/0_stateless/00722_inner_join.sql
+++ b/tests/queries/0_stateless/00722_inner_join.sql
@@ -1,3 +1,7 @@
+-- Tags: no-parallel
+
+SET allow_experimental_analyzer = 1;
+
 DROP TABLE IF EXISTS one;
 CREATE TABLE one(dummy UInt8) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00736_disjunction_optimisation.reference b/tests/queries/0_stateless/00736_disjunction_optimisation.reference
index afd698b425e..84477a64057 100644
--- a/tests/queries/0_stateless/00736_disjunction_optimisation.reference
+++ b/tests/queries/0_stateless/00736_disjunction_optimisation.reference
@@ -25,6 +25,81 @@
 3	21
 3	22
 3	23
+QUERY id: 0
+  PROJECTION COLUMNS
+    k UInt64
+    s UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: k, result_type: UInt64, source_id: 3
+      COLUMN id: 4, column_name: s, result_type: UInt64, source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.bug
+  WHERE
+    FUNCTION id: 5, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          FUNCTION id: 7, function_name: in, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 8, nodes: 2
+                COLUMN id: 9, column_name: k, result_type: UInt64, source_id: 3
+                CONSTANT id: 10, constant_value: Tuple_(UInt64_1, UInt64_2, UInt64_3), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+          FUNCTION id: 11, function_name: in, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 12, nodes: 2
+                COLUMN id: 13, column_name: s, result_type: UInt64, source_id: 3
+                CONSTANT id: 14, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  SETTINGS allow_experimental_analyzer=1
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+QUERY id: 0
+  PROJECTION COLUMNS
+    k UInt64
+    s UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: k, result_type: UInt64, source_id: 3
+      COLUMN id: 4, column_name: s, result_type: UInt64, source_id: 3
+  JOIN TREE
+    QUERY id: 3, is_subquery: 1
+      PROJECTION COLUMNS
+        k UInt64
+        s UInt64
+      PROJECTION
+        LIST id: 5, nodes: 2
+          COLUMN id: 6, column_name: k, result_type: UInt64, source_id: 7
+          COLUMN id: 8, column_name: s, result_type: UInt64, source_id: 7
+      JOIN TREE
+        TABLE id: 7, table_name: default.bug
+      WHERE
+        FUNCTION id: 9, function_name: in, function_type: ordinary, result_type: UInt8
+          ARGUMENTS
+            LIST id: 10, nodes: 2
+              COLUMN id: 11, column_name: k, result_type: UInt64, source_id: 7
+              CONSTANT id: 12, constant_value: Tuple_(UInt64_1, UInt64_2, UInt64_3), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  WHERE
+    FUNCTION id: 13, function_name: in, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          COLUMN id: 15, column_name: s, result_type: UInt64, source_id: 3
+          CONSTANT id: 16, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  SETTINGS allow_experimental_analyzer=1
 1	1	21	1	1	1
 1	1	22	0	1	1
 1	1	23	0	0	1
@@ -34,42 +109,6 @@
 3	1	21	1	1	1
 3	1	22	0	1	1
 3	1	23	0	0	1
-21	1
-22	1
-23	1
-21	1
-22	1
-23	1
-21	1
-22	1
-23	1
-1	21
-1	22
-1	23
-2	21
-2	22
-2	23
-3	21
-3	22
-3	23
-1	21
-1	22
-1	23
-2	21
-2	22
-2	23
-3	21
-3	22
-3	23
-1	21
-1	22
-1	23
-2	21
-2	22
-2	23
-3	21
-3	22
-3	23
 1	1	21	1	1	1
 1	1	22	0	1	1
 1	1	23	0	0	1
@@ -79,6 +118,41 @@
 3	1	21	1	1	1
 3	1	22	0	1	1
 3	1	23	0	0	1
+QUERY id: 0
+  PROJECTION COLUMNS
+    k UInt64
+    or(equals(k, 1), equals(k, 2), equals(k, 3)) UInt8
+    s UInt64
+    equals(s, 21) UInt8
+    or(equals(s, 21), equals(s, 22)) UInt8
+    or(equals(s, 21), equals(s, 22), equals(s, 23)) UInt8
+  PROJECTION
+    LIST id: 1, nodes: 6
+      COLUMN id: 2, column_name: k, result_type: UInt64, source_id: 3
+      FUNCTION id: 4, function_name: in, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 5, nodes: 2
+            COLUMN id: 2, column_name: k, result_type: UInt64, source_id: 3
+            CONSTANT id: 6, constant_value: Tuple_(UInt64_1, UInt64_2, UInt64_3), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+      COLUMN id: 7, column_name: s, result_type: UInt64, source_id: 3
+      FUNCTION id: 8, function_name: equals, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 9, nodes: 2
+            COLUMN id: 7, column_name: s, result_type: UInt64, source_id: 3
+            CONSTANT id: 10, constant_value: UInt64_21, constant_value_type: UInt8
+      FUNCTION id: 11, function_name: in, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 12, nodes: 2
+            COLUMN id: 7, column_name: s, result_type: UInt64, source_id: 3
+            CONSTANT id: 13, constant_value: Tuple_(UInt64_21, UInt64_22), constant_value_type: Tuple(UInt8, UInt8)
+      FUNCTION id: 14, function_name: in, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 15, nodes: 2
+            COLUMN id: 7, column_name: s, result_type: UInt64, source_id: 3
+            CONSTANT id: 16, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  JOIN TREE
+    TABLE id: 3, table_name: default.bug
+  SETTINGS allow_experimental_analyzer=1
 21	1
 22	1
 23	1
@@ -88,3 +162,256 @@
 21	1
 22	1
 23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+QUERY id: 0
+  PROJECTION COLUMNS
+    s UInt64
+    or(equals(s, 21), equals(s, 22), equals(s, 23)) UInt8
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: s, result_type: UInt64, source_id: 3
+      FUNCTION id: 4, function_name: in, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 5, nodes: 2
+            COLUMN id: 2, column_name: s, result_type: UInt64, source_id: 3
+            CONSTANT id: 6, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  JOIN TREE
+    TABLE id: 3, table_name: default.bug
+  SETTINGS allow_experimental_analyzer=1
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+QUERY id: 0
+  PROJECTION COLUMNS
+    k UInt64
+    s UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: k, result_type: UInt64, source_id: 3
+      COLUMN id: 4, column_name: s, result_type: UInt64, source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.bug
+  WHERE
+    FUNCTION id: 5, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          FUNCTION id: 7, function_name: in, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 8, nodes: 2
+                COLUMN id: 9, column_name: k, result_type: UInt64, source_id: 3
+                CONSTANT id: 10, constant_value: Tuple_(UInt64_1, UInt64_2, UInt64_3), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+          FUNCTION id: 11, function_name: in, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 12, nodes: 2
+                COLUMN id: 13, column_name: s, result_type: UInt64, source_id: 3
+                CONSTANT id: 14, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  SETTINGS allow_experimental_analyzer=1
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+QUERY id: 0
+  PROJECTION COLUMNS
+    k UInt64
+    s UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: k, result_type: UInt64, source_id: 3
+      COLUMN id: 4, column_name: s, result_type: UInt64, source_id: 3
+  JOIN TREE
+    QUERY id: 3, is_subquery: 1
+      PROJECTION COLUMNS
+        k UInt64
+        s UInt64
+      PROJECTION
+        LIST id: 5, nodes: 2
+          COLUMN id: 6, column_name: k, result_type: UInt64, source_id: 7
+          COLUMN id: 8, column_name: s, result_type: UInt64, source_id: 7
+      JOIN TREE
+        TABLE id: 7, table_name: default.bug
+      WHERE
+        FUNCTION id: 9, function_name: in, function_type: ordinary, result_type: UInt8
+          ARGUMENTS
+            LIST id: 10, nodes: 2
+              COLUMN id: 11, column_name: k, result_type: UInt64, source_id: 7
+              CONSTANT id: 12, constant_value: Tuple_(UInt64_1, UInt64_2, UInt64_3), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  WHERE
+    FUNCTION id: 13, function_name: in, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          COLUMN id: 15, column_name: s, result_type: UInt64, source_id: 3
+          CONSTANT id: 16, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  SETTINGS allow_experimental_analyzer=1
+1	1	21	1	1	1
+1	1	22	0	1	1
+1	1	23	0	0	1
+2	1	21	1	1	1
+2	1	22	0	1	1
+2	1	23	0	0	1
+3	1	21	1	1	1
+3	1	22	0	1	1
+3	1	23	0	0	1
+1	1	21	1	1	1
+1	1	22	0	1	1
+1	1	23	0	0	1
+2	1	21	1	1	1
+2	1	22	0	1	1
+2	1	23	0	0	1
+3	1	21	1	1	1
+3	1	22	0	1	1
+3	1	23	0	0	1
+QUERY id: 0
+  PROJECTION COLUMNS
+    k UInt64
+    or(equals(k, 1), equals(k, 2), equals(k, 3)) UInt8
+    s UInt64
+    equals(s, 21) UInt8
+    or(equals(s, 21), equals(s, 22)) UInt8
+    or(equals(s, 21), equals(s, 22), equals(s, 23)) UInt8
+  PROJECTION
+    LIST id: 1, nodes: 6
+      COLUMN id: 2, column_name: k, result_type: UInt64, source_id: 3
+      FUNCTION id: 4, function_name: in, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 5, nodes: 2
+            COLUMN id: 2, column_name: k, result_type: UInt64, source_id: 3
+            CONSTANT id: 6, constant_value: Tuple_(UInt64_1, UInt64_2, UInt64_3), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+      COLUMN id: 7, column_name: s, result_type: UInt64, source_id: 3
+      FUNCTION id: 8, function_name: equals, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 9, nodes: 2
+            COLUMN id: 7, column_name: s, result_type: UInt64, source_id: 3
+            CONSTANT id: 10, constant_value: UInt64_21, constant_value_type: UInt8
+      FUNCTION id: 11, function_name: or, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 12, nodes: 2
+            FUNCTION id: 13, function_name: equals, function_type: ordinary, result_type: UInt8
+              ARGUMENTS
+                LIST id: 14, nodes: 2
+                  COLUMN id: 7, column_name: s, result_type: UInt64, source_id: 3
+                  CONSTANT id: 15, constant_value: UInt64_21, constant_value_type: UInt8
+            FUNCTION id: 16, function_name: equals, function_type: ordinary, result_type: UInt8
+              ARGUMENTS
+                LIST id: 17, nodes: 2
+                  COLUMN id: 7, column_name: s, result_type: UInt64, source_id: 3
+                  CONSTANT id: 18, constant_value: UInt64_22, constant_value_type: UInt8
+      FUNCTION id: 19, function_name: in, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 20, nodes: 2
+            COLUMN id: 7, column_name: s, result_type: UInt64, source_id: 3
+            CONSTANT id: 21, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  JOIN TREE
+    TABLE id: 3, table_name: default.bug
+  SETTINGS allow_experimental_analyzer=1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+QUERY id: 0
+  PROJECTION COLUMNS
+    s UInt64
+    or(equals(s, 21), equals(s, 22), equals(s, 23)) UInt8
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: s, result_type: UInt64, source_id: 3
+      FUNCTION id: 4, function_name: in, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 5, nodes: 2
+            COLUMN id: 2, column_name: s, result_type: UInt64, source_id: 3
+            CONSTANT id: 6, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  JOIN TREE
+    TABLE id: 3, table_name: default.bug
+  SETTINGS allow_experimental_analyzer=1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+QUERY id: 0
+  PROJECTION COLUMNS
+    s UInt64
+    or(equals(s, 21), equals(22, s), equals(23, s)) UInt8
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: s, result_type: UInt64, source_id: 3
+      FUNCTION id: 4, function_name: in, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 5, nodes: 2
+            COLUMN id: 2, column_name: s, result_type: UInt64, source_id: 3
+            CONSTANT id: 6, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+  JOIN TREE
+    TABLE id: 3, table_name: default.bug
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/00736_disjunction_optimisation.sql b/tests/queries/0_stateless/00736_disjunction_optimisation.sql
index 700221ef7f0..e5bfc81f7ae 100644
--- a/tests/queries/0_stateless/00736_disjunction_optimisation.sql
+++ b/tests/queries/0_stateless/00736_disjunction_optimisation.sql
@@ -5,17 +5,45 @@ insert into bug values(1,21),(1,22),(1,23),(2,21),(2,22),(2,23),(3,21),(3,22),(3
 set optimize_min_equality_disjunction_chain_length = 2;
 
 select * from bug;
+
 select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23);
+select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;
+explain query tree select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
+
 select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23);
+select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
+
 select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug;
+select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+
 select s, (s=21 or s=22 or s=23) from bug;
+select s, (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select s, (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
 
 set optimize_min_equality_disjunction_chain_length = 3;
 
 select * from bug;
+
 select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23);
+select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;
+explain query tree select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
+
 select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23);
+select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
+
 select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug;
+select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+
 select s, (s=21 or s=22 or s=23) from bug;
+select s, (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select s, (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+
+select s, (s=21 or 22=s or 23=s) from bug;
+select s, (s=21 or 22=s or 23=s) from bug SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select s, (s=21 or 22=s or 23=s) from bug SETTINGS allow_experimental_analyzer = 1;;
 
 DROP TABLE bug;
diff --git a/tests/queries/0_stateless/00740_database_in_nested_view.sql b/tests/queries/0_stateless/00740_database_in_nested_view.sql
index 1890baafaa1..e2debe2859b 100644
--- a/tests/queries/0_stateless/00740_database_in_nested_view.sql
+++ b/tests/queries/0_stateless/00740_database_in_nested_view.sql
@@ -1,5 +1,6 @@
 -- Tags: no-parallel
 
+DROP DATABASE IF EXISTS test_00740;
 CREATE DATABASE test_00740;
 USE test_00740;
 
diff --git a/tests/queries/0_stateless/00741_client_comment_multiline.sql b/tests/queries/0_stateless/00741_client_comment_multiline.sql
index 9fe4a4cb4ba..ebe9a19274c 100644
--- a/tests/queries/0_stateless/00741_client_comment_multiline.sql
+++ b/tests/queries/0_stateless/00741_client_comment_multiline.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel, no-fasttest
+-- Tags: no-fasttest
 
 CREATE DATABASE IF NOT EXISTS test_00741; -- foo
 DROP DATABASE test_00741;
diff --git a/tests/queries/0_stateless/00744_join_not_found_column.sql b/tests/queries/0_stateless/00744_join_not_found_column.sql
index a271347dcd9..72969e7937d 100644
--- a/tests/queries/0_stateless/00744_join_not_found_column.sql
+++ b/tests/queries/0_stateless/00744_join_not_found_column.sql
@@ -1,3 +1,5 @@
+SET joined_subquery_requires_alias = 0;
+
 DROP TEMPORARY TABLE IF EXISTS test_00744;
 CREATE TEMPORARY TABLE test_00744
 (
@@ -11,27 +13,33 @@ FROM
 (
     SELECT
         x,
-        1
-    FROM test_00744
+        `1`
+    FROM
+    (
+        SELECT x, 1 FROM test_00744
+    )
     ALL INNER JOIN
     (
         SELECT
             count(),
             1
         FROM test_00744
-    ) jss2 USING (1)
+    ) jss2 USING (`1`)
     LIMIT 10
 );
 
 SELECT
     x,
-    1
-FROM test_00744
+    `1`
+FROM
+(
+    SELECT x, 1 FROM test_00744
+)
 ALL INNER JOIN
 (
     SELECT
         count(),
         1
     FROM test_00744
-) js2 USING (1)
+) js2 USING (`1`)
 LIMIT 10;
diff --git a/tests/queries/0_stateless/00746_hashing_tuples.reference b/tests/queries/0_stateless/00746_hashing_tuples.reference
index 71d45be5a54..e3b896f6077 100644
--- a/tests/queries/0_stateless/00746_hashing_tuples.reference
+++ b/tests/queries/0_stateless/00746_hashing_tuples.reference
@@ -1,11 +1,11 @@
 12940785793559895259
 17926972817233444501
 7456555839952096623
-CC45107CC4B79F62D831BEF2103C7CBF
-DF2EC2F0669B000EDFF6ADEE264E7D68
-4CD1C30C38AB935D418B5269EF197B9E
-9D78134EE48654D753CCA1B76185CF8E
-389D16428D2AADEC9713905572F42864
+1
+1
+1
+1
+1
 955237314186186656
 8175794665478042155
 9325786087413524176
@@ -18,8 +18,8 @@ DF2EC2F0669B000EDFF6ADEE264E7D68
 8163029322371165472
 8788309436660676487
 236561483980029756
-8DD5527CC43D76F4760D26BE0F641F7E
-F8F7AD9B6CD4CF117A71E277E2EC2931
+1
+1
 12384823029245979431
 4507350192761038840
 1188926775431157506
diff --git a/tests/queries/0_stateless/00746_hashing_tuples.sql b/tests/queries/0_stateless/00746_hashing_tuples.sql
index 466a2184c65..f17ad6fa77f 100644
--- a/tests/queries/0_stateless/00746_hashing_tuples.sql
+++ b/tests/queries/0_stateless/00746_hashing_tuples.sql
@@ -4,11 +4,11 @@ SELECT sipHash64(1, 2, 3);
 SELECT sipHash64(1, 3, 2);
 SELECT sipHash64(('a', [1, 2, 3], 4, (4, ['foo', 'bar'], 1, (1, 2))));
 
-SELECT hex(sipHash128('foo'));
-SELECT hex(sipHash128('\x01'));
-SELECT hex(sipHash128('foo', 'foo'));
-SELECT hex(sipHash128('foo', 'foo', 'foo'));
-SELECT hex(sipHash128(1, 2, 3));
+SELECT hex(sipHash128('foo')) = hex(reverse(unhex('CC45107CC4B79F62D831BEF2103C7CBF'))) or hex(sipHash128('foo')) = 'CC45107CC4B79F62D831BEF2103C7CBF';
+SELECT hex(sipHash128('\x01')) = hex(reverse(unhex('DF2EC2F0669B000EDFF6ADEE264E7D68'))) or hex(sipHash128('\x01')) = 'DF2EC2F0669B000EDFF6ADEE264E7D68';
+SELECT hex(sipHash128('foo', 'foo')) = hex(reverse(unhex('4CD1C30C38AB935D418B5269EF197B9E'))) or hex(sipHash128('foo', 'foo')) = '4CD1C30C38AB935D418B5269EF197B9E';
+SELECT hex(sipHash128('foo', 'foo', 'foo')) = hex(reverse(unhex('9D78134EE48654D753CCA1B76185CF8E'))) or hex(sipHash128('foo', 'foo', 'foo')) = '9D78134EE48654D753CCA1B76185CF8E';
+SELECT hex(sipHash128(1, 2, 3)) = hex(reverse(unhex('389D16428D2AADEC9713905572F42864'))) or hex(sipHash128(1, 2, 3)) = '389D16428D2AADEC9713905572F42864';
 
 SELECT halfMD5(1, 2, 3);
 SELECT halfMD5(1, 3, 2);
@@ -26,8 +26,8 @@ SELECT murmurHash3_64(1, 2, 3);
 SELECT murmurHash3_64(1, 3, 2);
 SELECT murmurHash3_64(('a', [1, 2, 3], 4, (4, ['foo', 'bar'], 1, (1, 2))));
 
-SELECT hex(murmurHash3_128('foo', 'foo'));
-SELECT hex(murmurHash3_128('foo', 'foo', 'foo'));
+SELECT hex(murmurHash3_128('foo', 'foo')) = hex(reverse(unhex('8DD5527CC43D76F4760D26BE0F641F7E'))) or hex(murmurHash3_128('foo', 'foo')) = '8DD5527CC43D76F4760D26BE0F641F7E';
+SELECT hex(murmurHash3_128('foo', 'foo', 'foo')) = hex(reverse(unhex('F8F7AD9B6CD4CF117A71E277E2EC2931'))) or hex(murmurHash3_128('foo', 'foo', 'foo')) = 'F8F7AD9B6CD4CF117A71E277E2EC2931';
 
 SELECT gccMurmurHash(1, 2, 3);
 SELECT gccMurmurHash(1, 3, 2);
diff --git a/tests/queries/0_stateless/00746_sql_fuzzy.sh b/tests/queries/0_stateless/00746_sql_fuzzy.sh
index b534b1820ba..c0741beea12 100755
--- a/tests/queries/0_stateless/00746_sql_fuzzy.sh
+++ b/tests/queries/0_stateless/00746_sql_fuzzy.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00753_alter_attach.sql b/tests/queries/0_stateless/00753_alter_attach.sql
index 9fa4f92c2c1..299d0dd995f 100644
--- a/tests/queries/0_stateless/00753_alter_attach.sql
+++ b/tests/queries/0_stateless/00753_alter_attach.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 DROP TABLE IF EXISTS alter_attach;
 CREATE TABLE alter_attach (x UInt64, p UInt8) ENGINE = MergeTree ORDER BY tuple() PARTITION BY p;
 INSERT INTO alter_attach VALUES (1, 1), (2, 1), (3, 1);
diff --git a/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql b/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
index d7b154bc6ac..4aa7ab8ad64 100644
--- a/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
+++ b/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 -- check ALTER MODIFY COLUMN with partitions
 
 SET send_logs_level = 'fatal';
diff --git a/tests/queries/0_stateless/00754_alter_modify_order_by.sql b/tests/queries/0_stateless/00754_alter_modify_order_by.sql
index 234bd61902b..9c7eee74c8c 100644
--- a/tests/queries/0_stateless/00754_alter_modify_order_by.sql
+++ b/tests/queries/0_stateless/00754_alter_modify_order_by.sql
@@ -1,6 +1,12 @@
 SET send_logs_level = 'fatal';
 SET optimize_on_insert = 0;
 
+DROP TABLE IF EXISTS no_order;
+CREATE TABLE no_order(a UInt32, b UInt32) ENGINE = MergeTree ORDER BY tuple();
+ALTER TABLE no_order MODIFY ORDER BY (a); -- { serverError 36}
+
+DROP TABLE no_order;
+
 DROP TABLE IF EXISTS old_style;
 set allow_deprecated_syntax_for_merge_tree=1;
 CREATE TABLE old_style(d Date, x UInt32) ENGINE MergeTree(d, x, 8192);
diff --git a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
index 9ff759a034c..7e2384cfc52 100755
--- a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
+++ b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-parallel
+# Tags: long
 
 set -e
 
diff --git a/tests/queries/0_stateless/00765_sql_compatibility_aliases.reference b/tests/queries/0_stateless/00765_sql_compatibility_aliases.reference
index 6a2a0523476..285b9a62d20 100644
--- a/tests/queries/0_stateless/00765_sql_compatibility_aliases.reference
+++ b/tests/queries/0_stateless/00765_sql_compatibility_aliases.reference
@@ -3,6 +3,7 @@ FOO
 foo
 FOO
 baz
+zzz
 2
 fo
 oo
diff --git a/tests/queries/0_stateless/00765_sql_compatibility_aliases.sql b/tests/queries/0_stateless/00765_sql_compatibility_aliases.sql
index 4e16768b373..da0eb9bea6d 100644
--- a/tests/queries/0_stateless/00765_sql_compatibility_aliases.sql
+++ b/tests/queries/0_stateless/00765_sql_compatibility_aliases.sql
@@ -5,6 +5,7 @@ select ucase('foo');
 select LOWER('Foo');
 select UPPER('Foo');
 select REPLACE('bar', 'r', 'z');
+select REGEXP_REPLACE('bar', '.', 'z');
 select Locate('foo', 'o');
 select SUBSTRING('foo', 1, 2);
 select Substr('foo', 2);
diff --git a/tests/queries/0_stateless/00800_low_cardinality_join.sql b/tests/queries/0_stateless/00800_low_cardinality_join.sql
index 30fb40a56e9..9c1fd9b7ad3 100644
--- a/tests/queries/0_stateless/00800_low_cardinality_join.sql
+++ b/tests/queries/0_stateless/00800_low_cardinality_join.sql
@@ -1,3 +1,4 @@
+set allow_experimental_analyzer = 1;
 set joined_subquery_requires_alias = 0;
 
 select * from (select dummy as val from system.one) any left join (select dummy as val from system.one) using val;
@@ -10,7 +11,7 @@ select * from (select toLowCardinality(toNullable(dummy)) as val from system.one
 select * from (select toLowCardinality(dummy) as val from system.one) any left join (select toLowCardinality(toNullable(dummy)) as val from system.one) using val;
 select * from (select toLowCardinality(toNullable(dummy)) as val from system.one) any left join (select toLowCardinality(toNullable(dummy)) as val from system.one) using val;
 select '-';
-select * from (select dummy as val from system.one) any left join (select dummy as val from system.one) on val + 0 = val * 1; -- { serverError 352 }
+select * from (select dummy as val from system.one) any left join (select dummy as val from system.one) on val + 0 = val * 1; -- { serverError 403 }
 select * from (select dummy as val from system.one) any left join (select dummy as rval from system.one) on val + 0 = rval * 1;
 select * from (select toLowCardinality(dummy) as val from system.one) any left join (select dummy as rval from system.one) on val + 0 = rval * 1;
 select * from (select dummy as val from system.one) any left join (select toLowCardinality(dummy) as rval from system.one) on val + 0 = rval * 1;
diff --git a/tests/queries/0_stateless/00800_low_cardinality_merge_join.sql.j2 b/tests/queries/0_stateless/00800_low_cardinality_merge_join.sql.j2
index 8b7856b7738..8e2037480c7 100644
--- a/tests/queries/0_stateless/00800_low_cardinality_merge_join.sql.j2
+++ b/tests/queries/0_stateless/00800_low_cardinality_merge_join.sql.j2
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 {% for join_algorithm in ['partial_merge', 'full_sorting_merge', 'grace_hash'] -%}
 
 SET join_algorithm = '{{ join_algorithm }}';
@@ -12,7 +14,7 @@ SELECT * FROM (SELECT toLowCardinality(toNullable(dummy)) AS val FROM system.one
 SELECT * FROM (SELECT toLowCardinality(dummy) AS val FROM system.one) s1 ANY LEFT JOIN (SELECT toLowCardinality(toNullable(dummy)) AS val FROM system.one) s2 USING val ORDER BY val;
 SELECT * FROM (SELECT toLowCardinality(toNullable(dummy)) AS val FROM system.one) s1 ANY LEFT JOIN (SELECT toLowCardinality(toNullable(dummy)) AS val FROM system.one) s2 USING val ORDER BY val;
 SELECT '-';
-SELECT * FROM (SELECT dummy AS val FROM system.one) s1 ANY LEFT JOIN (SELECT dummy AS val FROM system.one) s2 ON val + 0 = val * 1 ORDER BY val; -- { serverError 352 }
+SELECT * FROM (SELECT dummy AS val FROM system.one) s1 ANY LEFT JOIN (SELECT dummy AS val FROM system.one) s2 ON val + 0 = val * 1 ORDER BY val; -- { serverError 403 }
 SELECT * FROM (SELECT dummy AS val FROM system.one) s1 ANY LEFT JOIN (SELECT dummy AS rval FROM system.one) s2 ON val + 0 = rval * 1 ORDER BY val;
 SELECT * FROM (SELECT toLowCardinality(dummy) AS val FROM system.one) s1 ANY LEFT JOIN (SELECT dummy AS rval FROM system.one) s2 ON val + 0 = rval * 1 ORDER BY val;
 SELECT * FROM (SELECT dummy AS val FROM system.one) s1 ANY LEFT JOIN (SELECT toLowCardinality(dummy) AS rval FROM system.one) s2 ON val + 0 = rval * 1 ORDER BY val;
diff --git a/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql b/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
index 1c83d2ae36d..85e5f8b63ad 100644
--- a/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
+++ b/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS alter_compression_codec;
diff --git a/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql b/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
index 593d349caf9..c080c2fc98e 100644
--- a/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
+++ b/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
diff --git a/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql b/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
index 9331e39f8d7..fba6a216762 100644
--- a/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
+++ b/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
diff --git a/tests/queries/0_stateless/00804_test_delta_codec_compression.sql b/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
index 4afd8e6d860..25988f6474b 100644
--- a/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
+++ b/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel, no-random-merge-tree-settings
+-- Tags: no-random-merge-tree-settings
 
 SET send_logs_level = 'fatal';
 SET joined_subquery_requires_alias = 0;
diff --git a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
index 19d9b006cd7..71acc11b971 100755
--- a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
+++ b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
@@ -59,7 +59,7 @@ timeout $TIMEOUT bash -c thread4 2> /dev/null &
 
 wait
 
-echo "DROP TABLE concurrent_alter_column NO DELAY" | ${CLICKHOUSE_CLIENT}   # NO DELAY has effect only for Atomic database
+echo "DROP TABLE concurrent_alter_column SYNC" | ${CLICKHOUSE_CLIENT}   # SYNC has effect only for Atomic database
 
 # Wait for alters and check for deadlocks (in case of deadlock this loop will not finish)
 while true; do
diff --git a/tests/queries/0_stateless/00818_alias_bug_4110.reference b/tests/queries/0_stateless/00818_alias_bug_4110.reference
index 210fc67db66..e6013d269c2 100644
--- a/tests/queries/0_stateless/00818_alias_bug_4110.reference
+++ b/tests/queries/0_stateless/00818_alias_bug_4110.reference
@@ -4,6 +4,7 @@
 11	12
 12	11
 10	10
+10	11	11
 12	11
 10	12
 11	12
diff --git a/tests/queries/0_stateless/00818_alias_bug_4110.sql b/tests/queries/0_stateless/00818_alias_bug_4110.sql
index df7e70cb275..9f3657221e4 100644
--- a/tests/queries/0_stateless/00818_alias_bug_4110.sql
+++ b/tests/queries/0_stateless/00818_alias_bug_4110.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 select s.a as a, s.a + 1 as b from (select 10 as a) s;
 select s.a + 1 as a, s.a as b from (select 10 as a) s;
 select s.a + 1 as a, s.a + 1 as b from (select 10 as a) s;
@@ -5,15 +7,15 @@ select s.a + 1 as b, s.a + 2 as a from (select 10 as a) s;
 select s.a + 2 as b, s.a + 1 as a from (select 10 as a) s;
 
 select a, a as a from (select 10 as a);
-select s.a, a, a + 1 as a from (select 10 as a) as s; -- { serverError 352 }
+select s.a, a, a + 1 as a from (select 10 as a) as s;
 select s.a + 2 as b, b - 1 as a from (select 10 as a) s;
 select s.a as a, s.a + 2 as b from (select 10 as a) s;
 select s.a + 1 as a, s.a + 2 as b from (select 10 as a) s;
 select a + 1 as a, a + 1 as b from (select 10 as a);
 select a + 1 as b, b + 1 as a from (select 10 as a); -- { serverError 174 }
-select 10 as a, a + 1 as a; -- { serverError 179 }
-with 10 as a select a as a; -- { serverError 179 }
-with 10 as a select a + 1 as a; -- { serverError 179 }
+select 10 as a, a + 1 as a; -- { serverError 47 }
+with 10 as a select a as a; -- { serverError 47 }
+with 10 as a select a + 1 as a; -- { serverError 47 }
 
 SELECT 0 as t FROM (SELECT 1 as t) as inn WHERE inn.t = 1;
 SELECT sum(value) as value FROM (SELECT 1 as value) as data WHERE data.value > 0;
diff --git a/tests/queries/0_stateless/00818_inner_join_bug_3567.reference b/tests/queries/0_stateless/00818_inner_join_bug_3567.reference
index 173e53ebc34..41e0d8ea43a 100644
--- a/tests/queries/0_stateless/00818_inner_join_bug_3567.reference
+++ b/tests/queries/0_stateless/00818_inner_join_bug_3567.reference
@@ -3,17 +3,17 @@
 │ b │ 2018-01-01 │
 │ c │ 2018-01-01 │
 └───┴────────────┘
-┌─c─┬─a─┬──────────d─┬─a─┬──────────b─┐
-│ B │ b │ 2018-01-01 │ B │ 2018-01-01 │
-│ C │ c │ 2018-01-01 │ C │ 2018-01-01 │
-│ D │ d │ 2018-01-01 │ D │ 2018-01-01 │
-└───┴───┴────────────┴───┴────────────┘
-┌─a─┬──────────b─┬─c─┬──────────d─┐
-│ a │ 2018-01-01 │   │ 1970-01-01 │
-│ b │ 2018-01-01 │ B │ 2018-01-01 │
-│ c │ 2018-01-01 │ C │ 2018-01-01 │
-└───┴────────────┴───┴────────────┘
-┌─a─┬──────────b─┬─c─┬──────────d─┐
-│ b │ 2018-01-01 │ B │ 2018-01-01 │
-│ c │ 2018-01-01 │ C │ 2018-01-01 │
-└───┴────────────┴───┴────────────┘
+┌─c─┬─table2.a─┬──────────d─┬─a─┬──────────b─┐
+│ B │ b        │ 2018-01-01 │ B │ 2018-01-01 │
+│ C │ c        │ 2018-01-01 │ C │ 2018-01-01 │
+│ D │ d        │ 2018-01-01 │ D │ 2018-01-01 │
+└───┴──────────┴────────────┴───┴────────────┘
+┌─a─┬──────────b─┬─c─┬──────────d─┬─c─┐
+│ a │ 2018-01-01 │   │ 1970-01-01 │   │
+│ b │ 2018-01-01 │ B │ 2018-01-01 │ B │
+│ c │ 2018-01-01 │ C │ 2018-01-01 │ C │
+└───┴────────────┴───┴────────────┴───┘
+┌─a─┬──────────b─┬─c─┬──────────d─┬─c─┐
+│ b │ 2018-01-01 │ B │ 2018-01-01 │ B │
+│ c │ 2018-01-01 │ C │ 2018-01-01 │ C │
+└───┴────────────┴───┴────────────┴───┘
diff --git a/tests/queries/0_stateless/00818_inner_join_bug_3567.sql b/tests/queries/0_stateless/00818_inner_join_bug_3567.sql
index 1c851d40f47..cc0b63f9def 100644
--- a/tests/queries/0_stateless/00818_inner_join_bug_3567.sql
+++ b/tests/queries/0_stateless/00818_inner_join_bug_3567.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 DROP TABLE IF EXISTS table1;
 DROP TABLE IF EXISTS table2;
 
diff --git a/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.reference b/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.reference
index afbe9855519..b6d689e3e74 100644
--- a/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.reference
+++ b/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.reference
@@ -1,11 +1,11 @@
-1	x	x
-1	x	x
-1	x	x
-1	x	x
-1	x	x
-1	x	x
-1	x	x
-1	x	x
-1	x	x
-1	x	x
-1	x	x
+1	x	y
+1	x	y
+1	x	y
+1	x	y
+1	x	y
+1	x	y
+1	x	y
+1	x	y
+1	x	y
+1	x	y
+1	x	y
diff --git a/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.sql b/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.sql
index 14a7424e634..cdb9e57d17f 100644
--- a/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.sql
+++ b/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.sql
@@ -1,5 +1,6 @@
 SET any_join_distinct_right_table_keys = 1;
 SET joined_subquery_requires_alias = 0;
+SET allow_experimental_analyzer = 1;
 
 SELECT * FROM (SELECT 1 AS a, 'x' AS b) join (SELECT 1 as a, 'y' as b) using a;
 SELECT * FROM (SELECT 1 AS a, 'x' AS b) left join (SELECT 1 as a, 'y' as b) using a;
diff --git a/tests/queries/0_stateless/00820_multiple_joins.reference b/tests/queries/0_stateless/00820_multiple_joins.reference
index f9d9a664784..3d7054bacfc 100644
--- a/tests/queries/0_stateless/00820_multiple_joins.reference
+++ b/tests/queries/0_stateless/00820_multiple_joins.reference
@@ -32,13 +32,13 @@
 6	6	60	60
 12	12	120	120
 18	18	180	180
-┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬─t3.c─┐
+┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬────c─┐
 │    0 │    0 │    0 │    0 │    0 │
 │    6 │    6 │   60 │   60 │  600 │
 │   12 │   12 │  120 │  120 │ 1200 │
 │   18 │   18 │  180 │  180 │ 1800 │
 └──────┴──────┴──────┴──────┴──────┘
-┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬─t3.c─┐
+┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬────c─┐
 │    0 │    0 │    0 │    0 │    0 │
 │    6 │    6 │   60 │   60 │  600 │
 │   12 │   12 │  120 │  120 │ 1200 │
diff --git a/tests/queries/0_stateless/00820_multiple_joins.sql b/tests/queries/0_stateless/00820_multiple_joins.sql
index af13e6f1d8b..5c7a7bebb0b 100644
--- a/tests/queries/0_stateless/00820_multiple_joins.sql
+++ b/tests/queries/0_stateless/00820_multiple_joins.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 DROP TABLE IF EXISTS table1;
 DROP TABLE IF EXISTS table2;
 DROP TABLE IF EXISTS table3;
diff --git a/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.reference b/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.reference
index 6d317230813..11755d6bc8b 100644
--- a/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.reference
+++ b/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.reference
@@ -32,13 +32,13 @@
 6	6	60	60
 12	12	120	120
 18	18	180	180
-┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬─t3.c─┐
+┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬────c─┐
 │    0 │    0 │    0 │    0 │    0 │
 │    6 │    6 │   60 │   60 │  600 │
 │   12 │   12 │  120 │  120 │ 1200 │
 │   18 │   18 │  180 │  180 │ 1800 │
 └──────┴──────┴──────┴──────┴──────┘
-┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬─t3.c─┐
+┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬────c─┐
 │    0 │    0 │    0 │    0 │    0 │
 │    6 │    6 │   60 │   60 │  600 │
 │   12 │   12 │  120 │  120 │ 1200 │
diff --git a/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.sql b/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.sql
index 612e75e6d4d..3da2cad4eff 100644
--- a/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.sql
+++ b/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 DROP TABLE IF EXISTS table1;
 DROP TABLE IF EXISTS table2;
 DROP TABLE IF EXISTS table3;
diff --git a/tests/queries/0_stateless/00834_hints_for_type_function_typos.sh b/tests/queries/0_stateless/00834_hints_for_type_function_typos.sh
index 41a35d908d1..b013993059f 100755
--- a/tests/queries/0_stateless/00834_hints_for_type_function_typos.sh
+++ b/tests/queries/0_stateless/00834_hints_for_type_function_typos.sh
@@ -10,7 +10,7 @@ $CLICKHOUSE_CLIENT -q "select c23ount(*) from system.functions;" 2>&1 | grep "Ma
 $CLICKHOUSE_CLIENT -q "select cunt(*) from system.functions;" 2>&1 | grep "Maybe you meant: \['count'" &>/dev/null;
 $CLICKHOUSE_CLIENT -q "select positin(*) from system.functions;" 2>&1 | grep "Maybe you meant: \['position'" &>/dev/null;
 $CLICKHOUSE_CLIENT -q "select POSITIO(*) from system.functions;" 2>&1 | grep "Maybe you meant: \['position'" &>/dev/null;
-$CLICKHOUSE_CLIENT -q "select fount(*) from system.functions;" 2>&1 | grep "Maybe you meant: \['count'" | grep "Maybe you meant: \['round'" | grep "Or unknown aggregate function" &>/dev/null;
+$CLICKHOUSE_CLIENT -q "select fount(*) from system.functions;" 2>&1 | grep "Maybe you meant: \['count'" &>/dev/null;
 $CLICKHOUSE_CLIENT -q "select positin(*) from system.functions;" 2>&1 | grep -v "Or unknown aggregate function" &>/dev/null;
 $CLICKHOUSE_CLIENT -q "select pov(*) from system.functions;" 2>&1 | grep "Maybe you meant: \['pow'\]" &>/dev/null;
 $CLICKHOUSE_CLIENT -q "select getColumnStructure('abc');" 2>&1 | grep "Maybe you meant: \['dumpColumnStructure'\]" &>/dev/null;
diff --git a/tests/queries/0_stateless/00834_kill_mutation.sh b/tests/queries/0_stateless/00834_kill_mutation.sh
index 623016dfcfb..46b10ccbff4 100755
--- a/tests/queries/0_stateless/00834_kill_mutation.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-debug, no-parallel
+# Tags: no-debug
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
index caad08dcb9d..6797e9cac12 100755
--- a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: replica, no-debug, no-parallel
+# Tags: replica, no-debug
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00834_limit_with_constant_expressions.sql b/tests/queries/0_stateless/00834_limit_with_constant_expressions.sql
index 12104145237..54486634130 100644
--- a/tests/queries/0_stateless/00834_limit_with_constant_expressions.sql
+++ b/tests/queries/0_stateless/00834_limit_with_constant_expressions.sql
@@ -9,7 +9,7 @@ SELECT number FROM numbers(10) LIMIT now(); -- { serverError 440 }
 SELECT number FROM numbers(10) LIMIT today(); -- { serverError 440 }
 SELECT number FROM numbers(10) LIMIT toUInt8('1');
 SELECT number FROM numbers(10) LIMIT toFloat32('1');
-SELECT number FROM numbers(10) LIMIT rand(); -- { serverError 36 }
+SELECT number FROM numbers(10) LIMIT rand(); -- { serverError 36, 440 }
 
 SELECT count() <= 1 FROM (SELECT number FROM numbers(10) LIMIT randConstant() % 2);
 
diff --git a/tests/queries/0_stateless/00835_if_generic_case.reference b/tests/queries/0_stateless/00835_if_generic_case.reference
index 45ee4651e17..84c036b17ca 100644
--- a/tests/queries/0_stateless/00835_if_generic_case.reference
+++ b/tests/queries/0_stateless/00835_if_generic_case.reference
@@ -2,7 +2,7 @@
 2000-01-01 00:00:00	2000-01-02	2000-01-02 00:00:00
 2000-01-01 00:00:00	2000-01-02	2000-01-02 00:00:00
 2000-01-01 00:00:00	2000-01-02	2000-01-02 00:00:00
-2000-01-01 00:00:00	2000-01-02	2000-01-02
+2000-01-01 00:00:00	2000-01-02	2000-01-02 00:00:00
 2000-01-01 00:00:00	2000-01-02	2000-01-02
 2000-01-01 00:00:00	2000-01-02	2000-01-02
 2000-01-01 00:00:00	2000-01-02	2000-01-02
diff --git a/tests/queries/0_stateless/00835_if_generic_case.sql b/tests/queries/0_stateless/00835_if_generic_case.sql
index 63baffcf17d..3d7f128f4c1 100644
--- a/tests/queries/0_stateless/00835_if_generic_case.sql
+++ b/tests/queries/0_stateless/00835_if_generic_case.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 SELECT toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul') AS x, toDate('2000-01-02') AS y, x > y ? x : y AS z;
 SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul')) AS x, toDate('2000-01-02') AS y, x > y ? x : y AS z;
 SELECT toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul') AS x, materialize(toDate('2000-01-02')) AS y, x > y ? x : y AS z;
diff --git a/tests/queries/0_stateless/00848_join_use_nulls_segfault.reference b/tests/queries/0_stateless/00848_join_use_nulls_segfault.reference
index 6bfe0db1448..43f48089b06 100644
--- a/tests/queries/0_stateless/00848_join_use_nulls_segfault.reference
+++ b/tests/queries/0_stateless/00848_join_use_nulls_segfault.reference
@@ -10,13 +10,13 @@ l	\N	\N	String	Nullable(String)
 \N	\N
 \N	\N
 using
-l	\N	String	Nullable(String)
-	\N	String	Nullable(String)
-l	\N	String	Nullable(String)
+l	\N	Nullable(String)	Nullable(String)
+l	\N	Nullable(String)	Nullable(String)
+\N	\N	Nullable(String)	Nullable(String)
+\N	\N	Nullable(String)	Nullable(String)
+l	\N	Nullable(String)	Nullable(String)
+l	\N	Nullable(String)	Nullable(String)
 \N	\N	Nullable(String)	Nullable(String)
-l	\N	String	Nullable(String)
-	\N	String	Nullable(String)
-l	\N	String	Nullable(String)
 \N	\N	Nullable(String)	Nullable(String)
 \N	\N
 \N	\N
@@ -32,13 +32,13 @@ l	\N	\N	Nullable(String)	Nullable(String)
 \N	\N
 \N	\N
 using + join_use_nulls
-l	\N	String	Nullable(String)
 l	\N	Nullable(String)	Nullable(String)
-\N	\N	Nullable(String)	Nullable(String)
-\N	\N	Nullable(String)	Nullable(String)
-l	\N	String	Nullable(String)
 l	\N	Nullable(String)	Nullable(String)
-\N	\N	Nullable(String)	Nullable(String)
-\N	\N	Nullable(String)	Nullable(String)
+r	\N	Nullable(String)	Nullable(String)
+r	\N	Nullable(String)	Nullable(String)
+l	\N	Nullable(String)	Nullable(String)
+l	\N	Nullable(String)	Nullable(String)
+r	\N	Nullable(String)	Nullable(String)
+r	\N	Nullable(String)	Nullable(String)
 \N	\N
 \N	\N
diff --git a/tests/queries/0_stateless/00848_join_use_nulls_segfault.sql b/tests/queries/0_stateless/00848_join_use_nulls_segfault.sql
index 57eca0eb9e0..2f6cca0284c 100644
--- a/tests/queries/0_stateless/00848_join_use_nulls_segfault.sql
+++ b/tests/queries/0_stateless/00848_join_use_nulls_segfault.sql
@@ -1,4 +1,5 @@
 SET any_join_distinct_right_table_keys = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS t1_00848;
 DROP TABLE IF EXISTS t2_00848;
@@ -53,16 +54,16 @@ SELECT t3.id = 'l', t3.not_id = 'l' FROM t1_00848 t1 LEFT JOIN t3_00848 t3 ON t1
 
 SELECT 'using + join_use_nulls';
 
-SELECT *, toTypeName(t1.id), toTypeName(t3.id) FROM t1_00848 t1 ANY LEFT JOIN t3_00848 t3 USING(id) ORDER BY t1.id, t3.id;
-SELECT *, toTypeName(t1.id), toTypeName(t3.id) FROM t1_00848 t1 ANY FULL JOIN t3_00848 t3 USING(id) ORDER BY t1.id, t3.id;
-SELECT *, toTypeName(t2.id), toTypeName(t3.id) FROM t2_00848 t2 ANY FULL JOIN t3_00848 t3 USING(id) ORDER BY t2.id, t3.id;
+SELECT *, toTypeName(t1.id), toTypeName(t3.id) FROM t1_00848 t1 ANY LEFT JOIN t3_00848 t3 USING(id) ORDER BY id;
+SELECT *, toTypeName(t1.id), toTypeName(t3.id) FROM t1_00848 t1 ANY FULL JOIN t3_00848 t3 USING(id) ORDER BY id;
+SELECT *, toTypeName(t2.id), toTypeName(t3.id) FROM t2_00848 t2 ANY FULL JOIN t3_00848 t3 USING(id) ORDER BY id;
 
-SELECT *, toTypeName(t1.id), toTypeName(t3.id) FROM t1_00848 t1 LEFT JOIN t3_00848 t3 USING(id) ORDER BY t1.id, t3.id;
-SELECT *, toTypeName(t1.id), toTypeName(t3.id) FROM t1_00848 t1 FULL JOIN t3_00848 t3 USING(id) ORDER BY t1.id, t3.id;
-SELECT *, toTypeName(t2.id), toTypeName(t3.id) FROM t2_00848 t2 FULL JOIN t3_00848 t3 USING(id) ORDER BY t2.id, t3.id;
+SELECT *, toTypeName(t1.id), toTypeName(t3.id) FROM t1_00848 t1 LEFT JOIN t3_00848 t3 USING(id) ORDER BY id;
+SELECT *, toTypeName(t1.id), toTypeName(t3.id) FROM t1_00848 t1 FULL JOIN t3_00848 t3 USING(id) ORDER BY id;
+SELECT *, toTypeName(t2.id), toTypeName(t3.id) FROM t2_00848 t2 FULL JOIN t3_00848 t3 USING(id) ORDER BY id;
 
-SELECT t3.id = 'l', t3.not_id = 'l' FROM t1_00848 t1 ANY LEFT JOIN t3_00848 t3 USING(id) ORDER BY t1.id, t3.id;
-SELECT t3.id = 'l', t3.not_id = 'l' FROM t1_00848 t1 LEFT JOIN t3_00848 t3 USING(id) ORDER BY t1.id, t3.id;
+SELECT t3.id = 'l', t3.not_id = 'l' FROM t1_00848 t1 ANY LEFT JOIN t3_00848 t3 USING(id) ORDER BY id;
+SELECT t3.id = 'l', t3.not_id = 'l' FROM t1_00848 t1 LEFT JOIN t3_00848 t3 USING(id) ORDER BY id;
 
 DROP TABLE t1_00848;
 DROP TABLE t2_00848;
diff --git a/tests/queries/0_stateless/00849_multiple_comma_join_2.sql b/tests/queries/0_stateless/00849_multiple_comma_join_2.sql
index db8b27c4d4d..51bf5a2ede1 100644
--- a/tests/queries/0_stateless/00849_multiple_comma_join_2.sql
+++ b/tests/queries/0_stateless/00849_multiple_comma_join_2.sql
@@ -62,49 +62,49 @@ SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explai
 
 --- EXPLAIN QUERY TREE
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2 WHERE t1.a = t2.a);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2 WHERE t1.a = t2.a SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2 WHERE t1.b = t2.b);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2 WHERE t1.b = t2.b SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3 WHERE t1.a = t2.a AND t1.a = t3.a);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3 WHERE t1.a = t2.a AND t1.a = t3.a SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3 WHERE t1.b = t2.b AND t1.b = t3.b);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3 WHERE t1.b = t2.b AND t1.b = t3.b SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t1.a = t2.a AND t1.a = t3.a AND t1.a = t4.a);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t1.a = t2.a AND t1.a = t3.a AND t1.a = t4.a SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t1.b = t2.b AND t1.b = t3.b AND t1.b = t4.b);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t1.b = t2.b AND t1.b = t3.b AND t1.b = t4.b SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t2.a = t1.a AND t2.a = t3.a AND t2.a = t4.a);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t2.a = t1.a AND t2.a = t3.a AND t2.a = t4.a SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t3.a = t1.a AND t3.a = t2.a AND t3.a = t4.a);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t3.a = t1.a AND t3.a = t2.a AND t3.a = t4.a SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t4.a = t1.a AND t4.a = t2.a AND t4.a = t3.a);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t4.a = t1.a AND t4.a = t2.a AND t4.a = t3.a SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t1.a = t2.a AND t2.a = t3.a AND t3.a = t4.a);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 WHERE t1.a = t2.a AND t2.a = t3.a AND t3.a = t4.a SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2, t3, t4 SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1 CROSS JOIN t2 CROSS JOIN t3 CROSS JOIN t4);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1 CROSS JOIN t2 CROSS JOIN t3 CROSS JOIN t4 SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2 CROSS JOIN t3);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1, t2 CROSS JOIN t3 SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1 JOIN t2 USING a CROSS JOIN t3);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1 JOIN t2 USING a CROSS JOIN t3 SETTINGS allow_experimental_analyzer = 1);
 
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
-    EXPLAIN QUERY TREE SELECT t1.a FROM t1 JOIN t2 ON t1.a = t2.a CROSS JOIN t3);
+    EXPLAIN QUERY TREE SELECT t1.a FROM t1 JOIN t2 ON t1.a = t2.a CROSS JOIN t3 SETTINGS allow_experimental_analyzer = 1);
 
 INSERT INTO t1 values (1,1), (2,2), (3,3), (4,4);
 INSERT INTO t2 values (1,1), (1, Null);
diff --git a/tests/queries/0_stateless/00853_join_with_nulls_crash.reference b/tests/queries/0_stateless/00853_join_with_nulls_crash.reference
index 459b73acdbf..5df14d02d5e 100644
--- a/tests/queries/0_stateless/00853_join_with_nulls_crash.reference
+++ b/tests/queries/0_stateless/00853_join_with_nulls_crash.reference
@@ -15,5 +15,5 @@ bar	bar	1	2	String	Nullable(String)
 	\N	0	1	String	Nullable(String)
 foo	2	0	String
 bar	1	2	String
-test	0	1	String
+	0	1	String
 	0	1	String
diff --git a/tests/queries/0_stateless/00853_join_with_nulls_crash.sql b/tests/queries/0_stateless/00853_join_with_nulls_crash.sql
index c63c2d99cba..b620b8a7902 100644
--- a/tests/queries/0_stateless/00853_join_with_nulls_crash.sql
+++ b/tests/queries/0_stateless/00853_join_with_nulls_crash.sql
@@ -27,7 +27,7 @@ SELECT s1.other, s2.other, count_a, count_b, toTypeName(s1.other), toTypeName(s2
     ( SELECT other, count() AS count_a FROM table_a GROUP BY other ) s1
 ALL FULL JOIN
     ( SELECT other, count() AS count_b FROM table_b GROUP BY other ) s2
-USING other
+ON s1.other = s2.other
 ORDER BY s2.other DESC, count_a, s1.other;
 
 SELECT s1.something, s2.something, count_a, count_b, toTypeName(s1.something), toTypeName(s2.something) FROM
@@ -41,7 +41,7 @@ SELECT s1.something, s2.something, count_a, count_b, toTypeName(s1.something), t
     ( SELECT something, count() AS count_a FROM table_a GROUP BY something ) s1
 ALL RIGHT JOIN
     ( SELECT something, count() AS count_b FROM table_b GROUP BY something ) s2
-USING (something)
+ON s1.something = s2.something
 ORDER BY count_a DESC, s1.something, s2.something;
 
 SET joined_subquery_requires_alias = 0;
@@ -50,7 +50,7 @@ SELECT something, count_a, count_b, toTypeName(something) FROM
     ( SELECT something, count() AS count_a FROM table_a GROUP BY something ) as s1
 ALL FULL JOIN
     ( SELECT something, count() AS count_b FROM table_b GROUP BY something ) as s2
-USING (something)
+ON s1.something = s2.something
 ORDER BY count_a DESC, something DESC;
 
 DROP TABLE table_a;
diff --git a/tests/queries/0_stateless/00858_issue_4756.reference b/tests/queries/0_stateless/00858_issue_4756.reference
index d00491fd7e5..e8183f05f5d 100644
--- a/tests/queries/0_stateless/00858_issue_4756.reference
+++ b/tests/queries/0_stateless/00858_issue_4756.reference
@@ -1 +1,3 @@
 1
+1
+1
diff --git a/tests/queries/0_stateless/00858_issue_4756.sql b/tests/queries/0_stateless/00858_issue_4756.sql
index 3da0766c4e9..9eacd5ef364 100644
--- a/tests/queries/0_stateless/00858_issue_4756.sql
+++ b/tests/queries/0_stateless/00858_issue_4756.sql
@@ -1,3 +1,4 @@
+set allow_experimental_analyzer = 1;
 set distributed_product_mode = 'local';
 
 drop table if exists shard1;
@@ -21,7 +22,7 @@ where distr1.id in
     from distr1
     join distr2 on distr1.id = distr2.id
     where distr1.id > 0
-); -- { serverError 288 }
+);
 
 select distinct(d0.id) from distr1 d0
 where d0.id in
@@ -32,15 +33,14 @@ where d0.id in
     where d1.id > 0
 );
 
--- TODO
---select distinct(distr1.id) from distr1
---where distr1.id in
---(
---    select distr1.id
---    from distr1 as d1
---    join distr2 as d2 on distr1.id = distr2.id
---    where distr1.id > 0
---);
+select distinct(distr1.id) from distr1
+where distr1.id in
+(
+   select distr1.id
+   from distr1 as d1
+   join distr2 as d2 on distr1.id = distr2.id
+   where distr1.id > 0
+);
 
 drop table shard1;
 drop table shard2;
diff --git a/tests/queries/0_stateless/00862_decimal_in.reference b/tests/queries/0_stateless/00862_decimal_in.reference
index 0cd93f69c38..f60b8081af4 100644
--- a/tests/queries/0_stateless/00862_decimal_in.reference
+++ b/tests/queries/0_stateless/00862_decimal_in.reference
@@ -16,3 +16,9 @@
 64	64
 64	64
 64	64
+256	256
+256	256
+256	256
+256	256
+256	256
+256	256
diff --git a/tests/queries/0_stateless/00862_decimal_in.sql b/tests/queries/0_stateless/00862_decimal_in.sql
index b5c058119a2..3aa7bb18cb4 100644
--- a/tests/queries/0_stateless/00862_decimal_in.sql
+++ b/tests/queries/0_stateless/00862_decimal_in.sql
@@ -5,7 +5,7 @@ CREATE TABLE temp
     y Nullable(Decimal(38, 2))
 ) ENGINE = Memory;
 
-INSERT INTO temp VALUES (32, 32), (64, 64), (128, 128);
+INSERT INTO temp VALUES (32, 32), (64, 64), (128, 128), (256, 256);
 
 SELECT * FROM temp WHERE x IN (toDecimal128(128, 1));
 SELECT * FROM temp WHERE x IN (toDecimal128(128, 2));
@@ -28,7 +28,11 @@ SELECT * FROM temp WHERE y IN (toDecimal64(64, 1));
 SELECT * FROM temp WHERE y IN (toDecimal64(64, 2));
 SELECT * FROM temp WHERE y IN (toDecimal64(64, 3));
 
-SELECT * FROM temp WHERE x IN (toDecimal256(256, 1)); -- { serverError 53 }
-SELECT * FROM temp WHERE y IN (toDecimal256(256, 1)); -- { serverError 53 }
+SELECT * FROM temp WHERE x IN (toDecimal256(256, 1));
+SELECT * FROM temp WHERE x IN (toDecimal256(256, 2));
+SELECT * FROM temp WHERE x IN (toDecimal256(256, 3));
+SELECT * FROM temp WHERE y IN (toDecimal256(256, 1));
+SELECT * FROM temp WHERE y IN (toDecimal256(256, 2));
+SELECT * FROM temp WHERE y IN (toDecimal256(256, 3));
 
 DROP TABLE IF EXISTS temp;
diff --git a/tests/queries/0_stateless/00897_flatten.reference b/tests/queries/0_stateless/00897_flatten.reference
index 6c1aa724070..591b70ee063 100644
--- a/tests/queries/0_stateless/00897_flatten.reference
+++ b/tests/queries/0_stateless/00897_flatten.reference
@@ -8,6 +8,18 @@
 [0,0,1,0,1,0,1,0,1]
 [0,0,1,0,1,0,1,0,1,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2]
 [0,0,1,0,1,0,1,0,1,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3]
+[]
+[]
+[]
+[]
+[0]
+[0,0,0,0,1]
+[]
+[]
+[]
+[]
+[0]
+[0,0,0,0,1]
 [1,2,3,4,5,6,7,8]
 []
 []
diff --git a/tests/queries/0_stateless/00897_flatten.sql b/tests/queries/0_stateless/00897_flatten.sql
index 04c725677bd..0d67a1708fd 100644
--- a/tests/queries/0_stateless/00897_flatten.sql
+++ b/tests/queries/0_stateless/00897_flatten.sql
@@ -1,6 +1,8 @@
 SELECT flatten(arrayJoin([[[1, 2, 3], [4, 5]], [[6], [7, 8]]]));
 SELECT arrayFlatten(arrayJoin([[[[]], [[1], [], [2, 3]]], [[[4]]]]));
-SELECT flatten(arrayMap(x -> arrayMap(x -> arrayMap(x -> range(x), range(x)), range(x)), range(number))) FROM numbers(6);
+SELECT flatten(arrayMap(x -> arrayMap(y -> arrayMap(z -> range(x), range(x)), range(x)), range(number))) FROM numbers(6);
+SELECT flatten(arrayMap(x -> arrayMap(y -> arrayMap(z -> range(z), range(y)), range(x)), range(number))) FROM numbers(6);
+SELECT flatten(arrayMap(x -> arrayMap(x -> arrayMap(x -> range(x), range(x)), range(x)), range(number))) FROM numbers(6) SETTINGS allow_experimental_analyzer=1;
 SELECT arrayFlatten([[[1, 2, 3], [4, 5]], [[6], [7, 8]]]);
 SELECT flatten([[[]]]);
 SELECT arrayFlatten([]);
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.reference b/tests/queries/0_stateless/00900_long_parquet_load.reference
index 72ec99ad2c6..50631bfab59 100644
--- a/tests/queries/0_stateless/00900_long_parquet_load.reference
+++ b/tests/queries/0_stateless/00900_long_parquet_load.reference
@@ -6,19 +6,20 @@
 [1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['1999-12-31 23:00:00','2000-12-31 23:00:00','2001-12-31 23:00:00']	[0.2,10,4]	[4,10000.1,10000.1]	[1000000000,90,101001.01]
 [1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['1999-12-31 23:00:00','2000-12-31 23:00:00','2001-12-31 23:00:00']	[0.2,10,4]	[4,10000.1,10000.1]	[1000000000,90,101001.01]
 === Try load data from alltypes_plain.parquet
+0	1	0	0	0	0	0	0	01/01/09	0	1230768000
+1	0	1	1	1	10	1.1	10.1	01/01/09	1	1230768060
+2	1	0	0	0	0	0	0	02/01/09	0	1233446400
+3	0	1	1	1	10	1.1	10.1	02/01/09	1	1233446460
 4	1	0	0	0	0	0	0	03/01/09	0	1235865600
 5	0	1	1	1	10	1.1	10.1	03/01/09	1	1235865660
 6	1	0	0	0	0	0	0	04/01/09	0	1238544000
 7	0	1	1	1	10	1.1	10.1	04/01/09	1	1238544060
-2	1	0	0	0	0	0	0	02/01/09	0	1233446400
-3	0	1	1	1	10	1.1	10.1	02/01/09	1	1233446460
-0	1	0	0	0	0	0	0	01/01/09	0	1230768000
-1	0	1	1	1	10	1.1	10.1	01/01/09	1	1230768060
 === Try load data from alltypes_plain.snappy.parquet
 6	1	0	0	0	0	0	0	04/01/09	0	1238544000
 7	0	1	1	1	10	1.1	10.1	04/01/09	1	1238544060
 === Try load data from array_float.parquet
 idx1	[]
+idx10	[10.2,8.2]
 idx2	[10.2,8.2,7.2]
 idx3	[10.2,8.2]
 idx4	[10.2]
@@ -27,9 +28,9 @@ idx6	[10.2]
 idx7	[10.2,8.2]
 idx8	[10.2,8.2]
 idx9	[10.2]
-idx10	[10.2,8.2]
 === Try load data from array_int.parquet
 idx1	[100,101,102]
+idx10	[100,101,102]
 idx2	[100,101]
 idx3	[100,101,102,101]
 idx4	[100]
@@ -38,9 +39,9 @@ idx6	[100,101]
 idx7	[100,101]
 idx8	[100,101]
 idx9	[100,101,102]
-idx10	[100,101,102]
 === Try load data from array_string.parquet
 idx1	['This','is','a','test']
+idx10	['This','is','a','test']
 idx2	['cigarette','smoke']
 idx3	['the','grocery','clerks']
 idx4	[]
@@ -49,7 +50,6 @@ idx6	['me','up?']
 idx7	['then','I','put','him','back']
 idx8	['make','a','man']
 idx9	['Which','Heaven','to','gaudy','day','denies']
-idx10	['This','is','a','test']
 === Try load data from binary.parquet
 \0
 

@@ -92,8 +92,11 @@ idx10	['This','is','a','test']
 123	1
 456	2
 === Try load data from datapage_v2.snappy.parquet
-Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Unknown encoding type.: While executing ParquetBlockInputFormat: data for INSERT was parsed from stdin: (in query: INSERT INTO parquet_load FORMAT Parquet). (CANNOT_READ_ALL_DATA)
-
+abc	1	2	1	[1,2,3]
+abc	2	3	1	[]
+abc	3	4	1	[]
+abc	5	2	1	[1,2]
+\N	4	5	0	[1,2,3]
 === Try load data from datatype-date32.parquet
 1925-01-01
 1949-10-01
@@ -271,8 +274,8 @@ Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Unkno
 24
 === Try load data from list_columns.parquet
 [1,2,3]	['abc','efg','hij']
-[NULL,1]	[]
 [4]	['efg',NULL,'hij','xyz']
+[NULL,1]	[]
 === Try load data from nation.dict-malformed.parquet
 0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai
 1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon
@@ -328,9 +331,9 @@ Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Unkno
 6	[]	[]	{}	[]	(NULL,[],([]),{})
 7	[]	[[],[5,6]]	{'k1':NULL,'k3':NULL}	[]	(7,[2,3,NULL],([[],[(NULL,NULL)],[]]),{})
 === Try load data from nullable_list.parquet
+[]	[]	[]
 [1,NULL,2]	[NULL,'Some string',NULL]	[0,NULL,42.42]
 [NULL]	[NULL]	[NULL]
-[]	[]	[]
 === Try load data from nulls.snappy.parquet
 (NULL)
 (NULL)
@@ -343,544 +346,544 @@ Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Unkno
 === Try load data from single_nan.parquet
 \N
 === Try load data from userdata1.parquet
-1454486129	1	Amanda	Jordan	ajordan0@com.com	Female	1.197.201.2	6759521864920116	Indonesia	3/8/1971	49756.53	Internal Auditor	1E+02
-1454519043	2	Albert	Freeman	afreeman1@is.gd	Male	218.111.175.34		Canada	1/16/1968	150280.17	Accountant IV	
-1454461771	3	Evelyn	Morgan	emorgan2@altervista.org	Female	7.161.136.94	6767119071901597	Russia	2/1/1960	144972.51	Structural Engineer	
-1454459781	4	Denise	Riley	driley3@gmpg.org	Female	140.35.109.83	3576031598965625	China	4/8/1997	90263.05	Senior Cost Accountant	
-1454475931	5	Carlos	Burns	cburns4@miitbeian.gov.cn		169.113.235.40	5602256255204850	South Africa		\N		
-1454484154	6	Kathryn	White	kwhite5@google.com	Female	195.131.81.179	3583136326049310	Indonesia	2/25/1983	69227.11	Account Executive	
-1454488388	7	Samuel	Holmes	sholmes6@foxnews.com	Male	232.234.81.197	3582641366974690	Portugal	12/18/1987	14247.62	Senior Financial Analyst	
-1454482026	8	Harry	Howell	hhowell7@eepurl.com	Male	91.235.51.73		Bosnia and Herzegovina	3/1/1962	186469.43	Web Developer IV	
-1454471573	9	Jose	Foster	jfoster8@yelp.com	Male	132.31.53.61		South Korea	3/27/1992	231067.84	Software Test Engineer I	1E+02
-1454524187	10	Emily	Stewart	estewart9@opensource.org	Female	143.28.251.245	3574254110301671	Nigeria	1/28/1997	27234.28	Health Coach IV	
-1454458242	11	Susan	Perkins	sperkinsa@patch.com	Female	180.85.0.62	3573823609854134	Russia		210001.95		
-1454522674	12	Alice	Berry	aberryb@wikipedia.org	Female	246.225.12.189	4917830851454417	China	8/12/1968	22944.53	Quality Engineer	
-1454525297	13	Justin	Berry	jberryc@usatoday.com	Male	157.7.146.43	6331109912871813274	Zambia	8/15/1975	44165.46	Structural Analysis Engineer	
-1454536012	14	Kathy	Reynolds	kreynoldsd@redcross.org	Female	81.254.172.13	5537178462965976	Bosnia and Herzegovina	6/27/1970	286592.99	Librarian	
-1454489603	15	Dorothy	Hudson	dhudsone@blogger.com	Female	8.59.7.0	3542586858224170	Japan	12/20/1989	157099.71	Nurse Practicioner	<script>alert(\'hi\')</script>
-1454460241	16	Bruce	Willis	bwillisf@bluehost.com	Male	239.182.219.189	3573030625927601	Brazil		239100.65		
-1454461065	17	Emily	Andrews	eandrewsg@cornell.edu	Female	29.231.180.172	30271790537626	Russia	4/13/1990	116800.65	Food Chemist	
-1454517864	18	Stephen	Wallace	swallaceh@netvibes.com	Male	152.49.213.62	5433943468526428	Ukraine	1/15/1978	248877.99	Account Representative I	
-1454499954	19	Clarence	Lawson	clawsoni@vkontakte.ru	Male	107.175.15.152	3544052814080964	Russia		177122.99		
-1454495436	20	Rebecca	Bell	rbellj@bandcamp.com	Female	172.215.104.127		China		137251.19		
-1454505444	21	Diane	Stevens	dstevensk@cnet.com	Female	141.243.73.164		Russia	6/5/1985	87978.22	Food Chemist	œ∑´®†¥¨ˆøπ“‘
-1454523505	22	Lawrence	Ramos	lramosl@sourceforge.net	Male	46.72.4.6	3537473810855655	Tanzania		131283.64		
-1454525455	23	Gregory	Barnes	gbarnesm@google.ru	Male	220.22.114.145	3538432455620641	Tunisia	1/23/1971	182233.49	Senior Sales Associate	사회과학원 어학연구소
-1454472340	24	Michelle	Ellis	mellisn@timesonline.co.uk	Female	239.81.215.135	3547383558025965	Tanzania	6/5/1964	278001.46	Tax Accountant	
-1454518347	25	Rachel	Perkins	rperkinso@lulu.com	Female	90.173.28.95	633313663891003209	Russia		176178.75		
-1454486554	26	Anthony	Lawrence	alawrencep@miitbeian.gov.cn	Male	121.211.242.99	564182969714151470	Japan	12/10/1979	170085.81	Electrical Engineer	
-1454488886	27	Henry	Henry	hhenryq@godaddy.com	Male	191.88.236.116	4905730021217853521	China	9/22/1995	284300.15	Nuclear Power Engineer	
-1454519352	28	Samuel	Hunter	shunterr@instagram.com	Male	72.190.230.173	5002353797389897	Brazil	9/21/1968	108950.24	Environmental Tech	
-1454469374	29	Jacqueline	Holmes	jholmess@ustream.tv	Female	47.141.224.95	3555934842115316	United States		247939.52		̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟
-1454535469	30	Annie	Torres	atorrest@ning.com	Female	202.94.67.27	3530389861801215	Nigeria	5/20/1958	118310.72	Electrical Engineer	-1E+02
-1454526588	31	Antonio	Berry	aberryu@ow.ly	Male	5.82.180.4		Thailand		135007.96		
-1454533547	32	Nicole	Martinez	nmartinezv@oakley.com	Female	46.32.149.87		United States		149720.75		Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮
-1454459459	33	Christina	Mason	cmasonw@nydailynews.com	Female	74.214.22.120		Greece	7/21/1986	242593.85	Senior Sales Associate	
-1454541103	34	Margaret	Barnes	mbarnesx@angelfire.com	Female	133.178.126.244	3582552005871223	South Africa	11/13/1969	109644.23	Human Resources Assistant II	
-1454487881	35	Melissa	Kelly	mkellyy@unblog.fr	Female	179.132.207.169	6374648559206801	Indonesia	2/6/1968	45639.62	General Manager	Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣
-1454484472	36	Betty	Carr	bcarrz@parallels.com	Female	159.201.161.49		France		91370.3		-1E2
-1454532399	37	Dorothy	Gomez	dgomez10@jiathis.com	Female	65.111.200.146	493684876859391834	China		57194.86		
-1454538878	38	Kathryn	Lane	klane11@netlog.com	Female	169.141.178.89	5308993357499254	Czech Republic	8/20/1964	67783.73	Paralegal	
-1454511326	39	Jose	Murphy	jmurphy12@paypal.com	Male	118.85.253.180	4994715164232848	Chile	8/8/1991	134708.82	Nuclear Power Engineer	
-1454458506	40	Jack	Flores	jflores13@yolasite.com	Male	162.215.65.11	3577342788590928	Argentina	1/28/1958	81685.1	Financial Advisor	
-1454529124	41	Walter	Martinez	wmartinez14@spotify.com	Male	165.150.92.96		Somalia	3/8/1972	212105.33	Health Coach I	
-1454473984	42	Todd	Alvarez	talvarez15@csmonitor.com	Male	59.123.34.76	3557102122317535	Japan	12/19/1999	284728.99	Marketing Assistant	
-1454488466	43	Amanda	Gray	agray16@cdbaby.com	Female	252.20.193.145	3561501596653859	China	8/28/1967	213410.26	Senior Quality Engineer	
-1454494415	44	Sharon	Simpson	ssimpson17@weather.com	Female	242.68.147.87		France	9/28/1963	133884.94	Analog Circuit Design manager	
-1454526201	45	Bonnie	Collins	bcollins18@list-manage.com	Female	132.217.56.27	3540813015762450	Germany	7/21/1986	67661.42	Business Systems Development Analyst	
-1454474597	46	Deborah	Armstrong	darmstrong19@addthis.com	Female	89.44.11.142		Canada	4/8/1969	111569.22	Quality Control Specialist	⁦test⁧
-1454486980	47	Daniel	Mccoy	dmccoy1a@skype.com	Male	115.85.247.190	3554507990607374	Central African Republic		66260.14		❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙
-1454505529	48	Jean	Flores	jflores1b@samsung.com	Female	211.70.131.207	5392903051983005	Nepal	4/6/1990	199100.32	Financial Advisor	
-1454521849	49	Lisa	Snyder	lsnyder1c@woothemes.com	Female	145.202.177.215	30475362189761	Germany	12/12/1974	210631.91	Safety Technician II	 
-1454469295	50	Sean	Alexander	salexander1d@dagondesign.com	Male	89.83.147.177		Bosnia and Herzegovina	5/29/1978	256068.38	Senior Financial Analyst	
-1454481568	51	Ernest	Carroll	ecarroll1e@dailymail.co.uk	Male	194.224.39.215	5100172156945078	Portugal	11/1/1992	100269.36	Dental Hygienist	
-1454492589	52	Louise	Dean	ldean1f@tamu.edu	Female	109.43.178.48	201996646854139	Ethiopia		173300.37		
+1454457660	721	Shirley	Williams	swilliamsk0@sciencedirect.com		132.137.10.218	5610801309305920	Indonesia	8/13/1978	\N	Help Desk Technician	
+1454457663	785	Daniel	Spencer	dspencerls@cargocollective.com	Male	241.143.186.140		China	12/3/1997	194214.08	Internal Auditor	
+1454457674	880	Lillian	Murray	lmurrayof@guardian.co.uk	Female	222.252.22.1	201713786459078	Norway	4/16/1981	282503.77	Business Systems Development Analyst	
+1454457684	852	Carol	Patterson	cpattersonnn@ycombinator.com	Female	244.190.113.241	0604512080706322395	Liberia	5/8/1984	263412.02	Assistant Professor	
+1454457705	244	Sarah	Freeman	sfreeman6r@wikimedia.org	Female	219.8.22.27	30520943172503	United States	3/25/1958	25806.31	Budget/Accounting Analyst II	⁰⁴⁵
+1454457740	633	Maria	Fowler	mfowlerhk@chronoengine.com	Female	246.85.249.122	3584144503415501	China	11/25/1998	276712.79	Staff Scientist	␣
+1454457782	925	Chris	Murphy	cmurphypo@nature.com		89.217.243.136	5602220700741429	Russia		\N		
+1454457790	788	Nicholas	Butler	nbutlerlv@thetimes.co.uk	Male	77.38.58.165	3575506969751259	Brazil	2/10/1981	192076.79	Data Coordiator	
+1454457853	301	Jerry	Welch	jwelch8c@paginegialle.it	Male	141.166.33.218	5602252929753349	Latvia	3/14/1973	28731.89	Software Engineer I	
 1454457952	53	Ralph	Price	rprice1g@tmall.com	Male	152.6.235.33	4844227560658222	China	8/26/1986	168208.4	Teacher	
-1454467269	54	George	Ferguson	gferguson1h@51.la	Male	129.108.219.50	3539784298399554	Macedonia	6/26/1971	153238.6	Computer Systems Analyst IV	パーティーへ行かないか
-1454515393	55	Anna	Montgomery	amontgomery1i@google.cn	Female	80.111.141.47	3586860392406446	China	9/6/1957	92837.5	Software Test Engineer IV	1E2
-1454514049	56	Cheryl	Lawrence	clawrence1j@ameblo.jp	Female	171.155.78.116		Finland	5/7/1985	200827.88	Recruiting Manager	
-1454459605	57	Willie	Palmer	wpalmer1k@t-online.de	Male	164.107.46.161	4026614769857244	China	8/23/1986	184978.64	Environmental Specialist	
-1454478957	58	Arthur	Berry	aberry1l@unc.edu	Male	52.42.24.55	3542761473624274	China		144164.88		
-1454519593	59	Patricia	Marshall	pmarshall1m@dell.com	Female	47.108.196.175		China	7/21/1984	69236.54	Environmental Specialist	
-1454466852	60	Cynthia	Richards	crichards1n@dailymail.co.uk	Female	178.236.66.213	3557986543874466	Brazil		179378		
-1454496286	61	David	Sanders	dsanders1o@fda.gov	Male	94.143.190.8	3585745042921822	Mexico	2/15/1963	197445.45	Data Coordiator	0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟
-1454534081	62	Julia	Sullivan	jsullivan1p@wisc.edu	Female	32.183.154.67	6767624411254094	Bolivia	11/28/1963	118311.39	Electrical Engineer	
-1454530379	63	Kevin	Butler	kbutler1q@symantec.com	Male	21.88.110.64	3551107057688681	Georgia	12/13/1962	129632.55	Database Administrator III	
-1454475593	64	Dennis	Ross	dross1r@parallels.com	Male	78.25.77.223		Portugal	5/27/1959	280933.71	Biostatistician II	
-1454478626	65	Raymond	Jacobs	rjacobs1s@sohu.com	Male	188.52.98.175	5048378563875353	Indonesia		13673.35		
-1454532460	66	Steven	Pierce	spierce1t@usgs.gov	Male	230.13.54.19	5100178880451481	Namibia	4/10/1965	152382.69	Analyst Programmer	
-1454480831	67	Jonathan	Ellis	jellis1u@g.co	Male	125.115.227.203		China	4/5/1991	268468.96	Staff Scientist	　
-1454460516	68	Rachel	Price	rprice1v@census.gov	Female	89.52.192.105		Indonesia	5/6/1982	234502.16	Payment Adjustment Coordinator	
-1454492257	69	Harold	Olson	holson1w@chronoengine.com	Male	169.173.35.139		China	7/25/1994	146917.43	Occupational Therapist	
-1454524497	70	Pamela	Wagner	pwagner1x@gravatar.com	Female	184.97.191.144	5593584893781844	Italy	5/3/1964	253108.75	Automation Specialist I	1;DROP TABLE users
-1454537805	71	Stephanie	Watkins	swatkins1y@rakuten.co.jp		124.183.29.113	30552863095190	Burkina Faso	8/29/1971	\N	Physical Therapy Assistant	
-1454530454	72	John	Ortiz	jortiz1z@mozilla.org	Male	4.70.220.127	5194470971764378	Sweden	2/13/1978	91566.02	Analyst Programmer	
-1454523864	73	Kimberly	Wheeler	kwheeler20@imgur.com	Female	26.46.50.55		China	11/6/1978	31026.94	Junior Executive	
-1454470404	74	Kathryn	Henderson	khenderson21@ask.com	Female	218.212.63.68	4936394111685353310	Ukraine	4/11/1985	59413.85	Pharmacist	-$1.00
-1454527390	75	Catherine	Gibson	cgibson22@ebay.com	Female	204.84.35.26	5402007176101895	Indonesia	12/20/1984	92315.94	Desktop Support Technician	
-1454509078	76	Carolyn	Nelson	cnelson23@tiny.cc	Female	64.13.61.211	4844223687165886	Estonia	3/9/1985	179193.6	Social Worker	
-1454479055	77	Denise	Nguyen	dnguyen24@ovh.net	Female	18.208.48.116	201900233821394	China		121013.48		
+1454458004	607	Johnny	Owens	jowensgu@blogspot.com	Male	181.25.18.91	5602239825516409	Indonesia	2/14/1960	169429.76	Health Coach III	
+1454458010	375	Bruce	Gonzales	bgonzalesae@studiopress.com	Male	19.195.169.187		Sweden	7/4/1993	118244.57	Human Resources Manager	"<>?:""{}|_+"
+1454458170	744	Heather	Richardson	hrichardsonkn@twitter.com	Female	129.15.137.135		Ukraine	12/26/1980	164117.18	GIS Technical Architect	
+1454458178	635	Willie	Dixon	wdixonhm@diigo.com	Male	27.245.227.220		Japan	8/29/1992	265321.18	Senior Cost Accountant	
+1454458242	11	Susan	Perkins	sperkinsa@patch.com	Female	180.85.0.62	3573823609854134	Russia		210001.95		
+1454458282	175	Samuel	Edwards	sedwards4u@businessweek.com	Male	60.248.106.175	676249211413011686	Russia	10/15/1986	75886.69	Senior Sales Associate	<img src=x onerror=alert(\'hi\') />
 1454458493	78	Mildred	Torres	mtorres25@alibaba.com	Female	38.102.60.15	6399156779396437	Russia	9/24/1960	166987.55	Paralegal	
-1454507970	79	Linda	Shaw	lshaw26@psu.edu	Female	188.221.197.229	3557917782902346	Russia	9/30/1987	67211.67	Structural Analysis Engineer	
-1454540546	80	Anna	Hudson	ahudson27@gmpg.org	Female	153.84.219.15		Indonesia	9/12/1997	110408.87	VP Marketing	
-1454536800	81	Albert	Pierce	apierce28@phoca.cz	Male	145.148.40.149		Palestinian Territory	11/4/1955	43019.01	Web Developer III	0/0
-1454542995	82	Carol	Franklin	cfranklin29@marketwatch.com	Female	32.189.30.244	67097647572873744	China	6/5/1978	31572.53	Automation Specialist II	
-1454506472	83	Carlos	Washington	cwashington2a@phpbb.com	Male	90.239.40.124	67063904960748578	United States	11/4/1970	28853.61	Developer I	❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙
-1454463081	84	Kathryn	Austin	kaustin2b@livejournal.com	Female	152.193.181.90		Philippines	10/8/1990	131855.43	Nurse Practicioner	
-1454494358	85	Lillian	Gardner	lgardner2c@hao123.com	Female	189.104.46.70		Russia	10/28/1961	145282.64	Occupational Therapist	
-1454530407	86	Peter	Mendoza	pmendoza2d@paypal.com	Male	77.225.63.206	3562330687037049	Mexico	12/23/1988	40664.88	Staff Scientist	
-1454466533	87	Dennis	Torres	dtorres2e@ask.com	Male	199.131.129.105	50188330277167912	Croatia	5/25/1986	265985	Account Representative II	社會科學院語學研究所
-1454463286	88	Timothy	Watkins	twatkins2f@toplist.cz	Male	120.52.182.111		Tunisia	6/24/2000	242129.05	Operator	
-1454498394	89	Nicole	Willis	nwillis2g@cmu.edu	Female	44.196.120.110	6394724888228638	Indonesia	2/1/1966	258772.36	Physical Therapy Assistant	
-1454525151	90	Jacqueline	Carr	jcarr2h@freewebs.com	Female	197.40.38.49	201939989746686	China	5/31/1961	100733.44	Civil Engineer	(｡◕ ∀ ◕｡)
-1454510656	91	Theresa	Gonzalez	tgonzalez2i@nih.gov	Female	237.106.229.219		Argentina	8/10/1970	47723.61	Product Engineer	
-1454479785	92	Donald	Bradley	dbradley2j@latimes.com	Male	244.82.249.86	3534114122488321	Indonesia	7/8/2000	105051.77	Tax Accountant	
-1454512853	93	Katherine	Little	klittle2k@cyberchimps.com	Female	61.43.154.182	30218284989094	Poland	1/20/1990	155597.16	Associate Professor	
-1454516486	94	Ruth	Cooper	rcooper2l@apache.org	Female	114.82.62.61		Indonesia	7/20/1993	181481.5	Civil Engineer	
-1454498785	95	Stephen	Gutierrez	sgutierrez2m@walmart.com	Male	134.231.189.30	3560204445825528	Guatemala	8/22/1995	83986.79	Structural Engineer	
-1454473160	96	Kevin	Scott	kscott2n@histats.com	Male	226.59.43.229	3558997916332270	United States	6/5/1966	130054.63	Graphic Designer	ÅÍÎÏ˝ÓÔÒÚÆ☃
-1454540928	97	Steven	Williamson	swilliamson2o@devhub.com	Male	122.216.99.88		France		238119.62		
-1454473451	98	Shawn	Adams	sadams2p@imdb.com	Male	148.92.123.202	5893564746795315893	Indonesia	11/10/1959	67749.83	Senior Developer	‫test‫
-1454507278	99	Russell	Fields	rfields2q@google.ca	Male	110.74.199.162		Tanzania	1/2/1994	13268.99	Mechanical Systems Engineer	
-1454514595	100	Willie	Weaver	wweaver2r@google.de	Male	13.54.121.138	3534023246040472	Mexico	8/21/1970	175694.61	Dental Hygienist	̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰
+1454458506	40	Jack	Flores	jflores13@yolasite.com	Male	162.215.65.11	3577342788590928	Argentina	1/28/1958	81685.1	Financial Advisor	
+1454458536	749	Larry	Fields	lfieldsks@theguardian.com	Male	46.57.123.222	3531208154739438	Yemen		139177.38		Œ„´‰ˇÁ¨ˆØ∏”’
+1454458564	521	Roy	Palmer	rpalmereg@nsw.gov.au	Male	255.242.77.68	3589146577885209	Nepal	8/28/1964	262816.87	Software Test Engineer IV	
+1454458607	314	James	Harvey	jharvey8p@npr.org	Male	96.88.41.248	3589416270039051	China		211553.57		
+1454458706	995	Jose	Mccoy	jmccoyrm@elpais.com	Male	117.37.215.98	560222933605513180	Norway	7/30/1987	275898.37	Graphic Designer	
+1454458727	835	Sean	Castillo	scastillon6@altervista.org		211.77.61.195		Portugal	6/15/1979	\N	Quality Control Specialist	
+1454458739	821	Juan	Foster	jfosterms@reference.com	Male	219.231.170.245	5108759901583907	Portugal	2/16/1969	120076.81	Quality Engineer	1E02
+1454458751	670	Irene	Hughes	ihughesil@topsy.com	Female	154.194.86.224	3536739760978536	Netherlands	6/17/1973	274295.42	Structural Analysis Engineer	
+1454458801	149	Gregory	Edwards	gedwards44@icq.com	Male	5.204.156.34	3548268624172124	Portugal	2/5/1977	236421.33	Librarian	
+1454458805	683	Joshua	Ramirez	jramireziy@liveinternet.ru	Male	164.224.133.177	3574998106893089	France	10/24/1987	17658.63	Senior Developer	
+1454458862	226	James	Austin	jaustin69@istockphoto.com	Male	228.107.68.143	4913037818454290	Russia		25084.49		
+1454458909	659	Doris	Welch	dwelchia@about.com	Female	195.125.217.107	3537263234825586	Indonesia	3/31/1995	183928.71	Quality Engineer	
+1454458914	479	Joseph	Gordon	jgordonda@trellian.com	Male	140.193.192.82	3533495991170988	Indonesia	6/30/1960	262448.45	Health Coach II	
+1454458932	615	Marie	Matthews	mmatthewsh2@smugmug.com		8.217.73.21	589312447234085155	Indonesia	8/10/1973	\N	Chief Design Engineer	<img src=x onerror=alert(\'hi\') />
+1454458946	379	Martha	Simmons	msimmonsai@tripadvisor.com	Female	8.141.39.185		Russia	9/18/1978	92766.32	Staff Scientist	
+1454458967	730	Anne	Perez	aperezk9@freewebs.com	Female	208.87.2.91		China	8/18/1966	47293.4	Nuclear Power Engineer	❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙
+1454458979	426	Lois	Green	lgreenbt@1688.com		39.174.95.97	5100146457712544	Bulgaria	2/22/1955	\N	Health Coach III	
+1454459038	810	Mark	Kelley	mkelleymh@blog.com		210.153.220.197	3543227090716355	Poland	5/31/1969	\N	Programmer Analyst I	
+1454459045	475	Richard	Howell	rhowelld6@springer.com	Male	176.182.155.97		Central African Republic		138775.31		‪‪test‪
+1454459058	523	Phillip	Butler	pbutlerei@storify.com	Male	184.124.14.67		China	12/18/1957	106832.85	Paralegal	
+1454459092	437	Virginia	Robinson	vrobinsonc4@opensource.org	Female	148.213.54.195	3567035727522042	China	6/27/1995	24623.44	Senior Sales Associate	
+1454459132	722	Robin	Spencer	rspencerk1@github.com	Female	83.129.98.63	3580163142176138	Poland	1/18/1987	171963.73	Budget/Accounting Analyst I	
+1454459226	291	Julia	Medina	jmedina82@cbc.ca	Female	43.27.110.171	30163835573619	Russia	8/12/1991	109927.88	Software Engineer II	
+1454459288	800	Sarah	Andrews	sandrewsm7@kickstarter.com	Female	238.132.217.166	5018303367167648843	China	4/19/1970	42010.56	Computer Systems Analyst IV	
+1454459290	162	Steve	Spencer	sspencer4h@deliciousdays.com	Male	109.138.4.34		China	6/2/1964	79184.71	Teacher	() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }
+1454459301	322	Frances	Fisher	ffisher8x@businessinsider.com	Female	55.187.133.82	30168292124913	Poland	11/4/1997	140594.79	Geologist IV	社會科學院語學研究所
+1454459320	370	Roger	Gilbert	rgilberta9@businesswire.com	Male	46.96.123.235		Finland	1/20/1999	16506.02	Analog Circuit Design manager	
+1454459328	929	Susan	Jordan	sjordanps@ucla.edu	Female	108.42.4.149	589358467890938815	Philippines	5/31/1995	44739.92	Account Coordinator	
+1454459330	215	Philip	Fox	pfox5y@vimeo.com	Male	65.223.141.140		Israel	9/5/1991	218538.31	Graphic Designer	
+1454459356	265	Judith	Simpson	jsimpson7c@taobao.com		105.52.110.107	6378542962124121	Indonesia	12/12/1983	\N	Project Manager	"""\'""\'""\'\'\'"""
+1454459359	708	Judy	Young	jyoungjn@dailymail.co.uk	Female	21.109.231.236	3554148278137055	Tunisia	1/2/1958	212070.86	Chief Design Engineer	田中さんにあげて下さい
+1454459394	795	Clarence	Edwards	cedwardsm2@ed.gov		111.156.147.232	3533231926493017	Poland	12/23/1981	\N	General Manager	
+1454459439	589	Gerald	Porter	gportergc@pcworld.com	Male	97.189.77.0		Philippines	7/2/1979	278447.61	Professor	
+1454459459	33	Christina	Mason	cmasonw@nydailynews.com	Female	74.214.22.120		Greece	7/21/1986	242593.85	Senior Sales Associate	
+1454459497	524	Brenda	Willis	bwillisej@sun.com	Female	45.122.116.217	6380803357074248	Poland		108844.98		
+1454459499	591	Rose	Garrett	rgarrettge@mit.edu	Female	116.228.6.108	30147178065069	Philippines	10/5/1988	244134.1	Accountant III	
+1454459516	653		Lane		Male	192.59.226.245	3528384158258405	China	12/26/1997	127912.54	Geologist I	
+1454459556	779	Richard	Hunt	rhuntlm@ovh.net	Male	162.73.16.141	5203349476569897	China	6/24/1969	13375.17	Environmental Tech	
+1454459562	681	Betty	Hamilton	bhamiltoniw@facebook.com	Female	193.209.0.183		Morocco	5/5/1965	210804.85	Human Resources Assistant II	
+1454459577	173	Amy	Garza	agarza4s@woothemes.com	Female	75.187.251.37		China		82283.83		
+1454459605	57	Willie	Palmer	wpalmer1k@t-online.de	Male	164.107.46.161	4026614769857244	China	8/23/1986	184978.64	Environmental Specialist	
+1454459605	888	Marie	Torres	mtorreson@tamu.edu	Female	190.148.84.34	5610170119678060511	Bosnia and Herzegovina		261087.2		
+1454459709	293	Amy	Cook	acook84@prlog.org		186.92.46.224		Ukraine	7/23/1976	\N	Human Resources Assistant III	
+1454459719	920	Johnny	Brown	jbrownpj@constantcontact.com	Male	25.161.139.20		Sweden	4/17/1998	149870.24	Speech Pathologist	
+1454459729	137	Phillip	Vasquez	pvasquez3s@canalblog.com	Male	195.121.180.8	5602221706127365	Ethiopia	7/28/1992	274927.74	Internal Auditor	
+1454459747	876	Samuel	Hughes	shughesob@dion.ne.jp	Male	29.127.239.106	3535476909940686	Indonesia		220585.61		Œ„´‰ˇÁ¨ˆØ∏”’
+1454459781	4	Denise	Riley	driley3@gmpg.org	Female	140.35.109.83	3576031598965625	China	4/8/1997	90263.05	Senior Cost Accountant	
+1454459806	195	Joe	Hayes	jhayes5e@opensource.org	Male	96.48.27.170	343842871636339	Indonesia		239690.34		
+1454459806	525	Elizabeth	Porter	eporterek@china.com.cn	Female	249.248.212.114		Indonesia	7/7/1993	33270.67	Recruiter	
+1454459905	958	Louis	Griffin	lgriffinql@umn.edu		184.242.195.194	3571277617780793	China	10/31/1988	\N	Assistant Media Planner	
+1454459969	655	Johnny	Reed	jreedi6@chicagotribune.com	Male	169.161.103.111	4844445630272291	Russia	5/23/1979	68913.72	Quality Engineer	
+1454459981	614	Marie	Ramirez	mramirezh1@wikia.com	Female	143.213.146.199	633390820329851783	China	7/17/1988	131783.55	Dental Hygienist	
+1454460012	200	Russell	Ward	rward5j@surveymonkey.com	Male	73.156.128.8		Sweden		173849.81		
+1454460033	454	Ashley	Crawford	acrawfordcl@weather.com	Female	61.81.102.117	3563365997409370	Vietnam		264109.73		
+1454460230	685	Joan	Jackson	jjacksonj0@paypal.com	Female	153.5.15.100		Yemen	8/16/1992	54385.21	Structural Analysis Engineer	
+1454460236	222	Sara	Price	sprice65@usatoday.com	Female	46.58.242.198		Canada	2/11/1959	49611.44	Sales Representative	
+1454460241	16	Bruce	Willis	bwillisf@bluehost.com	Male	239.182.219.189	3573030625927601	Brazil		239100.65		
+1454460496	906	Amanda	Clark	aclarkp5@facebook.com	Female	190.75.162.144	56022268731524616	Norway	7/19/1982	39551.7	General Manager	
+1454460516	68	Rachel	Price	rprice1v@census.gov	Female	89.52.192.105		Indonesia	5/6/1982	234502.16	Payment Adjustment Coordinator	
+1454460605	879	Diane	Flores	dfloresoe@wiley.com	Female	88.102.252.118	201739112087937	Philippines	12/2/1969	250449.32	Sales Associate	
+1454460715	676	Michael	Jackson	mjacksonir@scribd.com	Male	130.159.201.48	201788384710734	China	7/8/1957	170234.61	Database Administrator III	
+1454460728	550	Cheryl	Evans	cevansf9@yolasite.com	Female	244.155.129.93		Japan	7/24/1955	12380.49	Budget/Accounting Analyst II	
+1454460813	761	Kathleen	Cook	kcookl4@geocities.jp	Female	154.7.81.231		Bulgaria	5/12/1996	107594.9	Analyst Programmer	
+1454460817	599	Sean	Garcia	sgarciagm@blogger.com	Male	94.211.15.55	3557998741604165	Serbia	8/24/1963	131270.12	Structural Engineer	0/0
+1454460934	939	Keith	Hernandez	khernandezq2@amazon.com	Male	153.51.249.140	3550284883492520	Belarus	10/12/1977	56167.67	Environmental Tech	
+1454460945	763	Amanda	Miller	amillerl6@dagondesign.com	Female	15.140.92.92		Philippines	11/24/1979	118824.39	Structural Engineer	
+1454460961	664	Kathleen	Torres	ktorresif@vistaprint.com	Female	11.165.183.246		Nicaragua	4/6/1960	257366	Environmental Specialist	
+1454461065	17	Emily	Andrews	eandrewsg@cornell.edu	Female	29.231.180.172	30271790537626	Russia	4/13/1990	116800.65	Food Chemist	
+1454461083	569	Heather	Johnson	hjohnsonfs@skype.com	Female	3.121.91.120	3552946432961233	Argentina	11/24/1966	197315	Cost Accountant	
+1454461104	768	Gregory	James	gjameslb@businessweek.com	Male	80.18.249.93	30041579214659	Sweden		78310.93		
+1454461128	584	Lois	Ross	lrossg7@irs.gov	Female	176.213.236.60		Brazil	6/23/1989	95013.72	Database Administrator IV	999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
+1454461201	856	Mildred	Harper	mharpernr@samsung.com	Female	153.214.193.120	6763961170182948344	Finland		37573.27		
+1454461259	383	Beverly	Carter	bcarteram@wordpress.com	Female	4.251.6.51	3535631087457545	Indonesia	11/15/1982	272520.3	Compensation Analyst	
+1454461332	909	Samuel	Henry	shenryp8@163.com	Male	204.10.183.241	6771639706876926	Philippines	4/3/1998	164954.8	Compensation Analyst	
+1454461498	678	Wanda	Ford	wfordit@sitemeter.com	Female	63.28.195.79		Poland		28276.84		
+1454461562	801	Annie	Bradley	abradleym8@jimdo.com	Female	166.216.149.179		Poland	2/17/1970	267475.37	Quality Control Specialist	
+1454461671	643	Thomas	Hunter	thunterhu@pinterest.com	Male	91.145.126.98	3574840401671309	China	3/3/1962	201611.79	Programmer II	
+1454461690	428	Dennis	Marshall	dmarshallbv@bloglines.com		51.104.218.177	3544646067494556	Pakistan		\N		
+1454461771	3	Evelyn	Morgan	emorgan2@altervista.org	Female	7.161.136.94	6767119071901597	Russia	2/1/1960	144972.51	Structural Engineer	
+1454461843	832	Anthony	Duncan	aduncann3@merriam-webster.com	Male	54.202.218.90	3561384853362062	China	10/5/1982	239812.39	Human Resources Manager	
+1454461880	648	Eric	Bryant	ebryanthz@tripod.com	Male	11.228.180.159		Sweden	3/21/1981	46534.77	Budget/Accounting Analyst I	١٢٣
+1454462013	943	Arthur	Nelson	anelsonq6@sun.com	Male	201.79.146.145	5602257963938888	Ukraine		185554.08		
+1454462053	994	Carol	Williams	cwilliamsrl@army.mil	Female	53.242.60.20		France	1/5/1988	120933.54	Recruiter	
 === Try load data from userdata2.parquet
-1454506599	1	Donald	Lewis	dlewis0@clickbank.net	Male	102.22.124.20		Indonesia	7/9/1972	140249.37	Senior Financial Analyst	
-1454458948	2	Walter	Collins	wcollins1@bloglovin.com	Male	247.28.26.93	3587726269478025	China		\N		
-1454524144	3	Michelle	Henderson	mhenderson2@geocities.jp	Female	193.68.146.150		France	1/15/1964	236219.26	Teacher	
-1454506939	4	Lori	Hudson	lhudson3@dion.ne.jp		34.252.168.48	3568840151595649	Russia	4/22/1988	\N	Nuclear Power Engineer	
-1454458529	5	Howard	Miller	hmiller4@fema.gov	Male	103.193.150.230	3583473261055014	France	11/26/1998	50210.02	Senior Editor	
-1454496547	6	Frances	Adams	fadams5@123-reg.co.uk	Female	106.196.106.93		Russia	3/27/1997	82175.77	Account Coordinator	
-1454528652	\N	Steven	Hanson	shanson6@cisco.com	Male	234.130.172.185	3550842607768119	Indonesia		129582.61		
-1454487094	8	Louis	Simmons	lsimmons7@icio.us	Male	18.69.80.15		China	6/1/1992	90744.86	Product Engineer	
-1454543811	9	Keith	Parker	kparker8@amazonaws.com	Male	108.205.40.64		Guadeloupe	12/30/1992	60618.9	Developer II	
-1454485649	10	Wanda	Walker	wwalker9@latimes.com	Female	246.214.98.78	3539421569669478	Portugal		137664.53		
-1454517563	11	Kathryn	Weaver	kweavera@bizjournals.com	Female	157.237.161.75	201425019338900	Sweden		117572.65		
-1454482256	12	Philip	Ward	pwardb@sakura.ne.jp	Male	77.140.225.69	201508031789224	Greece	9/3/1984	238925.79	Human Resources Manager	
-1454542618	13	Evelyn	Harvey	eharveyc@time.com		254.174.154.7	3539535868968594	China	5/15/1979	\N	Software Engineer III	
-1454484804	14	Andrea	Lane	alaned@gov.uk	Female	192.253.116.192	5100174455306952	Indonesia	1/19/1989	166778.42	Operator	
-1454507104	15	Bobby	Vasquez	bvasqueze@furl.net	Male	126.60.18.195	3581051861650673	Philippines	1/25/1975	138184.83	Senior Editor	
-1454536690	16	Kenneth	Gibson	kgibsonf@soundcloud.com	Male	91.153.142.170	5389947292571488	Peru	11/3/1975	98614.53	Environmental Tech	
-1454516554	17	Emily	Hill	ehillg@house.gov	Female	109.107.174.205		Palestinian Territory	5/18/1956	218781.48	Executive Secretary	
-1454541649	18	Kelly	Fowler	kfowlerh@dell.com	Female	147.58.88.116	3551741291105936	Greece	6/11/1975	117249.56	Systems Administrator III	
-1454524126	19	Diana	Howell	dhowelli@sphinn.com	Female	21.240.75.42	4026635872860296	Iran	7/7/1993	174844.52	Teacher	
-1454466206	20	Johnny	Collins	jcollinsj@google.ca	Male	38.173.129.250	372301677387203	Afghanistan	7/28/1987	155908.69	Social Worker	
-1454493912	21	Frank	Bradley	fbradleyk@shinystat.com	Male	186.9.38.46	4913033819988246	Czech Republic		211051.83		
-1454509391	22	Billy	Thomas	bthomasl@moonfruit.com	Male	143.89.197.162	4026052248187794	Czech Republic	10/7/1991	282061.72	Professor	👾 🙇 💁 🙅 🙆 🙋 🙎 🙍 
-1454523133	23	Philip	Moreno	pmorenom@rambler.ru	Male	9.39.210.239	4041597502244971	United States		122560.95		
-1454536839	24	Billy	Ray	brayn@meetup.com	Male	230.255.220.160	201925598515489	Kazakhstan	2/9/1966	130424.35	VP Accounting	사회과학원 어학연구소
-1454509252	25	Ryan	Wilson	rwilsono@forbes.com	Male	197.77.142.137		Poland	7/4/1961	280703.91	Software Test Engineer III	
-1454458024	26	Sandra	Coleman	scolemanp@blogger.com	Female	230.159.39.252	3555708337891155	China	8/7/1971	113688.11	VP Sales	
-1454513250	27	Evelyn	Moreno	emorenoq@chronoengine.com	Female	126.96.111.52	3557508895347766	United States	8/17/1990	167131.57	Recruiting Manager	
-1454509036	28	Elizabeth	Warren	ewarrenr@flavors.me	Female	213.8.204.211	67099385430526802	China	6/14/1996	119515.12	Media Manager II	
-1454541241	29	Linda	Hawkins	lhawkinss@fotki.com	Female	206.6.3.196	4913079795915711	Philippines	2/14/1961	107779.93	Technical Writer	
-1454493935	30	Janice	Day	jdayt@devhub.com	Female	243.24.120.209		Ukraine	6/9/1972	53906.4	Marketing Manager	
-1454483872	31	Diane	Perez	dperezu@ihg.com	Female	182.136.218.77		Belarus	2/9/1957	170326.91	Chief Design Engineer	
-1454529216	32	Bruce	Robinson	brobinsonv@redcross.org	Male	5.126.135.106	201769377515751	Philippines		169520.45		
-1454470160	33	Daniel	Lawrence	dlawrencew@usgs.gov	Male	200.168.191.214	4911581295367856744	United States	5/7/1967	199535.76	VP Sales	
-1454474809	34	Theresa	James	tjamesx@quantcast.com	Female	83.122.166.224	3545570545148759	Russia		104683.19		
-1454536922	35	Scott	Russell	srusselly@printfriendly.com	Male	92.233.3.208		Bolivia		205730.41		
-1454514354	36	Ruby	Vasquez	rvasquezz@toplist.cz	Female	8.148.83.49		France	11/5/1999	95407.16	Financial Advisor	
-1454524074	37	Jeffrey	Hall	jhall10@pagesperso-orange.fr	Male	91.103.226.35	3531476231658075	Indonesia	5/29/1987	247716.37	Business Systems Development Analyst	
-1454477697	38	Debra	Kennedy	dkennedy11@state.tx.us	Female	116.247.236.130	676732277565853203	Mexico	5/22/1955	272563.67	Desktop Support Technician	
-1454464041	39		Cole		Male	157.157.28.86	4911512925983388490	Panama		91174.63		
-1454521471	40	Helen	Sanchez	hsanchez13@oakley.com	Female	222.122.74.77		Venezuela	2/11/1969	189240.59	Food Chemist	
-1454527305	41	Jennifer	Russell	jrussell14@cpanel.net	Female	42.82.215.191		Morocco		80644.64		1E02
-1454479360	42	Fred	Marshall	fmarshall15@ifeng.com		160.92.143.233	6374102245574313	China	12/18/1984	\N	Structural Engineer	
-1454464402	43	Terry	Ford	tford16@shop-pro.jp	Male	169.34.131.192	3588107849306045	Turkmenistan		286388.01		
-1454468866	44	Maria	Mason	mmason17@miibeian.gov.cn	Female	213.62.60.224	060438374765421941	Sweden	7/6/1973	34664.91	Social Worker	
-1454486568	45	Sharon	Schmidt	sschmidt18@istockphoto.com	Female	111.247.11.124	5100179876769597	Argentina	10/4/1982	150142.49	Mechanical Systems Engineer	
-1454483332	46	Gregory	Jones	gjones19@jimdo.com	Male	132.88.44.128	30372001476487	China	12/31/1972	240265.01	Design Engineer	
-1454520829	47	Raymond	Moore	rmoore1a@arizona.edu		89.39.221.170	5602248693774107	Japan	4/24/1956	\N	VP Sales	
-1454531788	48	Tammy	Scott	tscott1b@mlb.com	Female	236.12.148.59	3577211980737555	Peru	10/14/1959	132064.01	Software Consultant	
-1454480004	49	Willie	Alexander	walexander1c@home.pl	Male	2.199.150.177		Brazil	10/14/1958	26424.57	Executive Secretary	｀ｨ(´∀｀∩
-1454473891	50	William	Garrett	wgarrett1d@java.com	Male	20.24.142.67		Croatia	10/9/1963	181424.2	Database Administrator III	
-1454463118	51	Patricia	Peterson	ppeterson1e@cpanel.net	Female	77.242.54.160	3585161324543005	Peru	3/5/1987	176561.19	Media Manager III	
-1454488118	52	Andrew	Cook	acook1f@ftc.gov	Male	220.139.174.228	6333320102003586	Bolivia	3/8/1969	185775.61	Computer Systems Analyst III	
-1454536072	53	Carol	Nichols	cnichols1g@statcounter.com	Female	233.176.31.182	3543580855019963	Nigeria	1/6/1960	105346.38	Compensation Analyst	
-1454489053	54	Jimmy	Morales	jmorales1h@archive.org	Male	199.160.215.73	3587538933267985	Kiribati	8/25/1961	146625.62	Assistant Media Planner	
-1454538033	55	Nancy	Montgomery	nmontgomery1i@freewebs.com	Female	11.235.20.56	3586137339728301	China		128631.29		$1.00
-1454461902	56	Thomas	Freeman	tfreeman1j@java.com	Male	161.123.216.250	3536920916224146	Colombia	8/4/1973	239571.27	Senior Developer	
-1454488504	57	Virginia	Bell	vbell1k@aboutads.info	Female	79.142.13.145	3585595583423005	Malaysia	4/2/1998	252007.47	Actuary	
-1454496671	58	Tammy	Adams	tadams1l@virginia.edu	Female	106.207.61.165	3528072249217643	Canada	1/26/1973	98463.77	Business Systems Development Analyst	
-1454516066	59	Cynthia	Robertson	crobertson1m@alibaba.com	Female	106.110.239.97		Belarus	12/20/1962	90950.39	Help Desk Technician	
-1454523801	60	Steven	Romero	sromero1n@usa.gov	Male	65.249.97.254	5007669084530801	Argentina	9/27/1963	14358.32	Quality Control Specialist	
-1454458452	61	Sean	Greene	sgreene1o@goo.gl	Male	71.195.178.59	5602246313163081	China	2/20/1991	70656.63	Sales Representative	
-1454537851	62	Jerry	Turner	jturner1p@scribd.com	Male	69.148.19.138	3561778321182616	New Zealand	5/25/1991	89186	Information Systems Manager	
-1454523562	63	Jennifer	Mendoza	jmendoza1q@shutterfly.com	Female	54.114.8.9	3544098267391200	Russia	7/8/1973	263720.16	General Manager	
-1454477002	64	Roy	Hughes	rhughes1r@stanford.edu	Male	209.120.70.78	3552886646968253	Canada	10/30/1968	191750.33	Mechanical Systems Engineer	
-1454477109	65	Susan	Jenkins	sjenkins1s@princeton.edu	Female	247.155.65.12		Philippines	3/1/1967	86339.04	VP Sales	
-1454527329	66	Norma	Dunn	ndunn1t@pen.io	Female	250.241.78.109		China	7/20/1967	77739.6	Web Designer I	
-1454461701	67	Tina	Reid	treid1u@163.com	Female	116.38.145.226		Germany	4/25/1967	228301.51	Financial Analyst	
-1454478121	68	Cynthia	Daniels	cdaniels1v@pinterest.com	Female	17.140.57.238	3589952234971047	Burundi	1/9/1956	42221.96	Research Nurse	
-1454462100	69		Wells		Male	92.13.7.20		Philippines	7/4/1969	78486.77	Tax Accountant	
-1454516337	70	Stephen	Butler	sbutler1x@moonfruit.com	Male	230.147.124.190		Argentina		125060.01		
-1454459366	71	Jacqueline	Wallace	jwallace1y@dagondesign.com	Female	203.83.140.84	3578315582149538	Turkmenistan	4/15/1997	89436.49	Cost Accountant	
-1454479818	72	Carol	Dunn	cdunn1z@ocn.ne.jp	Female	241.2.84.72	5602252003430282308	Bulgaria	2/1/1981	203473.36	Geological Engineer	
-1454505977	73	Russell	Williams	rwilliams20@imgur.com	Male	21.217.68.126	3566925409646658	Slovenia	1/30/1977	252402.64	Librarian	
-1454476392	74	Kathryn	Torres	ktorres21@rakuten.co.jp	Female	4.124.222.88	4026779356659103	Portugal	7/31/1956	121285.58	Project Manager	
-1454463675	75	Larry	Mason	lmason22@alibaba.com	Male	172.104.78.232	3587717468815331	Sweden	4/20/1969	248583.77	Professor	
-1454517479	76	Rachel	Dunn	rdunn23@hugedomains.com	Female	101.213.94.161	6374938227969686	Peru	6/18/1999	79245.45	Chief Design Engineer	
+1454457626	638	Richard	Perkins	rperkinshp@princeton.edu	Male	206.117.180.117		China	4/11/2000	123221.64	Tax Accountant	
 1454457675	77	Doris	Elliott	delliott24@shinystat.com	Female	36.27.140.126		Portugal	9/23/1987	98288.74	Design Engineer	
-1454483215	78	William	Mendoza	wmendoza25@prlog.org	Male	71.28.136.31	3580069171786970	China	3/20/1967	81965.94	Media Manager II	"ثم نفس سقطت وبالتحديد،
-1454504790	79	Elizabeth	Payne	epayne26@about.me	Female	40.237.87.45	337941052859146	Estonia		49661.99		
-1454481311	80	Dennis	Robertson	drobertson27@w3.org	Male	189.45.163.164		Italy	5/2/1972	19984.47	Web Developer III	
-1454514914	81	Edward	Little	elittle28@mozilla.org	Male	114.189.184.212		South Korea	11/19/1984	141645.22	Senior Sales Associate	../../../../../../../../../../../etc/passwd%00
-1454530264	82	Roy	Tucker	rtucker29@vistaprint.com	Male	254.148.189.172		Portugal		285617.13		
-1454510066	83	Matthew	Gardner	mgardner2a@wix.com	Male	91.23.27.42	5602247355547230028	Brazil	1/18/1977	267617.18	Actuary	
-1454535958	84	Anthony	Palmer	apalmer2b@uol.com.br		25.228.124.126	3561410660537354	China	7/4/1974	\N	Human Resources Assistant III	
-1454460668	85	John	Hudson	jhudson2c@rediff.com	Male	75.191.191.171	3538638405093479	Georgia	6/22/1994	82621.71	Tax Accountant	
-1454479399	86	Jonathan	Mills	jmills2d@mail.ru	Male	224.145.163.163	36504499928546	Philippines		77260.7		00˙Ɩ$-
-1454491670	87	Christine	Jackson	cjackson2e@feedburner.com	Female	8.207.125.219		Philippines	6/12/1964	32832.61	Occupational Therapist	
-1454475253	88	Eric	Fernandez	efernandez2f@artisteer.com	Male	246.217.21.160		France		124825.77		
-1454483421	89	Heather	Diaz	hdiaz2g@tmall.com	Female	220.248.165.145	502080553226612964	China	7/26/1966	280714.33	Food Chemist	
-1454515874	90	Nicole	Reid	nreid2h@cisco.com	Female	10.75.131.59	5610704755842409780	Philippines	12/15/1985	24922.19	Marketing Assistant	
-1454542340	91	Donald	Murphy	dmurphy2i@fema.gov	Male	127.141.234.199		China	4/10/1977	76449.81	Cost Accountant	
-1454531823	92	Steven	Wagner	swagner2j@go.com	Male	211.154.182.230		United Kingdom		249411.22		
-1454539859	93	Ruth	Alvarez	ralvarez2k@sciencedaily.com		240.195.230.204		South Korea	7/11/1964	\N	Senior Developer	
-1454462055	94	Carl	Oliver	coliver2l@cafepress.com	Male	199.184.71.24		China	6/26/1967	215279.38	Operator	(╯°□°）╯︵ ┻━┻)  
+1454457741	472	Sara	Collins	scollinsd3@yellowbook.com	Female	238.228.239.222	5002357683259593	Philippines	1/6/1966	220244.65	Internal Auditor	-1E02
+1454457764	681	Samuel	Foster	sfosteriw@github.io	Male	101.228.90.125	676725448783712104	Brazil	6/27/1982	275514.12	Office Assistant II	
+1454457800	216	Robin	Reed	rreed5z@guardian.co.uk		191.104.133.70		Portugal	3/15/1978	\N	Desktop Support Technician	test⁠test‫
+1454457912	321	Joe	Collins	jcollins8w@google.com.hk	Male	135.236.105.189	3573647966682865	Dominican Republic		106582.46		
+1454457928	837	Jonathan	Romero	jromeron8@hp.com	Male	129.49.88.101	30180713638645	Brazil	2/27/1957	238966.77	Speech Pathologist	
 1454457982	95	Teresa	Ruiz	truiz2m@diigo.com	Female	22.118.240.24	337941028849437	Brazil	7/25/1994	243603.67	Cost Accountant	
-1454465475	96	Kathryn	Carter	kcarter2n@fastcompany.com	Female	203.255.226.40		Greece	1/23/1969	34951.57	Registered Nurse	
-1454542755	97	Fred	Perry	fperry2o@imgur.com		46.52.134.142	3544236333368634	Indonesia	2/6/1966	\N	Programmer Analyst III	
-1454477885	98	Harry	Perkins	hperkins2p@domainmarket.com	Male	235.202.132.85	374288817366643	Russia	1/9/1962	167340.53	Physical Therapy Assistant	
-1454509699	99	Bobby	Hicks	bhicks2q@wix.com	Male	253.252.57.121	3555445397654443	United States	8/10/1964	238304.33	Quality Control Specialist	Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮
-1454515572	100	Tammy	Dunn	tdunn2r@list-manage.com	Female	162.156.75.67		Brazil	4/24/1980	163106.38	Sales Representative	
+1454458012	218	Samuel	Reed	sreed61@sohu.com	Male	131.124.128.124	3540638382406385	Brazil		257041.54		
+1454458014	128	Harold	Jenkins	hjenkins3j@hostgator.com		204.144.188.106	374283629923426	Dominican Republic		\N		
+1454458024	26	Sandra	Coleman	scolemanp@blogger.com	Female	230.159.39.252	3555708337891155	China	8/7/1971	113688.11	VP Sales	
+1454458038	609	Joyce	Palmer	jpalmergw@mashable.com	Female	164.56.14.55	6371540406366768	China		201121.46		
+1454458083	879	Kevin	Meyer	kmeyeroe@squarespace.com	Male	233.187.65.16		France		98010.89		
+1454458190	705	Beverly	Gonzales	bgonzalesjk@wufoo.com	Female	38.31.68.95	4405331360959318	Philippines	9/21/1957	42738.65	Director of Sales	
+1454458307	237	Richard	Grant	rgrant6k@etsy.com	Male	241.252.232.2	6304639002149768801	Poland	2/23/1991	71635.33	Paralegal	
+1454458377	986	Melissa	George	mgeorgerd@apple.com	Female	143.50.124.180	5602226915795555	Czech Republic	12/6/1962	63403.41	Internal Auditor	
+1454458390	181	Scott	Marshall	smarshall50@geocities.jp	Male	137.234.29.113	3571996025746621	Philippines	4/23/1978	206952.7	Staff Scientist	␣
+1454458452	61	Sean	Greene	sgreene1o@goo.gl	Male	71.195.178.59	5602246313163081	China	2/20/1991	70656.63	Sales Representative	
+1454458464	327	Janice	Matthews	jmatthews92@guardian.co.uk	Female	71.195.173.202	6304527633260205	Russia	7/29/2000	157292.61	Physical Therapy Assistant	
+1454458470	657	Kathy	Boyd	kboydi8@skyrock.com		36.183.199.94	6389206450992194	China	4/24/1982	\N	General Manager	🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧
+1454458494	390	Chris	Mason	cmasonat@purevolume.com	Male	21.36.118.254		China	4/28/1983	168120.17	Sales Representative	
+1454458497	365	Albert	Mills	amillsa4@t.co	Male	181.108.162.242		China	8/25/1962	180913.71	Recruiter	
+1454458508	999	Marie	Medina	mmedinarq@thetimes.co.uk	Female	223.83.175.211		Kazakhstan	3/25/1969	53564.76	Speech Pathologist	
+1454458512	185	Brandon	Williamson	bwilliamson54@vimeo.com	Male	4.249.36.104	4913822210519505	Russia		277603.75		
+1454458529	5	Howard	Miller	hmiller4@fema.gov	Male	103.193.150.230	3583473261055014	France	11/26/1998	50210.02	Senior Editor	
+1454458591	978	Jean	Jacobs	jjacobsr5@springer.com	Female	143.77.255.89	6377468383747335	Guatemala	11/13/1977	218108.02	Accounting Assistant III	
+1454458647	788	Dennis	Price	dpricelv@google.co.jp	Male	50.213.201.120	3588056573581168	Albania	10/29/1962	218338.58	Environmental Specialist	
+1454458655	450	Rose	Mccoy	rmccoych@livejournal.com	Female	91.93.75.71		Dominican Republic	1/2/1972	192818.85	Executive Secretary	\N
+1454458657	213	Norma	Garrett	ngarrett5w@technorati.com	Female	65.49.237.93		Albania		80916.71		
+1454458725	110	Theresa	Gardner	tgardner31@photobucket.com	Female	232.118.202.192		Ukraine	1/6/1982	243844.4	Health Coach II	
+1454458764	346	Thomas	Richards	trichards9l@ifeng.com	Male	0.111.159.70	5610777337517834253	Thailand	2/19/1981	221644.31	Analog Circuit Design manager	
+1454458768	430	Linda	Harvey	lharveybx@google.ca	Female	138.19.27.11		Indonesia	8/19/1961	200606	Teacher	-1/2
+1454458782	287	Martin	Ferguson	mferguson7y@eventbrite.com	Male	67.188.95.86		Portugal	7/2/1981	262746.89	Cost Accountant	
+1454458853	926	Joan	Graham	jgrahampp@icio.us	Female	209.238.1.225	3557860962551501	China	3/1/1972	197284.8	Chief Design Engineer	‪‪test‪
+1454458888	533	Sarah	Jordan	sjordanes@europa.eu	Female	120.197.115.153	5002357582121340	Indonesia	9/10/1963	146649.24	Programmer Analyst IV	
+1454458948	2	Walter	Collins	wcollins1@bloglovin.com	Male	247.28.26.93	3587726269478025	China		\N		
+1454459077	720	Theresa	Hayes	thayesjz@dion.ne.jp	Female	43.78.228.159		Russia		231701.16		
+1454459120	214	Margaret	Hughes	mhughes5x@biglobe.ne.jp	Female	36.234.5.134	3546342491809456	Azerbaijan		127862.72		˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs \'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ \'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥
+1454459148	737	Joseph	Gray	jgraykg@bbb.org	Male	60.23.118.26	3540391233313117	United States		159699.28		
+1454459184	419	Larry	Black	lblackbm@github.com	Male	61.181.102.70	5108758999951786	Canada	4/12/1997	263463.01	Staff Accountant I	
+1454459341	559	Raymond	Gray	rgrayfi@mapy.cz	Male	104.112.4.152	201619406564124	Brazil	4/29/1955	132421.37	VP Quality Control	和製漢語
+1454459366	71	Jacqueline	Wallace	jwallace1y@dagondesign.com	Female	203.83.140.84	3578315582149538	Turkmenistan	4/15/1997	89436.49	Cost Accountant	
+1454459447	315	Earl	Rivera	erivera8q@weebly.com	Male	249.22.156.255	6333306262684398	Macedonia		33051.81		""""
+1454459464	298	Johnny	Kelly	jkelly89@dailymail.co.uk	Male	56.120.150.167	4614973744018	Malaysia	10/20/1965	254369.91	Automation Specialist III	
+1454459540	329	Mary	Diaz	mdiaz94@macromedia.com	Female	60.49.220.52	5108751463671162	Mongolia	9/12/1997	112279.71	Project Manager	
+1454459624	842	Brenda	Jones	bjonesnd@mysql.com	Female	200.142.153.124		Colombia	10/1/1963	250051.84	Safety Technician III	
+1454459634	775	Lillian	Ryan	lryanli@t-online.de	Female	152.216.220.164	3541599165648107	Iran	8/19/1967	138178.35	VP Marketing	
+1454459634	998	Stephanie	Sims	ssimsrp@newyorker.com	Female	135.66.68.181	3548125808139842	Poland		112275.78		
+1454459658	659	Julie	Anderson	jandersonia@shareasale.com	Female	21.61.224.82	343450744553044	Netherlands	12/27/1976	68225.51	Compensation Analyst	
+1454459679	634	Harry	Olson	holsonhl@skyrock.com	Male	57.82.212.119	5002351465267817	Chile	4/3/1956	173608.69	Assistant Professor	
+1454459732	892		Thompson		Female	9.228.212.189		Czech Republic	10/3/1964	184732.94	Budget/Accounting Analyst IV	
+1454459817	495	Steve	Ramos	sramosdq@go.com	Male	209.215.139.231	5602239349519376	France		194636.12		
+1454459838	271	Nicole	Wright	nwright7i@businessinsider.com	Female	213.168.29.131	3551761943539373	Chile	2/22/1967	34243.03	Budget/Accounting Analyst III	
+1454459839	424	Kimberly	Coleman	kcolemanbr@bizjournals.com	Female	83.237.12.153	5641829981259605	Iran		280387.11		
+1454459870	701	Bobby	Chavez	bchavezjg@tinypic.com	Male	71.18.120.35	3575292555485293	China	5/20/1965	13910.56	Product Engineer	åß∂ƒ©˙∆˚¬…æ
+1454459921	954	Willie	Thomas	wthomasqh@earthlink.net	Male	173.219.113.26	3560763628353111	Mexico	5/31/1990	201325.44	Programmer Analyst I	
+1454459944	694	Theresa	Graham	tgrahamj9@amazon.com	Female	176.19.106.64	3539554098566813	China	4/8/1983	155735.87	Administrative Assistant III	
+1454459984	693	Jonathan	Graham	jgrahamj8@berkeley.edu	Male	239.139.123.46	3581752291204508	Sweden	9/12/1961	16159.02	Statistician III	
+1454460022	127	Anna	Moreno	amoreno3i@cafepress.com	Female	2.85.251.176	5610875550247635	Guatemala	12/30/1983	156757.41	Research Nurse	
+1454460158	232	Susan	Burns	sburns6f@cbsnews.com	Female	2.93.31.196	5602245359290816	China	10/25/1992	58832.39	Research Assistant IV	
+1454460185	711	Alice	Robertson	arobertsonjq@sakura.ne.jp	Female	182.147.6.194		Thailand	8/9/1955	54046.02	Legal Assistant	
+1454460227	661	Phyllis	Brown	pbrownic@macromedia.com	Female	115.89.196.124		Brazil	7/31/1990	245014.11	Librarian	
+1454460293	146	Christina	Gibson	cgibson41@over-blog.com	Female	226.138.197.167		China	3/14/1987	201589	Accountant II	
+1454460311	259	Donna	Marshall	dmarshall76@jimdo.com	Female	249.36.126.149	6709877241918640	Indonesia	4/15/1986	281443.65	Structural Engineer	１２３
+1454460317	899	Harold	Robinson	hrobinsonoy@privacy.gov.au	Male	94.237.36.16	5602247816220394	Philippines	10/3/1955	181832.97	Civil Engineer	0/0
+1454460450	391		Stone		Female	205.229.198.173		Portugal	10/13/1968	173807.29	Web Developer I	
+1454460563	814	Kelly	Riley	krileyml@4shared.com		166.51.39.101	3529610026130015	China	6/24/1987	\N	Data Coordiator	
+1454460586	350	Ruth	Green	rgreen9p@vk.com	Female	170.37.204.80	3567581372052553	Poland	10/30/1990	76094.37	Community Outreach Specialist	
+1454460599	284	Joyce	Bryant	jbryant7v@stumbleupon.com	Female	125.142.215.135	3551722227261571	Czech Republic		26866.76		""""
+1454460658	129	Paula	Oliver	poliver3k@barnesandnoble.com	Female	108.49.104.111	3551237510305944	China		149572.54		
+1454460668	85	John	Hudson	jhudson2c@rediff.com	Male	75.191.191.171	3538638405093479	Georgia	6/22/1994	82621.71	Tax Accountant	
+1454460753	578	Clarence	Gonzales	cgonzalesg1@fc2.com		13.29.242.81	30237628216824	Norway		\N		
+1454460790	754	Rose	Brooks	rbrookskx@chron.com	Female	99.103.60.118	201422963957371	China	4/8/1994	201004.89	Legal Assistant	1/2
+1454460792	118	Charles	Gonzalez	cgonzalez39@google.com.au	Male	52.126.168.127		Nigeria	8/26/1958	108318.24	Internal Auditor	
+1454460806	479	Henry	Scott	hscottda@cornell.edu	Male	53.161.182.142	5602240199354518	Indonesia	6/22/1992	32141.19	Assistant Professor	
+1454460806	791	Anthony	Butler	abutlerly@springer.com	Male	84.141.89.156		Czech Republic	8/21/1969	282078.29	Health Coach IV	
+1454460833	1000	Alice	Peterson	apetersonrr@parallels.com	Female	244.89.94.58	5602227843485236	Nigeria		239858.7		
+1454460836	246	Billy	Spencer	bspencer6t@mozilla.com	Male	1.121.193.207	5127963978663124	Malta		275300.87		
+1454460842	236	Susan	Wilson	swilson6j@mapy.cz	Female	253.105.50.250	4913609318117229	Cameroon	5/10/2000	135956.76	Director of Sales	
+1454460867	161	Janice	Armstrong	jarmstrong4g@sciencedirect.com	Female	76.231.89.120	6759331684315962	Philippines	7/14/1996	64638.14	Project Manager	
+1454460947	250		Larson		Male	250.66.116.249	6709520051264027651	Indonesia	9/30/1975	121560.88	Staff Accountant I	
+1454460979	951	Arthur	Long	alongqe@devhub.com	Male	92.244.136.245	4175006438208322	China	3/4/1959	74667.22	Pharmacist	
+1454461020	339	Doris	Bennett	dbennett9e@de.vu	Female	98.5.171.133	4041599256556998	Nicaragua		85802.06		$1.00
+1454461049	725	Patrick	Rodriguez	prodriguezk4@blogs.com	Male	233.167.251.29	3543135453573752	Poland	8/10/1956	129023.91	Web Designer IV	
+1454461082	359	Ruby	Fox	rfox9y@chron.com	Female	39.224.24.103	3566813987246457	Moldova		199091.31		
+1454461084	488	Mark	Weaver	mweaverdj@dot.gov	Male	36.130.233.58	3568615406520315	China		225258.27		
+1454461184	802	Joyce	Lopez	jlopezm9@ocn.ne.jp	Female	232.61.24.78		Ecuador		258343.17		
+1454461219	258	Paul	Gordon	pgordon75@gravatar.com	Male	160.61.49.169	3567008825292446	Czech Republic	2/25/2000	258680.6	Structural Analysis Engineer	
+1454461293	230	Victor	Campbell	vcampbell6d@stumbleupon.com	Male	212.43.106.70		China	9/19/1993	42985.78	Analog Circuit Design manager	
+1454461314	421	Timothy	Gomez	tgomezbo@examiner.com	Male	33.5.250.113	373343849259778	Czech Republic		215485.48		
+1454461350	944	Kelly	Hanson	khansonq7@phpbb.com		250.78.86.48		United States	1/2/1969	\N	Account Executive	
+1454461510	985	Rachel	Holmes	rholmesrc@hubpages.com	Female	182.16.233.193	3578965006812598	Nigeria	4/1/1980	273229.15	Assistant Professor	
+1454461537	400	Arthur	Smith	asmithb3@accuweather.com	Male	107.97.38.111	5602233710304252	China	1/30/1985	114652.62	Mechanical Systems Engineer	
+1454461604	993	Christina	Hayes	chayesrk@xing.com	Female	199.58.20.93		North Korea	10/30/1967	121659.5	Librarian	
+1454461701	67	Tina	Reid	treid1u@163.com	Female	116.38.145.226		Germany	4/25/1967	228301.51	Financial Analyst	
+1454461723	708	Carlos	Mason	cmasonjn@state.tx.us	Male	171.189.25.159	5402971302511824	Thailand	4/8/1965	163810.9	Business Systems Development Analyst	
+1454461756	816	Sara	Sanders	ssandersmn@cornell.edu	Female	54.250.225.134		Netherlands	7/26/1998	261953.95	Quality Engineer	
+1454461763	299	Diane	Watkins	dwatkins8a@netvibes.com		141.246.209.93		Yemen		\N		
+1454461897	976	Paula	Ross	prossr3@tumblr.com		39.229.193.40	3535447138661799	Jordan	8/19/1990	\N	Budget/Accounting Analyst IV	
+1454461902	56	Thomas	Freeman	tfreeman1j@java.com	Male	161.123.216.250	3536920916224146	Colombia	8/4/1973	239571.27	Senior Developer	
 === Try load data from userdata3.parquet
-1454515666	1	Ernest	Fuller	efuller0@examiner.com	Male	106.72.28.74	5610608195667267	Israel		140639.36		
-1454536327	2	Anthony	Foster	afoster1@weibo.com	Male	156.243.130.166	4508242795214771	Indonesia	1/16/1998	172843.61	Developer II	👾 🙇 💁 🙅 🙆 🙋 🙎 🙍 
-1454466139	3	Ryan	Montgomery	rmontgomery2@mozilla.org	Male	28.55.168.128		Colombia	11/21/1978	204620.66	Developer I	␢
-1454473204	4	Brenda	Nelson	bnelson3@photobucket.com	Female	185.81.160.85		Guatemala	10/29/1998	260474.12	GIS Technical Architect	
-1454458516	5	Jacqueline	Ellis	jellis4@amazon.com	Female	158.137.238.6		Russia	7/12/1959	286038.78	Marketing Assistant	
-1454528894	6	Paul	Ferguson	pferguson5@gmpg.org	Male	141.122.136.144	30501574577558	Thailand		241518.24		
-1454489945	7	Linda	Hunt	lhunt6@prlog.org	Female	104.179.97.82		Russia	3/30/1988	192756.38	Professor	
-1454486691	8	Frances	Kim	fkim7@blog.com	Female	28.77.158.48	676306013856639159	Indonesia		188511.28		<svg><script>0<1>alert(\'XSS\')</script>
-1454487153	9	Jason	Matthews	jmatthews8@google.co.uk	Male	72.129.239.24	3534550235909507	China	7/29/1982	238068.56	Web Designer III	
-1454519282	10	Carolyn	Elliott	celliott9@cpanel.net	Female	51.211.70.30	3563436733386899	Indonesia	4/28/1977	132718.26	Research Nurse	
-1454473379	11	Thomas	Mills	tmillsa@psu.edu	Male	104.114.227.199	5018278895598921190	Russia		236386.69		
-1454534367	12	Russell	Lee	rleeb@howstuffworks.com	Male	193.165.137.217		China		280252.36		🐵 🙈 🙉 🙊
-1454525264	13	Chris	Bailey	cbaileyc@redcross.org	Male	246.109.118.154	30485245023962	Thailand	11/26/1970	200218.34	Research Assistant I	
+1454457607	457	Clarence	Hunt	chuntco@drupal.org	Male	89.135.47.216		Zambia	9/27/1977	97179.31	Staff Accountant III	1E02
+1454457613	723	Arthur	Jones	ajonesk2@theguardian.com	Male	31.151.216.146		France	2/6/1986	12068.96	Teacher	
+1454457706	234	Doris	Grant	dgrant6h@nasa.gov	Female	195.132.180.36	5602256096038525	Colombia	7/14/1969	283813.79	Senior Cost Accountant	
 1454457712	14	Eric	Parker	eparkerd@usa.gov	Male	25.73.91.135	5602249431899032	Russia	8/12/1986	102832.54	Tax Accountant	
-1454526788	15	Anne	Robertson	arobertsone@geocities.jp	Female	209.77.27.30		Armenia		168201.04		　
-1454494278	16	Angela	Gonzalez	agonzalezf@state.gov	Female	118.77.43.191		Sweden	7/1/1972	161220.37	Database Administrator I	
-1454488522	17	Edward	Moreno	emorenog@hp.com	Male	200.50.125.67	3559979696602303	France	8/17/1966	144551.41	Chief Design Engineer	
-1454496145	18	Roy	Murray	rmurrayh@sphinn.com	Male	91.52.226.221	3546330084792460	Portugal		285872.87		𠜎𠜱𠝹𠱓𠱸𠲖𠳏
-1454492939	19	Louis	Willis	lwillisi@hp.com		14.132.82.250		Philippines	8/1/1980	\N	Director of Sales	
-1454530172	20	Edward	Perez	eperezj@china.com.cn	Male	24.152.201.59	3571014044514515	Indonesia		29515.23		
-1454518522	21	Nicole	Price	npricek@cpanel.net	Female	4.21.204.142		Peru	5/8/1978	154023.3	Office Assistant III	
-1454496552	22	Virginia	Nichols	vnicholsl@ning.com	Female	160.202.18.170	30166467912021	Greece	5/10/1966	145509.34	Programmer II	
-1454474290	23	Katherine	Roberts	krobertsm@hostgator.com	Female	247.21.118.188		Cuba		192723.43		
-1454522256	24	Emily	Sullivan	esullivann@sakura.ne.jp	Female	33.152.103.14	4074771539744796	Indonesia	6/28/1965	36127.55	VP Sales	
-1454527958	25	Susan	Turner	sturnero@google.pl		150.94.47.96	374283138983226	United States		\N		
-1454540961	26	Fred	Jenkins	fjenkinsp@walmart.com	Male	219.195.7.86		China	3/23/1965	69388.75	Human Resources Assistant I	
-1454496916	27	Jane	Torres	jtorresq@photobucket.com	Female	147.220.219.158	5002353015111222	Indonesia	9/29/1997	226788.25	Occupational Therapist	
-1454508711	28	Louis	Patterson	lpattersonr@wp.com	Male	158.176.255.43	5100145505218793	China	9/20/1993	30309.45	VP Quality Control	
-1454538643	29	Brandon	Wagner	bwagners@slashdot.org	Male	124.203.101.37	6771208405057819279	Iraq	10/3/1959	95522.88	Research Associate	
-1454484725	30	Amy	Jenkins	ajenkinst@wikia.com	Female	21.0.126.111	3542005201579396	Ethiopia	9/26/1984	167682.84	Tax Accountant	"""\'""\'""\'\'\'"""
-1454513613	31	Timothy	Frazier	tfrazieru@toplist.cz		100.218.94.178		China	5/17/1963	\N	Director of Sales	0.00
-1454463548	32	Phillip	Meyer	pmeyerv@live.com	Male	184.208.76.39	3541248561759148	France	11/3/1974	245572.41	Nurse	
-1454528692	33	Joe	Wallace	jwallacew@mail.ru	Male	167.122.66.246	5602246900361320	Russia		64311.11		
-1454466352	34	Walter	Rivera	wriverax@de.vu	Male	67.169.221.120	5366484318587717	Russia	1/28/1983	271690.8	Programmer Analyst I	
-1454480715	35	Lois	Mcdonald	lmcdonaldy@paypal.com		44.140.199.251		Portugal		\N		
-1454499439	36	William	Edwards	wedwardsz@acquirethisname.com	Male	69.187.29.7	3528411636358679	Egypt	2/23/1958	252476.42	Financial Analyst	Œ„´‰ˇÁ¨ˆØ∏”’
-1454460587	37	Frank	Stevens	fstevens10@samsung.com	Male	61.182.84.178		Philippines	3/19/1958	47326.14	VP Product Management	
-1454536874	38	Albert	Martinez	amartinez11@godaddy.com	Male	76.139.124.119		Ukraine	11/11/1994	57220.55	Software Engineer III	
-1454504601	39	Stephanie	Stewart	sstewart12@elpais.com	Female	104.98.138.203	4905603900430425379	Syria	2/11/1975	250118.59	Developer I	
-1454521301	40	Annie	Stevens	astevens13@slate.com	Female	214.146.163.79	3553338148582934	South Africa	11/8/1983	12963.52	Systems Administrator I	-1E2
-1454460788	41	Joyce	Butler	jbutler14@csmonitor.com	Female	88.243.175.236		Indonesia		135825.27		
-1454460615	42	Carlos	Armstrong	carmstrong15@technorati.com	Male	85.22.216.153	3532000356234436	Indonesia		23446.58		
-1454537073	43	Frances	Kelly	fkelly16@springer.com	Female	146.38.150.164	4026344347458956	China		242916.36		
-1454507861	44	Amanda	Pierce	apierce17@phpbb.com	Female	214.208.248.216	201678379872880	Faroe Islands	6/1/1990	38037.1	Software Test Engineer II	
test

-1454464352	45	Alan	Torres	atorres18@histats.com	Male	117.124.224.32	4844818559255911	Israel		114759.77		
-1454528513	46	Nancy	Brown	nbrown19@lycos.com	Female	98.103.84.222	4041378619584967	Portugal	9/16/1972	170596.79	GIS Technical Architect	
-1454518979	47	Kenneth	Larson	klarson1a@cnet.com	Male	71.35.49.21		Philippines	2/3/1990	178010.01	Staff Scientist	
-1454536052	48	Thomas	Lawson	tlawson1b@canalblog.com	Male	209.50.87.12	50201361710870252	Ukraine	10/5/1987	35118.14	Software Test Engineer II	
-1454488725	49	Debra	Gomez	dgomez1c@lycos.com	Female	26.107.134.220	30508009555281	China	9/10/1979	129186.15	Electrical Engineer	
-1454489047	50	Deborah	Price	dprice1d@google.nl	Female	207.145.225.232	4055636387933119	Russia	1/26/1983	165945.4	Dental Hygienist	␡
-1454478467	51	Diane	Banks	dbanks1e@wikispaces.com	Female	22.253.228.131		China		39139.44		
-1454468949	52	Marie	Woods	mwoods1f@bbc.co.uk		41.109.183.128		Russia	2/20/1989	\N	Human Resources Manager	
-1454489570	53	Randy	Romero	rromero1g@tamu.edu	Male	134.90.91.230		Indonesia	11/30/1960	230039.26	Professor	
-1454528266	54	Brandon	Fox	bfox1h@ocn.ne.jp	Male	157.130.211.215	6391404048298002	China	2/1/1979	223567.43	Programmer III	
-1454513948	55	Albert	Smith	asmith1i@jalbum.net	Male	167.84.86.133	3530479136988416	Ukraine		263457.42		
-1454467976	56	Jeremy	Black	jblack1j@sphinn.com	Male	181.85.144.139		Poland		194896.66		
-1454463146	57	Marilyn	Shaw	mshaw1k@bloomberg.com	Female	141.42.43.91	30110642387063	China		178473.04		
-1454540383	58	Stephanie	Diaz	sdiaz1l@who.int	Female	127.174.128.199	3571927033182087	Indonesia	3/25/1974	135570.75	Paralegal	
-1454492347	59	Christopher	Reynolds	creynolds1m@sun.com	Male	81.89.26.14		China	5/29/1956	147519.69	Account Executive	
-1454529565	60	Douglas	Holmes	dholmes1n@weather.com	Male	99.22.29.208		Honduras	11/29/2000	45372.51	VP Accounting	œ∑´®†¥¨ˆøπ“‘
-1454485707	61	Howard	Rogers	hrogers1o@sciencedirect.com	Male	222.229.220.65		Ukraine	2/26/1995	143231.21	Account Executive	
-1454489894	62	Melissa	Washington	mwashington1p@cmu.edu	Female	32.151.71.144	374288910553246	Czech Republic	2/24/1966	266547.15	Human Resources Manager	
-1454541195	63	Margaret	Flores	mflores1q@usnews.com	Female	108.42.248.249		France	8/25/1999	110594.3	Data Coordiator	
+1454457781	846	Sharon	Porter	sporternh@yelp.com	Female	206.179.138.50	6706029727013149	Colombia	7/3/1966	175902.84	Project Manager	
+1454457884	637	Frank	Hudson	fhudsonho@walmart.com	Male	52.37.91.110	4405081678166102	China	2/7/1997	126102.31	Senior Developer	
+1454457968	134	Teresa	Gray	tgray3p@ox.ac.uk	Female	60.117.57.222		China	9/18/1994	159276.6	Assistant Media Planner	
+1454458022	549	Aaron	Reid	areidf8@topsy.com	Male	117.148.230.113		Russia	3/25/1983	211580.8	Product Engineer	
+1454458079	156	Ann	Morris	amorris4b@newyorker.com	Female	14.165.90.97	3553147941910493	Indonesia	6/4/1956	158396.75	Engineer I	
+1454458121	794	Joshua	Flores	jfloresm1@sphinn.com	Male	84.212.10.197	3587575297567030	China	2/9/1989	267751.84	Developer III	
+1454458182	604	Steve	Castillo	scastillogr@ezinearticles.com	Male	159.158.95.181	3545937730645529	China	6/8/1993	86028	Programmer III	
 1454458233	64	Rose	Fernandez	rfernandez1r@usgs.gov	Female	199.141.221.229	3564435193511524	Brazil	5/5/1972	196329.18	Senior Cost Accountant	
-1454472500	65	Julie	Mendoza	jmendoza1s@unesco.org	Female	137.192.7.121	3586331607810566	Cuba		149157.14		
-1454515883	66	Earl	Sanders	esanders1t@github.com	Male	179.122.203.141	3561742181897127	Vietnam		215545.14		𠜎𠜱𠝹𠱓𠱸𠲖𠳏
-1454460569	67	Eric	Armstrong	earmstrong1u@arizona.edu	Male	128.202.252.112	4041590574307	Indonesia	5/30/1973	75347.18	Web Designer II	
-1454532395	68	Joyce	Perez	jperez1v@dmoz.org	Female	145.86.183.96		Canada	3/29/1975	115579.36	Director of Sales	
-1454524697	69		Sanchez		Female	100.163.22.106		Russia		127045.66		
-1454489862	70	Laura	Romero	lromero1x@godaddy.com	Female	237.131.116.77	3539134691869631	Madagascar	12/20/1957	208213.96	Business Systems Development Analyst	
-1454538359	71	Maria	Thomas	mthomas1y@lycos.com	Female	12.113.23.220	5602229580950679	China	10/29/1990	88961.11	Nurse	
-1454520121	72	Victor	Romero	vromero1z@reference.com	Male	208.79.116.61	6767842086446946518	Brazil		209207.14		
-1454510241	73	Betty	Hayes	bhayes20@goo.ne.jp	Female	153.254.225.4	201881044698306	Jordan	3/9/1970	173372.32	VP Accounting	
-1454465142	74	Roger	Jacobs	rjacobs21@rediff.com	Male	51.122.147.153	36548589951538	Benin	7/18/1977	18545.32	Paralegal	1/2
-1454470850	75	Ruth	Thompson	rthompson22@reuters.com	Female	220.41.116.217	67067442144878124	Croatia	6/30/1972	167279	Account Executive	ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ 
-1454515259	76	Theresa	James	tjames23@un.org	Female	31.135.76.146		China	12/28/1974	188732.88	Financial Advisor	
-1454517695	77	Pamela	Collins	pcollins24@nih.gov	Female	21.45.74.249	490591529416018576	Moldova	7/28/1998	252394.72	Marketing Assistant	🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧
-1454523543	78	Adam	Ward	award25@telegraph.co.uk	Male	242.85.131.30	201794641891036	Brazil		276446.24		
 1454458334	79	Robin	Price	rprice26@jugem.jp	Female	235.141.108.176	5610389618618837	Russia	1/7/1977	120293.75	Biostatistician IV	
-1454529469	80	Barbara	Ryan	bryan27@usda.gov	Female	58.0.103.48	30526192141883	Philippines		198959.68		
-1454497076	81	Melissa	Gibson	mgibson28@census.gov	Female	54.212.104.159	3529828486403520	Bhutan	7/29/1990	224163.74	Senior Developer	
-1454467979	82	Carolyn	Morris	cmorris29@cbslocal.com	Female	86.106.24.230		Portugal	2/12/1958	87727.95	Quality Engineer	0.00
-1454484623	83	Stephen	Harris	sharris2a@un.org	Male	247.19.48.100		Russia	4/9/1983	284559.55	Product Engineer	١٢٣
-1454476730	84	Linda	Campbell	lcampbell2b@mapy.cz	Female	28.62.77.24	6759510168753943	Peru	2/27/1982	16435.84	VP Quality Control	␡
-1454463822	85	Brian	Daniels	bdaniels2c@ovh.net	Male	143.36.66.196		Ecuador	7/6/1966	148952.4	Information Systems Manager	
 1454458337	86		West		Female	247.72.186.254	3541609903446548	Indonesia	12/11/1984	132544.98	Physical Therapy Assistant	
-1454518267	87	Timothy	Moore	tmoore2e@printfriendly.com	Male	109.229.170.253		Samoa		42697.58		
-1454523368	88	Eric	Walker	ewalker2f@mozilla.com	Male	243.173.35.155		Thailand	5/29/1970	48715.81	Engineer IV	
-1454486082	89	Maria	Arnold	marnold2g@google.com.br	Female	58.58.77.228	3589928770150089	Uruguay	3/14/1956	64067	Geological Engineer	
-1454541738	90	Edward	Garza	egarza2h@moonfruit.com	Male	43.21.138.236		New Zealand	3/27/1965	139025.58	Structural Analysis Engineer	
-1454490484	91	Alice	Young	ayoung2i@typepad.com	Female	120.255.189.145	630468343049978318	Serbia	4/18/1981	17663.49	Automation Specialist I	
-1454512586	92	Kenneth	Powell	kpowell2j@unicef.org	Male	238.251.71.34	3586683330377036	Philippines	2/10/1955	68010.82	Social Worker	
-1454472784	93	Kelly	Bell	kbell2k@hud.gov	Female	176.210.241.20		Russia	11/17/1984	57640.41	Web Developer I	　
-1454490007	94	David	Garcia	dgarcia2l@tmall.com	Male	100.18.61.166		Paraguay		201297.71		
-1454504627	95	Maria	Harvey	mharvey2m@nydailynews.com	Female	192.209.117.213	67593619471737741	Mongolia		283649.67		
-1454505519	96	Chris	Hall	chall2n@imageshack.us	Male	241.96.162.44	5594268668744901	Russia	1/3/1964	67656.08	Web Designer II	
-1454481847	97	Roger	Simpson	rsimpson2o@nymag.com	Male	80.110.89.28	493618903455317947	Indonesia		76354.79		
-1454515032	98	Richard	Nelson	rnelson2p@simplemachines.org	Male	43.54.4.82		Brazil		237205.58		NIL
+1454458375	939	Craig	Jones	cjonesq2@de.vu	Male	154.208.206.255		Indonesia	1/29/1989	266312.01	Safety Technician II	
+1454458415	805	George	Meyer	gmeyermc@google.nl	Male	146.59.222.51		Syria	5/28/1973	242409.4	Analog Circuit Design manager	
+1454458434	914	Earl	Martinez	emartinezpd@squidoo.com	Male	150.29.51.94	677135530260451546	Philippines	10/25/1970	257708.77	Software Engineer II	1E+02
+1454458516	5	Jacqueline	Ellis	jellis4@amazon.com	Female	158.137.238.6		Russia	7/12/1959	286038.78	Marketing Assistant	
+1454458597	371	Heather	Fisher	hfisheraa@printfriendly.com	Female	190.23.234.91	6304245587473860	Portugal	4/24/1955	101118.28	Associate Professor	
+1454458619	680	Mildred	Dean	mdeaniv@alibaba.com	Female	173.255.221.184	3576992005749797	Armenia	4/3/1979	78889.63	Desktop Support Technician	"__ﾛ(
+1454458806	695	Ashley	Olson	aolsonja@noaa.gov	Female	233.175.155.3	376319939588935	Indonesia	5/8/1979	256795.8	Systems Administrator III	
+1454458825	946	Beverly	Henderson	bhendersonq9@amazon.com	Female	96.37.213.162	3554635936579520	Russia	8/4/1979	65339.1	VP Marketing	
+1454458897	881		Collins		Male	100.212.189.244	3531552235272517	South Korea	7/5/1981	72539.92	VP Sales	
+1454458915	332	Raymond	Ward	rward97@drupal.org	Male	89.82.25.71	3538744508795034	South Africa	5/4/1994	163739.08	Data Coordiator	
+1454458981	216	Judy	Gutierrez	jgutierrez5z@ftc.gov	Female	120.107.239.171		China	11/13/1965	36744.51	Statistician I	🐵 🙈 🙉 🙊
+1454458994	539	Donald	Holmes	dholmesey@examiner.com	Male	24.129.145.78	3532611982139532	Czech Republic	11/7/1988	256744.28	Administrative Assistant I	
+1454459168	721	Christopher	Hunt	chuntk0@blogtalkradio.com	Male	69.240.85.94	201463274401428	Indonesia	6/8/1968	32269.1	Data Coordiator	
+1454459172	733	Bonnie	Hawkins	bhawkinskc@vinaora.com	Female	150.107.139.217	5010121004388204	China	8/28/1971	133958.72	Information Systems Manager	
+1454459204	768	Victor	Nichols	vnicholslb@blogs.com	Male	231.113.119.58	3587933684998468	France		13777.53		
+1454459243	803	Donald	Wood	dwoodma@parallels.com	Male	212.8.149.51	67610717455795070	Mexico	6/22/1971	20752.43	Chief Design Engineer	Œ„´‰ˇÁ¨ˆØ∏”’
+1454459252	752	Mark	Gomez	mgomezkv@hud.gov	Male	116.39.31.225	337941154145279	Indonesia	1/12/1965	232731.06	Professor	
+1454459281	282	Jason	Kelly	jkelly7t@themeforest.net	Male	129.110.129.46	3532753335256769	Botswana		122812.35		
+1454459307	681	Carlos	Fields	cfieldsiw@trellian.com	Male	253.69.168.229	3573119954905542	Japan		121346.35		
+1454459430	892	Gloria	Fowler	gfowleror@apache.org	Female	31.26.133.176	5602245069101311	Jamaica	5/31/1962	172923.11	Desktop Support Technician	-1E+02
+1454459462	728	Jacqueline	Porter	jporterk7@example.com	Female	183.189.204.28	3558636209028613	China	2/18/1966	60948.17	VP Marketing	
+1454459482	847	Brenda	Hall	bhallni@craigslist.org	Female	239.232.28.195		Sweden	12/5/1962	14658.92	Senior Quality Engineer	
+1454459511	512	Phyllis	Rice	pricee7@t-online.de	Female	141.247.60.33	4041591621552	China	3/9/1992	74670.8	Web Developer I	
+1454459535	331	Patrick	White	pwhite96@sina.com.cn	Male	145.132.114.239	3534146356970178	Ukraine	1/19/1994	96246.01	Executive Secretary	
+1454459549	611	Elizabeth	Day	edaygy@archive.org	Female	244.129.35.183	4903539550370988748	China	6/28/1974	217382.97	Paralegal	𠜎𠜱𠝹𠱓𠱸𠲖𠳏
+1454459623	424	Lillian	Vasquez	lvasquezbr@about.me	Female	15.233.130.74	6706936038940735306	Netherlands	6/28/2000	256419.66	Account Representative I	
+1454459691	579	Irene	Day	idayg2@theglobeandmail.com	Female	124.253.55.20	3564632724049897	Argentina	9/3/1974	58715.23	Teacher	
+1454459729	362	Melissa	Stephens	mstephensa1@comsenz.com	Female	105.158.98.174	3534057744078246	Philippines	1/22/1974	210781.96	Cost Accountant	᠎
+1454459735	103	Justin	Grant	jgrant2u@lycos.com	Male	251.111.132.81	3542141314461899	China	1/7/2001	140911.2	Project Manager	
+1454459793	662	Jesse	Gonzales	jgonzalesid@google.fr	Male	215.192.238.90	3550826252709387	Peru	7/22/1978	260505.75	Environmental Specialist	
+1454459819	866	Andrea	Carpenter	acarpentero1@taobao.com	Female	246.154.31.121		Japan	3/6/1984	248740.81	Senior Quality Engineer	
+1454459841	923	Marilyn	Long	mlongpm@walmart.com	Female	215.6.99.179	5602241011840536	Cameroon	10/28/1964	110571.54	Social Worker	
+1454459858	560	Judy	Wright	jwrightfj@blogs.com		7.139.209.42	560222806370845260	Colombia	3/6/1961	\N	Software Test Engineer IV	
+1454459862	244	Diane	Hawkins	dhawkins6r@hatena.ne.jp	Female	90.247.138.242	4026763155071942	China	5/10/1968	171218.47	Help Desk Operator	
+1454459921	639	Gloria	Fields	gfieldshq@mlb.com	Female	76.62.183.159	6334660493144630501	Peru	5/7/1996	210991.41	Accounting Assistant II	
+1454459945	193	Catherine	Rivera	crivera5c@liveinternet.ru	Female	197.164.37.102	4903900636714991	China	10/17/1984	240545.5	Cost Accountant	
+1454459958	186	Larry	Coleman	lcoleman55@imdb.com	Male	139.205.254.237	3549906950974212	Germany	12/19/1958	182376.29	Compensation Analyst	
+1454459959	195	Andrew	Henderson	ahenderson5e@ftc.gov	Male	44.116.118.204		United States	5/27/1977	108242.9	Accountant I	
+1454460044	743	Mildred	Clark	mclarkkm@issuu.com	Female	179.135.234.32	3589587359210761	Philippines		268426		-1E+02
+1454460050	189	Samuel	Fox	sfox58@bing.com	Male	220.161.213.119	3535192418612498	Argentina	9/2/1991	56084.78	Marketing Assistant	
+1454460053	209	Anne	Flores	aflores5s@marketwatch.com	Female	8.136.212.14		Canada	6/17/1964	195673.07	Occupational Therapist	
+1454460230	956	John	Baker	jbakerqj@exblog.jp	Male	96.167.232.236		Spain	9/29/1992	177531.95	Sales Representative	
+1454460278	683	Paula	Johnston	pjohnstoniy@marketwatch.com	Female	246.57.43.147	560221588257454843	Mongolia	10/20/1978	227145.54	Administrative Officer	
+1454460325	341	Samuel	Jordan	sjordan9g@jimdo.com	Male	183.29.32.119	3535569167756420	China	3/29/1975	130541.17	Safety Technician IV	
+1454460330	654	Michael	Sims	msimsi5@discuz.net	Male	169.136.209.75		Bulgaria	6/14/1982	277854.98	Recruiting Manager	
+1454460342	814	Deborah	Hudson	dhudsonml@parallels.com		186.205.3.210		Ukraine	11/3/2000	\N	Marketing Manager	
+1454460373	813	Mildred	Harris	mharrismk@vistaprint.com	Female	250.65.167.151	3577530968521354	Greece		238399.8		
+1454460382	624	Wayne	Henry	whenryhb@dedecms.com	Male	173.2.93.236		China		147631.62		
+1454460446	1000	Wanda	Brooks	wbrooksrr@yellowpages.com	Female	241.43.62.149	3539260761630759	Japan		158607.84		
+1454460471	685	Joe	Rivera	jriveraj0@ebay.com	Male	101.130.15.106	4903855508114581	Thailand		74067.89		
+1454460482	330	Robin	Campbell	rcampbell95@stanford.edu	Female	144.152.165.130	4662544509352	Sierra Leone	4/9/1969	64481.72	Quality Engineer	
+1454460569	67	Eric	Armstrong	earmstrong1u@arizona.edu	Male	128.202.252.112	4041590574307	Indonesia	5/30/1973	75347.18	Web Designer II	
+1454460587	37	Frank	Stevens	fstevens10@samsung.com	Male	61.182.84.178		Philippines	3/19/1958	47326.14	VP Product Management	
+1454460615	42	Carlos	Armstrong	carmstrong15@technorati.com	Male	85.22.216.153	3532000356234436	Indonesia		23446.58		
+1454460668	556	Lisa	Turner	lturnerff@ustream.tv	Female	192.4.71.81	3579076936527626	China		127717.62		
+1454460696	958	Howard	Gomez	hgomezql@people.com.cn		226.78.136.12	6706662408386172373	Philippines		\N		test⁠test‫
+1454460697	959	Kimberly	Alvarez	kalvarezqm@gizmodo.com	Female	244.177.51.246	30135810163038	Philippines	8/5/1976	211292	Design Engineer	
+1454460701	612	Dorothy	Hanson	dhansongz@i2i.jp	Female	165.73.75.69		Azerbaijan	9/5/1971	246728.41	Information Systems Manager	
+1454460759	126	Amy	Roberts	aroberts3h@dyndns.org	Female	166.99.225.202		Costa Rica		273960.79		𠜎𠜱𠝹𠱓𠱸𠲖𠳏
+1454460768	822	Jane	Tucker	jtuckermt@arizona.edu	Female	43.88.112.223		Sweden		55680.59		
+1454460788	41	Joyce	Butler	jbutler14@csmonitor.com	Female	88.243.175.236		Indonesia		135825.27		
+1454460812	496	Jesse	Cole	jcoledr@sogou.com	Male	106.227.88.115	50184107778776571	Peru	6/2/1965	205296.96	Actuary	
+1454460898	516	Wayne	Carter	wcartereb@g.co	Male	151.122.136.210	3547971451281253	Portugal	1/22/1992	122139.24	Cost Accountant	
+1454460912	571	Joan	Chavez	jchavezfu@com.com	Female	17.161.255.139		Poland	10/16/1972	277679.98	Safety Technician I	
+1454460930	166	Pamela	Perkins	pperkins4l@wsj.com	Female	237.225.95.141	378608444146629	China		141169.54		
+1454460959	128	Wayne	Kim	wkim3j@cdc.gov		196.5.87.192	5007668319479461	Malaysia	1/27/1979	\N	Internal Auditor	
+1454460980	465	Julie	Phillips	jphillipscw@ning.com	Female	186.219.160.248	5602251286921119	Spain	6/10/1976	120755.68	Marketing Manager	/dev/null; touch /tmp/blns.fail ; echo
+1454460991	144	Martha	Martin	mmartin3z@sakura.ne.jp	Female	220.126.107.146	201779098970730	New Zealand	5/23/1985	88724.94	Administrative Officer	
+1454461001	874	Laura	Wells	lwellso9@mit.edu	Female	135.67.140.204	5482317399663099	Sweden	12/4/1993	262303.96	Environmental Tech	
+1454461065	833	Lois	Lee	lleen4@zdnet.com	Female	31.87.204.102	5602245033844400	Bulgaria		113425.72		
+1454461292	575	Jessica	Watkins	jwatkinsfy@marketwatch.com	Female	165.50.211.193	201566979007298	Macedonia	7/12/1989	253506.67	Food Chemist	
+1454461361	184	Clarence	Moore	cmoore53@bloglines.com	Male	212.30.218.42		Indonesia	6/16/1974	283539.78	Internal Auditor	
+1454461642	406	Frances	Ray	frayb9@theguardian.com	Female	24.12.13.133	3555958533555779	Colombia	9/19/2000	282052.82	Staff Accountant III	
+1454461847	446	Helen	Ward	hwardcd@indiegogo.com	Female	249.175.182.167	3550054667502541	Colombia	2/15/1959	115934.54	Graphic Designer	
+1454461863	101	Irene	Adams	iadams2s@biblegateway.com	Female	135.79.211.166		Palestinian Territory	7/29/1994	73723.8	Help Desk Technician	00˙Ɩ$-
 1454461907	99	Ruth	Howell	rhowell2q@cornell.edu	Female	190.170.191.14		China	5/2/1969	286113.38	Senior Quality Engineer	
-1454524115	100	Judith	Garza	jgarza2r@usnews.com	Female	204.216.154.40		Ecuador	6/22/1962	256786.42	Teacher	
+1454461978	340	Gloria	Wilson	gwilson9f@soup.io	Female	116.58.188.151	3539542269827494	Croatia		206401.2		
+1454462106	132	Amanda	Porter	aporter3n@cloudflare.com	Female	64.254.17.111		Brazil	7/26/1964	41956.4	Nurse	
+1454462425	102	Ralph	Walker	rwalker2t@sitemeter.com		101.111.216.188		Peru	4/15/1959	\N	VP Accounting	
+1454462469	188	Christine	Rodriguez	crodriguez57@sciencedaily.com		240.122.189.81	6397046163164230	China	12/13/1998	\N	Sales Representative	
+1454462692	106	Cynthia	Vasquez	cvasquez2x@washingtonpost.com	Female	70.52.238.194		Kazakhstan		175907.62		1E+02
+1454462763	121	Heather	Davis	hdavis3c@hhs.gov	Female	154.156.181.140		Poland		71140.46		
+1454462944	704	Patrick	Torres	ptorresjj@ask.com	Male	122.10.211.188	5602254083107544	Russia	10/28/1995	119841.99	Environmental Tech	
+1454463056	718	Tammy	Simpson	tsimpsonjx@imdb.com	Female	28.114.238.250	5602250512089980	Russia	4/30/1987	240161.08	Human Resources Manager	-1/2
+1454463110	548		Ryan			48.44.183.147		Russia	12/7/1999	\N	Recruiting Manager	
+1454463111	206	Jeremy	Boyd	jboyd5p@sciencedirect.com	Male	190.221.209.41		Mexico	8/17/1963	169562.93	Legal Assistant	$1.00
 === Try load data from userdata4.parquet
-1454599685	1	Howard	Morgan	hmorgan0@typepad.com		158.178.195.62		Colombia	12/2/1992	\N	Data Coordiator	
-1454581720	2	Jessica	Schmidt	jschmidt1@google.com	Female	168.118.247.35	3565285464047941	Luxembourg	4/14/1995	222396.46	Research Nurse	nil
-1454608896	3	Beverly	Flores	bflores2@wikipedia.org	Female	51.97.88.173		Sweden	2/15/1965	141112.8	Actuary	
-1454575874	4	Marilyn	Sanchez	msanchez3@intel.com	Female	186.206.142.162		China	8/6/1969	87914.29	Structural Engineer	
-1454567588	5	Janice	Mitchell	jmitchell4@sina.com.cn	Female	205.187.116.241	5610719759939376962	Poland	7/4/1995	269297.4	Systems Administrator I	
+1454544135	174	Arthur	Bishop	abishop4t@deliciousdays.com	Male	23.143.216.45	3543731590226021	Portugal		74352.02		
+1454544166	397	Adam	Harrison	aharrisonb0@symantec.com	Male	24.23.251.104	30250631299455	United States	10/14/1976	220537.78	Systems Administrator IV	
+1454544275	676	Julia	Turner	jturnerir@tripadvisor.com	Female	246.75.105.64	3573355428855000	Philippines	9/23/1975	43244.37	Engineer I	
+1454544290	694	Carol	Griffin	cgriffinj9@zimbio.com		4.106.189.110		Philippines	5/5/1958	\N	Quality Engineer	
+1454544350	790	Michael	Mitchell	mmitchelllx@blog.com	Male	142.112.74.125		China		74089.46		
+1454544355	372	Brandon	Hicks	bhicksab@unicef.org	Male	14.1.141.83	564182403737341280	China	10/4/1985	62678.54	Sales Representative	
+1454544427	582	Annie	Spencer	aspencerg5@gizmodo.com	Female	193.135.127.103		Philippines	7/29/1965	32342.28	Cost Accountant	
+1454544628	802	Lois	Gibson	lgibsonm9@mayoclinic.com	Female	226.250.177.108	5610916546870112	Thailand	5/16/1955	149273.02	Occupational Therapist	
+1454544647	382	Paul	Sanders	psandersal@photobucket.com	Male	216.84.37.205	6385564398040268	Sweden	6/9/1980	240223.98	Mechanical Systems Engineer	1
+1454544648	364	Jason	Fox	jfoxa3@unesco.org	Male	184.48.48.126		Japan	8/9/1976	84483.3	Mechanical Systems Engineer	
+1454544719	716	Diana	Little	dlittlejv@shop-pro.jp	Female	168.15.235.95		Argentina		267712.23		
+1454544765	766	Lisa	Harper	lharperl9@boston.com	Female	26.253.184.166	4903454632131201206	China	9/30/1986	177862.14	Analog Circuit Design manager	
+1454544797	471	Linda	Arnold	larnoldd2@yellowbook.com	Female	25.72.220.19	3573669257084239	Indonesia	2/6/1983	249094.03	GIS Technical Architect	"
+1454544833	508	Andrea	Alvarez	aalvareze3@amazon.co.uk	Female	94.93.141.212		Indonesia		165484.69		　
+1454544883	991	Mary	Willis	mwillisri@i2i.jp	Female	188.83.241.84		Russia	9/4/1992	133498.3	Payment Adjustment Coordinator	
+1454544907	137	Harry	Thomas	hthomas3s@edublogs.org	Male	203.181.156.216	3586074069338235	Poland	6/6/1979	159098.74	Chemical Engineer	
+1454545008	824	Jack	Hudson	jhudsonmv@hp.com	Male	195.27.62.30		Ukraine	9/19/1970	163426.27	Community Outreach Specialist	
+1454545044	173	Ruth	Welch	rwelch4s@spotify.com	Female	7.253.134.135	3543426983427878	Japan	8/6/1964	203330.7	Paralegal	
+1454545053	225	Judy	Greene	jgreene68@discovery.com		246.203.234.47	589310636256482728	Dominica		\N		
+1454545135	948	Janet	Lawson	jlawsonqb@indiatimes.com	Female	90.48.142.31	4026186827051821	Philippines		197991.65		
+1454545185	757	James	Pierce	jpiercel0@meetup.com	Male	14.116.62.43	5018717793434778	Greece	12/25/1989	17173.34	Assistant Manager	
+1454545221	995	Philip	Mcdonald	pmcdonaldrm@tripadvisor.com	Male	224.59.55.103	5108753554344402	France	4/22/1955	59331.14	Recruiting Manager	
 1454545227	6	William	Williamson	wwilliamson5@trellian.com	Male	44.86.73.201	201849487683564	Indonesia	12/6/1993	95352.25	Librarian	1E+02
-1454602212	7	Jack	James	jjames6@sogou.com	Male	59.184.76.208	3552911855395632	Indonesia	11/25/1968	82549.73	Compensation Analyst	‪‪test‪
-1454556325	8	Jesse	Arnold	jarnold7@soup.io	Male	7.25.90.13	5100177285965756	Brazil	10/19/1987	257968.86	Executive Secretary	
-1454622627	9	Lori	Woods	lwoods8@fastcompany.com	Female	147.157.215.9	4844532485570190	Indonesia	12/26/1975	186145.91	Health Coach I	
-1454601455	10	Juan	Evans	jevans9@zimbio.com	Male	150.132.218.181	3578802610769023	Philippines	5/29/1988	129369.52	Social Worker	
-1454579490	11	Roy	Matthews	rmatthewsa@ucsd.edu	Male	203.239.85.224	5100135134598509	Russia		192057.84		
-1454586145	12	Kenneth	King	kkingb@zimbio.com		9.103.96.206	675913564329481832	Greece		\N		
-1454568600	13	Raymond	Green	rgreenc@fc2.com	Male	163.9.101.43		United States	1/28/1984	225094.01	Budget/Accounting Analyst III	
-1454603300	14	Lillian	Stephens	lstephensd@psu.edu	Female	31.50.183.23	630455284969060148	Finland	6/1/1973	19354.85	Information Systems Manager	
-1454560697	15	Mary	Gonzales	mgonzalese@wired.com	Female	91.42.17.109	3560985473023370	France	5/7/1966	23746.36	Compensation Analyst	
-1454561895	16	Roger	Mason	rmasonf@newyorker.com	Male	169.33.172.204	3545036194973129	Norway		165855.47		
-1454604198	17	Diane	Cole	dcoleg@unesco.org	Female	157.11.85.209		Philippines	6/9/1994	105028.67	Assistant Manager	
-1454601270	18	Annie	Hunt	ahunth@ocn.ne.jp	Female	169.47.232.187	5100177440436305	Poland	3/30/1992	266071.6	Legal Assistant	
-1454600872	19	Jacqueline	Bradley	jbradleyi@epa.gov	Female	83.241.214.77	5100131814165289	Indonesia	12/1/1971	55440.88	Dental Hygienist	
-1454600248	20	Kathy	Russell	krussellj@joomla.org	Female	158.32.89.44	3585627581021729	Indonesia	11/20/1999	29602.23	Sales Representative	
-1454551378	21	Beverly	Barnes	bbarnesk@europa.eu	Female	189.157.45.179	3548552521258155	Bulgaria	4/21/1956	37295.89	Human Resources Assistant II	
-1454604764	22	Roy	Morris	rmorrisl@scribd.com		201.51.139.86		China		\N		
-1454569146	23	Alice	Ramos	aramosm@utexas.edu	Female	185.168.142.9	374622349140748	Philippines	4/20/1966	138021.54	Paralegal	
-1454597325	24	Todd	Kelly	tkellyn@fotki.com	Male	46.19.203.86	4041599550654	Portugal	3/14/1998	84343.96	Executive Secretary	() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }
-1454551797	25	Lawrence	Ramos	lramoso@imageshack.us	Male	5.96.81.47	5010121401502407	Palestinian Territory	1/26/1994	265545.92	Operator	
-1454605654	26	Jennifer	Rogers	jrogersp@so-net.ne.jp	Female	31.48.54.193	5610097864736794573	Yemen	6/5/1992	138365.1	Computer Systems Analyst II	
-1454603775	27	Kimberly	Morgan	kmorganq@seesaa.net	Female	154.61.255.47		China		14486.75		0/0
-1454606635	28	Jessica	Marshall	jmarshallr@mtv.com	Female	164.101.35.148	3531025977662047	Brazil	7/2/1987	216211.96	VP Accounting	
-1454597817	29	Katherine	Gordon	kgordons@phoca.cz	Female	248.30.182.15	5602230546469168	Italy	10/11/1956	48478.51	Librarian	
-1454557995	30	Jennifer	Phillips	jphillipst@pcworld.com	Female	61.30.215.16	5100179891124018	Sweden	9/3/1967	254808.27	Software Consultant	
-1454613512	31	Gerald	Nguyen	gnguyenu@seesaa.net	Male	9.13.167.17	67717376159922001	China	9/3/1972	285571.49	Tax Accountant	
-1454625134	32	Rose	Ellis	rellisv@walmart.com	Female	250.88.7.15	3580333318847248	China	4/23/1987	47695.25	Systems Administrator II	和製漢語
-1454622672	33	Margaret	Grant	mgrantw@bbb.org	Female	227.165.116.192	3565645038486711	Slovenia	12/10/1992	106452.61	Account Coordinator	
-1454568796	34	Jessica	Wells	jwellsx@blogtalkradio.com	Female	185.189.187.186		Azerbaijan	9/13/1996	173164.24	Project Manager	
-1454582324	35	Henry	Jenkins	hjenkinsy@mit.edu	Male	10.83.90.235	5602221853972654	China	11/12/1975	25740.85	Recruiter	田中さんにあげて下さい
+1454545361	770	Gregory	Henderson	ghendersonld@issuu.com	Male	233.65.87.175		Philippines		79047.27		
+1454545379	713	Ruth	Barnes	rbarnesjs@google.it	Female	29.37.239.173	56108753791531632	Sweden	8/23/1965	268965.5	Occupational Therapist	
+1454545666	430	Stephen	Knight	sknightbx@so-net.ne.jp	Male	233.213.210.160		China	7/7/1969	183842.12	Quality Control Specialist	
+1454545825	470	Carl	Freeman	cfreemand1@de.vu	Male	40.13.20.8	5002357075956137	Armenia	1/6/1984	140264.63	Accountant III	
+1454545841	736	Ashley	Black	ablackkf@freewebs.com	Female	130.87.75.86	30046346841197	China	5/8/1991	263407.66	Senior Developer	
 1454545876	36	Earl	Mccoy	emccoyz@bigcartel.com	Male	161.179.122.154	5038877150819047588	Japan	10/12/1976	114766.43	Software Test Engineer IV	0.00
-1454618571	37	Paul	Knight	pknight10@google.cn	Male	182.38.37.173	5020715558032859593	Ukraine	10/25/1971	199366	Social Worker	
-1454576590	38	Martha	Clark	mclark11@usda.gov		189.166.203.239		South Korea		\N		
-1454601033	39	Clarence	Bryant	cbryant12@bigcartel.com	Male	120.218.175.241		Poland	9/1/1968	257075.65	Professor	田中さんにあげて下さい
-1454548319	40	Joan	Price	jprice13@mtv.com		233.4.158.135	3584182571037112	Portugal		\N		
-1454573152	41	Anthony	Ford	aford14@chicagotribune.com	Male	100.240.61.163		Iran	6/26/1992	152800.71	Senior Cost Accountant	
-1454595667	42	Roger	Henderson	rhenderson15@sitemeter.com	Male	206.185.213.252	3560757094744860	Brazil	6/26/1970	40949.78	Nurse	
-1454591751	43	Kenneth	Butler	kbutler16@youtu.be	Male	2.12.57.207	3586795027670612	Thailand	3/26/1987	165121.43	Research Assistant IV	
-1454566774	44	Kenneth	Wright	kwright17@google.de	Male	241.213.136.95	5602246924892961	Belarus	10/15/1995	227583.86	Speech Pathologist	
-1454617513	45	Aaron	Smith	asmith18@flickr.com	Male	185.244.9.145		China	11/25/1972	286108.94	Paralegal	
-1454574169	46	Amy	Matthews	amatthews19@t.co	Female	206.172.83.152	5002357749310919	China		39365.73		
-1454586102	47	Janet	Cooper	jcooper1a@dailymotion.com	Female	9.148.129.197		Comoros	8/2/1968	168391.72	Senior Cost Accountant	
-1454601994	48	Russell	Stewart	rstewart1b@edublogs.org	Male	113.23.229.63	675993663890158630	Thailand	4/17/1963	57609.96	Senior Editor	
-1454582839	49	Howard	Elliott	helliott1c@illinois.edu	Male	225.208.151.89	3577055641640512	Mongolia		176999.03		
-1454573932	50	Keith	Lane	klane1d@eventbrite.com	Male	250.24.9.55		Russia	5/27/1983	80452.19	Budget/Accounting Analyst II	
-1454583292	51	Jimmy	Richardson	jrichardson1e@vimeo.com	Male	152.87.188.99		China	6/30/1960	194774.28	Assistant Manager	❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙
-1454623280	52	Justin	Bryant	jbryant1f@github.com	Male	245.48.63.169	3562259518717901	Guatemala	10/28/1960	144419.21	Database Administrator III	
-1454582337	53	Ruby	Allen	rallen1g@cyberchimps.com	Female	238.148.148.156	3541217939068433	Japan		248388.64		
-1454578101	54		Ward		Male	120.88.247.59		Russia		125075.78		
+1454545911	981	Martin	Hudson	mhudsonr8@senate.gov	Male	103.7.125.212	3580063273741488	Azerbaijan		55371.91		
+1454545934	728	Brandon	Oliver	boliverk7@tuttocitta.it	Male	190.202.45.71	3561315827587251	Norway	10/31/1960	157819.05	Structural Engineer	
+1454545941	224	Julia	Lane	jlane67@networksolutions.com	Female	126.98.58.100	3566544839563357	Brazil	9/24/1975	77279.09	Business Systems Development Analyst	
+1454545957	112	Mildred	Martinez	mmartinez33@wufoo.com		206.47.25.150		Brazil		\N		
+1454546022	147	John	Henry	jhenry42@google.nl	Male	175.38.124.31	3534881822199867	China	7/7/1959	180821.73	Engineer I	"<>?:""{}|_+"
+1454546057	132	Rose	Evans	revans3n@hubpages.com	Female	18.134.14.151	6767390430172490489	United States	2/11/1977	109352.69	Automation Specialist II	
+1454546075	162	Nancy	Sanchez	nsanchez4h@yahoo.com	Female	180.250.167.88		Malawi	5/12/1956	280050.1	Health Coach III	
+1454546122	913	Lisa	Oliver	loliverpc@nydailynews.com	Female	153.239.15.222	201665522335840	Sweden	1/28/1957	180645.76	Marketing Assistant	() { 0; }; touch /tmp/blns.shellshock1.fail;
 1454546163	55	Nancy	Stephens	nstephens1i@godaddy.com	Female	211.0.225.116		Mongolia		20805.69		
-1454580277	56	Dorothy	Kennedy	dkennedy1j@mlb.com	Female	177.229.94.96		Indonesia	3/26/1984	118098.45	Legal Assistant	
-1454597567	57	Katherine	Ferguson	kferguson1k@google.cn	Female	185.67.150.20	5038883804496681778	Russia	1/28/1982	255040.89	Chemical Engineer	
-1454609494	58	Norma	Daniels	ndaniels1l@adobe.com	Female	72.161.56.76	5602256058813840	Lithuania	5/30/1986	228396.52	Junior Executive	
-1454549169	59	John	Rogers	jrogers1m@miitbeian.gov.cn	Male	91.131.170.178	3578552255653202	Croatia	9/25/1971	164207.53	Administrative Assistant III	
-1454627177	60	Lisa	Nguyen	lnguyen1n@phpbb.com	Female	99.51.36.31	3587343436670904	Ghana	6/10/1970	213963.71	Research Nurse	
-1454564279	61	Roy	Carter	rcarter1o@cmu.edu	Male	154.176.171.103	3581163353975466	Germany	7/21/1980	216294.79	Marketing Manager	
-1454546835	62	Donna	Gonzalez	dgonzalez1p@instagram.com	Female	81.57.136.186		China	3/3/1975	181562.45	Junior Executive	
-1454610240	63		Medina		Female	84.135.250.216	3579667388606106	Indonesia	7/18/1958	80267.81	Accounting Assistant III	
-1454613635	64	Samuel	Bishop	sbishop1r@npr.org	Male	87.38.89.122	3534693555244475	Indonesia		97009.57		
-1454551032	65	Jerry	Bradley	jbradley1s@umn.edu	Male	184.79.105.210	5602258009829107	China	3/13/1984	50863.85	Junior Executive	
-1454555641	66	Ralph	Castillo	rcastillo1t@nba.com	Male	96.246.167.130	6373313274491359	United States	5/14/1986	13099.91	Health Coach III	
-1454615262	67	Margaret	Vasquez	mvasquez1u@tuttocitta.it	Female	206.79.16.146		Poland	2/19/1973	281677.49	Quality Engineer	
-1454564143	68	Shawn	Payne	spayne1v@privacy.gov.au	Male	233.32.138.222	6380689013620353	China	5/29/1996	152175.99	Help Desk Operator	
-1454560234	69	Bonnie	Hart	bhart1w@networkadvertising.org	Female	92.158.145.51	5100141023990187	Philippines	8/10/1976	270525.27	Clinical Specialist	
-1454557523	70	Ruby	Phillips	rphillips1x@google.com.hk	Female	180.71.236.34		Russia	12/29/1980	175991.04	Analog Circuit Design manager	
-1454615738	71	Michael	Watkins	mwatkins1y@infoseek.co.jp	Male	20.48.165.57	6304600968704640	United States		277599.55		
-1454549243	72	Walter	Hill	whill1z@fda.gov	Male	169.189.26.193		Philippines	4/25/1989	170789.26	Executive Secretary	
-1454590835	73	Deborah	Garcia	dgarcia20@ehow.com	Female	176.149.163.227	3578754434491831	Brazil		213787.81		!@#$%^&*()
-1454592567	74	Sandra	Lee	slee21@hatena.ne.jp	Female	196.212.29.124		China	12/25/1976	190399.56	Assistant Media Planner	../../../../../../../../../../../etc/passwd%00
-1454570808	75	Steve	Shaw	sshaw22@photobucket.com	Male	56.32.41.109	3561652394394350	Macedonia	3/2/1961	180130.01	Recruiting Manager	
-1454627208	76	Jerry	Hansen	jhansen23@newyorker.com	Male	180.99.147.201	36652106508977	Ukraine	4/27/1992	201900.61	Chief Design Engineer	
-1454595596	77	Joshua	Harris	jharris24@china.com.cn	Male	93.173.2.87	3566428334927244	Greece	8/27/1987	189392.3	Account Representative III	
-1454615457	78	Clarence	Simmons	csimmons25@dailymotion.com	Male	30.117.30.162	3571762129017388	Philippines		180434.25		
-1454604481	79	Denise	Bishop	dbishop26@wsj.com	Female	251.230.214.155	3556286320706184	Philippines	10/18/1999	194426.62	Geologist II	
-1454614660	80	Jason	Warren	jwarren27@shop-pro.jp	Male	197.52.56.75	4913424719275497	China	8/26/1998	92571.41	Accounting Assistant II	
-1454592347	81	Jesse	Reynolds	jreynolds28@amazon.com		46.11.66.226		Portugal	10/6/1977	\N	Administrative Officer	<img src=x onerror=alert(\'hi\') />
-1454579746	82	Ruby	Lynch	rlynch29@xing.com	Female	50.190.120.2	340177638737200	Portugal	5/7/1981	159634.3	Sales Associate	
-1454578991	83	Phillip	Olson	polson2a@marriott.com	Male	38.205.137.200	4905640692662084	Indonesia	1/8/1987	161622.19	Assistant Media Planner	
-1454574785	84	Sean	Watkins	swatkins2b@ft.com	Male	22.52.43.242	6759770945991352	China	2/7/1964	103943.54	Senior Financial Analyst	
-1454603364	85	Teresa	Parker	tparker2c@shinystat.com	Female	36.134.254.22	4844522554899455	China	11/24/1987	137739.95	Chief Design Engineer	
-1454629483	86	Anthony	Harris	aharris2d@uiuc.edu	Male	142.3.139.220		China	2/26/1975	194926.38	Senior Quality Engineer	
-1454617821	87	Donna	Ray	dray2e@wikimedia.org	Female	122.113.90.100	3548062974262878	Peru	7/24/1964	121072.45	Clinical Specialist	åß∂ƒ©˙∆˚¬…æ
-1454567199	88	Craig	Lewis	clewis2f@purevolume.com	Male	106.156.113.218	3535698276698452	Slovenia		113013.98		
-1454606687	89	Adam	Turner	aturner2g@delicious.com	Male	94.92.15.85	3530109929436477	Sweden	3/18/1976	233715.21	Nurse Practicioner	
-1454565501	90	Terry	Parker	tparker2h@hc360.com	Male	189.36.77.133		China	4/2/1987	232623.76	GIS Technical Architect	
-1454604198	91	Juan	Shaw	jshaw2i@ehow.com	Male	222.127.83.190	493610712595084582	Democratic Republic of the Congo		220779.8		
-1454592729	92	Nicole	Russell	nrussell2j@angelfire.com	Female	247.123.224.36	4120730296866808	Germany		90748.17		
-1454563310	93	Robin	Ray	rray2k@t.co	Female	217.150.228.185		Sweden	9/28/1968	175995.93	Human Resources Assistant III	""""
+1454546263	498	Lillian	Lynch	llynchdt@posterous.com	Female	13.168.64.88		Brazil	6/18/1982	203558.13	Accountant I	
+1454546287	934	Mark	Dunn	mdunnpx@booking.com	Male	77.125.49.164		Indonesia	7/2/1990	120101.43	Financial Advisor	
+1454546293	748	Carol	Perry	cperrykr@cmu.edu	Female	113.54.30.174	675928304974727871	Colombia		122048.92		
+1454546294	830	Catherine	Rice	cricen1@hexun.com	Female	134.65.177.193		Portugal		100751.27		
+1454546294	924	Jimmy	Nelson	jnelsonpn@rediff.com	Male	244.130.194.232		Norway		259092.5		
+1454546377	431	Pamela	Ruiz	pruizby@java.com		42.71.124.95		Pakistan	9/15/1976	\N	Software Engineer I	
+1454546405	158	Melissa	Alexander	malexander4d@google.pl	Female	186.71.215.96		Greece	5/7/1972	180150.8	VP Marketing	
 1454546406	94	Debra	Sims	dsims2l@meetup.com	Female	150.198.93.159	5602215295621929	Brazil	12/21/1984	276704.96	Office Assistant IV	
-1454550946	95	Teresa	Harrison	tharrison2m@t.co	Female	111.107.40.16	5007666196554596	Philippines	5/12/1959	129967.9	GIS Technical Architect	
-1454603302	96	Tammy	Ward	tward2n@51.la	Female	148.119.68.255	3568303818489466	France	8/20/1984	63550.31	General Manager	
-1454605950	97	Louis	Harrison	lharrison2o@usgs.gov	Male	134.95.151.68	5100179516595931	Ukraine	9/27/1986	169379.73	Payment Adjustment Coordinator	
-1454579744	98	Charles	Simpson	csimpson2p@mashable.com	Male	241.0.124.209	3562073915241617	Sweden	9/20/1956	116909.68	Biostatistician IV	
-1454584629	99	Maria	Richards	mrichards2q@rediff.com	Female	108.13.82.54		Azerbaijan	1/23/1978	34000.68	Clinical Specialist	社會科學院語學研究所
-1454622328	100	Diana	Hall	dhall2r@oaic.gov.au	Female	6.215.107.104	3528227609255704	Russia	8/29/1996	221168.13	Assistant Professor	
+1454546500	909	Cynthia	Smith	csmithp8@house.gov	Female	166.21.108.146	374622628177056	China	9/30/1974	252566.03	Physical Therapy Assistant	
+1454546508	599	John	Lewis	jlewisgm@youtube.com	Male	90.227.58.221		Sweden	5/16/1970	58222.46	Software Engineer II	
+1454546576	617	Jonathan	Hall	jhallh4@upenn.edu	Male	12.13.126.157	491109978928388311	China	5/16/1986	50824.51	GIS Technical Architect	
+1454546653	227	Helen	Green	hgreen6a@vimeo.com	Female	156.198.175.255	5048379124161648	Uganda	10/20/2000	163189.36	Computer Systems Analyst III	
+1454546690	349	David	Washington	dwashington9o@un.org	Male	131.53.93.63	3578517361666653	Greece	10/16/1998	34742.07	Staff Accountant IV	
+1454546703	474	Betty	Cook	bcookd5@admin.ch	Female	23.9.243.170		China	5/16/1962	151829.78	Budget/Accounting Analyst I	
+1454546726	767	Philip	Burton	pburtonla@zimbio.com	Male	138.134.59.28	3528288812489043	Russia	5/27/1983	241065.94	Software Engineer III	
+1454546741	904	Debra	Wilson	dwilsonp3@desdev.cn	Female	254.162.119.226	630461807132739339	Poland	4/20/1969	107766.71	Financial Analyst	
+1454546820	480	Todd	Wagner	twagnerdb@reuters.com		25.149.209.61	3560449524302754	Tunisia	8/31/1983	\N	Research Associate	
+1454546835	62	Donna	Gonzalez	dgonzalez1p@instagram.com	Female	81.57.136.186		China	3/3/1975	181562.45	Junior Executive	
+1454546857	666	Anthony	Sullivan	asullivanih@boston.com	Male	119.85.206.152	561007482254370160	Portugal	5/20/1970	164827.57	Systems Administrator IV	
+1454546901	366	Julie	Garrett	jgarretta5@wsj.com	Female	40.18.147.38		China		225753.62		
+1454546930	808	Russell	Freeman	rfreemanmf@comcast.net	Male	244.181.177.133	30295400628590	Greece		173731.67		
+1454546970	739	Nicholas	Sanders	nsanderski@scientificamerican.com	Male	13.8.6.64	347899819407351	Portugal	6/3/1991	130727.91	Research Associate	
+1454547011	198	Timothy	Ford	tford5h@vk.com	Male	3.35.147.123	5602236379905962	Morocco	4/27/1998	55901.49	Paralegal	
+1454547029	644	Jean	Cole	jcolehv@mac.com	Female	5.188.221.124		Comoros	7/24/1985	215195.83	Civil Engineer	
+1454547030	916	Andrew	Campbell	acampbellpf@nymag.com	Male	172.206.158.110		Guatemala	8/12/1962	33394.2	Financial Analyst	
+1454547032	264	Charles	James	cjames7b@wordpress.org	Male	40.115.241.175	6761364619849686314	Canada	9/21/1958	227083.18	Professor	
+1454547070	727	Louise	Castillo	lcastillok6@cmu.edu	Female	54.15.177.72	3586380225985649	France	3/22/1978	17830.21	Nurse	
+1454547124	168	Christopher	Hughes	chughes4n@businessinsider.com	Male	23.110.32.151	6304281728252855	Serbia	12/9/1975	220573.8	Design Engineer	999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
+1454547192	232	Angela	Evans	aevans6f@a8.net	Female	115.244.254.13	6333718316396730	China	1/7/1968	265380.99	VP Quality Control	
+1454547201	464	Marie	Harris	mharriscv@dot.gov	Female	26.45.137.53		Tajikistan	9/24/1961	203845.4	Analog Circuit Design manager	
+1454547203	427	Rebecca	Thompson	rthompsonbu@wikipedia.org	Female	110.47.151.2		Indonesia	4/29/1992	216830.25	Assistant Manager	
+1454547212	575	Arthur	Reyes	areyesfy@ca.gov	Male	161.254.47.140		Poland	3/9/1962	214072.68	Health Coach I	
+1454547223	564	Rebecca	Ford	rfordfn@stanford.edu	Female	210.231.201.84		Indonesia	9/3/1969	204041.63	Office Assistant II	ÅÍÎÏ˝ÓÔÒÚÆ☃
+1454547242	997	William	Patterson	wpattersonro@omniture.com	Male	149.242.140.255	3528460022712031	Colombia	3/1/2000	108955.05	Executive Secretary	✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿
+1454547281	463	Gerald	Knight	gknightcu@independent.co.uk	Male	34.192.129.107		China	4/27/1975	84585.78	Civil Engineer	⁰⁴⁵
+1454547356	276	Albert	Gordon	agordon7n@examiner.com	Male	88.159.237.102	3534524682255003	Sweden	8/25/1996	265299.22	Assistant Media Planner	
+1454547362	317	Clarence	Simpson	csimpson8s@comsenz.com	Male	104.53.119.249	3586887721906879	Venezuela	3/7/1977	35314.18	Professor	
+1454547369	217	Anthony	Jacobs	ajacobs60@ycombinator.com	Male	59.162.173.59	374283051163301	Ivory Coast	7/11/1988	103409	Safety Technician II	(｡◕ ∀ ◕｡)
+1454547401	230	Jimmy	Bailey	jbailey6d@odnoklassniki.ru	Male	22.173.156.124	3576503167968271	China		197603.47		$1.00
+1454547508	960	Craig	Shaw	cshawqn@wordpress.org	Male	88.203.243.165	5602229798654196	Tanzania	8/5/1999	119584.32	Senior Sales Associate	
+1454547541	585	Bonnie	Snyder	bsnyderg8@ftc.gov	Female	170.100.220.94	3564602303009802	Japan	6/5/1998	89020.39	Desktop Support Technician	
+1454547577	871	Gloria	Howard	ghowardo6@harvard.edu	Female	173.45.99.88		Egypt	8/27/1972	140945.69	Human Resources Assistant I	
+1454547609	878	Kathryn	Snyder	ksnyderod@e-recht24.de	Female	235.195.131.110	6761199763991532	Indonesia	3/29/1973	168235	GIS Technical Architect	
+1454547697	473	Joseph	Coleman	jcolemand4@ucoz.ru	Male	1.40.64.123	4508104337648496	Argentina	6/14/1975	167526.19	Librarian	/dev/null; touch /tmp/blns.fail ; echo
+1454547707	206	Shirley	Ruiz	sruiz5p@dagondesign.com	Female	159.102.238.195	201955789975119	Bosnia and Herzegovina	10/8/1963	197240.2	General Manager	
+1454548013	705	Alan	Sims	asimsjk@ed.gov	Male	180.200.150.10	3531118427209962	Israel	12/8/1982	269504.53	Biostatistician III	
+1454548122	108	Craig	Knight	cknight2z@ucsd.edu	Male	139.37.241.169	3556934424099549	Greece	2/21/1955	247303.71	Senior Financial Analyst	Ω≈ç√∫˜µ≤≥÷
+1454548170	611	Steve	Ford	sfordgy@hubpages.com	Male	190.25.153.64	56022386492755060	China	6/7/1979	39645.72	Health Coach IV	̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕
+1454548319	40	Joan	Price	jprice13@mtv.com		233.4.158.135	3584182571037112	Portugal		\N		
+1454548438	618	Jeremy	Roberts	jrobertsh5@go.com	Male	89.14.246.154		Russia	7/31/1989	273400	Research Assistant II	
+1454548507	314		Dixon		Male	93.252.91.51	670677121929947139	Ireland		209533.24		
+1454548522	522	Eric	Kelley	ekelleyeh@pcworld.com	Male	131.75.70.227		Syria	7/22/1990	163141.3	General Manager	"__ﾛ(
+1454548725	133	Lillian	Collins	lcollins3o@csmonitor.com		80.80.47.76	4175009027155995	Czech Republic		\N		
+1454549109	306	Mark	Boyd	mboyd8h@cocolog-nifty.com	Male	158.13.1.119	3562815747212335	Brazil	2/15/1967	66134.2	Social Worker	
+1454549131	371	Carl	Knight	cknightaa@unc.edu	Male	64.176.41.31		Macedonia	6/4/1973	116193.06	Environmental Specialist	
+1454549158	346	Kathryn	Butler	kbutler9l@washingtonpost.com		32.220.87.246	374288729624402	China	11/24/1972	\N	Staff Accountant II	
+1454549169	59	John	Rogers	jrogers1m@miitbeian.gov.cn	Male	91.131.170.178	3578552255653202	Croatia	9/25/1971	164207.53	Administrative Assistant III	
+1454549202	304	Billy	Howard	bhoward8f@geocities.com	Male	101.47.248.109	3561004867229459	Ireland	2/23/1963	147308.45	Software Test Engineer II	
+1454549230	702	Patricia	Oliver	poliverjh@cmu.edu		18.206.245.40		Ireland		\N		ÅÍÎÏ˝ÓÔÒÚÆ☃
+1454549233	179	Christine	Duncan	cduncan4y@furl.net		49.36.119.18	30544573199206	China	8/15/2000	\N	Mechanical Systems Engineer	
+1454549243	72	Walter	Hill	whill1z@fda.gov	Male	169.189.26.193		Philippines	4/25/1989	170789.26	Executive Secretary	
+1454549360	862	Joseph	Patterson	jpattersonnx@google.it	Male	79.70.102.172	3548682692624495	Argentina		87931.98		
 === Try load data from userdata5.parquet
-1454582047	1	Kelly	Ortiz	kortiz0@omniture.com	Female	252.115.158.159	3537905681760845	Russia	4/23/1980	277302.99	Nurse	
-1454626441	2	Sharon	Carroll	scarroll1@disqus.com	Female	29.217.252.62	56022458507191696	Indonesia	8/28/1992	209258.05	Recruiter	åß∂ƒ©˙∆˚¬…æ
-1454608790	3	Ruth	Ross	rross2@cbc.ca	Female	220.224.80.32	3589642396435648	Benin	6/13/1994	18270.7	Design Engineer	
-1454601797	4	Kelly	Meyer	kmeyer3@cornell.edu	Female	255.65.123.124		Philippines	1/6/1967	17485.27	Cost Accountant	
-1454584344	5	Irene	Jordan	ijordan4@pagesperso-orange.fr	Female	162.57.23.136	3576848317807089	United States	1/4/1997	163979.38	Programmer Analyst III	
-1454547199	6	Irene	Wells	iwells5@fema.gov	Female	85.5.67.113		Iran		74337.42		
-1454604109	7	Jessica	Grant	jgrant6@gov.uk	Female	127.235.63.12	3536345996536989	Ecuador	1/27/1969	128665.86	Payment Adjustment Coordinator	
-1454549472	8	Norma	Wright	nwright7@prweb.com	Female	81.219.156.187	63047796765720509	Indonesia	6/27/1997	68907.46	Office Assistant III	
-1454611735	9	Brandon	Snyder	bsnyder8@artisteer.com	Male	102.118.191.191	490339322609872711	Malta	10/6/1981	71646.15	Physical Therapy Assistant	
-1454610256	10	Stephanie	Reed	sreed9@who.int	Female	175.52.228.75	502081312903167845	Afghanistan	8/27/1957	137924.13	Recruiter	
test

-1454565105	11	Jane	Armstrong	jarmstronga@state.gov		202.44.98.126	374283443294665	China	10/30/1991	\N	Associate Professor	
-1454607247	12	Donna	Coleman	dcolemanb@upenn.edu	Female	178.9.167.99		Vietnam	11/21/1957	93283.06	Librarian	
-1454567839	13	Samuel	Butler	sbutlerc@hp.com	Male	129.114.220.80	3587725229492688	Colombia	9/12/1984	208303.6	Compensation Analyst	
-1454567413	14	Jerry	Medina	jmedinad@youtu.be	Male	87.0.152.222	3579766249568578	Japan	8/30/1988	53502.26	Registered Nurse	
-1454603317	15	Samuel	Lane	slanee@i2i.jp	Male	225.20.25.160		Canada	9/6/1983	142643.38	GIS Technical Architect	❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙
-1454630090	16	Kathy	Rice	kricef@independent.co.uk	Female	4.200.99.226	6709951086431189768	Philippines		52614.1		
-1454575979	17	Adam	Woods	awoodsg@mapy.cz	Male	229.247.245.218	3580417672766100	Indonesia	12/8/1987	284906.49	Payment Adjustment Coordinator	
-1454555573	18	Theresa	Ellis	tellish@nydailynews.com	Female	39.249.101.160		Belarus	6/18/1966	35216.95	Sales Representative	
-1454555343	19	Christopher	Brooks	cbrooksi@intel.com	Male	252.52.58.13		China		119492.57		
 1454544139	20	Debra	White	dwhitej@umn.edu	Female	142.140.184.111		Indonesia		47859.54		
-1454559526	21	Alice	Ward	awardk@cafepress.com	Female	14.157.183.41	3554057857533990	Vietnam	5/7/1977	117790.3	Technical Writer	
-1454597106	22	Tina	Wood	twoodl@businesswire.com	Female	201.242.103.145	3568980472135848	Sweden	3/28/1969	47283.17	Staff Scientist	
-1454591306	23	Carolyn	Mendoza	cmendozam@army.mil		214.205.231.22		Greece		\N		␡
-1454611603	24	Craig	Ford	cfordn@vistaprint.com	Male	236.178.217.229	633110713949459104	Indonesia	12/22/1996	274187.59	Dental Hygienist	
-1454618551	25	Christine	Morrison	cmorrisono@ask.com	Female	219.71.212.187	3538407669945679	Tanzania	3/12/1991	84756.66	Executive Secretary	社會科學院語學研究所
-1454580024	26	Janice	Dean	jdeanp@statcounter.com	Female	49.234.145.208	3537160378882698	Ukraine	8/21/1991	217443.08	Administrative Assistant III	
-1454558127	27	Joan	Burton	jburtonq@oaic.gov.au	Female	221.227.41.244	201770241278691	China	4/6/1993	256763.22	Staff Accountant I	\N
-1454619460	28	Brandon	Stone	bstoner@discovery.com	Male	1.106.6.30	30535344906416	Indonesia	7/13/1964	166396.41	Health Coach II	
-1454571966	29	Sarah	Hall	shalls@loc.gov	Female	235.168.89.65	3528746985103311	Czech Republic	11/13/1959	123411.44	Assistant Manager	
-1454569447	30	Kelly	Crawford	kcrawfordt@typepad.com	Female	152.220.24.54	3578225435679583	Poland	10/21/1970	115305.8	Chief Design Engineer	
-1454609438	31	Maria	Banks	mbanksu@google.co.uk	Female	107.120.193.133	5602224764294077	Italy	10/29/1981	213273.21	Financial Analyst	
-1454546937	32	Roy	Simmons	rsimmonsv@telegraph.co.uk	Male	21.20.158.183	5602244835346375	Mongolia	6/27/1994	13987.6	Senior Editor	"<>?:""{}|_+"
-1454611880	33	Judith	Williamson	jwilliamsonw@hubpages.com	Female	128.75.193.80	3540423032294659	Indonesia	10/19/1975	35326.68	Senior Sales Associate	
-1454567714	34	Joe	Arnold	jarnoldx@soundcloud.com	Male	170.118.207.254	4017955870878	Morocco	1/11/1991	261893.92	Mechanical Systems Engineer	
-1454605829	35	Richard	Griffin	rgriffiny@barnesandnoble.com	Male	180.74.211.58	3539729371124817	Philippines	8/23/1964	43742.89	Nurse	
-1454607440	36	Billy	Freeman	bfreemanz@fda.gov	Male	223.238.104.92		Sweden	5/19/1961	185185.85	Office Assistant I	
-1454601803	37	Shawn	Welch	swelch10@oaic.gov.au	Male	239.144.169.67		Brazil		45785.65		‪‪test‪
-1454626608	38	Kenneth	Price	kprice11@tamu.edu	Male	121.107.99.253	372301962802254	China	3/1/1958	110448	Senior Sales Associate	
-1454612578	39	Patricia	Lawson	plawson12@dailymotion.com	Female	181.201.209.42	6761282787969476	Czech Republic	4/6/1956	126454.68	Staff Accountant I	
-1454544201	40	Christine	Alexander	calexander13@aboutads.info	Female	163.32.3.92	50183677518131890	China	1/14/1981	213713.99	Sales Associate	
-1454599667	41	Mark	Wagner	mwagner14@imageshack.us	Male	78.141.201.64	5007660710388524	China	3/10/1987	207149.01	Staff Scientist	
-1454624139	42	Richard	Armstrong	rarmstrong15@baidu.com	Male	229.173.184.111	3546008978147005	Indonesia	9/6/1961	52279.16	Software Engineer II	
-1454618327	43	Phillip	Ellis	pellis16@berkeley.edu	Male	183.182.90.8	3561054399919267	Brazil	1/31/1994	59681.04	Analog Circuit Design manager	\N
-1454614376	44	Beverly	Perry	bperry17@nasa.gov	Female	47.117.191.34		Vietnam	9/15/1983	41351.4	Database Administrator IV	1E+02
-1454559810	45	Carolyn	Parker	cparker18@soup.io	Female	124.227.162.209	3555739550936724	Belarus	1/29/1988	162142.52	Chemical Engineer	
-1454605899	46	Martin	Knight	mknight19@umn.edu	Male	173.169.240.26	5387225346178705	China	9/4/1994	200217.98	Assistant Professor	
-1454580952	47	Michael	Stephens	mstephens1a@altervista.org	Male	181.48.175.67		Honduras	9/10/1958	248987	Environmental Specialist	
-1454545483	48	Frances	Willis	fwillis1b@linkedin.com		102.186.57.75	4175001067968122	Philippines	8/3/1998	\N	VP Marketing	
-1454618611	49	Gary	Fox	gfox1c@paginegialle.it	Male	80.221.129.42		Belgium		261175.89		
-1454605416	50	Cynthia	Bailey	cbailey1d@microsoft.com	Female	210.74.99.47		Indonesia	4/23/1989	38171.71	Sales Associate	
-1454547938	51	Terry	Mitchell	tmitchell1e@soundcloud.com	Male	64.34.240.165		Peru		101626.65		
-1454607980	52	Edward	Webb	ewebb1f@123-reg.co.uk	Male	208.114.99.74	6386981481832436	Jordan		235457.76		
 1454544152	53	Ralph	Simmons	rsimmons1g@google.cn	Male	180.159.250.232	3554040768947822	Pakistan		111413.03		
-1454606074	54	Sara	Kelly	skelly1h@wix.com	Female	97.243.219.196	3560161969850482	Portugal	12/11/1963	185788.86	Chief Design Engineer	
-1454577433	55	Donna	Dean	ddean1i@ftc.gov	Female	91.232.196.181		Indonesia		285481.87		
-1454545198	56	Jane	Murray	jmurray1j@apache.org	Female	174.82.82.71	5100149053428994	China	7/15/1973	57832.83	Software Consultant	
-1454582927	57	Walter	Cook	wcook1k@webnode.com	Male	4.223.17.187	5048374925679138	China	7/19/1979	164010.7	Accounting Assistant IV	
-1454553504	58	Bonnie	Hanson	bhanson1l@squidoo.com	Female	209.131.133.80	3546400025538536	China	8/6/1989	207065.08	Recruiter	
-1454583403	59	Patrick	Kelly	pkelly1m@usgs.gov	Male	92.132.67.51	30129138653846	Poland	10/22/1984	281404.55	Librarian	
-1454551706	60	George	Ross	gross1n@sciencedaily.com	Male	77.33.183.49	201938854334636	Portugal	2/17/1986	96243.17	Teacher	
-1454572199	61	Joan	Harvey	jharvey1o@biglobe.ne.jp	Female	244.175.30.138	5479197462183554	Indonesia	12/30/1974	269498	Nurse Practicioner	åß∂ƒ©˙∆˚¬…æ
-1454555502	62	Louise	Stone	lstone1p@1und1.de	Female	230.79.20.66		Indonesia	1/14/1980	44528.64	Senior Editor	
-1454597662	63	Lawrence	Pierce	lpierce1q@ihg.com	Male	35.230.80.125	6763027632739915	Indonesia	7/22/1982	269467.08	Human Resources Assistant IV	
-1454577961	64	Dorothy	Gray	dgray1r@vimeo.com	Female	206.99.76.117	3582462082297450	China	10/8/1975	58802.03	Staff Scientist	-1.00
-1454578138	65	Shawn	Larson	slarson1s@sohu.com	Male	233.109.124.208	3557232712378033	Pakistan	6/11/1987	24566.92	Programmer I	
-1454620878	66	Ashley	Carter	acarter1t@weather.com	Female	120.243.16.33	5641823823569006485	Philippines	2/4/1999	181594.54	Technical Writer	
-1454608592	67	Bruce	Gonzalez	bgonzalez1u@behance.net	Male	213.165.12.93	5602219496203313	Sweden	6/27/1975	152915.03	Social Worker	
-1454570547	68	Gary	Porter	gporter1v@nhs.uk	Male	113.26.17.148	3551504699131924	China	10/15/1988	239398.41	VP Sales	åß∂ƒ©˙∆˚¬…æ
-1454623375	69	Kimberly	Bell	kbell1w@techcrunch.com	Female	232.188.203.114	06048433236353334	Tanzania		239482.42		"
-1454580645	70	James	Torres	jtorres1x@rakuten.co.jp	Male	42.70.136.181		Brazil	3/19/1968	66432.01	Information Systems Manager	
-1454565683	71	Cheryl	Williams	cwilliams1y@clickbank.net		24.11.168.130		Latvia	9/28/1958	\N	Quality Control Specialist	
-1454572298	72	Diane	Hicks	dhicks1z@noaa.gov	Female	220.185.241.90	36196827669213	Honduras	11/20/1977	104365.11	Systems Administrator I	
-1454630150	73	Judith	Brown	jbrown20@acquirethisname.com	Female	173.62.110.176		Czech Republic	12/26/1994	218616.17	Safety Technician IV	
-1454550898	74	Jesse	Dixon	jdixon21@bloglines.com	Male	156.125.120.208		Syria		277530.58		(╯°□°）╯︵ ┻━┻)  
-1454560223	75	Timothy	Garza	tgarza22@tmall.com	Male	56.172.71.231		Poland	4/1/1978	21103.66	Desktop Support Technician	␡
-1454549446	76	Gloria	Washington	gwashington23@hud.gov	Female	249.63.88.116	3528613230855766	Portugal	10/17/1960	175586.21	Information Systems Manager	
-1454555260	77	Patricia	Bell	pbell24@youtu.be	Female	20.46.164.228	3528267541114924	Honduras	1/31/1999	47750.6	Payment Adjustment Coordinator	
-1454579807	78	Theresa	Clark	tclark25@wp.com	Female	178.250.150.112	6396247540156151	Indonesia	10/10/1989	78319.93	Executive Secretary	
-1454629649	79	Matthew	Matthews	mmatthews26@typepad.com	Male	33.186.230.54	5213341713953768	Azerbaijan	10/4/1990	12883.34	Help Desk Technician	
-1454568333	80	Betty	White	bwhite27@github.com	Female	128.110.102.181	3572999005932624	Morocco	12/6/1980	30998.69	Operator	
-1454559489	81	Christina	Nguyen	cnguyen28@washingtonpost.com	Female	63.57.110.32	36954036240279	Philippines	7/23/1984	259707.25	Project Manager	
-1454575575	82	Norma	Stevens	nstevens29@newyorker.com	Female	148.35.34.31		Brazil	7/24/1984	233848.07	Professor	
-1454547659	83	Tammy	Walker	twalker2a@craigslist.org	Female	115.94.89.2	4508955158259501	China	1/1/1972	241046.96	Community Outreach Specialist	
-1454559813	84	Mark	Jackson	mjackson2b@utexas.edu	Male	136.242.153.66	36666130651082	Philippines	12/9/1957	245352.11	Account Executive	部落格
-1454547442	85	Scott	Washington	swashington2c@bloomberg.com	Male	79.185.72.100	6395647151650882	Brazil	2/17/1957	240505.52	Professor	
-1454577775	86	Margaret	Franklin	mfranklin2d@mapy.cz	Female	139.209.240.12	501835281527257384	Brazil		72758.49		
-1454582451	87	Carolyn	Wilson	cwilson2e@hp.com	Female	5.172.62.195	3581164938009805	France	1/19/1997	162909.64	Librarian	
-1454608782	88	Emily	Cole	ecole2f@epa.gov		97.83.153.33		Burkina Faso	5/3/1996	\N	Accounting Assistant IV	1.00
-1454544809	89	Carolyn	Gutierrez	cgutierrez2g@smh.com.au	Female	109.77.234.103		Madagascar	2/13/1999	139612.73	Nurse	
-1454591667	90	Jose	Wallace	jwallace2h@about.com	Male	250.231.81.57		Philippines	12/17/1983	213500.16	Design Engineer	
-1454561119	91	Charles	Reed	creed2i@independent.co.uk	Male	28.212.235.149	4017954848825528	China		88039.86		
-1454615732	92	Brian	Parker	bparker2j@hugedomains.com	Male	143.67.111.179		Portugal	1/18/1996	202446.54	Executive Secretary	
-1454613613	93	Donald	Fox	dfox2k@webs.com	Male	251.61.52.170	3553498748210516	Indonesia	12/19/1975	134745.75	Human Resources Manager	
-1454603200	94	Jack	West	jwest2l@biblegateway.com	Male	115.144.142.60		Poland	10/30/1956	245162.49	Office Assistant I	1.00
-1454574412	95	Doris	Gomez	dgomez2m@tinypic.com	Female	156.173.76.213	4041593860679	Colombia	8/28/1977	164689.56	Speech Pathologist	
+1454544187	564	Christine	Willis	cwillisfn@pagesperso-orange.fr	Female	166.102.221.213	3534808021291708	Russia	8/3/1991	112850.81	Desktop Support Technician	
+1454544201	40	Christine	Alexander	calexander13@aboutads.info	Female	163.32.3.92	50183677518131890	China	1/14/1981	213713.99	Sales Associate	
+1454544213	992	Anna	Dean	adeanrj@netvibes.com	Female	113.127.227.85	3586135192218451	Vietnam	5/29/1962	286181.88	Automation Specialist II	
+1454544238	601	Aaron	Kim	akimgo@mayoclinic.com	Male	182.52.179.175	3587685548758112	Kazakhstan	11/6/1963	156217.14	Accounting Assistant I	
+1454544284	903	John	Harris	jharrisp2@goo.ne.jp	Male	65.10.215.144	3565387100757980	China	6/7/1970	153671.44	Analog Circuit Design manager	
+1454544326	325	Billy	Meyer	bmeyer90@nature.com	Male	163.186.10.162	3538589516492193	Colombia	7/20/1983	84716.67	Assistant Professor	
+1454544328	746	Christine	Howell	chowellkp@php.net	Female	71.95.250.29	5100170292026399	China	1/11/1964	30533.25	Account Executive	
+1454544347	353	Alan	Collins	acollins9s@cpanel.net	Male	16.99.94.145	3536005999242155	Guatemala	6/1/1980	38434.4	Software Test Engineer II	・(￣∀￣)・:*:
+1454544495	879	Marie	Vasquez	mvasquezoe@is.gd	Female	101.194.66.108	3563730358790256	China	9/21/1958	12182.09	Nurse	
+1454544507	912	Evelyn	Fisher	efisherpb@soup.io	Female	221.207.200.158	201473318880354	China	5/17/1998	208654.68	Geological Engineer	
+1454544523	923	Jessica	George	jgeorgepm@so-net.ne.jp	Female	119.65.145.55		Russia	6/22/1965	73210.79	Nurse	
 1454544624	96	Brandon	Owens	bowens2n@si.edu	Male	5.39.151.46	4591258400528650	France	3/13/1998	74028.68	Software Engineer III	
-1454596449	97	Evelyn	Wagner	ewagner2o@sbwire.com	Female	84.231.120.250	3571837377153521	China	1/5/1965	78692.34	Operator	
+1454544685	617	Judith	Bishop	jbishoph4@weibo.com	Female	50.167.35.101	3536263290947101	Taiwan		147732.13		(｡◕ ∀ ◕｡)
+1454544809	89	Carolyn	Gutierrez	cgutierrez2g@smh.com.au	Female	109.77.234.103		Madagascar	2/13/1999	139612.73	Nurse	
+1454544817	929	Harold	Tucker	htuckerps@stanford.edu	Male	243.182.109.135	374622077056546	China		161472.14		
+1454544819	590	Irene	Larson	ilarsongd@addthis.com	Female	67.196.118.250		Syria	8/11/1969	222598.25	Business Systems Development Analyst	
+1454544888	577	Frances	Day	fdayg0@ox.ac.uk	Female	54.131.119.123	3534463936023182	Portugal	11/15/1969	206386.03	Environmental Specialist	
+1454544926	908	Bruce	Banks	bbanksp7@ifeng.com	Male	3.58.102.49	560224852697998794	Indonesia	1/18/1983	146835.33	Professor	
+1454544936	951	Carolyn	Lewis	clewisqe@blogger.com	Female	154.230.220.164	5469666950681032	Uruguay	11/25/1955	119686.8	Help Desk Technician	
+1454545198	56	Jane	Murray	jmurray1j@apache.org	Female	174.82.82.71	5100149053428994	China	7/15/1973	57832.83	Software Consultant	
+1454545225	439	Keith	Cook	kcookc6@usa.gov	Male	22.162.180.159		Poland		146503.61		
+1454545268	358	Todd	Meyer	tmeyer9x@huffingtonpost.com	Male	183.45.201.202	5593314243312813	China	7/31/1987	115187.5	Paralegal	
+1454545307	204	Lillian	Long	llong5n@skype.com	Female	146.238.55.254	5641820612278798844	Czech Republic	6/18/1999	150598.38	Human Resources Assistant IV	
+1454545319	409	Doris	Bishop	dbishopbc@spotify.com	Female	199.116.182.20	3575820879808061	Canada	11/29/1964	169913.1	Geological Engineer	
+1454545330	559	Eric	West	ewestfi@mapquest.com	Male	229.67.66.9	3584340222063867	Italy	8/31/1998	59102.31	General Manager	1E2
+1454545330	702	Dennis	Kelly	dkellyjh@cargocollective.com	Male	159.10.27.86	3586421938986530	China	3/22/1982	260296.17	Desktop Support Technician	
+1454545334	371	Gerald	Russell	grussellaa@last.fm		174.119.43.205	3545489024436298	Bahrain	12/21/2000	\N	Senior Cost Accountant	
+1454545338	369	Judy	Perez	jpereza8@gmpg.org	Female	109.68.19.234	5249772984361935	Philippines	7/9/1989	257973.8	Sales Associate	
+1454545351	178	Melissa	Thomas	mthomas4x@mysql.com	Female	192.210.201.207	5562824139318432	Equatorial Guinea	8/17/1965	267092.73	Junior Executive	
+1454545414	831	Arthur	Hill	ahilln2@usnews.com	Male	231.181.126.173	5602223371820245193	Colombia	3/25/1993	247436.07	Mechanical Systems Engineer	
+1454545426	170	Anne	Oliver	aoliver4p@jimdo.com	Female	205.100.30.244	3530095445603833	Indonesia	3/31/1970	232499.96	Software Test Engineer III	
+1454545483	48	Frances	Willis	fwillis1b@linkedin.com		102.186.57.75	4175001067968122	Philippines	8/3/1998	\N	VP Marketing	
+1454545502	478	Joshua	Harrison	jharrisond9@noaa.gov	Male	231.249.108.195	30492555718355	Japan	11/24/1971	143815.22	Clinical Specialist	
 1454545547	98	Timothy	Boyd	tboyd2p@imdb.com	Male	211.20.45.168	5602253132446507	Peru	7/8/1976	127883.56	Data Coordiator	
-1454549050	99	Edward	Gilbert	egilbert2q@ocn.ne.jp	Male	237.183.200.242	3586807595028188	Bangladesh	8/30/1956	214872.75	Senior Financial Analyst	᠎
-1454583513	100	Howard	Patterson	hpatterson2r@toplist.cz	Male	200.77.150.4	3558592437934298	China	7/9/1991	23607	Administrative Assistant IV	
+1454545556	148		Powell		Female	77.50.112.73	5303311226469439	China		175168.8		
+1454545565	998	Louis	Lee	lleerp@thetimes.co.uk	Male	8.88.141.81		Russia	11/20/1982	13134.47	Office Assistant IV	
+1454545585	116	Lisa	James	ljames37@walmart.com		149.162.35.129		Sweden	3/19/1986	\N	Graphic Designer	
+1454545601	269	Carlos	Flores	cflores7g@samsung.com	Male	121.205.206.52		France		89368.56		
+1454545680	197	Eugene	Shaw	eshaw5g@topsy.com	Male	75.2.214.89	5602236558365152	France	11/25/1983	204106.08	Associate Professor	
+1454545733	536	Charles	Welch	cwelchev@paginegialle.it	Male	135.156.127.116	3540766046216294	Bulgaria	11/26/1980	280230.13	Accountant II	
+1454545747	800	Sharon	Crawford	scrawfordm7@google.cn	Female	185.219.127.5	5141634704661813	Pakistan	12/1/1980	14880.86	Clinical Specialist	
+1454545784	370	Martin	Webb	mwebba9@shutterfly.com	Male	241.183.200.48		Portugal	5/28/1981	134676.08	Database Administrator III	
+1454545905	425	Wanda	Olson	wolsonbs@pen.io	Female	136.216.93.167	3579427292475142	Slovenia		195983.76		
+1454545917	158		Nelson		Female	158.42.83.104		Nigeria		56092.93		
+1454545926	144	Ruth	Ryan	rryan3z@reference.com	Female	157.117.150.254	3580511168862041	Indonesia	9/9/1972	56717.9	Account Coordinator	999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
+1454545928	432	Aaron	Sims	asimsbz@squidoo.com	Male	176.74.122.74	3553550116250639	China	12/20/1992	245201.62	Recruiting Manager	
+1454545988	167	Frank	Cunningham	fcunningham4m@github.com	Male	150.174.230.186	5602249442759621	France	4/17/1969	254828.23	Nuclear Power Engineer	
+1454546017	736	Doris	Reyes	dreyeskf@trellian.com	Female	50.37.101.111		Russia	3/23/1967	48543.29	Electrical Engineer	١٢٣
+1454546051	696	Walter	Baker	wbakerjb@webmd.com	Male	33.81.54.207		Poland	12/4/1985	257839.28	Occupational Therapist	
+1454546096	418	Nicole	Weaver	nweaverbl@yellowbook.com	Female	178.127.204.49	6333547435590930225	Brazil		91251		
+1454546121	521	Jesse	Mccoy	jmccoyeg@illinois.edu	Male	77.2.76.98	5602212301270239	Indonesia		265697.47		
+1454546176	324	Randy	Perkins	rperkins8z@spotify.com	Male	90.152.116.122	4903530859961340	Canada	9/29/1982	59754.4	Programmer IV	
+1454546214	720	Daniel	Roberts	drobertsjz@blog.com	Male	200.191.212.146	4917780904858553	Argentina	3/31/1965	151397.44	Analog Circuit Design manager	
+1454546253	279	Ernest	Palmer	epalmer7q@zdnet.com	Male	24.129.157.239	5384992294623031	China		158317.63		
+1454546269	937	Julia	Hawkins	jhawkinsq0@businesswire.com	Female	41.247.95.119		Japan		52113.66		
+1454546342	307	Phillip	Mason	pmason8i@hubpages.com	Male	231.103.199.111	5602233897712483	China		277619.14		␢
+1454546380	547	Benjamin	Garcia	bgarciaf6@spotify.com	Male	151.228.6.14	3555896626891000	Macedonia		240109.95		
+1454546423	616	Frances	Hamilton	fhamiltonh3@tamu.edu	Female	188.88.34.240		Peru	3/19/1989	69117.34	Assistant Professor	
+1454546426	753	Raymond	Harper	rharperkw@facebook.com	Male	148.46.64.54	5002351763645136	China	1/27/1980	191542.74	VP Accounting	
+1454546437	972	Bonnie	Morrison	bmorrisonqz@simplemachines.org		13.205.160.142	6763571935984496	Georgia	3/8/1973	\N	Tax Accountant	../../../../../../../../../../../etc/passwd%00
+1454546468	185	Lisa	Castillo	lcastillo54@ebay.com	Female	96.65.226.75	5100133275364427	Iran	4/8/1989	19003.55	Database Administrator I	
+1454546507	980	Marilyn	Castillo	mcastillor7@wikipedia.org	Female	225.8.34.64	3560325383537120	Thailand		166569.16		
+1454546551	293	Barbara	Diaz	bdiaz84@usnews.com	Female	176.106.164.136	30109403344362	Egypt	11/25/1984	41388.68	Quality Control Specialist	
+1454546607	172	Christina	Payne	cpayne4r@umich.edu		208.172.251.134	3567551256592404	Hungary	5/9/1977	\N	Quality Control Specialist	
+1454546678	454	Amy	Phillips	aphillipscl@blog.com	Female	156.231.253.161		Russia	11/21/1997	136062.09	Environmental Tech	␣
+1454546732	792	Christine	Howard	chowardlz@prweb.com	Female	69.22.66.149		Kosovo	3/10/1998	90266.03	Civil Engineer	
+1454546852	671	Juan	Scott	jscottim@theatlantic.com	Male	170.84.164.52	3530364751135776	Indonesia	12/29/1979	127445.95	Assistant Professor	
+1454546865	878	Robin	Matthews	rmatthewsod@alexa.com	Female	168.96.0.234	5108756854169874	China	11/17/1975	155909.78	Staff Accountant I	
+1454546874	578	Lisa	Foster	lfosterg1@va.gov	Female	116.239.143.83	30550897409197	Canada	12/25/1980	282301.9	Product Engineer	
+1454546885	514	Clarence	Gardner	cgardnere9@addthis.com	Male	241.164.83.193	3567799117668968	Mexico	2/8/1983	69661.64	Business Systems Development Analyst	
+1454546937	32	Roy	Simmons	rsimmonsv@telegraph.co.uk	Male	21.20.158.183	5602244835346375	Mongolia	6/27/1994	13987.6	Senior Editor	"<>?:""{}|_+"
+1454546996	140	Christina	Hanson	chanson3v@seattletimes.com	Female	154.87.3.146	3589004738797807	Peru	12/6/1994	157444.39	Budget/Accounting Analyst I	
+1454547050	714	Sean	Shaw	sshawjt@stumbleupon.com	Male	190.171.138.84	4041370678096900	Portugal	11/13/1987	280420.03	Director of Sales	
+1454547183	440	David	Dixon	ddixonc7@google.es	Male	102.192.92.231	3571723971536297	China		197005		ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ
+1454547190	109	Janice	Edwards	jedwards30@huffingtonpost.com	Female	156.5.183.66		Czech Republic	9/3/1977	166805.79	Account Coordinator	
+1454547193	807	Helen	Roberts	hrobertsme@marketwatch.com	Female	242.160.113.180	201415538184406	Armenia	9/30/1968	131695.03	Help Desk Technician	
+1454547199	6	Irene	Wells	iwells5@fema.gov	Female	85.5.67.113		Iran		74337.42		
+1454547206	629	Donna	Crawford	dcrawfordhg@google.fr	Female	139.87.72.237	3548002968267145	Philippines	9/10/1974	120949.74	Senior Quality Engineer	
+1454547314	239	Terry	Anderson	tanderson6m@joomla.org	Male	126.193.158.217		Slovenia	6/2/1988	241130.56	Senior Sales Associate	
+1454547413	874	Roger	Armstrong	rarmstrongo9@shop-pro.jp	Male	176.127.63.161		Sweden	1/4/1969	195125.77	Environmental Tech	
+1454547442	85	Scott	Washington	swashington2c@bloomberg.com	Male	79.185.72.100	6395647151650882	Brazil	2/17/1957	240505.52	Professor	
+1454547470	265	Ronald	Simmons	rsimmons7c@php.net	Male	231.21.126.12		Colombia	5/12/1959	28563.27	Staff Accountant III	
+1454547497	574	Laura	Lawson	llawsonfx@disqus.com	Female	227.157.239.115	5108755030972003	Mongolia	6/17/1987	192790.7	Sales Representative	../../../../../../../../../../../etc/hosts
+1454547546	582		Medina		Male	230.187.35.16		China		87740.62		
+1454547580	868	Todd	Simmons	tsimmonso3@amazon.co.uk	Male	232.231.42.85		Peru	1/28/1977	70099.6	Sales Associate	NULL
+1454547632	421	Sara	Murray	smurraybo@instagram.com	Female	83.32.41.79		Mongolia	3/2/1972	21859.35	Research Associate	
+1454547659	83	Tammy	Walker	twalker2a@craigslist.org	Female	115.94.89.2	4508955158259501	China	1/1/1972	241046.96	Community Outreach Specialist	
+1454547745	476	Norma	Palmer	npalmerd7@etsy.com	Female	24.81.30.107	6759877990739668322	China	2/22/1974	273005.88	Executive Secretary	
+1454547823	333	Ruth	Ryan	rryan98@gov.uk	Female	165.226.217.32	6771454237379758	Philippines	4/25/1993	246324.26	Staff Accountant I	
+1454547897	523	Raymond	Green	rgreenei@sciencedaily.com	Male	129.154.223.20	5020525177159002	Brazil	7/25/1966	217735.34	Sales Associate	
+1454547914	626	Steven	Cooper	scooperhd@home.pl	Male	226.75.17.73	30583351914956	United States	4/22/2000	174475.39	Web Developer II	
+1454547938	51	Terry	Mitchell	tmitchell1e@soundcloud.com	Male	64.34.240.165		Peru		101626.65		
+1454547979	282	Lisa	Romero	lromero7t@pinterest.com	Female	54.113.22.9		Portugal		224233.61		
+1454548111	899	Raymond	Payne	rpayneoy@purevolume.com	Male	170.237.246.144	201978019687940	Philippines	1/21/1993	126392.14	Staff Accountant I	
+1454548272	966	Kevin	Martin	kmartinqt@hostgator.com	Male	87.47.66.144	3550408592420163	Sweden	10/24/1965	213135.46	Senior Sales Associate	
+1454548342	846	Keith	Taylor	ktaylornh@about.me	Male	90.199.26.239	4175007392203366	South Africa	2/4/1990	64012.82	Associate Professor	
+1454548358	164	Lawrence	Johnston	ljohnston4j@businessweek.com	Male	150.125.123.49		China	6/14/1993	243318.68	Design Engineer	
+1454548489	550	Brandon	Owens	bowensf9@wired.com	Male	220.236.132.34		Vietnam		271248.99		
 === Try load data from v0.7.1.all-named-index.parquet
+0.21	59.8	61	326	3.89	3.84	2.31	Premium	E	SI1
 0.22	65.1	61	337	3.87	3.78	2.49	Fair	E	VS2
 0.23	56.9	65	327	4.05	4.07	2.31	Good	E	VS1
-0.31	63.3	58	335	4.34	4.35	2.75	Good	J	SI2
-0.23	61.5	55	326	3.95	3.98	2.43	Ideal	E	SI2
-0.21	59.8	61	326	3.89	3.84	2.31	Premium	E	SI1
-0.29	62.4	58	334	4.2	4.23	2.63	Premium	I	VS2
-0.26	61.9	55	337	4.07	4.11	2.53	Very Good	H	SI1
 0.23	59.4	61	338	4	4.05	2.39	Very Good	H	VS1
+0.23	61.5	55	326	3.95	3.98	2.43	Ideal	E	SI2
 0.24	62.3	57	336	3.95	3.98	2.47	Very Good	I	VVS1
 0.24	62.8	57	336	3.94	3.96	2.48	Very Good	J	VVS2
+0.26	61.9	55	337	4.07	4.11	2.53	Very Good	H	SI1
+0.29	62.4	58	334	4.2	4.23	2.63	Premium	I	VS2
+0.31	63.3	58	335	4.34	4.35	2.75	Good	J	SI2
 === Try load data from v0.7.1.column-metadata-handling.parquet
 1	0.1	2017-01-01 02:00:00	a	2017-01-01 02:00:00
 2	0.2	2017-01-02 02:00:00	b	2017-01-02 02:00:00
 3	0.3	2017-01-03 02:00:00	c	2017-01-03 02:00:00
 === Try load data from v0.7.1.parquet
-0.23	Ideal	E	SI2	61.5	55	326	3.95	3.98	2.43	0
 0.21	Premium	E	SI1	59.8	61	326	3.89	3.84	2.31	1
+0.22	Fair	E	VS2	65.1	61	337	3.87	3.78	2.49	8
 0.23	Good	E	VS1	56.9	65	327	4.05	4.07	2.31	2
+0.23	Ideal	E	SI2	61.5	55	326	3.95	3.98	2.43	0
+0.23	Very Good	H	VS1	59.4	61	338	4	4.05	2.39	9
+0.24	Very Good	I	VVS1	62.3	57	336	3.95	3.98	2.47	6
+0.24	Very Good	J	VVS2	62.8	57	336	3.94	3.96	2.48	5
+0.26	Very Good	H	SI1	61.9	55	337	4.07	4.11	2.53	7
 0.29	Premium	I	VS2	62.4	58	334	4.2	4.23	2.63	3
 0.31	Good	J	SI2	63.3	58	335	4.34	4.35	2.75	4
-0.24	Very Good	J	VVS2	62.8	57	336	3.94	3.96	2.48	5
-0.24	Very Good	I	VVS1	62.3	57	336	3.95	3.98	2.47	6
-0.26	Very Good	H	SI1	61.9	55	337	4.07	4.11	2.53	7
-0.22	Fair	E	VS2	65.1	61	337	3.87	3.78	2.49	8
-0.23	Very Good	H	VS1	59.4	61	338	4	4.05	2.39	9
 === Try load data from v0.7.1.some-named-index.parquet
+0.21	59.8	61	326	3.89	3.84	2.31	Premium	E	SI1
 0.22	65.1	61	337	3.87	3.78	2.49	Fair	E	VS2
 0.23	56.9	65	327	4.05	4.07	2.31	Good	E	VS1
-0.31	63.3	58	335	4.34	4.35	2.75	Good	J	SI2
-0.23	61.5	55	326	3.95	3.98	2.43	Ideal	E	SI2
-0.21	59.8	61	326	3.89	3.84	2.31	Premium	E	SI1
-0.29	62.4	58	334	4.2	4.23	2.63	Premium	I	VS2
-0.26	61.9	55	337	4.07	4.11	2.53	Very Good	H	SI1
 0.23	59.4	61	338	4	4.05	2.39	Very Good	H	VS1
+0.23	61.5	55	326	3.95	3.98	2.43	Ideal	E	SI2
 0.24	62.3	57	336	3.95	3.98	2.47	Very Good	I	VVS1
 0.24	62.8	57	336	3.94	3.96	2.48	Very Good	J	VVS2
+0.26	61.9	55	337	4.07	4.11	2.53	Very Good	H	SI1
+0.29	62.4	58	334	4.2	4.23	2.63	Premium	I	VS2
+0.31	63.3	58	335	4.34	4.35	2.75	Good	J	SI2
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.sh b/tests/queries/0_stateless/00900_long_parquet_load.sh
index 8e6ea24edb4..8142c5b5810 100755
--- a/tests/queries/0_stateless/00900_long_parquet_load.sh
+++ b/tests/queries/0_stateless/00900_long_parquet_load.sh
@@ -66,6 +66,6 @@ EOF
     # Some files contain unsupported data structures, exception is ok.
     cat "$DATA_DIR"/"$NAME" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_load FORMAT Parquet" 2>&1 | sed 's/Exception/Ex---tion/'
 
-    ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_load LIMIT 100"
+    ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_load ORDER BY tuple(*) LIMIT 100"
     ${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_load"
 done
diff --git a/tests/queries/0_stateless/00918_json_functions.reference b/tests/queries/0_stateless/00918_json_functions.reference
index 72e0df5bfda..be8e603f8dc 100644
--- a/tests/queries/0_stateless/00918_json_functions.reference
+++ b/tests/queries/0_stateless/00918_json_functions.reference
@@ -108,6 +108,12 @@ true	Bool
 123456789012	UInt64
 0	UInt64
 0	Int8
+{'a':'hello','b':'world'}
+{'a':'hello','b':'world'}
+{'a':('hello',100),'b':('world',200)}
+{'a':[100,200],'b':[-100,200,300]}
+{'a':{'c':'hello'},'b':{'d':'world'}}
+{'c':'hello'}
 --JSONExtractKeysAndValues--
 [('a','hello'),('b','[-100,200,300]')]
 [('b',[-100,200,300])]
@@ -152,6 +158,7 @@ e
 u
 v
 --show error: type should be const string
+--show error: key of map type should be String
 --allow_simdjson=0--
 --JSONLength--
 2
@@ -217,6 +224,12 @@ Friday
 (3,0)
 (3,5)
 (3,0)
+{'a':'hello','b':'world'}
+{'a':'hello','b':'world'}
+{'a':('hello',100),'b':('world',200)}
+{'a':[100,200],'b':[-100,200,300]}
+{'a':{'c':'hello'},'b':{'d':'world'}}
+{'c':'hello'}
 --JSONExtractKeysAndValues--
 [('a','hello'),('b','[-100,200,300]')]
 [('b',[-100,200,300])]
@@ -266,3 +279,4 @@ u
 v
 --show error: type should be const string
 --show error: index type should be integer
+--show error: key of map type should be String
diff --git a/tests/queries/0_stateless/00918_json_functions.sql b/tests/queries/0_stateless/00918_json_functions.sql
index 3314a5b762d..16cc72f7fdc 100644
--- a/tests/queries/0_stateless/00918_json_functions.sql
+++ b/tests/queries/0_stateless/00918_json_functions.sql
@@ -123,6 +123,13 @@ SELECT JSONExtract('{"a": "123456789012.345"}', 'a', 'UInt64') as a, toTypeName(
 SELECT JSONExtract('{"a": "-2000.22"}', 'a', 'UInt64') as a, toTypeName(a);
 SELECT JSONExtract('{"a": "-2000.22"}', 'a', 'Int8') as a, toTypeName(a);
 
+SELECT JSONExtract('{"a": "hello", "b": "world"}', 'Map(String, String)');
+SELECT JSONExtract('{"a": "hello", "b": "world"}', 'Map(LowCardinality(String), String)');
+SELECT JSONExtract('{"a": ["hello", 100.0], "b": ["world", 200]}', 'Map(String, Tuple(String, Float64))');
+SELECT JSONExtract('{"a": [100.0, 200], "b": [-100, 200.0, 300]}', 'Map(String, Array(Float64))');
+SELECT JSONExtract('{"a": {"c": "hello"}, "b": {"d": "world"}}', 'Map(String, Map(String, String))');
+SELECT JSONExtract('{"a": {"c": "hello"}, "b": {"d": "world"}}', 'a',  'Map(String, String)');
+
 SELECT '--JSONExtractKeysAndValues--';
 SELECT JSONExtractKeysAndValues('{"a": "hello", "b": [-100, 200.0, 300]}', 'String');
 SELECT JSONExtractKeysAndValues('{"a": "hello", "b": [-100, 200.0, 300]}', 'Array(Float64)');
@@ -166,8 +173,11 @@ SELECT JSONExtractString('["a", "b", "c", "d", "e"]', idx) FROM (SELECT arrayJoi
 SELECT JSONExtractString(json, 's') FROM (SELECT arrayJoin(['{"s":"u"}', '{"s":"v"}']) AS json);
 
 SELECT '--show error: type should be const string';
-SELECT JSONExtractKeysAndValues([], JSONLength('^?V{LSwp')); -- { serverError 44 }
-WITH '{"i": 1, "f": 1.2}' AS json SELECT JSONExtract(json, 'i', JSONType(json, 'i')); -- { serverError 44 }
+SELECT JSONExtractKeysAndValues([], JSONLength('^?V{LSwp')); -- { serverError ILLEGAL_COLUMN }
+WITH '{"i": 1, "f": 1.2}' AS json SELECT JSONExtract(json, 'i', JSONType(json, 'i')); -- { serverError ILLEGAL_COLUMN }
+
+SELECT '--show error: key of map type should be String';
+SELECT JSONExtract('{"a": [100.0, 200], "b": [-100, 200.0, 300]}', 'Map(Int64, Array(Float64))'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 
 
 SELECT '--allow_simdjson=0--';
@@ -247,6 +257,13 @@ SELECT JSONExtract('{"a":3}', 'Tuple(Int, Int)');
 SELECT JSONExtract('[3,5,7]', 'Tuple(Int, Int)');
 SELECT JSONExtract('[3]', 'Tuple(Int, Int)');
 
+SELECT JSONExtract('{"a": "hello", "b": "world"}', 'Map(String, String)');
+SELECT JSONExtract('{"a": "hello", "b": "world"}', 'Map(LowCardinality(String), String)');
+SELECT JSONExtract('{"a": ["hello", 100.0], "b": ["world", 200]}', 'Map(String, Tuple(String, Float64))');
+SELECT JSONExtract('{"a": [100.0, 200], "b": [-100, 200.0, 300]}', 'Map(String, Array(Float64))');
+SELECT JSONExtract('{"a": {"c": "hello"}, "b": {"d": "world"}}', 'Map(String, Map(String, String))');
+SELECT JSONExtract('{"a": {"c": "hello"}, "b": {"d": "world"}}', 'a',  'Map(String, String)');
+
 SELECT '--JSONExtractKeysAndValues--';
 SELECT JSONExtractKeysAndValues('{"a": "hello", "b": [-100, 200.0, 300]}', 'String');
 SELECT JSONExtractKeysAndValues('{"a": "hello", "b": [-100, 200.0, 300]}', 'Array(Float64)');
@@ -295,8 +312,11 @@ SELECT JSONExtractString('["a", "b", "c", "d", "e"]', idx) FROM (SELECT arrayJoi
 SELECT JSONExtractString(json, 's') FROM (SELECT arrayJoin(['{"s":"u"}', '{"s":"v"}']) AS json);
 
 SELECT '--show error: type should be const string';
-SELECT JSONExtractKeysAndValues([], JSONLength('^?V{LSwp')); -- { serverError 44 }
-WITH '{"i": 1, "f": 1.2}' AS json SELECT JSONExtract(json, 'i', JSONType(json, 'i')); -- { serverError 44 }
+SELECT JSONExtractKeysAndValues([], JSONLength('^?V{LSwp')); -- { serverError ILLEGAL_COLUMN }
+WITH '{"i": 1, "f": 1.2}' AS json SELECT JSONExtract(json, 'i', JSONType(json, 'i')); -- { serverError ILLEGAL_COLUMN }
 
 SELECT '--show error: index type should be integer';
-SELECT JSONExtract('[]', JSONExtract('0', 'UInt256'), 'UInt256'); -- { serverError 43 }
+SELECT JSONExtract('[]', JSONExtract('0', 'UInt256'), 'UInt256'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT '--show error: key of map type should be String';
+SELECT JSONExtract('{"a": [100.0, 200], "b": [-100, 200.0, 300]}', 'Map(Int64, Array(Float64))'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility_long.python b/tests/queries/0_stateless/00921_datetime64_compatibility_long.python
index 2706c0f5b12..3db80aef845 100644
--- a/tests/queries/0_stateless/00921_datetime64_compatibility_long.python
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.python
@@ -83,7 +83,7 @@ CAST(N as DateTime64(9, 'Europe/Minsk'))
 # CAST(N as DateTime64(12, 'Asia/Istanbul'))
 # DateTime64(18) will always fail due to zero precision, but it is Ok to test here:
 # CAST(N as DateTime64(18, 'Asia/Istanbul'))
-formatDateTime(N, '%C %d %D %e %F %H %I %j %m %M %p %R %S %T %u %V %w %y %Y %%', 'Asia/Istanbul')
+formatDateTime(N, '%C %d %D %e %F %H %I %j %m %i %p %R %S %T %u %V %w %y %Y %%', 'Asia/Istanbul')
 """.splitlines()
 
 # Expanded later to cartesian product of all arguments, using format string.
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference b/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
index 8a168ed0e9e..2f56230db37 100644
--- a/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
@@ -49,7 +49,7 @@ Code: 43
 "UInt8",11
 ------------------------------------------
 SELECT toUnixTimestamp(N)
-Code: 44
+"UInt32",1568592000
 "UInt32",1568650811
 "UInt32",1568650811
 ------------------------------------------
@@ -135,13 +135,13 @@ Code: 43
 ------------------------------------------
 SELECT date_trunc(\'year\', N, \'Asia/Istanbul\')
 Code: 43
-"Date","2019-01-01"
-"Date","2019-01-01"
+"DateTime('Asia/Istanbul')","2019-01-01 00:00:00"
+"DateTime('Asia/Istanbul')","2019-01-01 00:00:00"
 ------------------------------------------
 SELECT date_trunc(\'month\', N, \'Asia/Istanbul\')
 Code: 43
-"Date","2019-09-01"
-"Date","2019-09-01"
+"DateTime('Asia/Istanbul')","2019-09-01 00:00:00"
+"DateTime('Asia/Istanbul')","2019-09-01 00:00:00"
 ------------------------------------------
 SELECT date_trunc(\'day\', N, \'Asia/Istanbul\')
 "DateTime('Asia/Istanbul')","2019-09-16 00:00:00"
@@ -353,7 +353,7 @@ SELECT CAST(N as DateTime64(9, \'Europe/Minsk\'))
 "DateTime64(9, 'Europe/Minsk')","2019-09-16 19:20:11.000000000"
 "DateTime64(9, 'Europe/Minsk')","2019-09-16 19:20:11.234000000"
 ------------------------------------------
-SELECT formatDateTime(N, \'%C %d %D %e %F %H %I %j %m %M %p %R %S %T %u %V %w %y %Y %%\', \'Asia/Istanbul\')
+SELECT formatDateTime(N, \'%C %d %D %e %F %H %I %j %m %i %p %R %S %T %u %V %w %y %Y %%\', \'Asia/Istanbul\')
 "String","20 16 09/16/19 16 2019-09-16 00 12 259 09 00 AM 00:00 00 00:00:00 1 38 1 19 2019 %"
 "String","20 16 09/16/19 16 2019-09-16 19 07 259 09 20 PM 19:20 11 19:20:11 1 38 1 19 2019 %"
 "String","20 16 09/16/19 16 2019-09-16 19 07 259 09 20 PM 19:20 11 19:20:11 1 38 1 19 2019 %"
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
index e812a6cae5c..3512a0fb8db 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel, no-random-merge-tree-settings
+-- Tags: no-random-merge-tree-settings
 
 ----- Group of very similar simple tests ------
 select '----HORIZONTAL MERGE TESTS----';
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
index 636cd6589ce..2a7b6934e9a 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel, no-random-merge-tree-settings
+-- Tags: no-random-merge-tree-settings
 
 SET send_logs_level = 'fatal';
 SELECT '----00489----';
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
index a5170aa8058..20b2e3dba6d 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel, no-random-merge-tree-settings
+-- Tags: no-random-merge-tree-settings
 
 ----- Group of very similar simple tests ------
 DROP TABLE IF EXISTS zero_rows_per_granule;
diff --git a/tests/queries/0_stateless/00933_alter_ttl.sql b/tests/queries/0_stateless/00933_alter_ttl.sql
index 934d33660de..b0e697d024b 100644
--- a/tests/queries/0_stateless/00933_alter_ttl.sql
+++ b/tests/queries/0_stateless/00933_alter_ttl.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 set send_logs_level = 'fatal';
 
 drop table if exists ttl;
diff --git a/tests/queries/0_stateless/00933_reserved_word.sql b/tests/queries/0_stateless/00933_reserved_word.sql
index 3a26bc6ac98..447a618bfc9 100644
--- a/tests/queries/0_stateless/00933_reserved_word.sql
+++ b/tests/queries/0_stateless/00933_reserved_word.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 DROP TABLE IF EXISTS reserved_word_table;
 CREATE TABLE reserved_word_table (`index` UInt8) ENGINE = MergeTree ORDER BY `index`;
 
diff --git a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
index f1839bae259..e142c6c79fe 100644
--- a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
+++ b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
@@ -1 +1,3 @@
+99999
+99999
 0	0	13
diff --git a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
index 390d6a70ef1..7bf4a88e972 100755
--- a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
+++ b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
@@ -13,15 +13,24 @@ $CLICKHOUSE_CLIENT --query="CREATE TABLE small_table (a UInt64 default 0, n UInt
 $CLICKHOUSE_CLIENT --query="INSERT INTO small_table (n) SELECT * from system.numbers limit 100000;"
 $CLICKHOUSE_CLIENT --query="OPTIMIZE TABLE small_table FINAL;"
 
-cached_query="SELECT count() FROM small_table where n > 0;"
+cached_query="SELECT count() FROM small_table WHERE n > 0;"
 
-$CLICKHOUSE_CLIENT --use_uncompressed_cache=1 --query="$cached_query" &> /dev/null
-
-$CLICKHOUSE_CLIENT --use_uncompressed_cache=1 --allow_prefetched_read_pool_for_remote_filesystem=0 --allow_prefetched_read_pool_for_local_filesystem=0 --query_id="test-query-uncompressed-cache" --query="$cached_query" &> /dev/null
+$CLICKHOUSE_CLIENT --log_queries 1 --use_uncompressed_cache 1 --query="$cached_query"
+$CLICKHOUSE_CLIENT --log_queries 1 --use_uncompressed_cache 1 --allow_prefetched_read_pool_for_remote_filesystem 0 --allow_prefetched_read_pool_for_local_filesystem 0 --query_id="test-query-uncompressed-cache" --query="$cached_query"
 
 $CLICKHOUSE_CLIENT --query="SYSTEM FLUSH LOGS"
 
-
-$CLICKHOUSE_CLIENT --query="SELECT ProfileEvents['Seek'], ProfileEvents['ReadCompressedBytes'], ProfileEvents['UncompressedCacheHits'] AS hit FROM system.query_log WHERE (query_id = 'test-query-uncompressed-cache') and current_database = currentDatabase() AND (type = 2) AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1"
+$CLICKHOUSE_CLIENT --query="
+    SELECT
+        ProfileEvents['Seek'],
+        ProfileEvents['ReadCompressedBytes'],
+        ProfileEvents['UncompressedCacheHits'] AS hit
+    FROM system.query_log
+    WHERE query_id = 'test-query-uncompressed-cache'
+        AND current_database = currentDatabase()
+        AND type = 2
+        AND event_date >= yesterday()
+    ORDER BY event_time DESC
+    LIMIT 1"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS small_table"
diff --git a/tests/queries/0_stateless/00933_ttl_with_default.sql b/tests/queries/0_stateless/00933_ttl_with_default.sql
index 5504e33235c..e6c0a6e700c 100644
--- a/tests/queries/0_stateless/00933_ttl_with_default.sql
+++ b/tests/queries/0_stateless/00933_ttl_with_default.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 drop table if exists ttl_00933_2;
 
 create table ttl_00933_2 (d DateTime, a Int default 111 ttl d + interval 1 DAY) engine = MergeTree order by tuple() partition by toDayOfMonth(d);
diff --git a/tests/queries/0_stateless/00936_function_result_with_operator_in.sql b/tests/queries/0_stateless/00936_function_result_with_operator_in.sql
index dfb19c1f3ec..0b253021f39 100644
--- a/tests/queries/0_stateless/00936_function_result_with_operator_in.sql
+++ b/tests/queries/0_stateless/00936_function_result_with_operator_in.sql
@@ -22,8 +22,8 @@ SELECT 'a' IN splitByChar('c', 'abcdef');
 
 SELECT 'errors:';
 -- non-constant expressions in the right side of IN
-SELECT count() FROM samples WHERE 1 IN range(samples.value); -- { serverError 47 }
-SELECT count() FROM samples WHERE 1 IN range(rand() % 1000); -- { serverError 36 }
+SELECT count() FROM samples WHERE 1 IN range(samples.value); -- { serverError 1, 47 }
+SELECT count() FROM samples WHERE 1 IN range(rand() % 1000); -- { serverError 1, 36 }
 
 -- index is not used
 SELECT count() FROM samples WHERE value IN range(3); -- { serverError 277 }
@@ -31,4 +31,4 @@ SELECT count() FROM samples WHERE value IN range(3); -- { serverError 277 }
 -- wrong type
 SELECT 123 IN splitByChar('c', 'abcdef'); -- { serverError 53 }
 
-DROP TABLE samples;
\ No newline at end of file
+DROP TABLE samples;
diff --git a/tests/queries/0_stateless/00955_test_final_mark.sql b/tests/queries/0_stateless/00955_test_final_mark.sql
index 44eb4a69c2d..f29c61eef4c 100644
--- a/tests/queries/0_stateless/00955_test_final_mark.sql
+++ b/tests/queries/0_stateless/00955_test_final_mark.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel, no-random-merge-tree-settings
+-- Tags: no-random-merge-tree-settings
 
 SET send_logs_level = 'fatal';
 
diff --git a/tests/queries/0_stateless/00955_test_final_mark_use.sh b/tests/queries/0_stateless/00955_test_final_mark_use.sh
index b1bccd2d6e6..2c2589c83bd 100755
--- a/tests/queries/0_stateless/00955_test_final_mark_use.sh
+++ b/tests/queries/0_stateless/00955_test_final_mark_use.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-parallel, no-random-merge-tree-settings
+# Tags: no-random-merge-tree-settings
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00960_live_view_watch_events_live.py b/tests/queries/0_stateless/00960_live_view_watch_events_live.py
deleted file mode 100755
index 46c561516ba..00000000000
--- a/tests/queries/0_stateless/00960_live_view_watch_events_live.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1, client(
-    name="client2>", log=log
-) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-    client2.send("SET allow_experimental_live_view = 1")
-    client2.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send(" DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()")
-    client1.expect(prompt)
-    client1.send("CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt")
-    client1.expect(prompt)
-    client1.send("WATCH test.lv EVENTS")
-    client1.expect("version")
-    client1.expect("1.*" + end_of_block)
-    client2.send("INSERT INTO test.mt VALUES (1),(2),(3)")
-    client1.expect("2.*" + end_of_block)
-    client2.send("INSERT INTO test.mt VALUES (4),(5),(6)")
-    client1.expect("3.*" + end_of_block)
-    # send Ctrl-C
-    client1.send("\x03", eol="")
-    match = client1.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
-    client1.send("DROP TABLE test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE test.mt")
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
deleted file mode 100755
index ac399d3c4c8..00000000000
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1, client(
-    name="client2>", log=log
-) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-    client2.send("SET allow_experimental_live_view = 1")
-    client2.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send(
-        "CREATE LIVE VIEW test.lv WITH REFRESH 1"
-        " AS SELECT value FROM system.events WHERE event = 'OSCPUVirtualTimeMicroseconds'"
-    )
-    client1.expect(prompt)
-    client1.send("WATCH test.lv FORMAT JSONEachRow")
-    client1.expect(r'"_version":' + end_of_block)
-    client1.expect(r'"_version":' + end_of_block)
-    client1.expect(r'"_version":' + end_of_block)
-    # send Ctrl-C
-    client1.send("\x03", eol="")
-    match = client1.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
-    client1.send("DROP TABLE test.lv")
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
deleted file mode 100755
index 983b330e24a..00000000000
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import time
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1, client(
-    name="client2>", log=log
-) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-    client2.send("SET allow_experimental_live_view = 1")
-    client2.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send(
-        "CREATE LIVE VIEW test.lv WITH REFRESH 1"
-        " AS SELECT value FROM system.events WHERE event = 'OSCPUVirtualTimeMicroseconds'"
-    )
-    client1.expect(prompt)
-    client1.send("WATCH test.lv FORMAT JSONEachRow")
-    client1.expect(r'"_version":' + end_of_block)
-    client1.expect(r'"_version":' + end_of_block)
-    client1.expect(r'"_version":' + end_of_block)
-    # send Ctrl-C
-    client1.send("\x03", eol="")
-    match = client1.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
deleted file mode 100755
index 9d2a26c83c0..00000000000
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1, client(
-    name="client2>", log=log
-) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-    client2.send("SET allow_experimental_live_view = 1")
-    client2.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("DROP DICTIONARY IF EXITS test.dict")
-    client1.expect(prompt)
-
-    client1.send(
-        "CREATE TABLE test.mt (a Int32, b Int32) Engine=MergeTree order by tuple()"
-    )
-    client1.expect(prompt)
-    client1.send(
-        "CREATE DICTIONARY test.dict(a Int32, b Int32) PRIMARY KEY a LAYOUT(FLAT()) "
-        + "SOURCE(CLICKHOUSE(db 'test' table 'mt')) LIFETIME(1)"
-    )
-    client1.expect(prompt)
-    client1.send("CREATE LIVE VIEW test.lv WITH REFRESH 1 AS SELECT * FROM test.dict")
-    client1.expect(prompt)
-
-    client2.send("INSERT INTO test.mt VALUES (1,2)")
-    client2.expect(prompt)
-
-    client1.send("WATCH test.lv FORMAT JSONEachRow")
-    client1.expect(r'"_version":"1"')
-
-    client2.send("INSERT INTO test.mt VALUES (2,2)")
-    client2.expect(prompt)
-    client1.expect(r'"_version":"2"')
-
-    client2.send("INSERT INTO test.mt VALUES (3,2)")
-    client2.expect(prompt)
-    client1.expect(r'"_version":"3"')
-
-    # send Ctrl-C
-    client1.send("\x03", eol="")
-    match = client1.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send("DROP DICTIONARY IF EXISTS test.dict")
-    client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py b/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
deleted file mode 100755
index c8902203a3d..00000000000
--- a/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1, client(
-    name="client2>", log=log
-) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-    client2.send("SET allow_experimental_live_view = 1")
-    client2.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("SET live_view_heartbeat_interval=1")
-    client1.expect(prompt)
-    client1.send("CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()")
-    client1.expect(prompt)
-    client1.send("CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt")
-    client1.expect(prompt)
-    client1.send("WATCH test.lv EVENTS FORMAT CSV")
-    client1.expect("Progress: 1.00 rows.*\)")
-    client2.send("INSERT INTO test.mt VALUES (1)")
-    client2.expect(prompt)
-    client1.expect("Progress: 2.00 rows.*\)")
-    client2.send("INSERT INTO test.mt VALUES (2),(3)")
-    client2.expect(prompt)
-    # wait for heartbeat
-    client1.expect("Progress: 3.00 rows.*\)")
-    # send Ctrl-C
-    client1.send("\x03", eol="")
-    match = client1.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
-    client1.send("DROP TABLE test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE test.mt")
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py b/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
deleted file mode 100755
index b499f673cc0..00000000000
--- a/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1, client(
-    name="client2>", log=log
-) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-    client2.send("SET allow_experimental_live_view = 1")
-    client2.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send(" DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("SET live_view_heartbeat_interval=1")
-    client1.expect(prompt)
-    client1.send("CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()")
-    client1.expect(prompt)
-    client1.send("CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt")
-    client1.expect(prompt)
-    client1.send("WATCH test.lv")
-    client1.expect("_version")
-    client1.expect(r"0.*1" + end_of_block)
-    client2.send("INSERT INTO test.mt VALUES (1),(2),(3)")
-    client1.expect(r"6.*2" + end_of_block)
-    # wait for heartbeat
-    client1.expect("Progress: 2.00 rows.*\)")
-    # send Ctrl-C
-    client1.send("\x03", eol="")
-    match = client1.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
-    client1.send("DROP TABLE test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE test.mt")
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00965_logs_level_bugfix.reference b/tests/queries/0_stateless/00965_logs_level_bugfix.reference
index 52396b3fe79..affd41b780b 100644
--- a/tests/queries/0_stateless/00965_logs_level_bugfix.reference
+++ b/tests/queries/0_stateless/00965_logs_level_bugfix.reference
@@ -2,7 +2,6 @@
 .
 <Debug>
 .
-<Information>
 .
 <Error>
 -
diff --git a/tests/queries/0_stateless/00966_live_view_watch_events_http.py b/tests/queries/0_stateless/00966_live_view_watch_events_http.py
deleted file mode 100755
index 1f2ddae23d6..00000000000
--- a/tests/queries/0_stateless/00966_live_view_watch_events_http.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-from httpclient import client as http_client
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1:
-    client1.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send(" DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()")
-    client1.expect(prompt)
-    client1.send("CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt")
-    client1.expect(prompt)
-
-    try:
-        with http_client(
-            {
-                "method": "GET",
-                "url": "/?allow_experimental_live_view=1&query=WATCH%20test.lv%20EVENTS",
-            },
-            name="client2>",
-            log=log,
-        ) as client2:
-            client2.expect(".*1\n")
-            client1.send("INSERT INTO test.mt VALUES (1),(2),(3)")
-            client1.expect(prompt)
-            client2.expect(".*2\n")
-    finally:
-        client1.send("DROP TABLE test.lv")
-        client1.expect(prompt)
-        client1.send("DROP TABLE test.mt")
-        client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00967_live_view_watch_http.py b/tests/queries/0_stateless/00967_live_view_watch_http.py
deleted file mode 100755
index 92e192cc7f2..00000000000
--- a/tests/queries/0_stateless/00967_live_view_watch_http.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-from httpclient import client as http_client
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1:
-    client1.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send(" DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()")
-    client1.expect(prompt)
-    client1.send("CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt")
-    client1.expect(prompt)
-
-    try:
-        with http_client(
-            {
-                "method": "GET",
-                "url": "/?allow_experimental_live_view=1&query=WATCH%20test.lv",
-            },
-            name="client2>",
-            log=log,
-        ) as client2:
-            client2.expect(".*0\t1\n")
-            client1.send("INSERT INTO test.mt VALUES (1),(2),(3)")
-            client1.expect(prompt)
-            client2.expect(".*6\t2\n")
-    finally:
-        client1.send("DROP TABLE test.lv")
-        client1.expect(prompt)
-        client1.send("DROP TABLE test.mt")
-        client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.reference b/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.reference
deleted file mode 100644
index 5f48ead3147..00000000000
--- a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-{"row":{"a":1}}
-{"row":{"a":2}}
-{"row":{"a":3}}
-{"progress":{"read_rows":"3","read_bytes":"36","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}
diff --git a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql b/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
deleted file mode 100644
index 77b0f37e10f..00000000000
--- a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
+++ /dev/null
@@ -1,16 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT * FROM mt;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT * FROM lv FORMAT JSONEachRowWithProgress;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.reference b/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.reference
deleted file mode 100644
index 80ec35990d6..00000000000
--- a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.reference
+++ /dev/null
@@ -1,6 +0,0 @@
-{"row":{"sum(a)":"0","_version":"1"}}
-{"progress":{"read_rows":"1","read_bytes":"16","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}
-{"row":{"sum(a)":"6","_version":"2"}}
-{"progress":{"read_rows":"1","read_bytes":"16","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}
-{"row":{"sum(a)":"21","_version":"3"}}
-{"progress":{"read_rows":"1","read_bytes":"16","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}
diff --git a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql b/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
deleted file mode 100644
index 2d5d5f48b34..00000000000
--- a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT sum(a) FROM mt;
-
-WATCH lv LIMIT 0 FORMAT JSONEachRowWithProgress;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-WATCH lv LIMIT 0 FORMAT JSONEachRowWithProgress;
-
-INSERT INTO mt VALUES (4),(5),(6);
-
-WATCH lv LIMIT 0 FORMAT JSONEachRowWithProgress;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py b/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
deleted file mode 100755
index febe439e63b..00000000000
--- a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-from httpclient import client as http_client
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1:
-    client1.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send(" DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()")
-    client1.expect(prompt)
-    client1.send("CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt")
-    client1.expect(prompt)
-
-    with http_client(
-        {
-            "method": "GET",
-            "url": "/?allow_experimental_live_view=1&live_view_heartbeat_interval=1&query=WATCH%20test.lv%20EVENTS%20FORMAT%20JSONEachRowWithProgress",
-        },
-        name="client2>",
-        log=log,
-    ) as client2:
-        client2.expect(
-            '{"progress":{"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}\n',
-            escape=True,
-        )
-        client2.expect('{"row":{"version":"1"}', escape=True)
-        client2.expect(
-            '{"progress":{"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}',
-            escape=True,
-        )
-        # heartbeat is provided by progress message
-        client2.expect(
-            '{"progress":{"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}',
-            escape=True,
-        )
-
-        client1.send("INSERT INTO test.mt VALUES (1),(2),(3)")
-        client1.expect(prompt)
-
-        client2.expect('{"row":{"version":"2"}}\n', escape=True)
-
-    client1.send("DROP TABLE test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE test.mt")
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py b/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
deleted file mode 100755
index 117f7b7c786..00000000000
--- a/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-from httpclient import client as http_client
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1:
-    client1.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send(" DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()")
-    client1.expect(prompt)
-    client1.send("CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt")
-    client1.expect(prompt)
-
-    with http_client(
-        {
-            "method": "GET",
-            "url": "/?allow_experimental_live_view=1&live_view_heartbeat_interval=1&query=WATCH%20test.lv%20FORMAT%20JSONEachRowWithProgress",
-        },
-        name="client2>",
-        log=log,
-    ) as client2:
-        client2.expect(
-            '"progress".*',
-        )
-        client2.expect('{"row":{"sum(a)":"0","_version":"1"}}\n', escape=True)
-        client2.expect('"progress".*\n')
-        # heartbeat is provided by progress message
-        client2.expect('"progress".*\n')
-
-        client1.send("INSERT INTO test.mt VALUES (1),(2),(3)")
-        client1.expect(prompt)
-
-        client2.expect('"progress".*"read_rows":"2".*\n')
-        client2.expect('{"row":{"sum(a)":"6","_version":"2"}}\n', escape=True)
-
-    client1.send("DROP TABLE test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE test.mt")
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00972_live_view_select_1.sql b/tests/queries/0_stateless/00972_live_view_select_1.sql
deleted file mode 100644
index 20344466856..00000000000
--- a/tests/queries/0_stateless/00972_live_view_select_1.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-
-CREATE LIVE VIEW lv AS SELECT 1;
-
-SELECT * FROM lv;
-
-DROP TABLE lv;
diff --git a/tests/queries/0_stateless/00973_live_view_select.reference b/tests/queries/0_stateless/00973_live_view_select.reference
deleted file mode 100644
index 75236c0daf7..00000000000
--- a/tests/queries/0_stateless/00973_live_view_select.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-6	1
-6	1
-12	2
-12	2
diff --git a/tests/queries/0_stateless/00973_live_view_select.sql b/tests/queries/0_stateless/00973_live_view_select.sql
deleted file mode 100644
index 0844c730b26..00000000000
--- a/tests/queries/0_stateless/00973_live_view_select.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT sum(a) FROM mt;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00973_live_view_select_prewhere.reference b/tests/queries/0_stateless/00973_live_view_select_prewhere.reference
deleted file mode 100644
index 3a6fe59ae6d..00000000000
--- a/tests/queries/0_stateless/00973_live_view_select_prewhere.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-5	1
-10	2
diff --git a/tests/queries/0_stateless/00973_live_view_select_prewhere.sql b/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
deleted file mode 100644
index d0d27464618..00000000000
--- a/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
+++ /dev/null
@@ -1,28 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS lv2;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT sum(a) AS sum_a FROM mt PREWHERE a > 1;
-CREATE LIVE VIEW lv2 AS SELECT sum(number) AS sum_number FROM system.numbers PREWHERE number > 1;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv PREWHERE sum_a > 5; -- { serverError 182 }
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv PREWHERE sum_a > 10; -- { serverError 182 }
-
-SELECT *,_version FROM lv2; -- { serverError 182 }
-SELECT *,_version FROM lv2 PREWHERE sum_number > 10; -- { serverError 182 }
-
-DROP TABLE lv;
-DROP TABLE lv2;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select.reference b/tests/queries/0_stateless/00973_live_view_with_subquery_select.reference
deleted file mode 100644
index ebf18a51290..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select.reference
+++ /dev/null
@@ -1,18 +0,0 @@
-1	1
-2	1
-3	1
-1	1
-2	1
-3	1
-1	2
-2	2
-3	2
-1	2
-2	2
-3	2
-1	2
-2	2
-3	2
-1	2
-2	2
-3	2
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
deleted file mode 100644
index 9d644f245f6..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT a FROM (SELECT a FROM mt);
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.reference b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.reference
deleted file mode 100644
index 7a596e87ed6..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.reference
+++ /dev/null
@@ -1,6 +0,0 @@
-1	hello	2
-1	hello	2
-1	hello	3
-2	hello	3
-1	hello	3
-2	hello	3
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
deleted file mode 100644
index 562e6df1bfd..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS A;
-DROP TABLE IF EXISTS B;
-
-CREATE TABLE A (id Int32) Engine=Memory;
-CREATE TABLE B (id Int32, name String) Engine=Memory;
-
-CREATE LIVE VIEW lv AS SELECT id, name FROM ( SELECT A.id, B.name FROM A as A, B as B WHERE A.id = B.id );
-
-SELECT * FROM lv;
-
-INSERT INTO A VALUES (1);
-INSERT INTO B VALUES (1, 'hello');
-
-SELECT *,_version FROM lv ORDER BY id;
-SELECT *,_version FROM lv ORDER BY id;
-
-INSERT INTO A VALUES (2)
-INSERT INTO B VALUES (2, 'hello')
-
-SELECT *,_version FROM lv ORDER BY id;
-SELECT *,_version FROM lv ORDER BY id;
-
-DROP TABLE lv;
-DROP TABLE A;
-DROP TABLE B;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.reference b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.reference
deleted file mode 100644
index 7a596e87ed6..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.reference
+++ /dev/null
@@ -1,6 +0,0 @@
-1	hello	2
-1	hello	2
-1	hello	3
-2	hello	3
-1	hello	3
-2	hello	3
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
deleted file mode 100644
index 60078ccff30..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS A;
-DROP TABLE IF EXISTS B;
-
-CREATE TABLE A (id Int32) Engine=Memory;
-CREATE TABLE B (id Int32, name String) Engine=Memory;
-
-CREATE LIVE VIEW lv AS SELECT id, name FROM ( SELECT A.id, B.name FROM A, B WHERE A.id = B.id);
-
-SELECT * FROM lv;
-
-INSERT INTO A VALUES (1);
-INSERT INTO B VALUES (1, 'hello');
-
-SELECT *,_version FROM lv ORDER BY id;
-SELECT *,_version FROM lv ORDER BY id;
-
-INSERT INTO A VALUES (2)
-INSERT INTO B VALUES (2, 'hello')
-
-SELECT *,_version FROM lv ORDER BY id;
-SELECT *,_version FROM lv ORDER BY id;
-
-DROP TABLE lv;
-DROP TABLE A;
-DROP TABLE B;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.reference b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.reference
deleted file mode 100644
index ebf18a51290..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.reference
+++ /dev/null
@@ -1,18 +0,0 @@
-1	1
-2	1
-3	1
-1	1
-2	1
-3	1
-1	2
-2	2
-3	2
-1	2
-2	2
-3	2
-1	2
-2	2
-3	2
-1	2
-2	2
-3	2
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
deleted file mode 100644
index 700de5955f9..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT a FROM ( SELECT * FROM ( SELECT a FROM (SELECT a FROM mt) ) );
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.reference b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.reference
deleted file mode 100644
index 75236c0daf7..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-6	1
-6	1
-12	2
-12	2
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
deleted file mode 100644
index 3a9408a62fa..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT * FROM ( SELECT sum(a) FROM ( SELECT a FROM (SELECT a FROM mt) ) );
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.reference b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.reference
deleted file mode 100644
index 75236c0daf7..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-6	1
-6	1
-12	2
-12	2
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
deleted file mode 100644
index c0f218edbd8..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT * FROM ( SELECT sum(boo.x) FROM ( SELECT foo.x FROM (SELECT a AS x FROM mt) AS foo) AS boo );
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.reference b/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.reference
deleted file mode 100644
index ebf18a51290..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.reference
+++ /dev/null
@@ -1,18 +0,0 @@
-1	1
-2	1
-3	1
-1	1
-2	1
-3	1
-1	2
-2	2
-3	2
-1	2
-2	2
-3	2
-1	2
-2	2
-3	2
-1	2
-2	2
-3	2
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
deleted file mode 100644
index 2d7da9d6df5..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT foo.x FROM (SELECT a AS x FROM mt) AS foo;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.reference b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.reference
deleted file mode 100644
index 75236c0daf7..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-6	1
-6	1
-12	2
-12	2
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
deleted file mode 100644
index bdf74949f57..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT sum(a) FROM (SELECT a FROM mt);
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.reference b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.reference
deleted file mode 100644
index 75236c0daf7..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-6	1
-6	1
-12	2
-12	2
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
deleted file mode 100644
index a80af3e3337..00000000000
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT * FROM (SELECT sum(a) FROM mt);
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-SELECT *,_version FROM lv;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00974_live_view_select_with_aggregation.reference b/tests/queries/0_stateless/00974_live_view_select_with_aggregation.reference
deleted file mode 100644
index 6d50f0e9c3a..00000000000
--- a/tests/queries/0_stateless/00974_live_view_select_with_aggregation.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-6
-21
diff --git a/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql b/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
deleted file mode 100644
index 09eea37de60..00000000000
--- a/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT * FROM mt;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT sum(a) FROM lv;
-
-INSERT INTO mt VALUES (4),(5),(6);
-
-SELECT sum(a) FROM lv;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00975_live_view_create.sql b/tests/queries/0_stateless/00975_live_view_create.sql
deleted file mode 100644
index 1e7eb674bcc..00000000000
--- a/tests/queries/0_stateless/00975_live_view_create.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT * FROM mt;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00975_values_list.sql b/tests/queries/0_stateless/00975_values_list.sql
index 40c86898966..35afc99e93e 100644
--- a/tests/queries/0_stateless/00975_values_list.sql
+++ b/tests/queries/0_stateless/00975_values_list.sql
@@ -12,8 +12,8 @@ SELECT * FROM VALUES('n UInt64, s String, ss String', (1 + 22, '23', toString(23
 
 SELECT * FROM VALUES('a Decimal(4, 4), b String, c String', (divide(toDecimal32(5, 3), 3), 'a', 'b'));
 
-SELECT * FROM VALUES('x Float64', toUInt64(-1)); -- { serverError 69; }
-SELECT * FROM VALUES('x Float64', NULL); -- { serverError 53; }
+SELECT * FROM VALUES('x Float64', toUInt64(-1)); -- { serverError 69 }
+SELECT * FROM VALUES('x Float64', NULL); -- { serverError 53 }
 SELECT * FROM VALUES('x Nullable(Float64)', NULL);
 
 DROP TABLE values_list;
diff --git a/tests/queries/0_stateless/00976_live_view_select_version.reference b/tests/queries/0_stateless/00976_live_view_select_version.reference
deleted file mode 100644
index 453bd800469..00000000000
--- a/tests/queries/0_stateless/00976_live_view_select_version.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-1	1
-2	1
-3	1
diff --git a/tests/queries/0_stateless/00976_live_view_select_version.sql b/tests/queries/0_stateless/00976_live_view_select_version.sql
deleted file mode 100644
index 39ca587a49f..00000000000
--- a/tests/queries/0_stateless/00976_live_view_select_version.sql
+++ /dev/null
@@ -1,16 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT * FROM mt;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-SELECT *,_version FROM lv;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00976_ttl_with_old_parts.sql b/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
index c224ca30a3c..084112681e2 100644
--- a/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
+++ b/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d) settings remove_empty_parts = 0;
diff --git a/tests/queries/0_stateless/00977_live_view_watch_events.sql b/tests/queries/0_stateless/00977_live_view_watch_events.sql
deleted file mode 100644
index 3fe395b45fa..00000000000
--- a/tests/queries/0_stateless/00977_live_view_watch_events.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT sum(a) FROM mt;
-
-WATCH lv EVENTS LIMIT 0;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-WATCH lv EVENTS LIMIT 0;
-
-INSERT INTO mt VALUES (4),(5),(6);
-
-WATCH lv EVENTS LIMIT 0;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00978_live_view_watch.reference b/tests/queries/0_stateless/00978_live_view_watch.reference
deleted file mode 100644
index 6fbbedf1b21..00000000000
--- a/tests/queries/0_stateless/00978_live_view_watch.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-0	1
-6	2
-21	3
diff --git a/tests/queries/0_stateless/00978_live_view_watch.sql b/tests/queries/0_stateless/00978_live_view_watch.sql
deleted file mode 100644
index a76b8aef0d0..00000000000
--- a/tests/queries/0_stateless/00978_live_view_watch.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS mt;
-
-CREATE TABLE mt (a Int32) Engine=MergeTree order by tuple();
-CREATE LIVE VIEW lv AS SELECT sum(a) FROM mt;
-
-WATCH lv LIMIT 0;
-
-INSERT INTO mt VALUES (1),(2),(3);
-
-WATCH lv LIMIT 0;
-
-INSERT INTO mt VALUES (4),(5),(6);
-
-WATCH lv LIMIT 0;
-
-DROP TABLE lv;
-DROP TABLE mt;
diff --git a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py b/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
deleted file mode 100755
index ef144d044c2..00000000000
--- a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1, client(
-    name="client2>", log=log
-) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-    client2.send("SET allow_experimental_live_view = 1")
-    client2.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send(
-        "CREATE TABLE test.mt (time DateTime, location String, temperature UInt32) Engine=MergeTree order by tuple()"
-    )
-    client1.expect(prompt)
-    client1.send(
-        "CREATE LIVE VIEW test.lv AS SELECT toStartOfDay(time) AS day, location, avg(temperature) FROM test.mt GROUP BY day, location ORDER BY day, location"
-    )
-    client1.expect(prompt)
-    client1.send("WATCH test.lv FORMAT CSVWithNames")
-    client2.send(
-        "INSERT INTO test.mt VALUES ('2019-01-01 00:00:00','New York',60),('2019-01-01 00:10:00','New York',70)"
-    )
-    client2.expect(prompt)
-    client1.expect(r'"2019-01-01 00:00:00","New York",65')
-    client2.send(
-        "INSERT INTO test.mt VALUES ('2019-01-01 00:00:00','Moscow',30),('2019-01-01 00:10:00', 'Moscow', 40)"
-    )
-    client2.expect(prompt)
-    client1.expect(r'"2019-01-01 00:00:00","Moscow",35')
-    client1.expect(r'"2019-01-01 00:00:00","New York",65')
-    client2.send(
-        "INSERT INTO test.mt VALUES ('2019-01-02 00:00:00','New York',50),('2019-01-02 00:10:00','New York',60)"
-    )
-    client2.expect(prompt)
-    client1.expect(r'"2019-01-01 00:00:00","Moscow",35')
-    client1.expect(r'"2019-01-01 00:00:00","New York",65')
-    client1.expect(r'"2019-01-02 00:00:00","New York",55')
-    client2.send(
-        "INSERT INTO test.mt VALUES ('2019-01-02 00:00:00','Moscow',20),('2019-01-02 00:10:00', 'Moscow', 30)"
-    )
-    client2.expect(prompt)
-    client1.expect(r'"2019-01-01 00:00:00","Moscow",35')
-    client1.expect(r'"2019-01-01 00:00:00","New York",65')
-    client1.expect(r'"2019-01-02 00:00:00","Moscow",25')
-    client1.expect(r'"2019-01-02 00:00:00","New York",55')
-    client2.send(
-        "INSERT INTO test.mt VALUES ('2019-01-02 00:03:00','New York',40),('2019-01-02 00:06:00','New York',30)"
-    )
-    client2.expect(prompt)
-    client1.expect(r'"2019-01-01 00:00:00","Moscow",35')
-    client1.expect(r'"2019-01-01 00:00:00","New York",65')
-    client1.expect(r'"2019-01-02 00:00:00","Moscow",25')
-    client1.expect(r'"2019-01-02 00:00:00","New York",45')
-    # send Ctrl-C
-    client1.send("\x03", eol="")
-    match = client1.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
-    client1.send("DROP TABLE test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE test.mt")
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live.py b/tests/queries/0_stateless/00979_live_view_watch_live.py
deleted file mode 100755
index b099b56ae48..00000000000
--- a/tests/queries/0_stateless/00979_live_view_watch_live.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1, client(
-    name="client2>", log=log
-) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-    client2.send("SET allow_experimental_live_view = 1")
-    client2.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()")
-    client1.expect(prompt)
-    client1.send("CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt")
-    client1.expect(prompt)
-    client1.send("WATCH test.lv")
-    client1.expect("_version")
-    client1.expect(r"0.*1" + end_of_block)
-    client2.send("INSERT INTO test.mt VALUES (1),(2),(3)")
-    client1.expect(r"6.*2" + end_of_block)
-    client2.expect(prompt)
-    client2.send("INSERT INTO test.mt VALUES (4),(5),(6)")
-    client1.expect(r"21.*3" + end_of_block)
-    client2.expect(prompt)
-    for i in range(1, 129):
-        client2.send("INSERT INTO test.mt VALUES (1)")
-        client1.expect(r"%d.*%d" % (21 + i, 3 + i) + end_of_block)
-        client2.expect(prompt)
-    # send Ctrl-C
-    client1.send("\x03", eol="")
-    match = client1.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
-    client1.send("DROP TABLE test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE test.mt")
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py b/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
deleted file mode 100755
index a7c1adac214..00000000000
--- a/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1, client(
-    name="client2>", log=log
-) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-    client2.send("SET allow_experimental_live_view = 1")
-    client2.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send(" DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()")
-    client1.expect(prompt)
-    client1.send(
-        "CREATE LIVE VIEW test.lv AS SELECT * FROM ( SELECT sum(A.a) FROM (SELECT * FROM test.mt) AS A )"
-    )
-    client1.expect(prompt)
-    client1.send("WATCH test.lv")
-    client1.expect("_version")
-    client1.expect(r"0.*1" + end_of_block)
-    client2.send("INSERT INTO test.mt VALUES (1),(2),(3)")
-    client1.expect(r"6.*2" + end_of_block)
-    client2.expect(prompt)
-    client2.send("INSERT INTO test.mt VALUES (4),(5),(6)")
-    client1.expect(r"21.*3" + end_of_block)
-    client2.expect(prompt)
-    for i in range(1, 129):
-        client2.send("INSERT INTO test.mt VALUES (1)")
-        client1.expect(r"%d.*%d" % (21 + i, 3 + i) + end_of_block)
-        client2.expect(prompt)
-    # send Ctrl-C
-    client1.send("\x03", eol="")
-    match = client1.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
-    client1.send("DROP TABLE test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE test.mt")
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00980_merge_alter_settings.sql b/tests/queries/0_stateless/00980_merge_alter_settings.sql
index 02728a6ba8b..174d1fcd508 100644
--- a/tests/queries/0_stateless/00980_merge_alter_settings.sql
+++ b/tests/queries/0_stateless/00980_merge_alter_settings.sql
@@ -1,4 +1,4 @@
--- Tags: no-replicated-database, no-parallel
+-- Tags: no-replicated-database
 -- Tag no-replicated-database: Unsupported type of ALTER query
 
 DROP TABLE IF EXISTS log_for_alter;
diff --git a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
index 1b291bf84d2..b049e20cb6d 100644
--- a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
+++ b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
@@ -1,4 +1,4 @@
--- Tags: zookeeper, no-replicated-database, no-parallel
+-- Tags: zookeeper, no-replicated-database
 -- Tag no-replicated-database: Unsupported type of ALTER query
 
 DROP TABLE IF EXISTS replicated_table_for_alter1;
diff --git a/tests/queries/0_stateless/00988_expansion_aliases_limit.sql b/tests/queries/0_stateless/00988_expansion_aliases_limit.sql
index 15c9f82da6f..3c2442b15b5 100644
--- a/tests/queries/0_stateless/00988_expansion_aliases_limit.sql
+++ b/tests/queries/0_stateless/00988_expansion_aliases_limit.sql
@@ -1 +1 @@
-SELECT 1 AS a, a + a AS b, b + b AS c, c + c AS d, d + d AS e, e + e AS f, f + f AS g, g + g AS h, h + h AS i, i + i AS j, j + j AS k, k + k AS l, l + l AS m, m + m AS n, n + n AS o, o + o AS p, p + p AS q, q + q AS r, r + r AS s, s + s AS t, t + t AS u, u + u AS v, v + v AS w, w + w AS x, x + x AS y, y + y AS z; -- { serverError 168 }
+SELECT 1 AS a, a + a AS b, b + b AS c, c + c AS d, d + d AS e, e + e AS f, f + f AS g, g + g AS h, h + h AS i, i + i AS j, j + j AS k, k + k AS l, l + l AS m, m + m AS n, n + n AS o, o + o AS p, p + p AS q, q + q AS r, r + r AS s, s + s AS t, t + t AS u, u + u AS v, v + v AS w, w + w AS x, x + x AS y, y + y AS z; -- { serverError 36, 168 }
diff --git a/tests/queries/0_stateless/00990_hasToken.python b/tests/queries/0_stateless/00990_hasToken.python
index 7d3775adc9d..e9bc514474a 100644
--- a/tests/queries/0_stateless/00990_hasToken.python
+++ b/tests/queries/0_stateless/00990_hasToken.python
@@ -12,35 +12,46 @@ HAYSTACKS = [
 
 NEEDLE = "needle"
 
-HAY_RE = re.compile(r'\bhay\b', re.IGNORECASE)
-NEEDLE_RE = re.compile(r'\bneedle\b', re.IGNORECASE)
+HAY_RE = re.compile(r"\bhay\b", re.IGNORECASE)
+NEEDLE_RE = re.compile(r"\bneedle\b", re.IGNORECASE)
+
 
 def replace_follow_case(replacement):
     def func(match):
         g = match.group()
-        if g.islower(): return replacement.lower()
-        if g.istitle(): return replacement.title()
-        if g.isupper(): return replacement.upper()
+        if g.islower():
+            return replacement.lower()
+        if g.istitle():
+            return replacement.title()
+        if g.isupper():
+            return replacement.upper()
         return replacement
+
     return func
 
+
 def replace_separators(query, new_sep):
-    SEP_RE = re.compile('\\s+')
+    SEP_RE = re.compile("\\s+")
     result = SEP_RE.sub(new_sep, query)
     return result
 
-def enlarge_haystack(query, times, separator=''):
-    return HAY_RE.sub(replace_follow_case(('hay' + separator) * times), query)
+
+def enlarge_haystack(query, times, separator=""):
+    return HAY_RE.sub(replace_follow_case(("hay" + separator) * times), query)
+
 
 def small_needle(query):
-    return NEEDLE_RE.sub(replace_follow_case('n'), query)
+    return NEEDLE_RE.sub(replace_follow_case("n"), query)
+
 
 def remove_needle(query):
-    return NEEDLE_RE.sub('', query)
+    return NEEDLE_RE.sub("", query)
+
 
 def replace_needle(query, new_needle):
     return NEEDLE_RE.sub(new_needle, query)
 
+
 # with str.lower, str.uppert, str.title and such
 def transform_needle(query, string_transformation_func):
     def replace_with_transformation(match):
@@ -49,19 +60,21 @@ def transform_needle(query, string_transformation_func):
 
     return NEEDLE_RE.sub(replace_with_transformation, query)
 
-def create_cases(case_sensitive_func, case_insensitive_func, table_row_template, table_query_template, const_query_template):
+
+def create_cases(
+    case_sensitive_func,
+    case_insensitive_func,
+    table_row_template,
+    table_query_template,
+    const_query_template,
+):
     const_queries = []
     table_rows = []
     table_queries = set()
 
     def add_case(func, haystack, needle, match):
         match = int(match)
-        args = dict(
-            func = func,
-            haystack = haystack,
-            needle = needle,
-            match = match
-        )
+        args = dict(func=func, haystack=haystack, needle=needle, match=match)
         const_queries.append(const_query_template.substitute(args))
         table_queries.add(table_query_template.substitute(args))
         table_rows.append(table_row_template.substitute(args))
@@ -69,14 +82,28 @@ def create_cases(case_sensitive_func, case_insensitive_func, table_row_template,
     def add_case_sensitive(haystack, needle, match):
         add_case(case_sensitive_func, haystack, needle, match)
         if match:
-            add_case(case_sensitive_func, transform_needle(haystack, str.swapcase), transform_needle(needle, str.swapcase), match)
+            add_case(
+                case_sensitive_func,
+                transform_needle(haystack, str.swapcase),
+                transform_needle(needle, str.swapcase),
+                match,
+            )
 
     def add_case_insensitive(haystack, needle, match):
         add_case(case_insensitive_func, haystack, needle, match)
         if match:
-            add_case(case_insensitive_func, transform_needle(haystack, str.swapcase), needle, match)
-            add_case(case_insensitive_func, haystack, transform_needle(needle, str.swapcase), match)
-
+            add_case(
+                case_insensitive_func,
+                transform_needle(haystack, str.swapcase),
+                needle,
+                match,
+            )
+            add_case(
+                case_insensitive_func,
+                haystack,
+                transform_needle(needle, str.swapcase),
+                match,
+            )
 
     # Negative cases
     add_case_sensitive(remove_needle(HAYSTACKS[0]), NEEDLE, False)
@@ -85,7 +112,7 @@ def create_cases(case_sensitive_func, case_insensitive_func, table_row_template,
     for haystack in HAYSTACKS:
         add_case_sensitive(transform_needle(haystack, str.swapcase), NEEDLE, False)
 
-        sep = ''
+        sep = ""
         h = replace_separators(haystack, sep)
 
         add_case_sensitive(h, NEEDLE, False)
@@ -102,8 +129,7 @@ def create_cases(case_sensitive_func, case_insensitive_func, table_row_template,
         add_case_sensitive(haystack, NEEDLE, True)
         add_case_insensitive(haystack, NEEDLE, True)
 
-
-        for sep in list(''' ,'''):
+        for sep in list(""" ,"""):
             h = replace_separators(haystack, sep)
             add_case_sensitive(h, NEEDLE, True)
             add_case_sensitive(small_needle(h), small_needle(NEEDLE), True)
@@ -114,32 +140,43 @@ def create_cases(case_sensitive_func, case_insensitive_func, table_row_template,
             add_case_insensitive(enlarge_haystack(h, 200, sep), NEEDLE, True)
 
             # case insesitivity works only on ASCII strings
-            add_case_sensitive(replace_needle(h, 'иголка'), replace_needle(NEEDLE, 'иголка'), True)
-            add_case_sensitive(replace_needle(h, '指针'), replace_needle(NEEDLE, '指针'), True)
+            add_case_sensitive(
+                replace_needle(h, "иголка"), replace_needle(NEEDLE, "иголка"), True
+            )
+            add_case_sensitive(
+                replace_needle(h, "指针"), replace_needle(NEEDLE, "指针"), True
+            )
 
-    for sep in list('''~!@$%^&*()-=+|]}[{";:/?.><\t''') + [r'\\\\']:
+    for sep in list("""~!@$%^&*()-=+|]}[{";:/?.><\t""") + [r"\\\\"]:
         h = replace_separators(HAYSTACKS[0], sep)
         add_case(case_sensitive_func, h, NEEDLE, True)
 
     return table_rows, table_queries, const_queries
 
-def main():
 
+def main():
     def query(x):
         print(x)
 
-    CONST_QUERY = Template("""SELECT ${func}('${haystack}', '${needle}'), ' expecting ', ${match};""")
-    TABLE_QUERY = Template("""WITH '${needle}' as n
+    CONST_QUERY = Template(
+        """SELECT ${func}('${haystack}', '${needle}'), ' expecting ', ${match};"""
+    )
+    TABLE_QUERY = Template(
+        """WITH '${needle}' as n
     SELECT haystack, needle, ${func}(haystack, n) as result
     FROM ht
-    WHERE func = '${func}' AND needle = n AND result != match;""")
+    WHERE func = '${func}' AND needle = n AND result != match;"""
+    )
     TABLE_ROW = Template("""('${haystack}', '${needle}', ${match}, '${func}')""")
 
-    rows, table_queries, const_queries = create_cases('hasToken', 'hasTokenCaseInsensitive', TABLE_ROW, TABLE_QUERY, CONST_QUERY)
+    rows, table_queries, const_queries = create_cases(
+        "hasToken", "hasTokenCaseInsensitive", TABLE_ROW, TABLE_QUERY, CONST_QUERY
+    )
     for q in const_queries:
         query(q)
 
-    query("""DROP TABLE IF EXISTS ht;
+    query(
+        """DROP TABLE IF EXISTS ht;
     CREATE TABLE IF NOT EXISTS
     ht
 (
@@ -150,11 +187,15 @@ def main():
 )
 ENGINE MergeTree()
 ORDER BY haystack;
-INSERT INTO ht VALUES {values};""".format(values=", ".join(rows)))
+INSERT INTO ht VALUES {values};""".format(
+            values=", ".join(rows)
+        )
+    )
     for q in sorted(table_queries):
         query(q)
 
     query("""DROP TABLE ht""")
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()
diff --git a/tests/queries/0_stateless/00990_hasToken_and_tokenbf.reference b/tests/queries/0_stateless/00990_hasToken_and_tokenbf.reference
index 4b3beccf5f1..c462030edbf 100644
--- a/tests/queries/0_stateless/00990_hasToken_and_tokenbf.reference
+++ b/tests/queries/0_stateless/00990_hasToken_and_tokenbf.reference
@@ -2,6 +2,12 @@
 0
 2007
 2007
+0
+2007
+2007
+2007
+2007
+2007
 2007
 0
 2007
diff --git a/tests/queries/0_stateless/00990_hasToken_and_tokenbf.sql b/tests/queries/0_stateless/00990_hasToken_and_tokenbf.sql
index 41676905771..8e88af40046 100644
--- a/tests/queries/0_stateless/00990_hasToken_and_tokenbf.sql
+++ b/tests/queries/0_stateless/00990_hasToken_and_tokenbf.sql
@@ -18,15 +18,35 @@ SELECT max(id) FROM bloom_filter WHERE hasTokenCaseInsensitive(s, 'abc,def,zzz')
 SELECT max(id) FROM bloom_filter WHERE hasTokenOrNull(s, 'abc,def,zzz');
 SELECT max(id) FROM bloom_filter WHERE hasTokenCaseInsensitiveOrNull(s, 'abc,def,zzz');
 
-select max(id) from bloom_filter where hasTokenCaseInsensitive(s, 'ABC');
-select max(id) from bloom_filter where hasTokenCaseInsensitive(s, 'zZz');
+-- as table "bloom_filter" but w/o index_granularity_bytes
+drop table if exists bloom_filter2;
+create table bloom_filter2
+(
+    id UInt64,
+    s String,
+    index tok_bf3 (s, lower(s)) type tokenbf_v1(512, 3, 0) GRANULARITY 1
+) engine = MergeTree() order by id settings index_granularity = 8;
+
+insert into bloom_filter2 select number, 'yyy,uuu' from numbers(1024);
+insert into bloom_filter2 select number+2000, 'ABC,def,zzz' from numbers(8);
+insert into bloom_filter2 select number+3000, 'yyy,uuu' from numbers(1024);
+insert into bloom_filter2 select number+3000, 'abcdefzzz' from numbers(1024);
 
 set max_rows_to_read = 16;
 
 SELECT max(id) FROM bloom_filter WHERE hasToken(s, 'abc');
+SELECT max(id) FROM bloom_filter WHERE hasTokenOrNull(s, 'abc');
 SELECT max(id) FROM bloom_filter WHERE hasToken(s, 'ABC');
+select max(id) from bloom_filter where hasTokenCaseInsensitive(s, 'ABC');
+select max(id) from bloom_filter where hasTokenCaseInsensitiveOrNull(s, 'ABC');
 SELECT max(id) FROM bloom_filter WHERE hasToken(s, 'def');
 SELECT max(id) FROM bloom_filter WHERE hasToken(s, 'zzz');
+select max(id) from bloom_filter where hasTokenCaseInsensitive(s, 'zZz');
+
+select max(id) from bloom_filter2 where hasToken(s, 'ABC');
+select max(id) from bloom_filter2 where hasToken(s, 'abc');
+select max(id) from bloom_filter2 where hasTokenCaseInsensitive(s, 'abc');
+select max(id) from bloom_filter2 where hasTokenCaseInsensitive(s, 'ABC');
 
 -- invert result
 -- this does not work as expected, reading more rows that it should
diff --git a/tests/queries/0_stateless/00991_live_view_watch_event_live.python b/tests/queries/0_stateless/00991_live_view_watch_event_live.python
deleted file mode 100644
index 901d388ec01..00000000000
--- a/tests/queries/0_stateless/00991_live_view_watch_event_live.python
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env python3
-
-import subprocess
-import threading
-import queue as queue
-import os
-import sys
-import signal
-
-
-CLICKHOUSE_CLIENT = os.environ.get('CLICKHOUSE_CLIENT')
-CLICKHOUSE_CURL = os.environ.get('CLICKHOUSE_CURL')
-CLICKHOUSE_URL = os.environ.get('CLICKHOUSE_URL')
-
-
-def send_query(query):
-    cmd = list(CLICKHOUSE_CLIENT.split())
-    cmd += ['--query', query]
-    # print(cmd)
-    return subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout
-
-
-def send_query_in_process_group(query):
-    cmd = list(CLICKHOUSE_CLIENT.split())
-    cmd += ['--query', query]
-    # print(cmd)
-    return subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, preexec_fn=os.setsid)
-
-
-def read_lines_and_push_to_queue(pipe, queue):
-    try:
-        for line in iter(pipe.readline, ''):
-            line = line.strip()
-            print(line)
-            sys.stdout.flush()
-            queue.put(line)
-    except KeyboardInterrupt:
-        pass
-
-    queue.put(None)
-
-
-def test():
-    send_query('DROP TABLE IF EXISTS test.lv').read()
-    send_query('DROP TABLE IF EXISTS test.mt').read()
-    send_query('CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()').read()
-    send_query('CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt').read()
-
-    q = queue.Queue()
-    p = send_query_in_process_group('WATCH test.lv')
-    thread = threading.Thread(target=read_lines_and_push_to_queue, args=(p.stdout, q))
-    thread.start()
-
-    line = q.get()
-    print(line)
-    assert (line == '0\t1')
-
-    send_query('INSERT INTO test.mt VALUES (1),(2),(3)').read()
-    line = q.get()
-    print(line)
-    assert (line == '6\t2')
-
-    send_query('INSERT INTO test.mt VALUES (4),(5),(6)').read()
-    line = q.get()
-    print(line)
-    assert (line == '21\t3')
-
-    # Send Ctrl+C to client.
-    os.killpg(os.getpgid(p.pid), signal.SIGINT)
-    # This insert shouldn't affect lv.
-    send_query('INSERT INTO test.mt VALUES (7),(8),(9)').read()
-    line = q.get()
-    print(line)
-    assert (line is None)
-
-    send_query('DROP TABLE if exists test.lv').read()
-    send_query('DROP TABLE if exists test.lv').read()
-
-    thread.join()
-
-test()
diff --git a/tests/queries/0_stateless/00991_live_view_watch_event_live.reference b/tests/queries/0_stateless/00991_live_view_watch_event_live.reference
deleted file mode 100644
index 1e94cdade41..00000000000
--- a/tests/queries/0_stateless/00991_live_view_watch_event_live.reference
+++ /dev/null
@@ -1,7 +0,0 @@
-0	1
-0	1
-6	2
-6	2
-21	3
-21	3
-None
diff --git a/tests/queries/0_stateless/00991_live_view_watch_http.python b/tests/queries/0_stateless/00991_live_view_watch_http.python
deleted file mode 100755
index d5a1e6e8ed9..00000000000
--- a/tests/queries/0_stateless/00991_live_view_watch_http.python
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python3
-
-import subprocess
-import threading
-import queue as queue
-import os
-import sys
-
-
-CLICKHOUSE_CLIENT = os.environ.get('CLICKHOUSE_CLIENT')
-CLICKHOUSE_CURL = os.environ.get('CLICKHOUSE_CURL')
-CLICKHOUSE_URL = os.environ.get('CLICKHOUSE_URL')
-
-
-def send_query(query):
-    cmd = list(CLICKHOUSE_CLIENT.split())
-    cmd += ['--query', query]
-    # print(cmd)
-    return subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout
-
-
-def send_http_query(query):
-    cmd =  list(CLICKHOUSE_CURL.split()) # list(['curl', '-sSN', '--max-time', '10'])
-    cmd += ['-sSN', CLICKHOUSE_URL, '-d', query]
-    return subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout
-
-
-def read_lines_and_push_to_queue(pipe, queue):
-    for line in iter(pipe.readline, ''):
-        line = line.strip()
-        print(line)
-        sys.stdout.flush()
-        queue.put(line)
-
-    queue.put(None)
-
-
-def test():
-    send_query('DROP TABLE IF EXISTS test.lv').read()
-    send_query('DROP TABLE IF EXISTS test.mt').read()
-    send_query('CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()').read()
-    send_query('CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt').read()
-
-    q = queue.Queue()
-    pipe = send_http_query('WATCH test.lv')
-    thread = threading.Thread(target=read_lines_and_push_to_queue, args=(pipe, q))
-    thread.start()
-
-    line = q.get()
-    print(line)
-    assert (line == '0\t1')
-
-    send_query('INSERT INTO test.mt VALUES (1),(2),(3)').read()
-    line = q.get()
-    print(line)
-    assert (line == '6\t2')
-
-    send_query('DROP TABLE if exists test.lv').read()
-    send_query('DROP TABLE if exists test.lv').read()
-
-    thread.join()
-
-test()
diff --git a/tests/queries/0_stateless/00991_live_view_watch_http.reference b/tests/queries/0_stateless/00991_live_view_watch_http.reference
deleted file mode 100644
index 489457d751b..00000000000
--- a/tests/queries/0_stateless/00991_live_view_watch_http.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-0	1
-0	1
-6	2
-6	2
diff --git a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
index 8dbd10fc27b..5b1c50262bf 100755
--- a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
+++ b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
@@ -13,8 +13,8 @@ $CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS alter_table0;
     DROP TABLE IF EXISTS alter_table1;
 
-    CREATE TABLE alter_table0 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0;
-    CREATE TABLE alter_table1 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r2') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0
+    CREATE TABLE alter_table0 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0, replicated_max_mutations_in_one_entry = $(($RANDOM / 50 + 100));
+    CREATE TABLE alter_table1 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r2') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0, replicated_max_mutations_in_one_entry = $(($RANDOM / 50 + 200));
 "
 
 function thread1()
diff --git a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
index f143c97bdf4..f4f38ad9c83 100755
--- a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: race, zookeeper, no-parallel, no-upgrade-check
+# Tags: race, zookeeper, no-parallel, no-upgrade-check, no-replicated-database
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -56,12 +56,13 @@ function thread6()
     while true; do
         REPLICA=$(($RANDOM % 10))
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS alter_table_$REPLICA;
-            CREATE TABLE alter_table_$REPLICA (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$REPLICA') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
+            CREATE TABLE alter_table_$REPLICA (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16))
+            ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$REPLICA') ORDER BY a PARTITION BY b % 10
+            SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0, replicated_max_mutations_in_one_entry = $(($RANDOM / 50));";
         sleep 0.$RANDOM;
     done
 }
 
-
 # https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
 export -f thread1;
 export -f thread2;
diff --git a/tests/queries/0_stateless/00995_order_by_with_fill.reference b/tests/queries/0_stateless/00995_order_by_with_fill.reference
index 0036aabda40..4863c83c544 100644
--- a/tests/queries/0_stateless/00995_order_by_with_fill.reference
+++ b/tests/queries/0_stateless/00995_order_by_with_fill.reference
@@ -1,4 +1,9 @@
-*** table without fill to compare ***
+--{ echoOn }
+DROP TABLE IF EXISTS fill;
+CREATE TABLE fill (date Date, val Int, str String) ENGINE = Memory;
+INSERT INTO fill VALUES (toDate('2019-05-24'), 13, 'sd0')(toDate('2019-05-10'), 16, 'vp7')(toDate('2019-05-25'), 17, '0ei')(toDate('2019-05-30'), 18, '3kd')(toDate('2019-05-15'), 27, 'enb')(toDate('2019-06-04'), 5, '6az')(toDate('2019-05-23'), 15, '01v')(toDate('2019-05-08'), 28, 'otf')(toDate('2019-05-19'), 20, 'yfh')(toDate('2019-05-07'), 26, '2ke')(toDate('2019-05-07'), 18, 'prh')(toDate('2019-05-09'), 25, '798')(toDate('2019-05-10'), 1, 'myj')(toDate('2019-05-11'), 18, '3s2')(toDate('2019-05-23'), 29, '72y');
+-- *** table without fill to compare ***
+SELECT * FROM fill ORDER BY date, val;
 2019-05-07	18	prh
 2019-05-07	26	2ke
 2019-05-08	28	otf
@@ -14,7 +19,9 @@
 2019-05-25	17	0ei
 2019-05-30	18	3kd
 2019-06-04	5	6az
-*** date WITH FILL, val ***
+-- Some useful cases
+
+SELECT * FROM fill ORDER BY date WITH FILL, val;
 2019-05-07	18	prh
 2019-05-07	26	2ke
 2019-05-08	28	otf
@@ -47,7 +54,7 @@
 2019-06-02	0	
 2019-06-03	0	
 2019-06-04	5	6az
-*** date WITH FILL FROM 2019-05-01 TO 2019-05-31, val WITH FILL ***
+SELECT * FROM fill ORDER BY date WITH FILL FROM toDate('2019-05-01') TO toDate('2019-05-31'), val WITH FILL;
 2019-05-01	0	
 2019-05-02	0	
 2019-05-03	0	
@@ -116,7 +123,7 @@
 2019-05-29	0	
 2019-05-30	18	3kd
 2019-06-04	5	6az
-*** date DESC WITH FILL, val WITH FILL FROM 1 TO 6 ***
+SELECT * FROM fill ORDER BY date DESC WITH FILL, val WITH FILL FROM 1 TO 6;
 2019-06-04	1	
 2019-06-04	2	
 2019-06-04	3	
@@ -275,7 +282,9 @@
 2019-05-07	5	
 2019-05-07	18	prh
 2019-05-07	26	2ke
-*** date DESC WITH FILL TO 2019-05-01 STEP -2, val DESC WITH FILL FROM 10 TO -5 STEP -3 ***
+-- Some weird cases
+
+SELECT * FROM fill ORDER BY date DESC WITH FILL TO toDate('2019-05-01') STEP -2, val DESC WITH FILL FROM 10 TO -5 STEP -3;
 2019-06-04	10	
 2019-06-04	7	
 2019-06-04	5	6az
@@ -376,7 +385,7 @@
 2019-05-03	4	
 2019-05-03	1	
 2019-05-03	-2	
-*** date WITH FILL TO 2019-06-23 STEP 3, val WITH FILL FROM -10 STEP 2
+SELECT * FROM fill ORDER BY date WITH FILL TO toDate('2019-06-23') STEP 3, val WITH FILL FROM -10 STEP 2;
 2019-05-07	-10	
 2019-05-07	-8	
 2019-05-07	-6	
@@ -463,14 +472,18 @@
 2019-06-15	-10	
 2019-06-18	-10	
 2019-06-21	-10	
-*** table without fill to compare ***
+DROP TABLE fill;
+CREATE TABLE fill (a UInt32, b Int32) ENGINE = Memory;
+INSERT INTO fill VALUES (1, -2), (1, 3), (3, 2), (5, -1), (6, 5), (8, 0);
+-- *** table without fill to compare ***
+SELECT * FROM fill ORDER BY a, b;
 1	-2
 1	3
 3	2
 5	-1
 6	5
 8	0
-*** a WITH FILL, b WITH fill ***
+SELECT * FROM fill ORDER BY a WITH FILL, b WITH fill;
 1	-2
 1	-1
 1	0
@@ -484,7 +497,7 @@
 6	5
 7	0
 8	0
-*** a WITH FILL, b WITH fill TO 6 STEP 2 ***
+SELECT * FROM fill ORDER BY a WITH FILL, b WITH fill TO 6 STEP 2;
 1	-2
 1	0
 1	2
@@ -503,3 +516,8 @@
 8	0
 8	2
 8	4
+SELECT * FROM fill ORDER BY a WITH FILL STEP -1; -- { serverError 475 }
+SELECT * FROM fill ORDER BY a WITH FILL FROM 10 TO 1; -- { serverError 475 }
+SELECT * FROM fill ORDER BY a DESC WITH FILL FROM 1 TO 10; -- { serverError 475 }
+SELECT * FROM fill ORDER BY a WITH FILL FROM -10 to 10; -- { serverError 475 }
+DROP TABLE fill;
diff --git a/tests/queries/0_stateless/00995_order_by_with_fill.sql b/tests/queries/0_stateless/00995_order_by_with_fill.sql
index 7f7f85bdb5b..fe7a6e5d4ce 100644
--- a/tests/queries/0_stateless/00995_order_by_with_fill.sql
+++ b/tests/queries/0_stateless/00995_order_by_with_fill.sql
@@ -1,40 +1,34 @@
+--{ echoOn }
 DROP TABLE IF EXISTS fill;
 CREATE TABLE fill (date Date, val Int, str String) ENGINE = Memory;
 INSERT INTO fill VALUES (toDate('2019-05-24'), 13, 'sd0')(toDate('2019-05-10'), 16, 'vp7')(toDate('2019-05-25'), 17, '0ei')(toDate('2019-05-30'), 18, '3kd')(toDate('2019-05-15'), 27, 'enb')(toDate('2019-06-04'), 5, '6az')(toDate('2019-05-23'), 15, '01v')(toDate('2019-05-08'), 28, 'otf')(toDate('2019-05-19'), 20, 'yfh')(toDate('2019-05-07'), 26, '2ke')(toDate('2019-05-07'), 18, 'prh')(toDate('2019-05-09'), 25, '798')(toDate('2019-05-10'), 1, 'myj')(toDate('2019-05-11'), 18, '3s2')(toDate('2019-05-23'), 29, '72y');
 
-SELECT '*** table without fill to compare ***';
+-- *** table without fill to compare ***
 SELECT * FROM fill ORDER BY date, val;
 
 -- Some useful cases
 
-SELECT '*** date WITH FILL, val ***';
 SELECT * FROM fill ORDER BY date WITH FILL, val;
 
-SELECT '*** date WITH FILL FROM 2019-05-01 TO 2019-05-31, val WITH FILL ***';
 SELECT * FROM fill ORDER BY date WITH FILL FROM toDate('2019-05-01') TO toDate('2019-05-31'), val WITH FILL;
 
-SELECT '*** date DESC WITH FILL, val WITH FILL FROM 1 TO 6 ***';
 SELECT * FROM fill ORDER BY date DESC WITH FILL, val WITH FILL FROM 1 TO 6;
 
 -- Some weird cases
 
-SELECT '*** date DESC WITH FILL TO 2019-05-01 STEP -2, val DESC WITH FILL FROM 10 TO -5 STEP -3 ***';
 SELECT * FROM fill ORDER BY date DESC WITH FILL TO toDate('2019-05-01') STEP -2, val DESC WITH FILL FROM 10 TO -5 STEP -3;
 
-SELECT '*** date WITH FILL TO 2019-06-23 STEP 3, val WITH FILL FROM -10 STEP 2';
 SELECT * FROM fill ORDER BY date WITH FILL TO toDate('2019-06-23') STEP 3, val WITH FILL FROM -10 STEP 2;
 
 DROP TABLE fill;
 CREATE TABLE fill (a UInt32, b Int32) ENGINE = Memory;
 INSERT INTO fill VALUES (1, -2), (1, 3), (3, 2), (5, -1), (6, 5), (8, 0);
 
-SELECT '*** table without fill to compare ***';
+-- *** table without fill to compare ***
 SELECT * FROM fill ORDER BY a, b;
 
-SELECT '*** a WITH FILL, b WITH fill ***';
 SELECT * FROM fill ORDER BY a WITH FILL, b WITH fill;
 
-SELECT '*** a WITH FILL, b WITH fill TO 6 STEP 2 ***';
 SELECT * FROM fill ORDER BY a WITH FILL, b WITH fill TO 6 STEP 2;
 
 SELECT * FROM fill ORDER BY a WITH FILL STEP -1; -- { serverError 475 }
diff --git a/tests/queries/0_stateless/01000_subquery_requires_alias.reference b/tests/queries/0_stateless/01000_subquery_requires_alias.reference
index 8018af28430..b6ceb2a2a72 100644
--- a/tests/queries/0_stateless/01000_subquery_requires_alias.reference
+++ b/tests/queries/0_stateless/01000_subquery_requires_alias.reference
@@ -1,2 +1,2 @@
-1	2	3
-1	2	3
+2	1	3
+2	1	3
diff --git a/tests/queries/0_stateless/01000_subquery_requires_alias.sql b/tests/queries/0_stateless/01000_subquery_requires_alias.sql
index d14d4637be8..27320fab933 100644
--- a/tests/queries/0_stateless/01000_subquery_requires_alias.sql
+++ b/tests/queries/0_stateless/01000_subquery_requires_alias.sql
@@ -1,3 +1,4 @@
+SET allow_experimental_analyzer = 1;
 SET joined_subquery_requires_alias = 1;
 
 SELECT * FROM (SELECT 1 as A, 2 as B) X
diff --git a/tests/queries/0_stateless/01009_insert_select_data_loss.sql b/tests/queries/0_stateless/01009_insert_select_data_loss.sql
index a153d7dbc30..cbf87c4d0f1 100644
--- a/tests/queries/0_stateless/01009_insert_select_data_loss.sql
+++ b/tests/queries/0_stateless/01009_insert_select_data_loss.sql
@@ -1,7 +1,7 @@
 drop table if exists tab;
 create table tab (x UInt64) engine = MergeTree order by tuple();
 
-insert into tab select number as n from numbers(20) nums
+insert into tab select n from (SELECT number AS n FROM numbers(20)) nums
 semi left join (select number * 10 as n from numbers(2)) js2 using(n)
 settings max_block_size = 5;
 select * from tab order by x;
diff --git a/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql b/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql
index 18a67f41194..278aa46a479 100644
--- a/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql
+++ b/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql
@@ -10,6 +10,6 @@ SELECT '-';
 SELECT * FROM ints l INNER JOIN ints r USING i64 ORDER BY l.i32, r.i32;
 
 SELECT '-';
-SELECT count() FROM ( SELECT [1], count(1) ) AS t1 ALL RIGHT JOIN ( SELECT number AS s FROM numbers(2) ) AS t2 USING (s); -- { serverError NOT_FOUND_COLUMN_IN_BLOCK }
+SELECT count() FROM ( SELECT [1], count(1) ) AS t1 ALL RIGHT JOIN ( SELECT number AS s FROM numbers(2) ) AS t2 USING (s); -- { serverError NOT_FOUND_COLUMN_IN_BLOCK, UNKNOWN_IDENTIFIER }
 
 DROP TABLE ints;
diff --git a/tests/queries/0_stateless/01010_pmj_on_disk.sql b/tests/queries/0_stateless/01010_pmj_on_disk.sql
index d4fb9184896..4925f78f82f 100644
--- a/tests/queries/0_stateless/01010_pmj_on_disk.sql
+++ b/tests/queries/0_stateless/01010_pmj_on_disk.sql
@@ -1,6 +1,6 @@
 SET join_algorithm = 'hash';
 
-SELECT number as n, j FROM numbers(4) nums
+SELECT n, j FROM (SELECT number as n FROM numbers(4)) nums
 ANY LEFT JOIN (
     SELECT number * 2 AS n, number + 10 AS j
     FROM numbers(4000)
@@ -10,7 +10,7 @@ ORDER BY n;
 
 SET max_rows_in_join = 1000;
 
-SELECT number as n, j FROM numbers(4) nums
+SELECT n, j FROM (SELECT number AS n FROM numbers(4)) nums
 ANY LEFT JOIN (
     SELECT number * 2 AS n, number + 10 AS j
     FROM numbers(4000)
@@ -20,7 +20,7 @@ ORDER BY n; -- { serverError 191 }
 
 SET join_algorithm = 'partial_merge';
 
-SELECT number as n, j FROM numbers(4) nums
+SELECT n, j FROM (SELECT number as n FROM numbers(4)) nums
 ANY LEFT JOIN (
     SELECT number * 2 AS n, number + 10 AS j
     FROM numbers(4000)
@@ -30,7 +30,7 @@ ORDER BY n;
 
 SET partial_merge_join_optimizations = 1;
 
-SELECT number as n, j FROM numbers(4) nums
+SELECT n, j FROM (SELECT number AS n FROM numbers(4)) nums
 ANY LEFT JOIN (
     SELECT number * 2 AS n, number + 10 AS j
     FROM numbers(4000)
@@ -40,7 +40,7 @@ ORDER BY n;
 
 SET join_algorithm = 'auto';
 
-SELECT number as n, j FROM numbers(4) nums
+SELECT n, j FROM (SELECT number AS n FROM numbers(4)) nums
 ANY LEFT JOIN (
     SELECT number * 2 AS n, number + 10 AS j
     FROM numbers(4000)
@@ -50,7 +50,7 @@ ORDER BY n;
 
 SET max_rows_in_join = '10';
 
-SELECT number as n, j FROM numbers(4) nums
+SELECT n, j FROM (SELECT number AS n FROM numbers(4)) nums
 ANY LEFT JOIN (
     SELECT number * 2 AS n, number + 10 AS j
     FROM numbers(4000)
diff --git a/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql b/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
index 7804ce32a5a..f9f30b44700 100644
--- a/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
+++ b/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
@@ -3,7 +3,10 @@
 SET max_memory_usage = 32000000;
 SET join_on_disk_max_files_to_merge = 4;
 
-SELECT number * 200000 as n, j FROM numbers(5) nums
+SELECT n, j FROM
+(
+    SELECT number * 200000 as n FROM numbers(5)
+) nums
 ANY LEFT JOIN (
     SELECT number * 2 AS n, number AS j
     FROM numbers(1000000)
@@ -13,14 +16,20 @@ USING n; -- { serverError 241 }
 SET join_algorithm = 'partial_merge';
 SET default_max_bytes_in_join = 0;
 
-SELECT number * 200000 as n, j FROM numbers(5) nums
+SELECT n, j FROM
+(
+    SELECT number * 200000 as n FROM numbers(5)
+) nums
 ANY LEFT JOIN (
     SELECT number * 2 AS n, number AS j
     FROM numbers(1000000)
 ) js2
 USING n; -- { serverError 12 }
 
-SELECT number * 200000 as n, j FROM numbers(5) nums
+SELECT n, j FROM
+(
+    SELECT number * 200000 as n FROM numbers(5)
+) nums
 ANY LEFT JOIN (
     SELECT number * 2 AS n, number AS j
     FROM numbers(1000000)
@@ -28,7 +37,10 @@ ANY LEFT JOIN (
 USING n
 SETTINGS max_bytes_in_join = 30000000; -- { serverError 241 }
 
-SELECT number * 200000 as n, j FROM numbers(5) nums
+SELECT n, j FROM
+(
+    SELECT number * 200000 as n FROM numbers(5)
+) nums
 ANY LEFT JOIN (
     SELECT number * 2 AS n, number AS j
     FROM numbers(1000000)
@@ -39,7 +51,10 @@ SETTINGS max_bytes_in_join = 10000000;
 
 SET partial_merge_join_optimizations = 1;
 
-SELECT number * 200000 as n, j FROM numbers(5) nums
+SELECT n, j FROM
+(
+    SELECT number * 200000 as n FROM numbers(5)
+) nums
 LEFT JOIN (
     SELECT number * 2 AS n, number AS j
     FROM numbers(1000000)
@@ -50,7 +65,10 @@ SETTINGS max_rows_in_join = 100000;
 
 SET default_max_bytes_in_join = 10000000;
 
-SELECT number * 200000 as n, j FROM numbers(5) nums
+SELECT n, j FROM
+(
+    SELECT number * 200000 as n FROM numbers(5)
+) nums
 JOIN (
     SELECT number * 2 AS n, number AS j
     FROM numbers(1000000)
diff --git a/tests/queries/0_stateless/01013_repeat_function.reference b/tests/queries/0_stateless/01013_repeat_function.reference
index 46bb248a99a..ea0dadd524f 100644
--- a/tests/queries/0_stateless/01013_repeat_function.reference
+++ b/tests/queries/0_stateless/01013_repeat_function.reference
@@ -1,7 +1,7 @@
 abcabcabcabcabcabcabcabcabcabc
 abcabcabc
-sdfggsdfgg
-xywq
+
+
 
 abcabcabcabcabcabcabcabcabcabcabcabc
 sdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfgg
@@ -20,8 +20,8 @@ sdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfgg
 xywqxywqxywqxywqxywqxywqxywqxywqxywqxywq
 plkfplkfplkfplkfplkfplkfplkfplkfplkfplkf
 abcabcabc
-abcabc
-abc
+
+
 
 abcabcabcabcabcabcabcabcabcabcabcabc
 abcabcabcabcabcabcabcabcabcabc
diff --git a/tests/queries/0_stateless/01013_repeat_function.sql b/tests/queries/0_stateless/01013_repeat_function.sql
index 85b0c16b4ab..b29cc032f28 100644
--- a/tests/queries/0_stateless/01013_repeat_function.sql
+++ b/tests/queries/0_stateless/01013_repeat_function.sql
@@ -3,20 +3,20 @@ DROP TABLE IF EXISTS defaults;
 CREATE TABLE defaults
 (
     strings String,
-    u8 UInt8,
+    i8 Int8,
     u16 UInt16,
     u32 UInt32,
     u64 UInt64
 )ENGINE = Memory();
 
-INSERT INTO defaults values ('abc', 3, 12, 4, 56) ('sdfgg', 2, 10, 21, 200) ('xywq', 1, 4, 9, 5) ('plkf', 0, 5, 7,77);
+INSERT INTO defaults values ('abc', 3, 12, 4, 56) ('sdfgg', -2, 10, 21, 200) ('xywq', -1, 4, 9, 5) ('plkf', 0, 5, 7,77);
 
-SELECT repeat(strings, u8) FROM defaults;
+SELECT repeat(strings, i8) FROM defaults;
 SELECT repeat(strings, u16) FROM defaults;
 SELECT repeat(strings, u32) from defaults;
 SELECT repeat(strings, u64) FROM defaults;
 SELECT repeat(strings, 10) FROM defaults;
-SELECT repeat('abc', u8) FROM defaults;
+SELECT repeat('abc', i8) FROM defaults;
 SELECT repeat('abc', u16) FROM defaults;
 SELECT repeat('abc', u32) FROM defaults;
 SELECT repeat('abc', u64) FROM defaults;
diff --git a/tests/queries/0_stateless/01013_totals_without_aggregation.reference b/tests/queries/0_stateless/01013_totals_without_aggregation.reference
index 6dddf22a467..a1f5c1aa914 100644
--- a/tests/queries/0_stateless/01013_totals_without_aggregation.reference
+++ b/tests/queries/0_stateless/01013_totals_without_aggregation.reference
@@ -1,7 +1,7 @@
 11
 
-11
-12
+0
 12
+0
 13
-13
+0
diff --git a/tests/queries/0_stateless/01013_totals_without_aggregation.sql b/tests/queries/0_stateless/01013_totals_without_aggregation.sql
index 584a8994767..291f95c6bd6 100644
--- a/tests/queries/0_stateless/01013_totals_without_aggregation.sql
+++ b/tests/queries/0_stateless/01013_totals_without_aggregation.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 SELECT 11 AS n GROUP BY n WITH TOTALS;
 SELECT 12 AS n GROUP BY n WITH ROLLUP;
 SELECT 13 AS n GROUP BY n WITH CUBE;
diff --git a/tests/queries/0_stateless/01017_bithamming_distance.reference b/tests/queries/0_stateless/01017_bithamming_distance.reference
index cc2d4f39154..3e82e0d2864 100644
--- a/tests/queries/0_stateless/01017_bithamming_distance.reference
+++ b/tests/queries/0_stateless/01017_bithamming_distance.reference
@@ -13,3 +13,18 @@
 5
 9
 9
+0
+6
+6
+0
+6
+47
+0
+6
+47
+0
+6
+26
+0
+6
+26
diff --git a/tests/queries/0_stateless/01017_bithamming_distance.sql b/tests/queries/0_stateless/01017_bithamming_distance.sql
index 4b36894b97c..11f4f27d9a8 100644
--- a/tests/queries/0_stateless/01017_bithamming_distance.sql
+++ b/tests/queries/0_stateless/01017_bithamming_distance.sql
@@ -18,3 +18,27 @@ SELECT bitHammingDistance(n2, 100) FROM defaults;
 SELECT bitHammingDistance(n3, n4) FROM defaults;
 
 DROP TABLE defaults;
+
+DROP TABLE IF EXISTS test_string;
+
+CREATE TABLE test_string
+(
+	s1 String,
+	s2 String,
+	s3 FixedString(10),
+	s4 FixedString(10),
+) ENGINE = Memory;
+
+INSERT INTO test_string VALUES ('hello', 'hello', 'hello', 'hello') ('hello', 'hellow', 'hello', 'hellow') ('clickhouse', '012345', 'clickhouse', '012345');
+
+SELECT bitHammingDistance('hello', 'hello');
+SELECT bitHammingDistance('hello', 'hellow');
+SELECT bitHammingDistance(toFixedString('hello', 6), toFixedString('hellow', 6));
+
+SELECT bitHammingDistance(s1, s2) FROM test_string;
+SELECT bitHammingDistance(s3, s4) FROM test_string;
+
+SELECT bitHammingDistance('hello', s2) FROM test_string;
+SELECT bitHammingDistance(s4, toFixedString('hello', 10)) FROM test_string;
+
+DROP TABLE test_string;
diff --git a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
index e4d091ea0bb..4f35b69da0b 100755
--- a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
+++ b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
@@ -60,7 +60,7 @@ ${CLICKHOUSE_CLIENT} --query "ALTER TABLE $T1 UPDATE y = y + rand() % 1 WHERE no
 
 # hm... it looks like joinGet condidered determenistic
 ${CLICKHOUSE_CLIENT} --query "ALTER TABLE $R1 UPDATE y = joinGet('${CLICKHOUSE_DATABASE}.lookup_table', 'y_new', y) WHERE x=1" 2>&1 \
-&& echo 'OK' || echo 'FAIL'
+| grep -F -q "must use only deterministic functions" && echo 'OK' || echo 'FAIL'
 
 ${CLICKHOUSE_CLIENT} --query "ALTER TABLE $R1 DELETE WHERE dictHas('${CLICKHOUSE_DATABASE}.dict1', toUInt64(x))" 2>&1 \
 | grep -F -q "must use only deterministic functions" && echo 'OK' || echo 'FAIL'
diff --git a/tests/queries/0_stateless/01018_Distributed__shard_num.reference b/tests/queries/0_stateless/01018_Distributed__shard_num.reference
index 46963a006ec..232f12ed101 100644
--- a/tests/queries/0_stateless/01018_Distributed__shard_num.reference
+++ b/tests/queries/0_stateless/01018_Distributed__shard_num.reference
@@ -85,7 +85,7 @@ SELECT a._shard_num, a.key, b.host_name, b.host_address IN ('::1', '127.0.0.1'),
 FROM dist_1 a
 JOIN system.clusters b
 ON a._shard_num = b.shard_num
-WHERE b.cluster = 'test_cluster_two_shards_localhost'; -- { serverError 47; }
+WHERE b.cluster = 'test_cluster_two_shards_localhost'; -- { serverError 47, 403 }
 SELECT 'dist_3';
 dist_3
 SELECT * FROM dist_3;
diff --git a/tests/queries/0_stateless/01018_Distributed__shard_num.sql b/tests/queries/0_stateless/01018_Distributed__shard_num.sql
index d3f4e1ac527..7e31062348d 100644
--- a/tests/queries/0_stateless/01018_Distributed__shard_num.sql
+++ b/tests/queries/0_stateless/01018_Distributed__shard_num.sql
@@ -79,7 +79,7 @@ SELECT a._shard_num, a.key, b.host_name, b.host_address IN ('::1', '127.0.0.1'),
 FROM dist_1 a
 JOIN system.clusters b
 ON a._shard_num = b.shard_num
-WHERE b.cluster = 'test_cluster_two_shards_localhost'; -- { serverError 47; }
+WHERE b.cluster = 'test_cluster_two_shards_localhost'; -- { serverError 47, 403 }
 
 SELECT 'dist_3';
 SELECT * FROM dist_3;
diff --git a/tests/queries/0_stateless/01018_ambiguous_column.reference b/tests/queries/0_stateless/01018_ambiguous_column.reference
index a2a1d6ea4f6..308726fa184 100644
--- a/tests/queries/0_stateless/01018_ambiguous_column.reference
+++ b/tests/queries/0_stateless/01018_ambiguous_column.reference
@@ -1,12 +1,15 @@
 0	0
 0	0
+0	0
 0
 0
 0
 0
-┌─one.dummy─┬─A.dummy─┬─B.dummy─┐
-│         0 │       0 │       0 │
-└───────────┴─────────┴─────────┘
+0
+0
+┌─system.one.dummy─┬─A.dummy─┬─B.dummy─┐
+│                0 │       0 │       0 │
+└──────────────────┴─────────┴─────────┘
 ┌─A.dummy─┬─one.dummy─┬─two.dummy─┐
 │       0 │         0 │         0 │
 └─────────┴───────────┴───────────┘
diff --git a/tests/queries/0_stateless/01018_ambiguous_column.sql b/tests/queries/0_stateless/01018_ambiguous_column.sql
index 54603aab810..620bdb6ba3f 100644
--- a/tests/queries/0_stateless/01018_ambiguous_column.sql
+++ b/tests/queries/0_stateless/01018_ambiguous_column.sql
@@ -1,4 +1,6 @@
-select * from system.one cross join system.one; -- { serverError 352 }
+SET allow_experimental_analyzer = 1;
+
+select * from system.one cross join system.one;
 select * from system.one cross join system.one r;
 select * from system.one l cross join system.one;
 select * from system.one left join system.one using dummy;
@@ -8,10 +10,10 @@ USE system;
 
 SELECT dummy FROM one AS A JOIN one ON A.dummy = one.dummy;
 SELECT dummy FROM one JOIN one AS A ON A.dummy = one.dummy;
-SELECT dummy FROM one l JOIN one r ON dummy = r.dummy; -- { serverError 352 }
-SELECT dummy FROM one l JOIN one r ON l.dummy = dummy; -- { serverError 352 }
-SELECT dummy FROM one l JOIN one r ON one.dummy = r.dummy; -- { serverError 352 }
-SELECT dummy FROM one l JOIN one r ON l.dummy = one.dummy; -- { serverError 352 }
+SELECT dummy FROM one l JOIN one r ON dummy = r.dummy;
+SELECT dummy FROM one l JOIN one r ON l.dummy = dummy; -- { serverError 403 }
+SELECT dummy FROM one l JOIN one r ON one.dummy = r.dummy;
+SELECT dummy FROM one l JOIN one r ON l.dummy = one.dummy; -- { serverError 403 }
 
 SELECT * from one
 JOIN one A ON one.dummy = A.dummy
diff --git a/tests/queries/0_stateless/01018_empty_aggregation_filling.reference b/tests/queries/0_stateless/01018_empty_aggregation_filling.reference
index c29807a7e15..975b48c57f9 100644
--- a/tests/queries/0_stateless/01018_empty_aggregation_filling.reference
+++ b/tests/queries/0_stateless/01018_empty_aggregation_filling.reference
@@ -54,7 +54,7 @@ hello
 2011-04-05 14:19:19
 -123.45
 -123.45
-inf
-inf
+nan
+nan
 -123.45
 -123.45
diff --git a/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh b/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh
index e90085f4e8e..3a2eac1f38f 100755
--- a/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh
+++ b/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh
@@ -50,12 +50,20 @@ function insert_thread() {
 function alter_thread() {
     trap 'exit' INT
 
-    ALTER[0]="ALTER TABLE mv MODIFY QUERY SELECT v == 1 as test, v as case FROM src_a;"
-    ALTER[1]="ALTER TABLE mv MODIFY QUERY SELECT v == 2 as test, v as case FROM src_b;"
+    # Generate random ALTERs, but make sure that at least one of them is for each source table.
+    for i in {0..5}; do
+        ALTER[$i]="ALTER TABLE mv MODIFY QUERY SELECT v == 1 as test, v as case FROM src_a;"
+    done
+    # Insert 3 ALTERs to src_b, one in the first half of the array and two in arbitrary positions.
+    ALTER[$RANDOM % 3]="ALTER TABLE mv MODIFY QUERY SELECT v == 2 as test, v as case FROM src_b;"
+    ALTER[$RANDOM % 6]="ALTER TABLE mv MODIFY QUERY SELECT v == 2 as test, v as case FROM src_b;"
+    ALTER[$RANDOM % 6]="ALTER TABLE mv MODIFY QUERY SELECT v == 2 as test, v as case FROM src_b;"
 
+    i=0
     while true; do
-        $CLICKHOUSE_CLIENT --allow_experimental_alter_materialized_view_structure=1 \
-        -q "${ALTER[$RANDOM % 2]}"
+        $CLICKHOUSE_CLIENT --allow_experimental_alter_materialized_view_structure=1 -q "${ALTER[$i % 6]}"
+        ((i=i+1))
+
         sleep "0.0$RANDOM"
 
         is_done=$($CLICKHOUSE_CLIENT -q "SELECT countIf(case = 1) > 0 AND countIf(case = 2) > 0 FROM mv;")
diff --git a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
index 4c0afc4c439..8ef03be02b6 100755
--- a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
@@ -70,8 +70,8 @@ timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
 wait
 
-echo "DROP TABLE src NO DELAY" | ${CLICKHOUSE_CLIENT}
-echo "DROP TABLE dst NO DELAY" | ${CLICKHOUSE_CLIENT}
+echo "DROP TABLE src SYNC" | ${CLICKHOUSE_CLIENT}
+echo "DROP TABLE dst SYNC" | ${CLICKHOUSE_CLIENT}
 sleep 5
 
 # Check for deadlocks
diff --git a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference
index c89fe48d9f9..8d40aebacf2 100644
--- a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference
+++ b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference
@@ -1,5 +1,5 @@
 122
 
-Table dictdb_01041_01040.dict_invalidate doesn\'t exist
+1
 
 133
diff --git a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
index 7249d5e1a82..6856f952a47 100755
--- a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
+++ b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
@@ -53,7 +53,7 @@ function check_exception_detected()
 export -f check_exception_detected;
 timeout 30 bash -c check_exception_detected 2> /dev/null
 
-$CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb_01041_01040' AND name = 'invalidate'" 2>&1 | grep -Eo "Table dictdb_01041_01040.dict_invalidate .* exist"
+$CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb_01041_01040' AND name = 'invalidate'" 2>&1 | grep -Eo "dictdb_01041_01040.dict_invalidate.*UNKNOWN_TABLE" | wc -l
 
 $CLICKHOUSE_CLIENT --query "
 CREATE TABLE dictdb_01041_01040.dict_invalidate
diff --git a/tests/queries/0_stateless/01047_window_view_parser_inner_table.sql b/tests/queries/0_stateless/01047_window_view_parser_inner_table.sql
index 2d9911287a3..bf1ac254783 100644
--- a/tests/queries/0_stateless/01047_window_view_parser_inner_table.sql
+++ b/tests/queries/0_stateless/01047_window_view_parser_inner_table.sql
@@ -1,5 +1,6 @@
 -- Tags: no-parallel
 
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 DROP DATABASE IF EXISTS test_01047;
 set allow_deprecated_database_ordinary=1;
diff --git a/tests/queries/0_stateless/01048_window_view_parser.sql b/tests/queries/0_stateless/01048_window_view_parser.sql
index 4c329f99f6e..f87d9aa023e 100644
--- a/tests/queries/0_stateless/01048_window_view_parser.sql
+++ b/tests/queries/0_stateless/01048_window_view_parser.sql
@@ -1,5 +1,6 @@
 -- Tags: no-parallel
 
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 DROP DATABASE IF EXISTS test_01048;
 set allow_deprecated_database_ordinary=1;
diff --git a/tests/queries/0_stateless/01050_window_view_parser_tumble.sql b/tests/queries/0_stateless/01050_window_view_parser_tumble.sql
index d9604bb2b52..c52a6fefacb 100644
--- a/tests/queries/0_stateless/01050_window_view_parser_tumble.sql
+++ b/tests/queries/0_stateless/01050_window_view_parser_tumble.sql
@@ -1,3 +1,4 @@
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 
 DROP TABLE IF EXISTS mt;
@@ -5,29 +6,29 @@ DROP TABLE IF EXISTS mt;
 CREATE TABLE mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
 
 SELECT '---WATERMARK---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory WATERMARK=INTERVAL '1' SECOND AS SELECT count(a), tumbleStart(wid) AS w_start, tumbleEnd(wid) AS w_end FROM mt GROUP BY tumble(timestamp, INTERVAL '3' SECOND) AS wid;
 
 SELECT '---With w_end---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS SELECT count(a), tumbleStart(tumble(timestamp, INTERVAL '3' SECOND)) AS w_start, tumbleEnd(wid) AS w_end FROM mt GROUP BY tumble(timestamp, INTERVAL '3' SECOND) AS wid;
 
 SELECT '---WithOut w_end---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS SELECT count(a), tumbleStart(wid) AS w_start FROM mt GROUP BY tumble(timestamp, INTERVAL '3' SECOND) AS wid;
 
 SELECT '---WITH---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS WITH toDateTime('2018-01-01 00:00:00') AS date_time SELECT count(a), tumbleStart(wid) AS w_start, tumbleEnd(wid) AS w_end, date_time FROM mt GROUP BY tumble(timestamp, INTERVAL '3' SECOND) AS wid;
 
 SELECT '---WHERE---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS SELECT count(a), tumbleStart(wid) AS w_start FROM mt WHERE a != 1 GROUP BY tumble(timestamp, INTERVAL '3' SECOND) AS wid;
 
 SELECT '---ORDER_BY---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS SELECT count(a), tumbleStart(wid) AS w_start FROM mt WHERE a != 1 GROUP BY tumble(timestamp, INTERVAL '3' SECOND) AS wid ORDER BY w_start;
 
 SELECT '---With now---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS SELECT count(a), tumbleStart(wid) AS w_start, tumbleEnd(tumble(now(), INTERVAL '3' SECOND)) AS w_end FROM mt GROUP BY tumble(now(), INTERVAL '3' SECOND) AS wid;
diff --git a/tests/queries/0_stateless/01051_system_stack_trace.sql b/tests/queries/0_stateless/01051_system_stack_trace.sql
index e322462a46a..7eb2a05dc87 100644
--- a/tests/queries/0_stateless/01051_system_stack_trace.sql
+++ b/tests/queries/0_stateless/01051_system_stack_trace.sql
@@ -1,4 +1,4 @@
--- Tags: race
+SET storage_system_stack_trace_pipe_read_timeout_ms = 1000;
 
 -- { echo }
 SELECT count() > 0 FROM system.stack_trace WHERE query_id != '';
diff --git a/tests/queries/0_stateless/01051_window_view_parser_hop.sql b/tests/queries/0_stateless/01051_window_view_parser_hop.sql
index 472dc66f1a2..b37e4ed3095 100644
--- a/tests/queries/0_stateless/01051_window_view_parser_hop.sql
+++ b/tests/queries/0_stateless/01051_window_view_parser_hop.sql
@@ -1,3 +1,4 @@
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 
 DROP TABLE IF EXISTS mt;
@@ -5,29 +6,29 @@ DROP TABLE IF EXISTS mt;
 CREATE TABLE mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
 
 SELECT '---WATERMARK---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory WATERMARK=INTERVAL '1' SECOND AS SELECT count(a), hopStart(wid) AS w_start, hopEnd(wid) AS w_end FROM mt GROUP BY hop(timestamp, INTERVAL '3' SECOND, INTERVAL '5' SECOND) AS wid;
 
 SELECT '---With w_end---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS SELECT count(a), hopStart(wid) AS w_start, hopEnd(wid) AS w_end FROM mt GROUP BY hop(timestamp, INTERVAL '3' SECOND, INTERVAL '5' SECOND) AS wid;
 
 SELECT '---WithOut w_end---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS SELECT count(a), hopStart(wid) AS w_start FROM mt GROUP BY hop(timestamp, INTERVAL '3' SECOND, INTERVAL '5' SECOND) AS wid;
 
 SELECT '---WITH---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS WITH toDateTime('2018-01-01 00:00:00') AS date_time SELECT count(a), hopStart(wid) AS w_start, hopEnd(wid) AS w_end, date_time FROM mt GROUP BY hop(timestamp, INTERVAL '3' SECOND, INTERVAL '5' SECOND) AS wid;
 
 SELECT '---WHERE---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS SELECT count(a), hopStart(wid) AS w_start FROM mt WHERE a != 1 GROUP BY hop(timestamp, INTERVAL '3' SECOND, INTERVAL '5' SECOND) AS wid;
 
 SELECT '---ORDER_BY---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS SELECT count(a), hopStart(wid) AS w_start FROM mt WHERE a != 1 GROUP BY hop(timestamp, INTERVAL '3' SECOND, INTERVAL '5' SECOND) AS wid ORDER BY w_start;
 
 SELECT '---With now---';
-DROP TABLE IF EXISTS wv NO DELAY;
+DROP TABLE IF EXISTS wv SYNC;
 CREATE WINDOW VIEW wv ENGINE Memory AS SELECT count(a), hopStart(wid) AS w_start, hopEnd(hop(now(), INTERVAL '1' SECOND, INTERVAL '3' SECOND)) as w_end FROM mt GROUP BY hop(now(), INTERVAL '1' SECOND, INTERVAL '3' SECOND) AS wid;
diff --git a/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh b/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh
index 9fdc66191d7..e75b7d9570b 100755
--- a/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh
+++ b/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -18,11 +22,11 @@ INSERT INTO mt VALUES (1);
 EOF
 
 for _ in {1..100}; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
 	sleep .5
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT count FROM dst"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count FROM dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
index c1f9e52f831..fe757acfd06 100755
--- a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
+++ b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -18,11 +22,11 @@ INSERT INTO mt VALUES (1);
 EOF
 
 for _ in {1..100}; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
 	sleep .5
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT count FROM dst"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count FROM dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh b/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
index 04b1f8b65ce..0306509cf3c 100755
--- a/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
+++ b/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
@@ -1,20 +1,19 @@
 #!/usr/bin/env bash
-# Tags: no-parallel
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="create database if not exists test_01054;"
-$CLICKHOUSE_CLIENT --query="drop table if exists test_01054.ints;"
+$CLICKHOUSE_CLIENT --query="drop table if exists test_01054;"
 
-$CLICKHOUSE_CLIENT --query="create table test_01054.ints
+$CLICKHOUSE_CLIENT --query="create table test_01054
                             (key UInt64, i8 Int8, i16 Int16, i32 Int32, i64 Int64, u8 UInt8, u16 UInt16, u32 UInt32, u64 UInt64)
                             Engine = Memory;"
 
-$CLICKHOUSE_CLIENT --query="insert into test_01054.ints values (1, 1, 1, 1, 1, 1, 1, 1, 1);"
-$CLICKHOUSE_CLIENT --query="insert into test_01054.ints values (2, 2, 2, 2, 2, 2, 2, 2, 2);"
-$CLICKHOUSE_CLIENT --query="insert into test_01054.ints values (3, 3, 3, 3, 3, 3, 3, 3, 3);"
+$CLICKHOUSE_CLIENT --query="insert into test_01054 values (1, 1, 1, 1, 1, 1, 1, 1, 1);"
+$CLICKHOUSE_CLIENT --query="insert into test_01054 values (2, 2, 2, 2, 2, 2, 2, 2, 2);"
+$CLICKHOUSE_CLIENT --query="insert into test_01054 values (3, 3, 3, 3, 3, 3, 3, 3, 3);"
 
 function thread1()
 {
@@ -73,5 +72,4 @@ wait
 
 echo OK
 
-$CLICKHOUSE_CLIENT --query "DROP TABLE if exists test_01054.ints"
-$CLICKHOUSE_CLIENT -q "DROP DATABASE test_01054"
+$CLICKHOUSE_CLIENT --query "DROP TABLE if exists test_01054"
diff --git a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
index fc6bec80e0f..ee11b265ecd 100755
--- a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
+++ b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -14,15 +18,15 @@ CREATE TABLE dst(count UInt64) Engine=MergeTree ORDER BY tuple();
 CREATE TABLE mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
 CREATE WINDOW VIEW wv TO dst AS SELECT count(a) AS count FROM mt GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid;
 
-INSERT INTO mt VALUES (1, now('US/Samoa') + 1);
+INSERT INTO mt VALUES (1, now('US/Samoa') + 5);
 EOF
 
 for _ in {1..100}; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
 	sleep .5
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT count FROM dst"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count FROM dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh b/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
index f7bbceeb8ff..ea8ad372617 100755
--- a/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
+++ b/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -18,11 +22,11 @@ INSERT INTO mt VALUES (1, now('US/Samoa') + 1);
 EOF
 
 for _ in {1..100}; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
 	sleep .5
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT count FROM dst;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count FROM dst;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst;"
diff --git a/tests/queries/0_stateless/01056_create_table_as.sql b/tests/queries/0_stateless/01056_create_table_as.sql
index 62db8282ac0..6df660dba61 100644
--- a/tests/queries/0_stateless/01056_create_table_as.sql
+++ b/tests/queries/0_stateless/01056_create_table_as.sql
@@ -16,15 +16,9 @@ DROP TABLE t2;
 CREATE TABLE t3 AS numbers(10);
 DROP TABLE t3;
 
--- live view
-SET allow_experimental_live_view=1;
-CREATE LIVE VIEW lv AS SELECT * FROM t1;
-CREATE TABLE t3 AS lv; -- { serverError 80; }
-DROP TABLE lv;
-
 -- view
 CREATE VIEW v AS SELECT * FROM t1;
-CREATE TABLE t3 AS v; -- { serverError 80; }
+CREATE TABLE t3 AS v; -- { serverError 80 }
 DROP TABLE v;
 
 -- dictionary
@@ -43,7 +37,7 @@ SOURCE(CLICKHOUSE(
     TABLE 'dict_data' DB 'test_01056_dict_data' USER 'default' PASSWORD ''))
 LIFETIME(MIN 0 MAX 0)
 LAYOUT(SPARSE_HASHED());
-CREATE TABLE t3 AS dict; -- { serverError 80; }
+CREATE TABLE t3 AS dict; -- { serverError 80 }
 
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference b/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference
index 7df4dc7ead5..dd52fd1c1b2 100644
--- a/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference
+++ b/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference
@@ -50,12 +50,12 @@ FROM
 WHERE (co != 0) AND (co2 != 2)
 1	0	3	1
 1	0	0	1
-SELECT alias AS name
+SELECT name
 FROM
 (
-    SELECT name AS alias
+    SELECT name
     FROM system.settings
-    WHERE alias = \'enable_optimize_predicate_expression\'
+    WHERE name = \'enable_optimize_predicate_expression\'
 )
 ANY INNER JOIN
 (
diff --git a/tests/queries/0_stateless/01056_predicate_optimizer_bugs.sql b/tests/queries/0_stateless/01056_predicate_optimizer_bugs.sql
index 6d2bb2964d6..f237768bc4c 100644
--- a/tests/queries/0_stateless/01056_predicate_optimizer_bugs.sql
+++ b/tests/queries/0_stateless/01056_predicate_optimizer_bugs.sql
@@ -12,8 +12,8 @@ EXPLAIN SYNTAX SELECT co,co2,co3,num FROM ( SELECT co,co2,co3,count() AS num FRO
 SELECT co,co2,co3,num FROM ( SELECT co,co2,co3,count() AS num FROM ( SELECT 1 AS co,2 AS co2 ,3 AS co3 ) GROUP BY cube (co,co2,co3) ) WHERE co!=0 AND co2 !=2;
 
 -- https://github.com/ClickHouse/ClickHouse/issues/6734
-EXPLAIN SYNTAX SELECT alias AS name FROM ( SELECT name AS alias FROM system.settings ) ANY INNER JOIN ( SELECT name FROM system.settings ) USING (name) WHERE name = 'enable_optimize_predicate_expression';
-SELECT alias AS name FROM ( SELECT name AS alias FROM system.settings ) ANY INNER JOIN ( SELECT name FROM system.settings ) USING (name) WHERE name = 'enable_optimize_predicate_expression';
+EXPLAIN SYNTAX SELECT name FROM ( SELECT name FROM system.settings ) ANY INNER JOIN ( SELECT name FROM system.settings ) USING (name) WHERE name = 'enable_optimize_predicate_expression';
+SELECT name FROM ( SELECT name FROM system.settings ) ANY INNER JOIN ( SELECT name FROM system.settings ) USING (name) WHERE name = 'enable_optimize_predicate_expression';
 
 -- https://github.com/ClickHouse/ClickHouse/issues/6767
 DROP TABLE IF EXISTS t1;
diff --git a/tests/queries/0_stateless/01056_window_view_proc_hop_watch.py b/tests/queries/0_stateless/01056_window_view_proc_hop_watch.py
index 8580ad43ccd..4c3e3ead455 100755
--- a/tests/queries/0_stateless/01056_window_view_proc_hop_watch.py
+++ b/tests/queries/0_stateless/01056_window_view_proc_hop_watch.py
@@ -20,6 +20,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
+    client1.send("SET allow_experimental_analyzer = 0")
+    client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
     client1.send("SET window_view_heartbeat_interval = 1")
diff --git a/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh b/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh
index 5a1310ebd4d..087e2577e5f 100755
--- a/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh
+++ b/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -24,10 +28,10 @@ INSERT INTO mt VALUES (1, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh b/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh
index 3e196ab6f65..b74e8cc6d25 100755
--- a/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh
+++ b/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -24,10 +28,10 @@ INSERT INTO mt VALUES (1, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "6" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "6" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.py b/tests/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.py
index 44c2f211f2b..9adff06442e 100755
--- a/tests/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.py
+++ b/tests/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.py
@@ -20,6 +20,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
+    client1.send("SET allow_experimental_analyzer = 0")
+    client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
     client1.send("SET window_view_heartbeat_interval = 1")
@@ -29,7 +31,7 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client1.send("DROP TABLE IF EXISTS db_01059_event_hop_watch_strict_asc.mt")
     client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS db_01059_event_hop_watch_strict_asc.wv NO DELAY")
+    client1.send("DROP TABLE IF EXISTS db_01059_event_hop_watch_strict_asc.wv SYNC")
     client1.expect(prompt)
 
     client1.send(
@@ -69,7 +71,7 @@ with client(name="client1>", log=log) as client1, client(
     if match.groups()[1]:
         client1.send(client1.command)
         client1.expect(prompt)
-    client1.send("DROP TABLE db_01059_event_hop_watch_strict_asc.wv NO DELAY")
+    client1.send("DROP TABLE db_01059_event_hop_watch_strict_asc.wv SYNC")
     client1.expect(prompt)
     client1.send("DROP TABLE db_01059_event_hop_watch_strict_asc.mt")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh b/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh
index 9163fe8af27..8161e54923d 100755
--- a/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh
+++ b/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -25,10 +29,10 @@ INSERT INTO mt VALUES (1, 8, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "7" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "7" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh b/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh
index 77e5a876d5e..2230fc28fca 100755
--- a/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh
+++ b/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -25,10 +29,10 @@ INSERT INTO mt VALUES (1, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "6" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "6" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01062_window_view_event_hop_watch_asc.py b/tests/queries/0_stateless/01062_window_view_event_hop_watch_asc.py
index ddf0c423fa9..bb40b1df2f0 100755
--- a/tests/queries/0_stateless/01062_window_view_event_hop_watch_asc.py
+++ b/tests/queries/0_stateless/01062_window_view_event_hop_watch_asc.py
@@ -20,6 +20,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
+    client1.send("SET allow_experimental_analyzer = 0")
+    client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
     client1.send("SET window_view_heartbeat_interval = 1")
@@ -31,9 +33,7 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client1.send("DROP TABLE IF EXISTS 01062_window_view_event_hop_watch_asc.mt")
     client1.expect(prompt)
-    client1.send(
-        "DROP TABLE IF EXISTS 01062_window_view_event_hop_watch_asc.wv NO DELAY"
-    )
+    client1.send("DROP TABLE IF EXISTS 01062_window_view_event_hop_watch_asc.wv SYNC")
     client1.expect(prompt)
 
     client1.send(
@@ -75,7 +75,7 @@ with client(name="client1>", log=log) as client1, client(
     if match.groups()[1]:
         client1.send(client1.command)
         client1.expect(prompt)
-    client1.send("DROP TABLE 01062_window_view_event_hop_watch_asc.wv NO DELAY")
+    client1.send("DROP TABLE 01062_window_view_event_hop_watch_asc.wv SYNC")
     client1.expect(prompt)
     client1.send("DROP TABLE 01062_window_view_event_hop_watch_asc.mt")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh b/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh
index b51b076d522..913f2b69b9c 100755
--- a/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh
+++ b/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -25,10 +29,10 @@ INSERT INTO mt VALUES (1, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01064_pm_all_join_const_and_nullable.sql b/tests/queries/0_stateless/01064_pm_all_join_const_and_nullable.sql
index 10306777f25..bc5e1d68290 100644
--- a/tests/queries/0_stateless/01064_pm_all_join_const_and_nullable.sql
+++ b/tests/queries/0_stateless/01064_pm_all_join_const_and_nullable.sql
@@ -1,87 +1,87 @@
 SET join_algorithm = 'partial_merge';
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT materialize(1) as k FROM numbers(1) nums
+SELECT k FROM (SELECT materialize(1) AS k FROM numbers(1)) nums
 JOIN (SELECT materialize(1) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT materialize(1) as k FROM numbers(1) nums
+SELECT k FROM (SELECT materialize(1) as k FROM numbers(1)) nums
 JOIN (SELECT 1 AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT 1 as k FROM numbers(1) nums
+SELECT k FROM (SELECT 1 AS k FROM numbers(1)) nums
 JOIN (SELECT materialize(1) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT 1 as k FROM numbers(1) nums
+SELECT k FROM (SELECT 1 as k FROM numbers(1)) nums
 JOIN (SELECT 1 AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT 'first nullable';
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT materialize(toNullable(1)) as k FROM numbers(1) nums
+SELECT k FROM (SELECT materialize(toNullable(1)) AS k FROM numbers(1)) nums
 JOIN (SELECT materialize(1) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT materialize(toNullable(1)) as k FROM numbers(1) nums
+SELECT k FROM (SELECT materialize(toNullable(1)) as k FROM numbers(1)) nums
 JOIN (SELECT 1 AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT toNullable(1) as k FROM numbers(1) nums
+SELECT k FROM (SELECT toNullable(1) as k FROM numbers(1)) nums
 JOIN (SELECT materialize(1) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT toNullable(1) as k FROM numbers(1) nums
+SELECT k FROM (SELECT toNullable(1) as k FROM numbers(1)) nums
 JOIN (SELECT 1 AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT 'second nullable';
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT materialize(1) as k FROM numbers(1) nums
+SELECT k FROM (SELECT materialize(1) as k FROM numbers(1)) nums
 JOIN (SELECT materialize(toNullable(1)) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT materialize(1) as k FROM numbers(1) nums
+SELECT k FROM (SELECT materialize(1) as k FROM numbers(1)) nums
 JOIN (SELECT toNullable(1) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT 1 as k FROM numbers(1) nums
+SELECT k FROM (SELECT 1 as k FROM numbers(1)) nums
 JOIN (SELECT materialize(toNullable(1)) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT 1 as k FROM numbers(1) nums
+SELECT k FROM (SELECT 1 as k FROM numbers(1)) nums
 JOIN (SELECT toNullable(1) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT 'both nullable';
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT materialize(toNullable(1)) as k FROM numbers(1) nums
+SELECT k FROM (SELECT materialize(toNullable(1)) as k FROM numbers(1)) nums
 JOIN (SELECT materialize(toNullable(1)) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT materialize(toNullable(1)) as k FROM numbers(1) nums
+SELECT k FROM (SELECT materialize(toNullable(1)) as k FROM numbers(1)) nums
 JOIN (SELECT toNullable(1) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT toNullable(1) as k FROM numbers(1) nums
+SELECT k FROM (SELECT toNullable(1) as k FROM numbers(1)) nums
 JOIN (SELECT materialize(toNullable(1)) AS k, number n FROM numbers(100000)) j
 USING k);
 
 SELECT count(1), uniqExact(1) FROM (
-SELECT toNullable(1) as k FROM numbers(1) nums
+SELECT k FROM (SELECT toNullable(1) as k FROM numbers(1)) nums
 JOIN (SELECT toNullable(1) AS k, number n FROM numbers(100000)) j
 USING k);
diff --git a/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh b/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh
index 3a9e079d36f..20e6a72f7d9 100755
--- a/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh
+++ b/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -25,10 +29,10 @@ INSERT INTO mt VALUES (1, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "6" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "6" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01065_window_view_event_hop_watch_bounded.py b/tests/queries/0_stateless/01065_window_view_event_hop_watch_bounded.py
index 2e63e762f52..7f00130b184 100755
--- a/tests/queries/0_stateless/01065_window_view_event_hop_watch_bounded.py
+++ b/tests/queries/0_stateless/01065_window_view_event_hop_watch_bounded.py
@@ -19,6 +19,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
+    client1.send("SET allow_experimental_analyzer = 0")
+    client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
     client1.send("SET window_view_heartbeat_interval = 1")
diff --git a/tests/queries/0_stateless/01066_bit_count.reference b/tests/queries/0_stateless/01066_bit_count.reference
index 4a3b084b4a2..9a1a9a69216 100644
--- a/tests/queries/0_stateless/01066_bit_count.reference
+++ b/tests/queries/0_stateless/01066_bit_count.reference
@@ -19,3 +19,7 @@
 1	10	000000000000F03F
 -1	11	000000000000F0BF
 inf	11	000000000000F07F
+Hello, world!!!!	55
+67
+67
+1
diff --git a/tests/queries/0_stateless/01066_bit_count.sql b/tests/queries/0_stateless/01066_bit_count.sql
index d50b2657542..0b1b2dc8247 100644
--- a/tests/queries/0_stateless/01066_bit_count.sql
+++ b/tests/queries/0_stateless/01066_bit_count.sql
@@ -11,3 +11,9 @@ SELECT bitCount(toInt16(-1));
 SELECT bitCount(toInt8(-1));
 
 SELECT x, bitCount(x), hex(reinterpretAsString(x)) FROM VALUES ('x Float64', (1), (-1), (inf));
+
+SELECT toFixedString('Hello, world!!!!', 16) AS x, bitCount(x);
+
+SELECT length(replaceAll(bin('clickhouse cloud'), '0', ''));
+SELECT bitCount('clickhouse cloud');
+SELECT length(replaceAll(bin('clickhouse cloud'), '0', '')) = bitCount('clickhouse cloud');
diff --git a/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh b/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh
index 26972cc271f..756c74d4fa9 100755
--- a/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh
+++ b/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -27,10 +31,10 @@ INSERT INTO mt VALUES (1, '1990/01/01 12:00:11');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end, count;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end, count;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst;"
diff --git a/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh b/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh
index dbb05443d46..8d2c58a7332 100755
--- a/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh
+++ b/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -27,10 +31,10 @@ INSERT INTO mt VALUES (1, '1990/01/01 12:00:11');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end, count;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end, count;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst;"
diff --git a/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh b/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh
index 1d71c873713..3367bba1e03 100755
--- a/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh
+++ b/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -28,10 +32,10 @@ INSERT INTO mt VALUES (1, '1990/01/01 12:00:12');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "2" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "2" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end, count;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end, count;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst;"
diff --git a/tests/queries/0_stateless/01069_window_view_proc_tumble_watch.py b/tests/queries/0_stateless/01069_window_view_proc_tumble_watch.py
index 7b7d05c92db..eb31b2ccbcf 100755
--- a/tests/queries/0_stateless/01069_window_view_proc_tumble_watch.py
+++ b/tests/queries/0_stateless/01069_window_view_proc_tumble_watch.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Tags: no-parallel
+# Tags: no-parallel, no-fasttest
 
 import os
 import sys
@@ -20,6 +20,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
+    client1.send("SET allow_experimental_analyzer = 0")
+    client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
     client1.send("SET window_view_heartbeat_interval = 1")
@@ -31,7 +33,7 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client1.send("DROP TABLE IF EXISTS 01069_window_view_proc_tumble_watch.mt")
     client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS 01069_window_view_proc_tumble_watch.wv NO DELAY")
+    client1.send("DROP TABLE IF EXISTS 01069_window_view_proc_tumble_watch.wv SYNC")
     client1.expect(prompt)
 
     client1.send(
@@ -65,7 +67,7 @@ with client(name="client1>", log=log) as client1, client(
     if match.groups()[1]:
         client1.send(client1.command)
         client1.expect(prompt)
-    client1.send("DROP TABLE 01069_window_view_proc_tumble_watch.wv NO DELAY")
+    client1.send("DROP TABLE 01069_window_view_proc_tumble_watch.wv SYNC")
     client1.expect(prompt)
     client1.send("DROP TABLE 01069_window_view_proc_tumble_watch.mt")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01070_window_view_watch_events.py b/tests/queries/0_stateless/01070_window_view_watch_events.py
index f8782e5e7ce..8aeff041cc1 100755
--- a/tests/queries/0_stateless/01070_window_view_watch_events.py
+++ b/tests/queries/0_stateless/01070_window_view_watch_events.py
@@ -20,6 +20,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
+    client1.send("SET allow_experimental_analyzer = 0")
+    client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
     client1.send("SET window_view_heartbeat_interval = 1")
@@ -29,9 +31,9 @@ with client(name="client1>", log=log) as client1, client(
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01070_window_view_watch_events")
     client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS 01070_window_view_watch_events.mt NO DELAY")
+    client1.send("DROP TABLE IF EXISTS 01070_window_view_watch_events.mt SYNC")
     client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS 01070_window_view_watch_events.wv NO DELAY")
+    client1.send("DROP TABLE IF EXISTS 01070_window_view_watch_events.wv SYNC")
     client1.expect(prompt)
 
     client1.send(
@@ -63,7 +65,7 @@ with client(name="client1>", log=log) as client1, client(
     if match.groups()[1]:
         client1.send(client1.command)
         client1.expect(prompt)
-    client1.send("DROP TABLE 01070_window_view_watch_events.wv NO DELAY;")
+    client1.send("DROP TABLE 01070_window_view_watch_events.wv SYNC;")
     client1.expect(prompt)
     client1.send("DROP TABLE 01070_window_view_watch_events.mt;")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01071_live_view_detach_dependency.sql b/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
deleted file mode 100644
index 1caab4ca240..00000000000
--- a/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-DROP TABLE IF EXISTS test;
-DROP TABLE IF EXISTS lv;
-CREATE TABLE test (n Int8) ENGINE = Memory;
-CREATE LIVE VIEW lv AS SELECT * FROM test;
-DETACH TABLE lv;
-INSERT INTO test VALUES (42);
-DROP TABLE test;
-ATTACH TABLE lv;
-DROP TABLE lv;
diff --git a/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh b/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh
index 263dd5597c4..f1d426228cf 100755
--- a/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh
+++ b/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS info;
@@ -29,11 +33,11 @@ INSERT INTO mt VALUES (1, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE info"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE info"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql b/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
index 85c239765bc..24eaaacb8bd 100644
--- a/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
+++ b/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
@@ -16,16 +16,16 @@ select * from dist_01072 where key=toInt32OrZero(toString(xxHash64(0)));
 select * from dist_01072 where key=toInt32(xxHash32(0));
 select * from dist_01072 where key=toInt32(toInt32(xxHash32(0)));
 select * from dist_01072 where key=toInt32(toInt32(toInt32(xxHash32(0))));
-select * from dist_01072 where key=value; -- { serverError 507; }
-select * from dist_01072 where key=toInt32(value); -- { serverError 507; }
+select * from dist_01072 where key=value; -- { serverError 507 }
+select * from dist_01072 where key=toInt32(value); -- { serverError 507 }
 select * from dist_01072 where key=value settings force_optimize_skip_unused_shards=0;
 select * from dist_01072 where key=toInt32(value) settings force_optimize_skip_unused_shards=0;
 
 drop table dist_01072;
 create table dist_01072 (key Int, value Nullable(Int), str String) Engine=Distributed(test_cluster_two_shards, currentDatabase(), data_01072, key%2);
 select * from dist_01072 where key=toInt32(xxHash32(0));
-select * from dist_01072 where key=value; -- { serverError 507; }
-select * from dist_01072 where key=toInt32(value); -- { serverError 507; }
+select * from dist_01072 where key=value; -- { serverError 507 }
+select * from dist_01072 where key=toInt32(value); -- { serverError 507 }
 select * from dist_01072 where key=value settings force_optimize_skip_unused_shards=0;
 select * from dist_01072 where key=toInt32(value) settings force_optimize_skip_unused_shards=0;
 
@@ -34,16 +34,16 @@ set allow_suspicious_low_cardinality_types=1;
 drop table dist_01072;
 create table dist_01072 (key Int, value LowCardinality(Int), str String) Engine=Distributed(test_cluster_two_shards, currentDatabase(), data_01072, key%2);
 select * from dist_01072 where key=toInt32(xxHash32(0));
-select * from dist_01072 where key=value; -- { serverError 507; }
-select * from dist_01072 where key=toInt32(value); -- { serverError 507; }
+select * from dist_01072 where key=value; -- { serverError 507 }
+select * from dist_01072 where key=toInt32(value); -- { serverError 507 }
 select * from dist_01072 where key=value settings force_optimize_skip_unused_shards=0;
 select * from dist_01072 where key=toInt32(value) settings force_optimize_skip_unused_shards=0;
 
 drop table dist_01072;
 create table dist_01072 (key Int, value LowCardinality(Nullable(Int)), str String) Engine=Distributed(test_cluster_two_shards, currentDatabase(), data_01072, key%2);
 select * from dist_01072 where key=toInt32(xxHash32(0));
-select * from dist_01072 where key=value; -- { serverError 507; }
-select * from dist_01072 where key=toInt32(value); -- { serverError 507; }
+select * from dist_01072 where key=value; -- { serverError 507 }
+select * from dist_01072 where key=toInt32(value); -- { serverError 507 }
 select * from dist_01072 where key=value settings force_optimize_skip_unused_shards=0;
 select * from dist_01072 where key=toInt32(value) settings force_optimize_skip_unused_shards=0;
 
diff --git a/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh b/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh
index 4a228abaded..062ecf648a7 100755
--- a/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh
+++ b/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh
@@ -1,11 +1,16 @@
 #!/usr/bin/env bash
-# Tags: no-random-settings, no-parallel
+# Tags: no-random-settings, no-fasttest, no-parallel
+# For unknown reason this test is flaky without no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -13,17 +18,17 @@ DROP TABLE IF EXISTS wv;
 
 CREATE TABLE dst(time DateTime, colA String, colB String) Engine=MergeTree ORDER BY tuple();
 CREATE TABLE mt(colA String, colB String) ENGINE=MergeTree ORDER BY tuple();
-CREATE WINDOW VIEW wv TO dst AS SELECT tumbleStart(w_id) AS time, colA, colB FROM mt GROUP BY tumble(now(), INTERVAL '10' SECOND, 'US/Samoa') AS w_id, colA, colB;
+CREATE WINDOW VIEW wv TO dst AS SELECT tumbleStart(w_id) AS time, colA, colB FROM mt GROUP BY tumble(now('US/Samoa'), INTERVAL '10' SECOND, 'US/Samoa') AS w_id, colA, colB;
 
 INSERT INTO mt VALUES ('test1', 'test2');
 EOF
 
 for _ in {1..100}; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
 	sleep .5
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT colA, colB FROM dst"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT colA, colB FROM dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh b/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh
index 0845be093d5..b2a98897aff 100755
--- a/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh
+++ b/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -26,10 +30,10 @@ CREATE WINDOW VIEW wv TO dst WATERMARK=ASCENDING POPULATE AS SELECT count(a) AS
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "7" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "7" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SELECT * FROM dst ORDER BY market, w_end;
 INSERT INTO mt VALUES (1, 8, '1990/01/01 12:00:35');
 INSERT INTO mt VALUES (1, 8, '1990/01/01 12:00:37');
@@ -38,11 +42,11 @@ SELECT '------';
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "9" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "9" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
 
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh b/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh
index b8933060f12..5f169920dee 100755
--- a/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh
+++ b/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS info;
@@ -30,11 +34,11 @@ CREATE WINDOW VIEW wv TO dst WATERMARK=ASCENDING POPULATE AS SELECT count(a) AS
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE info"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE info"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh b/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh
index a0bdf32b134..f7842af4dad 100755
--- a/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh
+++ b/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -19,11 +23,11 @@ CREATE WINDOW VIEW wv TO dst POPULATE AS SELECT count(a) AS count, tumbleEnd(wid
 EOF
 
 for _ in {1..100}; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "1" && echo 'OK' && break
 	sleep .5
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT count FROM dst"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count FROM dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01076_window_view_alter_query_to.sh b/tests/queries/0_stateless/01076_window_view_alter_query_to.sh
index 039b9791728..11c126ea6de 100755
--- a/tests/queries/0_stateless/01076_window_view_alter_query_to.sh
+++ b/tests/queries/0_stateless/01076_window_view_alter_query_to.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -23,13 +27,13 @@ INSERT INTO mt VALUES (1, 5, '1990/01/01 12:00:06');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 ALTER TABLE wv MODIFY QUERY SELECT count(a) AS count, mt.market * 2 as market, tumbleEnd(wid) AS w_end FROM mt GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, mt.market;
 
 INSERT INTO mt VALUES (1, 6, '1990/01/01 12:00:10');
@@ -38,10 +42,10 @@ INSERT INTO mt VALUES (1, 8, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "5" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "5" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh b/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh
index 420bfd5bb47..17c28e2daf5 100755
--- a/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh
+++ b/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS mt2;
@@ -25,13 +29,13 @@ INSERT INTO mt VALUES (1, 5, '1990/01/01 12:00:06');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 ALTER TABLE wv MODIFY QUERY SELECT count(a) AS count, mt2.market * 2 as market, tumbleEnd(wid) AS w_end FROM mt2 GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, mt2.market;
 
 INSERT INTO mt2 VALUES (1, 6, '1990/01/01 12:00:10');
@@ -40,11 +44,11 @@ INSERT INTO mt2 VALUES (1, 8, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "5" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "5" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt2"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt2"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01078_window_view_alter_query_watch.py b/tests/queries/0_stateless/01078_window_view_alter_query_watch.py
index 8314db8081e..c32e508c5a5 100755
--- a/tests/queries/0_stateless/01078_window_view_alter_query_watch.py
+++ b/tests/queries/0_stateless/01078_window_view_alter_query_watch.py
@@ -20,6 +20,8 @@ with client(name="client1>", log=log) as client1, client(
     client2.expect(prompt)
     client3.expect(prompt)
 
+    client1.send("SET allow_experimental_analyzer = 0")
+    client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
     client1.send("SET window_view_heartbeat_interval = 1")
@@ -33,9 +35,9 @@ with client(name="client1>", log=log) as client1, client(
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01078_window_view_alter_query_watch")
     client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS 01078_window_view_alter_query_watch.mt NO DELAY")
+    client1.send("DROP TABLE IF EXISTS 01078_window_view_alter_query_watch.mt SYNC")
     client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS 01078_window_view_alter_query_watch.wv NO DELAY")
+    client1.send("DROP TABLE IF EXISTS 01078_window_view_alter_query_watch.wv SYNC")
     client1.expect(prompt)
 
     client1.send(
@@ -87,7 +89,7 @@ with client(name="client1>", log=log) as client1, client(
     if match.groups()[1]:
         client3.send(client3.command)
         client3.expect(prompt)
-    client3.send("DROP TABLE 01078_window_view_alter_query_watch.wv NO DELAY;")
+    client3.send("DROP TABLE 01078_window_view_alter_query_watch.wv SYNC;")
     client3.expect(prompt)
     client3.send("DROP TABLE 01078_window_view_alter_query_watch.mt;")
     client3.expect(prompt)
diff --git a/tests/queries/0_stateless/01079_new_range_reader_segfault.sql b/tests/queries/0_stateless/01079_new_range_reader_segfault.sql
index 9c3f073c72f..804d4316ea8 100644
--- a/tests/queries/0_stateless/01079_new_range_reader_segfault.sql
+++ b/tests/queries/0_stateless/01079_new_range_reader_segfault.sql
@@ -6,6 +6,6 @@ create table t (a Int) engine = MergeTree order by a;
 insert into t select number < 20 ? 0 : 1 from numbers(50);
 alter table t add column s String default 'foo';
 
-select s from t prewhere a != 1 where rand() % 2 = 0 limit 1;
+select s from t prewhere a != 1 where rowNumberInBlock() % 2 = 0 limit 1;
 
 drop table t;
diff --git a/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh b/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh
index 1d47889ea1a..7747e343bfb 100755
--- a/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh
+++ b/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -25,10 +29,10 @@ INSERT INTO mt VALUES (1, 8, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "7" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "7" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh b/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh
index d393bc591bc..25576ff3c06 100755
--- a/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh
+++ b/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -25,10 +29,10 @@ INSERT INTO mt VALUES (1, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "6" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "6" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM dst ORDER BY w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01081_window_view_target_table_engine.sh b/tests/queries/0_stateless/01081_window_view_target_table_engine.sh
index b447706de8b..dea0e5a7ba0 100755
--- a/tests/queries/0_stateless/01081_window_view_target_table_engine.sh
+++ b/tests/queries/0_stateless/01081_window_view_target_table_engine.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
@@ -23,9 +27,9 @@ INSERT INTO mt VALUES (1, 8, toDateTime('1990/01/01 12:00:30', 'US/Samoa'));
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM wv" | grep -q "7" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM wv" | grep -q "7" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM wv ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM wv ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
diff --git a/tests/queries/0_stateless/01082_window_view_watch_limit.py b/tests/queries/0_stateless/01082_window_view_watch_limit.py
index b31c9ee8167..12c8d295591 100755
--- a/tests/queries/0_stateless/01082_window_view_watch_limit.py
+++ b/tests/queries/0_stateless/01082_window_view_watch_limit.py
@@ -19,6 +19,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
+    client1.send("SET allow_experimental_analyzer = 0")
+    client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
     client1.send("SET window_view_heartbeat_interval = 1")
@@ -30,7 +32,7 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client1.send("DROP TABLE IF EXISTS 01082_window_view_watch_limit.mt")
     client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS 01082_window_view_watch_limit.wv NO DELAY")
+    client1.send("DROP TABLE IF EXISTS 01082_window_view_watch_limit.wv SYNC")
     client1.expect(prompt)
 
     client1.send(
@@ -59,7 +61,7 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect("1 row" + end_of_block)
     client1.expect(prompt)
 
-    client1.send("DROP TABLE 01082_window_view_watch_limit.wv NO DELAY")
+    client1.send("DROP TABLE 01082_window_view_watch_limit.wv SYNC")
     client1.expect(prompt)
     client1.send("DROP TABLE 01082_window_view_watch_limit.mt")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01083_window_view_select.sh b/tests/queries/0_stateless/01083_window_view_select.sh
index cbcc472c127..ca9195aa00d 100755
--- a/tests/queries/0_stateless/01083_window_view_select.sh
+++ b/tests/queries/0_stateless/01083_window_view_select.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -25,11 +29,11 @@ INSERT INTO mt VALUES (1, 8, '1990/01/01 12:00:30');
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM wv" | grep -q "7" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM wv" | grep -q "7" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM wv ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="SELECT market FROM wv ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM wv ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT market FROM wv ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh b/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
index 76d19a4d488..d8a29be781d 100755
--- a/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
+++ b/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
@@ -23,9 +27,9 @@ INSERT INTO mt VALUES (1, 8, toDateTime('1990/01/01 12:00:30', 'US/Samoa'));
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM wv" | grep -q "7" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM wv" | grep -q "7" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM wv ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM wv ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
diff --git a/tests/queries/0_stateless/01085_window_view_attach.sql b/tests/queries/0_stateless/01085_window_view_attach.sql
index bb47e0dc6b9..051557a6a76 100644
--- a/tests/queries/0_stateless/01085_window_view_attach.sql
+++ b/tests/queries/0_stateless/01085_window_view_attach.sql
@@ -1,5 +1,6 @@
 -- Tags: no-parallel
 
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 
 DROP DATABASE IF EXISTS test_01085;
@@ -14,7 +15,7 @@ CREATE WINDOW VIEW test_01085.wv ENGINE Memory WATERMARK=ASCENDING AS SELECT cou
 
 SHOW tables FROM test_01085;
 
-DROP TABLE test_01085.wv NO DELAY;
+DROP TABLE test_01085.wv SYNC;
 SHOW tables FROM test_01085;
 
 CREATE WINDOW VIEW test_01085.wv ENGINE Memory WATERMARK=ASCENDING AS SELECT count(a) AS count, market, tumbleEnd(wid) AS w_end FROM test_01085.mt GROUP BY tumble(timestamp, INTERVAL '5' SECOND) AS wid, market;
@@ -25,5 +26,5 @@ SHOW tables FROM test_01085;
 ATTACH TABLE test_01085.wv;
 SHOW tables FROM test_01085;
 
-DROP TABLE test_01085.wv NO DELAY;
+DROP TABLE test_01085.wv SYNC;
 SHOW tables FROM test_01085;
diff --git a/tests/queries/0_stateless/01086_odbc_roundtrip.sh b/tests/queries/0_stateless/01086_odbc_roundtrip.sh
index 20066c6b34c..9e688d91b12 100755
--- a/tests/queries/0_stateless/01086_odbc_roundtrip.sh
+++ b/tests/queries/0_stateless/01086_odbc_roundtrip.sh
@@ -13,12 +13,15 @@ for _ in $(seq 1 10); do
     sleep 0.1
 done
 
-${CLICKHOUSE_CLIENT} --query "select count() > 1 as ok from (select * from odbc('DSN={ClickHouse DSN (Unicode)}','system','tables'))"
+# ODBC will do HEAD request because of progress bar
+# in normal situation, 501 will be returned and no Error is logged
+# but sometimes we get I/O broken pipe producing an Error log but it doesn't affect the run of the test
+${CLICKHOUSE_CLIENT} --query "select count() > 1 as ok from (select * from odbc('DSN={ClickHouse DSN (Unicode)}','system','tables'))" 2> >(grep -Fv "Failed to make HTTP_HEAD request")
 
 ${CLICKHOUSE_CLIENT} --query "CREATE TABLE t (x UInt8, y Float32, z String) ENGINE = Memory"
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO t VALUES (1,0.1,'a я'),(2,0.2,'b ą'),(3,0.3,'c d')"
 
-${CLICKHOUSE_CLIENT} --query "SELECT x, y, z FROM odbc('DSN={ClickHouse DSN (ANSI)}','$CLICKHOUSE_DATABASE','t') ORDER BY x"
-${CLICKHOUSE_CLIENT} --query "SELECT x, y, z FROM odbc('DSN={ClickHouse DSN (Unicode)}','$CLICKHOUSE_DATABASE','t') ORDER BY x"
+${CLICKHOUSE_CLIENT} --query "SELECT x, y, z FROM odbc('DSN={ClickHouse DSN (ANSI)}','$CLICKHOUSE_DATABASE','t') ORDER BY x" 2> >(grep -Fv "Failed to make HTTP_HEAD request")
+${CLICKHOUSE_CLIENT} --query "SELECT x, y, z FROM odbc('DSN={ClickHouse DSN (Unicode)}','$CLICKHOUSE_DATABASE','t') ORDER BY x" 2> >(grep -Fv "Failed to make HTTP_HEAD request")
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE t"
diff --git a/tests/queries/0_stateless/01086_window_view_cleanup.sh b/tests/queries/0_stateless/01086_window_view_cleanup.sh
index c85455616e1..b078b4718c0 100755
--- a/tests/queries/0_stateless/01086_window_view_cleanup.sh
+++ b/tests/queries/0_stateless/01086_window_view_cleanup.sh
@@ -5,7 +5,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --allow_deprecated_database_ordinary=1 --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --allow_deprecated_database_ordinary=1 --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 SET window_view_clean_interval = 1;
 
@@ -24,19 +28,19 @@ INSERT INTO test_01086.mt VALUES (1, 5, toDateTime('1990/01/01 12:00:06', 'US/Sa
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM test_01086.\`.inner.wv\`" | grep -q "5" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM test_01086.\`.inner.wv\`" | grep -q "5" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT sleep(2);"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT sleep(2);"
 
-$CLICKHOUSE_CLIENT --query="INSERT INTO test_01086.mt VALUES (1, 6, toDateTime('1990/01/01 12:00:11', 'US/Samoa'));"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="INSERT INTO test_01086.mt VALUES (1, 6, toDateTime('1990/01/01 12:00:11', 'US/Samoa'));"
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM test_01086.\`.inner.wv\`" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM test_01086.\`.inner.wv\`" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT market, wid FROM test_01086.\`.inner.wv\` ORDER BY market, \`windowID(timestamp, toIntervalSecond('5'), 'US/Samoa')\` as wid";
-$CLICKHOUSE_CLIENT --query="DROP TABLE test_01086.wv NO DELAY;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE test_01086.mt NO DELAY;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE test_01086.dst NO DELAY;"
-$CLICKHOUSE_CLIENT --query="DROP DATABASE test_01086 NO DELAY;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT market, wid FROM test_01086.\`.inner.wv\` ORDER BY market, \`windowID(timestamp, toIntervalSecond('5'), 'US/Samoa')\` as wid";
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE test_01086.wv SYNC;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE test_01086.mt SYNC;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE test_01086.dst SYNC;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP DATABASE test_01086 SYNC;"
diff --git a/tests/queries/0_stateless/01087_storage_generate.reference b/tests/queries/0_stateless/01087_storage_generate.reference
index 00ea8ac914f..3b388d0e80f 100644
--- a/tests/queries/0_stateless/01087_storage_generate.reference
+++ b/tests/queries/0_stateless/01087_storage_generate.reference
@@ -1,103 +1,103 @@
 100
 -
-[]	-54259.6828	('2088-03-01 13:26:24.094','d3c2a216-a98c-d56c-7bf7-62de9f264cf4')
-[88]	34528.4014	('2031-12-08 21:40:39.898','9ef777c8-de0e-d25e-e16c-5b624f88523c')
-[-1]	121968.7945	('2060-02-05 06:18:12.011','7655e515-d2ca-2f06-0950-e4f44f69aca7')
-[-103,75]	-135033.4349	('2038-12-19 17:38:58.695','86b57d15-292d-2517-9acf-47cd053e7a3a')
-[110]	-202668.69	('2009-06-17 21:53:29.808','bc630f78-7d58-0c46-dd4b-27fc35625e96')
-[-22,2]	168636.9728	('2074-09-03 06:20:20.936','7624ce27-9bff-4e9d-3f18-6851a97dd0ca')
-[-22,-62]	-75192.4989	('2085-10-11 18:51:12.855','a4c4d0ed-f448-244e-1723-ca1bba816f2b')
-[-2,-90]	133592.5064	('2010-10-28 17:18:04.633','8ba9103b-f90c-b49b-38c1-223ae5f42bf7')
-[-94,80]	197330.6359	('2024-03-30 19:08:45.772','83442013-3677-5097-065d-72dfbe8a3506')
-[23]	167557.6237	('2078-07-25 18:54:42.480','be14d98e-5b24-54ee-c959-d24fa9a58fdd')
-[46,-10,-63]	185107.1979	('2040-10-07 03:06:53.504','5ed1fe6a-9313-41d7-4bf9-3948e961509f')
-[-107,68]	-163781.3045	('2021-12-21 16:18:58.933','7b634f19-0863-829e-484b-be288aab54a1')
-[-35,-116,73]	-203577.5379	('2093-08-01 17:21:09.407','d371bad4-b098-ffdd-f84c-6a02390c2939')
-[61]	152284.9386	('2089-12-20 16:21:33.149','9e8426c1-278a-4d9c-4076-364a95b065e3')
-[75]	170968.4171	('2020-07-17 12:45:31.975','47397a81-bda7-8bd9-59f7-d60e2204fe99')
-[-115,93]	-173740.5652	('2098-04-25 19:10:33.327','117e31dd-102e-ee6c-0dbd-0a4203c18ca5')
-[-20,4,21]	63834.8685	('2000-07-08 14:09:40.271','10b0fa48-55a3-755a-4a44-36315ae04c1c')
-[-110,117,91]	-160640.1506	('1998-04-18 06:58:04.479','6dfa3a8e-6e65-543c-5f50-1ff45835aa5a')
-[62]	63817.7977	('2043-01-23 23:07:18.972','98b8ef31-4f65-2f8b-1ea7-b1473900099e')
-[-2]	-175477.0173	('2007-01-16 04:46:14.781','ec92f616-6e1f-003a-54c6-c5f9118d2f1b')
-[]	197663.3035	('2046-06-30 14:04:56.788','fb3244a4-8af2-104f-2a6f-25a7b7b9a112')
-[-24]	-174299.4691	('2058-02-23 11:50:58.839','d63ee868-fa93-bf8b-0264-8ebbceb13e3b')
-[95,38]	-65083.7371	('2015-03-10 10:33:16.429','47bd199c-f99e-51ea-84e9-b65cce9d167c')
-[91,110,72]	130908.9643	('2036-03-16 12:17:53.679','0dd4ca31-1e09-d7e0-f3df-60cad3cfa805')
-[]	208972.3779	('2034-03-05 19:29:21.994','1069d77c-dfd2-912e-60b8-3c5b964f7e11')
-[-32]	167938.505	('2093-09-10 17:39:39.050','9d1025b6-2d0c-1d84-dafd-02668eb29270')
-[]	153744.6987	('2088-10-02 08:02:11.024','a88e6cb7-2210-5ce5-6bcf-24afc0eca5b6')
-[67]	-74220.665	('2074-12-30 15:43:40.817','68096065-18c8-8aca-fd21-15330ead669d')
-[6]	66759.8938	('2091-09-01 16:07:18.219','bb14f4cc-0b54-9a8c-e835-71333b28c03b')
-[-28,-82,9]	168625.3131	('2002-03-20 18:02:30.321','405bb877-6e28-8b91-cb62-bd82a3fa797c')
-[]	-19760.167	('2044-11-08 04:52:03.325','13769348-9e58-0e75-3972-8bbadc150715')
-[]	160663.7797	('2025-04-12 10:17:53.501','e6370321-94f5-97e6-0348-a84e72ff5b42')
-[-17,18]	99105.9856	('1972-05-01 09:23:11.688','02618b9e-97cd-4698-d2e8-3f52f4c5a09a')
-[86,77]	-116990.3914	('1981-12-31 02:06:54.198','3ac42bb4-8652-b1a8-10bb-98f0337261f8')
-[-109,69,-63]	-151527.3587	('2001-01-17 08:19:56.504','77fe7ee2-f279-2855-bfd2-a7d7cee678cc')
-[]	-57762.3928	('1978-08-16 15:47:37.660','ab9a110a-fd8d-3c4c-5a49-34c2005536ce')
-[-77]	107274.6407	('2017-01-12 09:03:02.657','c1ad4f17-cc54-45f3-9410-9c1011653f6d')
-[]	107133.641	('2050-10-05 03:29:27.154','36e576aa-c77f-994e-1925-4a4c40da3a0f')
-[]	46672.2176	('2094-01-21 17:25:39.144','e9ba850d-604e-bc7d-417c-1078e89d4615')
-[-87,-122,-65]	-86258.4663	('2081-06-17 00:37:45.498','64795221-9719-7937-b4d2-be5f30065ece')
-[-53]	-48672.1424	('1992-06-27 13:27:23.602','7c67bc31-c7bb-6197-fdca-f73329b976f2')
-[34]	-108954.782	('2096-07-03 20:06:30.632','9c1b37d7-4ced-9428-a0ae-34c5436b14c4')
-[]	-168124.2364	('1987-06-03 02:47:12.945','d1c39af4-f920-5095-b8e2-0f878950167b')
-[]	-112431.4799	('2021-07-26 04:04:58.527','da07a72d-7e1f-8890-4c4b-326835d11b39')
-[-35,-95,58]	-181254.9139	('2086-11-12 14:17:14.473','22f74d0b-dfc0-3f7a-33f4-8055d8fa7846')
-[98,119]	11468.5238	('2092-02-25 08:07:07.695','a1fb97bf-1885-6715-c233-b88a6cd111e4')
-[]	82333.8963	('1989-11-22 22:38:57.012','a2b82b5b-8331-555c-579b-de4b0eeb7e81')
-[-5,-66,69]	32055.8376	('2040-12-17 13:49:08.704','4537d25e-a2db-ea9a-8e24-a16ed7e0c6e4')
-[81,-84,-24]	-210815.2512	('2047-06-09 10:30:06.922','ac3c5b5f-f977-2830-c398-d10a6076a498')
-[84,-105]	-175413.7733	('1998-11-03 01:30:21.191','c535feac-1943-c0a1-23f0-645d5406db24')
-[58,31]	-335.8512	('1973-07-09 09:21:10.444','24a7dd3d-2565-1de3-05d9-e45fd8ba7729')
-[-49,-47]	177399.2836	('2049-03-15 12:33:00.190','e4432b9b-61e9-d451-dc87-ae3b9da6fd35')
-[]	211525.2349	('2106-01-11 07:44:18.918','23315435-7132-05b5-5a9b-c2c738433a87')
-[45,-95,-39]	-15314.9732	('2055-10-29 10:51:12.182','833b2efa-8c72-f5f6-3040-cb4831e8ceb9')
-[]	213384.5774	('2067-02-10 19:02:42.113','0cd7f438-caa7-0d21-867c-1fdb6d67d797')
-[99]	-147316.5599	('2000-05-09 17:37:34.776','a3ea6796-38d5-72ff-910d-8b4300831916')
-[]	8828.2471	('1993-11-30 13:53:22.503','7209213f-38bb-cfed-1955-f1fad5a9577a')
-[117,9,-35]	-134812.6269	('2065-09-04 20:47:26.589','d33d0d6f-b9c0-2850-4593-cfc9f1e20a4d')
-[-35,-58,-101]	-9101.5369	('2023-08-24 17:56:11.695','87fbe3f9-b1f0-c030-a4c0-8662045923b4')
-[-58,87]	122510.9099	('2019-08-09 14:40:29.849','c1d3a2cc-878f-c2c3-4a0b-10e98cda8b4a')
-[4,19,58]	-13496.8672	('2027-05-01 06:11:48.659','8996ae31-d670-cbfe-b735-b16b7c3b3476')
-[23,-75,-89]	-51218.286	('2010-06-01 22:49:03.396','d32b8b61-cc3e-31fa-2a2a-abefa60bfcee')
-[50]	-45297.4315	('2087-04-15 03:46:08.247','04fe9603-97fc-07a4-6248-0f21e408c884')
-[-23,17,63]	89185.9462	('2065-10-26 05:27:12.817','a5fbf764-70b4-8b65-4a8f-7550abca3859')
-[-6]	-129925.369	('2013-11-05 03:44:45.233','11db26b3-e2b5-b9fa-6b0e-79c43a2e67ab')
-[-72,-108]	203171.5475	('2000-01-28 06:34:58.032','14d5399e-7949-20c7-0e47-85e2fce5836c')
-[-73,34,-27]	2676.7265	('2057-10-25 11:37:10.049','00049a92-4350-badb-3764-dd7f019b9b31')
-[65,-7]	-153472.9461	('1973-04-11 23:34:41.245','e0a0324d-1552-d11e-f3a5-fbd822d206c5')
-[]	81837.7838	('2041-09-20 17:56:39.712','f7923f2c-e526-1706-79b9-58045d9deaa7')
-[-113,8]	173192.6905	('2066-04-02 06:59:59.356','e3013e5c-92e3-c03c-b57a-e1939e00a1a7')
-[107]	9694.1102	('1984-11-02 10:11:34.034','e973db18-07b7-2117-f3ba-e7002adfa939')
-[]	-76460.9664	('2051-02-10 06:54:42.143','b8344c22-9e8a-7052-c644-9c3e5989cdf1')
-[59,59,0]	27041.7606	('2083-02-17 15:21:22.547','4d6b137b-a3e1-f36d-2c0c-c8d718dda388')
-[-114]	133673.963	('2005-10-02 16:34:27.452','04785b75-30e5-af8b-547e-d15bcb7f49fb')
-[43]	-169861.2	('2006-12-13 06:26:13.923','cb865d38-d961-d7f9-acbb-583b9f31252f')
-[]	197115.2174	('2060-04-08 01:17:00.488','0f26c4b4-b24c-1fd5-c619-31bcf71a4831')
-[-25]	-200081.9506	('2055-12-24 23:30:16.276','0b32ad69-2c84-4269-9718-e3171482878a')
-[14,110]	-40196.4463	('2084-08-13 16:37:07.588','ed882071-acba-b3ab-5d77-d79a9544a834')
-[-62,-71,-82]	-154958.9747	('2100-07-07 23:32:53.741','7711c7c1-0d22-e302-fc86-61ef5e68db96')
-[96,-114,-101]	78910.332	('2100-07-19 12:02:27.109','756bfd26-c4b3-94b8-e991-c7ab7a833b76')
-[49]	80117.2267	('1970-07-04 00:50:56.748','aebac019-9054-4a77-2ccd-8801fc4a7496')
-[]	102078.4801	('2055-01-06 22:22:33.624','21f2e59a-a1ca-5df3-27fd-aa95456cfbe5')
-[-106]	-108728.4237	('2020-05-27 08:56:18.121','6b7b6674-9342-2360-4cc0-f7ef8a2404de')
-[]	173213.5631	('2034-01-18 16:04:16.059','2dc0038d-67c1-f0ee-280b-f3f0f536b01a')
-[42]	139872.2503	('2001-07-16 07:09:28.754','d6487da6-1077-1053-f314-9a1079f5df15')
-[]	1107.5244	('2031-02-26 12:06:00.846','b32bee8f-85b7-3c71-bb24-9a0093e6a08c')
-[]	85892.8913	('2088-04-13 11:54:18.514','84f3b59b-8d23-78a6-3032-91392344584f')
-[43]	-109644.2714	('1974-07-04 11:45:43.139','cf722ca8-15f5-6fe2-997c-0cf88e95e902')
-[]	212557.3762	('2069-03-03 04:21:08.439','9e676cac-36e6-2962-f7b1-578214f0dfbd')
-[-128,55]	80471.0777	('1970-04-01 15:54:40.257','ca358854-416b-9c95-0b9b-c7fed7bb7cb5')
-[-30,-54]	-132205.4512	('2017-12-15 19:54:15.750','3558faa4-2d2f-c533-437f-1e03d3600f1d')
-[-116,-72]	-91499.667	('2105-09-23 18:06:17.755','07bb6e47-3234-c268-40d7-332388dc06f8')
-[]	-201636.5228	('2085-01-27 04:54:42.717','86c3bdc3-ff0f-1723-07c2-845aa3c02370')
-[-103,-39]	44330.7722	('2064-07-02 08:08:28.068','0869c79d-6bdd-5d2d-a3d1-ffe13f6aa810')
-[99]	-31035.5391	('2093-07-25 22:50:23.026','aeb59338-254f-dc09-fbd7-263da415e211')
-[101]	157961.4729	('2036-05-03 23:35:07.845','8b6221a9-8dad-4655-7460-6b3031b06893')
-[111]	84732.4403	('1997-04-06 12:10:18.624','08806a79-59f4-c833-eedc-a200bb851767')
-[9,-48]	-190491.559	('2031-11-03 16:47:03.757','914e6166-c96e-e0e4-101a-0bb516cf5a2f')
-[-41]	-132501.8311	('2089-11-21 18:38:28.848','6de6cc8d-3c49-641e-fb12-87ed5ecb97b0')
-[77]	64903.6579	('1985-04-17 13:08:03.998','26484b8a-f3f1-587f-7777-bc7a57a689c3')
+[]	-54259.6828	('1973-07-09 09:21:10.444','9d1025b6-2d0c-1d84-dafd-02668eb29270')
+[88]	21968.7945	('2049-03-15 12:33:00.190','a88e6cb7-2210-5ce5-6bcf-24afc0eca5b6')
+[-1]	-2668.69	('2106-01-11 07:44:18.918','68096065-18c8-8aca-fd21-15330ead669d')
+[-103,75]	-75192.4989	('2055-10-29 10:51:12.182','bb14f4cc-0b54-9a8c-e835-71333b28c03b')
+[110]	97330.6359	('2067-02-10 19:02:42.113','405bb877-6e28-8b91-cb62-bd82a3fa797c')
+[-22,2]	85107.1979	('2000-05-09 17:37:34.776','13769348-9e58-0e75-3972-8bbadc150715')
+[-22,-62]	-3577.5379	('1993-11-30 13:53:22.503','e6370321-94f5-97e6-0348-a84e72ff5b42')
+[-2,-90]	70968.4171	('2065-09-04 20:47:26.589','02618b9e-97cd-4698-d2e8-3f52f4c5a09a')
+[-94,80]	63834.8685	('2023-08-24 17:56:11.695','3ac42bb4-8652-b1a8-10bb-98f0337261f8')
+[23]	63817.7977	('2019-08-09 14:40:29.849','77fe7ee2-f279-2855-bfd2-a7d7cee678cc')
+[46,-10,-63]	97663.3035	('2027-05-01 06:11:48.659','ab9a110a-fd8d-3c4c-5a49-34c2005536ce')
+[-107,68]	-65083.7371	('2010-06-01 22:49:03.396','c1ad4f17-cc54-45f3-9410-9c1011653f6d')
+[-35,-116,73]	8972.3779	('2087-04-15 03:46:08.247','36e576aa-c77f-994e-1925-4a4c40da3a0f')
+[61]	53744.6987	('2065-10-26 05:27:12.817','e9ba850d-604e-bc7d-417c-1078e89d4615')
+[75]	66759.8938	('2013-11-05 03:44:45.233','64795221-9719-7937-b4d2-be5f30065ece')
+[-115,93]	-19760.167	('2000-01-28 06:34:58.032','7c67bc31-c7bb-6197-fdca-f73329b976f2')
+[-20,4,21]	99105.9856	('2057-10-25 11:37:10.049','9c1b37d7-4ced-9428-a0ae-34c5436b14c4')
+[-110,117,91]	-51527.3587	('1973-04-11 23:34:41.245','d1c39af4-f920-5095-b8e2-0f878950167b')
+[62]	7274.6407	('2041-09-20 17:56:39.712','da07a72d-7e1f-8890-4c4b-326835d11b39')
+[-2]	46672.2176	('2066-04-02 06:59:59.356','22f74d0b-dfc0-3f7a-33f4-8055d8fa7846')
+[]	-48672.1424	('1984-11-02 10:11:34.034','a1fb97bf-1885-6715-c233-b88a6cd111e4')
+[-24]	-68124.2364	('2051-02-10 06:54:42.143','a2b82b5b-8331-555c-579b-de4b0eeb7e81')
+[95,38]	-81254.9139	('2083-02-17 15:21:22.547','4537d25e-a2db-ea9a-8e24-a16ed7e0c6e4')
+[91,110,72]	82333.8963	('2005-10-02 16:34:27.452','ac3c5b5f-f977-2830-c398-d10a6076a498')
+[]	-10815.2512	('2006-12-13 06:26:13.923','c535feac-1943-c0a1-23f0-645d5406db24')
+[-32]	-335.8512	('2060-04-08 01:17:00.488','24a7dd3d-2565-1de3-05d9-e45fd8ba7729')
+[]	11525.2349	('2055-12-24 23:30:16.276','e4432b9b-61e9-d451-dc87-ae3b9da6fd35')
+[67]	13384.5774	('2084-08-13 16:37:07.588','23315435-7132-05b5-5a9b-c2c738433a87')
+[6]	8828.2471	('2100-07-07 23:32:53.741','833b2efa-8c72-f5f6-3040-cb4831e8ceb9')
+[-28,-82,9]	-9101.5369	('2100-07-19 12:02:27.109','0cd7f438-caa7-0d21-867c-1fdb6d67d797')
+[]	-13496.8672	('1970-07-04 00:50:56.748','a3ea6796-38d5-72ff-910d-8b4300831916')
+[]	-45297.4315	('2055-01-06 22:22:33.624','7209213f-38bb-cfed-1955-f1fad5a9577a')
+[-17,18]	-29925.369	('2020-05-27 08:56:18.121','d33d0d6f-b9c0-2850-4593-cfc9f1e20a4d')
+[86,77]	2676.7265	('2034-01-18 16:04:16.059','87fbe3f9-b1f0-c030-a4c0-8662045923b4')
+[-109,69,-63]	81837.7838	('2001-07-16 07:09:28.754','c1d3a2cc-878f-c2c3-4a0b-10e98cda8b4a')
+[]	9694.1102	('2031-02-26 12:06:00.846','8996ae31-d670-cbfe-b735-b16b7c3b3476')
+[-77]	27041.7606	('2088-04-13 11:54:18.514','d32b8b61-cc3e-31fa-2a2a-abefa60bfcee')
+[]	-69861.2	('1974-07-04 11:45:43.139','04fe9603-97fc-07a4-6248-0f21e408c884')
+[]	-81.9506	('2069-03-03 04:21:08.439','a5fbf764-70b4-8b65-4a8f-7550abca3859')
+[-87,-122,-65]	-54958.9747	('1970-04-01 15:54:40.257','11db26b3-e2b5-b9fa-6b0e-79c43a2e67ab')
+[-53]	80117.2267	('2017-12-15 19:54:15.750','14d5399e-7949-20c7-0e47-85e2fce5836c')
+[34]	-8728.4237	('2105-09-23 18:06:17.755','00049a92-4350-badb-3764-dd7f019b9b31')
+[]	39872.2503	('2085-01-27 04:54:42.717','e0a0324d-1552-d11e-f3a5-fbd822d206c5')
+[]	85892.8913	('2064-07-02 08:08:28.068','f7923f2c-e526-1706-79b9-58045d9deaa7')
+[-35,-95,58]	12557.3762	('2093-07-25 22:50:23.026','e3013e5c-92e3-c03c-b57a-e1939e00a1a7')
+[98,119]	-32205.4512	('2036-05-03 23:35:07.845','e973db18-07b7-2117-f3ba-e7002adfa939')
+[]	-1636.5228	('1997-04-06 12:10:18.624','b8344c22-9e8a-7052-c644-9c3e5989cdf1')
+[-5,-66,69]	-31035.5391	('2031-11-03 16:47:03.757','4d6b137b-a3e1-f36d-2c0c-c8d718dda388')
+[81,-84,-24]	84732.4403	('2089-11-21 18:38:28.848','04785b75-30e5-af8b-547e-d15bcb7f49fb')
+[84,-105]	-32501.8311	('1985-04-17 13:08:03.998','cb865d38-d961-d7f9-acbb-583b9f31252f')
+[58,31]	95437.1166	('1977-06-10 06:40:13.164','0f26c4b4-b24c-1fd5-c619-31bcf71a4831')
+[-49,-47]	32232.0218	('2006-10-31 16:14:17.332','0b32ad69-2c84-4269-9718-e3171482878a')
+[]	-8085.7941	('1995-02-28 19:24:55.774','ed882071-acba-b3ab-5d77-d79a9544a834')
+[45,-95,-39]	-15528.0377	('2090-01-30 21:38:09.084','7711c7c1-0d22-e302-fc86-61ef5e68db96')
+[]	-26490.6032	('2064-06-06 03:33:21.798','756bfd26-c4b3-94b8-e991-c7ab7a833b76')
+[99]	35137.0312	('2029-05-20 02:21:06.599','aebac019-9054-4a77-2ccd-8801fc4a7496')
+[]	-35249.6041	('2103-07-16 18:29:01.847','21f2e59a-a1ca-5df3-27fd-aa95456cfbe5')
+[117,9,-35]	-20390.4167	('2051-04-04 01:10:56.314','6b7b6674-9342-2360-4cc0-f7ef8a2404de')
+[-35,-58,-101]	-86622.5332	('2056-01-31 05:30:53.382','2dc0038d-67c1-f0ee-280b-f3f0f536b01a')
+[-58,87]	-38301.9728	('1993-06-09 12:46:54.102','d6487da6-1077-1053-f314-9a1079f5df15')
+[4,19,58]	-19098.0416	('2046-03-01 07:58:38.749','b32bee8f-85b7-3c71-bb24-9a0093e6a08c')
+[23,-75,-89]	-57396.8139	('1994-03-07 15:06:46.346','84f3b59b-8d23-78a6-3032-91392344584f')
+[50]	15536.4639	('2101-06-20 20:16:49.230','cf722ca8-15f5-6fe2-997c-0cf88e95e902')
+[-23,17,63]	6790.5373	('2033-08-28 21:52:52.011','9e676cac-36e6-2962-f7b1-578214f0dfbd')
+[-6]	55706.5159	('2073-12-23 07:06:46.299','ca358854-416b-9c95-0b9b-c7fed7bb7cb5')
+[-72,-108]	-86272.6801	('2011-10-08 23:52:57.079','3558faa4-2d2f-c533-437f-1e03d3600f1d')
+[-73,34,-27]	99270.5967	('2100-01-02 21:12:36.759','07bb6e47-3234-c268-40d7-332388dc06f8')
+[65,-7]	-47051.3089	('2045-02-03 08:35:08.678','86c3bdc3-ff0f-1723-07c2-845aa3c02370')
+[]	-73019.898	('2031-11-03 03:51:00.078','0869c79d-6bdd-5d2d-a3d1-ffe13f6aa810')
+[-113,8]	69167.0269	('2100-08-12 02:10:36.637','aeb59338-254f-dc09-fbd7-263da415e211')
+[107]	20867.6436	('2032-05-30 20:42:14.359','8b6221a9-8dad-4655-7460-6b3031b06893')
+[]	-44814.8969	('2014-10-07 06:52:22.047','08806a79-59f4-c833-eedc-a200bb851767')
+[59,59,0]	5445.4157	('2089-11-28 09:02:07.006','914e6166-c96e-e0e4-101a-0bb516cf5a2f')
+[-114]	92856.7823	('2028-11-13 18:19:16.001','6de6cc8d-3c49-641e-fb12-87ed5ecb97b0')
+[43]	-2480.1718	('2102-05-21 16:10:28.701','26484b8a-f3f1-587f-7777-bc7a57a689c3')
+[]	-68249.3014	('2030-03-10 00:24:03.129','d2625c6e-dd01-7e12-e794-6601d4633dfc')
+[-25]	-96391.8384	('2079-01-14 14:29:39.356','125c0ffe-0cb6-c0ef-e4fe-cfa824d91cfc')
+[14,110]	99043.5601	('2102-02-06 00:40:42.723','0bcc2764-a09e-7707-df0d-ba8de2228488')
+[-62,-71,-82]	-19952.4405	('2003-12-28 16:25:30.841','b91d069b-8866-f2a5-37a6-d476cafcb331')
+[96,-114,-101]	-25989.8831	('2026-05-13 15:46:53.209','cbbd4ea9-a80c-642f-2650-977c8e56adff')
+[49]	-3848.9475	('2102-06-09 05:38:10.156','097a67d1-a39a-b133-03ab-304e954bcd95')
+[]	69635.1325	('2070-06-11 21:48:00.549','b9c6c1eb-2ee3-c50d-fb0f-05c7e06c77ce')
+[-106]	54574.7656	('2087-08-21 07:15:19.514','b6cc520e-a251-0027-6f4a-26b3a8fc47d1')
+[]	65529.215	('2011-07-24 06:41:14.268','bd1b3d45-44c7-f3c3-b521-5a42e095c66e')
+[42]	46705.3016	('2042-09-26 17:17:50.524','d3a14a33-e1c6-9c99-66cf-dd8a6b03bbfe')
+[]	54751.8012	('2048-12-26 02:02:23.706','ff698130-c509-0e1b-0a85-3989d6699004')
+[]	-84690.1759	('2063-10-25 19:01:38.315','8040b7c2-ef8f-b180-927f-4745e7a106c3')
+[43]	63776.0626	('2021-01-25 10:03:59.774','0aaf8333-b1ea-4d85-33e1-8c715179c161')
+[]	-7703.4808	('2001-05-12 17:53:23.514','047489f8-7294-e929-f98e-a2044d26ed22')
+[-128,55]	-23194.9926	('2099-09-18 07:04:58.395','3035f0bf-bda6-9307-90f6-a34378b20d6c')
+[-30,-54]	98203.9762	('2050-02-06 14:51:29.743','ccc3d3fd-64dc-65a1-61e1-384e83e3d641')
+[-116,-72]	-13519.4648	('1998-04-09 16:50:26.194','38810a09-9c5b-9a6f-4b4c-134aa551d6ba')
+[]	-6898.0943	('2099-09-13 20:00:52.619','255e9952-300f-0153-3a7f-8865d1b6683c')
+[-103,-39]	-52030.6657	('2047-10-28 16:47:28.315','385abde4-14d6-ed9e-bd01-e641dd0b5ed5')
+[99]	-42787.2791	('1996-10-22 16:24:52.458','e522d1ea-ffae-14f6-d95c-14dfdaf2eb83')
+[101]	-11540.4113	('1981-07-17 18:47:34.268','918f1eea-b5e7-b10b-96dd-47cdcd470a1a')
+[111]	71231.1796	('1997-05-16 14:19:48.064','28ae2849-7667-d36f-7010-fa020d71eb79')
+[9,-48]	68698.7488	('2078-03-06 02:00:34.565','3a37dc94-88d0-e885-8a2f-d37d135c5394')
+[-41]	-14738.4502	('2092-08-10 16:54:45.294','a629c44c-14ac-c7de-c6bc-a5eaac0063ed')
+[77]	-47644.5561	('2080-06-16 05:11:09.073','a46a60e2-c8ac-e8de-4b10-2a653c66c751')
 -
diff --git a/tests/queries/0_stateless/01087_table_function_generate.reference b/tests/queries/0_stateless/01087_table_function_generate.reference
index 53792bfb579..d6744ba0b33 100644
--- a/tests/queries/0_stateless/01087_table_function_generate.reference
+++ b/tests/queries/0_stateless/01087_table_function_generate.reference
@@ -94,16 +94,16 @@ Float32	Float64
 7.317837e-36	-1.6511853645079817e-21
 -
 Decimal(9, 4)	Decimal(18, 8)	Decimal(18, 8)
--18731.5032	81241713112.39967992	-10576027963457111164764.0798899532879521
-65289.5061	-27889310937.24180887	5807515838469365530027.7612329616030438
--197586.1517	-751754543.85331084	3835903211857734974086.0358362773591932
-183596.0063	8217353434.4196403	13633006218585943284268.9826084812209912
-73041.2674	-88881500366.49430454	-148702703925022894263.3187064158377476
-101454.4494	-27768337.71540858	-634829280961262229789.4961995996929358
--174012.0101	-13636289325.35403038	-3611949395160064991369.2765012316944096
-138203.8526	13556098030.08819271	134470734594381953531.9736002591779584
-15395.1766	-8047388876.97332962	16804394201271843589306.4234533639925009
-8569.7048	-49271659843.47126295	-14851374957489266092927.8687987539036841
+-18731.5032	-27768337.71540858	-9393543543230357843716.0041459374484681
+-97586.1517	-3636289325.35403038	3364376403318670133825.8224672630083466
+73041.2674	3556098030.08819271	-2446472555280036491886.6248666210495333
+-74012.0101	-8047388876.97332962	-1097064725002692978976.3763759594690971
+15395.1766	-9271659843.47126295	5428073503721506689195.250326552245674
+-93143.0664	-1797039080.46100129	-8559656833301969702973.2550203153949345
+46848.5225	-7332762471.23822513	6692780327859072322513.5175470507222506
+-85331.598	-7937795415.83578394	6508457918219676369805.8207979274851797
+-31470.8994	1482606444.06230976	-8371832329716119186316.4300878863977591
+32104.097	-9071727536.35797124	1491705856202199878279.4124322332399575
 -
 Tuple(Int32, Int64)
 (-187315032,8124171311239967992)
@@ -225,25 +225,25 @@ U6
 \'%Y~t9
 RL,{Xs\\tw
 -
-[]	-27467.1221	('2021-03-08 00:39:14.331','08ec773f-cded-8c46-727f-954768082cbf')
-[]	204013.7193	('2026-05-05 02:20:23.160','30f6d580-cb25-8d4f-f869-fc10128b3389')
-[-122]	-9432.2617	('2001-08-23 04:05:41.222','f7bf2154-78c3-8920-e4d3-a374e22998a4')
-[-30,61]	-133488.2399	('2048-05-14 06:05:06.021','a6af106c-b321-978b-fa79-338c9e342b5a')
-[-1]	58720.0591	('1976-06-07 20:26:18.162','fc038af0-ba31-8fdc-1847-37328ef161b0')
-[1]	-18736.7874	('1977-03-10 01:41:16.215','3259d377-a92d-3557-9045-4ad1294d55d5')
-[34,-10]	-99367.9009	('2031-05-08 07:00:41.084','0b38ebc5-20a6-be3d-8543-23ce3546f49c')
-[110]	31562.7502	('2045-02-27 08:46:14.976','74116384-cb3e-eb00-0102-fb30ddea5d5f')
-[114]	-84125.1554	('2023-06-06 03:55:06.492','bf9ab359-ef9f-ad11-7e6c-160368b1e5ea')
-[124]	-114719.5228	('2010-11-11 19:57:23.722','c1046ffb-3415-cc3a-509a-e0005856d7d7')
+[]	-89844.0836	('2057-10-03 21:07:16.864','fa79338c-9e34-2b5a-64b7-ab28e4f8c281')
+[]	58720.0591	('2048-05-14 06:05:06.021','854323ce-3546-f49c-08ec-773fcded8c46')
+[-122]	-9432.2617	('2010-11-11 19:57:23.722','7e6c1603-68b1-e5ea-3259-d377a92d3557')
+[-30,61]	-16883.7384	('2067-03-02 22:51:41.201','8dab5bc5-a641-5a33-7a35-02d6b3af106f')
+[-1]	-82719.0473	('2050-09-09 13:42:43.295','138fe3b2-602c-4249-f2dc-175ea47e2429')
+[1]	-99367.9009	('1976-06-07 20:26:18.162','509ae000-5856-d7d7-0b38-ebc520a6be3d')
+[34,-10]	97602.7584	('1995-09-16 10:43:48.516','18473732-8ef1-61b0-a6af-106cb321978b')
+[110]	-84125.1554	('2031-05-08 07:00:41.084','90454ad1-294d-55d5-30f6-d580cb258d4f')
+[114]	4013.7193	('2021-03-08 00:39:14.331','f869fc10-128b-3389-c104-6ffb3415cc3a')
+[124]	10712.855	('2005-06-14 02:52:57.504','727f9547-6808-2cbf-fc03-8af0ba318fdc')
 -
-[]	1900051923	{	-189530.5846	h	-5.6279699579452485e47	('1984-12-06','2028-08-17 03:05:01','2036-04-02 20:52:28.468','4b3d498c-dd44-95c1-5b75-921504ec5d8d')	F743
-[-102,-118]	392272782	Eb	-14818.02	o	-2.664492247169164e59	('2082-12-26','2052-09-09 03:50:50','2088-04-21 02:07:08.245','aeb9c26e-0ee7-2b8e-802b-2a96319b8e60')	CBF4
-[-71]	775049089	\N	-158115.1178	w	4.1323844687113747e-305	('2108-04-19','2090-07-31 13:45:26','2076-07-10 06:11:06.385','57c69bc6-dddd-0975-e932-a7b5173a1304')	EB1D
-[-28,100]	3675466147	{	-146685.1749	h	3.6676044396877755e142	('2017-10-25','2100-02-28 15:07:18','2055-10-14 03:36:20.056','14949dae-dfa8-a124-af83-887348b2f609')	6D88
-[-23]	2514120753	(`u,	-119659.6174	w	1.3231258347475906e34	('2141-04-06','2074-08-10 03:25:12','1976-12-04 15:31:55.745','86a9b3c1-4593-4d56-7762-3aa1dd22cbbf')	AD43
-[11,-36]	3308237300	\N	171205.1896	\N	5.634708707075817e195	('1974-10-31','1993-12-24 06:38:45','2038-07-15 02:22:51.805','63d999b8-8cca-e237-c4a4-4dd7d0096f65')	609E
-[39]	1614362420	`4A8P	157144.063	o	-1.1843143253872814e-255	('2147-08-18','2072-09-28 15:27:27','2073-07-10 09:19:58.146','6483f5c0-8733-364c-4fa0-9948d32e8903')	A886
-[48,-120]	3848918261	1<Lu3	91487.2852	h	-1.9300793134783347e263	('2050-12-04','2076-04-05 06:33:05','2103-12-13 20:48:44.066','e522b794-b8fa-3f11-003b-3b6b088ff941')	556E
-[55]	3047524030	li&lF	93462.3661	h	2.8979254388809897e54	('1976-01-10','1987-07-13 20:25:51','2021-11-19 01:44:08.986','486e5b26-5fe8-fe3e-12ef-09aee40643e0')	9E75
-[100,-42]	3999367674		-112975.9852	h	2.658098863752086e-160	('2081-05-13','2071-08-07 10:34:33','1980-11-11 09:00:44.669','9754e8ac-5145-befb-63d9-a12dd1cf1f3a')	DF63
+[]	1900051923	{	-89530.5846	h	-1.9300793134783347e263	('2081-06-01','2078-08-20 17:36:52','2103-12-13 20:48:44.066','77623aa1-dd22-cbbf-9754-e8ac5145befb')	B9D2
+[-102,-118]	392272782	Eb	-54771.1235	w	1.862030138254951e-275	('2069-11-06','2080-03-28 05:11:25','2074-02-13 07:29:40.749','af838873-48b2-f609-6483-f5c08733364c')	FD02
+[-71]	775049089	\N	-46685.1749	o	-1.1843143253872814e-255	('2024-01-16','2090-10-31 16:35:45','2073-07-10 09:19:58.146','802b2a96-319b-8e60-63d9-99b88ccae237')	CB06
+[-28,100]	3675466147	{	2713.8171	h	7.716471250409565e-150	('2084-01-01','2062-08-12 20:41:53','2034-02-02 02:30:44.960','9e60f4cb-6e55-1deb-5ac4-d66a86a8886d')	8502
+[-23]	2514120753	(`u,	-58115.1178	\N	5.634708707075817e195	('2006-11-21','1998-08-21 14:20:10','2038-07-15 02:22:51.805','e932a7b5-173a-1304-e522-b794b8fa3f11')	0355
+[11,-36]	3308237300	\N	49981.1072	o	1.551329240281692e74	('2001-08-12','2029-04-21 09:27:59','2085-03-11 12:17:17.374','4fa09948-d32e-8903-63df-43ad759e43f7')	1C98
+[39]	1614362420	`4A8P	1344.0939	o	-0.00010017641870052119	('2141-08-07','2031-08-07 08:29:42','2044-03-18 14:34:17.814','98714b2c-65e7-b5cb-a040-421e260c6d8d')	35D9
+[48,-120]	3848918261	1<Lu3	20577.5348	w	-7.09663503573236e-160	('2079-01-06','2058-07-13 22:47:30','2068-08-27 04:49:41.825','c4a44dd7-d009-6f65-1494-9daedfa8a124')	D175
+[55]	3047524030	li&lF	-19659.6174	o	-2.664492247169164e59	('2128-12-20','2032-01-08 03:14:46','2088-04-21 02:07:08.245','63d9a12d-d1cf-1f3a-57c6-9bc6dddd0975')	0926
+[100,-42]	3999367674		-14818.02	h	3.6676044396877755e142	('2110-02-03','2070-07-11 04:59:41','2055-10-14 03:36:20.056','003b3b6b-088f-f941-aeb9-c26e0ee72b8e')	6897
 -
diff --git a/tests/queries/0_stateless/01087_window_view_alter_query.sh b/tests/queries/0_stateless/01087_window_view_alter_query.sh
index 946f9c1cf12..a28ee4bc425 100755
--- a/tests/queries/0_stateless/01087_window_view_alter_query.sh
+++ b/tests/queries/0_stateless/01087_window_view_alter_query.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
@@ -21,13 +25,13 @@ INSERT INTO mt VALUES (1, 5, toDateTime('1990/01/01 12:00:06', 'US/Samoa'));
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM wv" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM wv" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM wv ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM wv ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 ALTER TABLE wv MODIFY QUERY SELECT count(a) AS count, mt.market * 2 as market, tumbleEnd(wid) AS w_end FROM mt GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, mt.market;
 
 INSERT INTO mt VALUES (1, 6, toDateTime('1990/01/01 12:00:10', 'US/Samoa'));
@@ -36,9 +40,9 @@ INSERT INTO mt VALUES (1, 8, toDateTime('1990/01/01 12:00:30', 'US/Samoa'));
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM wv" | grep -q "5" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM wv" | grep -q "5" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT count, market, w_end FROM wv ORDER BY market, w_end;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count, market, w_end FROM wv ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt"
diff --git a/tests/queries/0_stateless/01088_window_view_default_column.sh b/tests/queries/0_stateless/01088_window_view_default_column.sh
index 0f8213b18dc..1cdd9e3c9b9 100755
--- a/tests/queries/0_stateless/01088_window_view_default_column.sh
+++ b/tests/queries/0_stateless/01088_window_view_default_column.sh
@@ -4,7 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
@@ -26,10 +30,10 @@ INSERT INTO mt VALUES (1, 8, toDateTime('1990/01/01 12:00:30', 'US/Samoa'));
 EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT --query="SELECT count, market, w_end FROM dst ORDER BY w_end, market;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE wv;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE mt;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count, market, w_end FROM dst ORDER BY w_end, market;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE wv;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE dst;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE mt;"
diff --git a/tests/queries/0_stateless/01095_tpch_like_smoke.sql b/tests/queries/0_stateless/01095_tpch_like_smoke.sql
index 1ac9ec229f0..10ea601abad 100644
--- a/tests/queries/0_stateless/01095_tpch_like_smoke.sql
+++ b/tests/queries/0_stateless/01095_tpch_like_smoke.sql
@@ -180,7 +180,7 @@ order by
     n_name,
     s_name,
     p_partkey
-limit 100; -- { serverError 47 }
+limit 100; -- { serverError 1, 47 }
 
 select 3;
 select
@@ -598,7 +598,7 @@ where
             lineitem
         where
             l_partkey = p_partkey
-    ); -- { serverError 47 }
+    ); -- { serverError 1, 47 }
 
 select 18;
 select
@@ -709,7 +709,7 @@ where
     and s_nationkey = n_nationkey
     and n_name = 'CANADA'
 order by
-    s_name; -- { serverError 47 }
+    s_name; -- { serverError 1, 47 }
 
 select 21, 'fail: exists, not exists'; -- TODO
 -- select
diff --git a/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh b/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh
index 8c9efb75e96..770a0780ca2 100755
--- a/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh
+++ b/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh
@@ -15,7 +15,7 @@ function create_db()
         # Multiple database replicas on one server are actually not supported (until we have namespaces).
         # So CREATE TABLE queries will fail on all replicas except one. But it's still makes sense for a stress test.
         $CLICKHOUSE_CLIENT --allow_experimental_database_replicated=1 --query \
-        "create database if not exists ${CLICKHOUSE_DATABASE}_repl_$SUFFIX engine=Replicated('/test/01111/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX', '$SHARD', '$REPLICA')" \
+        "create database if not exists ${CLICKHOUSE_DATABASE}_repl_01111_$SUFFIX engine=Replicated('/test/01111/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX', '$SHARD', '$REPLICA')" \
          2>&1| grep -Fa "Exception: " | grep -Fv "REPLICA_ALREADY_EXISTS" | grep -Fiv "Will not try to start it up" | \
          grep -Fv "Coordination::Exception" | grep -Fv "already contains some data and it does not look like Replicated database path"
         sleep 0.$RANDOM
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.sql b/tests/queries/0_stateless/01115_join_with_dictionary.sql
index cde1385eaae..83227aa555a 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.sql
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.sql
@@ -88,11 +88,11 @@ SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s1 FULL JOIN dict_flat
 SELECT '-';
 SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANY INNER JOIN dict_flat d USING(key) ORDER BY s1.key;
 SELECT '-';
-SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANY RIGHT JOIN dict_flat d USING(key) ORDER BY s1.key;
+SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANY RIGHT JOIN dict_flat d USING(key) ORDER BY key;
 SELECT '-';
 SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 SEMI RIGHT JOIN dict_flat d USING(key) ORDER BY s1.key;
 SELECT '-';
-SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANTI RIGHT JOIN dict_flat d USING(key) ORDER BY s1.key;
+SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANTI RIGHT JOIN dict_flat d USING(key) ORDER BY key;
 
 SET join_use_nulls = 0;
 
diff --git a/tests/queries/0_stateless/01120_join_constants.sql b/tests/queries/0_stateless/01120_join_constants.sql
index fdf297f5934..d8c8b5757f8 100644
--- a/tests/queries/0_stateless/01120_join_constants.sql
+++ b/tests/queries/0_stateless/01120_join_constants.sql
@@ -1,7 +1,7 @@
 SELECT
     t1.*,
     t2.*,
-    'world',
+    'world' AS constant,
     isConstant('world')
 FROM
 (
@@ -19,7 +19,7 @@ LEFT JOIN
 SELECT
     t1.*,
     t2.*,
-    123,
+    123 AS constant,
     isConstant('world')
 FROM
 (
diff --git a/tests/queries/0_stateless/01129_dict_get_join_lose_constness.sql b/tests/queries/0_stateless/01129_dict_get_join_lose_constness.sql
index 4f7197dc5ce..fd3e12f7a15 100644
--- a/tests/queries/0_stateless/01129_dict_get_join_lose_constness.sql
+++ b/tests/queries/0_stateless/01129_dict_get_join_lose_constness.sql
@@ -13,9 +13,9 @@ SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' PASSWORD '' TAB
 LIFETIME(0)
 LAYOUT(hashed());
 
-SELECT dictGetInt32('system.dict1', 'element_count', toUInt64(dict_key)) AS join_key,
+SELECT join_key,
        toTimeZone(dictGetDateTime('system.dict1', 'loading_start_time', toUInt64(dict_key)), 'UTC') AS datetime
-FROM (select 1 AS dict_key) js1
+FROM (select dictGetInt32('system.dict1', 'element_count', toUInt64(dict_key)) AS join_key, 1 AS dict_key) js1
 LEFT JOIN (SELECT toInt32(2) AS join_key) js2
 USING (join_key)
 WHERE now() >= datetime;
diff --git a/tests/queries/0_stateless/01130_in_memory_parts.reference b/tests/queries/0_stateless/01130_in_memory_parts.reference
deleted file mode 100644
index ad5435abb59..00000000000
--- a/tests/queries/0_stateless/01130_in_memory_parts.reference
+++ /dev/null
@@ -1,39 +0,0 @@
-system.parts
-InMemory	2
-1
-1
-Simple selects
-0	0
-1	1
-2	2
-3	0
-4	1
-50	2
-51	0
-52	1
-53	2
-54	0
-34
-0
-20
-10
-Mutations and Alters
-66
-1	1
-2	2
-4	1
-5	2
-7	1
-[1,1]
-[]
-[4,16]
-[]
-[7,49]
-1	1
-2	1
-1	[1,1]
-2	[]
-4	[4,16]
-5	[]
-7	[7,49]
-0
diff --git a/tests/queries/0_stateless/01130_in_memory_parts.sql b/tests/queries/0_stateless/01130_in_memory_parts.sql
deleted file mode 100644
index 2b15ae24763..00000000000
--- a/tests/queries/0_stateless/01130_in_memory_parts.sql
+++ /dev/null
@@ -1,48 +0,0 @@
--- Tags: no-s3-storage
-
-DROP TABLE IF EXISTS in_memory;
-CREATE TABLE in_memory (a UInt32, b UInt32)
-    ENGINE = MergeTree ORDER BY a
-    SETTINGS min_rows_for_compact_part = 1000, min_rows_for_compact_part = 1000;
-
-INSERT INTO in_memory SELECT number, number % 3 FROM numbers(100);
-SELECT 'system.parts';
-SELECT DISTINCT part_type, marks FROM system.parts WHERE database = currentDatabase() AND table = 'in_memory' AND active;
-SELECT DISTINCT data_uncompressed_bytes > 0 FROM system.parts WHERE database = currentDatabase() AND table = 'in_memory' AND active;
-SELECT DISTINCT column_data_uncompressed_bytes > 0 FROM system.parts_columns WHERE database = currentDatabase() AND table = 'in_memory' AND active;
-
-SELECT 'Simple selects';
-
-SELECT * FROM in_memory ORDER BY a LIMIT 5;
-SELECT * FROM in_memory ORDER BY a LIMIT 5 OFFSET 50;
-SELECT count() FROM in_memory WHERE b = 0 SETTINGS max_block_size = 10;
--- Check index
-SELECT count() FROM in_memory WHERE a > 100 SETTINGS max_rows_to_read = 0, force_primary_key = 1;
-SELECT count() FROM in_memory WHERE a >= 10 AND a < 30 SETTINGS force_primary_key = 1;
-SELECT DISTINCT blockSize() FROM in_memory SETTINGS max_block_size = 10;
-
-SELECT 'Mutations and Alters';
-SET mutations_sync = 1;
-
-ALTER TABLE in_memory DELETE WHERE b = 0;
-
-SELECT count() FROM in_memory;
-SELECT * FROM in_memory ORDER BY a LIMIT 5;
-
-ALTER TABLE in_memory ADD COLUMN arr Array(UInt64);
-ALTER TABLE in_memory UPDATE arr = [a, a * a] WHERE b = 1;
-
-SELECT arr FROM in_memory ORDER BY a LIMIT 5;
-
-ALTER TABLE in_memory MODIFY COLUMN b String;
-ALTER TABLE in_memory RENAME COLUMN b to str;
-SELECT DISTINCT str, length(str) FROM in_memory ORDER BY str;
-ALTER TABLE in_memory DROP COLUMN str;
-
-SELECT * FROM in_memory ORDER BY a LIMIT 5;
-
--- in-memory parts works if they're empty.
-ALTER TABLE in_memory DELETE WHERE 1;
-SELECT count() FROM in_memory;
-
-DROP TABLE in_memory;
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_check.reference b/tests/queries/0_stateless/01130_in_memory_parts_check.reference
deleted file mode 100644
index 15f72836ff1..00000000000
--- a/tests/queries/0_stateless/01130_in_memory_parts_check.reference
+++ /dev/null
@@ -1 +0,0 @@
-201901_1_1_0	1	
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_check.sql b/tests/queries/0_stateless/01130_in_memory_parts_check.sql
deleted file mode 100644
index c2f5eba5949..00000000000
--- a/tests/queries/0_stateless/01130_in_memory_parts_check.sql
+++ /dev/null
@@ -1,13 +0,0 @@
--- Tags: no-s3-storage
-
--- Part of 00961_check_table test, but with in-memory parts
-
-SET check_query_single_value_result = 0;
-DROP TABLE IF EXISTS mt_table;
-CREATE TABLE mt_table (d Date, key UInt64, data String) ENGINE = MergeTree() PARTITION BY toYYYYMM(d) ORDER BY key
-    SETTINGS min_rows_for_compact_part = 1000, min_rows_for_compact_part = 1000;
-
-CHECK TABLE mt_table;
-INSERT INTO mt_table VALUES (toDate('2019-01-02'), 1, 'Hello'), (toDate('2019-01-02'), 2, 'World');
-CHECK TABLE mt_table;
-DROP TABLE mt_table;
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_default.reference b/tests/queries/0_stateless/01130_in_memory_parts_default.reference
deleted file mode 100644
index c51afdb6658..00000000000
--- a/tests/queries/0_stateless/01130_in_memory_parts_default.reference
+++ /dev/null
@@ -1 +0,0 @@
-0	bbb_aaa
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_default.sql b/tests/queries/0_stateless/01130_in_memory_parts_default.sql
deleted file mode 100644
index 776d5f89fcf..00000000000
--- a/tests/queries/0_stateless/01130_in_memory_parts_default.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- Tags: no-s3-storage
--- Test 01266_default_prewhere_reqq, but with in-memory parts
-DROP TABLE IF EXISTS t1;
-
-CREATE TABLE t1
-(
-    date Date, 
-    s1 String,
-    s2 String
-) ENGINE = MergeTree() PARTITION BY toYYYYMMDD(date) ORDER BY (date, s1)
-SETTINGS index_granularity = 8192, min_rows_for_compact_part = 1000, min_rows_for_wide_part = 1000;
-
-
-set max_threads=1;
-
-insert into t1 (date, s1,s2) values(today()-1,'aaa','bbb');
-alter table t1 add column s3 String DEFAULT concat(s2,'_',s1);
--- insert into t1 (date, s1,s2) values(today(),'aaa2','bbb2');
-select ignore(date), s3 from t1 where  s2='bbb';
-
-DROP TABLE t1;
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_nested.reference b/tests/queries/0_stateless/01130_in_memory_parts_nested.reference
deleted file mode 100644
index 3882abb9467..00000000000
--- a/tests/queries/0_stateless/01130_in_memory_parts_nested.reference
+++ /dev/null
@@ -1,25 +0,0 @@
-[0]
-[0,0,0]
-[0,0,0,0,0]
-[0,0,0,0,0,0,0]
-[0,0,0,0,0,0,0,0,0]
-[0]
-[0,0,0]
-[0,0,0,0,0]
-[0,0,0,0,0,0,0]
-[0,0,0,0,0,0,0,0,0]
-[0]
-[0,0,0]
-[0,0,0,0,0]
-[0,0,0,0,0,0,0]
-[0,0,0,0,0,0,0,0,0]
-[0]
-[0,2,4]
-[0,2,4,6,8]
-[0,2,4,6,8,10,12]
-[0,2,4,6,8,10,12,14,16]
-[0]	[0]
-[0,1,2]	[0,2,4]
-[0,1,2,3,4]	[0,2,4,6,8]
-[0,1,2,3,4,5,6]	[0,2,4,6,8,10,12]
-[0,1,2,3,4,5,6,7,8]	[0,2,4,6,8,10,12,14,16]
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_nested.sql b/tests/queries/0_stateless/01130_in_memory_parts_nested.sql
deleted file mode 100644
index 45e778b9f04..00000000000
--- a/tests/queries/0_stateless/01130_in_memory_parts_nested.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- Tags: no-s3-storage
--- Test 00576_nested_and_prewhere, but with in-memory parts.
-DROP TABLE IF EXISTS nested;
-
-CREATE TABLE nested (x UInt64, filter UInt8, n Nested(a UInt64)) ENGINE = MergeTree ORDER BY x
-    SETTINGS min_rows_for_compact_part = 200000, min_rows_for_wide_part = 300000;
-
-INSERT INTO nested SELECT number, number % 2, range(number % 10) FROM system.numbers LIMIT 100000;
-
-ALTER TABLE nested ADD COLUMN n.b Array(UInt64);
-SELECT DISTINCT n.b FROM nested PREWHERE filter;
-SELECT DISTINCT n.b FROM nested PREWHERE filter SETTINGS max_block_size = 123;
-SELECT DISTINCT n.b FROM nested PREWHERE filter SETTINGS max_block_size = 1234;
-
-ALTER TABLE nested ADD COLUMN n.c Array(UInt64) DEFAULT arrayMap(x -> x * 2, n.a);
-SELECT DISTINCT n.c FROM nested PREWHERE filter;
-SELECT DISTINCT n.a, n.c FROM nested PREWHERE filter;
-
-DROP TABLE nested;
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_partitons.reference b/tests/queries/0_stateless/01130_in_memory_parts_partitons.reference
deleted file mode 100644
index 44cbbed3f57..00000000000
--- a/tests/queries/0_stateless/01130_in_memory_parts_partitons.reference
+++ /dev/null
@@ -1,60 +0,0 @@
-1	2	foo
-1	3	bar
-2	4	aa
-2	5	bb
-2	6	cc
-3	7	qq
-3	8	ww
-3	9	ee
-3	10	rr
-1_1_1_0	InMemory	2
-2_2_2_0	InMemory	3
-3_3_3_0	InMemory	4
-^ init ==================
-2	4	aa
-2	5	bb
-2	6	cc
-3	7	qq
-3	8	ww
-3	9	ee
-3	10	rr
-2_2_2_0	InMemory	3
-3_3_3_0	InMemory	4
-^ drop 1 ==================
-3	7	qq
-3	8	ww
-3	9	ee
-3	10	rr
-3_3_3_0	InMemory	4
-^ detach 2 ==================
-2	4	aa
-2	5	bb
-2	6	cc
-3	7	qq
-3	8	ww
-3	9	ee
-3	10	rr
-2_4_4_0	Compact	3
-3_3_3_0	InMemory	4
-^ attach 2 =================
-2	4	aa
-2	5	bb
-2	6	cc
-3	7	qq
-3	8	ww
-3	9	ee
-3	10	rr
-2_4_4_0	Compact	3
-3_3_3_0	InMemory	4
-^ detach attach ==================
-2	4	aa
-2	5	bb
-2	6	cc
-3	11	tt
-3	12	yy
-t2	2_4_4_0	Compact	3
-t2	3_6_6_0	Compact	2
-t3	3_1_1_0	InMemory	2
-^ replace ==================
-3_1_1_0	InMemory	1	2
-^ freeze ==================
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql b/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
deleted file mode 100644
index 18da2d2bd30..00000000000
--- a/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
+++ /dev/null
@@ -1,59 +0,0 @@
--- Tags: no-parallel, no-s3-storage
-
-DROP TABLE IF EXISTS t2;
-
-CREATE TABLE t2(id UInt32, a UInt64, s String)
-    ENGINE = MergeTree ORDER BY a PARTITION BY id
-    SETTINGS min_rows_for_compact_part = 1000, min_rows_for_wide_part = 2000;
-
-SYSTEM STOP MERGES t2;
-
-INSERT INTO t2 VALUES (1, 2, 'foo'), (1, 3, 'bar');
-INSERT INTO t2 VALUES (2, 4, 'aa'), (2, 5, 'bb'), (2, 6, 'cc');
-INSERT INTO t2 VALUES (3, 7, 'qq'), (3, 8, 'ww'), (3, 9, 'ee'), (3, 10, 'rr');
-
-SELECT * FROM t2 ORDER BY a;
-SELECT name, part_type, rows FROM system.parts WHERE table = 't2' AND active AND database = currentDatabase() ORDER BY name;
-SELECT '^ init ==================';
-
-ALTER TABLE t2 DROP PARTITION 1;
-SELECT * FROM t2 ORDER BY a;
-SELECT name, part_type, rows FROM system.parts WHERE table = 't2' AND active AND database = currentDatabase() ORDER BY name;
-SELECT '^ drop 1 ==================';
-
-ALTER TABLE t2 DETACH PARTITION 2;
-SELECT * FROM t2 ORDER BY a;
-SELECT name, part_type, rows FROM system.parts WHERE table = 't2' AND active AND database = currentDatabase() ORDER BY name;
-SELECT '^ detach 2 ==================';
-
-ALTER TABLE t2 ATTACH PARTITION 2;
-SELECT * FROM t2 ORDER BY a;
-SELECT name, part_type, rows FROM system.parts WHERE table = 't2' AND active AND database = currentDatabase() ORDER BY name;
-SELECT '^ attach 2 =================';
-
-DETACH TABLE t2;
-ATTACH TABLE t2;
-
-SELECT * FROM t2 ORDER BY a;
-SELECT name, part_type, rows FROM system.parts WHERE table = 't2' AND active AND database = currentDatabase() ORDER BY name;
-SELECT '^ detach attach ==================';
-
-DROP TABLE IF EXISTS t3;
-
-CREATE TABLE t3(id UInt32, a UInt64, s String)
-    ENGINE = MergeTree ORDER BY a PARTITION BY id
-    SETTINGS min_rows_for_compact_part = 1000, min_rows_for_wide_part = 2000;
-
-INSERT INTO t3 VALUES (3, 11, 'tt'), (3, 12, 'yy');
-ALTER TABLE t2 REPLACE PARTITION 3 FROM t3;
-SELECT * FROM t2 ORDER BY a;
-SELECT table, name, part_type, rows FROM system.parts WHERE table = 't2' AND active AND database = currentDatabase() ORDER BY name;
-SELECT table, name, part_type, rows FROM system.parts WHERE table = 't3' AND active AND database = currentDatabase() ORDER BY name;
-SELECT '^ replace ==================';
-
-ALTER TABLE t3 FREEZE PARTITION 3;
-SELECT name, part_type, is_frozen, rows FROM system.parts WHERE table = 't3' AND active AND database = currentDatabase() ORDER BY name;
-SELECT '^ freeze ==================';
-
-DROP TABLE t2;
-DROP TABLE t3;
diff --git a/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.reference b/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.reference
index 01efbb7c64b..6d32c20909b 100644
--- a/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.reference
+++ b/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.reference
@@ -3,15 +3,27 @@
 1	l	\N	Nullable(String)
 2		\N	Nullable(String)
 -
+1	l	Nullable(String)	\N	Nullable(String)
+0	\N	Nullable(String)	\N	Nullable(String)
+0	\N	Nullable(String)	\N	Nullable(String)
+1	l	Nullable(String)	\N	Nullable(String)
+-
+1	l	LowCardinality(String)	\N	Nullable(String)
+0		LowCardinality(String)	\N	Nullable(String)
+0		LowCardinality(String)	\N	Nullable(String)
+1	l	LowCardinality(String)	\N	Nullable(String)
+-
+1	l	\N	Nullable(String)
+0	\N	\N	Nullable(String)
+0	\N	\N	Nullable(String)
+1	l	\N	Nullable(String)
+-
 1	l	\N	Nullable(String)
 0		\N	Nullable(String)
 0		\N	Nullable(String)
 1	l	\N	Nullable(String)
 -
-1	l	\N	Nullable(String)
-0		\N	Nullable(String)
-0		\N	Nullable(String)
-1	l	\N	Nullable(String)
+0	\N
 -
 0	
 -
diff --git a/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql b/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
index 38b72837174..2464b7a57cf 100644
--- a/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
+++ b/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
@@ -15,19 +15,37 @@ SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (x) ORD
 
 SELECT '-';
 
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x;
+-- lc should be supertype for l.lc and r.lc, so expect Nullable(String)
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
 
 SELECT '-';
 
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x;
+-- old behavior is different
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
 
 SELECT '-';
 
-SELECT x, lc FROM t AS l RIGHT JOIN nr AS r USING (lc);
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+
+SELECT '-';
+
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+
+SELECT '-';
+
+SELECT x, lc FROM t AS l RIGHT JOIN nr AS r USING (lc) SETTINGS allow_experimental_analyzer = 1;
+
+SELECT '-';
+
+SELECT x, lc FROM t AS l RIGHT JOIN nr AS r USING (lc) SETTINGS allow_experimental_analyzer = 0;
 
 SELECT '-';
 
diff --git a/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.reference b/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.reference
index c6bdcb773b2..bb29ec9becd 100644
--- a/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.reference
+++ b/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.reference
@@ -4,6 +4,16 @@
 2		\N	Nullable(String)
 -
 1	l	\N	Nullable(String)
+0	\N	\N	Nullable(String)
+0	\N	\N	Nullable(String)
+1	l	\N	Nullable(String)
+-
+1	l	\N	Nullable(String)
+0	\N	\N	Nullable(String)
+0	\N	\N	Nullable(String)
+1	l	\N	Nullable(String)
+-
+1	l	\N	Nullable(String)
 0		\N	Nullable(String)
 0		\N	Nullable(String)
 1	l	\N	Nullable(String)
diff --git a/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.sql b/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.sql
index dbc2d7c9f5d..718e8358c64 100644
--- a/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.sql
+++ b/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.sql
@@ -17,15 +17,27 @@ SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (x) ORD
 
 SELECT '-';
 
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
 
 SELECT '-';
 
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+
+SELECT '-';
+
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+
+SELECT '-';
+
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
 
 SELECT '-';
 
diff --git a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
index 7234cee96e0..505c406c2cc 100644
--- a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
+++ b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
@@ -12,7 +12,7 @@ DETACH TABLE rmt1;
 ATTACH TABLE rmt1;
 SHOW CREATE TABLE rmt1;
 
-CREATE TABLE rmt (n UInt64, s String) ENGINE = ReplicatedMergeTree('{default_path_test}{uuid}', '{default_name_test}') ORDER BY n;    -- { serverError 62 }
+CREATE TABLE rmt (n UInt64, s String) ENGINE = ReplicatedMergeTree('{default_path_test}{uuid}', '{default_name_test}') ORDER BY n;    -- { serverError 36 }
 CREATE TABLE rmt (n UInt64, s String) ENGINE = ReplicatedMergeTree('{default_path_test}test_01148', '{default_name_test}') ORDER BY n;
 SHOW CREATE TABLE rmt;
 RENAME TABLE rmt TO rmt2;   -- { serverError 48 }
@@ -24,7 +24,7 @@ SET distributed_ddl_output_mode='none';
 DROP DATABASE IF EXISTS test_01148_atomic;
 CREATE DATABASE test_01148_atomic ENGINE=Atomic;
 CREATE TABLE test_01148_atomic.rmt2 ON CLUSTER test_shard_localhost (n int, PRIMARY KEY n) ENGINE=ReplicatedMergeTree;
-CREATE TABLE test_01148_atomic.rmt3 AS test_01148_atomic.rmt2; -- { serverError 62 }
+CREATE TABLE test_01148_atomic.rmt3 AS test_01148_atomic.rmt2; -- { serverError 36 }
 CREATE TABLE test_01148_atomic.rmt4 ON CLUSTER test_shard_localhost AS test_01148_atomic.rmt2;
 SHOW CREATE TABLE test_01148_atomic.rmt2;
 RENAME TABLE test_01148_atomic.rmt4 to test_01148_atomic.rmt3;
diff --git a/tests/queries/0_stateless/01158_zookeeper_log_long.reference b/tests/queries/0_stateless/01158_zookeeper_log_long.reference
index a0088610c9d..7ec52cb3366 100644
--- a/tests/queries/0_stateless/01158_zookeeper_log_long.reference
+++ b/tests/queries/0_stateless/01158_zookeeper_log_long.reference
@@ -18,22 +18,18 @@ Response	0	Create	/test/01158/default/rmt/replicas/1/parts/all_0_0_0	0	0	\N	0	4
 Request	0	Exists	/test/01158/default/rmt/replicas/1/parts/all_0_0_0	0	0	\N	0	0	\N	\N	\N		0	0	0	0
 Response	0	Exists	/test/01158/default/rmt/replicas/1/parts/all_0_0_0	0	0	\N	0	0	ZOK	\N	\N		0	0	96	0
 blocks
-Request	0	Multi		0	0	\N	3	0	\N	\N	\N		0	0	0	0
-Request	0	Create	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	\N	0	1	\N	\N	\N		0	0	0	0
-Request	0	Remove	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	-1	0	2	\N	\N	\N		0	0	0	0
-Request	0	Create	/test/01158/default/rmt/block_numbers/all/block-	1	1	\N	0	3	\N	\N	\N		0	0	0	0
-Response	0	Multi		0	0	\N	3	0	ZOK	\N	\N		0	0	0	0
-Response	0	Create	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	\N	0	1	ZOK	\N	\N	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	0	0
-Response	0	Remove	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	-1	0	2	ZOK	\N	\N		0	0	0	0
-Response	0	Create	/test/01158/default/rmt/block_numbers/all/block-	1	1	\N	0	3	ZOK	\N	\N	/test/01158/default/rmt/block_numbers/all/block-0000000000	0	0	0	0
-Request	0	Multi		0	0	\N	3	0	\N	\N	\N		0	0	0	0
-Request	0	Create	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	\N	0	1	\N	\N	\N		0	0	0	0
-Request	0	Remove	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	-1	0	2	\N	\N	\N		0	0	0	0
-Request	0	Create	/test/01158/default/rmt/block_numbers/all/block-	1	1	\N	0	3	\N	\N	\N		0	0	0	0
-Response	0	Multi		0	0	\N	3	0	ZNODEEXISTS	\N	\N		0	0	0	0
-Response	0	Error	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	\N	0	1	ZNODEEXISTS	\N	\N		0	0	0	0
-Response	0	Error	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	-1	0	2	ZRUNTIMEINCONSISTENCY	\N	\N		0	0	0	0
-Response	0	Error	/test/01158/default/rmt/block_numbers/all/block-	1	1	\N	0	3	ZRUNTIMEINCONSISTENCY	\N	\N		0	0	0	0
+Request	0	Multi		0	0	\N	2	0	\N	\N	\N		0	0	0	0
+Request	0	CheckNotExists	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	-1	0	1	\N	\N	\N		0	0	0	0
+Request	0	Create	/test/01158/default/rmt/block_numbers/all/block-	1	1	\N	0	2	\N	\N	\N		0	0	0	0
+Response	0	Multi		0	0	\N	2	0	ZOK	\N	\N		0	0	0	0
+Response	0	CheckNotExists	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	-1	0	1	ZOK	\N	\N		0	0	0	0
+Response	0	Create	/test/01158/default/rmt/block_numbers/all/block-	1	1	\N	0	2	ZOK	\N	\N	/test/01158/default/rmt/block_numbers/all/block-0000000000	0	0	0	0
+Request	0	Multi		0	0	\N	2	0	\N	\N	\N		0	0	0	0
+Request	0	CheckNotExists	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	-1	0	1	\N	\N	\N		0	0	0	0
+Request	0	Create	/test/01158/default/rmt/block_numbers/all/block-	1	1	\N	0	2	\N	\N	\N		0	0	0	0
+Response	0	Multi		0	0	\N	2	0	ZNODEEXISTS	\N	\N		0	0	0	0
+Response	0	Error	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	-1	0	1	ZNODEEXISTS	\N	\N		0	0	0	0
+Response	0	Error	/test/01158/default/rmt/block_numbers/all/block-	1	1	\N	0	2	ZRUNTIMEINCONSISTENCY	\N	\N		0	0	0	0
 Request	0	Get	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	\N	0	0	\N	\N	\N		0	0	0	0
 Response	0	Get	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	\N	0	0	ZOK	\N	\N		0	0	9	0
 duration_ms
diff --git a/tests/queries/0_stateless/01160_table_dependencies.reference b/tests/queries/0_stateless/01160_table_dependencies.reference
index ead8377abc5..9fcd9bc504c 100644
--- a/tests/queries/0_stateless/01160_table_dependencies.reference
+++ b/tests/queries/0_stateless/01160_table_dependencies.reference
@@ -30,6 +30,14 @@ mv	[]	[]	[]
 s	[]	['join']	['t']
 t	['mv']	['dict1','join','s']	[]
 OK
+UNKNOWN_DATABASE
+dict1	[]	['dict_src']	['join','t']
+dict2	[]	['join']	[]
+dict_src	[]	[]	['dict1']
+join	[]	['dict1']	['dict2','s','t']
+mv	[]	[]	[]
+s	[]	['join']	['t']
+t	['mv']	['dict1','join','s']	[]
 dict1	[]	['dict_src']	['join','t']
 dict2	[]	['join']	[]
 dict_src	[]	[]	['dict1']
diff --git a/tests/queries/0_stateless/01160_table_dependencies.sh b/tests/queries/0_stateless/01160_table_dependencies.sh
index a0a3f05c6a9..acb6522e9e2 100755
--- a/tests/queries/0_stateless/01160_table_dependencies.sh
+++ b/tests/queries/0_stateless/01160_table_dependencies.sh
@@ -64,6 +64,10 @@ else
     echo "OK"
 fi
 
+$CLICKHOUSE_CLIENT -q "rename table t to ${CLICKHOUSE_DATABASE}_2.t" |& grep -m1 -F -o UNKNOWN_DATABASE
+$CLICKHOUSE_CLIENT -q "select table, arraySort(dependencies_table),
+arraySort(loading_dependencies_table), arraySort(loading_dependent_table) from system.tables where database in (currentDatabase(), '$t_database') order by table"
+
 $CLICKHOUSE_CLIENT -q "drop table mv"
 $CLICKHOUSE_CLIENT -q "create database ${CLICKHOUSE_DATABASE}_1"
 
diff --git a/tests/queries/0_stateless/01164_detach_attach_partition_race.sh b/tests/queries/0_stateless/01164_detach_attach_partition_race.sh
index 086f409c9a3..7640b9dddf2 100755
--- a/tests/queries/0_stateless/01164_detach_attach_partition_race.sh
+++ b/tests/queries/0_stateless/01164_detach_attach_partition_race.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q "create table mt (n int) engine=MergeTree order by n"
+$CLICKHOUSE_CLIENT -q "create table mt (n int) engine=MergeTree order by n settings parts_to_throw_insert=1000"
 $CLICKHOUSE_CLIENT -q "insert into mt values (1)"
 $CLICKHOUSE_CLIENT -q "insert into mt values (2)"
 $CLICKHOUSE_CLIENT -q "insert into mt values (3)"
diff --git a/tests/queries/0_stateless/01165_lost_part_empty_partition.reference b/tests/queries/0_stateless/01165_lost_part_empty_partition.reference
index e69de29bb2d..6ed281c757a 100644
--- a/tests/queries/0_stateless/01165_lost_part_empty_partition.reference
+++ b/tests/queries/0_stateless/01165_lost_part_empty_partition.reference
@@ -0,0 +1,2 @@
+1
+1
diff --git a/tests/queries/0_stateless/01165_lost_part_empty_partition.sql b/tests/queries/0_stateless/01165_lost_part_empty_partition.sql
index 9279de1a5b3..924798b0050 100644
--- a/tests/queries/0_stateless/01165_lost_part_empty_partition.sql
+++ b/tests/queries/0_stateless/01165_lost_part_empty_partition.sql
@@ -5,11 +5,12 @@ create table rmt2 (d DateTime, n int) engine=ReplicatedMergeTree('/test/01165/{d
 
 system stop replicated sends rmt1;
 insert into rmt1 values (now(), arrayJoin([1, 2])); -- { clientError 36 }
-insert into rmt1(n) select * from system.numbers limit arrayJoin([1, 2]); -- { serverError 36 }
+insert into rmt1(n) select * from system.numbers limit arrayJoin([1, 2]); -- { serverError 36, 440 }
 insert into rmt1 values (now(), rand());
 drop table rmt1;
 
 system sync replica rmt2;
+select lost_part_count from system.replicas where database = currentDatabase() and table = 'rmt2';
 drop table rmt2;
 
 
@@ -21,6 +22,7 @@ insert into rmt1 values (now(), rand());
 drop table rmt1;
 
 system sync replica rmt2;
+select lost_part_count from system.replicas where database = currentDatabase() and table = 'rmt2';
 drop table rmt2;
 
 
diff --git a/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh b/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
index a385fc81fe4..508ad05224c 100755
--- a/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
+++ b/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
@@ -2,6 +2,7 @@
 # Tags: long, no-replicated-database, no-ordinary-database
 
 # shellcheck disable=SC2015
+# shellcheck disable=SC2119
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.sh b/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.sh
index 12b654f4215..199c2b5389f 100755
--- a/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.sh
+++ b/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 # Tags: long, no-parallel, no-ordinary-database
 # Test is too heavy, avoid parallel run in Flaky Check
+# shellcheck disable=SC2119
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01174_select_insert_isolation.sh b/tests/queries/0_stateless/01174_select_insert_isolation.sh
index dc5c1d7a722..29ccfbb1ccb 100755
--- a/tests/queries/0_stateless/01174_select_insert_isolation.sh
+++ b/tests/queries/0_stateless/01174_select_insert_isolation.sh
@@ -2,6 +2,7 @@
 # Tags: long, no-ordinary-database
 
 # shellcheck disable=SC2015
+# shellcheck disable=SC2119
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
index fbb67a268ae..6edaaa5c602 100644
--- a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
+++ b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
@@ -1,8 +1,8 @@
 -- Tags: no-replicated-database
 -- Tag no-replicated-database: ON CLUSTER is not allowed
 
-DROP TABLE IF EXISTS test_repl ON CLUSTER test_shard_localhost SYNC;
+DROP TABLE IF EXISTS test_repl ON CLUSTER test_shard_localhost NO DELAY;
 CREATE TABLE test_repl ON CLUSTER test_shard_localhost (n UInt64) ENGINE ReplicatedMergeTree('/clickhouse/test_01181/{database}/test_repl','r1') ORDER BY tuple();
-DETACH TABLE test_repl ON CLUSTER test_shard_localhost SYNC;
+DETACH TABLE test_repl ON CLUSTER test_shard_localhost NO DELAY;
 ATTACH TABLE test_repl ON CLUSTER test_shard_localhost;
-DROP TABLE test_repl ON CLUSTER test_shard_localhost SYNC;
+DROP TABLE test_repl ON CLUSTER test_shard_localhost NO DELAY;
diff --git a/tests/queries/0_stateless/01190_full_attach_syntax.reference b/tests/queries/0_stateless/01190_full_attach_syntax.reference
deleted file mode 100644
index 61a0603975a..00000000000
--- a/tests/queries/0_stateless/01190_full_attach_syntax.reference
+++ /dev/null
@@ -1,13 +0,0 @@
-CREATE DICTIONARY test_01190.dict\n(\n    `key` UInt64 DEFAULT 0,\n    `col` UInt8 DEFAULT 1\n)\nPRIMARY KEY key\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT 9000 USER \'default\' TABLE \'table_for_dict\' PASSWORD \'[HIDDEN]\' DB \'test_01190\'))\nLIFETIME(MIN 1 MAX 10)\nLAYOUT(FLAT())
-CREATE DICTIONARY test_01190.dict\n(\n    `key` UInt64 DEFAULT 0,\n    `col` UInt8 DEFAULT 1\n)\nPRIMARY KEY key\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT 9000 USER \'default\' TABLE \'table_for_dict\' PASSWORD \'[HIDDEN]\' DB \'test_01190\'))\nLIFETIME(MIN 1 MAX 10)\nLAYOUT(FLAT())
-CREATE TABLE test_01190.log\n(\n    `s` String\n)\nENGINE = Log
-CREATE TABLE test_01190.log\n(\n    `s` String\n)\nENGINE = Log
-test
-CREATE TABLE test_01190.mt\n(\n    `key` Array(UInt8),\n    `s` String,\n    `n` UInt64,\n    `d` Date MATERIALIZED \'2000-01-01\'\n)\nENGINE = MergeTree(d, (key, s, n), 1)
-[1,2]	Hello	2
-CREATE TABLE test_01190.mt\n(\n    `key` Array(UInt8),\n    `s` String,\n    `n` UInt64,\n    `d` Date\n)\nENGINE = MergeTree(d, (key, s, n), 1)
-CREATE MATERIALIZED VIEW test_01190.mv\n(\n    `s` String\n)\nENGINE = Null AS\nSELECT *\nFROM test_01190.log
-CREATE MATERIALIZED VIEW test_01190.mv\n(\n    `s` String\n)\nENGINE = Null AS\nSELECT *\nFROM test_01190.log
-CREATE MATERIALIZED VIEW test_01190.mv\n(\n    `key` Array(UInt8),\n    `s` String,\n    `n` UInt64,\n    `d` Date\n)\nENGINE = Null AS\nSELECT *\nFROM test_01190.mt
-CREATE LIVE VIEW test_01190.lv\n(\n    `1` UInt8\n) AS\nSELECT 1
-CREATE LIVE VIEW test_01190.lv\n(\n    `1` UInt8\n) AS\nSELECT 1
diff --git a/tests/queries/0_stateless/01190_full_attach_syntax.sql b/tests/queries/0_stateless/01190_full_attach_syntax.sql
deleted file mode 100644
index e66978e22e1..00000000000
--- a/tests/queries/0_stateless/01190_full_attach_syntax.sql
+++ /dev/null
@@ -1,60 +0,0 @@
--- Tags: no-parallel
-
-DROP DATABASE IF EXISTS test_01190;
-set allow_deprecated_database_ordinary=1;
-set allow_deprecated_syntax_for_merge_tree=1;
-CREATE DATABASE test_01190 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
-USE test_01190;
-
-CREATE TABLE test_01190.table_for_dict (key UInt64, col UInt8) ENGINE = Memory;
-
-CREATE DICTIONARY test_01190.dict (key UInt64 DEFAULT 0, col UInt8 DEFAULT 1) PRIMARY KEY key SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'test_01190')) LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT());
-
-SHOW CREATE DICTIONARY test_01190.dict;
-
-DETACH DICTIONARY test_01190.dict;
-ATTACH TABLE test_01190.dict; -- { serverError 80 }
--- Full ATTACH syntax is not allowed for dictionaries
-ATTACH DICTIONARY test_01190.dict (key UInt64 DEFAULT 0, col UInt8 DEFAULT 42) PRIMARY KEY key SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'test_01190')) LIFETIME(MIN 1 MAX 100) LAYOUT(FLAT()); -- { clientError 62 }
-ATTACH DICTIONARY test_01190.dict;
-SHOW CREATE DICTIONARY test_01190.dict;
-
-CREATE TABLE log ENGINE = Log AS SELECT 'test' AS s;
-SHOW CREATE log;
-DETACH TABLE log;
-ATTACH DICTIONARY log; -- { serverError 80 }
-ATTACH TABLE log (s String) ENGINE = Log();
-SHOW CREATE log;
-SELECT * FROM log;
-
-DROP TABLE IF EXISTS mt;
-CREATE TABLE mt (key Array(UInt8), s String, n UInt64, d Date MATERIALIZED '2000-01-01') ENGINE = MergeTree(d, (key, s, n), 1);
-INSERT INTO mt VALUES ([1, 2], 'Hello', 2);
-DETACH TABLE mt;
-ATTACH TABLE mt (key Array(UInt8), s String, n UInt64, d Date MATERIALIZED '2000-01-01') ENGINE = MergeTree ORDER BY (key, s, n) PARTITION BY toYYYYMM(d); -- { serverError 342 }
-ATTACH TABLE mt (key Array(UInt8), s String, n UInt64, d Date MATERIALIZED '2000-01-01') ENGINE = MergeTree(d, (key, s, n), 1);
-SHOW CREATE mt;
-SELECT * FROM mt;
-DETACH TABLE mt;
-ATTACH TABLE mt (key Array(UInt8), s String, n UInt64, d Date) ENGINE = MergeTree(d, (key, s, n), 1);   -- It works (with Ordinary database), but probably it shouldn't
-SHOW CREATE mt;
-
-CREATE MATERIALIZED VIEW mv ENGINE = Null AS SELECT * FROM log;
-SHOW CREATE mv;
-DETACH VIEW mv;
-ATTACH MATERIALIZED VIEW mv ENGINE = Null AS SELECT * FROM log;
-SHOW CREATE mv;
-DETACH VIEW mv;
-ATTACH MATERIALIZED VIEW mv ENGINE = Null AS SELECT * FROM mt;  -- It works (with Ordinary database), but probably it shouldn't
-SHOW CREATE mv;
-
-SET allow_experimental_live_view = 1;
-CREATE LIVE VIEW lv AS SELECT 1;
-SHOW CREATE lv;
-DETACH VIEW lv;
-ATTACH LIVE VIEW lv AS SELECT 1;
-SHOW CREATE lv;
-
-DROP DATABASE test_01190;
-
-
diff --git a/tests/queries/0_stateless/01193_metadata_loading.sh b/tests/queries/0_stateless/01193_metadata_loading.sh
index 1604de6004a..d0f3001fceb 100755
--- a/tests/queries/0_stateless/01193_metadata_loading.sh
+++ b/tests/queries/0_stateless/01193_metadata_loading.sh
@@ -13,6 +13,11 @@ threads=10
 count_multiplier=1
 max_time_ms=1000
 
+# In case of s390x, the query execution time seems to be approximately ~1.1 to ~1.2 secs. So, to match the query execution time, set max_time_ms=1500
+if [[ $(uname -a | grep s390x) ]]; then
+    max_time_ms=1500
+fi
+
 debug_or_sanitizer_build=$($CLICKHOUSE_CLIENT -q "WITH ((SELECT value FROM system.build_options WHERE name='BUILD_TYPE') AS build, (SELECT value FROM system.build_options WHERE name='CXX_FLAGS') as flags) SELECT build='Debug' OR flags LIKE '%fsanitize%' OR hasThreadFuzzer()")
 
 if [[ debug_or_sanitizer_build -eq 1 ]]; then tables=100; count_multiplier=10; max_time_ms=1500; fi
diff --git a/tests/queries/0_stateless/01195_formats_diagnostic_info.sh b/tests/queries/0_stateless/01195_formats_diagnostic_info.sh
index e75780a4520..b146d65fc58 100755
--- a/tests/queries/0_stateless/01195_formats_diagnostic_info.sh
+++ b/tests/queries/0_stateless/01195_formats_diagnostic_info.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 # shellcheck disable=SC2206
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01201_read_single_thread_in_order.sql b/tests/queries/0_stateless/01201_read_single_thread_in_order.sql
index 33ccbbbe84d..24ed935a125 100644
--- a/tests/queries/0_stateless/01201_read_single_thread_in_order.sql
+++ b/tests/queries/0_stateless/01201_read_single_thread_in_order.sql
@@ -6,7 +6,7 @@ CREATE TABLE t
 )
 ENGINE = MergeTree
 ORDER BY number
-SETTINGS index_granularity = 128, index_granularity_bytes = '10Mi';
+SETTINGS index_granularity = 128, ratio_of_defaults_for_sparse_serialization = 1.0, index_granularity_bytes = '10Mi';
 
 SET min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
 INSERT INTO t SELECT number FROM numbers(10000000);
diff --git a/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql b/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
index 65adaf3ad71..de41132df62 100644
--- a/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
+++ b/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
@@ -9,7 +9,7 @@ create table data_02000 (key Int) Engine=Null();
 create table dist_02000 as data_02000 Engine=Distributed(test_cluster_two_shards, currentDatabase(), data_02000, key);
 
 select * from data_02000 where key = 0xdeadbeafdeadbeaf;
-select * from dist_02000 where key = 0xdeadbeafdeadbeaf settings force_optimize_skip_unused_shards=2; -- { serverError 507; }
+select * from dist_02000 where key = 0xdeadbeafdeadbeaf settings force_optimize_skip_unused_shards=2; -- { serverError 507 }
 select * from dist_02000 where key = 0xdeadbeafdeadbeaf;
 
 drop table data_02000;
diff --git a/tests/queries/0_stateless/01223_dist_on_dist.sql b/tests/queries/0_stateless/01223_dist_on_dist.sql
index 65a240fd48b..4cd8ffd7a03 100644
--- a/tests/queries/0_stateless/01223_dist_on_dist.sql
+++ b/tests/queries/0_stateless/01223_dist_on_dist.sql
@@ -33,9 +33,9 @@ select 'cluster() GROUP BY ORDER BY';
 select * from cluster(test_cluster_two_shards, currentDatabase(), dist_01223) group by key order by key;
 
 select 'LEFT JOIN';
-select toInt32(number) key, b.key from numbers(2) a left join (select distinct * from dist_01223) b using key order by b.key;
+select a.key, b.key from (SELECT toInt32(number) key from numbers(2)) a left join (select distinct * from dist_01223) b using key order by b.key;
 select 'RIGHT JOIN';
-select toInt32(number) key, b.key from numbers(2) a right join (select distinct * from dist_01223) b using key order by b.key;
+select a.key, b.key from (SELECT toInt32(number) key from numbers(2)) a right join (select distinct * from dist_01223) b using key order by b.key;
 
 -- more data for GROUP BY
 insert into data_01223 select number%3 from numbers(30);
diff --git a/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql b/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
index 513ecbd4ed4..be2f7b2a9bf 100644
--- a/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
+++ b/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
@@ -16,7 +16,7 @@ LAYOUT(FLAT());
 
 SYSTEM RELOAD DICTIONARY dict_db_01225.dict;
 
-DROP TABLE dict_db_01225.dict; -- { serverError 520; }
+DROP TABLE dict_db_01225.dict; -- { serverError 520 }
 DROP DICTIONARY dict_db_01225.dict;
 
 DROP DATABASE dict_db_01225;
diff --git a/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql b/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
index 09cde642ed2..bc733a0c546 100644
--- a/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
+++ b/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
@@ -18,7 +18,7 @@ LIFETIME(MIN 0 MAX 0)
 LAYOUT(FLAT());
 
 SHOW CREATE TABLE dict_db_01225_dictionary.`dict_db_01225.dict` FORMAT TSVRaw;
-SHOW CREATE TABLE dict_db_01225_dictionary.`dict_db_01225.no_such_dict`; -- { serverError 487; }
+SHOW CREATE TABLE dict_db_01225_dictionary.`dict_db_01225.no_such_dict`; -- { serverError 487 }
 
 DROP DATABASE dict_db_01225;
 DROP DATABASE dict_db_01225_dictionary;
diff --git a/tests/queries/0_stateless/01231_log_queries_min_type.sql b/tests/queries/0_stateless/01231_log_queries_min_type.sql
index c2470bb9a56..0ed5e3e605c 100644
--- a/tests/queries/0_stateless/01231_log_queries_min_type.sql
+++ b/tests/queries/0_stateless/01231_log_queries_min_type.sql
@@ -15,7 +15,7 @@ select count() from system.query_log where current_database = currentDatabase()
 
 set max_rows_to_read='100K';
 set log_queries_min_type='EXCEPTION_WHILE_PROCESSING';
-select '01231_log_queries_min_type/EXCEPTION_WHILE_PROCESSING', max(number) from system.numbers limit 1e6; -- { serverError 158; }
+select '01231_log_queries_min_type/EXCEPTION_WHILE_PROCESSING', max(number) from system.numbers limit 1e6; -- { serverError 158 }
 set max_rows_to_read=0;
 system flush logs;
 select count() from system.query_log where current_database = currentDatabase()
@@ -23,7 +23,7 @@ select count() from system.query_log where current_database = currentDatabase()
     and event_date >= yesterday() and type = 'ExceptionWhileProcessing';
 
 set max_rows_to_read='100K';
-select '01231_log_queries_min_type w/ Settings/EXCEPTION_WHILE_PROCESSING', max(number) from system.numbers limit 1e6; -- { serverError 158; }
+select '01231_log_queries_min_type w/ Settings/EXCEPTION_WHILE_PROCESSING', max(number) from system.numbers limit 1e6; -- { serverError 158 }
 system flush logs;
 set max_rows_to_read=0;
 select count() from system.query_log where
diff --git a/tests/queries/0_stateless/01232_untuple.reference b/tests/queries/0_stateless/01232_untuple.reference
index 8e1f97d2585..7bb80bf618f 100644
--- a/tests/queries/0_stateless/01232_untuple.reference
+++ b/tests/queries/0_stateless/01232_untuple.reference
@@ -2,7 +2,7 @@
 hello	1	3	world
 9
 9	(0,1)
-key	tupleElement(argMax(tuple(v1, v2, v3, v4, v5), v1), 1)	tupleElement(argMax(tuple(v1, v2, v3, v4, v5), v1), 2)	tupleElement(argMax(tuple(v1, v2, v3, v4, v5), v1), 3)	tupleElement(argMax(tuple(v1, v2, v3, v4, v5), v1), 4)	tupleElement(argMax(tuple(v1, v2, v3, v4, v5), v1), 5)
+key	tupleElement(argMax(tuple(v1, v2, v3, v4, v5), v1), \'1\')	tupleElement(argMax(tuple(v1, v2, v3, v4, v5), v1), \'2\')	tupleElement(argMax(tuple(v1, v2, v3, v4, v5), v1), \'3\')	tupleElement(argMax(tuple(v1, v2, v3, v4, v5), v1), \'4\')	tupleElement(argMax(tuple(v1, v2, v3, v4, v5), v1), \'5\')
 1	20	20	10	20	30
 2	11	20	10	20	30
 3	70	20	10	20	30
diff --git a/tests/queries/0_stateless/01232_untuple.sql b/tests/queries/0_stateless/01232_untuple.sql
index 92150e92b29..ccefd13a772 100644
--- a/tests/queries/0_stateless/01232_untuple.sql
+++ b/tests/queries/0_stateless/01232_untuple.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 select untuple((* except (b),)) from (select 1 a, 2 b, 3 c);
 select 'hello', untuple((* except (b),)), 'world' from (select 1 a, 2 b, 3 c);
 select argMax(untuple(x)) from (select (number, number + 1) as x from numbers(10));
diff --git a/tests/queries/0_stateless/01235_live_view_over_distributed.reference b/tests/queries/0_stateless/01235_live_view_over_distributed.reference
deleted file mode 100644
index 00fc99d96ba..00000000000
--- a/tests/queries/0_stateless/01235_live_view_over_distributed.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-2020-01-01
-2020-01-01
-2020-01-02
-2020-01-02
diff --git a/tests/queries/0_stateless/01235_live_view_over_distributed.sql b/tests/queries/0_stateless/01235_live_view_over_distributed.sql
deleted file mode 100644
index 32ec0a6127f..00000000000
--- a/tests/queries/0_stateless/01235_live_view_over_distributed.sql
+++ /dev/null
@@ -1,23 +0,0 @@
--- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
-
-set insert_distributed_sync = 1;
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS visits;
-DROP TABLE IF EXISTS visits_layer;
-
-CREATE TABLE visits(StartDate Date) ENGINE MergeTree ORDER BY(StartDate);
-CREATE TABLE visits_layer(StartDate Date) ENGINE Distributed(test_cluster_two_shards_localhost,  currentDatabase(), 'visits', rand());
-
-CREATE LIVE VIEW lv AS SELECT * FROM visits_layer ORDER BY StartDate;
-
-INSERT INTO visits_layer (StartDate) VALUES ('2020-01-01');
-INSERT INTO visits_layer (StartDate) VALUES ('2020-01-02');
-
-SELECT * FROM lv;
-
-DROP TABLE visits;
-DROP TABLE visits_layer;
-
-DROP TABLE lv;
diff --git a/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.reference b/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.reference
deleted file mode 100644
index dfb4d0552f5..00000000000
--- a/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.reference
+++ /dev/null
@@ -1,8 +0,0 @@
-2020-01-01
-2020-01-01
-2020-01-02
-2020-01-02
-2020-01-01
-2020-01-01
-2020-01-02
-2020-01-02
diff --git a/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql b/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
deleted file mode 100644
index 3822f22d353..00000000000
--- a/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- Tags: distributed, no-replicated-database, no-parallel, no-fasttest, no-random-settings
-
-SET allow_experimental_live_view = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS visits;
-DROP TABLE IF EXISTS visits_layer;
-
-CREATE TABLE visits (StartDate Date) ENGINE MergeTree ORDER BY(StartDate);
-CREATE TABLE visits_layer (StartDate Date) ENGINE Distributed(test_cluster_two_shards_localhost,  currentDatabase(), 'visits', rand());
-
-CREATE LIVE VIEW lv AS SELECT * FROM visits_layer ORDER BY StartDate;
-
-CREATE TABLE visits_layer_lv (StartDate Date) ENGINE Distributed(test_cluster_two_shards_localhost,  currentDatabase(), 'lv', rand());
-
-INSERT INTO visits_layer (StartDate) VALUES ('2020-01-01');
-INSERT INTO visits_layer (StartDate) VALUES ('2020-01-02');
-
-SELECT * FROM visits_layer_lv;
-
-DROP TABLE visits;
-DROP TABLE visits_layer;
-
-DROP TABLE lv;
-DROP TABLE visits_layer_lv;
diff --git a/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.reference b/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.reference
deleted file mode 100644
index 00fc99d96ba..00000000000
--- a/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-2020-01-01
-2020-01-01
-2020-01-02
-2020-01-02
diff --git a/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql b/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
deleted file mode 100644
index b7c1c6eea76..00000000000
--- a/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
+++ /dev/null
@@ -1,23 +0,0 @@
--- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
-
-SET allow_experimental_live_view = 1;
-SET insert_distributed_sync = 1;
-
-DROP TABLE IF EXISTS lv;
-DROP TABLE IF EXISTS visits;
-DROP TABLE IF EXISTS visits_layer;
-
-CREATE TABLE visits(StartDate Date) ENGINE MergeTree ORDER BY(StartDate);
-CREATE TABLE visits_layer(StartDate Date) ENGINE Distributed(test_cluster_two_shards_localhost,  currentDatabase(), 'visits', rand());
-
-CREATE LIVE VIEW lv AS SELECT foo.x FROM (SELECT StartDate AS x FROM visits_layer) AS foo ORDER BY foo.x;
-
-INSERT INTO visits_layer (StartDate) VALUES ('2020-01-01');
-INSERT INTO visits_layer (StartDate) VALUES ('2020-01-02');
-
-SELECT * FROM lv;
-
-DROP TABLE visits;
-DROP TABLE visits_layer;
-
-DROP TABLE lv;
diff --git a/tests/queries/0_stateless/01246_buffer_flush.sql b/tests/queries/0_stateless/01246_buffer_flush.sql
index 47891a7f00e..ac507d94b69 100644
--- a/tests/queries/0_stateless/01246_buffer_flush.sql
+++ b/tests/queries/0_stateless/01246_buffer_flush.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 drop table if exists data_01256;
 drop table if exists buffer_01256;
 
diff --git a/tests/queries/0_stateless/01246_insert_into_watch_live_view.py b/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
deleted file mode 100755
index 02d03abc8c3..00000000000
--- a/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env python3
-# Tags: no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import time
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-# log=sys.stdout
-
-with client(name="client1>", log=log) as client1, client(
-    name="client2>", log=log
-) as client2, client(name="client3>", log=log) as client3:
-    client1.expect(prompt)
-    client2.expect(prompt)
-    client3.expect(prompt)
-
-    client1.send("SET allow_experimental_live_view = 1")
-    client1.expect(prompt)
-    client3.send("SET allow_experimental_live_view = 1")
-    client3.expect(prompt)
-
-    client1.send("DROP TABLE IF EXISTS test.lv")
-    client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS test.lv_sums")
-    client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS test.mt")
-    client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS test.sums")
-    client1.expect(prompt)
-    client1.send("CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()")
-    client1.expect(prompt)
-    client1.send("CREATE LIVE VIEW test.lv AS SELECT sum(a) AS s FROM test.mt")
-    client1.expect(prompt)
-    client1.send(
-        "CREATE TABLE test.sums (s Int32, version Int32) Engine=MergeTree ORDER BY tuple()"
-    )
-    client1.expect(prompt)
-    client3.send(
-        "CREATE LIVE VIEW test.lv_sums AS SELECT * FROM test.sums ORDER BY version"
-    )
-    client3.expect(prompt)
-
-    client3.send("WATCH test.lv_sums FORMAT CSVWithNames")
-
-    client1.send("INSERT INTO test.sums WATCH test.lv")
-    client1.expect(r"INSERT INTO")
-
-    client3.expect("0,1.*\n")
-
-    client2.send("INSERT INTO test.mt VALUES (1),(2),(3)")
-    client2.expect(prompt)
-    client3.expect("6,2.*\n")
-
-    client2.send("INSERT INTO test.mt VALUES (4),(5),(6)")
-    client2.expect(prompt)
-    client3.expect("21,3.*\n")
-
-    # send Ctrl-C
-    client3.send("\x03", eol="")
-    match = client3.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client3.send(client3.command)
-        client3.expect(prompt)
-
-    # send Ctrl-C
-    client1.send("\x03", eol="")
-    match = client1.expect("(%s)|([#\$] )" % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
-
-    client2.send("DROP TABLE test.lv")
-    client2.expect(prompt)
-    client2.send("DROP TABLE test.lv_sums")
-    client2.expect(prompt)
-    client2.send("DROP TABLE test.sums")
-    client2.expect(prompt)
-    client2.send("DROP TABLE test.mt")
-    client2.expect(prompt)
diff --git a/tests/queries/0_stateless/01268_dictionary_direct_layout.sql b/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
index 914d24a740a..45b5c580561 100644
--- a/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
+++ b/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
@@ -75,7 +75,7 @@ CREATE DICTIONARY db_01268.dict2
 )
 PRIMARY KEY region_id
 SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict2' PASSWORD '' DB 'database_for_dict_01268'))
-LAYOUT(DIRECT());
+LAYOUT(DIRECT()) SETTINGS(dictionary_use_async_executor=1, max_threads=8);
 
 CREATE DICTIONARY db_01268.dict3
 (
diff --git a/tests/queries/0_stateless/01271_show_privileges.reference b/tests/queries/0_stateless/01271_show_privileges.reference
index c061eb95a65..ec245d8b9e0 100644
--- a/tests/queries/0_stateless/01271_show_privileges.reference
+++ b/tests/queries/0_stateless/01271_show_privileges.reference
@@ -39,7 +39,7 @@ ALTER MOVE PARTITION	['ALTER MOVE PART','MOVE PARTITION','MOVE PART']	TABLE	ALTE
 ALTER FETCH PARTITION	['ALTER FETCH PART','FETCH PARTITION']	TABLE	ALTER TABLE
 ALTER FREEZE PARTITION	['FREEZE PARTITION','UNFREEZE']	TABLE	ALTER TABLE
 ALTER DATABASE SETTINGS	['ALTER DATABASE SETTING','ALTER MODIFY DATABASE SETTING','MODIFY DATABASE SETTING']	DATABASE	ALTER DATABASE
-ALTER NAMED COLLECTION	[]	\N	ALTER
+ALTER NAMED COLLECTION	[]	NAMED_COLLECTION	NAMED COLLECTION CONTROL
 ALTER TABLE	[]	\N	ALTER
 ALTER DATABASE	[]	\N	ALTER
 ALTER VIEW REFRESH	['ALTER LIVE VIEW REFRESH','REFRESH VIEW']	VIEW	ALTER VIEW
@@ -50,17 +50,19 @@ CREATE DATABASE	[]	DATABASE	CREATE
 CREATE TABLE	[]	TABLE	CREATE
 CREATE VIEW	[]	VIEW	CREATE
 CREATE DICTIONARY	[]	DICTIONARY	CREATE
-CREATE TEMPORARY TABLE	[]	GLOBAL	CREATE
+CREATE TEMPORARY TABLE	[]	GLOBAL	CREATE ARBITRARY TEMPORARY TABLE
+CREATE ARBITRARY TEMPORARY TABLE	[]	GLOBAL	CREATE
 CREATE FUNCTION	[]	GLOBAL	CREATE
-CREATE NAMED COLLECTION	[]	GLOBAL	CREATE
+CREATE NAMED COLLECTION	[]	NAMED_COLLECTION	NAMED COLLECTION CONTROL
 CREATE	[]	\N	ALL
 DROP DATABASE	[]	DATABASE	DROP
 DROP TABLE	[]	TABLE	DROP
 DROP VIEW	[]	VIEW	DROP
 DROP DICTIONARY	[]	DICTIONARY	DROP
 DROP FUNCTION	[]	GLOBAL	DROP
-DROP NAMED COLLECTION	[]	GLOBAL	DROP
+DROP NAMED COLLECTION	[]	NAMED_COLLECTION	NAMED COLLECTION CONTROL
 DROP	[]	\N	ALL
+UNDROP TABLE	[]	TABLE	ALL
 TRUNCATE	['TRUNCATE TABLE']	TABLE	ALL
 OPTIMIZE	['OPTIMIZE TABLE']	TABLE	ALL
 BACKUP	[]	TABLE	ALL
@@ -89,9 +91,10 @@ SHOW ROW POLICIES	['SHOW POLICIES','SHOW CREATE ROW POLICY','SHOW CREATE POLICY'
 SHOW QUOTAS	['SHOW CREATE QUOTA']	GLOBAL	SHOW ACCESS
 SHOW SETTINGS PROFILES	['SHOW PROFILES','SHOW CREATE SETTINGS PROFILE','SHOW CREATE PROFILE']	GLOBAL	SHOW ACCESS
 SHOW ACCESS	[]	\N	ACCESS MANAGEMENT
-SHOW NAMED COLLECTIONS	['SHOW NAMED COLLECTIONS']	GLOBAL	ACCESS MANAGEMENT
-SHOW NAMED COLLECTIONS SECRETS	['SHOW NAMED COLLECTIONS SECRETS']	GLOBAL	ACCESS MANAGEMENT
 ACCESS MANAGEMENT	[]	\N	ALL
+SHOW NAMED COLLECTIONS	['SHOW NAMED COLLECTIONS']	NAMED_COLLECTION	NAMED COLLECTION CONTROL
+SHOW NAMED COLLECTIONS SECRETS	['SHOW NAMED COLLECTIONS SECRETS']	NAMED_COLLECTION	NAMED COLLECTION CONTROL
+NAMED COLLECTION CONTROL	[]	NAMED_COLLECTION	ALL
 SYSTEM SHUTDOWN	['SYSTEM KILL','SHUTDOWN']	GLOBAL	SYSTEM
 SYSTEM DROP DNS CACHE	['SYSTEM DROP DNS','DROP DNS CACHE','DROP DNS']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP MARK CACHE	['SYSTEM DROP MARK','DROP MARK CACHE','DROP MARKS']	GLOBAL	SYSTEM DROP CACHE
@@ -133,8 +136,10 @@ SYSTEM FLUSH LOGS	['FLUSH LOGS']	GLOBAL	SYSTEM FLUSH
 SYSTEM FLUSH	[]	\N	SYSTEM
 SYSTEM THREAD FUZZER	['SYSTEM START THREAD FUZZER','SYSTEM STOP THREAD FUZZER','START THREAD FUZZER','STOP THREAD FUZZER']	GLOBAL	SYSTEM
 SYSTEM UNFREEZE	['SYSTEM UNFREEZE']	GLOBAL	SYSTEM
+SYSTEM FAILPOINT	['SYSTEM ENABLE FAILPOINT','SYSTEM DISABLE FAILPOINT']	GLOBAL	SYSTEM
 SYSTEM	[]	\N	ALL
 dictGet	['dictHas','dictGetHierarchy','dictIsIn']	DICTIONARY	ALL
+displaySecretsInShowAndSelect	[]	GLOBAL	ALL
 addressToLine	[]	GLOBAL	INTROSPECTION
 addressToLineWithInlines	[]	GLOBAL	INTROSPECTION
 addressToSymbol	[]	GLOBAL	INTROSPECTION
diff --git a/tests/queries/0_stateless/01278_alter_rename_combination.reference b/tests/queries/0_stateless/01278_alter_rename_combination.reference
index cc912e9b265..e70c2d2e6f8 100644
--- a/tests/queries/0_stateless/01278_alter_rename_combination.reference
+++ b/tests/queries/0_stateless/01278_alter_rename_combination.reference
@@ -1,7 +1,7 @@
-CREATE TABLE default.rename_table\n(\n    `key` Int32,\n    `old_value1` Int32,\n    `value1` Int32\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.rename_table\n(\n    `key` Int32,\n    `old_value1` Int32,\n    `value1` Int32\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
 key	old_value1	value1
 1	2	3
-CREATE TABLE default.rename_table\n(\n    `k` Int32,\n    `v1` Int32,\n    `v2` Int32\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.rename_table\n(\n    `k` Int32,\n    `v1` Int32,\n    `v2` Int32\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
 k	v1	v2
 1	2	3
 4	5	6
diff --git a/tests/queries/0_stateless/01278_alter_rename_combination.sql b/tests/queries/0_stateless/01278_alter_rename_combination.sql
index fa73362622c..51322f5d86f 100644
--- a/tests/queries/0_stateless/01278_alter_rename_combination.sql
+++ b/tests/queries/0_stateless/01278_alter_rename_combination.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS rename_table;
 
-CREATE TABLE rename_table (key Int32, value1 Int32, value2 Int32) ENGINE = MergeTree ORDER BY tuple();
+CREATE TABLE rename_table (key Int32, value1 Int32, value2 Int32) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part=0;
 
 INSERT INTO rename_table VALUES (1, 2, 3);
 
diff --git a/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.sh b/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.sh
index 0e258bbbb09..08cc97c84bf 100755
--- a/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.sh
+++ b/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.sh
@@ -76,7 +76,7 @@ insert into data_01278 select
     reinterpretAsString(number), // s6
     reinterpretAsString(number), // s7
     reinterpretAsString(number)  // s8
-from numbers(100000); -- { serverError 241; }" > /dev/null 2>&1
+from numbers(100000); -- { serverError 241 }" > /dev/null 2>&1
     local ret_code=$?
     if [[ $ret_code -eq 0 ]];
     then
diff --git a/tests/queries/0_stateless/01278_random_string_utf8.reference b/tests/queries/0_stateless/01278_random_string_utf8.reference
index 36ae0ace76a..45efb26db75 100644
--- a/tests/queries/0_stateless/01278_random_string_utf8.reference
+++ b/tests/queries/0_stateless/01278_random_string_utf8.reference
@@ -2,3 +2,4 @@
 String
 1
 
+99
diff --git a/tests/queries/0_stateless/01278_random_string_utf8.sql b/tests/queries/0_stateless/01278_random_string_utf8.sql
index f2c0a6c41c7..76349d9d814 100644
--- a/tests/queries/0_stateless/01278_random_string_utf8.sql
+++ b/tests/queries/0_stateless/01278_random_string_utf8.sql
@@ -3,3 +3,4 @@ SELECT lengthUTF8(randomStringUTF8(100));
 SELECT toTypeName(randomStringUTF8(10));
 SELECT isValidUTF8(randomStringUTF8(100000));
 SELECT randomStringUTF8(0);
+SELECT lengthUTF8(lowerUTF8(randomStringUTF8(99))); -- bug #49672: msan assert
diff --git a/tests/queries/0_stateless/01281_alter_rename_and_other_renames.reference b/tests/queries/0_stateless/01281_alter_rename_and_other_renames.reference
index bf3358aea60..532b8ce8712 100644
--- a/tests/queries/0_stateless/01281_alter_rename_and_other_renames.reference
+++ b/tests/queries/0_stateless/01281_alter_rename_and_other_renames.reference
@@ -1,11 +1,11 @@
-CREATE TABLE default.rename_table_multiple\n(\n    `key` Int32,\n    `value1_string` String,\n    `value2` Int32\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.rename_table_multiple\n(\n    `key` Int32,\n    `value1_string` String,\n    `value2` Int32\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
 key	value1_string	value2
 1	2	3
-CREATE TABLE default.rename_table_multiple\n(\n    `key` Int32,\n    `value1_string` String,\n    `value2_old` Int32,\n    `value2` Int64 DEFAULT 7\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.rename_table_multiple\n(\n    `key` Int32,\n    `value1_string` String,\n    `value2_old` Int32,\n    `value2` Int64 DEFAULT 7\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
 key	value1_string	value2_old	value2
 1	2	3	7
 4	5	6	7
-CREATE TABLE default.rename_table_multiple\n(\n    `key` Int32,\n    `value1_string` String,\n    `value2_old` Int64 DEFAULT 7\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.rename_table_multiple\n(\n    `key` Int32,\n    `value1_string` String,\n    `value2_old` Int64 DEFAULT 7\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
 key	value1_string	value2_old
 1	2	7
 4	5	7
diff --git a/tests/queries/0_stateless/01281_alter_rename_and_other_renames.sql b/tests/queries/0_stateless/01281_alter_rename_and_other_renames.sql
index f9462f0478e..b0ccd7751ab 100644
--- a/tests/queries/0_stateless/01281_alter_rename_and_other_renames.sql
+++ b/tests/queries/0_stateless/01281_alter_rename_and_other_renames.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS rename_table_multiple;
 
-CREATE TABLE rename_table_multiple (key Int32, value1 String, value2 Int32) ENGINE = MergeTree ORDER BY tuple();
+CREATE TABLE rename_table_multiple (key Int32, value1 String, value2 Int32) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part=0;
 
 INSERT INTO rename_table_multiple VALUES (1, 2, 3);
 
diff --git a/tests/queries/0_stateless/01284_port.sql.j2 b/tests/queries/0_stateless/01284_port.sql.j2
index 6f78b3b8e3b..50e096c6deb 100644
--- a/tests/queries/0_stateless/01284_port.sql.j2
+++ b/tests/queries/0_stateless/01284_port.sql.j2
@@ -19,9 +19,9 @@ select port{{ suffix }}('http://127.0.0.1/', toUInt16(80));
 select port{{ suffix }}('http://foobar.com/', toUInt16(80));
 
 -- unsupported
-/* ILLEGAL_TYPE_OF_ARGUMENT */ select port(toFixedString('', 1)); -- { serverError 43; }
-/* ILLEGAL_TYPE_OF_ARGUMENT */ select port{{ suffix }}('', 1); -- { serverError 43; }
-/* NUMBER_OF_ARGUMENTS_DOESNT_MATCH */ select port{{ suffix }}('', 1, 1); -- { serverError 42; }
+/* ILLEGAL_TYPE_OF_ARGUMENT */ select port(toFixedString('', 1)); -- { serverError 43 }
+/* ILLEGAL_TYPE_OF_ARGUMENT */ select port{{ suffix }}('', 1); -- { serverError 43 }
+/* NUMBER_OF_ARGUMENTS_DOESNT_MATCH */ select port{{ suffix }}('', 1, 1); -- { serverError 42 }
 
 --
 -- Known limitations of domain() (getURLHost())
diff --git a/tests/queries/0_stateless/01291_aggregation_in_order.reference b/tests/queries/0_stateless/01291_aggregation_in_order.reference
index c072a8aed3e..cf058b9f2f5 100644
--- a/tests/queries/0_stateless/01291_aggregation_in_order.reference
+++ b/tests/queries/0_stateless/01291_aggregation_in_order.reference
@@ -22,8 +22,8 @@
 2	4	109	2
 1	619	1
 2	537	2
-1	619	1
-2	537	2
+-2	537	2
+-1	619	1
 2019-05-05 00:00:00	-45363190
 2019-05-05 00:00:00	-1249512288
 2019-05-05 00:00:00	345522721
diff --git a/tests/queries/0_stateless/01291_aggregation_in_order.sql b/tests/queries/0_stateless/01291_aggregation_in_order.sql
index c4357811520..e93eadc3329 100644
--- a/tests/queries/0_stateless/01291_aggregation_in_order.sql
+++ b/tests/queries/0_stateless/01291_aggregation_in_order.sql
@@ -14,7 +14,7 @@ SELECT a FROM pk_order GROUP BY a ORDER BY a;
 
 SELECT a, b, sum(c), avg(d) FROM pk_order GROUP BY a, b ORDER BY a, b;
 SELECT a, sum(c), avg(d) FROM pk_order GROUP BY a ORDER BY a;
-SELECT a, sum(c), avg(d) FROM pk_order GROUP BY -a ORDER BY a;
+SELECT -a, sum(c), avg(d) FROM pk_order GROUP BY -a ORDER BY -a;
 
 DROP TABLE IF EXISTS pk_order;
 
@@ -27,7 +27,7 @@ INSERT INTO pk_order
 set max_block_size = 1;
 
 SELECT d, max(b) FROM pk_order GROUP BY d, a ORDER BY d, a LIMIT 5;
-SELECT d, avg(a) FROM pk_order GROUP BY toString(d) ORDER BY toString(d) LIMIT 5;
+SELECT toString(d), avg(a) FROM pk_order GROUP BY toString(d) ORDER BY toString(d) LIMIT 5;
 SELECT toStartOfHour(d) as d1, min(a), max(b) FROM pk_order GROUP BY d1 ORDER BY d1 LIMIT 5;
 
 DROP TABLE pk_order;
diff --git a/tests/queries/0_stateless/01291_geo_types.sql b/tests/queries/0_stateless/01291_geo_types.sql
index 6b686ddf520..4038c545679 100644
--- a/tests/queries/0_stateless/01291_geo_types.sql
+++ b/tests/queries/0_stateless/01291_geo_types.sql
@@ -1,7 +1,5 @@
 DROP TABLE IF EXISTS geo;
 
-SET allow_experimental_geo_types = 1;
-
 CREATE TABLE geo (a Point, b Ring, c Polygon, d MultiPolygon) ENGINE=Memory();
 
 INSERT INTO geo VALUES((0, 0), [(0, 0), (10, 0), (10, 10), (0, 10)], [[(20, 20), (50, 20), (50, 50), (20, 50)], [(30, 30), (50, 50), (50, 30)]], [[[(0, 0), (10, 0), (10, 10), (0, 10)]], [[(20, 20), (50, 20), (50, 50), (20, 50)],[(30, 30), (50, 50), (50, 30)]]]);
diff --git a/tests/queries/0_stateless/01292_create_user.reference b/tests/queries/0_stateless/01292_create_user.reference
index f723412c636..eb89a5ed38c 100644
--- a/tests/queries/0_stateless/01292_create_user.reference
+++ b/tests/queries/0_stateless/01292_create_user.reference
@@ -13,6 +13,8 @@ CREATE USER u4_01292 IDENTIFIED WITH sha256_password
 CREATE USER u5_01292 IDENTIFIED WITH sha256_password
 CREATE USER u6_01292 IDENTIFIED WITH double_sha1_password
 CREATE USER u7_01292 IDENTIFIED WITH double_sha1_password
+CREATE USER u8_01292 IDENTIFIED WITH bcrypt_password
+CREATE USER u9_01292 IDENTIFIED WITH bcrypt_password
 CREATE USER u1_01292 IDENTIFIED WITH sha256_password
 CREATE USER u2_01292 IDENTIFIED WITH sha256_password
 CREATE USER u3_01292 IDENTIFIED WITH sha256_password
diff --git a/tests/queries/0_stateless/01292_create_user.sql b/tests/queries/0_stateless/01292_create_user.sql
index d0f157d36b0..a283ce687e6 100644
--- a/tests/queries/0_stateless/01292_create_user.sql
+++ b/tests/queries/0_stateless/01292_create_user.sql
@@ -1,4 +1,4 @@
--- Tags: no-fasttest
+-- Tags: no-fasttest, no-parallel
 
 DROP USER IF EXISTS u1_01292, u2_01292, u3_01292, u4_01292, u5_01292, u6_01292, u7_01292, u8_01292, u9_01292;
 DROP USER IF EXISTS u10_01292, u11_01292, u12_01292, u13_01292, u14_01292, u15_01292, u16_01292;
@@ -31,6 +31,8 @@ CREATE USER u4_01292 IDENTIFIED WITH sha256_password BY 'qwe123';
 CREATE USER u5_01292 IDENTIFIED WITH sha256_hash BY '18138372FAD4B94533CD4881F03DC6C69296DD897234E0CEE83F727E2E6B1F63';
 CREATE USER u6_01292 IDENTIFIED WITH double_sha1_password BY 'qwe123';
 CREATE USER u7_01292 IDENTIFIED WITH double_sha1_hash BY '8DCDD69CE7D121DE8013062AEAEB2A148910D50E';
+CREATE USER u8_01292 IDENTIFIED WITH bcrypt_password BY 'qwe123';
+CREATE USER u9_01292 IDENTIFIED WITH bcrypt_hash BY '$2a$12$rz5iy2LhuwBezsM88ZzWiemOVUeJ94xHTzwAlLMDhTzwUxOHaY64q';
 SHOW CREATE USER u1_01292;
 SHOW CREATE USER u2_01292;
 SHOW CREATE USER u3_01292;
@@ -38,6 +40,8 @@ SHOW CREATE USER u4_01292;
 SHOW CREATE USER u5_01292;
 SHOW CREATE USER u6_01292;
 SHOW CREATE USER u7_01292;
+SHOW CREATE USER u8_01292;
+SHOW CREATE USER u9_01292;
 ALTER USER u1_01292 IDENTIFIED BY '123qwe';
 ALTER USER u2_01292 IDENTIFIED BY '123qwe';
 ALTER USER u3_01292 IDENTIFIED BY '123qwe';
@@ -48,7 +52,7 @@ SHOW CREATE USER u2_01292;
 SHOW CREATE USER u3_01292;
 SHOW CREATE USER u4_01292;
 SHOW CREATE USER u5_01292;
-DROP USER u1_01292, u2_01292, u3_01292, u4_01292, u5_01292, u6_01292, u7_01292;
+DROP USER u1_01292, u2_01292, u3_01292, u4_01292, u5_01292, u6_01292, u7_01292, u8_01292, u9_01292;
 
 SELECT '-- host';
 CREATE USER u1_01292 HOST ANY;
diff --git a/tests/queries/0_stateless/01293_optimize_final_force.sh b/tests/queries/0_stateless/01293_optimize_final_force.sh
index 60d45f87385..994d5952dbc 100755
--- a/tests/queries/0_stateless/01293_optimize_final_force.sh
+++ b/tests/queries/0_stateless/01293_optimize_final_force.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01293_show_clusters.reference b/tests/queries/0_stateless/01293_show_clusters.reference
index c62f8cdfa2d..9f8a44ebd0a 100644
--- a/tests/queries/0_stateless/01293_show_clusters.reference
+++ b/tests/queries/0_stateless/01293_show_clusters.reference
@@ -1,2 +1,3 @@
 test_shard_localhost
-test_shard_localhost	1	1	1	localhost	::1	9000	1	default	
+test_cluster_one_shard_two_replicas	1	1	1	127.0.0.1	127.0.0.1	9000	1	default	
+test_cluster_one_shard_two_replicas	1	1	2	127.0.0.2	127.0.0.2	9000	0	default	
diff --git a/tests/queries/0_stateless/01293_show_clusters.sh b/tests/queries/0_stateless/01293_show_clusters.sh
index 2fdf17ec25e..ae027210383 100755
--- a/tests/queries/0_stateless/01293_show_clusters.sh
+++ b/tests/queries/0_stateless/01293_show_clusters.sh
@@ -6,4 +6,5 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -q "show clusters like 'test_shard%' limit 1"
 # cluster,shard_num,shard_weight,replica_num,host_name,host_address,port,is_local,user,default_database[,errors_count,slowdowns_count,estimated_recovery_time]
-$CLICKHOUSE_CLIENT -q "show cluster 'test_shard_localhost'" | cut -f-10
+# use a cluster with static IPv4
+$CLICKHOUSE_CLIENT -q "show cluster 'test_cluster_one_shard_two_replicas'" | cut -f-10
diff --git a/tests/queries/0_stateless/01293_show_settings.reference b/tests/queries/0_stateless/01293_show_settings.reference
index f11956e1893..f053387d1c5 100644
--- a/tests/queries/0_stateless/01293_show_settings.reference
+++ b/tests/queries/0_stateless/01293_show_settings.reference
@@ -3,6 +3,6 @@ connect_timeout	Seconds	10
 connect_timeout_with_failover_ms	Milliseconds	2000
 connect_timeout_with_failover_secure_ms	Milliseconds	3000
 external_storage_connect_timeout_sec	UInt64	10
+filesystem_prefetch_max_memory_usage	UInt64	1073741824
 max_untracked_memory	UInt64	1048576
 memory_profiler_step	UInt64	1048576
-filesystem_prefetch_max_memory_usage	UInt64	1073741824
diff --git a/tests/queries/0_stateless/01297_create_quota.reference b/tests/queries/0_stateless/01297_create_quota.reference
index f3f833d7619..6b844e0d2f6 100644
--- a/tests/queries/0_stateless/01297_create_quota.reference
+++ b/tests/queries/0_stateless/01297_create_quota.reference
@@ -64,3 +64,40 @@ q4_01297	604800	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 -- query_selects query_inserts
 CREATE QUOTA q1_01297 KEYED BY user_name FOR INTERVAL 1 minute MAX query_selects = 1 TO r1_01297
 CREATE QUOTA q2_01297 KEYED BY user_name FOR INTERVAL 1 minute MAX query_inserts = 1 TO r1_01297
+-- size suffix
+-- functional test
+CREATE QUOTA q1_01297 FOR INTERVAL 1 minute MAX query_selects = 12000
+CREATE QUOTA q2_01297 FOR INTERVAL 1 minute MAX query_selects = 12288
+CREATE QUOTA q3_01297 FOR INTERVAL 1 minute MAX query_selects = 12000000
+CREATE QUOTA q4_01297 FOR INTERVAL 1 minute MAX query_selects = 12582912
+CREATE QUOTA q5_01297 FOR INTERVAL 1 minute MAX query_selects = 12000000000
+CREATE QUOTA q6_01297 FOR INTERVAL 1 minute MAX query_selects = 12884901888
+CREATE QUOTA q7_01297 FOR INTERVAL 1 minute MAX query_selects = 12000000000000
+CREATE QUOTA q8_01297 FOR INTERVAL 1 minute MAX query_selects = 13194139533312
+CREATE QUOTA q9_01297 FOR INTERVAL 1 minute MAX execution_time = 12000
+CREATE QUOTA q10_01297 FOR INTERVAL 1 minute MAX execution_time = 12288
+CREATE QUOTA q11_01297 FOR INTERVAL 1 minute MAX execution_time = 12000000
+CREATE QUOTA q12_01297 FOR INTERVAL 1 minute MAX execution_time = 12582912
+CREATE QUOTA q13_01297 FOR INTERVAL 1 minute MAX execution_time = 12000000000
+CREATE QUOTA q14_01297 FOR INTERVAL 1 minute MAX execution_time = 12884901888
+CREATE QUOTA q15_01297 FOR INTERVAL 1 minute MAX query_selects = 1
+CREATE QUOTA q16_01297 FOR INTERVAL 1 minute MAX execution_time = 1.5
+-- overflow test
+CREATE QUOTA q1_01297 FOR INTERVAL 1 minute MAX query_selects = 18446744073709551615
+CREATE QUOTA q2_01297 FOR INTERVAL 1 minute MAX execution_time = 18446744073
+-- zero test
+CREATE QUOTA q1_01297 FOR INTERVAL 1 minute MAX query_selects = 0
+CREATE QUOTA q2_01297 FOR INTERVAL 1 minute MAX execution_time = 0
+-- underflow test
+-- syntax test
+CREATE QUOTA q1_01297 FOR INTERVAL 1 minute MAX query_selects = 12
+CREATE QUOTA q2_01297 FOR INTERVAL 1 minute MAX execution_time = 12
+CREATE QUOTA q3_01297 FOR INTERVAL 1 minute MAX query_selects = 12000
+CREATE QUOTA q4_01297 FOR INTERVAL 1 minute MAX execution_time = 12000
+CREATE QUOTA q5_01297 FOR INTERVAL 1 minute MAX execution_time = 0
+CREATE QUOTA q6_01297 FOR INTERVAL 1 minute MAX execution_time = 0
+CREATE QUOTA q7_01297 FOR INTERVAL 1 minute MAX execution_time = 0
+CREATE QUOTA q8_01297 FOR INTERVAL 1 minute MAX execution_time = 0
+CREATE QUOTA q9_01297 FOR INTERVAL 1 minute MAX execution_time = 123000
+CREATE QUOTA q10_01297 FOR INTERVAL 1 minute MAX execution_time = 123000
+-- bad syntax test
diff --git a/tests/queries/0_stateless/01297_create_quota.sql b/tests/queries/0_stateless/01297_create_quota.sql
index b30d453257a..a0ecb6bd2d0 100644
--- a/tests/queries/0_stateless/01297_create_quota.sql
+++ b/tests/queries/0_stateless/01297_create_quota.sql
@@ -1,7 +1,8 @@
 -- Tags: no-parallel
 
-DROP QUOTA IF EXISTS q1_01297, q2_01297, q3_01297, q4_01297, q5_01297, q6_01297, q7_01297, q8_01297, q9_01297, q10_01297;
-DROP QUOTA IF EXISTS q11_01297, q12_01297;
+DROP QUOTA IF EXISTS q1_01297, q2_01297, q3_01297, q4_01297, q5_01297, q6_01297, q7_01297, q8_01297, q9_01297,
+q10_01297, q11_01297, q12_01297, q13_01297, q14_01297, q15_01297, q16_01297, q17_01297,q18_01297;
+
 DROP QUOTA IF EXISTS q2_01297_renamed;
 DROP USER IF EXISTS u1_01297;
 DROP ROLE IF EXISTS r1_01297;
@@ -137,3 +138,112 @@ DROP QUOTA q1_01297, q2_01297;
 DROP ROLE r1_01297;
 DROP USER u1_01297;
 
+SELECT '-- size suffix';
+SELECT '-- functional test';
+CREATE QUOTA q1_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '12K';
+CREATE QUOTA q2_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '12Ki';
+CREATE QUOTA q3_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '12M';
+CREATE QUOTA q4_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '12Mi';
+CREATE QUOTA q5_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '12G';
+CREATE QUOTA q6_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '12Gi';
+CREATE QUOTA q7_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '12T';
+CREATE QUOTA q8_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '12Ti';
+CREATE QUOTA q9_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '12K';
+CREATE QUOTA q10_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '12Ki';
+CREATE QUOTA q11_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '12M';
+CREATE QUOTA q12_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '12Mi';
+CREATE QUOTA q13_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '12G';
+CREATE QUOTA q14_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '12Gi';
+CREATE QUOTA q15_01297 FOR INTERVAL 1 MINUTE MAX query_selects = 1.5;
+CREATE QUOTA q16_01297 FOR INTERVAL 1 MINUTE MAX execution_time = 1.5;
+CREATE QUOTA q17_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '1.5'; -- { clientError 27 }
+CREATE QUOTA q18_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '1.5'; -- { clientError 27 }
+SHOW CREATE QUOTA q1_01297;
+SHOW CREATE QUOTA q2_01297;
+SHOW CREATE QUOTA q3_01297;
+SHOW CREATE QUOTA q4_01297;
+SHOW CREATE QUOTA q5_01297;
+SHOW CREATE QUOTA q6_01297;
+SHOW CREATE QUOTA q7_01297;
+SHOW CREATE QUOTA q8_01297;
+SHOW CREATE QUOTA q9_01297;
+SHOW CREATE QUOTA q10_01297;
+SHOW CREATE QUOTA q11_01297;
+SHOW CREATE QUOTA q12_01297;
+SHOW CREATE QUOTA q13_01297;
+SHOW CREATE QUOTA q14_01297;
+SHOW CREATE QUOTA q15_01297;
+SHOW CREATE QUOTA q16_01297;
+DROP QUOTA IF EXISTS q1_01297;
+DROP QUOTA IF EXISTS q2_01297;
+DROP QUOTA IF EXISTS q3_01297;
+DROP QUOTA IF EXISTS q4_01297;
+DROP QUOTA IF EXISTS q5_01297;
+DROP QUOTA IF EXISTS q6_01297;
+DROP QUOTA IF EXISTS q7_01297;
+DROP QUOTA IF EXISTS q8_01297;
+DROP QUOTA IF EXISTS q9_01297;
+DROP QUOTA IF EXISTS q10_01297;
+DROP QUOTA IF EXISTS q11_01297;
+DROP QUOTA IF EXISTS q12_01297;
+DROP QUOTA IF EXISTS q13_01297;
+DROP QUOTA IF EXISTS q14_01297;
+DROP QUOTA IF EXISTS q15_01297;
+DROP QUOTA IF EXISTS q16_01297;
+SELECT '-- overflow test';
+CREATE QUOTA q1_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '18446744073709551615';
+CREATE QUOTA q2_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '18446744073';
+SHOW CREATE QUOTA q1_01297;
+SHOW CREATE QUOTA q2_01297;
+DROP QUOTA IF EXISTS q1_01297;
+DROP QUOTA IF EXISTS q2_01297;
+SELECT '-- zero test';
+CREATE QUOTA q1_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '0';
+CREATE QUOTA q2_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '0';
+SHOW CREATE QUOTA q1_01297;
+SHOW CREATE QUOTA q2_01297;
+DROP QUOTA IF EXISTS q1_01297;
+DROP QUOTA IF EXISTS q2_01297;
+SELECT '-- underflow test';
+CREATE QUOTA q1_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '-1'; -- { clientError 72 }
+CREATE QUOTA q2_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '-1'; -- { clientError 72 }
+SELECT '-- syntax test';
+CREATE QUOTA q1_01297 FOR INTERVAL 1 MINUTE MAX query_selects = ' 12 ';
+CREATE QUOTA q2_01297 FOR INTERVAL 1 MINUTE MAX execution_time = ' 12 ';
+CREATE QUOTA q3_01297 FOR INTERVAL 1 MINUTE MAX query_selects = ' 12k ';
+CREATE QUOTA q4_01297 FOR INTERVAL 1 MINUTE MAX execution_time = ' 12k ';
+CREATE QUOTA q5_01297 FOR INTERVAL 1 MINUTE MAX execution_time = ' 00 ';
+CREATE QUOTA q6_01297 FOR INTERVAL 1 MINUTE MAX execution_time = ' 00 ';
+CREATE QUOTA q7_01297 FOR INTERVAL 1 MINUTE MAX execution_time = ' 00k ';
+CREATE QUOTA q8_01297 FOR INTERVAL 1 MINUTE MAX execution_time = ' 00k ';
+CREATE QUOTA q9_01297 FOR INTERVAL 1 MINUTE MAX execution_time = ' 00123k ';
+CREATE QUOTA q10_01297 FOR INTERVAL 1 MINUTE MAX execution_time = ' 00123k ';
+SHOW CREATE QUOTA q1_01297;
+SHOW CREATE QUOTA q2_01297;
+SHOW CREATE QUOTA q3_01297;
+SHOW CREATE QUOTA q4_01297;
+SHOW CREATE QUOTA q5_01297;
+SHOW CREATE QUOTA q6_01297;
+SHOW CREATE QUOTA q7_01297;
+SHOW CREATE QUOTA q8_01297;
+SHOW CREATE QUOTA q9_01297;
+SHOW CREATE QUOTA q10_01297;
+DROP QUOTA IF EXISTS q1_01297;
+DROP QUOTA IF EXISTS q2_01297;
+DROP QUOTA IF EXISTS q3_01297;
+DROP QUOTA IF EXISTS q4_01297;
+DROP QUOTA IF EXISTS q5_01297;
+DROP QUOTA IF EXISTS q6_01297;
+DROP QUOTA IF EXISTS q7_01297;
+DROP QUOTA IF EXISTS q8_01297;
+DROP QUOTA IF EXISTS q9_01297;
+DROP QUOTA IF EXISTS q10_01297;
+SELECT '-- bad syntax test';
+CREATE QUOTA q1_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '1 1'; -- { clientError 27 }
+CREATE QUOTA q2_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '1 1'; -- { clientError 27 }
+CREATE QUOTA q3_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '1K 1'; -- { clientError 27 }
+CREATE QUOTA q4_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '1K 1'; -- { clientError 27 }
+CREATE QUOTA q5_01297 FOR INTERVAL 1 MINUTE MAX query_selects = '1K1'; -- { clientError 27 }
+CREATE QUOTA q6_01297 FOR INTERVAL 1 MINUTE MAX execution_time = '1K1'; -- { clientError 27 }
+CREATE QUOTA q7_01297 FOR INTERVAL 1 MINUTE MAX query_selects = 'foo'; -- { clientError 27 }
+CREATE QUOTA q8_01297 FOR INTERVAL 1 MINUTE MAX execution_time = 'bar'; -- { clientError 27 }
diff --git a/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect b/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
index a593075bb9a..c897d7e9772 100755
--- a/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
+++ b/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
@@ -28,7 +28,7 @@ exec kill -9 [exp_pid]
 close
 
 # Run client one more time and press "up" to see the last recorded query
-spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT --history_file=$history_file"
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT --disable_suggestion --history_file=$history_file"
 expect ":) "
 send -- "\[A"
 expect "for the history"
diff --git a/tests/queries/0_stateless/01300_group_by_other_keys_having.sql b/tests/queries/0_stateless/01300_group_by_other_keys_having.sql
index d209c5f24e3..911f61a62e2 100644
--- a/tests/queries/0_stateless/01300_group_by_other_keys_having.sql
+++ b/tests/queries/0_stateless/01300_group_by_other_keys_having.sql
@@ -1,5 +1,5 @@
 set optimize_group_by_function_keys = 1;
-
+set allow_experimental_analyzer = 1;
 
 -- { echoOn }
 SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY (number % 2) * (number % 3), number % 3, number % 2 HAVING avg(log(2) * number) > 3465735.3 ORDER BY k;
diff --git a/tests/queries/0_stateless/01308_orc_output_format_arrays.reference b/tests/queries/0_stateless/01308_orc_output_format_arrays.reference
index 1f9646ac112..7feea7cec35 100644
Binary files a/tests/queries/0_stateless/01308_orc_output_format_arrays.reference and b/tests/queries/0_stateless/01308_orc_output_format_arrays.reference differ
diff --git a/tests/queries/0_stateless/01308_orc_output_format_arrays.sh b/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
index 1d9aea353b6..498854874cf 100755
--- a/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
+++ b/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
@@ -11,7 +11,7 @@ $CLICKHOUSE_CLIENT --query="CREATE TABLE orc (array1 Array(Int32), array2 Array(
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO orc VALUES ([1,2,3,4,5], [[1,2], [3,4], [5]]), ([42], [[42, 42], [42]])";
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM orc FORMAT ORC";
+$CLICKHOUSE_CLIENT --query="SELECT * FROM orc FORMAT ORC SETTINGS output_format_orc_compression_method='none'" | md5sum;
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE orc";
 
diff --git a/tests/queries/0_stateless/01310_enum_comparison.sql b/tests/queries/0_stateless/01310_enum_comparison.sql
index 26901a61b2b..ed63911e698 100644
--- a/tests/queries/0_stateless/01310_enum_comparison.sql
+++ b/tests/queries/0_stateless/01310_enum_comparison.sql
@@ -3,4 +3,4 @@ INSERT INTO enum VALUES ('hello');
 
 SELECT count() FROM enum WHERE x = 'hello';
 SELECT count() FROM enum WHERE x = 'world';
-SELECT count() FROM enum WHERE x = 'xyz'; -- { serverError 36 }
+SELECT count() FROM enum WHERE x = 'xyz'; -- { serverError 691 }
diff --git a/tests/queries/0_stateless/01318_alter_add_constraint_format.reference b/tests/queries/0_stateless/01318_alter_add_constraint_format.reference
index 7a3b41536e0..9f58d161539 100644
--- a/tests/queries/0_stateless/01318_alter_add_constraint_format.reference
+++ b/tests/queries/0_stateless/01318_alter_add_constraint_format.reference
@@ -1,2 +1 @@
-ALTER TABLE replicated_constraints1
-    ADD CONSTRAINT IF NOT EXISTS b_constraint CHECK b > 10
+ALTER TABLE replicated_constraints1 ADD CONSTRAINT IF NOT EXISTS b_constraint CHECK b > 10
diff --git a/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference b/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference
index 91a96eb68a3..bf184d142ec 100644
--- a/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference
+++ b/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference
@@ -65,6 +65,7 @@ QUERY id: 0
           SORT id: 12, sort_direction: ASCENDING, with_fill: 0
             EXPRESSION
               COLUMN id: 7, column_name: number, result_type: UInt64, source_id: 8
+  SETTINGS allow_experimental_analyzer=1
 SELECT groupArray(x)
 FROM
 (
@@ -98,6 +99,7 @@ QUERY id: 0
           SORT id: 12, sort_direction: ASCENDING, with_fill: 0
             EXPRESSION
               COLUMN id: 7, column_name: number, result_type: UInt64, source_id: 8
+  SETTINGS allow_experimental_analyzer=1
 SELECT groupArray(x)
 FROM
 (
@@ -139,6 +141,7 @@ QUERY id: 0
           SORT id: 15, sort_direction: ASCENDING, with_fill: 0
             EXPRESSION
               COLUMN id: 7, column_name: number, result_type: UInt64, source_id: 8
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     key,
     a,
@@ -200,6 +203,7 @@ QUERY id: 0
       SORT id: 25, sort_direction: ASCENDING, with_fill: 0
         EXPRESSION
           COLUMN id: 26, column_name: key, result_type: UInt64, source_id: 5
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     key,
     a
@@ -225,6 +229,7 @@ QUERY id: 0
       SORT id: 7, sort_direction: ASCENDING, with_fill: 0
         EXPRESSION
           COLUMN id: 4, column_name: a, result_type: UInt8, source_id: 3
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     key,
     a
@@ -257,6 +262,7 @@ QUERY id: 0
                     LIST id: 11, nodes: 2
                       COLUMN id: 2, column_name: key, result_type: UInt64, source_id: 3
                       COLUMN id: 4, column_name: a, result_type: UInt8, source_id: 3
+  SETTINGS allow_experimental_analyzer=1
 QUERY id: 0
   PROJECTION COLUMNS
     key UInt64
@@ -279,6 +285,7 @@ QUERY id: 0
       SORT id: 10, sort_direction: ASCENDING, with_fill: 0
         EXPRESSION
           COLUMN id: 2, column_name: key, result_type: UInt64, source_id: 3
+  SETTINGS allow_experimental_analyzer=1
 QUERY id: 0
   PROJECTION COLUMNS
     t1.id UInt64
@@ -307,6 +314,7 @@ QUERY id: 0
       SORT id: 14, sort_direction: ASCENDING, with_fill: 0
         EXPRESSION
           COLUMN id: 15, column_name: id, result_type: UInt64, source_id: 5
+  SETTINGS allow_experimental_analyzer=1
 [0,1,2]
 [0,1,2]
 [0,1,2]
diff --git a/tests/queries/0_stateless/01323_redundant_functions_in_order_by.sql b/tests/queries/0_stateless/01323_redundant_functions_in_order_by.sql
index 338c1345052..738ad581e3d 100644
--- a/tests/queries/0_stateless/01323_redundant_functions_in_order_by.sql
+++ b/tests/queries/0_stateless/01323_redundant_functions_in_order_by.sql
@@ -20,25 +20,25 @@ SELECT key, a FROM test ORDER BY key, a, exp(key + a) SETTINGS allow_experimenta
 SELECT key, a FROM test ORDER BY key, exp(key + a);
 SELECT key, a FROM test ORDER BY key, exp(key + a) SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(x));
-EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(x));
+EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(x)) settings allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(exp(x)));
-EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(exp(x)));
+EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(exp(x))) settings allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY exp(x), x);
-EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY exp(x), x);
+EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY exp(x), x) settings allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s FULL JOIN test t USING(key) ORDER BY s.key, t.key;
-EXPLAIN QUERY TREE run_passes=1 SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s FULL JOIN test t USING(key) ORDER BY s.key, t.key;
+EXPLAIN QUERY TREE run_passes=1 SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s FULL JOIN test t USING(key) ORDER BY s.key, t.key settings allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT key, a FROM test ORDER BY key, a, exp(key + a);
-EXPLAIN QUERY TREE run_passes=1 SELECT key, a FROM test ORDER BY key, a, exp(key + a);
+EXPLAIN QUERY TREE run_passes=1 SELECT key, a FROM test ORDER BY key, a, exp(key + a) settings allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT key, a FROM test ORDER BY key, exp(key + a);
-EXPLAIN QUERY TREE run_passes=1 SELECT key, a FROM test ORDER BY key, exp(key + a);
-EXPLAIN QUERY TREE run_passes=1 SELECT key FROM test GROUP BY key ORDER BY avg(a), key;
+EXPLAIN QUERY TREE run_passes=1 SELECT key, a FROM test ORDER BY key, exp(key + a) settings allow_experimental_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT key FROM test GROUP BY key ORDER BY avg(a), key settings allow_experimental_analyzer=1;
 
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 CREATE TABLE t1 (id UInt64) ENGINE = MergeTree() ORDER BY id;
 CREATE TABLE t2 (id UInt64) ENGINE = MergeTree() ORDER BY id;
 
-EXPLAIN QUERY TREE run_passes=1 SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id ORDER BY t1.id, t2.id;
+EXPLAIN QUERY TREE run_passes=1 SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id ORDER BY t1.id, t2.id settings allow_experimental_analyzer=1;
 
 set optimize_redundant_functions_in_order_by = 0;
 
diff --git a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.reference b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.reference
index 60c6076aef0..a905ea97ae5 100644
--- a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.reference
+++ b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.reference
@@ -1,24 +1,24 @@
 hello	test
 hello	test
-1_0_0_0	hello	1
-1_0_0_0	hello	1
+0	0	hello	1
+0	0	hello	1
 hello	test
 goodbye	test
 hello	test
 goodbye	test
-3_0_0_1	goodbye	3
-1_0_0_1	hello	1
-3_0_0_1	goodbye	3
-1_0_0_1	hello	1
+0	0	goodbye	3
+0	0	hello	1
+0	0	goodbye	3
+0	0	hello	1
 1	test
 3	test
 111	abc
 1	test
 3	test
 111	abc
-1_0_0_2	1	1
-111_0_0_1	111	111
-3_0_0_2	3	3
-1_0_0_2	1	1
-111_0_0_1	111	111
-3_0_0_2	3	3
+0	0	1	1
+0	0	111	111
+0	0	3	3
+0	0	1	1
+0	0	111	111
+0	0	3	3
diff --git a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
index f20156fd9e3..d40bcc15e55 100644
--- a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
@@ -13,16 +13,17 @@ INSERT INTO test VALUES ('hello', 'test');
 SELECT * FROM test;
 SYSTEM SYNC REPLICA test2;
 SELECT * FROM test2;
-SELECT name, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test' AND active ORDER BY partition;
-SELECT name, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test2' AND active ORDER BY partition;
+SELECT min_block_number, max_block_number, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test' AND active ORDER BY partition;
+SELECT min_block_number, max_block_number, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test2' AND active ORDER BY partition;
 
 ALTER TABLE test MODIFY COLUMN x Enum('hello' = 1, 'world' = 2, 'goodbye' = 3);
 INSERT INTO test VALUES ('goodbye', 'test');
 OPTIMIZE TABLE test FINAL;
 SELECT * FROM test ORDER BY x;
+SYSTEM SYNC REPLICA test2;
 SELECT * FROM test2 ORDER BY x;
-SELECT name, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test' AND active ORDER BY partition;
-SELECT name, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test2' AND active ORDER BY partition;
+SELECT min_block_number, max_block_number, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test' AND active ORDER BY partition;
+SELECT min_block_number, max_block_number, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test2' AND active ORDER BY partition;
 
 ALTER TABLE test MODIFY COLUMN x Enum('hello' = 1, 'world' = 2); -- { serverError 524 }
 ALTER TABLE test MODIFY COLUMN x Enum('hello' = 1, 'world' = 2, 'test' = 3);
@@ -33,9 +34,10 @@ ALTER TABLE test MODIFY COLUMN x Int8;
 INSERT INTO test VALUES (111, 'abc');
 OPTIMIZE TABLE test FINAL;
 SELECT * FROM test ORDER BY x;
+SYSTEM SYNC REPLICA test2;
 SELECT * FROM test2 ORDER BY x;
-SELECT name, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test' AND active ORDER BY partition;
-SELECT name, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test2' AND active ORDER BY partition;
+SELECT min_block_number, max_block_number, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test' AND active ORDER BY partition;
+SELECT min_block_number, max_block_number, partition, partition_id FROM system.parts WHERE database = currentDatabase() AND table = 'test2' AND active ORDER BY partition;
 
 ALTER TABLE test MODIFY COLUMN x Enum8('' = 1); -- { serverError 524 }
 ALTER TABLE test MODIFY COLUMN x Enum16('' = 1); -- { serverError 524 }
diff --git a/tests/queries/0_stateless/01361_fover_remote_num_tries.sh b/tests/queries/0_stateless/01361_fover_remote_num_tries.sh
index 12a65a96c9b..2ee2ec1bc76 100755
--- a/tests/queries/0_stateless/01361_fover_remote_num_tries.sh
+++ b/tests/queries/0_stateless/01361_fover_remote_num_tries.sh
@@ -5,4 +5,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --connections_with_failover_max_tries 10 --query "SELECT hostName() FROM remote('128.1.2.3', default.tmp)" 2>&1 | grep -o -P 'connect timed out|Network is unreachable' | wc -l
+$CLICKHOUSE_CLIENT --connections_with_failover_max_tries 10 --query "SELECT hostName() FROM remote('128.1.2.3', default.tmp)" 2>&1 | grep -o -P 'Timeout exceeded while connecting to socket|Network is unreachable' | wc -l
diff --git a/tests/queries/0_stateless/01375_GROUP_BY_injective_elimination_dictGet_BAD_ARGUMENTS.sql b/tests/queries/0_stateless/01375_GROUP_BY_injective_elimination_dictGet_BAD_ARGUMENTS.sql
index 88a2b25c2db..8ff9cd2b9f2 100644
--- a/tests/queries/0_stateless/01375_GROUP_BY_injective_elimination_dictGet_BAD_ARGUMENTS.sql
+++ b/tests/queries/0_stateless/01375_GROUP_BY_injective_elimination_dictGet_BAD_ARGUMENTS.sql
@@ -1 +1 @@
-SELECT dictGetString(concat('default', '.countryId'), 'country', toUInt64(number)) AS country FROM numbers(2) GROUP BY country; -- { serverError 36; }
+SELECT dictGetString(concat('default', '.countryId'), 'country', toUInt64(number)) AS country FROM numbers(2) GROUP BY country; -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql b/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
index 258d96829a5..29ffcb46fbf 100644
--- a/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
+++ b/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
@@ -1,7 +1,7 @@
 -- Tags: no-parallel
 
 -- https://github.com/ClickHouse/ClickHouse/issues/11469
-SELECT dictGet('default.countryId', 'country', toUInt64(number)) AS country FROM numbers(2) GROUP BY country; -- { serverError 36; }
+SELECT dictGet('default.countryId', 'country', toUInt64(number)) AS country FROM numbers(2) GROUP BY country; -- { serverError 36 }
 
 
 -- with real dictionary
diff --git a/tests/queries/0_stateless/01380_coded_delta_exception_code.sql b/tests/queries/0_stateless/01380_coded_delta_exception_code.sql
index 587fac958cd..f4b88a93904 100644
--- a/tests/queries/0_stateless/01380_coded_delta_exception_code.sql
+++ b/tests/queries/0_stateless/01380_coded_delta_exception_code.sql
@@ -2,5 +2,5 @@ CREATE TABLE delta_codec_synthetic (`id` Decimal(38, 10) CODEC(Delta, ZSTD(22)))
 CREATE TABLE delta_codec_synthetic (`id` Decimal(38, 10) CODEC(DoubleDelta, ZSTD(22))) ENGINE = MergeTree() ORDER BY tuple(); -- { serverError 36 }
 CREATE TABLE delta_codec_synthetic (`id` Decimal(38, 10) CODEC(Gorilla, ZSTD(22))) ENGINE = MergeTree() ORDER BY tuple(); -- { serverError 36 }
 
-CREATE TABLE delta_codec_synthetic (`id` UInt64 CODEC(DoubleDelta(3), ZSTD(22))) ENGINE = MergeTree() ORDER BY tuple(); -- { serverError 36 }
-CREATE TABLE delta_codec_synthetic (`id` UInt64 CODEC(Gorilla('hello, world'), ZSTD(22))) ENGINE = MergeTree() ORDER BY tuple(); -- { serverError 36 }
+CREATE TABLE delta_codec_synthetic (`id` UInt64 CODEC(DoubleDelta(3), ZSTD(22))) ENGINE = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_CODEC_PARAMETER }
+CREATE TABLE delta_codec_synthetic (`id` UInt64 CODEC(Gorilla('hello, world'), ZSTD(22))) ENGINE = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_CODEC_PARAMETER }
diff --git a/tests/queries/0_stateless/01395_limit_more_cases.sh b/tests/queries/0_stateless/01395_limit_more_cases.sh
index 32c854e53fb..177147d2142 100755
--- a/tests/queries/0_stateless/01395_limit_more_cases.sh
+++ b/tests/queries/0_stateless/01395_limit_more_cases.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01402_cast_nullable_string_to_enum.sql b/tests/queries/0_stateless/01402_cast_nullable_string_to_enum.sql
index 3b53e593095..1d445412381 100644
--- a/tests/queries/0_stateless/01402_cast_nullable_string_to_enum.sql
+++ b/tests/queries/0_stateless/01402_cast_nullable_string_to_enum.sql
@@ -5,9 +5,9 @@ SELECT CAST(CAST(NULL AS Nullable(String)) AS Nullable(Enum8('Hello' = 1)));
 SELECT CAST(CAST(NULL AS Nullable(FixedString(1))) AS Nullable(Enum8('Hello' = 1)));
 
 -- empty string still not acceptable
-SELECT CAST(CAST('' AS Nullable(String)) AS Nullable(Enum8('Hello' = 1))); -- { serverError 36; }
-SELECT CAST(CAST('' AS Nullable(FixedString(1))) AS Nullable(Enum8('Hello' = 1))); -- { serverError 36; }
+SELECT CAST(CAST('' AS Nullable(String)) AS Nullable(Enum8('Hello' = 1))); -- { serverError 691 }
+SELECT CAST(CAST('' AS Nullable(FixedString(1))) AS Nullable(Enum8('Hello' = 1))); -- { serverError 691 }
 
 -- non-Nullable Enum() still not acceptable
-SELECT CAST(CAST(NULL AS Nullable(String)) AS Enum8('Hello' = 1)); -- { serverError 349; }
-SELECT CAST(CAST(NULL AS Nullable(FixedString(1))) AS Enum8('Hello' = 1)); -- { serverError 349; }
+SELECT CAST(CAST(NULL AS Nullable(String)) AS Enum8('Hello' = 1)); -- { serverError 349 }
+SELECT CAST(CAST(NULL AS Nullable(FixedString(1))) AS Enum8('Hello' = 1)); -- { serverError 349 }
diff --git a/tests/queries/0_stateless/01404_roundUpToPowerOfTwoOrZero_safety.sql b/tests/queries/0_stateless/01404_roundUpToPowerOfTwoOrZero_safety.sql
index 4ee6e1fa5e4..d61a35c9999 100644
--- a/tests/queries/0_stateless/01404_roundUpToPowerOfTwoOrZero_safety.sql
+++ b/tests/queries/0_stateless/01404_roundUpToPowerOfTwoOrZero_safety.sql
@@ -1,4 +1,4 @@
 -- repeat() with this length and this number of rows will allocation huge enough region (MSB set),
 -- which will cause roundUpToPowerOfTwoOrZero() returns 0 for such allocation (before the fix),
 -- and later repeat() will try to use this memory and will got SIGSEGV.
-SELECT repeat('0.0001048576', number * (number * (number * 255))) FROM numbers(65535); -- { serverError 131; }
+SELECT repeat('0.0001048576', number * (number * (number * 255))) FROM numbers(65535); -- { serverError 131 }
diff --git a/tests/queries/0_stateless/01407_lambda_arrayJoin.sql b/tests/queries/0_stateless/01407_lambda_arrayJoin.sql
index 363b1d92dbb..e1b8c1d5a76 100644
--- a/tests/queries/0_stateless/01407_lambda_arrayJoin.sql
+++ b/tests/queries/0_stateless/01407_lambda_arrayJoin.sql
@@ -1,5 +1,5 @@
 SELECT arrayFilter((a) -> ((a, arrayJoin([])) IN (Null, [Null])), []);
 SELECT arrayFilter((a) -> ((a, arrayJoin([[]])) IN (Null, [Null])), []);
 
-SELECT * FROM system.one ARRAY JOIN arrayFilter((a) -> ((a, arrayJoin([])) IN (NULL)), []) AS arr_x; -- { serverError 43; }
+SELECT * FROM system.one ARRAY JOIN arrayFilter((a) -> ((a, arrayJoin([])) IN (NULL)), []) AS arr_x; -- { serverError 43 }
 SELECT * FROM numbers(1) LEFT ARRAY JOIN arrayFilter((x_0, x_1) -> (arrayJoin([]) IN (NULL)), [], []) AS arr_x;
diff --git a/tests/queries/0_stateless/01408_range_overflow.sql b/tests/queries/0_stateless/01408_range_overflow.sql
index 2107e8c3f36..d26507f8358 100644
--- a/tests/queries/0_stateless/01408_range_overflow.sql
+++ b/tests/queries/0_stateless/01408_range_overflow.sql
@@ -1,7 +1,7 @@
 -- executeGeneric()
 SELECT range(1025, 1048576 + 9223372036854775807, 9223372036854775807);
 SELECT range(1025, 1048576 + (9223372036854775807 AS i), i);
-SELECT range(1025, 18446744073709551615, 1); -- { serverError 69; }
+SELECT range(1025, 18446744073709551615, 1); -- { serverError 69 }
 
 -- executeConstStep()
 SELECT range(number, 1048576 + 9223372036854775807, 9223372036854775807) FROM system.numbers LIMIT 1 OFFSET 1025;
diff --git a/tests/queries/0_stateless/01411_from_unixtime.reference b/tests/queries/0_stateless/01411_from_unixtime.reference
index 4114c9b98d3..f5b3be44e00 100644
--- a/tests/queries/0_stateless/01411_from_unixtime.reference
+++ b/tests/queries/0_stateless/01411_from_unixtime.reference
@@ -24,7 +24,7 @@ Jan	Jan
 366	366
 00	00
 01	01
-33	00
+January	January
 \n	\n
 AM	AM
 AM
diff --git a/tests/queries/0_stateless/01418_custom_settings.reference b/tests/queries/0_stateless/01418_custom_settings.reference
index cf0cb35c72a..8484a5d0e6f 100644
--- a/tests/queries/0_stateless/01418_custom_settings.reference
+++ b/tests/queries/0_stateless/01418_custom_settings.reference
@@ -1,3 +1,4 @@
+--- assigning ---
 5	UInt8
 -177	Int16
 98.11	Float64
@@ -6,7 +7,7 @@ custom_a	UInt64_5
 custom_b	Int64_-177
 custom_c	Float64_98.11
 custom_d	\'abc def\'
-
+--- modifying ---
 changed	String
 \N	Nullable(Nothing)
 50000	UInt16
@@ -15,9 +16,10 @@ custom_a	\'changed\'
 custom_b	NULL
 custom_c	UInt64_50000
 custom_d	Float64_1.11
-
+--- undefined setting ---
 404	UInt16
-
+--- wrong prefix ---
+--- using query context ---
 -0.333	Float64
 custom_e	Float64_-0.333
 404	UInt16
@@ -25,7 +27,13 @@ custom_e	UInt64_404
 word	String
 custom_f	\'word\'
 0
-
+--- compound identifier ---
 test	String
 custom_compound.identifier.v1	\'test\'
 CREATE SETTINGS PROFILE s1_01418 SETTINGS custom_compound.identifier.v2 = 100
+--- null type ---
+\N	Nullable(Nothing)
+custom_null	NULL
+\N	Nullable(Nothing)
+custom_null	NULL
+CREATE SETTINGS PROFILE s2_01418 SETTINGS custom_null = NULL
diff --git a/tests/queries/0_stateless/01418_custom_settings.sql b/tests/queries/0_stateless/01418_custom_settings.sql
index 95051db3a34..be18f553589 100644
--- a/tests/queries/0_stateless/01418_custom_settings.sql
+++ b/tests/queries/0_stateless/01418_custom_settings.sql
@@ -1,3 +1,6 @@
+DROP SETTINGS PROFILE IF EXISTS s1_01418, s2_01418;
+
+SELECT '--- assigning ---';
 SET custom_a = 5;
 SET custom_b = -177;
 SET custom_c = 98.11;
@@ -8,7 +11,7 @@ SELECT getSetting('custom_c') as v, toTypeName(v);
 SELECT getSetting('custom_d') as v, toTypeName(v);
 SELECT name, value FROM system.settings WHERE name LIKE 'custom_%' ORDER BY name;
 
-SELECT '';
+SELECT '--- modifying ---';
 SET custom_a = 'changed';
 SET custom_b = NULL;
 SET custom_c = 50000;
@@ -19,14 +22,15 @@ SELECT getSetting('custom_c') as v, toTypeName(v);
 SELECT getSetting('custom_d') as v, toTypeName(v);
 SELECT name, value FROM system.settings WHERE name LIKE 'custom_%' ORDER BY name;
 
-SELECT '';
+SELECT '--- undefined setting ---';
 SELECT getSetting('custom_e') as v, toTypeName(v); -- { serverError 115 } -- Setting not found.
 SET custom_e = 404;
 SELECT getSetting('custom_e') as v, toTypeName(v);
 
+SELECT '--- wrong prefix ---';
 SET invalid_custom = 8; -- { serverError 115 } -- Setting is neither a builtin nor started with one of the registered prefixes for user-defined settings.
 
-SELECT '';
+SELECT '--- using query context ---';
 SELECT getSetting('custom_e') as v, toTypeName(v) SETTINGS custom_e = -0.333;
 SELECT name, value FROM system.settings WHERE name = 'custom_e' SETTINGS custom_e = -0.333;
 SELECT getSetting('custom_e') as v, toTypeName(v);
@@ -37,7 +41,7 @@ SELECT name, value FROM system.settings WHERE name = 'custom_f' SETTINGS custom_
 SELECT getSetting('custom_f') as v, toTypeName(v); -- { serverError 115 } -- Setting not found.
 SELECT COUNT() FROM system.settings WHERE name = 'custom_f';
 
-SELECT '';
+SELECT '--- compound identifier ---';
 SET custom_compound.identifier.v1 = 'test';
 SELECT getSetting('custom_compound.identifier.v1') as v, toTypeName(v);
 SELECT name, value FROM system.settings WHERE name = 'custom_compound.identifier.v1';
@@ -45,3 +49,15 @@ SELECT name, value FROM system.settings WHERE name = 'custom_compound.identifier
 CREATE SETTINGS PROFILE s1_01418 SETTINGS custom_compound.identifier.v2 = 100;
 SHOW CREATE SETTINGS PROFILE s1_01418;
 DROP SETTINGS PROFILE s1_01418;
+
+SELECT '--- null type ---';
+SELECT getSetting('custom_null') as v, toTypeName(v) SETTINGS custom_null = NULL;
+SELECT name, value FROM system.settings WHERE name = 'custom_null' SETTINGS custom_null = NULL;
+
+SET custom_null = NULL;
+SELECT getSetting('custom_null') as v, toTypeName(v);
+SELECT name, value FROM system.settings WHERE name = 'custom_null';
+
+CREATE SETTINGS PROFILE s2_01418 SETTINGS custom_null = NULL;
+SHOW CREATE SETTINGS PROFILE s2_01418;
+DROP SETTINGS PROFILE s2_01418;
diff --git a/tests/queries/0_stateless/01428_nullable_asof_join.reference b/tests/queries/0_stateless/01428_nullable_asof_join.reference
index f04655fefaa..73825dce725 100644
--- a/tests/queries/0_stateless/01428_nullable_asof_join.reference
+++ b/tests/queries/0_stateless/01428_nullable_asof_join.reference
@@ -5,6 +5,15 @@ left asof using
 0	\N	0	\N	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
 1	\N	1	\N	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
 1	1	2	2	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
+0	\N	0	\N	UInt8	Nullable(UInt8)	UInt8	Nullable(UInt8)
+1	1	1	0	UInt8	Nullable(UInt8)	UInt8	Nullable(UInt8)
+1	1	2	0	UInt8	Nullable(UInt8)	UInt8	Nullable(UInt8)
+0	\N	0	\N	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
+1	1	1	0	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
+1	1	2	0	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
+0	\N	0	\N	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
+1	1	1	0	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
+1	1	2	0	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
 left asof on
 0	\N	0	\N	UInt8	Nullable(UInt8)	UInt8	Nullable(UInt8)
 1	\N	1	\N	UInt8	Nullable(UInt8)	UInt8	Nullable(UInt8)
@@ -12,9 +21,28 @@ left asof on
 0	\N	0	\N	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
 1	\N	1	\N	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
 1	1	2	2	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
+0	\N	0	\N	UInt8	Nullable(UInt8)	UInt8	Nullable(UInt8)
+1	1	1	0	UInt8	Nullable(UInt8)	UInt8	Nullable(UInt8)
+1	1	2	0	UInt8	Nullable(UInt8)	UInt8	Nullable(UInt8)
+0	\N	0	\N	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
+1	1	1	0	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
+1	1	2	0	UInt8	Nullable(UInt8)	Nullable(UInt8)	Nullable(UInt8)
 asof using
 1	1	2	2	UInt8	UInt8	UInt8	UInt8
 1	1	2	2	UInt8	UInt8	Nullable(UInt8)	UInt8
+1	1	2	2	UInt8	UInt8	Nullable(UInt8)	Nullable(UInt8)
+1	1	1	0	UInt8	UInt8	UInt8	Nullable(UInt8)
+1	1	2	0	UInt8	UInt8	UInt8	Nullable(UInt8)
+1	1	1	0	UInt8	UInt8	Nullable(UInt8)	Nullable(UInt8)
+1	1	2	0	UInt8	UInt8	Nullable(UInt8)	Nullable(UInt8)
+1	1	1	0	UInt8	UInt8	Nullable(UInt8)	Nullable(UInt8)
+1	1	2	0	UInt8	UInt8	Nullable(UInt8)	Nullable(UInt8)
 asof on
 1	1	2	2	UInt8	UInt8	UInt8	UInt8
 1	1	2	2	UInt8	UInt8	Nullable(UInt8)	UInt8
+1	1	1	0	UInt8	UInt8	UInt8	Nullable(UInt8)
+1	1	2	0	UInt8	UInt8	UInt8	Nullable(UInt8)
+1	1	1	0	UInt8	UInt8	Nullable(UInt8)	Nullable(UInt8)
+1	1	2	0	UInt8	UInt8	Nullable(UInt8)	Nullable(UInt8)
+1	1	1	0	UInt8	UInt8	Nullable(UInt8)	Nullable(UInt8)
+1	1	2	0	UInt8	UInt8	Nullable(UInt8)	Nullable(UInt8)
diff --git a/tests/queries/0_stateless/01428_nullable_asof_join.sql b/tests/queries/0_stateless/01428_nullable_asof_join.sql
index e1b00158d68..f07a26edd97 100644
--- a/tests/queries/0_stateless/01428_nullable_asof_join.sql
+++ b/tests/queries/0_stateless/01428_nullable_asof_join.sql
@@ -18,13 +18,19 @@ SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(ma
 FROM (SELECT toUInt8(number) > 0 as pk, toUInt8(number) as dt FROM numbers(3)) a
 ASOF LEFT JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 USING(pk, dt)
-ORDER BY a.dt; -- { serverError 48 }
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 0;
+
+SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
+FROM (SELECT toUInt8(number) > 0 as pk, toUInt8(number) as dt FROM numbers(3)) a
+ASOF LEFT JOIN (SELECT 1 as pk, toNullable(0) as dt) b
+USING(pk, dt)
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 1;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
 ASOF LEFT JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 USING(pk, dt)
-ORDER BY a.dt; -- { serverError 48 }
+ORDER BY a.dt;
 
 select 'left asof on';
 
@@ -44,13 +50,13 @@ SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(ma
 FROM (SELECT toUInt8(number) > 0 as pk, toUInt8(number) as dt FROM numbers(3)) a
 ASOF LEFT JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 ON a.pk = b.pk AND a.dt >= b.dt
-ORDER BY a.dt; -- { serverError 48 }
+ORDER BY a.dt;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
 ASOF LEFT JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 ON a.dt >= b.dt AND a.pk = b.pk
-ORDER BY a.dt; -- { serverError 48 }
+ORDER BY a.dt;
 
 select 'asof using';
 
@@ -64,19 +70,31 @@ SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(ma
 FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
 ASOF JOIN (SELECT 1 as pk, 2 as dt) b
 USING(pk, dt)
-ORDER BY a.dt;
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 0;
+
+SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
+FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
+ASOF JOIN (SELECT 1 as pk, 2 as dt) b
+USING(pk, dt)
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 1;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toUInt8(number) as dt FROM numbers(3)) a
 ASOF JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 USING(pk, dt)
-ORDER BY a.dt; -- { serverError 48 }
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 0;
+
+SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
+FROM (SELECT toUInt8(number) > 0 as pk, toUInt8(number) as dt FROM numbers(3)) a
+ASOF JOIN (SELECT 1 as pk, toNullable(0) as dt) b
+USING(pk, dt)
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 1;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
 ASOF JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 USING(pk, dt)
-ORDER BY a.dt; -- { serverError 48 }
+ORDER BY a.dt;
 
 select 'asof on';
 
@@ -96,19 +114,19 @@ SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(ma
 FROM (SELECT toUInt8(number) > 0 as pk, toUInt8(number) as dt FROM numbers(3)) a
 ASOF JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 ON a.pk = b.pk AND a.dt >= b.dt
-ORDER BY a.dt; -- { serverError 48 }
+ORDER BY a.dt;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
 ASOF JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 ON a.pk = b.pk AND a.dt >= b.dt
-ORDER BY a.dt; -- { serverError 48 }
+ORDER BY a.dt;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
 ASOF JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 ON a.dt >= b.dt AND a.pk = b.pk
-ORDER BY a.dt; -- { serverError 48 }
+ORDER BY a.dt;
 
 SELECT *
 FROM (SELECT NULL AS y, 1 AS x, '2020-01-01 10:10:10' :: DateTime64 AS t) AS t1
diff --git a/tests/queries/0_stateless/01429_join_on_error_messages.sql b/tests/queries/0_stateless/01429_join_on_error_messages.sql
index cf9aac0e4da..b22d5259136 100644
--- a/tests/queries/0_stateless/01429_join_on_error_messages.sql
+++ b/tests/queries/0_stateless/01429_join_on_error_messages.sql
@@ -1,8 +1,8 @@
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON (arrayJoin([1]) = B.b); -- { serverError 403 }
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON (A.a = arrayJoin([1])); -- { serverError 403 }
 
-SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON equals(a); -- { serverError 62 }
-SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON less(a); -- { serverError 62 }
+SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON equals(a); -- { serverError 42, 62 }
+SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON less(a); -- { serverError 42, 62 }
 
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON a = b AND a > b; -- { serverError 403 }
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON a = b AND a < b; -- { serverError 403 }
@@ -13,7 +13,7 @@ SET join_algorithm = 'partial_merge';
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b, 1 c) B ON a = b OR a = c; -- { serverError 48 }
 -- works for a = b OR a = b because of equivalent disjunct optimization
 
-SET join_algorithm = 'auto';
+SET join_algorithm = 'grace_hash';
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b, 1 c) B ON a = b OR a = c; -- { serverError 48 }
 -- works for a = b OR a = b because of equivalent disjunct optimization
 
diff --git a/tests/queries/0_stateless/01442_merge_detach_attach_long.sh b/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
index b3f9fbb42dd..c080dded1c8 100755
--- a/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
+++ b/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-parallel
+# Tags: long, no-parallel, no-debug
 
 set -e
 
diff --git a/tests/queries/0_stateless/01455_opentelemetry_distributed.reference b/tests/queries/0_stateless/01455_opentelemetry_distributed.reference
index d48b3738bc2..0729dd7b881 100644
--- a/tests/queries/0_stateless/01455_opentelemetry_distributed.reference
+++ b/tests/queries/0_stateless/01455_opentelemetry_distributed.reference
@@ -1,10 +1,10 @@
 ===http===
-{"query":"select 1 from remote('127.0.0.2', system, one) format Null\n","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
+{"query":"select 1 from remote('127.0.0.2', system, one) settings allow_experimental_analyzer = 1 format Null\n","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
 {"query":"DESC TABLE system.one","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
-{"query":"SELECT 1 FROM `system`.`one`","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
+{"query":"SELECT 1 AS `1` FROM `system`.`one`","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
 {"query":"DESC TABLE system.one","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
-{"query":"SELECT 1 FROM `system`.`one`","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
-{"query":"select 1 from remote('127.0.0.2', system, one) format Null\n","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
+{"query":"SELECT 1 AS `1` FROM `system`.`one`","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
+{"query":"select 1 from remote('127.0.0.2', system, one) settings allow_experimental_analyzer = 1 format Null\n","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
 {"total spans":"3","unique spans":"3","unique non-zero parent spans":"3"}
 {"initial query spans with proper parent":"1"}
 {"unique non-empty tracestate values":"1"}
diff --git a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
index b2b5ae89105..0dfec6097db 100755
--- a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
+++ b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
@@ -12,6 +12,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 function check_log
 {
 ${CLICKHOUSE_CLIENT} --format=JSONEachRow -nq "
+set allow_experimental_analyzer = 1;
 system flush logs;
 
 -- Show queries sorted by start time.
@@ -55,7 +56,7 @@ select count(*) "'"'"initial query spans with proper parent"'"'"
     where
         trace_id = UUIDNumToString(toFixedString(unhex('$trace_id'), 16))
         and operation_name = 'query'
-        and parent_span_id in ( 
+        and parent_span_id in (
            select span_id from system.opentelemetry_span_log where trace_id = UUIDNumToString(toFixedString(unhex('$trace_id'), 16)) and parent_span_id = reinterpretAsUInt64(unhex('73'))
         )
     ;
@@ -76,7 +77,7 @@ select uniqExact(value) "'"'"unique non-empty tracestate values"'"'"
 
 # Generate some random trace id so that the prevous runs of the test do not interfere.
 echo "===http==="
-trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(reverse(reinterpretAsString(generateUUIDv4()))))")
+trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(reverse(reinterpretAsString(generateUUIDv4())))) settings allow_experimental_analyzer = 1")
 
 # Check that the HTTP traceparent is read, and then passed through `remote`
 # table function. We expect 4 queries -- one initial, one SELECT and two
@@ -86,7 +87,7 @@ ${CLICKHOUSE_CURL} \
     --header "traceparent: 00-$trace_id-0000000000000073-01" \
     --header "tracestate: some custom state" "$CLICKHOUSE_URL" \
     --get \
-    --data-urlencode "query=select 1 from remote('127.0.0.2', system, one) format Null"
+    --data-urlencode "query=select 1 from remote('127.0.0.2', system, one) settings allow_experimental_analyzer = 1 format Null"
 
 check_log
 
diff --git a/tests/queries/0_stateless/01457_int256_hashing.sql b/tests/queries/0_stateless/01457_int256_hashing.sql
index 861e567950a..510d25f6b8c 100644
--- a/tests/queries/0_stateless/01457_int256_hashing.sql
+++ b/tests/queries/0_stateless/01457_int256_hashing.sql
@@ -1,13 +1,15 @@
 -- Tags: no-fasttest
 
+SET joined_subquery_requires_alias = 0;
+
 SELECT toUInt256(123) IN (NULL);
 SELECT toUInt256(123) AS k GROUP BY k;
-SELECT toUInt256(123) AS k FROM system.one INNER JOIN (SELECT toUInt256(123) AS k) t USING k;
+SELECT k FROM (SELECT toUInt256(123) AS k FROM system.one) INNER JOIN (SELECT toUInt256(123) AS k) t USING k;
 SELECT arrayEnumerateUniq([toUInt256(123), toUInt256(456), toUInt256(123)]);
 
 SELECT toInt256(123) IN (NULL);
 SELECT toInt256(123) AS k GROUP BY k;
-SELECT toInt256(123) AS k FROM system.one INNER JOIN (SELECT toInt256(123) AS k) t USING k;
+SELECT k FROM (SELECT toInt256(123) AS k FROM system.one) INNER JOIN (SELECT toInt256(123) AS k) t USING k;
 SELECT arrayEnumerateUniq([toInt256(123), toInt256(456), toInt256(123)]);
 
 -- SELECT toUInt128(123) IN (NULL);
@@ -17,17 +19,17 @@ SELECT arrayEnumerateUniq([toInt256(123), toInt256(456), toInt256(123)]);
 
 SELECT toInt128(123) IN (NULL);
 SELECT toInt128(123) AS k GROUP BY k;
-SELECT toInt128(123) AS k FROM system.one INNER JOIN (SELECT toInt128(123) AS k) t USING k;
+SELECT k FROM (SELECT toInt128(123) AS k FROM system.one) INNER JOIN (SELECT toInt128(123) AS k) t USING k;
 SELECT arrayEnumerateUniq([toInt128(123), toInt128(456), toInt128(123)]);
 
 SELECT toNullable(toUInt256(321)) IN (NULL);
 SELECT toNullable(toUInt256(321)) AS k GROUP BY k;
-SELECT toNullable(toUInt256(321)) AS k FROM system.one INNER JOIN (SELECT toUInt256(321) AS k) t USING k;
+SELECT k FROM (SELECT toNullable(toUInt256(321)) AS k FROM system.one) INNER JOIN (SELECT toUInt256(321) AS k) t USING k;
 SELECT arrayEnumerateUniq([toNullable(toUInt256(321)), toNullable(toUInt256(456)), toNullable(toUInt256(321))]);
 
 SELECT toNullable(toInt256(321)) IN (NULL);
 SELECT toNullable(toInt256(321)) AS k GROUP BY k;
-SELECT toNullable(toInt256(321)) AS k FROM system.one INNER JOIN (SELECT toInt256(321) AS k) t USING k;
+SELECT k FROM (SELECT toNullable(toInt256(321)) AS k FROM system.one) INNER JOIN (SELECT toInt256(321) AS k) t USING k;
 SELECT arrayEnumerateUniq([toNullable(toInt256(321)), toNullable(toInt256(456)), toNullable(toInt256(321))]);
 
 -- SELECT toNullable(toUInt128(321)) IN (NULL);
@@ -37,5 +39,5 @@ SELECT arrayEnumerateUniq([toNullable(toInt256(321)), toNullable(toInt256(456)),
 
 SELECT toNullable(toInt128(321)) IN (NULL);
 SELECT toNullable(toInt128(321)) AS k GROUP BY k;
-SELECT toNullable(toInt128(321)) AS k FROM system.one INNER JOIN (SELECT toInt128(321) AS k) t USING k;
+SELECT k FROM (SELECT toNullable(toInt128(321)) AS k FROM system.one) INNER JOIN (SELECT toInt128(321) AS k) t USING k;
 SELECT arrayEnumerateUniq([toNullable(toInt128(321)), toNullable(toInt128(456)), toNullable(toInt128(321))]);
diff --git a/tests/queries/0_stateless/01463_test_alter_live_view_refresh.reference b/tests/queries/0_stateless/01463_test_alter_live_view_refresh.reference
deleted file mode 100644
index 4d98c7b6838..00000000000
--- a/tests/queries/0_stateless/01463_test_alter_live_view_refresh.reference
+++ /dev/null
@@ -1 +0,0 @@
-ALTER LIVE VIEW live1 REFRESH
diff --git a/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql b/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
deleted file mode 100644
index 3c855c984b3..00000000000
--- a/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
+++ /dev/null
@@ -1,15 +0,0 @@
--- Tags: no-replicated-database, no-parallel, no-fasttest
-
-CREATE TABLE test0 (
-        c0 UInt64
-    ) ENGINE = MergeTree() PARTITION BY c0 ORDER BY c0;
-
-SET allow_experimental_live_view=1;
-
-CREATE LIVE VIEW live1 AS SELECT * FROM test0;
-
-select 'ALTER LIVE VIEW live1 REFRESH';
-ALTER LIVE VIEW live1 REFRESH; -- success
-
-DROP TABLE test0;
-DROP VIEW live1;
diff --git a/tests/queries/0_stateless/01470_columns_transformers.sql b/tests/queries/0_stateless/01470_columns_transformers.sql
index 2da2f6e9c67..8840ce3f3b5 100644
--- a/tests/queries/0_stateless/01470_columns_transformers.sql
+++ b/tests/queries/0_stateless/01470_columns_transformers.sql
@@ -17,15 +17,15 @@ SELECT a.* APPLY(toDate) EXCEPT(i, j) APPLY(any) from columns_transformers a;
 SELECT * EXCEPT STRICT i from columns_transformers;
 SELECT * EXCEPT STRICT (i, j) from columns_transformers;
 SELECT * EXCEPT STRICT i, j1 from columns_transformers; -- { serverError 47 }
-SELECT * EXCEPT STRICT(i, j1) from columns_transformers; -- { serverError 16 }
+SELECT * EXCEPT STRICT(i, j1) from columns_transformers; -- { serverError NO_SUCH_COLUMN_IN_TABLE , BAD_ARGUMENTS }
 SELECT * REPLACE STRICT i + 1 AS i from columns_transformers;
-SELECT * REPLACE STRICT(i + 1 AS col) from columns_transformers; -- { serverError 16 }
+SELECT * REPLACE STRICT(i + 1 AS col) from columns_transformers; -- { serverError NO_SUCH_COLUMN_IN_TABLE, BAD_ARGUMENTS }
 SELECT * REPLACE(i + 1 AS i) APPLY(sum) from columns_transformers;
 SELECT columns_transformers.* REPLACE(j + 2 AS j, i + 1 AS i) APPLY(avg) from columns_transformers;
 SELECT columns_transformers.* REPLACE(j + 1 AS j, j + 2 AS j) APPLY(avg) from columns_transformers; -- { serverError 43 }
 -- REPLACE after APPLY will not match anything
 SELECT a.* APPLY(toDate) REPLACE(i + 1 AS i) APPLY(any) from columns_transformers a;
-SELECT a.* APPLY(toDate) REPLACE STRICT(i + 1 AS i) APPLY(any) from columns_transformers a; -- { serverError 16 }
+SELECT a.* APPLY(toDate) REPLACE STRICT(i + 1 AS i) APPLY(any) from columns_transformers a; -- { serverError NO_SUCH_COLUMN_IN_TABLE, BAD_ARGUMENTS }
 
 EXPLAIN SYNTAX SELECT * APPLY(sum) from columns_transformers;
 EXPLAIN SYNTAX SELECT columns_transformers.* APPLY(avg) from columns_transformers;
diff --git a/tests/queries/0_stateless/01474_bad_global_join.sql b/tests/queries/0_stateless/01474_bad_global_join.sql
index b65b4e804a8..622e14e6f22 100644
--- a/tests/queries/0_stateless/01474_bad_global_join.sql
+++ b/tests/queries/0_stateless/01474_bad_global_join.sql
@@ -10,7 +10,7 @@ INSERT INTO local_table SELECT number AS id, toString(number) AS val FROM number
 CREATE TABLE dist_table AS local_table
 ENGINE = Distributed('test_cluster_two_shards_localhost', currentDatabase(), local_table);
 
-SELECT uniq(d.val) FROM dist_table AS d GLOBAL LEFT JOIN numbers(100) AS t USING id; -- { serverError 284 }
+SELECT uniq(d.val) FROM dist_table AS d GLOBAL LEFT JOIN numbers(100) AS t USING id; -- { serverError 47, 284 }
 SELECT uniq(d.val) FROM dist_table AS d GLOBAL LEFT JOIN local_table AS t USING id;
 
 DROP TABLE local_table;
diff --git a/tests/queries/0_stateless/01475_read_subcolumns_storages.reference b/tests/queries/0_stateless/01475_read_subcolumns_storages.reference
index 4e37b751d5a..ce0b13eabd2 100644
--- a/tests/queries/0_stateless/01475_read_subcolumns_storages.reference
+++ b/tests/queries/0_stateless/01475_read_subcolumns_storages.reference
@@ -7,9 +7,6 @@ TinyLog
 Memory
 100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)	{'foo':1,'bar':42}
 100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200	{'foo':1,'bar':42}	['foo','bar']	[1,42]
-MergeTree ORDER BY tuple() SETTINGS min_bytes_for_compact_part='10M'
-100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)	{'foo':1,'bar':42}
-100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200	{'foo':1,'bar':42}	['foo','bar']	[1,42]
 MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part='10M'
 100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)	{'foo':1,'bar':42}
 100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200	{'foo':1,'bar':42}	['foo','bar']	[1,42]
diff --git a/tests/queries/0_stateless/01475_read_subcolumns_storages.sh b/tests/queries/0_stateless/01475_read_subcolumns_storages.sh
index d770d5118ac..4a9b9639f78 100755
--- a/tests/queries/0_stateless/01475_read_subcolumns_storages.sh
+++ b/tests/queries/0_stateless/01475_read_subcolumns_storages.sh
@@ -12,7 +12,6 @@ create_query="CREATE TABLE subcolumns(n Nullable(UInt32), a1 Array(UInt32),\
 
 # "StripeLog"
 declare -a ENGINES=("Log" "TinyLog" "Memory" \
-    "MergeTree ORDER BY tuple() SETTINGS min_bytes_for_compact_part='10M'" \
     "MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part='10M'" \
     "MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part=0")
 
diff --git a/tests/queries/0_stateless/01476_right_full_join_switch.reference b/tests/queries/0_stateless/01476_right_full_join_switch.reference
index 1f839b86013..54f9909762f 100644
--- a/tests/queries/0_stateless/01476_right_full_join_switch.reference
+++ b/tests/queries/0_stateless/01476_right_full_join_switch.reference
@@ -3,6 +3,16 @@
 1	l	\N	LowCardinality(String)	Nullable(String)
 2		\N	LowCardinality(String)	Nullable(String)
 -
+\N	\N		Nullable(String)	LowCardinality(String)
+1	\N	l	Nullable(String)	LowCardinality(String)
+1	\N	l	Nullable(String)	LowCardinality(String)
+\N	\N		Nullable(String)	LowCardinality(String)
+-
+1	l	\N	LowCardinality(String)	Nullable(String)
+2		\N	LowCardinality(String)	Nullable(String)
+1	l	\N	LowCardinality(String)	Nullable(String)
+2		\N	LowCardinality(String)	Nullable(String)
+-
 0	\N		Nullable(String)	LowCardinality(String)
 1	\N	l	Nullable(String)	LowCardinality(String)
 0	\N		Nullable(String)	LowCardinality(String)
diff --git a/tests/queries/0_stateless/01476_right_full_join_switch.sql b/tests/queries/0_stateless/01476_right_full_join_switch.sql
index 5d041843ee2..dfbdec47e1f 100644
--- a/tests/queries/0_stateless/01476_right_full_join_switch.sql
+++ b/tests/queries/0_stateless/01476_right_full_join_switch.sql
@@ -10,8 +10,27 @@ CREATE TABLE nr (`x` Nullable(UInt32), `s` Nullable(String)) ENGINE = Memory;
 INSERT INTO t VALUES (1, 'l');
 INSERT INTO nr VALUES (2, NULL);
 
+
 SET join_use_nulls = 0;
 
+SET allow_experimental_analyzer = 1;
+
+-- t.x is supertupe for `x` from left and right since `x` is inside `USING`.
+SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l LEFT JOIN nr AS r USING (x) ORDER BY t.x;
+SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l RIGHT JOIN nr AS r USING (x) ORDER BY t.x;
+SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l FULL JOIN nr AS r USING (x) ORDER BY t.x;
+
+SELECT '-';
+
+SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l LEFT JOIN t AS r USING (x) ORDER BY t.x;
+SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l RIGHT JOIN t AS r USING (x) ORDER BY t.x;
+SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l FULL JOIN t AS r USING (x) ORDER BY t.x;
+
+SELECT '-';
+
+SET allow_experimental_analyzer = 0;
+
+-- t.x is supertupe for `x` from left and right since `x` is inside `USING`.
 SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l LEFT JOIN nr AS r USING (x) ORDER BY t.x;
 SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l RIGHT JOIN nr AS r USING (x) ORDER BY t.x;
 SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l FULL JOIN nr AS r USING (x) ORDER BY t.x;
diff --git a/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.reference b/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.reference
index ac4d0a3d21a..9b6890c01ee 100644
--- a/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.reference
+++ b/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.reference
@@ -17,7 +17,7 @@
 1	\N	l	Nullable(String)	LowCardinality(String)
 0	\N		Nullable(String)	LowCardinality(String)
 1	\N	l	Nullable(String)	LowCardinality(String)
--
+- join_use_nulls -
 1	l	\N	LowCardinality(String)	Nullable(String)
 2	\N	\N	LowCardinality(Nullable(String))	Nullable(String)
 1	l	\N	LowCardinality(Nullable(String))	Nullable(String)
@@ -33,3 +33,47 @@
 1	l	\N	LowCardinality(Nullable(String))	Nullable(String)
 \N	\N	\N	LowCardinality(Nullable(String))	Nullable(String)
 -
+\N	\N	\N	Nullable(String)	LowCardinality(Nullable(String))
+1	\N	l	Nullable(String)	LowCardinality(String)
+1	\N	l	Nullable(String)	LowCardinality(Nullable(String))
+\N	\N	\N	Nullable(String)	LowCardinality(Nullable(String))
+- analyzer -
+1	l	\N	LowCardinality(String)	Nullable(String)
+2		\N	LowCardinality(String)	Nullable(String)
+1	l	\N	LowCardinality(String)	Nullable(String)
+2		\N	LowCardinality(String)	Nullable(String)
+-
+\N	\N		Nullable(String)	LowCardinality(String)
+1	\N	l	Nullable(String)	LowCardinality(String)
+1	\N	l	Nullable(String)	LowCardinality(String)
+\N	\N		Nullable(String)	LowCardinality(String)
+-
+1	l	\N	Nullable(String)	Nullable(String)
+0	\N	\N	Nullable(String)	Nullable(String)
+0	\N	\N	Nullable(String)	Nullable(String)
+1	l	\N	Nullable(String)	Nullable(String)
+-
+0	\N	\N	Nullable(String)	Nullable(String)
+1	\N	l	Nullable(String)	Nullable(String)
+0	\N	\N	Nullable(String)	Nullable(String)
+1	\N	l	Nullable(String)	Nullable(String)
+- join_use_nulls -
+1	l	\N	LowCardinality(String)	Nullable(String)
+2	\N	\N	LowCardinality(Nullable(String))	Nullable(String)
+1	l	\N	LowCardinality(Nullable(String))	Nullable(String)
+2	\N	\N	LowCardinality(Nullable(String))	Nullable(String)
+-
+\N	\N	\N	Nullable(String)	LowCardinality(Nullable(String))
+1	\N	l	Nullable(String)	LowCardinality(String)
+1	\N	l	Nullable(String)	LowCardinality(Nullable(String))
+\N	\N	\N	Nullable(String)	LowCardinality(Nullable(String))
+-
+1	l	\N	Nullable(String)	Nullable(String)
+\N	\N	\N	Nullable(String)	Nullable(String)
+1	l	\N	Nullable(String)	Nullable(String)
+\N	\N	\N	Nullable(String)	Nullable(String)
+-
+\N	\N	\N	Nullable(String)	Nullable(String)
+1	\N	l	Nullable(String)	Nullable(String)
+1	\N	l	Nullable(String)	Nullable(String)
+\N	\N	\N	Nullable(String)	Nullable(String)
diff --git a/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.sql b/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.sql.j2
similarity index 83%
rename from tests/queries/0_stateless/01477_lc_in_merge_join_left_key.sql
rename to tests/queries/0_stateless/01477_lc_in_merge_join_left_key.sql.j2
index 2507613f051..6eafd41b411 100644
--- a/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.sql
+++ b/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.sql.j2
@@ -10,6 +10,14 @@ CREATE TABLE nr (`x` Nullable(UInt32), `s` Nullable(String)) ENGINE = Memory;
 INSERT INTO t VALUES (1, 'l');
 INSERT INTO nr VALUES (2, NULL);
 
+{% for allow_experimental_analyzer in [0, 1] -%}
+
+SET allow_experimental_analyzer = {{ allow_experimental_analyzer }};
+
+{% if allow_experimental_analyzer -%}
+SELECT '- analyzer -';
+{% endif -%}
+
 SET join_use_nulls = 0;
 
 SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l LEFT JOIN nr AS r USING (x) ORDER BY t.x;
@@ -36,7 +44,7 @@ SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l FULL JOIN t
 
 SET join_use_nulls = 1;
 
-SELECT '-';
+SELECT '- join_use_nulls -';
 
 SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l LEFT JOIN nr AS r USING (x) ORDER BY t.x;
 SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l RIGHT JOIN nr AS r USING (x) ORDER BY t.x;
@@ -56,10 +64,11 @@ SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l FULL JOIN nr
 
 SELECT '-';
 
--- TODO
--- SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l LEFT JOIN t AS r USING (s) ORDER BY t.x;
--- SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l RIGHT JOIN t AS r USING (s) ORDER BY t.x;
--- SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l FULL JOIN t AS r USING (s) ORDER BY t.x;
+SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l LEFT JOIN t AS r USING (s) ORDER BY t.x;
+SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l RIGHT JOIN t AS r USING (s) ORDER BY t.x;
+SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l FULL JOIN t AS r USING (s) ORDER BY t.x;
+
+{% endfor %}
 
 DROP TABLE t;
 DROP TABLE nr;
diff --git a/tests/queries/0_stateless/01495_subqueries_in_with_statement_2.sql b/tests/queries/0_stateless/01495_subqueries_in_with_statement_2.sql
index 7ec4eeaa778..43dff687d84 100644
--- a/tests/queries/0_stateless/01495_subqueries_in_with_statement_2.sql
+++ b/tests/queries/0_stateless/01495_subqueries_in_with_statement_2.sql
@@ -1,29 +1,29 @@
 
-WITH 
+WITH
 x AS (SELECT number AS a FROM numbers(10)),
 y AS (SELECT number AS a FROM numbers(5))
 SELECT * FROM x WHERE a in (SELECT a FROM y)
 ORDER BY a;
 
-WITH 
+WITH
 x AS (SELECT number AS a FROM numbers(10)),
 y AS (SELECT number AS a FROM numbers(5))
 SELECT * FROM x left JOIN y USING a
 ORDER BY a;
 
-WITH 
+WITH
 x AS (SELECT number AS a FROM numbers(10)),
 y AS (SELECT number AS a FROM numbers(5))
 SELECT * FROM x JOIN y USING a
 ORDER BY x.a;
 
-WITH 
+WITH
 x AS (SELECT number AS a FROM numbers(10)),
 y AS (SELECT number AS a FROM numbers(5)),
 z AS (SELECT toUInt64(1) b)
 SELECT * FROM x JOIN y USING a WHERE a in (SELECT * FROM z);
 
-WITH 
+WITH
 x AS (SELECT number AS a FROM numbers(10)),
 y AS (SELECT number AS a FROM numbers(5)),
 z AS (SELECT * FROM x WHERE a % 2),
@@ -31,19 +31,17 @@ w AS (SELECT * FROM y WHERE a > 0)
 SELECT * FROM x JOIN y USING a WHERE a in (SELECT * FROM z)
 ORDER BY x.a;
 
-WITH 
+WITH
 x AS (SELECT number AS a FROM numbers(10)),
 y AS (SELECT number AS a FROM numbers(5)),
 z AS (SELECT * FROM x WHERE a % 2),
 w AS (SELECT * FROM y WHERE a > 0)
-SELECT max(a) FROM x JOIN y USING a WHERE a in (SELECT * FROM z)
-HAVING a > (SELECT min(a) FROM w);
+SELECT max(a) FROM x JOIN y USING a WHERE a in (SELECT * FROM z) AND a > (SELECT min(a) FROM w);
 
-WITH 
+WITH
 x AS (SELECT number AS a FROM numbers(10)),
 y AS (SELECT number AS a FROM numbers(5)),
 z AS (SELECT * FROM x WHERE a % 2),
 w AS (SELECT * FROM y WHERE a > 0)
-SELECT a FROM x JOIN y USING a WHERE a in (SELECT * FROM z)
-HAVING a <= (SELECT max(a) FROM w)
+SELECT a FROM x JOIN y USING a WHERE a in (SELECT * FROM z) AND a <= (SELECT max(a) FROM w)
 ORDER BY x.a;
diff --git a/tests/queries/0_stateless/01505_trivial_count_with_partition_predicate.reference b/tests/queries/0_stateless/01505_trivial_count_with_partition_predicate.reference
index 5abc312652d..b434c50b070 100644
--- a/tests/queries/0_stateless/01505_trivial_count_with_partition_predicate.reference
+++ b/tests/queries/0_stateless/01505_trivial_count_with_partition_predicate.reference
@@ -1,3 +1,4 @@
+3
 0
 0
 2
diff --git a/tests/queries/0_stateless/01505_trivial_count_with_partition_predicate.sql b/tests/queries/0_stateless/01505_trivial_count_with_partition_predicate.sql
index e4e2e3dd76a..030db421683 100644
--- a/tests/queries/0_stateless/01505_trivial_count_with_partition_predicate.sql
+++ b/tests/queries/0_stateless/01505_trivial_count_with_partition_predicate.sql
@@ -7,16 +7,16 @@ insert into test1 values ('2020-09-01 00:01:02', 1), ('2020-09-01 20:01:03', 2),
 
 set max_rows_to_read = 1;
 -- non-optimized
-select count() from test1 settings max_parallel_replicas = 3; -- { serverError 158; }
+select count() from test1 settings max_parallel_replicas = 3;
 -- optimized (toYear is monotonic and we provide the partition expr as is)
 select count() from test1 where toYear(toDate(p)) = 1999;
 -- non-optimized (toDate(DateTime) is always monotonic, but we cannot relaxing the predicates to do trivial count())
-select count() from test1 where p > toDateTime('2020-09-01 10:00:00'); -- { serverError 158; }
+select count() from test1 where p > toDateTime('2020-09-01 10:00:00'); -- { serverError 158 }
 -- optimized (partition expr wrapped with non-monotonic functions)
 select count() FROM test1 where toDate(p) = '2020-09-01' and sipHash64(toString(toDate(p))) % 2 = 1;
 select count() FROM test1 where toDate(p) = '2020-09-01' and sipHash64(toString(toDate(p))) % 2 = 0;
 -- non-optimized (some predicate depends on non-partition_expr columns)
-select count() FROM test1 where toDate(p) = '2020-09-01' and k = 2; -- { serverError 158; }
+select count() FROM test1 where toDate(p) = '2020-09-01' and k = 2; -- { serverError 158 }
 -- optimized
 select count() from test1 where toDate(p) > '2020-09-01';
 -- non-optimized
@@ -35,10 +35,10 @@ select count() from test_tuple where i > 2;
 -- optimized
 select count() from test_tuple where i < 1;
 -- non-optimized
-select count() from test_tuple array join [p,p] as c where toDate(p) = '2020-09-01'; -- { serverError 158; }
+select count() from test_tuple array join [p,p] as c where toDate(p) = '2020-09-01'; -- { serverError 158 }
 select count() from test_tuple array join [1,2] as c where toDate(p) = '2020-09-01' settings max_rows_to_read = 4;
 -- non-optimized
-select count() from test_tuple array join [1,2,3] as c where toDate(p) = '2020-09-01'; -- { serverError 158; }
+select count() from test_tuple array join [1,2,3] as c where toDate(p) = '2020-09-01'; -- { serverError 158 }
 select count() from test_tuple array join [1,2,3] as c where toDate(p) = '2020-09-01' settings max_rows_to_read = 6;
 
 create table test_two_args(i int, j int, k int) engine MergeTree partition by i + j order by k settings index_granularity = 1;
@@ -48,7 +48,7 @@ insert into test_two_args values (1, 2, 3), (2, 1, 3), (0, 3, 4);
 -- optimized
 select count() from test_two_args where i + j = 3;
 -- non-optimized
-select count() from test_two_args where i = 1; -- { serverError 158; }
+select count() from test_two_args where i = 1; -- { serverError 158 }
 
 drop table test1;
 drop table test_tuple;
diff --git a/tests/queries/0_stateless/01508_explain_header.reference b/tests/queries/0_stateless/01508_explain_header.reference
index 7510e67c643..206bd4afdab 100644
--- a/tests/queries/0_stateless/01508_explain_header.reference
+++ b/tests/queries/0_stateless/01508_explain_header.reference
@@ -1,4 +1,4 @@
-Expression ((Projection + Before ORDER BY))
+Expression ((Project names + (Projection + Change column names to column identifiers)))
 Header: x UInt8
   ReadFromStorage (SystemOne)
   Header: dummy UInt8
diff --git a/tests/queries/0_stateless/01508_explain_header.sql b/tests/queries/0_stateless/01508_explain_header.sql
index fb274c84d8a..a9f876068aa 100644
--- a/tests/queries/0_stateless/01508_explain_header.sql
+++ b/tests/queries/0_stateless/01508_explain_header.sql
@@ -1 +1,3 @@
+SET allow_experimental_analyzer = 1;
+
 explain header = 1 select 1 as x;
diff --git a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
index efe24aa3a88..80318ba67fb 100755
--- a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
@@ -8,9 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS table_for_renames0"
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS table_for_renames50"
 
-
-$CLICKHOUSE_CLIENT --query "CREATE TABLE table_for_renames0 (value UInt64, data String) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_rename', '1') ORDER BY tuple() SETTINGS cleanup_delay_period = 1, cleanup_delay_period_random_add = 0, min_rows_for_compact_part = 100000, min_rows_for_compact_part = 10000000, write_ahead_log_max_bytes = 1"
-
+$CLICKHOUSE_CLIENT --query "CREATE TABLE table_for_renames0 (value UInt64, data String) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_rename', '1') ORDER BY tuple() SETTINGS cleanup_delay_period = 1, cleanup_delay_period_random_add = 0"
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO table_for_renames0 SELECT number, toString(number) FROM numbers(1000)"
 
diff --git a/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql b/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
index 228e4d73167..3d57518d0f4 100644
--- a/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
+++ b/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
@@ -13,9 +13,9 @@ set max_memory_usage='500M';
 set max_threads=1;
 set max_block_size=500;
 
-select key, groupArray(repeat('a', 200)), count() from data_01513 group by key format Null settings optimize_aggregation_in_order=0; -- { serverError 241; }
+select key, groupArray(repeat('a', 200)), count() from data_01513 group by key format Null settings optimize_aggregation_in_order=0; -- { serverError 241 }
 select key, groupArray(repeat('a', 200)), count() from data_01513 group by key format Null settings optimize_aggregation_in_order=1;
 -- for WITH TOTALS previous groups should be kept.
-select key, groupArray(repeat('a', 200)), count() from data_01513 group by key with totals format Null settings optimize_aggregation_in_order=1; -- { serverError 241; }
+select key, groupArray(repeat('a', 200)), count() from data_01513 group by key with totals format Null settings optimize_aggregation_in_order=1; -- { serverError 241 }
 
 drop table data_01513;
diff --git a/tests/queries/0_stateless/01516_create_table_primary_key.sql b/tests/queries/0_stateless/01516_create_table_primary_key.sql
index b2b9f288eab..630c573c2cc 100644
--- a/tests/queries/0_stateless/01516_create_table_primary_key.sql
+++ b/tests/queries/0_stateless/01516_create_table_primary_key.sql
@@ -35,7 +35,7 @@ ATTACH TABLE primary_key_test(v1 Int32, v2 Int32) ENGINE=ReplacingMergeTree ORDE
 SELECT * FROM primary_key_test FINAL;
 DROP TABLE primary_key_test;
 
-CREATE TABLE primary_key_test(v1 Int64, v2 Int32, v3 String, PRIMARY KEY(v1, gcd(v1, v2))) ENGINE=ReplacingMergeTree ORDER BY v1; -- { serverError 36; }
+CREATE TABLE primary_key_test(v1 Int64, v2 Int32, v3 String, PRIMARY KEY(v1, gcd(v1, v2))) ENGINE=ReplacingMergeTree ORDER BY v1; -- { serverError 36 }
 
 CREATE TABLE primary_key_test(v1 Int64, v2 Int32, v3 String, PRIMARY KEY(v1, gcd(v1, v2))) ENGINE=ReplacingMergeTree ORDER BY (v1, gcd(v1, v2));
 
diff --git a/tests/queries/0_stateless/01527_bad_aggregation_in_lambda.sql b/tests/queries/0_stateless/01527_bad_aggregation_in_lambda.sql
index 10ffca22bd1..3be73ba56e7 100644
--- a/tests/queries/0_stateless/01527_bad_aggregation_in_lambda.sql
+++ b/tests/queries/0_stateless/01527_bad_aggregation_in_lambda.sql
@@ -1 +1 @@
-SELECT arrayMap(x -> x * sum(x), range(10)); -- { serverError 47 }
+SELECT arrayMap(x -> x * sum(x), range(10)); -- { serverError 10, 47 }
diff --git a/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql b/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
index 08fba7480d1..ac04178e585 100644
--- a/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
+++ b/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
@@ -5,7 +5,7 @@ create table dist_01528 as system.one engine=Distributed('test_cluster_two_shard
 
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=1;
-select * from dist_01528 where dummy = 2; -- { serverError 507; }
+select * from dist_01528 where dummy = 2; -- { serverError 507 }
 select * from dist_01528 where dummy = 2 settings allow_nondeterministic_optimize_skip_unused_shards=1;
 
 drop table dist_01528;
diff --git a/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql b/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
index 7a2e64742cf..13b4a4e331b 100644
--- a/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
+++ b/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
@@ -30,7 +30,7 @@ create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickho
 drop database db_01530_atomic;
 
 create database db_01530_atomic Engine=Atomic;
-create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/db_01530_atomic/data', 'test') order by key; -- { serverError 253; }
+create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/db_01530_atomic/data', 'test') order by key; -- { serverError 253 }
 
 set database_atomic_wait_for_drop_and_detach_synchronously=1;
 
diff --git a/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql b/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
index f217b6094b2..4b907d5ebb6 100644
--- a/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
+++ b/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
@@ -4,8 +4,8 @@
 
 SET insert_keeper_fault_injection_probability=0; -- disable fault injection; part ids are non-deterministic in case of insert retries
 
-DROP TABLE IF EXISTS execute_on_single_replica_r1 NO DELAY;
-DROP TABLE IF EXISTS execute_on_single_replica_r2 NO DELAY;
+DROP TABLE IF EXISTS execute_on_single_replica_r1 SYNC;
+DROP TABLE IF EXISTS execute_on_single_replica_r2 SYNC;
 
 /* that test requires fixed zookeeper path, so we cannot use ReplicatedMergeTree({database}) */
 CREATE TABLE execute_on_single_replica_r1 (x UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01532/execute_on_single_replica', 'r1') ORDER BY tuple() SETTINGS execute_merges_on_single_replica_time_threshold=10;
@@ -130,5 +130,5 @@ GROUP BY part_name
 ORDER BY part_name
 FORMAT Vertical;
 
-DROP TABLE execute_on_single_replica_r1 NO DELAY;
-DROP TABLE execute_on_single_replica_r2 NO DELAY;
+DROP TABLE execute_on_single_replica_r1 SYNC;
+DROP TABLE execute_on_single_replica_r2 SYNC;
diff --git a/tests/queries/0_stateless/01533_multiple_nested.sql b/tests/queries/0_stateless/01533_multiple_nested.sql
index f39b56bbaa2..1a6f0ec395e 100644
--- a/tests/queries/0_stateless/01533_multiple_nested.sql
+++ b/tests/queries/0_stateless/01533_multiple_nested.sql
@@ -37,7 +37,7 @@ SELECT col1.a FROM nested FORMAT Null;
 
 -- 4 files: (col1.size0, col1.a) x2
 SYSTEM FLUSH LOGS;
-SELECT ProfileEvents['FileOpen']
+SELECT ProfileEvents['FileOpen'] - ProfileEvents['CreatedReadBufferDirectIOFailed']
 FROM system.query_log
 WHERE (type = 'QueryFinish') AND (lower(query) LIKE lower('SELECT col1.a FROM %nested%'))
     AND event_date >= yesterday() AND current_database = currentDatabase();
@@ -47,7 +47,7 @@ SELECT col3.n2.s FROM nested FORMAT Null;
 
 -- 6 files: (col3.size0, col3.n2.size1, col3.n2.s) x2
 SYSTEM FLUSH LOGS;
-SELECT ProfileEvents['FileOpen']
+SELECT ProfileEvents['FileOpen'] - ProfileEvents['CreatedReadBufferDirectIOFailed']
 FROM system.query_log
 WHERE (type = 'QueryFinish') AND (lower(query) LIKE lower('SELECT col3.n2.s FROM %nested%'))
     AND event_date >= yesterday() AND current_database = currentDatabase();
diff --git a/tests/queries/0_stateless/01548_parallel_parsing_max_memory.sh b/tests/queries/0_stateless/01548_parallel_parsing_max_memory.sh
index 8c4900043d0..308b90dcd55 100755
--- a/tests/queries/0_stateless/01548_parallel_parsing_max_memory.sh
+++ b/tests/queries/0_stateless/01548_parallel_parsing_max_memory.sh
@@ -6,4 +6,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 yes http://foobarfoobarfoobarfoobarfoobarfoobarfoobar.com | head -c1G > ${CLICKHOUSE_TMP}/1g.csv
 
-$CLICKHOUSE_LOCAL --stacktrace --input_format_parallel_parsing=1 --max_memory_usage=100Mi -q "select count() from file('${CLICKHOUSE_TMP}/1g.csv', 'TSV', 'URL String')"
+$CLICKHOUSE_LOCAL --stacktrace --input_format_parallel_parsing=1 --max_memory_usage=50Mi -q "select count() from file('${CLICKHOUSE_TMP}/1g.csv', 'TSV', 'URL String') settings max_threads=1"
diff --git a/tests/queries/0_stateless/01548_with_totals_having.sql b/tests/queries/0_stateless/01548_with_totals_having.sql
index 669d989aa5f..2562ea3f3e5 100644
--- a/tests/queries/0_stateless/01548_with_totals_having.sql
+++ b/tests/queries/0_stateless/01548_with_totals_having.sql
@@ -1,2 +1,2 @@
-SELECT * FROM numbers(4) GROUP BY number WITH TOTALS HAVING sum(number) <= arrayJoin([]); -- { serverError 44 }
+SELECT * FROM numbers(4) GROUP BY number WITH TOTALS HAVING sum(number) <= arrayJoin([]); -- { serverError 44, 59 }
 SELECT * FROM numbers(4) GROUP BY number WITH TOTALS HAVING sum(number) <= arrayJoin([3, 2, 1, 0]) ORDER BY number; -- { serverError 44 }
diff --git a/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.sql b/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.sql
index e374e012238..c202ad349d6 100644
--- a/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.sql
+++ b/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.sql
@@ -1,4 +1,4 @@
--- Tags: no-s3-storage
+-- Tags: no-s3-storage, no-random-merge-tree-settings
 
 DROP TABLE IF EXISTS data_01551;
 
diff --git a/tests/queries/0_stateless/01555_system_distribution_queue_mask.reference b/tests/queries/0_stateless/01555_system_distribution_queue_mask.reference
index 745160a517e..26aea1555a5 100644
--- a/tests/queries/0_stateless/01555_system_distribution_queue_mask.reference
+++ b/tests/queries/0_stateless/01555_system_distribution_queue_mask.reference
@@ -1,3 +1,5 @@
+masked flush only
+3,"default:*@127%2E0%2E0%2E1:9000,default:*@127%2E0%2E0%2E2:9000","AUTHENTICATION_FAILED",1
 masked
 3,"default:*@127%2E0%2E0%2E1:9000,default:*@127%2E0%2E0%2E2:9000","AUTHENTICATION_FAILED",1
 no masking
diff --git a/tests/queries/0_stateless/01555_system_distribution_queue_mask.sql b/tests/queries/0_stateless/01555_system_distribution_queue_mask.sql
index fea75e1439f..61083c3ae14 100644
--- a/tests/queries/0_stateless/01555_system_distribution_queue_mask.sql
+++ b/tests/queries/0_stateless/01555_system_distribution_queue_mask.sql
@@ -9,6 +9,20 @@ drop table if exists dist_01555;
 drop table if exists data_01555;
 create table data_01555 (key Int) Engine=Null();
 
+--
+-- masked flush only
+--
+SELECT 'masked flush only';
+create table dist_01555 (key Int) Engine=Distributed(test_cluster_with_incorrect_pw, currentDatabase(), data_01555, key);
+system stop distributed sends dist_01555;
+
+insert into dist_01555 values (1)(2);
+-- since test_cluster_with_incorrect_pw contains incorrect password ignore error
+system flush distributed dist_01555; -- { serverError 516 }
+select length(splitByChar('*', data_path)), replaceRegexpOne(data_path, '^.*/([^/]*)/' , '\\1'), extract(last_exception, 'AUTHENTICATION_FAILED'), dateDiff('s', last_exception_time, now()) < 5 from system.distribution_queue where database = currentDatabase() and table = 'dist_01555' format CSV;
+
+drop table dist_01555;
+
 --
 -- masked
 --
@@ -17,7 +31,7 @@ create table dist_01555 (key Int) Engine=Distributed(test_cluster_with_incorrect
 
 insert into dist_01555 values (1)(2);
 -- since test_cluster_with_incorrect_pw contains incorrect password ignore error
-system flush distributed dist_01555; -- { serverError 516; }
+system flush distributed dist_01555; -- { serverError 516 }
 select length(splitByChar('*', data_path)), replaceRegexpOne(data_path, '^.*/([^/]*)/' , '\\1'), extract(last_exception, 'AUTHENTICATION_FAILED'), dateDiff('s', last_exception_time, now()) < 5 from system.distribution_queue where database = currentDatabase() and table = 'dist_01555' format CSV;
 
 drop table dist_01555;
@@ -29,7 +43,6 @@ SELECT 'no masking';
 create table dist_01555 (key Int) Engine=Distributed(test_shard_localhost, currentDatabase(), data_01555, key);
 
 insert into dist_01555 values (1)(2);
--- since test_cluster_with_incorrect_pw contains incorrect password ignore error
 system flush distributed dist_01555;
 select length(splitByChar('*', data_path)), replaceRegexpOne(data_path, '^.*/([^/]*)/' , '\\1') from system.distribution_queue where database = currentDatabase() and table = 'dist_01555' format CSV;
 
diff --git a/tests/queries/0_stateless/01556_explain_select_with_union_query.reference b/tests/queries/0_stateless/01556_explain_select_with_union_query.reference
index c18e6b70b0d..27cf4c129b1 100644
--- a/tests/queries/0_stateless/01556_explain_select_with_union_query.reference
+++ b/tests/queries/0_stateless/01556_explain_select_with_union_query.reference
@@ -1,180 +1,180 @@
 Union
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
 Union
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
 Union
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
   Distinct
     Union
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
   Distinct
     Union
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
 Union
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
 Union
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
 Union
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
-    Expression ((Projection + Before ORDER BY))
+    Expression ((Project names + (Projection + Change column names to column identifiers)))
       ReadFromStorage (SystemOne)
 Union
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
   Distinct
     Union
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
-      Expression ((Projection + Before ORDER BY))
+      Expression ((Project names + (Projection + Change column names to column identifiers)))
         ReadFromStorage (SystemOne)
 Union
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
 Union
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
 Union
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
-  Expression ((Projection + Before ORDER BY))
+  Expression ((Project names + (Projection + Change column names to column identifiers)))
     ReadFromStorage (SystemOne)
diff --git a/tests/queries/0_stateless/01556_explain_select_with_union_query.sql b/tests/queries/0_stateless/01556_explain_select_with_union_query.sql
index dcd9bbe7347..bbd96ef5c69 100644
--- a/tests/queries/0_stateless/01556_explain_select_with_union_query.sql
+++ b/tests/queries/0_stateless/01556_explain_select_with_union_query.sql
@@ -1,3 +1,4 @@
+SET allow_experimental_analyzer = 1;
 SET union_default_mode = 'DISTINCT';
 
 set enable_global_with_statement = 1;
diff --git a/tests/queries/0_stateless/01558_ttest_scipy.python b/tests/queries/0_stateless/01558_ttest_scipy.python
index 4d913d4292f..75e1c2701b2 100644
--- a/tests/queries/0_stateless/01558_ttest_scipy.python
+++ b/tests/queries/0_stateless/01558_ttest_scipy.python
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3                                                                                                                                                                                              
+#!/usr/bin/env python3
 import os
 import sys
 from scipy import stats
@@ -6,70 +6,86 @@ import pandas as pd
 import numpy as np
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
 from pure_http_client import ClickHouseClient
 
+
 def test_and_check(name, a, b, t_stat, p_value, precision=1e-2):
     client = ClickHouseClient()
     client.query("DROP TABLE IF EXISTS ttest;")
-    client.query("CREATE TABLE ttest (left Float64, right UInt8) ENGINE = Memory;");
-    client.query("INSERT INTO ttest VALUES {};".format(", ".join(['({},{})'.format(i, 0) for i in a])))
-    client.query("INSERT INTO ttest VALUES {};".format(", ".join(['({},{})'.format(j, 1) for j in b])))
+    client.query("CREATE TABLE ttest (left Float64, right UInt8) ENGINE = Memory;")
+    client.query(
+        "INSERT INTO ttest VALUES {};".format(
+            ", ".join(["({},{})".format(i, 0) for i in a])
+        )
+    )
+    client.query(
+        "INSERT INTO ttest VALUES {};".format(
+            ", ".join(["({},{})".format(j, 1) for j in b])
+        )
+    )
     real = client.query_return_df(
-        "SELECT roundBankers({}(left, right).1, 16) as t_stat, ".format(name) +
-               "roundBankers({}(left, right).2, 16) as p_value ".format(name) + 
-        "FROM ttest FORMAT TabSeparatedWithNames;")
-    real_t_stat = real['t_stat'][0]
-    real_p_value = real['p_value'][0]
-    assert(abs(real_t_stat - np.float64(t_stat)) < precision), "clickhouse_t_stat {}, scipy_t_stat {}".format(real_t_stat, t_stat)
-    assert(abs(real_p_value - np.float64(p_value)) < precision), "clickhouse_p_value {}, scipy_p_value {}".format(real_p_value, p_value)
+        "SELECT roundBankers({}(left, right).1, 16) as t_stat, ".format(name)
+        + "roundBankers({}(left, right).2, 16) as p_value ".format(name)
+        + "FROM ttest FORMAT TabSeparatedWithNames;"
+    )
+    real_t_stat = real["t_stat"][0]
+    real_p_value = real["p_value"][0]
+    assert (
+        abs(real_t_stat - np.float64(t_stat)) < precision
+    ), "clickhouse_t_stat {}, scipy_t_stat {}".format(real_t_stat, t_stat)
+    assert (
+        abs(real_p_value - np.float64(p_value)) < precision
+    ), "clickhouse_p_value {}, scipy_p_value {}".format(real_p_value, p_value)
     client.query("DROP TABLE IF EXISTS ttest;")
 
 
 def test_student():
-    rvs1 = np.round(stats.norm.rvs(loc=1, scale=5,size=500), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=10, scale=5,size=500), 2)
-    s, p = stats.ttest_ind(rvs1, rvs2, equal_var = True)
+    rvs1 = np.round(stats.norm.rvs(loc=1, scale=5, size=500), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=10, scale=5, size=500), 2)
+    s, p = stats.ttest_ind(rvs1, rvs2, equal_var=True)
     test_and_check("studentTTest", rvs1, rvs2, s, p)
 
-    rvs1 = np.round(stats.norm.rvs(loc=0, scale=5,size=500), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=0, scale=5,size=500), 2)
-    s, p = stats.ttest_ind(rvs1, rvs2, equal_var = True)
+    rvs1 = np.round(stats.norm.rvs(loc=0, scale=5, size=500), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=0, scale=5, size=500), 2)
+    s, p = stats.ttest_ind(rvs1, rvs2, equal_var=True)
     test_and_check("studentTTest", rvs1, rvs2, s, p)
 
-    rvs1 = np.round(stats.norm.rvs(loc=2, scale=10,size=512), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=5, scale=20,size=1024), 2)
-    s, p = stats.ttest_ind(rvs1, rvs2, equal_var = True)
+    rvs1 = np.round(stats.norm.rvs(loc=2, scale=10, size=512), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=5, scale=20, size=1024), 2)
+    s, p = stats.ttest_ind(rvs1, rvs2, equal_var=True)
     test_and_check("studentTTest", rvs1, rvs2, s, p)
 
-    rvs1 = np.round(stats.norm.rvs(loc=0, scale=10,size=1024), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=0, scale=10,size=512), 2)
-    s, p = stats.ttest_ind(rvs1, rvs2, equal_var = True)
+    rvs1 = np.round(stats.norm.rvs(loc=0, scale=10, size=1024), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=0, scale=10, size=512), 2)
+    s, p = stats.ttest_ind(rvs1, rvs2, equal_var=True)
     test_and_check("studentTTest", rvs1, rvs2, s, p)
 
+
 def test_welch():
-    rvs1 = np.round(stats.norm.rvs(loc=1, scale=15,size=500), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=10, scale=5,size=500), 2)
-    s, p = stats.ttest_ind(rvs1, rvs2, equal_var = False)
+    rvs1 = np.round(stats.norm.rvs(loc=1, scale=15, size=500), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=10, scale=5, size=500), 2)
+    s, p = stats.ttest_ind(rvs1, rvs2, equal_var=False)
     test_and_check("welchTTest", rvs1, rvs2, s, p)
 
-    rvs1 = np.round(stats.norm.rvs(loc=0, scale=7,size=500), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=0, scale=3,size=500), 2)
-    s, p = stats.ttest_ind(rvs1, rvs2, equal_var = False)
+    rvs1 = np.round(stats.norm.rvs(loc=0, scale=7, size=500), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=0, scale=3, size=500), 2)
+    s, p = stats.ttest_ind(rvs1, rvs2, equal_var=False)
     test_and_check("welchTTest", rvs1, rvs2, s, p)
 
-    rvs1 = np.round(stats.norm.rvs(loc=0, scale=10,size=1024), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=5, scale=1,size=512), 2)
-    s, p = stats.ttest_ind(rvs1, rvs2, equal_var = False)
+    rvs1 = np.round(stats.norm.rvs(loc=0, scale=10, size=1024), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=5, scale=1, size=512), 2)
+    s, p = stats.ttest_ind(rvs1, rvs2, equal_var=False)
     test_and_check("welchTTest", rvs1, rvs2, s, p)
 
-    rvs1 = np.round(stats.norm.rvs(loc=5, scale=10,size=512), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=5, scale=10,size=1024), 2)
-    s, p = stats.ttest_ind(rvs1, rvs2, equal_var = False)
+    rvs1 = np.round(stats.norm.rvs(loc=5, scale=10, size=512), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=5, scale=10, size=1024), 2)
+    s, p = stats.ttest_ind(rvs1, rvs2, equal_var=False)
     test_and_check("welchTTest", rvs1, rvs2, s, p)
 
+
 if __name__ == "__main__":
     test_student()
     test_welch()
-    print("Ok.")
\ No newline at end of file
+    print("Ok.")
diff --git a/tests/queries/0_stateless/01561_clickhouse_client_stage.reference b/tests/queries/0_stateless/01561_clickhouse_client_stage.reference
index 44c39f2a444..00e0f4ddb2e 100644
--- a/tests/queries/0_stateless/01561_clickhouse_client_stage.reference
+++ b/tests/queries/0_stateless/01561_clickhouse_client_stage.reference
@@ -1,15 +1,15 @@
-execute: default
+execute: --allow_experimental_analyzer=1
 "foo"
 1
-execute: --stage fetch_columns
-"dummy"
+execute: --allow_experimental_analyzer=1 --stage fetch_columns
+"system.one.dummy_0"
 0
-execute: --stage with_mergeable_state
-"1"
+execute: --allow_experimental_analyzer=1 --stage with_mergeable_state
+"1_UInt8"
 1
-execute: --stage with_mergeable_state_after_aggregation
-"1"
+execute: --allow_experimental_analyzer=1 --stage with_mergeable_state_after_aggregation
+"1_UInt8"
 1
-execute: --stage complete
+execute: --allow_experimental_analyzer=1 --stage complete
 "foo"
 1
diff --git a/tests/queries/0_stateless/01561_clickhouse_client_stage.sh b/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
index 72161333812..99267458421 100755
--- a/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
+++ b/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
@@ -5,6 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+opts=(
+    "--allow_experimental_analyzer=1"
+)
+
 function execute_query()
 {
     if [ $# -eq 0 ]; then
@@ -15,8 +19,8 @@ function execute_query()
     ${CLICKHOUSE_CLIENT} "$@" --format CSVWithNames -q "SELECT 1 AS foo"
 }
 
-execute_query # default -- complete
-execute_query --stage fetch_columns
-execute_query --stage with_mergeable_state
-execute_query --stage with_mergeable_state_after_aggregation
-execute_query --stage complete
+execute_query "${opts[@]}" # default -- complete
+execute_query "${opts[@]}" --stage fetch_columns
+execute_query "${opts[@]}" --stage with_mergeable_state
+execute_query "${opts[@]}" --stage with_mergeable_state_after_aggregation
+execute_query "${opts[@]}" --stage complete
diff --git a/tests/queries/0_stateless/01561_mann_whitney_scipy.python b/tests/queries/0_stateless/01561_mann_whitney_scipy.python
index 7958e8bbaf1..4713120287d 100644
--- a/tests/queries/0_stateless/01561_mann_whitney_scipy.python
+++ b/tests/queries/0_stateless/01561_mann_whitney_scipy.python
@@ -6,7 +6,7 @@ import pandas as pd
 import numpy as np
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
 from pure_http_client import ClickHouseClient
 
@@ -14,40 +14,51 @@ from pure_http_client import ClickHouseClient
 def test_and_check(name, a, b, t_stat, p_value):
     client = ClickHouseClient()
     client.query("DROP TABLE IF EXISTS mann_whitney;")
-    client.query("CREATE TABLE mann_whitney (left Float64, right UInt8) ENGINE = Memory;");
-    client.query("INSERT INTO mann_whitney VALUES {};".format(", ".join(['({},{}), ({},{})'.format(i, 0, j, 1) for i,j in zip(a, b)])))
+    client.query(
+        "CREATE TABLE mann_whitney (left Float64, right UInt8) ENGINE = Memory;"
+    )
+    client.query(
+        "INSERT INTO mann_whitney VALUES {};".format(
+            ", ".join(["({},{}), ({},{})".format(i, 0, j, 1) for i, j in zip(a, b)])
+        )
+    )
 
     real = client.query_return_df(
-        "SELECT roundBankers({}(left, right).1, 16) as t_stat, ".format(name) +
-               "roundBankers({}(left, right).2, 16) as p_value ".format(name) + 
-        "FROM mann_whitney FORMAT TabSeparatedWithNames;")
-    real_t_stat = real['t_stat'][0]
-    real_p_value = real['p_value'][0]
-    assert(abs(real_t_stat - np.float64(t_stat) < 1e-2)), "clickhouse_t_stat {}, scipy_t_stat {}".format(real_t_stat, t_stat)
-    assert(abs(real_p_value - np.float64(p_value)) < 1e-2), "clickhouse_p_value {}, scipy_p_value {}".format(real_p_value, p_value)
+        "SELECT roundBankers({}(left, right).1, 16) as t_stat, ".format(name)
+        + "roundBankers({}(left, right).2, 16) as p_value ".format(name)
+        + "FROM mann_whitney FORMAT TabSeparatedWithNames;"
+    )
+    real_t_stat = real["t_stat"][0]
+    real_p_value = real["p_value"][0]
+    assert abs(
+        real_t_stat - np.float64(t_stat) < 1e-2
+    ), "clickhouse_t_stat {}, scipy_t_stat {}".format(real_t_stat, t_stat)
+    assert (
+        abs(real_p_value - np.float64(p_value)) < 1e-2
+    ), "clickhouse_p_value {}, scipy_p_value {}".format(real_p_value, p_value)
     client.query("DROP TABLE IF EXISTS mann_whitney;")
 
 
 def test_mann_whitney():
-    rvs1 = np.round(stats.norm.rvs(loc=1, scale=5,size=500), 5)
-    rvs2 = np.round(stats.expon.rvs(scale=0.2,size=500), 5)
-    s, p = stats.mannwhitneyu(rvs1, rvs2, alternative='two-sided')
+    rvs1 = np.round(stats.norm.rvs(loc=1, scale=5, size=500), 5)
+    rvs2 = np.round(stats.expon.rvs(scale=0.2, size=500), 5)
+    s, p = stats.mannwhitneyu(rvs1, rvs2, alternative="two-sided")
     test_and_check("mannWhitneyUTest", rvs1, rvs2, s, p)
     test_and_check("mannWhitneyUTest('two-sided')", rvs1, rvs2, s, p)
 
     equal = np.round(stats.cauchy.rvs(scale=5, size=500), 5)
-    s, p = stats.mannwhitneyu(equal, equal, alternative='two-sided')
+    s, p = stats.mannwhitneyu(equal, equal, alternative="two-sided")
     test_and_check("mannWhitneyUTest('two-sided')", equal, equal, s, p)
 
-    s, p = stats.mannwhitneyu(equal, equal, alternative='less', use_continuity=False)
+    s, p = stats.mannwhitneyu(equal, equal, alternative="less", use_continuity=False)
     test_and_check("mannWhitneyUTest('less', 0)", equal, equal, s, p)
 
-
-    rvs1 = np.round(stats.cauchy.rvs(scale=10,size=65536), 5)
-    rvs2 = np.round(stats.norm.rvs(loc=0, scale=10,size=65536), 5)
-    s, p = stats.mannwhitneyu(rvs1, rvs2, alternative='greater')
+    rvs1 = np.round(stats.cauchy.rvs(scale=10, size=65536), 5)
+    rvs2 = np.round(stats.norm.rvs(loc=0, scale=10, size=65536), 5)
+    s, p = stats.mannwhitneyu(rvs1, rvs2, alternative="greater")
     test_and_check("mannWhitneyUTest('greater')", rvs1, rvs2, s, p)
 
+
 if __name__ == "__main__":
     test_mann_whitney()
-    print("Ok.") 
\ No newline at end of file
+    print("Ok.")
diff --git a/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference b/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
index 8c8bb73b801..49b4d22ea71 100644
--- a/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
+++ b/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
@@ -4,10 +4,10 @@ SELECT
 FROM test_order_by
 ORDER BY timestamp ASC
 LIMIT 10
-Expression (Projection)
+Expression (Project names)
   Limit (preliminary LIMIT (without OFFSET))
     Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
+      Expression ((Before ORDER BY + (Projection + Change column names to column identifiers)))
         ReadFromMergeTree (default.test_order_by)
 SELECT
     timestamp,
@@ -15,10 +15,10 @@ SELECT
 FROM test_order_by
 ORDER BY toDate(timestamp) ASC
 LIMIT 10
-Expression (Projection)
+Expression (Project names)
   Limit (preliminary LIMIT (without OFFSET))
     Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
+      Expression ((Before ORDER BY + (Projection + Change column names to column identifiers)))
         ReadFromMergeTree (default.test_order_by)
 SELECT
     timestamp,
@@ -28,10 +28,10 @@ ORDER BY
     toDate(timestamp) ASC,
     timestamp ASC
 LIMIT 10
-Expression (Projection)
+Expression (Project names)
   Limit (preliminary LIMIT (without OFFSET))
     Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
+      Expression ((Before ORDER BY + (Projection + Change column names to column identifiers)))
         ReadFromMergeTree (default.test_order_by)
 SELECT
     timestamp,
diff --git a/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.sql b/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.sql
index 15ddb5a848f..2fe24d1662d 100644
--- a/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.sql
+++ b/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.sql
@@ -1,3 +1,4 @@
+SET allow_experimental_analyzer = 1;
 SET optimize_monotonous_functions_in_order_by = 1;
 SET optimize_read_in_order = 1;
 
diff --git a/tests/queries/0_stateless/01576_alias_column_rewrite.sql b/tests/queries/0_stateless/01576_alias_column_rewrite.sql
index 1f28225bef8..d59889c1af8 100644
--- a/tests/queries/0_stateless/01576_alias_column_rewrite.sql
+++ b/tests/queries/0_stateless/01576_alias_column_rewrite.sql
@@ -122,7 +122,7 @@ create table pl (dt DateTime, i int, projection p (select sum(i) group by toStar
 insert into pl values ('2020-10-24', 1);
 
 set max_rows_to_read = 2;
-select sum(i) from pd group by dt_m settings allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
+select sum(i) from pd group by dt_m settings optimize_use_projections = 1, force_optimize_projection = 1;
 
 drop table pd;
 drop table pl;
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index aaa88d66ca0..b981a46b4fd 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -915,12 +915,12 @@ from
     (select number, intDiv(number, 3) p, mod(number, 5) o
         from numbers(16)) t
 ;
-Expression ((Projection + Before ORDER BY))
+Expression ((Project names + Projection))
   Window (Window step for window \'\')
-    Window (Window step for window \'PARTITION BY p\')
-      Window (Window step for window \'PARTITION BY p ORDER BY o ASC\')
-        Sorting (Sorting for window \'PARTITION BY p ORDER BY o ASC\')
-          Expression ((Before window functions + (Projection + Before ORDER BY)))
+    Window (Window step for window \'PARTITION BY t.p_0\')
+      Window (Window step for window \'PARTITION BY t.p_0 ORDER BY t.o_1 ASC\')
+        Sorting (Sorting for window \'PARTITION BY t.p_0 ORDER BY t.o_1 ASC\')
+          Expression ((Before WINDOW + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))
             ReadFromStorage (SystemNumbers)
 explain select
     count(*) over (order by o, number),
@@ -929,13 +929,13 @@ from
     (select number, intDiv(number, 3) p, mod(number, 5) o
         from numbers(16)) t
 ;
-Expression ((Projection + Before ORDER BY))
-  Window (Window step for window \'ORDER BY o ASC, number ASC\')
-    Sorting (Sorting for window \'ORDER BY o ASC, number ASC\')
-      Window (Window step for window \'ORDER BY number ASC\')
-        Expression ((Before window functions + (Projection + Before ORDER BY)) [lifted up part])
-          Sorting (Sorting for window \'ORDER BY number ASC\')
-            Expression ((Before window functions + (Projection + Before ORDER BY)))
+Expression ((Project names + Projection))
+  Window (Window step for window \'ORDER BY t.o_0 ASC, t.number_1 ASC\')
+    Sorting (Sorting for window \'ORDER BY t.o_0 ASC, t.number_1 ASC\')
+      Window (Window step for window \'ORDER BY t.number_1 ASC\')
+        Expression ((Before WINDOW + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))) [lifted up part])
+          Sorting (Sorting for window \'ORDER BY t.number_1 ASC\')
+            Expression ((Before WINDOW + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))
               ReadFromStorage (SystemNumbers)
 -- A test case for the sort comparator found by fuzzer.
 SELECT
diff --git a/tests/queries/0_stateless/01591_window_functions.sql b/tests/queries/0_stateless/01591_window_functions.sql
index 3f4a028eac2..3c9c1f9cea7 100644
--- a/tests/queries/0_stateless/01591_window_functions.sql
+++ b/tests/queries/0_stateless/01591_window_functions.sql
@@ -1,5 +1,7 @@
 -- Tags: long
 
+SET allow_experimental_analyzer = 1;
+
 -- { echo }
 
 -- just something basic
diff --git a/tests/queries/0_stateless/01592_long_window_functions1.sql b/tests/queries/0_stateless/01592_long_window_functions1.sql
index 022d8071ffa..4911b7aa792 100644
--- a/tests/queries/0_stateless/01592_long_window_functions1.sql
+++ b/tests/queries/0_stateless/01592_long_window_functions1.sql
@@ -4,10 +4,6 @@ drop table if exists stack;
 
 set max_insert_threads = 4;
 
--- Temporary disable aggregation in order,
--- because it may fail with UBSan.
-set optimize_aggregation_in_order = 0;
-
 create table stack(item_id Int64, brand_id Int64, rack_id Int64, dt DateTime, expiration_dt DateTime, quantity UInt64)
 Engine = MergeTree 
 partition by toYYYYMM(dt) 
diff --git a/tests/queries/0_stateless/01592_toUnixTimestamp_Date.reference b/tests/queries/0_stateless/01592_toUnixTimestamp_Date.reference
index e69de29bb2d..f7d86529347 100644
--- a/tests/queries/0_stateless/01592_toUnixTimestamp_Date.reference
+++ b/tests/queries/0_stateless/01592_toUnixTimestamp_Date.reference
@@ -0,0 +1,4 @@
+1683676800
+1683676800
+1683676800
+1683676800
diff --git a/tests/queries/0_stateless/01592_toUnixTimestamp_Date.sql b/tests/queries/0_stateless/01592_toUnixTimestamp_Date.sql
index 5dc87e31f75..f2ba18a3b55 100644
--- a/tests/queries/0_stateless/01592_toUnixTimestamp_Date.sql
+++ b/tests/queries/0_stateless/01592_toUnixTimestamp_Date.sql
@@ -1 +1,4 @@
-select toUnixTimestamp(today()); -- { serverError 44; }
+select toUnixTimestamp(makeDate(2023, 5, 10));
+select toUnixTimestamp(makeDate32(2023, 5, 10));
+select toUnixTimestamp(makeDate(2023, 5, 10), 'Pacific/Auckland');
+select toUnixTimestamp(makeDate32(2023, 5, 10), 'Pacific/Auckland');
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01595_countMatches.sql b/tests/queries/0_stateless/01595_countMatches.sql
index 6374fe7bc5b..0b170945d44 100644
--- a/tests/queries/0_stateless/01595_countMatches.sql
+++ b/tests/queries/0_stateless/01595_countMatches.sql
@@ -25,5 +25,5 @@ select countMatchesCaseInsensitive('foo.com BAR.COM baz.com bam.com', '([^. ]+)\
 select countMatchesCaseInsensitive('foo.com@foo.com bar.com@foo.com BAZ.com@foo.com bam.com@foo.com', '([^. ]+)\.([^. ]+)@([^. ]+)\.([^. ]+)');
 
 select 'errors';
-select countMatches(1, 'foo') from numbers(1); -- { serverError 43; }
-select countMatches('foobarfoo', toString(number)) from numbers(1); -- { serverError 44; }
+select countMatches(1, 'foo') from numbers(1); -- { serverError 43 }
+select countMatches('foobarfoo', toString(number)) from numbers(1); -- { serverError 44 }
diff --git a/tests/queries/0_stateless/01596_full_join_chertus.sql b/tests/queries/0_stateless/01596_full_join_chertus.sql
index 162b9f7be8f..32911abb792 100644
--- a/tests/queries/0_stateless/01596_full_join_chertus.sql
+++ b/tests/queries/0_stateless/01596_full_join_chertus.sql
@@ -1,9 +1,9 @@
 select toTypeName(materialize(js1.k)), toTypeName(materialize(js2.k)), toTypeName(materialize(js1.s)), toTypeName(materialize(js2.s))
 from (select number k, toLowCardinality(toString(number)) s from numbers(2)) as js1
 full join (select toLowCardinality(number+1) k, toString(number+1) s from numbers(2)) as js2
-using k order by js1.k, js2.k;
+ON js1.k = js2.k order by js1.k, js2.k;
 
 select toTypeName(js1.k), toTypeName(js2.k), toTypeName(js1.s), toTypeName(js2.s)
 from (select number k, toLowCardinality(toString(number)) s from numbers(2)) as js1
 full join (select toLowCardinality(number+1) k, toString(number+1) s from numbers(2)) as js2
-using k order by js1.k, js2.k;
+ON js1.k = js2.k order by js1.k, js2.k;
diff --git a/tests/queries/0_stateless/01596_setting_limit_offset.reference b/tests/queries/0_stateless/01596_setting_limit_offset.reference
index 96483268d43..fe6390b172c 100644
--- a/tests/queries/0_stateless/01596_setting_limit_offset.reference
+++ b/tests/queries/0_stateless/01596_setting_limit_offset.reference
@@ -22,6 +22,10 @@
 107
 108
 109
+102
+103
+104
+105
 105
 106
 107
@@ -38,6 +42,26 @@
 64
 64
 60
+60
+60
+61
+61
+62
+62
+63
+63
+64
+64
+60
+60
+61
+61
+62
+62
+63
+63
+64
+64
 35
 35
 36
diff --git a/tests/queries/0_stateless/01596_setting_limit_offset.sql b/tests/queries/0_stateless/01596_setting_limit_offset.sql
index 3c91e3542bb..0c2ab5fb4dc 100644
--- a/tests/queries/0_stateless/01596_setting_limit_offset.sql
+++ b/tests/queries/0_stateless/01596_setting_limit_offset.sql
@@ -11,6 +11,7 @@ SELECT * FROM test OFFSET 20; -- 5 rows
 SELECT * FROM (SELECT i FROM test LIMIT 10 OFFSET 50) TMP; -- 5 rows
 SELECT * FROM test LIMIT 4 OFFSET 192; -- 4 rows
 SELECT * FROM test LIMIT 10 OFFSET 195; -- 5 rows
+SELECT * FROM test LIMIT 2*2 OFFSET 192;
 
 -- Only set offset
 SET limit = 0;
@@ -21,6 +22,8 @@ SELECT * FROM test LIMIT 100; -- no result
 SET offset = 10;
 SELECT * FROM test LIMIT 20 OFFSET 100; -- 10 rows
 SELECT * FROM test LIMIT 11 OFFSET 100; -- 1 rows
+SELECT * FROM test LIMIT 20 OFFSET 10*10;
+SELECT * FROM test LIMIT 4*5 OFFSET 10*10;
 
 -- offset and limit together
 SET limit = 10;
diff --git a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
index f47d0863e69..89ce84f6dbc 100755
--- a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
+++ b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -8,7 +7,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
 verify_sql="SELECT
     (SELECT sumIf(value, metric = 'PartsActive'), sumIf(value, metric = 'PartsOutdated') FROM system.metrics)
-    = (SELECT sum(active), sum(NOT active) FROM system.parts)"
+    = (SELECT sum(active), sum(NOT active) FROM
+    (SELECT active FROM system.parts UNION ALL SELECT active FROM system.projection_parts))"
 
 # The query is not atomic - it can compare states between system.parts and system.metrics from different points in time.
 # So, there is inherent race condition. But it should get expected result eventually.
diff --git a/tests/queries/0_stateless/01600_parts_types_metrics_long.sh b/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
index 05edf02f7ed..5f724e81042 100755
--- a/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
+++ b/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-s3-storage
+# Tags: no-s3-storage
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -11,7 +11,8 @@ set -o pipefail
 # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
 verify_sql="SELECT
     (SELECT sumIf(value, metric = 'PartsInMemory'), sumIf(value, metric = 'PartsCompact'), sumIf(value, metric = 'PartsWide') FROM system.metrics) =
-    (SELECT countIf(part_type == 'InMemory'), countIf(part_type == 'Compact'), countIf(part_type == 'Wide') FROM system.parts)"
+    (SELECT countIf(part_type == 'InMemory'), countIf(part_type == 'Compact'), countIf(part_type == 'Wide')
+    FROM (SELECT part_type FROM system.parts UNION ALL SELECT part_type FROM system.projection_parts))"
 
 # The query is not atomic - it can compare states between system.parts and system.metrics from different points in time.
 # So, there is inherent race condition (especially in fasttest that runs tests in parallel).
@@ -34,7 +35,7 @@ $CLICKHOUSE_CLIENT --database_atomic_wait_for_drop_and_detach_synchronously=1 --
 # InMemory - [0..5]
 # Compact  - (5..10]
 # Wide     - >10
-$CLICKHOUSE_CLIENT --query="CREATE TABLE data_01600 (part_type String, key Int) ENGINE = MergeTree PARTITION BY part_type ORDER BY key SETTINGS min_bytes_for_wide_part=0, min_bytes_for_compact_part=0, min_rows_for_wide_part=10, min_rows_for_compact_part=5"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE data_01600 (part_type String, key Int) ENGINE = MergeTree PARTITION BY part_type ORDER BY key SETTINGS min_bytes_for_wide_part=0, min_rows_for_wide_part=10"
 
 # InMemory
 $CLICKHOUSE_CLIENT --query="INSERT INTO data_01600 SELECT 'InMemory', number FROM system.numbers LIMIT 1"
diff --git a/tests/queries/0_stateless/01602_array_aggregation.reference b/tests/queries/0_stateless/01602_array_aggregation.reference
index bc21fae692e..ec8a0838401 100644
--- a/tests/queries/0_stateless/01602_array_aggregation.reference
+++ b/tests/queries/0_stateless/01602_array_aggregation.reference
@@ -34,6 +34,10 @@ Table array decimal avg
 3.5
 0
 2
+2023-04-05 00:25:24	2023-04-05 00:25:23	[0,1]
+2023-04-05 00:25:24.124	2023-04-05 00:25:23.123	[0,1.001]
+2023-04-06	2023-04-05	[0,1]
+2023-04-06	2023-04-05	[0,1]
 Types of aggregation result array min
 Int8	Int16	Int32	Int64
 UInt8	UInt16	UInt32	UInt64
diff --git a/tests/queries/0_stateless/01602_array_aggregation.sql b/tests/queries/0_stateless/01602_array_aggregation.sql
index 7159eb1442b..7c0f6eb8267 100644
--- a/tests/queries/0_stateless/01602_array_aggregation.sql
+++ b/tests/queries/0_stateless/01602_array_aggregation.sql
@@ -34,6 +34,11 @@ SELECT arrayAvg(x) FROM test_aggregation;
 
 DROP TABLE test_aggregation;
 
+WITH ['2023-04-05 00:25:23', '2023-04-05 00:25:24']::Array(DateTime) AS dt SELECT arrayMax(dt), arrayMin(dt), arrayDifference(dt);
+WITH ['2023-04-05 00:25:23.123', '2023-04-05 00:25:24.124']::Array(DateTime64(3)) AS dt SELECT arrayMax(dt), arrayMin(dt), arrayDifference(dt);
+WITH ['2023-04-05', '2023-04-06']::Array(Date) AS d SELECT arrayMax(d), arrayMin(d), arrayDifference(d);
+WITH ['2023-04-05', '2023-04-06']::Array(Date32) AS d SELECT arrayMax(d), arrayMin(d), arrayDifference(d);
+
 SELECT 'Types of aggregation result array min';
 SELECT toTypeName(arrayMin([toInt8(0)])), toTypeName(arrayMin([toInt16(0)])), toTypeName(arrayMin([toInt32(0)])), toTypeName(arrayMin([toInt64(0)]));
 SELECT toTypeName(arrayMin([toUInt8(0)])), toTypeName(arrayMin([toUInt16(0)])), toTypeName(arrayMin([toUInt32(0)])), toTypeName(arrayMin([toUInt64(0)]));
diff --git a/tests/queries/0_stateless/01602_show_create_view.reference b/tests/queries/0_stateless/01602_show_create_view.reference
index 5d4bd2cd972..5fe11a38db3 100644
--- a/tests/queries/0_stateless/01602_show_create_view.reference
+++ b/tests/queries/0_stateless/01602_show_create_view.reference
@@ -1,6 +1,5 @@
 CREATE VIEW test_1602.v\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n) AS\nSELECT *\nFROM test_1602.tbl
 CREATE MATERIALIZED VIEW test_1602.vv\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n)\nENGINE = MergeTree\nPARTITION BY toYYYYMM(EventDate)\nORDER BY (CounterID, EventDate, intHash32(UserID))\nSETTINGS index_granularity = 8192 AS\nSELECT *\nFROM test_1602.tbl
-CREATE LIVE VIEW test_1602.vvv\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n) AS\nSELECT *\nFROM test_1602.tbl
 CREATE VIEW test_1602.VIEW\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n) AS\nSELECT *\nFROM test_1602.tbl
 CREATE VIEW test_1602.DATABASE\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n) AS\nSELECT *\nFROM test_1602.tbl
 CREATE VIEW test_1602.DICTIONARY\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n) AS\nSELECT *\nFROM test_1602.tbl
diff --git a/tests/queries/0_stateless/01602_show_create_view.sql b/tests/queries/0_stateless/01602_show_create_view.sql
index 11b9c235290..1d4dd54b1c1 100644
--- a/tests/queries/0_stateless/01602_show_create_view.sql
+++ b/tests/queries/0_stateless/01602_show_create_view.sql
@@ -18,16 +18,10 @@ CREATE MATERIALIZED VIEW test_1602.vv (`EventDate` DateTime, `CounterID` UInt32,
 
 CREATE VIEW test_1602.VIEW AS SELECT * FROM test_1602.tbl; 
 
-SET allow_experimental_live_view=1;
-
-CREATE LIVE VIEW test_1602.vvv AS SELECT * FROM test_1602.tbl;
-
 SHOW CREATE VIEW test_1602.v;
 
 SHOW CREATE VIEW test_1602.vv;
 
-SHOW CREATE VIEW test_1602.vvv;
-
 SHOW CREATE VIEW test_1602.not_exist_view; -- { serverError 390 }
 
 SHOW CREATE VIEW test_1602.tbl; -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01603_decimal_mult_float.reference b/tests/queries/0_stateless/01603_decimal_mult_float.reference
index c2917516e99..4c9d45423ee 100644
--- a/tests/queries/0_stateless/01603_decimal_mult_float.reference
+++ b/tests/queries/0_stateless/01603_decimal_mult_float.reference
@@ -3,7 +3,7 @@
 0.00012000000000000002
 150.16500000000002
 7.775900000000001
-56.62269
+56.622689999999984
 598.8376688440277
 299.41883695311844
 0.7485470860550345
diff --git a/tests/queries/0_stateless/01603_decimal_mult_float.sql b/tests/queries/0_stateless/01603_decimal_mult_float.sql
index 99e4b775da7..799ab91d332 100644
--- a/tests/queries/0_stateless/01603_decimal_mult_float.sql
+++ b/tests/queries/0_stateless/01603_decimal_mult_float.sql
@@ -1,3 +1,5 @@
+SET optimize_arithmetic_operations_in_aggregate_functions = 0;
+
 SELECT toDecimal32(2, 2) * 1.2;
 SELECT toDecimal64(0.5, 2) * 20.33;
 SELECT 0.00001 * toDecimal32(12, 2);
diff --git a/tests/queries/0_stateless/01622_constraints_simple_optimization.reference b/tests/queries/0_stateless/01622_constraints_simple_optimization.reference
index 7e012e1a17b..a375c35ca3e 100644
--- a/tests/queries/0_stateless/01622_constraints_simple_optimization.reference
+++ b/tests/queries/0_stateless/01622_constraints_simple_optimization.reference
@@ -38,8 +38,47 @@ WHERE (c > 100) OR (b > 100)
 SELECT count() AS `count()`
 FROM constraint_test_constants
 WHERE c > 100
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.constraint_test_constants
+  WHERE
+    FUNCTION id: 4, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 5, nodes: 2
+          COLUMN id: 6, column_name: c, result_type: Int64, source_id: 3
+          CONSTANT id: 7, constant_value: UInt64_100, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT count() AS `count()`
 FROM constraint_test_constants
 WHERE c > 100
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.constraint_test_constants
+  WHERE
+    FUNCTION id: 4, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 5, nodes: 2
+          COLUMN id: 6, column_name: c, result_type: Int64, source_id: 3
+          CONSTANT id: 7, constant_value: UInt64_100, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT count() AS `count()`
 FROM constraint_test_constants
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.constraint_test_constants
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/01622_constraints_simple_optimization.sql b/tests/queries/0_stateless/01622_constraints_simple_optimization.sql
index 7ec9e1a3158..a4d0035c590 100644
--- a/tests/queries/0_stateless/01622_constraints_simple_optimization.sql
+++ b/tests/queries/0_stateless/01622_constraints_simple_optimization.sql
@@ -98,8 +98,12 @@ SELECT count() FROM constraint_test_constants WHERE 11 <= a; ---> assumption ->
 
 -- A AND NOT A
 EXPLAIN SYNTAX SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100);
+-- EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100); ---> the order of the generated checks is not consistent
 EXPLAIN SYNTAX SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100);
+EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) AND (c > 100);
+EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) AND (c > 100) SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) AND (c <= 100);
+EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) AND (c <= 100) SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE constraint_test_constants;
diff --git a/tests/queries/0_stateless/01622_constraints_where_optimization.reference b/tests/queries/0_stateless/01622_constraints_where_optimization.reference
index c7c516025f2..b5520d75b0e 100644
--- a/tests/queries/0_stateless/01622_constraints_where_optimization.reference
+++ b/tests/queries/0_stateless/01622_constraints_where_optimization.reference
@@ -1,14 +1,89 @@
 SELECT count()
 FROM t_constraints_where
 WHERE 0
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.t_constraints_where
+  WHERE
+    CONSTANT id: 4, constant_value: UInt64_0, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT count()
 FROM t_constraints_where
 WHERE 0
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.t_constraints_where
+  WHERE
+    CONSTANT id: 4, constant_value: UInt64_0, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT count()
 FROM t_constraints_where
 WHERE 0
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.t_constraints_where
+  WHERE
+    CONSTANT id: 4, constant_value: UInt64_0, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT count()
 FROM t_constraints_where
 WHERE b < 8
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.t_constraints_where
+  WHERE
+    FUNCTION id: 4, function_name: less, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 5, nodes: 2
+          COLUMN id: 6, column_name: b, result_type: UInt32, source_id: 3
+          CONSTANT id: 7, constant_value: UInt64_8, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT count()
 FROM t_constraints_where
+PREWHERE (b > 20) OR (b < 8)
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.t_constraints_where
+  PREWHERE
+    FUNCTION id: 4, function_name: less, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 5, nodes: 2
+          COLUMN id: 6, column_name: b, result_type: UInt32, source_id: 3
+          CONSTANT id: 7, constant_value: UInt64_8, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
+SELECT count()
+FROM t_constraints_where
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE id: 3, table_name: default.t_constraints_where
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/01622_constraints_where_optimization.sql b/tests/queries/0_stateless/01622_constraints_where_optimization.sql
index 6a9d1ba9f6b..2818351a120 100644
--- a/tests/queries/0_stateless/01622_constraints_where_optimization.sql
+++ b/tests/queries/0_stateless/01622_constraints_where_optimization.sql
@@ -8,9 +8,15 @@ CREATE TABLE t_constraints_where(a UInt32, b UInt32, CONSTRAINT c1 ASSUME b >= 5
 INSERT INTO t_constraints_where VALUES (1, 7);
 
 EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b > 15; -- assumption -> 0
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b > 15 SETTINGS allow_experimental_analyzer = 1; -- assumption -> 0
 EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b = 20; -- assumption -> 0
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b = 20 SETTINGS allow_experimental_analyzer = 1; -- assumption -> 0
 EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b < 2; -- assumption -> 0
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b < 2 SETTINGS allow_experimental_analyzer = 1; -- assumption -> 0
 EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b > 20 OR b < 8; -- assumption -> remove (b < 20)
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b > 20 OR b < 8 SETTINGS allow_experimental_analyzer = 1; -- assumption -> remove (b < 20)
+EXPLAIN SYNTAX SELECT count() FROM t_constraints_where PREWHERE b > 20 OR b < 8; -- assumption -> remove (b < 20)
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where PREWHERE b > 20 OR b < 8 SETTINGS allow_experimental_analyzer = 1; -- assumption -> remove (b < 20)
 
 DROP TABLE t_constraints_where;
 
@@ -18,6 +24,7 @@ CREATE TABLE t_constraints_where(a UInt32, b UInt32, CONSTRAINT c1 ASSUME b < 10
 
 INSERT INTO t_constraints_where VALUES (1, 7);
 
-EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b = 1 OR b < 18 OR b > 5; -- assumtion -> (b < 20) -> 0;
+EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b = 1 OR b < 18 OR b > 5; -- assumption -> (b < 20) -> 0;
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b = 1 OR b < 18 OR b > 5 SETTINGS allow_experimental_analyzer = 1; -- assumption -> (b < 20) -> 0;
 
 DROP TABLE t_constraints_where;
diff --git a/tests/queries/0_stateless/01623_constraints_column_swap.reference b/tests/queries/0_stateless/01623_constraints_column_swap.reference
index 7ae4516fe9e..3639ad47228 100644
--- a/tests/queries/0_stateless/01623_constraints_column_swap.reference
+++ b/tests/queries/0_stateless/01623_constraints_column_swap.reference
@@ -3,51 +3,329 @@ SELECT
     (b AS b) + 3 AS `plus(b, 3)`
 FROM column_swap_test_test
 WHERE b = 1
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(cityHash64(a), 10) UInt64
+    plus(b, 3) UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            COLUMN id: 4, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 6, constant_value: UInt64_10, constant_value_type: UInt8
+      FUNCTION id: 7, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 8, nodes: 2
+            COLUMN id: 9, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 10, constant_value: UInt64_3, constant_value_type: UInt8
+  JOIN TREE
+    TABLE id: 5, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 11, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 12, nodes: 2
+          COLUMN id: 13, column_name: b, result_type: UInt64, source_id: 5
+          CONSTANT id: 14, constant_value: UInt64_1, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
+SELECT
+    cityHash64(a) + 10,
+    b + 3
+FROM column_swap_test_test
+PREWHERE cityHash64(a) = 1
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(cityHash64(a), 10) UInt64
+    plus(b, 3) UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            COLUMN id: 4, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 6, constant_value: UInt64_10, constant_value_type: UInt8
+      FUNCTION id: 7, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 8, nodes: 2
+            COLUMN id: 9, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 10, constant_value: UInt64_3, constant_value_type: UInt8
+  JOIN TREE
+    TABLE id: 5, table_name: default.column_swap_test_test
+  PREWHERE
+    FUNCTION id: 11, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 12, nodes: 2
+          COLUMN id: 13, column_name: b, result_type: UInt64, source_id: 5
+          CONSTANT id: 14, constant_value: UInt64_1, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     (b AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`,
     (b AS b) + 3 AS `plus(b, 3)`
 FROM column_swap_test_test
 WHERE b = 0
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(cityHash64(a), 10) UInt64
+    plus(b, 3) UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            COLUMN id: 4, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 6, constant_value: UInt64_10, constant_value_type: UInt8
+      FUNCTION id: 7, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 8, nodes: 2
+            COLUMN id: 9, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 10, constant_value: UInt64_3, constant_value_type: UInt8
+  JOIN TREE
+    TABLE id: 5, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 11, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 12, nodes: 2
+          COLUMN id: 13, column_name: b, result_type: UInt64, source_id: 5
+          CONSTANT id: 14, constant_value: UInt64_0, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     (b AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`,
     (b AS b) + 3 AS `plus(b, 3)`
 FROM column_swap_test_test
 WHERE b = 0
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(cityHash64(a), 10) UInt64
+    plus(b, 3) UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            COLUMN id: 4, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 6, constant_value: UInt64_10, constant_value_type: UInt8
+      FUNCTION id: 7, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 8, nodes: 2
+            COLUMN id: 9, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 10, constant_value: UInt64_3, constant_value_type: UInt8
+  JOIN TREE
+    TABLE id: 5, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 11, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 12, nodes: 2
+          COLUMN id: 13, column_name: b, result_type: UInt64, source_id: 5
+          CONSTANT id: 14, constant_value: UInt64_0, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     (b AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`,
     (b AS b) + 3 AS `plus(b, 3)`
 FROM column_swap_test_test
 WHERE b = 1
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(cityHash64(a), 10) UInt64
+    plus(b, 3) UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            COLUMN id: 4, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 6, constant_value: UInt64_10, constant_value_type: UInt8
+      FUNCTION id: 7, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 8, nodes: 2
+            COLUMN id: 9, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 10, constant_value: UInt64_3, constant_value_type: UInt8
+  JOIN TREE
+    TABLE id: 5, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 11, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 12, nodes: 2
+          COLUMN id: 13, column_name: b, result_type: UInt64, source_id: 5
+          CONSTANT id: 14, constant_value: UInt64_1, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT (b AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`
 FROM column_swap_test_test
 WHERE b = 0
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(cityHash64(a), 10) UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            COLUMN id: 4, column_name: b, result_type: UInt64, source_id: 5
+            CONSTANT id: 6, constant_value: UInt64_10, constant_value_type: UInt8
+  JOIN TREE
+    TABLE id: 5, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 7, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 8, nodes: 2
+          COLUMN id: 9, column_name: b, result_type: UInt64, source_id: 5
+          CONSTANT id: 10, constant_value: UInt64_0, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     (cityHash64(a) AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`,
     a AS a
 FROM column_swap_test_test
 WHERE cityHash64(a) = 0
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(cityHash64(a), 10) UInt64
+    a String
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: cityHash64, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: a, result_type: String, source_id: 7
+            CONSTANT id: 8, constant_value: UInt64_10, constant_value_type: UInt8
+      COLUMN id: 9, column_name: a, result_type: String, source_id: 7
+  JOIN TREE
+    TABLE id: 7, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 10, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 11, nodes: 2
+          FUNCTION id: 12, function_name: cityHash64, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 13, nodes: 1
+                COLUMN id: 14, column_name: a, result_type: String, source_id: 7
+          CONSTANT id: 15, constant_value: UInt64_0, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     (cityHash64(a) AS b) + 10 AS `plus(b, 10)`,
     a AS a
 FROM column_swap_test_test
 WHERE cityHash64(a) = 0
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(b, 10) UInt64
+    a String
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: cityHash64, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: a, result_type: String, source_id: 7
+            CONSTANT id: 8, constant_value: UInt64_10, constant_value_type: UInt8
+      COLUMN id: 9, column_name: a, result_type: String, source_id: 7
+  JOIN TREE
+    TABLE id: 7, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 10, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 11, nodes: 2
+          FUNCTION id: 12, function_name: cityHash64, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 13, nodes: 1
+                COLUMN id: 14, column_name: a, result_type: String, source_id: 7
+          CONSTANT id: 15, constant_value: UInt64_0, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     a AS `substring(reverse(b), 1, 1)`,
     a AS a
 FROM column_swap_test_test
 WHERE a = \'c\'
+QUERY id: 0
+  PROJECTION COLUMNS
+    substring(reverse(b), 1, 1) String
+    a String
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: String, source_id: 3
+      COLUMN id: 4, column_name: a, result_type: String, source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 5, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          COLUMN id: 7, column_name: a, result_type: String, source_id: 3
+          CONSTANT id: 8, constant_value: \'c\', constant_value_type: String
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     a AS `substring(reverse(b), 1, 1)`,
     a AS a
 FROM column_swap_test_test
 WHERE a = \'c\'
+QUERY id: 0
+  PROJECTION COLUMNS
+    substring(reverse(b), 1, 1) String
+    a String
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: String, source_id: 3
+      COLUMN id: 4, column_name: a, result_type: String, source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 5, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          COLUMN id: 7, column_name: a, result_type: String, source_id: 3
+          CONSTANT id: 8, constant_value: \'c\', constant_value_type: String
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     a AS t1,
     a AS t2
 FROM column_swap_test_test
 WHERE a = \'c\'
+QUERY id: 0
+  PROJECTION COLUMNS
+    t1 String
+    t2 String
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: String, source_id: 3
+      COLUMN id: 4, column_name: a, result_type: String, source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 5, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          COLUMN id: 7, column_name: a, result_type: String, source_id: 3
+          CONSTANT id: 8, constant_value: \'c\', constant_value_type: String
+  SETTINGS allow_experimental_analyzer=1
 SELECT a AS `substring(reverse(b), 1, 1)`
 FROM column_swap_test_test
 WHERE a = \'c\'
+QUERY id: 0
+  PROJECTION COLUMNS
+    substring(reverse(b), 1, 1) String
+  PROJECTION
+    LIST id: 1, nodes: 1
+      COLUMN id: 2, column_name: a, result_type: String, source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.column_swap_test_test
+  WHERE
+    FUNCTION id: 4, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 5, nodes: 2
+          COLUMN id: 6, column_name: a, result_type: String, source_id: 3
+          CONSTANT id: 7, constant_value: \'c\', constant_value_type: String
+  SETTINGS allow_experimental_analyzer=1
 SELECT a
 FROM t_bad_constraint
+QUERY id: 0
+  PROJECTION COLUMNS
+    a UInt32
+  PROJECTION
+    LIST id: 1, nodes: 1
+      COLUMN id: 2, column_name: a, result_type: UInt32, source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.t_bad_constraint
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/01623_constraints_column_swap.sql b/tests/queries/0_stateless/01623_constraints_column_swap.sql
index c81b37c8428..3219ee3cda7 100644
--- a/tests/queries/0_stateless/01623_constraints_column_swap.sql
+++ b/tests/queries/0_stateless/01623_constraints_column_swap.sql
@@ -13,13 +13,22 @@ INSERT INTO column_swap_test_test VALUES (1, 'cat', 1), (2, 'dog', 2);
 INSERT INTO column_swap_test_test SELECT number AS i, format('test {} kek {}', toString(number), toString(number + 10))  AS a, 1 AS b FROM system.numbers LIMIT 1000000;
 
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE cityHash64(a) = 1;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE cityHash64(a) = 1 SETTINGS allow_experimental_analyzer = 1;
+EXPLAIN SYNTAX SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test PREWHERE cityHash64(a) = 1;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test PREWHERE cityHash64(a) = 1 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE cityHash64(a) = 0;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE cityHash64(a) = 0 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE b = 0;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE b = 0 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE b = 1;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE b = 1 SETTINGS allow_experimental_analyzer = 1;
 
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10 FROM column_swap_test_test WHERE cityHash64(a) = 0;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10 FROM column_swap_test_test WHERE cityHash64(a) = 0 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, a FROM column_swap_test_test WHERE cityHash64(a) = 0;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, a FROM column_swap_test_test WHERE cityHash64(a) = 0 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT b + 10, a FROM column_swap_test_test WHERE b = 0;
+EXPLAIN QUERY TREE SELECT b + 10, a FROM column_swap_test_test WHERE b = 0 SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE column_swap_test_test;
 
@@ -27,9 +36,13 @@ CREATE TABLE column_swap_test_test (i Int64, a String, b String, CONSTRAINT c1 A
 INSERT INTO column_swap_test_test SELECT number AS i, toString(number) AS a, format('test {} kek {}', toString(number), toString(number + 10)) b FROM system.numbers LIMIT 1000000;
 
 EXPLAIN SYNTAX SELECT substring(reverse(b), 1, 1), a FROM column_swap_test_test WHERE a = 'c';
+EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1), a FROM column_swap_test_test WHERE a = 'c' SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT substring(reverse(b), 1, 1), a FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c';
+EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1), a FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c' SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT substring(reverse(b), 1, 1) AS t1, a AS t2 FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c';
+EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1) AS t1, a AS t2 FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c' SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT substring(reverse(b), 1, 1) FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c';
+EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1) FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c' SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE column_swap_test_test;
 
@@ -40,5 +53,6 @@ CREATE TABLE t_bad_constraint(a UInt32, s String, CONSTRAINT c1 ASSUME a = toUIn
 INSERT INTO t_bad_constraint SELECT number, randomPrintableASCII(100) FROM numbers(10000);
 
 EXPLAIN SYNTAX SELECT a FROM t_bad_constraint;
+EXPLAIN QUERY TREE SELECT a FROM t_bad_constraint SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE t_bad_constraint;
diff --git a/tests/queries/0_stateless/01625_constraints_index_append.reference b/tests/queries/0_stateless/01625_constraints_index_append.reference
index 0df5c429d9e..591d8a85897 100644
--- a/tests/queries/0_stateless/01625_constraints_index_append.reference
+++ b/tests/queries/0_stateless/01625_constraints_index_append.reference
@@ -2,14 +2,22 @@ SELECT i AS i
 FROM index_append_test_test
 PREWHERE a = 0
 WHERE (a = 0) AND indexHint((i + 40) > 0)
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, optimize_move_to_prewhere = 1, optimize_substitute_columns = 1, optimize_append_index = 1
+1
 SELECT i AS i
 FROM index_append_test_test
 PREWHERE a < 0
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, optimize_move_to_prewhere = 1, optimize_substitute_columns = 1, optimize_append_index = 1
+0
 SELECT i AS i
 FROM index_append_test_test
 PREWHERE a >= 0
 WHERE (a >= 0) AND indexHint((i + 40) > 0)
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, optimize_move_to_prewhere = 1, optimize_substitute_columns = 1, optimize_append_index = 1
+1
 SELECT i AS i
 FROM index_append_test_test
 PREWHERE (2 * b) < 100
 WHERE ((2 * b) < 100) AND indexHint(i < 100)
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, optimize_move_to_prewhere = 1, optimize_substitute_columns = 1, optimize_append_index = 1
+1
diff --git a/tests/queries/0_stateless/01625_constraints_index_append.sh b/tests/queries/0_stateless/01625_constraints_index_append.sh
new file mode 100755
index 00000000000..acceedbb1d1
--- /dev/null
+++ b/tests/queries/0_stateless/01625_constraints_index_append.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# We should have correct env vars from shell_config.sh to run this test
+
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS index_append_test_test;"
+
+$CLICKHOUSE_CLIENT --query "CREATE TABLE index_append_test_test (i Int64, a UInt32, b UInt64, CONSTRAINT c1 ASSUME i <= 2 * b AND i + 40 > a) ENGINE = MergeTree() ORDER BY i;"
+$CLICKHOUSE_CLIENT --query "INSERT INTO index_append_test_test VALUES (1, 10, 1), (2, 20, 2);"
+
+function run_with_settings()
+{
+    query="$1 SETTINGS convert_query_to_cnf = 1\
+        , optimize_using_constraints = 1\
+        , optimize_move_to_prewhere = 1\
+        , optimize_substitute_columns = 1\
+        , optimize_append_index = 1"
+
+    if [[ $query =~ "EXPLAIN QUERY TREE" ]]; then query="${query}, allow_experimental_analyzer = 1"; fi
+
+    $CLICKHOUSE_CLIENT --query="$query"
+
+}
+
+run_with_settings "EXPLAIN SYNTAX SELECT i FROM index_append_test_test WHERE a = 0"
+run_with_settings "EXPLAIN QUERY TREE SELECT i FROM index_append_test_test WHERE a = 0" | grep -Fac "indexHint"
+run_with_settings "EXPLAIN SYNTAX SELECT i FROM index_append_test_test WHERE a < 0"
+run_with_settings "EXPLAIN QUERY TREE SELECT i FROM index_append_test_test WHERE a < 0" | grep -Fac "indexHint"
+run_with_settings "EXPLAIN SYNTAX SELECT i FROM index_append_test_test WHERE a >= 0"
+run_with_settings "EXPLAIN QUERY TREE SELECT i FROM index_append_test_test WHERE a >= 0" | grep -Fac "indexHint"
+run_with_settings "EXPLAIN SYNTAX SELECT i FROM index_append_test_test WHERE 2 * b < 100"
+run_with_settings "EXPLAIN QUERY TREE SELECT i FROM index_append_test_test WHERE 2 * b < 100" | grep -Fac "indexHint"
+
+$CLICKHOUSE_CLIENT --query "DROP TABLE index_append_test_test;"
diff --git a/tests/queries/0_stateless/01625_constraints_index_append.sql b/tests/queries/0_stateless/01625_constraints_index_append.sql
deleted file mode 100644
index fbffc9c7f10..00000000000
--- a/tests/queries/0_stateless/01625_constraints_index_append.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-SET convert_query_to_cnf = 1;
-SET optimize_using_constraints = 1;
-SET optimize_move_to_prewhere = 1;
-SET optimize_substitute_columns = 1;
-SET optimize_append_index = 1;
-
-DROP TABLE IF EXISTS index_append_test_test;
-
-CREATE TABLE index_append_test_test (i Int64, a UInt32, b UInt64, CONSTRAINT c1 ASSUME i <= 2 * b AND i + 40 > a) ENGINE = MergeTree() ORDER BY i;
-INSERT INTO index_append_test_test VALUES (1, 10, 1), (2, 20, 2);
-
-EXPLAIN SYNTAX SELECT i FROM index_append_test_test WHERE a = 0;
-EXPLAIN SYNTAX SELECT i FROM index_append_test_test WHERE a < 0;
-EXPLAIN SYNTAX SELECT i FROM index_append_test_test WHERE a >= 0;
-EXPLAIN SYNTAX SELECT i FROM index_append_test_test WHERE 2 * b < 100;
-
-DROP TABLE index_append_test_test;
diff --git a/tests/queries/0_stateless/01626_cnf_fuzz_long.python b/tests/queries/0_stateless/01626_cnf_fuzz_long.python
index 10c12d14182..de9e4a21dbb 100644
--- a/tests/queries/0_stateless/01626_cnf_fuzz_long.python
+++ b/tests/queries/0_stateless/01626_cnf_fuzz_long.python
@@ -4,14 +4,18 @@ from random import randint, choices
 import sys
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
 from pure_http_client import ClickHouseClient
 
 client = ClickHouseClient()
 
 N = 10
-create_query = "CREATE TABLE t_cnf_fuzz(" + ", ".join([f"c{i} UInt8" for i in range(N)]) + ") ENGINE = Memory"
+create_query = (
+    "CREATE TABLE t_cnf_fuzz("
+    + ", ".join([f"c{i} UInt8" for i in range(N)])
+    + ") ENGINE = Memory"
+)
 
 client.query("DROP TABLE IF EXISTS t_cnf_fuzz")
 client.query(create_query)
@@ -35,6 +39,7 @@ client.query(insert_query)
 MAX_CLAUSES = 10
 MAX_ATOMS = 5
 
+
 def generate_dnf():
     clauses = []
     num_clauses = randint(1, MAX_CLAUSES)
@@ -42,12 +47,17 @@ def generate_dnf():
         num_atoms = randint(1, MAX_ATOMS)
         atom_ids = choices(range(N), k=num_atoms)
         negates = choices([0, 1], k=num_atoms)
-        atoms = [f"(NOT c{i})" if neg else f"c{i}" for (i, neg) in zip(atom_ids, negates)]
+        atoms = [
+            f"(NOT c{i})" if neg else f"c{i}" for (i, neg) in zip(atom_ids, negates)
+        ]
         clauses.append("(" + " AND ".join(atoms) + ")")
 
     return " OR ".join(clauses)
 
-select_query = "SELECT count() FROM t_cnf_fuzz WHERE {} SETTINGS convert_query_to_cnf = {}"
+
+select_query = (
+    "SELECT count() FROM t_cnf_fuzz WHERE {} SETTINGS convert_query_to_cnf = {}"
+)
 
 fail_report = """
 Failed query: '{}'.
diff --git a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
index 363f88c5ec9..aeabc05fdd3 100644
--- a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
+++ b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
@@ -13,9 +13,9 @@ create table data_01641 (key Int, value String) engine=MergeTree order by (key,
 SET max_block_size = 1000, min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
 insert into data_01641 select number, toString(number) from numbers(120000);
 
--- Definitely should fail and it proves that memory is tracked in OPTIMIZE query.
 set max_memory_usage='10Mi', max_untracked_memory=0;
 
-optimize table data_01641 final; -- { serverError 241 }
+-- It fails iff memory is tracked in OPTIMIZE query, but it doesn't. OPTIMIZE query doesn't rely on query context.
+optimize table data_01641 final;
 
 drop table data_01641;
diff --git a/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.reference b/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.reference
index 613c455fc59..98bb953263a 100644
--- a/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.reference
+++ b/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.reference
@@ -8,8 +8,6 @@ wide fsync_after_insert
 1
 wide fsync_after_insert,fsync_part_directory
 1
-memory in_memory_parts_insert_sync
-1
 wide fsync_part_directory,vertical
 1
 2
diff --git a/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.sql b/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.sql
index ad0dfca0db2..dfc761e1764 100644
--- a/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.sql
+++ b/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.sql
@@ -37,13 +37,6 @@ select * from data_01643;
 optimize table data_01643 final;
 drop table data_01643;
 
-select 'memory in_memory_parts_insert_sync';
-create table data_01643 (key Int) engine=MergeTree() order by key settings min_rows_for_compact_part=2, in_memory_parts_insert_sync=1, fsync_after_insert=1, fsync_part_directory=1;
-insert into data_01643 values (1);
-select * from data_01643;
-optimize table data_01643 final;
-drop table data_01643;
-
 select 'wide fsync_part_directory,vertical';
 create table data_01643 (key Int) engine=MergeTree() order by key settings min_bytes_for_wide_part=0, fsync_part_directory=1, enable_vertical_merge_algorithm=1, vertical_merge_algorithm_min_rows_to_activate=0, vertical_merge_algorithm_min_columns_to_activate=0;
 insert into data_01643 values (1);
diff --git a/tests/queries/0_stateless/01643_replicated_merge_tree_fsync_smoke.reference b/tests/queries/0_stateless/01643_replicated_merge_tree_fsync_smoke.reference
index 613c455fc59..98bb953263a 100644
--- a/tests/queries/0_stateless/01643_replicated_merge_tree_fsync_smoke.reference
+++ b/tests/queries/0_stateless/01643_replicated_merge_tree_fsync_smoke.reference
@@ -8,8 +8,6 @@ wide fsync_after_insert
 1
 wide fsync_after_insert,fsync_part_directory
 1
-memory in_memory_parts_insert_sync
-1
 wide fsync_part_directory,vertical
 1
 2
diff --git a/tests/queries/0_stateless/01643_replicated_merge_tree_fsync_smoke.sql b/tests/queries/0_stateless/01643_replicated_merge_tree_fsync_smoke.sql
index bcce87e11db..54c30fa2b1a 100644
--- a/tests/queries/0_stateless/01643_replicated_merge_tree_fsync_smoke.sql
+++ b/tests/queries/0_stateless/01643_replicated_merge_tree_fsync_smoke.sql
@@ -63,17 +63,6 @@ system sync replica rep_fsync_r2;
 drop table rep_fsync_r1;
 drop table rep_fsync_r2;
 
-select 'memory in_memory_parts_insert_sync';
-create table rep_fsync_r1 (key Int) engine=ReplicatedMergeTree('/clickhouse/tables/{database}/rep_fsync', 'r1') order by key settings min_rows_for_compact_part=2, in_memory_parts_insert_sync=1, fsync_after_insert=1, fsync_part_directory=1;
-create table rep_fsync_r2 (key Int) engine=ReplicatedMergeTree('/clickhouse/tables/{database}/rep_fsync', 'r2') order by key settings min_rows_for_compact_part=2, in_memory_parts_insert_sync=1, fsync_after_insert=1, fsync_part_directory=1;
-insert into rep_fsync_r1 values (1);
-system sync replica rep_fsync_r2;
-select * from rep_fsync_r2;
-optimize table rep_fsync_r1 final;
-system sync replica rep_fsync_r2;
-drop table rep_fsync_r1;
-drop table rep_fsync_r2;
-
 select 'wide fsync_part_directory,vertical';
 create table rep_fsync_r1 (key Int) engine=ReplicatedMergeTree('/clickhouse/tables/{database}/rep_fsync', 'r1') order by key settings min_bytes_for_wide_part=0, fsync_part_directory=1, enable_vertical_merge_algorithm=1, vertical_merge_algorithm_min_rows_to_activate=0, vertical_merge_algorithm_min_columns_to_activate=0;
 create table rep_fsync_r2 (key Int) engine=ReplicatedMergeTree('/clickhouse/tables/{database}/rep_fsync', 'r2') order by key settings min_bytes_for_wide_part=0, fsync_part_directory=1, enable_vertical_merge_algorithm=1, vertical_merge_algorithm_min_rows_to_activate=0, vertical_merge_algorithm_min_columns_to_activate=0;
diff --git a/tests/queries/0_stateless/01647_clickhouse_local_hung.sh b/tests/queries/0_stateless/01647_clickhouse_local_hung.sh
index 04f32055ab6..4789db18b2e 100755
--- a/tests/queries/0_stateless/01647_clickhouse_local_hung.sh
+++ b/tests/queries/0_stateless/01647_clickhouse_local_hung.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01651_map_functions.reference b/tests/queries/0_stateless/01651_map_functions.reference
index 06adaf48cfd..60f1b6e0d0c 100644
--- a/tests/queries/0_stateless/01651_map_functions.reference
+++ b/tests/queries/0_stateless/01651_map_functions.reference
@@ -8,6 +8,8 @@
 0
 ['name','age']
 ['name','gender']
+{'name':'zhangsan','age':'10'}
+{'name':'lisi','gender':'female'}
 1	0	0
 1	0	1
 1	0	0
@@ -17,7 +19,20 @@
 [1000]
 [1001]
 [1002]
+{'1000':'2000','1000':'3000','1000':'4000'}
+{'1001':'2002','1001':'3003','1001':'4004'}
+{'1002':'2004','1002':'3006','1002':'4008'}
 {'aa':4,'bb':5}	['aa','bb']	[4,5]
 {'aa':4,'bb':5}	1	0
 {0:0}	1
 {0:0}	0
+{'aa':4,'bb':5}
+{'aa':4,'bb':5}
+{'aa':4,'bb':5}
+{'aa':4,'bb':5}
+{'aa':4,'bb':5}
+{'aa':4,'bb':5}
+{'aa':4,'bb':5}
+{'aa':('a',4),'bb':('b',5)}
+{'aa':('a',4),'bb':('b',5)}
+{'aa':('a',4),'bb':('b',5)}
diff --git a/tests/queries/0_stateless/01651_map_functions.sql b/tests/queries/0_stateless/01651_map_functions.sql
index bbaaf9bee84..5942bf8b2c2 100644
--- a/tests/queries/0_stateless/01651_map_functions.sql
+++ b/tests/queries/0_stateless/01651_map_functions.sql
@@ -2,23 +2,25 @@ set allow_experimental_map_type = 1;
 
 -- String type
 drop table if exists table_map;
-create table table_map (a Map(String, String), b String) engine = Memory;
-insert into table_map values ({'name':'zhangsan', 'age':'10'}, 'name'), ({'name':'lisi', 'gender':'female'},'age');
+create table table_map (a Map(String, String), b String, c Array(String), d Array(String)) engine = Memory;
+insert into table_map values ({'name':'zhangsan', 'age':'10'}, 'name', ['name', 'age'], ['zhangsan', '10']), ({'name':'lisi', 'gender':'female'},'age',['name', 'gender'], ['lisi', 'female']);
 select mapContains(a, 'name') from table_map;
 select mapContains(a, 'gender') from table_map;
 select mapContains(a, 'abc') from table_map;
 select mapContains(a, b) from table_map;
-select mapContains(a, 10) from table_map; -- { serverError 386 }
+select mapContains(a, 10) from table_map; -- { serverError NO_COMMON_TYPE }
 select mapKeys(a) from table_map;
+select mapFromArrays(c, d) from table_map;
 drop table if exists table_map;
 
-CREATE TABLE table_map (a Map(UInt8, Int), b UInt8, c UInt32) engine = MergeTree order by tuple();
-insert into table_map select map(number, number), number, number from numbers(1000, 3);
+CREATE TABLE table_map (a Map(UInt8, Int), b UInt8, c UInt32, d Array(String), e Array(String)) engine = MergeTree order by tuple();
+insert into table_map select map(number, number), number, number, [number, number, number], [number*2, number*3, number*4] from numbers(1000, 3);
 select mapContains(a, b), mapContains(a, c), mapContains(a, 233) from table_map;
-select mapContains(a, 'aaa') from table_map; -- { serverError 386 }
-select mapContains(b, 'aaa') from table_map; -- { serverError 43 }
+select mapContains(a, 'aaa') from table_map; -- { serverError NO_COMMON_TYPE }
+select mapContains(b, 'aaa') from table_map; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 select mapKeys(a) from table_map;
 select mapValues(a) from table_map;
+select mapFromArrays(d, e) from table_map;
 drop table if exists table_map;
 
 
@@ -27,3 +29,18 @@ select map( 'aa', 4, 'bb' , 5) as m, mapKeys(m), mapValues(m);
 select map( 'aa', 4, 'bb' , 5) as m, mapContains(m, 'aa'), mapContains(m, 'k');
 
 select map(0, 0) as m, mapContains(m, number % 2) from numbers(2);
+
+select mapFromArrays(['aa', 'bb'], [4, 5]);
+select mapFromArrays(['aa', 'bb'], materialize([4, 5])) from numbers(2);
+select mapFromArrays(materialize(['aa', 'bb']), [4, 5]) from numbers(2);
+select mapFromArrays(materialize(['aa', 'bb']), materialize([4, 5])) from numbers(2);
+select mapFromArrays('aa', [4, 5]); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select mapFromArrays(['aa', 'bb'], 5); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select mapFromArrays(['aa', 'bb'], [4, 5], [6, 7]); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select mapFromArrays(['aa', 'bb'], [4, 5, 6]); -- { serverError SIZES_OF_ARRAYS_DONT_MATCH }
+select mapFromArrays([[1,2], [3,4]], [4, 5, 6]); -- { serverError BAD_ARGUMENTS }
+
+select mapFromArrays(['aa', 'bb'], map('a', 4, 'b', 5));
+select mapFromArrays(['aa', 'bb'], materialize(map('a', 4, 'b', 5))) from numbers(2);
+select mapFromArrays(map('a', 4, 'b', 4), ['aa', 'bb']) from numbers(2); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select mapFromArrays(['aa', 'bb'], map('a', 4)); -- { serverError SIZES_OF_ARRAYS_DONT_MATCH }
diff --git a/tests/queries/0_stateless/01654_test_writer_block_sequence.python b/tests/queries/0_stateless/01654_test_writer_block_sequence.python
index e80cc273076..bc4e3da9ed5 100644
--- a/tests/queries/0_stateless/01654_test_writer_block_sequence.python
+++ b/tests/queries/0_stateless/01654_test_writer_block_sequence.python
@@ -5,15 +5,20 @@ import random
 import string
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
 from pure_http_client import ClickHouseClient
 
+
 def get_random_string(length):
-    return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(length))
+    return "".join(
+        random.choice(string.ascii_uppercase + string.digits) for _ in range(length)
+    )
+
 
 client = ClickHouseClient()
 
+
 def insert_block(table_name, block_granularity_rows, block_rows):
     global client
     block_data = []
@@ -25,9 +30,12 @@ def insert_block(table_name, block_granularity_rows, block_rows):
     values_row = ", ".join("(1, '" + row + "')" for row in block_data)
     client.query("INSERT INTO {} VALUES {}".format(table_name, values_row))
 
+
 try:
     client.query("DROP TABLE IF EXISTS t")
-    client.query("CREATE TABLE t (v UInt8, data String) ENGINE = MergeTree() ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0")
+    client.query(
+        "CREATE TABLE t (v UInt8, data String) ENGINE = MergeTree() ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0"
+    )
 
     client.query("SYSTEM STOP MERGES t")
 
@@ -53,6 +61,10 @@ try:
     client.query("SYSTEM START MERGES t")
     client.query("OPTIMIZE TABLE t FINAL")
 
-    print(client.query_return_df("SELECT COUNT() as C FROM t FORMAT TabSeparatedWithNames")['C'][0])
+    print(
+        client.query_return_df(
+            "SELECT COUNT() as C FROM t FORMAT TabSeparatedWithNames"
+        )["C"][0]
+    )
 finally:
     client.query("DROP TABLE IF EXISTS t")
diff --git a/tests/queries/0_stateless/01655_plan_optimizations.reference b/tests/queries/0_stateless/01655_plan_optimizations.reference
index f870a52284c..48d99647b43 100644
--- a/tests/queries/0_stateless/01655_plan_optimizations.reference
+++ b/tests/queries/0_stateless/01655_plan_optimizations.reference
@@ -53,7 +53,7 @@ Filter column: notEquals(y, 0)
 9	10
 > one condition of filter should be pushed down after aggregating, other condition is casted
 Filter column
-FUNCTION _CAST(minus(s, 4) :: 1, UInt8 :: 3) -> and(notEquals(y, 0), minus(s, 4))
+FUNCTION and(minus(s, 4) :: 1, 1 :: 3) -> and(notEquals(y, 0), minus(s, 4)) UInt8 : 2
 Aggregating
 Filter column: notEquals(y, 0)
 0	1
diff --git a/tests/queries/0_stateless/01655_plan_optimizations.sh b/tests/queries/0_stateless/01655_plan_optimizations.sh
index aaecdc390cb..ec856c9bf27 100755
--- a/tests/queries/0_stateless/01655_plan_optimizations.sh
+++ b/tests/queries/0_stateless/01655_plan_optimizations.sh
@@ -56,7 +56,7 @@ $CLICKHOUSE_CLIENT -q "
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0 and s - 4
     settings enable_optimize_predicate_expression=0" |
-    grep -o "Aggregating\|Filter column\|Filter column: notEquals(y, 0)\|FUNCTION _CAST(minus(s, 4) :: 1, UInt8 :: 3) -> and(notEquals(y, 0), minus(s, 4))"
+    grep -o "Aggregating\|Filter column\|Filter column: notEquals(y, 0)\|FUNCTION and(minus(s, 4) :: 1, 1 :: 3) -> and(notEquals(y, 0), minus(s, 4)) UInt8 : 2"
 $CLICKHOUSE_CLIENT -q "
     select s, y from (
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
diff --git a/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.reference b/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.reference
index 00eb03bd5f0..f23cf03913b 100644
--- a/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.reference
+++ b/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.reference
@@ -1,15 +1,25 @@
 Partial sorting plan
   optimize_read_in_window_order=0
     Sort description: n ASC, x ASC
+  optimize_read_in_window_order=0, allow_experimental_analyzer=1
+    Sort description: n ASC, x ASC
   optimize_read_in_window_order=1
     Prefix sort description: n ASC
     Result sort description: n ASC, x ASC
+  optimize_read_in_window_order=1, allow_experimental_analyzer=1
+    Prefix sort description: default.test_01655_plan_optimizations_optimize_read_in_window_order_n.n_0 ASC
+    Result sort description: default.test_01655_plan_optimizations_optimize_read_in_window_order_n.n_0 ASC, default.test_01655_plan_optimizations_optimize_read_in_window_order_n.x_1 ASC
 No sorting plan
   optimize_read_in_window_order=0
     Sort description: n ASC, x ASC
+  optimize_read_in_window_order=0, allow_experimental_analyzer=1
+    Sort description: default.test_01655_plan_optimizations_optimize_read_in_window_order_n_x.n_0 ASC, default.test_01655_plan_optimizations_optimize_read_in_window_order_n_x.x_1 ASC
   optimize_read_in_window_order=1
     Prefix sort description: n ASC, x ASC
     Result sort description: n ASC, x ASC
+  optimize_read_in_window_order=1, allow_experimental_analyzer=1
+    Prefix sort description: default.test_01655_plan_optimizations_optimize_read_in_window_order_n_x.n_0 ASC, default.test_01655_plan_optimizations_optimize_read_in_window_order_n_x.x_1 ASC
+    Result sort description: default.test_01655_plan_optimizations_optimize_read_in_window_order_n_x.n_0 ASC, default.test_01655_plan_optimizations_optimize_read_in_window_order_n_x.x_1 ASC
 Complex ORDER BY
   optimize_read_in_window_order=0
 3	3	1
diff --git a/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.sh b/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.sh
index a606f1a2f9e..24c8cf5052e 100755
--- a/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.sh
+++ b/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.sh
@@ -19,17 +19,25 @@ $CLICKHOUSE_CLIENT -q "optimize table ${name}_n_x final"
 
 echo 'Partial sorting plan'
 echo '  optimize_read_in_window_order=0'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0" | grep -i "sort description"
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,allow_experimental_analyzer=0" | grep -i "sort description"
+echo '  optimize_read_in_window_order=0, allow_experimental_analyzer=1'
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,allow_experimental_analyzer=0" | grep -i "sort description"
 
 echo '  optimize_read_in_window_order=1'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=1" | grep -i "sort description"
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=1,allow_experimental_analyzer=0" | grep -i "sort description"
+echo '  optimize_read_in_window_order=1, allow_experimental_analyzer=1'
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=1,allow_experimental_analyzer=1" | grep -i "sort description"
 
 echo 'No sorting plan'
 echo '  optimize_read_in_window_order=0'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0" | grep -i "sort description"
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,allow_experimental_analyzer=0" | grep -i "sort description"
+echo '  optimize_read_in_window_order=0, allow_experimental_analyzer=1'
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,allow_experimental_analyzer=1" | grep -i "sort description"
 
 echo '  optimize_read_in_window_order=1'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=1" | grep -i "sort description"
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=1,allow_experimental_analyzer=0" | grep -i "sort description"
+echo '  optimize_read_in_window_order=1, allow_experimental_analyzer=1'
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=1,allow_experimental_analyzer=1" | grep -i "sort description"
 
 echo 'Complex ORDER BY'
 $CLICKHOUSE_CLIENT -q "CREATE TABLE ${name}_complex (unique1 Int32, unique2 Int32, ten Int32) ENGINE=MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192"
diff --git a/tests/queries/0_stateless/01656_join_defaul_enum.sql b/tests/queries/0_stateless/01656_join_defaul_enum.sql
index 8a0fc089b16..878936da3b5 100644
--- a/tests/queries/0_stateless/01656_join_defaul_enum.sql
+++ b/tests/queries/0_stateless/01656_join_defaul_enum.sql
@@ -1,18 +1,9 @@
-DROP DATABASE IF EXISTS test_01656;
-
-CREATE DATABASE test_01656;
-USE test_01656;
-
-DROP TABLE IF EXISTS table_key;
-DROP TABLE IF EXISTS table_with_enum;
-
-CREATE TABLE table_key (keycol UInt16) ENGINE = MergeTree() ORDER BY (keycol) PARTITION BY tuple();
+CREATE TABLE table_key (keycol UInt16) ENGINE = MergeTree() ORDER BY (keycol) PARTITION BY tuple()
+as SELECT * FROM VALUES ( (1), (2), (3) );
 
 CREATE TABLE table_with_enum (keycol UInt16, enum_col Enum8('First' = 1,'Second' = 2))
-    ENGINE = MergeTree() ORDER BY (keycol) PARTITION BY tuple();
-
-INSERT INTO table_key VALUES (1), (2), (3);
-INSERT INTO table_with_enum VALUES (2, 'Second'), (4, 'Second');
+    ENGINE = MergeTree() ORDER BY (keycol) PARTITION BY tuple() 
+as SELECT * FROM VALUES ( (2, 'Second'), (4, 'Second') );
 
 SET join_algorithm = 'hash';
 
@@ -34,7 +25,6 @@ SELECT keycol, enum_col FROM table_with_enum LEFT JOIN table_key USING (keycol)
 SELECT keycol, enum_col FROM table_with_enum RIGHT JOIN table_key USING (keycol) ORDER BY keycol;
 SELECT keycol, enum_col FROM table_with_enum FULL JOIN table_key USING (keycol) ORDER BY keycol;
 
-DROP TABLE IF EXISTS table_key;
-DROP TABLE IF EXISTS table_with_enum;
+DROP TABLE table_key;
+DROP TABLE table_with_enum;
 
-DROP DATABASE IF EXISTS test_01656;
diff --git a/tests/queries/0_stateless/01660_system_parts_smoke.sql b/tests/queries/0_stateless/01660_system_parts_smoke.sql
index 64cba86b8f6..ad73e33eee1 100644
--- a/tests/queries/0_stateless/01660_system_parts_smoke.sql
+++ b/tests/queries/0_stateless/01660_system_parts_smoke.sql
@@ -21,8 +21,8 @@ SELECT '# two parts';
 INSERT INTO data_01660 VALUES (0);
 INSERT INTO data_01660 VALUES (1);
 SELECT _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';
-SELECT name, _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';
-SELECT name, active FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';
+SELECT name, _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660' ORDER BY name;
+SELECT name, active FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660' ORDER BY name;
 
 -- OPTIMIZE to create Outdated parts
 SELECT '# optimize';
@@ -35,7 +35,7 @@ SELECT count(), _state FROM system.parts WHERE database = currentDatabase() AND
 -- Inactive parts are clearing by async process also
 SELECT '# truncate';
 TRUNCATE data_01660;
-SELECT if (count() > 0, 'HAVE PARTS', 'NO PARTS'), _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660' GROUP BY _state;
+SELECT if (count() > 0, 'HAVE PARTS', 'NO PARTS'), _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660' GROUP BY _state ORDER BY _state;
 
 -- But DROP does
 SELECT '# drop';
diff --git a/tests/queries/0_stateless/01671_merge_join_and_constants.reference b/tests/queries/0_stateless/01671_merge_join_and_constants.reference
index efd814df893..f82033ab3c7 100644
--- a/tests/queries/0_stateless/01671_merge_join_and_constants.reference
+++ b/tests/queries/0_stateless/01671_merge_join_and_constants.reference
@@ -1,6 +1,6 @@
-┌─a─┬──────────b─┬─c─┬──────────d─┬─t2.'0.10'─┐
-│ a │ 2018-01-01 │   │ 1970-01-01 │           │
-│ b │ 2018-01-01 │ B │ 2018-01-01 │ 0.10      │
-│ c │ 2018-01-01 │ C │ 2018-01-01 │ 0.10      │
-└───┴────────────┴───┴────────────┴───────────┘
+┌─a─┬──────────b─┬─c─┬──────────d─┬─'0.10'─┬─c─┐
+│ a │ 2018-01-01 │   │ 1970-01-01 │        │   │
+│ b │ 2018-01-01 │ B │ 2018-01-01 │ 0.10   │ B │
+│ c │ 2018-01-01 │ C │ 2018-01-01 │ 0.10   │ C │
+└───┴────────────┴───┴────────────┴────────┴───┘
 \N	\N	\N	\N	0	0
diff --git a/tests/queries/0_stateless/01671_merge_join_and_constants.sql b/tests/queries/0_stateless/01671_merge_join_and_constants.sql
index e9a60f11875..5cabd6f7f06 100644
--- a/tests/queries/0_stateless/01671_merge_join_and_constants.sql
+++ b/tests/queries/0_stateless/01671_merge_join_and_constants.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 DROP TABLE IF EXISTS table1;
 DROP TABLE IF EXISTS table2;
 
diff --git a/tests/queries/0_stateless/01674_where_prewhere_array_crash.sql b/tests/queries/0_stateless/01674_where_prewhere_array_crash.sql
index 7a2466c70d7..478e0039177 100644
--- a/tests/queries/0_stateless/01674_where_prewhere_array_crash.sql
+++ b/tests/queries/0_stateless/01674_where_prewhere_array_crash.sql
@@ -1,7 +1,5 @@
-SET allow_experimental_analyzer = 1;
-
 drop table if exists tab;
 create table tab  (x UInt64, `arr.a` Array(UInt64), `arr.b` Array(UInt64)) engine = MergeTree order by x;
-select x from tab array join arr prewhere x != 0 where arr; -- { serverError 43 }
-select x from tab array join arr prewhere arr where x != 0; -- { serverError 43 }
+select x from tab array join arr prewhere x != 0 where arr; -- { serverError 47, 59 }
+select x from tab array join arr prewhere arr where x != 0; -- { serverError 47, 59 }
 drop table if exists tab;
diff --git a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.reference b/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.reference
index c66682ca038..cf3e942adfe 100644
--- a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.reference
+++ b/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.reference
@@ -4,7 +4,6 @@ ReplacingMergeTree: OK
 JSONEachRow: OK
 clusterAllReplicas: OK
 SimpleAggregateFunction: OK
-write_ahead_log_interval_ms_to_fsync: OK
 max_concurrent_queries_for_all_users: OK
 test_shard_localhost: OK
 default_path_test: OK
diff --git a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh b/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh
index 617148de5a3..42ae5e84f44 100755
--- a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh
+++ b/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh
@@ -89,8 +89,6 @@ client_compwords_positive=(
     clusterAllReplicas
     # system.data_type_families
     SimpleAggregateFunction
-    # system.merge_tree_settings
-    write_ahead_log_interval_ms_to_fsync
     # system.settings
     max_concurrent_queries_for_all_users
     # system.clusters
diff --git a/tests/queries/0_stateless/01686_rocksdb.sql b/tests/queries/0_stateless/01686_rocksdb.sql
index ad6f56772b0..f3177ce140e 100644
--- a/tests/queries/0_stateless/01686_rocksdb.sql
+++ b/tests/queries/0_stateless/01686_rocksdb.sql
@@ -24,7 +24,7 @@ SELECT * FROM 01686_test WHERE key IN (123, 456, -123) ORDER BY key;
 SELECT '--';
 SELECT * FROM 01686_test WHERE key = 'Hello'; -- { serverError 53 }
 
-DETACH TABLE 01686_test NO DELAY;
+DETACH TABLE 01686_test SYNC;
 ATTACH TABLE 01686_test;
 
 SELECT * FROM 01686_test WHERE key IN (99, 999, 9999, -123) ORDER BY key;
diff --git a/tests/queries/0_stateless/01705_normalize_create_alter_function_names.reference b/tests/queries/0_stateless/01705_normalize_create_alter_function_names.reference
index b6f5fe99ca1..b5b93c34c00 100644
--- a/tests/queries/0_stateless/01705_normalize_create_alter_function_names.reference
+++ b/tests/queries/0_stateless/01705_normalize_create_alter_function_names.reference
@@ -1,2 +1,2 @@
-CREATE TABLE default.x\n(\n    `i` Int32,\n    INDEX mm rand() TYPE minmax GRANULARITY 1,\n    INDEX nn rand() TYPE minmax GRANULARITY 1,\n    PROJECTION p\n    (\n        SELECT max(i)\n    ),\n    PROJECTION p2\n    (\n        SELECT min(i)\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/x\', \'r\')\nORDER BY i\nSETTINGS index_granularity = 8192
-metadata format version: 1\ndate column: \nsampling expression: \nindex granularity: 8192\nmode: 0\nsign column: \nprimary key: i\ndata format version: 1\npartition key: \nindices: mm rand() TYPE minmax GRANULARITY 1, nn rand() TYPE minmax GRANULARITY 1\nprojections: p (SELECT max(i)), p2 (SELECT min(i))\ngranularity bytes: 10485760\n
+CREATE TABLE default.x\n(\n    `i` Int32,\n    INDEX mm log2(i) TYPE minmax GRANULARITY 1,\n    INDEX nn log2(i) TYPE minmax GRANULARITY 1,\n    PROJECTION p\n    (\n        SELECT max(i)\n    ),\n    PROJECTION p2\n    (\n        SELECT min(i)\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/x\', \'r\')\nORDER BY i\nSETTINGS index_granularity = 8192
+metadata format version: 1\ndate column: \nsampling expression: \nindex granularity: 8192\nmode: 0\nsign column: \nprimary key: i\ndata format version: 1\npartition key: \nindices: mm log2(i) TYPE minmax GRANULARITY 1, nn log2(i) TYPE minmax GRANULARITY 1\nprojections: p (SELECT max(i)), p2 (SELECT min(i))\ngranularity bytes: 10485760\n
diff --git a/tests/queries/0_stateless/01705_normalize_create_alter_function_names.sql b/tests/queries/0_stateless/01705_normalize_create_alter_function_names.sql
index 683bd271405..be0f7e8b710 100644
--- a/tests/queries/0_stateless/01705_normalize_create_alter_function_names.sql
+++ b/tests/queries/0_stateless/01705_normalize_create_alter_function_names.sql
@@ -2,9 +2,9 @@
 
 drop table if exists x;
 
-create table x(i int, index mm RAND() type minmax granularity 1, projection p (select MAX(i))) engine ReplicatedMergeTree('/clickhouse/tables/{database}/x', 'r') order by i;
+create table x(i int, index mm LOG2(i) type minmax granularity 1, projection p (select MAX(i))) engine ReplicatedMergeTree('/clickhouse/tables/{database}/x', 'r') order by i;
 
-alter table x add index nn RAND() type minmax granularity 1, add projection p2 (select MIN(i));
+alter table x add index nn LOG2(i) type minmax granularity 1, add projection p2 (select MIN(i));
 
 show create x;
 
diff --git a/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql b/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql
index 6de0d4f4e0c..2bb92aec713 100644
--- a/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql
+++ b/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql
@@ -7,6 +7,6 @@ insert into data_01709 values (2);
 
 optimize table data_01709 final;
 
-insert into data_01709 values (3); -- { serverError 252; }
+insert into data_01709 values (3); -- { serverError 252 }
 
 drop table data_01709;
diff --git a/tests/queries/0_stateless/01710_aggregate_projection_with_hashing.sql b/tests/queries/0_stateless/01710_aggregate_projection_with_hashing.sql
index d5eaa2617a6..0429865e7b1 100644
--- a/tests/queries/0_stateless/01710_aggregate_projection_with_hashing.sql
+++ b/tests/queries/0_stateless/01710_aggregate_projection_with_hashing.sql
@@ -1,4 +1,4 @@
-set allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
+set optimize_use_projections = 1, force_optimize_projection = 1;
 
 drop table if exists tp;
 
diff --git a/tests/queries/0_stateless/01710_aggregate_projections.sh b/tests/queries/0_stateless/01710_aggregate_projections.sh
index 561b8927579..326a564a208 100755
--- a/tests/queries/0_stateless/01710_aggregate_projections.sh
+++ b/tests/queries/0_stateless/01710_aggregate_projections.sh
@@ -8,22 +8,22 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT -q "CREATE TABLE test_agg_proj (x Int32, y Int32, PROJECTION x_plus_y (SELECT sum(x - y), argMax(x, y) group by x + y)) ENGINE = MergeTree ORDER BY tuple() settings index_granularity = 1"
 $CLICKHOUSE_CLIENT -q "insert into test_agg_proj select intDiv(number, 2), -intDiv(number,3) - 1 from numbers(100)"
 
-$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1"
-$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj group by x + y order by s desc limit 5 settings optimize_use_projections=1"
+$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj group by x + y order by s desc limit 5 settings optimize_use_projections=1 format JSON" | grep "rows_read"
 
-$CLICKHOUSE_CLIENT -q "select (x + y) * 2, sum(x - y) * 2 as s from test_agg_proj group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1"
-$CLICKHOUSE_CLIENT -q "select (x + y) * 2, sum(x - y) * 2 as s from test_agg_proj group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT -q "select (x + y) * 2, sum(x - y) * 2 as s from test_agg_proj group by x + y order by s desc limit 5 settings optimize_use_projections=1"
+$CLICKHOUSE_CLIENT -q "select (x + y) * 2, sum(x - y) * 2 as s from test_agg_proj group by x + y order by s desc limit 5 settings optimize_use_projections=1 format JSON" | grep "rows_read"
 
-$CLICKHOUSE_CLIENT -q "select intDiv(x + y, 2) as v, intDiv(x + y, 3), sum(x - y) as s from test_agg_proj group by intDiv(x + y, 2), intDiv(x + y, 3) order by s desc, v limit 5 settings allow_experimental_projection_optimization=1"
-$CLICKHOUSE_CLIENT -q "select intDiv(x + y, 2) as v, intDiv(x + y, 3), sum(x - y) as s from test_agg_proj group by intDiv(x + y, 2), intDiv(x + y, 3) order by s desc, v limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT -q "select intDiv(x + y, 2) as v, intDiv(x + y, 3), sum(x - y) as s from test_agg_proj group by intDiv(x + y, 2), intDiv(x + y, 3) order by s desc, v limit 5 settings optimize_use_projections=1"
+$CLICKHOUSE_CLIENT -q "select intDiv(x + y, 2) as v, intDiv(x + y, 3), sum(x - y) as s from test_agg_proj group by intDiv(x + y, 2), intDiv(x + y, 3) order by s desc, v limit 5 settings optimize_use_projections=1 format JSON" | grep "rows_read"
 
-$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(x, y) * sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings allow_experimental_projection_optimization=1"
-$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(x, y) * sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(x, y) * sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings optimize_use_projections=1"
+$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(x, y) * sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings optimize_use_projections=1 format JSON" | grep "rows_read"
 
-$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(y, x), sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings allow_experimental_projection_optimization=1"
-$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(y, x), sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(y, x), sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings optimize_use_projections=1"
+$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(y, x), sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings optimize_use_projections=1 format JSON" | grep "rows_read"
 
-$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj prewhere (x + y) % 2 = 1 group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1"
-$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj prewhere (x + y) % 2 = 1 group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj prewhere (x + y) % 2 = 1 group by x + y order by s desc limit 5 settings optimize_use_projections=1"
+$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj prewhere (x + y) % 2 = 1 group by x + y order by s desc limit 5 settings optimize_use_projections=1 format JSON" | grep "rows_read"
 
 $CLICKHOUSE_CLIENT -q "drop table test_agg_proj"
diff --git a/tests/queries/0_stateless/01710_force_use_projection.sql b/tests/queries/0_stateless/01710_force_use_projection.sql
index 8931c65e34e..af6ca69c540 100644
--- a/tests/queries/0_stateless/01710_force_use_projection.sql
+++ b/tests/queries/0_stateless/01710_force_use_projection.sql
@@ -2,7 +2,7 @@ drop table if exists tp;
 
 create table tp (d1 Int32, d2 Int32, eventcnt Int64, projection p (select sum(eventcnt) group by d1)) engine = MergeTree order by (d1, d2);
 
-set allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
+set optimize_use_projections = 1, force_optimize_projection = 1;
 
 select sum(eventcnt) eventcnt, d1 from tp group by d1;
 
diff --git a/tests/queries/0_stateless/01710_minmax_count_projection.sql b/tests/queries/0_stateless/01710_minmax_count_projection.sql
index f7645414187..c17f0e1e1fb 100644
--- a/tests/queries/0_stateless/01710_minmax_count_projection.sql
+++ b/tests/queries/0_stateless/01710_minmax_count_projection.sql
@@ -4,7 +4,7 @@ create table d (i int, j int) engine MergeTree partition by i % 2 order by tuple
 
 insert into d select number, number from numbers(10000);
 
-set max_rows_to_read = 2, allow_experimental_projection_optimization = 1;
+set max_rows_to_read = 2, optimize_use_projections = 1;
 
 select min(i), max(i), count() from d;
 select min(i), max(i), count() from d group by _partition_id order by _partition_id;
diff --git a/tests/queries/0_stateless/01710_normal_projection_fix1.sql b/tests/queries/0_stateless/01710_normal_projection_fix1.sql
index b4d7c6e8734..cce8309046a 100644
--- a/tests/queries/0_stateless/01710_normal_projection_fix1.sql
+++ b/tests/queries/0_stateless/01710_normal_projection_fix1.sql
@@ -7,11 +7,14 @@ insert into t values (1, 2);
 alter table t add projection x (select * order by j);
 
 insert into t values (1, 4);
+insert into t values (1, 5);
 
-set allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
+set optimize_use_projections = 1, force_optimize_projection = 1;
 
 select i from t prewhere j = 4;
 
 SELECT j = 2, i FROM t PREWHERE j = 2;
 
+SELECT j = -1, j = NULL FROM t WHERE j = -1;
+
 drop table t;
diff --git a/tests/queries/0_stateless/01710_normal_projections.reference b/tests/queries/0_stateless/01710_normal_projections.reference
index 22ee679ce53..ccb4359b0e9 100644
--- a/tests/queries/0_stateless/01710_normal_projections.reference
+++ b/tests/queries/0_stateless/01710_normal_projections.reference
@@ -1,5 +1,5 @@
 select where x < 10
-optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0
+optimize_move_to_prewhere = 0, optimize_use_projections = 0
 0	4294967295
 1	4294967294
 2	4294967293
@@ -10,7 +10,7 @@ optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0
 7	4294967288
 8	4294967287
 9	4294967286
-optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1
+optimize_move_to_prewhere = 0, optimize_use_projections = 1
 0	4294967295
 1	4294967294
 2	4294967293
@@ -21,7 +21,7 @@ optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1
 7	4294967288
 8	4294967287
 9	4294967286
-optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0
+optimize_move_to_prewhere = 1, optimize_use_projections = 0
 0	4294967295
 1	4294967294
 2	4294967293
@@ -32,7 +32,7 @@ optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0
 7	4294967288
 8	4294967287
 9	4294967286
-optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1
+optimize_move_to_prewhere = 1, optimize_use_projections = 1
 0	4294967295
 1	4294967294
 2	4294967293
@@ -43,16 +43,16 @@ optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1
 7	4294967288
 8	4294967287
 9	4294967286
-optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0
+optimize_move_to_prewhere = 0, optimize_use_projections = 0
 		"rows_read": 100,
-optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1
+optimize_move_to_prewhere = 0, optimize_use_projections = 1
 		"rows_read": 100,
-optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0
+optimize_move_to_prewhere = 1, optimize_use_projections = 0
 		"rows_read": 100,
-optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1
+optimize_move_to_prewhere = 1, optimize_use_projections = 1
 		"rows_read": 100,
 select where y > 4294967286
-optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0
+optimize_move_to_prewhere = 0, optimize_use_projections = 0
 0	4294967295
 1	4294967294
 2	4294967293
@@ -62,7 +62,7 @@ optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0
 6	4294967289
 7	4294967288
 8	4294967287
-optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1
+optimize_move_to_prewhere = 0, optimize_use_projections = 1
 0	4294967295
 1	4294967294
 2	4294967293
@@ -72,7 +72,7 @@ optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1
 6	4294967289
 7	4294967288
 8	4294967287
-optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0
+optimize_move_to_prewhere = 1, optimize_use_projections = 0
 0	4294967295
 1	4294967294
 2	4294967293
@@ -82,7 +82,7 @@ optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0
 6	4294967289
 7	4294967288
 8	4294967287
-optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1
+optimize_move_to_prewhere = 1, optimize_use_projections = 1
 0	4294967295
 1	4294967294
 2	4294967293
@@ -92,12 +92,12 @@ optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1
 6	4294967289
 7	4294967288
 8	4294967287
-optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0
+optimize_move_to_prewhere = 0, optimize_use_projections = 0
 		"rows_read": 100,
-optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1
+optimize_move_to_prewhere = 0, optimize_use_projections = 1
 		"rows_read": 100,
-optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0
+optimize_move_to_prewhere = 1, optimize_use_projections = 0
 		"rows_read": 100,
-optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1
+optimize_move_to_prewhere = 1, optimize_use_projections = 1
 		"rows_read": 100,
 50
diff --git a/tests/queries/0_stateless/01710_normal_projections.sh b/tests/queries/0_stateless/01710_normal_projections.sh
index 3f2114b9a2b..5eed9b23573 100755
--- a/tests/queries/0_stateless/01710_normal_projections.sh
+++ b/tests/queries/0_stateless/01710_normal_projections.sh
@@ -9,73 +9,73 @@ $CLICKHOUSE_CLIENT -q "insert into test_sort_proj select number, toUInt32(-numbe
 
 echo "select where x < 10"
 
-echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+echo "optimize_move_to_prewhere = 0, optimize_use_projections = 0"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x
-                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+                       SETTINGS optimize_move_to_prewhere = 0, optimize_use_projections = 0"
 
-echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+echo "optimize_move_to_prewhere = 0, optimize_use_projections = 1"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x
-                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+                       SETTINGS optimize_move_to_prewhere = 0, optimize_use_projections = 1"
 
-echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+echo "optimize_move_to_prewhere = 1, optimize_use_projections = 0"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x
-                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+                       SETTINGS optimize_move_to_prewhere = 1, optimize_use_projections = 0"
 
-echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+echo "optimize_move_to_prewhere = 1, optimize_use_projections = 1"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x
-                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+                       SETTINGS optimize_move_to_prewhere = 1, optimize_use_projections = 1"
 
-echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+echo "optimize_move_to_prewhere = 0, optimize_use_projections = 0"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x FORMAT JSON
-                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0" | grep rows_read
+                       SETTINGS optimize_move_to_prewhere = 0, optimize_use_projections = 0" | grep rows_read
 
-echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+echo "optimize_move_to_prewhere = 0, optimize_use_projections = 1"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x FORMAT JSON
-                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1" | grep rows_read
+                       SETTINGS optimize_move_to_prewhere = 0, optimize_use_projections = 1" | grep rows_read
 
-echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+echo "optimize_move_to_prewhere = 1, optimize_use_projections = 0"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x FORMAT JSON
-                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0" | grep rows_read
+                       SETTINGS optimize_move_to_prewhere = 1, optimize_use_projections = 0" | grep rows_read
 
-echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+echo "optimize_move_to_prewhere = 1, optimize_use_projections = 1"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x FORMAT JSON
-                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1" | grep rows_read
+                       SETTINGS optimize_move_to_prewhere = 1, optimize_use_projections = 1" | grep rows_read
 
 
 echo "select where y > 4294967286"
 
-echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+echo "optimize_move_to_prewhere = 0, optimize_use_projections = 0"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x
-                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+                       SETTINGS optimize_move_to_prewhere = 0, optimize_use_projections = 0"
 
-echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+echo "optimize_move_to_prewhere = 0, optimize_use_projections = 1"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x
-                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+                       SETTINGS optimize_move_to_prewhere = 0, optimize_use_projections = 1"
 
-echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+echo "optimize_move_to_prewhere = 1, optimize_use_projections = 0"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x
-                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+                       SETTINGS optimize_move_to_prewhere = 1, optimize_use_projections = 0"
 
-echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+echo "optimize_move_to_prewhere = 1, optimize_use_projections = 1"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x
-                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+                       SETTINGS optimize_move_to_prewhere = 1, optimize_use_projections = 1"
 
 
-echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+echo "optimize_move_to_prewhere = 0, optimize_use_projections = 0"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x FORMAT JSON
-                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0" | grep rows_read
+                       SETTINGS optimize_move_to_prewhere = 0, optimize_use_projections = 0" | grep rows_read
 
-echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+echo "optimize_move_to_prewhere = 0, optimize_use_projections = 1"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x FORMAT JSON
-                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1" | grep rows_read
+                       SETTINGS optimize_move_to_prewhere = 0, optimize_use_projections = 1" | grep rows_read
 
-echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+echo "optimize_move_to_prewhere = 1, optimize_use_projections = 0"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x FORMAT JSON
-                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0" | grep rows_read
+                       SETTINGS optimize_move_to_prewhere = 1, optimize_use_projections = 0" | grep rows_read
 
-echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+echo "optimize_move_to_prewhere = 1, optimize_use_projections = 1"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x FORMAT JSON
-                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1" | grep rows_read
+                       SETTINGS optimize_move_to_prewhere = 1, optimize_use_projections = 1" | grep rows_read
 
 $CLICKHOUSE_CLIENT -q "ALTER TABLE test_sort_proj DELETE WHERE x % 2 = 0 SETTINGS mutations_sync=2;"
 $CLICKHOUSE_CLIENT -q "SELECT count() from test_sort_proj;"
diff --git a/tests/queries/0_stateless/01710_projection_aggregate_functions_null_for_empty.reference b/tests/queries/0_stateless/01710_projection_aggregate_functions_null_for_empty.reference
new file mode 100644
index 00000000000..f2a527c4d8d
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_aggregate_functions_null_for_empty.reference
@@ -0,0 +1 @@
+1554690688
diff --git a/tests/queries/0_stateless/01710_projection_aggregate_functions_null_for_empty.sql b/tests/queries/0_stateless/01710_projection_aggregate_functions_null_for_empty.sql
new file mode 100644
index 00000000000..a77720b6580
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_aggregate_functions_null_for_empty.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS t1;
+
+CREATE TABLE t1 (c0 Int32, PRIMARY KEY (c0)) ENGINE=MergeTree;
+INSERT INTO t1 VALUES (1554690688);
+
+SELECT MIN(t1.c0) FROM t1 SETTINGS aggregate_functions_null_for_empty = 1;
+
+DROP TABLE IF EXISTS t1;
diff --git a/tests/queries/0_stateless/01710_projection_aggregation_in_order.sql b/tests/queries/0_stateless/01710_projection_aggregation_in_order.sql
index 31d32da0ed3..e4fb1816c89 100644
--- a/tests/queries/0_stateless/01710_projection_aggregation_in_order.sql
+++ b/tests/queries/0_stateless/01710_projection_aggregation_in_order.sql
@@ -1,3 +1,5 @@
+-- Tags: disabled
+-- FIXME https://github.com/ClickHouse/ClickHouse/issues/49552
 -- Test that check the correctness of the result for optimize_aggregation_in_order and projections,
 -- not that this optimization will take place.
 
@@ -21,12 +23,12 @@ ENGINE = MergeTree
 ORDER BY (key, ts);
 
 INSERT INTO normal SELECT
-    1,
+    number,
     toDateTime('2021-12-06 00:00:00') + number,
     number
 FROM numbers(100000);
 
-SET allow_experimental_projection_optimization=1, optimize_aggregation_in_order=1, force_optimize_projection=1;
+SET optimize_use_projections=1, optimize_aggregation_in_order=1, force_optimize_projection=1;
 
 WITH toStartOfHour(ts) AS a SELECT sum(value) v FROM normal WHERE ts > '2021-12-06 22:00:00' GROUP BY a ORDER BY v LIMIT 5;
 WITH toStartOfHour(ts) AS a SELECT sum(value) v FROM normal WHERE ts > '2021-12-06 22:00:00' GROUP BY toStartOfHour(ts), a ORDER BY v LIMIT 5;
@@ -58,7 +60,7 @@ INSERT INTO agg SELECT
     number
 FROM numbers(100000);
 
-SET allow_experimental_projection_optimization=1, optimize_aggregation_in_order=1, force_optimize_projection = 1;
+SET optimize_use_projections=1, optimize_aggregation_in_order=1, force_optimize_projection = 1;
 
 WITH toStartOfHour(ts) AS a SELECT sum(value) v FROM agg WHERE ts > '2021-12-06 22:00:00' GROUP BY a ORDER BY v LIMIT 5;
 WITH toStartOfHour(ts) AS a SELECT sum(value) v FROM agg WHERE ts > '2021-12-06 22:00:00' GROUP BY toStartOfHour(ts), a ORDER BY v LIMIT 5;
diff --git a/tests/queries/0_stateless/01710_projection_array_join.sql b/tests/queries/0_stateless/01710_projection_array_join.sql
index cd18d9282b9..509e053e5bf 100644
--- a/tests/queries/0_stateless/01710_projection_array_join.sql
+++ b/tests/queries/0_stateless/01710_projection_array_join.sql
@@ -1,4 +1,4 @@
-set allow_experimental_projection_optimization = 1;
+set optimize_use_projections = 1;
 
 drop table if exists x;
 
diff --git a/tests/queries/0_stateless/01710_projection_detach_part.sql b/tests/queries/0_stateless/01710_projection_detach_part.sql
index d28c0848d42..c77a2abfbf9 100644
--- a/tests/queries/0_stateless/01710_projection_detach_part.sql
+++ b/tests/queries/0_stateless/01710_projection_detach_part.sql
@@ -1,4 +1,4 @@
-set allow_experimental_projection_optimization = 1;
+set optimize_use_projections = 1;
 
 drop table if exists t;
 
diff --git a/tests/queries/0_stateless/01710_projection_fetch_long.reference b/tests/queries/0_stateless/01710_projection_fetch_long.reference
index abce5410b26..c7834c75d02 100644
--- a/tests/queries/0_stateless/01710_projection_fetch_long.reference
+++ b/tests/queries/0_stateless/01710_projection_fetch_long.reference
@@ -10,8 +10,8 @@
 3	3
 4	4
 0
-CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    ),\n    PROJECTION pp\n    (\n        SELECT \n            x,\n            count()\n        GROUP BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32, index_granularity = 8192
+CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    ),\n    PROJECTION pp\n    (\n        SELECT \n            x,\n            count()\n        GROUP BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_wide_part = 4, min_bytes_for_wide_part = 32, index_granularity = 8192
 2
-CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    ),\n    PROJECTION pp\n    (\n        SELECT \n            x,\n            count()\n        GROUP BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32, index_granularity = 8192
-CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    ),\n    PROJECTION pp\n    (\n        SELECT \n            x,\n            count()\n        GROUP BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32, index_granularity = 8192
-CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32, index_granularity = 8192
+CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    ),\n    PROJECTION pp\n    (\n        SELECT \n            x,\n            count()\n        GROUP BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_wide_part = 4, min_bytes_for_wide_part = 32, index_granularity = 8192
+CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    ),\n    PROJECTION pp\n    (\n        SELECT \n            x,\n            count()\n        GROUP BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_wide_part = 4, min_bytes_for_wide_part = 32, index_granularity = 8192
+CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_wide_part = 4, min_bytes_for_wide_part = 32, index_granularity = 8192
diff --git a/tests/queries/0_stateless/01710_projection_fetch_long.sql b/tests/queries/0_stateless/01710_projection_fetch_long.sql
index 6c41c69254e..13f7a293934 100644
--- a/tests/queries/0_stateless/01710_projection_fetch_long.sql
+++ b/tests/queries/0_stateless/01710_projection_fetch_long.sql
@@ -3,9 +3,9 @@
 drop table if exists tp_1;
 drop table if exists tp_2;
 
-create table tp_1 (x Int32, y Int32, projection p (select x, y order by x)) engine = ReplicatedMergeTree('/clickhouse/tables/{shard}/01710_projection_fetch_' || currentDatabase(), '1_{replica}') order by y settings min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32;
+create table tp_1 (x Int32, y Int32, projection p (select x, y order by x)) engine = ReplicatedMergeTree('/clickhouse/tables/{shard}/01710_projection_fetch_' || currentDatabase(), '1_{replica}') order by y settings min_rows_for_wide_part = 4, min_bytes_for_wide_part = 32;
 
-create table tp_2 (x Int32, y Int32, projection p (select x, y order by x)) engine = ReplicatedMergeTree('/clickhouse/tables/{shard}/01710_projection_fetch_' || currentDatabase(), '2_{replica}') order by y settings min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32;
+create table tp_2 (x Int32, y Int32, projection p (select x, y order by x)) engine = ReplicatedMergeTree('/clickhouse/tables/{shard}/01710_projection_fetch_' || currentDatabase(), '2_{replica}') order by y settings min_rows_for_wide_part = 4, min_bytes_for_wide_part = 32;
 
 insert into tp_1 select number, number from numbers(3);
 
diff --git a/tests/queries/0_stateless/01710_projection_in_index.sql b/tests/queries/0_stateless/01710_projection_in_index.sql
index 87f5e79e37e..b858418584c 100644
--- a/tests/queries/0_stateless/01710_projection_in_index.sql
+++ b/tests/queries/0_stateless/01710_projection_in_index.sql
@@ -4,7 +4,7 @@ create table t (i int, j int, k int, projection p (select * order by j)) engine
 
 insert into t select number, number, number from numbers(10);
 
-set allow_experimental_projection_optimization = 1, max_rows_to_read = 3;
+set optimize_use_projections = 1, max_rows_to_read = 3;
 
 select * from t where i < 5 and j in (1, 2);
 
diff --git a/tests/queries/0_stateless/01710_projection_in_set.sql b/tests/queries/0_stateless/01710_projection_in_set.sql
index 5bc84645cec..3d1abd0c09f 100644
--- a/tests/queries/0_stateless/01710_projection_in_set.sql
+++ b/tests/queries/0_stateless/01710_projection_in_set.sql
@@ -3,7 +3,7 @@ create table x (i UInt64, j UInt64, k UInt64, projection agg (select sum(j), avg
 
 insert into x values (1, 2, 3);
 
-set allow_experimental_projection_optimization = 1, use_index_for_in_with_subqueries = 0;
+set optimize_use_projections = 1, use_index_for_in_with_subqueries = 0;
 
 select sum(j), avg(k) from x where i in (select number from numbers(4));
 
diff --git a/tests/queries/0_stateless/01710_projection_mutation.sql b/tests/queries/0_stateless/01710_projection_mutation.sql
index 30e84f23a53..d963cde7409 100644
--- a/tests/queries/0_stateless/01710_projection_mutation.sql
+++ b/tests/queries/0_stateless/01710_projection_mutation.sql
@@ -4,6 +4,6 @@ CREATE TABLE t (`key` UInt32, `created_at` Date, `value` UInt32, PROJECTION xxx
 
 INSERT INTO t SELECT 1 AS key, today() + (number % 30), number FROM numbers(1000);
 
-ALTER TABLE t UPDATE value = 0 WHERE (value > 0) AND (created_at >= '2021-12-21') SETTINGS allow_experimental_projection_optimization = 1;
+ALTER TABLE t UPDATE value = 0 WHERE (value > 0) AND (created_at >= '2021-12-21') SETTINGS optimize_use_projections = 1;
 
 DROP TABLE IF EXISTS t;
diff --git a/tests/queries/0_stateless/01710_projection_optimize_materialize.sql b/tests/queries/0_stateless/01710_projection_optimize_materialize.sql
index d8251aabaf6..e704c3e5610 100644
--- a/tests/queries/0_stateless/01710_projection_optimize_materialize.sql
+++ b/tests/queries/0_stateless/01710_projection_optimize_materialize.sql
@@ -1,6 +1,7 @@
+-- Tags: no-random-merge-tree-settings
 drop table if exists z;
 
-create table z (pk Int64, d Date, id UInt64, c UInt64) Engine MergeTree partition by d order by pk ;
+create table z (pk Int64, d Date, id UInt64, c UInt64) Engine MergeTree partition by d order by pk settings ratio_of_defaults_for_sparse_serialization = 1.0;
 
 insert into z  select number, '2021-10-24', intDiv (number, 10000), 1 from numbers(1000000);
 optimize table z final;
diff --git a/tests/queries/0_stateless/01710_projection_part_check.sql b/tests/queries/0_stateless/01710_projection_part_check.sql
index c889bd323a7..b15d9d7525e 100644
--- a/tests/queries/0_stateless/01710_projection_part_check.sql
+++ b/tests/queries/0_stateless/01710_projection_part_check.sql
@@ -1,6 +1,6 @@
 drop table if exists tp;
 
-create table tp (x Int32, y Int32, projection p (select x, y order by x)) engine = MergeTree order by y settings min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32;
+create table tp (x Int32, y Int32, projection p (select x, y order by x)) engine = MergeTree order by y settings min_rows_for_wide_part = 4, min_bytes_for_wide_part = 32;
 
 insert into tp select number, number from numbers(3);
 insert into tp select number, number from numbers(5);
diff --git a/tests/queries/0_stateless/01710_projection_vertical_merges.sql b/tests/queries/0_stateless/01710_projection_vertical_merges.sql
index e8a4a384017..2c4378bb7a4 100644
--- a/tests/queries/0_stateless/01710_projection_vertical_merges.sql
+++ b/tests/queries/0_stateless/01710_projection_vertical_merges.sql
@@ -12,7 +12,7 @@ optimize table t final;
 
 alter table t materialize projection p_norm settings mutations_sync = 1;
 
-set allow_experimental_projection_optimization = 1, max_rows_to_read = 3;
+set optimize_use_projections = 1, max_rows_to_read = 3;
 
 select c18 from t where c1 < 0;
 
diff --git a/tests/queries/0_stateless/01710_projection_with_joins.sql b/tests/queries/0_stateless/01710_projection_with_joins.sql
index 5dac2f05da9..94c15d00e2a 100644
--- a/tests/queries/0_stateless/01710_projection_with_joins.sql
+++ b/tests/queries/0_stateless/01710_projection_with_joins.sql
@@ -2,20 +2,20 @@ drop table if exists t;
 
 create table t (s UInt16, l UInt16, projection p (select s, l order by l)) engine MergeTree order by s;
 
-select s from t join (select toUInt16(1) as s) x using (s) order by s settings allow_experimental_projection_optimization = 1;
-select s from t join (select toUInt16(1) as s) x using (s) order by s settings allow_experimental_projection_optimization = 0;
+select s from t join (select toUInt16(1) as s) x using (s) order by s settings optimize_use_projections = 1;
+select s from t join (select toUInt16(1) as s) x using (s) order by s settings optimize_use_projections = 0;
 
 drop table t;
 
 drop table if exists mt;
 create table mt (id1 Int8, id2 Int8) Engine=MergeTree order by tuple();
-select id1 as alias1 from mt all inner join (select id2 as alias1 from mt) as t using (alias1) order by id1 settings allow_experimental_projection_optimization = 1;
-select id1 from mt all inner join (select id2 as id1 from mt) as t using (id1) order by id1 settings allow_experimental_projection_optimization = 1;
-select id2 as id1 from mt all inner join (select id1 from mt) as t using (id1) order by id1 settings allow_experimental_projection_optimization = 1;
+select alias1 from (select id1, id1 as alias1 from mt) as l all inner join (select id2 as alias1 from mt) as t using (alias1) order by l.id1 settings optimize_use_projections = 1;
+select id1 from mt all inner join (select id2 as id1 from mt) as t using (id1) order by id1 settings optimize_use_projections = 1;
+select id2 as id1 from mt all inner join (select id1 from mt) as t using (id1) order by id1 settings optimize_use_projections = 1;
 drop table mt;
 
 drop table if exists j;
 create table j (id1 Int8, id2 Int8, projection p (select id1, id2 order by id2)) Engine=MergeTree order by id1 settings index_granularity = 1;
 insert into j select number, number from numbers(10);
-select id1 as alias1 from j all inner join (select id2 as alias1 from j where id2 in (1, 2, 3)) as t using (alias1) where id2 in (2, 3, 4) order by id1 settings allow_experimental_projection_optimization = 1;
+select alias1 from (select id1, id1 as alias1 from j) as l all inner join (select id2, id2 as alias1 from j where id2 in (1, 2, 3)) as t using (alias1) where id2 in (2, 3, 4) order by id1 settings optimize_use_projections = 1;
 drop table j;
diff --git a/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql b/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql
index 734aa659146..877fca4590d 100644
--- a/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql
+++ b/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql
@@ -4,6 +4,6 @@ create table t (x UInt32) engine = MergeTree order by tuple() settings index_gra
 insert into t select number from numbers(100);
 alter table t add projection p (select uniqHLL12(x));
 insert into t select number + 100 from numbers(100);
-select uniqHLL12(x) from t settings allow_experimental_projection_optimization = 1, max_bytes_to_read=400, max_block_size=8; -- { serverError 307; }
+select uniqHLL12(x) from t settings optimize_use_projections = 1, max_bytes_to_read=400, max_block_size=8; -- { serverError 307 }
 
 drop table if exists t;
diff --git a/tests/queries/0_stateless/01710_projections.sql b/tests/queries/0_stateless/01710_projections.sql
index cbabd3ec598..a96339e30fa 100644
--- a/tests/queries/0_stateless/01710_projections.sql
+++ b/tests/queries/0_stateless/01710_projections.sql
@@ -1,13 +1,13 @@
 drop table if exists projection_test;
 
-create table projection_test (`sum(block_count)` UInt64, domain_alias UInt64 alias length(domain), datetime DateTime, domain LowCardinality(String), x_id String, y_id String, block_count Int64, retry_count Int64, duration Int64, kbytes Int64, buffer_time Int64, first_time Int64, total_bytes Nullable(UInt64), valid_bytes Nullable(UInt64), completed_bytes Nullable(UInt64), fixed_bytes Nullable(UInt64), force_bytes Nullable(UInt64), projection p (select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) / count(), avg((kbytes * 8) / duration), count(), sum(block_count) / sum(duration), avg(block_count / duration), sum(buffer_time) / sum(duration), avg(buffer_time / duration), sum(valid_bytes) / sum(total_bytes), sum(completed_bytes) / sum(total_bytes), sum(fixed_bytes) / sum(total_bytes), sum(force_bytes) / sum(total_bytes), sum(valid_bytes) / sum(total_bytes), sum(retry_count) / sum(duration), avg(retry_count / duration), countIf(block_count > 0) / count(), countIf(first_time = 0) / count(), uniqHLL12(x_id), uniqHLL12(y_id) group by dt_m, domain)) engine MergeTree partition by toDate(datetime) order by (toStartOfTenMinutes(datetime), domain);
+create table projection_test (`sum(block_count)` UInt64, domain_alias UInt64 alias length(domain), datetime DateTime, domain LowCardinality(String), x_id String, y_id String, block_count Int64, retry_count Int64, duration Int64, kbytes Int64, buffer_time Int64, first_time Int64, total_bytes Nullable(UInt64), valid_bytes Nullable(UInt64), completed_bytes Nullable(UInt64), fixed_bytes Nullable(UInt64), force_bytes Nullable(UInt64), projection p (select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) / count(), avg((kbytes * 8) / duration), count(), sum(block_count) / sum(duration), avg(block_count / duration), sum(buffer_time) / sum(duration), avg(buffer_time / duration), sum(valid_bytes) / sum(total_bytes), sum(completed_bytes) / sum(total_bytes), sum(fixed_bytes) / sum(total_bytes), sum(force_bytes) / sum(total_bytes), sum(valid_bytes) / sum(total_bytes), sum(retry_count) / sum(duration), avg(retry_count / duration), countIf(block_count > 0) / count(), countIf(first_time = 0) / count(), uniqHLL12(x_id), uniqHLL12(y_id) group by dt_m, domain)) engine MergeTree partition by toDate(datetime) order by (toStartOfTenMinutes(datetime), domain) settings index_granularity_bytes = 10000000;
 
 insert into projection_test with rowNumberInAllBlocks() as id select 1, toDateTime('2020-10-24 00:00:00') + (id / 20), toString(id % 100), * from generateRandom('x_id String, y_id String, block_count Int64, retry_count Int64, duration Int64, kbytes Int64, buffer_time Int64, first_time Int64, total_bytes Nullable(UInt64), valid_bytes Nullable(UInt64), completed_bytes Nullable(UInt64), fixed_bytes Nullable(UInt64), force_bytes Nullable(UInt64)', 10, 10, 1) limit 1000 settings max_threads = 1;
 
-set allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
+set optimize_use_projections = 1, force_optimize_projection = 1;
 
 select * from projection_test; -- { serverError 584 }
-select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) from projection_test join (select 1) x using (1) where domain = '1' group by dt_m order by dt_m; -- { serverError 584 }
+select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) from projection_test join (select 1) x on 1 where domain = '1' group by dt_m order by dt_m; -- { serverError 584 }
 
 select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) / count(), avg((kbytes * 8) / duration) from projection_test where domain = '1' group by dt_m order by dt_m;
 
@@ -39,7 +39,7 @@ select toStartOfMinute(datetime) dt_m, domain, sum(retry_count) / sum(duration),
 select toStartOfHour(toStartOfMinute(datetime)) dt_h, uniqHLL12(x_id), uniqHLL12(y_id) from projection_test group by dt_h order by dt_h;
 
 -- found by fuzzer
-SET enable_positional_arguments = 0;
+SET enable_positional_arguments = 0, force_optimize_projection = 0;
 SELECT 2, -1 FROM projection_test PREWHERE domain_alias = 1. WHERE domain = NULL GROUP BY -9223372036854775808 ORDER BY countIf(first_time = 0) / count(-2147483649) DESC NULLS LAST, 1048576 DESC NULLS LAST;
 
 drop table if exists projection_test;
@@ -47,6 +47,6 @@ drop table if exists projection_test;
 drop table if exists projection_without_key;
 create table projection_without_key (key UInt32, PROJECTION x (SELECT max(key))) engine MergeTree order by key;
 insert into projection_without_key select number from numbers(1000);
-set force_optimize_projection = 1, allow_experimental_projection_optimization = 1;
+set force_optimize_projection = 1, optimize_use_projections = 1;
 select max(key) from projection_without_key;
 drop table projection_without_key;
diff --git a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.reference b/tests/queries/0_stateless/01710_projections_and_duplicate_columms.reference
similarity index 100%
rename from tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.reference
rename to tests/queries/0_stateless/01710_projections_and_duplicate_columms.reference
diff --git a/tests/queries/0_stateless/01710_projections_and_duplicate_columms.sql b/tests/queries/0_stateless/01710_projections_and_duplicate_columms.sql
new file mode 100644
index 00000000000..74a7aea418a
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projections_and_duplicate_columms.sql
@@ -0,0 +1,8 @@
+drop table if exists projection_test__fuzz_0;
+set allow_suspicious_low_cardinality_types=1;
+
+CREATE TABLE projection_test__fuzz_0 (`sum(block_count)` UInt64, `domain_alias` UInt64 ALIAS length(domain), `datetime` DateTime, `domain` LowCardinality(String), `x_id` String, `y_id` String, `block_count` Int64, `retry_count` Int64, `duration` Decimal(76, 13), `kbytes` LowCardinality(Int64), `buffer_time` Int64, `first_time` UInt256, `total_bytes` LowCardinality(Nullable(UInt64)), `valid_bytes` Nullable(UInt64), `completed_bytes` Nullable(UInt64), `fixed_bytes` LowCardinality(Nullable(UInt64)), `force_bytes` Int256, PROJECTION p (SELECT toStartOfMinute(datetime) AS dt_m, countIf(first_time = 0) / count(), avg((kbytes * 8) / duration), count(), sum(block_count) / sum(duration), avg(block_count / duration), sum(buffer_time) / sum(duration), avg(buffer_time / duration), sum(valid_bytes) / sum(total_bytes), sum(completed_bytes) / sum(total_bytes), sum(fixed_bytes) / sum(total_bytes), sum(force_bytes) / sum(total_bytes), sum(valid_bytes) / sum(total_bytes), sum(retry_count) / sum(duration), avg(retry_count / duration), countIf(block_count > 0) / count(), countIf(first_time = 0) / count(), uniqHLL12(x_id), uniqHLL12(y_id) GROUP BY dt_m, domain)) ENGINE = MergeTree PARTITION BY toDate(datetime) ORDER BY (toStartOfTenMinutes(datetime), domain) SETTINGS index_granularity_bytes = 10000000;
+INSERT INTO projection_test__fuzz_0 SETTINGS max_threads = 1 WITH rowNumberInAllBlocks() AS id SELECT 1, toDateTime('2020-10-24 00:00:00') + (id / 20), toString(id % 100), * FROM generateRandom('x_id String, y_id String, block_count Int64, retry_count Int64, duration Int64, kbytes Int64, buffer_time Int64, first_time Int64, total_bytes Nullable(UInt64), valid_bytes Nullable(UInt64), completed_bytes Nullable(UInt64), fixed_bytes Nullable(UInt64), force_bytes Nullable(UInt64)', 10, 10, 1) LIMIT 1000 SETTINGS max_threads = 1;
+SELECT '-21474836.48', 10000000000., '', count(kbytes), '', 10.0001, toStartOfMinute(datetime) AS dt_m, 10, NULL FROM projection_test__fuzz_0 GROUP BY dt_m WITH ROLLUP WITH TOTALS ORDER BY count(retry_count / duration) ASC NULLS LAST, 100000000000000000000. ASC NULLS FIRST format Null;
+
+drop table projection_test__fuzz_0;
diff --git a/tests/queries/0_stateless/01710_projections_group_by_no_key.sql b/tests/queries/0_stateless/01710_projections_group_by_no_key.sql
index eefc03afb7a..98545bdd05a 100644
--- a/tests/queries/0_stateless/01710_projections_group_by_no_key.sql
+++ b/tests/queries/0_stateless/01710_projections_group_by_no_key.sql
@@ -2,7 +2,7 @@ drop table if exists projection_without_key;
 
 create table projection_without_key (key UInt32, PROJECTION x (SELECT sum(key) group by key % 3)) engine MergeTree order by key;
 insert into projection_without_key select number from numbers(1000);
-select sum(key) from projection_without_key settings allow_experimental_projection_optimization = 1;
-select sum(key) from projection_without_key settings allow_experimental_projection_optimization = 0;
+select sum(key) from projection_without_key settings optimize_use_projections = 1;
+select sum(key) from projection_without_key settings optimize_use_projections = 0;
 
 drop table projection_without_key;
diff --git a/tests/queries/0_stateless/01710_projections_in_distributed_query.sql b/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
index fa734b605cd..616bf3b5505 100644
--- a/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
+++ b/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
@@ -1,12 +1,14 @@
 -- Tags: distributed
 
+set enable_memory_bound_merging_of_aggregation_results=0;
+
 drop table if exists projection_test;
 
 create table projection_test (dt DateTime, cost Int64, projection p (select toStartOfMinute(dt) dt_m, sum(cost) group by dt_m)) engine MergeTree partition by toDate(dt) order by dt;
 
 insert into projection_test with rowNumberInAllBlocks() as id select toDateTime('2020-10-24 00:00:00') + (id / 20), * from generateRandom('cost Int64', 10, 10, 1) limit 1000 settings max_threads = 1;
 
-set allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
+set optimize_use_projections = 1, force_optimize_projection = 1;
 
 select toStartOfMinute(dt) dt_m, sum(cost) from projection_test group by dt_m;
 select sum(cost) from projection_test;
diff --git a/tests/queries/0_stateless/01710_projections_optimize_aggregation_in_order.sh b/tests/queries/0_stateless/01710_projections_optimize_aggregation_in_order.sh
index 2c6a6ef35eb..a166837e01a 100755
--- a/tests/queries/0_stateless/01710_projections_optimize_aggregation_in_order.sh
+++ b/tests/queries/0_stateless/01710_projections_optimize_aggregation_in_order.sh
@@ -38,7 +38,7 @@ function run_query()
 
     echo "$query"
     local opts=(
-        --allow_experimental_projection_optimization 1
+        --optimize_use_projections 1
         --force_optimize_projection 1
         --log_processors_profiles 1
         --query_id "$query_id"
diff --git a/tests/queries/0_stateless/01710_projections_partial_optimize_aggregation_in_order.sh b/tests/queries/0_stateless/01710_projections_partial_optimize_aggregation_in_order.sh
index 5a9c480c78c..ee73974e8a4 100755
--- a/tests/queries/0_stateless/01710_projections_partial_optimize_aggregation_in_order.sh
+++ b/tests/queries/0_stateless/01710_projections_partial_optimize_aggregation_in_order.sh
@@ -44,7 +44,7 @@ function run_query()
 
     echo "$query"
     local opts=(
-        --allow_experimental_projection_optimization 1
+        --optimize_use_projections 1
         --force_optimize_projection 1
         --log_processors_profiles 1
         --query_id "$query_id"
diff --git a/tests/queries/0_stateless/01715_table_function_view_fix.sql b/tests/queries/0_stateless/01715_table_function_view_fix.sql
index b96609391b5..5c24131b438 100644
--- a/tests/queries/0_stateless/01715_table_function_view_fix.sql
+++ b/tests/queries/0_stateless/01715_table_function_view_fix.sql
@@ -1,3 +1,3 @@
 SELECT view(SELECT 1); -- { clientError 62 }
 
-SELECT sumIf(dummy, dummy) FROM remote('127.0.0.{1,2}', numbers(2, 100), view(SELECT CAST(NULL, 'Nullable(UInt8)') AS dummy FROM system.one)); -- { serverError 183 }
+SELECT sumIf(dummy, dummy) FROM remote('127.0.0.{1,2}', numbers(2, 100), view(SELECT CAST(NULL, 'Nullable(UInt8)') AS dummy FROM system.one)); -- { serverError UNKNOWN_FUNCTION }
diff --git a/tests/queries/0_stateless/01720_join_implicit_cast.sql.j2 b/tests/queries/0_stateless/01720_join_implicit_cast.sql.j2
index f7439c8c56c..b08bcd3330e 100644
--- a/tests/queries/0_stateless/01720_join_implicit_cast.sql.j2
+++ b/tests/queries/0_stateless/01720_join_implicit_cast.sql.j2
@@ -47,7 +47,6 @@ SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)'
 SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 RIGHT JOIN t_ab2 USING (a, b);
 SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 INNER JOIN t_ab2 USING (a, b);
 
-SELECT * FROM ( SELECT a, b as "_CAST(a, Int32)" FROM t_ab1 ) t_ab1 FULL JOIN t_ab2 ON (t_ab1.a == t_ab2.a); -- { serverError 44 }
 SELECT * FROM ( SELECT a, b as "_CAST(a, Int32)" FROM t_ab1 ) t_ab1 FULL JOIN t_ab2 USING (a) FORMAT Null;
 
 {% endfor %}
diff --git a/tests/queries/0_stateless/01721_join_implicit_cast_long.reference.j2 b/tests/queries/0_stateless/01721_join_implicit_cast_long.reference.j2
index e9f32087439..ae43aa7195c 100644
--- a/tests/queries/0_stateless/01721_join_implicit_cast_long.reference.j2
+++ b/tests/queries/0_stateless/01721_join_implicit_cast_long.reference.j2
@@ -1,7 +1,6 @@
 {% for join_algorithm in ['hash', 'partial_merge', 'auto', 'full_sorting_merge', 'grace_hash'] -%}
 === {{ join_algorithm }} ===
 = full =
-{% if join_algorithm not in ['grace_hash'] -%}
 -4	0	196
 -3	0	197
 -2	0	198
@@ -17,7 +16,6 @@
 8	108	\N
 9	109	\N
 10	110	\N
-{% endif -%}
 = left =
 1	101	201
 2	102	202
@@ -30,7 +28,6 @@
 9	109	\N
 10	110	\N
 = right =
-{% if join_algorithm not in ['grace_hash'] -%}
 -4	0	196
 -3	0	197
 -2	0	198
@@ -41,7 +38,6 @@
 3	103	203
 4	104	204
 5	105	205
-{% endif -%}
 = inner =
 1	101	201
 2	102	202
@@ -49,7 +45,6 @@
 4	104	204
 5	105	205
 = full =
-{% if join_algorithm not in ['grace_hash'] -%}
 0	0	-4
 0	0	-3
 0	0	-2
@@ -65,7 +60,6 @@
 8	8	0
 9	9	0
 10	10	0
-{% endif -%}
 = left =
 1	1	1
 2	2	2
@@ -78,7 +72,6 @@
 9	9	0
 10	10	0
 = right =
-{% if join_algorithm not in ['grace_hash'] -%}
 0	0	-4
 0	0	-3
 0	0	-2
@@ -89,7 +82,6 @@
 3	3	3
 4	4	4
 5	5	5
-{% endif -%}
 = inner =
 1	1	1
 2	2	2
@@ -98,7 +90,6 @@
 5	5	5
 = join on =
 = full =
-{% if join_algorithm not in ['grace_hash'] -%}
 0	0	-4	196
 0	0	-3	197
 0	0	-2	198
@@ -114,7 +105,6 @@
 8	108	0	\N
 9	109	0	\N
 10	110	0	\N
-{% endif -%}
 = left =
 1	101	1	201
 2	102	2	202
@@ -127,7 +117,6 @@
 9	109	0	\N
 10	110	0	\N
 = right =
-{% if join_algorithm not in ['grace_hash'] -%}
 0	0	-4	196
 0	0	-3	197
 0	0	-2	198
@@ -138,7 +127,6 @@
 3	103	3	203
 4	104	4	204
 5	105	5	205
-{% endif -%}
 = inner =
 1	101	1	201
 2	102	2	202
@@ -146,7 +134,6 @@
 4	104	4	204
 5	105	5	205
 = full =
-{% if join_algorithm not in ['grace_hash'] -%}
 0	0	-4	196
 0	0	-3	197
 0	0	-2	198
@@ -162,7 +149,6 @@
 8	108	0	\N
 9	109	0	\N
 10	110	0	\N
-{% endif -%}
 = left =
 1	101	1	201
 2	102	2	202
@@ -175,7 +161,6 @@
 9	109	0	\N
 10	110	0	\N
 = right =
-{% if join_algorithm not in ['grace_hash'] -%}
 0	0	-4	196
 0	0	-3	197
 0	0	-2	198
@@ -186,7 +171,6 @@
 3	103	3	203
 4	104	4	204
 5	105	5	205
-{% endif -%}
 = inner =
 1	101	1	201
 2	102	2	202
@@ -196,7 +180,6 @@
 = agg =
 1
 1
-{% if join_algorithm not in ['grace_hash'] -%}
 1
 1
 1
@@ -205,13 +188,11 @@
 1	55	1055
 0	0	-10	0	990
 1	55	15	1055	1015
-{% endif -%}
 = types =
 1
 1
 1
 1
-{% if join_algorithm not in ['grace_hash'] -%}
 1
 1
 1
@@ -219,11 +200,9 @@
 1
 1
 1
-{% endif -%}
 {% if join_algorithm not in ['full_sorting_merge'] -%}
 === join use nulls ===
 = full =
-{% if join_algorithm not in ['grace_hash'] -%}
 -4	\N	196
 -3	\N	197
 -2	\N	198
@@ -239,7 +218,6 @@
 8	108	\N
 9	109	\N
 10	110	\N
-{% endif -%}
 = left =
 1	101	201
 2	102	202
@@ -252,7 +230,6 @@
 9	109	\N
 10	110	\N
 = right =
-{% if join_algorithm not in ['grace_hash'] -%}
 -4	\N	196
 -3	\N	197
 -2	\N	198
@@ -263,7 +240,6 @@
 3	103	203
 4	104	204
 5	105	205
-{% endif -%}
 = inner =
 1	101	201
 2	102	202
@@ -271,7 +247,6 @@
 4	104	204
 5	105	205
 = full =
-{% if join_algorithm not in ['grace_hash'] -%}
 1	1	1
 2	2	2
 3	3	3
@@ -287,7 +262,6 @@
 \N	\N	-2
 \N	\N	-1
 \N	\N	0
-{% endif -%}
 = left =
 1	1	1
 2	2	2
@@ -300,7 +274,6 @@
 9	9	\N
 10	10	\N
 = right =
-{% if join_algorithm not in ['grace_hash'] -%}
 1	1	1
 2	2	2
 3	3	3
@@ -311,7 +284,6 @@
 \N	\N	-2
 \N	\N	-1
 \N	\N	0
-{% endif -%}
 = inner =
 1	1	1
 2	2	2
@@ -320,7 +292,6 @@
 5	5	5
 = join on =
 = full =
-{% if join_algorithm not in ['grace_hash'] -%}
 1	101	1	201
 2	102	2	202
 3	103	3	203
@@ -336,7 +307,6 @@
 \N	\N	-2	198
 \N	\N	-1	199
 \N	\N	0	200
-{% endif -%}
 = left =
 1	101	1	201
 2	102	2	202
@@ -349,7 +319,6 @@
 9	109	\N	\N
 10	110	\N	\N
 = right =
-{% if join_algorithm not in ['grace_hash'] -%}
 1	101	1	201
 2	102	2	202
 3	103	3	203
@@ -360,7 +329,6 @@
 \N	\N	-2	198
 \N	\N	-1	199
 \N	\N	0	200
-{% endif -%}
 = inner =
 1	101	1	201
 2	102	2	202
@@ -368,7 +336,6 @@
 4	104	4	204
 5	105	5	205
 = full =
-{% if join_algorithm not in ['grace_hash'] -%}
 1	101	1	201
 2	102	2	202
 3	103	3	203
@@ -384,7 +351,6 @@
 \N	\N	-2	198
 \N	\N	-1	199
 \N	\N	0	200
-{% endif -%}
 = left =
 1	101	1	201
 2	102	2	202
@@ -397,7 +363,6 @@
 9	109	\N	\N
 10	110	\N	\N
 = right =
-{% if join_algorithm not in ['grace_hash'] -%}
 1	101	1	201
 2	102	2	202
 3	103	3	203
@@ -408,7 +373,6 @@
 \N	\N	-2	198
 \N	\N	-1	199
 \N	\N	0	200
-{% endif -%}
 = inner =
 1	101	1	201
 2	102	2	202
@@ -418,7 +382,6 @@
 = agg =
 1
 1
-{% if join_algorithm not in ['grace_hash'] -%}
 1
 1
 1
@@ -427,13 +390,11 @@
 1	55	1055
 1	55	15	1055	1015
 \N	\N	-10	\N	990
-{% endif -%}
 = types =
 1
 1
 1
 1
-{% if join_algorithm not in ['grace_hash'] -%}
 1
 1
 1
@@ -442,5 +403,4 @@
 1
 1
 {% endif -%}
-{% endif -%}
 {% endfor -%}
diff --git a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2 b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
index f5321939f28..38f71f4c5ec 100644
--- a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
+++ b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
@@ -10,7 +10,6 @@ INSERT INTO t1 SELECT number as a, 100 + number as b FROM system.numbers LIMIT 1
 INSERT INTO t2 SELECT number - 5 as a, 200 + number - 5 as b FROM system.numbers LIMIT 1, 10;
 
 {% macro is_implemented(join_algorithm) -%}
-{% if join_algorithm == 'grace_hash' %} -- { serverError NOT_IMPLEMENTED } {% endif %}
 {% endmacro -%}
 
 {% for join_algorithm in ['hash', 'partial_merge', 'auto', 'full_sorting_merge', 'grace_hash'] -%}
diff --git a/tests/queries/0_stateless/01771_bloom_filter_not_has.sql b/tests/queries/0_stateless/01771_bloom_filter_not_has.sql
index ab0e3d308f9..f945cbde56b 100644
--- a/tests/queries/0_stateless/01771_bloom_filter_not_has.sql
+++ b/tests/queries/0_stateless/01771_bloom_filter_not_has.sql
@@ -1,3 +1,4 @@
+-- Tags: no-parallel, long
 DROP TABLE IF EXISTS bloom_filter_null_array;
 CREATE TABLE bloom_filter_null_array (v Array(Int32), INDEX idx v TYPE bloom_filter GRANULARITY 3) ENGINE = MergeTree() ORDER BY v;
 INSERT INTO bloom_filter_null_array SELECT [number] FROM numbers(10000000);
diff --git a/tests/queries/0_stateless/01774_tuple_null_in.reference b/tests/queries/0_stateless/01774_tuple_null_in.reference
index aa47d0d46d4..573541ac970 100644
--- a/tests/queries/0_stateless/01774_tuple_null_in.reference
+++ b/tests/queries/0_stateless/01774_tuple_null_in.reference
@@ -1,2 +1 @@
 0
-0
diff --git a/tests/queries/0_stateless/01774_tuple_null_in.sql b/tests/queries/0_stateless/01774_tuple_null_in.sql
index a9cc39e8840..f08e1a067e5 100644
--- a/tests/queries/0_stateless/01774_tuple_null_in.sql
+++ b/tests/queries/0_stateless/01774_tuple_null_in.sql
@@ -1,2 +1 @@
-SELECT (NULL, NULL) = (8, 0) OR (NULL, NULL) = (3, 2) OR (NULL, NULL) = (0, 0) OR (NULL, NULL) = (3, 1);
 SELECT (NULL, NULL) IN ((NULL, 0), (3, 1), (3, 2), (8, 0), (NULL, NULL));
diff --git a/tests/queries/0_stateless/01780_column_sparse_distinct.reference b/tests/queries/0_stateless/01780_column_sparse_distinct.reference
index bb0cebc6540..beb45208e7b 100644
--- a/tests/queries/0_stateless/01780_column_sparse_distinct.reference
+++ b/tests/queries/0_stateless/01780_column_sparse_distinct.reference
@@ -5,3 +5,4 @@ all_2_2_0	v	Sparse
 2
 3
 4
+5
diff --git a/tests/queries/0_stateless/01780_column_sparse_distinct.sql b/tests/queries/0_stateless/01780_column_sparse_distinct.sql
index 502ca7600d4..e98bada1aac 100644
--- a/tests/queries/0_stateless/01780_column_sparse_distinct.sql
+++ b/tests/queries/0_stateless/01780_column_sparse_distinct.sql
@@ -7,7 +7,7 @@ SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
 
 SYSTEM STOP MERGES t_sparse_distinct;
 
-INSERT INTO t_sparse_distinct SELECT number, number % 5 FROM numbers(100000);
+INSERT INTO t_sparse_distinct SELECT number, number % 6 FROM numbers(100000);
 INSERT INTO t_sparse_distinct SELECT number, number % 100 = 0 FROM numbers(100000);
 
 SELECT name, column, serialization_kind
diff --git a/tests/queries/0_stateless/01786_explain_merge_tree.reference b/tests/queries/0_stateless/01786_explain_merge_tree.reference
index 4a3fe99710b..e6628813dbd 100644
--- a/tests/queries/0_stateless/01786_explain_merge_tree.reference
+++ b/tests/queries/0_stateless/01786_explain_merge_tree.reference
@@ -24,12 +24,12 @@
         Name: t_minmax
         Description: minmax GRANULARITY 2
         Parts: 1/2
-        Granules: 2/6
+        Granules: 4/6
       Skip
         Name: t_set
         Description: set GRANULARITY 2
         Parts: 1/1
-        Granules: 1/2
+        Granules: 2/4
 -----------------
               "Node Type": "ReadFromMergeTree",
               "Description": "default.test_index",
@@ -68,7 +68,7 @@
                   "Initial Parts": 2,
                   "Selected Parts": 1,
                   "Initial Granules": 6,
-                  "Selected Granules": 2
+                  "Selected Granules": 4
                 },
                 {
                   "Type": "Skip",
@@ -76,8 +76,8 @@
                   "Description": "set GRANULARITY 2",
                   "Initial Parts": 1,
                   "Selected Parts": 1,
-                  "Initial Granules": 2,
-                  "Selected Granules": 1
+                  "Initial Granules": 4,
+                  "Selected Granules": 2
                 }
               ]
             }
diff --git a/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
index f3be69d3279..b0d8284faa5 100644
--- a/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
+++ b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
@@ -1,7 +1,7 @@
 <Warning> DistributedSink: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 1)), implicit conversion will be done.
 <Warning> DistributedSink: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 1)), implicit conversion will be done.
-<Warning> default.dist_01683.DirectoryMonitor: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 0)), implicit conversion will be done
-<Warning> default.dist_01683.DirectoryMonitor: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 0)), implicit conversion will be done
+<Warning> default.dist_01683.DirectoryMonitor.default: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 0)), implicit conversion will be done
+<Warning> default.dist_01683.DirectoryMonitor.default: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 0)), implicit conversion will be done
 1
 1
 2
diff --git a/tests/queries/0_stateless/01814_distributed_push_down_limit.sh b/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
index d995e3a1370..4b75102e9cf 100755
--- a/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
+++ b/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
@@ -60,6 +60,8 @@ function test_distributed_push_down_limit_with_query_log()
         # disable hedged requests to avoid excessive log entries
         --use_hedged_requests 0
 
+        --async_query_sending_for_remote 0
+
         "$@"
     )
 
diff --git a/tests/queries/0_stateless/01823_explain_json.reference b/tests/queries/0_stateless/01823_explain_json.reference
index 9df7c16e4f4..befbf82f4fb 100644
--- a/tests/queries/0_stateless/01823_explain_json.reference
+++ b/tests/queries/0_stateless/01823_explain_json.reference
@@ -37,63 +37,59 @@
           "Node Type": "Aggregating",
           "Header": [
             {
-              "Name": "number",
+              "Name": "number_0",
               "Type": "UInt64"
             },
             {
-              "Name": "plus(number, 1)",
-              "Type": "UInt64"
-            },
-            {
-              "Name": "quantile(0.2)(number)",
+              "Name": "quantile(0.2_Float64)(number_0)",
               "Type": "Float64"
             },
             {
-              "Name": "sumIf(number, greater(number, 0))",
+              "Name": "sumIf(number_0, greater(number_0, 0_UInt8))",
               "Type": "UInt64"
             }
           ],
-          "Keys": ["number", "plus(number, 1)"],
+          "Keys": ["number_0"],
           "Aggregates": [
             {
-              "Name": "quantile(0.2)(number)",
+              "Name": "quantile(0.2_Float64)(number_0)",
               "Function": {
                 "Name": "quantile",
                 "Parameters": ["0.2"],
                 "Argument Types": ["UInt64"],
                 "Result Type": "Float64"
               },
-              "Arguments": ["number"]
+              "Arguments": ["number_0"]
             },
             {
-              "Name": "sumIf(number, greater(number, 0))",
+              "Name": "sumIf(number_0, greater(number_0, 0_UInt8))",
               "Function": {
                 "Name": "sumIf",
                 "Argument Types": ["UInt64", "UInt8"],
                 "Result Type": "UInt64"
               },
-              "Arguments": ["number", "greater(number, 0)"]
+              "Arguments": ["number_0", "greater(number_0, 0_UInt8)"]
             }
           ],
 --------
           "Node Type": "ArrayJoin",
           "Left": false,
-          "Columns": ["x", "y"],
+          "Columns": ["x_0", "y_1"],
 --------
           "Node Type": "Distinct",
-          "Columns": ["intDiv(number, 3)", "intDiv(number, 2)"],
+          "Columns": ["intDiv(number_0, 2_UInt8)", "intDiv(number_0, 3_UInt8)"],
 --
               "Node Type": "Distinct",
-              "Columns": ["intDiv(number, 3)", "intDiv(number, 2)"],
+              "Columns": ["intDiv(number_0, 2_UInt8)", "intDiv(number_0, 3_UInt8)"],
 --------
               "Sort Description": [
                 {
-                  "Column": "number",
+                  "Column": "number_0",
                   "Ascending": false,
                   "With Fill": false
                 },
                 {
-                  "Column": "plus(number, 1)",
+                  "Column": "plus(number_0, 1_UInt8)",
                   "Ascending": true,
                   "With Fill": false
                 }
diff --git a/tests/queries/0_stateless/01823_explain_json.sh b/tests/queries/0_stateless/01823_explain_json.sh
index 7868bc0cc78..39128773069 100755
--- a/tests/queries/0_stateless/01823_explain_json.sh
+++ b/tests/queries/0_stateless/01823_explain_json.sh
@@ -5,26 +5,29 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q "EXPLAIN json = 1, description = 0 SELECT 1 UNION ALL SELECT 2 FORMAT TSVRaw"
+opts=(
+    "--allow_experimental_analyzer=1"
+)
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "EXPLAIN json = 1, description = 0 SELECT 1 UNION ALL SELECT 2 FORMAT TSVRaw"
 echo "--------"
-$CLICKHOUSE_CLIENT -q "explain json = 1, description = 0, header = 1 select 1, 2 + dummy FORMAT TSVRaw" 2> /dev/null | grep Header -m 1 -A 8
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "explain json = 1, description = 0, header = 1 select 1, 2 + dummy FORMAT TSVRaw" 2> /dev/null | grep Header -m 1 -A 8
 
 echo "--------"
-$CLICKHOUSE_CLIENT -q "EXPLAIN json = 1, actions = 1, header = 1, description = 0
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "EXPLAIN json = 1, actions = 1, header = 1, description = 0
                        SELECT quantile(0.2)(number), sumIf(number, number > 0) from numbers(2) group by number, number + 1 FORMAT TSVRaw
-                      " | grep Aggregating -A 40
+                      " | grep Aggregating -A 36
 
 echo "--------"
-$CLICKHOUSE_CLIENT -q "EXPLAIN json = 1, actions = 1, description = 0
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "EXPLAIN json = 1, actions = 1, description = 0
                        SELECT x, y from numbers(2) array join [number, 1] as x, [number + 1] as y  FORMAT TSVRaw
                       " | grep ArrayJoin -A 2
 
 echo "--------"
-$CLICKHOUSE_CLIENT -q "EXPLAIN json = 1, actions = 1, description = 0
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "EXPLAIN json = 1, actions = 1, description = 0
                        SELECT distinct intDiv(number, 2), intDiv(number, 3) from numbers(10) FORMAT TSVRaw
                       " | grep Distinct -A 1
 
 echo "--------"
-$CLICKHOUSE_CLIENT -q "EXPLAIN json = 1, actions = 1, description = 0
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "EXPLAIN json = 1, actions = 1, description = 0
                        SELECT number + 1 from numbers(10) order by number desc, number + 1 limit 3 FORMAT TSVRaw
                       " | grep "Sort Description" -A 12
diff --git a/tests/queries/0_stateless/01852_multiple_joins_with_union_join.reference b/tests/queries/0_stateless/01852_multiple_joins_with_union_join.reference
index eb37a198435..85e6138dc5d 100644
--- a/tests/queries/0_stateless/01852_multiple_joins_with_union_join.reference
+++ b/tests/queries/0_stateless/01852_multiple_joins_with_union_join.reference
@@ -1,2 +1,2 @@
-1	1	1	1
-1	1	1	1
+1	1	1
+1	1	1
diff --git a/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql b/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql
index 39818fa51c2..8c6937eb581 100644
--- a/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql
+++ b/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 DROP TABLE IF EXISTS v1;
 DROP TABLE IF EXISTS v2;
 
@@ -17,7 +19,7 @@ JOIN v1 AS t2 USING (id)
 CROSS JOIN v2 AS n1
 CROSS JOIN v2 AS n2;
 
-SELECT * FROM v1 AS t1 JOIN v1 AS t2 USING (id) JOIN v1 AS t3 USING (value); -- { serverError NOT_IMPLEMENTED }
+SELECT * FROM v1 AS t1 JOIN v1 AS t2 USING (id) JOIN v1 AS t3 USING (value); -- { serverError UNKNOWN_IDENTIFIER }
 
 DROP TABLE IF EXISTS v1;
 DROP TABLE IF EXISTS v2;
diff --git a/tests/queries/0_stateless/01854_HTTP_dict_decompression.python b/tests/queries/0_stateless/01854_HTTP_dict_decompression.python
index 4f6878665aa..7d98a24e83e 100644
--- a/tests/queries/0_stateless/01854_HTTP_dict_decompression.python
+++ b/tests/queries/0_stateless/01854_HTTP_dict_decompression.python
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from http.server import SimpleHTTPRequestHandler,HTTPServer
+from http.server import SimpleHTTPRequestHandler, HTTPServer
 import socket
 import csv
 import sys
@@ -21,6 +21,7 @@ def is_ipv6(host):
     except:
         return True
 
+
 def get_local_port(host, ipv6):
     if ipv6:
         family = socket.AF_INET6
@@ -31,8 +32,9 @@ def get_local_port(host, ipv6):
         fd.bind((host, 0))
         return fd.getsockname()[1]
 
-CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', 'localhost')
-CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
+
+CLICKHOUSE_HOST = os.environ.get("CLICKHOUSE_HOST", "localhost")
+CLICKHOUSE_PORT_HTTP = os.environ.get("CLICKHOUSE_PORT_HTTP", "8123")
 
 #####################################################################################
 # This test starts an HTTP server and serves data to clickhouse url-engine based table.
@@ -42,16 +44,24 @@ CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
 #####################################################################################
 
 # IP-address of this host accessible from the outside world. Get the first one
-HTTP_SERVER_HOST = subprocess.check_output(['hostname', '-i']).decode('utf-8').strip().split()[0]
+HTTP_SERVER_HOST = (
+    subprocess.check_output(["hostname", "-i"]).decode("utf-8").strip().split()[0]
+)
 IS_IPV6 = is_ipv6(HTTP_SERVER_HOST)
 HTTP_SERVER_PORT = get_local_port(HTTP_SERVER_HOST, IS_IPV6)
 
 # IP address and port of the HTTP server started from this script.
 HTTP_SERVER_ADDRESS = (HTTP_SERVER_HOST, HTTP_SERVER_PORT)
 if IS_IPV6:
-    HTTP_SERVER_URL_STR = 'http://' + f'[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+    HTTP_SERVER_URL_STR = (
+        "http://"
+        + f"[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}"
+        + "/"
+    )
 else:
-    HTTP_SERVER_URL_STR = 'http://' + f'{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+    HTTP_SERVER_URL_STR = (
+        "http://" + f"{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}" + "/"
+    )
 
 # Because we need to check the content of file.csv we can create this content and avoid reading csv
 CSV_DATA = "Hello, 1\nWorld, 2\nThis, 152\nis, 9283\ntesting, 2313213\ndata, 555\n"
@@ -59,19 +69,24 @@ CSV_DATA = "Hello, 1\nWorld, 2\nThis, 152\nis, 9283\ntesting, 2313213\ndata, 555
 
 # Choose compression method
 # (Will change during test, need to check standard data sending, to make sure that nothing broke)
-COMPRESS_METHOD = 'none'
-ADDING_ENDING = ''
-ENDINGS = ['.gz', '.xz']
+COMPRESS_METHOD = "none"
+ADDING_ENDING = ""
+ENDINGS = [".gz", ".xz"]
 SEND_ENCODING = True
 
+
 def get_ch_answer(query):
     host = CLICKHOUSE_HOST
     if IS_IPV6:
-        host = f'[{host}]'
+        host = f"[{host}]"
 
-    url = os.environ.get('CLICKHOUSE_URL', 'http://{host}:{port}'.format(host=CLICKHOUSE_HOST, port=CLICKHOUSE_PORT_HTTP))
+    url = os.environ.get(
+        "CLICKHOUSE_URL",
+        "http://{host}:{port}".format(host=CLICKHOUSE_HOST, port=CLICKHOUSE_PORT_HTTP),
+    )
     return urllib.request.urlopen(url, data=query.encode()).read().decode()
 
+
 def check_answers(query, answer):
     ch_answer = get_ch_answer(query)
     if ch_answer.strip() != answer.strip():
@@ -80,18 +95,19 @@ def check_answers(query, answer):
         print("Fetched answer :", ch_answer, file=sys.stderr)
         raise Exception("Fail on query")
 
+
 # Server with head method which is useful for debuging by hands
 class HttpProcessor(SimpleHTTPRequestHandler):
     def _set_headers(self):
         self.send_response(200)
         if SEND_ENCODING:
-            self.send_header('Content-Encoding', COMPRESS_METHOD)
-        if COMPRESS_METHOD == 'none':
-            self.send_header('Content-Length', len(CSV_DATA.encode()))
+            self.send_header("Content-Encoding", COMPRESS_METHOD)
+        if COMPRESS_METHOD == "none":
+            self.send_header("Content-Length", len(CSV_DATA.encode()))
         else:
             self.compress_data()
-            self.send_header('Content-Length', len(self.data))
-        self.send_header('Content-Type', 'text/csv')
+            self.send_header("Content-Length", len(self.data))
+        self.send_header("Content-Type", "text/csv")
         self.end_headers()
 
     def do_HEAD(self):
@@ -99,18 +115,17 @@ class HttpProcessor(SimpleHTTPRequestHandler):
         return
 
     def compress_data(self):
-        if COMPRESS_METHOD == 'gzip':
+        if COMPRESS_METHOD == "gzip":
             self.data = gzip.compress((CSV_DATA).encode())
-        elif COMPRESS_METHOD == 'lzma':
+        elif COMPRESS_METHOD == "lzma":
             self.data = lzma.compress((CSV_DATA).encode())
         else:
-            self.data = 'WRONG CONVERSATION'.encode()
-
+            self.data = "WRONG CONVERSATION".encode()
 
     def do_GET(self):
         self._set_headers()
 
-        if COMPRESS_METHOD == 'none':
+        if COMPRESS_METHOD == "none":
             self.wfile.write(CSV_DATA.encode())
         else:
             self.wfile.write(self.data)
@@ -119,9 +134,11 @@ class HttpProcessor(SimpleHTTPRequestHandler):
     def log_message(self, format, *args):
         return
 
+
 class HTTPServerV6(HTTPServer):
     address_family = socket.AF_INET6
 
+
 def start_server(requests_amount):
     if IS_IPV6:
         httpd = HTTPServerV6(HTTP_SERVER_ADDRESS, HttpProcessor)
@@ -135,52 +152,60 @@ def start_server(requests_amount):
     t = threading.Thread(target=real_func)
     return t
 
+
 #####################################################################
 # Testing area.
 #####################################################################
 
-def test_select(dict_name="", schema="word String, counter UInt32", requests=[], answers=[], test_data=""):
+
+def test_select(
+    dict_name="",
+    schema="word String, counter UInt32",
+    requests=[],
+    answers=[],
+    test_data="",
+):
     global ADDING_ENDING
     global SEND_ENCODING
     global COMPRESS_METHOD
     for i in range(len(requests)):
         if i > 2:
-            ADDING_ENDING = ENDINGS[i-3]
+            ADDING_ENDING = ENDINGS[i - 3]
             SEND_ENCODING = False
 
         if dict_name:
             get_ch_answer("drop dictionary if exists {}".format(dict_name))
-            get_ch_answer('''CREATE DICTIONARY {} ({})
+            get_ch_answer(
+                """CREATE DICTIONARY {} ({})
             PRIMARY KEY word
             SOURCE(HTTP(url '{}' format 'CSV'))
             LAYOUT(complex_key_hashed())
-            LIFETIME(0)'''.format(dict_name, schema, HTTP_SERVER_URL_STR + '/test.csv' + ADDING_ENDING))
+            LIFETIME(0)""".format(
+                    dict_name, schema, HTTP_SERVER_URL_STR + "/test.csv" + ADDING_ENDING
+                )
+            )
 
         COMPRESS_METHOD = requests[i]
         print(i, COMPRESS_METHOD, ADDING_ENDING, SEND_ENCODING)
         check_answers("SELECT * FROM {} ORDER BY word".format(dict_name), answers[i])
 
+
 def main():
     # first three for encoding, second three for url
-    insert_requests = [
-            'none',
-            'gzip',
-            'lzma',
-            'gzip',
-            'lzma'
-    ]
+    insert_requests = ["none", "gzip", "lzma", "gzip", "lzma"]
 
     # This answers got experemently in non compressed mode and they are correct
-    answers = ['''Hello	1\nThis	152\nWorld	2\ndata	555\nis	9283\ntesting	2313213'''] * 5
+    answers = ["""Hello	1\nThis	152\nWorld	2\ndata	555\nis	9283\ntesting	2313213"""] * 5
 
     t = start_server(len(insert_requests))
     t.start()
-    test_select(dict_name="test_table_select", requests=insert_requests, answers=answers)
+    test_select(
+        dict_name="test_table_select", requests=insert_requests, answers=answers
+    )
     t.join()
     print("PASSED")
 
 
-
 if __name__ == "__main__":
     try:
         main()
@@ -191,5 +216,3 @@ if __name__ == "__main__":
         sys.stderr.flush()
 
         os._exit(1)
-
-
diff --git a/tests/queries/0_stateless/01881_join_on_conditions_hash.sql.j2 b/tests/queries/0_stateless/01881_join_on_conditions_hash.sql.j2
index d2cc066a1b1..fafefd72cb8 100644
--- a/tests/queries/0_stateless/01881_join_on_conditions_hash.sql.j2
+++ b/tests/queries/0_stateless/01881_join_on_conditions_hash.sql.j2
@@ -31,7 +31,6 @@ SELECT t1.key, t1.key2 FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key ==
 SELECT '--';
 SELECT t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2;
 SELECT t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND 0; -- { serverError INVALID_JOIN_ON_EXPRESSION }
-SELECT t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND 1; -- { serverError INVALID_JOIN_ON_EXPRESSION }
 
 SELECT '--';
 SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t2.id > 2;
@@ -71,8 +70,8 @@ SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id; -- { serverError
 SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.id; -- { serverError 403 }
 SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id + 2; -- { serverError 403 }
 SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.id + 2; -- { serverError 403 }
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.key; -- { serverError 403 }
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key; -- { serverError 403 }
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.key; -- { serverError 43, 403 }
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key; -- { serverError 43, 403 }
 SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 AND (t1.id == t2.id OR isNull(t2.key2)); -- { serverError 403 }
 SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 OR t1.id == t2.id; -- { serverError 403 }
 SELECT * FROM t1 JOIN t2 ON (t2.key == t2.key2 AND (t1.key == t1.key2 AND t1.key != 'XXX' OR t1.id == t2.id)) AND t1.id == t2.id; -- { serverError 403 }
diff --git a/tests/queries/0_stateless/01881_join_on_conditions_merge.sql.j2 b/tests/queries/0_stateless/01881_join_on_conditions_merge.sql.j2
index 1704fedb92b..e4b704247b2 100644
--- a/tests/queries/0_stateless/01881_join_on_conditions_merge.sql.j2
+++ b/tests/queries/0_stateless/01881_join_on_conditions_merge.sql.j2
@@ -68,8 +68,8 @@ SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id; -- { serverError
 SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.id; -- { serverError 403 }
 SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id + 2; -- { serverError 403 }
 SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.id + 2; -- { serverError 403 }
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.key; -- { serverError 403 }
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key; -- { serverError 403 }
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.key; -- { serverError 43, 403 }
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key; -- { serverError 43, 403 }
 SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 AND (t1.id == t2.id OR isNull(t2.key2)); -- { serverError 403 }
 SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 OR t1.id == t2.id; -- { serverError 403 }
 SELECT * FROM t1 JOIN t2 ON (t2.key == t2.key2 AND (t1.key == t1.key2 AND t1.key != 'XXX' OR t1.id == t2.id)) AND t1.id == t2.id; -- { serverError 403 }
diff --git a/tests/queries/0_stateless/01883_with_grouping_sets.reference b/tests/queries/0_stateless/01883_with_grouping_sets.reference
index 8fae10a05a4..499e930541f 100644
--- a/tests/queries/0_stateless/01883_with_grouping_sets.reference
+++ b/tests/queries/0_stateless/01883_with_grouping_sets.reference
@@ -13,8 +13,7 @@ ExpressionTransform
                 Copy 1 → 2
                   (Expression)
                   ExpressionTransform
-                    (ReadFromStorage)
-                    Memory 0 → 1
+                    (ReadFromMemoryStorage)
 1	0	1	4500
 1	0	3	4700
 1	0	5	4900
diff --git a/tests/queries/0_stateless/01888_read_int_safe.sql b/tests/queries/0_stateless/01888_read_int_safe.sql
index 3aea8e38ab0..197338775c4 100644
--- a/tests/queries/0_stateless/01888_read_int_safe.sql
+++ b/tests/queries/0_stateless/01888_read_int_safe.sql
@@ -1,10 +1,10 @@
-select toInt64('--1'); -- { serverError 72; }
-select toInt64('+-1'); -- { serverError 72; }
-select toInt64('++1'); -- { serverError 72; }
-select toInt64('++'); -- { serverError 72; }
-select toInt64('+'); -- { serverError 72; }
-select toInt64('1+1'); -- { serverError 6; }
-select toInt64('1-1'); -- { serverError 6; }
-select toInt64(''); -- { serverError 32; }
+select toInt64('--1'); -- { serverError 72 }
+select toInt64('+-1'); -- { serverError 72 }
+select toInt64('++1'); -- { serverError 72 }
+select toInt64('++'); -- { serverError 72 }
+select toInt64('+'); -- { serverError 72 }
+select toInt64('1+1'); -- { serverError 6 }
+select toInt64('1-1'); -- { serverError 6 }
+select toInt64(''); -- { serverError 32 }
 select toInt64('1');
 select toInt64('-1');
diff --git a/tests/queries/0_stateless/01889_sql_json_functions.reference b/tests/queries/0_stateless/01889_sql_json_functions.reference
index c2c106e8632..cb8e19ea2a0 100644
--- a/tests/queries/0_stateless/01889_sql_json_functions.reference
+++ b/tests/queries/0_stateless/01889_sql_json_functions.reference
@@ -31,6 +31,26 @@ select JSON_VALUE('{"a":"\\n\\u0000"}', '$.a');
 \n\0
 select JSON_VALUE('{"a":"\\u263a"}', '$.a');
 ☺
+select JSON_VALUE('{"hello":"world"}', '$.b') settings function_json_value_return_type_allow_nullable=true;
+\N
+select JSON_VALUE('{"hello":{"world":"!"}}', '$.hello') settings function_json_value_return_type_allow_complex=true;
+{"world":"!"}
+SELECT JSON_VALUE('{"hello":["world","world2"]}', '$.hello') settings function_json_value_return_type_allow_complex=true;
+["world","world2"]
+SELECT JSON_VALUE('{"1key":1}', '$.1key');
+1
+SELECT JSON_VALUE('{"hello":1}', '$[hello]');
+1
+SELECT JSON_VALUE('{"hello":1}', '$["hello"]');
+1
+SELECT JSON_VALUE('{"hello":1}', '$[\'hello\']');
+1
+SELECT JSON_VALUE('{"hello 1":1}', '$["hello 1"]');
+1
+SELECT JSON_VALUE('{"1key":1}', '$..1key'); -- { serverError 36 }
+SELECT JSON_VALUE('{"1key":1}', '$1key'); -- { serverError 36 }
+SELECT JSON_VALUE('{"1key":1}', '$key'); -- { serverError 36 }
+SELECT JSON_VALUE('{"1key":1}', '$.[key]'); -- { serverError 36 }
 SELECT '--JSON_QUERY--';
 --JSON_QUERY--
 SELECT JSON_QUERY('{"hello":1}', '$');
@@ -55,6 +75,20 @@ SELECT JSON_QUERY('', '$.hello');
 
 SELECT JSON_QUERY('{"array":[[0, 1, 2, 3, 4, 5], [0, -1, -2, -3, -4, -5]]}', '$.array[*][0 to 2, 4]');
 [0, 1, 4, 0, -1, -4]
+SELECT JSON_QUERY('{"1key":1}', '$.1key');
+[1]
+SELECT JSON_QUERY('{"hello":1}', '$[hello]');
+[1]
+SELECT JSON_QUERY('{"hello":1}', '$["hello"]');
+[1]
+SELECT JSON_QUERY('{"hello":1}', '$[\'hello\']');
+[1]
+SELECT JSON_QUERY('{"hello 1":1}', '$["hello 1"]');
+[1]
+SELECT JSON_QUERY('{"1key":1}', '$..1key'); -- { serverError 36 }
+SELECT JSON_QUERY('{"1key":1}', '$1key'); -- { serverError 36 }
+SELECT JSON_QUERY('{"1key":1}', '$key'); -- { serverError 36 }
+SELECT JSON_QUERY('{"1key":1}', '$.[key]'); -- { serverError 36 }
 SELECT '--JSON_EXISTS--';
 --JSON_EXISTS--
 SELECT JSON_EXISTS('{"hello":1}', '$');
diff --git a/tests/queries/0_stateless/01889_sql_json_functions.sql b/tests/queries/0_stateless/01889_sql_json_functions.sql
index e816443382c..947b0171ec6 100644
--- a/tests/queries/0_stateless/01889_sql_json_functions.sql
+++ b/tests/queries/0_stateless/01889_sql_json_functions.sql
@@ -17,6 +17,18 @@ SELECT JSON_VALUE('{"hello":"\\uD83C\\uDF3A \\uD83C\\uDF38 \\uD83C\\uDF37 Hello,
 SELECT JSON_VALUE('{"a":"Hello \\"World\\" \\\\"}', '$.a');
 select JSON_VALUE('{"a":"\\n\\u0000"}', '$.a');
 select JSON_VALUE('{"a":"\\u263a"}', '$.a');
+select JSON_VALUE('{"hello":"world"}', '$.b') settings function_json_value_return_type_allow_nullable=true;
+select JSON_VALUE('{"hello":{"world":"!"}}', '$.hello') settings function_json_value_return_type_allow_complex=true;
+SELECT JSON_VALUE('{"hello":["world","world2"]}', '$.hello') settings function_json_value_return_type_allow_complex=true;
+SELECT JSON_VALUE('{"1key":1}', '$.1key');
+SELECT JSON_VALUE('{"hello":1}', '$[hello]');
+SELECT JSON_VALUE('{"hello":1}', '$["hello"]');
+SELECT JSON_VALUE('{"hello":1}', '$[\'hello\']');
+SELECT JSON_VALUE('{"hello 1":1}', '$["hello 1"]');
+SELECT JSON_VALUE('{"1key":1}', '$..1key'); -- { serverError 36 }
+SELECT JSON_VALUE('{"1key":1}', '$1key'); -- { serverError 36 }
+SELECT JSON_VALUE('{"1key":1}', '$key'); -- { serverError 36 }
+SELECT JSON_VALUE('{"1key":1}', '$.[key]'); -- { serverError 36 }
 
 SELECT '--JSON_QUERY--';
 SELECT JSON_QUERY('{"hello":1}', '$');
@@ -30,6 +42,15 @@ SELECT JSON_QUERY('{"hello":{"world":"!"}}', '$.hello');
 SELECT JSON_QUERY( '{hello:{"world":"!"}}}', '$.hello'); -- invalid json => default value (empty string)
 SELECT JSON_QUERY('', '$.hello');
 SELECT JSON_QUERY('{"array":[[0, 1, 2, 3, 4, 5], [0, -1, -2, -3, -4, -5]]}', '$.array[*][0 to 2, 4]');
+SELECT JSON_QUERY('{"1key":1}', '$.1key');
+SELECT JSON_QUERY('{"hello":1}', '$[hello]');
+SELECT JSON_QUERY('{"hello":1}', '$["hello"]');
+SELECT JSON_QUERY('{"hello":1}', '$[\'hello\']');
+SELECT JSON_QUERY('{"hello 1":1}', '$["hello 1"]');
+SELECT JSON_QUERY('{"1key":1}', '$..1key'); -- { serverError 36 }
+SELECT JSON_QUERY('{"1key":1}', '$1key'); -- { serverError 36 }
+SELECT JSON_QUERY('{"1key":1}', '$key'); -- { serverError 36 }
+SELECT JSON_QUERY('{"1key":1}', '$.[key]'); -- { serverError 36 }
 
 SELECT '--JSON_EXISTS--';
 SELECT JSON_EXISTS('{"hello":1}', '$');
diff --git a/tests/queries/0_stateless/01889_sqlite_read_write.reference b/tests/queries/0_stateless/01889_sqlite_read_write.reference
index d6b1e6f41c1..9f2b382e41e 100644
--- a/tests/queries/0_stateless/01889_sqlite_read_write.reference
+++ b/tests/queries/0_stateless/01889_sqlite_read_write.reference
@@ -36,6 +36,11 @@ line1	1
 line2	2
 line3	3
 line4	4
+test schema inference
+col1	Nullable(String)					
+col2	Nullable(Int32)					
+col1	Nullable(String)					
+col2	Nullable(Int32)					
 test path in clickhouse-local
 line1	1
 line2	2
diff --git a/tests/queries/0_stateless/01889_sqlite_read_write.sh b/tests/queries/0_stateless/01889_sqlite_read_write.sh
index e732155dbcc..7691d2e3c2c 100755
--- a/tests/queries/0_stateless/01889_sqlite_read_write.sh
+++ b/tests/queries/0_stateless/01889_sqlite_read_write.sh
@@ -87,6 +87,14 @@ ${CLICKHOUSE_CLIENT} --query="INSERT INTO TABLE FUNCTION sqlite('${DB_PATH}', 't
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM sqlite('${DB_PATH}', 'table1') ORDER BY col2"
 
 
+${CLICKHOUSE_CLIENT} --query="select 'test schema inference'";
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE sqlite_table3_inferred_engine ENGINE = SQLite('${DB_PATH}', 'table3')"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE sqlite_table3_inferred_function AS sqlite('${DB_PATH}', 'table3')"
+${CLICKHOUSE_CLIENT} --query="DESCRIBE TABLE sqlite_table3_inferred_engine;"
+${CLICKHOUSE_CLIENT} --query="DESCRIBE TABLE sqlite_table3_inferred_function;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE sqlite_table3_inferred_engine;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE sqlite_table3_inferred_function;"
+
 sqlite3 "${DB_PATH2}" 'DROP TABLE IF EXISTS table1'
 sqlite3 "${DB_PATH2}" 'CREATE TABLE table1 (col1 text, col2 smallint);'
 sqlite3 "${DB_PATH2}" "INSERT INTO table1 VALUES ('line1', 1), ('line2', 2), ('line3', 3)"
diff --git a/tests/queries/0_stateless/01890_cross_join_explain_crash.reference b/tests/queries/0_stateless/01890_cross_join_explain_crash.reference
index 76315843adb..c08ba9c71b3 100644
--- a/tests/queries/0_stateless/01890_cross_join_explain_crash.reference
+++ b/tests/queries/0_stateless/01890_cross_join_explain_crash.reference
@@ -1,3 +1,4 @@
+1	1	1
 2	1	1
 1	2	1
 1	1	2
diff --git a/tests/queries/0_stateless/01890_cross_join_explain_crash.sql b/tests/queries/0_stateless/01890_cross_join_explain_crash.sql
index 20a1956ea6b..bb2bc606870 100644
--- a/tests/queries/0_stateless/01890_cross_join_explain_crash.sql
+++ b/tests/queries/0_stateless/01890_cross_join_explain_crash.sql
@@ -1,8 +1,7 @@
+SET allow_experimental_analyzer = 1;
 SET joined_subquery_requires_alias = 0;
-select * FROM (SELECT 1), (SELECT 1), (SELECT 1); -- { serverError 352 }
 
--- This queries work by luck.
--- Feel free to remove then if it is the only failed test.
+select * FROM (SELECT 1), (SELECT 1), (SELECT 1);
 select * from (select 2), (select 1) as a, (select 1) as b;
 select * from (select 1) as a, (select 2), (select 1) as b;
 select * from (select 1) as a, (select 1) as b, (select 2);
diff --git a/tests/queries/0_stateless/01891_partition_hash.reference b/tests/queries/0_stateless/01891_partition_hash.reference
index 56d11075e50..c5814777dfe 100644
--- a/tests/queries/0_stateless/01891_partition_hash.reference
+++ b/tests/queries/0_stateless/01891_partition_hash.reference
@@ -1 +1,2 @@
 6ba51fa36c625adab5d58007c96e32bf
+ebc1c2f37455caea601feeb840757dd3
diff --git a/tests/queries/0_stateless/01891_partition_hash.sql b/tests/queries/0_stateless/01891_partition_hash.sql
index f56ed6a4ff4..894594dd465 100644
--- a/tests/queries/0_stateless/01891_partition_hash.sql
+++ b/tests/queries/0_stateless/01891_partition_hash.sql
@@ -1,7 +1,32 @@
-drop table if exists tab;
-create table tab (i8 Int8, i16 Int16, i32 Int32, i64 Int64, i128 Int128, i256 Int256, u8 UInt8, u16 UInt16, u32 UInt32, u64 UInt64, u128 UInt128, u256 UInt256, id UUID, s String, fs FixedString(33), a Array(UInt8), t Tuple(UInt16, UInt32), d Date, dt DateTime('Asia/Istanbul'), dt64 DateTime64(3, 'Asia/Istanbul'), dec128 Decimal128(3), dec256 Decimal256(4), lc LowCardinality(String)) engine = MergeTree PARTITION BY (i8, i16, i32, i64, i128, i256, u8, u16, u32, u64, u128, u256, id, s, fs, a, t, d, dt, dt64, dec128, dec256, lc) order by tuple();
-insert into tab values (-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, '61f0c404-5cb3-11e7-907b-a6006ad3dba0', 'a', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', [1, 2, 3], (-1, -2), '2020-01-01', '2020-01-01 01:01:01', '2020-01-01 01:01:01', '123.456', '78.9101', 'a');
+DROP TABLE IF EXISTS tab;
+CREATE TABLE tab (
+    i8 Int8,
+    i16 Int16,
+    i32 Int32,
+    i64 Int64,
+    i128 Int128,
+    i256 Int256,
+    u8 UInt8,
+    u16 UInt16,
+    u32 UInt32,
+    u64 UInt64,
+    u128 UInt128,
+    u256 UInt256,
+    id UUID,
+    s String,
+    fs FixedString(33),
+    a Array(UInt8),
+    t Tuple(UInt16, UInt32),
+    d Date,
+    dt DateTime('Asia/Istanbul'),
+    dt64 DateTime64(3, 'Asia/Istanbul'),
+    dec128 Decimal128(3),
+    dec256 Decimal256(4),
+    lc LowCardinality(String))
+engine = MergeTree PARTITION BY (i8, i16, i32, i64, i128, i256, u8, u16, u32, u64, u128, u256, id, s, fs, a, t, d, dt, dt64, dec128, dec256, lc) ORDER BY tuple();
+INSERT INTO tab VALUES (-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, '61f0c404-5cb3-11e7-907b-a6006ad3dba0', 'a', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', [1, 2, 3], (-1, -2), '2020-01-01', '2020-01-01 01:01:01', '2020-01-01 01:01:01', '123.456', '78.9101', 'a');
+INSERT INTO tab VALUES (123, 12345, 1234567890, 1234567890000000000, 123456789000000000000000000000000000000, 123456789000000000000000000000000000000000000000000000000000000000000000000000, 123, 12345, 1234567890, 1234567890000000000, 123456789000000000000000000000000000000, 123456789000000000000000000000000000000000000000000000000000000000000000000000, '61f0c404-5cb3-11e7-907b-a6006ad3dba0', 'a', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', [1, 2, 3], (-1, -2), '2020-01-01', '2020-01-01 01:01:01', '2020-01-01 01:01:01', '123.456', '78.9101', 'a');
 -- Here we check that partition id did not change.
 -- Different result means Backward Incompatible Change. Old partitions will not be accepted by new server.
-select partition_id from system.parts where table = 'tab' and database = currentDatabase();
-drop table if exists tab;
+SELECT partition_id FROM system.parts WHERE table = 'tab' AND database = currentDatabase();
+DROP TABLE IF EXISTS tab;
diff --git a/tests/queries/0_stateless/01905_to_json_string.reference b/tests/queries/0_stateless/01905_to_json_string.reference
index 33d435f8e1a..ec4f4e48bde 100644
--- a/tests/queries/0_stateless/01905_to_json_string.reference
+++ b/tests/queries/0_stateless/01905_to_json_string.reference
@@ -1,3 +1,3 @@
-[]	2947817982	"&"	-69802.9769	"w"	-1.9158530982937093e25	["2003-05-15","1988-03-19 06:13:49","2090-04-14 03:58:26.029","91943d2e-480d-66b5-ee4c-1b5bb8eb7256"]	"�O"	[]
-[-115]	481807067	",{MM"	-170235.0663	"o"	3.3808659558052087e155	["2055-01-12","2070-08-09 03:49:21","2068-11-30 09:36:49.672","20b0e7b5-ad0e-177b-3054-c779b2a8ebe0"]	"I\\u001C"	["e57178f9-4d10-2fa1-7c2d-53c5a65c3463"]
+[]	2947817982	"&"	-69802.9769	"o"	3.3808659558052087e155	["2142-01-24","2076-06-05 14:54:21","2068-11-30 09:36:49.672","ee4c1b5b-b8eb-7256-20b0-e7b5ad0e177b"]	"��"	["7c2d53c5-a65c-3463-a76e-e26583aca234"]
+[-115]	481807067	",{MM"	-45534.1174	"w"	1.711178201812925e-166	["1994-01-04","1971-12-29 08:41:23","2012-03-25 07:11:39.573","3054c779-b2a8-ebe0-ec50-64cb1c494fbd"]	"�\\u0000"	["055300b2-b400-653c-1ea0-2413e3a3af76"]
 {"1234":"5678"}
diff --git a/tests/queries/0_stateless/01911_logical_error_minus.sql b/tests/queries/0_stateless/01911_logical_error_minus.sql
index 3dcdedd38f5..7f371a463f8 100644
--- a/tests/queries/0_stateless/01911_logical_error_minus.sql
+++ b/tests/queries/0_stateless/01911_logical_error_minus.sql
@@ -26,7 +26,7 @@ INSERT INTO codecTest (key, name, ref_valueF64, valueF64, ref_valueF32, valueF32
 INSERT INTO codecTest (key, name, ref_valueF64, valueF64, ref_valueF32, valueF32)
     SELECT number AS n, 'sin(n*n*n)*n', sin(n * n * n * n* n) AS v, v, v, v FROM system.numbers LIMIT 301, 100;
 
-SELECT IF(-2, NULL, 0.00009999999747378752), IF(1048577, 1048576, NULL), c1.key, IF(1, NULL, NULL), c2.key FROM codecTest AS c1 , codecTest AS c2 WHERE ignore(IF(257, -2, NULL), arrayJoin([65537]), IF(3, 1024, 9223372036854775807)) AND IF(NULL, 256, NULL) AND (IF(NULL, '1048576', NULL) = (c1.key - NULL)) LIMIT 65535;
+SELECT IF(2, NULL, 0.00009999999747378752), IF(104, 1048576, NULL), c1.key, IF(1, NULL, NULL), c2.key FROM codecTest AS c1 , codecTest AS c2 WHERE ignore(IF(255, -2, NULL), arrayJoin([65537]), IF(3, 1024, 9223372036854775807)) AND IF(NULL, 256, NULL) AND (IF(NULL, '1048576', NULL) = (c1.key - NULL)) LIMIT 65535;
 
 SELECT c1.key, c1.name, c1.ref_valueF64, c1.valueF64, c1.ref_valueF64 - c1.valueF64 AS dF64, '', c2.key, c2.ref_valueF64 FROM codecTest AS c1 , codecTest AS c2 WHERE (dF64 != 3) AND c1.valueF64 != 0 AND (c2.key = (c1.key - 1048576)) LIMIT 0;
 
@@ -72,7 +72,7 @@ INSERT INTO codecTest (key, ref_valueU64, valueU64, ref_valueU32, valueU32, ref_
     SELECT number as n, n + (rand64() - 9223372036854775807)/1000 as v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, toDateTime(v), toDateTime(v), toDate(v), toDate(v)
     FROM system.numbers LIMIT 3001, 1000;
 
-SELECT IF(-2, NULL, 0.00009999999747378752), IF(1048577, 1048576, NULL), c1.key, IF(1, NULL, NULL), c2.key FROM codecTest AS c1 , codecTest AS c2 WHERE ignore(IF(257, -2, NULL), arrayJoin([65537]), IF(3, 1024, 9223372036854775807)) AND IF(NULL, 256, NULL) AND (IF(NULL, '1048576', NULL) = (c1.key - NULL)) LIMIT 65535;
+SELECT IF(2, NULL, 0.00009999999747378752), IF(104, 1048576, NULL), c1.key, IF(1, NULL, NULL), c2.key FROM codecTest AS c1 , codecTest AS c2 WHERE ignore(IF(255, -2, NULL), arrayJoin([65537]), IF(3, 1024, 9223372036854775807)) AND IF(NULL, 256, NULL) AND (IF(NULL, '1048576', NULL) = (c1.key - NULL)) LIMIT 65535;
 
 
 DROP TABLE codecTest;
diff --git a/tests/queries/0_stateless/01913_exact_rows_before_limit_full.reference b/tests/queries/0_stateless/01913_exact_rows_before_limit_full.reference
new file mode 100644
index 00000000000..a0f4560ca1c
--- /dev/null
+++ b/tests/queries/0_stateless/01913_exact_rows_before_limit_full.reference
@@ -0,0 +1,162 @@
+{
+	"meta":
+	[
+		{
+			"name": "i",
+			"type": "Int32"
+		}
+	],
+
+	"data":
+	[
+		[0]
+	],
+
+	"rows": 1,
+
+	"rows_before_limit_at_least": 10000
+}
+{
+	"meta":
+	[
+		{
+			"name": "i",
+			"type": "Int32"
+		}
+	],
+
+	"data":
+	[
+		[0]
+	],
+
+	"rows": 1,
+
+	"rows_before_limit_at_least": 10
+}
+{
+	"meta":
+	[
+		{
+			"name": "i",
+			"type": "Int32"
+		}
+	],
+
+	"data":
+	[
+		[12]
+	],
+
+	"rows": 1,
+
+	"rows_before_limit_at_least": 3
+}
+{
+	"meta":
+	[
+		{
+			"name": "i",
+			"type": "Int32"
+		}
+	],
+
+	"data":
+	[
+		[0]
+	],
+
+	"rows": 1,
+
+	"rows_before_limit_at_least": 20
+}
+{
+	"meta":
+	[
+		{
+			"name": "i",
+			"type": "Int32"
+		}
+	],
+
+	"data":
+	[
+		[0]
+	],
+
+	"rows": 1,
+
+	"rows_before_limit_at_least": 60
+}
+{
+	"meta":
+	[
+		{
+			"name": "i",
+			"type": "Int32"
+		}
+	],
+
+	"data":
+	[
+		[0]
+	],
+
+	"rows": 1,
+
+	"rows_before_limit_at_least": 40
+}
+{
+	"meta":
+	[
+		{
+			"name": "i",
+			"type": "Int32"
+		}
+	],
+
+	"data":
+	[
+		[0]
+	],
+
+	"rows": 1,
+
+	"rows_before_limit_at_least": 60
+}
+{
+	"meta":
+	[
+		{
+			"name": "i",
+			"type": "Int32"
+		}
+	],
+
+	"data":
+	[
+		[0]
+	],
+
+	"rows": 1,
+
+	"rows_before_limit_at_least": 40
+}
+{
+	"meta":
+	[
+		{
+			"name": "i",
+			"type": "Int32"
+		}
+	],
+
+	"data":
+	[
+		[0]
+	],
+
+	"rows": 1,
+
+	"rows_before_limit_at_least": 20
+}
diff --git a/tests/queries/0_stateless/01913_exact_rows_before_limit_full.sql b/tests/queries/0_stateless/01913_exact_rows_before_limit_full.sql
new file mode 100644
index 00000000000..84f97090169
--- /dev/null
+++ b/tests/queries/0_stateless/01913_exact_rows_before_limit_full.sql
@@ -0,0 +1,29 @@
+-- Tags: no-parallel, no-random-merge-tree-settings
+
+drop table if exists test;
+
+create table test (i int) engine MergeTree order by tuple();
+
+insert into test select arrayJoin(range(10000));
+
+set exact_rows_before_limit = 1, output_format_write_statistics = 0, max_block_size = 100;
+
+select * from test limit 1 FORMAT JSONCompact;
+
+select * from test where i < 10 group by i limit 1 FORMAT JSONCompact;
+
+select * from test group by i having i in (10, 11, 12) limit 1 FORMAT JSONCompact;
+
+select * from test where i < 20 order by i limit 1 FORMAT JSONCompact;
+
+set prefer_localhost_replica = 0;
+select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 30 limit 1 FORMAT JSONCompact;
+select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 20 order by i limit 1 FORMAT JSONCompact;
+
+set prefer_localhost_replica = 1;
+select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 30 limit 1 FORMAT JSONCompact;
+select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 20 order by i limit 1 FORMAT JSONCompact;
+
+select * from (select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 10) limit 1 FORMAT JSONCompact;
+
+drop table if exists test;
diff --git a/tests/queries/0_stateless/01913_names_of_tuple_literal.sql b/tests/queries/0_stateless/01913_names_of_tuple_literal.sql
index 09de9e8cf37..879f4c91587 100644
--- a/tests/queries/0_stateless/01913_names_of_tuple_literal.sql
+++ b/tests/queries/0_stateless/01913_names_of_tuple_literal.sql
@@ -1,2 +1,4 @@
+SET allow_experimental_analyzer = 0;
+
 SELECT ((1, 2), (2, 3), (3, 4)) FORMAT TSVWithNames;
 SELECT ((1, 2), (2, 3), (3, 4)) FORMAT TSVWithNames SETTINGS legacy_column_name_of_tuple_literal = 1;
diff --git a/tests/queries/0_stateless/01920_async_drain_connections.sql b/tests/queries/0_stateless/01920_async_drain_connections.sql
deleted file mode 100644
index 827ca13fc1a..00000000000
--- a/tests/queries/0_stateless/01920_async_drain_connections.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table if exists t;
-
-create table t (number UInt64) engine = Distributed(test_cluster_two_shards, system, numbers);
-select * from t where number = 0 limit 2 settings sleep_in_receive_cancel_ms = 10000, max_execution_time = 5;
-
-drop table t;
diff --git a/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference b/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference
index 93f9e3d10db..72e8abb1428 100644
--- a/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference
+++ b/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference
@@ -1,2 +1,3 @@
 0
 1	0
+1	0
diff --git a/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql b/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql
index a73c06bbe49..176b5761ac5 100644
--- a/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql
+++ b/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql
@@ -2,3 +2,5 @@ SELECT 1 as a, count() FROM numbers(10) WHERE 0 GROUP BY a;
 SELECT count() FROM numbers(10) WHERE 0;
 
 SELECT 1 as a, count() FROM numbers(10) WHERE 0 GROUP BY a SETTINGS empty_result_for_aggregation_by_constant_keys_on_empty_set = 0;
+
+SELECT 1 as a, count() FROM numbers(10) WHERE 0 GROUP BY a SETTINGS empty_result_for_aggregation_by_constant_keys_on_empty_set = 0, optimize_trivial_count_query = 0;
diff --git a/tests/queries/0_stateless/01927_query_views_log_current_database.reference b/tests/queries/0_stateless/01927_query_views_log_current_database.reference
index eaa1e98c55c..64bf1e501f3 100644
--- a/tests/queries/0_stateless/01927_query_views_log_current_database.reference
+++ b/tests/queries/0_stateless/01927_query_views_log_current_database.reference
@@ -1,15 +1,15 @@
 Row 1:
 ──────
 stage:                Query log rows
-read_rows:            400
+read_rows:            300
 written_rows:         201
 databases:            ['_table_function','default']
-tables:               ['_table_function.numbers','default.table_a','default.table_b','default.table_b_live_view','default.table_c']
-views:                ['default.matview_a_to_b','default.matview_b_to_c','default.table_b_live_view']
+tables:               ['_table_function.numbers','default.table_a','default.table_b','default.table_c']
+views:                ['default.matview_a_to_b','default.matview_b_to_c']
 sleep_calls:          200
 sleep_us:             298
-profile_select_rows:  400
-profile_select_bytes: 5200
+profile_select_rows:  300
+profile_select_bytes: 3600
 profile_insert_rows:  201
 profile_insert_bytes: 2808
 Row 1:
@@ -45,23 +45,6 @@ profile_select_rows:  100
 profile_select_bytes: 800
 profile_insert_rows:  1
 profile_insert_bytes: 8
-
-Row 3:
-──────
-stage:                Depending views
-view_name:            default.table_b_live_view
-view_type:            Live
-status:               QueryFinish
-view_target:          default.table_b_live_view
-view_query:           SELECT sum(a + b) FROM default.table_b
-read_rows:            100
-written_rows:         0
-sleep_calls:          0
-sleep_us:             0
-profile_select_rows:  100
-profile_select_bytes: 1600
-profile_insert_rows:  0
-profile_insert_bytes: 0
 Row 1:
 ──────
 stage:                Query log rows 2
diff --git a/tests/queries/0_stateless/01927_query_views_log_current_database.sql b/tests/queries/0_stateless/01927_query_views_log_current_database.sql
index fbfbeab0167..ba42795333c 100644
--- a/tests/queries/0_stateless/01927_query_views_log_current_database.sql
+++ b/tests/queries/0_stateless/01927_query_views_log_current_database.sql
@@ -1,4 +1,3 @@
-SET allow_experimental_live_view = 1;
 SET log_queries=0;
 SET log_query_threads=0;
 
@@ -16,11 +15,6 @@ CREATE MATERIALIZED VIEW matview_a_to_b TO table_b AS SELECT toFloat64(a) AS a,
 CREATE MATERIALIZED VIEW matview_b_to_c TO table_c AS SELECT SUM(a + sleepEachRow(0.000002)) as a FROM table_b;
 CREATE MATERIALIZED VIEW matview_join_d_e TO table_f AS SELECT table_d.a as a, table_e.count + sleepEachRow(0.000003) as count FROM table_d LEFT JOIN table_e ON table_d.a = table_e.a;
 
--- SETUP LIVE VIEW
----- table_b_live_view (Int64)
-DROP TABLE IF EXISTS table_b_live_view;
-CREATE LIVE VIEW table_b_live_view AS SELECT sum(a + b) FROM table_b;
-
 -- ENABLE LOGS
 SET log_query_views=1;
 SET log_queries_min_type='QUERY_FINISH';
@@ -36,7 +30,6 @@ SYSTEM FLUSH LOGS;
 
 
 -- CHECK LOGS OF INSERT 1
--- Note that live views currently don't report written rows
 SELECT
     'Query log rows' as stage,
     read_rows,
@@ -133,7 +126,6 @@ ORDER BY view_name
 FORMAT Vertical;
 
 -- TEARDOWN
-DROP TABLE table_b_live_view;
 DROP TABLE matview_a_to_b;
 DROP TABLE matview_b_to_c;
 DROP TABLE matview_join_d_e;
diff --git a/tests/queries/0_stateless/01934_constexpr_aggregate_function_parameters.sql b/tests/queries/0_stateless/01934_constexpr_aggregate_function_parameters.sql
index 730313f1daa..95d411c4cec 100644
--- a/tests/queries/0_stateless/01934_constexpr_aggregate_function_parameters.sql
+++ b/tests/queries/0_stateless/01934_constexpr_aggregate_function_parameters.sql
@@ -1,12 +1,10 @@
-SET allow_experimental_analyzer = 1;
-
 SELECT groupArray(2 + 3)(number) FROM numbers(10);
 SELECT groupArray('5'::UInt8)(number) FROM numbers(10);
 
 SELECT groupArray(NULL)(number) FROM numbers(10); -- { serverError 36 }
 SELECT groupArray(NULL + NULL)(number) FROM numbers(10); -- { serverError 36 }
 SELECT groupArray([])(number) FROM numbers(10); -- { serverError 36 }
-SELECT groupArray(throwIf(1))(number) FROM numbers(10); -- { serverError 36 }
+SELECT groupArray(throwIf(1))(number) FROM numbers(10); -- { serverError 36, 134 }
 
 -- Not the best error message, can be improved.
-SELECT groupArray(number)(number) FROM numbers(10); -- { serverError 36 }
+SELECT groupArray(number)(number) FROM numbers(10); -- { serverError 36, 47 }
diff --git a/tests/queries/0_stateless/01936_quantiles_cannot_return_null.sql b/tests/queries/0_stateless/01936_quantiles_cannot_return_null.sql
index 81ac6224268..46fd8adf570 100644
--- a/tests/queries/0_stateless/01936_quantiles_cannot_return_null.sql
+++ b/tests/queries/0_stateless/01936_quantiles_cannot_return_null.sql
@@ -1,9 +1,9 @@
 set aggregate_functions_null_for_empty=0;
 
-SELECT quantiles(0.95)(x)　FROM　(SELECT 1 x WHERE 0);
-SELECT quantiles(0.95)(number)　FROM　(SELECT number FROM numbers(10) WHERE number > 10);
+SELECT quantiles(0.95)(x) FROM (SELECT 1 x WHERE 0);
+SELECT quantiles(0.95)(number) FROM (SELECT number FROM numbers(10) WHERE number > 10);
 
 set aggregate_functions_null_for_empty=1;
 
-SELECT quantiles(0.95)(x)　FROM　(SELECT 1 x WHERE 0);
-SELECT quantiles(0.95)(number)　FROM　(SELECT number FROM numbers(10) WHERE number > 10);
+SELECT quantiles(0.95)(x) FROM (SELECT 1 x WHERE 0);
+SELECT quantiles(0.95)(number) FROM (SELECT number FROM numbers(10) WHERE number > 10);
diff --git a/tests/queries/0_stateless/01936_three_parts_identifiers_in_wrong_places.sql b/tests/queries/0_stateless/01936_three_parts_identifiers_in_wrong_places.sql
index d2ca771edc5..83dd708c575 100644
--- a/tests/queries/0_stateless/01936_three_parts_identifiers_in_wrong_places.sql
+++ b/tests/queries/0_stateless/01936_three_parts_identifiers_in_wrong_places.sql
@@ -1,7 +1,9 @@
-SELECT dictGet(t.nest.a, concat(currentDatabase(), '.dict.dict'), 's', number) FROM numbers(5); -- { serverError 47 }
+SET allow_experimental_analyzer = 1;
 
-SELECT dictGetFloat64(t.b.s, 'database_for_dict.dict1', dictGetFloat64('Ta\0', toUInt64('databas\0_for_dict.dict1databas\0_for_dict.dict1', dictGetFloat64('', '', toUInt64(1048577), toDate(NULL)), NULL), toDate(dictGetFloat64(257, 'database_for_dict.dict1database_for_dict.dict1', '', toUInt64(NULL), 2, toDate(NULL)), '2019-05-2\0')), NULL, toUInt64(dictGetFloat64('', '', toUInt64(-9223372036854775808), toDate(NULL)), NULL)); -- { serverError 47 }
+SELECT dictGet(t.nest.a, concat(currentDatabase(), '.dict.dict'), 's', number) FROM numbers(5); -- { serverError 36 }
 
-SELECT NULL AND (2147483648 AND NULL) AND -2147483647, toUUID(((1048576 AND NULL) AND (2147483647 AND 257 AND NULL AND -2147483649) AND NULL) IN (test_01103.t1_distr.id), '00000000-e1fe-11e\0-bb8f\0853d60c00749'), stringToH3('89184926cc3ffff89184926cc3ffff89184926cc3ffff89184926cc3ffff89184926cc3ffff89184926cc3ffff89184926cc3ffff89184926cc3ffff'); -- { serverError 47 }
+SELECT dictGetFloat64(t.b.s, 'database_for_dict.dict1', dictGetFloat64('Ta\0', toUInt64('databas\0_for_dict.dict1databas\0_for_dict.dict1', dictGetFloat64('', '', toUInt64(1048577), toDate(NULL)), NULL), toDate(dictGetFloat64(257, 'database_for_dict.dict1database_for_dict.dict1', '', toUInt64(NULL), 2, toDate(NULL)), '2019-05-2\0')), NULL, toUInt64(dictGetFloat64('', '', toUInt64(-9223372036854775808), toDate(NULL)), NULL)); -- { serverError 36 }
+
+SELECT NULL AND (2147483648 AND NULL) AND -2147483647, toUUID(((1048576 AND NULL) AND (2147483647 AND 257 AND NULL AND -2147483649) AND NULL) IN (test_01103.t1_distr.id), '00000000-e1fe-11e\0-bb8f\0853d60c00749'), stringToH3('89184926cc3ffff89184926cc3ffff89184926cc3ffff89184926cc3ffff89184926cc3ffff89184926cc3ffff89184926cc3ffff89184926cc3ffff'); -- { serverError 36 }
 
 SELECT 'still alive';
diff --git a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
index 47cf6e06b48..2f8d8f06dee 100755
--- a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
+++ b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
@@ -15,8 +15,8 @@ ${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
 set min_chunk_bytes_for_parallel_parsing=10485760;
 set max_read_buffer_size = 65536;
 set input_format_parallel_parsing = 0;
-select * from file('test_01946.zstd', 'JSONEachRow', 'foo String') limit 30 format Null;
+select * from file('test_01946.zstd', 'JSONEachRow', 'foo String') order by foo limit 30 format Null;
 set input_format_parallel_parsing = 1;
-select * from file('test_01946.zstd', 'JSONEachRow', 'foo String') limit 30 format Null;
+select * from file('test_01946.zstd', 'JSONEachRow', 'foo String') order by foo limit 30 format Null;
 "
 
diff --git a/tests/queries/0_stateless/01951_distributed_push_down_limit.reference b/tests/queries/0_stateless/01951_distributed_push_down_limit.reference
index 7f73a8c6554..b9a7d17e955 100644
--- a/tests/queries/0_stateless/01951_distributed_push_down_limit.reference
+++ b/tests/queries/0_stateless/01951_distributed_push_down_limit.reference
@@ -13,8 +13,7 @@ Expression (Projection)
   Limit (preliminary LIMIT (without OFFSET))
     Sorting (Merge sorted streams after aggregation stage for ORDER BY)
       Union
-        Limit (preliminary LIMIT (with OFFSET))
-          Sorting (Sorting for ORDER BY)
-            Expression ((Before ORDER BY + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY)))))
-              ReadFromStorage (SystemNumbers)
+        Sorting (Sorting for ORDER BY)
+          Expression ((Before ORDER BY + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY)))))
+            ReadFromStorage (SystemNumbers)
         ReadFromRemote (Read from remote replica)
diff --git a/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.reference b/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.reference
index f2322e4ffc4..e39f4b962e6 100644
--- a/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.reference
+++ b/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.reference
@@ -1 +1,10 @@
-Connection failed at try №1,
+255.255.255.255
+HedgedConnectionsFactory: Connection failed at try №1
+executeQuery: Code: 519.: All attempts to get table structure failed.
+127.2,255.255.255.255
+0
+HedgedConnectionsFactory: Connection failed at try №1
+255.255.255.255,127.2
+0
+HedgedConnectionsFactory: Connection failed at try №1
+HedgedConnectionsFactory: Connection failed at try №1
diff --git a/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh b/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
index 3ddb6346631..488e2fe106a 100755
--- a/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
+++ b/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
@@ -1,14 +1,36 @@
 #!/usr/bin/env bash
-# Tags: shard
-
-CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=trace
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-opts=(
-    "--connections_with_failover_max_tries=1"
-    "--skip_unavailable_shards=1"
-)
-$CLICKHOUSE_CLIENT --query "select * from remote('255.255.255.255', system.one)" "${opts[@]}" 2>&1 | grep -o 'Connection failed at try.*,'
+stderr="$(mktemp "$CURDIR/clickhouse.stderr.XXXXXX.log")"
+trap 'rm -f "$stderr"' EXIT
+
+function process_log_safe()
+{
+    grep "^\\[" "$@" | sed -e 's/.*> //' -e 's/, reason.*//' -e 's/ DB::NetException//' -e 's/ Log: //'
+}
+function execute_query()
+{
+    local hosts=$1 && shift
+    local opts=(
+        "--connections_with_failover_max_tries=1"
+        "--skip_unavailable_shards=1"
+    )
+
+    echo "$hosts"
+    # NOTE: we cannot use process substition here for simplicity because they are async, i.e.:
+    #
+    #   clickhouse-client 2> >(wc -l)
+    #
+    # May dump output of "wc -l" after some other programs.
+    $CLICKHOUSE_CLIENT "${opts[@]}" --query "select * from remote('$hosts', system.one)" 2>"$stderr"
+    process_log_safe "$stderr"
+}
+execute_query 255.255.255.255
+execute_query 127.2,255.255.255.255
+# This will print two errors because there will be two attempts for 255.255.255.255:
+# - first for obtaining structure of the table
+# - second for the query
+execute_query 255.255.255.255,127.2
diff --git a/tests/queries/0_stateless/02001_append_output_file.reference b/tests/queries/0_stateless/02001_append_output_file.reference
new file mode 100644
index 00000000000..6f51dfc24e1
--- /dev/null
+++ b/tests/queries/0_stateless/02001_append_output_file.reference
@@ -0,0 +1,2 @@
+Hello, World! From client.
+Hello, World! From local.
diff --git a/tests/queries/0_stateless/02001_append_output_file.sh b/tests/queries/0_stateless/02001_append_output_file.sh
new file mode 100755
index 00000000000..47ac0183d91
--- /dev/null
+++ b/tests/queries/0_stateless/02001_append_output_file.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+
+[ -e "${CLICKHOUSE_TMP}"/test_append_to_output_file ] && rm "${CLICKHOUSE_TMP}"/test_append_to_output_file
+
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM (SELECT 'Hello, World! From client.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_append_to_output_file'"
+${CLICKHOUSE_LOCAL} --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_append_to_output_file' APPEND"
+cat ${CLICKHOUSE_TMP}/test_append_to_output_file
+
+rm -f "${CLICKHOUSE_TMP}/test_append_to_output_file"
diff --git a/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql b/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
index 7d9c08c7cb6..8ac8dc35276 100644
--- a/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
+++ b/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
@@ -4,4 +4,4 @@ SELECT
     cityHash64(number GLOBAL IN (NULL, -2147483648, -9223372036854775808), nan, 1024, NULL, NULL, 1.000100016593933, NULL),
     (NULL, cityHash64(inf, -2147483648, NULL, NULL, 10.000100135803223), cityHash64(1.1754943508222875e-38, NULL, NULL, NULL), 2147483647)
 FROM cluster(test_cluster_two_shards_localhost, numbers((NULL, cityHash64(0., 65536, NULL, NULL, 10000000000., NULL), 0) GLOBAL IN (some_identifier), 65536))
-WHERE number GLOBAL IN [1025] --{serverError 284}
+WHERE number GLOBAL IN [1025] --{serverError 36, 284}
diff --git a/tests/queries/0_stateless/02006_test_positional_arguments.reference b/tests/queries/0_stateless/02006_test_positional_arguments.reference
index e2bbea2149d..40100e8d5be 100644
--- a/tests/queries/0_stateless/02006_test_positional_arguments.reference
+++ b/tests/queries/0_stateless/02006_test_positional_arguments.reference
@@ -86,8 +86,8 @@ FROM test
 GROUP BY
     1 + greatest(x1, 1),
     x2
-select max(x1), x2 from test group by 1, 2; -- { serverError 43 }
-select 1 + max(x1), x2 from test group by 1, 2; -- { serverError 43 }
+select max(x1), x2 from test group by 1, 2; -- { serverError 43, 184 }
+select 1 + max(x1), x2 from test group by 1, 2; -- { serverError 43, 184 }
 explain syntax select x1 + x3, x3 from test group by 1, 2;
 SELECT
     x1 + x3,
diff --git a/tests/queries/0_stateless/02006_test_positional_arguments.sql b/tests/queries/0_stateless/02006_test_positional_arguments.sql
index 67f4fe24c55..159ad6bd427 100644
--- a/tests/queries/0_stateless/02006_test_positional_arguments.sql
+++ b/tests/queries/0_stateless/02006_test_positional_arguments.sql
@@ -30,8 +30,8 @@ explain syntax select x3, if(x3 > 10, x3, plus(x1, x2)), x1 + x2 from test order
 explain syntax select max(x1), x2 from test group by 2 order by 1, 2;
 explain syntax select 1 + greatest(x1, 1), x2 from test group by 1, 2;
 
-select max(x1), x2 from test group by 1, 2; -- { serverError 43 }
-select 1 + max(x1), x2 from test group by 1, 2; -- { serverError 43 }
+select max(x1), x2 from test group by 1, 2; -- { serverError 43, 184 }
+select 1 + max(x1), x2 from test group by 1, 2; -- { serverError 43, 184 }
 
 explain syntax select x1 + x3, x3 from test group by 1, 2;
 
diff --git a/tests/queries/0_stateless/02008_materialize_column.sql b/tests/queries/0_stateless/02008_materialize_column.sql
index 8a8eb2afe83..a78920d2525 100644
--- a/tests/queries/0_stateless/02008_materialize_column.sql
+++ b/tests/queries/0_stateless/02008_materialize_column.sql
@@ -8,33 +8,33 @@ INSERT INTO tmp SELECT * FROM system.numbers LIMIT 20;
 ALTER TABLE tmp MATERIALIZE COLUMN x; -- { serverError 36 }
 
 ALTER TABLE tmp ADD COLUMN s String DEFAULT toString(x);
-SELECT groupArray(x), groupArray(s) FROM tmp;
+SELECT arraySort(arraySort(groupArray(x))), groupArray(s) FROM tmp;
 
 ALTER TABLE tmp MODIFY COLUMN s String DEFAULT toString(x+1);
-SELECT groupArray(x), groupArray(s) FROM tmp;
+SELECT arraySort(groupArray(x)), groupArray(s) FROM tmp;
 
 ALTER TABLE tmp MATERIALIZE COLUMN s;
 ALTER TABLE tmp MODIFY COLUMN s String DEFAULT toString(x+2);
-SELECT groupArray(x), groupArray(s) FROM tmp;
+SELECT arraySort(groupArray(x)), groupArray(s) FROM tmp;
 
 ALTER TABLE tmp MATERIALIZE COLUMN s;
 ALTER TABLE tmp MODIFY COLUMN s String DEFAULT toString(x+3);
-SELECT groupArray(x), groupArray(s) FROM tmp;
+SELECT arraySort(groupArray(x)), groupArray(s) FROM tmp;
 ALTER TABLE tmp DROP COLUMN s;
 
 ALTER TABLE tmp ADD COLUMN s String MATERIALIZED toString(x);
-SELECT groupArray(x), groupArray(s) FROM tmp;
+SELECT arraySort(groupArray(x)), groupArray(s) FROM tmp;
 
 ALTER TABLE tmp MODIFY COLUMN s String MATERIALIZED toString(x+1);
-SELECT groupArray(x), groupArray(s) FROM tmp;
+SELECT arraySort(groupArray(x)), groupArray(s) FROM tmp;
 
 ALTER TABLE tmp MATERIALIZE COLUMN s;
 ALTER TABLE tmp MODIFY COLUMN s String MATERIALIZED toString(x+2);
-SELECT groupArray(x), groupArray(s) FROM tmp;
+SELECT arraySort(groupArray(x)), groupArray(s) FROM tmp;
 
 ALTER TABLE tmp MATERIALIZE COLUMN s;
 ALTER TABLE tmp MODIFY COLUMN s String MATERIALIZED toString(x+3);
-SELECT groupArray(x), groupArray(s) FROM tmp;
+SELECT arraySort(groupArray(x)), groupArray(s) FROM tmp;
 ALTER TABLE tmp DROP COLUMN s;
 
 DROP TABLE tmp;
diff --git a/tests/queries/0_stateless/02008_tuple_to_name_value_pairs.sql b/tests/queries/0_stateless/02008_tuple_to_name_value_pairs.sql
index 59987a86590..1f6026bb61e 100644
--- a/tests/queries/0_stateless/02008_tuple_to_name_value_pairs.sql
+++ b/tests/queries/0_stateless/02008_tuple_to_name_value_pairs.sql
@@ -19,7 +19,7 @@ INSERT INTO test02008 VALUES (tuple(3.3, 5.5, 6.6));
 SELECT untuple(arrayJoin(tupleToNameValuePairs(col))) from test02008;
 
 DROP TABLE IF EXISTS test02008;
-SELECT tupleToNameValuePairs(tuple(1, 1.3)); -- { serverError 43; }
-SELECT tupleToNameValuePairs(tuple(1, [1,2])); -- { serverError 43; }
-SELECT tupleToNameValuePairs(tuple(1, 'a')); -- { serverError 43; }
-SELECT tupleToNameValuePairs(33); -- { serverError 43; }
+SELECT tupleToNameValuePairs(tuple(1, 1.3)); -- { serverError 43 }
+SELECT tupleToNameValuePairs(tuple(1, [1,2])); -- { serverError 43 }
+SELECT tupleToNameValuePairs(tuple(1, 'a')); -- { serverError 43 }
+SELECT tupleToNameValuePairs(33); -- { serverError 43 }
diff --git a/tests/queries/0_stateless/02010_lc_native.python b/tests/queries/0_stateless/02010_lc_native.python
index e6d6f9e1317..a197d32a3b9 100755
--- a/tests/queries/0_stateless/02010_lc_native.python
+++ b/tests/queries/0_stateless/02010_lc_native.python
@@ -5,13 +5,13 @@ import socket
 import os
 import uuid
 
-CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', '127.0.0.1')
-CLICKHOUSE_PORT = int(os.environ.get('CLICKHOUSE_PORT_TCP', '900000'))
-CLICKHOUSE_DATABASE = os.environ.get('CLICKHOUSE_DATABASE', 'default')
+CLICKHOUSE_HOST = os.environ.get("CLICKHOUSE_HOST", "127.0.0.1")
+CLICKHOUSE_PORT = int(os.environ.get("CLICKHOUSE_PORT_TCP", "900000"))
+CLICKHOUSE_DATABASE = os.environ.get("CLICKHOUSE_DATABASE", "default")
+
 
 def writeVarUInt(x, ba):
     for _ in range(0, 9):
-
         byte = x & 0x7F
         if x > 0x7F:
             byte |= 0x80
@@ -24,12 +24,12 @@ def writeVarUInt(x, ba):
 
 
 def writeStringBinary(s, ba):
-    b = bytes(s, 'utf-8')
+    b = bytes(s, "utf-8")
     writeVarUInt(len(s), ba)
     ba.extend(b)
 
 
-def readStrict(s, size = 1):
+def readStrict(s, size=1):
     res = bytearray()
     while size:
         cur = s.recv(size)
@@ -48,18 +48,23 @@ def readUInt(s, size=1):
         val += res[i] << (i * 8)
     return val
 
+
 def readUInt8(s):
     return readUInt(s)
 
+
 def readUInt16(s):
     return readUInt(s, 2)
 
+
 def readUInt32(s):
     return readUInt(s, 4)
 
+
 def readUInt64(s):
     return readUInt(s, 8)
 
+
 def readVarUInt(s):
     x = 0
     for i in range(9):
@@ -75,25 +80,25 @@ def readVarUInt(s):
 def readStringBinary(s):
     size = readVarUInt(s)
     s = readStrict(s, size)
-    return s.decode('utf-8')
+    return s.decode("utf-8")
 
 
 def sendHello(s):
     ba = bytearray()
-    writeVarUInt(0, ba) # Hello
-    writeStringBinary('simple native protocol', ba)
+    writeVarUInt(0, ba)  # Hello
+    writeStringBinary("simple native protocol", ba)
     writeVarUInt(21, ba)
     writeVarUInt(9, ba)
     writeVarUInt(54449, ba)
-    writeStringBinary('default', ba) # database
-    writeStringBinary('default', ba) # user
-    writeStringBinary('', ba) # pwd
+    writeStringBinary("default", ba)  # database
+    writeStringBinary("default", ba)  # user
+    writeStringBinary("", ba)  # pwd
     s.sendall(ba)
 
 
 def receiveHello(s):
     p_type = readVarUInt(s)
-    assert (p_type == 0) # Hello
+    assert p_type == 0  # Hello
     server_name = readStringBinary(s)
     # print("Server name: ", server_name)
     server_version_major = readVarUInt(s)
@@ -111,78 +116,79 @@ def receiveHello(s):
 
 
 def serializeClientInfo(ba, query_id):
-    writeStringBinary('default', ba) # initial_user
-    writeStringBinary(query_id, ba) # initial_query_id
-    writeStringBinary('127.0.0.1:9000', ba) # initial_address
-    ba.extend([0] * 8) # initial_query_start_time_microseconds
-    ba.append(1) # TCP
-    writeStringBinary('os_user', ba) # os_user
-    writeStringBinary('client_hostname', ba) # client_hostname
-    writeStringBinary('client_name', ba) # client_name
+    writeStringBinary("default", ba)  # initial_user
+    writeStringBinary(query_id, ba)  # initial_query_id
+    writeStringBinary("127.0.0.1:9000", ba)  # initial_address
+    ba.extend([0] * 8)  # initial_query_start_time_microseconds
+    ba.append(1)  # TCP
+    writeStringBinary("os_user", ba)  # os_user
+    writeStringBinary("client_hostname", ba)  # client_hostname
+    writeStringBinary("client_name", ba)  # client_name
     writeVarUInt(21, ba)
     writeVarUInt(9, ba)
     writeVarUInt(54449, ba)
-    writeStringBinary('', ba) # quota_key
-    writeVarUInt(0, ba) # distributed_depth
-    writeVarUInt(1, ba) # client_version_patch
-    ba.append(0) # No telemetry
+    writeStringBinary("", ba)  # quota_key
+    writeVarUInt(0, ba)  # distributed_depth
+    writeVarUInt(1, ba)  # client_version_patch
+    ba.append(0)  # No telemetry
 
 
 def sendQuery(s, query):
     ba = bytearray()
     query_id = uuid.uuid4().hex
-    writeVarUInt(1, ba) # query
+    writeVarUInt(1, ba)  # query
     writeStringBinary(query_id, ba)
 
-    ba.append(1) # INITIAL_QUERY
+    ba.append(1)  # INITIAL_QUERY
 
     # client info
     serializeClientInfo(ba, query_id)
 
-    writeStringBinary('', ba) # No settings
-    writeStringBinary('', ba) # No interserver secret
-    writeVarUInt(2, ba) # Stage - Complete
-    ba.append(0) # No compression
-    writeStringBinary(query, ba) # query, finally
+    writeStringBinary("", ba)  # No settings
+    writeStringBinary("", ba)  # No interserver secret
+    writeVarUInt(2, ba)  # Stage - Complete
+    ba.append(0)  # No compression
+    writeStringBinary(query, ba)  # query, finally
     s.sendall(ba)
 
 
 def serializeBlockInfo(ba):
-    writeVarUInt(1, ba) # 1
-    ba.append(0) # is_overflows
-    writeVarUInt(2, ba) # 2
-    writeVarUInt(0, ba) # 0
-    ba.extend([0] * 4) # bucket_num
+    writeVarUInt(1, ba)  # 1
+    ba.append(0)  # is_overflows
+    writeVarUInt(2, ba)  # 2
+    writeVarUInt(0, ba)  # 0
+    ba.extend([0] * 4)  # bucket_num
 
 
 def sendEmptyBlock(s):
     ba = bytearray()
-    writeVarUInt(2, ba) # Data
-    writeStringBinary('', ba)
+    writeVarUInt(2, ba)  # Data
+    writeStringBinary("", ba)
     serializeBlockInfo(ba)
-    writeVarUInt(0, ba) # rows
-    writeVarUInt(0, ba) # columns
+    writeVarUInt(0, ba)  # rows
+    writeVarUInt(0, ba)  # columns
     s.sendall(ba)
 
 
 def assertPacket(packet, expected):
-    assert(packet == expected), packet
+    assert packet == expected, packet
+
 
 def readHeader(s):
     packet_type = readVarUInt(s)
-    if packet_type == 2: # Exception
+    if packet_type == 2:  # Exception
         raise RuntimeError(readException(s))
-    assertPacket(packet_type, 1) # Data
+    assertPacket(packet_type, 1)  # Data
 
-    readStringBinary(s) # external table name
+    readStringBinary(s)  # external table name
     # BlockInfo
-    assertPacket(readVarUInt(s), 1) # 1
-    assertPacket(readUInt8(s), 0) # is_overflows
-    assertPacket(readVarUInt(s), 2) # 2
-    assertPacket(readUInt32(s), 4294967295) # bucket_num
-    assertPacket(readVarUInt(s), 0) # 0
-    columns = readVarUInt(s) # rows
-    rows = readVarUInt(s) # columns
+    assertPacket(readVarUInt(s), 1)  # 1
+    assertPacket(readUInt8(s), 0)  # is_overflows
+    assertPacket(readVarUInt(s), 2)  # 2
+    assertPacket(readUInt32(s), 4294967295)  # bucket_num
+    assertPacket(readVarUInt(s), 0)  # 0
+    columns = readVarUInt(s)  # rows
+    rows = readVarUInt(s)  # columns
     print("Rows {} Columns {}".format(rows, columns))
     for _ in range(columns):
         col_name = readStringBinary(s)
@@ -194,9 +200,9 @@ def readException(s):
     code = readUInt32(s)
     name = readStringBinary(s)
     text = readStringBinary(s)
-    readStringBinary(s) # trace
-    assertPacket(readUInt8(s), 0) # has_nested
-    return "code {}: {}".format(code, text.replace('DB::Exception:', ''))
+    readStringBinary(s)  # trace
+    assertPacket(readUInt8(s), 0)  # has_nested
+    return "code {}: {}".format(code, text.replace("DB::Exception:", ""))
 
 
 def insertValidLowCardinalityRow():
@@ -205,7 +211,12 @@ def insertValidLowCardinalityRow():
         s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
         sendHello(s)
         receiveHello(s)
-        sendQuery(s, 'insert into {}.tab settings input_format_defaults_for_omitted_fields=0 format TSV'.format(CLICKHOUSE_DATABASE))
+        sendQuery(
+            s,
+            "insert into {}.tab settings input_format_defaults_for_omitted_fields=0 format TSV".format(
+                CLICKHOUSE_DATABASE
+            ),
+        )
 
         # external tables
         sendEmptyBlock(s)
@@ -213,25 +224,27 @@ def insertValidLowCardinalityRow():
 
         # Data
         ba = bytearray()
-        writeVarUInt(2, ba) # Data
-        writeStringBinary('', ba)
+        writeVarUInt(2, ba)  # Data
+        writeStringBinary("", ba)
         serializeBlockInfo(ba)
-        writeVarUInt(1, ba) # rows
-        writeVarUInt(1, ba) # columns
-        writeStringBinary('x', ba)
-        writeStringBinary('LowCardinality(String)', ba)
-        ba.extend([1] + [0] * 7) # SharedDictionariesWithAdditionalKeys
-        ba.extend([3, 2] + [0] * 6) # indexes type: UInt64 [3], with additional keys [2]
-        ba.extend([1] + [0] * 7) # num_keys in dict
-        writeStringBinary('hello', ba) # key
-        ba.extend([1] + [0] * 7) # num_indexes
-        ba.extend([0] * 8) # UInt64 index (0 for 'hello')
+        writeVarUInt(1, ba)  # rows
+        writeVarUInt(1, ba)  # columns
+        writeStringBinary("x", ba)
+        writeStringBinary("LowCardinality(String)", ba)
+        ba.extend([1] + [0] * 7)  # SharedDictionariesWithAdditionalKeys
+        ba.extend(
+            [3, 2] + [0] * 6
+        )  # indexes type: UInt64 [3], with additional keys [2]
+        ba.extend([1] + [0] * 7)  # num_keys in dict
+        writeStringBinary("hello", ba)  # key
+        ba.extend([1] + [0] * 7)  # num_indexes
+        ba.extend([0] * 8)  # UInt64 index (0 for 'hello')
         s.sendall(ba)
 
         # Fin block
         sendEmptyBlock(s)
 
-        assertPacket(readVarUInt(s), 5) # End of stream
+        assertPacket(readVarUInt(s), 5)  # End of stream
         s.close()
 
 
@@ -241,7 +254,12 @@ def insertLowCardinalityRowWithIndexOverflow():
         s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
         sendHello(s)
         receiveHello(s)
-        sendQuery(s, 'insert into {}.tab settings input_format_defaults_for_omitted_fields=0 format TSV'.format(CLICKHOUSE_DATABASE))
+        sendQuery(
+            s,
+            "insert into {}.tab settings input_format_defaults_for_omitted_fields=0 format TSV".format(
+                CLICKHOUSE_DATABASE
+            ),
+        )
 
         # external tables
         sendEmptyBlock(s)
@@ -249,19 +267,21 @@ def insertLowCardinalityRowWithIndexOverflow():
 
         # Data
         ba = bytearray()
-        writeVarUInt(2, ba) # Data
-        writeStringBinary('', ba)
+        writeVarUInt(2, ba)  # Data
+        writeStringBinary("", ba)
         serializeBlockInfo(ba)
-        writeVarUInt(1, ba) # rows
-        writeVarUInt(1, ba) # columns
-        writeStringBinary('x', ba)
-        writeStringBinary('LowCardinality(String)', ba)
-        ba.extend([1] + [0] * 7) # SharedDictionariesWithAdditionalKeys
-        ba.extend([3, 2] + [0] * 6) # indexes type: UInt64 [3], with additional keys [2]
-        ba.extend([1] + [0] * 7) # num_keys in dict
-        writeStringBinary('hello', ba) # key
-        ba.extend([1] + [0] * 7) # num_indexes
-        ba.extend([0] * 7 + [1]) # UInt64 index (overflow)
+        writeVarUInt(1, ba)  # rows
+        writeVarUInt(1, ba)  # columns
+        writeStringBinary("x", ba)
+        writeStringBinary("LowCardinality(String)", ba)
+        ba.extend([1] + [0] * 7)  # SharedDictionariesWithAdditionalKeys
+        ba.extend(
+            [3, 2] + [0] * 6
+        )  # indexes type: UInt64 [3], with additional keys [2]
+        ba.extend([1] + [0] * 7)  # num_keys in dict
+        writeStringBinary("hello", ba)  # key
+        ba.extend([1] + [0] * 7)  # num_indexes
+        ba.extend([0] * 7 + [1])  # UInt64 index (overflow)
         s.sendall(ba)
 
         assertPacket(readVarUInt(s), 2)
@@ -275,7 +295,12 @@ def insertLowCardinalityRowWithIncorrectDictType():
         s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
         sendHello(s)
         receiveHello(s)
-        sendQuery(s, 'insert into {}.tab settings input_format_defaults_for_omitted_fields=0 format TSV'.format(CLICKHOUSE_DATABASE))
+        sendQuery(
+            s,
+            "insert into {}.tab settings input_format_defaults_for_omitted_fields=0 format TSV".format(
+                CLICKHOUSE_DATABASE
+            ),
+        )
 
         # external tables
         sendEmptyBlock(s)
@@ -283,32 +308,40 @@ def insertLowCardinalityRowWithIncorrectDictType():
 
         # Data
         ba = bytearray()
-        writeVarUInt(2, ba) # Data
-        writeStringBinary('', ba)
+        writeVarUInt(2, ba)  # Data
+        writeStringBinary("", ba)
         serializeBlockInfo(ba)
-        writeVarUInt(1, ba) # rows
-        writeVarUInt(1, ba) # columns
-        writeStringBinary('x', ba)
-        writeStringBinary('LowCardinality(String)', ba)
-        ba.extend([1] + [0] * 7) # SharedDictionariesWithAdditionalKeys
-        ba.extend([3, 3] + [0] * 6) # indexes type: UInt64 [3], with global dict and add keys [1 + 2]
-        ba.extend([1] + [0] * 7) # num_keys in dict
-        writeStringBinary('hello', ba) # key
-        ba.extend([1] + [0] * 7) # num_indexes
-        ba.extend([0] * 8) # UInt64 index (overflow)
+        writeVarUInt(1, ba)  # rows
+        writeVarUInt(1, ba)  # columns
+        writeStringBinary("x", ba)
+        writeStringBinary("LowCardinality(String)", ba)
+        ba.extend([1] + [0] * 7)  # SharedDictionariesWithAdditionalKeys
+        ba.extend(
+            [3, 3] + [0] * 6
+        )  # indexes type: UInt64 [3], with global dict and add keys [1 + 2]
+        ba.extend([1] + [0] * 7)  # num_keys in dict
+        writeStringBinary("hello", ba)  # key
+        ba.extend([1] + [0] * 7)  # num_indexes
+        ba.extend([0] * 8)  # UInt64 index (overflow)
         s.sendall(ba)
 
         assertPacket(readVarUInt(s), 2)
         print(readException(s))
         s.close()
 
+
 def insertLowCardinalityRowWithIncorrectAdditionalKeys():
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.settimeout(30)
         s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
         sendHello(s)
         receiveHello(s)
-        sendQuery(s, 'insert into {}.tab settings input_format_defaults_for_omitted_fields=0 format TSV'.format(CLICKHOUSE_DATABASE))
+        sendQuery(
+            s,
+            "insert into {}.tab settings input_format_defaults_for_omitted_fields=0 format TSV".format(
+                CLICKHOUSE_DATABASE
+            ),
+        )
 
         # external tables
         sendEmptyBlock(s)
@@ -316,30 +349,34 @@ def insertLowCardinalityRowWithIncorrectAdditionalKeys():
 
         # Data
         ba = bytearray()
-        writeVarUInt(2, ba) # Data
-        writeStringBinary('', ba)
+        writeVarUInt(2, ba)  # Data
+        writeStringBinary("", ba)
         serializeBlockInfo(ba)
-        writeVarUInt(1, ba) # rows
-        writeVarUInt(1, ba) # columns
-        writeStringBinary('x', ba)
-        writeStringBinary('LowCardinality(String)', ba)
-        ba.extend([1] + [0] * 7) # SharedDictionariesWithAdditionalKeys
-        ba.extend([3, 0] + [0] * 6) # indexes type: UInt64 [3], with  NO additional keys [0]
-        ba.extend([1] + [0] * 7) # num_keys in dict
-        writeStringBinary('hello', ba) # key
-        ba.extend([1] + [0] * 7) # num_indexes
-        ba.extend([0] * 8) # UInt64 index (0 for 'hello')
+        writeVarUInt(1, ba)  # rows
+        writeVarUInt(1, ba)  # columns
+        writeStringBinary("x", ba)
+        writeStringBinary("LowCardinality(String)", ba)
+        ba.extend([1] + [0] * 7)  # SharedDictionariesWithAdditionalKeys
+        ba.extend(
+            [3, 0] + [0] * 6
+        )  # indexes type: UInt64 [3], with  NO additional keys [0]
+        ba.extend([1] + [0] * 7)  # num_keys in dict
+        writeStringBinary("hello", ba)  # key
+        ba.extend([1] + [0] * 7)  # num_indexes
+        ba.extend([0] * 8)  # UInt64 index (0 for 'hello')
         s.sendall(ba)
 
         assertPacket(readVarUInt(s), 2)
         print(readException(s))
         s.close()
 
+
 def main():
     insertValidLowCardinalityRow()
     insertLowCardinalityRowWithIndexOverflow()
     insertLowCardinalityRowWithIncorrectDictType()
     insertLowCardinalityRowWithIncorrectAdditionalKeys()
 
+
 if __name__ == "__main__":
     main()
diff --git a/tests/queries/0_stateless/02015_async_inserts_4.sh b/tests/queries/0_stateless/02015_async_inserts_4.sh
index 65598923b96..28f0e250630 100755
--- a/tests/queries/0_stateless/02015_async_inserts_4.sh
+++ b/tests/queries/0_stateless/02015_async_inserts_4.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02015_async_inserts_7.sh b/tests/queries/0_stateless/02015_async_inserts_7.sh
index c8cbbc48a29..29f908cdc90 100755
--- a/tests/queries/0_stateless/02015_async_inserts_7.sh
+++ b/tests/queries/0_stateless/02015_async_inserts_7.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02016_aggregation_spark_bar.reference b/tests/queries/0_stateless/02016_aggregation_spark_bar.reference
index 534942fc1d5..35a629d2bc0 100644
--- a/tests/queries/0_stateless/02016_aggregation_spark_bar.reference
+++ b/tests/queries/0_stateless/02016_aggregation_spark_bar.reference
@@ -46,7 +46,7 @@ SELECT sparkbar(5,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) FRO
 ▃▄▆█ 
 SELECT sparkbar(9,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) FROM spark_bar_test;
 ▂▅▂▃▇▆█  
-WITH number DIV 50 AS k, number % 50 AS value SELECT k, sparkbar(50, 0, 99)(number, value) FROM numbers(100) GROUP BY k ORDER BY k;
+WITH number DIV 50 AS k, toUInt32(number % 50) AS value SELECT k, sparkbar(50, 0, 99)(number, value) FROM numbers(100) GROUP BY k ORDER BY k;
 0	▁▁▁▁▂▂▂▃▃▃▃▄▄▄▅▅▅▅▆▆▆▇▇▇█                         
 1	                         ▁▁▁▁▂▂▂▃▃▃▃▄▄▄▅▅▅▅▆▆▆▇▇▇█
 SELECT sparkbar(128, 0, 9223372036854775806)(toUInt64(9223372036854775806), number % 65535) FROM numbers(100);
@@ -54,7 +54,7 @@ SELECT sparkbar(128, 0, 9223372036854775806)(toUInt64(9223372036854775806), numb
 SELECT sparkbar(128)(toUInt64(9223372036854775806), number % 65535) FROM numbers(100);
 █
 SELECT sparkbar(9)(x, y) FROM (SELECT * FROM Values('x UInt64, y UInt8', (18446744073709551615,255), (0,0), (0,0), (4036797895307271799,254)));
- ▇      █
+ █      █
 SELECT sparkbar(8, 0, 7)((number + 1) % 8, 1), sparkbar(8, 0, 7)((number + 2) % 8, 1), sparkbar(8, 0, 7)((number + 3) % 8, 1) FROM numbers(7);
  ███████	█ ██████	██ █████
 SELECT sparkbar(2)(number, -number) FROM numbers(10);
diff --git a/tests/queries/0_stateless/02016_aggregation_spark_bar.sql b/tests/queries/0_stateless/02016_aggregation_spark_bar.sql
index 2100a3dd4a6..4d2de566eda 100644
--- a/tests/queries/0_stateless/02016_aggregation_spark_bar.sql
+++ b/tests/queries/0_stateless/02016_aggregation_spark_bar.sql
@@ -33,7 +33,7 @@ SELECT sparkbar(4,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) FRO
 SELECT sparkbar(5,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) FROM spark_bar_test;
 SELECT sparkbar(9,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) FROM spark_bar_test;
 
-WITH number DIV 50 AS k, number % 50 AS value SELECT k, sparkbar(50, 0, 99)(number, value) FROM numbers(100) GROUP BY k ORDER BY k;
+WITH number DIV 50 AS k, toUInt32(number % 50) AS value SELECT k, sparkbar(50, 0, 99)(number, value) FROM numbers(100) GROUP BY k ORDER BY k;
 
 SELECT sparkbar(128, 0, 9223372036854775806)(toUInt64(9223372036854775806), number % 65535) FROM numbers(100);
 SELECT sparkbar(128)(toUInt64(9223372036854775806), number % 65535) FROM numbers(100);
@@ -59,4 +59,10 @@ SELECT sparkbar(2)(toInt32(number),  number) FROM numbers(10); -- { serverError
 SELECT sparkbar(2, 0)(number, number) FROM numbers(10); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 SELECT sparkbar(2, 0, 5, 8)(number, number) FROM numbers(10); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 
+-- it causes overflow, just check that it doesn't crash under UBSan, do not check the result it's not really reasonable
+SELECT sparkbar(10)(number, toInt64(number)) FROM numbers(toUInt64(9223372036854775807), 20) FORMAT Null;
+SELECT sparkbar(10)(number, -number) FROM numbers(toUInt64(9223372036854775807), 7) FORMAT Null;
+SELECT sparkbar(10)(number, number) FROM numbers(18446744073709551615, 7) FORMAT Null;
+SELECT sparkbar(16)(number, number) FROM numbers(18446744073709551600, 16) FORMAT Null;
+
 DROP TABLE IF EXISTS spark_bar_test;
diff --git a/tests/queries/0_stateless/02020_alter_table_modify_comment.sh b/tests/queries/0_stateless/02020_alter_table_modify_comment.sh
index c674f21034c..3448f052f51 100755
--- a/tests/queries/0_stateless/02020_alter_table_modify_comment.sh
+++ b/tests/queries/0_stateless/02020_alter_table_modify_comment.sh
@@ -43,7 +43,7 @@ EOF
     get_table_comment_info
 
     echo detach table
-    $CLICKHOUSE_CLIENT --query="DETACH TABLE comment_test_table NO DELAY;"
+    $CLICKHOUSE_CLIENT --query="DETACH TABLE comment_test_table SYNC;"
     get_table_comment_info
 
     echo re-attach table
diff --git a/tests/queries/0_stateless/02030_capnp_format.reference b/tests/queries/0_stateless/02030_capnp_format.reference
index 8c3c81b5bc3..2b2307bfc6a 100644
--- a/tests/queries/0_stateless/02030_capnp_format.reference
+++ b/tests/queries/0_stateless/02030_capnp_format.reference
@@ -50,4 +50,3 @@ OK
 OK
 OK
 OK
-OK
diff --git a/tests/queries/0_stateless/02030_capnp_format.sh b/tests/queries/0_stateless/02030_capnp_format.sh
index cdc1587bccd..c15d6fe442e 100755
--- a/tests/queries/0_stateless/02030_capnp_format.sh
+++ b/tests/queries/0_stateless/02030_capnp_format.sh
@@ -109,8 +109,6 @@ $CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint6
 $CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint64 Enum(\'one\' = 1)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
 $CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint64 Tuple(UInt64)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
 $CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint64 Nullable(UInt64)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
-$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint64 Int32') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
-
 
 $CLICKHOUSE_CLIENT --query="SELECT number AS a, toString(number) as b FROM numbers(5) FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_unnamed_union:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
 $CLICKHOUSE_CLIENT --query="SELECT toNullable(toString(number)) as nullable1 FROM numbers(5) FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_fake_nullable:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
diff --git a/tests/queries/0_stateless/02030_function_mapContainsKeyLike.reference b/tests/queries/0_stateless/02030_function_mapContainsKeyLike.reference
index eb8bc83384e..1f8f2bf0d0c 100644
--- a/tests/queries/0_stateless/02030_function_mapContainsKeyLike.reference
+++ b/tests/queries/0_stateless/02030_function_mapContainsKeyLike.reference
@@ -4,3 +4,11 @@
 4	{'4-K1':'4-V1','4-K2':'4-V2'}
 5	{'5-K1':'5-V1','5-K2':'5-V2'}
 6	{'6-K1':'6-V1','6-K2':'6-V2'}
+1
+1
+1
+1
+1
+0
+{'aa':NULL}
+{}
diff --git a/tests/queries/0_stateless/02030_function_mapContainsKeyLike.sql b/tests/queries/0_stateless/02030_function_mapContainsKeyLike.sql
index 7d9722b4c90..b04c5945a08 100644
--- a/tests/queries/0_stateless/02030_function_mapContainsKeyLike.sql
+++ b/tests/queries/0_stateless/02030_function_mapContainsKeyLike.sql
@@ -10,3 +10,14 @@ SELECT id, map FROM map_containsKeyLike_test WHERE mapContainsKeyLike(map, '1-%'
 SELECT id, map FROM map_containsKeyLike_test WHERE mapContainsKeyLike(map, '3-%') = 0 order by id;
 
 DROP TABLE map_containsKeyLike_test;
+
+SELECT mapContainsKeyLike(map('aa', 1, 'bb', 2), 'a%');
+SELECT mapContainsKeyLike(map('aa', 1, 'bb', 2), materialize('a%'));
+SELECT mapContainsKeyLike(materialize(map('aa', 1, 'bb', 2)), 'a%');
+SELECT mapContainsKeyLike(materialize(map('aa', 1, 'bb', 2)), materialize('a%'));
+
+SELECT mapContainsKeyLike(map('aa', NULL, 'bb', NULL), 'a%');
+SELECT mapContainsKeyLike(map('aa', NULL, 'bb', NULL), 'q%');
+
+SELECT mapExtractKeyLike(map('aa', NULL, 'bb', NULL), 'a%');
+SELECT mapExtractKeyLike(map('aa', NULL, 'bb', NULL), 'q%');
diff --git a/tests/queries/0_stateless/02048_clickhouse_local_stage.reference b/tests/queries/0_stateless/02048_clickhouse_local_stage.reference
index 44c39f2a444..00e0f4ddb2e 100644
--- a/tests/queries/0_stateless/02048_clickhouse_local_stage.reference
+++ b/tests/queries/0_stateless/02048_clickhouse_local_stage.reference
@@ -1,15 +1,15 @@
-execute: default
+execute: --allow_experimental_analyzer=1
 "foo"
 1
-execute: --stage fetch_columns
-"dummy"
+execute: --allow_experimental_analyzer=1 --stage fetch_columns
+"system.one.dummy_0"
 0
-execute: --stage with_mergeable_state
-"1"
+execute: --allow_experimental_analyzer=1 --stage with_mergeable_state
+"1_UInt8"
 1
-execute: --stage with_mergeable_state_after_aggregation
-"1"
+execute: --allow_experimental_analyzer=1 --stage with_mergeable_state_after_aggregation
+"1_UInt8"
 1
-execute: --stage complete
+execute: --allow_experimental_analyzer=1 --stage complete
 "foo"
 1
diff --git a/tests/queries/0_stateless/02048_clickhouse_local_stage.sh b/tests/queries/0_stateless/02048_clickhouse_local_stage.sh
index 5c1303b5160..182acc23a13 100755
--- a/tests/queries/0_stateless/02048_clickhouse_local_stage.sh
+++ b/tests/queries/0_stateless/02048_clickhouse_local_stage.sh
@@ -5,6 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+opts=(
+    "--allow_experimental_analyzer=1"
+)
+
 function execute_query()
 {
     if [ $# -eq 0 ]; then
@@ -15,8 +19,8 @@ function execute_query()
     ${CLICKHOUSE_LOCAL} "$@" --format CSVWithNames -q "SELECT 1 AS foo"
 }
 
-execute_query # default -- complete
-execute_query --stage fetch_columns
-execute_query --stage with_mergeable_state
-execute_query --stage with_mergeable_state_after_aggregation
-execute_query --stage complete
+execute_query "${opts[@]}" # default -- complete
+execute_query "${opts[@]}" --stage fetch_columns
+execute_query "${opts[@]}" --stage with_mergeable_state
+execute_query "${opts[@]}" --stage with_mergeable_state_after_aggregation
+execute_query "${opts[@]}" --stage complete
diff --git a/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh b/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh
index d53fe8dd305..f055ea304b2 100755
--- a/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh
+++ b/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh
@@ -26,13 +26,12 @@ SELECT count() FROM test_infile_parallel WHERE Value='first';
 SELECT count() FROM test_infile_parallel WHERE Value='second';
 EOF
 
-# Error code is 36 (BAD_ARGUMENTS). It is not ignored.
-${CLICKHOUSE_CLIENT} --multiquery "
-DROP TABLE IF EXISTS test_infile_parallel;
+# Error code is 27 (DB::ParsingException). It is not ignored.
+${CLICKHOUSE_CLIENT}  -m --multiquery --query "DROP TABLE IF EXISTS test_infile_parallel;
 CREATE TABLE test_infile_parallel (Id Int32,Value Enum('first' = 1, 'second' = 2)) ENGINE=Memory();
 SET input_format_allow_errors_num=0;
 INSERT INTO test_infile_parallel FROM INFILE '${CLICKHOUSE_TMP}/test_infile_parallel*' FORMAT TSV;
-" 2>&1 | grep -q "36" && echo "Correct" || echo 'Fail'
+" 2>&1 | grep -q "27" && echo "Correct" || echo 'Fail'
 
 ${CLICKHOUSE_LOCAL} --multiquery <<EOF
 DROP TABLE IF EXISTS test_infile_parallel; 
diff --git a/tests/queries/0_stateless/02048_views_with_comment.reference b/tests/queries/0_stateless/02048_views_with_comment.reference
deleted file mode 100644
index ad9817ad120..00000000000
--- a/tests/queries/0_stateless/02048_views_with_comment.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-live_view_comment_test	LiveView	live view
-materialized_view_comment_test	MaterializedView	materialized view
-view_comment_test	View	simple view
diff --git a/tests/queries/0_stateless/02048_views_with_comment.sql b/tests/queries/0_stateless/02048_views_with_comment.sql
deleted file mode 100644
index a7c991d119b..00000000000
--- a/tests/queries/0_stateless/02048_views_with_comment.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- Make sure that any kind of `VIEW` can be created with a `COMMENT` clause
--- and value of that clause is visible as `comment` column of `system.tables` table.
-
-CREATE VIEW view_comment_test AS (SELECT 1) COMMENT 'simple view';
-CREATE MATERIALIZED VIEW materialized_view_comment_test TO test1 (a UInt64) AS (SELECT 1) COMMENT 'materialized view';
-
-SET allow_experimental_live_view=1;
-CREATE LIVE VIEW live_view_comment_test AS (SELECT 1) COMMENT 'live view';
-
-SYSTEM FLUSH LOGS;
-
-SELECT name, engine, comment FROM system.tables WHERE database == currentDatabase() ORDER BY name;
diff --git a/tests/queries/0_stateless/02051_symlinks_to_user_files.sh b/tests/queries/0_stateless/02051_symlinks_to_user_files.sh
index dfdc71e0f0b..22d6d2938cd 100755
--- a/tests/queries/0_stateless/02051_symlinks_to_user_files.sh
+++ b/tests/queries/0_stateless/02051_symlinks_to_user_files.sh
@@ -28,5 +28,5 @@ function cleanup()
 trap cleanup EXIT
 
 ${CLICKHOUSE_CLIENT} --query="insert into table function file('${symlink_path}', 'Values', 'a String') select 'OK'";
-${CLICKHOUSE_CLIENT} --query="select * from file('${symlink_path}', 'Values', 'a String')";
+${CLICKHOUSE_CLIENT} --query="select * from file('${symlink_path}', 'Values', 'a String') order by a";
 
diff --git a/tests/queries/0_stateless/02103_with_names_and_types_parallel_parsing.sh b/tests/queries/0_stateless/02103_with_names_and_types_parallel_parsing.sh
index 487282099e2..a6e704093a2 100755
--- a/tests/queries/0_stateless/02103_with_names_and_types_parallel_parsing.sh
+++ b/tests/queries/0_stateless/02103_with_names_and_types_parallel_parsing.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+USER_FILES_PATH=$(clickhouse client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
 
 DATA_FILE=$USER_FILES_PATH/test_02103.data
 
@@ -14,7 +14,7 @@ FORMATS=('TSVWithNames' 'TSVWithNamesAndTypes' 'TSVRawWithNames' 'TSVRawWithName
 for format in "${FORMATS[@]}"
 do
     $CLICKHOUSE_CLIENT -q "SELECT number, range(number + 10) AS array, toString(number) AS string FROM numbers(10) FORMAT $format" > $DATA_FILE
-    $CLICKHOUSE_CLIENT -q "SELECT * FROM file('test_02103.data', '$format', 'number UInt64, array Array(UInt64), string String') SETTINGS input_format_parallel_parsing=1, min_chunk_bytes_for_parallel_parsing=40"
+    $CLICKHOUSE_CLIENT -q "SELECT * FROM file('test_02103.data', '$format', 'number UInt64, array Array(UInt64), string String') ORDER BY number SETTINGS input_format_parallel_parsing=1, min_chunk_bytes_for_parallel_parsing=40"
 done
 
 rm $DATA_FILE
diff --git a/tests/queries/0_stateless/02111_function_mapExtractKeyLike.reference b/tests/queries/0_stateless/02111_function_mapExtractKeyLike.reference
index 45edbc24c75..c6bd4c31538 100644
--- a/tests/queries/0_stateless/02111_function_mapExtractKeyLike.reference
+++ b/tests/queries/0_stateless/02111_function_mapExtractKeyLike.reference
@@ -21,3 +21,7 @@ The results of query: SELECT id, mapExtractKeyLike(map, \'5-K1\') FROM map_extra
 4	{}
 5	{'5-K1':'5-V1'}
 6	{}
+{'aa':1}
+{'aa':1}
+{'aa':1}
+{'aa':1}
diff --git a/tests/queries/0_stateless/02111_function_mapExtractKeyLike.sql b/tests/queries/0_stateless/02111_function_mapExtractKeyLike.sql
index 31f53642b74..a17b6b74595 100644
--- a/tests/queries/0_stateless/02111_function_mapExtractKeyLike.sql
+++ b/tests/queries/0_stateless/02111_function_mapExtractKeyLike.sql
@@ -7,7 +7,7 @@ INSERT INTO map_extractKeyLike_test VALUES (3, {'P1-K1':'3-V1','P2-K2':'3-V2'}),
 INSERT INTO map_extractKeyLike_test VALUES (5, {'5-K1':'5-V1','5-K2':'5-V2'}),(6, {'P3-K1':'6-V1','P4-K2':'6-V2'});
 
 SELECT 'The data of table:';
-SELECT * FROM map_extractKeyLike_test ORDER BY id; 
+SELECT * FROM map_extractKeyLike_test ORDER BY id;
 
 SELECT '';
 
@@ -20,3 +20,8 @@ SELECT 'The results of query: SELECT id, mapExtractKeyLike(map, \'5-K1\') FROM m
 SELECT id, mapExtractKeyLike(map, '5-K1') FROM map_extractKeyLike_test ORDER BY id;
 
 DROP TABLE map_extractKeyLike_test;
+
+SELECT mapExtractKeyLike(map('aa', 1, 'bb', 2), 'a%');
+SELECT mapExtractKeyLike(map('aa', 1, 'bb', 2), materialize('a%'));
+SELECT mapExtractKeyLike(materialize(map('aa', 1, 'bb', 2)), 'a%');
+SELECT mapExtractKeyLike(materialize(map('aa', 1, 'bb', 2)), materialize('a%'));
diff --git a/tests/queries/0_stateless/02116_tuple_element.sql b/tests/queries/0_stateless/02116_tuple_element.sql
index 4ce6e5cf136..c911712684d 100644
--- a/tests/queries/0_stateless/02116_tuple_element.sql
+++ b/tests/queries/0_stateless/02116_tuple_element.sql
@@ -16,7 +16,7 @@ EXPLAIN SYNTAX SELECT tupleElement(t1, 'a') FROM t_tuple_element;
 
 SELECT tupleElement(number, 1) FROM numbers(1); -- { serverError 43 }
 SELECT tupleElement(t1) FROM t_tuple_element; -- { serverError 42 }
-SELECT tupleElement(t1, 'b') FROM t_tuple_element; -- { serverError 47 }
+SELECT tupleElement(t1, 'b') FROM t_tuple_element; -- { serverError 10, 47 }
 SELECT tupleElement(t1, 0) FROM t_tuple_element; -- { serverError 127 }
 SELECT tupleElement(t1, 3) FROM t_tuple_element; -- { serverError 127 }
 SELECT tupleElement(t1, materialize('a')) FROM t_tuple_element; -- { serverError 43 }
@@ -28,7 +28,7 @@ SELECT tupleElement(t2, 1) FROM t_tuple_element;
 EXPLAIN SYNTAX SELECT tupleElement(t2, 1) FROM t_tuple_element;
 
 SELECT tupleElement(t2) FROM t_tuple_element; -- { serverError 42 }
-SELECT tupleElement(t2, 'a') FROM t_tuple_element; -- { serverError 47 }
+SELECT tupleElement(t2, 'a') FROM t_tuple_element; -- { serverError 10, 47 }
 SELECT tupleElement(t2, 0) FROM t_tuple_element; -- { serverError 127 }
 SELECT tupleElement(t2, 3) FROM t_tuple_element; -- { serverError 127 }
 SELECT tupleElement(t2, materialize(1)) FROM t_tuple_element; -- { serverError 43 }
diff --git a/tests/queries/0_stateless/02117_show_create_table_system.reference b/tests/queries/0_stateless/02117_show_create_table_system.reference
index f77076bcd5c..09cc62dac00 100644
--- a/tests/queries/0_stateless/02117_show_create_table_system.reference
+++ b/tests/queries/0_stateless/02117_show_create_table_system.reference
@@ -47,7 +47,10 @@ CREATE TABLE system.clusters
     `default_database` String,
     `errors_count` UInt32,
     `slowdowns_count` UInt32,
-    `estimated_recovery_time` UInt32
+    `estimated_recovery_time` UInt32,
+    `database_shard_name` String,
+    `database_replica_name` String,
+    `is_active` Nullable(UInt8)
 )
 ENGINE = SystemClusters
 COMMENT 'SYSTEM TABLE is built on the fly.'
@@ -281,7 +284,12 @@ CREATE TABLE system.functions
     `alias_to` String,
     `create_query` String,
     `origin` Enum8('System' = 0, 'SQLUserDefined' = 1, 'ExecutableUserDefined' = 2),
-    `description` String
+    `description` String,
+    `syntax` String,
+    `arguments` String,
+    `returned_value` String,
+    `examples` String,
+    `categories` String
 )
 ENGINE = SystemFunctions
 COMMENT 'SYSTEM TABLE is built on the fly.'
@@ -289,7 +297,7 @@ CREATE TABLE system.grants
 (
     `user_name` Nullable(String),
     `role_name` Nullable(String),
-    `access_type` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW FILESYSTEM CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER NAMED COLLECTION' = 41, 'ALTER TABLE' = 42, 'ALTER DATABASE' = 43, 'ALTER VIEW REFRESH' = 44, 'ALTER VIEW MODIFY QUERY' = 45, 'ALTER VIEW' = 46, 'ALTER' = 47, 'CREATE DATABASE' = 48, 'CREATE TABLE' = 49, 'CREATE VIEW' = 50, 'CREATE DICTIONARY' = 51, 'CREATE TEMPORARY TABLE' = 52, 'CREATE FUNCTION' = 53, 'CREATE NAMED COLLECTION' = 54, 'CREATE' = 55, 'DROP DATABASE' = 56, 'DROP TABLE' = 57, 'DROP VIEW' = 58, 'DROP DICTIONARY' = 59, 'DROP FUNCTION' = 60, 'DROP NAMED COLLECTION' = 61, 'DROP' = 62, 'TRUNCATE' = 63, 'OPTIMIZE' = 64, 'BACKUP' = 65, 'KILL QUERY' = 66, 'KILL TRANSACTION' = 67, 'MOVE PARTITION BETWEEN SHARDS' = 68, 'CREATE USER' = 69, 'ALTER USER' = 70, 'DROP USER' = 71, 'CREATE ROLE' = 72, 'ALTER ROLE' = 73, 'DROP ROLE' = 74, 'ROLE ADMIN' = 75, 'CREATE ROW POLICY' = 76, 'ALTER ROW POLICY' = 77, 'DROP ROW POLICY' = 78, 'CREATE QUOTA' = 79, 'ALTER QUOTA' = 80, 'DROP QUOTA' = 81, 'CREATE SETTINGS PROFILE' = 82, 'ALTER SETTINGS PROFILE' = 83, 'DROP SETTINGS PROFILE' = 84, 'SHOW USERS' = 85, 'SHOW ROLES' = 86, 'SHOW ROW POLICIES' = 87, 'SHOW QUOTAS' = 88, 'SHOW SETTINGS PROFILES' = 89, 'SHOW ACCESS' = 90, 'SHOW NAMED COLLECTIONS' = 91, 'SHOW NAMED COLLECTIONS SECRETS' = 92, 'ACCESS MANAGEMENT' = 93, 'SYSTEM SHUTDOWN' = 94, 'SYSTEM DROP DNS CACHE' = 95, 'SYSTEM DROP MARK CACHE' = 96, 'SYSTEM DROP UNCOMPRESSED CACHE' = 97, 'SYSTEM DROP MMAP CACHE' = 98, 'SYSTEM DROP QUERY CACHE' = 99, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 100, 'SYSTEM DROP FILESYSTEM CACHE' = 101, 'SYSTEM DROP SCHEMA CACHE' = 102, 'SYSTEM DROP S3 CLIENT CACHE' = 103, 'SYSTEM DROP CACHE' = 104, 'SYSTEM RELOAD CONFIG' = 105, 'SYSTEM RELOAD USERS' = 106, 'SYSTEM RELOAD SYMBOLS' = 107, 'SYSTEM RELOAD DICTIONARY' = 108, 'SYSTEM RELOAD MODEL' = 109, 'SYSTEM RELOAD FUNCTION' = 110, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 111, 'SYSTEM RELOAD' = 112, 'SYSTEM RESTART DISK' = 113, 'SYSTEM MERGES' = 114, 'SYSTEM TTL MERGES' = 115, 'SYSTEM FETCHES' = 116, 'SYSTEM MOVES' = 117, 'SYSTEM DISTRIBUTED SENDS' = 118, 'SYSTEM REPLICATED SENDS' = 119, 'SYSTEM SENDS' = 120, 'SYSTEM REPLICATION QUEUES' = 121, 'SYSTEM DROP REPLICA' = 122, 'SYSTEM SYNC REPLICA' = 123, 'SYSTEM RESTART REPLICA' = 124, 'SYSTEM RESTORE REPLICA' = 125, 'SYSTEM WAIT LOADING PARTS' = 126, 'SYSTEM SYNC DATABASE REPLICA' = 127, 'SYSTEM SYNC TRANSACTION LOG' = 128, 'SYSTEM SYNC FILE CACHE' = 129, 'SYSTEM FLUSH DISTRIBUTED' = 130, 'SYSTEM FLUSH LOGS' = 131, 'SYSTEM FLUSH' = 132, 'SYSTEM THREAD FUZZER' = 133, 'SYSTEM UNFREEZE' = 134, 'SYSTEM' = 135, 'dictGet' = 136, 'addressToLine' = 137, 'addressToLineWithInlines' = 138, 'addressToSymbol' = 139, 'demangle' = 140, 'INTROSPECTION' = 141, 'FILE' = 142, 'URL' = 143, 'REMOTE' = 144, 'MONGO' = 145, 'MEILISEARCH' = 146, 'MYSQL' = 147, 'POSTGRES' = 148, 'SQLITE' = 149, 'ODBC' = 150, 'JDBC' = 151, 'HDFS' = 152, 'S3' = 153, 'HIVE' = 154, 'SOURCES' = 155, 'CLUSTER' = 156, 'ALL' = 157, 'NONE' = 158),
+    `access_type` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW FILESYSTEM CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER NAMED COLLECTION' = 41, 'ALTER TABLE' = 42, 'ALTER DATABASE' = 43, 'ALTER VIEW REFRESH' = 44, 'ALTER VIEW MODIFY QUERY' = 45, 'ALTER VIEW' = 46, 'ALTER' = 47, 'CREATE DATABASE' = 48, 'CREATE TABLE' = 49, 'CREATE VIEW' = 50, 'CREATE DICTIONARY' = 51, 'CREATE TEMPORARY TABLE' = 52, 'CREATE ARBITRARY TEMPORARY TABLE' = 53, 'CREATE FUNCTION' = 54, 'CREATE NAMED COLLECTION' = 55, 'CREATE' = 56, 'DROP DATABASE' = 57, 'DROP TABLE' = 58, 'DROP VIEW' = 59, 'DROP DICTIONARY' = 60, 'DROP FUNCTION' = 61, 'DROP NAMED COLLECTION' = 62, 'DROP' = 63, 'UNDROP TABLE' = 64, 'TRUNCATE' = 65, 'OPTIMIZE' = 66, 'BACKUP' = 67, 'KILL QUERY' = 68, 'KILL TRANSACTION' = 69, 'MOVE PARTITION BETWEEN SHARDS' = 70, 'CREATE USER' = 71, 'ALTER USER' = 72, 'DROP USER' = 73, 'CREATE ROLE' = 74, 'ALTER ROLE' = 75, 'DROP ROLE' = 76, 'ROLE ADMIN' = 77, 'CREATE ROW POLICY' = 78, 'ALTER ROW POLICY' = 79, 'DROP ROW POLICY' = 80, 'CREATE QUOTA' = 81, 'ALTER QUOTA' = 82, 'DROP QUOTA' = 83, 'CREATE SETTINGS PROFILE' = 84, 'ALTER SETTINGS PROFILE' = 85, 'DROP SETTINGS PROFILE' = 86, 'SHOW USERS' = 87, 'SHOW ROLES' = 88, 'SHOW ROW POLICIES' = 89, 'SHOW QUOTAS' = 90, 'SHOW SETTINGS PROFILES' = 91, 'SHOW ACCESS' = 92, 'ACCESS MANAGEMENT' = 93, 'SHOW NAMED COLLECTIONS' = 94, 'SHOW NAMED COLLECTIONS SECRETS' = 95, 'NAMED COLLECTION CONTROL' = 96, 'SYSTEM SHUTDOWN' = 97, 'SYSTEM DROP DNS CACHE' = 98, 'SYSTEM DROP MARK CACHE' = 99, 'SYSTEM DROP UNCOMPRESSED CACHE' = 100, 'SYSTEM DROP MMAP CACHE' = 101, 'SYSTEM DROP QUERY CACHE' = 102, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 103, 'SYSTEM DROP FILESYSTEM CACHE' = 104, 'SYSTEM DROP SCHEMA CACHE' = 105, 'SYSTEM DROP S3 CLIENT CACHE' = 106, 'SYSTEM DROP CACHE' = 107, 'SYSTEM RELOAD CONFIG' = 108, 'SYSTEM RELOAD USERS' = 109, 'SYSTEM RELOAD SYMBOLS' = 110, 'SYSTEM RELOAD DICTIONARY' = 111, 'SYSTEM RELOAD MODEL' = 112, 'SYSTEM RELOAD FUNCTION' = 113, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 114, 'SYSTEM RELOAD' = 115, 'SYSTEM RESTART DISK' = 116, 'SYSTEM MERGES' = 117, 'SYSTEM TTL MERGES' = 118, 'SYSTEM FETCHES' = 119, 'SYSTEM MOVES' = 120, 'SYSTEM DISTRIBUTED SENDS' = 121, 'SYSTEM REPLICATED SENDS' = 122, 'SYSTEM SENDS' = 123, 'SYSTEM REPLICATION QUEUES' = 124, 'SYSTEM DROP REPLICA' = 125, 'SYSTEM SYNC REPLICA' = 126, 'SYSTEM RESTART REPLICA' = 127, 'SYSTEM RESTORE REPLICA' = 128, 'SYSTEM WAIT LOADING PARTS' = 129, 'SYSTEM SYNC DATABASE REPLICA' = 130, 'SYSTEM SYNC TRANSACTION LOG' = 131, 'SYSTEM SYNC FILE CACHE' = 132, 'SYSTEM FLUSH DISTRIBUTED' = 133, 'SYSTEM FLUSH LOGS' = 134, 'SYSTEM FLUSH' = 135, 'SYSTEM THREAD FUZZER' = 136, 'SYSTEM UNFREEZE' = 137, 'SYSTEM FAILPOINT' = 138, 'SYSTEM' = 139, 'dictGet' = 140, 'displaySecretsInShowAndSelect' = 141, 'addressToLine' = 142, 'addressToLineWithInlines' = 143, 'addressToSymbol' = 144, 'demangle' = 145, 'INTROSPECTION' = 146, 'FILE' = 147, 'URL' = 148, 'REMOTE' = 149, 'MONGO' = 150, 'MEILISEARCH' = 151, 'MYSQL' = 152, 'POSTGRES' = 153, 'SQLITE' = 154, 'ODBC' = 155, 'JDBC' = 156, 'HDFS' = 157, 'S3' = 158, 'HIVE' = 159, 'SOURCES' = 160, 'CLUSTER' = 161, 'ALL' = 162, 'NONE' = 163),
     `database` Nullable(String),
     `table` Nullable(String),
     `column` Nullable(String),
@@ -356,6 +364,7 @@ CREATE TABLE system.merges
     `partition_id` String,
     `is_mutation` UInt8,
     `total_size_bytes_compressed` UInt64,
+    `total_size_bytes_uncompressed` UInt64,
     `total_size_marks` UInt64,
     `bytes_read_uncompressed` UInt64,
     `rows_read` UInt64,
@@ -510,7 +519,8 @@ CREATE TABLE system.parts
     `last_removal_attemp_time` DateTime,
     `removal_state` String,
     `bytes` UInt64,
-    `marks_size` UInt64
+    `marks_size` UInt64,
+    `part_name` String
 )
 ENGINE = SystemParts
 COMMENT 'SYSTEM TABLE is built on the fly.'
@@ -564,16 +574,17 @@ CREATE TABLE system.parts_columns
     `subcolumns.data_uncompressed_bytes` Array(UInt64),
     `subcolumns.marks_bytes` Array(UInt64),
     `bytes` UInt64,
-    `marks_size` UInt64
+    `marks_size` UInt64,
+    `part_name` String
 )
 ENGINE = SystemPartsColumns
 COMMENT 'SYSTEM TABLE is built on the fly.'
 CREATE TABLE system.privileges
 (
-    `privilege` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW FILESYSTEM CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER NAMED COLLECTION' = 41, 'ALTER TABLE' = 42, 'ALTER DATABASE' = 43, 'ALTER VIEW REFRESH' = 44, 'ALTER VIEW MODIFY QUERY' = 45, 'ALTER VIEW' = 46, 'ALTER' = 47, 'CREATE DATABASE' = 48, 'CREATE TABLE' = 49, 'CREATE VIEW' = 50, 'CREATE DICTIONARY' = 51, 'CREATE TEMPORARY TABLE' = 52, 'CREATE FUNCTION' = 53, 'CREATE NAMED COLLECTION' = 54, 'CREATE' = 55, 'DROP DATABASE' = 56, 'DROP TABLE' = 57, 'DROP VIEW' = 58, 'DROP DICTIONARY' = 59, 'DROP FUNCTION' = 60, 'DROP NAMED COLLECTION' = 61, 'DROP' = 62, 'TRUNCATE' = 63, 'OPTIMIZE' = 64, 'BACKUP' = 65, 'KILL QUERY' = 66, 'KILL TRANSACTION' = 67, 'MOVE PARTITION BETWEEN SHARDS' = 68, 'CREATE USER' = 69, 'ALTER USER' = 70, 'DROP USER' = 71, 'CREATE ROLE' = 72, 'ALTER ROLE' = 73, 'DROP ROLE' = 74, 'ROLE ADMIN' = 75, 'CREATE ROW POLICY' = 76, 'ALTER ROW POLICY' = 77, 'DROP ROW POLICY' = 78, 'CREATE QUOTA' = 79, 'ALTER QUOTA' = 80, 'DROP QUOTA' = 81, 'CREATE SETTINGS PROFILE' = 82, 'ALTER SETTINGS PROFILE' = 83, 'DROP SETTINGS PROFILE' = 84, 'SHOW USERS' = 85, 'SHOW ROLES' = 86, 'SHOW ROW POLICIES' = 87, 'SHOW QUOTAS' = 88, 'SHOW SETTINGS PROFILES' = 89, 'SHOW ACCESS' = 90, 'SHOW NAMED COLLECTIONS' = 91, 'SHOW NAMED COLLECTIONS SECRETS' = 92, 'ACCESS MANAGEMENT' = 93, 'SYSTEM SHUTDOWN' = 94, 'SYSTEM DROP DNS CACHE' = 95, 'SYSTEM DROP MARK CACHE' = 96, 'SYSTEM DROP UNCOMPRESSED CACHE' = 97, 'SYSTEM DROP MMAP CACHE' = 98, 'SYSTEM DROP QUERY CACHE' = 99, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 100, 'SYSTEM DROP FILESYSTEM CACHE' = 101, 'SYSTEM DROP SCHEMA CACHE' = 102, 'SYSTEM DROP S3 CLIENT CACHE' = 103, 'SYSTEM DROP CACHE' = 104, 'SYSTEM RELOAD CONFIG' = 105, 'SYSTEM RELOAD USERS' = 106, 'SYSTEM RELOAD SYMBOLS' = 107, 'SYSTEM RELOAD DICTIONARY' = 108, 'SYSTEM RELOAD MODEL' = 109, 'SYSTEM RELOAD FUNCTION' = 110, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 111, 'SYSTEM RELOAD' = 112, 'SYSTEM RESTART DISK' = 113, 'SYSTEM MERGES' = 114, 'SYSTEM TTL MERGES' = 115, 'SYSTEM FETCHES' = 116, 'SYSTEM MOVES' = 117, 'SYSTEM DISTRIBUTED SENDS' = 118, 'SYSTEM REPLICATED SENDS' = 119, 'SYSTEM SENDS' = 120, 'SYSTEM REPLICATION QUEUES' = 121, 'SYSTEM DROP REPLICA' = 122, 'SYSTEM SYNC REPLICA' = 123, 'SYSTEM RESTART REPLICA' = 124, 'SYSTEM RESTORE REPLICA' = 125, 'SYSTEM WAIT LOADING PARTS' = 126, 'SYSTEM SYNC DATABASE REPLICA' = 127, 'SYSTEM SYNC TRANSACTION LOG' = 128, 'SYSTEM SYNC FILE CACHE' = 129, 'SYSTEM FLUSH DISTRIBUTED' = 130, 'SYSTEM FLUSH LOGS' = 131, 'SYSTEM FLUSH' = 132, 'SYSTEM THREAD FUZZER' = 133, 'SYSTEM UNFREEZE' = 134, 'SYSTEM' = 135, 'dictGet' = 136, 'addressToLine' = 137, 'addressToLineWithInlines' = 138, 'addressToSymbol' = 139, 'demangle' = 140, 'INTROSPECTION' = 141, 'FILE' = 142, 'URL' = 143, 'REMOTE' = 144, 'MONGO' = 145, 'MEILISEARCH' = 146, 'MYSQL' = 147, 'POSTGRES' = 148, 'SQLITE' = 149, 'ODBC' = 150, 'JDBC' = 151, 'HDFS' = 152, 'S3' = 153, 'HIVE' = 154, 'SOURCES' = 155, 'CLUSTER' = 156, 'ALL' = 157, 'NONE' = 158),
+    `privilege` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW FILESYSTEM CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER NAMED COLLECTION' = 41, 'ALTER TABLE' = 42, 'ALTER DATABASE' = 43, 'ALTER VIEW REFRESH' = 44, 'ALTER VIEW MODIFY QUERY' = 45, 'ALTER VIEW' = 46, 'ALTER' = 47, 'CREATE DATABASE' = 48, 'CREATE TABLE' = 49, 'CREATE VIEW' = 50, 'CREATE DICTIONARY' = 51, 'CREATE TEMPORARY TABLE' = 52, 'CREATE ARBITRARY TEMPORARY TABLE' = 53, 'CREATE FUNCTION' = 54, 'CREATE NAMED COLLECTION' = 55, 'CREATE' = 56, 'DROP DATABASE' = 57, 'DROP TABLE' = 58, 'DROP VIEW' = 59, 'DROP DICTIONARY' = 60, 'DROP FUNCTION' = 61, 'DROP NAMED COLLECTION' = 62, 'DROP' = 63, 'UNDROP TABLE' = 64, 'TRUNCATE' = 65, 'OPTIMIZE' = 66, 'BACKUP' = 67, 'KILL QUERY' = 68, 'KILL TRANSACTION' = 69, 'MOVE PARTITION BETWEEN SHARDS' = 70, 'CREATE USER' = 71, 'ALTER USER' = 72, 'DROP USER' = 73, 'CREATE ROLE' = 74, 'ALTER ROLE' = 75, 'DROP ROLE' = 76, 'ROLE ADMIN' = 77, 'CREATE ROW POLICY' = 78, 'ALTER ROW POLICY' = 79, 'DROP ROW POLICY' = 80, 'CREATE QUOTA' = 81, 'ALTER QUOTA' = 82, 'DROP QUOTA' = 83, 'CREATE SETTINGS PROFILE' = 84, 'ALTER SETTINGS PROFILE' = 85, 'DROP SETTINGS PROFILE' = 86, 'SHOW USERS' = 87, 'SHOW ROLES' = 88, 'SHOW ROW POLICIES' = 89, 'SHOW QUOTAS' = 90, 'SHOW SETTINGS PROFILES' = 91, 'SHOW ACCESS' = 92, 'ACCESS MANAGEMENT' = 93, 'SHOW NAMED COLLECTIONS' = 94, 'SHOW NAMED COLLECTIONS SECRETS' = 95, 'NAMED COLLECTION CONTROL' = 96, 'SYSTEM SHUTDOWN' = 97, 'SYSTEM DROP DNS CACHE' = 98, 'SYSTEM DROP MARK CACHE' = 99, 'SYSTEM DROP UNCOMPRESSED CACHE' = 100, 'SYSTEM DROP MMAP CACHE' = 101, 'SYSTEM DROP QUERY CACHE' = 102, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 103, 'SYSTEM DROP FILESYSTEM CACHE' = 104, 'SYSTEM DROP SCHEMA CACHE' = 105, 'SYSTEM DROP S3 CLIENT CACHE' = 106, 'SYSTEM DROP CACHE' = 107, 'SYSTEM RELOAD CONFIG' = 108, 'SYSTEM RELOAD USERS' = 109, 'SYSTEM RELOAD SYMBOLS' = 110, 'SYSTEM RELOAD DICTIONARY' = 111, 'SYSTEM RELOAD MODEL' = 112, 'SYSTEM RELOAD FUNCTION' = 113, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 114, 'SYSTEM RELOAD' = 115, 'SYSTEM RESTART DISK' = 116, 'SYSTEM MERGES' = 117, 'SYSTEM TTL MERGES' = 118, 'SYSTEM FETCHES' = 119, 'SYSTEM MOVES' = 120, 'SYSTEM DISTRIBUTED SENDS' = 121, 'SYSTEM REPLICATED SENDS' = 122, 'SYSTEM SENDS' = 123, 'SYSTEM REPLICATION QUEUES' = 124, 'SYSTEM DROP REPLICA' = 125, 'SYSTEM SYNC REPLICA' = 126, 'SYSTEM RESTART REPLICA' = 127, 'SYSTEM RESTORE REPLICA' = 128, 'SYSTEM WAIT LOADING PARTS' = 129, 'SYSTEM SYNC DATABASE REPLICA' = 130, 'SYSTEM SYNC TRANSACTION LOG' = 131, 'SYSTEM SYNC FILE CACHE' = 132, 'SYSTEM FLUSH DISTRIBUTED' = 133, 'SYSTEM FLUSH LOGS' = 134, 'SYSTEM FLUSH' = 135, 'SYSTEM THREAD FUZZER' = 136, 'SYSTEM UNFREEZE' = 137, 'SYSTEM FAILPOINT' = 138, 'SYSTEM' = 139, 'dictGet' = 140, 'displaySecretsInShowAndSelect' = 141, 'addressToLine' = 142, 'addressToLineWithInlines' = 143, 'addressToSymbol' = 144, 'demangle' = 145, 'INTROSPECTION' = 146, 'FILE' = 147, 'URL' = 148, 'REMOTE' = 149, 'MONGO' = 150, 'MEILISEARCH' = 151, 'MYSQL' = 152, 'POSTGRES' = 153, 'SQLITE' = 154, 'ODBC' = 155, 'JDBC' = 156, 'HDFS' = 157, 'S3' = 158, 'HIVE' = 159, 'SOURCES' = 160, 'CLUSTER' = 161, 'ALL' = 162, 'NONE' = 163),
     `aliases` Array(String),
-    `level` Nullable(Enum8('GLOBAL' = 0, 'DATABASE' = 1, 'TABLE' = 2, 'DICTIONARY' = 3, 'VIEW' = 4, 'COLUMN' = 5)),
-    `parent_group` Nullable(Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW FILESYSTEM CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER NAMED COLLECTION' = 41, 'ALTER TABLE' = 42, 'ALTER DATABASE' = 43, 'ALTER VIEW REFRESH' = 44, 'ALTER VIEW MODIFY QUERY' = 45, 'ALTER VIEW' = 46, 'ALTER' = 47, 'CREATE DATABASE' = 48, 'CREATE TABLE' = 49, 'CREATE VIEW' = 50, 'CREATE DICTIONARY' = 51, 'CREATE TEMPORARY TABLE' = 52, 'CREATE FUNCTION' = 53, 'CREATE NAMED COLLECTION' = 54, 'CREATE' = 55, 'DROP DATABASE' = 56, 'DROP TABLE' = 57, 'DROP VIEW' = 58, 'DROP DICTIONARY' = 59, 'DROP FUNCTION' = 60, 'DROP NAMED COLLECTION' = 61, 'DROP' = 62, 'TRUNCATE' = 63, 'OPTIMIZE' = 64, 'BACKUP' = 65, 'KILL QUERY' = 66, 'KILL TRANSACTION' = 67, 'MOVE PARTITION BETWEEN SHARDS' = 68, 'CREATE USER' = 69, 'ALTER USER' = 70, 'DROP USER' = 71, 'CREATE ROLE' = 72, 'ALTER ROLE' = 73, 'DROP ROLE' = 74, 'ROLE ADMIN' = 75, 'CREATE ROW POLICY' = 76, 'ALTER ROW POLICY' = 77, 'DROP ROW POLICY' = 78, 'CREATE QUOTA' = 79, 'ALTER QUOTA' = 80, 'DROP QUOTA' = 81, 'CREATE SETTINGS PROFILE' = 82, 'ALTER SETTINGS PROFILE' = 83, 'DROP SETTINGS PROFILE' = 84, 'SHOW USERS' = 85, 'SHOW ROLES' = 86, 'SHOW ROW POLICIES' = 87, 'SHOW QUOTAS' = 88, 'SHOW SETTINGS PROFILES' = 89, 'SHOW ACCESS' = 90, 'SHOW NAMED COLLECTIONS' = 91, 'SHOW NAMED COLLECTIONS SECRETS' = 92, 'ACCESS MANAGEMENT' = 93, 'SYSTEM SHUTDOWN' = 94, 'SYSTEM DROP DNS CACHE' = 95, 'SYSTEM DROP MARK CACHE' = 96, 'SYSTEM DROP UNCOMPRESSED CACHE' = 97, 'SYSTEM DROP MMAP CACHE' = 98, 'SYSTEM DROP QUERY CACHE' = 99, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 100, 'SYSTEM DROP FILESYSTEM CACHE' = 101, 'SYSTEM DROP SCHEMA CACHE' = 102, 'SYSTEM DROP S3 CLIENT CACHE' = 103, 'SYSTEM DROP CACHE' = 104, 'SYSTEM RELOAD CONFIG' = 105, 'SYSTEM RELOAD USERS' = 106, 'SYSTEM RELOAD SYMBOLS' = 107, 'SYSTEM RELOAD DICTIONARY' = 108, 'SYSTEM RELOAD MODEL' = 109, 'SYSTEM RELOAD FUNCTION' = 110, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 111, 'SYSTEM RELOAD' = 112, 'SYSTEM RESTART DISK' = 113, 'SYSTEM MERGES' = 114, 'SYSTEM TTL MERGES' = 115, 'SYSTEM FETCHES' = 116, 'SYSTEM MOVES' = 117, 'SYSTEM DISTRIBUTED SENDS' = 118, 'SYSTEM REPLICATED SENDS' = 119, 'SYSTEM SENDS' = 120, 'SYSTEM REPLICATION QUEUES' = 121, 'SYSTEM DROP REPLICA' = 122, 'SYSTEM SYNC REPLICA' = 123, 'SYSTEM RESTART REPLICA' = 124, 'SYSTEM RESTORE REPLICA' = 125, 'SYSTEM WAIT LOADING PARTS' = 126, 'SYSTEM SYNC DATABASE REPLICA' = 127, 'SYSTEM SYNC TRANSACTION LOG' = 128, 'SYSTEM SYNC FILE CACHE' = 129, 'SYSTEM FLUSH DISTRIBUTED' = 130, 'SYSTEM FLUSH LOGS' = 131, 'SYSTEM FLUSH' = 132, 'SYSTEM THREAD FUZZER' = 133, 'SYSTEM UNFREEZE' = 134, 'SYSTEM' = 135, 'dictGet' = 136, 'addressToLine' = 137, 'addressToLineWithInlines' = 138, 'addressToSymbol' = 139, 'demangle' = 140, 'INTROSPECTION' = 141, 'FILE' = 142, 'URL' = 143, 'REMOTE' = 144, 'MONGO' = 145, 'MEILISEARCH' = 146, 'MYSQL' = 147, 'POSTGRES' = 148, 'SQLITE' = 149, 'ODBC' = 150, 'JDBC' = 151, 'HDFS' = 152, 'S3' = 153, 'HIVE' = 154, 'SOURCES' = 155, 'CLUSTER' = 156, 'ALL' = 157, 'NONE' = 158))
+    `level` Nullable(Enum8('GLOBAL' = 0, 'DATABASE' = 1, 'TABLE' = 2, 'DICTIONARY' = 3, 'VIEW' = 4, 'COLUMN' = 5, 'NAMED_COLLECTION' = 6)),
+    `parent_group` Nullable(Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW FILESYSTEM CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER NAMED COLLECTION' = 41, 'ALTER TABLE' = 42, 'ALTER DATABASE' = 43, 'ALTER VIEW REFRESH' = 44, 'ALTER VIEW MODIFY QUERY' = 45, 'ALTER VIEW' = 46, 'ALTER' = 47, 'CREATE DATABASE' = 48, 'CREATE TABLE' = 49, 'CREATE VIEW' = 50, 'CREATE DICTIONARY' = 51, 'CREATE TEMPORARY TABLE' = 52, 'CREATE ARBITRARY TEMPORARY TABLE' = 53, 'CREATE FUNCTION' = 54, 'CREATE NAMED COLLECTION' = 55, 'CREATE' = 56, 'DROP DATABASE' = 57, 'DROP TABLE' = 58, 'DROP VIEW' = 59, 'DROP DICTIONARY' = 60, 'DROP FUNCTION' = 61, 'DROP NAMED COLLECTION' = 62, 'DROP' = 63, 'UNDROP TABLE' = 64, 'TRUNCATE' = 65, 'OPTIMIZE' = 66, 'BACKUP' = 67, 'KILL QUERY' = 68, 'KILL TRANSACTION' = 69, 'MOVE PARTITION BETWEEN SHARDS' = 70, 'CREATE USER' = 71, 'ALTER USER' = 72, 'DROP USER' = 73, 'CREATE ROLE' = 74, 'ALTER ROLE' = 75, 'DROP ROLE' = 76, 'ROLE ADMIN' = 77, 'CREATE ROW POLICY' = 78, 'ALTER ROW POLICY' = 79, 'DROP ROW POLICY' = 80, 'CREATE QUOTA' = 81, 'ALTER QUOTA' = 82, 'DROP QUOTA' = 83, 'CREATE SETTINGS PROFILE' = 84, 'ALTER SETTINGS PROFILE' = 85, 'DROP SETTINGS PROFILE' = 86, 'SHOW USERS' = 87, 'SHOW ROLES' = 88, 'SHOW ROW POLICIES' = 89, 'SHOW QUOTAS' = 90, 'SHOW SETTINGS PROFILES' = 91, 'SHOW ACCESS' = 92, 'ACCESS MANAGEMENT' = 93, 'SHOW NAMED COLLECTIONS' = 94, 'SHOW NAMED COLLECTIONS SECRETS' = 95, 'NAMED COLLECTION CONTROL' = 96, 'SYSTEM SHUTDOWN' = 97, 'SYSTEM DROP DNS CACHE' = 98, 'SYSTEM DROP MARK CACHE' = 99, 'SYSTEM DROP UNCOMPRESSED CACHE' = 100, 'SYSTEM DROP MMAP CACHE' = 101, 'SYSTEM DROP QUERY CACHE' = 102, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 103, 'SYSTEM DROP FILESYSTEM CACHE' = 104, 'SYSTEM DROP SCHEMA CACHE' = 105, 'SYSTEM DROP S3 CLIENT CACHE' = 106, 'SYSTEM DROP CACHE' = 107, 'SYSTEM RELOAD CONFIG' = 108, 'SYSTEM RELOAD USERS' = 109, 'SYSTEM RELOAD SYMBOLS' = 110, 'SYSTEM RELOAD DICTIONARY' = 111, 'SYSTEM RELOAD MODEL' = 112, 'SYSTEM RELOAD FUNCTION' = 113, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 114, 'SYSTEM RELOAD' = 115, 'SYSTEM RESTART DISK' = 116, 'SYSTEM MERGES' = 117, 'SYSTEM TTL MERGES' = 118, 'SYSTEM FETCHES' = 119, 'SYSTEM MOVES' = 120, 'SYSTEM DISTRIBUTED SENDS' = 121, 'SYSTEM REPLICATED SENDS' = 122, 'SYSTEM SENDS' = 123, 'SYSTEM REPLICATION QUEUES' = 124, 'SYSTEM DROP REPLICA' = 125, 'SYSTEM SYNC REPLICA' = 126, 'SYSTEM RESTART REPLICA' = 127, 'SYSTEM RESTORE REPLICA' = 128, 'SYSTEM WAIT LOADING PARTS' = 129, 'SYSTEM SYNC DATABASE REPLICA' = 130, 'SYSTEM SYNC TRANSACTION LOG' = 131, 'SYSTEM SYNC FILE CACHE' = 132, 'SYSTEM FLUSH DISTRIBUTED' = 133, 'SYSTEM FLUSH LOGS' = 134, 'SYSTEM FLUSH' = 135, 'SYSTEM THREAD FUZZER' = 136, 'SYSTEM UNFREEZE' = 137, 'SYSTEM FAILPOINT' = 138, 'SYSTEM' = 139, 'dictGet' = 140, 'displaySecretsInShowAndSelect' = 141, 'addressToLine' = 142, 'addressToLineWithInlines' = 143, 'addressToSymbol' = 144, 'demangle' = 145, 'INTROSPECTION' = 146, 'FILE' = 147, 'URL' = 148, 'REMOTE' = 149, 'MONGO' = 150, 'MEILISEARCH' = 151, 'MYSQL' = 152, 'POSTGRES' = 153, 'SQLITE' = 154, 'ODBC' = 155, 'JDBC' = 156, 'HDFS' = 157, 'S3' = 158, 'HIVE' = 159, 'SOURCES' = 160, 'CLUSTER' = 161, 'ALL' = 162, 'NONE' = 163))
 )
 ENGINE = SystemPrivileges
 COMMENT 'SYSTEM TABLE is built on the fly.'
@@ -685,7 +696,8 @@ CREATE TABLE system.projection_parts
     `rows_where_ttl_info.min` Array(DateTime),
     `rows_where_ttl_info.max` Array(DateTime),
     `bytes` UInt64,
-    `marks_size` UInt64
+    `marks_size` UInt64,
+    `part_name` String
 )
 ENGINE = SystemProjectionParts
 COMMENT 'SYSTEM TABLE is built on the fly.'
@@ -739,7 +751,8 @@ CREATE TABLE system.projection_parts_columns
     `column_data_uncompressed_bytes` UInt64,
     `column_marks_bytes` UInt64,
     `bytes` UInt64,
-    `marks_size` UInt64
+    `marks_size` UInt64,
+    `part_name` String
 )
 ENGINE = SystemProjectionPartsColumns
 COMMENT 'SYSTEM TABLE is built on the fly.'
@@ -846,6 +859,7 @@ CREATE TABLE system.replicas
     `is_session_expired` UInt8,
     `future_parts` UInt32,
     `parts_to_check` UInt32,
+    `zookeeper_name` String,
     `zookeeper_path` String,
     `replica_name` String,
     `replica_path` String,
@@ -867,6 +881,7 @@ CREATE TABLE system.replicas
     `absolute_delay` UInt64,
     `total_replicas` UInt8,
     `active_replicas` UInt8,
+    `lost_part_count` UInt64,
     `last_queue_update_exception` String,
     `zookeeper_exception` String,
     `replica_is_active` Map(String, UInt8)
@@ -1024,10 +1039,12 @@ CREATE TABLE system.storage_policies
     `volume_name` String,
     `volume_priority` UInt64,
     `disks` Array(String),
-    `volume_type` String,
+    `volume_type` Enum8('JBOD' = 0, 'SINGLE_DISK' = 1, 'UNKNOWN' = 2),
     `max_data_part_size` UInt64,
     `move_factor` Float32,
-    `prefer_not_to_merge` UInt8
+    `prefer_not_to_merge` UInt8,
+    `perform_ttl_move_on_insert` UInt8,
+    `load_balancing` Enum8('ROUND_ROBIN' = 0, 'LEAST_USED' = 1)
 )
 ENGINE = SystemStoragePolicies
 COMMENT 'SYSTEM TABLE is built on the fly.'
@@ -1110,7 +1127,7 @@ CREATE TABLE system.users
     `name` String,
     `id` UUID,
     `storage` String,
-    `auth_type` Enum8('no_password' = 0, 'plaintext_password' = 1, 'sha256_password' = 2, 'double_sha1_password' = 3, 'ldap' = 4, 'kerberos' = 5, 'ssl_certificate' = 6),
+    `auth_type` Enum8('no_password' = 0, 'plaintext_password' = 1, 'sha256_password' = 2, 'double_sha1_password' = 3, 'ldap' = 4, 'kerberos' = 5, 'ssl_certificate' = 6, 'bcrypt_password' = 7),
     `auth_params` String,
     `host_ip` Array(String),
     `host_names` Array(String),
diff --git a/tests/queries/0_stateless/02125_constant_if_condition_and_not_existing_column.sql b/tests/queries/0_stateless/02125_constant_if_condition_and_not_existing_column.sql
index 4aad7ae3694..822ffb19764 100644
--- a/tests/queries/0_stateless/02125_constant_if_condition_and_not_existing_column.sql
+++ b/tests/queries/0_stateless/02125_constant_if_condition_and_not_existing_column.sql
@@ -6,9 +6,9 @@ insert into test values (0);
 select if(0, y, 42) from test;
 select if(1, 42, y) from test;
 select if(toUInt8(0), y, 42) from test;
-select if(toInt8(0), y, 42) from test;
+select if(toUInt8(0), y, 42) from test;
+select if(toUInt8(1), 42, y) from test;
 select if(toUInt8(1), 42, y) from test;
-select if(toInt8(1), 42, y) from test;
 select if(toUInt8(toUInt8(0)), y, 42) from test;
 select if(cast(cast(0, 'UInt8'), 'UInt8'), y, 42) from test;
 explain syntax select x, if((select hasColumnInTable(currentDatabase(), 'test', 'y')), y, x || '_')  from test;
diff --git a/tests/queries/0_stateless/02125_many_mutations_2.reference b/tests/queries/0_stateless/02125_many_mutations_2.reference
new file mode 100644
index 00000000000..4bdea51dfc1
--- /dev/null
+++ b/tests/queries/0_stateless/02125_many_mutations_2.reference
@@ -0,0 +1,4 @@
+2000
+20000
+0
+1000
diff --git a/tests/queries/0_stateless/02125_many_mutations_2.sh b/tests/queries/0_stateless/02125_many_mutations_2.sh
new file mode 100755
index 00000000000..df170a402c6
--- /dev/null
+++ b/tests/queries/0_stateless/02125_many_mutations_2.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+# Tags: long, no-tsan, no-debug, no-asan, no-msan, no-ubsan
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "create table many_mutations (x UInt32, y UInt32) engine = MergeTree order by x"
+$CLICKHOUSE_CLIENT -q "insert into many_mutations select number, number + 1 from numbers(2000)"
+$CLICKHOUSE_CLIENT -q "system stop merges many_mutations"
+
+$CLICKHOUSE_CLIENT -q "select count() from many_mutations"
+
+job()
+{
+   for i in {1..1000}
+   do
+      $CLICKHOUSE_CLIENT -q "alter table many_mutations delete where y = ${i} * 2 settings mutations_sync=0"
+   done
+}
+
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+job &
+
+wait
+
+$CLICKHOUSE_CLIENT -q "select count() from system.mutations where database = currentDatabase() and table = 'many_mutations' and not is_done"
+$CLICKHOUSE_CLIENT -q "system start merges many_mutations"
+$CLICKHOUSE_CLIENT -q "optimize table many_mutations final"
+$CLICKHOUSE_CLIENT -q "system flush logs"
+$CLICKHOUSE_CLIENT -q "select count() from system.mutations where database = currentDatabase() and table = 'many_mutations' and not is_done"
+$CLICKHOUSE_CLIENT -q "select count() from many_mutations"
+$CLICKHOUSE_CLIENT -q "select * from system.part_log where database = currentDatabase() and table == 'many_mutations' and peak_memory_usage > 1e9"
diff --git a/tests/queries/0_stateless/02125_query_views_log_window_function.sql b/tests/queries/0_stateless/02125_query_views_log_window_function.sql
index 1de2cc95b14..fff1e943c58 100644
--- a/tests/queries/0_stateless/02125_query_views_log_window_function.sql
+++ b/tests/queries/0_stateless/02125_query_views_log_window_function.sql
@@ -1,4 +1,6 @@
+set allow_experimental_analyzer = 0;
 set allow_experimental_window_view = 1;
+
 CREATE TABLE data ( `id` UInt64, `timestamp` DateTime) ENGINE = Memory;
 CREATE WINDOW VIEW wv Engine Memory as select count(id), tumbleStart(w_id) as window_start from data group by tumble(timestamp, INTERVAL '10' SECOND) as w_id;
 
diff --git a/tests/queries/0_stateless/02125_transform_decimal_bug.reference b/tests/queries/0_stateless/02125_transform_decimal_bug.reference
index 7f59d0ee7bf..d1bf333ec8e 100644
--- a/tests/queries/0_stateless/02125_transform_decimal_bug.reference
+++ b/tests/queries/0_stateless/02125_transform_decimal_bug.reference
@@ -1,3 +1,4 @@
+1
 0
 1
 2
diff --git a/tests/queries/0_stateless/02125_transform_decimal_bug.sql b/tests/queries/0_stateless/02125_transform_decimal_bug.sql
index 4ef471ea875..002f60076e9 100644
--- a/tests/queries/0_stateless/02125_transform_decimal_bug.sql
+++ b/tests/queries/0_stateless/02125_transform_decimal_bug.sql
@@ -1,4 +1,4 @@
-SELECT transform(1, [1], [toDecimal32(1, 2)]); -- { serverError 44 }
+SELECT transform(1, [1], [toDecimal32(1, 2)]);
 SELECT transform(toDecimal32(number, 2), [toDecimal32(3, 2)], [toDecimal32(30, 2)]) FROM system.numbers LIMIT 10;
 SELECT transform(toDecimal32(number, 2), [toDecimal32(3, 2)], [toDecimal32(30, 2)], toDecimal32(1000, 2)) FROM system.numbers LIMIT 10;
 SELECT transform(number, [3, 5, 11], [toDecimal32(30, 2), toDecimal32(50, 2), toDecimal32(70,2)], toDecimal32(1000, 2)) FROM system.numbers LIMIT 10;
diff --git a/tests/queries/0_stateless/02126_url_auth.python b/tests/queries/0_stateless/02126_url_auth.python
index 57b16fb413e..9b2e68a017d 100644
--- a/tests/queries/0_stateless/02126_url_auth.python
+++ b/tests/queries/0_stateless/02126_url_auth.python
@@ -12,6 +12,7 @@ import subprocess
 from io import StringIO
 from http.server import BaseHTTPRequestHandler, HTTPServer
 
+
 def is_ipv6(host):
     try:
         socket.inet_aton(host)
@@ -19,6 +20,7 @@ def is_ipv6(host):
     except:
         return True
 
+
 def get_local_port(host, ipv6):
     if ipv6:
         family = socket.AF_INET6
@@ -29,8 +31,9 @@ def get_local_port(host, ipv6):
         fd.bind((host, 0))
         return fd.getsockname()[1]
 
-CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', '127.0.0.1')
-CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
+
+CLICKHOUSE_HOST = os.environ.get("CLICKHOUSE_HOST", "127.0.0.1")
+CLICKHOUSE_PORT_HTTP = os.environ.get("CLICKHOUSE_PORT_HTTP", "8123")
 
 #####################################################################################
 # This test starts an HTTP server and serves data to clickhouse url-engine based table.
@@ -39,27 +42,42 @@ CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
 #####################################################################################
 
 # IP-address of this host accessible from the outside world. Get the first one
-HTTP_SERVER_HOST = subprocess.check_output(['hostname', '-i']).decode('utf-8').strip().split()[0]
+HTTP_SERVER_HOST = (
+    subprocess.check_output(["hostname", "-i"]).decode("utf-8").strip().split()[0]
+)
 IS_IPV6 = is_ipv6(HTTP_SERVER_HOST)
 HTTP_SERVER_PORT = get_local_port(HTTP_SERVER_HOST, IS_IPV6)
 
 # IP address and port of the HTTP server started from this script.
 HTTP_SERVER_ADDRESS = (HTTP_SERVER_HOST, HTTP_SERVER_PORT)
 if IS_IPV6:
-    HTTP_SERVER_URL_STR = 'http://' + f'[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+    HTTP_SERVER_URL_STR = (
+        "http://"
+        + f"[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}"
+        + "/"
+    )
 else:
-    HTTP_SERVER_URL_STR = 'http://' + f'{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+    HTTP_SERVER_URL_STR = (
+        "http://" + f"{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}" + "/"
+    )
+
+CSV_DATA = os.path.join(
+    tempfile._get_default_tempdir(), next(tempfile._get_candidate_names())
+)
 
-CSV_DATA = os.path.join(tempfile._get_default_tempdir(), next(tempfile._get_candidate_names()))
 
 def get_ch_answer(query):
     host = CLICKHOUSE_HOST
     if IS_IPV6:
-        host = f'[{host}]'
+        host = f"[{host}]"
 
-    url = os.environ.get('CLICKHOUSE_URL', 'http://{host}:{port}'.format(host=CLICKHOUSE_HOST, port=CLICKHOUSE_PORT_HTTP))
+    url = os.environ.get(
+        "CLICKHOUSE_URL",
+        "http://{host}:{port}".format(host=CLICKHOUSE_HOST, port=CLICKHOUSE_PORT_HTTP),
+    )
     return urllib.request.urlopen(url, data=query.encode()).read().decode()
 
+
 def check_answers(query, answer):
     ch_answer = get_ch_answer(query)
     if ch_answer.strip() != answer.strip():
@@ -68,15 +86,16 @@ def check_answers(query, answer):
         print("Fetched answer :", ch_answer, file=sys.stderr)
         raise Exception("Fail on query")
 
+
 class CSVHTTPServer(BaseHTTPRequestHandler):
     def _set_headers(self):
         self.send_response(200)
-        self.send_header('Content-type', 'text/csv')
+        self.send_header("Content-type", "text/csv")
         self.end_headers()
 
     def do_GET(self):
         self._set_headers()
-        self.wfile.write(('hello, world').encode())
+        self.wfile.write(("hello, world").encode())
         # with open(CSV_DATA, 'r') as fl:
         #     reader = csv.reader(fl, delimiter=',')
         #     for row in reader:
@@ -84,33 +103,33 @@ class CSVHTTPServer(BaseHTTPRequestHandler):
         return
 
     def read_chunk(self):
-        msg = ''
+        msg = ""
         while True:
             sym = self.rfile.read(1)
-            if sym == '':
+            if sym == "":
                 break
-            msg += sym.decode('utf-8')
-            if msg.endswith('\r\n'):
+            msg += sym.decode("utf-8")
+            if msg.endswith("\r\n"):
                 break
         length = int(msg[:-2], 16)
         if length == 0:
-            return ''
+            return ""
         content = self.rfile.read(length)
-        self.rfile.read(2) # read sep \r\n
-        return content.decode('utf-8')
+        self.rfile.read(2)  # read sep \r\n
+        return content.decode("utf-8")
 
     def do_POST(self):
-        data = ''
+        data = ""
         while True:
             chunk = self.read_chunk()
             if not chunk:
                 break
             data += chunk
         with StringIO(data) as fl:
-            reader = csv.reader(fl, delimiter=',')
-            with open(CSV_DATA, 'a') as d:
+            reader = csv.reader(fl, delimiter=",")
+            with open(CSV_DATA, "a") as d:
                 for row in reader:
-                    d.write(','.join(row) + '\n')
+                    d.write(",".join(row) + "\n")
         self._set_headers()
         self.wfile.write(b"ok")
 
@@ -121,6 +140,7 @@ class CSVHTTPServer(BaseHTTPRequestHandler):
 class HTTPServerV6(HTTPServer):
     address_family = socket.AF_INET6
 
+
 def start_server():
     if IS_IPV6:
         httpd = HTTPServerV6(HTTP_SERVER_ADDRESS, CSVHTTPServer)
@@ -130,57 +150,87 @@ def start_server():
     t = threading.Thread(target=httpd.serve_forever)
     return t, httpd
 
+
 # test section
 
-def test_select(table_name="", schema="str String,numuint UInt32,numint Int32,double Float64", requests=[], answers=[], test_data=""):
-    with open(CSV_DATA, 'w') as f: # clear file
-        f.write('')
+
+def test_select(
+    table_name="",
+    schema="str String,numuint UInt32,numint Int32,double Float64",
+    requests=[],
+    answers=[],
+    test_data="",
+):
+    with open(CSV_DATA, "w") as f:  # clear file
+        f.write("")
 
     if test_data:
-        with open(CSV_DATA, 'w') as f:
+        with open(CSV_DATA, "w") as f:
             f.write(test_data + "\n")
 
     if table_name:
         get_ch_answer("drop table if exists {}".format(table_name))
-        get_ch_answer("create table {} ({}) engine=URL('{}', 'CSV')".format(table_name, schema, HTTP_SERVER_URL_STR))
+        get_ch_answer(
+            "create table {} ({}) engine=URL('{}', 'CSV')".format(
+                table_name, schema, HTTP_SERVER_URL_STR
+            )
+        )
 
     for i in range(len(requests)):
         tbl = table_name
         if not tbl:
-            tbl = "url('{addr}', 'CSV', '{schema}')".format(addr=HTTP_SERVER_URL_STR, schema=schema)
+            tbl = "url('{addr}', 'CSV', '{schema}')".format(
+                addr=HTTP_SERVER_URL_STR, schema=schema
+            )
         check_answers(requests[i].format(tbl=tbl), answers[i])
 
     if table_name:
         get_ch_answer("drop table if exists {}".format(table_name))
 
-def test_insert(table_name="", schema="str String,numuint UInt32,numint Int32,double Float64", requests_insert=[], requests_select=[], answers=[]):
-    with open(CSV_DATA, 'w') as f: # flush test file
-        f.write('')
+
+def test_insert(
+    table_name="",
+    schema="str String,numuint UInt32,numint Int32,double Float64",
+    requests_insert=[],
+    requests_select=[],
+    answers=[],
+):
+    with open(CSV_DATA, "w") as f:  # flush test file
+        f.write("")
 
     if table_name:
         get_ch_answer("drop table if exists {}".format(table_name))
-        get_ch_answer("create table {} ({}) engine=URL('{}', 'CSV')".format(table_name, schema, HTTP_SERVER_URL_STR))
+        get_ch_answer(
+            "create table {} ({}) engine=URL('{}', 'CSV')".format(
+                table_name, schema, HTTP_SERVER_URL_STR
+            )
+        )
 
     for req in requests_insert:
         tbl = table_name
         if not tbl:
-            tbl = "table function url('{addr}', 'CSV', '{schema}')".format(addr=HTTP_SERVER_URL_STR, schema=schema)
+            tbl = "table function url('{addr}', 'CSV', '{schema}')".format(
+                addr=HTTP_SERVER_URL_STR, schema=schema
+            )
         get_ch_answer(req.format(tbl=tbl))
 
-
     for i in range(len(requests_select)):
         tbl = table_name
         if not tbl:
-            tbl = "url('{addr}', 'CSV', '{schema}')".format(addr=HTTP_SERVER_URL_STR, schema=schema)
+            tbl = "url('{addr}', 'CSV', '{schema}')".format(
+                addr=HTTP_SERVER_URL_STR, schema=schema
+            )
         check_answers(requests_select[i].format(tbl=tbl), answers[i])
 
     if table_name:
         get_ch_answer("drop table if exists {}".format(table_name))
 
+
 def test_select_url_engine(requests=[], answers=[], test_data=""):
     for i in range(len(requests)):
         check_answers(requests[i], answers[i])
 
+
 def main():
     test_data = "Hello,2,-2,7.7\nWorld,2,-5,8.8"
     """
@@ -203,19 +253,29 @@ def main():
     """
 
     if IS_IPV6:
-        query = "select * from url('http://guest:guest@" + f'[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}' + "/', 'RawBLOB', 'a String')"
+        query = (
+            "select * from url('http://guest:guest@"
+            + f"[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}"
+            + "/', 'RawBLOB', 'a String')"
+        )
     else:
-        query = "select * from url('http://guest:guest@" + f'{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}' + "/', 'RawBLOB', 'a String')"
-
-
+        query = (
+            "select * from url('http://guest:guest@"
+            + f"{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}"
+            + "/', 'RawBLOB', 'a String')"
+        )
 
     select_requests_url_auth = {
-       query : 'hello, world',
+        query: "hello, world",
     }
 
     t, httpd = start_server()
     t.start()
-    test_select(requests=list(select_requests_url_auth.keys()), answers=list(select_requests_url_auth.values()), test_data=test_data)
+    test_select(
+        requests=list(select_requests_url_auth.keys()),
+        answers=list(select_requests_url_auth.values()),
+        test_data=test_data,
+    )
     httpd.shutdown()
     t.join()
     print("PASSED")
diff --git a/tests/queries/0_stateless/02127_connection_drain.reference b/tests/queries/0_stateless/02127_connection_drain.reference
deleted file mode 100644
index c31f2f40f6d..00000000000
--- a/tests/queries/0_stateless/02127_connection_drain.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-OK: sync drain
-OK: async drain
diff --git a/tests/queries/0_stateless/02127_connection_drain.sh b/tests/queries/0_stateless/02127_connection_drain.sh
deleted file mode 100755
index 523b02d9bd5..00000000000
--- a/tests/queries/0_stateless/02127_connection_drain.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-parallel
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-# sync drain
-for _ in {1..100}; do
-    prev=$(curl -d@- -sS "${CLICKHOUSE_URL}" <<<"select value from system.metrics where metric = 'SyncDrainedConnections'")
-    curl -d@- -sS "${CLICKHOUSE_URL}" <<<"select * from remote('127.{2,3}', view(select * from numbers(1e6))) limit 100 settings drain_timeout=-1 format Null"
-    now=$(curl -d@- -sS "${CLICKHOUSE_URL}" <<<"select value from system.metrics where metric = 'SyncDrainedConnections'")
-    if [[ "$prev" != $(( now-2 )) ]]; then
-        continue
-    fi
-    echo "OK: sync drain"
-    break
-done
-
-# async drain
-for _ in {1..100}; do
-    prev=$(curl -d@- -sS "${CLICKHOUSE_URL}" <<<"select value from system.metrics where metric = 'AsyncDrainedConnections'")
-    curl -d@- -sS "${CLICKHOUSE_URL}" <<<"select * from remote('127.{2,3}', view(select * from numbers(1e6))) limit 100 settings drain_timeout=10 format Null"
-    now=$(curl -d@- -sS "${CLICKHOUSE_URL}" <<<"select value from system.metrics where metric = 'AsyncDrainedConnections'")
-    if [[ "$prev" != $(( now-2 )) ]]; then
-        continue
-    fi
-    echo "OK: async drain"
-    break
-done
diff --git a/tests/queries/0_stateless/02129_add_column_add_ttl.reference b/tests/queries/0_stateless/02129_add_column_add_ttl.reference
index 8b3280ef095..5bffe7b5903 100644
--- a/tests/queries/0_stateless/02129_add_column_add_ttl.reference
+++ b/tests/queries/0_stateless/02129_add_column_add_ttl.reference
@@ -1,41 +1,42 @@
 0		2021-01-01	0
-0		2021-01-01	0
 1		2021-01-01	0
-1		2021-01-01	0
-2		2021-01-01	0
 2		2021-01-01	0
 3		2021-01-01	0
-3		2021-01-01	0
-4		2021-01-01	0
 4		2021-01-01	0
 5		2021-01-01	0
-5		2021-01-01	0
-6		2021-01-01	0
 6		2021-01-01	0
 7		2021-01-01	0
-7		2021-01-01	0
 8		2021-01-01	0
-8		2021-01-01	0
-9		2021-01-01	0
 9		2021-01-01	0
 ==========
 0		2021-01-01	0
+0		2021-01-01	1
+1		2021-01-01	0
+1		2021-01-01	1
+2		2021-01-01	0
+2		2021-01-01	1
+3		2021-01-01	0
+3		2021-01-01	1
+4		2021-01-01	0
+4		2021-01-01	1
+5		2021-01-01	0
+5		2021-01-01	1
+6		2021-01-01	0
+6		2021-01-01	1
+7		2021-01-01	0
+7		2021-01-01	1
+8		2021-01-01	0
+8		2021-01-01	1
+9		2021-01-01	0
+9		2021-01-01	1
+==========
 0		2021-01-01	0
 1		2021-01-01	0
-1		2021-01-01	0
-2		2021-01-01	0
 2		2021-01-01	0
 3		2021-01-01	0
-3		2021-01-01	0
-4		2021-01-01	0
 4		2021-01-01	0
 5		2021-01-01	0
-5		2021-01-01	0
-6		2021-01-01	0
 6		2021-01-01	0
 7		2021-01-01	0
-7		2021-01-01	0
-8		2021-01-01	0
 8		2021-01-01	0
 9		2021-01-01	0
-9		2021-01-01	0
diff --git a/tests/queries/0_stateless/02129_add_column_add_ttl.sql b/tests/queries/0_stateless/02129_add_column_add_ttl.sql
index 7a6dd928a3f..a68868ed3bc 100644
--- a/tests/queries/0_stateless/02129_add_column_add_ttl.sql
+++ b/tests/queries/0_stateless/02129_add_column_add_ttl.sql
@@ -4,10 +4,12 @@ create table ttl_test_02129(a Int64, b String, d Date)
 Engine=MergeTree partition by d order by a
 settings min_bytes_for_wide_part = 0, min_rows_for_wide_part = 0, materialize_ttl_recalculate_only = 0;
 
+system stop ttl merges ttl_test_02129;
+
 insert into ttl_test_02129 select number, '', '2021-01-01' from numbers(10);
 alter table ttl_test_02129 add column c Int64 settings mutations_sync=2;
 
-insert into ttl_test_02129 select number, '', '2021-01-01', 0 from numbers(10);
+insert into ttl_test_02129 select number, '', '2021-01-01', 1 from numbers(10);
 alter table  ttl_test_02129 modify TTL (d + INTERVAL 1 MONTH) DELETE WHERE c=1 settings mutations_sync=2;
 
 select * from ttl_test_02129 order by a, b, d, c;
@@ -21,11 +23,21 @@ create table ttl_test_02129(a Int64, b String, d Date)
 Engine=MergeTree partition by d order by a
 settings min_bytes_for_wide_part = 0, min_rows_for_wide_part = 0, materialize_ttl_recalculate_only = 1;
 
+system stop ttl merges ttl_test_02129;
+
 insert into ttl_test_02129 select number, '', '2021-01-01' from numbers(10);
 alter table ttl_test_02129 add column c Int64 settings mutations_sync=2;
 
-insert into ttl_test_02129 select number, '', '2021-01-01', 0 from numbers(10);
+insert into ttl_test_02129 select number, '', '2021-01-01', 1 from numbers(10);
 alter table  ttl_test_02129 modify TTL (d + INTERVAL 1 MONTH) DELETE WHERE c=1 settings mutations_sync=2;
 
+select * from ttl_test_02129 order by a, b, d, c;
+
+select '==========';
+
+system start ttl merges ttl_test_02129;
+
+optimize table ttl_test_02129 final;
+
 select * from ttl_test_02129 order by a, b, d, c;
 drop table ttl_test_02129;
diff --git a/tests/queries/0_stateless/02136_scalar_read_rows_json.reference b/tests/queries/0_stateless/02136_scalar_read_rows_json.reference
index 49020a4432f..f8335125233 100644
--- a/tests/queries/0_stateless/02136_scalar_read_rows_json.reference
+++ b/tests/queries/0_stateless/02136_scalar_read_rows_json.reference
@@ -30,7 +30,7 @@
 	"meta":
 	[
 		{
-			"type": "Tuple(UInt64, UInt64)"
+			"type": "Tuple(`max(number)` UInt64, `count(number)` UInt64)"
 		}
 	],
 
diff --git a/tests/queries/0_stateless/02136_scalar_read_rows_json.sh b/tests/queries/0_stateless/02136_scalar_read_rows_json.sh
index 34b4b6909b5..1fe345d266d 100755
--- a/tests/queries/0_stateless/02136_scalar_read_rows_json.sh
+++ b/tests/queries/0_stateless/02136_scalar_read_rows_json.sh
@@ -7,4 +7,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 echo "#1"
 ${CLICKHOUSE_CLIENT} --query='SELECT count() FROM numbers(100) FORMAT JSON;' | grep -a -v "elapsed"
 echo "#2"
-${CLICKHOUSE_CLIENT} --query='SELECT (SELECT max(number), count(number) FROM numbers(100000) as n) SETTINGS max_block_size = 65505 FORMAT JSON;' | grep -a -v "elapsed" | grep -v "_subquery"
+${CLICKHOUSE_CLIENT} --query='SELECT (SELECT max(number), count(number) FROM numbers(100000) as n) SETTINGS max_block_size = 65505, allow_experimental_analyzer = 1 FORMAT JSON;' | grep -a -v "elapsed" | grep -v "_subquery"
diff --git a/tests/queries/0_stateless/02148_in_memory_part_flush.reference b/tests/queries/0_stateless/02148_in_memory_part_flush.reference
deleted file mode 100644
index 219c5f4b22f..00000000000
--- a/tests/queries/0_stateless/02148_in_memory_part_flush.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-before DETACH TABLE
-500
-after DETACH TABLE
-500
diff --git a/tests/queries/0_stateless/02148_in_memory_part_flush.sql b/tests/queries/0_stateless/02148_in_memory_part_flush.sql
deleted file mode 100644
index ec20721186e..00000000000
--- a/tests/queries/0_stateless/02148_in_memory_part_flush.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-DROP TABLE IF EXISTS mem_part_flush;
-
-CREATE TABLE mem_part_flush
-(
-`key` UInt32,
-`ts` DateTime,
-`db_time` DateTime DEFAULT now()
-)
-ENGINE = MergeTree
-ORDER BY (key, ts)
-SETTINGS min_rows_for_compact_part = 1000000, min_bytes_for_compact_part = 200000000, in_memory_parts_enable_wal = 0;
-
-INSERT INTO mem_part_flush(key, ts) SELECT number % 1000, now() + intDiv(number,1000) FROM numbers(500);
-
-SELECT 'before DETACH TABLE';
-SELECT count(*) FROM mem_part_flush;
-
-DETACH TABLE mem_part_flush;
-
-ATTACH TABLE mem_part_flush;
-
-SELECT 'after DETACH TABLE';
-SELECT count(*) FROM mem_part_flush;
-
-
-DROP TABLE mem_part_flush;
diff --git a/tests/queries/0_stateless/02149_external_schema_inference.sh b/tests/queries/0_stateless/02149_external_schema_inference.sh
index df2b9a43565..5e03120c80f 100755
--- a/tests/queries/0_stateless/02149_external_schema_inference.sh
+++ b/tests/queries/0_stateless/02149_external_schema_inference.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 
 USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
-FILE_NAME=test_02149.data
+FILE_NAME=test_$CLICKHOUSE_TEST_UNIQUE_NAME.data
 DATA_FILE=$USER_FILES_PATH/$FILE_NAME
 
 touch $DATA_FILE
diff --git a/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.reference b/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.reference
index 71ca326f952..d1662cdeb81 100644
--- a/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.reference
+++ b/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.reference
@@ -66,6 +66,18 @@ ExpressionTransform
       ExpressionTransform
         (ReadFromMergeTree)
         MergeTreeInOrder 0 → 1
+(Expression)
+ExpressionTransform
+  (Limit)
+  Limit
+    (Sorting)
+      (Expression)
+      ExpressionTransform
+        (Expression)
+        ExpressionTransform
+          (ReadFromMergeTree)
+          ExpressionTransform
+            MergeTreeInOrder 0 → 1
 2020-10-11	0	0
 2020-10-11	0	10
 2020-10-11	0	20
@@ -82,6 +94,20 @@ ExpressionTransform
         ExpressionTransform
           (ReadFromMergeTree)
           MergeTreeInOrder 0 → 1
+(Expression)
+ExpressionTransform
+  (Limit)
+  Limit
+    (Sorting)
+    FinishSortingTransform
+      PartialSortingTransform
+        (Expression)
+        ExpressionTransform
+          (Expression)
+          ExpressionTransform
+            (ReadFromMergeTree)
+            ExpressionTransform
+              MergeTreeInOrder 0 → 1
 2020-10-12	0
 2020-10-12	1
 2020-10-12	2
@@ -104,6 +130,19 @@ ExpressionTransform
         (ReadFromMergeTree)
         ReverseTransform
           MergeTreeReverse 0 → 1
+(Expression)
+ExpressionTransform
+  (Limit)
+  Limit
+    (Sorting)
+      (Expression)
+      ExpressionTransform
+        (Expression)
+        ExpressionTransform
+          (ReadFromMergeTree)
+          ExpressionTransform
+            ReverseTransform
+              MergeTreeReverse 0 → 1
 2020-10-12	99999
 2020-10-12	99998
 2020-10-12	99997
diff --git a/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.sql b/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.sql
index f50aab67d77..5e662bd7842 100644
--- a/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.sql
+++ b/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.sql
@@ -21,17 +21,20 @@ SELECT toStartOfMonth(date) as d, i FROM t_read_in_order ORDER BY d, -i LIMIT 5;
 EXPLAIN PIPELINE SELECT toStartOfMonth(date) as d, i FROM t_read_in_order ORDER BY d, -i LIMIT 5;
 
 SELECT date, i FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i LIMIT 5;
-EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i LIMIT 5;
+EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i LIMIT 5 settings allow_experimental_analyzer=0;
+EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i LIMIT 5 settings allow_experimental_analyzer=1;
 
 SELECT * FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i, v LIMIT 5;
-EXPLAIN PIPELINE SELECT * FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i, v LIMIT 5;
+EXPLAIN PIPELINE SELECT * FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i, v LIMIT 5 settings allow_experimental_analyzer=0;
+EXPLAIN PIPELINE SELECT * FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i, v LIMIT 5 settings allow_experimental_analyzer=1;
 
 INSERT INTO t_read_in_order SELECT '2020-10-12', number, number FROM numbers(100000);
 
 SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i LIMIT 5;
 
 EXPLAIN SYNTAX SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5;
-EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5;
+EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5 settings allow_experimental_analyzer=0;
+EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5 settings allow_experimental_analyzer=1;
 SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5;
 
 DROP TABLE IF EXISTS t_read_in_order;
diff --git a/tests/queries/0_stateless/02149_schema_inference.sh b/tests/queries/0_stateless/02149_schema_inference.sh
index 1ccec240627..79b26f5b3f2 100755
--- a/tests/queries/0_stateless/02149_schema_inference.sh
+++ b/tests/queries/0_stateless/02149_schema_inference.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 
 USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
-FILE_NAME=test_02149.data
+FILE_NAME=test_$CLICKHOUSE_TEST_UNIQUE_NAME.data
 DATA_FILE=${USER_FILES_PATH:?}/$FILE_NAME
 
 touch $DATA_FILE
diff --git a/tests/queries/0_stateless/02149_schema_inference_formats_with_schema.reference b/tests/queries/0_stateless/02149_schema_inference_formats_with_schema.reference
index 47391a77ee8..9a7a1611a7b 100644
--- a/tests/queries/0_stateless/02149_schema_inference_formats_with_schema.reference
+++ b/tests/queries/0_stateless/02149_schema_inference_formats_with_schema.reference
@@ -422,9 +422,9 @@ float32	Float32
 float64	Float64					
 0	0
 1.2	0.7692307692307692
-date	Int32					
-0
-1
+date	Date32					
+1970-01-01
+1970-01-02
 str	String					
 fixed_string	FixedString(3)					
 Str: 0	100
diff --git a/tests/queries/0_stateless/02149_schema_inference_formats_with_schema.sh b/tests/queries/0_stateless/02149_schema_inference_formats_with_schema.sh
index d263ef63681..cf5a086fb5e 100755
--- a/tests/queries/0_stateless/02149_schema_inference_formats_with_schema.sh
+++ b/tests/queries/0_stateless/02149_schema_inference_formats_with_schema.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 
 USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
-FILE_NAME=test_02149.data
+FILE_NAME=test_$CLICKHOUSE_TEST_UNIQUE_NAME.data
 DATA_FILE=$USER_FILES_PATH/$FILE_NAME
 
 for format in Arrow ArrowStream Parquet ORC Native TSVWithNamesAndTypes TSVRawWithNamesAndTypes CSVWithNamesAndTypes JSONCompactEachRowWithNamesAndTypes JSONCompactStringsEachRowWithNamesAndTypes RowBinaryWithNamesAndTypes CustomSeparatedWithNamesAndTypes
diff --git a/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh b/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh
index ccd6f89e752..4a1eea0a238 100755
--- a/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh
+++ b/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long
+# Tags: long, no-tsan
 
 # shellcheck disable=SC2154
 
diff --git a/tests/queries/0_stateless/02153_native_bounds_check.sh b/tests/queries/0_stateless/02153_native_bounds_check.sh
deleted file mode 100755
index a3475ddacae..00000000000
--- a/tests/queries/0_stateless/02153_native_bounds_check.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-# Should correctly handle error.
-
-${CLICKHOUSE_LOCAL} --query "SELECT toString(number) AS a, toString(number) AS a FROM numbers(10)" --output-format Native |
-    ${CLICKHOUSE_LOCAL} --query "SELECT * FROM table" --input-format Native --structure 'a LowCardinality(String)' 2>&1 |
-    grep -c -F Exception
diff --git a/tests/queries/0_stateless/02154_dictionary_get_http_json.reference b/tests/queries/0_stateless/02154_dictionary_get_http_json.reference
index 7106f551cd7..201d3b122e8 100644
--- a/tests/queries/0_stateless/02154_dictionary_get_http_json.reference
+++ b/tests/queries/0_stateless/02154_dictionary_get_http_json.reference
@@ -3,11 +3,11 @@
 	"meta":
 	[
 		{
-			"name": "dictGet(02154_test_dictionary, 'value', toUInt64(0))",
+			"name": "dictGet('02154_test_dictionary', 'value', toUInt64(0))",
 			"type": "String"
 		},
 		{
-			"name": "dictGet(02154_test_dictionary, 'value', toUInt64(1))",
+			"name": "dictGet('02154_test_dictionary', 'value', toUInt64(1))",
 			"type": "String"
 		}
 	],
@@ -15,8 +15,8 @@
 	"data":
 	[
 		{
-			"dictGet(02154_test_dictionary, 'value', toUInt64(0))": "Value",
-			"dictGet(02154_test_dictionary, 'value', toUInt64(1))": ""
+			"dictGet('02154_test_dictionary', 'value', toUInt64(0))": "Value",
+			"dictGet('02154_test_dictionary', 'value', toUInt64(1))": ""
 		}
 	],
 
diff --git a/tests/queries/0_stateless/02154_dictionary_get_http_json.sh b/tests/queries/0_stateless/02154_dictionary_get_http_json.sh
index a2bce866c76..fbaf67fff2f 100755
--- a/tests/queries/0_stateless/02154_dictionary_get_http_json.sh
+++ b/tests/queries/0_stateless/02154_dictionary_get_http_json.sh
@@ -32,6 +32,7 @@ $CLICKHOUSE_CLIENT -q """
 
 echo """
     SELECT dictGet(02154_test_dictionary, 'value', toUInt64(0)), dictGet(02154_test_dictionary, 'value', toUInt64(1))
+    SETTINGS allow_experimental_analyzer = 1
     FORMAT JSON
 """ | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}&wait_end_of_query=1&output_format_write_statistics=0" -d @-
 
diff --git a/tests/queries/0_stateless/02158_proportions_ztest_cmp.python b/tests/queries/0_stateless/02158_proportions_ztest_cmp.python
index d622004db28..0555f8c36ec 100644
--- a/tests/queries/0_stateless/02158_proportions_ztest_cmp.python
+++ b/tests/queries/0_stateless/02158_proportions_ztest_cmp.python
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3                                                                                                                                                                                              
+#!/usr/bin/env python3
 import os
 import sys
 from math import sqrt, nan
@@ -8,7 +8,7 @@ import pandas as pd
 import numpy as np
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
 from pure_http_client import ClickHouseClient
 
@@ -25,7 +25,7 @@ def twosample_proportion_ztest(s1, s2, t1, t2, alpha):
         return nan, nan, nan, nan
     z_stat = (p1 - p2) / se
 
-    one_side  = 1 - stats.norm.cdf(abs(z_stat))
+    one_side = 1 - stats.norm.cdf(abs(z_stat))
     p_value = one_side * 2
 
     z = stats.norm.ppf(1 - 0.5 * alpha)
@@ -38,71 +38,171 @@ def twosample_proportion_ztest(s1, s2, t1, t2, alpha):
 def test_and_check(name, z_stat, p_value, ci_lower, ci_upper, precision=1e-2):
     client = ClickHouseClient()
     real = client.query_return_df(
-        "SELECT roundBankers({}.1, 16) as z_stat, ".format(name) +
-               "roundBankers({}.2, 16) as p_value, ".format(name) + 
-               "roundBankers({}.3, 16) as ci_lower, ".format(name) + 
-               "roundBankers({}.4, 16) as ci_upper ".format(name) + 
-        "FORMAT TabSeparatedWithNames;")
-    real_z_stat = real['z_stat'][0]
-    real_p_value = real['p_value'][0]
-    real_ci_lower = real['ci_lower'][0]
-    real_ci_upper  = real['ci_upper'][0]
-    assert((np.isnan(real_z_stat) and np.isnan(z_stat)) or abs(real_z_stat - np.float64(z_stat)) < precision), "clickhouse_z_stat {}, py_z_stat {}".format(real_z_stat, z_stat)
-    assert((np.isnan(real_p_value) and np.isnan(p_value)) or abs(real_p_value - np.float64(p_value)) < precision), "clickhouse_p_value {}, py_p_value {}".format(real_p_value, p_value)
-    assert((np.isnan(real_ci_lower) and np.isnan(ci_lower)) or abs(real_ci_lower - np.float64(ci_lower)) < precision), "clickhouse_ci_lower {}, py_ci_lower {}".format(real_ci_lower, ci_lower)
-    assert((np.isnan(real_ci_upper) and np.isnan(ci_upper)) or abs(real_ci_upper - np.float64(ci_upper)) < precision), "clickhouse_ci_upper {}, py_ci_upper {}".format(real_ci_upper, ci_upper)
+        "SELECT roundBankers({}.1, 16) as z_stat, ".format(name)
+        + "roundBankers({}.2, 16) as p_value, ".format(name)
+        + "roundBankers({}.3, 16) as ci_lower, ".format(name)
+        + "roundBankers({}.4, 16) as ci_upper ".format(name)
+        + "FORMAT TabSeparatedWithNames;"
+    )
+    real_z_stat = real["z_stat"][0]
+    real_p_value = real["p_value"][0]
+    real_ci_lower = real["ci_lower"][0]
+    real_ci_upper = real["ci_upper"][0]
+    assert (np.isnan(real_z_stat) and np.isnan(z_stat)) or abs(
+        real_z_stat - np.float64(z_stat)
+    ) < precision, "clickhouse_z_stat {}, py_z_stat {}".format(real_z_stat, z_stat)
+    assert (np.isnan(real_p_value) and np.isnan(p_value)) or abs(
+        real_p_value - np.float64(p_value)
+    ) < precision, "clickhouse_p_value {}, py_p_value {}".format(real_p_value, p_value)
+    assert (np.isnan(real_ci_lower) and np.isnan(ci_lower)) or abs(
+        real_ci_lower - np.float64(ci_lower)
+    ) < precision, "clickhouse_ci_lower {}, py_ci_lower {}".format(
+        real_ci_lower, ci_lower
+    )
+    assert (np.isnan(real_ci_upper) and np.isnan(ci_upper)) or abs(
+        real_ci_upper - np.float64(ci_upper)
+    ) < precision, "clickhouse_ci_upper {}, py_ci_upper {}".format(
+        real_ci_upper, ci_upper
+    )
 
 
 def test_mean_ztest():
     counts = [0, 0]
     nobs = [0, 0]
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(counts[0], counts[1], nobs[0], nobs[1], 0.05)
-    test_and_check("proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')" % (counts[0], counts[1], nobs[0], nobs[1]), z_stat, p_value, ci_lower, ci_upper)
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(10, 10, 10, 10, 0.05)
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        counts[0], counts[1], nobs[0], nobs[1], 0.05
+    )
+    test_and_check(
+        "proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')"
+        % (counts[0], counts[1], nobs[0], nobs[1]),
+        z_stat,
+        p_value,
+        ci_lower,
+        ci_upper,
+    )
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        10, 10, 10, 10, 0.05
+    )
 
     counts = [10, 10]
     nobs = [10, 10]
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(counts[0], counts[1], nobs[0], nobs[1], 0.05)
-    test_and_check("proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')" % (counts[0], counts[1], nobs[0], nobs[1]), z_stat, p_value, ci_lower, ci_upper)
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(10, 10, 10, 10, 0.05)
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        counts[0], counts[1], nobs[0], nobs[1], 0.05
+    )
+    test_and_check(
+        "proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')"
+        % (counts[0], counts[1], nobs[0], nobs[1]),
+        z_stat,
+        p_value,
+        ci_lower,
+        ci_upper,
+    )
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        10, 10, 10, 10, 0.05
+    )
 
     counts = [16, 16]
     nobs = [16, 18]
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(counts[0], counts[1], nobs[0], nobs[1], 0.05)
-    test_and_check("proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')" % (counts[0], counts[1], nobs[0], nobs[1]), z_stat, p_value, ci_lower, ci_upper)
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        counts[0], counts[1], nobs[0], nobs[1], 0.05
+    )
+    test_and_check(
+        "proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')"
+        % (counts[0], counts[1], nobs[0], nobs[1]),
+        z_stat,
+        p_value,
+        ci_lower,
+        ci_upper,
+    )
 
     counts = [10, 20]
     nobs = [30, 40]
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(counts[0], counts[1], nobs[0], nobs[1], 0.05)
-    test_and_check("proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')" % (counts[0], counts[1], nobs[0], nobs[1]), z_stat, p_value, ci_lower, ci_upper)
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        counts[0], counts[1], nobs[0], nobs[1], 0.05
+    )
+    test_and_check(
+        "proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')"
+        % (counts[0], counts[1], nobs[0], nobs[1]),
+        z_stat,
+        p_value,
+        ci_lower,
+        ci_upper,
+    )
 
     counts = [20, 10]
     nobs = [40, 30]
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(counts[0], counts[1], nobs[0], nobs[1], 0.05)
-    test_and_check("proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')" % (counts[0], counts[1], nobs[0], nobs[1]), z_stat, p_value, ci_lower, ci_upper)
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        counts[0], counts[1], nobs[0], nobs[1], 0.05
+    )
+    test_and_check(
+        "proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')"
+        % (counts[0], counts[1], nobs[0], nobs[1]),
+        z_stat,
+        p_value,
+        ci_lower,
+        ci_upper,
+    )
 
-    counts = [randrange(10,20), randrange(10,20)]
-    nobs = [randrange(counts[0] + 1, counts[0] * 2), randrange(counts[1], counts[1] * 2)]
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(counts[0], counts[1], nobs[0], nobs[1], 0.05)
-    test_and_check("proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')" % (counts[0], counts[1], nobs[0], nobs[1]), z_stat, p_value, ci_lower, ci_upper)
+    counts = [randrange(10, 20), randrange(10, 20)]
+    nobs = [
+        randrange(counts[0] + 1, counts[0] * 2),
+        randrange(counts[1], counts[1] * 2),
+    ]
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        counts[0], counts[1], nobs[0], nobs[1], 0.05
+    )
+    test_and_check(
+        "proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')"
+        % (counts[0], counts[1], nobs[0], nobs[1]),
+        z_stat,
+        p_value,
+        ci_lower,
+        ci_upper,
+    )
 
-    counts = [randrange(1,100), randrange(1,200)]
+    counts = [randrange(1, 100), randrange(1, 200)]
     nobs = [randrange(counts[0], counts[0] * 2), randrange(counts[1], counts[1] * 3)]
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(counts[0], counts[1], nobs[0], nobs[1], 0.05)
-    test_and_check("proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')" % (counts[0], counts[1], nobs[0], nobs[1]), z_stat, p_value, ci_lower, ci_upper)
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        counts[0], counts[1], nobs[0], nobs[1], 0.05
+    )
+    test_and_check(
+        "proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')"
+        % (counts[0], counts[1], nobs[0], nobs[1]),
+        z_stat,
+        p_value,
+        ci_lower,
+        ci_upper,
+    )
 
-    counts = [randrange(1,200), randrange(1,100)]
+    counts = [randrange(1, 200), randrange(1, 100)]
     nobs = [randrange(counts[0], counts[0] * 3), randrange(counts[1], counts[1] * 2)]
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(counts[0], counts[1], nobs[0], nobs[1], 0.05)
-    test_and_check("proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')" % (counts[0], counts[1], nobs[0], nobs[1]), z_stat, p_value, ci_lower, ci_upper)
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        counts[0], counts[1], nobs[0], nobs[1], 0.05
+    )
+    test_and_check(
+        "proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')"
+        % (counts[0], counts[1], nobs[0], nobs[1]),
+        z_stat,
+        p_value,
+        ci_lower,
+        ci_upper,
+    )
 
-    counts = [randrange(1,1000), randrange(1,1000)]
+    counts = [randrange(1, 1000), randrange(1, 1000)]
     nobs = [randrange(counts[0], counts[0] * 2), randrange(counts[1], counts[1] * 2)]
-    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(counts[0], counts[1], nobs[0], nobs[1], 0.05)
-    test_and_check("proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')" % (counts[0], counts[1], nobs[0], nobs[1]), z_stat, p_value, ci_lower, ci_upper)
+    z_stat, p_value, ci_lower, ci_upper = twosample_proportion_ztest(
+        counts[0], counts[1], nobs[0], nobs[1], 0.05
+    )
+    test_and_check(
+        "proportionsZTest(%d, %d, %d, %d, 0.95, 'unpooled')"
+        % (counts[0], counts[1], nobs[0], nobs[1]),
+        z_stat,
+        p_value,
+        ci_lower,
+        ci_upper,
+    )
 
 
 if __name__ == "__main__":
     test_mean_ztest()
     print("Ok.")
-
diff --git a/tests/queries/0_stateless/02158_ztest_cmp.python b/tests/queries/0_stateless/02158_ztest_cmp.python
index 8fc22d78e74..9591a150337 100644
--- a/tests/queries/0_stateless/02158_ztest_cmp.python
+++ b/tests/queries/0_stateless/02158_ztest_cmp.python
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3                                                                                                                                                                                              
+#!/usr/bin/env python3
 import os
 import sys
 from statistics import variance
@@ -7,7 +7,7 @@ import pandas as pd
 import numpy as np
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
 from pure_http_client import ClickHouseClient
 
@@ -30,46 +30,95 @@ def twosample_mean_ztest(rvs1, rvs2, alpha=0.05):
 def test_and_check(name, a, b, t_stat, p_value, ci_low, ci_high, precision=1e-2):
     client = ClickHouseClient()
     client.query("DROP TABLE IF EXISTS ztest;")
-    client.query("CREATE TABLE ztest (left Float64, right UInt8) ENGINE = Memory;");
-    client.query("INSERT INTO ztest VALUES {};".format(", ".join(['({},{})'.format(i, 0) for i in a])))
-    client.query("INSERT INTO ztest VALUES {};".format(", ".join(['({},{})'.format(j, 1) for j in b])))
+    client.query("CREATE TABLE ztest (left Float64, right UInt8) ENGINE = Memory;")
+    client.query(
+        "INSERT INTO ztest VALUES {};".format(
+            ", ".join(["({},{})".format(i, 0) for i in a])
+        )
+    )
+    client.query(
+        "INSERT INTO ztest VALUES {};".format(
+            ", ".join(["({},{})".format(j, 1) for j in b])
+        )
+    )
     real = client.query_return_df(
-        "SELECT roundBankers({}(left, right).1, 16) as t_stat, ".format(name) +
-               "roundBankers({}(left, right).2, 16) as p_value, ".format(name) + 
-               "roundBankers({}(left, right).3, 16) as ci_low, ".format(name) + 
-               "roundBankers({}(left, right).4, 16) as ci_high ".format(name) + 
-        "FROM ztest FORMAT TabSeparatedWithNames;")
-    real_t_stat = real['t_stat'][0]
-    real_p_value = real['p_value'][0]
-    real_ci_low = real['ci_low'][0]
-    real_ci_high  = real['ci_high'][0]
-    assert(abs(real_t_stat - np.float64(t_stat)) < precision), "clickhouse_t_stat {}, py_t_stat {}".format(real_t_stat, t_stat)
-    assert(abs(real_p_value - np.float64(p_value)) < precision), "clickhouse_p_value {}, py_p_value {}".format(real_p_value, p_value)
-    assert(abs(real_ci_low - np.float64(ci_low)) < precision), "clickhouse_ci_low {}, py_ci_low {}".format(real_ci_low, ci_low)
-    assert(abs(real_ci_high - np.float64(ci_high)) < precision), "clickhouse_ci_high {}, py_ci_high {}".format(real_ci_high, ci_high)
+        "SELECT roundBankers({}(left, right).1, 16) as t_stat, ".format(name)
+        + "roundBankers({}(left, right).2, 16) as p_value, ".format(name)
+        + "roundBankers({}(left, right).3, 16) as ci_low, ".format(name)
+        + "roundBankers({}(left, right).4, 16) as ci_high ".format(name)
+        + "FROM ztest FORMAT TabSeparatedWithNames;"
+    )
+    real_t_stat = real["t_stat"][0]
+    real_p_value = real["p_value"][0]
+    real_ci_low = real["ci_low"][0]
+    real_ci_high = real["ci_high"][0]
+    assert (
+        abs(real_t_stat - np.float64(t_stat)) < precision
+    ), "clickhouse_t_stat {}, py_t_stat {}".format(real_t_stat, t_stat)
+    assert (
+        abs(real_p_value - np.float64(p_value)) < precision
+    ), "clickhouse_p_value {}, py_p_value {}".format(real_p_value, p_value)
+    assert (
+        abs(real_ci_low - np.float64(ci_low)) < precision
+    ), "clickhouse_ci_low {}, py_ci_low {}".format(real_ci_low, ci_low)
+    assert (
+        abs(real_ci_high - np.float64(ci_high)) < precision
+    ), "clickhouse_ci_high {}, py_ci_high {}".format(real_ci_high, ci_high)
     client.query("DROP TABLE IF EXISTS ztest;")
 
 
 def test_mean_ztest():
-    rvs1 = np.round(stats.norm.rvs(loc=1, scale=5,size=500), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=10, scale=5,size=500), 2)
+    rvs1 = np.round(stats.norm.rvs(loc=1, scale=5, size=500), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=10, scale=5, size=500), 2)
     s, p, cl, ch = twosample_mean_ztest(rvs1, rvs2)
-    test_and_check("meanZTest(%f, %f, 0.95)" % (variance(rvs1), variance(rvs2)), rvs1, rvs2, s, p, cl, ch)
+    test_and_check(
+        "meanZTest(%f, %f, 0.95)" % (variance(rvs1), variance(rvs2)),
+        rvs1,
+        rvs2,
+        s,
+        p,
+        cl,
+        ch,
+    )
 
-    rvs1 = np.round(stats.norm.rvs(loc=0, scale=5,size=500), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=0, scale=5,size=500), 2)
+    rvs1 = np.round(stats.norm.rvs(loc=0, scale=5, size=500), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=0, scale=5, size=500), 2)
     s, p, cl, ch = twosample_mean_ztest(rvs1, rvs2)
-    test_and_check("meanZTest(%f, %f, 0.95)" % (variance(rvs1), variance(rvs2)), rvs1, rvs2, s, p, cl, ch)
+    test_and_check(
+        "meanZTest(%f, %f, 0.95)" % (variance(rvs1), variance(rvs2)),
+        rvs1,
+        rvs2,
+        s,
+        p,
+        cl,
+        ch,
+    )
 
-    rvs1 = np.round(stats.norm.rvs(loc=2, scale=10,size=512), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=5, scale=20,size=1024), 2)
+    rvs1 = np.round(stats.norm.rvs(loc=2, scale=10, size=512), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=5, scale=20, size=1024), 2)
     s, p, cl, ch = twosample_mean_ztest(rvs1, rvs2)
-    test_and_check("meanZTest(%f, %f, 0.95)" % (variance(rvs1), variance(rvs2)), rvs1, rvs2, s, p, cl, ch)
+    test_and_check(
+        "meanZTest(%f, %f, 0.95)" % (variance(rvs1), variance(rvs2)),
+        rvs1,
+        rvs2,
+        s,
+        p,
+        cl,
+        ch,
+    )
 
-    rvs1 = np.round(stats.norm.rvs(loc=0, scale=10,size=1024), 2)
-    rvs2 = np.round(stats.norm.rvs(loc=0, scale=10,size=512), 2)
+    rvs1 = np.round(stats.norm.rvs(loc=0, scale=10, size=1024), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=0, scale=10, size=512), 2)
     s, p, cl, ch = twosample_mean_ztest(rvs1, rvs2)
-    test_and_check("meanZTest(%f, %f, 0.95)" % (variance(rvs1), variance(rvs2)), rvs1, rvs2, s, p, cl, ch)
+    test_and_check(
+        "meanZTest(%f, %f, 0.95)" % (variance(rvs1), variance(rvs2)),
+        rvs1,
+        rvs2,
+        s,
+        p,
+        cl,
+        ch,
+    )
 
 
 if __name__ == "__main__":
diff --git a/tests/queries/0_stateless/02160_untuple_exponential_growth.sh b/tests/queries/0_stateless/02160_untuple_exponential_growth.sh
index 9ec6594af69..2bc8f74a524 100755
--- a/tests/queries/0_stateless/02160_untuple_exponential_growth.sh
+++ b/tests/queries/0_stateless/02160_untuple_exponential_growth.sh
@@ -7,5 +7,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # Should finish in reasonable time (milliseconds).
 # In previous versions this query led to exponential complexity of query analysis.
 
-${CLICKHOUSE_LOCAL} --query "SELECT untuple(tuple(untuple((1, untuple((untuple(tuple(untuple(tuple(untuple((untuple((1, 1, 1, 1)), 1, 1, 1)))))), 1, 1))))))" 2>&1 | grep -cF 'TOO_BIG_AST'
-${CLICKHOUSE_LOCAL} --query "SELECT untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple((1, 1, 1, 1, 1))))))))))))))))))))))))))" 2>&1 | grep -cF 'TOO_BIG_AST'
+${CLICKHOUSE_LOCAL} --query "SELECT untuple(tuple(untuple((1, untuple((untuple(tuple(untuple(tuple(untuple((untuple((1, 1, 1, 1)), 1, 1, 1)))))), 1, 1))))))" 2>&1 | grep -cF 'too big'
+${CLICKHOUSE_LOCAL} --query "SELECT untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple(tuple(untuple((1, 1, 1, 1, 1))))))))))))))))))))))))))" 2>&1 | grep -cF 'too big'
diff --git a/tests/queries/0_stateless/02163_operators.sql b/tests/queries/0_stateless/02163_operators.sql
index 4968e448ab2..3f2d7d8bbb7 100644
--- a/tests/queries/0_stateless/02163_operators.sql
+++ b/tests/queries/0_stateless/02163_operators.sql
@@ -1,2 +1,2 @@
-WITH 2 AS `b.c`, [4, 5] AS a, 6 AS u, 3 AS v, 2 AS d, TRUE AS e, 1 AS f, 0 AS g, 2 AS h, 'Hello' AS i, 'World' AS j, TIMESTAMP '2022-02-02 02:02:02' AS w, [] AS k, (1, 2) AS l, 2 AS m, 3 AS n, [] AS o, [1] AS p, 1 AS q, q AS r, 1 AS s, 1 AS t
-SELECT INTERVAL CASE CASE WHEN NOT -a[b.c] * u DIV v + d IS NOT NULL AND e OR f BETWEEN g AND h THEN i ELSE j END WHEN w THEN k END || [l, (m, n)] MINUTE IS NULL OR NOT o::Array(INT) = p <> q < r > s != t AS upyachka;
+WITH 2 AS `b.c`, [4, 5] AS a, 6 AS u, 3 AS v, 2 AS d, TRUE AS e, 1 AS f, 0 AS g, 2 AS h, 'Hello' AS i, 'World' AS j, 'hi' AS w, NULL AS k, (1, 2) AS l, 2 AS m, 3 AS n, [] AS o, [1] AS p, 1 AS q, q AS r, 1 AS s, 1 AS t
+SELECT INTERVAL CASE CASE WHEN NOT -a[`b.c`] * u DIV v + d IS NOT NULL AND e OR f BETWEEN g AND h THEN i ELSE j END WHEN w THEN k END || [l, (m, n)] MINUTE IS NULL OR NOT o::Array(INT) = p <> q < r > s != t AS upyachka;
diff --git a/tests/queries/0_stateless/02163_shard_num.reference b/tests/queries/0_stateless/02163_shard_num.reference
index a109d5d2b6b..77eea7c95b9 100644
--- a/tests/queries/0_stateless/02163_shard_num.reference
+++ b/tests/queries/0_stateless/02163_shard_num.reference
@@ -1,4 +1,5 @@
--- { echo }
+-- { echoOn }
+
 SELECT shardNum() AS shard_num, sum(1) as rows FROM remote('127.{1,2}', system, one) GROUP BY _shard_num;
 2	1
 1	1
@@ -14,4 +15,4 @@ SELECT _shard_num AS shard_num, sum(1) as rows FROM remote('127.{1,2}', system,
 SELECT a._shard_num AS shard_num, sum(1) as rows FROM remote('127.{1,2}', system, one) a GROUP BY shard_num;
 2	1
 1	1
-SELECT _shard_num FROM remote('127.1', system.one) AS a INNER JOIN (SELECT _shard_num FROM system.one) AS b USING (dummy); -- { serverError UNKNOWN_IDENTIFIER }
+SELECT _shard_num FROM remote('127.1', system.one) AS a INNER JOIN (SELECT _shard_num FROM system.one) AS b USING (dummy); -- { serverError UNSUPPORTED_METHOD, UNKNOWN_IDENTIFIER }
diff --git a/tests/queries/0_stateless/02163_shard_num.sql b/tests/queries/0_stateless/02163_shard_num.sql
index 27d40b3c976..cc87140ebaf 100644
--- a/tests/queries/0_stateless/02163_shard_num.sql
+++ b/tests/queries/0_stateless/02163_shard_num.sql
@@ -1,7 +1,10 @@
--- { echo }
+-- { echoOn }
+
 SELECT shardNum() AS shard_num, sum(1) as rows FROM remote('127.{1,2}', system, one) GROUP BY _shard_num;
 SELECT shardNum() AS shard_num, sum(1) as rows FROM remote('127.{1,2}', system, one) GROUP BY shard_num;
 SELECT _shard_num AS shard_num, sum(1) as rows FROM remote('127.{1,2}', system, one) GROUP BY _shard_num;
 SELECT _shard_num AS shard_num, sum(1) as rows FROM remote('127.{1,2}', system, one) GROUP BY shard_num;
 SELECT a._shard_num AS shard_num, sum(1) as rows FROM remote('127.{1,2}', system, one) a GROUP BY shard_num;
-SELECT _shard_num FROM remote('127.1', system.one) AS a INNER JOIN (SELECT _shard_num FROM system.one) AS b USING (dummy); -- { serverError UNKNOWN_IDENTIFIER }
+SELECT _shard_num FROM remote('127.1', system.one) AS a INNER JOIN (SELECT _shard_num FROM system.one) AS b USING (dummy); -- { serverError UNSUPPORTED_METHOD, UNKNOWN_IDENTIFIER }
+
+-- { echoOff }
diff --git a/tests/queries/0_stateless/02169_map_functions.reference b/tests/queries/0_stateless/02169_map_functions.reference
index 160aebbc852..10746a70f06 100644
--- a/tests/queries/0_stateless/02169_map_functions.reference
+++ b/tests/queries/0_stateless/02169_map_functions.reference
@@ -26,8 +26,81 @@
 {}
 {}
 {}
+{'key3':100,'key2':101,'key4':102,'key5':500,'key6':600}
+{'key3':101,'key2':102,'key4':103,'key5':500,'key6':600}
+{'key3':102,'key2':103,'key4':104,'key5':500,'key6':600}
+{'key3':103,'key2':104,'key4':105,'key5':500,'key6':600}
+{'key1':1111,'key2':2222,'key5':500,'key6':600}
+{'key1':1112,'key2':2224,'key5':500,'key6':600}
+{'key1':1113,'key2':2226,'key5':500,'key6':600}
+{'key3':100,'key2':101,'key4':102,'key5':500,'key6':600}
+{'key3':101,'key2':102,'key4':103,'key5':500,'key6':600}
+{'key3':102,'key2':103,'key4':104,'key5':500,'key6':600}
+{'key3':103,'key2':104,'key4':105,'key5':500,'key6':600}
+{'key1':1111,'key2':2222,'key5':500,'key6':600}
+{'key1':1112,'key2':2224,'key5':500,'key6':600}
+{'key1':1113,'key2':2226,'key5':500,'key6':600}
+{'key5':500,'key6':600}
+{'key5':500,'key6':600}
+1
+1
+1
+1
+0
+0
+0
+1
+1
+1
+1
+0
+0
+0
+{'key2':101,'key3':100,'key4':102}
+{'key2':102,'key3':101,'key4':103}
+{'key2':103,'key3':102,'key4':104}
+{'key2':104,'key3':103,'key4':105}
+{'key1':1111,'key2':2222}
+{'key1':1112,'key2':2224}
+{'key1':1113,'key2':2226}
+{'key3':100,'key2':101,'key4':102}
+{'key3':101,'key2':102,'key4':103}
+{'key3':102,'key2':103,'key4':104}
+{'key3':103,'key2':104,'key4':105}
+{'key1':1111,'key2':2222}
+{'key1':1112,'key2':2224}
+{'key1':1113,'key2':2226}
+{'key2':101,'key3':100,'key4':102}
+{'key2':102,'key3':101,'key4':103}
+{'key2':103,'key3':102,'key4':104}
+{'key2':104,'key3':103,'key4':105}
+{'key1':1111,'key2':2222}
+{'key1':1112,'key2':2224}
+{'key1':1113,'key2':2226}
 {3:2,1:0,2:0}
 {1:2,2:3}
 {1:2,2:3}
 {'x':'y','x':'y'}
 {'x':'y','x':'y'}
+{'k1':11,'k2':22}
+{'k1':11,'k2':22}
+{'k1':11,'k2':22}
+{'k1':11,'k2':22}
+{'k1':1,'k2':22,'k3':33,'k4':44}
+{'k1':1,'k2':22,'k3':33,'k4':44}
+{'k1':1,'k2':22,'k3':33,'k4':44}
+{'k1':1,'k2':22,'k3':33,'k4':44}
+{'k1':1,'k2':2,'k3':33,'k4':44}
+{'k1':1,'k2':2,'k3':33,'k4':44}
+{'k1':1,'k2':2,'k3':33,'k4':44}
+{'k1':1,'k2':2,'k3':33,'k4':44}
+{}
+{0:0}
+{1:1,0:0}
+{1:1,0:0,2:4}
+{1:1,3:3,0:0,2:4}
+{1:1,3:3,0:0,2:4,4:16}
+{1:1,3:3,5:5,0:0,2:4,4:16}
+{1:1,3:3,5:5,0:0,2:4,4:16,6:36}
+{1:1,3:3,5:5,7:7,0:0,2:4,4:16,6:36}
+{1:1,3:3,5:5,7:7,0:0,2:4,4:16,6:36,8:64}
diff --git a/tests/queries/0_stateless/02169_map_functions.sql b/tests/queries/0_stateless/02169_map_functions.sql
index 4cccaa56722..febaf2bd9d0 100644
--- a/tests/queries/0_stateless/02169_map_functions.sql
+++ b/tests/queries/0_stateless/02169_map_functions.sql
@@ -7,7 +7,19 @@ SELECT mapFilter((k, v) -> k like '%3' and v > 102, col) FROM table_map ORDER BY
 SELECT col, mapFilter((k, v) -> ((v % 10) > 1), col) FROM table_map ORDER BY id ASC;
 SELECT mapApply((k, v) -> (k, v + 1), col) FROM table_map ORDER BY id;
 SELECT mapFilter((k, v) -> 0, col) from table_map;
-SELECT mapApply((k, v) -> tuple(v + 9223372036854775806), col) FROM table_map; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT mapApply((k, v) -> tuple(v + 9223372036854775806), col) FROM table_map; -- { serverError BAD_ARGUMENTS }
+
+SELECT mapConcat(col, map('key5', 500), map('key6', 600)) FROM table_map ORDER BY id;
+SELECT mapConcat(col, materialize(map('key5', 500)), map('key6', 600)) FROM table_map ORDER BY id;
+SELECT concat(map('key5', 500), map('key6', 600));
+SELECT map('key5', 500) || map('key6', 600);
+
+SELECT mapExists((k, v) -> k LIKE '%3', col) FROM table_map ORDER BY id;
+SELECT mapExists((k, v) -> k LIKE '%2' AND v < 1000, col) FROM table_map ORDER BY id;
+
+SELECT mapSort(col) FROM table_map ORDER BY id;
+SELECT mapSort((k, v) -> v, col) FROM table_map ORDER BY id;
+SELECT mapPartialSort((k, v) -> k, 2, col) FROM table_map ORDER BY id;
 
 SELECT mapUpdate(map(1, 3, 3, 2), map(1, 0, 2, 0));
 SELECT mapApply((x, y) -> (x, x + 1), map(1, 0, 2, 0));
@@ -15,23 +27,45 @@ SELECT mapApply((x, y) -> (x, x + 1), materialize(map(1, 0, 2, 0)));
 SELECT mapApply((x, y) -> ('x', 'y'), map(1, 0, 2, 0));
 SELECT mapApply((x, y) -> ('x', 'y'), materialize(map(1, 0, 2, 0)));
 
+SELECT mapUpdate(map('k1', 1, 'k2', 2), map('k1', 11, 'k2', 22));
+SELECT mapUpdate(materialize(map('k1', 1, 'k2', 2)), map('k1', 11, 'k2', 22));
+SELECT mapUpdate(map('k1', 1, 'k2', 2), materialize(map('k1', 11, 'k2', 22)));
+SELECT mapUpdate(materialize(map('k1', 1, 'k2', 2)), materialize(map('k1', 11, 'k2', 22)));
+
+SELECT mapUpdate(map('k1', 1, 'k2', 2, 'k3', 3), map('k2', 22, 'k3', 33, 'k4', 44));
+SELECT mapUpdate(materialize(map('k1', 1, 'k2', 2, 'k3', 3)), map('k2', 22, 'k3', 33, 'k4', 44));
+SELECT mapUpdate(map('k1', 1, 'k2', 2, 'k3', 3), materialize(map('k2', 22, 'k3', 33, 'k4', 44)));
+SELECT mapUpdate(materialize(map('k1', 1, 'k2', 2, 'k3', 3)), materialize(map('k2', 22, 'k3', 33, 'k4', 44)));
+
+SELECT mapUpdate(map('k1', 1, 'k2', 2), map('k3', 33, 'k4', 44));
+SELECT mapUpdate(materialize(map('k1', 1, 'k2', 2)), map('k3', 33, 'k4', 44));
+SELECT mapUpdate(map('k1', 1, 'k2', 2), materialize(map('k3', 33, 'k4', 44)));
+SELECT mapUpdate(materialize(map('k1', 1, 'k2', 2)), materialize(map('k3', 33, 'k4', 44)));
+
+WITH (range(0, number % 10), range(0, number % 10))::Map(UInt64, UInt64) AS m1,
+     (range(0, number % 10, 2), arrayMap(x -> x * x, range(0, number % 10, 2)))::Map(UInt64, UInt64) AS m2
+SELECT DISTINCT mapUpdate(m1, m2) FROM numbers (100000);
+
 SELECT mapApply(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-SELECT mapApply((x, y) -> (x), map(1, 0, 2, 0)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT mapApply((x, y) -> ('x'), map(1, 0, 2, 0)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT mapApply((x) -> (x, x), map(1, 0, 2, 0)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT mapApply((x, y) -> (x, 1, 2), map(1, 0, 2, 0)); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-SELECT mapApply((x, y) -> (x, x + 1)); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT mapApply((x, y) -> (x), map(1, 0, 2, 0)); -- { serverError BAD_ARGUMENTS }
+SELECT mapApply((x, y) -> ('x'), map(1, 0, 2, 0)); -- { serverError BAD_ARGUMENTS }
+SELECT mapApply((x) -> (x, x), map(1, 0, 2, 0)); -- { serverError BAD_ARGUMENTS }
+SELECT mapApply((x, y) -> (x, 1, 2), map(1, 0, 2, 0)); -- { serverError BAD_ARGUMENTS }
+SELECT mapApply((x, y) -> (x, x + 1)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT mapApply(map(1, 0, 2, 0), (x, y) -> (x, x + 1)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT mapApply((x, y) -> (x, x+1), map(1, 0, 2, 0), map(1, 0, 2, 0)); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT mapApply((x, y) -> (x, x+1), map(1, 0, 2, 0), map(1, 0, 2, 0)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 
 SELECT mapFilter(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 SELECT mapFilter((x, y) -> (toInt32(x)), map(1, 0, 2, 0)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT mapFilter((x, y) -> ('x'), map(1, 0, 2, 0)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT mapFilter((x) -> (x, x), map(1, 0, 2, 0)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT mapFilter((x, y) -> (x, 1, 2), map(1, 0, 2, 0)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT mapFilter((x, y) -> (x, x + 1)); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT mapFilter((x, y) -> (x, x + 1)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT mapFilter(map(1, 0, 2, 0), (x, y) -> (x > 0)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT mapFilter((x, y) -> (x, x + 1), map(1, 0, 2, 0), map(1, 0, 2, 0)); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT mapFilter((x, y) -> (x, x + 1), map(1, 0, 2, 0), map(1, 0, 2, 0)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT mapConcat([1, 2], map(1, 2)); -- { serverError NO_COMMON_TYPE }
+SELECT mapSort(map(1, 2), map(3, 4)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 
 SELECT mapUpdate(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 SELECT mapUpdate(map(1, 3, 3, 2), map(1, 0, 2, 0),  map(1, 0, 2, 0)); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
diff --git a/tests/queries/0_stateless/02174_cte_scalar_cache.reference b/tests/queries/0_stateless/02174_cte_scalar_cache.reference
index 817116eda88..1acbef35325 100644
--- a/tests/queries/0_stateless/02174_cte_scalar_cache.reference
+++ b/tests/queries/0_stateless/02174_cte_scalar_cache.reference
@@ -1,3 +1,3 @@
-02177_CTE_GLOBAL_ON	5	500	11	0	5
-02177_CTE_GLOBAL_OFF	1	100	5	0	1
-02177_CTE_NEW_ANALYZER	2	200	3	0	2
+02177_CTE_GLOBAL_ON	1	100	4	0	1
+02177_CTE_GLOBAL_OFF	1	100	4	0	1
+02177_CTE_NEW_ANALYZER	1	100	4	0	1
diff --git a/tests/queries/0_stateless/02174_cte_scalar_cache.sql b/tests/queries/0_stateless/02174_cte_scalar_cache.sql
index 9ed80d08cff..50a10834e64 100644
--- a/tests/queries/0_stateless/02174_cte_scalar_cache.sql
+++ b/tests/queries/0_stateless/02174_cte_scalar_cache.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 WITH
     ( SELECT sleep(0.0001) FROM system.one ) as a1,
     ( SELECT sleep(0.0001) FROM system.one ) as a2,
diff --git a/tests/queries/0_stateless/02179_map_cast_to_array.reference b/tests/queries/0_stateless/02179_map_cast_to_array.reference
index c1870e78bb7..81bb9fba537 100644
--- a/tests/queries/0_stateless/02179_map_cast_to_array.reference
+++ b/tests/queries/0_stateless/02179_map_cast_to_array.reference
@@ -6,3 +6,4 @@
 {1:{1:'1234'}}	[(1,{1:1234})]	[(1,{1:1234})]
 {1:{1:'1234'}}	[(1,[(1,'1234')])]	[(1,[(1,'1234')])]
 {1:{1:'1234'}}	[(1,[(1,1234)])]	[(1,[(1,1234)])]
+[(1,'val1'),(2,'val2')]	Array(Tuple(k UInt32, v String))
diff --git a/tests/queries/0_stateless/02179_map_cast_to_array.sql b/tests/queries/0_stateless/02179_map_cast_to_array.sql
index b1320d7a43c..25b090c10b7 100644
--- a/tests/queries/0_stateless/02179_map_cast_to_array.sql
+++ b/tests/queries/0_stateless/02179_map_cast_to_array.sql
@@ -24,3 +24,6 @@ SELECT value, cast(value, type), cast(materialize(value), type);
 
 WITH map(1, map(1, '1234')) as value, 'Array(Tuple(UInt64, Array(Tuple(UInt64, UInt64))))' AS type
 SELECT value, cast(value, type), cast(materialize(value), type);
+
+WITH map(1, 'val1', 2, 'val2') AS map
+SELECT CAST(map, 'Array(Tuple(k UInt32, v String))') AS c, toTypeName(c);
diff --git a/tests/queries/0_stateless/02179_sparse_columns_detach.reference b/tests/queries/0_stateless/02179_sparse_columns_detach.reference
index 2f9714f7a97..04a9b10c09f 100644
--- a/tests/queries/0_stateless/02179_sparse_columns_detach.reference
+++ b/tests/queries/0_stateless/02179_sparse_columns_detach.reference
@@ -1,12 +1,12 @@
-1000
+954
 id	Default
 s	Sparse
-1000
+954
 id	Default
 s	Sparse
-1000
+954
 id	Default
 s	Sparse
-1000
+954
 id	Default
 s	Sparse
diff --git a/tests/queries/0_stateless/02179_sparse_columns_detach.sql b/tests/queries/0_stateless/02179_sparse_columns_detach.sql
index 4720e6720ba..2ae088fedb4 100644
--- a/tests/queries/0_stateless/02179_sparse_columns_detach.sql
+++ b/tests/queries/0_stateless/02179_sparse_columns_detach.sql
@@ -4,8 +4,8 @@ CREATE TABLE t_sparse_detach(id UInt64, s String)
 ENGINE = MergeTree ORDER BY id
 SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
 
-INSERT INTO t_sparse_detach SELECT number, number % 20 = 0 ? toString(number) : '' FROM numbers(10000);
-INSERT INTO t_sparse_detach SELECT number, number % 20 = 0 ? toString(number) : '' FROM numbers(10000);
+INSERT INTO t_sparse_detach SELECT number, number % 21 = 0 ? toString(number) : '' FROM numbers(10000);
+INSERT INTO t_sparse_detach SELECT number, number % 21 = 0 ? toString(number) : '' FROM numbers(10000);
 
 OPTIMIZE TABLE t_sparse_detach FINAL;
 
@@ -30,8 +30,8 @@ ALTER TABLE t_sparse_detach
     MODIFY SETTING vertical_merge_algorithm_min_rows_to_activate = 1,
     vertical_merge_algorithm_min_columns_to_activate = 1;
 
-INSERT INTO t_sparse_detach SELECT number, number % 20 = 0 ? toString(number) : '' FROM numbers(10000);
-INSERT INTO t_sparse_detach SELECT number, number % 20 = 0 ? toString(number) : '' FROM numbers(10000);
+INSERT INTO t_sparse_detach SELECT number, number % 21 = 0 ? toString(number) : '' FROM numbers(10000);
+INSERT INTO t_sparse_detach SELECT number, number % 21 = 0 ? toString(number) : '' FROM numbers(10000);
 
 OPTIMIZE TABLE t_sparse_detach FINAL;
 
diff --git a/tests/queries/0_stateless/02184_default_table_engine.sql b/tests/queries/0_stateless/02184_default_table_engine.sql
index 4b5ad6c008c..109875d53a5 100644
--- a/tests/queries/0_stateless/02184_default_table_engine.sql
+++ b/tests/queries/0_stateless/02184_default_table_engine.sql
@@ -82,7 +82,7 @@ SET default_table_engine = 'Log';
 CREATE TEMPORARY TABLE tmp (n int);
 SHOW CREATE TEMPORARY TABLE tmp;
 CREATE TEMPORARY TABLE tmp1 (n int) ENGINE=Memory;
-CREATE TEMPORARY TABLE tmp2 (n int) ENGINE=Log; -- {serverError 80}
+CREATE TEMPORARY TABLE tmp2 (n int) ENGINE=Log;
 CREATE TEMPORARY TABLE tmp2 (n int) ORDER BY n; -- {serverError 80}
 CREATE TEMPORARY TABLE tmp2 (n int, PRIMARY KEY (n)); -- {serverError 80}
 
diff --git a/tests/queries/0_stateless/02184_hash_functions_and_ip_types.reference b/tests/queries/0_stateless/02184_hash_functions_and_ip_types.reference
index 07705827428..b305806cd08 100644
--- a/tests/queries/0_stateless/02184_hash_functions_and_ip_types.reference
+++ b/tests/queries/0_stateless/02184_hash_functions_and_ip_types.reference
@@ -1,54 +1,54 @@
 Row 1:
 ──────
-ipv4:                                        1.2.3.4
-halfMD5(toIPv4('1.2.3.4')):                  14356538739656272800
-farmFingerprint64(toIPv4('1.2.3.4')):        5715546585361069049
-xxh3(toIPv4('1.2.3.4')):                     14355428563589734825
-wyHash64(toIPv4('1.2.3.4')):                 13096729196120951355
-xxHash32(toIPv4('1.2.3.4')):                 2430391091
-gccMurmurHash(toIPv4('1.2.3.4')):            5478801830569062645
-murmurHash2_32(toIPv4('1.2.3.4')):           1658978282
-javaHashUTF16LE(toIPv4('1.2.3.4')):          24190
-intHash64(toIPv4('1.2.3.4')):                5715546585361069049
-intHash32(toIPv4('1.2.3.4')):                3152671896
-metroHash64(toIPv4('1.2.3.4')):              5715546585361069049
-hex(murmurHash3_128(toIPv4('1.2.3.4'))):     549E9EF692591F6BB55874EF9A0DE88E
-jumpConsistentHash(toIPv4('1.2.3.4'), 42):   37
-sipHash64(toIPv4('1.2.3.4')):                10711397536826262068
-hex(sipHash128(toIPv4('1.2.3.4'))):          DBB6A76B92B59789EFB42185DC32311D
-kostikConsistentHash(toIPv4('1.2.3.4'), 42): 0
-xxHash64(toIPv4('1.2.3.4')):                 14496144933713060978
-murmurHash2_64(toIPv4('1.2.3.4')):           10829690723193326442
-cityHash64(toIPv4('1.2.3.4')):               5715546585361069049
-hiveHash(toIPv4('1.2.3.4')):                 122110
-murmurHash3_64(toIPv4('1.2.3.4')):           16570805747704317665
-murmurHash3_32(toIPv4('1.2.3.4')):           1165084099
-yandexConsistentHash(toIPv4('1.2.3.4'), 42): 0
+ipv4:                           1.2.3.4
+halfMD5(ipv4):                  14356538739656272800
+farmFingerprint64(ipv4):        5715546585361069049
+xxh3(ipv4):                     14355428563589734825
+wyHash64(ipv4):                 13096729196120951355
+xxHash32(ipv4):                 2430391091
+gccMurmurHash(ipv4):            5478801830569062645
+murmurHash2_32(ipv4):           1658978282
+javaHashUTF16LE(ipv4):          24190
+intHash64(ipv4):                5715546585361069049
+intHash32(ipv4):                3152671896
+metroHash64(ipv4):              5715546585361069049
+hex(murmurHash3_128(ipv4)):     549E9EF692591F6BB55874EF9A0DE88E
+jumpConsistentHash(ipv4, 42):   37
+sipHash64(ipv4):                10711397536826262068
+hex(sipHash128(ipv4)):          DBB6A76B92B59789EFB42185DC32311D
+kostikConsistentHash(ipv4, 42): 0
+xxHash64(ipv4):                 14496144933713060978
+murmurHash2_64(ipv4):           10829690723193326442
+cityHash64(ipv4):               5715546585361069049
+hiveHash(ipv4):                 122110
+murmurHash3_64(ipv4):           16570805747704317665
+murmurHash3_32(ipv4):           1165084099
+yandexConsistentHash(ipv4, 42): 0
 Row 1:
 ──────
-ipv6:                                                    fe80::62:5aff:fed1:daf0
-halfMD5(toIPv6('fe80::62:5aff:fed1:daf0')):              9503062220758009199
-hex(MD4(toIPv6('fe80::62:5aff:fed1:daf0'))):             E35A1A4FB3A3953421AB348B2E1A4A1A
-hex(MD5(toIPv6('fe80::62:5aff:fed1:daf0'))):             83E1A8BD8AB7456FC229208409F79798
-hex(SHA1(toIPv6('fe80::62:5aff:fed1:daf0'))):            A6D5DCE882AC44804382DE4639E6001612E1C8B5
-hex(SHA224(toIPv6('fe80::62:5aff:fed1:daf0'))):          F6995FD7BED2BCA21F68DAC6BBABE742DC1BA177BA8594CEF1715C52
-hex(SHA256(toIPv6('fe80::62:5aff:fed1:daf0'))):          F75497BAD6F7747BD6B150B6F69BA2DEE354F1C2A34B7BEA6183973B78640250
-hex(SHA512(toIPv6('fe80::62:5aff:fed1:daf0'))):          0C2893CCBF44BC19CCF339AEED5B68CBFD5A2EF38263A48FE21C3379BA4438E7FF7A02F59D7542442C6E6ED538E6D13D65D3573DADB381651D3D8A5DEA232EAC
-farmFingerprint64(toIPv6('fe80::62:5aff:fed1:daf0')):    6643158734288374888
-javaHash(toIPv6('fe80::62:5aff:fed1:daf0')):             684606770
-xxh3(toIPv6('fe80::62:5aff:fed1:daf0')):                 4051340969481364358
-wyHash64(toIPv6('fe80::62:5aff:fed1:daf0')):             18071806066582739916
-xxHash32(toIPv6('fe80::62:5aff:fed1:daf0')):             3353862080
-gccMurmurHash(toIPv6('fe80::62:5aff:fed1:daf0')):        11049311547848936878
-murmurHash2_32(toIPv6('fe80::62:5aff:fed1:daf0')):       1039121047
-javaHashUTF16LE(toIPv6('fe80::62:5aff:fed1:daf0')):      -666938696
-metroHash64(toIPv6('fe80::62:5aff:fed1:daf0')):          15333045864940909774
-hex(sipHash128(toIPv6('fe80::62:5aff:fed1:daf0'))):      31D50562F877B1F92A99B05B646568B7
-hex(murmurHash3_128(toIPv6('fe80::62:5aff:fed1:daf0'))): 6FFEF0C1DF8B5B472FE2EDF0C76C12B9
-sipHash64(toIPv6('fe80::62:5aff:fed1:daf0')):            5681592867096972315
-xxHash64(toIPv6('fe80::62:5aff:fed1:daf0')):             4533874364641685764
-murmurHash2_64(toIPv6('fe80::62:5aff:fed1:daf0')):       11839090601505681839
-cityHash64(toIPv6('fe80::62:5aff:fed1:daf0')):           1599722731594796935
-hiveHash(toIPv6('fe80::62:5aff:fed1:daf0')):             684606770
-murmurHash3_64(toIPv6('fe80::62:5aff:fed1:daf0')):       18323430650022796352
-murmurHash3_32(toIPv6('fe80::62:5aff:fed1:daf0')):       3971193740
+ipv6:                       fe80::62:5aff:fed1:daf0
+halfMD5(ipv6):              9503062220758009199
+hex(MD4(ipv6)):             E35A1A4FB3A3953421AB348B2E1A4A1A
+hex(MD5(ipv6)):             83E1A8BD8AB7456FC229208409F79798
+hex(SHA1(ipv6)):            A6D5DCE882AC44804382DE4639E6001612E1C8B5
+hex(SHA224(ipv6)):          F6995FD7BED2BCA21F68DAC6BBABE742DC1BA177BA8594CEF1715C52
+hex(SHA256(ipv6)):          F75497BAD6F7747BD6B150B6F69BA2DEE354F1C2A34B7BEA6183973B78640250
+hex(SHA512(ipv6)):          0C2893CCBF44BC19CCF339AEED5B68CBFD5A2EF38263A48FE21C3379BA4438E7FF7A02F59D7542442C6E6ED538E6D13D65D3573DADB381651D3D8A5DEA232EAC
+farmFingerprint64(ipv6):    6643158734288374888
+javaHash(ipv6):             684606770
+xxh3(ipv6):                 4051340969481364358
+wyHash64(ipv6):             18071806066582739916
+xxHash32(ipv6):             3353862080
+gccMurmurHash(ipv6):        11049311547848936878
+murmurHash2_32(ipv6):       1039121047
+javaHashUTF16LE(ipv6):      -666938696
+metroHash64(ipv6):          15333045864940909774
+hex(sipHash128(ipv6)):      31D50562F877B1F92A99B05B646568B7
+hex(murmurHash3_128(ipv6)): 6FFEF0C1DF8B5B472FE2EDF0C76C12B9
+sipHash64(ipv6):            5681592867096972315
+xxHash64(ipv6):             4533874364641685764
+murmurHash2_64(ipv6):       11839090601505681839
+cityHash64(ipv6):           1599722731594796935
+hiveHash(ipv6):             684606770
+murmurHash3_64(ipv6):       18323430650022796352
+murmurHash3_32(ipv6):       3971193740
diff --git a/tests/queries/0_stateless/02184_hash_functions_and_ip_types.sql b/tests/queries/0_stateless/02184_hash_functions_and_ip_types.sql
index 67aae812144..d96574ef4fe 100644
--- a/tests/queries/0_stateless/02184_hash_functions_and_ip_types.sql
+++ b/tests/queries/0_stateless/02184_hash_functions_and_ip_types.sql
@@ -1,5 +1,7 @@
 -- Tags: no-fasttest
 
+SET allow_experimental_analyzer = 1;
+
 SELECT
     toIPv4('1.2.3.4') AS ipv4,
     halfMD5(ipv4),
diff --git a/tests/queries/0_stateless/02187_async_inserts_all_formats.python b/tests/queries/0_stateless/02187_async_inserts_all_formats.python
index 65a323ef9db..fa555c78f8b 100644
--- a/tests/queries/0_stateless/02187_async_inserts_all_formats.python
+++ b/tests/queries/0_stateless/02187_async_inserts_all_formats.python
@@ -3,47 +3,71 @@ import os
 import sys
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
-CLICKHOUSE_URL = os.environ.get('CLICKHOUSE_URL')
-CLICKHOUSE_TMP = os.environ.get('CLICKHOUSE_TMP')
+CLICKHOUSE_URL = os.environ.get("CLICKHOUSE_URL")
+CLICKHOUSE_TMP = os.environ.get("CLICKHOUSE_TMP")
 
 from pure_http_client import ClickHouseClient
 
 client = ClickHouseClient()
 
+
 def run_test(data_format, gen_data_template, settings):
     print(data_format)
     client.query("TRUNCATE TABLE t_async_insert")
 
     expected = client.query(gen_data_template.format("TSV")).strip()
-    data = client.query(gen_data_template.format(data_format), settings=settings,binary_result=True)
+    data = client.query(
+        gen_data_template.format(data_format), settings=settings, binary_result=True
+    )
 
     insert_query = "INSERT INTO t_async_insert FORMAT {}".format(data_format)
     client.query_with_data(insert_query, data, settings=settings)
 
     result = client.query("SELECT * FROM t_async_insert FORMAT TSV").strip()
     if result != expected:
-        print("Failed for format {}.\nExpected:\n{}\nGot:\n{}\n".format(data_format, expected, result))
+        print(
+            "Failed for format {}.\nExpected:\n{}\nGot:\n{}\n".format(
+                data_format, expected, result
+            )
+        )
         exit(1)
 
-formats = client.query("SELECT name FROM system.formats WHERE is_input AND is_output \
-    AND name NOT IN ('CapnProto', 'RawBLOB', 'Template', 'ProtobufSingle', 'LineAsString', 'Protobuf', 'ProtobufList') ORDER BY name").strip().split('\n')
+
+formats = (
+    client.query(
+        "SELECT name FROM system.formats WHERE is_input AND is_output \
+    AND name NOT IN ('CapnProto', 'RawBLOB', 'Template', 'ProtobufSingle', 'LineAsString', 'Protobuf', 'ProtobufList') ORDER BY name"
+    )
+    .strip()
+    .split("\n")
+)
 
 # Generic formats
 client.query("DROP TABLE IF EXISTS t_async_insert")
-client.query("CREATE TABLE t_async_insert (id UInt64, s String, arr Array(UInt64)) ENGINE = Memory")
+client.query(
+    "CREATE TABLE t_async_insert (id UInt64, s String, arr Array(UInt64)) ENGINE = Memory"
+)
 gen_data_query = "SELECT number AS id, toString(number) AS s, range(number) AS arr FROM numbers(10) FORMAT {}"
 
 for data_format in formats:
-    run_test(data_format, gen_data_query, settings={"async_insert": 1, "wait_for_async_insert": 1})
+    run_test(
+        data_format,
+        gen_data_query,
+        settings={"async_insert": 1, "wait_for_async_insert": 1},
+    )
 
 # LineAsString
 client.query("DROP TABLE IF EXISTS t_async_insert")
 client.query("CREATE TABLE t_async_insert (s String) ENGINE = Memory")
 gen_data_query = "SELECT toString(number) AS s FROM numbers(10) FORMAT {}"
 
-run_test('LineAsString', gen_data_query, settings={"async_insert": 1, "wait_for_async_insert": 1})
+run_test(
+    "LineAsString",
+    gen_data_query,
+    settings={"async_insert": 1, "wait_for_async_insert": 1},
+)
 
 # TODO: add CapnProto and Protobuf
 
diff --git a/tests/queries/0_stateless/02187_msg_pack_uuid.sh b/tests/queries/0_stateless/02187_msg_pack_uuid.sh
index 9be92d66790..f04ef09a8c8 100755
--- a/tests/queries/0_stateless/02187_msg_pack_uuid.sh
+++ b/tests/queries/0_stateless/02187_msg_pack_uuid.sh
@@ -5,13 +5,13 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q "insert into table function file('uuid_str.msgpack', 'MsgPack', 'uuid UUID') select toUUID('5e7084e0-019f-461f-9e70-84e0019f561f') settings output_format_msgpack_uuid_representation='str'"
+$CLICKHOUSE_CLIENT -q "insert into table function file('uuid_str.msgpack', 'MsgPack', 'uuid UUID') select toUUID('5e7084e0-019f-461f-9e70-84e0019f561f') settings output_format_msgpack_uuid_representation='str', engine_file_truncate_on_insert=1"
 $CLICKHOUSE_CLIENT -q "select * from file('uuid_str.msgpack', 'MsgPack', 'uuid UUID')"
 
-$CLICKHOUSE_CLIENT -q "insert into table function file('uuid_bin.msgpack', 'MsgPack', 'uuid UUID') select toUUID('5e7084e0-019f-461f-9e70-84e0019f561f') settings output_format_msgpack_uuid_representation='bin'"
+$CLICKHOUSE_CLIENT -q "insert into table function file('uuid_bin.msgpack', 'MsgPack', 'uuid UUID') select toUUID('5e7084e0-019f-461f-9e70-84e0019f561f') settings output_format_msgpack_uuid_representation='bin', engine_file_truncate_on_insert=1"
 $CLICKHOUSE_CLIENT -q "select * from file('uuid_bin.msgpack', 'MsgPack', 'uuid UUID')"
 
-$CLICKHOUSE_CLIENT -q "insert into table function file('uuid_ext.msgpack', 'MsgPack', 'uuid UUID') select toUUID('5e7084e0-019f-461f-9e70-84e0019f561f') settings output_format_msgpack_uuid_representation='ext'"
+$CLICKHOUSE_CLIENT -q "insert into table function file('uuid_ext.msgpack', 'MsgPack', 'uuid UUID') select toUUID('5e7084e0-019f-461f-9e70-84e0019f561f') settings output_format_msgpack_uuid_representation='ext', engine_file_truncate_on_insert=1"
 $CLICKHOUSE_CLIENT -q "select * from file('uuid_ext.msgpack', 'MsgPack', 'uuid UUID')"
 $CLICKHOUSE_CLIENT -q "select c1, toTypeName(c1) from file('uuid_ext.msgpack') settings input_format_msgpack_number_of_columns=1"
 
diff --git a/tests/queries/0_stateless/02205_HTTP_user_agent.python b/tests/queries/0_stateless/02205_HTTP_user_agent.python
index 397e06cbe82..d8f8a32b6db 100644
--- a/tests/queries/0_stateless/02205_HTTP_user_agent.python
+++ b/tests/queries/0_stateless/02205_HTTP_user_agent.python
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from http.server import SimpleHTTPRequestHandler,HTTPServer
+from http.server import SimpleHTTPRequestHandler, HTTPServer
 import socket
 import sys
 import threading
@@ -17,6 +17,7 @@ def is_ipv6(host):
     except:
         return True
 
+
 def get_local_port(host, ipv6):
     if ipv6:
         family = socket.AF_INET6
@@ -27,20 +28,19 @@ def get_local_port(host, ipv6):
         fd.bind((host, 0))
         return fd.getsockname()[1]
 
-CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', 'localhost')
-CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
+
+CLICKHOUSE_HOST = os.environ.get("CLICKHOUSE_HOST", "localhost")
+CLICKHOUSE_PORT_HTTP = os.environ.get("CLICKHOUSE_PORT_HTTP", "8123")
 
 # Server returns this JSON response.
-SERVER_JSON_RESPONSE = \
-'''{
+SERVER_JSON_RESPONSE = """{
 	"login": "ClickHouse",
 	"id": 54801242,
 	"name": "ClickHouse",
 	"company": null
-}'''
+}"""
 
-EXPECTED_ANSWER = \
-'''{\\n\\t"login": "ClickHouse",\\n\\t"id": 54801242,\\n\\t"name": "ClickHouse",\\n\\t"company": null\\n}'''
+EXPECTED_ANSWER = """{\\n\\t"login": "ClickHouse",\\n\\t"id": 54801242,\\n\\t"name": "ClickHouse",\\n\\t"company": null\\n}"""
 
 #####################################################################################
 # This test starts an HTTP server and serves data to clickhouse url-engine based table.
@@ -51,26 +51,38 @@ EXPECTED_ANSWER = \
 #####################################################################################
 
 # IP-address of this host accessible from the outside world. Get the first one
-HTTP_SERVER_HOST = subprocess.check_output(['hostname', '-i']).decode('utf-8').strip().split()[0]
+HTTP_SERVER_HOST = (
+    subprocess.check_output(["hostname", "-i"]).decode("utf-8").strip().split()[0]
+)
 IS_IPV6 = is_ipv6(HTTP_SERVER_HOST)
 HTTP_SERVER_PORT = get_local_port(HTTP_SERVER_HOST, IS_IPV6)
 
 # IP address and port of the HTTP server started from this script.
 HTTP_SERVER_ADDRESS = (HTTP_SERVER_HOST, HTTP_SERVER_PORT)
 if IS_IPV6:
-    HTTP_SERVER_URL_STR = 'http://' + f'[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+    HTTP_SERVER_URL_STR = (
+        "http://"
+        + f"[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}"
+        + "/"
+    )
 else:
-    HTTP_SERVER_URL_STR = 'http://' + f'{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+    HTTP_SERVER_URL_STR = (
+        "http://" + f"{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}" + "/"
+    )
 
 
 def get_ch_answer(query):
     host = CLICKHOUSE_HOST
     if IS_IPV6:
-        host = f'[{host}]'
+        host = f"[{host}]"
 
-    url = os.environ.get('CLICKHOUSE_URL', 'http://{host}:{port}'.format(host=CLICKHOUSE_HOST, port=CLICKHOUSE_PORT_HTTP))
+    url = os.environ.get(
+        "CLICKHOUSE_URL",
+        "http://{host}:{port}".format(host=CLICKHOUSE_HOST, port=CLICKHOUSE_PORT_HTTP),
+    )
     return urllib.request.urlopen(url, data=query.encode()).read().decode()
 
+
 def check_answers(query, answer):
     ch_answer = get_ch_answer(query)
     if ch_answer.strip() != answer.strip():
@@ -79,16 +91,17 @@ def check_answers(query, answer):
         print("Fetched answer :", ch_answer, file=sys.stderr)
         raise Exception("Fail on query")
 
+
 # Server with check for User-Agent headers.
 class HttpProcessor(SimpleHTTPRequestHandler):
     def _set_headers(self):
-        user_agent = self.headers.get('User-Agent')
-        if user_agent and user_agent.startswith('ClickHouse/'):
+        user_agent = self.headers.get("User-Agent")
+        if user_agent and user_agent.startswith("ClickHouse/"):
             self.send_response(200)
         else:
             self.send_response(403)
 
-        self.send_header('Content-Type', 'text/csv')
+        self.send_header("Content-Type", "text/csv")
         self.end_headers()
 
     def do_GET(self):
@@ -98,9 +111,11 @@ class HttpProcessor(SimpleHTTPRequestHandler):
     def log_message(self, format, *args):
         return
 
+
 class HTTPServerV6(HTTPServer):
     address_family = socket.AF_INET6
 
+
 def start_server(requests_amount):
     if IS_IPV6:
         httpd = HTTPServerV6(HTTP_SERVER_ADDRESS, HttpProcessor)
@@ -114,15 +129,18 @@ def start_server(requests_amount):
     t = threading.Thread(target=real_func)
     return t
 
+
 #####################################################################
 # Testing area.
 #####################################################################
 
+
 def test_select():
     global HTTP_SERVER_URL_STR
-    query = 'SELECT * FROM url(\'{}\',\'JSONAsString\');'.format(HTTP_SERVER_URL_STR)
+    query = "SELECT * FROM url('{}','JSONAsString');".format(HTTP_SERVER_URL_STR)
     check_answers(query, EXPECTED_ANSWER)
 
+
 def main():
     # HEAD + GET
     t = start_server(2)
@@ -131,6 +149,7 @@ def main():
     t.join()
     print("PASSED")
 
+
 if __name__ == "__main__":
     try:
         main()
@@ -141,4 +160,3 @@ if __name__ == "__main__":
         sys.stderr.flush()
 
         os._exit(1)
-
diff --git a/tests/queries/0_stateless/02207_allow_plaintext_and_no_password.sh b/tests/queries/0_stateless/02207_allow_plaintext_and_no_password.sh
index 693f1d817e3..0345a0e6394 100755
--- a/tests/queries/0_stateless/02207_allow_plaintext_and_no_password.sh
+++ b/tests/queries/0_stateless/02207_allow_plaintext_and_no_password.sh
@@ -1,11 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-parallel, no-fasttest
-# Tag no-tsan: requires jemalloc to track small allocations
-# Tag no-asan: requires jemalloc to track small allocations
-# Tag no-ubsan: requires jemalloc to track small allocations
-# Tag no-msan: requires jemalloc to track small allocations
-
-
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02210_processors_profile_log_2.reference b/tests/queries/0_stateless/02210_processors_profile_log_2.reference
index 5467c7ef2ba..b9a848131fd 100644
--- a/tests/queries/0_stateless/02210_processors_profile_log_2.reference
+++ b/tests/queries/0_stateless/02210_processors_profile_log_2.reference
@@ -9,3 +9,4 @@ NullSource	0	0	0	0
 NumbersMt	0	0	1000000	8000000
 Resize	1	8	1	8
 Resize	1	8	1	8
+1
diff --git a/tests/queries/0_stateless/02210_processors_profile_log_2.sh b/tests/queries/0_stateless/02210_processors_profile_log_2.sh
index 93eabc2f0fe..044954a4e96 100755
--- a/tests/queries/0_stateless/02210_processors_profile_log_2.sh
+++ b/tests/queries/0_stateless/02210_processors_profile_log_2.sh
@@ -17,3 +17,5 @@ EOF
 ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
 
 ${CLICKHOUSE_CLIENT} -q "select name, sum(input_rows), sum(input_bytes), sum(output_rows), sum(output_bytes) from system.processors_profile_log where query_id = '${QUERY_ID}' group by name, plan_step, plan_group order by name, sum(input_rows), sum(input_bytes), sum(output_rows), sum(output_bytes)"
+
+${CLICKHOUSE_CLIENT} -q "select countDistinct(initial_query_id) from system.processors_profile_log where query_id = '${QUERY_ID}'"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02211_jsonl_format_extension.sql b/tests/queries/0_stateless/02211_jsonl_format_extension.sql
index 08fff5a11f5..61cc2a408fa 100644
--- a/tests/queries/0_stateless/02211_jsonl_format_extension.sql
+++ b/tests/queries/0_stateless/02211_jsonl_format_extension.sql
@@ -1,3 +1,3 @@
--- Tags: no-fasttest
-insert into table function file('data.jsonl', 'JSONEachRow', 'x UInt32') select * from numbers(10);
-select * from file('data.jsonl');
+-- Tags: no-fasttest, no-parallel
+insert into table function file('data.jsonl', 'JSONEachRow', 'x UInt32') select * from numbers(10) SETTINGS engine_file_truncate_on_insert=1;
+select * from file('data.jsonl') order by x;
diff --git a/tests/queries/0_stateless/02221_parallel_replicas_bug.sh b/tests/queries/0_stateless/02221_parallel_replicas_bug.sh
index cce32bf8272..3c44a2a7ba7 100755
--- a/tests/queries/0_stateless/02221_parallel_replicas_bug.sh
+++ b/tests/queries/0_stateless/02221_parallel_replicas_bug.sh
@@ -4,4 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-${CLICKHOUSE_CLIENT} --allow_experimental_parallel_reading_from_replicas=1 -nm < "$CURDIR"/01099_parallel_distributed_insert_select.sql > /dev/null
+${CLICKHOUSE_CLIENT} --allow_experimental_parallel_reading_from_replicas=1 --parallel_replicas_for_non_replicated_merge_tree=1 -nm < "$CURDIR"/01099_parallel_distributed_insert_select.sql > /dev/null
diff --git a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
index 60d3c78d740..53b44764d5c 100644
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
@@ -36,6 +36,8 @@ log
 log
 log_pointer
 log_pointer
+lost_part_count
+lost_part_count
 max_processed_insert_time
 max_processed_insert_time
 metadata
diff --git a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
index c59be6a3af5..ccc3064ccbd 100644
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
@@ -17,6 +17,7 @@ leader_election
 leader_election-0
 log
 log_pointer
+lost_part_count
 max_processed_insert_time
 metadata
 metadata
@@ -58,6 +59,7 @@ leader_election
 leader_election-0
 log
 log_pointer
+lost_part_count
 max_processed_insert_time
 metadata
 metadata
diff --git a/tests/queries/0_stateless/02226_analyzer_or_like_combine.reference b/tests/queries/0_stateless/02226_analyzer_or_like_combine.reference
index 6165079994f..d741391067c 100644
--- a/tests/queries/0_stateless/02226_analyzer_or_like_combine.reference
+++ b/tests/queries/0_stateless/02226_analyzer_or_like_combine.reference
@@ -78,17 +78,17 @@ SELECT
     materialize(\'Привет, World\') AS s1,
     materialize(\'Привет, World\') AS s2
 WHERE (s1 LIKE \'hell%\') OR (s2 ILIKE \'%привет%\') OR (s1 ILIKE \'world%\')
-SETTINGS optimize_or_like_chain = 1
+SETTINGS optimize_or_like_chain = 1, allow_hyperscan = 0
 SELECT
     materialize(\'Привет, World\') AS s1,
     materialize(\'Привет, World\') AS s2
 WHERE (s1 LIKE \'hell%\') OR (s2 ILIKE \'%привет%\') OR (s1 ILIKE \'world%\')
-SETTINGS optimize_or_like_chain = 1
+SETTINGS optimize_or_like_chain = 1, max_hyperscan_regexp_length = 10
 SELECT
     materialize(\'Привет, World\') AS s1,
     materialize(\'Привет, World\') AS s2
 WHERE (s1 LIKE \'hell%\') OR (s2 ILIKE \'%привет%\') OR (s1 ILIKE \'world%\')
-SETTINGS optimize_or_like_chain = 1
+SETTINGS optimize_or_like_chain = 1, max_hyperscan_regexp_total_length = 10
 SELECT
     materialize(\'Привет, World\') AS s1,
     materialize(\'Привет, World\') AS s2
diff --git a/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql b/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql
index dec73c201ef..fbebfc6d281 100644
--- a/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql
+++ b/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql
@@ -4,9 +4,9 @@ EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hel
 EXPLAIN QUERY TREE run_passes=1 SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 1, allow_experimental_analyzer = 1;
 
 EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('Привет, World') AS s2 WHERE (s1 LIKE 'hell%') OR (s2 ILIKE '%привет%') OR (s1 ILIKE 'world%') SETTINGS optimize_or_like_chain = 1;
-EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('Привет, World') AS s2 WHERE (s1 LIKE 'hell%') OR (s2 ILIKE '%привет%') OR (s1 ILIKE 'world%') SETTINGS optimize_or_like_chain = 1 SETTINGS allow_hyperscan = 0;
-EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('Привет, World') AS s2 WHERE (s1 LIKE 'hell%') OR (s2 ILIKE '%привет%') OR (s1 ILIKE 'world%') SETTINGS optimize_or_like_chain = 1 SETTINGS max_hyperscan_regexp_length = 10;
-EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('Привет, World') AS s2 WHERE (s1 LIKE 'hell%') OR (s2 ILIKE '%привет%') OR (s1 ILIKE 'world%') SETTINGS optimize_or_like_chain = 1 SETTINGS max_hyperscan_regexp_total_length = 10;
+EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('Привет, World') AS s2 WHERE (s1 LIKE 'hell%') OR (s2 ILIKE '%привет%') OR (s1 ILIKE 'world%') SETTINGS optimize_or_like_chain = 1, allow_hyperscan = 0;
+EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('Привет, World') AS s2 WHERE (s1 LIKE 'hell%') OR (s2 ILIKE '%привет%') OR (s1 ILIKE 'world%') SETTINGS optimize_or_like_chain = 1, max_hyperscan_regexp_length = 10;
+EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('Привет, World') AS s2 WHERE (s1 LIKE 'hell%') OR (s2 ILIKE '%привет%') OR (s1 ILIKE 'world%') SETTINGS optimize_or_like_chain = 1, max_hyperscan_regexp_total_length = 10;
 EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('Привет, World') AS s2 WHERE (s1 LIKE 'hell%') OR (s2 ILIKE '%привет%') OR (s1 ILIKE 'world%') OR s1 == 'Привет' SETTINGS optimize_or_like_chain = 1;
 
 
diff --git a/tests/queries/0_stateless/02226_filesystem_cache_profile_events.reference b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.reference
index d895040ef59..2ee0f256949 100644
--- a/tests/queries/0_stateless/02226_filesystem_cache_profile_events.reference
+++ b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.reference
@@ -1,15 +1,15 @@
 Using storage policy: s3_cache
 1	0	1
 0	1	0
-0
 0	1	0
+0
 Using storage policy: local_cache
 1	0	1
 0	1	0
-0
 0	1	0
+0
 Using storage policy: azure_cache
 1	0	1
 0	1	0
-0
 0	1	0
+0
diff --git a/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
index 96e51a58cc4..f071a570243 100755
--- a/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
+++ b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
@@ -64,19 +64,6 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     set remote_filesystem_read_method='threadpool';
     """
 
-    clickhouse client --multiquery --multiline  --query """
-    SELECT * FROM test_02226 WHERE value LIKE '%abc%' ORDER BY value LIMIT 10 FORMAT Null;
-
-    SET enable_filesystem_cache_on_write_operations = 1;
-
-    TRUNCATE TABLE test_02226;
-    SELECT count() FROM test_02226;
-
-    SYSTEM DROP FILESYSTEM CACHE;
-
-    INSERT INTO test_02226 SELECT * FROM generateRandom('key UInt32, value String') LIMIT 10000;
-    """
-
     query_id=$(clickhouse client --query "select queryID() from ($query) limit 1")
 
     clickhouse client --multiquery --multiline  --query """
@@ -90,7 +77,20 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     AND current_database = currentDatabase()
     ORDER BY query_start_time DESC
     LIMIT 1;
-
-    DROP TABLE test_02226;
     """
+
+    clickhouse client --multiquery --multiline  --query """
+    SELECT * FROM test_02226 WHERE value LIKE '%abc%' ORDER BY value LIMIT 10 FORMAT Null;
+
+    SET enable_filesystem_cache_on_write_operations = 1;
+
+    TRUNCATE TABLE test_02226;
+    SELECT count() FROM test_02226;
+
+    SYSTEM DROP FILESYSTEM CACHE;
+
+    INSERT INTO test_02226 SELECT * FROM generateRandom('key UInt32, value String') LIMIT 10000;
+    """
+
+    clickhouse client --query "DROP TABLE test_02226"
 done
diff --git a/tests/queries/0_stateless/02226_parallel_reading_from_replicas_benchmark.sh b/tests/queries/0_stateless/02226_parallel_reading_from_replicas_benchmark.sh
index 2a163746e20..4b8f8da5480 100755
--- a/tests/queries/0_stateless/02226_parallel_reading_from_replicas_benchmark.sh
+++ b/tests/queries/0_stateless/02226_parallel_reading_from_replicas_benchmark.sh
@@ -15,6 +15,7 @@ as select * from numbers(1);
 #   Logical error: 'Coordinator for parallel reading from replicas is not initialized'.
 opts=(
     --allow_experimental_parallel_reading_from_replicas 1
+    --parallel_replicas_for_non_replicated_merge_tree 1
     --max_parallel_replicas 3
 
     --iterations 1
diff --git a/tests/queries/0_stateless/02227_union_match_by_name.reference b/tests/queries/0_stateless/02227_union_match_by_name.reference
index cebcc42dcba..e51ea983f7f 100644
--- a/tests/queries/0_stateless/02227_union_match_by_name.reference
+++ b/tests/queries/0_stateless/02227_union_match_by_name.reference
@@ -1,40 +1,53 @@
--- { echo }
+-- { echoOn }
+
 EXPLAIN header = 1, optimize = 0 SELECT avgWeighted(x, y) FROM (SELECT NULL, 255 AS x, 1 AS y UNION ALL SELECT y, NULL AS x, 1 AS y);
-Expression (Projection)
+Expression (Project names)
 Header: avgWeighted(x, y) Nullable(Float64)
-  Expression (Before ORDER BY)
-  Header: avgWeighted(x, y) Nullable(Float64)
+  Expression (Projection)
+  Header: avgWeighted(x_0, y_1) Nullable(Float64)
     Aggregating
-    Header: avgWeighted(x, y) Nullable(Float64)
+    Header: avgWeighted(x_0, y_1) Nullable(Float64)
       Expression (Before GROUP BY)
-      Header: x Nullable(UInt8)
-              y UInt8
-        Union
-        Header: x Nullable(UInt8)
-                y UInt8
-          Expression (Conversion before UNION)
-          Header: x Nullable(UInt8)
+      Header: x_0 Nullable(UInt8)
+              y_1 UInt8
+        Expression (Change column names to column identifiers)
+        Header: x_0 Nullable(UInt8)
+                y_1 UInt8
+          Union
+          Header: NULL Nullable(UInt8)
+                  x Nullable(UInt8)
                   y UInt8
-            Expression (Projection)
-            Header: x UInt8
+            Expression (Conversion before UNION)
+            Header: NULL Nullable(UInt8)
+                    x Nullable(UInt8)
                     y UInt8
-              Expression (Before ORDER BY)
-              Header: 255 UInt8
-                      1 UInt8
-                      dummy UInt8
-                ReadFromStorage (SystemOne)
-                Header: dummy UInt8
-          Expression (Conversion before UNION)
-          Header: x Nullable(UInt8)
-                  y UInt8
-            Expression (Projection)
-            Header: x Nullable(Nothing)
+              Expression (Project names)
+              Header: NULL Nullable(Nothing)
+                      x UInt8
+                      y UInt8
+                Expression (Projection)
+                Header: NULL_Nullable(Nothing) Nullable(Nothing)
+                        255_UInt8 UInt8
+                        1_UInt8 UInt8
+                  Expression (Change column names to column identifiers)
+                  Header: system.one.dummy_0 UInt8
+                    ReadFromStorage (SystemOne)
+                    Header: dummy UInt8
+            Expression (Conversion before UNION)
+            Header: NULL Nullable(UInt8)
+                    x Nullable(UInt8)
                     y UInt8
-              Expression (Before ORDER BY)
-              Header: 1 UInt8
-                      NULL Nullable(Nothing)
-                      dummy UInt8
-                ReadFromStorage (SystemOne)
-                Header: dummy UInt8
+              Expression (Project names)
+              Header: y UInt8
+                      x Nullable(Nothing)
+                      y UInt8
+                Expression (Projection)
+                Header: 1_UInt8 UInt8
+                        NULL_Nullable(Nothing) Nullable(Nothing)
+                        1_UInt8 UInt8
+                  Expression (Change column names to column identifiers)
+                  Header: system.one.dummy_0 UInt8
+                    ReadFromStorage (SystemOne)
+                    Header: dummy UInt8
 SELECT avgWeighted(x, y) FROM (SELECT NULL, 255 AS x, 1 AS y UNION ALL SELECT y, NULL AS x, 1 AS y);
 255
diff --git a/tests/queries/0_stateless/02227_union_match_by_name.sql b/tests/queries/0_stateless/02227_union_match_by_name.sql
index cc0ab8ba5aa..6a19add1d37 100644
--- a/tests/queries/0_stateless/02227_union_match_by_name.sql
+++ b/tests/queries/0_stateless/02227_union_match_by_name.sql
@@ -1,3 +1,8 @@
--- { echo }
+SET allow_experimental_analyzer = 1;
+
+-- { echoOn }
+
 EXPLAIN header = 1, optimize = 0 SELECT avgWeighted(x, y) FROM (SELECT NULL, 255 AS x, 1 AS y UNION ALL SELECT y, NULL AS x, 1 AS y);
 SELECT avgWeighted(x, y) FROM (SELECT NULL, 255 AS x, 1 AS y UNION ALL SELECT y, NULL AS x, 1 AS y);
+
+-- { echoOff }
diff --git a/tests/queries/0_stateless/02229_client_stop_multiquery_in_SIGINT.sh b/tests/queries/0_stateless/02229_client_stop_multiquery_in_SIGINT.sh
index 171dcc52c9c..e5d00bc1a1c 100755
--- a/tests/queries/0_stateless/02229_client_stop_multiquery_in_SIGINT.sh
+++ b/tests/queries/0_stateless/02229_client_stop_multiquery_in_SIGINT.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02231_buffer_aggregate_states_leak.sql b/tests/queries/0_stateless/02231_buffer_aggregate_states_leak.sql
index a53b7f50e51..dbe18953957 100644
--- a/tests/queries/0_stateless/02231_buffer_aggregate_states_leak.sql
+++ b/tests/queries/0_stateless/02231_buffer_aggregate_states_leak.sql
@@ -28,7 +28,7 @@ create materialized view mv_02231 to buffer_02231 as select
 from in_02231
 group by key;
 
-insert into in_02231 select * from numbers(10e6) settings max_memory_usage='300Mi';
+insert into in_02231 select * from numbers(10e6) settings max_memory_usage='310Mi', max_threads=1;
 
 drop table buffer_02231;
 drop table out_02231;
diff --git a/tests/queries/0_stateless/02232_dist_insert_send_logs_level_hung.sh b/tests/queries/0_stateless/02232_dist_insert_send_logs_level_hung.sh
index 322e7e73991..734cef06214 100755
--- a/tests/queries/0_stateless/02232_dist_insert_send_logs_level_hung.sh
+++ b/tests/queries/0_stateless/02232_dist_insert_send_logs_level_hung.sh
@@ -49,7 +49,16 @@ insert_client_opts=(
 timeout 250s $CLICKHOUSE_CLIENT "${client_opts[@]}" "${insert_client_opts[@]}" -q "insert into function remote('127.2', currentDatabase(), in_02232) select * from numbers(1e6)"
 
 # Kill underlying query of remote() to make KILL faster
-timeout 30s $CLICKHOUSE_CLIENT "${client_opts[@]}" -q "KILL QUERY WHERE Settings['log_comment'] = '$CLICKHOUSE_LOG_COMMENT' SYNC" --format Null
+# This test is reproducing very interesting bahaviour.
+# The block size is 1, so the secondary query creates InterpreterSelectQuery for each row due to pushing to the MV.
+# It works extremely slow, and the initial query produces new blocks and writes them to the socket much faster
+# then the secondary query can read and process them. Therefore, it fills network buffers in the kernel.
+# Once a buffer in the kernel is full, send(...) blocks until the secondary query will finish processing data
+# that it already has in ReadBufferFromPocoSocket and call recv.
+# Or until the kernel will decide to resize the buffer (seems like it has non-trivial rules for that).
+# Anyway, it may look like the initial query got stuck, but actually it did not.
+# Moreover, the initial query cannot be killed at that point, so KILL QUERY ... SYNC will get "stuck" as well.
+timeout 30s $CLICKHOUSE_CLIENT "${client_opts[@]}" -q "KILL QUERY WHERE query like '%INSERT INTO $CLICKHOUSE_DATABASE.in_02232%' SYNC" --format Null
 echo $?
 
 $CLICKHOUSE_CLIENT "${client_opts[@]}" -nm -q "
diff --git a/tests/queries/0_stateless/02233_HTTP_ranged.python b/tests/queries/0_stateless/02233_HTTP_ranged.python
index e74d494edf5..66ef3304098 100644
--- a/tests/queries/0_stateless/02233_HTTP_ranged.python
+++ b/tests/queries/0_stateless/02233_HTTP_ranged.python
@@ -122,7 +122,7 @@ class HttpProcessor(BaseHTTPRequestHandler):
     get_call_num = 0
     responses_to_get = []
 
-    def send_head(self, from_get = False):
+    def send_head(self, from_get=False):
         if self.headers["Range"] and HttpProcessor.allow_range:
             try:
                 self.range = parse_byte_range(self.headers["Range"])
@@ -146,7 +146,9 @@ class HttpProcessor(BaseHTTPRequestHandler):
             self.send_error(416, "Requested Range Not Satisfiable")
             return None
 
-        retry_range_request = first != 0 and from_get is True and len(HttpProcessor.responses_to_get) > 0
+        retry_range_request = (
+            first != 0 and from_get is True and len(HttpProcessor.responses_to_get) > 0
+        )
         if retry_range_request:
             code = HttpProcessor.responses_to_get.pop()
             if code not in HttpProcessor.responses:
@@ -244,7 +246,9 @@ def run_test(allow_range, settings, check_retries=False):
             raise Exception("HTTP Range was not used when supported")
 
         if check_retries and len(HttpProcessor.responses_to_get) > 0:
-            raise Exception("Expected to get http response 500, which had to be retried, but 200 ok returned and then retried")
+            raise Exception(
+                "Expected to get http response 500, which had to be retried, but 200 ok returned and then retried"
+            )
 
         if retries_num > 0:
             expected_get_call_num += retries_num - 1
@@ -263,7 +267,7 @@ def run_test(allow_range, settings, check_retries=False):
 
 
 def main():
-    settings = {"max_download_buffer_size" : 20}
+    settings = {"max_download_buffer_size": 20}
 
     # Test Accept-Ranges=False
     run_test(allow_range=False, settings=settings)
@@ -271,7 +275,7 @@ def main():
     run_test(allow_range=True, settings=settings)
 
     # Test Accept-Ranges=True, parallel download is used
-    settings = {"max_download_buffer_size" : 10}
+    settings = {"max_download_buffer_size": 10}
     run_test(allow_range=True, settings=settings)
 
     # Test Accept-Ranges=True, parallel download is not used,
diff --git a/tests/queries/0_stateless/02233_interpolate_1.sql b/tests/queries/0_stateless/02233_interpolate_1.sql
index 229c36e23fb..3d416b27f45 100644
--- a/tests/queries/0_stateless/02233_interpolate_1.sql
+++ b/tests/queries/0_stateless/02233_interpolate_1.sql
@@ -36,7 +36,7 @@ SELECT n, source, inter FROM (
 # Test INTERPOLATE with inconsistent column - should produce error
 SELECT n, source, inter FROM (
    SELECT toFloat32(number % 10) AS n, 'original' AS source, number as inter FROM numbers(10) WHERE number % 3 = 1
-) ORDER BY n WITH FILL FROM 0 TO 11.51 STEP 0.5 INTERPOLATE (inter AS source); -- { serverError 32 }
+) ORDER BY n WITH FILL FROM 0 TO 11.51 STEP 0.5 INTERPOLATE (inter AS source); -- { serverError 6, 32 }
 
 # Test INTERPOLATE with aliased column
 SELECT n, source, inter + 1 AS inter_p FROM (
diff --git a/tests/queries/0_stateless/02233_with_total_empty_chunk.sql b/tests/queries/0_stateless/02233_with_total_empty_chunk.sql
index bf9ce85b6ed..e1e8186ed76 100644
--- a/tests/queries/0_stateless/02233_with_total_empty_chunk.sql
+++ b/tests/queries/0_stateless/02233_with_total_empty_chunk.sql
@@ -1 +1,3 @@
-SELECT (NULL, NULL, NULL, NULL, NULL, NULL, NULL) FROM numbers(0) GROUP BY number WITH TOTALS HAVING sum(number) <= arrayJoin([]);
+SET allow_experimental_analyzer = 1;
+
+SELECT (NULL, NULL, NULL, NULL, NULL, NULL, NULL) FROM numbers(0) GROUP BY number WITH TOTALS HAVING sum(number) <= arrayJoin([]) -- { serverError 59 };
diff --git a/tests/queries/0_stateless/02234_clickhouse_local_test_mode.sh b/tests/queries/0_stateless/02234_clickhouse_local_test_mode.sh
index f736751726d..16200399099 100755
--- a/tests/queries/0_stateless/02234_clickhouse_local_test_mode.sh
+++ b/tests/queries/0_stateless/02234_clickhouse_local_test_mode.sh
@@ -5,5 +5,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_LOCAL --query="SELECT n" 2>&1 | grep -q "Code: 47. DB::Exception: Missing columns:" && echo 'OK' || echo 'FAIL' ||:
+$CLICKHOUSE_LOCAL --query="SELECT n SETTINGS allow_experimental_analyzer = 1" 2>&1 | grep -q "Code: 47. DB::Exception:" && echo 'OK' || echo 'FAIL' ||:
 $CLICKHOUSE_LOCAL --query="SELECT n -- { serverError 47 }"
diff --git a/tests/queries/0_stateless/02240_filesystem_query_cache.reference b/tests/queries/0_stateless/02240_filesystem_query_cache.reference
index f4b9f7bb127..16c4cd1c049 100644
--- a/tests/queries/0_stateless/02240_filesystem_query_cache.reference
+++ b/tests/queries/0_stateless/02240_filesystem_query_cache.reference
@@ -6,6 +6,7 @@ SET skip_download_if_exceeds_query_cache=1;
 SET filesystem_cache_max_download_size=128;
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_4', min_bytes_for_wide_part = 10485760, compress_marks=false, compress_primary_key=false;
+SYSTEM DROP FILESYSTEM CACHE;
 INSERT INTO test SELECT number, toString(number) FROM numbers(100);
 SELECT  * FROM test FORMAT Null;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
diff --git a/tests/queries/0_stateless/02240_filesystem_query_cache.sql b/tests/queries/0_stateless/02240_filesystem_query_cache.sql
index 94eb4bc5ccd..44856a2188c 100644
--- a/tests/queries/0_stateless/02240_filesystem_query_cache.sql
+++ b/tests/queries/0_stateless/02240_filesystem_query_cache.sql
@@ -9,8 +9,8 @@ SET filesystem_cache_max_download_size=128;
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_4', min_bytes_for_wide_part = 10485760, compress_marks=false, compress_primary_key=false;
+SYSTEM DROP FILESYSTEM CACHE;
 INSERT INTO test SELECT number, toString(number) FROM numbers(100);
-
 SELECT  * FROM test FORMAT Null;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
 SYSTEM DROP FILESYSTEM CACHE;
diff --git a/tests/queries/0_stateless/02240_system_filesystem_cache_table.reference b/tests/queries/0_stateless/02240_system_filesystem_cache_table.reference
index d3be4855b36..f960b4eb21c 100644
--- a/tests/queries/0_stateless/02240_system_filesystem_cache_table.reference
+++ b/tests/queries/0_stateless/02240_system_filesystem_cache_table.reference
@@ -1,10 +1,68 @@
 Using storage policy: s3_cache
-0	79	80
-0	745	746
-0	745	746
-0	745	746
+0
+Expect cache
+DOWNLOADED	0	0	1
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+3
+Expect cache
+DOWNLOADED	0	0	1
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+3
+Expect no cache
+Expect cache
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+2
+Expect no cache
+Expect cache
+DOWNLOADED	0	0	1
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+3
+Expect cache
+DOWNLOADED	0	0	1
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+3
+Expect no cache
+Expect cache
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+2
+Expect no cache
 Using storage policy: local_cache
-0	79	80
-0	745	746
-0	745	746
-0	745	746
+0
+Expect cache
+DOWNLOADED	0	0	1
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+3
+Expect cache
+DOWNLOADED	0	0	1
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+3
+Expect no cache
+Expect cache
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+2
+Expect no cache
+Expect cache
+DOWNLOADED	0	0	1
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+3
+Expect cache
+DOWNLOADED	0	0	1
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+3
+Expect no cache
+Expect cache
+DOWNLOADED	0	79	80
+DOWNLOADED	0	745	746
+2
+Expect no cache
diff --git a/tests/queries/0_stateless/02240_system_filesystem_cache_table.sh b/tests/queries/0_stateless/02240_system_filesystem_cache_table.sh
index a487f3ca739..c7dc9fbd961 100755
--- a/tests/queries/0_stateless/02240_system_filesystem_cache_table.sh
+++ b/tests/queries/0_stateless/02240_system_filesystem_cache_table.sh
@@ -9,34 +9,69 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 for STORAGE_POLICY in 's3_cache' 'local_cache'; do
     echo "Using storage policy: $STORAGE_POLICY"
+    ${CLICKHOUSE_CLIENT} --query "SYSTEM STOP MERGES"
     ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP FILESYSTEM CACHE"
+    ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
+    ${CLICKHOUSE_CLIENT} --query "SELECT count() FROM system.filesystem_cache"
 
     ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_02240_storage_policy"
-    ${CLICKHOUSE_CLIENT} --query "CREATE TABLE test_02240_storage_policy (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='${STORAGE_POLICY}', min_bytes_for_wide_part = 10485760, compress_marks=false, compress_primary_key=false"
+    ${CLICKHOUSE_CLIENT} --query "CREATE TABLE test_02240_storage_policy (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='${STORAGE_POLICY}', min_bytes_for_wide_part = 1000000, compress_marks=false, compress_primary_key=false"
     ${CLICKHOUSE_CLIENT} --query "SYSTEM STOP MERGES test_02240_storage_policy"
     ${CLICKHOUSE_CLIENT} --enable_filesystem_cache_on_write_operations=0 --query "INSERT INTO test_02240_storage_policy SELECT number, toString(number) FROM numbers(100)"
+
+    echo 'Expect cache'
+    ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
     ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_02240_storage_policy FORMAT Null"
-    ${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size"
+    ${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_begin, file_segment_range_end, size"
+    ${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache";
+
+    echo 'Expect cache'
+    ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
+    ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_02240_storage_policy FORMAT Null"
+    ${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_begin, file_segment_range_end, size"
+    ${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache";
 
     ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP FILESYSTEM CACHE"
+    echo 'Expect no cache'
     ${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache"
+
+    echo 'Expect cache'
+    ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
     ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_02240_storage_policy FORMAT Null"
-    ${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache"
+    ${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_begin, file_segment_range_end, size"
+    ${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache";
+
     ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP FILESYSTEM CACHE"
+    echo 'Expect no cache'
     ${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache"
 
     ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_02240_storage_policy_3"
-    ${CLICKHOUSE_CLIENT} --query "CREATE TABLE test_02240_storage_policy_3 (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='${STORAGE_POLICY}_3', min_bytes_for_wide_part = 10485760, compress_marks=false, compress_primary_key=false"
+    ${CLICKHOUSE_CLIENT} --query "CREATE TABLE test_02240_storage_policy_3 (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='${STORAGE_POLICY}_3', min_bytes_for_wide_part = 1000000, compress_marks=false, compress_primary_key=false"
     ${CLICKHOUSE_CLIENT} --enable_filesystem_cache_on_write_operations=0 --query "INSERT INTO test_02240_storage_policy_3 SELECT number, toString(number) FROM numbers(100)"
+
+    echo 'Expect cache'
+    ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
     ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_02240_storage_policy_3 FORMAT Null"
-    ${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size"
+    ${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_begin, file_segment_range_end, size"
+    ${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache";
+
+    echo 'Expect cache'
+    ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
     ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_02240_storage_policy_3 FORMAT Null"
-    ${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size"
+    ${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_begin, file_segment_range_end, size"
+    ${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache";
+
+    echo 'Expect no cache'
+    ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP FILESYSTEM CACHE"
+    ${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache"
+
+    echo 'Expect cache'
+    ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
+    ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_02240_storage_policy_3 FORMAT Null"
+    ${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_begin, file_segment_range_end, size"
+    ${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache";
 
     ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP FILESYSTEM CACHE"
-    ${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache"
-    ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_02240_storage_policy_3 FORMAT Null"
-    ${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache"
-    ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP FILESYSTEM CACHE"
+    echo 'Expect no cache'
     ${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache"
 done
diff --git a/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.reference b/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.reference
index bbca9bbbfee..b3b7d12d219 100644
--- a/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.reference
+++ b/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.reference
@@ -1,60 +1,60 @@
 Using storage policy: s3_cache
 0
-0
+0	0
 Row 1:
 ──────
 file_segment_range_begin: 0
 file_segment_range_end:   745
 size:                     746
 state:                    DOWNLOADED
-7
-7
+8
+8	1100
 0
 2
 2
-7
+8	1100
 Row 1:
 ──────
 file_segment_range_begin: 0
 file_segment_range_end:   1659
 size:                     1660
 state:                    DOWNLOADED
-7
-7
-7
-7
-21
-31
-38
+8
+8	2014
+8	2014
+8	2014
+24	84045
+35	168815
+44	252113
 5010500
 18816
 Using storage policy: local_cache
 0
-0
+0	0
 Row 1:
 ──────
 file_segment_range_begin: 0
 file_segment_range_end:   745
 size:                     746
 state:                    DOWNLOADED
-7
-7
+8
+8	1100
 0
 2
 2
-7
+8	1100
 Row 1:
 ──────
 file_segment_range_begin: 0
 file_segment_range_end:   1659
 size:                     1660
 state:                    DOWNLOADED
-7
-7
-7
-7
-21
-31
-38
+8
+8	2014
+8	2014
+8	2014
+24	84045
+35	168815
+44	252113
 5010500
 18816
diff --git a/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.sh b/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.sh
index 048fb792e6e..e65bf9cb35f 100755
--- a/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.sh
+++ b/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.sh
@@ -33,7 +33,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
     FORMAT Vertical"
 
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path"
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --query "SELECT count(), sum(size) FROM system.filesystem_cache"
 
     $CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100)"
 
@@ -54,7 +54,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
     FORMAT Vertical"
 
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path"
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --query "SELECT count(), sum(size) FROM system.filesystem_cache"
 
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0"
 
@@ -64,7 +64,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
     $CLICKHOUSE_CLIENT --query "SELECT * FROM test_02241 FORMAT Null"
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0"
 
-    $CLICKHOUSE_CLIENT --query "SELECT count() size FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --query "SELECT count(), sum(size) size FROM system.filesystem_cache"
 
     $CLICKHOUSE_CLIENT --query "SYSTEM DROP FILESYSTEM CACHE"
 
@@ -87,24 +87,23 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
     FORMAT Vertical;"
 
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path"
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --query "SELECT count(), sum(size) FROM system.filesystem_cache"
 
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --query "SELECT count(), sum(size) FROM system.filesystem_cache"
     $CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100) SETTINGS enable_filesystem_cache_on_write_operations=0"
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --query "SELECT count(), sum(size) FROM system.filesystem_cache"
 
     $CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100)"
     $CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(300, 10000)"
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --query "SELECT count(), sum(size) FROM system.filesystem_cache"
 
     $CLICKHOUSE_CLIENT --query "SYSTEM START MERGES test_02241"
 
     $CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=1 --query "OPTIMIZE TABLE test_02241 FINAL"
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --query "SELECT count(), sum(size) FROM system.filesystem_cache"
 
     $CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=1 --mutations_sync=2 --query "ALTER TABLE test_02241 UPDATE value = 'kek' WHERE key = 100"
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
-
+    $CLICKHOUSE_CLIENT --query "SELECT count(), sum(size) FROM system.filesystem_cache"
     $CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(5000000)"
 
     $CLICKHOUSE_CLIENT --query "SYSTEM FLUSH LOGS"
diff --git a/tests/queries/0_stateless/02242_make_date.reference b/tests/queries/0_stateless/02242_make_date.reference
index 0e8500baeb7..dc85d872607 100644
--- a/tests/queries/0_stateless/02242_make_date.reference
+++ b/tests/queries/0_stateless/02242_make_date.reference
@@ -56,6 +56,8 @@ Nullable(Date)
 \N
 \N
 \N
+1980-01-01
+1980-01-01
 1984-02-03
 \N
 \N
diff --git a/tests/queries/0_stateless/02242_make_date.sql b/tests/queries/0_stateless/02242_make_date.sql
index 9e66daa2778..78feabfffb3 100644
--- a/tests/queries/0_stateless/02242_make_date.sql
+++ b/tests/queries/0_stateless/02242_make_date.sql
@@ -79,9 +79,11 @@ select makeDate(1980, NULL, 4);
 select makeDate(1980, 3, NULL);
 
 select makeDate(1980); -- { serverError 42 }
-select makeDate(1980, 1); -- { serverError 42 }
 select makeDate(1980, 1, 1, 1); -- { serverError 42 }
 
+select MAKEDATE(1980, 1, 1);
+select MAKEDATE(1980, 1);
+
 select makeDate(year, month, day) from (select NULL as year, 2 as month, 3 as day union all select 1984 as year, 2 as month, 3 as day) order by year, month, day;
 
 select makeDate(year, month, day) from (select NULL as year, 2 as month, 3 as day union all select NULL as year, 2 as month, 3 as day) order by year, month, day;
diff --git a/tests/queries/0_stateless/02242_make_date_mysql.reference b/tests/queries/0_stateless/02242_make_date_mysql.reference
new file mode 100644
index 00000000000..0fc51594a8c
--- /dev/null
+++ b/tests/queries/0_stateless/02242_make_date_mysql.reference
@@ -0,0 +1,25 @@
+Date
+Nullable(Date)
+Nullable(Date)
+1970-01-01
+2020-01-08
+1970-01-01
+1970-01-01
+1980-01-09
+1970-01-01
+1980-01-09
+1970-01-01
+1980-01-09
+1970-01-01
+1970-01-01
+1970-01-01
+2149-06-06
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-02
+\N
+\N
diff --git a/tests/queries/0_stateless/02242_make_date_mysql.sql b/tests/queries/0_stateless/02242_make_date_mysql.sql
new file mode 100644
index 00000000000..82d80579788
--- /dev/null
+++ b/tests/queries/0_stateless/02242_make_date_mysql.sql
@@ -0,0 +1,41 @@
+select toTypeName(makeDate(1991, 8));
+select toTypeName(makeDate(cast(1991 as Nullable(UInt64)), 8));
+select toTypeName(makeDate(1991, cast(8 as Nullable(UInt64))));
+
+select makeDate(1970, 01);
+select makeDate(2020, 08);
+select makeDate(-1980, 10);
+select makeDate(1980, -10);
+select makeDate(1980.0, 9);
+select makeDate(-1980.0, 9);
+select makeDate(cast(1980.1 as Decimal(20,5)), 9);
+select makeDate(cast('-1980.1' as Decimal(20,5)), 9);
+select makeDate(cast(1980.1 as Float32), 9);
+select makeDate(cast(-1980.1 as Float32), 9);
+
+select makeDate(cast(1980 as Date), 10); -- { serverError 43 }
+select makeDate(cast(-1980 as Date), 10); -- { serverError 43 }
+select makeDate(cast(1980 as Date32), 10); -- { serverError 43 }
+select makeDate(cast(-1980 as Date32), 10); -- { serverError 43 }
+select makeDate(cast(1980 as DateTime), 10); -- { serverError 43 }
+select makeDate(cast(-1980 as DateTime), 10); -- { serverError 43 }
+select makeDate(cast(1980 as DateTime64), 10); -- { serverError 43 }
+select makeDate(cast(-1980 as DateTime64), 10); -- { serverError 43 }
+select makeDate('1980', '10'); -- { serverError 43 }
+select makeDate('-1980', 3); -- { serverError 43 }
+select makeDate('aa', 3); -- { serverError 43 }
+select makeDate(1994, 'aa'); -- { serverError 43 }
+
+select makeDate(0, 1);
+select makeDate(19800, 12);
+select makeDate(2149, 157);
+select makeDate(2149, 158);
+select makeDate(1969,355);
+select makeDate(1969,356);
+select makeDate(1969,357);
+select makeDate(1970,0);
+select makeDate(1970,1);
+select makeDate(1970,2);
+
+select makeDate(NULL, 3);
+select makeDate(1980, NULL);
diff --git a/tests/queries/0_stateless/02243_make_date32.sql b/tests/queries/0_stateless/02243_make_date32.sql
index 2cf4ac6b358..9b0009b33a2 100644
--- a/tests/queries/0_stateless/02243_make_date32.sql
+++ b/tests/queries/0_stateless/02243_make_date32.sql
@@ -78,7 +78,6 @@ select makeDate32(1980, NULL, 4);
 select makeDate32(1980, 3, NULL);
 
 select makeDate32(1980); -- { serverError 42 }
-select makeDate32(1980, 1); -- { serverError 42 }
 select makeDate32(1980, 1, 1, 1); -- { serverError 42 }
 
 select makeDate32(year, month, day) from (select NULL as year, 2 as month, 3 as day union all select 1984 as year, 2 as month, 3 as day) order by year, month, day;
diff --git a/tests/queries/0_stateless/02243_make_date32_mysql.reference b/tests/queries/0_stateless/02243_make_date32_mysql.reference
new file mode 100644
index 00000000000..07c08a2ec70
--- /dev/null
+++ b/tests/queries/0_stateless/02243_make_date32_mysql.reference
@@ -0,0 +1,26 @@
+Date32
+Nullable(Date32)
+Nullable(Date32)
+1900-01-01
+2020-01-08
+1970-01-01
+1970-01-01
+1980-01-09
+1970-01-01
+1980-01-09
+1970-01-01
+1980-01-09
+1970-01-01
+1970-01-01
+1970-01-01
+2299-12-31
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1900-01-01
+1900-01-02
+\N
+\N
diff --git a/tests/queries/0_stateless/02243_make_date32_mysql.sql b/tests/queries/0_stateless/02243_make_date32_mysql.sql
new file mode 100644
index 00000000000..4a67dcd80de
--- /dev/null
+++ b/tests/queries/0_stateless/02243_make_date32_mysql.sql
@@ -0,0 +1,42 @@
+select toTypeName(makeDate32(1991, 8));
+select toTypeName(makeDate32(cast(1991 as Nullable(UInt64)), 8));
+select toTypeName(makeDate32(1991, cast(8 as Nullable(UInt64))));
+
+select makeDate32(1900, 01);
+select makeDate32(2020, 08);
+select makeDate32(-1980, 10);
+select makeDate32(1980, -10);
+select makeDate32(1980.0, 9);
+select makeDate32(-1980.0, 9);
+select makeDate32(cast(1980.1 as Decimal(20,5)), 9);
+select makeDate32(cast('-1980.1' as Decimal(20,5)), 9);
+select makeDate32(cast(1980.1 as Float32), 9);
+select makeDate32(cast(-1980.1 as Float32), 9);
+
+select makeDate32(cast(1980 as Date), 10); -- { serverError 43 }
+select makeDate32(cast(-1980 as Date), 10); -- { serverError 43 }
+select makeDate32(cast(1980 as Date32), 10); -- { serverError 43 }
+select makeDate32(cast(-1980 as Date32), 10); -- { serverError 43 }
+select makeDate32(cast(1980 as DateTime), 10); -- { serverError 43 }
+select makeDate32(cast(-1980 as DateTime), 10); -- { serverError 43 }
+select makeDate32(cast(1980 as DateTime64), 10); -- { serverError 43 }
+select makeDate32(cast(-1980 as DateTime64), 10); -- { serverError 43 }
+select makeDate32('1980', '10'); -- { serverError 43 }
+select makeDate32('-1980', 3); -- { serverError 43 }
+select makeDate32('aa', 3); -- { serverError 43 }
+select makeDate32(1994, 'aa'); -- { serverError 43 }
+
+select makeDate32(0, 1);
+select makeDate32(19800, 12);
+select makeDate32(2299, 365);
+select makeDate32(2299, 366);
+select makeDate32(2300, 1);
+select makeDate32(1899, 365);
+select makeDate32(1899, 366);
+select makeDate32(1899, 367);
+select makeDate32(1900, 0);
+select makeDate32(1900, 1);
+select makeDate32(1900, 2);
+
+select makeDate32(NULL, 3);
+select makeDate32(1980, NULL);
diff --git a/tests/queries/0_stateless/02271_fix_column_matcher_and_column_transformer.sql b/tests/queries/0_stateless/02271_fix_column_matcher_and_column_transformer.sql
index f0c0e2bae46..245b2cc97e3 100644
--- a/tests/queries/0_stateless/02271_fix_column_matcher_and_column_transformer.sql
+++ b/tests/queries/0_stateless/02271_fix_column_matcher_and_column_transformer.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 DROP TABLE IF EXISTS github_events;
 
 CREATE TABLE github_events
@@ -59,6 +61,6 @@ CREATE TABLE github_events
 )
 ENGINE = MergeTree ORDER BY (event_type, repo_name, created_at);
 
-with top_repos as ( select repo_name from github_events where event_type = 'WatchEvent' and toDate(created_at) = today() - 1 group by repo_name order by count() desc limit 100 union distinct select repo_name from github_events where event_type = 'WatchEvent' and toMonday(created_at) = toMonday(today() - interval 1 week) group by repo_name order by count() desc limit 100 union distinct select repo_name from github_events where event_type = 'WatchEvent' and toStartOfMonth(created_at) = toStartOfMonth(today()) - interval 1 month group by repo_name order by count() desc limit 100 union distinct select repo_name from github_events where event_type = 'WatchEvent' and toYear(created_at) = toYear(today()) - 1 group by repo_name order by count() desc limit 100 ), last_day as ( select repo_name, count() as count_last_day, rowNumberInAllBlocks() + 1 as position_last_day from github_events where repo_name in (select repo_name from top_repos) and toDate(created_at) = today() - 1 group by repo_name order by count_last_day desc ), last_week as ( select repo_name, count() as count_last_week, rowNumberInAllBlocks() + 1 as position_last_week from github_events where repo_name in (select repo_name from top_repos) and toMonday(created_at) = toMonday(today()) - interval 1 week group by repo_name order by count_last_week desc ), last_month as ( select repo_name, count() as count_last_month, rowNumberInAllBlocks() + 1 as position_last_month from github_events where repo_name in (select repo_name from top_repos) and toStartOfMonth(created_at) = toStartOfMonth(today()) - interval 1 month group by repo_name order by count_last_month desc ) select d.repo_name, columns(count) from last_day d join last_week w on d.repo_name = w.repo_name join last_month m on d.repo_name = m.repo_name FORMAT TabSeparatedWithNamesAndTypes; -- { serverError 47 }
+with top_repos as ( select repo_name from github_events where event_type = 'WatchEvent' and toDate(created_at) = today() - 1 group by repo_name order by count() desc limit 100 union distinct select repo_name from github_events where event_type = 'WatchEvent' and toMonday(created_at) = toMonday(today() - interval 1 week) group by repo_name order by count() desc limit 100 union distinct select repo_name from github_events where event_type = 'WatchEvent' and toStartOfMonth(created_at) = toStartOfMonth(today()) - interval 1 month group by repo_name order by count() desc limit 100 union distinct select repo_name from github_events where event_type = 'WatchEvent' and toYear(created_at) = toYear(today()) - 1 group by repo_name order by count() desc limit 100 ), last_day as ( select repo_name, count() as count_last_day, rowNumberInAllBlocks() + 1 as position_last_day from github_events where repo_name in (select repo_name from top_repos) and toDate(created_at) = today() - 1 group by repo_name order by count_last_day desc ), last_week as ( select repo_name, count() as count_last_week, rowNumberInAllBlocks() + 1 as position_last_week from github_events where repo_name in (select repo_name from top_repos) and toMonday(created_at) = toMonday(today()) - interval 1 week group by repo_name order by count_last_week desc ), last_month as ( select repo_name, count() as count_last_month, rowNumberInAllBlocks() + 1 as position_last_month from github_events where repo_name in (select repo_name from top_repos) and toStartOfMonth(created_at) = toStartOfMonth(today()) - interval 1 month group by repo_name order by count_last_month desc ) select d.repo_name, columns(count) from last_day d join last_week w on d.repo_name = w.repo_name join last_month m on d.repo_name = m.repo_name;
 
 DROP TABLE github_events;
diff --git a/tests/queries/0_stateless/02273_full_sort_join.reference.j2 b/tests/queries/0_stateless/02273_full_sort_join.reference.j2
index 98bfd9d9b2b..0af4158e971 100644
--- a/tests/queries/0_stateless/02273_full_sort_join.reference.j2
+++ b/tests/queries/0_stateless/02273_full_sort_join.reference.j2
@@ -1,7 +1,7 @@
 {% set table_size = 15 -%}
 {% for join_algorithm in ['default', 'full_sorting_merge', 'grace_hash'] -%}
 -- {{ join_algorithm }} --
-{% for block_size in range(1, table_size + 1) -%}
+{% for block_size in range(1, table_size + 1, 4) -%}
 ALL INNER USING | bs = {{ block_size }}
 4	0	0
 5	0	0
@@ -50,7 +50,6 @@ ALL LEFT | bs = {{ block_size }}
 14	14	val9	0
 14	14	val9	0
 ALL RIGHT | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 4	4	0	val10
 5	5	0	val6
 6	6	0	val8
@@ -64,7 +63,6 @@ ALL RIGHT | bs = {{ block_size }}
 13	13	0	val9
 14	14	0	val3
 14	14	0	val7
-{% endif -%}
 ALL INNER | bs = {{ block_size }} | copmosite key
 2	2	2	2	2	2	0	0
 2	2	2	2	2	2	0	0
@@ -85,7 +83,6 @@ ALL LEFT | bs = {{ block_size }} | copmosite key
 2	2	2	2	2	2	val12	0
 2	2	2	2	2	2	val9	0
 ALL RIGHT | bs = {{ block_size }} | copmosite key
-{% if join_algorithm != 'grace_hash' -%}
 0	\N	0	1	1	1	1	val2
 0	\N	0	1	1	1	1	val7
 0	\N	0	1	1	2	1	val5
@@ -99,7 +96,6 @@ ALL RIGHT | bs = {{ block_size }} | copmosite key
 0	\N	0	2	2	\N	1	val9
 2	2	2	2	2	2	0	val4
 2	2	2	2	2	2	0	val4
-{% endif -%}
 ANY INNER USING | bs = {{ block_size }}
 4	0	0
 5	0	0
@@ -137,7 +133,6 @@ ANY LEFT | bs = {{ block_size }}
 13	13	val13	0
 14	14	val9	0
 ANY RIGHT | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 4	4	0	val10
 5	5	0	val6
 6	6	0	val8
@@ -150,7 +145,6 @@ ANY RIGHT | bs = {{ block_size }}
 13	13	0	val9
 14	14	0	val3
 14	14	0	val7
-{% endif -%}
 ANY INNER | bs = {{ block_size }} | copmosite key
 2	2	2	2	2	2	0	0
 ANY LEFT | bs = {{ block_size }} | copmosite key
@@ -170,7 +164,6 @@ ANY LEFT | bs = {{ block_size }} | copmosite key
 2	2	2	2	2	2	val12	0
 2	2	2	2	2	2	val9	0
 ANY RIGHT | bs = {{ block_size }} | copmosite key
-{% if join_algorithm != 'grace_hash' -%}
 0	\N	0	1	1	1	1	val2
 0	\N	0	1	1	1	1	val7
 0	\N	0	1	1	2	1	val5
@@ -183,7 +176,6 @@ ANY RIGHT | bs = {{ block_size }} | copmosite key
 0	\N	0	2	1	\N	1	val3
 0	\N	0	2	2	\N	1	val9
 2	2	2	2	2	2	0	val4
-{% endif -%}
 {% endfor -%}
 ALL INNER | join_use_nulls = 1
 4	4	0	0
@@ -219,7 +211,6 @@ ALL LEFT | join_use_nulls = 1
 14	14	val9	0
 14	14	val9	0
 ALL RIGHT | join_use_nulls = 1
-{% if join_algorithm != 'grace_hash' -%}
 4	4	0	val10
 5	5	0	val6
 6	6	0	val8
@@ -233,7 +224,6 @@ ALL RIGHT | join_use_nulls = 1
 13	13	0	val9
 14	14	0	val3
 14	14	0	val7
-{% endif -%}
 ALL INNER | join_use_nulls = 1 | copmosite key
 2	2	2	2	2	2	0	0
 2	2	2	2	2	2	0	0
@@ -254,7 +244,6 @@ ALL LEFT | join_use_nulls = 1 | copmosite key
 2	2	2	2	2	2	val12	0
 2	2	2	2	2	2	val9	0
 ALL RIGHT | join_use_nulls = 1 | copmosite key
-{% if join_algorithm != 'grace_hash' -%}
 2	2	2	2	2	2	0	val4
 2	2	2	2	2	2	0	val4
 \N	\N	\N	1	1	1	\N	val2
@@ -268,7 +257,6 @@ ALL RIGHT | join_use_nulls = 1 | copmosite key
 \N	\N	\N	2	1	2	\N	val8
 \N	\N	\N	2	1	\N	\N	val3
 \N	\N	\N	2	2	\N	\N	val9
-{% endif -%}
 ANY INNER | join_use_nulls = 1
 4	4	0	0
 5	5	0	0
@@ -296,7 +284,6 @@ ANY LEFT | join_use_nulls = 1
 13	13	val13	0
 14	14	val9	0
 ANY RIGHT | join_use_nulls = 1
-{% if join_algorithm != 'grace_hash' -%}
 4	4	0	val10
 5	5	0	val6
 6	6	0	val8
@@ -309,7 +296,6 @@ ANY RIGHT | join_use_nulls = 1
 13	13	0	val9
 14	14	0	val3
 14	14	0	val7
-{% endif -%}
 ANY INNER | join_use_nulls = 1 | copmosite key
 2	2	2	2	2	2	0	0
 ANY LEFT | join_use_nulls = 1 | copmosite key
@@ -329,7 +315,6 @@ ANY LEFT | join_use_nulls = 1 | copmosite key
 2	2	2	2	2	2	val12	0
 2	2	2	2	2	2	val9	0
 ANY RIGHT | join_use_nulls = 1 | copmosite key
-{% if join_algorithm != 'grace_hash' -%}
 2	2	2	2	2	2	0	val4
 \N	\N	\N	1	1	1	\N	val2
 \N	\N	\N	1	1	1	\N	val7
@@ -342,5 +327,4 @@ ANY RIGHT | join_use_nulls = 1 | copmosite key
 \N	\N	\N	2	1	2	\N	val8
 \N	\N	\N	2	1	\N	\N	val3
 \N	\N	\N	2	2	\N	\N	val9
-{% endif -%}
 {% endfor -%}
diff --git a/tests/queries/0_stateless/02273_full_sort_join.sql.j2 b/tests/queries/0_stateless/02273_full_sort_join.sql.j2
index 8b739330364..6500306356c 100644
--- a/tests/queries/0_stateless/02273_full_sort_join.sql.j2
+++ b/tests/queries/0_stateless/02273_full_sort_join.sql.j2
@@ -26,9 +26,7 @@ INSERT INTO t2
         'val' || toString(number) as s
     FROM numbers_mt({{ table_size - 3 }});
 
-
 {% macro is_implemented(join_algorithm) -%}
-{% if join_algorithm == 'grace_hash' %} -- { serverError NOT_IMPLEMENTED } {% endif %}
 {% endmacro -%}
 
 {% for join_algorithm in ['default', 'full_sorting_merge', 'grace_hash'] -%}
@@ -38,7 +36,7 @@ SET max_bytes_in_join = '{% if join_algorithm == 'grace_hash' %}10K{% else %}0{%
 SELECT '-- {{ join_algorithm }} --';
 SET join_algorithm = '{{ join_algorithm }}';
 
-{% for block_size in range(1, table_size + 1) -%}
+{% for block_size in range(1, table_size + 1, 4) -%}
 {% for kind in ['ALL', 'ANY'] -%}
 
 SET max_block_size = {{ block_size }};
diff --git a/tests/queries/0_stateless/02274_full_sort_join_nodistinct.reference.j2 b/tests/queries/0_stateless/02274_full_sort_join_nodistinct.reference.j2
index 2cc6c6e85d6..df968e86e8d 100644
--- a/tests/queries/0_stateless/02274_full_sort_join_nodistinct.reference.j2
+++ b/tests/queries/0_stateless/02274_full_sort_join_nodistinct.reference.j2
@@ -1,6 +1,6 @@
 {% for join_algorithm in ['full_sorting_merge', 'grace_hash'] -%}
 --- {{ join_algorithm }} ---
-{% for block_size in range(1, 11) -%}
+{% for block_size in range(1, 11, 4) -%}
 t1 ALL INNER JOIN t2 | bs = {{ block_size }}
 1	1	4	5
 1	1	4	5
@@ -108,7 +108,6 @@ t1 ALL LEFT JOIN t2 | bs = {{ block_size }}
 2	2	val27	5
 3	3	val3	4
 t1 ALL RIGHT JOIN t2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	1	4	val11
 1	1	4	val12
 2	2	5	val22
@@ -161,7 +160,6 @@ t1 ALL RIGHT JOIN t2 | bs = {{ block_size }}
 2	2	5	val28
 2	2	5	val28
 3	3	4	val3
-{% endif -%}
 t1 ANY INNER JOIN t2 | bs = {{ block_size }}
 1	1	4	5
 2	2	5	5
@@ -177,7 +175,6 @@ t1 ANY LEFT JOIN t2 | bs = {{ block_size }}
 2	2	val27	5
 3	3	val3	4
 t1 ANY RIGHT JOIN t2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	1	4	val11
 1	1	4	val12
 2	2	5	val22
@@ -188,9 +185,7 @@ t1 ANY RIGHT JOIN t2 | bs = {{ block_size }}
 2	2	5	val27
 2	2	5	val28
 3	3	4	val3
-{% endif -%}
 t1 ALL FULL JOIN t2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	1	4	5
 1	1	4	5
 2	2	5	5
@@ -243,9 +238,7 @@ t1 ALL FULL JOIN t2 | bs = {{ block_size }}
 2	2	5	5
 2	2	5	5
 3	3	4	4
-{% endif -%}
 t1 ALL FULL JOIN USING t2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	4	5
 1	4	5
 2	5	5
@@ -298,7 +291,6 @@ t1 ALL FULL JOIN USING t2 | bs = {{ block_size }}
 2	5	5
 2	5	5
 3	4	4
-{% endif -%}
 t1 ALL INNER JOIN tn2 | bs = {{ block_size }}
 1	1	4	5
 1	1	4	5
@@ -315,7 +307,6 @@ t1 ALL LEFT JOIN tn2 | bs = {{ block_size }}
 2	\N	val27	0
 3	3	val3	4
 t1 ALL RIGHT JOIN tn2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 0	\N	0	val22
 0	\N	0	val23
 0	\N	0	val24
@@ -326,7 +317,6 @@ t1 ALL RIGHT JOIN tn2 | bs = {{ block_size }}
 1	1	4	val11
 1	1	4	val12
 3	3	4	val3
-{% endif -%}
 t1 ANY INNER JOIN tn2 | bs = {{ block_size }}
 1	1	4	5
 3	3	4	4
@@ -341,7 +331,6 @@ t1 ANY LEFT JOIN tn2 | bs = {{ block_size }}
 2	\N	val27	0
 3	3	val3	4
 t1 ANY RIGHT JOIN tn2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 0	\N	0	val22
 0	\N	0	val23
 0	\N	0	val24
@@ -352,9 +341,7 @@ t1 ANY RIGHT JOIN tn2 | bs = {{ block_size }}
 1	1	4	val11
 1	1	4	val12
 3	3	4	val3
-{% endif -%}
 t1 ALL FULL JOIN tn2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 0	\N	0	5
 0	\N	0	5
 0	\N	0	5
@@ -372,9 +359,8 @@ t1 ALL FULL JOIN tn2 | bs = {{ block_size }}
 2	\N	5	0
 2	\N	5	0
 3	3	4	4
-{% endif -%}
-t1 ALL FULL JOIN USING tn2 | bs = {{ block_size }}
 {% if join_algorithm != 'grace_hash' -%}
+t1 ALL FULL JOIN USING tn2 | bs = {{ block_size }}
 1	4	5
 1	4	5
 2	5	0
@@ -409,7 +395,6 @@ tn1 ALL LEFT JOIN t2 | bs = {{ block_size }}
 \N	0	val26	0
 \N	0	val27	0
 tn1 ALL RIGHT JOIN t2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	1	4	val11
 1	1	4	val12
 3	3	4	val3
@@ -420,7 +405,6 @@ tn1 ALL RIGHT JOIN t2 | bs = {{ block_size }}
 \N	2	0	val26
 \N	2	0	val27
 \N	2	0	val28
-{% endif -%}
 tn1 ANY INNER JOIN t2 | bs = {{ block_size }}
 1	1	4	5
 3	3	4	4
@@ -435,7 +419,6 @@ tn1 ANY LEFT JOIN t2 | bs = {{ block_size }}
 \N	0	val26	0
 \N	0	val27	0
 tn1 ANY RIGHT JOIN t2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	1	4	val11
 1	1	4	val12
 3	3	4	val3
@@ -446,9 +429,7 @@ tn1 ANY RIGHT JOIN t2 | bs = {{ block_size }}
 \N	2	0	val26
 \N	2	0	val27
 \N	2	0	val28
-{% endif -%}
 tn1 ALL FULL JOIN t2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	1	4	5
 1	1	4	5
 3	3	4	4
@@ -466,9 +447,7 @@ tn1 ALL FULL JOIN t2 | bs = {{ block_size }}
 \N	2	0	5
 \N	2	0	5
 \N	2	0	5
-{% endif -%}
 tn1 ALL FULL JOIN USING t2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	4	5
 1	4	5
 2	0	5
@@ -486,7 +465,6 @@ tn1 ALL FULL JOIN USING t2 | bs = {{ block_size }}
 \N	5	0
 \N	5	0
 \N	5	0
-{% endif -%}
 tn1 ALL INNER JOIN tn2 | bs = {{ block_size }}
 1	1	4	5
 1	1	4	5
@@ -503,7 +481,6 @@ tn1 ALL LEFT JOIN tn2 | bs = {{ block_size }}
 \N	\N	val26	0
 \N	\N	val27	0
 tn1 ALL RIGHT JOIN tn2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	1	4	val11
 1	1	4	val12
 3	3	4	val3
@@ -514,7 +491,6 @@ tn1 ALL RIGHT JOIN tn2 | bs = {{ block_size }}
 \N	\N	0	val26
 \N	\N	0	val27
 \N	\N	0	val28
-{% endif -%}
 tn1 ANY INNER JOIN tn2 | bs = {{ block_size }}
 1	1	4	5
 3	3	4	4
@@ -529,7 +505,6 @@ tn1 ANY LEFT JOIN tn2 | bs = {{ block_size }}
 \N	\N	val26	0
 \N	\N	val27	0
 tn1 ANY RIGHT JOIN tn2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	1	4	val11
 1	1	4	val12
 3	3	4	val3
@@ -540,9 +515,7 @@ tn1 ANY RIGHT JOIN tn2 | bs = {{ block_size }}
 \N	\N	0	val26
 \N	\N	0	val27
 \N	\N	0	val28
-{% endif -%}
 tn1 ALL FULL JOIN tn2 | bs = {{ block_size }}
-{% if join_algorithm != 'grace_hash' -%}
 1	1	4	5
 1	1	4	5
 3	3	4	4
@@ -560,9 +533,8 @@ tn1 ALL FULL JOIN tn2 | bs = {{ block_size }}
 \N	\N	5	0
 \N	\N	5	0
 \N	\N	5	0
-{% endif -%}
-tn1 ALL FULL JOIN USING tn2 | bs = {{ block_size }}
 {% if join_algorithm != 'grace_hash' -%}
+tn1 ALL FULL JOIN USING tn2 | bs = {{ block_size }}
 1	4	5
 1	4	5
 3	4	4
diff --git a/tests/queries/0_stateless/02274_full_sort_join_nodistinct.sql.j2 b/tests/queries/0_stateless/02274_full_sort_join_nodistinct.sql.j2
index 613da65421e..f8eb4b1a53e 100644
--- a/tests/queries/0_stateless/02274_full_sort_join_nodistinct.sql.j2
+++ b/tests/queries/0_stateless/02274_full_sort_join_nodistinct.sql.j2
@@ -16,7 +16,6 @@ INSERT INTO t2 VALUES (1, 'val11'), (1, 'val12'), (2, 'val22'), (2, 'val23'), (2
 INSERT INTO tn2 VALUES (1, 'val11'), (1, 'val12'), (NULL, 'val22'), (NULL, 'val23'), (NULL, 'val24'), (NULL, 'val25'), (NULL, 'val26'), (NULL, 'val27'), (NULL, 'val28'), (3, 'val3');
 
 {% macro is_implemented(join_algorithm) -%}
-{% if join_algorithm == 'grace_hash' %} -- { serverError NOT_IMPLEMENTED } {% endif %}
 {% endmacro -%}
 
 {% for join_algorithm in ['full_sorting_merge', 'grace_hash'] -%}
@@ -27,7 +26,7 @@ SET join_algorithm = '{{ join_algorithm }}';
 
 SELECT '--- {{ join_algorithm }} ---';
 
-{% for block_size in range(1, 11) -%}
+{% for block_size in range(1, 11, 4) -%}
 SET max_block_size = {{ block_size }};
 
 {% for t1, t2 in [('t1', 't2'), ('t1', 'tn2'), ('tn1', 't2'), ('tn1', 'tn2')]  -%}
@@ -47,9 +46,10 @@ SELECT t1.key, t2.key, length(t1.s), t2.s FROM {{ t1 }} AS t1 {{ kind }} RIGHT J
 SELECT '{{ t1 }} ALL FULL JOIN {{ t2 }} | bs = {{ block_size }}';
 SELECT t1.key, t2.key, length(t1.s), length(t2.s) FROM {{ t1 }} AS t1 {{ kind }} FULL JOIN {{ t2 }} AS t2 ON t1.key == t2.key ORDER BY t1.key, t2.key, length(t1.s), length(t2.s); {{ is_implemented(join_algorithm) }}
 
+{% if join_algorithm == 'full_sorting_merge' or t2 != 'tn2' -%}
 SELECT '{{ t1 }} ALL FULL JOIN USING {{ t2 }} | bs = {{ block_size }}';
 SELECT key, length(t1.s), length(t2.s) FROM {{ t1 }} AS t1 ALL FULL JOIN {{ t2 }} AS t2 USING (key) ORDER BY key, length(t1.s), length(t2.s); {{ is_implemented(join_algorithm) }}
-
+{% endif -%}
 {% endfor -%}
 {% endfor -%}
 SET max_bytes_in_join = 0;
diff --git a/tests/queries/0_stateless/02275_full_sort_join_long.reference b/tests/queries/0_stateless/02275_full_sort_join_long.reference
index 9ec06aea3e6..73482358d12 100644
--- a/tests/queries/0_stateless/02275_full_sort_join_long.reference
+++ b/tests/queries/0_stateless/02275_full_sort_join_long.reference
@@ -41,16 +41,34 @@ ALL INNER
 ALL LEFT
 50195752660639	500353531835	10369589	10369589	1000342
 ALL RIGHT
-skipped
+500353531835	684008812186	1367170	1000342	1367170
 ALL INNER
 500353531835	500353531835	1000342	1000342	1000342
 ALL LEFT
 50195752660639	500353531835	10369589	10369589	1000342
 ALL RIGHT
-skipped
+500353531835	684008812186	1367170	1000342	1367170
 ALL INNER
 500353531835	500353531835	1000342	1000342	1000342
 ALL LEFT
 50195752660639	500353531835	10369589	10369589	1000342
 ALL RIGHT
-skipped
+500353531835	684008812186	1367170	1000342	1367170
+ANY INNER
+199622811843	199622811843	399458	399458	399458
+ANY LEFT
+50010619420459	315220291655	10000000	10000000	630753
+ANY RIGHT
+316611844056	500267124407	1000000	633172	1000000
+ANY INNER
+199622811843	199622811843	399458	399458	399458
+ANY LEFT
+50010619420459	315220291655	10000000	10000000	630753
+ANY RIGHT
+316611844056	500267124407	1000000	633172	1000000
+ANY INNER
+199622811843	199622811843	399458	399458	399458
+ANY LEFT
+50010619420459	315220291655	10000000	10000000	630753
+ANY RIGHT
+316611844056	500267124407	1000000	633172	1000000
diff --git a/tests/queries/0_stateless/02275_full_sort_join_long.sql.j2 b/tests/queries/0_stateless/02275_full_sort_join_long.sql.j2
index 98cc46c9cb4..0b28fd67050 100644
--- a/tests/queries/0_stateless/02275_full_sort_join_long.sql.j2
+++ b/tests/queries/0_stateless/02275_full_sort_join_long.sql.j2
@@ -22,11 +22,6 @@ INSERT INTO t2
     FROM numbers_mt({{ rtable_size }})
 ;
 
-{% macro is_implemented(join_algorithm) -%}
-{% if join_algorithm == 'grace_hash' %} -- { serverError NOT_IMPLEMENTED }
-SELECT 'skipped';
-{% endif -%}
-{% endmacro -%}
 
 {% for join_algorithm in ['full_sorting_merge', 'grace_hash'] -%}
 
@@ -40,7 +35,6 @@ SET join_algorithm = '{{ join_algorithm }}';
 
 SET max_block_size = {{ block_size }};
 
-{% if not (kind == 'ANY' and join_algorithm == 'grace_hash') -%}
 
 SELECT '{{ kind }} INNER';
 SELECT sum(t1.key), sum(t2.key), count(), countIf(t1.key != 0), countIf(t2.key != 0) FROM t1
@@ -58,9 +52,8 @@ SELECT '{{ kind }} RIGHT';
 SELECT sum(t1.key), sum(t2.key), count(), countIf(t1.key != 0), countIf(t2.key != 0) FROM t1
 {{ kind }} RIGHT JOIN t2
 ON t1.key == t2.key
-; {{ is_implemented(join_algorithm) }}
+;
 
-{% endif -%}
 
 {% endfor -%}
 {% endfor -%}
diff --git a/tests/queries/0_stateless/02286_drop_filesystem_cache.sh b/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
index b563c487646..a6fa0457078 100755
--- a/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
+++ b/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
@@ -16,7 +16,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
                                    ORDER BY key
                                    SETTINGS storage_policy='$STORAGE_POLICY', min_bytes_for_wide_part = 10485760"
 
-    $CLICKHOUSE_CLIENT --query "SYSTEM STOP MERGES"
+    $CLICKHOUSE_CLIENT --query "SYSTEM STOP MERGES test_02286"
     $CLICKHOUSE_CLIENT --query "SYSTEM DROP FILESYSTEM CACHE"
 
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
@@ -31,7 +31,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
     $CLICKHOUSE_CLIENT --query "SELECT * FROM test_02286 FORMAT Null"
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
 
-    $CLICKHOUSE_CLIENT --multiline --multiquery --query "SYSTEM DROP FILESYSTEM CACHE './data'; --{serverError 36}"
+    $CLICKHOUSE_CLIENT --multiline --multiquery --query "SYSTEM DROP FILESYSTEM CACHE 'ff'; --{serverError 36}"
 
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
 
@@ -50,7 +50,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
                                    INNER JOIN system.filesystem_cache AS caches
                                    ON data_paths.cache_path = caches.cache_path"
 
-    $CLICKHOUSE_CLIENT --query "DROP TABLE test_02286 NO DELAY"
+    $CLICKHOUSE_CLIENT --query "DROP TABLE test_02286 SYNC"
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
 
     $CLICKHOUSE_CLIENT --query "SELECT cache_path FROM system.filesystem_cache"
@@ -77,7 +77,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
     $CLICKHOUSE_CLIENT --query "SELECT * FROM test_022862 FORMAT Null"
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
 
-    $CLICKHOUSE_CLIENT --query "SYSTEM DROP FILESYSTEM CACHE '${STORAGE_POLICY}_2/'"
+    $CLICKHOUSE_CLIENT --query "SYSTEM DROP FILESYSTEM CACHE '${STORAGE_POLICY}_2'"
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
 
     $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_022862"
diff --git a/tests/queries/0_stateless/02286_mysql_dump_input_format.reference b/tests/queries/0_stateless/02286_mysql_dump_input_format.reference
index a736358b9b7..25a78651e33 100644
--- a/tests/queries/0_stateless/02286_mysql_dump_input_format.reference
+++ b/tests/queries/0_stateless/02286_mysql_dump_input_format.reference
@@ -12,13 +12,13 @@
 4	\N
 5	\N
 6	7
+7	6
 \N	1
 \N	2
 \N	3
 \N	3
 \N	4
 \N	5
-7	6
 OK
 1	
 2	
diff --git a/tests/queries/0_stateless/02286_mysql_dump_input_format.sh b/tests/queries/0_stateless/02286_mysql_dump_input_format.sh
index 891734e9ad3..1139c1ea68c 100755
--- a/tests/queries/0_stateless/02286_mysql_dump_input_format.sh
+++ b/tests/queries/0_stateless/02286_mysql_dump_input_format.sh
@@ -9,140 +9,140 @@ USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonex
 
 cp $CURDIR/data_mysql_dump/dump*.sql $USER_FILES_PATH
 
-$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'x Nullable(Int32), y Nullable(Int32)')"
-$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'a Nullable(Int32), b Nullable(Int32)') settings input_format_mysql_dump_map_column_names = 0"
-$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'y Nullable(Int32), x Nullable(Int32)') settings input_format_mysql_dump_map_column_names = 1"
-$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'x Nullable(Int32), z String') settings input_format_skip_unknown_fields = 0" 2>&1 | grep -F -q 'INCORRECT_DATA' && echo 'OK' || echo 'FAIL'
-$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'x Nullable(Int32), z String') settings input_format_skip_unknown_fields = 1"
+$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'x Nullable(Int32), y Nullable(Int32)') order by x, y"
+$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'a Nullable(Int32), b Nullable(Int32)') order by a, b settings input_format_mysql_dump_map_column_names = 0"
+$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'y Nullable(Int32), x Nullable(Int32)') order by y, x settings input_format_mysql_dump_map_column_names = 1"
+$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'x Nullable(Int32), z String') order by x, z settings input_format_skip_unknown_fields = 0" 2>&1 | grep -F -q 'INCORRECT_DATA' && echo 'OK' || echo 'FAIL'
+$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'x Nullable(Int32), z String') order by x, z settings input_format_skip_unknown_fields = 1"
 
 echo "dump1"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump1.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump1.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump1.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump1.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"  2>&1 | grep -F -q 'Cannot extract table structure' && echo 'OK' || echo 'FAIL'
 $CLICKHOUSE_CLIENT -q "select * from file(dump1.sql, MySQLDump, 'x Nullable(Int32)') settings input_format_mysql_dump_table_name='test 3'" 2>&1 | grep -F -q 'EMPTY_DATA_PASSED' && echo 'OK' || echo 'FAIL'
 
 echo "dump2"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump2.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump2.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump2.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump2.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump2.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump2.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 
 echo "dump3"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump3.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump3.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump3.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump3.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump3.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump3.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2', max_threads=1"
 
 echo "dump4"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump4.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump4.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump4.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump4.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump4.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump4.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3', max_threads=1"
 
 echo "dump5"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump5.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump5.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump5.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump5.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump5.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump5.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 
 echo "dump6"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump6.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump6.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump6.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump6.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump6.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump6.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump6.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump6.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump6.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump6.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump6.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump6.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3', max_threads=1"
 
 echo "dump7"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump7.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump7.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "desc file(dump7.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump7.sql, MySQLDump) settings max_threads=1"
+$CLICKHOUSE_CLIENT -q "desc file(dump7.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 $CLICKHOUSE_CLIENT -q "select * from file(dump7.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
 $CLICKHOUSE_CLIENT -q "desc file(dump7.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump7.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump7.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump7.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump7.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump7.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3', max_threads=1"
 
 echo "dump8"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump8.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump8.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump8.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump8.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump2.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump2.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 
 echo "dump9"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump9.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump9.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump9.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump9.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump9.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump9.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 
 echo "dump10"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump10.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump10.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump10.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump10.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump10.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump10.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 
 echo "dump11"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump11.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump11.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump11.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump11.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump11.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump11.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 
 
 echo "dump12"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump12.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump12.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump12.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump12.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump12.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump12.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump12.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump12.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump12.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump12.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump12.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump12.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3', max_threads=1"
 
 echo "dump13"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump13.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump13.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump13.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump13.sql, MySQLDump) settings input_format_mysql_dump_table_name='fruits'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump13.sql, MySQLDump) settings input_format_mysql_dump_table_name='fruits'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump13.sql, MySQLDump) settings input_format_mysql_dump_table_name='fruits', max_threads=1"
 
 echo "dump14"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump14.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump14.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump14.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump14.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump14.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump14.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump14.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump14.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump14.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump14.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump14.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump14.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3', max_threads=1"
 
 echo "dump15"
 
 $CLICKHOUSE_CLIENT -q "desc file(dump15.sql, MySQLDump)"
-$CLICKHOUSE_CLIENT -q "select * from file(dump15.sql, MySQLDump)"
+$CLICKHOUSE_CLIENT -q "select * from file(dump15.sql, MySQLDump) settings max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump15.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump15.sql, MySQLDump) settings input_format_mysql_dump_table_name='test'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump15.sql, MySQLDump) settings input_format_mysql_dump_table_name='test', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump15.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump15.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump15.sql, MySQLDump) settings input_format_mysql_dump_table_name='test2', max_threads=1"
 $CLICKHOUSE_CLIENT -q "desc file(dump15.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
-$CLICKHOUSE_CLIENT -q "select * from file(dump15.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3'"
+$CLICKHOUSE_CLIENT -q "select * from file(dump15.sql, MySQLDump) settings input_format_mysql_dump_table_name='test 3', max_threads=1"
 
 rm $USER_FILES_PATH/dump*.sql
diff --git a/tests/queries/0_stateless/02293_arrow_dictionary_indexes.sql b/tests/queries/0_stateless/02293_arrow_dictionary_indexes.sql
index 3ff6a5ffbb3..3ea229a1152 100644
--- a/tests/queries/0_stateless/02293_arrow_dictionary_indexes.sql
+++ b/tests/queries/0_stateless/02293_arrow_dictionary_indexes.sql
@@ -1,3 +1,3 @@
--- Tags: no-fasttest
+-- Tags: no-fasttest, no-parallel
 insert into function file(02293_data.arrow) select toLowCardinality(toString(number)) from numbers(300) settings output_format_arrow_low_cardinality_as_dictionary=1, engine_file_truncate_on_insert=1;
-select * from file(02293_data.arrow);
+select * from file(02293_data.arrow) settings max_threads=1;
diff --git a/tests/queries/0_stateless/02293_formats_json_columns.reference b/tests/queries/0_stateless/02293_formats_json_columns.reference
index f59f02ad42b..d3fb006a73f 100644
--- a/tests/queries/0_stateless/02293_formats_json_columns.reference
+++ b/tests/queries/0_stateless/02293_formats_json_columns.reference
@@ -86,18 +86,18 @@ d	Nullable(String)
 \N	\N	3	\N
 \N	\N	\N	String
 OK
-3	
-2	
 1	
+2	
+3	
 c1	Nullable(Int64)					
 c2	Nullable(Int64)					
 c3	Nullable(String)					
 1	1	\N
-2	2	\N
-3	3	\N
-1	\N	\N
-2	\N	\N
-3	\N	\N
 1	2	String
+1	\N	\N
+2	2	\N
+2	\N	\N
+3	3	\N
+3	\N	\N
 OK
 OK
diff --git a/tests/queries/0_stateless/02293_formats_json_columns.sh b/tests/queries/0_stateless/02293_formats_json_columns.sh
index 7a21f8d9bab..0aaf2abfc45 100755
--- a/tests/queries/0_stateless/02293_formats_json_columns.sh
+++ b/tests/queries/0_stateless/02293_formats_json_columns.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+USER_FILES_PATH=$(clickhouse client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
 
 DATA_FILE=$USER_FILES_PATH/data_02293
 
@@ -17,13 +17,13 @@ echo "JSONColumns"
 $CLICKHOUSE_CLIENT -q "select * from test_02293 order by a format JSONColumns"
 $CLICKHOUSE_CLIENT -q "select * from test_02293 order by a format JSONColumns" > $DATA_FILE
 $CLICKHOUSE_CLIENT -q "desc file(data_02293, JSONColumns)"
-$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONColumns)"
+$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONColumns) order by a"
 
 echo "JSONCompactColumns"
 $CLICKHOUSE_CLIENT -q "select * from test_02293 order by a format JSONCompactColumns"
 $CLICKHOUSE_CLIENT -q "select * from test_02293 order by a format JSONCompactColumns" > $DATA_FILE
 $CLICKHOUSE_CLIENT -q "desc file(data_02293, JSONCompactColumns)"
-$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONCompactColumns)"
+$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONCompactColumns) order by c1, c2, c3"
 
 echo "JSONColumnsWithMetadata"
 $CLICKHOUSE_CLIENT -q "select sum(a) as sum, avg(a) as avg from test_02293 group by a % 4 with totals order by tuple(sum, avg) format JSONColumnsWithMetadata" --extremes=1 | grep -v "elapsed"
@@ -49,9 +49,9 @@ echo '
 ' > $DATA_FILE
 
 $CLICKHOUSE_CLIENT -q "desc file(data_02293, JSONColumns)"
-$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONColumns)"
-$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONColumns, 'a UInt32, t String') settings input_format_skip_unknown_fields=0" 2>&1 | grep -F -q 'INCORRECT_DATA' && echo 'OK' || echo 'FAIL'
-$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONColumns, 'a UInt32, t String') settings input_format_skip_unknown_fields=1"
+$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONColumns) order by b, a, c, d"
+$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONColumns, 'a UInt32, t String') order by a, t settings input_format_skip_unknown_fields=0" 2>&1 | grep -F -q 'INCORRECT_DATA' && echo 'OK' || echo 'FAIL'
+$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONColumns, 'a UInt32, t String') order by a, t settings input_format_skip_unknown_fields=1"
 
 echo '
 [
@@ -75,8 +75,8 @@ echo '
 ' > $DATA_FILE
 
 $CLICKHOUSE_CLIENT -q "desc file(data_02293, JSONCompactColumns)"
-$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONCompactColumns)"
-$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONCompactColumns, 'a UInt32, t UInt32')" 2>&1 | grep -F -q 'INCORRECT_DATA' && echo 'OK' || echo 'FAIL'
+$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONCompactColumns) order by c1, c2, c3"
+$CLICKHOUSE_CLIENT -q "select * from file(data_02293, JSONCompactColumns, 'a UInt32, t UInt32') order by a, t" 2>&1 | grep -F -q 'INCORRECT_DATA' && echo 'OK' || echo 'FAIL'
 
 echo '
 {
diff --git a/tests/queries/0_stateless/02293_grouping_function.sql b/tests/queries/0_stateless/02293_grouping_function.sql
index cf076c8e51c..c858eae269d 100644
--- a/tests/queries/0_stateless/02293_grouping_function.sql
+++ b/tests/queries/0_stateless/02293_grouping_function.sql
@@ -1,3 +1,5 @@
+set optimize_group_by_function_keys=0;
+
 SELECT
     number,
     grouping(number, number % 2, number % 3) AS gr
diff --git a/tests/queries/0_stateless/02293_grouping_function_group_by.sql b/tests/queries/0_stateless/02293_grouping_function_group_by.sql
index d438a8a5277..da6477a1822 100644
--- a/tests/queries/0_stateless/02293_grouping_function_group_by.sql
+++ b/tests/queries/0_stateless/02293_grouping_function_group_by.sql
@@ -1,3 +1,5 @@
+set optimize_group_by_function_keys=0;
+
 SELECT
     number,
     grouping(number, number % 2, number % 3) = 6
diff --git a/tests/queries/0_stateless/02294_anova_cmp.python b/tests/queries/0_stateless/02294_anova_cmp.python
index 7597b3712d1..2212a887b2f 100644
--- a/tests/queries/0_stateless/02294_anova_cmp.python
+++ b/tests/queries/0_stateless/02294_anova_cmp.python
@@ -7,7 +7,7 @@ import pandas as pd
 import numpy as np
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
 from pure_http_client import ClickHouseClient
 
@@ -22,15 +22,22 @@ def test_and_check(rvs, n_groups, f_stat, p_value, precision=1e-2):
     client.query("DROP TABLE IF EXISTS anova;")
     client.query("CREATE TABLE anova (left Float64, right UInt64) ENGINE = Memory;")
     for group in range(n_groups):
-        client.query(f'''INSERT INTO anova VALUES {", ".join([f'({i},{group})' for i in rvs[group]])};''')
+        client.query(
+            f"""INSERT INTO anova VALUES {", ".join([f'({i},{group})' for i in rvs[group]])};"""
+        )
 
     real = client.query_return_df(
-        '''SELECT roundBankers(a.1, 16) as f_stat, roundBankers(a.2, 16) as p_value FROM (SELECT anova(left, right) as a FROM anova) FORMAT TabSeparatedWithNames;''')
+        """SELECT roundBankers(a.1, 16) as f_stat, roundBankers(a.2, 16) as p_value FROM (SELECT anova(left, right) as a FROM anova) FORMAT TabSeparatedWithNames;"""
+    )
 
-    real_f_stat = real['f_stat'][0]
-    real_p_value = real['p_value'][0]
-    assert(abs(real_f_stat - np.float64(f_stat)) < precision), f"clickhouse_f_stat {real_f_stat}, py_f_stat {f_stat}"
-    assert(abs(real_p_value - np.float64(p_value)) < precision), f"clickhouse_p_value {real_p_value}, py_p_value {p_value}"
+    real_f_stat = real["f_stat"][0]
+    real_p_value = real["p_value"][0]
+    assert (
+        abs(real_f_stat - np.float64(f_stat)) < precision
+    ), f"clickhouse_f_stat {real_f_stat}, py_f_stat {f_stat}"
+    assert (
+        abs(real_p_value - np.float64(p_value)) < precision
+    ), f"clickhouse_p_value {real_p_value}, py_p_value {p_value}"
     client.query("DROP TABLE IF EXISTS anova;")
 
 
diff --git a/tests/queries/0_stateless/02303_query_kind.reference b/tests/queries/0_stateless/02303_query_kind.reference
index 163f8b0ed5e..5af8c2b743f 100644
--- a/tests/queries/0_stateless/02303_query_kind.reference
+++ b/tests/queries/0_stateless/02303_query_kind.reference
@@ -1,36 +1,36 @@
-clickhouse-client --query_kind secondary_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
-Expression ((Projection + Before ORDER BY))
+clickhouse-client --allow_experimental_analyzer=1 --query_kind secondary_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
+Expression ((Project names + Projection))
 Header: dummy String
   Aggregating
-  Header: toString(dummy) String
-    Expression (Before GROUP BY)
-    Header: toString(dummy) String
+  Header: toString(system.one.dummy_0) String
+    Expression ((Before GROUP BY + Change column names to column identifiers))
+    Header: toString(system.one.dummy_0) String
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
-clickhouse-local --query_kind secondary_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
-Expression ((Projection + Before ORDER BY))
+clickhouse-local --allow_experimental_analyzer=1 --query_kind secondary_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
+Expression ((Project names + Projection))
 Header: dummy String
   Aggregating
-  Header: toString(dummy) String
-    Expression (Before GROUP BY)
-    Header: toString(dummy) String
+  Header: toString(system.one.dummy_0) String
+    Expression ((Before GROUP BY + Change column names to column identifiers))
+    Header: toString(system.one.dummy_0) String
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
-clickhouse-client --query_kind initial_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
-Expression ((Projection + Before ORDER BY))
+clickhouse-client --allow_experimental_analyzer=1 --query_kind initial_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
+Expression ((Project names + Projection))
 Header: dummy String
   Aggregating
-  Header: toString(dummy) String
-    Expression (Before GROUP BY)
-    Header: toString(dummy) String
+  Header: toString(system.one.dummy_0) String
+    Expression ((Before GROUP BY + Change column names to column identifiers))
+    Header: toString(system.one.dummy_0) String
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
-clickhouse-local --query_kind initial_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
-Expression ((Projection + Before ORDER BY))
+clickhouse-local --allow_experimental_analyzer=1 --query_kind initial_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
+Expression ((Project names + Projection))
 Header: dummy String
   Aggregating
-  Header: toString(dummy) String
-    Expression (Before GROUP BY)
-    Header: toString(dummy) String
+  Header: toString(system.one.dummy_0) String
+    Expression ((Before GROUP BY + Change column names to column identifiers))
+    Header: toString(system.one.dummy_0) String
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
diff --git a/tests/queries/0_stateless/02303_query_kind.sh b/tests/queries/0_stateless/02303_query_kind.sh
index 5ad5f9ec6f4..1d883a2dcc7 100755
--- a/tests/queries/0_stateless/02303_query_kind.sh
+++ b/tests/queries/0_stateless/02303_query_kind.sh
@@ -4,6 +4,10 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
+opts=(
+    "--allow_experimental_analyzer=1"
+)
+
 function run_query()
 {
     echo "clickhouse-client $*"
@@ -12,5 +16,5 @@ function run_query()
     echo "clickhouse-local $*"
     $CLICKHOUSE_LOCAL "$@"
 }
-run_query --query_kind secondary_query -q "explain plan header=1 select toString(dummy) as dummy from system.one group by dummy"
-run_query --query_kind initial_query -q "explain plan header=1 select toString(dummy) as dummy from system.one group by dummy"
+run_query "${opts[@]}" --query_kind secondary_query -q "explain plan header=1 select toString(dummy) as dummy from system.one group by dummy"
+run_query "${opts[@]}" --query_kind initial_query -q "explain plan header=1 select toString(dummy) as dummy from system.one group by dummy"
diff --git a/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql
index 4a0cef35310..a569b6e9b84 100644
--- a/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql
+++ b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql
@@ -3,10 +3,10 @@
 insert into function file(data_02314.csv) select number, number + 1 from numbers(5) settings engine_file_truncate_on_insert=1;
 insert into function file(data_02314.csv) select number, number + 1, number + 2 from numbers(5);
 desc file(data_02314.csv) settings input_format_csv_skip_first_lines=5;
-select * from file(data_02314.csv) settings input_format_csv_skip_first_lines=5;
+select * from file(data_02314.csv) order by c1 settings input_format_csv_skip_first_lines=5;
 
 insert into function file(data_02314.tsv) select number, number + 1 from numbers(5) settings engine_file_truncate_on_insert=1;
 insert into function file(data_02314.tsv) select number, number + 1, number + 2 from numbers(5);
 desc file(data_02314.tsv) settings input_format_tsv_skip_first_lines=5;
-select * from file(data_02314.tsv) settings input_format_tsv_skip_first_lines=5;
+select * from file(data_02314.tsv) order by c1 settings input_format_tsv_skip_first_lines=5;
 
diff --git a/tests/queries/0_stateless/02315_grouping_constant_folding.reference b/tests/queries/0_stateless/02315_grouping_constant_folding.reference
index 6e591de2661..31816318a42 100644
--- a/tests/queries/0_stateless/02315_grouping_constant_folding.reference
+++ b/tests/queries/0_stateless/02315_grouping_constant_folding.reference
@@ -27,3 +27,17 @@ SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY ROLLUP(a,
 5	0	0	2
 5	1	0	2
 10	0	0	0
+SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY GROUPING SETS ((a, b), (a, a), ()) ORDER BY (amount, a, b) SETTINGS force_grouping_standard_compatibility=0, allow_experimental_analyzer=1;
+1	0	0	3
+1	0	2	3
+1	0	4	3
+1	0	6	3
+1	0	8	3
+1	1	1	3
+1	1	3	3
+1	1	5	3
+1	1	7	3
+1	1	9	3
+5	0	0	2
+5	1	0	2
+10	0	0	0
diff --git a/tests/queries/0_stateless/02315_grouping_constant_folding.sql b/tests/queries/0_stateless/02315_grouping_constant_folding.sql
index ff259b7be79..f992aa0da32 100644
--- a/tests/queries/0_stateless/02315_grouping_constant_folding.sql
+++ b/tests/queries/0_stateless/02315_grouping_constant_folding.sql
@@ -9,5 +9,7 @@ SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY GROUPING
 
 SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY ROLLUP(a, b) ORDER BY (amount, a, b) SETTINGS force_grouping_standard_compatibility=0;
 
+SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY GROUPING SETS ((a, b), (a, a), ()) ORDER BY (amount, a, b) SETTINGS force_grouping_standard_compatibility=0, allow_experimental_analyzer=1;
+
 -- { echoOff }
 DROP TABLE test02315;
diff --git a/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree.sql b/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree.sql
index 00b90bb38b5..9413c664293 100644
--- a/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree.sql
+++ b/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree.sql
@@ -74,7 +74,7 @@ select table, partition, name, rows from system.parts where database = currentDa
 drop table t_light;
 
 SELECT '-----Test lightweight delete in multi blocks-----';
-CREATE TABLE t_large(a UInt32, b int) ENGINE=MergeTree order BY a settings min_bytes_for_wide_part=0;
+CREATE TABLE t_large(a UInt32, b int) ENGINE=MergeTree order BY a settings min_bytes_for_wide_part=0, index_granularity=8192, index_granularity_bytes='10Mi';
 INSERT INTO t_large SELECT number + 1, number + 1  FROM numbers(100000);
 
 DELETE FROM t_large WHERE a = 50000;
diff --git a/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree_compact_parts.sql b/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree_compact_parts.sql
index 4e9f3db0b96..db0567f252a 100644
--- a/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree_compact_parts.sql
+++ b/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree_compact_parts.sql
@@ -80,7 +80,7 @@ select table, partition, name, rows from system.parts where database = currentDa
 drop table t_light;
 
 SELECT '-----Test lightweight delete in multi blocks-----';
-CREATE TABLE t_large(a UInt32, b int) ENGINE=MergeTree order BY a settings min_bytes_for_wide_part=0;
+CREATE TABLE t_large(a UInt32, b int) ENGINE=MergeTree order BY a settings min_bytes_for_wide_part=0, index_granularity=8192, index_granularity_bytes='10Mi';
 INSERT INTO t_large SELECT number + 1, number + 1  FROM numbers(100000);
 
 DELETE FROM t_large WHERE a = 50000;
diff --git a/tests/queries/0_stateless/02319_no_columns_in_row_level_filter.reference b/tests/queries/0_stateless/02319_no_columns_in_row_level_filter.reference
index c0911ffc598..d344f57649d 100644
--- a/tests/queries/0_stateless/02319_no_columns_in_row_level_filter.reference
+++ b/tests/queries/0_stateless/02319_no_columns_in_row_level_filter.reference
@@ -1,4 +1,4 @@
-1000000
+0
 0
 0
 0
diff --git a/tests/queries/0_stateless/02337_multiple_joins_original_names.reference b/tests/queries/0_stateless/02337_multiple_joins_original_names.reference
index 6ed281c757a..e8183f05f5d 100644
--- a/tests/queries/0_stateless/02337_multiple_joins_original_names.reference
+++ b/tests/queries/0_stateless/02337_multiple_joins_original_names.reference
@@ -1,2 +1,3 @@
 1
 1
+1
diff --git a/tests/queries/0_stateless/02337_multiple_joins_original_names.sql b/tests/queries/0_stateless/02337_multiple_joins_original_names.sql
index afafee9f8eb..63bbfe6873d 100644
--- a/tests/queries/0_stateless/02337_multiple_joins_original_names.sql
+++ b/tests/queries/0_stateless/02337_multiple_joins_original_names.sql
@@ -1,11 +1,13 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/34697
 
+SET allow_experimental_analyzer = 1;
+
 SELECT table1_id FROM (
     SELECT first.table1_id
     FROM (SELECT number+1 as table1_id FROM numbers(1)) as first
     JOIN (SELECT number+1 as table2_id FROM numbers(1)) as second ON first.table1_id = second.table2_id
     JOIN (SELECT number+1 as table3_id FROM numbers(1)) as third ON first.table1_id = third.table3_id
-); -- { serverError UNKNOWN_IDENTIFIER }
+);
 
 SELECT table1_id FROM (
     SELECT first.table1_id
diff --git a/tests/queries/0_stateless/02339_analyzer_matcher_basic.reference b/tests/queries/0_stateless/02339_analyzer_matcher_basic.reference
index 3ca0d303793..7e263647f98 100644
--- a/tests/queries/0_stateless/02339_analyzer_matcher_basic.reference
+++ b/tests/queries/0_stateless/02339_analyzer_matcher_basic.reference
@@ -38,6 +38,21 @@ id	UInt64
 value	String					
 0	Value
 Database and table qualified matchers
+--
+id	UInt64					
+value	String					
+0	Value
+--
+id	UInt64					
+0
+--
+id	UInt64					
+value	String					
+0	Value
+--
+id	UInt64					
+value	String					
+0	Value
 APPLY transformer
 --
 toString(id)	String					
@@ -74,20 +89,20 @@ toString(value)	String
 Value
 REPLACE transformer
 --
-5	UInt8					
+id	UInt8					
 value	String					
 5	Value
 --
-5	UInt8					
+id	UInt8					
 value	String					
 5	Value
 --
-5	UInt8					
-6	UInt8					
+id	UInt8					
+value	UInt8					
 5	6
 --
-5	UInt8					
-6	UInt8					
+id	UInt8					
+value	UInt8					
 5	6
 Combine EXCEPT, REPLACE, APPLY transformers
 --
diff --git a/tests/queries/0_stateless/02339_analyzer_matcher_basic.sql b/tests/queries/0_stateless/02339_analyzer_matcher_basic.sql
index 9d7c486b28a..a09325fa43b 100644
--- a/tests/queries/0_stateless/02339_analyzer_matcher_basic.sql
+++ b/tests/queries/0_stateless/02339_analyzer_matcher_basic.sql
@@ -80,27 +80,25 @@ CREATE TABLE 02339_db.test_table
 
 INSERT INTO 02339_db.test_table VALUES (0, 'Value');
 
--- TODO: Qualified COLUMNS where identifier has more than 2 parts are not supported on parser level
+SELECT '--';
 
--- SELECT '--';
+DESCRIBE (SELECT 02339_db.test_table.* FROM 02339_db.test_table);
+SELECT 02339_db.test_table.* FROM 02339_db.test_table;
 
--- DESCRIBE (SELECT 02339_db.test_table.* FROM 02339_db.test_table);
--- SELECT 02339_db.test_table.* FROM 02339_db.test_table;
+SELECT '--';
 
--- SELECT '--';
+DESCRIBE (SELECT 02339_db.test_table.COLUMNS(id) FROM 02339_db.test_table);
+SELECT 02339_db.test_table.COLUMNS(id) FROM 02339_db.test_table;
 
--- DESCRIBE (SELECT 02339_db.test_table.COLUMNS(id) FROM 02339_db.test_table);
--- SELECT 02339_db.test_table.COLUMNS(id) FROM 02339_db.test_table;
+SELECT '--';
 
--- SELECT '--';
+DESCRIBE (SELECT 02339_db.test_table.COLUMNS(id), 02339_db.test_table.COLUMNS(value) FROM 02339_db.test_table);
+SELECT 02339_db.test_table.COLUMNS(id), 02339_db.test_table.COLUMNS(value) FROM 02339_db.test_table;
 
--- DESCRIBE (SELECT 02339_db.test_table.COLUMNS(id), 02339_db.test_table.COLUMNS(value) FROM 02339_db.test_table);
--- SELECT 02339_db.test_table.COLUMNS(id), 02339_db.test_table.COLUMNS(value) FROM 02339_db.test_table;
+SELECT '--';
 
--- SELECT '--';
-
--- DESCRIBE (SELECT 02339_db.test_table.COLUMNS('i'), 02339_db.test_table.COLUMNS('v') FROM 02339_db.test_table);
--- SELECT 02339_db.test_table.COLUMNS('i'), 02339_db.test_table.COLUMNS('v') FROM 02339_db.test_table;
+DESCRIBE (SELECT 02339_db.test_table.COLUMNS('i'), 02339_db.test_table.COLUMNS('v') FROM 02339_db.test_table);
+SELECT 02339_db.test_table.COLUMNS('i'), 02339_db.test_table.COLUMNS('v') FROM 02339_db.test_table;
 
 DROP TABLE 02339_db.test_table;
 DROP DATABASE 02339_db;
diff --git a/tests/queries/0_stateless/02342_window_view_different_struct.sql b/tests/queries/0_stateless/02342_window_view_different_struct.sql
index c5bf8899cae..a5b2b8daa5a 100644
--- a/tests/queries/0_stateless/02342_window_view_different_struct.sql
+++ b/tests/queries/0_stateless/02342_window_view_different_struct.sql
@@ -1,3 +1,4 @@
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 
 DROP TABLE IF EXISTS data_02342;
diff --git a/tests/queries/0_stateless/02343_aggregation_pipeline.reference b/tests/queries/0_stateless/02343_aggregation_pipeline.reference
index ec9a394d05d..ca838fdf4e0 100644
--- a/tests/queries/0_stateless/02343_aggregation_pipeline.reference
+++ b/tests/queries/0_stateless/02343_aggregation_pipeline.reference
@@ -92,12 +92,15 @@ ExpressionTransform × 16
   (MergingAggregated)
   Resize 1 → 16
     MergingAggregatedTransform
-      Resize 2 → 1
+      Resize 17 → 1
         (Union)
-          (ReadFromStorage)
-          AggregatingTransform
-            ExpressionTransform
-              MergeTreeInOrder 0 → 1
+          (Aggregating)
+          Resize 1 → 16
+            AggregatingTransform
+              (Expression)
+              ExpressionTransform
+                (ReadFromMergeTree)
+                MergeTreeInOrder 0 → 1
           (ReadFromRemote)
 explain pipeline SELECT k1, k3, sum(value) v FROM remote('127.0.0.{1,2}', currentDatabase(), proj_agg_02343) GROUP BY k1, k3 SETTINGS distributed_aggregation_memory_efficient = 1;
 (Expression)
@@ -109,9 +112,11 @@ ExpressionTransform × 16
         Resize 1 → 16
           GroupingAggregatedTransform 2 → 1
             (Union)
-              (ReadFromStorage)
+              (Aggregating)
               AggregatingTransform
+                (Expression)
                 ExpressionTransform
+                  (ReadFromMergeTree)
                   MergeTreeInOrder 0 → 1
               (ReadFromRemote)
 -- { echoOn }
diff --git a/tests/queries/0_stateless/02343_group_by_use_nulls.sql b/tests/queries/0_stateless/02343_group_by_use_nulls.sql
index a979a78be0d..e1d4021a943 100644
--- a/tests/queries/0_stateless/02343_group_by_use_nulls.sql
+++ b/tests/queries/0_stateless/02343_group_by_use_nulls.sql
@@ -1,3 +1,4 @@
+set optimize_group_by_function_keys=0;
 -- { echoOn }
 SELECT number, number % 2, sum(number) AS val
 FROM numbers(10)
diff --git a/tests/queries/0_stateless/02343_group_by_use_nulls_distributed.sql b/tests/queries/0_stateless/02343_group_by_use_nulls_distributed.sql
index 15ac1127de7..96485728231 100644
--- a/tests/queries/0_stateless/02343_group_by_use_nulls_distributed.sql
+++ b/tests/queries/0_stateless/02343_group_by_use_nulls_distributed.sql
@@ -1,3 +1,5 @@
+set optimize_group_by_function_keys=0;
+
 -- { echoOn }
 SELECT number, number % 2, sum(number) AS val
 FROM remote('127.0.0.{2,3}', numbers(10))
diff --git a/tests/queries/0_stateless/02344_describe_cache.reference b/tests/queries/0_stateless/02344_describe_cache.reference
index d3bb37af5cf..7561b32bae1 100644
--- a/tests/queries/0_stateless/02344_describe_cache.reference
+++ b/tests/queries/0_stateless/02344_describe_cache.reference
@@ -1,2 +1,2 @@
-2147483648	1048576	104857600	1	0	0	0	s3_cache/	0
-2147483648	1048576	104857600	0	0	0	0	s3_cache_2/	0
+134217728	1048576	104857600	1	0	0	0	/var/lib/clickhouse/caches/s3_cache/	0
+134217728	1048576	104857600	0	0	0	0	/var/lib/clickhouse/caches/s3_cache_2/	0
diff --git a/tests/queries/0_stateless/02344_describe_cache.sql b/tests/queries/0_stateless/02344_describe_cache.sql
index fef004cb27f..a687ad01394 100644
--- a/tests/queries/0_stateless/02344_describe_cache.sql
+++ b/tests/queries/0_stateless/02344_describe_cache.sql
@@ -1,7 +1,7 @@
 -- Tags: no-fasttest, no-parallel
 
-SYSTEM DROP FILESYSTEM CACHE 's3_cache/';
-SYSTEM DROP FILESYSTEM CACHE 's3_cache_2/';
+SYSTEM DROP FILESYSTEM CACHE 's3_cache';
+SYSTEM DROP FILESYSTEM CACHE 's3_cache_2';
 
 DESCRIBE FILESYSTEM CACHE 's3_cache';
 DESCRIBE FILESYSTEM CACHE 's3_cache_2';
diff --git a/tests/queries/0_stateless/02344_show_caches.reference b/tests/queries/0_stateless/02344_show_caches.reference
deleted file mode 100644
index 2ee4f902ba1..00000000000
--- a/tests/queries/0_stateless/02344_show_caches.reference
+++ /dev/null
@@ -1,14 +0,0 @@
-cached_azure
-s3_cache_2
-s3_cache
-s3_cache_3
-s3_cache_multi
-s3_cache_4
-s3_cache_5
-s3_cache_small_segment_size
-local_cache
-s3_cache_6
-s3_cache_small
-local_cache_2
-local_cache_3
-s3_cache_multi_2
diff --git a/tests/queries/0_stateless/02344_show_caches.sql b/tests/queries/0_stateless/02344_show_caches.sql
deleted file mode 100644
index 56f00b89051..00000000000
--- a/tests/queries/0_stateless/02344_show_caches.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Tags: no-fasttest, no-replicated-database, no-cpu-aarch64
-SHOW FILESYSTEM CACHES;
diff --git a/tests/queries/0_stateless/02345_implicit_transaction.reference b/tests/queries/0_stateless/02345_implicit_transaction.reference
index e4dd35600f7..fb4254ec5a7 100644
--- a/tests/queries/0_stateless/02345_implicit_transaction.reference
+++ b/tests/queries/0_stateless/02345_implicit_transaction.reference
@@ -12,3 +12,6 @@ in_transaction	10000
 out_transaction	0
 {"'implicit_True'":"implicit_True","all":"2","is_empty":0}
 {"'implicit_False'":"implicit_False","all":"2","is_empty":1}
+0
+0
+0
diff --git a/tests/queries/0_stateless/02345_implicit_transaction.sql b/tests/queries/0_stateless/02345_implicit_transaction.sql
index e3f9cca37d1..b0cb4ab6305 100644
--- a/tests/queries/0_stateless/02345_implicit_transaction.sql
+++ b/tests/queries/0_stateless/02345_implicit_transaction.sql
@@ -1,4 +1,4 @@
--- Tags: no-ordinary-database
+-- Tags: no-ordinary-database, no-fasttest
 
 CREATE TABLE landing (n Int64) engine=MergeTree order by n;
 CREATE TABLE target  (n Int64) engine=MergeTree order by n;
@@ -92,3 +92,13 @@ WHERE
     query LIKE '-- Verify that the transaction_id column is NOT populated without transaction%'
 GROUP BY transaction_id
 FORMAT JSONEachRow;
+
+SET implicit_transaction=1;
+SET throw_on_unsupported_query_inside_transaction=1;
+SELECT * FROM system.one;
+SELECT * FROM cluster('test_cluster_interserver_secret', system, one);  -- { serverError NOT_IMPLEMENTED }
+SELECT * FROM cluster('test_cluster_two_shards', system, one);  -- { serverError NOT_IMPLEMENTED }
+SET throw_on_unsupported_query_inside_transaction=0;
+-- there's not session in the interserver mode
+SELECT * FROM cluster('test_cluster_interserver_secret', system, one) FORMAT Null;  -- { serverError INVALID_TRANSACTION }
+SELECT * FROM cluster('test_cluster_two_shards', system, one);
diff --git a/tests/queries/0_stateless/02346_full_text_search.reference b/tests/queries/0_stateless/02346_full_text_search.reference
index f1e21e511d0..d6e510b9375 100644
--- a/tests/queries/0_stateless/02346_full_text_search.reference
+++ b/tests/queries/0_stateless/02346_full_text_search.reference
@@ -1,3 +1,4 @@
+Test inverted(2)
 af	inverted
 1
 101	Alick a01
@@ -10,6 +11,7 @@ af	inverted
 113	Click b03
 118	Click b08
 1
+Test inverted()
 af	inverted
 101	Alick a01
 106	Alick a06
@@ -21,9 +23,11 @@ af	inverted
 101	Alick a01
 111	Alick b01
 1
+Test on array columns
 af	inverted
 3	['Click a03','Click b03']
 1
+Test on map columns
 af	inverted
 103	{'Click':'Click a03'}
 108	{'Click':'Click a08'}
@@ -32,22 +36,13 @@ af	inverted
 1
 103	{'Click':'Click a03'}
 1
+Test inverted(2) on a column with two parts
 af	inverted
 101	Alick a01
 111	Alick b01
 201	rick c01
 1
+Test inverted(2) on UTF-8 data
 af	inverted
 102	clickhouse你好
 1
-af	inverted
-BC614E,05397FB1,6969696969898240,CF3304
-1
-af	inverted
-1
-1
-af	inverted
-1
-1
-1
-1
diff --git a/tests/queries/0_stateless/02346_full_text_search.sql b/tests/queries/0_stateless/02346_full_text_search.sql
index 2b10800e78f..18d1ce0fd96 100644
--- a/tests/queries/0_stateless/02346_full_text_search.sql
+++ b/tests/queries/0_stateless/02346_full_text_search.sql
@@ -2,7 +2,7 @@ SET allow_experimental_inverted_index = 1;
 SET log_queries = 1;
 
 ----------------------------------------------------
--- Test inverted(2)
+SELECT 'Test inverted(2)';
 
 DROP TABLE IF EXISTS tab;
 
@@ -58,7 +58,7 @@ SELECT read_rows==8 from system.query_log
         LIMIT 1;
 
 ----------------------------------------------------
--- Test inverted()
+SELECT 'Test inverted()';
 
 DROP TABLE IF EXISTS tab_x;
 
@@ -111,7 +111,7 @@ SELECT read_rows==4 from system.query_log
     LIMIT 1;
 
 ----------------------------------------------------
--- Test on array columns
+SELECT 'Test on array columns';
 
 DROP TABLE IF EXISTS tab;
 
@@ -138,7 +138,7 @@ SELECT read_rows==2 from system.query_log
     LIMIT 1;
 
 ----------------------------------------------------
--- Test on map columns
+SELECT 'Test on map columns';
 
 DROP TABLE IF EXISTS tab;
 
@@ -178,7 +178,8 @@ SELECT read_rows==8 from system.query_log
     LIMIT 1;
 
 ----------------------------------------------------
--- Test inverted(2) on a column with two parts
+SELECT 'Test inverted(2) on a column with two parts';
+
 
 DROP TABLE IF EXISTS tab;
 
@@ -206,7 +207,7 @@ SELECT read_rows==6 from system.query_log
     LIMIT 1;
 
 ----------------------------------------------------
--- Test inverted(2) on UTF-8 data
+SELECT 'Test inverted(2) on UTF-8 data';
 
 DROP TABLE IF EXISTS tab;
 
@@ -233,105 +234,108 @@ SELECT read_rows==2 from system.query_log
         AND result_rows==1
     LIMIT 1;
 
-----------------------------------------------------
--- Test max_digestion_size_per_segment
 
-DROP TABLE IF EXISTS tab;
+-- Tests with parameter max_digestion_size_per_segment are flaky in CI, not clear why --> comment out for the time being:
 
-CREATE TABLE tab(k UInt64, s String, INDEX af(s) TYPE inverted(0))
-                    Engine=MergeTree
-                    ORDER BY (k)
-                    SETTINGS max_digestion_size_per_segment = 1024, index_granularity = 256
-                    AS
-                        SELECT
-                        number,
-                        format('{},{},{},{}', hex(12345678), hex(87654321), hex(number/17 + 5), hex(13579012)) as s
-                        FROM numbers(10240);
-
--- check inverted index was created
-SELECT name, type FROM system.data_skipping_indices WHERE table == 'tab' AND database = currentDatabase() LIMIT 1;
-
--- search inverted index
-SELECT s FROM tab WHERE hasToken(s, '6969696969898240');
-
--- check the query only read 1 granule (1 row total; each granule has 256 rows)
-SYSTEM FLUSH LOGS;
-SELECT read_rows==256 from system.query_log 
-        WHERE query_kind ='Select'
-            AND current_database = currentDatabase()
-            AND endsWith(trimRight(query), 'SELECT s FROM tab WHERE hasToken(s, \'6969696969898240\');') 
-            AND type='QueryFinish' 
-            AND result_rows==1
-        LIMIT 1;
-
-----------------------------------------------------
--- Test density==1
-
-DROP TABLE IF EXISTS tab;
-
-CREATE TABLE tab(k UInt64, s String, INDEX af(s) TYPE inverted(0, 1.0))
-                     Engine=MergeTree
-                     ORDER BY (k)
-                     SETTINGS max_digestion_size_per_segment = 1, index_granularity = 512
-                     AS
-                          SELECT number, if(number%2, format('happy {}', hex(number)), format('birthday {}', hex(number)))
-                          FROM numbers(1024);
-
--- check inverted index was created
-SELECT name, type FROM system.data_skipping_indices WHERE table == 'tab' AND database = currentDatabase() LIMIT 1;
-
--- search inverted index, no row has 'happy birthday'
-SELECT count() == 0 FROM tab WHERE s =='happy birthday';
-
--- check the query only skip all granules (0 row total; each granule has 512 rows)
-SYSTEM FLUSH LOGS;
-SELECT read_rows==0 from system.query_log 
-        WHERE query_kind ='Select'
-            AND current_database = currentDatabase()
-            AND endsWith(trimRight(query), 'SELECT count() == 0 FROM tab WHERE s ==\'happy birthday\';')
-            AND type='QueryFinish' 
-            AND result_rows==1
-        LIMIT 1;
-
-----------------------------------------------------
--- Test density==0.1
-
-DROP TABLE IF EXISTS tab;
-
-CREATE TABLE tab(k UInt64, s String, INDEX af(s) TYPE inverted(0, 0.1))
-                    Engine=MergeTree
-                    ORDER BY (k)
-                    SETTINGS max_digestion_size_per_segment = 1, index_granularity = 512
-                    AS
-                        SELECT number, if(number==1023, 'happy new year', if(number%2, format('happy {}', hex(number)), format('birthday {}', hex(number))))
-                        FROM numbers(1024);
-
--- check inverted index was created
-
-SELECT name, type FROM system.data_skipping_indices WHERE table == 'tab' AND database = currentDatabase() LIMIT 1;
-
--- search inverted index, no row has 'happy birthday'
-SELECT count() == 0 FROM tab WHERE s == 'happy birthday';
-
--- check the query does not skip any of the 2 granules(1024 rows total; each granule has 512 rows)
-SYSTEM FLUSH LOGS;
-SELECT read_rows==1024 from system.query_log 
-        WHERE query_kind ='Select'
-            AND current_database = currentDatabase()
-            AND endsWith(trimRight(query), 'SELECT count() == 0 FROM tab WHERE s == \'happy birthday\';')
-            AND type='QueryFinish' 
-            AND result_rows==1
-        LIMIT 1;
-
--- search inverted index, no row has 'happy new year'
-SELECT count() == 1 FROM tab WHERE s == 'happy new year';
-
--- check the query only read 1 granule because of density (1024 rows total; each granule has 512 rows)
-SYSTEM FLUSH LOGS;
-SELECT read_rows==512 from system.query_log 
-        WHERE query_kind ='Select'
-            AND current_database = currentDatabase()
-            AND endsWith(trimRight(query), 'SELECT count() == 1 FROM tab WHERE s == \'happy new year\';')
-            AND type='QueryFinish' 
-            AND result_rows==1
-        LIMIT 1;
+-- ----------------------------------------------------
+-- SELECT 'Test max_digestion_size_per_segment';
+--
+-- DROP TABLE IF EXISTS tab;
+--
+-- CREATE TABLE tab(k UInt64, s String, INDEX af(s) TYPE inverted(0))
+--                     Engine=MergeTree
+--                     ORDER BY (k)
+--                     SETTINGS max_digestion_size_per_segment = 1024, index_granularity = 256
+--                     AS
+--                         SELECT
+--                         number,
+--                         format('{},{},{},{}', hex(12345678), hex(87654321), hex(number/17 + 5), hex(13579012)) as s
+--                         FROM numbers(10240);
+--
+-- -- check inverted index was created
+-- SELECT name, type FROM system.data_skipping_indices WHERE table == 'tab' AND database = currentDatabase() LIMIT 1;
+--
+-- -- search inverted index
+-- SELECT s FROM tab WHERE hasToken(s, '6969696969898240');
+--
+-- -- check the query only read 1 granule (1 row total; each granule has 256 rows)
+-- SYSTEM FLUSH LOGS;
+-- SELECT read_rows==256 from system.query_log 
+--         WHERE query_kind ='Select'
+--             AND current_database = currentDatabase()
+--             AND endsWith(trimRight(query), 'SELECT s FROM tab WHERE hasToken(s, \'6969696969898240\');') 
+--             AND type='QueryFinish' 
+--             AND result_rows==1
+--         LIMIT 1;
+--
+-- ----------------------------------------------------
+-- SELECT 'Test density==1';
+--
+-- DROP TABLE IF EXISTS tab;
+--
+-- CREATE TABLE tab(k UInt64, s String, INDEX af(s) TYPE inverted(0, 1.0))
+--                      Engine=MergeTree
+--                      ORDER BY (k)
+--                      SETTINGS max_digestion_size_per_segment = 1, index_granularity = 512
+--                      AS
+--                           SELECT number, if(number%2, format('happy {}', hex(number)), format('birthday {}', hex(number)))
+--                           FROM numbers(1024);
+--
+-- -- check inverted index was created
+-- SELECT name, type FROM system.data_skipping_indices WHERE table == 'tab' AND database = currentDatabase() LIMIT 1;
+--
+-- -- search inverted index, no row has 'happy birthday'
+-- SELECT count() == 0 FROM tab WHERE s =='happy birthday';
+--
+-- -- check the query only skip all granules (0 row total; each granule has 512 rows)
+-- SYSTEM FLUSH LOGS;
+-- SELECT read_rows==0 from system.query_log 
+--         WHERE query_kind ='Select'
+--             AND current_database = currentDatabase()
+--             AND endsWith(trimRight(query), 'SELECT count() == 0 FROM tab WHERE s ==\'happy birthday\';')
+--             AND type='QueryFinish' 
+--             AND result_rows==1
+--         LIMIT 1;
+--
+-- ----------------------------------------------------
+-- SELECT 'Test density==0.1';
+--
+-- DROP TABLE IF EXISTS tab;
+--
+-- CREATE TABLE tab(k UInt64, s String, INDEX af(s) TYPE inverted(0, 0.1))
+--                     Engine=MergeTree
+--                     ORDER BY (k)
+--                     SETTINGS max_digestion_size_per_segment = 1, index_granularity = 512
+--                     AS
+--                         SELECT number, if(number==1023, 'happy new year', if(number%2, format('happy {}', hex(number)), format('birthday {}', hex(number))))
+--                         FROM numbers(1024);
+--
+-- -- check inverted index was created
+--
+-- SELECT name, type FROM system.data_skipping_indices WHERE table == 'tab' AND database = currentDatabase() LIMIT 1;
+--
+-- -- search inverted index, no row has 'happy birthday'
+-- SELECT count() == 0 FROM tab WHERE s == 'happy birthday';
+--
+-- -- check the query does not skip any of the 2 granules(1024 rows total; each granule has 512 rows)
+-- SYSTEM FLUSH LOGS;
+-- SELECT read_rows==1024 from system.query_log 
+--         WHERE query_kind ='Select'
+--             AND current_database = currentDatabase()
+--             AND endsWith(trimRight(query), 'SELECT count() == 0 FROM tab WHERE s == \'happy birthday\';')
+--             AND type='QueryFinish' 
+--             AND result_rows==1
+--         LIMIT 1;
+--
+-- -- search inverted index, no row has 'happy new year'
+-- SELECT count() == 1 FROM tab WHERE s == 'happy new year';
+--
+-- -- check the query only read 1 granule because of density (1024 rows total; each granule has 512 rows)
+-- SYSTEM FLUSH LOGS;
+-- SELECT read_rows==512 from system.query_log 
+--         WHERE query_kind ='Select'
+--             AND current_database = currentDatabase()
+--             AND endsWith(trimRight(query), 'SELECT count() == 1 FROM tab WHERE s == \'happy new year\';')
+--             AND type='QueryFinish' 
+--             AND result_rows==1
+--         LIMIT 1;
diff --git a/tests/queries/0_stateless/02346_read_in_order_fixed_prefix.python b/tests/queries/0_stateless/02346_read_in_order_fixed_prefix.python
index 399533480a9..7f52daeb408 100644
--- a/tests/queries/0_stateless/02346_read_in_order_fixed_prefix.python
+++ b/tests/queries/0_stateless/02346_read_in_order_fixed_prefix.python
@@ -123,10 +123,14 @@ Uses FinishSortingTransform: {}
 
 for query in queries:
     check_query(query["where"], query["order_by"], query["optimize"], False)
-    check_query(query["where"], query["order_by"] + ["e"], query["optimize"], query["optimize"])
+    check_query(
+        query["where"], query["order_by"] + ["e"], query["optimize"], query["optimize"]
+    )
 
     where_columns = [f"bitNot({col})" for col in query["where"]]
     check_query(where_columns, query["order_by"], query["optimize"], False)
-    check_query(where_columns, query["order_by"] + ["e"], query["optimize"], query["optimize"])
+    check_query(
+        where_columns, query["order_by"] + ["e"], query["optimize"], query["optimize"]
+    )
 
 print("OK")
diff --git a/tests/queries/0_stateless/02352_lightweight_delete.sql b/tests/queries/0_stateless/02352_lightweight_delete.sql
index e1759e56a3a..b13688282a4 100644
--- a/tests/queries/0_stateless/02352_lightweight_delete.sql
+++ b/tests/queries/0_stateless/02352_lightweight_delete.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS lwd_test;
 
-CREATE TABLE lwd_test (id UInt64 , value String) ENGINE MergeTree() ORDER BY id;
+CREATE TABLE lwd_test (id UInt64 , value String) ENGINE MergeTree() ORDER BY id SETTINGS index_granularity=8192, index_granularity_bytes='10Mi';
 
 INSERT INTO lwd_test SELECT number, randomString(10) FROM system.numbers LIMIT 1000000;
 
diff --git a/tests/queries/0_stateless/02352_lightweight_delete_and_object_column.reference b/tests/queries/0_stateless/02352_lightweight_delete_and_object_column.reference
new file mode 100644
index 00000000000..3ad5abd03ae
--- /dev/null
+++ b/tests/queries/0_stateless/02352_lightweight_delete_and_object_column.reference
@@ -0,0 +1 @@
+99
diff --git a/tests/queries/0_stateless/02352_lightweight_delete_and_object_column.sql b/tests/queries/0_stateless/02352_lightweight_delete_and_object_column.sql
new file mode 100644
index 00000000000..cd29d0ac445
--- /dev/null
+++ b/tests/queries/0_stateless/02352_lightweight_delete_and_object_column.sql
@@ -0,0 +1,14 @@
+DROP TABLE IF EXISTS t_obj SYNC;
+
+SET allow_experimental_object_type=1;
+
+CREATE TABLE t_obj(id Int32, name Object('json')) ENGINE = MergeTree() ORDER BY id;
+
+INSERT INTO t_obj select number, '{"a" : "' || toString(number) || '"}' FROM numbers(100);
+
+DELETE FROM t_obj WHERE id = 10;
+
+SELECT COUNT() FROM t_obj;
+
+DROP TABLE t_obj SYNC;
+
diff --git a/tests/queries/0_stateless/02354_with_statement_non_exist_column.reference b/tests/queries/0_stateless/02354_with_statement_non_exist_column.reference
index d00491fd7e5..e69de29bb2d 100644
--- a/tests/queries/0_stateless/02354_with_statement_non_exist_column.reference
+++ b/tests/queries/0_stateless/02354_with_statement_non_exist_column.reference
@@ -1 +0,0 @@
-1
diff --git a/tests/queries/0_stateless/02354_with_statement_non_exist_column.sql b/tests/queries/0_stateless/02354_with_statement_non_exist_column.sql
index 1a989c1d952..869c335b621 100644
--- a/tests/queries/0_stateless/02354_with_statement_non_exist_column.sql
+++ b/tests/queries/0_stateless/02354_with_statement_non_exist_column.sql
@@ -1,5 +1,3 @@
-WITH x AS y SELECT 1;
-
 DROP TEMPORARY TABLE IF EXISTS t1;
 DROP TEMPORARY TABLE IF EXISTS t2;
 
diff --git a/tests/queries/0_stateless/02361_fsync_profile_events.sh b/tests/queries/0_stateless/02361_fsync_profile_events.sh
index 44a1bd58d36..5b603133f6c 100755
--- a/tests/queries/0_stateless/02361_fsync_profile_events.sh
+++ b/tests/queries/0_stateless/02361_fsync_profile_events.sh
@@ -44,8 +44,8 @@ for i in {1..100}; do
     ")"
 
     # Non retriable errors
-    if [[ $FileSync -ne 7 ]]; then
-        echo "FileSync: $FileSync != 11" >&2
+    if [[ $FileSync -ne 8 ]]; then
+        echo "FileSync: $FileSync != 8" >&2
         exit 2
     fi
     # Check that all files was synced
diff --git a/tests/queries/0_stateless/02364_window_view_segfault.sh b/tests/queries/0_stateless/02364_window_view_segfault.sh
index d03a1e5ae3e..3def22f4a9e 100755
--- a/tests/queries/0_stateless/02364_window_view_segfault.sh
+++ b/tests/queries/0_stateless/02364_window_view_segfault.sh
@@ -5,7 +5,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery --multiline --query """
+opts=(
+    "--allow_experimental_analyzer=0"
+)
+
+${CLICKHOUSE_CLIENT} "${opts[@]}" --multiquery --multiline --query """
 DROP TABLE IF EXISTS mt ON CLUSTER test_shard_localhost;
 DROP TABLE IF EXISTS wv ON CLUSTER test_shard_localhost;
 CREATE TABLE mt  ON CLUSTER test_shard_localhost (a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
diff --git a/tests/queries/0_stateless/02368_cancel_write_into_hdfs.sh b/tests/queries/0_stateless/02368_cancel_write_into_hdfs.sh
index 8262cd7eab5..65d0b3f434f 100755
--- a/tests/queries/0_stateless/02368_cancel_write_into_hdfs.sh
+++ b/tests/queries/0_stateless/02368_cancel_write_into_hdfs.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-stress
+# Tags: no-fasttest, no-asan, no-tsan, no-msan, no-ubsan, no-debug
+# FIXME https://github.com/ClickHouse/ClickHouse/issues/47207
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02370_lost_part_intersecting_merges.reference b/tests/queries/0_stateless/02370_lost_part_intersecting_merges.reference
new file mode 100644
index 00000000000..bc44a664c04
--- /dev/null
+++ b/tests/queries/0_stateless/02370_lost_part_intersecting_merges.reference
@@ -0,0 +1,8 @@
+1	0	all_0_0_0
+1	1	all_1_2_1
+1	2	all_1_2_1
+0
+3	0	all_0_3_2
+3	1	all_0_3_2
+3	2	all_0_3_2
+3	3	all_0_3_2
diff --git a/tests/queries/0_stateless/02370_lost_part_intersecting_merges.sh b/tests/queries/0_stateless/02370_lost_part_intersecting_merges.sh
new file mode 100755
index 00000000000..bc297cbb963
--- /dev/null
+++ b/tests/queries/0_stateless/02370_lost_part_intersecting_merges.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+# Tags: long, zookeeper
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "drop table if exists rmt1 sync;"
+$CLICKHOUSE_CLIENT -q "drop table if exists rmt2 sync;"
+
+$CLICKHOUSE_CLIENT -q "create table rmt1 (n int) engine=ReplicatedMergeTree('/test/02369/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/{database}', '1') order by n
+  settings cleanup_delay_period=0, cleanup_delay_period_random_add=0, old_parts_lifetime=0"
+$CLICKHOUSE_CLIENT -q "create table rmt2 (n int) engine=ReplicatedMergeTree('/test/02369/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/{database}', '2') order by n"
+
+$CLICKHOUSE_CLIENT -q "system stop replicated sends rmt2"
+$CLICKHOUSE_CLIENT --insert_keeper_fault_injection_probability=0 -q "insert into rmt2 values (0);"
+
+$CLICKHOUSE_CLIENT --insert_keeper_fault_injection_probability=0 -q "insert into rmt1 values (1);"
+$CLICKHOUSE_CLIENT --insert_keeper_fault_injection_probability=0 -q "insert into rmt1 values (2);"
+
+$CLICKHOUSE_CLIENT -q "system sync replica rmt1 pull;"
+
+# There's a stupid effect from "zero copy replication":
+# MERGE_PARTS all_1_2_1 can be executed by rmt2 even if it was assigned by rmt1
+# After that, rmt2 will not be able to execute that merge and will only try to fetch the part from rmt2
+# But sends are stopped on rmt2...
+
+(sleep 5 && $CLICKHOUSE_CLIENT -q "system start replicated sends rmt2") &
+
+$CLICKHOUSE_CLIENT --optimize_throw_if_noop=1 -q "optimize table rmt1;"
+$CLICKHOUSE_CLIENT -q "system sync replica rmt1;"
+
+$CLICKHOUSE_CLIENT -q "select 1, *, _part from rmt1 order by n;"
+
+path=$($CLICKHOUSE_CLIENT -q "select path from system.parts where database='$CLICKHOUSE_DATABASE' and table='rmt1' and name='all_1_2_1'")
+# ensure that path is absolute before removing
+$CLICKHOUSE_CLIENT -q "select throwIf(substring('$path', 1, 1) != '/', 'Path is relative: $path')" || exit
+rm -rf $path
+
+$CLICKHOUSE_CLIENT -q "select * from rmt1;" 2>&1 | grep LOGICAL_ERROR
+$CLICKHOUSE_CLIENT --min_bytes_to_use_direct_io=1 --local_filesystem_read_method=pread_threadpool -q "select * from rmt1;" 2>&1 | grep LOGICAL_ERROR
+
+$CLICKHOUSE_CLIENT -q "select sleep(0.1) from numbers($(($RANDOM % 30))) settings max_block_size=1 format Null"
+
+$CLICKHOUSE_CLIENT -q "detach table rmt1;"
+$CLICKHOUSE_CLIENT -q "attach table rmt1;"
+
+$CLICKHOUSE_CLIENT --insert_keeper_fault_injection_probability=0 -q "insert into rmt1 values (3);"
+$CLICKHOUSE_CLIENT -q "system sync replica rmt1 pull;"
+$CLICKHOUSE_CLIENT -q "optimize table rmt1 final;"
+
+$CLICKHOUSE_CLIENT -q "system sync replica rmt1;"
+$CLICKHOUSE_CLIENT -q "select 3, *, _part from rmt1 order by n;"
+
+$CLICKHOUSE_CLIENT -q "drop table rmt1 sync;"
+$CLICKHOUSE_CLIENT -q "drop table rmt2 sync;"
diff --git a/tests/queries/0_stateless/02371_select_projection_normal_agg.sql b/tests/queries/0_stateless/02371_select_projection_normal_agg.sql
index 283aec0b122..8650fb6b843 100644
--- a/tests/queries/0_stateless/02371_select_projection_normal_agg.sql
+++ b/tests/queries/0_stateless/02371_select_projection_normal_agg.sql
@@ -11,7 +11,8 @@ CREATE TABLE video_log
 )
 ENGINE = MergeTree
 PARTITION BY toDate(datetime)
-ORDER BY (user_id, device_id);
+ORDER BY (user_id, device_id)
+SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
 
 DROP TABLE IF EXISTS rng;
 
@@ -57,7 +58,8 @@ CREATE TABLE video_log_result
 )
 ENGINE = MergeTree
 PARTITION BY toDate(hour)
-ORDER BY sum_bytes;
+ORDER BY sum_bytes
+SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
 
 INSERT INTO video_log_result SELECT
     toStartOfHour(datetime) AS hour,
diff --git a/tests/queries/0_stateless/02377_executable_function_settings.reference b/tests/queries/0_stateless/02377_executable_function_settings.reference
index 5eef5774e14..edef1cca7a1 100644
--- a/tests/queries/0_stateless/02377_executable_function_settings.reference
+++ b/tests/queries/0_stateless/02377_executable_function_settings.reference
@@ -6,3 +6,4 @@ FROM executable(\'\', \'JSON\', \'data String\', SETTINGS max_command_execution_
 --------------------
 SELECT data
 FROM executable(\'\', \'JSON\', \'data String\', SETTINGS max_command_execution_time = 100, command_read_timeout = 1)
+--------------------
diff --git a/tests/queries/0_stateless/02377_executable_function_settings.sql b/tests/queries/0_stateless/02377_executable_function_settings.sql
index be60ad2d89b..ae0dc49c2fc 100644
--- a/tests/queries/0_stateless/02377_executable_function_settings.sql
+++ b/tests/queries/0_stateless/02377_executable_function_settings.sql
@@ -3,3 +3,7 @@ SELECT '--------------------';
 EXPLAIN SYNTAX SELECT * from executable('', 'JSON', 'data String', SETTINGS max_command_execution_time=100);
 SELECT '--------------------';
 EXPLAIN SYNTAX SELECT * from executable('', 'JSON', 'data String', SETTINGS max_command_execution_time=100, command_read_timeout=1);
+SELECT '--------------------';
+
+SELECT * from executable('JSON', 'data String', SETTINGS max_command_execution_time=100); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT * from executable('JSON', 'data String', 'TEST', 'TEST'); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.reference b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.reference
index 9d78707429e..69c325c21a9 100644
--- a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.reference
+++ b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.reference
@@ -5,6 +5,12 @@ Sorting (Sorting for ORDER BY)
 Sorting (Global): a ASC
 Sorting (None)
 Sorting (None)
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a
+Sorting (Global): a ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Global): default.optimize_sorting.a_0 ASC
+Sorting (None)
+Sorting (None)
 -- disable optimization -> sorting order is NOT propagated from subquery -> full sort
 -- QUERY: set optimize_sorting_by_input_stream_properties=0;set query_plan_read_in_order=0;set max_threads=3;EXPLAIN PIPELINE SELECT a FROM (SELECT a FROM optimize_sorting) ORDER BY a
 MergingSortedTransform 3 → 1
@@ -27,12 +33,24 @@ Sorting (Sorting for ORDER BY)
 Sorting (Global): a ASC
 Sorting (Stream): a ASC
 Sorting (Stream): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a
+Sorting (Global): a ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Global): default.optimize_sorting.a_0 ASC
+Sorting (Stream): default.optimize_sorting.a_0 ASC
+Sorting (Stream): a ASC
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a+1
 Sorting (None)
 Sorting (Sorting for ORDER BY)
 Sorting (Global): plus(a, 1) ASC
 Sorting (Chunk): a ASC
 Sorting (Chunk): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a+1
+Sorting (None)
+Sorting (Sorting for ORDER BY)
+Sorting (Global): plus(default.optimize_sorting.a_0, 1_UInt8) ASC
+Sorting (Chunk): default.optimize_sorting.a_0 ASC
+Sorting (Chunk): a ASC
 -- ExpressionStep breaks sort mode
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting ORDER BY a+1
 Sorting (Global): plus(a, 1) ASC
@@ -40,28 +58,54 @@ Sorting (Sorting for ORDER BY)
 Sorting (Global): plus(a, 1) ASC
 Sorting (None)
 Sorting (Chunk): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting ORDER BY a+1
+Sorting (Global): plus(a, 1) ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Global): plus(default.optimize_sorting.a_0, 1_UInt8) ASC
+Sorting (None)
+Sorting (Chunk): a ASC
 -- FilterStep preserves sort mode
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a > 0
 Sorting (Chunk): a ASC
 Sorting (Chunk): a ASC
 Sorting (Chunk): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a > 0
+Sorting (Chunk): a ASC
+Sorting (Chunk): default.optimize_sorting.a_0 ASC
+Sorting (Chunk): a ASC
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a+1 > 0
 Sorting (Chunk): a ASC
 Sorting (Chunk): a ASC
 Sorting (Chunk): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a+1 > 0
+Sorting (Chunk): a ASC
+Sorting (Chunk): default.optimize_sorting.a_0 ASC
+Sorting (Chunk): a ASC
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, a+1 FROM optimize_sorting WHERE a+1 > 0
 Sorting (Chunk): a ASC
 Sorting (Chunk): a ASC
 Sorting (Chunk): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, a+1 FROM optimize_sorting WHERE a+1 > 0
+Sorting (Chunk): a ASC
+Sorting (Chunk): default.optimize_sorting.a_0 ASC
+Sorting (Chunk): a ASC
 -- FilterStep breaks sort mode
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a > 0 FROM optimize_sorting WHERE a > 0
 Sorting (None)
 Sorting (None)
 Sorting (Chunk): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a > 0 FROM optimize_sorting WHERE a > 0
+Sorting (None)
+Sorting (None)
+Sorting (Chunk): a ASC
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting WHERE a+1 > 0
 Sorting (None)
 Sorting (None)
 Sorting (Chunk): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting WHERE a+1 > 0
+Sorting (None)
+Sorting (None)
+Sorting (Chunk): a ASC
 -- aliases break sorting order
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM (SELECT sipHash64(a) AS a FROM (SELECT a FROM optimize_sorting ORDER BY a)) ORDER BY a
 Sorting (Global): a ASC
@@ -72,12 +116,27 @@ Sorting (Sorting for ORDER BY)
 Sorting (Global): a ASC
 Sorting (Stream): a ASC
 Sorting (Stream): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM (SELECT sipHash64(a) AS a FROM (SELECT a FROM optimize_sorting ORDER BY a)) ORDER BY a
+Sorting (Global): a ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Global): a_0 ASC
+Sorting (None)
+Sorting (Sorting for ORDER BY)
+Sorting (Global): default.optimize_sorting.a_2 ASC
+Sorting (Stream): default.optimize_sorting.a_2 ASC
+Sorting (Stream): a ASC
 -- aliases DONT break sorting order
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, b FROM (SELECT x AS a, y AS b FROM (SELECT a AS x, b AS y FROM optimize_sorting) ORDER BY x, y)
-Sorting (Global): x ASC, y ASC
+Sorting (Global): a ASC, b ASC
 Sorting (Sorting for ORDER BY)
 Sorting (Global): x ASC, y ASC
+Sorting (Stream): x ASC, y ASC
 Sorting (Stream): a ASC, b ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, b FROM (SELECT x AS a, y AS b FROM (SELECT a AS x, b AS y FROM optimize_sorting) ORDER BY x, y)
+Sorting (Global): a ASC, b ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Global): x_2 ASC, y_3 ASC
+Sorting (Stream): x_2 ASC, y_3 ASC
 Sorting (Stream): a ASC, b ASC
 -- actions chain breaks sorting order: input(column a)->sipHash64(column a)->alias(sipHash64(column a), a)->plus(alias a, 1)
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, z FROM (SELECT sipHash64(a) AS a, a + 1 AS z FROM (SELECT a FROM optimize_sorting ORDER BY a + 1)) ORDER BY a + 1
@@ -89,6 +148,15 @@ Sorting (Sorting for ORDER BY)
 Sorting (Global): plus(a, 1) ASC
 Sorting (Chunk): a ASC
 Sorting (Chunk): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, z FROM (SELECT sipHash64(a) AS a, a + 1 AS z FROM (SELECT a FROM optimize_sorting ORDER BY a + 1)) ORDER BY a + 1
+Sorting (None)
+Sorting (Sorting for ORDER BY)
+Sorting (Global): plus(a_0, 1_UInt8) ASC
+Sorting (Global): plus(default.optimize_sorting.a_3, 1_UInt8) ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Global): plus(default.optimize_sorting.a_3, 1_UInt8) ASC
+Sorting (Chunk): default.optimize_sorting.a_3 ASC
+Sorting (Chunk): a ASC
 -- check that correct sorting info is provided in case of only prefix of sorting key is in ORDER BY clause but all sorting key columns returned by query
 -- QUERY: set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN sorting=1 SELECT a, b FROM optimize_sorting ORDER BY a
 Sorting (Global): a ASC
@@ -96,3 +164,9 @@ Sorting (Sorting for ORDER BY)
 Sorting (Global): a ASC
 Sorting (Stream): a ASC
 Sorting (Stream): a ASC
+-- QUERY (analyzer): set optimize_read_in_order=1;set max_threads=3;set query_plan_remove_redundant_sorting=0;EXPLAIN PLAN sorting=1 SELECT a, b FROM optimize_sorting ORDER BY a
+Sorting (Global): a ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Global): default.optimize_sorting.a_0 ASC
+Sorting (Stream): default.optimize_sorting.a_0 ASC
+Sorting (Stream): a ASC
diff --git a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.sh b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.sh
index 0678ff63e3f..7e937ac42b6 100755
--- a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.sh
+++ b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.sh
@@ -17,9 +17,12 @@ function explain_sorting {
     echo "-- QUERY: "$1
     $CLICKHOUSE_CLIENT -nq "$1" | eval $FIND_SORTING
 }
+
 function explain_sortmode {
     echo "-- QUERY: "$1
-    $CLICKHOUSE_CLIENT -nq "$1" | eval $FIND_SORTMODE
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -nq "$1" | eval $FIND_SORTMODE
+    echo "-- QUERY (analyzer): "$1
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -nq "$1" | eval $FIND_SORTMODE
 }
 
 $CLICKHOUSE_CLIENT -q "drop table if exists optimize_sorting sync"
@@ -62,10 +65,6 @@ explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=
 echo "-- aliases break sorting order"
 explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM (SELECT sipHash64(a) AS a FROM (SELECT a FROM optimize_sorting ORDER BY a)) ORDER BY a"
 
-# FIXME: we still do full sort here, - it's because, for most inner subqueury, sorting description contains original column names but header contains only aliases on those columns:
-#|     Header: x Int32                                                 │
-#│             y Int32                                                 │
-#│     Sort Mode: Chunk: a ASC, b ASC                                  │
 echo "-- aliases DONT break sorting order"
 explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, b FROM (SELECT x AS a, y AS b FROM (SELECT a AS x, b AS y FROM optimize_sorting) ORDER BY x, y)"
 
diff --git a/tests/queries/0_stateless/02378_analyzer_projection_names.reference b/tests/queries/0_stateless/02378_analyzer_projection_names.reference
index 9e72fe0d100..a82d4d4c5d2 100644
--- a/tests/queries/0_stateless/02378_analyzer_projection_names.reference
+++ b/tests/queries/0_stateless/02378_analyzer_projection_names.reference
@@ -136,7 +136,7 @@ plus(id, id)	UInt64
 SELECT '--';
 --
 DESCRIBE (SELECT test_table.* REPLACE id + (id AS id_alias) AS id, id_alias FROM test_table);
-plus(id, id_alias)	UInt64					
+id	UInt64					
 value	String					
 id_alias	UInt64					
 SELECT 'Matcher';
diff --git a/tests/queries/0_stateless/02378_part_log_profile_events_replicated.sql b/tests/queries/0_stateless/02378_part_log_profile_events_replicated.sql
index d61b680bb87..4f52740c498 100644
--- a/tests/queries/0_stateless/02378_part_log_profile_events_replicated.sql
+++ b/tests/queries/0_stateless/02378_part_log_profile_events_replicated.sql
@@ -1,8 +1,8 @@
 
 -- Tags: long, replica, no-replicated-database, no-parallel
 
-DROP TABLE IF EXISTS part_log_profile_events_r1 NO DELAY;
-DROP TABLE IF EXISTS part_log_profile_events_r2 NO DELAY;
+DROP TABLE IF EXISTS part_log_profile_events_r1 SYNC;
+DROP TABLE IF EXISTS part_log_profile_events_r2 SYNC;
 
 CREATE TABLE part_log_profile_events_r1 (x UInt64)
 ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_02378/part_log_profile_events', 'r1')
@@ -36,5 +36,5 @@ WHERE event_time > now() - INTERVAL 10 MINUTE
     AND event_type == 'DownloadPart'
 ;
 
-DROP TABLE part_log_profile_events_r1 NO DELAY;
-DROP TABLE part_log_profile_events_r2 NO DELAY;
+DROP TABLE part_log_profile_events_r1 SYNC;
+DROP TABLE part_log_profile_events_r2 SYNC;
diff --git a/tests/queries/0_stateless/02381_join_dup_columns_in_plan.reference b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.reference
index bbf288c45d7..31a37862663 100644
--- a/tests/queries/0_stateless/02381_join_dup_columns_in_plan.reference
+++ b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.reference
@@ -2,51 +2,51 @@ Expression
 Header: key String
         value String
   Join
-  Header: key String
-          value String
+  Header: s1.key_0 String
+          s2.value_1 String
     Expression
-    Header: key String
+    Header: s1.key_0 String
       ReadFromStorage
       Header: dummy UInt8
     Union
-    Header: s2.key String
-            value String
+    Header: s2.key_2 String
+            s2.value_1 String
       Expression
-      Header: s2.key String
-              value String
+      Header: s2.key_2 String
+              s2.value_1 String
         ReadFromStorage
         Header: dummy UInt8
       Expression
-      Header: s2.key String
-              value String
+      Header: s2.key_2 String
+              s2.value_1 String
         ReadFromStorage
         Header: dummy UInt8
 Expression
 Header: key String
         value String
   Join
-  Header: key String
-          s2.key String
-          value String
+  Header: s1.key_0 String
+          s2.key_2 String
+          s2.value_1 String
     Sorting
-    Header: key String
+    Header: s1.key_0 String
       Expression
-      Header: key String
+      Header: s1.key_0 String
         ReadFromStorage
         Header: dummy UInt8
     Sorting
-    Header: s2.key String
-            value String
+    Header: s2.key_2 String
+            s2.value_1 String
       Union
-      Header: s2.key String
-              value String
+      Header: s2.key_2 String
+              s2.value_1 String
         Expression
-        Header: s2.key String
-                value String
+        Header: s2.key_2 String
+                s2.value_1 String
           ReadFromStorage
           Header: dummy UInt8
         Expression
-        Header: s2.key String
-                value String
+        Header: s2.key_2 String
+                s2.value_1 String
           ReadFromStorage
           Header: dummy UInt8
diff --git a/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql
index 4ed6d965292..dfcd8c12e11 100644
--- a/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql
+++ b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql
@@ -1,3 +1,4 @@
+SET allow_experimental_analyzer = 1;
 SET join_algorithm = 'hash';
 
 EXPLAIN actions=0, description=0, header=1
diff --git a/tests/queries/0_stateless/02382_filesystem_cache_persistent_files.reference b/tests/queries/0_stateless/02382_filesystem_cache_persistent_files.reference
index 083f0f69dc8..e77afc98007 100644
--- a/tests/queries/0_stateless/02382_filesystem_cache_persistent_files.reference
+++ b/tests/queries/0_stateless/02382_filesystem_cache_persistent_files.reference
@@ -8,7 +8,7 @@ SYSTEM STOP MERGES nopers;
 INSERT INTO nopers SELECT number, toString(number) FROM numbers(10);
 SELECT * FROM nopers FORMAT Null;
 SELECT sum(size) FROM system.filesystem_cache;
-194
+195
 SELECT extract(local_path, '.*/([\w.]+)') as file, extract(cache_path, '.*/([\w.]+)') as cache, size
 FROM
 (
@@ -21,17 +21,18 @@ ON data_paths.cache_path = caches.cache_path
 ORDER BY file, cache, size;
 data.bin	0	114
 data.mrk3	0	80
+format_version.txt	0	1
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_small', min_bytes_for_wide_part = 10485760, compress_marks=false, compress_primary_key=false;
 SYSTEM STOP MERGES test;
 INSERT INTO test SELECT number, toString(number) FROM numbers(100);
 SELECT * FROM test FORMAT Null;
 SELECT sum(size) FROM system.filesystem_cache;
-1020
+1021
 SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
-4
+5
 SELECT count() FROM system.filesystem_cache;
-4
+5
 SELECT extract(local_path, '.*/([\w.]+)') as file, extract(cache_path, '.*/([\w.]+)') as cache, size
 FROM
 (
@@ -46,17 +47,18 @@ data.bin	0	114
 data.bin	0	746
 data.mrk3	0	80
 data.mrk3	0_persistent	80
+format_version.txt	0	1
 DROP TABLE IF EXISTS test2;
 CREATE TABLE test2 (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_small', min_bytes_for_wide_part = 10485760, compress_marks=false, compress_primary_key=false;
 SYSTEM STOP MERGES test2;
 INSERT INTO test2 SELECT number, toString(number) FROM numbers(100000);
 SELECT * FROM test2 FORMAT Null;
 SELECT sum(size) FROM system.filesystem_cache;
-794
+795
 SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
-4
+5
 SELECT count() FROM system.filesystem_cache;
-4
+5
 SELECT extract(local_path, '.*/([\w.]+)') as file, extract(cache_path, '.*/([\w.]+)') as cache, size
 FROM
 (
@@ -71,6 +73,7 @@ data.bin	0	114
 data.mrk3	0	80
 data.mrk3	0_persistent	80
 data.mrk3	0_persistent	520
+format_version.txt	0	1
 DROP TABLE test;
 DROP TABLE test2;
 DROP TABLE nopers;
diff --git a/tests/queries/0_stateless/02383_arrow_dict_special_cases.sh b/tests/queries/0_stateless/02383_arrow_dict_special_cases.sh
index 86f95873f14..40487f16551 100755
--- a/tests/queries/0_stateless/02383_arrow_dict_special_cases.sh
+++ b/tests/queries/0_stateless/02383_arrow_dict_special_cases.sh
@@ -6,24 +6,24 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+UNIQ_DEST_PATH=$USER_FILES_PATH/test-02383-$RANDOM-$RANDOM
+mkdir -p $UNIQ_DEST_PATH
 
-mkdir -p $USER_FILES_PATH/test_02383
-cp $CURDIR/data_arrow/dictionary*.arrow $USER_FILES_PATH/test_02383/
-cp $CURDIR/data_arrow/corrupted.arrow $USER_FILES_PATH/test_02383/
-cp $CURDIR/data_arrow/dict_with_nulls.arrow $USER_FILES_PATH/test_02383/
+cp $CURDIR/data_arrow/dictionary*.arrow $UNIQ_DEST_PATH/
+cp $CURDIR/data_arrow/corrupted.arrow $UNIQ_DEST_PATH/
+cp $CURDIR/data_arrow/dict_with_nulls.arrow $UNIQ_DEST_PATH/
 
-$CLICKHOUSE_CLIENT -q "desc file('test_02383/dictionary1.arrow')"
-$CLICKHOUSE_CLIENT -q "select * from file('test_02383/dictionary1.arrow')"
-$CLICKHOUSE_CLIENT -q "desc file('test_02383/dictionary2.arrow')"
-$CLICKHOUSE_CLIENT -q "select * from file('test_02383/dictionary2.arrow')"
-$CLICKHOUSE_CLIENT -q "desc file('test_02383/dictionary3.arrow')"
-$CLICKHOUSE_CLIENT -q "select * from file('test_02383/dictionary3.arrow')"
+$CLICKHOUSE_CLIENT -q "desc file('$UNIQ_DEST_PATH/dictionary1.arrow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$UNIQ_DEST_PATH/dictionary1.arrow') settings max_threads=1"
+$CLICKHOUSE_CLIENT -q "desc file('$UNIQ_DEST_PATH/dictionary2.arrow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$UNIQ_DEST_PATH/dictionary2.arrow') settings max_threads=1"
+$CLICKHOUSE_CLIENT -q "desc file('$UNIQ_DEST_PATH/dictionary3.arrow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$UNIQ_DEST_PATH/dictionary3.arrow') settings max_threads=1"
 
-$CLICKHOUSE_CLIENT -q "desc file('test_02383/corrupted.arrow')"
-$CLICKHOUSE_CLIENT -q "select * from file('test_02383/corrupted.arrow')" 2>&1 | grep -F -q "INCORRECT_DATA" && echo OK || echo FAIL
+$CLICKHOUSE_CLIENT -q "desc file('$UNIQ_DEST_PATH/corrupted.arrow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$UNIQ_DEST_PATH/corrupted.arrow')" 2>&1 | grep -F -q "INCORRECT_DATA" && echo OK || echo FAIL
 
-$CLICKHOUSE_CLIENT -q "desc file('test_02383/dict_with_nulls.arrow')"
-$CLICKHOUSE_CLIENT -q "select * from file('test_02383/dict_with_nulls.arrow')"
+$CLICKHOUSE_CLIENT -q "desc file('$UNIQ_DEST_PATH/dict_with_nulls.arrow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$UNIQ_DEST_PATH/dict_with_nulls.arrow') settings max_threads=1"
 
-
-rm -rf $USER_FILES_PATH/test_02383
+rm -rf $UNIQ_DEST_PATH
diff --git a/tests/queries/0_stateless/02402_external_disk_mertrics.sql b/tests/queries/0_stateless/02402_external_disk_mertrics.sql
index b675c05f45c..e9696eb7122 100644
--- a/tests/queries/0_stateless/02402_external_disk_mertrics.sql
+++ b/tests/queries/0_stateless/02402_external_disk_mertrics.sql
@@ -20,7 +20,8 @@ SET join_algorithm = 'partial_merge';
 SET default_max_bytes_in_join = 0;
 SET max_bytes_in_join = 10000000;
 
-SELECT number * 200000 as n, j * 2097152 FROM numbers(5) nums
+SELECT n, j * 2097152 FROM
+(SELECT number * 200000 as n FROM numbers(5)) nums
 ANY LEFT JOIN ( SELECT number * 2 AS n, number AS j FROM numbers(1000000) ) js2
 USING n
 ORDER BY n
diff --git a/tests/queries/0_stateless/02402_merge_engine_with_view.sql b/tests/queries/0_stateless/02402_merge_engine_with_view.sql
index 64822784845..ae9de1426e7 100644
--- a/tests/queries/0_stateless/02402_merge_engine_with_view.sql
+++ b/tests/queries/0_stateless/02402_merge_engine_with_view.sql
@@ -1,7 +1,7 @@
 -- #40014
-CREATE TABLE m0 (id UInt64) ENGINE=MergeTree ORDER BY id SETTINGS index_granularity = 1;
+CREATE TABLE m0 (id UInt64) ENGINE=MergeTree ORDER BY id SETTINGS index_granularity = 1, ratio_of_defaults_for_sparse_serialization = 1.0;
 INSERT INTO m0 SELECT number FROM numbers(10);
-CREATE TABLE m1 (id UInt64, s String) ENGINE=MergeTree ORDER BY id SETTINGS index_granularity = 1;
+CREATE TABLE m1 (id UInt64, s String) ENGINE=MergeTree ORDER BY id SETTINGS index_granularity = 1, ratio_of_defaults_for_sparse_serialization = 1.0;
 INSERT INTO m1 SELECT number, 'boo' FROM numbers(10);
 CREATE VIEW m1v AS SELECT id FROM m1;
 
diff --git a/tests/queries/0_stateless/02403_big_http_chunk_size.python b/tests/queries/0_stateless/02403_big_http_chunk_size.python
index 4e2e97e487b..4d2f01db55b 100644
--- a/tests/queries/0_stateless/02403_big_http_chunk_size.python
+++ b/tests/queries/0_stateless/02403_big_http_chunk_size.python
@@ -8,8 +8,8 @@ TRANSFER_ENCODING_HEADER = "Transfer-Encoding"
 
 
 def main():
-    host = os.environ['CLICKHOUSE_HOST']
-    port = int(os.environ['CLICKHOUSE_PORT_HTTP'])
+    host = os.environ["CLICKHOUSE_HOST"]
+    port = int(os.environ["CLICKHOUSE_PORT_HTTP"])
 
     sock = socket(AF_INET, SOCK_STREAM)
     sock.connect((host, port))
@@ -47,4 +47,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
diff --git a/tests/queries/0_stateless/02404_memory_bound_merging.reference b/tests/queries/0_stateless/02404_memory_bound_merging.reference
index f774abe834d..d9fac433189 100644
--- a/tests/queries/0_stateless/02404_memory_bound_merging.reference
+++ b/tests/queries/0_stateless/02404_memory_bound_merging.reference
@@ -113,21 +113,13 @@ ExpressionTransform
             (Expression)
             ExpressionTransform × 4
               (MergingAggregated)
-              MergingAggregatedBucketTransform × 4
-                Resize 1 → 4
-                  FinishAggregatingInOrderTransform 3 → 1
-                    (Union)
-                      (Aggregating)
-                      SortingAggregatedForMemoryBoundMergingTransform 4 → 1
-                        MergingAggregatedBucketTransform × 4
-                          Resize 1 → 4
-                            FinishAggregatingInOrderTransform 4 → 1
-                              AggregatingInOrderTransform × 4
-                                (Expression)
-                                ExpressionTransform × 4
-                                  (ReadFromMergeTree)
-                                  MergeTreeInOrder × 4 0 → 1
-                      (ReadFromRemoteParallelReplicas)
+              Resize 1 → 4
+                SortingAggregatedTransform 4 → 1
+                  MergingAggregatedBucketTransform × 4
+                    Resize 1 → 4
+                      GroupingAggregatedTransform 3 → 1
+                        (Union)
+                          (ReadFromRemoteParallelReplicas)
 select a, count() from pr_t group by a order by a limit 5 offset 500;
 500	1000
 501	1000
diff --git a/tests/queries/0_stateless/02404_memory_bound_merging.sql b/tests/queries/0_stateless/02404_memory_bound_merging.sql
index b6299de9aae..23c29ca8d93 100644
--- a/tests/queries/0_stateless/02404_memory_bound_merging.sql
+++ b/tests/queries/0_stateless/02404_memory_bound_merging.sql
@@ -61,6 +61,7 @@ create table pr_t(a UInt64, b UInt64) engine=MergeTree order by a;
 insert into pr_t select number % 1000, number % 1000 from numbers_mt(1e6);
 
 set allow_experimental_parallel_reading_from_replicas = 1;
+set parallel_replicas_for_non_replicated_merge_tree = 1;
 set max_parallel_replicas = 3;
 set use_hedged_requests = 0;
 set cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost';
diff --git a/tests/queries/0_stateless/02410_inmemory_wal_cleanup.reference b/tests/queries/0_stateless/02410_inmemory_wal_cleanup.reference
deleted file mode 100644
index 6727d83a6f4..00000000000
--- a/tests/queries/0_stateless/02410_inmemory_wal_cleanup.reference
+++ /dev/null
@@ -1,35 +0,0 @@
--- { echo }
-
-DROP TABLE IF EXISTS in_memory;
-CREATE TABLE in_memory (a UInt32) ENGINE = MergeTree ORDER BY a SETTINGS min_rows_for_compact_part = 1000, min_bytes_for_wide_part = 10485760;
-INSERT INTO in_memory VALUES (1);
-INSERT INTO in_memory VALUES (2);
-SELECT name, active, part_type FROM system.parts WHERE database = currentDatabase() AND table = 'in_memory';
-all_1_1_0	1	InMemory
-all_2_2_0	1	InMemory
-SELECT * FROM in_memory ORDER BY a;
-1
-2
--- no WAL remove since parts are still in use
-DETACH TABLE in_memory;
-ATTACH TABLE in_memory;
-SELECT name, active, part_type FROM system.parts WHERE database = currentDatabase() AND table = 'in_memory';
-all_1_1_0	1	InMemory
-all_2_2_0	1	InMemory
-SELECT * FROM in_memory ORDER BY a;
-1
-2
--- WAL should be removed, since on disk part covers all parts in WAL
-OPTIMIZE TABLE in_memory;
-DETACH TABLE in_memory;
-ATTACH TABLE in_memory;
-SELECT name, active, part_type FROM system.parts WHERE database = currentDatabase() AND table = 'in_memory';
-all_1_2_1	1	Compact
--- check that the WAL will be reinitialized after remove
-INSERT INTO in_memory VALUES (3);
-DETACH TABLE in_memory;
-ATTACH TABLE in_memory;
-SELECT * FROM in_memory ORDER BY a;
-1
-2
-3
diff --git a/tests/queries/0_stateless/02410_inmemory_wal_cleanup.sql b/tests/queries/0_stateless/02410_inmemory_wal_cleanup.sql
deleted file mode 100644
index 7f832d980ba..00000000000
--- a/tests/queries/0_stateless/02410_inmemory_wal_cleanup.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- Tags: no-s3-storage
-
--- { echo }
-
-DROP TABLE IF EXISTS in_memory;
-
-CREATE TABLE in_memory (a UInt32) ENGINE = MergeTree ORDER BY a SETTINGS min_rows_for_compact_part = 1000, min_bytes_for_wide_part = 10485760;
-INSERT INTO in_memory VALUES (1);
-INSERT INTO in_memory VALUES (2);
-SELECT name, active, part_type FROM system.parts WHERE database = currentDatabase() AND table = 'in_memory';
-SELECT * FROM in_memory ORDER BY a;
-
--- no WAL remove since parts are still in use
-DETACH TABLE in_memory;
-ATTACH TABLE in_memory;
-SELECT name, active, part_type FROM system.parts WHERE database = currentDatabase() AND table = 'in_memory';
-SELECT * FROM in_memory ORDER BY a;
-
--- WAL should be removed, since on disk part covers all parts in WAL
-OPTIMIZE TABLE in_memory;
-DETACH TABLE in_memory;
-ATTACH TABLE in_memory;
-SELECT name, active, part_type FROM system.parts WHERE database = currentDatabase() AND table = 'in_memory';
-
--- check that the WAL will be reinitialized after remove
-INSERT INTO in_memory VALUES (3);
-DETACH TABLE in_memory;
-ATTACH TABLE in_memory;
-SELECT * FROM in_memory ORDER BY a;
diff --git a/tests/queries/0_stateless/02414_all_new_table_functions_must_be_documented.sql b/tests/queries/0_stateless/02414_all_new_table_functions_must_be_documented.sql
index a73993f6a5a..ef339b760aa 100644
--- a/tests/queries/0_stateless/02414_all_new_table_functions_must_be_documented.sql
+++ b/tests/queries/0_stateless/02414_all_new_table_functions_must_be_documented.sql
@@ -2,5 +2,5 @@
 -- Please help shorten this list down to zero elements.
 SELECT name FROM system.table_functions WHERE length(description) < 10
 AND name NOT IN (
-    'cosn', 'oss', 'hdfs', 'hdfsCluster', 'hive', 'mysql', 'postgresql', 's3', 's3Cluster', 'sqlite' -- these functions are not enabled in fast test
+    'cosn', 'oss', 'hdfs', 'hdfsCluster', 'hive', 'mysql', 'postgresql', 's3', 's3Cluster', 'sqlite', 'urlCluster' -- these functions are not enabled in fast test
 ) ORDER BY name;
diff --git a/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference b/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference
index e41249af54c..7ab26982402 100644
--- a/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference
+++ b/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference
@@ -97,6 +97,7 @@ arrayCumSum
 arrayCumSumNonNegative
 arrayDifference
 arrayDistinct
+arrayDotProduct
 arrayElement
 arrayEnumerate
 arrayEnumerateDense
@@ -389,6 +390,7 @@ javaHashUTF16LE
 joinGet
 joinGetOrNull
 jumpConsistentHash
+kafkaMurmurHash
 kostikConsistentHash
 lcm
 least
@@ -416,16 +418,10 @@ makeDateTime
 makeDateTime64
 map
 mapAdd
-mapApply
-mapContains
-mapContainsKeyLike
-mapExtractKeyLike
-mapFilter
-mapKeys
+mapFromArrays
 mapPopulateSeries
 mapSubtract
 mapUpdate
-mapValues
 match
 materialize
 max2
@@ -512,6 +508,7 @@ nullIf
 nullIn
 nullInIgnoreSet
 or
+parseDateTime
 parseDateTime32BestEffort
 parseDateTime32BestEffortOrNull
 parseDateTime32BestEffortOrZero
@@ -527,6 +524,11 @@ parseDateTimeBestEffortOrZero
 parseDateTimeBestEffortUS
 parseDateTimeBestEffortUSOrNull
 parseDateTimeBestEffortUSOrZero
+parseDateTimeInJodaSyntax
+parseDateTimeInJodaSyntaxOrNull
+parseDateTimeInJodaSyntaxOrZero
+parseDateTimeOrNull
+parseDateTimeOrZero
 parseTimeDelta
 partitionId
 path
@@ -653,6 +655,7 @@ sleep
 sleepEachRow
 snowflakeToDateTime
 snowflakeToDateTime64
+space
 splitByChar
 splitByNonAlpha
 splitByRegexp
diff --git a/tests/queries/0_stateless/02417_opentelemetry_insert_on_distributed_table.reference b/tests/queries/0_stateless/02417_opentelemetry_insert_on_distributed_table.reference
index dde07d4540d..98827438920 100644
--- a/tests/queries/0_stateless/02417_opentelemetry_insert_on_distributed_table.reference
+++ b/tests/queries/0_stateless/02417_opentelemetry_insert_on_distributed_table.reference
@@ -1,8 +1,18 @@
-{"operation_name":"void DB::DistributedSink::writeToLocal(const Cluster::ShardInfo &, const DB::Block &, size_t)","cluster":"test_cluster_two_shards_localhost","shard":"1","rows":"1","bytes":"8"}
-{"operation_name":"void DB::DistributedSink::writeToLocal(const Cluster::ShardInfo &, const DB::Block &, size_t)","cluster":"test_cluster_two_shards_localhost","shard":"2","rows":"1","bytes":"8"}
-{"operation_name":"void DB::StorageDistributedDirectoryMonitor::processFile(const std::string &)","cluster":"test_cluster_two_shards_localhost","shard":"1","rows":"1","bytes":"8"}
-{"operation_name":"void DB::StorageDistributedDirectoryMonitor::processFile(const std::string &)","cluster":"test_cluster_two_shards_localhost","shard":"2","rows":"1","bytes":"8"}
-{"operation_name":"auto DB::DistributedSink::runWritingJob(DB::DistributedSink::JobReplica &, const DB::Block &, size_t)::(anonymous class)::operator()() const","cluster":"test_cluster_two_shards_localhost","shard":"1","rows":"1","bytes":"8"}
-{"operation_name":"auto DB::DistributedSink::runWritingJob(DB::DistributedSink::JobReplica &, const DB::Block &, size_t)::(anonymous class)::operator()() const","cluster":"test_cluster_two_shards_localhost","shard":"2","rows":"1","bytes":"8"}
-{"operation_name":"auto DB::DistributedSink::runWritingJob(DB::DistributedSink::JobReplica &, const DB::Block &, size_t)::(anonymous class)::operator()() const","cluster":"test_cluster_two_shards_localhost","shard":"1","rows":"1","bytes":"8"}
-{"operation_name":"auto DB::DistributedSink::runWritingJob(DB::DistributedSink::JobReplica &, const DB::Block &, size_t)::(anonymous class)::operator()() const","cluster":"test_cluster_two_shards_localhost","shard":"2","rows":"1","bytes":"8"}
+===1===
+{"operation_name":"void DB::DistributedSink::writeToLocal(const Cluster::ShardInfo &, const Block &, size_t)","cluster":"test_cluster_two_shards_localhost","shard":"1","rows":"1","bytes":"8"}
+{"operation_name":"void DB::DistributedSink::writeToLocal(const Cluster::ShardInfo &, const Block &, size_t)","cluster":"test_cluster_two_shards_localhost","shard":"2","rows":"1","bytes":"8"}
+1
+===2===
+{"operation_name":"void DB::DistributedAsyncInsertDirectoryQueue::processFile(const std::string &)","cluster":"test_cluster_two_shards_localhost","shard":"1","rows":"1","bytes":"8"}
+{"operation_name":"void DB::DistributedAsyncInsertDirectoryQueue::processFile(const std::string &)","cluster":"test_cluster_two_shards_localhost","shard":"2","rows":"1","bytes":"8"}
+3
+2
+===3===
+{"operation_name":"auto DB::DistributedSink::runWritingJob(JobReplica &, const Block &, size_t)::(anonymous class)::operator()() const","cluster":"test_cluster_two_shards_localhost","shard":"1","rows":"1","bytes":"8"}
+{"operation_name":"auto DB::DistributedSink::runWritingJob(JobReplica &, const Block &, size_t)::(anonymous class)::operator()() const","cluster":"test_cluster_two_shards_localhost","shard":"2","rows":"1","bytes":"8"}
+1
+===4===
+{"operation_name":"auto DB::DistributedSink::runWritingJob(JobReplica &, const Block &, size_t)::(anonymous class)::operator()() const","cluster":"test_cluster_two_shards_localhost","shard":"1","rows":"1","bytes":"8"}
+{"operation_name":"auto DB::DistributedSink::runWritingJob(JobReplica &, const Block &, size_t)::(anonymous class)::operator()() const","cluster":"test_cluster_two_shards_localhost","shard":"2","rows":"1","bytes":"8"}
+3
+2
diff --git a/tests/queries/0_stateless/02417_opentelemetry_insert_on_distributed_table.sh b/tests/queries/0_stateless/02417_opentelemetry_insert_on_distributed_table.sh
index 9ac5f061d4a..edc3d06e5bf 100755
--- a/tests/queries/0_stateless/02417_opentelemetry_insert_on_distributed_table.sh
+++ b/tests/queries/0_stateless/02417_opentelemetry_insert_on_distributed_table.sh
@@ -20,6 +20,7 @@ function insert()
             -H "tracestate: $4" \
             "${CLICKHOUSE_URL}" \
             --data @-
+    ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH DISTRIBUTED ${CLICKHOUSE_DATABASE}.dist_opentelemetry"
 }
 
 function check_span()
@@ -42,6 +43,22 @@ ${CLICKHOUSE_CLIENT} -nq "
     ;"
 }
 
+#
+# $1 - OpenTelemetry Trace Id
+# $2 - value of insert_distributed_sync
+function check_span_kind()
+{
+${CLICKHOUSE_CLIENT} -nq "
+    SYSTEM FLUSH LOGS;
+
+    SELECT count()
+    FROM system.opentelemetry_span_log
+    WHERE finish_date >= yesterday()
+    AND   lower(hex(trace_id))           = '${1}'
+    AND   kind                           = '${2}'
+    ;"
+}
+
 
 #
 # Prepare tables for tests
@@ -57,30 +74,46 @@ CREATE TABLE ${CLICKHOUSE_DATABASE}.local_opentelemetry (key UInt64) Engine=Merg
 #
 # test1
 #
+echo "===1==="
 trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(generateUUIDv4()))");
 insert $trace_id 0 1 "async-insert-writeToLocal"
 check_span $trace_id
+# 1 HTTP SERVER spans
+check_span_kind $trace_id 'SERVER'
 
 #
 # test2
 #
+echo "===2==="
 trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(generateUUIDv4()))");
 insert $trace_id 0 0 "async-insert-writeToRemote"
 check_span $trace_id
+# 3 SERVER spans, 1 for HTTP, 2 for TCP
+check_span_kind $trace_id 'SERVER'
+# 2 CLIENT spans
+check_span_kind $trace_id 'CLIENT'
 
 #
 # test3
 #
 trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(generateUUIDv4()))");
 insert $trace_id 1 1  "sync-insert-writeToLocal"
+echo "===3==="
 check_span $trace_id
+# 1 HTTP SERVER spans
+check_span_kind $trace_id 'SERVER'
 
 #
 # test4
 #
+echo "===4==="
 trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(generateUUIDv4()))");
 insert $trace_id 1 0  "sync-insert-writeToRemote"
 check_span $trace_id
+# 3 SERVER spans, 1 for HTTP, 2 for TCP
+check_span_kind $trace_id 'SERVER'
+# 2 CLIENT spans
+check_span_kind $trace_id 'CLIENT'
 
 #
 # Cleanup
diff --git a/tests/queries/0_stateless/02420_final_setting_analyzer.reference b/tests/queries/0_stateless/02420_final_setting_analyzer.reference
index ee7c2541bcf..9a03c484765 100644
--- a/tests/queries/0_stateless/02420_final_setting_analyzer.reference
+++ b/tests/queries/0_stateless/02420_final_setting_analyzer.reference
@@ -108,9 +108,6 @@ select left_table.id,val_left, val_middle, val_right from left_table
 ORDER BY left_table.id, val_left, val_middle, val_right;
 1	c	a	c
 1	c	b	c
--- no distributed tests because it is not currently supported:
--- JOIN with remote storages is unsupported.
-
 -- Quite exotic with Merge engine
 DROP TABLE IF EXISTS table_to_merge_a;
 DROP TABLE IF EXISTS table_to_merge_b;
diff --git a/tests/queries/0_stateless/02420_final_setting_analyzer.sql b/tests/queries/0_stateless/02420_final_setting_analyzer.sql
index 5937e536239..14c832cfaf5 100644
--- a/tests/queries/0_stateless/02420_final_setting_analyzer.sql
+++ b/tests/queries/0_stateless/02420_final_setting_analyzer.sql
@@ -79,9 +79,6 @@ select left_table.id,val_left, val_middle, val_right from left_table
                                                               inner join (SELECT * FROM right_table WHERE id = 1) r on middle_table.id = r.id
 ORDER BY left_table.id, val_left, val_middle, val_right;
 
--- no distributed tests because it is not currently supported:
--- JOIN with remote storages is unsupported.
-
 -- Quite exotic with Merge engine
 DROP TABLE IF EXISTS table_to_merge_a;
 DROP TABLE IF EXISTS table_to_merge_b;
diff --git a/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.reference b/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.reference
index d3d171221e8..71c9a23879f 100644
--- a/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.reference
+++ b/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.reference
@@ -8,3 +8,6 @@
 1
 1
 1
+1
+1
+1
diff --git a/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.sql b/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.sql
index f5978a34061..f5d182be3e3 100644
--- a/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.sql
+++ b/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.sql
@@ -8,16 +8,16 @@ INSERT INTO dtest VALUES ('33', '44.4', '35');
 SELECT count() == 0 FROM dtest WHERE a IN toDecimal32('33.3000', 4);
 SELECT count() == 0 FROM dtest WHERE a IN toDecimal64('33.3000', 4);
 SELECT count() == 0 FROM dtest WHERE a IN toDecimal128('33.3000', 4);
-SELECT count() == 0 FROM dtest WHERE a IN toDecimal256('33.3000', 4); -- { serverError 53 }
+SELECT count() == 0 FROM dtest WHERE a IN toDecimal256('33.3000', 4);
 
 SELECT count() == 0 FROM dtest WHERE b IN toDecimal32('44.4000', 0);
 SELECT count() == 0 FROM dtest WHERE b IN toDecimal64('44.4000', 0);
 SELECT count() == 0 FROM dtest WHERE b IN toDecimal128('44.4000', 0);
-SELECT count() == 0 FROM dtest WHERE b IN toDecimal256('44.4000', 0); -- { serverError 53 }
+SELECT count() == 0 FROM dtest WHERE b IN toDecimal256('44.4000', 0);
 
 SELECT count() == 1 FROM dtest WHERE b IN toDecimal32('44.4000', 4);
 SELECT count() == 1 FROM dtest WHERE b IN toDecimal64('44.4000', 4);
 SELECT count() == 1 FROM dtest WHERE b IN toDecimal128('44.4000', 4);
-SELECT count() == 1 FROM dtest WHERE b IN toDecimal256('44.4000', 4); -- { serverError 53 }
+SELECT count() == 1 FROM dtest WHERE b IN toDecimal256('44.4000', 4);
 
 DROP TABLE IF EXISTS dtest;
diff --git a/tests/queries/0_stateless/02423_ddl_for_opentelemetry.sh b/tests/queries/0_stateless/02423_ddl_for_opentelemetry.sh
index 6164ff97d9f..7136698d5b7 100755
--- a/tests/queries/0_stateless/02423_ddl_for_opentelemetry.sh
+++ b/tests/queries/0_stateless/02423_ddl_for_opentelemetry.sh
@@ -15,13 +15,15 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # $3 - Query Settings
 function execute_query()
 {
-    # Some queries are supposed to fail, use -f to suppress error messages
-    echo $2 | ${CLICKHOUSE_CURL_COMMAND} -q -s --max-time 180 \
-                -X POST \
-                -H "traceparent: 00-$1-5150000000000515-01" \
-                -H "tracestate: a\nb cd" \
-                "${CLICKHOUSE_URL}&${3}" \
-                --data @-
+    local trace_id=$1 && shift
+    local ddl_version=$1 && shift
+    local opts=(
+        --opentelemetry-traceparent "00-$trace_id-5150000000000515-01"
+        --opentelemetry-tracestate $'a\nb cd'
+        --distributed_ddl_output_mode "none"
+        --distributed_ddl_entry_format_version "$ddl_version"
+    )
+    ${CLICKHOUSE_CLIENT} "${opts[@]}" "$@"
 }
 
 # This function takes following argument:
@@ -82,9 +84,9 @@ for ddl_version in 3 4; do
     echo "===ddl_format_version ${ddl_version}===="
 
     trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(generateUUIDv4()))");
-    execute_query $trace_id "CREATE TABLE ${CLICKHOUSE_DATABASE}.ddl_test_for_opentelemetry ON CLUSTER ${cluster_name} (id UInt64) Engine=MergeTree ORDER BY id" "distributed_ddl_output_mode=none&distributed_ddl_entry_format_version=${ddl_version}"
+    execute_query $trace_id $ddl_version -q "CREATE TABLE ${CLICKHOUSE_DATABASE}.ddl_test_for_opentelemetry ON CLUSTER ${cluster_name} (id UInt64) Engine=MergeTree ORDER BY id"
 
-    check_span 1 $trace_id "HTTPHandler"
+    check_span 1 $trace_id "TCPHandler"
 
     if [ $cluster_name = "test_shard_localhost" ]; then
         check_span 1 $trace_id "%executeDDLQueryOnCluster%" "attribute['clickhouse.cluster']='${cluster_name}'"
@@ -106,7 +108,7 @@ for ddl_version in 3 4; do
     check_span $expected $trace_id "%DDLWorker::processTask%"
     
     # For queries that tracing are enabled(format version is 4 or Replicated database engine), there should be two 'query' spans,
-    # one is for the HTTPHandler, the other is for the DDL executing in DDLWorker.
+    # one is for the TCPHandler, the other is for the DDL executing in DDLWorker.
     #
     # For other format, there should be only one 'query' span
     if [ $cluster_name = "test_shard_localhost" ]; then
@@ -134,9 +136,9 @@ done
 echo "===exception===="
 
 trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(generateUUIDv4()))");
-execute_query $trace_id "DROP TABLE ${CLICKHOUSE_DATABASE}.ddl_test_for_opentelemetry_non_exist ON CLUSTER ${cluster_name}" "distributed_ddl_output_mode=none&distributed_ddl_entry_format_version=4" 2>&1| grep -Fv "UNKNOWN_TABLE"
+execute_query $trace_id 4 -q "DROP TABLE ${CLICKHOUSE_DATABASE}.ddl_test_for_opentelemetry_non_exist ON CLUSTER ${cluster_name}" 2>&1 | grep 'DB::Exception ' | grep -Fv "UNKNOWN_TABLE"
 
-check_span 1 $trace_id "HTTPHandler"
+check_span 1 $trace_id "TCPHandler"
 
 if [ $cluster_name = "test_shard_localhost" ]; then
     expected=1
@@ -144,11 +146,11 @@ else
     # For Replicated database it will fail on initiator before enqueueing distributed DDL
     expected=0
 fi
-check_span $expected $trace_id "%executeDDLQueryOnCluster%" "attribute['clickhouse.cluster']='${cluster_name}'"
-check_span $expected $trace_id "%DDLWorker::processTask%"
+check_span $expected $trace_id "%executeDDLQueryOnCluster%" "attribute['clickhouse.cluster']='${cluster_name}' AND kind = 'PRODUCER'"
+check_span $expected $trace_id "%DDLWorker::processTask%" "kind = 'CONSUMER'"
 
 if [ $cluster_name = "test_shard_localhost" ]; then
-    # There should be two 'query' spans, one is for the HTTPHandler, the other is for the DDL executing in DDLWorker.
+    # There should be two 'query' spans, one is for the TCPHandler, the other is for the DDL executing in DDLWorker.
     # Both of these two spans contain exception
     expected=2
 else
diff --git a/tests/queries/0_stateless/02423_drop_memory_parts.reference b/tests/queries/0_stateless/02423_drop_memory_parts.reference
deleted file mode 100644
index d69a5f07a05..00000000000
--- a/tests/queries/0_stateless/02423_drop_memory_parts.reference
+++ /dev/null
@@ -1,14 +0,0 @@
-init state
-30
-0_1_1_0	InMemory	10	1
-1_2_2_0	InMemory	10	1
-2_3_3_0	InMemory	10	1
-drop part 0
-20
-1_2_2_0	InMemory	10	1
-2_3_3_0	InMemory	10	1
-detach table
-attach table
-20
-1_2_2_0	InMemory	10	1
-2_3_3_0	InMemory	10	1
diff --git a/tests/queries/0_stateless/02423_drop_memory_parts.sql b/tests/queries/0_stateless/02423_drop_memory_parts.sql
deleted file mode 100644
index 9326f159b0c..00000000000
--- a/tests/queries/0_stateless/02423_drop_memory_parts.sql
+++ /dev/null
@@ -1,40 +0,0 @@
--- Tags: no-s3-storage
-
-DROP TABLE IF EXISTS table_in_memory;
-
-CREATE TABLE table_in_memory
-(
-    `id` UInt64,
-    `value` UInt64
-)
-ENGINE = MergeTree
-PARTITION BY id
-ORDER BY value
-SETTINGS min_bytes_for_wide_part=1000, min_bytes_for_compact_part=900;
-
-SELECT 'init state';
-INSERT INTO table_in_memory SELECT intDiv(number, 10), number FROM numbers(30);
-
-SELECT count() FROM table_in_memory;
-SELECT name, part_type, rows, active from system.parts
-WHERE table='table_in_memory' AND database=currentDatabase();
-
-SELECT 'drop part 0';
-ALTER TABLE table_in_memory DROP PARTITION 0;
-
-SELECT count() FROM table_in_memory;
-SELECT name, part_type, rows, active from system.parts
-WHERE table='table_in_memory' AND database=currentDatabase() AND active;
-
-SELECT 'detach table';
-DETACH TABLE table_in_memory;
-
-SELECT name, part_type, rows, active from system.parts
-WHERE table='table_in_memory' AND database=currentDatabase();
-
-SELECT 'attach table';
-ATTACH TABLE table_in_memory;
-
-SELECT count() FROM table_in_memory;
-SELECT name, part_type, rows, active from system.parts
-WHERE table='table_in_memory' AND database=currentDatabase() and active;
diff --git a/tests/queries/0_stateless/02426_orc_bug.reference b/tests/queries/0_stateless/02426_orc_bug.reference
index e5ad2b49289..baa88da2158 100644
Binary files a/tests/queries/0_stateless/02426_orc_bug.reference and b/tests/queries/0_stateless/02426_orc_bug.reference differ
diff --git a/tests/queries/0_stateless/02426_orc_bug.sh b/tests/queries/0_stateless/02426_orc_bug.sh
new file mode 100755
index 00000000000..7a7ad9f1783
--- /dev/null
+++ b/tests/queries/0_stateless/02426_orc_bug.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query="SELECT arrayJoin([[], [1]]) FORMAT ORC SETTINGS output_format_orc_compression_method='none'" | md5sum;
+
diff --git a/tests/queries/0_stateless/02426_orc_bug.sql b/tests/queries/0_stateless/02426_orc_bug.sql
deleted file mode 100644
index 7016f1ceb70..00000000000
--- a/tests/queries/0_stateless/02426_orc_bug.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Tags: no-fasttest
-
-SELECT arrayJoin([[], [1]]) FORMAT ORC;
diff --git a/tests/queries/0_stateless/02428_parameterized_view.reference b/tests/queries/0_stateless/02428_parameterized_view.reference
index 52a31f53cc1..b73c52c478f 100644
--- a/tests/queries/0_stateless/02428_parameterized_view.reference
+++ b/tests/queries/0_stateless/02428_parameterized_view.reference
@@ -19,7 +19,8 @@ ERROR
 50
 ERROR
 10
-ERROR
+10
+20
 20
 ERROR
 30
@@ -35,3 +36,7 @@ ERROR
 10
 20
 10
+10
+10
+10
+1
diff --git a/tests/queries/0_stateless/02428_parameterized_view.sh b/tests/queries/0_stateless/02428_parameterized_view.sh
index 6118013b665..3abfbfc22fc 100755
--- a/tests/queries/0_stateless/02428_parameterized_view.sh
+++ b/tests/queries/0_stateless/02428_parameterized_view.sh
@@ -15,13 +15,19 @@ $CLICKHOUSE_CLIENT -q "DROP VIEW IF EXISTS test_02428_pv6"
 $CLICKHOUSE_CLIENT -q "DROP VIEW IF EXISTS test_02428_pv7"
 $CLICKHOUSE_CLIENT -q "DROP VIEW IF EXISTS test_02428_pv8"
 $CLICKHOUSE_CLIENT -q "DROP VIEW IF EXISTS test_02428_pv9"
+$CLICKHOUSE_CLIENT -q "DROP VIEW IF EXISTS test_02428_pv10"
+$CLICKHOUSE_CLIENT -q "DROP VIEW IF EXISTS test_02428_pv11"
+$CLICKHOUSE_CLIENT -q "DROP VIEW IF EXISTS test_02428_pv12"
 $CLICKHOUSE_CLIENT -q "DROP VIEW IF EXISTS test_02428_v1"
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test_02428_Catalog"
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS ${CLICKHOUSE_TEST_UNIQUE_NAME}.pv1"
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS ${CLICKHOUSE_TEST_UNIQUE_NAME}.Catalog"
 $CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS ${CLICKHOUSE_TEST_UNIQUE_NAME}"
+$CLICKHOUSE_CLIENT -q "DROP VIEW IF EXISTS 02428_trace_view"
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS 02428_otel_traces_trace_id_ts"
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS 02428_otel_traces"
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE test_02428_Catalog (Name String, Price UInt64, Quantity UInt64) ENGINE = Memory"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE test_02428_Catalog (Name String, Price UInt64, Quantity UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/parameterized_view', 'r1') ORDER BY Name"
 
 $CLICKHOUSE_CLIENT -q "INSERT INTO test_02428_Catalog VALUES ('Pen', 10, 3)"
 $CLICKHOUSE_CLIENT -q "INSERT INTO test_02428_Catalog VALUES ('Book', 50, 2)"
@@ -56,7 +62,8 @@ $CLICKHOUSE_CLIENT -q "SELECT Price FROM test_02428_pv2(price=50)"  2>&1 |  grep
 $CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv3 AS SELECT * FROM test_02428_Catalog WHERE Price={price:UInt64} AND Quantity=3"
 $CLICKHOUSE_CLIENT -q "SELECT Price FROM test_02428_pv3(price=10)"
 
-$CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv4 AS SELECT * FROM test_02428_Catalog WHERE Price={price:UInt64} AND Quantity={price:UInt64}" 2>&1 |  grep -Fq "DUPLICATE_COLUMN" && echo 'ERROR' || echo 'OK'
+$CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv4 AS SELECT * FROM test_02428_Catalog WHERE Price={price:UInt64} OR Price={price:UInt64}*2"
+$CLICKHOUSE_CLIENT -q "SELECT Price FROM test_02428_pv4(price=10) ORDER BY Price"
 
 $CLICKHOUSE_CLIENT -q "CREATE DATABASE ${CLICKHOUSE_TEST_UNIQUE_NAME}"
 $CLICKHOUSE_CLIENT -q "CREATE TABLE ${CLICKHOUSE_TEST_UNIQUE_NAME}.Catalog (Name String, Price UInt64, Quantity UInt64) ENGINE = Memory"
@@ -70,7 +77,7 @@ $CLICKHOUSE_CLIENT -q "SELECT Price FROM \`${CLICKHOUSE_TEST_UNIQUE_NAME}.pv1\`(
 
 $CLICKHOUSE_CLIENT -q "INSERT INTO test_02428_Catalog VALUES ('Book2', 30, 8)"
 $CLICKHOUSE_CLIENT -q "INSERT INTO test_02428_Catalog VALUES ('Book3', 30, 8)"
-$CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv5 AS SELECT Price FROM test_02428_Catalog WHERE {price:UInt64} HAVING Quantity in (SELECT {quantity:UInt64}) LIMIT {limit:UInt64}"
+$CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv5 AS SELECT Price FROM test_02428_Catalog WHERE Price={price:UInt64} HAVING Quantity in (SELECT {quantity:UInt64}) LIMIT {limit:UInt64}"
 $CLICKHOUSE_CLIENT -q "SELECT Price FROM test_02428_pv5(price=30, quantity=8, limit=1)"
 $CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv6 AS SELECT Price+{price:UInt64} FROM test_02428_Catalog GROUP BY Price+{price:UInt64} ORDER BY Price+{price:UInt64}"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_02428_pv6(price=10)"
@@ -83,6 +90,29 @@ $CLICKHOUSE_CLIENT -q "SELECT * FROM test_02428_pv8(prices=[10,20])"
 $CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv9 AS SELECT Price FROM test_02428_Catalog WHERE Price IN (10,20) AND Quantity={quantity:UInt64} ORDER BY Price"
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_02428_pv9(quantity=3)"
 
+$CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv10 AS SELECT Price FROM test_02428_Catalog WHERE Price={Pri:UInt64} ORDER BY Price"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_02428_pv10(Pri=10)"
+
+$CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv11 AS SELECT * from ( SELECT Price FROM test_02428_Catalog WHERE Price={price:UInt64} )"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_02428_pv11(price=10)"
+
+$CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv12 AS SELECT * from ( SELECT Price FROM test_02428_Catalog WHERE Price IN (SELECT number FROM numbers({price:UInt64})) )"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_02428_pv12(price=11)"
+
+$CLICKHOUSE_CLIENT -q "CREATE TABLE 02428_otel_traces (TraceId String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/otel_traces', 'r1') ORDER BY TraceId"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE 02428_otel_traces_trace_id_ts (TraceId String, Start Timestamp) ENGINE  = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/otel_traces_trace_id_ts', 'r1') ORDER BY TraceId"
+
+$CLICKHOUSE_CLIENT -q "INSERT INTO 02428_otel_traces(TraceId) VALUES ('1')"
+$CLICKHOUSE_CLIENT -q "INSERT INTO 02428_otel_traces_trace_id_ts(TraceId, Start) VALUES('1', now())"
+
+$CLICKHOUSE_CLIENT -q "CREATE VIEW 02428_trace_view AS WITH  {trace_id:String} AS trace_id,
+                              ( SELECT min(Start) FROM 02428_otel_traces_trace_id_ts WHERE TraceId = trace_id
+                               ) AS start SELECT
+                       TraceId AS traceID
+                       FROM 02428_otel_traces"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM 02428_trace_view(trace_id='1')"
+
+
 $CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_pv1"
 $CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_pv2"
 $CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_pv3"
@@ -91,8 +121,14 @@ $CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_pv6"
 $CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_pv7"
 $CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_pv8"
 $CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_pv9"
+$CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_pv10"
+$CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_pv11"
+$CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_pv12"
 $CLICKHOUSE_CLIENT -q "DROP VIEW test_02428_v1"
 $CLICKHOUSE_CLIENT -q "DROP TABLE test_02428_Catalog"
 $CLICKHOUSE_CLIENT -q "DROP TABLE ${CLICKHOUSE_TEST_UNIQUE_NAME}.pv1"
 $CLICKHOUSE_CLIENT -q "DROP TABLE ${CLICKHOUSE_TEST_UNIQUE_NAME}.Catalog"
-$CLICKHOUSE_CLIENT -q "DROP DATABASE ${CLICKHOUSE_TEST_UNIQUE_NAME}"
\ No newline at end of file
+$CLICKHOUSE_CLIENT -q "DROP DATABASE ${CLICKHOUSE_TEST_UNIQUE_NAME}"
+$CLICKHOUSE_CLIENT -q "DROP VIEW 02428_trace_view"
+$CLICKHOUSE_CLIENT -q "DROP TABLE 02428_otel_traces_trace_id_ts"
+$CLICKHOUSE_CLIENT -q "DROP TABLE 02428_otel_traces"
diff --git a/tests/queries/0_stateless/02432_s3_parallel_parts_cleanup.sql b/tests/queries/0_stateless/02432_s3_parallel_parts_cleanup.sql
index 235a3335d9d..88fb2cdf9b1 100644
--- a/tests/queries/0_stateless/02432_s3_parallel_parts_cleanup.sql
+++ b/tests/queries/0_stateless/02432_s3_parallel_parts_cleanup.sql
@@ -1,5 +1,7 @@
 -- Tags: no-fasttest
 
+SET send_logs_level = 'fatal';
+
 drop table if exists rmt;
 drop table if exists rmt2;
 
@@ -7,7 +9,7 @@ drop table if exists rmt2;
 create table rmt (n int, m int, k int) engine=ReplicatedMergeTree('/test/02432/{database}', '1') order by tuple()
     settings storage_policy = 's3_cache', allow_remote_fs_zero_copy_replication=1,
         max_part_removal_threads=10, concurrent_part_removal_threshold=1, cleanup_delay_period=1, cleanup_delay_period_random_add=1,
-        max_replicated_merges_in_queue=0, max_replicated_mutations_in_queue=0, min_bytes_for_compact_part=0, min_rows_for_compact_part=0;
+        max_replicated_merges_in_queue=0, max_replicated_mutations_in_queue=0, min_bytes_for_wide_part=0, min_rows_for_wide_part=0;
 
 insert into rmt(n, m) values (1, 42);
 insert into rmt(n, m) values (2, 42);
@@ -37,7 +39,7 @@ select count(), sum(n), sum(m) from rmt;
 create table rmt2 (n int, m int, k String) engine=ReplicatedMergeTree('/test/02432/{database}', '2') order by tuple()
     settings storage_policy = 's3_cache', allow_remote_fs_zero_copy_replication=1,
         max_part_removal_threads=10, concurrent_part_removal_threshold=1, cleanup_delay_period=1, cleanup_delay_period_random_add=1,
-        min_bytes_for_compact_part=0, min_rows_for_compact_part=0, max_replicated_merges_in_queue=1,
+        min_bytes_for_wide_part=0, min_rows_for_wide_part=0, max_replicated_merges_in_queue=1,
         old_parts_lifetime=0;
 
 alter table rmt2 modify column k Nullable(String);
diff --git a/tests/queries/0_stateless/02434_cancel_insert_when_client_dies.reference b/tests/queries/0_stateless/02434_cancel_insert_when_client_dies.reference
new file mode 100644
index 00000000000..d2475419998
--- /dev/null
+++ b/tests/queries/0_stateless/02434_cancel_insert_when_client_dies.reference
@@ -0,0 +1,3 @@
+5000000
+5000000
+1
diff --git a/tests/queries/0_stateless/02434_cancel_insert_when_client_dies.sh b/tests/queries/0_stateless/02434_cancel_insert_when_client_dies.sh
new file mode 100755
index 00000000000..5e2da509314
--- /dev/null
+++ b/tests/queries/0_stateless/02434_cancel_insert_when_client_dies.sh
@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+# Tags: no-random-settings
+# shellcheck disable=SC2009
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+export DATA_FILE="$CLICKHOUSE_TMP/deduptest.tsv"
+export TEST_MARK="02434_insert_${CLICKHOUSE_DATABASE}_"
+
+$CLICKHOUSE_CLIENT -q 'select * from numbers(5000000) format TSV' > $DATA_FILE
+$CLICKHOUSE_CLIENT -q 'create table dedup_test(A Int64) Engine = MergeTree order by A settings non_replicated_deduplication_window=1000;'
+$CLICKHOUSE_CLIENT -q "create table dedup_dist(A Int64) Engine = Distributed('test_cluster_one_shard_two_replicas', currentDatabase(), dedup_test)"
+
+function insert_data
+{
+    SETTINGS="query_id=$ID&max_insert_block_size=110000&min_insert_block_size_rows=110000"
+    # max_block_size=10000, so external table will contain smaller blocks that will be squashed on insert-select (more chances to catch a bug on query cancellation)
+    TRASH_SETTINGS="query_id=$ID&input_format_parallel_parsing=0&max_threads=1&max_insert_threads=1&max_insert_block_size=110000&max_block_size=10000&min_insert_block_size_bytes=0&min_insert_block_size_rows=110000&max_insert_block_size=110000"
+    TYPE=$(( RANDOM % 5 ))
+
+    if [[ "$TYPE" -eq 0 ]]; then
+        # client will send 10000-rows blocks, server will squash them into 110000-rows blocks (more chances to catch a bug on query cancellation)
+        $CLICKHOUSE_CLIENT --max_block_size=10000 --max_insert_block_size=10000 --query_id="$ID" \
+            -q 'insert into dedup_test settings max_insert_block_size=110000, min_insert_block_size_rows=110000 format TSV' < $DATA_FILE
+    elif [[ "$TYPE" -eq 1 ]]; then
+        $CLICKHOUSE_CLIENT --max_block_size=10000 --max_insert_block_size=10000 --query_id="$ID" --prefer_localhost_replica="$(( RANDOM % 2))" \
+            -q 'insert into dedup_dist settings max_insert_block_size=110000, min_insert_block_size_rows=110000 format TSV' < $DATA_FILE
+    elif [[ "$TYPE" -eq 2 ]]; then
+        $CLICKHOUSE_CURL -sS -X POST --data-binary @- "$CLICKHOUSE_URL&$SETTINGS&query=insert+into+dedup_test+format+TSV" < $DATA_FILE
+    elif [[ "$TYPE" -eq 3 ]]; then
+        $CLICKHOUSE_CURL -sS -X POST -H "Transfer-Encoding: chunked" --data-binary @- "$CLICKHOUSE_URL&$SETTINGS&query=insert+into+dedup_test+format+TSV" < $DATA_FILE
+    else
+        $CLICKHOUSE_CURL -sS -F 'file=@-' "$CLICKHOUSE_URL&$TRASH_SETTINGS&file_format=TSV&file_types=UInt64" -X POST --form-string 'query=insert into dedup_test select * from file' < $DATA_FILE
+    fi
+}
+
+export -f insert_data
+
+ID="02434_insert_init_${CLICKHOUSE_DATABASE}_$RANDOM"
+insert_data
+$CLICKHOUSE_CLIENT -q "system flush distributed dedup_dist"
+$CLICKHOUSE_CLIENT -q 'select count() from dedup_test'
+
+function thread_insert
+{
+    # supress "Killed" messages from bash
+    i=0
+    while true; do
+        export ID="$TEST_MARK$RANDOM-$RANDOM-$i"
+        bash -c insert_data 2>&1| grep -Fav "Killed"
+        i=$((i + 1))
+    done
+}
+
+function thread_select
+{
+    while true; do
+        $CLICKHOUSE_CLIENT -q "with (select count() from dedup_test) as c select throwIf(c != 5000000, 'Expected 5000000 rows, got ' || toString(c)) format Null"
+        sleep 0.$RANDOM;
+    done
+}
+
+function thread_cancel
+{
+    while true; do
+        SIGNAL="INT"
+        if (( RANDOM % 2 )); then
+            SIGNAL="KILL"
+        fi
+        PID=$(grep -Fa "$TEST_MARK" /proc/*/cmdline | grep -Fav grep | grep -Eoa "/proc/[0-9]*/cmdline:" | grep -Eo "[0-9]*" | head -1)
+        if [ ! -z "$PID" ]; then kill -s "$SIGNAL" "$PID"; fi
+        sleep 0.$RANDOM;
+        sleep 0.$RANDOM;
+        sleep 0.$RANDOM;
+    done
+}
+
+export -f thread_insert;
+export -f thread_select;
+export -f thread_cancel;
+
+TIMEOUT=40
+
+timeout $TIMEOUT bash -c thread_insert &
+timeout $TIMEOUT bash -c thread_select &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+wait
+
+$CLICKHOUSE_CLIENT -q 'select count() from dedup_test'
+
+$CLICKHOUSE_CLIENT -q 'system flush logs'
+
+# Ensure that thread_cancel actually did something
+$CLICKHOUSE_CLIENT -q "select count() > 0 from system.text_log where event_date >= yesterday() and query_id like '$TEST_MARK%' and (
+  message_format_string in ('Unexpected end of file while reading chunk header of HTTP chunked data', 'Unexpected EOF, got {} of {} bytes',
+  'Query was cancelled or a client has unexpectedly dropped the connection') or
+  message like '%Connection reset by peer%' or message like '%Broken pipe, while writing to socket%')"
diff --git a/tests/queries/0_stateless/02435_rollback_cancelled_queries.reference b/tests/queries/0_stateless/02435_rollback_cancelled_queries.reference
new file mode 100644
index 00000000000..2d32c17ec7c
--- /dev/null
+++ b/tests/queries/0_stateless/02435_rollback_cancelled_queries.reference
@@ -0,0 +1,3 @@
+1000000
+0
+1
diff --git a/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh b/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh
new file mode 100755
index 00000000000..8f8e8cc7ee0
--- /dev/null
+++ b/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+# Tags: no-random-settings, no-ordinary-database
+# shellcheck disable=SC2009
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+export DATA_FILE="$CLICKHOUSE_TMP/deduptest.tsv"
+export TEST_MARK="02435_insert_${CLICKHOUSE_DATABASE}_"
+export SESSION="02435_session_${CLICKHOUSE_DATABASE}"
+
+$CLICKHOUSE_CLIENT -q 'select * from numbers(1000000) format TSV' > $DATA_FILE
+$CLICKHOUSE_CLIENT -q 'create table dedup_test(A Int64) Engine = MergeTree order by sin(A) partition by intDiv(A, 100000)'
+
+function insert_data
+{
+    IMPLICIT=$(( RANDOM % 2 ))
+    SESSION_ID="${SESSION}_$RANDOM.$RANDOM.$NUM"
+    TXN_SETTINGS="session_id=$SESSION_ID&throw_on_unsupported_query_inside_transaction=0&implicit_transaction=$IMPLICIT"
+    BEGIN=""
+    COMMIT=""
+    SETTINGS="query_id=$ID&$TXN_SETTINGS&max_insert_block_size=110000&min_insert_block_size_rows=110000"
+    if [[ "$IMPLICIT" -eq 0 ]]; then
+        $CLICKHOUSE_CURL -sS -d 'begin transaction' "$CLICKHOUSE_URL&$TXN_SETTINGS"
+        SETTINGS="$SETTINGS&session_check=1"
+        BEGIN="begin transaction;"
+        COMMIT=$(echo -ne "\n\ncommit")
+    fi
+
+    # max_block_size=10000, so external table will contain smaller blocks that will be squashed on insert-select (more chances to catch a bug on query cancellation)
+    TRASH_SETTINGS="$SETTINGS&input_format_parallel_parsing=0&max_threads=1&max_insert_threads=1&max_block_size=10000&min_insert_block_size_bytes=0"
+    TYPE=$(( RANDOM % 6 ))
+
+    if [[ "$TYPE" -eq 0 ]]; then
+        $CLICKHOUSE_CURL -sS -X POST --data-binary @- "$CLICKHOUSE_URL&$SETTINGS&query=insert+into+dedup_test+format+TSV" < $DATA_FILE
+    elif [[ "$TYPE" -eq 1 ]]; then
+        $CLICKHOUSE_CURL -sS -X POST -H "Transfer-Encoding: chunked" --data-binary @- "$CLICKHOUSE_URL&$SETTINGS&query=insert+into+dedup_test+format+TSV" < $DATA_FILE
+    elif [[ "$TYPE" -eq 2 ]]; then
+        $CLICKHOUSE_CURL -sS -F 'file=@-' "$CLICKHOUSE_URL&$TRASH_SETTINGS&file_format=TSV&file_types=UInt64" -X POST --form-string 'query=insert into dedup_test select * from file' < $DATA_FILE
+    else
+        # client will send 1000-rows blocks, server will squash them into 110000-rows blocks (more chances to catch a bug on query cancellation)
+        $CLICKHOUSE_CLIENT --stacktrace --query_id="$ID" --throw_on_unsupported_query_inside_transaction=0 --implicit_transaction="$IMPLICIT" \
+            --max_block_size=1000 --max_insert_block_size=1000 --multiquery -q \
+            "${BEGIN}insert into dedup_test settings max_insert_block_size=110000, min_insert_block_size_rows=110000 format TSV$COMMIT" < $DATA_FILE \
+            | grep -Fv "Transaction is not in RUNNING state"
+    fi
+
+    if [[ "$IMPLICIT" -eq 0 ]]; then
+        $CLICKHOUSE_CURL -sS -d 'commit' "$CLICKHOUSE_URL&$TXN_SETTINGS&close_session=1" 2>&1| grep -Fav "Transaction is not in RUNNING state"
+    fi
+}
+
+export -f insert_data
+
+ID="02435_insert_init_${CLICKHOUSE_DATABASE}_$RANDOM"
+insert_data 0
+$CLICKHOUSE_CLIENT -q 'select count() from dedup_test'
+
+function thread_insert
+{
+    # supress "Killed" messages from bash
+    i=2
+    while true; do
+        export ID="$TEST_MARK$RANDOM-$RANDOM-$i"
+        export NUM="$i"
+        bash -c insert_data 2>&1| grep -Fav "Killed" | grep -Fav "SESSION_IS_LOCKED" | grep -Fav "SESSION_NOT_FOUND"
+        i=$((i + 1))
+    done
+}
+
+function thread_select
+{
+    while true; do
+        $CLICKHOUSE_CLIENT --implicit_transaction=1 -q "with (select count() from dedup_test) as c select throwIf(c % 1000000 != 0, 'Expected 1000000 * N rows, got ' || toString(c)) format Null"
+        sleep 0.$RANDOM;
+    done
+}
+
+function thread_cancel
+{
+    while true; do
+        SIGNAL="INT"
+        if (( RANDOM % 2 )); then
+            SIGNAL="KILL"
+        fi
+        PID=$(grep -Fa "$TEST_MARK" /proc/*/cmdline | grep -Fav grep | grep -Eoa "/proc/[0-9]*/cmdline:" | grep -Eo "[0-9]*" | head -1)
+        if [ ! -z "$PID" ]; then kill -s "$SIGNAL" "$PID"; fi
+        sleep 0.$RANDOM;
+    done
+}
+
+export -f thread_insert;
+export -f thread_select;
+export -f thread_cancel;
+
+TIMEOUT=20
+
+timeout $TIMEOUT bash -c thread_insert &
+timeout $TIMEOUT bash -c thread_select &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+wait
+
+$CLICKHOUSE_CLIENT -q 'system flush logs'
+
+ID="02435_insert_last_${CLICKHOUSE_DATABASE}_$RANDOM"
+insert_data 1
+
+$CLICKHOUSE_CLIENT --implicit_transaction=1 -q 'select throwIf(count() % 1000000 != 0 or count() = 0) from dedup_test' \
+  || $CLICKHOUSE_CLIENT -q "select name, rows, active, visible, creation_tid, creation_csn from system.parts where database=currentDatabase();"
+
+# Ensure that thread_cancel actually did something
+$CLICKHOUSE_CLIENT -q "select count() > 0 from system.text_log where event_date >= yesterday() and query_id like '$TEST_MARK%' and (
+  message_format_string in ('Unexpected end of file while reading chunk header of HTTP chunked data', 'Unexpected EOF, got {} of {} bytes',
+  'Query was cancelled or a client has unexpectedly dropped the connection') or
+  message like '%Connection reset by peer%' or message like '%Broken pipe, while writing to socket%')"
+
+wait_for_queries_to_finish 30
+$CLICKHOUSE_CLIENT --database_atomic_wait_for_drop_and_detach_synchronously=0 -q "drop table dedup_test"
diff --git a/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.reference b/tests/queries/0_stateless/02437_drop_mv_restart_replicas.reference
similarity index 100%
rename from tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.reference
rename to tests/queries/0_stateless/02437_drop_mv_restart_replicas.reference
diff --git a/tests/queries/0_stateless/02437_drop_mv_restart_replicas.sh b/tests/queries/0_stateless/02437_drop_mv_restart_replicas.sh
new file mode 100755
index 00000000000..ca5e1245046
--- /dev/null
+++ b/tests/queries/0_stateless/02437_drop_mv_restart_replicas.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+# Tags: long, zookeeper, race, no-ordinary-database, no-replicated-database
+# FIXME remove no-replicated-database tag
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "create user u_$CLICKHOUSE_DATABASE"
+$CLICKHOUSE_CLIENT -q "grant all on db_$CLICKHOUSE_DATABASE.* to u_$CLICKHOUSE_DATABASE"
+
+# For tests with Replicated
+ENGINE=$($CLICKHOUSE_CLIENT -q "select replace(engine_full, '$CLICKHOUSE_DATABASE', 'db_$CLICKHOUSE_DATABASE') from system.databases where name='$CLICKHOUSE_DATABASE' format TSVRaw")
+export ENGINE
+
+function thread_ddl()
+{
+    while true; do
+        $CLICKHOUSE_CLIENT -q "create database if not exists db_$CLICKHOUSE_DATABASE engine=$ENGINE"
+        $CLICKHOUSE_CLIENT -q "CREATE TABLE if not exists db_$CLICKHOUSE_DATABASE.test (test String, A Int64, B Int64) ENGINE = ReplicatedMergeTree ('/clickhouse/tables/{database}/test_02124/{table}', '1') ORDER BY tuple();"
+        $CLICKHOUSE_CLIENT -q "CREATE MATERIALIZED VIEW if not exists db_$CLICKHOUSE_DATABASE.test_mv_a Engine=ReplicatedMergeTree ('/clickhouse/tables/{database}/test_02124/{table}', '1') order by tuple() AS SELECT test, A, count() c FROM db_$CLICKHOUSE_DATABASE.test group by test, A;"
+        $CLICKHOUSE_CLIENT -q "CREATE MATERIALIZED VIEW if not exists db_$CLICKHOUSE_DATABASE.test_mv_b Engine=ReplicatedMergeTree ('/clickhouse/tables/{database}/test_02124/{table}', '1') partition by A order by tuple() AS SELECT test, A, count() c FROM db_$CLICKHOUSE_DATABASE.test group by test, A;"
+        $CLICKHOUSE_CLIENT -q "CREATE MATERIALIZED VIEW if not exists db_$CLICKHOUSE_DATABASE.test_mv_c Engine=ReplicatedMergeTree ('/clickhouse/tables/{database}/test_02124/{table}', '1') order by tuple() AS SELECT test, A, count() c FROM db_$CLICKHOUSE_DATABASE.test group by test, A;"
+        sleep 0.$RANDOM;
+
+        # A kind of backoff
+        timeout 5s $CLICKHOUSE_CLIENT -q "select sleepEachRow(0.1) from system.dropped_tables format Null" 2>/dev/null ||:
+
+        $CLICKHOUSE_CLIENT -q "drop database if exists db_$CLICKHOUSE_DATABASE"
+    done
+}
+
+function thread_insert()
+{
+    while true; do
+        $CLICKHOUSE_CLIENT -q "INSERT INTO db_$CLICKHOUSE_DATABASE.test SELECT 'case1', number%3, rand() FROM numbers(5)"
+        sleep 0.$RANDOM;
+    done
+}
+
+function thread_restart()
+{
+    while true; do
+        # The simplest way to restart only replicas from a specific database is to use a special user
+        $CLICKHOUSE_CLIENT --user "u_$CLICKHOUSE_DATABASE" -q "system restart replicas"
+        sleep 0.$RANDOM;
+    done
+}
+
+export -f thread_ddl;
+export -f thread_insert;
+export -f thread_restart;
+
+TIMEOUT=15
+
+timeout $TIMEOUT bash -c thread_ddl 2>&1| grep -Fa "Exception: " | grep -Fv -e "TABLE_IS_DROPPED" -e "UNKNOWN_TABLE" -e "DATABASE_NOT_EMPTY" &
+timeout $TIMEOUT bash -c thread_insert 2> /dev/null &
+timeout $TIMEOUT bash -c thread_restart 2>&1| grep -Fa "Exception: " | grep -Fv -e "is currently dropped or renamed" &
+
+wait
+
+timeout 45s $CLICKHOUSE_CLIENT -q "select sleepEachRow(0.3) from system.dropped_tables format Null" 2>/dev/null ||:
+
+$CLICKHOUSE_CLIENT -q "drop database if exists db_$CLICKHOUSE_DATABASE" 2>&1| grep -Fa "Exception: " | grep -Fv -e "TABLE_IS_DROPPED" -e "UNKNOWN_TABLE" -e "DATABASE_NOT_EMPTY" ||:
diff --git a/tests/queries/0_stateless/02438_sync_replica_lightweight.reference b/tests/queries/0_stateless/02438_sync_replica_lightweight.reference
new file mode 100644
index 00000000000..25abaad13e2
--- /dev/null
+++ b/tests/queries/0_stateless/02438_sync_replica_lightweight.reference
@@ -0,0 +1,15 @@
+GET_PART	all_0_0_0
+GET_PART	all_1_1_0
+1	1	all_0_0_0
+1	2	all_1_1_0
+MERGE_PARTS	all_0_1_1
+3	1	all_0_1_1
+3	2	all_0_1_1
+4	1	all_0_1_1
+4	2	all_0_1_1
+5	1	all_0_2_2
+5	2	all_0_2_2
+5	3	all_0_2_2
+6	1	all_0_2_2
+6	2	all_0_2_2
+6	3	all_0_2_2
diff --git a/tests/queries/0_stateless/02438_sync_replica_lightweight.sql b/tests/queries/0_stateless/02438_sync_replica_lightweight.sql
new file mode 100644
index 00000000000..1da48d95d9b
--- /dev/null
+++ b/tests/queries/0_stateless/02438_sync_replica_lightweight.sql
@@ -0,0 +1,42 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: different number of replicas
+
+create table rmt1 (n int) engine=ReplicatedMergeTree('/test/{database}/02438/', '1') order by tuple();
+create table rmt2 (n int) engine=ReplicatedMergeTree('/test/{database}/02438/', '2') order by tuple();
+
+system stop replicated sends rmt1;
+system stop merges rmt2;
+
+set insert_keeper_fault_injection_probability=0;
+
+insert into rmt1 values (1);
+insert into rmt1 values (2);
+system sync replica rmt2 pull;  -- does not wait
+select type, new_part_name from system.replication_queue where database=currentDatabase() and table='rmt2' order by new_part_name;
+select 1, n, _part from rmt1 order by n;
+select 2, n, _part from rmt2 order by n;
+
+set optimize_throw_if_noop = 1;
+system sync replica rmt1 pull;
+optimize table rmt1 final;
+
+system start replicated sends rmt1;
+system sync replica rmt2 lightweight;   -- waits for fetches, not merges
+select type, new_part_name from system.replication_queue where database=currentDatabase() and table='rmt2' order by new_part_name;
+select 3, n, _part from rmt1 order by n;
+select 4, n, _part from rmt2 order by n;
+
+system start merges rmt2;
+system sync replica rmt2;
+
+insert into rmt2 values (3);
+system sync replica rmt2 pull;
+optimize table rmt2 final;
+
+system sync replica rmt1 strict;
+
+select 5, n, _part from rmt1 order by n;
+select 6, n, _part from rmt2 order by n;
+
+drop table rmt1;
+drop table rmt2;
diff --git a/tests/queries/0_stateless/02439_merge_selecting_partitions.reference b/tests/queries/0_stateless/02439_merge_selecting_partitions.reference
new file mode 100644
index 00000000000..e836994b3aa
--- /dev/null
+++ b/tests/queries/0_stateless/02439_merge_selecting_partitions.reference
@@ -0,0 +1 @@
+/test/02439/s1/default/block_numbers/123
diff --git a/tests/queries/0_stateless/02439_merge_selecting_partitions.sql b/tests/queries/0_stateless/02439_merge_selecting_partitions.sql
new file mode 100644
index 00000000000..88ce2834d6b
--- /dev/null
+++ b/tests/queries/0_stateless/02439_merge_selecting_partitions.sql
@@ -0,0 +1,28 @@
+
+drop table if exists rmt;
+
+create table rmt (n int, m int) engine=ReplicatedMergeTree('/test/02439/{shard}/{database}', '{replica}') partition by n order by n;
+insert into rmt select number, number from numbers(50);
+insert into rmt values (1, 2);
+insert into rmt values (1, 3);
+insert into rmt values (1, 4);
+insert into rmt values (1, 5);
+insert into rmt values (1, 6);
+insert into rmt values (1, 7);
+insert into rmt values (1, 8);
+insert into rmt values (1, 9);
+-- there's nothing to merge in all partitions but '1'
+
+optimize table rmt partition tuple(123);
+
+set optimize_throw_if_noop=1;
+optimize table rmt partition tuple(123); -- { serverError CANNOT_ASSIGN_OPTIMIZE }
+
+select sleepEachRow(3) as higher_probability_of_reproducing_the_issue format Null;
+system flush logs;
+
+-- it should not list unneeded partitions where we cannot merge anything
+select distinct path from system.zookeeper_log where path like '/test/02439/s1/' || currentDatabase() || '/block_numbers/%'
+    and op_num in ('List', 'SimpleList', 'FilteredList') and path not like '%/block_numbers/1';
+
+drop table rmt;
diff --git a/tests/queries/0_stateless/02440_mutations_finalization.reference b/tests/queries/0_stateless/02440_mutations_finalization.reference
new file mode 100644
index 00000000000..c4bad0a3806
--- /dev/null
+++ b/tests/queries/0_stateless/02440_mutations_finalization.reference
@@ -0,0 +1,5 @@
+0000000000	UPDATE n = 2 WHERE n = 1	['all_0_0_0']	0
+1
+0000000000	UPDATE n = 2 WHERE n = 1	['all_0_0_0']	0
+2
+0000000000	UPDATE n = 2 WHERE n = 1	[]
diff --git a/tests/queries/0_stateless/02440_mutations_finalization.sql b/tests/queries/0_stateless/02440_mutations_finalization.sql
new file mode 100644
index 00000000000..c522d8ab9df
--- /dev/null
+++ b/tests/queries/0_stateless/02440_mutations_finalization.sql
@@ -0,0 +1,34 @@
+
+create table mut (n int) engine=ReplicatedMergeTree('/test/02440/{database}/mut', '1') order by tuple();
+set insert_keeper_fault_injection_probability=0;
+insert into mut values (1);
+system stop merges mut;
+alter table mut update n = 2 where n = 1;
+-- it will create MUTATE_PART entry, but will not execute it
+
+system sync replica mut pull;
+select mutation_id, command, parts_to_do_names, is_done from system.mutations where database=currentDatabase() and table='mut';
+
+-- merges (and mutations) will start again after detach/attach, we need to avoid this somehow...
+create table tmp (n int) engine=MergeTree order by tuple() settings index_granularity=1;
+insert into tmp select * from numbers(1000);
+alter table tmp update n = sleepEachRow(1) where 1;
+select sleepEachRow(2) as higher_probablility_of_reproducing_the_issue format Null;
+
+-- it will not execute MUTATE_PART, because another mutation is currently executing (in tmp)
+alter table mut modify setting max_number_of_mutations_for_replica=1;
+detach table mut;
+attach table mut;
+
+-- mutation should not be finished yet
+select * from mut;
+select mutation_id, command, parts_to_do_names, is_done from system.mutations where database=currentDatabase() and table='mut';
+
+alter table mut modify setting max_number_of_mutations_for_replica=100;
+system sync replica mut;
+
+-- and now it should (is_done may be 0, but it's okay)
+select * from mut;
+select mutation_id, command, parts_to_do_names from system.mutations where database=currentDatabase() and table='mut';
+
+drop table tmp; -- btw, it will check that mutation can be cancelled between blocks on shutdown
diff --git a/tests/queries/0_stateless/02441_alter_delete_and_drop_column.reference b/tests/queries/0_stateless/02441_alter_delete_and_drop_column.reference
new file mode 100644
index 00000000000..e9858167301
--- /dev/null
+++ b/tests/queries/0_stateless/02441_alter_delete_and_drop_column.reference
@@ -0,0 +1,2 @@
+MUTATE_PART	all_0_0_0_1	['all_0_0_0']
+1	2
diff --git a/tests/queries/0_stateless/02441_alter_delete_and_drop_column.sql b/tests/queries/0_stateless/02441_alter_delete_and_drop_column.sql
new file mode 100644
index 00000000000..9c4697362df
--- /dev/null
+++ b/tests/queries/0_stateless/02441_alter_delete_and_drop_column.sql
@@ -0,0 +1,27 @@
+-- Tags: no-replicated-database
+
+create table mut (n int, m int, k int) engine=ReplicatedMergeTree('/test/02441/{database}/mut', '1') order by n;
+set insert_keeper_fault_injection_probability=0;
+insert into mut values (1, 2, 3), (10, 20, 30);
+
+system stop merges mut;
+alter table mut delete where n = 10;
+
+-- a funny way to wait for a MUTATE_PART to be assigned
+select sleepEachRow(2) from url('http://localhost:8123/?param_tries={1..10}&query=' || encodeURLComponent(
+            'select 1 where ''MUTATE_PART'' not in (select type from system.replication_queue where database=''' || currentDatabase() || ''' and table=''mut'')'
+    ), 'LineAsString', 's String') settings max_threads=1 format Null;
+
+alter table mut drop column k settings alter_sync=0;
+system sync replica mut pull;
+
+-- a funny way to wait for ALTER_METADATA to disappear from the replication queue
+select sleepEachRow(2) from url('http://localhost:8123/?param_tries={1..10}&query=' || encodeURLComponent(
+    'select * from system.replication_queue where database=''' || currentDatabase() || ''' and table=''mut'' and type=''ALTER_METADATA'''
+    ), 'LineAsString', 's String') settings max_threads=1 format Null;
+
+select type, new_part_name, parts_to_merge from system.replication_queue where database=currentDatabase() and table='mut';
+system start merges mut;
+set receive_timeout=30;
+system sync replica mut;
+select * from mut;
diff --git a/tests/queries/0_stateless/02442_auxiliary_zookeeper_endpoint_id.reference b/tests/queries/0_stateless/02442_auxiliary_zookeeper_endpoint_id.reference
new file mode 100644
index 00000000000..4a9341ba3f6
--- /dev/null
+++ b/tests/queries/0_stateless/02442_auxiliary_zookeeper_endpoint_id.reference
@@ -0,0 +1 @@
+10013
diff --git a/tests/queries/0_stateless/02442_auxiliary_zookeeper_endpoint_id.sql b/tests/queries/0_stateless/02442_auxiliary_zookeeper_endpoint_id.sql
new file mode 100644
index 00000000000..ff3552b2a42
--- /dev/null
+++ b/tests/queries/0_stateless/02442_auxiliary_zookeeper_endpoint_id.sql
@@ -0,0 +1,21 @@
+-- Tags: no-fasttest
+
+drop table if exists t1_r1 sync;
+drop table if exists t1_r2 sync;
+drop table if exists t2 sync;
+
+create table t1_r1 (x Int32) engine=ReplicatedMergeTree('/test/02442/{database}/t', 'r1') order by x;
+
+create table t1_r2 (x Int32) engine=ReplicatedMergeTree('/test/02442/{database}/t', 'r2') order by x;
+
+-- create table with same replica_path as t1_r1
+create table t2 (x Int32) engine=ReplicatedMergeTree('zookeeper2:/test/02442/{database}/t', 'r1') order by x;
+drop table t2 sync;
+
+-- insert data into one replica
+insert into t1_r1 select * from generateRandom('x Int32') LIMIT 10013;
+system sync replica t1_r2;
+select count() from t1_r2;
+
+drop table t1_r1 sync;
+drop table t1_r2 sync;
diff --git a/tests/queries/0_stateless/02447_drop_database_replica.reference b/tests/queries/0_stateless/02447_drop_database_replica.reference
index 1d65fe66c6e..f2b41569540 100644
--- a/tests/queries/0_stateless/02447_drop_database_replica.reference
+++ b/tests/queries/0_stateless/02447_drop_database_replica.reference
@@ -6,10 +6,16 @@ t
 2
 2
 2
-rdb_default	1	1
-rdb_default	1	2
 2
 2
 2
+2
+rdb_default	1	1	s1	r1	1
+2
+2
+rdb_default	1	1	s1	r1	1
+rdb_default	1	2	s1	r2	0
+2
+2
 t
-rdb_default_3	1	1
+rdb_default_4	1	1	s1	r1	1
diff --git a/tests/queries/0_stateless/02447_drop_database_replica.sh b/tests/queries/0_stateless/02447_drop_database_replica.sh
index 4bfd6243c2e..47a6cf10bda 100755
--- a/tests/queries/0_stateless/02447_drop_database_replica.sh
+++ b/tests/queries/0_stateless/02447_drop_database_replica.sh
@@ -13,35 +13,49 @@ $CLICKHOUSE_CLIENT -q "show tables from $db"
 
 $CLICKHOUSE_CLIENT -q "system drop database replica 's1|r1' from table t" 2>&1| grep -Fac "SYNTAX_ERROR"
 $CLICKHOUSE_CLIENT -q "system drop database replica 's1|r1' from database $db" 2>&1| grep -Fac "There is a local database"
+$CLICKHOUSE_CLIENT -q "system drop database replica 'r1' from shard 's1' from database $db" 2>&1| grep -Fac "There is a local database"
 $CLICKHOUSE_CLIENT -q "system drop database replica 's1|r1' from zkpath '/test/$CLICKHOUSE_DATABASE/rdb'" 2>&1| grep -Fac "There is a local database"
 $CLICKHOUSE_CLIENT -q "system drop database replica 's1|r1' from zkpath '/test/$CLICKHOUSE_DATABASE/rdb/'" 2>&1| grep -Fac "There is a local database"
+$CLICKHOUSE_CLIENT -q "system drop database replica 'r1' from shard 's1' from zkpath '/test/$CLICKHOUSE_DATABASE/rdb/'" 2>&1| grep -Fac "There is a local database"
 
 $CLICKHOUSE_CLIENT -q "system drop database replica 's1|r1' from zkpath '/test/$CLICKHOUSE_DATABASE/'" 2>&1| grep -Fac "does not look like a path of Replicated database"
 $CLICKHOUSE_CLIENT -q "system drop database replica 's2|r1' from zkpath '/test/$CLICKHOUSE_DATABASE/rdb'" 2>&1| grep -Fac "does not exist"
+$CLICKHOUSE_CLIENT -q "system drop database replica 's1' from shard 'r1' from zkpath '/test/$CLICKHOUSE_DATABASE/rdb'" 2>&1| grep -Fac "does not exist"
+$CLICKHOUSE_CLIENT -q "system drop database replica 's1|r1' from shard 's1' from zkpath '/test/$CLICKHOUSE_DATABASE/rdb'" 2>&1| grep -Fac "does not exist"
 $CLICKHOUSE_CLIENT -q "system drop database replica 's2/r1' from zkpath '/test/$CLICKHOUSE_DATABASE/rdb'" 2>&1| grep -Fac "Invalid replica name"
 
 db2="${db}_2"
+db3="${db}_3"
 $CLICKHOUSE_CLIENT --allow_experimental_database_replicated=1 -q "create database $db2 engine=Replicated('/test/$CLICKHOUSE_DATABASE/rdb', 's1', 'r2')"
+$CLICKHOUSE_CLIENT --allow_experimental_database_replicated=1 -q "create database $db3 engine=Replicated('/test/$CLICKHOUSE_DATABASE/rdb', 's2', 'r1')"
 $CLICKHOUSE_CLIENT -q "system sync database replica $db"
-$CLICKHOUSE_CLIENT -q "select cluster, shard_num, replica_num from system.clusters where cluster='$db' order by shard_num, replica_num"
+$CLICKHOUSE_CLIENT -q "select cluster, shard_num, replica_num, database_shard_name, database_replica_name, is_active from system.clusters where cluster='$db' and shard_num=1 and replica_num=1"
 $CLICKHOUSE_CLIENT -q "system drop database replica 's1|r1' from database $db2" 2>&1| grep -Fac "is active, cannot drop it"
 
+$CLICKHOUSE_CLIENT -q "detach database $db3"
+$CLICKHOUSE_CLIENT -q "system drop database replica 'r1' from shard 's2' from database $db"
+$CLICKHOUSE_CLIENT -q "attach database $db3" 2>/dev/null
+$CLICKHOUSE_CLIENT --distributed_ddl_output_mode=none -q "create table $db3.t2 as system.query_log" 2>&1| grep -Fac "Database is in readonly mode"   # Suppress style check: current_database=$CLICKHOUSE_DATABASE
+
 $CLICKHOUSE_CLIENT -q "detach database $db2"
+$CLICKHOUSE_CLIENT -q "system sync database replica $db"
+$CLICKHOUSE_CLIENT -q "select cluster, shard_num, replica_num, database_shard_name, database_replica_name, is_active from system.clusters where cluster='$db' order by shard_num, replica_num"
 $CLICKHOUSE_CLIENT -q "system drop database replica 's1|r2' from database $db"
 $CLICKHOUSE_CLIENT -q "attach database $db2" 2>/dev/null
 $CLICKHOUSE_CLIENT --distributed_ddl_output_mode=none -q "create table $db2.t2 as system.query_log" 2>&1| grep -Fac "Database is in readonly mode"   # Suppress style check: current_database=$CLICKHOUSE_DATABASE
 
 $CLICKHOUSE_CLIENT -q "detach database $db"
-$CLICKHOUSE_CLIENT -q "system drop database replica 's1|r1' from zkpath '/test/$CLICKHOUSE_DATABASE/rdb/'"
+$CLICKHOUSE_CLIENT -q "system drop database replica 'r1' from shard 's1' from zkpath '/test/$CLICKHOUSE_DATABASE/rdb/'"
 $CLICKHOUSE_CLIENT -q "attach database $db" 2>/dev/null
 $CLICKHOUSE_CLIENT --distributed_ddl_output_mode=none -q "create table $db.t2 as system.query_log" 2>&1| grep -Fac "Database is in readonly mode"   # Suppress style check: current_database=$CLICKHOUSE_DATABASE
 $CLICKHOUSE_CLIENT -q "show tables from $db"
 
-db3="${db}_3"
-$CLICKHOUSE_CLIENT --allow_experimental_database_replicated=1 -q "create database $db3 engine=Replicated('/test/$CLICKHOUSE_DATABASE/rdb', 's1', 'r1')"
-$CLICKHOUSE_CLIENT -q "system sync database replica $db3"
-$CLICKHOUSE_CLIENT -q "select cluster, shard_num, replica_num from system.clusters where cluster='$db3'"
+db4="${db}_4"
+$CLICKHOUSE_CLIENT --allow_experimental_database_replicated=1 -q "create database $db4 engine=Replicated('/test/$CLICKHOUSE_DATABASE/rdb', 's1', 'r1')"
+$CLICKHOUSE_CLIENT -q "system sync database replica $db4"
+$CLICKHOUSE_CLIENT -q "select cluster, shard_num, replica_num, database_shard_name, database_replica_name, is_active from system.clusters where cluster='$db4'"
 
 $CLICKHOUSE_CLIENT -q "drop database $db"
 $CLICKHOUSE_CLIENT -q "drop database $db2"
 $CLICKHOUSE_CLIENT -q "drop database $db3"
+$CLICKHOUSE_CLIENT -q "drop database $db4"
diff --git a/tests/queries/0_stateless/02451_order_by_monotonic.reference b/tests/queries/0_stateless/02451_order_by_monotonic.reference
index d3de324a7e1..f9f0ef38be1 100644
--- a/tests/queries/0_stateless/02451_order_by_monotonic.reference
+++ b/tests/queries/0_stateless/02451_order_by_monotonic.reference
@@ -4,19 +4,19 @@
 2022-09-09 12:00:00	0x
 2022-09-09 12:00:00	1
 2022-09-09 12:00:00	1x
-  Prefix sort description: toStartOfMinute(t) ASC
-  Result sort description: toStartOfMinute(t) ASC, c1 ASC
-  Prefix sort description: toStartOfMinute(t) ASC
-  Result sort description: toStartOfMinute(t) ASC
-  Prefix sort description: negate(a) ASC
-  Result sort description: negate(a) ASC
-  Prefix sort description: negate(a) ASC, negate(b) ASC
-  Result sort description: negate(a) ASC, negate(b) ASC
-  Prefix sort description: a DESC, negate(b) ASC
-  Result sort description: a DESC, negate(b) ASC
-  Prefix sort description: negate(a) ASC, b DESC
-  Result sort description: negate(a) ASC, b DESC
-  Prefix sort description: negate(a) ASC
-  Result sort description: negate(a) ASC, b ASC
-  Prefix sort description: a ASC
-  Result sort description: a ASC, negate(b) ASC
+  Prefix sort description: toStartOfMinute(test.t_0) ASC
+  Result sort description: toStartOfMinute(test.t_0) ASC, test.c1_1 ASC
+  Prefix sort description: toStartOfMinute(test.t_0) ASC
+  Result sort description: toStartOfMinute(test.t_0) ASC
+  Prefix sort description: negate(test.a_0) ASC
+  Result sort description: negate(test.a_0) ASC
+  Prefix sort description: negate(test.a_0) ASC, negate(test.b_1) ASC
+  Result sort description: negate(test.a_0) ASC, negate(test.b_1) ASC
+  Prefix sort description: test.a_0 DESC, negate(test.b_1) ASC
+  Result sort description: test.a_0 DESC, negate(test.b_1) ASC
+  Prefix sort description: negate(test.a_0) ASC, test.b_1 DESC
+  Result sort description: negate(test.a_0) ASC, test.b_1 DESC
+  Prefix sort description: negate(test.a_0) ASC
+  Result sort description: negate(test.a_0) ASC, test.b_1 ASC
+  Prefix sort description: test.a_0 ASC
+  Result sort description: test.a_0 ASC, negate(test.b_1) ASC
diff --git a/tests/queries/0_stateless/02451_order_by_monotonic.sh b/tests/queries/0_stateless/02451_order_by_monotonic.sh
index cc26ba91e1c..7d1356b4445 100755
--- a/tests/queries/0_stateless/02451_order_by_monotonic.sh
+++ b/tests/queries/0_stateless/02451_order_by_monotonic.sh
@@ -4,37 +4,41 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+opts=(
+    "--allow_experimental_analyzer=1"
+)
+
 function explain_sort_description()
 {
-    out=$($CLICKHOUSE_CLIENT --optimize_read_in_order=1 -q "EXPLAIN PLAN actions = 1 $1")
+    out=$($CLICKHOUSE_CLIENT "${opts[@]}" --optimize_read_in_order=1 -q "EXPLAIN PLAN actions = 1 $1")
     echo "$out" | grep "Prefix sort description:"
     echo "$out" | grep "Result sort description:"
 }
 
-$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_order_by_monotonic"
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_order_by_monotonic (t DateTime, c1 String) ENGINE = MergeTree ORDER BY (t, c1)
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "DROP TABLE IF EXISTS t_order_by_monotonic"
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "CREATE TABLE t_order_by_monotonic (t DateTime, c1 String) ENGINE = MergeTree ORDER BY (t, c1)
     AS SELECT '2022-09-09 12:00:00', toString(number % 2) FROM numbers(2) UNION ALL
        SELECT '2022-09-09 12:00:30', toString(number % 2)|| 'x' FROM numbers(3)"
 
-$CLICKHOUSE_CLIENT --optimize_aggregation_in_order=1 -q "SELECT count() FROM
-    (SELECT toStartOfMinute(t) AS s, c1 FROM t_order_by_monotonic GROUP BY s, c1)"
+$CLICKHOUSE_CLIENT "${opts[@]}" --optimize_aggregation_in_order=1 -q "SELECT count() FROM
+    (SELECT toStartOfMinute(t) AS s, c1 FROM t_order_by_monotonic AS test GROUP BY s, c1)"
 
-$CLICKHOUSE_CLIENT --optimize_read_in_order=1 -q "SELECT toStartOfMinute(t) AS s, c1 FROM t_order_by_monotonic ORDER BY s, c1"
+$CLICKHOUSE_CLIENT "${opts[@]}" --optimize_read_in_order=1 -q "SELECT toStartOfMinute(t) AS s, c1 FROM t_order_by_monotonic AS test ORDER BY s, c1"
 
-explain_sort_description "SELECT toStartOfMinute(t) AS s, c1 FROM t_order_by_monotonic ORDER BY s, c1"
-explain_sort_description "SELECT toStartOfMinute(t) AS s, c1 FROM t_order_by_monotonic ORDER BY s"
+explain_sort_description "SELECT toStartOfMinute(t) AS s, c1 FROM t_order_by_monotonic AS test ORDER BY s, c1"
+explain_sort_description "SELECT toStartOfMinute(t) AS s, c1 FROM t_order_by_monotonic AS test ORDER BY s"
 
-$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_order_by_monotonic"
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "DROP TABLE IF EXISTS t_order_by_monotonic"
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_order_by_monotonic (a Int64, b Int64) ENGINE = MergeTree ORDER BY (a, b)"
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "CREATE TABLE t_order_by_monotonic (a Int64, b Int64) ENGINE = MergeTree ORDER BY (a, b)"
 
-$CLICKHOUSE_CLIENT -q "INSERT INTO t_order_by_monotonic VALUES (1, 1) (1, 2), (2, 1) (2, 2)"
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "INSERT INTO t_order_by_monotonic VALUES (1, 1) (1, 2), (2, 1) (2, 2)"
 
-explain_sort_description "SELECT * FROM t_order_by_monotonic ORDER BY -a"
-explain_sort_description "SELECT * FROM t_order_by_monotonic ORDER BY -a, -b"
-explain_sort_description "SELECT * FROM t_order_by_monotonic ORDER BY a DESC, -b"
-explain_sort_description "SELECT * FROM t_order_by_monotonic ORDER BY -a, b DESC"
-explain_sort_description "SELECT * FROM t_order_by_monotonic ORDER BY -a, b"
-explain_sort_description "SELECT * FROM t_order_by_monotonic ORDER BY a, -b"
+explain_sort_description "SELECT * FROM t_order_by_monotonic AS test ORDER BY -a"
+explain_sort_description "SELECT * FROM t_order_by_monotonic AS test ORDER BY -a, -b"
+explain_sort_description "SELECT * FROM t_order_by_monotonic AS test ORDER BY a DESC, -b"
+explain_sort_description "SELECT * FROM t_order_by_monotonic AS test ORDER BY -a, b DESC"
+explain_sort_description "SELECT * FROM t_order_by_monotonic AS test ORDER BY -a, b"
+explain_sort_description "SELECT * FROM t_order_by_monotonic AS test ORDER BY a, -b"
 
-$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_order_by_monotonic"
+$CLICKHOUSE_CLIENT "${opts[@]}" -q "DROP TABLE IF EXISTS t_order_by_monotonic"
diff --git a/tests/queries/0_stateless/02455_one_row_from_csv_memory_usage.sh b/tests/queries/0_stateless/02455_one_row_from_csv_memory_usage.sh
index 7506e78455d..5b54666a6a3 100755
--- a/tests/queries/0_stateless/02455_one_row_from_csv_memory_usage.sh
+++ b/tests/queries/0_stateless/02455_one_row_from_csv_memory_usage.sh
@@ -1,11 +1,15 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 #  shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-user_files_path=$($CLICKHOUSE_CLIENT --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep -E '^Code: 107.*FILE_DOESNT_EXIST' | head -1 | awk '{gsub("/nonexist.txt","",$9); print $9}')
-cp "$CUR_DIR"/data_csv/10m_rows.csv.xz $user_files_path/
+USER_FILES_PATH=$($CLICKHOUSE_CLIENT --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep -E '^Code: 107.*FILE_DOESNT_EXIST' | head -1 | awk '{gsub("/nonexist.txt","",$9); print $9}')
 
-${CLICKHOUSE_CLIENT} --query="SELECT * FROM file('$user_files_path/10m_rows.csv.xz' , 'CSVWithNames') LIMIT 1 settings max_memory_usage=1000000000"
-${CLICKHOUSE_CLIENT} --query="SELECT * FROM file('$user_files_path/10m_rows.csv.xz' , 'CSVWithNames') LIMIT 1 settings max_memory_usage=100000000"
+cp "$CUR_DIR"/data_csv/10m_rows.csv.xz $USER_FILES_PATH/
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM file('10m_rows.csv.xz' , 'CSVWithNames') order by identifier, number, name, surname, birthday LIMIT 1 settings max_threads=1, max_memory_usage=1000000000"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM file('10m_rows.csv.xz' , 'CSVWithNames') order by identifier, number, name, surname, birthday LIMIT 1 settings max_threads=1, max_memory_usage=100000000"
+
+rm $USER_FILES_PATH/10m_rows.csv.xz
diff --git a/tests/queries/0_stateless/02456_async_inserts_logs.reference b/tests/queries/0_stateless/02456_async_inserts_logs.reference
index efd8a88eca4..ba1b19fb184 100644
--- a/tests/queries/0_stateless/02456_async_inserts_logs.reference
+++ b/tests/queries/0_stateless/02456_async_inserts_logs.reference
@@ -1,7 +1,10 @@
 5
-	Values	21	1	Ok	1
-t_async_inserts_logs	JSONEachRow	39	1	Ok	1
-t_async_inserts_logs	Values	8	1	Ok	1
-t_async_inserts_logs	JSONEachRow	6	0	ParsingError	1
-t_async_inserts_logs	Values	6	0	ParsingError	1
-t_async_inserts_logs	Values	8	0	FlushError	1
+	Values	21	2	1	Ok	1
+t_async_inserts_logs	JSONEachRow	39	2	1	Ok	1
+t_async_inserts_logs	Values	8	1	1	Ok	1
+t_async_inserts_logs	JSONEachRow	6	0	0	ParsingError	1
+t_async_inserts_logs	Values	6	0	0	ParsingError	1
+t_async_inserts_logs	Values	8	1	0	FlushError	1
+AsyncInsertBytes	1
+AsyncInsertQuery	1
+AsyncInsertRows	1
diff --git a/tests/queries/0_stateless/02456_async_inserts_logs.sh b/tests/queries/0_stateless/02456_async_inserts_logs.sh
index 006455e2d42..43cd73d7231 100755
--- a/tests/queries/0_stateless/02456_async_inserts_logs.sh
+++ b/tests/queries/0_stateless/02456_async_inserts_logs.sh
@@ -30,10 +30,15 @@ ${CLICKHOUSE_CLIENT} -q "SELECT count() FROM t_async_inserts_logs"
 
 ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
 ${CLICKHOUSE_CLIENT} -q "
-    SELECT table, format, bytes, empty(exception), status,
+    SELECT table, format, bytes, rows, empty(exception), status,
     status = 'ParsingError' ? flush_time_microseconds = 0 : flush_time_microseconds > event_time_microseconds AS time_ok
     FROM system.asynchronous_insert_log
     WHERE database = '$CLICKHOUSE_DATABASE' OR query ILIKE 'INSERT INTO FUNCTION%$CLICKHOUSE_DATABASE%'
     ORDER BY table, status, format"
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE t_async_inserts_logs"
+
+${CLICKHOUSE_CLIENT} -q "
+SELECT event, value > 0 FROM system.events
+WHERE event IN ('AsyncInsertQuery', 'AsyncInsertBytes', 'AsyncInsertRows')
+ORDER BY event"
diff --git a/tests/queries/0_stateless/02457_s3_cluster_schema_inference.reference b/tests/queries/0_stateless/02457_s3_cluster_schema_inference.reference
index b918bf2b155..8d744ba7b46 100644
--- a/tests/queries/0_stateless/02457_s3_cluster_schema_inference.reference
+++ b/tests/queries/0_stateless/02457_s3_cluster_schema_inference.reference
@@ -10,6 +10,138 @@ c3	Nullable(Int64)
 c1	Nullable(Int64)					
 c2	Nullable(Int64)					
 c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
 0	0	0
 0	0	0
 1	2	3
diff --git a/tests/queries/0_stateless/02457_s3_cluster_schema_inference.sql b/tests/queries/0_stateless/02457_s3_cluster_schema_inference.sql
index 03e8785b24b..6182a1a222e 100644
--- a/tests/queries/0_stateless/02457_s3_cluster_schema_inference.sql
+++ b/tests/queries/0_stateless/02457_s3_cluster_schema_inference.sql
@@ -5,9 +5,34 @@ desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localh
 desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV');
 desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'test', 'testtest');
 desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'test', 'testtest', 'TSV');
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'auto');
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto');
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto', 'auto');
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'test', 'testtest', 'auto');
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'test', 'testtest', 'TSV', 'auto');
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'test', 'testtest', 'TSV', 'auto', 'auto');
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', NOSIGN);
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', NOSIGN, 'TSV');
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', NOSIGN, 'TSV', 'auto');
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', NOSIGN, 'TSV', 'auto', 'auto');
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', headers(MyCustomHeader = 'SomeValue'));
+desc s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto', headers(MyCustomHeader = 'SomeValue'), 'auto');
+
 
 select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv') order by c1, c2, c3;
 select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV') order by c1, c2, c3;
 select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'test', 'testtest') order by c1, c2, c3;
 select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'test', 'testtest', 'TSV') order by c1, c2, c3; 
+select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'auto') order by c1, c2, c3;
+select * from  s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto') order by c1, c2, c3;
+select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto', 'auto') order by c1, c2, c3;
+select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'test', 'testtest', 'auto') order by c1, c2, c3;
+select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'test', 'testtest', 'TSV', 'auto') order by c1, c2, c3;
+select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'test', 'testtest', 'TSV', 'auto', 'auto') order by c1, c2, c3;
+select * from  s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', NOSIGN) order by c1, c2, c3;
+select * from  s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', NOSIGN, 'TSV') order by c1, c2, c3;
+select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', NOSIGN, 'TSV', 'auto') order by c1, c2, c3;
+select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', NOSIGN, 'TSV', 'auto', 'auto') order by c1, c2, c3;
+select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', headers(MyCustomHeader = 'SomeValue')) order by c1, c2, c3;
+select * from s3Cluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto', headers(MyCustomHeader = 'SomeValue'), 'auto') order by c1, c2, c3;
 
diff --git a/tests/queries/0_stateless/02458_insert_select_progress_tcp.python b/tests/queries/0_stateless/02458_insert_select_progress_tcp.python
index c638b3d2040..696eb01ff7e 100644
--- a/tests/queries/0_stateless/02458_insert_select_progress_tcp.python
+++ b/tests/queries/0_stateless/02458_insert_select_progress_tcp.python
@@ -5,13 +5,13 @@ import os
 import uuid
 import json
 
-CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', '127.0.0.1')
-CLICKHOUSE_PORT = int(os.environ.get('CLICKHOUSE_PORT_TCP', '900000'))
-CLICKHOUSE_DATABASE = os.environ.get('CLICKHOUSE_DATABASE', 'default')
+CLICKHOUSE_HOST = os.environ.get("CLICKHOUSE_HOST", "127.0.0.1")
+CLICKHOUSE_PORT = int(os.environ.get("CLICKHOUSE_PORT_TCP", "900000"))
+CLICKHOUSE_DATABASE = os.environ.get("CLICKHOUSE_DATABASE", "default")
+
 
 def writeVarUInt(x, ba):
     for _ in range(0, 9):
-
         byte = x & 0x7F
         if x > 0x7F:
             byte |= 0x80
@@ -24,12 +24,12 @@ def writeVarUInt(x, ba):
 
 
 def writeStringBinary(s, ba):
-    b = bytes(s, 'utf-8')
+    b = bytes(s, "utf-8")
     writeVarUInt(len(s), ba)
     ba.extend(b)
 
 
-def readStrict(s, size = 1):
+def readStrict(s, size=1):
     res = bytearray()
     while size:
         cur = s.recv(size)
@@ -48,18 +48,23 @@ def readUInt(s, size=1):
         val += res[i] << (i * 8)
     return val
 
+
 def readUInt8(s):
     return readUInt(s)
 
+
 def readUInt16(s):
     return readUInt(s, 2)
 
+
 def readUInt32(s):
     return readUInt(s, 4)
 
+
 def readUInt64(s):
     return readUInt(s, 8)
 
+
 def readVarUInt(s):
     x = 0
     for i in range(9):
@@ -75,25 +80,25 @@ def readVarUInt(s):
 def readStringBinary(s):
     size = readVarUInt(s)
     s = readStrict(s, size)
-    return s.decode('utf-8')
+    return s.decode("utf-8")
 
 
 def sendHello(s):
     ba = bytearray()
-    writeVarUInt(0, ba) # Hello
-    writeStringBinary('simple native protocol', ba)
+    writeVarUInt(0, ba)  # Hello
+    writeStringBinary("simple native protocol", ba)
     writeVarUInt(21, ba)
     writeVarUInt(9, ba)
     writeVarUInt(54449, ba)
-    writeStringBinary(CLICKHOUSE_DATABASE, ba) # database
-    writeStringBinary('default', ba) # user
-    writeStringBinary('', ba) # pwd
+    writeStringBinary(CLICKHOUSE_DATABASE, ba)  # database
+    writeStringBinary("default", ba)  # user
+    writeStringBinary("", ba)  # pwd
     s.sendall(ba)
 
 
 def receiveHello(s):
     p_type = readVarUInt(s)
-    assert (p_type == 0) # Hello
+    assert p_type == 0  # Hello
     server_name = readStringBinary(s)
     # print("Server name: ", server_name)
     server_version_major = readVarUInt(s)
@@ -111,65 +116,65 @@ def receiveHello(s):
 
 
 def serializeClientInfo(ba, query_id):
-    writeStringBinary('default', ba) # initial_user
-    writeStringBinary(query_id, ba) # initial_query_id
-    writeStringBinary('127.0.0.1:9000', ba) # initial_address
-    ba.extend([0] * 8) # initial_query_start_time_microseconds
-    ba.append(1) # TCP
-    writeStringBinary('os_user', ba) # os_user
-    writeStringBinary('client_hostname', ba) # client_hostname
-    writeStringBinary('client_name', ba) # client_name
+    writeStringBinary("default", ba)  # initial_user
+    writeStringBinary(query_id, ba)  # initial_query_id
+    writeStringBinary("127.0.0.1:9000", ba)  # initial_address
+    ba.extend([0] * 8)  # initial_query_start_time_microseconds
+    ba.append(1)  # TCP
+    writeStringBinary("os_user", ba)  # os_user
+    writeStringBinary("client_hostname", ba)  # client_hostname
+    writeStringBinary("client_name", ba)  # client_name
     writeVarUInt(21, ba)
     writeVarUInt(9, ba)
     writeVarUInt(54449, ba)
-    writeStringBinary('', ba) # quota_key
-    writeVarUInt(0, ba) # distributed_depth
-    writeVarUInt(1, ba) # client_version_patch
-    ba.append(0) # No telemetry
+    writeStringBinary("", ba)  # quota_key
+    writeVarUInt(0, ba)  # distributed_depth
+    writeVarUInt(1, ba)  # client_version_patch
+    ba.append(0)  # No telemetry
 
 
 def sendQuery(s, query):
     ba = bytearray()
     query_id = uuid.uuid4().hex
-    writeVarUInt(1, ba) # query
+    writeVarUInt(1, ba)  # query
     writeStringBinary(query_id, ba)
 
-    ba.append(1) # INITIAL_QUERY
+    ba.append(1)  # INITIAL_QUERY
 
     # client info
     serializeClientInfo(ba, query_id)
 
-    writeStringBinary('', ba) # No settings
-    writeStringBinary('', ba) # No interserver secret
-    writeVarUInt(2, ba) # Stage - Complete
-    ba.append(0) # No compression
-    writeStringBinary(query, ba) # query, finally
+    writeStringBinary("", ba)  # No settings
+    writeStringBinary("", ba)  # No interserver secret
+    writeVarUInt(2, ba)  # Stage - Complete
+    ba.append(0)  # No compression
+    writeStringBinary(query, ba)  # query, finally
     s.sendall(ba)
 
 
 def serializeBlockInfo(ba):
-    writeVarUInt(1, ba) # 1
-    ba.append(0) # is_overflows
-    writeVarUInt(2, ba) # 2
-    writeVarUInt(0, ba) # 0
-    ba.extend([0] * 4) # bucket_num
+    writeVarUInt(1, ba)  # 1
+    ba.append(0)  # is_overflows
+    writeVarUInt(2, ba)  # 2
+    writeVarUInt(0, ba)  # 0
+    ba.extend([0] * 4)  # bucket_num
 
 
 def sendEmptyBlock(s):
     ba = bytearray()
-    writeVarUInt(2, ba) # Data
-    writeStringBinary('', ba)
+    writeVarUInt(2, ba)  # Data
+    writeStringBinary("", ba)
     serializeBlockInfo(ba)
-    writeVarUInt(0, ba) # rows
-    writeVarUInt(0, ba) # columns
+    writeVarUInt(0, ba)  # rows
+    writeVarUInt(0, ba)  # columns
     s.sendall(ba)
 
 
 def assertPacket(packet, expected):
-    assert(packet == expected), packet
+    assert packet == expected, packet
 
 
-class Progress():
+class Progress:
     def __init__(self):
         # NOTE: this is done in ctor to initialize __dict__
         self.read_rows = 0
@@ -198,11 +203,12 @@ class Progress():
 
     def __bool__(self):
         return (
-            self.read_rows > 0 or
-            self.read_bytes > 0 or
-            self.total_rows_to_read > 0 or
-            self.written_rows > 0 or
-            self.written_bytes > 0)
+            self.read_rows > 0
+            or self.read_bytes > 0
+            or self.total_rows_to_read > 0
+            or self.written_rows > 0
+            or self.written_bytes > 0
+        )
 
 
 def readProgress(s):
@@ -219,13 +225,14 @@ def readProgress(s):
     progress.readPacket(s)
     return progress
 
+
 def readException(s):
     code = readUInt32(s)
     name = readStringBinary(s)
     text = readStringBinary(s)
-    readStringBinary(s) # trace
-    assertPacket(readUInt8(s), 0) # has_nested
-    return "code {}: {}".format(code, text.replace('DB::Exception:', ''))
+    readStringBinary(s)  # trace
+    assertPacket(readUInt8(s), 0)  # has_nested
+    return "code {}: {}".format(code, text.replace("DB::Exception:", ""))
 
 
 def main():
@@ -236,7 +243,10 @@ def main():
         receiveHello(s)
         # For 1 second sleep and 1000ms of interactive_delay we definitelly should have non zero progress packet.
         # NOTE: interactive_delay=0 cannot be used since in this case CompletedPipelineExecutor will not call cancelled callback.
-        sendQuery(s, "insert into function null('_ Int') select sleep(1) from numbers(2) settings max_block_size=1, interactive_delay=1000")
+        sendQuery(
+            s,
+            "insert into function null('_ Int') select sleep(1) from numbers(2) settings max_block_size=1, interactive_delay=1000",
+        )
 
         # external tables
         sendEmptyBlock(s)
diff --git a/tests/queries/0_stateless/02458_use_structure_from_insertion_table.reference b/tests/queries/0_stateless/02458_use_structure_from_insertion_table.reference
index 0ca28640270..53abb49c4e1 100644
--- a/tests/queries/0_stateless/02458_use_structure_from_insertion_table.reference
+++ b/tests/queries/0_stateless/02458_use_structure_from_insertion_table.reference
@@ -1,9 +1,12 @@
+\N	0
 \N	1
 1	2
 \N	42
 \N	42
 \N	42
 \N	42
+42
+42
 \N
 \N
 \N
diff --git a/tests/queries/0_stateless/02458_use_structure_from_insertion_table.sql b/tests/queries/0_stateless/02458_use_structure_from_insertion_table.sql
index a609dc361fe..97d493fa031 100644
--- a/tests/queries/0_stateless/02458_use_structure_from_insertion_table.sql
+++ b/tests/queries/0_stateless/02458_use_structure_from_insertion_table.sql
@@ -10,7 +10,7 @@ insert into test select * from file(02458_data.jsonl);
 insert into test select x, 1 from file(02458_data.jsonl);
 insert into test select x, y from file(02458_data.jsonl);
 insert into test select x + 1, y from file(02458_data.jsonl); -- {serverError ONLY_NULLS_WHILE_READING_SCHEMA}
-insert into test select x, z from file(02458_data.jsonl); -- {serverError ONLY_NULLS_WHILE_READING_SCHEMA}
+insert into test select x, z from file(02458_data.jsonl);
 
 insert into test select * from file(02458_data.jsoncompacteachrow);
 insert into test select x, 1 from file(02458_data.jsoncompacteachrow); -- {serverError ONLY_NULLS_WHILE_READING_SCHEMA}
@@ -28,8 +28,8 @@ drop table test;
 create table test (x Nullable(UInt32)) engine=Memory();
 insert into test select * from file(02458_data.jsonl);
 insert into test select x from file(02458_data.jsonl);
-insert into test select y from file(02458_data.jsonl); -- {serverError ONLY_NULLS_WHILE_READING_SCHEMA}
-insert into test select y as x from file(02458_data.jsonl); -- {serverError ONLY_NULLS_WHILE_READING_SCHEMA}
+insert into test select y from file(02458_data.jsonl);
+insert into test select y as x from file(02458_data.jsonl);
 
 insert into test select c1 from input() format CSV 1,2; -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
 insert into test select x from input() format JSONEachRow {"x" : null, "y" : 42}
diff --git a/tests/queries/0_stateless/02466_distributed_query_profiler.sql b/tests/queries/0_stateless/02466_distributed_query_profiler.sql
index 9fc2fe7b4bd..171cc2a7563 100644
--- a/tests/queries/0_stateless/02466_distributed_query_profiler.sql
+++ b/tests/queries/0_stateless/02466_distributed_query_profiler.sql
@@ -12,10 +12,4 @@ settings
     -- This is to activate as much signals as possible to trigger EINTR
     query_profiler_real_time_period_ns=1,
     -- This is to use MultiplexedConnections
-    use_hedged_requests=0,
-    -- This is to make the initiator waiting for cancel packet in MultiplexedConnections::getReplicaForReading()
-    --
-    -- NOTE: that even smaller sleep will be enough to trigger this problem
-    -- with 100% probability, however just to make it more reliable, increase
-    -- it to 2 seconds.
-    sleep_in_receive_cancel_ms=2000;
+    use_hedged_requests=0;
diff --git a/tests/queries/0_stateless/02473_multistep_prewhere.python b/tests/queries/0_stateless/02473_multistep_prewhere.python
index 37a7280dac2..a942568233c 100644
--- a/tests/queries/0_stateless/02473_multistep_prewhere.python
+++ b/tests/queries/0_stateless/02473_multistep_prewhere.python
@@ -4,18 +4,19 @@ import os
 import sys
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
 from pure_http_client import ClickHouseClient
 
 
 class Tester:
-    '''
+    """
     - Creates test table
     - Deletes the specified range of rows
     - Masks another range using row-level policy
     - Runs some read queries and checks that the results
-    '''
+    """
+
     def __init__(self, session, url, index_granularity, total_rows):
         self.session = session
         self.url = url
@@ -25,10 +26,10 @@ class Tester:
         self.repro_queries = []
 
     def report_error(self):
-        print('Repro steps:', '\n\n\t'.join(self.repro_queries))
+        print("Repro steps:", "\n\n\t".join(self.repro_queries))
         exit(1)
 
-    def query(self, query_text, include_in_repro_steps = True, expected_data = None):
+    def query(self, query_text, include_in_repro_steps=True, expected_data=None):
         self.repro_queries.append(query_text)
         resp = self.session.post(self.url, data=query_text)
         if resp.status_code != 200:
@@ -36,113 +37,187 @@ class Tester:
             error = resp.text[0:40]
             if error not in self.reported_errors:
                 self.reported_errors.add(error)
-                print('Code:', resp.status_code)
-                print('Result:', resp.text)
+                print("Code:", resp.status_code)
+                print("Result:", resp.text)
                 self.report_error()
 
         result = resp.text
         # Check that the result is as expected
-        if ((not expected_data is None) and (int(result) != len(expected_data))):
-            print('Expected {} rows, got {}'.format(len(expected_data), result))
-            print('Expected data:' + str(expected_data))
+        if (not expected_data is None) and (int(result) != len(expected_data)):
+            print("Expected {} rows, got {}".format(len(expected_data), result))
+            print("Expected data:" + str(expected_data))
             self.report_error()
 
         if not include_in_repro_steps:
             self.repro_queries.pop()
 
-
-    def check_data(self, all_data, delete_range_start, delete_range_end, row_level_policy_range_start, row_level_policy_range_end):
+    def check_data(
+        self,
+        all_data,
+        delete_range_start,
+        delete_range_end,
+        row_level_policy_range_start,
+        row_level_policy_range_end,
+    ):
         all_data_after_delete = all_data[
-            ~((all_data.a == 0) &
-              (all_data.b > delete_range_start) &
-              (all_data.b <= delete_range_end))]
+            ~(
+                (all_data.a == 0)
+                & (all_data.b > delete_range_start)
+                & (all_data.b <= delete_range_end)
+            )
+        ]
         all_data_after_row_policy = all_data_after_delete[
-            (all_data_after_delete.b <= row_level_policy_range_start) |
-            (all_data_after_delete.b > row_level_policy_range_end)]
+            (all_data_after_delete.b <= row_level_policy_range_start)
+            | (all_data_after_delete.b > row_level_policy_range_end)
+        ]
 
-        for to_select in ['count()', 'sum(d)']: # Test reading with and without column with default value
-            self.query('SELECT {} FROM tab_02473;'.format(to_select), False, all_data_after_row_policy)
+        for to_select in [
+            "count()",
+            "sum(d)",
+        ]:  # Test reading with and without column with default value
+            self.query(
+                "SELECT {} FROM tab_02473;".format(to_select),
+                False,
+                all_data_after_row_policy,
+            )
 
             delta = 10
             for query_range_start in [0, delta]:
-                for query_range_end in [self.total_rows - delta]: #, self.total_rows]:
+                for query_range_end in [self.total_rows - delta]:  # , self.total_rows]:
                     expected = all_data_after_row_policy[
-                        (all_data_after_row_policy.a == 0) &
-                        (all_data_after_row_policy.b > query_range_start) &
-                        (all_data_after_row_policy.b <= query_range_end)]
-                    self.query('SELECT {} from tab_02473 PREWHERE b > {} AND b <= {} WHERE a == 0;'.format(
-                        to_select, query_range_start, query_range_end), False, expected)
+                        (all_data_after_row_policy.a == 0)
+                        & (all_data_after_row_policy.b > query_range_start)
+                        & (all_data_after_row_policy.b <= query_range_end)
+                    ]
+                    self.query(
+                        "SELECT {} from tab_02473 PREWHERE b > {} AND b <= {} WHERE a == 0;".format(
+                            to_select, query_range_start, query_range_end
+                        ),
+                        False,
+                        expected,
+                    )
 
                     expected = all_data_after_row_policy[
-                        (all_data_after_row_policy.a == 0) &
-                        (all_data_after_row_policy.c > query_range_start) &
-                        (all_data_after_row_policy.c <= query_range_end)]
-                    self.query('SELECT {} from tab_02473 PREWHERE c > {} AND c <= {} WHERE a == 0;'.format(
-                        to_select, query_range_start, query_range_end), False, expected)
+                        (all_data_after_row_policy.a == 0)
+                        & (all_data_after_row_policy.c > query_range_start)
+                        & (all_data_after_row_policy.c <= query_range_end)
+                    ]
+                    self.query(
+                        "SELECT {} from tab_02473 PREWHERE c > {} AND c <= {} WHERE a == 0;".format(
+                            to_select, query_range_start, query_range_end
+                        ),
+                        False,
+                        expected,
+                    )
 
                     expected = all_data_after_row_policy[
-                        (all_data_after_row_policy.a == 0) &
-                        ((all_data_after_row_policy.c <= query_range_start) |
-                         (all_data_after_row_policy.c > query_range_end))]
-                    self.query('SELECT {} from tab_02473 PREWHERE c <= {} OR c > {} WHERE a == 0;'.format(
-                        to_select, query_range_start, query_range_end), False, expected)
+                        (all_data_after_row_policy.a == 0)
+                        & (
+                            (all_data_after_row_policy.c <= query_range_start)
+                            | (all_data_after_row_policy.c > query_range_end)
+                        )
+                    ]
+                    self.query(
+                        "SELECT {} from tab_02473 PREWHERE c <= {} OR c > {} WHERE a == 0;".format(
+                            to_select, query_range_start, query_range_end
+                        ),
+                        False,
+                        expected,
+                    )
 
-
-    def run_test(self, delete_range_start, delete_range_end, row_level_policy_range_start, row_level_policy_range_end):
+    def run_test(
+        self,
+        delete_range_start,
+        delete_range_end,
+        row_level_policy_range_start,
+        row_level_policy_range_end,
+    ):
         self.repro_queries = []
 
-        self.query('''
+        self.query(
+            """
             CREATE TABLE tab_02473 (a Int8, b Int32, c Int32, PRIMARY KEY (a))
             ENGINE = MergeTree() ORDER BY (a, b)
-            SETTINGS min_bytes_for_wide_part = 0, index_granularity = {};'''.format(self.index_granularity))
+            SETTINGS min_bytes_for_wide_part = 0, index_granularity = {};""".format(
+                self.index_granularity
+            )
+        )
 
-        self.query('INSERT INTO tab_02473 select 0, number+1, number+1 FROM numbers({});'.format(self.total_rows))
+        self.query(
+            "INSERT INTO tab_02473 select 0, number+1, number+1 FROM numbers({});".format(
+                self.total_rows
+            )
+        )
 
         client = ClickHouseClient()
-        all_data = client.query_return_df("SELECT a, b, c, 1 as d FROM tab_02473 FORMAT TabSeparatedWithNames;")
+        all_data = client.query_return_df(
+            "SELECT a, b, c, 1 as d FROM tab_02473 FORMAT TabSeparatedWithNames;"
+        )
 
-        self.query('OPTIMIZE TABLE tab_02473 FINAL SETTINGS mutations_sync=2;')
+        self.query("OPTIMIZE TABLE tab_02473 FINAL SETTINGS mutations_sync=2;")
 
         # After all data has been written add a column with default value
-        self.query('ALTER TABLE tab_02473 ADD COLUMN d Int64 DEFAULT 1;')
+        self.query("ALTER TABLE tab_02473 ADD COLUMN d Int64 DEFAULT 1;")
 
         self.check_data(all_data, -100, -100, -100, -100)
 
-        self.query('DELETE FROM tab_02473 WHERE a = 0 AND b > {} AND b <= {};'.format(
-            delete_range_start, delete_range_end))
+        self.query(
+            "DELETE FROM tab_02473 WHERE a = 0 AND b > {} AND b <= {};".format(
+                delete_range_start, delete_range_end
+            )
+        )
 
         self.check_data(all_data, delete_range_start, delete_range_end, -100, -100)
 
-        self.query('CREATE ROW POLICY policy_tab_02473 ON tab_02473 FOR SELECT USING b <= {} OR b > {} TO default;'.format(
-            row_level_policy_range_start, row_level_policy_range_end))
+        self.query(
+            "CREATE ROW POLICY policy_tab_02473 ON tab_02473 FOR SELECT USING b <= {} OR b > {} TO default;".format(
+                row_level_policy_range_start, row_level_policy_range_end
+            )
+        )
 
-        self.check_data(all_data, delete_range_start, delete_range_end, row_level_policy_range_start, row_level_policy_range_end)
+        self.check_data(
+            all_data,
+            delete_range_start,
+            delete_range_end,
+            row_level_policy_range_start,
+            row_level_policy_range_end,
+        )
 
-        self.query('DROP POLICY policy_tab_02473 ON tab_02473;')
-
-        self.query('DROP TABLE tab_02473;')
+        self.query("DROP POLICY policy_tab_02473 ON tab_02473;")
 
+        self.query("DROP TABLE tab_02473;")
 
 
 def main():
     # Set mutations to synchronous mode and enable lightweight DELETE's
-    url = os.environ['CLICKHOUSE_URL'] + '&max_threads=1'
+    url = os.environ["CLICKHOUSE_URL"] + "&max_threads=1"
 
-    default_index_granularity = 10;
+    default_index_granularity = 10
     total_rows = 8 * default_index_granularity
     step = default_index_granularity
     session = requests.Session()
-    for index_granularity in [default_index_granularity-1, default_index_granularity]: # [default_index_granularity-1, default_index_granularity+1, default_index_granularity]:
+    for index_granularity in [
+        default_index_granularity - 1,
+        default_index_granularity,
+    ]:  # [default_index_granularity-1, default_index_granularity+1, default_index_granularity]:
         tester = Tester(session, url, index_granularity, total_rows)
         # Test combinations of ranges of various size masked by lightweight DELETES
         # along with ranges of various size masked by row-level policies
         for delete_range_start in range(0, total_rows, 3 * step):
-            for delete_range_end in range(delete_range_start + 3 * step, total_rows, 2 * step):
+            for delete_range_end in range(
+                delete_range_start + 3 * step, total_rows, 2 * step
+            ):
                 for row_level_policy_range_start in range(0, total_rows, 3 * step):
-                    for row_level_policy_range_end in range(row_level_policy_range_start + 3 * step, total_rows, 2 * step):
-                        tester.run_test(delete_range_start, delete_range_end, row_level_policy_range_start, row_level_policy_range_end)
+                    for row_level_policy_range_end in range(
+                        row_level_policy_range_start + 3 * step, total_rows, 2 * step
+                    ):
+                        tester.run_test(
+                            delete_range_start,
+                            delete_range_end,
+                            row_level_policy_range_start,
+                            row_level_policy_range_end,
+                        )
 
 
 if __name__ == "__main__":
     main()
-
diff --git a/tests/queries/0_stateless/02473_multistep_split_prewhere.python b/tests/queries/0_stateless/02473_multistep_split_prewhere.python
index 41d8a746e11..19444994fd2 100644
--- a/tests/queries/0_stateless/02473_multistep_split_prewhere.python
+++ b/tests/queries/0_stateless/02473_multistep_split_prewhere.python
@@ -4,16 +4,17 @@ import os
 import sys
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
 from pure_http_client import ClickHouseClient
 
 
 class Tester:
-    '''
+    """
     - Creates test table with multiple integer columns
     - Runs read queries with multiple range conditions on different columns in PREWHERE and check that the result is correct
-    '''
+    """
+
     def __init__(self, session, url, index_granularity, total_rows):
         self.session = session
         self.url = url
@@ -23,10 +24,10 @@ class Tester:
         self.repro_queries = []
 
     def report_error(self):
-        print('Repro steps:', '\n\n\t'.join(self.repro_queries))
+        print("Repro steps:", "\n\n\t".join(self.repro_queries))
         exit(1)
 
-    def query(self, query_text, include_in_repro_steps = True, expected_data = None):
+    def query(self, query_text, include_in_repro_steps=True, expected_data=None):
         self.repro_queries.append(query_text)
         resp = self.session.post(self.url, data=query_text)
         if resp.status_code != 200:
@@ -34,98 +35,150 @@ class Tester:
             error = resp.text[0:40]
             if error not in self.reported_errors:
                 self.reported_errors.add(error)
-                print('Code:', resp.status_code)
-                print('Result:', resp.text)
+                print("Code:", resp.status_code)
+                print("Result:", resp.text)
                 self.report_error()
 
         result = resp.text
         # Check that the result is as expected
-        if ((not expected_data is None) and (int(result) != len(expected_data))):
-            print('Expected {} rows, got {}'.format(len(expected_data), result))
-            print('Expected data:' + str(expected_data))
+        if (not expected_data is None) and (int(result) != len(expected_data)):
+            print("Expected {} rows, got {}".format(len(expected_data), result))
+            print("Expected data:" + str(expected_data))
             self.report_error()
 
         if not include_in_repro_steps:
             self.repro_queries.pop()
 
-
-    def check_data(self, all_data, c_range_start, c_range_end, d_range_start, d_range_end):
-        for to_select in ['count()', 'sum(e)']: # Test reading with and without column with default value
-            self.query('SELECT {} FROM tab_02473;'.format(to_select), False, all_data)
+    def check_data(
+        self, all_data, c_range_start, c_range_end, d_range_start, d_range_end
+    ):
+        for to_select in [
+            "count()",
+            "sum(e)",
+        ]:  # Test reading with and without column with default value
+            self.query("SELECT {} FROM tab_02473;".format(to_select), False, all_data)
 
             delta = 10
             for b_range_start in [0, delta]:
-                for b_range_end in [self.total_rows - delta]: #, self.total_rows]:
+                for b_range_end in [self.total_rows - delta]:  # , self.total_rows]:
                     expected = all_data[
-                        (all_data.a == 0) &
-                        (all_data.b > b_range_start) &
-                        (all_data.b <= b_range_end)]
-                    self.query('SELECT {} from tab_02473 PREWHERE b > {} AND b <= {} WHERE a == 0;'.format(
-                        to_select, b_range_start, b_range_end), False, expected)
+                        (all_data.a == 0)
+                        & (all_data.b > b_range_start)
+                        & (all_data.b <= b_range_end)
+                    ]
+                    self.query(
+                        "SELECT {} from tab_02473 PREWHERE b > {} AND b <= {} WHERE a == 0;".format(
+                            to_select, b_range_start, b_range_end
+                        ),
+                        False,
+                        expected,
+                    )
 
                     expected = all_data[
-                        (all_data.a == 0) &
-                        (all_data.b > b_range_start) &
-                        (all_data.b <= b_range_end) &
-                        (all_data.c > c_range_start) &
-                        (all_data.c <= c_range_end)]
-                    self.query('SELECT {} from tab_02473 PREWHERE b > {} AND b <= {} AND c > {} AND c <= {} WHERE a == 0;'.format(
-                        to_select, b_range_start, b_range_end, c_range_start, c_range_end), False, expected)
+                        (all_data.a == 0)
+                        & (all_data.b > b_range_start)
+                        & (all_data.b <= b_range_end)
+                        & (all_data.c > c_range_start)
+                        & (all_data.c <= c_range_end)
+                    ]
+                    self.query(
+                        "SELECT {} from tab_02473 PREWHERE b > {} AND b <= {} AND c > {} AND c <= {} WHERE a == 0;".format(
+                            to_select,
+                            b_range_start,
+                            b_range_end,
+                            c_range_start,
+                            c_range_end,
+                        ),
+                        False,
+                        expected,
+                    )
 
                     expected = all_data[
-                        (all_data.a == 0) &
-                        (all_data.b > b_range_start) &
-                        (all_data.b <= b_range_end) &
-                        (all_data.c > c_range_start) &
-                        (all_data.c <= c_range_end) &
-                        (all_data.d > d_range_start) &
-                        (all_data.d <= d_range_end)]
-                    self.query('SELECT {} from tab_02473 PREWHERE b > {} AND b <= {} AND c > {} AND c <= {} AND d > {} AND d <= {} WHERE a == 0;'.format(
-                        to_select, b_range_start, b_range_end, c_range_start, c_range_end, d_range_start, d_range_end), False, expected)
-
+                        (all_data.a == 0)
+                        & (all_data.b > b_range_start)
+                        & (all_data.b <= b_range_end)
+                        & (all_data.c > c_range_start)
+                        & (all_data.c <= c_range_end)
+                        & (all_data.d > d_range_start)
+                        & (all_data.d <= d_range_end)
+                    ]
+                    self.query(
+                        "SELECT {} from tab_02473 PREWHERE b > {} AND b <= {} AND c > {} AND c <= {} AND d > {} AND d <= {} WHERE a == 0;".format(
+                            to_select,
+                            b_range_start,
+                            b_range_end,
+                            c_range_start,
+                            c_range_end,
+                            d_range_start,
+                            d_range_end,
+                        ),
+                        False,
+                        expected,
+                    )
 
     def run_test(self, c_range_start, c_range_end, d_range_start, d_range_end):
         self.repro_queries = []
 
-        self.query('''
+        self.query(
+            """
             CREATE TABLE tab_02473 (a Int8, b Int32, c Int32, d Int32, PRIMARY KEY (a))
             ENGINE = MergeTree() ORDER BY (a, b)
-            SETTINGS min_bytes_for_wide_part = 0, index_granularity = {};'''.format(self.index_granularity))
+            SETTINGS min_bytes_for_wide_part = 0, index_granularity = {};""".format(
+                self.index_granularity
+            )
+        )
 
-        self.query('INSERT INTO tab_02473 select 0, number+1, number+1, number+1 FROM numbers({});'.format(self.total_rows))
+        self.query(
+            "INSERT INTO tab_02473 select 0, number+1, number+1, number+1 FROM numbers({});".format(
+                self.total_rows
+            )
+        )
 
         client = ClickHouseClient()
-        all_data = client.query_return_df("SELECT a, b, c, d, 1 as e FROM tab_02473 FORMAT TabSeparatedWithNames;")
+        all_data = client.query_return_df(
+            "SELECT a, b, c, d, 1 as e FROM tab_02473 FORMAT TabSeparatedWithNames;"
+        )
 
-        self.query('OPTIMIZE TABLE tab_02473 FINAL SETTINGS mutations_sync=2;')
+        self.query("OPTIMIZE TABLE tab_02473 FINAL SETTINGS mutations_sync=2;")
 
         # After all data has been written add a column with default value
-        self.query('ALTER TABLE tab_02473 ADD COLUMN e Int64 DEFAULT 1;')
+        self.query("ALTER TABLE tab_02473 ADD COLUMN e Int64 DEFAULT 1;")
 
-        self.check_data(all_data, c_range_start, c_range_end, d_range_start, d_range_end)
-
-        self.query('DROP TABLE tab_02473;')
+        self.check_data(
+            all_data, c_range_start, c_range_end, d_range_start, d_range_end
+        )
 
+        self.query("DROP TABLE tab_02473;")
 
 
 def main():
     # Enable multiple prewhere read steps
-    url = os.environ['CLICKHOUSE_URL'] + '&enable_multiple_prewhere_read_steps=1&move_all_conditions_to_prewhere=0&max_threads=1'
+    url = (
+        os.environ["CLICKHOUSE_URL"]
+        + "&enable_multiple_prewhere_read_steps=1&move_all_conditions_to_prewhere=0&max_threads=1"
+    )
 
-    default_index_granularity = 10;
+    default_index_granularity = 10
     total_rows = 8 * default_index_granularity
     step = default_index_granularity
     session = requests.Session()
-    for index_granularity in [default_index_granularity-1, default_index_granularity]:
+    for index_granularity in [default_index_granularity - 1, default_index_granularity]:
         tester = Tester(session, url, index_granularity, total_rows)
         # Test combinations of ranges of columns c and d
         for c_range_start in range(0, total_rows, int(2.3 * step)):
-            for c_range_end in range(c_range_start + 3 * step, total_rows, int(2.1 * step)):
-                for d_range_start in range(int(0.5 * step), total_rows, int(2.7 * step)):
-                    for d_range_end in range(d_range_start + 3 * step, total_rows, int(2.2 * step)):
-                        tester.run_test(c_range_start, c_range_end, d_range_start, d_range_end)
+            for c_range_end in range(
+                c_range_start + 3 * step, total_rows, int(2.1 * step)
+            ):
+                for d_range_start in range(
+                    int(0.5 * step), total_rows, int(2.7 * step)
+                ):
+                    for d_range_end in range(
+                        d_range_start + 3 * step, total_rows, int(2.2 * step)
+                    ):
+                        tester.run_test(
+                            c_range_start, c_range_end, d_range_start, d_range_end
+                        )
 
 
 if __name__ == "__main__":
     main()
-
diff --git a/tests/queries/0_stateless/02473_optimize_old_parts.reference b/tests/queries/0_stateless/02473_optimize_old_parts.reference
index 9002d73ff27..7d08cd5bbef 100644
--- a/tests/queries/0_stateless/02473_optimize_old_parts.reference
+++ b/tests/queries/0_stateless/02473_optimize_old_parts.reference
@@ -4,9 +4,4 @@ With merge any part range
 1
 With merge partition only
 1
-With merge replicated any part range
 1
-With merge replicated partition only
-1
-With merge partition only and new parts
-3
diff --git a/tests/queries/0_stateless/02473_optimize_old_parts.sh b/tests/queries/0_stateless/02473_optimize_old_parts.sh
new file mode 100755
index 00000000000..0c2dd04d024
--- /dev/null
+++ b/tests/queries/0_stateless/02473_optimize_old_parts.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Wait for number of parts in table $1 to become $2.
+# Print the changed value. If no changes for $3 seconds, prints initial value.
+wait_for_number_of_parts() {
+    for _ in `seq $3`
+    do
+        sleep 1
+        res=`$CLICKHOUSE_CLIENT -q "SELECT count(*) FROM system.parts WHERE database = currentDatabase() AND table='$1' AND active"`
+        if [ "$res" -eq "$2" ]
+        then
+            echo "$res"
+            return
+        fi
+    done
+    echo "$res"
+}
+
+$CLICKHOUSE_CLIENT -nmq "
+DROP TABLE IF EXISTS test_without_merge;
+DROP TABLE IF EXISTS test_with_merge;
+
+SELECT 'Without merge';
+
+CREATE TABLE test_without_merge (i Int64) ENGINE = MergeTree ORDER BY i SETTINGS merge_selecting_sleep_ms=1000;
+INSERT INTO test_without_merge SELECT 1;
+INSERT INTO test_without_merge SELECT 2;
+INSERT INTO test_without_merge SELECT 3;"
+
+wait_for_number_of_parts 'test_without_merge' 1 10
+
+$CLICKHOUSE_CLIENT -nmq "
+DROP TABLE test_without_merge;
+
+SELECT 'With merge any part range';
+
+CREATE TABLE test_with_merge (i Int64) ENGINE = MergeTree ORDER BY i
+SETTINGS min_age_to_force_merge_seconds=1, merge_selecting_sleep_ms=1000, min_age_to_force_merge_on_partition_only=false;
+INSERT INTO test_with_merge SELECT 1;
+INSERT INTO test_with_merge SELECT 2;
+INSERT INTO test_with_merge SELECT 3;"
+
+wait_for_number_of_parts 'test_with_merge' 1 100
+
+$CLICKHOUSE_CLIENT -nmq "
+DROP TABLE test_with_merge;
+
+SELECT 'With merge partition only';
+
+CREATE TABLE test_with_merge (i Int64) ENGINE = MergeTree ORDER BY i
+SETTINGS min_age_to_force_merge_seconds=1, merge_selecting_sleep_ms=1000, min_age_to_force_merge_on_partition_only=true;
+INSERT INTO test_with_merge SELECT 1;
+INSERT INTO test_with_merge SELECT 2;
+INSERT INTO test_with_merge SELECT 3;"
+
+wait_for_number_of_parts 'test_with_merge' 1 100
+
+$CLICKHOUSE_CLIENT -nmq "
+SELECT sleepEachRow(1) FROM numbers(9) FORMAT Null; -- Sleep for 9 seconds and verify that we keep the old part because it's the only one
+SELECT (now() - modification_time) > 5 FROM system.parts WHERE database = currentDatabase() AND table='test_with_merge' AND active;
+
+DROP TABLE test_with_merge;"
diff --git a/tests/queries/0_stateless/02473_optimize_old_parts.sql b/tests/queries/0_stateless/02473_optimize_old_parts.sql
deleted file mode 100644
index c2bd37033c1..00000000000
--- a/tests/queries/0_stateless/02473_optimize_old_parts.sql
+++ /dev/null
@@ -1,87 +0,0 @@
--- Tags: long
-
-DROP TABLE IF EXISTS test_without_merge;
-DROP TABLE IF EXISTS test_with_merge;
-DROP TABLE IF EXISTS test_replicated;
-
-SELECT 'Without merge';
-
-CREATE TABLE test_without_merge (i Int64) ENGINE = MergeTree ORDER BY i;
-INSERT INTO test_without_merge SELECT 1;
-INSERT INTO test_without_merge SELECT 2;
-INSERT INTO test_without_merge SELECT 3;
-
-SELECT sleepEachRow(1) FROM numbers(9) FORMAT Null;
-SELECT count(*) FROM system.parts WHERE database = currentDatabase() AND table='test_without_merge' AND active;
-
-DROP TABLE test_without_merge;
-
-SELECT 'With merge any part range';
-
-CREATE TABLE test_with_merge (i Int64) ENGINE = MergeTree ORDER BY i
-SETTINGS min_age_to_force_merge_seconds=3, min_age_to_force_merge_on_partition_only=false;
-INSERT INTO test_with_merge SELECT 1;
-INSERT INTO test_with_merge SELECT 2;
-INSERT INTO test_with_merge SELECT 3;
-
-SELECT sleepEachRow(1) FROM numbers(9) FORMAT Null;
-SELECT count(*) FROM system.parts WHERE database = currentDatabase() AND table='test_with_merge' AND active;
-
-DROP TABLE test_with_merge;
-
-SELECT 'With merge partition only';
-
-CREATE TABLE test_with_merge (i Int64) ENGINE = MergeTree ORDER BY i
-SETTINGS min_age_to_force_merge_seconds=3, min_age_to_force_merge_on_partition_only=true;
-INSERT INTO test_with_merge SELECT 1;
-INSERT INTO test_with_merge SELECT 2;
-INSERT INTO test_with_merge SELECT 3;
-
-SELECT sleepEachRow(1) FROM numbers(9) FORMAT Null;
-SELECT count(*) FROM system.parts WHERE database = currentDatabase() AND table='test_with_merge' AND active;
-
-DROP TABLE test_with_merge;
-
-SELECT 'With merge replicated any part range';
-
-CREATE TABLE test_replicated (i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test02473', 'node')  ORDER BY i
-SETTINGS min_age_to_force_merge_seconds=3, min_age_to_force_merge_on_partition_only=false;
-INSERT INTO test_replicated SELECT 1;
-INSERT INTO test_replicated SELECT 2;
-INSERT INTO test_replicated SELECT 3;
-
-SELECT sleepEachRow(1) FROM numbers(9) FORMAT Null;
-SELECT count(*) FROM system.parts WHERE database = currentDatabase() AND table='test_replicated' AND active;
-
-DROP TABLE test_replicated;
-
-SELECT 'With merge replicated partition only';
-
-CREATE TABLE test_replicated (i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test02473_partition_only', 'node')  ORDER BY i
-SETTINGS min_age_to_force_merge_seconds=3, min_age_to_force_merge_on_partition_only=true;
-INSERT INTO test_replicated SELECT 1;
-INSERT INTO test_replicated SELECT 2;
-INSERT INTO test_replicated SELECT 3;
-
-SELECT sleepEachRow(1) FROM numbers(9) FORMAT Null;
-SELECT count(*) FROM system.parts WHERE database = currentDatabase() AND table='test_replicated' AND active;
-
-DROP TABLE test_replicated;
-
-SELECT 'With merge partition only and new parts';
-
-CREATE TABLE test_with_merge (i Int64) ENGINE = MergeTree ORDER BY i
-SETTINGS min_age_to_force_merge_seconds=3, min_age_to_force_merge_on_partition_only=true;
-SYSTEM STOP MERGES test_with_merge;
--- These three parts will have min_age=6 at the time of merge
-INSERT INTO test_with_merge SELECT 1;
-INSERT INTO test_with_merge SELECT 2;
-SELECT sleepEachRow(1) FROM numbers(9) FORMAT Null;
--- These three parts will have min_age=0 at the time of merge
--- and so, nothing will be merged.
-INSERT INTO test_with_merge SELECT 3;
-SYSTEM START MERGES test_with_merge;
-
-SELECT count(*) FROM system.parts WHERE database = currentDatabase() AND table='test_with_merge' AND active;
-
-DROP TABLE test_with_merge;
diff --git a/tests/queries/0_stateless/02475_bson_each_row_format.reference b/tests/queries/0_stateless/02475_bson_each_row_format.reference
index 5922167dc97..f90867d92b1 100644
--- a/tests/queries/0_stateless/02475_bson_each_row_format.reference
+++ b/tests/queries/0_stateless/02475_bson_each_row_format.reference
@@ -121,7 +121,7 @@ Nullable
 2
 0
 4
-FAIL
+OK
 null	Nullable(Int64)					
 0
 \N
@@ -191,8 +191,11 @@ tuple	Tuple(Nullable(Int64), Nullable(String))
 (3,'Hello')
 (4,'Hello')
 Map
-OK
-OK
+{1:0,2:1}
+{1:1,2:2}
+{1:2,2:3}
+{1:3,2:4}
+{1:4,2:5}
 {'a':0,'b':1}
 {'a':1,'b':2}
 {'a':2,'b':3}
diff --git a/tests/queries/0_stateless/02475_bson_each_row_format.sh b/tests/queries/0_stateless/02475_bson_each_row_format.sh
index b4efea7e326..aa58d27fa50 100755
--- a/tests/queries/0_stateless/02475_bson_each_row_format.sh
+++ b/tests/queries/0_stateless/02475_bson_each_row_format.sh
@@ -88,7 +88,7 @@ echo "Nullable"
 $CLICKHOUSE_CLIENT -q "insert into function file(02475_data.bsonEachRow, auto, 'null Nullable(UInt32)') select number % 2 ? NULL : number from numbers(5) settings engine_file_truncate_on_insert=1"
 $CLICKHOUSE_CLIENT -q "select * from file(02475_data.bsonEachRow, auto, 'null Nullable(UInt32)')"
 $CLICKHOUSE_CLIENT -q "select * from file(02475_data.bsonEachRow, auto, 'null UInt32')"
-$CLICKHOUSE_CLIENT -q "select * from file(02475_data.bsonEachRow, auto, 'null UInt32') settings input_format_null_as_default=0" 2>&1 | grep -q -F "INCORRECT_DATA" && echo "OK" || echo "FAIL"
+$CLICKHOUSE_CLIENT -q "select * from file(02475_data.bsonEachRow, auto, 'null UInt32') settings input_format_null_as_default=0" 2>&1 | grep -q -F "ILLEGAL_COLUMN" && echo "OK" || echo "FAIL"
 
 $CLICKHOUSE_CLIENT -q "desc file(02475_data.bsonEachRow)"
 $CLICKHOUSE_CLIENT -q "select * from file(02475_data.bsonEachRow)"
@@ -132,10 +132,10 @@ $CLICKHOUSE_CLIENT -q "select * from file(02475_data.bsonEachRow)"
 
 
 echo "Map"
-$CLICKHOUSE_CLIENT -q "insert into function file(02475_data.bsonEachRow, auto, 'map Map(UInt64, UInt64)') select map(1, number, 2, number + 1) from numbers(5) settings engine_file_truncate_on_insert=1" 2>&1 | grep -q -F "ILLEGAL_COLUMN" && echo "OK" || echo "FAIL"
-$CLICKHOUSE_CLIENT -q "insert into function file(02475_data.bsonEachRow, auto, 'map Map(String, UInt64)') select map('a', number, 'b', number + 1) from numbers(5) settings engine_file_truncate_on_insert=1"
+$CLICKHOUSE_CLIENT -q "insert into function file(02475_data.bsonEachRow, auto, 'map Map(UInt64, UInt64)') select map(1, number, 2, number + 1) from numbers(5) settings engine_file_truncate_on_insert=1"
+$CLICKHOUSE_CLIENT -q "select * from file(02475_data.bsonEachRow, auto, 'map Map(UInt64, UInt64)')"
 
-$CLICKHOUSE_CLIENT -q "select * from file(02475_data.bsonEachRow, auto, 'map Map(UInt64, UInt64)')" 2>&1 | grep -q -F "ILLEGAL_COLUMN" && echo "OK" || echo "FAIL"
+$CLICKHOUSE_CLIENT -q "insert into function file(02475_data.bsonEachRow, auto, 'map Map(String, UInt64)') select map('a', number, 'b', number + 1) from numbers(5) settings engine_file_truncate_on_insert=1"
 $CLICKHOUSE_CLIENT -q "select * from file(02475_data.bsonEachRow, auto, 'map Map(String, UInt64)')"
 
 $CLICKHOUSE_CLIENT -q "desc file(02475_data.bsonEachRow)"
diff --git a/tests/queries/0_stateless/02476_analyzer_identifier_hints.sh b/tests/queries/0_stateless/02476_analyzer_identifier_hints.sh
index cd99d1fbd02..0702c146426 100755
--- a/tests/queries/0_stateless/02476_analyzer_identifier_hints.sh
+++ b/tests/queries/0_stateless/02476_analyzer_identifier_hints.sh
@@ -174,6 +174,15 @@ $CLICKHOUSE_CLIENT -q "SELECT t1.value_ FROM test_table_1 AS t1 INNER JOIN test_
 $CLICKHOUSE_CLIENT -q "SELECT t2.value_ FROM test_table_1 AS t1 INNER JOIN test_table_2 AS t2 ON t1.id = t2.id SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['t2.value'\]" &>/dev/null;
 
+$CLICKHOUSE_CLIENT -q "SELECT [1] AS a, a.size1 SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
+    | grep "Maybe you meant: \['a.size0'\]" &>/dev/null;
+
+$CLICKHOUSE_CLIENT -q "SELECT ((1))::Tuple(a Tuple(b UInt32)) AS t, t.c SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
+    | grep "Maybe you meant: \['t.a'\]" &>/dev/null;
+
+$CLICKHOUSE_CLIENT -q "SELECT ((1))::Tuple(a Tuple(b UInt32)) AS t, t.a.c SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
+    | grep "Maybe you meant: \['t.a.b'\]" &>/dev/null;
+
 $CLICKHOUSE_CLIENT -q "SELECT 1";
 
 $CLICKHOUSE_CLIENT -n -q "
diff --git a/tests/queries/0_stateless/02477_age.reference b/tests/queries/0_stateless/02477_age.reference
index 249c413d923..4afe3df8ad8 100644
--- a/tests/queries/0_stateless/02477_age.reference
+++ b/tests/queries/0_stateless/02477_age.reference
@@ -37,7 +37,7 @@ Constant and non-constant arguments
 -524160
 1440
 Case insensitive
--10
+-1
 Dependance of timezones
 0
 0
diff --git a/tests/queries/0_stateless/02477_age.sql b/tests/queries/0_stateless/02477_age.sql
index 9b612276b01..72a692f61d0 100644
--- a/tests/queries/0_stateless/02477_age.sql
+++ b/tests/queries/0_stateless/02477_age.sql
@@ -45,7 +45,7 @@ SELECT age('minute', materialize(toDate('2017-12-31')), materialize(toDate('2018
 
 SELECT 'Case insensitive';
 
-SELECT age('year', today(), today() - INTERVAL 10 YEAR);
+SELECT age('YeAr', toDate('2017-12-31'), toDate('2016-01-01'));
 
 SELECT 'Dependance of timezones';
 
diff --git a/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.reference b/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.reference
index dcfcac737c3..84589668d64 100644
--- a/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.reference
+++ b/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.reference
@@ -1,6 +1,62 @@
 SELECT a
 FROM t_logical_expressions_optimizer_low_cardinality
 WHERE a IN (\'x\', \'y\')
+QUERY id: 0
+  PROJECTION COLUMNS
+    a LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      COLUMN id: 2, column_name: a, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.t_logical_expressions_optimizer_low_cardinality
+  WHERE
+    FUNCTION id: 4, function_name: in, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 5, nodes: 2
+          COLUMN id: 2, column_name: a, result_type: LowCardinality(String), source_id: 3
+          CONSTANT id: 6, constant_value: Tuple_(\'x\', \'y\'), constant_value_type: Tuple(String, String)
+  SETTINGS allow_experimental_analyzer=1
+SELECT a
+FROM t_logical_expressions_optimizer_low_cardinality
+WHERE (a = \'x\') OR (\'y\' = a)
+QUERY id: 0
+  PROJECTION COLUMNS
+    a LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      COLUMN id: 2, column_name: a, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.t_logical_expressions_optimizer_low_cardinality
+  WHERE
+    FUNCTION id: 4, function_name: in, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 5, nodes: 2
+          COLUMN id: 2, column_name: a, result_type: LowCardinality(String), source_id: 3
+          CONSTANT id: 6, constant_value: Tuple_(\'x\', \'y\'), constant_value_type: Tuple(String, String)
+  SETTINGS allow_experimental_analyzer=1
 SELECT a
 FROM t_logical_expressions_optimizer_low_cardinality
 WHERE (b = 0) OR (b = 1)
+QUERY id: 0
+  PROJECTION COLUMNS
+    a LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      COLUMN id: 2, column_name: a, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.t_logical_expressions_optimizer_low_cardinality
+  WHERE
+    FUNCTION id: 4, function_name: or, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 5, nodes: 2
+          FUNCTION id: 6, function_name: equals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 7, nodes: 2
+                COLUMN id: 8, column_name: b, result_type: UInt32, source_id: 3
+                CONSTANT id: 9, constant_value: UInt64_0, constant_value_type: UInt8
+          FUNCTION id: 10, function_name: equals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 11, nodes: 2
+                COLUMN id: 8, column_name: b, result_type: UInt32, source_id: 3
+                CONSTANT id: 12, constant_value: UInt64_1, constant_value_type: UInt8
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.sql b/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.sql
index be355a05675..14f8ad830e7 100644
--- a/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.sql
+++ b/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.sql
@@ -4,7 +4,11 @@ CREATE TABLE t_logical_expressions_optimizer_low_cardinality (a LowCardinality(S
 
 -- LowCardinality case, ignore optimize_min_equality_disjunction_chain_length limit, optimzer applied
 EXPLAIN SYNTAX SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a = 'x' OR a = 'y';
+EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a = 'x' OR a = 'y' SETTINGS allow_experimental_analyzer = 1;
+EXPLAIN SYNTAX SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a = 'x' OR 'y' = a;
+EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a = 'x' OR 'y' = a SETTINGS allow_experimental_analyzer = 1;
 -- Non-LowCardinality case, optimizer not applied for short chains
 EXPLAIN SYNTAX SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE b = 0 OR b = 1;
+EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE b = 0 OR b = 1 SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE t_logical_expressions_optimizer_low_cardinality;
diff --git a/tests/queries/0_stateless/02477_projection_materialize_and_zero_copy.sql b/tests/queries/0_stateless/02477_projection_materialize_and_zero_copy.sql
index d4c24b31da2..1845919890c 100644
--- a/tests/queries/0_stateless/02477_projection_materialize_and_zero_copy.sql
+++ b/tests/queries/0_stateless/02477_projection_materialize_and_zero_copy.sql
@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS t;
 
 create table t (c1 Int64, c2 String, c3 DateTime, c4 Int8, c5 String, c6 String, c7 String, c8 String, c9 String, c10 String, c11 String, c12 String, c13 Int8, c14 Int64, c15 String, c16 String, c17 String, c18 Int64, c19 Int64, c20 Int64) engine ReplicatedMergeTree('/clickhouse/test/{database}/test_02477', '1') order by c18
-SETTINGS allow_remote_fs_zero_copy_replication=1;
+SETTINGS allow_remote_fs_zero_copy_replication=1, index_granularity=8092, index_granularity_bytes='10Mi';
 
 insert into t (c1, c18) select number, -number from numbers(2000000);
 
diff --git a/tests/queries/0_stateless/02478_projection_with_group_by_alter.reference b/tests/queries/0_stateless/02478_projection_with_group_by_alter.reference
index 6ad2c8ec8db..0755be238e3 100644
--- a/tests/queries/0_stateless/02478_projection_with_group_by_alter.reference
+++ b/tests/queries/0_stateless/02478_projection_with_group_by_alter.reference
@@ -13,7 +13,7 @@ SELECT c FROM testing ORDER BY e, d;
 4
 1
 3
--- update all colums used by proj_1
+-- update all columns used by proj_1
 ALTER TABLE testing UPDATE c = c+1, d = d+2 WHERE True SETTINGS mutations_sync=2;
 SELECT * FROM system.mutations WHERE database = currentDatabase() AND table = 'testing' AND not is_done;
 SELECT c FROM testing ORDER BY d;
diff --git a/tests/queries/0_stateless/02478_projection_with_group_by_alter.sql b/tests/queries/0_stateless/02478_projection_with_group_by_alter.sql
index 9ed644fd7da..600d37956a9 100644
--- a/tests/queries/0_stateless/02478_projection_with_group_by_alter.sql
+++ b/tests/queries/0_stateless/02478_projection_with_group_by_alter.sql
@@ -25,7 +25,7 @@ OPTIMIZE TABLE testing FINAL;
 SELECT c FROM testing ORDER BY d;
 SELECT c FROM testing ORDER BY e, d;
 
--- update all colums used by proj_1
+-- update all columns used by proj_1
 ALTER TABLE testing UPDATE c = c+1, d = d+2 WHERE True SETTINGS mutations_sync=2;
 
 SELECT * FROM system.mutations WHERE database = currentDatabase() AND table = 'testing' AND not is_done;
diff --git a/tests/queries/0_stateless/02479_mysql_connect_to_self.reference b/tests/queries/0_stateless/02479_mysql_connect_to_self.reference
index 573541ac970..f4dd01bc184 100644
--- a/tests/queries/0_stateless/02479_mysql_connect_to_self.reference
+++ b/tests/queries/0_stateless/02479_mysql_connect_to_self.reference
@@ -1 +1,72 @@
-0
+---
+1	one	-1	een
+2	two	-2	twee
+3	three	-3	drie
+4	four	-4	vier
+5	five	-5	vijf
+---
+5
+---
+1
+1
+1
+1
+1
+---
+1
+2
+3
+4
+5
+---
+-5	five
+-4	four
+-1	one
+-3	three
+-2	two
+---
+-3	three
+-1	one
+-2	two
+-4	four
+-5	five
+---
+-1
+-3
+-4
+-5
+---
+4
+QUERY id: 0
+  PROJECTION COLUMNS
+    key String
+    a String
+    b String
+    c String
+  PROJECTION
+    LIST id: 1, nodes: 4
+      COLUMN id: 2, column_name: key, result_type: String, source_id: 3
+      COLUMN id: 4, column_name: a, result_type: String, source_id: 3
+      COLUMN id: 5, column_name: b, result_type: String, source_id: 3
+      COLUMN id: 6, column_name: c, result_type: String, source_id: 3
+  JOIN TREE
+    TABLE_FUNCTION id: 3, table_function_name: mysql
+      ARGUMENTS
+        LIST id: 7, nodes: 5
+          CONSTANT id: 8, constant_value: \'127.0.0.1:9004\', constant_value_type: String
+          CONSTANT id: 9, constant_value: \'default\', constant_value_type: String
+            EXPRESSION
+              FUNCTION id: 10, function_name: currentDatabase, function_type: ordinary, result_type: String
+          IDENTIFIER id: 11, identifier: foo
+          CONSTANT id: 12, constant_value: \'default\', constant_value_type: String
+          CONSTANT id: 13, constant_value: \'\', constant_value_type: String
+      SETTINGS connection_wait_timeout=123 connect_timeout=40123002 read_write_timeout=40123001 connection_pool_size=3
+
+SELECT
+    key AS key,
+    a AS a,
+    b AS b,
+    c AS c
+FROM mysql(\'127.0.0.1:9004\', \'default\', foo, \'default\', \'\', SETTINGS connection_wait_timeout = 123, connect_timeout = 40123002, read_write_timeout = 40123001, connection_pool_size = 3)
+---
+5
diff --git a/tests/queries/0_stateless/02479_mysql_connect_to_self.sql b/tests/queries/0_stateless/02479_mysql_connect_to_self.sql
index 7ff5b3e3382..ff46ebf1ed2 100644
--- a/tests/queries/0_stateless/02479_mysql_connect_to_self.sql
+++ b/tests/queries/0_stateless/02479_mysql_connect_to_self.sql
@@ -1,4 +1,42 @@
 -- Tags: no-fasttest
-SELECT *
-FROM mysql('127.0.0.1:9004', system, one, 'default', '')
-SETTINGS send_logs_level = 'fatal'; -- failed connection tries are ok, if it succeeded after retry.
+
+SET send_logs_level = 'fatal'; -- failed connection tries are ok, if it succeeded after retry.
+
+CREATE TABLE foo (key UInt32, a String, b Int64, c String) ENGINE = TinyLog;
+INSERT INTO foo VALUES (1, 'one', -1, 'een'), (2, 'two', -2, 'twee'), (3, 'three', -3, 'drie'), (4, 'four', -4, 'vier'), (5, 'five', -5, 'vijf');
+
+SET allow_experimental_analyzer = 1;
+
+SELECT '---';
+SELECT * FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '') ORDER BY key;
+
+SELECT '---';
+SELECT count() FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '');
+
+SELECT '---';
+SELECT 1 FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '');
+
+SELECT '---';
+SELECT key FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '') ORDER BY key;
+
+SELECT '---';
+SELECT b, a FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '') ORDER BY a;
+
+SELECT '---';
+SELECT b, a FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '') ORDER BY c;
+
+SELECT '---';
+SELECT b FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '') WHERE c != 'twee' ORDER BY b;
+
+SELECT '---';
+SELECT count() FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '') WHERE c != 'twee';
+
+EXPLAIN QUERY TREE dump_ast = 1
+SELECT * FROM mysql(
+    '127.0.0.1:9004', currentDatabase(), foo, 'default', '',
+    SETTINGS connection_wait_timeout = 123, connect_timeout = 40123002, read_write_timeout = 40123001, connection_pool_size = 3
+);
+
+SELECT '---';
+SELECT count() FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '', SETTINGS connection_pool_size = 1);
+SELECT count() FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '', SETTINGS connection_pool_size = 0); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/02479_nullable_primary_key_non_first_column.reference b/tests/queries/0_stateless/02479_nullable_primary_key_non_first_column.reference
new file mode 100644
index 00000000000..ed6ac232d9c
--- /dev/null
+++ b/tests/queries/0_stateless/02479_nullable_primary_key_non_first_column.reference
@@ -0,0 +1,2 @@
+a	\N
+1	1	\N
diff --git a/tests/queries/0_stateless/02479_nullable_primary_key_non_first_column.sql b/tests/queries/0_stateless/02479_nullable_primary_key_non_first_column.sql
new file mode 100644
index 00000000000..2d56e315bd1
--- /dev/null
+++ b/tests/queries/0_stateless/02479_nullable_primary_key_non_first_column.sql
@@ -0,0 +1,11 @@
+drop table if exists test_table;
+create table test_table (A Nullable(String), B Nullable(String)) engine MergeTree order by (A,B) settings index_granularity = 1, allow_nullable_key=1;
+insert into test_table values ('a', 'b'), ('a', null), (null, 'b');
+select * from test_table where B is null;
+drop table test_table;
+
+DROP TABLE IF EXISTS dm_metric_small2;
+CREATE TABLE dm_metric_small2 (`x` Nullable(Int64), `y` Nullable(Int64), `z` Nullable(Int64)) ENGINE = MergeTree() ORDER BY (x, y, z) SETTINGS index_granularity = 1, allow_nullable_key = 1;
+INSERT INTO dm_metric_small2 VALUES (1,1,NULL) (1,1,1) (1,2,0) (1,2,1) (1,2,NULL) (1,2,NULL);
+SELECT * FROM dm_metric_small2 WHERE (x = 1) AND (y = 1) AND z IS NULL;
+DROP TABLE dm_metric_small2;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02479_nullable_primary_key_second_column.reference b/tests/queries/0_stateless/02479_nullable_primary_key_second_column.reference
deleted file mode 100644
index f0227e1a41e..00000000000
--- a/tests/queries/0_stateless/02479_nullable_primary_key_second_column.reference
+++ /dev/null
@@ -1 +0,0 @@
-a	\N
diff --git a/tests/queries/0_stateless/02479_nullable_primary_key_second_column.sql b/tests/queries/0_stateless/02479_nullable_primary_key_second_column.sql
deleted file mode 100644
index ad0c09222c2..00000000000
--- a/tests/queries/0_stateless/02479_nullable_primary_key_second_column.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-drop table if exists test_table;
-
-create table test_table (A Nullable(String), B Nullable(String)) engine MergeTree order by (A,B) settings index_granularity = 1, allow_nullable_key=1;
-
-insert into test_table values ('a', 'b'), ('a', null), (null, 'b');
-
-select * from test_table where B is null;
-
-drop table test_table;
diff --git a/tests/queries/0_stateless/02480_tlp_nan.reference b/tests/queries/0_stateless/02480_tlp_nan.reference
index ea4aa44fa89..befd1f66564 100644
--- a/tests/queries/0_stateless/02480_tlp_nan.reference
+++ b/tests/queries/0_stateless/02480_tlp_nan.reference
@@ -1,10 +1,21 @@
+-- {echo}
+SELECT sqrt(-1) as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
 nan	0	1	0
+SELECT sqrt(-1) as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 nan	0	1	0
+SELECT -inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
 -inf	0	1	0
+SELECT -inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 -inf	0	1	0
+SELECT NULL as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
 \N	\N	\N	1
+SELECT NULL as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 \N	\N	\N	1
+SELECT inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
 inf	0	1	0
+SELECT inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 inf	0	1	0
+SELECT nan as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
 nan	0	1	0
+SELECT nan as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 nan	0	1	0
diff --git a/tests/queries/0_stateless/02481_aggregation_in_order_plan.reference b/tests/queries/0_stateless/02481_aggregation_in_order_plan.reference
index d8b62435bfa..bb4eb4ddd75 100644
--- a/tests/queries/0_stateless/02481_aggregation_in_order_plan.reference
+++ b/tests/queries/0_stateless/02481_aggregation_in_order_plan.reference
@@ -4,6 +4,7 @@
 0	1	2	200
   Aggregating
   Order: a ASC, c ASC
-    Sorting (Stream): a ASC, b ASC, c ASC
       ReadFromMergeTree (default.tab)
-      Sorting (Stream): a ASC, b ASC, c ASC
+  Aggregating
+  Order: default.tab.a_0 ASC, default.tab.c_2 ASC
+        ReadFromMergeTree (default.tab)
diff --git a/tests/queries/0_stateless/02481_aggregation_in_order_plan.sql b/tests/queries/0_stateless/02481_aggregation_in_order_plan.sql
index 9c99609ca46..490060dee6f 100644
--- a/tests/queries/0_stateless/02481_aggregation_in_order_plan.sql
+++ b/tests/queries/0_stateless/02481_aggregation_in_order_plan.sql
@@ -5,4 +5,5 @@ insert into tab select 0, number % 3, 2 - intDiv(number, 3), (number % 3 + 1) *
 insert into tab select 0, number % 3, 2 - intDiv(number, 3), (number % 3 + 1) * 100 from numbers(6);
 
 select a, any(b), c, d from tab where b = 1 group by a, c, d order by c, d settings optimize_aggregation_in_order=1, query_plan_aggregation_in_order=1;
-select * from (explain actions = 1, sorting=1 select a, any(b), c, d from tab where b = 1 group by a, c, d settings optimize_aggregation_in_order=1, query_plan_aggregation_in_order=1) where explain like '%Sorting (Stream)%' or explain like '%ReadFromMergeTree%' or explain like '%Aggregating%' or explain like '%Order:%';
+select * from (explain actions = 1, sorting=1 select a, any(b), c, d from tab where b = 1 group by a, c, d settings optimize_aggregation_in_order=1, query_plan_aggregation_in_order=1) where explain like '%ReadFromMergeTree%' or explain like '%Aggregating%' or explain like '%Order:%' settings allow_experimental_analyzer=0;
+select * from (explain actions = 1, sorting=1 select a, any(b), c, d from tab where b = 1 group by a, c, d settings optimize_aggregation_in_order=1, query_plan_aggregation_in_order=1) where explain like '%ReadFromMergeTree%' or explain like '%Aggregating%' or explain like '%Order:%' settings allow_experimental_analyzer=1;
diff --git a/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql b/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql
index b51233f734c..de9208ef009 100644
--- a/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql
+++ b/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql
@@ -1,3 +1,5 @@
+set allow_experimental_analyzer = 1;
+
 EXPLAIN QUERY TREE run_passes=1
 SELECT avg(log(2) * number) AS k FROM numbers(10000000)
 GROUP BY GROUPING SETS (((number % 2) * (number % 3)), number % 3, number % 2)
diff --git a/tests/queries/0_stateless/02481_async_insert_dedup.python b/tests/queries/0_stateless/02481_async_insert_dedup.python
index 0cea7301ce5..9fd82da1038 100644
--- a/tests/queries/0_stateless/02481_async_insert_dedup.python
+++ b/tests/queries/0_stateless/02481_async_insert_dedup.python
@@ -8,37 +8,47 @@ import time
 from threading import Thread
 
 CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
 from pure_http_client import ClickHouseClient
 
 client = ClickHouseClient()
 
 # test table without partition
-client.query("DROP TABLE IF EXISTS t_async_insert_dedup_no_part NO DELAY")
-client.query('''
+client.query("DROP TABLE IF EXISTS t_async_insert_dedup_no_part SYNC")
+client.query(
+    """
 CREATE TABLE t_async_insert_dedup_no_part (
 KeyID     UInt32
 ) Engine = ReplicatedMergeTree('/clickhouse/tables/{shard}/{database}/t_async_insert_dedup', '{replica}')
 ORDER BY (KeyID)
-''')
+"""
+)
 
-client.query("insert into t_async_insert_dedup_no_part values (1), (2), (3), (4), (5)", settings = {"async_insert": 1, "wait_for_async_insert": 1, "insert_keeper_fault_injection_probability": 0})
+client.query(
+    "insert into t_async_insert_dedup_no_part values (1), (2), (3), (4), (5)",
+    settings={
+        "async_insert": 1,
+        "wait_for_async_insert": 1,
+        "insert_keeper_fault_injection_probability": 0,
+    },
+)
 result = client.query("select count(*) from t_async_insert_dedup_no_part")
 print(result, flush=True)
-client.query("DROP TABLE IF EXISTS t_async_insert_dedup_no_part NO DELAY")
+client.query("DROP TABLE IF EXISTS t_async_insert_dedup_no_part SYNC")
+
 
 # generate data and push to queue
 def generate_data(q, total_number):
     old_data = []
     max_chunk_size = 30
-    partitions = ['2022-11-11 10:10:10', '2022-12-12 10:10:10']
+    partitions = ["2022-11-11 10:10:10", "2022-12-12 10:10:10"]
     last_number = 0
     while True:
-        dup_simulate = random.randint(0,3)
+        dup_simulate = random.randint(0, 3)
         # insert old data randomly. 25% of them are dup.
         if dup_simulate == 0:
-            last_idx = len(old_data)-1
+            last_idx = len(old_data) - 1
             if last_idx < 0:
                 continue
             idx = last_idx - random.randint(0, 50)
@@ -53,7 +63,7 @@ def generate_data(q, total_number):
             end = start + chunk_size
             if end > total_number:
                 end = total_number
-            for i in range(start, end+1):
+            for i in range(start, end + 1):
                 partition = partitions[random.randint(0, 1)]
                 insert_stmt += "('{}', {}),".format(partition, i)
             insert_stmt = insert_stmt[:-1]
@@ -65,33 +75,46 @@ def generate_data(q, total_number):
     # wait all the tasks is done.
     q.join()
 
+
 def fetch_and_insert_data(q, client):
     while True:
         insert = q.get()
-        client.query(insert, settings = {"async_insert": 1, "async_insert_deduplicate": 1, "wait_for_async_insert": 0, "async_insert_busy_timeout_ms": 1500, "insert_keeper_fault_injection_probability": 0})
+        client.query(
+            insert,
+            settings={
+                "async_insert": 1,
+                "async_insert_deduplicate": 1,
+                "wait_for_async_insert": 0,
+                "async_insert_busy_timeout_ms": 1500,
+                "insert_keeper_fault_injection_probability": 0,
+            },
+        )
         q.task_done()
         sleep_time = random.randint(50, 500)
-        time.sleep(sleep_time/1000.0)
+        time.sleep(sleep_time / 1000.0)
+
 
 # main process
-client.query("DROP TABLE IF EXISTS t_async_insert_dedup NO DELAY")
-client.query('''
+client.query("DROP TABLE IF EXISTS t_async_insert_dedup SYNC")
+client.query(
+    """
 CREATE TABLE t_async_insert_dedup (
 EventDate DateTime,
 KeyID     UInt32
 ) Engine = ReplicatedMergeTree('/clickhouse/tables/{shard}/{database}/t_async_insert_dedup', '{replica}')
 PARTITION BY toYYYYMM(EventDate)
 ORDER BY (KeyID, EventDate) SETTINGS use_async_block_ids_cache = 1
-''')
+"""
+)
 
 q = queue.Queue(100)
 total_number = 10000
 
-gen = Thread(target = generate_data, args = [q, total_number])
+gen = Thread(target=generate_data, args=[q, total_number])
 gen.start()
 
 for i in range(3):
-    insert = Thread(target = fetch_and_insert_data, args = [q, client])
+    insert = Thread(target=fetch_and_insert_data, args=[q, client])
     insert.start()
 
 gen.join()
@@ -109,7 +132,7 @@ while True:
         errMsg = f"the size of result is {len(result)}. we expect {total_number}."
     else:
         for i in range(total_number):
-            expect = str(i+1)
+            expect = str(i + 1)
             real = result[i]
             if expect != real:
                 err = True
@@ -117,7 +140,7 @@ while True:
                 break
     # retry several times to get stable results.
     if err and retry >= 5:
-        print (errMsg, flush=True)
+        print(errMsg, flush=True)
     elif err:
         retry += 1
         continue
@@ -125,15 +148,19 @@ while True:
         print(len(result), flush=True)
     break
 
-result = client.query("SELECT value FROM system.metrics  where metric = 'AsyncInsertCacheSize'")
+result = client.query(
+    "SELECT value FROM system.metrics  where metric = 'AsyncInsertCacheSize'"
+)
 result = int(result.split()[0])
 if result <= 0:
     raise Exception(f"AsyncInsertCacheSize should > 0, but got {result}")
-result = client.query("SELECT value FROM system.events  where event = 'AsyncInsertCacheHits'")
+result = client.query(
+    "SELECT value FROM system.events  where event = 'AsyncInsertCacheHits'"
+)
 result = int(result.split()[0])
 if result <= 0:
     raise Exception(f"AsyncInsertCacheHits should > 0, but got {result}")
 
-client.query("DROP TABLE IF EXISTS t_async_insert_dedup NO DELAY")
+client.query("DROP TABLE IF EXISTS t_async_insert_dedup SYNC")
 
 os._exit(os.EX_OK)
diff --git a/tests/queries/0_stateless/02481_low_cardinality_with_short_circuit_functins_mutations.reference b/tests/queries/0_stateless/02481_low_cardinality_with_short_circuit_functins_mutations.reference
new file mode 100644
index 00000000000..9a6e97d4503
--- /dev/null
+++ b/tests/queries/0_stateless/02481_low_cardinality_with_short_circuit_functins_mutations.reference
@@ -0,0 +1,3 @@
+0	xxxx	yyyy
+1	yyyy	yyyy
+2	xxxx	yyyy
diff --git a/tests/queries/0_stateless/02481_low_cardinality_with_short_circuit_functins_mutations.sql b/tests/queries/0_stateless/02481_low_cardinality_with_short_circuit_functins_mutations.sql
new file mode 100644
index 00000000000..9d183dde91d
--- /dev/null
+++ b/tests/queries/0_stateless/02481_low_cardinality_with_short_circuit_functins_mutations.sql
@@ -0,0 +1,14 @@
+drop table if exists issue_46128;
+
+create table issue_46128 (
+	id Int64,
+	a LowCardinality(Nullable(String)),
+	b LowCardinality(Nullable(String))
+) Engine = MergeTree order by id
+as  select number%100, 'xxxx', 'yyyy' from numbers(10);
+
+ALTER TABLE issue_46128 UPDATE a = b WHERE id= 1 settings mutations_sync=2;
+
+select * from issue_46128 where id  <= 2 order by id;
+
+drop table issue_46128;
diff --git a/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.reference b/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.reference
index dd677873c7c..348408a15cc 100644
--- a/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.reference
+++ b/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.reference
@@ -1,4 +1,5 @@
 -- { echoOn }
+
 SELECT
     cutURLParameter('http://bigmir.net/?a=b&c=d', []),
     cutURLParameter('http://bigmir.net/?a=b&c=d', ['a']),
@@ -30,7 +31,7 @@ SELECT
     FORMAT Vertical;
 Row 1:
 ──────
-cutURLParameter('http://bigmir.net/?a=b&c=d', []):                         http://bigmir.net/?a=b&c=d
+cutURLParameter('http://bigmir.net/?a=b&c=d', array()):                    http://bigmir.net/?a=b&c=d
 cutURLParameter('http://bigmir.net/?a=b&c=d', ['a']):                      http://bigmir.net/?c=d
 cutURLParameter('http://bigmir.net/?a=b&c=d', ['a', 'c']):                 http://bigmir.net/?
 cutURLParameter('http://bigmir.net/?a=b&c=d', ['c']):                      http://bigmir.net/?a=b
@@ -43,7 +44,7 @@ cutURLParameter('http://bigmir.net/?a=b&c=d#e&g=h', ['c', 'g']):           http:
 cutURLParameter('http://bigmir.net/?a=b&c=d#e&g=h', ['e', 'g']):           http://bigmir.net/?a=b&c=d#e
 cutURLParameter('http://bigmir.net/?a=b&c=d#test?e=f&g=h', ['test', 'e']): http://bigmir.net/?a=b&c=d#test?g=h
 cutURLParameter('http://bigmir.net/?a=b&c=d#test?e=f&g=h', ['test', 'g']): http://bigmir.net/?a=b&c=d#test?e=f
-cutURLParameter('//bigmir.net/?a=b&c=d', []):                              //bigmir.net/?a=b&c=d
+cutURLParameter('//bigmir.net/?a=b&c=d', array()):                         //bigmir.net/?a=b&c=d
 cutURLParameter('//bigmir.net/?a=b&c=d', ['a']):                           //bigmir.net/?c=d
 cutURLParameter('//bigmir.net/?a=b&c=d', ['a', 'c']):                      //bigmir.net/?
 cutURLParameter('//bigmir.net/?a=b&c=d#e=f', ['a', 'e']):                  //bigmir.net/?c=d#
@@ -88,7 +89,7 @@ SELECT
     FORMAT Vertical;
 Row 1:
 ──────
-cutURLParameter(materialize('http://bigmir.net/?a=b&c=d'), []):                         http://bigmir.net/?a=b&c=d
+cutURLParameter(materialize('http://bigmir.net/?a=b&c=d'), array()):                    http://bigmir.net/?a=b&c=d
 cutURLParameter(materialize('http://bigmir.net/?a=b&c=d'), ['a']):                      http://bigmir.net/?c=d
 cutURLParameter(materialize('http://bigmir.net/?a=b&c=d'), ['a', 'c']):                 http://bigmir.net/?
 cutURLParameter(materialize('http://bigmir.net/?a=b&c=d'), ['c']):                      http://bigmir.net/?a=b
@@ -101,7 +102,7 @@ cutURLParameter(materialize('http://bigmir.net/?a=b&c=d#e&g=h'), ['c', 'g']):
 cutURLParameter(materialize('http://bigmir.net/?a=b&c=d#e&g=h'), ['e', 'g']):           http://bigmir.net/?a=b&c=d#e
 cutURLParameter(materialize('http://bigmir.net/?a=b&c=d#test?e=f&g=h'), ['test', 'e']): http://bigmir.net/?a=b&c=d#test?g=h
 cutURLParameter(materialize('http://bigmir.net/?a=b&c=d#test?e=f&g=h'), ['test', 'g']): http://bigmir.net/?a=b&c=d#test?e=f
-cutURLParameter(materialize('//bigmir.net/?a=b&c=d'), []):                              //bigmir.net/?a=b&c=d
+cutURLParameter(materialize('//bigmir.net/?a=b&c=d'), array()):                         //bigmir.net/?a=b&c=d
 cutURLParameter(materialize('//bigmir.net/?a=b&c=d'), ['a']):                           //bigmir.net/?c=d
 cutURLParameter(materialize('//bigmir.net/?a=b&c=d'), ['a', 'c']):                      //bigmir.net/?
 cutURLParameter(materialize('//bigmir.net/?a=b&c=d#e=f'), ['a', 'e']):                  //bigmir.net/?c=d#
diff --git a/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.sql b/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.sql
index ea2d6ae104f..6d64d2685b7 100644
--- a/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.sql
+++ b/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.sql
@@ -1,4 +1,7 @@
+SET allow_experimental_analyzer = 1;
+
 -- { echoOn }
+
 SELECT
     cutURLParameter('http://bigmir.net/?a=b&c=d', []),
     cutURLParameter('http://bigmir.net/?a=b&c=d', ['a']),
diff --git a/tests/queries/0_stateless/02490_replacing_merge_tree_is_deleted_column.sql b/tests/queries/0_stateless/02490_replacing_merge_tree_is_deleted_column.sql
index 615d42f12fa..8549300d49f 100644
--- a/tests/queries/0_stateless/02490_replacing_merge_tree_is_deleted_column.sql
+++ b/tests/queries/0_stateless/02490_replacing_merge_tree_is_deleted_column.sql
@@ -8,33 +8,33 @@ DROP TABLE IF EXISTS test;
 CREATE TABLE test (uid String, version UInt32, is_deleted UInt8) ENGINE = ReplacingMergeTree(version) Order by (uid);
 INSERT INTO test (*) VALUES ('d1', 1, 0), ('d2', 1, 0), ('d6', 1, 0), ('d4', 1, 0), ('d6', 2, 1), ('d3', 1, 0), ('d1', 2, 1), ('d5', 1, 0), ('d4', 2, 1), ('d1', 3, 0), ('d1', 4, 1), ('d4', 3, 0), ('d1', 5, 0);
 SELECT '== Test SELECT ... FINAL - no is_deleted ==';
-select * from test FINAL;
+select * from test FINAL order by uid;
 OPTIMIZE TABLE test FINAL CLEANUP;
-select * from test;
+select * from test order by uid;
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (uid String, version UInt32, is_deleted UInt8) ENGINE = ReplacingMergeTree(version) Order by (uid) SETTINGS clean_deleted_rows='Always';
 INSERT INTO test (*) VALUES ('d1', 1, 0), ('d2', 1, 0), ('d6', 1, 0), ('d4', 1, 0), ('d6', 2, 1), ('d3', 1, 0), ('d1', 2, 1), ('d5', 1, 0), ('d4', 2, 1), ('d1', 3, 0), ('d1', 4, 1), ('d4', 3, 0), ('d1', 5, 0);
 SELECT '== Test SELECT ... FINAL - no is_deleted SETTINGS clean_deleted_rows=Always ==';
-select * from test FINAL;
+select * from test FINAL order by uid;
 OPTIMIZE TABLE test FINAL CLEANUP;
-select * from test;
+select * from test order by uid;
 
 -- Test the new behaviour
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (uid String, version UInt32, is_deleted UInt8) ENGINE = ReplacingMergeTree(version, is_deleted) Order by (uid);
 INSERT INTO test (*) VALUES ('d1', 1, 0), ('d2', 1, 0), ('d6', 1, 0), ('d4', 1, 0), ('d6', 2, 1), ('d3', 1, 0), ('d1', 2, 1), ('d5', 1, 0), ('d4', 2, 1), ('d1', 3, 0), ('d1', 4, 1), ('d4', 3, 0), ('d1', 5, 0);
 SELECT '== Test SELECT ... FINAL ==';
-select * from test FINAL;
-select * from test;
+select * from test FINAL order by uid;
+select * from test order by uid;
 
 SELECT '== Insert backups ==';
 INSERT INTO test (*) VALUES ('d6', 1, 0), ('d4', 1, 0), ('d6', 2, 1), ('d3', 1, 0), ('d1', 2, 1), ('d5', 1, 0), ('d4', 2, 1);
-select * from test FINAL;
+select * from test FINAL order by uid;
 
 SELECT '== Insert a second batch with overlaping data ==';
 INSERT INTO test (*) VALUES ('d4', 1, 0), ('d6', 2, 1), ('d3', 1, 0), ('d1', 2, 1), ('d5', 1, 0), ('d4', 2, 1), ('d1', 3, 1), ('d1', 4, 1), ('d4', 3, 0), ('d1', 5, 0), ('d2', 2, 1), ('d2', 3, 0), ('d3', 2, 1), ('d3', 3, 0);
-select * from test FINAL;
+select * from test FINAL order by uid;
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (uid String, version UInt32, is_deleted UInt8) ENGINE = ReplacingMergeTree(version, is_deleted) Order by (uid);
@@ -45,7 +45,7 @@ INSERT INTO test (*) VALUES ('d1', 1, 0), ('d1', 2, 1), ('d1', 3, 0), ('d1', 4,
 INSERT INTO test (*) VALUES ('d1', 1, 0), ('d1', 2, 1), ('d1', 3, 0), ('d1', 4, 1), ('d1', 5, 0), ('d2', 1, 0), ('d3', 1, 0), ('d4', 1, 0),  ('d5', 1, 0), ('d6', 1, 0), ('d6', 2, 1);
 SELECT '== Only last version remains after OPTIMIZE W/ CLEANUP ==';
 OPTIMIZE TABLE test FINAL CLEANUP;
-select * from test;
+select * from test order by uid;
 
 -- insert d6 v=3 is_deleted=true (timestamp more recent so this version should be the one take into acount)
 INSERT INTO test (*) VALUES ('d1', 1, 0), ('d1', 2, 1), ('d1', 3, 0), ('d1', 4, 1), ('d1', 5, 0), ('d2', 1, 0), ('d3', 1, 0), ('d4', 1, 0),  ('d5', 1, 0), ('d6', 1, 0), ('d6', 3, 1);
@@ -53,7 +53,7 @@ INSERT INTO test (*) VALUES ('d1', 1, 0), ('d1', 2, 1), ('d1', 3, 0), ('d1', 4,
 SELECT '== OPTIMIZE W/ CLEANUP (remove d6) ==';
 OPTIMIZE TABLE test FINAL CLEANUP;
 -- No d6 anymore
-select * from test;
+select * from test order by uid;
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (uid String, version UInt32, is_deleted UInt8) ENGINE = ReplacingMergeTree(version, is_deleted) Order by (uid) SETTINGS clean_deleted_rows='Always';
@@ -61,12 +61,12 @@ CREATE TABLE test (uid String, version UInt32, is_deleted UInt8) ENGINE = Replac
 SELECT '== Test of the SETTINGS clean_deleted_rows as Always ==';
 INSERT INTO test (*) VALUES ('d1', 1, 0), ('d2', 1, 0), ('d6', 1, 0), ('d4', 1, 0), ('d6', 2, 1), ('d3', 1, 0), ('d1', 2, 1), ('d5', 1, 0), ('d4', 2, 1), ('d1', 3, 0), ('d1', 4, 1), ('d4', 3, 0), ('d1', 5, 0);
 -- Even if the setting is set to Always, the SELECT FINAL doesn't delete rows
-select * from test FINAL;
-select * from test;
+select * from test FINAL order by uid;
+select * from test order by uid;
 
 OPTIMIZE TABLE test FINAL;
 -- d6 has to be removed since we set clean_deleted_rows as 'Always'
-select * from test;
+select * from test order by uid;
 
 SELECT '== Test of the SETTINGS clean_deleted_rows as Never ==';
 ALTER TABLE test MODIFY SETTING clean_deleted_rows='Never';
@@ -74,7 +74,7 @@ INSERT INTO test (*) VALUES ('d1', 1, 0), ('d2', 1, 0), ('d6', 1, 0), ('d4', 1,
 INSERT INTO test (*) VALUES ('d1', 1, 0), ('d2', 1, 0), ('d6', 1, 0), ('d4', 1, 0), ('d6', 2, 1), ('d3', 1, 0), ('d1', 2, 1), ('d5', 1, 0), ('d4', 2, 1), ('d1', 3, 0), ('d1', 4, 1), ('d4', 3, 0), ('d1', 5, 0);
 OPTIMIZE TABLE test FINAL;
 -- d6 has NOT to be removed since we set clean_deleted_rows as 'Never'
-select * from test;
+select * from test order by uid;
 
 DROP TABLE IF EXISTS testCleanupR1;
 
@@ -92,7 +92,7 @@ OPTIMIZE TABLE testCleanupR1 FINAL CLEANUP;
 
 -- Only d3 to d5 remain
 SELECT '== (Replicas) Test optimize ==';
-SELECT * FROM testCleanupR1;
+SELECT * FROM testCleanupR1 order by uid;
 
 ------------------------------
 
@@ -110,7 +110,7 @@ OPTIMIZE TABLE testSettingsR1 FINAL;
 
 -- Only d3 to d5 remain
 SELECT '== (Replicas) Test settings ==';
-SELECT * FROM testSettingsR1;
+SELECT * FROM testSettingsR1 order by col1;
 
 
 ------------------------------
@@ -133,28 +133,28 @@ CREATE TABLE testMT (uid String, version UInt32, is_deleted UInt8) ENGINE = Merg
 INSERT INTO testMT (*) VALUES ('d1', 1, 1);
 OPTIMIZE TABLE testMT FINAL CLEANUP;  -- { serverError CANNOT_ASSIGN_OPTIMIZE }
 OPTIMIZE TABLE testMT FINAL;
-SELECT * FROM testMT;
+SELECT * FROM testMT order by uid;
 
 CREATE TABLE testSummingMT (uid String, version UInt32, is_deleted UInt8) ENGINE = SummingMergeTree() Order by (uid) SETTINGS clean_deleted_rows='Always';
 INSERT INTO testSummingMT (*) VALUES ('d1', 1, 1);
 OPTIMIZE TABLE testSummingMT FINAL CLEANUP;  -- { serverError CANNOT_ASSIGN_OPTIMIZE }
 OPTIMIZE TABLE testSummingMT FINAL;
-SELECT * FROM testSummingMT;
+SELECT * FROM testSummingMT order by uid;
 
 CREATE TABLE testAggregatingMT (uid String, version UInt32, is_deleted UInt8) ENGINE = AggregatingMergeTree() Order by (uid) SETTINGS clean_deleted_rows='Always';
 INSERT INTO testAggregatingMT (*) VALUES ('d1', 1, 1);
 OPTIMIZE TABLE testAggregatingMT FINAL CLEANUP;  -- { serverError CANNOT_ASSIGN_OPTIMIZE }
 OPTIMIZE TABLE testAggregatingMT FINAL;
-SELECT * FROM testAggregatingMT;
+SELECT * FROM testAggregatingMT order by uid;
 
 CREATE TABLE testCollapsingMT (uid String, version UInt32, is_deleted UInt8, sign Int8) ENGINE = CollapsingMergeTree(sign) Order by (uid) SETTINGS clean_deleted_rows='Always';
 INSERT INTO testCollapsingMT (*) VALUES ('d1', 1, 1, 1);
 OPTIMIZE TABLE testCollapsingMT FINAL CLEANUP;  -- { serverError CANNOT_ASSIGN_OPTIMIZE }
 OPTIMIZE TABLE testCollapsingMT FINAL;
-SELECT * FROM testCollapsingMT;
+SELECT * FROM testCollapsingMT order by uid;
 
 CREATE TABLE testVersionedCMT (uid String, version UInt32, is_deleted UInt8, sign Int8) ENGINE = VersionedCollapsingMergeTree(sign, version) Order by (uid) SETTINGS clean_deleted_rows='Always';
 INSERT INTO testVersionedCMT (*) VALUES ('d1', 1, 1, 1);
 OPTIMIZE TABLE testVersionedCMT FINAL CLEANUP;  -- { serverError CANNOT_ASSIGN_OPTIMIZE }
 OPTIMIZE TABLE testVersionedCMT FINAL;
-SELECT * FROM testVersionedCMT;
+SELECT * FROM testVersionedCMT order by uid;
diff --git a/tests/queries/0_stateless/02494_query_cache_case_agnostic_matching.sql b/tests/queries/0_stateless/02494_query_cache_case_agnostic_matching.sql
index 9440a1fd9c0..9f26d7759de 100644
--- a/tests/queries/0_stateless/02494_query_cache_case_agnostic_matching.sql
+++ b/tests/queries/0_stateless/02494_query_cache_case_agnostic_matching.sql
@@ -1,8 +1,6 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 -- Start with empty query cache (QC) and query log
 SYSTEM DROP QUERY CACHE;
 DROP TABLE system.query_log SYNC;
diff --git a/tests/queries/0_stateless/02494_query_cache_compression.reference b/tests/queries/0_stateless/02494_query_cache_compression.reference
new file mode 100644
index 00000000000..922ab65540a
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_compression.reference
@@ -0,0 +1,4804 @@
+-- insert with enabled compression
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+-- read from cache
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+-- insert with disabled compression
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+-- read from cache
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
diff --git a/tests/queries/0_stateless/02494_query_cache_compression.sql b/tests/queries/0_stateless/02494_query_cache_compression.sql
new file mode 100644
index 00000000000..3d17deebd94
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_compression.sql
@@ -0,0 +1,35 @@
+-- Tags: no-parallel
+-- Tag no-parallel: Messes with internal cache
+
+SYSTEM DROP QUERY CACHE;
+DROP TABLE IF EXISTS t;
+
+-- Create test table with lot's of rows
+CREATE TABLE t(c String) ENGINE=MergeTree ORDER BY c;
+INSERT INTO t SELECT multiIf(n = 0, 'abc', n = 1, 'def', n = 2, 'abc', n = 3, 'jkl', '<unused>') FROM (SELECT number % 4 AS n FROM numbers(1200));
+OPTIMIZE TABLE t FINAL;
+
+-- Run query which, store *compressed* result in query cache
+SELECT '-- insert with enabled compression';
+SELECT * FROM t ORDER BY c
+SETTINGS use_query_cache = true, query_cache_compress_entries = true;
+
+-- Run again to check that no bad things happen and that the result is as expected
+SELECT '-- read from cache';
+SELECT * FROM t ORDER BY c
+SETTINGS use_query_cache = true;
+
+SYSTEM DROP QUERY CACHE;
+
+-- Run query which, store *uncompressed* result in query cache
+SELECT '-- insert with disabled compression';
+SELECT * FROM t ORDER BY c
+SETTINGS use_query_cache = true, query_cache_compress_entries = false;
+
+-- Run again to check that no bad things happen and that the result is as expected
+SELECT '-- read from cache';
+SELECT * FROM t ORDER BY c
+SETTINGS use_query_cache = true;
+
+DROP TABLE t;
+SYSTEM DROP QUERY CACHE;
diff --git a/tests/queries/0_stateless/02494_query_cache_drop_cache.sql b/tests/queries/0_stateless/02494_query_cache_drop_cache.sql
index 1f61472fcb0..bc2e7f442fc 100644
--- a/tests/queries/0_stateless/02494_query_cache_drop_cache.sql
+++ b/tests/queries/0_stateless/02494_query_cache_drop_cache.sql
@@ -1,7 +1,8 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
+-- (it's silly to use what will be tested below but we have to assume other tests cluttered the query cache)
+SYSTEM DROP QUERY CACHE;
 
 -- Cache query result in query cache
 SELECT 1 SETTINGS use_query_cache = true;
diff --git a/tests/queries/0_stateless/02494_query_cache_eligible_queries.sql b/tests/queries/0_stateless/02494_query_cache_eligible_queries.sql
index b4bc9e2c258..5c45ee8aedd 100644
--- a/tests/queries/0_stateless/02494_query_cache_eligible_queries.sql
+++ b/tests/queries/0_stateless/02494_query_cache_eligible_queries.sql
@@ -1,8 +1,6 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 SYSTEM DROP QUERY CACHE;
 DROP TABLE IF EXISTS eligible_test;
 DROP TABLE IF EXISTS eligible_test2;
diff --git a/tests/queries/0_stateless/02494_query_cache_events.sql b/tests/queries/0_stateless/02494_query_cache_events.sql
index d775467d525..900b68f5eb2 100644
--- a/tests/queries/0_stateless/02494_query_cache_events.sql
+++ b/tests/queries/0_stateless/02494_query_cache_events.sql
@@ -1,8 +1,6 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 -- Start with empty query cache QC and query log
 SYSTEM DROP QUERY CACHE;
 DROP TABLE system.query_log SYNC;
diff --git a/tests/queries/0_stateless/02494_query_cache_exception_handling.sql b/tests/queries/0_stateless/02494_query_cache_exception_handling.sql
index 4d686d81ed3..70a443cc75c 100644
--- a/tests/queries/0_stateless/02494_query_cache_exception_handling.sql
+++ b/tests/queries/0_stateless/02494_query_cache_exception_handling.sql
@@ -1,8 +1,6 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 SYSTEM DROP QUERY CACHE;
 
 -- If an exception is thrown during query execution, no entry must be created in the query cache
diff --git a/tests/queries/0_stateless/02494_query_cache_explain.reference b/tests/queries/0_stateless/02494_query_cache_explain.reference
index ecc965ac391..690e75bca7c 100644
--- a/tests/queries/0_stateless/02494_query_cache_explain.reference
+++ b/tests/queries/0_stateless/02494_query_cache_explain.reference
@@ -1,9 +1,9 @@
 1
 1
-Expression ((Projection + Before ORDER BY))
+Expression ((Project names + (Projection + Change column names to column identifiers)))
   Limit (preliminary LIMIT (without OFFSET))
     ReadFromStorage (SystemNumbers)
-Expression ((Projection + Before ORDER BY))
+Expression ((Project names + (Projection + Change column names to column identifiers)))
   Limit (preliminary LIMIT (without OFFSET))
     ReadFromStorage (SystemNumbers)
 (Expression)
diff --git a/tests/queries/0_stateless/02494_query_cache_explain.sql b/tests/queries/0_stateless/02494_query_cache_explain.sql
index 67717efde13..d12938181c2 100644
--- a/tests/queries/0_stateless/02494_query_cache_explain.sql
+++ b/tests/queries/0_stateless/02494_query_cache_explain.sql
@@ -1,7 +1,7 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
+SET allow_experimental_analyzer = 1;
 
 SYSTEM DROP QUERY CACHE;
 
diff --git a/tests/queries/0_stateless/02494_query_cache_min_query_duration.sql b/tests/queries/0_stateless/02494_query_cache_min_query_duration.sql
index 7d759c86130..ee0b73f43e2 100644
--- a/tests/queries/0_stateless/02494_query_cache_min_query_duration.sql
+++ b/tests/queries/0_stateless/02494_query_cache_min_query_duration.sql
@@ -1,8 +1,6 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 SYSTEM DROP QUERY CACHE;
 
 -- This creates an entry in the query cache ...
diff --git a/tests/queries/0_stateless/02494_query_cache_min_query_runs.sql b/tests/queries/0_stateless/02494_query_cache_min_query_runs.sql
index 2401beeab13..ffdf12169e3 100644
--- a/tests/queries/0_stateless/02494_query_cache_min_query_runs.sql
+++ b/tests/queries/0_stateless/02494_query_cache_min_query_runs.sql
@@ -1,8 +1,6 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 SYSTEM DROP QUERY CACHE;
 
 -- Cache the query after the 1st query invocation
diff --git a/tests/queries/0_stateless/02494_query_cache_nondeterministic_functions.sql b/tests/queries/0_stateless/02494_query_cache_nondeterministic_functions.sql
index 534d63aa427..045b7258a34 100644
--- a/tests/queries/0_stateless/02494_query_cache_nondeterministic_functions.sql
+++ b/tests/queries/0_stateless/02494_query_cache_nondeterministic_functions.sql
@@ -1,8 +1,6 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 SYSTEM DROP QUERY CACHE;
 
 -- rand() is non-deterministic, with default settings no entry in the query cache should be created
diff --git a/tests/queries/0_stateless/02494_query_cache_normalize_ast.sql b/tests/queries/0_stateless/02494_query_cache_normalize_ast.sql
index 7e3cd273312..5fd09eb935b 100644
--- a/tests/queries/0_stateless/02494_query_cache_normalize_ast.sql
+++ b/tests/queries/0_stateless/02494_query_cache_normalize_ast.sql
@@ -1,8 +1,6 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 -- Start with empty query cache (QC) and query log.
 SYSTEM DROP QUERY CACHE;
 DROP TABLE system.query_log SYNC;
diff --git a/tests/queries/0_stateless/02494_query_cache_passive_usage.sql b/tests/queries/0_stateless/02494_query_cache_passive_usage.sql
index 8f1e3972b6d..6143b5f7083 100644
--- a/tests/queries/0_stateless/02494_query_cache_passive_usage.sql
+++ b/tests/queries/0_stateless/02494_query_cache_passive_usage.sql
@@ -1,8 +1,6 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 -- Start with empty query cache (QC).
 SYSTEM DROP QUERY CACHE;
 
diff --git a/tests/queries/0_stateless/02494_query_cache_secrets.sql b/tests/queries/0_stateless/02494_query_cache_secrets.sql
index 99a972b003c..66427df8f10 100644
--- a/tests/queries/0_stateless/02494_query_cache_secrets.sql
+++ b/tests/queries/0_stateless/02494_query_cache_secrets.sql
@@ -2,8 +2,6 @@
 -- Tag no-fasttest: Depends on OpenSSL
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 SYSTEM DROP QUERY CACHE;
 
 -- Cache a result of a query with secret in the query cache
diff --git a/tests/queries/0_stateless/00972_live_view_select_1.reference b/tests/queries/0_stateless/02494_query_cache_sparse_columns.reference
similarity index 100%
rename from tests/queries/0_stateless/00972_live_view_select_1.reference
rename to tests/queries/0_stateless/02494_query_cache_sparse_columns.reference
diff --git a/tests/queries/0_stateless/02494_query_cache_sparse_columns.sql b/tests/queries/0_stateless/02494_query_cache_sparse_columns.sql
new file mode 100644
index 00000000000..4344d139d60
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_sparse_columns.sql
@@ -0,0 +1,22 @@
+-- Tags: no-parallel
+
+DROP TABLE IF EXISTS t_cache_sparse;
+SYSTEM DROP QUERY CACHE;
+
+CREATE TABLE t_cache_sparse (id UInt64, v UInt64)
+ENGINE = MergeTree ORDER BY id
+SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
+
+SYSTEM STOP MERGES t_cache_sparse;
+
+INSERT INTO t_cache_sparse SELECT number, number FROM numbers(10000);
+INSERT INTO t_cache_sparse SELECT number, 0 FROM numbers(10000);
+
+SET use_query_cache = 1;
+SET max_threads = 1;
+
+SELECT v FROM t_cache_sparse FORMAT Null;
+SELECT v FROM t_cache_sparse FORMAT Null;
+SELECT count() FROM system.query_cache WHERE query LIKE 'SELECT v FROM t_cache_sparse%';
+
+DROP TABLE t_cache_sparse;
diff --git a/tests/queries/0_stateless/02494_query_cache_squash_partial_results.reference b/tests/queries/0_stateless/02494_query_cache_squash_partial_results.reference
new file mode 100644
index 00000000000..2c4fa587dfc
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_squash_partial_results.reference
@@ -0,0 +1,276 @@
+-- insert with enabled squashing
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+-- read from cache
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+-- insert with disabled squashing
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+-- read from cache
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+abc
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+def
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+ghi
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
+jkl
diff --git a/tests/queries/0_stateless/02494_query_cache_squash_partial_results.sql b/tests/queries/0_stateless/02494_query_cache_squash_partial_results.sql
new file mode 100644
index 00000000000..391cc7f7e1a
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_squash_partial_results.sql
@@ -0,0 +1,51 @@
+-- Tags: no-parallel
+-- Tag no-parallel: Messes with internal cache
+
+SYSTEM DROP QUERY CACHE;
+DROP TABLE IF EXISTS t;
+
+-- Create test table with "many" rows
+CREATE TABLE t(c String) ENGINE=MergeTree ORDER BY c;
+SYSTEM STOP MERGES t; -- retain multiple parts to make the SELECT process multiple chunks
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+INSERT INTO t values ('abc') ('def') ('ghi') ('jkl');
+
+-- Run query which reads multiple chunks (small max_block_size), cache result in query cache, force squashing of partial results
+SELECT '-- insert with enabled squashing';
+SELECT * FROM t ORDER BY c
+SETTINGS max_block_size = 3, use_query_cache = true, query_cache_squash_partial_results = true;
+
+-- Run again to check that no bad things happen and that the result is as expected
+SELECT '-- read from cache';
+SELECT * FROM t ORDER BY c
+SETTINGS max_block_size = 3, use_query_cache = true;
+
+SYSTEM DROP QUERY CACHE;
+
+-- Run query which reads multiple chunks (small max_block_size), cache result in query cache, but **disable** squashing of partial results
+SELECT '-- insert with disabled squashing';
+SELECT * FROM t ORDER BY c
+SETTINGS max_block_size = 3, use_query_cache = true, query_cache_squash_partial_results = false;
+
+-- Run again to check that no bad things happen and that the result is as expected
+SELECT '-- read from cache';
+SELECT * FROM t ORDER BY c
+SETTINGS max_block_size = 3, use_query_cache = true;
+
+DROP TABLE t;
+SYSTEM DROP QUERY CACHE;
diff --git a/tests/queries/0_stateless/02494_query_cache_totals_extremes.reference b/tests/queries/0_stateless/02494_query_cache_totals_extremes.reference
new file mode 100644
index 00000000000..2f6e5e7bd87
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_totals_extremes.reference
@@ -0,0 +1,43 @@
+1st run:
+1	8
+2	2
+
+0	10
+2nd run:
+1	8
+2	2
+
+0	10
+1
+---
+1st run:
+1	8
+2	2
+
+1	2
+2	8
+2nd run:
+1	8
+2	2
+
+1	2
+2	8
+1
+---
+1st run:
+1	8
+2	2
+
+0	10
+
+1	2
+2	8
+2nd run:
+1	8
+2	2
+
+0	10
+
+1	2
+2	8
+1
diff --git a/tests/queries/0_stateless/02494_query_cache_totals_extremes.sql b/tests/queries/0_stateless/02494_query_cache_totals_extremes.sql
new file mode 100644
index 00000000000..8fde4a668c8
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_totals_extremes.sql
@@ -0,0 +1,46 @@
+-- Tags: no-parallel
+-- Tag no-parallel: Messes with internal cache
+
+SYSTEM DROP QUERY CACHE;
+DROP TABLE IF EXISTS tbl;
+
+CREATE TABLE tbl (key UInt64, agg UInt64) ENGINE = MergeTree ORDER BY key;
+INSERT INTO tbl VALUES (1, 3), (2, 2), (1, 4), (1, 1);
+
+-- A query with totals calculation. The result should be written into / read from the query cache.
+-- Check that both queries produce the same result and that a query cache entry exists.
+SELECT '1st run:';
+SELECT key, sum(agg) FROM tbl GROUP BY key WITH totals ORDER BY key SETTINGS use_query_cache = 1;
+SELECT '2nd run:';
+SELECT key, sum(agg) FROM tbl GROUP BY key WITH totals ORDER BY key SETTINGS use_query_cache = 1;
+
+SELECT count(*) FROM system.query_cache;
+
+SELECT '---';
+
+SYSTEM DROP QUERY CACHE;
+
+-- A query with extremes calculation. The result should be written into / read from the query cache.
+-- Check that both queries produce the same result.
+SELECT '1st run:';
+SELECT key, sum(agg) FROM tbl GROUP BY key ORDER BY key SETTINGS use_query_cache = 1, extremes = 1;
+SELECT '2nd run:';
+SELECT key, sum(agg) FROM tbl GROUP BY key ORDER BY key SETTINGS use_query_cache = 1, extremes = 1;
+
+SELECT count(*) FROM system.query_cache;
+
+SELECT '---';
+
+SYSTEM DROP QUERY CACHE;
+
+-- A query with totals and extremes calculation. The result should be written into / read from the query cache.
+-- Check that both queries produce the same result.
+SELECT '1st run:';
+SELECT key, sum(agg) FROM tbl GROUP BY key WITH totals ORDER BY key SETTINGS use_query_cache = 1, extremes = 1;
+SELECT '2nd run:';
+SELECT key, sum(agg) FROM tbl GROUP BY key WITH totals ORDER BY key SETTINGS use_query_cache = 1, extremes = 1;
+
+SELECT count(*) FROM system.query_cache;
+DROP TABLE IF EXISTS tbl;
+
+SYSTEM DROP QUERY CACHE;
diff --git a/tests/queries/0_stateless/02494_query_cache_ttl_long.sql b/tests/queries/0_stateless/02494_query_cache_ttl_long.sql
index 135ddf2195c..acaf34ee81d 100644
--- a/tests/queries/0_stateless/02494_query_cache_ttl_long.sql
+++ b/tests/queries/0_stateless/02494_query_cache_ttl_long.sql
@@ -3,8 +3,6 @@
 -- Tag long: Test runtime is > 6 sec
 -- Tag no-parallel: Messes with internal cache
 
-SET allow_experimental_query_cache = true;
-
 SYSTEM DROP QUERY CACHE;
 
 -- Cache query result into query cache with a TTL of 3 sec
diff --git a/tests/queries/0_stateless/02494_query_cache_user_quotas.reference b/tests/queries/0_stateless/02494_query_cache_user_quotas.reference
new file mode 100644
index 00000000000..ea1f0e76c95
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_user_quotas.reference
@@ -0,0 +1,10 @@
+Run SELECT with quota that current user may use only 1 byte in the query cache	1
+Expect no entries in the query cache	0
+Run SELECT again but w/o quota	1
+Expect one entry in the query cache	1
+---
+Run SELECT which writes its result in the query cache	1
+Run another SELECT with quota that current user may write only 1 entry in the query cache	1
+Expect one entry in the query cache	1
+Run another SELECT w/o quota	1
+Expect two entries in the query cache	2
diff --git a/tests/queries/0_stateless/02494_query_cache_user_quotas.sql b/tests/queries/0_stateless/02494_query_cache_user_quotas.sql
new file mode 100644
index 00000000000..123c9d21101
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_user_quotas.sql
@@ -0,0 +1,29 @@
+-- Tags: no-parallel
+-- Tag no-parallel: Messes with internal cache
+
+-- Tests per-user quotas of the query cache. Settings 'query_cache_max_size_in_bytes' and 'query_cache_max_entries' are actually supposed to
+-- be used in a settings profile, together with a readonly constraint. For simplicity, test both settings stand-alone in a stateless test
+-- instead of an integration test - the relevant logic will still be covered by that.
+
+SYSTEM DROP QUERY CACHE;
+
+SET query_cache_max_size_in_bytes = 1;
+SELECT 'Run SELECT with quota that current user may use only 1 byte in the query cache', 1 SETTINGS use_query_cache = true;
+SELECT 'Expect no entries in the query cache', count(*) FROM system.query_cache;
+
+SET query_cache_max_size_in_bytes = DEFAULT;
+SELECT 'Run SELECT again but w/o quota', 1 SETTINGS use_query_cache = true;
+SELECT 'Expect one entry in the query cache',  count(*) FROM system.query_cache;
+
+SELECT '---';
+SYSTEM DROP QUERY CACHE;
+
+SELECT 'Run SELECT which writes its result in the query cache', 1 SETTINGS use_query_cache = true;
+SET query_cache_max_entries = 1;
+SELECT 'Run another SELECT with quota that current user may write only 1 entry in the query cache', 1 SETTINGS use_query_cache = true;
+SELECT 'Expect one entry in the query cache', count(*) FROM system.query_cache;
+SET query_cache_max_entries = DEFAULT;
+SELECT 'Run another SELECT w/o quota', 1 SETTINGS use_query_cache = true;
+SELECT 'Expect two entries in the query cache', count(*) FROM system.query_cache;
+
+SYSTEM DROP QUERY CACHE;
diff --git a/tests/queries/0_stateless/02494_zero_copy_and_projection_and_mutation_work_together.sql b/tests/queries/0_stateless/02494_zero_copy_and_projection_and_mutation_work_together.sql
index 7a51d86dd30..98427874160 100644
--- a/tests/queries/0_stateless/02494_zero_copy_and_projection_and_mutation_work_together.sql
+++ b/tests/queries/0_stateless/02494_zero_copy_and_projection_and_mutation_work_together.sql
@@ -72,8 +72,8 @@ SYSTEM SYNC REPLICA wikistat2;
 -- Such condition will lead to successful queries.
 SELECT 0 FROM numbers(5) WHERE sleepEachRow(1) = 1;
 
-select sum(hits), count() from wikistat1 GROUP BY project, subproject, path settings allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
-select sum(hits), count() from wikistat2 GROUP BY project, subproject, path settings allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
+select sum(hits), count() from wikistat1 GROUP BY project, subproject, path settings optimize_use_projections = 1, force_optimize_projection = 1;
+select sum(hits), count() from wikistat2 GROUP BY project, subproject, path settings optimize_use_projections = 1, force_optimize_projection = 1;
 
 DROP TABLE wikistat1;
 DROP TABLE wikistat2;
diff --git a/tests/queries/0_stateless/02496_remove_redundant_sorting.reference b/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
index 598ff1a490d..ca1384fd177 100644
--- a/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
@@ -1,21 +1,13 @@
 -- Disabled query_plan_remove_redundant_sorting
 -- ORDER BY clauses in subqueries are untouched
 Expression (Projection)
-Header: number UInt64
   Sorting (Sorting for ORDER BY)
-  Header: number UInt64
     Expression ((Before ORDER BY + Projection))
-    Header: number UInt64
       Sorting (Sorting for ORDER BY)
-      Header: number UInt64
         Expression ((Before ORDER BY + Projection))
-        Header: number UInt64
           Sorting (Sorting for ORDER BY)
-          Header: number UInt64
             Expression (Before ORDER BY)
-            Header: number UInt64
               ReadFromStorage (SystemNumbers)
-              Header: number UInt64
 -- Enabled query_plan_remove_redundant_sorting
 -- ORDER BY removes ORDER BY clauses in subqueries
 -- query
@@ -34,13 +26,9 @@ FROM
 ORDER BY number ASC
 -- explain
 Expression (Projection)
-Header: number UInt64
   Sorting (Sorting for ORDER BY)
-  Header: number UInt64
     Expression ((Before ORDER BY + (Projection + (Before ORDER BY + (Projection + Before ORDER BY)))))
-    Header: number UInt64
       ReadFromStorage (SystemNumbers)
-      Header: number UInt64
 -- execute
 0
 1
@@ -62,19 +50,12 @@ FROM
 ORDER BY number ASC
 -- explain
 Expression (Projection)
-Header: number UInt64
   Sorting (Sorting for ORDER BY)
-  Header: number UInt64
     Expression ((Before ORDER BY + Projection))
-    Header: number UInt64
       Filling
-      Header: number UInt64
         Sorting (Sorting for ORDER BY)
-        Header: number UInt64
           Expression ((Before ORDER BY + (Projection + Before ORDER BY)))
-          Header: number UInt64
             ReadFromStorage (SystemNumbers)
-            Header: number UInt64
 -- execute
 0
 1
@@ -97,21 +78,13 @@ FROM
 ORDER BY number ASC
 -- explain
 Expression (Projection)
-Header: number UInt64
   Sorting (Sorting for ORDER BY)
-  Header: number UInt64
     Expression ((Before ORDER BY + Projection))
-    Header: number UInt64
       LimitBy
-      Header: number UInt64
         Expression (Before LIMIT BY)
-        Header: number UInt64
           Sorting (Sorting for ORDER BY)
-          Header: number UInt64
             Expression ((Before ORDER BY + (Projection + Before ORDER BY)))
-            Header: number UInt64
               ReadFromStorage (SystemNumbers)
-              Header: number UInt64
 -- execute
 0
 1
@@ -142,27 +115,15 @@ FROM
 ) AS t2
 -- explain
 Expression ((Projection + Before ORDER BY))
-Header: number UInt64
-        t2.number UInt64
   Join (JOIN FillRightFirst)
-  Header: number UInt64
-          t2.number UInt64
     Expression ((Before JOIN + Projection))
-    Header: number UInt64
       Sorting (Sorting for ORDER BY)
-      Header: number UInt64
         Expression ((Before ORDER BY + (Projection + Before ORDER BY)))
-        Header: number UInt64
           ReadFromStorage (SystemNumbers)
-          Header: number UInt64
     Expression ((Joined actions + (Rename joined columns + Projection)))
-    Header: t2.number UInt64
       Sorting (Sorting for ORDER BY)
-      Header: number UInt64
         Expression ((Before ORDER BY + (Projection + Before ORDER BY)))
-        Header: number UInt64
           ReadFromStorage (SystemNumbers)
-          Header: number UInt64
 -- execute
 0	2
 0	1
@@ -200,25 +161,13 @@ FROM
 ORDER BY t1.number, t2.number
 -- explain
 Expression (Projection)
-Header: number UInt64
-        t2.number UInt64
   Sorting (Sorting for ORDER BY)
-  Header: number UInt64
-          t2.number UInt64
     Expression (Before ORDER BY)
-    Header: number UInt64
-            t2.number UInt64
       Join (JOIN FillRightFirst)
-      Header: number UInt64
-              t2.number UInt64
         Expression ((Before JOIN + (Projection + (Before ORDER BY + (Projection + Before ORDER BY)))))
-        Header: number UInt64
           ReadFromStorage (SystemNumbers)
-          Header: number UInt64
         Expression ((Joined actions + (Rename joined columns + (Projection + (Before ORDER BY + (Projection + Before ORDER BY))))))
-        Header: t2.number UInt64
           ReadFromStorage (SystemNumbers)
-          Header: number UInt64
 -- execute
 0	0
 0	1
@@ -246,14 +195,9 @@ FROM
 GROUP BY number
 -- explain
 Expression ((Projection + Before ORDER BY))
-Header: sum(number) UInt64
   Aggregating
-  Header: number UInt64
-          sum(number) UInt64
     Expression ((Before GROUP BY + (Projection + (Before ORDER BY + (Projection + Before ORDER BY)))))
-    Header: number UInt64
       ReadFromStorage (SystemNumbers)
-      Header: number UInt64
 -- execute
 0
 2
@@ -275,13 +219,9 @@ FROM
 GROUP BY number
 -- explain
 Expression ((Projection + Before ORDER BY))
-Header: number UInt64
   Aggregating
-  Header: number UInt64
     Expression ((Before GROUP BY + (Projection + (Before ORDER BY + (Projection + Before ORDER BY)))))
-    Header: number UInt64
       ReadFromStorage (SystemNumbers)
-      Header: number UInt64
 -- execute
 0
 2
@@ -297,13 +237,9 @@ FROM
 )
 -- explain
 Expression ((Projection + Before ORDER BY))
-Header: sum(number) UInt64
   Aggregating
-  Header: sum(number) UInt64
     Expression ((Before GROUP BY + (Projection + Before ORDER BY)))
-    Header: number UInt64
       ReadFromStorage (SystemNumbers)
-      Header: number UInt64
 -- execute
 45
 -- check that optimization is applied recursively to subqueries as well
@@ -324,18 +260,11 @@ FROM
 ORDER BY a ASC
 -- explain
 Expression (Projection)
-Header: a UInt64
   Sorting (Sorting for ORDER BY)
-  Header: a UInt64
     Expression ((Before ORDER BY + (Projection + Before ORDER BY)))
-    Header: a UInt64
       Aggregating
-      Header: number UInt64
-              sum(number) UInt64
         Expression ((Before GROUP BY + (Projection + Before ORDER BY)))
-        Header: number UInt64
           ReadFromStorage (SystemNumbers)
-          Header: number UInt64
 -- execute
 0
 1
@@ -357,17 +286,11 @@ FROM
 ORDER BY a ASC
 -- explain
 Expression (Projection)
-Header: a UInt64
   Sorting (Sorting for ORDER BY)
-  Header: a UInt64
     Expression ((Before ORDER BY + (Projection + Before ORDER BY)))
-    Header: a UInt64
       Aggregating
-      Header: number UInt64
         Expression ((Before GROUP BY + (Projection + Before ORDER BY)))
-        Header: number UInt64
           ReadFromStorage (SystemNumbers)
-          Header: number UInt64
 -- execute
 0
 1
@@ -394,15 +317,10 @@ FROM
 WHERE a > 0
 -- explain
 Expression ((Projection + (Before ORDER BY + )))
-Header: a UInt64
   Aggregating
-  Header: number UInt64
     Filter
-    Header: number UInt64
       Filter (( + (Before GROUP BY + (Projection + (Before ORDER BY + (Projection + Before ORDER BY))))))
-      Header: number UInt64
         ReadFromStorage (SystemNumbers)
-        Header: number UInt64
 -- execute
 2
 1
@@ -424,17 +342,11 @@ FROM
 ORDER BY number ASC
 -- explain
 Expression (Projection)
-Header: number UInt64
   Sorting (Sorting for ORDER BY)
-  Header: number UInt64
     Expression ((Before ORDER BY + (Projection + (Before ORDER BY + (Projection + Before ORDER BY)))))
-    Header: number UInt64
       Aggregating
-      Header: number UInt64
         Expression (Before GROUP BY)
-        Header: number UInt64
           ReadFromStorage (SystemNumbers)
-          Header: number UInt64
 -- execute
 0
 1
@@ -459,28 +371,16 @@ FROM
 )
 -- explain
 Expression ((Projection + Before ORDER BY))
-Header: toTypeName(sum(v)) String
-        sum(v) Float64
   Aggregating
-  Header: sum(v) Float64
     Expression ((Before GROUP BY + Projection))
-    Header: v Float64
       Sorting (Sorting for ORDER BY)
-      Header: v Float64
         Union
-        Header: v Float64
           Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
-          Header: v Float64
             ReadFromStorage (SystemOne)
-            Header: dummy UInt8
           Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
-          Header: v Float64
             ReadFromStorage (SystemOne)
-            Header: dummy UInt8
           Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
-          Header: v Float64
             ReadFromStorage (SystemOne)
-            Header: dummy UInt8
 -- execute
 Float64	9007199254740994
 -- sum() with Nullable(Floats) depends on order, -> sorting is not removed here
@@ -503,28 +403,16 @@ FROM
 )
 -- explain
 Expression ((Projection + Before ORDER BY))
-Header: toTypeName(sum(v)) String
-        sum(v) Nullable(Float64)
   Aggregating
-  Header: sum(v) Nullable(Float64)
     Expression ((Before GROUP BY + Projection))
-    Header: v Nullable(Float64)
       Sorting (Sorting for ORDER BY)
-      Header: v Nullable(Float64)
         Union
-        Header: v Nullable(Float64)
           Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
-          Header: v Nullable(Float64)
             ReadFromStorage (SystemOne)
-            Header: dummy UInt8
           Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
-          Header: v Nullable(Float64)
             ReadFromStorage (SystemOne)
-            Header: dummy UInt8
           Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
-          Header: v Nullable(Float64)
             ReadFromStorage (SystemOne)
-            Header: dummy UInt8
 -- execute
 Nullable(Float64)	9007199254740994
 -- sumIf() with Floats depends on order, -> sorting is not removed here
@@ -547,29 +435,16 @@ FROM
 )
 -- explain
 Expression ((Projection + Before ORDER BY))
-Header: toTypeName(sumIf(v, greater(v, 0))) String
-        sumIf(v, greater(v, 0)) Float64
   Aggregating
-  Header: sumIf(v, greater(v, 0)) Float64
     Expression ((Before GROUP BY + Projection))
-    Header: v Float64
-            greater(v, 0) UInt8
       Sorting (Sorting for ORDER BY)
-      Header: v Float64
         Union
-        Header: v Float64
           Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
-          Header: v Float64
             ReadFromStorage (SystemOne)
-            Header: dummy UInt8
           Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
-          Header: v Float64
             ReadFromStorage (SystemOne)
-            Header: dummy UInt8
           Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
-          Header: v Float64
             ReadFromStorage (SystemOne)
-            Header: dummy UInt8
 -- execute
 Float64	9007199254740994
 -- disable common optimization to avoid functions to be lifted up (liftUpFunctions optimization), needed for testing with stateful function
@@ -587,22 +462,12 @@ FROM
 ORDER BY number ASC
 -- explain
 Expression (Projection)
-Header: number UInt64
-        neighbor(number, 2) UInt64
   Sorting (Sorting for ORDER BY)
-  Header: number UInt64
-          neighbor(number, 2) UInt64
     Expression (Before ORDER BY)
-    Header: number UInt64
-            neighbor(number, 2) UInt64
       Expression (Projection)
-      Header: number UInt64
         Sorting (Sorting for ORDER BY)
-        Header: number UInt64
           Expression (Before ORDER BY)
-          Header: number UInt64
             ReadFromStorage (SystemNumbers)
-            Header: number UInt64
 -- execute
 0	0
 1	0
@@ -627,19 +492,11 @@ FROM
 )
 -- explain
 Expression (Projection)
-Header: number UInt64
-        plus(number, 2) UInt64
   Expression (Before ORDER BY)
-  Header: number UInt64
-          plus(number, 2) UInt64
     Expression (Projection)
-    Header: number UInt64
       Sorting (Sorting for ORDER BY)
-      Header: number UInt64
         Expression (Before ORDER BY)
-        Header: number UInt64
           ReadFromStorage (SystemNumbers)
-          Header: number UInt64
 -- execute
 9	11
 8	10
diff --git a/tests/queries/0_stateless/02496_remove_redundant_sorting.sh b/tests/queries/0_stateless/02496_remove_redundant_sorting.sh
index 45d8e188824..8b529c26d93 100755
--- a/tests/queries/0_stateless/02496_remove_redundant_sorting.sh
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting.sh
@@ -4,8 +4,12 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-DISABLE_OPTIMIZATION="SET query_plan_remove_redundant_sorting=0;SET optimize_duplicate_order_by_and_distinct=0"
-ENABLE_OPTIMIZATION="SET query_plan_remove_redundant_sorting=1;SET optimize_duplicate_order_by_and_distinct=0"
+if [ -z ${ENABLE_ANALYZER+x} ]; then
+    ENABLE_ANALYZER=0
+fi
+
+DISABLE_OPTIMIZATION="SET allow_experimental_analyzer=$ENABLE_ANALYZER;SET query_plan_remove_redundant_sorting=0;SET optimize_duplicate_order_by_and_distinct=0"
+ENABLE_OPTIMIZATION="SET allow_experimental_analyzer=$ENABLE_ANALYZER;SET query_plan_remove_redundant_sorting=1;SET optimize_duplicate_order_by_and_distinct=0"
 
 echo "-- Disabled query_plan_remove_redundant_sorting"
 echo "-- ORDER BY clauses in subqueries are untouched"
@@ -22,13 +26,13 @@ FROM
     ORDER BY number DESC
 )
 ORDER BY number ASC"
-$CLICKHOUSE_CLIENT -nq "$DISABLE_OPTIMIZATION;EXPLAIN header=1 $query"
+$CLICKHOUSE_CLIENT -nq "$DISABLE_OPTIMIZATION;EXPLAIN $query"
 
 function run_query {
     echo "-- query"
     echo "$1"
     echo "-- explain"
-    $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;EXPLAIN header=1 $1"
+    $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;EXPLAIN $1"
     echo "-- execute"
     $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;$1"
 }
diff --git a/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference b/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference
new file mode 100644
index 00000000000..ddc89a72821
--- /dev/null
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference
@@ -0,0 +1,523 @@
+-- Disabled query_plan_remove_redundant_sorting
+-- ORDER BY clauses in subqueries are untouched
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + Project names))))
+      Sorting (Sorting for ORDER BY)
+        Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + Project names))))
+          Sorting (Sorting for ORDER BY)
+            Expression ((Before ORDER BY + (Projection + Change column names to column identifiers)))
+              ReadFromStorage (SystemNumbers)
+-- Enabled query_plan_remove_redundant_sorting
+-- ORDER BY removes ORDER BY clauses in subqueries
+-- query
+SELECT *
+FROM
+(
+    SELECT *
+    FROM
+    (
+        SELECT *
+        FROM numbers(3)
+        ORDER BY number ASC
+    )
+    ORDER BY number DESC
+)
+ORDER BY number ASC
+-- explain
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))))))
+      ReadFromStorage (SystemNumbers)
+-- execute
+0
+1
+2
+-- ORDER BY cannot remove ORDER BY in subquery WITH FILL
+-- query
+SELECT *
+FROM
+(
+    SELECT *
+    FROM
+    (
+        SELECT *
+        FROM numbers(3)
+        ORDER BY number DESC
+    )
+    ORDER BY number ASC WITH FILL STEP 1
+)
+ORDER BY number ASC
+-- explain
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + Project names))))
+      Filling
+        Sorting (Sorting for ORDER BY)
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemNumbers)
+-- execute
+0
+1
+2
+-- ORDER BY cannot remove ORDER BY in subquery with LIMIT BY
+-- query
+SELECT *
+FROM
+(
+    SELECT *
+    FROM
+    (
+        SELECT *
+        FROM numbers(3)
+        ORDER BY number DESC
+    )
+    ORDER BY number ASC
+    LIMIT 1 BY number
+)
+ORDER BY number ASC
+-- explain
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + Project names))))
+      LimitBy
+        Expression (Before LIMIT BY)
+          Sorting (Sorting for ORDER BY)
+            Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
+              ReadFromStorage (SystemNumbers)
+-- execute
+0
+1
+2
+-- CROSS JOIN with subqueries, nor ORDER BY nor GROUP BY in main query -> only ORDER BY clauses in most inner subqueries will be removed
+-- query
+SELECT *
+FROM
+(
+    SELECT number
+    FROM
+    (
+        SELECT number
+        FROM numbers(3)
+        ORDER BY number DESC
+    )
+    ORDER BY number ASC
+) AS t1,
+(
+    SELECT number
+    FROM
+    (
+        SELECT number
+        FROM numbers(3)
+        ORDER BY number ASC
+    )
+    ORDER BY number DESC
+) AS t2
+-- explain
+Expression ((Project names + (Projection + DROP unused columns after JOIN)))
+  Join (JOIN FillRightFirst)
+    Expression ((Change column names to column identifiers + Project names))
+      Sorting (Sorting for ORDER BY)
+        Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
+          ReadFromStorage (SystemNumbers)
+    Expression ((Change column names to column identifiers + Project names))
+      Sorting (Sorting for ORDER BY)
+        Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
+          ReadFromStorage (SystemNumbers)
+-- execute
+0	2
+0	1
+0	0
+1	2
+1	1
+1	0
+2	2
+2	1
+2	0
+-- CROSS JOIN with subqueries, ORDER BY in main query -> all ORDER BY clauses will be removed in subqueries
+-- query
+SELECT *
+FROM
+(
+    SELECT number
+    FROM
+    (
+        SELECT number
+        FROM numbers(3)
+        ORDER BY number DESC
+    )
+    ORDER BY number ASC
+) AS t1,
+(
+    SELECT number
+    FROM
+    (
+        SELECT number
+        FROM numbers(3)
+        ORDER BY number ASC
+    )
+    ORDER BY number DESC
+) AS t2
+ORDER BY t1.number, t2.number
+-- explain
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression ((Before ORDER BY + (Projection + DROP unused columns after JOIN)))
+      Join (JOIN FillRightFirst)
+        Expression ((Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))))
+          ReadFromStorage (SystemNumbers)
+        Expression ((Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))))
+          ReadFromStorage (SystemNumbers)
+-- execute
+0	0
+0	1
+0	2
+1	0
+1	1
+1	2
+2	0
+2	1
+2	2
+-- GROUP BY with aggregation function which does NOT depend on order -> eliminate ORDER BY(s) in _all_ subqueries
+-- query
+SELECT sum(number)
+FROM
+(
+    SELECT *
+    FROM
+    (
+        SELECT *
+        FROM numbers(3)
+        ORDER BY number ASC
+    )
+    ORDER BY number DESC
+)
+GROUP BY number
+-- explain
+Expression ((Project names + Projection))
+  Aggregating
+    Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers))))))))))
+      ReadFromStorage (SystemNumbers)
+-- execute
+0
+2
+1
+-- GROUP BY with aggregation function which depends on order -> keep ORDER BY in first subquery, and eliminate in second subquery
+-- query
+SELECT any(number)
+FROM
+(
+    SELECT *
+    FROM
+    (
+        SELECT *
+        FROM numbers(3)
+        ORDER BY number ASC
+    )
+    ORDER BY number DESC
+)
+GROUP BY number
+-- explain
+Expression ((Project names + Projection))
+  Aggregating
+    Expression ((Before GROUP BY + (Change column names to column identifiers + Project names)))
+      Sorting (Sorting for ORDER BY)
+        Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
+          ReadFromStorage (SystemNumbers)
+-- execute
+0
+2
+1
+-- query with aggregation function but w/o GROUP BY -> remove sorting
+-- query
+SELECT sum(number)
+FROM
+(
+    SELECT *
+    FROM numbers(10)
+    ORDER BY number DESC
+)
+-- explain
+Expression ((Project names + Projection))
+  Aggregating
+    Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers))))))
+      ReadFromStorage (SystemNumbers)
+-- execute
+45
+-- check that optimization is applied recursively to subqueries as well
+-- GROUP BY with aggregation function which does NOT depend on order -> eliminate ORDER BY in most inner subquery here
+-- query
+SELECT a
+FROM
+(
+    SELECT sum(number) AS a
+    FROM
+    (
+        SELECT *
+        FROM numbers(3)
+        ORDER BY number ASC
+    )
+    GROUP BY number
+)
+ORDER BY a ASC
+-- explain
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + Projection)))))
+      Aggregating
+        Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers))))))
+          ReadFromStorage (SystemNumbers)
+-- execute
+0
+1
+2
+-- GROUP BY with aggregation function which depends on order -> ORDER BY in subquery is kept due to the aggregation function
+-- query
+SELECT a
+FROM
+(
+    SELECT any(number) AS a
+    FROM
+    (
+        SELECT *
+        FROM numbers(3)
+        ORDER BY number ASC
+    )
+    GROUP BY number
+)
+ORDER BY a ASC
+-- explain
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + Projection)))))
+      Aggregating
+        Expression ((Before GROUP BY + (Change column names to column identifiers + Project names)))
+          Sorting (Sorting for ORDER BY)
+            Expression ((Before ORDER BY + (Projection + Change column names to column identifiers)))
+              ReadFromStorage (SystemNumbers)
+-- execute
+0
+1
+2
+-- Check that optimization works for subqueries as well, - main query have neither ORDER BY nor GROUP BY
+-- query
+SELECT a
+FROM
+(
+    SELECT any(number) AS a
+    FROM
+    (
+        SELECT *
+        FROM
+        (
+            SELECT *
+            FROM numbers(3)
+            ORDER BY number DESC
+        )
+        ORDER BY number ASC
+    )
+    GROUP BY number
+)
+WHERE a > 0
+-- explain
+Expression ((Project names + Projection))
+  Filter ((WHERE + (Change column names to column identifiers + (Project names + Projection))))
+    Aggregating
+      Expression ((Before GROUP BY + (Change column names to column identifiers + Project names)))
+        Sorting (Sorting for ORDER BY)
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemNumbers)
+-- execute
+2
+1
+-- GROUP BY in most inner query makes execution parallelized, and removing inner sorting steps will keep it that way. But need to correctly update data streams sorting properties after removing sorting steps
+-- query
+SELECT *
+FROM
+(
+    SELECT *
+    FROM
+    (
+        SELECT *
+        FROM numbers(3)
+        GROUP BY number
+        ORDER BY number ASC
+    )
+    ORDER BY number ASC
+)
+ORDER BY number ASC
+-- explain
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + Projection))))))))))
+      Aggregating
+        Expression ((Before GROUP BY + Change column names to column identifiers))
+          ReadFromStorage (SystemNumbers)
+-- execute
+0
+1
+2
+-- sum() with Floats depends on order, -> sorting is not removed here
+-- query
+SELECT
+    toTypeName(sum(v)),
+    sum(v)
+FROM
+(
+    SELECT v
+    FROM
+    (
+        SELECT CAST('9007199254740992', 'Float64') AS v
+        UNION ALL
+        SELECT CAST('1', 'Float64') AS v
+        UNION ALL
+        SELECT CAST('1', 'Float64') AS v
+    )
+    ORDER BY v ASC
+)
+-- explain
+Expression ((Project names + Projection))
+  Aggregating
+    Expression ((Before GROUP BY + (Change column names to column identifiers + Project names)))
+      Sorting (Sorting for ORDER BY)
+        Union
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemOne)
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemOne)
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemOne)
+-- execute
+Float64	9007199254740994
+-- sum() with Nullable(Floats) depends on order, -> sorting is not removed here
+-- query
+SELECT
+    toTypeName(sum(v)),
+    sum(v)
+FROM
+(
+    SELECT v
+    FROM
+    (
+        SELECT '9007199254740992'::Nullable(Float64) AS v
+        UNION ALL
+        SELECT '1'::Nullable(Float64) AS v
+        UNION ALL
+        SELECT '1'::Nullable(Float64) AS v
+    )
+    ORDER BY v ASC
+)
+-- explain
+Expression ((Project names + Projection))
+  Aggregating
+    Expression ((Before GROUP BY + (Change column names to column identifiers + Project names)))
+      Sorting (Sorting for ORDER BY)
+        Union
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemOne)
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemOne)
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemOne)
+-- execute
+Nullable(Float64)	9007199254740994
+-- sumIf() with Floats depends on order, -> sorting is not removed here
+-- query
+SELECT
+    toTypeName(sumIf(v, v > 0)),
+    sumIf(v, v > 0)
+FROM
+(
+    SELECT v
+    FROM
+    (
+        SELECT CAST('9007199254740992', 'Float64') AS v
+        UNION ALL
+        SELECT CAST('1', 'Float64') AS v
+        UNION ALL
+        SELECT CAST('1', 'Float64') AS v
+    )
+    ORDER BY v ASC
+)
+-- explain
+Expression ((Project names + Projection))
+  Aggregating
+    Expression ((Before GROUP BY + (Change column names to column identifiers + Project names)))
+      Sorting (Sorting for ORDER BY)
+        Union
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemOne)
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemOne)
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+            ReadFromStorage (SystemOne)
+-- execute
+Float64	9007199254740994
+-- disable common optimization to avoid functions to be lifted up (liftUpFunctions optimization), needed for testing with stateful function
+-- neighbor() as stateful function prevents removing inner ORDER BY since its result depends on order
+-- query
+SELECT
+    number,
+    neighbor(number, 2)
+FROM
+(
+    SELECT *
+    FROM numbers(10)
+    ORDER BY number DESC
+)
+ORDER BY number ASC
+-- explain
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression (Before ORDER BY)
+      Expression (Projection)
+        Expression (Change column names to column identifiers)
+          Expression (Project names)
+            Sorting (Sorting for ORDER BY)
+              Expression (Before ORDER BY)
+                Expression (Projection)
+                  Expression (Change column names to column identifiers)
+                    ReadFromStorage (SystemNumbers)
+-- execute
+0	0
+1	0
+2	0
+3	1
+4	2
+5	3
+6	4
+7	5
+8	6
+9	7
+-- non-stateful function does _not_ prevent removing inner ORDER BY
+-- query
+SELECT
+    number,
+    plus(number, 2)
+FROM
+(
+    SELECT *
+    FROM numbers(10)
+    ORDER BY number DESC
+)
+-- explain
+Expression (Project names)
+  Expression (Projection)
+    Expression (Change column names to column identifiers)
+      Expression (Project names)
+        Sorting (Sorting for ORDER BY)
+          Expression (Before ORDER BY)
+            Expression (Projection)
+              Expression (Change column names to column identifiers)
+                ReadFromStorage (SystemNumbers)
+-- execute
+9	11
+8	10
+7	9
+6	8
+5	7
+4	6
+3	5
+2	4
+1	3
+0	2
diff --git a/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.sh b/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.sh
new file mode 100755
index 00000000000..3913609fdd2
--- /dev/null
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# shellcheck source=./02496_remove_redundant_sorting.sh
+ENABLE_ANALYZER=1 . "$CURDIR"/02496_remove_redundant_sorting.sh
diff --git a/tests/queries/0_stateless/02497_if_transform_strings_to_enum.reference b/tests/queries/0_stateless/02497_if_transform_strings_to_enum.reference
index c6265e195c4..a1a653361ee 100644
--- a/tests/queries/0_stateless/02497_if_transform_strings_to_enum.reference
+++ b/tests/queries/0_stateless/02497_if_transform_strings_to_enum.reference
@@ -37,7 +37,7 @@ QUERY id: 0
   JOIN TREE
     TABLE id: 7, table_name: system.numbers
   LIMIT
-    CONSTANT id: 17, constant_value: UInt64_10, constant_value_type: UInt8
+    CONSTANT id: 17, constant_value: UInt64_10, constant_value_type: UInt64
 google
 google
 google
@@ -80,7 +80,7 @@ QUERY id: 0
   JOIN TREE
     TABLE id: 9, table_name: system.numbers
   LIMIT
-    CONSTANT id: 19, constant_value: UInt64_10, constant_value_type: UInt8
+    CONSTANT id: 19, constant_value: UInt64_10, constant_value_type: UInt64
 other1
 other1
 google1
@@ -124,7 +124,7 @@ QUERY id: 0
   JOIN TREE
     TABLE id: 9, table_name: system.numbers
   LIMIT
-    CONSTANT id: 20, constant_value: UInt64_10, constant_value_type: UInt8
+    CONSTANT id: 20, constant_value: UInt64_10, constant_value_type: UInt64
 google1
 google1
 google1
@@ -171,7 +171,7 @@ QUERY id: 0
   JOIN TREE
     TABLE id: 11, table_name: system.numbers
   LIMIT
-    CONSTANT id: 22, constant_value: UInt64_10, constant_value_type: UInt8
+    CONSTANT id: 22, constant_value: UInt64_10, constant_value_type: UInt64
 google
 google
 google
@@ -225,7 +225,7 @@ QUERY id: 0
       JOIN TREE
         TABLE id: 12, table_name: system.numbers
       LIMIT
-        CONSTANT id: 22, constant_value: UInt64_10, constant_value_type: UInt8
+        CONSTANT id: 22, constant_value: UInt64_10, constant_value_type: UInt64
 other
 other
 google
@@ -276,7 +276,7 @@ QUERY id: 0
       JOIN TREE
         TABLE id: 10, table_name: system.numbers
       LIMIT
-        CONSTANT id: 20, constant_value: UInt64_10, constant_value_type: UInt8
+        CONSTANT id: 20, constant_value: UInt64_10, constant_value_type: UInt64
 google	google
 google	google
 google	google
@@ -343,7 +343,7 @@ QUERY id: 0
   JOIN TREE
     TABLE id: 9, table_name: system.numbers
   LIMIT
-    CONSTANT id: 19, constant_value: UInt64_10, constant_value_type: UInt8
+    CONSTANT id: 19, constant_value: UInt64_10, constant_value_type: UInt64
 other	other
 other	other
 google	google
@@ -404,17 +404,7 @@ QUERY id: 0
   JOIN TREE
     TABLE id: 7, table_name: system.numbers
   LIMIT
-    CONSTANT id: 17, constant_value: UInt64_10, constant_value_type: UInt8
-\N
-\N
-\N
-\N
-\N
-\N
-\N
-\N
-\N
-\N
+    CONSTANT id: 17, constant_value: UInt64_10, constant_value_type: UInt64
 SELECT transform(number, [NULL], _CAST([\'google\', \'censor.net\', \'yahoo\'], \'Array(Enum8(\\\'censor.net\\\' = 1, \\\'google\\\' = 2, \\\'other\\\' = 3, \\\'yahoo\\\' = 4))\'), _CAST(\'other\', \'Enum8(\\\'censor.net\\\' = 1, \\\'google\\\' = 2, \\\'other\\\' = 3, \\\'yahoo\\\' = 4)\'))
 FROM
 (
@@ -424,56 +414,38 @@ FROM
 )
 QUERY id: 0
   PROJECTION COLUMNS
-    transform(number, [NULL], [\'google\', \'censor.net\', \'yahoo\'], \'other\') Nullable(Nothing)
+    transform(number, [NULL], [\'google\', \'censor.net\', \'yahoo\'], \'other\') String
   PROJECTION
     LIST id: 1, nodes: 1
-      FUNCTION id: 2, function_name: transform, function_type: ordinary, result_type: Nullable(Nothing)
+      FUNCTION id: 2, function_name: toString, function_type: ordinary, result_type: String
         ARGUMENTS
-          LIST id: 3, nodes: 4
-            COLUMN id: 4, column_name: number, result_type: Nullable(Nothing), source_id: 5
-            CONSTANT id: 6, constant_value: Array_[NULL], constant_value_type: Array(Nullable(Nothing))
-            CONSTANT id: 7, constant_value: Array_[\'google\', \'censor.net\', \'yahoo\'], constant_value_type: Array(String)
-            CONSTANT id: 8, constant_value: \'other\', constant_value_type: String
+          LIST id: 3, nodes: 1
+            FUNCTION id: 4, function_name: transform, function_type: ordinary, result_type: Enum8(\'censor.net\' = 1, \'google\' = 2, \'other\' = 3, \'yahoo\' = 4)
+              ARGUMENTS
+                LIST id: 5, nodes: 4
+                  COLUMN id: 6, column_name: number, result_type: Nullable(Nothing), source_id: 7
+                  CONSTANT id: 8, constant_value: Array_[NULL], constant_value_type: Array(Nullable(Nothing))
+                  FUNCTION id: 9, function_name: _CAST, function_type: ordinary, result_type: Array(Enum8(\'censor.net\' = 1, \'google\' = 2, \'other\' = 3, \'yahoo\' = 4))
+                    ARGUMENTS
+                      LIST id: 10, nodes: 2
+                        CONSTANT id: 11, constant_value: Array_[\'google\', \'censor.net\', \'yahoo\'], constant_value_type: Array(String)
+                        CONSTANT id: 12, constant_value: \'Array(Enum8(\\\'censor.net\\\' = 1, \\\'google\\\' = 2, \\\'other\\\' = 3, \\\'yahoo\\\' = 4))\', constant_value_type: String
+                  FUNCTION id: 13, function_name: _CAST, function_type: ordinary, result_type: Enum8(\'censor.net\' = 1, \'google\' = 2, \'other\' = 3, \'yahoo\' = 4)
+                    ARGUMENTS
+                      LIST id: 14, nodes: 2
+                        CONSTANT id: 15, constant_value: \'other\', constant_value_type: String
+                        CONSTANT id: 16, constant_value: \'Enum8(\\\'censor.net\\\' = 1, \\\'google\\\' = 2, \\\'other\\\' = 3, \\\'yahoo\\\' = 4)\', constant_value_type: String
   JOIN TREE
-    QUERY id: 5, is_subquery: 1
+    QUERY id: 7, is_subquery: 1
       PROJECTION COLUMNS
         number Nullable(Nothing)
       PROJECTION
-        LIST id: 9, nodes: 1
-          CONSTANT id: 10, constant_value: NULL, constant_value_type: Nullable(Nothing)
+        LIST id: 17, nodes: 1
+          CONSTANT id: 18, constant_value: NULL, constant_value_type: Nullable(Nothing)
       JOIN TREE
-        TABLE id: 11, table_name: system.numbers
+        TABLE id: 19, table_name: system.numbers
       LIMIT
-        CONSTANT id: 12, constant_value: UInt64_10, constant_value_type: UInt8
-\N
-\N
-\N
-\N
-\N
-\N
-\N
-\N
-\N
-\N
-SELECT transform(number, NULL, _CAST([\'google\', \'censor.net\', \'yahoo\'], \'Array(Enum8(\\\'censor.net\\\' = 1, \\\'google\\\' = 2, \\\'other\\\' = 3, \\\'yahoo\\\' = 4))\'), _CAST(\'other\', \'Enum8(\\\'censor.net\\\' = 1, \\\'google\\\' = 2, \\\'other\\\' = 3, \\\'yahoo\\\' = 4)\'))
-FROM system.numbers
-LIMIT 10
-QUERY id: 0
-  PROJECTION COLUMNS
-    transform(number, NULL, [\'google\', \'censor.net\', \'yahoo\'], \'other\') Nullable(Nothing)
-  PROJECTION
-    LIST id: 1, nodes: 1
-      FUNCTION id: 2, function_name: transform, function_type: ordinary, result_type: Nullable(Nothing)
-        ARGUMENTS
-          LIST id: 3, nodes: 4
-            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
-            CONSTANT id: 6, constant_value: NULL, constant_value_type: Nullable(Nothing)
-            CONSTANT id: 7, constant_value: Array_[\'google\', \'censor.net\', \'yahoo\'], constant_value_type: Array(String)
-            CONSTANT id: 8, constant_value: \'other\', constant_value_type: String
-  JOIN TREE
-    TABLE id: 5, table_name: system.numbers
-  LIMIT
-    CONSTANT id: 9, constant_value: UInt64_10, constant_value_type: UInt8
+        CONSTANT id: 20, constant_value: UInt64_10, constant_value_type: UInt64
 other
 other
 google
@@ -502,7 +474,7 @@ QUERY id: 0
   JOIN TREE
     TABLE id: 5, table_name: system.numbers
   LIMIT
-    CONSTANT id: 9, constant_value: UInt64_10, constant_value_type: UInt8
+    CONSTANT id: 9, constant_value: UInt64_10, constant_value_type: UInt64
 google
 google
 google
@@ -534,4 +506,4 @@ QUERY id: 0
   JOIN TREE
     TABLE id: 7, table_name: system.numbers
   LIMIT
-    CONSTANT id: 11, constant_value: UInt64_10, constant_value_type: UInt8
+    CONSTANT id: 11, constant_value: UInt64_10, constant_value_type: UInt64
diff --git a/tests/queries/0_stateless/02497_if_transform_strings_to_enum.sql b/tests/queries/0_stateless/02497_if_transform_strings_to_enum.sql
index c23046c7b20..492d42cb6bc 100644
--- a/tests/queries/0_stateless/02497_if_transform_strings_to_enum.sql
+++ b/tests/queries/0_stateless/02497_if_transform_strings_to_enum.sql
@@ -33,13 +33,13 @@ SELECT transform(number, [2, 4, 6], ['google', 'censor.net', 'yahoo'], 'other')
 EXPLAIN SYNTAX SELECT transform(number, [2, 4, 6], ['google', 'censor.net', 'yahoo'], 'other') as value, value FROM system.numbers LIMIT 10;
 EXPLAIN QUERY TREE run_passes = 1 SELECT transform(number, [2, 4, 6], ['google', 'censor.net', 'yahoo'], 'other') as value, value FROM system.numbers LIMIT 10;
 
-SELECT transform(number, [NULL], ['google', 'censor.net', 'yahoo'], 'other') FROM (SELECT NULL as number FROM system.numbers LIMIT 10);
+SELECT transform(number, [NULL], ['google', 'censor.net', 'yahoo'], 'other') FROM (SELECT NULL as number FROM system.numbers LIMIT 10); -- { serverError 36 }
 EXPLAIN SYNTAX SELECT transform(number, [NULL], ['google', 'censor.net', 'yahoo'], 'other') FROM (SELECT NULL as number FROM system.numbers LIMIT 10);
 EXPLAIN QUERY TREE run_passes = 1 SELECT transform(number, [NULL], ['google', 'censor.net', 'yahoo'], 'other') FROM (SELECT NULL as number FROM system.numbers LIMIT 10);
 
-SELECT transform(number, NULL, ['google', 'censor.net', 'yahoo'], 'other') FROM system.numbers LIMIT 10;
-EXPLAIN SYNTAX SELECT transform(number, NULL, ['google', 'censor.net', 'yahoo'], 'other') FROM system.numbers LIMIT 10;
-EXPLAIN QUERY TREE run_passes = 1 SELECT transform(number, NULL, ['google', 'censor.net', 'yahoo'], 'other') FROM system.numbers LIMIT 10;
+SELECT transform(number, NULL, ['google', 'censor.net', 'yahoo'], 'other') FROM system.numbers LIMIT 10; -- { serverError 43 }
+EXPLAIN SYNTAX SELECT transform(number, NULL, ['google', 'censor.net', 'yahoo'], 'other') FROM system.numbers LIMIT 10; -- { serverError 43 }
+EXPLAIN QUERY TREE run_passes = 1 SELECT transform(number, NULL, ['google', 'censor.net', 'yahoo'], 'other') FROM system.numbers LIMIT 10; -- { serverError 43 }
 
 SET optimize_if_transform_strings_to_enum = 0;
 
diff --git a/tests/queries/0_stateless/02497_storage_file_reader_selection.reference b/tests/queries/0_stateless/02497_storage_file_reader_selection.reference
index 8da37e4219c..680eb502aaa 100644
--- a/tests/queries/0_stateless/02497_storage_file_reader_selection.reference
+++ b/tests/queries/0_stateless/02497_storage_file_reader_selection.reference
@@ -1,10 +1,4 @@
-key
-foo
-bar
 1
 0
-key
-foo
-bar
 0
 1
diff --git a/tests/queries/0_stateless/02497_storage_file_reader_selection.sh b/tests/queries/0_stateless/02497_storage_file_reader_selection.sh
index 4d9336bc1a0..20bde68718d 100755
--- a/tests/queries/0_stateless/02497_storage_file_reader_selection.sh
+++ b/tests/queries/0_stateless/02497_storage_file_reader_selection.sh
@@ -4,24 +4,13 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
-
-DATA_FILE=$USER_FILES_PATH/test_02497_storage_file_reader.data
+DATA_FILE=test_02497_$CLICKHOUSE_TEST_UNIQUE_NAME.tsv
 echo -e 'key\nfoo\nbar' > $DATA_FILE
 
-QUERY_ID=$RANDOM
-$CLICKHOUSE_CLIENT -q "SELECT * FROM file('test_02497_storage_file_reader.data', 'TSV', 's String')" \
-  --query_id $QUERY_ID
+$CLICKHOUSE_LOCAL --storage_file_read_method=mmap --print-profile-events -q "SELECT * FROM file($DATA_FILE) FORMAT Null" 2>&1 | grep -F -c "CreatedReadBufferMMap"
+$CLICKHOUSE_LOCAL --storage_file_read_method=mmap --print-profile-events -q "SELECT * FROM file($DATA_FILE) FORMAT Null" 2>&1 | grep -F -c "CreatedReadBufferOrdinary"
 
-$CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
-$CLICKHOUSE_CLIENT -q "SELECT sum(ProfileEvents['CreatedReadBufferMMap']) FROM system.query_log WHERE query_id='$QUERY_ID'"
-$CLICKHOUSE_CLIENT -q "SELECT sum(ProfileEvents['CreatedReadBufferOrdinary']) FROM system.query_log WHERE query_id='$QUERY_ID'"
+$CLICKHOUSE_LOCAL --storage_file_read_method=pread --print-profile-events -q "SELECT * FROM file($DATA_FILE) FORMAT Null" 2>&1 | grep -F -c "CreatedReadBufferMMap"
+$CLICKHOUSE_LOCAL --storage_file_read_method=pread --print-profile-events -q "SELECT * FROM file($DATA_FILE) FORMAT Null" 2>&1 | grep -F -c "CreatedReadBufferOrdinary"
 
-QUERY_ID=$RANDOM
-$CLICKHOUSE_CLIENT -q "SELECT * FROM file('test_02497_storage_file_reader.data', 'TSV', 's String')" \
-  --query_id $QUERY_ID \
-  --storage_file_read_method=pread
-
-$CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
-$CLICKHOUSE_CLIENT -q "SELECT sum(ProfileEvents['CreatedReadBufferMMap']) FROM system.query_log WHERE query_id='$QUERY_ID'"
-$CLICKHOUSE_CLIENT -q "SELECT sum(ProfileEvents['CreatedReadBufferOrdinary']) FROM system.query_log WHERE query_id='$QUERY_ID'"
+rm $DATA_FILE
diff --git a/tests/queries/0_stateless/02499_extract_key_value_pairs_multiple_input.reference b/tests/queries/0_stateless/02499_extract_key_value_pairs_multiple_input.reference
new file mode 100644
index 00000000000..d0cf9ff680b
--- /dev/null
+++ b/tests/queries/0_stateless/02499_extract_key_value_pairs_multiple_input.reference
@@ -0,0 +1,371 @@
+-- { echoOn }
+
+-- basic tests
+
+-- expected output: {'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar, age:31 team:psg,nationality:brazil') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
+-- keys and values starting with number, underscore and other special characters
+-- expected output: {'$nationality':'@brazil','1name':'neymar','4ge':'31','_team':'_psg'}
+WITH
+    extractKeyValuePairs('1name:neymar, 4ge:31 _team:_psg,$nationality:@brazil') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'$nationality':'@brazil','1name':'neymar','4ge':'31','_team':'_psg'}
+-- only special characters
+-- expected output: {'#':'#','$':'$','@':'@','_':'_'}
+WITH
+    extractKeyValuePairs('_:_, @:@ #:#,$:$') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'#':'#','$':'$','@':'@','_':'_'}
+-- special (not control) characters in the middle of elements
+-- expected output: {'age':'3!','name':'ney!mar','nationality':'br4z!l','t&am':'@psg'}
+WITH
+    extractKeyValuePairs('name:ney!mar, age:3! t&am:@psg,nationality:br4z!l') AS s_map,
+        CAST(
+            arrayMap(
+                (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+            ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'3!','name':'ney!mar','nationality':'br4z!l','t&am':'@psg'}
+-- non-standard escape characters (i.e not \n, \r, \t and etc), back-slash should be preserved
+-- expected output: {'amount\\z':'$5\\h','currency':'\\$USD'}
+WITH
+    extractKeyValuePairs('currency:\$USD, amount\z:$5\h') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'amount\\z':'$5\\h','currency':'\\$USD'}
+-- invalid escape sequence at the end of file should be ignored
+-- expected output: {'key':'invalid_escape_sequence','valid_key':'valid_value'}
+WITH
+    extractKeyValuePairsWithEscaping('valid_key:valid_value key:invalid_escape_sequence\\', ':', ' ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'key':'invalid_escape_sequence','valid_key':'valid_value'}
+-- standard escape sequences are covered by unit tests
+
+-- simple quoting
+-- expected output: {'age':'31','name':'neymar','team':'psg'}
+WITH
+    extractKeyValuePairs('name:"neymar", "age":31 "team":"psg"') AS s_map,
+        CAST(
+            arrayMap(
+                (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+            ),
+        'Map(String,String)'
+    ) AS x
+SELECT
+    x;
+{'age':'31','name':'neymar','team':'psg'}
+-- empty values
+-- expected output: {'age':'','name':'','nationality':''}
+WITH
+    extractKeyValuePairs('name:"", age: , nationality:') AS s_map,
+    CAST(
+        arrayMap(
+            (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+        ),
+        'Map(String,String)'
+    ) AS x
+SELECT
+    x;
+{'age':'','name':'','nationality':''}
+-- empty keys
+-- empty keys are not allowed, thus empty output is expected
+WITH
+    extractKeyValuePairs('"":abc, :def') AS s_map,
+    CAST(
+        arrayMap(
+            (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+        ),
+        'Map(String,String)'
+    ) AS x
+SELECT
+    x;
+{}
+-- semi-colon as pair delimiter
+-- expected output: {'age':'31','anotherkey':'anothervalue','name':'neymar','random_key':'value_with_comma,still_part_of_value:still_part_of_value','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar;age:31;team:psg;random_key:value_with_comma,still_part_of_value:still_part_of_value;anotherkey:anothervalue', ':', ';') AS s_map,
+    CAST(
+        arrayMap(
+            (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+        ),
+        'Map(String,String)'
+    ) AS x
+SELECT
+    x;
+{'age':'31','anotherkey':'anothervalue','name':'neymar','random_key':'value_with_comma,still_part_of_value:still_part_of_value','team':'psg'}
+-- both comma and semi-colon as pair delimiters
+-- expected output: {'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar;age:31;team:psg;nationality:brazil,last_key:last_value', ':', ';,') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+-- single quote as quoting character
+-- expected output: {'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:\'neymar\';\'age\':31;team:psg;nationality:brazil,last_key:last_value', ':', ';,', '\'') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+-- NO ESCAPING TESTS
+-- expected output: {'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar, age:31 team:psg,nationality:brazil', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
+-- special (not control) characters in the middle of elements
+-- expected output: {'age':'3!','name':'ney!mar','nationality':'br4z!l','t&am':'@psg'}
+WITH
+    extractKeyValuePairs('name:ney!mar, age:3! t&am:@psg,nationality:br4z!l', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'3!','name':'ney!mar','nationality':'br4z!l','t&am':'@psg'}
+-- non-standard escape characters (i.e not \n, \r, \t and etc), it should accept everything
+-- expected output: {'amount\\z':'$5\\h','currency':'\\$USD'}
+WITH
+    extractKeyValuePairs('currency:\$USD, amount\z:$5\h', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'amount\\z':'$5\\h','currency':'\\$USD'}
+-- standard escape sequences, it should return it as it is
+-- expected output: {'key1':'header\nbody','key2':'start_of_text\tend_of_text'}
+WITH
+    extractKeyValuePairs('key1:header\nbody key2:start_of_text\tend_of_text', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'key1':'header\nbody','key2':'start_of_text\tend_of_text'}
+-- standard escape sequences are covered by unit tests
+
+-- simple quoting
+-- expected output: {'age':'31','name':'neymar','team':'psg'}
+WITH
+    extractKeyValuePairs('name:"neymar", "age":31 "team":"psg"', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'31','name':'neymar','team':'psg'}
+-- empty values
+-- expected output: {'age':'','name':'','nationality':''}
+WITH
+    extractKeyValuePairs('name:"", age: , nationality:', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'','name':'','nationality':''}
+-- empty keys
+-- empty keys are not allowed, thus empty output is expected
+WITH
+    extractKeyValuePairs('"":abc, :def', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{}
+-- semi-colon as pair delimiter
+-- expected output: {'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar;age:31;team:psg;nationality:brazil', ':', ';', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
+-- both comma and semi-colon as pair delimiters
+-- expected output: {'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar;age:31;team:psg;nationality:brazil,last_key:last_value', ':', ';,', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+-- single quote as quoting character
+-- expected output: {'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:\'neymar\';\'age\':31;team:psg;nationality:brazil,last_key:last_value', ':', ';,', '\'') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+-- { echoOn }
+
+SET extract_kvp_max_pairs_per_row = 2;
+-- Should be allowed because it no longer exceeds the max number of pairs
+-- expected output: {'key1':'value1','key2':'value2'}
+WITH
+    extractKeyValuePairs('key1:value1,key2:value2') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'key1':'value1','key2':'value2'}
+SET extract_kvp_max_pairs_per_row = 0;
+-- Should be allowed because max pairs per row is set to 0 (unlimited)
+-- expected output: {'key1':'value1','key2':'value2'}
+WITH
+    extractKeyValuePairs('key1:value1,key2:value2') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'key1':'value1','key2':'value2'}
+-- should not fail because pair delimiters contains 8 characters, which is within the limit
+WITH
+    extractKeyValuePairs('not_important', ':', '12345678', '\'') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{}
+-- key value delimiter should be considered valid part of value
+WITH
+    extractKeyValuePairs('formula=1+2=3 argument1=1 argument2=2 result=3, char="=" char2== string="foo=bar"', '=') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'argument1':'1','argument2':'2','char':'=','char2':'=','formula':'1+2=3','result':'3','string':'foo=bar'}
+-- check str_to_map alias (it is case-insensitive)
+WITH
+    sTr_tO_mAp('name:neymar, age:31 team:psg,nationality:brazil') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
+-- check mapFromString alias
+WITH
+    mapFromString('name:neymar, age:31 team:psg,nationality:brazil') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+{'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
diff --git a/tests/queries/0_stateless/02499_extract_key_value_pairs_multiple_input.sql b/tests/queries/0_stateless/02499_extract_key_value_pairs_multiple_input.sql
new file mode 100644
index 00000000000..804ff4ce880
--- /dev/null
+++ b/tests/queries/0_stateless/02499_extract_key_value_pairs_multiple_input.sql
@@ -0,0 +1,506 @@
+-- { echoOn }
+
+-- basic tests
+
+-- expected output: {'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar, age:31 team:psg,nationality:brazil') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- keys and values starting with number, underscore and other special characters
+-- expected output: {'$nationality':'@brazil','1name':'neymar','4ge':'31','_team':'_psg'}
+WITH
+    extractKeyValuePairs('1name:neymar, 4ge:31 _team:_psg,$nationality:@brazil') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- only special characters
+-- expected output: {'#':'#','$':'$','@':'@','_':'_'}
+WITH
+    extractKeyValuePairs('_:_, @:@ #:#,$:$') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- special (not control) characters in the middle of elements
+-- expected output: {'age':'3!','name':'ney!mar','nationality':'br4z!l','t&am':'@psg'}
+WITH
+    extractKeyValuePairs('name:ney!mar, age:3! t&am:@psg,nationality:br4z!l') AS s_map,
+        CAST(
+            arrayMap(
+                (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+            ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- non-standard escape characters (i.e not \n, \r, \t and etc), back-slash should be preserved
+-- expected output: {'amount\\z':'$5\\h','currency':'\\$USD'}
+WITH
+    extractKeyValuePairs('currency:\$USD, amount\z:$5\h') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- invalid escape sequence at the end of file should be ignored
+-- expected output: {'key':'invalid_escape_sequence','valid_key':'valid_value'}
+WITH
+    extractKeyValuePairsWithEscaping('valid_key:valid_value key:invalid_escape_sequence\\', ':', ' ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- standard escape sequences are covered by unit tests
+
+-- simple quoting
+-- expected output: {'age':'31','name':'neymar','team':'psg'}
+WITH
+    extractKeyValuePairs('name:"neymar", "age":31 "team":"psg"') AS s_map,
+        CAST(
+            arrayMap(
+                (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+            ),
+        'Map(String,String)'
+    ) AS x
+SELECT
+    x;
+
+-- empty values
+-- expected output: {'age':'','name':'','nationality':''}
+WITH
+    extractKeyValuePairs('name:"", age: , nationality:') AS s_map,
+    CAST(
+        arrayMap(
+            (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+        ),
+        'Map(String,String)'
+    ) AS x
+SELECT
+    x;
+
+-- empty keys
+-- empty keys are not allowed, thus empty output is expected
+WITH
+    extractKeyValuePairs('"":abc, :def') AS s_map,
+    CAST(
+        arrayMap(
+            (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+        ),
+        'Map(String,String)'
+    ) AS x
+SELECT
+    x;
+
+-- semi-colon as pair delimiter
+-- expected output: {'age':'31','anotherkey':'anothervalue','name':'neymar','random_key':'value_with_comma,still_part_of_value:still_part_of_value','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar;age:31;team:psg;random_key:value_with_comma,still_part_of_value:still_part_of_value;anotherkey:anothervalue', ':', ';') AS s_map,
+    CAST(
+        arrayMap(
+            (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+        ),
+        'Map(String,String)'
+    ) AS x
+SELECT
+    x;
+
+-- both comma and semi-colon as pair delimiters
+-- expected output: {'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar;age:31;team:psg;nationality:brazil,last_key:last_value', ':', ';,') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- single quote as quoting character
+-- expected output: {'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:\'neymar\';\'age\':31;team:psg;nationality:brazil,last_key:last_value', ':', ';,', '\'') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- NO ESCAPING TESTS
+-- expected output: {'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar, age:31 team:psg,nationality:brazil', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- special (not control) characters in the middle of elements
+-- expected output: {'age':'3!','name':'ney!mar','nationality':'br4z!l','t&am':'@psg'}
+WITH
+    extractKeyValuePairs('name:ney!mar, age:3! t&am:@psg,nationality:br4z!l', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- non-standard escape characters (i.e not \n, \r, \t and etc), it should accept everything
+-- expected output: {'amount\\z':'$5\\h','currency':'\\$USD'}
+WITH
+    extractKeyValuePairs('currency:\$USD, amount\z:$5\h', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- standard escape sequences, it should return it as it is
+-- expected output: {'key1':'header\nbody','key2':'start_of_text\tend_of_text'}
+WITH
+    extractKeyValuePairs('key1:header\nbody key2:start_of_text\tend_of_text', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- standard escape sequences are covered by unit tests
+
+-- simple quoting
+-- expected output: {'age':'31','name':'neymar','team':'psg'}
+WITH
+    extractKeyValuePairs('name:"neymar", "age":31 "team":"psg"', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- empty values
+-- expected output: {'age':'','name':'','nationality':''}
+WITH
+    extractKeyValuePairs('name:"", age: , nationality:', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- empty keys
+-- empty keys are not allowed, thus empty output is expected
+WITH
+    extractKeyValuePairs('"":abc, :def', ':', ', ', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- semi-colon as pair delimiter
+-- expected output: {'age':'31','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar;age:31;team:psg;nationality:brazil', ':', ';', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- both comma and semi-colon as pair delimiters
+-- expected output: {'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:neymar;age:31;team:psg;nationality:brazil,last_key:last_value', ':', ';,', '"') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- single quote as quoting character
+-- expected output: {'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
+WITH
+    extractKeyValuePairs('name:\'neymar\';\'age\':31;team:psg;nationality:brazil,last_key:last_value', ':', ';,', '\'') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- { echoOff }
+
+-- cross parameter validation tests
+-- should fail because key value delimiter conflicts with pair delimiters
+WITH
+    extractKeyValuePairs('not_important', ':', ',:', '\'') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError BAD_ARGUMENTS}
+
+-- should fail because key value delimiter conflicts with quoting characters
+WITH
+    extractKeyValuePairs('not_important', ':', ',', '\':') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError BAD_ARGUMENTS}
+
+-- should fail because pair delimiters conflicts with quoting characters
+WITH
+    extractKeyValuePairs('not_important', ':', ',', ',') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError BAD_ARGUMENTS}
+
+-- should fail because data_column argument must be of type String
+WITH
+    extractKeyValuePairs([1, 2]) AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
+
+-- should fail because key_value_delimiter argument must be of type String
+WITH
+    extractKeyValuePairs('', [1, 2]) AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
+
+-- should fail because pair_delimiters argument must be of type String
+WITH
+    extractKeyValuePairs('', ':', [1, 2]) AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
+
+-- should fail because quoting_character argument must be of type String
+WITH
+    extractKeyValuePairs('', ':', ' ', [1, 2]) AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
+
+-- should fail because pair delimiters can contain at most 8 characters
+WITH
+    extractKeyValuePairs('not_important', ':', '123456789', '\'') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError BAD_ARGUMENTS}
+
+-- should fail because no argument has been provided
+WITH
+    extractKeyValuePairs() AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
+
+-- should fail because one extra argument / non existent has been provided
+WITH
+    extractKeyValuePairs('a', ':', ',', '"', '') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
+
+-- Should fail allowed because it exceeds the max number of pairs
+SET extract_kvp_max_pairs_per_row = 1;
+WITH
+    extractKeyValuePairs('key1:value1,key2:value2') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x; -- {serverError LIMIT_EXCEEDED}
+
+-- { echoOn }
+
+SET extract_kvp_max_pairs_per_row = 2;
+-- Should be allowed because it no longer exceeds the max number of pairs
+-- expected output: {'key1':'value1','key2':'value2'}
+WITH
+    extractKeyValuePairs('key1:value1,key2:value2') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+SET extract_kvp_max_pairs_per_row = 0;
+-- Should be allowed because max pairs per row is set to 0 (unlimited)
+-- expected output: {'key1':'value1','key2':'value2'}
+WITH
+    extractKeyValuePairs('key1:value1,key2:value2') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- should not fail because pair delimiters contains 8 characters, which is within the limit
+WITH
+    extractKeyValuePairs('not_important', ':', '12345678', '\'') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- key value delimiter should be considered valid part of value
+WITH
+    extractKeyValuePairs('formula=1+2=3 argument1=1 argument2=2 result=3, char="=" char2== string="foo=bar"', '=') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- check str_to_map alias (it is case-insensitive)
+WITH
+    sTr_tO_mAp('name:neymar, age:31 team:psg,nationality:brazil') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
+
+-- check mapFromString alias
+WITH
+    mapFromString('name:neymar, age:31 team:psg,nationality:brazil') AS s_map,
+    CAST(
+            arrayMap(
+                    (x) -> (x, s_map[x]), arraySort(mapKeys(s_map))
+                ),
+            'Map(String,String)'
+        ) AS x
+SELECT
+    x;
diff --git a/tests/queries/0_stateless/02500_remove_redundant_distinct.reference b/tests/queries/0_stateless/02500_remove_redundant_distinct.reference
index 32ddab4886c..2e049dbc936 100644
--- a/tests/queries/0_stateless/02500_remove_redundant_distinct.reference
+++ b/tests/queries/0_stateless/02500_remove_redundant_distinct.reference
@@ -464,3 +464,16 @@ Expression ((Projection + (Before ORDER BY + (Projection + Before ORDER BY))))
 1
 
 0
+-- DISTINCT COUNT() with GROUP BY => do _not_ remove DISTINCT
+-- query
+select distinct count() from numbers(10) group by number
+-- explain
+Expression (Projection)
+  Distinct
+    Distinct (Preliminary DISTINCT)
+      Expression (Before ORDER BY)
+        Aggregating
+          Expression (Before GROUP BY)
+            ReadFromStorage (SystemNumbers)
+-- execute
+1
diff --git a/tests/queries/0_stateless/02500_remove_redundant_distinct.sh b/tests/queries/0_stateless/02500_remove_redundant_distinct.sh
index 879cc776fe1..41744cc59f9 100755
--- a/tests/queries/0_stateless/02500_remove_redundant_distinct.sh
+++ b/tests/queries/0_stateless/02500_remove_redundant_distinct.sh
@@ -4,9 +4,13 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+if [ -z ${ENABLE_ANALYZER+x} ]; then
+    ENABLE_ANALYZER=0
+fi
+
 OPTIMIZATION_SETTING="query_plan_remove_redundant_distinct"
-DISABLE_OPTIMIZATION="SET $OPTIMIZATION_SETTING=0;SET optimize_duplicate_order_by_and_distinct=0"
-ENABLE_OPTIMIZATION="SET $OPTIMIZATION_SETTING=1;SET optimize_duplicate_order_by_and_distinct=0"
+DISABLE_OPTIMIZATION="set allow_experimental_analyzer=$ENABLE_ANALYZER;SET $OPTIMIZATION_SETTING=0;SET optimize_duplicate_order_by_and_distinct=0"
+ENABLE_OPTIMIZATION="set allow_experimental_analyzer=$ENABLE_ANALYZER;SET $OPTIMIZATION_SETTING=1;SET optimize_duplicate_order_by_and_distinct=0"
 
 echo "-- Disabled $OPTIMIZATION_SETTING"
 query="SELECT DISTINCT *
@@ -256,3 +260,7 @@ FROM
     GROUP BY a WITH TOTALS
 )"
 run_query "$query"
+
+echo "-- DISTINCT COUNT() with GROUP BY => do _not_ remove DISTINCT"
+query="select distinct count() from numbers(10) group by number"
+run_query "$query"
diff --git a/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.reference b/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.reference
new file mode 100644
index 00000000000..c9301c1f0a3
--- /dev/null
+++ b/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.reference
@@ -0,0 +1,481 @@
+-- Disabled query_plan_remove_redundant_distinct
+Expression (Project names)
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression ((Projection + (Change column names to column identifiers + Project names)))
+        Distinct (DISTINCT)
+          Distinct (Preliminary DISTINCT)
+            Expression ((Projection + (Change column names to column identifiers + Project names)))
+              Distinct (DISTINCT)
+                Distinct (Preliminary DISTINCT)
+                  Expression ((Projection + Change column names to column identifiers))
+                    ReadFromStorage (SystemNumbers)
+-- Enabled query_plan_remove_redundant_distinct
+-- DISTINCT is only in most inner subquery
+-- query
+SELECT DISTINCT *
+FROM
+(
+    SELECT DISTINCT *
+    FROM
+    (
+        SELECT DISTINCT *
+        FROM numbers(3)
+    )
+)
+-- explain
+Expression ((Project names + (Projection + (Change column names to column identifiers + (Project names + (Projection + (Change column names to column identifiers + Project names)))))))
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression ((Projection + Change column names to column identifiers))
+        ReadFromStorage (SystemNumbers)
+-- execute
+0
+1
+2
+-- do _not_ remove DISTINCT after UNION
+-- query
+SELECT DISTINCT number FROM
+(
+    (SELECT DISTINCT number FROM numbers(1))
+    UNION ALL
+    (SELECT DISTINCT number FROM numbers(2))
+)
+ORDER BY number
+-- explain
+Expression (Project names)
+  Distinct (DISTINCT)
+    Sorting (Sorting for ORDER BY)
+      Expression (Before ORDER BY)
+        Distinct (Preliminary DISTINCT)
+          Union
+            Expression ((Projection + (Change column names to column identifiers + Project names)))
+              Distinct (DISTINCT)
+                Distinct (Preliminary DISTINCT)
+                  Expression ((Projection + Change column names to column identifiers))
+                    ReadFromStorage (SystemNumbers)
+            Expression (( + ( + Project names)))
+              Distinct (DISTINCT)
+                Distinct (Preliminary DISTINCT)
+                  Expression ((Projection + Change column names to column identifiers))
+                    ReadFromStorage (SystemNumbers)
+-- execute
+0
+1
+-- do _not_ remove DISTINCT after JOIN
+-- query
+SELECT DISTINCT *
+FROM
+(
+    SELECT DISTINCT number AS n
+    FROM numbers(2)
+) as x,
+(
+    SELECT DISTINCT number AS n
+    FROM numbers(2)
+) as y
+-- explain
+Expression (Project names)
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression ((Projection + DROP unused columns after JOIN))
+        Join (JOIN FillRightFirst)
+          Expression ((Change column names to column identifiers + Project names))
+            Distinct (DISTINCT)
+              Distinct (Preliminary DISTINCT)
+                Expression ((Projection + Change column names to column identifiers))
+                  ReadFromStorage (SystemNumbers)
+          Expression ((Change column names to column identifiers + Project names))
+            Distinct (DISTINCT)
+              Distinct (Preliminary DISTINCT)
+                Expression ((Projection + Change column names to column identifiers))
+                  ReadFromStorage (SystemNumbers)
+-- execute
+0	0
+0	1
+1	0
+1	1
+-- DISTINCT duplicates with several columns
+-- query
+SELECT DISTINCT *
+FROM
+(
+    SELECT DISTINCT *
+    FROM
+    (
+        SELECT DISTINCT number as a, 2*number as b
+        FROM numbers(3)
+    )
+)
+-- explain
+Expression ((Project names + (Projection + (Change column names to column identifiers + (Project names + (Projection + (Change column names to column identifiers + Project names)))))))
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression ((Projection + Change column names to column identifiers))
+        ReadFromStorage (SystemNumbers)
+-- execute
+0	0
+1	2
+2	4
+-- DISTINCT duplicates with constant columns
+-- query
+SELECT DISTINCT 2, a, b
+FROM
+(
+    SELECT DISTINCT a, b
+    FROM
+    (
+        SELECT DISTINCT 1, number as a, 2*number as b
+        FROM numbers(3)
+    )
+)
+-- explain
+Expression ((Project names + (Projection + (Change column names to column identifiers + (Project names + (Projection + (Change column names to column identifiers + Project names)))))))
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression ((Projection + Change column names to column identifiers))
+        ReadFromStorage (SystemNumbers)
+-- execute
+2	0	0
+2	1	2
+2	2	4
+-- ARRAY JOIN: do _not_ remove outer DISTINCT because new rows are generated between inner and outer DISTINCTs
+-- query
+SELECT DISTINCT *
+FROM
+(
+    SELECT DISTINCT *
+    FROM VALUES('Hello', 'World', 'Goodbye')
+) AS words
+ARRAY JOIN [0, 1] AS arr
+-- explain
+Expression (Project names)
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression (Projection)
+        ArrayJoin (ARRAY JOIN)
+          Expression ((DROP unused columns before ARRAY JOIN + (ARRAY JOIN actions + (Change column names to column identifiers + Project names))))
+            Distinct (DISTINCT)
+              Distinct (Preliminary DISTINCT)
+                Expression ((Projection + Change column names to column identifiers))
+                  ReadFromStorage (Values)
+-- execute
+Hello
+World
+Goodbye
+-- WITH FILL: do _not_ remove outer DISTINCT because new rows are generated between inner and outer DISTINCTs
+-- query
+SELECT DISTINCT *
+FROM
+(
+    SELECT DISTINCT *
+    FROM values('id UInt8', 0, 2)
+    ORDER BY id ASC WITH FILL
+)
+-- explain
+Expression (Project names)
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression ((Projection + (Change column names to column identifiers + Project names)))
+        Filling
+          Distinct (DISTINCT)
+            Sorting (Sorting for ORDER BY)
+              Expression (Before ORDER BY)
+                Distinct (Preliminary DISTINCT)
+                  Expression ((Projection + Change column names to column identifiers))
+                    ReadFromStorage (Values)
+-- execute
+0
+1
+2
+-- WHERE with arrayJoin(): do _not_ remove outer DISTINCT because new rows are generated between inner and outer DISTINCTs
+-- query
+SELECT DISTINCT *
+FROM
+(
+    SELECT DISTINCT ['Istanbul', 'Berlin', 'Bensheim'] AS cities
+)
+WHERE arrayJoin(cities) IN ['Berlin', 'Bensheim']
+-- explain
+Expression (Project names)
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression (Projection)
+        Filter ((WHERE + (Change column names to column identifiers + Project names)))
+          Distinct (DISTINCT)
+            Distinct (Preliminary DISTINCT)
+              Expression ((Projection + Change column names to column identifiers))
+                ReadFromStorage (SystemOne)
+-- execute
+['Istanbul','Berlin','Bensheim']
+-- GROUP BY before DISTINCT with on the same columns => remove DISTINCT
+-- query
+SELECT DISTINCT a
+FROM
+(
+    SELECT
+        a,
+        sum(b) AS c
+    FROM
+    (
+        SELECT
+            x.number AS a,
+            y.number AS b
+        FROM numbers(3) AS x, numbers(3, 3) AS y
+    )
+    GROUP BY a
+)
+-- explain
+Expression ((Project names + (Projection + (Change column names to column identifiers + (Project names + Projection)))))
+  Aggregating
+    Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + DROP unused columns after JOIN)))))
+      Join (JOIN FillRightFirst)
+        Expression (Change column names to column identifiers)
+          ReadFromStorage (SystemNumbers)
+        Expression (Change column names to column identifiers)
+          ReadFromStorage (SystemNumbers)
+-- execute
+0
+2
+1
+-- GROUP BY before DISTINCT with on different columns => do _not_ remove DISTINCT
+-- query
+SELECT DISTINCT c
+FROM
+(
+    SELECT
+        a,
+        sum(b) AS c
+    FROM
+    (
+        SELECT
+            x.number AS a,
+            y.number AS b
+        FROM numbers(3) AS x, numbers(3, 3) AS y
+    )
+    GROUP BY a
+)
+-- explain
+Expression (Project names)
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression ((Projection + (Change column names to column identifiers + (Project names + Projection))))
+        Aggregating
+          Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + DROP unused columns after JOIN)))))
+            Join (JOIN FillRightFirst)
+              Expression (Change column names to column identifiers)
+                ReadFromStorage (SystemNumbers)
+              Expression (Change column names to column identifiers)
+                ReadFromStorage (SystemNumbers)
+-- execute
+12
+-- GROUP BY WITH ROLLUP before DISTINCT with on different columns => do _not_ remove DISTINCT
+-- query
+SELECT DISTINCT c
+FROM
+(
+    SELECT
+        a,
+        sum(b) AS c
+    FROM
+    (
+        SELECT
+            x.number AS a,
+            y.number AS b
+        FROM numbers(3) AS x, numbers(3, 3) AS y
+    )
+    GROUP BY a WITH ROLLUP
+)
+-- explain
+Expression (Project names)
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression ((Projection + (Change column names to column identifiers + (Project names + Projection))))
+        Rollup
+          Aggregating
+            Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + DROP unused columns after JOIN)))))
+              Join (JOIN FillRightFirst)
+                Expression (Change column names to column identifiers)
+                  ReadFromStorage (SystemNumbers)
+                Expression (Change column names to column identifiers)
+                  ReadFromStorage (SystemNumbers)
+-- execute
+12
+36
+-- GROUP BY WITH ROLLUP before DISTINCT with on the same columns => remove DISTINCT
+-- query
+SELECT DISTINCT a
+FROM
+(
+    SELECT
+        a,
+        sum(b) AS c
+    FROM
+    (
+        SELECT
+            x.number AS a,
+            y.number AS b
+        FROM numbers(3) AS x, numbers(3, 3) AS y
+    )
+    GROUP BY a WITH ROLLUP
+)
+-- explain
+Expression ((Project names + (Projection + (Change column names to column identifiers + (Project names + Projection)))))
+  Rollup
+    Aggregating
+      Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + DROP unused columns after JOIN)))))
+        Join (JOIN FillRightFirst)
+          Expression (Change column names to column identifiers)
+            ReadFromStorage (SystemNumbers)
+          Expression (Change column names to column identifiers)
+            ReadFromStorage (SystemNumbers)
+-- execute
+0
+2
+1
+0
+-- GROUP BY WITH CUBE before DISTINCT with on different columns => do _not_ remove DISTINCT
+-- query
+SELECT DISTINCT c
+FROM
+(
+    SELECT
+        a,
+        sum(b) AS c
+    FROM
+    (
+        SELECT
+            x.number AS a,
+            y.number AS b
+        FROM numbers(3) AS x, numbers(3, 3) AS y
+    )
+    GROUP BY a WITH CUBE
+)
+-- explain
+Expression (Project names)
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression ((Projection + (Change column names to column identifiers + (Project names + Projection))))
+        Cube
+          Aggregating
+            Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + DROP unused columns after JOIN)))))
+              Join (JOIN FillRightFirst)
+                Expression (Change column names to column identifiers)
+                  ReadFromStorage (SystemNumbers)
+                Expression (Change column names to column identifiers)
+                  ReadFromStorage (SystemNumbers)
+-- execute
+12
+36
+-- GROUP BY WITH CUBE before DISTINCT with on the same columns => remove DISTINCT
+-- query
+SELECT DISTINCT a
+FROM
+(
+    SELECT
+        a,
+        sum(b) AS c
+    FROM
+    (
+        SELECT
+            x.number AS a,
+            y.number AS b
+        FROM numbers(3) AS x, numbers(3, 3) AS y
+    )
+    GROUP BY a WITH CUBE
+)
+-- explain
+Expression ((Project names + (Projection + (Change column names to column identifiers + (Project names + Projection)))))
+  Cube
+    Aggregating
+      Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + DROP unused columns after JOIN)))))
+        Join (JOIN FillRightFirst)
+          Expression (Change column names to column identifiers)
+            ReadFromStorage (SystemNumbers)
+          Expression (Change column names to column identifiers)
+            ReadFromStorage (SystemNumbers)
+-- execute
+0
+2
+1
+0
+-- GROUP BY WITH TOTALS before DISTINCT with on different columns => do _not_ remove DISTINCT
+-- query
+SELECT DISTINCT c
+FROM
+(
+    SELECT
+        a,
+        sum(b) AS c
+    FROM
+    (
+        SELECT
+            x.number AS a,
+            y.number AS b
+        FROM numbers(3) AS x, numbers(3, 3) AS y
+    )
+    GROUP BY a WITH TOTALS
+)
+-- explain
+Expression (Project names)
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression ((Projection + (Change column names to column identifiers + (Project names + Projection))))
+        TotalsHaving
+          Aggregating
+            Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + DROP unused columns after JOIN)))))
+              Join (JOIN FillRightFirst)
+                Expression (Change column names to column identifiers)
+                  ReadFromStorage (SystemNumbers)
+                Expression (Change column names to column identifiers)
+                  ReadFromStorage (SystemNumbers)
+-- execute
+12
+
+36
+-- GROUP BY WITH TOTALS before DISTINCT with on the same columns => remove DISTINCT
+-- query
+SELECT DISTINCT a
+FROM
+(
+    SELECT
+        a,
+        sum(b) AS c
+    FROM
+    (
+        SELECT
+            x.number AS a,
+            y.number AS b
+        FROM numbers(3) AS x, numbers(3, 3) AS y
+    )
+    GROUP BY a WITH TOTALS
+)
+-- explain
+Expression ((Project names + (Projection + (Change column names to column identifiers + (Project names + Projection)))))
+  TotalsHaving
+    Aggregating
+      Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + DROP unused columns after JOIN)))))
+        Join (JOIN FillRightFirst)
+          Expression (Change column names to column identifiers)
+            ReadFromStorage (SystemNumbers)
+          Expression (Change column names to column identifiers)
+            ReadFromStorage (SystemNumbers)
+-- execute
+0
+2
+1
+
+0
+-- DISTINCT COUNT() with GROUP BY => do _not_ remove DISTINCT
+-- query
+select distinct count() from numbers(10) group by number
+-- explain
+Expression (Project names)
+  Distinct (DISTINCT)
+    Distinct (Preliminary DISTINCT)
+      Expression (Projection)
+        Aggregating
+          Expression ((Before GROUP BY + Change column names to column identifiers))
+            ReadFromStorage (SystemNumbers)
+-- execute
+1
diff --git a/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.sh b/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.sh
new file mode 100755
index 00000000000..b979980d6c4
--- /dev/null
+++ b/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# shellcheck source=./02500_remove_redundant_distinct.sh
+ENABLE_ANALYZER=1 . "$CURDIR"/02500_remove_redundant_distinct.sh
diff --git a/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh b/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh
index 918adc12de6..ed66c36b823 100755
--- a/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh
+++ b/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh
@@ -33,5 +33,5 @@ select count() from system.filesystem_cache_log where query_id = '$query_id' AND
 
 ${CLICKHOUSE_CLIENT} --multiline --multiquery -q "
 select count() from ttt;
-drop table ttt no delay;
+drop table ttt sync;
 "
diff --git a/tests/queries/0_stateless/02504_regexp_dictionary_table_source.reference b/tests/queries/0_stateless/02504_regexp_dictionary_table_source.reference
index 28b98cfabf3..4e72cf4ce37 100644
--- a/tests/queries/0_stateless/02504_regexp_dictionary_table_source.reference
+++ b/tests/queries/0_stateless/02504_regexp_dictionary_table_source.reference
@@ -1,5 +1,11 @@
+1	0	Linux/(\\d+[\\.\\d]*).+tlinux	['version','name']	['\\1','TencentOS']
+2	0	(\\d+)/tclwebkit(\\d+[\\.\\d]*)	['comment','version','name']	['test $1 and $2','$1','Android']
+3	2	33/tclwebkit	['version']	['13']
+4	2	3[12]/tclwebkit	['version']	['12']
+5	2	3[12]/tclwebkit	['version']	['11']
+6	2	3[12]/tclwebkit	['version']	['10']
 ('TencentOS',101,'nothing')
-('Andriod',13,'test 33 and 11.10')
+('Android',13,'test 33 and 11.10')
 ('',NULL,'nothing')
 ('',0,'default')
 30/tclwebkit0
@@ -17,19 +23,22 @@
 42/tclwebkit12
 43/tclwebkit13
 44/tclwebkit14
-('Andriod',30)
-('Andriod',12)
-('Andriod',12)
-('Andriod',13)
-('Andriod',34)
-('Andriod',35)
-('Andriod',36)
-('Andriod',37)
-('Andriod',38)
-('Andriod',39)
-('Andriod',40)
-('Andriod',41)
-('Andriod',42)
-('Andriod',43)
-('Andriod',44)
-('Andriod1',33,'matched 3')
+('Android',30)
+('Android',12)
+('Android',12)
+('Android',13)
+('Android',34)
+('Android',35)
+('Android',36)
+('Android',37)
+('Android',38)
+('Android',39)
+('Android',40)
+('Android',41)
+('Android',42)
+('Android',43)
+('Android',44)
+('Android1',33,'matched 3')
+1	0	(\\d+)/tclwebkit	['version','name']	['$1','Android']
+2	0	33/tclwebkit	['comment','version']	['matched 3','13']
+3	1	33/tclwebkit	['name']	['Android1']
diff --git a/tests/queries/0_stateless/02504_regexp_dictionary_table_source.sql b/tests/queries/0_stateless/02504_regexp_dictionary_table_source.sql
index a8f1fb17a45..42d7acbf057 100644
--- a/tests/queries/0_stateless/02504_regexp_dictionary_table_source.sql
+++ b/tests/queries/0_stateless/02504_regexp_dictionary_table_source.sql
@@ -1,7 +1,7 @@
 -- Tags: use-vectorscan
 
-DROP TABLE IF EXISTS regexp_dictionary_source_table;
 DROP DICTIONARY IF EXISTS regexp_dict1;
+DROP TABLE IF EXISTS regexp_dictionary_source_table;
 
 CREATE TABLE regexp_dictionary_source_table
 (
@@ -15,7 +15,7 @@ CREATE TABLE regexp_dictionary_source_table
 -- test back reference.
 
 INSERT INTO regexp_dictionary_source_table VALUES (1, 0, 'Linux/(\d+[\.\d]*).+tlinux', ['name', 'version'], ['TencentOS', '\1'])
-INSERT INTO regexp_dictionary_source_table VALUES (2, 0, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['Andriod', '$1', 'test $1 and $2'])
+INSERT INTO regexp_dictionary_source_table VALUES (2, 0, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['Android', '$1', 'test $1 and $2'])
 INSERT INTO regexp_dictionary_source_table VALUES (3, 2, '33/tclwebkit', ['version'], ['13'])
 INSERT INTO regexp_dictionary_source_table VALUES (4, 2, '3[12]/tclwebkit', ['version'], ['12'])
 INSERT INTO regexp_dictionary_source_table VALUES (5, 2, '3[12]/tclwebkit', ['version'], ['11'])
@@ -29,10 +29,11 @@ create dictionary regexp_dict1
     comment String default 'nothing'
 )
 PRIMARY KEY(regexp)
-SOURCE(CLICKHOUSE(QUERY concat('select * from ', currentDatabase() , '.regexp_dictionary_source_table')))
+SOURCE(CLICKHOUSE(TABLE 'regexp_dictionary_source_table'))
 LIFETIME(0)
-LAYOUT(regexp_tree)
-SETTINGS(regexp_dict_allow_other_sources = true);
+LAYOUT(regexp_tree);
+
+select * from dictionary(regexp_dict1);
 
 select dictGet('regexp_dict1', ('name', 'version', 'comment'), 'Linux/101.tlinux');
 select dictGet('regexp_dict1', ('name', 'version', 'comment'), '33/tclwebkit11.10x');
@@ -64,14 +65,14 @@ SYSTEM RELOAD dictionary regexp_dict1; -- { serverError 489  }
 truncate table regexp_dictionary_source_table;
 
 INSERT INTO regexp_dictionary_source_table VALUES (1, 2, 'Linux/(\d+[\.\d]*).+tlinux', ['name', 'version'], ['TencentOS', '\1'])
-INSERT INTO regexp_dictionary_source_table VALUES (2, 3, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['Andriod', '$1', 'test $1 and $2'])
-INSERT INTO regexp_dictionary_source_table VALUES (3, 1, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['Andriod', '$1', 'test $1 and $2'])
+INSERT INTO regexp_dictionary_source_table VALUES (2, 3, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['Android', '$1', 'test $1 and $2'])
+INSERT INTO regexp_dictionary_source_table VALUES (3, 1, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['Android', '$1', 'test $1 and $2'])
 SYSTEM RELOAD dictionary regexp_dict1; -- { serverError 489  }
 
 -- test priority
 truncate table regexp_dictionary_source_table;
-INSERT INTO regexp_dictionary_source_table VALUES (1, 0, '(\d+)/tclwebkit', ['name', 'version'], ['Andriod', '$1']);
-INSERT INTO regexp_dictionary_source_table VALUES (3, 1, '33/tclwebkit', ['name'], ['Andriod1']); -- child has more priority than parents.
+INSERT INTO regexp_dictionary_source_table VALUES (1, 0, '(\d+)/tclwebkit', ['name', 'version'], ['Android', '$1']);
+INSERT INTO regexp_dictionary_source_table VALUES (3, 1, '33/tclwebkit', ['name'], ['Android1']); -- child has more priority than parents.
 INSERT INTO regexp_dictionary_source_table VALUES (2, 0, '33/tclwebkit', ['version', 'comment'], ['13', 'matched 3']); -- larger id has lower priority than small id.
 SYSTEM RELOAD dictionary regexp_dict1;
 select dictGet(regexp_dict1, ('name', 'version', 'comment'), '33/tclwebkit');
@@ -79,7 +80,8 @@ select dictGet(regexp_dict1, ('name', 'version', 'comment'), '33/tclwebkit');
 truncate table regexp_dictionary_source_table;
 SYSTEM RELOAD dictionary regexp_dict1; -- { serverError 489 }
 
+select * from dictionary(regexp_dict1);
 
+DROP DICTIONARY IF EXISTS regexp_dict1;
 DROP TABLE IF EXISTS regexp_dictionary_source_table;
 DROP TABLE IF EXISTS needle_table;
-DROP DICTIONARY IF EXISTS regexp_dict1;
diff --git a/tests/queries/0_stateless/02504_regexp_dictionary_ua_parser.reference b/tests/queries/0_stateless/02504_regexp_dictionary_ua_parser.reference
index b161b099eef..872ee1a0f33 100644
--- a/tests/queries/0_stateless/02504_regexp_dictionary_ua_parser.reference
+++ b/tests/queries/0_stateless/02504_regexp_dictionary_ua_parser.reference
@@ -1,793 +1,793 @@
-AppleTV	Other 0.0	ATV OS X 0.0.0
-LG-M150	Firefox Mobile 68.0	Android 7.0.0
-Generic Smartphone	Firefox Mobile 68.0	Android 8.0.0
-Generic Tablet	Firefox Mobile 68.0	Android 8.1.0
-Generic Smartphone	Firefox Mobile 68.0	Android 9.0.0
-PH-1	Chrome Mobile 77.0	Android 10.0.0
-Pixel 2 XL	Chrome Mobile 77.0	Android 10.0.0
-Pixel 2	Chrome Mobile 77.0	Android 10.0.0
-Pixel 3	Facebook 240.0	Android 10.0.0
-Pixel XL	Chrome Mobile WebView 77.0	Android 10.0.0
-Pixel XL	Chrome Mobile 77.0	Android 10.0.0
-HTC Sensation 4G	Chrome Mobile 42.0	Android 4.0.3
-Kindle	Amazon Silk 73.7	Android 4.0.3
-Samsung GT-I9152 	Chrome Mobile 42.0	Android 4.2.2
-Samsung GT-N5110	Chrome 76.0	Android 4.4.2
-RCT6773W22	Chrome 77.0	Android 4.4.2
-Samsung SM-T217S	Chrome 77.0	Android 4.4.2
-Samsung SM-T530NU	Chrome 77.0	Android 4.4.2
-TegraNote-P1640	Chrome 69.0	Android 4.4.2
-Kindle	Amazon Silk 76.3	Android 4.4.3
-Samsung SM-A500H	Chrome Mobile 73.0	Android 5.0.2
-Samsung SM-T357T	Chrome 77.0	Android 5.0.2
-Samsung SM-T530NU	Chrome 76.0	Android 5.0.2
-Samsung SM-T530NU	Chrome 77.0	Android 5.0.2
-RCT6213W87DK	Yandex Browser 19.4	Android 5.0.0
-Samsung SM-N900T	Facebook 229.0	Android 5.0.0
-Generic Smartphone	Chrome Mobile WebView 70.0	Android 5.1.1
-Kindle	Amazon Silk 76.3	Android 5.1.1
-AFTT	Chrome Mobile WebView 70.0	Android 5.1.1
-Kindle	Amazon Silk 76.3	Android 5.1.1
-Kindle	Amazon Silk 76.3	Android 5.1.1
-Kindle	Amazon Silk 71.2	Android 5.1.1
-Kindle	Amazon Silk 76.3	Android 5.1.1
-Kindle	Amazon Silk 76.3	Android 5.1.1
-Kindle	Amazon Silk 76.3	Android 5.1.1
-Kindle	Amazon Silk 76.3	Android 5.1.1
-Kindle	Amazon Silk 77.1	Android 5.1.1
-LG-AS330	Chrome Mobile 77.0	Android 5.1.1
-LGL43AL	Chrome Mobile 77.0	Android 5.1.1
-Samsung SM-G530R7	Samsung Internet 9.2	Android 5.1.1
-Samsung SM-T377P	Samsung Internet 10.1	Android 5.1.1
-Samsung SM-T900	Samsung Internet 10.1	Android 5.1.1
-Samsung SM-T337A	Chrome 69.0	Android 5.1.1
-Samsung SM-G360T1	Chrome Mobile 67.0	Android 5.1.1
-Samsung SM-J320FN	Chrome Mobile 74.0	Android 5.1.1
-SM-T280	Chrome 74.0	Android 5.1.1
-Samsung SM-T330NU	Chrome 71.0	Android 5.1.1
-SM-T670	Chrome 76.0	Android 5.1.1
-SM-T670	Chrome 77.0	Android 5.1.1
-Vodafone Smart ultra 6	Chrome Mobile WebView 74.0	Android 5.1.1
-BLU Advance 5.0	Chrome Mobile 66.0	Android 5.1.0
-HTC Desire 626s	Chrome Mobile 77.0	Android 5.1.0
-HUAWEI LUA-L22	Chrome Mobile 50.0	Android 5.1.0
-NX16A11264	Chrome 77.0	Android 5.1.0
-XT1526	Chrome Mobile 73.0	Android 5.1.0
-Oppo CPH1613	Chrome Mobile 77.0	Android 6.0.1
-LG-M153 	Chrome Mobile WebView 55.0	Android 6.0.1
-LG-M153	Chrome Mobile 77.0	Android 6.0.1
-LGLS676	Chrome Mobile 77.0	Android 6.0.1
-N9136	Chrome Mobile 74.0	Android 6.0.1
-Asus Nexus 7	Chrome 44.0	Android 6.0.1
-Samsung SM-G900I	Samsung Internet 10.1	Android 6.0.1
-Samsung SM-G900P	Samsung Internet 7.2	Android 6.0.1
-Samsung SM-J700M	Samsung Internet 10.1	Android 6.0.1
-Samsung SM-S327VL	Samsung Internet 10.1	Android 6.0.1
-Samsung SM-T377A	Chrome 77.0	Android 6.0.1
-Samsung SM-G532M	Chrome Mobile 55.0	Android 6.0.1
-Samsung SM-G532M	Facebook 240.0	Android 6.0.1
-Samsung SM-G532M	Chrome Mobile 77.0	Android 6.0.1
-Samsung SM-G550T	Chrome Mobile 76.0	Android 6.0.1
-Samsung SM-G550T	Chrome Mobile 77.0	Android 6.0.1
-Samsung SM-G550T1	Chrome Mobile 76.0	Android 6.0.1
-Samsung SM-G900V	Chrome Mobile 73.0	Android 6.0.1
-Samsung SM-G920A	Chrome Mobile 77.0	Android 6.0.1
-Samsung SM-J327P	Chrome Mobile 77.0	Android 6.0.1
-Samsung SM-N910S	Chrome Mobile 75.0	Android 6.0.1
-Samsung SM-N920V	Chrome Mobile 76.0	Android 6.0.1
-Samsung SM-T350	Chrome 59.0	Android 6.0.1
-Samsung SM-T560NU	Chrome 77.0	Android 6.0.1
-SM-T800	Chrome 77.0	Android 6.0.1
-XT1254	Chrome Mobile 77.0	Android 6.0.1
-Z798BL	Chrome Mobile 67.0	Android 6.0.1
-Z799VL	Chrome Mobile WebView 45.0	Android 6.0.1
-5010X	Chrome Mobile 76.0	Android 6.0.0
-Huawei CAM-L21	Chrome Mobile 77.0	Android 6.0.0
-F3313	Chrome Mobile 77.0	Android 6.0.0
-RCT6603W47M7	Chrome 77.0	Android 6.0.0
-5049Z	Chrome Mobile 56.0	Android 7.0.0
-Asus A002A	Chrome Mobile 77.0	Android 7.0.0
-Alcatel_5044C	Chrome Mobile 77.0	Android 7.0.0
-Astra Young Pro	Chrome Mobile WebView 59.0	Android 7.0.0
-Infinix X571	Chrome Mobile 77.0	Android 7.0.0
-LG-H872 	Chrome Mobile 64.0	Android 7.0.0
-LG-K425 	Chrome Mobile 55.0	Android 7.0.0
-LG-LS777	Chrome Mobile 77.0	Android 7.0.0
-LG-M210	Chrome Mobile 77.0	Android 7.0.0
-LG-M430	Chrome Mobile 77.0	Android 7.0.0
-LG-TP260 	Chrome Mobile WebView 64.0	Android 7.0.0
-LG-TP260	Chrome Mobile 77.0	Android 7.0.0
-LG-TP450 	Chrome Mobile 64.0	Android 7.0.0
-LG-V521	Chrome 75.0	Android 7.0.0
-LG-V521	Chrome 77.0	Android 7.0.0
-LGMP260	Chrome Mobile 58.0	Android 7.0.0
-LGMS210	Chrome Mobile 55.0	Android 7.0.0
-LGMS210	Chrome Mobile 77.0	Android 7.0.0
-P00I	Chrome 77.0	Android 7.0.0
-RS988	Chrome Mobile 77.0	Android 7.0.0
-Samsung SM-J701F	Samsung Internet 10.1	Android 7.0.0
-Samsung SM-J710F	Samsung Internet 10.1	Android 7.0.0
-Samsung SM-N920T	Samsung Internet 9.2	Android 7.0.0
-Samsung SM-G920A	Chrome Mobile 77.0	Android 7.0.0
-Samsung SM-G920P	Flipboard 4.2	Android 7.0.0
-Samsung SM-G920V	Chrome Mobile 76.0	Android 7.0.0
-Samsung SM-G928V	Chrome Mobile 77.0	Android 7.0.0
-Samsung SM-G950U	Chrome Mobile 77.0	Android 7.0.0
-Samsung SM-G955U	Chrome Mobile 77.0	Android 7.0.0
-Samsung SM-J327T	Chrome Mobile 74.0	Android 7.0.0
-Samsung SM-J327T	Chrome Mobile 77.0	Android 7.0.0
-Samsung SM-J327T1	Chrome Mobile 64.0	Android 7.0.0
-Samsung SM-J327T1	Chrome Mobile 75.0	Android 7.0.0
-Samsung SM-J327T1	Chrome Mobile 77.0	Android 7.0.0
-Samsung SM-N9208	Chrome Mobile 73.0	Android 7.0.0
-Samsung SM-N920P	Chrome Mobile 74.0	Android 7.0.0
-Samsung SM-N920T	Chrome Mobile 77.0	Android 7.0.0
-SM-T585	Chrome 77.0	Android 7.0.0
-SM-T810	Chrome 75.0	Android 7.0.0
-SM-T810	Chrome 76.0	Android 7.0.0
-SM-T810	Chrome 77.0	Android 7.0.0
-SM-T813	Chrome 76.0	Android 7.0.0
-SM-T813	Chrome 76.0	Android 7.0.0
-Trekstor ST1009X	Chrome 75.0	Android 7.0.0
-XT1663	Chrome Mobile 77.0	Android 7.0.0
-Generic Smartphone	Chrome Mobile 58.0	Android 7.0.0
-A574BL	Chrome Mobile WebView 77.0	Android 7.1.1
-A574BL	Chrome Mobile 77.0	Android 7.1.1
-Oppo CPH1729	Facebook 240.0	Android 7.1.1
-3632A	Chrome Mobile 74.0	Android 7.1.1
-General Mobile 4G Dual	Chrome Mobile 77.0	Android 7.1.1
-Moto E (4) Plus	Chrome Mobile WebView 76.0	Android 7.1.1
-Moto E (4)	Chrome Mobile 70.0	Android 7.1.1
-Moto E (4)	Chrome Mobile 76.0	Android 7.1.1
-Moto E (4)	Chrome Mobile 77.0	Android 7.1.1
-Moto E (4)	Chrome Mobile 77.0	Android 7.1.1
-NX591J	Chrome Mobile 77.0	Android 7.1.1
-REVVLPLUS C3701A	Chrome Mobile 64.0	Android 7.1.1
-Samsung SM-J320A	Samsung Internet 10.1	Android 7.1.1
-Samsung SM-T550	Samsung Internet 10.1	Android 7.1.1
-Samsung SM-T377A	Chrome 64.0	Android 7.1.1
-Samsung SM-J250F	Chrome Mobile 76.0	Android 7.1.1
-Samsung SM-J700T	Chrome Mobile 77.0	Android 7.1.1
-SM-T350	Chrome 77.0	Android 7.1.1
-Samsung SM-T377T	Chrome 77.0	Android 7.1.1
-Samsung SM-T550	Chrome 69.0	Android 7.1.1
-SM-T550	Chrome 77.0	Android 7.1.1
-Samsung SM-T560NU	Chrome 77.0	Android 7.1.1
-X20	Chrome Mobile WebView 52.0	Android 7.1.1
-Z851M	Chrome Mobile 58.0	Android 7.1.1
-Z899VL	Chrome Mobile WebView 74.0	Android 7.1.1
-Z982	Chrome Mobile WebView 75.0	Android 7.1.1
-Z982	Chrome Mobile 77.0	Android 7.1.1
-Generic Smartphone	Chrome Mobile WebView 70.0	Android 7.1.2
-AFTKMST12	Chrome Mobile WebView 70.0	Android 7.1.2
-Kindle	Amazon Silk 76.3	Android 7.1.2
-AFTMM	Chrome Mobile WebView 70.0	Android 7.1.2
-AFTN	Chrome Mobile WebView 70.0	Android 7.1.2
-KFKAWI	Chrome Mobile WebView 59.0	Android 7.1.2
-Kindle	Amazon Silk 76.3	Android 7.1.2
-Kindle	Amazon Silk 76.3	Android 7.1.2
-LG-SP200	Chrome Mobile 75.0	Android 7.1.2
-LG-SP200	Chrome Mobile 76.0	Android 7.1.2
-LM-X210(G)	Chrome Mobile 76.0	Android 7.1.2
-LM-X210	Chrome Mobile 76.0	Android 7.1.2
-RCT6973W43R	Chrome 77.0	Android 7.1.2
-XiaoMi Redmi 4	Chrome Mobile 77.0	Android 7.1.2
-Generic Smartphone	Chrome Mobile WebView 76.0	Android 8.0.0
-Asus Z01FD	Chrome Mobile 77.0	Android 8.0.0
-Huawei AUM-L29	Chrome Mobile 77.0	Android 8.0.0
-BRAVIA 4K GB	Chrome Mobile WebView 77.0	Android 8.0.0
-CMR-W09	Chrome 77.0	Android 8.0.0
-EVA-AL00	Chrome Mobile 77.0	Android 8.0.0
-G3223	Chrome Mobile 77.0	Android 8.0.0
-LG-H910	Chrome Mobile 77.0	Android 8.0.0
-LG-H931	Chrome Mobile 76.0	Android 8.0.0
-LG-H932	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-A520F	Samsung Internet 10.1	Android 8.0.0
-Samsung SM-G891A	Samsung Internet 8.2	Android 8.0.0
-Samsung SM-G935T	Samsung Internet 10.1	Android 8.0.0
-Samsung SM-G955U	Samsung Internet 10.1	Android 8.0.0
-Samsung SM-J337T	Samsung Internet 9.2	Android 8.0.0
-Samsung SM-J737P	Samsung Internet 10.1	Android 8.0.0
-Samsung SM-N950F	Samsung Internet 10.1	Android 8.0.0
-Samsung SM-G891A	Chrome Mobile 72.0	Android 8.0.0
-Samsung SM-G935A	Chrome Mobile 76.0	Android 8.0.0
-Samsung SM-A720F	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-G570F	Facebook 231.0	Android 8.0.0
-Samsung SM-G570Y	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-G930T	Chrome Mobile WebView 77.0	Android 8.0.0
-Samsung SM-G930V	Chrome Mobile 64.0	Android 8.0.0
-Samsung SM-G930VL	Chrome Mobile 74.0	Android 8.0.0
-Samsung SM-G935F	Chrome Mobile 75.0	Android 8.0.0
-Samsung SM-G935P	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-G935T	Facebook 240.0	Android 8.0.0
-Samsung SM-G935T	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-G950U	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-G955U	Chrome Mobile 74.0	Android 8.0.0
-Samsung SM-G955U	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-J330G	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-J337T	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-J737A	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-J737T1	Chrome Mobile 66.0	Android 8.0.0
-Samsung SM-J737T1	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-N950F	Chrome Mobile 66.0	Android 8.0.0
-Samsung SM-N950U	Chrome Mobile 76.0	Android 8.0.0
-Samsung SM-N950U	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-N950U1	Chrome Mobile 77.0	Android 8.0.0
-Samsung SM-S367VL	Chrome Mobile 77.0	Android 8.0.0
-VS995	Chrome Mobile 77.0	Android 8.0.0
-XT1635-02	Chrome Mobile 77.0	Android 8.0.0
-moto e5 play	Chrome Mobile 76.0	Android 8.0.0
-moto e5 play	Chrome Mobile 77.0	Android 8.0.0
-moto e5 supra	Chrome Mobile 76.0	Android 8.0.0
-moto g(6)	Chrome Mobile 77.0	Android 8.0.0
-5041C	Chrome Mobile 77.0	Android 8.1.0
-6062W	Chrome Mobile 77.0	Android 8.1.0
-A502DL	Chrome Mobile 67.0	Android 8.1.0
-A502DL	Chrome Mobile 76.0	Android 8.1.0
-Huawei BKK-LX2	Chrome Mobile 76.0	Android 8.1.0
-C4	Chrome Mobile 70.0	Android 8.1.0
-3310A	Chrome Mobile 77.0	Android 8.1.0
-Infinix X604	Chrome Mobile 64.0	Android 8.1.0
-Joy 1	Chrome Mobile 77.0	Android 8.1.0
-LAVA LE9820	Chrome Mobile 77.0	Android 8.1.0
-LG-Q710AL	Chrome Mobile 77.0	Android 8.1.0
-LM-Q610(FGN)	Chrome Mobile 77.0	Android 8.1.0
-LM-Q710(FGN)	Facebook 235.0	Android 8.1.0
-LM-Q710(FGN)	Chrome Mobile 70.0	Android 8.1.0
-LM-Q710(FGN)	Chrome Mobile 76.0	Android 8.1.0
-LM-Q710(FGN)	Chrome Mobile 76.0	Android 8.1.0
-LM-Q710(FGN)	Chrome Mobile 77.0	Android 8.1.0
-LM-V405	Chrome Mobile 77.0	Android 8.1.0
-LM-X210(G)	UC Browser 11.6	Android 8.1.0
-LM-X210(G)	Chrome Mobile 70.0	Android 8.1.0
-LM-X210(G)	Chrome Mobile 72.0	Android 8.1.0
-LM-X210(G)	Chrome Mobile 77.0	Android 8.1.0
-LM-X212(G)	Chrome Mobile 77.0	Android 8.1.0
-LM-X220	Chrome Mobile 70.0	Android 8.1.0
-LM-X220	Chrome Mobile 76.0	Android 8.1.0
-LM-X220PM	Chrome Mobile WebView 77.0	Android 8.1.0
-LM-X410(FG)	Chrome Mobile 70.0	Android 8.1.0
-LM-X410(FG)	Chrome Mobile 76.0	Android 8.1.0
-LM-X410(FG)	Chrome Mobile 77.0	Android 8.1.0
-LM-X410.FGN	Chrome Mobile 68.0	Android 8.1.0
-LML414DL	Chrome Mobile 76.0	Android 8.1.0
-LML713DL	Chrome Mobile 77.0	Android 8.1.0
-Moto G (5S) Plus	Chrome Mobile 77.0	Android 8.1.0
-HTC One	Chrome Mobile WebView 70.0	Android 8.1.0
-RCT6873W42BMF8KC	Chrome Mobile 77.0	Android 8.1.0
-REVVL 2	Chrome Mobile 67.0	Android 8.1.0
-REVVL 2	Chrome Mobile 76.0	Android 8.1.0
-Samsung SM-J727T	Samsung Internet 10.1	Android 8.1.0
-Samsung SM-J727T1	Samsung Internet 9.4	Android 8.1.0
-Samsung SM-J727T1	Samsung Internet 10.1	Android 8.1.0
-Samsung SM-T580	Samsung Internet 9.4	Android 8.1.0
-Samsung SM-J727A	Facebook 240.0	Android 8.1.0
-Samsung SM-G610F	Chrome Mobile 77.0	Android 8.1.0
-Samsung SM-J260T1	Chrome Mobile 76.0	Android 8.1.0
-Samsung SM-J260T1	Chrome Mobile 76.0	Android 8.1.0
-Samsung SM-J260T1	Chrome Mobile 77.0	Android 8.1.0
-Samsung SM-J410F	Chrome Mobile 77.0	Android 8.1.0
-Samsung SM-J727P	Chrome Mobile 68.0	Android 8.1.0
-Samsung SM-J727T	Chrome Mobile 66.0	Android 8.1.0
-Samsung SM-J727T1	Chrome Mobile 76.0	Android 8.1.0
-Samsung SM-J727T1	Chrome Mobile 77.0	Android 8.1.0
-Samsung SM-J727T1	Chrome Mobile 77.0	Android 8.1.0
-Samsung SM-J727V	Chrome Mobile 70.0	Android 8.1.0
-Samsung SM-J727V	Chrome Mobile 77.0	Android 8.1.0
-SM-P580	Chrome 77.0	Android 8.1.0
-SM-T380	Chrome 75.0	Android 8.1.0
-SM-T580	Edge Mobile 42.0	Android 8.1.0
-SM-T580	Chrome 76.0	Android 8.1.0
-SM-T580	Chrome 76.0	Android 8.1.0
-SM-T580	Chrome 77.0	Android 8.1.0
-Samsung SM-T837T	Chrome 77.0	Android 8.1.0
-TECNO CF8	Facebook 239.0	Android 8.1.0
-V1818CA	Chrome Mobile 75.0	Android 8.1.0
-meizu C9	Chrome Mobile 68.0	Android 8.1.0
-vivo 1724	Chrome Mobile 76.0	Android 8.1.0
-vivo 1814	Chrome Mobile 77.0	Android 8.1.0
-Generic Smartphone	DuckDuckGo Mobile 5.0	Android 9.0.0
-1825	Chrome Mobile 70.0	Android 9.0.0
-ANE-LX2	Facebook 236.0	Android 9.0.0
-BLA-A09	Chrome Mobile 77.0	Android 9.0.0
-Huawei CLT-L04	Chrome Mobile 77.0	Android 9.0.0
-Oppo CPH1911	Facebook 239.0	Android 9.0.0
-Oppo CPH1923	Chrome Mobile WebView 76.0	Android 9.0.0
-Huawei ELE-L29	Chrome Mobile 77.0	Android 9.0.0
-G8142	Chrome Mobile 77.0	Android 9.0.0
-GM1911	Chrome Mobile 76.0	Android 9.0.0
-GM1917	Chrome Mobile 77.0	Android 9.0.0
-Huawei INE-LX2	Chrome Mobile 76.0	Android 9.0.0
-LM-G710	Chrome Mobile WebView 77.0	Android 9.0.0
-LM-Q720	Chrome Mobile 77.0	Android 9.0.0
-LM-V405	Chrome Mobile WebView 77.0	Android 9.0.0
-LM-V405	Chrome Mobile 76.0	Android 9.0.0
-LM-V500N	Chrome Mobile 77.0	Android 9.0.0
-LM-X420	Chrome Mobile 72.0	Android 9.0.0
-LM-X420	Chrome Mobile 77.0	Android 9.0.0
-MAR-LX1A	Chrome Mobile 77.0	Android 9.0.0
-XiaoMi MI 9	Chrome Mobile 77.0	Android 9.0.0
-XiaoMi Mi A2	Chrome Mobile 77.0	Android 9.0.0
-Moto Z (2)	Chrome Mobile 77.0	Android 9.0.0
-Nokia 6	Chrome Mobile 77.0	Android 9.0.0
-OnePlus ONEPLUS A6000	Chrome Mobile 77.0	Android 9.0.0
-OnePlus ONEPLUS A6003	Chrome Mobile 77.0	Android 9.0.0
-OnePlus ONEPLUS A6013	Chrome Mobile WebView 77.0	Android 9.0.0
-OnePlus ONEPLUS A6013	Chrome Mobile 74.0	Android 9.0.0
-OnePlus ONEPLUS A6013	Chrome Mobile 77.0	Android 9.0.0
-PAR-AL00	Facebook 235.0	Android 9.0.0
-Pixel 2 XL	Chrome Mobile 77.0	Android 9.0.0
-Pixel 3	Chrome Mobile WebView 77.0	Android 9.0.0
-Pixel 3	Chrome Mobile 76.0	Android 9.0.0
-Pixel 3	Chrome Mobile 77.0	Android 9.0.0
-Pixel 3a XL	Chrome Mobile 77.0	Android 9.0.0
-REVVLRY 	Chrome Mobile 73.0	Android 9.0.0
-Oppo RMX1801	Chrome Mobile 75.0	Android 9.0.0
-XiaoMi Redmi 7	Chrome Mobile 77.0	Android 9.0.0
-XiaoMi Redmi Note 7	Chrome Mobile 76.0	Android 9.0.0
-Samsung SM-A102U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-A505FN	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-A505GN	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-G892U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-G950U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-G955F	Samsung Internet 9.4	Android 9.0.0
-Samsung SM-G955U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-G9600	Samsung Internet 9.4	Android 9.0.0
-Samsung SM-G960U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-G965U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-G970F	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-G970U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-G973U	Samsung Internet 9.4	Android 9.0.0
-Samsung SM-G973U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-G975U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-J415F	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-J730F	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-J737P	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-J737T	Samsung Internet 9.0	Android 9.0.0
-Samsung SM-N950U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-N960F	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-N960U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-N960U1	Samsung Internet 9.2	Android 9.0.0
-Samsung SM-N970U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-N975U	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-N975U1	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-T510	Samsung Internet 10.1	Android 9.0.0
-Samsung SM-T720	Samsung Internet 10.1	Android 9.0.0
-SHIELD Android TV	Chrome Mobile WebView 77.0	Android 9.0.0
-Samsung SM-A102U	Chrome Mobile 72.0	Android 9.0.0
-Samsung SM-A102U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-A105M	Facebook 237.0	Android 9.0.0
-Samsung SM-A205G	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-A205U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-A505F	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-A530F	Facebook 240.0	Android 9.0.0
-Samsung SM-A530N	Chrome Mobile WebView 77.0	Android 9.0.0
-Samsung SM-A600T	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-A605F	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-A920F	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G892A	Chrome Mobile 74.0	Android 9.0.0
-Samsung SM-G950F	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G950U	Chrome Mobile WebView 77.0	Android 9.0.0
-Samsung SM-G950U	Chrome Mobile 71.0	Android 9.0.0
-Samsung SM-G950U	Chrome Mobile 76.0	Android 9.0.0
-Samsung SM-G950U	Chrome Mobile 76.0	Android 9.0.0
-Samsung SM-G950U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G950U1	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G955F	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G955U	Facebook 240.0	Android 9.0.0
-Samsung SM-G955U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G9600	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G960U	Facebook 233.0	Android 9.0.0
-Samsung SM-G960U	Chrome Mobile WebView 77.0	Android 9.0.0
-Samsung SM-G960U	Chrome Mobile 71.0	Android 9.0.0
-Samsung SM-G960U	Chrome Mobile 74.0	Android 9.0.0
-Samsung SM-G960U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G960U1	Facebook 240.0	Android 9.0.0
-Samsung SM-G960U1	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G965F	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G965U	Chrome Mobile 74.0	Android 9.0.0
-Samsung SM-G965U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G965U	Chrome Mobile 79.0	Android 9.0.0
-Samsung SM-G965U1	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G970U	Facebook 240.0	Android 9.0.0
-Samsung SM-G970U	Chrome Mobile 75.0	Android 9.0.0
-Samsung SM-G970U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G970U1	Chrome Mobile WebView 77.0	Android 9.0.0
-Samsung SM-G973U	Chrome Mobile 74.0	Android 9.0.0
-Samsung SM-G973U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G973U1	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G975U	Chrome Mobile 75.0	Android 9.0.0
-Samsung SM-G975U	Chrome Mobile 76.0	Android 9.0.0
-Samsung SM-G975U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-G975U1	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-J260A	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-J337P	Chrome Mobile 76.0	Android 9.0.0
-Samsung SM-J600FN	Chrome Mobile 75.0	Android 9.0.0
-Samsung SM-J600G	Facebook 238.0	Android 9.0.0
-Samsung SM-J730F	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-J737A	Chrome Mobile WebView 77.0	Android 9.0.0
-Samsung SM-J737A	Chrome Mobile 74.0	Android 9.0.0
-Samsung SM-J737V	Pinterest 0.0	Android 9.0.0
-Samsung SM-J737V	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-J810M	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-N950U	Facebook 240.0	Android 9.0.0
-Samsung SM-N950U	Chrome Mobile 72.0	Android 9.0.0
-Samsung SM-N950U	Chrome Mobile 75.0	Android 9.0.0
-Samsung SM-N950U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-N950U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-N960F	Chrome Mobile 76.0	Android 9.0.0
-Samsung SM-N960U	Facebook 240.0	Android 9.0.0
-Samsung SM-N960U	Chrome Mobile WebView 77.0	Android 9.0.0
-Samsung SM-N960U	Chrome Mobile 74.0	Android 9.0.0
-Samsung SM-N960U	Chrome Mobile 75.0	Android 9.0.0
-Samsung SM-N960U	Chrome Mobile 76.0	Android 9.0.0
-Samsung SM-N960U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-N960U1	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-N975U	Chrome Mobile WebView 77.0	Android 9.0.0
-Samsung SM-N975U	Chrome Mobile WebView 77.0	Android 9.0.0
-Samsung SM-N975U	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-N976V	Facebook 240.0	Android 9.0.0
-Samsung SM-S367VL	Chrome Mobile 77.0	Android 9.0.0
-Samsung SM-S767VL	Chrome Mobile 76.0	Android 9.0.0
-Samsung SM-T597P	Chrome 77.0	Android 9.0.0
-SM-T720	Chrome 77.0	Android 9.0.0
-TECNO KC8	Chrome Mobile 77.0	Android 9.0.0
-Huawei VOG-L29	Chrome Mobile 77.0	Android 9.0.0
-cp3705A	Chrome Mobile 74.0	Android 9.0.0
-moto g(6)	Chrome Mobile WebView 77.0	Android 9.0.0
-moto g(6) play	Chrome Mobile 77.0	Android 9.0.0
-moto g(7) play	Facebook 235.0	Android 9.0.0
-moto g(7) play	Chrome Mobile 70.0	Android 9.0.0
-moto g(7) power	Chrome Mobile 75.0	Android 9.0.0
-moto g(7) power	Chrome Mobile 77.0	Android 9.0.0
-moto z4	Chrome Mobile 73.0	Android 9.0.0
-moto z4	Chrome Mobile 77.0	Android 9.0.0
-Samsung GT-P3113 	Android 4.1	Android 4.1.1
-Samsung GT-I8160 	Android 4.1	Android 4.1.2
-Asus Nexus 7	Android 4.2	Android 4.2.2
-Samsung SM-E500H	Android 4.4	Android 4.4.0
-LGMS550	Chrome Mobile WebView 43.0	Android 6.0.1
-Samsung SM-J737T1	Chrome Mobile WebView 43.0	Android 6.0.1
-TECNO CA6	Opera Mobile 5.3	Android 7.0.0
-XiaoMi Redmi 5A	MiuiBrowser 9.5	Android 7.1.2
-Oppo CPH1911	Chrome Mobile WebView 70.0	Android 9.0.0
-vivo 1904	Opera Mobile 44.1	Android 9.0.0
-Mac	Firefox 68.0	Mac OS X 10.11.0
-Mac	Firefox 69.0	Mac OS X 10.13.0
-Mac	Firefox 67.0	Mac OS X 10.14.0
-Mac	Firefox 68.0	Mac OS X 10.14.0
-Mac	Firefox 69.0	Mac OS X 10.14.0
-Mac	Firefox 70.0	Mac OS X 10.14.0
-Mac	Chrome 76.0	Mac OS X 10.10.5
-Mac	Chrome 77.0	Mac OS X 10.10.5
-Mac	Safari 10.1	Mac OS X 10.10.5
-Mac	Chrome 76.0	Mac OS X 10.11.4
-Mac	Chrome 72.0	Mac OS X 10.11.6
-Mac	Chrome 76.0	Mac OS X 10.11.6
-Mac	Chrome 76.0	Mac OS X 10.11.6
-Mac	Chrome 77.0	Mac OS X 10.11.6
-Mac	Safari 9.1	Mac OS X 10.11.6
-Mac	Safari 10.0	Mac OS X 10.11.6
-Mac	Safari 11.1	Mac OS X 10.11.6
-Mac	Chrome 77.0	Mac OS X 10.12.1
-Mac	Safari 10.0	Mac OS X 10.12.3
-Mac	Chrome 75.0	Mac OS X 10.12.6
-Mac	Chrome 76.0	Mac OS X 10.12.6
-Mac	Chrome 76.0	Mac OS X 10.12.6
-Mac	Chrome 77.0	Mac OS X 10.12.6
-Mac	Safari 12.1	Mac OS X 10.12.6
-Mac	Safari 11.0	Mac OS X 10.13.0
-Mac	Chrome 77.0	Mac OS X 10.13.1
-Mac	Chrome 77.0	Mac OS X 10.13.2
-Mac	Chrome 76.0	Mac OS X 10.13.4
-Mac	Chrome 76.0	Mac OS X 10.13.4
-Mac	Chrome 76.0	Mac OS X 10.13.5
-Mac	Chrome 75.0	Mac OS X 10.13.6
-Mac	Chrome 76.0	Mac OS X 10.13.6
-Mac	Chrome 77.0	Mac OS X 10.13.6
-Mac	Safari 12.0	Mac OS X 10.13.6
-Mac	Safari 12.1	Mac OS X 10.13.6
-Mac	Safari 12.1	Mac OS X 10.13.6
-Mac	Safari 13.0	Mac OS X 10.13.6
-Mac	Safari 13.0	Mac OS X 10.13.6
-Mac	Chrome 75.0	Mac OS X 10.14.0
-Mac	Chrome 76.0	Mac OS X 10.14.0
-Mac	Chrome 77.0	Mac OS X 10.14.0
-Mac	Chrome 77.0	Mac OS X 10.14.1
-Mac	Chrome 76.0	Mac OS X 10.14.2
-Mac	Chrome 69.0	Mac OS X 10.14.3
-Mac	Safari 12.0	Mac OS X 10.14.3
-Mac	Chrome 75.0	Mac OS X 10.14.4
-Mac	Chrome 77.0	Mac OS X 10.14.4
-Mac	Safari 12.1	Mac OS X 10.14.4
-Mac	Chrome 76.0	Mac OS X 10.14.5
-Mac	Chrome 77.0	Mac OS X 10.14.5
-Mac	Safari 12.1	Mac OS X 10.14.5
-Mac	Chrome 75.0	Mac OS X 10.14.6
-Mac	Chrome 76.0	Mac OS X 10.14.6
-Mac	Chrome 76.0	Mac OS X 10.14.6
-Mac	Chrome 77.0	Mac OS X 10.14.6
-Mac	Chrome 77.0	Mac OS X 10.14.6
-Mac	Safari 12.1	Mac OS X 10.14.6
-Mac	Safari 13.0	Mac OS X 10.14.6
-Mac	Chrome 65.0	Mac OS X 10.9.5
-Mac	Chrome 66.0	Mac OS X 10.9.5
-Mac	Chrome 67.0	Mac OS X 10.9.5
-PlayStation 4	Apple Mail 605.1	Other 0.0.0
-Samsung SMART-TV	Safari 3.0	Tizen 3.0.0
-Samsung SMART-TV	Samsung Internet 2.0	Tizen 3.0.0
-Samsung SMART-TV	Samsung Internet 2.1	Tizen 4.0.0
-Samsung SMART-TV	Samsung Internet 2.2	Tizen 5.0.0
-Other	Edge 17.17134	Windows 10.0.0
-Other	Edge 18.17763	Windows 10.0.0
-Other	Chrome 77.0	Windows 10.0.0
-Other	Maxthon 5.2	Windows 10.0.0
-Other	Chrome 73.1	Windows 10.0.0
-Other	Chrome 76.0	Windows 10.0.0
-Other	Opera 63.0	Windows 10.0.0
-Other	Chrome 77.0	Windows 10.0.0
-Other	Chrome 77.0	Windows 10.0.0
-Other	Coc Coc 82.0	Windows 10.0.0
-Other	IE 11.0	Windows 10.0.0
-Other	Firefox 59.0	Windows 10.0.0
-Other	Firefox 60.0	Windows 10.0.0
-Other	Edge 15.15063	Windows 10.0.0
-Other	Edge 16.16299	Windows 10.0.0
-Other	Edge 17.17134	Windows 10.0.0
-Other	Edge 18.17763	Windows 10.0.0
-Other	Chrome 65.0	Windows 10.0.0
-Other	Chrome 70.0	Windows 10.0.0
-Other	Edge 18.18362	Windows 10.0.0
-Other	Edge 18.18995	Windows 10.0.0
-Other	Edge 18.19493	Windows 10.0.0
-Other	Chrome 70.0	Windows 10.0.0
-Other	Chrome 71.0	Windows 10.0.0
-Other	Chrome 73.0	Windows 10.0.0
-Other	Chrome 74.0	Windows 10.0.0
-Other	Chrome 75.0	Windows 10.0.0
-Other	Chrome 76.0	Windows 10.0.0
-Other	Vivaldi 2.7	Windows 10.0.0
-Other	Chrome 76.0	Windows 10.0.0
-Other	Opera 63.0	Windows 10.0.0
-Other	Chrome 77.0	Windows 10.0.0
-Other	Chrome 77.0	Windows 10.0.0
-Other	Edge 79.0	Windows 10.0.0
-Other	Edge 18.18362	Windows 10.0.0
-Other	Edge 18.18363	Windows 10.0.0
-Other	Edge 18.18362	Windows 10.0.0
-Other	Firefox 61.0	Windows 10.0.0
-Other	Firefox 63.0	Windows 10.0.0
-Other	Firefox 67.0	Windows 10.0.0
-Other	Firefox 68.0	Windows 10.0.0
-Other	Firefox 69.0	Windows 10.0.0
-Other	Firefox 69.0	Windows 10.0.0
-Other	Chrome 49.0	Windows XP.0.0
-Other	Chrome 49.0	Windows Vista.0.0
-Other	Chrome 49.0	Windows Vista.0.0
-Other	Chrome 76.0	Windows 7.0.0
-Other	Chrome 77.0	Windows 7.0.0
-Other	Chrome 77.0	Windows 7.0.0
-Other	Coc Coc 80.0	Windows 7.0.0
-Other	Coc Coc 82.0	Windows 7.0.0
-Other	IE 11.0	Windows 7.0.0
-Other	Chrome 67.0	Windows 7.0.0
-Other	Chrome 70.0	Windows 7.0.0
-Other	Chrome 72.0	Windows 7.0.0
-Other	Chrome 74.0	Windows 7.0.0
-Other	Chrome 75.0	Windows 7.0.0
-Other	Chrome 76.0	Windows 7.0.0
-Other	Chrome 76.0	Windows 7.0.0
-Other	Chrome 77.0	Windows 7.0.0
-Other	Waterfox 56.2	Windows 7.0.0
-Other	Firefox 60.0	Windows 7.0.0
-Other	Firefox 63.0	Windows 7.0.0
-Other	Firefox 68.0	Windows 7.0.0
-Other	Firefox 69.0	Windows 7.0.0
-Other	Firefox 69.0	Windows 7.0.0
-Other	Chrome 77.0	Windows 8.0.0
-Other	Firefox 69.0	Windows 8.0.0
-Other	Chrome 77.0	Windows 8.1.0
-Other	IE 11.0	Windows RT 8.1.0
-Other	IE 11.0	Windows 8.1.0
-Other	IE 11.0	Windows 8.1.0
-Other	Chrome 63.0	Windows 8.1.0
-Other	Chrome 64.0	Windows 8.1.0
-Other	Chrome 76.0	Windows 8.1.0
-Other	Chrome 76.0	Windows 8.1.0
-Other	Chrome 77.0	Windows 8.1.0
-Other	Firefox 69.0	Windows 8.1.0
-Other	Firefox 69.0	Windows 8.1.0
-Other	Chrome 72.0	Windows 10.0.0
-Other	Chrome 77.0	Chrome OS 12371.75.0
-Other	Chrome 76.0	Chrome OS 12239.92.0
-Other	Chrome 69.0	Chrome OS 10895.78.0
-Other	Chrome 70.0	Chrome OS 11021.81.0
-Other	Chrome 74.0	Chrome OS 11895.118.0
-Other	Chrome 76.0	Chrome OS 12239.92.0
-Other	Chrome 76.0	Chrome OS 12239.92.1
-Other	Chrome 76.0	Chrome OS 12239.92.4
-Other	Chrome 77.0	Chrome OS 12371.46.0
-Other	Chrome 77.0	Chrome OS 12371.65.0
-Other	Chrome 75.0	Linux 0.0.0
-Other	Chrome 77.0	Linux 0.0.0
-Other	Samsung Internet 10.1	Linux 0.0.0
-Other	Chrome 66.0	Linux 0.0.0
-Other	Chrome 66.0	Linux 0.0.0
-Other	Chrome 66.0	Linux 0.0.0
-Other	Chrome 66.0	Linux 0.0.0
-Other	Chrome 66.0	Linux 0.0.0
-Other	Firefox 65.0	Ubuntu 0.0.0
-Other	Firefox 66.0	Ubuntu 0.0.0
-Other	Firefox 67.0	Ubuntu 0.0.0
-iPad	Google 22.0	iOS 10.3.3
-iPad	Chrome Mobile iOS 71.0	iOS 10.3.3
-iPad	Firefox iOS 14.0	iOS 10.3.3
-iPad	Mobile Safari UI/WKWebView 0.0	iOS 10.3.3
-iPad	Facebook 240.0	iOS 10.3.3
-iPad	Mobile Safari 10.0	iOS 10.3.3
-iPad	Mobile Safari 10.0	iOS 10.3.4
-iPad	Chrome Mobile iOS 76.0	iOS 11.1.0
-iPad	Chrome Mobile iOS 76.0	iOS 11.1.2
-iPad	Mobile Safari 11.0	iOS 11.2.1
-iPad	Mobile Safari 11.0	iOS 11.2.2
-iPad	Mobile Safari 11.0	iOS 11.2.6
-iPad	Mobile Safari 11.0	iOS 11.3.0
-iPad	Mobile Safari 11.0	iOS 11.4.0
-iPad	Mobile Safari UI/WKWebView 0.0	iOS 11.4.1
-iPad	Mobile Safari 11.0	iOS 11.4.1
-iPad	Google 83.0	iOS 12.0.0
-iPad	Mobile Safari 12.0	iOS 12.0.0
-iPad	Chrome Mobile iOS 75.0	iOS 12.1.0
-iPad	Chrome Mobile iOS 76.0	iOS 12.1.0
-iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.1.0
-iPad	Mobile Safari 12.0	iOS 12.1.0
-iPad	Mobile Safari 12.0	iOS 12.1.1
-iPad	Google 48.0	iOS 12.1.4
-iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.1.4
-iPad	Mobile Safari 12.0	iOS 12.1.4
-iPad	Chrome Mobile iOS 76.0	iOS 12.2.0
-iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.2.0
-iPad	Mobile Safari 12.1	iOS 12.2.0
-iPad	Chrome Mobile iOS 77.0	iOS 12.3.0
-iPad	Google 83.0	iOS 12.3.0
-iPad	Mobile Safari 12.1	iOS 12.3.0
-iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.3.1
-iPad	Mobile Safari 12.1	iOS 12.3.1
-iPad	Chrome Mobile iOS 76.0	iOS 12.4.0
-iPad	Chrome Mobile iOS 76.0	iOS 12.4.0
-iPad	Chrome Mobile iOS 77.0	iOS 12.4.0
-iPad	Chrome Mobile iOS 77.0	iOS 12.4.0
-iPad	Chrome Mobile iOS 77.0	iOS 12.4.0
-iPad	Google 74.0	iOS 12.4.0
-iPad	Google 83.0	iOS 12.4.0
-iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.4.0
-iPad	Mobile Safari 12.1	iOS 12.4.0
-iPad	Chrome Mobile iOS 67.0	iOS 12.4.1
-iPad	Firefox iOS 19.0	iOS 12.4.1
-iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.4.1
-iPad	Facebook 0.0	iOS 12.4.1
-iPad	Facebook 0.0	iOS 12.4.1
-iPad	Facebook 0.0	iOS 12.4.1
-iPad	Facebook 0.0	iOS 12.4.1
-iPad	Mobile Safari 12.1	iOS 12.4.1
-iPad	Mobile Safari 6.0	iOS 6.1.3
-iPad	Mobile Safari 8.0	iOS 8.0.0
-iPad	Mobile Safari 8.0	iOS 8.2.0
-iPad	Google 23.1	iOS 8.4.0
-iPad	Mobile Safari 9.0	iOS 9.3.2
-iPad	Mobile Safari 9.0	iOS 9.3.5
-iPhone	Mobile Safari 10.0	iOS 10.2.0
-iPhone	Facebook 0.0	iOS 10.3.3
-iPhone	Google 68.0	iOS 10.3.4
-iPhone	Mobile Safari 10.0	iOS 10.3.4
-iPhone	Mobile Safari 11.0	iOS 11.0.3
-iPhone	Mobile Safari 11.0	iOS 11.1.1
-iPhone	Mobile Safari 11.0	iOS 11.1.2
-iPhone	Mobile Safari 11.0	iOS 11.2.1
-iPhone	Facebook 207.0	iOS 11.2.6
-iPhone	Chrome Mobile iOS 76.0	iOS 11.3.0
-iPhone	Facebook 0.0	iOS 11.3.0
-iPhone	Mobile Safari 11.0	iOS 11.3.0
-iPhone	Google 83.0	iOS 11.4.0
-iPhone	Mobile Safari 11.0	iOS 11.4.0
-iPhone	Google 74.1	iOS 11.4.1
-iPhone	Mobile Safari 11.0	iOS 11.4.1
-iPhone	Mobile Safari 12.0	iOS 12.0.0
-iPhone	Mobile Safari 12.0	iOS 12.1.0
-iPhone	Mobile Safari 12.0	iOS 12.1.1
-iPhone	Google 74.1	iOS 12.1.2
-iPhone	Facebook 0.0	iOS 12.1.2
-iPhone	Mobile Safari 12.0	iOS 12.1.2
-iPhone	Mobile Safari 12.0	iOS 12.1.3
-iPhone	Google 74.1	iOS 12.1.4
-iPhone	Mobile Safari 12.0	iOS 12.1.4
-iPhone	Chrome Mobile iOS 72.0	iOS 12.2.0
-iPhone	Chrome Mobile iOS 76.0	iOS 12.2.0
-iPhone	Chrome Mobile iOS 77.0	iOS 12.2.0
-iPhone	Facebook 0.0	iOS 12.2.0
-iPhone	Facebook 0.0	iOS 12.2.0
-iPhone	Mobile Safari 12.1	iOS 12.2.0
-iPhone	Chrome Mobile iOS 77.0	iOS 12.3.0
-iPhone	Google 83.0	iOS 12.3.0
-iPhone	Mobile Safari 12.1	iOS 12.3.0
-iPhone	Google 79.0	iOS 12.3.1
-iPhone	Mobile Safari UI/WKWebView 0.0	iOS 12.3.1
-iPhone	DuckDuckGo Mobile 7.0	iOS 12.3.1
-iPhone	Facebook 0.0	iOS 12.3.1
-iPhone	Facebook 0.0	iOS 12.3.1
-iPhone	Facebook 0.0	iOS 12.3.1
-iPhone	Mobile Safari 12.1	iOS 12.3.1
-iPhone	Mobile Safari 12.1	iOS 12.3.2
-iPhone	Chrome Mobile iOS 69.0	iOS 12.4.0
-iPhone	Chrome Mobile iOS 73.0	iOS 12.4.0
-iPhone	Chrome Mobile iOS 75.0	iOS 12.4.0
-iPhone	Chrome Mobile iOS 76.0	iOS 12.4.0
-iPhone	Chrome Mobile iOS 77.0	iOS 12.4.0
-iPhone	Chrome Mobile iOS 77.0	iOS 12.4.0
-iPhone	Google 81.0	iOS 12.4.0
-iPhone	Google 82.1	iOS 12.4.0
-iPhone	Google 83.0	iOS 12.4.0
-iPhone	Facebook 0.0	iOS 12.4.0
-iPhone	Facebook 0.0	iOS 12.4.0
-iPhone	Facebook 0.0	iOS 12.4.0
-iPhone	Facebook 0.0	iOS 12.4.0
-iPhone	Mobile Safari 12.1	iOS 12.4.0
-iPhone	Google 74.1	iOS 12.4.1
-iPhone	Mobile Safari UI/WKWebView 0.0	iOS 12.4.1
-iPhone	Instagram 89.0	iOS 12.4.1
-iPhone	Facebook 240.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Facebook 0.0	iOS 12.4.1
-iPhone	Mobile Safari 12.1	iOS 12.4.1
-iPhone	Mobile Safari 12.4	iOS 12.4.1
-iPhone	Mobile Safari UI/WKWebView 0.0	iOS 12.4.2
-iPhone	Mobile Safari 12.1	iOS 12.4.2
-iPhone	Chrome Mobile iOS 77.0	iOS 13.0.0
-iPhone	Facebook 0.0	iOS 13.0.0
-iPhone	Facebook 0.0	iOS 13.0.0
-iPhone	Facebook 0.0	iOS 13.0.0
-iPhone	Facebook 0.0	iOS 13.0.0
-iPhone	Facebook 0.0	iOS 13.0.0
-iPhone	Facebook 0.0	iOS 13.0.0
-iPhone	Mobile Safari 13.0	iOS 13.0.0
-iPhone	Chrome Mobile iOS 76.0	iOS 13.1.0
-iPhone	Chrome Mobile iOS 77.0	iOS 13.1.0
-iPhone	Chrome Mobile iOS 77.0	iOS 13.1.0
-iPhone	Firefox iOS 8.1	iOS 13.1.0
-iPhone	Google 83.0	iOS 13.1.0
-iPhone	Mobile Safari UI/WKWebView 0.0	iOS 13.1.0
-iPhone	DuckDuckGo Mobile 7.0	iOS 13.1.0
-iPhone	Facebook 0.0	iOS 13.1.0
-iPhone	Facebook 0.0	iOS 13.1.0
-iPhone	Facebook 0.0	iOS 13.1.0
-iPhone	Facebook 0.0	iOS 13.1.0
-iPhone	Facebook 0.0	iOS 13.1.0
-iPhone	Mobile Safari 13.0	iOS 13.1.0
-iPhone	Mobile Safari UI/WKWebView 0.0	iOS 13.1.1
-iPhone	Facebook 0.0	iOS 13.1.1
-iPhone	Facebook 0.0	iOS 13.1.1
-iPhone	Facebook 0.0	iOS 13.1.1
-iPhone	Facebook 0.0	iOS 13.1.1
-iPhone	Mobile Safari 13.0	iOS 13.1.1
-iPhone	Mobile Safari UI/WKWebView 0.0	iOS 13.1.2
-iPhone	Facebook 0.0	iOS 13.1.2
-iPhone	Mobile Safari 13.0	iOS 13.1.2
+AppleCoreMedia/1.0.0.12B466 (Apple TV; U; CPU OS 8_1_3 like Mac OS X; en_us)	AppleTV	Other 0.0	ATV OS X 0.0.0
+Mozilla/5.0 (Android 7.0; Mobile; LG-M150; rv:68.0) Gecko/68.0 Firefox/68.0	LG-M150	Firefox Mobile 68.0	Android 7.0.0
+Mozilla/5.0 (Android 8.0.0; Mobile; rv:68.0) Gecko/68.0 Firefox/68.0	Generic Smartphone	Firefox Mobile 68.0	Android 8.0.0
+Mozilla/5.0 (Android 8.1.0; Tablet; rv:68.0) Gecko/68.0 Firefox/68.0	Generic Tablet	Firefox Mobile 68.0	Android 8.1.0
+Mozilla/5.0 (Android 9; Mobile; rv:68.0) Gecko/68.0 Firefox/68.0	Generic Smartphone	Firefox Mobile 68.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 10; PH-1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	PH-1	Chrome Mobile 77.0	Android 10.0.0
+Mozilla/5.0 (Linux; Android 10; Pixel 2 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Pixel 2 XL	Chrome Mobile 77.0	Android 10.0.0
+Mozilla/5.0 (Linux; Android 10; Pixel 2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Pixel 2	Chrome Mobile 77.0	Android 10.0.0
+Mozilla/5.0 (Linux; Android 10; Pixel 3 Build/QP1A.190711.020.C3; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Pixel 3	Facebook 240.0	Android 10.0.0
+Mozilla/5.0 (Linux; Android 10; Pixel XL Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36	Pixel XL	Chrome Mobile WebView 77.0	Android 10.0.0
+Mozilla/5.0 (Linux; Android 10; Pixel XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Pixel XL	Chrome Mobile 77.0	Android 10.0.0
+Mozilla/5.0 (Linux; Android 4.0.3; HTC Sensation 4G Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.111 Mobile Safari/537.36	HTC Sensation 4G	Chrome Mobile 42.0	Android 4.0.3
+Mozilla/5.0 (Linux; Android 4.0.3; KFTT) AppleWebKit/537.36 (KHTML, like Gecko) Silk/73.7.5 like Chrome/73.0.3683.90 Safari/537.36	Kindle	Amazon Silk 73.7	Android 4.0.3
+Mozilla/5.0 (Linux; Android 4.2.2; GT-I9152 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.111 Mobile Safari/537.36	Samsung GT-I9152 	Chrome Mobile 42.0	Android 4.2.2
+Mozilla/5.0 (Linux; Android 4.4.2; GT-N5110) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Samsung GT-N5110	Chrome 76.0	Android 4.4.2
+Mozilla/5.0 (Linux; Android 4.4.2; RCT6773W22) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	RCT6773W22	Chrome 77.0	Android 4.4.2
+Mozilla/5.0 (Linux; Android 4.4.2; SM-T217S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	Samsung SM-T217S	Chrome 77.0	Android 4.4.2
+Mozilla/5.0 (Linux; Android 4.4.2; SM-T530NU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	Samsung SM-T530NU	Chrome 77.0	Android 4.4.2
+Mozilla/5.0 (Linux; Android 4.4.2; TegraNote-P1640 Build/KOT49H; en-us) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36	TegraNote-P1640	Chrome 69.0	Android 4.4.2
+Mozilla/5.0 (Linux; Android 4.4.3; KFTHWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.6 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 4.4.3
+Mozilla/5.0 (Linux; Android 5.0.2; SM-A500H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36	Samsung SM-A500H	Chrome Mobile 73.0	Android 5.0.2
+Mozilla/5.0 (Linux; Android 5.0.2; SM-T357T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	Samsung SM-T357T	Chrome 77.0	Android 5.0.2
+Mozilla/5.0 (Linux; Android 5.0.2; SM-T530NU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Samsung SM-T530NU	Chrome 76.0	Android 5.0.2
+Mozilla/5.0 (Linux; Android 5.0.2; SM-T530NU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	Samsung SM-T530NU	Chrome 77.0	Android 5.0.2
+Mozilla/5.0 (Linux; Android 5.0; RCT6213W87DK) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 YaBrowser/19.4.1.454.01 Safari/537.36	RCT6213W87DK	Yandex Browser 19.4	Android 5.0.0
+Mozilla/5.0 (Linux; Android 5.0; SM-N900T Build/LRX21V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/229.0.0.35.117;]	Samsung SM-N900T	Facebook 229.0	Android 5.0.0
+Mozilla/5.0 (Linux; Android 5.1.1) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Focus/4.4.1 Chrome/70.0.3538.110 Mobile Safari/537.36	Generic Smartphone	Chrome Mobile WebView 70.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; AFTB) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.16 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; AFTT Build/LVY48F; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.110 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.26	AFTT	Chrome Mobile WebView 70.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; AFTT) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.16 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; KFAUWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.6 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; KFDOWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/71.2.4 like Chrome/71.0.3578.98 Safari/537.36	Kindle	Amazon Silk 71.2	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; KFDOWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.6 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; KFFOWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.6 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; KFGIWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.6 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; KFSUWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.6 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; KFSUWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/77.1.127 like Chrome/77.0.3865.92 Safari/537.36	Kindle	Amazon Silk 77.1	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; LG-AS330) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LG-AS330	Chrome Mobile 77.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; LGL43AL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LGL43AL	Chrome Mobile 77.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; SAMSUNG SM-G530R7 Build/LMY47X) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.2 Chrome/67.0.3396.87 Mobile Safari/537.36	Samsung SM-G530R7	Samsung Internet 9.2	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; SAMSUNG SM-T377P) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Safari/537.36	Samsung SM-T377P	Samsung Internet 10.1	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; SAMSUNG SM-T900) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Safari/537.36	Samsung SM-T900	Samsung Internet 10.1	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; SAMSUNG-SM-T337A Build/LMY47X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36	Samsung SM-T337A	Chrome 69.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; SM-G360T1 Build/LMY47X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.81 Mobile Safari/537.36	Samsung SM-G360T1	Chrome Mobile 67.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; SM-J320FN) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36	Samsung SM-J320FN	Chrome Mobile 74.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; SM-T280) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Safari/537.36	SM-T280	Chrome 74.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; SM-T330NU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36	Samsung SM-T330NU	Chrome 71.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; SM-T670) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	SM-T670	Chrome 76.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; SM-T670) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	SM-T670	Chrome 77.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1.1; Vodafone Smart ultra 6 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.136 Mobile Safari/537.36	Vodafone Smart ultra 6	Chrome Mobile WebView 74.0	Android 5.1.1
+Mozilla/5.0 (Linux; Android 5.1; BLU Advance 5.0 Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.158 Mobile Safari/537.36	BLU Advance 5.0	Chrome Mobile 66.0	Android 5.1.0
+Mozilla/5.0 (Linux; Android 5.1; HTC Desire 626s) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	HTC Desire 626s	Chrome Mobile 77.0	Android 5.1.0
+Mozilla/5.0 (Linux; Android 5.1; HUAWEI LUA-L22 Build/HUAWEILUA-L22) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.89 Mobile Safari/537.36	HUAWEI LUA-L22	Chrome Mobile 50.0	Android 5.1.0
+Mozilla/5.0 (Linux; Android 5.1; NX16A11264) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	NX16A11264	Chrome 77.0	Android 5.1.0
+Mozilla/5.0 (Linux; Android 5.1; XT1526) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36	XT1526	Chrome Mobile 73.0	Android 5.1.0
+Mozilla/5.0 (Linux; Android 6.0.1; CPH1613) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Oppo CPH1613	Chrome Mobile 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; LG-M153 Build/MXB48T; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36	LG-M153 	Chrome Mobile WebView 55.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; LG-M153) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LG-M153	Chrome Mobile 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; LGLS676) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LGLS676	Chrome Mobile 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; N9136) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36	N9136	Chrome Mobile 74.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; Nexus 7 Build/MOB30X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.133 Safari/537.36	Asus Nexus 7	Chrome 44.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG SM-G900I) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G900I	Samsung Internet 10.1	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG SM-G900P Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.2 Chrome/59.0.3071.125 Mobile Safari/537.36	Samsung SM-G900P	Samsung Internet 7.2	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG SM-J700M) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-J700M	Samsung Internet 10.1	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG SM-S327VL) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-S327VL	Samsung Internet 10.1	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG-SM-T377A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	Samsung SM-T377A	Chrome 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-G532M Build/MMB29T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36	Samsung SM-G532M	Chrome Mobile 55.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-G532M Build/MMB29T; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/75.0.3770.101 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Samsung SM-G532M	Facebook 240.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-G532M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G532M	Chrome Mobile 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-G550T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-G550T	Chrome Mobile 76.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-G550T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G550T	Chrome Mobile 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-G550T1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-G550T1	Chrome Mobile 76.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-G900V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.75 Mobile Safari/537.36	Samsung SM-G900V	Chrome Mobile 73.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-G920A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G920A	Chrome Mobile 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-J327P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J327P	Chrome Mobile 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-N910S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Mobile Safari/537.36	Samsung SM-N910S	Chrome Mobile 75.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-N920V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.89 Mobile Safari/537.36	Samsung SM-N920V	Chrome Mobile 76.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-T350 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Safari/537.36	Samsung SM-T350	Chrome 59.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-T560NU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	Samsung SM-T560NU	Chrome 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; SM-T800) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	SM-T800	Chrome 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; XT1254) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	XT1254	Chrome Mobile 77.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; Z798BL Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36	Z798BL	Chrome Mobile 67.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0.1; Z799VL Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/45.0.2454.95 Mobile Safari/537.36	Z799VL	Chrome Mobile WebView 45.0	Android 6.0.1
+Mozilla/5.0 (Linux; Android 6.0; 5010X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.89 Mobile Safari/537.36	5010X	Chrome Mobile 76.0	Android 6.0.0
+Mozilla/5.0 (Linux; Android 6.0; CAM-L21) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Huawei CAM-L21	Chrome Mobile 77.0	Android 6.0.0
+Mozilla/5.0 (Linux; Android 6.0; F3313) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	F3313	Chrome Mobile 77.0	Android 6.0.0
+Mozilla/5.0 (Linux; Android 6.0; RCT6603W47M7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	RCT6603W47M7	Chrome 77.0	Android 6.0.0
+Mozilla/5.0 (Linux; Android 7.0; 5049Z Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36	5049Z	Chrome Mobile 56.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; ASUS_A002A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Asus A002A	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; Alcatel_5044C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Alcatel_5044C	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; Astra Young Pro Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/59.0.3071.125 Mobile Safari/537.36	Astra Young Pro	Chrome Mobile WebView 59.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; Infinix X571) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Infinix X571	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LG-H872 Build/NRD90U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.123 Mobile Safari/537.36	LG-H872 	Chrome Mobile 64.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LG-K425 Build/NRD90U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36	LG-K425 	Chrome Mobile 55.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LG-LS777) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LG-LS777	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LG-M210) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LG-M210	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LG-M430) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LG-M430	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LG-TP260 Build/NRD90U; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/64.0.3282.137 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	LG-TP260 	Chrome Mobile WebView 64.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LG-TP260) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LG-TP260	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LG-TP450 Build/NRD90U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36	LG-TP450 	Chrome Mobile 64.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LG-V521) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Safari/537.36	LG-V521	Chrome 75.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LG-V521) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	LG-V521	Chrome 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LGMP260 Build/NRD90U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36	LGMP260	Chrome Mobile 58.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LGMS210 Build/NRD90U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36	LGMS210	Chrome Mobile 55.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; LGMS210) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LGMS210	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; P00I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	P00I	Chrome 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; RS988) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	RS988	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SAMSUNG SM-J701F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-J701F	Samsung Internet 10.1	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SAMSUNG SM-J710F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-J710F	Samsung Internet 10.1	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SAMSUNG SM-N920T Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.2 Chrome/67.0.3396.87 Mobile Safari/537.36	Samsung SM-N920T	Samsung Internet 9.2	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SAMSUNG-SM-G920A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G920A	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-G920P Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 Flipboard/4.2.23/4722,4.2.23.4722	Samsung SM-G920P	Flipboard 4.2	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-G920V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-G920V	Chrome Mobile 76.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-G928V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G928V	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-G950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G950U	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-G955U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G955U	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-J327T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36	Samsung SM-J327T	Chrome Mobile 74.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-J327T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J327T	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-J327T1 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36	Samsung SM-J327T1	Chrome Mobile 64.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-J327T1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36	Samsung SM-J327T1	Chrome Mobile 75.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-J327T1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J327T1	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-N9208) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36	Samsung SM-N9208	Chrome Mobile 73.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-N920P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36	Samsung SM-N920P	Chrome Mobile 74.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-N920T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-N920T	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-T585) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	SM-T585	Chrome 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-T810) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Safari/537.36	SM-T810	Chrome 75.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-T810) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Safari/537.36	SM-T810	Chrome 76.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-T810) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	SM-T810	Chrome 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-T813) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Safari/537.36	SM-T813	Chrome 76.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; SM-T813) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	SM-T813	Chrome 76.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; ST1009X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Safari/537.36	Trekstor ST1009X	Chrome 75.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0; XT1663) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	XT1663	Chrome Mobile 77.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.0;) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.96 Mobile Safari/537.36	Generic Smartphone	Chrome Mobile 58.0	Android 7.0.0
+Mozilla/5.0 (Linux; Android 7.1.1; A574BL Build/NMF26F; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	A574BL	Chrome Mobile WebView 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; A574BL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	A574BL	Chrome Mobile 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; CPH1729 Build/N6F26Q; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Oppo CPH1729	Facebook 240.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; Coolpad 3632A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36	3632A	Chrome Mobile 74.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; General Mobile 4G Dual) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	General Mobile 4G Dual	Chrome Mobile 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; Moto E (4) Plus Build/NCRS26.58-44-20; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.111 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	Moto E (4) Plus	Chrome Mobile WebView 76.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; Moto E (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36	Moto E (4)	Chrome Mobile 70.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; Moto E (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Moto E (4)	Chrome Mobile 76.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; Moto E (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.73 Mobile Safari/537.36	Moto E (4)	Chrome Mobile 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; Moto E (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Moto E (4)	Chrome Mobile 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; NX591J) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	NX591J	Chrome Mobile 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; REVVLPLUS C3701A Build/143.54.190611.3701A-TMO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36	REVVLPLUS C3701A	Chrome Mobile 64.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; SAMSUNG SM-J320A) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-J320A	Samsung Internet 10.1	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; SAMSUNG SM-T550) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Safari/537.36	Samsung SM-T550	Samsung Internet 10.1	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; SAMSUNG-SM-T377A Build/NMF26X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Safari/537.36	Samsung SM-T377A	Chrome 64.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; SM-J250F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-J250F	Chrome Mobile 76.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; SM-J700T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J700T	Chrome Mobile 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; SM-T350) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	SM-T350	Chrome 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; SM-T377T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.73 Safari/537.36	Samsung SM-T377T	Chrome 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; SM-T550 Build/NMF26X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36	Samsung SM-T550	Chrome 69.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; SM-T550) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	SM-T550	Chrome 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; SM-T560NU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	Samsung SM-T560NU	Chrome 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; X20 Build/N6F26Q; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/52.0.2743.100 Mobile Safari/537.36	X20	Chrome Mobile WebView 52.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; Z851M Build/NMF26V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36	Z851M	Chrome Mobile 58.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; Z899VL Build/NMF26V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.136 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	Z899VL	Chrome Mobile WebView 74.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; Z982 Build/NMF26V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/75.0.3770.143 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	Z982	Chrome Mobile WebView 75.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.1; Z982) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Z982	Chrome Mobile 77.0	Android 7.1.1
+Mozilla/5.0 (Linux; Android 7.1.2) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Focus/4.4.1 Chrome/70.0.3538.110 Mobile Safari/537.36	Generic Smartphone	Chrome Mobile WebView 70.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; AFTKMST12 Build/NS6265; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.110 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.26	AFTKMST12	Chrome Mobile WebView 70.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; AFTKMST12) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.16 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; AFTMM Build/NS6265; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.110 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.26	AFTMM	Chrome Mobile WebView 70.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; AFTN Build/NS6265; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.110 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.26	AFTN	Chrome Mobile WebView 70.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; KFKAWI Build/NS6301; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/59.0.3071.125 Safari/537.36	KFKAWI	Chrome Mobile WebView 59.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; KFKAWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.6 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; KFMUWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/76.3.6 like Chrome/76.0.3809.132 Safari/537.36	Kindle	Amazon Silk 76.3	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; LG-SP200) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Mobile Safari/537.36	LG-SP200	Chrome Mobile 75.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; LG-SP200) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	LG-SP200	Chrome Mobile 76.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; LM-X210(G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	LM-X210(G)	Chrome Mobile 76.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; LM-X210) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	LM-X210	Chrome Mobile 76.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; RCT6973W43R) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	RCT6973W43R	Chrome 77.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 7.1.2; Redmi 4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	XiaoMi Redmi 4	Chrome Mobile 77.0	Android 7.1.2
+Mozilla/5.0 (Linux; Android 8.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.132 Mobile Safari/537.36	Generic Smartphone	Chrome Mobile WebView 76.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; ASUS_Z01FD) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Asus Z01FD	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; AUM-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Huawei AUM-L29	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; BRAVIA 4K GB Build/OPR2.170623.027.S25; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	BRAVIA 4K GB	Chrome Mobile WebView 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; CMR-W09) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	CMR-W09	Chrome 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; EVA-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.73 Mobile Safari/537.36	EVA-AL00	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; G3223) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	G3223	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; LG-H910) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LG-H910	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; LG-H931) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	LG-H931	Chrome Mobile 76.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; LG-H932) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LG-H932	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-A520F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-A520F	Samsung Internet 10.1	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-G891A Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/8.2 Chrome/63.0.3239.111 Mobile Safari/537.36	Samsung SM-G891A	Samsung Internet 8.2	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-G935T) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G935T	Samsung Internet 10.1	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-G955U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G955U	Samsung Internet 10.1	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-J337T Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.2 Chrome/67.0.3396.87 Mobile Safari/537.36	Samsung SM-J337T	Samsung Internet 9.2	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-J737P) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-J737P	Samsung Internet 10.1	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-N950F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-N950F	Samsung Internet 10.1	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG-SM-G891A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Mobile Safari/537.36	Samsung SM-G891A	Chrome Mobile 72.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG-SM-G935A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-G935A	Chrome Mobile 76.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-A720F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-A720F	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G570F Build/R16NW; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/73.0.3683.90 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/231.0.0.39.113;]	Samsung SM-G570F	Facebook 231.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G570Y) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G570Y	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G930T Build/R16NW; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	Samsung SM-G930T	Chrome Mobile WebView 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G930V Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36	Samsung SM-G930V	Chrome Mobile 64.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G930VL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36	Samsung SM-G930VL	Chrome Mobile 74.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G935F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Mobile Safari/537.36	Samsung SM-G935F	Chrome Mobile 75.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G935P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G935P	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G935T Build/R16NW; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Samsung SM-G935T	Facebook 240.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G935T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G935T	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G950U	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G955U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.112 Mobile Safari/537.36	Samsung SM-G955U	Chrome Mobile 74.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G955U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G955U	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-J330G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J330G	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-J337T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J337T	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-J737A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J737A	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-J737T1 Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.126 Mobile Safari/537.36	Samsung SM-J737T1	Chrome Mobile 66.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-J737T1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J737T1	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-N950F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.126 Mobile Safari/537.36	Samsung SM-N950F	Chrome Mobile 66.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-N950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-N950U	Chrome Mobile 76.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-N950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-N950U	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-N950U1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-N950U1	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; SM-S367VL Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36 OPT/1.22.80	Samsung SM-S367VL	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; VS995) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	VS995	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; XT1635-02) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	XT1635-02	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; moto e5 play) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	moto e5 play	Chrome Mobile 76.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; moto e5 play) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	moto e5 play	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; moto e5 supra) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	moto e5 supra	Chrome Mobile 76.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.0.0; moto g(6)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	moto g(6)	Chrome Mobile 77.0	Android 8.0.0
+Mozilla/5.0 (Linux; Android 8.1.0; 5041C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	5041C	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; 6062W) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	6062W	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; A502DL Build/OPM1.171019.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36	A502DL	Chrome Mobile 67.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; A502DL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	A502DL	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; BKK-LX2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Huawei BKK-LX2	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; C4 Build/OPM2.171019.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36	C4	Chrome Mobile 70.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; Coolpad 3310A Build/3310A.SPRINT.190213.0S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	3310A	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; Infinix X604 Build/O11019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36	Infinix X604	Chrome Mobile 64.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; Joy 1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Joy 1	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LAVA LE9820) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LAVA LE9820	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LG-Q710AL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LG-Q710AL	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-Q610(FGN)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LM-Q610(FGN)	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-Q710(FGN) Build/OPM1.171019.019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/235.0.0.38.118;]	LM-Q710(FGN)	Facebook 235.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-Q710(FGN)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36	LM-Q710(FGN)	Chrome Mobile 70.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-Q710(FGN)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	LM-Q710(FGN)	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-Q710(FGN)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	LM-Q710(FGN)	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-Q710(FGN)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LM-Q710(FGN)	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-V405) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LM-V405	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X210(G) Build/OPM1.171019.026; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 agentweb/4.0.2  UCBrowser/11.6.4.950	LM-X210(G)	UC Browser 11.6	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X210(G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36	LM-X210(G)	Chrome Mobile 70.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X210(G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.105 Mobile Safari/537.36	LM-X210(G)	Chrome Mobile 72.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X210(G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LM-X210(G)	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X212(G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LM-X212(G)	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X220) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36	LM-X220	Chrome Mobile 70.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X220) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	LM-X220	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X220PM Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	LM-X220PM	Chrome Mobile WebView 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X410(FG)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36	LM-X410(FG)	Chrome Mobile 70.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X410(FG)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	LM-X410(FG)	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X410(FG)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LM-X410(FG)	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LM-X410.FGN Build/OPM1.171019.019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.91 Mobile Safari/537.36	LM-X410.FGN	Chrome Mobile 68.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LML414DL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	LML414DL	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; LML713DL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LML713DL	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; Moto G (5S) Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Moto G (5S) Plus	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; One) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.110 Mobile Safari/537.36/TansoDL	HTC One	Chrome Mobile WebView 70.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; RCT6873W42BMF8KC Build/O11019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	RCT6873W42BMF8KC	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; REVVL 2 Build/OPM1.171019.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36	REVVL 2	Chrome Mobile 67.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; REVVL 2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	REVVL 2	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SAMSUNG SM-J727T) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-J727T	Samsung Internet 10.1	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SAMSUNG SM-J727T1 Build/M1AJQ) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36	Samsung SM-J727T1	Samsung Internet 9.4	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SAMSUNG SM-J727T1) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-J727T1	Samsung Internet 10.1	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SAMSUNG SM-T580 Build/M1AJQ) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Safari/537.36	Samsung SM-T580	Samsung Internet 9.4	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SAMSUNG-SM-J727A Build/M1AJQ; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Samsung SM-J727A	Facebook 240.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-G610F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G610F	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J260T1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	Samsung SM-J260T1	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J260T1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-J260T1	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J260T1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J260T1	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J410F Build/M1AJB) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J410F	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J727P Build/M1AJQ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.91 Mobile Safari/537.36	Samsung SM-J727P	Chrome Mobile 68.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J727T Build/M1AJQ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.126 Mobile Safari/537.36	Samsung SM-J727T	Chrome Mobile 66.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J727T1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	Samsung SM-J727T1	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J727T1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.73 Mobile Safari/537.36	Samsung SM-J727T1	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J727T1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J727T1	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J727V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36	Samsung SM-J727V	Chrome Mobile 70.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-J727V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J727V	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-P580) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	SM-P580	Chrome 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-T380) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Safari/537.36	SM-T380	Chrome 75.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-T580) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Safari/537.36 EdgA/42.0.2.3928	SM-T580	Edge Mobile 42.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-T580) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	SM-T580	Chrome 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-T580) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.89 Safari/537.36	SM-T580	Chrome 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-T580) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	SM-T580	Chrome 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; SM-T837T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	Samsung SM-T837T	Chrome 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; TECNO CF8 Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/239.0.0.41.152;]	TECNO CF8	Facebook 239.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; V1818CA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36	V1818CA	Chrome Mobile 75.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; meizu C9 Build/OPM2.171019.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.91 Mobile Safari/537.36	meizu C9	Chrome Mobile 68.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; vivo 1724) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	vivo 1724	Chrome Mobile 76.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 8.1.0; vivo 1814) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	vivo 1814	Chrome Mobile 77.0	Android 8.1.0
+Mozilla/5.0 (Linux; Android 9) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 DuckDuckGo/5	Generic Smartphone	DuckDuckGo Mobile 5.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; 1825) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36	1825	Chrome Mobile 70.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; ANE-LX2 Build/HUAWEIANE-L22; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.132 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/236.0.0.40.117;]	ANE-LX2	Facebook 236.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; BLA-A09) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	BLA-A09	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; CLT-L04) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Huawei CLT-L04	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; CPH1911 Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/239.0.0.41.152;]	Oppo CPH1911	Facebook 239.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; CPH1923 Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.111 Mobile Safari/537.36	Oppo CPH1923	Chrome Mobile WebView 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; ELE-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Huawei ELE-L29	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; G8142) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	G8142	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; GM1911) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	GM1911	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; GM1917) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	GM1917	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; INE-LX2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	Huawei INE-LX2	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; LM-G710 Build/PKQ1.181105.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36	LM-G710	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; LM-Q720) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LM-Q720	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; LM-V405 Build/PKQ1.190202.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.15	LM-V405	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; LM-V405) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	LM-V405	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; LM-V500N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LM-V500N	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; LM-X420) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Mobile Safari/537.36	LM-X420	Chrome Mobile 72.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; LM-X420) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	LM-X420	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; MAR-LX1A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	MAR-LX1A	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; MI 9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	XiaoMi MI 9	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; Mi A2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	XiaoMi Mi A2	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; Moto Z (2)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Moto Z (2)	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; Nokia 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Nokia 6	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; ONEPLUS A6000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	OnePlus ONEPLUS A6000	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; ONEPLUS A6003) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	OnePlus ONEPLUS A6003	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; ONEPLUS A6013 Build/PKQ1.180716.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36	OnePlus ONEPLUS A6013	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; ONEPLUS A6013) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36	OnePlus ONEPLUS A6013	Chrome Mobile 74.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; ONEPLUS A6013) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	OnePlus ONEPLUS A6013	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; PAR-AL00 Build/HUAWEIPAR-AL00; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/235.0.0.38.118;]	PAR-AL00	Facebook 235.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; Pixel 2 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Pixel 2 XL	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; Pixel 3 Build/PQ1A.190105.004; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36	Pixel 3	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; Pixel 3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	Pixel 3	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; Pixel 3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Pixel 3	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; Pixel 3a XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Pixel 3a XL	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; REVVLRY ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36	REVVLRY 	Chrome Mobile 73.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; RMX1801) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36	Oppo RMX1801	Chrome Mobile 75.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; Redmi 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	XiaoMi Redmi 7	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; Redmi Note 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.89 Mobile Safari/537.36	XiaoMi Redmi Note 7	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-A102U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-A102U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-A505FN) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-A505FN	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-A505GN) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-A505GN	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G892U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G892U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G950U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G950U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36	Samsung SM-G955F	Samsung Internet 9.4	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G955U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G9600 Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36	Samsung SM-G9600	Samsung Internet 9.4	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G960U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G960U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G965U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G965U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G970F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G970F	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G970U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G970U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G973U Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36	Samsung SM-G973U	Samsung Internet 9.4	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G973U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G973U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G975U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G975U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-J415F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-J415F	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-J730F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-J730F	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-J737P) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-J737P	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-J737T Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.0 Chrome/67.0.3396.87 Mobile Safari/537.36	Samsung SM-J737T	Samsung Internet 9.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-N950U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-N950U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-N960F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-N960F	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-N960U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-N960U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-N960U1 Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.2 Chrome/67.0.3396.87 Mobile Safari/537.36	Samsung SM-N960U1	Samsung Internet 9.2	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-N970U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-N970U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-N975U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-N975U	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-N975U1) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-N975U1	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-T510) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Safari/537.36	Samsung SM-T510	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-T720) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Safari/537.36	Samsung SM-T720	Samsung Internet 10.1	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SHIELD Android TV Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	SHIELD Android TV	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A102U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Mobile Safari/537.36	Samsung SM-A102U	Chrome Mobile 72.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A102U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-A102U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A105M Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/237.0.0.44.120;]	Samsung SM-A105M	Facebook 237.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A205G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-A205G	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A205U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-A205U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A505F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-A505F	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A530F Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Samsung SM-A530F	Facebook 240.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A530N Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;KAKAOTALK 1908560	Samsung SM-A530N	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A600T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-A600T	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A605F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-A605F	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-A920F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-A920F	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G892A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36	Samsung SM-G892A	Chrome Mobile 74.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G950F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G950F	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G950U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	Samsung SM-G950U	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G950U	Chrome Mobile 71.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36	Samsung SM-G950U	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-G950U	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G950U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G950U1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G950U1	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G955F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G955F	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G955U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.73 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Samsung SM-G955U	Facebook 240.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G955U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G955U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G9600) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G9600	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G960U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/73.0.3683.90 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/233.0.0.36.117;]	Samsung SM-G960U	Facebook 233.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G960U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	Samsung SM-G960U	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G960U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36	Samsung SM-G960U	Chrome Mobile 71.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G960U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36	Samsung SM-G960U	Chrome Mobile 74.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G960U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G960U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G960U1 Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Samsung SM-G960U1	Facebook 240.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G960U1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G960U1	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G965F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G965F	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G965U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36	Samsung SM-G965U	Chrome Mobile 74.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G965U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G965U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G965U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3921.2 Mobile Safari/537.36	Samsung SM-G965U	Chrome Mobile 79.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G965U1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G965U1	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G970U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Samsung SM-G970U	Facebook 240.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G970U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36	Samsung SM-G970U	Chrome Mobile 75.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G970U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G970U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G970U1 Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G970U1	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G973U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36	Samsung SM-G973U	Chrome Mobile 74.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G973U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G973U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G973U1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G973U1	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G975U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36	Samsung SM-G975U	Chrome Mobile 75.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G975U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-G975U	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G975U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G975U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-G975U1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-G975U1	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-J260A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J260A	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-J337P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-J337P	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-J600FN) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.89 Mobile Safari/537.36	Samsung SM-J600FN	Chrome Mobile 75.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-J600G Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.73 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/238.0.0.41.116;]	Samsung SM-J600G	Facebook 238.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-J730F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J730F	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-J737A Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	Samsung SM-J737A	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-J737A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36	Samsung SM-J737A	Chrome Mobile 74.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-J737V Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/75.0.3770.101 Mobile Safari/537.36 [Pinterest/Android]	Samsung SM-J737V	Pinterest 0.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-J737V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J737V	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-J810M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-J810M	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N950U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Samsung SM-N950U	Facebook 240.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Mobile Safari/537.36	Samsung SM-N950U	Chrome Mobile 72.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36	Samsung SM-N950U	Chrome Mobile 75.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.73 Mobile Safari/537.36	Samsung SM-N950U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N950U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-N950U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N960F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-N960F	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N960U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.136 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Samsung SM-N960U	Facebook 240.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N960U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	Samsung SM-N960U	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N960U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36	Samsung SM-N960U	Chrome Mobile 74.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N960U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Mobile Safari/537.36	Samsung SM-N960U	Chrome Mobile 75.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N960U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-N960U	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N960U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-N960U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N960U1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-N960U1	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N975U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.73 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	Samsung SM-N975U	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N975U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	Samsung SM-N975U	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N975U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-N975U	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-N976V Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/240.0.0.38.121;]	Samsung SM-N976V	Facebook 240.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-S367VL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Samsung SM-S367VL	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-S767VL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36	Samsung SM-S767VL	Chrome Mobile 76.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-T597P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	Samsung SM-T597P	Chrome 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; SM-T720) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36	SM-T720	Chrome 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; TECNO KC8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	TECNO KC8	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; VOG-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	Huawei VOG-L29	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; cp3705A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36	cp3705A	Chrome Mobile 74.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; moto g(6) Build/PPS29.118-15-11; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Mobile Safari/537.36;dailymotion-player-sdk-android 0.1.31	moto g(6)	Chrome Mobile WebView 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; moto g(6) play) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	moto g(6) play	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; moto g(7) play Build/PCYS29.105-134-1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.132 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/235.0.0.38.118;]	moto g(7) play	Facebook 235.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; moto g(7) play) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36	moto g(7) play	Chrome Mobile 70.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; moto g(7) power) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36	moto g(7) power	Chrome Mobile 75.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; moto g(7) power) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36	moto g(7) power	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; moto z4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36	moto z4	Chrome Mobile 73.0	Android 9.0.0
+Mozilla/5.0 (Linux; Android 9; moto z4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.73 Mobile Safari/537.36	moto z4	Chrome Mobile 77.0	Android 9.0.0
+Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; GT-P3113 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30	Samsung GT-P3113 	Android 4.1	Android 4.1.1
+Mozilla/5.0 (Linux; U; Android 4.1.2; ar-ae; GT-I8160 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30	Samsung GT-I8160 	Android 4.1	Android 4.1.2
+Mozilla/5.0 (Linux; U; Android 4.2.2; en-us; Nexus 7 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30; DailymotionEmbedSDK 1.0	Asus Nexus 7	Android 4.2	Android 4.2.2
+Mozilla/5.0 (Linux; U; Android 4.4; en-us; SM-E500H Build/JOP24G) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30	Samsung SM-E500H	Android 4.4	Android 4.4.0
+Mozilla/5.0 (Linux; U; Android 6.0.1; en-us; LGMS550 Build/JOP24G) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.65 Mobile Safari/534.30	LGMS550	Chrome Mobile WebView 43.0	Android 6.0.1
+Mozilla/5.0 (Linux; U; Android 6.0.1; en-us; SM-J737T1 Build/JOP24G) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.65 Mobile Safari/534.30	Samsung SM-J737T1	Chrome Mobile WebView 43.0	Android 6.0.1
+Mozilla/5.0 (Linux; U; Android 7.0; TECNO CA6 Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/64.0.3282.137 Mobile Safari/537.36 OPR/5.3.2254.135058	TECNO CA6	Opera Mobile 5.3	Android 7.0.0
+Mozilla/5.0 (Linux; U; Android 7.1.2; id-id; Redmi 5A Build/N2G47H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/53.0.2785.146 Mobile Safari/537.36 XiaoMi/MiuiBrowser/9.5.6	XiaoMi Redmi 5A	MiuiBrowser 9.5	Android 7.1.2
+Mozilla/5.0 (Linux; U; Android 9; in-id; CPH1911 Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.80 Mobile Safari/537.36 OppoBrowser/25.6.0.0.5beta	Oppo CPH1911	Chrome Mobile WebView 70.0	Android 9.0.0
+Mozilla/5.0 (Linux; U; Android 9; vivo 1904 Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.136 Mobile Safari/537.36 OPR/44.1.2254.143214	vivo 1904	Opera Mobile 44.1	Android 9.0.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:68.0) Gecko/20100101 Firefox/68.0	Mac	Firefox 68.0	Mac OS X 10.11.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:69.0) Gecko/20100101 Firefox/69.0	Mac	Firefox 69.0	Mac OS X 10.13.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:67.0) Gecko/20100101 Firefox/67.0	Mac	Firefox 67.0	Mac OS X 10.14.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:68.0) Gecko/20100101 Firefox/68.0	Mac	Firefox 68.0	Mac OS X 10.14.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:69.0) Gecko/20100101 Firefox/69.0	Mac	Firefox 69.0	Mac OS X 10.14.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:70.0) Gecko/20100101 Firefox/70.0	Mac	Firefox 70.0	Mac OS X 10.14.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.10.5
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.10.5
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.1.2 Safari/603.3.8	Mac	Safari 10.1	Mac OS X 10.10.5
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.11.4
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36	Mac	Chrome 72.0	Mac OS X 10.11.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.11.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.11.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.11.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/601.7.7 (KHTML, like Gecko) Version/9.1.2 Safari/601.7.7	Mac	Safari 9.1	Mac OS X 10.11.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/602.2.14 (KHTML, like Gecko) Version/10.0.1 Safari/602.2.14	Mac	Safari 10.0	Mac OS X 10.11.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1.2 Safari/605.1.15	Mac	Safari 11.1	Mac OS X 10.11.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.12.1
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_3) AppleWebKit/602.4.8 (KHTML, like Gecko) Version/10.0.3 Safari/602.4.8	Mac	Safari 10.0	Mac OS X 10.12.3
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36	Mac	Chrome 75.0	Mac OS X 10.12.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.12.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.12.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.12.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Safari/605.1.15	Mac	Safari 12.1	Mac OS X 10.12.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Safari/604.1.38	Mac	Safari 11.0	Mac OS X 10.13.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.13.1
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.13.2
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.13.4
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.13.4
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.13.5
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.142 Safari/537.36	Mac	Chrome 75.0	Mac OS X 10.13.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.13.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.13.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0.3 Safari/605.1.15	Mac	Safari 12.0	Mac OS X 10.13.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Safari/605.1.15	Mac	Safari 12.1	Mac OS X 10.13.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Safari/605.1.15	Mac	Safari 12.1	Mac OS X 10.13.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0 Safari/605.1.15	Mac	Safari 13.0	Mac OS X 10.13.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.1 Safari/605.1.15	Mac	Safari 13.0	Mac OS X 10.13.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.142 Safari/537.36	Mac	Chrome 75.0	Mac OS X 10.14.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.14.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.14.0
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.14.1
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.14.2
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36	Mac	Chrome 69.0	Mac OS X 10.14.3
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0.3 Safari/605.1.15	Mac	Safari 12.0	Mac OS X 10.14.3
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.142 Safari/537.36	Mac	Chrome 75.0	Mac OS X 10.14.4
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.14.4
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1 Safari/605.1.15	Mac	Safari 12.1	Mac OS X 10.14.4
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.14.5
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.14.5
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Safari/605.1.15	Mac	Safari 12.1	Mac OS X 10.14.5
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.142 Safari/537.36	Mac	Chrome 75.0	Mac OS X 10.14.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.14.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Mac	Chrome 76.0	Mac OS X 10.14.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.14.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Mac	Chrome 77.0	Mac OS X 10.14.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Safari/605.1.15	Mac	Safari 12.1	Mac OS X 10.14.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.1 Safari/605.1.15	Mac	Safari 13.0	Mac OS X 10.14.6
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36	Mac	Chrome 65.0	Mac OS X 10.9.5
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.181 Safari/537.36	Mac	Chrome 66.0	Mac OS X 10.9.5
+Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Safari/537.36	Mac	Chrome 67.0	Mac OS X 10.9.5
+Mozilla/5.0 (PlayStation 4 6.72) AppleWebKit/605.1.15 (KHTML, like Gecko)	PlayStation 4	Apple Mail 605.1	Other 0.0.0
+Mozilla/5.0 (SMART-TV; LINUX; Tizen 3.0) AppleWebKit/538.1 (KHTML, like Gecko) Version/3.0 TV Safari/538.1	Samsung SMART-TV	Safari 3.0	Tizen 3.0.0
+Mozilla/5.0 (SMART-TV; Linux; Tizen 3.0) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/2.0 Chrome/47.0.2526.69 TV safari/537.36	Samsung SMART-TV	Samsung Internet 2.0	Tizen 3.0.0
+Mozilla/5.0 (SMART-TV; Linux; Tizen 4.0) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/2.1 Chrome/56.0.2924.0 TV Safari/537.36	Samsung SMART-TV	Samsung Internet 2.1	Tizen 4.0.0
+Mozilla/5.0 (SMART-TV; Linux; Tizen 5.0) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/2.2 Chrome/63.0.3239.84 TV Safari/537.36	Samsung SMART-TV	Samsung Internet 2.2	Tizen 5.0.0
+Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/17.17134	Other	Edge 17.17134	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/18.17763	Other	Edge 18.17763	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36	Other	Chrome 77.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36 Maxthon/5.2.7.5000	Other	Maxthon 5.2	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.1.3683.41 Safari/537.36	Other	Chrome 73.1	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36	Other	Chrome 76.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36 OPR/63.0.3368.94	Other	Opera 63.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36	Other	Chrome 77.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Other	Chrome 77.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) coc_coc_browser/82.0.144 Chrome/76.0.3809.144 Safari/537.36	Other	Coc Coc 82.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko	Other	IE 11.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; WOW64; rv:59.0) Gecko/20100101 Firefox/59.0	Other	Firefox 59.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Firefox/60.0	Other	Firefox 60.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36 Edge/15.15063	Other	Edge 15.15063	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299	Other	Edge 16.16299	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/17.17134	Other	Edge 17.17134	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/18.17763	Other	Edge 18.17763	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.162 Safari/537.36	Other	Chrome 65.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36	Other	Chrome 70.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.18362	Other	Edge 18.18362	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.18995	Other	Edge 18.18995	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.19493	Other	Edge 18.19493	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36	Other	Chrome 70.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36	Other	Chrome 71.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.75 Safari/537.36	Other	Chrome 73.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36	Other	Chrome 74.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.80 Safari/537.36	Other	Chrome 75.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36	Other	Chrome 76.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.110 Safari/537.36 Vivaldi/2.7.1628.30	Other	Vivaldi 2.7	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Other	Chrome 76.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36 OPR/63.0.3368.94	Other	Opera 63.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36	Other	Chrome 77.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Other	Chrome 77.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3907.0 Safari/537.36 Edg/79.0.279.0	Other	Edge 79.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox One) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.18362	Other	Edge 18.18362	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox One) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.18363	Other	Edge 18.18363	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox One; WebView/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.18362	Other	Edge 18.18362	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:61.0) Gecko/20100101 Firefox/61.0	Other	Firefox 61.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:63.0) Gecko/20100101 Firefox/63.0	Other	Firefox 63.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:67.0) Gecko/20100101 Firefox/67.0	Other	Firefox 67.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Firefox/68.0	Other	Firefox 68.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:69.0) Gecko/20100101 Firefox/69.0	Other	Firefox 69.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 10.0; rv:69.0) Gecko/20100101 Firefox/69.0	Other	Firefox 69.0	Windows 10.0.0
+Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.112 Safari/537.36	Other	Chrome 49.0	Windows XP.0.0
+Mozilla/5.0 (Windows NT 6.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.112 Safari/537.36	Other	Chrome 49.0	Windows Vista.0.0
+Mozilla/5.0 (Windows NT 6.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.112 Safari/537.36	Other	Chrome 49.0	Windows Vista.0.0
+Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Other	Chrome 76.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Other	Chrome 77.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Other	Chrome 77.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) coc_coc_browser/80.0.180 Chrome/74.0.3729.180 Safari/537.36	Other	Coc Coc 80.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) coc_coc_browser/82.0.144 Chrome/76.0.3809.144 Safari/537.36	Other	Coc Coc 82.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko	Other	IE 11.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36	Other	Chrome 67.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36	Other	Chrome 70.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36	Other	Chrome 72.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 Safari/537.36	Other	Chrome 74.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36	Other	Chrome 75.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36	Other	Chrome 76.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Other	Chrome 76.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Other	Chrome 77.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:56.0) Gecko/20100101 Firefox/56.0 Waterfox/56.2.14	Other	Waterfox 56.2	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0	Other	Firefox 60.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:63.0) Gecko/20100101 Firefox/63.0	Other	Firefox 63.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:68.0) Gecko/20100101 Firefox/68.0	Other	Firefox 68.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:69.0) Gecko/20100101 Firefox/69.0	Other	Firefox 69.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.1; rv:69.0) Gecko/20100101 Firefox/69.0	Other	Firefox 69.0	Windows 7.0.0
+Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Other	Chrome 77.0	Windows 8.0.0
+Mozilla/5.0 (Windows NT 6.2; Win64; x64; rv:69.0) Gecko/20100101 Firefox/69.0	Other	Firefox 69.0	Windows 8.0.0
+Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Other	Chrome 77.0	Windows 8.1.0
+Mozilla/5.0 (Windows NT 6.3; ARM; Trident/7.0; Touch; rv:11.0) like Gecko	Other	IE 11.0	Windows RT 8.1.0
+Mozilla/5.0 (Windows NT 6.3; Trident/7.0; Touch; rv:11.0) like Gecko	Other	IE 11.0	Windows 8.1.0
+Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; rv:11.0) like Gecko	Other	IE 11.0	Windows 8.1.0
+Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36	Other	Chrome 63.0	Windows 8.1.0
+Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.186 Safari/537.36	Other	Chrome 64.0	Windows 8.1.0
+Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36	Other	Chrome 76.0	Windows 8.1.0
+Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36	Other	Chrome 76.0	Windows 8.1.0
+Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36	Other	Chrome 77.0	Windows 8.1.0
+Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:69.0) Gecko/20100101 Firefox/69.0	Other	Firefox 69.0	Windows 8.1.0
+Mozilla/5.0 (Windows NT 6.3; rv:69.0) Gecko/20100101 Firefox/69.0	Other	Firefox 69.0	Windows 8.1.0
+Mozilla/5.0 (Windows; U; Windows NT 10.0; en-US; Valve Steam GameOverlay/1568860339; ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36	Other	Chrome 72.0	Windows 10.0.0
+Mozilla/5.0 (X11; CrOS aarch64 12371.75.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.105 Safari/537.36	Other	Chrome 77.0	Chrome OS 12371.75.0
+Mozilla/5.0 (X11; CrOS armv7l 12239.92.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.136 Safari/537.36	Other	Chrome 76.0	Chrome OS 12239.92.0
+Mozilla/5.0 (X11; CrOS x86_64 10895.78.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.120 Safari/537.36	Other	Chrome 69.0	Chrome OS 10895.78.0
+Mozilla/5.0 (X11; CrOS x86_64 11021.81.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36	Other	Chrome 70.0	Chrome OS 11021.81.0
+Mozilla/5.0 (X11; CrOS x86_64 11895.118.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.159 Safari/537.36	Other	Chrome 74.0	Chrome OS 11895.118.0
+Mozilla/5.0 (X11; CrOS x86_64 12239.92.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.136 Safari/537.36	Other	Chrome 76.0	Chrome OS 12239.92.0
+Mozilla/5.0 (X11; CrOS x86_64 12239.92.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.136 Safari/537.36	Other	Chrome 76.0	Chrome OS 12239.92.1
+Mozilla/5.0 (X11; CrOS x86_64 12239.92.4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.136 Safari/537.36	Other	Chrome 76.0	Chrome OS 12239.92.4
+Mozilla/5.0 (X11; CrOS x86_64 12371.46.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.63 Safari/537.36	Other	Chrome 77.0	Chrome OS 12371.46.0
+Mozilla/5.0 (X11; CrOS x86_64 12371.65.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.93 Safari/537.36	Other	Chrome 77.0	Chrome OS 12371.65.0
+Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36	Other	Chrome 75.0	Linux 0.0.0
+Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36	Other	Chrome 77.0	Linux 0.0.0
+Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/10.1 Chrome/71.0.3578.99 Safari/537.36	Other	Samsung Internet 10.1	Linux 0.0.0
+Mozilla/5.0 (X11; U; U; Linux x86_64; in-id) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36	Other	Chrome 66.0	Linux 0.0.0
+Mozilla/5.0 (X11; U; U; Linux x86_64; pt-pt) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36	Other	Chrome 66.0	Linux 0.0.0
+Mozilla/5.0 (X11; U; U; Linux x86_64; th-th) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36	Other	Chrome 66.0	Linux 0.0.0
+Mozilla/5.0 (X11; U; U; Linux x86_64; vi-vn) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36	Other	Chrome 66.0	Linux 0.0.0
+Mozilla/5.0 (X11; U; U; Linux x86_64; zh-cn) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36	Other	Chrome 66.0	Linux 0.0.0
+Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:65.0) Gecko/20100101 Firefox/65.0	Other	Firefox 65.0	Ubuntu 0.0.0
+Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:66.0) Gecko/20100101 Firefox/66.0	Other	Firefox 66.0	Ubuntu 0.0.0
+Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:67.0) Gecko/20100101 Firefox/67.0	Other	Firefox 67.0	Ubuntu 0.0.0
+Mozilla/5.0 (iPad; CPU OS 10_3_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) GSA/22.0.141836113 Mobile/14G60 Safari/600.1.4	iPad	Google 22.0	iOS 10.3.3
+Mozilla/5.0 (iPad; CPU OS 10_3_3 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) CriOS/71.0.3578.89 Mobile/14G60 Safari/602.1	iPad	Chrome Mobile iOS 71.0	iOS 10.3.3
+Mozilla/5.0 (iPad; CPU OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) FxiOS/14.0b12646 Mobile/14G60 Safari/603.3.8	iPad	Firefox iOS 14.0	iOS 10.3.3
+Mozilla/5.0 (iPad; CPU OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Mobile/14G60	iPad	Mobile Safari UI/WKWebView 0.0	iOS 10.3.3
+Mozilla/5.0 (iPad; CPU OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Mobile/14G60 [FBAN/FBIOS;FBAV/240.0.0.55.117;FBBV/174195427;FBDV/iPad5,3;FBMD/iPad;FBSN/iOS;FBSV/10.3.3;FBSS/2;FBID/tablet;FBLC/zh_TW;FBOP/5;FBRV/175353135;FBCR/]	iPad	Facebook 240.0	iOS 10.3.3
+Mozilla/5.0 (iPad; CPU OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.0 Mobile/14G60 Safari/602.1	iPad	Mobile Safari 10.0	iOS 10.3.3
+Mozilla/5.0 (iPad; CPU OS 10_3_4 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.0 Mobile/14G61 Safari/602.1	iPad	Mobile Safari 10.0	iOS 10.3.4
+Mozilla/5.0 (iPad; CPU OS 11_1 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) CriOS/76.0.3809.123 Mobile/15B101 Safari/604.1	iPad	Chrome Mobile iOS 76.0	iOS 11.1.0
+Mozilla/5.0 (iPad; CPU OS 11_1_2 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) CriOS/76.0.3809.123 Mobile/15B202 Safari/604.1	iPad	Chrome Mobile iOS 76.0	iOS 11.1.2
+Mozilla/5.0 (iPad; CPU OS 11_2_1 like Mac OS X) AppleWebKit/604.4.7 (KHTML, like Gecko) Version/11.0 Mobile/15C153 Safari/604.1	iPad	Mobile Safari 11.0	iOS 11.2.1
+Mozilla/5.0 (iPad; CPU OS 11_2_2 like Mac OS X) AppleWebKit/604.4.7 (KHTML, like Gecko) Version/11.0 Mobile/15C202 Safari/604.1	iPad	Mobile Safari 11.0	iOS 11.2.2
+Mozilla/5.0 (iPad; CPU OS 11_2_6 like Mac OS X) AppleWebKit/604.5.6 (KHTML, like Gecko) Version/11.0 Mobile/15D100 Safari/604.1	iPad	Mobile Safari 11.0	iOS 11.2.6
+Mozilla/5.0 (iPad; CPU OS 11_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 11.0	iOS 11.3.0
+Mozilla/5.0 (iPad; CPU OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 11.0	iOS 11.4.0
+Mozilla/5.0 (iPad; CPU OS 11_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15G77	iPad	Mobile Safari UI/WKWebView 0.0	iOS 11.4.1
+Mozilla/5.0 (iPad; CPU OS 11_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 11.0	iOS 11.4.1
+Mozilla/5.0 (iPad; CPU OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/83.0.268992909 Mobile/15E148 Safari/605.1	iPad	Google 83.0	iOS 12.0.0
+Mozilla/5.0 (iPad; CPU OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 12.0	iOS 12.0.0
+Mozilla/5.0 (iPad; CPU OS 12_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/75.0.3770.103 Mobile/15E148 Safari/605.1	iPad	Chrome Mobile iOS 75.0	iOS 12.1.0
+Mozilla/5.0 (iPad; CPU OS 12_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/76.0.3809.123 Mobile/15E148 Safari/605.1	iPad	Chrome Mobile iOS 76.0	iOS 12.1.0
+Mozilla/5.0 (iPad; CPU OS 12_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16B92	iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.1.0
+Mozilla/5.0 (iPad; CPU OS 12_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 12.0	iOS 12.1.0
+Mozilla/5.0 (iPad; CPU OS 12_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 12.0	iOS 12.1.1
+Mozilla/5.0 (iPad; CPU OS 12_1_4 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/48.0.193557427 Mobile/16D57 Safari/604.1	iPad	Google 48.0	iOS 12.1.4
+Mozilla/5.0 (iPad; CPU OS 12_1_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16D57	iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.1.4
+Mozilla/5.0 (iPad; CPU OS 12_1_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 12.0	iOS 12.1.4
+Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/76.0.3809.123 Mobile/15E148 Safari/605.1	iPad	Chrome Mobile iOS 76.0	iOS 12.2.0
+Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148	iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.2.0
+Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 12.1	iOS 12.2.0
+Mozilla/5.0 (iPad; CPU OS 12_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.93 Mobile/15E148 Safari/605.1	iPad	Chrome Mobile iOS 77.0	iOS 12.3.0
+Mozilla/5.0 (iPad; CPU OS 12_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/83.0.268992909 Mobile/15E148 Safari/605.1	iPad	Google 83.0	iOS 12.3.0
+Mozilla/5.0 (iPad; CPU OS 12_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 12.1	iOS 12.3.0
+Mozilla/5.0 (iPad; CPU OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148	iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.3.1
+Mozilla/5.0 (iPad; CPU OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 12.1	iOS 12.3.1
+Mozilla/5.0 (iPad; CPU OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/76.0.3809.123 Mobile/15E148 Safari/605.1	iPad	Chrome Mobile iOS 76.0	iOS 12.4.0
+Mozilla/5.0 (iPad; CPU OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/76.0.3809.81 Mobile/15E148 Safari/605.1	iPad	Chrome Mobile iOS 76.0	iOS 12.4.0
+Mozilla/5.0 (iPad; CPU OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.103 Mobile/15E148 Safari/605.1	iPad	Chrome Mobile iOS 77.0	iOS 12.4.0
+Mozilla/5.0 (iPad; CPU OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.69 Mobile/15E148 Safari/605.1	iPad	Chrome Mobile iOS 77.0	iOS 12.4.0
+Mozilla/5.0 (iPad; CPU OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.93 Mobile/15E148 Safari/605.1	iPad	Chrome Mobile iOS 77.0	iOS 12.4.0
+Mozilla/5.0 (iPad; CPU OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/74.0.248026584 Mobile/15E148 Safari/605.1	iPad	Google 74.0	iOS 12.4.0
+Mozilla/5.0 (iPad; CPU OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/83.0.268992909 Mobile/15E148 Safari/605.1	iPad	Google 83.0	iOS 12.4.0
+Mozilla/5.0 (iPad; CPU OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148	iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.4.0
+Mozilla/5.0 (iPad; CPU OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 12.1	iOS 12.4.0
+Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) CriOS/67.0.3396.87 Mobile/16G102 Safari/604.1	iPad	Chrome Mobile iOS 67.0	iOS 12.4.1
+Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/19.0b16042 Mobile/15E148 Safari/605.1.15	iPad	Firefox iOS 19.0	iOS 12.4.1
+Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148	iPad	Mobile Safari UI/WKWebView 0.0	iOS 12.4.1
+Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPad4,7;FBMD/iPad;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/tablet;FBLC/vi_VN;FBOP/5;FBCR/]	iPad	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPad5,1;FBMD/iPad;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBCR/;FBID/tablet;FBLC/en_US;FBOP/5]	iPad	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPad6,11;FBMD/iPad;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/tablet;FBLC/en_US;FBOP/5;FBCR/]	iPad	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPad7,5;FBMD/iPad;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/tablet;FBLC/en_US;FBOP/5;FBCR/]	iPad	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1	iPad	Mobile Safari 12.1	iOS 12.4.1
+Mozilla/5.0 (iPad; CPU OS 6_1_3 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B329 Safari/8536.25	iPad	Mobile Safari 6.0	iOS 6.1.3
+Mozilla/5.0 (iPad; CPU OS 8_0 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12A365 Safari/600.1.4	iPad	Mobile Safari 8.0	iOS 8.0.0
+Mozilla/5.0 (iPad; CPU OS 8_2 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12D508 Safari/600.1.4	iPad	Mobile Safari 8.0	iOS 8.2.0
+Mozilla/5.0 (iPad; CPU OS 8_4 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) GSA/23.1.148956103 Mobile/12H143 Safari/600.1.4	iPad	Google 23.1	iOS 8.4.0
+Mozilla/5.0 (iPad; CPU OS 9_3_2 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13F69 Safari/601.1	iPad	Mobile Safari 9.0	iOS 9.3.2
+Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13G36 Safari/601.1	iPad	Mobile Safari 9.0	iOS 9.3.5
+Mozilla/5.0 (iPhone; CPU iPhone OS 10_2 like Mac OS X) AppleWebKit/602.3.12 (KHTML, like Gecko) Version/10.0 Mobile/14C92 Safari/602.1	iPhone	Mobile Safari 10.0	iOS 10.2.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Mobile/14G60 [FBAN/FBIOS;FBDV/iPhone7,1;FBMD/iPhone;FBSN/iOS;FBSV/10.3.3;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Verizon]	iPhone	Facebook 0.0	iOS 10.3.3
+Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_4 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) GSA/68.0.234683655 Mobile/14G61 Safari/602.1	iPhone	Google 68.0	iOS 10.3.4
+Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_4 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.0 Mobile/14G61 Safari/602.1	iPhone	Mobile Safari 10.0	iOS 10.3.4
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_0_3 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A432 Safari/604.1	iPhone	Mobile Safari 11.0	iOS 11.0.3
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_1_1 like Mac OS X) AppleWebKit/604.3.5 (KHTML, like Gecko) Version/11.0 Mobile/15B150 Safari/604.1	iPhone	Mobile Safari 11.0	iOS 11.1.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_1_2 like Mac OS X) AppleWebKit/604.3.5 (KHTML, like Gecko) Version/11.0 Mobile/15B202 Safari/604.1	iPhone	Mobile Safari 11.0	iOS 11.1.2
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_2_1 like Mac OS X) AppleWebKit/604.4.7 (KHTML, like Gecko) Version/11.0 Mobile/15C153 Safari/604.1	iPhone	Mobile Safari 11.0	iOS 11.2.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_2_6 like Mac OS X) AppleWebKit/604.5.6 (KHTML, like Gecko) Mobile/15D100 [FBAN/FBIOS;FBAV/207.0.0.48.100;FBBV/141048683;FBDV/iPhone9,3;FBMD/iPhone;FBSN/iOS;FBSV/11.2.6;FBSS/2;FBCR/SFR;FBID/phone;FBLC/fr_FR;FBOP/5;FBRV/142061404]	iPhone	Facebook 207.0	iOS 11.2.6
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) CriOS/76.0.3809.123 Mobile/15E148 Safari/604.1	iPhone	Chrome Mobile iOS 76.0	iOS 11.3.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E302 [FBAN/FBIOS;FBDV/iPhone7,2;FBMD/iPhone;FBSN/iOS;FBSV/11.3.1;FBSS/2;FBID/phone;FBLC/fr_FR;FBOP/5;FBCR/VINI]	iPhone	Facebook 0.0	iOS 11.3.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 11.0	iOS 11.3.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/83.0.268992909 Mobile/15E148 Safari/604.1	iPhone	Google 83.0	iOS 11.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 11.0	iOS 11.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_4_1 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/74.1.250942683 Mobile/15G77 Safari/604.1	iPhone	Google 74.1	iOS 11.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 11_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 11.0	iOS 11.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.0	iOS 12.0.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.0	iOS 12.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.0	iOS 12.1.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/74.1.250942683 Mobile/16C101 Safari/604.1	iPhone	Google 74.1	iOS 12.1.2
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16C101 [FBAN/FBIOS;FBDV/iPhone9,3;FBMD/iPhone;FBSN/iOS;FBSV/12.1.2;FBSS/2;FBCR/Free;FBID/phone;FBLC/fr_FR;FBOP/5]	iPhone	Facebook 0.0	iOS 12.1.2
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.0	iOS 12.1.2
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.0	iOS 12.1.3
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/74.1.250942683 Mobile/16D57 Safari/604.1	iPhone	Google 74.1	iOS 12.1.4
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.0	iOS 12.1.4
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/72.0.3626.101 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 72.0	iOS 12.2.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/76.0.3809.123 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 76.0	iOS 12.2.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.69 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 77.0	iOS 12.2.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,2;FBMD/iPhone;FBSN/iOS;FBSV/12.2;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 12.2.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,5;FBMD/iPhone;FBSN/iOS;FBSV/12.2;FBSS/3;FBCR/AT&T;FBID/phone;FBLC/en_US;FBOP/5]	iPhone	Facebook 0.0	iOS 12.2.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.1	iOS 12.2.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.69 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 77.0	iOS 12.3.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/83.0.268992909 Mobile/15E148 Safari/605.1	iPhone	Google 83.0	iOS 12.3.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.1	iOS 12.3.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/79.0.259819395 Mobile/16F203 Safari/604.1	iPhone	Google 79.0	iOS 12.3.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148	iPhone	Mobile Safari UI/WKWebView 0.0	iOS 12.3.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 DuckDuckGo/7	iPhone	DuckDuckGo Mobile 7.0	iOS 12.3.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,6;FBMD/iPhone;FBSN/iOS;FBSV/12.3.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 12.3.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,6;FBMD/iPhone;FBSN/iOS;FBSV/12.3.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 12.3.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone9,3;FBMD/iPhone;FBSN/iOS;FBSV/12.3.1;FBSS/2;FBID/phone;FBLC/es_LA;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 12.3.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.1	iOS 12.3.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.1	iOS 12.3.2
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/69.0.3497.105 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 69.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/73.0.3683.68 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 73.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/75.0.3770.103 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 75.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/76.0.3809.123 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 76.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.103 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 77.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.69 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 77.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/81.0.264749124 Mobile/15E148 Safari/605.1	iPhone	Google 81.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/82.1.267240167 Mobile/15E148 Safari/605.1	iPhone	Google 82.1	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/83.0.268992909 Mobile/15E148 Safari/605.1	iPhone	Google 83.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,1;FBMD/iPhone;FBSN/iOS;FBSV/12.4;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Verizon]	iPhone	Facebook 0.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,5;FBMD/iPhone;FBSN/iOS;FBSV/12.4;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,6;FBMD/iPhone;FBSN/iOS;FBSV/12.4;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Sprint]	iPhone	Facebook 0.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone9,4;FBMD/iPhone;FBSN/iOS;FBSV/12.4;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.1	iOS 12.4.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/74.1.250942683 Mobile/16G102 Safari/604.1	iPhone	Google 74.1	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148	iPhone	Mobile Safari UI/WKWebView 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Instagram 89.0.0.14.100 (iPhone11,6; iOS 12_4_1; en_US; en-US; scale=3.00; gamut=normal; 1242x2688; 149781277)	iPhone	Instagram 89.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBAV/240.0.0.55.117;FBBV/174195427;FBDV/iPhone7,2;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/phone;FBLC/es_LA;FBOP/5;FBRV/175040728;FBCR/AT&T]	iPhone	Facebook 240.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,2;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Sprint]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,3;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,3;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Verizon]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,4;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/phone;FBLC/es_LA;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,4;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/phone;FBLC/fr_FR;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,5;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBCR/T-Mobile;FBID/phone;FBLC/es_LA;FBOP/5]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,5;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,5;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/es_LA;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,6;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,2;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Verizon]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,6;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,6;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Verizon]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,6;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/fr_FR;FBOP/5;FBCR/SFR]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,8;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,8;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Verizon]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,8;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/phone;FBLC/fr_FR;FBOP/5;FBCR/Carrier]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone7,2;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone8,1;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/MetroPCS]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone9,2;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/cricket]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone9,4;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone9,4;FBMD/iPhone;FBSN/iOS;FBSV/12.4.1;FBSS/3;FBID/phone;FBLC/fr_FR;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.1	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.4.1 Mobile/15E148 Safari/605.1.15	iPhone	Mobile Safari 12.4	iOS 12.4.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148	iPhone	Mobile Safari UI/WKWebView 0.0	iOS 12.4.2
+Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 12.1	iOS 12.4.2
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.69 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 77.0	iOS 13.0.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,5;FBMD/iPhone;FBSN/iOS;FBSV/13.0;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 13.0.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,6;FBMD/iPhone;FBSN/iOS;FBSV/13.0;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 13.0.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,2;FBMD/iPhone;FBSN/iOS;FBSV/13.0;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Verizon]	iPhone	Facebook 0.0	iOS 13.0.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,8;FBMD/iPhone;FBSN/iOS;FBSV/13.0;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 13.0.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,8;FBMD/iPhone;FBSN/iOS;FBSV/13.0;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Verizon]	iPhone	Facebook 0.0	iOS 13.0.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone9,4;FBMD/iPhone;FBSN/iOS;FBSV/13.0;FBSS/3;FBID/phone;FBLC/fr_FR;FBOP/5;FBCR/Orange France]	iPhone	Facebook 0.0	iOS 13.0.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 13.0	iOS 13.0.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/76.0.3809.123 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 76.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.69 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 77.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/77.0.3865.93 Mobile/15E148 Safari/605.1	iPhone	Chrome Mobile iOS 77.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/8.1.3 Mobile/15E148 Safari/605.1.15	iPhone	Firefox iOS 8.1	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/83.0.268992909 Mobile/15E148 Safari/605.1	iPhone	Google 83.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148	iPhone	Mobile Safari UI/WKWebView 0.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 DuckDuckGo/7	iPhone	DuckDuckGo Mobile 7.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,1;FBMD/iPhone;FBSN/iOS;FBSV/13.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,6;FBMD/iPhone;FBSN/iOS;FBSV/13.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,6;FBMD/iPhone;FBSN/iOS;FBSV/13.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,8;FBMD/iPhone;FBSN/iOS;FBSV/13.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone9,4;FBMD/iPhone;FBSN/iOS;FBSV/13.1;FBSS/3;FBID/phone;FBLC/es_LA;FBOP/5;FBCR/Telcel]	iPhone	Facebook 0.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.1 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 13.0	iOS 13.1.0
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148	iPhone	Mobile Safari UI/WKWebView 0.0	iOS 13.1.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,1;FBMD/iPhone;FBSN/iOS;FBSV/13.1.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Union]	iPhone	Facebook 0.0	iOS 13.1.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,3;FBMD/iPhone;FBSN/iOS;FBSV/13.1.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Verizon]	iPhone	Facebook 0.0	iOS 13.1.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,6;FBMD/iPhone;FBSN/iOS;FBSV/13.1.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/T-Mobile]	iPhone	Facebook 0.0	iOS 13.1.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,6;FBMD/iPhone;FBSN/iOS;FBSV/13.1.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/Verizon]	iPhone	Facebook 0.0	iOS 13.1.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.1 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 13.0	iOS 13.1.1
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148	iPhone	Mobile Safari UI/WKWebView 0.0	iOS 13.1.2
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,2;FBMD/iPhone;FBSN/iOS;FBSV/13.1.2;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/AT&T]	iPhone	Facebook 0.0	iOS 13.1.2
+Mozilla/5.0 (iPhone; CPU iPhone OS 13_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.1 Mobile/15E148 Safari/604.1	iPhone	Mobile Safari 13.0	iOS 13.1.2
diff --git a/tests/queries/0_stateless/02504_regexp_dictionary_ua_parser.sh b/tests/queries/0_stateless/02504_regexp_dictionary_ua_parser.sh
index 8e361a191d6..6e386360d60 100755
--- a/tests/queries/0_stateless/02504_regexp_dictionary_ua_parser.sh
+++ b/tests/queries/0_stateless/02504_regexp_dictionary_ua_parser.sh
@@ -68,13 +68,13 @@ $CLICKHOUSE_CLIENT -n --query="
 insert into user_agents select ua from input('ua String') FORMAT LineAsString" < $CURDIR/data_ua_parser/useragents.txt
 
 $CLICKHOUSE_CLIENT -n --query="
-select device,
+select ua, device,
 concat(tupleElement(browser, 1), ' ', tupleElement(browser, 2), '.', tupleElement(browser, 3)) as browser ,
 concat(tupleElement(os, 1), ' ', tupleElement(os, 2), '.', tupleElement(os, 3), '.', tupleElement(os, 4)) as os
 from (
-     select dictGet('regexp_os', ('os_replacement', 'os_v1_replacement', 'os_v2_replacement', 'os_v3_replacement'), ua) os,
+     select ua, dictGet('regexp_os', ('os_replacement', 'os_v1_replacement', 'os_v2_replacement', 'os_v3_replacement'), ua) os,
      dictGet('regexp_browser', ('family_replacement', 'v1_replacement', 'v2_replacement'), ua) as browser,
-     dictGet('regexp_device', 'device_replacement', ua) device from user_agents);
+     dictGet('regexp_device', 'device_replacement', ua) device from user_agents) order by ua;
 "
 
 $CLICKHOUSE_CLIENT -n --query="
diff --git a/tests/queries/0_stateless/02513_validate_data_types.sql b/tests/queries/0_stateless/02513_validate_data_types.sql
index 1235d00ba79..5eb91ac7879 100644
--- a/tests/queries/0_stateless/02513_validate_data_types.sql
+++ b/tests/queries/0_stateless/02513_validate_data_types.sql
@@ -5,10 +5,6 @@ select CAST('{"x" : 1}', 'JSON'); -- {serverError ILLEGAL_COLUMN}
 desc file(nonexist.json, JSONAsObject); -- {serverError ILLEGAL_COLUMN}
 desc file(nonexist.json, JSONEachRow, 'x JSON'); -- {serverError ILLEGAL_COLUMN}
 
-set allow_experimental_geo_types=0;
-select CAST([[(20, 20), (50, 20), (50, 50), (20, 50)], [(30, 30), (50, 50), (50, 30)]], 'Polygon'); -- {serverError ILLEGAL_COLUMN}
-desc file(nonexist.json, JSONEachRow, 'pg Polygon'); -- {serverError ILLEGAL_COLUMN}
-
 set allow_suspicious_low_cardinality_types=0;
 select CAST(1000000, 'LowCardinality(UInt64)'); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
 desc file(nonexist.json, JSONEachRow, 'lc LowCardinality(UInt64)'); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
@@ -16,4 +12,3 @@ desc file(nonexist.json, JSONEachRow, 'lc LowCardinality(UInt64)'); -- {serverEr
 set allow_suspicious_fixed_string_types=0;
 select CAST('', 'FixedString(1000)'); -- {serverError ILLEGAL_COLUMN}
 desc file(nonexist.json, JSONEachRow, 'fs FixedString(1000)'); -- {serverError ILLEGAL_COLUMN}
-
diff --git a/tests/queries/0_stateless/02514_analyzer_drop_join_on.reference b/tests/queries/0_stateless/02514_analyzer_drop_join_on.reference
index 0f6fa7e2e66..8b4cafc3260 100644
--- a/tests/queries/0_stateless/02514_analyzer_drop_join_on.reference
+++ b/tests/queries/0_stateless/02514_analyzer_drop_join_on.reference
@@ -24,26 +24,26 @@ Header: count() UInt64
             Header: default.a.a2_4 String
                     default.b.b1_0 UInt64
               Join (JOIN FillRightFirst)
-              Header: default.a.a2_4 String
-                      default.a.a1_1 UInt64
+              Header: default.a.a1_1 UInt64
+                      default.a.a2_4 String
                       default.b.b1_0 UInt64
                 Expression ((JOIN actions + Change column names to column identifiers))
-                Header: default.a.a2_4 String
-                        default.a.a1_1 UInt64
-                  ReadFromStorage (Memory)
-                  Header: a2 String
-                          a1 UInt64
+                Header: default.a.a1_1 UInt64
+                        default.a.a2_4 String
+                  ReadFromMemoryStorage
+                  Header: a1 UInt64
+                          a2 String
                 Expression ((JOIN actions + Change column names to column identifiers))
                 Header: default.b.b1_0 UInt64
-                  ReadFromStorage (Memory)
+                  ReadFromMemoryStorage
                   Header: b1 UInt64
             Expression ((JOIN actions + Change column names to column identifiers))
             Header: default.c.c1_2 UInt64
-              ReadFromStorage (Memory)
+              ReadFromMemoryStorage
               Header: c1 UInt64
         Expression ((JOIN actions + Change column names to column identifiers))
         Header: default.d.d1_3 UInt64
-          ReadFromStorage (Memory)
+          ReadFromMemoryStorage
           Header: d1 UInt64
 EXPLAIN PLAN header = 1
 SELECT a.a2, d.d2 FROM a JOIN b USING (k) JOIN c USING (k) JOIN d USING (k)
@@ -52,41 +52,41 @@ Expression ((Project names + (Projection + DROP unused columns after JOIN)))
 Header: a2 String
         d2 String
   Join (JOIN FillRightFirst)
-  Header: default.a.k_2 UInt64
-          default.a.a2_0 String
+  Header: default.a.a2_0 String
+          default.a.k_2 UInt64
           default.d.d2_1 String
     Expression (DROP unused columns after JOIN)
-    Header: default.a.k_2 UInt64
-            default.a.a2_0 String
+    Header: default.a.a2_0 String
+            default.a.k_2 UInt64
       Join (JOIN FillRightFirst)
-      Header: default.a.k_2 UInt64
-              default.a.a2_0 String
+      Header: default.a.a2_0 String
+              default.a.k_2 UInt64
         Expression (DROP unused columns after JOIN)
-        Header: default.a.k_2 UInt64
-                default.a.a2_0 String
+        Header: default.a.a2_0 String
+                default.a.k_2 UInt64
           Join (JOIN FillRightFirst)
-          Header: default.a.k_2 UInt64
-                  default.a.a2_0 String
+          Header: default.a.a2_0 String
+                  default.a.k_2 UInt64
             Expression (Change column names to column identifiers)
-            Header: default.a.k_2 UInt64
-                    default.a.a2_0 String
-              ReadFromStorage (Memory)
-              Header: k UInt64
-                      a2 String
+            Header: default.a.a2_0 String
+                    default.a.k_2 UInt64
+              ReadFromMemoryStorage
+              Header: a2 String
+                      k UInt64
             Expression (Change column names to column identifiers)
             Header: default.b.k_3 UInt64
-              ReadFromStorage (Memory)
+              ReadFromMemoryStorage
               Header: k UInt64
         Expression (Change column names to column identifiers)
         Header: default.c.k_4 UInt64
-          ReadFromStorage (Memory)
+          ReadFromMemoryStorage
           Header: k UInt64
     Expression (Change column names to column identifiers)
-    Header: default.d.k_5 UInt64
-            default.d.d2_1 String
-      ReadFromStorage (Memory)
-      Header: k UInt64
-              d2 String
+    Header: default.d.d2_1 String
+            default.d.k_5 UInt64
+      ReadFromMemoryStorage
+      Header: d2 String
+              k UInt64
 EXPLAIN PLAN header = 1
 SELECT b.bx FROM a
 JOIN (SELECT b1, b2 || 'x'  AS bx FROM b ) AS b ON b.b1 = a.a1
@@ -123,28 +123,28 @@ Header: bx String
                     b.bx_0 String
                     b.b1_1 UInt64
               Join (JOIN FillRightFirst)
-              Header: default.a.a2_6 String
-                      default.a.a1_2 UInt64
+              Header: default.a.a1_2 UInt64
+                      default.a.a2_6 String
                       b.bx_0 String
                       b.b1_1 UInt64
                 Expression ((JOIN actions + Change column names to column identifiers))
-                Header: default.a.a2_6 String
-                        default.a.a1_2 UInt64
-                  ReadFromStorage (Memory)
-                  Header: a2 String
-                          a1 UInt64
+                Header: default.a.a1_2 UInt64
+                        default.a.a2_6 String
+                  ReadFromMemoryStorage
+                  Header: a1 UInt64
+                          a2 String
                 Expression ((JOIN actions + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))
                 Header: b.b1_1 UInt64
                         b.bx_0 String
-                  ReadFromStorage (Memory)
-                  Header: b2 String
-                          b1 UInt64
+                  ReadFromMemoryStorage
+                  Header: b1 UInt64
+                          b2 String
             Expression ((JOIN actions + Change column names to column identifiers))
-            Header: default.c.c2_5 String
-                    default.c.c1_3 UInt64
-              ReadFromStorage (Memory)
-              Header: c2 String
-                      c1 UInt64
+            Header: default.c.c1_3 UInt64
+                    default.c.c2_5 String
+              ReadFromMemoryStorage
+              Header: c1 UInt64
+                      c2 String
         Expression ((JOIN actions + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))
         Header: d.d1_4 UInt64
           ReadFromStorage (SystemNumbers)
diff --git a/tests/queries/0_stateless/02515_cleanup_async_insert_block_ids.sh b/tests/queries/0_stateless/02515_cleanup_async_insert_block_ids.sh
index 9e22089d5e1..458a5e95faa 100755
--- a/tests/queries/0_stateless/02515_cleanup_async_insert_block_ids.sh
+++ b/tests/queries/0_stateless/02515_cleanup_async_insert_block_ids.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 CLICKHOUSE_TEST_ZOOKEEPER_PREFIX="${CLICKHOUSE_TEST_ZOOKEEPER_PREFIX}/${CLICKHOUSE_DATABASE}"
 
 $CLICKHOUSE_CLIENT -n --query "
-    DROP TABLE IF EXISTS t_async_insert_cleanup NO DELAY;
+    DROP TABLE IF EXISTS t_async_insert_cleanup SYNC;
     CREATE TABLE t_async_insert_cleanup (
         KeyID UInt32
     ) Engine = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/t_async_insert_cleanup', '{replica}')
@@ -27,7 +27,7 @@ old_answer=$($CLICKHOUSE_CLIENT --query "SELECT count(*) FROM system.zookeeper W
 for i in {1..300}; do
     answer=$($CLICKHOUSE_CLIENT --query "SELECT count(*) FROM system.zookeeper WHERE path like '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/t_async_insert_cleanup/async_blocks%' settings allow_unrestricted_reads_from_keeper = 'true'")
     if [ $answer == '10' ]; then
-        $CLICKHOUSE_CLIENT -n --query "DROP TABLE t_async_insert_cleanup NO DELAY;"
+        $CLICKHOUSE_CLIENT -n --query "DROP TABLE t_async_insert_cleanup SYNC;"
         exit 0
     fi
     sleep 1
@@ -36,4 +36,4 @@ done
 $CLICKHOUSE_CLIENT --query "SELECT count(*) FROM t_async_insert_cleanup"
 echo $old_answer
 $CLICKHOUSE_CLIENT --query "SELECT count(*) FROM system.zookeeper WHERE path like '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/t_async_insert_cleanup/async_blocks%' settings allow_unrestricted_reads_from_keeper = 'true'"
-$CLICKHOUSE_CLIENT -n --query "DROP TABLE t_async_insert_cleanup NO DELAY;"
+$CLICKHOUSE_CLIENT -n --query "DROP TABLE t_async_insert_cleanup SYNC;"
diff --git a/tests/queries/0_stateless/02515_projections_with_totals.reference b/tests/queries/0_stateless/02515_projections_with_totals.reference
index c6359cae032..f086fcb10e9 100644
--- a/tests/queries/0_stateless/02515_projections_with_totals.reference
+++ b/tests/queries/0_stateless/02515_projections_with_totals.reference
@@ -1,3 +1,6 @@
 0
 
 0
+0
+
+0
diff --git a/tests/queries/0_stateless/02515_projections_with_totals.sql b/tests/queries/0_stateless/02515_projections_with_totals.sql
index 4d43d5381da..1e4b5c6f255 100644
--- a/tests/queries/0_stateless/02515_projections_with_totals.sql
+++ b/tests/queries/0_stateless/02515_projections_with_totals.sql
@@ -3,4 +3,8 @@ CREATE TABLE t (x UInt8, PROJECTION p (SELECT x GROUP BY x)) ENGINE = MergeTree
 INSERT INTO t VALUES (0);
 SET group_by_overflow_mode = 'any', max_rows_to_group_by = 1000, totals_mode = 'after_having_auto';
 SELECT x FROM t GROUP BY x WITH TOTALS;
+
+SET optimize_aggregation_in_order=1;
+SELECT x FROM t GROUP BY x WITH TOTALS;
+
 DROP TABLE t;
diff --git a/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.reference b/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.reference
index fd0b223f8e5..19da8828c30 100644
--- a/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.reference
+++ b/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.reference
@@ -2,6 +2,10 @@
 1
 
 0
+1
+1
+
+1
 \N
 
 100000000000000000000
diff --git a/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql b/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql
index b6e60aa2e1f..6b58d737a3e 100644
--- a/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql
+++ b/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 SELECT *
 FROM
 (
@@ -12,7 +14,26 @@ INNER JOIN
     SELECT 1
     GROUP BY 1
         WITH TOTALS
-) AS t2 USING (a);
+) AS t2 USING (a)
+SETTINGS allow_experimental_analyzer=0;
+
+SELECT *
+FROM
+(
+    SELECT 1 AS a
+) AS t1
+INNER JOIN
+(
+    SELECT 1 AS a
+    GROUP BY 1
+        WITH TOTALS
+    UNION ALL
+    SELECT 1
+    GROUP BY 1
+        WITH TOTALS
+) AS t2 USING (a)
+SETTINGS allow_experimental_analyzer=1;
+
 
 SELECT a
 FROM
diff --git a/tests/queries/0_stateless/02516_projections_and_context.reference b/tests/queries/0_stateless/02516_projections_and_context.reference
index e69de29bb2d..6ed281c757a 100644
--- a/tests/queries/0_stateless/02516_projections_and_context.reference
+++ b/tests/queries/0_stateless/02516_projections_and_context.reference
@@ -0,0 +1,2 @@
+1
+1
diff --git a/tests/queries/0_stateless/02516_projections_and_context.sql b/tests/queries/0_stateless/02516_projections_and_context.sql
index a7c143c7900..2b659eafabc 100644
--- a/tests/queries/0_stateless/02516_projections_and_context.sql
+++ b/tests/queries/0_stateless/02516_projections_and_context.sql
@@ -1,6 +1,10 @@
 DROP TABLE IF EXISTS test1__fuzz_37;
 CREATE TABLE test1__fuzz_37 (`i` Date) ENGINE = MergeTree ORDER BY i;
 insert into test1__fuzz_37 values ('2020-10-10');
+set allow_experimental_analyzer = 0;
 SELECT count() FROM test1__fuzz_37 GROUP BY dictHas(NULL, (dictHas(NULL, (('', materialize(NULL)), materialize(NULL))), 'KeyKey')), dictHas('test_dictionary', tuple(materialize('Ke\0'))), tuple(dictHas(NULL, (tuple('Ke\0Ke\0Ke\0Ke\0Ke\0Ke\0\0\0\0Ke\0'), materialize(NULL)))), 'test_dicti\0nary', (('', materialize(NULL)), dictHas(NULL, (dictHas(NULL, tuple(materialize(NULL))), 'KeyKeyKeyKeyKeyKeyKeyKey')), materialize(NULL)); -- { serverError BAD_ARGUMENTS }
 SELECT count() FROM test1__fuzz_37 GROUP BY dictHas('non_existing_dictionary', materialize('a')); -- { serverError BAD_ARGUMENTS }
+set allow_experimental_analyzer = 1;
+SELECT count() FROM test1__fuzz_37 GROUP BY dictHas(NULL, (dictHas(NULL, (('', materialize(NULL)), materialize(NULL))), 'KeyKey')), dictHas('test_dictionary', tuple(materialize('Ke\0'))), tuple(dictHas(NULL, (tuple('Ke\0Ke\0Ke\0Ke\0Ke\0Ke\0\0\0\0Ke\0'), materialize(NULL)))), 'test_dicti\0nary', (('', materialize(NULL)), dictHas(NULL, (dictHas(NULL, tuple(materialize(NULL))), 'KeyKeyKeyKeyKeyKeyKeyKey')), materialize(NULL));
+SELECT count() FROM test1__fuzz_37 GROUP BY dictHas('non_existing_dictionary', materialize('a'));
 DROP TABLE test1__fuzz_37;
diff --git a/tests/queries/0_stateless/02516_projections_with_rollup.sql b/tests/queries/0_stateless/02516_projections_with_rollup.sql
index e670fbb7827..038caf59264 100644
--- a/tests/queries/0_stateless/02516_projections_with_rollup.sql
+++ b/tests/queries/0_stateless/02516_projections_with_rollup.sql
@@ -1,3 +1,6 @@
+-- Tags: disabled
+-- FIXME https://github.com/ClickHouse/ClickHouse/issues/49552
+
 DROP TABLE IF EXISTS video_log;
 DROP TABLE IF EXISTS video_log_result__fuzz_0;
 DROP TABLE IF EXISTS rng;
diff --git a/tests/queries/0_stateless/02521_aggregation_by_partitions.sql b/tests/queries/0_stateless/02521_aggregation_by_partitions.sql
index aaa1b8b9b2d..b7d4a6ee93a 100644
--- a/tests/queries/0_stateless/02521_aggregation_by_partitions.sql
+++ b/tests/queries/0_stateless/02521_aggregation_by_partitions.sql
@@ -3,7 +3,7 @@
 set max_threads = 16;
 set allow_aggregate_partitions_independently = 1;
 set force_aggregate_partitions_independently = 1;
-set allow_experimental_projection_optimization = 0;
+set optimize_use_projections = 0;
 
 create table t1(a UInt32) engine=MergeTree order by tuple() partition by a % 4 settings index_granularity = 8192, index_granularity_bytes = 10485760;
 
diff --git a/tests/queries/0_stateless/02521_cannot_find_column_in_projection.reference b/tests/queries/0_stateless/02521_cannot_find_column_in_projection.reference
new file mode 100644
index 00000000000..2cd767c8054
--- /dev/null
+++ b/tests/queries/0_stateless/02521_cannot_find_column_in_projection.reference
@@ -0,0 +1 @@
+2023-01-05	10
diff --git a/tests/queries/0_stateless/02521_cannot-find-column-in-projection.sql b/tests/queries/0_stateless/02521_cannot_find_column_in_projection.sql
similarity index 50%
rename from tests/queries/0_stateless/02521_cannot-find-column-in-projection.sql
rename to tests/queries/0_stateless/02521_cannot_find_column_in_projection.sql
index 31602c5bae2..6ee8ec07178 100644
--- a/tests/queries/0_stateless/02521_cannot-find-column-in-projection.sql
+++ b/tests/queries/0_stateless/02521_cannot_find_column_in_projection.sql
@@ -1,3 +1,5 @@
+drop table if exists test;
 create table test(day Date, id UInt32) engine=MergeTree partition by day order by tuple();
 insert into test select toDate('2023-01-05') AS day, number from numbers(10);
-with toUInt64(id) as id_with select day, count(id_with)  from test where day >= '2023-01-01' group by day limit 1000; -- { serverError NOT_FOUND_COLUMN_IN_BLOCK }
+with toUInt64(id) as id_with select day, count(id_with) from test where day >= '2023-01-01' group by day limit 1000;
+drop table test;
diff --git a/tests/queries/0_stateless/02524_fuzz_and_fuss_2.sql b/tests/queries/0_stateless/02524_fuzz_and_fuss_2.sql
index e32238001bf..d78e8d34232 100644
--- a/tests/queries/0_stateless/02524_fuzz_and_fuss_2.sql
+++ b/tests/queries/0_stateless/02524_fuzz_and_fuss_2.sql
@@ -9,6 +9,6 @@ ENGINE = Memory;
 INSERT INTO data_a_02187
 SELECT *
 FROM system.one
-SETTINGS max_block_size = '1', min_insert_block_size_rows = '65536', min_insert_block_size_bytes = '0', max_insert_threads = '0', max_threads = '3', receive_timeout = '10', receive_data_timeout_ms = '10000', connections_with_failover_max_tries = '0', extremes = '1', use_uncompressed_cache = '0', optimize_move_to_prewhere = '1', optimize_move_to_prewhere_if_final = '0', replication_alter_partitions_sync = '2', totals_mode = 'before_having', allow_suspicious_low_cardinality_types = '1', compile_expressions = '1', min_count_to_compile_expression = '0', group_by_two_level_threshold = '100', distributed_aggregation_memory_efficient = '0', distributed_group_by_no_merge = '1', optimize_distributed_group_by_sharding_key = '1', optimize_skip_unused_shards = '1', optimize_skip_unused_shards_rewrite_in = '1', force_optimize_skip_unused_shards = '2', optimize_skip_unused_shards_nesting = '1', force_optimize_skip_unused_shards_nesting = '2', merge_tree_min_rows_for_concurrent_read = '10000', force_primary_key = '1', network_compression_method = 'ZSTD', network_zstd_compression_level = '7', log_queries = '0', log_queries_min_type = 'QUERY_FINISH', distributed_product_mode = 'local', insert_quorum = '2', insert_quorum_timeout = '0', insert_quorum_parallel = '0', select_sequential_consistency = '1', join_use_nulls = '1', any_join_distinct_right_table_keys = '1', preferred_max_column_in_block_size_bytes = '32', insert_distributed_sync = '1', insert_allow_materialized_columns = '1', use_index_for_in_with_subqueries = '1', joined_subquery_requires_alias = '0', empty_result_for_aggregation_by_empty_set = '1', allow_suspicious_codecs = '1', query_profiler_real_time_period_ns = '0', query_profiler_cpu_time_period_ns = '0', opentelemetry_start_trace_probability = '1', max_rows_to_read = '1000000', read_overflow_mode = 'break', max_rows_to_group_by = '10', group_by_overflow_mode = 'any', max_rows_to_sort = '100', sort_overflow_mode = 'break', max_result_rows = '10', max_execution_time = '3', max_execution_speed = '1', max_bytes_in_join = '100', join_algorithm = 'partial_merge', max_memory_usage = '1099511627776', log_query_threads = '1', send_logs_level = 'fatal', enable_optimize_predicate_expression = '1', prefer_localhost_replica = '1', optimize_read_in_order = '1', optimize_aggregation_in_order = '1', read_in_order_two_level_merge_threshold = '1', allow_introspection_functions = '1', check_query_single_value_result = '1', allow_experimental_live_view = '1', default_table_engine = 'Memory', mutations_sync = '2', convert_query_to_cnf = '0', optimize_arithmetic_operations_in_aggregate_functions = '1', optimize_duplicate_order_by_and_distinct = '0', optimize_multiif_to_if = '0', optimize_monotonous_functions_in_order_by = '1', optimize_functions_to_subcolumns = '1', optimize_using_constraints = '1', optimize_substitute_columns = '1', optimize_append_index = '1', transform_null_in = '1', allow_experimental_geo_types = '1', data_type_default_nullable = '1', cast_keep_nullable = '1', cast_ipv4_ipv6_default_on_conversion_error = '0', system_events_show_zero_values = '1', enable_global_with_statement = '1', optimize_on_insert = '0', optimize_rewrite_sum_if_to_count_if = '1', distributed_ddl_output_mode = 'throw', union_default_mode = 'ALL', optimize_aggregators_of_group_by_keys = '1', optimize_group_by_function_keys = '1', short_circuit_function_evaluation = 'enable', async_insert = '1', enable_filesystem_cache = '0', allow_deprecated_database_ordinary = '1', allow_deprecated_syntax_for_merge_tree = '1', allow_experimental_nlp_functions = '1', allow_experimental_object_type = '1', allow_experimental_map_type = '1', allow_experimental_projection_optimization = '1', input_format_null_as_default = '1', input_format_ipv4_default_on_conversion_error = '0', input_format_ipv6_default_on_conversion_error = '0', output_format_json_named_tuples_as_objects = '1', output_format_write_statistics = '0', output_format_pretty_row_numbers = '1';
+SETTINGS max_block_size = '1', min_insert_block_size_rows = '65536', min_insert_block_size_bytes = '0', max_insert_threads = '0', max_threads = '3', receive_timeout = '10', receive_data_timeout_ms = '10000', connections_with_failover_max_tries = '0', extremes = '1', use_uncompressed_cache = '0', optimize_move_to_prewhere = '1', optimize_move_to_prewhere_if_final = '0', replication_alter_partitions_sync = '2', totals_mode = 'before_having', allow_suspicious_low_cardinality_types = '1', compile_expressions = '1', min_count_to_compile_expression = '0', group_by_two_level_threshold = '100', distributed_aggregation_memory_efficient = '0', distributed_group_by_no_merge = '1', optimize_distributed_group_by_sharding_key = '1', optimize_skip_unused_shards = '1', optimize_skip_unused_shards_rewrite_in = '1', force_optimize_skip_unused_shards = '2', optimize_skip_unused_shards_nesting = '1', force_optimize_skip_unused_shards_nesting = '2', merge_tree_min_rows_for_concurrent_read = '10000', force_primary_key = '1', network_compression_method = 'ZSTD', network_zstd_compression_level = '7', log_queries = '0', log_queries_min_type = 'QUERY_FINISH', distributed_product_mode = 'local', insert_quorum = '2', insert_quorum_timeout = '0', insert_quorum_parallel = '0', select_sequential_consistency = '1', join_use_nulls = '1', any_join_distinct_right_table_keys = '1', preferred_max_column_in_block_size_bytes = '32', insert_distributed_sync = '1', insert_allow_materialized_columns = '1', use_index_for_in_with_subqueries = '1', joined_subquery_requires_alias = '0', empty_result_for_aggregation_by_empty_set = '1', allow_suspicious_codecs = '1', query_profiler_real_time_period_ns = '0', query_profiler_cpu_time_period_ns = '0', opentelemetry_start_trace_probability = '1', max_rows_to_read = '1000000', read_overflow_mode = 'break', max_rows_to_group_by = '10', group_by_overflow_mode = 'any', max_rows_to_sort = '100', sort_overflow_mode = 'break', max_result_rows = '10', max_execution_time = '3', max_execution_speed = '1', max_bytes_in_join = '100', join_algorithm = 'partial_merge', max_memory_usage = '1099511627776', log_query_threads = '1', send_logs_level = 'fatal', enable_optimize_predicate_expression = '1', prefer_localhost_replica = '1', optimize_read_in_order = '1', optimize_aggregation_in_order = '1', read_in_order_two_level_merge_threshold = '1', allow_introspection_functions = '1', check_query_single_value_result = '1', allow_experimental_live_view = '1', default_table_engine = 'Memory', mutations_sync = '2', convert_query_to_cnf = '0', optimize_arithmetic_operations_in_aggregate_functions = '1', optimize_duplicate_order_by_and_distinct = '0', optimize_multiif_to_if = '0', optimize_monotonous_functions_in_order_by = '1', optimize_functions_to_subcolumns = '1', optimize_using_constraints = '1', optimize_substitute_columns = '1', optimize_append_index = '1', transform_null_in = '1', data_type_default_nullable = '1', cast_keep_nullable = '1', cast_ipv4_ipv6_default_on_conversion_error = '0', system_events_show_zero_values = '1', enable_global_with_statement = '1', optimize_on_insert = '0', optimize_rewrite_sum_if_to_count_if = '1', distributed_ddl_output_mode = 'throw', union_default_mode = 'ALL', optimize_aggregators_of_group_by_keys = '1', optimize_group_by_function_keys = '1', short_circuit_function_evaluation = 'enable', async_insert = '1', enable_filesystem_cache = '0', allow_deprecated_database_ordinary = '1', allow_deprecated_syntax_for_merge_tree = '1', allow_experimental_nlp_functions = '1', allow_experimental_object_type = '1', allow_experimental_map_type = '1', optimize_use_projections = '1', input_format_null_as_default = '1', input_format_ipv4_default_on_conversion_error = '0', input_format_ipv6_default_on_conversion_error = '0', output_format_json_named_tuples_as_objects = '1', output_format_write_statistics = '0', output_format_pretty_row_numbers = '1';
 
 DROP TABLE data_a_02187;
diff --git a/tests/queries/0_stateless/02525_different_engines_in_temporary_tables.reference b/tests/queries/0_stateless/02525_different_engines_in_temporary_tables.reference
new file mode 100644
index 00000000000..3d1916b29f6
--- /dev/null
+++ b/tests/queries/0_stateless/02525_different_engines_in_temporary_tables.reference
@@ -0,0 +1,14 @@
+1	a
+2	b
+3	c
+0
+0
+1	a
+2	b
+3	c
+1	a
+2	b
+3	c
+1	a
+2	b
+3	c
diff --git a/tests/queries/0_stateless/02525_different_engines_in_temporary_tables.sql b/tests/queries/0_stateless/02525_different_engines_in_temporary_tables.sql
new file mode 100644
index 00000000000..7ebc05dfece
--- /dev/null
+++ b/tests/queries/0_stateless/02525_different_engines_in_temporary_tables.sql
@@ -0,0 +1,66 @@
+DROP TEMPORARY TABLE IF EXISTS table_merge_tree_02525;
+CREATE TEMPORARY TABLE table_merge_tree_02525
+(
+    id UInt64,
+    info String
+)
+ENGINE = MergeTree
+ORDER BY id
+PRIMARY KEY id;
+INSERT INTO table_merge_tree_02525 VALUES (1, 'a'), (2, 'b'), (3, 'c');
+SELECT * FROM table_merge_tree_02525;
+-- Check that temporary table with MergeTree is not sent to remote servers
+-- The query with remote() should not fail
+SELECT dummy FROM remote('127.0.0.{1,2}', system, one);
+DROP TEMPORARY TABLE table_merge_tree_02525;
+
+DROP TEMPORARY TABLE IF EXISTS table_log_02525;
+CREATE TEMPORARY TABLE table_log_02525
+(
+    id UInt64,
+    info String
+)
+ENGINE = Log;
+INSERT INTO table_log_02525 VALUES (1, 'a'), (2, 'b'), (3, 'c');
+SELECT * FROM table_log_02525;
+DROP TEMPORARY TABLE table_log_02525;
+
+DROP TEMPORARY TABLE IF EXISTS table_stripe_log_02525;
+CREATE TEMPORARY TABLE table_stripe_log_02525
+(
+    id UInt64,
+    info String
+)
+ENGINE = StripeLog;
+INSERT INTO table_stripe_log_02525 VALUES (1, 'a'), (2, 'b'), (3, 'c');
+SELECT * FROM table_stripe_log_02525;
+DROP TEMPORARY TABLE table_stripe_log_02525;
+
+DROP TEMPORARY TABLE IF EXISTS table_tiny_log_02525;
+CREATE TEMPORARY TABLE table_tiny_log_02525
+(
+    id UInt64,
+    info String
+)
+ENGINE = TinyLog;
+INSERT INTO table_tiny_log_02525 VALUES (1, 'a'), (2, 'b'), (3, 'c');
+SELECT * FROM table_tiny_log_02525;
+DROP TEMPORARY TABLE table_tiny_log_02525;
+
+DROP TEMPORARY TABLE IF EXISTS table_replicated_merge_tree_02525;
+CREATE TEMPORARY TABLE table_replicated_merge_tree_02525
+(
+    id UInt64,
+    info String
+)
+ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_02525/table_replicated_merge_tree_02525', 'r1')
+ORDER BY id
+PRIMARY KEY id; -- { serverError INCORRECT_QUERY }
+
+DROP TEMPORARY TABLE IF EXISTS table_keeper_map_02525;
+CREATE TEMPORARY TABLE table_keeper_map_02525
+(
+    key String,
+    value UInt32
+) Engine=KeeperMap('/' || currentDatabase() || '/test02525')
+PRIMARY KEY(key); -- { serverError INCORRECT_QUERY }
diff --git a/tests/queries/0_stateless/02534_keyed_siphash.reference b/tests/queries/0_stateless/02534_keyed_siphash.reference
index 52e92f37720..3606b9a41db 100644
--- a/tests/queries/0_stateless/02534_keyed_siphash.reference
+++ b/tests/queries/0_stateless/02534_keyed_siphash.reference
@@ -191,6 +191,6 @@ E51B38608EF25F57
 1
 1
 E28DBDE7FE22E41C
-1CE422FEE7BD8DE20000000000000000
+1
 E28DBDE7FE22E41C
-1CE422FEE7BD8DE20000000000000000
+1
diff --git a/tests/queries/0_stateless/02534_keyed_siphash.sql b/tests/queries/0_stateless/02534_keyed_siphash.sql
index 3c41efd7d58..9c914f586f0 100644
--- a/tests/queries/0_stateless/02534_keyed_siphash.sql
+++ b/tests/queries/0_stateless/02534_keyed_siphash.sql
@@ -269,6 +269,6 @@ select sipHash64Keyed(toUInt64(0), '1'); -- { serverError 48 }
 select sipHash128Keyed(toUInt64(0), '1'); -- { serverError 48 }
 
 select hex(sipHash64());
-select hex(sipHash128());
+SELECT hex(sipHash128()) = hex(reverse(unhex('1CE422FEE7BD8DE20000000000000000'))) or hex(sipHash128()) = '1CE422FEE7BD8DE20000000000000000';
 select hex(sipHash64Keyed());
-select hex(sipHash128Keyed());
+SELECT hex(sipHash128Keyed()) = hex(reverse(unhex('1CE422FEE7BD8DE20000000000000000'))) or hex(sipHash128Keyed()) = '1CE422FEE7BD8DE20000000000000000';
diff --git a/tests/queries/0_stateless/02535_analyzer_group_by_use_nulls.reference b/tests/queries/0_stateless/02535_analyzer_group_by_use_nulls.reference
new file mode 100644
index 00000000000..63610604ddd
--- /dev/null
+++ b/tests/queries/0_stateless/02535_analyzer_group_by_use_nulls.reference
@@ -0,0 +1,266 @@
+-- { echoOn }
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY ROLLUP(number, number % 2)
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=1;
+0	0	0
+0	\N	0
+1	1	1
+1	\N	1
+2	0	2
+2	\N	2
+3	1	3
+3	\N	3
+4	0	4
+4	\N	4
+5	1	5
+5	\N	5
+6	0	6
+6	\N	6
+7	1	7
+7	\N	7
+8	0	8
+8	\N	8
+9	1	9
+9	\N	9
+\N	\N	45
+set optimize_group_by_function_keys = 0;
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY ROLLUP(number, number % 2)
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=1;
+0	0	0
+0	\N	0
+1	1	1
+1	\N	1
+2	0	2
+2	\N	2
+3	1	3
+3	\N	3
+4	0	4
+4	\N	4
+5	1	5
+5	\N	5
+6	0	6
+6	\N	6
+7	1	7
+7	\N	7
+8	0	8
+8	\N	8
+9	1	9
+9	\N	9
+\N	\N	45
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY ROLLUP(number, number % 2)
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=0;
+0	0	0
+0	0	0
+0	0	45
+1	0	1
+1	1	1
+2	0	2
+2	0	2
+3	0	3
+3	1	3
+4	0	4
+4	0	4
+5	0	5
+5	1	5
+6	0	6
+6	0	6
+7	0	7
+7	1	7
+8	0	8
+8	0	8
+9	0	9
+9	1	9
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY CUBE(number, number % 2)
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=1;
+0	0	0
+0	\N	0
+1	1	1
+1	\N	1
+2	0	2
+2	\N	2
+3	1	3
+3	\N	3
+4	0	4
+4	\N	4
+5	1	5
+5	\N	5
+6	0	6
+6	\N	6
+7	1	7
+7	\N	7
+8	0	8
+8	\N	8
+9	1	9
+9	\N	9
+\N	0	20
+\N	1	25
+\N	\N	45
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY CUBE(number, number % 2)
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=0;
+0	0	0
+0	0	0
+0	0	20
+0	0	45
+0	1	25
+1	0	1
+1	1	1
+2	0	2
+2	0	2
+3	0	3
+3	1	3
+4	0	4
+4	0	4
+5	0	5
+5	1	5
+6	0	6
+6	0	6
+7	0	7
+7	1	7
+8	0	8
+8	0	8
+9	0	9
+9	1	9
+SELECT
+    number,
+    number % 2,
+    sum(number) AS val
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls = 1;
+0	\N	0
+1	\N	1
+2	\N	2
+3	\N	3
+4	\N	4
+5	\N	5
+6	\N	6
+7	\N	7
+8	\N	8
+9	\N	9
+\N	0	20
+\N	1	25
+SELECT
+    number,
+    number % 2,
+    sum(number) AS val
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls = 0;
+0	0	0
+0	0	20
+0	1	25
+1	0	1
+2	0	2
+3	0	3
+4	0	4
+5	0	5
+6	0	6
+7	0	7
+8	0	8
+9	0	9
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY ROLLUP(number, number % 2) WITH TOTALS
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=1;
+0	0	0
+0	\N	0
+1	1	1
+1	\N	1
+2	0	2
+2	\N	2
+3	1	3
+3	\N	3
+4	0	4
+4	\N	4
+5	1	5
+5	\N	5
+6	0	6
+6	\N	6
+7	1	7
+7	\N	7
+8	0	8
+8	\N	8
+9	1	9
+9	\N	9
+\N	\N	45
+
+0	0	45
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY CUBE(number, number % 2) WITH TOTALS
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=1;
+0	0	0
+0	\N	0
+1	1	1
+1	\N	1
+2	0	2
+2	\N	2
+3	1	3
+3	\N	3
+4	0	4
+4	\N	4
+5	1	5
+5	\N	5
+6	0	6
+6	\N	6
+7	1	7
+7	\N	7
+8	0	8
+8	\N	8
+9	1	9
+9	\N	9
+\N	0	20
+\N	1	25
+\N	\N	45
+
+0	0	45
+SELECT
+    number,
+    number % 2,
+    sum(number) AS val
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY 1, tuple(val)
+SETTINGS group_by_use_nulls = 1, max_bytes_before_external_sort=10;
+0	\N	0
+1	\N	1
+2	\N	2
+3	\N	3
+4	\N	4
+5	\N	5
+6	\N	6
+7	\N	7
+8	\N	8
+9	\N	9
+\N	0	20
+\N	1	25
diff --git a/tests/queries/0_stateless/02535_analyzer_group_by_use_nulls.sql b/tests/queries/0_stateless/02535_analyzer_group_by_use_nulls.sql
new file mode 100644
index 00000000000..a4d4f2f8bc9
--- /dev/null
+++ b/tests/queries/0_stateless/02535_analyzer_group_by_use_nulls.sql
@@ -0,0 +1,85 @@
+SET allow_experimental_analyzer=1;
+
+-- { echoOn }
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY ROLLUP(number, number % 2)
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=1;
+
+set optimize_group_by_function_keys = 0;
+
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY ROLLUP(number, number % 2)
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=1;
+
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY ROLLUP(number, number % 2)
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=0;
+
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY CUBE(number, number % 2)
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=1;
+
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY CUBE(number, number % 2)
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=0;
+
+SELECT
+    number,
+    number % 2,
+    sum(number) AS val
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls = 1;
+
+SELECT
+    number,
+    number % 2,
+    sum(number) AS val
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls = 0;
+
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY ROLLUP(number, number % 2) WITH TOTALS
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=1;
+
+SELECT number, number % 2, sum(number) AS val
+FROM numbers(10)
+GROUP BY CUBE(number, number % 2) WITH TOTALS
+ORDER BY (number, number % 2, val)
+SETTINGS group_by_use_nulls=1;
+
+SELECT
+    number,
+    number % 2,
+    sum(number) AS val
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY 1, tuple(val)
+SETTINGS group_by_use_nulls = 1, max_bytes_before_external_sort=10;
diff --git a/tests/queries/0_stateless/02535_max_parallel_replicas_custom_key.reference b/tests/queries/0_stateless/02535_max_parallel_replicas_custom_key.reference
new file mode 100644
index 00000000000..8d0f56ba185
--- /dev/null
+++ b/tests/queries/0_stateless/02535_max_parallel_replicas_custom_key.reference
@@ -0,0 +1,173 @@
+query='SELECT * FROM cluster(test_cluster_one_shard_three_replicas_localhost, currentDatabase(), 02535_custom_key)' with custom_key='sipHash64(x)'
+filter_type='default' max_replicas=1 prefer_localhost_replica=0
+Hello
+filter_type='default' max_replicas=2 prefer_localhost_replica=0
+Hello
+filter_type='default' max_replicas=3 prefer_localhost_replica=0
+Hello
+filter_type='range' max_replicas=1 prefer_localhost_replica=0
+Hello
+filter_type='range' max_replicas=2 prefer_localhost_replica=0
+Hello
+filter_type='range' max_replicas=3 prefer_localhost_replica=0
+Hello
+filter_type='default' max_replicas=1 prefer_localhost_replica=1
+Hello
+filter_type='default' max_replicas=2 prefer_localhost_replica=1
+Hello
+filter_type='default' max_replicas=3 prefer_localhost_replica=1
+Hello
+filter_type='range' max_replicas=1 prefer_localhost_replica=1
+Hello
+filter_type='range' max_replicas=2 prefer_localhost_replica=1
+Hello
+filter_type='range' max_replicas=3 prefer_localhost_replica=1
+Hello
+query='SELECT y, count() FROM cluster(test_cluster_one_shard_three_replicas_localhost, currentDatabase(), 02535_custom_key) GROUP BY y ORDER BY y' with custom_key='y'
+filter_type='default' max_replicas=1 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=2 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=3 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=1 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=2 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=3 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=1 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=2 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=3 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=1 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=2 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=3 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+query='SELECT y, count() FROM cluster(test_cluster_one_shard_three_replicas_localhost, currentDatabase(), 02535_custom_key) GROUP BY y ORDER BY y' with custom_key='cityHash64(y)'
+filter_type='default' max_replicas=1 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=2 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=3 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=1 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=2 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=3 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=1 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=2 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=3 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=1 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=2 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=3 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+query='SELECT y, count() FROM cluster(test_cluster_one_shard_three_replicas_localhost, currentDatabase(), 02535_custom_key) GROUP BY y ORDER BY y' with custom_key='cityHash64(y) + 1'
+filter_type='default' max_replicas=1 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=2 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=3 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=1 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=2 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=3 prefer_localhost_replica=0
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=1 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=2 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='default' max_replicas=3 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=1 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=2 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+filter_type='range' max_replicas=3 prefer_localhost_replica=1
+0	334
+1	333
+2	333
+1
diff --git a/tests/queries/0_stateless/02535_max_parallel_replicas_custom_key.sh b/tests/queries/0_stateless/02535_max_parallel_replicas_custom_key.sh
new file mode 100755
index 00000000000..9850406eb3a
--- /dev/null
+++ b/tests/queries/0_stateless/02535_max_parallel_replicas_custom_key.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# Tags: no-parallel, long
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function run_with_custom_key {
+    echo "query='$1' with custom_key='$2'"
+    for prefer_localhost_replica in 0 1; do
+        for filter_type in 'default' 'range'; do
+            for max_replicas in {1..3}; do
+                echo "filter_type='$filter_type' max_replicas=$max_replicas prefer_localhost_replica=$prefer_localhost_replica"
+                query="$1 SETTINGS max_parallel_replicas=$max_replicas\
+    , parallel_replicas_custom_key='$2'\
+    , parallel_replicas_custom_key_filter_type='$filter_type'\
+    , prefer_localhost_replica=$prefer_localhost_replica"
+                $CLICKHOUSE_CLIENT --query="$query"
+            done
+        done
+    done
+}
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS 02535_custom_key";
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE 02535_custom_key (x String) ENGINE = MergeTree ORDER BY x";
+$CLICKHOUSE_CLIENT --query="INSERT INTO 02535_custom_key VALUES ('Hello')";
+
+run_with_custom_key "SELECT * FROM cluster(test_cluster_one_shard_three_replicas_localhost, currentDatabase(), 02535_custom_key)" "sipHash64(x)"
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE 02535_custom_key"
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE 02535_custom_key (x String, y Int32) ENGINE = MergeTree ORDER BY cityHash64(x)"
+$CLICKHOUSE_CLIENT --query="INSERT INTO 02535_custom_key SELECT toString(number), number % 3 FROM numbers(1000)"
+
+function run_count_with_custom_key {
+    run_with_custom_key "SELECT y, count() FROM cluster(test_cluster_one_shard_three_replicas_localhost, currentDatabase(), 02535_custom_key) GROUP BY y ORDER BY y" "$1"
+}
+
+run_count_with_custom_key "y"
+run_count_with_custom_key "cityHash64(y)"
+run_count_with_custom_key "cityHash64(y) + 1"
+
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM cluster(test_cluster_one_shard_three_replicas_localhost, currentDatabase(), 02535_custom_key) as t1 JOIN 02535_custom_key USING y" --parallel_replicas_custom_key="y" --send_logs_level="trace" 2>&1 | grep -Fac "JOINs are not supported with"
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE 02535_custom_key"
diff --git a/tests/queries/0_stateless/02536_distributed_detach_table.reference b/tests/queries/0_stateless/02536_distributed_detach_table.reference
new file mode 100644
index 00000000000..f09bace4421
--- /dev/null
+++ b/tests/queries/0_stateless/02536_distributed_detach_table.reference
@@ -0,0 +1,2 @@
+0	0
+10	20
diff --git a/tests/queries/0_stateless/02536_distributed_detach_table.sql b/tests/queries/0_stateless/02536_distributed_detach_table.sql
new file mode 100644
index 00000000000..92bee1ee544
--- /dev/null
+++ b/tests/queries/0_stateless/02536_distributed_detach_table.sql
@@ -0,0 +1,16 @@
+-- test detach distributed table with pending files
+CREATE TABLE test_02536 (n Int8) ENGINE=MergeTree() ORDER BY tuple();
+CREATE TABLE test_dist_02536 (n Int8) ENGINE=Distributed(test_cluster_two_shards, currentDatabase(), test_02536, rand());
+SYSTEM STOP DISTRIBUTED SENDS test_dist_02536;
+
+INSERT INTO test_dist_02536 SELECT number FROM numbers(5) SETTINGS prefer_localhost_replica=0;
+SELECT count(n), sum(n) FROM test_dist_02536; -- 0 0
+
+DETACH TABLE test_dist_02536;
+ATTACH TABLE test_dist_02536;
+
+SYSTEM FLUSH DISTRIBUTED test_dist_02536;
+
+SELECT count(n), sum(n) FROM test_dist_02536; -- 10 20
+DROP TABLE test_02536;
+DROP TABLE test_dist_02536;
diff --git a/tests/queries/0_stateless/02536_replace_with_nonconst_needle_and_replacement.reference b/tests/queries/0_stateless/02536_replace_with_nonconst_needle_and_replacement.reference
new file mode 100644
index 00000000000..5e50b9e6cbf
--- /dev/null
+++ b/tests/queries/0_stateless/02536_replace_with_nonconst_needle_and_replacement.reference
@@ -0,0 +1,137 @@
+** replaceAll() **
+- non-const needle, const replacement
+1	Hello World	l	x	Hexxo Worxd
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hello World
+5	Hello World	.	x	Hello World
+1	Hello World	l	x	Hexxo Worxd
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hello World
+5	Hello World	.	x	Hello World
+- const needle, non-const replacement
+1	Hello World	l	xx	Hexxxxo Worxxd
+2	Hello World	l	x	Hexxo Worxd
+3	Hello World	l	x	Hexxo Worxd
+4	Hello World	l	x	Hexxo Worxd
+5	Hello World	l	x	Hexxo Worxd
+1	Hello World	l	xx	Hexxxxo Worxxd
+2	Hello World	l	x	Hexxo Worxd
+3	Hello World	l	x	Hexxo Worxd
+4	Hello World	l	x	Hexxo Worxd
+5	Hello World	l	x	Hexxo Worxd
+- non-const needle, non-const replacement
+1	Hello World	l	xx	Hexxxxo Worxxd
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hello World
+5	Hello World	.	x	Hello World
+1	Hello World	l	xx	Hexxxxo Worxxd
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hello World
+5	Hello World	.	x	Hello World
+** replaceOne() **
+- non-const needle, const replacement
+1	Hello World	l	x	Hexlo World
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hello World
+5	Hello World	.	x	Hello World
+1	Hello World	l	x	Hexlo World
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hello World
+5	Hello World	.	x	Hello World
+- const needle, non-const replacement
+1	Hello World	l	xx	Hexxlo World
+2	Hello World	l	x	Hexlo World
+3	Hello World	l	x	Hexlo World
+4	Hello World	l	x	Hexlo World
+5	Hello World	l	x	Hexlo World
+1	Hello World	l	xx	Hexxlo World
+2	Hello World	l	x	Hexlo World
+3	Hello World	l	x	Hexlo World
+4	Hello World	l	x	Hexlo World
+5	Hello World	l	x	Hexlo World
+- non-const needle, non-const replacement
+1	Hello World	l	xx	Hexxlo World
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hello World
+5	Hello World	.	x	Hello World
+1	Hello World	l	xx	Hexxlo World
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hello World
+5	Hello World	.	x	Hello World
+** replaceRegexpAll() **
+- non-const needle, const replacement
+1	Hello World	l	x	Hexxo Worxd
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hxllx Wxrld
+5	Hello World	.	x	xxxxxxxxxxx
+1	Hello World	l	x	Hexxo Worxd
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hxllx Wxrld
+5	Hello World	.	x	xxxxxxxxxxx
+- const needle, non-const replacement
+1	Hello World	l	xx	Hexxxxo Worxxd
+2	Hello World	l	x	Hexxo Worxd
+3	Hello World	l	x	Hexxo Worxd
+4	Hello World	l	x	Hexxo Worxd
+5	Hello World	l	x	Hexxo Worxd
+1	Hello World	l	xx	Hexxxxo Worxxd
+2	Hello World	l	x	Hexxo Worxd
+3	Hello World	l	x	Hexxo Worxd
+4	Hello World	l	x	Hexxo Worxd
+5	Hello World	l	x	Hexxo Worxd
+- non-const needle, non-const replacement
+1	Hello World	l	xx	Hexxxxo Worxxd
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hxllx Wxrld
+5	Hello World	.	x	xxxxxxxxxxx
+1	Hello World	l	xx	Hexxxxo Worxxd
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hxllx Wxrld
+5	Hello World	.	x	xxxxxxxxxxx
+** replaceRegexpOne() **
+- non-const needle, const replacement
+1	Hello World	l	x	Hexlo World
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hxllo World
+5	Hello World	.	x	xello World
+1	Hello World	l	x	Hexlo World
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hxllo World
+5	Hello World	.	x	xello World
+- const needle, non-const replacement
+1	Hello World	l	xx	Hexxlo World
+2	Hello World	l	x	Hexlo World
+3	Hello World	l	x	Hexlo World
+4	Hello World	l	x	Hexlo World
+5	Hello World	l	x	Hexlo World
+1	Hello World	l	xx	Hexxlo World
+2	Hello World	l	x	Hexlo World
+3	Hello World	l	x	Hexlo World
+4	Hello World	l	x	Hexlo World
+5	Hello World	l	x	Hexlo World
+- non-const needle, non-const replacement
+1	Hello World	l	xx	Hexxlo World
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hxllo World
+5	Hello World	.	x	xello World
+1	Hello World	l	xx	Hexxlo World
+2	Hello World	ll	x	Hexo World
+3	Hello World	not_found	x	Hello World
+4	Hello World	[eo]	x	Hxllo World
+5	Hello World	.	x	xello World
+Check that an exception is thrown if the needle is empty
diff --git a/tests/queries/0_stateless/02536_replace_with_nonconst_needle_and_replacement.sql b/tests/queries/0_stateless/02536_replace_with_nonconst_needle_and_replacement.sql
new file mode 100644
index 00000000000..926bde3a74b
--- /dev/null
+++ b/tests/queries/0_stateless/02536_replace_with_nonconst_needle_and_replacement.sql
@@ -0,0 +1,100 @@
+-- Tests that functions replaceOne(), replaceAll(), replaceRegexpOne(), replaceRegexpAll() work with with non-const pattern and replacement arguments
+
+DROP TABLE IF EXISTS test_tab;
+
+CREATE TABLE test_tab
+  (id UInt32, haystack String, needle String, replacement String)
+  engine = MergeTree()
+  ORDER BY id;
+
+INSERT INTO test_tab VALUES (1, 'Hello World', 'l', 'xx') (2, 'Hello World', 'll', 'x') (3, 'Hello World', 'not_found', 'x') (4, 'Hello World', '[eo]', 'x') (5, 'Hello World', '.', 'x')
+
+
+SELECT '** replaceAll() **';
+
+SELECT '- non-const needle, const replacement';
+SELECT id, haystack, needle, 'x', replaceAll(haystack, needle, 'x') FROM test_tab ORDER BY id;
+SELECT id, haystack, needle, 'x', replaceAll('Hello World', needle, 'x') FROM test_tab ORDER BY id;
+
+SELECT '- const needle, non-const replacement';
+SELECT id, haystack, 'l', replacement, replaceAll(haystack, 'l', replacement) FROM test_tab ORDER BY id;
+SELECT id, haystack, 'l', replacement, replaceAll('Hello World', 'l', replacement) FROM test_tab ORDER BY id;
+
+SELECT '- non-const needle, non-const replacement';
+SELECT id, haystack, needle, replacement, replaceAll(haystack, needle, replacement) FROM test_tab ORDER BY id;
+SELECT id, haystack, needle, replacement, replaceAll('Hello World', needle, replacement) FROM test_tab ORDER BY id;
+
+
+SELECT '** replaceOne() **';
+
+SELECT '- non-const needle, const replacement';
+SELECT id, haystack, needle, 'x', replaceOne(haystack, needle, 'x') FROM test_tab ORDER BY id;
+SELECT id, haystack, needle, 'x', replaceOne('Hello World', needle, 'x') FROM test_tab ORDER BY id;
+
+SELECT '- const needle, non-const replacement';
+SELECT id, haystack, 'l', replacement, replaceOne(haystack, 'l', replacement) FROM test_tab ORDER BY id;
+SELECT id, haystack, 'l', replacement, replaceOne('Hello World', 'l', replacement) FROM test_tab ORDER BY id;
+
+SELECT '- non-const needle, non-const replacement';
+SELECT id, haystack, needle, replacement, replaceOne(haystack, needle, replacement) FROM test_tab ORDER BY id;
+SELECT id, haystack, needle, replacement, replaceOne('Hello World', needle, replacement) FROM test_tab ORDER BY id;
+
+SELECT '** replaceRegexpAll() **';
+
+SELECT '- non-const needle, const replacement';
+SELECT id, haystack, needle, 'x', replaceRegexpAll(haystack, needle, 'x') FROM test_tab ORDER BY id;
+SELECT id, haystack, needle, 'x', replaceRegexpAll('Hello World', needle, 'x') FROM test_tab ORDER BY id;
+
+SELECT '- const needle, non-const replacement';
+SELECT id, haystack, 'l', replacement, replaceRegexpAll(haystack, 'l', replacement) FROM test_tab ORDER BY id;
+SELECT id, haystack, 'l', replacement, replaceRegexpAll('Hello World', 'l', replacement) FROM test_tab ORDER BY id;
+
+SELECT '- non-const needle, non-const replacement';
+SELECT id, haystack, needle, replacement, replaceRegexpAll(haystack, needle, replacement) FROM test_tab ORDER BY id;
+SELECT id, haystack, needle, replacement, replaceRegexpAll('Hello World', needle, replacement) FROM test_tab ORDER BY id;
+
+SELECT '** replaceRegexpOne() **';
+
+SELECT '- non-const needle, const replacement';
+SELECT id, haystack, needle, 'x', replaceRegexpOne(haystack, needle, 'x') FROM test_tab ORDER BY id;
+SELECT id, haystack, needle, 'x', replaceRegexpOne('Hello World', needle, 'x') FROM test_tab ORDER BY id;
+
+SELECT '- const needle, non-const replacement';
+SELECT id, haystack, 'l', replacement, replaceRegexpOne(haystack, 'l', replacement) FROM test_tab ORDER BY id;
+SELECT id, haystack, 'l', replacement, replaceRegexpOne('Hello World', 'l', replacement) FROM test_tab ORDER BY id;
+
+SELECT '- non-const needle, non-const replacement';
+SELECT id, haystack, needle, replacement, replaceRegexpOne(haystack, needle, replacement) FROM test_tab ORDER BY id;
+SELECT id, haystack, needle, replacement, replaceRegexpOne('Hello World', needle, replacement) FROM test_tab ORDER BY id;
+
+DROP TABLE IF EXISTS test_tab;
+
+
+SELECT 'Check that an exception is thrown if the needle is empty';
+
+CREATE TABLE test_tab
+  (id UInt32, haystack String, needle String, replacement String)
+  engine = MergeTree()
+  ORDER BY id;
+
+INSERT INTO test_tab VALUES (1, 'Hello World', 'l', 'x') (2, 'Hello World', '', 'y')
+
+-- needle: non-const, replacement: const
+SELECT replaceAll(haystack, needle, 'x') FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+SELECT replaceOne(haystack, needle, 'x') FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+SELECT replaceRegexpAll(haystack, needle, 'x') FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+SELECT replaceRegexpOne(haystack, needle, 'x') FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+
+-- needle: const, replacement: non-const
+SELECT replaceAll(haystack, '', replacement) FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+SELECT replaceOne(haystack, '', replacement) FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+SELECT replaceRegexpAll(haystack, '', replacement) FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+SELECT replaceRegexpOne(haystack, '', replacement) FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+
+-- needle: non-const, replacement: non-const
+SELECT replaceAll(haystack, needle, replacement) FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+SELECT replaceOne(haystack, needle, replacement) FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+SELECT replaceRegexpAll(haystack, needle, replacement) FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+SELECT replaceRegexpOne(haystack, needle, replacement) FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
+
+DROP TABLE IF EXISTS test_tab;
diff --git a/tests/queries/0_stateless/02537_distributed_loosing_files_after_exception.reference b/tests/queries/0_stateless/02537_distributed_loosing_files_after_exception.reference
new file mode 100644
index 00000000000..7793e91fcb6
--- /dev/null
+++ b/tests/queries/0_stateless/02537_distributed_loosing_files_after_exception.reference
@@ -0,0 +1,16 @@
+monitor_batch_insert=0
+1	2
+1	0
+-- { echoOn }
+SELECT sum(key), count(key) FROM dist;
+2	2
+SELECT sum(key), count(key) FROM underlying;
+2	2
+monitor_batch_insert=1
+1	2
+1	0
+-- { echoOn }
+SELECT sum(key), count(key) FROM dist;
+2	2
+SELECT sum(key), count(key) FROM underlying;
+2	2
diff --git a/tests/queries/0_stateless/02537_distributed_loosing_files_after_exception.sql.j2 b/tests/queries/0_stateless/02537_distributed_loosing_files_after_exception.sql.j2
new file mode 100644
index 00000000000..4f8cf1ccffe
--- /dev/null
+++ b/tests/queries/0_stateless/02537_distributed_loosing_files_after_exception.sql.j2
@@ -0,0 +1,32 @@
+{% for setting in [0, 1] %}
+-- Testing that distributed table doesn't loose file after inserts which contain errors
+
+SELECT 'monitor_batch_insert={{ setting }}';
+
+DROP TABLE IF EXISTS dist;
+DROP TABLE IF EXISTS underlying;
+
+CREATE TABLE dist (key Int) ENGINE=Distributed(test_shard_localhost, currentDatabase(), underlying) SETTINGS monitor_batch_inserts={{ setting }};
+SYSTEM STOP DISTRIBUTED SENDS dist;
+
+INSERT INTO dist SETTINGS prefer_localhost_replica=0, max_threads=1 VALUES (1);
+INSERT INTO dist SETTINGS prefer_localhost_replica=0, max_threads=2 VALUES (1);
+
+SYSTEM FLUSH DISTRIBUTED dist; -- { serverError UNKNOWN_TABLE }
+-- check the second since after using queue it may got lost from it
+SYSTEM FLUSH DISTRIBUTED dist; -- { serverError UNKNOWN_TABLE }
+
+SELECT is_blocked, data_files FROM system.distribution_queue WHERE database = currentDatabase() AND table = 'dist';
+
+CREATE TABLE underlying (key Int) ENGINE=Memory();
+SYSTEM FLUSH DISTRIBUTED dist;
+
+-- all data should be flushed
+SELECT is_blocked, data_files FROM system.distribution_queue WHERE database = currentDatabase() AND table = 'dist';
+
+-- { echoOn }
+SELECT sum(key), count(key) FROM dist;
+SELECT sum(key), count(key) FROM underlying;
+-- { echoOff }
+
+{% endfor %}
diff --git a/tests/queries/0_stateless/02538_alter_rename_sequence.reference b/tests/queries/0_stateless/02538_alter_rename_sequence.reference
new file mode 100644
index 00000000000..73aa1b7e8d8
--- /dev/null
+++ b/tests/queries/0_stateless/02538_alter_rename_sequence.reference
@@ -0,0 +1,8 @@
+1	2	3
+4	5	6
+{"column1_renamed":"1","column2_renamed":"2","column3":"3"}
+{"column1_renamed":"4","column2_renamed":"5","column3":"6"}
+1	2	3
+4	5	6
+{"column1_renamed":"1","column2_renamed":"2","column3":"3"}
+{"column1_renamed":"4","column2_renamed":"5","column3":"6"}
diff --git a/tests/queries/0_stateless/02538_alter_rename_sequence.sql b/tests/queries/0_stateless/02538_alter_rename_sequence.sql
new file mode 100644
index 00000000000..d7df27dc702
--- /dev/null
+++ b/tests/queries/0_stateless/02538_alter_rename_sequence.sql
@@ -0,0 +1,59 @@
+DROP TABLE IF EXISTS wrong_metadata;
+
+CREATE TABLE wrong_metadata(
+    column1 UInt64,
+    column2 UInt64,
+    column3 UInt64
+)
+ENGINE ReplicatedMergeTree('/test/{database}/tables/wrong_metadata', '1')
+ORDER BY tuple();
+
+INSERT INTO wrong_metadata VALUES (1, 2, 3);
+
+SYSTEM STOP REPLICATION QUEUES wrong_metadata;
+
+ALTER TABLE wrong_metadata RENAME COLUMN column1 TO column1_renamed SETTINGS replication_alter_partitions_sync = 0;
+
+INSERT INTO wrong_metadata VALUES (4, 5, 6);
+
+SELECT * FROM wrong_metadata ORDER BY column1;
+
+SYSTEM START REPLICATION QUEUES wrong_metadata;
+
+SYSTEM SYNC REPLICA wrong_metadata;
+
+ALTER TABLE wrong_metadata RENAME COLUMN column2 to column2_renamed SETTINGS replication_alter_partitions_sync = 2;
+
+SELECT * FROM wrong_metadata ORDER BY column1_renamed FORMAT JSONEachRow;
+
+DROP TABLE IF EXISTS wrong_metadata;
+
+
+CREATE TABLE wrong_metadata_wide(
+    column1 UInt64,
+    column2 UInt64,
+    column3 UInt64
+)
+ENGINE ReplicatedMergeTree('/test/{database}/tables/wrong_metadata_wide', '1')
+ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0;
+
+INSERT INTO wrong_metadata_wide VALUES (1, 2, 3);
+
+SYSTEM STOP REPLICATION QUEUES wrong_metadata_wide;
+
+ALTER TABLE wrong_metadata_wide RENAME COLUMN column1 TO column1_renamed SETTINGS replication_alter_partitions_sync = 0;
+
+INSERT INTO wrong_metadata_wide VALUES (4, 5, 6);
+
+SELECT * FROM wrong_metadata_wide ORDER by column1;
+
+SYSTEM START REPLICATION QUEUES wrong_metadata_wide;
+
+SYSTEM SYNC REPLICA wrong_metadata_wide;
+
+ALTER TABLE wrong_metadata_wide RENAME COLUMN column2 to column2_renamed SETTINGS replication_alter_partitions_sync = 2;
+
+SELECT * FROM wrong_metadata_wide ORDER BY column1_renamed FORMAT JSONEachRow;
+
+DROP TABLE IF EXISTS wrong_metadata_wide;
diff --git a/tests/queries/0_stateless/02540_duplicate_primary_key.sql b/tests/queries/0_stateless/02540_duplicate_primary_key.sql
index 322b6d74845..a084d76964b 100644
--- a/tests/queries/0_stateless/02540_duplicate_primary_key.sql
+++ b/tests/queries/0_stateless/02540_duplicate_primary_key.sql
@@ -90,16 +90,16 @@ ORDER BY (coverage, situation_name, NAME_toe, NAME_cockroach);
 
 insert into test select * from generateRandom() limit 10;
 
-with dissonance as ( 
-    Select cast(toStartOfInterval(coverage, INTERVAL 1 day) as Date) as flour, count() as regulation 
+with dissonance as (
+    Select cast(toStartOfInterval(coverage, INTERVAL 1 day) as Date) as flour, count() as regulation
     from test
-    group by flour having flour >= toDate(now())-100 
+    group by flour having flour >= toDate(now())-100
     ),
-cheetah as ( 
-    Select flour, regulation from dissonance 
-    union distinct 
-    Select toDate(now())-1, ifnull((select regulation from dissonance where flour = toDate(now())-1),0) as regulation 
-) 
+cheetah as (
+    Select flour, regulation from dissonance
+    union distinct
+    Select toDate(now())-1, ifnull((select regulation from dissonance where flour = toDate(now())-1),0) as regulation
+)
 Select flour, regulation from cheetah order by flour with fill step 1 limit 100 format Null;
 
 drop table test;
diff --git a/tests/queries/0_stateless/02540_duplicate_primary_key2.reference b/tests/queries/0_stateless/02540_duplicate_primary_key2.reference
new file mode 100644
index 00000000000..08839f6bb29
--- /dev/null
+++ b/tests/queries/0_stateless/02540_duplicate_primary_key2.reference
@@ -0,0 +1 @@
+200
diff --git a/tests/queries/0_stateless/02540_duplicate_primary_key2.sql b/tests/queries/0_stateless/02540_duplicate_primary_key2.sql
new file mode 100644
index 00000000000..d0f02a894f2
--- /dev/null
+++ b/tests/queries/0_stateless/02540_duplicate_primary_key2.sql
@@ -0,0 +1,99 @@
+drop table if exists test;
+
+set allow_suspicious_low_cardinality_types = 1;
+
+CREATE TABLE test
+(
+    `timestamp` DateTime,
+    `latitude` Nullable(Float32) CODEC(Gorilla, ZSTD(1)),
+    `longitude` Nullable(Float32) CODEC(Gorilla, ZSTD(1)),
+    `xxxx1` LowCardinality(UInt8),
+    `xxxx2` LowCardinality(Nullable(Int16)),
+    `xxxx3` LowCardinality(Nullable(Int16)),
+    `xxxx4` Nullable(Int32),
+    `xxxx5` LowCardinality(Nullable(Int32)),
+    `xxxx6` Nullable(Int32),
+    `xxxx7` Nullable(Int32),
+    `xxxx8` LowCardinality(Int32),
+    `xxxx9` LowCardinality(Nullable(Int16)),
+    `xxxx10` LowCardinality(Nullable(Int16)),
+    `xxxx11` LowCardinality(Nullable(Int16)),
+    `xxxx12` LowCardinality(String),
+    `xxxx13` Nullable(Float32),
+    `xxxx14` LowCardinality(String),
+    `xxxx15` LowCardinality(Nullable(String)),
+    `xxxx16` LowCardinality(String),
+    `xxxx17` LowCardinality(String),
+    `xxxx18` FixedString(19),
+    `xxxx19` FixedString(17),
+    `xxxx20` LowCardinality(UInt8),
+    `xxxx21` LowCardinality(Nullable(Int16)),
+    `xxxx22` LowCardinality(Nullable(Int16)),
+    `xxxx23` LowCardinality(Nullable(Int16)),
+    `xxxx24` LowCardinality(Nullable(Int16)),
+    `xxxx25` LowCardinality(Nullable(Int16)),
+    `xxxx26` LowCardinality(Nullable(Int16)),
+    `xxxx27` Nullable(Float32),
+    `xxxx28` LowCardinality(Nullable(String)),
+    `xxxx29` LowCardinality(String),
+    `xxxx30` LowCardinality(String),
+    `xxxx31` LowCardinality(Nullable(String)),
+    `xxxx32` UInt64,
+    PROJECTION cumsum_projection_simple
+    (
+        SELECT
+            xxxx1,
+            toStartOfInterval(timestamp, toIntervalMonth(1)),
+            toStartOfWeek(timestamp, 8),
+            toStartOfInterval(timestamp, toIntervalDay(1)),
+            xxxx17,
+            xxxx16,
+            xxxx14,
+            xxxx9,
+            xxxx10,
+            xxxx21,
+            xxxx22,
+            xxxx11,
+            sum(multiIf(xxxx21 IS NULL, 0, 1)),
+            sum(multiIf(xxxx22 IS NULL, 0, 1)),
+            sum(multiIf(xxxx23 IS NULL, 0, 1)),
+            max(toStartOfInterval(timestamp, toIntervalDay(1))),
+            max(CAST(CAST(toStartOfInterval(timestamp, toIntervalDay(1)), 'Nullable(DATE)'), 'Nullable(TIMESTAMP)')),
+            min(toStartOfInterval(timestamp, toIntervalDay(1))),
+            min(CAST(CAST(toStartOfInterval(timestamp, toIntervalDay(1)), 'Nullable(DATE)'), 'Nullable(TIMESTAMP)')),
+            count(),
+            sum(1),
+            COUNTDistinct(xxxx16),
+            COUNTDistinct(xxxx31),
+            COUNTDistinct(xxxx14),
+            COUNTDistinct(CAST(toStartOfInterval(timestamp, toIntervalDay(1)), 'Nullable(DATE)'))
+        GROUP BY
+            xxxx1,
+            toStartOfInterval(timestamp, toIntervalMonth(1)),
+            toStartOfWeek(timestamp, 8),
+            toStartOfInterval(timestamp, toIntervalDay(1)),
+            xxxx1,
+            toStartOfInterval(timestamp, toIntervalMonth(1)),
+            toStartOfWeek(timestamp, 8),
+            toStartOfInterval(timestamp, toIntervalDay(1)),
+            xxxx17,
+            xxxx16,
+            xxxx14,
+            xxxx9,
+            xxxx10,
+            xxxx21,
+            xxxx22,
+            xxxx11
+    )
+)
+ENGINE = MergeTree
+PARTITION BY toYYYYMM(timestamp)
+ORDER BY (xxxx17, xxxx14, xxxx16, toStartOfDay(timestamp), left(xxxx19, 10), timestamp);
+
+INSERT INTO test SELECT * replace 1 as xxxx16 replace 1 as xxxx1 replace '2022-02-02 01:00:00' as timestamp replace 'Airtel' as xxxx14 FROM generateRandom() LIMIT 100;
+INSERT INTO test SELECT * replace 1 as xxxx16 replace 1 as xxxx1 replace '2022-02-02 01:00:00' as timestamp replace 'BSNL' as xxxx14 FROM generateRandom() LIMIT 100;
+INSERT INTO test SELECT * replace 1 as xxxx16 replace 1 as xxxx1 replace '2022-02-02 01:00:00' as timestamp replace 'xxx' as xxxx14 FROM generateRandom() LIMIT 100;
+
+select sum(1) from test where toStartOfInterval(timestamp, INTERVAL 1 day) >= TIMESTAMP '2022-02-01 01:00:00' and xxxx14 in ('Airtel', 'BSNL') and xxxx1 = 1 GROUP BY xxxx16;
+
+drop table test;
diff --git a/tests/queries/0_stateless/02542_case_no_else.reference b/tests/queries/0_stateless/02542_case_no_else.reference
new file mode 100644
index 00000000000..8f3fdf29168
--- /dev/null
+++ b/tests/queries/0_stateless/02542_case_no_else.reference
@@ -0,0 +1,3 @@
+2
+1	Z
+1	Z
diff --git a/tests/queries/0_stateless/02542_case_no_else.sql b/tests/queries/0_stateless/02542_case_no_else.sql
new file mode 100644
index 00000000000..0c7975a750e
--- /dev/null
+++ b/tests/queries/0_stateless/02542_case_no_else.sql
@@ -0,0 +1,14 @@
+SELECT CASE 1 WHEN 1 THEN 2 END;
+
+SELECT id,
+    CASE id
+         WHEN 1 THEN 'Z'
+    END x
+FROM  (SELECT 1 as id);
+
+SELECT id,
+       CASE id
+            WHEN 1 THEN 'Z'
+            ELSE 'X'
+     END x
+FROM  (SELECT 1 as id);
diff --git a/tests/queries/0_stateless/02542_transform_new.reference b/tests/queries/0_stateless/02542_transform_new.reference
new file mode 100644
index 00000000000..b6eaa692c41
--- /dev/null
+++ b/tests/queries/0_stateless/02542_transform_new.reference
@@ -0,0 +1,32 @@
+1
+1
+1
+1
+9
+9
+\N
+7
+1
+9
+7
+b
+b
+b
+b
+a
+a
+\N
+c
+sep1
+80000
+80000
+sep2
+80000
+80000
+sep3
+1
+sep4
+8000
+sep5
+8000
+sep6
diff --git a/tests/queries/0_stateless/02542_transform_new.sql b/tests/queries/0_stateless/02542_transform_new.sql
new file mode 100644
index 00000000000..43da0a50731
--- /dev/null
+++ b/tests/queries/0_stateless/02542_transform_new.sql
@@ -0,0 +1,35 @@
+select transform(2, [1,2], [9,1], materialize(null));
+select transform(2, [1,2], [9,1], materialize(7));
+select transform(2, [1,2], [9,1], null);
+select transform(2, [1,2], [9,1], 7);
+select transform(1, [1,2], [9,1], null);
+select transform(1, [1,2], [9,1], 7);
+select transform(5, [1,2], [9,1], null);
+select transform(5, [1,2], [9,1], 7);
+select transform(2, [1,2], [9,1]);
+select transform(1, [1,2], [9,1]);
+select transform(7, [1,2], [9,1]);
+
+select transform(2, [1,2], ['a','b'], materialize(null));
+select transform(2, [1,2], ['a','b'], materialize('c'));
+select transform(2, [1,2], ['a','b'], null);
+select transform(2, [1,2], ['a','b'], 'c');
+select transform(1, [1,2], ['a','b'], null);
+select transform(1, [1,2], ['a','b'], 'c');
+select transform(5, [1,2], ['a','b'], null);
+select transform(5, [1,2], ['a','b'], 'c');
+
+select 'sep1';
+SELECT transform(number, [2], [toDecimal32(1, 1)], materialize(80000)) as x FROM numbers(2);
+select 'sep2';
+SELECT transform(number, [2], [toDecimal32(1, 1)], 80000) as x FROM numbers(2);
+select 'sep3';
+SELECT transform(toDecimal32(2, 1), [toDecimal32(2, 1)], [1]);
+select 'sep4';
+SELECT transform(8000, [1], [toDecimal32(2, 1)]);
+select 'sep5';
+SELECT transform(toDecimal32(8000,0), [1], [toDecimal32(2, 1)]);
+select 'sep6';
+SELECT transform(-9223372036854775807, [-1], [toDecimal32(1024, 3)]) FROM system.numbers LIMIT 7; -- { serverError BAD_ARGUMENTS }
+SELECT [NULL, NULL, NULL, NULL], transform(number, [2147483648], [toDecimal32(1, 2)]) AS x FROM numbers(257) WHERE materialize(10); -- { serverError BAD_ARGUMENTS }
+SELECT transform(-2147483649, [1], [toDecimal32(1, 2)]) GROUP BY [1] WITH TOTALS; -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/02542_transform_old.reference b/tests/queries/0_stateless/02542_transform_old.reference
new file mode 100644
index 00000000000..d03b17d40a3
--- /dev/null
+++ b/tests/queries/0_stateless/02542_transform_old.reference
@@ -0,0 +1,72 @@
+google
+other
+yahoo
+yandex
+#1
+20
+21
+22
+29
+#2
+0
+1
+3
+5
+7
+8
+9
+20
+21
+29
+#3
+20
+21
+22
+29
+#4
+google
+other
+yahoo
+yandex
+#5
+0
+1
+3
+5
+7
+8
+9
+google
+yahoo
+yandex
+----
+google
+other
+yahoo
+yandex
+#1
+20
+21
+22
+29
+#3
+20
+21
+22
+29
+#4
+google
+other
+yahoo
+yandex
+----
+2000
+2100
+2200
+2900
+#1
+2000
+2100
+2200
+2900
+----
diff --git a/tests/queries/0_stateless/02542_transform_old.sql b/tests/queries/0_stateless/02542_transform_old.sql
new file mode 100644
index 00000000000..01a960ec367
--- /dev/null
+++ b/tests/queries/0_stateless/02542_transform_old.sql
@@ -0,0 +1,25 @@
+SELECT transform(number, [2, 4, 6], ['google', 'yandex', 'yahoo'], 'other') as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '#1';
+SELECT transform(number, [2, 4, 6], [29, 20, 21], 22) as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '#2';
+SELECT transform(number, [2, 4, 6], [29, 20, 21]) as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '#3';
+SELECT transform(toString(number), ['2', '4', '6'], [29, 20, 21], 22) as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '#4';
+SELECT transform(toString(number), ['2', '4', '6'], ['google', 'yandex', 'yahoo'], 'other') as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '#5';
+SELECT transform(toString(number), ['2', '4', '6'], ['google', 'yandex', 'yahoo']) as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '----';
+SELECT transform(number, [2, 4, 6], ['google', 'yandex', 'yahoo'], materialize('other')) as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '#1';
+SELECT transform(number, [2, 4, 6], [29, 20, 21], materialize(22)) as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '#3';
+SELECT transform(toString(number), ['2', '4', '6'], [29, 20, 21], materialize(22)) as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '#4';
+SELECT transform(toString(number), ['2', '4', '6'], ['google', 'yandex', 'yahoo'], materialize('other')) as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '----';
+SELECT transform(number, [2, 4, 6], [2900, 2000, 2100], 2200) as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '#1';
+SELECT transform(number, [2, 4, 6], [2900, 2000, 2100], materialize(2200)) as x FROM numbers(10) GROUP BY x ORDER BY x;
+SELECT '----';
+SELECT transform(number, [1], [null]) FROM system.numbers LIMIT 1; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/02543_alter_rename_modify_stuck.reference b/tests/queries/0_stateless/02543_alter_rename_modify_stuck.reference
new file mode 100644
index 00000000000..156128e3dd2
--- /dev/null
+++ b/tests/queries/0_stateless/02543_alter_rename_modify_stuck.reference
@@ -0,0 +1 @@
+{"v":"1","v2":"77"}
diff --git a/tests/queries/0_stateless/02543_alter_rename_modify_stuck.sh b/tests/queries/0_stateless/02543_alter_rename_modify_stuck.sh
new file mode 100755
index 00000000000..adaf1846552
--- /dev/null
+++ b/tests/queries/0_stateless/02543_alter_rename_modify_stuck.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS table_to_rename"
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE table_to_rename(v UInt64, v1 UInt64)ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0"
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO table_to_rename VALUES (1, 1)"
+
+
+# we want to following mutations to stuck
+# That is why we stop merges and wait in loops until they actually start
+$CLICKHOUSE_CLIENT --query="SYSTEM STOP MERGES table_to_rename"
+
+$CLICKHOUSE_CLIENT --query="ALTER TABLE table_to_rename RENAME COLUMN v1 to v2" &
+
+counter=0 retries=60
+
+I=0
+while [[ $counter -lt $retries ]]; do
+    I=$((I + 1))
+    result=$($CLICKHOUSE_CLIENT --query "show create table table_to_rename")
+    if [[ $result == *"v2"* ]]; then
+        break;
+    fi
+    sleep 0.1
+    ((++counter))
+done
+
+
+$CLICKHOUSE_CLIENT --query="ALTER TABLE table_to_rename UPDATE v2 = 77 WHERE 1 = 1 SETTINGS mutations_sync = 2" &
+
+counter=0 retries=60
+
+I=0
+while [[ $counter -lt $retries ]]; do
+    I=$((I + 1))
+    result=$($CLICKHOUSE_CLIENT --query "SELECT count() from system.mutations where database='${CLICKHOUSE_DATABASE}' and table='table_to_rename'")
+    if [[ $result == "2" ]]; then
+        break;
+    fi
+    sleep 0.1
+    ((++counter))
+done
+
+
+$CLICKHOUSE_CLIENT --query="SYSTEM START MERGES table_to_rename"
+
+wait
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM table_to_rename FORMAT JSONEachRow"
+
+
+ $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS table_to_rename"
diff --git a/tests/queries/0_stateless/02543_alter_update_rename_stuck.reference b/tests/queries/0_stateless/02543_alter_update_rename_stuck.reference
new file mode 100644
index 00000000000..156128e3dd2
--- /dev/null
+++ b/tests/queries/0_stateless/02543_alter_update_rename_stuck.reference
@@ -0,0 +1 @@
+{"v":"1","v2":"77"}
diff --git a/tests/queries/0_stateless/02543_alter_update_rename_stuck.sh b/tests/queries/0_stateless/02543_alter_update_rename_stuck.sh
new file mode 100755
index 00000000000..e801fbedab7
--- /dev/null
+++ b/tests/queries/0_stateless/02543_alter_update_rename_stuck.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS table_to_rename"
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE table_to_rename(v UInt64, v1 UInt64)ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0"
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO table_to_rename VALUES (1, 1)"
+
+
+# we want to following mutations to stuck
+# That is why we stop merges and wait in loops until they actually start
+$CLICKHOUSE_CLIENT --query="SYSTEM STOP MERGES table_to_rename"
+
+$CLICKHOUSE_CLIENT --query="ALTER TABLE table_to_rename UPDATE v1 = 77 WHERE 1 = 1 SETTINGS mutations_sync = 2" &
+
+counter=0 retries=60
+
+I=0
+while [[ $counter -lt $retries ]]; do
+    I=$((I + 1))
+    result=$($CLICKHOUSE_CLIENT --query "SELECT count() from system.mutations where database='${CLICKHOUSE_DATABASE}' and table='table_to_rename'")
+    if [[ $result == "1" ]]; then
+        break;
+    fi
+    sleep 0.1
+    ((++counter))
+done
+
+$CLICKHOUSE_CLIENT --query="ALTER TABLE table_to_rename RENAME COLUMN v1 to v2" &
+
+
+# it will not introduce any flakyness
+# just wait that mutation doesn't start
+sleep 3
+
+$CLICKHOUSE_CLIENT --query="SYSTEM START MERGES table_to_rename"
+
+wait
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM table_to_rename FORMAT JSONEachRow"
+
+
+ $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS table_to_rename"
diff --git a/tests/queries/0_stateless/02552_siphash128_reference.reference b/tests/queries/0_stateless/02552_siphash128_reference.reference
index a831c691ce7..452e9910660 100644
--- a/tests/queries/0_stateless/02552_siphash128_reference.reference
+++ b/tests/queries/0_stateless/02552_siphash128_reference.reference
@@ -126,5 +126,5 @@ E3040C00EB28F15366CA73CBD872E740
 1
 1
 1
-1CE422FEE7BD8DE20000000000000000
-1CE422FEE7BD8DE20000000000000000
+1
+1
diff --git a/tests/queries/0_stateless/02552_siphash128_reference.sql b/tests/queries/0_stateless/02552_siphash128_reference.sql
index 323561654b9..c238e51b690 100644
--- a/tests/queries/0_stateless/02552_siphash128_reference.sql
+++ b/tests/queries/0_stateless/02552_siphash128_reference.sql
@@ -203,5 +203,5 @@ select sipHash128ReferenceKeyed((toUInt64(0),toUInt64(0)),char(0, 1, 2, 3, 4, 5,
 select sipHash128ReferenceKeyed((0, 0), '1'); -- { serverError 48 }
 select sipHash128ReferenceKeyed(toUInt64(0), '1'); -- { serverError 48 }
 
-select hex(sipHash128Reference());
-select hex(sipHash128ReferenceKeyed());
+SELECT hex(sipHash128Reference()) = hex(reverse(unhex('1CE422FEE7BD8DE20000000000000000'))) or hex(sipHash128()) = '1CE422FEE7BD8DE20000000000000000';
+SELECT hex(sipHash128ReferenceKeyed()) = hex(reverse(unhex('1CE422FEE7BD8DE20000000000000000'))) or hex(sipHash128Keyed()) = '1CE422FEE7BD8DE20000000000000000';
diff --git a/tests/queries/0_stateless/02555_davengers_rename_chain.reference b/tests/queries/0_stateless/02555_davengers_rename_chain.reference
new file mode 100644
index 00000000000..a9fc4b395e2
--- /dev/null
+++ b/tests/queries/0_stateless/02555_davengers_rename_chain.reference
@@ -0,0 +1,26 @@
+{"a1":"1","b1":"2","c":"3"}
+~~~~~~~
+{"a1":"1","b1":"2","c":"3"}
+{"a1":"4","b1":"5","c":"6"}
+~~~~~~~
+{"a1":"1","b1":"2","c":"3"}
+{"a1":"4","b1":"5","c":"6"}
+{"a1":"7","b1":"8","c":"9"}
+~~~~~~~
+{"b":"1","a":"2","c":"3"}
+{"b":"4","a":"5","c":"6"}
+{"b":"7","a":"8","c":"9"}
+~~~~~~~
+{"a1":"1","b1":"2","c":"3"}
+~~~~~~~
+{"a1":"1","b1":"2","c":"3"}
+{"a1":"4","b1":"5","c":"6"}
+~~~~~~~
+{"a1":"1","b1":"2","c":"3"}
+{"a1":"4","b1":"5","c":"6"}
+{"a1":"7","b1":"8","c":"9"}
+~~~~~~~
+{"b":"1","a":"2","c":"3"}
+{"b":"4","a":"5","c":"6"}
+{"b":"7","a":"8","c":"9"}
+~~~~~~~
diff --git a/tests/queries/0_stateless/02555_davengers_rename_chain.sh b/tests/queries/0_stateless/02555_davengers_rename_chain.sh
new file mode 100755
index 00000000000..b23f8085fd7
--- /dev/null
+++ b/tests/queries/0_stateless/02555_davengers_rename_chain.sh
@@ -0,0 +1,143 @@
+#!/usr/bin/env bash
+# Tags: replica
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS wrong_metadata"
+
+$CLICKHOUSE_CLIENT -n --query="CREATE TABLE wrong_metadata(
+    a UInt64,
+    b UInt64,
+    c UInt64
+)
+ENGINE ReplicatedMergeTree('/test/{database}/tables/wrong_metadata', '1')
+ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0"
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO wrong_metadata VALUES (1, 2, 3)"
+
+
+$CLICKHOUSE_CLIENT --query="SYSTEM STOP MERGES wrong_metadata"
+
+
+$CLICKHOUSE_CLIENT --query="ALTER TABLE wrong_metadata RENAME COLUMN a TO a1, RENAME COLUMN b to b1 SETTINGS replication_alter_partitions_sync = 0"
+
+counter=0 retries=60
+I=0
+while [[ $counter -lt $retries ]]; do
+    I=$((I + 1))
+    result=$($CLICKHOUSE_CLIENT --query "SHOW CREATE TABLE wrong_metadata")
+    if [[ $result == *"\`a1\` UInt64"* ]]; then
+        break;
+    fi
+    sleep 0.1
+    ((++counter))
+done
+
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM wrong_metadata ORDER BY a1 FORMAT JSONEachRow"
+
+$CLICKHOUSE_CLIENT --query="SELECT '~~~~~~~'"
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO wrong_metadata VALUES (4, 5, 6)"
+
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM wrong_metadata ORDER BY a1 FORMAT JSONEachRow"
+$CLICKHOUSE_CLIENT --query="SELECT '~~~~~~~'"
+
+
+$CLICKHOUSE_CLIENT --query="ALTER TABLE wrong_metadata RENAME COLUMN a1 TO b, RENAME COLUMN b1 to a SETTINGS replication_alter_partitions_sync = 0"
+
+counter=0 retries=60
+I=0
+while [[ $counter -lt $retries ]]; do
+    I=$((I + 1))
+    result=$($CLICKHOUSE_CLIENT --query "SELECT * FROM system.mutations WHERE table = 'wrong_metadata' AND database='${CLICKHOUSE_DATABASE}'")
+    if [[ $result == *"b1 TO a"* ]]; then
+        break;
+    fi
+    sleep 0.1
+    ((++counter))
+done
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO wrong_metadata VALUES (7, 8, 9)"
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM wrong_metadata ORDER by a1 FORMAT JSONEachRow"
+$CLICKHOUSE_CLIENT --query="SELECT '~~~~~~~'"
+
+$CLICKHOUSE_CLIENT --query="SYSTEM START MERGES wrong_metadata"
+
+$CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA wrong_metadata"
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM wrong_metadata order by a FORMAT JSONEachRow"
+
+$CLICKHOUSE_CLIENT --query="SELECT '~~~~~~~'"
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS wrong_metadata"
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS wrong_metadata_compact"
+
+$CLICKHOUSE_CLIENT -n --query="CREATE TABLE wrong_metadata_compact(
+    a UInt64,
+    b UInt64,
+    c UInt64
+)
+ENGINE ReplicatedMergeTree('/test/{database}/tables/wrong_metadata_compact', '1')
+ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 10000000"
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO wrong_metadata_compact VALUES (1, 2, 3)"
+
+$CLICKHOUSE_CLIENT --query="SYSTEM STOP MERGES wrong_metadata_compact"
+
+$CLICKHOUSE_CLIENT --query="ALTER TABLE wrong_metadata_compact RENAME COLUMN a TO a1, RENAME COLUMN b to b1 SETTINGS replication_alter_partitions_sync = 0"
+
+counter=0 retries=60
+I=0
+while [[ $counter -lt $retries ]]; do
+    I=$((I + 1))
+    result=$($CLICKHOUSE_CLIENT --query "SHOW CREATE TABLE wrong_metadata_compact")
+    if [[ $result == *"\`a1\` UInt64"* ]]; then
+        break;
+    fi
+    sleep 0.1
+    ((++counter))
+done
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM wrong_metadata_compact ORDER BY a1 FORMAT JSONEachRow"
+$CLICKHOUSE_CLIENT --query="SELECT '~~~~~~~'"
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO wrong_metadata_compact VALUES (4, 5, 6)"
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM wrong_metadata_compact ORDER BY a1 FORMAT JSONEachRow"
+$CLICKHOUSE_CLIENT --query="SELECT '~~~~~~~'"
+
+$CLICKHOUSE_CLIENT --query="ALTER TABLE wrong_metadata_compact RENAME COLUMN a1 TO b, RENAME COLUMN b1 to a SETTINGS replication_alter_partitions_sync = 0"
+
+counter=0 retries=60
+I=0
+while [[ $counter -lt $retries ]]; do
+    I=$((I + 1))
+    result=$($CLICKHOUSE_CLIENT --query "SELECT * FROM system.mutations WHERE table = 'wrong_metadata_compact' AND database='${CLICKHOUSE_DATABASE}'")
+    if [[ $result == *"b1 TO a"* ]]; then
+        break;
+    fi
+    sleep 0.1
+    ((++counter))
+done
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO wrong_metadata_compact VALUES (7, 8, 9)"
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM wrong_metadata_compact ORDER by a1 FORMAT JSONEachRow"
+$CLICKHOUSE_CLIENT --query="SELECT '~~~~~~~'"
+
+$CLICKHOUSE_CLIENT --query="SYSTEM START MERGES wrong_metadata_compact"
+
+$CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA wrong_metadata_compact"
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM wrong_metadata_compact order by a FORMAT JSONEachRow"
+$CLICKHOUSE_CLIENT --query="SELECT '~~~~~~~'"
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS wrong_metadata_compact"
diff --git a/tests/queries/0_stateless/02559_nested_multiple_levels_default.reference b/tests/queries/0_stateless/02559_nested_multiple_levels_default.reference
index b0214e0e7c7..9ed0fb620a4 100644
--- a/tests/queries/0_stateless/02559_nested_multiple_levels_default.reference
+++ b/tests/queries/0_stateless/02559_nested_multiple_levels_default.reference
@@ -1,6 +1,4 @@
 data_compact	Compact
 [[]]
-data_memory	InMemory
-[[]]
 data_wide	Wide
 [[]]
diff --git a/tests/queries/0_stateless/02559_nested_multiple_levels_default.sql b/tests/queries/0_stateless/02559_nested_multiple_levels_default.sql
index 156af5c7784..9dcdab82acb 100644
--- a/tests/queries/0_stateless/02559_nested_multiple_levels_default.sql
+++ b/tests/queries/0_stateless/02559_nested_multiple_levels_default.sql
@@ -10,26 +10,12 @@ CREATE TABLE data_compact
 )
 ENGINE = MergeTree()
 ORDER BY tuple()
-SETTINGS min_rows_for_compact_part=0, min_bytes_for_compact_part=0, min_rows_for_wide_part=100, min_bytes_for_wide_part=1e9;
+SETTINGS min_rows_for_wide_part=100, min_bytes_for_wide_part=1e9;
 INSERT INTO data_compact VALUES ([0]);
 ALTER TABLE data_compact ADD COLUMN root.nested_array Array(Array(UInt8));
 SELECT table, part_type FROM system.parts WHERE table = 'data_compact' AND database = currentDatabase();
 SELECT root.nested_array FROM data_compact;
 
--- memory
-DROP TABLE IF EXISTS data_memory;
-CREATE TABLE data_memory
-(
-    `root.array` Array(UInt8),
-)
-ENGINE = MergeTree()
-ORDER BY tuple()
-SETTINGS min_rows_for_compact_part=100, min_bytes_for_compact_part=1e9, min_rows_for_wide_part=100, min_bytes_for_wide_part=1e9, in_memory_parts_enable_wal=0;
-INSERT INTO data_memory VALUES ([0]);
-ALTER TABLE data_memory ADD COLUMN root.nested_array Array(Array(UInt8));
-SELECT table, part_type FROM system.parts WHERE table = 'data_memory' AND database = currentDatabase();
-SELECT root.nested_array FROM data_memory;
-
 -- wide
 DROP TABLE IF EXISTS data_wide;
 CREATE TABLE data_wide
@@ -38,7 +24,7 @@ CREATE TABLE data_wide
 )
 ENGINE = MergeTree()
 ORDER BY tuple()
-SETTINGS min_rows_for_wide_part=0, min_bytes_for_wide_part=0, min_rows_for_wide_part=0, min_bytes_for_wide_part=0;
+SETTINGS min_rows_for_wide_part=0, min_bytes_for_wide_part=0;
 INSERT INTO data_wide VALUES ([0]);
 ALTER TABLE data_wide ADD COLUMN root.nested_array Array(Array(UInt8));
 SELECT table, part_type FROM system.parts WHERE table = 'data_wide' AND database = currentDatabase();
diff --git a/tests/queries/0_stateless/02560_agg_state_deserialization_hash_table_crash.sql b/tests/queries/0_stateless/02560_agg_state_deserialization_hash_table_crash.sql
index 5b6662faeb3..d85cacc70be 100644
--- a/tests/queries/0_stateless/02560_agg_state_deserialization_hash_table_crash.sql
+++ b/tests/queries/0_stateless/02560_agg_state_deserialization_hash_table_crash.sql
@@ -1,4 +1,4 @@
 DROP TABLE IF EXISTS tab;
 create table tab (d Int64, s AggregateFunction(groupUniqArrayArray, Array(UInt64)), c SimpleAggregateFunction(groupUniqArrayArray, Array(UInt64))) engine = SummingMergeTree() order by d;
-INSERT INTO tab VALUES (1, 'このコー'); -- { clientError CANNOT_ALLOCATE_MEMORY }
+INSERT INTO tab VALUES (1, 'このコー'); -- { clientError 128 }
 DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02560_window_ntile.reference b/tests/queries/0_stateless/02560_window_ntile.reference
index cae0586fa8c..1045fc1011a 100644
--- a/tests/queries/0_stateless/02560_window_ntile.reference
+++ b/tests/queries/0_stateless/02560_window_ntile.reference
@@ -22,7 +22,28 @@ select a, b, ntile(3) over (partition by a order by b rows between unbounded pre
 1	7	3
 1	8	3
 1	9	3
-select a, b, ntile(2) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
+select a, b, ntile(3) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
+0	0	1
+0	1	1
+0	2	1
+0	3	1
+0	4	2
+0	5	2
+0	6	2
+0	7	3
+0	8	3
+0	9	3
+1	0	1
+1	1	1
+1	2	1
+1	3	1
+1	4	2
+1	5	2
+1	6	2
+1	7	3
+1	8	3
+1	9	3
+select a, b, ntile(2) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
 0	0	1
 0	1	1
 0	2	1
@@ -43,7 +64,7 @@ select a, b, ntile(2) over (partition by a order by b rows between unbounded pre
 1	7	2
 1	8	2
 1	9	2
-select a, b, ntile(1) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
+select a, b, ntile(1) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
 0	0	1
 0	1	1
 0	2	1
@@ -64,7 +85,7 @@ select a, b, ntile(1) over (partition by a order by b rows between unbounded pre
 1	7	1
 1	8	1
 1	9	1
-select a, b, ntile(100) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
+select a, b, ntile(100) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
 0	0	1
 0	1	2
 0	2	3
@@ -85,7 +106,7 @@ select a, b, ntile(100) over (partition by a order by b rows between unbounded p
 1	7	8
 1	8	9
 1	9	10
-select a, b, ntile(65535) over (partition by a order by b rows between unbounded preceding and unbounded following) from (select 1 as a, number as b from numbers(65535)) limit 100;
+select a, b, ntile(65535) over (partition by a order by b) from (select 1 as a, number as b from numbers(65535)) limit 100;
 1	0	1
 1	1	2
 1	2	3
@@ -187,11 +208,11 @@ select a, b, ntile(65535) over (partition by a order by b rows between unbounded
 1	98	99
 1	99	100
 -- Bad arguments
-select a, b, ntile(3.0) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
-select a, b, ntile('2') over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
-select a, b, ntile(0) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
-select a, b, ntile(-2) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
-select a, b, ntile(b + 1) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
+select a, b, ntile(3.0) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
+select a, b, ntile('2') over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
+select a, b, ntile(0) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
+select a, b, ntile(-2) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
+select a, b, ntile(b + 1) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
 -- Bad window type
 select a, b, ntile(2) over (partition by a) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
 select a, b, ntile(2) over (partition by a order by b rows between 4 preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/02560_window_ntile.sql b/tests/queries/0_stateless/02560_window_ntile.sql
index 4c25ecf4dd2..f2acf8fc94e 100644
--- a/tests/queries/0_stateless/02560_window_ntile.sql
+++ b/tests/queries/0_stateless/02560_window_ntile.sql
@@ -2,17 +2,20 @@
 
 -- Normal cases
 select a, b, ntile(3) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
-select a, b, ntile(2) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
-select a, b, ntile(1) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
-select a, b, ntile(100) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
-select a, b, ntile(65535) over (partition by a order by b rows between unbounded preceding and unbounded following) from (select 1 as a, number as b from numbers(65535)) limit 100;
+select a, b, ntile(3) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
+select a, b, ntile(2) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
+select a, b, ntile(1) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
+select a, b, ntile(100) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20));
+select a, b, ntile(65535) over (partition by a order by b) from (select 1 as a, number as b from numbers(65535)) limit 100;
+
+
 
 -- Bad arguments
-select a, b, ntile(3.0) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
-select a, b, ntile('2') over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
-select a, b, ntile(0) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
-select a, b, ntile(-2) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
-select a, b, ntile(b + 1) over (partition by a order by b rows between unbounded preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
+select a, b, ntile(3.0) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
+select a, b, ntile('2') over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
+select a, b, ntile(0) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
+select a, b, ntile(-2) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
+select a, b, ntile(b + 1) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
 
 -- Bad window type
 select a, b, ntile(2) over (partition by a) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/02561_temporary_table_grants.reference b/tests/queries/0_stateless/02561_temporary_table_grants.reference
new file mode 100644
index 00000000000..b462a5a7baa
--- /dev/null
+++ b/tests/queries/0_stateless/02561_temporary_table_grants.reference
@@ -0,0 +1,4 @@
+OK
+OK
+OK
+OK
diff --git a/tests/queries/0_stateless/02561_temporary_table_grants.sh b/tests/queries/0_stateless/02561_temporary_table_grants.sh
new file mode 100755
index 00000000000..6e0c96786e8
--- /dev/null
+++ b/tests/queries/0_stateless/02561_temporary_table_grants.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+
+user=user_$CLICKHOUSE_TEST_UNIQUE_NAME
+$CLICKHOUSE_CLIENT --query "DROP USER IF EXISTS $user"
+$CLICKHOUSE_CLIENT --query "CREATE USER $user IDENTIFIED WITH PLAINTEXT_PASSWORD BY 'hello'"
+
+$CLICKHOUSE_CLIENT --user $user --password hello --query "CREATE TEMPORARY TABLE table_memory_02561(name String)" 2>&1 | grep -F "Not enough privileges. To execute this query it's necessary to have grant CREATE TEMPORARY TABLE" > /dev/null && echo "OK"
+
+$CLICKHOUSE_CLIENT --query "GRANT CREATE TEMPORARY TABLE ON *.* TO $user"
+$CLICKHOUSE_CLIENT --user $user --password hello --query "CREATE TEMPORARY TABLE table_memory_02561(name String)"
+
+$CLICKHOUSE_CLIENT --user $user --password hello --query "CREATE TEMPORARY TABLE table_merge_tree_02561(name String) ENGINE = MergeTree() ORDER BY name" 2>&1 | grep -F "Not enough privileges. To execute this query it's necessary to have grant CREATE ARBITRARY TEMPORARY TABLE" > /dev/null && echo "OK"
+
+$CLICKHOUSE_CLIENT --query "GRANT CREATE ARBITRARY TEMPORARY TABLE ON *.* TO $user"
+
+$CLICKHOUSE_CLIENT --user $user --password hello --query "CREATE TEMPORARY TABLE table_merge_tree_02561(name String) ENGINE = MergeTree() ORDER BY name"
+
+$CLICKHOUSE_CLIENT --user $user --password hello --query "CREATE TEMPORARY TABLE table_file_02561(name String) ENGINE = File(TabSeparated)" 2>&1 | grep -F "Not enough privileges. To execute this query it's necessary to have grant FILE" > /dev/null && echo "OK"
+
+$CLICKHOUSE_CLIENT --query "GRANT FILE ON *.* TO $user"
+
+$CLICKHOUSE_CLIENT --user $user --password hello --query "CREATE TEMPORARY TABLE table_file_02561(name String) ENGINE = File(TabSeparated)"
+
+$CLICKHOUSE_CLIENT --user $user --password hello --query "CREATE TEMPORARY TABLE table_url_02561(name String) ENGINE = URL('http://127.0.0.1:8123?query=select+12', 'RawBLOB')" 2>&1 | grep -F "Not enough privileges. To execute this query it's necessary to have grant URL" > /dev/null && echo "OK"
+
+$CLICKHOUSE_CLIENT --query "GRANT URL ON *.* TO $user"
+
+$CLICKHOUSE_CLIENT --user $user --password hello --query "CREATE TEMPORARY TABLE table_url_02561(name String) ENGINE = URL('http://127.0.0.1:8123?query=select+12', 'RawBLOB')"
+
+$CLICKHOUSE_CLIENT --query "DROP USER $user"
diff --git a/tests/queries/0_stateless/02561_temporary_table_sessions.reference b/tests/queries/0_stateless/02561_temporary_table_sessions.reference
new file mode 100644
index 00000000000..b3890873523
--- /dev/null
+++ b/tests/queries/0_stateless/02561_temporary_table_sessions.reference
@@ -0,0 +1,7 @@
+OK
+1	d
+2	e
+3	f
+1	a
+2	b
+3	c
diff --git a/tests/queries/0_stateless/02561_temporary_table_sessions.sh b/tests/queries/0_stateless/02561_temporary_table_sessions.sh
new file mode 100755
index 00000000000..a810a48cdf3
--- /dev/null
+++ b/tests/queries/0_stateless/02561_temporary_table_sessions.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+SESSION_ID_A="$RANDOM$RANDOM$RANDOM"
+SESSION_ID_B="$RANDOM$RANDOM$RANDOM"
+
+# Create temporary table and insert in SESSION_ID_A
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${SESSION_ID_A}" -d 'CREATE TEMPORARY TABLE table_merge_tree_02561 (id UInt64, info String) ENGINE = MergeTree ORDER BY id'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${SESSION_ID_A}" -d "INSERT INTO table_merge_tree_02561 VALUES (1, 'a'), (2, 'b'), (3, 'c')"
+
+# Select from SESSION_ID_B
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${SESSION_ID_B}" -d "SELECT * FROM table_merge_tree_02561" | tr -d '\n' | grep -F 'UNKNOWN_TABLE' > /dev/null && echo "OK"
+
+# Create temporary table, insert and select in SESSION_ID_B
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${SESSION_ID_B}" -d 'CREATE TEMPORARY TABLE table_merge_tree_02561 (id UInt64, info String) ENGINE = MergeTree ORDER BY id'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${SESSION_ID_B}" -d "INSERT INTO table_merge_tree_02561 VALUES (1, 'd'), (2, 'e'), (3, 'f')"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${SESSION_ID_B}" -d "SELECT * FROM table_merge_tree_02561"
+
+# Select from SESSION_ID_A
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${SESSION_ID_A}" -d "SELECT * FROM table_merge_tree_02561"
+
+# Drop tables in both sessions
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${SESSION_ID_A}" -d "DROP TEMPORARY TABLE table_merge_tree_02561"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${SESSION_ID_B}" -d "DROP TEMPORARY TABLE table_merge_tree_02561"
diff --git a/tests/queries/0_stateless/02564_date_format.reference b/tests/queries/0_stateless/02564_date_format.reference
index a5f2e362cc6..38c0d39340b 100644
--- a/tests/queries/0_stateless/02564_date_format.reference
+++ b/tests/queries/0_stateless/02564_date_format.reference
@@ -17,7 +17,7 @@ Jan	Jan
 366	366
 00	00
 01	01
-33	00
+January	January
 \n	\n
 AM	AM
 AM
diff --git a/tests/queries/0_stateless/02564_query_id_header.reference b/tests/queries/0_stateless/02564_query_id_header.reference
index 413e8929f36..fa56fc23e3e 100644
--- a/tests/queries/0_stateless/02564_query_id_header.reference
+++ b/tests/queries/0_stateless/02564_query_id_header.reference
@@ -20,3 +20,7 @@ DROP TABLE t_query_id_header
 < Content-Type: text/plain; charset=UTF-8
 < X-ClickHouse-Query-Id: query_id
 < X-ClickHouse-Timezone: timezone
+BAD SQL
+< Content-Type: text/plain; charset=UTF-8
+< X-ClickHouse-Query-Id: query_id
+< X-ClickHouse-Timezone: timezone
diff --git a/tests/queries/0_stateless/02564_query_id_header.sh b/tests/queries/0_stateless/02564_query_id_header.sh
index 67ddbcfcc46..7184422a030 100755
--- a/tests/queries/0_stateless/02564_query_id_header.sh
+++ b/tests/queries/0_stateless/02564_query_id_header.sh
@@ -28,3 +28,4 @@ run_and_check_headers "INSERT INTO t_query_id_header VALUES (1)"
 run_and_check_headers "EXISTS TABLE t_query_id_header"
 run_and_check_headers "SELECT * FROM t_query_id_header"
 run_and_check_headers "DROP TABLE t_query_id_header"
+run_and_check_headers "BAD SQL"
diff --git a/tests/queries/0_stateless/02565_analyzer_limit_settings.reference b/tests/queries/0_stateless/02565_analyzer_limit_settings.reference
index 6f23097612e..87e9f407cc8 100644
--- a/tests/queries/0_stateless/02565_analyzer_limit_settings.reference
+++ b/tests/queries/0_stateless/02565_analyzer_limit_settings.reference
@@ -62,7 +62,6 @@ SELECT * FROM numbers(10);
 SELECT * FROM numbers(10) LIMIT 3 OFFSET 2;
 3
 4
-5
 SELECT * FROM numbers(10) LIMIT 5 OFFSET 2;
 3
 4
diff --git a/tests/queries/0_stateless/02566_ipv4_ipv6_binary_formats.reference b/tests/queries/0_stateless/02566_ipv4_ipv6_binary_formats.reference
new file mode 100644
index 00000000000..a3d8a33f757
--- /dev/null
+++ b/tests/queries/0_stateless/02566_ipv4_ipv6_binary_formats.reference
@@ -0,0 +1,18 @@
+CapnProto
+2001:db8:11a3:9d7:1f34:8a2e:7a0:765d	127.0.0.1
+Avro
+2001:db8:11a3:9d7:1f34:8a2e:7a0:765d	127.0.0.1
+Arrow
+2001:db8:11a3:9d7:1f34:8a2e:7a0:765d	127.0.0.1
+Parquet
+ipv6	Nullable(FixedString(16))					
+ipv4	Nullable(UInt32)					
+2001:db8:11a3:9d7:1f34:8a2e:7a0:765d	127.0.0.1
+ORC
+ipv6	Nullable(String)					
+ipv4	Nullable(Int32)					
+2001:db8:11a3:9d7:1f34:8a2e:7a0:765d	127.0.0.1
+BSONEachRow
+2001:db8:11a3:9d7:1f34:8a2e:7a0:765d	127.0.0.1
+MsgPack
+2001:db8:11a3:9d7:1f34:8a2e:7a0:765d	127.0.0.1
diff --git a/tests/queries/0_stateless/02566_ipv4_ipv6_binary_formats.sh b/tests/queries/0_stateless/02566_ipv4_ipv6_binary_formats.sh
new file mode 100755
index 00000000000..d27a2f9fcbb
--- /dev/null
+++ b/tests/queries/0_stateless/02566_ipv4_ipv6_binary_formats.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo "CapnProto"
+${CLICKHOUSE_LOCAL} -q "select '2001:db8:11a3:9d7:1f34:8a2e:7a0:765d'::IPv6 as ipv6, '127.0.0.1'::IPv4 as ipv4 format CapnProto settings format_schema='$CURDIR/format_schemas/02566_ipv4_ipv6:Message'" > 02566_ipv4_ipv6_data.capnp
+${CLICKHOUSE_LOCAL} -q "select * from file(02566_ipv4_ipv6_data.capnp, auto, 'ipv6 IPv6, ipv4 IPv4') settings format_schema='$CURDIR/format_schemas/02566_ipv4_ipv6:Message'"
+rm 02566_ipv4_ipv6_data.capnp
+
+echo "Avro"
+${CLICKHOUSE_LOCAL} -q "select '2001:db8:11a3:9d7:1f34:8a2e:7a0:765d'::IPv6 as ipv6, '127.0.0.1'::IPv4 as ipv4 format Avro"  > 02566_ipv4_ipv6_data.avro
+${CLICKHOUSE_LOCAL} -q "select * from file(02566_ipv4_ipv6_data.avro, auto, 'ipv6 IPv6, ipv4 IPv4')"
+rm 02566_ipv4_ipv6_data.avro
+
+echo "Arrow"
+${CLICKHOUSE_LOCAL} -q "select '2001:db8:11a3:9d7:1f34:8a2e:7a0:765d'::IPv6 as ipv6, '127.0.0.1'::IPv4 as ipv4 format Arrow"  > 02566_ipv4_ipv6_data.arrow
+${CLICKHOUSE_LOCAL} -q "select * from file(02566_ipv4_ipv6_data.arrow, auto, 'ipv6 IPv6, ipv4 IPv4')"
+rm 02566_ipv4_ipv6_data.arrow
+
+echo "Parquet"
+${CLICKHOUSE_LOCAL} -q "select '2001:db8:11a3:9d7:1f34:8a2e:7a0:765d'::IPv6 as ipv6, '127.0.0.1'::IPv4 as ipv4 format Parquet"  > 02566_ipv4_ipv6_data.parquet
+${CLICKHOUSE_LOCAL} -q "desc file(02566_ipv4_ipv6_data.parquet)"
+${CLICKHOUSE_LOCAL} -q "select ipv6, toIPv4(ipv4) from file(02566_ipv4_ipv6_data.parquet, auto, 'ipv6 IPv6, ipv4 UInt32')"
+rm 02566_ipv4_ipv6_data.parquet
+
+echo "ORC"
+${CLICKHOUSE_LOCAL} -q "select '2001:db8:11a3:9d7:1f34:8a2e:7a0:765d'::IPv6 as ipv6, '127.0.0.1'::IPv4 as ipv4 format ORC"  > 02566_ipv4_ipv6_data.orc
+${CLICKHOUSE_LOCAL} -q "desc file(02566_ipv4_ipv6_data.orc)"
+${CLICKHOUSE_LOCAL} -q "select ipv6, toIPv4(ipv4) from file(02566_ipv4_ipv6_data.orc, auto, 'ipv6 IPv6, ipv4 UInt32')"
+rm 02566_ipv4_ipv6_data.orc
+
+echo "BSONEachRow"
+${CLICKHOUSE_LOCAL} -q "select '2001:db8:11a3:9d7:1f34:8a2e:7a0:765d'::IPv6 as ipv6, '127.0.0.1'::IPv4 as ipv4 format BSONEachRow"  > 02566_ipv4_ipv6_data.bson
+${CLICKHOUSE_LOCAL} -q "select * from file(02566_ipv4_ipv6_data.bson, auto, 'ipv6 IPv6, ipv4 IPv4')"
+rm 02566_ipv4_ipv6_data.bson
+
+echo "MsgPack"
+${CLICKHOUSE_LOCAL} -q "select '2001:db8:11a3:9d7:1f34:8a2e:7a0:765d'::IPv6 as ipv6, '127.0.0.1'::IPv4 as ipv4 format MsgPack"  > 02566_ipv4_ipv6_data.msgpack
+${CLICKHOUSE_LOCAL} -q "select * from file(02566_ipv4_ipv6_data.msgpack, auto, 'ipv6 IPv6, ipv4 IPv4')"
+rm 02566_ipv4_ipv6_data.msgpack
+
+
diff --git a/tests/queries/0_stateless/02567_and_consistency.reference b/tests/queries/0_stateless/02567_and_consistency.reference
index bcb2b5aecfb..e0014f187a8 100644
--- a/tests/queries/0_stateless/02567_and_consistency.reference
+++ b/tests/queries/0_stateless/02567_and_consistency.reference
@@ -6,10 +6,8 @@ true
 =====
 true
 =====
-=====
 1
 =====
-=====
 allow_experimental_analyzer
 true
 #45440
diff --git a/tests/queries/0_stateless/02567_and_consistency.sql b/tests/queries/0_stateless/02567_and_consistency.sql
index f02185a1a52..8ad06bd68cb 100644
--- a/tests/queries/0_stateless/02567_and_consistency.sql
+++ b/tests/queries/0_stateless/02567_and_consistency.sql
@@ -42,31 +42,10 @@ SETTINGS enable_optimize_predicate_expression = 0;
 
 SELECT '=====';
 
-SELECT toBool(sin(SUM(number))) AS x
-FROM
-(
-    SELECT 1 AS number
-)
-GROUP BY number
-HAVING 1 AND sin(sum(number))
-SETTINGS enable_optimize_predicate_expression = 1; -- { serverError 59 }
-
-SELECT '=====';
-
 SELECT 1 and sin(1);
 
 SELECT '=====';
 
-SELECT toBool(sin(SUM(number))) AS x
-FROM
-(
-    SELECT 1 AS number
-)
-GROUP BY number
-HAVING x AND sin(1)
-SETTINGS enable_optimize_predicate_expression = 0; -- { serverError 59 }
-
-SELECT '=====';
 SELECT 'allow_experimental_analyzer';
 
 SET allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/02567_native_type_conversions.reference b/tests/queries/0_stateless/02567_native_type_conversions.reference
new file mode 100644
index 00000000000..5c223870c11
--- /dev/null
+++ b/tests/queries/0_stateless/02567_native_type_conversions.reference
@@ -0,0 +1,3 @@
+1
+42
+1
diff --git a/tests/queries/0_stateless/02567_native_type_conversions.sh b/tests/queries/0_stateless/02567_native_type_conversions.sh
new file mode 100755
index 00000000000..976c42f07c1
--- /dev/null
+++ b/tests/queries/0_stateless/02567_native_type_conversions.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select 42::UInt8 as x format Native" | $CLICKHOUSE_LOCAL --structure="x UInt64" --input-format="Native" -q "select * from table" --input_format_native_allow_types_conversion=0 2>&1 | grep "TYPE_MISMATCH" -c
+
+$CLICKHOUSE_LOCAL -q "select 42::UInt8 as x format Native" | $CLICKHOUSE_LOCAL --structure="x UInt64" --input-format="Native" -q "select * from table" --input_format_native_allow_types_conversion=1
+
+$CLICKHOUSE_LOCAL -q "select 'Hello' as x format Native" | $CLICKHOUSE_LOCAL --structure="x UInt64" --input-format="Native" -q "select * from table" --input_format_native_allow_types_conversion=1 2>&1 | grep 'while converting column "x" from type String to type UInt64' -c
+
diff --git a/tests/queries/0_stateless/02568_and_consistency.reference b/tests/queries/0_stateless/02568_and_consistency.reference
new file mode 100644
index 00000000000..07a8041d0ee
--- /dev/null
+++ b/tests/queries/0_stateless/02568_and_consistency.reference
@@ -0,0 +1,5 @@
+=
+1554690688
+=
+1554690688
+=
diff --git a/tests/queries/0_stateless/02568_and_consistency.sql b/tests/queries/0_stateless/02568_and_consistency.sql
new file mode 100644
index 00000000000..4e76da78427
--- /dev/null
+++ b/tests/queries/0_stateless/02568_and_consistency.sql
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (c0 Int32, PRIMARY KEY (c0)) ENGINE=MergeTree;
+INSERT INTO t1 VALUES (1554690688);
+
+select '=';
+
+SELECT MIN(t1.c0)
+FROM t1
+GROUP BY
+    (-sign(cos(t1.c0))) * (-max2(t1.c0, t1.c0 / t1.c0)),
+    t1.c0 * t1.c0,
+    sign(-exp(-t1.c0))
+HAVING -(-(MIN(t1.c0) + MIN(t1.c0))) AND (pow('{b' > '-657301241', log(-1004522121)) IS NOT NULL)
+UNION ALL
+SELECT MIN(t1.c0)
+FROM t1
+GROUP BY
+    (-sign(cos(t1.c0))) * (-max2(t1.c0, t1.c0 / t1.c0)),
+    t1.c0 * t1.c0,
+    sign(-exp(-t1.c0))
+HAVING NOT (-(-(MIN(t1.c0) + MIN(t1.c0))) AND (pow('{b' > '-657301241', log(-1004522121)) IS NOT NULL))
+UNION ALL
+SELECT MIN(t1.c0)
+FROM t1
+GROUP BY
+    (-sign(cos(t1.c0))) * (-max2(t1.c0, t1.c0 / t1.c0)),
+    t1.c0 * t1.c0,
+    sign(-exp(-t1.c0))
+HAVING (-(-(MIN(t1.c0) + MIN(t1.c0))) AND (pow('{b' > '-657301241', log(-1004522121)) IS NOT NULL)) IS NULL
+SETTINGS aggregate_functions_null_for_empty = 1, enable_optimize_predicate_expression = 0;
+
+select '=';
+
+SELECT MIN(t1.c0)
+FROM t1
+GROUP BY t1.c0
+HAVING and(MIN(t1.c0) + MIN(t1.c0), 1)
+SETTINGS aggregate_functions_null_for_empty = 1, enable_optimize_predicate_expression = 0;
+
+select '=';
+
+DROP TABLE IF EXISTS t1;
diff --git a/tests/queries/0_stateless/02570_fallback_from_async_insert.sh b/tests/queries/0_stateless/02570_fallback_from_async_insert.sh
index 9c158d6241b..d7c8944b89d 100755
--- a/tests/queries/0_stateless/02570_fallback_from_async_insert.sh
+++ b/tests/queries/0_stateless/02570_fallback_from_async_insert.sh
@@ -47,6 +47,7 @@ $CLICKHOUSE_CLIENT --query "SYSTEM FLUSH LOGS"
 $CLICKHOUSE_CLIENT --query "
     SELECT 'id_' || splitByChar('_', query_id)[1] AS id FROM system.text_log
     WHERE query_id LIKE '%$query_id_suffix' AND message LIKE '%$message%'
+    ORDER BY id
 "
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS t_async_insert_fallback"
diff --git a/tests/queries/0_stateless/02572_materialized_views_ignore_errors.reference b/tests/queries/0_stateless/02572_materialized_views_ignore_errors.reference
new file mode 100644
index 00000000000..fc2e6b78122
--- /dev/null
+++ b/tests/queries/0_stateless/02572_materialized_views_ignore_errors.reference
@@ -0,0 +1,28 @@
+-- { echoOn }
+select * from data_02572 order by key;
+insert into data_02572 settings materialized_views_ignore_errors=1 values (2);
+select * from data_02572 order by key;
+2
+-- check system.query_views_log
+system flush logs;
+-- lower(status) to pass through clickhouse-test "exception" check
+select lower(status::String), errorCodeToName(exception_code)
+from system.query_views_log where
+    view_name = concatWithSeparator('.', currentDatabase(), 'push_to_proxy_mv_02572') and
+    view_target = concatWithSeparator('.', currentDatabase(), 'proxy_02572')
+    order by event_date, event_time
+;
+exceptionwhileprocessing	UNKNOWN_TABLE
+-- materialized_views_ignore_errors=0
+insert into data_02572 values (1); -- { serverError UNKNOWN_TABLE }
+select * from data_02572 order by key;
+1
+2
+create table receiver_02572 as data_02572;
+insert into data_02572 values (3);
+select * from data_02572 order by key;
+1
+2
+3
+select * from receiver_02572 order by key;
+3
diff --git a/tests/queries/0_stateless/02572_materialized_views_ignore_errors.sql b/tests/queries/0_stateless/02572_materialized_views_ignore_errors.sql
new file mode 100644
index 00000000000..2d1f824b9b1
--- /dev/null
+++ b/tests/queries/0_stateless/02572_materialized_views_ignore_errors.sql
@@ -0,0 +1,40 @@
+set prefer_localhost_replica=1;
+
+drop table if exists data_02572;
+drop table if exists proxy_02572;
+drop table if exists push_to_proxy_mv_02572;
+drop table if exists receiver_02572;
+
+create table data_02572 (key Int) engine=Memory();
+
+create table proxy_02572 (key Int) engine=Distributed('test_shard_localhost', currentDatabase(), 'receiver_02572');
+-- ensure that insert fails
+insert into proxy_02572 values (1); -- { serverError UNKNOWN_TABLE }
+
+-- proxy data with MV
+create materialized view push_to_proxy_mv_02572 to proxy_02572 as select * from data_02572;
+
+-- { echoOn }
+select * from data_02572 order by key;
+
+insert into data_02572 settings materialized_views_ignore_errors=1 values (2);
+select * from data_02572 order by key;
+-- check system.query_views_log
+system flush logs;
+-- lower(status) to pass through clickhouse-test "exception" check
+select lower(status::String), errorCodeToName(exception_code)
+from system.query_views_log where
+    view_name = concatWithSeparator('.', currentDatabase(), 'push_to_proxy_mv_02572') and
+    view_target = concatWithSeparator('.', currentDatabase(), 'proxy_02572')
+    order by event_date, event_time
+;
+
+-- materialized_views_ignore_errors=0
+insert into data_02572 values (1); -- { serverError UNKNOWN_TABLE }
+select * from data_02572 order by key;
+
+create table receiver_02572 as data_02572;
+
+insert into data_02572 values (3);
+select * from data_02572 order by key;
+select * from receiver_02572 order by key;
diff --git a/tests/queries/0_stateless/02572_query_views_log_background_thread.reference b/tests/queries/0_stateless/02572_query_views_log_background_thread.reference
new file mode 100644
index 00000000000..eeba62c5dc8
--- /dev/null
+++ b/tests/queries/0_stateless/02572_query_views_log_background_thread.reference
@@ -0,0 +1,19 @@
+-- { echoOn }
+insert into buffer_02572 values (1);
+-- ensure that the flush was not direct
+select * from data_02572;
+select * from copy_02572;
+-- we cannot use OPTIMIZE, this will attach query context, so let's wait
+select sleepEachRow(1) from numbers(3*2) format Null;
+select * from data_02572;
+1
+select * from copy_02572;
+1
+system flush logs;
+select count() > 0, lower(status::String), errorCodeToName(exception_code)
+    from system.query_views_log where
+    view_name = concatWithSeparator('.', currentDatabase(), 'mv_02572') and
+    view_target = concatWithSeparator('.', currentDatabase(), 'copy_02572')
+    group by 2, 3
+;
+1	queryfinish	OK
diff --git a/tests/queries/0_stateless/02572_query_views_log_background_thread.sql b/tests/queries/0_stateless/02572_query_views_log_background_thread.sql
new file mode 100644
index 00000000000..dc229412b13
--- /dev/null
+++ b/tests/queries/0_stateless/02572_query_views_log_background_thread.sql
@@ -0,0 +1,35 @@
+-- INSERT buffer_02572 -> data_02572 -> copy_02572
+--                                   ^^
+--                             push to system.query_views_log
+
+drop table if exists buffer_02572;
+drop table if exists data_02572;
+drop table if exists copy_02572;
+drop table if exists mv_02572;
+
+create table copy_02572 (key Int) engine=Memory();
+create table data_02572 (key Int) engine=Memory();
+create table buffer_02572 (key Int) engine=Buffer(currentDatabase(), data_02572, 1,
+    /* never direct flush for flush from background thread */
+    /* min_time= */ 3, 3,
+    1, 1e9,
+    1, 1e9);
+create materialized view mv_02572 to copy_02572 as select * from data_02572;
+
+-- { echoOn }
+insert into buffer_02572 values (1);
+-- ensure that the flush was not direct
+select * from data_02572;
+select * from copy_02572;
+-- we cannot use OPTIMIZE, this will attach query context, so let's wait
+select sleepEachRow(1) from numbers(3*2) format Null;
+select * from data_02572;
+select * from copy_02572;
+
+system flush logs;
+select count() > 0, lower(status::String), errorCodeToName(exception_code)
+    from system.query_views_log where
+    view_name = concatWithSeparator('.', currentDatabase(), 'mv_02572') and
+    view_target = concatWithSeparator('.', currentDatabase(), 'copy_02572')
+    group by 2, 3
+;
diff --git a/tests/queries/0_stateless/02572_system_logs_materialized_views_ignore_errors.reference b/tests/queries/0_stateless/02572_system_logs_materialized_views_ignore_errors.reference
new file mode 100644
index 00000000000..029f80b46b0
--- /dev/null
+++ b/tests/queries/0_stateless/02572_system_logs_materialized_views_ignore_errors.reference
@@ -0,0 +1,2 @@
+11	queryfinish	OK
+11	querystart	OK
diff --git a/tests/queries/0_stateless/02572_system_logs_materialized_views_ignore_errors.sql b/tests/queries/0_stateless/02572_system_logs_materialized_views_ignore_errors.sql
new file mode 100644
index 00000000000..a7a74190821
--- /dev/null
+++ b/tests/queries/0_stateless/02572_system_logs_materialized_views_ignore_errors.sql
@@ -0,0 +1,30 @@
+-- Tags: no-parallel, no-replicated-database
+-- Tag no-parallel: due to attaching to system.query_log
+-- Tag no-replicated-database: Replicated database will has extra queries
+
+-- Attach MV to system.query_log and check that writing query_log will not fail
+
+set log_queries=1;
+
+drop table if exists log_proxy_02572;
+drop table if exists push_to_logs_proxy_mv_02572;
+
+-- create log tables
+system flush logs;
+create table log_proxy_02572 as system.query_log engine=Distributed('test_shard_localhost', currentDatabase(), 'receiver_02572');
+create materialized view push_to_logs_proxy_mv_02572 to log_proxy_02572 as select * from system.query_log;
+
+select 1 format Null;
+system flush logs;
+system flush logs;
+
+drop table log_proxy_02572;
+drop table push_to_logs_proxy_mv_02572;
+
+system flush logs;
+-- lower() to pass through clickhouse-test "exception" check
+select count(), lower(type::String), errorCodeToName(exception_code)
+    from system.query_log
+    where current_database = currentDatabase()
+    group by 2, 3
+    order by 2;
diff --git a/tests/queries/0_stateless/02575_merge_prewhere_different_default_kind.reference b/tests/queries/0_stateless/02575_merge_prewhere_different_default_kind.reference
index 32db2512eab..c17e235ddad 100644
--- a/tests/queries/0_stateless/02575_merge_prewhere_different_default_kind.reference
+++ b/tests/queries/0_stateless/02575_merge_prewhere_different_default_kind.reference
@@ -1,12 +1,13 @@
 -- { echoOn }
 -- for pure PREWHERE it is not addressed yet.
 SELECT * FROM m PREWHERE a = 'OK';
-OK	0
+OK	1970-01-01	0
 SELECT * FROM m PREWHERE f = 0; -- { serverError ILLEGAL_PREWHERE }
 SELECT * FROM m WHERE f = 0 SETTINGS optimize_move_to_prewhere=0;
-OK	0
+OK	1970-01-01	0
 SELECT * FROM m WHERE f = 0 SETTINGS optimize_move_to_prewhere=1;
-OK	0
+OK	1970-01-01	0
 -- { echoOn }
 SELECT * FROM m WHERE f = 0 SETTINGS optimize_move_to_prewhere=1;
-OK	0
+OK	1970-01-01	0
+OK	1970-01-01	0
diff --git a/tests/queries/0_stateless/02575_merge_prewhere_different_default_kind.sql b/tests/queries/0_stateless/02575_merge_prewhere_different_default_kind.sql
index 0f1d582a26e..88c7923a570 100644
--- a/tests/queries/0_stateless/02575_merge_prewhere_different_default_kind.sql
+++ b/tests/queries/0_stateless/02575_merge_prewhere_different_default_kind.sql
@@ -6,20 +6,22 @@ DROP TABLE IF EXISTS t2;
 
 CREATE TABLE m
 (
-    `a` String,
-    `f` UInt8
+    a String,
+    date Date,
+    f UInt8
 )
 ENGINE = Merge(currentDatabase(), '^(t1|t2)$');
 
 CREATE TABLE t1
 (
     a String,
+    date Date,
     f UInt8 ALIAS 0
 )
 ENGINE = MergeTree
 ORDER BY tuple()
 SETTINGS index_granularity = 8192;
-INSERT INTO t1 VALUES ('OK');
+INSERT INTO t1 (a) VALUES ('OK');
 
 -- { echoOn }
 -- for pure PREWHERE it is not addressed yet.
@@ -32,12 +34,13 @@ SELECT * FROM m WHERE f = 0 SETTINGS optimize_move_to_prewhere=1;
 CREATE TABLE t2
 (
     a String,
+    date Date,
     f UInt8,
 )
 ENGINE = MergeTree
 ORDER BY tuple()
 SETTINGS index_granularity = 8192;
-INSERT INTO t2 VALUES ('OK', 1);
+INSERT INTO t2 (a) VALUES ('OK');
 
 -- { echoOn }
 SELECT * FROM m WHERE f = 0 SETTINGS optimize_move_to_prewhere=1;
diff --git a/tests/queries/0_stateless/02577_keepermap_delete_update.reference b/tests/queries/0_stateless/02577_keepermap_delete_update.reference
index 8ca8c0ca5a2..4a71f86a258 100644
--- a/tests/queries/0_stateless/02577_keepermap_delete_update.reference
+++ b/tests/queries/0_stateless/02577_keepermap_delete_update.reference
@@ -1,32 +1,32 @@
-1	Some string	0
-2	Some other string	0
-3	random	0
-4	random2	0
+1	Some string	0	0
+2	Some other string	0	0
+3	random	0	0
+4	random2	0	0
 -----------
-3	random	0
-4	random2	0
+3	random	0	0
+4	random2	0	0
 -----------
-3	random	0
+3	random	0	0
 -----------
 0
 -----------
-1	String	10
-2	String	20
-3	String	30
-4	String	40
+1	String	10	0
+2	String	20	0
+3	String	30	0
+4	String	40	0
 -----------
-1	String	10
-2	String	20
-3	Another	30
-4	Another	40
+1	String	10	0
+2	String	20	0
+3	Another	30	1
+4	Another	40	1
 -----------
-1	String	10
-2	String	20
-3	Another	30
-4	Another	40
+1	String	10	0
+2	String	20	0
+3	Another	30	1
+4	Another	40	1
 -----------
-1	String	102
-2	String	202
-3	Another	302
-4	Another	402
+1	String	102	1
+2	String	202	1
+3	Another	302	2
+4	Another	402	2
 -----------
diff --git a/tests/queries/0_stateless/02577_keepermap_delete_update.sql b/tests/queries/0_stateless/02577_keepermap_delete_update.sql
index 199a653822c..ae80e6ead29 100644
--- a/tests/queries/0_stateless/02577_keepermap_delete_update.sql
+++ b/tests/queries/0_stateless/02577_keepermap_delete_update.sql
@@ -1,42 +1,44 @@
 -- Tags: no-ordinary-database, no-fasttest
 
-DROP TABLE IF EXISTS 02661_keepermap_delete_update;
+DROP TABLE IF EXISTS 02577_keepermap_delete_update;
 
-CREATE TABLE 02661_keepermap_delete_update (key UInt64, value String, value2 UInt64) ENGINE=KeeperMap('/' ||  currentDatabase() || '/test02661_keepermap_delete_update') PRIMARY KEY(key);
+CREATE TABLE 02577_keepermap_delete_update (key UInt64, value String, value2 UInt64) ENGINE=KeeperMap('/' ||  currentDatabase() || '/test02577_keepermap_delete_update') PRIMARY KEY(key);
 
-INSERT INTO 02661_keepermap_delete_update VALUES (1, 'Some string', 0), (2, 'Some other string', 0), (3, 'random', 0), (4, 'random2', 0);
+INSERT INTO 02577_keepermap_delete_update VALUES (1, 'Some string', 0), (2, 'Some other string', 0), (3, 'random', 0), (4, 'random2', 0);
 
-SELECT * FROM 02661_keepermap_delete_update ORDER BY key;
+SELECT *, _version FROM 02577_keepermap_delete_update ORDER BY key;
 SELECT '-----------';
 
-DELETE FROM 02661_keepermap_delete_update WHERE value LIKE 'Some%string';
+DELETE FROM 02577_keepermap_delete_update WHERE value LIKE 'Some%string';
 
-SELECT * FROM 02661_keepermap_delete_update ORDER BY key;
+SELECT *, _version FROM 02577_keepermap_delete_update ORDER BY key;
 SELECT '-----------';
 
-ALTER TABLE 02661_keepermap_delete_update DELETE WHERE key >= 4;
+ALTER TABLE 02577_keepermap_delete_update DELETE WHERE key >= 4;
 
-SELECT * FROM 02661_keepermap_delete_update ORDER BY key;
+SELECT *, _version FROM 02577_keepermap_delete_update ORDER BY key;
 SELECT '-----------';
 
-DELETE FROM 02661_keepermap_delete_update WHERE 1 = 1;
-SELECT count() FROM 02661_keepermap_delete_update;
+DELETE FROM 02577_keepermap_delete_update WHERE 1 = 1;
+SELECT count() FROM 02577_keepermap_delete_update;
 SELECT '-----------';
 
-INSERT INTO 02661_keepermap_delete_update VALUES (1, 'String', 10), (2, 'String', 20), (3, 'String', 30), (4, 'String', 40);
-SELECT * FROM 02661_keepermap_delete_update ORDER BY key;
+INSERT INTO 02577_keepermap_delete_update VALUES (1, 'String', 10), (2, 'String', 20), (3, 'String', 30), (4, 'String', 40);
+SELECT *, _version FROM 02577_keepermap_delete_update ORDER BY key;
 SELECT '-----------';
 
-ALTER TABLE 02661_keepermap_delete_update UPDATE value = 'Another' WHERE key > 2;
-SELECT * FROM 02661_keepermap_delete_update ORDER BY key;
+ALTER TABLE 02577_keepermap_delete_update UPDATE value = 'Another' WHERE key > 2;
+SELECT *, _version FROM 02577_keepermap_delete_update ORDER BY key;
 SELECT '-----------';
 
-ALTER TABLE 02661_keepermap_delete_update UPDATE key = key * 10 WHERE 1 = 1; -- { serverError 36 }
-SELECT * FROM 02661_keepermap_delete_update ORDER BY key;
+ALTER TABLE 02577_keepermap_delete_update UPDATE key = key * 10 WHERE 1 = 1; -- { serverError BAD_ARGUMENTS }
+SELECT *, _version FROM 02577_keepermap_delete_update ORDER BY key;
 SELECT '-----------';
 
-ALTER TABLE 02661_keepermap_delete_update UPDATE value2 = value2 * 10 + 2 WHERE value2 < 100;
-SELECT * FROM 02661_keepermap_delete_update ORDER BY key;
+ALTER TABLE 02577_keepermap_delete_update UPDATE value2 = value2 * 10 + 2 WHERE value2 < 100;
+SELECT *, _version FROM 02577_keepermap_delete_update ORDER BY key;
 SELECT '-----------';
 
-DROP TABLE IF EXISTS 02661_keepermap_delete_update;
+ALTER TABLE 02577_keepermap_delete_update ON CLUSTER test_shard_localhost UPDATE value2 = value2 * 10 + 2 WHERE value2 < 100; -- { serverError BAD_ARGUMENTS }
+
+DROP TABLE IF EXISTS 02577_keepermap_delete_update;
diff --git a/tests/queries/0_stateless/02579_fill_empty_chunk.sql b/tests/queries/0_stateless/02579_fill_empty_chunk.sql
index 14ae322d8c9..cbdbd7a9f84 100644
--- a/tests/queries/0_stateless/02579_fill_empty_chunk.sql
+++ b/tests/queries/0_stateless/02579_fill_empty_chunk.sql
@@ -1,5 +1,7 @@
 -- this SELECT produces empty chunk in FillingTransform
 
+SET enable_positional_arguments = 0;
+
 SELECT
     2 AS x,
     arrayJoin([NULL, NULL, NULL])
diff --git a/tests/queries/0_stateless/02581_parquet_arrow_orc_compressions.reference b/tests/queries/0_stateless/02581_parquet_arrow_orc_compressions.reference
new file mode 100644
index 00000000000..492b12dba56
--- /dev/null
+++ b/tests/queries/0_stateless/02581_parquet_arrow_orc_compressions.reference
@@ -0,0 +1,14 @@
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
diff --git a/tests/queries/0_stateless/02581_parquet_arrow_orc_compressions.sh b/tests/queries/0_stateless/02581_parquet_arrow_orc_compressions.sh
new file mode 100755
index 00000000000..89b5147f026
--- /dev/null
+++ b/tests/queries/0_stateless/02581_parquet_arrow_orc_compressions.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format Parquet settings output_format_parquet_compression_method='none'" | $CLICKHOUSE_LOCAL --input-format=Parquet -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format Parquet settings output_format_parquet_compression_method='lz4'" | $CLICKHOUSE_LOCAL --input-format=Parquet -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format Parquet settings output_format_parquet_compression_method='snappy'" | $CLICKHOUSE_LOCAL --input-format=Parquet -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format Parquet settings output_format_parquet_compression_method='zstd'" | $CLICKHOUSE_LOCAL --input-format=Parquet -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format Parquet settings output_format_parquet_compression_method='brotli'" | $CLICKHOUSE_LOCAL --input-format=Parquet -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format Parquet settings output_format_parquet_compression_method='gzip'" | $CLICKHOUSE_LOCAL --input-format=Parquet -q "select count() from table"
+
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format ORC settings output_format_orc_compression_method='none'" | $CLICKHOUSE_LOCAL --input-format=ORC -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format ORC settings output_format_orc_compression_method='lz4'" | $CLICKHOUSE_LOCAL --input-format=ORC -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format ORC settings output_format_orc_compression_method='zstd'" | $CLICKHOUSE_LOCAL --input-format=ORC -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format ORC settings output_format_orc_compression_method='zlib'" | $CLICKHOUSE_LOCAL --input-format=ORC -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format ORC settings output_format_orc_compression_method='snappy'" | $CLICKHOUSE_LOCAL --input-format=ORC -q "select count() from table"
+
+
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format Arrow settings output_format_arrow_compression_method='none'" | $CLICKHOUSE_LOCAL --input-format=Arrow -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format Arrow settings output_format_arrow_compression_method='lz4_frame'" | $CLICKHOUSE_LOCAL --input-format=Arrow -q "select count() from table"
+$CLICKHOUSE_LOCAL -q "select * from numbers(10) format Arrow settings output_format_arrow_compression_method='zstd'" | $CLICKHOUSE_LOCAL --input-format=Arrow -q "select count() from table"
+
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.reference b/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.reference
new file mode 100644
index 00000000000..3a92fcf283d
--- /dev/null
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.reference
@@ -0,0 +1,9 @@
+40000
+all_1_1_0
+all_2_2_0
+all_3_3_0
+all_4_4_0
+5000	all_1_1_0_9
+5000	all_2_2_0_9
+5000	all_3_3_0_9
+5000	all_4_4_0_9
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.sql b/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.sql
new file mode 100644
index 00000000000..92e372d0cdb
--- /dev/null
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.sql
@@ -0,0 +1,27 @@
+-- Tags: long, no-debug, no-tsan, no-asan, no-ubsan, no-msan
+
+DROP TABLE IF EXISTS 02581_trips;
+
+CREATE TABLE 02581_trips(id UInt32, description String, id2 UInt32, PRIMARY KEY id) ENGINE=MergeTree ORDER BY id;
+
+-- Make multiple parts
+INSERT INTO 02581_trips SELECT number, '', number FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+10000000, '', number FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+20000000, '', number FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+30000000, '', number FROM numbers(10000);
+
+SELECT count() from 02581_trips WHERE description = '';
+
+SELECT name FROM system.parts WHERE database=currentDatabase() AND table = '02581_trips' AND active ORDER BY name;
+
+-- Start multiple mutations simultaneously
+SYSTEM STOP MERGES 02581_trips;
+ALTER TABLE 02581_trips UPDATE description='5' WHERE id IN (SELECT (number*10 + 5)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=0;
+ALTER TABLE 02581_trips UPDATE description='6' WHERE id IN (SELECT (number*10 + 6)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=0;
+ALTER TABLE 02581_trips DELETE WHERE id IN (SELECT (number*10 + 7)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=0;
+ALTER TABLE 02581_trips UPDATE description='8' WHERE id IN (SELECT (number*10 + 8)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=0;
+SYSTEM START MERGES 02581_trips;
+DELETE FROM 02581_trips WHERE id IN (SELECT (number*10 + 9)::UInt32 FROM numbers(200000000));
+SELECT count(), _part from 02581_trips WHERE description = '' GROUP BY _part ORDER BY _part;
+
+DROP TABLE 02581_trips;
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks.reference b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks.reference
new file mode 100644
index 00000000000..452e0e0801e
--- /dev/null
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks.reference
@@ -0,0 +1,58 @@
+-- { echoOn }
+SELECT count(), _part FROM 02581_trips GROUP BY _part ORDER BY _part;
+10000	all_1_1_0
+10000	all_2_2_0
+10000	all_3_3_0
+10000	all_4_4_0
+-- Run mutation with a 'IN big subquery'
+ALTER TABLE 02581_trips UPDATE description='1' WHERE id IN (SELECT (number*10+1)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+SELECT count(), _part FROM 02581_trips WHERE description = '' GROUP BY _part ORDER BY _part;
+9000	all_1_1_0_5
+9000	all_2_2_0_5
+9000	all_3_3_0_5
+9000	all_4_4_0_5
+ALTER TABLE 02581_trips UPDATE description='2' WHERE id IN (SELECT (number*10+2)::UInt32 FROM numbers(10000)) SETTINGS mutations_sync=2;
+SELECT count(), _part FROM 02581_trips WHERE description = '' GROUP BY _part ORDER BY _part;
+8000	all_1_1_0_6
+8000	all_2_2_0_6
+8000	all_3_3_0_6
+8000	all_4_4_0_6
+-- Run mutation with `id 'IN big subquery'
+ALTER TABLE 02581_trips UPDATE description='a' WHERE id IN (SELECT (number*10)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+28000
+ALTER TABLE 02581_trips UPDATE description='a' WHERE id IN (SELECT (number*10 + 1)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2, max_rows_in_set=1000;
+SELECT count() from 02581_trips WHERE description = '';
+28000
+-- Run mutation with func(`id`) IN big subquery
+ALTER TABLE 02581_trips UPDATE description='b' WHERE id::UInt64 IN (SELECT (number*10 + 2)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+28000
+-- Run mutation with non-PK `id2` IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c' WHERE id2 IN (SELECT (number*10 + 3)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+24000
+-- Run mutation with PK and non-PK IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c'
+WHERE
+    (id IN (SELECT (number*10 + 4)::UInt32 FROM numbers(10000000))) OR
+    (id2 IN (SELECT (number*10 + 4)::UInt32 FROM numbers(10000000)))
+SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+20000
+-- Run mutation with PK and non-PK IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c'
+WHERE
+    (id::UInt64 IN (SELECT (number*10 + 5)::UInt32 FROM numbers(10000000))) OR
+    (id2::UInt64 IN (SELECT (number*10 + 5)::UInt32 FROM numbers(10000000)))
+SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+16000
+-- Run mutation with PK and non-PK IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c'
+WHERE
+    (id::UInt32 IN (SELECT (number*10 + 6)::UInt32 FROM numbers(10000000))) OR
+    ((id2+1)::String IN (SELECT (number*10 + 6)::UInt32 FROM numbers(10000000)))
+SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+12000
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks.sql b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks.sql
new file mode 100644
index 00000000000..7b52a89b16f
--- /dev/null
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks.sql
@@ -0,0 +1,60 @@
+DROP TABLE IF EXISTS 02581_trips;
+
+CREATE TABLE 02581_trips(id UInt32, id2 UInt32, description String) ENGINE=MergeTree ORDER BY id;
+
+-- Make multiple parts
+INSERT INTO 02581_trips SELECT number, number, '' FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+10000, number+10000, '' FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+20000, number+20000, '' FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+30000, number+30000, '' FROM numbers(10000);
+
+-- { echoOn }
+SELECT count(), _part FROM 02581_trips GROUP BY _part ORDER BY _part;
+
+-- Run mutation with a 'IN big subquery'
+ALTER TABLE 02581_trips UPDATE description='1' WHERE id IN (SELECT (number*10+1)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+SELECT count(), _part FROM 02581_trips WHERE description = '' GROUP BY _part ORDER BY _part;
+ALTER TABLE 02581_trips UPDATE description='2' WHERE id IN (SELECT (number*10+2)::UInt32 FROM numbers(10000)) SETTINGS mutations_sync=2;
+SELECT count(), _part FROM 02581_trips WHERE description = '' GROUP BY _part ORDER BY _part;
+
+-- Run mutation with `id 'IN big subquery'
+ALTER TABLE 02581_trips UPDATE description='a' WHERE id IN (SELECT (number*10)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+ALTER TABLE 02581_trips UPDATE description='a' WHERE id IN (SELECT (number*10 + 1)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2, max_rows_in_set=1000;
+SELECT count() from 02581_trips WHERE description = '';
+
+-- Run mutation with func(`id`) IN big subquery
+ALTER TABLE 02581_trips UPDATE description='b' WHERE id::UInt64 IN (SELECT (number*10 + 2)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+-- Run mutation with non-PK `id2` IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c' WHERE id2 IN (SELECT (number*10 + 3)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+-- Run mutation with PK and non-PK IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c'
+WHERE
+    (id IN (SELECT (number*10 + 4)::UInt32 FROM numbers(10000000))) OR
+    (id2 IN (SELECT (number*10 + 4)::UInt32 FROM numbers(10000000)))
+SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+-- Run mutation with PK and non-PK IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c'
+WHERE
+    (id::UInt64 IN (SELECT (number*10 + 5)::UInt32 FROM numbers(10000000))) OR
+    (id2::UInt64 IN (SELECT (number*10 + 5)::UInt32 FROM numbers(10000000)))
+SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+-- Run mutation with PK and non-PK IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c'
+WHERE
+    (id::UInt32 IN (SELECT (number*10 + 6)::UInt32 FROM numbers(10000000))) OR
+    ((id2+1)::String IN (SELECT (number*10 + 6)::UInt32 FROM numbers(10000000)))
+SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+-- { echoOff }
+
+DROP TABLE 02581_trips;
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.reference b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.reference
new file mode 100644
index 00000000000..3a7410d925f
--- /dev/null
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.reference
@@ -0,0 +1,12 @@
+40000
+all_1_1_0
+all_2_2_0
+all_3_3_0
+all_4_4_0
+36000
+32000
+28000
+24000
+20000
+16000
+12000
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.sql b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.sql
new file mode 100644
index 00000000000..21ff453cd8e
--- /dev/null
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.sql
@@ -0,0 +1,57 @@
+-- Tags: long, no-debug, no-tsan, no-asan, no-ubsan, no-msan
+
+DROP TABLE IF EXISTS 02581_trips;
+
+CREATE TABLE 02581_trips(id UInt32, description String, id2 UInt32, PRIMARY KEY id) ENGINE=MergeTree ORDER BY id;
+
+-- Make multiple parts
+INSERT INTO 02581_trips SELECT number, '', number FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+10000000, '', number FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+20000000, '', number FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+30000000, '', number FROM numbers(10000);
+
+SELECT count() from 02581_trips WHERE description = '';
+
+
+SELECT name FROM system.parts WHERE database=currentDatabase() AND table = '02581_trips' AND active ORDER BY name;
+
+-- Run mutation with `id` a 'IN big subquery'
+ALTER TABLE 02581_trips UPDATE description='a' WHERE id IN (SELECT (number*10)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+ALTER TABLE 02581_trips UPDATE description='a' WHERE id IN (SELECT (number*10 + 1)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=2, max_rows_in_set=1000;
+SELECT count() from 02581_trips WHERE description = '';
+
+-- Run mutation with func(`id`) IN big subquery
+ALTER TABLE 02581_trips UPDATE description='b' WHERE id::UInt64 IN (SELECT (number*10 + 2)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+-- Run mutation with non-PK `id2` IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c' WHERE id2 IN (SELECT (number*10 + 3)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+-- Run mutation with PK and non-PK IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c'
+WHERE
+    (id IN (SELECT (number*10 + 4)::UInt32 FROM numbers(200000000))) OR
+    (id2 IN (SELECT (number*10 + 4)::UInt32 FROM numbers(200000000)))
+SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+-- Run mutation with PK and non-PK IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c'
+WHERE
+    (id::UInt64 IN (SELECT (number*10 + 5)::UInt32 FROM numbers(200000000))) OR
+    (id2::UInt64 IN (SELECT (number*10 + 5)::UInt32 FROM numbers(200000000)))
+SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+-- Run mutation with PK and non-PK IN big subquery
+ALTER TABLE 02581_trips UPDATE description='c'
+WHERE
+    (id::UInt32 IN (SELECT (number*10 + 6)::UInt32 FROM numbers(200000000))) OR
+    ((id2+1)::String IN (SELECT (number*10 + 6)::UInt32 FROM numbers(200000000)))
+SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+DROP TABLE 02581_trips;
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_with_storage_set.reference b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_with_storage_set.reference
new file mode 100644
index 00000000000..267105947b9
--- /dev/null
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_with_storage_set.reference
@@ -0,0 +1,7 @@
+40000
+all_1_1_0
+all_2_2_0
+all_3_3_0
+all_4_4_0
+36000
+32000
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_with_storage_set.sql b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_with_storage_set.sql
new file mode 100644
index 00000000000..9a14f78628b
--- /dev/null
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_with_storage_set.sql
@@ -0,0 +1,32 @@
+DROP TABLE IF EXISTS 02581_trips;
+
+CREATE TABLE 02581_trips(id UInt32, description String, id2 UInt32, PRIMARY KEY id) ENGINE=MergeTree ORDER BY id;
+
+-- Make multiple parts
+INSERT INTO 02581_trips SELECT number, '', number FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+10000000, '', number FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+20000000, '', number FROM numbers(10000);
+INSERT INTO 02581_trips SELECT number+30000000, '', number FROM numbers(10000);
+
+SELECT count() from 02581_trips WHERE description = '';
+
+
+SELECT name FROM system.parts WHERE database=currentDatabase() AND table = '02581_trips' AND active ORDER BY name;
+
+CREATE TABLE 02581_set (id UInt32) ENGINE = Set;
+
+INSERT INTO 02581_set SELECT number*10+7 FROM numbers(10000000);
+
+-- Run mutation with PK `id` IN big set
+ALTER TABLE 02581_trips UPDATE description='d' WHERE id IN 02581_set SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+INSERT INTO 02581_set SELECT number*10+8 FROM numbers(10000000);
+
+-- Run mutation with PK `id` IN big set after it is updated
+ALTER TABLE 02581_trips UPDATE description='d' WHERE id IN 02581_set SETTINGS mutations_sync=2;
+SELECT count() from 02581_trips WHERE description = '';
+
+
+DROP TABLE 02581_set;
+DROP TABLE 02581_trips;
diff --git a/tests/queries/0_stateless/25337_width_bucket.reference b/tests/queries/0_stateless/02581_width_bucket.reference
similarity index 100%
rename from tests/queries/0_stateless/25337_width_bucket.reference
rename to tests/queries/0_stateless/02581_width_bucket.reference
diff --git a/tests/queries/0_stateless/25337_width_bucket.sql b/tests/queries/0_stateless/02581_width_bucket.sql
similarity index 100%
rename from tests/queries/0_stateless/25337_width_bucket.sql
rename to tests/queries/0_stateless/02581_width_bucket.sql
diff --git a/tests/queries/0_stateless/25339_analyzer_join_subquery_empty_column_list.reference b/tests/queries/0_stateless/02582_analyzer_join_subquery_empty_column_list.reference
similarity index 100%
rename from tests/queries/0_stateless/25339_analyzer_join_subquery_empty_column_list.reference
rename to tests/queries/0_stateless/02582_analyzer_join_subquery_empty_column_list.reference
diff --git a/tests/queries/0_stateless/25339_analyzer_join_subquery_empty_column_list.sql b/tests/queries/0_stateless/02582_analyzer_join_subquery_empty_column_list.sql
similarity index 100%
rename from tests/queries/0_stateless/25339_analyzer_join_subquery_empty_column_list.sql
rename to tests/queries/0_stateless/02582_analyzer_join_subquery_empty_column_list.sql
diff --git a/tests/queries/0_stateless/02664_async_reading_with_small_limit.reference b/tests/queries/0_stateless/02582_async_reading_with_small_limit.reference
similarity index 100%
rename from tests/queries/0_stateless/02664_async_reading_with_small_limit.reference
rename to tests/queries/0_stateless/02582_async_reading_with_small_limit.reference
diff --git a/tests/queries/0_stateless/02664_async_reading_with_small_limit.sql b/tests/queries/0_stateless/02582_async_reading_with_small_limit.sql
similarity index 100%
rename from tests/queries/0_stateless/02664_async_reading_with_small_limit.sql
rename to tests/queries/0_stateless/02582_async_reading_with_small_limit.sql
diff --git a/tests/queries/0_stateless/02670_map_literal_cast.reference b/tests/queries/0_stateless/02583_map_literal_cast.reference
similarity index 100%
rename from tests/queries/0_stateless/02670_map_literal_cast.reference
rename to tests/queries/0_stateless/02583_map_literal_cast.reference
diff --git a/tests/queries/0_stateless/02670_map_literal_cast.sql b/tests/queries/0_stateless/02583_map_literal_cast.sql
similarity index 100%
rename from tests/queries/0_stateless/02670_map_literal_cast.sql
rename to tests/queries/0_stateless/02583_map_literal_cast.sql
diff --git a/tests/queries/0_stateless/02584_compressor_codecs.reference b/tests/queries/0_stateless/02584_compressor_codecs.reference
new file mode 100644
index 00000000000..bb0850568bb
--- /dev/null
+++ b/tests/queries/0_stateless/02584_compressor_codecs.reference
@@ -0,0 +1,9 @@
+1
+1
+1
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/02584_compressor_codecs.sh b/tests/queries/0_stateless/02584_compressor_codecs.sh
new file mode 100755
index 00000000000..fad6847b792
--- /dev/null
+++ b/tests/queries/0_stateless/02584_compressor_codecs.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo "Hello, World!" > 02584_test_data
+
+$CLICKHOUSE_COMPRESSOR --codec 'Delta' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out'
+$CLICKHOUSE_COMPRESSOR --codec 'Delta(5)' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out' 2>&1 | grep -c "ILLEGAL_CODEC_PARAMETER";
+$CLICKHOUSE_COMPRESSOR --codec 'Delta([1,2])' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out' 2>&1 | grep -c "ILLEGAL_CODEC_PARAMETER";
+$CLICKHOUSE_COMPRESSOR --codec 'Delta(4)' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out';
+
+$CLICKHOUSE_COMPRESSOR --codec 'DoubleDelta' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out'
+$CLICKHOUSE_COMPRESSOR --codec 'DoubleDelta(5)' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out' 2>&1 | grep -c "ILLEGAL_CODEC_PARAMETER";
+$CLICKHOUSE_COMPRESSOR --codec 'DoubleDelta([1,2])' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out' 2>&1 | grep -c "ILLEGAL_CODEC_PARAMETER";
+$CLICKHOUSE_COMPRESSOR --codec 'DoubleDelta(4)' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out';
+
+$CLICKHOUSE_COMPRESSOR --codec 'Gorilla' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out'
+$CLICKHOUSE_COMPRESSOR --codec 'Gorilla(5)' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out' 2>&1 | grep -c "ILLEGAL_CODEC_PARAMETER";
+$CLICKHOUSE_COMPRESSOR --codec 'Gorilla([1,2])' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out' 2>&1 | grep -c "ILLEGAL_CODEC_PARAMETER";
+$CLICKHOUSE_COMPRESSOR --codec 'Gorilla(4)' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out';
+
+$CLICKHOUSE_COMPRESSOR --codec 'FPC' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out';
+$CLICKHOUSE_COMPRESSOR --codec 'FPC(5)' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out';
+$CLICKHOUSE_COMPRESSOR --codec 'FPC(5, 1)' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out' 2>&1 | grep -c "ILLEGAL_CODEC_PARAMETER";
+$CLICKHOUSE_COMPRESSOR --codec 'FPC([1,2,3])' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out' 2>&1 | grep -c "ILLEGAL_CODEC_PARAMETER";
+$CLICKHOUSE_COMPRESSOR --codec 'FPC(5, 4)' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out';
+
+
+$CLICKHOUSE_COMPRESSOR --codec 'T64' --codec 'LZ4' --input '02584_test_data' --output '02584_test_out' 2>&1 | grep -c "CANNOT_COMPRESS";
+
+rm 02584_test_data 02584_test_out
+
diff --git a/tests/queries/0_stateless/02674_range_ipv4.reference b/tests/queries/0_stateless/02584_range_ipv4.reference
similarity index 100%
rename from tests/queries/0_stateless/02674_range_ipv4.reference
rename to tests/queries/0_stateless/02584_range_ipv4.reference
diff --git a/tests/queries/0_stateless/02674_range_ipv4.sql b/tests/queries/0_stateless/02584_range_ipv4.sql
similarity index 100%
rename from tests/queries/0_stateless/02674_range_ipv4.sql
rename to tests/queries/0_stateless/02584_range_ipv4.sql
diff --git a/tests/queries/0_stateless/00975_live_view_create.reference b/tests/queries/0_stateless/02585_query_status_deadlock.reference
similarity index 100%
rename from tests/queries/0_stateless/00975_live_view_create.reference
rename to tests/queries/0_stateless/02585_query_status_deadlock.reference
diff --git a/tests/queries/0_stateless/02585_query_status_deadlock.sh b/tests/queries/0_stateless/02585_query_status_deadlock.sh
new file mode 100755
index 00000000000..227ecb1c1b2
--- /dev/null
+++ b/tests/queries/0_stateless/02585_query_status_deadlock.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+QUERY_ID="${CLICKHOUSE_DATABASE}_test_02585_query_to_kill_id_1"
+
+$CLICKHOUSE_CLIENT --query_id="$QUERY_ID" -n -q "
+create temporary table tmp as select * from numbers(500000000);
+select * from remote('127.0.0.2', 'system.numbers_mt') where number in (select * from tmp);" &> /dev/null &
+
+$CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
+
+while true
+do
+    res=$($CLICKHOUSE_CLIENT -q "select query, event_time from system.query_log where query_id = '$QUERY_ID' and query like 'select%' limit 1")
+    if [ -n "$res" ]; then
+        break
+    fi
+    sleep  1
+done
+
+$CLICKHOUSE_CLIENT -q "kill query where query_id = '$QUERY_ID' sync" &> /dev/null
+
diff --git a/tests/queries/0_stateless/02587_csv_big_numbers_inference.reference b/tests/queries/0_stateless/02587_csv_big_numbers_inference.reference
new file mode 100644
index 00000000000..5b38606d1fd
--- /dev/null
+++ b/tests/queries/0_stateless/02587_csv_big_numbers_inference.reference
@@ -0,0 +1,4 @@
+c1	Nullable(Float64)					
+100000000000000000000
+c1	Nullable(Float64)					
+-100000000000000000000
diff --git a/tests/queries/0_stateless/02587_csv_big_numbers_inference.sql b/tests/queries/0_stateless/02587_csv_big_numbers_inference.sql
new file mode 100644
index 00000000000..45a93034524
--- /dev/null
+++ b/tests/queries/0_stateless/02587_csv_big_numbers_inference.sql
@@ -0,0 +1,5 @@
+desc format('CSV', '100000000000000000000');
+select * from format('CSV', '100000000000000000000');
+desc format('CSV', '-100000000000000000000');
+select * from format('CSV', '-100000000000000000000');
+
diff --git a/tests/queries/0_stateless/02588_avro_date32_and_decimals.reference b/tests/queries/0_stateless/02588_avro_date32_and_decimals.reference
new file mode 100644
index 00000000000..3a2d4fcf4f7
--- /dev/null
+++ b/tests/queries/0_stateless/02588_avro_date32_and_decimals.reference
@@ -0,0 +1,5 @@
+Date32	1942-08-16
+Decimal(9, 4)	4242.4242
+Decimal(18, 14)	4242.4242
+Decimal(38, 34)	4242.4242
+Decimal(76, 64)	4242.4242
diff --git a/tests/queries/0_stateless/02588_avro_date32_and_decimals.sh b/tests/queries/0_stateless/02588_avro_date32_and_decimals.sh
new file mode 100755
index 00000000000..57363b85f0e
--- /dev/null
+++ b/tests/queries/0_stateless/02588_avro_date32_and_decimals.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select toInt32(-10000)::Date32 as d format Avro" | $CLICKHOUSE_LOCAL --input-format=Avro -q "select toTypeName(d), d from table"
+
+$CLICKHOUSE_LOCAL -q "select 4242.4242::Decimal32(4) as d format Avro" | $CLICKHOUSE_LOCAL --input-format=Avro -q "select toTypeName(d), d from table"
+$CLICKHOUSE_LOCAL -q "select 4242.4242::Decimal64(14) as d format Avro" | $CLICKHOUSE_LOCAL --input-format=Avro -q "select toTypeName(d), d from table"
+$CLICKHOUSE_LOCAL -q "select 4242.4242::Decimal128(34) as d format Avro" | $CLICKHOUSE_LOCAL --input-format=Avro -q "select toTypeName(d), d from table"
+$CLICKHOUSE_LOCAL -q "select 4242.4242::Decimal256(64) as d format Avro" | $CLICKHOUSE_LOCAL --input-format=Avro -q "select toTypeName(d), d from table"
+
diff --git a/tests/queries/0_stateless/02588_parquet_bug.reference b/tests/queries/0_stateless/02588_parquet_bug.reference
new file mode 100644
index 00000000000..44de58ae5c3
--- /dev/null
+++ b/tests/queries/0_stateless/02588_parquet_bug.reference
@@ -0,0 +1,3 @@
+cta	224.0.90.10	1670964058771367936	64066044	NYSE	cqs_pillar	quote	\N	\N	\N	82.92	1	R	82.97	2	R
+1670964058771367936
+1670946478544048640	ARCA	cqs_pillar
diff --git a/tests/queries/0_stateless/02588_parquet_bug.sh b/tests/queries/0_stateless/02588_parquet_bug.sh
new file mode 100755
index 00000000000..f7e4ecf5e4c
--- /dev/null
+++ b/tests/queries/0_stateless/02588_parquet_bug.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select * from file('$CURDIR/data_parquet/02588_data.parquet') where exchange_ts = 1670964058771367936"
+$CLICKHOUSE_LOCAL -q "select exchange_ts from file('$CURDIR/data_parquet/02588_data.parquet') where exchange_ts = 1670964058771367936"
+$CLICKHOUSE_LOCAL -q "select exchange_ts, market, product from file('$CURDIR/data_parquet/02588_data.parquet') where exchange_ts = 1670946478544048640"
+
diff --git a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.reference b/tests/queries/0_stateless/02589_bson_invalid_document_size.reference
similarity index 100%
rename from tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.reference
rename to tests/queries/0_stateless/02589_bson_invalid_document_size.reference
diff --git a/tests/queries/0_stateless/02589_bson_invalid_document_size.sql b/tests/queries/0_stateless/02589_bson_invalid_document_size.sql
new file mode 100644
index 00000000000..b536b8d5c92
--- /dev/null
+++ b/tests/queries/0_stateless/02589_bson_invalid_document_size.sql
@@ -0,0 +1,4 @@
+set input_format_parallel_parsing=1;
+set max_threads=0;
+select * from format(BSONEachRow, 'x UInt32', x'00000000'); -- {serverError INCORRECT_DATA}
+
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live.reference b/tests/queries/0_stateless/02590_bson_duplicate_column.reference
similarity index 100%
rename from tests/queries/0_stateless/00979_live_view_watch_live.reference
rename to tests/queries/0_stateless/02590_bson_duplicate_column.reference
diff --git a/tests/queries/0_stateless/02590_bson_duplicate_column.sql b/tests/queries/0_stateless/02590_bson_duplicate_column.sql
new file mode 100644
index 00000000000..ea70fb9ba68
--- /dev/null
+++ b/tests/queries/0_stateless/02590_bson_duplicate_column.sql
@@ -0,0 +1 @@
+select * from format(BSONEachRow, 'x UInt32, y UInt32', x'1a0000001078002a0000001078002a0000001079002a00000000'); -- {serverError INCORRECT_DATA}
diff --git a/tests/queries/0_stateless/02590_interserver_mode_client_info_initial_query_start_time.reference b/tests/queries/0_stateless/02590_interserver_mode_client_info_initial_query_start_time.reference
new file mode 100644
index 00000000000..fbce8ae2026
--- /dev/null
+++ b/tests/queries/0_stateless/02590_interserver_mode_client_info_initial_query_start_time.reference
@@ -0,0 +1,8 @@
+SELECT
+3	0	0
+3	0	0
+INSERT
+CHECK
+1
+2
+6	0	2
diff --git a/tests/queries/0_stateless/02590_interserver_mode_client_info_initial_query_start_time.sh b/tests/queries/0_stateless/02590_interserver_mode_client_info_initial_query_start_time.sh
new file mode 100755
index 00000000000..5da643bd17b
--- /dev/null
+++ b/tests/queries/0_stateless/02590_interserver_mode_client_info_initial_query_start_time.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: interserver mode requires SSL
+#
+# Test that checks that some of ClientInfo correctly passed in inter-server mode.
+# NOTE: we need .sh test (.sql is not enough) because queries on remote nodes does not have current_database = currentDatabase()
+#
+# Check-style suppression: select * from system.query_log where current_database = currentDatabase();
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+function get_query_id() { random_str 10; }
+
+$CLICKHOUSE_CLIENT -nm -q "
+    drop table if exists buf;
+    drop table if exists dist;
+    drop table if exists data;
+
+    create table data (key Int) engine=Memory();
+    create table dist as data engine=Distributed(test_cluster_interserver_secret, currentDatabase(), data, key);
+    create table dist_dist as data engine=Distributed(test_cluster_interserver_secret, currentDatabase(), dist, key);
+    system stop distributed sends dist;
+"
+
+echo "SELECT"
+query_id="$(get_query_id)"
+# initialize connection, but actually if there are other tables that uses this
+# cluster then, it will be created long time ago, but this is OK for this
+# test, since we care about the difference between NOW() and there should
+# not be any significant difference.
+$CLICKHOUSE_CLIENT --prefer_localhost_replica=0 --query_id "$query_id" -q "select * from dist"
+$CLICKHOUSE_CLIENT -nm --param_query_id "$query_id" -q "
+    system flush logs;
+    select count(), countIf(initial_query_start_time_microseconds != query_start_time_microseconds), countIf(event_time - initial_query_start_time > 3) from system.query_log where type = 'QueryFinish' and initial_query_id = {query_id:String};
+"
+
+sleep 6
+
+query_id="$(get_query_id)"
+# this query (and all subsequent) should reuse the previous connection (at least most of the time)
+$CLICKHOUSE_CLIENT --prefer_localhost_replica=0 --query_id "$query_id" -q "select * from dist"
+
+$CLICKHOUSE_CLIENT -nm --param_query_id "$query_id" -q "
+    system flush logs;
+    select count(), countIf(initial_query_start_time_microseconds != query_start_time_microseconds), countIf(event_time - initial_query_start_time > 3) from system.query_log where type = 'QueryFinish' and initial_query_id = {query_id:String};
+"
+
+echo "INSERT"
+query_id="$(get_query_id)"
+$CLICKHOUSE_CLIENT --prefer_localhost_replica=0 --query_id "$query_id" -nm -q "
+    insert into dist_dist values (1),(2);
+    select * from data;
+"
+
+sleep 3
+$CLICKHOUSE_CLIENT -nm --param_query_id "$query_id" -q "system flush distributed dist_dist"
+sleep 1
+$CLICKHOUSE_CLIENT -nm --param_query_id "$query_id" -q "system flush distributed dist"
+
+echo "CHECK"
+$CLICKHOUSE_CLIENT -nm --param_query_id "$query_id" -q "
+    select * from data order by key;
+    system flush logs;
+    select count(), countIf(initial_query_start_time_microseconds != query_start_time_microseconds), countIf(event_time - initial_query_start_time > 3) from system.query_log where type = 'QueryFinish' and initial_query_id = {query_id:String};
+"
diff --git a/tests/queries/0_stateless/02591_bson_long_tuple.reference b/tests/queries/0_stateless/02591_bson_long_tuple.reference
new file mode 100644
index 00000000000..98eb634721e
Binary files /dev/null and b/tests/queries/0_stateless/02591_bson_long_tuple.reference differ
diff --git a/tests/queries/0_stateless/02591_bson_long_tuple.sql b/tests/queries/0_stateless/02591_bson_long_tuple.sql
new file mode 100644
index 00000000000..e24150c8e6d
--- /dev/null
+++ b/tests/queries/0_stateless/02591_bson_long_tuple.sql
@@ -0,0 +1,2 @@
+select tuple(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11) as x format BSONEachRow;
+
diff --git a/tests/queries/0_stateless/02591_protobuf_nested_arrays.reference b/tests/queries/0_stateless/02591_protobuf_nested_arrays.reference
new file mode 100644
index 00000000000..ff21f7fc2c9
--- /dev/null
+++ b/tests/queries/0_stateless/02591_protobuf_nested_arrays.reference
@@ -0,0 +1 @@
+[[[42,42],[],[42]],[[],[42],[42,42,42,42]]]
diff --git a/tests/queries/0_stateless/02591_protobuf_nested_arrays.sh b/tests/queries/0_stateless/02591_protobuf_nested_arrays.sh
new file mode 100755
index 00000000000..b6714932f3a
--- /dev/null
+++ b/tests/queries/0_stateless/02591_protobuf_nested_arrays.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select [[[42, 42], [], [42]], [[], [42], [42, 42, 42, 42]]] as a format Protobuf settings format_schema = '$SCHEMADIR/00825_protobuf_format_array_3dim:ABC'" | $CLICKHOUSE_LOCAL --input-format Protobuf --format_schema="$SCHEMADIR/00825_protobuf_format_array_3dim:ABC" --structure="a Array(Array(Array(Int32)))"  -q "select * from table"
+
diff --git a/tests/queries/0_stateless/02592_avro_more_types.reference b/tests/queries/0_stateless/02592_avro_more_types.reference
new file mode 100644
index 00000000000..5de415be619
--- /dev/null
+++ b/tests/queries/0_stateless/02592_avro_more_types.reference
@@ -0,0 +1,7 @@
+c1	FixedString(16)					
+c2	FixedString(16)					
+c3	FixedString(32)					
+c4	FixedString(32)					
+c5	Map(String, Int32)					
+c6	Decimal(18, 2)					
+42	42	42	42	{42:42}	2020-01-01 00:00:00.00
diff --git a/tests/queries/0_stateless/02592_avro_more_types.sh b/tests/queries/0_stateless/02592_avro_more_types.sh
new file mode 100755
index 00000000000..7b87acd5f96
--- /dev/null
+++ b/tests/queries/0_stateless/02592_avro_more_types.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select 42::Int128 as c1, 42::UInt128 as c2, 42::Int256 as c3, 42::UInt256 as c4, map(42, 42) as c5, toDateTime64('2020-01-01', 2) as c6 format Avro" | $CLICKHOUSE_LOCAL --input-format Avro --table test  -q "desc test"
+
+$CLICKHOUSE_LOCAL -q "select 42::Int128 as c1, 42::UInt128 as c2, 42::Int256 as c3, 42::UInt256 as c4, map(42, 42) as c5, toDateTime64('2020-01-01', 2) as c6 format Avro" | $CLICKHOUSE_LOCAL --structure "c1 Int128, c2 UInt128, c3 Int256, c4 UInt256, c5 Map(UInt32, UInt32), c6 DateTime64(2)" --input-format Avro --table test  -q "select * from test"
+
+
+
diff --git a/tests/queries/0_stateless/02592_avro_records_with_same_names.reference b/tests/queries/0_stateless/02592_avro_records_with_same_names.reference
new file mode 100644
index 00000000000..7237be8884e
--- /dev/null
+++ b/tests/queries/0_stateless/02592_avro_records_with_same_names.reference
@@ -0,0 +1 @@
+((1,2))	((3,4,5))
diff --git a/tests/queries/0_stateless/02592_avro_records_with_same_names.sh b/tests/queries/0_stateless/02592_avro_records_with_same_names.sh
new file mode 100755
index 00000000000..92a7846d3bd
--- /dev/null
+++ b/tests/queries/0_stateless/02592_avro_records_with_same_names.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select tuple(tuple(1, 2))::Tuple(x Tuple(a UInt32, b UInt32)) as c1, tuple(tuple(3, 4, 5))::Tuple(x Tuple(c UInt32, d UInt32, e UInt32)) as c2 format Avro" | $CLICKHOUSE_LOCAL --input-format Avro --structure 'c1 Tuple(x Tuple(a UInt32, b UInt32)), c2 Tuple(x Tuple(c UInt32, d UInt32, e UInt32))' -q "select * from table"
diff --git a/tests/queries/0_stateless/02593_bson_more_types.reference b/tests/queries/0_stateless/02593_bson_more_types.reference
new file mode 100644
index 00000000000..e84b3c8efb8
--- /dev/null
+++ b/tests/queries/0_stateless/02593_bson_more_types.reference
@@ -0,0 +1,5 @@
+{'a\\u0000b':42}
+c1	Nullable(Int32)					
+c2	Nullable(Int32)					
+c3	Map(String, Nullable(Int32))					
+a	b	{42:42}
diff --git a/tests/queries/0_stateless/02593_bson_more_types.sh b/tests/queries/0_stateless/02593_bson_more_types.sh
new file mode 100755
index 00000000000..cd7b9e0aaf3
--- /dev/null
+++ b/tests/queries/0_stateless/02593_bson_more_types.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_LOCAL -q "select map('a\0b', 42) as c1 format BSONEachRow" | $CLICKHOUSE_LOCAL --input-format BSONEachRow --table test --structure "c1 Map(String, UInt32)" -q "select * from test"
+
+$CLICKHOUSE_LOCAL -q "select 'a'::Enum8('a' = 1) as c1, 'b'::Enum16('b' = 1) as c2, map(42, 42) as c3 format BSONEachRow" | $CLICKHOUSE_LOCAL --input-format BSONEachRow --table test -q "desc test"
+
+$CLICKHOUSE_LOCAL -q "select 'a'::Enum8('a' = 1) as c1, 'b'::Enum16('b' = 1) as c2, map(42, 42) as c3 format BSONEachRow" | $CLICKHOUSE_LOCAL --input-format BSONEachRow --table test --structure "c1 Enum8('a' = 1), c2 Enum16('b' = 1), c3 Map(UInt32, UInt32)" -q "select * from test"
+
+
diff --git a/tests/queries/0_stateless/02594_msgpack_more_types.reference b/tests/queries/0_stateless/02594_msgpack_more_types.reference
new file mode 100644
index 00000000000..8ccf11ccdb4
--- /dev/null
+++ b/tests/queries/0_stateless/02594_msgpack_more_types.reference
@@ -0,0 +1,2 @@
+a	b	2020-01-01	42	42	42	42	42.42	42.42	42.42	42.42
+(42,'Hello')	({42:[1,2,3]},[([(1,2),(1,2)],'Hello',[1,2,3]),([],'World',[1])])
diff --git a/tests/queries/0_stateless/02594_msgpack_more_types.sh b/tests/queries/0_stateless/02594_msgpack_more_types.sh
new file mode 100755
index 00000000000..bddfb5ad829
--- /dev/null
+++ b/tests/queries/0_stateless/02594_msgpack_more_types.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select 'a'::Enum8('a' = 1) as c1, 'b'::Enum16('b' = 1) as c2, '2020-01-01'::Date32 as c3, 42::Int128 as c4, 42::UInt128 as c5, 42::Int256 as c6, 42::UInt256 as c7, 42.42::Decimal32(2) as c8, 42.42::Decimal64(2) as c9, 42.42::Decimal128(2) as c10, 42.42::Decimal256(2) as c11 format MsgPack" | $CLICKHOUSE_LOCAL --input-format MsgPack --structure="c1 Enum8('a' = 1), c2 Enum16('b' = 1), c3 Date32, c4 Int128, c5 UInt128, c6 Int256, c7 UInt256, c8 Decimal32(2), c9 Decimal64(2), c10 Decimal128(2), c11 Decimal256(2)" -q "select * from table"
+
+$CLICKHOUSE_LOCAL -q "select tuple(42, 'Hello') as c1, tuple(map(42, [1, 2, 3]), [tuple([tuple(1, 2), tuple(1, 2)], 'Hello', [1, 2, 3]), tuple([], 'World', [1])]) as c2 format MsgPack" | $CLICKHOUSE_LOCAL --input-format MsgPack --structure="c1 Tuple(UInt32, String), c2 Tuple(Map(UInt32, Array(UInt32)), Array(Tuple(Array(Tuple(UInt32, UInt32)), String, Array(UInt32))))" -q "select * from table"
+
diff --git a/tests/queries/0_stateless/02595_orc_arrow_parquet_more_types.reference b/tests/queries/0_stateless/02595_orc_arrow_parquet_more_types.reference
new file mode 100644
index 00000000000..dee75e5a50c
--- /dev/null
+++ b/tests/queries/0_stateless/02595_orc_arrow_parquet_more_types.reference
@@ -0,0 +1,5 @@
+42	42	42	42	a	b
+42	42	42	42	a	b
+42	42	42	42	a	b	42.42	0.0.0.0
+\N
+\N
diff --git a/tests/queries/0_stateless/02595_orc_arrow_parquet_more_types.sh b/tests/queries/0_stateless/02595_orc_arrow_parquet_more_types.sh
new file mode 100755
index 00000000000..f2127d69f37
--- /dev/null
+++ b/tests/queries/0_stateless/02595_orc_arrow_parquet_more_types.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select 42::Int128 as c1, 42::UInt128 as c2, 42::Int256 as c3, 42::UInt256 as c4, 'a'::Enum8('a' = 1) as c5, 'b'::Enum16('b' = 1) as c6 format Parquet" | $CLICKHOUSE_LOCAL --input-format Parquet --structure="c1 Int128, c2 UInt128, c3 Int256, c4 UInt256, c5 Enum8('a' = 1), c6 Enum16('b' = 1)"  -q "select * from table"
+
+$CLICKHOUSE_LOCAL -q "select 42::Int128 as c1, 42::UInt128 as c2, 42::Int256 as c3, 42::UInt256 as c4, 'a'::Enum8('a' = 1) as c5, 'b'::Enum16('b' = 1) as c6 format Arrow" | $CLICKHOUSE_LOCAL --input-format Arrow --structure="c1 Int128, c2 UInt128, c3 Int256, c4 UInt256, c5 Enum8('a' = 1), c6 Enum16('b' = 1)"  -q "select * from table"
+
+$CLICKHOUSE_LOCAL -q "select 42::Int128 as c1, 42::UInt128 as c2, 42::Int256 as c3, 42::UInt256 as c4, 'a'::Enum8('a' = 1) as c5, 'b'::Enum16('b' = 1) as c6, 42.42::Decimal256(2) as c7, '0.0.0.0'::IPv4 as c8 format ORC" | $CLICKHOUSE_LOCAL --input-format ORC --structure="c1 Int128, c2 UInt128, c3 Int256, c4 UInt256, c5 Enum8('a' = 1), c6 Enum16('b' = 1), c7 Decimal256(2), c8 IPv4"  -q "select * from table"
+
+$CLICKHOUSE_LOCAL -q "select NULL::Nullable(IPv6) as x format ORC" | $CLICKHOUSE_LOCAL --input-format ORC --structure="x Nullable(IPv6)"  -q "select * from table"
+
+$CLICKHOUSE_LOCAL -q "select NULL::Nullable(UInt256) as x format ORC" | $CLICKHOUSE_LOCAL --input-format ORC --structure="x Nullable(UInt256)"  -q "select * from table"
+
diff --git a/tests/queries/0_stateless/02596_build_set_and_remote.reference b/tests/queries/0_stateless/02596_build_set_and_remote.reference
new file mode 100644
index 00000000000..8d12196ae33
--- /dev/null
+++ b/tests/queries/0_stateless/02596_build_set_and_remote.reference
@@ -0,0 +1,19 @@
+-- {echoOn}
+SELECT arrayExists(x -> (x IN (SELECT '2')), [2]) FROM system.one;
+1
+SELECT arrayExists(x -> (x IN (SELECT '2')), [2]) FROM remote('127.0.0.{2,3}', system.one);
+1
+1
+SELECT arrayExists(x -> (x IN (SELECT '2')), [2]) FROM remote('127.0.0.{2,3}', system.one) GROUP BY NULL;
+1
+SELECT arrayExists(x -> (x IN (SELECT '2')), [2]) FROM remote('127.0.0.{2,3}', system.one) GROUP BY 1;
+1
+SELECT arrayExists(x -> (x IN (SELECT '2')), [2]) FROM remote('127.0.0.{2,3}', system.one) GROUP BY 'A';
+1
+SELECT 1 IN ( SELECT 1 ) FROM remote('127.0.0.{1,2}', system.one) GROUP BY dummy;
+1
+SELECT 1000.0001, toUInt64(arrayJoin([NULL, 257, 65536, NULL])), arrayExists(x -> (x IN (SELECT '2.55')), [-9223372036854775808]) FROM remote('127.0.0.{1,2}', system.one) GROUP BY NULL, NULL, NULL, NULL;
+1000.0001	\N	0
+1000.0001	257	0
+1000.0001	65536	0
+1000.0001	\N	0
diff --git a/tests/queries/0_stateless/02596_build_set_and_remote.sql b/tests/queries/0_stateless/02596_build_set_and_remote.sql
new file mode 100644
index 00000000000..7a904344c91
--- /dev/null
+++ b/tests/queries/0_stateless/02596_build_set_and_remote.sql
@@ -0,0 +1,14 @@
+-- {echoOn}
+SELECT arrayExists(x -> (x IN (SELECT '2')), [2]) FROM system.one;
+
+SELECT arrayExists(x -> (x IN (SELECT '2')), [2]) FROM remote('127.0.0.{2,3}', system.one);
+
+SELECT arrayExists(x -> (x IN (SELECT '2')), [2]) FROM remote('127.0.0.{2,3}', system.one) GROUP BY NULL;
+
+SELECT arrayExists(x -> (x IN (SELECT '2')), [2]) FROM remote('127.0.0.{2,3}', system.one) GROUP BY 1;
+
+SELECT arrayExists(x -> (x IN (SELECT '2')), [2]) FROM remote('127.0.0.{2,3}', system.one) GROUP BY 'A';
+
+SELECT 1 IN ( SELECT 1 ) FROM remote('127.0.0.{1,2}', system.one) GROUP BY dummy;
+
+SELECT 1000.0001, toUInt64(arrayJoin([NULL, 257, 65536, NULL])), arrayExists(x -> (x IN (SELECT '2.55')), [-9223372036854775808]) FROM remote('127.0.0.{1,2}', system.one) GROUP BY NULL, NULL, NULL, NULL;
diff --git a/tests/queries/0_stateless/02661_quantile_approx.reference b/tests/queries/0_stateless/02661_quantile_approx.reference
new file mode 100644
index 00000000000..8369363aa9b
--- /dev/null
+++ b/tests/queries/0_stateless/02661_quantile_approx.reference
@@ -0,0 +1,43 @@
+-- { echoOn }
+with arrayJoin([0, 1, 2, 10]) as x select quantilesGK(100, 0.5, 0.4, 0.1)(x);
+[1,1,0]
+with arrayJoin([0, 6, 7, 9, 10]) as x select quantileGK(100, 0.5)(x);
+7
+select quantilesGK(10000, 0.25, 0.5, 0.75, 0.0, 1.0, 0, 1)(number + 1) from numbers(1000);
+[250,500,750,1,1000,1,1000]
+select quantilesGK(10000, 0.01, 0.1, 0.11)(number + 1) from numbers(10);
+[1,1,2]
+with number + 1 as col select quantilesGK(10000, 0.25, 0.5, 0.75)(col), count(col), quantilesGK(10000, 0.0, 1.0)(col), sum(col) from numbers(1000);
+[250,500,750]	1000	[1,1000]	500500
+select quantilesGK(1, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number + 1) from numbers(1000);
+[1,1,1,1,1]
+select quantilesGK(10, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number + 1) from numbers(1000);
+[1,156,156,296,715]
+select quantilesGK(100, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number + 1) from numbers(1000);
+[93,192,251,306,770]
+select quantilesGK(1000, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number + 1) from numbers(1000);
+[99,199,249,313,776]
+select quantilesGK(10000, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number + 1) from numbers(1000);
+[100,200,250,314,777]
+select medianGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select medianGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select quantileGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select quantileGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select medianGK(100)(number) from numbers(10);
+4
+select quantileGK(100)(number) from numbers(10);
+4
+select quantileGK(100, 0.5)(number) from numbers(10);
+4
+select quantileGK(100, 0.5, 0.75)(number) from numbers(10); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select quantileGK('abc', 0.5)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select quantileGK(1.23, 0.5)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select quantileGK(-100, 0.5)(number) from numbers(10); -- { serverError BAD_ARGUMENTS }
+select quantilesGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select quantilesGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select quantilesGK(100)(number) from numbers(10); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select quantilesGK(100, 0.5)(number) from numbers(10);
+[4]
+select quantilesGK('abc', 0.5, 0.75)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select quantilesGK(1.23, 0.5, 0.75)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select quantilesGK(-100, 0.5, 0.75)(number) from numbers(10); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/02661_quantile_approx.sql b/tests/queries/0_stateless/02661_quantile_approx.sql
new file mode 100644
index 00000000000..52c2979ad44
--- /dev/null
+++ b/tests/queries/0_stateless/02661_quantile_approx.sql
@@ -0,0 +1,41 @@
+set allow_experimental_analyzer = 1;
+
+-- { echoOn }
+with arrayJoin([0, 1, 2, 10]) as x select quantilesGK(100, 0.5, 0.4, 0.1)(x);
+with arrayJoin([0, 6, 7, 9, 10]) as x select quantileGK(100, 0.5)(x);
+
+select quantilesGK(10000, 0.25, 0.5, 0.75, 0.0, 1.0, 0, 1)(number + 1) from numbers(1000);
+select quantilesGK(10000, 0.01, 0.1, 0.11)(number + 1) from numbers(10);
+
+with number + 1 as col select quantilesGK(10000, 0.25, 0.5, 0.75)(col), count(col), quantilesGK(10000, 0.0, 1.0)(col), sum(col) from numbers(1000);
+
+select quantilesGK(1, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number + 1) from numbers(1000);
+select quantilesGK(10, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number + 1) from numbers(1000);
+select quantilesGK(100, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number + 1) from numbers(1000);
+select quantilesGK(1000, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number + 1) from numbers(1000);
+select quantilesGK(10000, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number + 1) from numbers(1000);
+
+
+select medianGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select medianGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+
+select quantileGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select quantileGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+
+select medianGK(100)(number) from numbers(10);
+select quantileGK(100)(number) from numbers(10);
+select quantileGK(100, 0.5)(number) from numbers(10);
+select quantileGK(100, 0.5, 0.75)(number) from numbers(10); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select quantileGK('abc', 0.5)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select quantileGK(1.23, 0.5)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select quantileGK(-100, 0.5)(number) from numbers(10); -- { serverError BAD_ARGUMENTS }
+
+select quantilesGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select quantilesGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+
+select quantilesGK(100)(number) from numbers(10); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select quantilesGK(100, 0.5)(number) from numbers(10);
+select quantilesGK('abc', 0.5, 0.75)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select quantilesGK(1.23, 0.5, 0.75)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select quantilesGK(-100, 0.5, 0.75)(number) from numbers(10); -- { serverError BAD_ARGUMENTS }
+-- { echoOff }
diff --git a/tests/queries/0_stateless/02662_first_last_value.reference b/tests/queries/0_stateless/02662_first_last_value.reference
new file mode 100644
index 00000000000..0c4503d61ac
--- /dev/null
+++ b/tests/queries/0_stateless/02662_first_last_value.reference
@@ -0,0 +1,20 @@
+-- { echo }
+
+-- create table
+drop table if exists test;
+create table test(`a` Nullable(Int32), `b` Nullable(Int32)) ENGINE = Memory;
+insert into test (a,b) values (1,null), (2,3), (4, 5), (6,null);
+-- first value
+select first_value(b) from test;
+3
+select first_value(b) ignore nulls from test;
+3
+select first_value(b) respect nulls from test;
+\N
+-- last value
+select last_value(b) from test;
+5
+select last_value(b) ignore nulls from test;
+5
+select last_value(b) respect nulls from test;
+\N
diff --git a/tests/queries/0_stateless/02662_first_last_value.sql b/tests/queries/0_stateless/02662_first_last_value.sql
new file mode 100644
index 00000000000..126e89f5325
--- /dev/null
+++ b/tests/queries/0_stateless/02662_first_last_value.sql
@@ -0,0 +1,16 @@
+-- { echo }
+
+-- create table
+drop table if exists test;
+create table test(`a` Nullable(Int32), `b` Nullable(Int32)) ENGINE = Memory;
+insert into test (a,b) values (1,null), (2,3), (4, 5), (6,null);
+
+-- first value
+select first_value(b) from test;
+select first_value(b) ignore nulls from test;
+select first_value(b) respect nulls from test;
+
+-- last value
+select last_value(b) from test;
+select last_value(b) ignore nulls from test;
+select last_value(b) respect nulls from test;
diff --git a/tests/queries/0_stateless/02662_sparse_columns_mutations_1.reference b/tests/queries/0_stateless/02662_sparse_columns_mutations_1.reference
new file mode 100644
index 00000000000..3f5c8b6ed1f
--- /dev/null
+++ b/tests/queries/0_stateless/02662_sparse_columns_mutations_1.reference
@@ -0,0 +1,13 @@
+1_1_1_0	String	Sparse
+477	['','foo']
+1_1_1_0_2	Nullable(String)	Default
+477	['','foo']
+1_1_1_0_2	Nullable(String)	Default
+2_3_3_0	Nullable(String)	Default
+954	['','foo']
+1_1_1_0_4	String	Default
+2_3_3_0_4	String	Default
+954	['','foo']
+1_1_1_1_4	String	Sparse
+2_3_3_1_4	String	Sparse
+954	['','foo']
diff --git a/tests/queries/0_stateless/02662_sparse_columns_mutations_1.sql b/tests/queries/0_stateless/02662_sparse_columns_mutations_1.sql
new file mode 100644
index 00000000000..3bf37e8e62b
--- /dev/null
+++ b/tests/queries/0_stateless/02662_sparse_columns_mutations_1.sql
@@ -0,0 +1,49 @@
+SET mutations_sync = 2;
+
+DROP TABLE IF EXISTS t_sparse_mutations_1;
+
+CREATE TABLE t_sparse_mutations_1 (key UInt8, id UInt64, s String)
+ENGINE = MergeTree ORDER BY id PARTITION BY key
+SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
+
+INSERT INTO t_sparse_mutations_1 SELECT 1, number, if (number % 21 = 0, 'foo', '') FROM numbers (10000);
+
+SELECT name, type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_1' AND column = 's' AND active
+ORDER BY name;
+
+SELECT countIf(s = 'foo'), arraySort(groupUniqArray(s)) FROM t_sparse_mutations_1;
+
+ALTER TABLE t_sparse_mutations_1 MODIFY COLUMN s Nullable(String);
+
+SELECT name, type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_1' AND column = 's' AND active
+ORDER BY name;
+
+SELECT countIf(s = 'foo'), arraySort(groupUniqArray(s)) FROM t_sparse_mutations_1;
+
+INSERT INTO t_sparse_mutations_1 SELECT 2, number, if (number % 21 = 0, 'foo', '') FROM numbers (10000);
+
+SELECT name, type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_1' AND column = 's' AND active
+ORDER BY name;
+
+SELECT countIf(s = 'foo'), arraySort(groupUniqArray(s)) FROM t_sparse_mutations_1;
+
+ALTER TABLE t_sparse_mutations_1 MODIFY COLUMN s String;
+
+SELECT name, type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_1' AND column = 's' AND active
+ORDER BY name;
+
+SELECT countIf(s = 'foo'), arraySort(groupUniqArray(s)) FROM t_sparse_mutations_1;
+
+OPTIMIZE TABLE t_sparse_mutations_1 FINAL;
+
+SELECT name, type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_1' AND column = 's' AND active
+ORDER BY name;
+
+SELECT countIf(s = 'foo'), arraySort(groupUniqArray(s)) FROM t_sparse_mutations_1;
+
+DROP TABLE t_sparse_mutations_1;
diff --git a/tests/queries/0_stateless/02662_sparse_columns_mutations_2.reference b/tests/queries/0_stateless/02662_sparse_columns_mutations_2.reference
new file mode 100644
index 00000000000..64eb0119982
--- /dev/null
+++ b/tests/queries/0_stateless/02662_sparse_columns_mutations_2.reference
@@ -0,0 +1,6 @@
+String	Default
+10000	49995000
+String	Default
+770	3848845
+String	Sparse
+770	3848845
diff --git a/tests/queries/0_stateless/02662_sparse_columns_mutations_2.sql b/tests/queries/0_stateless/02662_sparse_columns_mutations_2.sql
new file mode 100644
index 00000000000..561bd164200
--- /dev/null
+++ b/tests/queries/0_stateless/02662_sparse_columns_mutations_2.sql
@@ -0,0 +1,33 @@
+SET mutations_sync = 2;
+
+DROP TABLE IF EXISTS t_sparse_mutations_2;
+
+CREATE TABLE t_sparse_mutations_2 (key UInt8, id UInt64, s String)
+ENGINE = MergeTree ORDER BY id PARTITION BY key
+SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
+
+INSERT INTO t_sparse_mutations_2 SELECT 1, number, toString(number) FROM numbers (10000);
+
+SELECT type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_2' AND column = 's' AND active
+ORDER BY name;
+
+SELECT count(), sum(s::UInt64) FROM t_sparse_mutations_2 WHERE s != '';
+
+ALTER TABLE t_sparse_mutations_2 UPDATE s = '' WHERE id % 13 != 0;
+
+SELECT type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_2' AND column = 's' AND active
+ORDER BY name;
+
+SELECT count(), sum(s::UInt64) FROM t_sparse_mutations_2 WHERE s != '';
+
+OPTIMIZE TABLE t_sparse_mutations_2 FINAL;
+
+SELECT type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_2' AND column = 's' AND active
+ORDER BY name;
+
+SELECT count(), sum(s::UInt64) FROM t_sparse_mutations_2 WHERE s != '';
+
+DROP TABLE t_sparse_mutations_2;
diff --git a/tests/queries/0_stateless/02662_sparse_columns_mutations_3.reference b/tests/queries/0_stateless/02662_sparse_columns_mutations_3.reference
new file mode 100644
index 00000000000..1501fd27fd5
--- /dev/null
+++ b/tests/queries/0_stateless/02662_sparse_columns_mutations_3.reference
@@ -0,0 +1,11 @@
+String	Default
+Tuple(UInt64, UInt64, String, String, String)	Default	['1','2','3','4','5']	['UInt64','UInt64','String','String','String']	['Default','Default','Default','Default','Default']
+10000	0	['1']	['0']	['']
+Tuple(UInt64, UInt64, String, String, String)	Default	['1','2','3','4','5']	['UInt64','UInt64','String','String','String']	['Default','Sparse','Default','Default','Sparse']
+10000	0	['1']	['0']	['']
+Tuple(UInt64, UInt64, UInt64, UInt64, String)	Default	['1','2','3','4','5']	['UInt64','UInt64','UInt64','UInt64','String']	['Default','Sparse','Default','Default','Sparse']
+10000	0	10000	0	['']
+Tuple(UInt64, UInt64, UInt64, UInt64, String)	Default	['1','2','3','4','5']	['UInt64','UInt64','UInt64','UInt64','String']	['Default','Sparse','Default','Sparse','Sparse']
+10000	0	10000	0	['']
+Tuple(Nullable(UInt64), Nullable(UInt64), Nullable(UInt64), Nullable(UInt64), Nullable(String))	Default	['1','1.null','2','2.null','3','3.null','4','4.null','5','5.null']	['Nullable(UInt64)','UInt8','Nullable(UInt64)','UInt8','Nullable(UInt64)','UInt8','Nullable(UInt64)','UInt8','Nullable(String)','UInt8']	['Default','Default','Default','Default','Default','Default','Default','Default','Default','Default']
+10000	0	10000	0	['']
diff --git a/tests/queries/0_stateless/02662_sparse_columns_mutations_3.sql b/tests/queries/0_stateless/02662_sparse_columns_mutations_3.sql
new file mode 100644
index 00000000000..6e66336dcbc
--- /dev/null
+++ b/tests/queries/0_stateless/02662_sparse_columns_mutations_3.sql
@@ -0,0 +1,85 @@
+SET mutations_sync = 2;
+
+DROP TABLE IF EXISTS t_sparse_mutations_3;
+
+CREATE TABLE t_sparse_mutations_3 (key UInt8, id UInt64, s String)
+ENGINE = MergeTree ORDER BY id PARTITION BY key
+SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
+
+INSERT INTO t_sparse_mutations_3 SELECT 1, number, toString(tuple(1, 0, '1', '0', '')) FROM numbers (10000);
+
+SELECT type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_3' AND column = 's' AND active
+ORDER BY name;
+
+ALTER TABLE t_sparse_mutations_3 MODIFY COLUMN s Tuple(UInt64, UInt64, String, String, String);
+
+SELECT
+    type,
+    serialization_kind,
+    subcolumns.names,
+    subcolumns.types,
+    subcolumns.serializations
+FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_3' AND column = 's' AND active
+ORDER BY name;
+
+SELECT sum(s.1), sum(s.2), groupUniqArray(s.3), groupUniqArray(s.4), groupUniqArray(s.5) FROM t_sparse_mutations_3;
+
+OPTIMIZE TABLE t_sparse_mutations_3 FINAL;
+
+SELECT
+    type,
+    serialization_kind,
+    subcolumns.names,
+    subcolumns.types,
+    subcolumns.serializations
+FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_3' AND column = 's' AND active
+ORDER BY name;
+
+SELECT sum(s.1), sum(s.2), groupUniqArray(s.3), groupUniqArray(s.4), groupUniqArray(s.5) FROM t_sparse_mutations_3;
+
+ALTER TABLE t_sparse_mutations_3 MODIFY COLUMN s Tuple(UInt64, UInt64, UInt64, UInt64, String);
+
+SELECT
+    type,
+    serialization_kind,
+    subcolumns.names,
+    subcolumns.types,
+    subcolumns.serializations
+FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_3' AND column = 's' AND active
+ORDER BY name;
+
+SELECT sum(s.1), sum(s.2), sum(s.3), sum(s.4), groupUniqArray(s.5) FROM t_sparse_mutations_3;
+
+OPTIMIZE TABLE t_sparse_mutations_3 FINAL;
+
+SELECT
+    type,
+    serialization_kind,
+    subcolumns.names,
+    subcolumns.types,
+    subcolumns.serializations
+FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_3' AND column = 's' AND active
+ORDER BY name;
+
+SELECT sum(s.1), sum(s.2), sum(s.3), sum(s.4), groupUniqArray(s.5) FROM t_sparse_mutations_3;
+
+ALTER TABLE t_sparse_mutations_3 MODIFY COLUMN s Tuple(Nullable(UInt64), Nullable(UInt64), Nullable(UInt64), Nullable(UInt64), Nullable(String));
+
+SELECT
+    type,
+    serialization_kind,
+    subcolumns.names,
+    subcolumns.types,
+    subcolumns.serializations
+FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_3' AND column = 's' AND active
+ORDER BY name;
+
+SELECT sum(s.1), sum(s.2), sum(s.3), sum(s.4), groupUniqArray(s.5) FROM t_sparse_mutations_3;
+
+DROP TABLE t_sparse_mutations_3;
diff --git a/tests/queries/0_stateless/02662_sparse_columns_mutations_4.reference b/tests/queries/0_stateless/02662_sparse_columns_mutations_4.reference
new file mode 100644
index 00000000000..2e24ab44f9a
--- /dev/null
+++ b/tests/queries/0_stateless/02662_sparse_columns_mutations_4.reference
@@ -0,0 +1,2 @@
+UInt64	Sparse
+String	Default
diff --git a/tests/queries/0_stateless/02662_sparse_columns_mutations_4.sql b/tests/queries/0_stateless/02662_sparse_columns_mutations_4.sql
new file mode 100644
index 00000000000..039af658489
--- /dev/null
+++ b/tests/queries/0_stateless/02662_sparse_columns_mutations_4.sql
@@ -0,0 +1,21 @@
+SET mutations_sync = 2;
+
+DROP TABLE IF EXISTS t_sparse_mutations_4;
+
+CREATE TABLE t_sparse_mutations_4 (k UInt64, v UInt64)
+ENGINE = MergeTree ORDER BY k
+SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
+
+INSERT INTO t_sparse_mutations_4 SELECT number, 0 FROM numbers(10000);
+
+SELECT type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_4' AND column = 'v' AND active
+ORDER BY name;
+
+ALTER TABLE t_sparse_mutations_4 MODIFY COLUMN v String;
+
+SELECT type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_4' AND column = 'v' AND active
+ORDER BY name;
+
+DROP TABLE t_sparse_mutations_4;
diff --git a/tests/queries/0_stateless/02662_sparse_columns_mutations_5.reference b/tests/queries/0_stateless/02662_sparse_columns_mutations_5.reference
new file mode 100644
index 00000000000..698d61cbb24
--- /dev/null
+++ b/tests/queries/0_stateless/02662_sparse_columns_mutations_5.reference
@@ -0,0 +1,2 @@
+Tuple(UInt64, UInt64)	Default	['1','2']	['UInt64','UInt64']	['Sparse','Sparse']
+Tuple(UInt64, String)	Default	['1','2']	['UInt64','String']	['Sparse','Default']
diff --git a/tests/queries/0_stateless/02662_sparse_columns_mutations_5.sql b/tests/queries/0_stateless/02662_sparse_columns_mutations_5.sql
new file mode 100644
index 00000000000..79bac836bdc
--- /dev/null
+++ b/tests/queries/0_stateless/02662_sparse_columns_mutations_5.sql
@@ -0,0 +1,21 @@
+SET mutations_sync = 2;
+
+DROP TABLE IF EXISTS t_sparse_mutations_5;
+
+CREATE TABLE t_sparse_mutations_5 (k UInt64, t Tuple(UInt64, UInt64))
+ENGINE = MergeTree ORDER BY k
+SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
+
+INSERT INTO t_sparse_mutations_5 SELECT number, (0, 0) FROM numbers(10000);
+
+SELECT type, serialization_kind, subcolumns.names, subcolumns.types, subcolumns.serializations FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_5' AND column = 't' AND active
+ORDER BY name;
+
+ALTER TABLE t_sparse_mutations_5 MODIFY COLUMN t Tuple(UInt64, String);
+
+SELECT type, serialization_kind, subcolumns.names, subcolumns.types, subcolumns.serializations FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_mutations_5' AND column = 't' AND active
+ORDER BY name;
+
+DROP TABLE t_sparse_mutations_5;
diff --git a/tests/queries/0_stateless/02668_logical_optimizer_removing_redundant_checks.reference b/tests/queries/0_stateless/02668_logical_optimizer_removing_redundant_checks.reference
new file mode 100644
index 00000000000..d083e178586
--- /dev/null
+++ b/tests/queries/0_stateless/02668_logical_optimizer_removing_redundant_checks.reference
@@ -0,0 +1,89 @@
+1	test
+3	another
+QUERY id: 0
+  PROJECTION COLUMNS
+    a Int32
+    b LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: Int32, source_id: 3
+      COLUMN id: 4, column_name: b, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.02668_logical_optimizer
+  WHERE
+    FUNCTION id: 5, function_name: in, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          COLUMN id: 7, column_name: a, result_type: Int32, source_id: 3
+          CONSTANT id: 8, constant_value: Tuple_(UInt64_1, UInt64_3), constant_value_type: Tuple(UInt8, UInt8)
+1	test
+QUERY id: 0
+  PROJECTION COLUMNS
+    a Int32
+    b LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: Int32, source_id: 3
+      COLUMN id: 4, column_name: b, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.02668_logical_optimizer
+  WHERE
+    FUNCTION id: 5, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          COLUMN id: 7, column_name: a, result_type: Int32, source_id: 3
+          CONSTANT id: 8, constant_value: UInt64_1, constant_value_type: UInt8
+QUERY id: 0
+  PROJECTION COLUMNS
+    a Int32
+    b LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: Int32, source_id: 3
+      COLUMN id: 4, column_name: b, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.02668_logical_optimizer
+  WHERE
+    CONSTANT id: 5, constant_value: UInt64_0, constant_value_type: UInt8
+3	another
+QUERY id: 0
+  PROJECTION COLUMNS
+    a Int32
+    b LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: Int32, source_id: 3
+      COLUMN id: 4, column_name: b, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.02668_logical_optimizer
+  WHERE
+    FUNCTION id: 5, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          FUNCTION id: 7, function_name: equals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 8, nodes: 2
+                COLUMN id: 9, column_name: a, result_type: Int32, source_id: 3
+                CONSTANT id: 10, constant_value: UInt64_3, constant_value_type: UInt8
+          FUNCTION id: 11, function_name: equals, function_type: ordinary, result_type: LowCardinality(UInt8)
+            ARGUMENTS
+              LIST id: 12, nodes: 2
+                COLUMN id: 13, column_name: b, result_type: LowCardinality(String), source_id: 3
+                CONSTANT id: 14, constant_value: \'another\', constant_value_type: String
+2	test2
+QUERY id: 0
+  PROJECTION COLUMNS
+    a Int32
+    b LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: Int32, source_id: 3
+      COLUMN id: 4, column_name: b, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.02668_logical_optimizer
+  WHERE
+    FUNCTION id: 5, function_name: equals, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          COLUMN id: 7, column_name: a, result_type: Int32, source_id: 3
+          CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
diff --git a/tests/queries/0_stateless/02668_logical_optimizer_removing_redundant_checks.sql b/tests/queries/0_stateless/02668_logical_optimizer_removing_redundant_checks.sql
new file mode 100644
index 00000000000..f20ef412215
--- /dev/null
+++ b/tests/queries/0_stateless/02668_logical_optimizer_removing_redundant_checks.sql
@@ -0,0 +1,26 @@
+SET allow_experimental_analyzer = 1;
+
+DROP TABLE IF EXISTS 02668_logical_optimizer;
+
+CREATE TABLE 02668_logical_optimizer
+(a Int32, b LowCardinality(String))
+ENGINE=Memory;
+
+INSERT INTO 02668_logical_optimizer VALUES (1, 'test'), (2, 'test2'), (3, 'another');
+
+SET optimize_min_equality_disjunction_chain_length = 2;
+
+SELECT * FROM 02668_logical_optimizer WHERE a = 1 OR 3 = a OR 1 = a;
+EXPLAIN QUERY TREE SELECT * FROM 02668_logical_optimizer WHERE a = 1 OR 3 = a OR 1 = a;
+
+SELECT * FROM 02668_logical_optimizer WHERE a = 1 OR 1 = a;
+EXPLAIN QUERY TREE SELECT * FROM 02668_logical_optimizer WHERE a = 1 OR 1 = a;
+
+SELECT * FROM 02668_logical_optimizer WHERE a = 1 AND 2 = a;
+EXPLAIN QUERY TREE SELECT * FROM 02668_logical_optimizer WHERE a = 1 AND 2 = a;
+
+SELECT * FROM 02668_logical_optimizer WHERE 3 = a AND b = 'another' AND a = 3;
+EXPLAIN QUERY TREE SELECT * FROM 02668_logical_optimizer WHERE a = 3 AND b = 'another' AND a = 3;
+
+SELECT * FROM 02668_logical_optimizer WHERE a = 2 AND 2 = a;
+EXPLAIN QUERY TREE SELECT * FROM 02668_logical_optimizer WHERE a = 2 AND 2 = a;
diff --git a/tests/queries/0_stateless/02668_parse_datetime.reference b/tests/queries/0_stateless/02668_parse_datetime.reference
new file mode 100644
index 00000000000..b7215ac3718
--- /dev/null
+++ b/tests/queries/0_stateless/02668_parse_datetime.reference
@@ -0,0 +1,243 @@
+-- { echoOn }
+-- year
+select parseDateTime('2020', '%Y', 'UTC') = toDateTime('2020-01-01', 'UTC');
+1
+-- month
+select parseDateTime('02', '%m', 'UTC') = toDateTime('2000-02-01', 'UTC');
+1
+select parseDateTime('07', '%m', 'UTC') = toDateTime('2000-07-01', 'UTC');
+1
+select parseDateTime('11-', '%m-', 'UTC') = toDateTime('2000-11-01', 'UTC');
+1
+select parseDateTime('00', '%m'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('13', '%m'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('12345', '%m'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('02', '%c', 'UTC') = toDateTime('2000-02-01', 'UTC');
+1
+select parseDateTime('07', '%c', 'UTC') = toDateTime('2000-07-01', 'UTC');
+1
+select parseDateTime('11-', '%c-', 'UTC') = toDateTime('2000-11-01', 'UTC');
+1
+select parseDateTime('00', '%c'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('13', '%c'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('12345', '%c'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('jun', '%b', 'UTC') = toDateTime('2000-06-01', 'UTC');
+1
+select parseDateTime('JUN', '%b', 'UTC') = toDateTime('2000-06-01', 'UTC');
+1
+select parseDateTime('abc', '%b'); -- { serverError CANNOT_PARSE_DATETIME }
+set formatdatetime_parsedatetime_m_is_month_name = 1;
+select parseDateTime('may', '%M', 'UTC') = toDateTime('2000-05-01', 'UTC');
+1
+select parseDateTime('MAY', '%M', 'UTC') = toDateTime('2000-05-01', 'UTC');
+1
+select parseDateTime('september', '%M', 'UTC') = toDateTime('2000-09-01', 'UTC');
+1
+select parseDateTime('summer', '%M'); -- { serverError CANNOT_PARSE_DATETIME }
+set formatdatetime_parsedatetime_m_is_month_name = 0;
+select parseDateTime('08', '%M', 'UTC') = toDateTime('1970-01-01 00:08:00', 'UTC');
+1
+select parseDateTime('59', '%M', 'UTC') = toDateTime('1970-01-01 00:59:00', 'UTC');
+1
+select parseDateTime('00/', '%M/', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('60', '%M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('-1', '%M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+set formatdatetime_parsedatetime_m_is_month_name = 1;
+-- day of month
+select parseDateTime('07', '%d', 'UTC') = toDateTime('2000-01-07', 'UTC');
+1
+select parseDateTime('01', '%d', 'UTC') = toDateTime('2000-01-01', 'UTC');
+1
+select parseDateTime('/11', '/%d', 'UTC') = toDateTime('2000-01-11', 'UTC');
+1
+select parseDateTime('00', '%d'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('32', '%d'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('12345', '%d'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('02-31', '%m-%d'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('04-31', '%m-%d'); -- { serverError CANNOT_PARSE_DATETIME }
+-- The last one is chosen if multiple months of year if supplied
+select parseDateTime('01 31 20 02', '%m %d %d %m', 'UTC') = toDateTime('2000-02-20', 'UTC');
+1
+select parseDateTime('02 31 20 04', '%m %d %d %m', 'UTC') = toDateTime('2000-04-20', 'UTC');
+1
+select parseDateTime('02 31 01', '%m %d %m', 'UTC') = toDateTime('2000-01-31', 'UTC');
+1
+select parseDateTime('2000-02-29', '%Y-%m-%d', 'UTC') = toDateTime('2000-02-29', 'UTC');
+1
+select parseDateTime('2001-02-29', '%Y-%m-%d'); -- { serverError CANNOT_PARSE_DATETIME }
+-- day of year
+select parseDateTime('001', '%j', 'UTC') = toDateTime('2000-01-01', 'UTC');
+1
+select parseDateTime('007', '%j', 'UTC') = toDateTime('2000-01-07', 'UTC');
+1
+select parseDateTime('/031/', '/%j/', 'UTC') = toDateTime('2000-01-31', 'UTC');
+1
+select parseDateTime('032', '%j', 'UTC') = toDateTime('2000-02-01', 'UTC');
+1
+select parseDateTime('060', '%j', 'UTC') = toDateTime('2000-02-29', 'UTC');
+1
+select parseDateTime('365', '%j', 'UTC') = toDateTime('2000-12-30', 'UTC');
+1
+select parseDateTime('366', '%j', 'UTC') = toDateTime('2000-12-31', 'UTC');
+1
+select parseDateTime('1980 001', '%Y %j', 'UTC') = toDateTime('1980-01-01', 'UTC');
+1
+select parseDateTime('1980 007', '%Y %j', 'UTC') = toDateTime('1980-01-07', 'UTC');
+1
+select parseDateTime('1980 /007', '%Y /%j', 'UTC') = toDateTime('1980-01-07', 'UTC');
+1
+select parseDateTime('1980 /031/', '%Y /%j/', 'UTC') = toDateTime('1980-01-31', 'UTC');
+1
+select parseDateTime('1980 032', '%Y %j', 'UTC') = toDateTime('1980-02-01', 'UTC');
+1
+select parseDateTime('1980 060', '%Y %j', 'UTC') = toDateTime('1980-02-29', 'UTC');
+1
+select parseDateTime('1980 366', '%Y %j', 'UTC') = toDateTime('1980-12-31', 'UTC');
+1
+select parseDateTime('1981 366', '%Y %j'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('367', '%j'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('000', '%j'); -- { serverError CANNOT_PARSE_DATETIME }
+-- The last one is chosen if multiple day of years are supplied.
+select parseDateTime('2000 366 2001', '%Y %j %Y'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('2001 366 2000', '%Y %j %Y', 'UTC') = toDateTime('2000-12-31', 'UTC');
+1
+-- hour of day
+select parseDateTime('07', '%H', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTime('23', '%H', 'UTC') = toDateTime('1970-01-01 23:00:00', 'UTC');
+1
+select parseDateTime('00', '%H', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('10', '%H', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+1
+select parseDateTime('24', '%H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('-1', '%H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('1234567', '%H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('07', '%k', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTime('23', '%k', 'UTC') = toDateTime('1970-01-01 23:00:00', 'UTC');
+1
+select parseDateTime('00', '%k', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('10', '%k', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+1
+select parseDateTime('24', '%k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('-1', '%k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('1234567', '%k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- hour of half day
+select parseDateTime('07', '%h', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTime('12', '%h', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('01', '%h', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+1
+select parseDateTime('10', '%h', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+1
+select parseDateTime('00', '%h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('13', '%h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('07', '%I', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTime('12', '%I', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('01', '%I', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+1
+select parseDateTime('10', '%I', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+1
+select parseDateTime('00', '%I', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('13', '%I', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%I', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('07', '%l', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTime('12', '%l', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('01', '%l', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+1
+select parseDateTime('10', '%l', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+1
+select parseDateTime('00', '%l', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('13', '%l', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%l', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- half of day
+select parseDateTime('07 PM', '%H %p', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTime('07 AM', '%H %p', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTime('07 pm', '%H %p', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTime('07 am', '%H %p', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTime('00 AM', '%H %p', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('00 PM', '%H %p', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('00 am', '%H %p', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('00 pm', '%H %p', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('01 PM', '%h %p', 'UTC') = toDateTime('1970-01-01 13:00:00', 'UTC');
+1
+select parseDateTime('01 AM', '%h %p', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+1
+select parseDateTime('06 PM', '%h %p', 'UTC') = toDateTime('1970-01-01 18:00:00', 'UTC');
+1
+select parseDateTime('06 AM', '%h %p', 'UTC') = toDateTime('1970-01-01 06:00:00', 'UTC');
+1
+select parseDateTime('12 PM', '%h %p', 'UTC') = toDateTime('1970-01-01 12:00:00', 'UTC');
+1
+select parseDateTime('12 AM', '%h %p', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+-- minute
+select parseDateTime('08', '%i', 'UTC') = toDateTime('1970-01-01 00:08:00', 'UTC');
+1
+select parseDateTime('59', '%i', 'UTC') = toDateTime('1970-01-01 00:59:00', 'UTC');
+1
+select parseDateTime('00/', '%i/', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('60', '%i', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('-1', '%i', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%i', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- second
+select parseDateTime('09', '%s', 'UTC') = toDateTime('1970-01-01 00:00:09', 'UTC');
+1
+select parseDateTime('58', '%s', 'UTC') = toDateTime('1970-01-01 00:00:58', 'UTC');
+1
+select parseDateTime('00/', '%s/', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('60', '%s', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('-1', '%s', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%s', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- microsecond
+select parseDateTime('000000', '%f', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('456789', '%f', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTime('42', '%f', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC'); -- { serverError NOT_ENOUGH_SPACE }
+select parseDateTime('12ABCD', '%f', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- mixed YMD format
+select parseDateTime('2021-01-04+23:00:00.654321', '%Y-%m-%d+%H:%i:%s.%f', 'UTC') = toDateTime('2021-01-04 23:00:00', 'UTC');
+1
+select parseDateTime('2019-07-03 11:04:10.975319', '%Y-%m-%d %H:%i:%s.%f', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+1
+select parseDateTime('10:04:11 03-07-2019.242424', '%s:%i:%H %d-%m-%Y.%f', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+1
+-- *OrZero, *OrNull, str_to_date
+select parseDateTimeOrZero('10:04:11 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+1
+select parseDateTimeOrZero('10:04:11 invalid 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeOrNull('10:04:11 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+1
+select parseDateTimeOrNull('10:04:11 invalid 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') IS NULL;
+1
+select str_to_date('10:04:11 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+1
+select sTr_To_DaTe('10:04:11 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+1
+select str_to_date('10:04:11 invalid 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') IS NULL;
+1
+-- Error handling
+select parseDateTime('12 AM'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select parseDateTime('12 AM', '%h %p', 'UTC', 'a fourth argument'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
diff --git a/tests/queries/0_stateless/02668_parse_datetime.sql b/tests/queries/0_stateless/02668_parse_datetime.sql
new file mode 100644
index 00000000000..3fb4aacedbd
--- /dev/null
+++ b/tests/queries/0_stateless/02668_parse_datetime.sql
@@ -0,0 +1,168 @@
+-- { echoOn }
+-- year
+select parseDateTime('2020', '%Y', 'UTC') = toDateTime('2020-01-01', 'UTC');
+
+-- month
+select parseDateTime('02', '%m', 'UTC') = toDateTime('2000-02-01', 'UTC');
+select parseDateTime('07', '%m', 'UTC') = toDateTime('2000-07-01', 'UTC');
+select parseDateTime('11-', '%m-', 'UTC') = toDateTime('2000-11-01', 'UTC');
+select parseDateTime('00', '%m'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('13', '%m'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('12345', '%m'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('02', '%c', 'UTC') = toDateTime('2000-02-01', 'UTC');
+select parseDateTime('07', '%c', 'UTC') = toDateTime('2000-07-01', 'UTC');
+select parseDateTime('11-', '%c-', 'UTC') = toDateTime('2000-11-01', 'UTC');
+select parseDateTime('00', '%c'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('13', '%c'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('12345', '%c'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('jun', '%b', 'UTC') = toDateTime('2000-06-01', 'UTC');
+select parseDateTime('JUN', '%b', 'UTC') = toDateTime('2000-06-01', 'UTC');
+select parseDateTime('abc', '%b'); -- { serverError CANNOT_PARSE_DATETIME }
+set formatdatetime_parsedatetime_m_is_month_name = 1;
+select parseDateTime('may', '%M', 'UTC') = toDateTime('2000-05-01', 'UTC');
+select parseDateTime('MAY', '%M', 'UTC') = toDateTime('2000-05-01', 'UTC');
+select parseDateTime('september', '%M', 'UTC') = toDateTime('2000-09-01', 'UTC');
+select parseDateTime('summer', '%M'); -- { serverError CANNOT_PARSE_DATETIME }
+set formatdatetime_parsedatetime_m_is_month_name = 0;
+select parseDateTime('08', '%M', 'UTC') = toDateTime('1970-01-01 00:08:00', 'UTC');
+select parseDateTime('59', '%M', 'UTC') = toDateTime('1970-01-01 00:59:00', 'UTC');
+select parseDateTime('00/', '%M/', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('60', '%M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('-1', '%M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+set formatdatetime_parsedatetime_m_is_month_name = 1;
+
+-- day of month
+select parseDateTime('07', '%d', 'UTC') = toDateTime('2000-01-07', 'UTC');
+select parseDateTime('01', '%d', 'UTC') = toDateTime('2000-01-01', 'UTC');
+select parseDateTime('/11', '/%d', 'UTC') = toDateTime('2000-01-11', 'UTC');
+select parseDateTime('00', '%d'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('32', '%d'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('12345', '%d'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('02-31', '%m-%d'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('04-31', '%m-%d'); -- { serverError CANNOT_PARSE_DATETIME }
+-- The last one is chosen if multiple months of year if supplied
+select parseDateTime('01 31 20 02', '%m %d %d %m', 'UTC') = toDateTime('2000-02-20', 'UTC');
+select parseDateTime('02 31 20 04', '%m %d %d %m', 'UTC') = toDateTime('2000-04-20', 'UTC');
+select parseDateTime('02 31 01', '%m %d %m', 'UTC') = toDateTime('2000-01-31', 'UTC');
+select parseDateTime('2000-02-29', '%Y-%m-%d', 'UTC') = toDateTime('2000-02-29', 'UTC');
+select parseDateTime('2001-02-29', '%Y-%m-%d'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- day of year
+select parseDateTime('001', '%j', 'UTC') = toDateTime('2000-01-01', 'UTC');
+select parseDateTime('007', '%j', 'UTC') = toDateTime('2000-01-07', 'UTC');
+select parseDateTime('/031/', '/%j/', 'UTC') = toDateTime('2000-01-31', 'UTC');
+select parseDateTime('032', '%j', 'UTC') = toDateTime('2000-02-01', 'UTC');
+select parseDateTime('060', '%j', 'UTC') = toDateTime('2000-02-29', 'UTC');
+select parseDateTime('365', '%j', 'UTC') = toDateTime('2000-12-30', 'UTC');
+select parseDateTime('366', '%j', 'UTC') = toDateTime('2000-12-31', 'UTC');
+select parseDateTime('1980 001', '%Y %j', 'UTC') = toDateTime('1980-01-01', 'UTC');
+select parseDateTime('1980 007', '%Y %j', 'UTC') = toDateTime('1980-01-07', 'UTC');
+select parseDateTime('1980 /007', '%Y /%j', 'UTC') = toDateTime('1980-01-07', 'UTC');
+select parseDateTime('1980 /031/', '%Y /%j/', 'UTC') = toDateTime('1980-01-31', 'UTC');
+select parseDateTime('1980 032', '%Y %j', 'UTC') = toDateTime('1980-02-01', 'UTC');
+select parseDateTime('1980 060', '%Y %j', 'UTC') = toDateTime('1980-02-29', 'UTC');
+select parseDateTime('1980 366', '%Y %j', 'UTC') = toDateTime('1980-12-31', 'UTC');
+select parseDateTime('1981 366', '%Y %j'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('367', '%j'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('000', '%j'); -- { serverError CANNOT_PARSE_DATETIME }
+-- The last one is chosen if multiple day of years are supplied.
+select parseDateTime('2000 366 2001', '%Y %j %Y'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('2001 366 2000', '%Y %j %Y', 'UTC') = toDateTime('2000-12-31', 'UTC');
+
+-- hour of day
+select parseDateTime('07', '%H', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTime('23', '%H', 'UTC') = toDateTime('1970-01-01 23:00:00', 'UTC');
+select parseDateTime('00', '%H', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('10', '%H', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+select parseDateTime('24', '%H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('-1', '%H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('1234567', '%H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('07', '%k', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTime('23', '%k', 'UTC') = toDateTime('1970-01-01 23:00:00', 'UTC');
+select parseDateTime('00', '%k', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('10', '%k', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+select parseDateTime('24', '%k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('-1', '%k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('1234567', '%k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- hour of half day
+select parseDateTime('07', '%h', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTime('12', '%h', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('01', '%h', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+select parseDateTime('10', '%h', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+select parseDateTime('00', '%h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('13', '%h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('07', '%I', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTime('12', '%I', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('01', '%I', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+select parseDateTime('10', '%I', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+select parseDateTime('00', '%I', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('13', '%I', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%I', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('07', '%l', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTime('12', '%l', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('01', '%l', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+select parseDateTime('10', '%l', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+select parseDateTime('00', '%l', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('13', '%l', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%l', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- half of day
+select parseDateTime('07 PM', '%H %p', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTime('07 AM', '%H %p', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTime('07 pm', '%H %p', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTime('07 am', '%H %p', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTime('00 AM', '%H %p', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('00 PM', '%H %p', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('00 am', '%H %p', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('00 pm', '%H %p', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('01 PM', '%h %p', 'UTC') = toDateTime('1970-01-01 13:00:00', 'UTC');
+select parseDateTime('01 AM', '%h %p', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+select parseDateTime('06 PM', '%h %p', 'UTC') = toDateTime('1970-01-01 18:00:00', 'UTC');
+select parseDateTime('06 AM', '%h %p', 'UTC') = toDateTime('1970-01-01 06:00:00', 'UTC');
+select parseDateTime('12 PM', '%h %p', 'UTC') = toDateTime('1970-01-01 12:00:00', 'UTC');
+select parseDateTime('12 AM', '%h %p', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+
+-- minute
+select parseDateTime('08', '%i', 'UTC') = toDateTime('1970-01-01 00:08:00', 'UTC');
+select parseDateTime('59', '%i', 'UTC') = toDateTime('1970-01-01 00:59:00', 'UTC');
+select parseDateTime('00/', '%i/', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('60', '%i', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('-1', '%i', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%i', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- second
+select parseDateTime('09', '%s', 'UTC') = toDateTime('1970-01-01 00:00:09', 'UTC');
+select parseDateTime('58', '%s', 'UTC') = toDateTime('1970-01-01 00:00:58', 'UTC');
+select parseDateTime('00/', '%s/', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('60', '%s', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('-1', '%s', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTime('123456789', '%s', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- microsecond
+select parseDateTime('000000', '%f', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('456789', '%f', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTime('42', '%f', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC'); -- { serverError NOT_ENOUGH_SPACE }
+select parseDateTime('12ABCD', '%f', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- mixed YMD format
+select parseDateTime('2021-01-04+23:00:00.654321', '%Y-%m-%d+%H:%i:%s.%f', 'UTC') = toDateTime('2021-01-04 23:00:00', 'UTC');
+select parseDateTime('2019-07-03 11:04:10.975319', '%Y-%m-%d %H:%i:%s.%f', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+select parseDateTime('10:04:11 03-07-2019.242424', '%s:%i:%H %d-%m-%Y.%f', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+
+-- *OrZero, *OrNull, str_to_date
+select parseDateTimeOrZero('10:04:11 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+select parseDateTimeOrZero('10:04:11 invalid 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeOrNull('10:04:11 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+select parseDateTimeOrNull('10:04:11 invalid 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') IS NULL;
+select str_to_date('10:04:11 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+select sTr_To_DaTe('10:04:11 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTime('2019-07-03 11:04:10', 'UTC');
+select str_to_date('10:04:11 invalid 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') IS NULL;
+
+-- Error handling
+select parseDateTime('12 AM'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select parseDateTime('12 AM', '%h %p', 'UTC', 'a fourth argument'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+
+-- { echoOff }
diff --git a/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.reference b/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.reference
new file mode 100644
index 00000000000..9fbf105dc41
--- /dev/null
+++ b/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.reference
@@ -0,0 +1,358 @@
+-- { echoOn }
+-- empty
+select parseDateTimeInJodaSyntax(' ', ' ', 'UTC') = toDateTime('1970-01-01', 'UTC');
+1
+-- era
+select parseDateTimeInJodaSyntax('AD 1999', 'G YYYY', 'UTC') = toDateTime('1999-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('ad 1999', 'G YYYY', 'UTC') = toDateTime('1999-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('Ad 1999', 'G YYYY', 'UTC') = toDateTime('1999-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('AD 1999', 'G yyyy', 'UTC') = toDateTime('1999-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('AD 1999 2000', 'G YYYY yyyy', 'UTC') = toDateTime('2000-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('AD 1999 2000', 'G yyyy YYYY', 'UTC') = toDateTime('2000-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('AD 1999', 'G Y'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('AD 1999', 'G YY'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('AD 1999', 'G YYY'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('BC', 'G'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('AB', 'G'); -- { serverError CANNOT_PARSE_DATETIME }
+-- year of era
+select parseDateTimeInJodaSyntax('2106', 'YYYY', 'UTC') = toDateTime('2106-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1970', 'YYYY', 'UTC') = toDateTime('1970-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1969', 'YYYY', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('2107', 'YYYY', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('+1999', 'YYYY', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('12', 'YY', 'UTC') = toDateTime('2012-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('69', 'YY', 'UTC') = toDateTime('2069-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('70', 'YY', 'UTC') = toDateTime('1970-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('99', 'YY', 'UTC') = toDateTime('1999-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('01', 'YY', 'UTC') = toDateTime('2001-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1', 'YY', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('99 98 97', 'YY YY YY', 'UTC') = toDateTime('1997-01-01', 'UTC');
+1
+-- year
+select parseDateTimeInJodaSyntax('12', 'yy', 'UTC') = toDateTime('2012-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('69', 'yy', 'UTC') = toDateTime('2069-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('70', 'yy', 'UTC') = toDateTime('1970-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('99', 'yy', 'UTC') = toDateTime('1999-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('+99', 'yy', 'UTC') = toDateTime('1999-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('+99 02', 'yy MM', 'UTC') = toDateTime('1999-02-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('10 +10', 'MM yy', 'UTC') = toDateTime('2010-10-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('10+2001', 'MMyyyy', 'UTC') = toDateTime('2001-10-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('+200110', 'yyyyMM', 'UTC') = toDateTime('2001-10-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1970', 'yyyy', 'UTC') = toDateTime('1970-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('2106', 'yyyy', 'UTC') = toDateTime('2106-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1969', 'yyyy', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('2107', 'yyyy', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- week year
+select parseDateTimeInJodaSyntax('2106', 'xxxx', 'UTC') = toDateTime('2106-01-04', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1971', 'xxxx', 'UTC') = toDateTime('1971-01-04', 'UTC');
+1
+select parseDateTimeInJodaSyntax('2025', 'xxxx', 'UTC') = toDateTime('2024-12-30', 'UTC');
+1
+select parseDateTimeInJodaSyntax('12', 'xx', 'UTC') = toDateTime('2012-01-02', 'UTC');
+1
+select parseDateTimeInJodaSyntax('69', 'xx', 'UTC') = toDateTime('2068-12-31', 'UTC');
+1
+select parseDateTimeInJodaSyntax('99', 'xx', 'UTC') = toDateTime('1999-01-04', 'UTC');
+1
+select parseDateTimeInJodaSyntax('01', 'xx', 'UTC') = toDateTime('2001-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('+10', 'xx', 'UTC') = toDateTime('2010-01-04', 'UTC');
+1
+select parseDateTimeInJodaSyntax('+99 01', 'xx ww', 'UTC') = toDateTime('1999-01-04', 'UTC');
+1
+select parseDateTimeInJodaSyntax('+99 02', 'xx ww', 'UTC') = toDateTime('1999-01-11', 'UTC');
+1
+select parseDateTimeInJodaSyntax('10 +10', 'ww xx', 'UTC') = toDateTime('2010-03-08', 'UTC');
+1
+select parseDateTimeInJodaSyntax('2+10', 'wwxx', 'UTC') = toDateTime('2010-01-11', 'UTC');
+1
+select parseDateTimeInJodaSyntax('+102', 'xxM', 'UTC') = toDateTime('2010-02-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('+20102', 'xxxxM', 'UTC') = toDateTime('2010-02-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1970', 'xxxx', 'UTC'); -- { serverError VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE }
+select parseDateTimeInJodaSyntax('1969', 'xxxx', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('2107', 'xxxx', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- century of era
+select parseDateTimeInJodaSyntax('20', 'CC', 'UTC') = toDateTime('2000-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('21', 'CC', 'UTC') = toDateTime('2100-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('19', 'CC', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('22', 'CC', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- month
+select parseDateTimeInJodaSyntax('1', 'M', 'UTC') = toDateTime('2000-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax(' 7', ' MM', 'UTC') = toDateTime('2000-07-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('11', 'M', 'UTC') = toDateTime('2000-11-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('10-', 'M-', 'UTC') = toDateTime('2000-10-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('-12-', '-M-', 'UTC') = toDateTime('2000-12-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0', 'M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('13', 'M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('12345', 'M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+--- Ensure MMM and MMMM specifiers consume both short- and long-form month names
+select parseDateTimeInJodaSyntax('Aug', 'MMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('AuG', 'MMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('august', 'MMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('Aug', 'MMMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('AuG', 'MMMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('august', 'MMMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+1
+--- invalid month names
+select parseDateTimeInJodaSyntax('Decembr', 'MMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('Decembr', 'MMMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('Decemberary', 'MMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('Decemberary', 'MMMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('asdf', 'MMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('asdf', 'MMMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- day of month
+select parseDateTimeInJodaSyntax('1', 'd', 'UTC') = toDateTime('2000-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('7 ', 'dd ', 'UTC') = toDateTime('2000-01-07', 'UTC');
+1
+select parseDateTimeInJodaSyntax('/11', '/dd', 'UTC') = toDateTime('2000-01-11', 'UTC');
+1
+select parseDateTimeInJodaSyntax('/31/', '/d/', 'UTC') = toDateTime('2000-01-31', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0', 'd', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('32', 'd', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('12345', 'd', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('02-31', 'M-d', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('04-31', 'M-d', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- The last one is chosen if multiple day of months are supplied.
+select parseDateTimeInJodaSyntax('2 31 1', 'M d M', 'UTC') = toDateTime('2000-01-31', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1 31 20 2', 'M d d M', 'UTC') = toDateTime('2000-02-20', 'UTC');
+1
+select parseDateTimeInJodaSyntax('2 31 20 4', 'M d d M', 'UTC') = toDateTime('2000-04-20', 'UTC');
+1
+--- Leap year
+select parseDateTimeInJodaSyntax('2020-02-29', 'YYYY-M-d', 'UTC') = toDateTime('2020-02-29', 'UTC');
+1
+select parseDateTimeInJodaSyntax('2001-02-29', 'YYYY-M-d', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- day of year
+select parseDateTimeInJodaSyntax('1', 'D', 'UTC') = toDateTime('2000-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('7 ', 'DD ', 'UTC') = toDateTime('2000-01-07', 'UTC');
+1
+select parseDateTimeInJodaSyntax('/11', '/DD', 'UTC') = toDateTime('2000-01-11', 'UTC');
+1
+select parseDateTimeInJodaSyntax('/31/', '/DDD/', 'UTC') = toDateTime('2000-01-31', 'UTC');
+1
+select parseDateTimeInJodaSyntax('32', 'D', 'UTC') = toDateTime('2000-02-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('60', 'D', 'UTC') = toDateTime('2000-02-29', 'UTC');
+1
+select parseDateTimeInJodaSyntax('365', 'D', 'UTC') = toDateTime('2000-12-30', 'UTC');
+1
+select parseDateTimeInJodaSyntax('366', 'D', 'UTC') = toDateTime('2000-12-31', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1999 1', 'yyyy D', 'UTC') = toDateTime('1999-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1999 7 ', 'yyyy DD ', 'UTC') = toDateTime('1999-01-07', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1999 /11', 'yyyy /DD', 'UTC') = toDateTime('1999-01-11', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1999 /31/', 'yyyy /DD/', 'UTC') = toDateTime('1999-01-31', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1999 32', 'yyyy D', 'UTC') = toDateTime('1999-02-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1999 60', 'yyyy D', 'UTC') = toDateTime('1999-03-01', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1999 365', 'yyyy D', 'UTC') = toDateTime('1999-12-31', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1999 366', 'yyyy D', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+--- Ensure all days of year are checked against final selected year
+select parseDateTimeInJodaSyntax('2001 366 2000', 'yyyy D yyyy', 'UTC') = toDateTime('2000-12-31', 'UTC');
+1
+select parseDateTimeInJodaSyntax('2000 366 2001', 'yyyy D yyyy', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('0', 'D', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('367', 'D', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- hour of day
+select parseDateTimeInJodaSyntax('7', 'H', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('23', 'HH', 'UTC') = toDateTime('1970-01-01 23:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0', 'HHH', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('10', 'HHHHHHHH', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+1
+--- invalid hour od day
+select parseDateTimeInJodaSyntax('24', 'H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('-1', 'H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 'H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- clock hour of day
+select parseDateTimeInJodaSyntax('7', 'k', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('24', 'kk', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1', 'kkk', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('10', 'kkkkkkkk', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+1
+-- invalid clock hour of day
+select parseDateTimeInJodaSyntax('25', 'k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('0', 'k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 'k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- hour of half day
+select parseDateTimeInJodaSyntax('7', 'K', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('11', 'KK', 'UTC') = toDateTime('1970-01-01 11:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0', 'KKK', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('10', 'KKKKKKKK', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+1
+-- invalid hour of half day
+select parseDateTimeInJodaSyntax('12', 'K', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('-1', 'K', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 'K', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- clock hour of half day
+select parseDateTimeInJodaSyntax('7', 'h', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('12', 'hh', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1', 'hhh', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('10', 'hhhhhhhh', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+1
+-- invalid clock hour of half day
+select parseDateTimeInJodaSyntax('13', 'h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('0', 'h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 'h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- half of day
+--- Half of day has no effect if hour or clockhour of day is provided hour of day tests
+select parseDateTimeInJodaSyntax('7 PM', 'H a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('7 AM', 'H a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('7 pm', 'H a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('7 am', 'H a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0 PM', 'H a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0 AM', 'H a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0 pm', 'H a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0 am', 'H a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('7 PM', 'k a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('7 AM', 'k a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('7 pm', 'k a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('7 am', 'k a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('24 PM', 'k a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('24 AM', 'k a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('24 pm', 'k a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('24 am', 'k a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+-- Half of day has effect if hour or clockhour of halfday is provided
+select parseDateTimeInJodaSyntax('0 PM', 'K a', 'UTC') = toDateTime('1970-01-01 12:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0 AM', 'K a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('6 PM', 'K a', 'UTC') = toDateTime('1970-01-01 18:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('6 AM', 'K a', 'UTC') = toDateTime('1970-01-01 06:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('11 PM', 'K a', 'UTC') = toDateTime('1970-01-01 23:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('11 AM', 'K a', 'UTC') = toDateTime('1970-01-01 11:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1 PM', 'h a', 'UTC') = toDateTime('1970-01-01 13:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1 AM', 'h a', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('6 PM', 'h a', 'UTC') = toDateTime('1970-01-01 18:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('6 AM', 'h a', 'UTC') = toDateTime('1970-01-01 06:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('12 PM', 'h a', 'UTC') = toDateTime('1970-01-01 12:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('12 AM', 'h a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+-- time gives precendent to most recent time specifier
+select parseDateTimeInJodaSyntax('0 1 AM', 'H h a', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('12 1 PM', 'H h a', 'UTC') = toDateTime('1970-01-01 13:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1 AM 0', 'h a H', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('1 AM 12', 'h a H', 'UTC') = toDateTime('1970-01-01 12:00:00', 'UTC');
+1
+-- minute
+select parseDateTimeInJodaSyntax('8', 'm', 'UTC') = toDateTime('1970-01-01 00:08:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('59', 'mm', 'UTC') = toDateTime('1970-01-01 00:59:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0/', 'mmm/', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('60', 'm', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('-1', 'm', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 'm', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- second
+select parseDateTimeInJodaSyntax('9', 's', 'UTC') = toDateTime('1970-01-01 00:00:09', 'UTC');
+1
+select parseDateTimeInJodaSyntax('58', 'ss', 'UTC') = toDateTime('1970-01-01 00:00:58', 'UTC');
+1
+select parseDateTimeInJodaSyntax('0/', 's/', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+1
+select parseDateTimeInJodaSyntax('60', 's', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('-1', 's', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 's', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- integer overflow in AST Fuzzer
+select parseDateTimeInJodaSyntax('19191919191919191919191919191919', 'CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- *OrZero, *OrNull
+select parseDateTimeInJodaSyntaxOrZero('2001 366 2000', 'yyyy D yyyy', 'UTC') = toDateTime('2000-12-31', 'UTC');
+1
+select parseDateTimeInJodaSyntaxOrZero('2001 invalid 366 2000', 'yyyy D yyyy', 'UTC') = toDateTime('1970-01-01', 'UTC');
+1
+select parseDateTimeInJodaSyntaxOrNull('2001 366 2000', 'yyyy D yyyy', 'UTC') = toDateTime('2000-12-31', 'UTC');
+1
+select parseDateTimeInJodaSyntaxOrNull('2001 invalid 366 2000', 'yyyy D yyyy', 'UTC') IS NULL;
+1
+-- Error handling
+select parseDateTimeInJodaSyntax('12 AM'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select parseDateTimeInJodaSyntax('12 AM', 'h a', 'UTC', 'a fourth argument'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
diff --git a/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.sql b/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.sql
new file mode 100644
index 00000000000..f5810d3d4c3
--- /dev/null
+++ b/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.sql
@@ -0,0 +1,244 @@
+-- { echoOn }
+-- empty
+select parseDateTimeInJodaSyntax(' ', ' ', 'UTC') = toDateTime('1970-01-01', 'UTC');
+
+-- era
+select parseDateTimeInJodaSyntax('AD 1999', 'G YYYY', 'UTC') = toDateTime('1999-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('ad 1999', 'G YYYY', 'UTC') = toDateTime('1999-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('Ad 1999', 'G YYYY', 'UTC') = toDateTime('1999-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('AD 1999', 'G yyyy', 'UTC') = toDateTime('1999-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('AD 1999 2000', 'G YYYY yyyy', 'UTC') = toDateTime('2000-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('AD 1999 2000', 'G yyyy YYYY', 'UTC') = toDateTime('2000-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('AD 1999', 'G Y'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('AD 1999', 'G YY'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('AD 1999', 'G YYY'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('BC', 'G'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('AB', 'G'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- year of era
+select parseDateTimeInJodaSyntax('2106', 'YYYY', 'UTC') = toDateTime('2106-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('1970', 'YYYY', 'UTC') = toDateTime('1970-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('1969', 'YYYY', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('2107', 'YYYY', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('+1999', 'YYYY', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+select parseDateTimeInJodaSyntax('12', 'YY', 'UTC') = toDateTime('2012-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('69', 'YY', 'UTC') = toDateTime('2069-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('70', 'YY', 'UTC') = toDateTime('1970-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('99', 'YY', 'UTC') = toDateTime('1999-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('01', 'YY', 'UTC') = toDateTime('2001-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('1', 'YY', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+select parseDateTimeInJodaSyntax('99 98 97', 'YY YY YY', 'UTC') = toDateTime('1997-01-01', 'UTC');
+
+-- year
+select parseDateTimeInJodaSyntax('12', 'yy', 'UTC') = toDateTime('2012-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('69', 'yy', 'UTC') = toDateTime('2069-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('70', 'yy', 'UTC') = toDateTime('1970-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('99', 'yy', 'UTC') = toDateTime('1999-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('+99', 'yy', 'UTC') = toDateTime('1999-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('+99 02', 'yy MM', 'UTC') = toDateTime('1999-02-01', 'UTC');
+select parseDateTimeInJodaSyntax('10 +10', 'MM yy', 'UTC') = toDateTime('2010-10-01', 'UTC');
+select parseDateTimeInJodaSyntax('10+2001', 'MMyyyy', 'UTC') = toDateTime('2001-10-01', 'UTC');
+select parseDateTimeInJodaSyntax('+200110', 'yyyyMM', 'UTC') = toDateTime('2001-10-01', 'UTC');
+select parseDateTimeInJodaSyntax('1970', 'yyyy', 'UTC') = toDateTime('1970-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('2106', 'yyyy', 'UTC') = toDateTime('2106-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('1969', 'yyyy', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('2107', 'yyyy', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- week year
+select parseDateTimeInJodaSyntax('2106', 'xxxx', 'UTC') = toDateTime('2106-01-04', 'UTC');
+select parseDateTimeInJodaSyntax('1971', 'xxxx', 'UTC') = toDateTime('1971-01-04', 'UTC');
+select parseDateTimeInJodaSyntax('2025', 'xxxx', 'UTC') = toDateTime('2024-12-30', 'UTC');
+select parseDateTimeInJodaSyntax('12', 'xx', 'UTC') = toDateTime('2012-01-02', 'UTC');
+select parseDateTimeInJodaSyntax('69', 'xx', 'UTC') = toDateTime('2068-12-31', 'UTC');
+select parseDateTimeInJodaSyntax('99', 'xx', 'UTC') = toDateTime('1999-01-04', 'UTC');
+select parseDateTimeInJodaSyntax('01', 'xx', 'UTC') = toDateTime('2001-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('+10', 'xx', 'UTC') = toDateTime('2010-01-04', 'UTC');
+select parseDateTimeInJodaSyntax('+99 01', 'xx ww', 'UTC') = toDateTime('1999-01-04', 'UTC');
+select parseDateTimeInJodaSyntax('+99 02', 'xx ww', 'UTC') = toDateTime('1999-01-11', 'UTC');
+select parseDateTimeInJodaSyntax('10 +10', 'ww xx', 'UTC') = toDateTime('2010-03-08', 'UTC');
+select parseDateTimeInJodaSyntax('2+10', 'wwxx', 'UTC') = toDateTime('2010-01-11', 'UTC');
+select parseDateTimeInJodaSyntax('+102', 'xxM', 'UTC') = toDateTime('2010-02-01', 'UTC');
+select parseDateTimeInJodaSyntax('+20102', 'xxxxM', 'UTC') = toDateTime('2010-02-01', 'UTC');
+select parseDateTimeInJodaSyntax('1970', 'xxxx', 'UTC'); -- { serverError VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE }
+select parseDateTimeInJodaSyntax('1969', 'xxxx', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('2107', 'xxxx', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- century of era
+select parseDateTimeInJodaSyntax('20', 'CC', 'UTC') = toDateTime('2000-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('21', 'CC', 'UTC') = toDateTime('2100-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('19', 'CC', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('22', 'CC', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- month
+select parseDateTimeInJodaSyntax('1', 'M', 'UTC') = toDateTime('2000-01-01', 'UTC');
+select parseDateTimeInJodaSyntax(' 7', ' MM', 'UTC') = toDateTime('2000-07-01', 'UTC');
+select parseDateTimeInJodaSyntax('11', 'M', 'UTC') = toDateTime('2000-11-01', 'UTC');
+select parseDateTimeInJodaSyntax('10-', 'M-', 'UTC') = toDateTime('2000-10-01', 'UTC');
+select parseDateTimeInJodaSyntax('-12-', '-M-', 'UTC') = toDateTime('2000-12-01', 'UTC');
+select parseDateTimeInJodaSyntax('0', 'M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('13', 'M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('12345', 'M', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+--- Ensure MMM and MMMM specifiers consume both short- and long-form month names
+select parseDateTimeInJodaSyntax('Aug', 'MMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+select parseDateTimeInJodaSyntax('AuG', 'MMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+select parseDateTimeInJodaSyntax('august', 'MMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+select parseDateTimeInJodaSyntax('Aug', 'MMMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+select parseDateTimeInJodaSyntax('AuG', 'MMMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+select parseDateTimeInJodaSyntax('august', 'MMMM', 'UTC') = toDateTime('2000-08-01', 'UTC');
+--- invalid month names
+select parseDateTimeInJodaSyntax('Decembr', 'MMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('Decembr', 'MMMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('Decemberary', 'MMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('Decemberary', 'MMMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('asdf', 'MMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('asdf', 'MMMM', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- day of month
+select parseDateTimeInJodaSyntax('1', 'd', 'UTC') = toDateTime('2000-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('7 ', 'dd ', 'UTC') = toDateTime('2000-01-07', 'UTC');
+select parseDateTimeInJodaSyntax('/11', '/dd', 'UTC') = toDateTime('2000-01-11', 'UTC');
+select parseDateTimeInJodaSyntax('/31/', '/d/', 'UTC') = toDateTime('2000-01-31', 'UTC');
+select parseDateTimeInJodaSyntax('0', 'd', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('32', 'd', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('12345', 'd', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('02-31', 'M-d', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('04-31', 'M-d', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+-- The last one is chosen if multiple day of months are supplied.
+select parseDateTimeInJodaSyntax('2 31 1', 'M d M', 'UTC') = toDateTime('2000-01-31', 'UTC');
+select parseDateTimeInJodaSyntax('1 31 20 2', 'M d d M', 'UTC') = toDateTime('2000-02-20', 'UTC');
+select parseDateTimeInJodaSyntax('2 31 20 4', 'M d d M', 'UTC') = toDateTime('2000-04-20', 'UTC');
+--- Leap year
+select parseDateTimeInJodaSyntax('2020-02-29', 'YYYY-M-d', 'UTC') = toDateTime('2020-02-29', 'UTC');
+select parseDateTimeInJodaSyntax('2001-02-29', 'YYYY-M-d', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- day of year
+select parseDateTimeInJodaSyntax('1', 'D', 'UTC') = toDateTime('2000-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('7 ', 'DD ', 'UTC') = toDateTime('2000-01-07', 'UTC');
+select parseDateTimeInJodaSyntax('/11', '/DD', 'UTC') = toDateTime('2000-01-11', 'UTC');
+select parseDateTimeInJodaSyntax('/31/', '/DDD/', 'UTC') = toDateTime('2000-01-31', 'UTC');
+select parseDateTimeInJodaSyntax('32', 'D', 'UTC') = toDateTime('2000-02-01', 'UTC');
+select parseDateTimeInJodaSyntax('60', 'D', 'UTC') = toDateTime('2000-02-29', 'UTC');
+select parseDateTimeInJodaSyntax('365', 'D', 'UTC') = toDateTime('2000-12-30', 'UTC');
+select parseDateTimeInJodaSyntax('366', 'D', 'UTC') = toDateTime('2000-12-31', 'UTC');
+select parseDateTimeInJodaSyntax('1999 1', 'yyyy D', 'UTC') = toDateTime('1999-01-01', 'UTC');
+select parseDateTimeInJodaSyntax('1999 7 ', 'yyyy DD ', 'UTC') = toDateTime('1999-01-07', 'UTC');
+select parseDateTimeInJodaSyntax('1999 /11', 'yyyy /DD', 'UTC') = toDateTime('1999-01-11', 'UTC');
+select parseDateTimeInJodaSyntax('1999 /31/', 'yyyy /DD/', 'UTC') = toDateTime('1999-01-31', 'UTC');
+select parseDateTimeInJodaSyntax('1999 32', 'yyyy D', 'UTC') = toDateTime('1999-02-01', 'UTC');
+select parseDateTimeInJodaSyntax('1999 60', 'yyyy D', 'UTC') = toDateTime('1999-03-01', 'UTC');
+select parseDateTimeInJodaSyntax('1999 365', 'yyyy D', 'UTC') = toDateTime('1999-12-31', 'UTC');
+select parseDateTimeInJodaSyntax('1999 366', 'yyyy D', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+--- Ensure all days of year are checked against final selected year
+select parseDateTimeInJodaSyntax('2001 366 2000', 'yyyy D yyyy', 'UTC') = toDateTime('2000-12-31', 'UTC');
+select parseDateTimeInJodaSyntax('2000 366 2001', 'yyyy D yyyy', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('0', 'D', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('367', 'D', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- hour of day
+select parseDateTimeInJodaSyntax('7', 'H', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('23', 'HH', 'UTC') = toDateTime('1970-01-01 23:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('0', 'HHH', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('10', 'HHHHHHHH', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+--- invalid hour od day
+select parseDateTimeInJodaSyntax('24', 'H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('-1', 'H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 'H', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- clock hour of day
+select parseDateTimeInJodaSyntax('7', 'k', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('24', 'kk', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('1', 'kkk', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('10', 'kkkkkkkk', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+-- invalid clock hour of day
+select parseDateTimeInJodaSyntax('25', 'k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('0', 'k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 'k', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- hour of half day
+select parseDateTimeInJodaSyntax('7', 'K', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('11', 'KK', 'UTC') = toDateTime('1970-01-01 11:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('0', 'KKK', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('10', 'KKKKKKKK', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+-- invalid hour of half day
+select parseDateTimeInJodaSyntax('12', 'K', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('-1', 'K', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 'K', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- clock hour of half day
+select parseDateTimeInJodaSyntax('7', 'h', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('12', 'hh', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('1', 'hhh', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('10', 'hhhhhhhh', 'UTC') = toDateTime('1970-01-01 10:00:00', 'UTC');
+-- invalid clock hour of half day
+select parseDateTimeInJodaSyntax('13', 'h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('0', 'h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 'h', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- half of day
+--- Half of day has no effect if hour or clockhour of day is provided hour of day tests
+select parseDateTimeInJodaSyntax('7 PM', 'H a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('7 AM', 'H a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('7 pm', 'H a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('7 am', 'H a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('0 PM', 'H a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('0 AM', 'H a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('0 pm', 'H a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('0 am', 'H a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('7 PM', 'k a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('7 AM', 'k a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('7 pm', 'k a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('7 am', 'k a', 'UTC') = toDateTime('1970-01-01 07:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('24 PM', 'k a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('24 AM', 'k a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('24 pm', 'k a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('24 am', 'k a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+-- Half of day has effect if hour or clockhour of halfday is provided
+select parseDateTimeInJodaSyntax('0 PM', 'K a', 'UTC') = toDateTime('1970-01-01 12:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('0 AM', 'K a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('6 PM', 'K a', 'UTC') = toDateTime('1970-01-01 18:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('6 AM', 'K a', 'UTC') = toDateTime('1970-01-01 06:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('11 PM', 'K a', 'UTC') = toDateTime('1970-01-01 23:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('11 AM', 'K a', 'UTC') = toDateTime('1970-01-01 11:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('1 PM', 'h a', 'UTC') = toDateTime('1970-01-01 13:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('1 AM', 'h a', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('6 PM', 'h a', 'UTC') = toDateTime('1970-01-01 18:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('6 AM', 'h a', 'UTC') = toDateTime('1970-01-01 06:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('12 PM', 'h a', 'UTC') = toDateTime('1970-01-01 12:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('12 AM', 'h a', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+-- time gives precendent to most recent time specifier
+select parseDateTimeInJodaSyntax('0 1 AM', 'H h a', 'UTC') = toDateTime('1970-01-01 01:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('12 1 PM', 'H h a', 'UTC') = toDateTime('1970-01-01 13:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('1 AM 0', 'h a H', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('1 AM 12', 'h a H', 'UTC') = toDateTime('1970-01-01 12:00:00', 'UTC');
+
+-- minute
+select parseDateTimeInJodaSyntax('8', 'm', 'UTC') = toDateTime('1970-01-01 00:08:00', 'UTC');
+select parseDateTimeInJodaSyntax('59', 'mm', 'UTC') = toDateTime('1970-01-01 00:59:00', 'UTC');
+select parseDateTimeInJodaSyntax('0/', 'mmm/', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('60', 'm', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('-1', 'm', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 'm', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- second
+select parseDateTimeInJodaSyntax('9', 's', 'UTC') = toDateTime('1970-01-01 00:00:09', 'UTC');
+select parseDateTimeInJodaSyntax('58', 'ss', 'UTC') = toDateTime('1970-01-01 00:00:58', 'UTC');
+select parseDateTimeInJodaSyntax('0/', 's/', 'UTC') = toDateTime('1970-01-01 00:00:00', 'UTC');
+select parseDateTimeInJodaSyntax('60', 's', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('-1', 's', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+select parseDateTimeInJodaSyntax('123456789', 's', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- integer overflow in AST Fuzzer
+select parseDateTimeInJodaSyntax('19191919191919191919191919191919', 'CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC', 'UTC'); -- { serverError CANNOT_PARSE_DATETIME }
+
+-- *OrZero, *OrNull
+select parseDateTimeInJodaSyntaxOrZero('2001 366 2000', 'yyyy D yyyy', 'UTC') = toDateTime('2000-12-31', 'UTC');
+select parseDateTimeInJodaSyntaxOrZero('2001 invalid 366 2000', 'yyyy D yyyy', 'UTC') = toDateTime('1970-01-01', 'UTC');
+select parseDateTimeInJodaSyntaxOrNull('2001 366 2000', 'yyyy D yyyy', 'UTC') = toDateTime('2000-12-31', 'UTC');
+select parseDateTimeInJodaSyntaxOrNull('2001 invalid 366 2000', 'yyyy D yyyy', 'UTC') IS NULL;
+
+-- Error handling
+select parseDateTimeInJodaSyntax('12 AM'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select parseDateTimeInJodaSyntax('12 AM', 'h a', 'UTC', 'a fourth argument'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+-- { echoOff }
diff --git a/tests/queries/0_stateless/02668_ulid_decoding.reference b/tests/queries/0_stateless/02668_ulid_decoding.reference
new file mode 100644
index 00000000000..b48580d60bb
--- /dev/null
+++ b/tests/queries/0_stateless/02668_ulid_decoding.reference
@@ -0,0 +1,3 @@
+1
+2023-03-27 19:16:44.000
+2023-03-27 19:16:44.000
diff --git a/tests/queries/0_stateless/02668_ulid_decoding.sql b/tests/queries/0_stateless/02668_ulid_decoding.sql
new file mode 100644
index 00000000000..df94025b7b5
--- /dev/null
+++ b/tests/queries/0_stateless/02668_ulid_decoding.sql
@@ -0,0 +1,10 @@
+-- Tags: no-fasttest
+
+SELECT dateDiff('minute', ULIDStringToDateTime(generateULID()), now()) = 0;
+SELECT toTimezone(ULIDStringToDateTime('01GWJWKW30MFPQJRYEAF4XFZ9E'), 'America/Costa_Rica');
+SELECT ULIDStringToDateTime('01GWJWKW30MFPQJRYEAF4XFZ9E', 'America/Costa_Rica');
+SELECT ULIDStringToDateTime('01GWJWKW30MFPQJRYEAF4XFZ9', 'America/Costa_Rica'); -- { serverError ILLEGAL_COLUMN }
+SELECT ULIDStringToDateTime('01GWJWKW30MFPQJRYEAF4XFZ9E', 'America/Costa_Ric'); -- { serverError POCO_EXCEPTION }
+SELECT ULIDStringToDateTime('01GWJWKW30MFPQJRYEAF4XFZ9E0'); -- { serverError ILLEGAL_COLUMN }
+SELECT ULIDStringToDateTime(1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT ULIDStringToDateTime(1, 2); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/02669_alter_modify_to_nullable.reference b/tests/queries/0_stateless/02669_alter_modify_to_nullable.reference
new file mode 100644
index 00000000000..aff80e1d699
--- /dev/null
+++ b/tests/queries/0_stateless/02669_alter_modify_to_nullable.reference
@@ -0,0 +1,8 @@
+1_1_1_0	String	Default
+2_2_2_0	String	Sparse
+20000	10435	['','bar','foo']
+1_1_1_0_3	String	Default
+2_2_2_0_3	Nullable(String)	Default
+20000	10435	['','bar','foo']
+1_1_1_0_3	0
+2_2_2_0_3	10000
diff --git a/tests/queries/0_stateless/02669_alter_modify_to_nullable.sql b/tests/queries/0_stateless/02669_alter_modify_to_nullable.sql
new file mode 100644
index 00000000000..862280fd7cd
--- /dev/null
+++ b/tests/queries/0_stateless/02669_alter_modify_to_nullable.sql
@@ -0,0 +1,31 @@
+DROP TABLE IF EXISTS t_modify_to_nullable;
+
+CREATE TABLE t_modify_to_nullable (key UInt64, id UInt64, s String)
+ENGINE = MergeTree ORDER BY id PARTITION BY key
+SETTINGS min_bytes_for_wide_part = 0, ratio_of_defaults_for_sparse_serialization = 0.9;
+
+INSERT INTO t_modify_to_nullable SELECT 1, number, 'foo' FROM numbers(10000);
+INSERT INTO t_modify_to_nullable SELECT 2, number, if (number % 23 = 0, 'bar', '') FROM numbers(10000);
+
+SELECT name, type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_modify_to_nullable' AND column = 's' AND active
+ORDER BY name;
+
+SELECT count(s), countIf(s != ''), arraySort(groupUniqArray(s)) FROM t_modify_to_nullable;
+
+SET mutations_sync = 2;
+ALTER TABLE t_modify_to_nullable MODIFY COLUMN s Nullable(String);
+
+SELECT name, type, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_modify_to_nullable' AND column = 's' AND active
+ORDER BY name;
+
+SELECT count(s), countIf(s != ''), arraySort(groupUniqArray(s)) FROM t_modify_to_nullable;
+
+SYSTEM FLUSH LOGS;
+
+SELECT part_name, read_rows FROM system.part_log
+WHERE database = currentDatabase() AND table = 't_modify_to_nullable' AND event_type = 'MutatePart'
+ORDER BY part_name;
+
+DROP TABLE t_modify_to_nullable;
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.reference b/tests/queries/0_stateless/02670_constant_skip_index.reference
similarity index 100%
rename from tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.reference
rename to tests/queries/0_stateless/02670_constant_skip_index.reference
diff --git a/tests/queries/0_stateless/02670_constant_skip_index.sql b/tests/queries/0_stateless/02670_constant_skip_index.sql
new file mode 100644
index 00000000000..97dd2ab33c9
--- /dev/null
+++ b/tests/queries/0_stateless/02670_constant_skip_index.sql
@@ -0,0 +1,25 @@
+
+DROP TABLE IF EXISTS t_constant_index;
+
+CREATE TABLE t_constant_index
+(
+    id UInt64,
+    INDEX t_constant_index 'foo' TYPE set(2) GRANULARITY 1
+) ENGINE = MergeTree
+ORDER BY id; -- { serverError INCORRECT_QUERY }
+
+CREATE TABLE t_constant_index
+(
+    id UInt64,
+    INDEX t_constant_index id + rand() TYPE set(2) GRANULARITY 1
+) ENGINE = MergeTree
+ORDER BY id; -- { serverError BAD_ARGUMENTS }
+
+CREATE TABLE t_constant_index
+(
+    id UInt64,
+    INDEX t_constant_index id * 2 TYPE set(2) GRANULARITY 1
+) ENGINE = MergeTree
+ORDER BY id;
+
+DROP TABLE t_constant_index;
diff --git a/tests/queries/0_stateless/02674_and_consistency.reference b/tests/queries/0_stateless/02674_and_consistency.reference
new file mode 100644
index 00000000000..e74ab1928c5
--- /dev/null
+++ b/tests/queries/0_stateless/02674_and_consistency.reference
@@ -0,0 +1,4 @@
+10
+#45218
+10
+=
diff --git a/tests/queries/0_stateless/02674_and_consistency.sql b/tests/queries/0_stateless/02674_and_consistency.sql
new file mode 100644
index 00000000000..5988832ba68
--- /dev/null
+++ b/tests/queries/0_stateless/02674_and_consistency.sql
@@ -0,0 +1,21 @@
+SELECT SUM(number)
+FROM
+(
+    SELECT 10 AS number
+)
+GROUP BY number
+HAVING 1 AND sin(SUMOrNull(number))
+SETTINGS enable_optimize_predicate_expression = 0;
+
+select '#45218';
+
+SELECT SUM(number)
+FROM
+(
+    SELECT 10 AS number
+)
+GROUP BY cos(min2(number, number) % number) - number
+HAVING ((-sign(-233841197)) IS NOT NULL) AND sin(lcm(SUM(number), SUM(number)) >= ('372497213' IS NOT NULL))
+SETTINGS aggregate_functions_null_for_empty = 1, enable_optimize_predicate_expression = 0;
+
+select '=';
diff --git a/tests/queries/0_stateless/02674_date_int_string_json_inference.reference b/tests/queries/0_stateless/02674_date_int_string_json_inference.reference
new file mode 100644
index 00000000000..2e89d6a15a4
--- /dev/null
+++ b/tests/queries/0_stateless/02674_date_int_string_json_inference.reference
@@ -0,0 +1 @@
+x	Nullable(String)					
diff --git a/tests/queries/0_stateless/02674_date_int_string_json_inference.sql b/tests/queries/0_stateless/02674_date_int_string_json_inference.sql
new file mode 100644
index 00000000000..21abf763cbf
--- /dev/null
+++ b/tests/queries/0_stateless/02674_date_int_string_json_inference.sql
@@ -0,0 +1,2 @@
+desc format(JSONEachRow, '{"x" : "2020-01-01"}, {"x" : "1000"}')
+
diff --git a/tests/queries/0_stateless/02674_trivial_count_analyzer.reference b/tests/queries/0_stateless/02674_trivial_count_analyzer.reference
new file mode 100644
index 00000000000..05feadb58a0
--- /dev/null
+++ b/tests/queries/0_stateless/02674_trivial_count_analyzer.reference
@@ -0,0 +1,47 @@
+-- { echoOn }
+set allow_experimental_analyzer=1;
+set optimize_trivial_count_query=1;
+create table m3(a Int64, b UInt64) Engine=MergeTree order by tuple();
+select count() from m3;
+0
+insert into m3 values (0,0);
+insert into m3 values (-1,1);
+select trimBoth(explain) from (explain select count() from m3) where explain like '%ReadFromPreparedSource (Optimized trivial count)%';
+ReadFromPreparedSource (Optimized trivial count)
+select count() from m3;
+2
+select count(*) from m3;
+2
+select count(a) from m3;
+2
+select count(b) from m3;
+2
+select count() + 1 from m3;
+3
+drop table m3;
+-- checking queries with FINAL
+create table replacing_m3(a Int64, b UInt64) Engine=ReplacingMergeTree() order by (a, b);
+SYSTEM STOP MERGES replacing_m3;
+select count() from replacing_m3;
+0
+insert into replacing_m3 values (0,0);
+insert into replacing_m3 values (0,0);
+insert into replacing_m3 values (-1,1);
+insert into replacing_m3 values (-2,2);
+select trimBoth(explain) from (explain select count() from replacing_m3) where explain like '%ReadFromPreparedSource (Optimized trivial count)%';
+ReadFromPreparedSource (Optimized trivial count)
+select count() from replacing_m3;
+4
+select count(*) from replacing_m3;
+4
+select count(a) from replacing_m3;
+4
+select count(b) from replacing_m3;
+4
+select count() from replacing_m3 FINAL;
+3
+select count(a) from replacing_m3 FINAL;
+3
+select count(b) from replacing_m3 FINAL;
+3
+drop table replacing_m3;
diff --git a/tests/queries/0_stateless/02674_trivial_count_analyzer.sql b/tests/queries/0_stateless/02674_trivial_count_analyzer.sql
new file mode 100644
index 00000000000..988d1b9ba92
--- /dev/null
+++ b/tests/queries/0_stateless/02674_trivial_count_analyzer.sql
@@ -0,0 +1,45 @@
+drop table if exists m3;
+drop table if exists replacing_m3;
+
+-- { echoOn }
+set allow_experimental_analyzer=1;
+set optimize_trivial_count_query=1;
+
+create table m3(a Int64, b UInt64) Engine=MergeTree order by tuple();
+
+select count() from m3;
+
+insert into m3 values (0,0);
+insert into m3 values (-1,1);
+
+select trimBoth(explain) from (explain select count() from m3) where explain like '%ReadFromPreparedSource (Optimized trivial count)%';
+select count() from m3;
+select count(*) from m3;
+select count(a) from m3;
+select count(b) from m3;
+select count() + 1 from m3;
+
+drop table m3;
+
+-- checking queries with FINAL
+create table replacing_m3(a Int64, b UInt64) Engine=ReplacingMergeTree() order by (a, b);
+SYSTEM STOP MERGES replacing_m3;
+
+select count() from replacing_m3;
+
+insert into replacing_m3 values (0,0);
+insert into replacing_m3 values (0,0);
+insert into replacing_m3 values (-1,1);
+insert into replacing_m3 values (-2,2);
+
+select trimBoth(explain) from (explain select count() from replacing_m3) where explain like '%ReadFromPreparedSource (Optimized trivial count)%';
+select count() from replacing_m3;
+select count(*) from replacing_m3;
+select count(a) from replacing_m3;
+select count(b) from replacing_m3;
+
+select count() from replacing_m3 FINAL;
+select count(a) from replacing_m3 FINAL;
+select count(b) from replacing_m3 FINAL;
+
+drop table replacing_m3;
diff --git a/tests/queries/0_stateless/02675_grant_query_formatting.reference b/tests/queries/0_stateless/02675_grant_query_formatting.reference
new file mode 100644
index 00000000000..8cbf028e742
--- /dev/null
+++ b/tests/queries/0_stateless/02675_grant_query_formatting.reference
@@ -0,0 +1 @@
+GRANT SELECT ON *.* TO A WITH REPLACE OPTION
diff --git a/tests/queries/0_stateless/02675_grant_query_formatting.sh b/tests/queries/0_stateless/02675_grant_query_formatting.sh
new file mode 100755
index 00000000000..76c953913a9
--- /dev/null
+++ b/tests/queries/0_stateless/02675_grant_query_formatting.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+
+format="$CLICKHOUSE_FORMAT --oneline"
+
+echo "grant select on *.* to A with replace option" | $format
diff --git a/tests/queries/0_stateless/01920_async_drain_connections.reference b/tests/queries/0_stateless/02675_is_ipv6_function_fix.reference
similarity index 50%
rename from tests/queries/0_stateless/01920_async_drain_connections.reference
rename to tests/queries/0_stateless/02675_is_ipv6_function_fix.reference
index aa47d0d46d4..573541ac970 100644
--- a/tests/queries/0_stateless/01920_async_drain_connections.reference
+++ b/tests/queries/0_stateless/02675_is_ipv6_function_fix.reference
@@ -1,2 +1 @@
 0
-0
diff --git a/tests/queries/0_stateless/02675_is_ipv6_function_fix.sql b/tests/queries/0_stateless/02675_is_ipv6_function_fix.sql
new file mode 100644
index 00000000000..c28b4a5dc2d
--- /dev/null
+++ b/tests/queries/0_stateless/02675_is_ipv6_function_fix.sql
@@ -0,0 +1 @@
+SELECT isIPv6String('1234::1234:');
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02675_predicate_push_down_filled_join_fix.reference b/tests/queries/0_stateless/02675_predicate_push_down_filled_join_fix.reference
new file mode 100644
index 00000000000..ecdb62c5cb5
--- /dev/null
+++ b/tests/queries/0_stateless/02675_predicate_push_down_filled_join_fix.reference
@@ -0,0 +1,33 @@
+Expression ((Project names + (Projection + )))
+Header: t1.id UInt64
+        t1.value String
+        t2.value String
+Actions: INPUT : 0 -> t1.id_0 UInt64 : 0
+         INPUT : 1 -> t1.value_1 String : 1
+         INPUT : 2 -> t2.value_2 String : 2
+         ALIAS t1.id_0 :: 0 -> t1.id UInt64 : 3
+         ALIAS t1.value_1 :: 1 -> t1.value String : 0
+         ALIAS t2.value_2 :: 2 -> t2.value String : 1
+Positions: 3 0 1
+  FilledJoin (Filled JOIN)
+  Header: t1.id_0 UInt64
+          t1.value_1 String
+          t2.value_2 String
+    Filter (( + (JOIN actions + Change column names to column identifiers)))
+    Header: t1.id_0 UInt64
+            t1.value_1 String
+    Filter column: equals(t1.id_0, 0_UInt8) (removed)
+    Actions: INPUT : 0 -> id UInt64 : 0
+             INPUT : 1 -> value String : 1
+             COLUMN Const(UInt8) -> 0_UInt8 UInt8 : 2
+             ALIAS id :: 0 -> t1.id_0 UInt64 : 3
+             ALIAS value :: 1 -> t1.value_1 String : 0
+             FUNCTION equals(t1.id_0 : 3, 0_UInt8 :: 2) -> equals(t1.id_0, 0_UInt8) UInt8 : 1
+    Positions: 1 3 0
+      ReadFromMergeTree (default.test_table)
+      Header: id UInt64
+              value String
+      ReadType: Default
+      Parts: 1
+      Granules: 1
+0	Value	JoinValue
diff --git a/tests/queries/0_stateless/02675_predicate_push_down_filled_join_fix.sql b/tests/queries/0_stateless/02675_predicate_push_down_filled_join_fix.sql
new file mode 100644
index 00000000000..930127497ae
--- /dev/null
+++ b/tests/queries/0_stateless/02675_predicate_push_down_filled_join_fix.sql
@@ -0,0 +1,28 @@
+SET allow_experimental_analyzer = 1;
+SET single_join_prefer_left_table = 0;
+SET optimize_move_to_prewhere = 0;
+
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table
+(
+    id UInt64,
+    value String
+) ENGINE=MergeTree ORDER BY id;
+
+INSERT INTO test_table VALUES (0, 'Value');
+
+DROP TABLE IF EXISTS test_table_join;
+CREATE TABLE test_table_join
+(
+    id UInt64,
+    value String
+) ENGINE = Join(All, inner, id);
+
+INSERT INTO test_table_join VALUES (0, 'JoinValue');
+
+EXPLAIN header = 1, actions = 1 SELECT t1.id, t1.value, t2.value FROM test_table AS t1 INNER JOIN test_table_join AS t2 ON t1.id = t2.id WHERE t1.id = 0;
+
+SELECT t1.id, t1.value, t2.value FROM test_table AS t1 INNER JOIN test_table_join AS t2 ON t1.id = t2.id WHERE t1.id = 0;
+
+DROP TABLE test_table_join;
+DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.reference b/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.reference
new file mode 100644
index 00000000000..3f34d5e2c79
--- /dev/null
+++ b/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.reference
@@ -0,0 +1,23 @@
+INSERT TO S3
+ [ 0 ] S3CompleteMultipartUpload: 1 
+ [ 0 ] S3CreateMultipartUpload: 1 
+ [ 0 ] S3HeadObject: 2 
+ [ 0 ] S3ReadRequestsCount: 2 
+ [ 0 ] S3UploadPart: 1 
+ [ 0 ] S3WriteRequestsCount: 3 
+CHECK WITH query_log
+QueryFinish	S3CreateMultipartUpload	1	S3UploadPart	1	S3CompleteMultipartUpload	1	S3PutObject	0
+CREATE
+INSERT
+ [ 0 ] FileOpen: 8 
+READ
+INSERT and READ INSERT
+ [ 0 ] FileOpen: 8 
+ [ 0 ] FileOpen: 8 
+DROP
+CHECK with query_log
+QueryFinish	INSERT INTO times SELECT now() + INTERVAL 1 day SETTINGS optimize_on_insert = 0;	FileOpen	8
+QueryFinish	SELECT \'1\', min(t) FROM times;	FileOpen	0
+QueryFinish	INSERT INTO times SELECT now() + INTERVAL 2 day SETTINGS optimize_on_insert = 0;	FileOpen	8
+QueryFinish	SELECT \'2\', min(t) FROM times;	FileOpen	0
+QueryFinish	INSERT INTO times SELECT now() + INTERVAL 3 day SETTINGS optimize_on_insert = 0;	FileOpen	8
diff --git a/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.sh b/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.sh
new file mode 100755
index 00000000000..adc9525ef81
--- /dev/null
+++ b/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: needs s3
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo "INSERT TO S3"
+$CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1 -nq "
+INSERT INTO TABLE FUNCTION s3('http://localhost:11111/test/profile_events.csv', 'test', 'testtest', 'CSV', 'number UInt64') SELECT number FROM numbers(1000000) SETTINGS s3_max_single_part_upload_size = 10, s3_truncate_on_insert = 1;
+" 2>&1 | grep -o -e '\ \[\ .*\ \]\ S3.*:\ .*\ ' | grep -v 'Microseconds' | sort
+
+echo "CHECK WITH query_log"
+$CLICKHOUSE_CLIENT -nq "
+SYSTEM FLUSH LOGS;
+SELECT type,
+       'S3CreateMultipartUpload', ProfileEvents['S3CreateMultipartUpload'],
+       'S3UploadPart', ProfileEvents['S3UploadPart'],
+       'S3CompleteMultipartUpload', ProfileEvents['S3CompleteMultipartUpload'],
+       'S3PutObject', ProfileEvents['S3PutObject']
+FROM system.query_log
+WHERE query LIKE '%profile_events.csv%'
+AND type = 'QueryFinish'
+AND current_database = currentDatabase()
+ORDER BY query_start_time DESC;
+"
+
+echo "CREATE"
+$CLICKHOUSE_CLIENT -nq "
+DROP TABLE IF EXISTS times;
+CREATE TABLE times (t DateTime) ENGINE MergeTree ORDER BY t
+  SETTINGS
+    storage_policy='default',
+    min_rows_for_wide_part = 1000000,
+    min_bytes_for_wide_part = 1000000,
+    ratio_of_defaults_for_sparse_serialization=1.0;
+"
+
+echo "INSERT"
+$CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1  -nq "
+INSERT INTO times SELECT now() + INTERVAL 1 day SETTINGS optimize_on_insert = 0;
+" 2>&1 | grep -o -e '\ \[\ .*\ \]\ FileOpen:\ .*\ '
+
+echo "READ"
+$CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1  -nq "
+SELECT '1', min(t) FROM times;
+" 2>&1 | grep -o -e '\ \[\ .*\ \]\ FileOpen:\ .*\ '
+
+echo "INSERT and READ INSERT"
+$CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1  -nq "
+INSERT INTO times SELECT now() + INTERVAL 2 day SETTINGS optimize_on_insert = 0;
+SELECT '2', min(t) FROM times;
+INSERT INTO times SELECT now() + INTERVAL 3 day SETTINGS optimize_on_insert = 0;
+" 2>&1 | grep -o -e '\ \[\ .*\ \]\ FileOpen:\ .*\ '
+
+echo "DROP"
+$CLICKHOUSE_CLIENT -nq "
+DROP TABLE times;
+"
+
+echo "CHECK with query_log"
+$CLICKHOUSE_CLIENT -nq "
+SYSTEM FLUSH LOGS;
+SELECT type,
+       query,
+       'FileOpen', ProfileEvents['FileOpen']
+FROM system.query_log
+WHERE current_database = currentDatabase()
+AND ( query LIKE '%SELECT % FROM times%' OR query LIKE '%INSERT INTO times%' )
+AND type = 'QueryFinish'
+ORDER BY query_start_time_microseconds ASC, query DESC;
+"
diff --git a/tests/queries/0_stateless/02675_sparse_columns_clear_column.reference b/tests/queries/0_stateless/02675_sparse_columns_clear_column.reference
new file mode 100644
index 00000000000..56fa4a9ebea
--- /dev/null
+++ b/tests/queries/0_stateless/02675_sparse_columns_clear_column.reference
@@ -0,0 +1,6 @@
+arr	Default
+v	Sparse
+arr	Default
+arr	Default
+v	Sparse
+0	[]
diff --git a/tests/queries/0_stateless/02675_sparse_columns_clear_column.sql b/tests/queries/0_stateless/02675_sparse_columns_clear_column.sql
new file mode 100644
index 00000000000..781030ef7b4
--- /dev/null
+++ b/tests/queries/0_stateless/02675_sparse_columns_clear_column.sql
@@ -0,0 +1,34 @@
+DROP TABLE IF EXISTS t_sparse_columns_clear;
+
+CREATE TABLE t_sparse_columns_clear (arr Array(UInt64), v UInt64)
+ENGINE = MergeTree ORDER BY tuple()
+SETTINGS
+    ratio_of_defaults_for_sparse_serialization = 0.9,
+    min_bytes_for_wide_part=0;
+
+INSERT INTO t_sparse_columns_clear SELECT [number], 0 FROM numbers(1000);
+
+SELECT column, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_columns_clear' AND active
+ORDER BY column;
+
+SET mutations_sync = 2;
+SET alter_sync = 2;
+
+ALTER TABLE t_sparse_columns_clear CLEAR COLUMN v;
+
+SELECT column, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_columns_clear' AND active
+ORDER BY column;
+
+OPTIMIZE TABLE t_sparse_columns_clear FINAL;
+
+SELECT column, serialization_kind FROM system.parts_columns
+WHERE database = currentDatabase() AND table = 't_sparse_columns_clear' AND active
+ORDER BY column;
+
+DROP TABLE t_sparse_columns_clear SYNC;
+
+SYSTEM FLUSH LOGS;
+
+SELECT count(), groupArray(message) FROM system.text_log WHERE logger_name LIKE '%' || currentDatabase() || '.t_sparse_columns_clear' || '%' AND level = 'Error';
diff --git a/tests/queries/0_stateless/02676_analyzer_limit_offset.reference b/tests/queries/0_stateless/02676_analyzer_limit_offset.reference
new file mode 100644
index 00000000000..96483268d43
--- /dev/null
+++ b/tests/queries/0_stateless/02676_analyzer_limit_offset.reference
@@ -0,0 +1,63 @@
+0
+1
+2
+3
+4
+15
+15
+16
+16
+17
+30
+30
+31
+31
+32
+102
+103
+104
+105
+105
+106
+107
+108
+109
+105
+106
+107
+108
+109
+60
+60
+61
+61
+62
+62
+63
+63
+64
+64
+60
+35
+35
+36
+36
+37
+37
+38
+38
+39
+39
+105
+106
+107
+108
+109
+12
+13
+13
+14
+14
+15
+15
+16
diff --git a/tests/queries/0_stateless/02676_analyzer_limit_offset.sql b/tests/queries/0_stateless/02676_analyzer_limit_offset.sql
new file mode 100644
index 00000000000..39c6b85f088
--- /dev/null
+++ b/tests/queries/0_stateless/02676_analyzer_limit_offset.sql
@@ -0,0 +1,34 @@
+set allow_experimental_analyzer=1;
+
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (i UInt64) Engine = MergeTree() order by i;
+INSERT INTO test SELECT number FROM numbers(100);
+INSERT INTO test SELECT number FROM numbers(10,100);
+OPTIMIZE TABLE test FINAL;
+
+-- Only set limit
+SET limit = 5;
+SELECT * FROM test; -- 5 rows
+SELECT * FROM test OFFSET 20; -- 5 rows
+SELECT * FROM (SELECT i FROM test LIMIT 10 OFFSET 50) TMP; -- 5 rows
+SELECT * FROM test LIMIT 4 OFFSET 192; -- 4 rows
+SELECT * FROM test LIMIT 10 OFFSET 195; -- 5 rows
+
+-- Only set offset
+SET limit = 0;
+SET offset = 195;
+SELECT * FROM test; -- 5 rows
+SELECT * FROM test OFFSET 20; -- no result
+SELECT * FROM test LIMIT 100; -- no result
+SET offset = 10;
+SELECT * FROM test LIMIT 20 OFFSET 100; -- 10 rows
+SELECT * FROM test LIMIT 11 OFFSET 100; -- 1 rows
+
+-- offset and limit together
+SET limit = 10;
+SELECT * FROM test LIMIT 50 OFFSET 50; -- 10 rows
+SELECT * FROM test LIMIT 50 OFFSET 190; -- 0 rows
+SELECT * FROM test LIMIT 50 OFFSET 185; -- 5 rows
+SELECT * FROM test LIMIT 18 OFFSET 5; -- 8 rows
+
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/02676_distinct_reading_in_order_analyzer.reference b/tests/queries/0_stateless/02676_distinct_reading_in_order_analyzer.reference
new file mode 100644
index 00000000000..016202cfb66
--- /dev/null
+++ b/tests/queries/0_stateless/02676_distinct_reading_in_order_analyzer.reference
@@ -0,0 +1 @@
+MergeTreeInOrder
diff --git a/tests/queries/0_stateless/02676_distinct_reading_in_order_analyzer.sql b/tests/queries/0_stateless/02676_distinct_reading_in_order_analyzer.sql
new file mode 100644
index 00000000000..f00c1322e1d
--- /dev/null
+++ b/tests/queries/0_stateless/02676_distinct_reading_in_order_analyzer.sql
@@ -0,0 +1,8 @@
+drop table if exists t;
+
+set allow_experimental_analyzer=1;
+
+create table t (a UInt64, b UInt64) engine=MergeTree() order by (a);
+insert into t select number % 2, number from numbers(10);
+
+select splitByChar(' ', trimBoth(explain))[1] from (explain pipeline select distinct a from t) where explain like '%MergeTreeInOrder%';
diff --git a/tests/queries/0_stateless/02676_kafka_murmur_hash.reference b/tests/queries/0_stateless/02676_kafka_murmur_hash.reference
new file mode 100644
index 00000000000..43f8440a5fc
--- /dev/null
+++ b/tests/queries/0_stateless/02676_kafka_murmur_hash.reference
@@ -0,0 +1,5 @@
+1173551340
+1357151166
+1161502112
+661178819
+2088585677
diff --git a/tests/queries/0_stateless/02676_kafka_murmur_hash.sql b/tests/queries/0_stateless/02676_kafka_murmur_hash.sql
new file mode 100644
index 00000000000..d2847b757e2
--- /dev/null
+++ b/tests/queries/0_stateless/02676_kafka_murmur_hash.sql
@@ -0,0 +1,8 @@
+-- Test are taken from: https://github.com/apache/kafka/blob/139f7709bd3f5926901a21e55043388728ccca78/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java#L93
+-- and the reference is generated with: https://pastila.nl/?06465d36/87f8ab2c9f6501c54f1c0879a13c8626
+
+SELECT kafkaMurmurHash('21');
+SELECT kafkaMurmurHash('foobar');
+SELECT kafkaMurmurHash('a-little-bit-long-string');
+SELECT kafkaMurmurHash('a-little-bit-longer-string');
+SELECT kafkaMurmurHash('lkjh234lh9fiuh90y23oiuhsafujhadof229phr9h19h89h8');
diff --git a/tests/queries/0_stateless/02676_optimize_old_parts_replicated.reference b/tests/queries/0_stateless/02676_optimize_old_parts_replicated.reference
new file mode 100644
index 00000000000..0f3c482f188
--- /dev/null
+++ b/tests/queries/0_stateless/02676_optimize_old_parts_replicated.reference
@@ -0,0 +1,7 @@
+Without merge
+3
+With merge replicated any part range
+1
+With merge replicated partition only
+1
+1
diff --git a/tests/queries/0_stateless/02676_optimize_old_parts_replicated.sh b/tests/queries/0_stateless/02676_optimize_old_parts_replicated.sh
new file mode 100755
index 00000000000..2202a349c56
--- /dev/null
+++ b/tests/queries/0_stateless/02676_optimize_old_parts_replicated.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Wait for number of parts in table $1 to become $2.
+# Print the changed value. If no changes for $3 seconds, prints initial value.
+wait_for_number_of_parts() {
+    for _ in `seq $3`
+    do
+        sleep 1
+        res=`$CLICKHOUSE_CLIENT -q "SELECT count(*) FROM system.parts WHERE database = currentDatabase() AND table='$1' AND active"`
+        if [ "$res" -eq "$2" ]
+        then
+            echo "$res"
+            return
+        fi
+    done
+    echo "$res"
+}
+
+$CLICKHOUSE_CLIENT -nmq "
+DROP TABLE IF EXISTS test_without_merge;
+DROP TABLE IF EXISTS test_replicated;
+
+SELECT 'Without merge';
+
+CREATE TABLE test_without_merge (i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test02676_without_merge', 'node') ORDER BY i SETTINGS merge_selecting_sleep_ms=1000;
+INSERT INTO test_without_merge SELECT 1;
+INSERT INTO test_without_merge SELECT 2;
+INSERT INTO test_without_merge SELECT 3;"
+
+wait_for_number_of_parts 'test_without_merge' 1 10
+
+$CLICKHOUSE_CLIENT -nmq "
+DROP TABLE test_without_merge;
+
+SELECT 'With merge replicated any part range';
+
+CREATE TABLE test_replicated (i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test02676', 'node')  ORDER BY i
+SETTINGS min_age_to_force_merge_seconds=1, merge_selecting_sleep_ms=1000, min_age_to_force_merge_on_partition_only=false;
+INSERT INTO test_replicated SELECT 1;
+INSERT INTO test_replicated SELECT 2;
+INSERT INTO test_replicated SELECT 3;"
+
+wait_for_number_of_parts 'test_replicated' 1 100
+
+$CLICKHOUSE_CLIENT -nmq "
+DROP TABLE test_replicated;
+
+SELECT 'With merge replicated partition only';
+
+CREATE TABLE test_replicated (i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test02676_partition_only', 'node')  ORDER BY i
+SETTINGS min_age_to_force_merge_seconds=1, merge_selecting_sleep_ms=1000, min_age_to_force_merge_on_partition_only=true;
+INSERT INTO test_replicated SELECT 1;
+INSERT INTO test_replicated SELECT 2;
+INSERT INTO test_replicated SELECT 3;"
+
+wait_for_number_of_parts 'test_replicated' 1 100
+
+$CLICKHOUSE_CLIENT -nmq "
+SELECT sleepEachRow(1) FROM numbers(9) FORMAT Null; -- Sleep for 9 seconds and verify that we keep the old part because it's the only one
+SELECT (now() - modification_time) > 5 FROM system.parts WHERE database = currentDatabase() AND table='test_replicated' AND active;
+
+DROP TABLE test_replicated;"
diff --git a/tests/queries/0_stateless/02676_to_decimal_string.reference b/tests/queries/0_stateless/02676_to_decimal_string.reference
new file mode 100644
index 00000000000..4c27ee5b528
--- /dev/null
+++ b/tests/queries/0_stateless/02676_to_decimal_string.reference
@@ -0,0 +1,21 @@
+2.00000000000000000000000000000000000000000000000000000000000000000000000000000
+2.12
+-2.00000000000000000000000000000000000000000000000000000000000000000000000000000
+-2.12
+2.987600000000000033395508580724708735942840576171875000000000
+2.15
+-2.987600000000000033395508580724708735942840576171875000000000
+-2.15
+64.1230010986
+64.2340000000
+-64.1230010986
+-64.2340000000
+-32.345
+32.34500000000000000000000000000000000000000000000000000000000000000000000000000
+32.46
+-64.5671232345
+128.78932312332132985464
+-128.78932312332132985464
+128.78932312332132985464000000000000000000000000000000000000000000000000000000000
+128.7893231233
+-128.78932312332132985464123123789323123321329854600000000000000000000000000000000
diff --git a/tests/queries/0_stateless/02676_to_decimal_string.sql b/tests/queries/0_stateless/02676_to_decimal_string.sql
new file mode 100644
index 00000000000..563d60c62c7
--- /dev/null
+++ b/tests/queries/0_stateless/02676_to_decimal_string.sql
@@ -0,0 +1,35 @@
+-- Regular types
+SELECT toDecimalString(2, 77);  -- more digits required than exist
+SELECT toDecimalString(2.123456, 2);  -- rounding
+SELECT toDecimalString(-2, 77);  -- more digits required than exist
+SELECT toDecimalString(-2.123456, 2);  -- rounding
+
+SELECT toDecimalString(2.9876, 60);  -- more digits required than exist (took 60 as it is float by default)
+SELECT toDecimalString(2.1456, 2);  -- rounding
+SELECT toDecimalString(-2.9876, 60);  -- more digits required than exist
+SELECT toDecimalString(-2.1456, 2);  -- rounding
+
+-- Float32 and Float64 tests. No sense to test big float precision -- the result will be a mess anyway.
+SELECT toDecimalString(64.123::Float32, 10);
+SELECT toDecimalString(64.234::Float64, 10);
+SELECT toDecimalString(-64.123::Float32, 10);
+SELECT toDecimalString(-64.234::Float64, 10);
+
+-- Decimals
+SELECT toDecimalString(-32.345::Decimal32(3), 3);
+SELECT toDecimalString(32.345::Decimal32(3), 77);  -- more digits required than exist
+SELECT toDecimalString(32.456::Decimal32(3), 2);  -- rounding
+SELECT toDecimalString('-64.5671232345'::Decimal64(10), 10);
+SELECT toDecimalString('128.78932312332132985464'::Decimal128(20), 20);
+SELECT toDecimalString('-128.78932312332132985464123123'::Decimal128(26), 20);  -- rounding
+SELECT toDecimalString('128.78932312332132985464'::Decimal128(20), 77);  -- more digits required than exist
+SELECT toDecimalString('128.789323123321329854641231237893231233213298546'::Decimal256(45), 10);  -- rounding
+SELECT toDecimalString('-128.789323123321329854641231237893231233213298546'::Decimal256(45), 77);  -- more digits required than exist
+
+-- Max number of decimal fractional digits is defined as 77 for Int/UInt/Decimal and 60 for Float.
+-- These values shall work OK.
+SELECT toDecimalString('32.32'::Float32, 61); -- {serverError CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER}
+SELECT toDecimalString('64.64'::Float64, 61); -- {serverError CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER}
+SELECT toDecimalString('88'::UInt8, 78); -- {serverError CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER}
+SELECT toDecimalString('646464'::Int256, 78); -- {serverError CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER}
+SELECT toDecimalString('-128.789323123321329854641231237893231233213298546'::Decimal256(45), 78); -- {serverError CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER}
diff --git a/tests/queries/0_stateless/02676_trailing_commas.reference b/tests/queries/0_stateless/02676_trailing_commas.reference
new file mode 100644
index 00000000000..76d173ca23e
--- /dev/null
+++ b/tests/queries/0_stateless/02676_trailing_commas.reference
@@ -0,0 +1,5 @@
+1
+1
+1
+1	2	0
+1
diff --git a/tests/queries/0_stateless/02676_trailing_commas.sql b/tests/queries/0_stateless/02676_trailing_commas.sql
new file mode 100644
index 00000000000..048405c4d20
--- /dev/null
+++ b/tests/queries/0_stateless/02676_trailing_commas.sql
@@ -0,0 +1,5 @@
+SELECT 1,;
+SELECT 1, FROM numbers(1);
+WITH 1 as a SELECT a, FROM numbers(1);
+WITH 1 as from SELECT from, from + from, from in [0], FROM numbers(1);
+SELECT n, FROM (SELECT 1 AS n);
diff --git a/tests/queries/0_stateless/02677_analyzer_bitmap_has_any.reference b/tests/queries/0_stateless/02677_analyzer_bitmap_has_any.reference
new file mode 100644
index 00000000000..16d7e43ecb3
--- /dev/null
+++ b/tests/queries/0_stateless/02677_analyzer_bitmap_has_any.reference
@@ -0,0 +1,4 @@
+1	0
+--------------
+--------------
+1	0
diff --git a/tests/queries/0_stateless/02677_analyzer_bitmap_has_any.sql b/tests/queries/0_stateless/02677_analyzer_bitmap_has_any.sql
new file mode 100644
index 00000000000..f0f9845d91d
--- /dev/null
+++ b/tests/queries/0_stateless/02677_analyzer_bitmap_has_any.sql
@@ -0,0 +1,36 @@
+SELECT
+    bitmapHasAny(bitmapBuild([toUInt8(1)]), (
+        SELECT groupBitmapState(toUInt8(1))
+    )) has1,
+    bitmapHasAny(bitmapBuild([toUInt64(1)]), (
+        SELECT groupBitmapState(toUInt64(2))
+    )) has2;
+
+SELECT '--------------';
+
+SELECT *
+FROM
+(
+    SELECT
+        bitmapHasAny(bitmapBuild([toUInt8(1)]), (
+            SELECT groupBitmapState(toUInt8(1))
+        )) has1,
+        bitmapHasAny(bitmapBuild([toUInt64(1)]), (
+            SELECT groupBitmapState(toUInt64(2))
+        )) has2
+) SETTINGS allow_experimental_analyzer = 0; -- { serverError 43 }
+
+SELECT '--------------';
+
+SELECT *
+FROM
+(
+    SELECT
+        bitmapHasAny(bitmapBuild([toUInt8(1)]), (
+            SELECT groupBitmapState(toUInt8(1))
+        )) has1,
+        bitmapHasAny(bitmapBuild([toUInt64(1)]), (
+            SELECT groupBitmapState(toUInt64(2))
+        )) has2
+) SETTINGS allow_experimental_analyzer = 1;
+
diff --git a/tests/queries/0_stateless/02677_analyzer_compound_expressions.reference b/tests/queries/0_stateless/02677_analyzer_compound_expressions.reference
new file mode 100644
index 00000000000..96c10398c90
--- /dev/null
+++ b/tests/queries/0_stateless/02677_analyzer_compound_expressions.reference
@@ -0,0 +1,18 @@
+a	b
+a	b
+1	a	b
+1	a	b
+3
+3
+[0,0,1]
+[0,0,1]
+3	[2,0,1]
+3	[2,0,1]
+['foo','bar']	[1,2]
+['foo','bar']	[1,2]
+['foo','bar']	[1,2]
+['foo','bar']	[(1,2),(3,4)]	[1,3]	[2,4]
+['foo','bar']	[(1,2),(3,4)]	[1,3]	[2,4]
+['foo','bar']	[(1,2),(3,4)]	[1,3]	[2,4]
+['foo','bar']	[(1,2),(3,4)]	[1,3]	[2,4]
+3
diff --git a/tests/queries/0_stateless/02677_analyzer_compound_expressions.sql b/tests/queries/0_stateless/02677_analyzer_compound_expressions.sql
new file mode 100644
index 00000000000..6b7fdab8993
--- /dev/null
+++ b/tests/queries/0_stateless/02677_analyzer_compound_expressions.sql
@@ -0,0 +1,44 @@
+SET allow_experimental_analyzer = 1;
+
+WITH ('a', 'b')::Tuple(c1 String, c2 String) AS t
+SELECT t.c1, t.c2;
+
+WITH materialize(('a', 'b')::Tuple(c1 String, c2 String)) AS t
+SELECT t.c1, t.c2;
+
+WITH (1, ('a', 'b'))::Tuple(c1 UInt64, t1 Tuple(c1 String, c2 String)) AS t
+SELECT t.c1, t.t1.c1, t.t1.c2;
+
+WITH materialize((1, ('a', 'b'))::Tuple(c1 UInt64, t1 Tuple(c1 String, c2 String))) AS t
+SELECT t.c1, t.t1.c1, t.t1.c2;
+
+WITH [1, 2, 3] AS arr SELECT arr.size0;
+WITH materialize([1, 2, 3]) AS arr SELECT arr.size0;
+
+WITH [1, 2, NULL] AS arr SELECT arr.null;
+WITH materialize([1, 2, NULL]) AS arr SELECT arr.null;
+
+WITH [[1, 2], [], [3]] AS arr SELECT arr.size0, arr.size1;
+WITH materialize([[1, 2], [], [3]]) AS arr SELECT arr.size0, arr.size1;
+
+WITH map('foo', 1, 'bar', 2) AS m SELECT m.keys, m.values;
+WITH materialize(map('foo', 1, 'bar', 2)) AS m SELECT m.keys, m.values;
+WITH map('foo', 1, 'bar', 2) AS m SELECT m.*;
+
+WITH map('foo', (1, 2), 'bar', (3, 4))::Map(String, Tuple(a UInt64, b UInt64)) AS m
+SELECT m.keys, m.values, m.values.a, m.values.b;
+
+WITH materialize(map('foo', (1, 2), 'bar', (3, 4))::Map(String, Tuple(a UInt64, b UInt64))) AS m
+SELECT m.keys, m.values, m.values.a, m.values.b;
+
+WITH map('foo', (1, 2), 'bar', (3, 4))::Map(String, Tuple(a UInt64, b UInt64)) AS m
+SELECT m.keys, m.values, m.values.*;
+
+WITH materialize(map('foo', (1, 2), 'bar', (3, 4))::Map(String, Tuple(a UInt64, b UInt64))) AS m
+SELECT m.keys, m.values, m.values.*;
+
+WITH [1, 2, 3] AS arr SELECT arr.*; -- { serverError UNSUPPORTED_METHOD }
+
+SELECT getSubcolumn([1, 2, 3], 'size0');
+SELECT getSubcolumn([1, 2, 3], materialize('size0')); -- { serverError ILLEGAL_COLUMN }
+SELECT getSubcolumn([1, 2, 3], 'aaa'); -- { serverError ILLEGAL_COLUMN }
diff --git a/tests/queries/0_stateless/02677_decode_url_component.reference b/tests/queries/0_stateless/02677_decode_url_component.reference
new file mode 100644
index 00000000000..5f88856dc1c
--- /dev/null
+++ b/tests/queries/0_stateless/02677_decode_url_component.reference
@@ -0,0 +1,2 @@
+%D0%BA%D0%BB%D0%B8%D0%BA%D1%85%D0%B0%D1%83%D1%81	1
+1
diff --git a/tests/queries/0_stateless/02677_decode_url_component.sql b/tests/queries/0_stateless/02677_decode_url_component.sql
new file mode 100644
index 00000000000..68345b5de16
--- /dev/null
+++ b/tests/queries/0_stateless/02677_decode_url_component.sql
@@ -0,0 +1,5 @@
+SELECT
+    encodeURLComponent('кликхаус') AS encoded,
+    decodeURLComponent(encoded) = 'кликхаус' AS expected_EQ;
+
+SELECT DISTINCT decodeURLComponent(encodeURLComponent(randomString(100) AS x)) = x FROM numbers(100000);
diff --git a/tests/queries/0_stateless/02677_get_subcolumn_array_of_tuples.reference b/tests/queries/0_stateless/02677_get_subcolumn_array_of_tuples.reference
new file mode 100644
index 00000000000..f2700561f4e
--- /dev/null
+++ b/tests/queries/0_stateless/02677_get_subcolumn_array_of_tuples.reference
@@ -0,0 +1,3 @@
+[42]
+['foo']
+1
diff --git a/tests/queries/0_stateless/02677_get_subcolumn_array_of_tuples.sql b/tests/queries/0_stateless/02677_get_subcolumn_array_of_tuples.sql
new file mode 100644
index 00000000000..5779821afaa
--- /dev/null
+++ b/tests/queries/0_stateless/02677_get_subcolumn_array_of_tuples.sql
@@ -0,0 +1,13 @@
+SET allow_experimental_analyzer = 1;
+
+DROP TABLE IF EXISTS t_get_subcolumn;
+
+CREATE TABLE t_get_subcolumn (id UInt64, n Nested(u UInt64, s String)) ENGINE = MergeTree ORDER BY id;
+
+INSERT INTO t_get_subcolumn VALUES (1, [42], ['foo']);
+
+SELECT getSubcolumn(n, 'u') FROM t_get_subcolumn;
+SELECT getSubcolumn(n, 's') FROM t_get_subcolumn;
+SELECT getSubcolumn(n, 'size0') FROM t_get_subcolumn;
+
+DROP TABLE t_get_subcolumn;
diff --git a/tests/queries/0_stateless/02677_grace_hash_limit_race.reference b/tests/queries/0_stateless/02677_grace_hash_limit_race.reference
new file mode 100644
index 00000000000..83b33d238da
--- /dev/null
+++ b/tests/queries/0_stateless/02677_grace_hash_limit_race.reference
@@ -0,0 +1 @@
+1000
diff --git a/tests/queries/0_stateless/02677_grace_hash_limit_race.sql b/tests/queries/0_stateless/02677_grace_hash_limit_race.sql
new file mode 100644
index 00000000000..55262ab2455
--- /dev/null
+++ b/tests/queries/0_stateless/02677_grace_hash_limit_race.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS test_grace_hash;
+
+CREATE TABLE test_grace_hash (id UInt32, value UInt64) ENGINE = MergeTree ORDER BY id;
+
+INSERT INTO test_grace_hash SELECT number, number % 100 = 0 FROM numbers(100000);
+
+SET join_algorithm = 'grace_hash';
+
+SELECT count() FROM (
+    SELECT f.id FROM test_grace_hash AS f
+    LEFT JOIN test_grace_hash AS d
+    ON f.id = d.id
+    LIMIT 1000
+);
+
+DROP TABLE test_grace_hash;
diff --git a/tests/queries/0_stateless/01071_live_view_detach_dependency.reference b/tests/queries/0_stateless/02678_explain_pipeline_graph_with_projection.reference
similarity index 100%
rename from tests/queries/0_stateless/01071_live_view_detach_dependency.reference
rename to tests/queries/0_stateless/02678_explain_pipeline_graph_with_projection.reference
diff --git a/tests/queries/0_stateless/02678_explain_pipeline_graph_with_projection.sql b/tests/queries/0_stateless/02678_explain_pipeline_graph_with_projection.sql
new file mode 100644
index 00000000000..e8b7405d602
--- /dev/null
+++ b/tests/queries/0_stateless/02678_explain_pipeline_graph_with_projection.sql
@@ -0,0 +1,12 @@
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1(ID UInt64, name String) engine=MergeTree order by ID;
+
+insert into t1(ID, name) values (1, 'abc'), (2, 'bbb');
+
+-- The returned node order is uncertain
+explain pipeline graph=1 select count(ID) from t1 FORMAT Null;
+explain pipeline graph=1 select sum(1) from t1 FORMAT Null;
+explain pipeline graph=1 select min(ID) from t1 FORMAT Null;
+explain pipeline graph=1 select max(ID) from t1 FORMAT Null;
+
+DROP TABLE t1;
diff --git a/tests/queries/0_stateless/02679_explain_merge_tree_prewhere_row_policy.reference b/tests/queries/0_stateless/02679_explain_merge_tree_prewhere_row_policy.reference
new file mode 100644
index 00000000000..2fe98ea1682
--- /dev/null
+++ b/tests/queries/0_stateless/02679_explain_merge_tree_prewhere_row_policy.reference
@@ -0,0 +1,56 @@
+Expression ((Projection + Before ORDER BY))
+Header: id UInt64
+        value String
+Actions: INPUT :: 0 -> id UInt64 : 0
+         INPUT :: 1 -> value String : 1
+Positions: 0 1
+  ReadFromMergeTree (default.test_table)
+  Header: id UInt64
+          value String
+  ReadType: Default
+  Parts: 0
+  Granules: 0
+  Prewhere info
+  Need filter: 1
+    Prewhere filter
+    Prewhere filter column: equals(id, 5) (removed)
+    Actions: INPUT : 0 -> id UInt64 : 0
+             COLUMN Const(UInt8) -> 5 UInt8 : 1
+             FUNCTION equals(id : 0, 5 :: 1) -> equals(id, 5) UInt8 : 2
+    Positions: 2 0
+    Row level filter
+    Row level filter column: greaterOrEquals(id, 5)
+    Actions: INPUT : 0 -> id UInt64 : 0
+             COLUMN Const(UInt8) -> 5 UInt8 : 1
+             FUNCTION greaterOrEquals(id : 0, 5 :: 1) -> greaterOrEquals(id, 5) UInt8 : 2
+    Positions: 2 0
+Expression ((Project names + (Projection + Change column names to column identifiers)))
+Header: id UInt64
+        value String
+Actions: INPUT : 0 -> id UInt64 : 0
+         INPUT : 1 -> value String : 1
+         ALIAS id :: 0 -> default.test_table.id_0 UInt64 : 2
+         ALIAS value :: 1 -> default.test_table.value_1 String : 0
+         ALIAS default.test_table.id_0 :: 2 -> id UInt64 : 1
+         ALIAS default.test_table.value_1 :: 0 -> value String : 2
+Positions: 1 2
+  ReadFromMergeTree (default.test_table)
+  Header: id UInt64
+          value String
+  ReadType: Default
+  Parts: 0
+  Granules: 0
+  Prewhere info
+  Need filter: 1
+    Prewhere filter
+    Prewhere filter column: equals(id, 5_UInt8) (removed)
+    Actions: INPUT : 0 -> id UInt64 : 0
+             COLUMN Const(UInt8) -> 5_UInt8 UInt8 : 1
+             FUNCTION equals(id : 0, 5_UInt8 :: 1) -> equals(id, 5_UInt8) UInt8 : 2
+    Positions: 2 0
+    Row level filter
+    Row level filter column: greaterOrEquals(id, 5_UInt8)
+    Actions: INPUT : 0 -> id UInt64 : 0
+             COLUMN Const(UInt8) -> 5_UInt8 UInt8 : 1
+             FUNCTION greaterOrEquals(id : 0, 5_UInt8 :: 1) -> greaterOrEquals(id, 5_UInt8) UInt8 : 2
+    Positions: 2 0
diff --git a/tests/queries/0_stateless/02679_explain_merge_tree_prewhere_row_policy.sql b/tests/queries/0_stateless/02679_explain_merge_tree_prewhere_row_policy.sql
new file mode 100644
index 00000000000..4bc7be13490
--- /dev/null
+++ b/tests/queries/0_stateless/02679_explain_merge_tree_prewhere_row_policy.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table
+(
+    id UInt64,
+    value String
+) ENGINE=MergeTree ORDER BY id;
+
+INSERT INTO test_table VALUES (0, 'Value');
+
+DROP ROW POLICY IF EXISTS test_row_policy ON test_table;
+CREATE ROW POLICY test_row_policy ON test_table USING id >= 5 TO ALL;
+
+EXPLAIN header = 1, actions = 1 SELECT id, value FROM test_table PREWHERE id = 5 settings allow_experimental_analyzer=0;
+EXPLAIN header = 1, actions = 1 SELECT id, value FROM test_table PREWHERE id = 5 settings allow_experimental_analyzer=1;
+
+DROP ROW POLICY test_row_policy ON test_table;
+DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/01246_insert_into_watch_live_view.reference b/tests/queries/0_stateless/02679_query_parameters_dangling_pointer.reference
similarity index 100%
rename from tests/queries/0_stateless/01246_insert_into_watch_live_view.reference
rename to tests/queries/0_stateless/02679_query_parameters_dangling_pointer.reference
diff --git a/tests/queries/0_stateless/02679_query_parameters_dangling_pointer.sql b/tests/queries/0_stateless/02679_query_parameters_dangling_pointer.sql
new file mode 100644
index 00000000000..7705b860e8e
--- /dev/null
+++ b/tests/queries/0_stateless/02679_query_parameters_dangling_pointer.sql
@@ -0,0 +1,4 @@
+-- There is no use-after-free in the following query:
+
+SET param_o = 'a';
+CREATE TABLE test.xxx (a Int64) ENGINE=MergeTree ORDER BY ({o:String}); -- { serverError 44 }
diff --git a/tests/queries/0_stateless/02680_datetime64_monotonic_check.reference b/tests/queries/0_stateless/02680_datetime64_monotonic_check.reference
new file mode 100644
index 00000000000..7bff7e0c2e5
--- /dev/null
+++ b/tests/queries/0_stateless/02680_datetime64_monotonic_check.reference
@@ -0,0 +1,2 @@
+22	0	1
+1970-01-01 02:00:02
diff --git a/tests/queries/0_stateless/02680_datetime64_monotonic_check.sql b/tests/queries/0_stateless/02680_datetime64_monotonic_check.sql
new file mode 100644
index 00000000000..6036831d05d
--- /dev/null
+++ b/tests/queries/0_stateless/02680_datetime64_monotonic_check.sql
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS 02680_datetime64_monotonic_check;
+DROP TABLE IF EXISTS 02680_datetime_monotonic_check_lc;
+
+CREATE TABLE 02680_datetime64_monotonic_check (`t` DateTime64(3), `x` Nullable(Decimal(18, 14)))
+ENGINE = MergeTree
+PARTITION BY toYYYYMMDD(t)
+ORDER BY x SETTINGS allow_nullable_key = 1;
+
+INSERT INTO 02680_datetime64_monotonic_check VALUES (toDateTime64('2023-03-13 00:00:00', 3, 'Asia/Jerusalem'), 123);
+
+SELECT toHour(toTimeZone(t, 'UTC')) AS toHour_UTC, toHour(toTimeZone(t, 'Asia/Jerusalem')) AS toHour_Israel, count()
+FROM 02680_datetime64_monotonic_check
+WHERE toHour_Israel = 0
+GROUP BY toHour_UTC, toHour_Israel;
+
+DROP TABLE 02680_datetime64_monotonic_check;
+
+SET allow_suspicious_low_cardinality_types = 1;
+CREATE TABLE 02680_datetime_monotonic_check_lc (`timestamp` LowCardinality(UInt32))
+ENGINE = MergeTree
+ORDER BY timestamp
+SETTINGS index_granularity = 1;
+
+INSERT INTO 02680_datetime_monotonic_check_lc VALUES (2);
+
+SELECT toDateTime(timestamp, 'Asia/Jerusalem') FROM 02680_datetime_monotonic_check_lc WHERE toHour(toDateTime(timestamp, 'Asia/Jerusalem')) = 2;
+
+DROP TABLE 02680_datetime_monotonic_check_lc
diff --git a/tests/queries/0_stateless/02521_cannot-find-column-in-projection.reference b/tests/queries/0_stateless/02680_default_star.reference
similarity index 100%
rename from tests/queries/0_stateless/02521_cannot-find-column-in-projection.reference
rename to tests/queries/0_stateless/02680_default_star.reference
diff --git a/tests/queries/0_stateless/02680_default_star.sql b/tests/queries/0_stateless/02680_default_star.sql
new file mode 100644
index 00000000000..d560bd01e41
--- /dev/null
+++ b/tests/queries/0_stateless/02680_default_star.sql
@@ -0,0 +1,6 @@
+-- These queries yield syntax error, not logical error.
+
+CREATE TEMPORARY TABLE test (ad DEFAULT *); -- { clientError SYNTAX_ERROR }
+CREATE TEMPORARY TABLE test (ad INT DEFAULT *); -- { clientError SYNTAX_ERROR }
+CREATE TEMPORARY TABLE test (ad DEFAULT * NOT NULL); -- { clientError SYNTAX_ERROR }
+CREATE TEMPORARY TABLE test (ad DEFAULT t.* NOT NULL); -- { clientError SYNTAX_ERROR }
diff --git a/tests/queries/0_stateless/02680_illegal_type_of_filter_projection.reference b/tests/queries/0_stateless/02680_illegal_type_of_filter_projection.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02680_illegal_type_of_filter_projection.sql b/tests/queries/0_stateless/02680_illegal_type_of_filter_projection.sql
new file mode 100644
index 00000000000..3ef3b8a4fe6
--- /dev/null
+++ b/tests/queries/0_stateless/02680_illegal_type_of_filter_projection.sql
@@ -0,0 +1,3 @@
+CREATE TABLE test_tuple (`p` DateTime, `i` int, `j` int) ENGINE = MergeTree PARTITION BY (toDate(p), i) ORDER BY j SETTINGS index_granularity = 1;
+insert into test_tuple values (1, 1, 1);
+SELECT count() FROM test_tuple PREWHERE sipHash64(sipHash64(p, toString(toDate(p))), toString(toDate(p))) % -0. WHERE i > NULL settings optimize_trivial_count_query=0; -- { serverError ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER }
diff --git a/tests/queries/0_stateless/00977_live_view_watch_events.reference b/tests/queries/0_stateless/02680_instr_alias_for_position_case_insensitive.reference
similarity index 66%
rename from tests/queries/0_stateless/00977_live_view_watch_events.reference
rename to tests/queries/0_stateless/02680_instr_alias_for_position_case_insensitive.reference
index 01e79c32a8c..4792e70f333 100644
--- a/tests/queries/0_stateless/00977_live_view_watch_events.reference
+++ b/tests/queries/0_stateless/02680_instr_alias_for_position_case_insensitive.reference
@@ -1,3 +1,2 @@
-1
 2
 3
diff --git a/tests/queries/0_stateless/02680_instr_alias_for_position_case_insensitive.sql b/tests/queries/0_stateless/02680_instr_alias_for_position_case_insensitive.sql
new file mode 100644
index 00000000000..c1c55c2c982
--- /dev/null
+++ b/tests/queries/0_stateless/02680_instr_alias_for_position_case_insensitive.sql
@@ -0,0 +1,2 @@
+select INSTR('hello', 'e');
+select INSTR('hELlo', 'L');
diff --git a/tests/queries/0_stateless/02680_lc_null_as_default.reference b/tests/queries/0_stateless/02680_lc_null_as_default.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02680_lc_null_as_default.sql b/tests/queries/0_stateless/02680_lc_null_as_default.sql
new file mode 100644
index 00000000000..f6bfad37771
--- /dev/null
+++ b/tests/queries/0_stateless/02680_lc_null_as_default.sql
@@ -0,0 +1,6 @@
+drop table if exists test_null_as_default__fuzz_46;
+SET allow_suspicious_low_cardinality_types = 1;
+CREATE TABLE test_null_as_default__fuzz_46 (a Nullable(DateTime64(3)), b LowCardinality(Float32) DEFAULT a + 1000) ENGINE = Memory;
+INSERT INTO test_null_as_default__fuzz_46 SELECT 1, NULL UNION ALL SELECT 2, NULL;
+drop table test_null_as_default__fuzz_46;
+
diff --git a/tests/queries/0_stateless/02680_mysql_ast_logical_err.reference b/tests/queries/0_stateless/02680_mysql_ast_logical_err.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02680_mysql_ast_logical_err.sql b/tests/queries/0_stateless/02680_mysql_ast_logical_err.sql
new file mode 100644
index 00000000000..bde91df83ca
--- /dev/null
+++ b/tests/queries/0_stateless/02680_mysql_ast_logical_err.sql
@@ -0,0 +1,4 @@
+CREATE TABLE foo (key UInt32, a String, b Int64, c String) ENGINE = TinyLog;
+
+SELECT count() FROM mysql(mysql('127.0.0.1:9004', currentDatabase(), 'foo', 'default', ''), '127.0.0.1:9004', currentDatabase(), 'foo', '', ''); -- { serverError UNKNOWN_FUNCTION }
+SELECT count() FROM mysql(mysql('127.0.0.1:9004', currentDatabase(), 'foo', 'default', '', SETTINGS connection_pool_size = 1), '127.0.0.1:9004', currentDatabase(), 'foo', '', ''); -- { serverError UNKNOWN_FUNCTION, UNSUPPORTED_METHOD }
diff --git a/tests/queries/0_stateless/02681_aggregation_by_partitions_bug.reference b/tests/queries/0_stateless/02681_aggregation_by_partitions_bug.reference
new file mode 100644
index 00000000000..749fce669df
--- /dev/null
+++ b/tests/queries/0_stateless/02681_aggregation_by_partitions_bug.reference
@@ -0,0 +1 @@
+1000000
diff --git a/tests/queries/0_stateless/02681_aggregation_by_partitions_bug.sql b/tests/queries/0_stateless/02681_aggregation_by_partitions_bug.sql
new file mode 100644
index 00000000000..32b4b55076b
--- /dev/null
+++ b/tests/queries/0_stateless/02681_aggregation_by_partitions_bug.sql
@@ -0,0 +1,10 @@
+-- Tags: no-random-merge-tree-settings
+
+set max_threads = 16;
+
+create table t(a UInt32) engine=MergeTree order by tuple() partition by a % 16;
+
+insert into t select * from numbers_mt(1e6);
+
+set allow_aggregate_partitions_independently=1, force_aggregate_partitions_independently=1;
+select count(distinct a) from t;
diff --git a/tests/queries/0_stateless/02681_comparsion_tuple_elimination_ast.reference b/tests/queries/0_stateless/02681_comparsion_tuple_elimination_ast.reference
new file mode 100644
index 00000000000..6d848fbd4b1
--- /dev/null
+++ b/tests/queries/0_stateless/02681_comparsion_tuple_elimination_ast.reference
@@ -0,0 +1,7 @@
+SELECT
+    a,
+    b,
+    c,
+    d
+FROM t1
+WHERE (((a = 1) AND (b = 2)) AND ((c = 3) AND (d = 4) AND (a = 5))) OR ((a = c) AND (b = 10) AND (1000 = d)) OR (((a = c) AND (b = 10)) AND (1000 = d))
diff --git a/tests/queries/0_stateless/02681_comparsion_tuple_elimination_ast.sql b/tests/queries/0_stateless/02681_comparsion_tuple_elimination_ast.sql
new file mode 100644
index 00000000000..7f36b0568c7
--- /dev/null
+++ b/tests/queries/0_stateless/02681_comparsion_tuple_elimination_ast.sql
@@ -0,0 +1,8 @@
+SET optimize_move_to_prewhere = 1; -- works only for PREWHERE
+
+CREATE TABLE t1 (a UInt64, b UInt64, c UInt64, d UInt64) ENGINE = Memory;
+INSERT INTO t1 SELECT number, number * 10, number * 100, number * 1000 FROM numbers(1000000);
+
+EXPLAIN SYNTAX
+SELECT * FROM t1
+WHERE (a, b) = (1, 2) AND (c, d, a) = (3, 4, 5) OR (a, b, 1000) = (c, 10, d) OR ((a, b), 1000) = ((c, 10), d);
diff --git a/tests/queries/0_stateless/02153_native_bounds_check.reference b/tests/queries/0_stateless/02681_final_excessive_reading_bug.reference
similarity index 100%
rename from tests/queries/0_stateless/02153_native_bounds_check.reference
rename to tests/queries/0_stateless/02681_final_excessive_reading_bug.reference
diff --git a/tests/queries/0_stateless/02681_final_excessive_reading_bug.sh b/tests/queries/0_stateless/02681_final_excessive_reading_bug.sh
new file mode 100755
index 00000000000..a795b9ec5a0
--- /dev/null
+++ b/tests/queries/0_stateless/02681_final_excessive_reading_bug.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Tags: no-random-merge-tree-settings
+
+# shellcheck disable=SC2154
+
+unset CLICKHOUSE_LOG_COMMENT
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT -q "CREATE TABLE sample_final (CounterID UInt32, EventDate Date, EventTime DateTime, UserID UInt64, Sign Int8) ENGINE = CollapsingMergeTree(Sign) ORDER BY (CounterID, EventDate, intHash32(UserID), EventTime) SAMPLE BY intHash32(UserID)"
+
+$CLICKHOUSE_CLIENT -q "INSERT INTO sample_final SELECT number / (8192 * 4), toDate('2019-01-01'), toDateTime('2019-01-01 00:00:01') + number, number / (8192 * 2), if((number % 3) = 1, -1, 1) FROM numbers(1000000)"
+
+query_id="${CLICKHOUSE_DATABASE}_final_excessive_reading_bug_$RANDOM"
+$CLICKHOUSE_CLIENT --query_id="$query_id" -q "select * from sample_final FINAL SAMPLE 1/2 OFFSET 1/2 format Null settings max_threads=16"
+
+$CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
+$CLICKHOUSE_CLIENT --param_query_id="$query_id" -q "
+SELECT ProfileEvents['SelectedRows'] < 1_000_000
+  FROM system.query_log
+ WHERE event_date >= yesterday() AND type = 'QueryFinish' AND query_id = {query_id:String} AND current_database = currentDatabase()"
diff --git a/tests/queries/0_stateless/02681_group_array_too_large_size.reference b/tests/queries/0_stateless/02681_group_array_too_large_size.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02681_group_array_too_large_size.sql b/tests/queries/0_stateless/02681_group_array_too_large_size.sql
new file mode 100644
index 00000000000..7b09f9b468e
--- /dev/null
+++ b/tests/queries/0_stateless/02681_group_array_too_large_size.sql
@@ -0,0 +1,8 @@
+-- This query throw high-level exception instead of low-level "too large size passed to allocator":
+
+SELECT * FROM format(CSV, 'entitypArray AggregateFunction(groupArray, String)',
+'295TMiews.viewN�����""""""TabSepar��������������������������������������������������������������������������������������������ated
+d St""
+
+
+r'); -- { serverError TOO_LARGE_ARRAY_SIZE }
diff --git a/tests/queries/0_stateless/02681_undrop_query.reference b/tests/queries/0_stateless/02681_undrop_query.reference
new file mode 100644
index 00000000000..5df6c392eb9
--- /dev/null
+++ b/tests/queries/0_stateless/02681_undrop_query.reference
@@ -0,0 +1,32 @@
+test MergeTree undrop
+02681_undrop_mergetree
+1
+2
+3
+test detach
+UPDATE num = 2 WHERE id = 1
+test MergeTree with cluster
+02681_undrop_uuid_on_cluster
+1
+2
+3
+test MergeTree without uuid on cluster
+02681_undrop_no_uuid_on_cluster
+1
+2
+3
+test ReplicatedMergeTree undrop
+02681_undrop_replicatedmergetree
+1
+2
+3
+test Log undrop
+02681_undrop_log
+1
+2
+3
+test Distributed undrop
+02681_undrop_distributed
+test MergeTree drop and undrop multiple times
+02681_undrop_multiple
+3
diff --git a/tests/queries/0_stateless/02681_undrop_query.sql b/tests/queries/0_stateless/02681_undrop_query.sql
new file mode 100644
index 00000000000..ead1a8bb305
--- /dev/null
+++ b/tests/queries/0_stateless/02681_undrop_query.sql
@@ -0,0 +1,90 @@
+-- Tags: no-ordinary-database, no-replicated-database, distributed, zookeeper
+
+set database_atomic_wait_for_drop_and_detach_synchronously = 0;
+set allow_experimental_undrop_table_query = 1;
+
+select 'test MergeTree undrop';
+drop table if exists 02681_undrop_mergetree sync;
+create table 02681_undrop_mergetree (id Int32) Engine=MergeTree() order by id;
+insert into 02681_undrop_mergetree values (1),(2),(3);
+drop table 02681_undrop_mergetree;
+select table from system.dropped_tables where table = '02681_undrop_mergetree' limit 1;
+undrop table 02681_undrop_mergetree;
+select * from 02681_undrop_mergetree order by id;
+drop table 02681_undrop_mergetree sync;
+
+select 'test detach';
+drop table if exists 02681_undrop_detach sync;
+create table 02681_undrop_detach (id Int32, num Int32) Engine=MergeTree() order by id;
+insert into 02681_undrop_detach values (1, 1);
+detach table 02681_undrop_detach;
+undrop table 02681_undrop_detach; -- { serverError 57 }
+attach table 02681_undrop_detach;
+alter table 02681_undrop_detach update num = 2 where id = 1;
+select command from system.mutations where table='02681_undrop_detach' limit 1;
+drop table 02681_undrop_detach sync;
+
+select 'test MergeTree with cluster';
+drop table if exists 02681_undrop_uuid_on_cluster on cluster test_shard_localhost sync format Null;
+create table 02681_undrop_uuid_on_cluster on cluster test_shard_localhost (id Int32) Engine=MergeTree() order by id format Null;
+insert into 02681_undrop_uuid_on_cluster values (1),(2),(3);
+drop table 02681_undrop_uuid_on_cluster on cluster test_shard_localhost format Null;
+select table from system.dropped_tables where table = '02681_undrop_uuid_on_cluster' limit 1;
+undrop table 02681_undrop_uuid_on_cluster on cluster test_shard_localhost format Null;
+select * from 02681_undrop_uuid_on_cluster order by id;
+drop table 02681_undrop_uuid_on_cluster sync;
+
+select 'test MergeTree without uuid on cluster';
+drop table if exists 02681_undrop_no_uuid_on_cluster on cluster test_shard_localhost sync format Null;
+create table 02681_undrop_no_uuid_on_cluster on cluster test_shard_localhost (id Int32) Engine=MergeTree() order by id format Null;
+insert into 02681_undrop_no_uuid_on_cluster values (1),(2),(3);
+drop table 02681_undrop_no_uuid_on_cluster on cluster test_shard_localhost format Null;
+select table from system.dropped_tables where table = '02681_undrop_no_uuid_on_cluster' limit 1;
+undrop table 02681_undrop_no_uuid_on_cluster on cluster test_shard_localhost format Null;
+select * from 02681_undrop_no_uuid_on_cluster order by id;
+drop table 02681_undrop_no_uuid_on_cluster on cluster test_shard_localhost sync format Null;
+
+select 'test ReplicatedMergeTree undrop';
+drop table if exists 02681_undrop_replicatedmergetree sync;
+create table 02681_undrop_replicatedmergetree (id Int32) Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/02681_undrop_replicatedmergetree', 'test_undrop') order by id;
+insert into 02681_undrop_replicatedmergetree values (1),(2),(3);
+drop table 02681_undrop_replicatedmergetree;
+select table from system.dropped_tables where table = '02681_undrop_replicatedmergetree' limit 1;
+undrop table 02681_undrop_replicatedmergetree;
+select * from 02681_undrop_replicatedmergetree order by id;
+drop table 02681_undrop_replicatedmergetree sync;
+
+select 'test Log undrop';
+drop table if exists 02681_undrop_log sync;
+create table 02681_undrop_log (id Int32) Engine=Log();
+insert into 02681_undrop_log values (1),(2),(3);
+drop table 02681_undrop_log;
+select table from system.dropped_tables where table = '02681_undrop_log' limit 1;
+undrop table 02681_undrop_log;
+select * from 02681_undrop_log order by id;
+drop table 02681_undrop_log sync;
+
+select 'test Distributed undrop';
+drop table if exists 02681_undrop_distributed sync;
+create table 02681_undrop_distributed (id Int32) Engine = Distributed(test_shard_localhost, currentDatabase(), 02681_undrop, rand());
+drop table 02681_undrop_distributed;
+select table from system.dropped_tables where table = '02681_undrop_distributed' limit 1;
+undrop table 02681_undrop_distributed;
+drop table 02681_undrop_distributed sync;
+
+select 'test MergeTree drop and undrop multiple times';
+drop table if exists 02681_undrop_multiple sync;
+create table 02681_undrop_multiple (id Int32) Engine=MergeTree() order by id;
+insert into 02681_undrop_multiple values (1);
+drop table 02681_undrop_multiple;
+create table 02681_undrop_multiple (id Int32) Engine=MergeTree() order by id;
+insert into 02681_undrop_multiple values (2);
+drop table 02681_undrop_multiple;
+create table 02681_undrop_multiple (id Int32) Engine=MergeTree() order by id;
+insert into 02681_undrop_multiple values (3);
+drop table 02681_undrop_multiple;
+select table from system.dropped_tables where table = '02681_undrop_multiple' limit 1;
+undrop table 02681_undrop_multiple;
+select * from 02681_undrop_multiple order by id;
+undrop table 02681_undrop_multiple; -- { serverError 57 }
+drop table 02681_undrop_multiple sync;
diff --git a/tests/queries/0_stateless/02681_undrop_query_uuid.reference b/tests/queries/0_stateless/02681_undrop_query_uuid.reference
new file mode 100644
index 00000000000..beae016401b
--- /dev/null
+++ b/tests/queries/0_stateless/02681_undrop_query_uuid.reference
@@ -0,0 +1,6 @@
+test MergeTree with uuid
+02681_undrop_uuid
+OK
+1
+2
+3
diff --git a/tests/queries/0_stateless/02681_undrop_query_uuid.sh b/tests/queries/0_stateless/02681_undrop_query_uuid.sh
new file mode 100755
index 00000000000..a93f30ef459
--- /dev/null
+++ b/tests/queries/0_stateless/02681_undrop_query_uuid.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Tags: no-ordinary-database, no-replicated-database
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo 'test MergeTree with uuid'
+${CLICKHOUSE_CLIENT} -q "drop table if exists 02681_undrop_uuid sync;"
+uuid=$(${CLICKHOUSE_CLIENT} --query "SELECT generateUUIDv4()")
+uuid2=$(${CLICKHOUSE_CLIENT} --query "SELECT generateUUIDv4()")
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -q "create table 02681_undrop_uuid UUID '$uuid' on cluster test_shard_localhost (id Int32) Engine=MergeTree() order by id;"
+${CLICKHOUSE_CLIENT} -q "insert into 02681_undrop_uuid values (1),(2),(3);"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -q "drop table 02681_undrop_uuid on cluster test_shard_localhost settings database_atomic_wait_for_drop_and_detach_synchronously = 0;"
+${CLICKHOUSE_CLIENT} -q "select table from system.dropped_tables where table = '02681_undrop_uuid' limit 1;"
+${CLICKHOUSE_CLIENT} -q "undrop table 02681_undrop_uuid UUID '$uuid2' settings allow_experimental_undrop_table_query = 1;" 2>&1| grep -Faq "UNKNOWN_TABLE" && echo OK
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -q "undrop table 02681_undrop_uuid UUID '$uuid' on cluster test_shard_localhost settings allow_experimental_undrop_table_query = 1;"
+${CLICKHOUSE_CLIENT} -q "select * from 02681_undrop_uuid order by id;"
+${CLICKHOUSE_CLIENT} -q "drop table 02681_undrop_uuid sync;"
diff --git a/tests/queries/0_stateless/02682_quantiles_too_large_size.reference b/tests/queries/0_stateless/02682_quantiles_too_large_size.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02682_quantiles_too_large_size.sql b/tests/queries/0_stateless/02682_quantiles_too_large_size.sql
new file mode 100644
index 00000000000..fff98f667c7
Binary files /dev/null and b/tests/queries/0_stateless/02682_quantiles_too_large_size.sql differ
diff --git a/tests/queries/0_stateless/02683_native_too_large_size.reference b/tests/queries/0_stateless/02683_native_too_large_size.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02683_native_too_large_size.sql b/tests/queries/0_stateless/02683_native_too_large_size.sql
new file mode 100644
index 00000000000..e8752477f2d
Binary files /dev/null and b/tests/queries/0_stateless/02683_native_too_large_size.sql differ
diff --git a/tests/queries/0_stateless/02684_bson.reference b/tests/queries/0_stateless/02684_bson.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02684_bson.sql b/tests/queries/0_stateless/02684_bson.sql
new file mode 100644
index 00000000000..cab5600eff0
Binary files /dev/null and b/tests/queries/0_stateless/02684_bson.sql differ
diff --git a/tests/queries/0_stateless/02685_bson2.reference b/tests/queries/0_stateless/02685_bson2.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02685_bson2.sql b/tests/queries/0_stateless/02685_bson2.sql
new file mode 100644
index 00000000000..fc65d2952df
Binary files /dev/null and b/tests/queries/0_stateless/02685_bson2.sql differ
diff --git a/tests/queries/0_stateless/02685_decimal256_various.reference b/tests/queries/0_stateless/02685_decimal256_various.reference
new file mode 100644
index 00000000000..848c5e0b163
--- /dev/null
+++ b/tests/queries/0_stateless/02685_decimal256_various.reference
@@ -0,0 +1,97 @@
+-- { echoOn }
+
+SELECT 1.1::Decimal(60, 30);
+1.1
+SELECT round(1.1::Decimal(60, 30));
+1
+SELECT round(1.1::Decimal(60, 30), 1);
+1.1
+SELECT round(1.234567890123456789012345678901::Decimal(60, 30), 1);
+1.2
+SELECT round(1.234567890123456789012345678901::Decimal(60, 30), 30);
+1.234567890123456789012345678901
+SELECT round(1.234567890123456789012345678901::Decimal(60, 30), 31);
+1.234567890123456789012345678901
+SELECT round(1.234567890123456789012345678901::Decimal(60, 30), 20);
+1.23456789012345678901
+SELECT hex(1.234567890123456789012345678901::Decimal(60, 30));
+356C760E4FC986A2A39F1A950F00000000000000000000000000000000000000
+SELECT bin(1.234567890123456789012345678901::Decimal(60, 30));
+0011010101101100011101100000111001001111110010011000011010100010101000111001111100011010100101010000111100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+SELECT reinterpret(unhex(hex(1.234567890123456789012345678901::Decimal(60, 30))), 'Decimal(60, 30)');
+1.234567890123456789012345678901
+SELECT arraySum([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+4.65
+SELECT arraySum([1.2::Decimal(60, 30), 3.45::Decimal(3, 2)]);
+4.65
+SELECT arrayMin([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+1.2
+SELECT arrayMax([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+3.45
+SELECT arrayAvg([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+2.325
+SELECT round(arrayProduct([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]), 6);
+4.14
+SELECT toTypeName(arrayProduct([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]));
+Float64
+SELECT arrayCumSum([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+[1.2,4.65]
+SELECT arrayCumSumNonNegative([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+[1.2,4.65]
+SELECT arrayDifference([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+[0,2.25]
+SELECT arrayCompact([1.2::Decimal(60, 30) AS x, x, x, x, 3.45::Decimal(3, 2) AS y, y, x, x]);
+[1.2,3.45,1.2]
+SELECT 1.2::Decimal(2, 1) IN (1.2::Decimal(60, 30), 3.4::Decimal(60, 30));
+1
+SELECT 1.23::Decimal(3, 2) IN (1.2::Decimal(60, 30), 3.4::Decimal(60, 30));
+0
+SELECT 1.2::Decimal(60, 30) IN (1.2::Decimal(2, 1));
+1
+SELECT toTypeName([1.2::Decimal(60, 30), 3.45::Decimal(3, 2)]);
+Array(Decimal(76, 30))
+SELECT toTypeName(arraySum([1.2::Decimal(60, 30), 3.45::Decimal(3, 2)]));
+Decimal(76, 30)
+SELECT arrayJoin(sumMap(x)) FROM (SELECT [('Hello', 1.2::Decimal256(30)), ('World', 3.4::Decimal256(30))]::Map(String, Decimal256(30)) AS x UNION ALL SELECT [('World', 5.6::Decimal256(30)), ('GoodBye', -111.222::Decimal256(30))]::Map(String, Decimal256(30))) ORDER BY 1;
+('GoodBye',-111.222)
+('Hello',1.2)
+('World',9)
+SELECT mapAdd(map('Hello', 1.2::Decimal128(30), 'World', 3.4::Decimal128(30)), map('World', 5.6::Decimal128(30), 'GoodBye', -111.222::Decimal128(30)));
+{'GoodBye':-111.222,'Hello':1.2,'World':9}
+SELECT mapSubtract(map('Hello', 1.2::Decimal128(30), 'World', 3.4::Decimal128(30)), map('World', 5.6::Decimal128(30), 'GoodBye', -111.222::Decimal128(30)));
+{'GoodBye':111.222,'Hello':1.2,'World':-2.2}
+SELECT arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(UInt256)));
+[2,3]
+SELECT toTypeName(arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(UInt128))));
+Array(UInt128)
+SELECT toTypeName(arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(Int128))));
+Array(Int128)
+SELECT arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(Int128)));
+[2,3]
+SELECT arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(Int8)));
+[2,3]
+SELECT toTypeName(arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(Int8))));
+Array(Int8)
+SELECT arraySort(arrayIntersect([1.1::Decimal256(70), 2.34::Decimal256(60), 3.456::Decimal256(50)], [2.34::Decimal256(65), 3.456::Decimal256(55), 4.5678::Decimal256(45)]));
+[2.34,3.456]
+SELECT arraySort(arrayIntersect([1.1::Decimal256(1)], [1.12::Decimal256(2)])); -- Note: this is correct but the semantics has to be clarified in the docs.
+[1.1]
+SELECT arraySort(arrayIntersect([1.1::Decimal256(2)], [1.12::Decimal256(2)]));
+[]
+SELECT arraySort(arrayIntersect([1.1::Decimal128(1)], [1.12::Decimal128(2)])); -- Note: this is correct but the semantics has to be clarified in the docs.
+[1.1]
+SELECT arraySort(arrayIntersect([1.1::Decimal128(2)], [1.12::Decimal128(2)]));
+[]
+select coalesce(cast('123', 'Nullable(Decimal(20, 10))'), 0);
+123
+select coalesce(cast('123', 'Nullable(Decimal(40, 10))'), 0);
+123
+select coalesce(cast('123', 'Decimal(40, 10)'), 0);
+123
+DROP TABLE IF EXISTS decimal_insert_cast_issue;
+create table decimal_insert_cast_issue (a Decimal(76, 0)) engine = TinyLog;
+SET param_param = 1;
+INSERT INTO decimal_insert_cast_issue VALUES ({param:Nullable(Decimal(41, 0))});
+SELECT * FROM decimal_insert_cast_issue;
+1
+DROP TABLE decimal_insert_cast_issue;
diff --git a/tests/queries/0_stateless/02685_decimal256_various.sql b/tests/queries/0_stateless/02685_decimal256_various.sql
new file mode 100644
index 00000000000..545eaefe35e
--- /dev/null
+++ b/tests/queries/0_stateless/02685_decimal256_various.sql
@@ -0,0 +1,65 @@
+-- { echoOn }
+
+SELECT 1.1::Decimal(60, 30);
+SELECT round(1.1::Decimal(60, 30));
+SELECT round(1.1::Decimal(60, 30), 1);
+SELECT round(1.234567890123456789012345678901::Decimal(60, 30), 1);
+SELECT round(1.234567890123456789012345678901::Decimal(60, 30), 30);
+SELECT round(1.234567890123456789012345678901::Decimal(60, 30), 31);
+SELECT round(1.234567890123456789012345678901::Decimal(60, 30), 20);
+
+SELECT hex(1.234567890123456789012345678901::Decimal(60, 30));
+SELECT bin(1.234567890123456789012345678901::Decimal(60, 30));
+SELECT reinterpret(unhex(hex(1.234567890123456789012345678901::Decimal(60, 30))), 'Decimal(60, 30)');
+
+SELECT arraySum([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+SELECT arraySum([1.2::Decimal(60, 30), 3.45::Decimal(3, 2)]);
+
+SELECT arrayMin([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+SELECT arrayMax([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+SELECT arrayAvg([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+
+SELECT round(arrayProduct([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]), 6);
+SELECT toTypeName(arrayProduct([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]));
+
+SELECT arrayCumSum([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+SELECT arrayCumSumNonNegative([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+SELECT arrayDifference([1.2::Decimal(60, 30), 3.45::Decimal(61, 29)]);
+
+SELECT arrayCompact([1.2::Decimal(60, 30) AS x, x, x, x, 3.45::Decimal(3, 2) AS y, y, x, x]);
+
+SELECT 1.2::Decimal(2, 1) IN (1.2::Decimal(60, 30), 3.4::Decimal(60, 30));
+SELECT 1.23::Decimal(3, 2) IN (1.2::Decimal(60, 30), 3.4::Decimal(60, 30));
+SELECT 1.2::Decimal(60, 30) IN (1.2::Decimal(2, 1));
+
+SELECT toTypeName([1.2::Decimal(60, 30), 3.45::Decimal(3, 2)]);
+SELECT toTypeName(arraySum([1.2::Decimal(60, 30), 3.45::Decimal(3, 2)]));
+
+SELECT arrayJoin(sumMap(x)) FROM (SELECT [('Hello', 1.2::Decimal256(30)), ('World', 3.4::Decimal256(30))]::Map(String, Decimal256(30)) AS x UNION ALL SELECT [('World', 5.6::Decimal256(30)), ('GoodBye', -111.222::Decimal256(30))]::Map(String, Decimal256(30))) ORDER BY 1;
+
+SELECT mapAdd(map('Hello', 1.2::Decimal128(30), 'World', 3.4::Decimal128(30)), map('World', 5.6::Decimal128(30), 'GoodBye', -111.222::Decimal128(30)));
+SELECT mapSubtract(map('Hello', 1.2::Decimal128(30), 'World', 3.4::Decimal128(30)), map('World', 5.6::Decimal128(30), 'GoodBye', -111.222::Decimal128(30)));
+
+SELECT arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(UInt256)));
+SELECT toTypeName(arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(UInt128))));
+SELECT toTypeName(arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(Int128))));
+SELECT arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(Int128)));
+SELECT arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(Int8)));
+SELECT toTypeName(arraySort(arrayIntersect([1, 2, 3]::Array(UInt256), [2, 3, 4]::Array(Int8))));
+
+SELECT arraySort(arrayIntersect([1.1::Decimal256(70), 2.34::Decimal256(60), 3.456::Decimal256(50)], [2.34::Decimal256(65), 3.456::Decimal256(55), 4.5678::Decimal256(45)]));
+SELECT arraySort(arrayIntersect([1.1::Decimal256(1)], [1.12::Decimal256(2)])); -- Note: this is correct but the semantics has to be clarified in the docs.
+SELECT arraySort(arrayIntersect([1.1::Decimal256(2)], [1.12::Decimal256(2)]));
+SELECT arraySort(arrayIntersect([1.1::Decimal128(1)], [1.12::Decimal128(2)])); -- Note: this is correct but the semantics has to be clarified in the docs.
+SELECT arraySort(arrayIntersect([1.1::Decimal128(2)], [1.12::Decimal128(2)]));
+
+select coalesce(cast('123', 'Nullable(Decimal(20, 10))'), 0);
+select coalesce(cast('123', 'Nullable(Decimal(40, 10))'), 0);
+select coalesce(cast('123', 'Decimal(40, 10)'), 0);
+
+DROP TABLE IF EXISTS decimal_insert_cast_issue;
+create table decimal_insert_cast_issue (a Decimal(76, 0)) engine = TinyLog;
+SET param_param = 1;
+INSERT INTO decimal_insert_cast_issue VALUES ({param:Nullable(Decimal(41, 0))});
+SELECT * FROM decimal_insert_cast_issue;
+DROP TABLE decimal_insert_cast_issue;
diff --git a/tests/queries/0_stateless/02686_bson3.reference b/tests/queries/0_stateless/02686_bson3.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02686_bson3.sql b/tests/queries/0_stateless/02686_bson3.sql
new file mode 100644
index 00000000000..05a73e814dd
Binary files /dev/null and b/tests/queries/0_stateless/02686_bson3.sql differ
diff --git a/tests/queries/0_stateless/02686_postgres_protocol_decimal_256.reference b/tests/queries/0_stateless/02686_postgres_protocol_decimal_256.reference
new file mode 100644
index 00000000000..5e61b14b9a1
--- /dev/null
+++ b/tests/queries/0_stateless/02686_postgres_protocol_decimal_256.reference
@@ -0,0 +1,5 @@
+ test 
+------
+ 1.23
+(1 row)
+
diff --git a/tests/queries/0_stateless/02686_postgres_protocol_decimal_256.sh b/tests/queries/0_stateless/02686_postgres_protocol_decimal_256.sh
new file mode 100755
index 00000000000..2a94f940327
--- /dev/null
+++ b/tests/queries/0_stateless/02686_postgres_protocol_decimal_256.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-fasttest: needs psql
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+echo "
+DROP USER IF EXISTS postgresql_user;
+CREATE USER postgresql_user HOST IP '127.0.0.1' IDENTIFIED WITH no_password;
+" | $CLICKHOUSE_CLIENT -n
+
+psql --host localhost --port ${CLICKHOUSE_PORT_POSTGRESQL} ${CLICKHOUSE_DATABASE} --user postgresql_user -c "SELECT 1.23::Decimal256(70) AS test;"
diff --git a/tests/queries/0_stateless/02687_native_fuzz.reference b/tests/queries/0_stateless/02687_native_fuzz.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02687_native_fuzz.sql b/tests/queries/0_stateless/02687_native_fuzz.sql
new file mode 100644
index 00000000000..0cd11390918
Binary files /dev/null and b/tests/queries/0_stateless/02687_native_fuzz.sql differ
diff --git a/tests/queries/0_stateless/02688_aggregate_states.reference b/tests/queries/0_stateless/02688_aggregate_states.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02688_aggregate_states.sql b/tests/queries/0_stateless/02688_aggregate_states.sql
new file mode 100644
index 00000000000..575f4b1bb3a
--- /dev/null
+++ b/tests/queries/0_stateless/02688_aggregate_states.sql
@@ -0,0 +1,7 @@
+SELECT '\x01\x00'::AggregateFunction(groupBitmap, UInt32); -- { serverError INCORRECT_DATA }
+SELECT '\x01\x01\x01'::AggregateFunction(groupBitmap, UInt64); -- { serverError STD_EXCEPTION }
+SELECT '\x02\x00\x0d'::AggregateFunction(topK, UInt256); -- { serverError CANNOT_READ_ALL_DATA }
+SELECT unhex('bebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebe0c0c3131313131313131313131313173290aee00b300')::AggregateFunction(minDistinct, Int8); -- { serverError TOO_LARGE_ARRAY_SIZE }
+SELECT unhex('01000b0b0b0d0d0d0d7175616e74696c6554696d696e672c20496e743332000300')::AggregateFunction(quantileTiming, Int32); -- { serverError INCORRECT_DATA }
+SELECT unhex('010001')::AggregateFunction(quantileTiming, Int32); -- { serverError INCORRECT_DATA }
+SELECT unhex('0a00797979797979797979790a0a6e')::AggregateFunction(minForEach, Ring); -- { serverError TOO_LARGE_ARRAY_SIZE }
diff --git a/tests/queries/0_stateless/02688_long_aggregate_function_names.reference b/tests/queries/0_stateless/02688_long_aggregate_function_names.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02688_long_aggregate_function_names.sql b/tests/queries/0_stateless/02688_long_aggregate_function_names.sql
new file mode 100644
index 00000000000..266bbd62957
--- /dev/null
+++ b/tests/queries/0_stateless/02688_long_aggregate_function_names.sql
@@ -0,0 +1 @@
+SELECT minOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNullOrNull(1); -- { serverError TOO_LARGE_STRING_SIZE }
diff --git a/tests/queries/0_stateless/02689_meaningless_data_types.reference b/tests/queries/0_stateless/02689_meaningless_data_types.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02689_meaningless_data_types.sql b/tests/queries/0_stateless/02689_meaningless_data_types.sql
new file mode 100644
index 00000000000..8ae702d66df
--- /dev/null
+++ b/tests/queries/0_stateless/02689_meaningless_data_types.sql
@@ -0,0 +1,3 @@
+SELECT 0::Bool(Upyachka); -- { serverError DATA_TYPE_CANNOT_HAVE_ARGUMENTS }
+SELECT [(1, 2), (3, 4)]::Ring(Upyachka); -- { serverError DATA_TYPE_CANNOT_HAVE_ARGUMENTS }
+SELECT '1.1.1.1'::IPv4('Hello, world!'); -- { serverError DATA_TYPE_CANNOT_HAVE_ARGUMENTS }
diff --git a/tests/queries/0_stateless/02690_subquery_identifiers.reference b/tests/queries/0_stateless/02690_subquery_identifiers.reference
new file mode 100644
index 00000000000..6ed281c757a
--- /dev/null
+++ b/tests/queries/0_stateless/02690_subquery_identifiers.reference
@@ -0,0 +1,2 @@
+1
+1
diff --git a/tests/queries/0_stateless/02690_subquery_identifiers.sql b/tests/queries/0_stateless/02690_subquery_identifiers.sql
new file mode 100644
index 00000000000..07fcb0ffff9
--- /dev/null
+++ b/tests/queries/0_stateless/02690_subquery_identifiers.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS t_str;
+
+CREATE TABLE t_str
+(
+    `creation_time` String
+)
+ENGINE = MergeTree
+PARTITION BY creation_time
+ORDER BY creation_time;
+
+insert into t_str values ('2020-02-02');
+
+select 1 as x from t_str where cast('1970-01-01' as date) <= cast((select max('1970-01-01') from numbers(1)) as date);
+select * from ( select 1 as x from t_str where cast('1970-01-01' as date) <= cast((select max('1970-01-01') from numbers(1)) as date));
+SELECT * FROM (SELECT * FROM t_str WHERE (SELECT any('1970-01-01'))::Date > today());
+
+DROP TABLE t_str;
diff --git a/tests/queries/0_stateless/02691_drop_column_with_projections_replicated.reference b/tests/queries/0_stateless/02691_drop_column_with_projections_replicated.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02691_drop_column_with_projections_replicated.sql b/tests/queries/0_stateless/02691_drop_column_with_projections_replicated.sql
new file mode 100644
index 00000000000..c28c2f233dd
--- /dev/null
+++ b/tests/queries/0_stateless/02691_drop_column_with_projections_replicated.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS 02691_drop_column_replicated;
+
+CREATE TABLE 02691_drop_column_replicated (col1 Int64, col2 Int64, PROJECTION 02691_drop_column_replicated (SELECT * ORDER BY col1 ))
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/02691_drop_column', 'r1')
+ORDER BY col1;
+
+INSERT INTO 02691_drop_column_replicated VALUES (1, 2);
+
+ALTER TABLE 02691_drop_column_replicated DROP COLUMN col2 SETTINGS alter_sync = 2;
+
+DROP TABLE 02691_drop_column_replicated;
diff --git a/tests/queries/0_stateless/02691_multiple_joins_backtick_identifiers.reference b/tests/queries/0_stateless/02691_multiple_joins_backtick_identifiers.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02691_multiple_joins_backtick_identifiers.sql b/tests/queries/0_stateless/02691_multiple_joins_backtick_identifiers.sql
new file mode 100644
index 00000000000..4a56c12866e
--- /dev/null
+++ b/tests/queries/0_stateless/02691_multiple_joins_backtick_identifiers.sql
@@ -0,0 +1,49 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+
+CREATE TABLE t1 (`1a` Nullable(Int64), `2b` Nullable(String)) engine = Memory;
+CREATE TABLE t2 (`3c` Nullable(Int64), `4d` Nullable(String)) engine = Memory;
+CREATE TABLE t3 (`5e` Nullable(Int64), `6f` Nullable(String)) engine = Memory;
+
+SELECT
+    `1a`,
+    `2b`
+FROM t1 AS tt1
+INNER JOIN
+(
+    SELECT `3c`
+    FROM t2
+) AS tt2 ON tt1.`1a` = tt2.`3c`
+INNER JOIN
+(
+    SELECT `6f`
+    FROM t3
+) AS tt3 ON tt1.`2b` = tt3.`6f`;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+
+CREATE TABLE t1 (`a` Nullable(Int64), `b` Nullable(String)) engine = Memory;
+CREATE TABLE t2 (`c` Nullable(Int64), `d` Nullable(String)) engine = Memory;
+CREATE TABLE t3 (`e` Nullable(Int64), `f` Nullable(String)) engine = Memory;
+
+SELECT
+    a,
+    b
+FROM t1 AS tt1
+INNER JOIN
+(
+    SELECT c
+    FROM t2
+) AS tt2 ON tt1.a = tt2.c
+INNER JOIN
+(
+    SELECT f
+    FROM t3
+) AS tt3 ON tt1.b = tt3.f;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
diff --git a/tests/queries/0_stateless/02692_multiple_joins_unicode.reference b/tests/queries/0_stateless/02692_multiple_joins_unicode.reference
new file mode 100644
index 00000000000..3aca4fe5c7b
--- /dev/null
+++ b/tests/queries/0_stateless/02692_multiple_joins_unicode.reference
@@ -0,0 +1,2 @@
+2021-01-01	上海市	启用
+2021-01-02	北京市	停用
diff --git a/tests/queries/0_stateless/02692_multiple_joins_unicode.sql b/tests/queries/0_stateless/02692_multiple_joins_unicode.sql
new file mode 100644
index 00000000000..d622c556e56
--- /dev/null
+++ b/tests/queries/0_stateless/02692_multiple_joins_unicode.sql
@@ -0,0 +1,24 @@
+DROP TABLE IF EXISTS store;
+DROP TABLE IF EXISTS location;
+DROP TABLE IF EXISTS sales;
+
+CREATE TABLE store (id UInt32, "名称" String, "状态" String) ENGINE=MergeTree() Order by id;
+CREATE TABLE location (id UInt32, name String) ENGINE=MergeTree() Order by id;
+CREATE TABLE sales ("日期" Date, "店铺" UInt32, "地址" UInt32, "销售额" Float32) ENGINE=MergeTree() Order by "日期";
+
+INSERT INTO store VALUES (1,'店铺1','启用'),(2,'店铺2','停用');
+INSERT INTO location VALUES (1,'上海市'),(2,'北京市');
+INSERT INTO sales VALUES ('2021-01-01',1,1,10),('2021-01-02',2,2,20);
+
+SELECT
+    `日期`,
+    location.name,
+    store.`状态`
+FROM sales
+LEFT JOIN store ON store.id = `店铺`
+LEFT JOIN location ON location.id = `地址`
+ORDER BY 1, 2, 3;
+
+DROP TABLE store;
+DROP TABLE location;
+DROP TABLE sales;
diff --git a/tests/queries/0_stateless/02693_multiple_joins_in.reference b/tests/queries/0_stateless/02693_multiple_joins_in.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02693_multiple_joins_in.sql b/tests/queries/0_stateless/02693_multiple_joins_in.sql
new file mode 100644
index 00000000000..8be52948d26
--- /dev/null
+++ b/tests/queries/0_stateless/02693_multiple_joins_in.sql
@@ -0,0 +1,3 @@
+create temporary table temp_table3(val0 UInt64) ENGINE=Memory();
+select * from (select 1 as id) t1 inner join (select 1 as id) t2 on t1.id=t2.id inner join (select 1 as id) t3 on t1.id=t3.id where t1.id in temp_table3;
+select * from (select 1 as id) t1 inner join (select 1 as id) t2 on t1.id=t2.id where t1.id in temp_table3;
diff --git a/tests/queries/0_stateless/02694_wrong_identifier_shouldnt_be_accepted.reference b/tests/queries/0_stateless/02694_wrong_identifier_shouldnt_be_accepted.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02694_wrong_identifier_shouldnt_be_accepted.sql b/tests/queries/0_stateless/02694_wrong_identifier_shouldnt_be_accepted.sql
new file mode 100644
index 00000000000..e929b1e620a
--- /dev/null
+++ b/tests/queries/0_stateless/02694_wrong_identifier_shouldnt_be_accepted.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS s;
+
+CREATE TABLE t1 ( k Int64, x Int64) ENGINE = Memory;
+CREATE TABLE t2 ( x Int64 ) ENGINE = Memory;
+
+create table s (k Int64, d DateTime)  Engine=Memory;
+
+SELECT * FROM t1
+INNER JOIN s ON t1.k = s.k
+INNER JOIN t2 ON t2.x = t1.x
+WHERE (t1.d >= now()); -- { serverError UNKNOWN_IDENTIFIER }
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE s;
diff --git a/tests/queries/0_stateless/02695_logical_optimizer_alias_bug.reference b/tests/queries/0_stateless/02695_logical_optimizer_alias_bug.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/02695_logical_optimizer_alias_bug.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/02695_logical_optimizer_alias_bug.sql b/tests/queries/0_stateless/02695_logical_optimizer_alias_bug.sql
new file mode 100644
index 00000000000..5b13eea5e4b
--- /dev/null
+++ b/tests/queries/0_stateless/02695_logical_optimizer_alias_bug.sql
@@ -0,0 +1,2 @@
+create table test_local (id UInt32, path LowCardinality(String)) engine = MergeTree order by id;
+WITH ((position(path, '/a') > 0) AND (NOT (position(path, 'a') > 0))) OR (path = '/b') OR (path = '/b/') as alias1 SELECT max(alias1) FROM remote('127.0.0.{1,2}', currentDatabase(), test_local) WHERE (id = 299386662);
diff --git a/tests/queries/0_stateless/02695_storage_join_insert_select_deadlock.reference b/tests/queries/0_stateless/02695_storage_join_insert_select_deadlock.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02695_storage_join_insert_select_deadlock.sql b/tests/queries/0_stateless/02695_storage_join_insert_select_deadlock.sql
new file mode 100644
index 00000000000..59528511357
--- /dev/null
+++ b/tests/queries/0_stateless/02695_storage_join_insert_select_deadlock.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS test_table_join;
+
+CREATE TABLE test_table_join
+(
+    id UInt64,
+    value String
+) ENGINE = Join(Any, Left, id);
+
+INSERT INTO test_table_join VALUES (1, 'q');
+
+INSERT INTO test_table_join SELECT * from test_table_join; -- { serverError DEADLOCK_AVOIDED }
+
+INSERT INTO test_table_join SELECT * FROM (SELECT 1 as id) AS t1 ANY LEFT JOIN test_table_join USING (id); -- { serverError DEADLOCK_AVOIDED }
+INSERT INTO test_table_join SELECT id, toString(id) FROM (SELECT 1 as id) AS t1 ANY LEFT JOIN (SELECT id FROM test_table_join) AS t2 USING (id); -- { serverError DEADLOCK_AVOIDED }
+
+DROP TABLE IF EXISTS test_table_join;
diff --git a/tests/queries/0_stateless/02696_ignore_inacc_tables_mat_view_atttach.reference b/tests/queries/0_stateless/02696_ignore_inacc_tables_mat_view_atttach.reference
new file mode 100644
index 00000000000..bb3ee860aec
--- /dev/null
+++ b/tests/queries/0_stateless/02696_ignore_inacc_tables_mat_view_atttach.reference
@@ -0,0 +1,2 @@
+3	some_val
+3	9
diff --git a/tests/queries/0_stateless/02696_ignore_inacc_tables_mat_view_atttach.sql b/tests/queries/0_stateless/02696_ignore_inacc_tables_mat_view_atttach.sql
new file mode 100644
index 00000000000..25e0ddf2ef6
--- /dev/null
+++ b/tests/queries/0_stateless/02696_ignore_inacc_tables_mat_view_atttach.sql
@@ -0,0 +1,23 @@
+SET send_logs_level = 'fatal';
+
+CREATE TABLE test_table (n Int32, s String) ENGINE MergeTree PARTITION BY n ORDER BY n;
+
+CREATE TABLE mview_backend (n Int32, n2 Int64) ENGINE MergeTree PARTITION BY n ORDER BY n;
+
+CREATE MATERIALIZED VIEW mview TO mview_backend AS SELECT n, n * n AS "n2" FROM test_table;
+
+DROP TABLE test_table;
+
+DETACH TABLE mview;
+
+/* Check that we don't get an exception with the option. */
+ATTACH TABLE mview;
+
+/* Check if the data in the materialized view is updated after the restore.*/
+CREATE TABLE test_table (n Int32, s String) ENGINE MergeTree PARTITION BY n ORDER BY n;
+
+INSERT INTO test_table VALUES (3,'some_val');
+
+SELECT n,s  FROM test_table ORDER BY n;
+SELECT n,n2 FROM mview ORDER by n;
+
diff --git a/tests/queries/0_stateless/02696_inverted_idx_checksums.reference b/tests/queries/0_stateless/02696_inverted_idx_checksums.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02696_inverted_idx_checksums.sql b/tests/queries/0_stateless/02696_inverted_idx_checksums.sql
new file mode 100644
index 00000000000..92ffa7a6196
--- /dev/null
+++ b/tests/queries/0_stateless/02696_inverted_idx_checksums.sql
@@ -0,0 +1,16 @@
+SET allow_experimental_inverted_index = 1;
+
+CREATE TABLE t
+(
+    `key` UInt64,
+    `str` String,
+    INDEX inv_idx str TYPE inverted(0) GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY key;
+
+INSERT INTO t VALUES (1, 'Hello World');
+
+ALTER TABLE t DETACH PART 'all_1_1_0';
+
+ALTER TABLE t ATTACH PART 'all_1_1_0';
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02697_alter_dependencies.reference b/tests/queries/0_stateless/02697_alter_dependencies.reference
new file mode 100644
index 00000000000..d05b1f927f4
--- /dev/null
+++ b/tests/queries/0_stateless/02697_alter_dependencies.reference
@@ -0,0 +1 @@
+0	0
diff --git a/tests/queries/0_stateless/02697_alter_dependencies.sql b/tests/queries/0_stateless/02697_alter_dependencies.sql
new file mode 100644
index 00000000000..cf9b7551b5f
--- /dev/null
+++ b/tests/queries/0_stateless/02697_alter_dependencies.sql
@@ -0,0 +1,16 @@
+CREATE TABLE mv_source (a Int64, insert_time DateTime) ENGINE = MergeTree() ORDER BY insert_time;
+CREATE TABLE mv_target (a Int64, insert_time DateTime) ENGINE = MergeTree() ORDER BY insert_time;
+CREATE MATERIALIZED VIEW source_to_target to mv_target as Select * from mv_source where a not in (Select sleepEachRow(0.1) from numbers(50));
+
+ALTER TABLE mv_source MODIFY TTL insert_time + toIntervalDay(1);
+SYSTEM FLUSH LOGS;
+-- This is a fancy way to check that the MV hasn't been called (no functions executed by ALTER)
+SELECT
+    ProfileEvents['FunctionExecute'],
+    ProfileEvents['TableFunctionExecute']
+FROM system.query_log
+WHERE
+        type = 'QueryFinish' AND
+        query like '%ALTER TABLE mv_source%' AND
+        current_database = currentDatabase() AND
+        event_time > now() - INTERVAL 10 minute;
diff --git a/tests/queries/0_stateless/02697_stop_reading_on_first_cancel.reference b/tests/queries/0_stateless/02697_stop_reading_on_first_cancel.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/02697_stop_reading_on_first_cancel.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/02697_stop_reading_on_first_cancel.sh b/tests/queries/0_stateless/02697_stop_reading_on_first_cancel.sh
new file mode 100755
index 00000000000..09837bff808
--- /dev/null
+++ b/tests/queries/0_stateless/02697_stop_reading_on_first_cancel.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -n --query="SELECT sum(number * 0) FROM numbers(10000000000) SETTINGS partial_result_on_first_cancel=true;" &
+pid=$!
+sleep 2
+kill -SIGINT $pid
+wait $pid
diff --git a/tests/queries/0_stateless/02698_marked_dropped_tables.reference b/tests/queries/0_stateless/02698_marked_dropped_tables.reference
new file mode 100644
index 00000000000..44906da9527
--- /dev/null
+++ b/tests/queries/0_stateless/02698_marked_dropped_tables.reference
@@ -0,0 +1,8 @@
+25400_dropped_tables	MergeTree
+index	UInt32					
+database	String					
+table	String					
+uuid	UUID					
+engine	String					
+metadata_dropped_path	String					
+table_dropped_time	DateTime					
diff --git a/tests/queries/0_stateless/02698_marked_dropped_tables.sql b/tests/queries/0_stateless/02698_marked_dropped_tables.sql
new file mode 100644
index 00000000000..9bf6579b583
--- /dev/null
+++ b/tests/queries/0_stateless/02698_marked_dropped_tables.sql
@@ -0,0 +1,11 @@
+-- Tags: no-ordinary-database
+
+SET database_atomic_wait_for_drop_and_detach_synchronously = 0;
+DROP TABLE IF EXISTS 25400_dropped_tables;
+
+CREATE TABLE 25400_dropped_tables (id Int32) Engine=MergeTree() ORDER BY id;
+DROP TABLE 25400_dropped_tables;
+
+SELECT table, engine FROM system.dropped_tables WHERE database = currentDatabase() LIMIT 1;
+DESCRIBE TABLE system.dropped_tables;
+ 
diff --git a/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.reference b/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.reference
new file mode 100644
index 00000000000..35c94347ac9
--- /dev/null
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.reference
@@ -0,0 +1,11 @@
+[]
+[]
+[[(2147483647,0),(10.0001,65535),(1,255),(1023,2147483646)]]	[[[(2147483647,0),(10.0001,65535),(1023,2147483646),(2147483647,0)]]]
+[[(2147483647,0),(10.0001,65535),(1,255),(1023,2147483646)]]	[]
+[[(2147483647,0),(10.0001,65535),(1,255),(1023,2147483646)]]	[[[(2147483647,0),(10.0001,65535),(1023,2147483646),(2147483647,0)]]]
+[[(2147483647,0),(10.0001,65535),(1,255),(1023,2147483646)]]	[[[(2147483647,0),(10.0001,65535),(1023,2147483646),(2147483647,0)]]]
+[[[(100.0001,1000.0001),(1000.0001,1.1920928955078125e-7),(20,-20),(20,20),(10,10),(-20,20),(100.0001,1000.0001)]]]
+[[[(100.0001,1000.0001),(1000.0001,1.1920928955078125e-7),(20,-20),(20,20),(10,10),(-20,20),(100.0001,1000.0001)]]]
+[(9223372036854775807,1.1754943508222875e-38)]	[[(1,1.0001)]]	\N	[]
+
+[(9223372036854775807,1.1754943508222875e-38)]	[]	\N	[]
diff --git a/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.sql b/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.sql
new file mode 100644
index 00000000000..85307bec6e5
--- /dev/null
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.sql
@@ -0,0 +1,5 @@
+SELECT polygonsSymDifferenceCartesian([[[(1., 1.)]] AS x], [x]) GROUP BY x WITH ROLLUP;
+SELECT [[(2147483647, 0.), (10.0001, 65535), (1, 255), (1023, 2147483646)]], polygonsSymDifferenceCartesian([[[(2147483647, 0.), (10.0001, 65535), (1023, 2147483646)]]], [[[(1000.0001, 10.0001)]]]) GROUP BY [[(2147483647, 0.), (10.0001, 65535), (1023, 2147483646)]] WITH ROLLUP SETTINGS allow_experimental_analyzer=0;
+SELECT [[(2147483647, 0.), (10.0001, 65535), (1, 255), (1023, 2147483646)]], polygonsSymDifferenceCartesian([[[(2147483647, 0.), (10.0001, 65535), (1023, 2147483646)]]], [[[(1000.0001, 10.0001)]]]) GROUP BY [[(2147483647, 0.), (10.0001, 65535), (1023, 2147483646)]] WITH ROLLUP SETTINGS allow_experimental_analyzer=1;
+SELECT polygonsSymDifferenceCartesian([[[(100.0001, 1000.0001), (-20., 20.), (10., 10.), (20., 20.), (20., -20.), (1000.0001, 1.1920928955078125e-7)]],[[(0.0001, 100000000000000000000.)]] AS x],[x]) GROUP BY x WITH ROLLUP;
+SELECT [(9223372036854775807, 1.1754943508222875e-38)], x, NULL, polygonsSymDifferenceCartesian([[[(1.1754943508222875e-38, 1.1920928955078125e-7), (0.5, 0.5)]], [[(1.1754943508222875e-38, 1.1920928955078125e-7), (1.1754943508222875e-38, 1.1920928955078125e-7)], [(0., 1.0001)]], [[(1., 1.0001)]] AS x], [[[(3.4028234663852886e38, 0.9999)]]]) GROUP BY GROUPING SETS ((x)) WITH TOTALS
diff --git a/tests/queries/0_stateless/02700_regexp_operator.reference b/tests/queries/0_stateless/02700_regexp_operator.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02700_regexp_operator.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02700_regexp_operator.sql b/tests/queries/0_stateless/02700_regexp_operator.sql
new file mode 100644
index 00000000000..5a5275bf1ea
--- /dev/null
+++ b/tests/queries/0_stateless/02700_regexp_operator.sql
@@ -0,0 +1 @@
+SELECT 'ab' REGEXP 'a.*b';
diff --git a/tests/queries/0_stateless/02700_s3_part_INT_MAX.reference b/tests/queries/0_stateless/02700_s3_part_INT_MAX.reference
new file mode 100644
index 00000000000..8425fb4df60
--- /dev/null
+++ b/tests/queries/0_stateless/02700_s3_part_INT_MAX.reference
@@ -0,0 +1 @@
+2097152
diff --git a/tests/queries/0_stateless/02700_s3_part_INT_MAX.sh b/tests/queries/0_stateless/02700_s3_part_INT_MAX.sh
new file mode 100755
index 00000000000..d831c7d9806
--- /dev/null
+++ b/tests/queries/0_stateless/02700_s3_part_INT_MAX.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Tags: no-parallel, long
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# Regression test for crash in case of part exceeds INT_MAX
+#
+# NOTE: .sh test is used over .sql because it needs $CLICKHOUSE_DATABASE to
+# avoid truncation, since seems that the version of MinIO that is used on CI
+# too slow with this.
+$CLICKHOUSE_CLIENT -nm -q "
+    INSERT INTO FUNCTION s3('http://localhost:11111/test/$CLICKHOUSE_DATABASE/test_INT_MAX.tsv', '', '', 'TSV')
+    SELECT repeat('a', 1024) FROM numbers((pow(2, 30) * 2) / 1024)
+    SETTINGS s3_max_single_part_upload_size = '10Gi';
+
+    SELECT count() FROM s3('http://localhost:11111/test/$CLICKHOUSE_DATABASE/test_INT_MAX.tsv');
+"
diff --git a/tests/queries/0_stateless/02701_fail_on_invalid_having.reference b/tests/queries/0_stateless/02701_fail_on_invalid_having.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02701_fail_on_invalid_having.sql b/tests/queries/0_stateless/02701_fail_on_invalid_having.sql
new file mode 100644
index 00000000000..092bda23164
--- /dev/null
+++ b/tests/queries/0_stateless/02701_fail_on_invalid_having.sql
@@ -0,0 +1 @@
+SELECT a, sum(b) FROM (SELECT 1 AS a, 1 AS b, 0 AS c) GROUP BY a HAVING c SETTINGS allow_experimental_analyzer=1 -- { serverError NOT_AN_AGGREGATE }
diff --git a/tests/queries/0_stateless/02701_non_parametric_function.reference b/tests/queries/0_stateless/02701_non_parametric_function.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02701_non_parametric_function.sql b/tests/queries/0_stateless/02701_non_parametric_function.sql
new file mode 100644
index 00000000000..5261fa7b082
--- /dev/null
+++ b/tests/queries/0_stateless/02701_non_parametric_function.sql
@@ -0,0 +1,9 @@
+-- Tags: no-parallel
+
+SELECT * FROM system.numbers WHERE number > toUInt64(10)(number) LIMIT 10; -- { serverError 309 }
+
+CREATE FUNCTION IF NOT EXISTS sum_udf as (x, y) -> (x + y);
+
+SELECT sum_udf(1)(1, 2); -- { serverError 309 }
+
+DROP FUNCTION IF EXISTS sum_udf;
diff --git a/tests/queries/0_stateless/02702_allow_skip_errors_enum.reference b/tests/queries/0_stateless/02702_allow_skip_errors_enum.reference
new file mode 100644
index 00000000000..f9264f7fbd3
--- /dev/null
+++ b/tests/queries/0_stateless/02702_allow_skip_errors_enum.reference
@@ -0,0 +1,2 @@
+Hello
+World
diff --git a/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh b/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh
new file mode 100755
index 00000000000..e68f5517d52
--- /dev/null
+++ b/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x Enum('Hello' = 1, 'World' = 2)) ENGINE = Memory;"
+$CLICKHOUSE_CLIENT --input_format_allow_errors_num 1 --query "INSERT INTO t FORMAT CSV" <<END
+Hello
+Goodbye
+World
+END
+
+$CLICKHOUSE_CLIENT --query "SELECT x FROM t ORDER BY x"
+$CLICKHOUSE_CLIENT --query "DROP TABLE t"
diff --git a/tests/queries/0_stateless/02702_logical_optimizer_with_nulls.reference b/tests/queries/0_stateless/02702_logical_optimizer_with_nulls.reference
new file mode 100644
index 00000000000..eb79bbc842a
--- /dev/null
+++ b/tests/queries/0_stateless/02702_logical_optimizer_with_nulls.reference
@@ -0,0 +1,77 @@
+1	test
+3	another
+QUERY id: 0
+  PROJECTION COLUMNS
+    a Int32
+    b LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: Int32, source_id: 3
+      COLUMN id: 4, column_name: b, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.02702_logical_optimizer
+  WHERE
+    FUNCTION id: 5, function_name: or, function_type: ordinary, result_type: Nullable(UInt8)
+      ARGUMENTS
+        LIST id: 6, nodes: 3
+          FUNCTION id: 7, function_name: equals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 8, nodes: 2
+                COLUMN id: 9, column_name: a, result_type: Int32, source_id: 3
+                CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+          FUNCTION id: 11, function_name: equals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 12, nodes: 2
+                CONSTANT id: 13, constant_value: UInt64_3, constant_value_type: UInt8
+                COLUMN id: 9, column_name: a, result_type: Int32, source_id: 3
+          FUNCTION id: 14, function_name: equals, function_type: ordinary, result_type: Nullable(Nothing)
+            ARGUMENTS
+              LIST id: 15, nodes: 2
+                CONSTANT id: 16, constant_value: NULL, constant_value_type: Nullable(Nothing)
+                COLUMN id: 9, column_name: a, result_type: Int32, source_id: 3
+1	test
+2	test2
+3	another
+QUERY id: 0
+  PROJECTION COLUMNS
+    a Int32
+    b LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: Int32, source_id: 3
+      COLUMN id: 4, column_name: b, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.02702_logical_optimizer
+  WHERE
+    FUNCTION id: 5, function_name: or, function_type: ordinary, result_type: Nullable(UInt8)
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          FUNCTION id: 7, function_name: equals, function_type: ordinary, result_type: Nullable(Nothing)
+            ARGUMENTS
+              LIST id: 8, nodes: 2
+                COLUMN id: 9, column_name: a, result_type: Int32, source_id: 3
+                CONSTANT id: 10, constant_value: NULL, constant_value_type: Nullable(Nothing)
+          FUNCTION id: 11, function_name: in, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 12, nodes: 2
+                COLUMN id: 9, column_name: a, result_type: Int32, source_id: 3
+                CONSTANT id: 13, constant_value: Tuple_(UInt64_1, UInt64_3, UInt64_2), constant_value_type: Tuple(UInt8, UInt8, UInt8)
+1	test
+2	test2
+3	another
+QUERY id: 0
+  PROJECTION COLUMNS
+    a Nullable(Int32)
+    b LowCardinality(String)
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: a, result_type: Nullable(Int32), source_id: 3
+      COLUMN id: 4, column_name: b, result_type: LowCardinality(String), source_id: 3
+  JOIN TREE
+    TABLE id: 3, table_name: default.02702_logical_optimizer_with_null_column
+  WHERE
+    FUNCTION id: 5, function_name: in, function_type: ordinary, result_type: Nullable(UInt8)
+      ARGUMENTS
+        LIST id: 6, nodes: 2
+          COLUMN id: 7, column_name: a, result_type: Nullable(Int32), source_id: 3
+          CONSTANT id: 8, constant_value: Tuple_(UInt64_1, UInt64_3, UInt64_2), constant_value_type: Tuple(UInt8, UInt8, UInt8)
diff --git a/tests/queries/0_stateless/02702_logical_optimizer_with_nulls.sql b/tests/queries/0_stateless/02702_logical_optimizer_with_nulls.sql
new file mode 100644
index 00000000000..07d0b170a02
--- /dev/null
+++ b/tests/queries/0_stateless/02702_logical_optimizer_with_nulls.sql
@@ -0,0 +1,32 @@
+SET allow_experimental_analyzer = 1;
+
+DROP TABLE IF EXISTS 02702_logical_optimizer;
+
+CREATE TABLE 02702_logical_optimizer
+(a Int32, b LowCardinality(String))
+ENGINE=Memory;
+
+INSERT INTO 02702_logical_optimizer VALUES (1, 'test'), (2, 'test2'), (3, 'another');
+
+SET optimize_min_equality_disjunction_chain_length = 3;
+
+SELECT * FROM 02702_logical_optimizer WHERE a = 1 OR 3 = a OR NULL = a;
+EXPLAIN QUERY TREE SELECT * FROM 02702_logical_optimizer WHERE a = 1 OR 3 = a OR NULL = a;
+
+SELECT * FROM 02702_logical_optimizer WHERE a = 1 OR 3 = a OR 2 = a OR a = NULL;
+EXPLAIN QUERY TREE SELECT * FROM 02702_logical_optimizer WHERE a = 1 OR 3 = a OR 2 = a OR a = NULL;
+
+DROP TABLE 02702_logical_optimizer;
+
+DROP TABLE IF EXISTS 02702_logical_optimizer_with_null_column;
+
+CREATE TABLE 02702_logical_optimizer_with_null_column
+(a Nullable(Int32), b LowCardinality(String))
+ENGINE=Memory;
+
+INSERT INTO 02702_logical_optimizer_with_null_column VALUES (1, 'test'), (2, 'test2'), (3, 'another');
+
+SELECT * FROM 02702_logical_optimizer_with_null_column WHERE a = 1 OR 3 = a OR 2 = a;
+EXPLAIN QUERY TREE SELECT * FROM 02702_logical_optimizer_with_null_column WHERE a = 1 OR 3 = a OR 2 = a;
+
+DROP TABLE 02702_logical_optimizer_with_null_column;
diff --git a/tests/queries/0_stateless/02703_explain_query_tree_is_forbidden_with_old_analyzer.reference b/tests/queries/0_stateless/02703_explain_query_tree_is_forbidden_with_old_analyzer.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02703_explain_query_tree_is_forbidden_with_old_analyzer.sql b/tests/queries/0_stateless/02703_explain_query_tree_is_forbidden_with_old_analyzer.sql
new file mode 100644
index 00000000000..d351bfe402c
--- /dev/null
+++ b/tests/queries/0_stateless/02703_explain_query_tree_is_forbidden_with_old_analyzer.sql
@@ -0,0 +1,2 @@
+set allow_experimental_analyzer=0;
+EXPLAIN QUERY TREE run_passes = true, dump_passes = true SELECT 1; -- { serverError NOT_IMPLEMENTED }
diff --git a/tests/queries/0_stateless/02703_jit_external_aggregation.reference b/tests/queries/0_stateless/02703_jit_external_aggregation.reference
new file mode 100644
index 00000000000..9c558e357c4
--- /dev/null
+++ b/tests/queries/0_stateless/02703_jit_external_aggregation.reference
@@ -0,0 +1 @@
+.
diff --git a/tests/queries/0_stateless/02703_jit_external_aggregation.sh b/tests/queries/0_stateless/02703_jit_external_aggregation.sh
new file mode 100755
index 00000000000..4bc17c106fb
--- /dev/null
+++ b/tests/queries/0_stateless/02703_jit_external_aggregation.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# Tags: long, no-asan, no-msan, no-tsan, no-ubsan, no-debug
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# This query should return empty result
+$CLICKHOUSE_CLIENT --compile_aggregate_expressions 1 --min_count_to_compile_aggregate_expression=0 --query "
+SELECT
+    COUNT() AS c,
+    group_key,
+    anyIf(r, key = 0) AS x0,
+    anyIf(r, key = 1) AS x1,
+    anyIf(r, key = 2) AS x2
+FROM
+(
+    SELECT
+        CRC32(toString(number)) % 1000000 AS group_key,
+        number % 3 AS key,
+        number AS r
+    FROM numbers(10000000)
+)
+GROUP BY group_key
+HAVING (c = 2) AND (x0 > 0) AND (x1 > 0) AND (x2 > 0)
+ORDER BY group_key ASC
+LIMIT 10
+SETTINGS max_bytes_before_external_group_by = 200000
+" && echo -n '.'
+
+echo
diff --git a/tests/queries/0_stateless/02703_keeper_map_concurrent_create_drop.reference b/tests/queries/0_stateless/02703_keeper_map_concurrent_create_drop.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/02703_keeper_map_concurrent_create_drop.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/02703_keeper_map_concurrent_create_drop.sh b/tests/queries/0_stateless/02703_keeper_map_concurrent_create_drop.sh
new file mode 100755
index 00000000000..3964427895c
--- /dev/null
+++ b/tests/queries/0_stateless/02703_keeper_map_concurrent_create_drop.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+# Tags: no-ordinary-database, zookeeper, no-fasttest, no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function create_drop_loop()
+{
+    table_name="02703_keeper_map_concurrent_$1"
+    $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS $table_name"
+    for _ in `seq $1`
+    do
+        sleep 0.3
+    done
+
+    i=0
+    while true;
+    do
+        $CLICKHOUSE_CLIENT --query="CREATE TABLE IF NOT EXISTS $table_name (key UInt64, value UInt64) ENGINE = KeeperMap('/02703_keeper_map/$CLICKHOUSE_DATABASE') PRIMARY KEY(key)"
+        $CLICKHOUSE_CLIENT --query="INSERT INTO $table_name VALUES ($1, $i)"
+        result=$($CLICKHOUSE_CLIENT --query="SELECT value FROM $table_name WHERE key = $1")
+
+        if [ $result != $i ]
+        then
+            echo "Got invalid result $result"
+            exit 1
+        fi
+
+        $CLICKHOUSE_CLIENT --query="DROP TABLE $table_name"
+
+        ((++i))
+    done
+}
+
+export -f create_drop_loop;
+
+THREADS=10
+TIMEOUT=30
+
+for i in `seq $THREADS`
+do
+    timeout $TIMEOUT bash -c "create_drop_loop $i" 2> /dev/null &
+done
+
+wait
+
+for i in `seq $THREADS`
+do
+    $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS 02703_keeper_map_concurrent_$i"
+done
+
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM system.zookeeper WHERE path = '/test_keeper_map/02703_keeper_map/$CLICKHOUSE_DATABASE'"
diff --git a/tests/queries/0_stateless/02703_max_local_read_bandwidth.reference b/tests/queries/0_stateless/02703_max_local_read_bandwidth.reference
new file mode 100644
index 00000000000..e2968e9fef5
--- /dev/null
+++ b/tests/queries/0_stateless/02703_max_local_read_bandwidth.reference
@@ -0,0 +1,3 @@
+read	1	1	1	1
+pread	1	1	1	1
+pread_threadpool	1	1	1	1
diff --git a/tests/queries/0_stateless/02703_max_local_read_bandwidth.sh b/tests/queries/0_stateless/02703_max_local_read_bandwidth.sh
new file mode 100755
index 00000000000..d47e2f363bd
--- /dev/null
+++ b/tests/queries/0_stateless/02703_max_local_read_bandwidth.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Tags: no-s3-storage, no-random-settings, no-random-merge-tree-settings
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -nm -q "
+    drop table if exists data;
+    create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9;
+"
+
+# reading 1e6*8 bytes with 1M bandwith it should take (8-1)/1=7 seconds
+$CLICKHOUSE_CLIENT -q "insert into data select * from numbers(1e6)"
+
+read_methods=(
+    read
+    pread
+    pread_threadpool
+    # NOTE: io_uring doing all IO from one thread, that is not attached to the query
+    # io_uring
+    # NOTE: mmap cannot be throttled
+    # mmap
+)
+for read_method in "${read_methods[@]}"; do
+    query_id=$(random_str 10)
+    $CLICKHOUSE_CLIENT --query_id "$query_id" -q "select * from data format Null settings max_local_read_bandwidth='1M', local_filesystem_read_method='$read_method'"
+    $CLICKHOUSE_CLIENT -nm -q "
+        SYSTEM FLUSH LOGS;
+        SELECT
+            '$read_method',
+            query_duration_ms >= 7e3,
+            ProfileEvents['ReadBufferFromFileDescriptorReadBytes'] > 8e6,
+            ProfileEvents['LocalReadThrottlerBytes'] > 8e6,
+            ProfileEvents['LocalReadThrottlerSleepMicroseconds'] > 7e6*0.9
+        FROM system.query_log
+        WHERE current_database = '$CLICKHOUSE_DATABASE' AND query_id = '$query_id' AND type != 'QueryStart'
+    "
+done
diff --git a/tests/queries/0_stateless/02703_max_local_write_bandwidth.reference b/tests/queries/0_stateless/02703_max_local_write_bandwidth.reference
new file mode 100644
index 00000000000..ad05a699da0
--- /dev/null
+++ b/tests/queries/0_stateless/02703_max_local_write_bandwidth.reference
@@ -0,0 +1 @@
+1	1	1	1
diff --git a/tests/queries/0_stateless/02703_max_local_write_bandwidth.sh b/tests/queries/0_stateless/02703_max_local_write_bandwidth.sh
new file mode 100755
index 00000000000..41165d35d37
--- /dev/null
+++ b/tests/queries/0_stateless/02703_max_local_write_bandwidth.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Tags: no-s3-storage
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -nm -q "
+    drop table if exists data;
+    create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9;
+"
+
+query_id=$(random_str 10)
+# writes 1e6*8 bytes with 1M bandwith it should take (8-1)/1=7 seconds
+$CLICKHOUSE_CLIENT --query_id "$query_id" -q "insert into data select * from numbers(1e6) settings max_local_write_bandwidth='1M'"
+$CLICKHOUSE_CLIENT -nm -q "
+    SYSTEM FLUSH LOGS;
+    SELECT
+        query_duration_ms >= 7e3,
+        ProfileEvents['WriteBufferFromFileDescriptorWriteBytes'] > 8e6,
+        ProfileEvents['LocalWriteThrottlerBytes'] > 8e6,
+        ProfileEvents['LocalWriteThrottlerSleepMicroseconds'] > 7e6*0.9
+    FROM system.query_log
+    WHERE current_database = '$CLICKHOUSE_DATABASE' AND query_id = '$query_id' AND type != 'QueryStart'
+"
diff --git a/tests/queries/0_stateless/02703_row_policies_for_asterisk.reference b/tests/queries/0_stateless/02703_row_policies_for_asterisk.reference
new file mode 100644
index 00000000000..528bd7ef91e
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policies_for_asterisk.reference
@@ -0,0 +1,2 @@
+Policy for table `*` does not affect other tables in the database
+other	100	20
diff --git a/tests/queries/0_stateless/02703_row_policies_for_asterisk.sql b/tests/queries/0_stateless/02703_row_policies_for_asterisk.sql
new file mode 100644
index 00000000000..96b1c01a6d6
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policies_for_asterisk.sql
@@ -0,0 +1,11 @@
+-- Tags: no-parallel
+
+SELECT 'Policy for table `*` does not affect other tables in the database';
+CREATE DATABASE 02703_db_asterisk;
+CREATE ROW POLICY 02703_asterisk ON 02703_db_asterisk.`*` USING x=1 AS permissive TO ALL;
+CREATE TABLE 02703_db_asterisk.`*` (x UInt8, y UInt8) ENGINE = MergeTree ORDER BY x AS SELECT 100, 20;
+CREATE TABLE 02703_db_asterisk.`other` (x UInt8, y UInt8) ENGINE = MergeTree ORDER BY x AS SELECT 100, 20;
+SELECT 'star', * FROM 02703_db_asterisk.`*`;
+SELECT 'other', * FROM 02703_db_asterisk.other;
+DROP ROW POLICY 02703_asterisk ON 02703_db_asterisk.`*`;
+DROP DATABASE 02703_db_asterisk;
diff --git a/tests/queries/0_stateless/02703_row_policies_for_database_combination.reference b/tests/queries/0_stateless/02703_row_policies_for_database_combination.reference
new file mode 100644
index 00000000000..68ed02d1dc0
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policies_for_database_combination.reference
@@ -0,0 +1,42 @@
+None
+1	10
+2	20
+3	30
+4	40
+R1: x == 1
+1	10
+R1, R2: (x == 1) OR (x == 2)
+1	10
+2	20
+R1, R2: (x == 2) FROM ANOTHER
+2	20
+R1, R2, R3: (x == 1) OR (x == 2) OR (x == 3)
+1	10
+2	20
+3	30
+R1, R2, R3, R4: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2)
+1	10
+2	20
+R1, R2, R3, R4, R5: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2) AND (y >= 20)
+2	20
+2	20
+R1, R2, R3, R4, R5: (x == 2) AND (y >= 20) FROM AFTER_RP
+2	20
+R1, R2, R3, R4, R5: (x == 2) AND (y >= 20) FROM ANOTHER
+2	20
+R2, R3, R4, R5: ((x == 2) OR (x == 3)) AND (x <= 2) AND (y >= 20)
+2	20
+R3, R4, R5: (x == 3) AND (x <= 2) AND (y >= 20)
+R4, R5: (x <= 2) AND (y >= 20)
+2	20
+R5: (x >= 2)
+2	20
+3	30
+4	40
+Policy not applicable
+None
+1	10
+2	20
+3	30
+4	40
+No problematic policy, select works
diff --git a/tests/queries/0_stateless/02703_row_policies_for_database_combination.sql b/tests/queries/0_stateless/02703_row_policies_for_database_combination.sql
new file mode 100644
index 00000000000..f9b466f1ade
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policies_for_database_combination.sql
@@ -0,0 +1,88 @@
+-- Tags: no-parallel
+
+DROP DATABASE IF EXISTS 02703_db;
+CREATE DATABASE 02703_db;
+DROP TABLE IF EXISTS 02703_db.02703_rptable;
+DROP TABLE IF EXISTS 02703_db.02703_rptable_another;
+CREATE TABLE 02703_db.02703_rptable (x UInt8, y UInt8) ENGINE = MergeTree ORDER BY x;
+
+INSERT INTO 02703_db.02703_rptable VALUES (1, 10), (2, 20), (3, 30), (4, 40);
+
+CREATE TABLE 02703_db.02703_rptable_another ENGINE = MergeTree ORDER BY x AS SELECT * FROM 02703_db.02703_rptable;
+
+
+DROP ROW POLICY IF EXISTS 02703_filter_1 ON 02703_db.02703_rptable;
+DROP ROW POLICY IF EXISTS 02703_filter_2 ON 02703_db.*;
+DROP ROW POLICY IF EXISTS 02703_filter_3 ON 02703_db.02703_rptable;
+DROP ROW POLICY IF EXISTS 02703_filter_4 ON 02703_db.02703_rptable;
+DROP ROW POLICY IF EXISTS 02703_filter_5 ON 02703_db.*;
+
+-- the test assumes users_without_row_policies_can_read_rows is true
+
+SELECT 'None';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE ROW POLICY 02703_filter_1 ON 02703_db.02703_rptable USING x=1 AS permissive TO ALL;
+SELECT 'R1: x == 1';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE ROW POLICY 02703_filter_2 ON 02703_db.* USING x=2 AS permissive TO ALL;
+SELECT 'R1, R2: (x == 1) OR (x == 2)';
+SELECT * FROM 02703_db.02703_rptable;
+
+SELECT 'R1, R2: (x == 2) FROM ANOTHER';
+SELECT * FROM 02703_db.02703_rptable_another;
+
+CREATE ROW POLICY 02703_filter_3 ON 02703_db.02703_rptable USING x=3 AS permissive TO ALL;
+SELECT 'R1, R2, R3: (x == 1) OR (x == 2) OR (x == 3)';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE ROW POLICY 02703_filter_4 ON 02703_db.02703_rptable USING x<=2 AS restrictive TO ALL;
+SELECT 'R1, R2, R3, R4: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2)';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE ROW POLICY 02703_filter_5 ON 02703_db.* USING y>=20 AS restrictive TO ALL;
+SELECT 'R1, R2, R3, R4, R5: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2) AND (y >= 20)';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE TABLE 02703_db.02703_after_rp ENGINE = MergeTree ORDER BY x AS SELECT * FROM 02703_db.02703_rptable;
+SELECT * FROM 02703_db.02703_after_rp;
+
+-- does not matter if policies or table are created first
+SELECT 'R1, R2, R3, R4, R5: (x == 2) AND (y >= 20) FROM AFTER_RP';
+SELECT * FROM 02703_db.02703_after_rp;
+
+SELECT 'R1, R2, R3, R4, R5: (x == 2) AND (y >= 20) FROM ANOTHER';
+SELECT * FROM 02703_db.02703_rptable_another;
+
+DROP ROW POLICY 02703_filter_1 ON 02703_db.02703_rptable;
+SELECT 'R2, R3, R4, R5: ((x == 2) OR (x == 3)) AND (x <= 2) AND (y >= 20)';
+SELECT * FROM 02703_db.02703_rptable;
+
+DROP ROW POLICY 02703_filter_2 ON 02703_db.*;
+SELECT 'R3, R4, R5: (x == 3) AND (x <= 2) AND (y >= 20)';
+SELECT * FROM 02703_db.02703_rptable;
+
+DROP ROW POLICY 02703_filter_3 ON 02703_db.02703_rptable;
+SELECT 'R4, R5: (x <= 2) AND (y >= 20)';
+SELECT * FROM 02703_db.02703_rptable;
+
+DROP ROW POLICY 02703_filter_4 ON 02703_db.02703_rptable;
+SELECT 'R5: (x >= 2)';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE TABLE 02703_db.02703_unexpected_columns (xx UInt8, yy UInt8) ENGINE = MergeTree ORDER BY xx;
+SELECT 'Policy not applicable';
+SELECT * FROM 02703_db.02703_unexpected_columns; -- { serverError 47 } -- Missing columns: 'x' while processing query
+
+DROP ROW POLICY 02703_filter_5 ON 02703_db.*;
+SELECT 'None';
+SELECT * FROM 02703_db.02703_rptable;
+
+SELECT 'No problematic policy, select works';
+SELECT 'Ok' FROM 02703_db.02703_unexpected_columns;
+
+DROP TABLE 02703_db.02703_rptable;
+DROP TABLE 02703_db.02703_rptable_another;
+DROP TABLE 02703_db.02703_unexpected_columns;
+DROP DATABASE 02703_db;
diff --git a/tests/queries/0_stateless/02703_row_policy_for_database.reference b/tests/queries/0_stateless/02703_row_policy_for_database.reference
new file mode 100644
index 00000000000..ec03e538d95
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policy_for_database.reference
@@ -0,0 +1,20 @@
+-- row policies for database
+  -- SHOW CREATE POLICY db1_02703 ON db1_02703.*
+CREATE ROW POLICY db1_02703 ON db1_02703.* FOR SELECT USING 1 TO ALL
+  -- SHOW CREATE POLICY ON db1_02703.*
+CREATE ROW POLICY db1_02703 ON db1_02703.* FOR SELECT USING 1 TO ALL
+CREATE ROW POLICY tbl1_02703 ON db1_02703.table FOR SELECT USING 1 TO ALL
+  -- SHOW CREATE POLICY ON db1_02703.`*`
+R1, R2: (x == 1) OR (x == 2)
+1
+2
+Check system.query_log
+SELECT \'-- row policies for database\';	[]
+SELECT \'  -- SHOW CREATE POLICY db1_02703 ON db1_02703.*\';	[]
+SELECT \'  -- SHOW CREATE POLICY ON db1_02703.*\';	[]
+SELECT \'  -- SHOW CREATE POLICY ON db1_02703.`*`\';	[]
+SELECT \'R1, R2: (x == 1) OR (x == 2)\';	[]
+SELECT * FROM 02703_rqtable_default;	['`02703_filter_11_db` ON default.*','`02703_filter_11` ON default.`02703_rqtable_default`']
+SELECT \'Check system.query_log\';	[]
+  -- CREATE DATABASE-LEVEL POLICY IN CURRENT DATABASE
+CREATE ROW POLICY db2_02703 ON db1_02703.* TO u1_02703
diff --git a/tests/queries/0_stateless/02703_row_policy_for_database.sql b/tests/queries/0_stateless/02703_row_policy_for_database.sql
new file mode 100644
index 00000000000..03183a96b98
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policy_for_database.sql
@@ -0,0 +1,53 @@
+-- Tags: no-parallel
+
+DROP DATABASE IF EXISTS db1_02703;
+DROP USER IF EXISTS u1_02703;
+CREATE USER u1_02703;
+
+CREATE DATABASE db1_02703;
+
+CREATE TABLE db1_02703.02703_rqtable (x UInt8) ENGINE = MergeTree ORDER BY x;
+INSERT INTO db1_02703.02703_rqtable VALUES (1), (2), (3), (4);
+
+
+SELECT '-- row policies for database';
+CREATE ROW POLICY db1_02703 ON db1_02703.* USING 1 AS PERMISSIVE TO ALL;
+CREATE ROW POLICY tbl1_02703 ON db1_02703.table USING 1 AS PERMISSIVE TO ALL;
+SELECT '  -- SHOW CREATE POLICY db1_02703 ON db1_02703.*';
+SHOW CREATE POLICY db1_02703 ON db1_02703.*;
+SELECT '  -- SHOW CREATE POLICY ON db1_02703.*';
+SHOW CREATE POLICY ON db1_02703.*;
+SELECT '  -- SHOW CREATE POLICY ON db1_02703.`*`';
+SHOW CREATE POLICY ON db1_02703.`*`;
+DROP POLICY db1_02703 ON db1_02703.*;
+DROP POLICY tbl1_02703 ON db1_02703.table;
+
+CREATE ROW POLICY any_02703 ON *.some_table USING 1 AS PERMISSIVE TO ALL; -- { clientError 62 }
+
+CREATE TABLE 02703_rqtable_default (x UInt8) ENGINE = MergeTree ORDER BY x;
+
+CREATE ROW POLICY 02703_filter_11_db ON * USING x=1 AS permissive TO ALL;
+CREATE ROW POLICY 02703_filter_11 ON 02703_rqtable_default USING x=2 AS permissive TO ALL;
+
+INSERT INTO 02703_rqtable_default VALUES (1), (2), (3), (4);
+
+SELECT 'R1, R2: (x == 1) OR (x == 2)';
+SELECT * FROM 02703_rqtable_default;
+
+DROP TABLE 02703_rqtable_default;
+
+SELECT 'Check system.query_log';
+SYSTEM FLUSH LOGS;
+SELECT query, used_row_policies FROM system.query_log WHERE current_database == currentDatabase() AND type == 'QueryStart' AND query_kind == 'Select' ORDER BY event_time_microseconds;
+
+DROP ROW POLICY 02703_filter_11_db ON *;
+DROP ROW POLICY 02703_filter_11 ON 02703_rqtable_default;
+
+USE db1_02703;
+SELECT '  -- CREATE DATABASE-LEVEL POLICY IN CURRENT DATABASE';
+CREATE ROW POLICY db2_02703 ON * TO u1_02703;
+SHOW CREATE POLICY db2_02703 ON *;
+
+DROP ROW POLICY db2_02703 ON *;
+
+DROP USER u1_02703;
diff --git a/tests/queries/0_stateless/02703_storage_s3_race.reference b/tests/queries/0_stateless/02703_storage_s3_race.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/02703_storage_s3_race.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/02703_storage_s3_race.sh b/tests/queries/0_stateless/02703_storage_s3_race.sh
new file mode 100755
index 00000000000..65a38e600f7
--- /dev/null
+++ b/tests/queries/0_stateless/02703_storage_s3_race.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+filename="test_${CLICKHOUSE_DATABASE}_${RANDOM}"
+
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_s3_race"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE test_s3_race (u UInt64) ENGINE = S3(s3_conn, filename='$filename', format='CSV')"
+$CLICKHOUSE_CLIENT --s3_truncate_on_insert 1 --query "INSERT INTO test_s3_race VALUES (1)"
+
+$CLICKHOUSE_BENCHMARK -i 100 -c 4 <<< "SELECT * FROM test_s3_race" >/dev/null 2>&1
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_s3_race"
+echo "OK"
diff --git a/tests/queries/0_stateless/02704_keeper_map_zk_nodes.reference b/tests/queries/0_stateless/02704_keeper_map_zk_nodes.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh b/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh
new file mode 100755
index 00000000000..9689d4f5a50
--- /dev/null
+++ b/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh
@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+# Tags: no-ordinary-database, zookeeper, no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+table_name="02704_keeper_map_zk_nodes"
+table_name_another="02704_keeper_map_zk_nodes_new_table"
+
+$CLICKHOUSE_CLIENT --multiquery --query="
+DROP TABLE IF EXISTS $table_name;
+DROP TABLE IF EXISTS $table_name_another;
+CREATE TABLE $table_name (key UInt64, value UInt64)
+ENGINE = KeeperMap('/$table_name/$CLICKHOUSE_DATABASE')
+PRIMARY KEY(key)"
+
+function assert_children_size()
+{
+    for _ in `seq 10`
+    do
+        children_size=$($CLICKHOUSE_CLIENT --query="SELECT count() FROM system.zookeeper WHERE path = '$1'")
+        if [ $children_size == $2 ]
+        then
+            return
+        fi
+
+        sleep 0.4
+    done
+
+    echo "Invalid number of children for path '$1': actual $children_size, expected $2"
+    exit 1
+}
+
+function assert_root_children_size()
+{
+    assert_children_size "/test_keeper_map/02704_keeper_map_zk_nodes/$CLICKHOUSE_DATABASE" $1
+}
+
+function assert_data_children_size()
+{
+    assert_children_size "/test_keeper_map/02704_keeper_map_zk_nodes/$CLICKHOUSE_DATABASE/data" $1
+}
+
+assert_root_children_size 2
+assert_data_children_size 0
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO $table_name VALUES (1, 11)"
+
+assert_data_children_size 1
+
+$CLICKHOUSE_CLIENT --query="
+CREATE TABLE $table_name_another (key UInt64, value UInt64)
+ENGINE = KeeperMap('/$table_name/$CLICKHOUSE_DATABASE')
+PRIMARY KEY(key)"
+
+assert_root_children_size 2
+assert_data_children_size 1
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO $table_name_another VALUES (1, 11)"
+
+assert_root_children_size 2
+assert_data_children_size 1
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO $table_name_another VALUES (2, 22)"
+
+assert_root_children_size 2
+assert_data_children_size 2
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE $table_name"
+
+assert_root_children_size 2
+assert_data_children_size 2
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE $table_name_another"
+
+assert_root_children_size 0
diff --git a/tests/queries/0_stateless/02704_max_backup_bandwidth.reference b/tests/queries/0_stateless/02704_max_backup_bandwidth.reference
new file mode 100644
index 00000000000..9972842f982
--- /dev/null
+++ b/tests/queries/0_stateless/02704_max_backup_bandwidth.reference
@@ -0,0 +1 @@
+1	1
diff --git a/tests/queries/0_stateless/02704_max_backup_bandwidth.sh b/tests/queries/0_stateless/02704_max_backup_bandwidth.sh
new file mode 100755
index 00000000000..b5d32d2059d
--- /dev/null
+++ b/tests/queries/0_stateless/02704_max_backup_bandwidth.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Tags: no-s3-storage, no-random-settings, no-random-merge-tree-settings
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -nm -q "
+    drop table if exists data;
+    create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9;
+"
+
+# reading 1e6*8 bytes with 1M bandwith it should take (8-1)/1=7 seconds
+$CLICKHOUSE_CLIENT -q "insert into data select * from numbers(1e6)"
+
+query_id=$(random_str 10)
+$CLICKHOUSE_CLIENT --query_id "$query_id" -q "backup table data to Disk('default', 'backups/$CLICKHOUSE_DATABASE/data/backup1')" --max_backup_bandwidth=1M > /dev/null
+$CLICKHOUSE_CLIENT -nm -q "
+    SYSTEM FLUSH LOGS;
+    SELECT
+        query_duration_ms >= 7e3,
+        ProfileEvents['ReadBufferFromFileDescriptorReadBytes'] > 8e6
+    FROM system.query_log
+    WHERE current_database = '$CLICKHOUSE_DATABASE' AND query_id = '$query_id' AND type != 'QueryStart'
+"
diff --git a/tests/queries/0_stateless/02704_storage_merge_explain_graph_crash.reference b/tests/queries/0_stateless/02704_storage_merge_explain_graph_crash.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02704_storage_merge_explain_graph_crash.sql b/tests/queries/0_stateless/02704_storage_merge_explain_graph_crash.sql
new file mode 100644
index 00000000000..44a8fe4f049
--- /dev/null
+++ b/tests/queries/0_stateless/02704_storage_merge_explain_graph_crash.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS foo;
+DROP TABLE IF EXISTS foo2;
+DROP TABLE IF EXISTS foo2_dist;
+DROP TABLE IF EXISTS merge1;
+
+CREATE TABLE foo (`Id` Int32, `Val` Int32) ENGINE = MergeTree ORDER BY Id;
+INSERT INTO foo SELECT number, number FROM numbers(100);
+
+CREATE TABLE foo2 (`Id` Int32, `Val` Int32) ENGINE = MergeTree ORDER BY Id;
+INSERT INTO foo2 SELECT number, number FROM numbers(100);
+CREATE TABLE foo2_dist (`Id` UInt32, `Val` String) ENGINE = Distributed(test_shard_localhost, currentDatabase(), foo2);
+
+CREATE TABLE merge1 AS foo ENGINE = Merge(currentDatabase(), '^(foo|foo2_dist)$');
+
+EXPLAIN PIPELINE graph = 1, compact = 1 SELECT * FROM merge1 FORMAT Null;
+EXPLAIN PIPELINE graph = 1, compact = 1 SELECT * FROM merge1 FORMAT Null SETTINGS allow_experimental_analyzer=1;
diff --git a/tests/queries/0_stateless/02705_capnp_more_types.reference b/tests/queries/0_stateless/02705_capnp_more_types.reference
new file mode 100644
index 00000000000..9cacd1fe527
--- /dev/null
+++ b/tests/queries/0_stateless/02705_capnp_more_types.reference
@@ -0,0 +1,3 @@
+42	42	42	42	42.42	42.42
+{'Hello':42,'World':24}
+42	42	42	42	42	42	42	42
diff --git a/tests/queries/0_stateless/02705_capnp_more_types.sh b/tests/queries/0_stateless/02705_capnp_more_types.sh
new file mode 100755
index 00000000000..1f6b1f7c86b
--- /dev/null
+++ b/tests/queries/0_stateless/02705_capnp_more_types.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-replicated-database
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+SCHEMADIR=$CURDIR/format_schemas
+$CLICKHOUSE_LOCAL -q "select 42::Int128 as int128, 42::UInt128 as uint128, 42::Int256 as int256, 42::UInt256 as uint256, 42.42::Decimal128(2) as decimal128, 42.42::Decimal256(2) as decimal256 format CapnProto settings format_schema='$SCHEMADIR/02705_big_numbers:Message'" | $CLICKHOUSE_LOCAL --input-format CapnProto --structure "int128 Int128, uint128 UInt128, int256 Int256, uint256 UInt256, decimal128 Decimal128(2), decimal256 Decimal256(2)" -q "select * from table" --format_schema="$SCHEMADIR/02705_big_numbers:Message"
+
+$CLICKHOUSE_LOCAL -q "select map('Hello', 42, 'World', 24) as map format CapnProto settings format_schema='$SCHEMADIR/02705_map:Message'" | $CLICKHOUSE_LOCAL  --input-format CapnProto --structure "map Map(String, UInt32)" --format_schema="$SCHEMADIR/02705_map:Message"  -q "select * from table"
+
+
+$CLICKHOUSE_LOCAL -q "select 42 as int8, 42 as uint8, 42 as int16, 42 as uint16, 42 as int32, 42 as uint32, 42 as int64, 42 as uint64 format CapnProto settings format_schema='$SCHEMADIR/02030_capnp_simple_types:Message'" | $CLICKHOUSE_LOCAL  --input-format CapnProto --structure "int8 UInt32, uint8 Int32, int16 Int8, uint16 UInt8, int32 UInt64, uint32 Int64, int64 UInt16, uint64 Int16" --format_schema="$SCHEMADIR/02030_capnp_simple_types:Message"  -q "select * from table"
+
+
+
diff --git a/tests/queries/0_stateless/02705_grouping_keys_equal_keys.reference b/tests/queries/0_stateless/02705_grouping_keys_equal_keys.reference
new file mode 100644
index 00000000000..a9e2f17562a
--- /dev/null
+++ b/tests/queries/0_stateless/02705_grouping_keys_equal_keys.reference
@@ -0,0 +1,6 @@
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/02705_grouping_keys_equal_keys.sql b/tests/queries/0_stateless/02705_grouping_keys_equal_keys.sql
new file mode 100644
index 00000000000..fcf5b4d2ce5
--- /dev/null
+++ b/tests/queries/0_stateless/02705_grouping_keys_equal_keys.sql
@@ -0,0 +1,7 @@
+SELECT count()
+FROM numbers(2)
+GROUP BY
+GROUPING SETS (
+  (number, number + 0, number + 1),
+  (number % 1048576, number % -9223372036854775808),
+  (number / 2, number / 2));
diff --git a/tests/queries/0_stateless/02705_projection_and_ast_optimizations_bug.reference b/tests/queries/0_stateless/02705_projection_and_ast_optimizations_bug.reference
new file mode 100644
index 00000000000..9049324c392
--- /dev/null
+++ b/tests/queries/0_stateless/02705_projection_and_ast_optimizations_bug.reference
@@ -0,0 +1 @@
+-2.5574077246549023	0.6663667453928805	1
diff --git a/tests/queries/0_stateless/02705_projection_and_ast_optimizations_bug.sql b/tests/queries/0_stateless/02705_projection_and_ast_optimizations_bug.sql
new file mode 100644
index 00000000000..5589fbeeb9e
--- /dev/null
+++ b/tests/queries/0_stateless/02705_projection_and_ast_optimizations_bug.sql
@@ -0,0 +1,6 @@
+drop table if exists t1;
+CREATE TABLE t1 (c0 Int32) ENGINE = MergeTree() ORDER BY c0 PARTITION BY (- (c0));
+insert into t1 values(1);
+SELECT (- ((((tan (t1.c0)))+(t1.c0)))), (cos ((sin (pow(t1.c0,t1.c0))))), ((gcd((- (t1.c0)),((t1.c0)+(t1.c0))))*((- ((- (t1.c0)))))) FROM t1 GROUP BY (sqrt ((- (t1.c0)))), t1.c0, pow((erf ((- (t1.c0)))),t1.c0);
+drop table t1;
+
diff --git a/tests/queries/0_stateless/02705_protobuf_debug_abort.reference b/tests/queries/0_stateless/02705_protobuf_debug_abort.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02705_protobuf_debug_abort.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02705_protobuf_debug_abort.sh b/tests/queries/0_stateless/02705_protobuf_debug_abort.sh
new file mode 100755
index 00000000000..ec564d4c6fc
--- /dev/null
+++ b/tests/queries/0_stateless/02705_protobuf_debug_abort.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo 'syntax = "proto3";
+
+message Message {
+    NotExisted x = 1;
+}' > 02705_schema_$CLICKHOUSE_TEST_UNIQUE_NAME.proto
+
+
+$CLICKHOUSE_LOCAL -q "select * from file(data.bin, Protobuf) settings format_schema='02705_schema_$CLICKHOUSE_TEST_UNIQUE_NAME:Message'" 2>&1 | grep -c "CANNOT_PARSE_PROTOBUF_SCHEMA"
+
+rm 02705_schema_$CLICKHOUSE_TEST_UNIQUE_NAME.proto
+
diff --git a/tests/queries/0_stateless/02705_settings_check_changed_flag.reference b/tests/queries/0_stateless/02705_settings_check_changed_flag.reference
new file mode 100644
index 00000000000..58a93072157
--- /dev/null
+++ b/tests/queries/0_stateless/02705_settings_check_changed_flag.reference
@@ -0,0 +1,32 @@
+0
+1
+1
+1
+0
+1
+1
+1
+0
+1
+1
+1
+0
+1
+1
+1
+0
+1
+1
+1
+0
+1
+1
+1
+0
+1
+1
+1
+0
+1
+1
+1
diff --git a/tests/queries/0_stateless/02705_settings_check_changed_flag.sql b/tests/queries/0_stateless/02705_settings_check_changed_flag.sql
new file mode 100644
index 00000000000..151e7a66b71
--- /dev/null
+++ b/tests/queries/0_stateless/02705_settings_check_changed_flag.sql
@@ -0,0 +1,82 @@
+---SettingFieldNumber
+SELECT changed from system.settings where name = 'mysql_max_rows_to_insert';
+SET mysql_max_rows_to_insert = 123123;
+
+select changed from system.settings where name = 'mysql_max_rows_to_insert';
+set mysql_max_rows_to_insert = 123123;
+select changed from system.settings where name = 'mysql_max_rows_to_insert';
+set mysql_max_rows_to_insert = 65536;
+select changed from system.settings where name = 'mysql_max_rows_to_insert';
+
+---SettingAutoWrapper 
+
+select changed from system.settings where name = 'insert_quorum';
+set insert_quorum = 123123;
+select changed from system.settings where name = 'insert_quorum';
+set insert_quorum = 123123;
+select changed from system.settings where name = 'insert_quorum';
+set insert_quorum = 0;
+select changed from system.settings where name = 'insert_quorum';
+
+---SettingFieldMaxThreads 
+
+select changed from system.settings where name = 'max_alter_threads';
+set max_alter_threads = 123123;
+select changed from system.settings where name = 'max_alter_threads';
+set max_alter_threads = 123123;
+select changed from system.settings where name = 'max_alter_threads';
+set max_alter_threads = 0;
+select changed from system.settings where name = 'max_alter_threads';
+
+---SettingFieldTimespanUnit
+
+select changed from system.settings where name = 'drain_timeout';
+set drain_timeout = 123123;
+select changed from system.settings where name = 'drain_timeout';
+set drain_timeout = 123123;
+select changed from system.settings where name = 'drain_timeout';
+set drain_timeout = 3;
+select changed from system.settings where name = 'drain_timeout';
+
+
+---SettingFieldChar
+
+select changed from system.settings where name = 'format_csv_delimiter';
+set format_csv_delimiter = ',';
+select changed from system.settings where name = 'format_csv_delimiter';
+set format_csv_delimiter = ',';
+select changed from system.settings where name = 'format_csv_delimiter';
+set format_csv_delimiter = ',';
+select changed from system.settings where name = 'format_csv_delimiter';
+
+
+---SettingFieldURI
+
+select changed from system.settings where name = 'format_avro_schema_registry_url';
+set format_avro_schema_registry_url = 'https://github.com/ClickHouse/ClickHouse/tree/master/src/Core';
+select changed from system.settings where name = 'format_avro_schema_registry_url';
+set format_avro_schema_registry_url = 'https://github.com/ClickHouse/ClickHouse/tree/master/src/Core';
+select changed from system.settings where name = 'format_avro_schema_registry_url';
+set format_avro_schema_registry_url = '';
+select changed from system.settings where name = 'format_avro_schema_registry_url';
+
+
+--- SettingFieldEnum
+
+select changed from system.settings where name = 'output_format_orc_compression_method';
+set output_format_orc_compression_method = 'none';
+select changed from system.settings where name = 'output_format_orc_compression_method';
+set output_format_orc_compression_method = 'none';
+select changed from system.settings where name = 'output_format_orc_compression_method';
+set output_format_orc_compression_method = 'lz4';
+select changed from system.settings where name = 'output_format_orc_compression_method';
+
+--- SettingFieldMultiEnum
+
+select changed from system.settings where name = 'join_algorithm';
+set join_algorithm = 'auto,direct';
+select changed from system.settings where name = 'join_algorithm';
+set join_algorithm = 'auto,direct';
+select changed from system.settings where name = 'join_algorithm';
+set join_algorithm = 'default';
+select changed from system.settings where name = 'join_algorithm';
diff --git a/tests/queries/0_stateless/02706_array_map_tuples.reference b/tests/queries/0_stateless/02706_array_map_tuples.reference
new file mode 100644
index 00000000000..a44843f1a35
--- /dev/null
+++ b/tests/queries/0_stateless/02706_array_map_tuples.reference
@@ -0,0 +1,3 @@
+[(2,1)]
+[1]
+[(3,2)]
diff --git a/tests/queries/0_stateless/02706_array_map_tuples.sql b/tests/queries/0_stateless/02706_array_map_tuples.sql
new file mode 100644
index 00000000000..205e15c7de2
--- /dev/null
+++ b/tests/queries/0_stateless/02706_array_map_tuples.sql
@@ -0,0 +1,6 @@
+WITH [(1, 2)] AS arr1 SELECT arrayMap((x, y) -> (y, x), arr1);
+WITH [(1, 2)] AS arr1 SELECT arrayMap(x -> x.1, arr1);
+WITH [(1, 2)] AS arr1, [(3, 4)] AS arr2 SELECT arrayMap((x, y) -> (y.1, x.2), arr1, arr2);
+
+WITH [(1, 2)] AS arr1 SELECT arrayMap((x, y, z) -> (y, x, z), arr1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+WITH [1, 2] AS arr1 SELECT arrayMap((x, y) -> (y, x), arr1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/02706_arrow_different_dictionaries.reference b/tests/queries/0_stateless/02706_arrow_different_dictionaries.reference
new file mode 100644
index 00000000000..eda4c04d605
--- /dev/null
+++ b/tests/queries/0_stateless/02706_arrow_different_dictionaries.reference
@@ -0,0 +1,20 @@
+0
+0
+1
+1
+2
+2
+3
+3
+4
+4
+5
+5
+6
+6
+7
+7
+8
+8
+9
+9
diff --git a/tests/queries/0_stateless/02706_arrow_different_dictionaries.sh b/tests/queries/0_stateless/02706_arrow_different_dictionaries.sh
new file mode 100755
index 00000000000..d3958aa768d
--- /dev/null
+++ b/tests/queries/0_stateless/02706_arrow_different_dictionaries.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select toLowCardinality(toString(number % 10)) as x from numbers(20) format Arrow settings max_block_size=7, output_format_arrow_low_cardinality_as_dictionary=1" | $CLICKHOUSE_LOCAL -q "select * from table order by x" --input-format='Arrow'
+
diff --git a/tests/queries/0_stateless/02706_keeper_map_insert_strict.reference b/tests/queries/0_stateless/02706_keeper_map_insert_strict.reference
new file mode 100644
index 00000000000..a6bdbb192e4
--- /dev/null
+++ b/tests/queries/0_stateless/02706_keeper_map_insert_strict.reference
@@ -0,0 +1,3 @@
+1	1.1
+1	2.1
+1	2.1
diff --git a/tests/queries/0_stateless/02706_keeper_map_insert_strict.sql b/tests/queries/0_stateless/02706_keeper_map_insert_strict.sql
new file mode 100644
index 00000000000..97c801ec46e
--- /dev/null
+++ b/tests/queries/0_stateless/02706_keeper_map_insert_strict.sql
@@ -0,0 +1,20 @@
+-- Tags: no-ordinary-database, no-fasttest
+
+DROP TABLE IF EXISTS 02706_keeper_map_insert_strict SYNC;
+
+CREATE TABLE 02706_keeper_map_insert_strict (key UInt64, value Float64) Engine=KeeperMap('/' || currentDatabase() || '/test_02706_keeper_map_insert_strict') PRIMARY KEY(key);
+
+INSERT INTO 02706_keeper_map_insert_strict VALUES (1, 1.1), (2, 2.2);
+SELECT * FROM 02706_keeper_map_insert_strict WHERE key = 1;
+
+SET keeper_map_strict_mode = false;
+
+INSERT INTO 02706_keeper_map_insert_strict VALUES (1, 2.1);
+SELECT * FROM 02706_keeper_map_insert_strict WHERE key = 1;
+
+SET keeper_map_strict_mode = true;
+
+INSERT INTO 02706_keeper_map_insert_strict VALUES (1, 2.1); -- { serverError KEEPER_EXCEPTION }
+SELECT * FROM 02706_keeper_map_insert_strict WHERE key = 1;
+
+DROP TABLE 02706_keeper_map_insert_strict;
diff --git a/tests/queries/0_stateless/02706_kolmogorov_smirnov_test.reference b/tests/queries/0_stateless/02706_kolmogorov_smirnov_test.reference
new file mode 100644
index 00000000000..d2e9e7de5d4
--- /dev/null
+++ b/tests/queries/0_stateless/02706_kolmogorov_smirnov_test.reference
@@ -0,0 +1,3 @@
+0.1	0.1	1	0.05	0.1	1	0.05	0.1	1	0.05	0.099562	1	0.018316	1	1	-0	1	1	-0	1	1	-0	1	1	-0	1
+0.000007	0.000007	0.000004	0.000023	0.000007	0.000004	0.000023	0.000007	0.000004	0.000023	0.000008	0.000003	0.00002	0.158	0.158	0.158	0.146	0.158	0.158	0.146	0.158	0.158	0.146	0.158	0.158	0.146
+0	0	0	0.523357	0	0	0.523357	0	0	0.523357	0	0	0.504595	0.486	0.486	0.486	0.036	0.486	0.486	0.036	0.486	0.486	0.036	0.486	0.486	0.036
diff --git a/tests/queries/0_stateless/02706_kolmogorov_smirnov_test.sql b/tests/queries/0_stateless/02706_kolmogorov_smirnov_test.sql
new file mode 100644
index 00000000000..3199b6968c0
--- /dev/null
+++ b/tests/queries/0_stateless/02706_kolmogorov_smirnov_test.sql
@@ -0,0 +1,107 @@
+DROP TABLE IF EXISTS kstest;
+
+CREATE TABLE kstest (left Float64, right Float64) ENGINE = Memory;
+
+INSERT INTO kstest VALUES (0.010268, 0), (0.000167, 0), (0.000167, 0), (0.159258, 1), (0.136278, 1), (0.122389, 1);
+
+SELECT 
+roundBankers(kolmogorovSmirnovTest(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','auto')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less','auto')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater','auto')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','exact')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less','exact')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater','exact')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','asymp')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less','asymp')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater','asymp')(left, right).2, 6) ,
+roundBankers(kolmogorovSmirnovTest(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','auto')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less','auto')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater','auto')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','exact')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less','exact')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater','exact')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','asymp')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less','asymp')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater','asymp')(left, right).1, 6) 
+from kstest;
+
+DROP TABLE IF EXISTS kstest;
+
+CREATE TABLE kstest (left Float64, right Float64) ENGINE = Memory;
+
+INSERT INTO kstest VALUES (14.72789, 0), (9.61661, 0), (13.57615, 0), (3.98392, 0), (11.98889, 0), (10.99422, 0), (5.44792, 0), (20.29346, 0), (7.05926, 0), (9.22732, 0), (12.06847, 0), (13.52612, 0), (8.24597, 0), (9.35245, 0), (10.12297, 0), (15.80624, 0), (13.68613, 0), (10.72729, 0), (5.62078, 0), (6.12229, 0), (6.03801, 0), (8.95585, 0), (24.04613, 0), (9.04757, 0), (2.68263, 0), (15.43935, 0), (2.89423, 0), (4.01423, 0), (4.30568, 0), (11.99948, 0), (8.40574, 0), (10.86642, 0), (9.4266, 0), (-8.12752, 0), (7.91634, 0), (7.3967, 0), (2.26431, 0), (14.20118, 0), (6.68233, 0), (15.46221, 0), (7.88467, 0), (11.20011, 0), (8.92027, 0), (10.27926, 0), (5.14395, 0), (5.62178, 0), (12.84383, 0), (9.98009, 0), (-0.69789, 0), (11.41386, 0), (7.76863, 0), (7.21743, 0), (1.81176, 0), (9.43762, 0), (19.22117, 0), (2.97128, 0), (14.32851, 0), (7.54959, 0), (3.81545, 0), (10.1281, 0), (2.48596, 0), (10.0461, 0), (3.59714, 0), (9.73522, 0), (18.8077, 0), (3.15148, 0), (12.26062, 0), (5.66707, 0), (6.58623, 0), (17.30902, 0), (9.91391, 0), (5.36946, 0), (15.73637, 0), (16.96281, 0), (11.54063, 0), (18.37358, 0), (11.38255, 0), (10.53256, 0), (8.08833, 0), (16.27556, 0), (2.42969, 0), (9.56127, 0), (7.32998, 0), (9.19511, 0), (9.66903, 0), (4.15029, 0), (8.83511, 0), (14.60617, 0), (14.06143, 0), (5.39556, 0), (10.11871, 0), (10.56619, 0), (14.4462, 0), (10.42106, 0), (7.75551, 0), (11.00418, 0), (4.47226, 0), (16.35461, 0), (18.55174, 0), (11.82044, 0), (7.39454, 0), (11.27767, 0), (6.83827, 0), (7.76858, 0), (15.97614, 0), (14.53781, 0), (12.99546, 0), (16.91151, 0), (9.65012, 0), (14.25487, 0), (14.03618, 0), (2.57382, 0), (2.50779, 0), (14.24787, 0), (13.34666, 0), (7.31102, 0), (10.22981, 0), (17.4435, 0), (21.2074, 0), (6.64191, 0), (18.7086, 0), (14.78686, 0), (9.85287, 0), (4.48263, 0), (14.17469, 0), (14.4342, 0), (19.2481, 0), (3.47165, 0), (8.28712, 0), (8.81657, 0), (0.92319, 0), (20.41106, 0), (6.76127, 0), (22.00242, 0), (8.66129, 0), (10.9929, 0), (17.95494, 0), (17.20996, 0), (12.18888, 0), (12.14257, 0), (15.81243, 0), (4.43362, 0), (1.17567, 0), (15.60881, 0), (9.34833, 0), (6.33513, 0), (-0.83095, 0), (12.43268, 0), (6.63207, 0), (11.96877, 0), (14.81029, 0), (21.84876, 0), (3.75896, 0), (6.91307, 0), (13.73015, 0), (8.63753, 0), (15.71679, 0), (1.74565, 0), (9.16895, 0), (5.70685, 0), (5.00117, 0), (13.06888, 0), (7.51204, 0), (15.34885, 0), (5.20264, 0), (8.59043, 0), (6.45619, 0), (14.61979, 0), (11.7075, 0), (14.04901, 0), (4.20525, 0), (15.1733, 0), (3.12934, 0), (8.08049, 0), (15.41273, 0), (16.90751, 0), (5.86893, 0), (7.1086, 0), (4.418, 0), (12.0614, 0), (7.07887, 0), (3.61585, 0), (11.73001, 0), (10.80449, 0), (8.40311, 0), (9.91276, 0), (16.4164, 0), (5.25034, 0), (15.20283, 0), (10.42909, 0), (9.53888, 0), (14.68939, 0), (6.60007, 0), (18.31058, 0), (7.01885, 0), (18.71631, 0), (10.50002, 0), (10.7517, 0), (4.23224, 0), (2.28924, 0), (8.56059, 0), (8.25095, 0), (9.15673, 0), (13.28409, 0), (8.4513, 0), (2.83911, 0), (2.79676, 0), (9.11055, 0), (7.18529, 0), (-4.1258, 0), (5.28306, 0), (6.82757, 0), (10.89035, 0), (5.24822, 0), (11.935, 0), (6.45675, 0), (10.18088, 0), (4.9932, 0), (18.09939, 0), (8.11738, 0), (5.37883, 0), (10.50339, 0), (16.64093, 0), (14.77263, 0), (13.71385, 0), (6.98746, 0), (10.74635, 0), (5.49432, 0), (13.46078, 0), (10.67565, 0), (9.0291, 0), (11.51417, 0), (13.07118, 0), (9.5049, 0), (8.50611, 0), (6.47606, 0), (13.06526, 0), (19.08658, 0), (9.49741, 0), (10.60865, 0), (2.28996, 0), (8.12846, 0), (5.62241, 0), (4.07712, 0), (17.98526, 0), (9.466, 0), (11.38904, 0), (5.91826, 0), (1.52059, 0), (18.79161, 0), (18.20669, 0), (-1.67829, 0), (18.01586, 0), (16.31577, 0), (7.88281, 0), (8.46179, 0), (10.31113, 0), (14.88377, 0), (1.31835, 0), (2.53176, 0), (9.48625, 0), (3.97936, 0), (11.52319, 0), (13.24178, 0), (7.58739, 0), (10.00959, 0), (9.73361, 0), (8.35716, 0), (1.65491, 0), (11.11521, 0), (6.08355, 0), (10.04582, 0), (11.58237, 0), (16.40249, 0), (1.9691, 0), (13.22776, 0), (2.67059, 0), (9.83651, 0), (2.12539, 0), (9.27114, 0), (9.0699, 0), (2.78179, 0), (12.49311, 0), (12.97662, 0), (15.06359, 0), (16.91565, 0), (5.92011, 0), (5.81304, 0), (8.46425, 0), (9.48705, 0), (4.68191, 0), (5.70028, 0), (-0.78798, 0), (10.03442, 0), (15.45433, 0), (9.43845, 0), (3.05825, 0), (6.92126, 0), (14.05905, 0), (19.71579, 0), (15.0131, 0), (4.50386, 0), (1.31061, 0), (10.81197, 0), (14.32942, 0), (9.26469, 0), (7.27679, 0), (22.69295, 0), (12.03763, 0), (7.34876, 0), (16.60689, 0), (7.48786, 0), (15.78602, 0), (17.21048, 0), (13.93482, 0), (9.69911, 0), (12.24315, 0), (10.58131, 0), (19.57006, 0), (9.8856, 0), (11.70302, 0), (7.89864, 0), (12.24831, 0), (16.93707, 0), (9.65467, 0), (4.221, 0), (15.45229, 0), (12.83088, 0), (7.58313, 0), (12.895, 0), (10.02471, 0), (13.36059, 0), (5.07864, 0), (9.72017, 0), (11.05809, 0), (15.28528, 0), (13.99834, 0), (19.26989, 0), (9.41846, 0), (11.65425, 0), (8.49638, 0), (6.38592, 0), (-4.69837, 0), (12.22061, 0), (9.41331, 0), (13.2075, 0), (12.97005, 0), (11.44352, 0), (9.79805, 0), (6.93116, 0), (10.07691, 0), (22.05892, 0), (7.80353, 0), (-2.17276, 0), (0.61509, 0), (8.35842, 0), (17.77108, 0), (14.70841, 0), (1.27992, 0), (15.62699, 0), (9.32914, 0), (15.41866, 0), (10.82009, 0), (3.29902, 0), (9.21998, 0), (7.93845, 0), (10.33344, 0), (12.06399, 0), (5.5308, 0), (8.38727, 0), (18.11104, 0), (8.86565, 0), (19.41825, 0), (9.52376, 0), (3.94552, 0), (9.37587, 0), (15.44954, 0), (15.90527, 0), (13.18927, 0), (7.01646, 0), (9.06005, 0), (9.06431, 0), (5.76006, 0), (9.18705, 0), (-3.48446, 0), (15.89817, 0), (12.94719, 0), (23.69426, 0), (17.47755, 0), (15.61528, 0), (0.54832, 0), (14.32916, 0), (9.55305, 0), (13.79891, 0), (0.82544, 0), (13.34875, 0), (9.07614, 0), (5.19621, 0), (2.1451, 0), (9.87726, 0), (8.45439, 0), (-1.41842, 0), (7.93598, 0), (11.23151, 0), (17.84458, 0), (7.02237, 0), (10.7842, 0), (4.42832, 0), (4.45044, 0), (1.50938, 0), (21.21651, 0), (6.2097, 0), (6.84354, 0), (18.53804, 0), (12.01072, 0), (4.8345, 0), (20.41587, 0), (14.48353, 0), (8.71116, 0), (12.42818, 0), (14.89244, 0), (8.03033, 0), (5.25917, 0), (2.30092, 0), (10.22504, 0), (15.37573, 0), (7.13666, 0), (4.45018, 0), (10.18405, 0), (3.91025, 0), (14.52304, 0), (13.14771, 0), (11.99219, 0), (9.21345, 0), (8.85106, 0), (12.91887, 0), (15.62308, 0), (11.88034, 0), (15.12097, 0), (11.58168, 0), (16.83051, 0), (5.25405, 0), (2.19976, 0), (4.56716, 0), (16.46053, 0), (5.61995, 0), (8.67704, 0), (5.62789, 0), (9.84815, 0), (13.05834, 0), (11.74205, 0), (3.88393, 0), (16.15321, 0), (4.83925, 0), (13.00334, 0), (4.4028, 0), (4.35794, 0), (4.47478, 0), (2.38713, 0), (4.25235, 0), (10.87509, 0), (9.82411, 0), (13.61518, 0), (10.25507, 0), (4.0335, 0), (10.69881, 0), (5.70321, 0), (6.96244, 0), (9.35874, 0), (6.28076, 0), (8.29015, 0), (6.88653, 0), (7.70687, 0), (8.2001, 0), (6.73415, 0), (3.82052, 0), (3.94469, 0), (15.82384, 0), (2.54004, 0), (10.74876, 0), (12.60517, 0), (17.7024, 0), (4.6722, 0), (13.67341, 0), (6.4565, 0), (12.95699, 0), (4.56912, 0), (5.58464, 0), (4.0638, 0), (13.05559, 0), (5.38269, 0), (0.16354, 0), (7.23962, 0), (7.38577, 0), (8.50951, 0), (13.72574, 0), (17.80421, 0), (3.01135, 0), (8.02608, 0), (14.23847, 0), (-8.65656, 1), (22.98234, 1), (23.80821, 1), (13.33939, 1), (-4.05537, 1), (23.5155, 1), (-6.45272, 1), (17.7903, 1), (11.463, 1), (5.28021, 1), (8.39157, 1), (6.02464, 1), (14.43732, 1), (15.76584, 1), (1.54391, 1), (1.24897, 1), (27.1507, 1), (7.71091, 1), (15.71846, 1), (32.97808, 1), (-1.79334, 1), (-9.23439, 1), (11.27838, 1), (0.72703, 1), (18.51557, 1), (9.16619, 1), (17.29624, 1), (-1.30208, 1), (-3.48018, 1), (10.12082, 1), (-8.01318, 1), (-14.22264, 1), (16.58174, 1), (-0.55975, 1), (5.61449, 1), (1.44626, 1), (7.89158, 1), (1.13369, 1), (-0.82609, 1), (12.23365, 1), (12.45443, 1), (14.46915, 1), (13.72627, 1), (18.41459, 1), (29.66702, 1), (1.51619, 1), (10.40078, 1), (3.33266, 1), (6.12036, 1), (11.86553, 1), (6.59422, 1), (22.0948, 1), (1.79623, 1), (14.29513, 1), (19.69162, 1), (-7.98033, 1), (5.48433, 1), (-2.28474, 1), (9.91876, 1), (10.64097, 1), (0.22523, 1), (17.01773, 1), (22.37388, 1), (14.04215, 1), (23.1244, 1), (18.96958, 1), (8.42663, 1), (3.7165, 1), (14.29366, 1), (23.50886, 1), (26.33722, 1), (26.72396, 1), (13.26287, 1), (12.97607, 1), (17.41838, 1), (8.63875, 1), (17.08943, 1), (23.15356, 1), (-4.4965, 1), (7.58895, 1), (26.04074, 1), (6.84245, 1), (20.56287, 1), (3.84735, 1), (-2.76304, 1), (13.1615, 1), (8.21954, 1), (-3.49943, 1), (22.12419, 1), (7.08323, 1), (16.12937, 1), (-0.32672, 1), (16.5942, 1), (7.68977, 1), (11.39484, 1), (-5.11987, 1), (20.87404, 1), (8.01007, 1), (3.26497, 1), (5.61253, 1), (20.69182, 1), (0.0296, 1), (21.904, 1), (22.46572, 1), (3.63685, 1), (-5.10846, 1), (14.86389, 1), (5.47188, 1), (18.44095, 1), (16.71368, 1), (6.36704, 1), (8.82663, 1), (14.6727, 1), (7.98383, 1), (2.65568, 1), (21.45827, 1), (11.77948, 1), (4.71979, 1), (3.17951, 1), (13.90226, 1), (15.50578, 1), (10.8026, 1), (16.91369, 1), (9.90552, 1), (13.87322, 1), (4.12366, 1), (-3.78985, 1), (1.7599, 1), (3.43715, 1), (-3.45246, 1), (23.64571, 1), (-4.96877, 1), (3.93514, 1), (1.49914, 1), (12.71519, 1), (5.11521, 1), (4.79872, 1), (20.89391, 1), (5.363, 1), (8.02765, 1), (14.30804, 1), (11.49002, 1), (14.25281, 1), (7.6573, 1), (15.49686, 1), (3.29327, 1), (2.27236, 1), (12.58104, 1), (19.19128, 1), (15.25901, 1), (6.5221, 1), (10.10965, 1), (12.75249, 1), (16.50977, 1), (-8.6697, 1), (8.28553, 1), (1.44315, 1), (4.65869, 1), (0.98149, 1), (0.16623, 1), (17.66332, 1), (4.35346, 1), (6.52742, 1), (-1.06631, 1), (-5.28454, 1), (14.25583, 1), (8.74058, 1), (1.89553, 1), (-0.92959, 1), (10.30289, 1), (-6.3744, 1), (-8.1706, 1), (10.95369, 1), (4.94384, 1), (28.40568, 1), (3.7004, 1), (2.52363, 1), (4.07997, 1), (7.8849, 1), (17.95409, 1), (16.67021, 1), (11.34377, 1), (-0.07446, 1), (22.00223, 1), (3.31778, 1), (18.50719, 1), (-3.58655, 1), (6.5394, 1), (12.40459, 1), (16.59866, 1), (7.54176, 1), (-1.51044, 1), (12.69758, 1), (2.9842, 1), (2.49187, 1), (2.04113, 1), (-2.46544, 1), (15.18368, 1), (-0.04058, 1), (-0.4127, 1), (10.5526, 1), (12.03982, 1), (12.10923, 1), (11.54954, 1), (-1.18613, 1), (11.30984, 1), (23.54105, 1), (10.67321, 1), (24.09196, 1), (7.5008, 1), (12.52233, 1), (4.30673, 1), (9.35793, 1), (4.44472, 1), (-7.00679, 1), (8.56241, 1), (23.73891, 1), (15.62708, 1), (16.09205, 1), (12.52074, 1), (14.58927, 1), (-4.80187, 1), (8.47964, 1), (7.75477, 1), (12.6893, 1), (7.14147, 1), (12.12654, 1), (12.32334, 1), (7.98909, 1), (3.26652, 1), (20.53684, 1), (32.3369, 1), (19.74911, 1), (-4.62897, 1), (8.26483, 1), (20.88451, 1), (-2.12982, 1), (25.61459, 1), (5.32091, 1), (-4.1196, 1), (7.57937, 1), (21.15847, 1), (6.46355, 1), (7.74846, 1), (19.62636, 1), (28.34629, 1), (26.73919, 1), (20.40427, 1), (3.03378, 1), (10.2537, 1), (7.47745, 1), (10.79184, 1), (3.91962, 1), (19.97973, 1), (18.87711, 1), (12.56157, 1), (11.46033, 1), (3.78661, 1), (-9.45748, 1), (12.06033, 1), (-0.74615, 1), (13.2815, 1), (24.78052, 1), (5.83337, 1), (17.4111, 1), (19.70331, 1), (11.78446, 1), (-1.366, 1), (1.37458, 1), (16.31483, 1), (32.63464, 1), (-3.79736, 1), (19.17984, 1), (-0.27705, 1), (-3.69456, 1), (28.38058, 1), (-1.36876, 1), (-25.63301, 1), (3.58644, 1), (-6.85667, 1), (13.42225, 1), (12.04671, 1), (28.99468, 1), (7.87662, 1), (2.61119, 1), (-3.56022, 1), (1.50022, 1), (14.55836, 1), (9.35831, 1), (16.9366, 1), (29.23126, 1), (15.31386, 1), (13.46112, 1), (7.39667, 1), (11.15599, 1), (9.80499, 1), (22.64923, 1), (8.67693, 1), (18.67335, 1), (-3.19127, 1), (22.94716, 1), (17.86834, 1), (16.98267, 1), (15.91653, 1), (11.79718, 1), (18.50208, 1), (8.90755, 1), (10.44843, 1), (4.67433, 1), (6.82287, 1), (10.82228, 1), (-4.18631, 1), (20.3872, 1), (11.84735, 1), (21.25376, 1), (10.55032, 1), (12.19023, 1), (0.63369, 1), (7.92381, 1), (17.90933, 1), (15.30781, 1), (10.01877, 1), (0.88744, 1), (22.20967, 1), (-4.23117, 1), (21.50819, 1), (11.27421, 1), (-16.23179, 1), (33.43085, 1), (5.15093, 1), (1.34505, 1), (6.027, 1), (-10.43035, 1), (27.45998, 1), (19.24886, 1), (-4.44761, 1), (5.453, 1), (12.73758, 1), (11.2897, 1), (31.032, 1), (7.39168, 1), (11.95245, 1), (26.279, 1), (-1.0255, 1), (10.36675, 1), (11.58439, 1), (27.8405, 1), (13.1707, 1), (31.39133, 1), (27.08301, 1), (-2.14368, 1), (4.08476, 1), (21.5573, 1), (16.69822, 1), (7.69955, 1), (8.32793, 1), (6.49235, 1), (-7.3284, 1), (10.58264, 1), (-6.17006, 1), (34.55782, 1), (10.93221, 1), (44.24299, 1), (14.6224, 1), (-7.42798, 1), (15.52351, 1), (11.33982, 1), (10.46716, 1), (13.0986, 1), (-4.25988, 1), (9.55316, 1), (0.75489, 1), (25.99212, 1), (-0.81401, 1), (3.49551, 1), (22.99402, 1), (10.99628, 1), (23.70223, 1), (2.71482, 1), (22.82309, 1), (31.25686, 1), (4.86318, 1), (-1.06476, 1), (15.10298, 1), (-0.61015, 1), (17.81246, 1), (-1.55788, 1), (18.09709, 1), (9.11271, 1), (9.94682, 1), (-7.33194, 1), (-4.67293, 1), (21.81717, 1), (7.16318, 1), (13.25649, 1), (13.88776, 1), (4.95793, 1), (17.65303, 1), (14.47382, 1), (13.19373, 1), (31.86093, 1), (5.73161, 1), (10.96492, 1), (6.97951, 1), (1.75136, 1), (10.96144, 1), (15.08137, 1), (9.95311, 1), (7.07729, 1), (3.08148, 1), (22.37954, 1), (8.51951, 1), (2.88746, 1), (26.73509, 1), (-2.88939, 1), (-2.82367, 1), (-0.35783, 1), (14.22076, 1), (11.50295, 1), (7.10171, 1), (8.28488, 1), (0.54178, 1), (13.8022, 1), (15.62157, 1), (10.79173, 1), (28.18946, 1), (30.43524, 1), (2.54914, 1), (9.89421, 1), (13.08631, 1), (4.68761, 1), (5.61516, 1), (22.88072, 1), (7.4735, 1), (11.27382, 1), (2.39559, 1), (-3.31889, 1), (9.61957, 1), (23.01381, 1), (-1.23467, 1), (9.07691, 1), (15.78056, 1), (12.28421, 1), (9.44888, 1), (13.16928, 1), (4.33357, 1), (2.21737, 1), (33.17833, 1), (13.25407, 1), (-2.47961, 1), (6.41401, 1), (18.8439, 1), (-4.63375, 1), (-8.2909, 1), (12.18221, 1), (-2.95356, 1), (19.61659, 1), (12.45056, 1), (-4.17198, 1), (21.9641, 1), (11.96416, 1), (12.74573, 1), (10.47873, 1), (12.73295, 1), (11.31373, 1), (9.9827, 1), (5.87138, 1), (4.24372, 1), (-23.72256, 1), (28.41337, 1), (4.88103, 1), (3.61902, 1), (8.93586, 1), (16.40759, 1), (27.84494, 1), (5.6001, 1), (14.51379, 1), (13.5576, 1), (12.92213, 1), (3.90686, 1), (17.07104, 1), (15.84268, 1), (17.38777, 1), (16.54766, 1), (5.94487, 1), (17.02804, 1), (7.66386, 1), (10.43088, 1), (6.16059, 1), (20.46178, 1), (20.02888, 1), (20.95949, 1), (6.50808, 1), (7.22366, 1), (8.06659, 1), (16.08241, 1), (13.83514, 1), (-0.33454, 1), (12.98848, 1), (12.99024, 1);
+
+SELECT 
+roundBankers(kolmogorovSmirnovTest(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','auto')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less','auto')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater','auto')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','exact')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less','exact')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater','exact')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','asymp')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less','asymp')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater','asymp')(left, right).2, 6) ,
+roundBankers(kolmogorovSmirnovTest(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','auto')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less','auto')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater','auto')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','exact')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less','exact')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater','exact')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','asymp')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less','asymp')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater','asymp')(left, right).1, 6) 
+from kstest;
+
+DROP TABLE IF EXISTS kstest;
+
+
+CREATE TABLE kstest (left Float64, right Float64) ENGINE = Memory;
+
+INSERT INTO kstest VALUES (4.82025, 0), (6.13896, 0), (15.20277, 0), (14.15351, 0), (7.21338, 0), (8.55506, 0), (13.80816, 0), (11.28411, 0), (7.4612, 0), (7.43759, 0), (12.9832, 0), (-5.74783, 0), (12.47114, 0), (15.14223, 0), (3.40603, 0), (9.27323, 0), (7.88547, 0), (8.56456, 0), (4.59731, 0), (7.91213, 0), (7.33894, 0), (21.74811, 0), (11.92111, 0), (0.18828, 0), (10.47314, 0), (20.37396, 0), (11.04991, 0), (13.30083, 0), (14.28065, 0), (2.86942, 0), (24.96072, 0), (14.20164, 0), (18.28769, 0), (10.50949, 0), (9.22273, 0), (11.77608, 0), (8.56872, 0), (13.74535, 0), (11.65209, 0), (12.51894, 0), (17.76256, 0), (13.52122, 0), (8.70796, 0), (6.04749, 0), (16.33064, 0), (8.35636, 0), (14.03496, 0), (11.05834, 0), (14.49261, 0), (2.59383, 0), (8.01022, 0), (4.05458, 0), (13.26384, 0), (14.62058, 0), (10.52489, 0), (8.46357, 0), (6.4147, 0), (9.70071, 0), (12.47581, 0), (4.38333, 0), (17.54172, 0), (10.12109, 0), (7.73186, 0), (14.0279, 0), (11.6621, 0), (17.47045, 0), (15.50223, 0), (15.46034, 0), (13.39964, 0), (14.98025, 0), (15.87912, 0), (17.67374, 0), (9.64073, 0), (12.84904, 0), (7.70278, 0), (13.03156, 0), (9.04512, 0), (15.97014, 0), (8.96389, 0), (11.48009, 0), (9.71153, 0), (13.00084, 0), (12.39803, 0), (13.08188, 0), (5.82244, 0), (10.81871, 0), (8.2539, 0), (7.52114, 0), (9.11488, 0), (8.37482, 0), (14.48652, 0), (11.42152, 0), (16.03111, 0), (13.14057, 0), (-2.26351, 0), (15.50394, 0), (14.88603, 0), (13.37257, 0), (11.84026, 0), (7.66558, 0), (6.24584, 0), (3.6312, 0), (2.7018, 0), (5.63656, 0), (5.82643, 0), (10.06745, 0), (-0.5831, 0), (14.84202, 0), (9.5524, 0), (19.71713, 0), (14.23109, 0), (8.69105, 0), (5.33742, 0), (7.30372, 0), (7.93342, 0), (15.20884, 0), (7.53839, 0), (13.45311, 0), (11.04473, 0), (10.76673, 0), (15.44145, 0), (14.06596, 0), (9.14873, 0), (12.88372, 0), (8.74994, 0), (10.53263, 0), (16.16694, 0), (8.37197, 0), (3.43739, 0), (4.72799, 0), (9.08802, 0), (11.2531, 0), (5.16115, 0), (10.20895, 0), (18.70884, 0), (15.88924, 0), (3.38758, 0), (6.46449, 0), (10.21088, 0), (14.08458, 0), (15.74508, 0), (19.31896, 0), (13.19641, 0), (11.95409, 0), (10.70718, 0), (1.05245, 0), (10.04772, 0), (17.01369, 0), (10.2286, 0), (19.58323, 0), (7.02892, 0), (4.16866, 0), (8.94326, 0), (4.99854, 0), (8.88352, 0), (18.65422, 0), (17.32328, 0), (9.33492, 0), (14.94788, 0), (8.05863, 0), (14.6737, 0), (10.93801, 0), (0.54036, 0), (-0.34242, 0), (5.89076, 0), (3.15189, 0), (1.94421, 0), (6.38698, 0), (10.50654, 0), (8.95362, 0), (6.23711, 0), (11.75359, 0), (12.42155, 0), (-1.55472, 0), (4.6688, 0), (10.48087, 0), (11.74615, 0), (9.26822, 0), (7.55517, 0), (12.76005, 0), (16.47102, 0), (11.31297, 0), (14.37437, 0), (2.38799, 0), (6.44577, 0), (5.07471, 0), (11.55123, 0), (7.76795, 0), (10.60116, 0), (14.40885, 0), (11.58158, 0), (8.81648, 0), (12.92299, 0), (11.26939, 0), (17.95014, 0), (2.95002, 0), (17.41959, 0), (11.12455, 0), (8.78541, 0), (14.36413, 0), (12.98554, 0), (12.58505, 0), (15.49789, 0), (11.70999, 0), (0.65596, 0), (11.08202, 0), (14.75752, 0), (6.84385, 0), (9.27245, 0), (13.78243, 0), (17.4863, 0), (4.01777, 0), (11.82861, 0), (13.86551, 0), (6.16591, 0), (8.71589, 0), (16.77195, 0), (17.23243, 0), (-2.12941, 0), (5.66629, 0), (12.45153, 0), (1.63971, 0), (13.84031, 0), (4.6144, 0), (5.26169, 0), (9.27769, 0), (9.14288, 0), (9.71953, 0), (9.38446, 0), (1.64788, 0), (11.72922, 0), (13.68926, 0), (9.42952, 0), (12.05574, 0), (9.09148, 0), (5.32273, 0), (20.25258, 0), (10.14599, 0), (10.82156, 0), (5.75736, 0), (7.13567, 0), (9.29746, 0), (5.1618, 0), (10.076, 0), (21.65669, 0), (13.35486, 0), (6.79957, 0), (8.76243, 0), (14.59294, 0), (16.90609, 0), (10.50337, 0), (-0.07923, 0), (13.51648, 0), (12.0676, 0), (0.86482, 0), (9.03563, 0), (5.38751, 0), (17.16866, 0), (2.78702, 0), (11.15548, 0), (12.30843, 0), (8.04897, 0), (9.95814, 0), (11.29308, 0), (14.13032, 0), (21.05877, 0), (3.57386, 0), (7.96631, 0), (3.30484, 0), (18.61856, 0), (16.35184, 0), (7.65236, 0), (18.02895, 0), (9.79458, 0), (16.7274, 0), (8.84453, 0), (13.05709, 0), (10.91447, 0), (8.40171, 0), (16.95211, 0), (11.82194, 0), (19.87978, 0), (12.88455, 0), (-0.00947, 0), (12.28109, 0), (6.96462, 0), (13.75282, 0), (14.39141, 0), (11.07193, 0), (12.88039, 0), (11.38253, 0), (21.02707, 0), (7.51955, 0), (6.31984, 0), (15.6543, 0), (14.80315, 0), (8.38024, 0), (21.7516, 0), (14.31336, 0), (15.04703, 0), (5.73787, 0), (13.16911, 0), (12.40695, 0), (9.88968, 0), (8.46703, 0), (8.70637, 0), (8.03551, 0), (5.9757, 0), (12.22951, 0), (3.14736, 0), (10.51266, 0), (18.593, 0), (10.82213, 0), (7.14216, 0), (6.81154, 0), (-0.6486, 0), (20.56136, 0), (11.35367, 0), (11.38205, 0), (17.14, 0), (14.91215, 0), (15.50207, 0), (5.93162, 0), (3.74869, 0), (14.11532, 0), (7.38954, 0), (5.45764, 0), (18.33733, 0), (9.91923, 0), (2.38991, 0), (14.16756, 0), (2.39791, 0), (6.92586, 0), (5.32474, 0), (2.28812, 0), (5.71718, 0), (5.84197, 0), (2.76206, 0), (19.05928, 0), (11.51788, 0), (6.56648, 0), (3.35735, 0), (7.55948, 0), (19.99908, 0), (13.00634, 0), (18.36886, 0), (11.14675, 0), (16.72931, 0), (12.50106, 0), (6.00605, 0), (23.06653, 0), (5.39694, 0), (9.53167, 0), (12.76944, 0), (7.20604, 0), (13.25391, 0), (13.7341, 0), (10.85292, 0), (-7.75835, 0), (10.29728, 0), (13.70099, 0), (10.17959, 0), (9.98399, 0), (12.69389, 0), (-0.28848, 0), (-2.18319, 0), (13.36378, 0), (10.09232, 0), (5.49489, 0), (5.46156, 0), (0.94225, 0), (12.79205, 0), (10.09593, 0), (6.06218, 0), (0.89463, 0), (11.88986, 0), (10.79733, 0), (1.51371, 0), (2.20967, 0), (15.45732, 0), (16.5262, 0), (5.99724, 0), (8.3613, 0), (15.68183, 0), (15.32117, 0), (14.15674, 0), (6.64553, 0), (4.20777, 0), (-0.10521, 0), (-0.88169, 0), (1.85913, 0), (9.73673, 0), (0.30926, 0), (6.17559, 0), (11.76602, 0), (5.68385, 0), (14.57088, 0), (12.81509, 0), (9.85682, 0), (12.06376, 0), (6.08874, 0), (11.63921, 0), (14.86722, 0), (10.41035, 0), (2.93794, 0), (12.21841, 0), (0.23804, 0), (3.14845, 0), (7.29748, 0), (3.06134, 0), (13.77684, 0), (16.21992, 0), (5.33511, 0), (9.68959, 0), (9.44169, 0), (18.08012, 0), (4.04224, 0), (8.77918, 0), (10.18324, 0), (9.38914, 0), (11.76995, 0), (14.19963, 0), (6.88817, 0), (16.56123, 0), (15.39885, 0), (5.21241, 0), (4.44408, 0), (17.87587, 0), (12.53337, 0), (13.60916, 0), (6.60104, 0), (7.35453, 0), (18.61572, 0), (6.10437, 0), (13.08682, 0), (12.15404, 0), (4.90789, 0), (2.13353, 0), (12.49593, 0), (11.93056, 0), (13.29408, 0), (5.70038, 0), (8.40271, 0), (5.19456, 0), (-5.51028, 0), (14.0329, 0), (10.38365, 0), (6.56812, 0), (4.21129, 0), (9.7157, 0), (9.88553, 0), (13.45346, 0), (4.97752, 0), (12.77595, 0), (8.56465, 0), (4.27703, 0), (18.12502, 0), (12.45735, 0), (12.42912, 0), (12.08125, 0), (10.85779, 0), (4.36013, 0), (11.85062, 0), (8.47776, 0), (9.60822, 0), (11.3069, 0), (14.25525, 0), (1.55168, 0), (14.57782, 0), (7.84786, 0), (9.87774, 0), (14.75575, 0), (3.68774, 0), (9.37667, 0), (20.28676, 0), (12.10027, 0), (8.01819, 0), (18.78158, 0), (20.85402, 0), (18.98069, 0), (16.1429, 0), (9.24047, 0), (14.12487, 0), (10.18841, 0), (-3.04478, 0), (5.7552, 0), (9.30376, 0), (11.42837, 0), (6.02364, 0), (8.86984, 0), (10.91177, 0), (10.04418, 0), (18.10774, 0), (7.49384, 0), (9.11556, 0), (9.7051, 0), (5.23268, 0), (9.04647, 0), (8.81547, 0), (2.65098, 0), (-2.69857, 1), (15.80943, 1), (7.31555, 1), (3.96517, 1), (4.77809, 1), (9.6472, 1), (-26.41717, 1), (-10.85635, 1), (-1.4376, 1), (-0.96308, 1), (2.84315, 1), (5.79467, 1), (-3.06091, 1), (-14.62902, 1), (22.08022, 1), (-2.11982, 1), (-4.84824, 1), (-10.50447, 1), (2.4891, 1), (9.90324, 1), (-22.66866, 1), (-0.97103, 1), (-16.57608, 1), (-3.78749, 1), (25.84511, 1), (5.30797, 1), (-18.19466, 1), (11.72708, 1), (0.2891, 1), (-9.83474, 1), (6.69942, 1), (18.09604, 1), (18.52651, 1), (1.38201, 1), (7.64615, 1), (17.66598, 1), (-2.44141, 1), (-9.01598, 1), (27.69142, 1), (4.06946, 1), (-15.0077, 1), (-10.49648, 1), (-4.88322, 1), (-25.09805, 1), (-4.64024, 1), (20.94434, 1), (24.12126, 1), (-14.10962, 1), (10.6512, 1), (14.50687, 1), (-19.88081, 1), (-11.55271, 1), (13.16921, 1), (16.63864, 1), (-24.08114, 1), (-9.09949, 1), (-10.54702, 1), (0.20813, 1), (8.19066, 1), (-2.70523, 1), (-0.23954, 1), (7.19398, 1), (-7.1618, 1), (-7.44322, 1), (-17.92031, 1), (-1.58146, 1), (9.18338, 1), (3.25838, 1), (-14.30234, 1), (1.84695, 1), (31.13794, 1), (-0.85067, 1), (19.02787, 1), (-3.09594, 1), (13.45584, 1), (-5.48104, 1), (-22.74928, 1), (-8.03697, 1), (17.31143, 1), (-16.65231, 1), (-18.58713, 1), (-16.52641, 1), (14.95261, 1), (12.56762, 1), (15.00188, 1), (1.85858, 1), (2.1926, 1), (-2.4095, 1), (21.56873, 1), (3.35509, 1), (-4.98672, 1), (35.08603, 1), (-10.01602, 1), (-3.85153, 1), (-6.81974, 1), (19.56525, 1), (-9.35488, 1), (0.24268, 1), (-3.51488, 1), (-0.37066, 1), (24.20888, 1), (-11.73537, 1), (0.01282, 1), (0.03963, 1), (-9.65589, 1), (-0.37429, 1), (5.61255, 1), (0.49984, 1), (-10.15066, 1), (-14.54314, 1), (16.56889, 1), (-7.73873, 1), (-3.76422, 1), (1.40722, 1), (2.28818, 1), (-13.12643, 1), (5.17082, 1), (4.79089, 1), (-17.42643, 1), (8.72548, 1), (-3.70285, 1), (16.77893, 1), (13.382, 1), (19.98418, 1), (0.00483, 1), (-4.75951, 1), (2.35391, 1), (21.65809, 1), (-9.2714, 1), (-18.38253, 1), (7.23097, 1), (14.97927, 1), (-4.02197, 1), (-29.8189, 1), (-12.8554, 1), (-7.60124, 1), (-14.90158, 1), (-3.31486, 1), (31.38144, 1), (-8.61288, 1), (15.31895, 1), (-10.19488, 1), (13.796, 1), (-0.32912, 1), (-0.0684, 1), (-30.06834, 1), (24.93912, 1), (-3.26506, 1), (-8.29751, 1), (-5.39189, 1), (-25.08603, 1), (-1.45318, 1), (16.72724, 1), (-3.38467, 1), (-26.00478, 1), (7.28369, 1), (16.96226, 1), (16.5858, 1), (10.46583, 1), (3.84345, 1), (-2.99382, 1), (1.42078, 1), (-11.0123, 1), (2.09909, 1), (1.21064, 1), (15.36079, 1), (-21.61349, 1), (22.7726, 1), (10.50512, 1), (-6.95825, 1), (9.20036, 1), (15.66902, 1), (3.28098, 1), (-9.05692, 1), (0.32882, 1), (-1.64934, 1), (-4.81406, 1), (-5.06006, 1), (19.97493, 1), (2.88646, 1), (-0.34552, 1), (7.55186, 1), (-22.96115, 1), (31.29166, 1), (6.18798, 1), (-2.52715, 1), (-11.58799, 1), (14.13596, 1), (13.45069, 1), (12.15179, 1), (3.44491, 1), (-8.78006, 1), (18.32087, 1), (11.91757, 1), (-2.00179, 1), (10.88411, 1), (9.09327, 1), (6.62484, 1), (8.87178, 1), (11.52254, 1), (-14.15988, 1), (-17.19515, 1), (14.03089, 1), (-2.4095, 1), (-16.83575, 1), (2.71469, 1), (4.84351, 1), (-1.17651, 1), (-3.37529, 1), (-19.92137, 1), (4.48952, 1), (-12.4906, 1), (-5.65277, 1), (8.50819, 1), (-19.61261, 1), (12.54156, 1), (11.06784, 1), (-12.59285, 1), (3.43683, 1), (-3.00325, 1), (12.49082, 1), (7.20955, 1), (17.6547, 1), (15.8619, 1), (24.3048, 1), (-8.05434, 1), (-6.06901, 1), (-15.69515, 1), (-11.13917, 1), (-3.90757, 1), (-2.57038, 1), (5.14065, 1), (17.8497, 1), (-8.64665, 1), (-18.68331, 1), (5.8567, 1), (-20.93884, 1), (4.40583, 1), (14.35985, 1), (4.18134, 1), (4.3635, 1), (9.35428, 1), (2.8908, 1), (16.01017, 1), (-1.48499, 1), (-9.97949, 1), (1.03055, 1), (-2.79697, 1), (6.85977, 1), (4.73213, 1), (2.7815, 1), (-2.46866, 1), (18.39425, 1), (-0.80378, 1), (-0.22982, 1), (-16.11608, 1), (3.0862, 1), (3.20779, 1), (10.50146, 1), (-0.21305, 1), (11.21012, 1), (-0.99825, 1), (18.39633, 1), (-3.39003, 1), (-0.64411, 1), (-1.39932, 1), (15.45319, 1), (-0.66044, 1), (-15.2223, 1), (-34.39907, 1), (-3.57836, 1), (16.82828, 1), (1.66624, 1), (15.43475, 1), (8.17776, 1), (5.50486, 1), (10.43082, 1), (-6.63332, 1), (2.28008, 1), (16.37203, 1), (5.16313, 1), (-8.85281, 1), (13.26692, 1), (-7.46842, 1), (8.43091, 1), (-13.18172, 1), (-0.72401, 1), (22.3881, 1), (10.65448, 1), (2.81289, 1), (10.92405, 1), (-8.95358, 1), (19.80653, 1), (-12.86527, 1), (5.38826, 1), (-6.83501, 1), (-15.7647, 1), (-27.67412, 1), (8.6499, 1), (-4.89542, 1), (16.76167, 1), (12.84284, 1), (-17.27324, 1), (-4.18726, 1), (-14.62366, 1), (-5.49863, 1), (-16.22846, 1), (10.60329, 1), (6.46781, 1), (1.70458, 1), (10.77448, 1), (0.8463, 1), (13.0482, 1), (-4.36264, 1), (3.22647, 1), (2.38828, 1), (6.7946, 1), (-0.25254, 1), (1.2497, 1), (1.6544, 1), (4.1019, 1), (11.27839, 1), (-5.04127, 1), (18.11674, 1), (0.51231, 1), (-0.51029, 1), (13.52556, 1), (16.10171, 1), (5.68197, 1), (-2.85904, 1), (-8.89167, 1), (6.24489, 1), (10.85319, 1), (-0.39816, 1), (3.87079, 1), (-3.1867, 1), (1.55322, 1), (16.86779, 1), (-14.60321, 1), (-1.81952, 1), (-3.11624, 1), (1.24193, 1), (10.18179, 1), (4.69796, 1), (0.69032, 1), (11.7723, 1), (7.62896, 1), (9.89741, 1), (9.11484, 1), (-3.84676, 1), (-0.4777, 1), (0.95958, 1), (-7.95056, 1), (-10.97474, 1), (-6.54861, 1), (34.74933, 1), (27.39463, 1), (4.18299, 1), (6.02476, 1), (-1.99397, 1), (1.26478, 1), (23.37106, 1), (10.49682, 1), (-11.04354, 1), (-12.22284, 1), (-9.87635, 1), (28.90511, 1), (6.77613, 1), (0.55352, 1), (0.37031, 1), (7.1418, 1), (3.24897, 1), (-1.60918, 1), (3.1675, 1), (-17.97072, 1), (-5.61743, 1), (14.1422, 1), (14.87695, 1), (-4.65961, 1), (-0.99174, 1), (-2.96623, 1), (-9.02263, 1), (-17.2088, 1), (2.78608, 1), (6.74239, 1), (4.8524, 1), (7.46731, 1), (1.04894, 1), (-12.8023, 1), (-17.18188, 1), (-5.08801, 1), (22.13942, 1), (-0.36384, 1), (17.80564, 1), (7.67504, 1), (1.59779, 1), (4.10942, 1), (0.61074, 1), (-14.40767, 1), (10.59906, 1), (16.57017, 1), (-15.17526, 1), (-6.98549, 1), (-0.64548, 1), (3.23756, 1), (14.65504, 1), (4.583, 1), (12.72378, 1), (5.26547, 1), (0.81781, 1), (9.38273, 1), (10.37636, 1), (10.70325, 1), (-0.83043, 1), (-7.53149, 1), (-9.09147, 1), (-19.51381, 1), (-28.44508, 1), (6.44392, 1), (11.10201, 1), (-2.86184, 1), (8.30673, 1), (8.8797, 1), (10.68053, 1), (15.62919, 1), (8.00579, 1), (6.4651, 1), (-4.50029, 1), (18.04514, 1), (11.12996, 1), (-5.14007, 1), (9.43857, 1), (3.13476, 1), (4.9772, 1), (-17.45782, 1), (0.05552, 1), (-1.90283, 1), (2.67908, 1), (-2.62243, 1), (-3.22767, 1), (-8.70222, 1), (-23.11605, 1), (21.6757, 1), (12.70076, 1), (4.4322, 1), (11.69344, 1), (9.18052, 1), (-2.2549, 1), (-2.15615, 1), (20.29765, 1), (-0.29536, 1), (15.50109, 1), (8.79187, 1), (5.11533, 1), (-20.44436, 1), (-3.00909, 1), (-4.48291, 1), (21.84462, 1), (1.94225, 1), (-2.81908, 1), (17.19418, 1), (-9.33528, 1), (-0.17346, 1), (0.03958, 1), (-35.17786, 1), (8.36887, 1), (-9.02292, 1), (-10.98804, 1), (0.29335, 1), (4.29634, 1), (3.87718, 1), (-9.08532, 1), (7.13922, 1), (-7.62463, 1), (-10.5666, 1), (4.68165, 1), (-3.30172, 1), (13.04852, 1), (13.45616, 1), (2.41043, 1), (-0.36501, 1), (-15.67383, 1), (17.92217, 1), (8.42106, 1), (3.22063, 1), (-7.31753, 1), (21.99596, 1), (-36.8273, 1), (-20.46391, 1), (5.74179, 1), (-15.83178, 1), (14.90454, 1), (-8.84645, 1), (3.72036, 1), (4.6877, 1), (16.35418, 1), (3.15441, 1), (2.39907, 1), (-17.58664, 1), (-13.18269, 1);
+
+SELECT 
+roundBankers(kolmogorovSmirnovTest(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','auto')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less','auto')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater','auto')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','exact')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less','exact')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater','exact')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','asymp')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('less','asymp')(left, right).2, 6),
+roundBankers(kolmogorovSmirnovTest('greater','asymp')(left, right).2, 6) ,
+roundBankers(kolmogorovSmirnovTest(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','auto')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less','auto')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater','auto')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','exact')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less','exact')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater','exact')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('two-sided','asymp')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('less','asymp')(left, right).1, 6),
+roundBankers(kolmogorovSmirnovTest('greater','asymp')(left, right).1, 6) 
+from kstest;
+
+DROP TABLE IF EXISTS kstest;
diff --git a/tests/queries/0_stateless/02706_kolmogorov_smirnov_test_scipy.python b/tests/queries/0_stateless/02706_kolmogorov_smirnov_test_scipy.python
new file mode 100644
index 00000000000..01f245e0cf0
--- /dev/null
+++ b/tests/queries/0_stateless/02706_kolmogorov_smirnov_test_scipy.python
@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+import os
+import sys
+from scipy import stats
+import pandas as pd
+import numpy as np
+
+CURDIR = os.path.dirname(os.path.realpath(__file__))
+sys.path.insert(0, os.path.join(CURDIR, "helpers"))
+
+from pure_http_client import ClickHouseClient
+
+
+def test_and_check(name, a, b, t_stat, p_value, precision=1e-2):
+    client = ClickHouseClient()
+    client.query("DROP TABLE IF EXISTS ks_test;")
+    client.query("CREATE TABLE ks_test (left Float64, right UInt8) ENGINE = Memory;")
+    client.query(
+        "INSERT INTO ks_test VALUES {};".format(
+            ", ".join(["({},{})".format(i, 0) for i in a])
+        )
+    )
+    client.query(
+        "INSERT INTO ks_test VALUES {};".format(
+            ", ".join(["({},{})".format(j, 1) for j in b])
+        )
+    )
+    real = client.query_return_df(
+        "SELECT roundBankers({}(left, right).1, 16) as t_stat, ".format(name)
+        + "roundBankers({}(left, right).2, 16) as p_value ".format(name)
+        + "FROM ks_test FORMAT TabSeparatedWithNames;"
+    )
+    real_t_stat = real["t_stat"][0]
+    real_p_value = real["p_value"][0]
+    assert (
+        abs(real_t_stat - np.float64(t_stat)) < precision
+    ), "clickhouse_t_stat {}, scipy_t_stat {}".format(real_t_stat, t_stat)
+    assert (
+        abs(real_p_value - np.float64(p_value)) < precision
+    ), "clickhouse_p_value {}, scipy_p_value {}".format(real_p_value, p_value)
+    client.query("DROP TABLE IF EXISTS ks_test;")
+
+
+def test_ks_all_alternatives(rvs1, rvs2):
+    s, p = stats.ks_2samp(rvs1, rvs2)
+    test_and_check("kolmogorovSmirnovTest", rvs1, rvs2, s, p)
+
+    s, p = stats.ks_2samp(rvs1, rvs2, alternative="two-sided")
+    test_and_check("kolmogorovSmirnovTest('two-sided')", rvs1, rvs2, s, p)
+
+    s, p = stats.ks_2samp(rvs1, rvs2, alternative="greater", method="auto")
+    test_and_check("kolmogorovSmirnovTest('greater', 'auto')", rvs1, rvs2, s, p)
+
+    s, p = stats.ks_2samp(rvs1, rvs2, alternative="less", method="exact")
+    test_and_check("kolmogorovSmirnovTest('less', 'exact')", rvs1, rvs2, s, p)
+
+    if max(len(rvs1), len(rvs2)) > 10000:
+        s, p = stats.ks_2samp(rvs1, rvs2, alternative="two-sided", method="asymp")
+        test_and_check("kolmogorovSmirnovTest('two-sided', 'asymp')", rvs1, rvs2, s, p)
+        s, p = stats.ks_2samp(rvs1, rvs2, alternative="greater", method="asymp")
+        test_and_check("kolmogorovSmirnovTest('greater', 'asymp')", rvs1, rvs2, s, p)
+
+
+def test_kolmogorov_smirnov():
+    rvs1 = np.round(stats.norm.rvs(loc=1, scale=5, size=100), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=1.5, scale=5, size=200), 2)
+    test_ks_all_alternatives(rvs1, rvs2)
+
+    rvs1 = np.round(stats.norm.rvs(loc=13, scale=1, size=100), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=1.52, scale=9, size=100), 2)
+    test_ks_all_alternatives(rvs1, rvs2)
+
+    rvs1 = np.round(stats.norm.rvs(loc=1, scale=5, size=100), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=11.5, scale=50, size=1000), 2)
+    test_ks_all_alternatives(rvs1, rvs2)
+
+    rvs1 = np.round(stats.norm.rvs(loc=1, scale=5, size=11000), 2)
+    rvs2 = np.round(stats.norm.rvs(loc=3.5, scale=5.5, size=11000), 2)
+    test_ks_all_alternatives(rvs1, rvs2)
+
+
+if __name__ == "__main__":
+    test_kolmogorov_smirnov()
+    print("Ok.")
diff --git a/tests/queries/0_stateless/02706_kolmogorov_smirnov_test_scipy.reference b/tests/queries/0_stateless/02706_kolmogorov_smirnov_test_scipy.reference
new file mode 100644
index 00000000000..587579af915
--- /dev/null
+++ b/tests/queries/0_stateless/02706_kolmogorov_smirnov_test_scipy.reference
@@ -0,0 +1 @@
+Ok.
diff --git a/tests/queries/0_stateless/02706_kolmogorov_smirnov_test_scipy.sh b/tests/queries/0_stateless/02706_kolmogorov_smirnov_test_scipy.sh
new file mode 100755
index 00000000000..674495bbefa
--- /dev/null
+++ b/tests/queries/0_stateless/02706_kolmogorov_smirnov_test_scipy.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# We should have correct env vars from shell_config.sh to run this test
+
+python3 "$CURDIR"/02706_kolmogorov_smirnov_test_scipy.python
diff --git a/tests/queries/0_stateless/02706_show_columns.reference b/tests/queries/0_stateless/02706_show_columns.reference
new file mode 100644
index 00000000000..9d7e8485e19
--- /dev/null
+++ b/tests/queries/0_stateless/02706_show_columns.reference
@@ -0,0 +1,47 @@
+--- Aliases of SHOW COLUMNS
+int32	Nullable(Int32)	1		\N	
+str	String	0	SOR	\N	
+uint64	UInt64	0	PRI SOR	\N	
+int32	Nullable(Int32)	1		\N	
+str	String	0	SOR	\N	
+uint64	UInt64	0	PRI SOR	\N	
+--- EXTENDED
+int32	Nullable(Int32)	1		\N	
+str	String	0	SOR	\N	
+uint64	UInt64	0	PRI SOR	\N	
+--- FULL
+int32	Nullable(Int32)	1		\N		\N	example comment	
+str	String	0	SOR	\N		\N		
+uint64	UInt64	0	PRI SOR	\N		\N		
+--- LIKE
+int32	Nullable(Int32)	1		\N	
+uint64	UInt64	0	PRI SOR	\N	
+--- NOT LIKE
+str	String	0	SOR	\N	
+--- ILIKE
+int32	Nullable(Int32)	1		\N	
+uint64	UInt64	0	PRI SOR	\N	
+--- NOT ILIKE
+str	String	0	SOR	\N	
+--- WHERE
+int32	Nullable(Int32)	1		\N	
+uint64	UInt64	0	PRI SOR	\N	
+--- LIMIT
+int32	Nullable(Int32)	1		\N	
+--- Check with weird table names
+c	String	0	PRI SOR	\N	
+c	String	0	PRI SOR	\N	
+c	String	0	PRI SOR	\N	
+c	String	0	PRI SOR	\N	
+--- Original table
+int32	Nullable(Int32)	1		\N	
+str	String	0	SOR	\N	
+uint64	UInt64	0	PRI SOR	\N	
+--- Equally named table in other database
+int32	Int32	0		\N	
+str	String	0		\N	
+uint64	UInt64	0	PRI SOR	\N	
+--- Short form
+int32	Int32	0		\N	
+str	String	0		\N	
+uint64	UInt64	0	PRI SOR	\N	
diff --git a/tests/queries/0_stateless/02706_show_columns.sql b/tests/queries/0_stateless/02706_show_columns.sql
new file mode 100644
index 00000000000..b1a907c5c71
--- /dev/null
+++ b/tests/queries/0_stateless/02706_show_columns.sql
@@ -0,0 +1,92 @@
+-- Tags: no-parallel
+-- no-parallel: creates a custom database schema and expects to use it exclusively
+
+-- Create a test table and verify that the output of SHOW COLUMNS is sane.
+-- The matching of actual/expected results relies on the fact that the output of SHOW COLUMNS is sorted.
+DROP TABLE IF EXISTS tab;
+CREATE TABLE tab
+(
+    `uint64` UInt64,
+    `int32` Nullable(Int32) COMMENT 'example comment',
+    `str` String,
+    INDEX idx str TYPE set(1000)
+)
+ENGINE = MergeTree
+PRIMARY KEY (uint64)
+ORDER BY (uint64, str);
+
+SELECT '--- Aliases of SHOW COLUMNS';
+SHOW COLUMNS FROM tab;
+SHOW FIELDS FROM tab;
+
+SELECT '--- EXTENDED';
+SHOW EXTENDED COLUMNS FROM tab;
+
+SELECT '--- FULL';
+SHOW FULL COLUMNS FROM tab;
+
+SELECT '--- LIKE';
+SHOW COLUMNS FROM tab LIKE '%int%';
+
+SELECT '--- NOT LIKE';
+SHOW COLUMNS FROM tab NOT LIKE '%int%';
+
+SELECT '--- ILIKE';
+SHOW COLUMNS FROM tab ILIKE '%INT%';
+
+SELECT '--- NOT ILIKE';
+SHOW COLUMNS FROM tab NOT ILIKE '%INT%';
+
+SELECT '--- WHERE';
+SHOW COLUMNS FROM tab WHERE field LIKE '%int%';
+
+SELECT '--- LIMIT';
+SHOW COLUMNS FROM tab LIMIT 1;
+
+SELECT '--- Check with weird table names';
+
+DROP TABLE IF EXISTS `$4@^7`;
+CREATE TABLE `$4@^7` (c String) ENGINE = MergeTree ORDER BY c;
+SHOW COLUMNS FROM `$4@^7`;
+DROP TABLE `$4@^7`;
+
+DROP TABLE IF EXISTS NULL;
+CREATE TABLE NULL (c String) ENGINE = MergeTree ORDER BY c;
+SHOW COLUMNS FROM NULL;
+DROP TABLE NULL;
+
+DROP DATABASE IF EXISTS `'`;
+CREATE DATABASE `'`;
+CREATE TABLE `'`.`'` (c String) ENGINE = MergeTree ORDER BY c;
+SHOW COLUMNS FROM `'` FROM `'`;
+SHOW COLUMNS FROM `'`.`'`; -- abbreviated form
+DROP TABLE `'`.`'`;
+DROP DATABASE `'`;
+
+-- Create a table in a different database. Intentionally useing the same table/column names as above so
+-- we notice if something is buggy in the implementation of SHOW COLUMNS.
+DROP DATABASE IF EXISTS database_123456789abcde;
+CREATE DATABASE database_123456789abcde; -- pseudo-random database name
+
+DROP TABLE IF EXISTS database_123456789abcde.tab;
+CREATE TABLE database_123456789abcde.tab
+(
+    `uint64` UInt64,
+    `int32` Int32,
+    `str` String
+)
+ENGINE = MergeTree
+ORDER BY uint64;
+
+SELECT '--- Original table';
+SHOW COLUMNS FROM tab;
+
+SELECT '--- Equally named table in other database';
+SHOW COLUMNS FROM tab FROM database_123456789abcde;
+
+SELECT '--- Short form';
+SHOW COLUMNS FROM database_123456789abcde.tab;
+
+DROP DATABASE database_123456789abcde;
+
+DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02707_analyzer_nested_lambdas_types.reference b/tests/queries/0_stateless/02707_analyzer_nested_lambdas_types.reference
new file mode 100644
index 00000000000..9502c314200
--- /dev/null
+++ b/tests/queries/0_stateless/02707_analyzer_nested_lambdas_types.reference
@@ -0,0 +1,5 @@
+[0]	[[0]]
+[0]	[[0]]
+[0]	[[1]]
+[0]	[[1]]
+[0]	[[1]]
diff --git a/tests/queries/0_stateless/02707_analyzer_nested_lambdas_types.sql b/tests/queries/0_stateless/02707_analyzer_nested_lambdas_types.sql
new file mode 100644
index 00000000000..f9258d61900
--- /dev/null
+++ b/tests/queries/0_stateless/02707_analyzer_nested_lambdas_types.sql
@@ -0,0 +1,24 @@
+SELECT
+    range(1),
+    arrayMap(x -> arrayMap(x -> x, range(x)), [1])
+SETTINGS allow_experimental_analyzer = 0;
+
+SELECT
+    range(1),
+    arrayMap(x -> arrayMap(x -> x, range(x)), [1])
+SETTINGS allow_experimental_analyzer = 1;
+
+SELECT
+    range(1),
+    arrayMap(x -> arrayMap(x -> 1, range(x)), [1])
+SETTINGS allow_experimental_analyzer = 0;
+
+SELECT
+    range(1),
+    arrayMap(x -> arrayMap(x -> 1, range(x)), [1])
+SETTINGS allow_experimental_analyzer = 1;
+
+SELECT
+    range(1),
+    arrayMap(x -> arrayMap(y -> 1, range(x)), [1])
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/02707_keeper_map_delete_update_strict.reference b/tests/queries/0_stateless/02707_keeper_map_delete_update_strict.reference
new file mode 100644
index 00000000000..7ae6daf4b8d
--- /dev/null
+++ b/tests/queries/0_stateless/02707_keeper_map_delete_update_strict.reference
@@ -0,0 +1,32 @@
+1	Some string	0	0	0
+2	Some other string	0	0	0
+3	random	0	0	0
+4	random2	0	0	0
+-----------
+3	random	0	0
+4	random2	0	0
+-----------
+3	random	0	0
+-----------
+0
+-----------
+1	String	10	0
+2	String	20	0
+3	String	30	0
+4	String	40	0
+-----------
+1	String	10	0
+2	String	20	0
+3	Another	30	1
+4	Another	40	1
+-----------
+1	String	10	0
+2	String	20	0
+3	Another	30	1
+4	Another	40	1
+-----------
+1	String	102	1
+2	String	202	1
+3	Another	302	2
+4	Another	402	2
+-----------
diff --git a/tests/queries/0_stateless/02707_keeper_map_delete_update_strict.sql b/tests/queries/0_stateless/02707_keeper_map_delete_update_strict.sql
new file mode 100644
index 00000000000..cf59af2f388
--- /dev/null
+++ b/tests/queries/0_stateless/02707_keeper_map_delete_update_strict.sql
@@ -0,0 +1,44 @@
+-- Tags: no-ordinary-database, no-fasttest
+
+DROP TABLE IF EXISTS 02707_keepermap_delete_update;
+
+SET keeper_map_strict_mode = 1;
+
+CREATE TABLE 02707_keepermap_delete_update (key UInt64, value String, value2 UInt64) ENGINE=KeeperMap('/' ||  currentDatabase() || '/test02707_keepermap_delete_update') PRIMARY KEY(key);
+
+INSERT INTO 02707_keepermap_delete_update VALUES (1, 'Some string', 0), (2, 'Some other string', 0), (3, 'random', 0), (4, 'random2', 0);
+
+SELECT *, _version, _version FROM 02707_keepermap_delete_update ORDER BY key;
+SELECT '-----------';
+
+DELETE FROM 02707_keepermap_delete_update WHERE value LIKE 'Some%string';
+
+SELECT *, _version FROM 02707_keepermap_delete_update ORDER BY key;
+SELECT '-----------';
+
+ALTER TABLE 02707_keepermap_delete_update DELETE WHERE key >= 4;
+
+SELECT *, _version FROM 02707_keepermap_delete_update ORDER BY key;
+SELECT '-----------';
+
+DELETE FROM 02707_keepermap_delete_update WHERE 1 = 1;
+SELECT count() FROM 02707_keepermap_delete_update;
+SELECT '-----------';
+
+INSERT INTO 02707_keepermap_delete_update VALUES (1, 'String', 10), (2, 'String', 20), (3, 'String', 30), (4, 'String', 40);
+SELECT *, _version FROM 02707_keepermap_delete_update ORDER BY key;
+SELECT '-----------';
+
+ALTER TABLE 02707_keepermap_delete_update UPDATE value = 'Another' WHERE key > 2;
+SELECT *, _version FROM 02707_keepermap_delete_update ORDER BY key;
+SELECT '-----------';
+
+ALTER TABLE 02707_keepermap_delete_update UPDATE key = key * 10 WHERE 1 = 1; -- { serverError 36 }
+SELECT *, _version FROM 02707_keepermap_delete_update ORDER BY key;
+SELECT '-----------';
+
+ALTER TABLE 02707_keepermap_delete_update UPDATE value2 = value2 * 10 + 2 WHERE value2 < 100;
+SELECT *, _version FROM 02707_keepermap_delete_update ORDER BY key;
+SELECT '-----------';
+
+DROP TABLE IF EXISTS 02707_keepermap_delete_update;
diff --git a/tests/queries/0_stateless/02707_protobuf_unnamed_tuple_as_nested_message.reference b/tests/queries/0_stateless/02707_protobuf_unnamed_tuple_as_nested_message.reference
new file mode 100644
index 00000000000..a01aba9895b
--- /dev/null
+++ b/tests/queries/0_stateless/02707_protobuf_unnamed_tuple_as_nested_message.reference
@@ -0,0 +1 @@
+(42,'Hello',[1,2,3])
diff --git a/tests/queries/0_stateless/02707_protobuf_unnamed_tuple_as_nested_message.sh b/tests/queries/0_stateless/02707_protobuf_unnamed_tuple_as_nested_message.sh
new file mode 100755
index 00000000000..735117c6603
--- /dev/null
+++ b/tests/queries/0_stateless/02707_protobuf_unnamed_tuple_as_nested_message.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+SCHEMADIR=$CURDIR/format_schemas
+
+$CLICKHOUSE_LOCAL -q "select tuple(42, 'Hello', [1,2,3]) as x format Protobuf settings format_schema='$SCHEMADIR/02707_schema:Message'" | $CLICKHOUSE_LOCAL --input-format Protobuf --structure='x Tuple(UInt32, String, Array(UInt32))' -q "select * from table" --format_schema="$SCHEMADIR/02707_schema:Message"
+
diff --git a/tests/queries/0_stateless/02707_skip_index_with_in.reference b/tests/queries/0_stateless/02707_skip_index_with_in.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02707_skip_index_with_in.sql b/tests/queries/0_stateless/02707_skip_index_with_in.sql
new file mode 100644
index 00000000000..4767619cee1
--- /dev/null
+++ b/tests/queries/0_stateless/02707_skip_index_with_in.sql
@@ -0,0 +1,20 @@
+DROP TABLE IF EXISTS t_skip_index_in;
+
+CREATE TABLE t_skip_index_in
+(
+    a String,
+    b String,
+    c String,
+    INDEX idx_c c TYPE bloom_filter GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY (a, b);
+
+INSERT INTO t_skip_index_in VALUES ('a', 'b', 'c');
+
+-- This query checks that set is not being built if indexes are not used,
+-- because with EXPLAIN the set will be built only for analysis of indexes.
+EXPLAIN SELECT count() FROM t_skip_index_in WHERE c IN (SELECT throwIf(1)) SETTINGS use_skip_indexes = 0 FORMAT Null;
+EXPLAIN SELECT count() FROM t_skip_index_in WHERE c IN (SELECT throwIf(1)) SETTINGS use_skip_indexes = 1; -- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
+
+DROP TABLE t_skip_index_in;
diff --git a/tests/queries/0_stateless/02708_dot_product.reference b/tests/queries/0_stateless/02708_dot_product.reference
new file mode 100644
index 00000000000..45e53871aa2
--- /dev/null
+++ b/tests/queries/0_stateless/02708_dot_product.reference
@@ -0,0 +1,14 @@
+3881.304
+3881.304
+3881.304
+376.5
+230
+0
+0
+Float64
+Float32
+Float64
+Float64
+UInt16
+UInt64
+Int64
diff --git a/tests/queries/0_stateless/02708_dot_product.sql b/tests/queries/0_stateless/02708_dot_product.sql
new file mode 100644
index 00000000000..e94cb577bf4
--- /dev/null
+++ b/tests/queries/0_stateless/02708_dot_product.sql
@@ -0,0 +1,55 @@
+SELECT dotProduct([12, 2.22, 302], [1.32, 231.2, 11.1]);
+
+SELECT scalarProduct([12, 2.22, 302], [1.32, 231.2, 11.1]);
+
+SELECT arrayDotProduct([12, 2.22, 302], [1.32, 231.2, 11.1]);
+
+SELECT dotProduct([1.3, 2, 3, 4, 5], [222, 12, 5.3, 2, 8]);
+
+SELECT dotProduct([1, 1, 1, 1, 1], [222, 12, 0, -12, 8]);
+
+SELECT round(dotProduct([12345678901234567], [1]) - dotProduct(tuple(12345678901234567), tuple(1)), 2);
+
+SELECT round(dotProduct([-1, 2, 3.002], [2, 3.4, 4]) - dotProduct((-1, 2, 3.002), (2, 3.4, 4)), 2);
+
+DROP TABLE IF EXISTS product_fp64_fp64;
+CREATE TABLE product_fp64_fp64 (x Array(Float64), y Array(Float64)) engine = MergeTree() order by x;
+INSERT INTO TABLE product_fp64_fp64 (x, y) values ([1, 2], [3, 4]);
+SELECT toTypeName(dotProduct(x, y)) from product_fp64_fp64;
+DROP TABLE product_fp64_fp64;
+
+DROP TABLE IF EXISTS product_fp32_fp32;
+CREATE TABLE product_fp32_fp32 (x Array(Float32), y Array(Float32)) engine = MergeTree() order by x;
+INSERT INTO TABLE product_fp32_fp32 (x, y) values ([1, 2], [3, 4]);
+SELECT toTypeName(dotProduct(x, y)) from product_fp32_fp32;
+DROP TABLE product_fp32_fp32;
+
+DROP TABLE IF EXISTS product_fp32_fp64;
+CREATE TABLE product_fp32_fp64 (x Array(Float32), y Array(Float64)) engine = MergeTree() order by x;
+INSERT INTO TABLE product_fp32_fp64 (x, y) values ([1, 2], [3, 4]);
+SELECT toTypeName(dotProduct(x, y)) from product_fp32_fp64;
+DROP TABLE product_fp32_fp64;
+
+DROP TABLE IF EXISTS product_uint8_fp64;
+CREATE TABLE product_uint8_fp64 (x Array(UInt8), y Array(Float64)) engine = MergeTree() order by x;
+INSERT INTO TABLE product_uint8_fp64 (x, y) values ([1, 2], [3, 4]);
+SELECT toTypeName(dotProduct(x, y)) from product_uint8_fp64;
+DROP TABLE product_uint8_fp64;
+
+DROP TABLE IF EXISTS product_uint8_uint8;
+CREATE TABLE product_uint8_uint8 (x Array(UInt8), y Array(UInt8)) engine = MergeTree() order by x;
+INSERT INTO TABLE product_uint8_uint8 (x, y) values ([1, 2], [3, 4]);
+SELECT toTypeName(dotProduct(x, y)) from product_uint8_uint8;
+DROP TABLE product_uint8_uint8;
+
+DROP TABLE IF EXISTS product_uint64_uint64;
+CREATE TABLE product_uint64_uint64 (x Array(UInt64), y Array(UInt64)) engine = MergeTree() order by x;
+INSERT INTO TABLE product_uint64_uint64 (x, y) values ([1, 2], [3, 4]);
+SELECT toTypeName(dotProduct(x, y)) from product_uint64_uint64;
+DROP TABLE product_uint64_uint64;
+
+DROP TABLE IF EXISTS product_int32_uint64;
+CREATE TABLE product_int32_uint64 (x Array(Int32), y Array(UInt64)) engine = MergeTree() order by x;
+INSERT INTO TABLE product_int32_uint64 (x, y) values ([1, 2], [3, 4]);
+SELECT toTypeName(dotProduct(x, y)) from product_int32_uint64;
+DROP TABLE product_int32_uint64;
diff --git a/tests/queries/0_stateless/02708_parallel_replicas_not_found_column.reference b/tests/queries/0_stateless/02708_parallel_replicas_not_found_column.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/02708_parallel_replicas_not_found_column.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/02708_parallel_replicas_not_found_column.sql b/tests/queries/0_stateless/02708_parallel_replicas_not_found_column.sql
new file mode 100644
index 00000000000..ff7b53ce01f
--- /dev/null
+++ b/tests/queries/0_stateless/02708_parallel_replicas_not_found_column.sql
@@ -0,0 +1,4 @@
+CREATE TABLE IF NOT EXISTS t_02708(x DateTime) ENGINE = MergeTree ORDER BY tuple();
+SET send_logs_level='error';
+SELECT count() FROM t_02708 SETTINGS allow_experimental_parallel_reading_from_replicas=1;
+DROP TABLE t_02708;
diff --git a/tests/queries/0_stateless/02709_generate_random_valid_decimals_and_bools.reference b/tests/queries/0_stateless/02709_generate_random_valid_decimals_and_bools.reference
new file mode 100644
index 00000000000..49f0c2c1360
--- /dev/null
+++ b/tests/queries/0_stateless/02709_generate_random_valid_decimals_and_bools.reference
@@ -0,0 +1,25 @@
+32.077
+-421.374
+401.741
+19.925
+-53.055
+-741245.011359027
+-108826.704302334
+-885710.601317107
+200615.252943765
+571119.753066497
+-1810705720.77468465228544079155
+4423020457.03124833705321108749
+-7357115755.03893179428185573375
+-3596476105.34116783307269095642
+-882544888.46147190610682821046
+2998274172057708048.9272057168211482653001963259921827760845
+-59397657133291422934.9333984240607897191609175175045361436671
+39869165044835399916.6747138660882932389363995495451540473418
+-57185968744047146404.1855920695644202095475491426441451681562
+-45866526235163110880.4305861667709353032099072504822212330478
+1
+0
+1
+1
+1
diff --git a/tests/queries/0_stateless/02709_generate_random_valid_decimals_and_bools.sql b/tests/queries/0_stateless/02709_generate_random_valid_decimals_and_bools.sql
new file mode 100644
index 00000000000..c290ce4833a
--- /dev/null
+++ b/tests/queries/0_stateless/02709_generate_random_valid_decimals_and_bools.sql
@@ -0,0 +1,5 @@
+select toString(x)::Decimal(6, 3) from generateRandom('x Decimal(6, 3)', 42) limit 5;
+select toString(x)::Decimal(15, 9) from generateRandom('x Decimal(15, 9)', 42) limit 5;
+select toString(x)::Decimal(30, 20) from generateRandom('x Decimal(30, 20)', 42) limit 5;
+select toString(x)::Decimal(60, 40) from generateRandom('x Decimal(60, 40)', 42) limit 5;
+select reinterpret(x, 'UInt8') from generateRandom('x Bool', 42) limit 5;
diff --git a/tests/queries/0_stateless/02709_storage_memory_compressed.reference b/tests/queries/0_stateless/02709_storage_memory_compressed.reference
new file mode 100644
index 00000000000..9a665fab809
--- /dev/null
+++ b/tests/queries/0_stateless/02709_storage_memory_compressed.reference
@@ -0,0 +1,2 @@
+1	foo	['0','1','2','3','4']	{'k1':'v1'}
+2	bar	['0','1','2','3','4']	{'k2':'v2'}
diff --git a/tests/queries/0_stateless/02709_storage_memory_compressed.sql b/tests/queries/0_stateless/02709_storage_memory_compressed.sql
new file mode 100644
index 00000000000..0e12b47998c
--- /dev/null
+++ b/tests/queries/0_stateless/02709_storage_memory_compressed.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS t_memory_compressed;
+
+CREATE TABLE t_memory_compressed (id UInt64, s String, arr Array(LowCardinality(String)), m Map(String, String))
+ENGINE = Memory SETTINGS compress = 1;
+
+INSERT INTO t_memory_compressed VALUES (1, 'foo', range(5), map('k1', 'v1'));
+INSERT INTO t_memory_compressed VALUES (2, 'bar', range(5), map('k2', 'v2'));
+
+SELECT * FROM t_memory_compressed ORDER BY id;
+
+DROP TABLE t_memory_compressed;
diff --git a/tests/queries/0_stateless/02710_aggregation_nested_map_ip_uuid.reference b/tests/queries/0_stateless/02710_aggregation_nested_map_ip_uuid.reference
new file mode 100644
index 00000000000..c5b787f3dd6
--- /dev/null
+++ b/tests/queries/0_stateless/02710_aggregation_nested_map_ip_uuid.reference
@@ -0,0 +1,3 @@
+1	['1.2.3.4']	[5]	['::1']	[7]	['00130949-0cd4-4c3d-84c4-cc421eff480f']	[9]
+1	['1.2.3.4','2.3.4.5']	[37,13]	['::1','::2']	[41,14]	['00000000-0cd4-4c3d-84c4-cc421eff480f','00130949-0cd4-4c3d-84c4-cc421eff480f']	[39,21]
+2	['1.2.3.4','2.3.4.5']	[26,16]	['::1','::2']	[25,20]	['00130949-0cd4-4c3d-84c4-cc421eff480f']	[48]
diff --git a/tests/queries/0_stateless/02710_aggregation_nested_map_ip_uuid.sql b/tests/queries/0_stateless/02710_aggregation_nested_map_ip_uuid.sql
new file mode 100644
index 00000000000..456e8723d08
--- /dev/null
+++ b/tests/queries/0_stateless/02710_aggregation_nested_map_ip_uuid.sql
@@ -0,0 +1,32 @@
+DROP TABLE IF EXISTS summing_table;
+CREATE TABLE summing_table
+(
+    id UInt32,
+    `ip4Map.value` Array(IPv4), `ip4Map.total` Array(UInt32),
+    `ip6Map.value` Array(IPv6), `ip6Map.total` Array(UInt32),
+    `uuidMap.value` Array(UUID), `uuidMap.total` Array(UInt32)
+) ENGINE = SummingMergeTree ORDER BY id;
+
+INSERT INTO summing_table(id, ip4Map.value, ip4Map.total, ip6Map.value, ip6Map.total, uuidMap.value, uuidMap.total)
+    values (1, ['1.2.3.4'], [1], ['::1'], [2], ['00130949-0cd4-4c3d-84c4-cc421eff480f'], [3]);
+INSERT INTO summing_table(id, ip4Map.value, ip4Map.total, ip6Map.value, ip6Map.total, uuidMap.value, uuidMap.total)
+    values(1, ['1.2.3.4'], [4], ['::1'], [5], ['00130949-0cd4-4c3d-84c4-cc421eff480f'], [6]);
+OPTIMIZE TABLE summing_table FINAL;
+SELECT * FROM summing_table ORDER BY id, ip4Map.value, ip4Map.total, ip6Map.value, ip6Map.total, uuidMap.value, uuidMap.total;
+
+INSERT INTO summing_table(id, ip4Map.value, ip4Map.total, ip6Map.value, ip6Map.total, uuidMap.value, uuidMap.total)
+    values(2, ['1.2.3.4'], [7], ['::1'], [8], ['00130949-0cd4-4c3d-84c4-cc421eff480f'], [9]);
+INSERT INTO summing_table(id, ip4Map.value, ip4Map.total, ip6Map.value, ip6Map.total, uuidMap.value, uuidMap.total)
+    values(1, ['1.2.3.4'], [10], ['::1'], [11], ['00130949-0cd4-4c3d-84c4-cc421eff480f'], [12]);
+INSERT INTO summing_table(id, ip4Map.value, ip4Map.total, ip6Map.value, ip6Map.total, uuidMap.value, uuidMap.total)
+    values(1, ['2.3.4.5'], [13], ['::2'], [14], ['00000000-0cd4-4c3d-84c4-cc421eff480f'], [15]);
+INSERT INTO summing_table(id, ip4Map.value, ip4Map.total, ip6Map.value, ip6Map.total, uuidMap.value, uuidMap.total)
+    values(2, ['2.3.4.5'], [16], ['::1'], [17], ['00130949-0cd4-4c3d-84c4-cc421eff480f'], [18]);
+INSERT INTO summing_table(id, ip4Map.value, ip4Map.total, ip6Map.value, ip6Map.total, uuidMap.value, uuidMap.total)
+    values(2, ['1.2.3.4'], [19], ['::2'], [20], ['00130949-0cd4-4c3d-84c4-cc421eff480f'], [21]);
+INSERT INTO summing_table(id, ip4Map.value, ip4Map.total, ip6Map.value, ip6Map.total, uuidMap.value, uuidMap.total)
+    values(1, ['1.2.3.4'], [22], ['::1'], [23], ['00000000-0cd4-4c3d-84c4-cc421eff480f'], [24]);
+OPTIMIZE TABLE summing_table FINAL;
+SELECT * FROM summing_table ORDER BY id, ip4Map.value, ip4Map.total, ip6Map.value, ip6Map.total, uuidMap.value, uuidMap.total;
+
+DROP TABLE summing_table;
diff --git a/tests/queries/0_stateless/02710_allow_suspicious_indices.reference b/tests/queries/0_stateless/02710_allow_suspicious_indices.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02710_allow_suspicious_indices.sql b/tests/queries/0_stateless/02710_allow_suspicious_indices.sql
new file mode 100644
index 00000000000..78d52f7bc72
--- /dev/null
+++ b/tests/queries/0_stateless/02710_allow_suspicious_indices.sql
@@ -0,0 +1,22 @@
+-- Check CREATE TABLE
+
+DROP TABLE IF EXISTS tbl;
+CREATE TABLE tbl (id UInt32) ENGINE = MergeTree() ORDER BY (id + 1, id + 1);  -- { serverError BAD_ARGUMENTS }
+CREATE TABLE tbl (id UInt32) ENGINE = MergeTree() ORDER BY (id + 1, id + 1) SETTINGS allow_suspicious_indices = 1;
+
+DROP TABLE IF EXISTS tbl;
+CREATE TABLE tbl (id UInt32, INDEX idx (id + 1, id + 1) TYPE minmax) ENGINE = MergeTree() ORDER BY id;  -- { serverError BAD_ARGUMENTS }
+CREATE TABLE tbl (id UInt32, INDEX idx (id + 1, id + 1) TYPE minmax) ENGINE = MergeTree() ORDER BY id SETTINGS allow_suspicious_indices = 1;
+
+-- Check ALTER TABLE
+
+DROP TABLE IF EXISTS tbl;
+CREATE TABLE tbl (id1 UInt32) ENGINE = MergeTree() ORDER BY id1;
+ALTER TABLE tbl ADD COLUMN `id2` UInt32, MODIFY ORDER BY (id1, id2, id2);  -- { serverError BAD_ARGUMENTS }
+ALTER TABLE tbl ADD COLUMN `id2` UInt32, MODIFY ORDER BY (id1, id2, id1);  -- { serverError BAD_ARGUMENTS }
+ALTER TABLE tbl ADD COLUMN `id2` UInt32, MODIFY ORDER BY (id1, id2, id2) SETTINGS allow_suspicious_indices = 1;
+
+DROP TABLE IF EXISTS tbl;
+CREATE TABLE tbl (id UInt32) ENGINE = MergeTree() ORDER BY id;
+ALTER TABLE tbl ADD INDEX idx (id+1, id, id+1) TYPE minmax;  -- { serverError BAD_ARGUMENTS }
+ALTER TABLE tbl ADD INDEX idx (id+1, id, id+1) TYPE minmax SETTINGS allow_suspicious_indices = 1;
diff --git a/tests/queries/0_stateless/02710_date_diff_aliases.reference b/tests/queries/0_stateless/02710_date_diff_aliases.reference
new file mode 100644
index 00000000000..1eeb5a3a2fa
--- /dev/null
+++ b/tests/queries/0_stateless/02710_date_diff_aliases.reference
@@ -0,0 +1,5 @@
+DATE_DIFF
+TIMESTAMP_DIFF
+date_diff
+timestampDiff
+timestamp_diff
diff --git a/tests/queries/0_stateless/02710_date_diff_aliases.sql b/tests/queries/0_stateless/02710_date_diff_aliases.sql
new file mode 100644
index 00000000000..c6b31c44f95
--- /dev/null
+++ b/tests/queries/0_stateless/02710_date_diff_aliases.sql
@@ -0,0 +1,7 @@
+SELECT name FROM system.functions
+WHERE name = 'date_diff'
+   OR name = 'DATE_DIFF'
+   OR name = 'timestampDiff'
+   OR name = 'timestamp_diff'
+   OR name = 'TIMESTAMP_DIFF'
+ORDER BY name;
diff --git a/tests/queries/0_stateless/02710_default_replicated_parameters.reference b/tests/queries/0_stateless/02710_default_replicated_parameters.reference
new file mode 100644
index 00000000000..84c643316b1
--- /dev/null
+++ b/tests/queries/0_stateless/02710_default_replicated_parameters.reference
@@ -0,0 +1,2 @@
+CREATE DATABASE replicated_database_params\nENGINE = Replicated(\'some/path/default/replicated_database_params\', \'{shard}\', \'{replica}\')
+CREATE DATABASE replicated_database_params\nENGINE = Replicated(\'some/path/default/replicated_database_params\', \'shard_1\', \'{replica}\')
diff --git a/tests/queries/0_stateless/02710_default_replicated_parameters.sql b/tests/queries/0_stateless/02710_default_replicated_parameters.sql
new file mode 100644
index 00000000000..279b7e81bdd
--- /dev/null
+++ b/tests/queries/0_stateless/02710_default_replicated_parameters.sql
@@ -0,0 +1,13 @@
+-- Tags: no-parallel
+
+SET allow_experimental_database_replicated=1;
+
+DROP DATABASE IF EXISTS replicated_database_params;
+
+CREATE DATABASE replicated_database_params ENGINE = Replicated('some/path/' || currentDatabase() || '/replicated_database_params');
+SHOW CREATE DATABASE replicated_database_params;
+DROP DATABASE replicated_database_params;
+
+CREATE DATABASE replicated_database_params ENGINE = Replicated('some/path/' || currentDatabase() || '/replicated_database_params', 'shard_1');
+SHOW CREATE DATABASE replicated_database_params;
+DROP DATABASE replicated_database_params;
diff --git a/tests/queries/0_stateless/02710_protobuf_ipv4_date32.reference b/tests/queries/0_stateless/02710_protobuf_ipv4_date32.reference
new file mode 100644
index 00000000000..11383548d90
--- /dev/null
+++ b/tests/queries/0_stateless/02710_protobuf_ipv4_date32.reference
@@ -0,0 +1,3 @@
+0.0.0.0	0.0.0.0	0.0.0.0	2020-01-01	2020-01-01	2020-01-01
+1.2.3.4	1.2.3.4	1.2.3.4
+255.255.255.255	255.255.255.255	255.255.255.255
diff --git a/tests/queries/0_stateless/02710_protobuf_ipv4_date32.sh b/tests/queries/0_stateless/02710_protobuf_ipv4_date32.sh
new file mode 100755
index 00000000000..83657e590bb
--- /dev/null
+++ b/tests/queries/0_stateless/02710_protobuf_ipv4_date32.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+SCHEMADIR=$CURDIR/format_schemas
+
+$CLICKHOUSE_LOCAL -q "select '0.0.0.0'::IPv4 as ipv4, ipv4 as ipv4_bytes, ipv4 as ipv4_int64, '2020-01-01'::Date32 as date32, date32 as date32_bytes, date32 as date32_int64 format Protobuf settings format_schema = '$SCHEMADIR/02710_schema:Message'" | $CLICKHOUSE_LOCAL --input-format Protobuf --format_schema="$SCHEMADIR/02710_schema:Message" --structure="ipv4 IPv4, ipv4_bytes IPv4, ipv4_int64 IPv4, date32 Date32, date32_bytes Date32, date32_int64 Date32"  -q "select * from table"
+
+$CLICKHOUSE_LOCAL -q "select '1.2.3.4'::IPv4 as ipv4, ipv4 as ipv4_bytes, ipv4 as ipv4_int64 format Protobuf settings format_schema = '$SCHEMADIR/02710_schema:Message'" | $CLICKHOUSE_LOCAL --input-format Protobuf --format_schema="$SCHEMADIR/02710_schema:Message" --structure="ipv4 IPv4, ipv4_bytes IPv4, ipv4_int64 IPv4" -q "select * from table"
+
+$CLICKHOUSE_LOCAL -q "select '255.255.255.255'::IPv4 as ipv4, ipv4 as ipv4_bytes, ipv4 as ipv4_int64 format Protobuf settings format_schema = '$SCHEMADIR/02710_schema:Message'" | $CLICKHOUSE_LOCAL --input-format Protobuf --format_schema="$SCHEMADIR/02710_schema:Message" --structure="ipv4 IPv4, ipv4_bytes IPv4, ipv4_int64 IPv4" -q "select * from table"
+
+
+
diff --git a/tests/queries/0_stateless/02710_show_table.reference b/tests/queries/0_stateless/02710_show_table.reference
new file mode 100644
index 00000000000..7b12c079a9b
--- /dev/null
+++ b/tests/queries/0_stateless/02710_show_table.reference
@@ -0,0 +1,5 @@
+CREATE TABLE default.t_2710_show_table\n(\n    `n1` UInt32,\n    `s` String\n)\nENGINE = Log
+CREATE TABLE default.t_2710_show_table\n(\n    `n1` UInt32,\n    `s` String\n)\nENGINE = Log
+CREATE TABLE default.t_2710_show_table\n(\n    `n1` UInt32,\n    `s` String\n)\nENGINE = Log
+CREATE DATABASE t_2710_db\nENGINE = Atomic
+CREATE DATABASE t_2710_db\nENGINE = Atomic
diff --git a/tests/queries/0_stateless/02710_show_table.sql b/tests/queries/0_stateless/02710_show_table.sql
new file mode 100644
index 00000000000..52682ce83da
--- /dev/null
+++ b/tests/queries/0_stateless/02710_show_table.sql
@@ -0,0 +1,16 @@
+-- Tags: no-parallel
+DROP TABLE IF EXISTS t_2710_show_table;
+
+CREATE TABLE t_2710_show_table(n1 UInt32, s String) engine=Log;
+SHOW TABLE t_2710_show_table;
+SHOW CREATE TABLE t_2710_show_table;
+SHOW CREATE t_2710_show_table;
+
+DROP TABLE t_2710_show_table;
+
+DROP DATABASE IF EXISTS t_2710_db;
+CREATE DATABASE t_2710_db engine=Atomic;
+SHOW DATABASE t_2710_db;
+SHOW CREATE DATABASE t_2710_db;
+
+DROP DATABASE t_2710_db;
diff --git a/tests/queries/0_stateless/02710_topk_with_empty_array.reference b/tests/queries/0_stateless/02710_topk_with_empty_array.reference
new file mode 100644
index 00000000000..17212447ad8
--- /dev/null
+++ b/tests/queries/0_stateless/02710_topk_with_empty_array.reference
@@ -0,0 +1 @@
+[[]]
diff --git a/tests/queries/0_stateless/02710_topk_with_empty_array.sql b/tests/queries/0_stateless/02710_topk_with_empty_array.sql
new file mode 100644
index 00000000000..7de066e9ae4
--- /dev/null
+++ b/tests/queries/0_stateless/02710_topk_with_empty_array.sql
@@ -0,0 +1 @@
+SELECT topK(emptyArrayInt16());
diff --git a/tests/queries/0_stateless/02711_server_uuid_macro.reference b/tests/queries/0_stateless/02711_server_uuid_macro.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02711_server_uuid_macro.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02711_server_uuid_macro.sql b/tests/queries/0_stateless/02711_server_uuid_macro.sql
new file mode 100644
index 00000000000..4f562ad36bf
--- /dev/null
+++ b/tests/queries/0_stateless/02711_server_uuid_macro.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS test;
+
+-- You can create a table with the {server_uuid} substituted.
+CREATE TABLE test (x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test', 'replica-{server_uuid}') ORDER BY x;
+
+-- The server UUID is correctly substituted.
+SELECT engine_full LIKE ('%replica-' || serverUUID()::String || '%') FROM system.tables WHERE database = currentDatabase() AND name = 'test';
+
+-- An attempt to create a second table with the same UUID results in error.
+CREATE TABLE test2 (x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test', 'replica-{server_uuid}') ORDER BY x; -- { serverError REPLICA_ALREADY_EXISTS }
+
+-- The macro {server_uuid} is special, not a configuration-type macro. It's normal that it is inaccessible with the getMacro function.
+SELECT getMacro('server_uuid'); -- { serverError NO_ELEMENTS_IN_CONFIG }
+
+DROP TABLE test SYNC;
diff --git a/tests/queries/0_stateless/02711_soundex_function.reference b/tests/queries/0_stateless/02711_soundex_function.reference
new file mode 100644
index 00000000000..1b843e030f7
--- /dev/null
+++ b/tests/queries/0_stateless/02711_soundex_function.reference
@@ -0,0 +1,27 @@
+0000
+0000
+J523
+A000
+F634
+F634
+J525
+J525
+J523
+M235
+M235
+S530
+S530
+---
+0000
+0000
+J523
+A000
+F634
+F634
+J525
+J525
+J523
+M235
+M235
+S530
+S530
diff --git a/tests/queries/0_stateless/02711_soundex_function.sql b/tests/queries/0_stateless/02711_soundex_function.sql
new file mode 100644
index 00000000000..d2fe374b341
--- /dev/null
+++ b/tests/queries/0_stateless/02711_soundex_function.sql
@@ -0,0 +1,28 @@
+SELECT soundex('');
+SELECT soundex('12345');
+SELECT soundex('341Jons54326ton');
+SELECT soundex('A2222222');
+SELECT soundex('Fairdale');
+SELECT soundex('Faredale');
+SELECT soundex('Jon1s2o3n');
+SELECT soundex('Jonson');
+SELECT soundex('Jonston');
+SELECT soundex('M\acDonald22321');
+SELECT soundex('MacDonald');
+SELECT soundex('S3344mith0000');
+SELECT soundex('Smith');
+
+SELECT '---';
+
+-- same input strings but in a table
+DROP TABLE IF EXISTS tab;
+CREATE TABLE tab (col String) Engine=MergeTree ORDER BY col;
+INSERT INTO tab VALUES ('') ('12345') ('341Jons54326ton') ('A2222222') ('Fairdale') ('Faredale') ('Jon1s2o3n') ('Jonson') ('Jonston') ('M\acDonald22321') ('MacDonald') ('S3344mith0000') ('Smith');
+
+SELECT soundex(col) FROM tab;
+
+DROP TABLE tab;
+
+-- negative tests
+SELECT soundex(toFixedString('Smith', 5)); -- { serverError ILLEGAL_COLUMN }
+SELECT soundex(5); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/02711_trim_aliases.reference b/tests/queries/0_stateless/02711_trim_aliases.reference
new file mode 100644
index 00000000000..fa0920cd079
--- /dev/null
+++ b/tests/queries/0_stateless/02711_trim_aliases.reference
@@ -0,0 +1,3 @@
+ltrim
+rtrim
+trim
diff --git a/tests/queries/0_stateless/02711_trim_aliases.sql b/tests/queries/0_stateless/02711_trim_aliases.sql
new file mode 100644
index 00000000000..d0d739805fd
--- /dev/null
+++ b/tests/queries/0_stateless/02711_trim_aliases.sql
@@ -0,0 +1,5 @@
+SELECT name FROM system.functions
+WHERE name = 'ltrim'
+   OR name = 'rtrim'
+   OR name = 'trim'
+ORDER BY name;
diff --git a/tests/queries/0_stateless/02712_bool_better_exception_message.reference b/tests/queries/0_stateless/02712_bool_better_exception_message.reference
new file mode 100644
index 00000000000..aba60fe1061
--- /dev/null
+++ b/tests/queries/0_stateless/02712_bool_better_exception_message.reference
@@ -0,0 +1,5 @@
+true
+false
+1
+1
+1
diff --git a/tests/queries/0_stateless/02712_bool_better_exception_message.sh b/tests/queries/0_stateless/02712_bool_better_exception_message.sh
new file mode 100755
index 00000000000..1da70d7025b
--- /dev/null
+++ b/tests/queries/0_stateless/02712_bool_better_exception_message.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_LOCAL <<END
+    SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": 1}');
+    SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": null}');
+END
+
+$CLICKHOUSE_LOCAL <<END 2>&1 | rg -Fc "'w' character"
+    SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": wtf}');
+END
+
+$CLICKHOUSE_LOCAL <<END 2>&1 | rg -Fc "expected 'false'"
+    SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": ftw}');
+END
+
+$CLICKHOUSE_LOCAL <<END 2>&1 | rg -Fc "'{' character"
+    SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": {}}');
+END
diff --git a/tests/queries/0_stateless/02713_array_low_cardinality_string.reference b/tests/queries/0_stateless/02713_array_low_cardinality_string.reference
new file mode 100644
index 00000000000..aea0fd62732
--- /dev/null
+++ b/tests/queries/0_stateless/02713_array_low_cardinality_string.reference
@@ -0,0 +1,12 @@
+---
+tab	idx	bloom_filter
+---
+Expression ((Projection + Before ORDER BY))
+  Filter (WHERE)
+    ReadFromMergeTree (default.tab)
+    Indexes:
+      Skip
+        Name: idx
+        Description: bloom_filter GRANULARITY 1
+        Parts: 1/1
+        Granules: 1/1
diff --git a/tests/queries/0_stateless/02713_array_low_cardinality_string.sql b/tests/queries/0_stateless/02713_array_low_cardinality_string.sql
new file mode 100644
index 00000000000..4ecd3bf17c1
--- /dev/null
+++ b/tests/queries/0_stateless/02713_array_low_cardinality_string.sql
@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS tab;
+
+CREATE TABLE tab
+(
+    foo Array(LowCardinality(String)),
+    INDEX idx foo TYPE bloom_filter
+)
+ENGINE = MergeTree
+PRIMARY KEY tuple();
+
+INSERT INTO tab VALUES (['a', 'b']);
+
+SELECT '---';
+
+SELECT table, name, type
+FROM system.data_skipping_indices
+WHERE database = currentDatabase() AND table = 'tab';
+
+SELECT '---';
+
+EXPLAIN indexes = 1 SELECT * FROM tab WHERE has(foo, 'b');
+
+DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02713_create_user_substitutions.reference b/tests/queries/0_stateless/02713_create_user_substitutions.reference
new file mode 100644
index 00000000000..f9b5cc495b5
--- /dev/null
+++ b/tests/queries/0_stateless/02713_create_user_substitutions.reference
@@ -0,0 +1,11 @@
+1
+2
+3
+4
+5
+6
+7
+8
+CREATE USER user9_02713 IDENTIFIED WITH ldap SERVER \'qwerty9\'
+CREATE USER user10_02713 IDENTIFIED WITH kerberos REALM \'qwerty10\'
+CREATE USER user11_02713 IDENTIFIED WITH ssl_certificate CN \'qwerty11\', \'qwerty12\'
diff --git a/tests/queries/0_stateless/02713_create_user_substitutions.sh b/tests/queries/0_stateless/02713_create_user_substitutions.sh
new file mode 100755
index 00000000000..42926335acb
--- /dev/null
+++ b/tests/queries/0_stateless/02713_create_user_substitutions.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "DROP USER IF EXISTS user1_02713, user2_02713, user3_02713, user4_02713, user5_02713, user6_02713, user7_02713";
+
+$CLICKHOUSE_CLIENT --param_password=qwerty1 -q "CREATE USER user1_02713 IDENTIFIED BY {password:String}";
+$CLICKHOUSE_CLIENT --param_password=qwerty2 -q "CREATE USER user2_02713 IDENTIFIED WITH PLAINTEXT_PASSWORD BY {password:String}";
+$CLICKHOUSE_CLIENT --param_password=qwerty3 -q "CREATE USER user3_02713 IDENTIFIED WITH SHA256_PASSWORD BY {password:String}";
+$CLICKHOUSE_CLIENT --param_password=qwerty4 -q "CREATE USER user4_02713 IDENTIFIED WITH DOUBLE_SHA1_PASSWORD BY {password:String}";
+$CLICKHOUSE_CLIENT --param_password=qwerty5 -q "CREATE USER user5_02713 IDENTIFIED WITH BCRYPT_PASSWORD BY {password:String}";
+
+# Generated online
+$CLICKHOUSE_CLIENT --param_hash=310cef2caff72c0224f38ca8e2141ca6012cd4da550c692573c25a917d9a75e6 \
+    -q "CREATE USER user6_02713 IDENTIFIED WITH SHA256_HASH BY {hash:String}";
+# Generated with ClickHouse
+$CLICKHOUSE_CLIENT --param_hash=5886A74C452575627522F3A80D8B9E239FD8955F \
+    -q "CREATE USER user7_02713 IDENTIFIED WITH DOUBLE_SHA1_HASH BY {hash:String}";
+# Generated online
+$CLICKHOUSE_CLIENT --param_hash=\$2a\$12\$wuohz0HFSBBNE8huN0Yx6.kmWrefiYVKeMp4gsuNoO1rOWwF2FXXC \
+    -q "CREATE USER user8_02713 IDENTIFIED WITH BCRYPT_HASH BY {hash:String}";
+
+$CLICKHOUSE_CLIENT --param_server=qwerty9 -q "CREATE USER user9_02713 IDENTIFIED WITH LDAP SERVER {server:String}";
+$CLICKHOUSE_CLIENT --param_realm=qwerty10 -q "CREATE USER user10_02713 IDENTIFIED WITH KERBEROS REALM {realm:String}";
+$CLICKHOUSE_CLIENT --param_cert1=qwerty11 --param_cert2=qwerty12 -q "CREATE USER user11_02713 IDENTIFIED WITH SSL_CERTIFICATE CN {cert1:String}, {cert2:String}";
+
+$CLICKHOUSE_CLIENT --user=user1_02713 --password=qwerty1 -q "SELECT 1";
+$CLICKHOUSE_CLIENT --user=user2_02713 --password=qwerty2 -q "SELECT 2";
+$CLICKHOUSE_CLIENT --user=user3_02713 --password=qwerty3 -q "SELECT 3";
+$CLICKHOUSE_CLIENT --user=user4_02713 --password=qwerty4 -q "SELECT 4";
+$CLICKHOUSE_CLIENT --user=user5_02713 --password=qwerty5 -q "SELECT 5";
+$CLICKHOUSE_CLIENT --user=user6_02713 --password=qwerty6 -q "SELECT 6";
+$CLICKHOUSE_CLIENT --user=user7_02713 --password=qwerty7 -q "SELECT 7";
+$CLICKHOUSE_CLIENT --user=user8_02713 --password=qwerty8 -q "SELECT 8";
+
+$CLICKHOUSE_CLIENT -q "SHOW CREATE USER user9_02713";
+$CLICKHOUSE_CLIENT -q "SHOW CREATE USER user10_02713";
+$CLICKHOUSE_CLIENT -q "SHOW CREATE USER user11_02713";
+
+$CLICKHOUSE_CLIENT -q "DROP USER user1_02713, user2_02713, user3_02713, user4_02713, user5_02713, user6_02713, user7_02713, user8_02713, user9_02713, user10_02713, user11_02713";
diff --git a/tests/queries/0_stateless/02713_ip4_uint_compare.reference b/tests/queries/0_stateless/02713_ip4_uint_compare.reference
new file mode 100644
index 00000000000..fdc2de3fbcb
--- /dev/null
+++ b/tests/queries/0_stateless/02713_ip4_uint_compare.reference
@@ -0,0 +1 @@
+1	0	1	1	1	1	0
diff --git a/tests/queries/0_stateless/02713_ip4_uint_compare.sql b/tests/queries/0_stateless/02713_ip4_uint_compare.sql
new file mode 100644
index 00000000000..ec8d6584329
--- /dev/null
+++ b/tests/queries/0_stateless/02713_ip4_uint_compare.sql
@@ -0,0 +1,9 @@
+WITH toIPv4('127.0.0.10') AS ip
+SELECT
+    ip = 2130706442::UInt32,
+    ip = 0::UInt32,
+    ip < 2130706443::UInt32,
+    ip > 2130706441::UInt32,
+    ip <= 2130706442::UInt32,
+    ip >= 2130706442::UInt32,
+    ip != 2130706442::UInt32;
diff --git a/tests/queries/0_stateless/02713_sequence_match_serialization_fix.reference b/tests/queries/0_stateless/02713_sequence_match_serialization_fix.reference
new file mode 100644
index 00000000000..2a1c127e635
--- /dev/null
+++ b/tests/queries/0_stateless/02713_sequence_match_serialization_fix.reference
@@ -0,0 +1,3 @@
+serialized state is not used	1
+serialized state is used	1
+via Distributed	1
diff --git a/tests/queries/0_stateless/02713_sequence_match_serialization_fix.sql b/tests/queries/0_stateless/02713_sequence_match_serialization_fix.sql
new file mode 100644
index 00000000000..3521cb8470f
--- /dev/null
+++ b/tests/queries/0_stateless/02713_sequence_match_serialization_fix.sql
@@ -0,0 +1,36 @@
+DROP TABLE IF EXISTS 02713_seqt;
+DROP TABLE IF EXISTS 02713_seqt_distr;
+
+SELECT
+    'serialized state is not used', sequenceMatch('(?1)(?2)')(time, number_ = 1, number_ = 0) AS seq
+FROM
+(
+    SELECT
+        number AS time,
+        number % 2 AS number_
+    FROM numbers_mt(100)
+);
+
+
+CREATE TABLE 02713_seqt
+ENGINE = MergeTree
+ORDER BY n AS
+SELECT
+    sequenceMatchState('(?1)(?2)')(time, number_ = 1, number_ = 0) AS seq,
+    1 AS n
+FROM
+(
+    SELECT
+        number AS time,
+        number % 2 AS number_
+    FROM numbers_mt(100)
+);
+
+
+SELECT 'serialized state is used', sequenceMatchMerge('(?1)(?2)')(seq) AS seq
+FROM 02713_seqt;
+
+
+CREATE TABLE 02713_seqt_distr ( seq AggregateFunction(sequenceMatch('(?1)(?2)'), UInt64, UInt8, UInt8) , n UInt8) ENGINE = Distributed(test_shard_localhost, currentDatabase(), '02713_seqt');
+
+SELECT 'via Distributed', sequenceMatchMerge('(?1)(?2)')(seq) AS seq FROM 02713_seqt_distr;
diff --git a/tests/queries/0_stateless/02714_async_inserts_empty_data.reference b/tests/queries/0_stateless/02714_async_inserts_empty_data.reference
new file mode 100644
index 00000000000..47ee41ddc0f
--- /dev/null
+++ b/tests/queries/0_stateless/02714_async_inserts_empty_data.reference
@@ -0,0 +1,2 @@
+0
+Ok	0
diff --git a/tests/queries/0_stateless/02714_async_inserts_empty_data.sh b/tests/queries/0_stateless/02714_async_inserts_empty_data.sh
new file mode 100755
index 00000000000..b2dc3298733
--- /dev/null
+++ b/tests/queries/0_stateless/02714_async_inserts_empty_data.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_async_insert_empty_data"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_async_insert_empty_data (id UInt32) ENGINE = Memory"
+
+echo -n '' | ${CLICKHOUSE_CURL} -sS "$url&query=INSERT%20INTO%20t_async_insert_empty_data%20FORMAT%20JSONEachRow" --data-binary @-
+
+${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
+${CLICKHOUSE_CLIENT} -q "SELECT count() FROM t_async_insert_empty_data"
+${CLICKHOUSE_CLIENT} -q "SELECT status, bytes FROM system.asynchronous_insert_log WHERE database = '$CLICKHOUSE_DATABASE' AND table = 't_async_insert_empty_data'"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_async_insert_empty_data"
diff --git a/tests/queries/0_stateless/02714_date_date32_in.reference b/tests/queries/0_stateless/02714_date_date32_in.reference
new file mode 100644
index 00000000000..d9ff83f1949
--- /dev/null
+++ b/tests/queries/0_stateless/02714_date_date32_in.reference
@@ -0,0 +1,4 @@
+1
+1
+0
+0
diff --git a/tests/queries/0_stateless/02714_date_date32_in.sql b/tests/queries/0_stateless/02714_date_date32_in.sql
new file mode 100644
index 00000000000..69a087eff6f
--- /dev/null
+++ b/tests/queries/0_stateless/02714_date_date32_in.sql
@@ -0,0 +1,4 @@
+select toDate32('2020-01-01') in (toDate('2020-01-01'));
+select toDate('2020-01-01') in (toDate32('2020-01-01'));
+select toDate('2020-01-01') in 1::Int64;
+select toDate32('2020-01-01') in 1::UInt64;
diff --git a/tests/queries/0_stateless/02714_local_object_storage.reference b/tests/queries/0_stateless/02714_local_object_storage.reference
new file mode 100644
index 00000000000..b3f28057554
--- /dev/null
+++ b/tests/queries/0_stateless/02714_local_object_storage.reference
@@ -0,0 +1,2 @@
+1	test
+1	test
diff --git a/tests/queries/0_stateless/02714_local_object_storage.sql b/tests/queries/0_stateless/02714_local_object_storage.sql
new file mode 100644
index 00000000000..fa9025b8b6e
--- /dev/null
+++ b/tests/queries/0_stateless/02714_local_object_storage.sql
@@ -0,0 +1,28 @@
+SET min_bytes_to_use_direct_io='1Gi'; -- It does not work (fixme)
+SET local_filesystem_read_method='pread'; -- ui_uring local_fs_method does not work here (fixme)
+
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test (a Int32, b String)
+ENGINE = MergeTree() ORDER BY tuple()
+SETTINGS disk = disk(
+    type = 'local_blob_storage',
+    path = '/var/lib/clickhouse/disks/${CLICKHOUSE_TEST_UNIQUE_NAME}/');
+
+INSERT INTO test SELECT 1, 'test';
+SELECT * FROM test;
+
+DROP TABLE test SYNC;
+
+CREATE TABLE test (a Int32, b String)
+ENGINE = MergeTree() ORDER BY tuple()
+SETTINGS disk = disk(
+    type = 'cache',
+    max_size = '10Mi',
+    path = '/var/lib/clickhouse/caches/${CLICKHOUSE_TEST_UNIQUE_NAME}/',
+    disk = disk(type='local_blob_storage', path='/var/lib/clickhouse/disks/${CLICKHOUSE_TEST_UNIQUE_NAME}/'));
+
+INSERT INTO test SELECT 1, 'test';
+SELECT * FROM test;
+
+DROP TABLE test SYNC;
diff --git a/tests/queries/0_stateless/02714_read_bytes_aggregateFunction.reference b/tests/queries/0_stateless/02714_read_bytes_aggregateFunction.reference
new file mode 100644
index 00000000000..d315d85a11e
--- /dev/null
+++ b/tests/queries/0_stateless/02714_read_bytes_aggregateFunction.reference
@@ -0,0 +1,6 @@
+UInt64	1	8
+UInt64	10	80
+UInt64	1000	8000
+AggregateFunction(argMax, String, DateTime)	1	80
+AggregateFunction(argMax, String, DateTime)	10	800
+AggregateFunction(argMax, String, DateTime)	1000	80000
diff --git a/tests/queries/0_stateless/02714_read_bytes_aggregateFunction.sql b/tests/queries/0_stateless/02714_read_bytes_aggregateFunction.sql
new file mode 100644
index 00000000000..26bc9ebe62b
--- /dev/null
+++ b/tests/queries/0_stateless/02714_read_bytes_aggregateFunction.sql
@@ -0,0 +1,59 @@
+CREATE TABLE test (id UInt64, `amax` AggregateFunction(argMax, String, DateTime))
+ENGINE=MergeTree()
+ORDER BY id
+SETTINGS ratio_of_defaults_for_sparse_serialization=1 -- Sparse columns will take more bytes for a single row
+AS
+    SELECT number, argMaxState(number::String, '2023-04-12 16:23:01'::DateTime)
+    FROM numbers(1)
+    GROUP BY number;
+
+SELECT sum(id) FROM test FORMAT Null;
+SELECT argMaxMerge(amax) FROM test FORMAT Null;
+
+INSERT INTO test
+    SELECT number, argMaxState(number::String, '2023-04-12 16:23:01'::DateTime)
+    FROM numbers(9)
+    GROUP BY number;
+
+SELECT sum(id) FROM test FORMAT Null;
+SELECT argMaxMerge(amax) FROM test FORMAT Null;
+
+INSERT INTO test
+SELECT number, argMaxState(number::String, '2023-04-12 16:23:01'::DateTime)
+FROM numbers(990)
+GROUP BY number;
+
+SELECT sum(id) FROM test FORMAT Null;
+SELECT argMaxMerge(amax) FROM test FORMAT Null;
+
+SYSTEM FLUSH LOGS;
+
+SELECT 'UInt64',
+       read_rows,
+       read_bytes
+FROM system.query_log
+WHERE
+    current_database = currentDatabase() AND
+    query = 'SELECT sum(id) FROM test FORMAT Null;' AND
+    type = 2 AND event_date >= yesterday()
+ORDER BY event_time_microseconds;
+
+-- Size of ColumnAggregateFunction: Number of pointers * pointer size + arena size
+-- 1 * 8 + AggregateFunction(argMax, String, DateTime)
+--
+-- Size of AggregateFunction(argMax, String, DateTime):
+-- SingleValueDataString() + SingleValueDataFixed(DateTime)
+-- SingleValueDataString = 64B for small strings, 64B + string size + 1 for larger
+-- SingleValueDataFixed(DateTime) = 1 + 4. With padding = 8
+-- SingleValueDataString Total: 72B
+--
+-- ColumnAggregateFunction total: 8 + 72 = 80
+SELECT 'AggregateFunction(argMax, String, DateTime)',
+       read_rows,
+       read_bytes
+FROM system.query_log
+WHERE
+    current_database = currentDatabase() AND
+    query = 'SELECT argMaxMerge(amax) FROM test FORMAT Null;' AND
+    type = 2 AND event_date >= yesterday()
+ORDER BY event_time_microseconds;
diff --git a/tests/queries/0_stateless/02715_bit_operations_float.reference b/tests/queries/0_stateless/02715_bit_operations_float.reference
new file mode 100644
index 00000000000..a208d00f211
--- /dev/null
+++ b/tests/queries/0_stateless/02715_bit_operations_float.reference
@@ -0,0 +1,2 @@
+1	1	1	1
+12	11	41	12
diff --git a/tests/queries/0_stateless/02715_bit_operations_float.sql b/tests/queries/0_stateless/02715_bit_operations_float.sql
new file mode 100644
index 00000000000..6dc0a14e9b4
--- /dev/null
+++ b/tests/queries/0_stateless/02715_bit_operations_float.sql
@@ -0,0 +1,8 @@
+SELECT bitNot(-inf) != 0, bitNot(inf) != 0, bitNot(3.40282e+38) != 0, bitNot(nan) != 0;
+SELECT bitCount(-inf), bitCount(inf), bitCount(3.40282e+38), bitCount(nan);
+
+SELECT bitAnd(1.0, 1.0); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT bitOr(1.0, 1.0); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT bitRotateLeft(1.0, 1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT bitShiftLeft(1.0, 1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT bitTest(1.0, 1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/02715_or_null.reference b/tests/queries/0_stateless/02715_or_null.reference
new file mode 100644
index 00000000000..9ec7b825e5c
--- /dev/null
+++ b/tests/queries/0_stateless/02715_or_null.reference
@@ -0,0 +1,3 @@
+\N
+1	1
+1
diff --git a/tests/queries/0_stateless/02715_or_null.sql b/tests/queries/0_stateless/02715_or_null.sql
new file mode 100644
index 00000000000..f020dd2c74c
--- /dev/null
+++ b/tests/queries/0_stateless/02715_or_null.sql
@@ -0,0 +1,33 @@
+SELECT argMaxOrNull(id, timestamp)
+FROM
+(
+    SELECT
+        CAST(NULL, 'Nullable(UInt32)') AS id,
+        2 AS timestamp
+);
+
+SELECT
+    argMax(id, timestamp),
+    argMaxOrNull(id, timestamp)
+FROM
+(
+    SELECT
+        CAST(NULL, 'Nullable(UInt32)') AS id,
+        2 AS timestamp
+    UNION ALL
+    SELECT
+        1 AS id,
+        1 AS timestamp
+);
+
+SELECT argMaxIfOrNull(id, timestamp, id IS NOT NULL)
+FROM
+(
+    SELECT
+        CAST(NULL, 'Nullable(UInt32)') AS id,
+        2 AS timestamp
+    UNION ALL
+    SELECT
+        1 AS id,
+        1 AS timestamp
+);
diff --git a/tests/queries/0_stateless/02716_int256_arrayfunc.reference b/tests/queries/0_stateless/02716_int256_arrayfunc.reference
new file mode 100644
index 00000000000..d95216fd264
--- /dev/null
+++ b/tests/queries/0_stateless/02716_int256_arrayfunc.reference
@@ -0,0 +1,16 @@
+[0,2]	Array(Int128)
+[0,2]	Array(Int128)
+[0,2]	Array(Int256)
+[0,2]	Array(Int256)
+---
+[1,3]	Array(UInt128)
+[1,3]	Array(Int128)
+[1,3]	Array(UInt256)
+[1,3]	Array(Int256)
+[3,4,5]	Array(UInt256)
+[1,2]	Array(Int256)
+---
+[1,3]	Array(UInt128)
+[1,0]	Array(Int128)
+[1,3]	Array(UInt256)
+[1,0]	Array(Int256)
diff --git a/tests/queries/0_stateless/02716_int256_arrayfunc.sql b/tests/queries/0_stateless/02716_int256_arrayfunc.sql
new file mode 100644
index 00000000000..779a3168ea6
--- /dev/null
+++ b/tests/queries/0_stateless/02716_int256_arrayfunc.sql
@@ -0,0 +1,22 @@
+SELECT arrayDifference([toUInt128(1), 3]), toTypeName(arrayDifference([toUInt128(1), 3]));
+SELECT arrayDifference([toInt128(1), 3]), toTypeName(arrayDifference([toInt128(1), 3]));
+SELECT arrayDifference([toUInt256(1), 3]), toTypeName(arrayDifference([toUInt256(1), 3]));
+SELECT arrayDifference([toInt256(1), 3]), toTypeName(arrayDifference([toInt256(1), 3]));
+
+SELECT '---';
+
+SELECT arrayCumSum([toUInt128(1), 2]), toTypeName(arrayCumSum([toUInt128(1), 2]));
+SELECT arrayCumSum([toInt128(1), 2]), toTypeName(arrayCumSum([toInt128(1), 2]));
+SELECT arrayCumSum([toUInt256(1), 2]), toTypeName(arrayCumSum([toUInt256(1), 2]));
+SELECT arrayCumSum([toInt256(1), 2]), toTypeName(arrayCumSum([toInt256(1), 2]));
+
+SELECT arrayCumSum([3, toInt128(1), toInt256(1)]), toTypeName(arrayCumSum([toUInt256(1), toUInt128(1)]));
+SELECT arrayCumSum([toInt256(1), toInt128(1)]), toTypeName(arrayCumSum([toInt256(1), toInt128(1)]));
+
+SELECT '---';
+
+SELECT arrayCumSumNonNegative([toUInt128(1), 2]), toTypeName(arrayCumSumNonNegative([toUInt128(1), 2]));
+SELECT arrayCumSumNonNegative([toInt128(1), -2]), toTypeName(arrayCumSumNonNegative([toInt128(1), -2]));
+SELECT arrayCumSumNonNegative([toUInt256(1), 2]), toTypeName(arrayCumSumNonNegative([toUInt256(1), 2]));
+SELECT arrayCumSumNonNegative([toInt256(1), -2]), toTypeName(arrayCumSumNonNegative([toInt256(1), -2]));
+
diff --git a/tests/queries/0_stateless/02716_parquet_invalid_date32.reference b/tests/queries/0_stateless/02716_parquet_invalid_date32.reference
new file mode 100644
index 00000000000..1052b48e58c
--- /dev/null
+++ b/tests/queries/0_stateless/02716_parquet_invalid_date32.reference
@@ -0,0 +1,2 @@
+1
+200000
diff --git a/tests/queries/0_stateless/02716_parquet_invalid_date32.sh b/tests/queries/0_stateless/02716_parquet_invalid_date32.sh
new file mode 100755
index 00000000000..5b909eecc34
--- /dev/null
+++ b/tests/queries/0_stateless/02716_parquet_invalid_date32.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select * from file('$CURDIR/data_parquet/02716_data.parquet', auto, 'date Date32')" 2>&1 | grep -c "VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE"
+
+$CLICKHOUSE_LOCAL -q "select * from file('$CURDIR/data_parquet/02716_data.parquet', auto, 'date Int32')"
+
diff --git a/tests/queries/0_stateless/02717_pretty_json.reference b/tests/queries/0_stateless/02717_pretty_json.reference
new file mode 100644
index 00000000000..a8bd1b450e0
--- /dev/null
+++ b/tests/queries/0_stateless/02717_pretty_json.reference
@@ -0,0 +1,74 @@
+{
+    "num": 42,
+    "arr": [
+        42,
+        42
+    ],
+    "nested_arr": [
+        [
+            [
+                42,
+                42
+            ],
+            [
+                42,
+                42
+            ]
+        ],
+        [
+            [
+                42,
+                42
+            ]
+        ]
+    ],
+    "tuple": {
+        "a": 42,
+        "b": 42
+    },
+    "nested_tuple": {
+        "a": {
+            "b": {
+                "c": 42,
+                "d": 42
+            },
+            "e": 42
+        },
+        "f": 42
+    },
+    "map": {
+        "42": 42,
+        "24": 24
+    },
+    "nested_map": {
+        "42": {
+            "42": {
+                "42": 42
+            }
+        }
+    },
+    "nested_types": [
+        [
+            {
+                "42": 42
+            },
+            [
+                42,
+                42
+            ]
+        ],
+        [
+            {
+                "42": 42
+            },
+            [
+                42,
+                42
+            ]
+        ]
+    ],
+    "json_object": {
+        "a.b": 1,
+        "a.c": 2
+    }
+}
diff --git a/tests/queries/0_stateless/02717_pretty_json.sql b/tests/queries/0_stateless/02717_pretty_json.sql
new file mode 100644
index 00000000000..8a49eb50adf
--- /dev/null
+++ b/tests/queries/0_stateless/02717_pretty_json.sql
@@ -0,0 +1,3 @@
+set allow_experimental_object_type=1;
+select 42 as num, [42, 42] as arr, [[[42, 42], [42, 42]], [[42, 42]]] as nested_arr, tuple(42, 42)::Tuple(a UInt32, b UInt32) as tuple, tuple(tuple(tuple(42, 42), 42), 42)::Tuple(a Tuple(b Tuple(c UInt32, d UInt32), e UInt32), f UInt32) as nested_tuple, map(42, 42, 24, 24) as map, map(42, map(42, map(42, 42))) as nested_map, [tuple(map(42, 42), [42, 42]), tuple(map(42, 42), [42, 42])]::Array(Tuple(Map(UInt32, UInt32), Array(UInt32))) as nested_types, '{"a" : {"b" : 1, "c" : 2}}'::JSON as json_object format PrettyNDJSON;
+
diff --git a/tests/queries/0_stateless/02718_cli_dashed_options_parsing.reference b/tests/queries/0_stateless/02718_cli_dashed_options_parsing.reference
new file mode 100644
index 00000000000..6479f538bd8
--- /dev/null
+++ b/tests/queries/0_stateless/02718_cli_dashed_options_parsing.reference
@@ -0,0 +1,17 @@
+Test 1: Check that you can specify options with a dashes, not an underscores
+Test 1.1: Check option from config - server_logs_file
+1
+OK
+1
+OK
+1
+OK
+Test 1.2: Check some option from Settings.h - allow_deprecated_syntax_for_merge_tree
+0
+Test 2: check that unicode dashes are handled correctly
+Test 2.1: check em-dash support
+1
+Test 2.2: check en-dash support
+1
+Test 2.3 check mathematical minus support
+1
diff --git a/tests/queries/0_stateless/02718_cli_dashed_options_parsing.sh b/tests/queries/0_stateless/02718_cli_dashed_options_parsing.sh
new file mode 100755
index 00000000000..ba455a56521
--- /dev/null
+++ b/tests/queries/0_stateless/02718_cli_dashed_options_parsing.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+file_name=${CLICKHOUSE_TEST_UNIQUE_NAME}
+file_name_1=${file_name}_1
+file_name_2=${file_name}_2
+file_name_3=${file_name}_3
+
+#################
+echo "Test 1: Check that you can specify options with a dashes, not an underscores"
+
+[[ -e $file_name_1 ]] && rm $file_name_1
+[[ -e $file_name_2 ]] && rm $file_name_2
+[[ -e $file_name_3 ]] && rm $file_name_3
+
+echo "Test 1.1: Check option from config - server_logs_file"
+
+$CLICKHOUSE_LOCAL --log-level=debug --server-logs-file=$file_name_1 -q "SELECT 1;" 2> /dev/null
+[[ -e $file_name_1 ]] && echo OK
+$CLICKHOUSE_LOCAL --log-level=debug --server-logs-file $file_name_2 -q "SELECT 1;" 2> /dev/null
+[[ -e $file_name_2 ]] && echo OK
+$CLICKHOUSE_LOCAL --log-level=debug --server_logs_file $file_name_3 -q "SELECT 1;" 2> /dev/null
+[[ -e $file_name_3 ]] && echo OK
+
+echo "Test 1.2: Check some option from Settings.h - allow_deprecated_syntax_for_merge_tree"
+
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test";
+$CLICKHOUSE_CLIENT --allow-deprecated-syntax-for-merge-tree=1 --query="CREATE TABLE test (d Date, s String) ENGINE = MergeTree(d, s, 8192)";
+$CLICKHOUSE_CLIENT --query="DROP TABLE test";
+echo $?
+
+#################
+echo "Test 2: check that unicode dashes are handled correctly"
+
+echo "Test 2.1: check em-dash support"
+# Unicode code: U+2014
+$CLICKHOUSE_LOCAL —query "SELECT 1";
+
+echo "Test 2.2: check en-dash support"
+# Unicode code: U+2013
+$CLICKHOUSE_LOCAL –query "SELECT 1";
+
+echo "Test 2.3 check mathematical minus support"
+# Unicode code: U+2212
+$CLICKHOUSE_LOCAL −query "SELECT 1";
+
+rm $file_name_1
+rm $file_name_2
+rm $file_name_3
diff --git a/tests/queries/0_stateless/02718_insert_meet_hardware_error.reference b/tests/queries/0_stateless/02718_insert_meet_hardware_error.reference
new file mode 100644
index 00000000000..f599e28b8ab
--- /dev/null
+++ b/tests/queries/0_stateless/02718_insert_meet_hardware_error.reference
@@ -0,0 +1 @@
+10
diff --git a/tests/queries/0_stateless/02718_insert_meet_hardware_error.sql b/tests/queries/0_stateless/02718_insert_meet_hardware_error.sql
new file mode 100644
index 00000000000..ab90bbecc04
--- /dev/null
+++ b/tests/queries/0_stateless/02718_insert_meet_hardware_error.sql
@@ -0,0 +1,20 @@
+-- Tags: zookeeper, no-parallel
+
+DROP TABLE IF EXISTS t_hardware_error NO DELAY;
+
+CREATE TABLE t_hardware_error (
+	KeyID UInt32
+) Engine = ReplicatedMergeTree('/clickhouse/tables/{shard}/{database}/t_async_insert_dedup', '{replica}')
+ORDER BY (KeyID);
+
+insert into t_hardware_error values (1), (2), (3), (4), (5); 
+
+system enable failpoint replicated_merge_tree_commit_zk_fail_after_op;
+
+insert into t_hardware_error values (6), (7), (8), (9), (10); 
+
+select count() from t_hardware_error;
+
+system disable failpoint replicated_commit_zk_fail_after_op;
+
+DROP TABLE t_hardware_error NO DELAY;
diff --git a/tests/queries/0_stateless/02718_parquet_metadata_format.reference b/tests/queries/0_stateless/02718_parquet_metadata_format.reference
new file mode 100644
index 00000000000..1f55c29da56
--- /dev/null
+++ b/tests/queries/0_stateless/02718_parquet_metadata_format.reference
@@ -0,0 +1,225 @@
+{
+    "num_columns": "3",
+    "num_rows": "100000",
+    "num_row_groups": "2",
+    "format_version": "2.6",
+    "metadata_size": "617",
+    "total_uncompressed_size": "314147",
+    "total_compressed_size": "27081",
+    "columns": [
+        {
+            "name": "number",
+            "path": "number",
+            "max_definition_level": "0",
+            "max_repetition_level": "0",
+            "physical_type": "INT32",
+            "logical_type": "Int(bitWidth=16, isSigned=false)",
+            "compression": "LZ4",
+            "total_uncompressed_size": "133321",
+            "total_compressed_size": "13293",
+            "space_saved": "90.03%",
+            "encodings": [
+                "RLE_DICTIONARY",
+                "PLAIN",
+                "RLE"
+            ]
+        },
+        {
+            "name": "str",
+            "path": "str",
+            "max_definition_level": "0",
+            "max_repetition_level": "0",
+            "physical_type": "BYTE_ARRAY",
+            "logical_type": "None",
+            "compression": "LZ4",
+            "total_uncompressed_size": "149115",
+            "total_compressed_size": "13340",
+            "space_saved": "91.05%",
+            "encodings": [
+                "RLE_DICTIONARY",
+                "PLAIN",
+                "RLE"
+            ]
+        },
+        {
+            "name": "mod",
+            "path": "mod",
+            "max_definition_level": "1",
+            "max_repetition_level": "0",
+            "physical_type": "INT32",
+            "logical_type": "Int(bitWidth=8, isSigned=false)",
+            "compression": "LZ4",
+            "total_uncompressed_size": "31711",
+            "total_compressed_size": "448",
+            "space_saved": "98.59%",
+            "encodings": [
+                "RLE_DICTIONARY",
+                "PLAIN",
+                "RLE"
+            ]
+        }
+    ],
+    "row_groups": [
+        {
+            "num_columns": "3",
+            "num_rows": "65409",
+            "total_uncompressed_size": "200527",
+            "total_compressed_size": "14406",
+            "columns": [
+                {
+                    "name": "number",
+                    "path": "number",
+                    "total_compressed_size": "7070",
+                    "total_uncompressed_size": "85956",
+                    "have_statistics": true,
+                    "statistics": {
+                        "num_values": "65409",
+                        "null_count": "0",
+                        "distinct_count": null,
+                        "min": "0",
+                        "max": "999"
+                    }
+                },
+                {
+                    "name": "str",
+                    "path": "str",
+                    "total_compressed_size": "7093",
+                    "total_uncompressed_size": "93853",
+                    "have_statistics": true,
+                    "statistics": {
+                        "num_values": "65409",
+                        "null_count": "0",
+                        "distinct_count": null,
+                        "min": "Hello0",
+                        "max": "Hello999"
+                    }
+                },
+                {
+                    "name": "mod",
+                    "path": "mod",
+                    "total_compressed_size": "243",
+                    "total_uncompressed_size": "20718",
+                    "have_statistics": true,
+                    "statistics": {
+                        "num_values": "32705",
+                        "null_count": "32704",
+                        "distinct_count": null,
+                        "min": "0",
+                        "max": "8"
+                    }
+                }
+            ]
+        },
+        {
+            "num_columns": "3",
+            "num_rows": "34591",
+            "total_uncompressed_size": "113620",
+            "total_compressed_size": "12675",
+            "columns": [
+                {
+                    "name": "number",
+                    "path": "number",
+                    "total_compressed_size": "6223",
+                    "total_uncompressed_size": "47365",
+                    "have_statistics": true,
+                    "statistics": {
+                        "num_values": "34591",
+                        "null_count": "0",
+                        "distinct_count": null,
+                        "min": "0",
+                        "max": "999"
+                    }
+                },
+                {
+                    "name": "str",
+                    "path": "str",
+                    "total_compressed_size": "6247",
+                    "total_uncompressed_size": "55262",
+                    "have_statistics": true,
+                    "statistics": {
+                        "num_values": "34591",
+                        "null_count": "0",
+                        "distinct_count": null,
+                        "min": "Hello0",
+                        "max": "Hello999"
+                    }
+                },
+                {
+                    "name": "mod",
+                    "path": "mod",
+                    "total_compressed_size": "205",
+                    "total_uncompressed_size": "10993",
+                    "have_statistics": true,
+                    "statistics": {
+                        "num_values": "17295",
+                        "null_count": "17296",
+                        "distinct_count": null,
+                        "min": "0",
+                        "max": "8"
+                    }
+                }
+            ]
+        }
+    ]
+}
+{
+    "num_columns": "3",
+    "format_version": "2.6"
+}
+{
+    "columns": [
+        {
+            "name": "number",
+            "path": "number",
+            "max_definition_level": "0",
+            "max_repetition_level": "0",
+            "physical_type": "INT32",
+            "logical_type": "Int(bitWidth=16, isSigned=false)",
+            "compression": "LZ4",
+            "total_uncompressed_size": "133321",
+            "total_compressed_size": "13293",
+            "space_saved": "90.03%",
+            "encodings": [
+                "RLE_DICTIONARY",
+                "PLAIN",
+                "RLE"
+            ]
+        },
+        {
+            "name": "str",
+            "path": "str",
+            "max_definition_level": "0",
+            "max_repetition_level": "0",
+            "physical_type": "BYTE_ARRAY",
+            "logical_type": "None",
+            "compression": "LZ4",
+            "total_uncompressed_size": "149115",
+            "total_compressed_size": "13340",
+            "space_saved": "91.05%",
+            "encodings": [
+                "RLE_DICTIONARY",
+                "PLAIN",
+                "RLE"
+            ]
+        },
+        {
+            "name": "mod",
+            "path": "mod",
+            "max_definition_level": "1",
+            "max_repetition_level": "0",
+            "physical_type": "INT32",
+            "logical_type": "Int(bitWidth=8, isSigned=false)",
+            "compression": "LZ4",
+            "total_uncompressed_size": "31711",
+            "total_compressed_size": "448",
+            "space_saved": "98.59%",
+            "encodings": [
+                "RLE_DICTIONARY",
+                "PLAIN",
+                "RLE"
+            ]
+        }
+    ]
+}
+1
+1
diff --git a/tests/queries/0_stateless/02718_parquet_metadata_format.sh b/tests/queries/0_stateless/02718_parquet_metadata_format.sh
new file mode 100755
index 00000000000..94d7f453850
--- /dev/null
+++ b/tests/queries/0_stateless/02718_parquet_metadata_format.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select * from file('$CURDIR/data_parquet/02718_data.parquet', ParquetMetadata) format JSONEachRow" | python3 -m json.tool
+
+$CLICKHOUSE_LOCAL -q "select num_columns, format_version from file('$CURDIR/data_parquet/02718_data.parquet', ParquetMetadata, 'num_columns UInt64, format_version String') format JSONEachRow" | python3 -m json.tool
+
+$CLICKHOUSE_LOCAL -q "select columns from file('$CURDIR/data_parquet/02718_data.parquet', ParquetMetadata) format JSONEachRow" | python3 -m json.tool
+
+
+$CLICKHOUSE_LOCAL -q "select some_column from file('$CURDIR/data_parquet/02718_data.parquet', ParquetMetadata, 'some_column Array(UInt32)')" 2>&1 | grep -c "BAD_ARGUMENTS"
+
+$CLICKHOUSE_LOCAL -q "select num_columns from file('$CURDIR/data_parquet/02718_data.parquet', ParquetMetadata, 'num_columns Array(UInt32)')" 2>&1 | grep -c "BAD_ARGUMENTS"
+
+
diff --git a/tests/queries/0_stateless/02719_aggregate_with_empty_string_key.reference b/tests/queries/0_stateless/02719_aggregate_with_empty_string_key.reference
new file mode 100644
index 00000000000..e9b4456e5c7
--- /dev/null
+++ b/tests/queries/0_stateless/02719_aggregate_with_empty_string_key.reference
@@ -0,0 +1,4 @@
+-----------String------------
+\N	1
+	2
+s	1
diff --git a/tests/queries/0_stateless/02719_aggregate_with_empty_string_key.sql b/tests/queries/0_stateless/02719_aggregate_with_empty_string_key.sql
new file mode 100644
index 00000000000..7930b2ca0cc
--- /dev/null
+++ b/tests/queries/0_stateless/02719_aggregate_with_empty_string_key.sql
@@ -0,0 +1,7 @@
+drop table if exists test ;
+create table test(str Nullable(String), i Int64) engine=Memory();
+insert into test values(null, 1),('', 2),('s', 1);
+select '-----------String------------';
+select str ,max(i) from test group by str;
+
+drop table test;
diff --git a/tests/queries/0_stateless/02720_row_policy_column_with_dots.reference b/tests/queries/0_stateless/02720_row_policy_column_with_dots.reference
new file mode 100644
index 00000000000..dd2c30cc9f8
--- /dev/null
+++ b/tests/queries/0_stateless/02720_row_policy_column_with_dots.reference
@@ -0,0 +1 @@
+2024-01-01	Hello	World
diff --git a/tests/queries/0_stateless/02720_row_policy_column_with_dots.sql b/tests/queries/0_stateless/02720_row_policy_column_with_dots.sql
new file mode 100644
index 00000000000..361bd0e0ec7
--- /dev/null
+++ b/tests/queries/0_stateless/02720_row_policy_column_with_dots.sql
@@ -0,0 +1,6 @@
+CREATE table if not exists table_with_dot_column (date Date, regular_column String, `other_column.2` String) ENGINE = MergeTree() ORDER BY date;
+INSERT INTO table_with_dot_column select '2020-01-01', 'Hello', 'World';
+INSERT INTO table_with_dot_column select '2024-01-01', 'Hello', 'World';
+CREATE ROW POLICY IF NOT EXISTS row_policy ON table_with_dot_column USING toDate(date) >= today() - 30 TO ALL;
+SELECT * FROM table_with_dot_column;
+DROP TABLE table_with_dot_column;
diff --git a/tests/queries/0_stateless/02720_s3_strict_upload_part_size.reference b/tests/queries/0_stateless/02720_s3_strict_upload_part_size.reference
new file mode 100644
index 00000000000..f7c4ece5f1f
--- /dev/null
+++ b/tests/queries/0_stateless/02720_s3_strict_upload_part_size.reference
@@ -0,0 +1,4 @@
+part size: 6000001, part number: 1
+part size: 6000001, part number: 2
+part size: 6000001, part number: 3
+part size: 2971517, part number: 4
diff --git a/tests/queries/0_stateless/02720_s3_strict_upload_part_size.sh b/tests/queries/0_stateless/02720_s3_strict_upload_part_size.sh
new file mode 100755
index 00000000000..9799ef0478a
--- /dev/null
+++ b/tests/queries/0_stateless/02720_s3_strict_upload_part_size.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, long
+# Tag no-fasttest: requires S3
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+in="$CUR_DIR/$CLICKHOUSE_TEST_UNIQUE_NAME.in"
+out="$CUR_DIR/$CLICKHOUSE_TEST_UNIQUE_NAME.out"
+log="$CUR_DIR/$CLICKHOUSE_TEST_UNIQUE_NAME.log"
+
+set -e
+trap 'rm -f "${out:?}" "${in:?}" "${log:?}"' EXIT
+
+# Generate a file of 20MiB in size, with our part size it will have 4 parts
+# NOTE: 1 byte is for new line, so 1023 not 1024
+$CLICKHOUSE_LOCAL -q "SELECT randomPrintableASCII(1023) FROM numbers(20*1024) FORMAT LineAsString" > "$in"
+
+$CLICKHOUSE_CLIENT --send_logs_level=trace --server_logs_file="$log" -q "INSERT INTO FUNCTION s3(s3_conn, filename='$CLICKHOUSE_TEST_UNIQUE_NAME', format='LineAsString', structure='line String') FORMAT LineAsString" --s3_strict_upload_part_size=6000001 < "$in"
+grep -F '<Fatal>' "$log" || :
+grep -o 'WriteBufferFromS3: writePart.*, part size: .*' "$log" | grep -o 'part size: .*'
+$CLICKHOUSE_CLIENT -q "SELECT * FROM s3(s3_conn, filename='$CLICKHOUSE_TEST_UNIQUE_NAME', format='LineAsString', structure='line String') FORMAT LineAsString" > "$out"
+
+diff -q "$in" "$out"
diff --git a/tests/queries/0_stateless/02721_parquet_field_not_found.reference b/tests/queries/0_stateless/02721_parquet_field_not_found.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02721_parquet_field_not_found.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02721_parquet_field_not_found.sh b/tests/queries/0_stateless/02721_parquet_field_not_found.sh
new file mode 100755
index 00000000000..72925afec6e
--- /dev/null
+++ b/tests/queries/0_stateless/02721_parquet_field_not_found.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select 42 as x format Parquet" | $CLICKHOUSE_LOCAL --input-format Parquet --structure "x UInt32, y UInt32" -q "select * from table" 2>&1 | grep -c "THERE_IS_NO_COLUMN"
+
diff --git a/tests/queries/0_stateless/02721_url_cluster.reference b/tests/queries/0_stateless/02721_url_cluster.reference
new file mode 100644
index 00000000000..36ef7609920
--- /dev/null
+++ b/tests/queries/0_stateless/02721_url_cluster.reference
@@ -0,0 +1,136 @@
+0	0	0
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+20	21	22
+23	24	25
+26	27	28
+0	0	0
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+20	21	22
+23	24	25
+26	27	28
+0	0	0
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+20	21	22
+23	24	25
+26	27	28
+0	0	0
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+20	21	22
+23	24	25
+26	27	28
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	UInt64					
+c2	UInt64					
+c3	UInt64					
+c1	UInt64					
+c2	UInt64					
+c3	UInt64					
+12
+12
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+1	2	3
+4	5	6
+7	8	9
+0	0	0
diff --git a/tests/queries/0_stateless/02721_url_cluster.sql b/tests/queries/0_stateless/02721_url_cluster.sql
new file mode 100644
index 00000000000..c30b03495cd
--- /dev/null
+++ b/tests/queries/0_stateless/02721_url_cluster.sql
@@ -0,0 +1,40 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
+select * from urlCluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/{a,b,c}.tsv') ORDER BY c1, c2, c3;
+select * from urlCluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/{a,b,c}.tsv', 'TSV') ORDER BY c1, c2, c3;
+select * from urlCluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/{a,b,c}.tsv', 'TSV', 'c1 UInt64, c2 UInt64, c3 UInt64') ORDER BY c1, c2, c3;
+select * from urlCluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/{a,b,c}.tsv', 'TSV', 'c1 UInt64, c2 UInt64, c3 UInt64', 'auto') ORDER BY c1, c2, c3;
+
+desc urlCluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/{a,b,c}.tsv');
+desc urlCluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/{a,b,c}.tsv', 'TSV');
+desc urlCluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/{a,b,c}.tsv', 'TSV', 'c1 UInt64, c2 UInt64, c3 UInt64');
+desc urlCluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/{a,b,c}.tsv', 'TSV', 'c1 UInt64, c2 UInt64, c3 UInt64', 'auto');
+
+select COUNT() from urlCluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/{a,b,c}.tsv');
+select COUNT(*) from urlCluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/{a,b,c}.tsv');
+
+desc urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv');
+desc urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV');
+desc urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'auto');
+desc urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto');
+desc urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto', 'auto');
+
+desc urlCluster('test_cluster_one_shard_three_replicas_localhost', headers('X-ClickHouse-Database'='default'), 'http://localhost:11111/test/{a,b}.tsv');
+desc urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', headers('X-ClickHouse-Database'='default'), 'TSV');
+desc urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'auto', headers('X-ClickHouse-Database'='default'));
+desc urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto', headers('X-ClickHouse-Database'='default'));
+desc urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', headers('X-ClickHouse-Database'='default'), 'auto', 'auto');
+
+select * from urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv') order by c1, c2, c3;
+select * from urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV') order by c1, c2, c3;
+select * from urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'auto') order by c1, c2, c3;
+select * from urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto') order by c1, c2, c3;
+select * from urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/{a,b}.tsv', 'TSV', 'auto', 'auto') order by c1, c2, c3;
+
+drop table if exists test;
+create table test (x UInt32, y UInt32, z UInt32) engine=Memory();
+insert into test select * from urlCluster('test_cluster_one_shard_three_replicas_localhost', 'http://localhost:11111/test/a.tsv', 'TSV');
+select * from test;
+drop table test;
+
diff --git a/tests/queries/0_stateless/02722_line_as_string_consistency.reference b/tests/queries/0_stateless/02722_line_as_string_consistency.reference
new file mode 100644
index 00000000000..f71e78457a8
--- /dev/null
+++ b/tests/queries/0_stateless/02722_line_as_string_consistency.reference
@@ -0,0 +1,7 @@
+0D48656C6C6F	9999
+0D	1
+48656C6C6F	1
+---
+0D48656C6C6F	9999
+0D	1
+48656C6C6F	1
diff --git a/tests/queries/0_stateless/02722_line_as_string_consistency.sh b/tests/queries/0_stateless/02722_line_as_string_consistency.sh
new file mode 100755
index 00000000000..be1942a9164
--- /dev/null
+++ b/tests/queries/0_stateless/02722_line_as_string_consistency.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# The LineAsString format reads every line until the newline character (\n).
+# The DOS or MacOS Classic line breaks \r\n or \n\r don't have special support.
+
+# While the behavior described above can be changed in future to add the support for DOS or MacOS Classic,
+# the most important is that it should be exactly the same (consistent)
+# regardless whether the parallel parsing enabled or not,
+# and this test checks that.
+
+for _ in {1..10000}; do echo -ne 'Hello\n\r'; done | $CLICKHOUSE_LOCAL --min_chunk_bytes_for_parallel_parsing 1 --input_format_parallel_parsing 0 --query "SELECT hex(*), count() FROM table GROUP BY ALL ORDER BY 2 DESC, 1" --input-format LineAsString
+echo '---'
+for _ in {1..10000}; do echo -ne 'Hello\n\r'; done | $CLICKHOUSE_LOCAL --min_chunk_bytes_for_parallel_parsing 1 --input_format_parallel_parsing 1 --query "SELECT hex(*), count() FROM table GROUP BY ALL ORDER BY 2 DESC, 1" --input-format LineAsString
diff --git a/tests/queries/0_stateless/02722_log_profile_events.reference b/tests/queries/0_stateless/02722_log_profile_events.reference
new file mode 100644
index 00000000000..0d66ea1aee9
--- /dev/null
+++ b/tests/queries/0_stateless/02722_log_profile_events.reference
@@ -0,0 +1,2 @@
+0
+1
diff --git a/tests/queries/0_stateless/02722_log_profile_events.sql b/tests/queries/0_stateless/02722_log_profile_events.sql
new file mode 100644
index 00000000000..07e2d524d53
--- /dev/null
+++ b/tests/queries/0_stateless/02722_log_profile_events.sql
@@ -0,0 +1,5 @@
+-- There are no fatal errors:
+SELECT count() FROM system.events WHERE event = 'LogFatal';
+
+-- It counts the trace log messages:
+SELECT count() > 0 FROM system.events WHERE event = 'LogTrace';
diff --git a/tests/queries/0_stateless/02723_jit_aggregation_bug_48120.reference b/tests/queries/0_stateless/02723_jit_aggregation_bug_48120.reference
new file mode 100644
index 00000000000..6f9b4b4fc6a
--- /dev/null
+++ b/tests/queries/0_stateless/02723_jit_aggregation_bug_48120.reference
@@ -0,0 +1,7 @@
+-- { echoOn }
+SYSTEM DROP COMPILED EXPRESSION CACHE;
+SELECT minIf(num1, num1 < 5) FROM dummy GROUP BY num2;
+0
+SYSTEM DROP COMPILED EXPRESSION CACHE;
+SELECT minIf(num1, num1 >= 5) FROM dummy GROUP BY num2;
+5
diff --git a/tests/queries/0_stateless/02723_jit_aggregation_bug_48120.sql b/tests/queries/0_stateless/02723_jit_aggregation_bug_48120.sql
new file mode 100644
index 00000000000..04e0fc5e0ba
--- /dev/null
+++ b/tests/queries/0_stateless/02723_jit_aggregation_bug_48120.sql
@@ -0,0 +1,17 @@
+-- Tags: no-fasttest, no-ubsan, no-cpu-aarch64
+
+drop table if exists dummy;
+CREATE TABLE dummy ( num1 Int32, num2 Enum8('foo' = 0, 'bar' = 1, 'tar' = 2) )
+ENGINE = MergeTree ORDER BY num1 as select 5, 'bar';
+
+set compile_aggregate_expressions=1;
+set min_count_to_compile_aggregate_expression=0;
+
+-- { echoOn }
+SYSTEM DROP COMPILED EXPRESSION CACHE;
+SELECT minIf(num1, num1 < 5) FROM dummy GROUP BY num2;
+SYSTEM DROP COMPILED EXPRESSION CACHE;
+SELECT minIf(num1, num1 >= 5) FROM dummy GROUP BY num2;
+-- { echoOff }
+
+drop table dummy;
diff --git a/tests/queries/0_stateless/02723_parallelize_output_setting.reference b/tests/queries/0_stateless/02723_parallelize_output_setting.reference
new file mode 100644
index 00000000000..0f2a396f471
--- /dev/null
+++ b/tests/queries/0_stateless/02723_parallelize_output_setting.reference
@@ -0,0 +1,7 @@
+-- { echoOn }
+set parallelize_output_from_storages=1;
+select startsWith(trimLeft(explain),'Resize') as resize from (explain pipeline select * from file(data_02723.csv)) where resize;
+1
+-- no Resize in pipeline
+set parallelize_output_from_storages=0;
+select startsWith(trimLeft(explain),'Resize') as resize from (explain pipeline select * from file(data_02723.csv)) where resize;
diff --git a/tests/queries/0_stateless/02723_parallelize_output_setting.sql b/tests/queries/0_stateless/02723_parallelize_output_setting.sql
new file mode 100644
index 00000000000..7db28ca4dec
--- /dev/null
+++ b/tests/queries/0_stateless/02723_parallelize_output_setting.sql
@@ -0,0 +1,12 @@
+-- Tags: no-parallel
+
+insert into function file(data_02723.csv) select number from numbers(5) settings engine_file_truncate_on_insert=1;
+
+set max_threads=2;
+-- { echoOn }
+set parallelize_output_from_storages=1;
+select startsWith(trimLeft(explain),'Resize') as resize from (explain pipeline select * from file(data_02723.csv)) where resize;
+-- no Resize in pipeline
+set parallelize_output_from_storages=0;
+select startsWith(trimLeft(explain),'Resize') as resize from (explain pipeline select * from file(data_02723.csv)) where resize;
+
diff --git a/tests/queries/0_stateless/02723_param_exception_message_context.reference b/tests/queries/0_stateless/02723_param_exception_message_context.reference
new file mode 100644
index 00000000000..286f53421b5
--- /dev/null
+++ b/tests/queries/0_stateless/02723_param_exception_message_context.reference
@@ -0,0 +1 @@
+for query parameter 'x'
diff --git a/tests/queries/0_stateless/02723_param_exception_message_context.sh b/tests/queries/0_stateless/02723_param_exception_message_context.sh
new file mode 100755
index 00000000000..d37badd444f
--- /dev/null
+++ b/tests/queries/0_stateless/02723_param_exception_message_context.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# The exception message about unparsed parameter also tells about the name of the parameter.
+$CLICKHOUSE_CLIENT --param_x Hello --query "SELECT {x:Array(String)}" 2>&1 | rg -oF "for query parameter 'x'" | uniq
diff --git a/tests/queries/0_stateless/02723_zookeeper_name.reference b/tests/queries/0_stateless/02723_zookeeper_name.reference
new file mode 100644
index 00000000000..074712bd8fe
--- /dev/null
+++ b/tests/queries/0_stateless/02723_zookeeper_name.reference
@@ -0,0 +1,4 @@
+Create Tables
+Insert Data
+"t1","default",1
+"t2","default",1
diff --git a/tests/queries/0_stateless/02723_zookeeper_name.sql b/tests/queries/0_stateless/02723_zookeeper_name.sql
new file mode 100644
index 00000000000..e6374767951
--- /dev/null
+++ b/tests/queries/0_stateless/02723_zookeeper_name.sql
@@ -0,0 +1,23 @@
+-- Tags: zookeeper, replica
+
+SELECT 'Create Tables';
+CREATE TABLE t1(k UInt32, v UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_02723/zookeeper_name/t1', '1') ORDER BY k;
+
+CREATE TABLE t2(k UInt32, v UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_02723/zookeeper_name/t2', '1') ORDER BY k;
+
+SELECT 'Insert Data';
+
+INSERT INTO t1 SELECT * FROM generateRandom('k UInt32, v UInt32') LIMIT 1;
+INSERT INTO t2 SELECT * FROM generateRandom('k UInt32, v UInt32') LIMIT 1;
+
+SELECT
+    table, zookeeper_name, count()
+FROM system.replicas
+INNER JOIN system.parts USING (database, table)
+WHERE database = currentDatabase()
+GROUP BY table, zookeeper_name
+ORDER BY table, zookeeper_name
+FORMAT CSV;
+
+DROP TABLE t1;
+DROP TABLE t2;
diff --git a/tests/queries/0_stateless/02724_decompress_filename_exception.reference b/tests/queries/0_stateless/02724_decompress_filename_exception.reference
new file mode 100644
index 00000000000..f9c5aacff7b
--- /dev/null
+++ b/tests/queries/0_stateless/02724_decompress_filename_exception.reference
@@ -0,0 +1,8 @@
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
diff --git a/tests/queries/0_stateless/02724_decompress_filename_exception.sh b/tests/queries/0_stateless/02724_decompress_filename_exception.sh
new file mode 100755
index 00000000000..bbc2b8d066b
--- /dev/null
+++ b/tests/queries/0_stateless/02724_decompress_filename_exception.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+FILENAME="${USER_FILES_PATH}/corrupted_file.tsv.xx"
+
+echo 'corrupted file' > $FILENAME;
+
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file('${FILENAME}', 'TSV', 'c UInt32', 'gzip')" 2>&1    | grep -q "While reading from: $FILENAME" && echo 'Ok' || echo 'Fail';
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file('${FILENAME}', 'TSV', 'c UInt32', 'deflate')" 2>&1 | grep -q "While reading from: $FILENAME" && echo 'Ok' || echo 'Fail';
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file('${FILENAME}', 'TSV', 'c UInt32', 'br')" 2>&1      | grep -q "While reading from: $FILENAME" && echo 'Ok' || echo 'Fail';
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file('${FILENAME}', 'TSV', 'c UInt32', 'xz')" 2>&1      | grep -q "While reading from: $FILENAME" && echo 'Ok' || echo 'Fail';
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file('${FILENAME}', 'TSV', 'c UInt32', 'zstd')" 2>&1    | grep -q "While reading from: $FILENAME" && echo 'Ok' || echo 'Fail';
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file('${FILENAME}', 'TSV', 'c UInt32', 'lz4')" 2>&1     | grep -q "While reading from: $FILENAME" && echo 'Ok' || echo 'Fail';
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file('${FILENAME}', 'TSV', 'c UInt32', 'bz2')" 2>&1     | grep -q "While reading from: $FILENAME" && echo 'Ok' || echo 'Fail';
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file('${FILENAME}', 'TSV', 'c UInt32', 'snappy')" 2>&1  | grep -q "While reading from: $FILENAME" && echo 'Ok' || echo 'Fail';
+
+rm $FILENAME;
diff --git a/tests/queries/0_stateless/02724_delay_mutations.reference b/tests/queries/0_stateless/02724_delay_mutations.reference
new file mode 100644
index 00000000000..16bd972a06d
--- /dev/null
+++ b/tests/queries/0_stateless/02724_delay_mutations.reference
@@ -0,0 +1,8 @@
+1	2
+4
+1	6
+0
+ALTER TABLE t_delay_mutations UPDATE v = 3 WHERE 1;	0	0
+ALTER TABLE t_delay_mutations UPDATE v = 4 WHERE 1;	0	0
+ALTER TABLE t_delay_mutations UPDATE v = 5 WHERE 1;	1	1
+ALTER TABLE t_delay_mutations UPDATE v = 6 WHERE 1;	1	1
diff --git a/tests/queries/0_stateless/02724_delay_mutations.sh b/tests/queries/0_stateless/02724_delay_mutations.sh
new file mode 100755
index 00000000000..f349e29253a
--- /dev/null
+++ b/tests/queries/0_stateless/02724_delay_mutations.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# shellcheck source=./mergetree_mutations.lib
+. "$CURDIR"/mergetree_mutations.lib
+
+${CLICKHOUSE_CLIENT} -n --query "
+DROP TABLE IF EXISTS t_delay_mutations SYNC;
+
+CREATE TABLE t_delay_mutations (id UInt64, v UInt64)
+ENGINE = MergeTree ORDER BY id
+SETTINGS
+    number_of_mutations_to_delay = 2,
+    number_of_mutations_to_throw = 10,
+    min_delay_to_mutate_ms = 10,
+    min_delay_to_mutate_ms = 1000;
+
+SET mutations_sync = 0;
+SYSTEM STOP MERGES t_delay_mutations;
+
+INSERT INTO t_delay_mutations VALUES (1, 2);
+
+ALTER TABLE t_delay_mutations UPDATE v = 3 WHERE 1;
+ALTER TABLE t_delay_mutations UPDATE v = 4 WHERE 1;
+
+ALTER TABLE t_delay_mutations UPDATE v = 5 WHERE 1;
+ALTER TABLE t_delay_mutations UPDATE v = 6 WHERE 1;
+
+SELECT * FROM t_delay_mutations ORDER BY id;
+SELECT count() FROM system.mutations WHERE database = currentDatabase() AND table = 't_delay_mutations' AND NOT is_done;
+"
+
+${CLICKHOUSE_CLIENT} --query "SYSTEM START MERGES t_delay_mutations"
+wait_for_mutation "t_delay_mutations" "mutation_5.txt"
+
+${CLICKHOUSE_CLIENT} -n --query "
+SELECT * FROM t_delay_mutations ORDER BY id;
+SELECT count() FROM system.mutations WHERE database = currentDatabase() AND table = 't_delay_mutations' AND NOT is_done;
+
+DROP TABLE IF EXISTS t_delay_mutations SYNC;
+"
+
+${CLICKHOUSE_CLIENT} -n --query "
+SYSTEM FLUSH LOGS;
+
+SELECT
+    query,
+    ProfileEvents['DelayedMutations'],
+    ProfileEvents['DelayedMutationsMilliseconds'] BETWEEN 10 AND 1000
+FROM system.query_log
+WHERE
+    type = 'QueryFinish' AND
+    current_database = '$CLICKHOUSE_DATABASE' AND
+    query ILIKE 'ALTER TABLE t_delay_mutations UPDATE%'
+ORDER BY query;
+"
diff --git a/tests/queries/0_stateless/02724_function_in_left_table_clause_asof_join.reference b/tests/queries/0_stateless/02724_function_in_left_table_clause_asof_join.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02724_function_in_left_table_clause_asof_join.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02724_function_in_left_table_clause_asof_join.sql b/tests/queries/0_stateless/02724_function_in_left_table_clause_asof_join.sql
new file mode 100644
index 00000000000..13dfb5debe7
--- /dev/null
+++ b/tests/queries/0_stateless/02724_function_in_left_table_clause_asof_join.sql
@@ -0,0 +1,8 @@
+select count(*)
+from (
+  select 1 as id, [1, 2, 3] as arr
+) as sessions
+ASOF LEFT JOIN (
+  select 1 as session_id, 4 as id
+) as visitors
+ON visitors.session_id <= sessions.id AND arrayFirst(a -> a, arrayMap((a) -> a, sessions.arr)) = visitors.id
diff --git a/tests/queries/0_stateless/02724_jit_logical_functions.reference b/tests/queries/0_stateless/02724_jit_logical_functions.reference
new file mode 100644
index 00000000000..673ffe02613
--- /dev/null
+++ b/tests/queries/0_stateless/02724_jit_logical_functions.reference
@@ -0,0 +1,18 @@
+Logical functions not null
+0	0	0	0	0
+0	1	0	1	1
+1	0	0	1	1
+1	1	1	1	0
+Logical functions nullable
+0	0	0	0	0
+0	1	0	1	1
+1	0	0	1	1
+1	1	1	1	0
+0	\N	0	\N	\N
+1	\N	\N	1	\N
+0	0	0
+1	1	0
+0	0	0
+1	1	0
+\N	\N	\N
+\N	\N	\N
diff --git a/tests/queries/0_stateless/02724_jit_logical_functions.sql b/tests/queries/0_stateless/02724_jit_logical_functions.sql
new file mode 100644
index 00000000000..fe6646337d0
--- /dev/null
+++ b/tests/queries/0_stateless/02724_jit_logical_functions.sql
@@ -0,0 +1,21 @@
+SET compile_expressions = 1;
+SET min_count_to_compile_expression = 0;
+
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table (a UInt8, b UInt8) ENGINE = TinyLog;
+INSERT INTO test_table VALUES (0, 0), (0, 1), (1, 0), (1, 1);
+
+SELECT 'Logical functions not null';
+SELECT a, b, and(a, b), or(a, b), xor(a, b) FROM test_table;
+
+DROP TABLE test_table;
+
+DROP TABLE IF EXISTS test_table_nullable;
+CREATE TABLE test_table_nullable (a UInt8, b Nullable(UInt8)) ENGINE = TinyLog;
+INSERT INTO test_table_nullable VALUES (0, 0), (0, 1), (1, 0), (1, 1), (0, NULL), (1, NULL);
+
+SELECT 'Logical functions nullable';
+SELECT a, b, and(a, b), or(a, b), xor(a, b) FROM test_table_nullable;
+SELECT and(b, b), or(b, b), xor(b, b) FROM test_table_nullable;
+
+DROP TABLE test_table_nullable;
diff --git a/tests/queries/0_stateless/02724_limit_num_mutations.reference b/tests/queries/0_stateless/02724_limit_num_mutations.reference
new file mode 100644
index 00000000000..5742648c79d
--- /dev/null
+++ b/tests/queries/0_stateless/02724_limit_num_mutations.reference
@@ -0,0 +1,9 @@
+1	2
+2
+CREATE TABLE default.t_limit_mutations\n(\n    `id` UInt64,\n    `v` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/t_limit_mutations\', \'1\')\nORDER BY id\nSETTINGS number_of_mutations_to_throw = 2, index_granularity = 8192
+1	2
+4
+CREATE TABLE default.t_limit_mutations\n(\n    `id` UInt64,\n    `v` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/t_limit_mutations\', \'1\')\nORDER BY id\nSETTINGS number_of_mutations_to_throw = 2, index_granularity = 8192
+1	6
+0
+CREATE TABLE default.t_limit_mutations\n(\n    `id` UInt64,\n    `v` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/t_limit_mutations\', \'1\')\nORDER BY id\nSETTINGS number_of_mutations_to_throw = 2, index_granularity = 8192
diff --git a/tests/queries/0_stateless/02724_limit_num_mutations.sh b/tests/queries/0_stateless/02724_limit_num_mutations.sh
new file mode 100755
index 00000000000..a9d69b2ed48
--- /dev/null
+++ b/tests/queries/0_stateless/02724_limit_num_mutations.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# shellcheck source=./mergetree_mutations.lib
+. "$CURDIR"/mergetree_mutations.lib
+
+set -e
+
+function wait_for_alter()
+{
+    type=$1
+    for i in {1..100}; do
+        sleep 0.1
+        ${CLICKHOUSE_CLIENT} --query "SHOW CREATE TABLE t_limit_mutations" | grep -q "\`v\` $type" && break;
+
+        if [[ $i -eq 100 ]]; then
+            echo "Timed out while waiting for alter to execute"
+        fi
+    done
+}
+
+${CLICKHOUSE_CLIENT} -n --query "
+DROP TABLE IF EXISTS t_limit_mutations SYNC;
+
+CREATE TABLE t_limit_mutations (id UInt64, v UInt64)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/t_limit_mutations', '1') ORDER BY id
+SETTINGS number_of_mutations_to_throw = 2;
+
+SET mutations_sync = 0;
+SYSTEM STOP MERGES t_limit_mutations;
+
+INSERT INTO t_limit_mutations VALUES (1, 2);
+
+ALTER TABLE t_limit_mutations UPDATE v = 3 WHERE 1;
+ALTER TABLE t_limit_mutations UPDATE v = 4 WHERE 1;
+
+SYSTEM SYNC REPLICA t_limit_mutations PULL;
+
+ALTER TABLE t_limit_mutations UPDATE v = 5 WHERE 1; -- { serverError TOO_MANY_MUTATIONS }
+ALTER TABLE t_limit_mutations MODIFY COLUMN v String; -- { serverError TOO_MANY_MUTATIONS }
+
+SELECT * FROM t_limit_mutations ORDER BY id;
+SELECT count() FROM system.mutations WHERE database = currentDatabase() AND table = 't_limit_mutations' AND NOT is_done;
+SHOW CREATE TABLE t_limit_mutations;
+"
+
+${CLICKHOUSE_CLIENT} -n --query "
+ALTER TABLE t_limit_mutations UPDATE v = 6 WHERE 1 SETTINGS number_of_mutations_to_throw = 100;
+ALTER TABLE t_limit_mutations MODIFY COLUMN v String SETTINGS number_of_mutations_to_throw = 100, alter_sync = 0;
+"
+
+wait_for_alter "String"
+
+${CLICKHOUSE_CLIENT} -n --query "
+SELECT * FROM t_limit_mutations ORDER BY id;
+SELECT count() FROM system.mutations WHERE database = currentDatabase() AND table = 't_limit_mutations' AND NOT is_done;
+SHOW CREATE TABLE t_limit_mutations;
+"
+
+${CLICKHOUSE_CLIENT} --query "SYSTEM START MERGES t_limit_mutations"
+
+wait_for_mutation "t_limit_mutations" "0000000003"
+
+${CLICKHOUSE_CLIENT} -n --query "
+SELECT * FROM t_limit_mutations ORDER BY id;
+SELECT count() FROM system.mutations WHERE database = currentDatabase() AND table = 't_limit_mutations' AND NOT is_done;
+SHOW CREATE TABLE t_limit_mutations;
+
+DROP TABLE IF EXISTS t_limit_mutations SYNC;
+"
diff --git a/tests/queries/0_stateless/02724_mutliple_storage_join.reference b/tests/queries/0_stateless/02724_mutliple_storage_join.reference
new file mode 100644
index 00000000000..f7eb44d66e0
--- /dev/null
+++ b/tests/queries/0_stateless/02724_mutliple_storage_join.reference
@@ -0,0 +1,6 @@
+0
+0
+0
+0
+0
+0
diff --git a/tests/queries/0_stateless/02724_mutliple_storage_join.sql b/tests/queries/0_stateless/02724_mutliple_storage_join.sql
new file mode 100644
index 00000000000..286e867704d
--- /dev/null
+++ b/tests/queries/0_stateless/02724_mutliple_storage_join.sql
@@ -0,0 +1,21 @@
+CREATE TABLE user(id UInt32, name String) ENGINE = Join(ANY, LEFT, id);
+INSERT INTO user VALUES (1,'U1')(2,'U2')(3,'U3');
+
+CREATE TABLE product(id UInt32, name String, cate String) ENGINE = Join(ANY, LEFT, id);
+INSERT INTO product VALUES (1,'P1','C1')(2,'P2','C1')(3,'P3','C2');
+
+CREATE TABLE order(id UInt32, pId UInt32, uId UInt32) ENGINE = TinyLog;
+INSERT INTO order VALUES (1,1,1)(2,1,2)(3,2,3);
+
+SELECT ignore(*) FROM (
+    SELECT
+        uId,
+        user.id as `uuu`
+    FROM order
+    LEFT ANY JOIN user
+    ON uId = `uuu`
+);
+
+SELECT ignore(*) FROM order
+LEFT ANY JOIN user ON uId = user.id
+LEFT ANY JOIN product ON pId = product.id;
diff --git a/tests/queries/0_stateless/02724_persist_interval_type.reference b/tests/queries/0_stateless/02724_persist_interval_type.reference
new file mode 100644
index 00000000000..964604605d9
--- /dev/null
+++ b/tests/queries/0_stateless/02724_persist_interval_type.reference
@@ -0,0 +1,6 @@
+2023-01-01 00:00:01.000000001	2023-01-01 02:00:00.000000001	2023-01-01 00:00:00.000000004	1	2	0
+2023-01-01 00:00:02.000000001	2023-01-01 03:00:00.000000001	2023-01-01 00:00:00.000000005	2	3	0
+2023-01-01 00:00:01.000000001	2023-01-01 02:00:00.000000001	2023-01-01 00:00:00.000000004	1	2	0
+2023-01-01 00:00:02.000000001	2023-01-01 03:00:00.000000001	2023-01-01 00:00:00.000000005	2	3	0
+0
+1
diff --git a/tests/queries/0_stateless/02724_persist_interval_type.sql b/tests/queries/0_stateless/02724_persist_interval_type.sql
new file mode 100644
index 00000000000..3acce003c9a
--- /dev/null
+++ b/tests/queries/0_stateless/02724_persist_interval_type.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS saved_intervals_tmp;
+create table saved_intervals_tmp Engine=Memory as SELECT number as EventID, toIntervalSecond(number+1) as v1, toIntervalHour(number+2) as v2, toIntervalNanosecond(number+3) as v3 from numbers(2);
+with toDateTime64('2023-01-01 00:00:00.000000001', 9, 'US/Eastern') as c select c+v1 as c_v1, c+v2 as c_v2, c+v3 as c_v3, date_diff(second, c, c_v1), date_diff(hour, c, c_v2), date_diff(second, c, c_v3) from saved_intervals_tmp;
+DROP TABLE IF EXISTS saved_intervals_tmp;
+
+DROP TABLE IF EXISTS saved_intervals_mgt;
+create table saved_intervals_mgt Engine=MergeTree() ORDER BY EventID as SELECT number as EventID, toIntervalSecond(number+1) as v1, toIntervalHour(number+2) as v2, toIntervalNanosecond(number+3) as v3 from numbers(2);
+with toDateTime64('2023-01-01 00:00:00.000000001', 9, 'US/Eastern') as c select c+v1 as c_v1, c+v2 as c_v2, c+v3 as c_v3, date_diff(second, c, c_v1), date_diff(hour, c, c_v2), date_diff(second, c, c_v3) from saved_intervals_mgt;
+DROP TABLE IF EXISTS saved_intervals_mgt;
+
+DROP TABLE IF EXISTS t1;
+CREATE table t1 (v1 IntervalMinute) ENGINE = Memory;
+INSERT INTO t1 with toDateTime64('2023-01-01 00:00:00.000000001', 9, 'US/Eastern') as c SELECT EXTRACT(MINUTE FROM c+toIntervalSecond(number * 60)) from numbers(2);
+select * from t1;
+DROP TABLE IF EXISTS t1;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02724_show_indexes.reference b/tests/queries/0_stateless/02724_show_indexes.reference
new file mode 100644
index 00000000000..20af3954fa5
--- /dev/null
+++ b/tests/queries/0_stateless/02724_show_indexes.reference
@@ -0,0 +1,42 @@
+--- Aliases of SHOW INDEX
+tbl	0	blf_idx	\N	\N	\N	\N	\N	\N	\N	bloom_filter	\N	\N	YES	d, b
+tbl	0	mm1_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	a, c, d
+tbl	0	mm2_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	c, d, e
+tbl	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	c, a
+tbl	0	set_idx	\N	\N	\N	\N	\N	\N	\N	set	\N	\N	YES	e
+tbl	0	blf_idx	\N	\N	\N	\N	\N	\N	\N	bloom_filter	\N	\N	YES	d, b
+tbl	0	mm1_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	a, c, d
+tbl	0	mm2_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	c, d, e
+tbl	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	c, a
+tbl	0	set_idx	\N	\N	\N	\N	\N	\N	\N	set	\N	\N	YES	e
+tbl	0	blf_idx	\N	\N	\N	\N	\N	\N	\N	bloom_filter	\N	\N	YES	d, b
+tbl	0	mm1_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	a, c, d
+tbl	0	mm2_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	c, d, e
+tbl	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	c, a
+tbl	0	set_idx	\N	\N	\N	\N	\N	\N	\N	set	\N	\N	YES	e
+--- EXTENDED
+tbl	0	blf_idx	\N	\N	\N	\N	\N	\N	\N	bloom_filter	\N	\N	YES	d, b
+tbl	0	mm1_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	a, c, d
+tbl	0	mm2_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	c, d, e
+tbl	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	c, a
+tbl	0	set_idx	\N	\N	\N	\N	\N	\N	\N	set	\N	\N	YES	e
+--- WHERE
+tbl	0	mm1_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	a, c, d
+tbl	0	mm2_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	c, d, e
+--- Check with weird table names
+$4@^7	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	c
+NULL	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	c
+\'	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	c
+\'	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	c
+--- Original table
+tbl	0	blf_idx	\N	\N	\N	\N	\N	\N	\N	bloom_filter	\N	\N	YES	d, b
+tbl	0	mm1_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	a, c, d
+tbl	0	mm2_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	c, d, e
+tbl	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	c, a
+tbl	0	set_idx	\N	\N	\N	\N	\N	\N	\N	set	\N	\N	YES	e
+--- Equally named table in other database
+tbl	0	mmi_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	b
+tbl	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	a
+--- Short form
+tbl	0	mmi_idx	\N	\N	\N	\N	\N	\N	\N	minmax	\N	\N	YES	b
+tbl	0	PRIMARY	\N	\N	A	\N	\N	\N	\N	primary	\N	\N	YES	a
diff --git a/tests/queries/0_stateless/02724_show_indexes.sql b/tests/queries/0_stateless/02724_show_indexes.sql
new file mode 100644
index 00000000000..ce8ed67c524
--- /dev/null
+++ b/tests/queries/0_stateless/02724_show_indexes.sql
@@ -0,0 +1,79 @@
+-- Tags: no-parallel
+-- no-parallel: creates a custom database schema and expects to use it exclusively
+
+-- Create a test table and verify that the output of SHOW INDEXES is sane.
+-- The matching of actual/expected results relies on the fact that the output of SHOW INDEX is sorted.
+DROP TABLE IF EXISTS tbl;
+CREATE TABLE tbl
+(
+    a UInt64,
+    b UInt64,
+    c UInt64,
+    d UInt64,
+    e UInt64,
+    INDEX mm1_idx (a, c, d) TYPE minmax,
+    INDEX mm2_idx (c, d, e) TYPE minmax,
+    INDEX set_idx (e)       TYPE set(100),
+    INDEX blf_idx (d, b)    TYPE bloom_filter(0.8)
+)
+ENGINE = MergeTree
+PRIMARY KEY (c, a);
+
+SELECT '--- Aliases of SHOW INDEX';
+SHOW INDEX FROM tbl;
+SHOW INDEXES FROM tbl;
+SHOW KEYS FROM tbl;
+
+SELECT '--- EXTENDED';
+SHOW EXTENDED INDEX FROM tbl;
+--
+SELECT '--- WHERE';
+SHOW INDEX FROM tbl WHERE index_type LIKE '%minmax%';
+
+SELECT '--- Check with weird table names';
+
+DROP TABLE IF EXISTS `$4@^7`;
+CREATE TABLE `$4@^7` (c String) ENGINE = MergeTree ORDER BY c;
+SHOW INDEX FROM `$4@^7`;
+DROP TABLE `$4@^7`;
+
+DROP TABLE IF EXISTS NULL;
+CREATE TABLE NULL (c String) ENGINE = MergeTree ORDER BY c;
+SHOW INDEX FROM NULL;
+DROP TABLE NULL;
+
+DROP DATABASE IF EXISTS `'`;
+CREATE DATABASE `'`;
+CREATE TABLE `'`.`'` (c String) ENGINE = MergeTree ORDER BY c;
+SHOW INDEX FROM `'` FROM `'`;
+SHOW INDEX FROM `'`.`'`; -- abbreviated form
+DROP TABLE `'`.`'`;
+DROP DATABASE `'`;
+
+-- Create a table in a different database. Intentionally using the same table/column names as above so
+-- we notice if something is buggy in the implementation of SHOW INDEX.
+DROP DATABASE IF EXISTS database_123456789abcde;
+CREATE DATABASE database_123456789abcde; -- pseudo-random database name
+
+DROP TABLE IF EXISTS database_123456789abcde.tbl;
+CREATE TABLE database_123456789abcde.tbl
+(
+    a UInt64,
+    b UInt64,
+    INDEX mmi_idx b TYPE minmax
+)
+ENGINE = MergeTree
+PRIMARY KEY a;
+
+SELECT '--- Original table';
+SHOW INDEX FROM tbl;
+
+SELECT '--- Equally named table in other database';
+SHOW INDEX FROM tbl FROM database_123456789abcde;
+
+SELECT '--- Short form';
+SHOW INDEX FROM database_123456789abcde.tbl;
+
+DROP DATABASE database_123456789abcde;
+
+DROP TABLE tbl;
diff --git a/tests/queries/0_stateless/02725_agg_projection_resprect_PK.reference b/tests/queries/0_stateless/02725_agg_projection_resprect_PK.reference
new file mode 100644
index 00000000000..e6b95502e1e
--- /dev/null
+++ b/tests/queries/0_stateless/02725_agg_projection_resprect_PK.reference
@@ -0,0 +1,2 @@
+      ReadFromMergeTree (p1)
+          Granules: 1/12
diff --git a/tests/queries/0_stateless/02725_agg_projection_resprect_PK.sql b/tests/queries/0_stateless/02725_agg_projection_resprect_PK.sql
new file mode 100644
index 00000000000..a2355f78f4c
--- /dev/null
+++ b/tests/queries/0_stateless/02725_agg_projection_resprect_PK.sql
@@ -0,0 +1,32 @@
+-- Tags: no-random-merge-tree-settings
+
+DROP TABLE IF EXISTS t0;
+
+CREATE TABLE t0
+(
+    c1 Int64,
+    c2 Int64,
+    c3 Int64,
+    PROJECTION p1
+    (
+        SELECT
+            c1,
+            c2,
+            sum(c3)
+        GROUP BY
+            c2,
+            c1
+    )
+)
+ENGINE = MergeTree ORDER BY (c1, c2) settings min_bytes_for_wide_part = 10485760, min_rows_for_wide_part = 0;
+
+INSERT INTO t0 SELECT
+    number,
+    -number,
+    number
+FROM numbers_mt(1e5);
+
+select * from (EXPLAIN indexes = 1 SELECT c1, sum(c3) FROM t0 GROUP BY c1) where explain like '%ReadFromMergeTree%';
+select * from (EXPLAIN indexes = 1 SELECT c1, sum(c3) FROM t0 WHERE c1 = 100 GROUP BY c1) where explain like '%Granules%';
+
+DROP TABLE t0;
diff --git a/tests/queries/0_stateless/02725_alias_columns_should_not_allow_compression_codec.reference b/tests/queries/0_stateless/02725_alias_columns_should_not_allow_compression_codec.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02725_alias_columns_should_not_allow_compression_codec.sql b/tests/queries/0_stateless/02725_alias_columns_should_not_allow_compression_codec.sql
new file mode 100644
index 00000000000..083a3aefdaf
--- /dev/null
+++ b/tests/queries/0_stateless/02725_alias_columns_should_not_allow_compression_codec.sql
@@ -0,0 +1,7 @@
+drop table if exists alias_column_should_not_allow_compression;
+create table if not exists alias_column_should_not_allow_compression ( user_id UUID, user_id_hashed ALIAS (cityHash64(user_id))) engine=MergeTree() order by tuple();
+create table if not exists alias_column_should_not_allow_compression_fail ( user_id UUID, user_id_hashed ALIAS (cityHash64(user_id)) codec(LZ4HC(1))) engine=MergeTree() order by tuple(); -- { serverError BAD_ARGUMENTS }
+alter table alias_column_should_not_allow_compression modify column user_id codec(LZ4HC(1));
+alter table alias_column_should_not_allow_compression modify column user_id_hashed codec(LZ4HC(1)); -- { serverError BAD_ARGUMENTS }
+alter table alias_column_should_not_allow_compression add column user_id_hashed_1 UInt64 ALIAS (cityHash64(user_id)) codec(LZ4HC(1)); -- { serverError BAD_ARGUMENTS }
+drop table if exists alias_column_should_not_allow_compression;
diff --git a/tests/queries/0_stateless/02725_alias_with_restricted_keywords.reference b/tests/queries/0_stateless/02725_alias_with_restricted_keywords.reference
new file mode 100644
index 00000000000..9874d6464ab
--- /dev/null
+++ b/tests/queries/0_stateless/02725_alias_with_restricted_keywords.reference
@@ -0,0 +1 @@
+1	2
diff --git a/tests/queries/0_stateless/02725_alias_with_restricted_keywords.sql b/tests/queries/0_stateless/02725_alias_with_restricted_keywords.sql
new file mode 100644
index 00000000000..6df0e856061
--- /dev/null
+++ b/tests/queries/0_stateless/02725_alias_with_restricted_keywords.sql
@@ -0,0 +1 @@
+SELECT 1 `array`, 2 "union";
diff --git a/tests/queries/0_stateless/02725_async_insert_table_setting.reference b/tests/queries/0_stateless/02725_async_insert_table_setting.reference
new file mode 100644
index 00000000000..5f5235c569f
--- /dev/null
+++ b/tests/queries/0_stateless/02725_async_insert_table_setting.reference
@@ -0,0 +1,4 @@
+2
+2
+default.t_mt_async_insert	1
+default.t_mt_sync_insert	0
diff --git a/tests/queries/0_stateless/02725_async_insert_table_setting.sh b/tests/queries/0_stateless/02725_async_insert_table_setting.sh
new file mode 100755
index 00000000000..13911e8d677
--- /dev/null
+++ b/tests/queries/0_stateless/02725_async_insert_table_setting.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} -n --query "
+DROP TABLE IF EXISTS t_mt_async_insert;
+DROP TABLE IF EXISTS t_mt_sync_insert;
+
+CREATE TABLE t_mt_async_insert (id UInt64, s String)
+ENGINE = MergeTree ORDER BY id SETTINGS async_insert = 1;
+
+CREATE TABLE t_mt_sync_insert (id UInt64, s String)
+ENGINE = MergeTree ORDER BY id SETTINGS async_insert = 0;"
+
+url="${CLICKHOUSE_URL}&async_insert=0&wait_for_async_insert=1"
+
+${CLICKHOUSE_CURL} -sS "$url" -d "INSERT INTO t_mt_async_insert VALUES (1, 'aa'), (2, 'bb')"
+${CLICKHOUSE_CURL} -sS "$url" -d "INSERT INTO t_mt_sync_insert VALUES (1, 'aa'), (2, 'bb')"
+
+${CLICKHOUSE_CLIENT} -n --query "
+SELECT count() FROM t_mt_async_insert;
+SELECT count() FROM t_mt_sync_insert;
+
+SYSTEM FLUSH LOGS;
+SELECT tables[1], ProfileEvents['AsyncInsertQuery'] FROM system.query_log
+WHERE
+    type = 'QueryFinish' AND
+    current_database = currentDatabase() AND
+    query ILIKE 'INSERT INTO t_mt_%sync_insert%'
+ORDER BY tables[1];
+
+DROP TABLE IF EXISTS t_mt_async_insert;
+DROP TABLE IF EXISTS t_mt_sync_insert;"
diff --git a/tests/queries/0_stateless/02725_cnf_large_check.reference b/tests/queries/0_stateless/02725_cnf_large_check.reference
new file mode 100644
index 00000000000..1c915801174
--- /dev/null
+++ b/tests/queries/0_stateless/02725_cnf_large_check.reference
@@ -0,0 +1,4 @@
+8
+8
+2
+2
diff --git a/tests/queries/0_stateless/02725_cnf_large_check.sql b/tests/queries/0_stateless/02725_cnf_large_check.sql
new file mode 100644
index 00000000000..0780e6bcdd3
--- /dev/null
+++ b/tests/queries/0_stateless/02725_cnf_large_check.sql
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS 02725_cnf;
+
+CREATE TABLE 02725_cnf (c0 UInt8, c1 UInt8, c2 UInt8, c3 UInt8, c4 UInt8, c5 UInt8, c6 UInt8, c7 UInt8, c8 UInt8, c9 UInt8) ENGINE = Memory;
+
+INSERT INTO 02725_cnf VALUES (0, 0, 0, 0, 0, 0, 0, 0, 0, 0), (0, 0, 0, 0, 0, 0, 0, 0, 0, 1), (0, 0, 0, 0, 0, 0, 0, 0, 1, 0), (0, 0, 0, 0, 0, 0, 0, 0, 1, 1), (0, 0, 0, 0, 0, 0, 0, 1, 0, 0), (0, 0, 0, 0, 0, 0, 0, 1, 0, 1), (0, 0, 0, 0, 0, 0, 0, 1, 1, 0), (0, 0, 0, 0, 0, 0, 0, 1, 1, 1);
+
+SELECT count()
+FROM 02725_cnf
+WHERE (c5 AND (NOT c0)) OR ((NOT c3) AND (NOT c6) AND (NOT c1) AND (NOT c6)) OR (c7 AND (NOT c3) AND (NOT c5) AND (NOT c7)) OR ((NOT c8) AND c5) OR ((NOT c0)) OR ((NOT c8) AND (NOT c5) AND c1 AND c6 AND c3) OR (c7 AND (NOT c0) AND c6 AND c1 AND (NOT c2)) OR (c3 AND (NOT c9) AND c1)
+SETTINGS convert_query_to_cnf = 1, allow_experimental_analyzer = 1;
+
+SELECT count()
+FROM 02725_cnf
+WHERE (c5 AND (NOT c0)) OR ((NOT c3) AND (NOT c6) AND (NOT c1) AND (NOT c6)) OR (c7 AND (NOT c3) AND (NOT c5) AND (NOT c7)) OR ((NOT c8) AND c5) OR ((NOT c0)) OR ((NOT c8) AND (NOT c5) AND c1 AND c6 AND c3) OR (c7 AND (NOT c0) AND c6 AND c1 AND (NOT c2)) OR (c3 AND (NOT c9) AND c1)
+SETTINGS convert_query_to_cnf = 1, allow_experimental_analyzer = 0;
+
+SELECT count()
+FROM 02725_cnf
+WHERE ((NOT c2) AND c2 AND (NOT c1)) OR ((NOT c2) AND c3 AND (NOT c5)) OR ((NOT c7) AND (NOT c8)) OR (c9 AND c6 AND c8 AND (NOT c8) AND (NOT c7))
+SETTINGS convert_query_to_cnf = 1, allow_experimental_analyzer = 1;
+
+SELECT count()
+FROM 02725_cnf
+WHERE ((NOT c2) AND c2 AND (NOT c1)) OR ((NOT c2) AND c3 AND (NOT c5)) OR ((NOT c7) AND (NOT c8)) OR (c9 AND c6 AND c8 AND (NOT c8) AND (NOT c7))
+SETTINGS convert_query_to_cnf = 1, allow_experimental_analyzer = 0;
+
+DROP TABLE 02725_cnf;
diff --git a/tests/queries/0_stateless/02725_keeper_fault_inject_sequential_cleanup.reference b/tests/queries/0_stateless/02725_keeper_fault_inject_sequential_cleanup.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02725_keeper_fault_inject_sequential_cleanup.sql b/tests/queries/0_stateless/02725_keeper_fault_inject_sequential_cleanup.sql
new file mode 100644
index 00000000000..e1db4ba2fa6
--- /dev/null
+++ b/tests/queries/0_stateless/02725_keeper_fault_inject_sequential_cleanup.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS keeper_fault_inject_sequential_cleanup;
+
+CREATE TABLE keeper_fault_inject_sequential_cleanup (d Int8) ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_02725/tables/keeper_fault_inject_sequential_cleanup', '1') ORDER BY d;
+
+INSERT INTO keeper_fault_inject_sequential_cleanup VALUES (1);
+INSERT INTO keeper_fault_inject_sequential_cleanup SETTINGS insert_deduplicate = 0 VALUES (1);
+INSERT INTO keeper_fault_inject_sequential_cleanup SETTINGS insert_deduplicate = 0, insert_keeper_fault_injection_probability = 0.4, insert_keeper_fault_injection_seed = 5619964844601345291 VALUES (1);
+
+-- with database ordinary it produced a warning
+DROP TABLE keeper_fault_inject_sequential_cleanup;
diff --git a/tests/queries/0_stateless/02725_local_query_parameters.reference b/tests/queries/0_stateless/02725_local_query_parameters.reference
new file mode 100644
index 00000000000..9972842f982
--- /dev/null
+++ b/tests/queries/0_stateless/02725_local_query_parameters.reference
@@ -0,0 +1 @@
+1	1
diff --git a/tests/queries/0_stateless/02725_local_query_parameters.sh b/tests/queries/0_stateless/02725_local_query_parameters.sh
new file mode 100755
index 00000000000..92d7f645454
--- /dev/null
+++ b/tests/queries/0_stateless/02725_local_query_parameters.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-replicated-database
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL --multiquery -q "
+    SET param_x=1;
+    SELECT {x:UInt64}, {x:String};"
diff --git a/tests/queries/0_stateless/02725_memory-for-merges.reference b/tests/queries/0_stateless/02725_memory-for-merges.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02725_memory-for-merges.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02725_memory-for-merges.sql b/tests/queries/0_stateless/02725_memory-for-merges.sql
new file mode 100644
index 00000000000..b6ae7af7f1a
--- /dev/null
+++ b/tests/queries/0_stateless/02725_memory-for-merges.sql
@@ -0,0 +1,27 @@
+-- Tags: no-s3-storage
+-- We allocate a lot of memory for buffers when reading or writing to S3
+
+DROP TABLE IF EXISTS 02725_memory_for_merges SYNC;
+
+CREATE TABLE 02725_memory_for_merges
+(   n UInt64,
+    s String
+)
+ENGINE = MergeTree
+ORDER BY n
+SETTINGS merge_max_block_size_bytes=1024, index_granularity_bytes=1024;
+
+INSERT INTO 02725_memory_for_merges SELECT number, randomPrintableASCII(1000000) FROM numbers(100);
+INSERT INTO 02725_memory_for_merges SELECT number, randomPrintableASCII(1000000) FROM numbers(100);
+INSERT INTO 02725_memory_for_merges SELECT number, randomPrintableASCII(1000000) FROM numbers(100);
+INSERT INTO 02725_memory_for_merges SELECT number, randomPrintableASCII(1000000) FROM numbers(100);
+INSERT INTO 02725_memory_for_merges SELECT number, randomPrintableASCII(1000000) FROM numbers(100);
+
+OPTIMIZE TABLE 02725_memory_for_merges FINAL;
+
+SYSTEM FLUSH LOGS;
+
+WITH (SELECT uuid FROM system.tables WHERE table='02725_memory_for_merges' and database=currentDatabase()) as uuid
+SELECT sum(peak_memory_usage) < 1024 * 1024 * 200 from system.part_log where table_uuid=uuid and event_type='MergeParts';
+
+DROP TABLE IF EXISTS 02725_memory_for_merges SYNC;
diff --git a/tests/queries/0_stateless/02725_null_group_key_with_rollup.reference b/tests/queries/0_stateless/02725_null_group_key_with_rollup.reference
new file mode 100644
index 00000000000..e296f838e48
--- /dev/null
+++ b/tests/queries/0_stateless/02725_null_group_key_with_rollup.reference
@@ -0,0 +1,10 @@
+\N	2
+
+\N	2
+\N	2
+
+\N	2
+\N	2
+\N	2
+\N	2
+\N	2
diff --git a/tests/queries/0_stateless/02725_null_group_key_with_rollup.sql b/tests/queries/0_stateless/02725_null_group_key_with_rollup.sql
new file mode 100644
index 00000000000..98f354e2911
--- /dev/null
+++ b/tests/queries/0_stateless/02725_null_group_key_with_rollup.sql
@@ -0,0 +1,13 @@
+set allow_suspicious_low_cardinality_types=1;
+DROP TABLE IF EXISTS group_by_null_key;
+CREATE TABLE group_by_null_key (c1 Nullable(Int32), c2 LowCardinality(Nullable(Int32))) ENGINE = Memory();
+INSERT INTO group_by_null_key VALUES (null, null), (null, null);
+
+select c1, count(*) from group_by_null_key group by c1 WITH TOTALS;
+select c2, count(*) from group_by_null_key group by c2 WITH TOTALS;
+
+select c1, count(*) from group_by_null_key group by ROLLUP(c1);
+select c2, count(*) from group_by_null_key group by ROLLUP(c2);
+
+
+DROP TABLE group_by_null_key;
diff --git a/tests/queries/0_stateless/02725_object_column_alter.reference b/tests/queries/0_stateless/02725_object_column_alter.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02725_object_column_alter.sql b/tests/queries/0_stateless/02725_object_column_alter.sql
new file mode 100644
index 00000000000..0e41070742a
--- /dev/null
+++ b/tests/queries/0_stateless/02725_object_column_alter.sql
@@ -0,0 +1,15 @@
+-- Eventually this ALTER should be fixed
+
+SET allow_experimental_object_type=1;
+
+DROP TABLE IF EXISTS t_to;
+DROP TABLE IF EXISTS t_from;
+
+CREATE TABLE t_to (id UInt64, value Nullable(String)) ENGINE MergeTree() ORDER BY id;
+CREATE TABLE t_from (id UInt64, value Object('json')) ENGINE MergeTree() ORDER BY id;
+
+ALTER TABLE t_to MODIFY COLUMN value Object('json'); -- { serverError BAD_ARGUMENTS }
+ALTER TABLE t_from MODIFY COLUMN value Nullable(String); -- { serverError BAD_ARGUMENTS }
+
+DROP TABLE t_to;
+DROP TABLE t_from;
diff --git a/tests/queries/0_stateless/02725_parquet_preserve_order.reference b/tests/queries/0_stateless/02725_parquet_preserve_order.reference
new file mode 100644
index 00000000000..e9c8f99bb33
--- /dev/null
+++ b/tests/queries/0_stateless/02725_parquet_preserve_order.reference
@@ -0,0 +1,12 @@
+0
+1
+2
+(Expression)
+ExpressionTransform
+  (ReadFromStorage)
+  File 0 → 1
+(Expression)
+ExpressionTransform × 2
+  (ReadFromStorage)
+  Resize 1 → 2
+    File 0 → 1
diff --git a/tests/queries/0_stateless/02725_parquet_preserve_order.sh b/tests/queries/0_stateless/02725_parquet_preserve_order.sh
new file mode 100755
index 00000000000..ea3e4219e35
--- /dev/null
+++ b/tests/queries/0_stateless/02725_parquet_preserve_order.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+# This file has a row group with 2 rows, then a row group with 1 row.
+# It'll be read into two blocks. The first block will sleep 2x longer than the second.
+# So reordering is very likely if the order-preservation doesn't work.
+
+$CLICKHOUSE_LOCAL -q "select number+sleepEachRow(3) from file('$CURDIR/data_parquet/02725_data.parquet') settings input_format_parquet_preserve_order=1"
+
+$CLICKHOUSE_LOCAL -q "explain pipeline select number+sleepEachRow(3) from file('$CURDIR/data_parquet/02725_data.parquet') settings input_format_parquet_preserve_order=1, max_threads=2"
+$CLICKHOUSE_LOCAL -q "explain pipeline select number+sleepEachRow(3) from file('$CURDIR/data_parquet/02725_data.parquet') settings input_format_parquet_preserve_order=0, parallelize_output_from_storages=1, max_threads=2"
diff --git a/tests/queries/0_stateless/02725_start_stop_fetches.reference b/tests/queries/0_stateless/02725_start_stop_fetches.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02725_start_stop_fetches.sh b/tests/queries/0_stateless/02725_start_stop_fetches.sh
new file mode 100755
index 00000000000..0ca687ae951
--- /dev/null
+++ b/tests/queries/0_stateless/02725_start_stop_fetches.sh
@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+# Tags: race, zookeeper, no-parallel, no-upgrade-check, no-replicated-database
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+
+NUM_REPLICAS=5
+
+for i in $(seq 1 $NUM_REPLICAS); do
+    $CLICKHOUSE_CLIENT -n -q "
+        DROP TABLE IF EXISTS r$i SYNC;
+        CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/r', 'r$i') ORDER BY x SETTINGS replicated_deduplication_window = 1, allow_remote_fs_zero_copy_replication = 1;
+    "
+done
+
+function thread {
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        $CLICKHOUSE_CLIENT --query "INSERT INTO r$REPLICA SELECT rand()"
+    done
+}
+
+function nemesis_thread1 {
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        $CLICKHOUSE_CLIENT --query "SYSTEM STOP REPLICATED SENDS r$REPLICA"
+        sleep 0.5
+        $CLICKHOUSE_CLIENT --query "SYSTEM START REPLICATED SENDS r$REPLICA"
+    done
+}
+
+function nemesis_thread2 {
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        $CLICKHOUSE_CLIENT --query "SYSTEM STOP FETCHES r$REPLICA"
+        sleep 0.5
+        $CLICKHOUSE_CLIENT --query "SYSTEM START FETCHES r$REPLICA"
+    done
+}
+
+
+
+export -f thread
+export -f nemesis_thread1
+export -f nemesis_thread2
+
+TIMEOUT=20
+
+timeout $TIMEOUT bash -c thread 2>/dev/null &
+timeout $TIMEOUT bash -c thread 2>/dev/null &
+timeout $TIMEOUT bash -c thread 2>/dev/null &
+timeout $TIMEOUT bash -c nemesis_thread1 2>/dev/null &
+timeout $TIMEOUT bash -c nemesis_thread1 2>/dev/null &
+timeout $TIMEOUT bash -c nemesis_thread1 2>/dev/null &
+timeout $TIMEOUT bash -c nemesis_thread2 2>/dev/null &
+timeout $TIMEOUT bash -c nemesis_thread2 2>/dev/null &
+timeout $TIMEOUT bash -c nemesis_thread2 2>/dev/null &
+
+wait
+
+
+for i in $(seq 1 $NUM_REPLICAS); do
+    $CLICKHOUSE_CLIENT -q "SYSTEM START FETCHES r$REPLICA"
+    $CLICKHOUSE_CLIENT -q "SYSTEM START REPLICATED SENDS r$REPLICA"
+done
+
+for i in $(seq 1 $NUM_REPLICAS); do
+    $CLICKHOUSE_CLIENT --max_execution_time 60 -q "SYSTEM SYNC REPLICA r$i PULL"
+done
+
+for i in $(seq 1 $NUM_REPLICAS); do
+    $CLICKHOUSE_CLIENT -q "DROP TABLE r$i" 2>/dev/null &
+done
+
+wait
diff --git a/tests/queries/0_stateless/02725_url_support_virtual_column.reference b/tests/queries/0_stateless/02725_url_support_virtual_column.reference
new file mode 100644
index 00000000000..d20c91344e5
--- /dev/null
+++ b/tests/queries/0_stateless/02725_url_support_virtual_column.reference
@@ -0,0 +1,4 @@
+/
+
+	1
+/		1
diff --git a/tests/queries/0_stateless/02725_url_support_virtual_column.sql b/tests/queries/0_stateless/02725_url_support_virtual_column.sql
new file mode 100644
index 00000000000..02a4dfc449b
--- /dev/null
+++ b/tests/queries/0_stateless/02725_url_support_virtual_column.sql
@@ -0,0 +1,8 @@
+-- Tags: no-parallel
+
+select _path from url('http://127.0.0.1:8123/?query=select+1&user=default', LineAsString, 's String');
+select _file from url('http://127.0.0.1:8123/?query=select+1&user=default', LineAsString, 's String');
+select _file, count() from url('http://127.0.0.1:8123/?query=select+1&user=default', LineAsString, 's String') group by _file;
+select _path, _file, s from url('http://127.0.0.1:8123/?query=select+1&user=default', LineAsString, 's String');
+select _path, _file, s from url('http://127.0.0.1:8123/?query=select+1&user=default&password=wrong', LineAsString, 's String'); -- { serverError RECEIVED_ERROR_FROM_REMOTE_IO_SERVER }
+
diff --git a/tests/queries/0_stateless/02726_set_allow_experimental_query_cache_as_obsolete.reference b/tests/queries/0_stateless/02726_set_allow_experimental_query_cache_as_obsolete.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02726_set_allow_experimental_query_cache_as_obsolete.sql b/tests/queries/0_stateless/02726_set_allow_experimental_query_cache_as_obsolete.sql
new file mode 100644
index 00000000000..244ba4e959a
--- /dev/null
+++ b/tests/queries/0_stateless/02726_set_allow_experimental_query_cache_as_obsolete.sql
@@ -0,0 +1,2 @@
+SET allow_experimental_query_cache = 0;
+SET allow_experimental_query_cache = 1;
diff --git a/tests/queries/0_stateless/02730_dictionary_hashed_load_factor_element_count.reference b/tests/queries/0_stateless/02730_dictionary_hashed_load_factor_element_count.reference
new file mode 100644
index 00000000000..09d337562b5
--- /dev/null
+++ b/tests/queries/0_stateless/02730_dictionary_hashed_load_factor_element_count.reference
@@ -0,0 +1,2 @@
+dict_sharded	1	1000000	0.4768
+dict_sharded_multi	5	1000000	0.4768
diff --git a/tests/queries/0_stateless/02730_dictionary_hashed_load_factor_element_count.sql b/tests/queries/0_stateless/02730_dictionary_hashed_load_factor_element_count.sql
new file mode 100644
index 00000000000..1e42f56889d
--- /dev/null
+++ b/tests/queries/0_stateless/02730_dictionary_hashed_load_factor_element_count.sql
@@ -0,0 +1,17 @@
+DROP DICTIONARY IF EXISTS dict_sharded;
+DROP DICTIONARY IF EXISTS dict_sharded_multi;
+DROP TABLE IF EXISTS dict_data;
+
+CREATE TABLE dict_data (key UInt64, v0 UInt16, v1 UInt16, v2 UInt16, v3 UInt16, v4 UInt16) engine=Memory() AS SELECT number, number%65535, number%65535, number%6553, number%655355, number%65535 FROM numbers(1e6);
+
+CREATE DICTIONARY dict_sharded (key UInt64, v0 UInt16) PRIMARY KEY key SOURCE(CLICKHOUSE(TABLE 'dict_data')) LIFETIME(MIN 0 MAX 0) LAYOUT(HASHED(SHARDS 32));
+SYSTEM RELOAD DICTIONARY dict_sharded;
+SELECT name, length(attribute.names), element_count, round(load_factor, 4) FROM system.dictionaries WHERE database = currentDatabase() AND name = 'dict_sharded';
+DROP DICTIONARY dict_sharded;
+
+CREATE DICTIONARY dict_sharded_multi (key UInt64, v0 UInt16, v1 UInt16, v2 UInt16, v3 UInt16, v4 UInt16) PRIMARY KEY key SOURCE(CLICKHOUSE(TABLE 'dict_data')) LIFETIME(MIN 0 MAX 0) LAYOUT(HASHED(SHARDS 32));
+SYSTEM RELOAD DICTIONARY dict_sharded_multi;
+SELECT name, length(attribute.names), element_count, round(load_factor, 4) FROM system.dictionaries WHERE database = currentDatabase() AND name = 'dict_sharded_multi';
+DROP DICTIONARY dict_sharded_multi;
+
+DROP TABLE dict_data;
diff --git a/tests/queries/0_stateless/02730_with_fill_by_sorting_prefix.reference b/tests/queries/0_stateless/02730_with_fill_by_sorting_prefix.reference
new file mode 100644
index 00000000000..260f08027f1
--- /dev/null
+++ b/tests/queries/0_stateless/02730_with_fill_by_sorting_prefix.reference
@@ -0,0 +1,227 @@
+-- { echoOn }
+set use_with_fill_by_sorting_prefix=1;
+-- corner case with constant sort prefix
+SELECT number
+FROM numbers(1)
+ORDER BY 10 ASC, number DESC WITH FILL FROM 1
+SETTINGS enable_positional_arguments=0;
+1
+0
+-- sensor table
+drop table if exists ts;
+create table ts (sensor_id UInt64, timestamp UInt64, value Float64) ENGINE=MergeTree()  ORDER BY (sensor_id, timestamp);
+insert into ts VALUES (1, 10, 1), (1, 12, 2), (3, 5, 1), (3, 7, 3), (5, 1, 1), (5, 3, 1);
+-- FillingTransform: 6 rows will be processed in 1 chunks
+select * from ts order by sensor_id, timestamp with fill step 1;
+1	10	1
+1	11	0
+1	12	2
+3	5	1
+3	6	0
+3	7	3
+5	1	1
+5	2	0
+5	3	1
+drop table if exists ts;
+create table ts (sensor_id UInt64, timestamp UInt64, value Float64) ENGINE=MergeTree()  ORDER BY (sensor_id, timestamp);
+system stop merges ts;
+-- FillingTransform: 6 rows will be processed in 3 chunks with 2 rows each
+insert into ts VALUES (1, 10, 1), (1, 12, 1);
+insert into ts VALUES (3, 5, 1), (3, 7, 1);
+insert into ts VALUES (5, 1, 1), (5, 3, 1);
+select * from ts order by sensor_id, timestamp with fill step 1 settings max_block_size=2;
+1	10	1
+1	11	0
+1	12	1
+3	5	1
+3	6	0
+3	7	1
+5	1	1
+5	2	0
+5	3	1
+drop table if exists ts;
+create table ts (sensor_id UInt64, timestamp UInt64, value Float64) ENGINE=MergeTree()  ORDER BY (sensor_id, timestamp);
+system stop merges ts;
+-- FillingTransform: 6 rows will be processed in 2 chunks with 3 rows each
+insert into ts VALUES (1, 10, 1), (1, 12, 1), (3, 5, 1);
+insert into ts VALUES (3, 7, 1), (5, 1, 1), (5, 3, 1);
+select * from ts order by sensor_id, timestamp with fill step 1 settings max_block_size=3;
+1	10	1
+1	11	0
+1	12	1
+3	5	1
+3	6	0
+3	7	1
+5	1	1
+5	2	0
+5	3	1
+-- FROM and TO
+-- ASC order in sorting prefix
+select * from ts order by sensor_id, timestamp with fill from 6 to 10 step 1 interpolate (value as 9999);
+1	6	9999
+1	7	9999
+1	8	9999
+1	9	9999
+1	10	1
+1	12	1
+3	5	1
+3	6	9999
+3	7	1
+3	8	9999
+3	9	9999
+5	1	1
+5	3	1
+5	6	9999
+5	7	9999
+5	8	9999
+5	9	9999
+select * from ts order by sensor_id, timestamp with fill from 6 to 10 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+0	6	9999
+0	7	9999
+0	8	9999
+0	9	9999
+1	10	1
+1	12	1
+3	5	1
+3	7	1
+5	1	1
+5	3	1
+-- DESC order in sorting prefix
+select * from ts order by sensor_id DESC, timestamp with fill from 6 to 10 step 1 interpolate (value as 9999);
+5	1	1
+5	3	1
+5	6	9999
+5	7	9999
+5	8	9999
+5	9	9999
+3	5	1
+3	6	9999
+3	7	1
+3	8	9999
+3	9	9999
+1	6	9999
+1	7	9999
+1	8	9999
+1	9	9999
+1	10	1
+1	12	1
+select * from ts order by sensor_id DESC, timestamp with fill from 6 to 10 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+5	1	1
+5	3	1
+3	5	1
+0	6	9999
+3	7	1
+0	8	9999
+0	9	9999
+1	10	1
+1	12	1
+-- without TO
+-- ASC order in sorting prefix
+select * from ts order by sensor_id, timestamp with fill from 6 step 1 interpolate (value as 9999);
+1	6	9999
+1	7	9999
+1	8	9999
+1	9	9999
+1	10	1
+1	11	9999
+1	12	1
+3	5	1
+3	6	9999
+3	7	1
+5	1	1
+5	3	1
+select * from ts order by sensor_id, timestamp with fill from 6 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+0	6	9999
+0	7	9999
+0	8	9999
+0	9	9999
+1	10	1
+0	11	9999
+1	12	1
+3	5	1
+3	7	1
+5	1	1
+5	3	1
+-- DESC order in sorting prefix
+select * from ts order by sensor_id DESC, timestamp with fill from 6 step 1 interpolate (value as 9999);
+5	1	1
+5	3	1
+3	5	1
+3	6	9999
+3	7	1
+1	6	9999
+1	7	9999
+1	8	9999
+1	9	9999
+1	10	1
+1	11	9999
+1	12	1
+select * from ts order by sensor_id DESC, timestamp with fill from 6 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+5	1	1
+5	3	1
+3	5	1
+0	6	9999
+3	7	1
+0	8	9999
+0	9	9999
+1	10	1
+0	11	9999
+1	12	1
+-- without FROM
+-- ASC order in sorting prefix
+select * from ts order by sensor_id, timestamp with fill to 10 step 1 interpolate (value as 9999);
+1	10	1
+1	12	1
+3	5	1
+3	6	9999
+3	7	1
+3	8	9999
+3	9	9999
+5	1	1
+5	2	9999
+5	3	1
+5	4	9999
+5	5	9999
+5	6	9999
+5	7	9999
+5	8	9999
+5	9	9999
+select * from ts order by sensor_id, timestamp with fill to 10 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+1	10	1
+1	12	1
+3	5	1
+3	7	1
+5	1	1
+5	3	1
+-- DESC order in sorting prefix
+select * from ts order by sensor_id DESC, timestamp with fill to 10 step 1 interpolate (value as 9999);
+5	1	1
+5	2	9999
+5	3	1
+5	4	9999
+5	5	9999
+5	6	9999
+5	7	9999
+5	8	9999
+5	9	9999
+3	5	1
+3	6	9999
+3	7	1
+3	8	9999
+3	9	9999
+1	10	1
+1	12	1
+select * from ts order by sensor_id DESC, timestamp with fill to 10 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+5	1	1
+0	2	9999
+5	3	1
+0	4	9999
+3	5	1
+0	6	9999
+3	7	1
+0	8	9999
+0	9	9999
+1	10	1
+1	12	1
+-- checking that sorting prefix columns can't be used in INTERPOLATE
+SELECT * FROM ts ORDER BY sensor_id, value, timestamp WITH FILL FROM 6 TO 10 INTERPOLATE ( value AS 1 ); -- { serverError INVALID_WITH_FILL_EXPRESSION }
diff --git a/tests/queries/0_stateless/02730_with_fill_by_sorting_prefix.sql b/tests/queries/0_stateless/02730_with_fill_by_sorting_prefix.sql
new file mode 100644
index 00000000000..e2f1ce29d5c
--- /dev/null
+++ b/tests/queries/0_stateless/02730_with_fill_by_sorting_prefix.sql
@@ -0,0 +1,60 @@
+-- { echoOn }
+set use_with_fill_by_sorting_prefix=1;
+
+-- corner case with constant sort prefix
+SELECT number
+FROM numbers(1)
+ORDER BY 10 ASC, number DESC WITH FILL FROM 1
+SETTINGS enable_positional_arguments=0;
+
+-- sensor table
+drop table if exists ts;
+create table ts (sensor_id UInt64, timestamp UInt64, value Float64) ENGINE=MergeTree()  ORDER BY (sensor_id, timestamp);
+insert into ts VALUES (1, 10, 1), (1, 12, 2), (3, 5, 1), (3, 7, 3), (5, 1, 1), (5, 3, 1);
+-- FillingTransform: 6 rows will be processed in 1 chunks
+select * from ts order by sensor_id, timestamp with fill step 1;
+
+drop table if exists ts;
+create table ts (sensor_id UInt64, timestamp UInt64, value Float64) ENGINE=MergeTree()  ORDER BY (sensor_id, timestamp);
+system stop merges ts;
+-- FillingTransform: 6 rows will be processed in 3 chunks with 2 rows each
+insert into ts VALUES (1, 10, 1), (1, 12, 1);
+insert into ts VALUES (3, 5, 1), (3, 7, 1);
+insert into ts VALUES (5, 1, 1), (5, 3, 1);
+select * from ts order by sensor_id, timestamp with fill step 1 settings max_block_size=2;
+
+drop table if exists ts;
+create table ts (sensor_id UInt64, timestamp UInt64, value Float64) ENGINE=MergeTree()  ORDER BY (sensor_id, timestamp);
+system stop merges ts;
+-- FillingTransform: 6 rows will be processed in 2 chunks with 3 rows each
+insert into ts VALUES (1, 10, 1), (1, 12, 1), (3, 5, 1);
+insert into ts VALUES (3, 7, 1), (5, 1, 1), (5, 3, 1);
+select * from ts order by sensor_id, timestamp with fill step 1 settings max_block_size=3;
+
+-- FROM and TO
+-- ASC order in sorting prefix
+select * from ts order by sensor_id, timestamp with fill from 6 to 10 step 1 interpolate (value as 9999);
+select * from ts order by sensor_id, timestamp with fill from 6 to 10 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+
+-- DESC order in sorting prefix
+select * from ts order by sensor_id DESC, timestamp with fill from 6 to 10 step 1 interpolate (value as 9999);
+select * from ts order by sensor_id DESC, timestamp with fill from 6 to 10 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+
+-- without TO
+-- ASC order in sorting prefix
+select * from ts order by sensor_id, timestamp with fill from 6 step 1 interpolate (value as 9999);
+select * from ts order by sensor_id, timestamp with fill from 6 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+-- DESC order in sorting prefix
+select * from ts order by sensor_id DESC, timestamp with fill from 6 step 1 interpolate (value as 9999);
+select * from ts order by sensor_id DESC, timestamp with fill from 6 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+
+-- without FROM
+-- ASC order in sorting prefix
+select * from ts order by sensor_id, timestamp with fill to 10 step 1 interpolate (value as 9999);
+select * from ts order by sensor_id, timestamp with fill to 10 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+-- DESC order in sorting prefix
+select * from ts order by sensor_id DESC, timestamp with fill to 10 step 1 interpolate (value as 9999);
+select * from ts order by sensor_id DESC, timestamp with fill to 10 step 1 interpolate (value as 9999) settings use_with_fill_by_sorting_prefix=0;
+
+-- checking that sorting prefix columns can't be used in INTERPOLATE
+SELECT * FROM ts ORDER BY sensor_id, value, timestamp WITH FILL FROM 6 TO 10 INTERPOLATE ( value AS 1 ); -- { serverError INVALID_WITH_FILL_EXPRESSION }
diff --git a/tests/queries/0_stateless/02731_in_operator_with_one_size_tuple.reference b/tests/queries/0_stateless/02731_in_operator_with_one_size_tuple.reference
new file mode 100644
index 00000000000..d7ede115bc2
--- /dev/null
+++ b/tests/queries/0_stateless/02731_in_operator_with_one_size_tuple.reference
@@ -0,0 +1,2 @@
+2023-04-17	1
+2023-04-17	1
diff --git a/tests/queries/0_stateless/02731_in_operator_with_one_size_tuple.sql b/tests/queries/0_stateless/02731_in_operator_with_one_size_tuple.sql
new file mode 100644
index 00000000000..eab7d24a92e
--- /dev/null
+++ b/tests/queries/0_stateless/02731_in_operator_with_one_size_tuple.sql
@@ -0,0 +1,10 @@
+CREATE TABLE test(`report_date` Date, `sspid` UInt64) ENGINE MergeTree PARTITION BY report_date ORDER BY report_date;
+
+INSERT INTO test SELECT toDate('2023-04-20'), 0;
+INSERT INTO test SELECT toDate('2023-04-19'), 0;
+INSERT INTO test SELECT toDate('2023-04-17'), 1;
+INSERT INTO test SELECT toDate('2023-04-17'), 1;
+
+
+SELECT * FROM test  WHERE tuple(report_date) IN tuple(toDate('2023-04-17'));
+DROP TABLE test;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02731_nothing_deserialization.reference b/tests/queries/0_stateless/02731_nothing_deserialization.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02731_nothing_deserialization.sql b/tests/queries/0_stateless/02731_nothing_deserialization.sql
new file mode 100644
index 00000000000..7526bce3578
--- /dev/null
+++ b/tests/queries/0_stateless/02731_nothing_deserialization.sql
@@ -0,0 +1 @@
+SELECT CAST('\x01\x00' AS AggregateFunction(nothingArrayIf, Array(Nullable(Nothing)), Nullable(Nothing))); -- { serverError INCORRECT_DATA }
diff --git a/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.reference b/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.reference
new file mode 100644
index 00000000000..df606679523
--- /dev/null
+++ b/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.reference
@@ -0,0 +1,44 @@
+=============== INNER QUERY (NO PARALLEL) ===============
+0	PJFiUe#J2O	_s\'	14427935816175499794
+1	>T%O	,z<	17537932797009027240
+12	D[6,P	#}Lmb[ ZzU	6394957109822140795
+18		$_N-	24422838680427462
+2	bX?}ix [	Ny]2 G	16242612901291874718
+20	VE]	Y	15120036904703536841
+22	Ti~3)N)<	A!( 3	18361093572663329113
+23	Sx>b:^UG	XpedE)Q:	7433019734386307503
+29	2j&S)ba?XG	QuQj	17163829389637435056
+3	UlI+1		14144472852965836438
+=============== INNER QUERY (PARALLEL) ===============
+0	PJFiUe#J2O	_s\'	14427935816175499794
+1	>T%O	,z<	17537932797009027240
+12	D[6,P	#}Lmb[ ZzU	6394957109822140795
+18		$_N-	24422838680427462
+2	bX?}ix [	Ny]2 G	16242612901291874718
+20	VE]	Y	15120036904703536841
+22	Ti~3)N)<	A!( 3	18361093572663329113
+23	Sx>b:^UG	XpedE)Q:	7433019734386307503
+29	2j&S)ba?XG	QuQj	17163829389637435056
+3	UlI+1		14144472852965836438
+=============== QUERIES EXECUTED BY PARALLEL INNER QUERY ALONE ===============
+0	3	SELECT `key`, `value1`, `value2`, toUInt64(min(`time`)) AS `start_ts` FROM `default`.`join_inner_table` PREWHERE (`id` = \'833c9e22-c245-4eb5-8745-117a9a1f26b1\') AND (`number` > toUInt64(\'1610517366120\')) GROUP BY `key`, `value1`, `value2` ORDER BY `key` ASC, `value1` ASC, `value2` ASC LIMIT 10
+1	1	-- Parallel inner query alone\nSELECT\n    key,\n    value1,\n    value2,\n    toUInt64(min(time)) AS start_ts\nFROM join_inner_table\nPREWHERE (id = \'833c9e22-c245-4eb5-8745-117a9a1f26b1\') AND (number > toUInt64(\'1610517366120\'))\nGROUP BY key, value1, value2\nORDER BY key, value1, value2\nLIMIT 10\nSETTINGS allow_experimental_parallel_reading_from_replicas = 1;
+=============== OUTER QUERY (NO PARALLEL) ===============
+>T%O	,z<	10
+NQTpY#	W\\Xx4	10
+PJFiUe#J2O	_s\'	10
+U	c	10
+UlI+1		10
+bX?}ix [	Ny]2 G	10
+t<iT	X48q:Z]t0	10
+=============== OUTER QUERY (PARALLEL) ===============
+>T%O	,z<	10
+NQTpY#	W\\Xx4	10
+PJFiUe#J2O	_s\'	10
+U	c	10
+UlI+1		10
+bX?}ix [	Ny]2 G	10
+t<iT	X48q:Z]t0	10
+0	3	SELECT `key`, `value1`, `value2`, toUInt64(min(`time`)) AS `start_ts` FROM `default`.`join_inner_table` PREWHERE (`id` = \'833c9e22-c245-4eb5-8745-117a9a1f26b1\') AND (`number` > toUInt64(\'1610517366120\')) GROUP BY `key`, `value1`, `value2`
+0	3	SELECT `value1`, `value2`, count() AS `count` FROM `default`.`join_outer_table` ALL INNER JOIN `_data_11888098645495698704_17868075224240210014` USING (`key`) GROUP BY `key`, `value1`, `value2`
+1	1	-- Parallel full query\nSELECT\n    value1,\n    value2,\n    avg(count) AS avg\nFROM\n    (\n        SELECT\n            key,\n            value1,\n            value2,\n            count() AS count\n        FROM join_outer_table\n        INNER JOIN\n        (\n            SELECT\n                key,\n                value1,\n                value2,\n                toUInt64(min(time)) AS start_ts\n            FROM join_inner_table\n            PREWHERE (id = \'833c9e22-c245-4eb5-8745-117a9a1f26b1\') AND (number > toUInt64(\'1610517366120\'))\n            GROUP BY key, value1, value2\n        ) USING (key)\n        GROUP BY key, value1, value2\n        )\nGROUP BY value1, value2\nORDER BY value1, value2\nSETTINGS allow_experimental_parallel_reading_from_replicas = 1;
diff --git a/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.sql b/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.sql
new file mode 100644
index 00000000000..29c20980c14
--- /dev/null
+++ b/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.sql
@@ -0,0 +1,182 @@
+-- Tags: zookeeper
+
+CREATE TABLE join_inner_table
+(
+    id UUID,
+    key String,
+    number Int64,
+    value1 String,
+    value2 String,
+    time Int64
+)
+ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/join_inner_table', 'r1')
+ORDER BY (id, number, key);
+
+INSERT INTO join_inner_table
+SELECT
+    '833c9e22-c245-4eb5-8745-117a9a1f26b1'::UUID as id,
+    rowNumberInAllBlocks()::String as key,
+    * FROM generateRandom('number Int64, value1 String, value2 String, time Int64', 1, 10, 2)
+LIMIT 100;
+
+SET allow_experimental_analyzer = 0;
+SET max_parallel_replicas = 3;
+SET prefer_localhost_replica = 1;
+SET cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost';
+SET use_hedged_requests = 0;
+SET joined_subquery_requires_alias = 0;
+
+SELECT '=============== INNER QUERY (NO PARALLEL) ===============';
+
+SELECT
+    key,
+    value1,
+    value2,
+    toUInt64(min(time)) AS start_ts
+FROM join_inner_table
+    PREWHERE (id = '833c9e22-c245-4eb5-8745-117a9a1f26b1') AND (number > toUInt64('1610517366120'))
+GROUP BY key, value1, value2
+ORDER BY key, value1, value2
+LIMIT 10;
+
+SELECT '=============== INNER QUERY (PARALLEL) ===============';
+
+-- Parallel inner query alone
+SELECT
+    key,
+    value1,
+    value2,
+    toUInt64(min(time)) AS start_ts
+FROM join_inner_table
+PREWHERE (id = '833c9e22-c245-4eb5-8745-117a9a1f26b1') AND (number > toUInt64('1610517366120'))
+GROUP BY key, value1, value2
+ORDER BY key, value1, value2
+LIMIT 10
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1;
+
+SELECT '=============== QUERIES EXECUTED BY PARALLEL INNER QUERY ALONE ===============';
+
+SYSTEM FLUSH LOGS;
+-- There should be 4 queries. The main query as received by the initiator and the 3 equal queries sent to each replica
+SELECT is_initial_query, count() as c, query,
+FROM system.query_log
+WHERE
+      event_date >= yesterday()
+  AND type = 'QueryFinish'
+  AND initial_query_id =
+      (
+          SELECT query_id
+          FROM system.query_log
+          WHERE
+                current_database = currentDatabase()
+            AND event_date >= yesterday()
+            AND type = 'QueryFinish'
+            AND query LIKE '-- Parallel inner query alone%'
+      )
+GROUP BY is_initial_query, query
+ORDER BY is_initial_query, c, query;
+
+---- Query with JOIN
+
+CREATE TABLE join_outer_table
+(
+    id UUID,
+    key String,
+    otherValue1 String,
+    otherValue2 String,
+    time Int64
+)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/join_outer_table', 'r1')
+ORDER BY (id, time, key);
+
+INSERT INTO join_outer_table
+SELECT
+    '833c9e22-c245-4eb5-8745-117a9a1f26b1'::UUID as id,
+        (rowNumberInAllBlocks() % 10)::String as key,
+        * FROM generateRandom('otherValue1 String, otherValue2 String, time Int64', 1, 10, 2)
+LIMIT 100;
+
+
+SELECT '=============== OUTER QUERY (NO PARALLEL) ===============';
+
+SELECT
+    value1,
+    value2,
+    avg(count) AS avg
+FROM
+(
+    SELECT
+        key,
+        value1,
+        value2,
+        count() AS count
+    FROM join_outer_table
+    INNER JOIN
+    (
+        SELECT
+            key,
+            value1,
+            value2,
+            toUInt64(min(time)) AS start_ts
+        FROM join_inner_table
+        PREWHERE (id = '833c9e22-c245-4eb5-8745-117a9a1f26b1') AND (number > toUInt64('1610517366120'))
+        GROUP BY key, value1, value2
+    ) USING (key)
+    GROUP BY key, value1, value2
+)
+GROUP BY value1, value2
+ORDER BY value1, value2;
+
+SELECT '=============== OUTER QUERY (PARALLEL) ===============';
+
+-- Parallel full query
+SELECT
+    value1,
+    value2,
+    avg(count) AS avg
+FROM
+    (
+        SELECT
+            key,
+            value1,
+            value2,
+            count() AS count
+        FROM join_outer_table
+        INNER JOIN
+        (
+            SELECT
+                key,
+                value1,
+                value2,
+                toUInt64(min(time)) AS start_ts
+            FROM join_inner_table
+            PREWHERE (id = '833c9e22-c245-4eb5-8745-117a9a1f26b1') AND (number > toUInt64('1610517366120'))
+            GROUP BY key, value1, value2
+        ) USING (key)
+        GROUP BY key, value1, value2
+        )
+GROUP BY value1, value2
+ORDER BY value1, value2
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1;
+
+SYSTEM FLUSH LOGS;
+
+-- There should be 7 queries. The main query as received by the initiator, the 3 equal queries to execute the subquery
+-- in the inner join and the 3 queries executing the whole query (but replacing the subquery with a temp table)
+SELECT is_initial_query, count() as c, query,
+FROM system.query_log
+WHERE
+      event_date >= yesterday()
+  AND type = 'QueryFinish'
+  AND initial_query_id =
+      (
+          SELECT query_id
+          FROM system.query_log
+          WHERE
+                current_database = currentDatabase()
+            AND event_date >= yesterday()
+            AND type = 'QueryFinish'
+            AND query LIKE '-- Parallel full query%'
+      )
+GROUP BY is_initial_query, query
+ORDER BY is_initial_query, c, query;
diff --git a/tests/queries/0_stateless/02731_parquet_s3.reference b/tests/queries/0_stateless/02731_parquet_s3.reference
new file mode 100644
index 00000000000..5a5aaeb0068
--- /dev/null
+++ b/tests/queries/0_stateless/02731_parquet_s3.reference
@@ -0,0 +1 @@
+12639441726720293784
diff --git a/tests/queries/0_stateless/02731_parquet_s3.sql b/tests/queries/0_stateless/02731_parquet_s3.sql
new file mode 100644
index 00000000000..3c3f11f535b
--- /dev/null
+++ b/tests/queries/0_stateless/02731_parquet_s3.sql
@@ -0,0 +1,7 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
+-- Reading from s3 a parquet file of size between ~1 MB and ~2 MB was broken at some point.
+insert into function s3(s3_conn, filename='test_02731_parquet_s3.parquet') select cityHash64(number) from numbers(170000) settings s3_truncate_on_insert=1;
+
+select sum(*) from s3(s3_conn, filename='test_02731_parquet_s3.parquet') settings remote_filesystem_read_method='threadpool', remote_filesystem_read_prefetch=1;
diff --git a/tests/queries/0_stateless/02731_replace_partition_from_temporary_table.reference b/tests/queries/0_stateless/02731_replace_partition_from_temporary_table.reference
new file mode 100644
index 00000000000..ced682dd94f
--- /dev/null
+++ b/tests/queries/0_stateless/02731_replace_partition_from_temporary_table.reference
@@ -0,0 +1,9 @@
+Initial
+6	12
+6	12
+REPLACE simple
+6	10
+6	10
+ATTACH FROM
+6	10
+6	10
diff --git a/tests/queries/0_stateless/02731_replace_partition_from_temporary_table.sql b/tests/queries/0_stateless/02731_replace_partition_from_temporary_table.sql
new file mode 100644
index 00000000000..b2f31230dfb
--- /dev/null
+++ b/tests/queries/0_stateless/02731_replace_partition_from_temporary_table.sql
@@ -0,0 +1,48 @@
+-- Tags: no-replicated-database
+
+DROP TEMPORARY TABLE IF EXISTS src;
+DROP TABLE IF EXISTS dst;
+DROP TABLE IF EXISTS rdst;
+
+CREATE TEMPORARY TABLE src (p UInt64, k String, d UInt64) ENGINE = MergeTree PARTITION BY p ORDER BY k;
+CREATE TABLE dst (p UInt64, k String, d UInt64) ENGINE = MergeTree PARTITION BY p ORDER BY k;
+CREATE TABLE rdst (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_alter_attach_00626_rdst', 'r1') PARTITION BY p ORDER BY k;
+
+SELECT 'Initial';
+INSERT INTO src VALUES (0, '0', 1);
+INSERT INTO src VALUES (1, '0', 1);
+INSERT INTO src VALUES (1, '1', 1);
+INSERT INTO src VALUES (2, '0', 1);
+INSERT INTO src VALUES (3, '0', 1);
+INSERT INTO src VALUES (3, '1', 1);
+
+INSERT INTO dst VALUES (0, '1', 2);
+INSERT INTO dst VALUES (1, '1', 2), (1, '2', 2);
+INSERT INTO dst VALUES (2, '1', 2);
+INSERT INTO dst VALUES (3, '1', 2), (3, '2', 2);
+
+INSERT INTO rdst VALUES (0, '1', 2);
+INSERT INTO rdst VALUES (1, '1', 2), (1, '2', 2);
+INSERT INTO rdst VALUES (2, '1', 2);
+INSERT INTO rdst VALUES (3, '1', 2), (3, '2', 2);
+
+SELECT count(), sum(d) FROM dst;
+SELECT count(), sum(d) FROM rdst;
+
+SELECT 'REPLACE simple';
+ALTER TABLE dst REPLACE PARTITION 1 FROM src;
+SELECT count(), sum(d) FROM dst;
+ALTER TABLE rdst REPLACE PARTITION 3 FROM src;
+SELECT count(), sum(d) FROM rdst;
+
+SELECT 'ATTACH FROM';
+ALTER TABLE dst DROP PARTITION 1;
+ALTER TABLE dst ATTACH PARTITION 1 FROM src;
+SELECT count(), sum(d) FROM dst;
+ALTER TABLE rdst DROP PARTITION 3;
+ALTER TABLE rdst ATTACH PARTITION 1 FROM src;
+SELECT count(), sum(d) FROM rdst;
+
+DROP TEMPORARY TABLE IF EXISTS src;
+DROP TABLE IF EXISTS dst;
+DROP TABLE IF EXISTS rdst;
diff --git a/tests/queries/0_stateless/02731_zero_objects_in_metadata.reference b/tests/queries/0_stateless/02731_zero_objects_in_metadata.reference
new file mode 100644
index 00000000000..125915f4f65
--- /dev/null
+++ b/tests/queries/0_stateless/02731_zero_objects_in_metadata.reference
@@ -0,0 +1,3 @@
+1	[]
+1	[]
+[]
diff --git a/tests/queries/0_stateless/02731_zero_objects_in_metadata.sh b/tests/queries/0_stateless/02731_zero_objects_in_metadata.sh
new file mode 100755
index 00000000000..690cf977d08
--- /dev/null
+++ b/tests/queries/0_stateless/02731_zero_objects_in_metadata.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-s3-storage
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} -n --query "
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (id Int32, empty Array(Int32))
+    ENGINE=MergeTree ORDER BY id
+    SETTINGS min_rows_for_wide_part=0, min_bytes_for_wide_part=0, disk='s3_disk';
+
+INSERT INTO test (id) VALUES (1);
+SELECT * FROM test;
+"
+
+${CLICKHOUSE_CLIENT} -n --query "
+BACKUP TABLE test TO Disk('backups', 'test_s3_backup');
+DROP TABLE test;
+RESTORE TABLE test FROM Disk('backups', 'test_s3_backup');
+" &>/dev/null
+
+${CLICKHOUSE_CLIENT} -n --query "
+SELECT * FROM test;
+SELECT empty FROM test;
+"
diff --git a/tests/queries/0_stateless/02732_transform_fuzz.reference b/tests/queries/0_stateless/02732_transform_fuzz.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02732_transform_fuzz.sql b/tests/queries/0_stateless/02732_transform_fuzz.sql
new file mode 100644
index 00000000000..c2918d4da81
--- /dev/null
+++ b/tests/queries/0_stateless/02732_transform_fuzz.sql
@@ -0,0 +1 @@
+SELECT caseWithExpr(arrayReduce(NULL, []), []); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/02733_distinct.reference b/tests/queries/0_stateless/02733_distinct.reference
new file mode 100644
index 00000000000..caaa76087c9
--- /dev/null
+++ b/tests/queries/0_stateless/02733_distinct.reference
@@ -0,0 +1,10 @@
+		1
+		2
+v1	v2	3
+v1	v2	4
+v1	v2	5
+		1
+		2
+v1	v2	3
+v1	v2	4
+v1	v2	5
diff --git a/tests/queries/0_stateless/02733_distinct.sql b/tests/queries/0_stateless/02733_distinct.sql
new file mode 100644
index 00000000000..bbb26b17d8c
--- /dev/null
+++ b/tests/queries/0_stateless/02733_distinct.sql
@@ -0,0 +1,19 @@
+-- Tags: no-random-settings
+-- there is a bug if `optimize_distinct_in_order` is true
+
+DROP TABLE IF EXISTS test;
+CREATE TABLE test
+(
+    c1 String,
+    c2 String,
+    c3 String
+)
+ENGINE = ReplacingMergeTree
+ORDER BY (c1, c3);
+
+INSERT INTO test(c1, c2, c3) VALUES ('', '', '1'), ('', '', '2'),('v1', 'v2', '3'),('v1', 'v2', '4'),('v1', 'v2', '5');
+
+SELECT c1, c2, c3 FROM test GROUP BY c1, c2, c3 ORDER BY c1, c2, c3;
+SELECT DISTINCT c1, c2, c3 FROM test;
+
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/02733_fix_distinct_in_order_bug_49622.reference b/tests/queries/0_stateless/02733_fix_distinct_in_order_bug_49622.reference
new file mode 100644
index 00000000000..19f58f6ca91
--- /dev/null
+++ b/tests/queries/0_stateless/02733_fix_distinct_in_order_bug_49622.reference
@@ -0,0 +1,2 @@
+	1
+	2
diff --git a/tests/queries/0_stateless/02733_fix_distinct_in_order_bug_49622.sql b/tests/queries/0_stateless/02733_fix_distinct_in_order_bug_49622.sql
new file mode 100644
index 00000000000..9501a2c0761
--- /dev/null
+++ b/tests/queries/0_stateless/02733_fix_distinct_in_order_bug_49622.sql
@@ -0,0 +1,15 @@
+set optimize_distinct_in_order=1;
+
+DROP TABLE IF EXISTS test_string;
+
+CREATE TABLE test_string
+(
+    `c1` String,
+    `c2` String
+)
+ENGINE = MergeTree
+ORDER BY c1;
+
+INSERT INTO test_string(c1, c2) VALUES ('1',  ''), ('2', '');
+
+SELECT DISTINCT c2, c1 FROM test_string;
diff --git a/tests/queries/0_stateless/02733_sparse_columns_reload.reference b/tests/queries/0_stateless/02733_sparse_columns_reload.reference
new file mode 100644
index 00000000000..7ab314964ee
--- /dev/null
+++ b/tests/queries/0_stateless/02733_sparse_columns_reload.reference
@@ -0,0 +1,2 @@
+100000
+100000
diff --git a/tests/queries/0_stateless/02733_sparse_columns_reload.sql b/tests/queries/0_stateless/02733_sparse_columns_reload.sql
new file mode 100644
index 00000000000..d4b48274107
--- /dev/null
+++ b/tests/queries/0_stateless/02733_sparse_columns_reload.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS t_sparse_reload;
+
+CREATE TABLE t_sparse_reload (id UInt64, v UInt64)
+ENGINE = MergeTree ORDER BY id
+SETTINGS ratio_of_defaults_for_sparse_serialization = 0.95;
+
+INSERT INTO t_sparse_reload SELECT number, 0 FROM numbers(100000);
+
+SELECT count() FROM t_sparse_reload WHERE NOT ignore(*);
+
+ALTER TABLE t_sparse_reload MODIFY SETTING ratio_of_defaults_for_sparse_serialization = 1.0;
+
+DETACH TABLE t_sparse_reload;
+ATTACH TABLE t_sparse_reload;
+
+SELECT count() FROM t_sparse_reload WHERE NOT ignore(*);
+
+DROP TABLE t_sparse_reload;
diff --git a/tests/queries/0_stateless/02734_big_int_from_float_ubsan.reference b/tests/queries/0_stateless/02734_big_int_from_float_ubsan.reference
new file mode 100644
index 00000000000..9972842f982
--- /dev/null
+++ b/tests/queries/0_stateless/02734_big_int_from_float_ubsan.reference
@@ -0,0 +1 @@
+1	1
diff --git a/tests/queries/0_stateless/02734_big_int_from_float_ubsan.sql b/tests/queries/0_stateless/02734_big_int_from_float_ubsan.sql
new file mode 100644
index 00000000000..9fbf54c1a4d
--- /dev/null
+++ b/tests/queries/0_stateless/02734_big_int_from_float_ubsan.sql
@@ -0,0 +1,9 @@
+WITH
+    18 AS precision,
+    toUInt256(-1) AS int,
+    toUInt256(toFloat64(int)) AS converted,
+    toString(int) AS int_str,
+    toString(converted) AS converted_str
+SELECT
+    length(int_str) = length(converted_str) AS have_same_length,
+    substring(int_str, 1, precision) = substring(converted_str, 1, precision) AS have_same_prefix
diff --git a/tests/queries/0_stateless/02734_optimize_group_by.reference b/tests/queries/0_stateless/02734_optimize_group_by.reference
new file mode 100644
index 00000000000..3f5ef03cb61
--- /dev/null
+++ b/tests/queries/0_stateless/02734_optimize_group_by.reference
@@ -0,0 +1,8 @@
+a	b
+a	b
+a	b
+	b
+a	b
+a	b
+a	b
+a	b
diff --git a/tests/queries/0_stateless/02734_optimize_group_by.sql b/tests/queries/0_stateless/02734_optimize_group_by.sql
new file mode 100644
index 00000000000..28e86c04b0f
--- /dev/null
+++ b/tests/queries/0_stateless/02734_optimize_group_by.sql
@@ -0,0 +1,7 @@
+SELECT 'a' AS key, 'b' as value GROUP BY key WITH CUBE SETTINGS allow_experimental_analyzer = 0;
+SELECT 'a' AS key, 'b' as value GROUP BY key WITH CUBE SETTINGS allow_experimental_analyzer = 1;
+
+SELECT 'a' AS key, 'b' as value GROUP BY ignore(1) WITH CUBE;
+
+SELECT 'a' AS key, 'b' as value GROUP BY ignore(1);
+SELECT 'a' AS key, 'b' as value GROUP BY key;
diff --git a/tests/queries/0_stateless/02734_sparse_columns_mutation.reference b/tests/queries/0_stateless/02734_sparse_columns_mutation.reference
new file mode 100644
index 00000000000..bdce3124792
--- /dev/null
+++ b/tests/queries/0_stateless/02734_sparse_columns_mutation.reference
@@ -0,0 +1,5 @@
+5000	1189524
+1
+3333	0
+0
+3333	0
diff --git a/tests/queries/0_stateless/02734_sparse_columns_mutation.sql b/tests/queries/0_stateless/02734_sparse_columns_mutation.sql
new file mode 100644
index 00000000000..6fdb5b5f4a7
--- /dev/null
+++ b/tests/queries/0_stateless/02734_sparse_columns_mutation.sql
@@ -0,0 +1,30 @@
+DROP TABLE IF EXISTS t_sparse_mutation;
+
+CREATE TABLE t_sparse_mutation (id UInt64, v UInt64)
+ENGINE = MergeTree ORDER BY id
+SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
+
+INSERT INTO t_sparse_mutation select number, if (number % 21 = 0, number, 0) FROM numbers(10000);
+
+SET mutations_sync = 2;
+
+DELETE FROM t_sparse_mutation WHERE id % 2 = 0;
+
+SELECT count(), sum(v) FROM t_sparse_mutation;
+
+SELECT sum(has_lightweight_delete) FROM system.parts
+WHERE database = currentDatabase() AND table = 't_sparse_mutation' AND active;
+
+ALTER TABLE t_sparse_mutation UPDATE v = v * 2 WHERE id % 5 = 0;
+ALTER TABLE t_sparse_mutation DELETE WHERE id % 3 = 0;
+
+SELECT count(), sum(v) FROM t_sparse_mutation;
+
+OPTIMIZE TABLE t_sparse_mutation FINAL;
+
+SELECT sum(has_lightweight_delete) FROM system.parts
+WHERE database = currentDatabase() AND table = 't_sparse_mutation' AND active;
+
+SELECT count(), sum(v) FROM t_sparse_mutation;
+
+DROP TABLE t_sparse_mutation;
diff --git a/tests/queries/0_stateless/02734_sparse_columns_short_circuit.reference b/tests/queries/0_stateless/02734_sparse_columns_short_circuit.reference
new file mode 100644
index 00000000000..bf2c10d23ec
--- /dev/null
+++ b/tests/queries/0_stateless/02734_sparse_columns_short_circuit.reference
@@ -0,0 +1 @@
+477
diff --git a/tests/queries/0_stateless/02734_sparse_columns_short_circuit.sql b/tests/queries/0_stateless/02734_sparse_columns_short_circuit.sql
new file mode 100644
index 00000000000..da8de22a80e
--- /dev/null
+++ b/tests/queries/0_stateless/02734_sparse_columns_short_circuit.sql
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS t_sparse_short_circuit;
+
+SET short_circuit_function_evaluation = 'force_enable';
+
+CREATE TABLE t_sparse_short_circuit (a UInt64, b UInt64)
+ENGINE = MergeTree ORDER BY tuple()
+SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
+
+INSERT INTO t_sparse_short_circuit select number, if (number % 21 = 0, number % 10 + 1, 0) FROM numbers(100000);
+
+SELECT sum(if(a % 10 = 0, CAST(b, 'UInt8'), 0)) FROM t_sparse_short_circuit;
+
+DROP TABLE t_sparse_short_circuit;
diff --git a/tests/queries/0_stateless/02735_array_map_array_of_tuples.reference b/tests/queries/0_stateless/02735_array_map_array_of_tuples.reference
new file mode 100644
index 00000000000..80481fee564
--- /dev/null
+++ b/tests/queries/0_stateless/02735_array_map_array_of_tuples.reference
@@ -0,0 +1,4 @@
+[(1)]
+[1]
+[3]
+[3]
diff --git a/tests/queries/0_stateless/02735_array_map_array_of_tuples.sql b/tests/queries/0_stateless/02735_array_map_array_of_tuples.sql
new file mode 100644
index 00000000000..51d60aa0cd0
--- /dev/null
+++ b/tests/queries/0_stateless/02735_array_map_array_of_tuples.sql
@@ -0,0 +1,4 @@
+SELECT arrayMap((x) -> x, [tuple(1)]);
+SELECT arrayMap((x) -> x.1, [tuple(1)]);
+SELECT arrayMap((x) -> x.1 + x.2, [tuple(1, 2)]);
+SELECT arrayMap((x, y) -> x + y, [tuple(1, 2)]);
diff --git a/tests/queries/0_stateless/02735_asof_join_right_null.reference b/tests/queries/0_stateless/02735_asof_join_right_null.reference
new file mode 100644
index 00000000000..d4332556cb5
--- /dev/null
+++ b/tests/queries/0_stateless/02735_asof_join_right_null.reference
@@ -0,0 +1,95 @@
+-- { echoOn }
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b < t2.b ORDER BY t1.b;
+1	-1	1	1
+1	0	1	1
+1	1	1	2
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b <= t2.b ORDER BY t1.b;
+1	-1	1	1
+1	0	1	1
+1	1	1	1
+1	2	1	2
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b > t2.b ORDER BY t1.b;
+1	2	1	1
+1	3	1	2
+1	4	1	2
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b >= t2.b ORDER BY t1.b;
+1	1	1	1
+1	2	1	2
+1	3	1	2
+1	4	1	2
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b < t2.b ORDER BY t1.b;
+1	-1	1	1
+1	0	1	1
+1	1	1	2
+1	2	0	\N
+1	3	0	\N
+1	4	0	\N
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b <= t2.b ORDER BY t1.b;
+1	-1	1	1
+1	0	1	1
+1	1	1	1
+1	2	1	2
+1	3	0	\N
+1	4	0	\N
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b > t2.b ORDER BY t1.b;
+1	-1	0	\N
+1	0	0	\N
+1	1	0	\N
+1	2	1	1
+1	3	1	2
+1	4	1	2
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b >= t2.b ORDER BY t1.b;
+1	-1	0	\N
+1	0	0	\N
+1	1	1	1
+1	2	1	2
+1	3	1	2
+1	4	1	2
+SET join_use_nulls = 1;
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b < t2.b ORDER BY t1.b;
+1	-1	1	1
+1	0	1	1
+1	1	1	2
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b <= t2.b ORDER BY t1.b;
+1	-1	1	1
+1	0	1	1
+1	1	1	1
+1	2	1	2
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b > t2.b ORDER BY t1.b;
+1	2	1	1
+1	3	1	2
+1	4	1	2
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b >= t2.b ORDER BY t1.b;
+1	1	1	1
+1	2	1	2
+1	3	1	2
+1	4	1	2
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b < t2.b ORDER BY t1.b;
+1	-1	1	1
+1	0	1	1
+1	1	1	2
+1	2	\N	\N
+1	3	\N	\N
+1	4	\N	\N
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b <= t2.b ORDER BY t1.b;
+1	-1	1	1
+1	0	1	1
+1	1	1	1
+1	2	1	2
+1	3	\N	\N
+1	4	\N	\N
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b > t2.b ORDER BY t1.b;
+1	-1	\N	\N
+1	0	\N	\N
+1	1	\N	\N
+1	2	1	1
+1	3	1	2
+1	4	1	2
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b >= t2.b ORDER BY t1.b;
+1	-1	\N	\N
+1	0	\N	\N
+1	1	1	1
+1	2	1	2
+1	3	1	2
+1	4	1	2
+DROP TABLE t1;
diff --git a/tests/queries/0_stateless/02735_asof_join_right_null.sql b/tests/queries/0_stateless/02735_asof_join_right_null.sql
new file mode 100644
index 00000000000..997d33a0570
--- /dev/null
+++ b/tests/queries/0_stateless/02735_asof_join_right_null.sql
@@ -0,0 +1,32 @@
+
+CREATE TABLE t1 (a Int, b Int) ENGINE = Memory;
+INSERT INTO t1 VALUES (1, -1), (1, 0), (1, 1), (1, 2), (1, 3), (1, 4);
+
+CREATE TABLE t2 (a Int, b Nullable(Int)) ENGINE = Memory;
+INSERT INTO t2 VALUES (1, 1), (1, NULL), (1, 2);
+
+-- { echoOn }
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b < t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b <= t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b > t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b >= t2.b ORDER BY t1.b;
+
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b < t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b <= t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b > t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b >= t2.b ORDER BY t1.b;
+
+SET join_use_nulls = 1;
+
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b < t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b <= t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b > t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF JOIN t2 ON t1.a = t2.a AND t1.b >= t2.b ORDER BY t1.b;
+
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b < t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b <= t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b > t2.b ORDER BY t1.b;
+SELECT * FROM t1 ASOF LEFT JOIN t2 ON t1.a = t2.a AND t1.b >= t2.b ORDER BY t1.b;
+
+DROP TABLE t1;
+
diff --git a/tests/queries/0_stateless/02735_system_zookeeper_connection.reference b/tests/queries/0_stateless/02735_system_zookeeper_connection.reference
new file mode 100644
index 00000000000..1deabd88b88
--- /dev/null
+++ b/tests/queries/0_stateless/02735_system_zookeeper_connection.reference
@@ -0,0 +1,2 @@
+default	::1	9181	0	0	3
+zookeeper2	::1	9181	0	0	0
diff --git a/tests/queries/0_stateless/02735_system_zookeeper_connection.sql b/tests/queries/0_stateless/02735_system_zookeeper_connection.sql
new file mode 100644
index 00000000000..8b37c428413
--- /dev/null
+++ b/tests/queries/0_stateless/02735_system_zookeeper_connection.sql
@@ -0,0 +1,15 @@
+-- Tags: no-fasttest, no-replicated-database
+
+DROP TABLE IF EXISTS test_zk_connection_table;
+
+CREATE TABLE test_zk_connection_table (
+    key UInt64
+)
+ENGINE ReplicatedMergeTree('zookeeper2:/clickhouse/{database}/02731_zk_connection/{shard}', '{replica}')
+ORDER BY tuple();
+
+-- keeper_api_version will by 0 for auxiliary_zookeeper2, because we fail to get /api_version due to chroot
+-- I'm not sure if it's a bug or a useful trick to fallback to basic api
+select name, host, port, index, is_expired, keeper_api_version from system.zookeeper_connection order by name;
+
+DROP TABLE IF EXISTS test_zk_connection_table;
diff --git a/tests/queries/0_stateless/02736_bit_count_big_int.reference b/tests/queries/0_stateless/02736_bit_count_big_int.reference
new file mode 100644
index 00000000000..a3a725ace69
--- /dev/null
+++ b/tests/queries/0_stateless/02736_bit_count_big_int.reference
@@ -0,0 +1,13 @@
+128
+256
+128
+256
+127
+255
+126
+255
+64
+UInt8
+UInt16
+UInt8
+UInt16
diff --git a/tests/queries/0_stateless/02736_bit_count_big_int.sql b/tests/queries/0_stateless/02736_bit_count_big_int.sql
new file mode 100644
index 00000000000..35a4a641606
--- /dev/null
+++ b/tests/queries/0_stateless/02736_bit_count_big_int.sql
@@ -0,0 +1,19 @@
+SELECT bitCount(CAST(-1 AS UInt128));
+SELECT bitCount(CAST(-1 AS UInt256));
+
+SELECT bitCount(CAST(-1 AS Int128));
+SELECT bitCount(CAST(-1 AS Int256));
+
+SELECT bitCount(CAST(-1 AS UInt128) - 1);
+SELECT bitCount(CAST(-1 AS UInt256) - 2);
+
+SELECT bitCount(CAST(-1 AS Int128) - 3);
+SELECT bitCount(CAST(-1 AS Int256) - 4);
+
+SELECT bitCount(CAST(0xFFFFFFFFFFFFFFFF AS Int256));
+
+SELECT toTypeName(bitCount(1::UInt128));
+SELECT toTypeName(bitCount(1::UInt256));
+
+SELECT toTypeName(bitCount(1::Int128));
+SELECT toTypeName(bitCount(1::Int256));
diff --git a/tests/queries/0_stateless/02737_sql_auto_is_null.reference b/tests/queries/0_stateless/02737_sql_auto_is_null.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/02737_sql_auto_is_null.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/02737_sql_auto_is_null.sql b/tests/queries/0_stateless/02737_sql_auto_is_null.sql
new file mode 100644
index 00000000000..22f1a9524ca
--- /dev/null
+++ b/tests/queries/0_stateless/02737_sql_auto_is_null.sql
@@ -0,0 +1,2 @@
+SET SQL_AUTO_IS_NULL = 0;
+SELECT getSetting('SQL_AUTO_IS_NULL');
diff --git a/tests/queries/0_stateless/02740_hashed_dictionary_load_factor_smoke.reference b/tests/queries/0_stateless/02740_hashed_dictionary_load_factor_smoke.reference
new file mode 100644
index 00000000000..d43fa8e734c
--- /dev/null
+++ b/tests/queries/0_stateless/02740_hashed_dictionary_load_factor_smoke.reference
@@ -0,0 +1,12 @@
+CREATE DICTIONARY default.test_sparse_dictionary_load_factor\n(\n    `key` UInt64,\n    `value` UInt16\n)\nPRIMARY KEY key\nSOURCE(CLICKHOUSE(TABLE test_table))\nLIFETIME(MIN 0 MAX 0)\nLAYOUT(SPARSE_HASHED(MAX_LOAD_FACTOR 0.9))
+100000
+0
+CREATE DICTIONARY default.test_dictionary_load_factor\n(\n    `key` UInt64,\n    `value` UInt16\n)\nPRIMARY KEY key\nSOURCE(CLICKHOUSE(TABLE test_table))\nLIFETIME(MIN 0 MAX 0)\nLAYOUT(HASHED(MAX_LOAD_FACTOR 0.9))
+100000
+0
+CREATE DICTIONARY default.test_dictionary_load_factor_nullable\n(\n    `key` UInt64,\n    `value` Nullable(UInt16)\n)\nPRIMARY KEY key\nSOURCE(CLICKHOUSE(TABLE test_table_nullable))\nLIFETIME(MIN 0 MAX 0)\nLAYOUT(HASHED(MAX_LOAD_FACTOR 0.9))
+100000
+0
+CREATE DICTIONARY default.test_complex_dictionary_load_factor\n(\n    `key_1` UInt64,\n    `key_2` UInt64,\n    `value` UInt16\n)\nPRIMARY KEY key_1, key_2\nSOURCE(CLICKHOUSE(TABLE test_table_complex))\nLIFETIME(MIN 0 MAX 0)\nLAYOUT(COMPLEX_KEY_HASHED(MAX_LOAD_FACTOR 0.9))
+100000
+0
diff --git a/tests/queries/0_stateless/02740_hashed_dictionary_load_factor_smoke.sql b/tests/queries/0_stateless/02740_hashed_dictionary_load_factor_smoke.sql
new file mode 100644
index 00000000000..d4bb9a1b14a
--- /dev/null
+++ b/tests/queries/0_stateless/02740_hashed_dictionary_load_factor_smoke.sql
@@ -0,0 +1,107 @@
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table
+(
+    key UInt64,
+    value UInt16
+) ENGINE=Memory() AS SELECT number, number FROM numbers(1e5);
+
+DROP TABLE IF EXISTS test_table_nullable;
+CREATE TABLE test_table_nullable
+(
+    key UInt64,
+    value Nullable(UInt16)
+) ENGINE=Memory() AS SELECT number, number % 2 == 0 ? NULL : number FROM numbers(1e5);
+
+DROP TABLE IF EXISTS test_table_string;
+CREATE TABLE test_table_string
+(
+    key String,
+    value UInt16
+) ENGINE=Memory() AS SELECT 'foo' || number::String, number FROM numbers(1e5);
+
+DROP TABLE IF EXISTS test_table_complex;
+CREATE TABLE test_table_complex
+(
+    key_1 UInt64,
+    key_2 UInt64,
+    value UInt16
+) ENGINE=Memory() AS SELECT number, number, number FROM numbers(1e5);
+
+DROP DICTIONARY IF EXISTS test_sparse_dictionary_load_factor;
+CREATE DICTIONARY test_sparse_dictionary_load_factor
+(
+    key UInt64,
+    value UInt16
+) PRIMARY KEY key
+SOURCE(CLICKHOUSE(TABLE test_table))
+LAYOUT(SPARSE_HASHED(MAX_LOAD_FACTOR 0.90))
+LIFETIME(0);
+SHOW CREATE test_sparse_dictionary_load_factor;
+SYSTEM RELOAD DICTIONARY test_sparse_dictionary_load_factor;
+SELECT element_count FROM system.dictionaries WHERE database = currentDatabase() AND name = 'test_sparse_dictionary_load_factor';
+SELECT count() FROM test_table WHERE dictGet('test_sparse_dictionary_load_factor', 'value', key) != value;
+DROP DICTIONARY test_sparse_dictionary_load_factor;
+
+DROP DICTIONARY IF EXISTS test_dictionary_load_factor;
+CREATE DICTIONARY test_dictionary_load_factor
+(
+    key UInt64,
+    value UInt16
+) PRIMARY KEY key
+SOURCE(CLICKHOUSE(TABLE test_table))
+LAYOUT(HASHED(MAX_LOAD_FACTOR 0.90))
+LIFETIME(0);
+SHOW CREATE test_dictionary_load_factor;
+SYSTEM RELOAD DICTIONARY test_dictionary_load_factor;
+SELECT element_count FROM system.dictionaries WHERE database = currentDatabase() AND name = 'test_dictionary_load_factor';
+SELECT count() FROM test_table WHERE dictGet('test_dictionary_load_factor', 'value', key) != value;
+DROP DICTIONARY test_dictionary_load_factor;
+
+DROP DICTIONARY IF EXISTS test_dictionary_load_factor_nullable;
+CREATE DICTIONARY test_dictionary_load_factor_nullable
+(
+    key UInt64,
+    value Nullable(UInt16)
+) PRIMARY KEY key
+SOURCE(CLICKHOUSE(TABLE test_table_nullable))
+LAYOUT(HASHED(MAX_LOAD_FACTOR 0.90))
+LIFETIME(0);
+SHOW CREATE test_dictionary_load_factor_nullable;
+SYSTEM RELOAD DICTIONARY test_dictionary_load_factor_nullable;
+SELECT element_count FROM system.dictionaries WHERE database = currentDatabase() AND name = 'test_dictionary_load_factor_nullable';
+SELECT count() FROM test_table_nullable WHERE dictGet('test_dictionary_load_factor_nullable', 'value', key) != value;
+DROP DICTIONARY test_dictionary_load_factor_nullable;
+
+DROP DICTIONARY IF EXISTS test_complex_dictionary_load_factor;
+CREATE DICTIONARY test_complex_dictionary_load_factor
+(
+    key_1 UInt64,
+    key_2 UInt64,
+    value UInt16
+) PRIMARY KEY key_1, key_2
+SOURCE(CLICKHOUSE(TABLE test_table_complex))
+LAYOUT(COMPLEX_KEY_HASHED(MAX_LOAD_FACTOR 0.90))
+LIFETIME(0);
+SYSTEM RELOAD DICTIONARY test_complex_dictionary_load_factor;
+SHOW CREATE test_complex_dictionary_load_factor;
+SELECT element_count FROM system.dictionaries WHERE database = currentDatabase() and name = 'test_complex_dictionary_load_factor';
+SELECT count() FROM test_table_complex WHERE dictGet('test_complex_dictionary_load_factor', 'value', (key_1, key_2)) != value;
+DROP DICTIONARY test_complex_dictionary_load_factor;
+
+DROP DICTIONARY IF EXISTS test_dictionary_load_factor_string;
+CREATE DICTIONARY test_dictionary_load_factor_string
+(
+    key String,
+    value UInt16
+) PRIMARY KEY key
+SOURCE(CLICKHOUSE(TABLE test_table_string))
+LAYOUT(HASHED(MAX_LOAD_FACTOR 1))
+LIFETIME(0);
+-- should because of MAX_LOAD_FACTOR is 1 (maximum allowed value is 0.99)
+SYSTEM RELOAD DICTIONARY test_dictionary_load_factor_string; -- { serverError BAD_ARGUMENTS }
+DROP DICTIONARY test_dictionary_load_factor_string;
+
+DROP TABLE test_table;
+DROP TABLE test_table_nullable;
+DROP TABLE test_table_string;
+DROP TABLE test_table_complex;
diff --git a/tests/queries/0_stateless/02741_hashed_dictionary_load_factor.reference b/tests/queries/0_stateless/02741_hashed_dictionary_load_factor.reference
new file mode 100644
index 00000000000..abe891cbb9b
--- /dev/null
+++ b/tests/queries/0_stateless/02741_hashed_dictionary_load_factor.reference
@@ -0,0 +1,4 @@
+test_dictionary_hashed	1000000	0.4768	33558760
+test_dictionary_hashed_load_factor	1000000	0.9537	16781544
+test_dictionary_sparse_hashed	1000000	0.4768	20975848
+test_dictionary_sparse_hashed_load_factor	1000000	0.9537	10490088
diff --git a/tests/queries/0_stateless/02741_hashed_dictionary_load_factor.sql.j2 b/tests/queries/0_stateless/02741_hashed_dictionary_load_factor.sql.j2
new file mode 100644
index 00000000000..870acd54514
--- /dev/null
+++ b/tests/queries/0_stateless/02741_hashed_dictionary_load_factor.sql.j2
@@ -0,0 +1,39 @@
+{# vi: ft=sql #}
+
+{% for layout in ["hashed", "sparse_hashed"] %}
+DROP DICTIONARY IF EXISTS test_dictionary_{{layout}};
+DROP DICTIONARY IF EXISTS test_dictionary_{{layout}}_load_factor;
+DROP TABLE IF EXISTS test_table;
+
+CREATE TABLE test_table
+(
+    key UInt64,
+    value UInt16
+) ENGINE=Memory() AS SELECT number, number FROM numbers(1e6);
+
+CREATE DICTIONARY test_dictionary_{{layout}}
+(
+    key UInt64,
+    value UInt16
+) PRIMARY KEY key
+SOURCE(CLICKHOUSE(TABLE test_table))
+LAYOUT({{layout}}())
+LIFETIME(0);
+
+CREATE DICTIONARY test_dictionary_{{layout}}_load_factor
+(
+    key UInt64,
+    value UInt16
+) PRIMARY KEY key
+SOURCE(CLICKHOUSE(TABLE test_table))
+LAYOUT({{layout}}(MAX_LOAD_FACTOR 0.98))
+LIFETIME(0);
+
+SYSTEM RELOAD DICTIONARY test_dictionary_{{layout}};
+SYSTEM RELOAD DICTIONARY test_dictionary_{{layout}}_load_factor;
+SELECT name, element_count, round(load_factor, 4), bytes_allocated FROM system.dictionaries WHERE database = currentDatabase() ORDER BY name;
+
+DROP DICTIONARY IF EXISTS test_dictionary_{{layout}};
+DROP DICTIONARY IF EXISTS test_dictionary_{{layout}}_load_factor;
+DROP TABLE test_table;
+{% endfor %}
diff --git a/tests/queries/0_stateless/02750_settings_alias_tcp_protocol.python b/tests/queries/0_stateless/02750_settings_alias_tcp_protocol.python
new file mode 100644
index 00000000000..768fb2144e3
--- /dev/null
+++ b/tests/queries/0_stateless/02750_settings_alias_tcp_protocol.python
@@ -0,0 +1,218 @@
+#!/usr/bin/env python3
+
+import socket
+import os
+import uuid
+import json
+
+CLICKHOUSE_HOST = os.environ.get("CLICKHOUSE_HOST", "127.0.0.1")
+CLICKHOUSE_PORT = int(os.environ.get("CLICKHOUSE_PORT_TCP", "900000"))
+CLICKHOUSE_DATABASE = os.environ.get("CLICKHOUSE_DATABASE", "default")
+
+
+def writeVarUInt(x, ba):
+    for _ in range(0, 9):
+        byte = x & 0x7F
+        if x > 0x7F:
+            byte |= 0x80
+
+        ba.append(byte)
+
+        x >>= 7
+        if x == 0:
+            return
+
+
+def writeStringBinary(s, ba):
+    b = bytes(s, "utf-8")
+    writeVarUInt(len(s), ba)
+    ba.extend(b)
+
+
+def readStrict(s, size=1):
+    res = bytearray()
+    while size:
+        cur = s.recv(size)
+        # if not res:
+        #     raise "Socket is closed"
+        size -= len(cur)
+        res.extend(cur)
+
+    return res
+
+
+def readUInt(s, size=1):
+    res = readStrict(s, size)
+    val = 0
+    for i in range(len(res)):
+        val += res[i] << (i * 8)
+    return val
+
+
+def readUInt8(s):
+    return readUInt(s)
+
+
+def readUInt16(s):
+    return readUInt(s, 2)
+
+
+def readUInt32(s):
+    return readUInt(s, 4)
+
+
+def readUInt64(s):
+    return readUInt(s, 8)
+
+
+def readVarUInt(s):
+    x = 0
+    for i in range(9):
+        byte = readStrict(s)[0]
+        x |= (byte & 0x7F) << (7 * i)
+
+        if not byte & 0x80:
+            return x
+
+    return x
+
+
+def readStringBinary(s):
+    size = readVarUInt(s)
+    s = readStrict(s, size)
+    return s.decode("utf-8")
+
+
+def sendHello(s):
+    ba = bytearray()
+    writeVarUInt(0, ba)  # Hello
+    writeStringBinary("simple native protocol", ba)
+    writeVarUInt(21, ba)
+    writeVarUInt(9, ba)
+    writeVarUInt(54449, ba)
+    writeStringBinary(CLICKHOUSE_DATABASE, ba)  # database
+    writeStringBinary("default", ba)  # user
+    writeStringBinary("", ba)  # pwd
+    s.sendall(ba)
+
+
+def receiveHello(s):
+    p_type = readVarUInt(s)
+    assert p_type == 0  # Hello
+    _server_name = readStringBinary(s)
+    _server_version_major = readVarUInt(s)
+    _server_version_minor = readVarUInt(s)
+    _server_revision = readVarUInt(s)
+    _server_timezone = readStringBinary(s)
+    _server_display_name = readStringBinary(s)
+    _server_version_patch = readVarUInt(s)
+
+
+def serializeClientInfo(ba, query_id):
+    writeStringBinary("default", ba)  # initial_user
+    writeStringBinary(query_id, ba)  # initial_query_id
+    writeStringBinary("127.0.0.1:9000", ba)  # initial_address
+    ba.extend([0] * 8)  # initial_query_start_time_microseconds
+    ba.append(1)  # TCP
+    writeStringBinary("os_user", ba)  # os_user
+    writeStringBinary("client_hostname", ba)  # client_hostname
+    writeStringBinary("client_name", ba)  # client_name
+    writeVarUInt(21, ba)
+    writeVarUInt(9, ba)
+    writeVarUInt(54449, ba)
+    writeStringBinary("", ba)  # quota_key
+    writeVarUInt(0, ba)  # distributed_depth
+    writeVarUInt(1, ba)  # client_version_patch
+    ba.append(0)  # No telemetry
+
+
+def sendQuery(s, query, settings):
+    ba = bytearray()
+    query_id = uuid.uuid4().hex
+    writeVarUInt(1, ba)  # query
+    writeStringBinary(query_id, ba)
+
+    ba.append(1)  # INITIAL_QUERY
+
+    # client info
+    serializeClientInfo(ba, query_id)
+
+    # Settings
+    for key, value in settings.items():
+        writeStringBinary(key, ba)
+        writeVarUInt(1, ba)  # is_important
+        writeStringBinary(str(value), ba)
+    writeStringBinary("", ba)  # End of settings
+
+    writeStringBinary("", ba)  # No interserver secret
+    writeVarUInt(2, ba)  # Stage - Complete
+    ba.append(0)  # No compression
+    writeStringBinary(query, ba)  # query, finally
+    s.sendall(ba)
+
+
+def serializeBlockInfo(ba):
+    writeVarUInt(1, ba)  # 1
+    ba.append(0)  # is_overflows
+    writeVarUInt(2, ba)  # 2
+    writeVarUInt(0, ba)  # 0
+    ba.extend([0] * 4)  # bucket_num
+
+
+def sendEmptyBlock(s):
+    ba = bytearray()
+    writeVarUInt(2, ba)  # Data
+    writeStringBinary("", ba)
+    serializeBlockInfo(ba)
+    writeVarUInt(0, ba)  # rows
+    writeVarUInt(0, ba)  # columns
+    s.sendall(ba)
+
+
+def assertPacket(packet, expected):
+    assert packet == expected, "Got: {}, expected: {}".format(packet, expected)
+
+
+def readResponse(s):
+    packet_type = readVarUInt(s)
+    if packet_type == 2:  # Exception
+        raise RuntimeError(readException(s))
+
+    if packet_type == 1:  # Data
+        return None
+    if packet_type == 3:  # Progress
+        return None
+    if packet_type == 5:  # End stream
+        return None
+
+    raise RuntimeError("Unexpected packet: {}".format(packet_type))
+
+
+def readException(s):
+    code = readUInt32(s)
+    _name = readStringBinary(s)
+    text = readStringBinary(s)
+    readStringBinary(s)  # trace
+    assertPacket(readUInt8(s), 0)  # has_nested
+    return "code {}: {}".format(code, text.replace("DB::Exception:", ""))
+
+
+def main():
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.settimeout(30)
+        s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
+        sendHello(s)
+        receiveHello(s)
+        sendQuery(s, "select 1", {"replication_alter_partitions_sync": 1})
+        # external tables
+        sendEmptyBlock(s)
+
+        while readResponse(s) is not None:
+            pass
+
+        s.close()
+    print("OK")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/queries/0_stateless/02750_settings_alias_tcp_protocol.reference b/tests/queries/0_stateless/02750_settings_alias_tcp_protocol.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/02750_settings_alias_tcp_protocol.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/02750_settings_alias_tcp_protocol.sh b/tests/queries/0_stateless/02750_settings_alias_tcp_protocol.sh
new file mode 100755
index 00000000000..35d685c1580
--- /dev/null
+++ b/tests/queries/0_stateless/02750_settings_alias_tcp_protocol.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# NOTE: this sh wrapper is required because of shell_config
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+python3 "$CURDIR"/02750_settings_alias_tcp_protocol.python
diff --git a/tests/queries/0_stateless/02751_match_constant_needle.reference b/tests/queries/0_stateless/02751_match_constant_needle.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02751_match_constant_needle.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02751_match_constant_needle.sql b/tests/queries/0_stateless/02751_match_constant_needle.sql
new file mode 100644
index 00000000000..71bdcc7cb0a
--- /dev/null
+++ b/tests/queries/0_stateless/02751_match_constant_needle.sql
@@ -0,0 +1 @@
+select match('default/k8s1', '\\A(?:(?:[-0-9_a-z]+(?:\\.[-0-9_a-z]+)*)/k8s1)\\z');
diff --git a/tests/queries/0_stateless/02751_multiif_to_if_crash.reference b/tests/queries/0_stateless/02751_multiif_to_if_crash.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02751_multiif_to_if_crash.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02751_multiif_to_if_crash.sql b/tests/queries/0_stateless/02751_multiif_to_if_crash.sql
new file mode 100644
index 00000000000..05233c2c4b9
--- /dev/null
+++ b/tests/queries/0_stateless/02751_multiif_to_if_crash.sql
@@ -0,0 +1 @@
+SELECT sum(A) FROM (SELECT multiIf(1, 1, NULL) as A);
diff --git a/tests/queries/0_stateless/02751_multiquery_with_argument.reference b/tests/queries/0_stateless/02751_multiquery_with_argument.reference
new file mode 100644
index 00000000000..33288ec5bcb
--- /dev/null
+++ b/tests/queries/0_stateless/02751_multiquery_with_argument.reference
@@ -0,0 +1,24 @@
+100
+101
+102
+103
+Syntax error
+Empty query
+Empty query
+BAD_ARGUMENTS
+BAD_ARGUMENTS
+BAD_ARGUMENTS
+Bad arguments
+Bad arguments
+Bad arguments
+Bad arguments
+Bad arguments
+Bad arguments
+Bad arguments
+BAD_ARGUMENTS
+Bad arguments
+BAD_ARGUMENTS
+Bad arguments
+Bad arguments
+Bad arguments
+Bad arguments
diff --git a/tests/queries/0_stateless/02751_multiquery_with_argument.sh b/tests/queries/0_stateless/02751_multiquery_with_argument.sh
new file mode 100755
index 00000000000..153004c752e
--- /dev/null
+++ b/tests/queries/0_stateless/02751_multiquery_with_argument.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL --multiquery "SELECT 100"
+$CLICKHOUSE_LOCAL --multiquery "SELECT 101;"
+$CLICKHOUSE_LOCAL --multiquery "SELECT 102;SELECT 103;"
+
+# Invalid SQL.
+$CLICKHOUSE_LOCAL --multiquery "SELECT 200; S" 2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_LOCAL --multiquery "; SELECT 201;" 2>&1 | grep -o 'Empty query'
+$CLICKHOUSE_LOCAL --multiquery "; S; SELECT 202" 2>&1 | grep -o 'Empty query'
+
+# Error expectation cases.
+# -n <SQL> is prohibited
+$CLICKHOUSE_LOCAL -n "SELECT 301" 2>&1 | grep -o 'BAD_ARGUMENTS'
+$CLICKHOUSE_LOCAL -n "SELECT 302;" 2>&1 | grep -o 'BAD_ARGUMENTS'
+$CLICKHOUSE_LOCAL -n "SELECT 304;SELECT 305;" 2>&1 | grep -o 'BAD_ARGUMENTS'
+$CLICKHOUSE_LOCAL --multiquery --multiquery 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL -n --multiquery 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL --multiquery -n 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL --multiquery --multiquery "SELECT 306; SELECT 307;" 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL -n --multiquery "SELECT 307; SELECT 308;" 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL --multiquery "SELECT 309; SELECT 310;" --multiquery  2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL --multiquery "SELECT 311;" --multiquery "SELECT 312;" 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL --multiquery "SELECT 313;" -n "SELECT 314;" 2>&1 | grep -o 'BAD_ARGUMENTS'
+$CLICKHOUSE_LOCAL --multiquery "SELECT 315;" --query "SELECT 316;" 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL -n "SELECT 320" --query "SELECT 317;" 2>&1 | grep -o 'BAD_ARGUMENTS'
+$CLICKHOUSE_LOCAL --query --multiquery --multiquery "SELECT 318;" 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL --query --multiquery "SELECT 319;" 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL --query -n "SELECT 400;" 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL --query -n --multiquery "SELECT 401;" 2>&1 | grep -o 'Bad arguments'
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02751_parallel_replicas_bug_chunkinfo_not_set.reference b/tests/queries/0_stateless/02751_parallel_replicas_bug_chunkinfo_not_set.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02751_parallel_replicas_bug_chunkinfo_not_set.sql b/tests/queries/0_stateless/02751_parallel_replicas_bug_chunkinfo_not_set.sql
new file mode 100644
index 00000000000..2ea2cecc7b5
--- /dev/null
+++ b/tests/queries/0_stateless/02751_parallel_replicas_bug_chunkinfo_not_set.sql
@@ -0,0 +1,43 @@
+CREATE TABLE join_inner_table__fuzz_1
+(
+    `id` UUID,
+    `key` Nullable(Date),
+    `number` Int64,
+    `value1` LowCardinality(String),
+    `value2` LowCardinality(String),
+    `time` Int128
+)
+ENGINE = MergeTree
+ORDER BY (id, number, key)
+SETTINGS allow_nullable_key = 1;
+
+INSERT INTO join_inner_table__fuzz_1 SELECT
+    CAST('833c9e22-c245-4eb5-8745-117a9a1f26b1', 'UUID') AS id,
+    CAST(rowNumberInAllBlocks(), 'String') AS key,
+    *
+FROM generateRandom('number Int64, value1 String, value2 String, time Int64', 1, 10, 2)
+LIMIT 100;
+
+SET max_parallel_replicas = 3,  prefer_localhost_replica = 1, use_hedged_requests = 0, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_parallel_reading_from_replicas = 1;
+
+-- SELECT query will write a Warning to the logs
+SET send_logs_level='error';
+
+SELECT
+    key,
+    value1,
+    value2,
+    toUInt64(min(time)) AS start_ts
+FROM join_inner_table__fuzz_1
+PREWHERE (id = '833c9e22-c245-4eb5-8745-117a9a1f26b1') AND (number > toUInt64('1610517366120'))
+GROUP BY
+    key,
+    value1,
+    value2
+    WITH ROLLUP
+ORDER BY
+    key ASC,
+    value1 ASC,
+    value2 ASC NULLS LAST
+LIMIT 10
+FORMAT Null;
diff --git a/tests/queries/0_stateless/02751_protobuf_ipv6.reference b/tests/queries/0_stateless/02751_protobuf_ipv6.reference
new file mode 100644
index 00000000000..0318b49c77e
--- /dev/null
+++ b/tests/queries/0_stateless/02751_protobuf_ipv6.reference
@@ -0,0 +1,2 @@
+::ffff:1.2.3.4
+::ffff:1.2.3.4
diff --git a/tests/queries/0_stateless/02751_protobuf_ipv6.sh b/tests/queries/0_stateless/02751_protobuf_ipv6.sh
new file mode 100755
index 00000000000..f93963aa6c6
--- /dev/null
+++ b/tests/queries/0_stateless/02751_protobuf_ipv6.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+SCHEMADIR=$CURDIR/format_schemas
+
+
+echo -ne '\x12\x1a\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x01\x02\x03\x04' | $CLICKHOUSE_LOCAL --input-format Protobuf --format_schema="$SCHEMADIR/02751_protobuf_ipv6:Message" --structure="ipv6_bytes IPv6" -q "select * from table"
+
+$CLICKHOUSE_LOCAL -q "select '::ffff:1.2.3.4'::IPv6 as ipv6_bytes format Protobuf settings format_schema = '$SCHEMADIR/02751_protobuf_ipv6:Message'" | $CLICKHOUSE_LOCAL --input-format Protobuf --format_schema="$SCHEMADIR/02751_protobuf_ipv6:Message" --structure="ipv6_bytes IPv6"  -q "select * from table"
+
diff --git a/tests/queries/0_stateless/02751_query_log_test_partitions.reference b/tests/queries/0_stateless/02751_query_log_test_partitions.reference
new file mode 100644
index 00000000000..5a9f2163c0e
--- /dev/null
+++ b/tests/queries/0_stateless/02751_query_log_test_partitions.reference
@@ -0,0 +1,2 @@
+3	3
+02751_query_log_test_partitions.3
diff --git a/tests/queries/0_stateless/02751_query_log_test_partitions.sql b/tests/queries/0_stateless/02751_query_log_test_partitions.sql
new file mode 100644
index 00000000000..be047d1a46e
--- /dev/null
+++ b/tests/queries/0_stateless/02751_query_log_test_partitions.sql
@@ -0,0 +1,20 @@
+set log_queries=1;
+set log_queries_min_type='QUERY_FINISH';
+
+DROP TABLE IF EXISTS 02751_query_log_test_partitions;
+CREATE TABLE 02751_query_log_test_partitions (a Int64, b Int64) ENGINE = MergeTree PARTITION BY a ORDER BY b;
+
+INSERT INTO 02751_query_log_test_partitions SELECT number, number FROM numbers(10);
+
+SELECT * FROM 02751_query_log_test_partitions WHERE a = 3;
+
+SYSTEM FLUSH LOGS;
+
+SELECT
+    --Remove the prefix string which is a mutable database name.
+    arrayStringConcat(arrayPopFront(splitByString('.', partitions[1])), '.')
+FROM
+    system.query_log
+WHERE
+    current_database=currentDatabase() and
+    query = 'SELECT * FROM 02751_query_log_test_partitions WHERE a = 3;'
diff --git a/tests/queries/0_stateless/02751_text_formats_bad_nullable_parsing.reference b/tests/queries/0_stateless/02751_text_formats_bad_nullable_parsing.reference
new file mode 100644
index 00000000000..65e15e19c8b
--- /dev/null
+++ b/tests/queries/0_stateless/02751_text_formats_bad_nullable_parsing.reference
@@ -0,0 +1,3 @@
+1	\N
+1	\N
+1	\N
diff --git a/tests/queries/0_stateless/02751_text_formats_bad_nullable_parsing.sh b/tests/queries/0_stateless/02751_text_formats_bad_nullable_parsing.sh
new file mode 100755
index 00000000000..e51079071ec
--- /dev/null
+++ b/tests/queries/0_stateless/02751_text_formats_bad_nullable_parsing.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# NOTE: this sh wrapper is required because of shell_config
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "drop table if exists test" 
+$CLICKHOUSE_CLIENT -q "create table test (x UInt32, y Nullable(UInt32)) engine=MergeTree order by x"
+$CLICKHOUSE_CLIENT -q "select '1\t\\\N\n2\t\\\' format RawBLOB" | $CLICKHOUSE_CLIENT -q "insert into test settings input_format_allow_errors_num=1 format TSV"
+$CLICKHOUSE_CLIENT -q "select '1,\\\N\n2,\\\' format RawBLOB" | $CLICKHOUSE_CLIENT -q "insert into test settings input_format_allow_errors_num=1 format CSV"
+$CLICKHOUSE_CLIENT -q "select '1\tNULL\n2\tN' format RawBLOB" | $CLICKHOUSE_CLIENT -q "insert into test settings input_format_allow_errors_num=2, format_custom_escaping_rule='Quoted' format CustomSeparated"
+$CLICKHOUSE_CLIENT -q "select * from test"
+$CLICKHOUSE_CLIENT -q "drop table test"; 
diff --git a/tests/queries/0_stateless/02752_custom_separated_ignore_spaces_bug.reference b/tests/queries/0_stateless/02752_custom_separated_ignore_spaces_bug.reference
new file mode 100644
index 00000000000..f52004e62a3
--- /dev/null
+++ b/tests/queries/0_stateless/02752_custom_separated_ignore_spaces_bug.reference
@@ -0,0 +1 @@
+unquoted_string
diff --git a/tests/queries/0_stateless/02752_custom_separated_ignore_spaces_bug.sql b/tests/queries/0_stateless/02752_custom_separated_ignore_spaces_bug.sql
new file mode 100644
index 00000000000..62047a704a7
--- /dev/null
+++ b/tests/queries/0_stateless/02752_custom_separated_ignore_spaces_bug.sql
@@ -0,0 +1 @@
+select * from format(CustomSeparatedIgnoreSpaces, 'x String', ' unquoted_string\n') settings format_custom_escaping_rule='CSV';
diff --git a/tests/queries/0_stateless/02752_space_function.reference b/tests/queries/0_stateless/02752_space_function.reference
new file mode 100644
index 00000000000..d265a843ba9
--- /dev/null
+++ b/tests/queries/0_stateless/02752_space_function.reference
@@ -0,0 +1,86 @@
+const, uint
+   	3
+   	3
+   	3
+   	3
+const, int
+   	3
+   	3
+   	3
+   	3
+const, int, negative
+	0
+	0
+	0
+	0
+negative tests
+null
+\N
+const, uint, multiple
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+const int, multiple
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+                              
+non-const, uint
+   	3
+  	2
+ 	1
+	0
+            	12
+          	10
+    	4
+     	5
+    	4
+                     	21
+         	9
+       	7
+                                                        	56
+                    	20
+     	5
+       	7
+non-const, int
+   	3
+  	2
+ 	1
+	0
+            	12
+          	10
+    	4
+     	5
+	0
+	0
+	0
+	0
+                                                        	56
+                    	20
+     	5
+       	7
diff --git a/tests/queries/0_stateless/02752_space_function.sql b/tests/queries/0_stateless/02752_space_function.sql
new file mode 100644
index 00000000000..b12906927df
--- /dev/null
+++ b/tests/queries/0_stateless/02752_space_function.sql
@@ -0,0 +1,64 @@
+SELECT 'const, uint';
+SELECT space(3::UInt8), length(space(3::UInt8));
+SELECT space(3::UInt16), length(space(3::UInt16));
+SELECT space(3::UInt32), length(space(3::UInt32));
+SELECT space(3::UInt64), length(space(3::UInt64));
+SELECT 'const, int';
+SELECT space(3::Int8), length(space(3::Int8));
+SELECT space(3::Int16), length(space(3::Int16));
+SELECT space(3::Int32), length(space(3::Int32));
+SELECT space(3::Int64), length(space(3::Int64));
+
+SELECT 'const, int, negative';
+SELECT space(-3::Int8), length(space(-3::Int8));
+SELECT space(-3::Int16), length(space(-3::Int16));
+SELECT space(-3::Int32), length(space(-3::Int32));
+SELECT space(-3::Int64), length(space(-3::Int64));
+
+SELECT 'negative tests';
+SELECT space('abc'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT space(['abc']); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT space(('abc')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT space(30303030303030303030303030303030::UInt64); -- { serverError TOO_LARGE_STRING_SIZE }
+
+SELECT 'null';
+SELECT space(NULL);
+
+DROP TABLE IF EXISTS defaults;
+CREATE TABLE defaults
+(
+    u8 UInt8,
+    u16 UInt16,
+    u32 UInt32,
+    u64 UInt64,
+    i8 Int8,
+    i16 Int16,
+    i32 Int32,
+    i64 Int64
+) ENGINE = Memory();
+
+INSERT INTO defaults values (3, 12, 4, 56, 3, 12, -4, 56) (2, 10, 21, 20, 2, 10, -21, 20) (1, 4, 9, 5, 1, 4, -9, 5) (0, 5, 7, 7, 0, 5, -7, 7);
+
+SELECT 'const, uint, multiple';
+SELECT space(30::UInt8) FROM defaults;
+SELECT space(30::UInt16) FROM defaults;
+SELECT space(30::UInt32) FROM defaults;
+SELECT space(30::UInt64) FROM defaults;
+SELECT 'const int, multiple';
+SELECT space(30::Int8) FROM defaults;
+SELECT space(30::Int16) FROM defaults;
+SELECT space(30::Int32) FROM defaults;
+SELECT space(30::Int64) FROM defaults;
+
+SELECT 'non-const, uint';
+SELECT space(u8), length(space(u8)) FROM defaults;
+SELECT space(u16), length(space(u16)) FROM defaults;
+SELECT space(u32), length(space(u32)) from defaults;
+SELECT space(u64), length(space(u64)) FROM defaults;
+SELECT 'non-const, int';
+SELECT space(i8), length(space(i8)) FROM defaults;
+SELECT space(i16), length(space(i16)) FROM defaults;
+SELECT space(i32), length(space(i32)) from defaults;
+SELECT space(i64), length(space(i64)) FROM defaults;
+
+DROP TABLE defaults;
diff --git a/tests/queries/0_stateless/02760_dictionaries_memory.reference b/tests/queries/0_stateless/02760_dictionaries_memory.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02760_dictionaries_memory.sql.j2 b/tests/queries/0_stateless/02760_dictionaries_memory.sql.j2
new file mode 100644
index 00000000000..ea979506e07
--- /dev/null
+++ b/tests/queries/0_stateless/02760_dictionaries_memory.sql.j2
@@ -0,0 +1,32 @@
+-- Tags: long
+-- Tag long: in parallel runs could exceed 60 seconds
+{# vim: ft=sql #}
+
+SET max_memory_usage=0;
+DROP DICTIONARY IF EXISTS dict;
+DROP TABLE IF EXISTS dict_data;
+
+CREATE TABLE dict_data (key UInt64, value UInt64) Engine=Memory();
+INSERT INTO dict_data SELECT number, number%10 FROM numbers(3_000_000);
+
+SET max_memory_usage='4Mi';
+{% for layout in [
+    'FLAT(INITIAL_ARRAY_SIZE 3_000_000 MAX_ARRAY_SIZE 3_000_000)',
+    'HASHED()',
+    'HASHED_ARRAY()',
+    'SPARSE_HASHED()',
+    'SPARSE_HASHED(SHARDS 2 /* shards are special, they use threads */)',
+] %}
+CREATE DICTIONARY dict (key UInt64, value UInt64) PRIMARY KEY key SOURCE(CLICKHOUSE(TABLE dict_data)) LIFETIME(0) LAYOUT({{layout}});
+SYSTEM RELOAD DICTIONARY dict;
+-- assert that dictionary in memory takes more than 20MB, that way for each
+-- shard we will have 10MB, that way we ensure that the allocations will be
+-- definitely correct for the memory tracker to hit the MEMORY_LIMIT_EXCEEDED
+-- error.
+SELECT throwIf(bytes_allocated < 20e6, 'Memory constraints does not matched for layout {{layout}}') FROM system.dictionaries WHERE database = currentDatabase() AND name = 'dict' FORMAT Null;
+DROP DICTIONARY dict;
+
+CREATE DICTIONARY dict (key UInt64, value UInt64) PRIMARY KEY key SOURCE(CLICKHOUSE(TABLE dict_data)) LIFETIME(0) LAYOUT({{layout}});
+SELECT dictGet('dict', 'value', 1::UInt64) FORMAT Null;
+DROP DICTIONARY dict;
+{% endfor %}
diff --git a/tests/queries/0_stateless/02761_ddl_initial_query_id.reference b/tests/queries/0_stateless/02761_ddl_initial_query_id.reference
new file mode 100644
index 00000000000..5c6f448eed5
--- /dev/null
+++ b/tests/queries/0_stateless/02761_ddl_initial_query_id.reference
@@ -0,0 +1,5 @@
+default distributed_ddl_entry_format_version
+DROP TABLE IF EXISTS foo ON CLUSTER test_shard_localhost
+distributed_ddl_entry_format_version=PRESERVE_INITIAL_QUERY_ID_VERSION
+DROP TABLE IF EXISTS default.foo
+DROP TABLE IF EXISTS foo ON CLUSTER test_shard_localhost
diff --git a/tests/queries/0_stateless/02761_ddl_initial_query_id.sh b/tests/queries/0_stateless/02761_ddl_initial_query_id.sh
new file mode 100755
index 00000000000..e9a315b812b
--- /dev/null
+++ b/tests/queries/0_stateless/02761_ddl_initial_query_id.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+echo "default distributed_ddl_entry_format_version"
+query_id="$(random_str 10)"
+$CLICKHOUSE_CLIENT --query_id "$query_id" --distributed_ddl_output_mode=none -q "DROP TABLE IF EXISTS foo ON CLUSTER test_shard_localhost"
+$CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
+$CLICKHOUSE_CLIENT -q "SELECT query FROM system.query_log WHERE initial_query_id = '$query_id' AND type != 'QueryStart'"
+
+echo "distributed_ddl_entry_format_version=PRESERVE_INITIAL_QUERY_ID_VERSION"
+PRESERVE_INITIAL_QUERY_ID_VERSION=5
+query_id="$(random_str 10)"
+# Check that serialization will not be broken with new lines in initial_query_id
+query_id+=$'\nfoo'
+$CLICKHOUSE_CLIENT --distributed_ddl_entry_format_version=$PRESERVE_INITIAL_QUERY_ID_VERSION --query_id "$query_id" --distributed_ddl_output_mode=none -q "DROP TABLE IF EXISTS foo ON CLUSTER test_shard_localhost"
+$CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
+# - normalizeQuery() is required to strip out DDL comment
+# - replace() is required to avoid non deterministic behaviour of
+#   normalizeQuery() that replaces the identifier with "?" only if it has more
+#   then two numbers.
+$CLICKHOUSE_CLIENT -q "SELECT normalizeQuery(replace(query, currentDatabase(), 'default')) FROM system.query_log WHERE initial_query_id = '$query_id' AND type != 'QueryStart' ORDER BY event_time_microseconds"
diff --git a/tests/queries/0_stateless/02762_replicated_database_no_args.reference b/tests/queries/0_stateless/02762_replicated_database_no_args.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02762_replicated_database_no_args.sql b/tests/queries/0_stateless/02762_replicated_database_no_args.sql
new file mode 100644
index 00000000000..1409a059b02
--- /dev/null
+++ b/tests/queries/0_stateless/02762_replicated_database_no_args.sql
@@ -0,0 +1,4 @@
+-- Tags: no-parallel
+
+set allow_experimental_database_replicated=1;
+create database replicated_db_no_args engine=Replicated; -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/02763_jit_compare_functions_nan.reference b/tests/queries/0_stateless/02763_jit_compare_functions_nan.reference
new file mode 100644
index 00000000000..0fc42c1b712
--- /dev/null
+++ b/tests/queries/0_stateless/02763_jit_compare_functions_nan.reference
@@ -0,0 +1,7 @@
+--
+0
+0
+0
+0
+0
+0
diff --git a/tests/queries/0_stateless/02763_jit_compare_functions_nan.sql b/tests/queries/0_stateless/02763_jit_compare_functions_nan.sql
new file mode 100644
index 00000000000..61d165139d6
--- /dev/null
+++ b/tests/queries/0_stateless/02763_jit_compare_functions_nan.sql
@@ -0,0 +1,25 @@
+SET compile_expressions = 1;
+SET min_count_to_compile_expression = 0;
+
+DROP TABLE IF EXISTS test_table_1;
+DROP TABLE IF EXISTS test_table_2;
+
+CREATE TABLE test_table_1 (id UInt32) ENGINE = MergeTree ORDER BY (id);
+create table test_table_2 (id UInt32) ENGINE = MergeTree ORDER BY (id);
+INSERT INTO test_table_1 VALUES (2);
+INSERT INTO test_table_2 VALUES (2);
+
+select t1.id, t2.id FROM test_table_1 AS t1 RIGHT JOIN test_table_2 AS t2 ON (t1.id = t2.id)
+WHERE (acos(t2.id) <> atan(t1.id)) and (not (acos(t2.id) <> atan(t1.id)));
+
+DROP TABLE test_table_1;
+DROP TABLE test_table_2;
+
+SELECT '--';
+
+SELECT (acos(a) <> atan(b)) and (not (acos(a) <> atan(b))) r FROM (SELECT 2 a, 2 b);
+SELECT (acos(a) <> atan(b)) and (not (acos(a) <> atan(b))) r FROM (SELECT 2 a, 2 b);
+SELECT (acos(a) <> atan(b)) and (not (acos(a) <> atan(b))) r FROM (SELECT 2 a, 2 b);
+SELECT (acos(a) <> atan(b)) and (not (acos(a) <> atan(b))) r FROM (SELECT 2 a, 2 b);
+SELECT (acos(a) <> atan(b)) and (not (acos(a) <> atan(b))) r FROM (SELECT 2 a, 2 b);
+SELECT (acos(a) <> atan(b)) and (not (acos(a) <> atan(b))) r FROM (SELECT 2 a, 2 b);
diff --git a/tests/queries/0_stateless/02764_date_filter_predicate_optimizer.reference b/tests/queries/0_stateless/02764_date_filter_predicate_optimizer.reference
new file mode 100644
index 00000000000..e5c608ddc1a
--- /dev/null
+++ b/tests/queries/0_stateless/02764_date_filter_predicate_optimizer.reference
@@ -0,0 +1,39 @@
+SELECT value1
+FROM t
+WHERE ((date1 >= \'1993-01-01\') AND (date1 <= \'1993-12-31\')) AND ((id >= 1) AND (id <= 3))
+SELECT value1
+FROM t
+WHERE ((date1 < \'1993-01-01\') OR (date1 > \'1993-12-31\')) AND ((id >= 1) AND (id <= 3))
+SELECT value1
+FROM t
+WHERE (date1 < \'1993-01-01\') AND ((id >= 1) AND (id <= 3))
+SELECT value1
+FROM t
+WHERE (date1 > \'1993-12-31\') AND ((id >= 1) AND (id <= 3))
+SELECT value1
+FROM t
+WHERE (date1 <= \'1993-12-31\') AND ((id >= 1) AND (id <= 3))
+SELECT value1
+FROM t
+WHERE (date1 >= \'1993-01-01\') AND ((id >= 1) AND (id <= 3))
+SELECT value1
+FROM t
+WHERE ((date1 >= \'1993-01-01\') AND (date1 <= \'1997-12-31\')) AND ((id >= 1) AND (id <= 3))
+SELECT value1
+FROM t
+WHERE (((date1 >= \'1993-01-01\') AND (date1 <= \'1993-12-31\')) OR ((date1 >= \'1994-01-01\') AND (date1 <= \'1994-12-31\'))) AND ((id >= 1) AND (id <= 3))
+SELECT
+    value1,
+    toYear(date1) AS year1
+FROM t
+WHERE ((date1 >= \'1993-01-01\') AND (date1 <= \'1993-12-31\')) AND ((id >= 1) AND (id <= 3))
+SELECT value1
+FROM t
+WHERE (date1 < \'1993-01-01\') AND ((id >= 1) AND (id <= 3))
+SELECT value1
+FROM t
+PREWHERE (date1 >= \'1993-01-01\') AND (date1 <= \'1993-12-31\')
+WHERE ((date1 >= \'1993-01-01\') AND (date1 <= \'1993-12-31\')) AND ((id >= 1) AND (id <= 3))
+SELECT value1
+FROM t
+WHERE ((id >= 1) AND (id <= 3)) AND ((date1 >= \'1993-01-01\') AND (date1 <= \'1993-12-31\'))
diff --git a/tests/queries/0_stateless/02764_date_filter_predicate_optimizer.sql b/tests/queries/0_stateless/02764_date_filter_predicate_optimizer.sql
new file mode 100644
index 00000000000..563468d4f82
--- /dev/null
+++ b/tests/queries/0_stateless/02764_date_filter_predicate_optimizer.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (id UInt32, value1 String, date1 Date) ENGINE ReplacingMergeTree() ORDER BY id;
+
+EXPLAIN SYNTAX SELECT value1 FROM t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1 FROM t WHERE toYear(date1) <> 1993 AND id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1 FROM t WHERE toYear(date1) < 1993 AND id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1 FROM t WHERE toYear(date1) > 1993 AND id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1 FROM t WHERE toYear(date1) <= 1993 AND id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1 FROM t WHERE toYear(date1) >= 1993 AND id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1 FROM t WHERE toYear(date1) BETWEEN 1993 AND 1997 AND id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1 FROM t WHERE (toYear(date1) = 1993 OR toYear(date1) = 1994) AND id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1, toYear(date1) as year1 FROM t WHERE year1 = 1993 AND id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1 FROM t WHERE 1993 > toYear(date1) AND id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1 FROM t PREWHERE toYear(date1) = 1993 WHERE id BETWEEN 1 AND 3;
+EXPLAIN SYNTAX SELECT value1 FROM t WHERE id BETWEEN 1 AND 3 HAVING toYear(date1) = 1993;
+
+DROP TABLE t;
diff --git a/tests/queries/0_stateless/02764_parallel_replicas_plain_merge_tree.reference b/tests/queries/0_stateless/02764_parallel_replicas_plain_merge_tree.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02764_parallel_replicas_plain_merge_tree.sql b/tests/queries/0_stateless/02764_parallel_replicas_plain_merge_tree.sql
new file mode 100644
index 00000000000..aaf68dfd300
--- /dev/null
+++ b/tests/queries/0_stateless/02764_parallel_replicas_plain_merge_tree.sql
@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS parallel_replicas_plain (x String) ENGINE=MergeTree() ORDER BY x;
+INSERT INTO parallel_replicas_plain SELECT toString(number) FROM numbers(10);
+
+SET max_parallel_replicas=3, allow_experimental_parallel_reading_from_replicas=1, use_hedged_requests=0, cluster_for_parallel_replicas='parallel_replicas';
+SET send_logs_level='error';
+SET parallel_replicas_for_non_replicated_merge_tree = 0;
+
+SELECT x FROM parallel_replicas_plain LIMIT 1 FORMAT Null;
+SELECT max(length(x)) FROM parallel_replicas_plain FORMAT Null;
+
+SET parallel_replicas_for_non_replicated_merge_tree = 1;
+
+SELECT x FROM parallel_replicas_plain LIMIT 1 FORMAT Null;
+SELECT max(length(x)) FROM parallel_replicas_plain FORMAT Null;
+
+DROP TABLE IF EXISTS parallel_replicas_plain;
diff --git a/tests/queries/0_stateless/02765_parallel_replicas_final_modifier.reference b/tests/queries/0_stateless/02765_parallel_replicas_final_modifier.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02765_parallel_replicas_final_modifier.sql b/tests/queries/0_stateless/02765_parallel_replicas_final_modifier.sql
new file mode 100644
index 00000000000..f447051e1e5
--- /dev/null
+++ b/tests/queries/0_stateless/02765_parallel_replicas_final_modifier.sql
@@ -0,0 +1,14 @@
+CREATE TABLE IF NOT EXISTS parallel_replicas_final (x String) ENGINE=ReplacingMergeTree() ORDER BY x;
+
+INSERT INTO parallel_replicas_final SELECT toString(number) FROM numbers(10);
+
+SET max_parallel_replicas=3, allow_experimental_parallel_reading_from_replicas=1, use_hedged_requests=0, cluster_for_parallel_replicas='parallel_replicas';
+SET parallel_replicas_for_non_replicated_merge_tree = 1;
+
+SELECT * FROM parallel_replicas_final FINAL FORMAT Null;
+
+SET allow_experimental_parallel_reading_from_replicas=2;
+
+SELECT * FROM parallel_replicas_final FINAL FORMAT Null; -- { serverError SUPPORT_IS_DISABLED }
+
+DROP TABLE IF EXISTS parallel_replicas_final;
diff --git a/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.reference b/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.reference
new file mode 100644
index 00000000000..d21f914f0dc
--- /dev/null
+++ b/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.reference
@@ -0,0 +1,24 @@
+view	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	0	1	0	1	2	3
+subquery	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	0	0	1	0	2	2
+CSE	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	0	0	1	0	2	2
+CSE_Multi	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	0	0	1	0	2	2
+CTE	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	0	0	1	0	2	2
+CTE_Multi	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	0	0	1	0	4	4
+view	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	1	1	0	1	3	4
+subquery	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	1	0	1	0	2	2
+CSE	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	1	0	1	0	2	2
+CSE_Multi	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	1	0	1	0	2	2
+CTE	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	1	0	1	0	2	2
+CTE_Multi	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+1	1	0	1	0	4	4
diff --git a/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.sh b/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.sh
new file mode 100755
index 00000000000..cded0b28409
--- /dev/null
+++ b/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.sh
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -n -q "
+    DROP TABLE IF EXISTS mv;
+    DROP TABLE IF EXISTS output;
+    DROP TABLE IF EXISTS input;
+
+    CREATE TABLE input (key Int) Engine=Null;
+    CREATE TABLE output AS input Engine=Null;
+    CREATE MATERIALIZED VIEW mv TO output AS SELECT * FROM input;
+"
+
+for allow_experimental_analyzer in 0 1; do
+    query_id="$(random_str 10)"
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "INSERT INTO input SELECT * FROM numbers(1)"
+    $CLICKHOUSE_CLIENT -mn -q "
+        SYSTEM FLUSH LOGS;
+        SELECT
+            1 view,
+            $allow_experimental_analyzer allow_experimental_analyzer,
+            ProfileEvents['InsertQuery'] InsertQuery,
+            ProfileEvents['SelectQuery'] SelectQuery,
+            ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
+            -- FIXME: for analyzer it will have one more for sample block
+            ProfileEvents['SelectQueriesWithSubqueries'] SelectQueriesWithSubqueries,
+            ProfileEvents['QueriesWithSubqueries'] QueriesWithSubqueries
+        FROM system.query_log
+        WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND query_id = '$query_id'
+        FORMAT TSVWithNames;
+    "
+
+    query_id="$(random_str 10)"
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "SELECT * FROM system.one WHERE dummy IN (SELECT * FROM system.one) FORMAT Null"
+    $CLICKHOUSE_CLIENT -mn -q "
+        SYSTEM FLUSH LOGS;
+        SELECT
+            1 subquery,
+            $allow_experimental_analyzer allow_experimental_analyzer,
+            ProfileEvents['InsertQuery'] InsertQuery,
+            ProfileEvents['SelectQuery'] SelectQuery,
+            ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
+            ProfileEvents['SelectQueriesWithSubqueries'] SelectQueriesWithSubqueries,
+            ProfileEvents['QueriesWithSubqueries'] QueriesWithSubqueries
+        FROM system.query_log
+        WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND query_id = '$query_id'
+        FORMAT TSVWithNames;
+    "
+
+    query_id="$(random_str 10)"
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "WITH (SELECT * FROM system.one) AS x SELECT x FORMAT Null"
+    $CLICKHOUSE_CLIENT -mn -q "
+        SYSTEM FLUSH LOGS;
+        SELECT
+            1 CSE,
+            $allow_experimental_analyzer allow_experimental_analyzer,
+            ProfileEvents['InsertQuery'] InsertQuery,
+            ProfileEvents['SelectQuery'] SelectQuery,
+            ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
+            ProfileEvents['SelectQueriesWithSubqueries'] SelectQueriesWithSubqueries,
+            ProfileEvents['QueriesWithSubqueries'] QueriesWithSubqueries
+        FROM system.query_log
+        WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND query_id = '$query_id'
+        FORMAT TSVWithNames;
+    "
+
+    query_id="$(random_str 10)"
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "WITH (SELECT * FROM system.one) AS x SELECT x, x FORMAT Null"
+    $CLICKHOUSE_CLIENT -mn -q "
+        SYSTEM FLUSH LOGS;
+        SELECT
+            1 CSE_Multi,
+            $allow_experimental_analyzer allow_experimental_analyzer,
+            ProfileEvents['InsertQuery'] InsertQuery,
+            ProfileEvents['SelectQuery'] SelectQuery,
+            ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
+            ProfileEvents['SelectQueriesWithSubqueries'] SelectQueriesWithSubqueries,
+            ProfileEvents['QueriesWithSubqueries'] QueriesWithSubqueries
+        FROM system.query_log
+        WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND query_id = '$query_id'
+        FORMAT TSVWithNames;
+    "
+
+    query_id="$(random_str 10)"
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "WITH x AS (SELECT * FROM system.one) SELECT * FROM x FORMAT Null"
+    $CLICKHOUSE_CLIENT -mn -q "
+        SYSTEM FLUSH LOGS;
+        SELECT
+            1 CTE,
+            $allow_experimental_analyzer allow_experimental_analyzer,
+            ProfileEvents['InsertQuery'] InsertQuery,
+            ProfileEvents['SelectQuery'] SelectQuery,
+            ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
+            ProfileEvents['SelectQueriesWithSubqueries'] SelectQueriesWithSubqueries,
+            ProfileEvents['QueriesWithSubqueries'] QueriesWithSubqueries
+        FROM system.query_log
+        WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND query_id = '$query_id'
+        FORMAT TSVWithNames;
+    "
+
+    query_id="$(random_str 10)"
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "WITH x AS (SELECT * FROM system.one) SELECT * FROM x UNION ALL SELECT * FROM x FORMAT Null"
+    $CLICKHOUSE_CLIENT -mn -q "
+        SYSTEM FLUSH LOGS;
+        SELECT
+            1 CTE_Multi,
+            $allow_experimental_analyzer allow_experimental_analyzer,
+            ProfileEvents['InsertQuery'] InsertQuery,
+            ProfileEvents['SelectQuery'] SelectQuery,
+            ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
+            ProfileEvents['SelectQueriesWithSubqueries'] SelectQueriesWithSubqueries,
+            ProfileEvents['QueriesWithSubqueries'] QueriesWithSubqueries
+        FROM system.query_log
+        WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND query_id = '$query_id'
+        FORMAT TSVWithNames;
+    "
+done
diff --git a/tests/queries/0_stateless/02767_into_outfile_extensions_msan.reference b/tests/queries/0_stateless/02767_into_outfile_extensions_msan.reference
new file mode 100644
index 00000000000..0c8b489c2fd
--- /dev/null
+++ b/tests/queries/0_stateless/02767_into_outfile_extensions_msan.reference
@@ -0,0 +1,2 @@
+Expression ((Projection + Before ORDER BY))
+  ReadFromStorage (SystemNumbers)
diff --git a/tests/queries/0_stateless/02767_into_outfile_extensions_msan.sh b/tests/queries/0_stateless/02767_into_outfile_extensions_msan.sh
new file mode 100755
index 00000000000..0c5767314d5
--- /dev/null
+++ b/tests/queries/0_stateless/02767_into_outfile_extensions_msan.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+out="explain1.$CLICKHOUSE_TEST_UNIQUE_NAME.out"
+# only EXPLAIN triggers the problem under MSan
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -q "explain select * from numbers(1) into outfile '$out'"
+cat "$out"
+rm -f "$out"
diff --git a/tests/queries/0_stateless/02768_into_outfile_extensions_format.reference b/tests/queries/0_stateless/02768_into_outfile_extensions_format.reference
new file mode 100644
index 00000000000..4ebc1da8865
--- /dev/null
+++ b/tests/queries/0_stateless/02768_into_outfile_extensions_format.reference
@@ -0,0 +1,20 @@
+SELECT *
+FROM numbers(1)
+INTO OUTFILE '/dev/null'
+;
+
+SELECT *
+FROM numbers(1)
+INTO OUTFILE '/dev/null' AND STDOUT
+;
+
+SELECT *
+FROM numbers(1)
+INTO OUTFILE '/dev/null' APPEND
+;
+
+SELECT *
+FROM numbers(1)
+INTO OUTFILE '/dev/null' APPEND AND STDOUT
+;
+
diff --git a/tests/queries/0_stateless/02768_into_outfile_extensions_format.sh b/tests/queries/0_stateless/02768_into_outfile_extensions_format.sh
new file mode 100755
index 00000000000..756488076f9
--- /dev/null
+++ b/tests/queries/0_stateless/02768_into_outfile_extensions_format.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+echo "
+select * from numbers(1) into outfile '/dev/null';
+select * from numbers(1) into outfile '/dev/null' and stdout;
+select * from numbers(1) into outfile '/dev/null' append;
+select * from numbers(1) into outfile '/dev/null' append and stdout;
+" | clickhouse-format -n
diff --git a/tests/queries/0_stateless/02769_nan_equality_comparison.reference b/tests/queries/0_stateless/02769_nan_equality_comparison.reference
new file mode 100644
index 00000000000..a8ba06cfce6
--- /dev/null
+++ b/tests/queries/0_stateless/02769_nan_equality_comparison.reference
@@ -0,0 +1,10 @@
+nan	0	0	0	0
+nan	0	0	0	0
+nan	nan	0	0	0	0
+--
+--
+nan	1	1	1	1
+nan	1	1	1	1
+nan	nan	1	1	1	1
+--
+nan
diff --git a/tests/queries/0_stateless/02769_nan_equality_comparison.sql b/tests/queries/0_stateless/02769_nan_equality_comparison.sql
new file mode 100644
index 00000000000..6cce19a2204
--- /dev/null
+++ b/tests/queries/0_stateless/02769_nan_equality_comparison.sql
@@ -0,0 +1,42 @@
+SET compile_expressions = 1;
+SET min_count_to_compile_expression = 0;
+
+SELECT nan AS value, value = value, value = materialize(value), materialize(value) = value, materialize(value) = materialize(value);
+SELECT cast(nan, 'Float32') AS value, value = value, value = materialize(value), materialize(value) = value, materialize(value) = materialize(value);
+SELECT nan AS lhs, cast(nan, 'Float32') AS rhs, lhs = rhs, lhs = materialize(rhs), materialize(lhs) = rhs, materialize(lhs) = materialize(rhs);
+
+SELECT '--';
+
+CREATE TABLE test_table
+(
+    id UInt32,
+    value UInt32
+) ENGINE = MergeTree ORDER BY id;
+INSERT INTO test_table VALUES (76, 57);
+
+SELECT value FROM (SELECT stddevSamp(id) AS value FROM test_table) as subquery
+WHERE ((value = value) AND (NOT (value = value)));
+
+DROP TABLE test_table;
+
+SELECT '--';
+
+SELECT nan AS value, value != value, value != materialize(value), materialize(value) != value, materialize(value) != materialize(value);
+SELECT cast(nan, 'Float32') AS value, value != value, value != materialize(value), materialize(value) != value, materialize(value) != materialize(value);
+SELECT nan AS lhs, cast(nan, 'Float32') AS rhs, lhs != rhs, lhs != materialize(rhs), materialize(lhs) != rhs, materialize(lhs) != materialize(rhs);
+
+SELECT '--';
+
+CREATE TABLE test_table
+(
+    id UInt32,
+    value_1 UInt32,
+    value_2 Float32
+) ENGINE = MergeTree ORDER BY id;
+INSERT INTO test_table VALUES (12000, 36, 77.94);
+
+SELECT value
+FROM (SELECT (corr(value_1, value_1) OVER test_window) AS value FROM test_table WINDOW test_window AS (PARTITION BY value_2 ORDER BY id ASC)) as subquery
+WHERE not (not (value <> value));
+
+DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/02770_jit_aggregation_nullable_key_fix.reference b/tests/queries/0_stateless/02770_jit_aggregation_nullable_key_fix.reference
new file mode 100644
index 00000000000..7d604c076f4
--- /dev/null
+++ b/tests/queries/0_stateless/02770_jit_aggregation_nullable_key_fix.reference
@@ -0,0 +1,4 @@
+1048576
+65411
+1048576
+65411
diff --git a/tests/queries/0_stateless/02770_jit_aggregation_nullable_key_fix.sql b/tests/queries/0_stateless/02770_jit_aggregation_nullable_key_fix.sql
new file mode 100644
index 00000000000..e4ce789f4da
--- /dev/null
+++ b/tests/queries/0_stateless/02770_jit_aggregation_nullable_key_fix.sql
@@ -0,0 +1,39 @@
+SET compile_aggregate_expressions = 1;
+SET min_count_to_compile_aggregate_expression = 0;
+SET group_by_use_nulls = 0;
+
+SELECT count() FROM
+(
+    SELECT
+        count([NULL, NULL]),
+        count([2147483646, -2147483647, 3, 3]),
+        uniqExact(if(number >= 1048577, number, NULL), NULL)
+    FROM numbers(1048577)
+    GROUP BY if(number >= 2., number, NULL)
+);
+
+SELECT count() FROM
+(
+    SELECT count()
+    FROM numbers(65411)
+    GROUP BY if(number < 1, NULL, number)
+);
+
+SET group_by_use_nulls = 1;
+
+SELECT count() FROM
+(
+    SELECT
+        count([NULL, NULL]),
+        count([2147483646, -2147483647, 3, 3]),
+        uniqExact(if(number >= 1048577, number, NULL), NULL)
+    FROM numbers(1048577)
+    GROUP BY if(number >= 2., number, NULL)
+);
+
+SELECT count() FROM
+(
+    SELECT count()
+    FROM numbers(65411)
+    GROUP BY if(number < 1, NULL, number)
+);
diff --git a/tests/queries/0_stateless/add-test b/tests/queries/0_stateless/add-test
index e8e68cf174e..dbff8212020 100755
--- a/tests/queries/0_stateless/add-test
+++ b/tests/queries/0_stateless/add-test
@@ -10,7 +10,7 @@ TESTS_PATH=$(dirname ${BASH_SOURCE[0]})
 set -ue
 
 # shellcheck disable=SC2010
-LAST_TEST_NO=$(ls -1 ${TESTS_PATH} | grep -P -o '^\d+' | sort -nr | head -1)
+LAST_TEST_NO=$(ls -1 ${TESTS_PATH} | grep -E -o '^[0-9]+' | sort -nr | head -1)
 
 # remove leading zeros, increment and add padding zeros to 5 digits
 NEW_TEST_NO=$(printf "%05d\n" $((10#$LAST_TEST_NO + 1)))
diff --git a/tests/queries/0_stateless/data_parquet/02588_data.parquet b/tests/queries/0_stateless/data_parquet/02588_data.parquet
new file mode 100644
index 00000000000..e00b869233d
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/02588_data.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/02716_data.parquet b/tests/queries/0_stateless/data_parquet/02716_data.parquet
new file mode 100644
index 00000000000..21875ca286c
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/02716_data.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/02718_data.parquet b/tests/queries/0_stateless/data_parquet/02718_data.parquet
new file mode 100644
index 00000000000..6a930689c83
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/02718_data.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/02725_data.parquet b/tests/queries/0_stateless/data_parquet/02725_data.parquet
new file mode 100644
index 00000000000..5b4842c9dbd
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/02725_data.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet.columns b/tests/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet.columns
index c6bb5057cc2..dc094bef8ed 100644
--- a/tests/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet.columns
+++ b/tests/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet.columns
@@ -1 +1 @@
-`a` Nullable(String), `b` Array(Nullable(Int32)), `c` Nullable(Float64), `d` Nullable(UInt8), `e` Array(Nullable(Int32))
+`a` Nullable(String), `b` Nullable(Int32), `c` Nullable(Float64), `d` Nullable(UInt8), `e` Array(Nullable(Int32))
diff --git a/tests/queries/0_stateless/format_schemas/02566_ipv4_ipv6.capnp b/tests/queries/0_stateless/format_schemas/02566_ipv4_ipv6.capnp
new file mode 100644
index 00000000000..f999043e2d2
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02566_ipv4_ipv6.capnp
@@ -0,0 +1,6 @@
+@0xb6ecde1cd54a101d;
+
+struct Message {
+    ipv4 @0 :UInt32;
+    ipv6 @1 :Data;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02705_big_numbers.capnp b/tests/queries/0_stateless/format_schemas/02705_big_numbers.capnp
new file mode 100644
index 00000000000..67ef4637454
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02705_big_numbers.capnp
@@ -0,0 +1,10 @@
+@0xdbb9ad1f14bf0b36;
+
+struct Message {
+    int128 @0 :Data;
+    uint128 @1 :Data;
+    int256 @2 :Data;
+    uint256 @3 :Data;
+    decimal128 @4 :Data;
+    decimal256 @5 :Data;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02705_map.capnp b/tests/queries/0_stateless/format_schemas/02705_map.capnp
new file mode 100644
index 00000000000..91f0125feeb
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02705_map.capnp
@@ -0,0 +1,14 @@
+@0xdbb9ad1f14bf0b36;
+
+struct Message {
+    struct Map {
+        struct Entry {
+            key @0 : Text;
+            value @1 : UInt32;
+        }
+
+        entries @0 : List(Entry);
+    }
+
+    map @0 : Map;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02707_schema.proto b/tests/queries/0_stateless/format_schemas/02707_schema.proto
new file mode 100644
index 00000000000..afbc1f854b1
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02707_schema.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+message Nested {
+    int32 a = 1;
+    string b = 2;
+    repeated int32 c = 3;
+};
+
+message Message {
+    Nested x = 1;
+};
diff --git a/tests/queries/0_stateless/format_schemas/02710_schema.proto b/tests/queries/0_stateless/format_schemas/02710_schema.proto
new file mode 100644
index 00000000000..d6bf0ad350a
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02710_schema.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+message Message
+{
+    uint32 ipv4 = 1;
+    bytes ipv4_bytes = 2;
+    int64 ipv4_int64 = 3;
+    int32 date32 = 4;
+    bytes date32_bytes = 5;
+    int64 date32_int64 = 6;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02751_protobuf_ipv6.proto b/tests/queries/0_stateless/format_schemas/02751_protobuf_ipv6.proto
new file mode 100644
index 00000000000..8e6f115f2d7
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02751_protobuf_ipv6.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+
+message Message
+{
+    bytes ipv6_bytes = 3;
+}
diff --git a/tests/queries/0_stateless/replication.lib b/tests/queries/0_stateless/replication.lib
index 7c7db48e078..1805b56f8dc 100755
--- a/tests/queries/0_stateless/replication.lib
+++ b/tests/queries/0_stateless/replication.lib
@@ -29,8 +29,10 @@ function try_sync_replicas()
     i=0
     for t in "${tables_arr[@]}"
     do
-        # The size of log may be big, so increase timeout.
-        $CLICKHOUSE_CLIENT --receive_timeout $time_left -q "SYSTEM SYNC REPLICA $t" || ($CLICKHOUSE_CLIENT -q \
+        # Do not start new merges (it can make SYNC a bit faster)
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE $t MODIFY SETTING max_replicated_merges_in_queue=0"
+
+        $CLICKHOUSE_CLIENT --receive_timeout $time_left -q "SYSTEM SYNC REPLICA $t STRICT" || ($CLICKHOUSE_CLIENT -q \
             "select 'sync failed, queue:', * from system.replication_queue where database=currentDatabase() and table='$t' order by database, table, node_name" && exit 1) &
         pids[${i}]=$!
         i=$((i + 1))
@@ -79,9 +81,9 @@ function check_replication_consistency()
 
     # Trigger pullLogsToQueue(...) and updateMutations(...) on some replica to make it pull all mutations, so it will be possible to kill them
     some_table=$($CLICKHOUSE_CLIENT -q "SELECT name FROM system.tables WHERE database=currentDatabase() AND name like '$table_name_prefix%' ORDER BY rand() LIMIT 1")
-    $CLICKHOUSE_CLIENT --receive_timeout 3 -q "SYSTEM SYNC REPLICA $some_table" 1>/dev/null 2>/dev/null ||:
+    $CLICKHOUSE_CLIENT -q "SYSTEM SYNC REPLICA $some_table PULL" 1>/dev/null 2>/dev/null ||:
     some_table=$($CLICKHOUSE_CLIENT -q "SELECT name FROM system.tables WHERE database=currentDatabase() AND name like '$table_name_prefix%' ORDER BY rand() LIMIT 1")
-    $CLICKHOUSE_CLIENT --receive_timeout 3 -q "SYSTEM SYNC REPLICA $some_table" 1>/dev/null 2>/dev/null ||:
+    $CLICKHOUSE_CLIENT -q "SYSTEM SYNC REPLICA $some_table PULL" 1>/dev/null 2>/dev/null ||:
 
     # Forcefully cancel mutations to avoid waiting for them to finish
     ${CLICKHOUSE_CLIENT} -q "KILL MUTATION WHERE database=currentDatabase() AND table like '$table_name_prefix%'" > /dev/null
diff --git a/tests/queries/1_stateful/00081_group_by_without_key_and_totals.sql b/tests/queries/1_stateful/00081_group_by_without_key_and_totals.sql
index d9653f48552..03e9e0feb40 100644
--- a/tests/queries/1_stateful/00081_group_by_without_key_and_totals.sql
+++ b/tests/queries/1_stateful/00081_group_by_without_key_and_totals.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 SELECT count() AS c FROM test.hits WHERE CounterID = 1704509 WITH TOTALS SETTINGS totals_mode = 'before_having',          max_rows_to_group_by = 100000, group_by_overflow_mode = 'any';
 SELECT count() AS c FROM test.hits WHERE CounterID = 1704509 WITH TOTALS SETTINGS totals_mode = 'after_having_inclusive', max_rows_to_group_by = 100000, group_by_overflow_mode = 'any';
 SELECT count() AS c FROM test.hits WHERE CounterID = 1704509 WITH TOTALS SETTINGS totals_mode = 'after_having_exclusive', max_rows_to_group_by = 100000, group_by_overflow_mode = 'any';
diff --git a/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.reference b/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.reference
deleted file mode 100644
index 31d3e6d14da..00000000000
--- a/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-8873898
-8873899
-8873899
diff --git a/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql b/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
deleted file mode 100644
index c1a2001e2a5..00000000000
--- a/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
+++ /dev/null
@@ -1,41 +0,0 @@
--- Tags: no-tsan
-
-DROP TABLE IF EXISTS mixed_granularity_table;
-
-CREATE TABLE mixed_granularity_table (`WatchID` UInt64, `JavaEnable` UInt8, `Title` String, `GoodEvent` Int16, `EventTime` DateTime, `EventDate` Date, `CounterID` UInt32, `ClientIP` UInt32, `ClientIP6` FixedString(16), `RegionID` UInt32, `UserID` UInt64, `CounterClass` Int8, `OS` UInt8, `UserAgent` UInt8, `URL` String, `Referer` String, `URLDomain` String, `RefererDomain` String, `Refresh` UInt8, `IsRobot` UInt8, `RefererCategories` Array(UInt16), `URLCategories` Array(UInt16), `URLRegions` Array(UInt32), `RefererRegions` Array(UInt32), `ResolutionWidth` UInt16, `ResolutionHeight` UInt16, `ResolutionDepth` UInt8, `FlashMajor` UInt8, `FlashMinor` UInt8, `FlashMinor2` String, `NetMajor` UInt8, `NetMinor` UInt8, `UserAgentMajor` UInt16, `UserAgentMinor` FixedString(2), `CookieEnable` UInt8, `JavascriptEnable` UInt8, `IsMobile` UInt8, `MobilePhone` UInt8, `MobilePhoneModel` String, `Params` String, `IPNetworkID` UInt32, `TraficSourceID` Int8, `SearchEngineID` UInt16, `SearchPhrase` String, `AdvEngineID` UInt8, `IsArtifical` UInt8, `WindowClientWidth` UInt16, `WindowClientHeight` UInt16, `ClientTimeZone` Int16, `ClientEventTime` DateTime, `SilverlightVersion1` UInt8, `SilverlightVersion2` UInt8, `SilverlightVersion3` UInt32, `SilverlightVersion4` UInt16, `PageCharset` String, `CodeVersion` UInt32, `IsLink` UInt8, `IsDownload` UInt8, `IsNotBounce` UInt8, `FUniqID` UInt64, `HID` UInt32, `IsOldCounter` UInt8, `IsEvent` UInt8, `IsParameter` UInt8, `DontCountHits` UInt8, `WithHash` UInt8, `HitColor` FixedString(1), `UTCEventTime` DateTime, `Age` UInt8, `Sex` UInt8, `Income` UInt8, `Interests` UInt16, `Robotness` UInt8, `GeneralInterests` Array(UInt16), `RemoteIP` UInt32, `RemoteIP6` FixedString(16), `WindowName` Int32, `OpenerName` Int32, `HistoryLength` Int16, `BrowserLanguage` FixedString(2), `BrowserCountry` FixedString(2), `SocialNetwork` String, `SocialAction` String, `HTTPError` UInt16, `SendTiming` Int32, `DNSTiming` Int32, `ConnectTiming` Int32, `ResponseStartTiming` Int32, `ResponseEndTiming` Int32, `FetchTiming` Int32, `RedirectTiming` Int32, `DOMInteractiveTiming` Int32, `DOMContentLoadedTiming` Int32, `DOMCompleteTiming` Int32, `LoadEventStartTiming` Int32, `LoadEventEndTiming` Int32, `NSToDOMContentLoadedTiming` Int32, `FirstPaintTiming` Int32, `RedirectCount` Int8, `SocialSourceNetworkID` UInt8, `SocialSourcePage` String, `ParamPrice` Int64, `ParamOrderID` String, `ParamCurrency` FixedString(3), `ParamCurrencyID` UInt16, `GoalsReached` Array(UInt32), `OpenstatServiceName` String, `OpenstatCampaignID` String, `OpenstatAdID` String, `OpenstatSourceID` String, `UTMSource` String, `UTMMedium` String, `UTMCampaign` String, `UTMContent` String, `UTMTerm` String, `FromTag` String, `HasGCLID` UInt8, `RefererHash` UInt64, `URLHash` UInt64, `CLID` UInt32, `YCLID` UInt64, `ShareService` String, `ShareURL` String, `ShareTitle` String, `ParsedParams.Key1` Array(String), `ParsedParams.Key2` Array(String), `ParsedParams.Key3` Array(String), `ParsedParams.Key4` Array(String), `ParsedParams.Key5` Array(String), `ParsedParams.ValueDouble` Array(Float64), `IslandID` FixedString(16), `RequestNum` UInt32, `RequestTry` UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192, enable_mixed_granularity_parts=1; -- same with hits, but enabled mixed granularity
-
-INSERT INTO mixed_granularity_table SELECT * FROM test.hits LIMIT 10;
-
-ALTER TABLE mixed_granularity_table REPLACE PARTITION 201403 FROM test.hits;
-
-SELECT COUNT() FROM mixed_granularity_table;
-
-INSERT INTO mixed_granularity_table SELECT * FROM test.hits LIMIT 1;
-
-SELECT COUNT() FROM mixed_granularity_table;
-
-OPTIMIZE TABLE mixed_granularity_table FINAL;
-
-SELECT COUNT() FROM mixed_granularity_table;
-
-CREATE TABLE non_mixed_granularity_non_adaptive_table (`WatchID` UInt64, `JavaEnable` UInt8, `Title` String, `GoodEvent` Int16, `EventTime` DateTime, `EventDate` Date, `CounterID` UInt32, `ClientIP` UInt32, `ClientIP6` FixedString(16), `RegionID` UInt32, `UserID` UInt64, `CounterClass` Int8, `OS` UInt8, `UserAgent` UInt8, `URL` String, `Referer` String, `URLDomain` String, `RefererDomain` String, `Refresh` UInt8, `IsRobot` UInt8, `RefererCategories` Array(UInt16), `URLCategories` Array(UInt16), `URLRegions` Array(UInt32), `RefererRegions` Array(UInt32), `ResolutionWidth` UInt16, `ResolutionHeight` UInt16, `ResolutionDepth` UInt8, `FlashMajor` UInt8, `FlashMinor` UInt8, `FlashMinor2` String, `NetMajor` UInt8, `NetMinor` UInt8, `UserAgentMajor` UInt16, `UserAgentMinor` FixedString(2), `CookieEnable` UInt8, `JavascriptEnable` UInt8, `IsMobile` UInt8, `MobilePhone` UInt8, `MobilePhoneModel` String, `Params` String, `IPNetworkID` UInt32, `TraficSourceID` Int8, `SearchEngineID` UInt16, `SearchPhrase` String, `AdvEngineID` UInt8, `IsArtifical` UInt8, `WindowClientWidth` UInt16, `WindowClientHeight` UInt16, `ClientTimeZone` Int16, `ClientEventTime` DateTime, `SilverlightVersion1` UInt8, `SilverlightVersion2` UInt8, `SilverlightVersion3` UInt32, `SilverlightVersion4` UInt16, `PageCharset` String, `CodeVersion` UInt32, `IsLink` UInt8, `IsDownload` UInt8, `IsNotBounce` UInt8, `FUniqID` UInt64, `HID` UInt32, `IsOldCounter` UInt8, `IsEvent` UInt8, `IsParameter` UInt8, `DontCountHits` UInt8, `WithHash` UInt8, `HitColor` FixedString(1), `UTCEventTime` DateTime, `Age` UInt8, `Sex` UInt8, `Income` UInt8, `Interests` UInt16, `Robotness` UInt8, `GeneralInterests` Array(UInt16), `RemoteIP` UInt32, `RemoteIP6` FixedString(16), `WindowName` Int32, `OpenerName` Int32, `HistoryLength` Int16, `BrowserLanguage` FixedString(2), `BrowserCountry` FixedString(2), `SocialNetwork` String, `SocialAction` String, `HTTPError` UInt16, `SendTiming` Int32, `DNSTiming` Int32, `ConnectTiming` Int32, `ResponseStartTiming` Int32, `ResponseEndTiming` Int32, `FetchTiming` Int32, `RedirectTiming` Int32, `DOMInteractiveTiming` Int32, `DOMContentLoadedTiming` Int32, `DOMCompleteTiming` Int32, `LoadEventStartTiming` Int32, `LoadEventEndTiming` Int32, `NSToDOMContentLoadedTiming` Int32, `FirstPaintTiming` Int32, `RedirectCount` Int8, `SocialSourceNetworkID` UInt8, `SocialSourcePage` String, `ParamPrice` Int64, `ParamOrderID` String, `ParamCurrency` FixedString(3), `ParamCurrencyID` UInt16, `GoalsReached` Array(UInt32), `OpenstatServiceName` String, `OpenstatCampaignID` String, `OpenstatAdID` String, `OpenstatSourceID` String, `UTMSource` String, `UTMMedium` String, `UTMCampaign` String, `UTMContent` String, `UTMTerm` String, `FromTag` String, `HasGCLID` UInt8, `RefererHash` UInt64, `URLHash` UInt64, `CLID` UInt32, `YCLID` UInt64, `ShareService` String, `ShareURL` String, `ShareTitle` String, `ParsedParams.Key1` Array(String), `ParsedParams.Key2` Array(String), `ParsedParams.Key3` Array(String), `ParsedParams.Key4` Array(String), `ParsedParams.Key5` Array(String), `ParsedParams.ValueDouble` Array(Float64), `IslandID` FixedString(16), `RequestNum` UInt32, `RequestTry` UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192, index_granularity_bytes=0; -- same with hits, but enabled mixed granularity and fixed_granularity
-
-INSERT INTO non_mixed_granularity_non_adaptive_table SELECT * FROM test.hits LIMIT 10;
-
--- after optimize mixed_granularity_table will have .mrk2 parts
-ALTER TABLE non_mixed_granularity_non_adaptive_table REPLACE PARTITION 201403 FROM mixed_granularity_table; -- { serverError 36 }
-
-DROP TABLE IF EXISTS non_mixed_granularity_non_adaptive_table;
-
-
-DROP TABLE IF EXISTS mixed_granularity_strictly_non_adaptive_table;
-
-CREATE TABLE mixed_granularity_strictly_non_adaptive_table (`WatchID` UInt64, `JavaEnable` UInt8, `Title` String, `GoodEvent` Int16, `EventTime` DateTime, `EventDate` Date, `CounterID` UInt32, `ClientIP` UInt32, `ClientIP6` FixedString(16), `RegionID` UInt32, `UserID` UInt64, `CounterClass` Int8, `OS` UInt8, `UserAgent` UInt8, `URL` String, `Referer` String, `URLDomain` String, `RefererDomain` String, `Refresh` UInt8, `IsRobot` UInt8, `RefererCategories` Array(UInt16), `URLCategories` Array(UInt16), `URLRegions` Array(UInt32), `RefererRegions` Array(UInt32), `ResolutionWidth` UInt16, `ResolutionHeight` UInt16, `ResolutionDepth` UInt8, `FlashMajor` UInt8, `FlashMinor` UInt8, `FlashMinor2` String, `NetMajor` UInt8, `NetMinor` UInt8, `UserAgentMajor` UInt16, `UserAgentMinor` FixedString(2), `CookieEnable` UInt8, `JavascriptEnable` UInt8, `IsMobile` UInt8, `MobilePhone` UInt8, `MobilePhoneModel` String, `Params` String, `IPNetworkID` UInt32, `TraficSourceID` Int8, `SearchEngineID` UInt16, `SearchPhrase` String, `AdvEngineID` UInt8, `IsArtifical` UInt8, `WindowClientWidth` UInt16, `WindowClientHeight` UInt16, `ClientTimeZone` Int16, `ClientEventTime` DateTime, `SilverlightVersion1` UInt8, `SilverlightVersion2` UInt8, `SilverlightVersion3` UInt32, `SilverlightVersion4` UInt16, `PageCharset` String, `CodeVersion` UInt32, `IsLink` UInt8, `IsDownload` UInt8, `IsNotBounce` UInt8, `FUniqID` UInt64, `HID` UInt32, `IsOldCounter` UInt8, `IsEvent` UInt8, `IsParameter` UInt8, `DontCountHits` UInt8, `WithHash` UInt8, `HitColor` FixedString(1), `UTCEventTime` DateTime, `Age` UInt8, `Sex` UInt8, `Income` UInt8, `Interests` UInt16, `Robotness` UInt8, `GeneralInterests` Array(UInt16), `RemoteIP` UInt32, `RemoteIP6` FixedString(16), `WindowName` Int32, `OpenerName` Int32, `HistoryLength` Int16, `BrowserLanguage` FixedString(2), `BrowserCountry` FixedString(2), `SocialNetwork` String, `SocialAction` String, `HTTPError` UInt16, `SendTiming` Int32, `DNSTiming` Int32, `ConnectTiming` Int32, `ResponseStartTiming` Int32, `ResponseEndTiming` Int32, `FetchTiming` Int32, `RedirectTiming` Int32, `DOMInteractiveTiming` Int32, `DOMContentLoadedTiming` Int32, `DOMCompleteTiming` Int32, `LoadEventStartTiming` Int32, `LoadEventEndTiming` Int32, `NSToDOMContentLoadedTiming` Int32, `FirstPaintTiming` Int32, `RedirectCount` Int8, `SocialSourceNetworkID` UInt8, `SocialSourcePage` String, `ParamPrice` Int64, `ParamOrderID` String, `ParamCurrency` FixedString(3), `ParamCurrencyID` UInt16, `GoalsReached` Array(UInt32), `OpenstatServiceName` String, `OpenstatCampaignID` String, `OpenstatAdID` String, `OpenstatSourceID` String, `UTMSource` String, `UTMMedium` String, `UTMCampaign` String, `UTMContent` String, `UTMTerm` String, `FromTag` String, `HasGCLID` UInt8, `RefererHash` UInt64, `URLHash` UInt64, `CLID` UInt32, `YCLID` UInt64, `ShareService` String, `ShareURL` String, `ShareTitle` String, `ParsedParams.Key1` Array(String), `ParsedParams.Key2` Array(String), `ParsedParams.Key3` Array(String), `ParsedParams.Key4` Array(String), `ParsedParams.Key5` Array(String), `ParsedParams.ValueDouble` Array(Float64), `IslandID` FixedString(16), `RequestNum` UInt32, `RequestTry` UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192, enable_mixed_granularity_parts=1, index_granularity_bytes=0; -- same with hits, but enabled mixed granularity and fixed_granularity
-
-INSERT INTO mixed_granularity_strictly_non_adaptive_table SELECT * FROM test.hits LIMIT 10;
-
-ALTER TABLE mixed_granularity_strictly_non_adaptive_table REPLACE PARTITION 201403 FROM mixed_granularity_table; -- { serverError 36 }
-
-DROP TABLE IF EXISTS mixed_granularity_table;
-
-DROP TABLE IF EXISTS mixed_granularity_strictly_non_adaptive_table;
diff --git a/tests/queries/1_stateful/00172_early_constant_folding.reference b/tests/queries/1_stateful/00172_early_constant_folding.reference
index da564dc694e..6b72183c066 100644
--- a/tests/queries/1_stateful/00172_early_constant_folding.reference
+++ b/tests/queries/1_stateful/00172_early_constant_folding.reference
@@ -1,6 +1,9 @@
 (Expression)
-ExpressionTransform
-  (ReadFromStorage)
-  AggregatingTransform
-    ExpressionTransform
-      SourceFromSingleChunk 0 → 1
+ExpressionTransform × 10
+  (Aggregating)
+  Resize 1 → 10
+    AggregatingTransform
+      (Expression)
+      ExpressionTransform
+        (ReadFromPreparedSource)
+        SourceFromSingleChunk 0 → 1
diff --git a/tests/queries/1_stateful/00172_early_constant_folding.sql b/tests/queries/1_stateful/00172_early_constant_folding.sql
index b31e418b492..1ed7b8719b4 100644
--- a/tests/queries/1_stateful/00172_early_constant_folding.sql
+++ b/tests/queries/1_stateful/00172_early_constant_folding.sql
@@ -1,3 +1,4 @@
 -- Tags: no-parallel-replicas
 
+set max_threads=10;
 EXPLAIN PIPELINE SELECT count(JavaEnable) FROM test.hits WHERE WatchID = 1 OR Title = 'next' OR URL = 'prev' OR URL = '???' OR 1;
diff --git a/tests/queries/1_stateful/00173_group_by_use_nulls.reference b/tests/queries/1_stateful/00173_group_by_use_nulls.reference
index 02723bf14dd..e82b996ad3c 100644
--- a/tests/queries/1_stateful/00173_group_by_use_nulls.reference
+++ b/tests/queries/1_stateful/00173_group_by_use_nulls.reference
@@ -8,3 +8,25 @@
 59183	1336
 33010362	1336
 800784	1336
+-- { echoOn }
+set allow_experimental_analyzer = 1;
+SELECT
+    CounterID AS k,
+    quantileBFloat16(0.5)(ResolutionWidth)
+FROM remote('127.0.0.{1,2}', test, hits)
+GROUP BY k
+ORDER BY
+    count() DESC,
+    CounterID ASC
+LIMIT 10
+SETTINGS group_by_use_nulls = 1;
+1704509	1384
+732797	1336
+598875	1384
+792887	1336
+3807842	1336
+25703952	1336
+716829	1384
+59183	1336
+33010362	1336
+800784	1336
diff --git a/tests/queries/1_stateful/00173_group_by_use_nulls.sql b/tests/queries/1_stateful/00173_group_by_use_nulls.sql
index 7acacc4e579..8531e9efaf8 100644
--- a/tests/queries/1_stateful/00173_group_by_use_nulls.sql
+++ b/tests/queries/1_stateful/00173_group_by_use_nulls.sql
@@ -8,3 +8,28 @@ ORDER BY
     CounterID ASC
 LIMIT 10
 SETTINGS group_by_use_nulls = 1;
+
+SELECT
+    CounterID AS k,
+    quantileBFloat16(0.5)(ResolutionWidth)
+FROM test.hits
+GROUP BY k
+ORDER BY
+    count() DESC,
+    CounterID ASC
+LIMIT 10
+SETTINGS group_by_use_nulls = 1 FORMAT Null;
+
+-- { echoOn }
+set allow_experimental_analyzer = 1;
+
+SELECT
+    CounterID AS k,
+    quantileBFloat16(0.5)(ResolutionWidth)
+FROM remote('127.0.0.{1,2}', test, hits)
+GROUP BY k
+ORDER BY
+    count() DESC,
+    CounterID ASC
+LIMIT 10
+SETTINGS group_by_use_nulls = 1;
diff --git a/tests/queries/1_stateful/00174_distinct_in_order.reference b/tests/queries/1_stateful/00174_distinct_in_order.reference
index c0b2aadc20e..084efe0092c 100644
--- a/tests/queries/1_stateful/00174_distinct_in_order.reference
+++ b/tests/queries/1_stateful/00174_distinct_in_order.reference
@@ -1,3 +1,3 @@
 -- check that distinct with and w/o optimization produce the same result
--- DISTINCT colums are the same as in ORDER BY
--- DISTINCT colums has prefix in ORDER BY columns
+-- DISTINCT columns are the same as in ORDER BY
+-- DISTINCT columns has prefix in ORDER BY columns
diff --git a/tests/queries/1_stateful/00174_distinct_in_order.sql b/tests/queries/1_stateful/00174_distinct_in_order.sql
index 08ab219c806..aac54d46181 100644
--- a/tests/queries/1_stateful/00174_distinct_in_order.sql
+++ b/tests/queries/1_stateful/00174_distinct_in_order.sql
@@ -3,7 +3,7 @@ select '-- check that distinct with and w/o optimization produce the same result
 drop table if exists distinct_in_order sync;
 drop table if exists ordinary_distinct sync;
 
-select '-- DISTINCT colums are the same as in ORDER BY';
+select '-- DISTINCT columns are the same as in ORDER BY';
 create table distinct_in_order (CounterID UInt32, EventDate Date) engine=MergeTree() order by (CounterID, EventDate);
 insert into distinct_in_order select distinct CounterID, EventDate from test.hits order by CounterID, EventDate settings optimize_distinct_in_order=1;
 create table ordinary_distinct (CounterID UInt32, EventDate Date) engine=MergeTree() order by (CounterID, EventDate);
@@ -13,7 +13,7 @@ select distinct * from distinct_in_order except select * from ordinary_distinct;
 drop table if exists distinct_in_order sync;
 drop table if exists ordinary_distinct sync;
 
-select '-- DISTINCT colums has prefix in ORDER BY columns';
+select '-- DISTINCT columns has prefix in ORDER BY columns';
 create table distinct_in_order (CounterID UInt32, EventDate Date) engine=MergeTree() order by (CounterID, EventDate);
 insert into distinct_in_order select distinct CounterID, EventDate from test.hits order by CounterID settings optimize_distinct_in_order=1;
 create table ordinary_distinct (CounterID UInt32, EventDate Date) engine=MergeTree() order by (CounterID, EventDate);
diff --git a/tests/queries/1_stateful/00177_memory_bound_merging.reference b/tests/queries/1_stateful/00177_memory_bound_merging.reference
index a96cfe2af9e..5689152d60a 100644
--- a/tests/queries/1_stateful/00177_memory_bound_merging.reference
+++ b/tests/queries/1_stateful/00177_memory_bound_merging.reference
@@ -10,10 +10,6 @@ http://auto.ru/chatay-baranta_bound-in-thankYou=ru/tver/zhanny	2014-03-18	http:/
 http://auto.ru/chatay-baranta_bound-in-thankYou=ru/tver/zhanny	2014-03-19	http://auto.ru/chatay-baranta_bound-in-thankYou=ru/tver/zhanny
 http://auto.ru/chatay-baranta_bound-in-thankYou=ru/tver/zhanny	2014-03-20	http://auto.ru/chatay-baranta_bound-in-thankYou=ru/tver/zhanny
 1
+SortingAggregatedTransform
 MergingAggregatedBucketTransform
-FinishAggregatingInOrderTransform
-SortingAggregatedForMemoryBoundMergingTransform
-MergingAggregatedBucketTransform
-FinishAggregatingInOrderTransform
-AggregatingInOrderTransform
-MergeTreeInOrder
+GroupingAggregatedTransform
diff --git a/tests/queries/1_stateful/00177_memory_bound_merging.sh b/tests/queries/1_stateful/00177_memory_bound_merging.sh
index b01c62a7c92..008422be108 100755
--- a/tests/queries/1_stateful/00177_memory_bound_merging.sh
+++ b/tests/queries/1_stateful/00177_memory_bound_merging.sh
@@ -34,7 +34,7 @@ test1() {
         GROUP BY CounterID, URL, EventDate
         ORDER BY URL, EventDate
         LIMIT 5 OFFSET 10
-        SETTINGS optimize_aggregation_in_order = 1, enable_memory_bound_merging_of_aggregation_results = 1, allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 3, use_hedged_requests = 0"
+        SETTINGS optimize_aggregation_in_order = 1, enable_memory_bound_merging_of_aggregation_results = 1, allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, max_parallel_replicas = 3, use_hedged_requests = 0"
     check_replicas_read_in_order $query_id
 }
 
@@ -51,7 +51,7 @@ test2() {
         GROUP BY URL, EventDate
         ORDER BY URL, EventDate
         LIMIT 5 OFFSET 10
-        SETTINGS optimize_aggregation_in_order = 1, enable_memory_bound_merging_of_aggregation_results = 1, allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 3, use_hedged_requests = 0, query_plan_aggregation_in_order = 1"
+        SETTINGS optimize_aggregation_in_order = 1, enable_memory_bound_merging_of_aggregation_results = 1, allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, max_parallel_replicas = 3, use_hedged_requests = 0, query_plan_aggregation_in_order = 1"
     check_replicas_read_in_order $query_id
 }
 
@@ -67,7 +67,7 @@ test3() {
             FROM test.hits
             WHERE CounterID = 1704509 AND UserID = 4322253409885123546
             GROUP BY URL, EventDate
-            SETTINGS optimize_aggregation_in_order = 1, enable_memory_bound_merging_of_aggregation_results = 1, allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 3, use_hedged_requests = 0
+            SETTINGS optimize_aggregation_in_order = 1, enable_memory_bound_merging_of_aggregation_results = 1, allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, max_parallel_replicas = 3, use_hedged_requests = 0
         )
         WHERE explain LIKE '%Aggr%Transform%' OR explain LIKE '%InOrder%'"
 }
diff --git a/tests/queries/shell_config.sh b/tests/queries/shell_config.sh
index 3006b74d3f9..ef70c82aefc 100644
--- a/tests/queries/shell_config.sh
+++ b/tests/queries/shell_config.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2120
 
 # Don't check for ODR violation, since we may test shared build with ASAN
 export ASAN_OPTIONS=detect_odr_violation=0
@@ -136,12 +137,13 @@ function clickhouse_client_removed_host_parameter()
 
 function wait_for_queries_to_finish()
 {
+    local max_tries="${1:-20}"
     # Wait for all queries to finish (query may still be running if thread is killed by timeout)
     num_tries=0
     while [[ $($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE current_database=currentDatabase() AND query NOT LIKE '%system.processes%'") -ne 0 ]]; do
         sleep 0.5;
         num_tries=$((num_tries+1))
-        if [ $num_tries -eq 20 ]; then
+        if [ $num_tries -eq $max_tries ]; then
             $CLICKHOUSE_CLIENT -q "SELECT * FROM system.processes WHERE current_database=currentDatabase() AND query NOT LIKE '%system.processes%' FORMAT Vertical"
             break
         fi
diff --git a/tests/sqllogic/connection.py b/tests/sqllogic/connection.py
new file mode 100644
index 00000000000..a9976a7beca
--- /dev/null
+++ b/tests/sqllogic/connection.py
@@ -0,0 +1,285 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import datetime
+import logging
+import pyodbc
+import sqlite3
+import traceback
+import enum
+import random
+import string
+from contextlib import contextmanager
+
+from exceptions import ProgramError
+
+
+logger = logging.getLogger("connection")
+logger.setLevel(logging.DEBUG)
+
+
+class OdbcConnectingArgs:
+    def __init__(self, **kwargs):
+        self._kwargs = kwargs
+
+    def __str__(self):
+        conn_str = ";".join(
+            ["{}={}".format(x, y) for x, y in self._kwargs.items() if y]
+        )
+        return conn_str
+
+    def update_database(self, database):
+        self._kwargs["Database"] = database
+
+    @staticmethod
+    def create_from_kw(
+        dsn="", server="localhost", user="default", database="default", **kwargs
+    ):
+        conn_args = {
+            "DSN": dsn,
+            "Server": server,
+            "User": user,
+            "Database": database,
+        }
+        conn_args.update(kwargs)
+        return OdbcConnectingArgs(**conn_args)
+
+    @staticmethod
+    def create_from_connection_string(conn_str):
+        args = OdbcConnectingArgs()
+        for kv in conn_str.split(";"):
+            if kv:
+                k, v = kv.split("=", 1)
+                args._kwargs[k] = v
+        return args
+
+
+def _random_str(length=8):
+    alphabet = string.ascii_lowercase + string.digits
+    return "".join(random.SystemRandom().choice(alphabet) for _ in range(length))
+
+
+def default_clickhouse_odbc_conn_str():
+    return str(
+        OdbcConnectingArgs.create_from_kw(
+            dsn="ClickHouse DSN (ANSI)",
+        )
+    )
+
+
+class Engines(enum.Enum):
+    SQLITE = enum.auto()
+    ODBC = enum.auto()
+
+    @staticmethod
+    def list():
+        return list(map(lambda c: c.name.lower(), Engines))
+
+
+class KnownDBMS(str, enum.Enum):
+    sqlite = "sqlite"
+    clickhouse = "ClickHouse"
+
+
+class ConnectionWrap(object):
+    def __init__(self, connection=None, factory=None, factory_kwargs=None):
+        self._factory = factory
+        self._factory_kwargs = factory_kwargs
+        self._connection = connection
+
+        self.DBMS_NAME = None
+        self.DATABASE_NAME = None
+        self.USER_NAME = None
+
+    @staticmethod
+    def create(connection):
+        return ConnectionWrap(connection=connection)
+
+    @staticmethod
+    def create_form_factory(factory, factory_kwargs):
+        return ConnectionWrap(
+            factory=factory, factory_kwargs=factory_kwargs
+        ).reconnect()
+
+    def can_reconnect(self):
+        return self._factory is not None
+
+    def reconnect(self):
+        if self._connection is not None:
+            self._connection.close()
+        self._connection = self._factory(self._factory_kwargs)
+        return self
+
+    def assert_can_reconnect(self):
+        assert self.can_reconnect(), f"no reconnect for: {self.DBMS_NAME}"
+
+    def __getattr__(self, item):
+        return getattr(self._connection, item)
+
+    def __enter__(self):
+        return self
+
+    def drop_all_tables(self):
+        if self.DBMS_NAME == KnownDBMS.clickhouse.value:
+            list_query = (
+                f"SELECT name FROM system.tables WHERE database='{self.DATABASE_NAME}'"
+            )
+        elif self.DBMS_NAME == KnownDBMS.sqlite.value:
+            list_query = f"SELECT name FROM sqlite_master WHERE type='table'"
+        else:
+            logger.warning(
+                "unable to drop all tables for unknown database: %s", self.DBMS_NAME
+            )
+            return
+
+        list_result = execute_request(list_query, self)
+        logger.info("tables will be dropped: %s", list_result.get_result())
+        for table_name in list_result.get_result():
+            table_name = table_name[0]
+            execute_request(f"DROP TABLE {table_name}", self).assert_no_exception()
+            logger.debug("success drop table: %s", table_name)
+
+    def _use_database(self, database="default"):
+        if self.DBMS_NAME == KnownDBMS.clickhouse.value:
+            logger.info("use test database: %s", database)
+            self._factory_kwargs.update_database(database)
+            self.reconnect()
+            self.DATABASE_NAME = database
+
+    def use_random_database(self):
+        if self.DBMS_NAME == KnownDBMS.clickhouse.value:
+            database = f"test_{_random_str()}"
+            execute_request(f"CREATE DATABASE {database}", self).assert_no_exception()
+            self._use_database(database)
+            logger.info(
+                "currentDatabase : %s",
+                execute_request(f"SELECT currentDatabase()", self).get_result(),
+            )
+
+    @contextmanager
+    def with_one_test_scope(self):
+        try:
+            yield self
+        finally:
+            self.drop_all_tables()
+
+    @contextmanager
+    def with_test_database_scope(self):
+        self.use_random_database()
+        try:
+            yield self
+        finally:
+            self._use_database()
+
+    def __exit__(self, *args):
+        if hasattr(self._connection, "close"):
+            return self._connection.close()
+
+
+def setup_connection(engine, conn_str=None, make_debug_request=True):
+    connection = None
+
+    if isinstance(engine, str):
+        engine = Engines[engine.upper()]
+
+    if engine == Engines.ODBC:
+        if conn_str is None:
+            raise ProgramError("conn_str has to be set up for ODBC connection")
+
+        logger.debug("Drivers: %s", pyodbc.drivers())
+        logger.debug("DataSources: %s", pyodbc.dataSources())
+        logger.debug("Connection string: %s", conn_str)
+
+        conn_args = OdbcConnectingArgs.create_from_connection_string(conn_str)
+
+        connection = ConnectionWrap.create_form_factory(
+            factory=lambda args: pyodbc.connect(str(args)),
+            factory_kwargs=conn_args,
+        )
+        connection.add_output_converter(pyodbc.SQL_UNKNOWN_TYPE, lambda x: None)
+
+        connection.DBMS_NAME = connection.getinfo(pyodbc.SQL_DBMS_NAME)
+        connection.DATABASE_NAME = connection.getinfo(pyodbc.SQL_DATABASE_NAME)
+        connection.USER_NAME = connection.getinfo(pyodbc.SQL_USER_NAME)
+
+    elif engine == Engines.SQLITE:
+        conn_str = conn_str if conn_str is not None else ":memory:"
+        connection = ConnectionWrap.create(sqlite3.connect(conn_str))
+
+        connection.DBMS_NAME = "sqlite"
+        connection.DATABASE_NAME = "main"
+        connection.USER_NAME = "default"
+
+    logger.info(
+        "Connection info: DBMS name %s, database %s, user %s",
+        connection.DBMS_NAME,
+        connection.DATABASE_NAME,
+        connection.USER_NAME,
+    )
+
+    if make_debug_request:
+        request = "SELECT 1"
+        logger.debug("Make debug request to the connection: %s", request)
+        result = execute_request(request, connection)
+        logger.debug("Debug request returned: %s", result.get_result())
+
+    logger.debug("Connection is ok")
+    return connection
+
+
+class ExecResult:
+    def __init__(self):
+        self._exception = None
+        self._result = None
+        self._description = None
+
+    def as_exception(self, exc):
+        self._exception = exc
+        return self
+
+    def get_result(self):
+        self.assert_no_exception()
+        return self._result
+
+    def get_description(self):
+        self.assert_no_exception()
+        return self._description
+
+    def as_ok(self, rows=None, description=None):
+        if rows is None:
+            self._result = True
+            return self
+        self._result = rows
+        self._description = description
+        return self
+
+    def get_exception(self):
+        return self._exception
+
+    def has_exception(self):
+        return self._exception is not None
+
+    def assert_no_exception(self):
+        if self.has_exception():
+            raise ProgramError(
+                f"request doesn't have a result set, it has the exception",
+                parent=self._exception,
+            )
+
+
+def execute_request(request, connection):
+    cursor = connection.cursor()
+    try:
+        cursor.execute(request)
+        if cursor.description:
+            logging.debug("request has a description %s", cursor.description)
+            rows = cursor.fetchall()
+            connection.commit()
+            return ExecResult().as_ok(rows=rows, description=cursor.description)
+        else:
+            logging.debug("request doesn't have a description")
+            connection.commit()
+            return ExecResult().as_ok()
+    except (pyodbc.Error, sqlite3.DatabaseError) as err:
+        return ExecResult().as_exception(err)
+    finally:
+        cursor.close()
diff --git a/tests/sqllogic/exceptions.py b/tests/sqllogic/exceptions.py
new file mode 100644
index 00000000000..30c8983d80f
--- /dev/null
+++ b/tests/sqllogic/exceptions.py
@@ -0,0 +1,133 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+from enum import Enum
+
+
+class Error(Exception):
+    def __init__(
+        self,
+        message,
+        file=None,
+        name=None,
+        pos=None,
+        request=None,
+        details=None,
+        *args,
+        **kwargs,
+    ):
+        super().__init__(message, *args, **kwargs)
+        self._file = file
+        self._name = name
+        self._pos = pos
+        self._request = request
+        self._details = details
+
+    @property
+    def test_file(self):
+        return self._file
+
+    @property
+    def test_name(self):
+        return self._name
+
+    @property
+    def test_pos(self):
+        return self._pos
+
+    @property
+    def request(self):
+        return self._request
+
+    @property
+    def message(self):
+        return super().__str__()
+
+    @property
+    def reason(self):
+        return ", ".join(
+            (
+                str(x)
+                for x in [
+                    super().__str__(),
+                    "details: {}".format(self._details) if self._details else "",
+                ]
+                if x
+            )
+        )
+
+    def set_details(self, file=None, name=None, pos=None, request=None, details=None):
+        if file is not None:
+            self._file = file
+        if name is not None:
+            self._name = name
+        if pos is not None:
+            self._pos = pos
+        if pos is not None:
+            self._request = request
+        if request is not None:
+            self._request = request
+        if details is not None:
+            self._details = details
+
+    def _at_file_and_pos(self):
+        if self._file is not None and self._pos is not None:
+            return f"at: [{self._file}:{self._pos}]"
+        if self._name is not None and self._pos is not None:
+            return f"at: [{self._name}:{self._pos}]"
+        return None
+
+
+class ErrorWithParent(Error):
+    def __init__(self, message, parent=None, *args, **kwargs):
+        super().__init__(message, *args, **kwargs)
+        self._parent = parent
+
+    def get_parent(self):
+        return self._parent
+
+    @property
+    def reason(self):
+        return ", ".join(
+            (
+                str(x)
+                for x in [
+                    super().reason,
+                    "exception: {}".format(str(self._parent)) if self._parent else "",
+                ]
+                if x
+            )
+        )
+
+
+class ProgramError(ErrorWithParent):
+    def __str__(self):
+        return self.reason
+
+
+class DataResultDiffer(Error):
+    pass
+
+
+class SchemeResultDiffer(Error):
+    pass
+
+
+class StatementExecutionError(ErrorWithParent):
+    pass
+
+
+class QueryExecutionError(ErrorWithParent):
+    pass
+
+
+class StatementSuccess(Error):
+    def __init__(self, *args, **kwargs):
+        message = kwargs["success"] if "message" in kwargs else "success"
+        super().__init__(message, *args, **kwargs)
+
+
+class QuerySuccess(Error):
+    def __init__(self, *args, **kwargs):
+        message = kwargs["success"] if "message" in kwargs else "success"
+        super().__init__(message, *args, **kwargs)
diff --git a/tests/sqllogic/runner.py b/tests/sqllogic/runner.py
new file mode 100755
index 00000000000..1cf4c19c649
--- /dev/null
+++ b/tests/sqllogic/runner.py
@@ -0,0 +1,428 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import argparse
+import enum
+import os
+import logging
+import csv
+import json
+import multiprocessing
+from functools import reduce
+from deepdiff import DeepDiff
+
+from connection import setup_connection, Engines, default_clickhouse_odbc_conn_str
+from test_runner import TestRunner, Status, RequestType
+
+
+LEVEL_NAMES = [x.lower() for x in logging._nameToLevel.keys() if x != logging.NOTSET]
+
+
+def setup_logger(args):
+    logging.getLogger().setLevel(logging.NOTSET)
+    formatter = logging.Formatter(
+        fmt="%(asctime)s %(levelname)s %(name)s %(filename)s %(funcName)s:%(lineno)d - %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S",
+    )
+
+    if args.log_file:
+        file_handler = logging.FileHandler(args.log_file)
+        file_handler.setLevel(args.log_level.upper())
+        file_handler.setFormatter(formatter)
+        logging.getLogger().addHandler(file_handler)
+    else:
+        stream_handler = logging.StreamHandler()
+        stream_handler.setLevel(logging.INFO)
+        stream_handler.setFormatter(formatter)
+        logging.getLogger().addHandler(stream_handler)
+
+
+def __write_check_status(status_row, out_dir):
+    if len(status_row) > 140:
+        status_row = status_row[0:135] + "..."
+    check_status_path = os.path.join(out_dir, "check_status.tsv")
+    with open(check_status_path, "a") as stream:
+        writer = csv.writer(stream, delimiter="\t", lineterminator="\n")
+        writer.writerow(status_row)
+
+
+class TestNameGranularity(str, enum.Enum):
+    file = enum.auto()
+    request = enum.auto()
+
+
+def __write_test_result(
+    reports,
+    out_dir,
+    mode_name,
+    granularity=TestNameGranularity.request,
+    only_errors=None,
+):
+    all_stages = reports.keys()
+    test_results_path = os.path.join(out_dir, "test_results.tsv")
+    with open(test_results_path, "a") as stream:
+        writer = csv.writer(stream, delimiter="\t", lineterminator="\n")
+        for stage in all_stages:
+            report = reports[stage]
+            for test_report in report.tests.values():
+                test_name_prefix = (
+                    f"sqllogic::{mode_name}::{stage}::{test_report.test_name}"
+                )
+
+                for request_status in test_report.requests.values():
+                    if request_status.status == Status.error or not only_errors:
+                        test_name = test_name_prefix
+                        if granularity == TestNameGranularity.request:
+                            test_name += f"::{request_status.position}"
+
+                        test_status = "success"
+                        if request_status.status == Status.error:
+                            test_status = "FAIL"
+
+                        log_row = (
+                            f"position: {request_status.position}"
+                            f", type: {request_status.request_type.name.lower()}"
+                            f", request: '{request_status.request}'"
+                        )
+                        if request_status.status == Status.error:
+                            log_row += f", reason: '{request_status.reason}'"
+
+                        writer.writerow(
+                            [
+                                test_name,
+                                test_status,
+                                0,
+                                log_row,
+                            ]
+                        )
+
+
+def statements_report(reports, out_dir, mode_name):
+    __write_test_result(
+        reports,
+        out_dir,
+        mode_name,
+        granularity=TestNameGranularity.file,
+        only_errors=True,
+    )
+
+    failed_stages = []
+    for stage, report in reports.items():
+        if report.stats.total.fail > 0:
+            failed_stages.append(stage)
+
+    if len(failed_stages) == 0:
+        status_row = [
+            "success",
+            f"All tests from {mode_name} are successful",
+        ]
+        __write_check_status(status_row, out_dir)
+        return
+
+    stage = max(failed_stages, key=lambda x: reports[x].stats.total.fail)
+    stats = reports[stage].stats
+    status_row = [
+        "error",
+        f"{stats.total.fail}/{stats.total.all} tests failed at {mode_name}::{stage}",
+    ]
+    __write_check_status(status_row, out_dir)
+
+
+def _child_process(setup_kwargs, runner_kwargs, input_dir, output_dir, test):
+    with setup_connection(**setup_kwargs) as connection:
+        with connection.with_test_database_scope():
+            runner = TestRunner(connection, **runner_kwargs)
+            runner.run_all_tests_from_file(test, input_dir)
+            runner.write_results_to_dir(output_dir)
+            return runner.report
+
+
+def run_all_tests_in_parallel(setup_kwargs, runner_kwargs, input_dir, output_dir):
+    process_count = max(1, os.cpu_count() - 2)
+    with multiprocessing.Pool(process_count) as pool:
+        async_results = [
+            pool.apply_async(
+                _child_process,
+                args=(
+                    setup_kwargs,
+                    runner_kwargs,
+                    input_dir,
+                    output_dir,
+                    test,
+                ),
+            )
+            for test in TestRunner.list_tests(input_dir)
+        ]
+        reports = [ar.get() for ar in async_results]
+
+    report = reduce(lambda x, y: x.combine_with(y), reports)
+    report.write_report(output_dir)
+    return report
+
+
+def as_kwargs(**kwargs):
+    return kwargs
+
+
+def mode_check_statements(parser):
+    parser.add_argument("--input-dir", metavar="DIR", required=True)
+    parser.add_argument("--out-dir", metavar="DIR", required=True)
+
+    def calle(args):
+        input_dir = os.path.realpath(args.input_dir)
+        out_dir = os.path.realpath(args.out_dir)
+
+        if not os.path.exists(input_dir):
+            raise FileNotFoundError(
+                input_dir, f"check statements: no such file or directory {input_dir}"
+            )
+
+        if not os.path.isdir(input_dir):
+            raise NotADirectoryError(
+                input_dir, f"check statements:: not a dir {input_dir}"
+            )
+
+        reports = dict()
+
+        out_stages_dir = os.path.join(out_dir, f"{args.mode}-stages")
+
+        complete_sqlite_dir = os.path.join(out_stages_dir, "complete-sqlite")
+        os.makedirs(complete_sqlite_dir, exist_ok=True)
+
+        reports["complete-sqlite"] = run_all_tests_in_parallel(
+            setup_kwargs=as_kwargs(
+                engine=Engines.SQLITE,
+            ),
+            runner_kwargs=as_kwargs(
+                verify_mode=False,
+                skip_request_types=[RequestType.query],
+                stop_at_statement_error=True,
+            ),
+            input_dir=input_dir,
+            output_dir=complete_sqlite_dir,
+        )
+
+        verify_clickhouse_dir = os.path.join(out_stages_dir, "verify-clickhouse")
+        os.makedirs(verify_clickhouse_dir, exist_ok=True)
+
+        reports["verify-clickhouse"] = run_all_tests_in_parallel(
+            setup_kwargs=as_kwargs(
+                engine=Engines.ODBC,
+                conn_str=default_clickhouse_odbc_conn_str(),
+            ),
+            runner_kwargs=as_kwargs(
+                verify_mode=True,
+                skip_request_types=[RequestType.query],
+                stop_at_statement_error=True,
+            ),
+            input_dir=complete_sqlite_dir,
+            output_dir=verify_clickhouse_dir,
+        )
+
+        statements_report(reports, out_dir, args.mode)
+
+    parser.set_defaults(func=calle)
+
+
+def make_actual_report(reports):
+    return {stage: report.get_map() for stage, report in reports.items()}
+
+
+def write_actual_report(actial, out_dir):
+    with open(os.path.join(out_dir, "actual_report.json"), "w") as f:
+        f.write(json.dumps(actial))
+
+
+def read_canonic_report(input_dir):
+    file = os.path.join(input_dir, "canonic_report.json")
+    if not os.path.exists(file):
+        return {}
+
+    with open(os.path.join(input_dir, "canonic_report.json"), "r") as f:
+        data = f.read()
+    return json.loads(data)
+
+
+def write_canonic_report(canonic, out_dir):
+    with open(os.path.join(out_dir, "canonic_report.json"), "w") as f:
+        f.write(json.dumps(canonic))
+
+
+def self_test_report(reports, input_dir, out_dir, mode_name):
+    actual = make_actual_report(reports)
+    write_actual_report(actual, out_dir)
+
+    canonic = read_canonic_report(input_dir)
+    write_canonic_report(canonic, out_dir)
+
+    status_row = [
+        "success",
+        f"All statements from {mode_name} are successful",
+    ]
+
+    failed_stages = {}
+
+    for stage, actual_report in actual.items():
+        actual_stats = actual_report["stats"]
+
+        if stage not in canonic:
+            failed_stages[stage] = actual_stats.items()
+            continue
+
+        canonic_report = canonic[stage]
+        canonic_stats = canonic_report["stats"]
+
+        logging.debug("stage: %s, canonic: %s", stage, canonic_stats)
+        logging.debug("stage: %s, actual: %s", stage, actual_stats)
+
+        diff = DeepDiff(actual_stats, canonic_stats)
+        if len(diff):
+            failed_stages[stage] = diff
+            logging.error("diff: %s", diff)
+        else:
+            logging.debug("diff: %s", diff)
+
+    all_stages = actual.keys()
+    if len(failed_stages) > 0:
+        description = f"Failed {len(failed_stages)}/{len(all_stages)} from {mode_name}, stages: {','.join(failed_stages)}"
+        status_row = ["error", description]
+
+    __write_check_status(status_row, out_dir)
+
+
+def mode_self_test(parser):
+    parser.add_argument("--self-test-dir", metavar="DIR", required=True)
+    parser.add_argument("--out-dir", metavar="DIR", required=True)
+
+    def calle(args):
+        self_test_dir = os.path.realpath(args.self_test_dir)
+        if not os.path.exists(self_test_dir):
+            raise FileNotFoundError(
+                self_test_dir, f"self test: no such file or directory {self_test_dir}"
+            )
+        if not os.path.isdir(self_test_dir):
+            raise NotADirectoryError(
+                self_test_dir, f"self test: not a dir {self_test_dir}"
+            )
+        logging.debug("self test dir is: %s", self_test_dir)
+
+        out_dir = os.path.realpath(args.out_dir)
+        if not os.path.exists(out_dir):
+            raise FileNotFoundError(out_dir, f"self test: dir not found {out_dir}")
+        if not os.path.isdir(out_dir):
+            raise NotADirectoryError(out_dir, f"self test: not a dir {out_dir}")
+
+        reports = dict()
+
+        out_stages_dir = os.path.join(out_dir, f"{args.mode}-stages")
+
+        out_dir_sqlite_complete = os.path.join(out_stages_dir, "sqlite-complete")
+        os.makedirs(out_dir_sqlite_complete, exist_ok=True)
+        with setup_connection(Engines.SQLITE) as sqlite:
+            runner = TestRunner(sqlite)
+            runner.run_all_tests_from_dir(self_test_dir)
+            runner.write_results_to_dir(out_dir_sqlite_complete)
+            runner.write_report(out_dir_sqlite_complete)
+            reports["sqlite-complete"] = runner.report
+
+        out_dir_sqlite_vs_sqlite = os.path.join(out_stages_dir, "sqlite-vs-sqlite")
+        os.makedirs(out_dir_sqlite_vs_sqlite, exist_ok=True)
+        with setup_connection(Engines.SQLITE) as sqlite:
+            runner = TestRunner(sqlite)
+            runner.with_verify_mode()
+            runner.run_all_tests_from_dir(out_dir_sqlite_complete)
+            runner.write_results_to_dir(out_dir_sqlite_vs_sqlite)
+            runner.write_report(out_dir_sqlite_vs_sqlite)
+            reports["sqlite-vs-sqlite"] = runner.report
+
+        out_dir_clickhouse_complete = os.path.join(
+            out_stages_dir, "clickhouse-complete"
+        )
+        os.makedirs(out_dir_clickhouse_complete, exist_ok=True)
+        with setup_connection(
+            Engines.ODBC, default_clickhouse_odbc_conn_str()
+        ) as clickhouse:
+            runner = TestRunner(clickhouse)
+            runner.run_all_tests_from_dir(self_test_dir)
+            runner.write_results_to_dir(out_dir_clickhouse_complete)
+            runner.write_report(out_dir_clickhouse_complete)
+            reports["clickhouse-complete"] = runner.report
+
+        out_dir_clickhouse_vs_clickhouse = os.path.join(
+            out_stages_dir, "clickhouse-vs-clickhouse"
+        )
+        os.makedirs(out_dir_clickhouse_vs_clickhouse, exist_ok=True)
+        with setup_connection(
+            Engines.ODBC, default_clickhouse_odbc_conn_str()
+        ) as clickhouse:
+            runner = TestRunner(clickhouse)
+            runner.with_verify_mode()
+            runner.run_all_tests_from_dir(out_dir_clickhouse_complete)
+            runner.write_results_to_dir(out_dir_clickhouse_vs_clickhouse)
+            runner.write_report(os.path.join(out_dir_clickhouse_vs_clickhouse))
+            reports["clickhouse-vs-clickhouse"] = runner.report
+
+        out_dir_sqlite_vs_clickhouse = os.path.join(
+            out_stages_dir, "sqlite-vs-clickhouse"
+        )
+        os.makedirs(out_dir_sqlite_vs_clickhouse, exist_ok=True)
+
+        reports["sqlite-vs-clickhouse"] = run_all_tests_in_parallel(
+            setup_kwargs=as_kwargs(
+                engine=Engines.ODBC,
+                conn_str=default_clickhouse_odbc_conn_str(),
+            ),
+            runner_kwargs=as_kwargs(
+                verify_mode=True,
+            ),
+            input_dir=out_dir_sqlite_complete,
+            output_dir=out_dir_sqlite_vs_clickhouse,
+        )
+
+        self_test_report(reports, self_test_dir, out_dir, args.mode)
+
+    parser.set_defaults(func=calle)
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        description="This script runs sqllogic tests over database."
+    )
+
+    parser.add_argument("--log-file", help="write logs to the file", metavar="FILE")
+    parser.add_argument(
+        "--log-level",
+        help="define the log level for log file",
+        metavar="level",
+        choices=LEVEL_NAMES,
+        default="debug",
+    )
+
+    subparsers = parser.add_subparsers(dest="mode")
+    mode_check_statements(
+        subparsers.add_parser(
+            "statements-test",
+            help="Run all test. Check that all statements are passed",
+        )
+    )
+    mode_self_test(
+        subparsers.add_parser(
+            "self-test",
+            help="Run all test. Check that all statements are passed",
+        )
+    )
+    args = parser.parse_args()
+    if args.mode is None:
+        parser.print_help()
+    return args
+
+
+def main():
+    args = parse_args()
+    setup_logger(args)
+    if args.mode is not None:
+        args.func(args)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/sqllogic/self-test/canonic_report.json b/tests/sqllogic/self-test/canonic_report.json
new file mode 100644
index 00000000000..0cd1aa4b43b
--- /dev/null
+++ b/tests/sqllogic/self-test/canonic_report.json
@@ -0,0 +1 @@
+{"sqlite-complete": {"dbms_name": "sqlite", "stats": {"statements": {"success": 4, "fail": 0}, "queries": {"success": 14, "fail": 4}, "total": {"success": 18, "fail": 4}}, "input_dir": "/clickhouse-tests/sqllogic/self-test", "output_dir": "/test_output/self-test/self-test-stages/sqlite-complete", "tests": {"test.test": {"test_name": "test.test", "test_file": "/clickhouse-tests/sqllogic/self-test/test.test", "stats": {"statements": {"success": 4, "fail": 0}, "queries": {"success": 14, "fail": 4}, "total": {"success": 18, "fail": 4}}, "requests": {"5": {"status": "success", "position": 5, "request_type": "statement", "request": "CREATE TABLE t1(a INTEGER, b INTEGER)", "reason": "success"}, "9": {"status": "success", "position": 9, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(1,2)", "reason": "success"}, "12": {"status": "success", "position": 12, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(3,4)", "reason": "success"}, "15": {"status": "success", "position": 15, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(5,6)", "reason": "success"}, "18": {"status": "success", "position": 18, "request_type": "query", "request": "SELECT a, b FROM t1 ORDER BY 2,1", "reason": "success"}, "25": {"status": "error", "position": 25, "request_type": "query", "request": "SELECT a, c FROM t1 ORDER BY 2,1", "reason": "query execution failed with an exception, exception: no such column: c"}, "38": {"status": "success", "position": 38, "request_type": "query", "request": "SELECT a, c FROM t1", "reason": "success"}, "44": {"status": "error", "position": 44, "request_type": "query", "request": "SELECT a, c FROM t1", "reason": "query is expected to fail with different error, details: expected error: expect to fail in a different way, exception: no such column: c"}, "49": {"status": "success", "position": 49, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "55": {"status": "success", "position": 55, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "60": {"status": "success", "position": 60, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "64": {"status": "success", "position": 64, "request_type": "query", "request": "SELECT -1.0", "reason": "success"}, "70": {"status": "success", "position": 70, "request_type": "query", "request": "SELECT -1", "reason": "success"}, "76": {"status": "success", "position": 76, "request_type": "query", "request": "SELECT 1.0, 1", "reason": "success"}, "82": {"status": "error", "position": 82, "request_type": "query", "request": "SELECT 1.0, 1", "reason": "canonic and actual columns count differ, details: expected columns 1, actual columns 2"}, "88": {"status": "error", "position": 88, "request_type": "query", "request": "SELECT 1.0", "reason": "canonic and actual columns count differ, details: expected columns 2, actual columns 1"}, "94": {"status": "success", "position": 94, "request_type": "query", "request": "select a, b from t1 where a = b", "reason": "success"}, "99": {"status": "success", "position": 99, "request_type": "query", "request": "SELECT 1.0013", "reason": "success"}, "105": {"status": "success", "position": 105, "request_type": "query", "request": "SELECT NULL as a", "reason": "success"}, "116": {"status": "success", "position": 116, "request_type": "query", "request": "SELECT NULL", "reason": "success"}, "121": {"status": "success", "position": 121, "request_type": "query", "request": "SELECT 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15", "reason": "success"}, "126": {"status": "success", "position": 126, "request_type": "query", "request": "WITH RECURSIVE cnt(x) AS ( SELECT 1 UNION ALL SELECT x+1 FROM cnt LIMIT 20 ) SELECT x FROM cnt;", "reason": "success"}}}}}, "sqlite-vs-sqlite": {"dbms_name": "sqlite", "stats": {"statements": {"success": 4, "fail": 0}, "queries": {"success": 15, "fail": 3}, "total": {"success": 19, "fail": 3}}, "input_dir": "/test_output/self-test/self-test-stages/sqlite-complete", "output_dir": "/test_output/self-test/self-test-stages/sqlite-vs-sqlite", "tests": {"test.test": {"test_name": "test.test", "test_file": "/test_output/self-test/self-test-stages/sqlite-complete/test.test", "stats": {"statements": {"success": 4, "fail": 0}, "queries": {"success": 15, "fail": 3}, "total": {"success": 19, "fail": 3}}, "requests": {"5": {"status": "success", "position": 5, "request_type": "statement", "request": "CREATE TABLE t1(a INTEGER, b INTEGER)", "reason": "success"}, "9": {"status": "success", "position": 9, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(1,2)", "reason": "success"}, "12": {"status": "success", "position": 12, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(3,4)", "reason": "success"}, "15": {"status": "success", "position": 15, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(5,6)", "reason": "success"}, "18": {"status": "success", "position": 18, "request_type": "query", "request": "SELECT a, b FROM t1 ORDER BY 2,1", "reason": "success"}, "28": {"status": "success", "position": 28, "request_type": "query", "request": "SELECT a, c FROM t1 ORDER BY 2,1", "reason": "success"}, "42": {"status": "success", "position": 42, "request_type": "query", "request": "SELECT a, c FROM t1", "reason": "success"}, "48": {"status": "error", "position": 48, "request_type": "query", "request": "SELECT a, c FROM t1", "reason": "query is expected to fail with different error, details: expected error: expect to fail in a different way, exception: no such column: c"}, "54": {"status": "success", "position": 54, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "60": {"status": "success", "position": 60, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "66": {"status": "success", "position": 66, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "72": {"status": "success", "position": 72, "request_type": "query", "request": "SELECT -1.0", "reason": "success"}, "78": {"status": "success", "position": 78, "request_type": "query", "request": "SELECT -1", "reason": "success"}, "84": {"status": "success", "position": 84, "request_type": "query", "request": "SELECT 1.0, 1", "reason": "success"}, "90": {"status": "error", "position": 90, "request_type": "query", "request": "SELECT 1.0, 1", "reason": "canonic and actual columns count differ, details: expected columns 1, actual columns 2"}, "96": {"status": "error", "position": 96, "request_type": "query", "request": "SELECT 1.0", "reason": "canonic and actual columns count differ, details: expected columns 2, actual columns 1"}, "102": {"status": "success", "position": 102, "request_type": "query", "request": "select a, b from t1 where a = b", "reason": "success"}, "107": {"status": "success", "position": 107, "request_type": "query", "request": "SELECT 1.0013", "reason": "success"}, "113": {"status": "success", "position": 113, "request_type": "query", "request": "SELECT NULL as a", "reason": "success"}, "124": {"status": "success", "position": 124, "request_type": "query", "request": "SELECT NULL", "reason": "success"}, "129": {"status": "success", "position": 129, "request_type": "query", "request": "SELECT 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15", "reason": "success"}, "135": {"status": "success", "position": 135, "request_type": "query", "request": "WITH RECURSIVE cnt(x) AS ( SELECT 1 UNION ALL SELECT x+1 FROM cnt LIMIT 20 ) SELECT x FROM cnt;", "reason": "success"}}}}}, "clickhouse-complete": {"dbms_name": "ClickHouse", "stats": {"statements": {"success": 4, "fail": 0}, "queries": {"success": 15, "fail": 4}, "total": {"success": 19, "fail": 4}}, "input_dir": "/clickhouse-tests/sqllogic/self-test", "output_dir": "/test_output/self-test/self-test-stages/clickhouse-complete", "tests": {"test.test": {"test_name": "test.test", "test_file": "/clickhouse-tests/sqllogic/self-test/test.test", "stats": {"statements": {"success": 4, "fail": 0}, "queries": {"success": 15, "fail": 4}, "total": {"success": 19, "fail": 4}}, "requests": {"1": {"status": "success", "position": 1, "request_type": "statement", "request": "CREATE TABLE t1(a INTEGER, b INTEGER) ENGINE = MergeTree() PRIMARY KEY tuple()", "reason": "success"}, "9": {"status": "success", "position": 9, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(1,2)", "reason": "success"}, "12": {"status": "success", "position": 12, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(3,4)", "reason": "success"}, "15": {"status": "success", "position": 15, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(5,6)", "reason": "success"}, "18": {"status": "success", "position": 18, "request_type": "query", "request": "SELECT a, b FROM t1 ORDER BY 2,1", "reason": "success"}, "25": {"status": "error", "position": 25, "request_type": "query", "request": "SELECT a, c FROM t1 ORDER BY 2,1", "reason": "query execution failed with an exception, exception: ('HY000', \"[HY000] HTTP status code: 404\nReceived error:\nCode: 47. DB::Exception: Missing columns: 'c' while processing query: 'SELECT a, c FROM t1 ORDER BY c ASC, a ASC', required columns: 'a' 'c', maybe you meant: 'a'. (UNKNOWN_IDENTIFIER) (version 23.3.1.1654 (official build))\n\n (1) (SQLExecDirectW)\")"}, "32": {"status": "success", "position": 32, "request_type": "query", "request": "SELECT a, c FROM t1", "reason": "success"}, "44": {"status": "error", "position": 44, "request_type": "query", "request": "SELECT a, c FROM t1", "reason": "query is expected to fail with different error, details: expected error: expect to fail in a different way, exception: ('HY000', \"[HY000] HTTP status code: 404\nReceived error:\nCode: 47. DB::Exception: Missing columns: 'c' while processing query: 'SELECT a, c FROM t1', required columns: 'a' 'c', maybe you meant: 'a'. (UNKNOWN_IDENTIFIER) (version 23.3.1.1654 (official build))\n\n (1) (SQLExecDirectW)\")"}, "49": {"status": "success", "position": 49, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "55": {"status": "success", "position": 55, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "60": {"status": "success", "position": 60, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "64": {"status": "success", "position": 64, "request_type": "query", "request": "SELECT -1.0", "reason": "success"}, "70": {"status": "success", "position": 70, "request_type": "query", "request": "SELECT -1", "reason": "success"}, "76": {"status": "success", "position": 76, "request_type": "query", "request": "SELECT 1.0, 1", "reason": "success"}, "82": {"status": "error", "position": 82, "request_type": "query", "request": "SELECT 1.0, 1", "reason": "canonic and actual columns count differ, details: expected columns 1, actual columns 2"}, "88": {"status": "error", "position": 88, "request_type": "query", "request": "SELECT 1.0", "reason": "canonic and actual columns count differ, details: expected columns 2, actual columns 1"}, "94": {"status": "success", "position": 94, "request_type": "query", "request": "select a, b from t1 where a = b", "reason": "success"}, "99": {"status": "success", "position": 99, "request_type": "query", "request": "SELECT 1.0013", "reason": "success"}, "105": {"status": "success", "position": 105, "request_type": "query", "request": "SELECT NULL as a", "reason": "success"}, "110": {"status": "success", "position": 110, "request_type": "query", "request": "SELECT CAST(NULL AS Nullable(INTEGER))", "reason": "success"}, "116": {"status": "success", "position": 116, "request_type": "query", "request": "SELECT NULL", "reason": "success"}, "121": {"status": "success", "position": 121, "request_type": "query", "request": "SELECT 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15", "reason": "success"}, "139": {"status": "success", "position": 139, "request_type": "query", "request": "SELECT number+1 from system.numbers LIMIT 20", "reason": "success"}}}}}, "clickhouse-vs-clickhouse": {"dbms_name": "ClickHouse", "stats": {"statements": {"success": 4, "fail": 0}, "queries": {"success": 16, "fail": 3}, "total": {"success": 20, "fail": 3}}, "input_dir": "/test_output/self-test/self-test-stages/clickhouse-complete", "output_dir": "/test_output/self-test/self-test-stages/clickhouse-vs-clickhouse", "tests": {"test.test": {"test_name": "test.test", "test_file": "/test_output/self-test/self-test-stages/clickhouse-complete/test.test", "stats": {"statements": {"success": 4, "fail": 0}, "queries": {"success": 16, "fail": 3}, "total": {"success": 20, "fail": 3}}, "requests": {"1": {"status": "success", "position": 1, "request_type": "statement", "request": "CREATE TABLE t1(a INTEGER, b INTEGER) ENGINE = MergeTree() PRIMARY KEY tuple()", "reason": "success"}, "9": {"status": "success", "position": 9, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(1,2)", "reason": "success"}, "12": {"status": "success", "position": 12, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(3,4)", "reason": "success"}, "15": {"status": "success", "position": 15, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(5,6)", "reason": "success"}, "18": {"status": "success", "position": 18, "request_type": "query", "request": "SELECT a, b FROM t1 ORDER BY 2,1", "reason": "success"}, "28": {"status": "success", "position": 28, "request_type": "query", "request": "SELECT a, c FROM t1 ORDER BY 2,1", "reason": "success"}, "36": {"status": "success", "position": 36, "request_type": "query", "request": "SELECT a, c FROM t1", "reason": "success"}, "48": {"status": "error", "position": 48, "request_type": "query", "request": "SELECT a, c FROM t1", "reason": "query is expected to fail with different error, details: expected error: expect to fail in a different way, exception: ('HY000', \"[HY000] HTTP status code: 404\nReceived error:\nCode: 47. DB::Exception: Missing columns: 'c' while processing query: 'SELECT a, c FROM t1', required columns: 'a' 'c', maybe you meant: 'a'. (UNKNOWN_IDENTIFIER) (version 23.3.1.1654 (official build))\n\n (1) (SQLExecDirectW)\")"}, "54": {"status": "success", "position": 54, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "60": {"status": "success", "position": 60, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "66": {"status": "success", "position": 66, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "72": {"status": "success", "position": 72, "request_type": "query", "request": "SELECT -1.0", "reason": "success"}, "78": {"status": "success", "position": 78, "request_type": "query", "request": "SELECT -1", "reason": "success"}, "84": {"status": "success", "position": 84, "request_type": "query", "request": "SELECT 1.0, 1", "reason": "success"}, "90": {"status": "error", "position": 90, "request_type": "query", "request": "SELECT 1.0, 1", "reason": "canonic and actual columns count differ, details: expected columns 1, actual columns 2"}, "96": {"status": "error", "position": 96, "request_type": "query", "request": "SELECT 1.0", "reason": "canonic and actual columns count differ, details: expected columns 2, actual columns 1"}, "102": {"status": "success", "position": 102, "request_type": "query", "request": "select a, b from t1 where a = b", "reason": "success"}, "107": {"status": "success", "position": 107, "request_type": "query", "request": "SELECT 1.0013", "reason": "success"}, "113": {"status": "success", "position": 113, "request_type": "query", "request": "SELECT NULL as a", "reason": "success"}, "118": {"status": "success", "position": 118, "request_type": "query", "request": "SELECT CAST(NULL AS Nullable(INTEGER))", "reason": "success"}, "124": {"status": "success", "position": 124, "request_type": "query", "request": "SELECT NULL", "reason": "success"}, "129": {"status": "success", "position": 129, "request_type": "query", "request": "SELECT 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15", "reason": "success"}, "148": {"status": "success", "position": 148, "request_type": "query", "request": "SELECT number+1 from system.numbers LIMIT 20", "reason": "success"}}}}}, "sqlite-vs-clickhouse": {"dbms_name": "ClickHouse", "stats": {"statements": {"success": 4, "fail": 0}, "queries": {"success": 13, "fail": 6}, "total": {"success": 17, "fail": 6}}, "input_dir": "/test_output/self-test/self-test-stages/sqlite-complete", "output_dir": "/test_output/self-test/self-test-stages/sqlite-vs-clickhouse", "tests": {"test.test": {"test_name": "test.test", "test_file": "/test_output/self-test/self-test-stages/sqlite-complete/test.test", "stats": {"statements": {"success": 4, "fail": 0}, "queries": {"success": 13, "fail": 6}, "total": {"success": 17, "fail": 6}}, "requests": {"1": {"status": "success", "position": 1, "request_type": "statement", "request": "CREATE TABLE t1(a INTEGER, b INTEGER) ENGINE = MergeTree() PRIMARY KEY tuple()", "reason": "success"}, "9": {"status": "success", "position": 9, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(1,2)", "reason": "success"}, "12": {"status": "success", "position": 12, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(3,4)", "reason": "success"}, "15": {"status": "success", "position": 15, "request_type": "statement", "request": "INSERT INTO t1(a,b) VALUES(5,6)", "reason": "success"}, "18": {"status": "success", "position": 18, "request_type": "query", "request": "SELECT a, b FROM t1 ORDER BY 2,1", "reason": "success"}, "28": {"status": "error", "position": 28, "request_type": "query", "request": "SELECT a, c FROM t1 ORDER BY 2,1", "reason": "canonic and actual results have different exceptions, details: canonic: query execution failed with an exception, original is: no such column: c, actual: query execution failed with an exception, original is: ('HY000', \"[HY000] HTTP status code: 404\nReceived error:\nCode: 47. DB::Exception: Missing columns: 'c' while processing query: 'SELECT a, c FROM t1 ORDER BY c ASC, a ASC', required columns: 'a' 'c', maybe you meant: 'a'. (UNKNOWN_IDENTIFIER) (version 23.3.1.1654 (official build))\n\n (1) (SQLExecDirectW)\")"}, "36": {"status": "success", "position": 36, "request_type": "query", "request": "SELECT a, c FROM t1", "reason": "success"}, "48": {"status": "error", "position": 48, "request_type": "query", "request": "SELECT a, c FROM t1", "reason": "query is expected to fail with different error, details: expected error: expect to fail in a different way, exception: ('HY000', \"[HY000] HTTP status code: 404\nReceived error:\nCode: 47. DB::Exception: Missing columns: 'c' while processing query: 'SELECT a, c FROM t1', required columns: 'a' 'c', maybe you meant: 'a'. (UNKNOWN_IDENTIFIER) (version 23.3.1.1654 (official build))\n\n (1) (SQLExecDirectW)\")"}, "54": {"status": "success", "position": 54, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "60": {"status": "success", "position": 60, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "66": {"status": "success", "position": 66, "request_type": "query", "request": "SELECT ''", "reason": "success"}, "72": {"status": "success", "position": 72, "request_type": "query", "request": "SELECT -1.0", "reason": "success"}, "78": {"status": "success", "position": 78, "request_type": "query", "request": "SELECT -1", "reason": "success"}, "84": {"status": "success", "position": 84, "request_type": "query", "request": "SELECT 1.0, 1", "reason": "success"}, "90": {"status": "error", "position": 90, "request_type": "query", "request": "SELECT 1.0, 1", "reason": "canonic and actual columns count differ, details: expected columns 1, actual columns 2"}, "96": {"status": "error", "position": 96, "request_type": "query", "request": "SELECT 1.0", "reason": "canonic and actual columns count differ, details: expected columns 2, actual columns 1"}, "102": {"status": "success", "position": 102, "request_type": "query", "request": "select a, b from t1 where a = b", "reason": "success"}, "107": {"status": "success", "position": 107, "request_type": "query", "request": "SELECT 1.0013", "reason": "success"}, "113": {"status": "error", "position": 113, "request_type": "query", "request": "SELECT NULL as a", "reason": "actual result has exception and canonic result doesn't, details: actual: query execution failed with an exception, original is: ('ODBC SQL type 0 is not yet supported.  column-index=0  type=0', 'HY106')"}, "118": {"status": "success", "position": 118, "request_type": "query", "request": "SELECT CAST(NULL AS Nullable(INTEGER))", "reason": "success"}, "124": {"status": "error", "position": 124, "request_type": "query", "request": "SELECT NULL", "reason": "actual result has exception and canonic result doesn't, details: actual: query execution failed with an exception, original is: ('ODBC SQL type 0 is not yet supported.  column-index=0  type=0', 'HY106')"}, "129": {"status": "success", "position": 129, "request_type": "query", "request": "SELECT 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15", "reason": "success"}, "148": {"status": "success", "position": 148, "request_type": "query", "request": "SELECT number+1 from system.numbers LIMIT 20", "reason": "success"}}}}}}
diff --git a/tests/sqllogic/self-test/test.test b/tests/sqllogic/self-test/test.test
new file mode 100644
index 00000000000..85b27ed7d60
--- /dev/null
+++ b/tests/sqllogic/self-test/test.test
@@ -0,0 +1,145 @@
+onlyif ClickHouse
+statement ok
+CREATE TABLE t1(a INTEGER, b INTEGER) ENGINE = MergeTree() PRIMARY KEY tuple()
+
+skipif ClickHouse
+statement ok
+CREATE TABLE t1(a INTEGER, b INTEGER)
+
+statement ok
+INSERT INTO t1(a,b) VALUES(1,2)
+
+statement ok
+INSERT INTO t1(a,b) VALUES(3,4)
+
+statement ok
+INSERT INTO t1(a,b) VALUES(5,6)
+
+# just ok request
+query II nosort
+SELECT a, b
+  FROM t1
+ ORDER BY 2,1
+----
+
+# will fail and write exception as a result
+query II nosort
+SELECT a, c
+  FROM t1
+ ORDER BY 2,1
+----
+
+# expect to fail
+onlyif ClickHouse
+query error UNKNOWN_IDENTIFIER
+SELECT a, c FROM t1
+----
+
+# expect to fail
+onlyif sqlite
+query error No such column
+SELECT a, c FROM t1
+----
+
+# expect to fail in a different way
+query error expect to fail in a different way
+SELECT a, c FROM t1
+----
+
+# print empty as (empty)
+query T nosort
+SELECT ''
+----
+(empty)
+
+# without result set
+query T nosort
+SELECT ''
+----
+
+# without result and saparator
+query T nosort
+SELECT ''
+
+# just ok with REAL
+query R nosort
+SELECT -1.0
+----
+-1.000
+
+# just ok with signed
+query I nosort
+SELECT -1
+----
+-1
+
+# just ok
+query RI nosort
+SELECT 1.0, 1
+----
+1.000 1
+
+# mess with columns count
+query R nosort
+SELECT 1.0, 1
+----
+1.000 1
+
+# mess with columns count
+query RT nosort
+SELECT 1.0
+----
+1.000
+
+# empty result set
+query II nosort
+select a, b from t1 where a = b
+----
+
+# precise is 3 digits
+query R nosort
+SELECT 1.0013
+----
+1.001
+
+query T nosort
+SELECT NULL as a
+----
+NULL
+
+onlyif ClickHouse
+query I nosort
+SELECT CAST(NULL AS Nullable(INTEGER))
+----
+NULL
+
+query T nosort
+SELECT NULL
+----
+NULL NULL
+
+# thish check how result hashing works
+query IIIIIIIIIIIIIII nosort
+SELECT 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+----
+
+skipif ClickHouse
+query I nosort
+WITH RECURSIVE
+  cnt(x) AS (
+     SELECT 1
+     UNION ALL
+     SELECT x+1 FROM cnt
+      LIMIT 20
+  )
+SELECT x FROM cnt;
+----
+20 values hashing to 52c46dff81346ead02fcf6245c762b1a
+
+onlyif ClickHouse
+query I nosort
+SELECT number+1 from system.numbers LIMIT 20
+----
+20 values hashing to 52c46dff81346ead02fcf6245c762b1a
+
+
diff --git a/tests/sqllogic/test_parser.py b/tests/sqllogic/test_parser.py
new file mode 100755
index 00000000000..42adb83809f
--- /dev/null
+++ b/tests/sqllogic/test_parser.py
@@ -0,0 +1,609 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import logging
+import os
+
+from itertools import chain
+from enum import Enum
+from hashlib import md5
+from functools import reduce
+
+from exceptions import Error, ProgramError, ErrorWithParent, DataResultDiffer
+
+
+logger = logging.getLogger("parser")
+logger.setLevel(logging.DEBUG)
+
+CONDITION_SKIP = "skipif"
+CONDITION_ONLY = "onlyif"
+
+
+# TODO replace assertions with raise exception
+class TestFileFormatException(Error):
+    pass
+
+
+class FileAndPos:
+    def __init__(self, file=None, pos=None):
+        self.file = file
+        self.pos = pos
+
+    def __str__(self):
+        return f"{self.file}:{self.pos}"
+
+
+def check_conditions(conditions, dbms_name):
+    rules = {}
+    for rec in conditions:
+        key, val = rec
+        if key not in conditions:
+            rules[key] = []
+        rules[key].append(val)
+    if CONDITION_SKIP in rules:
+        if dbms_name in rules[CONDITION_SKIP]:
+            return False
+    if CONDITION_ONLY in rules:
+        if dbms_name not in rules[CONDITION_ONLY]:
+            return False
+    return True
+
+
+class BlockType(Enum):
+    comments = 1
+    control = 2
+    statement = 3
+    query = 4
+
+
+COMMENT_TOKENS = ["#"]
+RESULT_SEPARATION_LINE = "----"
+CONTROL_TOKENS = ["halt", "hash-threshold"]
+
+CONDITIONS_TOKENS = [CONDITION_SKIP, CONDITION_ONLY]
+STATEMENT_TOKEN = "statement"
+QUERY_TOKEN = "query"
+
+
+ACCEPTABLE_TYPES = {type(""): "T", type(1): "I", type(0.001): "R"}
+
+
+def _is_comment_line(tokens):
+    return tokens and tokens[0][0] in COMMENT_TOKENS
+
+
+def _is_separation_line(tokens):
+    return tokens and tokens[0] == RESULT_SEPARATION_LINE
+
+
+def _is_control_line(tokens):
+    return tokens and tokens[0] in CONTROL_TOKENS
+
+
+def _is_conditional_line(tokens):
+    return tokens and tokens[0] in CONDITIONS_TOKENS
+
+
+def _is_statement_line(tokens):
+    return tokens and tokens[0] == STATEMENT_TOKEN
+
+
+def _is_query_line(tokens):
+    return tokens and tokens[0] == QUERY_TOKEN
+
+
+class FileBlockBase:
+    def __init__(self, parser, start, end):
+        self._parser = parser
+        self._start = start
+        self._end = end
+
+    def get_block_type(self):
+        pass
+
+    def get_pos(self):
+        return self._start + 1
+
+    @staticmethod
+    def __parse_request(test_file, start, end):
+        request_end = start
+        while request_end < end:
+            tokens = test_file.get_tokens(request_end)
+            if not tokens or _is_separation_line(tokens):
+                break
+            request_end += 1
+        request = test_file.get_tokens_from_lines(start, request_end)
+        logger.debug("slice request %s:%s end %s", start, request_end, end)
+        return " ".join(request), request_end
+
+    @staticmethod
+    def __parse_result(test_file, start, end):
+        result_end = start
+        while result_end < end:
+            tokens = test_file.get_tokens(result_end)
+            if not tokens:
+                break
+            result_end += 1
+        logger.debug("slice result %s:%s end %s", start, result_end, end)
+        result = test_file.get_tokens(start, result_end)
+        return result, result_end
+
+    @staticmethod
+    def parse_block(parser, start, end):
+        file_pos = FileAndPos(parser.get_test_name(), start + 1)
+        logger.debug("%s start %s end %s", file_pos, start, end)
+
+        block_type = BlockType.comments
+        conditions = []
+        controls = []
+        statement = None
+        query = None
+        request = []
+        result_line = None
+        result = []
+
+        line = start
+        while line < end:
+            tokens = parser.get_tokens(line)
+
+            if _is_comment_line(tokens):
+                pass
+            elif _is_conditional_line(tokens):
+                conditions.append(parser.get_tokens(line))
+
+            elif _is_control_line(tokens):
+                assert block_type in (BlockType.comments, BlockType.control)
+                block_type = BlockType.control
+                controls.append(parser.get_tokens(line))
+
+            elif _is_statement_line(tokens):
+                assert block_type in (BlockType.comments,)
+                block_type = BlockType.statement
+                statement = parser.get_tokens(line)
+                request, last_line = FileBlockBase.__parse_request(
+                    parser, line + 1, end
+                )
+                assert last_line == end
+                line = last_line
+
+            elif _is_query_line(tokens):
+                assert block_type in (BlockType.comments,)
+                block_type = BlockType.query
+                query = parser.get_tokens(line)
+                request, last_line = FileBlockBase.__parse_request(
+                    parser, line + 1, end
+                )
+                result_line = last_line
+                line = last_line
+                if line == end:
+                    break
+                tokens = parser.get_tokens(line)
+                assert _is_separation_line(tokens), f"last_line {last_line}, end {end}"
+                result, last_line = FileBlockBase.__parse_result(parser, line + 1, end)
+                assert last_line == end
+                line = last_line
+            line += 1
+
+        if block_type == BlockType.comments:
+            return FileBlockComments(parser, start, end)
+
+        if block_type == BlockType.control:
+            return FileBlockControl(parser, start, end, conditions, controls)
+
+        if block_type == BlockType.statement:
+            return FileBlockStatement(
+                parser, start, end, conditions, statement, request
+            )
+
+        if block_type == BlockType.query:
+            block = FileBlockQuery(
+                parser, start, end, conditions, query, request, result_line
+            )
+            block.with_result(result)
+            return block
+
+    def dump_to(self, output):
+        if output is None:
+            return
+        for line in range(self._start, self._end):
+            output.write(self._parser.get_line(line))
+        output.write("\n")
+
+
+class FileBlockComments(FileBlockBase):
+    def __init__(self, parser, start, end):
+        super().__init__(parser, start, end)
+
+    def get_block_type(self):
+        return BlockType.comments
+
+
+class FileBlockControl(FileBlockBase):
+    def __init__(self, parser, start, end, conditions, control):
+        super().__init__(parser, start, end)
+        self.conditions = conditions
+        self.control = control
+
+    def get_block_type(self):
+        return BlockType.control
+
+    def get_conditions(self):
+        return self.conditions
+
+
+class FileBlockStatement(FileBlockBase):
+    def __init__(self, parser, start, end, conditions, statement, request):
+        super().__init__(parser, start, end)
+        self.conditions = conditions
+        self.statement = statement
+        self.request = request
+
+    def get_block_type(self):
+        return BlockType.statement
+
+    def get_request(self):
+        return self.request
+
+    def get_conditions(self):
+        return self.conditions
+
+    def get_statement(self):
+        return self.statement
+
+    def expected_error(self):
+        return self.statement[1] == "error"
+
+
+class FileBlockQuery(FileBlockBase):
+    def __init__(self, parser, start, end, conditions, query, request, result_line):
+        super().__init__(parser, start, end)
+        self.conditions = conditions
+        self.query = query
+        self.request = request
+        self.result = None
+        self.result_line = result_line
+
+    def get_block_type(self):
+        return BlockType.query
+
+    def get_request(self):
+        return self.request
+
+    def get_conditions(self):
+        return self.conditions
+
+    def get_query(self):
+        return self.query
+
+    def expected_error(self):
+        return " ".join(self.query[2:]).lower() if self.query[1] == "error" else None
+
+    def get_types(self):
+        if self.query[1] == "error":
+            raise TestFileFormatException(
+                "the query is expected to fail, there are no types"
+            )
+        return self.query[1]
+
+    def get_sort_mode(self):
+        return self.query[2]
+
+    def get_result(self):
+        return self.result
+
+    def with_result(self, result):
+        self.result = result
+
+    def dump_to(self, output):
+        if output is None:
+            return
+
+        for line in range(self._start, self.result_line):
+            output.write(self._parser.get_line(line))
+
+        if self.result is not None:
+            logger.debug("dump result %s", self.result)
+            output.write("----\n")
+            for row in self.result:
+                output.write(" ".join(row) + "\n")
+
+        output.write("\n")
+
+
+class TestFileParser:
+    CONTROL_TOKENS = ["halt", "hash-threshold"]
+    CONDITIONS_TOKENS = [CONDITION_SKIP, CONDITION_ONLY]
+    STATEMENT_TOKEN = "statement"
+    QUERY_TOKEN = "query"
+    COMMENT_TOKEN = "#"
+
+    DEFAULT_HASH_THRESHOLD = 8
+
+    def __init__(self, stream, test_name, test_file):
+        self._stream = stream
+        self._test_name = test_name
+        self._test_file = test_file
+
+        self._lines = []
+        self._raw_tokens = []
+        self._tokens = []
+        self._empty_lines = []
+
+    def get_test_name(self):
+        return self._test_name
+
+    def get_test_file(self):
+        if self._test_file is not None:
+            return self._test_file
+        return self._test_name
+
+    def get_line(self, line):
+        return self._lines[line]
+
+    def get_tokens(self, start, end=None):
+        if end is None:
+            return self._tokens[start]
+        else:
+            return self._tokens[start:end]
+
+    def get_tokens_from_lines(self, start, end):
+        return list(chain(*self._tokens[start:end]))
+
+    def __load_file(self):
+        self._lines = self._stream.readlines()
+
+        self._raw_tokens = [line.split() for line in self._lines]
+        assert len(self._lines) == len(self._raw_tokens)
+
+        self._tokens = []
+        for line in self._raw_tokens:
+            if self.COMMENT_TOKEN in line:
+                comment_starts_at = line.index(self.COMMENT_TOKEN)
+                self._tokens.append(line[0:comment_starts_at])
+            else:
+                self._tokens.append(line)
+
+        self._empty_lines = [i for i, x in enumerate(self._raw_tokens) if len(x) == 0]
+
+        logger.debug(
+            "Test file %s loaded rows %s, empty rows %s",
+            self.get_test_file(),
+            len(self._lines),
+            len(self._empty_lines),
+        )
+
+    def __unload_file(self):
+        self._test_file = None
+        self._test_name = None
+        self._stream = None
+        self._lines = []
+        self._raw_tokens = []
+        self._tokens = []
+        self._empty_lines = []
+
+    def _iterate_blocks(self):
+        prev = 0
+        for i in self._empty_lines:
+            if prev != i:
+                yield FileBlockBase.parse_block(self, prev, i)
+            prev = i + 1
+
+        if prev != len(self._lines):
+            yield FileBlockBase.parse_block(self, prev, len(self._lines))
+
+    def test_blocks(self):
+        try:
+            self.__load_file()
+            yield from self._iterate_blocks()
+        finally:
+            self.__unload_file()
+
+
+class QueryResult:
+    def __init__(
+        self,
+        rows=None,
+        values_count=None,
+        data_hash=None,
+        exception=None,
+        hash_threshold=0,
+    ):
+        self.rows = rows
+        self.values_count = values_count
+        self.data_hash = data_hash
+        self.exception = exception
+        self.hash_threshold = hash_threshold
+        self.hash_it()
+        logger.debug("created QueryResult %s", str(self))
+
+    def __str__(self):
+        params = ", ".join(
+            (
+                str(x)
+                for x in [
+                    "rows: {}".format(self.rows) if self.rows else "",
+                    "values_count: {}".format(self.values_count)
+                    if self.values_count
+                    else "",
+                    "data_hash: {}".format(self.data_hash) if self.data_hash else "",
+                    "exception: {}".format(self.exception) if self.exception else "",
+                    "hash_threshold: {}".format(self.hash_threshold)
+                    if self.hash_threshold
+                    else "",
+                ]
+                if x
+            )
+        )
+        return "QueryResult({})".format(params)
+
+    def __iter__(self):
+        if self.rows is not None:
+            if self.hash_threshold == 0:
+                return iter(self.rows)
+            if self.values_count <= self.hash_threshold:
+                return iter(self.rows)
+        if self.data_hash is not None:
+            return iter(
+                [["{} values hashing to {}".format(self.values_count, self.data_hash)]]
+            )
+        if self.exception is not None:
+            return iter([["exception: {}".format(self.exception)]])
+        raise ProgramError("Query result is empty", details="{}".format(self.__str__()))
+
+    @staticmethod
+    def __value_count(rows):
+        return reduce(lambda a, b: a + len(b), rows, 0)
+
+    @staticmethod
+    def parse_it(rows, hash_threshold):
+        logger.debug("parse result len: %s rows: %s", len(rows), rows)
+        if len(rows) == 1:
+            logger.debug("one row is %s", rows)
+            if len(rows[0]) > 0 and rows[0][0] == "exception:":
+                logging.debug("as exception")
+                message = " ".join(rows[0][1:])
+                return QueryResult(exception=message)
+            if len(rows[0]) == 5 and " ".join(rows[0][1:4]) == "values hashing to":
+                logging.debug("as hashed data")
+                values_count = int(rows[0][0])
+                data_hash = rows[0][4]
+                return QueryResult(data_hash=data_hash, values_count=values_count)
+        logger.debug("as data")
+        values_count = QueryResult.__value_count(rows)
+        return QueryResult(
+            rows=rows, values_count=values_count, hash_threshold=hash_threshold
+        )
+
+    @staticmethod
+    def __result_as_strings(rows, types):
+        res = []
+        for row in rows:
+            res_row = []
+            for c, t in zip(row, types):
+                if c is None:
+                    res_row.append("NULL")
+                    continue
+
+                if t == "T":
+                    if c == "":
+                        res_row.append("(empty)")
+                    else:
+                        res_row.append(str(c))
+                elif t == "I":
+                    res_row.append(str(int(c)))
+                elif t == "R":
+                    res_row.append(f"{c:.3f}")
+
+            res.append(res_row)
+        return res
+
+    @staticmethod
+    def __sort_result(rows, sort_mode):
+        if sort_mode == "nosort":
+            return rows
+        if sort_mode == "rowsort":
+            return sorted(rows)
+        if sort_mode == "valuesort":
+            values = list(chain(*rows))
+            values.sort()
+            return [values] if values else []
+
+    @staticmethod
+    def __calculate_hash(rows):
+        md5_hash = md5()
+        for row in rows:
+            for value in row:
+                md5_hash.update(value.encode("ascii"))
+        return str(md5_hash.hexdigest())
+
+    @staticmethod
+    def make_it(rows, types, sort_mode, hash_threshold):
+        values_count = QueryResult.__value_count(rows)
+        as_string = QueryResult.__result_as_strings(rows, types)
+        as_sorted = QueryResult.__sort_result(as_string, sort_mode)
+        return QueryResult(
+            rows=as_sorted, values_count=values_count, hash_threshold=hash_threshold
+        )
+
+    def hash_it(self):
+        if self.rows is not None and self.data_hash is None:
+            self.data_hash = QueryResult.__calculate_hash(self.rows)
+        return self
+
+    @staticmethod
+    def as_exception(e):
+        # do not print details to the test file
+        # but print original exception
+        if isinstance(e, ErrorWithParent):
+            message = "{}, original is: {}".format(e, e.get_parent())
+        else:
+            message = "{}".format(e)
+
+        return QueryResult(exception=message)
+
+    @staticmethod
+    def assert_eq(canonic, actual):
+        if not isinstance(canonic, QueryResult):
+            raise ProgramError("NotImplemented")
+
+        if not isinstance(actual, QueryResult):
+            raise ProgramError("NotImplemented")
+
+        if canonic.exception is not None or actual.exception is not None:
+            if canonic.exception is not None and actual.exception is not None:
+                if canonic.exception != actual.exception:
+                    raise DataResultDiffer(
+                        "canonic and actual results have different exceptions",
+                        details=f"canonic: {canonic.exception}, actual: {actual.exception}",
+                    )
+                else:
+                    # exceptions are the same
+                    return
+            elif canonic.exception is not None:
+                raise DataResultDiffer(
+                    "canonic result has exception and actual result doesn't",
+                    details=f"canonic: {canonic.exception}",
+                )
+            else:
+                raise DataResultDiffer(
+                    "actual result has exception and canonic result doesn't",
+                    details=f"actual: {actual.exception}",
+                )
+
+        canonic.hash_it()
+        actual.hash_it()
+
+        if canonic.data_hash is not None:
+            if actual.data_hash is None:
+                raise ProgramError("actual result has to have hash for data")
+            if canonic.values_count != actual.values_count:
+                raise DataResultDiffer(
+                    "canonic and actual results have different value count",
+                    details="canonic values count {}, actual {}".format(
+                        canonic.values_count, actual.values_count
+                    ),
+                )
+            if canonic.data_hash != actual.data_hash:
+                raise DataResultDiffer(
+                    "canonic and actual results have different hashes"
+                )
+            return
+
+        if canonic.rows is not None and actual.rows is not None:
+            if canonic.values_count != actual.values_count:
+                raise DataResultDiffer(
+                    "canonic and actual results have different value count",
+                    details="canonic values count {}, actual {}".format(
+                        canonic.values_count, actual.values_count
+                    ),
+                )
+            if canonic.rows != actual.rows:
+                raise DataResultDiffer(
+                    "canonic and actual results have different values"
+                )
+            return
+
+        raise ProgramError(
+            "Unable to compare results",
+            details="actual {}, canonic {}".format(actual, canonic),
+        )
diff --git a/tests/sqllogic/test_runner.py b/tests/sqllogic/test_runner.py
new file mode 100644
index 00000000000..3df38e7fce5
--- /dev/null
+++ b/tests/sqllogic/test_runner.py
@@ -0,0 +1,584 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import enum
+import logging
+import os
+import traceback
+import io
+import json
+
+import test_parser
+from exceptions import (
+    Error,
+    ProgramError,
+    DataResultDiffer,
+    StatementExecutionError,
+    StatementSuccess,
+    QueryExecutionError,
+    QuerySuccess,
+    SchemeResultDiffer,
+)
+from connection import execute_request
+
+
+logger = logging.getLogger("parser")
+logger.setLevel(logging.DEBUG)
+
+
+def _list_files(path):
+    logger.debug("list files in %s, type %s", path, type(path))
+
+    if not isinstance(path, str):
+        raise ProgramError("NotImplemented")
+
+    if os.path.isfile(path):
+        yield path
+    else:
+        with os.scandir(path) as it:
+            for entry in it:
+                yield from _list_files(entry.path)
+
+
+def _filter_files(suffix, files):
+    yield from (path for path in files if path.endswith(suffix))
+
+
+class RequestType(str, enum.Enum):
+    statement = enum.auto()
+    query = enum.auto()
+
+
+class Status(str, enum.Enum):
+    success = "success"
+    error = "error"
+
+
+class TestStatus:
+    def __init__(self):
+        self.status = None
+        self.file = None
+        self.position = None
+        self.request_type = None
+        self.request = None
+        self.reason = None
+
+    def get_map(self):
+        return {
+            "status": self.status.name.lower(),
+            # "file": self.file,
+            "position": self.position,
+            "request_type": self.request_type.name.lower(),
+            "request": self.request,
+            "reason": self.reason,
+        }
+
+    @staticmethod
+    def __from_error(err):
+        if isinstance(err, Error):
+            result = TestStatus()
+            result.name = err.test_name
+            result.file = err.test_file
+            result.position = err.test_pos
+            result.request = err.request
+            result.reason = err.reason
+            return result
+        raise ProgramError("NotImplemented")
+
+    @staticmethod
+    def from_exception(ex):
+        result = TestStatus.__from_error(ex)
+
+        if isinstance(ex, StatementSuccess):
+            result.status = Status.success
+            result.request_type = RequestType.statement
+        elif isinstance(ex, StatementExecutionError):
+            result.status = Status.error
+            result.request_type = RequestType.statement
+        elif isinstance(ex, QuerySuccess):
+            result.status = Status.success
+            result.request_type = RequestType.query
+        elif isinstance(ex, QueryExecutionError):
+            result.status = Status.error
+            result.request_type = RequestType.query
+        elif isinstance(ex, SchemeResultDiffer):
+            result.status = Status.error
+            result.request_type = RequestType.query
+        elif isinstance(ex, DataResultDiffer):
+            result.status = Status.error
+            result.request_type = RequestType.query
+        else:
+            raise ProgramError("NotImplemented", parent=ex)
+
+        return result
+
+
+class SimpleStats:
+    def __init__(self, general=None):
+        self._general = general
+        self._success = 0
+        self._fail = 0
+
+    @property
+    def all(self):
+        return self._success + self.fail
+
+    @property
+    def success(self):
+        return self._success
+
+    @success.setter
+    def success(self, value):
+        if self._general is not None:
+            self._general.success += value - self._success
+        self._success = value
+
+    @property
+    def fail(self):
+        return self._fail
+
+    @fail.setter
+    def fail(self, value):
+        if self._general is not None:
+            self._general.fail += value - self._fail
+        self._fail = value
+
+    def __repr__(self):
+        return str(self.get_map())
+
+    def update(self, status):
+        if not isinstance(status, TestStatus):
+            raise ProgramError("NotImplemented")
+
+        if status.status == Status.error:
+            self.fail += 1
+        else:
+            self.success += 1
+
+    def get_map(self):
+        result = dict()
+        result["success"] = self.success
+        result["fail"] = self.fail
+        return result
+
+    def combine_with(self, right):
+        if not isinstance(right, SimpleStats):
+            raise ProgramError("NotImplemented")
+        self.success += right.success
+        self.fail += right.fail
+
+
+class Stats:
+    def __init__(self):
+        self.total = SimpleStats()
+        self.statements = SimpleStats(self.total)
+        self.queries = SimpleStats(self.total)
+
+    def __repr__(self):
+        return str(self.get_map())
+
+    def update(self, status):
+        if not isinstance(status, TestStatus):
+            raise ProgramError("NotImplemented")
+
+        if status.request_type == RequestType.query:
+            choose = self.queries
+        else:
+            choose = self.statements
+        choose.update(status)
+
+    def get_map(self):
+        result = dict()
+        result["statements"] = self.statements.get_map()
+        result["queries"] = self.queries.get_map()
+        result["total"] = self.total.get_map()
+        return result
+
+    def combine_with(self, right):
+        if not isinstance(right, Stats):
+            raise ProgramError("NotImplemented")
+        self.statements.combine_with(right.statements)
+        self.queries.combine_with(right.queries)
+
+
+class OneReport:
+    def __init__(self, test_name, test_file):
+        self.test_name = test_name
+        self.test_file = test_file
+        self.stats = Stats()
+        self.requests = dict()  # type: dict(int, TestStatus)
+
+    def update(self, status):
+        if not isinstance(status, TestStatus):
+            raise ProgramError("NotImplemented")
+
+        self.stats.update(status)
+        self.requests[status.position] = status
+
+    def __repr__(self):
+        return str(self.get_map())
+
+    def get_map(self):
+        result = dict()
+        result["test_name"] = self.test_name
+        result["test_file"] = self.test_file
+        result["stats"] = self.stats.get_map()
+        result["requests"] = dict()
+        requests = result["requests"]
+        for pos, status in self.requests.items():
+            requests[pos] = status.get_map()
+        return result
+
+
+class Report:
+    def __init__(self, dbms_name, input_dir=None):
+        self.dbms_name = dbms_name
+        self.stats = Stats()
+        self.tests = dict()  # type: dict(str, OneReport)
+        self.input_dir = input_dir
+        self.output_dir = None
+
+    def update(self, status):
+        if not isinstance(status, TestStatus):
+            raise ProgramError("NotImplemented")
+
+        self.stats.update(status)
+        self.__get_file_report(status).update(status)
+
+    def __get_file_report(self, status):
+        if status.name not in self.tests:
+            self.tests[status.name] = OneReport(status.name, status.file)
+        return self.tests[status.name]
+
+    def __repr__(self):
+        return str(self.get_map())
+
+    def assign_result_dir(self, res_dir):
+        self.output_dir = res_dir
+
+    def get_map(self):
+        result = dict()
+        result["dbms_name"] = self.dbms_name
+        result["stats"] = self.stats.get_map()
+        result["input_dir"] = self.input_dir
+        if self.input_dir is not None:
+            result["input_dir"] = self.input_dir
+        if self.output_dir is not None:
+            result["output_dir"] = self.output_dir
+        result["tests"] = dict()
+        tests = result["tests"]
+        for test_name, one_report in self.tests.items():
+            tests.update({test_name: one_report.get_map()})
+        return result
+
+    def combine_with(self, right):
+        if not isinstance(right, Report):
+            raise ProgramError("NotImplemented")
+
+        if self.dbms_name != right.dbms_name:
+            raise ProgramError("reports are attached to the different databases")
+
+        if self.input_dir is None or right.input_dir is None:
+            raise ProgramError("can't compare input dirs")
+
+        if self.input_dir != right.input_dir:
+            raise ProgramError(
+                "can't combine reports, they are attached to the different input dirs"
+            )
+
+        for test_name in right.tests.keys():
+            if test_name in self.tests:
+                raise ProgramError(
+                    f"can't combine reports, they have intersect tests, {test_name}"
+                )
+
+        self.tests.update(right.tests)
+        self.stats.combine_with(right.stats)
+        return self
+
+    def write_report(self, report_dir):
+        report_path = os.path.join(report_dir, "report.json")
+        logger.info(f"create file {report_path}")
+        with open(report_path, "w") as stream:
+            stream.write(json.dumps(self.get_map(), indent=4))
+
+
+class TestRunner:
+    def __init__(
+        self,
+        connection,
+        verify_mode=None,
+        skip_request_types=None,
+        stop_at_statement_error=None,
+    ):
+        self.connection = connection
+        self.verify = False if verify_mode is None else verify_mode
+        self.skip_request_types = []
+        if skip_request_types is not None:
+            for req_type in skip_request_types:
+                self.with_skip(req_type)
+        self.stop_at_statement_error = (
+            False if stop_at_statement_error is None else stop_at_statement_error
+        )
+
+        self.dbms_name = connection.DBMS_NAME
+        self.report = None
+        self.results = None
+        self._input_dir = None
+
+    def with_verify_mode(self):
+        self.verify = True
+        return self
+
+    def with_completion_mode(self):
+        self.verify = False
+        return self
+
+    def with_skip(self, type_request):
+        if type_request == RequestType.query:
+            self.skip_request_types.append(test_parser.BlockType.query)
+        if type_request == RequestType.statement:
+            self.skip_request_types.append(test_parser.BlockType.statement)
+
+    def __statuses(self, parser, out_stream):
+        skip_rest = False
+
+        for block in parser.test_blocks():
+            test_file = parser.get_test_file()
+            test_name = parser.get_test_name()
+            position = block.get_pos()
+            name_pos = f"{test_name}:{position}"
+
+            clogger = logging.getLogger(f"parser at {name_pos}")
+
+            if skip_rest:
+                clogger.debug("Skip rest blocks")
+                block.dump_to(out_stream)
+                continue
+
+            if block.get_block_type() == test_parser.BlockType.comments:
+                clogger.debug("Skip comment block")
+                block.dump_to(out_stream)
+                continue
+
+            if block.get_block_type() == test_parser.BlockType.control:
+                clogger.debug("Skip control block", name_pos)
+                block.dump_to(out_stream)
+                continue
+
+            clogger.debug("Request <%s>", block.get_request())
+
+            cond_lines = block.get_conditions()
+            if not test_parser.check_conditions(cond_lines, self.dbms_name):
+                clogger.debug("Conditionally skip block for %s", self.dbms_name)
+                block.dump_to(out_stream)
+                continue
+
+            request = block.get_request()
+            exec_res = execute_request(request, self.connection)
+
+            if block.get_block_type() in self.skip_request_types:
+                clogger.debug("Runtime skip block for %s", self.dbms_name)
+                block.dump_to(out_stream)
+                continue
+
+            if block.get_block_type() == test_parser.BlockType.statement:
+                try:
+                    clogger.debug("this is statement")
+                    if block.expected_error():
+                        clogger.debug("error is expected")
+                        if not exec_res.has_exception():
+                            raise StatementExecutionError(
+                                "statement request did not fail as expected"
+                            )
+                    else:
+                        clogger.debug("ok is expected")
+                        if exec_res.has_exception():
+                            raise StatementExecutionError(
+                                "statement failed with exception",
+                                parent=exec_res.get_exception(),
+                            )
+                    raise StatementSuccess()
+                except StatementSuccess as ok:
+                    clogger.debug("statement is ok")
+                    ok.set_details(
+                        file=test_file, name=test_name, pos=position, request=request
+                    )
+                    block.dump_to(out_stream)
+                    yield TestStatus.from_exception(ok)
+                except StatementExecutionError as err:
+                    err.set_details(
+                        file=test_file, name=test_name, pos=position, request=request
+                    )
+                    clogger.critical("Unable to execute statement, %s", err.reason)
+                    block.dump_to(out_stream)
+                    if self.stop_at_statement_error:
+                        clogger.critical("Will skip the rest of the file")
+                        skip_rest = True
+                    yield TestStatus.from_exception(err)
+
+            if block.get_block_type() == test_parser.BlockType.query:
+                try:
+                    clogger.debug("this is query")
+                    expected_error = block.expected_error()
+                    if expected_error:
+                        clogger.debug("error is expected %s", expected_error)
+                        if exec_res.has_exception():
+                            e = exec_res.get_exception()
+                            clogger.debug("had error %s", e)
+                            message = str(e).lower()
+                            if expected_error not in message:
+                                clogger.debug("errors differed")
+                                raise QueryExecutionError(
+                                    "query is expected to fail with different error",
+                                    details=f"expected error: {expected_error}",
+                                    parent=exec_res.get_exception(),
+                                )
+                            else:
+                                clogger.debug("errors matched")
+                                raise QuerySuccess()
+                        else:
+                            clogger.debug("missed error")
+                            raise QueryExecutionError(
+                                "query is expected to fail with error",
+                                details="expected error: {}".format(expected_error),
+                            )
+                    else:
+                        clogger.debug("success is expected")
+                        if exec_res.has_exception():
+                            clogger.debug("had error")
+                            if self.verify:
+                                clogger.debug("verify mode")
+                                canonic = test_parser.QueryResult.parse_it(
+                                    block.get_result(), 10
+                                )
+                                exception = QueryExecutionError(
+                                    "query execution failed with an exception",
+                                    parent=exec_res.get_exception(),
+                                )
+                                actual = test_parser.QueryResult.as_exception(exception)
+                                test_parser.QueryResult.assert_eq(canonic, actual)
+                                block.with_result(actual)
+                                raise QuerySuccess()
+                            else:
+                                clogger.debug("completion mode")
+                                raise QueryExecutionError(
+                                    "query execution failed with an exception",
+                                    parent=exec_res.get_exception(),
+                                )
+
+                    canonic_types = block.get_types()
+                    clogger.debug("canonic types %s", canonic_types)
+
+                    if len(exec_res.get_result()) > 0:
+                        actual_columns_count = len(exec_res.get_result()[0])
+                        canonic_columns_count = len(canonic_types)
+                        if canonic_columns_count != actual_columns_count:
+                            raise SchemeResultDiffer(
+                                "canonic and actual columns count differ",
+                                details="expected columns {}, actual columns {}".format(
+                                    canonic_columns_count, actual_columns_count
+                                ),
+                            )
+
+                    actual = test_parser.QueryResult.make_it(
+                        exec_res.get_result(), canonic_types, block.get_sort_mode(), 10
+                    )
+
+                    if self.verify:
+                        clogger.debug("verify mode")
+                        canonic = test_parser.QueryResult.parse_it(
+                            block.get_result(), 10
+                        )
+                        test_parser.QueryResult.assert_eq(canonic, actual)
+
+                    block.with_result(actual)
+                    raise QuerySuccess()
+
+                except QuerySuccess as ok:
+                    ok.set_details(
+                        file=test_file, name=test_name, pos=position, request=request
+                    )
+                    clogger.debug("query ok")
+                    block.dump_to(out_stream)
+                    yield TestStatus.from_exception(ok)
+                except Error as err:
+                    err.set_details(
+                        file=test_file, name=test_name, pos=position, request=request
+                    )
+                    clogger.warning(
+                        "Query has failed with exception: %s",
+                        err.reason,
+                    )
+                    block.with_result(test_parser.QueryResult.as_exception(err))
+                    block.dump_to(out_stream)
+                    yield TestStatus.from_exception(err)
+
+    def run_one_test(self, stream, test_name, test_file):
+        if self._input_dir is not None:
+            if not test_file.startswith(self._input_dir):
+                raise ProgramError(
+                    f"that runner instance is attached to tests in dir {self._input_dir}"
+                    f", can't run with file {test_file}"
+                )
+        else:
+            self._input_dir = os.path.dirname(test_file)
+
+        if self.report is None:
+            self.report = Report(self.dbms_name, self._input_dir)
+
+        if self.results is None:
+            self.results = dict()
+
+        with self.connection.with_one_test_scope():
+            out_stream = io.StringIO()
+            self.results[test_name] = out_stream
+
+            parser = test_parser.TestFileParser(stream, test_name, test_file)
+            for status in self.__statuses(parser, out_stream):
+                self.report.update(status)
+
+    def _assert_input_dir(self, input_dir):
+        if self._input_dir is not None:
+            if self._input_dir != input_dir:
+                raise ProgramError(
+                    f"that runner instance is attached to tests in dir {self._input_dir}"
+                    f", can't run with {input_dir}"
+                )
+
+    def run_all_tests_from_file(self, test_file, input_dir=None):
+        self._assert_input_dir(input_dir)
+        self._input_dir = input_dir
+        if self._input_dir is None:
+            self._input_dir = os.path.dirname(test_file)
+
+        test_name = os.path.relpath(test_file, start=self._input_dir)
+        logger.debug("open file %s", test_name)
+        with open(test_file, "r") as stream:
+            self.run_one_test(stream, test_name, test_file)
+
+    def run_all_tests_from_dir(self, input_dir):
+        self._assert_input_dir(input_dir)
+        self._input_dir = input_dir
+        for file_path in TestRunner.list_tests(self._input_dir):
+            self.run_all_tests_from_file(file_path, self._input_dir)
+
+    def write_results_to_dir(self, dir_path):
+        if not os.path.isdir(dir_path):
+            raise NotADirectoryError(dir_path)
+
+        self.report.assign_result_dir(dir_path)
+
+        for test_name, stream in self.results.items():
+            test_file = os.path.join(dir_path, test_name)
+            logger.info(f"create file {test_file}")
+            result_dir = os.path.dirname(test_file)
+            os.makedirs(result_dir, exist_ok=True)
+            with open(test_file, "w") as output:
+                output.write(stream.getvalue())
+
+    def write_report(self, report_dir):
+        self.report.write_report(report_dir)
+
+    @staticmethod
+    def list_tests(input_dir):
+        yield from _filter_files(".test", _list_files(input_dir))
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index bb9d4c88fa1..47dd2fc9f2d 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -14,7 +14,7 @@ add_subdirectory (config-processor)
 add_subdirectory (report)
 
 # Not used in package
-if (NOT DEFINED ENABLE_UTILS OR ENABLE_UTILS)
+if (ENABLE_UTILS)
     add_subdirectory (compressor)
     add_subdirectory (corrector_utf8)
     add_subdirectory (zookeeper-cli)
@@ -23,16 +23,8 @@ if (NOT DEFINED ENABLE_UTILS OR ENABLE_UTILS)
     add_subdirectory (wikistat-loader)
     add_subdirectory (check-marks)
     add_subdirectory (checksum-for-compressed-block)
-    add_subdirectory (wal-dump)
     add_subdirectory (check-mysql-binlog)
     add_subdirectory (keeper-bench)
-
-    if (TARGET ch_contrib::nuraft)
-        add_subdirectory (keeper-data-dumper)
-    endif ()
-
-    # memcpy_jart.S contains position dependent code
-    if (NOT CMAKE_POSITION_INDEPENDENT_CODE AND OS_LINUX AND ARCH_AMD64)
-        add_subdirectory (memcpy-bench)
-    endif ()
+    add_subdirectory (keeper-data-dumper)
+    add_subdirectory (memcpy-bench)
 endif ()
diff --git a/utils/changelog-simple/.gitignore b/utils/changelog-simple/.gitignore
deleted file mode 100644
index 78caa68e38e..00000000000
--- a/utils/changelog-simple/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.txt
-*.json
diff --git a/utils/changelog-simple/README.md b/utils/changelog-simple/README.md
deleted file mode 100644
index cd8f8da9b61..00000000000
--- a/utils/changelog-simple/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-## How To Generate Changelog
-
-Generate github token:
-* https://github.com/settings/tokens - keep all checkboxes unchecked, no scopes need to be enabled.
-
-Dependencies:
-```
-sudo apt-get install git curl jq python3 python3-fuzzywuzzy 
-```
-
-Update information about tags:
-```
-git fetch --tags
-```
-
-Usage example:
-
-```
-export GITHUB_USER=... GITHUB_TOKEN=ghp_...
-./changelog.sh v21.5.6.6-stable v21.6.2.7-prestable
-```
diff --git a/utils/changelog-simple/changelog.sh b/utils/changelog-simple/changelog.sh
deleted file mode 100755
index 52817acfae4..00000000000
--- a/utils/changelog-simple/changelog.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-set -e
-
-script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-from="$1"
-to="$2"
-log_command=(git log "$from..$to" --first-parent)
-
-"${log_command[@]}" > "changelog-log.txt"
-
-# Check for diamond merges.
-if "${log_command[@]}" --oneline --grep "Merge branch '" | grep ''
-then
-    # DO NOT ADD automated handling of diamond merges to this script.
-    # It is an unsustainable way to work with git, and it MUST be visible.
-    echo Warning: suspected diamond merges above.
-    echo Some commits will be missed, review these manually.
-fi
-
-# Search for PR numbers in commit messages. First variant is normal merge, and second
-# variant is squashed. Next are some backport message variants.
-find_prs=(sed -n "s/^.*merg[eding]*.*#\([[:digit:]]\+\).*$/\1/Ip;
-                  s/^.*(#\([[:digit:]]\+\))$/\1/p;
-                  s/^.*back[- ]*port[ed of]*.*#\([[:digit:]]\+\).*$/\1/Ip;
-                  s/^.*cherry[- ]*pick[ed of]*.*#\([[:digit:]]\+\).*$/\1/Ip")
-
-# awk is to filter out small task numbers from different task tracker, which are
-# referenced by documentation commits like '* DOCSUP-824: query log (#115)'.
-"${find_prs[@]}" "changelog-log.txt" | sort -rn | uniq | awk '$0 > 1000 { print $0 }' > "changelog-prs.txt"
-
-echo "$(wc -l < "changelog-prs.txt") PRs added between $from and $to."
-if [ $(wc -l < "changelog-prs.txt") -eq 0 ] ; then exit 0 ; fi
-
-function github_download()
-{
-    local url=${1}
-    local file=${2}
-    if ! [ -f "$file" ]
-    then
-        echo "curl -u \"$GITHUB_USER:***\" -sSf \"$url\" > \"$file\""
-
-        if ! curl -u "$GITHUB_USER:$GITHUB_TOKEN" \
-                -sSf "$url" \
-                > "$file"
-        then
-            >&2 echo "Failed to download '$url' to '$file'. Contents: '$(cat "$file")'."
-            rm "$file"
-            return 1
-        fi
-        sleep 0.1
-    fi
-}
-
-rm changelog-prs-filtered.txt &> /dev/null ||:
-for pr in $(cat "changelog-prs.txt")
-do
-    # Download PR info from github.
-    file="pr$pr.json"
-    github_download "https://api.github.com/repos/ClickHouse/ClickHouse/pulls/$pr" "$file" || continue
-
-    if ! [ "$pr" == "$(jq -r .number "$file")" ]
-    then
-        >&2 echo "Got wrong data for PR #$pr (please check and remove '$file')."
-        continue
-    fi
-
-    # Filter out PRs by bots.
-    user_login=$(jq -r .user.login "$file")
-
-    filter_bot=$(echo "$user_login" | grep -q "\[bot\]$" && echo "Skip." || echo "Ok." ||:)
-    filter_robot=$(echo "$user_login" | grep -q "robot-clickhouse" && echo "Skip." || echo "Ok." ||:)
-
-    if [ "Skip." == "$filter_robot" ] || [ "Skip." == "$filter_bot" ]
-    then
-        continue
-    fi
-
-    # Download author info from github.
-    user_id=$(jq -r .user.id "$file")
-    user_file="user$user_id.json"
-    github_download "$(jq -r .user.url "$file")" "$user_file" || continue
-
-    if ! [ "$user_id" == "$(jq -r .id "$user_file")" ]
-    then
-        >&2 echo "Got wrong data for user #$user_id (please check and remove '$user_file')."
-        continue
-    fi
-
-    echo "$pr" >> changelog-prs-filtered.txt
-done
-
-echo "### ClickHouse release $to FIXME as compared to $from
-" > changelog.md
-"$script_dir/format-changelog.py" changelog-prs-filtered.txt >> changelog.md
-cat changelog.md
diff --git a/utils/changelog-simple/format-changelog.py b/utils/changelog-simple/format-changelog.py
deleted file mode 100755
index d5e1518270e..00000000000
--- a/utils/changelog-simple/format-changelog.py
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/python3
-
-import argparse
-import collections
-import fuzzywuzzy.fuzz
-import itertools
-import json
-import os
-import re
-import sys
-
-parser = argparse.ArgumentParser(description="Format changelog for given PRs.")
-parser.add_argument(
-    "file",
-    metavar="FILE",
-    type=argparse.FileType("r", encoding="utf-8"),
-    nargs="?",
-    default=sys.stdin,
-    help="File with PR numbers, one per line.",
-)
-args = parser.parse_args()
-
-# This function mirrors the PR description checks in ClickhousePullRequestTrigger.
-# Returns False if the PR should not be mentioned changelog.
-def parse_one_pull_request(item):
-    description = item["body"]
-    # Don't skip empty lines because they delimit parts of description
-    lines = [
-        line
-        for line in [
-            x.strip() for x in (description.split("\n") if description else [])
-        ]
-    ]
-    lines = [re.sub(r"\s+", " ", l) for l in lines]
-
-    category = ""
-    entry = ""
-
-    if lines:
-        i = 0
-        while i < len(lines):
-            if re.match(r"(?i).*change\s*log\s*category", lines[i]):
-                i += 1
-                if i >= len(lines):
-                    break
-                # Can have one empty line between header and the category itself. Filter it out.
-                if not lines[i]:
-                    i += 1
-                    if i >= len(lines):
-                        break
-                category = re.sub(r"^[-*\s]*", "", lines[i])
-                i += 1
-
-            elif re.match(r"(?i).*change\s*log\s*entry", lines[i]):
-                i += 1
-                # Can have one empty line between header and the entry itself. Filter it out.
-                if i < len(lines) and not lines[i]:
-                    i += 1
-                # All following lines until empty one are the changelog entry.
-                entry_lines = []
-                while i < len(lines) and lines[i]:
-                    entry_lines.append(lines[i])
-                    i += 1
-                entry = " ".join(entry_lines)
-            else:
-                i += 1
-
-    if not category:
-        # Shouldn't happen, because description check in CI should catch such PRs.
-        # Fall through, so that it shows up in output and the user can fix it.
-        category = "NO CL CATEGORY"
-
-    # Filter out the PR categories that are not for changelog.
-    if re.match(
-        r"(?i)doc|((non|in|not|un)[-\s]*significant)|(not[ ]*for[ ]*changelog)",
-        category,
-    ):
-        return False
-
-    if not entry:
-        # Shouldn't happen, because description check in CI should catch such PRs.
-        category = "NO CL ENTRY"
-        entry = "NO CL ENTRY:  '" + item["title"] + "'"
-
-    entry = entry.strip()
-    if entry[-1] != ".":
-        entry += "."
-
-    item["entry"] = entry
-    item["category"] = category
-
-    return True
-
-
-# This array gives the preferred category order, and is also used to
-# normalize category names.
-categories_preferred_order = [
-    "Backward Incompatible Change",
-    "New Feature",
-    "Performance Improvement",
-    "Improvement",
-    "Bug Fix",
-    "Build/Testing/Packaging Improvement",
-    "Other",
-]
-
-category_to_pr = collections.defaultdict(lambda: [])
-users = {}
-for line in args.file:
-    pr = json.loads(open(f"pr{line.strip()}.json").read())
-    assert pr["number"]
-    if not parse_one_pull_request(pr):
-        continue
-
-    assert pr["category"]
-
-    # Normalize category name
-    for c in categories_preferred_order:
-        if fuzzywuzzy.fuzz.ratio(pr["category"].lower(), c.lower()) >= 90:
-            pr["category"] = c
-            break
-
-    category_to_pr[pr["category"]].append(pr)
-    user_id = pr["user"]["id"]
-    users[user_id] = json.loads(open(f"user{user_id}.json").read())
-
-
-def print_category(category):
-    print(("#### " + category))
-    print()
-    for pr in category_to_pr[category]:
-        user = users[pr["user"]["id"]]
-        user_name = user["name"] if user["name"] else user["login"]
-
-        # Substitute issue links.
-        # 1) issue number w/o markdown link
-        pr["entry"] = re.sub(
-            r"([^[])#([0-9]{4,})",
-            r"\1[#\2](https://github.com/ClickHouse/ClickHouse/issues/\2)",
-            pr["entry"],
-        )
-        # 2) issue URL w/o markdown link
-        pr["entry"] = re.sub(
-            r"([^(])https://github.com/ClickHouse/ClickHouse/issues/([0-9]{4,})",
-            r"\1[#\2](https://github.com/ClickHouse/ClickHouse/issues/\2)",
-            pr["entry"],
-        )
-
-        print(
-            f'* {pr["entry"]} [#{pr["number"]}]({pr["html_url"]}) ([{user_name}]({user["html_url"]})).'
-        )
-
-    print()
-
-
-# Print categories in preferred order
-for category in categories_preferred_order:
-    if category in category_to_pr:
-        print_category(category)
-        category_to_pr.pop(category)
-
-# Print the rest of the categories
-for category in category_to_pr:
-    print_category(category)
diff --git a/utils/changelog/changelog.py b/utils/changelog/changelog.py
index 3b66b68193b..6b70952eced 100755
--- a/utils/changelog/changelog.py
+++ b/utils/changelog/changelog.py
@@ -126,8 +126,8 @@ def get_descriptions(prs: PullRequests) -> Dict[str, List[Description]]:
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-        description="Generate a changelog in MD format between given tags. "
-        "It fetches all tags and unshallow the git repositore automatically",
+        description="Generate a changelog in Markdown format between given tags. "
+        "It fetches all tags and unshallow the git repository automatically",
     )
     parser.add_argument(
         "-v",
@@ -243,6 +243,14 @@ def generate_description(item: PullRequest, repo: Repository) -> Optional[Descri
             else:
                 i += 1
 
+    # Remove excessive bullets from the entry.
+    if re.match(r"^[\-\*] ", entry):
+        entry = entry[2:]
+
+    # Better style.
+    if re.match(r"^[a-z]", entry):
+        entry = entry.capitalize()
+
     if not category:
         # Shouldn't happen, because description check in CI should catch such PRs.
         # Fall through, so that it shows up in output and the user can fix it.
@@ -256,6 +264,14 @@ def generate_description(item: PullRequest, repo: Repository) -> Optional[Descri
         category = "NOT FOR CHANGELOG / INSIGNIFICANT"
         return Description(item.number, item.user, item.html_url, item.title, category)
 
+    # Normalize bug fixes
+    if re.match(
+        r"(?i)bug\Wfix",
+        category,
+    ):
+        category = "Bug Fix (user-visible misbehavior in an official stable release)"
+        return Description(item.number, item.user, item.html_url, item.title, category)
+
     # Filter out documentations changelog
     if re.match(
         r"(?i)doc",
diff --git a/utils/check-mysql-binlog/main.cpp b/utils/check-mysql-binlog/main.cpp
index 7dd387ba5be..68558340180 100644
--- a/utils/check-mysql-binlog/main.cpp
+++ b/utils/check-mysql-binlog/main.cpp
@@ -17,7 +17,8 @@ static DB::MySQLReplication::BinlogEventPtr parseSingleEventBody(
     std::shared_ptr<DB::MySQLReplication::TableMapEvent> & last_table_map_event, bool exist_checksum)
 {
     DB::MySQLReplication::BinlogEventPtr event;
-    DB::ReadBufferPtr limit_read_buffer = std::make_shared<DB::LimitReadBuffer>(payload, header.event_size - 19, false);
+    DB::ReadBufferPtr limit_read_buffer = std::make_shared<DB::LimitReadBuffer>(payload, header.event_size - 19,
+                                                                                /* trow_exception */ false, /* exact_limit */ std::nullopt);
     DB::ReadBufferPtr event_payload = std::make_shared<DB::MySQLBinlogEventReadBuffer>(*limit_read_buffer, exist_checksum ? 4 : 0);
 
     switch (header.type)
diff --git a/utils/check-style/aspell-ignore/en/aspell-dict.txt b/utils/check-style/aspell-ignore/en/aspell-dict.txt
index 1ad7432a5bf..65844a4946e 100644
--- a/utils/check-style/aspell-ignore/en/aspell-dict.txt
+++ b/utils/check-style/aspell-ignore/en/aspell-dict.txt
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 484
+personal_ws-1.1 en 543
 AArch
 ACLs
 AMQP
@@ -24,7 +24,9 @@ CapnProto
 CentOS
 ClickHouse
 ClickHouse's
+ClickableSquare
 CodeBlock
+CodeLLDB
 Config
 ConnectionDetails
 Contrib
@@ -52,13 +54,14 @@ HDDs
 Heredoc
 Homebrew
 Homebrew's
+HorizontalDivide
 Hostname
+INSERTed
 IPv
 IntN
 Integrations
-invariants
-JSONAsString
 JSONAsObject
+JSONAsString
 JSONColumns
 JSONColumnsWithMetadata
 JSONCompact
@@ -82,13 +85,17 @@ Jemalloc
 Jepsen
 KDevelop
 LGPL
+LLDB
+LLVM's
 LOCALTIME
 LOCALTIMESTAMP
 LibFuzzer
 LineAsString
+LinksDeployment
 LowCardinality
 MEMTABLE
 MSan
+MVCC
 MacOS
 Memcheck
 MemorySanitizer
@@ -104,14 +111,17 @@ NULLIF
 NVME
 NYPD
 NuRaft
-ObjectId
-Ok
 OLAP
 OLTP
+ObjectId
+Observability
+Ok
+OpenSSL
 OpenSUSE
 OpenStack
 OpenTelemetry
 PAAMAYIM
+ParquetMetadata
 Parsers
 Postgres
 Precompiled
@@ -119,6 +129,7 @@ PrettyCompact
 PrettyCompactMonoBlock
 PrettyCompactNoEscapes
 PrettyCompactNoEscapesMonoBlock
+PrettyJSONEachRow
 PrettyMonoBlock
 PrettyNoEscapes
 PrettyNoEscapesMonoBlock
@@ -128,10 +139,10 @@ PrettySpaceNoEscapes
 PrettySpaceNoEscapesMonoBlock
 Protobuf
 ProtobufSingle
+QEMU
 QTCreator
 QueryCacheHits
 QueryCacheMisses
-QEMU
 RBAC
 RawBLOB
 RedHat
@@ -141,8 +152,10 @@ RowBinaryWithNames
 RowBinaryWithNamesAndTypes
 Runtime
 SATA
+SELECTs
 SERIALIZABLE
 SIMD
+SLES
 SMALLINT
 SQLInsert
 SQLSTATE
@@ -167,6 +180,8 @@ Testflows
 Tgz
 Toolset
 Tradeoff
+Transactional
+TwoColumnList
 UBSan
 UInt
 UIntN
@@ -176,16 +191,18 @@ Updatable
 Util
 Valgrind
 Vectorized
+VideoContainer
+ViewAllLink
 VirtualBox
 Werror
+WithNamesAndTypes
 Woboq
 WriteBuffer
 WriteBuffers
-WithNamesAndTypes
 XCode
 YAML
-Yasm
 YYYY
+Yasm
 Zipkin
 ZooKeeper
 ZooKeeper's
@@ -195,11 +212,13 @@ analytics
 anonymized
 ansi
 async
+atomicity
 autogeneration
 autostart
 avro
 avx
 aws
+backend
 backoff
 backticks
 benchmarking
@@ -275,6 +294,7 @@ dmesg
 dont
 dragonbox
 durations
+encodings
 endian
 enum
 exFAT
@@ -286,6 +306,7 @@ flatbuffers
 fmtlib
 formatschema
 formatter
+fsync
 fuzzer
 fuzzers
 gRPC
@@ -309,6 +330,7 @@ instantiation
 integrational
 integrations
 interserver
+invariants
 jdbc
 jemalloc
 json
@@ -333,8 +355,8 @@ jsonstringseachrowwithprogress
 kafka
 kafkacat
 konsole
-latencies
 laion
+latencies
 lexicographically
 libFuzzer
 libc
@@ -358,11 +380,13 @@ linearizability
 linearizable
 lineasstring
 linefeeds
+lineorder
 linux
 llvm
 localhost
 macOS
 mariadb
+mdadm
 miniselect
 msgpack
 msgpk
@@ -373,13 +397,15 @@ mutex
 mysql
 mysqldump
 mysqljs
+natively
 noop
-nullable
 nullability
+nullable
 num
 obfuscator
 odbc
 ok
+openSUSE
 openldap
 opentelemetry
 overcommit
@@ -407,6 +433,7 @@ prettycompact
 prettycompactmonoblock
 prettycompactnoescapes
 prettycompactnoescapesmonoblock
+prettyjsoneachrow
 prettymonoblock
 prettynoescapes
 prettynoescapesmonoblock
@@ -500,6 +527,7 @@ tokenization
 toml
 toolchain
 toolset
+transactional
 transactionally
 tskv
 tsv
@@ -532,6 +560,7 @@ xcode
 xml
 xz
 zLib
+zLinux
 zkcopy
 zlib
 znodes
diff --git a/utils/check-style/check-black b/utils/check-style/check-black
index 141dcd1b406..33c463d1668 100755
--- a/utils/check-style/check-black
+++ b/utils/check-style/check-black
@@ -4,10 +4,22 @@ set -e
 
 # We check only our code, that's why we skip contrib
 GIT_ROOT=$(git rev-parse --show-cdup)
-GIT_ROOT=${GIT_ROOT:-.}
+GIT_ROOT=${GIT_ROOT:-./}
 tmp=$(mktemp)
-# Find all *.py files in the repo except the contrib directory
-find_cmd=(find "$GIT_ROOT" -name '*.py' -not -path "$GIT_ROOT/contrib/*")
+
+# Find all *.py, *.python files and executable files without extension
+# that are determined as python scripts by 'file' util
+# in the repo except the contrib directory.
+find_cmd=(
+  find "$GIT_ROOT" -type f -not -path "${GIT_ROOT}contrib/*"
+    \(
+      -name '*.py' -or -name "*.python" -or
+        \(
+          -executable -not -name "*.*" -exec sh -c 'file {} | grep -q "Python script"' \;
+        \)
+    \)
+)
+
 if ! "${find_cmd[@]}" -exec black --check --diff {} + 1>"$tmp" 2>&1; then
   # Show the result only if some files need formatting
   cat "$tmp"
@@ -16,4 +28,5 @@ if ! "${find_cmd[@]}" -exec black --check --diff {} + 1>"$tmp" 2>&1; then
   # Automatically add changed files to stage
   "${find_cmd[@]}" -exec git add -u {} + 1>/dev/null 2>&1
 fi
+
 rm "$tmp"
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index 53165d14f96..afaf2ee6d48 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -13,7 +13,7 @@
 #  and then to run formatter only for the specified files.
 
 ROOT_PATH=$(git rev-parse --show-toplevel)
-EXCLUDE_DIRS='build/|integration/|widechar_width/|glibc-compatibility/|poco/|memcpy/|consistent-hashing|benchmark|tests/'
+EXCLUDE_DIRS='build/|integration/|widechar_width/|glibc-compatibility/|poco/|memcpy/|consistent-hashing|benchmark|tests/|utils/keeper-bench/example.yaml'
 
 # From [1]:
 #     But since array_to_string_internal() in array.c still loops over array
@@ -67,6 +67,7 @@ EXTERN_TYPES_EXCLUDES=(
     ProfileEvents::Counters
     ProfileEvents::end
     ProfileEvents::increment
+    ProfileEvents::incrementForLogMessage
     ProfileEvents::getName
     ProfileEvents::Type
     ProfileEvents::TypeEnum
@@ -78,6 +79,7 @@ EXTERN_TYPES_EXCLUDES=(
 
     CurrentMetrics::add
     CurrentMetrics::sub
+    CurrentMetrics::get
     CurrentMetrics::set
     CurrentMetrics::end
     CurrentMetrics::Increment
@@ -165,7 +167,7 @@ find $ROOT_PATH/tests/queries -iname '*fail*' |
     grep . && echo 'Tests should not be named with "fail" in their names. It makes looking at the results less convenient when you search for "fail" substring in browser.'
 
 # Queries to system.query_log/system.query_thread_log should have current_database = currentDatabase() condition
-# NOTE: it is not that accuate, but at least something.
+# NOTE: it is not that accurate, but at least something.
 tests_with_query_log=( $(
     find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' -or -iname '*.j2' |
         grep -vP $EXCLUDE_DIRS |
@@ -177,6 +179,17 @@ for test_case in "${tests_with_query_log[@]}"; do
     } || echo "Queries to system.query_log/system.query_thread_log does not have current_database = currentDatabase() condition in $test_case"
 done
 
+# There shouldn't be large jumps between test numbers (since they should be consecutive)
+max_diff=$(
+    find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' -or -iname '*.j2' |
+          grep -oP '\d+\D+\K\d+' | sort -n -u | awk 's{print ($0-s) " diff " s " and " $0 }{s=$0}' | sort -n | tail -n 1
+)
+max_diff_value=( $(echo $max_diff) )
+if [[ $max_diff_value -ge 100 ]];
+then
+    echo "Too big of a difference between test numbers: $max_diff"
+fi
+
 # Queries to:
 tables_with_database_column=(
     system.tables
@@ -392,3 +405,9 @@ find $ROOT_PATH/{src,programs,utils} -name '*.h' -or -name '*.cpp' |
 
 # Check for existence of __init__.py files
 for i in "${ROOT_PATH}"/tests/integration/test_*; do FILE="${i}/__init__.py"; [ ! -f "${FILE}" ] && echo "${FILE} should exist for every integration test"; done
+
+# A small typo can lead to debug code in release builds, see https://github.com/ClickHouse/ClickHouse/pull/47647
+find $ROOT_PATH/{src,programs,utils} -name '*.h' -or -name '*.cpp' | xargs grep -l -F '#ifdef NDEBUG' | xargs -I@FILE awk '/#ifdef NDEBUG/ { inside = 1; dirty = 1 } /#endif/ { if (inside && dirty) { print "File @FILE has suspicious #ifdef NDEBUG, possibly confused with #ifndef NDEBUG" }; inside = 0 } /#else/ { dirty = 0 }' @FILE
+
+# If a user is doing dynamic or typeid cast with a pointer, and immediately dereferencing it, it is unsafe.
+find $ROOT_PATH/{src,programs,utils} -name '*.h' -or -name '*.cpp' | xargs grep --line-number -P '(dynamic|typeid)_cast<[^>]+\*>\([^\(\)]+\)->' | grep -P '.' && echo "It's suspicious when you are doing a dynamic_cast or typeid_cast with a pointer and immediately dereferencing it. Use references instead of pointers or check a pointer to nullptr."
diff --git a/utils/check-style/shellcheck-run.sh b/utils/check-style/shellcheck-run.sh
index c0063d4b191..bdb0f681c31 100755
--- a/utils/check-style/shellcheck-run.sh
+++ b/utils/check-style/shellcheck-run.sh
@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
 ROOT_PATH=$(git rev-parse --show-toplevel)
-EXCLUDE_DIRS='build/|integration/|widechar_width/|glibc-compatibility/|memcpy/|consistent-hashing/|Parsers/New'
+NPROC=$(($(nproc) + 3))
 # Check sh tests with Shellcheck
-(cd $ROOT_PATH/tests/queries/0_stateless/ && shellcheck --check-sourced --external-sources --severity info --exclude SC1071,SC2086,SC2016 *.sh ../1_stateful/*.sh)
+( cd "$ROOT_PATH/tests/queries/0_stateless/" && \
+  find "$ROOT_PATH/tests/queries/"{0_stateless,1_stateful} -name '*.sh' -print0 | \
+    xargs -0 -P "$NPROC" -n 20 shellcheck --check-sourced --external-sources --severity info --exclude SC1071,SC2086,SC2016
+)
 
 # Check docker scripts with shellcheck
-find "$ROOT_PATH/docker" -executable -type f -exec file -F'	' --mime-type {} \; | awk -F'	' '$2==" text/x-shellscript" {print $1}' | grep -v "entrypoint.alpine.sh" | grep -v "compare.sh"| xargs shellcheck
-
+find "$ROOT_PATH/docker" -executable -type f -exec file -F'	' --mime-type {} \; | \
+  awk -F'	' '$2==" text/x-shellscript" {print $1}' | \
+  grep -v "compare.sh" | \
+  xargs -P "$NPROC" -n 20 shellcheck
diff --git a/utils/checksum-for-compressed-block/main.cpp b/utils/checksum-for-compressed-block/main.cpp
index 27a2154340e..4f9923e7638 100644
--- a/utils/checksum-for-compressed-block/main.cpp
+++ b/utils/checksum-for-compressed-block/main.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
-#include <Common/hex.h>
+#include <base/hex.h>
 
 
 /** A tool to easily prove if "Checksum doesn't match: corrupted data"
diff --git a/utils/ci-slack-bot/ci-slack-bot.py b/utils/ci-slack-bot/ci-slack-bot.py
new file mode 100755
index 00000000000..6e694b4fdbd
--- /dev/null
+++ b/utils/ci-slack-bot/ci-slack-bot.py
@@ -0,0 +1,298 @@
+#!/usr/bin/env python3
+
+# A trivial stateless slack bot that notifies about new broken tests in ClickHouse CI.
+# It checks what happened to our CI during the last check_period hours (1 hour) and notifies us in slack if necessary.
+# This script should be executed once each check_period hours (1 hour).
+# It will post duplicate messages if you run it more often; it will lose some messages if you run it less often.
+#
+# You can run it locally with no arguments, it will work in a dry-run mode. Or you can set your own SLACK_URL_DEFAULT.
+# Feel free to add more checks, more details to messages, or better heuristics.
+# NOTE There's no deployment automation for now,
+# an AWS Lambda (slack-ci-bot-test lambda in CI-CD) has to be updated manually after changing this script.
+#
+# See also: https://aretestsgreenyet.com/
+
+import os
+import json
+import base64
+import random
+
+if os.environ.get("AWS_LAMBDA_ENV", "0") == "1":
+    # For AWS labmda (python 3.7)
+    from botocore.vendored import requests
+else:
+    # For running locally
+    import requests
+
+DRY_RUN_MARK = "<no url, dry run>"
+
+MAX_FAILURES_DEFAULT = 40
+SLACK_URL_DEFAULT = DRY_RUN_MARK
+
+FLAKY_ALERT_PROBABILITY = 0.20
+
+MAX_TESTS_TO_REPORT = 4
+
+# Slack has a stupid limitation on message size, it splits long messages into multiple ones breaking formatting
+MESSAGE_LENGTH_LIMIT = 4000
+
+# Find tests that failed in master during the last check_period * 24 hours,
+# but did not fail during the last 2 weeks. Assuming these tests were broken recently.
+# Counts number of failures in check_period and check_period * 24 time windows
+# to distinguish rare flaky tests from completely broken tests
+NEW_BROKEN_TESTS_QUERY = """
+WITH
+    1 AS check_period,
+    check_period * 24 AS extended_check_period,
+    now() as now
+SELECT
+    test_name,
+    any(report_url),
+    countIf((check_start_time + check_duration_ms / 1000) < now - INTERVAL check_period HOUR) AS count_prev_periods,
+    countIf((check_start_time + check_duration_ms / 1000) >= now - INTERVAL check_period HOUR) AS count
+FROM checks
+WHERE 1
+    AND check_start_time BETWEEN now - INTERVAL 1 WEEK AND now
+    AND (check_start_time + check_duration_ms / 1000) >= now - INTERVAL extended_check_period HOUR
+    AND pull_request_number = 0
+    AND test_status LIKE 'F%'
+    AND check_status != 'success'
+    AND test_name NOT IN (
+        SELECT test_name FROM checks WHERE 1
+        AND check_start_time >= now - INTERVAL 1 MONTH
+        AND (check_start_time + check_duration_ms / 1000) BETWEEN now - INTERVAL 2 WEEK AND now - INTERVAL extended_check_period HOUR 
+        AND pull_request_number = 0
+        AND check_status != 'success'
+        AND test_status LIKE 'F%')
+    AND test_context_raw NOT LIKE '%CannotSendRequest%' and test_context_raw NOT LIKE '%Server does not respond to health check%'
+GROUP BY test_name
+ORDER BY (count_prev_periods + count) DESC
+"""
+
+# Returns total number of failed checks during the last 24 hours
+# and previous value of that metric (check_period hours ago)
+COUNT_FAILURES_QUERY = """
+WITH
+    1 AS check_period,
+    '%' AS check_name_pattern,
+    now() as now
+SELECT
+    countIf((check_start_time + check_duration_ms / 1000) >= now - INTERVAL 24 HOUR) AS new_val,
+    countIf((check_start_time + check_duration_ms / 1000) <= now - INTERVAL check_period HOUR) AS prev_val
+FROM checks
+WHERE 1
+    AND check_start_time >= now - INTERVAL 1 WEEK
+    AND (check_start_time + check_duration_ms / 1000) >= now - INTERVAL 24 + check_period HOUR
+    AND pull_request_number = 0
+    AND test_status LIKE 'F%'
+    AND check_status != 'success'
+    AND check_name ILIKE check_name_pattern
+"""
+
+# It shows all recent failures of the specified test (helps to find when it started)
+ALL_RECENT_FAILURES_QUERY = """
+WITH
+    '{}' AS name_substr,
+    90 AS interval_days,
+    ('Stateless tests (asan)', 'Stateless tests (address)', 'Stateless tests (address, actions)') AS backport_and_release_specific_checks
+SELECT
+    toStartOfDay(check_start_time) AS d,
+    count(),
+    groupUniqArray(pull_request_number) AS prs,
+    any(report_url)
+FROM checks
+WHERE ((now() - toIntervalDay(interval_days)) <= check_start_time) AND (pull_request_number NOT IN (
+    SELECT pull_request_number AS prn
+    FROM checks
+    WHERE (prn != 0) AND ((now() - toIntervalDay(interval_days)) <= check_start_time) AND (check_name IN (backport_and_release_specific_checks))
+)) AND (position(test_name, name_substr) > 0) AND (test_status IN ('FAIL', 'ERROR', 'FLAKY'))
+GROUP BY d
+ORDER BY d DESC
+"""
+
+SLACK_MESSAGE_JSON = {"type": "mrkdwn", "text": None}
+
+
+def get_play_url(query):
+    return (
+        "https://play.clickhouse.com/play?user=play#"
+        + base64.b64encode(query.encode()).decode()
+    )
+
+
+def run_clickhouse_query(query):
+    url = "https://play.clickhouse.com/?user=play&query=" + requests.utils.quote(query)
+    res = requests.get(url)
+    if res.status_code != 200:
+        print("Failed to execute query: ", res.status_code, res.content)
+        raise Exception(
+            "Failed to execute query: {}: {}".format(res.status_code, res.content)
+        )
+
+    lines = res.text.strip().splitlines()
+    return [x.split("\t") for x in lines]
+
+
+def split_broken_and_flaky_tests(failed_tests):
+    if not failed_tests:
+        return None
+
+    broken_tests = []
+    flaky_tests = []
+    for name, report, count_prev_str, count_str in failed_tests:
+        count_prev, count = int(count_prev_str), int(count_str)
+        if (2 <= count and count_prev < 2) or (count_prev == 1 and count == 1):
+            # It failed 2 times or more within extended time window, it's definitely broken.
+            # 2 <= count_prev means that it was not reported as broken on previous runs
+            broken_tests.append([name, report])
+        elif 0 < count and count_prev == 0:
+            # It failed only once, can be a rare flaky test
+            flaky_tests.append([name, report])
+
+    return broken_tests, flaky_tests
+
+
+def format_failed_tests_list(failed_tests, failure_type):
+    if len(failed_tests) == 1:
+        res = "There is a new {} test:\n".format(failure_type)
+    else:
+        res = "There are {} new {} tests:\n".format(len(failed_tests), failure_type)
+
+    for name, report in failed_tests[:MAX_TESTS_TO_REPORT]:
+        cidb_url = get_play_url(ALL_RECENT_FAILURES_QUERY.format(name))
+        res += "-   *{}*  -  <{}|Report>  -  <{}|CI DB> \n".format(
+            name, report, cidb_url
+        )
+
+    if MAX_TESTS_TO_REPORT < len(failed_tests):
+        res += "-   and {} other tests... :this-is-fine-fire:".format(
+            len(failed_tests) - MAX_TESTS_TO_REPORT
+        )
+
+    return res
+
+
+def get_new_broken_tests_message(failed_tests):
+    if not failed_tests:
+        return None
+
+    broken_tests, flaky_tests = split_broken_and_flaky_tests(failed_tests)
+    if len(broken_tests) == 0 and len(flaky_tests) == 0:
+        return None
+
+    msg = ""
+    if len(broken_tests) > 0:
+        msg += format_failed_tests_list(broken_tests, "*BROKEN*")
+    elif random.random() > FLAKY_ALERT_PROBABILITY:
+        looks_like_fuzzer = [x[0].count(" ") > 2 for x in flaky_tests]
+        if not any(looks_like_fuzzer):
+            print("Will not report flaky tests to avoid noise: ", flaky_tests)
+            return None
+
+    if len(flaky_tests) > 0:
+        if len(msg) > 0:
+            msg += "\n"
+        msg += format_failed_tests_list(flaky_tests, "flaky")
+
+    return msg
+
+
+def get_too_many_failures_message_impl(failures_count):
+    MAX_FAILURES = int(os.environ.get("MAX_FAILURES", MAX_FAILURES_DEFAULT))
+    curr_failures = int(failures_count[0][0])
+    prev_failures = int(failures_count[0][1])
+    if curr_failures == 0 and prev_failures != 0:
+        return (
+            "Looks like CI is completely broken: there are *no failures* at all... 0_o"
+        )
+    if curr_failures < MAX_FAILURES:
+        return None
+    if prev_failures < MAX_FAILURES:
+        return ":alert: *CI is broken: there are {} failures during the last 24 hours*".format(
+            curr_failures
+        )
+    if curr_failures < prev_failures:
+        return None
+    if (curr_failures - prev_failures) / prev_failures < 0.2:
+        return None
+    return "CI is broken and it's getting worse: there are {} failures during the last 24 hours".format(
+        curr_failures
+    )
+
+
+def get_too_many_failures_message(failures_count):
+    msg = get_too_many_failures_message_impl(failures_count)
+    if msg:
+        msg += "\nSee https://aretestsgreenyet.com/"
+    return msg
+
+
+def split_slack_message(long_message):
+    lines = long_message.split("\n")
+    messages = []
+    curr_msg = ""
+    for line in lines:
+        if len(curr_msg) + len(line) < MESSAGE_LENGTH_LIMIT:
+            curr_msg += "\n"
+            curr_msg += line
+        else:
+            messages.append(curr_msg)
+            curr_msg = line
+    messages.append(curr_msg)
+    return messages
+
+
+def send_to_slack_impl(message):
+    SLACK_URL = os.environ.get("SLACK_URL", SLACK_URL_DEFAULT)
+    if SLACK_URL == DRY_RUN_MARK:
+        return
+
+    payload = SLACK_MESSAGE_JSON.copy()
+    payload["text"] = message
+    res = requests.post(SLACK_URL, json.dumps(payload))
+    if res.status_code != 200:
+        print("Failed to send a message to Slack: ", res.status_code, res.content)
+        raise Exception(
+            "Failed to send a message to Slack: {}: {}".format(
+                res.status_code, res.content
+            )
+        )
+
+
+def send_to_slack(message):
+    messages = split_slack_message(message)
+    for msg in messages:
+        send_to_slack_impl(msg)
+
+
+def query_and_alert_if_needed(query, get_message_func):
+    query_res = run_clickhouse_query(query)
+    print("Got result {} for query {}", query_res, query)
+    msg = get_message_func(query_res)
+    if msg is None:
+        return
+
+    msg += "\nCI DB query: <{}|link>".format(get_play_url(query))
+    print("Sending message to slack:", msg)
+    send_to_slack(msg)
+
+
+def check_and_alert():
+    query_and_alert_if_needed(NEW_BROKEN_TESTS_QUERY, get_new_broken_tests_message)
+    query_and_alert_if_needed(COUNT_FAILURES_QUERY, get_too_many_failures_message)
+
+
+def lambda_handler(event, context):
+    try:
+        check_and_alert()
+        return {"statusCode": 200, "body": "OK"}
+    except Exception as e:
+        send_to_slack(
+            "I failed, please help me (see ClickHouse/utils/ci-slack-bot/ci-slack-bot.py): "
+            + str(e)
+        )
+        return {"statusCode": 200, "body": "FAIL"}
+
+
+if __name__ == "__main__":
+    check_and_alert()
diff --git a/utils/clickhouse-diagnostics/clickhouse-diagnostics b/utils/clickhouse-diagnostics/clickhouse-diagnostics
index cf65e4efbfb..5cacbf1d4d4 100755
--- a/utils/clickhouse-diagnostics/clickhouse-diagnostics
+++ b/utils/clickhouse-diagnostics/clickhouse-diagnostics
@@ -19,9 +19,9 @@ import tenacity
 import xmltodict
 import yaml
 
-SELECT_VERSION = r'SELECT version()'
+SELECT_VERSION = r"SELECT version()"
 
-SELECT_UPTIME = r'''
+SELECT_UPTIME = r"""
 {% if version_ge('21.3') -%}
 SELECT formatReadableTimeDelta(uptime())
 {% else -%}
@@ -29,18 +29,18 @@ SELECT
     toString(floor(uptime() / 3600 / 24)) || ' days ' ||
     toString(floor(uptime() % (24 * 3600) / 3600, 1)) || ' hours'
 {% endif -%}
-'''
+"""
 
 SELECT_SYSTEM_TABLES = "SELECT name FROM system.tables WHERE database = 'system'"
 
-SELECT_DATABASE_ENGINES = r'''SELECT
+SELECT_DATABASE_ENGINES = r"""SELECT
     engine,
     count() "count"
 FROM system.databases
 GROUP BY engine
-'''
+"""
 
-SELECT_DATABASES = r'''SELECT
+SELECT_DATABASES = r"""SELECT
     name,
     engine,
     tables,
@@ -62,17 +62,17 @@ LEFT JOIN
 ) AS db_stats ON db.name = db_stats.database
 ORDER BY bytes_on_disk DESC
 LIMIT 10
-'''
+"""
 
-SELECT_TABLE_ENGINES = r'''SELECT
+SELECT_TABLE_ENGINES = r"""SELECT
     engine,
     count() "count"
 FROM system.tables
 WHERE database != 'system'
 GROUP BY engine
-'''
+"""
 
-SELECT_DICTIONARIES = r'''SELECT
+SELECT_DICTIONARIES = r"""SELECT
     source,
     type,
     status,
@@ -80,13 +80,13 @@ SELECT_DICTIONARIES = r'''SELECT
 FROM system.dictionaries
 GROUP BY source, type, status
 ORDER BY status DESC, source
-'''
+"""
 
 SELECT_ACCESS = "SHOW ACCESS"
 
 SELECT_QUOTA_USAGE = "SHOW QUOTA"
 
-SELECT_REPLICAS = r'''SELECT
+SELECT_REPLICAS = r"""SELECT
     database,
     table,
     is_leader,
@@ -98,9 +98,9 @@ SELECT_REPLICAS = r'''SELECT
 FROM system.replicas
 ORDER BY absolute_delay DESC
 LIMIT 10
-'''
+"""
 
-SELECT_REPLICATION_QUEUE = r'''SELECT
+SELECT_REPLICATION_QUEUE = r"""SELECT
     database,
     table,
     replica_name,
@@ -121,9 +121,9 @@ SELECT_REPLICATION_QUEUE = r'''SELECT
 FROM system.replication_queue
 ORDER BY create_time ASC
 LIMIT 20
-'''
+"""
 
-SELECT_REPLICATED_FETCHES = r'''SELECT
+SELECT_REPLICATED_FETCHES = r"""SELECT
     database,
     table,
     round(elapsed, 1) "elapsed",
@@ -140,9 +140,9 @@ SELECT_REPLICATED_FETCHES = r'''SELECT
     to_detached,
     thread_id
 FROM system.replicated_fetches
-'''
+"""
 
-SELECT_PARTS_PER_TABLE = r'''SELECT
+SELECT_PARTS_PER_TABLE = r"""SELECT
         database,
     table,
     count() "partitions",
@@ -162,9 +162,9 @@ FROM
 GROUP BY database, table
 ORDER BY max_parts_per_partition DESC
 LIMIT 10
-'''
+"""
 
-SELECT_MERGES = r'''SELECT
+SELECT_MERGES = r"""SELECT
     database,
     table,
     round(elapsed, 1) "elapsed",
@@ -187,9 +187,9 @@ SELECT_MERGES = r'''SELECT
     formatReadableSize(memory_usage) "memory_usage"
 {% endif -%}
 FROM system.merges
-'''
+"""
 
-SELECT_MUTATIONS = r'''SELECT
+SELECT_MUTATIONS = r"""SELECT
     database,
     table,
     mutation_id,
@@ -206,9 +206,9 @@ SELECT_MUTATIONS = r'''SELECT
 FROM system.mutations
 WHERE NOT is_done
 ORDER BY create_time DESC
-'''
+"""
 
-SELECT_RECENT_DATA_PARTS = r'''SELECT
+SELECT_RECENT_DATA_PARTS = r"""SELECT
     database,
     table,
     engine,
@@ -242,9 +242,9 @@ SELECT_RECENT_DATA_PARTS = r'''SELECT
 FROM system.parts
 WHERE modification_time > now() - INTERVAL 3 MINUTE
 ORDER BY modification_time DESC
-'''
+"""
 
-SELECT_DETACHED_DATA_PARTS = r'''SELECT
+SELECT_DETACHED_DATA_PARTS = r"""SELECT
     database,
     table,
     partition_id,
@@ -255,9 +255,9 @@ SELECT_DETACHED_DATA_PARTS = r'''SELECT
     max_block_number,
     level
 FROM system.detached_parts
-'''
+"""
 
-SELECT_PROCESSES = r'''SELECT
+SELECT_PROCESSES = r"""SELECT
     elapsed,
     query_id,
     {% if normalize_queries -%}
@@ -285,9 +285,9 @@ SELECT_PROCESSES = r'''SELECT
     {% endif -%}
 FROM system.processes
 ORDER BY elapsed DESC
-'''
+"""
 
-SELECT_TOP_QUERIES_BY_DURATION = r'''SELECT
+SELECT_TOP_QUERIES_BY_DURATION = r"""SELECT
     type,
     query_start_time,
     query_duration_ms,
@@ -339,9 +339,9 @@ WHERE type != 'QueryStart'
   AND event_time >= now() - INTERVAL 1 DAY
 ORDER BY query_duration_ms DESC
 LIMIT 10
-'''
+"""
 
-SELECT_TOP_QUERIES_BY_MEMORY_USAGE = r'''SELECT
+SELECT_TOP_QUERIES_BY_MEMORY_USAGE = r"""SELECT
     type,
     query_start_time,
     query_duration_ms,
@@ -393,9 +393,9 @@ WHERE type != 'QueryStart'
   AND event_time >= now() - INTERVAL 1 DAY
 ORDER BY memory_usage DESC
 LIMIT 10
-'''
+"""
 
-SELECT_FAILED_QUERIES = r'''SELECT
+SELECT_FAILED_QUERIES = r"""SELECT
     type,
     query_start_time,
     query_duration_ms,
@@ -448,9 +448,9 @@ WHERE type != 'QueryStart'
   AND exception != ''
 ORDER BY query_start_time DESC
 LIMIT 10
-'''
+"""
 
-SELECT_STACK_TRACES = r'''SELECT
+SELECT_STACK_TRACES = r"""SELECT
     '\n' || arrayStringConcat(
        arrayMap(
            x,
@@ -459,9 +459,9 @@ SELECT_STACK_TRACES = r'''SELECT
            arrayMap(x -> demangle(addressToSymbol(x)), trace)),
        '\n') AS trace
 FROM system.stack_trace
-'''
+"""
 
-SELECT_CRASH_LOG = r'''SELECT
+SELECT_CRASH_LOG = r"""SELECT
     event_time,
     signal,
     thread_id,
@@ -470,7 +470,7 @@ SELECT_CRASH_LOG = r'''SELECT
     version
 FROM system.crash_log
 ORDER BY event_time DESC
-'''
+"""
 
 
 def retry(exception_types, max_attempts=5, max_interval=5):
@@ -481,7 +481,8 @@ def retry(exception_types, max_attempts=5, max_interval=5):
         retry=tenacity.retry_if_exception_type(exception_types),
         wait=tenacity.wait_random_exponential(multiplier=0.5, max=max_interval),
         stop=tenacity.stop_after_attempt(max_attempts),
-        reraise=True)
+        reraise=True,
+    )
 
 
 class ClickhouseError(Exception):
@@ -502,9 +503,9 @@ class ClickhouseClient:
     def __init__(self, *, host="localhost", port=8123, user="default", password):
         self._session = requests.Session()
         if user:
-            self._session.headers['X-ClickHouse-User'] = user
-            self._session.headers['X-ClickHouse-Key'] = password
-        self._url = f'http://{host}:{port}'
+            self._session.headers["X-ClickHouse-User"] = user
+            self._session.headers["X-ClickHouse-Key"] = password
+        self._url = f"http://{host}:{port}"
         self._timeout = 60
         self._ch_version = None
 
@@ -516,7 +517,16 @@ class ClickhouseClient:
         return self._ch_version
 
     @retry(requests.exceptions.ConnectionError)
-    def query(self, query, query_args=None, format=None, post_data=None, timeout=None, echo=False, dry_run=False):
+    def query(
+        self,
+        query,
+        query_args=None,
+        format=None,
+        post_data=None,
+        timeout=None,
+        echo=False,
+        dry_run=False,
+    ):
         """
         Execute query.
         """
@@ -524,28 +534,30 @@ class ClickhouseClient:
             query = self.render_query(query, **query_args)
 
         if format:
-            query += f' FORMAT {format}'
+            query += f" FORMAT {format}"
 
         if timeout is None:
             timeout = self._timeout
 
         if echo:
-            print(sqlparse.format(query, reindent=True), '\n')
+            print(sqlparse.format(query, reindent=True), "\n")
 
         if dry_run:
             return None
 
         try:
-            response = self._session.post(self._url,
-                                          params={
-                                              'query': query,
-                                          },
-                                          json=post_data,
-                                          timeout=timeout)
+            response = self._session.post(
+                self._url,
+                params={
+                    "query": query,
+                },
+                json=post_data,
+                timeout=timeout,
+            )
 
             response.raise_for_status()
 
-            if format in ('JSON', 'JSONCompact'):
+            if format in ("JSON", "JSONCompact"):
                 return response.json()
 
             return response.text.strip()
@@ -555,7 +567,9 @@ class ClickhouseClient:
     def render_query(self, query, **kwargs):
         env = jinja2.Environment()
 
-        env.globals['version_ge'] = lambda version: version_ge(self.clickhouse_version, version)
+        env.globals["version_ge"] = lambda version: version_ge(
+            self.clickhouse_version, version
+        )
 
         template = env.from_string(query)
         return template.render(kwargs)
@@ -578,11 +592,13 @@ class ClickhouseConfig:
 
     @classmethod
     def load(cls):
-        return ClickhouseConfig(cls._load_config('/var/lib/clickhouse/preprocessed_configs/config.xml'))
+        return ClickhouseConfig(
+            cls._load_config("/var/lib/clickhouse/preprocessed_configs/config.xml")
+        )
 
     @staticmethod
     def _load_config(config_path):
-        with open(config_path, 'r') as file:
+        with open(config_path, "r") as file:
             return xmltodict.parse(file.read())
 
     @classmethod
@@ -591,8 +607,8 @@ class ClickhouseConfig:
             for key, value in list(config.items()):
                 if isinstance(value, MutableMapping):
                     cls._mask_secrets(config[key])
-                elif key in ('password', 'secret_access_key', 'header', 'identity'):
-                    config[key] = '*****'
+                elif key in ("password", "secret_access_key", "header", "identity"):
+                    config[key] = "*****"
 
 
 class DiagnosticsData:
@@ -603,53 +619,53 @@ class DiagnosticsData:
     def __init__(self, args):
         self.args = args
         self.host = args.host
-        self._sections = [{'section': None, 'data': {}}]
+        self._sections = [{"section": None, "data": {}}]
 
     def add_string(self, name, value, section=None):
         self._section(section)[name] = {
-            'type': 'string',
-            'value': value,
+            "type": "string",
+            "value": value,
         }
 
     def add_xml_document(self, name, document, section=None):
         self._section(section)[name] = {
-            'type': 'xml',
-            'value': document,
+            "type": "xml",
+            "value": document,
         }
 
     def add_query(self, name, query, result, section=None):
         self._section(section)[name] = {
-            'type': 'query',
-            'query': query,
-            'result': result,
+            "type": "query",
+            "query": query,
+            "result": result,
         }
 
     def add_command(self, name, command, result, section=None):
         self._section(section)[name] = {
-            'type': 'command',
-            'command': command,
-            'result': result,
+            "type": "command",
+            "command": command,
+            "result": result,
         }
 
     def dump(self, format):
-        if format.startswith('json'):
+        if format.startswith("json"):
             result = self._dump_json()
-        elif format.startswith('yaml'):
+        elif format.startswith("yaml"):
             result = self._dump_yaml()
         else:
             result = self._dump_wiki()
 
-        if format.endswith('.gz'):
-            compressor = gzip.GzipFile(mode='wb', fileobj=sys.stdout.buffer)
+        if format.endswith(".gz"):
+            compressor = gzip.GzipFile(mode="wb", fileobj=sys.stdout.buffer)
             compressor.write(result.encode())
         else:
             print(result)
 
     def _section(self, name=None):
-        if self._sections[-1]['section'] != name:
-            self._sections.append({'section': name, 'data': {}})
+        if self._sections[-1]["section"] != name:
+            self._sections.append({"section": name, "data": {}})
 
-        return self._sections[-1]['data']
+        return self._sections[-1]["data"]
 
     def _dump_json(self):
         """
@@ -669,85 +685,85 @@ class DiagnosticsData:
         """
 
         def _write_title(buffer, value):
-            buffer.write(f'### {value}\n')
+            buffer.write(f"### {value}\n")
 
         def _write_subtitle(buffer, value):
-            buffer.write(f'#### {value}\n')
+            buffer.write(f"#### {value}\n")
 
         def _write_string_item(buffer, name, item):
-            value = item['value']
-            if value != '':
-                value = f'**{value}**'
-            buffer.write(f'{name}: {value}\n')
+            value = item["value"]
+            if value != "":
+                value = f"**{value}**"
+            buffer.write(f"{name}: {value}\n")
 
         def _write_xml_item(buffer, section_name, name, item):
             if section_name:
-                buffer.write(f'##### {name}\n')
+                buffer.write(f"##### {name}\n")
             else:
                 _write_subtitle(buffer, name)
 
-            _write_result(buffer, item['value'], format='XML')
+            _write_result(buffer, item["value"], format="XML")
 
         def _write_query_item(buffer, section_name, name, item):
             if section_name:
-                buffer.write(f'##### {name}\n')
+                buffer.write(f"##### {name}\n")
             else:
                 _write_subtitle(buffer, name)
 
-            _write_query(buffer, item['query'])
-            _write_result(buffer, item['result'])
+            _write_query(buffer, item["query"])
+            _write_result(buffer, item["result"])
 
         def _write_command_item(buffer, section_name, name, item):
             if section_name:
-                buffer.write(f'##### {name}\n')
+                buffer.write(f"##### {name}\n")
             else:
                 _write_subtitle(buffer, name)
 
-            _write_command(buffer, item['command'])
-            _write_result(buffer, item['result'])
+            _write_command(buffer, item["command"])
+            _write_result(buffer, item["result"])
 
         def _write_unknown_item(buffer, section_name, name, item):
             if section_name:
-                buffer.write(f'**{name}**\n')
+                buffer.write(f"**{name}**\n")
             else:
                 _write_subtitle(buffer, name)
 
             json.dump(item, buffer, indent=2)
 
         def _write_query(buffer, query):
-            buffer.write('**query**\n')
-            buffer.write('```sql\n')
+            buffer.write("**query**\n")
+            buffer.write("```sql\n")
             buffer.write(query)
-            buffer.write('\n```\n')
+            buffer.write("\n```\n")
 
         def _write_command(buffer, command):
-            buffer.write('**command**\n')
-            buffer.write('```\n')
+            buffer.write("**command**\n")
+            buffer.write("```\n")
             buffer.write(command)
-            buffer.write('\n```\n')
+            buffer.write("\n```\n")
 
         def _write_result(buffer, result, format=None):
-            buffer.write('**result**\n')
-            buffer.write(f'```{format}\n' if format else '```\n')
+            buffer.write("**result**\n")
+            buffer.write(f"```{format}\n" if format else "```\n")
             buffer.write(result)
-            buffer.write('\n```\n')
+            buffer.write("\n```\n")
 
         buffer = io.StringIO()
 
-        _write_title(buffer, f'Diagnostics data for host {self.host}')
+        _write_title(buffer, f"Diagnostics data for host {self.host}")
         for section in self._sections:
-            section_name = section['section']
+            section_name = section["section"]
             if section_name:
                 _write_subtitle(buffer, section_name)
 
-            for name, item in section['data'].items():
-                if item['type'] == 'string':
+            for name, item in section["data"].items():
+                if item["type"] == "string":
                     _write_string_item(buffer, name, item)
-                elif item['type'] == 'query':
+                elif item["type"] == "query":
                     _write_query_item(buffer, section_name, name, item)
-                elif item['type'] == 'command':
+                elif item["type"] == "command":
                     _write_command_item(buffer, section_name, name, item)
-                elif item['type'] == 'xml':
+                elif item["type"] == "xml":
                     _write_xml_item(buffer, section_name, name, item)
                 else:
                     _write_unknown_item(buffer, section_name, name, item)
@@ -760,126 +776,196 @@ def main():
     Program entry point.
     """
     args = parse_args()
-    timestamp = datetime.strftime(datetime.now(), '%Y-%m-%d %H:%M:%S')
-    client = ClickhouseClient(host=args.host, port=args.port, user=args.user, password=args.password)
+    timestamp = datetime.strftime(datetime.now(), "%Y-%m-%d %H:%M:%S")
+    client = ClickhouseClient(
+        host=args.host, port=args.port, user=args.user, password=args.password
+    )
     ch_config = ClickhouseConfig.load()
     version = client.clickhouse_version
-    system_tables = [row[0] for row in execute_query(client, SELECT_SYSTEM_TABLES, format='JSONCompact')['data']]
+    system_tables = [
+        row[0]
+        for row in execute_query(client, SELECT_SYSTEM_TABLES, format="JSONCompact")[
+            "data"
+        ]
+    ]
 
     diagnostics = DiagnosticsData(args)
-    diagnostics.add_string('Version', version)
-    diagnostics.add_string('Timestamp', timestamp)
-    diagnostics.add_string('Uptime', execute_query(client, SELECT_UPTIME))
+    diagnostics.add_string("Version", version)
+    diagnostics.add_string("Timestamp", timestamp)
+    diagnostics.add_string("Uptime", execute_query(client, SELECT_UPTIME))
 
-    diagnostics.add_xml_document('ClickHouse configuration', ch_config.dump())
+    diagnostics.add_xml_document("ClickHouse configuration", ch_config.dump())
 
-    if version_ge(version, '20.8'):
-        add_query(diagnostics, 'Access configuration',
-                  client=client,
-                  query=SELECT_ACCESS,
-                  format='TSVRaw')
-        add_query(diagnostics, 'Quotas',
-                  client=client,
-                  query=SELECT_QUOTA_USAGE,
-                  format='Vertical')
+    if version_ge(version, "20.8"):
+        add_query(
+            diagnostics,
+            "Access configuration",
+            client=client,
+            query=SELECT_ACCESS,
+            format="TSVRaw",
+        )
+        add_query(
+            diagnostics,
+            "Quotas",
+            client=client,
+            query=SELECT_QUOTA_USAGE,
+            format="Vertical",
+        )
 
-    add_query(diagnostics, 'Database engines',
-              client=client,
-              query=SELECT_DATABASE_ENGINES,
-              format='PrettyCompactNoEscapes',
-              section='Schema')
-    add_query(diagnostics, 'Databases (top 10 by size)',
-              client=client,
-              query=SELECT_DATABASES,
-              format='PrettyCompactNoEscapes',
-              section='Schema')
-    add_query(diagnostics, 'Table engines',
-              client=client,
-              query=SELECT_TABLE_ENGINES,
-              format='PrettyCompactNoEscapes',
-              section='Schema')
-    add_query(diagnostics, 'Dictionaries',
-              client=client,
-              query=SELECT_DICTIONARIES,
-              format='PrettyCompactNoEscapes',
-              section='Schema')
+    add_query(
+        diagnostics,
+        "Database engines",
+        client=client,
+        query=SELECT_DATABASE_ENGINES,
+        format="PrettyCompactNoEscapes",
+        section="Schema",
+    )
+    add_query(
+        diagnostics,
+        "Databases (top 10 by size)",
+        client=client,
+        query=SELECT_DATABASES,
+        format="PrettyCompactNoEscapes",
+        section="Schema",
+    )
+    add_query(
+        diagnostics,
+        "Table engines",
+        client=client,
+        query=SELECT_TABLE_ENGINES,
+        format="PrettyCompactNoEscapes",
+        section="Schema",
+    )
+    add_query(
+        diagnostics,
+        "Dictionaries",
+        client=client,
+        query=SELECT_DICTIONARIES,
+        format="PrettyCompactNoEscapes",
+        section="Schema",
+    )
 
-    add_query(diagnostics, 'Replicated tables (top 10 by absolute delay)',
-              client=client,
-              query=SELECT_REPLICAS,
-              format='PrettyCompactNoEscapes',
-              section='Replication')
-    add_query(diagnostics, 'Replication queue (top 20 oldest tasks)',
-              client=client,
-              query=SELECT_REPLICATION_QUEUE,
-              format='Vertical',
-              section='Replication')
-    if version_ge(version, '21.3'):
-        add_query(diagnostics, 'Replicated fetches',
-                  client=client,
-                  query=SELECT_REPLICATED_FETCHES,
-                  format='Vertical',
-                  section='Replication')
+    add_query(
+        diagnostics,
+        "Replicated tables (top 10 by absolute delay)",
+        client=client,
+        query=SELECT_REPLICAS,
+        format="PrettyCompactNoEscapes",
+        section="Replication",
+    )
+    add_query(
+        diagnostics,
+        "Replication queue (top 20 oldest tasks)",
+        client=client,
+        query=SELECT_REPLICATION_QUEUE,
+        format="Vertical",
+        section="Replication",
+    )
+    if version_ge(version, "21.3"):
+        add_query(
+            diagnostics,
+            "Replicated fetches",
+            client=client,
+            query=SELECT_REPLICATED_FETCHES,
+            format="Vertical",
+            section="Replication",
+        )
 
-    add_query(diagnostics, 'Top 10 tables by max parts per partition',
-              client=client,
-              query=SELECT_PARTS_PER_TABLE,
-              format='PrettyCompactNoEscapes')
-    add_query(diagnostics, 'Merges in progress',
-              client=client,
-              query=SELECT_MERGES,
-              format='Vertical')
-    add_query(diagnostics, 'Mutations in progress',
-              client=client,
-              query=SELECT_MUTATIONS,
-              format='Vertical')
-    add_query(diagnostics, 'Recent data parts (modification time within last 3 minutes)',
-              client=client,
-              query=SELECT_RECENT_DATA_PARTS,
-              format='Vertical')
+    add_query(
+        diagnostics,
+        "Top 10 tables by max parts per partition",
+        client=client,
+        query=SELECT_PARTS_PER_TABLE,
+        format="PrettyCompactNoEscapes",
+    )
+    add_query(
+        diagnostics,
+        "Merges in progress",
+        client=client,
+        query=SELECT_MERGES,
+        format="Vertical",
+    )
+    add_query(
+        diagnostics,
+        "Mutations in progress",
+        client=client,
+        query=SELECT_MUTATIONS,
+        format="Vertical",
+    )
+    add_query(
+        diagnostics,
+        "Recent data parts (modification time within last 3 minutes)",
+        client=client,
+        query=SELECT_RECENT_DATA_PARTS,
+        format="Vertical",
+    )
 
-    add_query(diagnostics, 'system.detached_parts',
-              client=client,
-              query=SELECT_DETACHED_DATA_PARTS,
-              format='PrettyCompactNoEscapes',
-              section='Detached data')
-    add_command(diagnostics, 'Disk space usage',
-                command='du -sh -L -c /var/lib/clickhouse/data/*/*/detached/* | sort -rsh',
-                section='Detached data')
+    add_query(
+        diagnostics,
+        "system.detached_parts",
+        client=client,
+        query=SELECT_DETACHED_DATA_PARTS,
+        format="PrettyCompactNoEscapes",
+        section="Detached data",
+    )
+    add_command(
+        diagnostics,
+        "Disk space usage",
+        command="du -sh -L -c /var/lib/clickhouse/data/*/*/detached/* | sort -rsh",
+        section="Detached data",
+    )
 
-    add_query(diagnostics, 'Queries in progress (process list)',
-              client=client,
-              query=SELECT_PROCESSES,
-              format='Vertical',
-              section='Queries')
-    add_query(diagnostics, 'Top 10 queries by duration',
-              client=client,
-              query=SELECT_TOP_QUERIES_BY_DURATION,
-              format='Vertical',
-              section='Queries')
-    add_query(diagnostics, 'Top 10 queries by memory usage',
-              client=client,
-              query=SELECT_TOP_QUERIES_BY_MEMORY_USAGE,
-              format='Vertical',
-              section='Queries')
-    add_query(diagnostics, 'Last 10 failed queries',
-              client=client,
-              query=SELECT_FAILED_QUERIES,
-              format='Vertical',
-              section='Queries')
+    add_query(
+        diagnostics,
+        "Queries in progress (process list)",
+        client=client,
+        query=SELECT_PROCESSES,
+        format="Vertical",
+        section="Queries",
+    )
+    add_query(
+        diagnostics,
+        "Top 10 queries by duration",
+        client=client,
+        query=SELECT_TOP_QUERIES_BY_DURATION,
+        format="Vertical",
+        section="Queries",
+    )
+    add_query(
+        diagnostics,
+        "Top 10 queries by memory usage",
+        client=client,
+        query=SELECT_TOP_QUERIES_BY_MEMORY_USAGE,
+        format="Vertical",
+        section="Queries",
+    )
+    add_query(
+        diagnostics,
+        "Last 10 failed queries",
+        client=client,
+        query=SELECT_FAILED_QUERIES,
+        format="Vertical",
+        section="Queries",
+    )
 
-    add_query(diagnostics, 'Stack traces',
-              client=client,
-              query=SELECT_STACK_TRACES,
-              format='Vertical')
+    add_query(
+        diagnostics,
+        "Stack traces",
+        client=client,
+        query=SELECT_STACK_TRACES,
+        format="Vertical",
+    )
 
-    if 'crash_log' in system_tables:
-        add_query(diagnostics, 'Crash log',
-                  client=client,
-                  query=SELECT_CRASH_LOG,
-                  format='Vertical')
+    if "crash_log" in system_tables:
+        add_query(
+            diagnostics,
+            "Crash log",
+            client=client,
+            query=SELECT_CRASH_LOG,
+            format="Vertical",
+        )
 
-    add_command(diagnostics, 'uname', 'uname -a')
+    add_command(diagnostics, "uname", "uname -a")
 
     diagnostics.dump(args.format)
 
@@ -889,29 +975,34 @@ def parse_args():
     Parse command-line arguments.
     """
     parser = argparse.ArgumentParser()
-    parser.add_argument('--format',
-                        choices=['json', 'yaml', 'json.gz', 'yaml.gz', 'wiki', 'wiki.gz'],
-                        default='wiki')
-    parser.add_argument('--normalize-queries',
-                        action='store_true',
-                        default=False)
-    parser.add_argument('--host', dest="host", help="clickhouse host")
-    parser.add_argument('--port', dest="port", default=8123, help="clickhouse http port")
-    parser.add_argument('--user', dest="user", default="default", help="clickhouse user")
-    parser.add_argument('--password', dest="password", help="clickhouse password")
+    parser.add_argument(
+        "--format",
+        choices=["json", "yaml", "json.gz", "yaml.gz", "wiki", "wiki.gz"],
+        default="wiki",
+    )
+    parser.add_argument("--normalize-queries", action="store_true", default=False)
+    parser.add_argument("--host", dest="host", help="clickhouse host")
+    parser.add_argument(
+        "--port", dest="port", default=8123, help="clickhouse http port"
+    )
+    parser.add_argument(
+        "--user", dest="user", default="default", help="clickhouse user"
+    )
+    parser.add_argument("--password", dest="password", help="clickhouse password")
     return parser.parse_args()
 
 
 def add_query(diagnostics, name, client, query, format, section=None):
     query_args = {
-        'normalize_queries': diagnostics.args.normalize_queries,
+        "normalize_queries": diagnostics.args.normalize_queries,
     }
     query = client.render_query(query, **query_args)
     diagnostics.add_query(
         name=name,
         query=query,
         result=execute_query(client, query, render_query=False, format=format),
-        section=section)
+        section=section,
+    )
 
 
 def execute_query(client, query, render_query=True, format=None):
@@ -926,14 +1017,18 @@ def execute_query(client, query, render_query=True, format=None):
 
 def add_command(diagnostics, name, command, section=None):
     diagnostics.add_command(
-        name=name,
-        command=command,
-        result=execute_command(command),
-        section=section)
+        name=name, command=command, result=execute_command(command), section=section
+    )
 
 
 def execute_command(command, input=None):
-    proc = subprocess.Popen(command, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    proc = subprocess.Popen(
+        command,
+        shell=True,
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+    )
 
     if isinstance(input, str):
         input = input.encode()
@@ -941,7 +1036,7 @@ def execute_command(command, input=None):
     stdout, stderr = proc.communicate(input=input)
 
     if proc.returncode:
-        return f'failed with exit code {proc.returncode}\n{stderr.decode()}'
+        return f"failed with exit code {proc.returncode}\n{stderr.decode()}"
 
     return stdout.decode()
 
@@ -957,8 +1052,8 @@ def parse_version(version):
     """
     Parse version string.
     """
-    return [int(x) for x in version.strip().split('.') if x.isnumeric()]
+    return [int(x) for x in version.strip().split(".") if x.isnumeric()]
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/utils/data-lakes-importer.py b/utils/data-lakes-importer.py
new file mode 100755
index 00000000000..aa03f15b1c0
--- /dev/null
+++ b/utils/data-lakes-importer.py
@@ -0,0 +1,119 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import pyspark
+from delta import *  # pip install delta-spark
+
+# Usage example:
+# ./data-lakes-importer.py iceberg data.parquet result_path
+
+
+def get_spark_for_iceberg(result_path):
+    builder = (
+        pyspark.sql.SparkSession.builder.appName("spark_test")
+        .config(
+            "spark.jars.packages",
+            "org.apache.iceberg:iceberg-spark-runtime-3.3_2.12:1.1.0",
+        )
+        .config(
+            "spark.sql.catalog.spark_catalog",
+            "org.apache.iceberg.spark.SparkSessionCatalog",
+        )
+        .config("spark.sql.catalog.local", "org.apache.iceberg.spark.SparkCatalog")
+        .config("spark.sql.catalog.spark_catalog.type", "hadoop")
+        .config("spark.sql.catalog.spark_catalog.warehouse", result_path)
+        .master("local")
+    )
+    return builder.master("local").getOrCreate()
+
+
+def get_spark_for_delta():
+    builder = (
+        pyspark.sql.SparkSession.builder.appName("spark_test")
+        .config("spark.sql.extensions", "io.delta.sql.DeltaSparkSessionExtension")
+        .config(
+            "spark.sql.catalog.spark_catalog",
+            "org.apache.spark.sql.delta.catalog.DeltaCatalog",
+        )
+        .master("local")
+    )
+
+    return configure_spark_with_delta_pip(builder).master("local").getOrCreate()
+
+
+def get_spark_for_hudi():
+    builder = (
+        pyspark.sql.SparkSession.builder.appName("spark_test")
+        .config(
+            "spark.jars.packages",
+            "org.apache.hudi:hudi-spark3.3-bundle_2.12:0.13.0",
+        )
+        .config(
+            "org.apache.spark.sql.hudi.catalog.HoodieCatalog",
+        )
+        .config("spark.serializer", "org.apache.spark.serializer.KryoSerializer")
+        .config(
+            "spark.sql.catalog.local", "org.apache.spark.sql.hudi.catalog.HoodieCatalog"
+        )
+        .config(
+            "spark.driver.memory", "20g"
+        )  # .config('spark.sql.extensions", "org.apache.spark.sql.hudi.HoodieSparkSessionExtension')
+        .master("local")
+    )
+    return builder.master("local").getOrCreate()
+
+
+def main():
+    data_lake_name = str(sys.argv[1]).strip()
+    file_path = sys.argv[2]
+    result_path = sys.argv[3]
+
+    if not file_path.startswith("/"):
+        print(f"Expected absolute path, got relative: {file_path}")
+        exit(1)
+
+    if not result_path.startswith("/"):
+        print(f"Expected absolute path, got relative: {result_path}")
+        exit(1)
+
+    spark = None
+    if data_lake_name == "iceberg":
+        spark = get_spark_for_iceberg(result_path)
+        spark.conf.set("spark.sql.debug.maxToStringFields", 100000)
+        spark.read.load(f"file://{file_path}").writeTo("iceberg_table").using(
+            "iceberg"
+        ).create()
+    elif data_lake_name == "delta":
+        spark = get_spark_for_delta()
+        spark.conf.set("spark.sql.debug.maxToStringFields", 100000)
+        spark.read.load(f"file://{file_path}").write.mode("overwrite").option(
+            "compression", "none"
+        ).format("delta").option("delta.columnMapping.mode", "name").save(result_path)
+    elif data_lake_name == "hudi":
+        spark = get_spark_for_hudi()
+        spark.conf.set("spark.sql.debug.maxToStringFields", 100000)
+        spark.read.load(f"file://{file_path}").write.mode("overwrite").option(
+            "compression", "none"
+        ).format("hudi").option("hoodie.table.name", "hudi").option(
+            "hoodie.datasource.write.partitionpath.field", "partitionpath"
+        ).option(
+            "hoodie.datasource.write.table.name", "hudi"
+        ).option(
+            "hoodie.datasource.write.recordkey.field", "ts"
+        ).option(
+            "hoodie.datasource.write.precombine.field", "ts"
+        ).option(
+            "hoodie.datasource.write.operation", "insert_overwrite"
+        ).save(
+            result_path
+        )
+    else:
+        print(
+            f"Unknown data lake name {data_lake_name}. Support only: 'iceberg', 'delta'"
+        )
+        exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/utils/keeper-bench/CMakeLists.txt b/utils/keeper-bench/CMakeLists.txt
index 2596be4addd..49ce2068246 100644
--- a/utils/keeper-bench/CMakeLists.txt
+++ b/utils/keeper-bench/CMakeLists.txt
@@ -1,2 +1,7 @@
+if (NOT TARGET ch_contrib::rapidjson)
+    message (${RECONFIGURE_MESSAGE_LEVEL} "Not building keeper-bench due to rapidjson is disabled")
+    return()
+endif ()
+
 clickhouse_add_executable(keeper-bench Generator.cpp Runner.cpp Stats.cpp main.cpp)
-target_link_libraries(keeper-bench PRIVATE clickhouse_common_zookeeper_no_log)
+target_link_libraries(keeper-bench PRIVATE clickhouse_common_config_no_zookeeper_log ch_contrib::rapidjson)
diff --git a/utils/keeper-bench/Generator.cpp b/utils/keeper-bench/Generator.cpp
index 5d1d0f8a491..2212f7158ae 100644
--- a/utils/keeper-bench/Generator.cpp
+++ b/utils/keeper-bench/Generator.cpp
@@ -1,16 +1,18 @@
 #include "Generator.h"
+#include "Common/Exception.h"
+#include "Common/ZooKeeper/ZooKeeperCommon.h"
+#include <Common/Config/ConfigProcessor.h>
 #include <random>
 #include <filesystem>
+#include <Poco/Util/AbstractConfiguration.h>
 
 using namespace Coordination;
 using namespace zkutil;
 
-namespace DB
-{
-namespace ErrorCodes
+namespace DB::ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-}
+    extern const int BAD_ARGUMENTS;
 }
 
 namespace
@@ -38,16 +40,6 @@ std::string generateRandomString(size_t length)
 }
 }
 
-std::string generateRandomPath(const std::string & prefix, size_t length)
-{
-    return std::filesystem::path(prefix) / generateRandomString(length);
-}
-
-std::string generateRandomData(size_t size)
-{
-    return generateRandomString(size);
-}
-
 void removeRecursive(Coordination::ZooKeeper & zookeeper, const std::string & path)
 {
     namespace fs = std::filesystem;
@@ -96,126 +88,629 @@ void removeRecursive(Coordination::ZooKeeper & zookeeper, const std::string & pa
     remove_future.get();
 }
 
-
-void CreateRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+NumberGetter
+NumberGetter::fromConfig(const std::string & key, const Poco::Util::AbstractConfiguration & config, std::optional<uint64_t> default_value)
 {
-    removeRecursive(zookeeper, path_prefix);
+    NumberGetter number_getter;
 
-    auto promise = std::make_shared<std::promise<void>>();
-    auto future = promise->get_future();
-    auto create_callback = [promise] (const CreateResponse & response)
+    if (!config.has(key) && default_value.has_value())
     {
-        if (response.error != Coordination::Error::ZOK)
-            promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
-        else
-            promise->set_value();
-    };
-    zookeeper.create(path_prefix, "", false, false, default_acls, create_callback);
-    future.get();
+        number_getter.value = *default_value;
+    }
+    else if (config.has(key + ".min_value") && config.has(key + ".max_value"))
+    {
+        NumberRange range{.min_value = config.getUInt64(key + ".min_value"), .max_value = config.getUInt64(key + ".max_value")};
+        if (range.max_value <= range.min_value)
+            throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Range is invalid for key {}: [{}, {}]", key, range.min_value, range.max_value);
+        number_getter.value = range;
+    }
+    else
+    {
+        number_getter.value = config.getUInt64(key);
+    }
+
+    return number_getter;
 }
 
-ZooKeeperRequestPtr CreateRequestGenerator::generate()
+std::string NumberGetter::description() const
 {
+    if (const auto * number = std::get_if<uint64_t>(&value))
+        return std::to_string(*number);
+
+    const auto & range = std::get<NumberRange>(value);
+    return fmt::format("random value from range [{}, {}]", range.min_value, range.max_value);
+}
+
+uint64_t NumberGetter::getNumber() const
+{
+    if (const auto * number = std::get_if<uint64_t>(&value))
+        return *number;
+
+    const auto & range = std::get<NumberRange>(value);
+    static pcg64 rng(randomSeed());
+    return std::uniform_int_distribution<uint64_t>(range.min_value, range.max_value)(rng);
+}
+
+StringGetter StringGetter::fromConfig(const std::string & key, const Poco::Util::AbstractConfiguration & config)
+{
+    StringGetter string_getter;
+    if (config.has(key + ".random_string"))
+        string_getter.value
+            = NumberGetter::fromConfig(key + ".random_string.size", config);
+    else
+        string_getter.value = config.getString(key);
+
+    return string_getter;
+}
+
+void StringGetter::setString(std::string name)
+{
+    value = std::move(name);
+}
+
+std::string StringGetter::getString() const
+{
+    if (const auto * string = std::get_if<std::string>(&value))
+        return *string;
+
+    const auto number_getter = std::get<NumberGetter>(value);
+    return generateRandomString(number_getter.getNumber());
+}
+
+std::string StringGetter::description() const
+{
+    if (const auto * string = std::get_if<std::string>(&value))
+        return *string;
+
+    const auto number_getter = std::get<NumberGetter>(value);
+    return fmt::format("random string with size of {}", number_getter.description());
+}
+
+bool StringGetter::isRandom() const
+{
+    return std::holds_alternative<NumberGetter>(value);
+}
+
+PathGetter PathGetter::fromConfig(const std::string & key, const Poco::Util::AbstractConfiguration & config)
+{
+    static constexpr std::string_view path_key_string = "path";
+
+    PathGetter path_getter;
+    Poco::Util::AbstractConfiguration::Keys path_keys;
+    config.keys(key, path_keys);
+
+    for (const auto & path_key : path_keys)
+    {
+        if (!path_key.starts_with(path_key_string))
+            continue;
+
+        const auto current_path_key_string = key + "." + path_key;
+        const auto children_of_key = current_path_key_string + ".children_of";
+        if (config.has(children_of_key))
+        {
+            auto parent_node = config.getString(children_of_key);
+            if (parent_node.empty() || parent_node[0] != '/')
+                throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Invalid path for request generator: '{}'", parent_node);
+            path_getter.parent_paths.push_back(std::move(parent_node));
+        }
+        else
+        {
+            auto path = config.getString(key + "." + path_key);
+
+            if (path.empty() || path[0] != '/')
+                throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Invalid path for request generator: '{}'", path);
+
+            path_getter.paths.push_back(std::move(path));
+        }
+    }
+
+    path_getter.path_picker = std::uniform_int_distribution<size_t>(0, path_getter.paths.size() - 1);
+    return path_getter;
+}
+
+void PathGetter::initialize(Coordination::ZooKeeper & zookeeper)
+{
+    for (const auto & parent_path : parent_paths)
+    {
+        auto list_promise = std::make_shared<std::promise<ListResponse>>();
+        auto list_future = list_promise->get_future();
+        auto callback = [list_promise] (const ListResponse & response)
+        {
+            if (response.error != Coordination::Error::ZOK)
+                list_promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+            else
+                list_promise->set_value(response);
+        };
+        zookeeper.list(parent_path, ListRequestType::ALL, std::move(callback), {});
+        auto list_response = list_future.get();
+
+        for (const auto & child : list_response.names)
+            paths.push_back(std::filesystem::path(parent_path) / child);
+    }
+
+    path_picker = std::uniform_int_distribution<size_t>(0, paths.size() - 1);
+    initialized = true;
+}
+
+std::string PathGetter::getPath() const
+{
+    if (!initialized)
+        throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "PathGetter is not initialized");
+
+    if (paths.size() == 1)
+        return paths[0];
+
+    static pcg64 rng(randomSeed());
+    return paths[path_picker(rng)];
+}
+
+std::string PathGetter::description() const
+{
+    std::string description;
+    for (const auto & path : parent_paths)
+    {
+        if (!description.empty())
+            description += ", ";
+        description += fmt::format("children of {}", path);
+    }
+
+    for (const auto & path : paths)
+    {
+        if (!description.empty())
+            description += ", ";
+        description += path;
+    }
+
+    return description;
+}
+
+RequestGetter::RequestGetter(std::vector<RequestGeneratorPtr> request_generators_)
+    : request_generators(std::move(request_generators_))
+{}
+
+RequestGetter RequestGetter::fromConfig(const std::string & key, const Poco::Util::AbstractConfiguration & config, bool for_multi)
+{
+    RequestGetter request_getter;
+
+    Poco::Util::AbstractConfiguration::Keys generator_keys;
+    config.keys(key, generator_keys);
+
+    bool use_weights = false;
+    size_t weight_sum = 0;
+    auto & generators = request_getter.request_generators;
+    for (const auto & generator_key : generator_keys)
+    {
+        RequestGeneratorPtr request_generator;
+
+        if (generator_key.starts_with("create"))
+            request_generator = std::make_unique<CreateRequestGenerator>();
+        else if (generator_key.starts_with("set"))
+            request_generator = std::make_unique<SetRequestGenerator>();
+        else if (generator_key.starts_with("get"))
+            request_generator = std::make_unique<GetRequestGenerator>();
+        else if (generator_key.starts_with("list"))
+            request_generator = std::make_unique<ListRequestGenerator>();
+        else if (generator_key.starts_with("multi"))
+        {
+            if (for_multi)
+                throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Nested multi requests are not allowed");
+            request_generator = std::make_unique<MultiRequestGenerator>();
+        }
+        else
+        {
+            if (for_multi)
+                continue;
+
+            throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Unknown generator {}", key + "." + generator_key);
+        }
+
+        request_generator->getFromConfig(key + "." + generator_key, config);
+
+        auto weight = request_generator->getWeight();
+        use_weights |= weight != 1;
+        weight_sum += weight;
+
+        generators.push_back(std::move(request_generator));
+    }
+
+    if (generators.empty())
+        throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "No request generators found in config for key '{}'", key);
+
+
+    size_t max_value = use_weights ? weight_sum - 1 : generators.size() - 1;
+    request_getter.request_generator_picker = std::uniform_int_distribution<size_t>(0, max_value);
+
+    /// construct weight vector
+    if (use_weights)
+    {
+        auto & weights = request_getter.weights;
+        weights.reserve(generators.size());
+        weights.push_back(generators[0]->getWeight() - 1);
+
+        for (size_t i = 1; i < generators.size(); ++i)
+            weights.push_back(weights.back() + generators[i]->getWeight());
+    }
+
+    return request_getter;
+}
+
+RequestGeneratorPtr RequestGetter::getRequestGenerator() const
+{
+    static pcg64 rng(randomSeed());
+
+    auto random_number = request_generator_picker(rng);
+
+    if (weights.empty())
+        return request_generators[random_number];
+
+    for (size_t i = 0; i < request_generators.size(); ++i)
+    {
+        if (random_number <= weights[i])
+            return request_generators[i];
+    }
+
+    throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Invalid number generated: {}", random_number);
+}
+
+std::string RequestGetter::description() const
+{
+    std::string guard(30, '-');
+    std::string description = guard;
+
+    for (const auto & request_generator : request_generators)
+        description += fmt::format("\n{}\n", request_generator->description());
+    return description + guard;
+}
+
+void RequestGetter::startup(Coordination::ZooKeeper & zookeeper)
+{
+    for (const auto & request_generator : request_generators)
+        request_generator->startup(zookeeper);
+}
+
+const std::vector<RequestGeneratorPtr> & RequestGetter::requestGenerators() const
+{
+    return request_generators;
+}
+
+void RequestGenerator::getFromConfig(const std::string & key, const Poco::Util::AbstractConfiguration & config)
+{
+    if (config.has(key + ".weight"))
+        weight = config.getUInt64(key + ".weight");
+    getFromConfigImpl(key, config);
+}
+
+std::string RequestGenerator::description()
+{
+    std::string weight_string = weight == 1 ? "" : fmt::format("\n- weight: {}", weight);
+    return fmt::format("{}{}", descriptionImpl(), weight_string);
+}
+
+Coordination::ZooKeeperRequestPtr RequestGenerator::generate(const Coordination::ACLs & acls)
+{
+    return generateImpl(acls);
+}
+
+void RequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+{
+    startupImpl(zookeeper);
+}
+
+size_t RequestGenerator::getWeight() const
+{
+    return weight;
+}
+
+CreateRequestGenerator::CreateRequestGenerator()
+    : rng(randomSeed())
+    , remove_picker(0, 1.0)
+{}
+
+void CreateRequestGenerator::getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config)
+{
+    parent_path = PathGetter::fromConfig(key, config);
+
+    name = StringGetter(NumberGetter::fromConfig(key + ".name_length", config, 5));
+
+    if (config.has(key + ".data"))
+        data = StringGetter::fromConfig(key + ".data", config);
+
+    if (config.has(key + ".remove_factor"))
+        remove_factor = config.getDouble(key + ".remove_factor");
+}
+
+std::string CreateRequestGenerator::descriptionImpl()
+{
+    std::string data_string
+        = data.has_value() ? fmt::format("data for created nodes: {}", data->description()) : "no data for created nodes";
+    std::string remove_factor_string
+        = remove_factor.has_value() ? fmt::format("- remove factor: {}", *remove_factor) : "- without removes";
+    return fmt::format(
+        "Create Request Generator\n"
+        "- parent path(s) for created nodes: {}\n"
+        "- name for created nodes: {}\n"
+        "- {}\n"
+        "{}",
+        parent_path.description(),
+        name.description(),
+        data_string,
+        remove_factor_string);
+}
+
+void CreateRequestGenerator::startupImpl(Coordination::ZooKeeper & zookeeper)
+{
+    parent_path.initialize(zookeeper);
+}
+
+Coordination::ZooKeeperRequestPtr CreateRequestGenerator::generateImpl(const Coordination::ACLs & acls)
+{
+    if (remove_factor.has_value() && !paths_created.empty() && remove_picker(rng) < *remove_factor)
+    {
+        auto request = std::make_shared<ZooKeeperRemoveRequest>();
+        auto it = paths_created.begin();
+        request->path = *it;
+        paths_created.erase(it);
+        return request;
+    }
+
     auto request = std::make_shared<ZooKeeperCreateRequest>();
-    request->acls = default_acls;
-    size_t plength = 5;
-    if (path_length)
-        plength = *path_length;
-    auto path_candidate = generateRandomPath(path_prefix, plength);
+    request->acls = acls;
+
+    std::string path_candidate = std::filesystem::path(parent_path.getPath()) / name.getString();
 
     while (paths_created.contains(path_candidate))
-        path_candidate = generateRandomPath(path_prefix, plength);
+        path_candidate = std::filesystem::path(parent_path.getPath()) / name.getString();
 
     paths_created.insert(path_candidate);
 
-    request->path = path_candidate;
-    if (data_size)
-        request->data = generateRandomData(*data_size);
+    request->path = std::move(path_candidate);
+
+    if (data)
+        request->data = data->getString();
 
     return request;
 }
 
-
-void SetRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+void SetRequestGenerator::getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config)
 {
-    removeRecursive(zookeeper, path_prefix);
+    path = PathGetter::fromConfig(key, config);
 
-    auto promise = std::make_shared<std::promise<void>>();
-    auto future = promise->get_future();
-    auto create_callback = [promise] (const CreateResponse & response)
-    {
-        if (response.error != Coordination::Error::ZOK)
-            promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
-        else
-            promise->set_value();
-    };
-    zookeeper.create(path_prefix, "", false, false, default_acls, create_callback);
-    future.get();
+    data = StringGetter::fromConfig(key + ".data", config);
 }
 
-ZooKeeperRequestPtr SetRequestGenerator::generate()
+std::string SetRequestGenerator::descriptionImpl()
+{
+    return fmt::format(
+        "Set Request Generator\n"
+        "- path(s) to set: {}\n"
+        "- data to set: {}",
+        path.description(),
+        data.description());
+}
+
+Coordination::ZooKeeperRequestPtr SetRequestGenerator::generateImpl(const Coordination::ACLs & /*acls*/)
 {
     auto request = std::make_shared<ZooKeeperSetRequest>();
-    request->path = path_prefix;
-    request->data = generateRandomData(data_size);
-
+    request->path = path.getPath();
+    request->data = data.getString();
     return request;
 }
 
-
-void GetRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+void SetRequestGenerator::startupImpl(Coordination::ZooKeeper & zookeeper)
 {
-    auto promise = std::make_shared<std::promise<void>>();
-    auto future = promise->get_future();
-    auto create_callback = [promise] (const CreateResponse & response)
-    {
-        if (response.error != Coordination::Error::ZOK)
-            promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
-        else
-            promise->set_value();
-    };
-    zookeeper.create(path_prefix, "", false, false, default_acls, create_callback);
-    future.get();
-    size_t total_nodes = 1;
-    if (num_nodes)
-        total_nodes = *num_nodes;
-
-    for (size_t i = 0; i < total_nodes; ++i)
-    {
-        auto path = generateRandomPath(path_prefix, 5);
-        while (std::find(paths_to_get.begin(), paths_to_get.end(), path) != paths_to_get.end())
-            path = generateRandomPath(path_prefix, 5);
-
-        auto create_promise = std::make_shared<std::promise<void>>();
-        auto create_future = create_promise->get_future();
-        auto callback = [create_promise] (const CreateResponse & response)
-        {
-            if (response.error != Coordination::Error::ZOK)
-                create_promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
-            else
-                create_promise->set_value();
-        };
-        std::string data;
-        if (nodes_data_size)
-            data = generateRandomString(*nodes_data_size);
-
-        zookeeper.create(path, data, false, false, default_acls, callback);
-        create_future.get();
-        paths_to_get.push_back(path);
-    }
+    path.initialize(zookeeper);
 }
 
-Coordination::ZooKeeperRequestPtr GetRequestGenerator::generate()
+void GetRequestGenerator::getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config)
+{
+    path = PathGetter::fromConfig(key, config);
+}
+
+std::string GetRequestGenerator::descriptionImpl()
+{
+    return fmt::format(
+        "Get Request Generator\n"
+        "- path(s) to get: {}",
+        path.description());
+}
+
+Coordination::ZooKeeperRequestPtr GetRequestGenerator::generateImpl(const Coordination::ACLs & /*acls*/)
 {
     auto request = std::make_shared<ZooKeeperGetRequest>();
-
-    size_t path_index = distribution(rng);
-    request->path = paths_to_get[path_index];
+    request->path = path.getPath();
     return request;
 }
 
-void ListRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+void GetRequestGenerator::startupImpl(Coordination::ZooKeeper & zookeeper)
 {
+    path.initialize(zookeeper);
+}
+
+void ListRequestGenerator::getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config)
+{
+    path = PathGetter::fromConfig(key, config);
+}
+
+std::string ListRequestGenerator::descriptionImpl()
+{
+    return fmt::format(
+        "List Request Generator\n"
+        "- path(s) to get: {}",
+        path.description());
+}
+
+Coordination::ZooKeeperRequestPtr ListRequestGenerator::generateImpl(const Coordination::ACLs & /*acls*/)
+{
+    auto request = std::make_shared<ZooKeeperFilteredListRequest>();
+    request->path = path.getPath();
+    return request;
+}
+
+void ListRequestGenerator::startupImpl(Coordination::ZooKeeper & zookeeper)
+{
+    path.initialize(zookeeper);
+}
+
+void MultiRequestGenerator::getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config)
+{
+    if (config.has(key + ".size"))
+        size = NumberGetter::fromConfig(key + ".size", config);
+
+    request_getter = RequestGetter::fromConfig(key, config, /*for_multi*/ true);
+};
+
+std::string MultiRequestGenerator::descriptionImpl()
+{
+    std::string size_string = size.has_value() ? fmt::format("- number of requests: {}\n", size->description()) : "";
+    return fmt::format(
+        "Multi Request Generator\n"
+        "{}"
+        "- requests:\n{}",
+        size_string,
+        request_getter.description());
+}
+
+Coordination::ZooKeeperRequestPtr MultiRequestGenerator::generateImpl(const Coordination::ACLs & acls)
+{
+    Coordination::Requests ops;
+
+    if (size)
+    {
+        auto request_count = size->getNumber();
+
+        for (size_t i = 0; i < request_count; ++i)
+            ops.push_back(request_getter.getRequestGenerator()->generate(acls));
+    }
+    else
+    {
+        for (const auto & request_generator : request_getter.requestGenerators())
+            ops.push_back(request_generator->generate(acls));
+    }
+
+    return std::make_shared<ZooKeeperMultiRequest>(ops, acls);
+}
+
+void MultiRequestGenerator::startupImpl(Coordination::ZooKeeper & zookeeper)
+{
+    request_getter.startup(zookeeper);
+}
+
+Generator::Generator(const Poco::Util::AbstractConfiguration & config)
+{
+    Coordination::ACL acl;
+    acl.permissions = Coordination::ACL::All;
+    acl.scheme = "world";
+    acl.id = "anyone";
+    default_acls.emplace_back(std::move(acl));
+
+    static const std::string generator_key = "generator";
+
+    std::cerr << "---- Parsing setup ---- " << std::endl;
+    static const std::string setup_key = generator_key + ".setup";
+    Poco::Util::AbstractConfiguration::Keys keys;
+    config.keys(setup_key, keys);
+    for (const auto & key : keys)
+    {
+        if (key.starts_with("node"))
+        {
+            auto node_key = setup_key + "." + key;
+            auto parsed_root_node = parseNode(node_key, config);
+            const auto node = root_nodes.emplace_back(parsed_root_node);
+
+            if (config.has(node_key + ".repeat"))
+            {
+                if (!node->name.isRandom())
+                    throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Repeating node creation for key {}, but name is not randomly generated", node_key);
+
+                auto repeat_count = config.getUInt64(node_key + ".repeat");
+                node->repeat_count = repeat_count;
+                for (size_t i = 1; i < repeat_count; ++i)
+                    root_nodes.emplace_back(node->clone());
+            }
+
+            std::cerr << "Tree to create:" << std::endl;
+
+            node->dumpTree();
+            std::cerr << std::endl;
+        }
+    }
+    std::cerr << "---- Done parsing data setup ----\n" << std::endl;
+
+    std::cerr << "---- Collecting request generators ----" << std::endl;
+    static const std::string requests_key = generator_key + ".requests";
+    request_getter = RequestGetter::fromConfig(requests_key, config);
+    std::cerr << request_getter.description() << std::endl;
+    std::cerr << "---- Done collecting request generators ----\n" << std::endl;
+}
+
+std::shared_ptr<Generator::Node> Generator::parseNode(const std::string & key, const Poco::Util::AbstractConfiguration & config)
+{
+    auto node = std::make_shared<Generator::Node>();
+    node->name = StringGetter::fromConfig(key + ".name", config);
+
+    if (config.has(key + ".data"))
+        node->data = StringGetter::fromConfig(key + ".data", config);
+
+    Poco::Util::AbstractConfiguration::Keys node_keys;
+    config.keys(key, node_keys);
+
+    for (const auto & node_key : node_keys)
+    {
+        if (!node_key.starts_with("node"))
+            continue;
+
+        const auto node_key_string = key + "." + node_key;
+        auto child_node = parseNode(node_key_string, config);
+        node->children.push_back(child_node);
+
+        if (config.has(node_key_string + ".repeat"))
+        {
+            if (!child_node->name.isRandom())
+                throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Repeating node creation for key {}, but name is not randomly generated", node_key_string);
+
+            auto repeat_count = config.getUInt64(node_key_string + ".repeat");
+            child_node->repeat_count = repeat_count;
+            for (size_t i = 1; i < repeat_count; ++i)
+                node->children.push_back(child_node);
+        }
+    }
+
+    return node;
+}
+
+void Generator::Node::dumpTree(int level) const
+{
+    std::string data_string
+        = data.has_value() ? fmt::format("{}", data->description()) : "no data";
+
+    std::string repeat_count_string = repeat_count != 0 ? fmt::format(", repeated {} times", repeat_count) : "";
+
+    std::cerr << fmt::format("{}name: {}, data: {}{}", std::string(level, '\t'), name.description(), data_string, repeat_count_string) << std::endl;
+
+    for (auto it = children.begin(); it != children.end();)
+    {
+        const auto & child = *it;
+        child->dumpTree(level + 1);
+        std::advance(it, child->repeat_count != 0 ? child->repeat_count : 1);
+    }
+}
+
+std::shared_ptr<Generator::Node> Generator::Node::clone() const
+{
+    auto new_node = std::make_shared<Node>();
+    new_node->name = name;
+    new_node->data = data;
+    new_node->repeat_count = repeat_count;
+
+    // don't do deep copy of children because we will do clone only for root nodes
+    new_node->children = children;
+
+    return new_node;
+}
+
+void Generator::Node::createNode(Coordination::ZooKeeper & zookeeper, const std::string & parent_path, const Coordination::ACLs & acls) const
+{
+    auto path = std::filesystem::path(parent_path) / name.getString();
     auto promise = std::make_shared<std::promise<void>>();
     auto future = promise->get_future();
     auto create_callback = [promise] (const CreateResponse & response)
@@ -225,97 +720,47 @@ void ListRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
         else
             promise->set_value();
     };
-    zookeeper.create(path_prefix, "", false, false, default_acls, create_callback);
+    zookeeper.create(path, data ? data->getString() : "", false, false, acls, create_callback);
     future.get();
 
-    size_t total_nodes = 1;
-    if (num_nodes)
-        total_nodes = *num_nodes;
-
-    size_t path_length = 5;
-    if (paths_length)
-        path_length = *paths_length;
-
-    for (size_t i = 0; i < total_nodes; ++i)
-    {
-        auto path = generateRandomPath(path_prefix, path_length);
-
-        auto create_promise = std::make_shared<std::promise<void>>();
-        auto create_future = create_promise->get_future();
-        auto callback = [create_promise] (const CreateResponse & response)
-        {
-            if (response.error != Coordination::Error::ZOK)
-                create_promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
-            else
-                create_promise->set_value();
-        };
-        zookeeper.create(path, "", false, false, default_acls, callback);
-        create_future.get();
-    }
+    for (const auto & child : children)
+        child->createNode(zookeeper, path, acls);
 }
 
-Coordination::ZooKeeperRequestPtr ListRequestGenerator::generate()
+void Generator::startup(Coordination::ZooKeeper & zookeeper)
 {
-    auto request = std::make_shared<ZooKeeperListRequest>();
-    request->path = path_prefix;
-    return request;
+    std::cerr << "---- Creating test data ----" << std::endl;
+    for (const auto & node : root_nodes)
+    {
+        auto node_name = node->name.getString();
+        node->name.setString(node_name);
+
+        std::string root_path = std::filesystem::path("/") / node_name;
+        std::cerr << "Cleaning up " << root_path << std::endl;
+        removeRecursive(zookeeper, root_path);
+
+        node->createNode(zookeeper, "/", default_acls);
+    }
+    std::cerr << "---- Created test data ----\n" << std::endl;
+
+    std::cerr << "---- Initializing generators ----" << std::endl;
+
+    request_getter.startup(zookeeper);
 }
 
-std::unique_ptr<IGenerator> getGenerator(const std::string & name)
+Coordination::ZooKeeperRequestPtr Generator::generate()
 {
-    if (name == "create_no_data")
-    {
-        return std::make_unique<CreateRequestGenerator>();
-    }
-    else if (name == "create_small_data")
-    {
-        return std::make_unique<CreateRequestGenerator>("/create_generator", 5, 32);
-    }
-    else if (name == "create_medium_data")
-    {
-        return std::make_unique<CreateRequestGenerator>("/create_generator", 5, 1024);
-    }
-    else if (name == "create_big_data")
-    {
-        return std::make_unique<CreateRequestGenerator>("/create_generator", 5, 512 * 1024);
-    }
-    else if (name == "get_no_data")
-    {
-        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 0);
-    }
-    else if (name == "get_small_data")
-    {
-        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 32);
-    }
-    else if (name == "get_medium_data")
-    {
-        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 1024);
-    }
-    else if (name == "get_big_data")
-    {
-        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 512 * 1024);
-    }
-    else if (name == "list_no_nodes")
-    {
-        return std::make_unique<ListRequestGenerator>("/list_generator", 0, 1);
-    }
-    else if (name == "list_few_nodes")
-    {
-        return std::make_unique<ListRequestGenerator>("/list_generator", 10, 5);
-    }
-    else if (name == "list_medium_nodes")
-    {
-        return std::make_unique<ListRequestGenerator>("/list_generator", 1000, 5);
-    }
-    else if (name == "list_a_lot_nodes")
-    {
-        return std::make_unique<ListRequestGenerator>("/list_generator", 100000, 5);
-    }
-    else if (name == "set_small_data")
-    {
-        return std::make_unique<SetRequestGenerator>("/set_generator", 5);
-    }
-
-
-    throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Unknown generator {}", name);
+    return request_getter.getRequestGenerator()->generate(default_acls);
+}
+
+void Generator::cleanup(Coordination::ZooKeeper & zookeeper)
+{
+    std::cerr << "---- Cleaning up test data ----" << std::endl;
+    for (const auto & node : root_nodes)
+    {
+        auto node_name = node->name.getString();
+        std::string root_path = std::filesystem::path("/") / node_name;
+        std::cerr << "Cleaning up " << root_path << std::endl;
+        removeRecursive(zookeeper, root_path);
+    }
 }
diff --git a/utils/keeper-bench/Generator.h b/utils/keeper-bench/Generator.h
index 1ff01b25ed4..5b4c05b2d8b 100644
--- a/utils/keeper-bench/Generator.h
+++ b/utils/keeper-bench/Generator.h
@@ -6,121 +6,194 @@
 #include <functional>
 #include <optional>
 #include <pcg-random/pcg_random.hpp>
+#include <Poco/Util/AbstractConfiguration.h>
 #include <Common/randomSeed.h>
 
-
-std::string generateRandomPath(const std::string & prefix, size_t length = 5);
-
-std::string generateRandomData(size_t size);
-
-class IGenerator
+struct NumberGetter
 {
-public:
-    IGenerator()
+    static NumberGetter fromConfig(const std::string & key, const Poco::Util::AbstractConfiguration & config, std::optional<uint64_t> default_value = std::nullopt);
+    uint64_t getNumber() const;
+    std::string description() const;
+private:
+    struct NumberRange
     {
-        Coordination::ACL acl;
-        acl.permissions = Coordination::ACL::All;
-        acl.scheme = "world";
-        acl.id = "anyone";
-        default_acls.emplace_back(std::move(acl));
-    }
-    virtual void startup(Coordination::ZooKeeper & /*zookeeper*/) {}
-    virtual Coordination::ZooKeeperRequestPtr generate() = 0;
-
-    virtual ~IGenerator() = default;
-
-    Coordination::ACLs default_acls;
+        uint64_t min_value;
+        uint64_t max_value;
+    };
 
+    std::variant<uint64_t, NumberRange> value;
 };
 
-class CreateRequestGenerator final : public IGenerator
+struct StringGetter
 {
-public:
-    explicit CreateRequestGenerator(
-        std::string path_prefix_ = "/create_generator",
-        std::optional<uint64_t> path_length_ = std::nullopt,
-        std::optional<uint64_t> data_size_ = std::nullopt)
-        : path_prefix(path_prefix_)
-        , path_length(path_length_)
-        , data_size(data_size_)
+    explicit StringGetter(NumberGetter number_getter)
+        : value(std::move(number_getter))
     {}
 
-    void startup(Coordination::ZooKeeper & zookeeper) override;
-    Coordination::ZooKeeperRequestPtr generate() override;
+    StringGetter() = default;
 
+    static StringGetter fromConfig(const std::string & key, const Poco::Util::AbstractConfiguration & config);
+    void setString(std::string name);
+    std::string getString() const;
+    std::string description() const;
+    bool isRandom() const;
 private:
-    std::string path_prefix;
-    std::optional<uint64_t> path_length;
-    std::optional<uint64_t> data_size;
+    std::variant<std::string, NumberGetter> value;
+};
+
+struct PathGetter
+{
+    static PathGetter fromConfig(const std::string & key, const Poco::Util::AbstractConfiguration & config);
+
+    std::string getPath() const;
+    std::string description() const;
+
+    void initialize(Coordination::ZooKeeper & zookeeper);
+private:
+    std::vector<std::string> parent_paths;
+
+    bool initialized = false;
+
+    std::vector<std::string> paths;
+    mutable std::uniform_int_distribution<size_t> path_picker;
+};
+
+struct RequestGenerator
+{
+    virtual ~RequestGenerator() = default;
+
+    void getFromConfig(const std::string & key, const Poco::Util::AbstractConfiguration & config);
+
+    Coordination::ZooKeeperRequestPtr generate(const Coordination::ACLs & acls);
+
+    std::string description();
+
+    void startup(Coordination::ZooKeeper & zookeeper);
+
+    size_t getWeight() const;
+private:
+    virtual void getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config) = 0;
+    virtual std::string descriptionImpl() = 0;
+    virtual Coordination::ZooKeeperRequestPtr generateImpl(const Coordination::ACLs & acls) = 0;
+    virtual void startupImpl(Coordination::ZooKeeper &) {}
+
+    size_t weight = 1;
+};
+
+using RequestGeneratorPtr = std::shared_ptr<RequestGenerator>;
+
+struct CreateRequestGenerator final : public RequestGenerator
+{
+    CreateRequestGenerator();
+private:
+    void getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config) override;
+    std::string descriptionImpl() override;
+    Coordination::ZooKeeperRequestPtr generateImpl(const Coordination::ACLs & acls) override;
+    void startupImpl(Coordination::ZooKeeper & zookeeper) override;
+
+    PathGetter parent_path;
+    StringGetter name;
+    std::optional<StringGetter> data;
+
+    std::optional<double> remove_factor;
+    pcg64 rng;
+    std::uniform_real_distribution<double> remove_picker;
+
     std::unordered_set<std::string> paths_created;
 };
 
-
-class GetRequestGenerator final : public IGenerator
+struct SetRequestGenerator final : public RequestGenerator
 {
-public:
-    explicit GetRequestGenerator(
-        std::string path_prefix_ = "/get_generator",
-        std::optional<uint64_t> num_nodes_ = std::nullopt,
-        std::optional<uint64_t> nodes_data_size_ = std::nullopt)
-        : path_prefix(path_prefix_)
-        , num_nodes(num_nodes_)
-        , nodes_data_size(nodes_data_size_)
-        , rng(randomSeed())
-        , distribution(0, num_nodes ? *num_nodes - 1 : 0)
-    {}
-
-    void startup(Coordination::ZooKeeper & zookeeper) override;
-    Coordination::ZooKeeperRequestPtr generate() override;
-
 private:
-    std::string path_prefix;
-    std::optional<uint64_t> num_nodes;
-    std::optional<uint64_t> nodes_data_size;
-    std::vector<std::string> paths_to_get;
+    void getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config) override;
+    std::string descriptionImpl() override;
+    Coordination::ZooKeeperRequestPtr generateImpl(const Coordination::ACLs & acls) override;
+    void startupImpl(Coordination::ZooKeeper & zookeeper) override;
 
-    pcg64 rng;
-    std::uniform_int_distribution<size_t> distribution;
+    PathGetter path;
+    StringGetter data;
 };
 
-class ListRequestGenerator final : public IGenerator
+struct GetRequestGenerator final : public RequestGenerator
 {
-public:
-    explicit ListRequestGenerator(
-        std::string path_prefix_ = "/list_generator",
-        std::optional<uint64_t> num_nodes_ = std::nullopt,
-        std::optional<uint64_t> paths_length_ = std::nullopt)
-        : path_prefix(path_prefix_)
-        , num_nodes(num_nodes_)
-        , paths_length(paths_length_)
-    {}
-
-    void startup(Coordination::ZooKeeper & zookeeper) override;
-    Coordination::ZooKeeperRequestPtr generate() override;
-
 private:
-    std::string path_prefix;
-    std::optional<uint64_t> num_nodes;
-    std::optional<uint64_t> paths_length;
+    void getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config) override;
+    std::string descriptionImpl() override;
+    Coordination::ZooKeeperRequestPtr generateImpl(const Coordination::ACLs & acls) override;
+    void startupImpl(Coordination::ZooKeeper & zookeeper) override;
+
+    PathGetter path;
 };
 
-class SetRequestGenerator final : public IGenerator
+struct ListRequestGenerator final : public RequestGenerator
 {
-public:
-    explicit SetRequestGenerator(
-        std::string path_prefix_ = "/set_generator",
-        uint64_t data_size_ = 5)
-        : path_prefix(path_prefix_)
-        , data_size(data_size_)
-    {}
-
-    void startup(Coordination::ZooKeeper & zookeeper) override;
-    Coordination::ZooKeeperRequestPtr generate() override;
-
 private:
-    std::string path_prefix;
-    uint64_t data_size;
+    void getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config) override;
+    std::string descriptionImpl() override;
+    Coordination::ZooKeeperRequestPtr generateImpl(const Coordination::ACLs & acls) override;
+    void startupImpl(Coordination::ZooKeeper & zookeeper) override;
+
+    PathGetter path;
 };
 
+struct RequestGetter
+{
+    explicit RequestGetter(std::vector<RequestGeneratorPtr> request_generators_);
 
-std::unique_ptr<IGenerator> getGenerator(const std::string & name);
+    RequestGetter() = default;
+
+    static RequestGetter fromConfig(const std::string & key, const Poco::Util::AbstractConfiguration & config, bool for_multi = false);
+
+    RequestGeneratorPtr getRequestGenerator() const;
+    std::string description() const;
+    void startup(Coordination::ZooKeeper & zookeeper);
+    const std::vector<RequestGeneratorPtr> & requestGenerators() const;
+private:
+    std::vector<RequestGeneratorPtr> request_generators;
+    std::vector<size_t> weights;
+    mutable std::uniform_int_distribution<size_t> request_generator_picker;
+};
+
+struct MultiRequestGenerator final : public RequestGenerator
+{
+private:
+    void getFromConfigImpl(const std::string & key, const Poco::Util::AbstractConfiguration & config) override;
+    std::string descriptionImpl() override;
+    Coordination::ZooKeeperRequestPtr generateImpl(const Coordination::ACLs & acls) override;
+    void startupImpl(Coordination::ZooKeeper & zookeeper) override;
+
+    std::optional<NumberGetter> size;
+    RequestGetter request_getter;
+};
+
+class Generator
+{
+public:
+    explicit Generator(const Poco::Util::AbstractConfiguration & config);
+
+    void startup(Coordination::ZooKeeper & zookeeper);
+    Coordination::ZooKeeperRequestPtr generate();
+    void cleanup(Coordination::ZooKeeper & zookeeper);
+private:
+    struct Node
+    {
+        StringGetter name;
+        std::optional<StringGetter> data;
+        std::vector<std::shared_ptr<Node>> children;
+        size_t repeat_count = 0;
+
+        std::shared_ptr<Node> clone() const;
+
+        void createNode(Coordination::ZooKeeper & zookeeper, const std::string & parent_path, const Coordination::ACLs & acls) const;
+        void dumpTree(int level = 0) const;
+    };
+
+    static std::shared_ptr<Node> parseNode(const std::string & key, const Poco::Util::AbstractConfiguration & config);
+
+    std::uniform_int_distribution<size_t> request_picker;
+    std::vector<std::shared_ptr<Node>> root_nodes;
+    RequestGetter request_getter;
+    Coordination::ACLs default_acls;
+};
+
+std::optional<Generator> getGenerator(const std::string & name);
diff --git a/utils/keeper-bench/README.md b/utils/keeper-bench/README.md
new file mode 100644
index 00000000000..8b498228799
--- /dev/null
+++ b/utils/keeper-bench/README.md
@@ -0,0 +1,317 @@
+# Keeper Bench
+
+Keeper Bench is a tool for benchmarking Keeper or any ZooKeeper compatible systems.
+
+To run it call following command from the build folder:
+
+```
+./utils/keeper-bench --config benchmark_config_file.yaml
+```
+
+## Configuration file
+
+Keeper Bench runs need to be configured inside a yaml or XML file.
+An example of a configuration file can be found in `./utils/keeper-bench/example.yaml`
+
+### Table of contents
+- [Special Types](#special-types)
+- [General settings](#general-settings)
+- [Connections](#connections)
+- [Generator](#generator)
+- [Output](#output)
+
+<a name="special-types"></a>
+## Special types
+
+### IntegerGetter
+
+Can be defined with constant integer or as a random value from a range.
+
+```yaml
+key: integer
+key:
+    min_value: integer
+    max_value: integer
+```
+
+Example for a constant value:
+
+```yaml
+some_key: 2
+```
+
+Example for random value from [10, 20]:
+
+```yaml
+some_key:
+    min_value: 10
+    max_value: 20
+```
+
+### StringGetter
+
+Can be defined with constant string or as a random string of some size.
+
+```yaml
+key: string
+key:
+    random_string:
+        size: IntegerGetter
+```
+
+Example for a constant value:
+```yaml
+some_key: "string"
+```
+
+Example for a random string with a random size from [10, 20]:
+```yaml
+some_key:
+    random_string:
+        size:
+            min_value: 10
+            max_value: 20
+```
+
+
+### PathGetter
+
+If a section contains one or more `path` keys, all `path` keys are collected into a list. \
+Additionally, paths can be defined with key `children_of` which will add all children of some path to the list.
+
+```yaml
+path: string
+path:
+    children_of: string
+```
+
+Example for defining list of paths (`/path1`, `/path2` and children of `/path3`):
+
+```yaml
+main:
+    path:
+        - "/path1"
+        - "/path2"
+    path:
+        children_of: "/path3"
+```
+
+<a name="general-settings"></a>
+## General settings
+
+```yaml
+# number of parallel queries (default: 1)
+concurrency: integer
+
+# amount of queries to be executed, set 0 to disable limit (default: 0)
+iterations: integer
+
+# delay between intermediate reports in seconds, set 0 to disable reports (default: 1.0)
+report_delay: double
+
+# stop launch of queries after specified time limit, set 0 to disable limit (default: 0)
+timelimit: double
+
+# continue testing even if a query fails (default: false)
+continue_on_errors: boolean
+```
+
+<a name="connections"></a>
+## Connections
+
+Connection definitions that will be used throughout tests defined under `connections` key.
+
+Following configurations can be defined under `connections` key or for each specific connection. \
+If it's defined under `connections` key, it will be used by default unless a specific connection overrides it.
+
+```yaml
+secure: boolean
+operation_timeout_ms: integer
+session_timeout_ms: integer
+connection_timeout_ms: integer
+```
+
+Specific configuration can be defined with a string or with a detailed description.
+
+```yaml
+host: string
+connection:
+    host: string
+
+    # number of sessions to create for host
+    sessions: integer
+    # any connection configuration defined above
+```
+
+Example definition of 3 connections in total, 1 to `localhost:9181` and 2 to `localhost:9182` both will use secure connections:
+
+```yaml
+connections:
+    secure: true
+
+    host: "localhost:9181"
+    connection:
+        host: "localhost:9182"
+        sessions: 2
+```
+
+<a name="generator"></a>
+## Generator
+
+Main part of the benchmark is the generator itself which creates necessary nodes and defines how the requests will be generated. \
+It is defined under `generator` key.
+
+### Setup
+
+Setup defines nodes that are needed for test, defined under `setup` key.
+
+Each node is defined with a `node` key in the following format:
+
+```yaml
+node: StringGetter
+
+node:
+    name: StringGetter
+    data: StringGetter
+    repeat: integer
+    node: Node
+```
+
+If only string is defined, a node with that name will be created. \
+Otherwise more detailed definition could be included to set data or the children of the node. \
+If `repeat` key is set, the node definition will be used multiple times. For a `repeat` key to be valid, the name of the node needs to be a random string.
+
+Example for a setup:
+
+```yaml
+generator:
+    setup:
+        node: "node1"
+            node:
+                name:
+                    random_string:
+                        size: 20
+                data: "somedata"
+                repeat: 4
+        node:
+            name:
+                random_string:
+                    size: 10
+            repeat: 2
+```
+
+We will create node `/node1` with no data and 4 children of random name of size 20 and data set to `somedata`. \
+We will also create 2 nodes with no data and random name of size 10 under `/` node.
+
+### Requests
+
+While benchmark is running, we are generating requests.
+
+Request generator is defined under `requests` key. \
+For each request `weight` (default: 1) can be defined which defines preference for a certain request.
+
+#### `create`
+
+```yaml
+create:
+    # parent path for created nodes
+    path: string
+
+    # length of the name for the create node (default: 5)
+    name_length: IntegerGetter
+
+    # data for create nodes (default: "")
+    data: StringGetter
+
+    # value in range [0.0, 1.0> denoting how often a remove request should be generated compared to create request (default: 0)
+    remove_factor: double
+```
+
+#### `set`
+
+```yaml
+set:
+    # paths on which we randomly set data
+    path: PathGetter
+
+    # data to set
+    data: StringGetter
+```
+
+#### `get`
+
+```yaml
+get:
+    # paths for which we randomly get data
+    path: PathGetter
+```
+
+#### `list`
+
+```yaml
+list:
+    # paths for which we randomly do list request
+    path: PathGetter
+```
+
+#### `multi`
+
+```yaml
+multi:
+    # any request definition defined above can be added
+
+    # optional size for the multi request
+    size: IntegerGetter
+```
+
+Multi request definition can contain any other request generator definitions described above. \
+If `size` key is defined, we will randomly pick `size` amount of requests from defined request generators. \
+All request generators can have a higher pick probability by using `weight` key. \
+If `size` is not defined, multi request with same request generators will always be generated. \
+Both write and read multi requests are supported.
+
+#### Example
+
+```yaml
+generator:
+    requests:
+        create:
+            path: "/test_create"
+            name_length:
+                min_value: 10
+                max_value: 20
+        multi:
+            weight: 20
+            size: 10
+            get:
+                path:
+                    children_of: "/test_get1"
+            get:
+                weight: 2
+                path:
+                    children_of: "/test_get2"
+```
+
+We defined a request geneator that will generate either a `create` or a `multi` request. \
+Each `create` request will create a node under `/test_create` with a randomly generated name with size from range `[10, 20]`. \
+`multi` request will be generated 20 times more than `create` request. \
+`multi` request will contain 10 requests and approximately twice as much get requests to children of "/test_get2".
+
+<a name="output"></a>
+## Output
+
+```yaml
+output:
+    # if defined, JSON output of results will be stored at the defined path
+    file: string
+    # or
+    file:
+        # if defined, JSON output of results will be stored at the defined path
+        path: string
+
+        # if set to true, timestamp will be appended to the output file name (default: false)
+        with_timestamp: boolean
+
+    # if set to true, output will be printed to stdout also (default: false)
+    stdout: boolean
+```
diff --git a/utils/keeper-bench/Runner.cpp b/utils/keeper-bench/Runner.cpp
index 2f3cf4b0620..f86d2b44dd7 100644
--- a/utils/keeper-bench/Runner.cpp
+++ b/utils/keeper-bench/Runner.cpp
@@ -1,15 +1,160 @@
 #include "Runner.h"
+#include <Poco/Util/AbstractConfiguration.h>
 
-namespace DB
+#include "Common/ZooKeeper/ZooKeeperCommon.h"
+#include "Common/ZooKeeper/ZooKeeperConstants.h"
+#include <Common/EventNotifier.h>
+#include <Common/Config/ConfigProcessor.h>
+#include "IO/ReadBufferFromString.h"
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/copyData.h>
+
+namespace CurrentMetrics
 {
+    extern const Metric LocalThread;
+    extern const Metric LocalThreadActive;
+}
 
-namespace ErrorCodes
+namespace DB::ErrorCodes
 {
     extern const int CANNOT_BLOCK_SIGNAL;
+    extern const int BAD_ARGUMENTS;
 }
 
+Runner::Runner(
+        std::optional<size_t> concurrency_,
+        const std::string & config_path,
+        const Strings & hosts_strings_,
+        std::optional<double> max_time_,
+        std::optional<double> delay_,
+        std::optional<bool> continue_on_error_,
+        std::optional<size_t> max_iterations_)
+        : info(std::make_shared<Stats>())
+{
+
+    DB::ConfigProcessor config_processor(config_path, true, false);
+    auto config = config_processor.loadConfig().configuration;
+
+    generator.emplace(*config);
+
+    if (!hosts_strings_.empty())
+    {
+        for (const auto & host : hosts_strings_)
+            connection_infos.push_back({.host = host});
+    }
+    else
+    {
+        if (!config)
+            throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "No config file or hosts defined");
+
+        parseHostsFromConfig(*config);
+    }
+
+    std::cerr << "---- Run options ---- " << std::endl;
+    static constexpr uint64_t DEFAULT_CONCURRENCY = 1;
+    if (concurrency_)
+        concurrency = *concurrency_;
+    else
+        concurrency = config->getUInt64("concurrency", DEFAULT_CONCURRENCY);
+    std::cerr << "Concurrency: " << concurrency << std::endl;
+
+    static constexpr uint64_t DEFAULT_ITERATIONS = 0;
+    if (max_iterations_)
+        max_iterations = *max_iterations_;
+    else
+        max_iterations = config->getUInt64("iterations", DEFAULT_ITERATIONS);
+    std::cerr << "Iterations: " << max_iterations << std::endl;
+
+    static constexpr double DEFAULT_DELAY = 1.0;
+    if (delay_)
+        delay = *delay_;
+    else
+        delay = config->getDouble("report_delay", DEFAULT_DELAY);
+    std::cerr << "Report delay: " << delay << std::endl;
+
+    static constexpr double DEFAULT_TIME_LIMIT = 0.0;
+    if (max_time_)
+        max_time = *max_time_;
+    else
+        max_time = config->getDouble("timelimit", DEFAULT_TIME_LIMIT);
+    std::cerr << "Time limit: " << max_time << std::endl;
+
+    if (continue_on_error_)
+        continue_on_error = *continue_on_error_;
+    else
+        continue_on_error = config->getBool("continue_on_error", false);
+    std::cerr << "Continue on error: " << continue_on_error << std::endl;
+
+    static const std::string output_key = "output";
+    print_to_stdout = config->getBool(output_key + ".stdout", false);
+    std::cerr << "Printing output to stdout: " << print_to_stdout << std::endl;
+
+    static const std::string output_file_key = output_key + ".file";
+    if (config->has(output_file_key))
+    {
+        if (config->has(output_file_key + ".path"))
+        {
+            file_output = config->getString(output_file_key + ".path");
+            output_file_with_timestamp = config->getBool(output_file_key + ".with_timestamp");
+        }
+        else
+            file_output = config->getString(output_file_key);
+
+        std::cerr << "Result file path: " << file_output->string() << std::endl;
+    }
+
+    std::cerr << "---- Run options ----\n" << std::endl;
+
+    pool.emplace(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, concurrency);
+    queue.emplace(concurrency);
 }
 
+void Runner::parseHostsFromConfig(const Poco::Util::AbstractConfiguration & config)
+{
+    ConnectionInfo default_connection_info;
+
+    const auto fill_connection_details = [&](const std::string & key, auto & connection_info)
+    {
+        if (config.has(key + ".secure"))
+            connection_info.secure = config.getBool(key + ".secure");
+
+        if (config.has(key + ".session_timeout_ms"))
+            connection_info.session_timeout_ms = config.getInt(key + ".session_timeout_ms");
+
+        if (config.has(key + ".operation_timeout_ms"))
+            connection_info.operation_timeout_ms = config.getInt(key + ".operation_timeout_ms");
+
+        if (config.has(key + ".connection_timeout_ms"))
+            connection_info.connection_timeout_ms = config.getInt(key + ".connection_timeout_ms");
+    };
+
+    fill_connection_details("connections", default_connection_info);
+
+    Poco::Util::AbstractConfiguration::Keys connections_keys;
+    config.keys("connections", connections_keys);
+
+    for (const auto & key : connections_keys)
+    {
+        std::string connection_key = "connections." + key;
+        auto connection_info = default_connection_info;
+        if (key.starts_with("host"))
+        {
+            connection_info.host = config.getString(connection_key);
+            connection_infos.push_back(std::move(connection_info));
+        }
+        else if (key.starts_with("connection") && key != "connection_timeout_ms")
+        {
+            connection_info.host = config.getString(connection_key + ".host");
+            if (config.has(connection_key + ".sessions"))
+                connection_info.sessions = config.getUInt64(connection_key + ".sessions");
+
+            fill_connection_details(connection_key, connection_info);
+
+            connection_infos.push_back(std::move(connection_info));
+        }
+    }
+}
 
 void Runner::thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> zookeepers)
 {
@@ -33,7 +178,7 @@ void Runner::thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> zookee
 
         while (!extracted)
         {
-            extracted = queue.tryPop(request, 100);
+            extracted = queue->tryPop(request, 100);
 
             if (shutdown
                 || (max_iterations && requests_executed >= max_iterations))
@@ -47,9 +192,35 @@ void Runner::thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> zookee
 
         auto promise = std::make_shared<std::promise<size_t>>();
         auto future = promise->get_future();
-        Coordination::ResponseCallback callback = [promise](const Coordination::Response & response)
+        Coordination::ResponseCallback callback = [&request, promise](const Coordination::Response & response)
         {
-            if (response.error != Coordination::Error::ZOK)
+            bool set_exception = true;
+
+            if (response.error == Coordination::Error::ZOK)
+            {
+                set_exception = false;
+            }
+            else if (response.error == Coordination::Error::ZNONODE)
+            {
+                /// remove can fail with ZNONODE because of different order of execution
+                /// of generated create and remove requests
+                /// this is okay for concurrent runs
+                if (dynamic_cast<const Coordination::ZooKeeperRemoveResponse *>(&response))
+                    set_exception = false;
+                else if (const auto * multi_response = dynamic_cast<const Coordination::ZooKeeperMultiResponse *>(&response))
+                {
+                    const auto & responses = multi_response->responses;
+                    size_t i = 0;
+                    while (responses[i]->error != Coordination::Error::ZNONODE)
+                        ++i;
+
+                    const auto & multi_request = dynamic_cast<const Coordination::ZooKeeperMultiRequest &>(*request);
+                    if (dynamic_cast<const Coordination::ZooKeeperRemoveRequest *>(&*multi_request.requests[i]))
+                        set_exception = false;
+                }
+            }
+
+            if (set_exception)
                 promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
             else
                 promise->set_value(response.bytesSize());
@@ -62,14 +233,14 @@ void Runner::thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> zookee
         try
         {
             auto response_size = future.get();
-            double seconds = watch.elapsedSeconds();
+            auto microseconds = watch.elapsedMicroseconds();
 
             std::lock_guard lock(mutex);
 
             if (request->isReadRequest())
-                info->addRead(seconds, 1, request->bytesSize() + response_size);
+                info->addRead(microseconds, 1, request->bytesSize() + response_size);
             else
-                info->addWrite(seconds, 1, request->bytesSize() + response_size);
+                info->addWrite(microseconds, 1, request->bytesSize() + response_size);
         }
         catch (...)
         {
@@ -95,7 +266,7 @@ void Runner::thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> zookee
                 {
                     try
                     {
-                        zookeepers = getConnections();
+                        zookeepers = refreshConnections();
                         break;
                     }
                     catch (...)
@@ -110,13 +281,13 @@ void Runner::thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> zookee
     }
 }
 
-bool Runner::tryPushRequestInteractively(const Coordination::ZooKeeperRequestPtr & request, DB::InterruptListener & interrupt_listener)
+bool Runner::tryPushRequestInteractively(Coordination::ZooKeeperRequestPtr && request, DB::InterruptListener & interrupt_listener)
 {
     bool inserted = false;
 
     while (!inserted)
     {
-        inserted = queue.tryPush(request, 100);
+        inserted = queue->tryPush(std::move(request), 100);
 
         if (shutdown)
         {
@@ -126,13 +297,13 @@ bool Runner::tryPushRequestInteractively(const Coordination::ZooKeeperRequestPtr
 
         if (max_time > 0 && total_watch.elapsedSeconds() >= max_time)
         {
-            std::cout << "Stopping launch of queries. Requested time limit is exhausted.\n";
+            std::cerr << "Stopping launch of queries. Requested time limit is exhausted.\n";
             return false;
         }
 
         if (interrupt_listener.check())
         {
-            std::cout << "Stopping launch of queries. SIGINT received." << std::endl;
+            std::cerr << "Stopping launch of queries. SIGINT received." << std::endl;
             return false;
         }
 
@@ -141,7 +312,7 @@ bool Runner::tryPushRequestInteractively(const Coordination::ZooKeeperRequestPtr
             printNumberOfRequestsExecuted(requests_executed);
 
             std::lock_guard lock(mutex);
-            report(info, concurrency);
+            info->report(concurrency);
             delay_watch.restart();
         }
     }
@@ -152,23 +323,26 @@ bool Runner::tryPushRequestInteractively(const Coordination::ZooKeeperRequestPtr
 
 void Runner::runBenchmark()
 {
-    auto aux_connections = getConnections();
+    createConnections();
 
     std::cerr << "Preparing to run\n";
-    generator->startup(*aux_connections[0]);
+    generator->startup(*connections[0]);
     std::cerr << "Prepared\n";
+
+    auto start_timestamp_ms = Poco::Timestamp().epochMicroseconds() / 1000;
+
     try
     {
         for (size_t i = 0; i < concurrency; ++i)
         {
-            auto connections = getConnections();
-            pool.scheduleOrThrowOnError([this, connections]() mutable { thread(connections); });
+            auto thread_connections = connections;
+            pool->scheduleOrThrowOnError([this, connections = std::move(thread_connections)]() mutable { thread(connections); });
         }
     }
     catch (...)
     {
         shutdown = true;
-        pool.wait();
+        pool->wait();
         throw;
     }
 
@@ -185,31 +359,102 @@ void Runner::runBenchmark()
         }
     }
 
-    pool.wait();
+    pool->wait();
     total_watch.stop();
 
     printNumberOfRequestsExecuted(requests_executed);
 
     std::lock_guard lock(mutex);
-    report(info, concurrency);
-}
+    info->report(concurrency);
 
+    DB::WriteBufferFromOwnString out;
+    info->writeJSON(out, concurrency, start_timestamp_ms);
+    auto output_string = std::move(out.str());
 
-std::vector<std::shared_ptr<Coordination::ZooKeeper>> Runner::getConnections()
-{
-    std::vector<std::shared_ptr<Coordination::ZooKeeper>> zookeepers;
-    for (const auto & host_string : hosts_strings)
+    if (print_to_stdout)
+        std::cout << output_string << std::endl;
+
+    if (file_output)
     {
-        Coordination::ZooKeeper::Node node{Poco::Net::SocketAddress{host_string}, false};
-        std::vector<Coordination::ZooKeeper::Node> nodes;
-        nodes.push_back(node);
-        zkutil::ZooKeeperArgs args;
-        args.session_timeout_ms = 30000;
-        args.connection_timeout_ms = 1000;
-        args.operation_timeout_ms = 10000;
-        zookeepers.emplace_back(std::make_shared<Coordination::ZooKeeper>(nodes, args, nullptr));
+        auto path = *file_output;
+
+        if (output_file_with_timestamp)
+        {
+            auto filename = file_output->filename();
+            filename = fmt::format("{}_{}{}", filename.stem().generic_string(), start_timestamp_ms, filename.extension().generic_string());
+            path = file_output->parent_path() / filename;
+        }
+
+        std::cerr << "Storing output to " << path << std::endl;
+
+        DB::WriteBufferFromFile file_output_buffer(path);
+        DB::ReadBufferFromString read_buffer(output_string);
+        DB::copyData(read_buffer, file_output_buffer);
     }
-
-
-    return zookeepers;
 }
+
+
+void Runner::createConnections()
+{
+    DB::EventNotifier::init();
+    std::cerr << "---- Creating connections ---- " << std::endl;
+    for (size_t connection_info_idx = 0; connection_info_idx < connection_infos.size(); ++connection_info_idx)
+    {
+        const auto & connection_info = connection_infos[connection_info_idx];
+        std::cerr << fmt::format("Creating {} session(s) for:\n"
+                                 "- host: {}\n"
+                                 "- secure: {}\n"
+                                 "- session timeout: {}ms\n"
+                                 "- operation timeout: {}ms\n"
+                                 "- connection timeout: {}ms",
+                                 connection_info.sessions,
+                                 connection_info.host,
+                                 connection_info.secure,
+                                 connection_info.session_timeout_ms,
+                                 connection_info.operation_timeout_ms,
+                                 connection_info.connection_timeout_ms) << std::endl;
+
+        for (size_t session = 0; session < connection_info.sessions; ++session)
+        {
+            connections.emplace_back(getConnection(connection_info));
+            connections_to_info_map[connections.size() - 1] = connection_info_idx;
+        }
+    }
+    std::cerr << "---- Done creating connections ----\n" << std::endl;
+}
+
+std::shared_ptr<Coordination::ZooKeeper> Runner::getConnection(const ConnectionInfo & connection_info)
+{
+    Coordination::ZooKeeper::Node node{Poco::Net::SocketAddress{connection_info.host}, connection_info.secure};
+    std::vector<Coordination::ZooKeeper::Node> nodes;
+    nodes.push_back(node);
+    zkutil::ZooKeeperArgs args;
+    args.session_timeout_ms = connection_info.session_timeout_ms;
+    args.connection_timeout_ms = connection_info.operation_timeout_ms;
+    args.operation_timeout_ms = connection_info.connection_timeout_ms;
+    return std::make_shared<Coordination::ZooKeeper>(nodes, args, nullptr);
+}
+
+std::vector<std::shared_ptr<Coordination::ZooKeeper>> Runner::refreshConnections()
+{
+    std::lock_guard lock(connection_mutex);
+    for (size_t connection_idx = 0; connection_idx < connections.size(); ++connection_idx)
+    {
+        auto & connection = connections[connection_idx];
+        if (connection->isExpired())
+        {
+            const auto & connection_info = connection_infos[connections_to_info_map[connection_idx]];
+            connection = getConnection(connection_info);
+        }
+    }
+    return connections;
+}
+
+Runner::~Runner()
+{
+    queue->clearAndFinish();
+    shutdown = true;
+    pool->wait();
+    generator->cleanup(*connections[0]);
+}
+
diff --git a/utils/keeper-bench/Runner.h b/utils/keeper-bench/Runner.h
index 3976ac720eb..f899f1d538d 100644
--- a/utils/keeper-bench/Runner.h
+++ b/utils/keeper-bench/Runner.h
@@ -1,17 +1,21 @@
 #pragma once
+#include "Common/ZooKeeper/ZooKeeperConstants.h"
 #include <Common/ZooKeeper/ZooKeeperImpl.h>
 #include "Generator.h"
 #include <Common/ZooKeeper/IKeeper.h>
+#include <Common/Config/ConfigProcessor.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
-#include <pcg-random/pcg_random.hpp>
-#include <Common/randomSeed.h>
 #include <Common/InterruptListener.h>
+#include <Common/CurrentMetrics.h>
 
 #include <Core/Types.h>
+#include <Poco/Util/AbstractConfiguration.h>
 #include "Stats.h"
 
+#include <filesystem>
+
 using Ports = std::vector<UInt16>;
 using Strings = std::vector<std::string>;
 
@@ -19,25 +23,13 @@ class Runner
 {
 public:
     Runner(
-        size_t concurrency_,
-        const std::string & generator_name,
+        std::optional<size_t> concurrency_,
+        const std::string & config_path,
         const Strings & hosts_strings_,
-        double max_time_,
-        double delay_,
-        bool continue_on_error_,
-        size_t max_iterations_)
-        : concurrency(concurrency_)
-        , pool(concurrency)
-        , hosts_strings(hosts_strings_)
-        , generator(getGenerator(generator_name))
-        , max_time(max_time_)
-        , delay(delay_)
-        , continue_on_error(continue_on_error_)
-        , max_iterations(max_iterations_)
-        , info(std::make_shared<Stats>())
-        , queue(concurrency)
-    {
-    }
+        std::optional<double> max_time_,
+        std::optional<double> delay_,
+        std::optional<bool> continue_on_error_,
+        std::optional<size_t> max_iterations_);
 
     void thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> zookeepers);
 
@@ -46,18 +38,19 @@ public:
         std::cerr << "Requests executed: " << num << ".\n";
     }
 
-    bool tryPushRequestInteractively(const Coordination::ZooKeeperRequestPtr & request, DB::InterruptListener & interrupt_listener);
+    bool tryPushRequestInteractively(Coordination::ZooKeeperRequestPtr && request, DB::InterruptListener & interrupt_listener);
 
     void runBenchmark();
 
-
+    ~Runner();
 private:
+    void parseHostsFromConfig(const Poco::Util::AbstractConfiguration & config);
 
     size_t concurrency = 1;
 
-    ThreadPool pool;
-    Strings hosts_strings;
-    std::unique_ptr<IGenerator> generator;
+    std::optional<ThreadPool> pool;
+
+    std::optional<Generator> generator;
     double max_time = 0;
     double delay = 1;
     bool continue_on_error = false;
@@ -66,6 +59,9 @@ private:
     std::atomic<bool> shutdown = false;
 
     std::shared_ptr<Stats> info;
+    bool print_to_stdout;
+    std::optional<std::filesystem::path> file_output;
+    bool output_file_with_timestamp;
 
     Stopwatch total_watch;
     Stopwatch delay_watch;
@@ -73,7 +69,26 @@ private:
     std::mutex mutex;
 
     using Queue = ConcurrentBoundedQueue<Coordination::ZooKeeperRequestPtr>;
-    Queue queue;
+    std::optional<Queue> queue;
 
-    std::vector<std::shared_ptr<Coordination::ZooKeeper>> getConnections();
+    struct ConnectionInfo
+    {
+        std::string host;
+
+        bool secure = false;
+        int32_t session_timeout_ms = Coordination::DEFAULT_SESSION_TIMEOUT_MS;
+        int32_t connection_timeout_ms = Coordination::DEFAULT_CONNECTION_TIMEOUT_MS;
+        int32_t operation_timeout_ms = Coordination::DEFAULT_OPERATION_TIMEOUT_MS;
+
+        size_t sessions = 1;
+    };
+
+    std::mutex connection_mutex;
+    std::vector<ConnectionInfo> connection_infos;
+    std::vector<std::shared_ptr<Coordination::ZooKeeper>> connections;
+    std::unordered_map<size_t, size_t> connections_to_info_map;
+
+    void createConnections();
+    std::shared_ptr<Coordination::ZooKeeper> getConnection(const ConnectionInfo & connection_info);
+    std::vector<std::shared_ptr<Coordination::ZooKeeper>> refreshConnections();
 };
diff --git a/utils/keeper-bench/Stats.cpp b/utils/keeper-bench/Stats.cpp
index 1f8b02ed09d..3e7e92db713 100644
--- a/utils/keeper-bench/Stats.cpp
+++ b/utils/keeper-bench/Stats.cpp
@@ -1,67 +1,177 @@
 #include "Stats.h"
 #include <iostream>
 
-void report(std::shared_ptr<Stats> & info, size_t concurrency)
+#include <rapidjson/document.h>
+#include <rapidjson/rapidjson.h>
+#include <rapidjson/writer.h>
+#include <rapidjson/stringbuffer.h>
+
+void Stats::StatsCollector::add(uint64_t microseconds, size_t requests_inc, size_t bytes_inc)
+{
+    work_time += microseconds;
+    requests += requests_inc;
+    requests_bytes += bytes_inc;
+    sampler.insert(microseconds);
+}
+
+void Stats::addRead(uint64_t microseconds, size_t requests_inc, size_t bytes_inc)
+{
+    read_collector.add(microseconds, requests_inc, bytes_inc);
+}
+
+void Stats::addWrite(uint64_t microseconds, size_t requests_inc, size_t bytes_inc)
+{
+    write_collector.add(microseconds, requests_inc, bytes_inc);
+}
+
+void Stats::StatsCollector::clear()
+{
+    requests = 0;
+    work_time = 0;
+    requests_bytes = 0;
+    sampler.clear();
+}
+
+void Stats::clear()
+{
+    read_collector.clear();
+    write_collector.clear();
+}
+
+std::pair<double, double> Stats::StatsCollector::getThroughput(size_t concurrency)
+{
+    assert(requests != 0);
+    double seconds = work_time / 1'000'000.0 / concurrency;
+
+    return {requests / seconds, requests_bytes / seconds};
+}
+
+double Stats::StatsCollector::getPercentile(double percent)
+{
+    return sampler.quantileNearest(percent / 100.0) / 1000.0;
+}
+
+void Stats::report(size_t concurrency)
 {
     std::cerr << "\n";
 
+    const auto & read_requests = read_collector.requests;
+    const auto & write_requests = write_collector.requests;
+
     /// Avoid zeros, nans or exceptions
-    if (0 == info->read_requests && 0 == info->write_requests)
+    if (0 == read_requests && 0 == write_requests)
         return;
 
-    double read_seconds = info->read_work_time / concurrency;
-    double write_seconds = info->write_work_time / concurrency;
+    auto [read_rps, read_bps] = read_collector.getThroughput(concurrency);
+    auto [write_rps, write_bps] = write_collector.getThroughput(concurrency);
 
-    std::cerr << "read requests " << info->read_requests << ", write requests " << info->write_requests << ", ";
-    if (info->errors)
-    {
-        std::cerr << "errors " << info->errors << ", ";
-    }
-    if (0 != info->read_requests)
+    std::cerr << "read requests " << read_requests << ", write requests " << write_requests << ", ";
+    if (errors)
+        std::cerr << "errors " << errors << ", ";
+
+    if (0 != read_requests)
     {
         std::cerr
-            << "Read RPS: " << (info->read_requests / read_seconds) << ", "
-            << "Read MiB/s: " << (info->requests_read_bytes / read_seconds / 1048576);
-        if (0 != info->write_requests)
+            << "Read RPS: " << read_rps << ", "
+            << "Read MiB/s: " << read_bps / 1048576;
+
+        if (0 != write_requests)
             std::cerr << ", ";
     }
-    if (0 != info->write_requests)
+
+    if (0 != write_requests)
     {
         std::cerr
-            << "Write RPS: " << (info->write_requests / write_seconds) << ", "
-            << "Write MiB/s: " << (info->requests_write_bytes / write_seconds / 1048576) << ". "
+            << "Write RPS: " << write_rps << ", "
+            << "Write MiB/s: " << write_bps / 1048576 << ". "
             << "\n";
     }
     std::cerr << "\n";
 
-    auto print_percentile = [&](double percent, Stats::Sampler & sampler)
+    auto print_percentile = [&](double percent, Stats::StatsCollector & collector)
     {
         std::cerr << percent << "%\t\t";
-        std::cerr << sampler.quantileNearest(percent / 100.0) << " sec.\t";
+        std::cerr << collector.getPercentile(percent) << " msec.\t";
         std::cerr << "\n";
     };
 
-    if (0 != info->read_requests)
+    const auto print_all_percentiles = [&](auto & collector)
+    {
+        for (int percent = 0; percent <= 90; percent += 10)
+            print_percentile(percent, collector);
+
+        print_percentile(95, collector);
+        print_percentile(99, collector);
+        print_percentile(99.9, collector);
+        print_percentile(99.99, collector);
+    };
+
+    if (0 != read_requests)
     {
         std::cerr << "Read sampler:\n";
-        for (int percent = 0; percent <= 90; percent += 10)
-            print_percentile(percent, info->read_sampler);
-
-        print_percentile(95, info->read_sampler);
-        print_percentile(99, info->read_sampler);
-        print_percentile(99.9, info->read_sampler);
-        print_percentile(99.99, info->read_sampler);
+        print_all_percentiles(read_collector);
     }
 
-    if (0 != info->write_requests)
+    if (0 != write_requests)
     {
         std::cerr << "Write sampler:\n";
-        for (int percent = 0; percent <= 90; percent += 10)
-            print_percentile(percent, info->write_sampler);
-
-        print_percentile(95, info->write_sampler);
-        print_percentile(99, info->write_sampler);
-        print_percentile(99.9, info->write_sampler);
-        print_percentile(99.99, info->write_sampler);
+        print_all_percentiles(write_collector);
     }
 }
+
+void Stats::writeJSON(DB::WriteBuffer & out, size_t concurrency, int64_t start_timestamp)
+{
+    using namespace rapidjson;
+    Document results;
+    auto & allocator = results.GetAllocator();
+    results.SetObject();
+
+    results.AddMember("timestamp", Value(start_timestamp), allocator);
+
+    const auto get_results = [&](auto & collector)
+    {
+        Value specific_results(kObjectType);
+
+        specific_results.AddMember("total_requests", Value(static_cast<uint64_t>(collector.requests)), allocator);
+
+        auto [rps, bps] = collector.getThroughput(concurrency);
+        specific_results.AddMember("requests_per_second", Value(rps), allocator);
+        specific_results.AddMember("bytes_per_second", Value(bps), allocator);
+
+        Value percentiles(kArrayType);
+
+        const auto add_percentile = [&](double percent)
+        {
+            Value percentile(kObjectType);
+            Value percent_key(fmt::format("{:.2f}", percent).c_str(), allocator);
+            percentile.AddMember(percent_key, Value(collector.getPercentile(percent)), allocator);
+            percentiles.PushBack(percentile, allocator);
+        };
+
+        for (int percent = 0; percent <= 90; percent += 10)
+            add_percentile(percent);
+
+        add_percentile(95);
+        add_percentile(99);
+        add_percentile(99.9);
+        add_percentile(99.99);
+
+        specific_results.AddMember("percentiles", percentiles, allocator);
+
+        return specific_results;
+    };
+
+    if (read_collector.requests != 0)
+        results.AddMember("read_results", get_results(read_collector), results.GetAllocator());
+
+    if (write_collector.requests != 0)
+        results.AddMember("write_results", get_results(write_collector), results.GetAllocator());
+
+    StringBuffer strbuf;
+    strbuf.Clear();
+    Writer<StringBuffer> writer(strbuf);
+    results.Accept(writer);
+
+    const char * output_string = strbuf.GetString();
+    out.write(output_string, strlen(output_string));
+}
diff --git a/utils/keeper-bench/Stats.h b/utils/keeper-bench/Stats.h
index 1b9a31bb734..bc50588e837 100644
--- a/utils/keeper-bench/Stats.h
+++ b/utils/keeper-bench/Stats.h
@@ -5,48 +5,38 @@
 
 #include <AggregateFunctions/ReservoirSampler.h>
 
+#include <base/JSON.h>
+
 struct Stats
 {
-    std::atomic<size_t> read_requests{0};
-    std::atomic<size_t> write_requests{0};
     size_t errors = 0;
-    size_t requests_write_bytes = 0;
-    size_t requests_read_bytes = 0;
-    double read_work_time = 0;
-    double write_work_time = 0;
 
     using Sampler = ReservoirSampler<double>;
-    Sampler read_sampler {1 << 16};
-    Sampler write_sampler {1 << 16};
-
-    void addRead(double seconds, size_t requests_inc, size_t bytes_inc)
+    struct StatsCollector
     {
-        read_work_time += seconds;
-        read_requests += requests_inc;
-        requests_read_bytes += bytes_inc;
-        read_sampler.insert(seconds);
-    }
+        std::atomic<size_t> requests{0};
+        uint64_t requests_bytes = 0;
+        uint64_t work_time = 0;
+        Sampler sampler;
 
-    void addWrite(double seconds, size_t requests_inc, size_t bytes_inc)
-    {
-        write_work_time += seconds;
-        write_requests += requests_inc;
-        requests_write_bytes += bytes_inc;
-        write_sampler.insert(seconds);
-    }
+        /// requests/second, bytes/second
+        std::pair<double, double> getThroughput(size_t concurrency);
+        double getPercentile(double percent);
 
-    void clear()
-    {
-        read_requests = 0;
-        write_requests = 0;
-        read_work_time = 0;
-        write_work_time = 0;
-        requests_read_bytes = 0;
-        requests_write_bytes = 0;
-        read_sampler.clear();
-        write_sampler.clear();
-    }
+        void add(uint64_t microseconds, size_t requests_inc, size_t bytes_inc);
+        void clear();
+    };
+
+    StatsCollector read_collector;
+    StatsCollector write_collector;
+
+    void addRead(uint64_t microseconds, size_t requests_inc, size_t bytes_inc);
+    void addWrite(uint64_t microseconds, size_t requests_inc, size_t bytes_inc);
+
+    void clear();
+
+    void report(size_t concurrency);
+    void writeJSON(DB::WriteBuffer & out, size_t concurrency, int64_t start_timestamp);
 };
 
 
-void report(std::shared_ptr<Stats> & info, size_t concurrency);
diff --git a/utils/keeper-bench/example.yaml b/utils/keeper-bench/example.yaml
new file mode 100644
index 00000000000..e800e923482
--- /dev/null
+++ b/utils/keeper-bench/example.yaml
@@ -0,0 +1,117 @@
+concurrency: 20
+iterations: 10000
+delay: 4
+timelimit: 300
+continue_on_errors: true
+
+connections:
+  operation_timeout_ms: 3000
+  connection_timeout_ms: 40000
+
+  connection:
+    secure: false
+    operation_timeout_ms: 2000
+    session_timeout_ms: 2000
+    connection_timeout_ms: 50000
+    host: "localhost:9181"
+    sessions: 1
+
+  host: "localhost:9181"
+
+generator:
+  setup:
+    node:
+      name: "test3"
+    node:
+      name: "test_create"
+    node:
+      name: "test4"
+    node:
+      name: "test"
+      data: "somedata"
+      node:
+        repeat: 4
+        name:
+          random_string:
+            size: 15
+        data:
+          random_string:
+            size:
+              min_value: 10
+              max_value: 20
+      node:
+        repeat: 2
+        node:
+          repeat: 2
+          name:
+            random_string:
+              size: 12
+        name:
+          random_string:
+            size: 15
+        data:
+          random_string:
+            size:
+              min_value: 10
+              max_value: 20
+    node:
+      name: "test2"
+      data: "somedata"
+  requests:
+    create:
+      path: "/test_create"
+      name_length: 10
+      remove_factor: 0.5
+    multi:
+      size: 20
+      create:
+        path: "/test"
+        data:
+          random_string:
+            size:
+              min_value: 10
+              max_value: 20
+        remove_factor: 0.8
+      set:
+        weight: 2
+        path: 
+          - "/test3"
+          - "/test4"
+        path:
+          children_of: "/test"
+        data:
+          random_string:
+            size: 10
+    get:
+      path: 
+        - "/test3"
+        - "/test4"
+      path:
+        children_of: "/test"
+
+    multi:
+      weight: 10
+      get:
+        path: 
+          - "/test3"
+          - "/test4"
+        path:
+          children_of: "/test"
+      list:
+        path: 
+          - "/test3"
+        path:
+          children_of: "/test"
+
+    list:
+      path: 
+        - "/test3"
+        - "/test4"
+      path:
+        children_of: "/test"
+
+output:
+  file: 
+    path: "output.json"
+    with_timestamp: true
+  stdout: true
diff --git a/utils/keeper-bench/main.cpp b/utils/keeper-bench/main.cpp
index 39af28e7580..0753d66850f 100644
--- a/utils/keeper-bench/main.cpp
+++ b/utils/keeper-bench/main.cpp
@@ -3,10 +3,24 @@
 #include "Runner.h"
 #include "Stats.h"
 #include "Generator.h"
+#include "Common/Exception.h"
 #include <Common/TerminalSize.h>
 #include <Core/Types.h>
+#include <boost/program_options/variables_map.hpp>
 
-using namespace std;
+namespace
+{
+
+template <typename T>
+std::optional<T> valueToOptional(const boost::program_options::variable_value & value)
+{
+    if (value.empty())
+        return std::nullopt;
+
+    return value.as<T>();
+}
+
+}
 
 int main(int argc, char *argv[])
 {
@@ -19,15 +33,14 @@ int main(int argc, char *argv[])
 
         boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
         desc.add_options()
-            ("help",                                                            "produce help message")
-            ("generator",     value<std::string>()->default_value("set_small_data"),             "query to execute")
-            ("concurrency,c", value<unsigned>()->default_value(1),              "number of parallel queries")
-            ("delay,d",       value<double>()->default_value(1),                "delay between intermediate reports in seconds (set 0 to disable reports)")
-            ("iterations,i",  value<size_t>()->default_value(0),                "amount of queries to be executed")
-            ("timelimit,t",   value<double>()->default_value(0.),               "stop launch of queries after specified time limit")
-            ("hosts,h",       value<Strings>()->multitoken(),                   "")
+            ("help",                                                                         "produce help message")
+            ("config",         value<std::string>()->default_value(""),                      "yaml/xml file containing configuration")
+            ("concurrency,c",  value<unsigned>(),                                            "number of parallel queries")
+            ("report-delay,d", value<double>(),                                              "delay between intermediate reports in seconds (set 0 to disable reports)")
+            ("iterations,i",   value<size_t>(),                                              "amount of queries to be executed")
+            ("time-limit,t",   value<double>(),                                              "stop launch of queries after specified time limit")
+            ("hosts,h",        value<Strings>()->multitoken()->default_value(Strings{}, ""), "")
             ("continue_on_errors", "continue testing even if a query fails")
-            ("reconnect", "establish new connection for every query")
         ;
 
         boost::program_options::variables_map options;
@@ -41,15 +54,22 @@ int main(int argc, char *argv[])
             return 1;
         }
 
-        Runner runner(options["concurrency"].as<unsigned>(),
-            options["generator"].as<std::string>(),
-            options["hosts"].as<Strings>(),
-            options["timelimit"].as<double>(),
-            options["delay"].as<double>(),
-            options.count("continue_on_errors"),
-            options["iterations"].as<size_t>());
+        Runner runner(valueToOptional<unsigned>(options["concurrency"]),
+                      options["config"].as<std::string>(),
+                      options["hosts"].as<Strings>(),
+                      valueToOptional<double>(options["time-limit"]),
+                      valueToOptional<double>(options["report-delay"]),
+                      options.count("continue_on_errors") ? std::optional<bool>(true) : std::nullopt,
+                      valueToOptional<size_t>(options["iterations"]));
 
-        runner.runBenchmark();
+        try
+        {
+            runner.runBenchmark();
+        }
+        catch (const DB::Exception & e)
+        {
+            std::cout << "Got exception while trying to run benchmark: " << e.message() << std::endl;
+        }
 
         return 0;
     }
diff --git a/utils/keeper-data-dumper/CMakeLists.txt b/utils/keeper-data-dumper/CMakeLists.txt
index 1f55e50e68e..136d6f2268c 100644
--- a/utils/keeper-data-dumper/CMakeLists.txt
+++ b/utils/keeper-data-dumper/CMakeLists.txt
@@ -1,2 +1,7 @@
+if (NOT TARGET ch_contrib::nuraft)
+    message (WARNING "Not building keeper-data-dumper due to nuraft is disabled")
+    return ()
+endif ()
+
 clickhouse_add_executable(keeper-data-dumper main.cpp)
 target_link_libraries(keeper-data-dumper PRIVATE dbms)
diff --git a/utils/keeper-overload/keeper-overload.py b/utils/keeper-overload/keeper-overload.py
index bdb4563c713..0a059b10588 100755
--- a/utils/keeper-overload/keeper-overload.py
+++ b/utils/keeper-overload/keeper-overload.py
@@ -166,7 +166,7 @@ def main(args):
     keeper_bench_path = args.keeper_bench_path
 
     keepers = []
-    for (port, server_id) in zip(PORTS, SERVER_IDS):
+    for port, server_id in zip(PORTS, SERVER_IDS):
         keepers.append(
             Keeper(
                 keeper_binary_path, server_id, port, workdir, args.with_thread_fuzzer
diff --git a/utils/list-licenses/list-licenses.sh b/utils/list-licenses/list-licenses.sh
index db3eb5e59e8..dd23e6321c8 100755
--- a/utils/list-licenses/list-licenses.sh
+++ b/utils/list-licenses/list-licenses.sh
@@ -40,14 +40,21 @@ ls -1 -d ${LIBS_PATH}/*/ | ${GREP_CMD} -F -v -- '-cmake' | LC_ALL=C sort | while
          ${GREP_CMD} -q -i -F 'Altered source versions must be plainly marked as such' "$LIB_LICENSE" &&
          ${GREP_CMD} -q -i -F 'This notice may not be removed or altered' "$LIB_LICENSE" &&
          echo "zLib") ||
+        (${GREP_CMD} -q -i -F 'This program, "bzip2", the associated library "libbzip2"' "$LIB_LICENSE" &&
+         echo "bzip2") ||
         (${GREP_CMD} -q -i -F 'Permission is hereby granted, free of charge, to any person' "$LIB_LICENSE" &&
-         ${GREP_CMD} -q -i -F 'The above copyright notice and this permission notice shall be included' "$LIB_LICENSE" &&
+         ${GREP_CMD} -q -i -F 'The above copyright notice and this permission notice shall be' "$LIB_LICENSE" &&
          ${GREP_CMD} -q -i -F 'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND' "$LIB_LICENSE" &&
          echo "MIT") ||
+        (${GREP_CMD} -q -F 'PostgreSQL' "$LIB_LICENSE" &&
+         echo "PostgreSQL") ||
         (${GREP_CMD} -q -i -F 'Permission to use, copy, modify, and distribute this software for any purpose' "$LIB_LICENSE" &&
          ${GREP_CMD} -q -i -F 'the name of a copyright holder shall not' "$LIB_LICENSE" &&
          ${GREP_CMD} -q -i -F 'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND' "$LIB_LICENSE" &&
          echo "MIT/curl") ||
+        (${GREP_CMD} -q -i -F 'OpenLDAP Public License' "$LIB_LICENSE" &&
+         ${GREP_CMD} -q -i -F 'Version 2.8' "$LIB_LICENSE" &&
+         echo "OpenLDAP Version 2.8") ||
         (${GREP_CMD} -q -i -F 'Redistributions of source code must retain the above copyright' "$LIB_LICENSE" &&
          ${GREP_CMD} -q -i -F 'Redistributions in binary form must reproduce' "$LIB_LICENSE" &&
          ${GREP_CMD} -q -i -F 'Neither the name' "$LIB_LICENSE" &&
@@ -55,6 +62,14 @@ ls -1 -d ${LIBS_PATH}/*/ | ${GREP_CMD} -F -v -- '-cmake' | LC_ALL=C sort | while
         (${GREP_CMD} -q -i -F 'Redistributions of source code must retain the above copyright' "$LIB_LICENSE" &&
          ${GREP_CMD} -q -i -F 'Redistributions in binary form must reproduce' "$LIB_LICENSE" &&
          echo "BSD 2-clause") ||
+        (${GREP_CMD} -q -i -F 'Permission to use, copy, modify, and distribute this software' "$LIB_LICENSE" &&
+         ${GREP_CMD} -q -i -F 'documentation for any purpose and without fee is hereby granted' "$LIB_LICENSE" &&
+         ${GREP_CMD} -q -i -F 'the above copyright notice appear in all copies and that both that copyright' "$LIB_LICENSE" &&
+         ${GREP_CMD} -q -i -F 'notice and this permission notice appear in supporting documentation' "$LIB_LICENSE" &&
+         ${GREP_CMD} -q -i -F 'not be used in advertising or publicity pertaining' "$LIB_LICENSE" &&
+         ${GREP_CMD} -q -i -F 'distribution of the software without specific, written prior permission' "$LIB_LICENSE" &&
+         ${GREP_CMD} -q -i -F 'makes no representations about the suitability of this software' "$LIB_LICENSE" &&
+         echo "HPND") ||
         echo "Unknown")
 
         RELATIVE_PATH=$(echo "$LIB_LICENSE" | sed -r -e 's!^.+/contrib/!/contrib/!')
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index 3814e94bf24..653a0cd5388 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,7 +1,23 @@
+v23.4.2.11-stable	2023-05-02
+v23.4.1.1943-stable	2023-04-27
+v23.3.2.37-lts	2023-04-22
+v23.3.1.2823-lts	2023-03-31
+v23.2.6.34-stable	2023-04-23
+v23.2.5.46-stable	2023-04-03
+v23.2.4.12-stable	2023-03-10
+v23.2.3.17-stable	2023-03-06
+v23.2.2.20-stable	2023-03-01
 v23.2.1.2537-stable	2023-02-23
+v23.1.7.30-stable	2023-04-22
+v23.1.6.42-stable	2023-04-03
+v23.1.5.24-stable	2023-03-10
+v23.1.4.58-stable	2023-03-01
 v23.1.3.5-stable	2023-02-03
 v23.1.2.9-stable	2023-01-29
 v23.1.1.3077-stable	2023-01-25
+v22.12.6.22-stable	2023-03-31
+v22.12.5.34-stable	2023-03-10
+v22.12.4.76-stable	2023-03-01
 v22.12.3.5-stable	2023-01-10
 v22.12.2.25-stable	2023-01-06
 v22.12.1.1752-stable	2022-12-15
@@ -25,6 +41,10 @@ v22.9.4.32-stable	2022-10-26
 v22.9.3.18-stable	2022-09-30
 v22.9.2.7-stable	2022-09-23
 v22.9.1.2603-stable	2022-09-22
+v22.8.17.17-lts	2023-04-22
+v22.8.16.32-lts	2023-04-04
+v22.8.15.23-lts	2023-03-10
+v22.8.14.53-lts	2023-02-27
 v22.8.13.20-lts	2023-01-29
 v22.8.12.45-lts	2023-01-10
 v22.8.11.15-lts	2022-12-08
@@ -63,6 +83,7 @@ v22.4.5.9-stable	2022-05-06
 v22.4.4.7-stable	2022-04-29
 v22.4.3.3-stable	2022-04-26
 v22.4.2.1-stable	2022-04-22
+v22.3.20.29-lts	2023-03-31
 v22.3.19.6-lts	2023-02-27
 v22.3.18.37-lts	2023-02-15
 v22.3.17.13-lts	2023-01-12
diff --git a/utils/memcpy-bench/CMakeLists.txt b/utils/memcpy-bench/CMakeLists.txt
index 460a06ba851..c0b0b8a589d 100644
--- a/utils/memcpy-bench/CMakeLists.txt
+++ b/utils/memcpy-bench/CMakeLists.txt
@@ -1,3 +1,9 @@
+# memcpy_jart.S contains position dependent code
+if (CMAKE_POSITION_INDEPENDENT_CODE OR NOT OS_LINUX OR NOT ARCH_AMD64)
+    message (WARNING "Not building memcpy-bench due to PIC enabled or not Linux or not x86")
+    return ()
+endif ()
+
 enable_language(ASM)
 
 clickhouse_add_executable (memcpy-bench
diff --git a/utils/memcpy-bench/memcpy-bench.cpp b/utils/memcpy-bench/memcpy-bench.cpp
index 8b75164eb60..bb571200d07 100644
--- a/utils/memcpy-bench/memcpy-bench.cpp
+++ b/utils/memcpy-bench/memcpy-bench.cpp
@@ -1,6 +1,4 @@
-#ifdef HAS_RESERVED_IDENTIFIER
 #pragma clang diagnostic ignored "-Wreserved-identifier"
-#endif
 
 #include <memory>
 #include <cstddef>
diff --git a/utils/s3tools/s3uploader b/utils/s3tools/s3uploader
index 33db76f57f4..d53661614c0 100755
--- a/utils/s3tools/s3uploader
+++ b/utils/s3tools/s3uploader
@@ -28,39 +28,48 @@ class S3API(object):
         bucket = self.connection.get_bucket(bucket_name)
         key = bucket.initiate_multipart_upload(s3_path)
         logging.info("Will upload to s3 path %s", s3_path)
-        chunksize = 1024 * 1024 * 1024 # 1 GB
+        chunksize = 1024 * 1024 * 1024  # 1 GB
         filesize = os.stat(file_path).st_size
         logging.info("File size is %s", filesize)
         chunkcount = int(math.ceil(filesize / chunksize))
 
         def call_back(x, y):
             print("Uploaded {}/{} bytes".format(x, y))
+
         try:
             for i in range(chunkcount + 1):
                 logging.info("Uploading chunk %s of %s", i, chunkcount + 1)
                 offset = chunksize * i
                 bytes_size = min(chunksize, filesize - offset)
 
-                with open(file_path, 'r') as fp:
+                with open(file_path, "r") as fp:
                     fp.seek(offset)
-                    key.upload_part_from_file(fp=fp, part_num=i+1,
-                                              size=bytes_size, cb=call_back,
-                                              num_cb=100)
+                    key.upload_part_from_file(
+                        fp=fp, part_num=i + 1, size=bytes_size, cb=call_back, num_cb=100
+                    )
             key.complete_upload()
         except Exception as ex:
             key.cancel_upload()
             raise ex
         logging.info("Contents were set")
         return "https://{bucket}.{mds_url}/{path}".format(
-            bucket=bucket_name, mds_url=self.mds_url, path=s3_path)
+            bucket=bucket_name, mds_url=self.mds_url, path=s3_path
+        )
 
     def set_file_contents(self, bucket, local_file_path, s3_file_path):
         key = Key(bucket)
         key.key = s3_file_path
         file_size = os.stat(local_file_path).st_size
-        logging.info("Uploading file `%s` to `%s`. Size is %s", local_file_path, s3_file_path, file_size)
+        logging.info(
+            "Uploading file `%s` to `%s`. Size is %s",
+            local_file_path,
+            s3_file_path,
+            file_size,
+        )
+
         def call_back(x, y):
             print("Uploaded {}/{} bytes".format(x, y))
+
         key.set_contents_from_filename(local_file_path, cb=call_back)
 
     def upload_data_for_static_files_disk(self, bucket_name, directory_path, s3_path):
@@ -74,12 +83,14 @@ class S3API(object):
             path = root.split(os.sep)
             for file in files:
                 local_file_path = os.path.join(root, file)
-                s3_file = local_file_path[len(directory_path) + 1:]
+                s3_file = local_file_path[len(directory_path) + 1 :]
                 s3_file_path = os.path.join(s3_path, s3_file)
                 self.set_file_contents(bucket, local_file_path, s3_file_path)
 
         logging.info("Uploading finished")
-        return "https://{bucket}.{mds_url}/{path}".format(bucket=bucket_name, mds_url=self.mds_url, path=s3_path)
+        return "https://{bucket}.{mds_url}/{path}".format(
+            bucket=bucket_name, mds_url=self.mds_url, path=s3_path
+        )
 
     def list_bucket_keys(self, bucket_name):
         bucket = self.connection.get_bucket(bucket_name)
@@ -91,100 +102,119 @@ class S3API(object):
         bucket.get_all_keys()
         for obj in bucket.get_all_keys():
             if obj.key.startswith(folder_path):
-                print('Removing ' + obj.key)
+                print("Removing " + obj.key)
                 obj.delete()
 
 
-def make_tar_file_for_table(clickhouse_data_path, db_name, table_name,
-                            tmp_prefix):
-
-    relative_data_path = os.path.join('data', db_name, table_name)
-    relative_meta_path = os.path.join('metadata', db_name, table_name + '.sql')
+def make_tar_file_for_table(clickhouse_data_path, db_name, table_name, tmp_prefix):
+    relative_data_path = os.path.join("data", db_name, table_name)
+    relative_meta_path = os.path.join("metadata", db_name, table_name + ".sql")
     path_to_data = os.path.join(clickhouse_data_path, relative_data_path)
     path_to_metadata = os.path.join(clickhouse_data_path, relative_meta_path)
-    temporary_file_name = tmp_prefix + '/{tname}.tar'.format(tname=table_name)
+    temporary_file_name = tmp_prefix + "/{tname}.tar".format(tname=table_name)
     with tarfile.open(temporary_file_name, "w") as bundle:
         bundle.add(path_to_data, arcname=relative_data_path)
         bundle.add(path_to_metadata, arcname=relative_meta_path)
     return temporary_file_name
 
 
-USAGE_EXAMPLES = '''
+USAGE_EXAMPLES = """
 examples:
 \t./s3uploader --dataset-name some_ds --access-key-id XXX --secret-access-key YYY --clickhouse-data-path /opt/clickhouse/ --table-name default.some_tbl --bucket-name some-bucket
 \t./s3uploader --dataset-name some_ds --access-key-id XXX --secret-access-key YYY --file-path some_ds.tsv.xz --bucket-name some-bucket --s3-path /path/to/
-'''
+"""
 
 if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
+    logging.basicConfig(level=logging.INFO, format="%(asctime)s %(message)s")
 
     parser = argparse.ArgumentParser(
         description="Simple tool for uploading datasets to clickhouse S3",
-        usage='%(prog)s [options] {}'.format(USAGE_EXAMPLES))
-    parser.add_argument('--s3-api-url', default='s3.amazonaws.com')
-    parser.add_argument('--s3-common-url', default='s3.amazonaws.com')
-    parser.add_argument('--bucket-name', default='clickhouse-datasets')
-    parser.add_argument('--dataset-name', required=True,
-                        help='Name of dataset, will be used in uploaded path')
-    parser.add_argument('--access-key-id', required=True)
-    parser.add_argument('--secret-access-key', required=True)
-    parser.add_argument('--clickhouse-data-path',
-                        default='/var/lib/clickhouse/',
-                        help='Path to clickhouse database on filesystem')
-    parser.add_argument('--s3-path', help='Path in s3, where to upload file')
-    parser.add_argument('--tmp-prefix', default='/tmp',
-                        help='Prefix to store temporary downloaded file')
+        usage="%(prog)s [options] {}".format(USAGE_EXAMPLES),
+    )
+    parser.add_argument("--s3-api-url", default="s3.amazonaws.com")
+    parser.add_argument("--s3-common-url", default="s3.amazonaws.com")
+    parser.add_argument("--bucket-name", default="clickhouse-datasets")
+    parser.add_argument(
+        "--dataset-name",
+        required=True,
+        help="Name of dataset, will be used in uploaded path",
+    )
+    parser.add_argument("--access-key-id", required=True)
+    parser.add_argument("--secret-access-key", required=True)
+    parser.add_argument(
+        "--clickhouse-data-path",
+        default="/var/lib/clickhouse/",
+        help="Path to clickhouse database on filesystem",
+    )
+    parser.add_argument("--s3-path", help="Path in s3, where to upload file")
+    parser.add_argument(
+        "--tmp-prefix", default="/tmp", help="Prefix to store temporary downloaded file"
+    )
     data_group = parser.add_mutually_exclusive_group(required=True)
-    table_name_argument = data_group.add_argument('--table-name',
-                            help='Name of table with database, if you are uploading partitions')
-    data_group.add_argument('--file-path',
-                            help='Name of file, if you are uploading')
-    data_group.add_argument('--directory-path', help='Path to directory with files to upload')
-    data_group.add_argument('--list-directory', help='List s3 directory by --directory-path')
-    data_group.add_argument('--remove-directory', help='Remove s3 directory by --directory-path')
+    table_name_argument = data_group.add_argument(
+        "--table-name",
+        help="Name of table with database, if you are uploading partitions",
+    )
+    data_group.add_argument("--file-path", help="Name of file, if you are uploading")
+    data_group.add_argument(
+        "--directory-path", help="Path to directory with files to upload"
+    )
+    data_group.add_argument(
+        "--list-directory", help="List s3 directory by --directory-path"
+    )
+    data_group.add_argument(
+        "--remove-directory", help="Remove s3 directory by --directory-path"
+    )
     args = parser.parse_args()
 
     if args.table_name is not None and args.clickhouse_data_path is None:
-        raise argparse.ArgumentError(table_name_argument,
-            "You should specify --clickhouse-data-path to upload --table")
+        raise argparse.ArgumentError(
+            table_name_argument,
+            "You should specify --clickhouse-data-path to upload --table",
+        )
 
     s3_conn = S3API(
-        args.access_key_id, args.secret_access_key,
-        args.s3_api_url, args.s3_common_url)
+        args.access_key_id, args.secret_access_key, args.s3_api_url, args.s3_common_url
+    )
 
-    file_path = ''
+    file_path = ""
     directory_path = args.directory_path
     s3_path = args.s3_path
 
     if args.list_directory:
         s3_conn.list_bucket_keys(args.bucket_name)
     elif args.remove_directory:
-        print('Removing s3 path: ' + args.remove_directory)
+        print("Removing s3 path: " + args.remove_directory)
         s3_conn.remove_folder_from_bucket(args.bucket_name, args.remove_directory)
     elif args.directory_path is not None:
-        url = s3_conn.upload_data_for_static_files_disk(args.bucket_name, directory_path, s3_path)
+        url = s3_conn.upload_data_for_static_files_disk(
+            args.bucket_name, directory_path, s3_path
+        )
         logging.info("Data uploaded: %s", url)
     else:
-
         if args.table_name is not None:
-            if '.' not in args.table_name:
-                db_name = 'default'
+            if "." not in args.table_name:
+                db_name = "default"
             else:
-                db_name, table_name = args.table_name.split('.')
+                db_name, table_name = args.table_name.split(".")
             file_path = make_tar_file_for_table(
-                args.clickhouse_data_path, db_name, table_name, args.tmp_prefix)
+                args.clickhouse_data_path, db_name, table_name, args.tmp_prefix
+            )
         else:
             file_path = args.file_path
 
-        if 'tsv' in file_path:
+        if "tsv" in file_path:
             s3_path = os.path.join(
-                args.dataset_name, 'tsv', os.path.basename(file_path))
+                args.dataset_name, "tsv", os.path.basename(file_path)
+            )
         if args.table_name is not None:
             s3_path = os.path.join(
-                args.dataset_name, 'partitions', os.path.basename(file_path))
+                args.dataset_name, "partitions", os.path.basename(file_path)
+            )
         elif args.s3_path is not None:
             s3_path = os.path.join(
-                args.dataset_name, args.s3_path, os.path.basename(file_path))
+                args.dataset_name, args.s3_path, os.path.basename(file_path)
+            )
         else:
             raise Exception("Don't know s3-path to upload")
 
diff --git a/utils/security-generator/generate_security.py b/utils/security-generator/generate_security.py
index d25612e8bc6..83180ccce1c 100755
--- a/utils/security-generator/generate_security.py
+++ b/utils/security-generator/generate_security.py
@@ -48,17 +48,20 @@ A public disclosure date is negotiated by the ClickHouse maintainers and the bug
 """
 
 
-def generate_supported_versions():
+def generate_supported_versions() -> str:
     with open(VERSIONS_FILE, "r", encoding="utf-8") as fd:
         versions = [line.split(maxsplit=1)[0][1:] for line in fd.readlines()]
 
     # The versions in VERSIONS_FILE are ordered ascending, so the first one is
     # the greatest one. We may have supported versions in the previous year
-    unsupported_year = int(versions[0].split(".", maxsplit=1)[0]) - 2
-    # 3 supported versions
-    supported = []  # type: List[str]
-    # 2 LTS versions, one of them could be in supported
+    greatest_year = int(versions[0].split(".", maxsplit=1)[0])
+    unsupported_year = greatest_year - 2
+    # 3 regular versions
+    regular = []  # type: List[str]
+    max_regular = 3
+    # 2 LTS versions, one of them could be in regular
     lts = []  # type: List[str]
+    max_lts = 2
     # The rest are unsupported
     unsupported = []  # type: List[str]
     table = [
@@ -69,18 +72,21 @@ def generate_supported_versions():
         year = int(version.split(".")[0])
         month = int(version.split(".")[1])
         version = f"{year}.{month}"
-        if version in supported or version in lts:
+        to_append = ""
+        if version in regular or version in lts:
             continue
-        if len(supported) < 3:
-            supported.append(version)
-            if len(lts) < 2 and month in [3, 8]:
-                # The version can be LTS as well
-                lts.append(version)
-            table.append(f"| {version} | ✔️ |")
-            continue
-        if len(lts) < 2 and month in [3, 8]:
+        if len(regular) < max_regular:
+            regular.append(version)
+            to_append = f"| {version} | ✔️ |"
+        if len(lts) < max_lts and month in [3, 8]:
             lts.append(version)
-            table.append(f"| {version} | ✔️ |")
+            to_append = f"| {version} | ✔️ |"
+        if to_append:
+            if len(regular) == max_regular and len(lts) == max_lts:
+                # if we reached the max number of supported versions, the rest
+                # are unsopported, so year.* will be used
+                unsupported_year = min(greatest_year - 1, year)
+            table.append(to_append)
             continue
         if year <= unsupported_year:
             # The whole year is unsopported
@@ -92,7 +98,7 @@ def generate_supported_versions():
     return "\n".join(table) + "\n"
 
 
-def main():
+def main() -> None:
     print(HEADER)
     print(generate_supported_versions())
     print(FOOTER)
diff --git a/utils/self-extracting-executable/decompressor.cpp b/utils/self-extracting-executable/decompressor.cpp
index 37fbd043814..d41b9b1ebe1 100644
--- a/utils/self-extracting-executable/decompressor.cpp
+++ b/utils/self-extracting-executable/decompressor.cpp
@@ -168,6 +168,10 @@ int decompress(char * input, char * output, off_t start, off_t end, size_t max_n
     return 0;
 }
 
+bool isSudo()
+{
+    return geteuid() == 0;
+}
 
 /// Read data about files and decomrpess them.
 int decompressFiles(int input_fd, char * path, char * name, bool & have_compressed_analoge, bool & has_exec, char * decompressed_suffix, uint64_t * decompressed_umask)
@@ -220,6 +224,8 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
         return 1;
     }
 
+    bool is_sudo = isSudo();
+
     FileData file_info;
     /// Decompress files with appropriate file names
     for (size_t i = 0; i < le64toh(metadata.number_of_files); ++i)
@@ -319,6 +325,9 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
             perror("fsync");
         if (0 != close(output_fd))
             perror("close");
+
+        if (is_sudo)
+            chown(file_name, info_in.st_uid, info_in.st_gid);
     }
 
     if (0 != munmap(input, info_in.st_size))
@@ -414,6 +423,13 @@ int main(int/* argc*/, char* argv[])
     else
         name = file_path;
 
+    struct stat input_info;
+    if (0 != stat(self, &input_info))
+    {
+        perror("stat");
+        return 1;
+    }
+
 #if !defined(OS_DARWIN) && !defined(OS_FREEBSD)
     /// get inode of this executable
     uint64_t inode = getInode(self);
@@ -441,13 +457,6 @@ int main(int/* argc*/, char* argv[])
         return 1;
     }
 
-    struct stat input_info;
-    if (0 != stat(self, &input_info))
-    {
-        perror("stat");
-        return 1;
-    }
-
     /// inconsistency in WSL1 Ubuntu - inode reported in /proc/self/maps is a 64bit to
     /// 32bit conversion of input_info.st_ino
     if (input_info.st_ino & 0xFFFFFFFF00000000 && !(inode & 0xFFFFFFFF00000000))
@@ -532,6 +541,9 @@ int main(int/* argc*/, char* argv[])
             return 1;
         }
 
+        if (isSudo())
+            chown(static_cast<char *>(self), input_info.st_uid, input_info.st_gid);
+
         if (has_exec)
         {
 #if !defined(OS_DARWIN) && !defined(OS_FREEBSD)
diff --git a/utils/test_history/test-history b/utils/test_history/test-history
index fdd6c36e9dc..5f031af1d3a 100755
--- a/utils/test_history/test-history
+++ b/utils/test_history/test-history
@@ -11,13 +11,14 @@ from termcolor import colored
 import sys
 
 COLORMAP = {
-    "success": colored("success", 'green'),
-    "failure": colored("failure", 'red'),
-    "error": colored("error", 'red'),
-    "pending": colored("pending", 'yellow'),
-    "not run": colored("not run", 'white'),
+    "success": colored("success", "green"),
+    "failure": colored("failure", "red"),
+    "error": colored("error", "red"),
+    "pending": colored("pending", "yellow"),
+    "not run": colored("not run", "white"),
 }
 
+
 def _filter_statuses(statuses):
     """
     Squash statuses to latest state
@@ -69,7 +70,7 @@ if __name__ == "__main__":
     date_since = datetime.datetime.strptime(args.since, "%Y-%m-%d %H:%M:%S")
 
     gh = Github(args.token)
-    repo = gh.get_repo('ClickHouse/ClickHouse')
+    repo = gh.get_repo("ClickHouse/ClickHouse")
     commits = get_commits(repo, date_since)
 
     longest_header = []
@@ -101,6 +102,6 @@ if __name__ == "__main__":
         result_data.append(current_result)
 
     if sys.stdout.isatty():
-        longest_header = [colored(h, 'white', attrs=['bold']) for h in longest_header]
+        longest_header = [colored(h, "white", attrs=["bold"]) for h in longest_header]
 
     print(tabulate.tabulate(result_data, headers=longest_header, tablefmt="grid"))
diff --git a/utils/tests-visualizer/index.html b/utils/tests-visualizer/index.html
index 11b2d6504e4..b2db5dbed33 100644
--- a/utils/tests-visualizer/index.html
+++ b/utils/tests-visualizer/index.html
@@ -20,9 +20,7 @@
             width: 130px;
             display: block;
             margin: 30px auto;
-            -webkit-animation: spin 2s ease-in-out infinite;
-            -moz-animation: spin 2s ease-in-out infinite;
-            animation: spin 2s ease-in-out infinite;
+            animation: spin 10s ease-in-out infinite;
         }
 
         h1 {
@@ -45,16 +43,9 @@
             cursor: pointer;
         }
 
-        @-moz-keyframes spin {
-            100% { -moz-transform: rotate(360deg); }
-        }
-
-        @-webkit-keyframes spin {
-            100% { -webkit-transform: rotate(360deg); }
-        }
-
         @keyframes spin {
-            100% { transform:rotate(360deg); }
+            50% { transform:scale(150%); }
+            100% { transform:scale(100%); }
         }
     </style>
 </head>
@@ -67,33 +58,26 @@
 </div>
 <canvas id="canvas"></canvas>
 <script type="text/javascript">
-///////////////////////
-//  GLOBAL VARIABLES
-///////////////////////
-let start_date = '2020-06-13';
+let start_date = '2021-12-01';
 const canvasNode = document.getElementById('canvas');
 const infoNode = document.getElementById('info');
 const loadingNode = document.getElementById('loading');
 const failMessageNode = document.getElementById('fail-message');
 
-///////////////////////
-//      QUERIES
-///////////////////////
 let render_data_query = `
     WITH '${start_date}'::Date AS start_date
     SELECT groupArray([d, n, fail]) FROM
     (
         SELECT n, check_start_time::Date - start_date AS d, max(test_status LIKE 'F%' OR test_status LIKE 'E%') AS fail
-        FROM "default".checks
+        FROM checks
 
         INNER JOIN
         (
-            SELECT test_name, toUInt16(rowNumberInAllBlocks()) AS n FROM
+            SELECT test_name, toUInt16(row_number() OVER (ORDER BY test_name)) AS n FROM
             (
                 SELECT DISTINCT test_name
-                FROM "default".checks
+                FROM checks
                 WHERE match(test_name, '^\\d+_') AND check_name ILIKE '%stateless%' AND check_start_time > now() - INTERVAL 1 DAY
-                ORDER BY test_name
             )
         ) AS nums
 
@@ -109,25 +93,20 @@ let render_data_query = `
     FORMAT TSV`;
 
 let test_names_query = `
-    SELECT test_name, toUInt16(rowNumberInAllBlocks()) AS n FROM
+    SELECT test_name, toUInt16(row_number() OVER (ORDER BY test_name)) AS n FROM
     (
         SELECT DISTINCT test_name
-        FROM "default".checks
+        FROM checks
         WHERE match(test_name, '^\\d+_') AND check_name ILIKE '%stateless%' AND check_start_time > now() - INTERVAL 1 DAY
-        ORDER BY test_name
     ) FORMAT JSONCompact`;
 
-///////////////////////
-//       MAIN
-///////////////////////
-
 (async () => {
     try {
         const [render_data, test_names_data]  = await Promise.all([
             loadDataByQuery(render_data_query),
             loadDataByQuery(test_names_query),
         ]);
-        // we good
+
         renderResponse(render_data);
         saveTestNames(test_names_data);
     } catch (e) {
@@ -138,10 +117,6 @@ let test_names_query = `
     }
 })()
 
-///////////////////////
-//  SPECIAL FUNCTIONS
-///////////////////////
-
 async function loadDataByQuery(query) {
     const response = await fetch(
         "https://play.clickhouse.com?user=play&add_http_cors_header=1",
diff --git a/utils/wal-dump/CMakeLists.txt b/utils/wal-dump/CMakeLists.txt
deleted file mode 100644
index 3d59e95b4ca..00000000000
--- a/utils/wal-dump/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-clickhouse_add_executable (wal-dump main.cpp)
-target_link_libraries(wal-dump PRIVATE dbms boost::program_options)
diff --git a/utils/wal-dump/main.cpp b/utils/wal-dump/main.cpp
deleted file mode 100644
index 3566936324b..00000000000
--- a/utils/wal-dump/main.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <iostream>
-
-#include <boost/program_options.hpp>
-
-#include <Compression/CompressedReadBuffer.h>
-#include <Compression/CompressedReadBufferFromFile.h>
-#include <Compression/CompressedWriteBuffer.h>
-#include <Formats/NativeReader.h>
-#include <IO/Operators.h>
-#include <IO/ReadBufferFromFile.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteBufferFromFileDescriptor.h>
-#include <Storages/MergeTree/MergeTreeWriteAheadLog.h>
-
-/*
- * Dump the Write Ahead Log file, outputs:
- * Part 0, Version: 0, Action : ADD_PART, Name: 4_1_1_0, Block:
-   a Int32 Int32(size = 2), b Int32 Int32(size = 2), c Int32 Int32(size = 2)
- */
-
-static void dump(const std::string & bin_path)
-{
-    DB::ReadBufferFromFile in(bin_path);
-    DB::NativeReader block_in(in, 0);
-    DB::Block block;
-
-    DB::WriteBufferFromFileDescriptor out(STDOUT_FILENO);
-
-    for (size_t part_num = 0; !in.eof(); ++part_num)
-    {
-        UInt8 version;
-        String part_name;
-        DB::MergeTreeWriteAheadLog::ActionType action_type;
-
-        DB::readIntBinary(version, in);
-        DB::readIntBinary(action_type, in);
-        DB::readStringBinary(part_name, in);
-        block = block_in.read();
-
-        out << "Part " << part_num << ", Version: " << version
-            << ", Action : " << (action_type == DB::MergeTreeWriteAheadLog::ActionType::ADD_PART ? "ADD_PART" : "DROP_PART")
-            << ", Name: " << part_name << ", Block:\n";
-        out << block.dumpStructure() << "\n";
-        out << "\n" << DB::flush;
-    }
-}
-
-
-int main(int argc, char ** argv)
-{
-    boost::program_options::options_description desc("Allowed options");
-    desc.add_options()("help,h", "produce help message");
-
-    boost::program_options::variables_map options;
-    boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), options);
-
-    if (options.count("help") || argc != 2)
-    {
-        std::cout << "Usage: " << argv[0] << " wal.bin" << std::endl;
-        std::cout << desc << std::endl;
-        return 1;
-    }
-
-    try
-    {
-        dump(argv[1]);
-    }
-    catch (const DB::Exception & e)
-    {
-        std::cerr << e.what() << ", " << e.message() << std::endl
-                  << std::endl
-                  << "Stack trace:" << std::endl
-                  << e.getStackTraceString() << std::endl;
-        throw;
-    }
-
-    return 0;
-}
diff --git a/utils/wikistat-loader/main.cpp b/utils/wikistat-loader/main.cpp
index 31ade014c74..493f1df05da 100644
--- a/utils/wikistat-loader/main.cpp
+++ b/utils/wikistat-loader/main.cpp
@@ -1,6 +1,6 @@
 #include <boost/program_options.hpp>
 
-#include <Common/hex.h>
+#include <base/hex.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 #include <IO/ReadHelpers.h>